From 8f5daea2be4a451912cb950668a5d6581bfb2fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=20=E6=98=A5=E9=9B=B7?= <pandaxcl@gmail.com>
Date: Tue, 16 Jun 2020 10:14:42 +0800
Subject: [PATCH] Squashed 'lib3rd/libzmq.git/' changes from
 3a2b3bc625..661aa7c25b
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

661aa7c25b 1. 给clips的扩展添加了newline函数：因为其居然不支持；（
f94fda4c8b 1. 修正了zmq的clips扩展代码中的BUG：socket在pollitems里面的表示应该是static_cast<void*>(zmq::socket)，而不是shared_ptr的get函数的返回值：）
01c131269a 1. 修正了zeromq的clips扩展的zmq-poll-create的zmq::socket_t作为zmq::pollitems_t的错误，只需要void*转型就好了，cppzmq对其进行了封装。
e3f11d2581 1. 完善了zeromq的clips扩展：修正了bug，增强了异常输出细节：）
d12828f1ca Merge commit '5cdc61f57a16adeaa009aef98c7203e5519dc5fc'
5cdc61f57a Squashed 'lib3rd/fmt.git/' changes from 16aec06179..e900d735bb
91464f1b58 1. 给xclips的zeromq的poll扩展添加了实例代码：）
ac34875c0b 1. 更新所有的submodule
84d59546ee 1. 添加了scribble/text的命令行规则：用于使用Racket的Scheme语言来生成代码；）
1f8ddb536f 1. 改善了xcconfig的编写格式：不用挤在一行里面了；）
4e19c526d0 Merge commit '2cd6eead6ae57ee4801d4fc6be278b3d5e6277e7'
2cd6eead6a Squashed 'lib3rd/catch2.git/' changes from 7fcc19d02a..0f12995501
31a967f210 Squashed 'lib3rd/fmt.git/' changes from 901c9d8509..16aec06179
684c7099d9 Merge commit '31a967f210dc02b91ae781bf49f0fc220e36769f'
86b1dd3599 Merge commit '409ab3e528cce2e24cd652a31013800ad038c050'
409ab3e528 Squashed 'lib3rd/libzmq.git/' changes from c2556bb947..3a2b3bc625
3f76f5ce9a Merge commit 'ee8d949923300bf147f442cf599b61b7fb7369cb'
ee8d949923 Squashed 'lib3rd/nlohmann-json.git/' changes from 972d6a3842..456478b3c5
9fdcb100d4 Merge commit 'e6f189510e4e6da1e3339313715e35340a43fb6e'
e6f189510e Squashed 'lib3rd/libzmq.git/' changes from 907ec22475..c2556bb947
c2556bb947 Merge commit '3fa1a33cadbdd1ce655cd48e27057b46d9d565ee'
3fa1a33cad Squashed 'lib3rd/graphviz.git/' changes from 1be9b598bd..f7f1d9879b
f7f1d9879b Merge commit '03ef654f94a0c4e894ee9ae374249d471ed0f0e8'
03ef654f94 Squashed 'lib3rd/fmt.git/' changes from 972d6a3842..901c9d8509
faee89cb71 Merge commit 'a3e4a1979a8a5112019adb00f849c021d3c3b4c6'
a3e4a1979a Squashed 'lib3rd/cppzmq.git/' changes from a2ef92ef57..c4d4cf75dd
ea3a14503e Merge commit '4340f78546420bb3ff3dfa24edb0e5960acf50b3'
4340f78546 Squashed 'lib3rd/cppcoro.git/' changes from 92892f31d0..69e575480a
f1d39aa8c6 Squashed 'lib3rd/catch2.git/' changes from 972d6a3842..7fcc19d02a
0fd4056562 Merge commit 'f1d39aa8c6ca315a497a03d8a241a35a48609d26'
7fcc19d02a 1. 将rxcpp的头文件加入到shared的xcconfig文件中：）
901c9d8509 1. 默认关闭-Wdocumentation和-Wcomma两种警告
f090e67d8d 1. 给xclips扩展添加了starts-with，istarts-with，ends-with，iends-with，contains，icontains共六个Lexeme函数：）
5ca47cf3a2 1. 完善了clips::multifield的C++绑定增强；）
f3688102f1 1. 修正了CLIPS的扩展JSON里面的一处json-set-value-for-path的BUG：当value类型为STRING或SYMBOL时，就不需要parse（很可能不成功）了！
65cd0b050f 1. 添加了自动pull子模块的sh脚本文件：并更新了所有的submodule
a6a28abac3 1. 为了让zmq扩展的名称更加对称：zmq-poll-has-message修改成为了zmq-poll-router-has-message
61ad4d0ccc 1. 去除了ZeroMQ扩展的协议约束：发现是没有必要的！本来希望能够通过缓冲的方式组合成为完整的协议（Command，JSON）格式之后再发送，但是发现还不如直接组合好了再发给ZMQ处理！这也是职责单一原则的体现了：）
77849a42bb 1. 给XCLIPS的扩展添加了CompleteCommand的测试例子：发现CLIPS的command必须以换行符结束：（ 2. 给ZMQ的XCLIPS扩展添加了更详细的日志输出！
b2eb292589 1. 添加了到catch2的头文件搜索目录；）
9fbc9a30df 1. 将mustache的CLIPS扩展函数（render和render_with_partials）合并成为一个函数：mustache-render
cc39081479 1. 完善了zeromq_poll系列CLIPS扩展函数
3ba1bf806e 1. 添加了zmq_poll的功能：便于在xclips里面从多个socket获取消息：） 2. 让clips.hpp支持multifiled的return和参数；）
90cc4d0b81 1. 修改了shared的xcconfig文件：是的能够自动链接libzmq库（iOS和macOS）
2ff6e80960 Merge commit '0f664910f18b0640b3b78afeefed64a8acc14e6c'
0f664910f1 Squashed 'lib3rd/yoga.git/' changes from a96a36ef59..4135420cba
7a7c3148e2 Squashed 'lib3rd/nlohmann-json.git/' changes from 456478b3c5..972d6a3842
605960815a Merge commit '7a7c3148e2884c3299104dd1381cb9c7e0f6216d'
6c3e5ae71f Squashed 'lib3rd/libzmq.git/' changes from f00f464566..907ec22475
a409a1bf6d Merge commit '6c3e5ae71f5ab8d688be3343c7cee7fd0055722d'
739aa1d7c4 Merge commit 'f7849a64697977c250db6362152d58da15f84156'
f7849a6469 Squashed 'lib3rd/graphviz.git/' changes from f8b9e0351..1be9b598b
0c07e74f71 Squashed 'lib3rd/fmt.git/' changes from 5944fcad3..972d6a384
ebdf5d1467 Merge commit '0c07e74f71c34ee0b47a957f186bbf01fe904272'
a8b072532f Squashed 'lib3rd/cppzmq.git/' changes from a3e5b54c3..a2ef92ef5
08711af11d Merge commit 'a8b072532f4c196c67d69a4a226233bb1a49f301'
35b558a979 Squashed 'lib3rd/catch2.git/' changes from 37cbf4a4f..972d6a384
4f3e3c3cbe Merge commit '35b558a979a36c1a2bed4aba8df4c8a37f4db476'
972d6a3842 1. 将CLIPS的代码（包含扩展）做成了CMakeLists.txt的模式：便于多项目之间自动管理依赖和链接：）
3c5a3237ad 1. 清理了xclips的冗余花括号；）
b475573a4b 1. xclips的扩展zmq发送数据的长度不正确的BUG得到了修复：） 2. xclips的zmq扩展添加了一个zmq_close函数：）
0d06803c41 1. 补充了一个macos遗漏的xcconfig数据
b7884259b2 1. 将在xcode里面配置的各种项目属性拿到了独立的xcconfig文件中：这样后面类似的项目使用起来更方便：）
01b78370fc 1. 将CLIPS扩展里面的CLIPS协议更换为SEXP协议，同时将read-clips修改为read-sexp：这样，就可以用到CLIPS之外的LISP语言上：）
1d04fcff41 1. 完善了CLIPS的JSON扩展的value_for_path和set_value_for_path函数：）
6ccbcfcfe5 1. CLIPS的JSON扩展库，第一次编译测试通过了；）
187a3624a1 1. 给socket的扩展添加了block_reading的读取功能：实现【等待】能力；）
243f672a5d 1. 添加了zmq扩展的version函数；）
a58373b275 1. 给zmq的扩展添加了RAW的protocol
5c8b442d8c 1. 删除router的回显显示：这是多余的操作，用户可以自己来操作
c0f2d17728 1. socket可以发送任意的子节序列了：将之前的protocol从socket里面剔除了；同时读取的时候，不会发生阻塞了；）
873e4d9283 1. 修正了uuidgen的编译错误：因为我clips.h头文件里面定义了太多的【短宏】和boost的uuid库里面的LHS和RHS冲突了！
8fcd588bf6 1. 给CLIPS的扩展添加了一系列的utility函数：）
5481c08a71 1. 添加了expand-for-eval和expand-and-eval两个函数：但是有些限制，暂时没用上：（
8607930317 1. 添加了read-until的CLIPS扩展函数：主要用于process的处理：）
e6ca7a0ef3 1. 用宏的方式来简化了CLIPS扩展的代码量：主要是重复代码
9c0361dd82 1. 发现了一处zmq解析协议的BUG：需要同时支持CLIPS和JSON格式：）
0041fc0f82 1. 添加了process的terminal的支持：使得CLIPS可以直接利用第三方的命令行工具作为自己的子函数（微服务）：O） 2. 结果process的system-output函数也做到process模块里面了；） 3. 修复了一个clips::boolean类型的一个bug
9037810238 1. 重命名read-system为system-output：语义更加明确
b0757bba84 1. 调整了CLIPS的扩展，使其能够在iOS下也能正常工作了；）
1b2f1be749 1. 添加了read-system的函数：能够从命令行的输出中返回结果了；）
d5a4c88c4a 1. 添加了boost_1_73_0的代码：）
dedb452bfd 1. 关闭了一处CLIPS扩展的日志输出
c08ab5dafd 1. 给CLIPS扩展添加了mustache_render_with_partials函数：用于使用mustache模版引擎的partials功能：） 2. 重命名test-bench-execute为：test-benchmark：）
6af0c40726 1. 添加了CLIPS扩展支持的协议：CLIPS和JSON两种协议：）并改善了错误报告：）
bd391aa7c5 1. 修正了CLIPS的String扩展在输出给router时候的问题：之前只处理了输入，现在处理输出
71bfba3252 1. 将readcommand调整为read-command：这样就和CLIPS的read-number的习惯吻合了；）
cfb3ad7811 1. 给CLIPS的扩展添加了readcommand命令：用于读取一个完整的command：在使用ZMQ和socket的时候很必要：）
487dabcb55 1. CLIPS的socket扩展也能够一次读取一个完整的命令了；）
8182908268 1. 现在ZMQ的CLIPS绑定已经可以按照CompleteCommand的方式来缓存一个完整的命令在发送出去了；）
51177fed47 1. 给CLIPS的String的词法在只有【双引号】的基础上添加了【反引号】【单引号】功能支持：尽量减少了使用【 斜杠\】转义的需求！
a5c9065cbe 1. 给CLIPS扩展添加了mustache的模版引擎支持：）
84a678c09b 1. 成功的引入了ZMQ的功能到CLIPS扩展中：）
fd2d7f74dc 1. 发现CLIPS的API里面的argumentCode和expectBits有关系，但是并不一样！！！
013f018f34 1. 发现了测试中的一些bug：对CLIPS的扩展的test_bench功能进行了测试：）
791cd81896 1. 重命名select_action为create_primitive_value：更加贴近具体的意义
f37bdc52fb 1. CLIPS的扩展终于完全正确了：（read）已经可以读取到正确的值了：）之前没有使用RouterUnreadFunction
9b102f94bb 1. 清理了clips扩展中的不需要的内容
8c5f26bb33 1. boost::asio的socket添加到了CLIPS中：也就是说，从今以后，xclips可以直接使用网络了；）
d6fa51b303 1. 改写了clips.hpp和clips.cpp文件，首次支持了network的router功能：还未经过严格的测试！
9d31a33723 1. 添加了libzmq的ios版本的ignore描述
ed464d0dc0 1. 添加了mstch.git的submodule：git的submodule被提交了；）
c0b533a865 Merge commit '7f82b73a2f035d403a7130fc1f24af8bdea2603d' as 'lib3rd/mstch.git'
7f82b73a2f Squashed 'lib3rd/mstch.git/' content from commit 0fde1cf94
774da9e0ef 1. 添加README的内容描述了mstch.git的subtree和submodule：）
77f83483f2 1. rpc.git子模块的路径错误：删除之！
a6c208be67 1. 添加了rpclib.git的子模块：）
3859c03acd Merge commit '2c2a7ed46e66d3f950e8b6a7535a426d74e9ba05' as 'lib3rd/grpc.git'
2c2a7ed46e Squashed 'lib3rd/grpc.git/' content from commit c07ddb4504
8f9fb5bb54 1. 添加了grpc的子模块 2. 添加了备注到README
e36912c152 1. 确保CLIPS_unicode的clips_core_6_40在macOS和iOS下都可用：主要区别是system函数，iOS下不可用
ddec83cd12 Squashed 'lib3rd/nlohmann-json.git/' content from commit 456478b3c
3424cfdfa5 Merge commit 'ddec83cd12c8291848d6f0fffffd2d6632d46f4c' as 'lib3rd/nlohmann-json.git'
2e40a6d3ae 1. 忽略了libzmq.git和rttr.git的build文件：）
243f5ce3a3 1. 调整了yoga.git的编译选项：使得其能够在iOS和macOS下都能够使用：）
4144a547fa 1. nlohmann-json.git的subtree制作错误：需要修正！
56385dfb0c 1. 修正GraphViz的sincos链接的问题：系统的sincos是C++的Symbol，C暂时不能用！！！
5c752390a7 1. 调整GraphViz的plugin代码从【SHARED】改为【STATIC】形式：且在xcode的linker中添加【-all_load】链接选项；然后将union_find.c从libspine.a中剔除（和libcommon.a重复了），终于链接通过了：）
9fa0502000 1. 修改graphviz.git的subtree代码：使其能够在macOS和iOS下正常使用：）
d22bbd6573 1. 添加了boost_1_72_0的源代码：）
6a1e39def2 Merge commit 'c599d74aa6c40018e53a4248c4df0ef3da4be3ac' as 'lib3rd/clips_uml.git'
c599d74aa6 Squashed 'lib3rd/clips_uml.git/' content from commit 7bd70cb68
ab6550485e Merge commit 'b674b6386c63840269a33c3ae6c9ebdcad4499d0' as 'lib3rd/clips_core_6_40.git'
b674b6386c Squashed 'lib3rd/clips_core_6_40.git/' content from commit 516c97053
eb2a817ed4 1. 更正了添加subtree的脚本：前面有错误！
65f786ffec Squashed 'lib3rd/graphviz.git/' content from commit f8b9e0351
772fdd4309 Merge commit '65f786ffecb67ad12562461c5004ae1243d3d1b8' as 'lib3rd/graphviz.git'
93e55cb88a Merge commit '958153ed0dc0c1eb8d56efddfff1b3b2eba06f91' as 'lib3rd/nlohmann-json.git'
958153ed0d Squashed 'lib3rd/nlohmann-json.git/' content from commit 6ad0a586e
b00486b488 Merge commit '1bdf861f36fe2684a8a8c8ab33b2fef4c416234f' as 'lib3rd/rttr.git'
1bdf861f36 Squashed 'lib3rd/rttr.git/' content from commit b16fccf0f
5fc0beca1a Merge commit '3dff2711ebf2329c63a2321ec4f4e760e202cbfc' as 'lib3rd/cucumber-cpp.git'
3dff2711eb Squashed 'lib3rd/cucumber-cpp.git/' content from commit dd424c1a9
67e0ed5d6c Squashed 'lib3rd/yoga.git/' content from commit a96a36ef5
dd876f76fd Merge commit '67e0ed5d6c1dfdbe59205bf56afc354e54416261' as 'lib3rd/yoga.git'
b2454f0c14 Squashed 'lib3rd/fmt.git/' content from commit 5944fcad3
e61dae7b09 Merge commit 'b2454f0c14c18e13cb71a8be0b25ec8d0c96591b' as 'lib3rd/fmt.git'
07d93fd16b Merge commit '6f6c4814e5c78cea60e31b9921ce50e8a8f86402' as 'lib3rd/rpclib.git'
6f6c4814e5 Squashed 'lib3rd/rpclib.git/' content from commit 3b00c4ccf
1dd0834682 Squashed 'lib3rd/libzmq.git/' content from commit f00f46456
53274f487f Merge commit '1dd083468264c4604aee3ae024704ba5e4e973cf' as 'lib3rd/libzmq.git'
aacec21578 Squashed 'lib3rd/cppzmq.git/' content from commit a3e5b54c3
2f22b31685 Merge commit 'aacec21578be08301d16795093d53773ac327f0d' as 'lib3rd/cppzmq.git'
ee739256ef Merge commit '9f189958342e9b6a9d40afd6e455835953c86145' as 'lib3rd/cpplinq.git'
9f18995834 Squashed 'lib3rd/cpplinq.git/' content from commit 581f9a981
802b64f830 Squashed 'lib3rd/cppcoro.git/' content from commit 92892f31d
3b0c13428b Merge commit '802b64f830c24b12bab1877d888fc48ddf479f79' as 'lib3rd/cppcoro.git'
5ad8caf8f6 Squashed 'lib3rd/catch2.git/' content from commit 37cbf4a4f
6034403f33 Merge commit '5ad8caf8f6a59fd769d6f71edd718ab594dccb07' as 'lib3rd/catch2.git'
ff27304c91 Merge commit 'a03ac0b68644c6e26c26d4a8134656bfb50bcf89' as 'lib3rd/rxcpp.git'
a03ac0b686 Squashed 'lib3rd/rxcpp.git/' content from commit a71a89a27
6ad0a586e4 1. 添加了更新submodule的子子孙孙的README
07b5419f00 1. 添加完成了所有的submodule：）
1dc9e87948 1. 增加了subtree和submodule的说明文件
978b3336ff 1. 提交一个README来初始化git仓库
REVERT: 3a2b3bc625 Merge pull request #3943 from bjovke/small_fix
REVERT: c32462cde0 Small fix.
REVERT: c89390f0f5 Make including Clang optional
REVERT: efaeec33fc RELICENSE grant
REVERT: 2e87390656 Initialize some CMake variables as empty before build
REVERT: c95f7d0933 Merge pull request #3935 from bluca/fuzzers
REVERT: cf9ccbbd37 Problem: metadata is stored for PUB sockets and never processed
REVERT: 821ab88f96 Problem: XPUB leaks unprocessed metadata on close
REVERT: b5a8825542 Merge pull request #3930 from bluca/fuzzers
REVERT: 38349198a6 Problem: MSAN complains about uninitialised buffers in CURVE greetings
REVERT: 35c4c22c81 Problem: z85 decode test might not always get valid input and pass
REVERT: 85e198c5b4 Problem: wrong testcase name in z85_decode_fuzzer
REVERT: 1ac753979a Problem: z85_decode fuzzer does not run regression tests with corpora
REVERT: 51c90a6cd5 Problem: z85_decode fuzzer fails if fewer than 5 bytes are passed
REVERT: c1d195641d provide minimal support for TSAN (#3929)
REVERT: 6e62fb19b4 Merge pull request #3925 from bjovke/timers_issue
REVERT: 2887c0fbb1 Problem: Usage of invalidated iterator of _timers container in zmq::poller_base_t::execute_timers (). Solution: Safe iteration through _timers container, valid only for std::multimap (currently it is).
REVERT: 907ec22475 Merge pull request #3922 from bluca/fuzzers
REVERT: 55dfa239ff Problem: build fails with Clang 10
REVERT: 8df0d99cd8 Merge pull request #3921 from bluca/fuzzers
REVERT: 2d23b599f2 Problem: test_bind_fuzzer does not use corpus for regression tests
REVERT: dccf1723cc Problem: invalid address results in out-of-range string access
REVERT: 3033112645 Merge pull request #3918 from bluca/fuzzers
REVERT: 6815138501 Problem: unfinished message can be leaked by client pipe
REVERT: 6439d32254 Problem: fuzz tests do not check that legitimate clients work
REVERT: afacdbeccf Merge pull request #3913 from somdoron/delay_bind
REVERT: ad3b36ab95 problem: test_xpub_manual is flapping
REVERT: e7f0090b16 problem: zeromq connects peer before handshake is completed
REVERT: 18cacf2ec1 Merge pull request #3910 from bluca/obs_release
REVERT: 364ae768fe Problem: removing latest_branch breaks ABI CI job
REVERT: 4a863e334a Merge pull request #3909 from nyfix/std
REVERT: f474b226b6 allow C/C++ standard to be specified at build time, default to C++11 if supported
REVERT: 820efb31bd Merge pull request #3908 from bluca/obs_release
REVERT: e1d07b61ca Problem: release script for OBS build fails often
REVERT: 0244d809a2 Merge pull request #3905 from bluca/fuzzers
REVERT: fb9d055578 Problem: test_bind_curve_fuzzer might get stuck on some input
REVERT: c33da0ea5b Problem: we lack an (internal) definition of severity for security issues
REVERT: 675a007d74 Problem: SECURITY.md does not mention 4.3.x series
REVERT: abb315a6da Problem: potential memory leak in test_connect_curve_fuzzer
REVERT: be77a8d932 Merge pull request #3903 from bjovke/msvc_cplusplus
REVERT: a1d82598bb Merge pull request #3904 from somdoron/CHANNEL
REVERT: 3da84c6d06 problem: no thread-safe alternative for ZMQ_PAIR
REVERT: 804d528114 Problem: MSVC always reports __cplusplus macro value as 199711L. Some newer features are switched off even with latest Visual studio version. Solution: Add check for MSVC version along with __cplusplus check.
REVERT: 28cb820f4f Merge pull request #3902 from bluca/fuzzers
REVERT: 98efa79f54 Problem: ZMQ_DISABLE_TEST_TIMEOUT does not work anymore
REVERT: 397ac80850 Problem: ZMTP v1 static allocator is needlessly resized
REVERT: 061ce6cea1 Merge pull request #3901 from bluca/fuzzers
REVERT: 5fd0711196 Problem: memory leak in test_connect_null_fuzzer
REVERT: 243503c29e Problem: set infinite timeouts on some tests by mistake
REVERT: f7b215c639 Merge pull request #3900 from bluca/fuzzers
REVERT: fd3e5daaeb Problem: fuzzing Github action ran on pushes on forks and fails
REVERT: 346f8b8b20 Problem: uninitialised error in testutil helper
REVERT: 5819867cd3 Problem: fuzzer curve tests use random keys
REVERT: d7e58fc880 Merge pull request #3899 from bluca/fuzzers
REVERT: 9f94aa866f Problem: oss-fuzz images not tested on PRs
REVERT: 5b7f67a822 Problem: memory sanitizer not enabled in CI
REVERT: c2ffe2e6d2 Merge pull request #3897 from bluca/fuzzers
REVERT: 2ac5ee7307 Problem: test_hello_msg binds to hard-coded port and fails when it's in use
REVERT: 04ecff399b Merge pull request #3896 from bluca/fuzzers
REVERT: 3770937de3 Problem: we want to check for undefined behaviour in the CI
REVERT: 0c5396849b Problem: syntax errors in ci_build.sh
REVERT: cdd9e9d1f4 Problem: Travis uses old-old-old-stable Ubuntu by default
REVERT: 96d3cb39e4 Problem: fuzz input which causes extra-large message allocation not stored
REVERT: 9ab3fbeee2 Problem: we want to have multiple seed corpora per fuzzer binary
REVERT: c4fd6dfea7 Problem: sanitizer tests cannot allocate much memory
REVERT: 7df845fb82 Problem: memory sanitizer detects uninitialised global variable usage
REVERT: 309d1f1cb7 Merge pull request #3894 from bluca/fuzzers
REVERT: 6b259224ee Problem: fuzzer regression tests do very little
REVERT: c8e62cb2e0 Problem: no dictionaries and seed corpora for fuzzers
REVERT: 60ccf54fa6 Problem: sub/cancel broken with CURVE
REVERT: 534580c31d Merge pull request #3893 from gummif/gfa/blob-ref
REVERT: 103e39bd6f Merge pull request #3892 from gummif/gfa/poller-event
REVERT: 47a080aac0 Problem: extra blob copy
REVERT: 284d90a436 Problem: unnecessary event struct and UB
REVERT: e05fe370fe Merge pull request #3890 from gummif/gfa/retfd
REVERT: e18772f942 Problem: -1 used for invalid socket
REVERT: aa29f7caff Merge pull request #3889 from bluca/fuzzers
REVERT: 1443c0e787 Merge pull request #3887 from gummif/gfa/unify-fd
REVERT: 5867d7cf5f Merge pull request #3888 from gummif/gfa/poller-fd
REVERT: d426f2ab0c Problem: Multiple fd_t definitions
REVERT: a909e7296d Problem: testutil build broken with gcc 4.4 on CentOS 6
REVERT: 882cb6fdfb Problem: static analysis shows dead store in testutil
REVERT: 12a2f81717 Merge pull request #3885 from bluca/fuzzers
REVERT: bf22a9f3e9 Problem: Poller event fd unspecified
REVERT: 96787c35f8 Problem: no fuzz testing for API with variable input
REVERT: 57df836381 Problem: no fuzz testing for CURVE
REVERT: 8e774f3cd6 Problem: no integration with fuzz testing
REVERT: c6d3bc68c8 Problem: ZMTP mocks duplicated across tests
REVERT: 4f35d1af1a Problem: using BSD sockets in test is duplicated across many tests
REVERT: c81a973cd8 Problem: assert macros not detecting errors from syscall that do not return -1 on failure
REVERT: 727637082f Problem: test_shutdown_stress_tipc fails sometimes
REVERT: b56195e995 Merge pull request #3882 from laplaceyang/relicense
REVERT: 491defdf12 RELICENSE: Grant from laplaceyang.
REVERT: 9984d43143 Merge pull request #3879 from somdoron/master
REVERT: 81056a7237 problem: appveyor is very slow
REVERT: a525323757 Merge pull request #3878 from Eelis/master
REVERT: f00f464566 Merge pull request #3866 from gummif/gfa/poller-refactoring
REVERT: 063f14a940 Problem: out-of-bounds array access in socket_poller::check_events.
REVERT: 0b32fb3629 Problem: poller item lookup can be simplified
REVERT: d882e807dd Merge pull request #3876 from somdoron/HELLO_MSG
REVERT: 08d94d0e16 Merge pull request #3877 from gummif/gfa/spinlock-fix
REVERT: 6ca07a30e3 problem: checking the wrong socket when sending hello msg
REVERT: 2745ac31d7 Merge pull request #3875 from bluca/test
REVERT: ff80089939 Problem: Spinning on atomics can cause hangs
REVERT: 5a78bad2a8 Problem: coverage CI job fails
REVERT: 7cac73401a Problem: test_many_sockets always fails on Windows
REVERT: ada6f0c058 Merge pull request #3871 from somdoron/DISCONNECT_MSG
REVERT: 7ce7b8b888 Merge pull request #3874 from shgalym/patch-1
REVERT: d0b5713709 typo fix root README
REVERT: 97a52af242 Merge pull request #3872 from gummif/gfa/poller-size
REVERT: 9c6738bb45 Problem: No support to query poller size
REVERT: 81444136d5 problem: router doesn't know when peer disconnected
REVERT: 4c1d720a47 Merge pull request #3870 from somdoron/HELLO_MSG
REVERT: 93da6763b0 problem: ZMQ_HEARTBEAT is not useful without sending an hello message
REVERT: 718ad8ab96 add wss transport and fix tipc tests when building using cmake on linux (#3857)
REVERT: 7276b6809a Merge pull request #3868 from gummif/gfa/poller-sleep
REVERT: ef4bb9aa5e Merge pull request #3865 from gummif/gfa/poller-fd-init
REVERT: 458d805eb6 Problem: poller sleeps forever if no events
REVERT: a468ac782a Problem: poller item fd uninitialized
REVERT: 7b1fef28f9 Problem: boilerplate when init msg from data copy (#3860)
REVERT: 347ff07c94 Merge pull request #3862 from gummif/gfa/poller-formatting
REVERT: fa2af05d47 Problem: Strange zmq_poller doc formatting
REVERT: ae45ac4e1f Merge pull request #3861 from gummif/gfa/send-doc
REVERT: cbdf075658 Problem: zmq_send doc does not match declaration
REVERT: 3c13e9222d Merge pull request #3851 from gummif/gfa/ts-int
REVERT: e1fc84141d Problem: ZMQ_THREAD_SAFE is not bool
REVERT: 323420c5ea Merge pull request #3850 from JSYoo5B/git-ignore-fix-track
REVERT: eceaaf360b Problem: executable sources are not tracked
REVERT: 876d4bfead Merge pull request #3849 from ferdnyc/zeromq-config-install
REVERT: a97158aa2a Add relicensing statement for ferdnyc
REVERT: 31569c78d9 Problem: CMake config doesn't support multiarch
REVERT: bb9135da4f Merge pull request #3847 from JSYoo5B/protocol-literals-refactor
REVERT: 38fd1fdc8e Problem: some cond. compile may cause problem
REVERT: 4f436ce00f Problem: some conditional compile was not applied
REVERT: ebd22ecf85 Problem: literals protocol names still remains
REVERT: 0c7ee438a8 Merge pull request #3848 from JSYoo5B/optimize-gitignore
REVERT: 2478887d4a Problem: gitignore is messed up
REVERT: 656205b5f9 Merge pull request #3844 from bluca/format
REVERT: f9417dab4d Problem: msg_t functions do not respect coding style
REVERT: 07d3687621 Merge pull request #3843 from JSYoo5B/man-udp-not-mentioned
REVERT: ded0d83e47 Problem: wildcard address with udp not mentioned
REVERT: 296beecd24 Problem: UDP is not mentioned in bind and connect
REVERT: f915971653 Merge pull request #3838 from JSYoo5B/osx-build-doc-issue
REVERT: 87f9e377dd Problem: building on OS X may failed
REVERT: 2206cb37e0 ip_resolver_t: Silencing C++-warning -Wnon-virtual-dtor (#3837)
REVERT: de0102e927 Fixes old Simon being in there
REVERT: 99cf1c2e96 Fixes tabs
REVERT: c0abfae0d4 Add relicense
REVERT: 0d42929193 Adds QNX as possible to compile on
REVERT: e765143b42 Merge pull request #3833 from bluca/news
REVERT: 4f45ac135a Problem: formatting not up to date
REVERT: 09476b3d7f Problem: NEWS out of date with latest changes
REVERT: e2de3b7986 Problem: no NEWS entry for ZMQ_RECONNECT_STOP
REVERT: debbe08fb8 add option to stop trying to reconnect on ECONNREFUSED (#3831)
REVERT: 66ee3ee46c Merge pull request #3832 from stac47/fix_unused_variable
REVERT: f0b0e80da0 Fix unused-variable warning in perf/proxy_thr.cpp
REVERT: c7e99cdc4c Merge pull request #3829 from gcsideal/master
REVERT: 76969bf51c Add relicense grant by Laszlo Boszormenyi (GCS)
REVERT: 98e82ddff3 Merge pull request #3828 from sappo/master
REVERT: 67e6a8c233 Problem: Usage of ANDROID_BUILD_DIR not documented
REVERT: e293b0b9b3 Problem: Setting TOOLCHAIN env vars should be done by helper
REVERT: 511d39c179 Problem: Unable to overwrite the ANDROID_BUILD_DIR
REVERT: 917921095e Merge pull request #3827 from sappo/master
REVERT: 1fc4f513f4 Problem: Tables in README are difficult to read
REVERT: 341f56ccac Problem: Android build is hard to understand
REVERT: d5bd1642d1 Merge pull request #3825 from bluca/relicense
REVERT: b4bfd0f058 Add grant by ninoles
REVERT: 52044b38f7 Merge pull request #3823 from somdoron/ZMQ_PEER
REVERT: 70bc7dd925 problem: zeromq doesn't has a thread-safe peer to peer socket
REVERT: 821685f249 Merge pull request #3822 from somdoron/GROUPMAXLENGTH
REVERT: 05194eb549 problem: maximum size of group doesn't match the RFC maximum size
REVERT: f17a794d59 Merge pull request #3814 from bluca/sub_cancel_decoder
REVERT: a7bb41ef77 Merge pull request #3820 from somdoron/WSENCODING
REVERT: 652834296b problem: ws_transport is missing the path the endpoint name
REVERT: 071ec1a9bb problem:Fallback to localhost in ws_address has no effect
REVERT: 6b75209f0e Merge pull request #3821 from bluca/relicense
REVERT: 8c618e0247 Grant from KLNikita
REVERT: 7bfd9512e6 problem: ws_encoder allocate a new msg for masking
REVERT: dca59c940e Merge pull request #3819 from bluca/relicense
REVERT: b7c1d932fb Grant by asafkahlon
REVERT: 38b6888c3e Problem: libzmq does not advertise ZMTP 3.1
REVERT: 253e9dd27b Problem: libzmq does not send ZMTP 3.1 sub/cancel commands
REVERT: d4af92cd15 Merge pull request #3818 from SCOREC/xlClang
REVERT: f4dff8eed6 relicense stmt
REVERT: 49ecde8d80 support compiling with IBM XL 16.1 w/ clang front end
REVERT: 0d073e0b67 Merge pull request #3816 from somdoron/SCATTER-GATHER-DOC
REVERT: 40de45396f problem: no docs for scatter-gather
REVERT: 27f2f5e745 Merge pull request #3815 from gummif/gfa/doc-typo
REVERT: ee32b833a7 Add relicence agreement
REVERT: f80830c4a8 Problem: Documentation for option name mismatch
REVERT: e7f802d1ac Merge pull request #3813 from sigiesec/code-style
REVERT: 21b8d5cff7 Problem: duplicated code in tests related to monitoring
REVERT: 495fb00b7e Problem: pointee types are unnecessarily non-const
REVERT: db8f4fba21 Problem: redundant inline/ZMQ_FINAL declarations
REVERT: 21d80e42a8 Merge pull request #3812 from pavel-pimenov/RELICENSE-pavel-pimenov
REVERT: c9845bfbf4 RELICENSE pavel-pimenov
REVERT: 84ec65482f Merge pull request #3808 from sigiesec/fix-test-monitor-to-be-checked
REVERT: d8851c5ca8 Merge pull request #3807 from sigiesec/fix-test-heartbeats
REVERT: 66094678d1 Problem: intermittent deadlocks/timeouts in test_monitor and test_security_zap
REVERT: 0a1fc44ed7 Merge pull request #3811 from sigiesec/fix-libsodium-1-0-0
REVERT: dfcca75d0b Problem: curve_encoding_t build fails with old libsodium versions
REVERT: 58b636675a Problem: on POSIX systems, all tests have a timeout of 60 seconds; disabling it via ZMQ_DISABLE_TEST_TIMEOUT doesn't work anymore
REVERT: 577d64c007 Problem: intermittent timeouts on test_heartbeats
REVERT: 06bdebfe8d Merge pull request #3805 from sigiesec/curve-zerocopy
REVERT: f1513f96d8 Merge pull request #3806 from sigiesec/increase-reconnect-ivl-timeout
REVERT: e7043c815d Problem: intermittent timeouts of test_reconnect_ivl
REVERT: 4177bf7445 Problem: curve_encoding_t involves unnecesary heap allocations and copying of message data
REVERT: 2fa8185340 Problem: cannot use static libsodium library on Windows
REVERT: b01685ea0a Problem: no unittests for curve_encoding_t
REVERT: 48aed8df11 Merge pull request #3803 from bluca/relicense
REVERT: 499624927a Submitting permission to relicense under MPLv2 statement. (#3804)
REVERT: 78b94a4fcf Problem: testutil.hpp pulls in min/max macro definitions on Windows
REVERT: 4ad239acbc Problem: curve encoding and decoding are not easily testable
REVERT: a7b328a79a Revert "Problem: nuget internal metadata not maintained, no relicense"
REVERT: 7cceedda2d Grant by phreed
REVERT: f6de0dcafa Grant by xantares
REVERT: 687241e93f Grant by jimenezrick
REVERT: af5ac60631 Merge pull request #3801 from bluca/relicense
REVERT: d69f4dc855 Problem: commented out code in CMakeLists.txt
REVERT: d2a8be8da7 Problem: nuget internal metadata not maintained, no relicense
REVERT: a2b4cca266 Merge pull request #3802 from FredTreg/patch-1
REVERT: 0b66262bda Adding relicensing grant from FredTreg
REVERT: 2a6cc306da Grant by acsearle
REVERT: 3e394fddb4 Problem: naming convention violated by curve_mechanism_base
REVERT: fc8eec6d39 Add relicense from zoobab
REVERT: 75dfbae0d1 Merge pull request #3798 from std-any-emplace/msvc-cmake-clang-buildfix
REVERT: e73789620d Merge pull request #3797 from std-any-emplace/msvc-cmake
REVERT: e29495373e Add an extra space after "/Z7". Else the flag gets joined with the flag following this and clang-cl does not like that.
REVERT: 9b66fe2fba Both libzmq and libzmq-static are trying to work in precompiled.pch. Solution: enforce order. Fixes https://github.com/zeromq/libzmq/issues/3776.
REVERT: fde2a7a65d Merge pull request #3795 from sigiesec/final-override-analyze
REVERT: 406c423c9a Problem: C-style casts used
REVERT: 78961eeab7 Problem: non-modifying member functions not marked as const/static
REVERT: 41e3f14d6a Problem: ptr/ref parameters and local variables are non-const but never modified
REVERT: 759fed8e7e Problem: meaningless inline specified on function declarations
REVERT: f8f7913737 Problem: irregular loop conditions
REVERT: 628adf1cb7 Problem: inconsistent polymorphic inheritance
REVERT: 6d69898240 Merge pull request #3794 from sigiesec/fix-ctx-shutdown
REVERT: fbf85448c3 Clarify used C++-standard for compilation. (#3793)
REVERT: 36a8df2f8c Problem: sockets can be created after calling zmq_ctx_shutdown
REVERT: ebc9314339 Merge pull request #3790 from std-any-emplace/master
REVERT: 337ec270a4 EAGAIN: Refer to ZMQ_RCVTIMEO when receiving in blocking-mode
REVERT: 349e3e21db Merge pull request #3789 from std-any-emplace/master
REVERT: feb4f3d424 Fix minor typo
REVERT: 81d522bb66 Refer to zmq_socket because there are more thread-safe sockets than just client/server
REVERT: 72865e1b61 Merge pull request #3788 from colletted/feature
REVERT: 64fc106123 Problem: preious commit contains tabs Solution: replace tabs with spaces
REVERT: 851ae90319 Problem: No relicense agreement by Denis Collette Solution: added relicence agreement
REVERT: 1450681fb4 Problem: Issue #3766 states that strtok is not thread safe and should be replaced
REVERT: b7dd31db5a Merge pull request #3785 from bluca/wss_option
REVERT: 1f00a5bf59 Problem: WS build option is independent of DRAFT
REVERT: ddae567f16 Problem: ZMQ_WSS socket options not defined in src/zmq_draft.h
REVERT: 07052ad309 Merge pull request #3784 from bluca/news
REVERT: 68e6d8c07f Problem: NEWS out of date with latest changes
REVERT: d47b7fa065 Merge pull request #3783 from std-any-emplace/master
REVERT: c09b794ac6 Add a relicense-file.
REVERT: 8004c10f39 Documentation fix regarding thread-safety of zmq_poll/zmq_poller.txt. See https://github.com/zeromq/libzmq/issues/3778.
REVERT: 1b8a352480 Merge pull request #3782 from mloy/fix_websocket_without_path_with_test
REVERT: 65ce499bef Added relicense file mloy
REVERT: 67adc458df Roundtrip test for websocket url without a path
REVERT: c357c378d8 fix: websocket url without path
REVERT: 7ea72e5692 Merge pull request #3780 from somdoron/WSPINGPONG
REVERT: 60ef14f80b problem: ws_engine don't support WS RFC close control msg
REVERT: b120ec33a9 problem: ws_engine don't support WS RFC ping-pong
REVERT: b9b901e89d Merge pull request #3775 from ffontaine/master
REVERT: d59dcbcaeb acinclude.m4: add -latomic to PKGCFG_LIBS_PRIVATE
REVERT: a9cca0d568 Merge pull request #3772 from kanonet/mingw-lib
REVERT: c5dab4f48f mingw: add missing namespace
REVERT: 73eb1eac05 Merge pull request #3767 from bluca/libbsd
REVERT: 382c6d7186 Update array.hpp (#3769)
REVERT: c560a41473 Problem: mingw build broken
REVERT: 3832bd6b11 Problem: UWP build fails
REVERT: 21f763c872 Problem: libbsd not used on Travis
REVERT: 9d2899af87 Problem: libzmq.pc does not include gnutls dependency for static linking
REVERT: 2c2ff01e85 Problem: CMake does not look for NSS using pkg-config
REVERT: 068385c951 Problem: internal reimplementation of strlcpy used by default on Linux
REVERT: 246cc77efc Merge pull request #3763 from sigiesec/replace-strcpy
REVERT: 59095f9d06 Merge pull request #3765 from sigiesec/various-improvements
REVERT: 3dbbc28bb8 Problem: use of unsafe strcpy
REVERT: 334e837b88 Problem: ws_engine uses unsafe strcpy
REVERT: 14ab794671 Problem: local functions not declared static
REVERT: fa804c7783 Problem: pseudo-loops which had exactly one iteration
REVERT: 579aa5b440 Problem: non-loop-variables initialized via loop initializer
REVERT: d4cc592387 Problem: loop variable modified in loop step and body
REVERT: a64c3e6c7d Problem: redundant consecutive return statements
REVERT: ddbf45cf8d Problem: redundant break after return
REVERT: 2256bd5b0b Problem: unnecessary copying of string literals
REVERT: 4c3f115469 Problem: raw malloc used unnecessarily
REVERT: 30e2398e67 Problem: WSS-specific members and options are compiled without ZMQ_HAVE_WSS
REVERT: 9e548bd591 Problem: insecure and inefficient strcpy used
REVERT: 3e7995f7f7 Merge pull request #3758 from sonoware/fix-set-cpu-affinity
REVERT: 8089529148 Problem: ZMQ_HAVE_PTHREAD_SET_AFFINITY not set correctly
REVERT: 3a3192e983 Adds RELICENSE for sonoware
REVERT: eb54966cb9 Merge pull request #3757 from sigiesec/fix-windows-signaler-regression
REVERT: 9f16513ebe Problem: loop sending signaler event is obscure
REVERT: 3ace237988 Revert "Removed unreachable code paths"
REVERT: 9b67fe8a98 Merge pull request #3755 from sigiesec/more-improvements-analyze
REVERT: b88b12c77c Problem: sonar has no access to git history
REVERT: f60f909899 Problem: missing use of C++11 = delete and = default
REVERT: 86d7de38ca Problem: redundant empty destructor
REVERT: 400107d765 Merge pull request #3754 from sigiesec/code-improvements-analyze
REVERT: 76460c5e17 Problem: clang-format outdated
REVERT: f8adf9ea55 Problem: unnecessary value parameters
REVERT: cb2b377d9f Problem: redundant else after return
REVERT: 1d9c6bcf09 Problem: unittest_udp_address not properly formatted
REVERT: fdabd73da6 Problem: parameters not const where const possible
REVERT: 84267e734b Problem: inconsistent parameter names on definition/declaration
REVERT: cd954e207d Problem: use of C-style casts
REVERT: a83c57d0bb Problem: identifiers not conformant with naming convention
REVERT: 18edd28955 Problem: clang version used for analysis is outdated
REVERT: de3e03c147 Problem: new clang-tidy contains checks that do not apply to libzmq
REVERT: b9ddf62261 Merge pull request #3752 from sigiesec/update-sonar-scanner-analyze
REVERT: d2fbfa7bd8 Problem: sonar-scanner binary is outdated and no longer available
REVERT: df993d113c Merge pull request #3751 from sigiesec/windows-domain-sockets-signaler
REVERT: cf7e0fb066 Problem: test_capabilities fails on Windows when IPC support is available
REVERT: 76b7478290 Problem: there is no VS2019/IPC build job
REVERT: ca552d563f Problem: listener socket uses TCP loopback connections which sometimes go awry
REVERT: bd4c2d60ba Problem: zmq::listener_t::create_wildcard_address not reusable in ip.cpp
REVERT: 3bcaea535c Problem: zmq_fdpair function is very long
REVERT: 65d2f1f498 Problem: if IPC enabled libzmq does not compile when in uwp build (#3747)
REVERT: 51bf2aff35 Merge pull request #3746 from drolevar/master
REVERT: 5a854780f2 Problem: cannot send arbitrary data from XSUB to XPUB.
REVERT: 85df75584e Merge pull request #3743 from bluca/test_ws_bindport
REVERT: 00a448b1f0 Problem: WS tests bind to hard-coded TCP port and fail when ran in parallel
REVERT: a61db18eee Problem: WSS LAST_ENDPOINT returns WS transport
REVERT: c711941e9a Problem: wildcard port binding does not work with WS sockets
REVERT: 79d75f017c Problem: WS sockets return TCP protocol strings with ZMQ_LAST_ENDPOINT
REVERT: 75d9d84100 Merge pull request #3744 from liedtkeInTUM/fix_output_name
REVERT: 0cca4b2ce9 Add relicense statement
REVERT: d9d4dbbbd4 Problem: static libs are generated without given basename
REVERT: 0f9dd85e89 Merge pull request #3741 from drolevar/master
REVERT: 04761133bf Fix zmq::select_t::loop formatting
REVERT: d5198693e8 Add relicense grant for Andrij Abyzov
REVERT: 108977c838 Change XSUB -> XPUB multipart message processing.
REVERT: e0d9e21374 Merge pull request #3738 from eldruin/external-output-name
REVERT: 0605d06f1e Add license grant
REVERT: 0bd8f70264 Allow renaming library from the outside
REVERT: 97df2dac3a Merge pull request #3735 from viciious/no-libsodium-spec
REVERT: e2e0f5c5f0 Add the relicense statement
REVERT: 39c63994f9 Remove the superfluous build requirement of libsodium-devel
REVERT: b788270bda Merge pull request #3734 from somdoron/tls_key_expired
REVERT: a1aeae92cd problem: test_wss_transport expired
REVERT: af86d93d5f Merge pull request #3726 from bluca/capsh_option
REVERT: c57b2a5cc4 Merge pull request #3729 from bluca/fd_oob
REVERT: 9ced36e407 Problem: WSAEventSelect checks for FD_OOB, but select does not
REVERT: 854354bbd6 Merge pull request #3728 from njsmith/patch-1
REVERT: 4f188fe1ab Fix typo in email address
REVERT: 30e966fe1b Merge pull request #3727 from Botje/fix-poller-example
REVERT: 9e4f55d741 RELICENSE: Add grant for Dries Harnie
REVERT: ba6695c59a Problem: zmq_poller example is wrong
REVERT: bfa8cf3089 Problem: test_pair_tcp_cap_net_admin requires sudo but is enabled by default in CMake
REVERT: 805564b996 Merge pull request #3717 from sigiesec/add-win-ipc-support
REVERT: 302436515c Problem: windows socket error number cleared before saved to saved_errno
REVERT: 66d0f3511f Problem: ipc transport not supported under Windows
REVERT: a33f1101dc Merge pull request #3724 from benjdero/qol-improvements
REVERT: c1168b2374 Rename my license agreement
REVERT: c995032595 Fix android build fail check when using a different locale than english
REVERT: 0d0899bc0d Download the NDK only the first time
REVERT: 7ee36a177a Make sure the new file erase the old one and don't get a different name
REVERT: 947893e79f Keep the unzip quiet but make sure it doesn't fail silently
REVERT: 11d49d4f47 Merge pull request #3721 from bluca/gnutls_pkg
REVERT: 44b13a3aa4 Problem: libzmq-dev not installable with libczmq-dev on Ubuntu 16.04
REVERT: 86722502e9 Merge pull request #3720 from BenjaminDeroche/master
REVERT: a67f7b09a4 Add the relicense statement
REVERT: d2099b7593 Problem: Android build script is severely outdated
REVERT: 58deca3fb3 Merge pull request #3716 from sigiesec/fix-winxp-support
REVERT: 7f43e7ff75 Problem: build targeting Windows XP is broken
REVERT: 92e3226869 Merge pull request #3714 from mdionisio/remove_libm
REVERT: 9f65720dc0 Revert "Problem: pkg-config file cannot be used for static linking on CentOS 7"
REVERT: 683bf1d732 Merge pull request #3713 from mdionisio/useless_ceil
REVERT: f07f47b1e3 avoid to use ceil function
REVERT: f370cc0070 Add RELICENSE grant for mdionisio
REVERT: c1ff4c2b52 Merge pull request #3711 from yan12125/centos7-static-linking
REVERT: ca30ee78f6 Add relicense note for @yan12125
REVERT: 765c24740d Problem: pkg-config file cannot be used for static linking on CentOS 7
REVERT: 96bc59a6ce Merge pull request #3708 from bluca/gnutls_pkg
REVERT: 5bcb7dc5fe Problem: test_wss_transport doesn't compile without DRAFT
REVERT: 688213dbe4 Merge pull request #3706 from somdoron/master
REVERT: efb9c5698e Merge pull request #3707 from bluca/gnutls_pkg
REVERT: be83fe27e2 Problem: RPM builds do not print test failures logs
REVERT: 5bfb13032e Problem: packages not build with TLS support
REVERT: de845bd021 Merge pull request #3705 from somdoron/ws_mechanism
REVERT: cad10d9580 problem: some files are missing in git ignore
REVERT: 55c9e5037f problem: mingw and cygwin builds fail because of line error
REVERT: 2d6a66a81d problem: test_xpub_nodrop fails frequently
REVERT: 9b15658eb1 problem: zero-sized messages cause assertion when glibc assertion are on
REVERT: 539718f35a Merge pull request #3704 from somdoron/ws_mechanism
REVERT: 618227f63c problem: GNUTLS handshake is getting blocked because of timeout on some versions
REVERT: 810d3b43d1 Merge pull request #3703 from somdoron/ws_mechanism
REVERT: a9bb526403 problem: wss transport return incorrect return code for error
REVERT: 8d9acb72c1 Merge pull request #3702 from somdoron/ws_mechanism
REVERT: 2018be643a problem: valgrind complain about uninitialized value
REVERT: 977f137a83 problem: cannot check WS and WSS capability
REVERT: 41b9af2c79 problem: WS transport doesn't support mechanism
REVERT: 95797422aa Merge pull request #3701 from JonDyte/master
REVERT: 9e60dbe780 RELICENSE: add Jon Dyte license grant.
REVERT: 28f5c9545a Merge pull request #3700 from bluca/relicense
REVERT: 42408dd9aa Add grant by nixman
REVERT: 1c7ed2484b Merge pull request #3698 from ThePrez/ibmi
REVERT: 94f92b64ed Add IBM i to platform list
REVERT: fb2db30b19 Add relicense notice
REVERT: 25320a3c7b Add IBM i build support via 'os400' clause
REVERT: 9bb6b21423 Merge pull request #3695 from somdoron/tls
REVERT: 7296fb5b15 problem: unsecured websocket is rarely used in production
REVERT: 2e9b2f8843 Merge pull request #3696 from bluca/relicense
REVERT: a43f03316e Add grant by MongoDB, Inc.
REVERT: 8fe620901f Merge pull request #3690 from ipechorin/master
REVERT: 598d9babf6 Add relicense grant
REVERT: 4ebe92333e Merge pull request #3687 from trya/fix_conflate
REVERT: 2fe9dd9101 Problem: ZMQ_CONFLATE on PUB sockets delivers to only one subscriber at most
REVERT: 38b485dd75 Merge pull request #3685 from trya/relicensing
REVERT: f24c019ec1 Merge pull request #3686 from trya/doc_sock_block
REVERT: 45e1fc059b Add relicense grant
REVERT: 4378d71247 Problem: Documentation about socket blocking on send operations is incorrect
REVERT: 8d34332ff2 Merge pull request #3683 from dimpase/patch-1
REVERT: 3290faa8e6 relicense by dimpase
REVERT: a25e3168bb Allow "configure --disable-maintainer-mode"
REVERT: d76664017c Merge pull request #3681 from TobiSchluter/bugfix/dont_include_winsock2
REVERT: 38d144731d Add relicensing file
REVERT: cb211e4f1e Problem: inclusion of winsock2.h leads to ordering issues in user code.
REVERT: 3ecaf9fe6e Merge pull request #3680 from bluca/nss_pkg
REVERT: bd5220c505 Problem: nss package has different name on SUSE
REVERT: 9b4deeffdb Merge pull request #3679 from bluca/nss_pkg
REVERT: 3e4c90bbf4 Problem: package build fails on SUSE Tumbleweed
REVERT: 79535f39ca Problem: there are already many Travis builds
REVERT: 5dd433501f Problem: packages are not build with nss
REVERT: 9acdafb001 Problem: spec file includes libsodium-devel twice
REVERT: adf348b667 Merge pull request #3677 from somdoron/sha1_conflict
REVERT: 2fb9e93cfa problem: ci doesn't build with nss
REVERT: 9be8334938 problem: sha1 external module conflict with czmq
REVERT: e756743a12 Merge pull request #3674 from herbrechtsmeier/relicense
REVERT: f505e02988 RELICENSE: add grant from Stefan Herbrechtsmeier
REVERT: be0f52fe57 Merge pull request #3673 from jcfr/relicense-jcfr
REVERT: 0858038367 Merge pull request #3672 from bluca/relicense
REVERT: a643e58902 Relicense granby by RPGillespie6
REVERT: 064d5438e6 Merge pull request #3671 from somdoron/ws_protocol
REVERT: 52e0d965b3 problem: ws_engine doesn't check Sec-WebSocket-Protocol
REVERT: df1bec03c0 Merge pull request #3670 from somdoron/ws_host_path
REVERT: a48fdd6a7f problem: ws_engine doesn't send correct host and path
REVERT: 3413e05bd0 Merge pull request #3668 from UniStuttgart-VISUS/master
REVERT: 00cf36e933 Added relicense
REVERT: 2ec56d25b6 Safer regex replace, keeping options like "/Zc:twoPhase-" intact
REVERT: a084deb0b2 Merge pull request #3666 from diorcety/license
REVERT: 0bbe531861 Relicense: diorcety
REVERT: 4256e5413c Merge pull request #3664 from cbusbey/relicense
REVERT: ccabb48265 grant relicense
REVERT: 3d656e1ff1 Relicense: Jean-Christophe Fillion-Robin
REVERT: e33eedc663 Merge pull request #3661 from bluca/autoconf_static_only
REVERT: 223e9266e0 Merge pull request #3662 from bluca/relicense
REVERT: 9785e37875 Grant by psl-felipefarinon
REVERT: 2fe2ce1e37 Problem: static-only test run fails
REVERT: 21bfa58dad Merge pull request #3660 from bluca/relicense
REVERT: 10aea5c65d Grant by kreuzberger
REVERT: 826e7db7be Merge pull request #3659 from bluca/xpub_user_msg
REVERT: 6fb8ef0711 Problem: can no longer send user data from XSUB to XPUB
REVERT: c737e5720f Merge pull request #3654 from bluca/relicense
REVERT: 1925bdccb1 Grant by skaller
REVERT: 62fe9bf147 Merge pull request #3653 from rcxdude/master
REVERT: ecc2eb42ce Add relicense permission
REVERT: 017e7d3605 Merge pull request #3652 from mvilim/relicense
REVERT: a55f2a52e3 Relicense permission
REVERT: 3e3c3d7ba5 Merge pull request #3651 from brian-peloton/master
REVERT: 41a58da49c Merge pull request #3650 from bluca/relicense
REVERT: 8a3140064f Grant by dmeehan1968
REVERT: db8447d3b1 Merge pull request #3649 from bluca/relicense
REVERT: 757ae967cf Grant by paddor
REVERT: 1a0d52db05 Grant by mbarbisan
REVERT: e30186cb00 Merge pull request #3648 from bluca/relicense
REVERT: b566e2cc77 Grant by jbreams
REVERT: 48c6290888 Grant by DaiyuHurst
REVERT: a76233b727 Merge pull request #3647 from msune/msune_licensing
REVERT: ea9d948cde RELICENSE: add relicense agreement from msune
REVERT: b3582da8fb Introduce extended set/get methods for ZMQ contexts (#3642)
REVERT: 2aa87c94cc UDP engine aborts on networking-related errors from socket syscalls (2) #2862 (#3640)
REVERT: 7559d2daaf Merge pull request #3639 from sigiesec/fix-win-binaries
REVERT: c1377ff168 Problem: appveyor binary archives do not contain import libraries
REVERT: f48c86d077 UDP engine aborts on networking-related errors from socket syscalls #2862 (#3638)
REVERT: e492dea80e Merge pull request #3637 from spotify/relicense
REVERT: 74e7ee0e66 Add relicense agreement from Spotify AB
REVERT: 56ace6d03f Merge pull request #3636 from schulzch/cmake-precompiled
REVERT: 878f1d51f5 Add ENABLE_PRECOMPILED option.
REVERT: 9bb197e030 Merge pull request #3613 from TomzBench/mingw-fix
REVERT: 1d21d2f4e4 Merge pull request #3634 from bluca/relicense
REVERT: 205c52009d RELICENSE: add grant by Daniel Krikun
REVERT: e9b67001dd Problem: invalid syntax for calling convention on function pointer
REVERT: 19f2d9e529 Merge pull request #3633 from Neopallium/master
REVERT: d63a00b98f Re-license Robert G. Jakabosky (Neopallium)
REVERT: f4cbe4ba45 Add relicense grant
REVERT: 5de89531f2 Merge pull request #3632 from Suudy/master
REVERT: 65e67b32bf RELICENSE:  Add relicensing grant
REVERT: ab51e0a81f Merge pull request #3626 from bluca/relicense
REVERT: 48ea043311 Merge pull request #3630 from hnwyllmm/patch-1
REVERT: 5650bbab1d Adds relicensing grant
REVERT: 66a228ef46 Merge pull request #3628 from murphybytes/murphybytes-relicense
REVERT: 9d53203ccf relicensing
REVERT: e8e13c17ad Merge pull request #3627 from f18m/master
REVERT: e979988d66 RELICENSE: chymanfx
REVERT: 78c435044d Merge pull request #3625 from jlauenercern/master
REVERT: 95176a53a4 RELICENSE: Joel Lauener
REVERT: a979a99523 Add relicense grant (#3624)
REVERT: 057331e3f9 Merge pull request #3623 from miniway/relicense
REVERT: b00494226c Relicense permission
REVERT: c87215380a Merge pull request #3622 from jens-auer/master
REVERT: cc83fed11a Add relicense statement
REVERT: 8443313e0b Merge pull request #3621 from bluca/relicense
REVERT: 3c951f7d1c Merge pull request #3620 from bebopagogo/master
REVERT: 3bb2a0d487 RELICENSE: Aleksander Melnikov
REVERT: becf469865 Add relicense agreement from Brian Adamson
REVERT: e161907db9 Merge pull request #3619 from bluca/relicense
REVERT: 87988bf4c8 Problem: formatting error
REVERT: 6b71823ad0 Merge pull request #3618 from AxelNennker/master
REVERT: 3c8f4a431e relicense
REVERT: edc266b3ab RELICENSE: Manuel Segura
REVERT: c0db5c3ae3 Merge pull request #3617 from claws/relicense_permission
REVERT: cd4fac3a0c relicense permission
REVERT: db82835995 Merge pull request #3616 from dennisklein/relicense_permission
REVERT: c44be4aa60 RELICENSE permission
REVERT: 1ef3a68629 Merge pull request #3615 from drbobbeaty/master
REVERT: 4e7a58b983 Merge pull request #3614 from garlick/relicense_garlick
REVERT: 7d8c86241c Added my relicense doc
REVERT: 304843373c Add relicense agreement from Jim Garlick
REVERT: 64d58c432c relicense add
REVERT: ec0aa6cef6 Merge pull request #3612 from fanquake/travis_sudo_deprecated
REVERT: 87b81926aa no void pointer to store function pointer
REVERT: 114b1f9516 problem: no relicensing agreement for fanquake
REVERT: abe26f0dc3 problem: sudo:false has been deprecated by Travis CI
REVERT: 5f95e53e0f Allow to graph results from TCP links at 100Gbps nicely.
REVERT: 9cdef8aa0c Better script for performance tests
REVERT: b66b2857ad Merge pull request #3610 from hxw/master
REVERT: 4cd39feb68 Add re-license grant file
REVERT: 62d8346447 add DragonFly BSD to platforms list
REVERT: c3eab89e53 Merge pull request #3608 from hxw/master
REVERT: 72854e6342 problem: DragonFly BSD does not allow mapping global IPv4 addresses when IPv6 is used
REVERT: ba679bcce8 problem: configure for DragonFly need FreeBSD also defined
REVERT: 6b6043600e Merge pull request #3607 from f18m/master
REVERT: 877c32dc3d Add scripts to ease performance graph generation
REVERT: 21a0815f2f Merge pull request #3605 from bl0x/master
REVERT: 5a519e1686 Add RELICENSING statement for bl0x.
REVERT: 45243cd009 Fix build on SL6.9. Fix #3603.
REVERT: a8d19057b1 Merge pull request #3602 from bluca/formatting
REVERT: 4d5e97adac Problem: formatting errors introduced by #3601
REVERT: 9dcbdd1b09 Merge pull request #3601 from jacquesg/win32threadname
REVERT: b3123a2fd1 Problem: __try and __except isn't universally supported on windows
REVERT: 47fc979b2a Merge pull request #3600 from drbitboy/master
REVERT: 853aa9801e Problem:  include/zmq.h is not so much broken as inconsistent in           how it declares the file descriptor (fd) of a socket           in struct zmq_pollitem_t vs. struct zmq_poller_event_t
REVERT: 20a4e4d1be Merge pull request #3598 from ssbl/contributing
REVERT: 475a029514 Problem: PR template is mostly about contributing guidelines
REVERT: ed4317b0e9 Merge pull request #3597 from ssbl/redundant-check
REVERT: f07d88be09 Problem: redundant check in condition
REVERT: 49f4ef1759 Merge pull request #3595 from aixxe/master
REVERT: 63409579e7 Problem: Usage of 'if_nametoindex' not supported in Windows XP.
REVERT: 69e451c1fa Merge pull request #3594 from mancasg/master
REVERT: 1bbbd77ac4 RELICENSE: Mancaș George grant
REVERT: 13387c5cdc Problem: stream_engine use after free Solution: Don't allow concurrent heartbeat timers
REVERT: 60cca513a1 Merge pull request #3593 from jean-airoldie/doc_poller
REVERT: 1bd94a979d Problem: behavior of closing a socket registered...
REVERT: c83fa74767 Merge pull request #3591 from jean-airoldie/max_sockets
REVERT: 7675995fe8 Problem: incorrect ZMQ_MAX_SOCKETS default value in doc
REVERT: 49636f4c88 Merge pull request #3588 from inuik/master
REVERT: afa11b0dfd Copy debug libraries for debug builds
REVERT: a56d36b8e5 Merge pull request #3587 from somdoron/stream_engine_base
REVERT: 157b2a2ee0 problem: ws_engine duplicate code from stream_engine
REVERT: 184e7a55e5 Merge pull request #3585 from bluca/fixes
REVERT: 7262701876 Problem: build on centos6/ubuntu12 still broken
REVERT: efd7188760 Merge pull request #3584 from bluca/fixes
REVERT: 496c8eb05a Problem: missing copyright and license header from new file
REVERT: 10a0baf691 Problem: wrong copyright dates in newly added files
REVERT: 38c31154d0 Problem: build broken with older compilers
REVERT: 021c6a706b Problem: no license.txt file for external/sha1/
REVERT: 3692b26649 Merge pull request #3579 from somdoron/zws2
REVERT: feeed3f27e Merge pull request #3580 from sigiesec/use-libsodium-based-allocator
REVERT: 4756ff3046 Problem: use of tweetnacl vs. libsodium is ambiguous
REVERT: 39941a0c82 problem: browser cannot communicate with zeromq directly
REVERT: 1781cff37b Problem: plaintext secrets placed in insecure memory
REVERT: 92dbb4caee Problem: no C++ style secure memory allocator available
REVERT: 8a7a9cb90f Problem: clang-format produces C++11 style nested templated arguments
REVERT: d9dce8f068 Merge pull request #3578 from ssbl/unused-parameter
REVERT: e26f094193 Problem: unused parameter in benchmark function
REVERT: 9c5cf8573c Merge pull request #3573 from sigiesec/use-std-vector
REVERT: 02f7dca678 Merge pull request #3570 from bluca/static_analysis
REVERT: 1de4cf6ffa Problem: use of malloc is error-prone
REVERT: 77cd206100 Problem: errors do not fail ABI CI test
REVERT: eec972a5b4 Problem: unused variable in test tool
REVERT: c819eedd89 Problem: missing rc checks in udp_engine
REVERT: b5db4b4421 Merge pull request #3568 from somdoron/master
REVERT: 71decb996d problem: wrong api_key for bintray
REVERT: 89ac4a0f6c Merge pull request #3566 from TomMD/fix/leaks
REVERT: b99bf4e1ce Merge pull request #3567 from myd7349/fix-include-dir
REVERT: bb3fa9c048 Problem: Missing ZeroMQ_INCLUDE_DIR when only static lib is built
REVERT: 90ff30c086 Free memory when curve_client sends invalid ready message.
REVERT: 27057263cd Merge pull request #3565 from bluca/newver
REVERT: 491a0ae107 Problem: 4.3.2 is out, need new version
REVERT: a84ffa12b2 Finalize changelog for 4.3.2
REVERT: fa82aa1120 Merge pull request #3564 from bluca/news
REVERT: c2488ed520 Problem: packaging versions out of date
REVERT: f5f1880b58 Problem: NEWS not up to date for v4.3.2
REVERT: 0f01fb5134 Problem: markdown errors in zmq_getsockopt.txt
REVERT: 8e6bafcbe0 Problem: application metadata not parsed correctly when using CURVE
REVERT: ddd0da2f57 Merge pull request #3476 from TomMD/fix/memory-leak
REVERT: 367cedb7c6 Fix request-handling memory leak
REVERT: 2c89c069a9 Tommd relicensing statement
REVERT: 5368ae0571 Merge pull request #3562 from bear-metal/lourens-relicense
REVERT: 3ec1bf5096 Add relicense agreement from Lourens Naudé
REVERT: 5f8a7b1c22 Merge pull request #3561 from zeromq/secpolicy
REVERT: 153deece66 Problem: no security policy
REVERT: d5067df2dd Merge pull request #3559 from ssbl/inconsistent-naming-convention-fix
REVERT: 1186e9868a Problem: code doesn't follow libzmq naming conventions
REVERT: 4a855fba8c Merge pull request #3557 from bluca/docs
REVERT: 364561953a Problem: zmq_disconnect documentation is confusing and breaks semantics
REVERT: eba6fb2988 Problem: ZMQ_IN/OUT_BATCH_SIZE are dangerous
REVERT: a43c842e0d Merge pull request #3556 from ssbl/better-names
REVERT: 68b744fac5 Merge pull request #3555 from jean-airoldie/batch_size_sockopt
REVERT: d1e6fe19b4 Problem: variable and type names are not descriptive
REVERT: cfcab66c71 Problem: {in,out}_batch_size must be configured at compiled time
REVERT: 4904bf7177 Merge pull request #3550 from jean-airoldie/heartbeat_test
REVERT: 241b073fd3 Problem: missing heartbeat test for draft sockets
REVERT: fcf828d34b Merge pull request #3547 from jean-airoldie/unbind-doc
REVERT: 15dafb1c1c Problem: radix tree's apply function uses incorrect resizing logic (#3548)
REVERT: 4d933c28be Problem: disconnect & unbind doc is misleading
REVERT: b17e854f15 Merge pull request #3546 from skicc/patch-1
REVERT: 0503abb336 RELICENSE
REVERT: d2be018800 CMake: don't try to link with librt on MinGW
REVERT: 9534bbfc4d Merge pull request #3539 from guillon/dev-socks-tests
REVERT: 153418e175 Add tests for SOCKS proxy support
REVERT: 46b498e590 Merge pull request #3544 from somdoron/master
REVERT: e27a13a8ba problem: no artifacts for x64 on windows
REVERT: 8f66156aa3 problem: tests might fail and prevent deployment
REVERT: 27f9be1125 Merge pull request #3542 from guillon/fix-test-asserts
REVERT: f203064374 Problem: test assertions not reporting the right line number
REVERT: aa6b6440f2 Merge pull request #3541 from somdoron/master
REVERT: ee6755ff1d problem: appveyor with libsodium change the current directory and break the build
REVERT: 3cb1c377dd Merge pull request #3540 from somdoron/master
REVERT: 0a696d8774 problem: no artifact repository for windows
REVERT: aac3cd4d93 Merge pull request #3535 from bluca/format
REVERT: 321c288005 Problem: philippeleite relicense statement not added to the repository
REVERT: 3c06ec118f Problem: formatting errors
REVERT: 1fdb152b9d Merge pull request #3537 from philippeleite/patch-2
REVERT: 8a02f70706 pthread_equal to compare thread ids
REVERT: 2202587267 Merge pull request #3534 from guillon/dev-socks-basic-auth
REVERT: 58c30dc7d1 Add support for SOCKS5 basic authentication
REVERT: 68558bc394 Merge pull request #3532 from guillon/fix-socks-connect
REVERT: 42cfa697f2 Fix issues with SOCKS5 proxy connection
REVERT: 9736f57f08 Add RELICENSE grant for guillon
REVERT: 178f9e3f3c Merge pull request #3527 from rotty/pr/clarify-zmq_msg_send-wording
REVERT: fae26774f5 Problem: Unclear `zmq_msg_send` failure semantics
REVERT: 96b9eece15 Merge pull request #3521 from jackpimbert/master
REVERT: 940f54e7ce Problem: PGM doc missing info on high data rates
REVERT: 840b9ba4fa Problem: No relicense agreement by jackpimbert
REVERT: 4dca26767e Merge pull request #3518 from ackalker/fix-use-of-test
REVERT: 196cb723df Add RELICENSE entry
REVERT: 9a397666d2 acinclude.m4, configure.ac: Fix several non-portable uses of `test`
REVERT: cef806550c Merge pull request #3516 from moretromain/fedorafix
REVERT: 5b07a1199c Fix compiler error
REVERT: 2b63a89635 Merge pull request #3515 from moretromain/win-threadname
REVERT: 27005cc1ae Implement thread name on windows, cleanup thread naming internals
REVERT: 046ccfc408 Merge pull request #3513 from bluca/clang7
REVERT: 9cb266edaa Merge pull request #3512 from bluca/fixes
REVERT: bde18f3ede Problem: comments before ifdefs are wrongly formatted
REVERT: 5de3aa1555 Problem: clang-tidy 6 has issues with comments
REVERT: 19ff4d0b6a Problem: zmq_socket_monitor_versioned_typed duplicates zmq_socket_monitor_versioned
REVERT: 797439c8e2 Problem: typos in manpage entry for ZMQ_XPUB_MANUAL_LAST_VALUE
REVERT: 41be0f5386 Problem: new xpub option is in critical path
REVERT: a53dfe936a Problem: many unnecessary ifdefs covering new xpub option
REVERT: 9bcfc251f4 Problem: new test_xpub_manual_last_value not built by automake
REVERT: 2f98f7034b  Support XPub socket send last value caching to last subscription pipe with ZMQ_XPUB_MANUAL_LAST_VALUE. (#3511)
REVERT: 6b51f03377 Merge pull request #3509 from jean-airoldie/monitor_typed
REVERT: 8738ada00f Problem: Endpoints are sometimes not unbound quick enough
REVERT: 7836ec752c Problem: Potentially unitialized variable in #3508
REVERT: 3aca047b96 Merge pull request #3508 from jean-airoldie/monitor_typed
REVERT: 606a8f7967 Problem: Socket monitoring only allows ZMQ_PAIR
REVERT: e285fe6ea7 Merge pull request #3502 from sigiesec/fix-plain-hello-message
REVERT: 6e1c58e86e Problem: PLAIN HELLO message incorrectly uses WELCOME literal
REVERT: 65dd38b268 Merge pull request #3499 from sigiesec/fix-windows-build
REVERT: d46c580977 Problem: signature of zmq_poller_fd does is incompatible with regular error handling
REVERT: 548f31d4b4 Merge pull request #3498 from sigiesec/fix-windows-build
REVERT: 63c4d8be78 Problem: syntax error on Windows related to socket descriptor type
REVERT: d3f52b2b91 Merge pull request #3497 from sigiesec/fix-cmake-config
REVERT: 8996912cad Problem: generated ZeroMQConfig.cmake does not work when only static or shared library was built
REVERT: f41f51461f Merge pull request #3496 from sigiesec/cleanup-cmakelists
REVERT: 2d8ef84760 Problem: CMAKE_REQUIRED_INCLUDES used in a wrong way, check_function_exists is problematic
REVERT: 3e5843d073 Problem: include directives are cluttered throughout CMakeLists.txt
REVERT: 7c53567b93 Problem: extra character in option name
REVERT: 9e4b6632c2 Problem: misspelled ar program name
REVERT: 635f093744 Problem: redundant output in CMakeLists.txt
REVERT: ea109fcaab Merge pull request #3493 from moretromain/cmake-fix
REVERT: a565718505 RELICENSE: moretromain grant
REVERT: 8eee5eb1a8 Fix a typo in CMakeLists.txt
REVERT: 7971be930b Merge pull request #3491 from bluca/gcc9
REVERT: ca2e8b3b19 Problem: build broken on Fedora 30
REVERT: 8c8110a136 Merge pull request #3490 from jean-airoldie/zmq_poller_fd_doc
REVERT: cdbe120738 Problem: No invalid pointer handling for zmq_poller_fd
REVERT: 19dd8195be Problem: Missing doc & unit tests for zmq_poller_fd
REVERT: 92eedc5716 Merge pull request #3489 from normano/master
REVERT: dad917e04e fixed date
REVERT: 97b51e81d3 Added RELICENSE for normano contribution
REVERT: 9780011846 Fixed zmq_socket_monitor example
REVERT: 9bee21b364 Merge pull request #3484 from jean-airoldie/poller_fd
REVERT: 05aadc4e38 Problem: no relicense agreement by jean-airoldie
REVERT: 046534480b Problem: Cannot get thread safe socket fd
REVERT: 501f9d8da4 Merge pull request #3483 from ssbl/dead-code-fix
REVERT: e9678efe00 Problem: unused Windows-specific code in sleep_ms
REVERT: e3a96778b6 Merge pull request #3481 from neheb/patch-1
REVERT: 761af4939f Add RELICENSE entry
REVERT: 091e15a28d Add <ios> include to fix uClibc++ compilation
REVERT: 9067e3ac9d Merge pull request #3480 from ipa/zeromq-3479
REVERT: 0a5ca642e2 corrected name in the signature of relicense statement
REVERT: c65fa0a34d Problem: QNX crosscompiler needs additional parameters to chosse the correct platform
REVERT: c531514c33 Problem: no relicense agreement by ipa
REVERT: e1a895917c Problem: libzmq does not build on QNX 6.6 using CMake #3479
REVERT: 494a82f0e7 Merge pull request #3478 from Omegastick/master
REVERT: 7d26319247 Problem: No relicense statement for Omegastick
REVERT: 43e398ed86 Problem: Radix Tree benchmarks break when project is used as a submodule
REVERT: cc99846156 Merge pull request #3477 from bluca/manpages
REVERT: f4b0f327de Problem: markup error in zmq_socket.txt
REVERT: 8f77150c80 Problem: man errors, can't break lines
REVERT: de4d69f597 Merge pull request #3473 from bluca/format
REVERT: 3c21eed0a1 Problem: CI format check fails
REVERT: 5b140baf45 Merge pull request #3472 from bluca/hardening
REVERT: 320ed68ce9 Problem: immediate binding hardening not used by debian package
REVERT: db7bdd1b1a Some explicit endpoint type changes to support GCC 5 (#3468)
REVERT: 6c613902da Merge pull request #3467 from sigiesec/improve-hwm-pubsub-test
REVERT: b9041bf78c Problem: missing information on assertion failure
REVERT: d328f90bb7 Problem: inadequate recv variant used which assumes 0-terminated string
REVERT: a5ee4fb001 Problem: code duplication for multiple transports, multiple test cases combined in one
REVERT: 06f5a6f282 Problem: use of generic assertion macro
REVERT: d4401b230b Problem: test case not making use of test_bind helper function
REVERT: bdccfe4097 Merge pull request #3464 from bluca/ericcson_grant
REVERT: 2de7f9ccf9 Relicensing grant from Ericsson
REVERT: e20861a065 Merge pull request #3463 from sigiesec/fix-3269
REVERT: 42e27b7d0d Problem: socket returned by ZMQ_FD cannot be used with CreateIoCompletionPort
REVERT: 25bb43c33a Merge pull request #3461 from sigiesec/refactor-tests
REVERT: 47dba21005 Problem: code is unnecessarily imperative
REVERT: bfec30b1e5 Problem: test_address_tipc is unnecessarily verbose
REVERT: 386de33030 Problem: code from bind_loopback_tipc is duplicated
REVERT: 0e0bead3cf Problem: code from bind_loopback_ipc is duplicated
REVERT: 7f64b925aa Problem: code from bind_loopback_ipv4 is duplicated
REVERT: 8dc933f2ed Problem: non-expressive test case name
REVERT: 34999d5069 Problem: s_send(more) can be replaced by safer send_string_expect_success
REVERT: af4fa22fd8 Problem: default test setUp/tearDown functions duplicated in many test programs
REVERT: 2b80dd7add Problem: test_bind used with explicit endpoint where bind_loopback_ipv4 could be used
REVERT: 454c0b834a Merge pull request #3460 from bluca/borken
REVERT: dc91981df7 Problem: removing header from testutil.hpp breaks unittest build with gcc8
REVERT: 6d77558c77 Merge pull request #3459 from sigiesec/migrate-testutil
REVERT: c2cd2966ab Problem: no documentation of testutil_unity functions
REVERT: de622c8198 Problem: functions are unnecessarily declared in header
REVERT: 1450830611 Problem: unused include directives
REVERT: d0c4402daf Problem: needless use of macros
REVERT: a62e9d35be Problem: internal functions present in header file
REVERT: 5d74eba64a Problem: remaining basic assertions
REVERT: 5b40bdb194 Problem: redundant specific of testutil headers
REVERT: 347708bcf2 Problem: test utilities are in headers and recompiled for every test
REVERT: cbd4157638 Problem: tests without test framework
REVERT: 9528983d95 Problem: tests without test framework
REVERT: 90a4d268d9 Problem: tests without test framework
REVERT: 6ed03e9333 Problem: tests without test framework
REVERT: 75cd23d6af Problem: tests without test framework
REVERT: 06e713e9e0 Problem: tests without test framework
REVERT: 4ab381436d Problem: tests without test framework
REVERT: 6f083df5fb Problem: tests without test framework
REVERT: 2f40d21618 Problem: access to moved object
REVERT: 740780293a Problem: tests without test framework
REVERT: e17232f725 Problem: possible use-after-free
REVERT: f083e60d8c Problem: use of extra context
REVERT: 924d47f818 Problem: tests without test framework
REVERT: f4b9cc994d Merge pull request #3457 from sigiesec/migrate-zap-test
REVERT: 0266d4ac27 Problem: testutil_monitoring not using unity
REVERT: f46a96926c Problem: test_security_curve uses custom assertion macro
REVERT: efaca82bff Problem: testutil_security not using unity
REVERT: 6e0724609a Problem: errno not output on test failure
REVERT: 669fc4df5a Problem: test_security_zap not using a test framework
REVERT: 99e53698c5 Merge pull request #3456 from bluca/test_fd_port
REVERT: 168aa83d08 Merge pull request #3453 from panlinux/validate-group-before-using-1462
REVERT: 98875a9ddc Problem: TCP and UDP test sockets use hard-coded port
REVERT: 830b3428ec Problem: new test binary not ignored
REVERT: 1f656fd19d Problem: no relicense agreement by panlinux
REVERT: d81f3ec21c Problem: test_filter_with_supplemental_process_owner_gid fails
REVERT: 645df4e602 Merge pull request #3449 from sigiesec/migrate-security-tests
REVERT: 17c47da01c Merge pull request #3452 from jacquesg/strnlen
REVERT: b26542bbfc Problem: strnlen may not be available
REVERT: c1d2e71861 Merge pull request #3451 from jacquesg/devpoll
REVERT: 04f5ae20af Problem: Solaris 10 had unknown, active users
REVERT: 8759d20d4b Problem: tests link to two different flavours of the runtime library, causing heap corruption
REVERT: ae1bc03e9e Problem: artifacts published on appveyor are missing pdb files
REVERT: 8a2296711d Problem: epoll_t no longer requires _worker
REVERT: 212ab4f834 Problem: /dev/poll doesn't compile
REVERT: 36a16ec7d1 Problem: test_security_plain not using a test framework
REVERT: 223ef516b6 Problem: test_security_null not using a test framework
REVERT: bd6fa4bbb3 Merge pull request #3445 from bluca/relicense_hp
REVERT: f4f2ebfe95 Update HPE statement as requested by the grantor
REVERT: 1198a8ec91 Merge pull request #3444 from bluca/relicense_hp
REVERT: 84e9a1a022 Relicensing grant from HPE
REVERT: 1e9a8c97ea Merge pull request #3441 from bluca/test_xpub_nodrop_flaky
REVERT: 0bbd38f5d4 Problem: text_xpub_nodrop sometimes fails
REVERT: 2f5c2f4a48 Merge pull request #3440 from emtr/proxy-performance-fix
REVERT: d41ed6180b Proxy performance fix, ticket #3439
REVERT: 2e6464864e Merge pull request #3438 from sigiesec/fix-appveyor-test-execution
REVERT: 028aecc6d9 Problem: appveyor build always fails
REVERT: 73159a8fab Problem: race condition in test_hwm
REVERT: 14fd7505bc Problem: race condition in test_xpub_nodrop
REVERT: 56c94757ff Problem: analysis build failing due to warnings-as-errors
REVERT: a95c4ab404 Problem: test_decrease_when_full is disabled for Windows
REVERT: 828ed69d63 Problem: test_decrease_when_full test case in test_sockopt_hwm does not run reliably under Windows
REVERT: 36d265ee7d Problem: redundant parentheses in return statements
REVERT: 0c363fbb76 Problem: argument is unnecessarily copied
REVERT: 995e0a3a26 Merge pull request #3436 from sigiesec/fix-reconnect-ivl-calculation
REVERT: d61d662ecb Problem: reconnect interval exponential backoff and may lead to integer overflows
REVERT: 46061508bf Merge pull request #3435 from trevorbernard/relicense
REVERT: 12238f6bb1 Issue #2376 - Add Trevor Bernard's permission to relicense
REVERT: 54bf9c6a59 Merge pull request #3434 from brc859844/master
REVERT: 23de068fe4 RELICENSE: Brett Cameron
REVERT: d54b524976 Merge pull request #3433 from rlenferink/relicense-info-michelet
REVERT: cc8b119c69 RELICENSE: Corrected info for leonarf
REVERT: 35aaa5425f Merge pull request #3432 from rlenferink/relicense-shancat
REVERT: 6f66b5a676 Adding grant from shancat
REVERT: 534ac7ef0d Merge pull request #3431 from steve-o/master
REVERT: bab50feb50 Add GitHub authors.
REVERT: 24d5bcfe4d Relicense permission for work by steve-o.
REVERT: 831ac95fd9 Merge pull request #3428 from Eelis/mallocfail
REVERT: f8bcdaf123 Merge pull request #3430 from rlenferink/rl-rename
REVERT: fea02c1071 Renamed RELICENSE to use GitHub username
REVERT: 5ac7df1d23 Merge pull request #3429 from CommanderBubble/master
REVERT: 8259c519b3 Problem: Program crashes if memory allocation in socket_poller_t::rebuild fails.
REVERT: d301f995ad Create mlloyd.md
REVERT: 2acd7391ae Merge pull request #5 from zeromq/master
REVERT: d814f37067 Merge pull request #3426 from Eelis/pollerdoc
REVERT: f09d5295c6 RELICENSE: Grant from Eelis.
REVERT: f1d6811dd7 Problem: The documentation for zmq_poller_new incorrectly states that it cannot fail.
REVERT: cdc4b8c6c6 Merge pull request #3423 from vortechs2000/relicense
REVERT: 3b3fbe0204 Add relicense grant
REVERT: 3d55131eba Merge pull request #3422 from sigiesec/fix-zmq-proxy-docs
REVERT: c05d010c01 Problem: zmq_proxy signature in documentation does not match actual signature
REVERT: f21bae529e Merge pull request #3421 from sigiesec/document-supported-platforms
REVERT: 598b5d4dcb Problem: no documentation of supported platforms
REVERT: e2af39bc42 Merge pull request #3420 from mgatny/master
REVERT: d63dcaf238 Problem: missing relicensing statement from mgatny
REVERT: 3e79d55271 Merge pull request #3419 from rlenferink/rl-rename
REVERT: cfd91f0602 Renamed license grants to use GitHub username
REVERT: fed6cc5669 Merge pull request #3418 from rlenferink/rl-extension
REVERT: 5b621164ed Converted to markdown
REVERT: 9e41dcf077 Merge pull request #3417 from rlenferink/rl-ricnewton
REVERT: fba60985e0 Received grant from Micromass UK Limited
REVERT: b3a62b7867 Merge pull request #3416 from pmienk/master
REVERT: 956c724302 RELICENCE: Phillip Mienk grant
REVERT: 66c9bd8020 Merge pull request #3415 from bluca/relicense_npl
REVERT: c189c973c2 Problem: no relicense grant from PNNL
REVERT: 39541f0306 Merge pull request #3414 from bluca/relicense_tim
REVERT: ca9eca058b Problem: missing relicense statement from Prarrot
REVERT: 9e8aef0b66 Merge pull request #3413 from somdoron/master
REVERT: 380b852561 Problem: missing relicensing statement from somdoron
REVERT: c39e7a8818 Merge pull request #3412 from calid/relicense-calid
REVERT: 1dd9ac9548 Relicense: Dylan Cali
REVERT: be20089675 Merge pull request #3411 from bluca/fix_threads
REVERT: f83b13b2d6 Problem: build fails on VS2010 as it does not have snprintf
REVERT: c63b0955e5 Problem: zmq_threadstart name not distinguished
REVERT: c8d039a3c7 Problem: unused variable warning in thread_start on !Linux
REVERT: f7ca7515d7 Problem: new thread parameter not initialised in ctor
REVERT: d02561eec0 Problem: IO thread name starts counting at 1
REVERT: 563396445a Problem: IO thread name uses space separator, the rest uses /
REVERT: de76789ac6 Problem: new thread naming breaks build on !Linux and overwrites prefix
REVERT: 484374f2b6 Problem: Threads don't have names which complicates debugging. Solution: 1. Use optional name parameter in thread_t::start for operating systems that have thread names. 2. Give start_thread() an optional name parameter for the thread's name. If this parameter is set, it will be appended to "0MQ:". If not set, "0MQ" will be used as the thread's name. 3. Give epoll the ability to name its thread. Then use this in io_thread and reaper to name them.
REVERT: c47b2af90a Problem: no relicense agreement by Kymeta Corporation Solution: add relicense agreement
REVERT: 907bce52e0 Merge pull request #3410 from Quuxplusone/license
REVERT: 465109d0ca RELICENSE: Arthur O'Dwyer grant
REVERT: 639ed00d9a Merge pull request #3409 from mkoppanen/relicense/mkoppanen
REVERT: 9634ab182f Add permission to relicense
REVERT: 96cd7cf2c3 Merge pull request #3408 from bluca/relicense
REVERT: 16a4153849 Problem: missing relicensing statement from bluca
REVERT: 8ef72d482e Problem: trie benchmarks count loop times instead of lookup calls (#3406)
REVERT: 6937447832 Merge pull request #3405 from sigiesec/use-std-condition-variable-any
REVERT: 7fbd977184 Problem: assertion triggered in stream_connecter_base::close
REVERT: 2759f459df Problem: C4267 warnings due to implicit conversion from size_t to int
REVERT: 21a389ca78 Problem: test_security_curve build fails with Windows targeting 8 or newer due to duplicate definition of htonll
REVERT: 120edd9809 Problem: selection of condition_variable_t implementation is confusing and not configurable
REVERT: bfb092c3ec Problem: value for _WIN32_WINNT not always known in CMakeLists.txt
REVERT: d7e1cf3eb0 Problem: std::condition_variable can only be used with std::unique_lock<std::mutex>, leading to two mutexes used in condition_variable_t
REVERT: 119a258504 Merge pull request #3383 from ZMQers/queue_monitor
REVERT: feadf6d40f Problem: cannot monitor state of queues at runtime
REVERT: cb73745250 Problem: cannot send more than one value per v2 event
REVERT: 1e26a93ce2 Problem: test_monitor fails in valgrind
REVERT: c1b374fa6a Problem: manpage for zmq_socket_monitor_versioned has old example
REVERT: 83946d5c98 Problem: testutil_monitoring does not close received messages
REVERT: edf79dfefc Problem: test_monitor check for DRAFT has to be kept up to date
REVERT: b20cb122d9 Problem: zmq_socket_monitor_versioned manpage not generated
REVERT: 2edba1259e Problem: zmq_socket_monitor_versioned manpage doesn't build
REVERT: 86697347fc Problem: symlinking manpages in automake does not work
REVERT: e5a7f2eb56 Merge pull request #3402 from sigiesec/revert-64-bit-assertions
REVERT: 31ff05d156 Revert "Problem: test build fails on 32 bit systems"
REVERT: 4273ffd266 Partially revert "Problem: monitor events are output as decimal in assertion messages"
REVERT: 4bdb05df78 Merge pull request #3400 from sigiesec/fix-issue-3397
REVERT: 9cb1fca115 Problem: on a failure to setsockopt SO_BINDTODEVICE, libzmq asserts
REVERT: ec4ecb01ff Problem: no test for ZMQ_BINDTODEVICE
REVERT: a3a40a01c9 Merge pull request #3399 from sigiesec/fix-unity-64-bit
REVERT: ac19d5f41c Problem: test build fails on 32 bit systems
REVERT: eb42e0442b Merge pull request #3396 from sigiesec/fix-issue-3394
REVERT: a763d734f2 Problem: formatting broken
REVERT: 7cf0d125d3 Problem: failed address resolution on TCP connect is not observable
REVERT: e45ede49b5 Problem: regression introduced by 68d520e, changing behaviour of unblocking sockets
REVERT: db8c26fce3 Problem: testutil_unity uses undefined names on Windows
REVERT: 8de7e529ec Problem: no test case for tcp name resolution no longer working
REVERT: 84dc40dd90 Problem: regression introduced by 68d520e, leading to tcp name resolution no longer working
REVERT: 5ecf8f93e2 Merge pull request #3395 from somdoron/ZeroCond
REVERT: 792a1e61f3 Merge pull request #3393 from sigiesec/add-v2-monitoring
REVERT: 462dd36d0e Problem: invoking the conditional variable for zero time is expensive
REVERT: 61e476ec89 Problem: MAX_SOCKET_STRING is too short for ipc wildcard binds
REVERT: b54b55d854 Problem: sun_path in an AF_UNIX address might not be null-terminated
REVERT: 31015fdcfe Problem: ipc_address data member does not conform with naming convention
REVERT: 808028fe02 Problem: use of unnecessary complex stringstream
REVERT: 19c6aa5c92 Problem: monitor events are output as decimal in assertion messages
REVERT: a86592f78c Problem: test_monitor is not run for ipc and tipc
REVERT: 9b1627f041 Merge pull request #3391 from bluca/listener_unistd
REVERT: 2df988eec3 Problem: build broken with newer gcc
REVERT: 0b4bb92395 Merge pull request #3389 from sigiesec/fix-issue-3387
REVERT: 8d784f26ab Problem: close always fails with wildcard bind, since directory is not empty
REVERT: b14bb2d8f8 Merge pull request #3388 from sigiesec/add-missing-include
REVERT: ded4ff6fd2 Problem: missing include directive for close/closesocket
REVERT: b8b1b8def3 Merge pull request #3384 from sigiesec/remove-socks-tcp-code-duplication
REVERT: 69a6522741 Merge pull request #3386 from sigiesec/remove-locale-dependency
REVERT: 74d62bb908 Problem: tcp address strings are dependent on locale
REVERT: e583276380 Problem: unnecessary platform-specific code parts around socklen_t
REVERT: c215235fb2 Problem: redundant string operations in zmq::udp_engine_t::sockaddr_to_msg
REVERT: d451a95234 Problem: redundant code in different preprocessor branches
REVERT: fc6ef0ebff Problem: zmq::get_peer_ip_address duplicates code from get_socket_address
REVERT: 2f7a450294 Problem: socks_connecter_t duplicates code around opening and configuring a TCP socket
REVERT: 68d520ef68 Problem: tcp_connecter_t and tcp_listener_t duplicate code around opening and configuring a TCP socket
REVERT: 3f4e64edc0 Problem: bind_to_device unnecessarily accepts a non-const string parameter
REVERT: 12c4b55af8 Problem: socks_connecter_t duplicates code with stream_connecter_base_t
REVERT: 14da2ab629 Merge pull request #3382 from bluca/tipc_endpoint
REVERT: 0411bc159a Problem: tipc disconnect does not work anymore
REVERT: c28cbf76d1 Merge pull request #3381 from bluca/test_ipv6_monitor
REVERT: a9a5b2bde5 Problem: DRAFT build broken on old Windows
REVERT: 84847138a1 Problem: test_monitor fails with ipv6
REVERT: 01b2a8ce21 Problem: unittest_radix_tree binary not ignored
REVERT: 33a493c4f8 Merge pull request #3379 from sigiesec/add-v2-monitoring
REVERT: 0e2e303b10 Problem: test_monitor is not run for ipv6
REVERT: f22b0b7483 Problem: test_monitor failing for assertion on endpoint addresses on ZMQ_EVENT_LISTENING event
REVERT: f3561f7759 Problem: no assertions for endpoint addresses on ZMQ_EVENT_MONITOR_STOPPED and ZMQ_EVENT_LISTENING events
REVERT: 5e2da02528 Problem: test case is leaking test socket
REVERT: 54240dccbb Problem: stream listeners do not provide correct local and remote address information (test_monitor is failing)
REVERT: 8f90f579f5 Problem: no assertions for local and remote addresses in monitor tests
REVERT: f884fa725c Problem: get_monitor_event_internal segfaults when using address
REVERT: b18d28eec1 Problem: no tests for v2 monitor events and test_socket_monitor_versioned
REVERT: 30e0cbbcdc Problem: test_monitor depends on testutil_security
REVERT: 482a3a2272 Problem: documented constants are not defined
REVERT: 367246bb23 Problem: test_monitor is not using a test framework
REVERT: 478e42442b Problem: no documentation on zmq_socket_monitor_versioned
REVERT: d8b5204f73 Problem: socks_connecter_t does not set local address
REVERT: 87082557f0 Problem: stream_connecter_base_t does not set local address
REVERT: aec9b130f7 Problem: get_socket_address and get_socket_name not available throughout libzmq and restricted to local address
REVERT: 01371398e9 Problem: monitor events are unversioned
REVERT: 2e73554644 Problem: socks_connecter_t, vmci_connecter_t and vmci_listener_t duplicate code with stream_*_base_t
REVERT: b462cc0912 Problem: misleading comments referring to a "library shutdown"
REVERT: 9a376fbe24 Problem: code duplication in get_address of ipc/tcp/tipc listener classes
REVERT: 5c81bbe82e Problem: norm_engine.cpp missing in CMakeLists.txt
REVERT: 4d8e5fb2e9 Merge pull request #3378 from sigiesec/refactor-stream-listeners-and-connecters
REVERT: 1aa6f7070c Merge pull request #3377 from sigiesec/fix-3376
REVERT: e162c8bda3 Problem: code duplication around getsockname
REVERT: 2b04946f49 Problem: code duplication around getsockname
REVERT: c476cf3d14 Problem: implicit cast between signed and unsigned types on some platforms
REVERT: 95eb8a7a99 Problem: parts of in_event duplicated across subclasses of stream_listener_base_t
REVERT: 93c1843f3e Problem: duplication across ipc_listener_t, tcp_listener_t, tipc_listener_t
REVERT: a40a3b7a34 Problem: several data members in stream_connecter_base_t are visible more than necessary
REVERT: a766a4b67e Problem: reconnect_timer_id duplicated and essentially used only in base class
REVERT: bed3b0cfb4 Problem: tipc_listener_t data members not conforming to naming style
REVERT: 2a5fb6cb8e Problem: ipc_listener_t data members not conforming to naming style
REVERT: 7e73587741 Problem: duplication in *_event methods across subclasses of stream_connecter_base_t
REVERT: a09099a615 Problem: process_term and close duplicated across subclasses of stream_connecter_base_t
REVERT: 531df586d0 Problem: rm_fd code duplicated across stream_connecter_t subclasses
REVERT: 1a230e89ca Problem: process_plug, get_new_reconnect_ivl and add_reconnect_timer duplicated across subclasses of stream_connector_base_t
REVERT: 74667ebcba Problem: destructors of tcp_connecter_t, ipc_connecter_t, tipc_connecter_t contain duplicated code
REVERT: d6f8d246e2 Problem: data members are duplicated across tcp_connecter_t, ipc_connecter_t, tipc_connecter_t
REVERT: 361d7168ad Problem: tipc_connector_t::_handle_valid is redundant
REVERT: a13eb1a9d8 Problem: ipc_connector_t::_handle_valid is redundant
REVERT: 065e81879a Problem: tipc_connector_t::_timer_started is unspecifically named
REVERT: ca87aaed57 Problem: ipc_connector_t::_timer_started is unspecifically named
REVERT: c94ad64876 Problem: tipc_connector_t data members not conforming to naming conventions
REVERT: 58063a75a2 Problem: ipc_connector_t data members not conforming to naming conventions
REVERT: 4d362887bb Problem: stream_engine_t::_endpoint is unnecessarily non-const
REVERT: 091df743a8 Problem: stream_engine_t::_peer_address is unnecssarily non-const
REVERT: ae79b41d4c Problem: bug in tipc_listener_t::set_address, random port is determined but not used
REVERT: afe48e2b16 Problem: unnecessary explicit definitions/deletions of special member functions in tipc_address_t
REVERT: 19b64709bb Merge pull request #3374 from bluca/hurd
REVERT: 9fae3d1f10 Problem: one more test fails on GNU/Hurd
REVERT: fe4e333334 Merge pull request #3369 from bluca/abi_checker_travis
REVERT: f9b0945c1b Problem: have to check ABI compatibility manually
REVERT: 331fee4b38 Merge pull request #3368 from bluca/release_branch
REVERT: 51557b9b96 Problem: race condition breaks automated OBS release
REVERT: 329155655c Merge pull request #3367 from bluca/alignment_cache_size
REVERT: 3b6db4b370 Problem: test_pair_ipc fails on GNU/Hurd due to wildcard bind
REVERT: bfb4a868fc Problem: atomic intrinsics unreliable on PPC64 and RISC-V
REVERT: 8040e28b26 Problem: posix_memalign autoconf check broken on some platforms
REVERT: 4a0c83fb12 Problem: yqueue false sharing issues on PPC64
REVERT: 0761e6bb48 Merge pull request #3364 from bluca/thread_priority_get
REVERT: 93b3689376 Problem: ZMQ_SOCKET_LIMIT and ZMQ_THREAD_PRIORITY have the same value
REVERT: f0d97e0243 Merge pull request #3363 from bluca/tests_race_conditions
REVERT: 4d38552445 Problem: GCC warnings about string overflows in tests
REVERT: 87dbd39ae0 Merge pull request #3361 from bluca/gssapi_pkgconfig
REVERT: 73ae7a349b Problem: gssapi pkg-config check in configure.ac does not work
REVERT: e21988d02b Merge pull request #3360 from bluca/cve
REVERT: bfba6e5a36 Problem: NEWS for 4.3.1 does not mention CVE number
REVERT: 2d02597964 Merge pull request #3359 from bluca/tests_race_conditions
REVERT: d55956574d Problem: test_rebind_ipc still fails
REVERT: ac9583973c Merge pull request #3358 from bluca/tests_race_conditions
REVERT: f64b697095 Problem: tests use hard-coded fixed IPC file path
REVERT: 4147957a5e Problem: test_security_zap fails on architectures that disallow unaligned pointer access
REVERT: 6a3c8b46f6 Merge pull request #3357 from bluca/news
REVERT: 73d41cec57 Problem: versions are out of date
REVERT: 2cb1240db6 Finalise changelog for 4.3.1
REVERT: 690cd894e6 Merge pull request #3356 from bluca/news
REVERT: 3ce8b11aa3 Problem: NEWS out of date with recent changes
REVERT: 3154f3eab7 Merge pull request #3355 from bluca/formatting
REVERT: e9fd5aae43 Problem: small formatting issue highlighted by clang
REVERT: 4ca3d430fe Merge pull request #3353 from guidovranken/v2_decoder-overflow-rce-fix
REVERT: 731be4bd59 Problem: Compilation error due to comparison between signed and unsigned expressions
REVERT: dcf001906a Problem: no relicense agreement by guidovranken
REVERT: 1a2ed12716 Problem: pointer overflow in zmq::v2_decoder_t::size_ready leading to remote code execution (issue #3351)
REVERT: 7302b9b8d1 Merge pull request #3345 from ssbl/unused-import
REVERT: cc686f15f4 Problem: unused import and inconsistent use of const
REVERT: fc36c7d2c4 Merge pull request #3343 from bluca/pull_atomic_drop
REVERT: 9bd9cbbeea Problem: race condition in PUSH might break atomicity
REVERT: b65b523a39 Merge pull request #3341 from sigiesec/migrate-more-tests
REVERT: 88bea4fd73 Problem: tests without test framework
REVERT: cb2b9a8cd2 Merge pull request #3338 from bluca/android_pkgconfig
REVERT: 7f34ca52c8 Problem: Android helper does not redirect pkg-config
REVERT: 16af86d49c Merge pull request #3337 from sigiesec/sigiesec/migrate-more-tests
REVERT: affe77280c Improved test assertion message
REVERT: 00f4bd05be Problem: tests without test framework
REVERT: 1c604c6212 Merge pull request #3336 from bluca/pkgconfig_requires
REVERT: c27afbca27 Problem: dev packages do not depend on static deps
REVERT: 28d5ce3dfa Problem: pkg-config file cannot be used for static linking
REVERT: 9d06e29cb2 Problem: duplicated pkg-config template
REVERT: ed8ed727c6 Merge pull request #3335 from jcourreges/back-to-ld-version-script
REVERT: 687c75858e Problem: libtool -export-symbols-regexp seems to leak weak symbols
REVERT: 546f8e7205 Merge pull request #3334 from jacquesg/nodelay-after-connect
REVERT: 9d8c2b3843 Problem: no relicensing grant for my contributions
REVERT: a1ace32650 Problem: TCP_NODELAY is set prior to connecting, which is problematic on Windows
REVERT: cfbbfb8ab8 Merge pull request #3333 from erickt/patch-1
REVERT: a92585586b Fix a typo - lenght to length
REVERT: b70d31c432 Merge pull request #3328 from sigiesec/sigiesec/migrate-more-tests
REVERT: 4a48184032 Problem: tests without test framework
REVERT: 65e72f9f0a Merge pull request #3327 from sigiesec/migrate-more-tests
REVERT: a8b2e5a617 Problem: tests without test framework
REVERT: f025129768 Merge pull request #3326 from hgourvest/master
REVERT: a6b5c75198 Problem: Switching or desactivate wifi can lead to have EINVAL error code returned on Android. Solution: Avoid killing the application, allows to take the appropriate measures to this situation.
REVERT: aaaec894d3 Merge pull request #3325 from jcourreges/platforms-conditionals-cleanup
REVERT: 941915d142 Problem: needlessly complicated conditionals in Makefile.am
REVERT: 386fa6e013 Problem: unused Debian/kFreeBSD-specific code
REVERT: 4d1d64b764 Merge pull request #3322 from jcourreges/libtool-export-symbols
REVERT: 36745fbf0d Merge pull request #3324 from jcourreges/jcourreges-relicense
REVERT: 70b48a9c0c Problem: --version-script not used on OpenBSD
REVERT: d20d107b48 Problem: no relicensing grant for my contributions
REVERT: eda7f958f9 Merge pull request #3321 from jcourreges/openbsd-build-error
REVERT: fb4629eea2 Problem: build fails on OpenBSD due to -Wl in LDFLAGS
REVERT: f615b8fdfc Merge pull request #3315 from bluca/news
REVERT: fbf37bb668 Problem: 4.3.0 is released, need to update ABI/version
REVERT: eff190d503 Problem: ABI is not correct for 4.3.0
REVERT: d411831302 Finalise changelog for 4.3.0
REVERT: fb7f8b77b8 Problem: NEWS out of date
REVERT: 6ec1a6f2af Problem: whitespace issues introduced by last 2 PRs
REVERT: cad2423d82 Consolidation of libatomic checks (#3314)
REVERT: d98325160f Android Things 1.06 with Termux changes (#3312)
REVERT: 1bb0d63f1e Merge pull request #3310 from sigiesec/update-wepoll-1.5.4
REVERT: df91e1e88a Problem: wepoll 1.5.2 is outdated
REVERT: 0e95c6c992 Merge pull request #3308 from bluca/draft
REVERT: f1dd84c11f Problem: zmq_proxy STATISTICS eligible for stable
REVERT: d61c47ef6f Problem: no example for STATISTICS in proxy manpage
REVERT: 35c6985e68 Problem: zmq_stopwatch_intermediate is eligible for STABLE
REVERT: 22c3ecc458 Problem: some context options have no getter
REVERT: 92cf6c6451 Problem: new ctx THREAD options are eligible for STABLE
REVERT: c347aef794 Problem: new DRAFT monitoring events are eligible for STABLE
REVERT: d349f93c2b Merge pull request #3306 from bluca/radix_autotools
REVERT: 6253591655 Problem: radix tree never used in autotools builds
REVERT: 25e069d131 Add specific option to select radix tree implementation for subscriptions (#3304)
REVERT: d60ed2d626 Merge pull request #3301 from bluca/tests
REVERT: f3fde8498d Merge pull request #3303 from crocket/master
REVERT: 14ed4e6492 Problem: There is probably no relicensing grant from me, yet.
REVERT: 8919464fbc Problem: C4 process is not easily discoverable.
REVERT: 4a0b6c6c6f Problem: compiler warning in unittest_poller
REVERT: 1402f7727e Problem: no automated way to enforce C++98 compatibility
REVERT: f215e13a71 Problem: compiler flags passed to preprocessor in autoconf
REVERT: 79f65b43cf Problem: NEWS does not mention new perf tool
REVERT: 0e01c27de5 Problem: test_router_notify cannot be ran in parallel
REVERT: 828812fa72 Problem: test_app_meta cannot be ran in parallel
REVERT: 2c1c2f8b1b Problem: new tests and perf binaries not ignored by git
REVERT: 3659c1204a Problem: radix tree needs benchmarks and improvements (#3290)
REVERT: 05e0ab55b8 Merge pull request #3299 from bluca/news
REVERT: b1e2c8588e Problem: #3263 not mentioned in NEWS
REVERT: a59c010e33 Merge pull request #3298 from pijyoi/signaler_wait1
REVERT: 9a15fe7fac use required number of descriptors (1) instead of FD_SETSIZE
REVERT: 63abe83388 Merge pull request #3296 from sigiesec/reapply-session-base-refactoring
REVERT: db09fab47b Problem: compilation broken with Sun Studio
REVERT: 2327661810 Merge pull request #3297 from toonetown/recv-buffer-overflow
REVERT: fa598579e6 Problem: Assert being triggered when Windows returns `WSAENOBUFS` from `recv` call on large buffers.
REVERT: eb74b726c2 Problem: no relicense agreement by toonetown
REVERT: c590873ff7 Problem: complexity of start_connecting
REVERT: 31b0a1dff0 Merge pull request #3295 from bluca/hurd_freebsd_sun
REVERT: 25ded9e897 Problem: out-of-date TODO in zmq_poll
REVERT: ab1607f813 Problem: poller implementation of zmq_poll is slow
REVERT: b6f55eac14 Problem: unity build broken with Sun Studio
REVERT: ffd99fbaf5 Problem: GNU/Hurd does not implement getsockname for ipc
REVERT: bd9011fe3b Problem: build broken with Sun Studio
REVERT: 54295cb342 Problem: passing tests on debian/kfreebsd marked as XFAIL
REVERT: 205573f1a3 Problem: typo in RUN_TEST macro breaks debian/kfreebsd build
REVERT: 320741f2c9 Merge pull request #3294 from bluca/stalebot
REVERT: 1b8a821222 Problem: stale bot label exceptions not correct
REVERT: b8b98bc601 Merge pull request #3293 from bluca/stalebot
REVERT: ecf1e31db7 Problem: stale issues linger on Github
REVERT: c5dab3b4f3 Merge pull request #3292 from bluca/news
REVERT: d330d01076 Problem: NEWS still out of date
REVERT: b03d6605a1 Merge pull request #3288 from bluca/news
REVERT: cb1970e136 Merge pull request #3291 from WallStProg/master
REVERT: 981cff5c93 RELICENSE: Bill Torpey
REVERT: 4e8c72c32f RELICENSE: Bill Torpey
REVERT: 29c369ff0b Some changes for CMakeLists.txt:
REVERT: 34f23bea82 Problem: NEWS not up to date
REVERT: 1f3d4dfbea Problem: wrong new version
REVERT: efc9a3021f Merge pull request #3287 from bluca/radix_draft
REVERT: 8f69122981 Problem: new radix tree implementation is experimental
REVERT: fc4115887c Merge pull request #3286 from ssbl/master
REVERT: 87d2919066 Problem: no relicense agreement by ssbl
REVERT: c68afb412e Problem: potentially large memory footprint of trie as number of subscriptions increases
REVERT: 9861d16cfc Merge pull request #3285 from bjovke/my_work
REVERT: f5d1d5d1af Problem: Use of pipe_t after free in zmq::socket_base_t::term_endpoint(). Issue #3245.
REVERT: 3863c869cc Merge pull request #3284 from lhftio/udp-multicast-hops
REVERT: 4ce402687a Problem: no relicense agreement by kfish
REVERT: 22083d7d62 Problem: UDP does not support ZMQ_MULTICAST_HOPS
REVERT: 7064c3a55f Merge pull request #3283 from hpsaturn/av/relicense
REVERT: 7c0017c55d Merge pull request #3272 from hpsaturn/av/fix_for_android
REVERT: e8c816f250 Relicense statement for Hpsaturn
REVERT: cbf29b5355 Merge pull request #3281 from ojura/patch-3
REVERT: 006f1e6773 Merge pull request #3278 from ojura/master
REVERT: a48b7a7d93 Relicense statement for Juraj Oršulić
REVERT: 3942195817 Update CMakeLists.txt
REVERT: 69ac7a934c fix for android building
REVERT: cfc9d5f519 Problem: trailing whitespace breaks clang-format-check
REVERT: b9b325ce3b Merge pull request #3271 from gabm/Relicense
REVERT: c1ac158f50 Problem: The flag that indicates the next expected message gets set even if the send fails (#3270)
REVERT: 439e57f091 grant relicense permission
REVERT: 501d0815bf Merge pull request #3267 from glemercier/master
REVERT: ffe62d3398 Fix build on arm64 architectures with some strict compilers
REVERT: 2e2806d744 Adds relicensing grant
REVERT: 6ee048992f Merge pull request #3266 from antonrd/issue-2488-zmq_msg_send-doc-fix
REVERT: b15aa40212 Adds relicensing grant
REVERT: 860c905e5a Removes unneeded trailing spaces in doc.
REVERT: 082457b6d0 Problem: zmq_msg_send doc incomplete return value description (issue #2488)
REVERT: d4adb9a549 Merge pull request #3265 from bluca/tipc
REVERT: 1a5937750c Problem: test_connect_delay_tipc randomly fails
REVERT: 41bdf5c389 Merge pull request #3264 from bluca/issue_pr_text
REVERT: 1275c96979 Problem: have to ask manually for relicensing grant
REVERT: 7476e58897 Merge pull request #3260 from sigiesec/remove-outdated-reference
REVERT: 36b62c1215 Problem: INSTALL refers to deprecated VS build instruction
REVERT: 95beabe7cc Merge pull request #3257 from f18m/hwm_test_fix
REVERT: 4f49e7420b Remove race condition from XPUB/SUB test in test_blocking()
REVERT: 9f962ea0cc Merge pull request #3255 from f18m/hwm_test_fix
REVERT: 4b399b51ce change test_hwm_pubsub to use XPUB and wait for subscription before start to sending messages out
REVERT: ea517a28ff Merge pull request #3253 from bluca/proxy_hwm
REVERT: df218af3bd Problem: test_proxy_hwm expects wrong number of msgs
REVERT: e651babd85 Problem: test_proxy_hwm uses an bool across threads
REVERT: 02019d9f4c Merge pull request #3254 from f18m/hwm_test_fix
REVERT: 72418e9dd0 Improve test reliability by: a) using XPUB in place of PUB to ensure we start publishing only after 1st subscriber has joined; b) accept both 2*HWM, 3*HWM and 4*HWM as TX/RX count of messages
REVERT: b933cb9d6a Merge pull request #3251 from f18m/relicensing
REVERT: a5a9fd1ff7 add relicensing grant
REVERT: eb3e63e22f Hwm tests and docs (#3242)
REVERT: 0750211109 Merge pull request #3250 from ffontaine/master
REVERT: 3b39942bd0 RELICENSE: Fabrice Fontaine
REVERT: 6de5f18be3 fix static build with libatomic
REVERT: 1b61ff2910 Merge pull request #3247 from schulzch/relicense
REVERT: fa397134fe RELICENSE: Christoph Schulz
REVERT: 10edb5930a Merge pull request #3246 from schulzch/cmake-fixes
REVERT: a21228b664 Conform to `cmakelint --filter=-linelength`
REVERT: ca7c03f825 Add instead of replace linker flags (fix for LLVM toolchain)
REVERT: 9c0bff2c9c Merge pull request #3239 from Mystfit/relicense
REVERT: fe212927f6 RELICENSE: Byron Mallett
REVERT: e0ec6a9b36 Problem: formatting errors introduced by PR #3237
REVERT: d8f3b283f8 Added SO_REUSEPORT socket option for UDP recv ports (#3237)
REVERT: 50dbd80c51 Merge pull request #3233 from sigiesec/migrate-tests-to-unity
REVERT: 1734a64d62 Revert "Problem: test_proxy not yet using unity"
REVERT: e0fe7f1037 Merge pull request #3232 from sigiesec/migrate-tests-to-unity
REVERT: 430b97fc73 Problem: test_use_fd not yet using unity
REVERT: d668925bca Problem: extensive duplication between test_use_fd_tcp and test_use_fd_ipc
REVERT: 929d295e01 Problem: test_timers not yet using unity
REVERT: 980791d182 Problem: test_stream_timeout not yet using unity
REVERT: f01682292c Problem: test_stream_disconnect not yet using unity
REVERT: 309fe2e6fd Problem: test_router_mandatory_hwm not yet using unity
REVERT: fd27324ec3 Problem: test_proxy not yet using unity
REVERT: 76f2edd0b7 Merge pull request #3230 from saraf/master
REVERT: 3f1f628538 Fix build failure on ARM due to bad variable name
REVERT: 12005bd926 Merge pull request #3228 from sigiesec/migrate-tests-to-unity
REVERT: 1a55100dbe Problem: test_xpub_verbose is not using testutil_unity
REVERT: 2334090732 Problem: test_stream not yet using unity
REVERT: 7ad0ff5e9a Problem: test_stream_empty not yet using unity
REVERT: 7b39d2cb2a Problem: test_unbind_wildcard not yet using unity
REVERT: c66288a882 Problem: duplicate code
REVERT: 713f075fec Problem: test_xpub_manual not yet using unity
REVERT: 407bd3b1b2 Problem: test_spec_pushpull not yet using unity
REVERT: 261dd1f92c Problem: test_ancillarries not yet using unity
REVERT: 3d2db5d8d5 Problem: test_capabilities not yet using unity
REVERT: dc29361ef4 Problem: test_req_correlate not yet using unity
REVERT: 244ba77ebc Problem: test_base85 not yet using unity
REVERT: 9f0b83a1d3 Problem: whitespace issue with PR #3227
REVERT: 777bd48296 Pgm fix (#3227)
REVERT: fce1838545 Problem: test_pair_tcp not yet using unity
REVERT: d7e51cdfed Problem: indentation issues with PR #3226
REVERT: 7852a6ce98 PGM receiver crash fix (#3226)
REVERT: 1c5e81788e Merge pull request #3225 from sigiesec/fix-bug-router-duplicate-id-no-handover
REVERT: 8328208e60 Problem: inconsistent _out_pipes when using the same routing id without ZMQ_ROUTER_HANDOVER
REVERT: 4ecfb81c7c Merge pull request #3224 from sigiesec/migrate-further-tests
REVERT: e07a6a69ad Problem: test_spec_router not yet using unity
REVERT: ab22aeb83e Problem: test_setsockopt not yet using unity
REVERT: 30b9e5a10b Problem: test_connect_rid not yet using unity
REVERT: 0fc2f0f073 Problem: test_term_endpoint not yet using unity
REVERT: dce77fda68 Problem: test_filter_ipc not yet using unity
REVERT: fe82c643ed Merge pull request #3220 from sigiesec/code-improvements
REVERT: 31f69937fc Merge pull request #3222 from sigiesec/add-z7-debug-info-with-relwithdebinfo
REVERT: 987e75b887 Problem: test program test_unbind_inproc is redundant, the same is already tested in test_inproc_connect
REVERT: f6a3ebde99 Problem: test not using unity assertions and test utils
REVERT: a9973ac43f Problem: /Z7 debug info is used only for Debug build, but not for RelWitDebInfo build
REVERT: 6824c167ad Merge pull request #3217 from WenbinHou/patch-1
REVERT: 75e4a342e2 Problem: XFAIL_TESTS does not correctly reference some tests
REVERT: 0507ae877d Update tests/CMakeLists.txt: use ZeroMQ_SOURCE_DIR, ZeroMQ_BINARY_DIR
REVERT: 8fbb32c8f1 RELICENSE: Wenbin Hou
REVERT: c546045d8c Problem: test_connect_delay_tipc not yet using unity
REVERT: 06a9d809aa Problem: test_connect_delay_tipc is almost always failing
REVERT: 6d7aeb056f Problem: complexity of start_connecting
REVERT: 2cd34da1b0 Problem: code duplication in session_base_t::start_connecting
REVERT: 799fae44fe Problem: magic literal used for inproc
REVERT: daadb65a46 Problem: inconsistency of using terms address and uri
REVERT: cdc6c66f9b Problem: complexity of term_endpoint
REVERT: a2d736c14f Problem: functionality around inprocs_t is scattered
REVERT: fb576d2f95 Problem: unnecessary procedural code
REVERT: 3455be144d Problem: code duplication around sending of routing id
REVERT: 83f41526c9 Problem: code duplication around options_t::conflate
REVERT: 8820dedcb7 Problem: stream_engine_t::_as_server is not used
REVERT: 0852099f67 Problem: unused field pipe_t::_credentials
REVERT: 2cdad3d0ce Add ZMQ_ROUTER_NOTIFY draft socket option (#3213)
REVERT: 4738bed5b6 Merge pull request #3219 from hoditohod/relicense
REVERT: 69d69f21a8 RELICENSE: Szekely Gyorgy
REVERT: c981336445 Udpate unittests/CMakeLists.txt: use ZeroMQ_SOURCE_DIR, ZeroMQ_BINARY_DIR
REVERT: cbb9925a10 Merge pull request #3215 from sigiesec/remove-unused-get-credential
REVERT: dbe289509e Merge pull request #3211 from sigiesec/migrate-and-extend-probe-router-test
REVERT: da30ff7d3d Problem: unused get_credential methods and associated fields
REVERT: 062b510b5d Problem: test case test_probe_router_router does not receive auto-generated routing id
REVERT: 0b1589dbba Merge pull request #3209 from sigiesec/code-improvements
REVERT: d78152bf83 Problem: no test case for ZMQ_PROBE_ROUTER on ZMQ_DEALER socket
REVERT: d9e5ba671b Problem: test_probe_router not yet using unity
REVERT: bbae67df89 Code style improvements
REVERT: b102e30419 Fixed naming for filter parameter, removed unnecessary temporary variable, fixed naming of local variable
REVERT: a1b6268c83 Made to_string const; converted C-style cast to reinterpret_cast
REVERT: 6e8424ab5d Merge pull request #3206 from sigiesec/fix-zap-memory-use-after-free
REVERT: 737927e333 Fixed spelling of parameter
REVERT: 46ed0920b2 Various code style improvements
REVERT: 53e9af71af Merge pull request #3208 from sigiesec/add-clang-rule-exclusions-analyze
REVERT: bfa8275cfb Added some more clang-tidy rule exclusions
REVERT: 563651e0c9 Problem: stream_engine_t instance may access its fields after it deleted itself
REVERT: 76602516a8 Merge pull request #3205 from sigiesec/code-improvements
REVERT: be81dcd4d3 Use std::min/max where possible
REVERT: 3cb77e423e Use revision_pos constant
REVERT: 758f903db4 Some code style improvements: removed redundant parentheses, added const, joined declaration and assignment of local variables
REVERT: 89e5313114 Refactored zmq::stream_engine_t::handshake, extracted several sub-methods
REVERT: c3739ff604 Use static_cast instead of C-style casts, make local variables const where possible, use switch instead of chained if/else, extract rm_helper_multiple_subnodes from rm_helper to reduce nesting
REVERT: 9e2cf35b66 Reduced number of calls to container end method
REVERT: 05e400a3e0 Merge pull request #3203 from sigiesec/update-wepoll
REVERT: d9ade47630 Merge pull request #3202 from sigiesec/code-improvements
REVERT: 19a70ab682 Optimized and simplified zmq::timers_t::execute and zmq::timers_t::timeout
REVERT: 4f77cfa327 Removed unreachable code paths
REVERT: 198c01e00b Use more structured for loop instead of while loop
REVERT: 9440f4e5bc Problem: wepoll outdated
REVERT: e4b4372c41 Simplified code
REVERT: ad3d1e7762 Reduced code duplication between xread and xhas_in
REVERT: 3cca90ea44 Optimized zmq::dish_t::xhas_in
REVERT: aa1f5739b7 Optimized zmq::dish_t::xrecv
REVERT: fa976f87f9 Simplified uses of erase
REVERT: 6357890ff6 Removed code duplication in process_commands
REVERT: da8024d3c9 Problem: No CI for mingw64 (#3195)
REVERT: ebe701afc1 Merge pull request #3198 from bluca/timers_draft
REVERT: 3159161cef Problem: zmq_timers_* are ready for STABLE
REVERT: efbec8e67f Problem: zmq_poller manpage is not build
REVERT: 06176fde4d Problem: no documentation for zmq_timers_*
REVERT: bbcdb961a0 Merge pull request #3193 from mvilim/local_attach
REVERT: 8a16fef3cc Problem: ZMQ_CONNECT_ROUTING_ID can be assigned to incoming socket connection (Issue #3191)
REVERT: 0aa222d07e Merge pull request #3197 from justusranvier/master
REVERT: 458f41e349 Problem: build system does not play nicely as a cmake subproject #3196
REVERT: f4aad4d1d2 Merge pull request #3194 from QuLogic/cmake-pkgconfig
REVERT: 1e51d6e043 Problem: cmake: pkgconfig always installed in lib.
REVERT: cc4d03fa1c Merge pull request #3181 from jcfr/support-custom-output-dir
REVERT: f1aeb7956c cmake: Fix .dll file location in the build tree
REVERT: b1d4955065 cmake: Streamline integration allowing config of CMAKE_*_OUTPUT_DIRECTORY
REVERT: 25f47ccbf8 Merge pull request #3187 from MelcoInternational/master
REVERT: 3b26c7f8e1 Switched android platform check to official form
REVERT: 7a9933f2e1 Merge pull request #3179 from masariello/master
REVERT: 9066e0670f Problem: stack overflow on win64 #2876. Basically zmq::signaler_t::wait suffers from stack bloating the same way socket_poller was found to be bloated due to the large size of fd_set Solution: replace the fd_set in the routine with an instance of optimized_fd_set_t
REVERT: 83e1712d67 Update conflate docs to cover issue #3171 (#3175)
REVERT: b0d9a5a2d5 Merge pull request #3174 from ilue/master
REVERT: 0d66067411 Merge pull request #3168 from bluca/recv_sub_cancel
REVERT: d70714e877 Problem: can't process ZMTP 3.1 cancel/subscribe commands
REVERT: 681e53f369 Problem: libstdc++ symbols exported on Debian/[Hurd|kFreeBSD]
REVERT: 8da4e9b95c Problem: pgm_sender does not initialise all its class variables
REVERT: 40606a93fe Problem: VMCI tests do not build
REVERT: a059d904fe Problem: binaries and artefacts missing from gitignore
REVERT: edec2244d1 update pair doc (#3170)
REVERT: 85dfca3087 Merge pull request #3167 from sigiesec/fix-clang-tidy-config-analyze
REVERT: 21ad652a1e Problem: syntax error in shell script
REVERT: bd8083e8b8 Problem: wrong quotation marks in .clang-tidy
REVERT: 0867c38032 Problem: connecter classes do not handle ZMQ_RECONNECT_IVL of -1 (#3163)
REVERT: e22cd678b6 Fix #3162
REVERT: 3a1e8f0704 Merge pull request #3159 from sigiesec/remove-superfluous-mutex
REVERT: 75e945f162 Problem: epoll_t employs an unnecessary mutex
REVERT: add97caa4f Merge pull request #3157 from kermitbu/master
REVERT: ba3bc3806c compile unittests
REVERT: 7e6792ca74 Merge pull request #3156 from sigiesec/add-cygwin64-ci
REVERT: aee5fc2560 Merge pull request #3155 from pijyoi/wepoll_missing_files
REVERT: 5a1ea0c398 Problem: ZMQ_USE_EPOLL_CLOEXEC not renamed to new name
REVERT: 9ca3821d9a Problem: incomplete wepoll filelist in Makefile.am
REVERT: 4a18ed6778 Problem: build fails due to broken cygwin64 tests
REVERT: eccf2e53bc Problem: cygwin build defines ZMQ_HAVE_WINDOWS
REVERT: c5d422c02b Problem: no CI for cygwin
REVERT: d07ddb1bce Merge pull request #3153 from pijyoi/autoconf_wepoll
REVERT: 2336e1f170 Problem: not able to use wepoll in configure script
REVERT: c76ac5474b fix computation of winsock fd_set size (#3151)
REVERT: e2a4d770d8 Merge pull request #3150 from sigiesec/reduce-duplication
REVERT: 17df28d2b6 Problem: outdated information in INSTALL regarding stack size
REVERT: 5ac900a984 Problem: huge size of socket_poller_t object on Windows with select polling
REVERT: 4a651251a7 Problem: code duplication within socket_poller_t
REVERT: 74d3d8421f Problem: huge stack allocation with select on Windows in socket_poller_t::wait
REVERT: 3d39bb9ca9 Problem: valid_pollset_bytes not reused in socket_poller
REVERT: a8d62d14c1 Problem: polling utilities not at a reusable location
REVERT: fa8bc17ef3 Problem: CMake error on Win32 with DRAFTS disabled
REVERT: fc92fa897a Problem: no non-DRAFT Windows build
REVERT: 7c0efcb588 Problem: huge stack allocation in Windows select code
REVERT: 2533ffed86 Problem: memcpy code fragment is duplicated
REVERT: 04dedfbc2a Problem: duplicated calculation of valid bytes in select pollset
REVERT: e4c3297ed8 Problem: fragile handling of possibly dynamically allocated pollfds
REVERT: c6e4b0abb1 Problem: zmq_poll implementation is complex
REVERT: 3db3bbfbbb Problem: duplication in implementation zmq_poller_poll
REVERT: 89e5f15ac4 Merge pull request #3149 from sigiesec/analyze
REVERT: 67b602fe76 Problem: unused variable warnings for values only used in asserts
REVERT: 3cb4754602 Problem: analysis job prolongs overall build
REVERT: 4604014c12 Problem: unused result of call to pull_msg
REVERT: c2ba553d87 Problem: unused values stored to variable, duplicated code
REVERT: ee4cdf8bf0 Problem: suspicious use of memcmp result
REVERT: 6bfa91f13f Merge pull request #3145 from sigiesec/analyze
REVERT: 0b8f586d8f Merge pull request #3144 from bluca/autoconf_taut
REVERT: a2f91c5509 Problem: unnecessary passing of non-const data
REVERT: c641644bb2 Problem: inconsistent parameter names
REVERT: ce4b71c3fa Problem: cppcoreguidelines-pro-type-static-cast-downcast warnings that are not meant to be resolved
REVERT: 9e6f1c9a3c Problem: redundant else after return
REVERT: 6fa12bd692 Problem: unused stored value warning
REVERT: 0f2979a38e Problem: assignment used as condition warning
REVERT: 24edc828ab Problem: redundant else after return
REVERT: 88646438d2 Problem: differing parameter names between declaration and definition
REVERT: 6c67fca7e0 Problem: numerous hicpp-signed-bitwise warnings that cannot easily be solved because of externally defined types
REVERT: da4309da13 Problem: violation of parameter naming conventions
REVERT: 29f1f39df3 Problem: unused parameter warning
REVERT: b59d7d574d Problem: typo in parameter name
REVERT: a91c7e718c Problem: warnings on violations of CERT ERR-58
REVERT: 0dce223341 Problem: no check if noexcept is supported by compiler
REVERT: 93194e7c53 Problem: non-portable memset
REVERT: 9c8fde09ca Problem: inconsistent control structures in address.cpp, redundant check for NULLness before delete
REVERT: 0179b7577a Problem: literals protocol names used at various places
REVERT: 06eaf20571 Problem: autoconf checks tautological compiler flag only for C++
REVERT: bd76926f5b Problem: code style issues in options_t (C-style cast, suboptimal std::string::find call, redundant method is_valid)
REVERT: a96a87f343 Problem: problematic atoi function is used (CERT ERR-34C)
REVERT: 273137741a Problem: protected data members in ip_address_t, ip_address_mask_t violates LSP
REVERT: 314ac28dbd Problem: protected data member in ip_resolver_t
REVERT: 573815da83 Problem: protected data member in encoder_base_t
REVERT: 088fd65bf2 Merge pull request #3143 from sigiesec/remove-extra-files
REVERT: be8e7de6be Problem: temporary files in repo
REVERT: c6c63481c3 Merge pull request #3142 from sigiesec/analyze
REVERT: 5a343fc27b Problem: stream_t/router_t access data member of base class
REVERT: ab3895a470 Problem: duplicated code in stream_t & router_t
REVERT: 09fab930b3 Problem: xwrite_activated duplicated between stream_t and router_t
REVERT: c9d6ef3035 Problem: Member outpipes is duplicate between router_t and stream_t
REVERT: 728eddfcfd Problem: socket_base_t::connect_routing_id is protected and only used in router_t and stream_t
REVERT: 25461a78dd Problem: members of mechanmism_t are needlessly protected
REVERT: 2dfdcaff26 Merge pull request #3141 from sigiesec/analyze
REVERT: 47dcd84f21 Problem: C-style casts
REVERT: 917a4a8e10 Problem: reinterpret_casts between unsigned char* and char*
REVERT: 0a43c66a32 Problem: magic literals in zap_client.cpp
REVERT: 7c2d1c1824 Problem: magic literals for UCHAR_MAX
REVERT: a4c817e736 Problem: magic number "2" in socket_base.cpp
REVERT: d75ec5e055 Problem: produce_* functions always return 0
REVERT: 7f880c256f Problem: magic numbers and data duplication in plain_*.cpp
REVERT: 8269b23e56 Problem: magic numbers and code duplication in msg.cpp
REVERT: 18000a213f Problem: magic numbers in mechanism_base.cpp
REVERT: abca9f6bc1 Problem: Magic numbers in plain_server.cpp
REVERT: 2da6629e0f Problem: Magic numbers "1" and "100" in signaler.cpp
REVERT: a6060674b4 Problem: Magic numbers "32" and "128" in tcp_address.cpp
REVERT: 93e75fd695 Problem: Magic numbers "6" and "7" in null_mechanism.cpp
REVERT: c05db7f025 Problem: Magic numbers "1" and "6" in null_mechanism.cpp
REVERT: ff27dd01f0 Problem: Magic numbers "1" and "4" in mechanism.cpp
REVERT: 7c9d058cdb Problem: Magic number "2" in ip_resolver.cpp
REVERT: 16bb62e6f7 Problem: ctx_t::_slots is a plain array
REVERT: a0a60e80ca Problem: Magic number "2" in ctx.cpp
REVERT: bbc903884f Merge pull request #3140 from bluca/clang_tautological
REVERT: 58d13395ec Problem: clang 6 warns about comparisons on 64 bit
REVERT: 624c142365 Problem: static analysis warning about ifdef typo
REVERT: 2d1bb07f8d Merge pull request #3139 from sigiesec/style-improvements
REVERT: 779d120fa3 Problem: tests do not follow naming style
REVERT: d767909b50 Problem: old C-style casts used
REVERT: e3c73d9881 Problem: inconsistent naming style for private data members, conflicts with naming of local variables and member functions
REVERT: 06cfd0d8ad Problem: unclear why QueryPerformanceFrequency is called for every call of QueryPerformanceCounter
REVERT: 97ba02bc2f Problem: redundant empty dtor
REVERT: 6ef67f13e3 Problem: use of C-style casts and magic literals
REVERT: 089746959d Merge pull request #3137 from sigiesec/disable-parallel-testing
REVERT: 0c74e8a0ad Problem: cmake install is not tested
REVERT: a1efc68516 Problem: appveyor CI takes a long time
REVERT: 33ba7e14b3 Problem: VS2008/2010/2017 tests fail if run in parallel
REVERT: fae88633d7 Merge pull request #3138 from sigiesec/fix-various-style-issues
REVERT: 37344d0b7c Problem: redundant old-style void argument declarations
REVERT: 12a97bb769 Problem: redundant else after return
REVERT: 21498700ef Problem: integer literals assigned to bool variables
REVERT: eacc805646 Problem: complex unnecessary ternary expressions
REVERT: 1432011277 Problem: inconsistent local variable naming
REVERT: c581f43c97 Problem: parameter naming style inconsistent
REVERT: 79d5ac3dee Merge pull request #3135 from sigiesec/fix-heartbeat-ttl-max
REVERT: 763760988f Problem: VS2008 has no definition of UINT16_MAX
REVERT: 8b030a9256 Problem: no tests for corner cases of setsockopt ZMQ_HEARTBEAT_TTL
REVERT: d90e70c1cf Problem: maximum allowed value for ZMQ_HEARTBEAT_TTL is wrong
REVERT: 50374bf6f5 Merge pull request #3134 from sigiesec/fix-sonarcloud-component-name
REVERT: b791645a49 Problem: project key is not unique across organizations
REVERT: f0f029c549 Merge pull request #3132 from sigiesec/add-vs2008-vs2010-ci
REVERT: 653c2073de Merge pull request #3133 from bluca/sonarqube_token
REVERT: cf41aed29d Problem: missing sonarqube token
REVERT: 1644d162fb Merge pull request #3115 from sigiesec/analyze
REVERT: 6afa1cee3a Problem: travis-ci analysis build is always run
REVERT: 51fd4b6a9d Problem: analysis build on PR virtual merges
REVERT: 100745d312 Problem: appveyor analysis runs on all branches
REVERT: 51d4b00196 Problem: no clang-tidy configuration
REVERT: 7b686900f9 Problem: VS2008 build fails due to unavailable stdint.h
REVERT: 1e89a51734 Problem: broken indentation
REVERT: 2ae0c4e2c5 Problem: unnecessarily complex inheritance hierarchy in decoders, warning C4355 with VS2010
REVERT: d96a030125 Problem: no CI builds for VS2008/VS2010
REVERT: 4d3516f634 Problem: no static analysis under Linux
REVERT: 2b31e50b01 Problem: No static analysis under Windows
REVERT: edd9a0c5c8 Merge pull request #3130 from sigiesec/fix-automake
REVERT: b6d36c92a2 Problem: autotools build broken
REVERT: f3e7911dd6 Merge pull request #3127 from sigiesec/integrate-wepoll
REVERT: a6cfbca3ac Merge pull request #3128 from sigiesec/fix-test-inproc-connect
REVERT: 06e0c0776d Problem: cmake run is very slow with MSVC
REVERT: 013958299b Merge pull request #3129 from sigiesec/deprecate-msvc-sln-builds
REVERT: 64f2b100da Problem: test_context_socket is not thread-safe
REVERT: af6d70ec72 Problem: prepared Visual Studio solution files are hard to maintain and redundant with CMake builds
REVERT: 9df851225a Problem: test_radio_dish takes time near timeout
REVERT: 945c79de67 Problem: test cases setting ZMQ_MULTICAST_LOOP to false fail on Windows
REVERT: 57ef8e2e3e Problem: custom test ignore
REVERT: 2bdf86d6c2 Problem: timeout on test_many_sockets with epoll
REVERT: 275a89ac3c Problem: test_many_sockets does not show number of sockets that could be created
REVERT: bd129e78ff Problem: test assertion unnecessary complex
REVERT: f5aec6fb27 Problem: no CI build with epoll under Windows
REVERT: 082b6aa641 Problem: epoll not supported under Windows
REVERT: c62df64bc2 Problem: wepoll source not in repository
REVERT: b56e7f13c5 Merge pull request #3126 from sigiesec/migrate-test-inproc-connect
REVERT: 3730833f9d Merge pull request #3125 from sigiesec/improve-socket-inheritance
REVERT: fdfa907187 Problem: test_inproc_connect not using test framework
REVERT: 2d9a8955f5 Problem: race condition in making socket non-inheritable
REVERT: 44da0e7e42 Problem: code duplication in making sockets non-inheritable
REVERT: c432aada84 Problem: inconsistent error handling and unnecessary code duplication
REVERT: 44b0753c5c Merge pull request #3047 from acsearle/master
REVERT: d02ba13576 Merge pull request #3122 from sigiesec/test-migrations
REVERT: 6c106d3930 Merge pull request #3121 from sigiesec/split-poller-config
REVERT: 440be28d7e Problem: unnecessary non-const variables
REVERT: d6952ded71 Problem: unused include directives and redundant forward declarations
REVERT: 04ec6aaf28 Problem: malloc call may fail
REVERT: 18eabed6ea Problem: I/O thread poll poller build unsupported
REVERT: d326434b37 Problem: API poller cannot be set independently from I/O thread poller, poll I/O thread poller broken on Windows
REVERT: ad100b0b9f Problem: test_xpub_nodrop not using test framework
REVERT: f13377de05 Problem: test_pub_invert_matching failing
REVERT: 12c6ae2283 Problem: test_pub_invert_matching not using test framework
REVERT: fa467d3425 Problem: test_hwm_pubsub not using test framework
REVERT: ee85957dc4 Problem: no test case for polling pending connect that ultimately fails
REVERT: 8ad0d5896e prevent duplicate connections from PUB sockets also (see https://gith… (#3117)
REVERT: c178193c50 Merge pull request #3116 from sigiesec/fix-some-more-style-issues
REVERT: 4e616f30dd Problem: C-style casts used
REVERT: d002eb5578 Problem: analyzer does not know that zmq_abort does not return
REVERT: 7b3acd47b2 Problem: malloc may fail in blob_t ctors
REVERT: 9da0c6d62f Problem: goto jumping backwards
REVERT: 62e48f837d Problem: assignment within complex condition
REVERT: fcee4ccdfd Problem: type of retired_fd is not fd_t (but int)
REVERT: f103f62630 Problem: unreachable return statement
REVERT: 290d215324 Problem: stream_engine assumes options_t.type is a single byte, but its type is int
REVERT: 6a5051fac3 Merge pull request #3114 from sigiesec/fix-some-style-issues
REVERT: e19823d83a Problem: redundant else
REVERT: ad781319ef Problem: ternary operator used with boolean literals\n\nSolution: Use comparison with 0 instead
REVERT: 22b72bb678 Problem: deallocate calls release after de-allocation
REVERT: e37fc47fb6 Problem: return value is stored but never used
REVERT: 2120f6aced Problem: ypipe_t::read is called with NULL argument
REVERT: 440d428153 Problem: single-argument ctor of blob_t is not marked explicit
REVERT: fa027970bb Allow EBADF on iOS #3046
REVERT: cbd52feb48 Merge pull request #3112 from devindusoft/FixCompilation_ZMQ_ATOMIC_PTR_MUTEX
REVERT: 6a9c6d427f Merge pull request #3111 from sigiesec/win-draft-fix-and-migrate-test
REVERT: e78d20ff2c Problem: test_radio_dish_udp_ipv6 triggers assertion under Windows
REVERT: dd1c87f9d9 Problem: type mismatch errors/warnings in Windows build
REVERT: 10cb710ab8 Problem: appveyor builds do not build DRAFT
REVERT: 7953083617 Merge pull request #3109 from sigiesec/migrate-test-spec-dealer-to-unity
REVERT: b30cbfc112 Problem: test_spec_dealer not using test framework
REVERT: 63e1e745f8 Fixed compilation with ZMQ_ATOMIC_PTR_MUTEX
REVERT: d81a041f18 Merge pull request #3103 from sigiesec/win-warnings-as-errors
REVERT: d437d668c0 Problem: MSVC warnings in connection with poll
REVERT: e447f058e2 Problem: C4244 warnings regarding SOCKET vs. int in test_system
REVERT: 106127b5d6 Problem: C4267 warnings in test_stream_disconnect
REVERT: 5ca0d4e8a9 Problem: C4267 warnings in test_spec_router
REVERT: 69a6b86310 Problem: C4267 warning test_spec_pushpull
REVERT: 3cbc7cb0dc Problem: C4244 warnings regarding SOCKET vs. int in test_security_null and test_security_plain
REVERT: 3ee65906af Problem: various warnings regarding SOCKET vs. int in test_security_curve
REVERT: 28631d1cd3 Problem: C4550 warning in testutil_security
REVERT: b0c3a42ed2 Problem: C4800 warnings in unittest_ip_resolver.cpp
REVERT: c589f2b603 Problem: C4800 warning in socket_base.cpp
REVERT: c52871f82c Problem: C4627 warning in proxy.cpp and signaler.cpp
REVERT: a8095a1046 Problem: C4800 warning in ip_resolver.cpp
REVERT: 95c770a275 Problem: C4099 warning in udp_engine.cpp
REVERT: d7e99085ef Problem: Warnings in Windows builds
REVERT: 6092431b97 Merge pull request #3100 from sigiesec/fix-poller-invalid-events
REVERT: 8ad43907e6 Merge pull request #3101 from bluca/heartbeat_disabled
REVERT: bf6bde3ae3 Problem: unnecessary ifdefs regarding handling of int vs. SOCKET at various places
REVERT: e8877f78a9 Problem: zmq_poller_[add/modify] accept invalid events arguments silently
REVERT: eac265059d Problem: heartbeat tests are disabled
REVERT: 6b9b369469 Problem: zmq_poller_* argument check code is cloned
REVERT: 54aff77475 Merge pull request #3096 from sigiesec/add-poller-docs
REVERT: 4fea7184dc Problem: man zmq_poller_* not working
REVERT: f4b1cae082 Problem: no documentation for zmq_poller_*
REVERT: 213254cca5 Problem: inconsistent behaviour of zmq_poller_new in case of memory exhaustion
REVERT: 2cd147e5ff Problem: misleading comment for calling zmq_poller_add with events == 0
REVERT: 00d25b7873 Problem: inconsistent behaviour of zmq_poller_add and zmq_poller_add_fd in case of memory exhaustion
REVERT: 0a037a7431 Merge pull request #3097 from sigiesec/ping-context
REVERT: be66eacf5c Problem: test_heartbeats still using plain assertions
REVERT: b331caad06 Problem: ZMTP 3.1 PING Context not implemented
REVERT: 5482b1ca45 Problem: heartbeat command parsing does not check command name size
REVERT: ba9274c39a Problem: test_heartbeats mocked ZMQ_REP is hacky and fragile
REVERT: f218478237 Problem: test_heartbeats use no test framework
REVERT: df2fe88b92 Merge pull request #3095 from bluca/sunstudio_linux
REVERT: 09f700f72e Problem: uninitialised class variable warning
REVERT: 7ba074fa28 Problem: Sun Studio build errors
REVERT: cdb54d248b Merge pull request #3094 from simias/mcast-if
REVERT: a833ace204 Problem: no way to specify source interface for UDP multicast sender sockets
REVERT: f6e528443e Merge pull request #3093 from simias/fix-aliasing
REVERT: 4eb6786347 Problem: test_radio_dish triggers aliasing errors with some compilers
REVERT: 21f642fa4f Merge pull request #3092 from bluca/solaris_studio
REVERT: c5b7f4f536 Problem: test_system info output hidden on Solaris
REVERT: 510a42c3d5 Problem: test_system fails on Solaris due to lower file limit
REVERT: b78cfb2395 Problem: mismatching declarations and definitions break Solaris Studio build
REVERT: 8b82ed50a2 Problem: Solaris Studio does not convert from char * to string
REVERT: 3d9c119543 Problem: compilation broken on Solaris
REVERT: 15e8de2f88 Merge pull request #3091 from sigiesec/fix-warnings-msvc
REVERT: d6433b5c24 Problem: warnings in MSVC builds around size_t/int
REVERT: 5fe783070b Merge pull request #3085 from bluca/getrandom_test
REVERT: 0f896fcd36 Merge pull request #3087 from simias/mcast_loop
REVERT: 4b635c3d06 Problem: documentation for zmq_udp is outdated
REVERT: 99412c810d Problem: ZMQ doesn't expose the MULTICAST_LOOP socket option
REVERT: e9211aed2c Merge pull request #3086 from simias/warning-fix
REVERT: f9c30f3e19 Problem: test helper recv_string_expect_success ignores the flags argument
REVERT: 3c2656eb52 Merge pull request #3081 from simias/udp_ipv6
REVERT: b0df4be51c Problem: UDP engine does not support IPv6
REVERT: 4ff814f204 Problem: getrandom test does not check if it's working
REVERT: 7aba6821ac Merge pull request #3084 from jorikcaljouw/new_fix_vs2015
REVERT: 45b0ff59ff Add ip_resolver.cpp and ip_resolver.hpp for vs2015 libzmq project
REVERT: b9ba36389d Merge pull request #3083 from asafkahlon/master
REVERT: 2ec5a33f6e acinclude.m4: check if -latomic is needed.
REVERT: 363fa7892d Merge pull request #3078 from simias/mcast_bind
REVERT: 746d4a0f5e Problem: UDP transport doesn't let the user specify the local bind address for multicast
REVERT: 524affc4c3 Problem: UDP address parser uses ad hoc code to detect multicast address
REVERT: 1bb1029bd1 Merge pull request #3075 from simias/udp_parser
REVERT: 2dc8579412 Problem: the UDP address code uses an ad hoc custom parser
REVERT: 0b36b84243 Problem: no unit tests for udp_address.cpp
REVERT: 801559c504 Merge pull request #3077 from simias/port_check
REVERT: 406c348771 Problem: ip_resolver allows wildcard ports for non-bindable sockets
REVERT: 889ac2eb3d Merge pull request #3074 from simias/author
REVERT: e027c80ed3 Added simias.md to RELICENSE
REVERT: 142ee305e7 Add Lionel Flandrin to AUTHORS
REVERT: 5f7c9c43f5 Merge pull request #3070 from simias/ip_refactor_clean
REVERT: 4cd2c2ebf8 Problem: address parsing code is tied to the TCP code
REVERT: 6160da5dbe Merge pull request #3068 from bluca/appveyor_cache
REVERT: 578c255f4f Problem: Appveyor VS 2015/17 images are single-core
REVERT: 2af2701ba6 Problem: Appveyor rebuilds libsodium every time
REVERT: 09d951ada3 Problem: Appveyor runs test sequentially
REVERT: e5eab4b91f Problem: CMake parallel build not enabled for C files
REVERT: 5210fa4e8d Merge pull request #3066 from AxelNennker/patch-3
REVERT: d47726ae41 Merge pull request #3065 from AxelNennker/patch-2
REVERT: 1d25658332 Update android_build_helper.sh
REVERT: d36c1ca5e0 Update README.md
REVERT: 9e4447f8e6 Merge pull request #3064 from AxelNennker/patch-1
REVERT: 990268e1db use HTTPS when downloading a binary before excuting it check hashes
REVERT: 046689bbe7 Merge pull request #3063 from bluca/heartbeat
REVERT: 4a4c6c27e4 Problem: heartbeat tests only cover ROUTER/DEALER
REVERT: cae6434345 Problem: HEARTBEAT command breaks REQ connection
REVERT: cdf5566108 Problem: default ZMQ_HEARTBEAT_TIMEOUT when enabled not documented
REVERT: 55be8f1c2f Merge pull request #3058 from dwijnand/patch-1
REVERT: e6dc9605a5 Fix formatting in CONTRIBUTING
REVERT: 69a894e1cb Merge pull request #3055 from dennisklein/master
REVERT: 0dda63660e Install relocatable dylibs (MacOS)
REVERT: 7f230b12fe Merge pull request #3053 from bluca/draft_doc
REVERT: c027255329 Problem: Server-client not marked as DRAFT in manpage
REVERT: 54fd20afdf Merge pull request #3049 from maksqwe/fix_fd_cast
REVERT: 989dfc7801 Fix fd_t variable casting on Windows platform
REVERT: c971445025 Merge pull request #3045 from asafkahlon/fix-configure-dladdr-check
REVERT: ce2f87970d configure.ac: serach for dladdr only on libunwind
REVERT: 8e8009ec5d Implement the wsa_error_no function with switch-case (#3044)
REVERT: bb4fb32925 CMake: Linker PDB install rule does not work when Visual Studio generators are used (#3040)
REVERT: 02eefb41ad Merge pull request #3039 from msune/refix_pedantic_warnings
REVERT: c7d602a29b Problem: C++ style comments in header file breaks pedantic build
REVERT: efc9efc42f Merge pull request #3037 from bluca/tweetnacl_pedantic
REVERT: 15905c5561 Problem: C++ style comments in C file breaks pedantic build
REVERT: 2aa54d6620 Merge pull request #3029 from sigiesec/fix-poller-context-shutdown
REVERT: f571c22851 Problem: socket_poller destruction after context shutdown is only tested with a non-thread-safe socket
REVERT: 87fbb5c447 Problem: socket poller shutdown asserts when context is terminating
REVERT: 32c8abb1d8 Problem: regression when zmq_poller_destroy is called after zmq_ctx_term
REVERT: ef6162ab77 Merge pull request #3027 from bluca/cmake_format
REVERT: 099070c396 Problem: clang-format Travis job broken
REVERT: 8fb5b10d8a Problem: `make dist` results are not tested (#3024)
REVERT: c8a1c4542d Merge pull request #3020 from bluca/newver
REVERT: 6f26a33359 Problem: 4.2.5 is out, we need to restore API changes and 4.3.x
REVERT: d062edd8c1 Finalise changelog for 4.2.5
REVERT: d70981f54d Merge pull request #3019 from bluca/newver
REVERT: a66a9d9e8d Problem: want to release 4.2.5 but no NEWS
REVERT: 5f17e26fa4 Problem: regression in 4.2.3 went unnoticed, want to release 4.2.5
REVERT: 7f1f7057d8 Merge pull request #3018 from bluca/null_auth_regression
REVERT: 1c5a63e939 Problem: backward incompatible change to NULL with ZAP
REVERT: e4b3bd8631 Problem: cannot set ZAP_ENFORCE_DOMAIN in testutil's wrappers
REVERT: 7722381fe7 Merge pull request #3016 from bluca/fix_docs
REVERT: 1b733e75a2 Problem: zmq_connect doc says inproc has to be bound first
REVERT: dba4ef28cc Problem: zmq_close manpage does not say it's asynchronous
REVERT: 9f2f30b7ff Problem: docs say STABLE API still in DRAFT
REVERT: 0e1a9a5252 Merge pull request #3015 from aytekinar/3012-gcc-fix
REVERT: 6fa9362351 Fix gcc build problem
REVERT: 0b99710949 Merge pull request #3014 from bluca/draft
REVERT: 3cb79f5042 Problem: ZMQ_BINDTODEVICE has met STABLE conditions
REVERT: 374da4207b Problem: ZMQ_MSG_GSSAPI_* have met STABLE conditions
REVERT: a4b74a7b05 Problem: ZMQ_ZERO_COPY_RCV not marked as DRAFT in docs
REVERT: 6411c4a247 Problem: ZMQ_MSG_T_SIZE has met STABLE conditions
REVERT: 7fb3bdd59a Merge pull request #3013 from bluca/newver
REVERT: f0378bfbf7 Problem: 4.2.4 is out, version is out of date
REVERT: 44f7158b29 Finalise changelog for 4.2.4
REVERT: 4efc2bf44e Problem: no mention of #2942 in NEWS
REVERT: 45681798b7 Merge pull request #3011 from sigiesec/migrate-to-unity
REVERT: 84a3767d61 Problem: open TODO comment regarding explicit zmq_disconnect/zmq_unbind
REVERT: 786a8d48d5 Problem: code duplication in test_reqrep_tcp
REVERT: 8372797cc3 Problem: code duplication in test_reqrep_tcp
REVERT: c84c3a525a Problem: test_reqrep_tcp not yet using unity
REVERT: 15b3dccf47 Merge pull request #3009 from bluca/newver
REVERT: 780813c4e7 Problem: NEWS out of date
REVERT: a415ede398 Merge pull request #3008 from eponsko/master
REVERT: 6a5af3dae6 Removed unnecessary errno_assert
REVERT: 9d3efcb030 Merge pull request #3002 from eponsko/master
REVERT: 65a9670065 Problem: ZMQ_DISH over UDP triggers errno_assert() after hitting watermark
REVERT: e49a861f7c Merge pull request #3001 from bluca/sodium_global_init
REVERT: 8f5fc705e4 Problem:  global random init/deinit breaks existing applications
REVERT: 4d9fc8066f Merge pull request #2999 from sigiesec/migrate-to-unity
REVERT: 6d89635f9a Problem: test_udp not using unity
REVERT: dc2764f58c Problem: test_last_endpoint not using unity
REVERT: 1747cbdcac Problem: test_immediate not using unity
REVERT: 6f8b604648 Problem: test_radio_dish not using unity
REVERT: cdc298f567 Problem: bind_loopback_ipv4 not reusable
REVERT: 8d0d4c76ee Merge pull request #2998 from kachanovskiy/master
REVERT: eb76ea06bd Fix for #2997
REVERT: 9079cf8ed4 Merge pull request #2995 from eponsko/master
REVERT: 4cb15ec638 Merge pull request #2994 from sigiesec/migrate-to-unity
REVERT: 57422c7df1 Problem: Documentation missing for ZMQ_METADATA socket option
REVERT: 7bd57ba83b Problem: test case tests multiple aspects
REVERT: 3e374d98f1 Problem: test case tests multiple aspects
REVERT: eb0307a9a6 Problem: test case tests multiple aspects
REVERT: 10dae6e830 Problem: test_poller not using unity
REVERT: 991b2336e4 Problem: test_thread_safe not using unity
REVERT: 5d32828bbf Problem: test_reconnect_ivl not using unity
REVERT: e388774737 Merge pull request #2981 from eponsko/master
REVERT: 1e217ac063 Problem: unity built with unnecessary float but without command line argument support
REVERT: f92cdf9470 Problem: test_ctx_destroy not using unity, and mixing test cases
REVERT: b2e50d9d03 Merge pull request #2992 from sigiesec/migrate-to-unity
REVERT: fa89fb8639 Problem: Makefile.am missing unity dependencies
REVERT: 9553a1f33e Problem: test_connect_resolve not yet using unity
REVERT: 6f9459e3fb Migrate tests/test_conflate.cpp to unity
REVERT: d318c95bc2 Problem: different aspects mixed in one test case
REVERT: dbcd42c58d Migrate tests/test_client_server.cpp to unity
REVERT: 0114572ce6 Migrate tests/test_bind_src_address.cpp to unity
REVERT: be33dce68e Migrate tests/test_bind_after_connect_tcp.cpp to unity
REVERT: 631de94563 Problem: test_router_hangover not yet using unity
REVERT: 59516ed51a Merge pull request #2990 from sigiesec/migrate-to-unity
REVERT: dd5eec35be Support application metadata through ZMQ_METADATA
REVERT: 59157f0e2f Problem: missing guidelines on proper test cleanup
REVERT: 9e3932b46b Problem: test assertion failures do not clean up properly
REVERT: df03bf4825 Merge pull request #2987 from sigiesec/migrate-to-unity
REVERT: c602361836 Problem: debug output in CMake file
REVERT: 437e9f4f59 Problem: tests readme outdated
REVERT: ae558706bf Problem: test_hwm and test_router_mandatory not yet using unity
REVERT: c9437ab755 Merge pull request #2986 from wittmeie/ws/fix-for-windows-imported-target
REVERT: d2293da6e5 Merge pull request #2983 from tonytheodore/master
REVERT: 79d9f2ba1e Fixes missing IMPORTED_LOCATION in import-target
REVERT: c7876c097f Problem: mingw static/shared builds have different preprocessor defines
REVERT: 9c748f1bf1 Partial fix for issue 2963, removed invalid casts from fd_t to int (#2984)
REVERT: 794d7a3143 Problem: certain windows header files are actually lowercase
REVERT: 7bce4ffbc7 Merge pull request #2982 from bluca/formattweetnacl
REVERT: 8d544ef1c4 Problem: formatting issues in the CI
REVERT: fef99d6c50 Problem: tweetnacl is external code and clang-format parses it
REVERT: 4726f7262d Pull request to merge porting to WindRiver VxWorks 6.x (#2966)
REVERT: 0d23b5ca69 Merge pull request #2980 from kachanovskiy/master
REVERT: 90342e0d29 Fixed issue #2979
REVERT: 19060345e4 Problem: TIPC availability check is too strict (#2977)
REVERT: 7abb8388d6 Problem: Tests for different TIPC address types missing (#2956)
REVERT: 40c6c1a7c9 Merge pull request #2976 from zeromq/revert-2974-static_init_gcc
REVERT: cef9cfa091 Revert "Problem: mis-detection of threadsafe_static_init causes test failures"
REVERT: 0c6c935726 Merge pull request #2974 from bluca/static_init_gcc
REVERT: 9bd2d3f937 Problem: mis-detection of threadsafe_static_init causes test failures
REVERT: 677efea238 Merge pull request #2973 from bluca/deb7
REVERT: e0b1992dd7 Problem: build broken with gcc-4.7
REVERT: ec58ba04f3 Merge pull request #2972 from sigiesec/reduce-sockopt-code-duplication
REVERT: 6f967c3a13 Problem: code duplication in getsockopt/setsockopt
REVERT: 10d2b2885e Merge pull request #2971 from ZMQers/fix-static-init
REVERT: 494c2a71f8 Merge pull request #2970 from bluca/format
REVERT: c36d8cb8e4 Problem: PR template does not mention clang-format
REVERT: 541ca30d8e Problem: make clang-format still shows error in the CI
REVERT: 4ea1e78d9d Merge pull request #2969 from skaes/master
REVERT: fcbd2a5710 Problem: enormous memory increase due to zero copy decoding
REVERT: 3658b2b580 Problem: pthread condvar timeouts are broken (#2967)
REVERT: 8cdfc8b9dd Problem: static initialization order fiasco
REVERT: d54633add1 Merge pull request #2964 from bluca/fix_mtrie_32bit
REVERT: 23025f44c6 Problem: unittest_mtrie fails on 32bit *nix
REVERT: 173b54a8c9 Merge pull request #2950 from zeromq/add-unittests-mtrie
REVERT: 9cd01bb54f Problem: inconsistent return values from mtrie_t::rm
REVERT: 36cdcc6c1a Problem: docs of mtrie referring to subscriptions and pipes
REVERT: e34e03d1a6 Problem: missing test case for addition of duplicate entry
REVERT: d57422819a Problem: documentation for ZMQ_XPUB_VERBOSE(R) is unclear
REVERT: 354491ddf2 Problem: no test for ZMQ_XPUB_VERBOSE(R)
REVERT: 5d5def40b5 Problem: casts required due to void* arguments in a C++ class
REVERT: 15b4f596a8 Problem: insufficient unit tests for mtrie
REVERT: 5fb0e97ab7 Problem: semantic issues
REVERT: 8bb055ece8 Problem: insufficient unit tests for mtrie
REVERT: 0e34d13063 Problem: insufficient unit tests for mtrie
REVERT: 506f0e5c44 Problem: insufficient unit tests for mtrie
REVERT: 56d806a9ef Problem: infufficient unit tests for mtrie
REVERT: b42a59a839 Problem: insufficient unit tests for mtrie
REVERT: 96fb17cb55 Problem: unittests not recognized by code coverage measurement
REVERT: dbbc10e05b Problem: incomplete test coverage of mtrie
REVERT: a9712c0bf2 Problem: no unittests for mtrie
REVERT: 9fc3692e3f Problem: read-only arguments of mtrie are not declared as const
REVERT: 31387f84e4 Merge pull request #2960 from Romain-Geissler-1A/fix-gcc-8-build
REVERT: 1e03f7b2d4 Fix gcc 8 build warning/error with -O3.
REVERT: b575b05d2c Merge pull request #2951 from eponsko/master
REVERT: 78aa9b1983 Support addressing TIPC Port Identity
REVERT: 4c7c9b87bf Merge pull request #2947 from sigiesec/fix-unittest-poller-race
REVERT: 2700c15d67 Merge pull request #2946 from hartcw/master
REVERT: ef7cb96782 Fix cmake install error when BUILD_SHARED is off
REVERT: d470475272 Add cmake build option for disabling tests
REVERT: dee0213108 Ensure correct cmake target suffix for all builds
REVERT: 5224b8704a Problem: race condition in unit test
REVERT: 487c275809 Merge pull request #2945 from kachanovskiy/master
REVERT: e10464e45e Fix for build break when SIO_LOOPBACK_FAST_PATH is not defined (i.e. in VS2010)
REVERT: bc467f0631 Merge pull request #2944 from sigiesec/unity
REVERT: 94743fd21f Problem: wrong formatting in several files
REVERT: 90c6d993be Problem: kqueue_t fails unittest_poller
REVERT: 3b90ad8c63 Problem: support of std::atomic is incomplete in VS <2015
REVERT: 9aa957b445 Problem: appveyor builds fails if they are not the most recent commit
REVERT: 815c7db06b Problem: poll build runs as last appveyor build
REVERT: 0458b85dec Problem: Some tests timeout on appveyor for POLLER=poll
REVERT: 96131b5b4e Problem: no documentation of the poller concept
REVERT: fafea72b92 Problem: header files not included in VS project files
REVERT: a8e9032dc5 Problem: unreachable code in io_thread_t::process_stop
REVERT: 922053237f Problem: test_sockopt_hwm not using unity
REVERT: a5738529e8 Problem: wsa_assert does not include error code
REVERT: e8e24030ea Problem: network initialization and shutdown functions not available for reuse
REVERT: ecb3b503c3 Problem: no output of details on test failure
REVERT: e57afec80e Merge pull request #2943 from sigiesec/fix-select-unix
REVERT: c62574ffca Problem: segfault in select_t::trigger_events
REVERT: 11a5388637 Problem: data race w.r.t. select_t::stopping
REVERT: e650240580 Problem: data race w.r.t. poll_t::stopping
REVERT: 08201bc1b9 Problem: select blocks forever under Unix
REVERT: a30133d8f5 Merge pull request #2935 from ZMQers/unity-base
REVERT: d0e01b4bb2 Problem: regression with "select" on *nix (#2940)
REVERT: 9ec95f9d46 Problem: build failure with VS <2015, has no snprintf
REVERT: 29e304ea5c Problem: unity license not mentioned in debian/copyright
REVERT: 1478fd0022 Problem: unittests not built with autotools
REVERT: f6f67cbf96 Problem: no autotools support for building with unity
REVERT: 7ea924c763 Problem: segfault on thread_t::stop if thread was never started
REVERT: 56c726d425 Problem: no unit tests
REVERT: f87d3ab294 Problem: pollers unnecessarily depend on whole ctx_t, but actually use only start_thread method
REVERT: 687f6a694f Problem: license and source information missing
REVERT: 5f854a31b7 Problem: test_security_curve not using test framework
REVERT: 21879abb5b Problem: test_socket_null not using test framework
REVERT: 61a28a26cc Problem: no test framework
REVERT: afd5d9f721 Merge pull request #2939 from sigiesec/fix-poll-timer-event-retiring
REVERT: 5873894c83 Problem: wrong assertion macro used on Windows
REVERT: 2f27bcd74b Problem: assertion failure in poll_t::poll if timer_event retired a pollset entry
REVERT: a2af3d18cc Problem: unittest_poller fails for poll_t
REVERT: ac777bad94 Merge pull request #2938 from bluca/format_autotools
REVERT: 504e6d0ecc Merge pull request #2937 from bluca/gcc_4_build
REVERT: d832267e23 Problem: make format-check not implemented with autotools
REVERT: 9b1ce59719 Problem: DRAFT build broken with GCC 4.7
REVERT: c33cb38af2 Merge pull request #2928 from eponsko/master
REVERT: eded1f8b90 Merge pull request #2923 from sigiesec/fastpath
REVERT: a57f7e3824 Add support for ZMQ_XPUB_NODROP on ZMQ_RADIO sockets
REVERT: a5e763039d Problem: use of TCP loopback fastpath not available for user sockets
REVERT: 490d76da2f Problem: SIO_LOOPBACK_FAST_PATH not activated for signaler socket pair
REVERT: 9544dade49 Merge pull request #2926 from sigiesec/fix-issue-2925
REVERT: 50d80d0835 Problem: test_timeo frequently fails on travis, probably because of slow execution
REVERT: 88d8c768d1 Problem: test_timers frequently fails on travis-ci
REVERT: 3baefc66ea Problem: incomplete assertions around modifications of fd_entries vs. load
REVERT: a1d55d0506 Problem: race conditions for options.linger (#2910)
REVERT: de0c669323 Problem: std::atomic not used on Visual C++ although it is available (#2930)
REVERT: 52d64e1d5d Merge pull request #2929 from sigiesec/add-windows-poll-build
REVERT: cdfc6bb8b3 Merge pull request #2924 from sigiesec/tcp-cleanup
REVERT: 9fbd125b41 Merge pull request #2917 from ZMQers/thread-safe-simplification
REVERT: 147fe9ed77 Problem: code duplication and unnecessary nesting around ZMQ_THREAD_SAFE querying
REVERT: cb9ccfa154 Merge pull request #2921 from sigiesec/mechanism-cleanup
REVERT: 2e849a4d60 Merge pull request #2913 from ZMQers/add-const
REVERT: 9872daa293 Merge pull request #2912 from ZMQers/socket-base-signaler-unreachable-code
REVERT: 3491fd0421 Merge pull request #2932 from sigiesec/reapply-2920
REVERT: fdcb4520ca fix Windows Intel compiler build failure
REVERT: 0b509c3d5b Problem: no CI build on Windows with POLLER=poll
REVERT: 2c2ea82789 Problem: duplicated code, redundant member handle_valid, asymmetry between   tcp_connecter and tcp_listener
REVERT: 06d805ff82 Problem: unnecessary complex operations in socket_base_t::term_endpoint
REVERT: 9a6993adce Problem: several code style issues in mechanism_t: code and data duplication, unnecessary construction of temporary std::string
REVERT: 368eff9ecb Problem: several fields are non-const without need
REVERT: 5b510656d0 Problem: unreachable code around socket_base_t::add/remove_signaler
REVERT: b77d7610cd Merge pull request #2908 from ZMQers/clang-format
REVERT: 3bcbd6544b Merge pull request #2922 from zeromq/revert-2920-work/fix-icl-build
REVERT: 08cc22a52b Revert "Problem: Windows Intel compiler build broken"
REVERT: c43c8795ca Merge pull request #2920 from tetsuh/work/fix-icl-build
REVERT: fee3884b5d fix Windows Intel compiler build failure
REVERT: 43c11d0a61 Problem: cmake broken under Windows
REVERT: ac775ba48b Problem: clang-format-diff does not run
REVERT: 749a85cb21 Problem: travis-ci is using outdated clang(-format)
REVERT: 26b5b5b2d9 Problem: out-of-scope files are considered by cmake clang-format targets
REVERT: 4161793d19 Problem: clang-format not run on CI
REVERT: 41f459e1dc Problem: formatting inconsistent
REVERT: 6d8baea714 Problem: no definition for applying automated formatting
REVERT: a45e4bb7bc Merge pull request #2909 from eponsko/master
REVERT: 542fe67f25 Problem:  ZMQ_DISH triggers assert when hitting the watermark(?)
REVERT: 390d79e0ab Merge pull request #2904 from jimklimov/jf-testlog
REVERT: 2559a99570 Improve handling of Jenkinsfile failed testlog archives
REVERT: c6bd123650 Merge pull request #2903 from sigiesec/fix-2895-2
REVERT: 206c832167 Problem: in case of exhausted resources on creation of a context, assertions are triggered
REVERT: 4e2b9e6e07 Merge pull request #2902 from jimklimov/jf-testlog
REVERT: 21b0628cd1 Jenkinsfile : regenerated with zproject support for logging test-suite results (revised)
REVERT: aec6ea78c5 Jenkinsfile : regenerated with zproject support for logging test-suite results
REVERT: 7186cd515d Jenkinsfile : regenerated with zproject support for failed-test retries
REVERT: c6a6ec39a6 Jenkinsfile : regenerated with zproject support for better workspace cleanup before test preparation
REVERT: 4110c6b751 Jenkinsfile : regenerated with zproject support for configurable test timeout
REVERT: 59347f68b8 Jenkinsfile : regenerated with zproject support for cppcheck among other tests
REVERT: 70d3cc23be Jenkinsfile : regenerated with zproject support for DO_DIST_DOCS option
REVERT: da7d4d0760 Merge pull request #2901 from thedrow/patch-1
REVERT: befe62674c Enable ccache for faster builds.
REVERT: c52ca3c284 Merge pull request #2897 from sigiesec/fix-2895
REVERT: 7488be61c2 Problem: add_fd might be called with fd_ == retired_fd Solution: add assertion
REVERT: 4518e0cc35 Merge pull request #2889 from SalvoVirga/fix/libzmq-static-cmake
REVERT: 9d6a5f3c2f linkage is now homogeneous for both targets libzmq and libzmq-static all calls to target_link_libraries are now at the same location
REVERT: 2540e1a609 Merge pull request #2888 from minrk/fix-cmake
REVERT: 35c4b68a09 fix inclusion of cmake modules in dist
REVERT: 5f8488de6d move FindSodium to builds/cmake/Modules
REVERT: f8da0ac721 move cmake ZeroMQConfig.cmake.in to builds/cmake
REVERT: e2ed5a357e Merge pull request #2886 from SylvainCorlay/cmake-soversion
REVERT: 8d35cf82f1 [cmake] fix SOVERSION
REVERT: 21927a74d9 Merge pull request #2885 from JohanMabille/librt_fix
REVERT: b2a8bbd89b removing hard-coded path of librt
REVERT: 020b0bede8 Fix CMake tests on Windows (#2872)
REVERT: cea60575f3 Merge pull request #2879 from WallStProg/dup-connect
REVERT: ec05166545 prevent duplicate connections from PUB sockets also (see https://github.com/zeromq/libzmq/issues/788)
REVERT: 4621e5885e Merge pull request #2878 from evoskuil/master
REVERT: 2859cdea0b Problem: generated NuGet files out of date.
REVERT: 2b91051cda Problem: NuGet package versioning out of sync with releases.
REVERT: 4e20c4592a Merge pull request #2870 from evoskuil/master
REVERT: f41b51ee04 Problem: NuGet packaging versions out of date.
REVERT: 7133eafae1 Problem: shared NuGet packaging descr. is compiler-specific.
REVERT: 9622984241 Problem: vc++ 11.0 (vs 2012) compile fails on move semantics.
REVERT: 9f7a6aac23 Merge pull request #2869 from evoskuil/master
REVERT: 8d78e08f71 Problem: fn pointers are not bool (vc++ warning C4550).
REVERT: 87fbe5a542 Merge pull request #2868 from jasperla/openbsd/ucred
REVERT: 22b57f6f28 Problem: Build is broken on OpenBSD
REVERT: 15828e4804 Merge pull request #2866 from bluca/new_ver
REVERT: 28a65cad50 Merge pull request #2867 from gouarin/fix-missing-file
REVERT: 084568bdf9 add ZeroMQConfig.cmake.in in EXTRA_DIST
REVERT: 65a1e458ab Problem: 4.2.3 is out, version(s) are out of date
REVERT: 3226b8ebdd Finalise changelog for 4.2.3
REVERT: fa85072fc3 Problem: no NEWS item for #2861
REVERT: 66fe4296ff Merge pull request #2865 from jimklimov/jenkins-agent
REVERT: e4fee1d3e0 Problem: nuget packaging refers to imatix gsl
REVERT: 028d02a038 Merge pull request #2864 from jimklimov/jenkins-agent
REVERT: 3af762441a Problem: Jenkinsfile uses "any" agent
REVERT: e2dbc99c4c Merge pull request #2861 from glaure/master
REVERT: 5189898479 export ZMQ_STATIC compile flag to depending projects (MSVC)
REVERT: 9bb863618c Merge pull request #2860 from bluca/cmake_win_static
REVERT: 53e536a983 Problem: static build broken on Win + CMake
REVERT: 1dd42fef83 Merge pull request #2857 from jimklimov/jfdc
REVERT: 822c6341dd Problem: Jenkinsfile does not pass DISTCHECK_CONFIGURE_FLAGS and LD_LIBRARY_PATH into make
REVERT: c6356b9c5a Problem: Jenkinsfile tests libzmq for memcheck - there is not spoon
REVERT: e7440779a4 Problem: Jenkinsfile timeouts expire
REVERT: e201985ad3 Problem: Jenkinsfile does not use DISTCHECK_CONFIGURE_FLAGS
REVERT: 737ea1f60d Merge pull request #2856 from scpeters/patch-1
REVERT: de5e7a3983 Problem: WIN32 CMAKECONFIG_INSTALL_DIR is broken
REVERT: d15795b4e3 Merge pull request #2852 from bluca/pkg_include_cppzmq
REVERT: dee655959c Merge pull request #2853 from jimklimov/jf
REVERT: 83c042ccda Problem: Debian packages are missing zmq.hpp
REVERT: f90dbe08bb Introduce Jenkinsfile
REVERT: fcacb603d6 Merge pull request #2851 from bluca/zpoller_wait_news
REVERT: 156633feaa Problem: DRAFT API change not in NEWS
REVERT: d8aa8fc794 Merge pull request #2846 from bluca/appveyor_vs2013
REVERT: a88abaa579 Merge pull request #2848 from bluca/linger_news
REVERT: e3cbdf4b93 Problem: ZMQ_LINGER doc change not in NEWS
REVERT: 90ea11c999 Merge pull request #2847 from fnaime/default_linger
REVERT: da9bc91053 Wrong ZMQ_LINGER default value
REVERT: 96252e4aac Problem: Appveyor builds Libsodium when disabled
REVERT: 16d7686b48 Problem: no VS2013/17 CI jobs
REVERT: 9f83a5988d Merge pull request #2844 from bluca/cmake_double_build
REVERT: 574d72b0e2 Problem: Travis builds with brew fail
REVERT: 08289d8f33 Problem: cannot disable Werror with autoconf
REVERT: 0298d037d0 Problem: CMake rebuilds everything twice
REVERT: 5264d49eab Problem: duplicate definition in CMake tweetnacl builds
REVERT: b3bf51716e Merge pull request #2842 from bluca/accept4
REVERT: ac552ba448 Problem: accept4 not available on all platforms
REVERT: 0d0d72e836 Merge pull request #2841 from bluca/news
REVERT: 5a8fd337fd Problem: NEWS not up to date
REVERT: e523adf3da Problem: new monitor events missing from docs
REVERT: 7a7c776abb Problem: trailing whitespace in include/zmq.h
REVERT: d49b0fad6d Merge pull request #2840 from ccpaging/master
REVERT: 700d7cd142 Merge pull request #2839 from bluca/linger_test
REVERT: e8ad51e62f Clean code for Visual Studio 2008 compiler
REVERT: 741e5c3db4 Problem: debian builds ignore test failures hiding issues
REVERT: de8f14adf5 Problem: test_security_{zap|curve} often hangs
REVERT: d2b6985028 Merge pull request #2833 from bluca/stream_test_parallel
REVERT: cffc1c4d2d Merge pull request #2832 from ebyrob/fix-doc-zmq_msg_init-zmq_recv
REVERT: d7926d6d5a Change zmq_recv to zmg_msg_recv since zmq_msg_t is only used with the zmg_msg_recv style functions.
REVERT: 498c6bbb67 Problem: test_stream_exceeds_buffer cannot be ran in parallel
REVERT: e10b350630 Merge pull request #2827 from korli/haiku
REVERT: 23f89f4671 add Haiku support
REVERT: aafdeb7687 Merge pull request #2825 from rolftimmermans/req_relaxed_has_out
REVERT: c8592dfbc3 Problem: REQ socket with ZMQ_REQ_RELAXED does not report ZMQ_POLLOUT when queried for events after first message.
REVERT: b3d19ffe1a Merge pull request #2813 from AntonBarwald/master
REVERT: 630f6d6ae7 Problem: On OSX usleep() changes the errno value
REVERT: 812e756264 Merge pull request #2809 from sigiesec/optimize-select-win
REVERT: f9d7eea6f9 Problem: code duplication
REVERT: e7817ad38d Problem: code duplication
REVERT: 37914d1be2 Problem: get_fd_family call is expensive and called frequently for the same fds
REVERT: 2b75a9ef18 Merge pull request #2806 from sigiesec/initialize-wsaevents-only-when-used
REVERT: cd32603c0e Problem: wsa_events are initialized/destroyed within every loop iteration even if not used
REVERT: dec3af4d69 Merge pull request #2803 from f18m/master
REVERT: 2aa0e6fd4d Change ZMQ_THREAD_AFFINITY to ZMQ_THREAD_AFFINITY_CPU_ADD/ZMQ_THREAD_AFFINITY_CPU_REMOVE. Avoid prefix thread names when no prefix was set.
REVERT: cb266ee073 Merge pull request #2619 from diorcety/winxp
REVERT: 81327af557 Partial Windows XP support
REVERT: d459542176 Merge pull request #2800 from sigiesec/optimize-blob-t-router
REVERT: 7ec58b279a Problem: one missed optimization opportunity for blob_t map lookup
REVERT: 54ca01ac0e Merge pull request #2799 from sigiesec/optimize-map-ops
REVERT: a4aceb272b Problem: use of std::map::insert is inefficient
REVERT: 07eb52cbad Merge pull request #2797 from zeromq/fix-zmq-atomic-counter-value-docs
REVERT: 439e49bca1 Problem: description of return value is cloned from zmq_atomic_counter_new
REVERT: 0897b3e07b Problem: excessive memory allocations around blob_t (#2796)
REVERT: cfef04035c Clarify usage of zmq_close (#2792)
REVERT: 2c247271a3 Merge pull request #2793 from sigiesec/timeout-comment
REVERT: cfb2129557 Problem: comment before sndtimeo/rcvtimeo does not specify dimension
REVERT: 835df92241 Merge pull request #2791 from bluca/centos6
REVERT: cfe44284f7 Merge pull request #2790 from youRFate/master
REVERT: 4e1588c4c3 added note concerning issue 2788 to INSTALL
REVERT: bd2ff7fbf8 Problem: DRAFT build broken with old GCC due to missing SIZE_MAX
REVERT: fe96697e8b Merge pull request #2787 from youRFate/master
REVERT: 2e2c22dd5b Problem: DRAFT build broken with old GCC due to GNU modifier
REVERT: 6df5e771bb added libiphlpapi to PKGCFG_LIBS_PRIVATE for static mingw builds
REVERT: 55a347c7da Problem: zmq_proxy_steerable manpage does not mention multipart
REVERT: cc8d3586cd Problem: formatting error in zmq_ctx_set
REVERT: fa5443e92f Merge pull request #2786 from f18m/affinity-scheduling-docs
REVERT: b95ef430be Add docs for ZMQ_THREAD_NAME_PREFIX
REVERT: e12f3e68c0 Increase details in docs
REVERT: f25cd6e7be Background thread names (#2784)
REVERT: 9af03e2214 Merge pull request #2785 from bluca/travis_norm
REVERT: 5311aa9cd9 Problem: Travis does not build with NORM
REVERT: 189b551b40 Merge pull request #2783 from f18m/docs-proxy-stats
REVERT: e2678b8b11 Add documentation for new steerable proxy command
REVERT: 920288b5b7 Merge pull request #2781 from bluca/norm_pkgconfig
REVERT: 9ad8ddf401 Problem: deb packages do not build with libnorm
REVERT: 78cdff3a3e Problem: autoconf does not use pkgconfig for NORM
REVERT: 39ad27c970 Merge pull request #2779 from bluca/thread_fixes
REVERT: e5e83c53e5 Problem: ZMQ_THREAD_AFFINITY is not documented
REVERT: 1478517e1a Problem: use of nice() for ZMQ_THREAD_PRIORITY not documented
REVERT: 4c2a95eab2 Problem: test_ctx_options only checks global DRAFT flag
REVERT: bfbb4ff2e9 Background threads enhancements (#2778)
REVERT: 577e713e2c Merge pull request #2775 from arsenm/master
REVERT: 5f03120ac5 Add my RELICENSE
REVERT: 23da2347bd Merge pull request #2773 from bluca/zap
REVERT: b6aee51691 Problem: strict ZAP protocol adherence is backward incompatible
REVERT: 50bddbaac9 Problem: dead code in options.hpp
REVERT: e3ee55b191 Problem: missing indentation for UDP branch
REVERT: c8f3f8a5da Problem: ambiguos bitwise ANDs in if statements
REVERT: 136431ebf7 Merge pull request #2769 from bluca/ipc_fixes
REVERT: a6de31fff6 Merge pull request #2771 from bluca/lcov_autoconf
REVERT: 6a9dec30a9 Problem: lcov autoconf macro out of date
REVERT: ed64585e93 Problem: test_rebind_ipc might not see race condition on fast envs
REVERT: 53f463a3fa Problem: test_rebind_ipc uses generic socket file name
REVERT: 7ad06f1449 Problem: IPC event_closed logs -1 as the FD
REVERT: 9be8cebd21 Merge pull request #2765 from GreatFruitOmsk/issue-2764
REVERT: 656cdb959a Problem: Race condition in IPC sockets
REVERT: 01a3f3955c Merge pull request #2768 from ADDubovik/master
REVERT: 02c46463d7 fix build for msvc2017
REVERT: 99c527702b Merge pull request #2766 from hxw/master
REVERT: 997825bdf1 add __FreeBSD__ to ifdefs
REVERT: 44f96a3652 Merge pull request #2745 from sigiesec/rename-identity
REVERT: f6688f0516 Merge pull request #2756 from bluca/reconnect_ivl_connect
REVERT: 2c8a7223b8 Problem: remaining use of "identity"
REVERT: 7e3f4b1d32 Problem: ZMTP protocol broken w.r.t. Identity property
REVERT: a5e3a65ae2 Problem: inconsistency between zmq.h and zmq_draft.h
REVERT: 4b821d8f84 Problem: remaining uses of "identity"
REVERT: 1414bf938c Problem: use of unqualified "id" in code example
REVERT: d6694e7d47 Problem: Use of "rid" in the docs
REVERT: 12f62c74c1 Problem: docs refer to "Identity"
REVERT: fab57634b4 Problem: Message metadata properties still refer to "identity"
REVERT: 27c7e52a5a Problem: Usage of "rid" in server_t
REVERT: 41bae55af7 Problem: inconsistent naming related to routing ids
REVERT: 9e7507b38b Problem: term "identity" is confusing
REVERT: 76dfec7fc3 Merge pull request #2755 from sigiesec/client-side-error
REVERT: edb4ca1023 Problem: zmq_connect fails after disconnect due to RECONNECT_IVL == -1
REVERT: e0243dcbca Problem: tests where client should receive an ERROR sometimes do not receive an ERROR (probably because the connection is closed before)
REVERT: 843e627bed Merge pull request #2753 from zeromq/zap-domain-docs
REVERT: 7297df6278 Problem: documentation of ZMQ_ZAP_DOMAIN is wrong
REVERT: e2f2193bec Merge pull request #2752 from sigiesec/test-no-zap-handler
REVERT: 77f76a49b2 Problem: no tests for cases 5 and 6 of #2711
REVERT: e546f9296e Problem: duplicated code & inconsistent behaviour between mechanisms
REVERT: ee8b8bd29c Problem: no test for ZAP handler terminating in flight
REVERT: a5f94cb610 Problem: tests without ZAP handler are failing
REVERT: 13b972b226 Problem: no tests without ZAP handler where one is expected
REVERT: 9071265c02 Merge pull request #2751 from bluca/centos6
REVERT: 40c1a3ab7e Problem: CentOS 6 build fails
REVERT: 2e167886cf Merge pull request #2749 from reza-ebrahimi/master
REVERT: 23c2f4987b Merge pull request #2748 from tkoeppe/relicense
REVERT: 633325e0bc Update AUTHERS File
REVERT: 21d78f4789 RELICENSE: Google, Inc.
REVERT: 5de2a82be8 Merge pull request #2744 from msune/refactor_poller_wait
REVERT: 5b92989540 Problem: duplicated socket_poller::wait() code
REVERT: 18498f620f Merge pull request #2746 from zeromq/revert-2743-rename-identity
REVERT: af03241dcb Revert "Problem: term "identity" is confusing"
REVERT: 08b01a5108 Merge pull request #2743 from sigiesec/rename-identity
REVERT: cd55c62499 Problem: use of unqualified "id" in code example
REVERT: 0874eec803 Problem: Use of "rid" in the docs
REVERT: f174003740 Problem: docs refer to "Identity"
REVERT: deae59dca9 Problem: Message metadata properties still refer to "identity"
REVERT: ae2ea1a655 Problem: Usage of "rid" in server_t
REVERT: e00131dd43 Problem: inconsistent naming related to routing ids
REVERT: 1daf83079a Problem: term "identity" is confusing
REVERT: 876d90732d Merge pull request #2741 from bluca/proxy_stats_typos
REVERT: 4fac78ec31 Problem: proxy stat 5th multipart message treated as 1st
REVERT: d7da31ed25 Problem: typo in comment in proxy.cpp
REVERT: f520738a0a Merge pull request #2740 from bluca/proxy_stats_frames
REVERT: b8695a47b5 Problem: proxy_steerable STATISTICS returns conflated buffers
REVERT: a89d79aa71 Merge pull request #2738 from bluca/proxy_stat_fixes
REVERT: 78c4d33600 Problem: new STATISTICS proxy_steerable not behind DRAFT
REVERT: c5aef5e078 Problem: compilation fails on 32 bit
REVERT: 4be9513443 Add "STATISTICS" command to zmq_proxy_steerable()  (#2737)
REVERT: f4b32aa792 Merge pull request #2734 from pavel-pimenov/fix-v1001
REVERT: 197ae832bf Merge pull request #2735 from pavel-pimenov/fix-728
REVERT: 0e8bf3520c V728 An excessive check 'options.mechanism == 0' can be simplified. The '||' operator is surrounded by opposite expressions. session_base.cpp 377
REVERT: 51ac7d28c5 V1001 The 'ptr' variable is assigned but is not used until the end of the function.
REVERT: 7afd6ab5ef Merge pull request #2732 from bluca/compiler_warnings
REVERT: 8feed48bb9 Problem: switch statements without breaks
REVERT: 31089326fb Problem: unused variables warnings in get_peer_state
REVERT: 0382118371 Problem: unused variable in test_wait_corner_cases
REVERT: 31e3977ab9 Merge pull request #2731 from sigiesec/fix-issue-2723
REVERT: 17b95683ce Merge pull request #2730 from sigiesec/fix-issue-2623
REVERT: 79e28af4ce Problem: new function zmq_socket_get_peer_state not in zmq_draft.h
REVERT: f3b268d84f Problem: no tests for error cases of zmq_socket_get_peer_state
REVERT: eeccbbd6f8 Problem: test case fails with tcp transport
REVERT: fc334bc759 Problem: unclean and duplicated test code
REVERT: f70097c1cf Problem: test does not trigger HWM
REVERT: 48a1e637b6 Problem: zmq_socket_get_peer_state is not implemented
REVERT: cda20260b3 Problem: missing call to zmq_poller_destroy
REVERT: f4d139bd16 Problem: duplicated code in socket-related functions
REVERT: efa86fe629 Problem: no test case using the proposed zmq_socket_get_peer_state function
REVERT: 49e1b8b75f Problem: test case in main function
REVERT: 4691714d5c Merge pull request #2729 from bluca/cmake
REVERT: fab14a3cc1 Problem: support for CMake << 3.1 broken
REVERT: 23e018f37a Problem: termination is requested from a session's owner when already in pending termination while processing an error
REVERT: eb8105cde1 Problem: assertion failure in select.cpp:111 under Windows
REVERT: 124e04659c Problem: ZMQ_HAVE_O_CLOEXEC not defined by CMake
REVERT: 28a4b9a969 Merge pull request #2727 from fove-robin/fix-o-cloexec
REVERT: 83f54d90ad Problem: ZMQ_HAVE_O_CLOEXEC always disabled
REVERT: f1c72dc8e5 Merge pull request #2721 from bjovke/my_work
REVERT: 91e0d689bb Problem: Inconsistent size_t/int usage. Solution: types corrected.
REVERT: 9c8844fd08 Merge pull request #2719 from jimklimov/setThreadName
REVERT: 40a3b0746f Problem: cosmetic setThreadName() can be fatal
REVERT: 5c981be9f8 Merge pull request #2718 from sigiesec/issue-template
REVERT: 3f946428ec Problem: bug reports are often missing relevant information
REVERT: f6933f85a9 Merge pull request #2716 from sigiesec/remove-tweetnacl-from-coverage
REVERT: fc2b7cd5ea Problem: coverage includes tweetnacl, which is not our code
REVERT: 3d1f11881f Merge pull request #2715 from sigiesec/add-timers-tests
REVERT: 7eebed56a5 Problem: no test for zmq_timers_timeout without any active timers
REVERT: 6147e45a07 Problem: missing tests for zmq_timers_* corner cases, missing handling of such corner cases, code duplication, missing assertions in test code
REVERT: d072d57e2e Problem: no tests for zmq_timer_* with NULL timers argument
REVERT: 8b263d5820 Problem: test_timers.cpp sleep_ duplicates msleep from testutil
REVERT: 8f3113b278 Merge pull request #2714 from sigiesec/add-poller-tests
REVERT: f685a3ffd2 Solution: unreachable code paths in socket_poller_t
REVERT: 8ae91fdf9a Problem: no test cases for zmq_poller_add*, zmq_poller_modify*, zmq_poller_remove* corner cases
REVERT: 68f416c0ca Problem: missing test case for zmq_poller_wait_all with negative number of events
REVERT: a71f7b0405 Problem: zmq_poller_* uses ETIMEDOUT (instead of the usual EAGAIN) to indicate timeouts
REVERT: 6a3c053a3e Problem: EFAULT is returned for bad file descriptors passed to zmq_poller_*_fd
REVERT: 74303b08e6 Problem: calling zmq_poller_wait* with NULL events causes an assertion, as opposed to other NULL arguments, which return an error
REVERT: c1a4cfdd9f Problem: waiting on an empty poller with infinite timeout waits forever
REVERT: 0c9b16d62a Problem: missing test cases for zmq_poller_* functions called with invalid arguments and corner cases for zmq_poller_wait_*
REVERT: 2e4fc4faf0 Problem: zmq_poller_*_fd functions do not check for invalid fd
REVERT: f9af5503b4 Problem: missing test cases for zmq_poller_* functions called with invalid arguments
REVERT: 6f665eb951 Merge pull request #2712 from sigiesec/add-socket-null-tests
REVERT: 9a336622fb Problem: no tests for socket-related functions passing NULL as socket
REVERT: 1881735f7d Merge pull request #2710 from sigiesec/remove-select-rm_fd-code-duplication
REVERT: c3c2515542 Problem: code duplication within zmq::select_t::rm_fd
REVERT: ee7f5b9b97 Merge pull request #2708 from bluca/obs_flair
REVERT: c2ce55aaa4 Merge pull request #2707 from sigiesec/test-monitor-diagnostics
REVERT: 7cd890a8bc Problem: packages builds not mentioned in README.md
REVERT: 0aef54421d Problem: test_monitor is disabled on Windows
REVERT: 82227136ea Problem: test_monitor sometimes fails due to a wrong event received, but not known which
REVERT: 5e85fa6a39 Merge pull request #2698 from sigiesec/client-side-auth-error-events
REVERT: 74203729bd Problem: test_zap_unsuccessful_status_500 and test_curve_security_with_bogus_client_credentials sometimes fail, particulary on slow/valgrind runs
REVERT: bd0675b93f Problem: no tests for client-side events for successful handshake and authentication failure in handshake
REVERT: 7481fba561 Merge pull request #2706 from bluca/gssapi_test_monitor
REVERT: b239d99a2c Problem: test_security_gssapi does not close messages
REVERT: cd09065c8a Problem: test_security_gssapi expects wrong event
REVERT: 72b517b309 Merge pull request #2704 from sigiesec/fix-test-sockopt-hwm
REVERT: 00c6962516 Problem: test failing due to too few messages sent relative to SNDHWM
REVERT: 4c2acdacca Problem: wrong assumption on behavior of ZMQ_SNDHWM in test_sockopt_hwm.cpp
REVERT: 7283574cee Merge pull request #2703 from bluca/rpm_la
REVERT: cfc3c7a66b Problem: spec changelog out of date
REVERT: b3acae89e2 Problem: RPM -devel still ships libzmq.la
REVERT: 13f3ab988a Merge pull request #2702 from bluca/test
REVERT: 68ba6d17be Problem: Travis does not test PGM
REVERT: f979ed4f35 Problem: Travis does not test GSSAPI
REVERT: 8896b672c4 Problem: RPM build does not pass correct configure options
REVERT: 962630fd65 Problem: Debian package not built with GSSAPI
REVERT: f6ce019fff Problem: incompatible parameter passed to send_zap_request
REVERT: 7c85bf2f88 Problem: uninitialised variables in gssapi_server constructor
REVERT: 2ba0149ee4 Problem: gssapi_mechanism_base_t initialisation misses one param
REVERT: 83c9c0b55f Problem: gssapi_client does not have a peer_address param
REVERT: 24b2f61b1b Problem: gssapi_server out of date with zap_client
REVERT: c8097af884 Problem: DRAFT GSSAPI socket options in wrong section cause duplication
REVERT: 6f49e40e36 Problem: gssapi_mechanism_base does not include mechanism_base
REVERT: e2ffa2a77b Problem: produce_ready in gssapi_mechanism_base not deduped
REVERT: 2c8a1315c1 Merge pull request #2700 from bluca/gssapi_uninit_ref
REVERT: 7453a02144 Problem: CMake on Linux does not link libzmq with optional libs
REVERT: 90b6c102bb Problem: various unused variables warnings
REVERT: e81a40b8bd Problem: CMake build ignores SO_BINDTODEVICE
REVERT: 9387897674 Problem: multi-part able sockets deprecated in favour of non-multi-part
REVERT: 5b1c0cd0ac Problem: test_security_gssapi fails to build
REVERT: 330856daec Problem: double definition in test_security_gssapi
REVERT: b7346f8e00 Problem: gssapi search in autoconf does not use pkgconfig
REVERT: 7be3efc936 Problem: TODO in gssapi mechanism
REVERT: 77444e206c Problem: free on stack variable in GSSAPI mechanism
REVERT: 80f4a87fb9 Merge pull request #2697 from bluca/vs2008
REVERT: f0554e7f16 Merge pull request #2696 from sigiesec/gssapi-dont-abort-on-bad-data
REVERT: 8ecfee475c Problem: missing files from VS2008 solution
REVERT: 898691e2eb Problem: gssapi_mechanism_base_t aborts the application when it receives a message it cannot decode
REVERT: 31c72e22ab Merge pull request #2695 from sigiesec/fine-grained-handshake-error-codes
REVERT: 301f3c70c2 Problem: code duplication between curve_client_t and curve_server_t decode and encode
REVERT: 44f6aa3de6 Problem: gssapi_* do not emit ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL events
REVERT: ca7eee357e Problem: no ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL events emitted in plain_client_t
REVERT: c66ae4656f Problem: curve_client_t may emit misleading event on bad data processed by curve_client_t::decode
REVERT: bdd0f3b18b Problem: documentation on zmq_socket_monitor out-of-sync with current   state of ZMQ_EVENT_HANDSHAKE_FAILED_* events
REVERT: e22ca065d6 Problem: curve_client_t does not emit handshake failure events
REVERT: 9bec68354c Problem: console output for NULL protocol errors
REVERT: 11b3c93852 Problem: console output for PLAIN protocol errors
REVERT: e2d3ba9c62 Problem: classification ZMQ_HANDSHAKE_FAILED_* events is coarse-grained and partially misleading
REVERT: f252f02b01 Merge pull request #2693 from bluca/verbose_check
REVERT: 9ac244a67c Problem: coverage CI job does not print test errors
REVERT: 2d2b51579b Merge pull request #2692 from minrk/utf8-groups
REVERT: 3130b913fc specify that groups shall be UTF8
REVERT: 1e393586c7 Merge pull request #2691 from sigiesec/relicense
REVERT: fecbd42dbe Problem: no relicense agreement by sigiesec
REVERT: d52197d84f Merge pull request #2689 from sigiesec/remove-zap-client-duplication
REVERT: 77aa5f4b3e Merge pull request #2688 from bluca/unwind_test_curve
REVERT: f9985708b7 Problem: unreachable code in zap_client_t
REVERT: 7f15e6c868 Problem: make-based builds broken
REVERT: 863a02b4a1 Problem: no ZAP tests for PLAIN mechanism
REVERT: 00816875b8 Problem: no ZAP tests for NULL mechanism
REVERT: f107b53768 Problem: deviating behavior regarding monitoring events between mechanisms
REVERT: 406af1ef67 Problem: ZAP tests are now generic but placed in test_security_curve.cpp
REVERT: 59d8060165 Problem: ZAP tests are only run with CURVE security
REVERT: 8dce0396fb Problem: inconsistent handling of ZAP replies
REVERT: 8c58ef7f5c Problem: zap_msg_available duplicated between curve_server_t and plain_server_t (with deviating behaviour)
REVERT: 314a3acfa9 Problem: status method duplicated between curve_server_t and plain_server_t
REVERT: ebba815a4d Problem: duplicate but equivalent state enums in curve_server_t and plain_server_t
REVERT: 414c6f45b8 Problem: receive_and_process_zap_reply is duplicated in all mechanisms
REVERT: d7a3778387 Problem: plain_server_t duplicates zap_client_t::send_zap_request
REVERT: 014b201d3e Problem: ZAP message without credentials is not terminated
REVERT: b324c66b6f Problem: null_mechanism duplicates zap_client_t::send_zap_request\nSolution: use zap_client_t::send_zap_request
REVERT: f3884f3380 Problem: gssapi_server_t duplicates zap_client_t::send_zap_request
REVERT: 6e8a0b31be Problem: ZAP client code is duplicated in all mechanisms
REVERT: 97e532e7db Problem: missing flags break build of test_security_curve
REVERT: e2df328d17 Merge pull request #2685 from minrk/uint32_t
REVERT: e0271087f0 add missing uint32_t typedef on msvc
REVERT: 4a18f6204c Problem: Possible buffer overruns related to metadata in various mechanisms (#2683)
REVERT: d5e4319edc [WIP, do not merge] Problem: insufficient tests for ZMTP-CURVE protocol errors (#2680)
REVERT: a927ecc0ed Merge pull request #2678 from evoskuil/fix-warnings
REVERT: 16dd37bbff Problem: unused variable causing warnings or breaks.
REVERT: 85b8b38fe1 Merge pull request #2677 from evoskuil/fix-warnings
REVERT: a604b84ab6 Problem: unused variables causing warnings or breaks.
REVERT: 6abeb7ec2f Merge pull request #2675 from bluca/sunos_sigbus
REVERT: e376c81c2d Problem: SIGBUS on SPARC64
REVERT: f0ae5e585c Problem: C++11 atomic API never used
REVERT: 347f143a5c Merge pull request #2673 from jakecobb/curve_testing
REVERT: 84ab771808 Problem: Throughput calculation underestimates slow messages
REVERT: 78b26d7ac2 Problem: Throughput perf tool doesn't support CURVE
REVERT: 6652a0d742 Merge pull request #2672 from jakecobb/cmake_libsodium
REVERT: 0cbdc18817 Problem: CMake build does not allow static linking libsodium
REVERT: 889a6bff05 Merge pull request #2671 from AlainODea/ao-clarify-null-ZAP-status-code
REVERT: 454d1eda65 Problem: log for bad ZAP status code is confusing
REVERT: 82c4792e21 Merge pull request #2668 from bluca/fix_pgm_build
REVERT: 75fba539d0 Problem: PGM/NORM builds broken due to i_engine API change
REVERT: a6cef4ef86 Problem: ZAP status codes != 200 do not result in an appropriate monitor event (#2665)
REVERT: 834b9e4cd7 Problem: some test cases may still fail because of EPIPE/ECONNABORT/ECONNRESET (#2664)
REVERT: 612d81a831 Merge pull request #2659 from bluca/fix_getrandom
REVERT: 20bbd016c1 Merge pull request #2663 from sigiesec/fix-zap-assertion
REVERT: 2564c8e5b9 Merge pull request #2662 from sigiesec/fix-hwm-tests-race-2
REVERT: de82cbe4ba Problem: failing assertion on ZAP protocol error
REVERT: 8842e0f0a9 Problem: occasional test failures due to messages not (yet) received in test assertion
REVERT: 5f6ff69f62 Problem: test_security_curve fails due to ECONNABORTED
REVERT: 1c1f10a25a Problem: test_security_curve occasionally hangs
REVERT: 02e93492b6 Merge pull request #2661 from jimklimov/brandom
REVERT: 3046fe2053 Problem: getrandom usage breaks build
REVERT: 98a3bb6f24 Merge pull request #2656 from bluca/unwind
REVERT: 14df80ae3a Problem: test_security_curve does not account for ECONNRESET
REVERT: dc51ebeb1f Problem: valgrind shows unitialised errors in backtrace print
REVERT: 03c0b2dfe2 Merge pull request #2654 from bluca/appveyor
REVERT: 0a8775e717 Merge pull request #2655 from sigiesec/fix-curve-produce-error
REVERT: 067b7b0d27 Problem: Android build on Travis OSX takes 10 minutes+
REVERT: 9c085381ee Problem: test_security_curve timeouts on CMake
REVERT: 8275f6356a Problem: redundant appveyor test
REVERT: e83abb3de3 Merge pull request #2652 from sigiesec/curve-security-tests-improvement
REVERT: 41108b203e Problem: zmq::curve_server_t::produce_error sends sizeof std::string instead of status code length
REVERT: 7ba70e95e5 Problem: test failure on CI due to ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL/EPIPE problem
REVERT: aacb219acd Problem: open TODOs in test code
REVERT: e84804d4cc Merge pull request #2647 from bluca/travis_test
REVERT: 5c7f56639b Merge pull request #2651 from sigiesec/doc-property-defines
REVERT: 32085870df Merge pull request #2650 from sigiesec/connection-close-event-workaround
REVERT: 63779094d3 Problem: new ZMQ_MSG_PROPERTY_* defines were not mentioned in the documentation
REVERT: b92dc0a674 Merge pull request #2649 from sigiesec/remove-property-literal-duplication
REVERT: 4b847f3ff9 Problem: no tests for ZAP handler that has an invalid protocol (#2648)
REVERT: 4fec4c99be Problem: sporadic failure in test_curve_security_with_null_client_credentials
REVERT: 7a16c292b7 Problem: Documentation mentions a message property "Resource", which does not exist
REVERT: 9949965717 Problem: Property names are duplicated at several places
REVERT: 5b91eb549b Problem: OSX builds are very slow
REVERT: 0c5731ac00 Problem: 2 OSX libsodium Travis runs
REVERT: d96b0f42a6 Problem: additional doc-build test on Travis
REVERT: ccb1250fcc Problem: a curve test uses hard-coded TCP port
REVERT: c191909c0e Problem: Misleading error code in case ZAP handler sends an invalid status code (#2646)
REVERT: 5d4e30eb13 Replace console output by monitoring events for curve security issues (#2645)
REVERT: fda9daa200 Merge pull request #2639 from bluca/wine_doc
REVERT: bb0b518e7f Problem: ZMQ_BINDTODEVICE not used for ZMQ_DISH
REVERT: 415bdbc1b9 Problem: ZMQ_BINDTODEVICE is DRAFT but not DRAFT
REVERT: 2048ed5dbf Problem: using Wine requires system tuning
REVERT: a34adbf474 Merge pull request #2640 from brianbalerno/vrf
REVERT: b963542e8f Add socket option BINDTODEVICE
REVERT: 4a37ce9aeb Merge pull request #2636 from bluca/tweetnacl_fd
REVERT: fbb6bbdcb8 Problem: reading from /dev/urandom is clunky
REVERT: 2626fdfa23 Problem: tweetnacl leaks file descriptor on fork+exec
REVERT: e015a0f8b9 Problem: fd leak in tweetnacl with one ctx per thread
REVERT: a7bf010ee2 Problem: misleading indentation in tweetnacl.c
REVERT: 2991e6f602 Merge pull request #2633 from pavel-pimenov/fix-C4324
REVERT: dfd9d48496 Suppress C4324 (VC++2017) 'zmq::command_t': structure was padded due to alignment specifier https://msdn.microsoft.com/en-us/library/92fdk6xx.aspx
REVERT: a537ace084 Merge pull request #2631 from ecoughlan/skip_invalid_setsockopt
REVERT: cfb59dde21 Problem: can't set IPV6_V6ONLY on OpenBSD
REVERT: b2c4dad46e Merge pull request #2626 from minrk/relicense
REVERT: 01f29ed8b9 add license grant for minrk
REVERT: e1dfb2e337 Merge pull request #2625 from trofi/master
REVERT: 88487e7da3 configure.ac: allow user to disable libunwind discovery via --disable-libunwind
REVERT: dfcf396ded Merge pull request #2624 from msune/master
REVERT: 609c131249 Problem: adapt, clarify docs ZMQ_ROUTER_MANDATORY
REVERT: bba4a93727 Merge pull request #2622 from msune/master
REVERT: b7b89a8f60 Fix ROUTER's xhas_out() in MANDATORY mode
REVERT: 30ab0ed897 Merge pull request #2615 from bluca/curve_server_reconnect
REVERT: d04065b778 Problem: CURVE server (connect) fails when client rebinds
REVERT: 4e6c89e3cd Merge pull request #2613 from mattconnolly/relicense
REVERT: 1d17182799 RELICENSE: Matt Connolly
REVERT: 35cd0245c9 Merge pull request #2610 from bjovke/my_work_2
REVERT: 33038da522 Merge pull request #2609 from bjovke/my_work
REVERT: 9ef34addb8 Problem: When using print_backtrace() on Linux with libunwind, printout of stack traces from multiple threads are interleaved. Solution: added static mutex to serialize printing of stack traces.
REVERT: 69355730a4 Problem: intermittent memory leak for req/rep send/recv. #2602 Solution: memory leak fixed.
REVERT: a3550e6104 Merge pull request #2605 from emanuelkoczwara/master
REVERT: cb54a6b24a Update zmq.txt
REVERT: f5da4b1c6c Merge pull request #2603 from bluca/xpub_manual_subs
REVERT: 3536c4b9c4 Problem: XPUB_MANUAL subscriptions not removed on peer term
REVERT: 8e2027983a Problem: XPUB_MANUAL takes effect for the next bind
REVERT: 2d83acceff Merge pull request #2596 from bluca/zap_curve
REVERT: 35fce88fee Merge pull request #2599 from ibancg/master
REVERT: d040dc18b5 Problem: CMake evaluation fails with Mingw-w64
REVERT: 2c4e5364aa Problem: missing Ws2_32.lib when cross compiling
REVERT: 6ad0b08da9 Problem: GSSAPI can no longer be used without ZAP
REVERT: 0ce18eac25 Problem: CURVE can no longer be used without ZAP
REVERT: 33695d1da8 Problem: ZAP is allowed to be configured incorrectly or not to work
REVERT: 10a9ba0926 Merge pull request #2593 from ilovexyz/dev
REVERT: af598f2e1c fix bug: dish client does not resend subscriptions to radio server after radio server restart
REVERT: 99805931e4 Merge pull request #2591 from laplaceyang/pr_cancel_timer_in_reconnect
REVERT: 67a6594fc0 fix bug: coredump if set linger and immediate together
REVERT: bcc30f2ab0 Merge pull request #2584 from GreatFruitOmsk/master
REVERT: 545135fb8d RELICENSE: Ilya Kulakov
REVERT: ec56eaaeb6 Merge pull request #2583 from timou/wincmake
REVERT: 293a18257a Suppress linker warning 4221 for MSVC
REVERT: 92339a4d9d Merge pull request #2582 from bluca/test_poller_use_after_free
REVERT: 17637536b8 Problem: use-after-free in test_poller
REVERT: bc8ad8860b Merge pull request #2580 from diorcety/ninja
REVERT: f66c49a62b Fix precompiled
REVERT: 6ad533bec4 Merge pull request #2578 from rkfg/dev
REVERT: 72b4b6830f Problem: abort at socket creation on Android with jzmq
REVERT: 8e1facc73e Merge pull request #2577 from bluca/rep_leak
REVERT: bdc676f687 Problem: REP leaves label msgs for dead REQ in pipe
REVERT: 766c47ffdd Merge pull request #2575 from zeromq/revert-2572-rep_leak
REVERT: 1489fc1ac5 Revert "Problem: REP leaves label msgs for dead REQ in pipe"
REVERT: 75cc2015d1 Merge pull request #2572 from bluca/rep_leak
REVERT: 0999fdd885 Problem: REP leaves label msgs for dead REQ in pipe
REVERT: d17581929c Merge pull request #2570 from jruffin/master-relicense
REVERT: 30dac3807f Added the license grant for jruffin
REVERT: b7e8a3d699 Merge pull request #2566 from leonarf/leonarf-relicense
REVERT: 7dc06fdfb2 license right grant from Leonard Michelet
REVERT: f0df483fa7 Merge pull request #2564 from rotty/master
REVERT: 806bc9dd08 Relicensing grant from rotty
REVERT: fb92cd30a1 Merge pull request #2562 from pijyoi/fix_init_fdset
REVERT: d11f501dc1 problem: not using official api FD_ZERO to init fd_set
REVERT: 0a66acb31b Merge pull request #2560 from bluca/tests_ports
REVERT: 18651d1699 Merge pull request #2561 from flub/master
REVERT: 3241875b7b Grant permission to relicense to MPL
REVERT: 655fbfc399 Problem: ASAN test doesn't print good traces with GCC 4.8
REVERT: 86f9f1df7a Problem: CI doesn't build with debugging symbols
REVERT: 11e2e5f6b5 Problem: address sanitizer support in CI is hacky
REVERT: 6d76106cde Problem: test_many_sockets is flacky on OSX
REVERT: 463c2d75ae Problem: CI builds and test runs not done in parallel
REVERT: 48792f8006 Problem: CI runs libsodium tests
REVERT: b29d46b6a5 Problem: tests use same IPC endpoint
REVERT: 5934919f3e Problem: tests bind to hardcoded TCP ports
REVERT: 2c2c813824 Merge pull request #2559 from michicc/master
REVERT: 584706f023 RELICENSE: Grant from michicc
REVERT: ae461dc2a9 Problem: cannot use wildcard port with source address
REVERT: 06666d8c4a Merge pull request #2558 from bluca/obs_release
REVERT: f126da8b22 Problem: no way to deploy releases to OBS
REVERT: e24ef3ff48 Merge pull request #2557 from bluca/package_gssapi_manpage
REVERT: d96c48ffa4 Problem: OBS _service sets version to unix timestamp.commitid
REVERT: 9dd75e62bf Problem: RPM build fails due to ignored zmq_gssapi.7
REVERT: 2215a9d391 Merge pull request #2554 from bluca/disable_new_poller_without_drafts
REVERT: 90c76fbd60 Problem: new zmq_poller used by zmq_poll without DRAFTs
REVERT: e905f9da99 Merge pull request #2553 from diorcety/x
REVERT: ec7b9480f5 Fix WITH_DOC
REVERT: 54b89858ab Merge pull request #2550 from garlick/gssapi_test
REVERT: edd6b0ad01 gssapi: add a basic test for GSSAPI security
REVERT: 8e33d4247c Merge pull request #2549 from garlick/gssapi_nametype
REVERT: 53918fc115 gssapi: drop unnecessary ifdefs
REVERT: c978d3bb0a gssapi: renumber socket options
REVERT: c23fcc1b05 Merge pull request #2548 from garlick/gssapi_nametype
REVERT: 568feb1c7f gssapi: document NAMETYPE options in get/setsockopt(3)
REVERT: 8892087e99 gssapi: add NAMETYPE options to zmq_getsockopt
REVERT: 9fbf2e2eb6 gssapi: move new options to DRAFT section
REVERT: c49436ad94 Merge pull request #2547 from diorcety/x
REVERT: 17460b3b2b Targets broken by some parts of f7d1c159d4f96686ce994319280c1bd3a2eab994
REVERT: 74395668c6 Merge pull request #2546 from rikvdh/master
REVERT: 67eee47557 RELICENSE: Grant from rikvdh
REVERT: 4ae2ffdac7 Merge pull request #2545 from garlick/gssapi_nametype
REVERT: 48f72844ad gssapi: add zmq_gssapi.7 to MAN7 in Makefile.am
REVERT: 8bd3f03cd4 gssapi: add NAMETYPE socket opts to zmq_gssapi.7
REVERT: 0b185e8297 gssapi: add NAMETYPE socket options
REVERT: 4783605b78 Merge pull request #2544 from Asmod4n/patch-2
REVERT: 798b258fbc Create Asmod4n.md
REVERT: 427292561c Merge pull request #2541 from garlick/gssapi_fix
REVERT: 2b9a352a3c gssapi: use gss_buffer_desc consistently
REVERT: 4e22dd0e97 gssapi: fail if client sets wrong principal
REVERT: f2b579ce02 gssapi: use GSS_C_BOTH to acquire credentials
REVERT: c371824b5b gssapi: document ZMQ_GSSAPI_PRINCIPAL as optional
REVERT: 43f4c28660 gssapi: define HAVE_LIBGSSAPI_KRB5 in configure.ac
REVERT: aa90863b77 Merge pull request #2539 from juan-filewave/win_build_if_defined_ZMQ_USE_POLL
REVERT: 52ce6aab86 Problem: Windows build broken by #if ZMQ_USE_POLL
REVERT: ce602d08db change macOS < 10.12 clock to SYSTEM_CLOCK, fixes #2537 (#2538)
REVERT: 45f4a40026 Merge pull request #2536 from RPGillespie6/master
REVERT: 69b2affe05 Add CMake Build Output Options
REVERT: 1d4014dc52 Problem: Minor inconsistency in macro syntax. Solution: Code fixed. (#2534)
REVERT: e8be2e9d60 Merge pull request #2533 from bjovke/my_work
REVERT: dc7bbe35b4 Problem: FD set copying on Windows still not optimal on some places. Solution: Improved memcpy() of FD sets for Windows builds.
REVERT: a3ad12f7fa Merge pull request #2532 from bjovke/my_work
REVERT: 6d3d99f3a1 Problem: Stack overflow in Windows VS 2012 builds for simple ZeroMQ usage. Solution: Added notice in INSTALL file to mandatory use at least 2 MB stack size in VS 2012 and recommendation to use at least 2 MB in all other Windows builds.
REVERT: eb37793a43 Merge pull request #2528 from kurdybacha/master
REVERT: 01f8ae061d RELICENSE: Pawel Kurdybacha grant
REVERT: bf07573188 Merge pull request #2527 from diorcety/x
REVERT: f7d1c159d4 Fix windows compilation
REVERT: dfde9a22cc Merge pull request #2526 from bjovke/my_work
REVERT: aa3540e657 Problem: misleading indentation and visually ambiguous if/else block ordering. Solution: fixed indentation and if/else block.
REVERT: c2798ef0db Merge pull request #2525 from swansontec/master
REVERT: 0b1402ffc7 RELICENSE: William Swanson
REVERT: d815228246 Merge pull request #2523 from bjovke/my_working_branch
REVERT: 3b01410edc Merge pull request #2524 from jakecobb/tcp_codestyle
REVERT: c635ee7e9d Critical BUG introduced with #2518 fixed.
REVERT: f89e3ee854 Problem: Bad style in tcp.hpp/cpp
REVERT: 2df4e87849 Merge pull request #2522 from bjovke/my_working_branch
REVERT: af6e071f65 Merge pull request #2521 from jakecobb/windows_tcptuning_consistency
REVERT: cd39b00e19 Consistency of Windows TCP tuning assertions
REVERT: 9bee9d6d03 Another macro correction.
REVERT: d66c2508cf Merge pull request #2519 from bjovke/master
REVERT: b6fb1f64a5 Macro correction.
REVERT: 2bdd06ca7e Relicense file extensions corrected.
REVERT: 64807214be Merge pull request #2520 from twhittock/patch-1
REVERT: 6ecdd68153 Tom Whittock grant
REVERT: 30cd655b3d Case found not covered in latest zmq::proxy() code.
REVERT: 545cacf5e2 Merge pull request #2518 from bjovke/master
REVERT: 26520fe152 zmq::socket_poller_t speed improvement for constructor and wait() function.
REVERT: a7977a5e84 Reworked zmq::proxy() for improved performance.
REVERT: 3e55545ab0 Code reformatting of proxy.cpp
REVERT: 2b543e7a2e Merge pull request #2516 from meox/master
REVERT: c8d6b67402 adding licence
REVERT: 6853e3f935 Merge pull request #2514 from lytboris/freebsd-enable-ai_v4mapped
REVERT: 63e1984aa7 Merge pull request #2513 from lytboris/windows-assign-instead-compare
REVERT: ef8b0c60fc re-enable AI_V4MAPPED on FreeBSD & DragonFlyBSD Detect AI_V4MAPPED is not supported in getaddrinfo() on the fly and retry query. This issue was seen on ancient FreeBSD releases and current implementation does support this flag correctly.
REVERT: 2b1bbf1673 fix a typo - assigment was used instead of comparison
REVERT: 6a41f278c5 Merge pull request #2510 from lytboris/ipv6-resolve_nic_name-fix
REVERT: ac7d02e7b0 Relicense Grant (#2511)
REVERT: 8bc92bde34 choose IP(v6) address based on ipv6_ flag in a correct way
REVERT: 9846da02dc Merge pull request #2507 from eburkitt/upmaster
REVERT: 9dbf5791fb Add relicense grant for eburkitt
REVERT: e5583cb043 Merge pull request #2495 from bluca/relicense_typo
REVERT: c7fea39005 Fix asciidoc
REVERT: 238aa49d55 Merge pull request #2504 from herbrechtsmeier/location
REVERT: 9deb6b023b cmake: Use LOCATION property only for imported targets
REVERT: 96e61d9f95 Merge pull request #2503 from herbrechtsmeier/msvc
REVERT: 2f367bddf7 cmake: Remove build/msvc include path to remove file name clash
REVERT: 926d2d2673 Merge pull request #2493 from herbrechtsmeier/cmake
REVERT: ac92fb54a6 Merge pull request #2502 from herbrechtsmeier/appveyor
REVERT: abbfed2b65 appveyor: Use correct CURVE security options
REVERT: cd753eedb4 Merge pull request #2501 from mauri-melato/master
REVERT: 0c2ffd6926 RELICENSE: Maurizio Melato grant
REVERT: 84f83d6f2d Merge pull request #1 from zeromq/master
REVERT: 699b3a2fd6 Merge pull request #2500 from kobolog/kobolog/relicense
REVERT: d0427d13af Relicense.
REVERT: f186421273 cmake: Export targets to package config
REVERT: 4e3e3f659d cmake: Disable runtime checks while cross compiling
REVERT: 556de55e4c cmake: Use project specific source directory instead of top level source tree
REVERT: f5ba27faec Relicense bjovke (#2498)
REVERT: 61ba79a41c Merge pull request #2497 from jakecobb/relicense
REVERT: 33db22c6a5 Relicensing permission for Jake Cobb
REVERT: 34588101ee Merge pull request #2496 from bbdb68/master
REVERT: 840f726b8b RELICENSE : Bruno Bodin grant
REVERT: 98dc4a4ef6 Problem: typos in RELICENSE/ptroja.md
REVERT: b26b1932cb RELICENSE: Piotr Trojanek grant (#2381)
REVERT: 26513b70d2 Merge pull request #2494 from bjovke/master
REVERT: 319eb27f19 Unnecessary dynamic memory allocation for zmq::socket_poller_t in zmq_poller_poll(). Fixed by allocating zmq::socket_poller_t from stack.
REVERT: 5d5263ed8a Prevent DOS by asserts in TCP tuning (#2492)
REVERT: 1d58a00992 Problem: no windows UWP support
REVERT: e224cc9061 Merge pull request #2490 from lodagro/master
REVERT: 9e86341483 Merge pull request #2489 from reunanen/relicense
REVERT: dfdd84fcd4 Relicense: Wouter Overmeire (lodagro)
REVERT: e1b9dbe5cc RELICENSE: Juha Reunanen / Tomaattinen / Outotec grant
REVERT: c5acd1bd70 Merge pull request #2486 from evoskuil/master
REVERT: 7952c584b6 Problem: xpub test has broken style (missing whitespace).
REVERT: 1dd9cac24d Problem: xpub_t.xattach_pipe no handle msg.copy or pipe_t.write fails.
REVERT: 6436bc51e6 Problem: sub.xsetsockopt leaks message (0..n bytes) payload on fail.
REVERT: 1b79da0d7d Problem: proxy leaks one message payload (0..n bytes) on close.
REVERT: 4ea7d01803 Problem: send_failure() util name undergeneralized (for read success).
REVERT: 8c165ad1d2 Problem: excess whitespace (style).
REVERT: d91cd4148e Merge pull request #2485 from zeromq/relicense
REVERT: 77562f7027 License grant
REVERT: f1bbb6fc0a Merge pull request #2484 from bluca/address_sanitizer
REVERT: d3ca23502f Problem: lack of out-of-bound memory checks in tests
REVERT: 7ce68da212 Merge pull request #2482 from evoskuil/master
REVERT: 0bfd747af8 Problem: heartbeats test has invalid curve design; xplat and style probs.
REVERT: a014e77ef7 Problem: leaks on send_zap_request fail, use of goto idiom is fragile.
REVERT: 29a5c98d83 Problem: zap_connect() asserts on write fail (yet returns fail codes).
REVERT: a0ccdc866e Problem: secure servers ignore zap_connect failre code and set ready.
REVERT: 9c6fb09929 Merge pull request #2478 from evoskuil/master
REVERT: 6c1fb4d0b8 Problem: NuGet pacakge out of date.
REVERT: f44300cb00 Problem: assert used for ZAP error handling aborts process.
REVERT: a6d03df37d Merge pull request #2477 from zeromq/jemc-relicense
REVERT: a86751ba51 Problem: No relicense file for jemc contributions.
REVERT: 84d94b4f43 Merge pull request #2475 from chrisstaite/master
REVERT: 5cc487cb8a Relicense grant for chrisstaite
REVERT: 8e2d2d47c6 Merge pull request #2472 from linville/master
REVERT: 6d739f4ac7 RELICENSE: Aaron Linville grant
REVERT: 815f4126e4 Merge pull request #2471 from t-b/improve_oom_handling
REVERT: 33e29bd383 Problem: Out of memory condition not always checked
REVERT: fe9f6b2837 Problem: GSSAPI check for Out of memory is done conditionally
REVERT: 19f30f7926 Problem: throwing version of new called
REVERT: 634c69abd3 Add relicense statement
REVERT: 182cb0ea06 Merge pull request #2470 from ianbarber/master
REVERT: 1f74979e8a Relicense grant for ianbarber
REVERT: 14bb2693db Merge pull request #2469 from madebr/relicense
REVERT: 38e3c120df RELICENSE: Anonymous Maarten grant
REVERT: 5744042741 Merge pull request #2468 from goodfella/goodfella-relicensing
REVERT: 0a6f540bfe RELICENSE: Nick Guiffrida grant
REVERT: 159b39eb77 Merge pull request #2467 from bjoto/master
REVERT: 31a3ead6e4 RELICENSE: Björn Töpel / bjoto
REVERT: 8cf64c2190 Merge pull request #2466 from evoskuil/master
REVERT: 616fbeff21 Problem: insufficient use of const complicates calling.
REVERT: 7a4c802489 Merge pull request #2465 from evoskuil/master
REVERT: fd513470c8 Merge pull request #2464 from ulikoehler/relicense
REVERT: be94f91148 added czmq to permission as well
REVERT: e1cc4cde1e Added relicense permit
REVERT: feb8e868df Problem: typo in comment.
REVERT: e9e2f8d9ea Merge pull request #2463 from tSed/sma/relicensing
REVERT: 754e9f6d88 RELICENSE: Samuel Martin grant
REVERT: 99007399f0 Relicense (#2462)
REVERT: 66accc05f5 Relicense (#2456)
REVERT: 28cdd111db Allow relicense (#2458)
REVERT: 9221b600bb Problem: need to relicense libzmq (#2459)
REVERT: 771b7c6c3b RELICENSE: Maarten Ditzel (#2460)
REVERT: 85165bad6b Problem: need to relicense libzmq (#2461)
REVERT: 3f80657c24 Merge pull request #2457 from evoskuil/master
REVERT: 72714ad297 Problem: no nuget package for 4.2.2
REVERT: f2d7b2cad8 Problem: curve not enabled by default in Visual Studio.
REVERT: 91a01f447d Problem: libsodium linked by default in Visual Studio projs.
REVERT: dbb5e72638 Problem: Visual Studio projects intertwined and drifting.
REVERT: dbd8346225 Merge pull request #2455 from willstrang/master
REVERT: 779561fea1 RELICENSE: William P Strang grant
REVERT: b906f48f27 Merge pull request #2454 from evoskuil/master
REVERT: 068c815224 Problem: __STDC_LIMIT_MACROS before PCH causes VC++ warning.
REVERT: 6622e16245 Merge pull request #2451 from evoskuil/master
REVERT: af0320f786 Problem: implicit cast from size_t to int implies data loss.
REVERT: ded6c84b38 Merge pull request #2450 from pijyoi/master
REVERT: c796240792 RELICENSE: KIU Shueng Chuan
REVERT: 773b8ff4b1 Merge pull request #2449 from sdrsdr/sdrsdr-relicense-grant
REVERT: d468e7a6c2 Relicense Grant
REVERT: ed6fd03f88 Merge pull request #2448 from chickenkiller/master
REVERT: 6a87d20c19 RELICENSE: Lionel Orry grant
REVERT: f82ef5a207 Merge pull request #2447 from somdoron/gitfoxi-relicense
REVERT: a4e90f6fb8 relicense michael fox
REVERT: 7c584142c5 Merge pull request #2446 from Hugne/master
REVERT: a898cd3359 Relicense: Erik Hugne
REVERT: 04b96adfda Merge pull request #2445 from reza-ebrahimi/master
REVERT: c6409b56a9 Relicense: Reza Ebrahimi <reza-ebrahimi>
REVERT: d0ebd0370c Merge pull request #2444 from tabe/relicense-tabe
REVERT: af6293de8d Merge pull request #2442 from bprager/master
REVERT: 04e4f0fe3c Create BerndPrager.md
REVERT: 6c63f173be RELICENSE: Takeshi Abe
REVERT: 96402a85be Merge pull request #2441 from natano/master
REVERT: d1ce868a35 Relicense grant: Martin Natano
REVERT: 88d1b862b2 Relicense - Chuck Remes (#2439)
REVERT: ce4a57f360 Merge pull request #2440 from fidlej/topic_license
REVERT: 10f591d7ff RELICENSE: Ivo Danihelka grant
REVERT: 9d14c2dc77 Merge pull request #2438 from a4z/authors
REVERT: fcb826fb7e Problem: not on the authors list
REVERT: 98ddc96834 Merge pull request #2437 from a4z/relicense
REVERT: 2e564e9a3d add relicense file
REVERT: 59ecc99a2f Merge pull request #2435 from Bklyn/master
REVERT: 58bf0dd44e Relicense: Caleb Epstein (Bklyn)
REVERT: 0d039c92d3 Merge pull request #2434 from opedroso/master
REVERT: 30ba3955d9 RELICENSE: Osiris Pedroso
REVERT: 895e03e553 Merge pull request #2431 from robertcastle/master
REVERT: 889fd5587d Merge pull request #2433 from SRombauts/master
REVERT: 144c76c911 RELICENSE: Sébastien Rombauts (SRombauts)
REVERT: 2a2b67c25d Merge pull request #2429 from cowo78/master
REVERT: a3b8174940 Merge pull request #2428 from olafmandel/relicense
REVERT: acd115fb2a Relicense - Robert Castle / Egomotion Ltd
REVERT: 427338342f Merge pull request #2427 from mipaaa/master
REVERT: 45c6ba177e Relicense (#2426)
REVERT: fef3f2375a Merge pull request #2430 from roalz/relicense
REVERT: 1f2d5ad561 Merge pull request #2425 from fichtner/relicense
REVERT: cbd9c00b1f RELICENSE: Roal Zanazzi (roalz)
REVERT: 1fafe0a38c Added RELICENSE/GiuseppeCorbelli.md to allow libzmq relicensing
REVERT: 5f09a98567 RELICENSE: Olaf Mandel grant
REVERT: c38bf8f930 Michael Hand grant
REVERT: 4961671b7f add "any" relicensing permission
REVERT: 27ce7f6ef6 Merge pull request #2424 from gena-moscow/master
REVERT: 607b52fed3 Merge pull request #2423 from aseering/master
REVERT: ed989bf36d RELICENSE
REVERT: 5d61675fc1 RELICENSE: Adam Seering
REVERT: 1df0de728d Merge pull request #2419 from sheremetyev/relicense
REVERT: bf6656e442 Merge pull request #2420 from drodri/relicense
REVERT: 123d8a7a51 Merge pull request #2421 from ezhikus/master
REVERT: c030c6c9e4 RELICENSE: Volodymyr Korniichuk
REVERT: 2c9ce720c0 RELICENSE: Fedor Sheremetyev
REVERT: 5f519115c3 relicense
REVERT: d80e8225d2 Merge pull request #2418 from djelenc/master
REVERT: 50f8c6d049 RELICENSE: David Jelenc
REVERT: 09c91ec593 Merge pull request #2417 from c-rack/relicense-c-rack
REVERT: 730de88c3f RELICENSE: Constantin Rack
REVERT: d1f5070a3c Merge pull request #2416 from ghpu/master
REVERT: 59478a8618 Agreement to relicensing.
REVERT: 237ad227f0 Merge pull request #2415 from febeling/copyright-grant
REVERT: d34aa4b0bb RELICENSE febeling
REVERT: 9833d18cf7 Relicense approval (#2397)
REVERT: bf46e30e25 Merge pull request #2414 from JohanMabille/relicense
REVERT: 949a92043f relicense
REVERT: 69038ec033 Merge pull request #2413 from SylvainCorlay/relicense
REVERT: 45ff0212e4 Relicense
REVERT: 78e4989f60 Merge pull request #2412 from banburybill/master
REVERT: 85782f391c RELICENSE: Jim Hague
REVERT: 05b692859c Merge pull request #2411 from camachat/master
REVERT: 78b2866977 Merge pull request #2410 from soulik/testing
REVERT: 86eed73cee RELICENSE: Eric Camachat
REVERT: 5781df52c2 RELICENSE: soulik
REVERT: ece055ac9a Merge pull request #2409 from danriegsecker/master
REVERT: 68c49b2881 Relicense statement for Dan Riegsecker (@danriegsecker)
REVERT: e2e9f7ce9d Merge pull request #2408 from loachfish/master
REVERT: d5e6ec0d8d RELICENSE: Justin.Hung grant
REVERT: adea1cefdc RELICENSE: Diego Fons (#2407)
REVERT: e9372f236a Added RELICENSE for amuraru contributor (#2406)
REVERT: 56484e65b5 Merge pull request #2405 from shripchenko/master
REVERT: 6d4d25a915 RELICENSE: shripchenko
REVERT: 47c3a6b6f1 Merge pull request #2404 from zeromq/gonzus-patch-1
REVERT: 66b7314166 Create gonzus.md
REVERT: 9d5b5b7b07 Merge pull request #2401 from rlenferink/master
REVERT: 2c771a409e Merge pull request #2403 from montoyaedu/patch-1
REVERT: f6e80e410c Create montoyaedu.md
REVERT: ec14bb7b35 RELICENSE: Updated wrong filename
REVERT: 89096c71fa Merge pull request #2400 from cjuniet/master
REVERT: 88bf9f8f1c Merge pull request #2399 from sappo/master
REVERT: a2e9ad696b RELICENSE: Christophe Juniet
REVERT: d561143321 RELICENSE: Kevin Sapper grant
REVERT: a0d61a8029 Merge pull request #2398 from demozon/master
REVERT: 951ba9d0e6 Merge pull request #2392 from clkao/patch-1
REVERT: 0793c7abea Merge pull request #2396 from vtellier/master
REVERT: 95940fa676 Merge pull request #2391 from Bitiquinho/master
REVERT: bc7c5a1e96 Merge pull request #2390 from taotetek/master
REVERT: 7b2ba9f842 Merge pull request #2389 from johntconklin/relicense
REVERT: 0df66b9648 RELICENSE: Tore Halvorsen
REVERT: b121e621c0 Merge pull request #2395 from ckamm/ckamm-relicense
REVERT: 39407c0d46 [RELICENSE] Vincent Tellier
REVERT: 0434e03932 RELICENSE: Christian Kamm grant
REVERT: 6c424465a6 Merge pull request #2394 from danielhtshih/master
REVERT: 61cf277d81 Merge pull request #2393 from evoskuil/master
REVERT: 555f4ccb56 RELICENSE: Daniel Shih grant
REVERT: eb3f00717f RELICENSE: Eric Voskuil grant
REVERT: 44a7a3e6e4 Create clkao.md
REVERT: 10a39e57a1 RELICENSE: Leonardo J. Consoni grant
REVERT: 2ac51173de Problem: want to relicense under mplv2
REVERT: d26414d152 RELICENSE: John T. Conklin grant
REVERT: 027856d770 Merge pull request #2385 from rgagnon24/master
REVERT: 2b7cda2eff Merge pull request #2386 from jkryl/master
REVERT: 7913e96271 I have added msys building, license stuff (#2387)
REVERT: 8ce9a11af4 Merge pull request #2388 from TTimo/master
REVERT: 7df5373c12 Merge pull request #2384 from agronholm/master
REVERT: cef0289f4d relicensing
REVERT: c0ddcf6f5c RELICENSE: Jan Kryl grant
REVERT: 28e3225801 RELICENSE: Robert Gagnon
REVERT: 63120a88b0 Create agronholm.md
REVERT: 6517d9199c Merge pull request #2383 from thompsa/master
REVERT: b9ac5cdc6c RELICENSE: Andrew Thompson grant
REVERT: d4b90657e8 Merge pull request #2382 from AndreLouisCaron/relicense
REVERT: 625f52e3a2 RELICENSE: Andre Caron grant
REVERT: c4d80a50c0 Merge pull request #2380 from cdolan/relicense
REVERT: eaa77b383b RELICENSE: Christopher Dolan grant
REVERT: 5aab04b083 Merge pull request #2379 from yuvallanger/master
REVERT: 4ea0dc4778 RELICENSE: Yuval Langer grant
REVERT: b43cd5af78 Merge pull request #2378 from staticfloat/sf/relicensing
REVERT: 4856169620 Merge pull request #2377 from tailhook/relicense
REVERT: c33b875d11 Add relicensing agreement for Elliot Saba
REVERT: 86c7be3854 Relicense permission by Paul Colomiets
REVERT: 9091623243 Fixed lib and dll paths in visual studio build (#2375)
REVERT: 4cc32d3367 Merge pull request #2374 from rlenferink/license_grants
REVERT: a46ca653a9 RELICENSE: Added templates for relicensing
REVERT: eccf8b7aae Merge pull request #2373 from rlenferink/rlenferink_grant
REVERT: bf2b957c49 RELICENSE: Roy Lenferink grant
REVERT: db854614e1 Merge pull request #2372 from Q-Leap-Networks/pr-fix_test_sodium
REVERT: 1dd5fef20c zmq_curve_keypair(): return result from crypto_box_keypair() to make testcase meaningfull
REVERT: da1633ebe7 Merge pull request #2368 from bluca/io_thread_name
REVERT: d7aceef2ed Problem: thread name is redundant
REVERT: 092ad50b0c Problem: I can't refactor
REVERT: 33246f7a9e Merge pull request #2367 from bluca/io_thread_name
REVERT: 3ab4796c5a Problem: ZMQ background threads are unnamed
REVERT: 3548d5e950 Merge pull request #2365 from somdoron/deprecate_zmq_poll
REVERT: aac8bb19fc problem:zmq_poll is slow and the API is complicated
REVERT: 580c5b288a Merge pull request #2364 from somdoron/master
REVERT: f694a2d985 problem: zmq_poll is slow because FD is being created on every call
REVERT: 651f81e8af Merge pull request #2362 from nexcvon/patch-2
REVERT: 9624f9ade7 Problem: zmq::signaler_t::send may loop forever
REVERT: 70a7756d8d Merge pull request #2361 from bluca/obs_new
REVERT: 05a967fa1b Problem: Travis using deprecated OBS project
REVERT: 34be53d8e4 Merge pull request #2360 from nexcvon/patch-2
REVERT: bcf75777c8 Problem: Assertion failed in zmq::signaler_t::send
REVERT: 07d904a2f8 Merge pull request #2354 from bluca/fix_pipe
REVERT: a73d5cd6c6 Problem: router pipe can block forever
REVERT: 1cfc3e1744 Merge pull request #2353 from bluca/fix_test
REVERT: 0f473d14cb Problem: unnecessary change to router_mandatory_hwm test
REVERT: ca311f7bfe Merge pull request #2352 from reza-ebrahimi/master
REVERT: 06740b5d8c Problem with ZMQ_ROUTER_MANDATORY option when peer lost
REVERT: 995a41b5a3 Merge pull request #2350 from tabe/zmq_socket_doc-typo
REVERT: c7ce4a1cea Problem: typo in the zmq_socket doc
REVERT: d6f4263ce3 cmake WITH_LIBSODIUM option is broken (#2349)
REVERT: 6818cced8e Merge pull request #2347 from zstang/patch-1
REVERT: 3b0dfd528f #2341 fix
REVERT: 64a85ebf2f Merge pull request #2346 from bluca/news
REVERT: ac5c75cea1 Problem: 4.2.2 is out, version(s) are out of date
REVERT: 8d75d506b6 Merge pull request #2345 from bluca/news
REVERT: 5285b6e152 Problem: packaging versions out of date
REVERT: 854ed90472 Problem: NEWS not up to date
REVERT: 26998b738e Merge pull request #2332 from bluca/parse_v4_mapped_in_v6
REVERT: 0db22c0069 Merge pull request #2337 from SylvainCorlay/include-find-sodium
REVERT: 33dccd2bf1 Include FindSodium.cmake in dist tarball
REVERT: 18cb7caeb2 Problem: v4-in-v6 mapped addresses cause parsing failure
REVERT: 78dafe5c7c Merge pull request #2331 from jimklimov/sol-poller
REVERT: f8816945c2 Problem: polling does not work well OOB in OpenIndiana
REVERT: e56bc48ebc Merge pull request #2327 from chutz/fix-divide-by-zero
REVERT: df7c684dd5 fix divide by zero in zmq::lb_t::sendpipe
REVERT: 5c34f65ad5 Merge pull request #2326 from SylvainCorlay/framework
REVERT: 4e472b18e3 Make OS Xframwork build optional
REVERT: bf6d8a5d17 Fix clock_t crash on iOS 9.3.2 and 9.3.5 (#2325)
REVERT: c6c21cf197 Problem: zmq_z85_decode does not validate its input  (#2322)
REVERT: 673bb506cf Merge pull request #2318 from kurdybacha/static_file_fix
REVERT: 877419e94f CMake static library output does not match ZeroMQ Config.
REVERT: c031b0c470 Merge pull request #2317 from SylvainCorlay/windows-static-target-name
REVERT: e38453866d Problem: cmake artefacts different from make generated artefacts
REVERT: e5677d89d5 Merge pull request #2315 from bluca/typo
REVERT: 5f8d87bf32 Problem: typo in the zmq_has doc
REVERT: 9aae95e496 Merge pull request #2314 from Asmod4n/master
REVERT: b7cd6e8a85 add test and documentation for "draft" capability
REVERT: a6a56e299d Merge pull request #2313 from Asmod4n/patch-1
REVERT: 4dbd387fa9 Add "draft" capability to zmq_has
REVERT: 4c1b338015 Merge pull request #2311 from SylvainCorlay/static-target-name
REVERT: c65a27213a Problem: name of static library generated by cmake differs from the behavior of kernel.
REVERT: ee9751ec25 Merge pull request #2308 from chuggafan/master
REVERT: 020ff65efa Updated buildbase and buildall to work with visual studio 2017
REVERT: f86053b985 Merge pull request #2304 from JohanMabille/cmake_fix
REVERT: 36d0c70647 cmake install on linux fixed
REVERT: b8d8c498c6 Merge pull request #2302 from laplaceyang/pr_thread_safe_modify_pipe
REVERT: 107f2441d5 Problem: Thread-safe solution for modify hwm of pipe
REVERT: 4fc313d152 Merge pull request #2301 from bluca/set_peer_unsafe
REVERT: edc770d680 Problem: HWM always boosted by 1
REVERT: 9f1ba60f50 Problem: modifying pipe from different thread is not safe
REVERT: 598befc1f8 Merge pull request #2299 from laplaceyang/pr_set_hwm_after_connect
REVERT: 5adcb83509 Problem: set hwm after connect lead to infinite hwm
REVERT: 77e1792cd8 Merge pull request #2298 from bluca/spec_uuid
REVERT: ce735c44ef Problem: spec file still depends on libuuid
REVERT: 81bbd2b72d Merge pull request #2296 from bluca/asciidoc-base
REVERT: e37936616d Problem: debian packages do not build manpages
REVERT: 9dbbd69480 Merge pull request #2295 from JohanMabille/cmake_win_install
REVERT: e258890f67 INSTALLATION instructions
REVERT: 7c709e5466 cmake install config file
REVERT: e95d23198f CPack option and .txt files installation dir
REVERT: e80db0e8e5 Merge pull request #2294 from JohanMabille/cmake_precompiled
REVERT: 2d749a066c Windows cmake build fixed
REVERT: ceb6be7751 Merge pull request #2292 from bluca/osx_sigpipe
REVERT: 31a3a06828 Problem: peer can close connection before SO_NOSIGPIPE is set
REVERT: d532f2e4d8 Merge pull request #2290 from bluca/doc_proxy_eintr
REVERT: 17ef8c6793 Merge pull request #2289 from bluca/windoze_includes_test
REVERT: 28c7abf821 Problem: zmq_proxy* may return EINTR other than ETERM
REVERT: 7e186432cb Problem:capitalized include filenames trip mingw
REVERT: dce4d06b71 Merge pull request #2288 from paddor/master
REVERT: 1b3df75b87 fix typos
REVERT: ec2ba8a997 Merge pull request #2283 from vtellier/master
REVERT: ea7e03a7ff Fixed issue #2286 by documentation
REVERT: 7e36db07b1 Handshake events null pointer fix
REVERT: ffb31dcadd Fixed issue #2227 second part
REVERT: ee98e7dca0 Merge pull request #2287 from bluca/hurd_ipv6_tos
REVERT: efc0e94291 Problem: build fails on GNU/Hurd as it does not support IPV6_TCLASS
REVERT: c38fde00a0 Merge pull request #2285 from bluca/bump_versions
REVERT: 7c0ded93af Problem: 4.2.1 is out, time to bump versions
REVERT: 7005f22726 Bugfix release 4.2.1
REVERT: 086bb890c5 Merge pull request #2282 from bluca/event_test
REVERT: 3f3601e855 Problem: handshake events not tested with curve
REVERT: d50b5b80fd Problem: NEWS entry for ctx option does not point to docs
REVERT: fc748ec799 Problem: new monitor events not mentioned in NEWS
REVERT: 200649fd57 Problem: new handshake event monitoring undocumented
REVERT: 2afba0085f Problem: documentation does not warn about ZMQ_EVENT_ALL and new events
REVERT: c0e2bc4ef9 Problem: new DRAFT monitor events returned even without --enable-draft
REVERT: 0ebed80dc1 Merge pull request #2281 from vtellier/master
REVERT: 48bc75e8a1 Code formatting + reverted hard error handshake fail
REVERT: 0ad600c7de Merge pull request #2280 from vtellier/master
REVERT: b6e9e0c2d3 Fixed issue #2227
REVERT: 64b07d8132 Merge pull request #2278 from bluca/msg_t_size_draft
REVERT: 8c22ba246c Problem: bug fixes not mentioned in NEWS file
REVERT: 113feb60a2 Problem: ZMQ_MSG_T_SIZE draft but not in DRAFT section
REVERT: 715f87fec7 Merge pull request #2277 from bluca/automake_1.14
REVERT: 47c7d8ee50 Problem: debian build fails with automake < 1.14
REVERT: ef88b8c760 Merge pull request #2276 from bluca/sodium_pkg
REVERT: bbae5d0f9a Problem: dpkg-query might fail in CI build and fail the build
REVERT: b2a2bb8609 Merge pull request #2275 from bluca/travis_pkg
REVERT: b1137b7672 Problem: documentation build not tested on Travis
REVERT: 822def9b2b Problem: Travis rebuilds libsodium every time
REVERT: a1220b7fd4 Problem: Travis OSX workaround for libtool no longer needed
REVERT: 1f86019e3f Problem: Travis installs packages when not needed
REVERT: 5871ea5df8 Merge pull request #2274 from bluca/cloexec
REVERT: 06055a7b74 Problem: cmake does not run test_zmq_poll_fd
REVERT: 6e708ce144 Problem: socketpair leaks file on fork+exec
REVERT: f287c7a2aa Problem: eventfd leaks socket on fork+exec
REVERT: 211898d243 Problem: epoll leaks socket on fork+exec
REVERT: 16439e42d2 Merge pull request #2272 from bluca/document_read_after_free
REVERT: d68e2e018e Merge pull request #2273 from bluca/docs
REVERT: 3dc016cab3 Problem: no documentation for ZMQ_SOCKS_PROXY
REVERT: baf32a1985 Problem: no documentation for zmq_curve_public
REVERT: a06f97d73a Problem: fix for read-after-free not documented
REVERT: dc39ceb347 Merge pull request #2268 from imkos/master
REVERT: 43941052a9 add link libsodium.a
REVERT: edad90f770 mingw32 fix
REVERT: fe3756defa Merge pull request #2266 from Cziken/master
REVERT: ee72493e14 Problem: Duplicated code
REVERT: 7a8180ece7 Merge pull request #2265 from bluca/contribution_notice_github
REVERT: e6b1f56131 Problem: contributing guidelines unclear for new devs
REVERT: 2dec320b22 Merge pull request #2263 from bluca/revert_curve_break
REVERT: 48e9e24726 Problem: #2262 broke curve
REVERT: 2aa09d34ff Merge pull request #2262 from Cziken/master
REVERT: 022eeaf33d Problem: Duplicated code
REVERT: d514bb598a Fixed handling of WSAEWOULDBLOCK to be generic (#2260)
REVERT: 2b565088d0 Merge pull request #2257 from minrk/check-event
REVERT: 0abdc28c84 only compare FD when neither item is a zmq socket
REVERT: 1910ef8d3e Merge pull request #2256 from laplaceyang/pr_zmq4_pub_with_zmtp_v1_sub
REVERT: 02a6079968 Merge pull request #2255 from bluca/poll_fd_testcase
REVERT: 8e8fdcc9ed fix bug zmq4.x PUB msg to ZMTP1.0 SUB server
REVERT: 272d340c1f Problem: no mixed FD and zmq socket zmq_poll test
REVERT: f9d231437a Merge pull request #2251 from hnwyllmm/master
REVERT: a4e448d586 misuse of 'close'
REVERT: 9052862619 Merge pull request #2250 from bluca/poll_regression
REVERT: 72176d5fbe Problem: check for item.fd causes zloop_poller regression
REVERT: c47e017bdd Merge pull request #2249 from pavel-pimenov/fix-v817
REVERT: 4d6fbe17e0 "%" -> '%'
REVERT: 39947d55c7 Merge pull request #2248 from pavel-pimenov/fix-precompiled
REVERT: eff42fa321 Add #include "precompiled.hpp"
REVERT: f64d3ad1e7 Merge pull request #2247 from bluca/trusty_unwind
REVERT: 379028fbd9 Problem: there is no libunwind-dev on Ubuntu 14.04LTS
REVERT: ad4a1bd0f3 Merge pull request #2245 from anass-b/builds-vs2017
REVERT: ad045512b9 Build support for VS2017, Windows SDK 10.0.14393.0, toolset v141
REVERT: d4076578a3 Merge pull request #2244 from rotty/wip/fix-mstcpip-include
REVERT: 365ca8595d Fix #include case for <mstcpip.h>
REVERT: 519940d07c Merge pull request #2241 from bluca/aix_test
REVERT: dcec022358 Problem: test_stream_exceeds_buffer does not build on AIX
REVERT: 8325355d73 Problem: test_stream_exceeds_buffer has redundant includes
REVERT: 5e03ad6d87 Merge pull request #2240 from bluca/aix_poll
REVERT: 57db5f2a5c Problem: 4.2.0 won't compile on AIX 7.1
REVERT: 3f8e6c0812 Merge pull request #2239 from loachfish/master
REVERT: 52ebffd715 avoid crashing in the multi-thread operation for std::vector
REVERT: 42c63368e6 Merge pull request #2238 from bluca/revert
REVERT: e46d91d41f Problem: PR #2236 breaks the build
REVERT: 324f10494a Merge pull request #2236 from loachfish/master
REVERT: e1368bdac8 avoid crashing in the multi-thread operation for std::vector
REVERT: 9a20f42f62 Merge pull request #2235 from bluca/cmake_soversion
REVERT: abeaba1557 Problem: CMake build uses library version as the ABI version
REVERT: febf801584 bug fix: AIX pollset error (#2233)
REVERT: 294bdb4eb6 Merge pull request #2231 from bluca/windows_ipv6_tos
REVERT: 33fcd2d6ca Problem: Windows does not support IPV6_TCLASS
REVERT: 4a24805f70 Merge pull request #2225 from bluca/select_broken
REVERT: 121c9d16f5 Problem: select.cpp/hpp build fails with reorder error
REVERT: ba74890f2f Problem: cannot pick select for poller
REVERT: e6572fac80 Merge pull request #2222 from SuperFluffy/doc_explain_context
REVERT: ec25fd2ada Add a single sentence explaining what a context is
REVERT: 53bf6dfcf0 Merge pull request #2221 from minrk/check-socket
REVERT: f302d8a7b6 only compare pollitem.fd if pollitem.socket is NULL
REVERT: 185fed3966 Merge pull request #2220 from bluca/zmq_msg_size
REVERT: 8a286bb842 Problem: no documentation for ZMQ_MSG_T_SIZE ctx option
REVERT: b480457283 Problem: ZMQ_MSG_T_SIZE is not mentioned in NEWS
REVERT: 670bec56d8 Problem: size of zmq_msg_t is not known to FFI wrappers
REVERT: 3db69212b7 Merge pull request #2216 from rotty/master
REVERT: 5d176cbe98 Document terminating NUL behavior in API more explicitly
REVERT: 93ccb5a16d Merge pull request #2215 from Bklyn/udp-bugfix
REVERT: 10181d7641 Untabify
REVERT: 5879f729dd Merge pull request #2214 from Bklyn/udp-bugfix
REVERT: f577ceab4b Problem: multicast is spelled incorrectly in udp_address class
REVERT: ace95327a3 Merge pull request #2213 from Bklyn/udp-bugfix
REVERT: cdac1ac9d3 Fix htons copy pasta
REVERT: b9b0fd87a4 Merge pull request #2210 from bluca/ipv6_tos_v4_only
REVERT: 90f091abf3 Problem: IPV6_TCLASS setsockopt fails on IPv4 socket
REVERT: bc1860430a Merge pull request #2209 from saifhhasan/master
REVERT: fc8007e896 Make ZMQ_TOS work with IPv6 sockets
REVERT: 8ac7500f9d Merge pull request #2203 from bluca/bump_version
REVERT: e50c6b6992 Merge pull request #2206 from bluca/dladdr
REVERT: 1b3fcbd3ee Problem: linker fails looking for dladdr
REVERT: 8015794b81 Problem: 4.2.0 is out, time to bump version for development
REVERT: 065169a221 Merge pull request #2201 from bluca/news_blocky
REVERT: 4b58b3735f Problem: NEWS says ZMQ_BLOCKY is a sock opt, but it's a ctx opt
REVERT: 067bfa13b8 Merge pull request #2198 from vyskocilm/master
REVERT: cab901c0a6 Problem: linking fails on glibc 2.24 with dladdr missing
REVERT: ef3c2591fc Merge pull request #2197 from bluca/install_keygen_rpm
REVERT: b73809c380 Problem: curve_keygen not packaged by RPM spec
REVERT: d9ff34891b Merge pull request #2196 from bluca/kfreebsd
REVERT: 43f3cc5c78 Problem: kFreeBSD does not implement pthread_setschedparam
REVERT: 361e99a906 Problem: kFreeBSD might return ECONNRESET under load when destroying engine
REVERT: 6585aeaba2 Merge pull request #2195 from vyskocilm/master
REVERT: 213a7efe86 Problem: curve_keygen not build unless --enable-curve is passed
REVERT: 8f577248b7 Merge pull request #2193 from warriorkitty/patch-1
REVERT: a5ad378893 Fix small typo
REVERT: 42d3ef5e06 Merge pull request #2192 from bluca/udp_news
REVERT: 7ff6d57d47 Problem: NEWS says scatter/gather support UDP but they don't
REVERT: 18bd4d171a Merge pull request #2191 from bluca/news_multicast
REVERT: 127ca8b3f3 Problem: NEWS does not mention UDP multicast transport
REVERT: 097bf26e8d Finalize NEWS for 4.2.0
REVERT: 785d9b5494 Merge pull request #2189 from bluca/changelog
REVERT: 9e52806724 Problem: no NEWS for 4.2.0
REVERT: 932cc8295b Problem: NEWS does not include previouos stable releases
REVERT: 7000e84aed Merge pull request #2187 from Dmitriy-GH/master
REVERT: 488cb5a022 MSVC 2015 project for compile libzmq.dll in WinXP compatible mode
REVERT: e7b12b3c2a Add WinXP compatibility
REVERT: 819bf785b7 Merge pull request #2186 from bluca/de-draft
REVERT: b5b5f75242 Problem: socket option marked as draft for 4.2
REVERT: 8cf4832e01 Merge pull request #2184 from bluca/rc
REVERT: 6da8385b2a Problem: new public symbols added
REVERT: e0d6f4ea11 Problem: no NEWS entry for 4.2.0
REVERT: cc70c829cf Merge pull request #2183 from a4z/opmg_cmake
REVERT: 6f597d0bd3 Problem: CMake build rejects to build with openpgm enabled
REVERT: 50a6c117f1 Merge pull request #2182 from pmienk/master
REVERT: 28fbee74c8 Suppress warning on uninitialized variable use by initializing variable.
REVERT: fb59cd1aad Merge pull request #2181 from jolting/patch-2
REVERT: 60b63ed518 Remove an unnecessary while (true)
REVERT: 2ece58acfd Merge pull request #2180 from cxreg/xpub-metadata-corruption
REVERT: b7f2c7e7ea Increment metadata refcount while it's in pending_metadata
REVERT: 16f584745d Merge pull request #2179 from bluca/alignment_windoz
REVERT: 2484d1c859 Problem: MS VC++ build broken
REVERT: ac14981651 Merge pull request #2177 from bluca/alignment
REVERT: df367a6682 Problem: pointer union for zmq_msg_t is a hack
REVERT: 0d032c99a6 Merge pull request #2176 from robertcastle/master
REVERT: 0dfb32a259 Problem: clock_gettime is now defined in macOS 10.12 SDK
REVERT: 2e9264354c Merge pull request #2173 from bluca/without_docs
REVERT: 8345fe9e95 Problem: build API incompatible with 4.1
REVERT: 1e69309e21 Merge pull request #2171 from bluca/connect_reuse_addr
REVERT: 25bf30bebe Problem: 2 connects with same sourceip:port to different destip:port fail
REVERT: 669ff41d52 Merge pull request #2170 from vielmetti/patch-1
REVERT: 92b1b2b181 Update INSTALL to note issues with 'make -j check'
REVERT: 1a02b1b3f2 Merge pull request #2168 from outotec/fix-build-2
REVERT: bb7421dda2 Problem: Does not build in Visual Studio 2013 / Win32
REVERT: d8f55dde57 Merge pull request #2164 from reunanen/add-EHOSTUNREACH-to-errno_to_string
REVERT: 57c765ef5a Add EHOSTUNREACH to errno_to_string
REVERT: 6ce2fb2b06 Merge pull request #2162 from hnwyllmm/master
REVERT: c5b528fdcd performance enhancement
REVERT: b031325996 Fixed problems from previous PR for #2158 (#2160)
REVERT: 398f256a5c Merge pull request #2159 from jens-auer/2158
REVERT: d1c7280d05 Add mutex for monitor socket
REVERT: 23be1dc0ec Merge pull request #2157 from athampy/master
REVERT: 134f08b3ca Fixed issue #2155
REVERT: f6962903a7 Implemented network interface name resolution on Windows platform Added fallback mechanism for specific socket binding on Windows platform with IPv6 enabled
REVERT: 3996d4e20d Merge branch 'master' of github.com:zeromq/libzmq
REVERT: c30da71735 Merge pull request #2156 from yasirs/patch-WSL
REVERT: 36af3edee2 Update tcp_address.cpp
REVERT: 9780945d7c Merge pull request #2152 from t-b/fix_socket_docu
REVERT: a151ac5936 Problem: Invalid markup in zmq_socket.txt
REVERT: 7f8c17b124 Merge pull request #2150 from bluca/request
REVERT: c592897f60 Problem: a request
REVERT: 075dd6a003 Merge pull request #2148 from WGH-/doc-router-mandatory-block
REVERT: eb0e0dda4e doc/zmq_socket.txt: clarify that ROUTER can be blocking
REVERT: 88e4cff948 Merge pull request #2147 from goodfella/fix-zmq-poller-poll-return
REVERT: ffdb44ad2c Fix zmq_poll return code assert in tests/test_radio_dish.cpp
REVERT: 1a2d58e4e7 Add #ifndef ZMQ_HAVE_WINDOWS guard around unistd.h include
REVERT: f3de534897 Do not assign rc to zmq_poller_destroy in zmq_poller_poll
REVERT: f46e45c263 Include unitstd.h in src/stream_engine.cpp for close system call
REVERT: 6c1669371a Merge pull request #2145 from minrk/zmq-poll-repeat
REVERT: fb5a04e21d allow duplicate entries in zmq_poller_poll
REVERT: ae0676e80d Merge pull request #2144 from minrk/fix-poller
REVERT: 310dafbc75 zmq_poll returns 0 on timeout
REVERT: 718608ce94 socket_poller::wait returns only triggered events
REVERT: 872f1e5a9d Merge pull request #2143 from minrk/avoid-duplicate-poller-proxy
REVERT: c636147c98 avoid duplicate entries in zmq_poll
REVERT: b0df7f1f17 Merge pull request #2141 from minrk/heap-alloc-poll-events
REVERT: 53fb120687 heap-allocate events in zmq_poller_poll
REVERT: 55930f5e42 Merge pull request #2140 from minrk/zmq_poll_poller
REVERT: c0b1114944 Merge pull request #2138 from minrk/darwin-clock
REVERT: 91e121c9d3 Merge pull request #2139 from minrk/update-poll-based-on-poll
REVERT: bdcaa935b9 zmq_poll calls zmq_poller if available
REVERT: e50a987650 update socket_poller when ZMQ_POLL_BASED_ON_SELECT
REVERT: 978c5c3499 only define clock macros on darwin if not already defined
REVERT: c751899313 Merge pull request #2136 from bluca/copyright
REVERT: 2768df845c Merge pull request #2135 from bluca/unbreak-pkg-config
REVERT: 2204cb48dd RELICENSE: Brocade Communications Systems Inc. MPLv2 grant
REVERT: 00239414b3 Problem: Brocade has copyright but not in AUTHORS
REVERT: 06d810b4c9 Problem: pkg-config Requires.private is broken
REVERT: 34a1292e96 Merge pull request #2134 from bluca/pkg-config-static
REVERT: 6d9411607d Problem: pkgconfig file does not support static link
REVERT: 131a2627b9 Merge pull request #2131 from minrk/poller-static-2
REVERT: ec750732d4 pass through poller events
REVERT: 06aeb47d73 Merge pull request #2130 from minrk/poller-static-alloc
REVERT: de7fc1fcf8 add n_events argument to zmq_poller_wait_all
REVERT: 187b4bff48 Merge pull request #2128 from minrk/multi-event-poller
REVERT: 2bc9796651 Problem: zmq_poller only signals one event
REVERT: 555a087763 	fix bugs of the pollset (#2127)
REVERT: 113d3ffc0b Merge pull request #2126 from paddor/master
REVERT: 7e07ff3e5b fix markup syntax on zmq_tipc(7) page
REVERT: 2e55bc5838 Merge pull request #2125 from GreatFruitOmsk/master
REVERT: 06614a394d Fix fd_entry may reference invalid object.
REVERT: 22dac19429 Merge pull request #2123 from bluca/dealer_router_async
REVERT: ab5c8c8dea Problem: zmq_ctx_term segfaults with too many pending inproc connects
REVERT: fab846a5e5 Problem: zmq_ctx_term asserts with connect-before-bind and sockets with identity over inproc transport
REVERT: 25402335fd Problem: no bind-after-connect TCP test
REVERT: 55244935c2 Merge pull request #2122 from gena-moscow/master
REVERT: 2e3888dd45 Problem: Pub socket crashes on client disconnect.  family_entry.fd_entries [i] is modified in zmq::select_t::rm_fd() Solution: do not copy family_entry.fd_entries [i]
REVERT: e30ab69738 Merge pull request #2121 from paddor/master
REVERT: 18e0451092 Problem: documentation markup unrecognized
REVERT: bacba21ef2 Merge pull request #2120 from hnwyllmm/pollset
REVERT: bdf887fd74 move macro define `ZMQ_USE_POLLSET` to the position between `ZMQ_USE_DEVPOLL` and `ZMQ_USE_POLL`
REVERT: 55442699ef replace tabs with space
REVERT: eee7880752 move the `pollset` to the position between `devpoll` and `poll`
REVERT: 861fcaf745 Merge pull request #2113 from hnwyllmm/pollset
REVERT: c964b7cfaf remove pollset.hpp/.cpp to src directory
REVERT: 4039858754 Merge pull request #2112 from hnwyllmm/pollset
REVERT: 3a5971171f add pollset poller in AIX
REVERT: 45286fa1fe add pollset poller in AIX
REVERT: 38931b2d8b add pollset poller in AIX
REVERT: 390e8f4d82 add pollset poller in AIX
REVERT: 50e277bd8f Merge pull request #2111 from bluca/ipv6_multi_endpoint
REVERT: 53e5a9a6f9 Problem: zmq_connect with IPv6 "source:port;dest:port" format is broken
REVERT: c1d07c6cd6 Problem: test_reqrep_tcp does not have IPv6 tests
REVERT: 896192ff42 Problem: test_reqrep_tcp does not test multiple endpoints
REVERT: 75219e33a7 Problem: test_reqrep_tcp does not test disconnect/unbind
REVERT: 8d723fee3d Problem: test_reqrep_tcp is too limited
REVERT: f0945c85ef Merge pull request #2110 from c-rack/remove-tabs
REVERT: 8cd33339a1 Problem: source conatins trailing spaces
REVERT: 022cf2aeaa Problem: source code contains tabs
REVERT: e8d665c4e5 Merge pull request #2106 from kou/support-mingw-cross-compile
REVERT: da9b9540f3 Problem: MinGW cross compile is failed on Linux
REVERT: 3683a96fcb Merge pull request #2105 from t-b/bugfix/missing_newline
REVERT: c9c49f3e9f Problem: Missing newline in printf statement
REVERT: cf34aeb298 Merge pull request #2100 from a4z/master
REVERT: a43f6ce0a6 Problem: scoped optional mutex lock caused unit tests to fail
REVERT: 3068f4762a Merge pull request #2099 from a4z/master
REVERT: 9201009f17 Problem: socket_base uses macros for mutex lock and unlock
REVERT: fb34c3234d Merge pull request #2097 from bluca/cmake_dist
REVERT: a4ae43e036 Problem: CMake build from dist tarball broken
REVERT: ae31587e4d Merge pull request #2094 from bluca/obs_draft
REVERT: abd37423d3 Problem: cannot build rpm with drafts on OBS
REVERT: a8a774e71b Problem: cannot build deb with drafts on OBS
REVERT: 493f17cc81 Merge pull request #2093 from t-b/fix_building_documentation
REVERT: ae08099eb5 Problem: Documentation still has .txt suffix
REVERT: 1303eea508 Problem: Broken documentation build
REVERT: 81fd4044f0 Merge pull request #2092 from bluca/xp_testutils_ipv6
REVERT: a9343dbbc3 Problem: testutil.hpp fails to build on Windows XP
REVERT: 5d1c75f033 Merge pull request #2090 from jolting/patch-1
REVERT: fd758d7239 [gssapi] memory allocation mismatch on windows
REVERT: 7f8a1da372 Merge pull request #2089 from bluca/ipv6_test_windows
REVERT: 0002824fc0 Problem: is_ipv6_available needs context to work on Windows
REVERT: f486176741 Revert "is_ipv6_available: Create a fake zmq context on windows"
REVERT: aab6ca787d Merge pull request #2088 from t-b/bugfix/initialize_network_stack_for_ipv6_test
REVERT: 9adf20aaeb is_ipv6_available: Create a fake zmq context on windows
REVERT: c9bc939705 Merge pull request #2084 from GreatFruitOmsk/cmake-fix
REVERT: 8678fcce7c Fix compatibility with newer CMake.
REVERT: 8d00cdd928 Merge pull request #2082 from pijyoi/fix_zmqstream_doc
REVERT: 5340215613 Problem: zmq_stream doc is confusing regarding ZMQ_SNDMORE flag
REVERT: 2fc86bc3c6 Merge pull request #2074 from bluca/obs_compress
REVERT: ae0ba5296f Problem: OBS service changes ver after compress
REVERT: 9029121eb4 Problem: OBS compress not available on CentOS
REVERT: 845426710e Merge pull request #2073 from bluca/obs
REVERT: 6822252f49 Problem: no OBS service file
REVERT: ce75606430 Problem: RPM package does not follow convention
REVERT: 202e7e03e3 Problem: RPM build targets outdated docs
REVERT: faaa8e53fe Problem: RPM has hard-coded SONAME versions
REVERT: c4defc75c0 Problem: RPM does not support PGM
REVERT: 373b63de9e Problem: RPM build does not support automake
REVERT: 0372e5ce22 Problem: spec file needs version before build on OBS
REVERT: 9c741c09a1 Problem: no Debian packaging
REVERT: a7ccb35c1f Merge pull request #2072 from reza-ebrahimi/master
REVERT: a2db60e1b8 Fixing indentation related to commit #2071
REVERT: e5599de6c3 Convert manual (locking and unlocking) mutexes to scoped mutexes for the case of unlocking mutex even if the protected operation throws an exception (#2071)
REVERT: bbece557c9 Fix copy/paste error (#2070)
REVERT: 61f9e71ee2 Merge pull request #2069 from hjp/master
REVERT: e175fe21e5 Avoid race condition with accept4 where available
REVERT: 5e684172d6 Fix build with NORM enabled on FreeBSD. (#2066)
REVERT: 3814b87330 Merge pull request #2065 from bluca/osx_sed
REVERT: 531b3bf7c3 Problem: Travis CI OSX builds are broken
REVERT: b2e8a90a97 Merge pull request #2064 from garlick/issue_2051
REVERT: d090a871bc Problem: getifaddrs can fail with ECONNREFUSED
REVERT: d44ef4fa5f Merge pull request #2061 from cowo78/master
REVERT: 7fdb167732 [tests/testutil.hpp] Problem: wrong windows.hpp path
REVERT: 0b01cc1ebc [tests/CMakeLists.txt] Problem: The libzmq.lib search path should be set only if the library is found at a specific path
REVERT: f9c86872e5 Merge pull request #2054 from BLangpap/master
REVERT: 96c306cc54 Problem: parameter %1 set hard to build target and prevents the skipping of pause Solution: removed Pause
REVERT: d51940a9f5 Merge pull request #2053 from BLangpap/master
REVERT: 73631bf1c9 modified build.bat to support non-pausing installation
REVERT: 5de974a036 modified build.bat for msvc to support no-pausing script-based installation
REVERT: 9561cc8c24 Merge pull request #2046 from pijyoi/reduce_msvc_warnings
REVERT: 603cd1db88 change event monitoring functions to use zmq::fd_t
REVERT: 5eb6fc3b08 Merge pull request #2045 from sheremetyev/update-ignores
REVERT: 219f2ffa46 Add missing Git ignores.
REVERT: a1f691e799 Merge pull request #2042 from sheremetyev/xpub-unsubscribe-manual
REVERT: baea406683 Store manual subscriptions in XPUB and send them out on pipe termination.
REVERT: 813c738137 Add test for consistent unsubscription in XPUB manual mode.
REVERT: a343059aad Merge pull request #2041 from packetstash/select-fix-rebased
REVERT: 4019112a82 Copy instead of reference to a vector that gets reallocated.
REVERT: b3bfa420ea Merge pull request #2036 from aburgm/abort-flush
REVERT: 07a374357e Flush stderr buffer before calling zmq_abort in assert macros
REVERT: 95782450c7 Merge pull request #2035 from slishak/master
REVERT: d49e43bbc8 Problem: FD_SETSIZE not set to 16k for all build definitions
REVERT: cb0eaf6bce Merge pull request #2034 from michicc/poll_windows
REVERT: 7a6ff07a01 Problem: Windows performance is not optimal due to select().
REVERT: 8d8d32f4d0 Problem: Theoretical overflow when polling more than INT_MAX handles.
REVERT: 7292de8de5 Merge pull request #2031 from bluca/vector_data
REVERT: 0dede9b50b Problem: std:vector.data breaks compat with C++98
REVERT: 4ea6df43bd Merge pull request #2032 from jlblancoc/patch-1
REVERT: 38d7bec19e Fix build error in MSVC11
REVERT: dc40c95c47 Merge pull request #2028 from bluca/update_ndk
REVERT: b4abaad269 Problem: Android CI uses outdated C++ ABI 4.8
REVERT: b872e7d9f7 Problem: Android CI NDK version out of date
REVERT: 8be568916e Problem: Android CI script hardcodes ABI version
REVERT: 33ed569289 Merge pull request #2024 from wbx-github/master
REVERT: 492a035706 allow to build sparc (v8,leon)
REVERT: 46912c4f2e Merge pull request #2023 from jimenezrick/patch-1
REVERT: c86e07dbc8 Problem: update zmq_setsockopt doc with new flag name
REVERT: 2b6200c49e Merge pull request #2018 from diorcety/mingw64
REVERT: 9835e18f64 Fix compilation with mingw64 using autotools
REVERT: 7b063a067c Merge pull request #2014 from GreatFruitOmsk/vmci
REVERT: 73e360fc49 VMCI family does not support non-blocking sockets.
REVERT: 184840cf37 Merge pull request #2013 from aseering/master
REVERT: b1e2b87f0f On systems where getifaddrs() exists but isn't implemented, behave as if 'resolve_nic_name()' were entirely unsupported
REVERT: 9a5036409d Merge pull request #2011 from evoskuil/master
REVERT: 96a66bab3b Problem: msvc imports missing Rule.Category declarations.
REVERT: 570805119d Merge pull request #2008 from hitstergtd/x-fix-windowshpp-style
REVERT: 40a2ed9e87 Problem: style broken in src/windows.hpp
REVERT: 4cd630fed2 Merge pull request #2004 from evoskuil/master
REVERT: c050d95fcd Problem: no unit tests for base85 or public curve functions.
REVERT: 5cae5bb5fe Merge pull request #2003 from evoskuil/master
REVERT: 460bc7525b Problem: no function to derive curve public key from secret key.
REVERT: 34164ec6f5 Merge pull request #2001 from evoskuil/master
REVERT: c7f167377c Problem: unresolved dgram externals in msvc builds.
REVERT: 6a99bb041d Problem: implicit integer narrowing cast warnings.
REVERT: d018029652 Merge pull request #2000 from Chris-P-Bacon/patch-1
REVERT: 874c346c20 Typo in define for libsodium
REVERT: 99373ff0b4 Merge pull request #1998 from hitstergtd/x-style-testsrcfd
REVERT: fed17746c6 Problem: Wrapping issue in test for SRCFD [style]
REVERT: 5f0ac2aebe Merge pull request #1997 from Bitiquinho/master
REVERT: c1af4fd24b Add myself to the AUTHORS file
REVERT: d65d15fb63 Merge pull request #1996 from somdoron/udp_raw_sockets
REVERT: bbfed6b8d0 problem: memory issues, access uninitiailized memory and leak
REVERT: c7effea912 Merge pull request #1995 from somdoron/udp_raw_sockets
REVERT: c4d0146f2c problem: udp doesn't enforce correct usage of bind/connect
REVERT: 443176d5ef Merge pull request #1994 from somdoron/udp_raw_sockets
REVERT: 0db70e247c problem: compilation error on windows
REVERT: d58eb54581 problem: test_dgram is missing in .gitignore
REVERT: 55f0a5503e problem: dgram is not enforcing two-part message
REVERT: ded0e5a6d9 problem: udp_engine didn't work with dgram socket type
REVERT: 6db8f1e74b problem: test is using connect with dgram, dgram only support bind
REVERT: eb80fa31ea problem: dgram more out logic was incorrect
REVERT: 47c0b6ec25 problem: dgram doesn't need to prefetch messages
REVERT: d791932635 problem: terminating conn doesn't make sense in disconnected protocol
REVERT: 8cd64b76e4 Adapt to new draft header. Rebase dgram socket on pair socket
REVERT: 23b3403fa5 Remove printf and add asserts on test
REVERT: 977e700893 Fix Copyright range
REVERT: a7399fab51 Fix Makefile.am
REVERT: da14bb4bc2 Added ZMQ_DGRAM tests to build (Makefile.am and CMakeLists.txt)
REVERT: 94c53e541d Added test for ZMQ_DGRAM socket type (unicast and multicast)
REVERT: cea473de59 Added ZMQ_DGRAM socket option to precmpiled.hpp
REVERT: 3e54ecd49c Added dgram.cpp to CMakeLists.txt sources
REVERT: 365c8eda72 Add dgram_t class (based on stream socket and udp engine)
REVERT: 72f19648d1 Merge pull request #1992 from evoskuil/master
REVERT: 8474dc3c53 Problem: precompiled.cpp/hpp required but excluded from non-msvc builds.
REVERT: bd66cfe6f8 Merge pull request #1991 from hitstergtd/x-testcov-zmq-2
REVERT: 5939debe41 Problem: incorrect file extension (.hpp) for zmq_draft.h in Makefile.am.
REVERT: 2b798e486a Problem: name conflicts from windows.h, draft API declared in pch.
REVERT: bda9374864 Problem: inadvertently deployed nuget package without tweetnacl enabled.
REVERT: a3aa10c06b Problem: nuget packaging script doesn't pause at the end.
REVERT: 94774f6915 Merge pull request #1988 from evoskuil/master
REVERT: 5e0fb27cc6 Problem: tab characters are poor for source readability.
REVERT: af524aed6b Problem: msvc dist has redundancies and missing elements.
REVERT: 9e26bb1885 Problem: typo in platform.hpp comment.
REVERT: 1c9d02d700 Problem: mo current nuget package.
REVERT: 7684ce4fcd Problem: incorrect white spacing for standard vcxproj file.
REVERT: 9622a830d0 Problem: inapplicable, redundant and invalid references in msvc pch.
REVERT: 4b041ef67d Problem: nuget package using wrong symbol and configured for libsodium.
REVERT: 2113feec39 Problem: msvc precompiled header config is a mess, tweetnacl is missing.
REVERT: 0db07394d0 Problem: msvc configuration options are invalid and/or inconsistent.
REVERT: 01ab149b96 Problem: copy of libsodium import props is unnecessary.
REVERT: 7425fcca80 Problem: incorrect include guard symbol.
REVERT: 40d7a4c896 Problem: redundant copies of msvc .props and .xml files.
REVERT: 71ba7df781 Merge pull request #1987 from hitstergtd/x-reduce-cliserv-sends
REVERT: e82e4ea13e Problem: test send count too high for AppVeyor
REVERT: f25a13bc8a Problem: configure.bat is incomplete and conflicts with MSVC UI.
REVERT: 9e872d0269 Merge pull request #1984 from hitstergtd/x-testcov-zmq-ctx
REVERT: 477cc1cb12 Problem: zmq_poller_destroy parameter checking
REVERT: 4842b6bd81 Problem: No coverage for ctx termination errors
REVERT: f8c93d508f Merge pull request #1983 from hitstergtd/x-unused-thread
REVERT: e946b0d1a6 Problem: scheduling parameters unused on OSX
REVERT: bce1cf96d9 Problem: vc common props have platform specific conditions.
REVERT: a3c3bcfe4a Problem: visual c++ invalid ToolsVersion warnings.
REVERT: 9cb7077e3d Problem: inconsistent msvc property sheet display name (vs2012).
REVERT: b5342bc008 Problem: no tool for maintainers to build all vs solutions.
REVERT: 398a5fd454 Problem: vs2010/12 build breaks, exclude atomic & inttypes in msvc pch.
REVERT: 29c8e30fc0 Merge pull request #1982 from Hugne/bug_1968
REVERT: f81ef1bc72 tipc: add support for address domain suffix
REVERT: 4ad68e0dfe Merge pull request #1981 from hitstergtd/x-unused-req
REVERT: 10a84ac8b1 Merge pull request #1979 from dmillard/patch-1
REVERT: 9e6745c12e Fix autotools for static MinGW builds
REVERT: c7ecbedb0e Merge pull request #1977 from hitstergtd/x-unused-variables
REVERT: 5efa11828c Problem: hint parameter throws unused warning
REVERT: 545e8e848e Problem: sockfd_ parameter throws unused warning
REVERT: dc7296537c Merge pull request #1976 from zeromq/revert-1975-master
REVERT: c41d514b8b Revert "problem:Socket try to access closed mutex"
REVERT: f6ce1d764c Merge pull request #1975 from somdoron/master
REVERT: 77d3d7b4dc problem:Socket try to access closed mutex
REVERT: a6e8d153cb Merge pull request #1974 from hitstergtd/master
REVERT: 8fc985a9b0 Problem: style/typo issue
REVERT: a4a247cf57 Merge pull request #1973 from hitstergtd/x-fix-m4-llvm-gcov-coverage
REVERT: 3eef0a7ba8 Merge pull request #1972 from hitstergtd/x-stylefix-udpengine
REVERT: 415af27395 Problem: Coverage option broken with LLVM GCOV
REVERT: 1f309d3a3d Merge pull request #1971 from sappo/master
REVERT: b22558119d Problem: Deploying release artifacts is a manual process Solution: Use travis to deploy these artifacts automatically.
REVERT: c4ce6d9b1b Merge pull request #1970 from hitstergtd/x-add-ancillary-tests
REVERT: 124ebd2dd6 Problem: UDP engine code not indented properly
REVERT: 206771afd2 Problem: Not all ancillary API methods tested
REVERT: d6aa6e71ec Merge pull request #1969 from pijyoi/fix_invalidsocket
REVERT: bb4bcf8f45 fix: sockets are not signed int on Windows
REVERT: f88d129b50 Merge pull request #1966 from bluca/backtrace_assert
REVERT: bb5037e855 Problem: leftover commented out line in configure
REVERT: 8045e9ae24 Problem: no backtrace is printed on assert
REVERT: c1dc9d0244 Merge pull request #1967 from hitstergtd/x-add-militant-option
REVERT: 6ea9dbc9ce Problem: No CMake option to set ZMQ_ACT_MILITANT
REVERT: f98b5bb5cf Merge pull request #1964 from bluca/sock_close_read_after_free
REVERT: 17132f0387 Problem: read-after-free when closing socket
REVERT: e9380b5a1a Merge pull request #1962 from somdoron/master
REVERT: be741f604a problem: timers test is flapping on windows
REVERT: 5dadded0a1 Merge pull request #1961 from somdoron/Signaler
REVERT: a747f72450 problem:closed poller still associated with socket
REVERT: fb75b201c3 Merge pull request #1960 from hitstergtd/x-sort-AUTHORS
REVERT: 001ddd80cc Merge pull request #1958 from hitstergtd/x-deprecate-zmq-sendrecviov-fix
REVERT: a46d7b994f Merge pull request #1959 from hitstergtd/x-zmqpoll-fix
REVERT: b3bb0b7f1c Problem: zmq_sendiov/zmq_recviov not Deprecated
REVERT: 109122dd46 Problem: style issues with comment in zmq_poll
REVERT: c33e96f2d2 Merge pull request #1957 from hitstergtd/x-TIPC-CMake-fix
REVERT: b470ed451f Problem: ZMQ_HAVE_TIPC option for CMake is broken
REVERT: 00d7ee1646 Merge pull request #1956 from hitstergtd/x-addto-AUTHORS-file
REVERT: ad82bd1b1a Merge pull request #1955 from hitstergtd/x-remove-MAINTAINERS-file
REVERT: 6ae2ff6446 Problem: MAINTAINERS file has no purpose anymore
REVERT: 745e07d93c Merge pull request #1954 from somdoron/master
REVERT: e15da4b38c problem: compilation error on osx
REVERT: feec47604f Merge pull request #1953 from somdoron/master
REVERT: ba20f665ae problem: SRCFD is redundant as we have metadata
REVERT: 4012538ce4 problem: srcfd is broken
REVERT: a192663ece Merge pull request #1951 from hitstergtd/x-monitorcomment-fix
REVERT: 372ab4b8fe Merge pull request #1949 from somdoron/master
REVERT: 50c2f7af8f fix sndbuf/rcvbuf tests
REVERT: fca45921a8 problem: zeromq performance got worsen by some changes
REVERT: 115e7de7d2 Merge pull request #1948 from hitstergtd/x-gitignore-fix
REVERT: e68c8ae1eb Problem: Not all GCOV extensions in .gitignore
REVERT: fc7d5e7fbb Merge pull request #1946 from somdoron/master
REVERT: b3667cccf9 mark zmq_msg new methods as draft
REVERT: fcc80d4ffb add draft option to windows configure
REVERT: 91394d27c7 Merge pull request #1945 from bluca/draft_api
REVERT: b741350745 Problem: test_pub_invert_matching not ignored
REVERT: a782be73ac Problem: no CI tests with DRAFT enabled
REVERT: 6de24c190a Problem: scatter/gather are not yet stable APIs
REVERT: caaf66c32c Problem: radio/dish are not yet stable APIs
REVERT: 32a1ef85a8 Problem: zmq_timers* are not yet stable APIs
REVERT: 738968082b Problem: zmq_poller* are not yet stable APIs
REVERT: 7e700f1e73 Problem: client/server are not yet stable APIs
REVERT: 064cd1fbfb Problem: no support for DRAFT API in build systems
REVERT: f0a34e0ff5 Problem: test_poller/use_fd_ipc/tcp use draft API
REVERT: c293618ae8 Problem: testutil.hpp includes platform.hpp last
REVERT: b469832409 Problem: precompiled.hpp ifdef'd for windows
REVERT: 464d3fd3f8 Merge pull request #1944 from hitstergtd/x-testmonitor-fix
REVERT: b65fc903cd Merge pull request #1943 from hitstergtd/x-style-tunetcpkeepalives-fix
REVERT: dc81aac195 Merge pull request #1940 from hitstergtd/x-update-autoconf-archive-m4-macros
REVERT: 52871b0f3c Problem: autoconf-archive m4 macros out of date
REVERT: a8f756173a Merge pull request #1941 from hitstergtd/x-doc-setsockopt-fix
REVERT: 1ab7dd0122 Problem: supported protocols comment is stale
REVERT: 40dbbe342e Problem: bounce() arguments reversed
REVERT: 4809926c10 Problem: zmq_setsockopt(3) man page formatting
REVERT: b3ae7cfa0d Merge pull request #1937 from hitstergtd/test-add-sendiov
REVERT: e4539778a4 Problem: multiple issues with sendiov/recviov
REVERT: a31c508979 Problem: tune_tcp* related code has style issues
REVERT: 89ef8b38c0 Merge pull request #1938 from hitstergtd/decoder-fix
REVERT: d7038bf11b Problem: AUTHORS file is not sorted
REVERT: 56e83d0eb6 Problem: Not shamelessly plugged into AUTHORS
REVERT: 8820e35a56 Problem: style issues in decoder.hpp
REVERT: 95acb29bfb Merge pull request #1934 from somdoron/master
REVERT: fee84134e7 UDP and Radio-dish documentation
REVERT: 34d5028ea8 allow specify binding address on radio with udp
REVERT: 9ec9c4ad0c Merge pull request #1933 from sappo/master
REVERT: a1ee5e3136 Problem: relicense statement from imatix is in the wrong place Solution: move the statement to the folder introduced in commit: dd51cad082923a5973cdaff9c0418e5ab28de763
REVERT: 5264a9afce Merge pull request #1917 from hintjens/master
REVERT: c1155fad71 Merge pull request #1925 from ewen-naos-nz/ewen_mcneill_relicense_naos
REVERT: f64c8429b9 Merge pull request #1924 from ewen-naos-nz/ewen_mcneill_relicense_readme
REVERT: f7cf246373 Merge pull request #1932 from hitstergtd/doxygen-libzmq
REVERT: f950f2ba69 Problem: No default doxygen cfg for ZeroMQ project
REVERT: 6712f6dd01 Merge pull request #1931 from hitstergtd/unistd-fix
REVERT: e604bbcc13 RELICENSE: Link to 0MQ Licensing page
REVERT: 3df0a4f7e4 Merge pull request #1929 from hitstergtd/autotools-fix
REVERT: 9218441f97 Problem: unistd.h redundantly included twice
REVERT: 876ee5d6b4 Problem: test_pub_invert_matching missing in autotools build
REVERT: 4b3199fefa Merge pull request #1927 from hitstergtd/codespell-fixes
REVERT: af82d0641c Merge pull request #1926 from hitstergtd/codespell-fixes
REVERT: d3c800a237 Problem: tune_tcp_keepalives signature >80 chars
REVERT: b2d0ab18f2 Problem: trailing whitespace in code
REVERT: 11311f9776 Problem: trailing spaces in code comments
REVERT: a4b426b18e Problem: typos/trailing spaces in code comments
REVERT: 0e5ea0c8f0 RELICENSE: Naos Ltd MPLv2 grant
REVERT: dd51cad082 RELICENSE: Start collecting MPLv2 license grants
REVERT: 7b9005a7a1 Merge pull request #1923 from hitstergtd/testxpubmanual-msvc-fix
REVERT: 8872809337 Problem: XPUB test broken since #1566 on Windows
REVERT: fb015569a2 Merge pull request #1921 from somdoron/master
REVERT: 9798f74d17 add have timers define to detect if timers class available
REVERT: a4d219c07a Problem: need to collect grants to relicense under MPLv2
REVERT: 230df282bd Merge pull request #1920 from somdoron/master
REVERT: 0655ed2e0e fix test unbind wildcard
REVERT: 0934bc784d fix test term endpoint
REVERT: 6f1dc64ff3 Merge pull request #1919 from bluca/xpub_test_logic
REVERT: a93600309f Problem: assertion in test_xpub_manual is swapped
REVERT: dd038ae38e Merge pull request #1918 from hitstergtd/hitstergtd-testxpubmanual-win
REVERT: ff02862171 Problem: XPUB test broken on Windows since #1569
REVERT: 4ae62dfc29 Merge pull request #1916 from linville/master
REVERT: a57fd70844 Fix issue with unresolved external symbols for the gather and scatter classes by adding them to the MSVC 2010, 2012, 2013 and 2015 projects.
REVERT: ad4e091a5a Merge pull request #1915 from hitstergtd/checkproto-windows-fix
REVERT: 7feb1e49fc Problem: Windows IPC check broken (check_protocol)
REVERT: 0ece425dca Merge pull request #1914 from hitstergtd/clang-testfiles-fix
REVERT: 7f0e380c05 Problem: LD search path warnings if using Clang
REVERT: 23e42526eb Merge pull request #1913 from bluca/ipc_windows
REVERT: 5178251587 Problem: test_ipc_wildcard is ran on Windows
REVERT: d6a57ad589 Merge pull request #1912 from hitstergtd/hitstergtd-testsrcfd-win-fix
REVERT: e8aeb3686d Problem: ZMQ_SRCFD test does not work on Windows
REVERT: 99763cce41 Merge pull request #1909 from somdoron/master
REVERT: e6dae56c6e Scatter-Gather socket types
REVERT: fae3a4e02a Merge pull request #1911 from somdoron/FixUDPWindows
REVERT: bf50f9fe75 Merge pull request #1910 from bluca/tipc
REVERT: 87e455f59b Fix UDP failing on windows
REVERT: a117c1f48d Problem: Travis CI CMake build does not run tests
REVERT: ea294afd8b Problem: CMake does not check for TIPC support
REVERT: 317499edae Merge pull request #1906 from hitstergtd/hitstergtd-cmake-tests-os-fix
REVERT: 846b2ba174 Problem: Linker search path warnings on OS X
REVERT: 136870f298 Merge pull request #1902 from bluca/zmq_unbind_api_breakage
REVERT: c8211bf320 Problem: can't unbind with bound addr with IPv6
REVERT: 58c4e7e6b6 Problem: IPv6 is disabled on Travis Precise/Trusty
REVERT: ac0e97e5dc Problem: can't test if IPv6 is available in tests
REVERT: 8d49650ac8 Merge pull request #1901 from hitstergtd/hitstergtd-testcmake-fix
REVERT: e09eb0db6f Problem: comment not well formed in CMakeLists.txt
REVERT: 1d083a33fd Merge pull request #1900 from hitstergtd/hitstergtd-testudp-fix
REVERT: 9a9bfb6443 Problem: test_udp does not release resources properly
REVERT: c354e0b371 Merge pull request #1898 from hitstergtd/checkprotocol-fixes-1
REVERT: 8cb27316fa Problem: check_protocol() logic duplicated twice
REVERT: a670e81e73 Merge pull request #1897 from hitstergtd/udp-errno-fix
REVERT: 362377948e Problem: errno not set if UDP is NOT used with ZMQ_RADIO or ZMQ_DISH
REVERT: c2a1be5c15 Merge pull request #1896 from hitstergtd/macosx-testfixes-1
REVERT: 307bd952bc Make all Linux-specific tests conditional
REVERT: 8c88297e63 Merge pull request #1895 from hitstergtd/libzmq-docfixes-2
REVERT: a17389eeb0 Fix typos similar to #1894
REVERT: 6a7eb2fbc1 Merge pull request #1894 from hitstergtd/libzmq-docfixes-1
REVERT: 6c3129286d Fix typo
REVERT: 3f77cf5a2f Merge pull request #1892 from bluca/solaris_fixes
REVERT: f6f89a84d9 Merge pull request #1893 from paddor/master
REVERT: ba9a559fe5 Problem: PR #1891 wasn't complete
REVERT: 1afed1d32e Problem: tabs instead of spaces used for indentation
REVERT: b1232a0fd8 Problem: Solaris build fails with libsodium
REVERT: a01baba38b Problem: test_use_fd_tcp does not work on Solaris
REVERT: edda1657fa Problem: pragma diagnostic is new in GCC 4.2
REVERT: abe44500de Problem: tweetnacl does not build on Solaris 10
REVERT: c54589daef Merge pull request #1891 from paddor/master
REVERT: 621c965fae Problem: tricky return value from zmq::socket_poller_t::wait when poller is empty
REVERT: b5dc794202 Problem: zmq_poller_wait doesn't check *event arg
REVERT: d570f57b6e Problem: ipc://* random dir created with USE_FD
REVERT: f18463f323 Problem: mkdtemp not available on all platforms
REVERT: 8028817f6b Problem: 1E9 is double but assigned to an int var
REVERT: 32f2b784b9 Merge pull request #1889 from spadalkar/master
REVERT: e3016b66bd Fix tests/test_many_sockets.cpp
REVERT: 23d08c2024 Merge pull request #1888 from bluca/ipv6_downgrade
REVERT: 9cf6f85a25 Problem: redundant Windows errno conversion
REVERT: 99a8795dfe Problem: zmq_connect (TCP) has no IPv4 fallback
REVERT: d169281a00 Problem: zmq_bind IPv4 fallback still tries IPv6
REVERT: 8251306012 Merge pull request #1885 from jimklimov/zmq_utils_header
REVERT: d7d917139b Problem: including recent "zmq_utils.h" crashes gcc -pedantic jobs
REVERT: fb4c226365 Merge pull request #1884 from hintjens/master
REVERT: 9eb74d4df4 Problem: ZMQ_SERVER man page is wrong
REVERT: aa13a49bc8 Merge pull request #1883 from yuvallanger/master
REVERT: 37a4a4075e Fix NetBSD thread scheduling problem.
REVERT: 7a563ebb2c Merge pull request #1882 from FredTreg/master
REVERT: 625b618776 Fixed ZMQ_REQ_CORRELATE (see pull request #1730)
REVERT: 0feec7a72e Merge pull request #1881 from camachat/master
REVERT: 023b34a144 Fix issue #1419 segfault when using a XSUB/XPUB proxy. Ref. https://github.com/zeromq/libzmq/issues/1419
REVERT: a7922e5fdd Merge pull request #1880 from MatthewPowley/fix-windows-xp-compatability
REVERT: f2018ab317 Fixes for Windows XP compatibility
REVERT: dac5b45dfb Merge pull request #1879 from MatthewPowley/improve-msvc-builds
REVERT: 260860dea1 Add .gitignore for Visual Studio builds in the 'builds/msvc' folder
REVERT: 0e405a5a77 Use vs2015 MSBuild property sheets in older projects
REVERT: cddfda2aed Merge pull request #1875 from hintjens/master
REVERT: e70e39be49 Problem: ctx.cpp still uses old HAVE_LIBSODIUM
REVERT: d6354c64ea Merge pull request #1874 from hintjens/master
REVERT: 396237f871 Problem: MSVC builds instructions aren't entirely clear
REVERT: 6a78b3ec19 Problem: HAVE_LIBSODIUM macro is inconsistent
REVERT: 6630a7ceaf Merge pull request #1873 from edigaryev/fix-urandom-chroot
REVERT: 8673fa7b03 Problem: build fails when CURVE security is disabled
REVERT: c71bb5fd1f Merge pull request #1872 from edigaryev/fix-urandom-chroot
REVERT: 884e00cb4a Problem: CURVE mechanism is unusable with chroot()
REVERT: c39741dd33 Merge pull request #1871 from gnieboer/gnieboer-patch-1
REVERT: 8c7b19b1b7 Update zmq_utils.h
REVERT: 05c8de7928 Merge pull request #1869 from jimklimov/fix-tcp_address
REVERT: e9c8557e92 zeromq-4.1.4/src/tcp_address.cpp : fix relaxed use of sizeof() without parenthesis
REVERT: b8ae850d78 Merge pull request #1862 from FredTreg/master
REVERT: e45dfe3bc7 Fixed issue #1695 (ZMQ_REQ_CORRELATE)
REVERT: 98ab7f4164 Merge pull request #1860 from bluca/valgrind
REVERT: dc27ad41d2 Problem: coveralls uses wrong path on Trusty
REVERT: 0eca822b8f Problem: Valgrind in Ubuntu Precise is too old
REVERT: 9d94eb11b3 Problem: test_fork causes valgrind false positive
REVERT: 00e0957640 Problem: false positive on valgrind 3.10
REVERT: ebc7316069 Problem: CI doesn't run Valgrind
REVERT: 2b2f9046d4 Problem: no Makefile target for Valgrind
REVERT: d5aaaeb888 Merge pull request #1859 from soulik/master
REVERT: 75579fe7d9 Added comment to sockaddr_storage
REVERT: e38166cc1b Use sockaddr_storage instead of sockaddr to support IPv6 addresses
REVERT: 3777309b67 Merge pull request #1858 from zoobab/master
REVERT: 516efa46c0 add some doc for docker android compilation
REVERT: 340eb52165 Merge pull request #1847 from bluca/test_large_msg
REVERT: 9a3c9ff864 Merge pull request #1857 from Suudy/master
REVERT: 075de03d1c Use FILENAME_MAX to determine BUFSIZE when getting socket path.
REVERT: 15fd419f22 Problem: test_large_msg requires 2GB of free RAM
REVERT: de56bc2729 Merge pull request #1853 from bluca/osx_ipc_wildcard
REVERT: 11917f850a Problem: IPC wildcard test broken on OSX
REVERT: 5ce6bc5f6d Merge pull request #1852 from Suudy/master
REVERT: b6080a798c Updated handling of Unix Domain Sockets, make use of temporary directories, and cleanup afterward.  Fix test_term_endpoint handling of optvallen
REVERT: 96c9e4aabd Merge pull request #1851 from bluca/gcov
REVERT: 1ac71c3c24 Problem: no coveralls.io badge in README.md
REVERT: 0cd7c0f807 Problem: no code coverage in CI
REVERT: 6df753c55a Problem: no code coverage integration
REVERT: 22cb66d832 Merge pull request #1849 from opedroso/WINPDB
REVERT: a6392b9e74 Problem: Windows PDB not created for RELEASE targets
REVERT: dbb6b019e6 Merge pull request #1848 from benjamg/benjamg-patch-1
REVERT: 7cc50d0005 parameter naming consistency [aesthetic]
REVERT: 24d12dc30a Merge pull request #1827 from bluca/make_dist_missing_files
REVERT: 6aa581980a Merge pull request #1845 from claudioscordino/master
REVERT: cb1b6bc9ae Better comments for understanding the classes array_t<> and array_item_t<>
REVERT: 6024dd5dfa Problem: ci_build does not fully test build system
REVERT: ff1ebf6ff0 Problem: ci_build.sh make check is overly complex
REVERT: 4366d7edf9 Problem: doc/Makefile.am ignores --without-docs
REVERT: 2d9e7b57f9 Problem: make dist does not tar up macros.hpp
REVERT: 8a0a18a527 Merge pull request #1844 from opedroso/CMAKELIST_PRECOMP
REVERT: cd1dfb4092 Problem: CMakelist missing support for Windows Precompiled headers
REVERT: 2cd4c38b80 Merge pull request #1843 from opedroso/WINDOWS_MAKE_TEST
REVERT: 1c9cec227d Problem: Tests do no build in Windows environment
REVERT: a911fa41b8 Problem: Tests do no build in Windows environment
REVERT: 0916c17b3a Merge pull request #1842 from opedroso/PRECOMPILED
REVERT: 72898a0ecc Merge pull request #1841 from opedroso/MAKE_CLEAN
REVERT: 224c0670ee Problem: Windows Build not using precompiled headers for all targets
REVERT: 09d003aac0 Problem: Added "make clean" to Windows build scripts
REVERT: d315eea707 Merge pull request #1839 from opedroso/master
REVERT: ee31ea1348 Merge pull request #1838 from obache/neatsrc/fix-c-comment-style
REVERT: 693d6384b6 Merge pull request #1837 from obache/neatsrc/fix-test-portability
REVERT: 3c4377b11d Merge pull request #1836 from obache/neatsrc/heimdal
REVERT: 8c7c8ece2d Problem: Fix C++ style comment usage in C source
REVERT: 55dad06cce Problem: Fix unportable `==` operator for `test`
REVERT: 09e868b743 Problem: Fix build with Heimdal krb5
REVERT: 36abdf7bd5 Merge pull request #1834 from garlick/config_nacl
REVERT: 54389fefb5 Problem: AS_HELP_STRING improperly quoted
REVERT: 9d75a9c27d Problem: AM_CONDITIONAL is used incorrectly
REVERT: ec6209737e Merge pull request #1832 from hintjens/master
REVERT: 5b7bf7509f Problem: can't be sure crypto_box always returns 0
REVERT: 708c2060ee Merge pull request #1830 from stevenc99/master
REVERT: dd8ccd5e0f include sys/ucred.h for struct ucred
REVERT: d7691756e2 Merge pull request #1829 from dflupu/master
REVERT: 3190de8045 update Makefile.mingw32
REVERT: 8b32073c7b Merge pull request #1826 from bluca/make_dist
REVERT: b3b9cfd92e Problem: packaging/redhat/zeromq.spec not ignored
REVERT: f3686e34ff Problem: make dist broken due to builds/msvc
REVERT: 391397571b Problem: make dist broken due to builds/android
REVERT: 8d811474d4 Problem: make dist broken due to builds/cmake
REVERT: 232094a09d Merge pull request #1825 from bluca/whitespace_and_werror
REVERT: 80e529a16a Problem: all tests fail with assert in in_event
REVERT: ae8efc21e8 Problem: nullptr is a reserved keyword in C++0x
REVERT: 7187169619 Problem: socket_poller_t initialization reorder
REVERT: c84a52b11e Problem: udp_engine_t fd cannot be init to NULL
REVERT: 1046f35930 Problem: udp_engine_t initialization reorder
REVERT: 24b84081be Problem: socks_connecter_t initialization reorder
REVERT: a6e49860f5 Problem: tcp_connecter_t initialization reorder
REVERT: 645c2be487 Problem: stream_engine_t initialization reorder
REVERT: c21dd8d6a2 Problem: socket_base_t initialization reorder
REVERT: acbf021a7c Problem: reaper_t initialization reorder
REVERT: 779bed6315 Problem: encoder_base_t initialization reorder
REVERT: de46fc6ac9 Problem: can't do anything with load.sub ret val
REVERT: 14054d28ed Problem: can't statically initialized pthread_t
REVERT: cf309a4e8c Problem: maxfd definition depends on ifdef
REVERT: d4c0716473 Problem: indentation should be 4 spaces, no tabs
REVERT: 406b5738b6 Merge pull request #1823 from opedroso/COVERITY
REVERT: b3d5fa63a0 Problem: Several problems found by Coverity Static Analyzer
REVERT: 4fca95a557 Problem: Visual Studio Toolset was incorrectly set in VCXPROJ files
REVERT: 1ffd87453b Merge pull request #1822 from opedroso/VS_TOOLSET
REVERT: b4784d95bb roblem: Visual Studio Toolset was incorrectly set in VCXPROJ files
REVERT: c5d8353429 Merge pull request #1819 from bluca/C++11
REVERT: 15945dc59b Merge pull request #1820 from obache/neatsrc/fix-netbsd-build
REVERT: 8eaa43d9d3 Problem: pgm/in.h is required on NetBSD too for `struct group_req`
REVERT: 0782b58d9c Problem: tweetnacl warnings override not needed
REVERT: 7dfbab3f97 Problem: it's 2016 and we are building with C++98
REVERT: 80650ecfe2 Problem: need to check for C++ standard in cmake
REVERT: b9f1e3ed61 Problem: writing autoconf macros is boring
REVERT: 266500a9ff Merge pull request #1818 from opedroso/PRECOMPILED
REVERT: afdf27765e Merge pull request #1817 from hintjens/master
REVERT: 8ae3671e88 Problem: tweetnacl gives many warnings on MSVC
REVERT: 79538ed651 Problem: Windows build not using precompiled header
REVERT: 4a5af9d58b Problem: Precompiled headers not being used
REVERT: 325eb693a9 Merge pull request #1815 from hintjens/master
REVERT: 27fe489843 Problem: VC++ gives warnings on inet_addr
REVERT: 1c43aaa39a Merge pull request #1814 from minrk/deprecate-zmq_utils.h
REVERT: d5b66295d4 Deprecate zmq_utils.h
REVERT: b20259809d Merge pull request #1811 from somdoron/master
REVERT: 352ae1468f remove using of dynamic cast
REVERT: b168e1044b Merge pull request #1810 from opedroso/IMPROVE_WINDOWS_BUILD
REVERT: 80024eca8c Problem:  Windows build script requires edit for DevStudio version
REVERT: 7200f473ad Merge pull request #1809 from hintjens/master
REVERT: 94c7087e36 Problem: piece of garbage ended up in configure.ac
REVERT: 7129187f87 Problem: getting various warnings in tweetnacl
REVERT: 3443da216f Problem: node-gyp defaults to -fno-rtti, which breaks libzmq
REVERT: c78e4f33a3 Problem: if src/platform.hpp still exists, gyp uses this
REVERT: 9bebd4dce9 Problem: local build should do its own .gitignore
REVERT: 8559770cf3 Problem: in builds/gyp, socket limit is 4K on Windows
REVERT: 4a481c857f Problem: socket limit is still 4K on Windows
REVERT: df6876abde Merge pull request #1805 from bluca/uninitialised_sockopt
REVERT: f86795350d Problem: curve keys getsockopt uninitialised read
REVERT: 93f99d09f4 Merge pull request #1804 from bluca/test_fixes
REVERT: facb512105 Problem: SETTLE_TIME is too short on slow systems
REVERT: 217f6c438e Problem: tests README does not document msleep
REVERT: 706c3b7c4b Problem: test_shutdown_stress_tipc broken on OSX/Cmake
REVERT: 63a0924484 Problem: test_sockopt_hwm not renamed in gitignore
REVERT: cb41201880 Problem: various tests fail in slow environments
REVERT: 4a84f8a02e Problem: tests use various sleep patterns to wait
REVERT: 955b51dfd2 Problem: test_msg_ffn uses unitialised memory
REVERT: 240190131c Problem: test_srcfd uses unitialised memory
REVERT: 302c7bee50 Problem: test_fork does not clean up at exit
REVERT: f87888f80c Problem: test_router_mandatory_hwm uses unitialised memory
REVERT: cffc653535 Problem: test_pre_allocated_fd_tcp leaks addrinfo
REVERT: 05ad915265 Problem: test_term_endpoint does not clean up at exit
REVERT: f8f8043222 Problem: test_msg_ffn uses unitialised memory
REVERT: e177512c82 Problem: test_system does not clean up at exit
REVERT: 18dcc32ac3 Merge pull request #1803 from bluca/ci_default_only_on_secondary
REVERT: 9a6e10406d Problem: too many CI builds
REVERT: 930a24425c Merge pull request #1802 from hintjens/master
REVERT: 9c0d176d68 Problem: tests don't build on Windows
REVERT: 0dbb918244 Merge pull request #1800 from hintjens/master
REVERT: bbcc79d188 Problem: tests don't build on Windows
REVERT: 06acd76a21 Problem: people don't know how to write test cases
REVERT: d148c3ea5d Problem: no clue how to run gyp on Windows
REVERT: 8bee4e2547 Merge pull request #1799 from hintjens/master
REVERT: 8230c0d396 Problem: gyp does not build tests
REVERT: 44c3859073 Problem: minor glitch, test_socketopt_hwm <> test_sockopt_hwm
REVERT: 25ce52e449 Problem: tcp_address.cpp has messy include usage
REVERT: a682f94a32 Problem: tcp_address.cpp won't compile on OS/X w/o ZMQ_HAVE_IFADDRS
REVERT: 22e830bece Merge pull request #1798 from hintjens/master
REVERT: 6bef3fe9ad Problem: can't build libzmq.a using gyp
REVERT: 781ddd6758 Merge pull request #1797 from bluca/ci_matrix
REVERT: 9393f06381 Problem: CI use of sodium or nacl is confusing
REVERT: 05f382d290 Merge pull request #1796 from bluca/cmake_build
REVERT: 01eb580739 Problem: typo in CMake platform.hpp breaks build
REVERT: fde81d7e07 Problem: can't build using gyp
REVERT: db77fc9ced Merge pull request #1795 from bluca/ci_tweetnacl
REVERT: 0afac59018 Problem: empty files are against ISO C++
REVERT: f1c4416e20 Problem: typo in CMakeLists "matches" keyword
REVERT: 1e6915039f Problem: typo in CMakeLists.txt, can't use sodium
REVERT: f777ad8b91 Problem: typo in configure.ac, can't use libsodium
REVERT: 0bdc5d0457 Problem: CMake CI build still clones libsodium
REVERT: 4f5594c2ce Problem: Android CI build uses unstable libsodium
REVERT: 3420e6e0dd Problem: CI still thinks libsodium is default
REVERT: 1fb4840955 Merge pull request #1794 from hintjens/master
REVERT: f8ed793f76 Problem: tweetnacl sources are a mess
REVERT: a460e5abd2 Merge pull request #1793 from hintjens/master
REVERT: e65367ea2d Problem: some configure options are confusing
REVERT: 8e40e67d29 Merge pull request #1792 from bluca/fix_gitignore
REVERT: 700de65a37 Merge pull request #1791 from hintjens/master
REVERT: 2e3a0db5f9 Problem: old filenames in .gitignore
REVERT: 9f8ced3f65 Problem: autotools platform.hpp is not compatible with CMake
REVERT: dd4b93ddd8 Merge pull request #1790 from hintjens/master
REVERT: ddbbe3b47c Problem: cmake fails with #error None of the ZMQ_USE_* macros defined
REVERT: b49a60410a Problem: use of libsodium vs. tweetnacl is confused
REVERT: 42ab88e486 Merge pull request #1786 from hintjens/master
REVERT: 62c66ae7f7 Problem: test_large_msg kills my system temporarily
REVERT: 7470c00d4d Problem: ZMQ_TCP_RECV_BUFFER/SEND_BUFFER are redundant
REVERT: 884c7f78e9 Problem: zmq_getsockopt wrongly referred to ZMQ_THREADSAFE
REVERT: 7f6ed167fc Problem: ZMQ_XPUB_VERBOSE_UNSUBSCRIBE is clumsy
REVERT: da8ce55a14 Problem: ZMQ_TCP_RETRANSMIT_TIMEOUT is a clumsy name
REVERT: 5eccd874d6 Merge pull request #1785 from bluca/one_more_rename
REVERT: edc4ee03e8 Problem: ZMQ_USEFD does not follow conventions
REVERT: 15846f2fe4 Merge pull request #1784 from bluca/rename_pre_allocated_fd
REVERT: c158178798 Problem: ZMQ_PRE_ALLOCATED_FD is too long
REVERT: 66d9a5f5ae Merge pull request #1783 from bluca/travis_tweetnacl
REVERT: c23cc65735 Problem: no CMake Travis CI build
REVERT: 918c1ec620 Problem: CMake uses command added in 2.8.12
REVERT: 84544ca6e2 Problem: no CI build with tweetnacl
REVERT: 6681bcf08c Problem: tweetnacl/contrib/randombytes need C++0x
REVERT: c59670dbc2 Merge pull request #1782 from minrk/configure-with-tweetnacl
REVERT: e86650794f fallback on tweetnacl if libsodium is not found and not explicitly requested
REVERT: 2902fd60b9 add --with-tweetnacl to configure
REVERT: 135c4112c8 Merge pull request #1780 from hintjens/master
REVERT: 58059939fc Problem: compile warnings on Windows in new radio/dish code
REVERT: e0f02bdfb8 Problem: libzmq uses different build.bat style than zproject
REVERT: 07cba2307d Merge pull request #1779 from obache/neatsrc/fix-a-typo-for-ZMTP-heartbeats
REVERT: 8a1dcca8c2 Merge pull request #1778 from obache/neatsrc/fix1768
REVERT: 4c6753346b Merge pull request #1777 from brian-peloton/master
REVERT: 99495bbab8 Fix a typo in "Add ZMTP heartbeats" changes
REVERT: 7cd60fae59 Change to detect POSIX Thread priority support properly
REVERT: 273b54715e Use memcpy instead of assuming option values are aligned
REVERT: ffe4a1c615 Merge pull request #1776 from hintjens/master
REVERT: a1f51b695f Problem: unclear rules for passing null arguments
REVERT: 27a8961c37 Problem: resolution of int optval_ was made more verbose
REVERT: c8318912f5 Problem: test case is using internal API
REVERT: 0d7e7bfac0 Problem: MSVC project filters were out of date
REVERT: 39563d70c5 Merge pull request #1775 from CommanderBubble/patch-2
REVERT: 7270d4de65 windows.hpp needs to be included before zmq.h
REVERT: a9666d7f0c Merge pull request #1774 from brian-peloton/master
REVERT: d06314df84 added windows includes as well as unix includes
REVERT: 75bea4bc13 update for mingw's default _WIN32_WINNT
REVERT: 05b5633b8d update for mingw's default _WIN32_WINNT
REVERT: 596fd2408a added ZMQ_HAVE_WINDOWS check to _WIN32_WINNT usage
REVERT: b98b1495af added ZMQ_HAVE_WINDOWS check to _WIN32_WINNT usage
REVERT: 595181d301 added ZMQ_HAVE_WINDOWS check to _WIN32_WINNT usage
REVERT: 56efddd182 remove c++11 requirement and -Werror=sign-compare
REVERT: 988d33bcf8 added windows.hpp with include check
REVERT: f472893da1 changed order of includes
REVERT: 3cdc9218c2 remove include that is already in header
REVERT: def0336e9a increase mingw's minimum _WIN32_WINNT version
REVERT: f4fe375bd1 Don't call memcpy with 0 size and NULL pointer(s)
REVERT: c9c9a777d6 Merge pull request #1773 from bluca/libsodium_stable
REVERT: 3641f705e1 Problem: CI builds libsodium from dev branch
REVERT: b9e4fa82a2 Merge pull request #1772 from hintjens/master
REVERT: 86aa7bb1bc Problem: commit a464eec7 really broke VS2015 builds
REVERT: 02120203b2 Merge pull request #1771 from bluca/valgrind_iterator
REVERT: a9aeb492dc Problem: Valgrind reports read of freed memory
REVERT: c5bf0dc0a4 Merge pull request #1770 from bluca/systemd
REVERT: 84ad4bf0ff Problem: cannot use new pre-allocated FD with TCP
REVERT: 9b885b7c00 Problem: cannot use new pre-allocated FD with IPC
REVERT: 4bcbb3055e Problem: cannot use pre-allocated FDs. Fixes #777
REVERT: 8b0fdd94d3 Merge pull request #1767 from hintjens/master
REVERT: a3d9b46a60 Problem: Android build is slow and noisy
REVERT: 08cfbdef7d Merge pull request #1766 from hintjens/master
REVERT: 31d181effb Problem: MSVC build does not detect libsodium
REVERT: 8fad51c270 Merge pull request #1765 from hintjens/master
REVERT: 6a9af8ed62 Problem: can't build without libsodium from command line (MSVC)
REVERT: 984699c427 Problem: was ignoring directories with build files
REVERT: d7a7f48918 Problem: my name is not in the AUTHORS file
REVERT: 3d9984efe2 Merge pull request #1764 from GreatFruitOmsk/master
REVERT: ad286d9442 Merge pull request #1763 from CommanderBubble/patch-1
REVERT: bfc42d47ec Merge pull request #4 from zeromq/master
REVERT: 538e5d4742 Make VMCI to work on Windows.
REVERT: d7e59d6188 Fix integer overflow error when calculating throughput.
REVERT: f38062e6e3 fix configure errors for 64bit mingw
REVERT: 0463926db8 change references from mingw32 to mingw
REVERT: bdda5189f0 fix configure errors for 64bit mingw
REVERT: 0329402d0a Merge pull request #1762 from hintjens/master
REVERT: d218e03884 Problem: project files have tool version in two places
REVERT: 4ce9c7c742 Problem: does not build on VS2015
REVERT: 963dffb54a Merge pull request #1760 from hintjens/master
REVERT: b92055fa56 Problem: not building on VS2015
REVERT: c6b11ae4a7 Merge pull request #1758 from zeromq/revert-1757-revert-1756-replace-zmq-term
REVERT: 44c6b0484e Revert "Revert "Problem: deprecated use and reference of `zmq_term`""
REVERT: c143a7d397 Merge pull request #1757 from zeromq/revert-1756-replace-zmq-term
REVERT: 1708bfefb7 Revert "Problem: deprecated use and reference of `zmq_term`"
REVERT: d44a8ccddb Merge pull request #1756 from c-rack/replace-zmq-term
REVERT: a26bb743d4 Problem: docs are still referring to deprecated `zmq_term`
REVERT: 589464ced9 Problem: comments still refer to deprecated `zmq_term`.
REVERT: 10d9ef8a5f Problem: perf use deprecated `zmq_term`
REVERT: 0d171563d0 Problem: tests use deprecated `zmq_term` function
REVERT: d92e40901d Merge pull request #1755 from UsamaMehboob/master
REVERT: a72cb5d43d added #include<unistd.h> in udp_engine.cpp to solve error 'close was not declared in scope'
REVERT: e1254e100e Merge pull request #1751 from c-rack/remove-zmq-utils-includes
REVERT: 7da3ee138e Problem: deprecated `zmq_utils.h` is still included
REVERT: 435535ce92 Merge pull request #1750 from hintjens/master
REVERT: 6f94af8cca Problem: various errors in build scripts
REVERT: 3cf6c33132 Merge pull request #1748 from sunkin351/master
REVERT: 9b01ae826e Restoring zmq_utils.h from previous version
REVERT: a464eec7df Added "udp_address" and "udp_engine" to enable windows build
REVERT: d7ef68d6b7 Merge pull request #1747 from c-rack/remove-zmq-utils-h
REVERT: af775c0c8b Problem: `zmq_utils.h` is deprecated since 2014-07-09
REVERT: 8dbda15e21 Merge pull request #1745 from somdoron/master
REVERT: 4f4e475331 Merge pull request #1746 from minrk/allow-underscore-dns
REVERT: cdec4dc9ee allow underscores in domain names
REVERT: 389e853c6d Fix compilation errors on windows
REVERT: add4e7675f Merge pull request #1744 from jcfr/fix-gcc-warnings
REVERT: 318dd7c717 Merge pull request #1743 from jcfr/add-missing-ctest-tests
REVERT: 73f73ddaa9 Merge pull request #1742 from jemc/master
REVERT: 2cb8da3bfd Style: Fix -Wmissing-field-initializers in socket_poller.cpp
REVERT: 46b02338e3 Style: Fix -Wunused-but-set-variable in test_stream_exceeds_buffer.cpp
REVERT: f329252dcb Style: Fix unused parameter compilation warnings
REVERT: 05e48cc6a9 ctest: Add missing test_udp and test_large_msg
REVERT: cf5c288dda Rename `udp_address::interface` to `iface` for VS2015 build. Resolves #1739.
REVERT: b784943f90 Merge pull request #1737 from somdoron/radio-dish
REVERT: 5ebfd1728f make udp support for radio-dish
REVERT: a2b9d826e4 Merge pull request #1735 from hintjens/master
REVERT: 2ae4c55bf5 Problem: radio/dish class broke Windows builds
REVERT: 1bcb0a737e Merge pull request #1734 from somdoron/radio-dish
REVERT: 1960b4e8a9 Filtering messages on dish side
REVERT: c7d52ec260 radio-dish join/leave are ZMTP commands
REVERT: 5054f2eb61 radio-dish is sending the group as first frame
REVERT: 68675e23d9 adds group to zmq_msg
REVERT: b2718149e0 msg external storage is using content_t
REVERT: e424388608 Merge pull request #1730 from somdoron/master
REVERT: 15ad6f8051 save some bytes in msg class
REVERT: dc945998a4 missing virtual modifier or session_base
REVERT: 16f1be9de3 Merge pull request #1729 from c-rack/update-copyright-year
REVERT: a539b0c6e8 Problem: copyright year is still 2015
REVERT: a7b7f3e6c2 Merge pull request #1727 from somdoron/master
REVERT: b8425a25cf radio-dish pattern
REVERT: 511d701de3 Merge pull request #1725 from GreatFruitOmsk/master
REVERT: 77f5344ff7 Fix VMCI compilation errors on Windows.
REVERT: 1c7d59a58a Merge pull request #1724 from minrk/multi-monitor
REVERT: f0dce000b2 stop previous monitor socket before starting new one
REVERT: f25a9c83f5 Merge pull request #1723 from GreatFruitOmsk/master
REVERT: 6c9974770b Family is not set when resolving NIC on android.
REVERT: cfbeac6ad1 Merge pull request #1722 from GreatFruitOmsk/master
REVERT: e7850410f8 Fix trailing spaces.
REVERT: e5894d5197 Fix missing headers which makes compilation fail on Android.
REVERT: 55e8191ac5 Merge pull request #1721 from c-rack/fix-issue-1720
REVERT: 5c9bd5f0cb Problem: SIZE_MAX is not defined in all stdint.h includes
REVERT: b7d42a4c4b Problem: SIZE_MAX is not defined
REVERT: 924bce6478 Problem: build fails due to undefined INT_MAX
REVERT: a40dd50da1 Merge pull request #1719 from minrk/rc-int-max
REVERT: 5fe75f0e43 truncate rc to INT_MAX
REVERT: 90f9f5ff91 Merge pull request #1718 from gcsideal/master
REVERT: be387d5e56 Last bits of Hurd support
REVERT: c42bf873bb Merge pull request #1717 from c-rack/fix-typo
REVERT: e6edc4729e Problem: typo
REVERT: cc29578088 Merge pull request #1716 from somdoron/master
REVERT: 669c5697c2 fixing a bug: client over inproc receives msg with routing id set
REVERT: e0fc5841cd Merge pull request #1715 from hintjens/master
REVERT: 88949694db Problem: configure --without-documentation is clumsy
REVERT: 9ebb5cc911 Merge pull request #1714 from somdoron/master
REVERT: 4bfe2ec686 fix bug in condition variable using invalid timeout
REVERT: d906e815bc Merge pull request #1713 from minrk/stdint
REVERT: 6ee78707c6 restore check for MSC 1600 before including stdint.h
REVERT: 1a502cc190 Merge pull request #1709 from gcsideal/master
REVERT: be5ab6d5c9 GNU/Hurd support
REVERT: 6d491a4289 Merge pull request #1707 from minrk/tweetnacl
REVERT: cf57a88d49 include tweetnacl in dists
REVERT: 93bb756298 Merge pull request #1706 from zoobab/master
REVERT: e19454e388 Problem: OpenWRT Makefile still uses tarballs, now using GIT HEAD master
REVERT: d8941f599a Merge pull request #1705 from hintjens/master
REVERT: 055995e535 Problem: builds directory contains packaging scripts
REVERT: d8d9ee3243 Problem: no support for OpenWRT
REVERT: b9167df916 Merge pull request #1702 from GreatFruitOmsk/greatfruit-master
REVERT: bfbb655491 Add support for the RelWithDebInfo CMake configuration.
REVERT: 47d9caa49a Merge pull request #1701 from madebr/cmake_test_include_source_dir
REVERT: be36423bc2 Problem: On Windows CI, the included file Windows.hpp could not be found. Solution: Include the source directory
REVERT: 8f4574f8d0 Merge pull request #1700 from madebr/stable_sodium
REVERT: e7afed0655 Problem: Windows CI fails due to libsodium build failure Solution: Use stable branch of libsodium
REVERT: b9d831695f Merge pull request #1699 from somdoron/master
REVERT: 6bbca7cf4a fix case when zmq_poller access a dead socket
REVERT: 714988e6c5 Merge pull request #1694 from hintjens/master
REVERT: c49eef46ec Problem: Android build is too slow
REVERT: f64c38583f Merge pull request #1692 from FredTreg/master
REVERT: 9bdb60577c Test for issue #1690 (ZMQ_REQ_RELAXED)
REVERT: c30676fe52 Merge pull request #1691 from FredTreg/master
REVERT: 89417ddb9f Fixed issue #1690 (ZMQ_REQ_RELAXED)
REVERT: 06402f4f28 Merge pull request #1687 from hintjens/master
REVERT: 2566c02a9e Problem: CLIENT and SERVER don't check SNDMORE
REVERT: ae3b2734df Merge pull request #1684 from hintjens/master
REVERT: 6bb0cc1fd5 Problem: still one error in vcxproj files
REVERT: 6164e3d913 Merge pull request #1683 from hintjens/master
REVERT: 137afd5610 Problem: includes timer.cpp/hpp instead of timers.cpp/hpp
REVERT: 1c874876ff Merge pull request #1682 from hintjens/master
REVERT: 065fbcdc8f Problem: performance tests don't link on Windows/MSVC
REVERT: 114f2b464f Merge pull request #1681 from hintjens/master
REVERT: bf14b1f906 Merge pull request #1680 from hintjens/master
REVERT: 6665bffe11 Problem: MSVC projects don't include timers.cpp/hpp
REVERT: 7893a6ac26 Problem: zmq poller API is not CLASS conformant
REVERT: f8b9ca5f42 Problem: zmq timers API is not CLASS conformant
REVERT: 627809568b Problem: on Windows, link fails on missing Iphlpapi.lib
REVERT: 78c3ba0dc5 Merge pull request #1677 from c-rack/faster-git-clone
REVERT: d32cb1ae6f Merge pull request #1679 from hintjens/master
REVERT: 97092d994d Problem: Windows build gives warning on v2_decoder.cpp:130
REVERT: 33c5985eb2 Problem: build scripts don't need full git history
REVERT: 4705feb2f4 Merge pull request #1676 from GreatFruitOmsk/master
REVERT: 0475c6dfd8 CMAKE_VS_PLATFORM_TOOLSET may not be set.
REVERT: c19470ece1 Merge pull request #1675 from somdoron/Timers
REVERT: aadaf99011 add timers API to libzmq
REVERT: 9ce8fe8f66 Merge pull request #1674 from GreatFruitOmsk/master
REVERT: b76ccb8b1a Add missing header for the if_nametoindex on Windows.
REVERT: 066ff133f0 Merge pull request #1672 from GreatFruitOmsk/master
REVERT: 923645060a Fix redirecting location of pdb via CMAKE_PDB_OUTPUT_DIRECTORY.
REVERT: b67cdcfd0b Merge pull request #1670 from hintjens/master
REVERT: 987eb6ddc3 Merge pull request #1671 from brian-peloton/master
REVERT: 700b91d102 Fix alignment of initial chunk in yqueue
REVERT: f3bcb73f02 Fixed old path to qt-android
REVERT: 31c35498af Revert "fixes #1565: Allow session to flush commands on an engine error"
REVERT: 768fc7699e Merge pull request #1668 from zoobab/master
REVERT: 8f1810d1e2 Add a Dockerfile to build libzmq for android
REVERT: 819a879ff2 Merge pull request #1669 from bluca/travis_android
REVERT: bd222d9206 Problem: travis CI tries to build "qt-android"
REVERT: a9bad3bc13 Merge pull request #1665 from hintjens/master
REVERT: 9b45ba7067 Problem: builds/qt-android name is inaccurate
REVERT: f00eb5aae6 Merge pull request #1664 from Kentzo/vmci
REVERT: 3caa637e1b Add special interface to represent local VMCI context.
REVERT: 301989614f Merge pull request #1663 from hurtonm/master
REVERT: 3ae5c55e46 Fix mailmap entry for Max Skaller
REVERT: 86efa67d97 Add mailmap entry for Chuck Remes
REVERT: 7eeb7d5e74 Merge pull request #1662 from hurtonm/master
REVERT: d8af708ad9 Add mailmap file
REVERT: c18904cbd2 Merge pull request #1659 from syenna/master
REVERT: 7cfa93352e Add missing support for IPv6 link local addresses (which include % followed by the interface name)
REVERT: 6eeef5eb7c Merge pull request #1658 from hintjens/master
REVERT: 3cc7cfc015 Merge pull request #1657 from Kentzo/vmci
REVERT: 6ae70a9428 Remove unnecessray comment and unnecessary include.
REVERT: 141de87085 Fix a typo in reference to with_norm_ext.
REVERT: 4dcfb23e2e Problem: zmq_vmci man page claims to be zmq_ipc man page
REVERT: 765fd20937 Merge pull request #1656 from bluca/vmci_include
REVERT: 64ce6ca772 Problem: build fails, vmci enabled by default
REVERT: a556b500da Problem: build failure, vmci include out of IFDEF
REVERT: fc7e3bc3a4 Merge pull request #1654 from Kentzo/vmci
REVERT: 68b13fbddb Add the VMCI transport.
REVERT: 61f74e2dfc Merge pull request #1652 from chrisstaite/master
REVERT: ba3cf3c006 Only start the heartbeat timer when the underlying mechanism is ready to stop cipher streams from trying to encrypt a heartbeat before the handshake has completed. Addresses issue #1601.
REVERT: f6018e81d8 Merge pull request #1651 from wcs1only/master
REVERT: 54799c8c6f fixes #1565: Allow session to flush commands on an engine error
REVERT: e56b486735 Merge pull request #1650 from c-rack/show-log-on-build-error
REVERT: dfaa92cd1e Problem: test-suite.log is not accessible on failing CI build
REVERT: 782fbe5bef Merge pull request #1649 from sheremetyev/fix-pipe-activation-race
REVERT: bad93c536a Set LWM to half of HWL.
REVERT: 234018d749 Add test demostrating that HWM applies to messages that have been already consumed.
REVERT: 6e064f9f75 Merge pull request #1648 from c-rack/remove-out-batch-size
REVERT: f9b8a94c90 Problem: out_batch_size has been replaced by ZMQ_TCP_SEND_BUFFER option in cdeec4c1
REVERT: b407b54b44 Merge pull request #1647 from banburybill/master
REVERT: e71471b2e8 Add new option ZMQ_MULTICAST_MAXTPDU to set PGM_MTU.
REVERT: 5d04dc354e Merge pull request #1645 from somdoron/master
REVERT: 804bce8294 Fix pipe terimation in router while reading message
REVERT: 4f7dc49642 Merge pull request #1643 from somdoron/master
REVERT: 210572201d Fix a bug when stream_engine try to set alreadt set metadata
REVERT: afc7c5c745 Merge pull request #1641 from c-rack/fix-recv-send-buffer
REVERT: fc1099ffd1 Problem: documentation shows wrong default value
REVERT: ec41f6540f Problem: tcp_recv/send_buffer should be byte value instead of scale factor
REVERT: 5ba328d7f3 Problem: there is no test for setsockopt ZMQ_TCP_SEND/RECV_BUFFER
REVERT: f80faeca29 Merge pull request #1640 from c-rack/fix-setsockopt
REVERT: a992d9aca0 Problem: comparison between signed and unsigned integer expressions
REVERT: 98d5d4d7f0 Problem: call of overloaded ‘pow()’ is ambiguous
REVERT: 86714959da Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 18c517020b Merge pull request #1638 from jens-auer/tcp_buffer_options
REVERT: 908d6b6740 Update options.cpp
REVERT: d2516a9c42 Merge branch 'tcp_buffer_options' of github.com:jens-auer/libzmq into tcp_buffer_options
REVERT: cdeec4c115 New options to set send/recv buffer size for TCP sockets.
REVERT: c41fe88df6 Merge pull request #1636 from roalz/feature-add-msvc2015-build
REVERT: 5f5fb5e5ad Added solution and project files to build with Microsoft Visual Studio 2015
REVERT: 4444361503 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: c775c509da Merge pull request #1631 from swansontec/master
REVERT: b2010432c7 Do not crash on unusual connection-failure cases
REVERT: 9a8c822aa2 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 22179afaba Merge pull request #1629 from hintjens/master
REVERT: 54e2e2a7ad Problem: Windows 7 TCP slow start
REVERT: ac46e6da96 Merge pull request #1628 from hintjens/master
REVERT: ba1515fe07 Problem: asserts if EINVAL recieved on read/write
REVERT: f38c11c063 Whitespace fixes
REVERT: ab2c009d0d Merge pull request #1626 from ahmetkakici/master
REVERT: 7c8e65e2cd Added missing socket_poller.cpp file to msvc solutions. also fixes issue https://github.com/zeromq/libzmq/issues/1624
REVERT: 182688d431 Merge pull request #1625 from lytboris/master
REVERT: a4baa36ba4 acutally allow specifying interfaces as source address
REVERT: 9b1432256d Merge pull request #1623 from zeromq/sappo-patch-1
REVERT: 64ffb3fc92 Problem: libzmq appveyor build status is not visible
REVERT: dc04c5bbd6 Merge pull request #1621 from madebr/cmake_winci_fixes
REVERT: 0a0b9fd760 tweetNaCL: fix winrandom
REVERT: 571ee21eef appveyor: build all relevant combinations
REVERT: 89338f43d5 CMake: fix library name on linux
REVERT: c5572211e7 Merge pull request #1620 from madebr/ctest_missing_tests
REVERT: 9930f1fc20 CTest: add missing tests + check for unknown tests
REVERT: 2f63231860 cmake: libzmq can now be built with both sodium and TweetNaCL
REVERT: 7fe032180a Merge pull request #1619 from madebr/winrandombytes
REVERT: b2c87b9a70 TweetNaCL: add windows randombytes implementation
REVERT: e182438ad6 Merge pull request #1618 from madebr/cmake_sodium
REVERT: 35d723ce5b Add Windows Continuous Integration (appveyor)
REVERT: 55ca9c5654 CMake: use libsodium if available, else use tweet_nacl
REVERT: 5d98e602c9 Merge pull request #1617 from somdoron/removing_pollfd
REVERT: da2bc60abe Removing zmq_pollfd as it is replaced by zmq_poller
REVERT: 0650b59b10 Merge pull request #1616 from somdoron/ZMQ_POLLER
REVERT: 24fc0d4e89 drop the socket postfix from poller methods
REVERT: 5c71fe6538 Fix socket_poller windows compiling issue
REVERT: 024819b491 add ZMQ_HAVE_POLLER define to check if ZMQ_POLLER exist
REVERT: 476ba22e0a ZMQ_Poller support more event types
REVERT: 544d1e3499 Change the error of zmq_poller from EAGAIN to ETIMEDOUT
REVERT: c22f9f3633 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: a7ea57fb68 Merge pull request #1615 from jeroenooms/master
REVERT: 9114d39577 enable static libraries on mingw
REVERT: 979e6bb45c Merge pull request #1613 from maxkozlovsky/master
REVERT: 06e882f8ea honor buffer reference count in zmq::shared_message_memory_allocator::deallocate
REVERT: f1e6cb8ba9 Merge pull request #1611 from somdoron/zpoller-port
REVERT: e387ce1571 remove pollfd from sockets when destroying poller
REVERT: 6501b8089f port zpoller to libzmq as zmq_poller
REVERT: 500269955d Merge pull request #1604 from wcs1only/master
REVERT: 516b440e0d fixes #1315 socket monitor hangs if zmq_bind fails
REVERT: a28398a4e8 Merge pull request #1603 from jizhilong/fix/typo
REVERT: 9a7858245c fix a typo in ypipe.hpp
REVERT: ea26e68b9d New options to set send/recv buffer size for TCP sockets.
REVERT: ca52520944 Merge pull request #1602 from scemama/master
REVERT: aefc5d120b Default behavior is --with-libsodium=yes
REVERT: 73a0eed75d Fixes issue #1556
REVERT: 96014ee7ed Merge pull request #1600 from lsniks/master
REVERT: 8ec747e14a Issue 1588 : Rollback in case send fails for multipart msg
REVERT: cca67fdd1b Merge pull request #1595 from pijyoi/signaler_failable
REVERT: 596d6e5b1c create signaler::recv_failable()
REVERT: 52ee724144 Merge pull request #1593 from meox/master
REVERT: 992ac3baa8 fix error with gcc 5.2
REVERT: 79daac119a Merge pull request #1592 from c-rack/fix-test
REVERT: e4c06bef18 Problem: check_hwm() has different semantic of 'full'
REVERT: a8605f576e Merge pull request #1591 from c-rack/check-hwm
REVERT: f1358c1243 Problem: duplicate code for hwm check
REVERT: dd6bb9ae0c Merge pull request #1586 from ricnewton/master
REVERT: 05d0451e29 Update cmake to support Visual Studio 2015
REVERT: d89753cbf0 Merge pull request #1585 from msb-at-yahoo/fix-send-doc-typo
REVERT: b12b8ca23b Fix typo on send documentation re: nullification
REVERT: ed1009b3a5 Merge pull request #1584 from ymax/master
REVERT: e9e03f5ade fixed zmq assertion in signaler.cpp under ubuntu
REVERT: 2452c598b7 Merge pull request #1582 from pengweichu/master
REVERT: 5dc8b51ceb Fixed the bug which cause the application crashed when use TCP connect to an invalid address(such as 192.168.1.255).
REVERT: 0f51190c27 Merge pull request #1580 from ricnewton/master
REVERT: 3f4f3c1137 Fix windows cmake build
REVERT: ee7f2a278a Merge pull request #1579 from staticfloat/patch-2
REVERT: 1fbc67a40a Fix pointer indirection precedence issue in docs
REVERT: 2c94bb42c5 Merge pull request #1578 from hintjens/master
REVERT: 3f9255019b Problem: description of ZMQ_CLIENT/SERVER has inaccuracies
REVERT: 50859e40b9 Problem: drop tests on CLIENT/SERVER are misleading
REVERT: fb57110b94 Merge pull request #1577 from hintjens/master
REVERT: f3ee8c69db Problem: request-reply pattern is lousy
REVERT: e7da0ea07b Problem: client/server pattern is not documented
REVERT: 4db73fc18b Problem: msg.cpp:set_routing_id accepts a zero routing ID
REVERT: 6b00f40f74 Problem: test_client/server_drop_more are invalid
REVERT: c2dffb9908 Problem: threadsafe test uses CLIENT-to-CLIENT
REVERT: d416ffcec5 Problem: cannot build single test case in tests
REVERT: 5e936fe955 Problem: routing ID cycles back to zero
REVERT: 60fdfd9a1b Problem: whitespace at end of lines, removed
REVERT: c5b1de368a Problem: code lets CLIENT connect to CLIENT
REVERT: 87f2dff38c Problem: zmq_msg_get_routing_id () is not consistent with API
REVERT: 7be6ad0504 Replaced tabs in some files, with spaces
REVERT: d0ffb91323 Merge pull request #1574 from pijyoi/master
REVERT: 25a50ca0d5 avoid dereferencing uint32_t on unaligned address
REVERT: 734a73c63d Merge pull request #1571 from c-rack/fix-typos
REVERT: bd923f0fbb Problem: some comments contain typos
REVERT: 3e43258769 Merge pull request #1570 from djelenc/deque_bug
REVERT: 64ffda90d2 Problem: Tests in Travis are failing randomly
REVERT: 39a0d33912 Merge pull request #1569 from djelenc/xpub_manual_lost_subscriptions
REVERT: 8fd71d631d Fixed missing subscriptions on XPUB with manual subscriptions
REVERT: 47e1216e1e Merge pull request #1567 from djelenc/xpub_manual_proxy_disconnect_unsubscribe
REVERT: dd35e1db0f Problem: lingering subscriptions on XPUB sockets (#1566)
REVERT: 9e8e81cf9a Merge pull request #1564 from c-rack/issue-1558-2
REVERT: 5dad00ebdc Problem: do not call poller->add_fd() with -1. Fixes #1558
REVERT: 23c55612e4 Merge pull request #1563 from zeromq/revert-1561-issue-1558
REVERT: 2159618b56 Revert "Solution: check return code of make_fdpair() with zmq_assert"
REVERT: 13db11c6ae Merge pull request #1562 from markuspf/fix-dragonfly-compile-2
REVERT: ee984b1fe6 Make DragonFly a first class citizen in terms of compilation
REVERT: 32d7da1103 Merge pull request #1561 from c-rack/issue-1558
REVERT: bb9788867f Problem: return code of make_fdpair() is not checked. Fixes #1558
REVERT: 801f39dbef Merge pull request #1557 from hintjens/master
REVERT: 1fdf8f78e4 Cleaned up test case
REVERT: 146be48495 Merge pull request #1553 from flub/master
REVERT: f86264db3e Update zmq_inproc manpage for bind/connect order
REVERT: 0e1448a26f Merge pull request #1550 from xaqq/master
REVERT: bc513b6381 Merge pull request #1547 from jemc/master
REVERT: 33419425eb Problem: Private/internal macros defined in public header. Solution: Move the macros to a private header.
REVERT: 735c02ed5e Merge pull request #1546 from reza-ebrahimi/master
REVERT: 63260d8701 rename ZMQ_UNUSED macro to LIBZMQ_UNUSED
REVERT: b07b1e270e Merge pull request #1545 from ricnewton/master
REVERT: 096007c574 Fix zmq crash when calling shutdown with a pending inproc socket connect
REVERT: 4e5843b8ff Merge pull request #1543 from csiro-workspace/master
REVERT: 7e09306cb3 -Set signaler_port to 0 which allows the OS to find a free port, rather than crashing if 5905 is in use (https://github.com/zeromq/libzmq/issues/1542) -Added config.hpp to the source list so it shows up in generated projects -Remove CMAKE_BUILD_TYPE setting for generators that don't use it
REVERT: ec98916e82 Merge pull request #1541 from jemc/master
REVERT: 61217a2686 Problem: Source files contain mixed tabs and spaces. Solution: Convert to spaces and remove trailing whitespace in these files.
REVERT: 6aa5c20b3d Merge pull request #1540 from djelenc/fix_failing_tests
REVERT: 1240d7ac83 Fixes failing tests regarding XPUB sockets.
REVERT: 391bc12d17 Merge pull request #1539 from djelenc/issue1116
REVERT: b9634e11a3 Addresses zeromq/libzmq#1116.
REVERT: 370b8c9bb1 Problem: Identity frame from router has no metadata
REVERT: 3f326b10d6 Merge pull request #1536 from bluca/ci-osx-missing-dependency
REVERT: 709a1e9a2d Merge pull request #1535 from somdoron/master
REVERT: 0c4032b5af CI run on OSX needs binutils
REVERT: 4da5ff6a7d revert to original zmq_polland creating zmq_pollfd_poll for polling on pollfd
REVERT: a96f16e3fa Merge pull request #1534 from somdoron/master
REVERT: d83b045347 rename poller to pollfd
REVERT: 7d42aac0c5 Merge pull request #1533 from c-rack/fix-tests
REVERT: 34fe5eaf26 Solution: explicitly set u.base.metadata to null
REVERT: 5bae6911af remove poller field, using fd instead
REVERT: 87e7ed054b Merge pull request #1531 from reza-ebrahimi/master
REVERT: 7058c54672 apply a change to LIBZMQ_DELETE macro (related to issue #1524)
REVERT: 6d9eb184b5 Merge pull request #1530 from reza-ebrahimi/master
REVERT: 1621c25ef0 define a macro for heap object deletion in a unified manner (related to issue #1524)
REVERT: 9bf88bcc03 Merge pull request #1529 from bluca/container
REVERT: 1ab4667412 Set -x in ci_build.sh to show commands in log
REVERT: f6b0eaddb5 Set sudo: false to force container build
REVERT: 1afc30a6c4 CI build/install in local directory
REVERT: 9ebd54a9e5 Merge pull request #1528 from bluca/fix-travis-check
REVERT: f4e9e6f062 CI build does not fail when tests fail. Fix #1527
REVERT: eb1d72f81d Merge pull request #1526 from somdoron/master
REVERT: 9d829f72f4 moving new poller field to the end of the struct
REVERT: e74e36def1 Merge pull request #1525 from somdoron/master
REVERT: 6eddbd98bc polling on thread safe sockets
REVERT: 1653d3c093 add new tests to gitignore
REVERT: 1aaa893e02 add tests for polling on thread safe sockets
REVERT: a63818904d add methods to handle poller
REVERT: 34968771ca add an option to check if the socket is thread safe
REVERT: de018e8766 Merge pull request #1522 from reza-ebrahimi/master
REVERT: a50834cbec fixed issue with ticket #1517 (wrong lib output name in MSVC CMake build) and apply some improvements in CMake build system
REVERT: eb2eec646f Merge pull request #1521 from reza-ebrahimi/master
REVERT: 8e6ef4616e changing some camelCase variable names to snake_case in previous commit
REVERT: 003ae1bfc6 Merge pull request #1520 from reza-ebrahimi/master
REVERT: d7b74d1f57 remove unnecessary multiple WSAGetLastError() calls
REVERT: 6d217aa919 Merge pull request #1519 from reza-ebrahimi/master
REVERT: bff2284a50 place a ZMQ_UNUSED macro and replace all unused variables with ZMQ_UNUSED macro
REVERT: bf27d58b7a Merge pull request #1518 from sappo/master
REVERT: 8bf4d1eaaf Problem: Missing src/ prefix for libzmq library in Makefile.am for test_getsockopt_memset Solution: Add prefix to fix test compilation
REVERT: effc26c695 Merge pull request #1476 from hintjens/master
REVERT: 08c2a9274e Merge pull request #1514 from rikvdh/master
REVERT: de55e3a355 Merge pull request #1515 from rikvdh/test-proxy-return
REVERT: 5485d6e371 Check proxy return values in tests
REVERT: c68e9a39bf Merge fix for zeromq/zeromq4-1#52, getsockopt ZMQ_RCVMORE now resets all bits
REVERT: fd9bd1b2a5 Problem: broke Cmake build
REVERT: 5d5cdac161 Problem: source packages lack makefiles for all systems except msvc
REVERT: 2b45e38b7b Problem: documentation for ZMQ_CTX_BLOCKY is wrong
REVERT: 11fba2b813 Fixed compile errors in test_stream
REVERT: 92c4decb69 Problem: lack test case for large stream messages
REVERT: b791031423 Merge pull request #1512 from pijyoi/retransmit_fix
REVERT: e129640471 fix: ZMQ_TCP_RETRANSMIT_TIMEOUT not applied to bind socket
REVERT: 84a93d4251 Merge pull request #1511 from sorenh/linger_fix
REVERT: abc845d1af Avoid terminating connections prematurely
REVERT: ba6e1337a3 Merge pull request #1510 from pijyoi/retransmit_timeout
REVERT: c7f2cdd699 fix: Windows setsockopt needs char* cast
REVERT: ca9215de1e add ZMQ_TCP_RETRANSMIT_TIMEOUT socket option
REVERT: 064c2e0836 Merge pull request #1508 from pijyoi/connect_timeout
REVERT: c9971e08a0 write man pages
REVERT: eeb697b5ac add connect timeout logic
REVERT: c0ca2be642 add ZMQ_CONNECT_TIMEOUT socket option
REVERT: 4a0bde8130 rename timer_started to reconnect_timer_started
REVERT: 5724b55f7b Merge pull request #1507 from pijyoi/fixdoc
REVERT: 2d9c7f3a1f ZMQ_TCP_KEEPALIVE_IDLE doc wrongly mentions TCP_KEEPCNT
REVERT: d65dab2039 Merge pull request #1504 from bluca/travis-file-limit
REVERT: 85da2ea42f Increase file limit in travis config
REVERT: 23655c5c56 Merge pull request #1503 from bluca/travis-ci-osx
REVERT: 270a1ac577 Add OSX build to travis config. Fixes #1502
REVERT: 20ba661019 Do not use ldconfig in CI if running on OSX
REVERT: 40e2befbbe Update NDK version to r10e, OSX support
REVERT: 102d1b14d0 Check for [g]readelf availability in qt-android helper
REVERT: 57ef59352b Merge pull request #1501 from jemc/fix/issue-1500
REVERT: 438b5207f6 Remove type-pun in zmq.cpp to resolve issue #1500.
REVERT: 7604e1f7d5 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 67640557de Merge pull request #1499 from jemc/docfix/setsockopt
REVERT: 6d0cea54aa Fix alphabetical order of non-deprecated setsockopt docs.
REVERT: 94c579a6c0 Fix title of docs for `ZMQ_XPUB_WELCOME_MSG` socket option.
REVERT: 7b5bf4aefe Merge pull request #1498 from pijyoi/master
REVERT: d9f32611ad ZMQ_TCP_KEEPALIVE_IDLE doc wrongly says it overrides TCP_KEEPCNT
REVERT: 2d8b1a78b3 Merge pull request #1497 from bluca/fix-autogen-libtool-detection
REVERT: 89fa904b2d Check for libtoolize instead of libtool on Linux
REVERT: a656b399cc Merge pull request #1496 from brian-peloton/macro-to-disable-test-timeout
REVERT: 94b6fca406 Merge pull request #1495 from brian-peloton/fix-test-flakiness
REVERT: 5dee46052d Merge pull request #1494 from brian-peloton/fix-partial-recv-in-test
REVERT: 4152023854 Merge pull request #1493 from brian-peloton/fix-other-test-flakiness
REVERT: 6dfe8f20e2 Merge pull request #1492 from brian-peloton/fix-memory-leak
REVERT: 80adc135c7 Merge pull request #1491 from brian-peloton/fix-eventfd-under-load
REVERT: c4c5135db6 Retry recv if it only returns part of a message during tests.
REVERT: 62a0e45089 Fix eventfd read handling under heavy load.
REVERT: e449d7bfbd Fix test flakiness.
REVERT: 97969808f6 Fix a documented memory leak.
REVERT: f86bded783 Increase sleep in test to fix flakiness under CPU load.
REVERT: cb0491ca18 Add a way to disable libzmq's internal test timeout.
REVERT: 7b2e37dc90 Merge pull request #1490 from evoskuil/master
REVERT: 81aa6f45a4 Style and explicitness.
REVERT: 6f0efc092c Make lossy cast explicit.
REVERT: 342c417f9d Add decoder_allocators to VS builds.
REVERT: 0917eceb6d Merge pull request #1489 from pijyoi/fix_1488
REVERT: 2182bc963d check for potential unsigned integer wraparound before adding
REVERT: 7701a8f936 Merge pull request #1487 from pijyoi/stream_notify
REVERT: fd51b0e508 update test that relied on connect notifications to be disabled
REVERT: 3e7d737360 change ZMQ_STREAM_NOTIFY to default to 1
REVERT: 518b939f31 make ZMQ_STREAM_NOTIFY also control disconnect notificatons
REVERT: 588e0d2d86 Merge pull request #1486 from jimenezrick/fix-1478
REVERT: ec5592db1f Fix 1478: receive unsubscriptions in XPUB when verbose
REVERT: 305c07583d Merge pull request #1485 from ricnewton/master
REVERT: 91877a22d7 Fix windows build
REVERT: a4509d8f88 Merge pull request #1484 from pijyoi/fixsmash
REVERT: 93218a60ae Merge pull request #1483 from ktf/master
REVERT: e2be0d25bd Fix compilation on mac.
REVERT: 5fead473a4 Merge pull request #1482 from brian-peloton/master
REVERT: 773a06fc23 Fix memory leak when creating a socket fails.
REVERT: 708353a1b9 advance refcnt only if it was used
REVERT: c05a475bf7 Merge pull request #1481 from brian-peloton/master
REVERT: 18791f2bfb Fix several missing msg_t::close calls.
REVERT: 3f70aca749 Merge pull request #1480 from brian-peloton/master
REVERT: a88524d388 Fix test_proxy hanging occasionally by setting ZMQ_LINGER to 0.
REVERT: b71f720cdc Merge pull request #1479 from jens-auer/issue1477
REVERT: 6b9b13be6c Fixed whitespace error.
REVERT: 23797120ff Fixed #1477  corruption in "zero-copy" raw_decoder for payloads larger than 8192 bytes #1477
REVERT: 15e35c52e7 Merge pull request #1475 from jimenezrick/fix-doc-setsockopt
REVERT: 7030bc429a Fix doc formatting issues in zmq_setsockopt page
REVERT: 6653775a31 Merge pull request #1474 from leonarf/patch-1
REVERT: 4a5998382c THREAD PRIORITY option documentation
REVERT: 311f4d00e4 Merge pull request #1472 from reunanen/allow-explicitly-setting-buf-sizes-to-0
REVERT: 7362f3af0f update documentation regarding the rcvbuf parameter
REVERT: 8096990e45 update documentation regarding the sndbuf and rcvbuf parameters
REVERT: f7b933f570 LIBZMQ-195 allow explicitly setting sndbuf and rcvbuf to 0 (see https://support.microsoft.com/en-us/kb/201213)
REVERT: 72a94881de Merge pull request #1471 from reunanen/retry-on-WSAENOBUFS
REVERT: adafdb8f4f Merge pull request #1470 from reunanen/check-msg-type-in-rm_refs
REVERT: ccb13e1732 add sanity check in msg_t::rm_refs in order to avoid invalid memory access with u.zclmsg.refcnt
REVERT: 8339271a3e LIBZMQ-195 on Windows, handle WSAENOBUFS like WSAEWOULDBLOCK
REVERT: db898deb09 Merge pull request #1469 from tkoeppe/master
REVERT: 29b45489fa [decoder.hpp] Fix misspelled inclusion
REVERT: d60040ddea Merge pull request #1468 from tkoeppe/master
REVERT: 5b4b8a063b [decoder*] Style fixes for consistency
REVERT: e83bad14cd Merge pull request #1467 from jens-auer/upstream
REVERT: ef365151ca - Replaced C-style casts with C++-casts - Replaced stdlib.h with cstdlib - Made single-argument constructors explicit
REVERT: f541ac9612 Merge pull request #1466 from jens-auer/upstream
REVERT: 3679793601 "zero-copy" raw_decoder
REVERT: d83220e92e Merge pull request #1465 from tkoeppe/master
REVERT: 14d69a312d Clean-up: Rename internal macros consistently.
REVERT: 6059e8eea7 Merge pull request #1461 from tkoeppe/master
REVERT: ddb82a546b atomic_counter.hpp: clean up the clean-up
REVERT: 26e3873f70 Add C++11 support to atomic_counter_t.
REVERT: 010f93b34c Merge pull request #1460 from tkoeppe/master
REVERT: 73e6a3808f atomic_ptr.h: clean up the clean-up
REVERT: 80b1e67e45 Merge pull request #1459 from tkoeppe/master
REVERT: 08f9bf589e Add missing relaxed memory ordering.
REVERT: f448dcde35 Merge pull request #1458 from tkoeppe/master
REVERT: 68f5926ec6 Add support for <atomic> in C++11
REVERT: f3ef027e87 Merge pull request #1457 from calid/ignore-unbind-tests
REVERT: ee787664bb ignore unbind tests
REVERT: 818491e7ee Merge pull request #1455 from calid/update-gitignore
REVERT: 9802dd5933 Merge pull request #1456 from calid/issue-949-tests
REVERT: 0f208c122d be pedantic and call zmq_close in tests
REVERT: d14f419743 another errant comment
REVERT: 6dac5092ad fix errant comments
REVERT: a9fd750e1c add tests for #949
REVERT: 34129593f0 update gitignore with additional tests
REVERT: 6ab66ca51a Merge pull request #1451 from jbreams/heartbeat-defaults
REVERT: e9a5bc8d1e Fix units and default values for heartbeats options
REVERT: 2e5435e38f Merge pull request #1449 from jbreams/heartbeats-docswindows
REVERT: 85417ba2fc Add documentation for ZMTP heartbeat socket options
REVERT: df0c7076bd Fix test_heartbeats compile in VS2013
REVERT: 3a27be3b6c Merge pull request #1448 from jbreams/heartbeats
REVERT: cbb3b176a6 Add ZMTP heartbeats
REVERT: 4b4e00bde0 Merge pull request #1446 from dnaeon/typo-fix
REVERT: fa3b5d8b03 Typo fix
REVERT: f9d0dab630 Merge pull request #1445 from c-rack/fix-resolve-ipv6
REVERT: 15f9ee19cb Solution: allow brackets in tcp ipv6 address
REVERT: d33fb6a2af Merge pull request #1441 from jens-auer/rebase3
REVERT: e70b5efa0b Reuse buffer when no messages depend on it.
REVERT: 51cb57e2c9 Fixed wrong handling of shared messages
REVERT: dfe1908008 Fixed wrong buffer end detection in v2_decoder.
REVERT: b3f2acf7d6 Merge pull request #1440 from xaqq/fix_solaris_build
REVERT: 8ffd723271 Probably fix build issue on Solaris.
REVERT: 6d4d7a5820 Merge pull request #1439 from hintjens/master
REVERT: 6f1d1142d1 Problem: 4.1 broke the ABI yet did not bump ABI number
REVERT: 8fb5590ba8 Merge pull request #1437 from ricnewton/master
REVERT: f696d0399c Fix tabbing
REVERT: 8484e1606d Fix windows build
REVERT: 52191af60e Merge pull request #1435 from minrk/test-ffn
REVERT: fdb7d68056 test zmq_msg custom free-function
REVERT: 426733469d Merge pull request #1433 from minrk/single-socket-proxy
REVERT: f34cc24bd7 test proxy with single REP socket
REVERT: 158d77d63e don't check POLLOUT for single-socket proxies
REVERT: d3bb450892 Merge pull request #1432 from xaqq/fix_init_order
REVERT: c35971a603 Fix initialization order.
REVERT: 5cbd197d10 Merge pull request #1430 from junovitch/fix-man-install-without-doc-build
REVERT: 45610c354d Enable install of man pages when BUILD_DOC is not set by shifting INSTALL_MAN outside of BUILD_DOC's if/endif
REVERT: f4da5442ba Merge pull request #1427 from xaqq/doc-patch
REVERT: 4ad9a5e570 Update documentation for zmq_setsockopt.
REVERT: c0cda2e699 Merge pull request #1426 from ricnewton/master
REVERT: dc949624e1 Handle infinite hwms properly
REVERT: 15eecf4cf4 Update high water marking to allow changing high water mark after connection established.
REVERT: a3b8f80fe5 Merge pull request #1425 from mipaaa/master
REVERT: b0296bc66f Fixed executable name in the usage string
REVERT: bc2f5f76f8 Merge pull request #1424 from ricnewton/master
REVERT: dc105ffc78 Fix xpub test to set hwm before bind.
REVERT: d4b11b0d17 Merge pull request #1423 from ricnewton/master
REVERT: 32770d2e60 Remove accidentally committed appveyor file.
REVERT: 9f8b8af926 Fail ZMQ_SNDHWM and ZMQ_RCVHWM setsockopt if already connected.
REVERT: 64e711eb50 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 383f67a5cc Merge pull request #1422 from hintjens/master
REVERT: e37d715702 Problem: tests/test_socketopt_hwm fails and breaks CI
REVERT: 1540737561 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: bfb0ac1cc4 Merge pull request #1418 from xaqq/setsockopt
REVERT: fb960147ca Introduce a failing test against zmq_setsockpt().
REVERT: 9e80f07a8d Merge pull request #1417 from jens-auer/zero_copy
REVERT: e9b403a7b1 zero-copy message receive
REVERT: 611e96c701 Allocation-free msg::init_data
REVERT: 03d6a7341b Merge pull request #1415 from hintjens/master
REVERT: 3e330d6e2b Fixes to README
REVERT: a07244cda2 Merge pull request #1414 from hintjens/master
REVERT: 8620c3e032 Problem: source file headers are somewhat confusing about LGPLv3
REVERT: 1e10222b8f Merge pull request #1413 from malexzx/master
REVERT: 1eb8e2a69f HPUX build and gmake check issues solution (#1412)
REVERT: 4676e6551f Merge pull request #1411 from jens-auer/address-sanitizer
REVERT: d337cf5a96 Fixed out-of-bounds access when releasing socket handles.
REVERT: a146503d30 Merge pull request #1409 from rikvdh/master
REVERT: aa2e74c2a2 Fix another degradation, CPU maxes out when POLLOUT is set because poll exits on POLLOUT and doesn't wait for POLLIN.
REVERT: d8077bb3da Merge pull request #1406 from rikvdh/master
REVERT: ae630cf3eb Fix degradation from #1382, POLLOUT was tested but not requested
REVERT: 099fd43836 Merge pull request #1405 from c-rack/fix-brackets
REVERT: 8a3296c1aa Solution: add missing brackets
REVERT: f9315e1980 Merge pull request #1403 from dfons/master
REVERT: fcf7b22b92 doc/zmq_socket.txt: Remove note about ZMQ_PAIR being experimental.
REVERT: dfaa55fa7b Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: f03a78bbfc Merge pull request #1401 from taotetek/master
REVERT: 537626258f remove temp printf from stream_engine
REVERT: d35473ecae Merge pull request #1398 from jacmet/pkgconfig-static-linking
REVERT: e89577d30c libzmq: Fix pkg-config files for static linking
REVERT: 4c36c93a31 Merge pull request #1397 from danriegsecker/master
REVERT: f4f918ba73 Some test fail to build targeting less that Windows Vista
REVERT: 59add707cd Merge pull request #1395 from anton-sergeev/master
REVERT: 5f9b258295 Make CMake option for perf-tools
REVERT: 3699242c4e Merge pull request #1394 from BurningEnlightenment/master
REVERT: f0a76318f4 REPLACE MSVC VERSION SUFFIX VARIABLE
REVERT: 959ab527f4 Merge pull request #1391 from CommanderBubble/master
REVERT: 1bfff06b8d Merge pull request #3 from CommanderBubble/FD-SETSIZE-update
REVERT: 166a14c4a5 Update configure.ac
REVERT: bd795d6f7a Update configure.ac
REVERT: 095741cd9c set FD_SETSIZE to 1024 on mingw
REVERT: 235a1dbf7d Merge pull request #2 from zeromq/master
REVERT: 43a1192ca4 Merge pull request #1390 from hintjens/master
REVERT: 74888769d6 Problem: incomplete specs for test_proxy_terminate
REVERT: eead3bc661 Merge pull request #1388 from rikvdh/issue-1382
REVERT: 7b9e9b838d Issue #1382: Do not send data to backend when there are no listeners (+ tests)
REVERT: e1e9fb3629 Merge pull request #1387 from c-rack/1386-libsodium-checkout
REVERT: 7e8ba0ecff Solution: Build libsodium from latest master branch. Fixes 1386.
REVERT: 3ec0e770b5 Merge pull request #1384 from hurtonm/master
REVERT: 2e06737bf4 pub: Don't delay pipe termination
REVERT: 09a65c5598 push: Don't delay pipe termination
REVERT: aabbe3f33a Merge pull request #1383 from somdoron/master
REVERT: c2dcc80602 change minimum version to windows vista and implement dummy condition variable for lower versions
REVERT: dbacc34238 Merge pull request #1379 from evoskuil/master
REVERT: 30bd7c481e Fix integer narrowing issues.
REVERT: cd830dd203 Merge pull request #1378 from CommanderBubble/master
REVERT: a53404f2f9 Merge pull request #1 from CommanderBubble/CommanderBubble-configure.ac-adds_mingw64_support
REVERT: 88ac63189c Merge pull request #1341 from hintjens/master
REVERT: 594e3dcceb Problem: shutdown asserts if WSASTARUP wasn't done previously
REVERT: 0673cd4e69 Problem: test_disconnect_inproc sometimes fails
REVERT: 9a4c4da265 Merge pull request #1375 from natano/configure_bitrig
REVERT: 8957ad5edf Add Bitrig to OS detection in configure.ac.
REVERT: f9fe77f421 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: c9bdcfc584 allow host_os to accept mingw64
REVERT: 04a9d582fd Merge pull request #1374 from kreuzberger/master
REVERT: d4a5803495 Update zmq_setsockopt.txt
REVERT: 18b6e6803b Add documenation for ZMQ_XPUP_NODROP
REVERT: a756eee30b Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 41d85f52d2 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 89bf2af128 Add libsodium directory path hints for cmake
REVERT: 6b4d9bca0c Merge pull request #1370 from calid/unbind-enoent
REVERT: edc0640206 doc: add ENOENT to list of zmq_unbind error codes
REVERT: 2d435eb692 Merge pull request #1369 from calid/ctx-term-vs-destroy
REVERT: 023505aced update zmq_ctx_term description for consistency
REVERT: 4820d493b0 Merge pull request #1368 from calid/docfix-zmq-msg-init
REVERT: 4c92fefe1b doc: zmq_msg_init does not set errno
REVERT: eb34533728 Merge pull request #1367 from evoskuil/master
REVERT: 1e27b364a4 Fix default VC rt lib for release dynamic exe.
REVERT: 6b06bc310f Merge pull request #1366 from xantares/patch-1
REVERT: 032c5eda3d fix CMP0053 warning with cmake 3.1
REVERT: ec4200a9d3 Merge pull request #1365 from xantares/master
REVERT: 0f24f675f5 set soversion without ZMQ_BUILD_FRAMEWORK
REVERT: 80044c9ed6 mutualize win32 flags
REVERT: 7dfa7b7a5d do not mix DLL_EXPORT & ZMQ_STATIC definitions
REVERT: 1d2b34dbe4 install *.txt in share/zmq
REVERT: 866e752b04 do not install sources
REVERT: 1a5ced9f47 Merge pull request #1361 from rodgert/master
REVERT: d47980a6ed Allow zmq_msg_gets checks to assert rather than segfault
REVERT: f053854e51 Merge pull request #1360 from hurtonm/master
REVERT: 5ed6ac60e2 Adjust number of sent messages on hiccups
REVERT: b7e52755e4 Merge pull request #1359 from rodgert/master
REVERT: 700f7bfede resolve #1347 addresses issue of no metadata on identity frame
REVERT: 1e6e5b1c0a Merge pull request #1357 from rodgert/master
REVERT: 4b948b1f3b Code cleanup
REVERT: cf0804bb7c Remove unused include
REVERT: 8daa74dc77 Fix comment from prior commit
REVERT: fefe0d42fa Update gitignore to include recently added tests for server sockets
REVERT: 638ddeb404 resolve #1347 Support limited metadata for STREAM sockets
REVERT: 8a526874ab Merge pull request #1356 from rodgert/master
REVERT: 39338e2fe4 Fix autogen.sh warning about trailing whitespace
REVERT: 2ae7ae698a Merge branch 'master' of github.com:zeromq/libzmq
REVERT: fe2ce47a44 Merge pull request #1355 from evoskuil/master
REVERT: bc53d710ff Fix error return for clock_gettime.
REVERT: 759c3e314c Merge pull request #1354 from evoskuil/master
REVERT: a8f11b3c3d Add clock_gettime implementation for OSX.
REVERT: 6630f19686 Apply VS2013 changes to VS2010 and VS2012.
REVERT: 55886b8b46 Merge pull request #1352 from somdoron/master
REVERT: deaa89656f thread safety bug - lock when sending
REVERT: cac4d7aa10 Merge pull request #1350 from zeromq/revert-1345-bzimmerman_CMAKE
REVERT: a4de3df73e Revert "Bzimmerman cmake"
REVERT: 5d42fe1bf7 Merge pull request #1349 from somdoron/master
REVERT: 5a897f7509 allocate reaper_signal only when needed
REVERT: bbdd8662ba thread safety - supporting windows
REVERT: 6749c9b3eb thread safety
REVERT: 88c6e696ab Merge pull request #1348 from evoskuil/master
REVERT: 6bf1609a10 Update VS DLL and NuGet versioning to 4.2.0.
REVERT: 91eead1d20 Add client.cpp/hpp and server.cpp/hpp to VS projects.
REVERT: 2fd2fca531 Make implicit cast explicit.
REVERT: 6724f41427 Fix forcing to bool.
REVERT: 405a749525 Merge pull request #1345 from QbaseLLC/bzimmerman_CMAKE
REVERT: c743bd95b4 changed test tools to compile statically
REVERT: caf4276710 removed packaged export added version to builds other cleanup
REVERT: fef20b1c83 Merge remote-tracking branch 'remotes/origin/HEAD' into bzimmerman_CMAKE
REVERT: eacbd0c5df Merge branch 'master' of github.com:zeromq/libzmq
REVERT: c9418db684 Merge pull request #1344 from febeling/cond-build-tools
REVERT: 54b56210ad Problem: curve keygen build cannot be switched off
REVERT: 2d59594a3a Problem: perf tools build cannot be switched off
REVERT: 49f58c0021 Merge remote-tracking branch 'remotes/upstream/master'
REVERT: 702008666c Adding Bryan's changes.
REVERT: 2bb72add49 update to use new find_program syntax
REVERT: 552c13616e replace check_library and check_include with find_file and find_library
REVERT: e05c805688 Merge pull request #1342 from chickenkiller/master
REVERT: 9daf6dd7c4 acinclude.m4: make kernel-specific flags cacheable
REVERT: ade54d72e7 Merge remote-tracking branch 'remotes/upstream/master'
REVERT: 8e89d11628 Merge pull request #1339 from evoskuil/master
REVERT: 1a0d134666 Add missing EOL at EOF.
REVERT: ca94cf568b Add appveyor support for building on windows.
REVERT: 05df7072d6 Merge remote-tracking branch 'remotes/upstream/master'
REVERT: 34cd718e0f Merge pull request #1337 from somdoron/JenkinsFix
REVERT: ee962117ef fix jenkins build
REVERT: edb3a13fd4 Merge pull request #1336 from somdoron/ClientSocket
REVERT: 79f162aa7b test the client socket can drop multi frame messages that being sent to it
REVERT: 14a19cd5d4 test the server socket can drop multi frame messages that being sent to it
REVERT: 862cd41c65 implement client socket type and drop messages when more flag is set on client and server
REVERT: a6362a454f Merge pull request #1334 from somdoron/ServerSocket
REVERT: 5632b57b4a adds server socket type and routing id to msg
REVERT: d5e7922d41 Merge remote-tracking branch 'remotes/upstream/master'
REVERT: 9826a7b19d Merge pull request #1333 from hintjens/master
REVERT: a7a512ab3d Problem: test cases are failing on slower PCs (eee PC)
REVERT: e351cbdd8f Merge remote-tracking branch 'remotes/upstream/master'
REVERT: 9fc0d2f1a3 Merge pull request #1331 from jemc/master
REVERT: 2894634829 Problem: qt-android build script out of date Solution: copy changes from latest zproject
REVERT: 153e0487de Merge pull request #1330 from rodgert/master
REVERT: 937d485e74 Add cast to make Clang happy
REVERT: be8cdc2bf6 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: e6c45f5376 Support using compielr intrinsics for atomic operations
REVERT: 8c8d23c761 Merge pull request #1328 from rodgert/master
REVERT: d8c15cf43b Code cleanup - removing unused local
REVERT: 0303131390 Merge pull request #1327 from rodgert/master
REVERT: bccf0bc813 Merge pull request #1326 from rodgert/master
REVERT: 1c72bf4e55 Clean up of metadata_t
REVERT: d9fb1d36ff resolve #1325 Alignment issue with zmq_msg_t on SPARC CPU
REVERT: 96a27d11c9 Merge pull request #1324 from jruffin/invert-matching
REVERT: cf2238f80e Added socket option ZMQ_INVERT_MATCHING.
REVERT: 148cec0a52 Merge pull request #1323 from ricnewton/master
REVERT: 415b49ba0d Fix Windows build
REVERT: 4ad2edff38 Merge pull request #1322 from hintjens/master
REVERT: 6ced7027a0 Problem: commit afb24b53 broke ZMQ_STREAM contract
REVERT: 0d9852a2a5 Merge pull request #1321 from hintjens/master
REVERT: 94d9a4ffdf Problem: copyright statements are out of date
REVERT: fd560b489c Merge pull request #1319 from rodgert/master
REVERT: 73bf0fb1a3 Remoe more test_id2fd cruft
REVERT: 3d440507ea Merge pull request #1317 from topher200/master
REVERT: 708298eaf1 documentation clarification on pipe::write failure
REVERT: be23e699c9 Merge pull request #1314 from topher200/master
REVERT: 866a04656e Close messages that failed to send
REVERT: 03a1b0e296 Merge remote-tracking branch 'upstream/master'
REVERT: 94b0ad3eaa Merge pull request #1312 from rodgert/master
REVERT: 40d2f9ad5d fix typo in zmq_msg_gets documentation
REVERT: 53431a5583 Merge pull request #1310 from rodgert/master
REVERT: 4e89ae616a Fix typo in zmq_msg_gets documentation
REVERT: 0e404ec844 Merge pull request #1309 from rodgert/master
REVERT: cf2bd3b6ae Expand on 'Peer-Address' property documentation
REVERT: 97f3126175 Formatting cleanup
REVERT: b443618333 Code cleanup
REVERT: 7d224d7871 Add 'Peer-Address' property to connection metadata
REVERT: 2e76bbe4f6 Merge pull request #1308 from rodgert/master
REVERT: 39285cb969 Try to clarify the intent of zmq_msg_gets() in documentation
REVERT: 10466626be Merge pull request #1301 from rodgert/master
REVERT: 413f835bc8 Make alignment compiler directive
REVERT: b6b990f5f9 Merge pull request #1300 from moteus/master
REVERT: 57cb34f123 Fix. Use C++03 compatible way to align struct. (Build on MSVC)
REVERT: 3503fdad33 Merge pull request #1299 from rodgert/master
REVERT: 6372fc2e56 Align inter-thread shared structers on cache-line granularity
REVERT: c816e42266 Merge pull request #1298 from rodgert/master
REVERT: 90194036bf Increase size of zmq_msg_t to 64 bytes
REVERT: 95e7611471 Merge pull request #1297 from rodgert/master
REVERT: a55005feb1 Remove documentation for ZMQ_IDENTITY_FD
REVERT: 7c0a644625 Remove of ZMQ_IDENTITY_FD socket option
REVERT: a450bdefec Revert "resolve #1292 ZMQ_IDENTITY_FD does not validate option_len"
REVERT: 1ae98c7422 Merge pull request #1293 from rodgert/master
REVERT: 45c6815446 resolve #1292 ZMQ_IDENTITY_FD does not validate option_len
REVERT: fa1f676ce5 Merge remote-tracking branch 'upstream/master'
REVERT: 4e9e719ff3 Merge pull request #1286 from ricnewton/master
REVERT: b1305bbec3 Remove int typedefs and use stdint.h for windows.
REVERT: 25f153980b Merge pull request #1283 from DaiyuHurst/master
REVERT: c993ac88ae Merge pull request #1284 from hintjens/master
REVERT: 89a2041755 Problem: incomplete definition of integer types
REVERT: 5d084cdfdd Implement a definitive cygwin target for libzmq.
REVERT: 4b4adbbc1d Merge branch 'master' of github.com:zeromq/libzmq
REVERT: d2bacdf591 Merge pull request #1282 from hintjens/master
REVERT: eacd4d9cba Problem: test cases were sporadically failing
REVERT: 04664f0ef7 Problem: 'bool' is not defined by default
REVERT: ae53b27b70 Merge pull request #1281 from hintjens/master
REVERT: 2de940b422 Problem: need atomic reference counting in several projects
REVERT: 07229c72ba Merge pull request #1280 from hintjens/master
REVERT: 17937ffcf0 Problem: very hard to debug security mechanism mismatch
REVERT: f78f4e3f73 Changed library name to zmq.lib.
REVERT: 5b1b3b56d3 Updated Cmake file to remove ascii doc.
REVERT: 187c743841 Merge pull request #1276 from hintjens/master
REVERT: f5f4d27354 Problem: zmq_epgm is duplicate of zmq_pgm
REVERT: ffb7cab4b3 Merge pull request #1275 from pmienk/master
REVERT: 510eabaec8 Alter --with-libsodium default.
REVERT: 4494286e92 Merge pull request #1272 from minrk/security-old-zmtp
REVERT: 5385a51527 craft vanilla socket security test messages
REVERT: 5a8b46e375 allow vanilla socket security tests to run on Windows
REVERT: efed3d010d add session->zap_enabled()
REVERT: 6cf120eaad reject old ZMTP connections if auth enabled
REVERT: c35c0ca1bb test unauthenticated messages from vanilla sockets
REVERT: c57d557460 Merge pull request #1269 from somdoron/manual_and_welcome
REVERT: dd809de6ff add to authors
REVERT: cdf4a1211d documentation for welcome msg and xpub manual
REVERT: bcaae7de01 Merge pull request #1268 from somdoron/manual_and_welcome
REVERT: 0ac0b04755 remove debug printf in test_xpub_welcome_msg
REVERT: 9bd34100b1 Merge pull request #1267 from somdoron/manual_and_welcome
REVERT: 768b62eb9d xpub welcome msg
REVERT: 96e29f1455 Add manual control over subscriptions to Pub
REVERT: cefce68a97 Merge pull request #1262 from hurtonm/master
REVERT: 905b1683c7 Fix issue #1257
REVERT: 1680a3cea1 Merge pull request #1260 from abbradar/master
REVERT: 32b2d3034b Fix test_filter_ipc for cleared supplementary groups
REVERT: cb5eebd8b7 Merge pull request #1258 from hintjens/master
REVERT: b6e61d72b2 Problem: linger values other than -1 or 0 are unsafe
REVERT: f448af948d Merge pull request #1255 from klaussfreire/master
REVERT: 6a227b2ee4 Re-enable pollout before cancelling tx timeout
REVERT: 3de1163369 Fix busy-polling bug in pgm_sender causing it to consume CPU cycles
REVERT: fca34e5e5a Merge pull request #1253 from minrk/linger-timeout
REVERT: 35dd85a1db use more conservative 30 second default timeout for LINGER
REVERT: ed4f342633 Merge pull request #1252 from c-rack/master
REVERT: 479db21136 Problem: return code of sodium_init() is not checked.
REVERT: 6dc9db1ede Merge pull request #1251 from johntconklin/master
REVERT: bc718b5307 Merge remote-tracking branch 'upstream/master'
REVERT: ea011a33de Fix typos.
REVERT: afec8440ae Use consistant spelling in documentation
REVERT: 7b6e310b47 Merge pull request #1248 from hintjens/master
REVERT: 661bccb5bc Merge pull request #1250 from c-rack/master
REVERT: e00ea532df Add tests for issue #1094.
REVERT: 1844fc3284 Problem: No error-checking of setsockopt ZMQ_CURVE_* z85 keys. Solves #1094.
REVERT: 7781375adf Problem: default LINGER value is insane
REVERT: 6d9f97ad60 Merge pull request #1246 from hintjens/master
REVERT: ea9f7acce3 Problem: zmq_ctx_term has insane behavior by default
REVERT: e3817a160a Merge pull request #1244 from johntconklin/master
REVERT: 7176b854bc Fix typo: endpoind -> endpoint
REVERT: b6ae984b11 Fix typo: addres -> address
REVERT: eda042d610 Merge pull request #1243 from jemc/master
REVERT: 5b6293c57e Problem: qt-android build doesn't fully work for downstream builds Solution: Fix the qt-android build
REVERT: 57eff1bec0 Merge pull request #1242 from pmienk/master
REVERT: 384fbbeca5 Restore structure to targets lost during nonrecursive refactor.
REVERT: be55c5ac3d Fixed .gitignore for mains in root
REVERT: 4a79f095b3 Merge pull request #1241 from jemc/builds-qt-android
REVERT: aeec276b85 Problem: Travis ci logs are too long Solution: Don't print tar extraction verbosely
REVERT: eae679718e Problem: No builtin way to build for qt-android Solution: Add qt-android build system and add to travis-ci
REVERT: 98e22da1ee Merge pull request #1234 from lysyloren/master
REVERT: 87c22364d6 Disable IPC testing on ipc-incapable systems in test_term_endpoint.cpp
REVERT: b863709eda Merge pull request #1233 from lysyloren/master
REVERT: f47960e4bc Added test and updated documentation for unbind wild-card * binded socket
REVERT: c9eb7b8a7b Merge pull request #1229 from lysyloren/master
REVERT: 4c6ea1252e Merge pull request #1232 from johntconklin/master
REVERT: 10c18f7408 Support both --enable-eventfd and --disable-eventfd options.
REVERT: 3ac1925dcc Merge pull request #1231 from johntconklin/master
REVERT: f78cbc50eb Correct libgssapi_krb5 packages.
REVERT: 0fe9cec92e Pass --with/--without-libgssapi_krb5 to configure.
REVERT: 09e7416ee9 Unbind socket with real endpoint when binding by wild-card * address
REVERT: d6c4750d26 Merge pull request #1226 from pmienk/master
REVERT: 2153043614 Add support for --with/--without libgssapi_krb5
REVERT: 1735c1e462 Add --with-libgssapi_krb5 to match libsodium and pgm.
REVERT: 9b2700cad2 Merge pull request #1225 from hurtonm/master
REVERT: 1fd1d519a8 Fix issue #1224
REVERT: e9b9860752 Merge pull request #1223 from xaqq/build-script
REVERT: 216caee1b3 Improve build script error checking.
REVERT: e74b10bc8c Merge pull request #1222 from zeromq/revert-1183-size_fix
REVERT: 0d459318e3 Revert "ZMQ API diverges from POSIX"
REVERT: 527eddc90d Merge pull request #1183 from mschneider/size_fix
REVERT: b1d766a39a Merge pull request #1219 from pmienk/master
REVERT: 607fa58b7f Merge pull request #1218 from johntconklin/master
REVERT: 7c33d91a78 Update travis script to configure with libsodium.
REVERT: 9078a7a4a5 Add support for --with/--without libsodium and --with/--without pgm command line options.
REVERT: 64a92cce49 Support both --with-* and --without-* options for libsodium and pgm
REVERT: 39b8ac303a Merge pull request #1217 from johntconklin/master
REVERT: ebfe6354e0 Merge pull request #1214 from johntconklin/master
REVERT: 0e7458daf3 Merge pull request #1216 from xaqq/pollpri
REVERT: 779c37abc4 Add support for POLLPRI flag.
REVERT: a109723b17 Merge pull request #1207 from hintjens/master
REVERT: 2e0c1a9883 Append to libzmq_la_CPPFLAGS and libzmq_la_LIBADD.
REVERT: 359933ae8f Merge pull request #1213 from dmick/master
REVERT: 983eaecc4c Merge pull request #1212 from dstftw/fix-typos
REVERT: c22bcf4f65 Fix builds/msvc/Makefile.am to include all properties files in the build
REVERT: 76d86c3fc3 Fix some typos
REVERT: 9289845c83 Remove build and runtime dependencies on e2fsprogs and e2fsprogs-devel.
REVERT: 08d90e8a05 Merge pull request #1210 from pmienk/master
REVERT: 8cf5e9fd48 Correct declaration of HAVE_LIBSODIUM.
REVERT: eb89555a24 Merge pull request #1209 from pmienk/master
REVERT: c8ee16940f Require pkg-config, use pkg-config to pull seek libsodium.
REVERT: b6762a6a8b Marked TCP and IPC filters as deprecated (ZAP)
REVERT: bc0f8d5168 Updated development master to 4.2.x
REVERT: 7f849b844b Updated NEWS for 4.0.x releases
REVERT: 3f10e401c3 Merge pull request #1208 from pmienk/master
REVERT: 00b3bfab10 Remove local pgm configuration option, cleanup configure.ac, remove unused Makefile.am instances.
REVERT: c6aedc3837 Partial migration to nonrecursive make.
REVERT: 3aa5a9d409 Merge pull request #1202 from pavel-pimenov/fix-pvs-studio
REVERT: 18ee219ce7 Fix V815 Decreased performance. Consider replacing the expression 'peer_address = ""' with 'peer_address.clear()'. stream_engine.cpp 99
REVERT: 0e3d40c806 Fix V815 Decreased performance. Consider replacing the expression 'options.socks_proxy_address != ""' with '!options.socks_proxy_address.empty()'. session_base.cpp 497
REVERT: 0b541b789a Fix V803 Decreased performance. In case 'it' is iterator it's more effective to use prefix form of increment.     Replace iterator++ with ++iterator. stream_engine.cpp     http://www.viva64.com/en/d/0165/print/
REVERT: 432c8496ea Merge pull request #1201 from johntconklin/master
REVERT: fbce7a2407 Remove build and runtime dependencies on uuid and uuid-devel.
REVERT: 610d64dd9e Merge branch 'master' of github.com:zeromq/libzmq
REVERT: cb9a0d2af4 Merge pull request #1200 from dmick/master
REVERT: dfd021b133 builds/redhat/zeromq.spec: fix manpage lists
REVERT: 8fde2d646c src/Makefile.am: libzmq.vers must go in dist tarball
REVERT: 2a0fa6baf5 builds/redhat/zeromq.spec: missing '%'
REVERT: de4a442263 builds/msvc/Makefile.am: fix up project file/property file paths
REVERT: 91cc9a2fd0 src/Makefile.am: i_properties.hpp removed some time ago
REVERT: d3c391c3d4 zeromq.spec.in: shared library version bump
REVERT: 6e53253d11 zeromq.spec.in: Missing build dependencies in specfile: asciidoc, xmlto
REVERT: 43028c7229 Merge pull request #1198 from toussa/master
REVERT: 7c5906d138 Problem : Build failed with MinGW on windows
REVERT: 053b14e6c1 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: ca0a216f52 Merge pull request #1196 from evoskuil/master
REVERT: cf4c03cf01 Update NuGet package.
REVERT: 7da40124b8 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: e40d4b2376 Merge pull request #1189 from steamraven/master
REVERT: 0900a48921 Problem: curve messages can be replayed
REVERT: fe4396c597 Merge pull request #1188 from hintjens/master
REVERT: 77f14aad95 Problem: stream_engine.cpp security can be downgraded
REVERT: 8e9005d591 Merge pull request #1186 from hintjens/master
REVERT: 57ade6d5bb Problem: test_security_curve does't try wrong mechanisms
REVERT: 8fbf810fd1 Local changes of libsodium path
REVERT: 2bf89bd0f8 Merge pull request #1185 from banburybill/master
REVERT: 94943bab3b Fix hang terminating PGM ZMQ_SUB (#822).
REVERT: b55288fdf3 return values of socket functions are ssize_t (not int) in compliance with POSIX
REVERT: 19712d3fbb Merge pull request #1181 from whoshuu/patch-1
REVERT: 5642366f10 Fix non-constant-expression narrowing
REVERT: 4b70793f1f Merge pull request #1179 from hurtonm/master
REVERT: 50e0915f98 Stop session's timer when pipe terminates
REVERT: be9fecdbc3 Merge pull request #1178 from evoskuil/master
REVERT: a8e900c7b3 Update nuget package
REVERT: c897af508d Merge pull request #1177 from hurtonm/master
REVERT: 5a497d7d0c Code cleanup
REVERT: 41a9968c2e Merge pull request #1176 from hintjens/master
REVERT: 51c8c1d67a Problem: undocumented limit on IPC paths in Linux is 107 chars
REVERT: cca297c313 Merge pull request #1173 from evoskuil/master
REVERT: 8cd85857fb Fix potential redefinition of common DEBUG symbol, replace tabs.
REVERT: 2c1d5f5a96 Merge pull request #1174 from jbreams/master
REVERT: d1881acbdc Clean up after using randombytes from libsodium
REVERT: 992dca6ba7 Fix configure warning.
REVERT: 83c6bc20db Merge pull request #1172 from evoskuil/master
REVERT: d76536eb70 Default Travis clang build fails on unused variable 'MAX_SENDS'.
REVERT: 2208907a88 Hide VS turd.
REVERT: 21e20127b6 Merge pull request #1171 from hintjens/master
REVERT: f15146b5d2 Problem: nodrop code is ugly
REVERT: 128bed472b Merge pull request #1170 from hintjens/master
REVERT: 2584c3a724 Added test cases to .gitignore
REVERT: 35040aaf18 Problem: issues with nodrop property
REVERT: 81485c7688 Merge pull request #1168 from ricnewton/master
REVERT: 8926cb3ddb Fix test broken when we changed FD_SETSIZE.
REVERT: 3811b0b1ef Merge pull request #1166 from hintjens/master
REVERT: 1acc1b1582 Problem: FD_SETSIZE 1024 is too restrictive under Windows
REVERT: 72b8a19691 Merge pull request #1163 from hurtonm/master
REVERT: f550d66ae3 Code cleanup
REVERT: b817f3c61e Merge pull request #1162 from xaqq/encode_decode
REVERT: fbdc5aa22d Add const qualifier to source parameters in zmq_z85_decode and zmq_z85_encode
REVERT: fadb2a38d9 Merge pull request #1161 from hurtonm/master
REVERT: a54d8d7b0c Reset metadata for outbound messages
REVERT: 25de6a03ac Merge pull request #1159 from kreuzberger/master
REVERT: 212220dda7 Bugfix wrong CMakeLists.txt after rename of file
REVERT: ea719a8dff Merge pull request #1151 from hintjens/master
REVERT: f20b70bef5 Cleaned up test_xpub_nodrop
REVERT: a7fed989a6 Minor changes to Travis CI script
REVERT: 785aebc6a8 Reworking Travis script
REVERT: 75d4f50be3 Problem: ZMQ_CURVE_SECRETKEY reads beyond end of Z85 data
REVERT: 0dcf6b5e2b Added AppDynamics as corporate author
REVERT: 2c5baff95f Note that ZMQ_TCP_ACCEPT_FILTER is deprecated
REVERT: acc4fe8794 Merge pull request #1158 from hurtonm/master
REVERT: 214553972d Return -1 when failed to publish message
REVERT: 228426ac44 Code cleanup
REVERT: bb6d18d5a2 Merge pull request #1156 from kreuzberger/master
REVERT: f042ea9e26 better naming of flags and variables to real functionality: nodrop
REVERT: d9a3cc48d4 do not silently drop messages in publisher if hwm is reached
REVERT: 446e8efb07 Merge pull request #1155 from mrvn/pull-document_hwm_behaviour_with_ZMQ_ROUTER_MANDATORY
REVERT: da6cf63857 Document altered HWM behaviour when ZMQ_ROUTER_MANDATORY is set.
REVERT: bbbe8d7832 Merge pull request #1154 from mrvn/pull-test_router_mandatory_hwm
REVERT: 893995e698 Add test for HWM behaviour for mandatory ROUTER sockets over tcp
REVERT: 0f780ef733 Merge pull request #1152 from drodri/task/cmake_structure
REVERT: 6537e202d6 moved root CMakeLists.txt tests config to tests/CMakeLists.txt
REVERT: 0c4ee0a9b0 Merge pull request #1147 from rodgert/master
REVERT: 03f097a541 Update zmq_msg_get(ZMQ_SHARED) to return true for type_cmsg messages
REVERT: 416ee8e75c Merge pull request #1146 from minrk/utf8-metadata
REVERT: 10a2e6c24d Merge pull request #1145 from pijyoi/master
REVERT: 4406329100 define encoding for message metadata to be UTF8
REVERT: 6bcced7537 use enum retired_fd instead of -1
REVERT: ac99d50abb Merge pull request #1142 from hintjens/master
REVERT: cdbe557727 Problem: does not install man pages correctly when out of tree
REVERT: 817912d795 Merge pull request #1139 from ewen-naos-nz/zos
REVERT: 326dec067f z/OS: Updated portability notes
REVERT: f1cd2055de z/OS: chmod +x builds/zos/{cxxall,runtests}
REVERT: 256c32d1fb z/OS: builds/zos/platform.hpp for libzmq 4.1.0
REVERT: 501666d07e z/OS: Skip pthread_{get,set}schedparam
REVERT: b27bafff60 z/OS: Autodetect tests to run
REVERT: 9d4f719e94 z/OS: Update build defines:
REVERT: 829b1bb4d4 Include testutil.hpp if using SETTLE_TIME
REVERT: 217e0ae9c6 Remove "const" from std::map key
REVERT: 6b21b1ecfa z/OS: Avoid removing libzmq.pc.in in makeclean
REVERT: 5cab63e1a1 z/OS: Transferrring from GitHub to z/OS UNIX
REVERT: f8ec9b5fad z/OS: Make builds/zos scripts executable
REVERT: 57a70d5e3b Merge pull request #1138 from ewen-naos-nz/zos
REVERT: 0af693c496 z/OS: Loop on EAGAIN on close() in ~signaler
REVERT: fc80e8cda1 z/OS: signal(SIGPIPE, SIG_IGN) for tests
REVERT: 19808ff878 z/OS: Documented SIGPIPE considerations
REVERT: 070fcd472e Merge pull request #1137 from evoskuil/master
REVERT: f96ebba7c2 Add socks files to VS2010 builds, update VS2012/2010 filters.
REVERT: 126b9d3a2a Remove libsodium VS import props crypt32.lib dependency.
REVERT: 0efd8d9bf3 Update VS filters for socks additions.
REVERT: b0103de608 Merge pull request #1136 from ewen-naos-nz/zos
REVERT: f72f4b2526 Extend z/OS UNIX port to allow building DLL
REVERT: 6e0c1c0a80 builds/zos/* portability files to z/OS UNIX
REVERT: 81b9f21bdd Merge pull request #1132 from rodgert/master
REVERT: 82282d6973 Added test and doc section for ZMQ_SHARED message flag
REVERT: d4d65da20d Merge pull request #1131 from rodgert/master
REVERT: 3497244c41 Added ZMQ_SHARED message option to zmq_msg_get()
REVERT: 5dc4066de4 Merge pull request #1130 from trevorbernard/master
REVERT: a62e6f473d Add Docker support
REVERT: d846fbf107 Merge pull request #1127 from twhittock/utils-eol
REVERT: 6099acd2be Ensure EOL is present at end of utils file.
REVERT: 428cf0255c Merge pull request #1125 from hurtonm/master
REVERT: 816299f11c Code cleanup
REVERT: bf74c0cfb1 Merge pull request #1124 from ricnewton/master
REVERT: 31cff7ccf9 Add test for unbinding inproc socket.
REVERT: 3c614074a2 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: e71ebbb771 Merge pull request #1123 from hurtonm/master
REVERT: 54e0fde1cc Resolve issue #949
REVERT: 36d529cba9 Merge pull request #1122 from twhittock/win-errhandle
REVERT: 993cb32e96 Windows: if WSA error number is held, use directly. It must be done this way, as WSAGetLastError returns 0 in these circumstances
REVERT: 660bf4311b Merge pull request #1121 from twhittock/master
REVERT: cb2582b09e vs2012: Add missing socks files
REVERT: 1353d28708 Merge pull request #1120 from hurtonm/master
REVERT: ccfbaea397 Don't delay reception of signal
REVERT: 3696d0d74f Merge pull request #1119 from mosconi/master
REVERT: 4ae4896978 duplicated type definitions when using CMAKE
REVERT: 3a16b0b108 Merge remote-tracking branch 'upstream/master'
REVERT: 51b3fad8ab Fix to build on OpenBSD
REVERT: e6b7c7acd6 Merge pull request #1118 from guidefloripa/master
REVERT: 9c42d28a20 Add static compilation on CMake
REVERT: 13ed711448 Merge pull request #1117 from jlauenercern/master
REVERT: 219310b4f0 Thread scheduling parameters: Use ZMQ context options instead of environment variables.
REVERT: 00fe56c4bf Merge pull request #1115 from hurtonm/master
REVERT: bbf597196e Merge pull request #1112 from hintjens/master
REVERT: 079ff8b759 Code cleanup
REVERT: fa3ae97480 Merge pull request #1114 from PalmStoneGames/master
REVERT: a9cb9022fd Add missing socks files
REVERT: 1b9f67cac6 Merge pull request #1113 from fichtner/socks_include
REVERT: f1207e6af1 socks: fix build on FreeBSD
REVERT: 39f2e8f273 Problem: missing stdlib.h include in curve_keygen.cpp
REVERT: a087ce55ea Problem: two header files for a single library
REVERT: 7e8dd46631 Merge pull request #1111 from hintjens/master
REVERT: dd05a64462 Problem: zmq_msg_gets did not set errno on unknown properties
REVERT: 3b505f1f6a Merge pull request #1110 from hintjens/master
REVERT: 6e91330a0c Added clarifying comment
REVERT: 58c067ff0e Revert "Problem: tcp_address.cpp allowed [ and ] around address"
REVERT: 47c796276f Merge pull request #1109 from hintjens/master
REVERT: ce8fbb26cb Problem: zmq_connect doesn't return EINVAL on invalid endpoint
REVERT: 2524e26893 Code cleanups
REVERT: 859b43f1eb Merge pull request #1107 from jlauenercern/master
REVERT: 112ef6f172 Allow change of pthread priority
REVERT: 64513d8522 Merge pull request #1106 from hintjens/master
REVERT: 78a7b469a1 Problem: tcp_address.cpp allowed [ and ] around address
REVERT: deaad00ad9 Problem: zmq_connect() does not validate TCP addresses
REVERT: 407843374d Merge pull request #1105 from hintjens/master
REVERT: 18d222515f Fixed typo in doc example
REVERT: 1f063dc30a Merge pull request #1103 from ricnewton/master
REVERT: 61c2a7d471 Merge pull request #1104 from tristianc/master
REVERT: fe2532e883 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 82be399527 Merge pull request #1097 from hintjens/master
REVERT: 369725ab8f Fix windows build
REVERT: de3832d2f8 Merge pull request #1101 from hurtonm/master
REVERT: b73d1c8fed Fix memory leak in socks connecter
REVERT: 79d578ef0b Merge pull request #1100 from hurtonm/master
REVERT: f06ca69ae9 Add support for SOCKS proxies
REVERT: 883e95b22e Merge pull request #1099 from chrox/master
REVERT: bdf6427a00 Fixed build with arm-linux-androideabi toolchain
REVERT: 8b80197207 Merge pull request #1098 from mgatny/add_gssapi_documentation
REVERT: 0a4123fd91 Add documentation for GSSAPI options.
REVERT: 36db9c0803 Fixed compile error if Kerberos installed
REVERT: 7242cdf842 Trivial whitespace fixup
REVERT: f11d673ba9 Problem: need way to probe library capabilities
REVERT: 27547bc9bc Problem: when libgssapi isn't available, GSSAPI options 'seem' to work
REVERT: cac5e74d55 Merge pull request #1096 from hintjens/master
REVERT: 1beb54cef0 Added militant API checking on zmq_getsockopt
REVERT: d0667461f0 Fixed build: malformed only defined when needed.
REVERT: b4ed3f5506 Problem: API violations are treated as recoverable errors
REVERT: 232e6ff761 Merge branch 'master' of https://github.com/tristianc/libzmq
REVERT: 1d236d81c8 Merge pull request #1090 from hintjens/master
REVERT: 373d68844a Merge pull request #1093 from hurtonm/master
REVERT: b62d1c7d5f Code cleanup
REVERT: 188f7864ea Fixed testcase for ZMQ_MAX_SOCKETS
REVERT: 39455c2114 Problem: zmq_ctx_get (ZMQ_MAX_SOCKETS) returns gibberish
REVERT: 8d7b64d648 Added packaged files and binary to RPM spec
REVERT: 3aec42e278 Merge pull request #1089 from jkryl/master
REVERT: cc4c37dc62 program dumps core when getpeername() returns EINVAL (#1085)
REVERT: c973c985fe Merge pull request #1088 from olafmandel/WSAENOTSOCK
REVERT: ab5775fb00 Fix failed assertion for WSAENOTSOCK
REVERT: 668b2c4d83 Merge pull request #1083 from hurtonm/master
REVERT: 706eb4da8d Code cleanup
REVERT: 8c616290c8 Merge pull request #1082 from dmeehan1968/exclude-test-abstract-ipc-non-linux
REVERT: a1f8737976 Exclude test_abstract_ipc from non-Linux builds
REVERT: 34e8f3c123 Merge pull request #1080 from tberkey/master
REVERT: fae07d919a Merge pull request #1079 from evoskuil/master
REVERT: 10e5277e9f Update NuGet template to incorporate platform.hpp from relative dir.
REVERT: 455bba6a15 Refresh VS 2010/2012 projects with recent VS2013 updates.
REVERT: c23420ce04 Merge pull request #1078 from mkluwe/handle-WSAEADDRINUSE
REVERT: fa95d0b5e8 removed whitespace
REVERT: 5154c544ff handle WSAEADDRINUSE in tcp_connecter_t::connect
REVERT: ff6b684ab3 Merge pull request #1076 from dmeehan1968/msvc-platform-hpp-no-copy
REVERT: d775b4539f Modified remote_thr project to not copy platform.hpp
REVERT: 66ebe31bf5 Modified remote_lat project to not copy platform.hpp
REVERT: dd95eb96be Modified local_thr project to not copy platform.hpp
REVERT: 06e67ff096 Modified local_lat project to not copy platform.hpp
REVERT: 7b50270142 Modified inproc_thr project to not copy platform.hpp
REVERT: f5478859b0 Modified inproc_lat project to not copy platform.hpp
REVERT: 649f4b0f24 Modified libzmq project to not copy platform.hpp
REVERT: d0371dc0f2 Merge pull request #1075 from dmeehan1968/perf-platform-hpp-restore
REVERT: 87ce17e439 Restore unpathed references to platform.hpp for cmake builds
REVERT: 14afbf9b48 Merge pull request #1074 from dmeehan1968/ignore-suo-in-subfolders
REVERT: 79575b0dd9 Exclude MSVC SUO files regardless of where they are in the builds/msvc folder
REVERT: 78ada21eb7 Merge pull request #1073 from evoskuil/master
REVERT: f1111ceb0d VS set switch /Z7 in debug static (DebugLIB/DebugLTCG) base props.
REVERT: cbad7de0ae Whitespace in VS projects.
REVERT: 4b543e2c98 Merge pull request #1072 from olafmandel/issue_1071
REVERT: de9eef3063 Extend zmq::wsa_error_to_errno()
REVERT: ad9838859f Merge pull request #1069 from evoskuil/master
REVERT: 920371ee6b Corrected installer source path for VS pdb debug symbols file.  Removed prefix path to platform.h
REVERT: 8e7a8a43b4 Merge pull request #1070 from ricnewton/master
REVERT: c9e86acf61 Set up hwm's before we connect the other end of the pipe in ctx_t::connect_inproc_sockets
REVERT: 6af46c39c7 Update VS import props to allow delinking by dependent projects.
REVERT: 4a02604cc2 Reset PDB out path change in base VS props.
REVERT: 764a3495c6 Merge pull request #1067 from hintjens/master
REVERT: ff07d85594 Problem: email addresses in AUTHORS harvested for spam
REVERT: b42b9c9d67 Merge pull request #1066 from hurtonm/master
REVERT: f447386936 Style fixes
REVERT: c6e38ec1b7 Merge pull request #1064 from evoskuil/master
REVERT: 77f50f9ab8 Merge pull request #1061 from dmeehan1968/fix-perf-platform-hpp-windows
REVERT: 451c94af8e Fix for perf/platform.hpp not being cleaned up by distclean
REVERT: b118acb710 Merge pull request #1059 from dmeehan1968/msvc-pdb-output
REVERT: ed49057fd7 Added ProgramDataBaseFile directive so that .pdb file goes into same directory as the .lib so that debug builds can find it
REVERT: d456e70d7d cosmetic msvc xml fix
REVERT: cfc754f393 Merge pull request #1020 from jemc/inproc_simult
REVERT: ac244b41c5 Merge pull request #1057 from hurtonm/master
REVERT: dd2be381ad Add const qualifier to register_endpoint param
REVERT: 8b47d36875 Revert "Mark failing test for issue #1015 as XFAIL"
REVERT: 99dba23dc7 Merge pull request #1055 from hurtonm/master
REVERT: 3901d94b27 Fix race condition in connecting inproc sockets
REVERT: 313b2ec84e Merge pull request #1054 from evoskuil/master
REVERT: 77514e0e9f Merge pull request #1053 from hurtonm/master
REVERT: 414fc86b22 Code cleanup
REVERT: be99f060b3 Update NuGet packaging.
REVERT: c0c89a3bc5 Update VS version resource and package version.
REVERT: 51c1a1c408 Generalize dependency reference in GSL config/script.
REVERT: 0c60256727 Revert change to VS props references because of VS UI limitation.
REVERT: 96501d7271 Merge pull request #1051 from hurtonm/master
REVERT: 5f4145e7cb Small code cleanup
REVERT: 6bdedcbca3 Merge pull request #1049 from hintjens/master
REVERT: 4b67919f93 Minor trim of man page title
REVERT: 11175a33f1 Problem: security tests block on zmq_send
REVERT: a1fbd97330 Merge pull request #1048 from hurtonm/master
REVERT: 32b3daad7e PLAIN: Small simplification
REVERT: 155feccb3f Merge pull request #1047 from mrvn/pull-testutil-expect_bounce_fail-send-timeout
REVERT: 11357df0e0 Merge pull request #1046 from mrvn/pull-testutil-set-alarm
REVERT: 2ba5af6d83 Set an alarm(60) in setup_test_environment() when not on windows so tests will not block too long if they go wrong.
REVERT: 0ebf94e429 Add a send timeout in expect_bounce_fail() so tests for authentication failures don't block.
REVERT: 77f5f7adae Merge pull request #1043 from hurtonm/dont_reconnect_on_protocol_errors
REVERT: de639c34ae Merge pull request #1042 from hurtonm/master
REVERT: 045dab91a5 Merge pull request #1037 from hintjens/master
REVERT: 9a53f334d2 Don't reconnect on protocol errors
REVERT: ed076d4620 Fix bug in reporting protocol errors
REVERT: bac001cc85 Merge pull request #1041 from hurtonm/master
REVERT: 7d3fa3afcb Tell the session why the engine has stopped
REVERT: a9a15ccf6f Use different endpoint for each test step
REVERT: aad54b2a8b Whitespace fixes
REVERT: a178097f95 Problem: artificial restriction on binary identities
REVERT: adddda17cf Merge pull request #1038 from hurtonm/master
REVERT: bd73119e2b CURVE: Implement server-side ERROR handling
REVERT: 4f571edf1b Merge pull request #1036 from hurtonm/master
REVERT: 0750303bfe CURVE: Implement client-side ERROR handling
REVERT: 0975be6ed7 Merge pull request #1035 from hurtonm/master
REVERT: 410f891599 Prefix error-reason with length in ERROR command
REVERT: 6dbc70516c Merge pull request #1034 from hurtonm/master
REVERT: dd6a4fe806 NULL: Correct ERROR command format
REVERT: 2ff098f6ae Merge pull request #1033 from hurtonm/master
REVERT: 164ff4be6b Remove debugging output
REVERT: 57546f4ecb PLAIN: Implement ERROR handling in server
REVERT: 8651b55797 PLAIN: Fix parsing of ERROR command
REVERT: 3338c76bac Merge pull request #1032 from hurtonm/master
REVERT: 6b8513744c PLAIN: Implement ERROR handling in client
REVERT: 8c4e049564 Merge pull request #1031 from sdrsdr/identity_fd
REVERT: 14e8e8af33 Merge branch 'master' of https://github.com/zeromq/libzmq into identity_fd
REVERT: 6f5e7714cf test case for zmq_getsockopt/ZMQ_IDENTITY_FD
REVERT: c6dec22717 Merge pull request #1030 from evoskuil/master
REVERT: 3aa6c1eab0 Optimize VS projects and common props.
REVERT: 7e7508a8d9 Harden MSBUILD base script against various VS installations.
REVERT: 09b17c13c2 Merge pull request #1029 from olafmandel/master
REVERT: c5cca55c78 Update build files to include metadata
REVERT: d58dfa4944 Update build files after plain_mechanism split
REVERT: ec0094c474 Merge pull request #1027 from evoskuil/master
REVERT: bf169024b3 Batched VS builds.
REVERT: 5ab44f4874 Ignore error on concurrent file copy in parallel VS builds.
REVERT: 249a59a519 Updated libsodium imports.
REVERT: dde45a98a6 Merge pull request #1026 from sdrsdr/identity_fd
REVERT: 1d5bc80372 Merge pull request #1025 from ricnewton/master
REVERT: 3d05df9aa5 Merge remote-tracking branch 'upstr/master' into identity_fd
REVERT: a16d3dbb0e docu
REVERT: 3f479f534e Merge pull request #1024 from sdrsdr/identity_fd
REVERT: 1c4cea6c7f Update  cmake for split of plain_mechanism
REVERT: 8fcefed43f patch cleanup
REVERT: d5991d6728  merge to upstream
REVERT: 098d01b16f Merge pull request #1023 from hurtonm/master
REVERT: 22d6a97403 Split plain_mechanism into client and server part
REVERT: 17cb14f79d Merge pull request #1022 from danielhtshih/master
REVERT: 70b6516d96 add untracked test_stream_timeout into .gitignore and tests/Makefile.am
REVERT: acb71e0096 store also here!
REVERT: b6c577a9ec Mark failing test for issue #1015 as XFAIL
REVERT: 5cf74db6bb Add failing test reproducing issue #1015.
REVERT: 7ec7f70384 Merge pull request #1019 from willstrang/master
REVERT: afe5fd87e9 Issue #1017: add ZMQ_HANDSHAKE_IVL time limit on connection handshake
REVERT: 1cf12ee612 Merge pull request #1018 from soundart/master
REVERT: b846f3075c ws
REVERT: 8962b7de45 removed return code check for now, got -1 in test_security_curve.
REVERT: 05ab9a848f find libsodium with cmake
REVERT: 2cdfa1fff3 initialize libsodium and tweetnacl
REVERT: ba22eff6b4 Merge pull request #1016 from hurtonm/master
REVERT: 934560b559 NULL: Implement ERROR handling
REVERT: 61d41156bc Merge pull request #1014 from evoskuil/master
REVERT: 4e5921b7ab Update VS 2008/10/12/13 file distribution.
REVERT: 033040f7e0 Integrate GSSAPI option in VS UI options and props.
REVERT: 17735a4e6b Rename VS version resource file.
REVERT: b0b6dd4043 Consolidate VS props to shared location.
REVERT: 4d640fe010 Merge pull request #1012 from hurtonm/master
REVERT: 43d8252446 Update gssapi mechanism
REVERT: 0be8144176 Update mechanism API so we can check for ERROR status
REVERT: 8672f3023a Merge pull request #1011 from fichtner/abstract_freebsd_again
REVERT: fff29a4a0c ipc: fail harder for abstract ipc on non-Linux
REVERT: b745455415 Merge pull request #1010 from fichtner/abstract_freebsd
REVERT: 69bd470103 tests: fix abstract ipc test by omitting slashes
REVERT: 4c4ca1f2f6 Merge pull request #1009 from fichtner/gss_freebsd
REVERT: 8c09ae6e49 gssapi: RFC 2744 mandates GSS_C_NT_HOSTBASED_SERVICE
REVERT: 40cbbe3c9e Merge pull request #1008 from hurtonm/master
REVERT: dcd1f2038e Minor renaming
REVERT: 2c786a200c Merge pull request #1007 from tSed/sma/fork-fix
REVERT: d178c71e21 cmake: fix indentation
REVERT: c83d4e01dd cmake: tests: disable test_fork if fork() is not available
REVERT: 6fdafc458a autotools: tests: disable test_fork if fork() is not available
REVERT: 87a08e1748 Merge pull request #1006 from hurtonm/master
REVERT: f2807d11a0 Remove i_properties interface
REVERT: c5cd92da68 Merge pull request #1005 from ricnewton/master
REVERT: 2f08477292 Initialise _has_src_addr variable, fixes hang on Windows.
REVERT: f21116b7be Merge pull request #1003 from hintjens/master
REVERT: b06474312d ZAP vs. ZMTP metadata priority fixed
REVERT: c01365d486 Fixed man page example
REVERT: bd4a76cc2a Problem: GSSAPI server doesn't parse ZAP user id
REVERT: 0d13971c05 Fixed compile error in test_security_null
REVERT: 84ed81c014 Added test_metadata
REVERT: dd6c752822 Merge pull request #1001 from hintjens/master
REVERT: ded00177b3 Revert "Add code to investigate data race"
REVERT: d190325e4d Revert "Enlarge the race window for some test cases"
REVERT: 0bc669b106 Merge pull request #1000 from daveab/feature/divide_by_zero_investigation
REVERT: 2a84d25974 Enlarge the race window for some test cases
REVERT: 5e0facda17 Add code to investigate data race
REVERT: 2db7cdc6a6 Merge pull request #999 from hurtonm/master
REVERT: 8d82cc2a0b Include ZMTP properties in message metadata
REVERT: 55c06924c8 Merge pull request #998 from hurtonm/master
REVERT: e95b477a87 Don't add empty metadata to received messages
REVERT: f721a7ad07 Merge pull request #997 from soundart/master
REVERT: 351c845339 Merge branch 'master' of github.com:soundart/libzmq
REVERT: 551bcdae6c add metadata
REVERT: 01afdf8476 no tweetnacl for windows currently
REVERT: 63cc250d05 typo
REVERT: e5a294ec02 tweetnacl integration
REVERT: 49f18d55cb Merge pull request #996 from hurtonm/master
REVERT: b9c2748146 Add metadata to received messages
REVERT: 62bb403eea Merge pull request #995 from hintjens/master
REVERT: cac0f9838d Problem: generates incompatible libzmq.so.3.1.0
REVERT: 79ef02538f Port 9999 is unsafe for tests
REVERT: fe3e8c5c70 linking fd to pipe identity via socket option
REVERT: 408dea796f Merge pull request #993 from klnikita/src_addr_connect
REVERT: acb6807041 Allow to set up a source address and port for outgoing tcp connections in zmq_connect()
REVERT: 69d27b3338 Merge pull request #992 from hurtonm/master
REVERT: 19c62b93fc Define i_properties interface
REVERT: ddde62a68c Merge pull request #991 from hurtonm/master
REVERT: f81a1304ff Update function prototype for zmq_msg_gets ()
REVERT: c24b457ccf Merge pull request #988 from hurtonm/master
REVERT: 724b2bb844 Add pointer to properties into message structure
REVERT: 26bf74972a Merge pull request #987 from hintjens/master
REVERT: 39ccfea036 Added more scaffolding for security
REVERT: d1232d144a Fixed NULL security test
REVERT: c6f8093bfb Added zmq_ctx_shutdown to Makefile
REVERT: 4307641f27 Merge pull request #986 from evoskuil/master
REVERT: c1ac534e6e Change OpenEvent to OpenEventW (Windows builds Unicode only).
REVERT: 2d6f5b0ec4 Merge pull request #985 from hintjens/master
REVERT: 9753de8566 Problem: zmq_socket_monitor code is dirty
REVERT: 97935c582e Added link to zmq_msg_gets
REVERT: 50afebe47c Merge pull request #984 from ricnewton/master
REVERT: bbaa85e7dd Fix windows non-unicode build
REVERT: cb0e8f1a9f Merge pull request #983 from pijyoi/master
REVERT: d4c5dc9b1d update ZMQ_STREAM docs about connection notification
REVERT: 2b9a5e49f4 Uupdate GSL referenece in packaging script.
REVERT: 763bf34e88 Merge pull request #981 from evoskuil/master
REVERT: e97bed3727 Add gssapi files to msvc project.
REVERT: ca29709f38 Change TCHAR to Unicode, use safe swprintf to remove warning.
REVERT: e37c206211 Merge pull request #980 from claws/fix_build_issue_when_missing_gssapi
REVERT: 7abf2564f8 fixes for gssapi build issue
REVERT: 09647fa916 src/gssapi_client.cpp
REVERT: dd64f6432c Merge pull request #978 from connamara/gssapi
REVERT: d1334d9df8 using latest copyright header
REVERT: 634c8abe29 encrypt option on gss ready
REVERT: 27591d2da6 ZMQ_GSSAPI_PLAINTEXT option for disabling encryption
REVERT: 18da8a7402 encode and decode ready message
REVERT: 2e1645a519 principle->principal
REVERT: 87834dd63f fixed up comments from pr
REVERT: 5441db3d7d configurable principle and service principle (for client)
REVERT: 4e6880ec95 gss mech sends principle as part of zap request
REVERT: be62be0fa4 gss encode/decode 'more' flag
REVERT: 778c72b9ed :fixed  client state transition bug
REVERT: 04db842dcc added ready for meta data exchange at end of gss handshake
REVERT: 761508bf4b Added comments to methods.
REVERT: 3c414c4aac GSSAPI mechanism now fully working with encryption
REVERT: eb2862525b Methods to send/recv gssapi-wrapped messages
REVERT: 1445516c41 Establishing GSSAPI sec context is working now
REVERT: 6290ba168f Added gss produce/process routines.
REVERT: c00b8c347b Refactored common impl into gssapi_mechanism_base.
REVERT: a4a0dc6644 Split up gssapi mechanism into client and server.
REVERT: abcb224318 stubbed in TOKEN command
REVERT: 4b1c851db4 Stubbed in gssapi security mechanism.
REVERT: d1bdd45e80 Merge pull request #975 from evoskuil/master
REVERT: 1ee980c191 Update filter file tool versions.
REVERT: 5a76db6f27 Merge branch 'zeromq/master'
REVERT: d03a1b0d5b Fix platform tools versioning on project files.
REVERT: bd45b74dd3 Remove versioning from VS .props files.
REVERT: cfe2036008 Merge pull request #974 from xantares/master
REVERT: ce4c4f2a05 Fixed mingw poll detection
REVERT: 98a64716ab Merge pull request #973 from HughPowell/master
REVERT: 213d111def Reference default locations for libsodium for VS2010
REVERT: 6cb742c7bb Change ToolsVersion to 4.0 for VS2010
REVERT: 6409c0ec1c Merge pull request #972 from mditzel/master
REVERT: 802d1bcb03 Fix issue #971
REVERT: 91e77e6aa4 Fix issue #969
REVERT: d40580c368 Merge pull request #970 from mditzel/master
REVERT: 52cfab3e21 Merge pull request #968 from hintjens/master
REVERT: 407b7fb474 Removed duplicate zmq_z85_* methods from zmq.h
REVERT: b9823a1388 Merge pull request #965 from evoskuil/master
REVERT: 51be440a28 Update VS build configurations.
REVERT: f9ef2dd343 Merge pull request #964 from evoskuil/master
REVERT: c392c266df Merge branch 'evoskuil/master'
REVERT: 34f4851c23 Incorporate libsodium option and linkage, generalize, update packaging.
REVERT: dd227d7a11 Merge pull request #961 from evoskuil/master
REVERT: f01b48c484 Update packaging metadata.
REVERT: 28c074ee63 Merge pull request #960 from evoskuil/master
REVERT: b7675eaace Update packaging metadata.
REVERT: 69fa001bab Merge branch 'evoskuil/master'
REVERT: e01801f5b9 Rationalize and update Visual Studio projects and packaging.
REVERT: 8fcda0d5da Cleaned up XFAIL on resources
REVERT: 84bf625477 Merge pull request #959 from evoskuil/master
REVERT: cbbfa14798 Merge branch 'zeromq/master'
REVERT: 5d0701d71d Add executable projects to VS2013 solution.
REVERT: 2ad6469cb2 Modify MSVC link incremental setting for deconfliction with LTCG flag.
REVERT: c1f7e1f48a Merge pull request #958 from hurtonm/master
REVERT: a53d703160 Resolve issue #939
REVERT: 7140bf041a Merge pull request #957 from jkryl/master
REVERT: 48b37f217f sockets created by accept are leaked to child processes (ticket #956)
REVERT: 55bde2a7b5 Merge pull request #952 from evoskuil/master
REVERT: 2e802a467f Change NuGet package id.
REVERT: 441fdd7cb6 Typo.
REVERT: ee69fa51b3 In nuget package copy copied DLLs to bin with linked name.
REVERT: c044f73bb7 Add nuget package generation and GUI selection of OpenPGM option.
REVERT: f3c156ba2b Merge branch 'zeromq/master'
REVERT: 86ef40d171 Reorganize and clean up visual studio build configurations.
REVERT: 29586d303d Merge pull request #950 from phreed/master
REVERT: 91c409fd93 updated with better owner, author and copyright information
REVERT: 394e4c6032 corrected some issues with the autopkg, include the dll
REVERT: af5b960177 added files to assist in building nuget packages
REVERT: 5a3b633bc5 cmake: correct find function
REVERT: b04abfae57 cmake: use FindSodium module
REVERT: 4706a18cf3 Merge pull request #945 from twwlogin/patch-2
REVERT: 20f22e0463 Merge pull request #944 from twwlogin/patch-1
REVERT: b7a663f1c1 Allow iov_base as char * on Solaris 8/9/10.
REVERT: 9051456f18 Include zmq.h after platform.hpp
REVERT: c217ab73b1 Merge pull request #941 from veegee/master
REVERT: 89cbd3d2fa Fix building on MinGW64 Windows
REVERT: faacb1413f Merge pull request #938 from bebopagogo/master
REVERT: 8116fe55b7 Merge pull request #937 from snikulov/fix_dll_out_path
REVERT: cd9755e4aa removed norm_engine dependency on deprecated encoder_base::has_data() method
REVERT: 0a97e05439 removed dependency on deprecated encoder_base::has_data() method
REVERT: 58a1430ca0 fixed msvc dll output path
REVERT: 65dcd79047 Merge pull request #936 from soundart/master
REVERT: 8edc80f27b cmake: fix fragile code related to HAVE_FORK macro
REVERT: 59b20e7f3e Merge pull request #934 from evoskuil/master
REVERT: 8782484fb5 Visual Studio 2013 build updates.
REVERT: a57cf1958a Merge pull request #933 from soundart/master
REVERT: 9dc890c501 fix test_fork
REVERT: 65c0ed4727 Merge pull request #932 from ricnewton/master
REVERT: b31ea51ca0 Merge pull request #931 from Dahko/patch-1
REVERT: f5eebc2ae3 Remove delays and destroy/recreate context between tests
REVERT: 6a627acea7 Fixed wrong assert in zmq_recv
REVERT: 5ced51b753 Merge pull request #930 from ricnewton/master
REVERT: e27a610897 Fix tabs
REVERT: 26dc643205 Add delays in test_connect_rid to allow time for socket to close before address reuse.
REVERT: 18e885bbe4 Add vs2013 solution and build for (v120) of libzmq project.
REVERT: be6763e381 Merge pull request #928 from bebopagogo/master
REVERT: e9523a98b5 Merge pull request #927 from ricnewton/master
REVERT: 43071bc724 fixed another missed norm_engine issue for non-norm build
REVERT: 5bd5188ec6 Fix tabs
REVERT: 7cead2bfd6 Fix travis build.
REVERT: a4b0e93fc1 Fix travis build.
REVERT: 05229ea673 Fix cmake build on windows.
REVERT: 0e0c46aedc Merge pull request #926 from bebopagogo/master
REVERT: d3e0be1528 added uncommitted norm_engine changes
REVERT: 0514aa5b51 Merge pull request #925 from hintjens/master
REVERT: b433adf49e Fixed comment
REVERT: 74d344ca74 Merge pull request #924 from bebopagogo/master
REVERT: 33f22d0d04 added norm_engine
REVERT: c91a638a5a added norm_engine
REVERT: 72c02b1569 Merge pull request #923 from hintjens/master
REVERT: b1e74f79c4 Revert "Fixed potential SEGFAULT."
REVERT: a5e397a55e Merge pull request #922 from horus42/master
REVERT: 03a3dd2503 Merge remote-tracking branch 'upstream/master'
REVERT: 79b81f4840 Fixed potential SEGFAULT.
REVERT: 49e035fb40 Merge pull request #921 from mbarbisan/master
REVERT: 350a1ac12b Allow TCP addresses to be re-resolved whenever there is a reconnection attempt
REVERT: 4e5f866fa4 Merge pull request #920 from mbarbisan/master
REVERT: 52db50f844 Add the tag name to the zmq_pollitem_t struct to allow easier forward declaration
REVERT: e224be25dc Merge pull request #914 from drewcrawford/issue_912
REVERT: 6009e2c6c4 Libsodium is now required if and only if --with-libsodium is used
REVERT: b63c5e5469 Merge pull request #911 from KennethWilke/master
REVERT: 2bcf860e77 Minor change to zmq_curve_keypair doc
REVERT: bf08114be4 Merge pull request #910 from hintjens/master
REVERT: 305a1442ae Added scaffolding for zmq_msg_gets
REVERT: 8de07ad79b Merge pull request #906 from olafmandel/fix_msvc8_build
REVERT: e7a0c54876 Fix MSVC8 build
REVERT: b008a341d7 Merge pull request #905 from guruofquality/missing_librt
REVERT: 2bc3c82745 add linking to librt under cmake build - fixes missing symbol
REVERT: 176d2c8a67 Merge pull request #904 from olafmandel/zmq-socket.man
REVERT: 45dfbc5248 Fix zmq_socket example in documentation
REVERT: 8b7ac4ffdc Merge pull request #902 from pavel-pimenov/fix-pvs-studio-v547
REVERT: acfbfe53bc Fix build with ZMQ_HAVE_WINDOWS (typedef UINT_PTR fd_t; -> unsigned type)   V547 Expression 'file_desc >= 0' is always true. Unsigned type value is always >= 0. socket_base.cpp 845   V547 Expression 'file_desc >= 0' is always true. Unsigned type value is always >= 0. socket_base.cpp 863   V547 Expression 'file_desc >= 0' is always true. Unsigned type value is always >= 0. socket_base.cpp 897   http://www.viva64.com/en/d/0137/print/
REVERT: 88ed56fa9d Merge pull request #901 from pijyoi/master
REVERT: acf0949f18 workaround missing Mstcpip.h in mingw32
REVERT: 3b8254daed Merge pull request #900 from pijyoi/master
REVERT: 9d3d9d635a fix: win32 tcp_keepalive gets set even when option is -1
REVERT: 1879b8ba76 Merge pull request #899 from olafmandel/duplicate_poller_detect
REVERT: 48b50cefb4 Remove duplicate poller decision making
REVERT: f789177abe Merge pull request #898 from hintjens/master
REVERT: 8cca4735d8 Added temporary CURVE debugging support
REVERT: 0be4a92d20 Merge pull request #895 from olafmandel/LIBZMQ_CHECK_POLLER
REVERT: a838b3897b Merge pull request #894 from olafmandel/Cygwin_gitignore
REVERT: d9d73e4bf9 Clarify configure messages for --with-poller=...
REVERT: f1ba66a78b Update .gitignore to exclude *.exe under Cygwin
REVERT: ba5fcc95eb Merge pull request #892 from olafmandel/ZMQ_SOCKET_LIMIT
REVERT: e41c8cba0e Rename ZMQ_MAX_SOCKETS_MAX to ZMQ_SOCKET_LIMIT
REVERT: 1e9ea54bf6 Merge pull request #889 from olafmandel/MAX_SOCKETS_MAX
REVERT: af42d439cd Merge pull request #890 from brunoqc/880
REVERT: a6e05ad5a3 Merge pull request #891 from lalebarde/master
REVERT: 3fb800c100 fix revert
REVERT: abf9d8b74e Revert "add a proxy hook"
REVERT: bc25366f7c Revert "add proxy_chain, a multi proxies chaining in the same thread feature"
REVERT: e8a13c44b0 Fix a strict-aliasing with type-punning
REVERT: 5815b768b9 Add ZMQ_MAX_SOCKETS_MAX to zmq_ctx_get()
REVERT: b54a168d41 Merge pull request #884 from guruofquality/cmake_fixes
REVERT: c7ffef37bc Merge pull request #886 from guruofquality/auto_fixes
REVERT: 1737520c67 Merge pull request #887 from ricnewton/master
REVERT: 12442a3d65 Bind pending connections on terminate outside lock.
REVERT: 668c42fc26 Fix hang on term when inproc is connected but never bound.
REVERT: a5741ea2f5 fix autotools out of tree build link issue on linux
REVERT: b1471da5ac fix libzmq.pc generation under cmake
REVERT: 6150812ff1 Merge pull request #881 from hintjens/master
REVERT: ab9349d3fe Revert "Fix potential memory leak"
REVERT: e376ad2787 Merge pull request #876 from hurtonm/master
REVERT: a09407829e Fix identity handling for inproc transport
REVERT: 8cda54c52b Merge pull request #874 from gyulalaszlo/cmake-switchable-tests
REVERT: 7a86b39d63 Added ZMQ_BUILD_TESTS to CMakeLists.txt to allow turning off tests. Useful when building ZMQ as a git submodule.
REVERT: 5a47fc4f08 Merge pull request #871 from apyrgio/develop
REVERT: 50d34e5653 Fix potential memory leak
REVERT: e6ef16d005 Fix potential segmentation fault
REVERT: 0ac223c746 Merge pull request #870 from hintjens/master
REVERT: 4f56631f78 Fixed issue #868
REVERT: 45b593e7ed Whitespace fix
REVERT: 40d7ca6a60 Whitespace cleanups
REVERT: 1fe82ae0a4 Merge pull request #866 from hintjens/master
REVERT: bb81b1e3d9 Fixed issue #865 - validation on ZMQ_TCP_KEEPALIVE
REVERT: 365b7b8d20 Merge pull request #864 from ricnewton/master
REVERT: 0b9a9f7671 Fix cmake build
REVERT: 6cd86932c5 Merge pull request #863 from hintjens/master
REVERT: 046e37e907 Test for 127.0.0.1 at tests startup
REVERT: de96d65f15 Merge pull request #862 from hintjens/master
REVERT: fa318400dc Fixed man page for zmq_proxy_hook
REVERT: e45fddc2bc Merge pull request #861 from pavel-pimenov/master
REVERT: 5dd82a6fa6 [libzmq] const string p -> const string& p (#860)
REVERT: e436073b37 Merge pull request #858 from lalebarde/master
REVERT: bc7441f517 add proxy_chain, a multi proxies chaining in the same thread feature
REVERT: fcd9b9506a Merge pull request #855 from hintjens/master
REVERT: b1aba5dc30 Fixed example for zmq_msg_copy
REVERT: 62ac5bb77f Fixed type for ZMQ_RCVMORE getsockopt example
REVERT: 188e99c0d4 Merge pull request #854 from lalebarde/master
REVERT: 9ae6a91fad add a proxy hook
REVERT: a7065519df Merge pull request #852 from hintjens/master
REVERT: 9c228e9374 Fixes to test cases
REVERT: 8fea78b130 Merge pull request #849 from pijyoi/master
REVERT: e71dfd13d7 typo fix: RECVHWM -> RCVHWM
REVERT: 9c6aa1e9e0 Merge pull request #848 from Prarrot/master
REVERT: 188e76a73f Added asserts on socket close in test_conenct_rid.
REVERT: 515af9b147 Added assert on duplicate id in ROUTER and STREAM sockets.  Updated man to reflect this change.  Modified test case to match.
REVERT: 141e1b5966 Cleaned up formatting of test_connect_rid.  Set LINGER to 0 on sockets.  This may address the test failing on some devices.
REVERT: 14c6cba2a5 Merge pull request #846 from lalebarde/master
REVERT: 660247066f Merge pull request #847 from Prarrot/master
REVERT: 2d6d8af0b8 added space at end of file
REVERT: 2b0fe6d181 Updated AUTHORS
REVERT: 7279429cf1 tabs to spaces
REVERT: de1164255a added test_connect_rid file and added to CMakeLists again.
REVERT: 5bc6737039 factorize code in proxy
REVERT: 0e94ddf377 Merge pull request #842 from ipechorin/master
REVERT: ebb51d7922 Fix CMake tests - delete non-existing test_connect_rid
REVERT: 1d7a07d919 Fix compilation of tests on MSVC 2008
REVERT: aaeae8deb3 Merge pull request #841 from Prarrot/master
REVERT: 3fbc10eba7 Updated man entries, and added behavior in case the user duplicates peer ids.  In this case the socket reverts to default behavior.
REVERT: 1d9b76c860 Added test for ZMQ_CONNECT_RID
REVERT: 2f36f65f8f Fixed duplicate variable declaration.
REVERT: 2f85447273 Merge pull request #839 from hintjens/master
REVERT: 50bd28c037 Cleaned up option to force identity on outgoing connection
REVERT: 5f07d103a7 Merge pull request #838 from Prarrot/master
REVERT: cedca84196 Merge pull request #837 from arsenm/master
REVERT: b1920bdf90 Fixed compile issue with missing member of socket_base.  Changed ZMQ_NEXT_IDENTITY to ZMQ_NEXT_CONNECT_PEER_ID.
REVERT: 00aeaddf94 Fix unused parameter and variable warnings.
REVERT: 5a230f7d9e Fix cmake configure error from deleted test.
REVERT: d82389a788 Merge pull request #834 from Prarrot/master
REVERT: a66c47f995 Merge pull request #833 from mrvn/pull_store-fd-on-connect
REVERT: d13b74e955 Merge pull request #832 from mrvn/pull_stream-connect-notification
REVERT: f13512a926 fixed define value in header
REVERT: 5d4860ea12 Both STREAM and ROUTER sockets suffer from a naming problem on outbound connections. While these connections can be created, they can't be immediately used. Traffic must be received before it can be sent. This prevents practical, minimal usage of STREAM or ROUTER as a true N fan in/out socket.
REVERT: afb24b53e6 Add STREAM connect notification. Adjust test cases to connection notification. Increase error checking in test cases.
REVERT: 92f8f244e2 Store socket FD after connect
REVERT: 53d0199e50 Merge pull request #828 from snikulov/cmake_rc_merge_fix
REVERT: f4a67b2520 fixed cmake merge related to version.rc.in handling
REVERT: 22655d05c7 Merge pull request #827 from EricMCornelius/master
REVERT: 88a8be8231 Update pipe.cpp
REVERT: 589fa57afa Corrects ypipe initialization when conflate is NOT enabled.
REVERT: 526847b73b Merge pull request #825 from AndreLouisCaron/disconnect-notifications
REVERT: f8300d183a Merge pull request #824 from AndreLouisCaron/fix-cmake-build
REVERT: 21011541e0 Fixes CMake build after ZAP test file was deleted.
REVERT: 17651b9276 Adds support for detecting ZMQ_STREAM disconnections.
REVERT: f253fe5f42 Merge pull request #823 from ricnewton/master
REVERT: bf06f3bb27 Define NOMINMAN to fix windows build.
REVERT: d981d01655 Merge pull request #821 from davipt/master
REVERT: d38a0c43b6 use version-script only for ELF linux
REVERT: d765a0e7d4 Merge pull request #820 from jtanx/win32
REVERT: 5efee6e0d5 Fix compilation on MinGW-w64
REVERT: 676dada8f6 Merge pull request #819 from hurtonm/master
REVERT: e46ec31209 Implement socket_base_t::get_credential member function
REVERT: 5c4f3cc603 Merge pull request #817 from Debian/symbols
REVERT: ea54669b6f Merge pull request #818 from Debian/s390x
REVERT: 245c75aad6 Fix timestamp counter on s390/s390x
REVERT: 27c050845c Only export zmq_* symbols
REVERT: 6e1b1fef8f Merge pull request #816 from snikulov/fix_test_windows
REVERT: bd2874a3a0 windows: changed tcp port from glrpc assigned to unassigned one
REVERT: 266711556d Merge pull request #815 from snikulov/cmake_install_update
REVERT: 1904f90284 cmake: fixed error 'install TARGETS given no ARCHIVE DESTINATION for static library target'
REVERT: ab07f7220d Merge pull request #814 from hurtonm/master
REVERT: 5d41d51ba5 Replace assert with zmq_assert
REVERT: 1014501679 Merge pull request #813 from hurtonm/master
REVERT: a80fb34765 Fix some comments regarding method overriding
REVERT: 60d6b89c5e Merge pull request #812 from hurtonm/master
REVERT: d72ceb93be Make it explicit that the probe function doesn't modify passed message
REVERT: 629221889d Merge pull request #810 from sradomski/master
REVERT: 23ea1b2b64 typo in docs
REVERT: 3aeaa6fab1 ZMQ_SRCFD docs and tests
REVERT: ecb9770947 Merge pull request #809 from hurtonm/master
REVERT: 96f5fddc45 Simplify ypipe_t and ypipe_base_t template parameters
REVERT: c7e3efba6b Merge pull request #808 from sradomski/master
REVERT: 823b7ebeb0 Removed dead code
REVERT: f30fb8501e Expose remote FD via zmq_msg_get(&msg, ZMQ_SRCFD)
REVERT: 08d897b174 Merge pull request #804 from mattconnolly/master
REVERT: 8c3e645013 Update test_filter_ipc to not use abstract socket.
REVERT: b5d2239a4e Merge pull request #803 from vortechs2000/fix-libzmq-576
REVERT: cd2827fb36 Fix LIBZMQ-576 - Revert "Merge pull request #510 from miniway/master"
REVERT: 2fa49e96d2 Merge pull request #800 from hintjens/master
REVERT: b3b9e046ee Updated copyright statements for 2014
REVERT: ff45caabd1 Fixed copyrights on TIPC code
REVERT: 5bf96f64b0 Removed ZMQ_ZAP_IPC_CREDS option
REVERT: adf5b45d71 Reordered socket options
REVERT: 3ad8c61190 Whitespace fixes
REVERT: 49a2902c82 Fixed issue #801
REVERT: 9d9592f830 Whitespace fixes
REVERT: 384f8522aa Merge pull request #799 from lodagro/patch-1
REVERT: a5f4d823a5 fix doc typo
REVERT: 5a0d21297e Merge pull request #798 from pijyoi/master
REVERT: 5fa3f0a045 doc bugfix: ZMQ_MSGMORE should be ZMQ_SNDMORE
REVERT: b5aa2b0f1c Merge pull request #797 from agronholm/master
REVERT: b554757cf0 Fixed setting TCP keepalive parameters on Windows
REVERT: 93e26efd5d Merge pull request #796 from hintjens/master
REVERT: 311b6bf9f7 Test was sometimes failing
REVERT: bf3702395c Fixed wildcard IPC endpoint and added test case
REVERT: 62f3fdf3b7 Fixed indentation
REVERT: 32f3fb490a Merge pull request #794 from hintjens/master
REVERT: 8ba1311e34 Fixed use of deprecated tempnam
REVERT: cf69781570 Added release notes for 4.0.3
REVERT: fc93902c4e Merge pull request #793 from minrk/test_resource
REVERT: f4c5c9e890 add failing test for binding to resources
REVERT: b4591202d2 Merge pull request #791 from moteus/patch-1
REVERT: b7a2248e22 Update doc for zmq_proxy_steerable [ci skip]
REVERT: 5401c35267 Merge pull request #790 from trevorbernard/master
REVERT: dc2ab43297 Merge pull request #789 from trevorbernard/single-connect
REVERT: dfcf2950fc Add tests/test_zap_ipc_creds to .gitignore
REVERT: 754ae1b115 Add Trevor Bernard to AUTHORS
REVERT: 10a6641ef2 Fix issue #788 - Only allow a single connect per endpoint for SUB, REQ, and DEALER sockets
REVERT: 02a8d1ea4c Merge pull request #785 from pijyoi/mutex_signaler
REVERT: e14c9bcb23 Merge pull request #786 from algernon/hotfix/curve_keygen.cpp
REVERT: b50ed02a20 tools/: Link curve_keygen with a c++ linker
REVERT: 7f22995e35 use mutex implementation if fixed signaler_port!=5905
REVERT: b4395d15f9 Merge pull request #782 from hashstat/master
REVERT: a018ef5e86 Add support for extending ZAP request address with IPC peer credentials.
REVERT: 0f3703a3ee Merge pull request #781 from hashstat/master
REVERT: 56b17100d4 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: f0bd333728 Move {SO,LOCAL}_PEERCRED checks to C++ context.
REVERT: dc5528cba6 Enable building IPC filtering with cmake.
REVERT: 4a4db83e55 Merge pull request #780 from hashstat/master
REVERT: dc9b1309b9 Shortened ZMQ_IPC_ACCEPT_FILTER_[UGP]ID to ZMQ_IPC_FILTER_[UGP]ID.
REVERT: 0a9a4fa904 Merge pull request #779 from hashstat/master
REVERT: af808203d7 Fix failing test case in test_filter_ipc.
REVERT: f5b6bd70f3 Merge pull request #775 from pijyoi/master
REVERT: e48ca50663 Merge pull request #774 from shubred1/master
REVERT: b7de0424fc Merge pull request #773 from hashstat/master
REVERT: fd8d6d471f use enum retired_fd instead of -1
REVERT: 2252322acc Add IPC accept filter socket options.
REVERT: 8662f44efa Intial IPC accept filter support.
REVERT: c7693bedea Updated documentation for zmq_disconnect() and zmq_setsockopt().
REVERT: a9492a0852 Merge pull request #770 from hurtonm/master
REVERT: 973d13d545 Code cleanup
REVERT: 39e2b79912 Merge pull request #768 from Talksum/master
REVERT: ff292d62d0 changing zmq_proxy_steerable to not use null terminated strings
REVERT: 0f6e737ff8 Merge pull request #766 from hurtonm/master
REVERT: cf14c54102 Fix issue #763
REVERT: 243aba265b Merge pull request #765 from pijyoi/master
REVERT: bd41087ab9 make win32 signaler support ephemeral ports
REVERT: a9eb6f792b Merge pull request #762 from ricnewton/master
REVERT: abbe704d9e Fix windows build for type of service.
REVERT: 3cddcbaadc Merge pull request #761 from claws/add_dscp_sockopt
REVERT: a4385e6105 tidy up
REVERT: 38bceca9ca Add ability to set and get DSCP socket option
REVERT: b91ef997ce Merge pull request #760 from shancat/move_linger_test
REVERT: 8f97f621a8 Move linger test to issue repo.
REVERT: 7c2c02862e Merge pull request #759 from hintjens/master
REVERT: 75a293d379 Moved version macros to top for better visibility
REVERT: 46c5a239cb Merge pull request #758 from hintjens/master
REVERT: 4d22d456a9 Reverting path change on platform.hpp, this broke some builds
REVERT: f98fbd5ad8 Fixed test_many_sockets
REVERT: 0ee76912e7 Merge pull request #756 from 0x6d686b/master
REVERT: 3535a1d7ea Fixed typo in documentation about zmq_proxy_steerable()
REVERT: a0bde50887 Merge pull request #755 from hintjens/master
REVERT: c89518d33d Added links to RFCs for socket patterns
REVERT: 4a7f07a19a Merge pull request #754 from pijyoi/master
REVERT: e3ddda7a1f Merge pull request #753 from pijyoi/master
REVERT: 7bd0b6ada1 remove all asserts during critical section
REVERT: ba33fb748b Merge pull request #752 from ricnewton/master
REVERT: cf8ba925b4 return error to caller on bind error
REVERT: 5f8067cd1b Fix signed/unsigned comparison
REVERT: dee333b2ed Fix signed/unsigned comparison
REVERT: 51fa803d63 Merge pull request #751 from psl-felipefarinon/master
REVERT: 7c51429440 Reduce default maximum number of sockets by 1 so there is room for the reaper socket.
REVERT: f77b96e4d9 Revert "Make FD_SETSIZE = ZMQ_MAX_SOCKETS_DFLT + 1 so there is room for the repear socket."
REVERT: 31cf53f025 issue #583 removing C++11 code.
REVERT: dc339f4c6d Merge pull request #750 from mattconnolly/master
REVERT: f06645c5f1 Update signaler make_fdpair to set file descriptors to -1 when too many files are open using socketpair.
REVERT: 1719b63f1d Merge pull request #749 from davipt/fix-001-test_many_sockets_and_mac_open
REVERT: 750426037d Fix socket creation above sistem limits for all 'other' OS not covered by eventfd, windows or vms; enhanced test to create sockets up to a bigger limit to really test hitting the OS limit
REVERT: 2b989ded67 Merge pull request #748 from hintjens/master
REVERT: 7971ef3857 Added ignore test case
REVERT: 8e21bc0b46 Merge pull request #747 from hurtonm/master
REVERT: 05d5962872 Signal that the peer performed orderly shutdown
REVERT: e66b42f363 Merge pull request #746 from ricnewton/master
REVERT: 0b92831b2a Make FD_SETSIZE = ZMQ_MAX_SOCKETS_DFLT + 1 so there is room for the repear socket.
REVERT: 4616403b10 Merge pull request #745 from ricnewton/master
REVERT: 7a510b4b60 Fix formatting.
REVERT: 90425cd5d6 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 89ecf2de79 Merge pull request #744 from psl-felipefarinon/master
REVERT: 3aa7348e0b Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 568cc1adaa Get maximum number of sockets it can handle from poller_t
REVERT: 485db41a43 Fixing broken build issue #583
REVERT: 1596a5e871 Merge pull request #743 from ricnewton/master
REVERT: 97cfa64d93 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 998c10a1b7 Merge pull request #741 from hintjens/master
REVERT: c4f09953d8 Merge remote-tracking branch 'upstream/master'
REVERT: 554b3c1f70 Add test case for many sockets
REVERT: de5a787868 Merge pull request #742 from psl-felipefarinon/master
REVERT: b8a9f299fb Fixing issue #583. Using low resolution timer for clock::now_ms
REVERT: 51f8571933 Simplified fdpair reset after fork
REVERT: 2be70dca1a Simplified error handling for make_fdpair on Windows
REVERT: e3898b5d77 Merge pull request #740 from hintjens/master
REVERT: c573f6b812 Fix for issue 574
REVERT: 729e9496b2 Merge pull request #739 from mbarbisan/master
REVERT: e84f17bbb4 Modified the zmq_setsockopt documentation to include the ZMQ_ROUTER_HANDOVER option
REVERT: 6ed1f4766a Merge pull request #738 from ricnewton/master
REVERT: 844689ed9a Fix race condition on shutdown
REVERT: 8797af777b Merge pull request #737 from hintjens/master
REVERT: 5b60540ed0 Removed over-long pauses in tests
REVERT: c2c6ec1907 Merge pull request #736 from Hugne/lookup_domain
REVERT: edbfae3141 zmq: change TIPC default lookup domain when connecting
REVERT: 370045367d Merge pull request #735 from Hugne/tipc_docs
REVERT: bbbccebbe7 zmq: add TIPC manpage
REVERT: 0d5ffd5a0c Merge pull request #734 from hintjens/master
REVERT: 5e6aa58a14 Fixed issue 578 - corrected type usage
REVERT: d7c8021afc Fixed issue 578
REVERT: 75af9ddb78 Merge pull request #733 from mingulov/doc
REVERT: bdf8bc3193 Doc examples with zmq_msg_close usage - parameter is 'zmq_msg_t *'
REVERT: 027990a112 Merge pull request #732 from Hugne/tipc
REVERT: 58ac87def1 zmq: narrow condition to include TIPC in build/test
REVERT: 299068b571 Merge pull request #731 from mbarbisan/master
REVERT: 2db808f250 Merge pull request #730 from Hugne/tipc
REVERT: 632677e805 ricnewton review comment
REVERT: 9d5a379331 zmq: add TIPC transport tests
REVERT: eab85b5295 zmq: add support for TIPC transport
REVERT: 5e71475d45 Shorten ZMQ_ROUTER_REASSIGN_IDENTITIES to ZMQ_ROUTER_HANDOVER. Also, added a test for the HANDOVER functionality.
REVERT: bc88b88804 Merge pull request #729 from mbarbisan/master
REVERT: 9d22ab1c4f Merge pull request #728 from NetImperia/patch-1
REVERT: 3825f3b300 Add support to the ROUTER socket to reassign identities upon name collision.
REVERT: c75ed69af3 Update tcp_connecter.cpp
REVERT: 2a03d541dc Merge pull request #727 from ricnewton/master
REVERT: 5405c6ac21 Remove redundant entry in tests makefile.
REVERT: 37450fad66 Merge pull request #726 from mattconnolly/master
REVERT: 36d7bba389 Adding source for test_stream_empty
REVERT: 9f87f747e3 Merge pull request #725 from ricnewton/master
REVERT: 2b08047d36 Fix formatting issue.
REVERT: 54a379f966 Clean up dead code in cmake.
REVERT: 5a74ad56a9 Sync cmake tests with tests in makefile.am
REVERT: 335cffc1e3 Merge pull request #724 from hintjens/master
REVERT: eaba5dfe37 Renamed test_router_raw_empty to test_stream_empty
REVERT: ac63e56255 Merge pull request #723 from hintjens/master
REVERT: c2c0f39d36 Fixed ref to zmq_socket_monitor
REVERT: b40879f9de Merge pull request #722 from ricnewton/master
REVERT: 379c280bde Fix test warning.
REVERT: 15f5b7ff6a Fix test warning.
REVERT: c9772d0a5c Merge pull request #721 from minrk/init-raw
REVERT: 366c8f87c4 test zmq_msg_close after sending empty message on ROUTER_RAW
REVERT: 96ee8bb9d9 add missing msg->init for ROUTER_RAW with empty message
REVERT: dad0933469 Merge pull request #718 from xantares/tarball_cmake
REVERT: 628787c965 Merge pull request #720 from hintjens/master
REVERT: 65050b1b03 Added --with-relaxed to disable pedantic compiles
REVERT: 1ee7b9b1ea test_stream failed when response was broken into frames
REVERT: 770d52ecfe Merge pull request #719 from xantares/mingw_arch
REVERT: ffd633b3bb fix use of CMAKE_SYSTEM_PROCESSOR
REVERT: 0beb39a448 Revert "fix use of CMAKE_SYSTEM_PROCESSOR"
REVERT: e5baf1e05e fix use of CMAKE_SYSTEM_PROCESSOR
REVERT: e273d94db8 include cmake files in tarball
REVERT: 71b423ae8d Merge pull request #717 from hintjens/master
REVERT: 87718c6102 Clarified use of secret/public keys
REVERT: 1f85ed06db Merge pull request #716 from hintjens/master
REVERT: 09426ff308 Fixed man page for CURVE key options
REVERT: 4582fe3276 Merge pull request #715 from ricnewton/master
REVERT: 8ee2a47267 Add new tests to CMakeLists.txt
REVERT: 41b2f83bef Merge pull request #714 from hintjens/master
REVERT: 406e6051e4 Cleaned up the code
REVERT: 08c91c0f94 Merge pull request #712 from lalebarde/master
REVERT: 984c2e94e4 small fix inzmq_proxy_steerable doc
REVERT: 99b13638eb add doc to zmq_proxy_steerable
REVERT: 5f1a9a4ae5 Merge pull request #713 from ricnewton/master
REVERT: 5250bdab9f add tests/test_proxy in gitignore
REVERT: 1b8daed9db Use consistant integer type in raw_decoder
REVERT: 1bb982ecc2 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: e33a382f8d new zmq_proxy is zmq_proxy_steerable to respect C API
REVERT: 1b75d1ecb5 add proxy control flow and test
REVERT: 3b628fd85a Merge pull request #710 from jenshz/patch-1
REVERT: f0a0e4d817 Update zmq_msg_init_data.txt
REVERT: 6139a66eee Merge pull request #709 from hintjens/master
REVERT: 097c2c8f8b Temporary workaround for broken libsodium install
REVERT: ff90fa7f4d Merge pull request #708 from hurtonm/master
REVERT: 7ecab54ac3 Load identity message to decoder at start
REVERT: 9bb4215cfe Merge pull request #707 from xantares/master
REVERT: b2d52a3730 Fixed out-of-source build
REVERT: 82ab836306 Merge pull request #706 from hurtonm/master
REVERT: b35c08beb4 Rename engine's methods to improve code readability
REVERT: 63e0fe915e Merge pull request #705 from hintjens/master
REVERT: 50a1973ee6 Identity can only be set on sockets that can connect to ROUTER
REVERT: cc2282556a Update NEWS
REVERT: 1b6ca34d16 Merge pull request #703 from hintjens/master
REVERT: b7eb1cdcce Revert "replace macro constants with enum types for user facing constants"
REVERT: b0085a7f29 Revert "distinguish between options and defaults"
REVERT: 2cf6d52310 Fixed NEWS for 4.0.1 release
REVERT: c629b6c7b0 Merge pull request #702 from hintjens/master
REVERT: 6ef68be04f Updated NEWS for 4.0.1 release
REVERT: 756010343d Merge pull request #701 from ezhikus/master
REVERT: 433ea35b6c Typo in type name "emTPy_slots_t"
REVERT: 283e52357c Merge pull request #700 from hashstat/master
REVERT: 62e26b3242 Add tests/test_abstract_ipc to .gitignore.
REVERT: e0f4d603c2 Fix detection of abstract ipc pathname and length calculation.
REVERT: ae7fad48a8 Add note on Linux abstract namespace to ipc documentation.
REVERT: 1a20220817 Merge pull request #699 from ezhikus/free_and_delete
REVERT: bacc9aeeae Merge pull request #698 from hashstat/master
REVERT: 7a960ff29c useless checks were removed
REVERT: f499c89528 Add test for abstract namespace support in ipc sockets on Linux.
REVERT: 31cdbd2afa Add abstract namespace support for IPC sockets on Linux.
REVERT: 23e58e30d5 Merge pull request #697 from pijyoi/master
REVERT: 55bfe7dbab WinSock2.h filename should be all lowercase
REVERT: 79c2598a08 test for _MSC_VER before using MSVC specific code
REVERT: d33a3ad0fd Merge pull request #696 from calid/enum-constants
REVERT: e7804c5027 distinguish between options and defaults
REVERT: 6934766cf8 Merge pull request #695 from hurtonm/master
REVERT: d4bb6d693f replace macro constants with enum types for user facing constants
REVERT: 88882e31cd Stop curve handshake when cookie box verification fails
REVERT: 21129c7501 Merge pull request #694 from hintjens/master
REVERT: edeedc6dd8 Disabled randomly failing part of test
REVERT: d37d32fb0c Clarified that zmq.h constants are part of the public contract
REVERT: cd030ef1c2 Merge pull request #693 from calid/doc-fix
REVERT: 0b4ce80853 fix minor typo in zmq_ctx_get doc example
REVERT: 73ae948abb Merge pull request #692 from hintjens/master
REVERT: fd4d125d8e Packaging for zmq_curve_keypair function
REVERT: ead6826cc1 Merge pull request #691 from minrk/curve_keygen
REVERT: 4577956964 return NULL and set EINVAL on bad z85 input
REVERT: 87254abc9f use zmq_curve_keypair in curve_keygen
REVERT: d1a927a92e add zmq_curve_keypair to zmq_utils
REVERT: 30d34888e0 Merge pull request #690 from mattconnolly/master
REVERT: 7660b78e12 config for libsodium in alternate path, using CPP flags for both C and C++ sources.
REVERT: 6c25d2f880 Merge pull request #689 from minrk/curve_keygen
REVERT: cf4bfd48cf include missing platform.hpp in curve_keygen
REVERT: 3d7b2b4c04 declare z85_encode / decode in zmq_utils
REVERT: f1002e9492 Merge pull request #688 from mattconnolly/master
REVERT: 848ce1adb1 Disable compiler warning for Solaris
REVERT: aa84e85153 Add '-lssp' linker flag for Solaris. Check for libraries after host specific setup.
REVERT: 2af23cf40c Merge pull request #687 from hintjens/master
REVERT: 015b43f969 Updated CMake project for test_issue_566
REVERT: d568e7f587 Merge pull request #686 from hintjens/master
REVERT: e42a0a4074 Added test case for issue 566
REVERT: 5271bc9db3 Merge pull request #685 from hintjens/master
REVERT: 26d5ac4075 curve_keygen needed assert.h
REVERT: 9d51155ce2 Build/test errors on OS/X with clang++
REVERT: 9827a1278b Merge pull request #684 from hurtonm/master
REVERT: be25cfdf35 Call flush after writing the identity message
REVERT: f06bf8d25b Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: b0b2567fcf Merge pull request #683 from hintjens/master
REVERT: 82149dde19 Updated libzmq CURVE to track RFC 27
REVERT: cc2823e240 Merge pull request #682 from hintjens/master
REVERT: 51fe8cfe52 Merge pull request #681 from ipechorin/master
REVERT: b3346fb37a Fixed build for MSVC 2008
REVERT: b504aad160 stdint.h is not available on all platforms
REVERT: 5f0a8dcffe Merge pull request #680 from hintjens/master
REVERT: 186b713aba Bumped library version and age
REVERT: 920385c40f Merge pull request #679 from mattconnolly/master
REVERT: 12eef06e45 Update configure: Allow libsodium to be installed in a custom path
REVERT: 7b5da7dc09 git ignore test run output files: tests/test*.{log|trs}
REVERT: 9db0791cd5 Revert "Copy platform.hpp into src directory in cmake build."
REVERT: efbe7d45fa Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 0e7124b656 Merge pull request #678 from hintjens/master
REVERT: f36a49de6d Move away from port 8080 which is occupied on some boxes
REVERT: 59f1fbc9a2 Merge pull request #677 from vortechs2000/fix_aix
REVERT: e3e7efedbe Revert "Reference platform.h by ../src/platform.h - AIX is ignoring -I flags"
REVERT: aa2aab1785 Merge pull request #674 from hintjens/master
REVERT: 11b699e73c Copy platform.hpp into src directory in cmake build.
REVERT: 1293f1b956 Merge pull request #675 from vortechs2000/fix_aix
REVERT: 015d9564ee Reference platform.h by ../src/platform.h - AIX is ignoring -I flags
REVERT: b49aa7a65d Updated NEWS for 4.0.0 release
REVERT: 0d3f9eb592 Missing file from Makefile.am
REVERT: 21157f7d85 Next version off libzmq master is 4.1.0
REVERT: 84a013e3de Fixed packaging for source distribution
REVERT: 1a9ea3e24a Merge pull request #673 from hintjens/master
REVERT: 5e609be345 Renamed new socket options to be clearer
REVERT: aaf2a2cdfb Merge pull request #672 from hintjens/master
REVERT: 0997a8b753 Removed inaccurate note in zmq_poll man page
REVERT: 71c9ae8b18 Built zmq_send_const man page properly
REVERT: 92c01f69db Renamed test_connect_delay to test_immediate
REVERT: 0644256ef4 Updated NEWS for 3.2.x releases
REVERT: 8f0a757f08 Merge pull request #671 from ricnewton/master
REVERT: 78cabfe8ea More testing github jenkins integration
REVERT: d503e19381 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 544575d18c Revert "More testing github jenkins integratio"
REVERT: 0640d6d2ba More testing github jenkins integratio
REVERT: 575ff39bfe Testing github jenkins integration
REVERT: 90867a4e8f Merge pull request #670 from ricnewton/master
REVERT: 7a747b5797 Fix cmake build
REVERT: 39de9bebcb Merge pull request #669 from hintjens/master
REVERT: e05556075f Renamed inproc connect test (name was too long)
REVERT: de91c7362c Merge pull request #668 from mrothe/no-public-tests
REVERT: 94c98abba3 Merge pull request #667 from hintjens/master
REVERT: b13230510c tests: don't listen on public ports
REVERT: 825052f83f Revert "makes curve keys symetric as in libcurve + factorisation"
REVERT: 22eb4d600b Revert "oblige the application to explicitely set the node type for PLAIN"
REVERT: 9e66685c08 Reformatted text
REVERT: dc79171fc3 Merge pull request #666 from lalebarde/master
REVERT: 1206f4572b oblige the application to explicitely set the node type for PLAIN
REVERT: bfd472f97c makes curve keys symetric as in libcurve + factorisation
REVERT: ad0b325e4a Merge pull request #665 from hintjens/master
REVERT: 7bb2b6ae11 Fixed length of domain setting
REVERT: 7735ca5f8d Added test case for NULL domains
REVERT: 67013f19f6 Merge pull request #664 from hintjens/master
REVERT: 321a8ffea9 NULL mechanism was not dealing with ZAP denials properly
REVERT: 971b275f7a Merge pull request #663 from hintjens/master
REVERT: fe9815a789 Fixed random failures in test_security_plain and _curve
REVERT: 276cd1f1da Merge pull request #662 from ricnewton/master
REVERT: 6f351007d4 Fix windows build
REVERT: fbe1b79188 Merge pull request #661 from lalebarde/master
REVERT: dc1f5e9f7c simplify test_security_curve.cpp with zmq_z85_encode
REVERT: d76f3f7c03 Merge pull request #660 from hintjens/master
REVERT: 576e3ca5e0 Added z85 codec to ZMQ API
REVERT: 5c7b39275f Merge pull request #659 from hintjens/master
REVERT: 193d0bb634 Fixed Z85 methods to be static and not pollute library
REVERT: 65ef76bb59 Minor simplification to makefile
REVERT: 90668517da Merge pull request #658 from ricnewton/inproc_connect_before_bind
REVERT: 4e6c56e081 Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind
REVERT: b9298823b4 Set hwm on connect socket before bind has happend to just that of connects hwm.
REVERT: 7841b0dd0f Support high water mark on inproc socket connect before bind.
REVERT: 133c32d5ed Merge pull request #657 from hintjens/master
REVERT: 0db2bbe29d Build didn't work if libsodium wasn't installed
REVERT: 3298e5a206 Merge pull request #656 from ricnewton/inproc_connect_before_bind
REVERT: b9c09064d5 Fix whitespace
REVERT: d5bd68b60b Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind
REVERT: 379bcb0881 Send identities when connecting pending sockets.
REVERT: c1fabf5ca9 Merge pull request #655 from hintjens/master
REVERT: 7c3496a76a Fix race condition and support multiple socket connects before bind.
REVERT: 60f470450d Merge pull request #654 from lalebarde/master
REVERT: 6c84a54388 add exhaustive comparison in testutil bounce
REVERT: 345bf146f1 Fixed overwrite in zmq_getsockopt
REVERT: 6fefa4166a Merge remote-tracking branch 'upstream/master' into inproc_connect_before_bind
REVERT: 5f20d63665 First attempt at inproc connect before bind
REVERT: 168efb9739 Merge pull request #653 from mattconnolly/master
REVERT: 6ff65a8aa4 Builds and installs curve_keygen tool
REVERT: 0d14efe73a Merge pull request #652 from hintjens/master
REVERT: ac8c72cea6 Added test_ctx_destroy to .gitignore
REVERT: d1ba8a50d2 Extended TravisCI build to use libsodium
REVERT: 52370bff44 Removed debugging printfs
REVERT: 0f9e5f6049 Fix preprocessor typoe
REVERT: 0f7141c21a Merge pull request #651 from ricnewton/master
REVERT: 8e6b5ad17e Fix Makefile.am for test_ctx_destroy
REVERT: bba0dd19a1 Merge pull request #650 from ricnewton/master
REVERT: ccf0e61b77 Merge remote-tracking branch 'upstream/master'
REVERT: 64e1c181f7 Implement non-blocking shutdown command that unblocks other threads waiting on blocking operations.
REVERT: 25c89cace1 Merge pull request #649 from hintjens/master
REVERT: 6725c4644f Added ZMQ_ZAP_DOMAIN socket option
REVERT: c45d91a106 Fixed comments on curve_keygen tool
REVERT: 635a03d240 Was sending NULL mechanism name with extra null (fixed)
REVERT: 4edad54537 Merge pull request #648 from ricnewton/master
REVERT: a601b3f6f4 Remove windows debug code.
REVERT: 7485b09cba Fix tests on windows
REVERT: 498dc37988 Merge pull request #645 from hintjens/master
REVERT: 4c75306023 Fixed test_stream case
REVERT: 9dd324aab2 z85 encoding buffer overrun
REVERT: 1f03710980 Merge pull request #647 from sebastien/master
REVERT: 11deee4e3e Merge branch 'master' of github.com:sebastien/libzmq
REVERT: f9188841b0 Clarified zmq_socket.txt ZMQ_STREAM section, added example
REVERT: 0a9261472f Removed test_raw_socket
REVERT: 32fa426e61 Added system check at start of selftests
REVERT: 7b02f1c966 Merge pull request #646 from minrk/xfail-linger
REVERT: bb348858f1 mark test_linger as expected failure
REVERT: 6612280946 Removed temporary patch on tests/Makefile.am
REVERT: 28b0a5fa27 Updated libzmq to match RFC 23, 24, 25, 26
REVERT: 1844a27c82 Removed test_raw_sock test case (replaced by test_stream)
REVERT: ef207e45ce Merge pull request #644 from ipechorin/master
REVERT: 873d80c9fe fix MSVC 2008 project: include the source files added recently
REVERT: e071d3a4ae fix MSVC10 project: include the source files added recently
REVERT: 7561ff70f3 Merge pull request #643 from ricnewton/master
REVERT: 4696f002ca Fix cmake file for security tests
REVERT: 0ff896d094 Merge pull request #642 from hintjens/master
REVERT: fb67e160a1 Fixed ZAP authentication
REVERT: 3a50aa4473 Merge pull request #641 from hintjens/master
REVERT: fba5612026 Fixed 'make check' failures
REVERT: 01b336f1f1 Whitespace fixes
REVERT: c128fac7a7 Merge pull request #639 from minrk/test_linger
REVERT: 6fa274ebef Merge pull request #640 from mattconnolly/fork
REVERT: 282765cab4 Merge pull request #628 from ianbarber/master
REVERT: 1771755888 test_fork.cpp: adding missing headers for linux
REVERT: c646ac96c0 cast rc to size_t for comparisons
REVERT: c3adc86d6b Fix unused variable when using eventfd
REVERT: ca8ac83e97 Merge pull request #637 from minrk/test_plain_inauth
REVERT: a3d9d01af8 test_fork: update test to verify communication between parent and child
REVERT: ff2900fd52 Terminate context in a child process of fork() to replace file descriptors to not interfere with parent process's context
REVERT: 0478ee04f4 Adding test showing failure to close socket/context in forked child
REVERT: 58b370df69 add test_linger
REVERT: 8ef7fbb4a4 Merge pull request #638 from shawnjgoff/master
REVERT: 6a18f59532 Change name of icanhasall to subscribe_to_all
REVERT: 9d94640edc test failed CURVE auth
REVERT: 0cac56fe52 test PLAIN auth with failed login
REVERT: 82a00e3a98 Merge pull request #636 from ricnewton/master
REVERT: da52806d68 Disable failing tests on windows.
REVERT: 22f05fa2fa Merge pull request #635 from guidog/master
REVERT: 93a068a832 Fixed silly port number.
REVERT: 4ca6ab26fa Merge pull request #634 from guidog/master
REVERT: 455739f942 Fixed markup so documentation can be built.
REVERT: 83e547f09f Merge pull request #633 from eburkitt/vs2012-clean-compile
REVERT: eaf227d4de get to clean compile under vs2012
REVERT: 2e9385ac02 Merge pull request #631 from jrossi/master
REVERT: 436cad37ec fix type on HWM
REVERT: a9baa051dd Merge in master changes
REVERT: d485404aab Merge pull request #626 from dkrikun/master
REVERT: 19ca8a0fc0 Add the Socket Identity info to the ZAP Messages
REVERT: cb6b5a65fc Merge pull request #629 from ulikoehler/init_data_assert
REVERT: fd8b0fec07 Re-add comment line from cmsg branch
REVERT: a28c38efa5 Fix spaces before comments
REVERT: 3f3777d05b Add test for ZMQ_CONFLATE option
REVERT: 9c2740d9fa Minor fixes to doc ; added zmq_msg_init_data() assert preventing deferred segfault
REVERT: bcfe863fd4 Merge pull request #630 from ulikoehler/cmsg
REVERT: da4a70d59d Fix indentation
REVERT: 121a838a0c Added message type for constant messages
REVERT: 531d3ebc09 Remove delay options
REVERT: b3ca7fd425 Merge pull request #627 from ianbarber/master
REVERT: 1011e8ad20 Merge pull request #624 from ricnewton/master
REVERT: cb35fd7bfe Attempt to fix disconnect not respecting linger
REVERT: ed272fe56d Merge pull request #625 from ulikoehler/zmq_send_const
REVERT: f59c1a5c5a Update doc for ZMQ_CONFLATE socket option
REVERT: daa7a8021f Plug in dbuffer to serve the ZMQ_CONFLATE option
REVERT: 4c35b88acb Implement double buffer for conflate option
REVERT: d020dd677f Declare ZMQ_CONFLATE option
REVERT: 4eac7e3e4f Add scoped_lock_t syntactic sugar
REVERT: 87c84a252a Add try_lock() to mutex_t
REVERT: 503da83fce Add #include to string.h in blob.hpp
REVERT: e23d3963d3 Fix doc typo
REVERT: 10becae7eb Added zmq_send_const test
REVERT: e2c322cf80 Implemented zmq_send_const
REVERT: 70a1fbee7a Fix running tests from cmake on linux.
REVERT: e1b2b649fb Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: a83baa9b0b Fix up threading code from port tests to windows.
REVERT: 7f74fc7c99 Port tests to windows and add to cmake build.
REVERT: eccfede10d Merge pull request #623 from ricnewton/master
REVERT: e16a6af0c7 Fix compile error on windows.
REVERT: 749c391b34 Merge pull request #622 from ckamm/req-strict
REVERT: 423ca36b17 Rename ZMQ_REQ_SEND_RESETS -> ZMQ_REQ_STRICT.
REVERT: fe30cc6d99 Merge pull request #619 from ckamm/req-send-resets
REVERT: 9f4526f59a Merge pull request #621 from hintjens/master
REVERT: 39ddc695bc Added note about tivotisation
REVERT: f5c59556bd REQ: Unset reply_pipe if it terminates.
REVERT: a0cc87a9d9 Add ZMQ_REQ_SEND_RESETS option.
REVERT: 637f794193 Merge pull request #620 from ckamm/req-id
REVERT: b9646f2aac Add ZMQ_REQ_REQUEST_IDS option.
REVERT: 6473dfd8f4 Merge pull request #617 from hurtonm/zap_updates
REVERT: 4a5358f4d0 Implement ZAP for NULL mechanism
REVERT: 53bc53da04 Update PLAIN mechanism to the latest ZAP revision
REVERT: d65231be1c Update CURVE mechanism to the latest ZAP revision
REVERT: 7541debe6d Add get_peer_ip_address utility function
REVERT: 4944095262 Merge pull request #615 from hintjens/master
REVERT: 1068bc0795 Merge pull request #616 from steve-o/master
REVERT: 409721b9d2 Add CMake support for static libraries.
REVERT: 21fe600848 Move CMake dependencies together.
REVERT: ae86c56d74 README file moved to GitHub format and extension, drop from packaging and default to NEWS file for popup.
REVERT: d46c2ee2fc Disabled last step in test_spec_req so build can complete
REVERT: 4fb004f59b Merge pull request #614 from ckamm/fix-spec-req-fail
REVERT: 7de23c0c8d Fix intermittent failure in test_spec_req.
REVERT: bccf3d6126 Merge pull request #613 from ckamm/coding-style-spec-tests
REVERT: 93b9f9021c Merge pull request #608 from ckamm/req-drops-unwanted
REVERT: bbc9a61197 Fix coding style in spec tests.
REVERT: c56d797bf9 REQ sockets drop replies from unasked peers.
REVERT: 524bd7ac76 Merge pull request #612 from ulikoehler/markdown
REVERT: 6bf4ffe727 Converted README to markdown + added travis build img
REVERT: 7560910f50 Merge pull request #611 from pijyoi/master
REVERT: 0f28b72914 update to include stream.cpp and curve related
REVERT: 5ac19647d9 Merge pull request #610 from hintjens/master
REVERT: 9ca6898f24 Got new test cases working with libzmq
REVERT: 08622a7788 Merge pull request #609 from ckamm/tests
REVERT: dfba19c4b6 Make pipeline/reqrep tests try tcp:// endpoints.
REVERT: 5038ef74b5 Merge pull request #606 from ckamm/master
REVERT: 8fd163cf5c Add tests for PUSH/PULL sockets.
REVERT: e093bd9923 Merge pull request #607 from cjuniet/master
REVERT: 7b7f7e4ebd Fix compilation warnings on unsigned comparisons.
REVERT: 798b394087 Add tests for Request-Reply pattern sockets.
REVERT: 78e47912d2 Merge pull request #605 from ricnewton/master
REVERT: 998610602e Fix tab/space formatting issue
REVERT: 5a30022045 Merge pull request #603 from ricnewton/master
REVERT: a3e16c18b1 Merge pull request #604 from ricnewton/cmake_fix
REVERT: 01dd6eb110 Fix cmake build Fix build on windows, uint isn't a standard type, unsigned int is.
REVERT: f6e972d546 Fix montior tests to handle the monitor stopped event correctly
REVERT: d4d23caf32 Add new socket monitor event for when socket monitoring is stopped.
REVERT: 1cfee8d1e7 Merge pull request #601 from leewoosung/hotfixes/patched
REVERT: 2a4aef9223 Merge pull request #602 from hurtonm/master
REVERT: 783bb890a9 Check socket types during mechanism handshake
REVERT: 4671108e57 LIBZMQ-541 issue fix
REVERT: 58b1082467 Merge pull request #600 from hurtonm/master
REVERT: afe9afa2a5 Set socket buffers before establishing TCP connection
REVERT: 11947b1ccb Merge pull request #597 from hintjens/master
REVERT: a71d64ab95 Merge pull request #599 from hurtonm/master
REVERT: aef2171e83 Make last_endpoint attribute of socket object
REVERT: c9bdb893f8 Use generic session class whenever possible
REVERT: 7460d00bac Merge pull request #598 from hurtonm/master
REVERT: fd7e9b8c46 Use generic session class whenever possible
REVERT: 7041770108 Added Z85 support
REVERT: 1beec5e960 Merge pull request #596 from hintjens/master
REVERT: 76df045950 Return EINVAL when trying to use CURVE without libsodium
REVERT: 357a9c45fb Simplify ZMQ_STREAM socket implementation, part II
REVERT: 7832addd20 Updated security mechanisms to use variable-length commands
REVERT: ba1ae7d639 Merge pull request #595 from hurtonm/master
REVERT: 7b27c125dc Simplify ZMQ_STREAM socket implementation, part II
REVERT: dd14d4e01b Minor whitespace fixes in man page
REVERT: c4ae74f816 Fixed zmq_errno function definition
REVERT: fe2753da0a Merge pull request #594 from hurtonm/master
REVERT: a1bb5e83ff Simplify ZMQ_STREAM socket implementation
REVERT: d8f1376008 Merge pull request #593 from hintjens/master
REVERT: ad77937956 Added ZMQ_STREAM socket type
REVERT: 4a4d222ec4 Merge pull request #592 from gavinmcniff/master
REVERT: b893ce2503 Store identity for raw socket
REVERT: e9d11c6611 Merge pull request #591 from hurtonm/master
REVERT: b12be41736 Rename parse_properties to parse_metadata
REVERT: ec943ac5de Merge pull request #590 from hurtonm/master
REVERT: 99d4974580 Refactor how properties are parsed
REVERT: 19cf076f8c Merge pull request #589 from ianbarber/master
REVERT: 13df8e6546 Merge branch 'master' of git://github.com/zeromq/libzmq
REVERT: 211bf2b08e Added security curve test
REVERT: 73e195279a Merge pull request #588 from hurtonm/master
REVERT: 084e8792de Small cleanup in pipe.cpp
REVERT: 2bf51247fe Merge pull request #587 from hurtonm/master
REVERT: fa0f0e21b8 Make ZAP optional for PLAIN mechanism
REVERT: 8bb79b5eb1 Merge pull request #586 from hurtonm/master
REVERT: 5975e00fd1 Make ZAP optional for CURVE mechanism
REVERT: acaaaa5351 Merge pull request #585 from hintjens/master
REVERT: fadfcac1de Fixed compile error, needed unistd.h
REVERT: 1ea06883c0 Fixed spelling in comments
REVERT: fb43d5a0fe Whitespace fix to man page
REVERT: f4848ddb32 Prints message and exits if app tries to use CURVE without libsodium
REVERT: 675bd4640b Merge pull request #584 from hurtonm/master
REVERT: 1b86324396 Fix test_disconnect_inproc to work on ILP64 systems
REVERT: 9eb2521537 Merge pull request #583 from ianbarber/master
REVERT: 694543e3a2 Merge branch 'master' of git://github.com/zeromq/libzmq
REVERT: f4c51db842 Fix small streamengine issue w/ term and handshake
REVERT: 91bc74089f Merge pull request #582 from hurtonm/master
REVERT: 8af208fab7 Implement ZMTP/3.0 CURVE mechanism
REVERT: e4a211870c Implement CurveZMQ message encryption and authentication
REVERT: c9638fceb4 Merge pull request #581 from hintjens/master
REVERT: 8c0ded5076 Properly set mechanism to CURVE when setting a curve option
REVERT: c5078ea1b8 Merge pull request #580 from hurtonm/master
REVERT: 20a7978d67 Stop ZMTP handshake when an unexpected message comes
REVERT: 92b02b98cd Merge pull request #579 from ianbarber/master
REVERT: cabf4e658f Comments to clarify the socket name function
REVERT: 1fe7820629 Merge pull request #577 from hintjens/master
REVERT: c5a9fa5b5e Merge pull request #578 from gonzus/master
REVERT: 3b355fec9a Introduced private constants for the context sanity tag values. Ignored more MSVC intermmediate files.
REVERT: 10f69c1500 Clarified man pages on mixed security
REVERT: d9bb16725e Added options for CURVE security
REVERT: 65c84abdb5 Merge pull request #576 from hurtonm/zmtp_curve
REVERT: 37b99c0b4b Implement ZMTP/3.0 CURVE handshake
REVERT: 9273022260 Merge pull request #575 from murphybytes/master
REVERT: 9bd8d9a726 added missing files required to build
REVERT: 1195092c61 Merge pull request #574 from pijyoi/master
REVERT: 38327927ce fix memory leak in tempnam() usage
REVERT: 5c54bc358e Merge pull request #573 from shripchenko/master
REVERT: 627190c8be another iteration on ZMQ_PROBE_ROUTER now it properly works for ROUTER
REVERT: 6b8569d78a Merge pull request #572 from hintjens/master
REVERT: 6ff51ee909 Updated ZAP request for changed protocol draft
REVERT: 656ff5b208 Small fixes to documentation
REVERT: 210fcbbbeb Merge pull request #571 from hurtonm/master
REVERT: 2928c91a6d Implement ZAP and integrate it with PLAIN mechanism
REVERT: 4e47084dd4 Minor cleanups
REVERT: c3e40736de Rename terminated->pipe_terminated
REVERT: 7a43c02aaf Merge pull request #570 from hintjens/master
REVERT: a9679da764 Packaging on ZMQ_PROBE_ROUTER
REVERT: 2344131db3 Packaging of ZMQ_PROBE
REVERT: dbd58f8e15 Fixed out-of-date reference
REVERT: 9c980e17dd changed option name. +documentation changes
REVERT: 97324398a7 refactored ZMQ_ROUTER_ANNOUNCE_SELF code. renamed it to ZMQ_PROBE_NEW_PEERS. implement it for DEALER tocket. +documentation
REVERT: d5f603690f Merge pull request #569 from jpoliv/master
REVERT: 42ab0e8217 Make     ./configure --with-system-pgm detect the OpenPGM 5.2 system library.
REVERT: d1f011d7e5 Merge pull request #568 from jmgao/patch-2
REVERT: 43d049741f Fix mistaken use of xor in "2^31 - 1".
REVERT: 6caa17373b Merge pull request #567 from ianbarber/master
REVERT: 9a0b2c8970 Pieter's change to fix memory leak on mechanism
REVERT: 240eff384a Merge pull request #563 from shripchenko/master
REVERT: 9d63ebf6d6 Merge pull request #564 from hurtonm/master
REVERT: 4e4803e07f Rename pipe states to make it more mnemonic
REVERT: f805e4dd03 changed option name. +documentation changes
REVERT: aec989fb5d small refactoring
REVERT: 51750a7d2a refactored ZMQ_ROUTER_ANNOUNCE_SELF code. renamed it to ZMQ_PROBE_NEW_PEERS. implement it for DEALER tocket. +documentation
REVERT: f781eb7e7b Merge pull request #562 from hintjens/master
REVERT: fbd1729cbd Removed tracing for Travis builds
REVERT: 13643b2aec Merge pull request #561 from shripchenko/master
REVERT: 910b469224 Merge branch 'master' of https://github.com/shripchenko/libzmq
REVERT: ed3a115da9 Add ROUTER socket option to introduce self(send an empty message) to new peers, to allow ROUTER<->ROUTER auto-discovery problem.
REVERT: ec7f711c58 Add ROUTER socket option to introduce self(send an empty message) to new peers, to allow ROUTER<->ROUTER auto-discovery problem.
REVERT: c7c865da75 Whitespace fixes
REVERT: d113495500 Merge pull request #560 from hintjens/master
REVERT: 4112693051 Cleaned up router option code - made consistent with options.cpp code - added trace print for ongoing issue with Travis CI builds
REVERT: 536ea4fc24 Merge pull request #559 from hintjens/master
REVERT: bf96cb44e2 Fixed name of Travis file
REVERT: 59a164d2b5 Added support for Travis CI
REVERT: e9e44c6b09 Merge pull request #558 from hintjens/master
REVERT: 31ee92f2fd stdint.h is not available on all platforms
REVERT: 73562112b8 Whitespace fixes
REVERT: fa5c0e18e3 Trivial fix to man page
REVERT: 5d2a8b18e5 Merge pull request #557 from hintjens/master
REVERT: f06abca046 Disable failing test for now
REVERT: f909b9c722 plain_mechanism now uses options.as_server - we need to switch to PLAIN according to options.mechanism - we need to catch case when both peers are as-server (or neither is) - and to use username/password from options, for client
REVERT: da1e9a178a Cleaned up test pingpong code
REVERT: 342e576ec8 Merge pull request #556 from hurtonm/master
REVERT: 182a224bb0 Use socket options to select security mechanism
REVERT: fbcbb06b46 Merge pull request #555 from hintjens/master
REVERT: e1f797b048 Added configuration for PLAIN security
REVERT: 8ea779c8f7 Fixed sizeof usage in man pages
REVERT: 593010fbeb Merge pull request #554 from hurtonm/master
REVERT: 4eecda8af3 Implement ZMTP/3.0 PLAIN mechanism
REVERT: d47295db70 Abstract security mechanism
REVERT: 131b0a7148 Merge pull request #553 from hintjens/master
REVERT: e918fd4d69 Use correct libsodium call for detection
REVERT: ff268b7c8a Fixed packaging for Windows - was missing errno sources
REVERT: fa346fddd3 Added configure check for libsodium
REVERT: 3ef3b9405c Merge pull request #552 from hurtonm/master
REVERT: a7032e9ca8 Update test_raw_sock to work with ZMTP/3.0
REVERT: cd4d8bb15a Implement ZMTP/3.0 NULL mechanism
REVERT: df01235871 Merge pull request #551 from hintjens/master
REVERT: cb2ee7a5c2 Fixed up test_iov case
REVERT: 7e129a405c Clarified zmq_msg_close not needed after zmq_msg_send
REVERT: 522765be1e Merge pull request #550 from JonDyte/iovec
REVERT: 56ead84490 Experimental function zmq_recviov doesnt work correctly in a couple of cases 1) VSM - you cannot hand out the 'data' address as it was not allocated on the heap 2) for other messages the 'data' address cannot be handed out either, as it not the address originally returned by malloc and hence cannot be passed to 'free'. see msg.cpp u.lmsg.content = (content_t*) malloc (sizeof (content_t) + size_); .... u.lmsg.content->data = u.lmsg.content + 1;
REVERT: 0bf5a31494 Merge pull request #549 from methodmissing/sigpipe-declare-err
REVERT: b5e5e10126 Fix return code redeclaration for platforms with SO_NOSIGPIPE
REVERT: 9703dd806a Merge pull request #548 from hintjens/master
REVERT: 710f38f1cc Fixed syntax error
REVERT: f4dbccd4fb Fix for LIBZMQ-526
REVERT: 0880d5b8ed Merge pull request #547 from hintjens/master
REVERT: f0cf4095b5 Fixed issue #525 - multipart upstreaming from xsub to xpub
REVERT: d0c58d2409 Merge pull request #546 from hintjens/master
REVERT: 9df7c70aba Cleaned up copyright statements in perftest tools
REVERT: c980820d29 I'm reverting the various changes to the throughput test programs since as far as I can see, these didn't work any more. At the very least, the command line API was broken and forced the user to enter new, exotic arguments. Patches should not break existing APIs. But also, the internals of these programs had become weird.
REVERT: 67e02ca8bc Use of named authors on man pages is no longer a good idea since it puts off contributors and doesn't reflect the real process. I've taken out all named authors and referred to the contribution policy. Hopefully this will improve the contributions to the man pages.
REVERT: f4a07b3951 Merge pull request #545 from hurtonm/master
REVERT: e52c436252 Interoperate with higher versions of ZMTP protocol
REVERT: c5721f9988 Merge pull request #544 from steve-o/libzmq-446
REVERT: d079190efa [#LIBZMQ-446] Silence error on setting PGM_TOS due to some platforms raising an error at runtime. Noted are RHEL 4.
REVERT: d2b5f1f49e Merge pull request #543 from steve-o/vc110_fix
REVERT: a432ea14d2 Add vc80 project dependency on platform.hpp for local & remote throughput tests.
REVERT: cd31f67a80 Add platform.hpp as project dependency to vc100 and vc110 projects for local & remote throughput tests.
REVERT: a3713cb750 Merge pull request #542 from hurtonm/master
REVERT: 9d79ac2830 Use state functions for message flow
REVERT: fd42be9dba Merge pull request #541 from hurtonm/rework_message_flow
REVERT: 7942db7606 Refactor code so that messages go through engines
REVERT: 91f1e13125 Merge pull request #540 from hintjens/master
REVERT: 6d19e400f1 Added clarification about connect on ROUTER
REVERT: c396144216 Merge pull request #539 from TTimo/master
REVERT: 2aec837218 InitializeSecurityDescriptor needs Advapi32.lib
REVERT: 106d962311 restore fixed MSVC 2010 projects, fork new MSVC 2012 projects
REVERT: b5ace90e8e Merge pull request #538 from TTimo/master
REVERT: 44df35cb1e Use Multithreaded DLL Runtime, Debug/Release accordingly - need consistency for the czmq configurations
REVERT: 5973b4c665 Windows friendly replacement for gettimeofday
REVERT: 574fe35b32 Fix MSVC project files.
REVERT: 1e7db60e9a Merge pull request #537 from TTimo/master
REVERT: f8e7d462a6 mingw32 fixes
REVERT: 01fef41575 Merge pull request #536 from hintjens/master
REVERT: 257debf659 Removed IPC endpoint from test; not portable, and fragile (#80)
REVERT: 09a00de803 Merge pull request #534 from hintjens/master
REVERT: 5ba7445b7a Merge pull request #535 from ken-tilera/master
REVERT: 3286bf5ab6 On the Tile architecture, use atomic instructions for atomic ptr and counter.
REVERT: 8c96deb900 Added corporate copyrights
REVERT: 39214b3e40 Merge pull request #533 from mika-fischer/workaround-for-496
REVERT: 03c28411d8 Work around for LIBZMQ-496
REVERT: 3b132e337e Merge pull request #532 from hurtonm/pgm_build_fix
REVERT: 81818401e8 Update PGM with recent changes
REVERT: 16f8ea3e95 Clarified HWM=0 means infinite
REVERT: 9ea20b82cc Merge pull request #531 from murrekatt/master
REVERT: c69e79706e Fix to building libzmq with CMake as sub-project (git submodule).
REVERT: 601eedb7f3 Updated CMake building to work after encoder/decoder changes.
REVERT: c7cb5ab7c0 Merge pull request #530 from hintjens/master
REVERT: f1738b9b92 More copyright cleanups
REVERT: 0e77d65f12 Removed pointless comment
REVERT: 8358d4e832 Renamed ZMQ_DELAY_ATTACH_ON_CONNECT_COULD_THIS_BE_ANY_LONGER to ZMQ_IMMEDIATE
REVERT: 12c7db8c42 Code name clean up
REVERT: d826c53b9b Bumped ZMTP revision to 2
REVERT: 785ef41f67 Refactored codecs to match ZMTP version numbers
REVERT: f0f16505e5 Removed corporate advertisements from source file headers
REVERT: cb69986d74 Comment change
REVERT: 898ad19851 It's its not it's
REVERT: 1810f1025f Merge pull request #529 from guidog/master
REVERT: d78d4972ae Adapted man page to API.
REVERT: ba2dda407d Merge pull request #528 from guidog/master
REVERT: b0b8ab27c5 Changed message structure for event notifications.
REVERT: 656258c1d4 Merge pull request #527 from guidog/master
REVERT: 21eeb03b6c Simplified the zmq_event_t structure for easier access and better usability towards language bindings.
REVERT: 068909f444 Merge pull request #526 from breese/master
REVERT: 7e37cc8ed4 Linux build fails due to undeclared variable
REVERT: be1160832e Merge pull request #525 from pijyoi/master
REVERT: 679869d981 add simple Makefile to build with mingw32
REVERT: 3176509e60 include source directory version of zmq.h and zmq_utils.h
REVERT: 402f9fd243 remote_thr.cpp: port pthreads usage to win32 api
REVERT: f420f0aff7 Merge pull request #524 from dlittleton/master
REVERT: 1e52a451d6 Windows: Fix rounding error when calculating now_us
REVERT: 22d9d95dd2 Merge pull request #523 from ambitslix/perf
REVERT: a22714dd79 Improvements and fixes for performance of PUSH/PULL in local_thr and remote_thr.
REVERT: deb977345c Merge pull request #522 from hintjens/master
REVERT: 066f3d2c9b Fixed overflow in local_thr results calculation
REVERT: fb45685aa8 Merge pull request #521 from SRombauts/master
REVERT: 0ecc96bf33 Adding missing new ZeroMQ_Static.props and Static.props files
REVERT: b3bcd8e323 Static Library Linking for Windows
REVERT: 0434366088 Merge pull request #520 from xantares/master
REVERT: d17567626a Fixed module path with cmake < 2.8.3
REVERT: 25dc715b7b Merge pull request #519 from SRombauts/master
REVERT: 897023c3c1 Merge pull request #518 from hintjens/master
REVERT: a61535a23a VS2008 & VS2010: adding the pre-build command to copy platform.hpp in perf/ directory to the two appropriate projects, for each MSVC version
REVERT: a85c9f45d1 MAXMSGSIZE broke when I cleaned up this code - fixed
REVERT: 157bf4523e VS2010: adding another pre-build command to copy platform.hpp in perf/ directory
REVERT: 23db53d0aa Corrected linking error in MSVC 2010 build
REVERT: ccf2b9b466 Merge pull request #517 from SRombauts/master
REVERT: 57f84d6811 Windows CE support : some more #if !defined _WIN32_WCE
REVERT: 05bb0ead54 Windows CE support : uncommenting #define EACCES needed
REVERT: 41d79bc19e Windows CE support : using standard _WIN32_WCE flag instead of WINCE
REVERT: a5ef50141c Merge pull request #516 from SRombauts/master
REVERT: 927000fe2f Fixed 7 MSVC2008 Compiler Warning (level 3) C4800: 'const int' : forcing value to bool 'true' or 'false' (performance warning)
REVERT: 42be4d13a7 Corrected more linking error in MSVC build
REVERT: a8dfcb3c7d Merge pull request #515 from hintjens/master
REVERT: e628421ed5 Updated NEWS for 3.2.2 stable
REVERT: 08be168dd0 Merge pull request #514 from pijyoi/fixcs
REVERT: 8c71ac47e8 release critical section on failure to create signaler fdpair
REVERT: 7094a70612 Merge pull request #513 from hintjens/master
REVERT: 51cfcb117a Some DNSs will resolve ANY domain name so I made more reliable errors.
REVERT: 9a6b875f21 Merge pull request #512 from montoyaedu/master
REVERT: 1a13554fe0 solved broken tests compilation
REVERT: 6b2304ad97 Merge pull request #511 from mjasperse/patch-2
REVERT: ec04ccba79 Corrected linking error in MSVC build
REVERT: f27eb67e1a Merge pull request #510 from miniway/master
REVERT: 2c1a3c55f7 LIBZMQ-497 there could be unsent bytes in encoder
REVERT: a3ae0d4c16 Merge pull request #509 from hintjens/master
REVERT: 8ab3c4a1bf Fixed issue #500
REVERT: b60689e59d Merge pull request #508 from hintjens/master
REVERT: 309740e197 Fixed issue #499
REVERT: 963c6a8e2f Lots of cleanups to self-tests * Removed or truncated sleeps so the tests run faster * Removed dependencies on zmq_utils * Rewrote a few tests that were confusing * Minor code cleanups
REVERT: c39cb0bde1 Rewrote completely, was bogusly testing EAGAIN
REVERT: 3a558fcc4b Rewrote raw test completely
REVERT: 8c9289342a Fixed use of deprecated zmq_init/term
REVERT: 5f009e5234 Various cleanups to test programs
REVERT: 18a14aedea Added ZMQ_IPV6 option, cleaned up setsockopt code, it was nasty
REVERT: aa21e090e1 Updated .gitignore
REVERT: 049931fc1e Merge pull request #507 from bjoto/master
REVERT: f1e77f2246 Removed heap allocation for in zmq_poll for small item sets
REVERT: 470d06bb9e Merge pull request #506 from arsenm/master
REVERT: e464a91086 Fix using wrong name for windows.h check in cmake
REVERT: e8cbfac966 Merge pull request #503 from chazmcgarvey/define-dummy-eproto
REVERT: abc8907e44 Merge pull request #505 from arsenm/master
REVERT: 93618e7d02 Merge pull request #504 from o172/master
REVERT: f01bab6633 Fix cmake not linking librt to perf-tools
REVERT: 0a1bd45721 Added tests/test_disconnect_inproc to .gitignore
REVERT: 7bc3e53b53 Merge pull request #502 from ianbarber/master
REVERT: ba3e18f700 define a dummy EPROTO for platforms that don't use it
REVERT: d850272417 Add size check on XSUB message sends
REVERT: eeaa2c8e42 Merge pull request #501 from chazmcgarvey/conditional-eproto
REVERT: 2e2ef7fd33 do not use EPROTO on platforms that do not have it
REVERT: 3a632185a6 Merge pull request #500 from haf/fixes/asciidoc-title
REVERT: 7918175717 Shortening the =-chars to make asciidoc work
REVERT: 29a1d8ec60 Merge pull request #499 from minrk/ac_header
REVERT: f467011dbc Merge pull request #498 from minrk/zmq_ctx_term
REVERT: 21c97f0cc2 AM_CONFIG_HEADER -> AC_CONFIG_HEADERS
REVERT: 64c019e24d move configure.in -> configure.ac
REVERT: edd43e1ca4 deprecate zmq_ctx_destroy in favor of zmq_ctx_term
REVERT: 21fc2a9946 Merge pull request #497 from hintjens/master
REVERT: bbc5befc66 Clarified zmq_bind on icp://
REVERT: c2fbb722a4 Merge pull request #496 from amuraru/master
REVERT: 35f18aef74 Fixed newline in test_disconnect_inproc
REVERT: fb0beb6f29 Fixed el5/el6 deps in RPM spec file
REVERT: 7d475add7e Merge pull request #495 from hintjens/master
REVERT: d997d88096 Revert "Old change to move ports off 5555 (was conflicting with other stuff)"
REVERT: aff1406713 Revert "Test cases were failing on bind"
REVERT: a4bedc5255 Whitespace and comment fixes
REVERT: da0efaa817 Old change to move ports off 5555 (was conflicting with other stuff)
REVERT: b0f0d3fcb4 Clarification on zmq_msg_more
REVERT: 12a648db07 Specified that it's safe to call zmq_msg_more after zmq_msg_close
REVERT: ef186fe15b Spelling fixes
REVERT: af934f85ca Removed use of deprecated API methods
REVERT: 8ba097f3da Test cases were failing on bind
REVERT: c1f76e433f Merge pull request #494 from jgm-radez/master
REVERT: d32e392278 allow XSUB/XPUB to send/recv messages unrelated to sub/unsub (LIBZMQ-490)
REVERT: 98a91e852e Merge pull request #493 from arsenm/master
REVERT: 45f504d3e2 Fix looking for rc sources in toplevel binary directory
REVERT: 949d157897 Merge pull request #492 from arsenm/master
REVERT: 6ce464414b Fix typos
REVERT: f770954d30 Fix a couple more warnings
REVERT: 6ecb796e77 Fix warnings with MinGW
REVERT: 1ffc5d11dc Fix some of the -Wshadows
REVERT: 14d3245e02 Fix -Wmismatched-tags
REVERT: edb5a05add Fix -Wmissing-field-initializers
REVERT: 3ebab09ce4 Fix unused argument warnings
REVERT: e88dc49400 Fix random 3 space tabs
REVERT: 59cafecd96 Fix MinGW32 build
REVERT: 3c7d4840a1 Fix NSIS installer errors, MinGW build.
REVERT: a1d6a222ed Generated header is not in ../src/
REVERT: 4704159f73 Fix cmake build with sun studio
REVERT: 74763e2c8e Don't use the toplevel cmake paths so the build works as a subproject
REVERT: f3901b35d4 Comments about ICC build failure with 12.x were crazy
REVERT: 0362c310a5 First pass at getting cmake build to work with non-Windows systems.
REVERT: 73c370dd17 Fix inconsistently using #if or #ifdef instead of #if defined
REVERT: c7009d274e Merge pull request #491 from pijyoi/issue84
REVERT: 1eee9ce035 Merge pull request #490 from pijyoi/master
REVERT: 151a80619b set SO_LINGER on first signaler socket to close in order to avoid TIME_WAIT state.
REVERT: 322808be9c eliminate code moved into zmq_utils.cpp
REVERT: 8dda553ac4 Merge pull request #489 from pijyoi/master
REVERT: 942c654d1c win32: close zmq-signaler-port-sync event object to avoid handle leak
REVERT: ce24557b11 Merge pull request #488 from steve-o/openpgm-next
REVERT: 2e9d4d4132 Pull upstream OpenPGM 5.2.122 for multi-platform minor fixes.
REVERT: 4febe88b2b Merge pull request #487 from miniway/master
REVERT: a0cecc718d returns -1 with EAGAIN when mandatory is set and pipe is full
REVERT: 2a7b219f07 Merge pull request #486 from miniway/master
REVERT: 394d755cf3 return EHOSTUNREACH at full only when mandatory is set
REVERT: 8da6b7a6fd Merge pull request #485 from miniway/master
REVERT: 9382941adc returns EHOSTUNREACH when a peer is full if ZMQ_ROUTER_MANDATORY is set
REVERT: 95d36f42ee Merge pull request #484 from pijyoi/master
REVERT: 6706efba28 fix wrong boolean operator
REVERT: ebd1bf9bcf Merge pull request #482 from sradomski/master
REVERT: 21345ffa50 Break early when pipe to be removed was found
REVERT: f9770e93ef Fixed iterator when erasing from inprocs multimap
REVERT: 624dd1e5b5 Removal of terminated pipes from inproc and ignoring peer ends
REVERT: 66c22456b9 Close pipes for inproc sockets on zmq_disconnect
REVERT: b2f6741bcb Merge pull request #481 from ianbarber/master
REVERT: 75161b5c62 Serialise test_connect_delay
REVERT: 013a99daab Merge pull request #480 from vperron/master
REVERT: 3fc8c7073d Same fix, in-line style
REVERT: 33f42efb48 Change NULL to 0 to keep compatibility with some cross-compiling GCC versions
REVERT: a4a731652a Merge pull request #479 from ianbarber/master
REVERT: 1d11f196b1 Update SPEC file
REVERT: cae5d3b817 Merge pull request #478 from methodmissing/event-messages-3.2
REVERT: d1cbf96cde Merge pull request #477 from hintjens/master
REVERT: e6da46ff8c Added autogen.sh hint
REVERT: 359a505949 Prefer malloc to new for event address allocation as per Martin's recommendation
REVERT: a28322cd0c Merge pull request #476 from hurtonm/master
REVERT: a8721c3c04 Check decoder's state function for NULL before calling it
REVERT: b1f4850153 Let socket event messages initialize with zmq_msg_init_data and let the framework handle cleanup
REVERT: f78ca629b5 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 8db8c45b18 Merge pull request #475 from ianbarber/master
REVERT: be4cc2f80a Update zmq_tcp to include a reference to RFC
REVERT: 7e6c304a98 Merge pull request #474 from hintjens/master
REVERT: 1489857973 Fixed ZMQ_SNDHWM description
REVERT: 7533ebb33d Clarified that SNDHWM is per part, not message
REVERT: 6d245eb6bc Copy monitor specific event endpoints to event messages as the engine etc. can be released at anytime
REVERT: ce4d321684 Revert "Merge pull request #473 from methodmissing/fix-engine-endpoint"
REVERT: 1a18c7b0a8 Merge pull request #473 from methodmissing/fix-engine-endpoint
REVERT: fdf162a117 [LIBZMQ-450] Copy the stream engine endpoint - string reference caused memory corruption
REVERT: bef9a41bdb Merge pull request #472 from jgm-radez/master
REVERT: b8d5d3fa69 Issue 468
REVERT: 01b9bc3663 Merge pull request #471 from methodmissing/fix-disconnect-event-addr
REVERT: 5205415beb Fix addresses on triggered events
REVERT: 37f8ce69c1 Merge pull request #470 from cdolan/master
REVERT: 6559da3033 Use memset/memmove rather than bzero/bcopy
REVERT: 30eaadddc3 Merge pull request #469 from hurtonm/code_cleanup
REVERT: 9013ee0d52 Minor code cleanup
REVERT: c179ad1173 Merge pull request #468 from hurtonm/issue_465
REVERT: c543b2ce8c Resolve LIBZMQ-465
REVERT: 99f714445f Merge pull request #467 from hurtonm/code_cleanup
REVERT: 66dc4d8b54 Don't pass flags to xrecv method
REVERT: 7865f96e97 Don't pass flags to xsend method
REVERT: 793895c477 Merge pull request #466 from hurtonm/code_cleanup
REVERT: b78800e467 Simplify implementation of DEALER socket
REVERT: d1e0889ab0 Merge pull request #463 from hintjens/master
REVERT: 3eaf4a967c Merge pull request #465 from steve-o/cmake-minor
REVERT: 19a8ea4584 Update source list with raw codec.
REVERT: 3ba401d7da Bring along CMake patchset from zeromq3-x for adding minor version to Windows labeling.
REVERT: de339785f2 Merge pull request #464 from hurtonm/code_cleanup
REVERT: ea19b7b658 Small cleanups
REVERT: 925a530663 Use const_cast operator to remove const modifier
REVERT: 82999f2d20 Don't forward identities to DEALER sockets
REVERT: 6290054f00 Added ROUTER-ROUTER as legal combination
REVERT: ec0824142e Merge pull request #462 from hurtonm/raw_fixes
REVERT: c1e960b31d Never exchange identities for sockets in raw mode
REVERT: aec47b3642 Extend ZMQ_ROUTER_RAW test
REVERT: 872ef76f3c Added DEALER-DEALER as legal combination
REVERT: 4e028ecb30 Merge pull request #461 from hurtonm/code_cleanup
REVERT: e51a1f04c9 session_base: code cleanup
REVERT: 5da971275d Merge pull request #460 from hintjens/master
REVERT: 777c38ae32 Renamed raw option to ZMQ_ROUTER_RAW
REVERT: 80aef8dfda Merge pull request #459 from hurtonm/issue_459
REVERT: 41dc2e6049 Resolve LIBZMQ-459
REVERT: 1348924251 Merge pull request #458 from vortechs2000/remove_cpp_comments_from_zmq_h
REVERT: f67a199332 Older versions of C compilers don't like C++ comments
REVERT: 2deb2e095e Merge pull request #457 from mjasperse/patch-1
REVERT: 1e60d17a23 Update builds/msvc/libzmq/libzmq.vcproj
REVERT: cdd7cd10c9 Merge pull request #456 from hurtonm/issue_464
REVERT: 7c66e8f807 Resolve LIBZMQ-464
REVERT: 04e716ac99 Merge pull request #455 from hintjens/master
REVERT: 79da450b8b Fixed formatting in man page
REVERT: 0404b3b60a Merge pull request #454 from hurtonm/code_cleanup
REVERT: 9d8eb1f9b9 Style fixes
REVERT: abbe34cdc2 Merge pull request #453 from hurtonm/issue_458
REVERT: d16e0a5342 Resolve LIBZMQ-458
REVERT: 4bc405a366 Merge pull request #452 from hshardeesi/master
REVERT: 7523b9ed29 Merge pull request #451 from hurtonm/use_correct_types_in_stream_engine
REVERT: dcf0693d6e Merge pull request #450 from hurtonm/issue_447
REVERT: 3aa30329d1 Use correct types when returning value in read/write methods
REVERT: 03deb2c97a Resolve LIBZMQ-447
REVERT: 83387b4073     Added support for non-zmq tcp client connections to router socket.     - Created a new option ZMQ_ROUTER_RAW_SOCK     - Added new raw_encoder and raw_decoder to receive and send messages in raw form to remote client     - Added test case file tests/test_raw_sock.cpp
REVERT: 19f77a1ccf Merge pull request #449 from hintjens/master
REVERT: 0bf8a4d2d2 Code formatting
REVERT: 6b45262086 Merge pull request #448 from jgm-radez/master
REVERT: 500f6cffe3 patch for issue 456
REVERT: bb59dc1b2a Merge pull request #447 from hintjens/master
REVERT: 171897f4e8 Cleanups to man pages
REVERT: 0b13872ff4 Merge pull request #446 from hurtonm/issue_452
REVERT: 01be614593 Merge pull request #445 from hurtonm/issue_417
REVERT: ef794925b4 Resolve LIBZMQ-452
REVERT: 4824237761 Resolve LIBZMQ-417
REVERT: d2ee38acfe Merge pull request #444 from vortechs2000/fix_aix
REVERT: 422c418a15 Move socket_base.hpp and err.hpp after poll.h include
REVERT: 2675a9d31b Merge pull request #443 from hintjens/master
REVERT: 4ba34c9d70 Whitespace and style fixes
REVERT: 7abb6ccb6a Merge pull request #442 from hintjens/master
REVERT: 066606322c Added unbind/disconnect man pages, notes to deprecated methods
REVERT: ee21fac8b8 Added ZMQ_FAIL_UNROUTABLE alias back as deprecated
REVERT: a3889d00c3 Fixed issue #451
REVERT: 45c063725b Fixed issue #449
REVERT: 7f63fc6579 Merge pull request #441 from hintjens/master
REVERT: 96811575c3 Fixed issue #448
REVERT: 9bab346690 Merge pull request #440 from hintjens/master
REVERT: 3a43bd7354 Several include files were missing
REVERT: 6e676af45e Merge pull request #439 from hintjens/master
REVERT: 351eff5448 Bumped version to 3.3.0
REVERT: 8e7892b72f Upated version for next release
REVERT: a7b2e9d017 Upated NEWS for 3.2.1
REVERT: cdcaca2dc4 Merge pull request #438 from steve-o/master
REVERT: c62fb89ed8 Update to libzmq source set.
REVERT: 7a1a5f9f7f Update AsciiDoc version details with CMake detected ZeroMQ version.
REVERT: 8ddb9fc7ea Enable parallel make and LTO by default.
REVERT: dfe7d15a88 MSVC11 not getting defined in CMake 2.8.9, punt to version string.
REVERT: ebe4eab477 Detect compiler version to tag libraries.
REVERT: 046c8ec7eb Add metadata to CMake options; mark executables advanced to hide from default view; fix WoW64 redirections.
REVERT: 56bb3df1f6 Detect ZeroMQ version at build time; hide NSIS dependencies in new cmake folder.
REVERT: b42e45adb8 Make OpenPGM a CMake option, default disabled.
REVERT: c53cf0d239 Minor refactor of CMake build script.
REVERT: 000d1a5fba Update CMakeLists.txt
REVERT: 58f7c2179f added artificacts for windows and openpgm build
REVERT: 73537e67e3 Merge pull request #437 from rohanbedarkar/master
REVERT: 93a7a37893 fixed trailing whitespace
REVERT: a438e63498 explicit comments on multicast loopback
REVERT: 11c22912d7 commented out TOS related opt for PGM
REVERT: 1ef63bc2ad Merge pull request #436 from hintjens/master
REVERT: 983ee761b1 Renamed ZMQ_ROUTER_BEHAVIOR to ZMQ_ROUTER_MANDATORY for clarity
REVERT: db690e3d99 Merge pull request #435 from hintjens/master
REVERT: f87bf38293 Fixed issue #443
REVERT: e41e071b05 Merge pull request #434 from vaughan0/master
REVERT: ce53fe0337 Minor documentation fix: zmq_msg_recv instead of zmq_msg_send
REVERT: d6e0ae24f3 Prepared for release 3.2.1
REVERT: 2440863292 Merge pull request #433 from michelp/reject-no-fds-avail
REVERT: b84d0119b5 Ported from libxs revision 123c0f5387ecef287dd11f4dc790fb76ee1c0f67
REVERT: 81482ec84a Merge pull request #432 from hurtonm/master
REVERT: 82d7238f08 Make socket IO more robust
REVERT: 343ec62282 Merge pull request #431 from ipechorin/master
REVERT: 5b83fe778c Merge pull request #430 from ipechorin/master
REVERT: 725f141fd7 Fix LIBZMQ-211: REP socket asserting when getting malformed request
REVERT: a49e392e34 Merge pull request #429 from ipechorin/dcf683aacb533634c273bb2f51fa3ceaadf89202
REVERT: 9b58372a38 Fix compilation using MSVC 2008: its <algorithm> defines wrong min/max without NOMINMAX
REVERT: 396b4e3046 Fix compilation using MSVC 2008: stdint.h is not present in this compiler
REVERT: 4de27b6c10 Update MSVC2008 project after recent renames and additions
REVERT: 2eb849ccda Merge pull request #428 from ipechorin/9056c13e1ebbfd7798ddd7b5cfdb9950933c710e
REVERT: dcf683aacb Update MSVC2010 project after recent renames and additions
REVERT: 9056c13e1e Use <stdint.h> shipped with Visual Studio 2010 and later
REVERT: ff264cb044 Merge pull request #427 from ianbarber/master
REVERT: afa4933c1e Init message in drop subscription
REVERT: 2a209140f7 Merge pull request #426 from methodmissing/fix-monitor
REVERT: b1776e234b Merge branch 'master' into fix-monitor
REVERT: a6c6054ef2 Merge pull request #425 from Astellar/zmq_msg_t
REVERT: 7bf516ded7 zmq_msg_t will now typedef a named struct.
REVERT: 8a57e4a5d7 Merge branch 'master' into fix-monitor
REVERT: 759d453368 Significantly reworked the monitoring infrastructure with a more granular per socket API and to play well with monitoring endpoints in application threads
REVERT: d981c91f80 Merge pull request #424 from vaughan0/patch-1
REVERT: f6a840b65b Update doc/zmq_msg_get.txt
REVERT: 86eb7bcae0 Merge pull request #423 from jmgao/patch-1
REVERT: 67d88bcb41 Add pthread.h include to test_connect_delay.cpp
REVERT: 7a40df6d3a Merge pull request #422 from hintjens/master
REVERT: 5db28752f3 Removed 'device' concept and introduced proxies * zmq_device is now a wrapper that calls zmq_proxy * zmq_proxy adds capture socket
REVERT: f074f6b6b9 Merge pull request #412 from Quuxplusone/test-release-builds-too
REVERT: cf20932df0 Add "#undef NDEBUG" to all tests.
REVERT: aaac4b84cb Code cleanups
REVERT: 84728cd961 Merge pull request #421 from hurtonm/master
REVERT: 2a41c8d7b4 Simplify initial handshaking
REVERT: 3f6148abdf Implement new message encoder/decoder
REVERT: 8672f5829e Introduce abstract interface for message encoder/decoder
REVERT: a224c97329 Merge pull request #420 from ianbarber/master
REVERT: d7331b7b1f Fixing PGM issues
REVERT: d0687876c0 Merge pull request #419 from hurtonm/code_cleanup
REVERT: 9d17ead33d Remove superfluous statement
REVERT: 7e6db47e65 Remove unused member variable
REVERT: 9143ac5156 Merge pull request #418 from hurtonm/versioned_ztp
REVERT: d9307c9ff0 Make ZMQ interoperate with ZMQ 2.x SUB sockets
REVERT: dfc0222ee6 Decouple encoder_t and decoder_t from session_base_t
REVERT: 1bca4f6f03 Extend ZTP/1.0 protocol
REVERT: 6347f8b0c9 Merge pull request #416 from hintjens/master
REVERT: ab8248847c Fixed license to remove references to X11 code
REVERT: c959f526f1 Merge pull request #415 from Quuxplusone/unused-parameters
REVERT: 08f6a9e7e8 Remove unused argc/argv parameters in tests.
REVERT: c29aef4dd8 Verify the value of the "void *s" passed to the monitor function.
REVERT: 3b984d40e9 Silence all "unused parameter" warnings from Clang.
REVERT: 7fa4d423b8 Fix char_traits<unsigned char> to what looks like correct behavior.
REVERT: f6fe600eef Merge pull request #414 from ianbarber/master
REVERT: fd67cd810a Update ROUTER_BEHAVIOR documentation
REVERT: 95c018c0d3 Use full endpoint string in monitor response
REVERT: 94835581a4 Remove early return on terminated state
REVERT: 206e5f6f44 Incorrect function name in socket_base
REVERT: f028379c1c Incorrect var name in monitor_event
REVERT: 8bf541b252 Fixing incorrect argument order on va_start
REVERT: 4a43a0d074 Merge pull request #413 from Quuxplusone/static-analysis
REVERT: 7fadd708a0 Fix monitor_event() to work at all.
REVERT: 537a802788 Add a missing null-check, turning a segfault into an assertion.
REVERT: 6347d392fd Fix a bug in pipe_t::flush().
REVERT: 0886b7a26b Silence a compiler warning.
REVERT: a48751b34b The "count_" out-parameter is doubled instead of unchanged.
REVERT: d588dbf27c Merge pull request #410 from Quuxplusone/LIBZMQ-414
REVERT: 033e311d66 Merge pull request #411 from Quuxplusone/fix-test_monitor-bug
REVERT: f718d2bead Fix a bug reported on the mailing list.
REVERT: 28c9255d46 Fix an error in the inline assembly for Thumb2.
REVERT: 12833804c9 Merge pull request #409 from hurtonm/master
REVERT: 1ab85f471a Exchange greeting messages for all socket types
REVERT: b32542e396 Merge pull request #403 from methodmissing/efault-zmq-poll
REVERT: 040d4d322d Merge pull request #408 from teotwaki/master
REVERT: a622328a9c Fix reordering compile errors
REVERT: 5637ed08a5 Merge pull request #407 from methodmissing/LIBZMQ-399
REVERT: 9dc248f6ab Fix invalid address metadata for ZMQ_EVENT_DISCONNECTED
REVERT: 1f22954762 Merge pull request #406 from hurtonm/master
REVERT: 9fab9937e5 Fix issue #406
REVERT: 84560c1607 Merge pull request #405 from jimenezrick/master
REVERT: 92bee5a6db Fix LIBZMQ-404: zmq_term not truly re-entrant
REVERT: 631e12d4e5 Merge pull request #404 from mimetnet/master
REVERT: a0eb0bb7e6 signaler.cpp's Windows Lock should be in the "Global" namespace
REVERT: 83537916f8 Fix issue 335
REVERT: 556074d438 Revert zmq_poll NULL poll items check to 2.2 behavior - let the poll items count filter out empty poll sets and not return a sometimes unexpected EFAULT error status
REVERT: 9be0c7e4b5 Merge pull request #402 from hurtonm/master
REVERT: 92827e45ee Small code cleanup
REVERT: bea0b4817b Merge pull request #401 from hurtonm/master
REVERT: 62b5b914f5 Always mark socket as retired when closing ipc_listener
REVERT: 43ee4396cf Merge pull request #400 from hurtonm/master
REVERT: c84ca01e95 Be more conservative about when to generate ZMQ_EVENT_CLOSE_FAILED
REVERT: 0533fb1ce1 Merge pull request #399 from hurtonm/master
REVERT: 6ac5cf8697 Simplify code for writer activation in Router socket
REVERT: f8752bf9fc Merge pull request #398 from hurtonm/master
REVERT: e37814eca4 Rewrite event processing in io_thread
REVERT: 823d14c7fc Merge pull request #397 from hurtonm/master
REVERT: 37d1e84467 Merge pull request #396 from hintjens/master
REVERT: 86eaa9c8e7 Rewrite process_command's loop
REVERT: 8d64fc6af8 Reverted fix for #393, was already fixed
REVERT: 73f960e739 Merge pull request #395 from hintjens/master
REVERT: 9aa8452b80 Fixed issue #393, compilation warnings
REVERT: 77dd0a6fba Merge pull request #394 from hintjens/master
REVERT: 8d96a43975 Fixed documentation of HWM on ZMQ_PULL
REVERT: e7f59297d0 Merge pull request #393 from cyrilh/master
REVERT: 01919774dc Making Android&pyzmq friendly version with avoid-version
REVERT: 1ff5af098a Merge pull request #392 from hurtonm/master
REVERT: 1b0e6ef8b4 mtrie: Code simplification
REVERT: 692648de96 mtrie: Do not throw exception on allocation failure
REVERT: e471e5b401 Merge pull request #391 from methodmissing/monitor-manual-format
REVERT: 9ccbeb84fa Let docs for zmq_ctx_set_monitor() respect a 80 char wide column width
REVERT: 6a1bd3e1e7 Merge pull request #390 from hurtonm/master
REVERT: 26e14d3064 Small code simplification
REVERT: 6f1229be6f Merge pull request #389 from hurtonm/master
REVERT: f8293df4c5 Fix a bug in trie implementation
REVERT: c251d940b3 Merge pull request #388 from minrk/forward-iovec
REVERT: a178817141 forward-declare struct iovec
REVERT: b57b7debaa Merge pull request #386 from steve-o/err-handler
REVERT: fc335c59ea Fix missing ENETRESET for Jira #LIBZMQ-329.
REVERT: c60b0f579d Merge pull request #385 from jdc8/master
REVERT: 85c19f1269 added missing files to MSVC10 solution file: tcp.cpp, tcp.hpp
REVERT: 98ee759dad Added missing semi-colon.
REVERT: eb16f6b88e Merge pull request #384 from steve-o/err-handler
REVERT: 5b3d0c633d Add errno fallback values for MSVC2008.
REVERT: 7bbccdeac9 Merge pull request #383 from Kobolog/master
REVERT: 08749c8e7b Removed an unneeded include in tests
REVERT: 6da48aed3a Fixed tests
REVERT: 829d0003be Verbose ROUTER socket behavior patch
REVERT: 21eb8c8fa5 Merge pull request #382 from hurtonm/master
REVERT: 7d99129411 Fix open_socket to return -1 (INVALID_SOCKET on Windows) on error
REVERT: 7753379eab Merge pull request #381 from hurtonm/connecter_cleanups
REVERT: 919bd9628d {tcp|ipc}_connecter: check whether socket is valid before closing it
REVERT: ec9f8994a7 Simplify {tcp|ipc}_connecter
REVERT: e0fed9d29a Simplify {tcp|ipc}_connecter
REVERT: c8d0d68471 Merge pull request #380 from jlopex/master
REVERT: eb6c668c2a libzmq3.x not compiling on Android crosscompiler
REVERT: 67ab3390ec Merge pull request #379 from hitenp/doc-changes
REVERT: a96dcfb29a Correct typo: add missing single quote.
REVERT: 426ea71697 Merge pull request #378 from steve-o/err-handler
REVERT: acbb99383f Add additional Windows Sockets Error Codes.
REVERT: f35bed0edc Merge pull request #377 from hurtonm/master
REVERT: 75d67286cc {tcp|ipc}_listener: close socket when set_address () fails
REVERT: a9507cc267 Merge pull request #376 from ianbarber/master
REVERT: c7c834a945 Add unistd header to test_connect_delay header
REVERT: dc9749fc67 Merge pull request #375 from ianbarber/master
REVERT: 35c55a2cde Add newline to end of test_connect_delay file
REVERT: 9e1e68ef16 Merge pull request #374 from steve-o/branding
REVERT: b2e56c5e4f Add ZeroMQ branding.
REVERT: 076e081de2 Merge pull request #373 from ianbarber/master
REVERT: e1cc2d4a41 Merge pull request #372 from ianbarber/manfix
REVERT: bc9ae715c3 Add asserts and rename pipe set
REVERT: 704b952274 Add reference to the inproc documentation
REVERT: 7b78ed9d60 Update bind and connect documentation for clarity
REVERT: e5904e63ce Allow blocking while connect() is completing
REVERT: 409d5e8fff Allow blocking while connect() is completing
REVERT: 95cbad3841 Revert "After speaking with Ben Gray and the discussion on the mailing list, this is an attempt to create a sockopt to allow connecting pipes to not immediately be available for traffic. The problem is in a PUSH to many PULL situation, where there is a connect to a PULL which is not there. This connect will immediately create a pipe (unlike bind), and traffic will be load balanced to that pipe. This means if there is a persistently unavailable end point then the traffic will queue until HWM is hit, and older messages will be lost."
REVERT: a563d494bb Revert "Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word"
REVERT: cc230cfe60 Revert "And another typo on the same comment"
REVERT: 5b167aa896 Revert "Remove the extra outpipe handling as the session is quite capable of delaying the creation of the pipe until the connection has happened. Simply don't build the pipe, and let it do that automatically."
REVERT: 81b8362a59 Revert "Fix a number of whitespace issues in various parts of the code, add validation to most calls on the test and take a first stab at implementing the reconnection pipe blocking."
REVERT: 48d3977632 Revert "Fix condition so that PGM and EPGM sockets always create pipes immediately, even if delay_attach_on_connect is set. This allows passing through the icanhasall flag, and is realistic given the fact those protocols should be able to connect immediately"
REVERT: 6c382c5c61 Revert "Fix whitespace in test"
REVERT: 72bae207a3 Revert "Rebinding on reconnection to allow for the pipe blocking will set the event sink again, which will cause an assert to be triggered. I have modified that to allow for setting the same sink to be OK. I believe this should be ok - on termination, if a pipe hasn't reconnected, it would just attempt to be erased from the pipes list again, which is reasonable"
REVERT: f0920caf02 Revert "On the advice of Martin Hurton, removed the new command type and just terminated the pipe in a reconnect situation, and notified the socket of the same. This handles the blocking properly, but at the cost of potentially losing in flight messages. However, this is a reasonable trade off given how much simpler it makes the patch."
REVERT: b020bd4ba8 Revert "Remove unnecessary extra test in pipe assertion - now we are terminating pipes we don't need to allow the case in which a pipe is rebound to the same sink"
REVERT: 956cfd9f75 Revert "Fix incorrect whitespace in if statement"
REVERT: 74175decb4 Revert "Removing unnecessary outpipe values that had been used for reconnecting existing pipes - no longer needed when using a pipe term for the delay_attach situation."
REVERT: 440af0022d Revert "Restoring comment for clarity"
REVERT: 8968b294e0 Revert "When detaching a pipe, as well as checking the delay on connect sockopt is set, also ensure that the protocol is not pgm or epgm as we are not implementing the functionality for multicase types"
REVERT: 836fa4b7ca Revert "The previous code to block the socket from receiving on that pipe during a disconnect was vulnerable to a race condition. This code calls with the terminate functions of both ends of the pipe - I believe this should be safer. This required storing a pointer to the socket end of the pipe"
REVERT: 2c6f26153e Revert "Reverted to a simpler shutdown. This seems to disconnect and reconnect the pipe properly, but there is a problem in overall shutdown when the pipe has blocked and reconnected - the session seems to get terminated() called on it only in shutdown for the original pipe, by which point it has been replaced. I am not sure at the moment why this only happens then, but this does mean this patch is broken at the moment"
REVERT: 3ae68d67a4 Revert "Use the hiccup mechanism to notify the socket end of the pair of the change in state, and have it shutdown that end, and shutdown the local end normally. This seems to resolve the shutdown and race condition issues."
REVERT: f5a072fee1 Revert "Code formatting, and clean up so that xhiccuped is only handled in case the pipe isn't terminating"
REVERT: 6eeaf15179 Revert "Remove unnecessary condition in assert"
REVERT: c9926f6f24 Revert "As Martin pointed out, there is a race condition in the old code where a pipe could start shutting down after disconnection, but the new one could connect first. This connection would not get a pipe created for it, so the messages could never flow. The simplest way round this would be a flag, but it is possibly for a very bouncy but fast connection to go up and down twice I imagine, so instead I have added a counter. This starts at zero, and will null out the pipe if terminate is called while it is zero. On a disconnect situation the counter is incremented, and the pipe is the not nulled if the value is non zero. In the terminated function it is decremented for each pipe that is shut down, and the assertion that the terminated pipe == the current pipe is skipped while it is non-zero. This should deal with the race condition and not allow any extra terminated() calls without hitting the assertion."
REVERT: 19da88be67 Revert "Filter read and write activated calls from the pipe to the session, and delay shutdown in terminated until the final pipe is shutdown."
REVERT: 4aaf3e6389 Revert "Add disconnect test"
REVERT: eb14890d23 Revert "Revert "Merge branch 'master' of github.com:ianbarber/libzmq""
REVERT: bdd4e1351d Revert "Revert "Merge branch 'master' of github.com:zeromq/libzmq""
REVERT: 029d3dfae2 Revert "Merge branch 'master' of github.com:ianbarber/libzmq"
REVERT: dde69fb9fb Revert "Merge branch 'master' of github.com:zeromq/libzmq"
REVERT: 6117a2b099 Revert "Replace incomplete count with a std::set"
REVERT: 4aa5ba3d11 Replace incomplete count with a std::set
REVERT: 7b10586558 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 3345902979 Merge branch 'master' of github.com:ianbarber/libzmq
REVERT: b448de926b Merge pull request #371 from hurtonm/fix_race_condition_in_connecters
REVERT: 3ec8e576d9 Fix race conditions in {tcp,ipc}_connecter
REVERT: d8f3487ee1 Add disconnect test
REVERT: a90c1db7d2 Filter read and write activated calls from the pipe to the session, and delay shutdown in terminated until the final pipe is shutdown.
REVERT: a5f7300da6 As Martin pointed out, there is a race condition in the old code where a pipe could start shutting down after disconnection, but the new one could connect first. This connection would not get a pipe created for it, so the messages could never flow. The simplest way round this would be a flag, but it is possibly for a very bouncy but fast connection to go up and down twice I imagine, so instead I have added a counter. This starts at zero, and will null out the pipe if terminate is called while it is zero. On a disconnect situation the counter is incremented, and the pipe is the not nulled if the value is non zero. In the terminated function it is decremented for each pipe that is shut down, and the assertion that the terminated pipe == the current pipe is skipped while it is non-zero. This should deal with the race condition and not allow any extra terminated() calls without hitting the assertion.
REVERT: 841cf69eb7 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: ace8f753e1 Merge pull request #370 from hurtonm/code_cleanup
REVERT: 1f53697211 Use struct keyword consistently with sockaddr and sockaddr_in
REVERT: e9bfd76f87 Merge pull request #368 from hurtonm/code_cleanup
REVERT: 66b7edfbd1 Merge pull request #367 from hurtonm/issue_309
REVERT: 602c50117c Small code simplification
REVERT: 796212a985 Fix the message decoder to ignore reserved flags.
REVERT: 3053f7e368 Remove unnecessary condition in assert
REVERT: 5da289cd5b Code formatting, and clean up so that xhiccuped is only handled in case the pipe isn't terminating
REVERT: 0bf1d0262e Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 67497a2643 Use the hiccup mechanism to notify the socket end of the pair of the change in state, and have it shutdown that end, and shutdown the local end normally. This seems to resolve the shutdown and race condition issues.
REVERT: b0792ec78a Merge pull request #366 from hitenp/tcp-consolidate
REVERT: db13fbf4a9 Consolidate TCP-specific common code into their own files.
REVERT: 1c6592157b Merge pull request #365 from hitenp/master
REVERT: 31cb1f297d Change connection failure test to use an invalid hostname
REVERT: b84b007981 Reverted to a simpler shutdown. This seems to disconnect and reconnect the pipe properly, but there is a problem in overall shutdown when the pipe has blocked and reconnected - the session seems to get terminated() called on it only in shutdown for the original pipe, by which point it has been replaced. I am not sure at the moment why this only happens then, but this does mean this patch is broken at the moment
REVERT: 889b0e6f29 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 1dcedf7ab1 Merge pull request #364 from AlexBio/fix_unused_variable
REVERT: 8643d71ee8 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 3db9bf31b3 Merge pull request #363 from AlexBio/fix_nosigpipe_check
REVERT: 4bd78bb4cf Check if SO_NOSIGPIPE is defined
REVERT: 271ced98cf Remove unused variable which causes build to fail with -Werror
REVERT: f611c57c48 Merge pull request #362 from hintjens/master
REVERT: e5bb5a60f4 Bumped version to 3.3.0
REVERT: 336f72720a The previous code to block the socket from receiving on that pipe during a disconnect was vulnerable to a race condition. This code calls with the terminate functions of both ends of the pipe - I believe this should be safer. This required storing a pointer to the socket end of the pipe
REVERT: 5008f385ba When detaching a pipe, as well as checking the delay on connect sockopt is set, also ensure that the protocol is not pgm or epgm as we are not implementing the functionality for multicase types
REVERT: 4d4674e088 Merge pull request #360 from vortechs2000/fix_hpux
REVERT: 09d18e4b3c Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: f8b79f888f Merge pull request #361 from vortechs2000/fix_aix7
REVERT: 897b6b58ea Merge pull request #359 from vortechs2000/fix_older_linux_gcc
REVERT: 97c48ccda6 Fix build on HPUX 11iv3
REVERT: 3687789f9d Fix build on RHEL5 and SLES10
REVERT: 616bcf9fc2 Fix up build on AIX7
REVERT: 09956dee93 Restoring comment for clarity
REVERT: ace7c99b91 Removing unnecessary outpipe values that had been used for reconnecting existing pipes - no longer needed when using a pipe term for the delay_attach situation.
REVERT: 55cbdfcf26 Fix incorrect whitespace in if statement
REVERT: 29f8d9ca15 Remove unnecessary extra test in pipe assertion - now we are terminating pipes we don't need to allow the case in which a pipe is rebound to the same sink
REVERT: c13f1d52ff On the advice of Martin Hurton, removed the new command type and just terminated the pipe in a reconnect situation, and notified the socket of the same. This handles the blocking properly, but at the cost of potentially losing in flight messages. However, this is a reasonable trade off given how much simpler it makes the patch.
REVERT: 1566091bc6 Rebinding on reconnection to allow for the pipe blocking will set the event sink again, which will cause an assert to be triggered. I have modified that to allow for setting the same sink to be OK. I believe this should be ok - on termination, if a pipe hasn't reconnected, it would just attempt to be erased from the pipes list again, which is reasonable
REVERT: 0b3478d6ec Fix whitespace in test
REVERT: b5ace39e2a Fix condition so that PGM and EPGM sockets always create pipes immediately, even if delay_attach_on_connect is set. This allows passing through the icanhasall flag, and is realistic given the fact those protocols should be able to connect immediately
REVERT: 6f6466f088 Fix a number of whitespace issues in various parts of the code, add validation to most calls on the test and take a first stab at implementing the reconnection pipe blocking.
REVERT: 06485d9200 Remove the extra outpipe handling as the session is quite capable of delaying the creation of the pipe until the connection has happened. Simply don't build the pipe, and let it do that automatically.
REVERT: 297af95451 And another typo on the same comment
REVERT: b79aaaf473 Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word
REVERT: f687a2989b Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 98ef56039e Merge pull request #358 from steve-o/issue-320-author
REVERT: 0f58a98b3e Merge branch 'issue-320' of https://github.com/steve-o/libzmq into issue-320-author
REVERT: 320684ef39 Return error on invalid PGM url instead of raising assertion (Douglas Young). Fix Win32 build.
REVERT: fe3fb419fe After speaking with Ben Gray and the discussion on the mailing list, this is an attempt to create a sockopt to allow connecting pipes to not immediately be available for traffic. The problem is in a PUSH to many PULL situation, where there is a connect to a PULL which is not there. This connect will immediately create a pipe (unlike bind), and traffic will be load balanced to that pipe. This means if there is a persistently unavailable end point then the traffic will queue until HWM is hit, and older messages will be lost.
REVERT: c28af41ca4 Merge pull request #356 from hurtonm/code_cleanup
REVERT: bc150de81e Merge pull request #355 from hurtonm/fq_lb_fix
REVERT: 89ff277bec lb: code cleanup
REVERT: 2973eaf446 Prevent connection starvation
REVERT: 4e7be102f4 Merge pull request #354 from steve-o/issue-320
REVERT: 13976a3d65 Return error on invalid PGM url instead of raising assertion. Fix Win32 build.
REVERT: 32befeb0a6 Merge pull request #353 from steve-o/master
REVERT: 75df0194bf Fix title on zmq_disconnect manpage.
REVERT: 1adb7b1017 Merge pull request #352 from hurtonm/issue_370
REVERT: 7fe45af30f Fix issue #370
REVERT: f7bd543c36 Merge pull request #351 from hurtonm/code_cleanup
REVERT: 24b79c7e0b Prefer errno_assert/alloc_assert to zmq_assert
REVERT: 013967681d fq: code cleanup
REVERT: 8152502f69 Merge pull request #350 from hurtonm/issue_369
REVERT: 130dfc5b5f Fix issue #369
REVERT: e30e48c23e Merge pull request #349 from hintjens/master
REVERT: 2ab12efe11 Fixing issue #361
REVERT: 3a76d246a8 Merge pull request #348 from hurtonm/code_cleanup
REVERT: d0b9005ef0 Don't assume SOCKET_ERROR is -1 on Windows
REVERT: ac53f1a728 Remove unnecessary casts
REVERT: e0534643fa Simplify error handling in tcp_connecter
REVERT: 13ef1e4f26 Make wsa_error_to_errno pure function
REVERT: a8f9a0d891 Use zmq_assert rather then assert
REVERT: 52ed4cdccf Remove dead code
REVERT: 7cfd03ba72 Remove unplug from i_engine interface
REVERT: 5db30fe991 Merge pull request #347 from methodmissing/monitor-doc-fails
REVERT: b85ff17822 Fix too long underline in monitor docs
REVERT: 74af2f9402 Merge pull request #346 from methodmissing/monitor-regressions
REVERT: 400f6f3863 Rename monitor documentation source file to match zmq_ctx_set_monitor() API
REVERT: 22b4388e29 Merge pull request #345 from methodmissing/monitor-regressions
REVERT: 1e92ee0a0e Oust last remaning ZMQ_MONITOR reference from NEWS as well
REVERT: adf7a7ade1 Merge branch 'master' into monitor-regressions
REVERT: 991b7fcc04 Rename zmq_monitor to zmq_ctx_set_monitor for compat with existing context specific APIs
REVERT: 04f0e7f26e Documentation for zmq_monitor
REVERT: 20152a6e3e Merge pull request #344 from hintjens/master
REVERT: 604456a8b0 Man page for zmq_ctx_new had error, fixed
REVERT: f27c02d01e Change context monitor_event prototype to accept a va_list instead
REVERT: 4767159f39 Initial stab at a context level monitor callback and registration API
REVERT: 7cb19fbf1c Merge pull request #343 from jimenezrick/master
REVERT: 65b6351e4a Merge pull request #342 from ipechorin/master
REVERT: 0e053e3478 Doc improvement: document interface omission in zmq_pgm.txt
REVERT: e13b3723b8 Rename type zmq_monitor_fn -> zmq_monitor for a more natural callback definition API (zmq_monitor type, monitor.function callback)
REVERT: 06cce15479 Change zmq_monitor_fn type to cast between pointer-to-object and pointer-to-function in a more standards compliant way
REVERT: d25dce9df9 Solaris/SunCC build fix: could not find a match for std::multimap<...>::insert(std::pair<...,...>)
REVERT: 5ef63318f8 Merge pull request #341 from kennytm/master
REVERT: c995de6584 Allow the ZMQ_MONITOR code compilable on gcc 4.7 on Linux.
REVERT: 89d5054e59 Merge pull request #340 from methodmissing/events
REVERT: d0461752ff Merge branch 'master' into events
REVERT: 70b067ecc6 Merge pull request #339 from ianbarber/master
REVERT: e65d228f4f gitignore endpoint test and add docs for unbind and disconnect
REVERT: c7af07cc77 Merge pull request #336 from mauri-melato/master
REVERT: d087548286 Merge pull request #338 from hurtonm/code_cleanup
REVERT: 641943944d Simplify encoder's loop
REVERT: 80e8baaff4 Merge pull request #337 from hurtonm/issue_268
REVERT: 3d93c1af5b Fix issue #268
REVERT: 5fe6ddfda3 On Windows, preventing sockets to be inherited by child processes.
REVERT: 5dc44a63d6 Merge pull request #335 from jdc8/master
REVERT: 37e4a38eb5 Fix compile error with Visual C++ 2008
REVERT: 68c1be8bf6 Fix for issue 355. Added missing source files dealer.cpp, device,cpp and router.cpp. Removed source files no longer present: xrep.cpp and xreq.cpp
REVERT: c38aecdc50 Merge branch 'master' into events
REVERT: 5c6f72c17c ZMQ_MONITOR socket option registers a callback / event sink for changes in socket state
REVERT: 47dbd4aa96 Merge pull request #334 from ianbarber/master
REVERT: 1075005b50 Patch from Mato that fixes a subtle connect bug: EAGAIN was being used as a translation value for EINPROGRESS, thus shadowing a real EAGAIN return value from the OS.  This caused later assertions of "Invalid argument" in stream_engine.cpp when it attempted to use a socket which was not connected.
REVERT: f497aae8df Merge pull request #333 from hurtonm/fix_decoder_to_properly_handle_large_messages
REVERT: 36bfaaabe6 Merge pull request #332 from hurtonm/fix_issue_264
REVERT: 9098f4d655 Merge pull request #331 from hurtonm/code_cleanup
REVERT: dd3eb08d33 Merge pull request #330 from hurtonm/pair_socket_rejects_additional_connections
REVERT: d84709497e Do not crash when multiple peers connect to PAIR socket
REVERT: 5227f676f4 Fix decoder to properly handle large messages
REVERT: 776563fcff Fix issue #264
REVERT: 394a248579 socket_base: process_unplug () is not used, remove it
REVERT: 16ec2868c5 Merge pull request #329 from ianbarber/master
REVERT: b7c9fc0750 Slight tweak to text for readability
REVERT: 7c5d79ddd3 Merge pull request #328 from tailhook/patch-1
REVERT: 138def0b99 Added refinement for ZMQ_FD option
REVERT: 29000d3b02 Merge pull request #326 from hurtonm/pipe_code_cleanup
REVERT: 41c82bdda1 Merge pull request #327 from hurtonm/fq_drop_unused_parameter
REVERT: 2cbf7993dc fq: remove unused parameter
REVERT: 1788fd396b pipe: code cleanup
REVERT: 648e31994d Merge pull request #325 from hurtonm/update_comment_in_device_plus_whitespace_fixes
REVERT: a2c3772531 Mention limitation of the device implementation
REVERT: e8b701cb92 Merge pull request #324 from hurtonm/rename_xrep_xreq_in_tests
REVERT: 9d02b3dafb Merge pull request #323 from hurtonm/xsub_fix_message_initialisation
REVERT: 873abdd24c Rename XREP/XREQ to ROUTER/DEALER in tests
REVERT: df5344bba0 xsub: fix memory leak
REVERT: 016df8e89c Merge pull request #322 from tranthamp/master
REVERT: 135fdab0ec Implement atomic operations for armv7a
REVERT: c120f02dc9 Merge pull request #321 from shripchenko/master
REVERT: f858321c1c add process_commands() to the beginning of zmq_connect() and zmq_bind()
REVERT: b9fb919877 Merge pull request #320 from shripchenko/master
REVERT: 057fab09a8 fixes for zmq_unbind() / zmq_disconnect() usage corner cases
REVERT: 4f668ad60a added zmq_unbind() / zmq_disconnect() test script. it works but rises very serious questions.
REVERT: 74ae19ac1f spaces deleted
REVERT: 952127dfd6 Merge pull request #319 from shripchenko/master
REVERT: 06b2eae87d small wording change
REVERT: 2faa4c487f stupid bug. I feel ashamed ^)
REVERT: 653e5854ed Merge pull request #318 from shripchenko/master
REVERT: 2eb6b32ef7 fixes for
REVERT: 489481857a 2nd try wuth sock->unbind() and sock->disconnect(). now with blackjack and const char*'s
REVERT: d56b75219f Merge pull request #316 from pieterh/master
REVERT: 8837852546 Merge pull request #317 from shripchenko/master
REVERT: 7b8e728e43 implement zmq_unbind(),zmq_disconnect(), zmq->sock->getsockopt(ZMQ_LAST_ENDPOINT_ID)
REVERT: 318d55fd10 Fixed issue LIBZMQ-358
REVERT: 36e9c4ac84 Merge pull request #315 from shripchenko/master
REVERT: b89a53ee7a fix bug in zmq::tcp_address_t::resolve_interface() where all resolved interface ip's overwrited by 0.0.0.0
REVERT: 334f99fb01 Merge pull request #314 from ianbarber/master
REVERT: 5b3008957d port of patch by Martin Sustrik to libxs: This patch instantiate a clock_t instance for each XS socket. Thus, it is shared between subsequent calls to xs_recv (and xs_send). That in turn significantly limits the number of invocations of  getimeofday (or similar) when timeouts are used and recv/send is called in a tight loop.
REVERT: f663ad935b Merge pull request #313 from ianbarber/master
REVERT: 206d80b5ff Make docs reflect socket mappings better
REVERT: 084c1824c4 Merge pull request #312 from shripchenko/master
REVERT: c77dc98b5c some spaces cleanups + delete unused anymore zmq::max_sockets + some minor code chages
REVERT: 525be51812 Merge pull request #311 from shripchenko/master
REVERT: acba6bdd6c Implement ZMQ_TCP_ACCEPT_FILTER setsockopt() for listening TCP sockets.
REVERT: e276df2bdf Merge pull request #309 from hurtonm/fix_issue_335
REVERT: cfa6f4bf51 Fix issue #335
REVERT: 899778dcb3 Merge pull request #308 from jdc8/master
REVERT: 177264d941 c++ style comments result in compile errors with non-c99 C compiler
REVERT: f6330f3d8d Merge pull request #307 from mkoppanen/master
REVERT: 70cf2d41ba ETIMEDOUT is a valid error code here. Fixes intermittent assertion failure on laggy networks
REVERT: 3cd0b1b647 Merge pull request #306 from shripchenko/master
REVERT: 4315467d7c documentation trimmed down to be just placeholders for who knows english better than me
REVERT: 4b303402a7 more flexible keepalive options detection + awful options documentation
REVERT: 0c3d917926 initial implementation of tuning TCP keep-alives for TCP socket currently not fully cross-platform work on linux possibly work in *bsd and could be enhanced to work on windows
REVERT: 4ab3c5a285 Merge pull request #305 from hurtonm/fix_identity_exchange_for_inproc_transport
REVERT: 12c0c6aa74 Fix identity exchange for inproc transport
REVERT: 88db804bb9 Merge pull request #304 from hurtonm/flush_identity_message_for_inproc_transport
REVERT: b41036aa2a Flush identity message for inproc transport
REVERT: 5bc9fd62c5 Merge pull request #303 from pieterh/master
REVERT: d8c58080a7 Fixed issue #351
REVERT: a969028977 Merge pull request #302 from hurtonm/router_bugfix
REVERT: 9a60b3a2a1 Fix error in router socket introduced in the previous commit
REVERT: 2faedd9e08 Merge pull request #300 from hurtonm/router_send_fixes
REVERT: 5c6e278887 Merge pull request #301 from hurtonm/router_rework_peer_identification
REVERT: 600488fa9c router: always respect message boundaries
REVERT: f037290dc3 router: reimplement peer identification
REVERT: 476c9b97c9 Merge pull request #299 from pieterh/master
REVERT: 9728706b10 Added optval checking in zmq_ctx_set
REVERT: 3eaae8b21e Merge pull request #298 from pieterh/master
REVERT: eb8217bb28 Fixed zmq_init(-1) issue
REVERT: cecc790ca3 Merge pull request #297 from hurtonm/code_cleanup
REVERT: 8da7271042 Merge pull request #296 from hurtonm/fix_router_send
REVERT: 1e2564a55f Fix return value of send for router socket
REVERT: 77d93d70f0 Simplify use of posix_assert in mutex.hpp
REVERT: e7674025e5 Remove the launch_sibling method
REVERT: 6f47f1281b Do not pass a message to the check_write method
REVERT: ed65271c52 Merge pull request #295 from hurtonm/tcp_address_fixes_anc_cleanups
REVERT: 9c46e87588 tcp_address: minor cleanups
REVERT: 700e08c3c2 tcp_address: make port number conversion more robust
REVERT: c428f6aece tcp_address: check address length before manipulating it
REVERT: 19f364e202 Merge pull request #294 from pieterh/master
REVERT: 2bcc300a0f Fixed issue #348
REVERT: 4c93fc2587 Merge pull request #291 from rcxdude/bugfix
REVERT: 64732aeca3 Merge pull request #293 from hurtonm/fix_getaddrinfo_for_ipv6_on_freebsd
REVERT: c2e9997a3c Don't set the AI_V4MAPPED flag on FreeBSD
REVERT: dc4d61f38b Merge pull request #292 from hurtonm/fix_issue_334
REVERT: 00b4571bf1 Fixed issue #334
REVERT: 084e1c2193 Fix for issue #307
REVERT: 6d776d0865 Merge pull request #290 from pieterh/master
REVERT: ba798ee8f3 Fixed issue #325
REVERT: 82c06e4417 Fixed issue #325
REVERT: c861fb4c83 Merge pull request #289 from pieterh/master
REVERT: 3585ec8aea Fixed Makefile for ROUTER/DEALER rename
REVERT: 712e36d29c Merge pull request #288 from pieterh/master
REVERT: 27c28bdc2e Mark sockets as invalid when closed, not when destroyed
REVERT: 6f720f0026 Merge pull request #287 from pieterh/master
REVERT: c12fedc70a Completed internal renaming of XREP/XREQ to ROUTER/DEALER
REVERT: 0480ce1820 Merge pull request #286 from pieterh/master
REVERT: 75809b27da Fixed issue LIBZMQ-345 - race condition in ctx.socket/term allows segfault
REVERT: 3b483a8dd7 Merge pull request #285 from hurtonm/ctx_patches
REVERT: 84707d3feb Merge pull request #284 from pieterh/master
REVERT: 151d0717bb Minor cleanups
REVERT: ae2b938330 register_endpoint: simplify locking
REVERT: e56f698023 choose_io_thread: do not assert when no I/O thread was chosen
REVERT: f944336ee0 Fix race condition in find_endpoint
REVERT: 860e1d24c0 Fixed issue #344
REVERT: 8a64d80fba Merge pull request #283 from pieterh/master
REVERT: f26e4ab784 Simplified zmq_msg_get/set functions
REVERT: 0afd8a87d5 Merge pull request #281 from pieterh/master
REVERT: cd57c43880 Merge pull request #282 from hurtonm/remove_unused_variable
REVERT: 58378c6a2c Merge pull request #280 from hurtonm/fix_ipc_connecter
REVERT: 35233f9e2f remove unused variable
REVERT: 0a6fc02702 fix connection establishment for AF_UNIX sockets
REVERT: 60e45f34b6 Merge pull request #279 from pieterh/master
REVERT: 6dd102cded Fixed issue #293
REVERT: 1e4c5b293a Merge branch 'issue-337'
REVERT: 7d6d2f9408 Merge pull request #278 from taurel/master
REVERT: 107581213c Disable reconnection option
REVERT: 5973da4866 Merge pull request #277 from pieterh/master
REVERT: 9426bd5baf Merge branch 'issue-336'
REVERT: 87fa8e78bf Merge pull request #276 from pieterh/master
REVERT: 6e71a54b1e Fixed issues #337, #341, and #340
REVERT: bdefa181ed Fixed issue 336
REVERT: 06dd31c56a Removed last vestiges of thread-safe sockets
REVERT: 8665f9a0b6 Merge pull request #275 from pieterh/master
REVERT: 9ccfbf8d30 Removed zmq.hpp, may add this back in separate commit
REVERT: 9ac40c47d7 Fixed issue LIBZMQ-333
REVERT: 32c85e0ea3 Merge pull request #274 from Kobolog/master
REVERT: cb70c5e75d fixed some typos
REVERT: 8095a129e8 man entry for the new option
REVERT: df584a3be0 an option to fail on unroutable messages in ROUTER sockets
REVERT: 62d27b7af3 Merge pull request #273 from BoresExpress/wm5
REVERT: 318ba8836f Add WinCE support.
REVERT: f9674308e8 Merge pull request #272 from staticfloat/patch-1
REVERT: 020f777e09 Eliminate unnecessary line break
REVERT: 19d30969cf Merge pull request #271 from BoresExpress/bug1
REVERT: ce24bf04dd Changed wrong file name in VC++ project.
REVERT: 4c59b1fb2f Merge pull request #270 from rgagnon24/master
REVERT: 3aabbbaefa Fix IPC transport domain socket stream file not being removed when connection is closed
REVERT: 0fed3a3fca Merge pull request #269 from datasift/master
REVERT: 5820438b64 update lower bound flag when removing topics
REVERT: 3f8322beff Merge pull request #268 from gimaker/compact-trie-table
REVERT: 3485b3ef40 Fixed a bug in the mtrie table compaction logic.
REVERT: 7689d205e9 Merge pull request #267 from mkoppanen/windows-project-files
REVERT: b05fb46966 Add missing files to Windows project files
REVERT: 58f8d4a417 Merge pull request #266 from mkoppanen/improve-tests
REVERT: 879ab39e92 Merge pull request #265 from mkoppanen/freebsd-solaris-fixes
REVERT: 5d7450d65e Improve the test for last_endpoint, use the same ports as other tests
REVERT: 1824574f9b Minor fixes to get_address code to fix build on solaris and freebsd. Also service doesnt need to be discovered here
REVERT: 78d24d3d01 Merge pull request #264 from ianbarber/master
REVERT: 5e1efc9ec3 Update documentation for last endpoint to mention inaddr_any and add a test for IPC last endpoint checking
REVERT: 2533909f60 Merge pull request #263 from mkoppanen/tcp-get-address
REVERT: 33a18f0f90 More fixes based on CentOS 6.2 results
REVERT: b19c5fced5 Merge pull request #262 from mkoppanen/tcp-get-address
REVERT: d00d4843be More fixes for ZMQ_LAST_ENDPOINT. Added a test
REVERT: b0573486c7 Fixes for tcp_listener::get_address
REVERT: 06140daf29 Merge pull request #261 from mkoppanen/windows-build
REVERT: 1bf4067cd8 More fixes for win build
REVERT: e248549252 Merge pull request #260 from mkoppanen/solaris-build
REVERT: 51b59b40dd Fix build on windows
REVERT: 9a4fd8a305 Needs explicit cast on solaris
REVERT: dd35385da3 Merge pull request #259 from mkoppanen/solaris-build
REVERT: 56aa49ff3d Fix build on solaris
REVERT: cfe2a821f3 Merge pull request #258 from skaller/master
REVERT: 916f1a524d Remove build script references to test_ts_context.
REVERT: e7da123b28 Remove thread safe test.
REVERT: 38e74c9e84 Remove thread safe socket stuff from C binding.
REVERT: 0fa6b8e793 Remove thread safe context init.
REVERT: 9e622d542a Merge pull request #256 from ianbarber/master
REVERT: 9910439277 Merge pull request #257 from mkoppanen/master
REVERT: da1920d944 Revert NULL checks in the API
REVERT: 82bd5431ce Updating documentation to remove ECANTROUTE error code
REVERT: c9898d2419 Merge pull request #255 from jtzl/master
REVERT: 132112afeb added more specific installation documentation
REVERT: 244f3a3c11 Merge pull request #254 from pieterh/minor-cleanups
REVERT: ccdb7a6305 Minor cleanups
REVERT: a457be315b Merge pull request #246 from pieterh/arguments
REVERT: 9321dfb845 Merge pull request #248 from pieterh/scattered
REVERT: 5d9432b282 Merge pull request #253 from ianbarber/master
REVERT: 2da76a3003 Updating to use getnameinfo rather than inet_ntop
REVERT: 4b62344023 Merge pull request #252 from gimaker/compact-trie-table
REVERT: c9d124b27e Merge pull request #251 from gimaker/sub-sndhwn-assert
REVERT: bfbe556e00 Merge pull request #250 from gimaker/connect-assert
REVERT: 4697634c0b Resolved conflicts after merge
REVERT: 3ee99ae81f Renamed scatter/gather methods, cleaned up source
REVERT: 8a497e2ffc Resolved conflicts after merge
REVERT: 0efb49f12f Fixed up all references to zmq_msg_size
REVERT: 02b81d42ce Changed return type of zmq_msg_size to ssize_t to allow error return
REVERT: dc09da4569 Return EFAULT if required arguments are null
REVERT: 07b49ffb9c Fixed up all references to zmq_msg_size
REVERT: 2f44faa7ce Merge pull request #247 from pieterh/sendrecv
REVERT: 2b646cbf63 Merge pull request #249 from pieterh/msgpeekpoke
REVERT: 2cd04c54df Compact the trie/mtrie node tables where possible, to reduce memory usage.
REVERT: e18f9da012 Drop subscription messages when reaching the SNDHWM rather than asserting.
REVERT: b9fb48f47b Resolve addresses in the calling thread on connect.
REVERT: d092f2615c Renamed peek/poke to get/set
REVERT: dcc1725a90 Renamed zmq_getmsgopt to zmq_msg_peek
REVERT: b3d7b29280 Renamed scatter/gather methods, cleaned up source
REVERT: fb4748f257 Added zmq_msg_send/recv functions
REVERT: 6b2ec366b1 Changed return type of zmq_msg_size to ssize_t to allow error return
REVERT: d38951db87 Return EFAULT if required arguments are null
REVERT: b2e2fa622d Merge pull request #244 from pieterh/master
REVERT: 0c4a19c408 Deprecated XREQ/XREP
REVERT: 5f6b95f4a2 Fixed footers to refer to man page, not all docs
REVERT: c85ecfc066 Cleaned up description of multi-part messages
REVERT: 636de46fe1 Removed section on devices, added new methods
REVERT: 086c059430 Ported numerous fixes from 2.1 man page
REVERT: 9bc0e10818 Merge pull request #243 from pieterh/master
REVERT: bd4f703264 Ignored generated files
REVERT: 2000d44109 Fixed syntax error in zmq_getsockopt man page
REVERT: a50a8aa364 Revert "more checks for parameters of API functions"
REVERT: afe8cd503f Revert "fix warn unused"
REVERT: b2e9347372 Merge pull request #238 from ianbarber/master
REVERT: cc10c00193 Updating docs with new sockopt
REVERT: b6c97230ed Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: b5d3373905 Moving to std::string in options
REVERT: a908ccbf35 Merge pull request #241 from skaller/master
REVERT: 48423c9e40 Merge pull request #242 from niXman/master
REVERT: e646ce43c1 more checks for parameters of API functions
REVERT: 4807935605 Implement type safe sockets and contexts.
REVERT: 770f84331f Allowing value 0, and moving code to get_address functions based on feedback
REVERT: 91bf4944da Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 256fa5d2b8 Merge pull request #240 from niXman/master
REVERT: 7b7d404269 fix warn unused
REVERT: 40052c1251 Merge pull request #239 from skaller/master
REVERT: 7fa14f3823 Merge branch 'master' of https://github.com/zeromq/libzmq
REVERT: 7b32c9cb51 Adding ZMQ_LAST_ENDPOINT for wildcard support on TCP and IPC sockets
REVERT: c3f7543ebe Fix uio support.
REVERT: 970a005399 Provide interface.
REVERT: 383a49dadf Implement zmq_recvmmsg.
REVERT: 531835bba8 Implement zmq_sendv.
REVERT: f59fff7bf2 Add check for sys/uio.h to configure script.
REVERT: 21571cf085 Merge pull request #237 from skaller/master
REVERT: 81662d70be Add a test for thread safe sockets.
REVERT: 759b2e01fd Fix comments to conform to style guide.
REVERT: 9dab56c1df Merge pull request #235 from skaller/master
REVERT: cbf6126b08 Merge pull request #234 from ianbarber/master
REVERT: 935f17488a Merge pull request #236 from danielnorberg/master
REVERT: 67fd4c9a2c add missing semicolon
REVERT: 520ad3c2d7 Set and arrange propagation of thread safe sockets flag.
REVERT: 988efbc73a Thread Safe Sockets.
REVERT: 4dd6ce0639 Add mission ; character
REVERT: 43b71ae4bf Fixing missing semicolon in xpub.cpp as reported on the list by Emmanuel TAUREL
REVERT: dc50bf5dca Merge pull request #233 from danielnorberg/master
REVERT: 79f753bf56 xpub: free received subscription messages
REVERT: 4f4d72afc6 Merge pull request #232 from chuckremes/master
REVERT: 93db782a1d Merge branch 'libzmq-268' of git://git.lucina.net/libzmq
REVERT: adee8270dd Merge pull request #231 from chuckremes/master
REVERT: 762bcff73f Merge branch 'libzmq-303' of git://git.lucina.net/libzmq
REVERT: e89a5f1e1a Merge pull request #230 from chuckremes/master
REVERT: c54ad48c9b Merge branch 'libzmq-205' of git://git.lucina.net/libzmq
REVERT: 0319cb2cd1 Fix data loss for PUB/SUB and unidirectional transports (LIBZMQ-268)
REVERT: edf7db74d9 Merge pull request #227 from gimaker/smaller-mtrie
REVERT: e6c97c5ecc Reduce memory usage of mtrie.
REVERT: 1925c92fe9 Merge branches 'libzmq-205' and 'libzmq-303'
REVERT: 7e8a839a22 Merge pull request #226 from gitfoxi/master
REVERT: 1e5a48f521 Epoll is default for cross-compile. For regular-compile, test kernel (run) support.
REVERT: 281dcd2544 Merge pull request #221 from fidlej/master
REVERT: 676d4f4e18 Merge pull request #222 from gimaker/trie-pruning
REVERT: 0c94cd036a Merge pull request #223 from gimaker/libzmq-310
REVERT: 95f6a07403 Merge pull request #224 from vortechs2000/master
REVERT: 57f64c5079 Merge pull request #225 from gitfoxi/master
REVERT: c71375ea72 Fix: Case where system library has epoll but kernel does not support it.
REVERT: c4f2240851 Fix: runtime patch for when system has clock_gettime but does not support CLOCK_MONOTONIC.
REVERT: b5dbff8ed4 Fix basic_string<unsigned char> not implemented in stdc++ 3
REVERT: 99df984be1 Fix bad combination of gcc3, -Werror and private destructor.
REVERT: bc4d1b6002 Fixed segfault bug sometimes happening when pruning the trie/mtrie.
REVERT: 2e0c4330fa Patch from Mikko Koppanen for #LIBZMQ-301
REVERT: 36215656eb Throw away unexpected data received by XPUB sockets, rather than asserting.
REVERT: c34a144365 Fix pgm_receiver.cpp: zmq_assert (pending_bytes == 0) (LIBZMQ-205)
REVERT: 19129edc60 Prune redundant nodes in the trie.
REVERT: 6fa9ffebe5 Prune redundant nodes in the mtrie.
REVERT: 029e28865d Fix assertion in pgm_sender_t::plug() (LIBZMQ-303)
REVERT: 1d8b132d36 Updated connector open() doc strings.
REVERT: 6f32361fea Version bumped to 3.1.1
REVERT: b3fbe0113d Merge branch 'master' of github.com:zeromq/libzmq
REVERT: dcb1d558a5 Fix MSVC10 build distfiles
REVERT: 3bf7860fb7 NEWS updated for 3.1.0 release
REVERT: 22ef966d4a Update email address in man pages
REVERT: 183e126364 Fix typo in zmq_sendmsg(3) manual page
REVERT: adc07128e6 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 3fbe8ac3c3 Dont wait for pending subscription commands on shutdown
REVERT: bfbd16d099 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 91fdedf25c Fix polling on XREP socket
REVERT: f9eb763293 zmq_sendmsg and zmq_recvmsg checks for NULL message object
REVERT: 3fb5c11b03 Added MSVC10 solution and project files for Windows
REVERT: a9e03336b0 A synchronous connect() failure in ipc_connecter can result in Assertion failed: s == retired_fd (ipc_connecter.cpp:174), as reported in LIBZMQ-294.
REVERT: 82d935309e Fix synchronous connect failure for ipc://, tcp:// (LIBZMQ-294)
REVERT: c90f54e6a6 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: e7d748e812 Mika Fischer added to AUTHORS file
REVERT: 0df86c41b5 rt library required on all platforms
REVERT: aaac96d94a This makes clock_t insensitive to the system clock being reset by NTP or the sysadmin, which could previously cause long hangs for instance in zmq_poll.
REVERT: b4f5ee58a9 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: fc17bd4117 ENOTCONN on recv() on TCP socket is treated decently (issue 254)
REVERT: daac9ac5b2 Phillip Kovacs added to the AUTHORS file
REVERT: bf9062902c Fix broken VPATH/parallel builds
REVERT: 5c1a91e33e Stuart Webster added to the AUTHORS file
REVERT: a610b3d1b4 Line-ending conversion rules for hg-git users and enabled use of .gitignore by hg-git users
REVERT: f8bd3967bf Documentation for IPv4ONLY option clarified
REVERT: 5a6503e5c2 Bug in XREP and XREQ fixed (issue 280)
REVERT: 83975c1b21 Missing "defined" tokens added
REVERT: 21bca4dbe4 Bug concerining identity in XREQ socket fixed (issue 280)
REVERT: 1c239708ab Couple of bugs in XREP handling of identities fixed. wq: Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
REVERT: f8b0055026 Hangup in signaler creation on Windows fixed
REVERT: 90d0435b56 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: a7b0b0d3dc AUTHORS file changed
REVERT: 27524908c1 Set libzmq ABI version to 3
REVERT: c79abee6bc Get AIX 6.1 compiling again by making msg_t class explicit
REVERT: 991f7e2c85 Set libzmq ABI version to 3
REVERT: 89962a8256 Uninitialised FSM state in REQ session fixed (issue 278)
REVERT: 11e31988e1 Chuck Remeas added to the AUTHORS file
REVERT: 93529d8c5d Add zmq_getmsgopt to the API
REVERT: bb66f3cc3b Bug in trie fixed (issue 277)
REVERT: 6503716203 Minor typo corrected
REVERT: fe81827bd0 Version changed to 3.1.0
REVERT: 21a0b49834 Obsolete ECANTROUTE errror code removed
REVERT: a756956781 Use identities in inproc transport
REVERT: de1d32daae Fix getaddrinfo calls to work on OpenVMS
REVERT: 50a9ee6e73 MSVC build fixed
REVERT: 05ce301f35 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 6cdd720400 Merge pull request #220 from 250bpm/HEAD
REVERT: e9c3a227a7 Linking exception corrected
REVERT: a4843b65d2 Identities re-introduced
REVERT: d20ea25b8c ZMQ_IDENTITY option re-introduced
REVERT: 8e21d64c97 Copyright dates adjusted to reflect reality
REVERT: 8a0f5f7650 Miru copyrights added
REVERT: 1c071f54a6 LABELs removed from the documentation
REVERT: 7563518929 Tests print their name before running
REVERT: 7842c71073 LABELS and COMMANDs removed
REVERT: 626099aa2a VTCP transport removed
REVERT: ac7717b7b3 250bpm copyrights added
REVERT: 4b832ea374 Revert the early dropping of request and replies for disconnected clients
REVERT: 9227c38933 ROUTER and DEALER are aliases for XREP and XREQ
REVERT: dee8b2360a New style ROUTER socket removed.
REVERT: 541b83bc02 Perry Kundert added to the AUTHORS file
REVERT: 09574a6104 Corrected discarding of remainder of message when request ID invalid
REVERT: 52bab42212 Missing bracket added
REVERT: 9b3e61a178 Ben Gray added to the AUTHORS file
REVERT: 9e000c8f26 Patch for issue LIBZMQ-275. Dealing with VSM in distribution when pipes fail to write.
REVERT: 68ab5f87ed Paul Betts added to the AUTHORS file
REVERT: 1b706ac028 Enable exceptions raising on assert on Win32
REVERT: a8362abf11 Enable exceptions raising on assert on Win32
REVERT: a70bea01cc Merge branch 'master' of github.com:zeromq/libzmq
REVERT: b3cda2ad60 Bug in kqueue poller fixed (issue 261)
REVERT: 6c1b50cfab Added compile-time test for SOCK_CLOEXEC
REVERT: d31792e652 Default HWMs are set to 1000
REVERT: f5f1a8b184 New upstream OpenPGM maintenance release 5.1.118.
REVERT: cc5d31605f Re-add PGM rate limiting
REVERT: 81da391e7e Use single port for creating signalers on Windows
REVERT: 7a10bbe77a Bug in subscription matching fixed (issue 263)
REVERT: 34b114d15d Make sure new ROUTER socket honours POLLIN for cmd messages
REVERT: 8485a5e5a4 Assert fixed in XREP & ROUTER  when sending to terminating pipe (issue 258)
REVERT: d726120e60 Bug in matching algorithm fixed
REVERT: 25cc25e9ad MSVC build fixed
REVERT: e170136a2e More bugs in mtrie fixed
REVERT: 5936379b29 Bug in mtrie fixed
REVERT: 06bdf2c4f9 Check message syntax in REQ asynchronously
REVERT: f78d9b6bfc Session class separated into socket-type-specific sessions
REVERT: 78b02d142e Minor optimisation in message distribution algorithm
REVERT: cf499ee016 Bug in message distribution algorithm fixed (issue 251)
REVERT: 42737f0918 test_invlid_rep added to .gitignore
REVERT: 8f8bfcaba0 Fixed issue with req assertions (issue 252)
REVERT: e191e806ea Fix polling system detection on mingw32 build
REVERT: 9d0e122bfa Added option to choose internal polling system
REVERT: 193fa1c079 Accept square brackets around IPv6 address
REVERT: 4138aca54b Fixed doc to clarify how label parts work
REVERT: 9fb9fea633 Improve error reporting in a minor way
REVERT: 8b7ac4c2a9 Close file descriptors on exec (issue 218)
REVERT: 2910a728dc msg_t::rm_refs closes the message when number of refs drops to 0 (issue 245)
REVERT: 82ab08d871 Premature deallocation bug in XSUB fixed (issue 244)
REVERT: 65bb75863d Fixed warnings on Win64
REVERT: 940c5b346b zmq_msg_t changed to structure
REVERT: dd7c629a27 Typo fixed in zmq_socket(3)
REVERT: 80a5f60e33 NIC name resolution moved to tcp_address_t
REVERT: f0c7edbc9c Missing include added to ip.cpp
REVERT: 898ee99dc1 Windows build fixed
REVERT: b6ecb00d23 TCP address related functionality moved to tcp_address_t
REVERT: 4a8dd1e404 MSVC build fixed
REVERT: b01a8e1751 IPC address related functionality refactored into ipc_address_t class
REVERT: 3488af048f Fix the PGM support on win64
REVERT: ed373450a2 MSVC build fixed
REVERT: b3bac17607 tcp_engine renamed to stream engine
REVERT: 41457e1ff1 Semaphores are not used anymore, build system is adjusted accordingly
REVERT: 714d3b288f EAFNOSUPPORT defined on Windows platform
REVERT: 85851d3127 Preliminary Android support
REVERT: 0354d4d37f Added Android support
REVERT: 57440b86e2 Add IPv6 support to tcp_listener
REVERT: 3c3c0bfd1f Minor problems in MSVC build fixed
REVERT: 9196c48256 select version zmq_poll reports invalid FDs
REVERT: 9380098534 Compilation error on HP-UX and AIX fixed
REVERT: 6dc3b2a657 Compilation error on FreeBSD fixed
REVERT: a3f27400de Minor compile-time bug on Windows fixed
REVERT: 1c54ce37b3 tcp_connecter disables IPV6_IPV6ONLY if needed.
REVERT: c27b9ac7de Update resolve_ip_interface and resolve_ip_hostname with ipv4only parameter.
REVERT: 9184a54f64 Update resolve_nic_name to take more generic sockaddr parameter.
REVERT: 784041f5b9 ZMQ_IPV4ONLY option added
REVERT: 8378180cbb Minor bug in vtcp_listener fixed
REVERT: 24230515f5 vtcp connection string simplified
REVERT: be48970977 MSVC build brought up-to-date
REVERT: d5f3628ad0 Different connecters simplified
REVERT: f63db009a1 Different listener implementations simplified
REVERT: b45fec337a Tuning of TCP sockets is done at a single place
REVERT: 46b053b8d6 Dead code removed from TCP and IPC transports
REVERT: 5ac63140b0 Implementations of TCP and IPC transports separated
REVERT: 6e987428d4 Precise reconnect interval randomised
REVERT: ce7a9a58e3 Setting TCP socket options moved to tcp_engine_t
REVERT: 588c728702 vtcp_connecter fixed
REVERT: d7319de3d0 First version of vtcp_connecter added
REVERT: 258e7e6794 Code cleanup
REVERT: 279302c5f5 Experimental VTCP listener added
REVERT: 9906c652ca Outdated entries removed from .gitignore
REVERT: 9119b4fd7b TCP transport classes simplified
REVERT: 43b5b3444c PGM subscription forwarding fixed
REVERT: 7c1dca546d Session classes merged into a single class
REVERT: f716b571ba Only one polling mechanism is compiled
REVERT: 0e71b111f4 Obsolete include in ctx.hpp removed
REVERT: 11e21d027d semaphore_t class removed
REVERT: 837451eddc Remove blob_t class
REVERT: 5650743d9e MSVC build brought up to date
REVERT: 75c4e0e62b mailbox::recv correctly passes EINTR to the caller
REVERT: 4bd335932c ECANTROUTE error documented in zmq_sendmsg(3)
REVERT: 6b873d4ffd ROUTER socket blocks on SNDHWM
REVERT: a1e09facb2 ROUTER socket reports error when message cannot be routed
REVERT: 72a793f78a ZMQ_GENERIC renamed to ZMQ_ROUTER
REVERT: cb2d715605 endmsg(3) and zmq_recvmsg(3) added to RPM spec file
REVERT: a808431d1d Fixed email addresses in the MAITAINERS file
REVERT: a33a275e3b Fixed issue 230
REVERT: 7298b5742f Includes in zmq.cpp cleaned-up
REVERT: 18d8be5e92 Fix pollin on Cygwin.
REVERT: ac20e17cbd Reference to C++ binding removed from zmq(7)
REVERT: 66ff99c457 Martin Lucina remove from MAINTAINERS file
REVERT: f97f50c252 Signaler timeout bug on Windows fixed
REVERT: 1a40880552 ZMQ_IDENTITY option removed from the documentation
REVERT: 89daa57faa Missing files for GENERIC socket implementation added
REVERT: bf78e230ad GENERIC socket type and COMMAND flag added
REVERT: c8e8f2a24c ZMQ_IDENTITY socket option removed
REVERT: ba67eff167 non-immediate_connect functionality removed
REVERT: 364839f3e6 Debian packaging removed
REVERT: e4f98d1e10 ROUTER and DEALER sockets removed
REVERT: 73630de98a Version number bumped to 4.0.0
REVERT: 57c1342c68 Bug with setting options on SUB socket fixed
REVERT: 29274811cc zmq_bind(3) and zmq_connect(3) describe EINVAL error
REVERT: 2afb791ec2 Subscription forwarding test added
REVERT: 215cfc653e REQ/REP drop test extended
REVERT: c7542981d1 PGM transport reconciled with subscription forwarding
REVERT: d7adc3f19a ZMQ_FILTER option removed
REVERT: a154ef69da Man pages for send & recv function brought up to date
REVERT: 7e1251178b Experimental code from zmq_init_t removed.
REVERT: 52eaf600e5 Drop outbound messages in XREP socket when SNDHWM is reached
REVERT: aa2150c25c VSM data are aligned to 32/64 bit boundary
REVERT: 1526ff638c License text in autogen.sh fixed
REVERT: 8d96036fcd Build system checks for presence of eventfd.h header
REVERT: 8fb9d3c6d0 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 6ae1be1a12 Race condition in eventfd signaler fixed
REVERT: 9a9a0cf410 eventfd implementation of the signaler
REVERT: c687c7e61e Fix MSVC build
REVERT: da26134aa6 Inproc tests need no I/O threads
REVERT: 7c0c798120 Command are now stored in ypipes instead of in socketpairs
REVERT: de3838403b Testing for errors from pthread_* functions fixed
REVERT: 4f4cc73280 Use strrchr to ensure we split off the last colon for the service port
REVERT: 543ad30e7d Packaging for MSVC build fixed
REVERT: f8bf3a4cef Rename i_inout to i_engine_sink
REVERT: 3ae73ee11f Typo in zmq_msg_size(3) fixed
REVERT: 770d0bc77c Fix MSVC build
REVERT: d1373792f7 Outstanding requests dropped when requester dies (issue 190)
REVERT: 12532c7940 O(1) fair-queueing in XREP implemented
REVERT: ec81f8fb25 New wire format for REQ/REP pattern
REVERT: 10a93bb79f Unspecified error code from mailbox_t::recv on Win32 fixed
REVERT: a28928fe37 Introduce ZMQ_ROUTER and ZMQ_DEALER sockets
REVERT: f437c9ed9b Fix errors in zmq_getsockopt(3) manpage
REVERT: ab99975ad4 LABEL flag added to the wire format
REVERT: ada5d42472 Basic tests now test multi-part messages instead of single-part
REVERT: c80908c469 Bug fixed in pipe termination
REVERT: 7572fee979 Optimise block/non-block switching in mailbox_t
REVERT: 8440de2b14 Fix minor warning in MSVC build
REVERT: f4760f02c3 Disable timeo test on MinGW
REVERT: 082f8e19b7 Mailbox timeouts fixed on Windows
REVERT: ed680a395e Documentation for XPUB and XSUB socket added
REVERT: 9f4d3767fe Session termination error fixed
REVERT: 00dc0245e6 Race condition in pipe_t fixed.
REVERT: 6052709c2a ENETDOWN is a legal error from TCP connect
REVERT: 5b77a41eaf Throughput tests fixed.
REVERT: 4b60023b96 Merge branch 'master' of github.com:zeromq/libzmq
REVERT: 9b795de4af Refactor Windows versioning and WinSock usage.Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
REVERT: dc66053530 Minor MSVC warning fixed
REVERT: d7923f08ca Add sockopt ZMQ_RCVTIMEO/ZMQ_SNDTIMEO.
REVERT: e895607ca7 ENETUNREACH is a valid error from connect
REVERT: 65d2b70312 Minor patch to fix ICC build
REVERT: 970798ff98 mtrie.cpp added to MSVC build
REVERT: c7fb5c54b6 Reverting previous commit that broke MSVC2010 build
REVERT: b164023cca Fix scope on Windows includes.
REVERT: ff93f54653 ZMQ_FILTER socket option added
REVERT: e080e3e8b6 Publisher-side filtering for multi-part messages fixed
REVERT: bd86def1c7 Actual message filtering happens in XPUB socket
REVERT: 3935258b82 Minor code beautification for mtrie_t
REVERT: ee7313b4d8 Subscriptions are processed immediately in XPUB socket
REVERT: a24a7c15a8 Session termination induced by socket fixed
REVERT: 0b59866a84 Patches from sub-forward branch incorporated
REVERT: 311fb0d852 Subscription matching moved from XSUB to SUB socket
REVERT: 718885fdcd Pending messages are delivered even if connection doesn't exist yet
REVERT: 87a6490b39 All pipe termination code moved to pipe_t
REVERT: 3d4203decf Fabien Ninoles added to the AUTHORS file
REVERT: 71ac91ba41 Add multi-array support to array_item_t.
REVERT: 0f6f7276e3 Move the pipe termination code to socket_base_t
REVERT: acf0b0e515 Introduces bi-directional pipes
REVERT: 9e6b399256 Couple of minor issues in MSVC build fixed
REVERT: da7b6d0b38 Paul Colomiets added to AUTHORS file
REVERT: 38e5f8699c Better handling of memory error in resolve_ip_hostname
REVERT: 864c18f797 zmq_msg_init_data returns ERRNO instead aborting
REVERT: d8d5a627b1 Duplicate initialisation of PGM_MULTICAST_HOPS removed
REVERT: 5d0cffc52f ZMQ_MULTICAST_HOPS socket option added
REVERT: 49df2f416c Fixes warning when compiling with MSVC on Win64
REVERT: 49387874ef Async connect doesn't fail on EWSANETDOWN
REVERT: da1ef4d268 Fixed REP assert on missing envelope
REVERT: 0c5b781e97 urrent pipe pointer in XREP out of range -- fixed.
REVERT: 3ef7c747ac Tore Halvorsen added to the AUTHORS file
REVERT: 10120214ac Accessing an iterator after it is accessed is not valid.
REVERT: ceb5e1a073 Deallocation functions in zmq.h and msg_t class are consistent.
REVERT: 5e329ba7ca Minor patch to keep ICC compiler happy
REVERT: 6ecec9bbf1 Current inpipe remains unchaged in XREP when other pipe terminates
REVERT: e5d4cd39e1 Yet one more fix related to PUB socket and multipart messages
REVERT: e78cc47b18 Moved tests off 5555 (conflict with Eclipse)
REVERT: eb9bc1b064 Message atomicity problem in PUB socket fixed.
REVERT: fe2e772dd5 pgm_socket uses binary version of UUID
REVERT: 96213d5735 WSAENETUNREACH is a valid networking error
REVERT: b2eb84f8ca Substantial simplification of uuid_t
REVERT: 10fbc78e5c Assert during SUB socket termination fixed.
REVERT: e0246e32d7 Message-related functionality factored out into msg_t class.
REVERT: 581697695a Message validity is checked in the runtime
REVERT: 20e0b7cdcb zmq_socket(3) describes the EMFILE error code
REVERT: e3dc0b25d9 OpenPGM compilation error on OSX fixed
REVERT: 452ea97f5b zmq_send(3) manpage improved
REVERT: 590ad2510b Error handling for accept on Cygwin fixed
REVERT: 5444064c1a Minor cleanup of preprocessor definitions for OpenPGM
REVERT: 933ace0919 MSVC build fixed to reflect zmq.cpp split
REVERT: 6191213a57 Code dealing with messages moved to msg.cpp
REVERT: 3b636d7d18 zmq_utils implementation moved to zmq_utils.cpp
REVERT: e6fd193760 OpenPGM now doesn't redefine bool, we can drop the workaround
REVERT: a3b49ca958 Fixed example
REVERT: 0839cceac9 Missing ENOTSOCK added on Win32
REVERT: b96fe15bb6 Run-time checking for context & socket validity added
REVERT: e62686aca5 RPM packaging improvements
REVERT: 6fd403c4d8 Make pkg-config dependency conditional
REVERT: 4b52cf949f TCP and IPC connection initiation allow for multiple properties
REVERT: 8203c4dbb2 Another error handling issue on Win32 solved
REVERT: 475ba3849d Issue with error checking on Win32 platform fixed
REVERT: 1842628b90 Unreferenced variable removed
REVERT: 2c7af35827 Add note about thread-safety to zmq_msg_init_data() manpage.
REVERT: 54ea458f62 Git ignores .gcno files
REVERT: a48b6cfc00 Additional gcov changes
REVERT: 656b646bc6 Large rename: AC_ZMQ_ to LIBZMQ_ and ac_zmq_ to libzmq_. Fixes "warning suspicious cache-id"
REVERT: bdeddb89f7 Added code coverage checking
REVERT: 7af18468f8 Add option to build with system opepgm
REVERT: 0e0e4559a0 Project location on github changed in README file
REVERT: 3e655227bd Fixed memory leak with threads on win32
REVERT: 85c2a84036 inproc perf tests now work on Windows
REVERT: 54830ac0f6 MSVC build system updated to match 3.0 changes
REVERT: ae90d3bdbe inproc_lat and inproc_thr added to .gitignore
REVERT: 599df5203c PGM wire format specification improved in zmq_pgm(7)
REVERT: cce57617c7 Ian Barber and Zed Shaw added to credits section
REVERT: 5142a1624b Robert G. Jakabosky added to the AUTHORS file
REVERT: d84558e172 Adding thread latency/throughput perf. examples.
REVERT: fbf1f51468 Upstream the openpgm build fixes. Add DSO symbol visibility to OpenPGM builds
REVERT: d36d9a378a Comments improvement
REVERT: 17fdb5e3a8 zmq_recv() returns size of the message even if it's truncated
REVERT: 82dbef360c Memory leak in zmq_recv fixed
REVERT: abb184a051 ZMQ_NOBLOCK renamed ZMQ_DONTWAIT
REVERT: bc4a1ce334 ZMQ_HWM split into ZMQ_SNDHWM and ZMQ_RCVHWM
REVERT: 507718ee1a ZMQ_HWM type changed to int
REVERT: bd9d7715eb ZMQ_RATE and ZMQ_RECOVERY_IVL types cahnged to int
REVERT: d61f067f5b ZMQ_EVENTS type changed to int
REVERT: 23bd3726a5 ZMQ_RCVMORE type changed to int
REVERT: 17e82a3611 ZMQ_SNDBUF and ZMQ_RCVBUF type changed to int
REVERT: a2252de2bc ZMQ_RECOVERY_IVL and ZMQ_RECOVERY_IVL_MSEC reconciled
REVERT: 8463b4d55e SWAP functionality removed
REVERT: fb27a000d9 send/recv was changed to send/recv/sendmsg/recvmsg
REVERT: d4e83d2601 C++ binding removed from the core
REVERT: 7d87db0529 Auto-tests modified to use C API instead of C++ binding
REVERT: 941be8d217 zmq_device removed
REVERT: d4d184a750 Pre-compiled devices removed
REVERT: b45b68ae4a ZMQ_MCAST_LOOP removed
REVERT: f5e6d67948 Timeout in zmq_poll is in milliseconds
REVERT: e3cf6e9ced Obsolete note removed from zmq_poll(3) manpage
REVERT: 34d7854199 Obsolete constants ZMQ_UPSTREAM and ZMQ_DOWNSTREAM removed
REVERT: dee5f650dd Version bumped to 3.0.0
REVERT: 1619b3d84a Message atomicity bug in load-balancer fixed
REVERT: 92c7c18367 Message atomicity problem solved in PUB socket
REVERT: fac9c2da56 zmq_socket(3) and zmq_setsockopt(3) man pages improved
REVERT: f5015f4c93 Incorrect errno reported from tcp_listener_t::set_address
REVERT: 32ded2b457 Duplicate identities now checked with zmq_connect
REVERT: b79d07b8bc reset socket state when identity message cannot be written to xrep
REVERT: 7045a4a213 Dead code removed from named_session.cpp
REVERT: f987f4b3e2 FreeBSD complation error fixed
REVERT: 2970d6c30b Remove obsolete assert from pgm_socket.cpp
REVERT: d0c8edde35 Added missing close method w/ check if socket is already closed.
REVERT: 7b95c5920c Windows build fixed
REVERT: b00be2651c Different fixed to make OpenVMS port work.
REVERT: 184bdb8e2b Bug caused by interaction of REQ/REP routing and HWM fixed.
REVERT: 97add1ec2f Documentation wrt thread-safety cleaned up.
REVERT: 18b9ebea32 The copyrights in file headers updated.
REVERT: 5fcef1cac4 ZMQ_MAXMSGSIZE option added
REVERT: 4c7446211a Explicit identities bug in inproc transport fixed.
REVERT: 67b1f14190 Memory leak in PUB/XPUB sockets fixed.
REVERT: d4e418f5f4 Socket with no owner objects is deallocated immediately
REVERT: c22e52737a Minor patch to zmq_getsockopt(3) man page
REVERT: 29e0e7dbad Incorrect PGM sender/receiver creation fixed
REVERT: 820fec7f28 Version bumped to 2.2.0
REVERT: 43e8868875 Added explicit error message in case of memory exhaustion
REVERT: 98ccff1a24 Fixes build on at least CentOS 5
REVERT: 0eea93526d Fix for memory leak caused by long identities
REVERT: 5c0931121b Computation of buffer size for PGM fixed.
REVERT: 12486fecc4 Fix MSVC and SunStudio builds with OpenPGM
REVERT: 17e2ca71b4 Logging of duplicit identities added
REVERT: 1f536b2d38 Init object is child of listener
REVERT: 28f3e87fc6 Add delay before reconnecting
REVERT: fbe5d859f4 Added note regarding setting sockopt before bind/connect
REVERT: ba26cc9938 Build problem with OpenPGM and MSVC fixed
REVERT: 14a0e147b2 Fixed win32 issue with WSAStartup
REVERT: e94790006e reaper added to MSVC build
REVERT: 5b82b1ba30 Reaper thread waits for commands rather them retrieving them periodically
REVERT: 80ac398bba Initial implementation of reaper thread.
REVERT: 889424e675 max_sockets honoured precisely
REVERT: 5dcbc34396 zmq_poll with no fds behaves decently
REVERT: 908b39bf83 m4_esyscmd_s doesnt seem to be portable across different systems
REVERT: c8e5be87d8 test-hwm added to .gitignore
REVERT: 4efead1bbb Fixed autogen.sh warnings on Debian 6 systems.
REVERT: 042e34a5d9 operator void* () added to context_t.
REVERT: 3f758ab2f4 Don't use RLIMIT_NOFILES in devpoll_t.
REVERT: ca1acc340c RLIMIT_NOFILE not used in poll_t anymore
REVERT: 1e0302633e Added WithOpenPGM configuration into MSVC builds
REVERT: 72d320366f Added test for HWM
REVERT: 1b15eba9a9 Fixed the problem of subscription forwarding and PGM interaction
REVERT: f7f1dfc86d ZMQ_RECONNECT_IVL_MAX socket option added
REVERT: 8e61a11b39 Do not execute ipc tests under MinGW
REVERT: 8561a55d2c Remove unnecessary visibility pragmas
REVERT: c91bf25645 Fix handle connection reset during session init
REVERT: 56bdba592c Fix cppcheck warnings: 	Prefer prefix ++/-- operators for non-primitive types.
REVERT: b262f2fe9b Typo fixed in zmq_send(3) man page.
REVERT: 667b247e32 Cancel pending timers when decoder for PGM stalls
REVERT: a249d15200 Fix MSVC build
REVERT: 59fa0c9b46 Gerard Toonstra added to the authors file
REVERT: a348d94c09 Fair queueing of subscriptions added to XPUB socket
REVERT: 58c9830d90 XSUB socket has a subscription distributor
REVERT: 8eae7d8507 'message distribution mechanism' separated from XPUB socket
REVERT: 18f29ded6a Make cppcheck not complain about "'operator=' should return something"
REVERT: 7051387108 Support dynamic generation of C preprocessor definitions for PGM rather than hardcoding them.
REVERT: 725ebce13c Version bumped to 2.1.1
REVERT: bd0ba6e89a Size of inproc hwm and swap is sum of peers' hwms and swaps
REVERT: babdf48aac Fix pipe writer termination
REVERT: 8e0049e2fb Disable sending messages on SUB socket
REVERT: 08cd2ce05d resolve "function declaration isn't a prototype"
REVERT: 472bdcd6b4 Return ETERM from getsockopt(ZMQ_EVETS) if zmq_term() was called
REVERT: 95eebbfffa sunos/gcc3 compilation issue fixed
REVERT: 51d2d9b9f8 Yet one more fix for oversized messages.
REVERT: 112d0cd52e Fix the segfault when over-sized message is rejected.
REVERT: cbbb1e925d Fix passing through CFLAGS/CPPFLAGS/CXXFLAGS when using --enable-debug
REVERT: d15e881ea0 unplugged engine tries to manipulate the pollset -- fixed
REVERT: b19ee99bb1 fix race condition in session init
REVERT: 27e83cc525 Fixes assertion on pipe.cpp:237 when swap fills up.
REVERT: a46980babe Remove assertions from devices
REVERT: f749f2d21c add basic uri validations
REVERT: 22b2b9a2b6 fix overwriting errno on bind failure
REVERT: a9d969a73e Bob Beaty added to the AUTHORS file
REVERT: fcfad5682e Added Recovery Interval in Milliseconds
REVERT: 1d81d2f1d4 tar doesn't accept -C flag on solaris while extracting
REVERT: a3353150f8 Fix werror flag store/restore
REVERT: aed2eeafdc Fix visibility on rhel4
REVERT: 9bb5323a1a Clarify zmq_send() operation for ZMQ_PUB sockets
REVERT: 73bbcb552d MSVC build fixed
REVERT: 8d6cafe066 All devices conflated into a single implementation.
REVERT: ec61751e17 options.type correctly set for PUB/SUB/XPUB/XSUB
REVERT: 8a6ff4ccd2 xup and xsub files added to the MSVC build
REVERT: 2daa0bb49d XSUB accepts (un)subscriptions in form of messages.
REVERT: c80e7b80cc XPUB and XSUB socket types added.
REVERT: abc8b5e40c Update NEWS file for 2.1.0 release
REVERT: 4a3ed39a22 Bump OpenPGM to 5.0.92.
REVERT: 520d621016 Bump ABI version to 1:0:0 for ZeroMQ 2.1.0 release
REVERT: b70d628fad Documentation updates for 2.1
REVERT: 5bb0a339be Prefix variables with "ac_zmq_"
REVERT: 17d7e6ede0 Merge branch 'maint'
REVERT: 289b1f5ced Remove unnecessary cast in kevent_delete
REVERT: 28db150aaf Fix thread thunker scope for MSVC.
REVERT: 325dd2f091 Functions passed to pthread_create are declared as extern "C"
REVERT: 0bc2a05d84 .gitignore modified to ignore test executables
REVERT: c9584096e0 Control symbol exports using -fvisibility
REVERT: 734624be76 Typo fixed in a comment.
REVERT: 92618fd99a Small fix for the rhel6 spec
REVERT: a689047de0 Merge branch 'maint'
REVERT: 83d9af9951 Mikko Koppanen becomes a maintainer of the build system.
REVERT: ac40680ea2 Problem with blob_t initialisation fixed.
REVERT: edf7c18d79 Add a check that the compiler actually works.
REVERT: 945c931daf Run autoupdate on the configure.in
REVERT: 72a7b93f12 Allow building without documentation.
REVERT: c86375831d Remove unneeded substitutions
REVERT: b83d0a1bc0 Remove unnecessary conditional
REVERT: 925595259b MinGW32 build fixes
REVERT: 3dbd5d5872 Fix mingw32 build
REVERT: 34f50a6840 Merge branch 'maint'
REVERT: bd0ecf4784 FD_SETSIZE defaults to 1024 in MSVC build
REVERT: 152c64f25d FD_SETSIZE defaults to 1024 in MSVC build
REVERT: da3327cf87 Build refactoring
REVERT: f77c8ca47f Merge branch 'maint'
REVERT: ffcb0baa73 Couple of patches for AIX build
REVERT: a2500ae348 Fix a bug that zmq_poll's select backend spins when timeout=-1, due to ptimeout not properly recalculated after first pass.
REVERT: 8abe67357a Merge branch 'maint'
REVERT: f7123de943 Fix socket_t::recv() hang scenario where initial call to process_commands() eats signal
REVERT: c0217027cc Coding style cleanup in mailbox.cpp
REVERT: 9da84a5239 signaler renamed to mailbox
REVERT: 9cfdb441f4 slots renamed to tids
REVERT: 623a9c9f1b Jacob Rideout added to the AUTGORS file.
REVERT: 0ada4f8e30 Fix documentation typos
REVERT: 1b39bcd883 Automatically resize signalling socket buffer if full
REVERT: 756f7df8c8 Previous FD_STSIZE patch reverted.
REVERT: 2246689c8f FD_SETSIZE for internal polling defaults to 1024
REVERT: b90e621329 minor typo fixed
REVERT: d4a41067d3 HP-UX has no OPEN_MAX defined
REVERT: de93f6359f crypto library is needed on HP-UX to generate UUIDs
REVERT: dbcd382524 Merge branch 'maint'
REVERT: eb83678b2b Add INSTALL to Git, thus making it a normal file
REVERT: 0ad71f88fe select now uses Erase-Remove idiom for retired fds
REVERT: 085b709021 Documentation for zmq_close and zmq_term fixed.
REVERT: 3d8eb071a2 Coding style fixed for pgm_socket
REVERT: b358df9fff Name of "GNU Lesser Public License" corrected.
REVERT: 3d01b929fe Peter Bourgon added to the AUTHORS file
REVERT: 9384faf7e5 Add function to zmq::error_t to access errnum
REVERT: dace2473f1 Burak Arslan added to the AUTHORS file
REVERT: 3eb935ef6e switch to c++-specific headers
REVERT: 9a1d4df0fd fix typo, destroy new engine
REVERT: 465da7b17e drop connection requests with duplicate peer identity
REVERT: 401986e6bb Build with MSVC2005 fixed
REVERT: e1debf15bb Update to OpenPGM 5.0.91.
REVERT: 11af0fcc54 Merge branch 'maint'
REVERT: 8ef53c0dc6 Fixes build on Linux using Sun Studio compiler
REVERT: 71bef330fc handle decoding malformed messages
REVERT: 8d6979922e Changes for MSVC OpenPGM build.
REVERT: da59f8dd7a Merge branch 'maint'
REVERT: 21b0c0b4f7 SunStudio fixed.
REVERT: e73c96ba30 Minor comment improvement.
REVERT: 0c86f90280 Minor typo fixed in zmq_getsockopt(3) man page.
REVERT: a780833683 ZMQ_BACKLOG socket option added.
REVERT: e8e2944f45 ZMQ_RECONNECT_IVL socket options added.
REVERT: 8b8837688a Couple of bugs in zmq_poll fixed.
REVERT: 72b15a6dae Implementation of zmq_strerror moved from zmq.cpp to err.cpp
REVERT: 61d38fbeed Bug in low precision clock fixed.
REVERT: 0a03e86e95 ZMQ_LINGER socket option added.
REVERT: a1474e3057 Cancel tx_timer_id in pgm_sender_t::out_event().
REVERT: 733c6780c5 Minor code clean-up to keep clang compiler happy.
REVERT: b95f11aa0a Don't set pedantic to yes if using ICC
REVERT: 48b0a901b8 Obsolete compile-time option removed.
REVERT: ae5a3c8a99 Merge branch 'maint'
REVERT: 710615cdab Version number increased.
REVERT: 18d46c8104 Merge branch 'maint'
REVERT: 53d1677c8b Update NEWS for 2.0.10 release
REVERT: 027eed41b8 Merge branch 'maint'
REVERT: 6e95205333 Fix memory leak under Windows
REVERT: 2e9871ce34 Merge branch 'maint'
REVERT: 5b44025602 maint: Upgrade OpenPGM to 2.1.28~dfsg
REVERT: eeb8e7c8be Merge branch 'maint'
REVERT: 3cf01bf56e Makefile.am: Add missing files to distribution, improve maintainer-clean
REVERT: 3b3df731e6 configure.in: Extract API version from zmq.h
REVERT: 7b9e39724e Minor fix in devpoll.hpp
REVERT: 17b0785744 Destructor of poller_base_t made virtual.
REVERT: 3e74a439c4 Cast execute_timers() result to int
REVERT: b64b50ae21 Timers correctly canceled by PGM engines on shutdown.
REVERT: e288f7a347 Fixes build on Linux using Sun Studio compiler
REVERT: e33e4d7650 ICC related qualifier fix
REVERT: 03a18c27ac zmq::clock_t : return correct value in rdtsc() on solaris
REVERT: 26d7669464 Added bin directory to ignore list.
REVERT: b7386f5b50 To insert to associateive STL containers value_type used instead of make_pair
REVERT: f9e6d94be5 zmq::poller_base_t : workaround for sunstudio compiler in add_timer()
REVERT: cafcdbbe2b Safety measure in zmq_msg_close implemented
REVERT: b174ad2c45 zmq_poll man page fixed to reflect the precise timeout semantics.
REVERT: da73b7c6f6 zmq::devpoll_t : correct a typo in loop()
REVERT: e2167cecae Precise timouts in zmq_poll implemented
REVERT: 9d96e0037a Clean-up of the code related to attaching/detaching engines to sessions.
REVERT: 5ae878b891 Merge branch 'maint'
REVERT: 2568947a71 Add support for RHEL6 in the spec file
REVERT: 954d7f743d Avoid duplicate creation of pipes for a single session
REVERT: c6d74e0a03 Drop PGM parameters to 100mb friendly range.
REVERT: 5b8af52efc Fix assertion in PGM transports on cancel_timer
REVERT: e168173162 Merge branch 'maint'
REVERT: 57428db898 configure.in: Do not patch libtool rpath handling
REVERT: 6cd0867f02 Fixing the Red Hat packaging
REVERT: f22e85f19f Reverting commit 1d431190f50c86f62460
REVERT: 73e7ef37c2 When XREP silently drops message, it does not empty it -- fixed
REVERT: f5030a93a5 Execute the timers before pollset initialisation.
REVERT: 318cdd1f24 Merge branch 'maint'
REVERT: ef8db789a1 Version macros added
REVERT: 214b56077a Fix missing platform.hpp in zmq_connecter.cpp
REVERT: daf5d3273b More cleanup of session termination process.
REVERT: f90c8d957e Scalability improvements for large amounts of connections
REVERT: 7a685b0f88 Clean-up of session termination process
REVERT: 965fb7755b configure.in: OpenPGM no longer requires pkg-config
REVERT: d62d721f1a configure.in: Add amd64 to OpenPGM supported platforms
REVERT: 1d431190f5 make sure that reader does not terminate in the middle of a multipart message
REVERT: 2142b8918a issue 92 -- Assertion failed: inpipe && outpipe (pair.cpp:86) -- fixed
REVERT: 1a6cd59e8b stress test for shutdown process added
REVERT: 2a85cce189 Merge branch 'master' of github.com:zeromq/zeromq2
REVERT: 0bb76b667b assert when xrep socket gets reconnected in the middle of the shutdown -- fixed
REVERT: 8f9080ebb9 zmq_poll(): Fix busy-loop if timeout is zero
REVERT: ac9b05c36b Merge branch 'maint'
REVERT: 79aea5ffa6 zmq_msg_move called on uninitialised message in xrep_t::xrecv -- fixed
REVERT: 98fa2fa802 fix in XREP's fair queueing mechanism
REVERT: 7881ba1bcd minor whitespace fix
REVERT: eaa925eca7 FreeBSD doesn't define MSG_ERRQUEUE -- now it's defined in 0MQ
REVERT: ec2e85919e C++ binding destructors don't throw exceptions
REVERT: d14be62499 more fixes to (e)pgm transport
REVERT: 96d85b2098  * Add assertions to check for OpenPGM calls with invalid parameters.  * Assertion to check that pgm_getaddrinfo is actually returning something.  * Missing pgm_connect call.  * Typo on TOS causing immediate abort.  * Placeholder calls for timeouts whilst continuing spin loop functionality.  * OpenPGM v5 now supports reference counting so remove init checks.  * Duplicate UDP unicast port setting, requires one unicast and one multicast.  * Incorrectly set socket rcvbuf size with sndbuf.  * Replace std::lexicographical_compare of TSI's with long word integer comparisons.  * pgm_socket_t::receive returns -1 on no data.
REVERT: 00cd7d49c7 Upgrade to OpenPGM-5.0.78
REVERT: 10bb9d0405 Dhammika Pathirana was missing from the AUTOHRS file for some reason -- fixed
REVERT: 87beaaa00d ZMQ_TYPE socket option added
REVERT: 6715f9b185 Merge branch 'maint'
REVERT: c1deb226f4 crash when closing an ypipe -- fixed
REVERT: f61921d096 REQ socket can die when reply is delivered on wrong unerlying connection -- fixed
REVERT: 16c3884a61 MSVC build fixed
REVERT: e2f834d294 ZMQ_FD and ZMQ_EVENTS documentation added
REVERT: 30c1cba4e4 latency optimisation for the case where there are no timers
REVERT: 238640a526 timers properly implemented
REVERT: 8d7bf6684c common base for all pollers created; the only thing it handles at the moment is 'load'
REVERT: cf815e8c78 new interfaces for timers; the implementation is not changed yet
REVERT: be79a9fbc2 minor beautifications
REVERT: 5dae27d0ed clock_t class added
REVERT: 7d5061798c Merge branch 'maint'
REVERT: 9129b79248 if TSC jumps backwards (in case of migration to a different CPU core) latency peak may occur -- fixed
REVERT: e478468e52 minor error in comment fixed
REVERT: 9c11886600 The flag in the socket has clear semantics now -- it tracks whether corresponding context was closed, it doesn't track whether zmq_close was called on the socket itself
REVERT: 4d51a52874 zmq_poll (select version) now correctly assumes that ZMQ_FD is edge-trigerred
REVERT: f49b77eedc zmq_poll honours ZMQ_FORCE_POLL and ZMQ_FORCE_SELECT options
REVERT: 1abfc92d26 minor problem in zmq_poll (select version) fixed
REVERT: 328c92a0a7 problem with engine being attached to session while it's being terminated fixed
REVERT: 1d2399720b zmq_init_t destroyed zmq_engine_t before plugging it out from the poller first -- fixed
REVERT: cda3c96a7f minor code reorganisation in ctx_t::terminate
REVERT: 938689a491 synchronisation problem fixed in ctx_t
REVERT: 471013a59f two races fixed in session creation
REVERT: 1f10208ad0 termination of pipe via delimiter message could stuck when no data were read from the pipe (because connection wasn't active) -- fixed
REVERT: 5153b6368b obsolete 'active' flag removed from session_t
REVERT: 4c6d07d366 single term ack counting mechanism for every socket (no separate mechanisms for fq_t and lb_t)
REVERT: fb6ce536d9 more details on launch_sibling in comments
REVERT: 0c215fada4 potential duplicate termination of pipes removed
REVERT: c7b9ba3ccd reconnection process fixed when failure occurs during init phase
REVERT: 85aa25e56c bug in REQ+multipart fixed
REVERT: ff1080728f Merge branch 'maint'
REVERT: e2802d9a4b values of RATE, RECOVERY_IVL and SWAP options are checked for negative values
REVERT: be159b6316 zmq::writer_t: Add missing test for swap
REVERT: 92f9136ca6 lefover assert removed
REVERT: a68e6739f4 when no I/O threads are available error is raised instead of assertion
REVERT: 47e87b7e4b EMTHREAD error code returned to zmq.h to ensure backward compatibility
REVERT: 91ea204644 EINTR returned from the blocking functions
REVERT: f374431ebe get rid of 'has virtual functions but non-virtual destructor' warnings in pipe.hpp
REVERT: 6d4ffd90db Bug in fq_t and lb_t (when used via ZMQ_EVENTS option) fixed
REVERT: b4740c14e7 Merge branch 'maint'
REVERT: 01c463cc89 Version number incremented to 2.0.10
REVERT: ebf3089735 NEWS updated for 2.0.9
REVERT: d4c8de5050 Merge branch 'maint'
REVERT: 1e8451961e Update .gitignore
REVERT: 32fd916c73 doc: Add 0MQ version to XHTML11 backend footer
REVERT: a6d3629fb4 build: Generate ChangeLog in 'make dist', ZIP automatically
REVERT: 76f2e5d544 Merge branch 'maint'
REVERT: db7fe858d6 Broken device numbering reverted
REVERT: 10227899b1 assert on malformed messages
REVERT: c2f3b3b445 forwarder and streamer devices handle multi-part messages correctly
REVERT: ae567be0c2 improved null checking in zmq_term
REVERT: ca176121de Merge branch 'maint'
REVERT: 51a84c15de zmq::select_t, zmq_poll(): assert if FD_SETSIZE reached
REVERT: f850190c16 zmq.h: Fix typo and use of C99 comment
REVERT: 2673a84e07 Merge branch 'maint'
REVERT: ee3444ff93 doc: Update zmq_socket(3) for 2.0.8 API changes
REVERT: 26b39bcdef Revert "Added man page for the zmq_device method"
REVERT: 8800ac7de5 Revert "Added clean target that deletes generated man pages"
REVERT: 32baeb610e Revert "Various changes to documentation project:"
REVERT: 4cb6dbd52f Revert "Reverting 'clean' change to Makefile"
REVERT: 48d3e2d660 Revert "Removed empty man pages for old standalone devices"
REVERT: 6c393f53e2 Revert "Further cleanups on reference manual"
REVERT: 6647e61243 Revert "Small improvements to zmq_device(3) page"
REVERT: 83d253d72d Revert "Removed wip zmq_deviced from master"
REVERT: 0a1f7e3524 Merge branch 'maint'
REVERT: 14853c2db5 Prior to this patch prefix_tree asserts.
REVERT: 8ec0743c75 Fix for signaler_t on HP-UX and AIX platforms
REVERT: d5b6f680a5 Mikael Kjaer added to AUTHORS
REVERT: a81a37399b Merge branch 'maint'
REVERT: 59315ebdcb Erasure of retired fd's in select.cpp causes an assertion in MSVC 2008 STL
REVERT: 47aaf10211 Merge branch 'maint'
REVERT: 99ddfa7d65 maint: will become 2.0.9
REVERT: 0fe7d3c998 conflicts resolved
REVERT: 651c1adc80 sys transport introdced; inproc://log moved to sys://log
REVERT: 6a0c323bb2 MSVC build fixed
REVERT: ce0972dca3 context creates an inproc endpoint ('inproc://log') to distribute 0MQ's log messages
REVERT: db73c76314 assert when pipe attaches to PUB socket in process of termination -- fixed
REVERT: aaa07613d3 pipe being attached to the PAIR socket during its termination process is immediately asked to terminate itself
REVERT: 47c064f2ea hangup when closing socket with no pipes attached -- fixed
REVERT: 090e460d6f naming cleanup: yarray->array
REVERT: f5acbb5095 naming cleanup: zmq_encoder->encoder, zmq_decoder->decoder
REVERT: e45583c0f2 OSX build fixed -- semaphore replaced by mutex
REVERT: f0a36f9994 Minor patch to zmq_cpp(7)
REVERT: fba90af8a7 Issue 54 - socket_base.cpp:162 comparison error
REVERT: 68d62cfb4e MSVC build fixed
REVERT: 0a8473dedd Added tests for transports per socket
REVERT: 6ec783e702 prefix_tree_t renamed to trie_t
REVERT: beea535f9d swap's block size made into a compile-time parameter
REVERT: d8b975f4e7 msg_store_t renamed to swap_t
REVERT: d90b407115 refactoring of pipe/swap interaction
REVERT: 42000d2c4f terminology unified: revive->activate
REVERT: 92923cd40b bug in pipe deactivation fixed
REVERT: 035c937ee7 zmq_poll: account for the fact that ZMQ_FD is edge-triggered
REVERT: 67aa788577 Fixed socket states in tests
REVERT: 4d9b046977 two tests added
REVERT: 0b76f234a2 Merge branch 'master' of github.com:zeromq/zeromq2
REVERT: 35cb1fade6 Add a basic framework for a test suite
REVERT: 98dc11843e assert on malformed messages
REVERT: 56faac7f19 zmq_poll returns prematurely even if infinite timeout is set - fixed
REVERT: 3cb84b5cea forwarder and streamer devices handle multi-part messages correctly
REVERT: 43f2c6ff5b improved null checking in zmq_term
REVERT: b608c19c5a MSVC build fixed
REVERT: 9b8993efb4 elementary fixes to the named session
REVERT: 46d7055565 connecter object unregisters its fd correctly
REVERT: 87655b0b9d listener object unregisters its fd correctly
REVERT: 0d5f3ebbda sessions created by listerner are correctly shut down
REVERT: 5a731e73c8 added ZMQ_MAKE_VALGRIND_HAPPY compile-time option
REVERT: 43e34d0281 engine leak fixed; pgm compilation fixed
REVERT: 45f83d78a5 one more dezombification bug fixed
REVERT: 936dbf956b dezombification procedure fixed
REVERT: 76bd6e73c3 engine termination on disconnect fixed
REVERT: d13933bc62 I/O object hierarchy implemented
REVERT: ee1f1af009 zmq_poll(): Fix some corner cases
REVERT: a85d1e51bf zmq_poll(): Rewrite to use ZMQ_FD/ZMQ_EVENTS pt2
REVERT: 6b1ca2cb1e Fix whitespace
REVERT: cd12508418 zmq_poll(): Rewrite to use ZMQ_FD/ZMQ_EVENTS pt1
REVERT: eb7b8a413a REP socket layered on top of XREP socket
REVERT: 3e97c0fef4 REQ socket implementation is layered on top of XREQ
REVERT: f77edfce26 Destruction of session is delayed till both in & out pipes are closed
REVERT: 05d908492d WIP: Socket migration between threads, new zmq_close() semantics
REVERT: b7e0fa972f 'master' will become 2.1.x release
REVERT: 1e089f7163 Update ChangeLog for v2.0.8
REVERT: c9076c5d8b Basic documentation for XREQ/XREP socket types
REVERT: 6d275a8788 Updated NEWS for stable 2.0.8 release
REVERT: 98bea86240 Updated NEWS for stable 2.0.8 release
REVERT: d788c1f7e4 Updated NEWS for stable 2.0.8 release
REVERT: c06a3cc510 Update version number to 2.0.8
REVERT: b66dd7afd2 zmq_stopwatch_stop: Don't return EFAULT
REVERT: 2b2accb8bf Added calls to zmq_msg_close in examples
REVERT: c52d1f2d47 Fixed example for multipart zmq_recv()
REVERT: 87612be91d Merge branch '46_device_robustness'
REVERT: de0035b6d9 Fixed git URL in README
REVERT: 7aba2d1033 documentation leftover from v2.0.6 cleaned in zmq(7)
REVERT: de0173754c Removed wip zmq_deviced from master
REVERT: 5be54b9120 46 - Devices vulnerable to invalid messages
REVERT: e74d350068 Fixed (un)signed type errors in get/setsockopt manual
REVERT: a12f446c4c Modified zmq_tcp(7) to emphasize wildcard interfaces
REVERT: b6cdd369e3 Added error checking (EFAULT) for null arguments
REVERT: 677b3d906a Added not-null assertions on pointer arguments in C API functions * zmq_term * zmq_socket * zmq_close * zmq_setsockopt * zmq_getsockopt * zmq_bind * zmq_connect * zmq_send * zmq_recv * zmq_poll * zmq_device * zmq_stopwatch_stop
REVERT: b579aa9510 Merge branch 'master' of github.com:zeromq/zeromq2
REVERT: 6d35e82db4 Fix uninitialized use of nbytes in signaler fix
REVERT: 2100a91333 Merge branch 'master' of github.com:zeromq/zeromq2
REVERT: 16b43e657b Merge branch 'master' of github.com:zeromq/zeromq2
REVERT: 9ac2ff449c zmq::signaler_t: Restart syscalls on EINTR
REVERT: 78e9ee84bf Fixed MSVC project for PULL/PUSH
REVERT: 96bcc9e6cf Small improvements to zmq_device(3) page
REVERT: 13f3481e12 Further cleanups on reference manual
REVERT: 6ff193999d Removed empty man pages for old standalone devices
REVERT: c51de31f2f Reverting 'clean' change to Makefile
REVERT: 77a3c36ff1 Various changes to documentation project:
REVERT: 6cd9030447 Added clean target that deletes generated man pages
REVERT: f575f252c9 Added man page for the zmq_device method
REVERT: 11a410b658 Renamed ZMQ_UPSTREAM to ZMQ_PULL, and ZMQ_DOWNSTREAM to ZMQ_PUSH.  Left the old definitions as aliases, to be removed in release 3.0.  Also renamed the source files implementing these two socket types.  This change does not break existing applications nor bindings, but allows us to fix the documentation and user guide now, rather than keeping the old (confusing) names.
REVERT: 544b36da68 XREQ: Correct behaviour on hitting ZMQ_HWM
REVERT: 66470b2c55 perf: fix typo
REVERT: 10533a560b pipe: check_read() should check for message delimiter
REVERT: e1c596b37e Make sure lwm > 0 when hwm > 0
REVERT: 5b1a6a4bea Issue 42 - getaddrinfo() fails
REVERT: aedf3f808b EHOSTUNREACH is a valid return value from recv()
REVERT: 269904361b minor comment clarification
REVERT: da49e5a4dd devices exit in case of context termination
REVERT: ca057c7db8 Fix identity generation for transient inproc connections
REVERT: 1f61c87ac5 issue 40 - nbytes != -1 (tcp_socket.cpp:216)
REVERT: fd707fedc5 issue 38 - Assertion failed: fetched (xrep.cpp:196)
REVERT: 805af8241d asciidoc.conf was missing from distribution tarball
REVERT: 0ab6532419 Prevent socket reuse by second bind, on win32
REVERT: 79a3d07c85 MSVC build fixed
REVERT: ba91644fdb msg_store added to MSVC build
REVERT: 1dda8a2aaa Used more expressive variable names
REVERT: fca2e8e8cc Add SWAP support
REVERT: 10c28c1fc2 Revive reader on pipe termination
REVERT: 2c3913bb19 fix double free error in PAIR socket
REVERT: cff7ba2315 Windows build fixed
REVERT: 7f01e9970d stopwatch returned to libzmq
REVERT: 4777fe4010 pipe: fix bug in rollback() method
REVERT: 9151de3895 generate identity for transient inproc connections
REVERT: 341e8a2673 test commit
REVERT: 9858447fad getsockopt documentation fixed
REVERT: ac90b7e0ba issue 35 - ZMQ_RCVMORE sometimes erroneously returns false
REVERT: 5ee355d188 if connect asserts, exact error is reported
REVERT: 27877d73ea EHOSTUNREACH is acceptable outcome from connect
REVERT: c818b14bbd clearing thread info structure
REVERT: 74a3907be2 couple of ICC warnings fixed
REVERT: 8782b4d696 -lcrypto added to linking flags for QNX
REVERT: 76e0153d4f issue 33 - missing virtual destructors
REVERT: d329c55da9 issue 31 - Assertion failed: err == ECONNREFUSED || err == ETIMEDOUT (tcp_connecter.cpp:296)
REVERT: 604f7475ec issue 32 - poll_t poller broken
REVERT: 7a29e8594f Piotr Trojanek added to AUTHORS file
REVERT: 751b60a18d extra ';' inside a struct or union -- clang warnings fixed
REVERT: 240fc33f65 minor comment clarification
REVERT: 784e73a7c8 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: ce53d02e05 C++ docs for zmq::poll function improved
REVERT: 8f51a10918 Update ChangeLog for v2.0.7
REVERT: 5c97ff9a2e More NEWS for 2.0.7
REVERT: e8a9614aae Update NEWS for 2.0.7 release
REVERT: 9b8f902d72 initial version of 2.0.7 NEWS
REVERT: baf659fde5 Move news from ChangeLog into NEWS
REVERT: 94dfe1368a Fix MINGW build
REVERT: cf048bb1f8 platform.hpp for MSVC contains only very basic stuff
REVERT: 927993863e MSVC build fixed
REVERT: 621d7415b3 Fix Solaris/NetBSD breakage in atomic_ptr.hpp
REVERT: 67ca7dcbe6 obsolete API elements removed - this commit breaks backward compatibility
REVERT: d844a90690 zmqd: Removing for now, not ready for 2.0.7
REVERT: 606c77368c Move perf helper functions to perf/helpers.cpp
REVERT: 05b4a7ae78 Remove PGM examples from build
REVERT: 4d65d7a5a9 Documentation: zmq_tcp(7) update for 2.0.7
REVERT: 7fc15c21a1 Documentation: zmq_cpp(7) update for 2.0.7
REVERT: 10f4bf3f35 Documentation: Cosmetic changes
REVERT: 8076fd1a3a Documentation: zmq_errno(3)
REVERT: 7c9b09bc51 Documentation: Flow control, zmq_socket(3)
REVERT: 9d00d300b0 Documentation: zmq_init() API changes for 2.0.7
REVERT: 8ba1d3c8ed Documentation: zmq_term() and ETERM for 2.0.7
REVERT: 74a03dfd7d Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: 8a77135079 Pieter Hintjens added to 'authors' section
REVERT: 0b0716661e multiple vulnerabilities in xml paerser fixed
REVERT: 99e6179edd Documentation updates
REVERT: b4f3e0acd7 Documentation updates
REVERT: 7bbe754cb4 Documentation updates
REVERT: 8a4df431de Documentation updates
REVERT: dfbaf4f966 Documentation updates
REVERT: 0fa73b0394 Documentation updates
REVERT: eb9ff1e779 Documentation updates
REVERT: 8becacf82c Documentation updates
REVERT: be6019abd1 issue 28. - SNDMORE/ RCVMORE is dropping every other message
REVERT: 2e9be56a40 memory leak in REQ socket fixed
REVERT: 3bb60da0d0 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 04fcd4d55b memory leak in REP socket fixed
REVERT: da37c45b0c Clarify zmq_bind/zmq_connect
REVERT: 74f1a4a579 RPM packaging cleanups
REVERT: b4cc7b97ec dist-hook for copying zeromq.spec to top-level
REVERT: 8bd3f743f5 Import redhat packaging
REVERT: 5219e4ce8f Clarify socket types in documentation, reinstate ZMQ_PAIR
REVERT: 8408ae066d LWM is computed rather than explicitly specified by user
REVERT: f34a468a26 coding style fixed in zmqd
REVERT: 7773fdddfb Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 091e92a11d Pieter Hintjens added to AUTHORS file
REVERT: 89783c37d2 incomplete messages can be stored in ypipe
REVERT: f40ce4e500 single 0MQ daemon (zmqd) - initial version
REVERT: 6705a3d580 some more sanity checks in pgm_socket
REVERT: ff9d398555 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 56262d7ba7 some more sanity checks in pgm_socket
REVERT: f6c1c97242 Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: 52ef3f3f2c Revert commit 7cb076e, atomic ops cleanup
REVERT: 127cb89ac1 MAINTAINERS file added
REVERT: 8e5ac100c9 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 714a8d50a0 fixes for OpenVMS
REVERT: 9fbb9141a8 Update historic include paths
REVERT: 9d16a415cb OpenPGM build flags cleanup
REVERT: 2cf9f04a46 Update OpenPGM to version 2.1.26
REVERT: a25414e55c Fix in zmq_poll (Windows version)
REVERT: 4d33c43913 caution about zmq_msg_init_* functions added to the docs
REVERT: 4a3b857c4c commands not processed immediatelly in some scenarios; fixed
REVERT: 36b044a0d5 ZMQ_PAIR socket removed from the documentation as it is unfinished yet
REVERT: f60d891b23 Issue 23. zmq_init() crashes on illegal numbers
REVERT: 64c58662b7 MSVC build fixed
REVERT: 835e893e54 dispatcher_t class renamed to ctx_t
REVERT: 10f5334f28 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 44dd005ff0 number of application threads to use 0MQ sockets is unlimited; app_threads parameter in zmq_init is unused and obsolete
REVERT: 3f5465ada1 Windows port fixed
REVERT: 235ed3a3dc signaler transports commands per se rather than one-bit signals
REVERT: 8b9bd05726 thread ID and dispatcher made private in object_t
REVERT: 84e0c7991a queue device fixed
REVERT: 4a6bac1dea Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: acfd0f8ca2 prefix in XREP recv'd message misses MORE flag
REVERT: beb4da3c28 windows port fixed
REVERT: ae93ed318a signaler rewritten in such a way that any number (>64) of threads can be used
REVERT: 1ffc6dd41f eventfd-style signaling removed
REVERT: 37128b7b1a fd_signaler_t renamed to signaler_t
REVERT: c193fd1466 lock-free polling removed; ZMQ_POLL flag removed
REVERT: 7cb076e56a Defer NetBSD atomic ops to GCC builtins. Revert Sun atomic ops #define.
REVERT: ad6fa9d0d4 initial version of multi-hop REQ/REP
REVERT: 1ad6ade0ed MSVC build fixed
REVERT: beffee92a8 P2P renamed to PAIR
REVERT: 7d9603d722 Bug in zmq_queue fixed
REVERT: d524c4e15d fix of documentation typo
REVERT: 1c33941be9 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: ea18d30c20 atomic_ptr fix of Win64
REVERT: 370cde0922 win build fixed
REVERT: 0024d29076 Build fixes for cross compiling and Win32
REVERT: 3496476939 MSVC perf build fixed
REVERT: 7668e7976d zmq_poll returns ETERM in case of context termination
REVERT: 3236cb1a54 ETERM is accounted for in the documentation
REVERT: fba28c7c0c issue 1 - Change zmq_term semantics
REVERT: dff79d778d version number bumped to 2.0.7 for MSVC build
REVERT: 6cf076510a C-style comments in zmq.h
REVERT: 00cf3ceb8d multi-part message functionality available via ZMQ_SNDMORE and ZMQ_RCVMORE
REVERT: 6fea422583 getsockopt added to c++ binding
REVERT: b668387d91 Remove -Wxxx gcc-isms from subdir Makefiles
REVERT: f6fa41dd7b Compile perf tests with the C++ compiler
REVERT: c214a24f06 fix for Sun C++ 5.8
REVERT: 770aedbd09 Build fixes for Solaris and non-GNU compilers
REVERT: 1dc0380e29 Debian packaging fixes suitable for 0MQ git
REVERT: 8aa2acd0f8 Debian packaging update from Adrian von Bidder
REVERT: 1d28dc9059 Fix for Issue #14
REVERT: 6ea76e9573 version bumped to 2.0.7
REVERT: 716f4ac871 zmq_getsockopt function added
REVERT: 027bb1d2a7 issue 10 - zmq_strerror problem on Windows
REVERT: 5cd9f74a70 few fixed related to multi-part messages in REP socket
REVERT: 77cbd18e9c issue 11 - Assertion failed: it != peers.end () (pgm_receiver.cpp:161)
REVERT: 38e9103e0c issue 13 (Assertion failed: load.get () == 0 (epoll.cpp:49)) fixed
REVERT: 0f7aab5212 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 745db9c574 unitialised member in seesion_t class - fixed
REVERT: b0250cc89d Win32 build fixed
REVERT: 065e4d00ff Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: edfd05df8e devices can be created via API
REVERT: a7973a2c49 Documentation fixes
REVERT: 0777567e89 ENODEV from zmq_bind error described
REVERT: 37fd1a77a6 Handle full-pipe for REP sockets more gracefully
REVERT: 2f219d7c28 ZMQ_TBC renamed to ZMQ_MORE
REVERT: 842b4dd2e4 muti-part message functionality available via API
REVERT: 8d8e0857be as advertised, zmq_flush and ZMQ_NOFLUSH were removed
REVERT: 06538fc117 multi-part messages work with REQ/REP sockets
REVERT: bbfac783f9 multi-part message work with UPSTREAM/DOWNSTREAM
REVERT: ed291b0251 multi-part messages work with PUB/SUB
REVERT: 0b9897b141 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 783463ac49 Clarify use of poll() with C++ API, fix typo
REVERT: c802a72a0b configure does not mention xmlto when missing
REVERT: 0a53ff7b9f Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 93bdb792a9 PUB socket was blocking occassionally - fixed
REVERT: f031677100 rollback of half-processed messages in case of disconnection
REVERT: dfdaff5eba XREP-style prefixing/trimming messages removed
REVERT: cbaf10978a fixes for building with Sun CC
REVERT: ae35a1644c fix include paths in perf on Win32
REVERT: 49a30d49f3 Update contributors for 2.0.6
REVERT: fe18ce1aba ChangeLog for v2.0.6
REVERT: 38c942ae64 Add Git location to README
REVERT: 6d5a9e9640 Update README
REVERT: ad75d02134 Add MSVC build files to distribution
REVERT: a9e0c3cd7e Removing leftover MSVC builds
REVERT: 5472861179 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 8a3f97400a Clarify zmq_poll restrictions
REVERT: 1705ec2247 C++ interface documentation updates
REVERT: 8fcf6ffb67 Cleanups to autogen.sh
REVERT: fceba03627 Cleanups to autogen.sh
REVERT: 61ad236e95 ZMQ_NOFLUSH and zmq_flush obsoleted
REVERT: c42343d3f0 pipe_t::rollback removes only unfinished message from the pipe rather than all unflushed messages
REVERT: dcb983699e zmq_queue implementation added
REVERT: 22db38bf3d MSVC build: C++ perf tests removed; all executables go into bin directory
REVERT: c08a7f8896 C perf tests are built non-optionally; C++ perf tests removed
REVERT: 1fbeba2fe3 simplify configuration summary
REVERT: 66b67fbdf2 devices are built unconditionally
REVERT: 430aa53334 text concerning language bindings removed from configure
REVERT: 54df388ace Java binding removed from MSVC build
REVERT: 6badd204d5 Implement flow control for ZMQ_REP sockets
REVERT: 923609b092 Implement flow control for ZMQ_REQ sockets
REVERT: 42e575cb6b Implement flow control fox ZMQ_XREP sockets
REVERT: e34184acc3 Implement flow control for ZMQ_XREQ sockets
REVERT: 06d7a44737 Implement flow control for ZMQ_PUB sockets
REVERT: f9c84a1a68 Implement flow control for ZMQ_DOWNSTREAM sockets
REVERT: 5d4f6b18cd Implement flow control for ZMQ_P2P sockets
REVERT: f9521c6b6a PGM: implement flow control
REVERT: 61ee6fae53 Implement flow control
REVERT: 31d36104aa devices/ build fixed
REVERT: 10bbe6af99 Cleanup .gitignore
REVERT: 27e2d08449 Restructure language bindings
REVERT: 90944759b6 Removed Java binding from core distribution
REVERT: 9fda070e4d Typeset literal correctly
REVERT: 0a1e0beaa2 Fixes to PGM wire format description
REVERT: 5fef480aeb Fixes to TCP wire format specification
REVERT: 8f90ae8dfd wire formats in docs clarified
REVERT: 98801ebcae Documentation fixes
REVERT: bc468b3451 Add missing section with zmq_version()
REVERT: edebff902a Add dependency for zmq_epgm.7
REVERT: ca70b40383 Hack, zmq_epgm.7 needs to be copied from zmq_pgm.7
REVERT: 1aee86408d Documentation rewrite
REVERT: d790940fd0 udp transport renamed to epgm
REVERT: 5a776f5597 PGM late joiners would start receiving a complete message rather than a message part
REVERT: 0f891e091c message flags from the wire are written to zmq_msg_t and vice versa
REVERT: 531c6af0d4 message flags added to zmq_msg_t strcuture
REVERT: 96ccc1c5fc 'flags' fields added to the wire format
REVERT: e04e2cdbba rollback functionality added to pipe
REVERT: 9481c69b0f problem with NIC name resolution on OSX fixed
REVERT: 26b0aea24f Win32 build fixes
REVERT: 352da8ae87 type mismatch in tcp_listener (win version) fixed
REVERT: 14054ecce7 Fix typo: zmq_close -> zmq_msg_close
REVERT: 708298d798 Fix possible lockups when reading from ZMQ_REP sockets
REVERT: 157a66fc42 polling on POSIX sockets returns POLLERR (win32)
REVERT: 4e7158b67d return POLLERR from polling on POSIX sockets (linux version)
REVERT: 7442f53956 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: ea0a44c8a9 Ruby binding removed
REVERT: 83f85ea51d ruby binding removed from msvc build
REVERT: 696ada8833 python binding removed from nsvc build
REVERT: 45414b5444 python binding removed
REVERT: efefa069b2 Cygwin support
REVERT: deda7ca54a Java Poller patch
REVERT: 4a1a83887d Win32 build of Java binding fixed
REVERT: 4440b13c35 Poller object implemented in Java binding
REVERT: 1c4daf79ce MIT license text added
REVERT: 57e057c825 1st version of Java poll added
REVERT: ed8fe68383 handle invalid PGM connection string decently
REVERT: be51cfa419 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 0b4172b868 minor cast issues on cygwin fixed
REVERT: b7f01f9071 chat example removed from win build; missing fd_signaler_t::poll on win added
REVERT: 476ebde628 use binary UUIDs instead of string representation to save some bytes
REVERT: cc5c30f5dc Fix: OpenPGM is now distributed as .tar.gz
REVERT: bba36e6ee6 Disable IPv6 support
REVERT: 39b8961974 Update OpenPGM to 2.0.24 (stable)
REVERT: ccd47f1ee8 chat example moved to separate repo
REVERT: 8980a98582 zmq_error used from ruby binding
REVERT: 551fa104ff zmq_errno used in C++ binding
REVERT: 95329719cd zmq_errno is exported from the DLL
REVERT: 2441ef11a2 zmq_errno helper function added
REVERT: 2dd55605ea recv fails after polling for IN on REQ socket
REVERT: 025c9e173c execution disabled on certain source files; some comments on java binding; MSVC temp files added to .gitignore
REVERT: 71b4947f95 Win32 build fixed
REVERT: 7c0df6ee02 Java binding beautified, inline documentation added
REVERT: ef1b597489 minor fix in zmq_socket(3) man page
REVERT: b9a612ff3f Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: f24955519a zmq_poll doesn't exit when infinite timeout is set and interrupt occurs
REVERT: 61f0ef569b NetBSD: Check for and use atomic_ops(3) if available
REVERT: 3a69cca386 Fix $build_doc/$install_man check yet again
REVERT: 1294c1d33a typo in zmq_ipc(7) fixed
REVERT: ff99d753ae Minor buid system tunning
REVERT: 740e531fbb Aleksey Yeschenko added to the credit section of AUTHORS file
REVERT: 57148b1fde Add missing check for install_man=yes
REVERT: 8b86dcf81c build on cygwin enabled
REVERT: 727054547f don't check for identity, if the connection is anonymous
REVERT: aff1f6621a Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 75f571c884 Multi-hop REQ/REP, part XII., generate unique identities for anonymous connections
REVERT: 2a79a943de Add NetBSD support
REVERT: 776b126339 Fix typo
REVERT: ab27f84b14 libstdc++ depends on libm on some platforms
REVERT: 495f0d105f Fix detection of libstdc++
REVERT: 46824abeb2 Never build docs from tarball releases
REVERT: 8be491b7bd Use feature test macros more conservatively
REVERT: d008637bc4 one more attempt to fix the previous win32 problem
REVERT: f97da5e644 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: e385319e5a recv returning -1 while errno=0 fixed
REVERT: 41354bfa98 zmq_version fixed on Win32 platform
REVERT: f745c96a9b Add POSIX and GNU Feature Test Macros
REVERT: 9d8623b28f ZMQII-76: Bug in how replies are handled when the REQ endpoint goes away
REVERT: 33cb20a747 ZMQII-77: Put librbzmq symbols into ZMQ module
REVERT: 1e7878489d exconf.rb checks for libzmq.so installation
REVERT: 8214d386c3 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 4190f64d8c Special exception clause added to LGPL license
REVERT: 96b2690716 Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: 60ce5cc82a PGM tarball should be removed on 'distclean', not 'clean'
REVERT: b9caa319e2 Multi-hop REQ/REP, part XI., finalise the XREQ/XREP functionality
REVERT: 2ddce20535 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: a2f9899f6a missing COPYING file added
REVERT: afb526f31a Fix 'make dist' to work with no special magic
REVERT: 8e9b78af27 Correct path for pgm distclean
REVERT: df0c18ca17 Missed one instance of pgm2
REVERT: b09eeeb2fa Update gitignore
REVERT: 80c820d758 Cleaning up more PGM cruft
REVERT: 635e314643 Clarify python.h messages
REVERT: 55800cea8c Fix typo
REVERT: 5687661ba4 Cleanup messages from configure.in
REVERT: 48a90cfb34 Replace check for sparc with host_cpu
REVERT: 0ded6c1973 Multiple fixes to --with-pgm
REVERT: 94c74d5c18 Brian Granger added to credits list
REVERT: f96f53c968 ZMQ_POLLERR placeholder added to zmq.h
REVERT: 5041b0bc0b fixing the previous commit :(
REVERT: 7778010d76 care taken of the fact that AI_NUMERICSERV is not defined on OSX 10.5
REVERT: 817c89a78e removed first dummy run of PKG_CHECK_EXISTS
REVERT: 43620b3d35 Multi-hop REQ/REP, part X., optional delayed creation of pipes during connect
REVERT: 4405250d93 Multi-hop REQ/REP, part IX., pass the peer identity as far as socket_base_t
REVERT: f5ce81f289 Multi-hop REQ/REP, part VIII., new blob_t type used for holding identity
REVERT: cdc2efe9b5 Multi-hop REQ/REP, part VII., identity-related algorithms rewritten
REVERT: 923eacd28a Multi-hop REQ/REP, part VI., session 'name' renamed to 'peer_identity'
REVERT: 2e78e48503 Multi-hop REQ/REP, part V., peer identity is passed from init object to session
REVERT: d8430f4b9a Multi-hop REQ/REP, part IV., add command deallocation mechanism
REVERT: 313b5dfadd Multi-hop REQ/REP, part III., change 'type' in options to simple 'traceroute' flag
REVERT: 96e0442332 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 36a576370c Multi-hop REQ/REP, part I., tracerouting switched on on XREP socket
REVERT: dc8f4b1b76 Fix memory leak in bind()
REVERT: 7b4cf2a4d0 Multi-hop REQ/REP, part I., socket type is known to all associated objects
REVERT: cd7300fd4f Resolve command starvation in recv()
REVERT: 7f7ac843d5 Next 0MQ release will be 2.0.6
REVERT: de41c9da31 Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: 30b967e2a4 Integrate version numbering into autoconf
REVERT: 92d0147b20 python binding build with 2.4 version of python fixed
REVERT: 432fbd796b ZMQII-72: Add zmq_version function (documentation)
REVERT: bd9213e712 ZMQII-72: Add zmq_version function
REVERT: 7cab423fc2 Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: bc9b7f1f54 lb: bugfix - never skip active pipe when sending msg
REVERT: 6b3c1798e7 fq: bugfix - don't read msg from inactive pipe
REVERT: 354efc513f Convert documentation to AsciiDoc
REVERT: 2d44bf3644 ZMQII-69: Make 0MQ build on HP-UX
REVERT: 8c25bab31d ZMQII-70: zmq_poll on win32 fails with EINVAL
REVERT: 8f86cac2f6 ZMQII-69: Make 0MQ build on HP-UX
REVERT: fd673ae231 couple of typos in the documentation fixed
REVERT: 6b2ca4e158 ZMQII-67: Build checks for python even if it's not needed
REVERT: 4c870ede7f ZMQII-57: Shutdown OpenPGM library
REVERT: 396e41a2a4 minor change to README
REVERT: 01533a5aef ZMQII-65: Two OS threads are mapped to the same app_thread_t
REVERT: 7593d815ac  ZMQII-64: First message stuck in 0MQ in case of immediate disconnection
REVERT: 427bc3276a minor code cleanup
REVERT: b0ee6b0c8a ZMQII-62: zmq_close after sending message via P2P socket fails
REVERT: bbaa494fb5 ZMQII-59: TCP server crashes sometimes when message is send and socket is closed immediately
REVERT: d21bf21a36 allow async connect on Win32 return WSAECONNABORTED
REVERT: 0888fcd06f yqueue_t uses malloc/free instead of new/delete
REVERT: 30076c4f7a ZMQII-58: TCP connecting asserts on Win32 (same fix for POSIX)
REVERT: c46b7ed197 ZMQII-58: TCP connecting asserts on Win32
REVERT: b86483acbe ZMQII-50: Document Ruby Bindings
REVERT: bc90231227 contrain interface name resolving in OpenPGM to IPv4 interfaces
REVERT: 0f697fe2b4 ZMQII-56: Avoid allocation of chunk in yqueue.hpp by keeping a spare one
REVERT: 72bbc92b70 Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: 6502c16a7f Update OpenPGM to 2.0.23rc8
REVERT: 4172fdd697 Win32 build fixed
REVERT: 7c25feb51b ZMQII-55: At most one PGM/UDP transport can be opened
REVERT: 9cee8f9c3e problem with PGM messages larger than 1 MTU fixed
REVERT: 27e47bdcc0 ZMQII-54: Affinity isn't honoured
REVERT: 5d16070ffc ZMQII-53: Memory leak when using invalid socket type
REVERT: a1e70f2957 ZMQII-52: Asserion during reconnection
REVERT: 528610ff55 typo in zmq_socket(3) man page fixed
REVERT: 00b9a5dede ZMQII-51: Implement O(1) topic matching
REVERT: 70ea8e9d4b ZMQII-48: Implement P2P socket type
REVERT: eb47c1b064 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 2784f90d59 moving debian directory to the root of the project
REVERT: 4d5e643299 patching libtool script moved at the end of configure
REVERT: 849095a042 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: f17f0fa67b CL binding ripped out of the tree
REVERT: e5ff617c4e fixed OpenPGM compilation on mingw32
REVERT: 8f57ff4634 fixed OpenPGM compilation on mingw32
REVERT: 2056c888d2 changed version of the master branch back to dev
REVERT: 0b97e7a4f2 libpgm updated to 2.6.21rc6
REVERT: 943125bd12 Hard-wired constant on OpenVMS replaced by symbolic constant
REVERT: aa27034db5 IPv6 patch - part V. (win32)
REVERT: adc5d7693d IPv6 patch - part IV.
REVERT: fca9a2159a Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 079d327670 IPv6 patch - part III.
REVERT: 454f43a45b IP address resolving on Win32 fixed
REVERT: df4548aa76 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 2634934999 IPv6 patch part 2/2
REVERT: 6aaf095dd2 IPv6 support -part II.
REVERT: d762e1a9c9 Win32 build fixed
REVERT: 34d65e22c5 Tero Marttila's Ipv6 patch - part I.
REVERT: 6edec4fe93 zmq_udp(7) man page fixed
REVERT: 70601c243f zmq_pgm(7) man page fixed
REVERT: d1e09578b2 Hardcoded loopback address removed from fd_signaler
REVERT: f4832faf29 small fix to man pages to comply with lintian
REVERT: b1b66df37c PGM man page improved
REVERT: 66ef22993f zmq_close man page improved
REVERT: a008af6088 Asko Kauppi added to the list of authors
REVERT: f0757c003e ZMQII-43: Race condition when writing to pipe
REVERT: 6a46ca75e5 ZMQ-42: Building with ICC fails
REVERT: 111f0ff078 ZMQII-41: Poll function in C++ binding doesn't convert errors to exceptions
REVERT: 6b0457fcaa minor documentation patch
REVERT: 7094edd6ba error handling in C perf tests improved
REVERT: 4ceb839350 typos in man pages fixed
REVERT: bddff50271 ZMQII-40: wrong return code from recolve_ip_interface
REVERT: 55944729ed ChangeLog modified for 2.0-beta2 version
REVERT: f40e3a6931 version number bumped
REVERT: 51e012c446 Solaris build fixed
REVERT: a507d16e13 Win32 build fixed
REVERT: 2bb57ac57a ZMQII-39: Implement IPC transport
REVERT: 56c369272c Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: b9b0124d55 ZMQII-34: ensure that poll won't return POLLIN event when the message will be filtered out anyway (Win32)
REVERT: b60342ae1a man pages are more specific on NIC name issue
REVERT: 067ba3b9f7 ZMQII-34: ensure that poll won't return POLLIN event when the message will be filtered out anyway (POSIX)
REVERT: 06105d1642 transports man pages updated
REVERT: 30a107e06d timeout parameter for zmq_poll added in cl binding
REVERT: 20a8edcf5c ZMQII-38: Compiler complains about missing virtual constructors
REVERT: 76dbb4f3bb zmq_tcp man page added
REVERT: bcd278a5a5 ZMQII-37: SIGSEGV when polling on REQ socket
REVERT: 4c613b39fa script to convert man pages to html added
REVERT: 72b2f07a70 ZMQII-36: Chat example & forwarder broken because of changes subscribe semantics
REVERT: 65f450f22e minor man page fix
REVERT: bd07baf028 ZMQII-33: zmq_poll may exceed timeout if signal interrupts the waiting
REVERT: e806615dd1 ZMQII-31: memory leak in zmq_poll (on timeout)
REVERT: 9fc8827b8a Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: ddf5f75549 zmq.cpp build probelm on non-linux platforms fixed
REVERT: e9a4ad38ce updated version to 2.0-beta1 in configure.in
REVERT: 7546526e66 ChangeLog updated for 2.0-beta1
REVERT: e21b33e9cf forced WINVER to 0x0501 for mingv32 build
REVERT: ef049efe2e perf tests modified to reflect change in subscription format
REVERT: 8d339e9596 Fixed newer autotools warningng about AC_CONFIG_MACRO_DIR
REVERT: 11fec367d1 added pending event fd handling by the pgm_sender
REVERT: 472ddf8de2 fixed failed merge with autogen.sh
REVERT: d10c605fa9 updated to libpgm-2.0.20rc5
REVERT: 4f6baf4dde Copyrights transferred from FastMQ to iMatix
REVERT: bf01727f4b updated to libpgm 2.0.19rc4
REVERT: 1528edb963 fixed autogen.sh complaining about existing config dir
REVERT: f2b235db16 ZMQII-29: Add timeout to zmq_poll function
REVERT: 7884f4541a problem with new version of autoreconf fixed
REVERT: 1b90e5f6f5 added missing likely.hpp file into the dist
REVERT: 9bda63cd63 fixed minor gcc warning in src/pgm_receiver.cpp
REVERT: 819590c04c libpgm updated to 2.0.18rc3
REVERT: 9fadf0b218 fixed minor gcc warning in src/pgm_socket.cpp
REVERT: d6da7903d0 removed unused foreign/openpgm/create_custom_gsi_1.patch file
REVERT: 7cb02fb3e7 fixed make dist for non pgm configuration
REVERT: 102077471c error in zmq_poll manpage fixed
REVERT: e9cebc86ed EINPROGRESS definition added on Win32 platform
REVERT: 23e5c3b342 polling on SUB socket fixed
REVERT: 72161fb075 format of subscriptions changed (no * needed anymore)
REVERT: c97967ed4b MSVC build fixed
REVERT: 5852db451a PGM code cleanup
REVERT: aebff623f3 ZMQII-28: Bidirectional introduction on TCP connection establishment
REVERT: b3bd4c15fe OpenPGM error handling fixed
REVERT: 7cf18a2aec minor fixes
REVERT: 5a0674dfec OpenPGM error handling improved
REVERT: 990a1e8686 zmq_cl(7) man page added
REVERT: bad224251e minor errors in zmq_cpp man page fixed
REVERT: d50c7daf9e hint parameter (zmq_free_fn) added to Lisp binding
REVERT: 1924cba889 memory management in Lisp binding fixed
REVERT: 86d68cbcbd memory leaks related to OpenPGM errors fixed
REVERT: 500d32a540 examples & perf added to the Debian package
REVERT: 667d1a8280 man page updated to match change in zmq_free_fn
REVERT: ab5abf6c7e hint parameter added to zmq_free function
REVERT: 02202ec30e addition to CREDITS section of AUTHORS file
REVERT: 5e77a1daa4 debian package added
REVERT: 7479871cde Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 8aa0908635 all news converted to nothrow variant
REVERT: 3e64083667 win32 build fixed
REVERT: 2cef05d869 reconnection mechanism added to tcp transport
REVERT: 14b112301e handle error during connecting by eventual reconnection
REVERT: e49115224a zmq_encoder/decoder are able to add/trim prefixes from messages; fair queueing and load balancing algorithms factorised into separate classes
REVERT: bd792faa9d ZMQ_SNDBUF and ZMQ_RCVBUF honoured in PGM transport
REVERT: 68488215da Man pages for XREQ/XREP/zmq_queue updated
REVERT: 0637e06387 zmq_streamer & zmq_queue are built under MSVC
REVERT: fa6bf24d80 XREP & XREQ socket types added; zmq_queue device added
REVERT: c43aded531 debug code removed from PGM engines
REVERT: f4ac8d7a44 OpenPGM v1 support removed
REVERT: 73b765e4b4 PGM transport fixed
REVERT: d5670f34ba ZMQII-26: Use zero-copy for large messages (rx side)
REVERT: 770178724f errors are never predicted in branch prediction (likely/unlikely macros added)
REVERT: d4fdc26efc zmq_poll implemented on Win32 platform
REVERT: 986ab66b8f ZMQII-27: Allow setting SNDBUF and RCVBUF size from 0MQ API (Win32)
REVERT: 8d58643655 MSVC build for chat example added
REVERT: 2e39f892c3 ZMQII-27: Allow setting SNDBUF and RCVBUF size from 0MQ API (POSIX)
REVERT: 72dacc3570 zero-copy on tx side optimised to minimise number of user/kernel space transitions
REVERT: 1c1dfb50f8 zmq_cpp(7) man page filled in
REVERT: cab5a4a159 minor documentation updates
REVERT: c98e29fb6e README added to chat example
REVERT: 902d4f2282 minor fix of zero-copy on tx side
REVERT: 9be877c685 ZMQII-26: Use zero-copy for large messages
REVERT: bfef2fcd0b autotools build system builds chat example now
REVERT: a08a72dd08 chat example added
REVERT: 82012667cc Deadlock on zmq_close
REVERT: 9f49594273 C & C++ header files clean-up
REVERT: 356ce8fe91 man pages updated
REVERT: 3e051e874a Vitaly Mayatskikh added to authors section
REVERT: 721e37a371 platform.hpp.in removed from the codebase
REVERT: 734aaa2dcb placeholders for new man pages added
REVERT: 6fcdc5fa69 common lisp binding & perf tests added
REVERT: 7146ef85e9 seqnum mechanism automated
REVERT: cb84580bbc harmless uninitialised memory read fixed
REVERT: 9bd309bda6 annoying optimisation in 'bind' command removed
REVERT: c04583ff6c minor code beautification
REVERT: 0d704fceee MSVC warnings fixed
REVERT: 9cff475af8 added libpgm-2.0.17rc2 into the dist package
REVERT: 82242f6a9e minor formatting fix in zmq_init.3 man page
REVERT: c637bf292d Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 9ccf2b42cf minor tweaks in pgm code
REVERT: fa1641afc5 msvc build fixed
REVERT: 19ce7c0e77 zmq_msg_data.3 referenced twice in Makefile.am - fixed
REVERT: 8d85638f77 memory leak in message encoder fixed
REVERT: 92aa9e94e2 experimental code to use futexes instead of mutexes added to simple_semapthore_t
REVERT: c98fd6bc3f ZMQII-25: Implement streamed request/reply
REVERT: 5cd98bc575 the rest of man3 man pages filled in
REVERT: e90ada0d04 more man pages filled in
REVERT: 6602cce9af zmq_init, zmq_term & zmq_strerror man pages added
REVERT: ed5563f752 man pages (dummy) added for zmq_msg_* functions
REVERT: 55b64a02e7 man pages - initial (dummy) version
REVERT: c41daca3da race condition in inproc transport shutdown fixed
REVERT: 64634605b3 obsolete parameter removed from 'bind' command
REVERT: 0e9ab2e8a3 inproc transport - initial commit
REVERT: 14f2fecdcd ZMQII-24: SEGFAULT when anonymous session disconnects
REVERT: c2e0661b0a uninitialised variable in devpoll_t and kqueue_t
REVERT: 26ca5ed8c6 Fixing concurrency issue in rep.cpp resulting in broken connections with multiple requesters under heavy load.
REVERT: 84585a9561 pgm_transport_recvmsgv in process_upstream returns PGM_IO_STATUS_RATE_LIMITED on busy sender
REVERT: c2cd7977f7 update pgm_socket to recent openpgm2
REVERT: 08b02a43ae fixed get_sender_fds and get_receiver_fds for openpgm2
REVERT: 7d672d3ab8 minor fixes for MSVC++ 2005 build
REVERT: 7cbdcc9542 ZMQII-21: Problem with fd_signaler_t::poll on socket close
REVERT: 55acf365ea releasing python global lock when doing blocking operations
REVERT: 8b08047cb0 added --with-pgm2-examples configure option
REVERT: 71e455bfe5 ZMQII-19: add --disable-eventfd configure option
REVERT: 50c7d12be6 added HAVE_LIBWS2_32 into platform.hpp.in
REVERT: 0ce02058eb updated 0MQ to recent OpenPGM2 rev.562
REVERT: ea2f6558fd mingw fixed winsock linking issue
REVERT: 7afc61ae7c 0MQ compilable on winXP mingw with --with-pgm2 option
REVERT: ac83175ef0 updated to recent PGM2 changes
REVERT: 3daeff2786 mingw port
REVERT: de2e439a52 1 minor change in xmlParser.cpp
REVERT: 14dc1f45cd build system tuning - fixed make dist
REVERT: b0c97a5f8b build system tuning
REVERT: d57ee0984a Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: ff65e26ce7 create_custom_gsi.patch renamed to create_custom_gsi_1.patch
REVERT: e1b9fcd4b1 moved pgm_create_custom_gsi into PGM1 and drop ssl dependency
REVERT: 4efe2366d7 poller is a concept now rather than virtualised class
REVERT: 4a3b4dadea ZMQII-9: Check and implement speculative reads & writes
REVERT: 49a9ef5fcb windows error handling improved
REVERT: cc631c4c66 ZMQII-18: Implement I/O multiplexing (first approximation)
REVERT: f2ff2c6e5c checking for available messages added to ypipe/pipe
REVERT: 84d854a088 documentation error in zmq.h fixed
REVERT: 64e68e7486 detecting data loss for PGM2 receiver
REVERT: 39d915ded8 PGM2 sender
REVERT: cf6cc0128f pgm2 receiver working (partly)
REVERT: 72c5c5fff4 --with-pgm2 compilable
REVERT: 33afdcd1ad added --with-pgm2 into build system
REVERT: 5aee5fd0cf Updated libzmq.vcproj file
REVERT: 27d8627cb5 Updated changelog for alpha3 release
REVERT: b0a1a16fc2 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 088a2db674 ZMQII-16: Change "struct zmq_msg_t" to "zmq_msg_t" in C binding
REVERT: 2521130769 ZMQII-14: Change default for ZMQ_MCAST_LOOP to true
REVERT: 85cbd7f83c added PGM bus functionality
REVERT: 3bd8f83f6d language bindings use zmq_strerror instead of strerror
REVERT: a0db7f6b81 POSIX error codes unsupported on win platform faked
REVERT: e136d923b7 ZMQ-specific error codes added
REVERT: cc8136896d documentation in zmq.h improved
REVERT: e6ca5da181 Windows build fixed
REVERT: b15f695976 different fixes to req/rep
REVERT: cb1b6fe32c initial version of req/rep sockets
REVERT: 7668b246fc ZMQ_POLL option forces fd_signaler to be used in app_thread
REVERT: 495a2228cd MSVC warnings removed
REVERT: f99b8fc921 receiving side of signaler virtualised
REVERT: 50a8b9ea0c 'flags' parameter added to zmq_init
REVERT: edecf75b61 python binding checks ctx argument type
REVERT: 8cdf75327d ChangeLog updated
REVERT: dffbdbb60c fixed compiler warning cast from uint64 to bool in socket_base.cpp
REVERT: 1bd6d5e0f6 fixed missing xmlParser in dist package
REVERT: 2be152967c java binding Makefile.am cleanup
REVERT: cff6eb4376 msvc directory moved into builds dir
REVERT: 3ebe9932f9 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 1a65504595 ruby directory moved into bindings dir
REVERT: c63387ca36 python directory moved into bindings dir
REVERT: 1b2a426656 c and cpp directories moved into bindings directory
REVERT: 6bfb9e6aaf java directory moved into bindings directory II
REVERT: 3de435a07d java directory moved into bindings directory
REVERT: d16b3bc0c9 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 35c58dc733 ZMQII-1: fix for devpoll, kqueue & poll
REVERT: 10dd8c5346 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 03d494d4f0 added udp:// transport prefix for PGM UDP encapsulation
REVERT: fc7715b463 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: f1c72d693e ZMQII-4: Failure in dev/poll poller
REVERT: c6665f46be set rc to 0 in its declaration (pyzmq.cpp)
REVERT: 3b2c3cae09 setsockopt cleanup in rbzmq
REVERT: 3534732c06 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 17800ac85e setsockopt cleanup in pyzmq.cpp
REVERT: a71d002880 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 4631fde7e3 ZMQII-8: Failure during orphan pipe deallocation
REVERT: 7a5db6041f added newly added socket options to all language bindings, P2P model changed to PUB/SUB for throughput tests
REVERT: 9c522dccaf reconnect added to zmq_connecter
REVERT: 6e03cb2f3e Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 9fbdcc7940 removed reset method from zmq_decoder_t
REVERT: 969522bbf5 added OpenPGM receiver - ZMQ_SUB
REVERT: bce2e60bbb more errors from send & recv handled decently on windows
REVERT: 0381a78c04 added reset method into zmq_decoder_t class
REVERT: 79d4a6debf Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 7653f34df0 fixed pub_t class creating ZMQ_SUB socket_base_t
REVERT: 98b8e9b54d Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: a841774cbd forwarder renamed to zmq_forwarder (MSVC build)
REVERT: 3a3bcd337f pgm_sender code beautiication
REVERT: f44b215a60 added out_event call into pgm_sender_t revive
REVERT: 712c7bd895 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 35e82b4605 forwarder renamed to zmq_forwarder
REVERT: 364281343c Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: bdf22e9c2f deleted useles iostream include from socket_base.cpp
REVERT: f7ad4a203a forwarder device compilable on windows
REVERT: 6cfd175e31 forwarder device added
REVERT: e2900ce0a1 xmlParser added
REVERT: 2bc9419ced ZMQII-10: Make connections interrupted during the init phase be closed silently
REVERT: 37cacc5700 ZMQII-1: Win32 - failure on shutdown
REVERT: c806aabb2d java binding sets socket options using setsockopt function
REVERT: 36707529a7 minor merge problem corrected
REVERT: 89b1f2782c Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 47350adcb6 separate class for PUB-style socket added
REVERT: 1a4d6f9119 added OpenPGM sender - ZMQ_PUB
REVERT: e940878b3f build on win32 fixed
REVERT: 7be7962f98 prefix-style message filtering added
REVERT: 42ad2aa02d ZMQII-7: Pipe detach fails on shutdown
REVERT: 29c5930d0b asserts for invalid indexes in pipe reader & writer added
REVERT: e0d1294c4b Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 5daa0dec0f ZMQII-5: Only one consumer in a process gets the message
REVERT: a91b449772 Revert "link libzmq with glib when congifured --with-pgm"
REVERT: 88695aaee6 link libzmq with glib when congifured --with-pgm
REVERT: f824b8a067 classify error from async connect as network related or 0MQ bugs
REVERT: f674c9269e ZMQII-2: SIGSEGV in zmq_connecter_init_t::read
REVERT: 93e70ee583 throughput tests use P2P sockets consistently
REVERT: 95944551be Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: b3f32e219e ZMQII-3: cheap and nasty implementation of message filtering
REVERT: 5acef9fc96 added --with-pgm option, libpgm-1.2.14 build within 0mq build system
REVERT: d81d341252 Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: 1864832ada building zmq.jar on win32 fixed
REVERT: 4cc923b025 Stop configure, when could not link with libuuid
REVERT: 65b8b2d2c7 Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: 305b81dbdf higher precision time measurement in python perf tests
REVERT: d743d97e36 Updated AUTHORS, ChangeLog, README and added COPYING.LESSER files
REVERT: 4d07d7cabe fix of async connect on win32
REVERT: c99f39abc6 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 37d8371967 async connect bug fixed
REVERT: cb78991f8e Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 734a62c12d Sparc solaris port
REVERT: d3fb9f90af missing java MSVC project added
REVERT: dadfd24364 Merge branch 'master' of github.com:sustrik/zeromq2
REVERT: ef34c94c3a win build for python
REVERT: 844b590b5e added libzmq.pc.in file
REVERT: b3fc145225 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 2a4a10c8be build system tuning
REVERT: 3069b6bd54 win port of java binding + java perf tests
REVERT: ec6822a477 win port for c and cpp perf tests
REVERT: b71c3005e6 include directory split into c and cpp dirs, added --with-c and --with-cpp configure options
REVERT: f895426c18 initial changes for win port
REVERT: 87ccbb9fae Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: d62c74232a Merge branch 'master' of git://github.com/sustrik/zeromq2
REVERT: 11a6cb925f Ruby binding functional
REVERT: 67253f3186 Java perf tests added
REVERT: 63b56d7fb3 python perf tests are included into distribution package
REVERT: 4307baf7bc python binding functional
REVERT: 450b31c3b2 bug in python binding fixed
REVERT: 103cbee6a5 couple of bugs fixed
REVERT: 4914e5c9d1 O(1) socket removal
REVERT: f92de9b2a9 bug during terminal shutdown fixed
REVERT: 702fdbb5dd messages that may have been received in the init phase are flushed immediately after engine is plugged in
REVERT: 75a5a8732c --disable-shared & C perf tests: a better way
REVERT: 947b463193 building C perf tests with --disable-shared fixed
REVERT: 5e08a89d1c Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 6a5120b1f1 python extension & perf tests
REVERT: 1f06d99a0f Add Java binding
REVERT: 0aacee389f POSIX threads don't use errno to report errors
REVERT: 72fdf47d16 python perf tests added
REVERT: b6d345f4a6 Ruby perf tests added
REVERT: 314deb6185 build system for perf/C and perf/C++
REVERT: 6c36673949 C perf tests added
REVERT: 4617fd9e9c c++ perf tests added
REVERT: 176879e5bb engine virtualised; chatroom example removed
REVERT: 1d650934e4 Ruby bidning added
REVERT: 3666a49022 bug in identifying current thread fixed
REVERT: 6996ef6f1a improved error handling
REVERT: cb09c6951e pipe deallocation added
REVERT: 2dd5016515 multiple bugs fixed
REVERT: 67194267f8 Merge branch 'master' of git@github.com:sustrik/zeromq2
REVERT: 99c5d92836 pipes added
REVERT: 67c69f952c make configure respect --with-python option
REVERT: aacdb7a454 python build fix
REVERT: 77bc3790fa python extension added
REVERT: 6be4b01437 session management implemented
REVERT: a801b6d8b3 couple of bugs in shutdown mechanism fixed
REVERT: 131f2e3096 subscribe API removed
REVERT: 059beca59d listener/connecter/init/session added
REVERT: bda766ab40 redundant interface (i_api) removed
REVERT: 9f1f823b7b zmq_listener/zmq_connecter implemented
REVERT: 3147ff8523 getsockopt implemented
REVERT: bde396f156 fix to 3-thread synchronisation algorithm
REVERT: 5b5b513330 socket options interface modeled as in BSD sockets
REVERT: a8b410e66c lockfree interaction patter for 3 theads implemented
REVERT: 0b5cc026fb clean up - session/socket/engine stuff removed
REVERT: b8b4acef4c dispatcher renamed to context
REVERT: 43fa72b7ee C++ binding uses exceptions to signal failure
REVERT: cc3755a16f renamed from zs to zmq
REVERT: 183b688764 git ignoring intermediary files
REVERT: 4ed70a9302 initial commit

git-subtree-dir: lib3rd/libzmq.git
git-subtree-split: 661aa7c25b72a8cb21335d0f7721d47bc6f36bda
---
 .clang-format                                 |   53 -
 .clang-tidy                                   |  426 ---
 .github/CONTRIBUTING.md                       |   48 -
 .github/issue_template.md                     |   22 -
 .github/stale.yml                             |   19 -
 .github/workflows/CI.yaml                     |   91 -
 .github/workflows/Fuzzers.yaml                |   13 -
 .gitignore                                    |  127 -
 .hgeol                                        |    2 -
 .mailmap                                      |   81 -
 .travis.yml                                   |  178 -
 AUTHORS                                       |  152 -
 CMakeLists.txt                                | 2136 ++---------
 COPYING                                       |  674 ----
 COPYING.LESSER                                |  181 -
 Dockerfile                                    |   11 -
 Doxygen.cfg                                   | 2320 ------------
 INSTALL                                       |  315 --
 Jenkinsfile                                   |  485 ---
 Makefile.am                                   | 1466 --------
 NEWS                                          | 2118 -----------
 README.cygwin.md                              |   15 -
 README.doxygen.md                             |   48 -
 README.md                                     |  209 +-
 RELICENSE/AnCaPepe.md                         |   15 -
 RELICENSE/AndreLouisCaron.md                  |   15 -
 RELICENSE/Asmod4n.md                          |   13 -
 RELICENSE/AxelNennker.md                      |   16 -
 RELICENSE/Bklyn.md                            |   15 -
 RELICENSE/Botje.md                            |   15 -
 RELICENSE/CommanderBubble.md                  |   15 -
 RELICENSE/DaiyuHurst.md                       |   16 -
 RELICENSE/Eelis.md                            |   16 -
 RELICENSE/FrancoFichtner.md                   |   15 -
 RELICENSE/FredTreg.md                         |   13 -
 RELICENSE/Hugne.md                            |   17 -
 RELICENSE/JohanMabille.md                     |   16 -
 RELICENSE/JonDyte.md                          |   15 -
 RELICENSE/KLNikita.md                         |   15 -
 RELICENSE/Neopallium.md                       |   13 -
 RELICENSE/Quuxplusone.md                      |   15 -
 RELICENSE/README.md                           |   23 -
 RELICENSE/RPGillespie6.md                     |   16 -
 RELICENSE/Ricardicus.md                       |    6 -
 RELICENSE/SRombauts.md                        |   15 -
 RELICENSE/SergheiNovac.md                     |   15 -
 RELICENSE/SylvainCorlay.md                    |   16 -
 RELICENSE/TTimo.md                            |   15 -
 RELICENSE/ThePrez.md                          |   13 -
 RELICENSE/TobiSchluter.md                     |   15 -
 RELICENSE/WenbinHou.md                        |   15 -
 RELICENSE/a4z.md                              |   17 -
 RELICENSE/abbradar.md                         |   15 -
 RELICENSE/ackalker.md                         |   15 -
 RELICENSE/acsearle.md                         |   14 -
 RELICENSE/agronholm.md                        |   15 -
 RELICENSE/aixxe.md                            |   15 -
 RELICENSE/amuraru.md                          |   15 -
 RELICENSE/answeroo.md                         |   15 -
 RELICENSE/antonrd.md                          |   17 -
 RELICENSE/arsenm.md                           |   15 -
 RELICENSE/asafkahlon.md                       |   15 -
 RELICENSE/aseering.md                         |   15 -
 RELICENSE/atomashpolskiy.md                   |   15 -
 RELICENSE/banburybill.md                      |   16 -
 RELICENSE/bbdb68.md                           |   13 -
 RELICENSE/bebopagogo.md                       |   13 -
 RELICENSE/benjdero.md                         |   13 -
 RELICENSE/bjoto.md                            |   16 -
 RELICENSE/bjovke.md                           |   16 -
 RELICENSE/bl0x.md                             |   16 -
 RELICENSE/bluca.md                            |   17 -
 RELICENSE/bprager.md                          |   13 -
 RELICENSE/brett-cameron.md                    |   15 -
 RELICENSE/brian-peloton.md                    |   15 -
 RELICENSE/brocade_communications_systems.md   |   15 -
 RELICENSE/brubakerjeff.md                     |   16 -
 RELICENSE/bwbuchanan.md                       |   15 -
 RELICENSE/c-rack.md                           |   15 -
 RELICENSE/calid.md                            |   14 -
 RELICENSE/camachat.md                         |   15 -
 RELICENSE/cbusbey.md                          |   13 -
 RELICENSE/cdolan.md                           |   15 -
 RELICENSE/chickenkiller.md                    |   15 -
 RELICENSE/chrisstaite.md                      |   14 -
 RELICENSE/chuckremes.md                       |   15 -
 RELICENSE/chuggafan.md                        |   15 -
 RELICENSE/chymanfx.md                         |   12 -
 RELICENSE/cjuniet.md                          |   15 -
 RELICENSE/ckamm.md                            |   15 -
 RELICENSE/claws.md                            |   15 -
 RELICENSE/clkao.md                            |   15 -
 RELICENSE/colletted.md                        |    7 -
 RELICENSE/cowo78.md                           |   15 -
 RELICENSE/crocket.md                          |   15 -
 RELICENSE/cwsmith.md                          |   13 -
 RELICENSE/danielhtshih.md                     |   15 -
 RELICENSE/danriegsecker.md                    |   16 -
 RELICENSE/demozon.md                          |   15 -
 RELICENSE/dennisklein.md                      |   15 -
 RELICENSE/dfons.md                            |   16 -
 RELICENSE/dhammika.md                         |   13 -
 RELICENSE/dimpase.md                          |   14 -
 RELICENSE/diorcety.md                         |   15 -
 RELICENSE/djelenc.md                          |   15 -
 RELICENSE/dkrikun.md                          |   13 -
 RELICENSE/dmeehan1968.md                      |   13 -
 RELICENSE/drbobbeaty.md                       |   15 -
 RELICENSE/drodri.md                           |   15 -
 RELICENSE/drolevar.md                         |   16 -
 RELICENSE/eburkitt.md                         |   15 -
 RELICENSE/egomotion.md                        |   16 -
 RELICENSE/eldruin.md                          |   15 -
 RELICENSE/emtr.md                             |   15 -
 RELICENSE/ericsson.md                         |   13 -
 RELICENSE/evoskuil.md                         |   15 -
 RELICENSE/ezhikus.md                          |   15 -
 RELICENSE/f18m.md                             |   15 -
 RELICENSE/fanquake.md                         |   17 -
 RELICENSE/febeling.md                         |   16 -
 RELICENSE/ferdnyc.md                          |   15 -
 RELICENSE/ffontaine.md                        |   15 -
 RELICENSE/fidlej.md                           |   15 -
 RELICENSE/flub.md                             |   14 -
 RELICENSE/gabm.md                             |   13 -
 RELICENSE/garlick.md                          |   16 -
 RELICENSE/gavinmcniff.md                      |   15 -
 RELICENSE/gcsideal.md                         |   15 -
 RELICENSE/gena-moscow.md                      |   15 -
 RELICENSE/ghpu.md                             |   15 -
 RELICENSE/gitfoxi.md                          |   16 -
 RELICENSE/glemercier.md                       |   17 -
 RELICENSE/gonzus.md                           |   15 -
 RELICENSE/goodfella.md                        |   13 -
 RELICENSE/google.md                           |   13 -
 RELICENSE/grmt.md                             |   13 -
 RELICENSE/guidovranken.md                     |   17 -
 RELICENSE/guillon.md                          |   15 -
 RELICENSE/gummif.md                           |   17 -
 RELICENSE/herbrechtsmeier.md                  |   15 -
 RELICENSE/hewlett_packard_enterprise.md       |   13 -
 RELICENSE/hgourvest.md                        |   16 -
 RELICENSE/hnwyllmm.md                         |   15 -
 RELICENSE/hoditohod.md                        |   15 -
 RELICENSE/hpsaturn.md                         |    9 -
 RELICENSE/hsw.md                              |   16 -
 RELICENSE/ianbarber.md                        |   15 -
 RELICENSE/imatix.md                           |   23 -
 RELICENSE/imkcy9.md                           |   16 -
 RELICENSE/inuik.md                            |   17 -
 RELICENSE/ipa.md                              |   17 -
 RELICENSE/ipechorin.md                        |   17 -
 RELICENSE/jackpimbert.md                      |   18 -
 RELICENSE/jacquesg.md                         |   17 -
 RELICENSE/jakecobb.md                         |   13 -
 RELICENSE/jbreams.md                          |   17 -
 RELICENSE/jcfr.md                             |   13 -
 RELICENSE/jcourreges.md                       |   13 -
 RELICENSE/jean-airoldie.md                    |    7 -
 RELICENSE/jemc.md                             |   15 -
 RELICENSE/jens.auer.md                        |   15 -
 RELICENSE/jimenezrick.md                      |   16 -
 RELICENSE/jimklimov.md                        |   17 -
 RELICENSE/jkryl.md                            |   15 -
 RELICENSE/jlauenercern.md                     |   15 -
 RELICENSE/johntconklin.md                     |   15 -
 RELICENSE/jruffin.md                          |   14 -
 RELICENSE/jsyoo5b.md                          |   15 -
 RELICENSE/kanonet.md                          |    8 -
 RELICENSE/kentzo.md                           |   15 -
 RELICENSE/kfish.md                            |   17 -
 RELICENSE/kobolog.md                          |   12 -
 RELICENSE/kreuzberger.md                      |   13 -
 RELICENSE/kurdybacha.md                       |   15 -
 RELICENSE/laplaceyang.md                      |   16 -
 RELICENSE/latchmoor-services-carcich.md       |   16 -
 RELICENSE/leonarf.md                          |   14 -
 RELICENSE/liedtkeInTUM.md                     |   13 -
 RELICENSE/linville.md                         |   15 -
 RELICENSE/loachfish.md                        |   15 -
 RELICENSE/lodagro.md                          |   14 -
 RELICENSE/lourens.md                          |   15 -
 RELICENSE/lstacul.md                          |   14 -
 RELICENSE/madebr.md                           |   15 -
 RELICENSE/malexzx.md                          |   13 -
 RELICENSE/mancasg.md                          |   15 -
 RELICENSE/mattconnolly.md                     |   15 -
 RELICENSE/mauri-melato.md                     |   13 -
 RELICENSE/mbarbisan.md                        |   14 -
 RELICENSE/mdionisio.md                        |   13 -
 RELICENSE/mditzel.md                          |   15 -
 RELICENSE/meox.md                             |   15 -
 RELICENSE/mesegura.md                         |   13 -
 RELICENSE/mgatny.md                           |   15 -
 RELICENSE/michicc.md                          |   15 -
 RELICENSE/micromass-ricnewton.md              |   16 -
 RELICENSE/miniway.md                          |   15 -
 RELICENSE/minrk.md                            |   15 -
 RELICENSE/mipaaa.md                           |   15 -
 RELICENSE/mjvk.md                             |   16 -
 RELICENSE/mkluwe.md                           |   15 -
 RELICENSE/mkoppanen.md                        |   15 -
 RELICENSE/mloy.md                             |   14 -
 RELICENSE/mongodb.md                          |   17 -
 RELICENSE/montoyaedu.md                       |   15 -
 RELICENSE/moretromain.md                      |   16 -
 RELICENSE/msune.md                            |   17 -
 RELICENSE/murphybytes.md                      |   15 -
 RELICENSE/mvilim.md                           |   16 -
 RELICENSE/mystfit.md                          |   15 -
 RELICENSE/naos_ltd.md                         |   19 -
 RELICENSE/natano.md                           |   15 -
 RELICENSE/neheb.md                            |   14 -
 RELICENSE/ninoles.md                          |   16 -
 RELICENSE/nixman.md                           |   15 -
 RELICENSE/normano.md                          |   15 -
 RELICENSE/ojura.md                            |    9 -
 RELICENSE/olafmandel.md                       |   13 -
 RELICENSE/omegastick.md                       |   15 -
 RELICENSE/opedroso.md                         |   15 -
 RELICENSE/opensource-kymetacorp.md            |   15 -
 RELICENSE/paddor.md                           |   13 -
 RELICENSE/panlinux.md                         |   17 -
 RELICENSE/pavel-pimenov.md                    |   15 -
 RELICENSE/philippeleite.md                    |   16 -
 RELICENSE/phreed.md                           |   15 -
 RELICENSE/pijyoi.md                           |   13 -
 RELICENSE/pmienk.md                           |   15 -
 RELICENSE/pnnl.md                             |   15 -
 RELICENSE/prarrot.md                          |   15 -
 RELICENSE/psl-felipefarinon.md                |   16 -
 RELICENSE/ptroja.md                           |   14 -
 RELICENSE/rcxdude.md                          |   13 -
 RELICENSE/reunanen.md                         |   15 -
 RELICENSE/reza-ebrahimi.md                    |   15 -
 RELICENSE/rgagnon24.md                        |   13 -
 RELICENSE/rikvdh.md                           |   15 -
 RELICENSE/rlenferink.md                       |   15 -
 RELICENSE/roalz.md                            |   13 -
 RELICENSE/rodgert.md                          |   17 -
 RELICENSE/rotty.md                            |   16 -
 RELICENSE/sappo.md                            |   13 -
 RELICENSE/scemama.md                          |   15 -
 RELICENSE/schulzch.md                         |   15 -
 RELICENSE/sdrsdr.md                           |   14 -
 RELICENSE/serg06.md                           |   15 -
 RELICENSE/shancat.md                          |   13 -
 RELICENSE/sheremetyev.md                      |   13 -
 RELICENSE/shripchenko.md                      |   15 -
 RELICENSE/sigiesec.md                         |   17 -
 RELICENSE/simias.md                           |   15 -
 RELICENSE/skaller.md                          |   15 -
 RELICENSE/skicc.md                            |   15 -
 RELICENSE/somdoron.md                         |   16 -
 RELICENSE/sonoware.md                         |   13 -
 RELICENSE/soulik.md                           |   15 -
 RELICENSE/spotify.md                          |   15 -
 RELICENSE/ssbl.md                             |   17 -
 RELICENSE/staticfloat.md                      |   15 -
 RELICENSE/std-any-emplace.md                  |   15 -
 RELICENSE/steve-o.md                          |   14 -
 RELICENSE/straubar.md                         |   15 -
 RELICENSE/suudy.md                            |   12 -
 RELICENSE/swansontec.md                       |   15 -
 RELICENSE/t-b.md                              |   15 -
 RELICENSE/tSed.md                             |   15 -
 RELICENSE/tabe.md                             |   15 -
 RELICENSE/tailhook.md                         |   16 -
 RELICENSE/taotetek.md                         |   13 -
 RELICENSE/tberkey.md                          |   14 -
 .../relicense-template-mplv2-any-osi.txt      |   15 -
 ...license-template-mplv2-share-alike-osi.txt |   15 -
 .../templates/relicense-template-mplv2.txt    |   13 -
 RELICENSE/thompsa.md                          |   15 -
 RELICENSE/tommd.md                            |   13 -
 RELICENSE/tomzbench.md                        |   14 -
 RELICENSE/toonetown.md                        |   17 -
 RELICENSE/trevorbernard.md                    |   16 -
 RELICENSE/trya.md                             |   13 -
 RELICENSE/twhittock.md                        |   15 -
 RELICENSE/ulikoehler.md                       |   16 -
 RELICENSE/viciious.md                         |   13 -
 RELICENSE/vortechs2000.md                     |   13 -
 RELICENSE/vtellier.md                         |   15 -
 RELICENSE/vyskocilm.md                        |    7 -
 RELICENSE/wallstprog.md                       |   16 -
 RELICENSE/willstrang.md                       |   15 -
 RELICENSE/xantares.md                         |   15 -
 RELICENSE/xaqq.md                             |   13 -
 RELICENSE/xqcool.mq                           |   15 -
 RELICENSE/yan12125.md                         |   13 -
 RELICENSE/yuvallanger.md                      |   15 -
 RELICENSE/zoobab.md                           |   15 -
 SECURITY.md                                   |  319 --
 SupportedPlatforms.md                         |   32 -
 acinclude.m4                                  | 1232 ------
 appveyor.yml                                  |  337 --
 autogen.sh                                    |   49 -
 branding.bmp                                  |  Bin 25818 -> 0 bytes
 builds/Makefile.am                            |   34 -
 builds/README                                 |   14 -
 builds/abi-compliance-checker/ci_build.sh     |   44 -
 builds/android/Dockerfile                     |   22 -
 builds/android/README.md                      |   33 -
 builds/android/android_build_helper.sh        |  301 --
 builds/android/build.sh                       |  101 -
 builds/android/ci_build.sh                    |   31 -
 builds/cmake/Modules/ClangFormat.cmake        |   41 -
 builds/cmake/Modules/FindAsciiDoc.cmake       |   26 -
 builds/cmake/Modules/FindNSS3.cmake           |    8 -
 builds/cmake/Modules/FindSodium.cmake         |   48 -
 builds/cmake/Modules/TestZMQVersion.cmake     |    8 -
 builds/cmake/Modules/ZMQSourceRunChecks.cmake |  313 --
 builds/cmake/Modules/ZMQSupportMacros.cmake   |    5 -
 builds/cmake/NSIS.template32.in               |  952 -----
 builds/cmake/NSIS.template64.in               |  960 -----
 builds/cmake/ZeroMQConfig.cmake.in            |   34 -
 builds/cmake/ci_build.sh                      |  111 -
 builds/cmake/clang-format-check.sh.in         |   14 -
 builds/cmake/platform.hpp.in                  |  138 -
 builds/coverage/ci_build.sh                   |   32 -
 builds/cygwin/Makefile.cygwin                 |   48 -
 builds/deprecated-msvc/.gitignore             |  256 --
 builds/deprecated-msvc/Makefile.am            |   94 -
 builds/deprecated-msvc/build/build.bat        |   33 -
 builds/deprecated-msvc/build/buildall.bat     |   16 -
 builds/deprecated-msvc/build/buildbase.bat    |   73 -
 builds/deprecated-msvc/errno.cpp              |   32 -
 builds/deprecated-msvc/errno.hpp              |   56 -
 builds/deprecated-msvc/platform.hpp           |   14 -
 .../deprecated-msvc/properties/Common.props   |   21 -
 builds/deprecated-msvc/properties/DLL.props   |   16 -
 builds/deprecated-msvc/properties/Debug.props |   29 -
 .../properties/DebugDEXE.props                |   21 -
 .../deprecated-msvc/properties/DebugDLL.props |   20 -
 .../properties/DebugLEXE.props                |   20 -
 .../deprecated-msvc/properties/DebugLIB.props |   21 -
 .../properties/DebugLTCG.props                |   20 -
 .../properties/DebugSEXE.props                |   21 -
 builds/deprecated-msvc/properties/EXE.props   |   17 -
 builds/deprecated-msvc/properties/LIB.props   |   16 -
 builds/deprecated-msvc/properties/LTCG.props  |   13 -
 builds/deprecated-msvc/properties/Link.props  |   21 -
 .../deprecated-msvc/properties/Messages.props |   15 -
 .../deprecated-msvc/properties/Output.props   |   30 -
 .../deprecated-msvc/properties/Release.props  |   41 -
 .../properties/ReleaseDEXE.props              |   20 -
 .../properties/ReleaseDLL.props               |   19 -
 .../properties/ReleaseLEXE.props              |   20 -
 .../properties/ReleaseLIB.props               |   19 -
 .../properties/ReleaseLTCG.props              |   19 -
 .../properties/ReleaseSEXE.props              |   20 -
 builds/deprecated-msvc/properties/Win32.props |   20 -
 builds/deprecated-msvc/properties/x64.props   |   23 -
 builds/deprecated-msvc/readme.txt             |   27 -
 builds/deprecated-msvc/resource.h             |   14 -
 builds/deprecated-msvc/resource.rc            |  Bin 4650 -> 0 bytes
 .../vs2008/inproc_lat/inproc_lat.vcproj       |   52 -
 .../vs2008/inproc_thr/inproc_thr.vcproj       |   52 -
 builds/deprecated-msvc/vs2008/libzmq.sln      |   95 -
 .../vs2008/libzmq/libzmq.vcproj               |  338 --
 .../vs2008/local_lat/local_lat.vcproj         |   52 -
 .../vs2008/local_thr/local_thr.vcproj         |   52 -
 .../vs2008/remote_lat/remote_lat.vcproj       |   52 -
 .../vs2008/remote_thr/remote_thr.vcproj       |   52 -
 .../vs2010/inproc_lat/inproc_lat.props        |   49 -
 .../vs2010/inproc_lat/inproc_lat.vcxproj      |   82 -
 .../vs2010/inproc_thr/inproc_thr.props        |   49 -
 .../vs2010/inproc_thr/inproc_thr.vcxproj      |   82 -
 .../vs2010/libsodium.import.props             |   52 -
 .../vs2010/libsodium.import.xml               |   17 -
 .../vs2010/libzmq.import.props                |   64 -
 .../deprecated-msvc/vs2010/libzmq.import.xml  |   49 -
 builds/deprecated-msvc/vs2010/libzmq.sln      |  206 -
 .../vs2010/libzmq/libzmq.props                |   76 -
 .../vs2010/libzmq/libzmq.vcxproj              |  289 --
 .../vs2010/libzmq/libzmq.vcxproj.filters      |  627 ---
 .../deprecated-msvc/vs2010/libzmq/libzmq.xml  |   40 -
 .../vs2010/local_lat/local_lat.props          |   49 -
 .../vs2010/local_lat/local_lat.vcxproj        |   82 -
 .../vs2010/local_thr/local_thr.props          |   49 -
 .../vs2010/local_thr/local_thr.vcxproj        |   82 -
 .../vs2010/remote_lat/remote_lat.props        |   49 -
 .../vs2010/remote_lat/remote_lat.vcxproj      |   82 -
 .../vs2010/remote_thr/remote_thr.props        |   49 -
 .../vs2010/remote_thr/remote_thr.vcxproj      |   82 -
 .../vs2012/inproc_lat/inproc_lat.props        |   49 -
 .../vs2012/inproc_lat/inproc_lat.vcxproj      |   82 -
 .../vs2012/inproc_thr/inproc_thr.props        |   49 -
 .../vs2012/inproc_thr/inproc_thr.vcxproj      |   82 -
 .../vs2012/libsodium.import.props             |   52 -
 .../vs2012/libsodium.import.xml               |   17 -
 .../vs2012/libzmq.import.props                |   64 -
 .../deprecated-msvc/vs2012/libzmq.import.xml  |   49 -
 builds/deprecated-msvc/vs2012/libzmq.sln      |  206 -
 .../vs2012/libzmq/libzmq.props                |   76 -
 .../vs2012/libzmq/libzmq.vcxproj              |  289 --
 .../vs2012/libzmq/libzmq.vcxproj.filters      |  627 ---
 .../deprecated-msvc/vs2012/libzmq/libzmq.xml  |   40 -
 .../vs2012/local_lat/local_lat.props          |   49 -
 .../vs2012/local_lat/local_lat.vcxproj        |   82 -
 .../vs2012/local_thr/local_thr.props          |   49 -
 .../vs2012/local_thr/local_thr.vcxproj        |   82 -
 .../vs2012/remote_lat/remote_lat.props        |   49 -
 .../vs2012/remote_lat/remote_lat.vcxproj      |   82 -
 .../vs2012/remote_thr/remote_thr.props        |   49 -
 .../vs2012/remote_thr/remote_thr.vcxproj      |   82 -
 .../vs2013/inproc_lat/inproc_lat.props        |   49 -
 .../vs2013/inproc_lat/inproc_lat.vcxproj      |   82 -
 .../vs2013/inproc_thr/inproc_thr.props        |   49 -
 .../vs2013/inproc_thr/inproc_thr.vcxproj      |   82 -
 .../vs2013/libsodium.import.props             |   52 -
 .../vs2013/libsodium.import.xml               |   17 -
 .../vs2013/libzmq.import.props                |   64 -
 .../deprecated-msvc/vs2013/libzmq.import.xml  |   49 -
 builds/deprecated-msvc/vs2013/libzmq.sln      |  208 -
 .../vs2013/libzmq/libzmq.props                |   76 -
 .../vs2013/libzmq/libzmq.vcxproj              |  289 --
 .../vs2013/libzmq/libzmq.vcxproj.filters      |  627 ---
 .../deprecated-msvc/vs2013/libzmq/libzmq.xml  |   40 -
 .../vs2013/local_lat/local_lat.props          |   49 -
 .../vs2013/local_lat/local_lat.vcxproj        |   82 -
 .../vs2013/local_thr/local_thr.props          |   49 -
 .../vs2013/local_thr/local_thr.vcxproj        |   82 -
 .../vs2013/remote_lat/remote_lat.props        |   49 -
 .../vs2013/remote_lat/remote_lat.vcxproj      |   82 -
 .../vs2013/remote_thr/remote_thr.props        |   49 -
 .../vs2013/remote_thr/remote_thr.vcxproj      |   82 -
 .../vs2015/inproc_lat/inproc_lat.props        |   49 -
 .../vs2015/inproc_lat/inproc_lat.vcxproj      |   82 -
 .../vs2015/inproc_thr/inproc_thr.props        |   49 -
 .../vs2015/inproc_thr/inproc_thr.vcxproj      |   82 -
 .../vs2015/libsodium.import.props             |   52 -
 .../vs2015/libsodium.import.xml               |   17 -
 .../vs2015/libzmq.import.props                |   64 -
 .../deprecated-msvc/vs2015/libzmq.import.xml  |   49 -
 builds/deprecated-msvc/vs2015/libzmq.sln      |  208 -
 .../vs2015/libzmq/libzmq.props                |   76 -
 .../vs2015/libzmq/libzmq.vcxproj              |  291 --
 .../vs2015/libzmq/libzmq.vcxproj.filters      |  627 ---
 .../deprecated-msvc/vs2015/libzmq/libzmq.xml  |   40 -
 .../vs2015/local_lat/local_lat.props          |   49 -
 .../vs2015/local_lat/local_lat.vcxproj        |   82 -
 .../vs2015/local_thr/local_thr.props          |   49 -
 .../vs2015/local_thr/local_thr.vcxproj        |   82 -
 .../vs2015/remote_lat/remote_lat.props        |   49 -
 .../vs2015/remote_lat/remote_lat.vcxproj      |   82 -
 .../vs2015/remote_thr/remote_thr.props        |   49 -
 .../vs2015/remote_thr/remote_thr.vcxproj      |   82 -
 .../deprecated-msvc/vs2015_xp/libzmq.vcxproj  |  258 --
 builds/deprecated-msvc/vs2015_xp/platform.hpp |   15 -
 .../vs2015_xp/test_zmq/test_multithread.cpp   |  229 --
 .../vs2015_xp/test_zmq/test_zmq.vcxproj       |  155 -
 .../vs2017/inproc_lat/inproc_lat.props        |   49 -
 .../vs2017/inproc_lat/inproc_lat.vcxproj      |   82 -
 .../vs2017/inproc_thr/inproc_thr.props        |   49 -
 .../vs2017/inproc_thr/inproc_thr.vcxproj      |   82 -
 .../vs2017/libsodium.import.props             |   52 -
 .../vs2017/libsodium.import.xml               |   17 -
 .../vs2017/libzmq.import.props                |   64 -
 .../deprecated-msvc/vs2017/libzmq.import.xml  |   49 -
 builds/deprecated-msvc/vs2017/libzmq.sln      |  208 -
 .../vs2017/libzmq/libzmq.props                |   76 -
 .../vs2017/libzmq/libzmq.vcxproj              |  289 --
 .../vs2017/libzmq/libzmq.vcxproj.filters      |  627 ---
 .../deprecated-msvc/vs2017/libzmq/libzmq.xml  |   40 -
 .../vs2017/local_lat/local_lat.props          |   49 -
 .../vs2017/local_lat/local_lat.vcxproj        |   82 -
 .../vs2017/local_thr/local_thr.props          |   49 -
 .../vs2017/local_thr/local_thr.vcxproj        |   82 -
 .../vs2017/remote_lat/remote_lat.props        |   49 -
 .../vs2017/remote_lat/remote_lat.vcxproj      |   82 -
 .../vs2017/remote_thr/remote_thr.props        |   49 -
 .../vs2017/remote_thr/remote_thr.vcxproj      |   82 -
 builds/gyp/.gitignore                         |    5 -
 builds/gyp/build.bat                          |    4 -
 builds/gyp/platform.hpp                       |   80 -
 builds/gyp/project-tests.gsl                  |   19 -
 builds/gyp/project-tests.gypi                 |  906 -----
 builds/gyp/project-tests.xml                  |   84 -
 builds/gyp/project.gyp                        |  295 --
 builds/mingw32/Makefile.mingw32               |   49 -
 builds/mingw32/platform.hpp                   |   43 -
 builds/nuget/libzmq.autopkg                   |   52 -
 builds/nuget/readme.nuget                     |   20 -
 builds/openwrt/Makefile                       |   70 -
 builds/qnx/ToolchainQNX6.6_x86.cmake          |   20 -
 builds/valgrind/ci_build.sh                   |   34 -
 builds/valgrind/valgrind.supp                 |   22 -
 builds/valgrind/vg                            |    1 -
 builds/vxworks/platform.hpp                   |  306 --
 builds/zos/README.md                          |  463 ---
 builds/zos/cxxall                             |   62 -
 builds/zos/makeclean                          |   36 -
 builds/zos/makelibzmq                         |   54 -
 builds/zos/maketests                          |  102 -
 builds/zos/platform.hpp                       |  300 --
 builds/zos/runtests                           |  188 -
 builds/zos/test_fork.cpp                      |   95 -
 builds/zos/zc++                               |   42 -
 ci_build.sh                                   |   84 -
 ci_deploy.sh                                  |   28 -
 clips/agenda.c                                | 1363 +++++++
 clips/agenda.h                                |  169 +
 clips/analysis.c                              | 1136 ++++++
 clips/analysis.h                              |   61 +
 clips/argacces.c                              |  509 +++
 clips/argacces.h                              |   77 +
 clips/bload.c                                 |  880 +++++
 clips/bload.h                                 |   94 +
 clips/bmathfun.c                              |  557 +++
 clips/bmathfun.h                              |   66 +
 clips/bsave.c                                 |  634 ++++
 clips/bsave.h                                 |  130 +
 clips/classcom.c                              |  976 +++++
 clips/classcom.h                              |  115 +
 clips/classexm.c                              | 1385 +++++++
 clips/classexm.h                              |   97 +
 clips/classfun.c                              | 1364 +++++++
 clips/classfun.h                              |  160 +
 clips/classinf.c                              | 1245 ++++++
 clips/classinf.h                              |   94 +
 clips/classini.c                              |  834 ++++
 clips/classini.h                              |   75 +
 clips/classpsr.c                              |  950 +++++
 clips/classpsr.h                              |   73 +
 clips/clips.cpp                               | 1644 ++++++++
 clips/clips.h                                 |  131 +
 clips/clips.hpp                               |  539 +++
 clips/clsltpsr.c                              |  914 +++++
 clips/clsltpsr.h                              |   72 +
 clips/commline.c                              | 1216 ++++++
 clips/commline.h                              |  131 +
 clips/conscomp.c                              | 1590 ++++++++
 clips/conscomp.h                              |  150 +
 clips/constant.h                              |  264 ++
 clips/constrct.c                              | 1063 ++++++
 clips/constrct.h                              |  216 ++
 clips/constrnt.c                              |  554 +++
 clips/constrnt.h                              |  132 +
 clips/crstrtgy.c                              | 1088 ++++++
 clips/crstrtgy.h                              |   85 +
 clips/cstrcbin.c                              |  185 +
 clips/cstrcbin.h                              |   61 +
 clips/cstrccmp.h                              |   43 +
 clips/cstrccom.c                              | 1776 +++++++++
 clips/cstrccom.h                              |  115 +
 clips/cstrcpsr.c                              |  835 ++++
 clips/cstrcpsr.h                              |   97 +
 clips/cstrnbin.c                              |  282 ++
 clips/cstrnbin.h                              |   55 +
 clips/cstrnchk.c                              |  826 ++++
 clips/cstrnchk.h                              |   91 +
 clips/cstrncmp.c                              |  237 ++
 clips/cstrncmp.h                              |   57 +
 clips/cstrnops.c                              | 1176 ++++++
 clips/cstrnops.h                              |   47 +
 clips/cstrnpsr.c                              | 1391 +++++++
 clips/cstrnpsr.h                              |   88 +
 clips/cstrnutl.c                              |  553 +++
 clips/cstrnutl.h                              |   54 +
 clips/default.c                               |  454 +++
 clips/default.h                               |   57 +
 clips/defins.c                                |  971 +++++
 clips/defins.h                                |  127 +
 clips/developr.c                              |  677 ++++
 clips/developr.h                              |   69 +
 clips/dffctbin.c                              |  477 +++
 clips/dffctbin.h                              |   76 +
 clips/dffctbsc.c                              |  308 ++
 clips/dffctbsc.h                              |   72 +
 clips/dffctcmp.c                              |  297 ++
 clips/dffctcmp.h                              |   44 +
 clips/dffctdef.c                              |  364 ++
 clips/dffctdef.h                              |  104 +
 clips/dffctpsr.c                              |  179 +
 clips/dffctpsr.h                              |   49 +
 clips/dffnxbin.c                              |  520 +++
 clips/dffnxbin.h                              |   67 +
 clips/dffnxcmp.c                              |  378 ++
 clips/dffnxcmp.h                              |   54 +
 clips/dffnxexe.c                              |  241 ++
 clips/dffnxexe.h                              |   58 +
 clips/dffnxfun.c                              | 1192 ++++++
 clips/dffnxfun.h                              |  155 +
 clips/dffnxpsr.c                              |  512 +++
 clips/dffnxpsr.h                              |   57 +
 clips/dfinsbin.c                              |  509 +++
 clips/dfinsbin.h                              |   66 +
 clips/dfinscmp.c                              |  345 ++
 clips/dfinscmp.h                              |   48 +
 clips/drive.c                                 | 1191 ++++++
 clips/drive.h                                 |   65 +
 clips/emathfun.c                              | 1167 ++++++
 clips/emathfun.h                              |   96 +
 clips/engine.c                                | 1565 ++++++++
 clips/engine.h                                |  203 +
 clips/entities.h                              |  276 ++
 clips/envrnbld.c                              |  770 ++++
 clips/envrnbld.h                              |   40 +
 clips/envrnmnt.c                              |  257 ++
 clips/envrnmnt.h                              |  112 +
 clips/evaluatn.c                              | 1718 +++++++++
 clips/evaluatn.h                              |  208 +
 clips/expressn.c                              |  494 +++
 clips/expressn.h                              |  151 +
 clips/exprnbin.c                              |  531 +++
 clips/exprnbin.h                              |   60 +
 clips/exprnops.c                              |  562 +++
 clips/exprnops.h                              |   67 +
 clips/exprnpsr.c                              | 1099 ++++++
 clips/exprnpsr.h                              |   98 +
 clips/extnfunc.c                              | 1016 +++++
 clips/extnfunc.h                              |  157 +
 clips/factbin.c                               |  447 +++
 clips/factbin.h                               |   56 +
 clips/factbld.c                               | 1035 +++++
 clips/factbld.h                               |   61 +
 clips/factcmp.c                               |  386 ++
 clips/factcmp.h                               |   46 +
 clips/factcom.c                               | 1306 +++++++
 clips/factcom.h                               |   84 +
 clips/factfun.c                               |  656 ++++
 clips/factfun.h                               |   75 +
 clips/factgen.c                               | 1282 +++++++
 clips/factgen.h                               |  229 ++
 clips/facthsh.c                               |  435 +++
 clips/facthsh.h                               |   81 +
 clips/factlhs.c                               |  250 ++
 clips/factlhs.h                               |   54 +
 clips/factmch.c                               |  902 +++++
 clips/factmch.h                               |   68 +
 clips/factmngr.c                              | 3345 +++++++++++++++++
 clips/factmngr.h                              |  325 ++
 clips/factprt.c                               |  498 +++
 clips/factprt.h                               |   60 +
 clips/factqpsr.c                              |  796 ++++
 clips/factqpsr.h                              |   61 +
 clips/factqury.c                              | 1261 +++++++
 clips/factqury.h                              |  109 +
 clips/factrete.c                              |  945 +++++
 clips/factrete.h                              |   70 +
 clips/factrhs.c                               |  667 ++++
 clips/factrhs.h                               |   55 +
 clips/filecom.c                               |  353 ++
 clips/filecom.h                               |  133 +
 clips/filertr.c                               |  481 +++
 clips/filertr.h                               |   94 +
 clips/fileutil.c                              | 1012 +++++
 clips/fileutil.h                              |   50 +
 clips/generate.c                              | 1079 ++++++
 clips/generate.h                              |   57 +
 clips/genrcbin.c                              |  902 +++++
 clips/genrcbin.h                              |   69 +
 clips/genrccmp.c                              |  640 ++++
 clips/genrccmp.h                              |   59 +
 clips/genrccom.c                              | 2017 ++++++++++
 clips/genrccom.h                              |  119 +
 clips/genrcexe.c                              |  737 ++++
 clips/genrcexe.h                              |   73 +
 clips/genrcfun.c                              |  887 +++++
 clips/genrcfun.h                              |  185 +
 clips/genrcpsr.c                              | 1618 ++++++++
 clips/genrcpsr.h                              |   80 +
 clips/globlbin.c                              |  458 +++
 clips/globlbin.h                              |   71 +
 clips/globlbsc.c                              |  361 ++
 clips/globlbsc.h                              |   83 +
 clips/globlcmp.c                              |  330 ++
 clips/globlcmp.h                              |   52 +
 clips/globlcom.c                              |  280 ++
 clips/globlcom.h                              |   63 +
 clips/globldef.c                              | 1069 ++++++
 clips/globldef.h                              |  151 +
 clips/globlpsr.c                              |  525 +++
 clips/globlpsr.h                              |   59 +
 clips/immthpsr.c                              |  431 +++
 clips/immthpsr.h                              |   55 +
 clips/incrrset.c                              |  530 +++
 clips/incrrset.h                              |   73 +
 clips/inherpsr.c                              |  850 +++++
 clips/inherpsr.h                              |   52 +
 clips/inscom.c                                | 2053 ++++++++++
 clips/inscom.h                                |  182 +
 clips/insfile.c                               | 1791 +++++++++
 clips/insfile.h                               |  104 +
 clips/insfun.c                                | 1451 +++++++
 clips/insfun.h                                |  134 +
 clips/insmngr.c                               | 2520 +++++++++++++
 clips/insmngr.h                               |  125 +
 clips/insmoddp.c                              | 1041 +++++
 clips/insmoddp.h                              |   91 +
 clips/insmult.c                               |  804 ++++
 clips/insmult.h                               |   62 +
 clips/inspsr.c                                |  590 +++
 clips/inspsr.h                                |   60 +
 clips/insquery.c                              | 1275 +++++++
 clips/insquery.h                              |  115 +
 clips/insqypsr.c                              |  729 ++++
 clips/insqypsr.h                              |   63 +
 clips/iofun.c                                 | 2045 ++++++++++
 clips/iofun.h                                 |  116 +
 clips/lgcldpnd.c                              |  644 ++++
 clips/lgcldpnd.h                              |   75 +
 clips/main.c                                  |  112 +
 clips/makefile                                | 1286 +++++++
 clips/makefile.win                            | 1290 +++++++
 clips/match.h                                 |  142 +
 clips/memalloc.c                              |  477 +++
 clips/memalloc.h                              |  197 +
 clips/miscfun.c                               | 1799 +++++++++
 clips/miscfun.h                               |  132 +
 clips/modulbin.c                              |  607 +++
 clips/modulbin.h                              |   84 +
 clips/modulbsc.c                              |  345 ++
 clips/modulbsc.h                              |   67 +
 clips/modulcmp.c                              |  499 +++
 clips/modulcmp.h                              |   54 +
 clips/moduldef.c                              |  817 ++++
 clips/moduldef.h                              |  271 ++
 clips/modulpsr.c                              | 1150 ++++++
 clips/modulpsr.h                              |   69 +
 clips/modulutl.c                              | 1018 +++++
 clips/modulutl.h                              |   84 +
 clips/msgcom.c                                | 1213 ++++++
 clips/msgcom.h                                |  125 +
 clips/msgfun.c                                | 1076 ++++++
 clips/msgfun.h                                |  118 +
 clips/msgpass.c                               | 1441 +++++++
 clips/msgpass.h                               |  100 +
 clips/msgpsr.c                                |  696 ++++
 clips/msgpsr.h                                |   71 +
 clips/multifld.c                              | 1404 +++++++
 clips/multifld.h                              |  130 +
 clips/multifun.c                              | 1713 +++++++++
 clips/multifun.h                              |   96 +
 clips/network.h                               |  142 +
 clips/objbin.c                                | 1509 ++++++++
 clips/objbin.h                                |   79 +
 clips/objcmp.c                                | 1507 ++++++++
 clips/objcmp.h                                |   71 +
 clips/object.h                                |  255 ++
 clips/objrtbin.c                              |  701 ++++
 clips/objrtbin.h                              |   79 +
 clips/objrtbld.c                              | 2396 ++++++++++++
 clips/objrtbld.h                              |   66 +
 clips/objrtcmp.c                              |  734 ++++
 clips/objrtcmp.h                              |   66 +
 clips/objrtfnx.c                              | 1312 +++++++
 clips/objrtfnx.h                              |  222 ++
 clips/objrtgen.c                              |  695 ++++
 clips/objrtgen.h                              |   63 +
 clips/objrtmch.c                              | 1505 ++++++++
 clips/objrtmch.h                              |  160 +
 clips/parsefun.c                              |  415 ++
 clips/parsefun.h                              |   67 +
 clips/pattern.c                               | 1265 +++++++
 clips/pattern.h                               |  163 +
 clips/pprint.c                                |  328 ++
 clips/pprint.h                                |   79 +
 clips/prccode.c                               | 1478 ++++++++
 clips/prccode.h                               |  145 +
 clips/prcdrfun.c                              |  640 ++++
 clips/prcdrfun.h                              |   93 +
 clips/prcdrpsr.c                              | 1057 ++++++
 clips/prcdrpsr.h                              |   79 +
 clips/prdctfun.c                              |  869 +++++
 clips/prdctfun.h                              |   77 +
 clips/prntutil.c                              |  875 +++++
 clips/prntutil.h                              |  125 +
 clips/proflfun.c                              |  824 ++++
 clips/proflfun.h                              |  118 +
 clips/reorder.c                               | 2082 ++++++++++
 clips/reorder.h                               |  172 +
 clips/reteutil.c                              | 1732 +++++++++
 clips/reteutil.h                              |  110 +
 clips/retract.c                               |  710 ++++
 clips/retract.h                               |   74 +
 clips/router.c                                |  734 ++++
 clips/router.h                                |  145 +
 clips/rulebin.c                               | 1136 ++++++
 clips/rulebin.h                               |  153 +
 clips/rulebld.c                               | 1328 +++++++
 clips/rulebld.h                               |   62 +
 clips/rulebsc.c                               |  517 +++
 clips/rulebsc.h                               |   91 +
 clips/rulecmp.c                               |  733 ++++
 clips/rulecmp.h                               |   63 +
 clips/rulecom.c                               | 1571 ++++++++
 clips/rulecom.h                               |  116 +
 clips/rulecstr.c                              |  877 +++++
 clips/rulecstr.h                              |   53 +
 clips/ruledef.c                               |  559 +++
 clips/ruledef.h                               |  179 +
 clips/ruledlt.c                               |  599 +++
 clips/ruledlt.h                               |   58 +
 clips/rulelhs.c                               | 1216 ++++++
 clips/rulelhs.h                               |   52 +
 clips/rulepsr.c                               | 1070 ++++++
 clips/rulepsr.h                               |   61 +
 clips/scanner.c                               |  859 +++++
 clips/scanner.h                               |  112 +
 clips/setup.h                                 |  486 +++
 clips/sortfun.c                               |  433 +++
 clips/sortfun.h                               |   55 +
 clips/strngfun.c                              | 1066 ++++++
 clips/strngfun.h                              |   99 +
 clips/strngrtr.c                              |  523 +++
 clips/strngrtr.h                              |   97 +
 clips/symblbin.c                              |  646 ++++
 clips/symblbin.h                              |   64 +
 clips/symblcmp.c                              |  893 +++++
 clips/symblcmp.h                              |   61 +
 clips/symbol.c                                | 1961 ++++++++++
 clips/symbol.h                                |  243 ++
 clips/sysdep.c                                |  851 +++++
 clips/sysdep.h                                |  149 +
 clips/textpro.c                               | 1388 +++++++
 clips/textpro.h                               |   77 +
 clips/tmpltbin.c                              |  609 +++
 clips/tmpltbin.h                              |  108 +
 clips/tmpltbsc.c                              |  327 ++
 clips/tmpltbsc.h                              |   87 +
 clips/tmpltcmp.c                              |  450 +++
 clips/tmpltcmp.h                              |   57 +
 clips/tmpltdef.c                              |  584 +++
 clips/tmpltdef.h                              |  154 +
 clips/tmpltfun.c                              | 2461 ++++++++++++
 clips/tmpltfun.h                              |  122 +
 clips/tmpltlhs.c                              |  379 ++
 clips/tmpltlhs.h                              |   50 +
 clips/tmpltpsr.c                              |  819 ++++
 clips/tmpltpsr.h                              |   59 +
 clips/tmpltrhs.c                              |  588 +++
 clips/tmpltrhs.h                              |   55 +
 clips/tmpltutl.c                              |  616 +++
 clips/tmpltutl.h                              |   78 +
 clips/userdata.c                              |  156 +
 clips/userdata.h                              |   72 +
 clips/userfunctions.c                         |   70 +
 clips/usrsetup.h                              |   12 +
 clips/utility.c                               | 1480 ++++++++
 clips/utility.h                               |  236 ++
 clips/watch.c                                 |  865 +++++
 clips/watch.h                                 |  124 +
 configure.ac                                  | 1106 ------
 doc/Makefile.am                               |   66 -
 doc/asciidoc.conf                             |   56 -
 doc/zmq.txt                                   |  280 --
 doc/zmq_atomic_counter_dec.txt                |   62 -
 doc/zmq_atomic_counter_destroy.txt            |   62 -
 doc/zmq_atomic_counter_inc.txt                |   61 -
 doc/zmq_atomic_counter_new.txt                |   62 -
 doc/zmq_atomic_counter_set.txt                |   61 -
 doc/zmq_atomic_counter_value.txt              |   62 -
 doc/zmq_bind.txt                              |  105 -
 doc/zmq_close.txt                             |   59 -
 doc/zmq_connect.txt                           |  109 -
 doc/zmq_connect_peer.txt                      |   92 -
 doc/zmq_ctx_destroy.txt                       |   67 -
 doc/zmq_ctx_get.txt                           |  123 -
 doc/zmq_ctx_get_ext.txt                       |   82 -
 doc/zmq_ctx_new.txt                           |   50 -
 doc/zmq_ctx_set.txt                           |  197 -
 doc/zmq_ctx_set_ext.txt                       |   86 -
 doc/zmq_ctx_shutdown.txt                      |   54 -
 doc/zmq_ctx_term.txt                          |   68 -
 doc/zmq_curve.txt                             |   92 -
 doc/zmq_curve_keypair.txt                     |   56 -
 doc/zmq_curve_public.txt                      |   62 -
 doc/zmq_disconnect.txt                        |   76 -
 doc/zmq_errno.txt                             |   50 -
 doc/zmq_getsockopt.txt                        | 1018 -----
 doc/zmq_gssapi.txt                            |   78 -
 doc/zmq_has.txt                               |   44 -
 doc/zmq_init.txt                              |   52 -
 doc/zmq_inproc.txt                            |   88 -
 doc/zmq_ipc.txt                               |  106 -
 doc/zmq_msg_close.txt                         |   57 -
 doc/zmq_msg_copy.txt                          |   72 -
 doc/zmq_msg_data.txt                          |   49 -
 doc/zmq_msg_get.txt                           |   83 -
 doc/zmq_msg_gets.txt                          |   83 -
 doc/zmq_msg_init.txt                          |   65 -
 doc/zmq_msg_init_buffer.txt                   |   59 -
 doc/zmq_msg_init_data.txt                     |   90 -
 doc/zmq_msg_init_size.txt                     |   59 -
 doc/zmq_msg_more.txt                          |   65 -
 doc/zmq_msg_move.txt                          |   53 -
 doc/zmq_msg_recv.txt                          |  128 -
 doc/zmq_msg_routing_id.txt                    |   61 -
 doc/zmq_msg_send.txt                          |  132 -
 doc/zmq_msg_set.txt                           |   46 -
 doc/zmq_msg_set_routing_id.txt                |   46 -
 doc/zmq_msg_size.txt                          |   49 -
 doc/zmq_null.txt                              |   27 -
 doc/zmq_pgm.txt                               |  188 -
 doc/zmq_plain.txt                             |   37 -
 doc/zmq_poll.txt                              |  145 -
 doc/zmq_poller.txt                            |  316 --
 doc/zmq_proxy.txt                             |   99 -
 doc/zmq_proxy_steerable.txt                   |  126 -
 doc/zmq_recv.txt                              |   95 -
 doc/zmq_recvmsg.txt                           |  125 -
 doc/zmq_send.txt                              |  105 -
 doc/zmq_send_const.txt                        |  104 -
 doc/zmq_sendmsg.txt                           |  122 -
 doc/zmq_setsockopt.txt                        | 1519 --------
 doc/zmq_socket.txt                            |  758 ----
 doc/zmq_socket_monitor.txt                    |  296 --
 doc/zmq_socket_monitor_versioned.txt          |  396 --
 doc/zmq_strerror.txt                          |   56 -
 doc/zmq_tcp.txt                               |  142 -
 doc/zmq_term.txt                              |   66 -
 doc/zmq_timers.txt                            |  162 -
 doc/zmq_tipc.txt                              |   83 -
 doc/zmq_udp.txt                               |  116 -
 doc/zmq_unbind.txt                            |  103 -
 doc/zmq_version.txt                           |   54 -
 doc/zmq_vmci.txt                              |   97 -
 doc/zmq_z85_decode.txt                        |   51 -
 doc/zmq_z85_encode.txt                        |   58 -
 external/sha1/license.txt                     |   26 -
 external/sha1/sha1.c                          |  336 --
 external/sha1/sha1.h                          |   87 -
 external/unity/license.txt                    |   21 -
 external/unity/unity.c                        | 1570 --------
 external/unity/unity.h                        |  503 ---
 external/unity/unity_internals.h              |  872 -----
 external/unity/version.txt                    |    1 -
 external/wepoll/README.md                     |  202 -
 external/wepoll/license.txt                   |   28 -
 external/wepoll/version.txt                   |    1 -
 external/wepoll/wepoll.c                      | 2186 -----------
 external/wepoll/wepoll.h                      |  117 -
 include/zmq.h                                 |  784 ----
 include/zmq_utils.h                           |   50 -
 installer.ico                                 |  Bin 2842 -> 0 bytes
 m4/ax_check_compile_flag.m4                   |   74 -
 m4/ax_check_vscript.m4                        |  142 -
 m4/ax_code_coverage.m4                        |  264 --
 m4/ax_cxx_compile_stdcxx.m4                   |  562 ---
 m4/ax_cxx_compile_stdcxx_11.m4                |   40 -
 m4/ax_func_posix_memalign.m4                  |   50 -
 m4/ax_valgrind_check.m4                       |  233 --
 packaging/README                              |    4 -
 packaging/debian/changelog                    |    5 -
 packaging/debian/compat                       |    1 -
 packaging/debian/control                      |   75 -
 packaging/debian/copyright                    |  116 -
 packaging/debian/libzmq3-dev.install          |    4 -
 packaging/debian/libzmq3-dev.manpages         |    2 -
 packaging/debian/libzmq5.docs                 |    2 -
 packaging/debian/libzmq5.install              |    1 -
 packaging/debian/rules                        |   69 -
 packaging/debian/source/format                |    1 -
 packaging/debian/zeromq.dsc.obs               |   15 -
 packaging/nuget/package.bat                   |   14 -
 packaging/nuget/package.config                |    6 -
 packaging/nuget/package.gsl                   |  264 --
 packaging/nuget/package.nuspec                |   98 -
 packaging/nuget/package.targets               |  129 -
 packaging/nuget/package.xml                   |   22 -
 packaging/obs/_service                        |   99 -
 packaging/redhat/zeromq.spec                  |  310 --
 perf/benchmark_radix_tree.cpp                 |  131 -
 perf/generate_csv.sh                          |  147 -
 perf/generate_graphs.py                       |   73 -
 perf/inproc_lat.cpp                           |  238 --
 perf/inproc_thr.cpp                           |  247 --
 perf/local_lat.cpp                            |  116 -
 perf/local_thr.cpp                            |  161 -
 perf/proxy_thr.cpp                            |  412 --
 perf/remote_lat.cpp                           |  129 -
 perf/remote_thr.cpp                           |  138 -
 src/address.cpp                               |  143 -
 src/address.hpp                               |  162 -
 src/array.hpp                                 |  140 -
 src/atomic_counter.hpp                        |  235 --
 src/atomic_ptr.hpp                            |  306 --
 src/blob.hpp                                  |  205 -
 src/channel.cpp                               |  160 -
 src/channel.hpp                               |   69 -
 src/client.cpp                                |  114 -
 src/client.hpp                                |   73 -
 src/clock.cpp                                 |  266 --
 src/clock.hpp                                 |   80 -
 src/command.hpp                               |  225 --
 src/condition_variable.hpp                    |  312 --
 src/config.hpp                                |   89 -
 src/ctx.cpp                                   |  893 -----
 src/ctx.hpp                                   |  271 --
 src/curve_client.cpp                          |  287 --
 src/curve_client.hpp                          |   86 -
 src/curve_client_tools.hpp                    |  316 --
 src/curve_mechanism_base.cpp                  |  313 --
 src/curve_mechanism_base.hpp                  |  108 -
 src/curve_server.cpp                          |  506 ---
 src/curve_server.hpp                          |   92 -
 src/dbuffer.hpp                               |  134 -
 src/dealer.cpp                                |  145 -
 src/dealer.hpp                                |   85 -
 src/decoder.hpp                               |  191 -
 src/decoder_allocators.cpp                    |  151 -
 src/decoder_allocators.hpp                    |  133 -
 src/devpoll.cpp                               |  208 -
 src/devpoll.hpp                               |  101 -
 src/dgram.cpp                                 |  169 -
 src/dgram.hpp                                 |   74 -
 src/dish.cpp                                  |  350 --
 src/dish.hpp                                  |  121 -
 src/dist.cpp                                  |  237 --
 src/dist.hpp                                  |  115 -
 src/encoder.hpp                               |  178 -
 src/endpoint.cpp                              |   44 -
 src/endpoint.hpp                              |   72 -
 src/epoll.cpp                                 |  218 --
 src/epoll.hpp                                 |  114 -
 src/err.cpp                                   |  453 ---
 src/err.hpp                                   |  183 -
 src/fd.hpp                                    |   63 -
 src/fq.cpp                                    |  150 -
 src/fq.hpp                                    |   84 -
 src/gather.cpp                                |   91 -
 src/gather.hpp                                |   66 -
 src/generic_mtrie.hpp                         |  126 -
 src/generic_mtrie_impl.hpp                    |  472 ---
 src/gssapi_client.cpp                         |  236 --
 src/gssapi_client.hpp                         |   92 -
 src/gssapi_mechanism_base.cpp                 |  402 --
 src/gssapi_mechanism_base.hpp                 |  132 -
 src/gssapi_server.cpp                         |  248 --
 src/gssapi_server.hpp                         |   93 -
 src/i_decoder.hpp                             |   61 -
 src/i_encoder.hpp                             |   58 -
 src/i_engine.hpp                              |   82 -
 src/i_mailbox.hpp                             |   58 -
 src/i_poll_events.hpp                         |   55 -
 src/io_object.cpp                             |  116 -
 src/io_object.hpp                             |   83 -
 src/io_thread.cpp                             |  121 -
 src/io_thread.hpp                             |   92 -
 src/ip.cpp                                    |  911 -----
 src/ip.hpp                                    |   86 -
 src/ip_resolver.cpp                           |  742 ----
 src/ip_resolver.hpp                           |  121 -
 src/ipc_address.cpp                           |  131 -
 src/ipc_address.hpp                           |   74 -
 src/ipc_connecter.cpp                         |  179 -
 src/ipc_connecter.hpp                         |   73 -
 src/ipc_listener.cpp                          |  357 --
 src/ipc_listener.hpp                          |   88 -
 src/kqueue.cpp                                |  230 --
 src/kqueue.hpp                                |  109 -
 src/lb.cpp                                    |  180 -
 src/lb.hpp                                    |   85 -
 src/libzmq.pc.in                              |   12 -
 src/libzmq.vers                               |    4 -
 src/likely.hpp                                |   42 -
 src/macros.hpp                                |   63 -
 src/mailbox.cpp                               |  106 -
 src/mailbox.hpp                               |   86 -
 src/mailbox_safe.cpp                          |  125 -
 src/mailbox_safe.hpp                          |   88 -
 src/mechanism.cpp                             |  370 --
 src/mechanism.hpp                             |  151 -
 src/mechanism_base.cpp                        |   82 -
 src/mechanism_base.hpp                        |   55 -
 src/metadata.cpp                              |   58 -
 src/metadata.hpp                              |   68 -
 src/msg.cpp                                   |  724 ----
 src/msg.hpp                                   |  345 --
 src/mtrie.cpp                                 |   37 -
 src/mtrie.hpp                                 |   52 -
 src/mutex.hpp                                 |  204 -
 src/norm_engine.cpp                           |  721 ----
 src/norm_engine.hpp                           |  195 -
 src/null_mechanism.cpp                        |  230 --
 src/null_mechanism.hpp                        |   73 -
 src/object.cpp                                |  551 ---
 src/object.hpp                                |  170 -
 src/options.cpp                               | 1283 -------
 src/options.hpp                               |  347 --
 src/own.cpp                                   |  212 --
 src/own.hpp                                   |  147 -
 src/pair.cpp                                  |  138 -
 src/pair.hpp                                  |   71 -
 src/peer.cpp                                  |   70 -
 src/peer.hpp                                  |   67 -
 src/pgm_receiver.cpp                          |  314 --
 src/pgm_receiver.hpp                          |  145 -
 src/pgm_sender.cpp                            |  256 --
 src/pgm_sender.hpp                            |  124 -
 src/pgm_socket.cpp                            |  687 ----
 src/pgm_socket.hpp                            |  128 -
 src/pipe.cpp                                  |  617 ---
 src/pipe.hpp                                  |  274 --
 src/plain_client.cpp                          |  224 --
 src/plain_client.hpp                          |   73 -
 src/plain_common.hpp                          |   53 -
 src/plain_server.cpp                          |  253 --
 src/plain_server.hpp                          |   66 -
 src/poll.cpp                                  |  204 -
 src/poll.hpp                                  |  110 -
 src/poller.hpp                                |   68 -
 src/poller_base.cpp                           |  147 -
 src/poller_base.hpp                           |  195 -
 src/polling_util.cpp                          |   51 -
 src/polling_util.hpp                          |  178 -
 src/pollset.cpp                               |  254 --
 src/pollset.hpp                               |  116 -
 src/precompiled.cpp                           |   30 -
 src/precompiled.hpp                           |  134 -
 src/proxy.cpp                                 |  646 ----
 src/proxy.hpp                                 |   42 -
 src/pub.cpp                                   |   69 -
 src/pub.hpp                                   |   59 -
 src/pull.cpp                                  |   76 -
 src/pull.hpp                                  |   68 -
 src/push.cpp                                  |   80 -
 src/push.hpp                                  |   68 -
 src/radio.cpp                                 |  286 --
 src/radio.hpp                                 |  113 -
 src/radix_tree.cpp                            |  578 ---
 src/radix_tree.hpp                            |  147 -
 src/random.cpp                                |  170 -
 src/random.hpp                                |   51 -
 src/raw_decoder.cpp                           |   74 -
 src/raw_decoder.hpp                           |   67 -
 src/raw_encoder.cpp                           |   50 -
 src/raw_encoder.hpp                           |   56 -
 src/raw_engine.cpp                            |  138 -
 src/raw_engine.hpp                            |   77 -
 src/reaper.cpp                                |  149 -
 src/reaper.hpp                                |   89 -
 src/rep.cpp                                   |  133 -
 src/rep.hpp                                   |   67 -
 src/req.cpp                                   |  319 --
 src/req.hpp                                   |  115 -
 src/router.cpp                                |  526 ---
 src/router.hpp                                |  132 -
 src/scatter.cpp                               |   86 -
 src/scatter.hpp                               |   68 -
 src/secure_allocator.hpp                      |  104 -
 src/select.cpp                                |  626 ---
 src/select.hpp                                |  171 -
 src/server.cpp                                |  184 -
 src/server.hpp                                |   88 -
 src/session_base.cpp                          |  810 ----
 src/session_base.hpp                          |  198 -
 src/signaler.cpp                              |  414 --
 src/signaler.hpp                              |   88 -
 src/socket_base.cpp                           | 2158 -----------
 src/socket_base.hpp                           |  400 --
 src/socket_poller.cpp                         |  695 ----
 src/socket_poller.hpp                         |  154 -
 src/socks.cpp                                 |  381 --
 src/socks.hpp                                 |  178 -
 src/socks_connecter.cpp                       |  424 ---
 src/socks_connecter.hpp                       |  135 -
 src/stdint.hpp                                |   80 -
 src/stream.cpp                                |  291 --
 src/stream.hpp                                |   94 -
 src/stream_connecter_base.cpp                 |  199 -
 src/stream_connecter_base.hpp                 |  125 -
 src/stream_engine_base.cpp                    |  768 ----
 src/stream_engine_base.hpp                    |  205 -
 src/stream_listener_base.cpp                  |  127 -
 src/stream_listener_base.hpp                  |   88 -
 src/sub.cpp                                   |   84 -
 src/sub.hpp                                   |   57 -
 src/tcp.cpp                                   |  408 --
 src/tcp.hpp                                   |   83 -
 src/tcp_address.cpp                           |  359 --
 src/tcp_address.hpp                           |   98 -
 src/tcp_connecter.cpp                         |  313 --
 src/tcp_connecter.hpp                         |   90 -
 src/tcp_listener.cpp                          |  273 --
 src/tcp_listener.hpp                          |   71 -
 src/thread.cpp                                |  406 --
 src/thread.hpp                                |  136 -
 src/timers.cpp                                |  184 -
 src/timers.hpp                                |  108 -
 src/tipc_address.cpp                          |  172 -
 src/tipc_address.hpp                          |   76 -
 src/tipc_connecter.cpp                        |  175 -
 src/tipc_connecter.hpp                        |   75 -
 src/tipc_listener.cpp                         |  175 -
 src/tipc_listener.hpp                         |   77 -
 src/trie.cpp                                  |  323 --
 src/trie.hpp                                  |   85 -
 src/tweetnacl.c                               |  993 -----
 src/tweetnacl.h                               |   80 -
 src/udp_address.cpp                           |  211 --
 src/udp_address.hpp                           |   73 -
 src/udp_engine.cpp                            |  629 ----
 src/udp_engine.hpp                            |   92 -
 src/v1_decoder.cpp                            |  156 -
 src/v1_decoder.hpp                            |   62 -
 src/v1_encoder.cpp                            |   95 -
 src/v1_encoder.hpp                            |   55 -
 src/v2_decoder.cpp                            |  167 -
 src/v2_decoder.hpp                            |   70 -
 src/v2_encoder.cpp                            |   96 -
 src/v2_encoder.hpp                            |   56 -
 src/v2_protocol.hpp                           |   49 -
 src/v3_1_encoder.cpp                          |  105 -
 src/v3_1_encoder.hpp                          |   56 -
 src/version.rc.in                             |   93 -
 src/vmci.cpp                                  |  100 -
 src/vmci.hpp                                  |   66 -
 src/vmci_address.cpp                          |  167 -
 src/vmci_address.hpp                          |   71 -
 src/vmci_connecter.cpp                        |  302 --
 src/vmci_connecter.hpp                        |  137 -
 src/vmci_listener.cpp                         |  267 --
 src/vmci_listener.hpp                         |   98 -
 src/windows.hpp                               |  100 -
 src/wire.hpp                                  |  103 -
 src/ws_address.cpp                            |  166 -
 src/ws_address.hpp                            |   77 -
 src/ws_connecter.cpp                          |  305 --
 src/ws_connecter.hpp                          |   98 -
 src/ws_decoder.cpp                            |  273 --
 src/ws_decoder.hpp                            |   81 -
 src/ws_encoder.cpp                            |  138 -
 src/ws_encoder.hpp                            |   59 -
 src/ws_engine.cpp                             | 1094 ------
 src/ws_engine.hpp                             |  182 -
 src/ws_listener.cpp                           |  335 --
 src/ws_listener.hpp                           |   84 -
 src/ws_protocol.hpp                           |   58 -
 src/wss_address.cpp                           |   53 -
 src/wss_address.hpp                           |   47 -
 src/wss_engine.cpp                            |  236 --
 src/wss_engine.hpp                            |   68 -
 src/xpub.cpp                                  |  396 --
 src/xpub.hpp                                  |  140 -
 src/xsub.cpp                                  |  279 --
 src/xsub.hpp                                  |  120 -
 src/ypipe.hpp                                 |  205 -
 src/ypipe_base.hpp                            |   55 -
 src/ypipe_conflate.hpp                        |  113 -
 src/yqueue.hpp                                |  214 --
 src/zap_client.cpp                            |  314 --
 src/zap_client.hpp                            |  101 -
 src/zmq.cpp                                   | 1535 --------
 src/zmq_draft.h                               |  169 -
 src/zmq_utils.cpp                             |  321 --
 src/zmtp_engine.cpp                           |  592 ---
 src/zmtp_engine.hpp                           |  136 -
 tests/CMakeLists.txt                          |  307 --
 tests/README.md                               |   45 -
 tests/fuzzer_corpora/endpoint.dict            |    4 -
 .../fuzzer_corpora/test_bind_curve_fuzzer.txt |    1 -
 tests/fuzzer_corpora/test_bind_fuzzer.txt     |    1 -
 .../fuzzer_corpora/test_bind_null_fuzzer.txt  |    2 -
 .../test_connect_curve_fuzzer.txt             |    1 -
 .../test_connect_null_fuzzer.txt              |    1 -
 .../fuzzer_corpora/test_z85_decode_fuzzer.txt |    1 -
 tests/fuzzer_corpora/zmtp.dict                |   45 -
 tests/test_abstract_ipc.cpp                   |   66 -
 tests/test_address_tipc.cpp                   |  107 -
 tests/test_ancillaries.cpp                    |   71 -
 tests/test_app_meta.cpp                       |  169 -
 tests/test_atomics.cpp                        |   65 -
 tests/test_base85.cpp                         |  204 -
 tests/test_bind_after_connect_tcp.cpp         |   63 -
 tests/test_bind_curve_fuzzer.cpp              |  149 -
 tests/test_bind_fuzzer.cpp                    |   82 -
 tests/test_bind_null_fuzzer.cpp               |  112 -
 tests/test_bind_src_address.cpp               |   56 -
 tests/test_capabilities.cpp                   |   99 -
 tests/test_channel.cpp                        |   81 -
 tests/test_client_server.cpp                  |  135 -
 tests/test_conflate.cpp                       |   76 -
 tests/test_connect_curve_fuzzer.cpp           |  139 -
 tests/test_connect_delay_tipc.cpp             |  246 --
 tests/test_connect_fuzzer.cpp                 |   71 -
 tests/test_connect_null_fuzzer.cpp            |  118 -
 tests/test_connect_resolve.cpp                |  104 -
 tests/test_connect_rid.cpp                    |  252 --
 tests/test_ctx_destroy.cpp                    |  255 --
 tests/test_ctx_options.cpp                    |  301 --
 tests/test_dgram.cpp                          |  107 -
 tests/test_diffserv.cpp                       |   72 -
 tests/test_disconnect_inproc.cpp              |  137 -
 tests/test_disconnect_msg.cpp                 |  118 -
 tests/test_filter_ipc.cpp                     |  220 --
 tests/test_fork.cpp                           |  103 -
 tests/test_getsockopt_memset.cpp              |   61 -
 tests/test_heartbeats.cpp                     |  444 ---
 tests/test_hello_msg.cpp                      |  107 -
 tests/test_hwm.cpp                            |  306 --
 tests/test_hwm_pubsub.cpp                     |  304 --
 tests/test_immediate.cpp                      |  221 --
 tests/test_inproc_connect.cpp                 |  353 --
 tests/test_invalid_rep.cpp                    |   91 -
 tests/test_iov.cpp                            |  154 -
 tests/test_ipc_wildcard.cpp                   |   57 -
 tests/test_issue_566.cpp                      |   98 -
 tests/test_last_endpoint.cpp                  |   65 -
 tests/test_many_sockets.cpp                   |   98 -
 tests/test_metadata.cpp                       |  136 -
 tests/test_mock_pub_sub.cpp                   |  244 --
 tests/test_monitor.cpp                        |  463 ---
 tests/test_msg_ffn.cpp                        |  126 -
 tests/test_msg_flags.cpp                      |  117 -
 tests/test_msg_init.cpp                       |   86 -
 tests/test_pair_inproc.cpp                    |   82 -
 tests/test_pair_ipc.cpp                       |   58 -
 tests/test_pair_tcp.cpp                       |  161 -
 tests/test_pair_tcp_cap_net_admin.cpp         |   80 -
 tests/test_pair_tipc.cpp                      |   60 -
 tests/test_pair_vmci.cpp                      |   64 -
 tests/test_peer.cpp                           |  113 -
 tests/test_poller.cpp                         |  778 ----
 tests/test_probe_router.cpp                   |  113 -
 tests/test_proxy.cpp                          |  470 ---
 tests/test_proxy_hwm.cpp                      |  426 ---
 tests/test_proxy_single_socket.cpp            |  101 -
 tests/test_proxy_terminate.cpp                |  116 -
 tests/test_pub_invert_matching.cpp            |  120 -
 tests/test_radio_dish.cpp                     |  555 ---
 tests/test_rebind_ipc.cpp                     |   69 -
 tests/test_reconnect_ivl.cpp                  |  111 -
 tests/test_reconnect_options.cpp              |  240 --
 tests/test_req_correlate.cpp                  |  124 -
 tests/test_req_relaxed.cpp                    |  238 --
 tests/test_reqrep_device.cpp                  |  125 -
 tests/test_reqrep_device_tipc.cpp             |  125 -
 tests/test_reqrep_inproc.cpp                  |   56 -
 tests/test_reqrep_ipc.cpp                     |   86 -
 tests/test_reqrep_tcp.cpp                     |  220 --
 tests/test_reqrep_tipc.cpp                    |   60 -
 tests/test_reqrep_vmci.cpp                    |   64 -
 tests/test_router_handover.cpp                |  155 -
 tests/test_router_mandatory.cpp               |  233 --
 tests/test_router_mandatory_hwm.cpp           |  120 -
 tests/test_router_mandatory_tipc.cpp          |   70 -
 tests/test_router_notify.cpp                  |  322 --
 tests/test_scatter_gather.cpp                 |   88 -
 tests/test_security_curve.cpp                 |  608 ---
 tests/test_security_gssapi.cpp                |  274 --
 tests/test_security_no_zap_handler.cpp        |   82 -
 tests/test_security_null.cpp                  |  199 -
 tests/test_security_plain.cpp                 |  211 --
 tests/test_security_zap.cpp                   |  472 ---
 tests/test_setsockopt.cpp                     |  150 -
 tests/test_shutdown_stress.cpp                |   97 -
 tests/test_shutdown_stress_tipc.cpp           |   99 -
 tests/test_socket_null.cpp                    |  145 -
 tests/test_sockopt_hwm.cpp                    |  200 -
 tests/test_socks.cpp                          |  893 -----
 tests/test_sodium.cpp                         |  114 -
 tests/test_spec_dealer.cpp                    |  226 --
 tests/test_spec_pushpull.cpp                  |  421 ---
 tests/test_spec_rep.cpp                       |  174 -
 tests/test_spec_req.cpp                       |  260 --
 tests/test_spec_router.cpp                    |  199 -
 tests/test_srcfd.cpp                          |  118 -
 tests/test_stream.cpp                         |  303 --
 tests/test_stream_disconnect.cpp              |  265 --
 tests/test_stream_empty.cpp                   |   71 -
 tests/test_stream_exceeds_buffer.cpp          |   90 -
 tests/test_stream_timeout.cpp                 |  167 -
 tests/test_sub_forward.cpp                    |   91 -
 tests/test_sub_forward_tipc.cpp               |   92 -
 tests/test_system.cpp                         |  117 -
 tests/test_term_endpoint.cpp                  |  183 -
 tests/test_term_endpoint_tipc.cpp             |  103 -
 tests/test_thread_safe.cpp                    |  106 -
 tests/test_timeo.cpp                          |   85 -
 tests/test_timers.cpp                         |  222 --
 tests/test_unbind_wildcard.cpp                |  205 -
 tests/test_use_fd.cpp                         |  218 --
 tests/test_ws_transport.cpp                   |  291 --
 tests/test_wss_transport.cpp                  |  162 -
 tests/test_xpub_manual.cpp                    |  539 ---
 tests/test_xpub_manual_last_value.cpp         |  514 ---
 tests/test_xpub_nodrop.cpp                    |  126 -
 tests/test_xpub_verbose.cpp                   |  330 --
 tests/test_xpub_welcome_msg.cpp               |   73 -
 tests/test_z85_decode_fuzzer.cpp              |   89 -
 tests/test_zmq_poll_fd.cpp                    |   86 -
 tests/testutil.cpp                            |  568 ---
 tests/testutil.hpp                            |  236 --
 tests/testutil_monitoring.cpp                 |  345 --
 tests/testutil_monitoring.hpp                 |   79 -
 tests/testutil_security.cpp                   |  416 --
 tests/testutil_security.hpp                   |  155 -
 tests/testutil_unity.cpp                      |  335 --
 tests/testutil_unity.hpp                      |  280 --
 tools/curve_keygen.cpp                        |   64 -
 unittests/CMakeLists.txt                      |   73 -
 unittests/unittest_curve_encoding.cpp         |  155 -
 unittests/unittest_ip_resolver.cpp            |  969 -----
 unittests/unittest_mtrie.cpp                  |  458 ---
 unittests/unittest_poller.cpp                 |  280 --
 unittests/unittest_radix_tree.cpp             |  290 --
 unittests/unittest_resolver_common.hpp        |   77 -
 unittests/unittest_udp_address.cpp            |  335 --
 unittests/unittest_ypipe.cpp                  |   87 -
 version.sh                                    |   21 -
 1404 files changed, 175332 insertions(+), 144949 deletions(-)
 delete mode 100644 .clang-format
 delete mode 100644 .clang-tidy
 delete mode 100644 .github/CONTRIBUTING.md
 delete mode 100644 .github/issue_template.md
 delete mode 100644 .github/stale.yml
 delete mode 100644 .github/workflows/CI.yaml
 delete mode 100644 .github/workflows/Fuzzers.yaml
 delete mode 100644 .gitignore
 delete mode 100644 .hgeol
 delete mode 100644 .mailmap
 delete mode 100644 .travis.yml
 delete mode 100644 AUTHORS
 delete mode 100644 COPYING
 delete mode 100644 COPYING.LESSER
 delete mode 100644 Dockerfile
 delete mode 100644 Doxygen.cfg
 delete mode 100644 INSTALL
 delete mode 100644 Jenkinsfile
 delete mode 100755 Makefile.am
 delete mode 100644 NEWS
 delete mode 100755 README.cygwin.md
 delete mode 100644 README.doxygen.md
 delete mode 100644 RELICENSE/AnCaPepe.md
 delete mode 100644 RELICENSE/AndreLouisCaron.md
 delete mode 100644 RELICENSE/Asmod4n.md
 delete mode 100644 RELICENSE/AxelNennker.md
 delete mode 100644 RELICENSE/Bklyn.md
 delete mode 100644 RELICENSE/Botje.md
 delete mode 100644 RELICENSE/CommanderBubble.md
 delete mode 100644 RELICENSE/DaiyuHurst.md
 delete mode 100644 RELICENSE/Eelis.md
 delete mode 100644 RELICENSE/FrancoFichtner.md
 delete mode 100644 RELICENSE/FredTreg.md
 delete mode 100644 RELICENSE/Hugne.md
 delete mode 100644 RELICENSE/JohanMabille.md
 delete mode 100644 RELICENSE/JonDyte.md
 delete mode 100644 RELICENSE/KLNikita.md
 delete mode 100644 RELICENSE/Neopallium.md
 delete mode 100644 RELICENSE/Quuxplusone.md
 delete mode 100644 RELICENSE/README.md
 delete mode 100644 RELICENSE/RPGillespie6.md
 delete mode 100644 RELICENSE/Ricardicus.md
 delete mode 100644 RELICENSE/SRombauts.md
 delete mode 100644 RELICENSE/SergheiNovac.md
 delete mode 100644 RELICENSE/SylvainCorlay.md
 delete mode 100644 RELICENSE/TTimo.md
 delete mode 100644 RELICENSE/ThePrez.md
 delete mode 100644 RELICENSE/TobiSchluter.md
 delete mode 100644 RELICENSE/WenbinHou.md
 delete mode 100644 RELICENSE/a4z.md
 delete mode 100644 RELICENSE/abbradar.md
 delete mode 100644 RELICENSE/ackalker.md
 delete mode 100644 RELICENSE/acsearle.md
 delete mode 100644 RELICENSE/agronholm.md
 delete mode 100644 RELICENSE/aixxe.md
 delete mode 100644 RELICENSE/amuraru.md
 delete mode 100644 RELICENSE/answeroo.md
 delete mode 100644 RELICENSE/antonrd.md
 delete mode 100644 RELICENSE/arsenm.md
 delete mode 100644 RELICENSE/asafkahlon.md
 delete mode 100644 RELICENSE/aseering.md
 delete mode 100644 RELICENSE/atomashpolskiy.md
 delete mode 100644 RELICENSE/banburybill.md
 delete mode 100644 RELICENSE/bbdb68.md
 delete mode 100644 RELICENSE/bebopagogo.md
 delete mode 100644 RELICENSE/benjdero.md
 delete mode 100644 RELICENSE/bjoto.md
 delete mode 100644 RELICENSE/bjovke.md
 delete mode 100644 RELICENSE/bl0x.md
 delete mode 100644 RELICENSE/bluca.md
 delete mode 100644 RELICENSE/bprager.md
 delete mode 100644 RELICENSE/brett-cameron.md
 delete mode 100644 RELICENSE/brian-peloton.md
 delete mode 100644 RELICENSE/brocade_communications_systems.md
 delete mode 100644 RELICENSE/brubakerjeff.md
 delete mode 100644 RELICENSE/bwbuchanan.md
 delete mode 100644 RELICENSE/c-rack.md
 delete mode 100644 RELICENSE/calid.md
 delete mode 100644 RELICENSE/camachat.md
 delete mode 100644 RELICENSE/cbusbey.md
 delete mode 100644 RELICENSE/cdolan.md
 delete mode 100644 RELICENSE/chickenkiller.md
 delete mode 100644 RELICENSE/chrisstaite.md
 delete mode 100644 RELICENSE/chuckremes.md
 delete mode 100644 RELICENSE/chuggafan.md
 delete mode 100644 RELICENSE/chymanfx.md
 delete mode 100644 RELICENSE/cjuniet.md
 delete mode 100644 RELICENSE/ckamm.md
 delete mode 100644 RELICENSE/claws.md
 delete mode 100644 RELICENSE/clkao.md
 delete mode 100644 RELICENSE/colletted.md
 delete mode 100644 RELICENSE/cowo78.md
 delete mode 100644 RELICENSE/crocket.md
 delete mode 100644 RELICENSE/cwsmith.md
 delete mode 100644 RELICENSE/danielhtshih.md
 delete mode 100644 RELICENSE/danriegsecker.md
 delete mode 100644 RELICENSE/demozon.md
 delete mode 100644 RELICENSE/dennisklein.md
 delete mode 100644 RELICENSE/dfons.md
 delete mode 100644 RELICENSE/dhammika.md
 delete mode 100644 RELICENSE/dimpase.md
 delete mode 100644 RELICENSE/diorcety.md
 delete mode 100644 RELICENSE/djelenc.md
 delete mode 100644 RELICENSE/dkrikun.md
 delete mode 100644 RELICENSE/dmeehan1968.md
 delete mode 100644 RELICENSE/drbobbeaty.md
 delete mode 100644 RELICENSE/drodri.md
 delete mode 100644 RELICENSE/drolevar.md
 delete mode 100644 RELICENSE/eburkitt.md
 delete mode 100644 RELICENSE/egomotion.md
 delete mode 100644 RELICENSE/eldruin.md
 delete mode 100644 RELICENSE/emtr.md
 delete mode 100644 RELICENSE/ericsson.md
 delete mode 100644 RELICENSE/evoskuil.md
 delete mode 100644 RELICENSE/ezhikus.md
 delete mode 100644 RELICENSE/f18m.md
 delete mode 100644 RELICENSE/fanquake.md
 delete mode 100644 RELICENSE/febeling.md
 delete mode 100644 RELICENSE/ferdnyc.md
 delete mode 100644 RELICENSE/ffontaine.md
 delete mode 100644 RELICENSE/fidlej.md
 delete mode 100644 RELICENSE/flub.md
 delete mode 100644 RELICENSE/gabm.md
 delete mode 100644 RELICENSE/garlick.md
 delete mode 100644 RELICENSE/gavinmcniff.md
 delete mode 100644 RELICENSE/gcsideal.md
 delete mode 100644 RELICENSE/gena-moscow.md
 delete mode 100644 RELICENSE/ghpu.md
 delete mode 100644 RELICENSE/gitfoxi.md
 delete mode 100644 RELICENSE/glemercier.md
 delete mode 100644 RELICENSE/gonzus.md
 delete mode 100644 RELICENSE/goodfella.md
 delete mode 100644 RELICENSE/google.md
 delete mode 100644 RELICENSE/grmt.md
 delete mode 100644 RELICENSE/guidovranken.md
 delete mode 100644 RELICENSE/guillon.md
 delete mode 100644 RELICENSE/gummif.md
 delete mode 100644 RELICENSE/herbrechtsmeier.md
 delete mode 100644 RELICENSE/hewlett_packard_enterprise.md
 delete mode 100644 RELICENSE/hgourvest.md
 delete mode 100644 RELICENSE/hnwyllmm.md
 delete mode 100644 RELICENSE/hoditohod.md
 delete mode 100644 RELICENSE/hpsaturn.md
 delete mode 100644 RELICENSE/hsw.md
 delete mode 100644 RELICENSE/ianbarber.md
 delete mode 100644 RELICENSE/imatix.md
 delete mode 100644 RELICENSE/imkcy9.md
 delete mode 100644 RELICENSE/inuik.md
 delete mode 100644 RELICENSE/ipa.md
 delete mode 100644 RELICENSE/ipechorin.md
 delete mode 100644 RELICENSE/jackpimbert.md
 delete mode 100644 RELICENSE/jacquesg.md
 delete mode 100644 RELICENSE/jakecobb.md
 delete mode 100644 RELICENSE/jbreams.md
 delete mode 100644 RELICENSE/jcfr.md
 delete mode 100644 RELICENSE/jcourreges.md
 delete mode 100644 RELICENSE/jean-airoldie.md
 delete mode 100644 RELICENSE/jemc.md
 delete mode 100644 RELICENSE/jens.auer.md
 delete mode 100644 RELICENSE/jimenezrick.md
 delete mode 100644 RELICENSE/jimklimov.md
 delete mode 100644 RELICENSE/jkryl.md
 delete mode 100644 RELICENSE/jlauenercern.md
 delete mode 100644 RELICENSE/johntconklin.md
 delete mode 100644 RELICENSE/jruffin.md
 delete mode 100644 RELICENSE/jsyoo5b.md
 delete mode 100644 RELICENSE/kanonet.md
 delete mode 100644 RELICENSE/kentzo.md
 delete mode 100644 RELICENSE/kfish.md
 delete mode 100644 RELICENSE/kobolog.md
 delete mode 100644 RELICENSE/kreuzberger.md
 delete mode 100644 RELICENSE/kurdybacha.md
 delete mode 100644 RELICENSE/laplaceyang.md
 delete mode 100644 RELICENSE/latchmoor-services-carcich.md
 delete mode 100644 RELICENSE/leonarf.md
 delete mode 100644 RELICENSE/liedtkeInTUM.md
 delete mode 100644 RELICENSE/linville.md
 delete mode 100644 RELICENSE/loachfish.md
 delete mode 100644 RELICENSE/lodagro.md
 delete mode 100644 RELICENSE/lourens.md
 delete mode 100644 RELICENSE/lstacul.md
 delete mode 100644 RELICENSE/madebr.md
 delete mode 100644 RELICENSE/malexzx.md
 delete mode 100644 RELICENSE/mancasg.md
 delete mode 100644 RELICENSE/mattconnolly.md
 delete mode 100644 RELICENSE/mauri-melato.md
 delete mode 100644 RELICENSE/mbarbisan.md
 delete mode 100644 RELICENSE/mdionisio.md
 delete mode 100644 RELICENSE/mditzel.md
 delete mode 100644 RELICENSE/meox.md
 delete mode 100644 RELICENSE/mesegura.md
 delete mode 100644 RELICENSE/mgatny.md
 delete mode 100644 RELICENSE/michicc.md
 delete mode 100644 RELICENSE/micromass-ricnewton.md
 delete mode 100644 RELICENSE/miniway.md
 delete mode 100644 RELICENSE/minrk.md
 delete mode 100644 RELICENSE/mipaaa.md
 delete mode 100644 RELICENSE/mjvk.md
 delete mode 100644 RELICENSE/mkluwe.md
 delete mode 100644 RELICENSE/mkoppanen.md
 delete mode 100644 RELICENSE/mloy.md
 delete mode 100644 RELICENSE/mongodb.md
 delete mode 100644 RELICENSE/montoyaedu.md
 delete mode 100644 RELICENSE/moretromain.md
 delete mode 100644 RELICENSE/msune.md
 delete mode 100644 RELICENSE/murphybytes.md
 delete mode 100644 RELICENSE/mvilim.md
 delete mode 100644 RELICENSE/mystfit.md
 delete mode 100644 RELICENSE/naos_ltd.md
 delete mode 100644 RELICENSE/natano.md
 delete mode 100644 RELICENSE/neheb.md
 delete mode 100644 RELICENSE/ninoles.md
 delete mode 100644 RELICENSE/nixman.md
 delete mode 100644 RELICENSE/normano.md
 delete mode 100644 RELICENSE/ojura.md
 delete mode 100644 RELICENSE/olafmandel.md
 delete mode 100644 RELICENSE/omegastick.md
 delete mode 100644 RELICENSE/opedroso.md
 delete mode 100644 RELICENSE/opensource-kymetacorp.md
 delete mode 100644 RELICENSE/paddor.md
 delete mode 100644 RELICENSE/panlinux.md
 delete mode 100644 RELICENSE/pavel-pimenov.md
 delete mode 100644 RELICENSE/philippeleite.md
 delete mode 100644 RELICENSE/phreed.md
 delete mode 100644 RELICENSE/pijyoi.md
 delete mode 100644 RELICENSE/pmienk.md
 delete mode 100644 RELICENSE/pnnl.md
 delete mode 100644 RELICENSE/prarrot.md
 delete mode 100644 RELICENSE/psl-felipefarinon.md
 delete mode 100644 RELICENSE/ptroja.md
 delete mode 100644 RELICENSE/rcxdude.md
 delete mode 100644 RELICENSE/reunanen.md
 delete mode 100644 RELICENSE/reza-ebrahimi.md
 delete mode 100644 RELICENSE/rgagnon24.md
 delete mode 100644 RELICENSE/rikvdh.md
 delete mode 100644 RELICENSE/rlenferink.md
 delete mode 100644 RELICENSE/roalz.md
 delete mode 100644 RELICENSE/rodgert.md
 delete mode 100644 RELICENSE/rotty.md
 delete mode 100644 RELICENSE/sappo.md
 delete mode 100644 RELICENSE/scemama.md
 delete mode 100644 RELICENSE/schulzch.md
 delete mode 100644 RELICENSE/sdrsdr.md
 delete mode 100644 RELICENSE/serg06.md
 delete mode 100644 RELICENSE/shancat.md
 delete mode 100644 RELICENSE/sheremetyev.md
 delete mode 100644 RELICENSE/shripchenko.md
 delete mode 100644 RELICENSE/sigiesec.md
 delete mode 100644 RELICENSE/simias.md
 delete mode 100644 RELICENSE/skaller.md
 delete mode 100644 RELICENSE/skicc.md
 delete mode 100644 RELICENSE/somdoron.md
 delete mode 100644 RELICENSE/sonoware.md
 delete mode 100644 RELICENSE/soulik.md
 delete mode 100644 RELICENSE/spotify.md
 delete mode 100644 RELICENSE/ssbl.md
 delete mode 100644 RELICENSE/staticfloat.md
 delete mode 100644 RELICENSE/std-any-emplace.md
 delete mode 100644 RELICENSE/steve-o.md
 delete mode 100644 RELICENSE/straubar.md
 delete mode 100644 RELICENSE/suudy.md
 delete mode 100644 RELICENSE/swansontec.md
 delete mode 100644 RELICENSE/t-b.md
 delete mode 100644 RELICENSE/tSed.md
 delete mode 100644 RELICENSE/tabe.md
 delete mode 100644 RELICENSE/tailhook.md
 delete mode 100644 RELICENSE/taotetek.md
 delete mode 100644 RELICENSE/tberkey.md
 delete mode 100644 RELICENSE/templates/relicense-template-mplv2-any-osi.txt
 delete mode 100644 RELICENSE/templates/relicense-template-mplv2-share-alike-osi.txt
 delete mode 100644 RELICENSE/templates/relicense-template-mplv2.txt
 delete mode 100644 RELICENSE/thompsa.md
 delete mode 100644 RELICENSE/tommd.md
 delete mode 100644 RELICENSE/tomzbench.md
 delete mode 100644 RELICENSE/toonetown.md
 delete mode 100644 RELICENSE/trevorbernard.md
 delete mode 100644 RELICENSE/trya.md
 delete mode 100644 RELICENSE/twhittock.md
 delete mode 100644 RELICENSE/ulikoehler.md
 delete mode 100644 RELICENSE/viciious.md
 delete mode 100644 RELICENSE/vortechs2000.md
 delete mode 100644 RELICENSE/vtellier.md
 delete mode 100644 RELICENSE/vyskocilm.md
 delete mode 100644 RELICENSE/wallstprog.md
 delete mode 100644 RELICENSE/willstrang.md
 delete mode 100644 RELICENSE/xantares.md
 delete mode 100644 RELICENSE/xaqq.md
 delete mode 100644 RELICENSE/xqcool.mq
 delete mode 100644 RELICENSE/yan12125.md
 delete mode 100644 RELICENSE/yuvallanger.md
 delete mode 100644 RELICENSE/zoobab.md
 delete mode 100644 SECURITY.md
 delete mode 100644 SupportedPlatforms.md
 delete mode 100644 acinclude.m4
 delete mode 100644 appveyor.yml
 delete mode 100755 autogen.sh
 delete mode 100755 branding.bmp
 delete mode 100644 builds/Makefile.am
 delete mode 100644 builds/README
 delete mode 100755 builds/abi-compliance-checker/ci_build.sh
 delete mode 100644 builds/android/Dockerfile
 delete mode 100644 builds/android/README.md
 delete mode 100644 builds/android/android_build_helper.sh
 delete mode 100755 builds/android/build.sh
 delete mode 100755 builds/android/ci_build.sh
 delete mode 100644 builds/cmake/Modules/ClangFormat.cmake
 delete mode 100644 builds/cmake/Modules/FindAsciiDoc.cmake
 delete mode 100644 builds/cmake/Modules/FindNSS3.cmake
 delete mode 100644 builds/cmake/Modules/FindSodium.cmake
 delete mode 100644 builds/cmake/Modules/TestZMQVersion.cmake
 delete mode 100644 builds/cmake/Modules/ZMQSourceRunChecks.cmake
 delete mode 100644 builds/cmake/Modules/ZMQSupportMacros.cmake
 delete mode 100644 builds/cmake/NSIS.template32.in
 delete mode 100644 builds/cmake/NSIS.template64.in
 delete mode 100644 builds/cmake/ZeroMQConfig.cmake.in
 delete mode 100755 builds/cmake/ci_build.sh
 delete mode 100644 builds/cmake/clang-format-check.sh.in
 delete mode 100644 builds/cmake/platform.hpp.in
 delete mode 100755 builds/coverage/ci_build.sh
 delete mode 100755 builds/cygwin/Makefile.cygwin
 delete mode 100644 builds/deprecated-msvc/.gitignore
 delete mode 100644 builds/deprecated-msvc/Makefile.am
 delete mode 100644 builds/deprecated-msvc/build/build.bat
 delete mode 100644 builds/deprecated-msvc/build/buildall.bat
 delete mode 100644 builds/deprecated-msvc/build/buildbase.bat
 delete mode 100644 builds/deprecated-msvc/errno.cpp
 delete mode 100644 builds/deprecated-msvc/errno.hpp
 delete mode 100644 builds/deprecated-msvc/platform.hpp
 delete mode 100644 builds/deprecated-msvc/properties/Common.props
 delete mode 100644 builds/deprecated-msvc/properties/DLL.props
 delete mode 100644 builds/deprecated-msvc/properties/Debug.props
 delete mode 100644 builds/deprecated-msvc/properties/DebugDEXE.props
 delete mode 100644 builds/deprecated-msvc/properties/DebugDLL.props
 delete mode 100644 builds/deprecated-msvc/properties/DebugLEXE.props
 delete mode 100644 builds/deprecated-msvc/properties/DebugLIB.props
 delete mode 100644 builds/deprecated-msvc/properties/DebugLTCG.props
 delete mode 100644 builds/deprecated-msvc/properties/DebugSEXE.props
 delete mode 100644 builds/deprecated-msvc/properties/EXE.props
 delete mode 100644 builds/deprecated-msvc/properties/LIB.props
 delete mode 100644 builds/deprecated-msvc/properties/LTCG.props
 delete mode 100644 builds/deprecated-msvc/properties/Link.props
 delete mode 100644 builds/deprecated-msvc/properties/Messages.props
 delete mode 100644 builds/deprecated-msvc/properties/Output.props
 delete mode 100644 builds/deprecated-msvc/properties/Release.props
 delete mode 100644 builds/deprecated-msvc/properties/ReleaseDEXE.props
 delete mode 100644 builds/deprecated-msvc/properties/ReleaseDLL.props
 delete mode 100644 builds/deprecated-msvc/properties/ReleaseLEXE.props
 delete mode 100644 builds/deprecated-msvc/properties/ReleaseLIB.props
 delete mode 100644 builds/deprecated-msvc/properties/ReleaseLTCG.props
 delete mode 100644 builds/deprecated-msvc/properties/ReleaseSEXE.props
 delete mode 100644 builds/deprecated-msvc/properties/Win32.props
 delete mode 100644 builds/deprecated-msvc/properties/x64.props
 delete mode 100644 builds/deprecated-msvc/readme.txt
 delete mode 100644 builds/deprecated-msvc/resource.h
 delete mode 100644 builds/deprecated-msvc/resource.rc
 delete mode 100644 builds/deprecated-msvc/vs2008/inproc_lat/inproc_lat.vcproj
 delete mode 100644 builds/deprecated-msvc/vs2008/inproc_thr/inproc_thr.vcproj
 delete mode 100644 builds/deprecated-msvc/vs2008/libzmq.sln
 delete mode 100644 builds/deprecated-msvc/vs2008/libzmq/libzmq.vcproj
 delete mode 100644 builds/deprecated-msvc/vs2008/local_lat/local_lat.vcproj
 delete mode 100644 builds/deprecated-msvc/vs2008/local_thr/local_thr.vcproj
 delete mode 100644 builds/deprecated-msvc/vs2008/remote_lat/remote_lat.vcproj
 delete mode 100644 builds/deprecated-msvc/vs2008/remote_thr/remote_thr.vcproj
 delete mode 100644 builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2010/libsodium.import.props
 delete mode 100644 builds/deprecated-msvc/vs2010/libsodium.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2010/libzmq.import.props
 delete mode 100644 builds/deprecated-msvc/vs2010/libzmq.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2010/libzmq.sln
 delete mode 100644 builds/deprecated-msvc/vs2010/libzmq/libzmq.props
 delete mode 100644 builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj.filters
 delete mode 100644 builds/deprecated-msvc/vs2010/libzmq/libzmq.xml
 delete mode 100644 builds/deprecated-msvc/vs2010/local_lat/local_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2010/local_lat/local_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2010/local_thr/local_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2010/local_thr/local_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2010/remote_lat/remote_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2010/remote_lat/remote_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2010/remote_thr/remote_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2010/remote_thr/remote_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2012/libsodium.import.props
 delete mode 100644 builds/deprecated-msvc/vs2012/libsodium.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2012/libzmq.import.props
 delete mode 100644 builds/deprecated-msvc/vs2012/libzmq.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2012/libzmq.sln
 delete mode 100644 builds/deprecated-msvc/vs2012/libzmq/libzmq.props
 delete mode 100644 builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj.filters
 delete mode 100644 builds/deprecated-msvc/vs2012/libzmq/libzmq.xml
 delete mode 100644 builds/deprecated-msvc/vs2012/local_lat/local_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2012/local_lat/local_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2012/local_thr/local_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2012/local_thr/local_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2012/remote_lat/remote_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2012/remote_lat/remote_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2012/remote_thr/remote_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2012/remote_thr/remote_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2013/libsodium.import.props
 delete mode 100644 builds/deprecated-msvc/vs2013/libsodium.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2013/libzmq.import.props
 delete mode 100644 builds/deprecated-msvc/vs2013/libzmq.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2013/libzmq.sln
 delete mode 100644 builds/deprecated-msvc/vs2013/libzmq/libzmq.props
 delete mode 100644 builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj.filters
 delete mode 100644 builds/deprecated-msvc/vs2013/libzmq/libzmq.xml
 delete mode 100644 builds/deprecated-msvc/vs2013/local_lat/local_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2013/local_lat/local_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2013/local_thr/local_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2013/local_thr/local_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2013/remote_lat/remote_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2013/remote_lat/remote_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2013/remote_thr/remote_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2013/remote_thr/remote_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2015/libsodium.import.props
 delete mode 100644 builds/deprecated-msvc/vs2015/libsodium.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2015/libzmq.import.props
 delete mode 100644 builds/deprecated-msvc/vs2015/libzmq.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2015/libzmq.sln
 delete mode 100644 builds/deprecated-msvc/vs2015/libzmq/libzmq.props
 delete mode 100644 builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj.filters
 delete mode 100644 builds/deprecated-msvc/vs2015/libzmq/libzmq.xml
 delete mode 100644 builds/deprecated-msvc/vs2015/local_lat/local_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2015/local_lat/local_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2015/local_thr/local_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2015/local_thr/local_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2015/remote_lat/remote_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2015/remote_lat/remote_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2015/remote_thr/remote_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2015/remote_thr/remote_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2015_xp/libzmq.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2015_xp/platform.hpp
 delete mode 100644 builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp
 delete mode 100644 builds/deprecated-msvc/vs2015_xp/test_zmq/test_zmq.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2017/libsodium.import.props
 delete mode 100644 builds/deprecated-msvc/vs2017/libsodium.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2017/libzmq.import.props
 delete mode 100644 builds/deprecated-msvc/vs2017/libzmq.import.xml
 delete mode 100644 builds/deprecated-msvc/vs2017/libzmq.sln
 delete mode 100644 builds/deprecated-msvc/vs2017/libzmq/libzmq.props
 delete mode 100644 builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj.filters
 delete mode 100644 builds/deprecated-msvc/vs2017/libzmq/libzmq.xml
 delete mode 100644 builds/deprecated-msvc/vs2017/local_lat/local_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2017/local_lat/local_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2017/local_thr/local_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2017/local_thr/local_thr.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2017/remote_lat/remote_lat.props
 delete mode 100644 builds/deprecated-msvc/vs2017/remote_lat/remote_lat.vcxproj
 delete mode 100644 builds/deprecated-msvc/vs2017/remote_thr/remote_thr.props
 delete mode 100644 builds/deprecated-msvc/vs2017/remote_thr/remote_thr.vcxproj
 delete mode 100644 builds/gyp/.gitignore
 delete mode 100644 builds/gyp/build.bat
 delete mode 100644 builds/gyp/platform.hpp
 delete mode 100644 builds/gyp/project-tests.gsl
 delete mode 100644 builds/gyp/project-tests.gypi
 delete mode 100644 builds/gyp/project-tests.xml
 delete mode 100644 builds/gyp/project.gyp
 delete mode 100644 builds/mingw32/Makefile.mingw32
 delete mode 100644 builds/mingw32/platform.hpp
 delete mode 100644 builds/nuget/libzmq.autopkg
 delete mode 100644 builds/nuget/readme.nuget
 delete mode 100644 builds/openwrt/Makefile
 delete mode 100644 builds/qnx/ToolchainQNX6.6_x86.cmake
 delete mode 100755 builds/valgrind/ci_build.sh
 delete mode 100644 builds/valgrind/valgrind.supp
 delete mode 100755 builds/valgrind/vg
 delete mode 100644 builds/vxworks/platform.hpp
 delete mode 100644 builds/zos/README.md
 delete mode 100755 builds/zos/cxxall
 delete mode 100755 builds/zos/makeclean
 delete mode 100755 builds/zos/makelibzmq
 delete mode 100755 builds/zos/maketests
 delete mode 100644 builds/zos/platform.hpp
 delete mode 100755 builds/zos/runtests
 delete mode 100644 builds/zos/test_fork.cpp
 delete mode 100755 builds/zos/zc++
 delete mode 100755 ci_build.sh
 delete mode 100644 ci_deploy.sh
 create mode 100755 clips/agenda.c
 create mode 100755 clips/agenda.h
 create mode 100755 clips/analysis.c
 create mode 100755 clips/analysis.h
 create mode 100755 clips/argacces.c
 create mode 100755 clips/argacces.h
 create mode 100755 clips/bload.c
 create mode 100755 clips/bload.h
 create mode 100755 clips/bmathfun.c
 create mode 100755 clips/bmathfun.h
 create mode 100755 clips/bsave.c
 create mode 100755 clips/bsave.h
 create mode 100755 clips/classcom.c
 create mode 100755 clips/classcom.h
 create mode 100755 clips/classexm.c
 create mode 100755 clips/classexm.h
 create mode 100755 clips/classfun.c
 create mode 100755 clips/classfun.h
 create mode 100755 clips/classinf.c
 create mode 100755 clips/classinf.h
 create mode 100755 clips/classini.c
 create mode 100755 clips/classini.h
 create mode 100755 clips/classpsr.c
 create mode 100755 clips/classpsr.h
 create mode 100644 clips/clips.cpp
 create mode 100755 clips/clips.h
 create mode 100644 clips/clips.hpp
 create mode 100755 clips/clsltpsr.c
 create mode 100755 clips/clsltpsr.h
 create mode 100755 clips/commline.c
 create mode 100755 clips/commline.h
 create mode 100755 clips/conscomp.c
 create mode 100755 clips/conscomp.h
 create mode 100755 clips/constant.h
 create mode 100755 clips/constrct.c
 create mode 100755 clips/constrct.h
 create mode 100755 clips/constrnt.c
 create mode 100755 clips/constrnt.h
 create mode 100755 clips/crstrtgy.c
 create mode 100755 clips/crstrtgy.h
 create mode 100755 clips/cstrcbin.c
 create mode 100755 clips/cstrcbin.h
 create mode 100755 clips/cstrccmp.h
 create mode 100755 clips/cstrccom.c
 create mode 100755 clips/cstrccom.h
 create mode 100755 clips/cstrcpsr.c
 create mode 100755 clips/cstrcpsr.h
 create mode 100755 clips/cstrnbin.c
 create mode 100755 clips/cstrnbin.h
 create mode 100755 clips/cstrnchk.c
 create mode 100755 clips/cstrnchk.h
 create mode 100755 clips/cstrncmp.c
 create mode 100755 clips/cstrncmp.h
 create mode 100755 clips/cstrnops.c
 create mode 100755 clips/cstrnops.h
 create mode 100755 clips/cstrnpsr.c
 create mode 100755 clips/cstrnpsr.h
 create mode 100755 clips/cstrnutl.c
 create mode 100755 clips/cstrnutl.h
 create mode 100755 clips/default.c
 create mode 100755 clips/default.h
 create mode 100755 clips/defins.c
 create mode 100755 clips/defins.h
 create mode 100755 clips/developr.c
 create mode 100755 clips/developr.h
 create mode 100755 clips/dffctbin.c
 create mode 100755 clips/dffctbin.h
 create mode 100755 clips/dffctbsc.c
 create mode 100755 clips/dffctbsc.h
 create mode 100755 clips/dffctcmp.c
 create mode 100755 clips/dffctcmp.h
 create mode 100755 clips/dffctdef.c
 create mode 100755 clips/dffctdef.h
 create mode 100755 clips/dffctpsr.c
 create mode 100755 clips/dffctpsr.h
 create mode 100755 clips/dffnxbin.c
 create mode 100755 clips/dffnxbin.h
 create mode 100755 clips/dffnxcmp.c
 create mode 100755 clips/dffnxcmp.h
 create mode 100755 clips/dffnxexe.c
 create mode 100755 clips/dffnxexe.h
 create mode 100755 clips/dffnxfun.c
 create mode 100755 clips/dffnxfun.h
 create mode 100755 clips/dffnxpsr.c
 create mode 100755 clips/dffnxpsr.h
 create mode 100755 clips/dfinsbin.c
 create mode 100755 clips/dfinsbin.h
 create mode 100755 clips/dfinscmp.c
 create mode 100755 clips/dfinscmp.h
 create mode 100755 clips/drive.c
 create mode 100755 clips/drive.h
 create mode 100755 clips/emathfun.c
 create mode 100755 clips/emathfun.h
 create mode 100755 clips/engine.c
 create mode 100755 clips/engine.h
 create mode 100755 clips/entities.h
 create mode 100755 clips/envrnbld.c
 create mode 100755 clips/envrnbld.h
 create mode 100755 clips/envrnmnt.c
 create mode 100755 clips/envrnmnt.h
 create mode 100755 clips/evaluatn.c
 create mode 100755 clips/evaluatn.h
 create mode 100755 clips/expressn.c
 create mode 100755 clips/expressn.h
 create mode 100755 clips/exprnbin.c
 create mode 100755 clips/exprnbin.h
 create mode 100755 clips/exprnops.c
 create mode 100755 clips/exprnops.h
 create mode 100755 clips/exprnpsr.c
 create mode 100755 clips/exprnpsr.h
 create mode 100755 clips/extnfunc.c
 create mode 100755 clips/extnfunc.h
 create mode 100755 clips/factbin.c
 create mode 100755 clips/factbin.h
 create mode 100755 clips/factbld.c
 create mode 100755 clips/factbld.h
 create mode 100755 clips/factcmp.c
 create mode 100755 clips/factcmp.h
 create mode 100755 clips/factcom.c
 create mode 100755 clips/factcom.h
 create mode 100755 clips/factfun.c
 create mode 100755 clips/factfun.h
 create mode 100755 clips/factgen.c
 create mode 100755 clips/factgen.h
 create mode 100755 clips/facthsh.c
 create mode 100755 clips/facthsh.h
 create mode 100755 clips/factlhs.c
 create mode 100755 clips/factlhs.h
 create mode 100755 clips/factmch.c
 create mode 100755 clips/factmch.h
 create mode 100755 clips/factmngr.c
 create mode 100755 clips/factmngr.h
 create mode 100755 clips/factprt.c
 create mode 100755 clips/factprt.h
 create mode 100644 clips/factqpsr.c
 create mode 100644 clips/factqpsr.h
 create mode 100644 clips/factqury.c
 create mode 100644 clips/factqury.h
 create mode 100755 clips/factrete.c
 create mode 100755 clips/factrete.h
 create mode 100755 clips/factrhs.c
 create mode 100755 clips/factrhs.h
 create mode 100755 clips/filecom.c
 create mode 100755 clips/filecom.h
 create mode 100755 clips/filertr.c
 create mode 100755 clips/filertr.h
 create mode 100755 clips/fileutil.c
 create mode 100755 clips/fileutil.h
 create mode 100755 clips/generate.c
 create mode 100755 clips/generate.h
 create mode 100755 clips/genrcbin.c
 create mode 100755 clips/genrcbin.h
 create mode 100755 clips/genrccmp.c
 create mode 100755 clips/genrccmp.h
 create mode 100755 clips/genrccom.c
 create mode 100755 clips/genrccom.h
 create mode 100755 clips/genrcexe.c
 create mode 100755 clips/genrcexe.h
 create mode 100755 clips/genrcfun.c
 create mode 100755 clips/genrcfun.h
 create mode 100755 clips/genrcpsr.c
 create mode 100755 clips/genrcpsr.h
 create mode 100755 clips/globlbin.c
 create mode 100755 clips/globlbin.h
 create mode 100755 clips/globlbsc.c
 create mode 100755 clips/globlbsc.h
 create mode 100755 clips/globlcmp.c
 create mode 100755 clips/globlcmp.h
 create mode 100755 clips/globlcom.c
 create mode 100755 clips/globlcom.h
 create mode 100755 clips/globldef.c
 create mode 100755 clips/globldef.h
 create mode 100755 clips/globlpsr.c
 create mode 100755 clips/globlpsr.h
 create mode 100755 clips/immthpsr.c
 create mode 100755 clips/immthpsr.h
 create mode 100755 clips/incrrset.c
 create mode 100755 clips/incrrset.h
 create mode 100755 clips/inherpsr.c
 create mode 100755 clips/inherpsr.h
 create mode 100755 clips/inscom.c
 create mode 100755 clips/inscom.h
 create mode 100755 clips/insfile.c
 create mode 100755 clips/insfile.h
 create mode 100755 clips/insfun.c
 create mode 100755 clips/insfun.h
 create mode 100755 clips/insmngr.c
 create mode 100755 clips/insmngr.h
 create mode 100755 clips/insmoddp.c
 create mode 100755 clips/insmoddp.h
 create mode 100755 clips/insmult.c
 create mode 100755 clips/insmult.h
 create mode 100755 clips/inspsr.c
 create mode 100755 clips/inspsr.h
 create mode 100755 clips/insquery.c
 create mode 100755 clips/insquery.h
 create mode 100755 clips/insqypsr.c
 create mode 100755 clips/insqypsr.h
 create mode 100755 clips/iofun.c
 create mode 100755 clips/iofun.h
 create mode 100755 clips/lgcldpnd.c
 create mode 100755 clips/lgcldpnd.h
 create mode 100755 clips/main.c
 create mode 100644 clips/makefile
 create mode 100644 clips/makefile.win
 create mode 100755 clips/match.h
 create mode 100755 clips/memalloc.c
 create mode 100755 clips/memalloc.h
 create mode 100755 clips/miscfun.c
 create mode 100755 clips/miscfun.h
 create mode 100755 clips/modulbin.c
 create mode 100755 clips/modulbin.h
 create mode 100755 clips/modulbsc.c
 create mode 100755 clips/modulbsc.h
 create mode 100755 clips/modulcmp.c
 create mode 100755 clips/modulcmp.h
 create mode 100755 clips/moduldef.c
 create mode 100755 clips/moduldef.h
 create mode 100755 clips/modulpsr.c
 create mode 100755 clips/modulpsr.h
 create mode 100755 clips/modulutl.c
 create mode 100755 clips/modulutl.h
 create mode 100755 clips/msgcom.c
 create mode 100755 clips/msgcom.h
 create mode 100755 clips/msgfun.c
 create mode 100755 clips/msgfun.h
 create mode 100755 clips/msgpass.c
 create mode 100755 clips/msgpass.h
 create mode 100755 clips/msgpsr.c
 create mode 100755 clips/msgpsr.h
 create mode 100755 clips/multifld.c
 create mode 100755 clips/multifld.h
 create mode 100755 clips/multifun.c
 create mode 100755 clips/multifun.h
 create mode 100755 clips/network.h
 create mode 100755 clips/objbin.c
 create mode 100755 clips/objbin.h
 create mode 100755 clips/objcmp.c
 create mode 100755 clips/objcmp.h
 create mode 100755 clips/object.h
 create mode 100755 clips/objrtbin.c
 create mode 100755 clips/objrtbin.h
 create mode 100755 clips/objrtbld.c
 create mode 100755 clips/objrtbld.h
 create mode 100755 clips/objrtcmp.c
 create mode 100755 clips/objrtcmp.h
 create mode 100755 clips/objrtfnx.c
 create mode 100755 clips/objrtfnx.h
 create mode 100755 clips/objrtgen.c
 create mode 100755 clips/objrtgen.h
 create mode 100755 clips/objrtmch.c
 create mode 100755 clips/objrtmch.h
 create mode 100755 clips/parsefun.c
 create mode 100755 clips/parsefun.h
 create mode 100755 clips/pattern.c
 create mode 100755 clips/pattern.h
 create mode 100755 clips/pprint.c
 create mode 100755 clips/pprint.h
 create mode 100755 clips/prccode.c
 create mode 100755 clips/prccode.h
 create mode 100755 clips/prcdrfun.c
 create mode 100755 clips/prcdrfun.h
 create mode 100755 clips/prcdrpsr.c
 create mode 100755 clips/prcdrpsr.h
 create mode 100755 clips/prdctfun.c
 create mode 100755 clips/prdctfun.h
 create mode 100755 clips/prntutil.c
 create mode 100755 clips/prntutil.h
 create mode 100755 clips/proflfun.c
 create mode 100755 clips/proflfun.h
 create mode 100755 clips/reorder.c
 create mode 100755 clips/reorder.h
 create mode 100755 clips/reteutil.c
 create mode 100755 clips/reteutil.h
 create mode 100755 clips/retract.c
 create mode 100755 clips/retract.h
 create mode 100755 clips/router.c
 create mode 100755 clips/router.h
 create mode 100755 clips/rulebin.c
 create mode 100755 clips/rulebin.h
 create mode 100755 clips/rulebld.c
 create mode 100755 clips/rulebld.h
 create mode 100755 clips/rulebsc.c
 create mode 100755 clips/rulebsc.h
 create mode 100755 clips/rulecmp.c
 create mode 100755 clips/rulecmp.h
 create mode 100755 clips/rulecom.c
 create mode 100755 clips/rulecom.h
 create mode 100755 clips/rulecstr.c
 create mode 100755 clips/rulecstr.h
 create mode 100755 clips/ruledef.c
 create mode 100755 clips/ruledef.h
 create mode 100755 clips/ruledlt.c
 create mode 100755 clips/ruledlt.h
 create mode 100755 clips/rulelhs.c
 create mode 100755 clips/rulelhs.h
 create mode 100755 clips/rulepsr.c
 create mode 100755 clips/rulepsr.h
 create mode 100755 clips/scanner.c
 create mode 100755 clips/scanner.h
 create mode 100755 clips/setup.h
 create mode 100755 clips/sortfun.c
 create mode 100755 clips/sortfun.h
 create mode 100755 clips/strngfun.c
 create mode 100755 clips/strngfun.h
 create mode 100755 clips/strngrtr.c
 create mode 100755 clips/strngrtr.h
 create mode 100755 clips/symblbin.c
 create mode 100755 clips/symblbin.h
 create mode 100755 clips/symblcmp.c
 create mode 100755 clips/symblcmp.h
 create mode 100755 clips/symbol.c
 create mode 100755 clips/symbol.h
 create mode 100755 clips/sysdep.c
 create mode 100755 clips/sysdep.h
 create mode 100755 clips/textpro.c
 create mode 100755 clips/textpro.h
 create mode 100755 clips/tmpltbin.c
 create mode 100755 clips/tmpltbin.h
 create mode 100755 clips/tmpltbsc.c
 create mode 100755 clips/tmpltbsc.h
 create mode 100755 clips/tmpltcmp.c
 create mode 100755 clips/tmpltcmp.h
 create mode 100755 clips/tmpltdef.c
 create mode 100755 clips/tmpltdef.h
 create mode 100755 clips/tmpltfun.c
 create mode 100755 clips/tmpltfun.h
 create mode 100755 clips/tmpltlhs.c
 create mode 100755 clips/tmpltlhs.h
 create mode 100755 clips/tmpltpsr.c
 create mode 100755 clips/tmpltpsr.h
 create mode 100755 clips/tmpltrhs.c
 create mode 100755 clips/tmpltrhs.h
 create mode 100755 clips/tmpltutl.c
 create mode 100755 clips/tmpltutl.h
 create mode 100755 clips/userdata.c
 create mode 100755 clips/userdata.h
 create mode 100644 clips/userfunctions.c
 create mode 100755 clips/usrsetup.h
 create mode 100755 clips/utility.c
 create mode 100755 clips/utility.h
 create mode 100755 clips/watch.c
 create mode 100755 clips/watch.h
 delete mode 100644 configure.ac
 delete mode 100644 doc/Makefile.am
 delete mode 100644 doc/asciidoc.conf
 delete mode 100644 doc/zmq.txt
 delete mode 100644 doc/zmq_atomic_counter_dec.txt
 delete mode 100644 doc/zmq_atomic_counter_destroy.txt
 delete mode 100644 doc/zmq_atomic_counter_inc.txt
 delete mode 100644 doc/zmq_atomic_counter_new.txt
 delete mode 100644 doc/zmq_atomic_counter_set.txt
 delete mode 100644 doc/zmq_atomic_counter_value.txt
 delete mode 100644 doc/zmq_bind.txt
 delete mode 100644 doc/zmq_close.txt
 delete mode 100644 doc/zmq_connect.txt
 delete mode 100644 doc/zmq_connect_peer.txt
 delete mode 100644 doc/zmq_ctx_destroy.txt
 delete mode 100644 doc/zmq_ctx_get.txt
 delete mode 100644 doc/zmq_ctx_get_ext.txt
 delete mode 100644 doc/zmq_ctx_new.txt
 delete mode 100644 doc/zmq_ctx_set.txt
 delete mode 100644 doc/zmq_ctx_set_ext.txt
 delete mode 100644 doc/zmq_ctx_shutdown.txt
 delete mode 100644 doc/zmq_ctx_term.txt
 delete mode 100644 doc/zmq_curve.txt
 delete mode 100644 doc/zmq_curve_keypair.txt
 delete mode 100644 doc/zmq_curve_public.txt
 delete mode 100644 doc/zmq_disconnect.txt
 delete mode 100644 doc/zmq_errno.txt
 delete mode 100755 doc/zmq_getsockopt.txt
 delete mode 100644 doc/zmq_gssapi.txt
 delete mode 100644 doc/zmq_has.txt
 delete mode 100644 doc/zmq_init.txt
 delete mode 100644 doc/zmq_inproc.txt
 delete mode 100644 doc/zmq_ipc.txt
 delete mode 100644 doc/zmq_msg_close.txt
 delete mode 100644 doc/zmq_msg_copy.txt
 delete mode 100644 doc/zmq_msg_data.txt
 delete mode 100644 doc/zmq_msg_get.txt
 delete mode 100644 doc/zmq_msg_gets.txt
 delete mode 100644 doc/zmq_msg_init.txt
 delete mode 100644 doc/zmq_msg_init_buffer.txt
 delete mode 100644 doc/zmq_msg_init_data.txt
 delete mode 100644 doc/zmq_msg_init_size.txt
 delete mode 100644 doc/zmq_msg_more.txt
 delete mode 100644 doc/zmq_msg_move.txt
 delete mode 100644 doc/zmq_msg_recv.txt
 delete mode 100644 doc/zmq_msg_routing_id.txt
 delete mode 100644 doc/zmq_msg_send.txt
 delete mode 100644 doc/zmq_msg_set.txt
 delete mode 100644 doc/zmq_msg_set_routing_id.txt
 delete mode 100644 doc/zmq_msg_size.txt
 delete mode 100644 doc/zmq_null.txt
 delete mode 100644 doc/zmq_pgm.txt
 delete mode 100644 doc/zmq_plain.txt
 delete mode 100644 doc/zmq_poll.txt
 delete mode 100644 doc/zmq_poller.txt
 delete mode 100644 doc/zmq_proxy.txt
 delete mode 100644 doc/zmq_proxy_steerable.txt
 delete mode 100644 doc/zmq_recv.txt
 delete mode 100644 doc/zmq_recvmsg.txt
 delete mode 100644 doc/zmq_send.txt
 delete mode 100644 doc/zmq_send_const.txt
 delete mode 100644 doc/zmq_sendmsg.txt
 delete mode 100755 doc/zmq_setsockopt.txt
 delete mode 100644 doc/zmq_socket.txt
 delete mode 100644 doc/zmq_socket_monitor.txt
 delete mode 100644 doc/zmq_socket_monitor_versioned.txt
 delete mode 100644 doc/zmq_strerror.txt
 delete mode 100644 doc/zmq_tcp.txt
 delete mode 100644 doc/zmq_term.txt
 delete mode 100644 doc/zmq_timers.txt
 delete mode 100644 doc/zmq_tipc.txt
 delete mode 100644 doc/zmq_udp.txt
 delete mode 100644 doc/zmq_unbind.txt
 delete mode 100644 doc/zmq_version.txt
 delete mode 100644 doc/zmq_vmci.txt
 delete mode 100644 doc/zmq_z85_decode.txt
 delete mode 100644 doc/zmq_z85_encode.txt
 delete mode 100644 external/sha1/license.txt
 delete mode 100644 external/sha1/sha1.c
 delete mode 100644 external/sha1/sha1.h
 delete mode 100644 external/unity/license.txt
 delete mode 100644 external/unity/unity.c
 delete mode 100644 external/unity/unity.h
 delete mode 100644 external/unity/unity_internals.h
 delete mode 100644 external/unity/version.txt
 delete mode 100644 external/wepoll/README.md
 delete mode 100644 external/wepoll/license.txt
 delete mode 100644 external/wepoll/version.txt
 delete mode 100644 external/wepoll/wepoll.c
 delete mode 100644 external/wepoll/wepoll.h
 delete mode 100644 include/zmq.h
 delete mode 100644 include/zmq_utils.h
 delete mode 100755 installer.ico
 delete mode 100644 m4/ax_check_compile_flag.m4
 delete mode 100644 m4/ax_check_vscript.m4
 delete mode 100644 m4/ax_code_coverage.m4
 delete mode 100644 m4/ax_cxx_compile_stdcxx.m4
 delete mode 100644 m4/ax_cxx_compile_stdcxx_11.m4
 delete mode 100644 m4/ax_func_posix_memalign.m4
 delete mode 100644 m4/ax_valgrind_check.m4
 delete mode 100644 packaging/README
 delete mode 100644 packaging/debian/changelog
 delete mode 100644 packaging/debian/compat
 delete mode 100644 packaging/debian/control
 delete mode 100644 packaging/debian/copyright
 delete mode 100644 packaging/debian/libzmq3-dev.install
 delete mode 100644 packaging/debian/libzmq3-dev.manpages
 delete mode 100644 packaging/debian/libzmq5.docs
 delete mode 100644 packaging/debian/libzmq5.install
 delete mode 100755 packaging/debian/rules
 delete mode 100644 packaging/debian/source/format
 delete mode 100644 packaging/debian/zeromq.dsc.obs
 delete mode 100644 packaging/nuget/package.bat
 delete mode 100644 packaging/nuget/package.config
 delete mode 100644 packaging/nuget/package.gsl
 delete mode 100644 packaging/nuget/package.nuspec
 delete mode 100644 packaging/nuget/package.targets
 delete mode 100644 packaging/nuget/package.xml
 delete mode 100644 packaging/obs/_service
 delete mode 100644 packaging/redhat/zeromq.spec
 delete mode 100644 perf/benchmark_radix_tree.cpp
 delete mode 100755 perf/generate_csv.sh
 delete mode 100755 perf/generate_graphs.py
 delete mode 100644 perf/inproc_lat.cpp
 delete mode 100644 perf/inproc_thr.cpp
 delete mode 100644 perf/local_lat.cpp
 delete mode 100644 perf/local_thr.cpp
 delete mode 100644 perf/proxy_thr.cpp
 delete mode 100644 perf/remote_lat.cpp
 delete mode 100644 perf/remote_thr.cpp
 delete mode 100644 src/address.cpp
 delete mode 100644 src/address.hpp
 delete mode 100644 src/array.hpp
 delete mode 100644 src/atomic_counter.hpp
 delete mode 100644 src/atomic_ptr.hpp
 delete mode 100644 src/blob.hpp
 delete mode 100644 src/channel.cpp
 delete mode 100644 src/channel.hpp
 delete mode 100644 src/client.cpp
 delete mode 100644 src/client.hpp
 delete mode 100644 src/clock.cpp
 delete mode 100644 src/clock.hpp
 delete mode 100644 src/command.hpp
 delete mode 100644 src/condition_variable.hpp
 delete mode 100644 src/config.hpp
 delete mode 100644 src/ctx.cpp
 delete mode 100644 src/ctx.hpp
 delete mode 100644 src/curve_client.cpp
 delete mode 100644 src/curve_client.hpp
 delete mode 100644 src/curve_client_tools.hpp
 delete mode 100644 src/curve_mechanism_base.cpp
 delete mode 100644 src/curve_mechanism_base.hpp
 delete mode 100644 src/curve_server.cpp
 delete mode 100644 src/curve_server.hpp
 delete mode 100644 src/dbuffer.hpp
 delete mode 100644 src/dealer.cpp
 delete mode 100644 src/dealer.hpp
 delete mode 100644 src/decoder.hpp
 delete mode 100644 src/decoder_allocators.cpp
 delete mode 100644 src/decoder_allocators.hpp
 delete mode 100644 src/devpoll.cpp
 delete mode 100644 src/devpoll.hpp
 delete mode 100644 src/dgram.cpp
 delete mode 100644 src/dgram.hpp
 delete mode 100644 src/dish.cpp
 delete mode 100644 src/dish.hpp
 delete mode 100644 src/dist.cpp
 delete mode 100644 src/dist.hpp
 delete mode 100644 src/encoder.hpp
 delete mode 100644 src/endpoint.cpp
 delete mode 100644 src/endpoint.hpp
 delete mode 100644 src/epoll.cpp
 delete mode 100644 src/epoll.hpp
 delete mode 100644 src/err.cpp
 delete mode 100644 src/err.hpp
 delete mode 100644 src/fd.hpp
 delete mode 100644 src/fq.cpp
 delete mode 100644 src/fq.hpp
 delete mode 100644 src/gather.cpp
 delete mode 100644 src/gather.hpp
 delete mode 100644 src/generic_mtrie.hpp
 delete mode 100644 src/generic_mtrie_impl.hpp
 delete mode 100644 src/gssapi_client.cpp
 delete mode 100644 src/gssapi_client.hpp
 delete mode 100644 src/gssapi_mechanism_base.cpp
 delete mode 100644 src/gssapi_mechanism_base.hpp
 delete mode 100644 src/gssapi_server.cpp
 delete mode 100644 src/gssapi_server.hpp
 delete mode 100644 src/i_decoder.hpp
 delete mode 100644 src/i_encoder.hpp
 delete mode 100644 src/i_engine.hpp
 delete mode 100644 src/i_mailbox.hpp
 delete mode 100644 src/i_poll_events.hpp
 delete mode 100644 src/io_object.cpp
 delete mode 100644 src/io_object.hpp
 delete mode 100644 src/io_thread.cpp
 delete mode 100644 src/io_thread.hpp
 delete mode 100644 src/ip.cpp
 delete mode 100644 src/ip.hpp
 delete mode 100644 src/ip_resolver.cpp
 delete mode 100644 src/ip_resolver.hpp
 delete mode 100644 src/ipc_address.cpp
 delete mode 100644 src/ipc_address.hpp
 delete mode 100644 src/ipc_connecter.cpp
 delete mode 100644 src/ipc_connecter.hpp
 delete mode 100644 src/ipc_listener.cpp
 delete mode 100644 src/ipc_listener.hpp
 delete mode 100644 src/kqueue.cpp
 delete mode 100644 src/kqueue.hpp
 delete mode 100644 src/lb.cpp
 delete mode 100644 src/lb.hpp
 delete mode 100644 src/libzmq.pc.in
 delete mode 100644 src/libzmq.vers
 delete mode 100644 src/likely.hpp
 delete mode 100644 src/macros.hpp
 delete mode 100644 src/mailbox.cpp
 delete mode 100644 src/mailbox.hpp
 delete mode 100644 src/mailbox_safe.cpp
 delete mode 100644 src/mailbox_safe.hpp
 delete mode 100644 src/mechanism.cpp
 delete mode 100644 src/mechanism.hpp
 delete mode 100644 src/mechanism_base.cpp
 delete mode 100644 src/mechanism_base.hpp
 delete mode 100644 src/metadata.cpp
 delete mode 100644 src/metadata.hpp
 delete mode 100644 src/msg.cpp
 delete mode 100644 src/msg.hpp
 delete mode 100644 src/mtrie.cpp
 delete mode 100644 src/mtrie.hpp
 delete mode 100644 src/mutex.hpp
 delete mode 100644 src/norm_engine.cpp
 delete mode 100644 src/norm_engine.hpp
 delete mode 100644 src/null_mechanism.cpp
 delete mode 100644 src/null_mechanism.hpp
 delete mode 100644 src/object.cpp
 delete mode 100644 src/object.hpp
 delete mode 100644 src/options.cpp
 delete mode 100644 src/options.hpp
 delete mode 100644 src/own.cpp
 delete mode 100644 src/own.hpp
 delete mode 100644 src/pair.cpp
 delete mode 100644 src/pair.hpp
 delete mode 100644 src/peer.cpp
 delete mode 100644 src/peer.hpp
 delete mode 100644 src/pgm_receiver.cpp
 delete mode 100644 src/pgm_receiver.hpp
 delete mode 100644 src/pgm_sender.cpp
 delete mode 100644 src/pgm_sender.hpp
 delete mode 100644 src/pgm_socket.cpp
 delete mode 100644 src/pgm_socket.hpp
 delete mode 100644 src/pipe.cpp
 delete mode 100644 src/pipe.hpp
 delete mode 100644 src/plain_client.cpp
 delete mode 100644 src/plain_client.hpp
 delete mode 100644 src/plain_common.hpp
 delete mode 100644 src/plain_server.cpp
 delete mode 100644 src/plain_server.hpp
 delete mode 100644 src/poll.cpp
 delete mode 100644 src/poll.hpp
 delete mode 100644 src/poller.hpp
 delete mode 100644 src/poller_base.cpp
 delete mode 100644 src/poller_base.hpp
 delete mode 100644 src/polling_util.cpp
 delete mode 100644 src/polling_util.hpp
 delete mode 100644 src/pollset.cpp
 delete mode 100644 src/pollset.hpp
 delete mode 100644 src/precompiled.cpp
 delete mode 100644 src/precompiled.hpp
 delete mode 100644 src/proxy.cpp
 delete mode 100644 src/proxy.hpp
 delete mode 100644 src/pub.cpp
 delete mode 100644 src/pub.hpp
 delete mode 100644 src/pull.cpp
 delete mode 100644 src/pull.hpp
 delete mode 100644 src/push.cpp
 delete mode 100644 src/push.hpp
 delete mode 100644 src/radio.cpp
 delete mode 100644 src/radio.hpp
 delete mode 100644 src/radix_tree.cpp
 delete mode 100644 src/radix_tree.hpp
 delete mode 100644 src/random.cpp
 delete mode 100644 src/random.hpp
 delete mode 100644 src/raw_decoder.cpp
 delete mode 100644 src/raw_decoder.hpp
 delete mode 100644 src/raw_encoder.cpp
 delete mode 100644 src/raw_encoder.hpp
 delete mode 100644 src/raw_engine.cpp
 delete mode 100644 src/raw_engine.hpp
 delete mode 100644 src/reaper.cpp
 delete mode 100644 src/reaper.hpp
 delete mode 100644 src/rep.cpp
 delete mode 100644 src/rep.hpp
 delete mode 100644 src/req.cpp
 delete mode 100644 src/req.hpp
 delete mode 100644 src/router.cpp
 delete mode 100644 src/router.hpp
 delete mode 100644 src/scatter.cpp
 delete mode 100644 src/scatter.hpp
 delete mode 100644 src/secure_allocator.hpp
 delete mode 100644 src/select.cpp
 delete mode 100644 src/select.hpp
 delete mode 100644 src/server.cpp
 delete mode 100644 src/server.hpp
 delete mode 100644 src/session_base.cpp
 delete mode 100644 src/session_base.hpp
 delete mode 100644 src/signaler.cpp
 delete mode 100644 src/signaler.hpp
 delete mode 100644 src/socket_base.cpp
 delete mode 100644 src/socket_base.hpp
 delete mode 100644 src/socket_poller.cpp
 delete mode 100644 src/socket_poller.hpp
 delete mode 100644 src/socks.cpp
 delete mode 100644 src/socks.hpp
 delete mode 100644 src/socks_connecter.cpp
 delete mode 100644 src/socks_connecter.hpp
 delete mode 100644 src/stdint.hpp
 delete mode 100644 src/stream.cpp
 delete mode 100644 src/stream.hpp
 delete mode 100755 src/stream_connecter_base.cpp
 delete mode 100755 src/stream_connecter_base.hpp
 delete mode 100644 src/stream_engine_base.cpp
 delete mode 100644 src/stream_engine_base.hpp
 delete mode 100644 src/stream_listener_base.cpp
 delete mode 100644 src/stream_listener_base.hpp
 delete mode 100644 src/sub.cpp
 delete mode 100644 src/sub.hpp
 delete mode 100644 src/tcp.cpp
 delete mode 100644 src/tcp.hpp
 delete mode 100644 src/tcp_address.cpp
 delete mode 100644 src/tcp_address.hpp
 delete mode 100644 src/tcp_connecter.cpp
 delete mode 100644 src/tcp_connecter.hpp
 delete mode 100644 src/tcp_listener.cpp
 delete mode 100644 src/tcp_listener.hpp
 delete mode 100644 src/thread.cpp
 delete mode 100644 src/thread.hpp
 delete mode 100644 src/timers.cpp
 delete mode 100644 src/timers.hpp
 delete mode 100644 src/tipc_address.cpp
 delete mode 100644 src/tipc_address.hpp
 delete mode 100644 src/tipc_connecter.cpp
 delete mode 100644 src/tipc_connecter.hpp
 delete mode 100644 src/tipc_listener.cpp
 delete mode 100644 src/tipc_listener.hpp
 delete mode 100644 src/trie.cpp
 delete mode 100644 src/trie.hpp
 delete mode 100644 src/tweetnacl.c
 delete mode 100644 src/tweetnacl.h
 delete mode 100644 src/udp_address.cpp
 delete mode 100644 src/udp_address.hpp
 delete mode 100644 src/udp_engine.cpp
 delete mode 100644 src/udp_engine.hpp
 delete mode 100644 src/v1_decoder.cpp
 delete mode 100644 src/v1_decoder.hpp
 delete mode 100644 src/v1_encoder.cpp
 delete mode 100644 src/v1_encoder.hpp
 delete mode 100644 src/v2_decoder.cpp
 delete mode 100644 src/v2_decoder.hpp
 delete mode 100644 src/v2_encoder.cpp
 delete mode 100644 src/v2_encoder.hpp
 delete mode 100644 src/v2_protocol.hpp
 delete mode 100644 src/v3_1_encoder.cpp
 delete mode 100644 src/v3_1_encoder.hpp
 delete mode 100644 src/version.rc.in
 delete mode 100644 src/vmci.cpp
 delete mode 100644 src/vmci.hpp
 delete mode 100644 src/vmci_address.cpp
 delete mode 100644 src/vmci_address.hpp
 delete mode 100644 src/vmci_connecter.cpp
 delete mode 100644 src/vmci_connecter.hpp
 delete mode 100644 src/vmci_listener.cpp
 delete mode 100644 src/vmci_listener.hpp
 delete mode 100644 src/windows.hpp
 delete mode 100644 src/wire.hpp
 delete mode 100644 src/ws_address.cpp
 delete mode 100644 src/ws_address.hpp
 delete mode 100644 src/ws_connecter.cpp
 delete mode 100644 src/ws_connecter.hpp
 delete mode 100644 src/ws_decoder.cpp
 delete mode 100644 src/ws_decoder.hpp
 delete mode 100644 src/ws_encoder.cpp
 delete mode 100644 src/ws_encoder.hpp
 delete mode 100644 src/ws_engine.cpp
 delete mode 100644 src/ws_engine.hpp
 delete mode 100644 src/ws_listener.cpp
 delete mode 100644 src/ws_listener.hpp
 delete mode 100644 src/ws_protocol.hpp
 delete mode 100644 src/wss_address.cpp
 delete mode 100644 src/wss_address.hpp
 delete mode 100644 src/wss_engine.cpp
 delete mode 100644 src/wss_engine.hpp
 delete mode 100644 src/xpub.cpp
 delete mode 100644 src/xpub.hpp
 delete mode 100644 src/xsub.cpp
 delete mode 100644 src/xsub.hpp
 delete mode 100644 src/ypipe.hpp
 delete mode 100644 src/ypipe_base.hpp
 delete mode 100644 src/ypipe_conflate.hpp
 delete mode 100644 src/yqueue.hpp
 delete mode 100644 src/zap_client.cpp
 delete mode 100644 src/zap_client.hpp
 delete mode 100644 src/zmq.cpp
 delete mode 100644 src/zmq_draft.h
 delete mode 100644 src/zmq_utils.cpp
 delete mode 100644 src/zmtp_engine.cpp
 delete mode 100644 src/zmtp_engine.hpp
 delete mode 100755 tests/CMakeLists.txt
 delete mode 100644 tests/README.md
 delete mode 100644 tests/fuzzer_corpora/endpoint.dict
 delete mode 100644 tests/fuzzer_corpora/test_bind_curve_fuzzer.txt
 delete mode 100644 tests/fuzzer_corpora/test_bind_fuzzer.txt
 delete mode 100644 tests/fuzzer_corpora/test_bind_null_fuzzer.txt
 delete mode 100644 tests/fuzzer_corpora/test_connect_curve_fuzzer.txt
 delete mode 100644 tests/fuzzer_corpora/test_connect_null_fuzzer.txt
 delete mode 100644 tests/fuzzer_corpora/test_z85_decode_fuzzer.txt
 delete mode 100644 tests/fuzzer_corpora/zmtp.dict
 delete mode 100644 tests/test_abstract_ipc.cpp
 delete mode 100644 tests/test_address_tipc.cpp
 delete mode 100644 tests/test_ancillaries.cpp
 delete mode 100644 tests/test_app_meta.cpp
 delete mode 100644 tests/test_atomics.cpp
 delete mode 100644 tests/test_base85.cpp
 delete mode 100644 tests/test_bind_after_connect_tcp.cpp
 delete mode 100644 tests/test_bind_curve_fuzzer.cpp
 delete mode 100644 tests/test_bind_fuzzer.cpp
 delete mode 100644 tests/test_bind_null_fuzzer.cpp
 delete mode 100644 tests/test_bind_src_address.cpp
 delete mode 100644 tests/test_capabilities.cpp
 delete mode 100644 tests/test_channel.cpp
 delete mode 100644 tests/test_client_server.cpp
 delete mode 100644 tests/test_conflate.cpp
 delete mode 100644 tests/test_connect_curve_fuzzer.cpp
 delete mode 100644 tests/test_connect_delay_tipc.cpp
 delete mode 100644 tests/test_connect_fuzzer.cpp
 delete mode 100644 tests/test_connect_null_fuzzer.cpp
 delete mode 100644 tests/test_connect_resolve.cpp
 delete mode 100644 tests/test_connect_rid.cpp
 delete mode 100644 tests/test_ctx_destroy.cpp
 delete mode 100644 tests/test_ctx_options.cpp
 delete mode 100644 tests/test_dgram.cpp
 delete mode 100644 tests/test_diffserv.cpp
 delete mode 100644 tests/test_disconnect_inproc.cpp
 delete mode 100644 tests/test_disconnect_msg.cpp
 delete mode 100644 tests/test_filter_ipc.cpp
 delete mode 100644 tests/test_fork.cpp
 delete mode 100644 tests/test_getsockopt_memset.cpp
 delete mode 100644 tests/test_heartbeats.cpp
 delete mode 100644 tests/test_hello_msg.cpp
 delete mode 100644 tests/test_hwm.cpp
 delete mode 100644 tests/test_hwm_pubsub.cpp
 delete mode 100644 tests/test_immediate.cpp
 delete mode 100644 tests/test_inproc_connect.cpp
 delete mode 100644 tests/test_invalid_rep.cpp
 delete mode 100644 tests/test_iov.cpp
 delete mode 100644 tests/test_ipc_wildcard.cpp
 delete mode 100644 tests/test_issue_566.cpp
 delete mode 100644 tests/test_last_endpoint.cpp
 delete mode 100644 tests/test_many_sockets.cpp
 delete mode 100644 tests/test_metadata.cpp
 delete mode 100644 tests/test_mock_pub_sub.cpp
 delete mode 100644 tests/test_monitor.cpp
 delete mode 100644 tests/test_msg_ffn.cpp
 delete mode 100644 tests/test_msg_flags.cpp
 delete mode 100644 tests/test_msg_init.cpp
 delete mode 100644 tests/test_pair_inproc.cpp
 delete mode 100644 tests/test_pair_ipc.cpp
 delete mode 100644 tests/test_pair_tcp.cpp
 delete mode 100644 tests/test_pair_tcp_cap_net_admin.cpp
 delete mode 100644 tests/test_pair_tipc.cpp
 delete mode 100644 tests/test_pair_vmci.cpp
 delete mode 100644 tests/test_peer.cpp
 delete mode 100644 tests/test_poller.cpp
 delete mode 100644 tests/test_probe_router.cpp
 delete mode 100644 tests/test_proxy.cpp
 delete mode 100644 tests/test_proxy_hwm.cpp
 delete mode 100644 tests/test_proxy_single_socket.cpp
 delete mode 100644 tests/test_proxy_terminate.cpp
 delete mode 100644 tests/test_pub_invert_matching.cpp
 delete mode 100644 tests/test_radio_dish.cpp
 delete mode 100644 tests/test_rebind_ipc.cpp
 delete mode 100644 tests/test_reconnect_ivl.cpp
 delete mode 100644 tests/test_reconnect_options.cpp
 delete mode 100644 tests/test_req_correlate.cpp
 delete mode 100644 tests/test_req_relaxed.cpp
 delete mode 100644 tests/test_reqrep_device.cpp
 delete mode 100644 tests/test_reqrep_device_tipc.cpp
 delete mode 100644 tests/test_reqrep_inproc.cpp
 delete mode 100644 tests/test_reqrep_ipc.cpp
 delete mode 100644 tests/test_reqrep_tcp.cpp
 delete mode 100644 tests/test_reqrep_tipc.cpp
 delete mode 100644 tests/test_reqrep_vmci.cpp
 delete mode 100644 tests/test_router_handover.cpp
 delete mode 100644 tests/test_router_mandatory.cpp
 delete mode 100644 tests/test_router_mandatory_hwm.cpp
 delete mode 100644 tests/test_router_mandatory_tipc.cpp
 delete mode 100644 tests/test_router_notify.cpp
 delete mode 100644 tests/test_scatter_gather.cpp
 delete mode 100644 tests/test_security_curve.cpp
 delete mode 100644 tests/test_security_gssapi.cpp
 delete mode 100644 tests/test_security_no_zap_handler.cpp
 delete mode 100644 tests/test_security_null.cpp
 delete mode 100644 tests/test_security_plain.cpp
 delete mode 100644 tests/test_security_zap.cpp
 delete mode 100644 tests/test_setsockopt.cpp
 delete mode 100644 tests/test_shutdown_stress.cpp
 delete mode 100644 tests/test_shutdown_stress_tipc.cpp
 delete mode 100644 tests/test_socket_null.cpp
 delete mode 100644 tests/test_sockopt_hwm.cpp
 delete mode 100644 tests/test_socks.cpp
 delete mode 100644 tests/test_sodium.cpp
 delete mode 100644 tests/test_spec_dealer.cpp
 delete mode 100644 tests/test_spec_pushpull.cpp
 delete mode 100644 tests/test_spec_rep.cpp
 delete mode 100644 tests/test_spec_req.cpp
 delete mode 100644 tests/test_spec_router.cpp
 delete mode 100644 tests/test_srcfd.cpp
 delete mode 100644 tests/test_stream.cpp
 delete mode 100644 tests/test_stream_disconnect.cpp
 delete mode 100644 tests/test_stream_empty.cpp
 delete mode 100644 tests/test_stream_exceeds_buffer.cpp
 delete mode 100644 tests/test_stream_timeout.cpp
 delete mode 100644 tests/test_sub_forward.cpp
 delete mode 100644 tests/test_sub_forward_tipc.cpp
 delete mode 100644 tests/test_system.cpp
 delete mode 100644 tests/test_term_endpoint.cpp
 delete mode 100644 tests/test_term_endpoint_tipc.cpp
 delete mode 100644 tests/test_thread_safe.cpp
 delete mode 100644 tests/test_timeo.cpp
 delete mode 100644 tests/test_timers.cpp
 delete mode 100644 tests/test_unbind_wildcard.cpp
 delete mode 100644 tests/test_use_fd.cpp
 delete mode 100644 tests/test_ws_transport.cpp
 delete mode 100644 tests/test_wss_transport.cpp
 delete mode 100644 tests/test_xpub_manual.cpp
 delete mode 100644 tests/test_xpub_manual_last_value.cpp
 delete mode 100644 tests/test_xpub_nodrop.cpp
 delete mode 100644 tests/test_xpub_verbose.cpp
 delete mode 100644 tests/test_xpub_welcome_msg.cpp
 delete mode 100644 tests/test_z85_decode_fuzzer.cpp
 delete mode 100644 tests/test_zmq_poll_fd.cpp
 delete mode 100644 tests/testutil.cpp
 delete mode 100644 tests/testutil.hpp
 delete mode 100644 tests/testutil_monitoring.cpp
 delete mode 100644 tests/testutil_monitoring.hpp
 delete mode 100644 tests/testutil_security.cpp
 delete mode 100644 tests/testutil_security.hpp
 delete mode 100644 tests/testutil_unity.cpp
 delete mode 100644 tests/testutil_unity.hpp
 delete mode 100644 tools/curve_keygen.cpp
 delete mode 100644 unittests/CMakeLists.txt
 delete mode 100644 unittests/unittest_curve_encoding.cpp
 delete mode 100644 unittests/unittest_ip_resolver.cpp
 delete mode 100644 unittests/unittest_mtrie.cpp
 delete mode 100644 unittests/unittest_poller.cpp
 delete mode 100644 unittests/unittest_radix_tree.cpp
 delete mode 100644 unittests/unittest_resolver_common.hpp
 delete mode 100644 unittests/unittest_udp_address.cpp
 delete mode 100644 unittests/unittest_ypipe.cpp
 delete mode 100755 version.sh

diff --git a/.clang-format b/.clang-format
deleted file mode 100644
index 0fc6f89fb..000000000
--- a/.clang-format
+++ /dev/null
@@ -1,53 +0,0 @@
-BasedOnStyle: LLVM
-IndentWidth: 4
-UseTab: Never
-BreakBeforeBraces: Custom
-BraceWrapping: 
-    AfterClass: true
-    AfterControlStatement: false
-    AfterEnum: true 
-    AfterFunction: true 
-    AfterNamespace: true
-    AfterObjCDeclaration: true 
-    AfterStruct: true 
-    AfterUnion: true 
-    BeforeCatch: true 
-    BeforeElse: false 
-    IndentBraces: false
-
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AllowShortIfStatementsOnASingleLine: false
-IndentCaseLabels: true
-BinPackArguments: true
-BinPackParameters: false
-AlignTrailingComments: true
-AllowShortBlocksOnASingleLine: false
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortFunctionsOnASingleLine: InlineOnly
-AlwaysBreakTemplateDeclarations: false
-ColumnLimit: 80
-MaxEmptyLinesToKeep: 2
-KeepEmptyLinesAtTheStartOfBlocks: false
-ContinuationIndentWidth: 2
-PointerAlignment: Right
-ReflowComments: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: Always
-SpaceInEmptyParentheses: false
-SpacesInAngles: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp03
-
-SortIncludes: false
-
-FixNamespaceComments: false
-BreakBeforeBinaryOperators: NonAssignment
-SpaceAfterTemplateKeyword: true
-AlignAfterOpenBracket: Align
-AlignOperands: true
-BreakConstructorInitializers: AfterColon
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-SpaceAfterCStyleCast: true
-BreakBeforeTernaryOperators: true
diff --git a/.clang-tidy b/.clang-tidy
deleted file mode 100644
index 5a7c53eb1..000000000
--- a/.clang-tidy
+++ /dev/null
@@ -1,426 +0,0 @@
-Checks:        "*,\
-# not currently a coding convention, but conceivable,\
--llvm-include-order,\
-# currently the coding convention deliberately produces violations of these,\
-# rules, but it may make sense to reconsider,\
--readability-implicit-bool-conversion,\
--readability-braces-around-statements,\
--readability-named-parameter,\
--fuchsia-default-arguments,\
--google-readability-todo,\
--google-runtime-int,\
--cppcoreguidelines-avoid-goto,\
--cppcoreguidelines-pro-type-member-init,\
--cppcoreguidelines-pro-type-static-cast-downcast,\
-# not applicable\
--fuchsia-default-argument-calls,\
--fuchsia-overloaded-operator,\
--fuchsia-statically-constructed-objects,\
-# not currently a coding convention, C++11-specific, but conceivable,\
--modernize-use-nullptr,\
--modernize-use-equals-default,\
--modernize-deprecated-headers,\
-# not currently a coding convention, C++11-specific and hard to implement,\
--hicpp-no-malloc,\
--hicpp-avoid-c-arrays,\
--modernize-avoid-c-arrays,\
--modernize-pass-by-value,\
--modernize-loop-convert,\
--modernize-use-auto,\
--modernize-use-trailing-return-type,\
--modernize-use-using,\
--modernize-return-braced-init-list,\
--cppcoreguidelines-avoid-c-arrays,\
--cppcoreguidelines-no-malloc,\
--cppcoreguidelines-owning-memory,\
--cppcoreguidelines-pro-type-union-access,\
--cppcoreguidelines-pro-bounds-array-to-pointer-decay,\
--cppcoreguidelines-pro-bounds-constant-array-index,\
--cppcoreguidelines-pro-bounds-pointer-arithmetic,\
-# not easily possible to implement (maybe replace by specific exclusions),\
--cppcoreguidelines-pro-type-vararg,\
--cppcoreguidelines-pro-type-reinterpret-cast,\
--hicpp-signed-bitwise,\
-# duplicates,\
--google-readability-braces-around-statements,\
--cppcoreguidelines-pro-type-cstyle-cast,\
--cppcoreguidelines-avoid-magic-numbers,\
--hicpp-braces-around-statements,\
--hicpp-use-equals-default,\
--hicpp-deprecated-headers,\
--hicpp-no-assembler,\
--hicpp-vararg,\
--hicpp-use-auto,\
--hicpp-use-nullptr,\
--hicpp-no-array-decay,\
--hicpp-member-init"
-WarningsAsErrors: ''
-HeaderFilterRegex: ''
-# AnalyzeTemporaryDtors: false
-CheckOptions:
-  # - key:             cert-dcl59-cpp.HeaderFileExtensions
-    # value:           h,hh,hpp,hxx
-  # - key:             cert-err61-cpp.CheckThrowTemporaries
-    # value:           '1'
-  # - key:             cert-oop11-cpp.IncludeStyle
-    # value:           llvm
-  # - key:             cert-oop11-cpp.UseCERTSemantics
-    # value:           '1'
-  # - key:             cppcoreguidelines-pro-bounds-constant-array-index.GslHeader
-    # value:           ''
-  # - key:             cppcoreguidelines-pro-bounds-constant-array-index.IncludeStyle
-    # value:           '0'
-  # - key:             cppcoreguidelines-pro-type-member-init.IgnoreArrays
-    # value:           '0'
-  # - key:             google-build-namespaces.HeaderFileExtensions
-    # value:           h,hh,hpp,hxx
-  # - key:             google-global-names-in-headers.HeaderFileExtensions
-    # value:           h
-  # - key:             google-readability-braces-around-statements.ShortStatementLines
-    # value:           '1'
-  # - key:             google-readability-function-size.BranchThreshold
-    # value:           '4294967295'
-  # - key:             google-readability-function-size.LineThreshold
-    # value:           '4294967295'
-  # - key:             google-readability-function-size.StatementThreshold
-    # value:           '800'
-  # - key:             google-readability-namespace-comments.ShortNamespaceLines
-    # value:           '10'
-  # - key:             google-readability-namespace-comments.SpacesBeforeComments
-    # value:           '2'
-  # - key:             google-runtime-int.SignedTypePrefix
-    # value:           int
-  # - key:             google-runtime-int.TypeSuffix
-    # value:           ''
-  # - key:             google-runtime-int.UnsignedTypePrefix
-    # value:           uint
-  # - key:             llvm-namespace-comment.ShortNamespaceLines
-    # value:           '1'
-  # - key:             llvm-namespace-comment.SpacesBeforeComments
-    # value:           '1'
-  # - key:             misc-assert-side-effect.AssertMacros
-    # value:           assert
-  # - key:             misc-assert-side-effect.CheckFunctionCalls
-    # value:           '0'
-  # - key:             misc-dangling-handle.HandleClasses
-    # value:           'std::basic_string_view;std::experimental::basic_string_view'
-  # - key:             misc-definitions-in-headers.HeaderFileExtensions
-    # value:           ',h,hh,hpp,hxx'
-  # - key:             misc-definitions-in-headers.UseHeaderFileExtension
-    # value:           '1'
-  # - key:             misc-misplaced-widening-cast.CheckImplicitCasts
-    # value:           '1'
-  # - key:             misc-move-constructor-init.IncludeStyle
-    # value:           llvm
-  # - key:             misc-move-constructor-init.UseCERTSemantics
-    # value:           '0'
-  # - key:             misc-sizeof-expression.WarnOnSizeOfCompareToConstant
-    # value:           '1'
-  # - key:             misc-sizeof-expression.WarnOnSizeOfConstant
-    # value:           '1'
-  # - key:             misc-sizeof-expression.WarnOnSizeOfThis
-    # value:           '1'
-  # - key:             misc-string-constructor.LargeLengthThreshold
-    # value:           '8388608'
-  # - key:             misc-string-constructor.WarnOnLargeLength
-    # value:           '1'
-  # - key:             misc-suspicious-missing-comma.MaxConcatenatedTokens
-    # value:           '5'
-  # - key:             misc-suspicious-missing-comma.RatioThreshold
-    # value:           '0.200000'
-  # - key:             misc-suspicious-missing-comma.SizeThreshold
-    # value:           '5'
-  # - key:             misc-suspicious-string-compare.StringCompareLikeFunctions
-    # value:           ''
-  # - key:             misc-suspicious-string-compare.WarnOnImplicitComparison
-    # value:           '1'
-  # - key:             misc-suspicious-string-compare.WarnOnLogicalNotComparison
-    # value:           '0'
-  # - key:             misc-throw-by-value-catch-by-reference.CheckThrowTemporaries
-    # value:           '1'
-  # - key:             modernize-loop-convert.MaxCopySize
-    # value:           '16'
-  # - key:             modernize-loop-convert.MinConfidence
-    # value:           reasonable
-  # - key:             modernize-loop-convert.NamingStyle
-    # value:           CamelCase
-  # - key:             modernize-pass-by-value.IncludeStyle
-    # value:           llvm
-  # - key:             modernize-replace-auto-ptr.IncludeStyle
-    # value:           llvm
-  # - key:             modernize-use-nullptr.NullMacros
-    # value:           'NULL'
-  # - key:             performance-faster-string-find.StringLikeClasses
-    # value:           'std::basic_string'
-  # - key:             performance-for-range-copy.WarnOnAllAutoCopies
-    # value:           '0'
-  # - key:             readability-braces-around-statements.ShortStatementLines
-    # value:           '1'
-  # - key:             readability-function-size.BranchThreshold
-    # value:           '4294967295'
-  # - key:             readability-function-size.LineThreshold
-    # value:           '4294967295'
-  # - key:             readability-function-size.StatementThreshold
-    # value:           '800'
-  # - key:             readability-identifier-naming.AbstractClassCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.AbstractClassPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.AbstractClassSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ClassConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ClassConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassMemberCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ClassMemberPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassMemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ClassMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstantMemberCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstantMemberPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantMemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstantParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprFunctionCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstexprFunctionPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprFunctionSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstexprMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprVariableCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstexprVariablePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprVariableSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.EnumCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.EnumConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.EnumConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.EnumConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.EnumPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.EnumSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.FunctionCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.FunctionPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.FunctionSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.GlobalConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalFunctionCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.GlobalFunctionPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalFunctionSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalVariableCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.GlobalVariablePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalVariableSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.IgnoreFailedSplit
-    # value:           '0'
-  # - key:             readability-identifier-naming.InlineNamespaceCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.InlineNamespacePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.InlineNamespaceSuffix
-    # value:           ''
-   - key:             readability-identifier-naming.LocalConstantCase
-     value:           lower_case
-   - key:             readability-identifier-naming.LocalConstantPrefix
-     value:           ''
-   - key:             readability-identifier-naming.LocalConstantSuffix
-     value:           ''
-   - key:             readability-identifier-naming.LocalVariableCase
-     value:           lower_case
-   - key:             readability-identifier-naming.LocalVariablePrefix
-     value:           ''
-   - key:             readability-identifier-naming.LocalVariableSuffix
-     value:           ''
-  # - key:             readability-identifier-naming.MemberCase
-    # value:           lower_case
-  # - key:             readability-identifier-naming.MemberPrefix
-    # value:           '_'
-  # - key:             readability-identifier-naming.MemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.MethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.MethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.MethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.NamespaceCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.NamespacePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.NamespaceSuffix
-    # value:           ''
-   - key:             readability-identifier-naming.ParameterCase
-     value:           lower_case
-  # - key:             readability-identifier-naming.ParameterPackCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ParameterPackPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ParameterPackSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ParameterPrefix
-    # value:           ''
-   - key:             readability-identifier-naming.ParameterSuffix
-     value:           '_'
-   - key:             readability-identifier-naming.PrivateMemberCase
-     value:           lower_case
-   - key:             readability-identifier-naming.PrivateMemberPrefix
-     value:           '_'
-   - key:             readability-identifier-naming.PrivateMemberSuffix
-     value:           ''
-  # - key:             readability-identifier-naming.PrivateMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.PrivateMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.PrivateMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ProtectedMemberCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ProtectedMemberPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ProtectedMemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ProtectedMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ProtectedMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ProtectedMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.PublicMemberCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.PublicMemberPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.PublicMemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.PublicMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.PublicMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.PublicMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.StaticConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.StaticConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.StaticConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.StaticVariableCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.StaticVariablePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.StaticVariableSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.StructCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.StructPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.StructSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.TemplateParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.TemplateParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.TemplateParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.TemplateTemplateParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.TemplateTemplateParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.TemplateTemplateParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.TypeTemplateParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.TypeTemplateParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.TypeTemplateParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.TypedefCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.TypedefPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.TypedefSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.UnionCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.UnionPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.UnionSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ValueTemplateParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ValueTemplateParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ValueTemplateParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.VariableCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.VariablePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.VariableSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.VirtualMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.VirtualMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.VirtualMethodSuffix
-    # value:           ''
-  # - key:             readability-simplify-boolean-expr.ChainedConditionalAssignment
-    # value:           '0'
-  # - key:             readability-simplify-boolean-expr.ChainedConditionalReturn
-    # value:           '0'
-   - key:             modernize-use-override.OverrideSpelling
-     value:           'ZMQ_OVERRIDE'
-   - key:             modernize-use-override.FinalSpelling
-     value:           'ZMQ_FINAL'
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
deleted file mode 100644
index 10bb5ab12..000000000
--- a/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Pull Request Notice
-
-Before sending a pull request make sure each commit solves one clear, minimal,
-plausible problem. Further each commit should have the following format:
-
-```
-Problem: X is broken
-
-Solution: do Y and Z to fix X
-```
-
-Please try to have the code changes conform to our coding style. For your
-convenience, you can install clang-format (at least version 5.0) and then
-run ```make clang-format-check```. Don't fix existing issues, if any - just
-make sure your changes are compliant. ```make clang-format-diff``` will
-automatically apply the required changes.
-To set a specific clang-format binary with autotools, you can for example
-run: ```./configure CLANG_FORMAT=clang-format-5.0```
-
-Please avoid sending a pull request with recursive merge nodes, as they
-are impossible to fix once merged. Please rebase your branch on
-zeromq/libzmq master instead of merging it.
-
-```
-git remote add upstream git@github.com:zeromq/libzmq.git
-git fetch upstream
-git rebase upstream/master
-git push -f
-```
-
-In case you already merged instead of rebasing you can drop the merge commit.
-
-```
-git rebase -i HEAD~10
-```
-
-Now, find your merge commit and mark it as drop and save. Finally rebase!
-
-If you are a new contributor please have a look at our contributing guidelines:
-[CONTRIBUTING](http://zeromq.org/docs:contributing)
-
-# FIRST TIME CONTRIBUTORS PLEASE NOTE
-
-Please add an additional commit with a relicensing grant.
-
-[Example](https://github.com/zeromq/libzmq/commit/fecbd42dbe45455fff3b6456350ceca047b82050)
-
-[More information on RELICENSING effort](https://github.com/zeromq/libzmq/tree/master/RELICENSE/README.md)
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index 21b837a8d..000000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,22 +0,0 @@
-*Please use this template for reporting suspected bugs or requests for help.*
-
-# Issue description
-
-
-
-# Environment
-
-* libzmq version (commit hash if unreleased): 
-* OS: 
-
-# Minimal test code / Steps to reproduce the issue
-
-1.  
-
-
-# What's the actual result? (include assertion message & call stack if applicable)
-
-
-
-# What's the expected result?
-
diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index a06b57d35..000000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 365
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 56
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "Help Request"
-  - "Feature Request"
-  - "Problem reproduced"
-  - Critical
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  activity for 365 days. It will be closed if no further activity occurs within
-  56 days. Thank you for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
deleted file mode 100644
index ff1d7503b..000000000
--- a/.github/workflows/CI.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: CI
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - platform: x64
-            configuration: release  
-            os: windows-2019
-            WITH_LIBSODIUM: ON
-            ENABLE_CURVE: ON
-            CMAKE_GENERATOR: Visual Studio 16 2019
-            MSVCVERSION: v142
-            MSVCYEAR: vs2019
-            ARTIFACT_NAME: v142-x64
-            ENABLE_DRAFTS: ON
-          # - platform: Win32
-          #   configuration: Release            
-          #   os: windows-2016           
-          #   WITH_LIBSODIUM: ON
-          #   ENABLE_CURVE: ON            
-          #   CMAKE_GENERATOR: "Visual Studio 15 2017"
-          #   MSVCVERSION: "v141"
-          #   MSVCYEAR: "vs2017"            
-          #   ARTIFACT_NAME: v141
-          #   ENABLE_DRAFTS: ON            
-          - platform: x64
-            configuration: Release
-            os: windows-2016           
-            WITH_LIBSODIUM: ON            
-            ENABLE_CURVE: ON            
-            CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-            MSVCVERSION: "v141"
-            MSVCYEAR: "vs2017"
-            ARTIFACT_NAME: v141-x64
-            ENABLE_DRAFTS: ON
-    env:
-      platform: ${{ matrix.platform }}
-      configuration: ${{ matrix.configuration }}
-      WITH_LIBSODIUM: ${{ matrix.WITH_LIBSODIUM }}
-      ENABLE_CURVE: ${{ matrix.ENABLE_CURVE }}
-      CMAKE_GENERATOR: ${{ matrix.CMAKE_GENERATOR }}
-      MSVCVERSION: ${{ matrix.MSVCVERSION }}
-      MSVCYEAR: ${{ matrix.MSVCYEAR }}
-      ARTIFACT_NAME: ${{ matrix.ARTIFACT_NAME }}
-      ENABLE_DRAFTS: ${{ matrix.ENABLE_DRAFTS }}
-      SODIUM_INCLUDE_DIR: ${{ github.workspace }}\libsodium\src\libsodium\include"
-      SODIUM_LIBRARY_DIR: ${{ github.workspace }}\libsodium\bin\${{ matrix.platform }}\${{ matrix.configuration }}\${{ matrix.MSVCVERSION }}\dynamic"
-      LIBZMQ_SRCDIR: ${{ github.workspace }}\libzmq
-    steps:    
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.0
-      if: matrix.os == 'windows-2019'
-    - name: Add msbuild to PATH 2016
-      run: echo "##[add-path]C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin"
-      if: matrix.os == 'windows-2016'    
-    - uses: actions/checkout@v2
-      if: matrix.WITH_LIBSODIUM == 'ON'
-      with:
-        repository: jedisct1/libsodium
-        ref: stable
-        path: libsodium        
-    - name: Compile libsodium
-      if: matrix.WITH_LIBSODIUM == 'ON'
-      shell: cmd
-      working-directory: libsodium
-      run: msbuild /v:minimal /p:Configuration=%Configuration%DLL builds\msvc\%MSVCYEAR%\libsodium\libsodium.vcxproj
-    - name: Copy libsodium
-      if: matrix.WITH_LIBSODIUM == 'ON'
-      shell: powershell
-      working-directory: libsodium
-      run: Copy-Item "bin\${env:Platform}\${env:Configuration}\${env:MSVCVERSION}\dynamic\libsodium.lib" -Destination "bin\${env:Platform}\${env:Configuration}\${env:MSVCVERSION}\dynamic\sodium.lib"
-    - uses: actions/checkout@v2    
-      with:    
-        path: libzmq
-    - run: md build_libzmq      
-      shell: cmd
-    - name: build
-      shell: cmd
-      working-directory: build_libzmq
-      run: |        
-        cmake -D CMAKE_INCLUDE_PATH="%SODIUM_INCLUDE_DIR%" -D CMAKE_LIBRARY_PATH="%SODIUM_LIBRARY_DIR%" -D WITH_LIBSODIUM="%WITH_LIBSODIUM%" -D ENABLE_DRAFTS="%ENABLE_DRAFTS%" -D ENABLE_ANALYSIS="%ENABLE_ANALYSIS%" -D ENABLE_CURVE="%ENABLE_CURVE%" -D API_POLLER="%API_POLLER%" -D POLLER="%POLLER%" %EXTRA_FLAGS% -D WITH_LIBSODIUM="%WITH_LIBSODIUM%" -D LIBZMQ_WERROR="%LIBZMQ_WERROR%" -G "%CMAKE_GENERATOR%" "%LIBZMQ_SRCDIR%"
-        cmake --build . --config %configuration% --target install -- -verbosity:Minimal -maxcpucount           
-    - name: test      
-      shell: cmd      
-      working-directory: build_libzmq
-      run: ctest -C "%Configuration%"
diff --git a/.github/workflows/Fuzzers.yaml b/.github/workflows/Fuzzers.yaml
deleted file mode 100644
index 8ef880708..000000000
--- a/.github/workflows/Fuzzers.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Fuzzers
-on: [pull_request]
-
-jobs:
-  Fuzzing:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Build Fuzzers
-      id: build
-      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'libzmq'
-        dry-run: false
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6170b15a3..000000000
--- a/.gitignore
+++ /dev/null
@@ -1,127 +0,0 @@
-syntax: glob # for hg-git users
-
-# Generated build scripts and IDE generating files
-## autotools
-/Makefile
-builds/Makefile
-builds/deprecated-msvc/Makefile
-doc/Makefile
-libtool
-### automake
-Makefile.in
-.deps/
-.dirstamp
-### autoconf
-autom4te.cache
-aclocal.m4
-config
-config.status
-config.log
-configure
-stamp-h1
-## CMake
-cmake-build-debug/
-build/
-## Android
-builds/android/prefix
-## IntelliJ
-.idea/
-## Visual Code
-.vscode/
-## other results-like folders
-bin/
-lib/
-obj/
-## Doxygen
-doxygen/
-## Packaging 
-packaging/nuget/*.nupkg
-
-# Test related build files
-libtestutil.a
-libunity.a
-
-# Some build outputs and temporal files
-*.o
-*.gcno
-*.gcda
-*.gcov
-*.ncb
-*.lo
-*.loT
-*.la
-*.exe
-*.html
-*.pdf
-*.ps
-*~
-.*~
-.libs
-
-# /src
-## Ignore generated files in configuration process
-src/platform.hpp*
-src/libzmq.pc
-
-# /tools
-## Executable binaries are ignored
-tools/curve_keygen
-## Executable source files must be tracked
-!tools/*.[ch]
-!tools/*.[ch]pp
-
-# /tests
-## Test binaries and logs are ignored
-tests/test*
-tests/test*.log
-tests/test*.trs
-## Test source files must be tracked
-!tests/test*.[ch]
-!tests/test*.[ch]pp
-## Build script and documentations must be tracked
-!tests/CMakeLists.txt
-!tests/README.md
-
-# /unittests
-## Unit test binaries and logs are ignored
-unittests/unittest_*
-unittests/unittest*.log
-unittests/unittest*.trs
-## Unit test source files must be tracked
-!unittests/unittest*.[ch]
-!unittests/unittest*.[ch]pp
-## Build script and documentations must be tracked
-!unittests/CMakeLists.txt
-!unittests/README.md
-
-# check test log files
-test-suite*.log
-
-# /perf
-## Benchmarking binaries and result files are ignored
-perf/*_lat
-perf/*_thr
-perf/benchmark_*
-perf/results
-## Benchmarking source files must be tracked
-!perf/*.[ch]
-!perf/*.[ch]pp
-## Benchmarking tool scripts must be tracked
-!perf/*.py
-!perf/*.sh
-
-# /doc
-## Generated document files 
-doc/*.[137]
-doc/*.html
-doc/*.xml
-
-# external libraries and release archive files
-foreign/openpgm/*
-!foreign/openpgm/*.tar.bz2
-!foreign/openpgm/*.tar.gz
-!foreign/openpgm/Makefile.am
-zeromq-*.tar.gz
-zeromq-*.zip
-core
-
diff --git a/.hgeol b/.hgeol
deleted file mode 100644
index a484af67a..000000000
--- a/.hgeol
+++ /dev/null
@@ -1,2 +0,0 @@
-[patterns]
-** = native
diff --git a/.mailmap b/.mailmap
deleted file mode 100644
index 77e75fa81..000000000
--- a/.mailmap
+++ /dev/null
@@ -1,81 +0,0 @@
-Ahmet Kakici <ahmet.kakici@pro-line.com.tr> ahmet <ahmet.kakici@pro-line.com.tr>
-Andrey Sibiryov <me@kobology.ru> Kobolog <me@kobology.ru>
-Brian Knox <taotetek@gmail.com> taotetek <taotetek@users.noreply.github.com>
-Chernyshev Vyacheslav <astellar@ro.ru> Astellar <astellar@ro.ru>
-Chris Laws <clawsicus@gmail.com> Chris Laws <claws@localhost>
-Chris Staite <chris@yourdreamnet.co.uk> Chris <chris@yourdreamnet.co.uk>
-Christoph Zach <czach@rst-automation.com> czach <czach@rst-automation.com>
-Chuck Remes <git@chuckremes.com> Chuck Remes <cremes@mac.com>
-Chuck Remes <git@chuckremes.com> Chuck Remes <cremes.devlist@mac.com>
-Constantin Rack <constantin.rack@gmail.com> Constantin Rack <constantin@rack.li>
-Constantin Rack <constantin.rack@gmail.com> Constantin Rack <c-rack@users.noreply.github.com>
-Daniel Krikun <krikun.daniel@gmail.com> danielkr <krikun.daniel@gmail.com>
-Daiyu Hurst <daiyu.hurst@gmail.com> DaiyuHurst <daiyu.hurst@gmail.com>
-Diego Rodriguez-Losada <diego.rlosada@gmail.com> Diego <diego.rlosada@gmail.com>
-Dongmin Yu <miniway@gmail.com> Min(Dongmin Yu) <miniway@gmail.com>
-Doron Somech <somdoron@gmail.com> somdoron <somdoron@gmail.com>
-Elliot Saba <staticfloat@gmail.com> staticfloat <staticfloat@gmail.com>
-Eric Voskuil <eric@voskuil.org> evoskuil <eric@voskuil.org>
-Eric Voskuil <eric@voskuil.org> anonymous <eric@voskuil.org>
-Felipe Farinon <felipe.farinon@powersyslab.com> psl-felipefarinon <felipe.farinon@powersyslab.com>
-Frank Hartmann <soundart@gmx.net> Frank <soundart@gmx.net>
-Gian Lorenzo Meocci <glmeocci@gmail.com> meox <glmeocci@gmail.com>
-Hardeep Singh <hshardeesi@gmail.com> Hardeep <hshardeesi@gmail.com>
-Henrik Feldt <henrik@haf.se> Henrik <henrik@haf.se>
-Huang Xin <chrox.huang@gmail.com> chrox <chrox.huang@gmail.com>
-Ian Barber <ian.barber@gmail.com> Ian Barber <ianbarber@google.com>
-Jens Auer <jens.auer@cgi.com> Jens Auer <jens-auer@users.noreply.github.com>
-Jens Auer <jens.auer@cgi.com> Jens Auer <jens.auer@betaversion.net>
-Joe Eli McIlvain <joe.eli.mac@gmail.com> Joe McIlvain <joe.eli.mac@gmail.com>
-Jos Decoster <jos.decoster@gmail.com> jdc8 <jos.decoster@gmail.com>
-Jos Decoster <jos.decoster@gmail.com> Jos Decoster <jos.decoster@retarget.com>
-Joshua Gao <jmg116@gmail.com> Josh Gao <jgao@mobileiron.com>
-Jörg Kreuzberger <joerg@kreuzberger.eu> kreuzberger <joerg@kreuzberger.eu>
-Arnaud Kapp <kapp.arno@gmail.com> Kapp Arnaud <kapp.arno@gmail.com>
-Arnaud Kapp <kapp.arno@gmail.com> KAPP Arnaud <kapp.arno@gmail.com>
-Arnaud Kapp <kapp.arno@gmail.com> KAPP Arnaud <xaqq@users.noreply.github.com>
-Kenneth Wilke <kenneth.wilke@rackspace.com> KennethWilke <kenneth.wilke@rackspace.com>
-Kevin Sapper <mail@kevinsapper.de> sappo <mail@kevinsapper.de>
-Kevin Sapper <mail@kevinsapper.de> Kevin Sapper <sappo@users.noreply.github.com>
-Leonard Michelet <leonard.michelet@openwide.fr> leonarf <leonard.michelet@openwide.fr>
-Martijn Jasperse <m.jasperse@gmail.com> mjasperse <m.jasperse@gmail.com>
-Martin Hurton <hurtonm@gmail.com> Martin Hurtoň <hurtonm@gmail.com>
-Martin Lucina <martin@lucina.net> Martin Lucina <mato@kotelna.sk>
-Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@fastmq.commkdir>
-Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@fastmq.com>
-Martin Sustrik <sustrik@250bpm.com> sustrik <sustrik@250bpm.com>
-Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@jozsi.(none)>
-Martin Sustrik <sustrik@250bpm.com> unknown <sustrik@.(none)>
-Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@turist.(none)>
-Maurice Barnum <msb@yahoo-inc.com> maurice barnum <msb@yahoo-inc.com>
-Maurizio Melato <maurizio.melato@nice-software.com> unknown <mauri@okinawa.(none)>
-Max Skaller <Max.Skaller@gmail.com> skaller <Max.Skaller@gmail.com>
-Michael Fox <415fox@gmail.com> m <415fox@gmail.com>
-Michael Hand <mipa@matrix.by> Mipa <mipa@matrix.by>
-Michel Zou <xantares10@hotmail.com> xantares <xantares09@hotmail.com>
-Mikael Helbo Kjaer <mhk@designtech.dk> Mikael Helbo Kjær <mhk@designtech.dk>
-Mike Gatny <mgatny@gmail.com> Mike Gatny <mgatny@connamara.com>
-Mikko Koppanen <mikko.koppanen@gmail.com> Mikko Koppanen <mkoppanen@php.net>
-Mikko Koppanen <mikko.koppanen@gmail.com> Mikko Koppanen <mikko@kuut.io>
-Mikko Koppanen <mikko.koppanen@gmail.com> Mikko Koppanen <mkoppanen@gameboy.config>
-Min RK <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
-Min RK <benjaminrk@gmail.com> Min Ragan-Kelley <benjaminrk@gmail.com>
-Montoya Edu <montoya.edu@gmail.com> montoyaedu <montoya.edu@gmail.com>
-Nikita Kozlov <nikita@elyzion.net> nikita kozlov <nikita@elyzion.net>
-Pavol Malosek <malosek@fastmq.com> malosek <malosek@fastmq.com>
-Pieter Hintjens <ph@imatix.com> Pieter Hintjens <ph@itmatix.com>
-Reza Ebrahimi <reza.ebrahimi.dev@gmail.com> reza.ebrahimi <reza.ebrahimi.dev@gmail.com>
-Ricardo Catalinas Jiménez <r@untroubled.be> Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
-Rohan Bedarkar <rohanb@cs.uchicago.edu> rohanbedarkar <rohanb@cs.uchicago.edu>
-Rohan Bedarkar <rohanb@cs.uchicago.edu> Rohan <rbe@ws5-34-chi.rtsgroup.net>
-Sergey KHripchenko <shripchenko@intermedia.net> root <root@ast-pbx-mt-3.intermedia.net>
-Sergey KHripchenko <shripchenko@intermedia.net> shripchenko <shripchenko@intermedia.net>
-Sergey M. <dstftw@gmail.com> Sergey M․ <dstftw@gmail.com>
-Steven McCoy <steven.mccoy@miru.hk> Steve-o <fnjordy@gmail.com>
-Tamara Kustarova <kustarova@fastmq.com> tamara <tamara@jozsi.(none)>
-Timothee Besset <ttimo@ttimo.net> Timothee "TTimo" Besset <ttimo@ttimo.net>
-Timothy Mossbarger <tim@ent.net> Tim M <tim@ent.net>
-Trevor Bernard <trevor.bernard@gmail.com> Trevor Bernard <tbernard@liveops.com>
-Trevor Bernard <trevor.bernard@gmail.com> Trevor Bernard <trevor.bernard@userevents.com>
-Volodymyr Korniichuk <VolodymyrKorn@gmail.com> Volodymyr Korniichuk <9173519@gmail.com>
-lysyloren <lysy_loren@gmail.com> lysyloren <lysy.loren@gmail.com>
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index cfe457a1c..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-# Travis CI script
-
-language: c
-
-os:
-- linux
-- osx
-
-dist: bionic
-
-cache: ccache
-
-env:
-  matrix:
-    - BUILD_TYPE=default CURVE=tweetnacl DRAFT=enabled
-    - BUILD_TYPE=cmake CURVE=tweetnacl
-    - BUILD_TYPE=default
-  # tokens to deploy releases on OBS and create/delete temporary branch on Github.
-  # 1) Create a token on https://github.com/settings/tokens/new with "public_repo"
-  #    capability and encrypt it with travis encrypt --org -r zeromq/libzmq GH_TOKEN="<token>"
-  # 2) Create 2 OBS tokens with osc token --create network:messaging:zeromq:release-<stable|draft> libzmq
-  #    encrypt them with travis encrypt --org -r zeromq/libzmq OBS_<STABLE|DRAFT>_TOKEN="<token>"
-  global:
-    - secure: aaIs9Y44FYp9VFCqa6LLD4illBH4aUfbS0zzzbAQ5xJvD6NfBsMiKEIhf/kRNCHAtP+1VfQVOejTD6/i08ALsVr3cZD9oB/t7874tz2/jeZUIhRNo+1KwyaVqNg0yUSV6ASIoq4aOfuGnjBlezNQ8LQ2bjQB2m4Enl5wxoYcYdA=
-    - secure: YFrcedBIKe0NR1WC6qQi9phZgtnzOiBIXm40TirvCtstV4eVnSouKgtQfLLArZ4o2tjflq4grQQNo1rJatvyi5YPOXsMcndsni18S+4Ffu8qbECdtPrK52vBweuf7q9oV9Ydax0Fm4bEqEMOZ2/mRBy3nK+mgsE3upeMwyWR0Zw=
-    - secure: lbZSzmqN39QdJwewKOZgq/1ijPKuyx9MFrGzMqXj2+eOSlaZS/tNavHMdKJOev+qJGK9wxmwzxOxS10AiH+AvN7WBacXX4ZtudjScz2HKJRDWTKyzMbzyScq51afniItzrsm+Vo8NHkenNFkux0sSbh0aHlpkLwrGQu+WZWcDN4=
-    - secure: "ZFL7hLJlGwYix8fF835OnQYakBt/o5iS7IfSW7el44ejEvGAOM9O5/ufxCcqSqn8Np7nOaM3RriAVTqWPZD6S7tMeflGTSGYHPYwWUc83z4rUPyG2FWVKXdB8ufpebAwu3hCgLiSmVeoQG47dl6xNk1oKCd+3UIjgz33u1Ecfps="
-
-matrix:
-  include:
-  - if: type = cron OR (branch =~ analyze$ AND type = push)
-    env: BUILD_TYPE=cmake CLANG_TIDY=/usr/bin/clang-tidy-8 CC=clang-8 CXX=clang++-8
-    os: linux
-    compiler: clang
-    addons:
-      apt:
-        sources:
-          - ubuntu-toolchain-r-test
-          - llvm-toolchain-trusty-8
-        packages:
-          - clang-8
-          - clang-tools-8
-          - clang-tidy-8
-  - env: BUILD_TYPE=default CURVE=tweetnacl IPv6=ON
-    os: linux
-    dist: precise
-  - env: BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
-    os: linux
-    dist: xenial
-    addons:
-      apt:
-        packages:
-        - lcov
-  - env: BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled TLS=enabled
-    os: linux
-    dist: xenial
-    addons:
-      apt:
-        packages:
-        - valgrind
-        - libgnutls-dev
-  - env: BUILD_TYPE=default CURVE=libsodium GSSAPI=enabled PGM=enabled NORM=enabled
-    os: linux
-    addons:
-      apt:
-        sources:
-        - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/ ./'
-          key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
-        packages:
-        - libkrb5-dev
-        - libnorm-dev
-        - libpgm-dev
-        - libsodium-dev
-        - asciidoc
-        - xmlto
-  - env: BUILD_TYPE=default DRAFT=enabled TLS=enabled
-    os: linux
-    dist: xenial
-    addons:
-      apt:
-        packages:
-          - libgnutls-dev
-  - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled GSSAPI=enabled PGM=enabled NORM=enabled TIPC=enabled USE_NSS=yes
-    os: linux
-    addons:
-      apt:
-        sources:
-        - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/ ./'
-          key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
-        packages:
-        - libkrb5-dev
-        - libnorm-dev
-        - libpgm-dev
-        - libsodium-dev
-        - libnss3-dev
-        - libbsd-dev
-  - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled
-    os: osx
-  - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled ADDRESS_SANITIZER=enabled
-    os: linux
-    addons:
-      apt:
-        packages:
-        - libsodium-dev
-  - env: BUILD_TYPE=android CURVE=tweetnacl
-    os: linux
-    dist: trusty
-  - env: BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/lib/llvm-8/bin/clang-format
-    os: linux
-    addons:
-      apt:
-        packages:
-        - clang-format-8
-  - env: BUILD_TYPE=default POLLER=poll
-    os: linux
-  - env: BUILD_TYPE=default POLLER=select
-    os: linux
-  - env: CXX=clang++ BUILD_TYPE=default CURVE=libsodium GSSAPI=enabled PGM=enabled NORM=enabled FORCE_98=enabled
-    os: linux
-    compiler: clang
-    addons:
-      apt:
-        sources:
-        - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/ ./'
-          key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
-        packages:
-        - libkrb5-dev
-        - libnorm-dev
-        - libpgm-dev
-        - libsodium-dev
-  - env: BUILD_TYPE=abi-compliance-checker
-    os: linux
-    dist: xenial
-    addons:
-      apt:
-        packages:
-        - abi-dumper
-        - abi-compliance-checker
-    
-
-before_install:
-- if [ $TRAVIS_OS_NAME == "osx" -a $BUILD_TYPE == "android" ] ; then brew update; brew install binutils ; fi
-- if [ $TRAVIS_OS_NAME == "osx" -a $CURVE == "libsodium" ] ; then brew update; brew install libsodium ; fi
-# To allow sonar to process history information, unshallow clone first.
-- if [ -n "$CLANG_TIDY" ] ; then
-    git fetch --unshallow ;
-    curl -L https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip -o build-wrapper-linux-x86.zip ;
-    unzip build-wrapper-linux-x86.zip ;
-    export SONARCLOUD_BUILD_WRAPPER_PATH="$(pwd)/build-wrapper-linux-x86/" ;
-    curl -L https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.2.0.1873-linux.zip -o sonar-scanner-cli.zip ;
-    unzip sonar-scanner-cli.zip ;
-    export SONAR_SCANNER_CLI_PATH="$(pwd)/sonar-scanner-4.2.0.1873-linux/bin/" ;
-  fi
-
-before_script:
-# ZMQ stress tests need more open socket (files) than the usual default
-# On OSX, it seems the way to set the max files limit is constantly changing, so
-# try to use all known knobs to ensure compatibility across various versions
-- if [ $TRAVIS_OS_NAME == "osx" ] ; then sudo sysctl -w kern.maxfiles=64000 ; sudo sysctl -w kern.maxfilesperproc=64000 ; sudo launchctl limit maxfiles 64000 64000 ; ulimit -n 64000; fi
-
-# Build and check this project according to the BUILD_TYPE
-script: ./ci_build.sh
-
-# Deploy tags
-before_deploy:
-- . ./ci_deploy.sh
-deploy:
-  provider: releases
-  api_key:
-    secure: vGB5E+A8wxm2J1GJZzmIgT9PrjEzvd9gE8iui8FyxSbxAsW9vFZFGZC/21sTtpVcmRarwQCHH1UEbtg+nJwN2iD9YzMRnSVks8xqP+b709YW+VXaMuhZgTzWa74IorQku7NuvLibvQk72/OSgdwPGaNJ6f5AX9pnWVWbEoW1svE=
-  file_glob: true
-  file: ${LIBZMQ_DEPLOYMENT}
-  skip_cleanup: true
-  on:
-    repo: zeromq/libzmq
-    branch: master
-    tags: true
-    condition: "$TRAVIS_OS_NAME =~ (linux) && $BUILD_TYPE =~ (default) && $CURVE =~ (libsodium) && -z $DRAFT"
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 42b865fad..000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,152 +0,0 @@
-Corporate Contributors
-======================
-
-Copyright (c) 2007-2014 iMatix Corporation
-Copyright (c) 2009-2011 250bpm s.r.o.
-Copyright (c) 2010-2011 Miru Limited
-Copyright (c) 2011 VMware, Inc.
-Copyright (c) 2012 Spotify AB
-Copyright (c) 2013 Ericsson AB
-Copyright (c) 2014 AppDynamics Inc.
-Copyright (c) 2015 Google, Inc.
-Copyright (c) 2015-2016 Brocade Communications Systems Inc.
-
-Individual Contributors
-=======================
-
-AJ Lewis
-Alexej Lotz
-Andrew Thompson
-André Caron
-Asko Kauppi
-Attila Mark
-Barak Amar
-Ben Gray
-Bernd Melchers
-Bernd Prager
-Bob Beaty
-Brandon Carpenter
-Brett Cameron
-Brian Buchanan
-Burak Arslan
-Carl Clemens
-Chia-liang Kao
-Chris Busbey
-Chris Rempel
-Chris Wong
-Christian Gudrian
-Christian Kamm
-Chuck Remes
-Conrad D. Steenberg
-Constantin Rack
-Daniel J. Bernstein
-Dhammika Pathirana
-Dhruva Krishnamurthy
-Dirk O. Kaar
-Doron Somech
-Douglas Creager
-Drew Crawford
-Erich Heine
-Erik Hugne
-Erik Rigtorp
-Fabien Ninoles
-Frank Denis
-George Neill
-Gerard Toonstra
-Ghislain Putois
-Gonzalo Diethelm
-Guido Goldstein
-Harald Achitz
-Hardeep Singh
-Hiten Pandya
-Ian Barber
-Ilja Golshtein
-Ilya Kulakov
-Ivo Danihelka
-Jacob Rideout
-Joe Thornber
-Jon Dyte
-Kamil Shakirov
-Ken Steele
-Kouhei Sutou
-Laurent Alebarde
-Leonardo J. Consoni
-Lionel Flandrin
-Lourens Naudé
-Luca Boccassi
-Marc Rossi
-Mark Barbisan
-Martin Hurton
-Martin Lucina
-Martin Pales
-Martin Sustrik
-Matus Hamorsky
-Max Wolf
-McClain Looney
-Michael Compton
-Mika Fischer
-Mikael Helbo Kjaer
-Mike Gatny
-Mikko Koppanen
-Min Ragan-Kelley
-Neale Ferguson
-Nir Soffer
-Osiris Pedroso
-Paul Betts
-Paul Colomiets
-Pavel Gushcha
-Pavol Malosek
-Perry Kundert
-Peter Bourgon
-Philip Kovacs
-Pieter Hintjens
-Piotr Trojanek
-Reza Ebrahimi
-Richard Newton
-Rik van der Heijden
-Robert G. Jakabosky
-Sebastian Otaegui
-Stefan Radomski
-Steven McCoy
-Stuart Webster
-Tamara Kustarova
-Taras Shpot
-Tero Marttila
-Terry Wilson
-Thijs Terlouw
-Thomas Rodgers
-Tim Mossbarger
-Toralf Wittner
-Tore Halvorsen
-Trevor Bernard
-Vitaly Mayatskikh
-
-Credits
-=======
-
-Aamir Mohammad
-Adrian von Bidder
-Aleksey Yeschenko
-Alessio Spadaro
-Alexander Majorov
-Anh Vu
-Bernd Schumacher
-Brian Granger
-Carsten Dinkelmann
-David Bahi
-Dirk Eddelbuettel
-Evgueny Khartchenko
-Frank Vanden Berghen
-Ian Barber
-John Apps
-Markus Fischer
-Matt Muggeridge
-Michael Santy
-Oleg Sevostyanov
-Paulo Henrique Silva
-Peter Busser
-Peter Lemenkov
-Robert Zhang
-Toralf Wittner
-Zed Shaw
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab864994a..39bd208d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,1768 +1,368 @@
-# CMake build script for ZeroMQ
-project(ZeroMQ)
-
-if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
-  cmake_minimum_required(VERSION 3.0.2)
-else()
-  cmake_minimum_required(VERSION 2.8.12)
-endif()
-
-include(CheckIncludeFiles)
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-include(CheckLibraryExists)
-include(CheckCSourceCompiles)
-include(CheckCSourceRuns)
-include(CMakeDependentOption)
-include(CheckCXXSymbolExists)
-include(CheckTypeSize)
-include(FindThreads)
-include(GNUInstallDirs)
-include(CheckTypeSize)
-include(CMakePackageConfigHelpers)
-
-list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}")
-set(ZMQ_CMAKE_MODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules)
-list(APPEND CMAKE_MODULE_PATH ${ZMQ_CMAKE_MODULES_DIR})
-
-include(TestZMQVersion)
-include(ZMQSourceRunChecks)
-include(ZMQSupportMacros)
-
-find_package(PkgConfig)
-
-# Set lists to empty beforehand as to not accidentally take values from parent
-set(sources)
-set(cxx-sources)
-set(html-docs)
-set(target_outputs)
-
-option(ENABLE_ASAN "Build with address sanitizer" OFF)
-if(ENABLE_ASAN)
-  message(STATUS "Instrumenting with Address Sanitizer")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer")
-  set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope")
-endif()
-
-# NOTE: Running libzmq under TSAN doesn't make much sense -- synchronization in libzmq is to some extent
-# handled by the code "knowing" what threads are allowed to do, rather than by enforcing those
-# restrictions, so TSAN generates a lot of (presumably) false positives from libzmq.
-# The settings below are intended to enable libzmq to be built with minimal support for TSAN
-# such that it can be used along with other code that is also built with TSAN.
-option(ENABLE_TSAN "Build with thread sanitizer" OFF)
-if(ENABLE_TSAN)
-  message(STATUS "Instrumenting with Thread Sanitizer")
-  set(CMAKE_BUILD_TYPE "RelWithDebInfo")
-  set(TSAN_FLAGS "-fno-omit-frame-pointer -fsanitize=thread")
-  set(TSAN_CCFLAGS "${TSAN_CCFLAGS} -mllvm -tsan-instrument-memory-accesses=0")
-  set(TSAN_CCFLAGS "${TSAN_CCFLAGS} -mllvm -tsan-instrument-atomics=0")
-  set(TSAN_CCFLAGS "${TSAN_CCFLAGS} -mllvm -tsan-instrument-func-entry-exit=1")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TSAN_FLAGS} ${TSAN_CCFLAGS} -fPIE")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TSAN_FLAGS} ${TSAN_CCFLAGS} -fPIE")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${TSAN_FLAGS} -pie -Qunused-arguments")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TSAN_FLAGS} -pie -Qunused-arguments")
-endif()
-
-option(ENABLE_INTRINSICS "Build using compiler intrinsics for atomic ops" OFF)
-if(ENABLE_INTRINSICS)
-  message(STATUS "Using compiler intrinsics for atomic ops")
-  add_definitions(-DZMQ_HAVE_ATOMIC_INTRINSICS)
-endif()
-
-set(ZMQ_OUTPUT_BASENAME
-    "zmq"
-    CACHE STRING "Output zmq library base name")
-
-if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
-  # Find more information: https://cmake.org/Wiki/CMake_RPATH_handling
-
-  # Apply CMP0042: MACOSX_RPATH is enabled by default
-  cmake_policy(SET CMP0042 NEW)
-
-  # Add an install rpath if it is not a system directory
-  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir)
-  if("${isSystemDir}" STREQUAL "-1")
-    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-  endif()
-
-  # Add linker search paths pointing to external dependencies
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-endif()
-
-if (NOT MSVC)
-  if(NOT CMAKE_CXX_FLAGS MATCHES "-std=")
-    # use C++11 by default if supported
-    check_cxx_compiler_flag("-std=gnu++11" COMPILER_SUPPORTS_CXX11)
-    if(COMPILER_SUPPORTS_CXX11)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-    endif()
-  endif()
-  if(NOT CMAKE_C_FLAGS MATCHES "-std=")
-    check_c_compiler_flag("-std=gnu11" COMPILER_SUPPORTS_C11)
-    if(COMPILER_SUPPORTS_C11)
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
-    else()
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-    endif()
-  endif()
-
-  # clang 6 has a warning that does not make sense on multi-platform code
-  check_cxx_compiler_flag("-Wno-tautological-constant-compare" CXX_HAS_TAUT_WARNING)
-  if(CXX_HAS_TAUT_WARNING)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-constant-compare")
-  endif()
-  check_c_compiler_flag("-Wno-tautological-constant-compare" CC_HAS_TAUT_WARNING)
-  if(CC_HAS_TAUT_WARNING)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-tautological-constant-compare")
-  endif()
-endif()
-
-# Will be used to add flags to pkg-config useful when apps want to statically link
-set(pkg_config_libs_private "")
-set(pkg_config_names_private "")
-
-option(WITH_OPENPGM "Build with support for OpenPGM" OFF)
-option(WITH_VMCI "Build with support for VMware VMCI socket" OFF)
-
-if(APPLE)
-  option(ZMQ_BUILD_FRAMEWORK "Build as OS X framework" OFF)
-endif()
-
-if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-  message(STATUS "Build and install draft classes and methods")
-  option(ENABLE_DRAFTS "Build and install draft classes and methods" ON)
-else()
-  message(STATUS "Not building draft classes and methods")
-  option(ENABLE_DRAFTS "Build and install draft classes and methods" OFF)
-endif()
-
-# Enable WebSocket transport and RadixTree
-if(ENABLE_DRAFTS)
-  set(ZMQ_BUILD_DRAFT_API 1)
-  option(ENABLE_WS "Enable WebSocket transport" ON)
-  option(ENABLE_RADIX_TREE "Use radix tree implementation to manage subscriptions" ON)
-else()
-  option(ENABLE_WS "Enable WebSocket transport" OFF)
-  option(ENABLE_RADIX_TREE "Use radix tree implementation to manage subscriptions" OFF)
-endif()
-
-if(ENABLE_RADIX_TREE)
-  message(STATUS "Using radix tree implementation to manage subscriptions")
-  set(ZMQ_USE_RADIX_TREE 1)
-endif()
-
-if(ENABLE_WS)
-  list(
-    APPEND
-    sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_address.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_connecter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_decoder.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_encoder.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_engine.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_listener.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_address.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_connecter.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_decoder.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_encoder.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_engine.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_listener.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_protocol.hpp)
-  set(ZMQ_HAVE_WS 1)
-
-  message(STATUS "Enable WebSocket transport")
-
-  option(WITH_TLS "Use TLS for WSS support" ON)
-  option(WITH_NSS "Use NSS instead of builtin sha1" OFF)
-
-  if(WITH_TLS)
-    find_package("GnuTLS" 3.6.7)
-    if(GNUTLS_FOUND)
-      set(pkg_config_names_private "${pkg_config_names_private} gnutls")
-      list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/src/wss_address.hpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/src/wss_address.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/wss_engine.hpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/src/wss_engine.cpp)
-
-      message(STATUS "Enable WSS transport")
-      set(ZMQ_USE_GNUTLS 1)
-      set(ZMQ_HAVE_WSS 1)
-    else()
-      message(WARNING "No WSS support, you may want to install GnuTLS and run cmake again")
-    endif()
-  endif()
-endif()
-
-if(NOT ZMQ_USE_GNUTLS)
-  if(WITH_NSS)
-    pkg_check_modules(NSS3 "nss")
-    if(NSS3_FOUND)
-      set(pkg_config_names_private "${pkg_config_names_private} nss")
-      message(STATUS "Using NSS")
-      set(ZMQ_USE_NSS 1)
-    else()
-      find_package("NSS3")
-      if(NSS3_FOUND)
-        set(pkg_config_libs_private "${pkg_config_libs_private} -lnss3")
-        message(STATUS "Using NSS")
-        set(ZMQ_USE_NSS 1)
-      else()
-        message(WARNING "No nss installed, if you don't want builtin SHA1, install NSS or GnuTLS")
-      endif()
-    endif()
-  endif()
-  if(NOT ZMQ_USE_NSS)
-    list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/external/sha1/sha1.c
-         ${CMAKE_CURRENT_SOURCE_DIR}/external/sha1/sha1.h)
-    message(STATUS "Using builtin sha1")
-    set(ZMQ_USE_BUILTIN_SHA1 1)
-  endif()
-endif()
-
-if(NOT MSVC)
-  option(WITH_LIBBSD "Use libbsd instead of builtin strlcpy" ON)
-  if(WITH_LIBBSD)
-    pkg_check_modules(LIBBSD "libbsd")
-    if(LIBBSD_FOUND)
-      message(STATUS "Using libbsd")
-      set(pkg_config_names_private "${pkg_config_names_private} libbsd")
-      set(ZMQ_HAVE_LIBBSD 1)
-    endif()
-  endif()
-  if(NOT WITH_LIBBSD OR NOT LIBBSD_FOUND)
-    check_cxx_symbol_exists(strlcpy string.h ZMQ_HAVE_STRLCPY)
-  endif()
-endif()
-
-# Select curve encryption library, defaults to tweetnacl To use libsodium instead, use --with-libsodium(must be
-# installed) To disable curve, use --disable-curve
-
-option(WITH_LIBSODIUM "Use libsodium instead of built-in tweetnacl" ON)
-option(WITH_LIBSODIUM_STATIC "Use static libsodium library" OFF)
-option(ENABLE_CURVE "Enable CURVE security" ON)
-
-if(ENABLE_CURVE)
-  if(WITH_LIBSODIUM)
-    find_package("Sodium")
-    if(SODIUM_FOUND)
-      message(STATUS "Using libsodium for CURVE security")
-      include_directories(${SODIUM_INCLUDE_DIRS})
-      if(WITH_LIBSODIUM_STATIC)
-        add_compile_definitions(SODIUM_STATIC)
-      endif()
-      set(ZMQ_USE_LIBSODIUM 1)
-      set(ZMQ_HAVE_CURVE 1)
-    else()
-      message(
-        WARNING
-          "libsodium not installed, instead using builtin tweetnacl, you may want to install libsodium and run cmake again"
-      )
-    endif()
-  endif()
-  if(NOT ZMQ_HAVE_CURVE)
-    message(STATUS "Using tweetnacl for CURVE security")
-    list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/src/tweetnacl.c)
-    set(ZMQ_USE_TWEETNACL 1)
-    set(ZMQ_HAVE_CURVE 1)
-  endif()
-else()
-  message(STATUS "CURVE security is disabled")
-endif()
-
-set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-
-option(WITH_MILITANT "Enable militant assertions" OFF)
-if(WITH_MILITANT)
-  add_definitions(-DZMQ_ACT_MILITANT)
-endif()
-
-set(API_POLLER
-    ""
-    CACHE STRING "Choose polling system for zmq_poll(er)_*. valid values are
-  poll or select [default=poll unless POLLER=select]")
-
-set(POLLER
-    ""
-    CACHE STRING "Choose polling system for I/O threads. valid values are
-  kqueue, epoll, devpoll, pollset, poll or select [default=autodetect]")
-
-if(WIN32)
-  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND CMAKE_SYSTEM_VERSION MATCHES "^10.0")
-    set(ZMQ_HAVE_WINDOWS_UWP ON)
-    set(ZMQ_HAVE_IPC OFF)
-    # to remove compile warninging "D9002 ignoring unknown option"
-    string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-    set(CMAKE_CXX_FLAGS_DEBUG
-        ${CMAKE_CXX_FLAGS_DEBUG}
-        CACHE STRING "" FORCE)
-    string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-        ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-        CACHE STRING "" FORCE)
-    string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-  endif()
-  # from https://stackoverflow.com/a/40217291/2019765
-  macro(get_WIN32_WINNT version)
-    if(CMAKE_SYSTEM_VERSION)
-      set(ver ${CMAKE_SYSTEM_VERSION})
-      string(REGEX MATCH "^([0-9]+).([0-9])" ver ${ver})
-      string(REGEX MATCH "^([0-9]+)" verMajor ${ver})
-      # Check for Windows 10, b/c we'll need to convert to hex 'A'.
-      if("${verMajor}" MATCHES "10")
-        set(verMajor "A")
-        string(REGEX REPLACE "^([0-9]+)" ${verMajor} ver ${ver})
-      endif("${verMajor}" MATCHES "10")
-      # Remove all remaining '.' characters.
-      string(REPLACE "." "" ver ${ver})
-      # Prepend each digit with a zero.
-      string(REGEX REPLACE "([0-9A-Z])" "0\\1" ver ${ver})
-      set(${version} "0x${ver}")
-    endif(CMAKE_SYSTEM_VERSION)
-  endmacro(get_WIN32_WINNT)
-
-  get_win32_winnt(ZMQ_WIN32_WINNT_DEFAULT)
-  message(STATUS "Detected _WIN32_WINNT from CMAKE_SYSTEM_VERSION: ${ZMQ_WIN32_WINNT_DEFAULT}")
-
-  # TODO limit _WIN32_WINNT to the actual Windows SDK version, which might be different from the default version
-  # installed with Visual Studio
-  if(MSVC_VERSION STREQUAL "1500" AND CMAKE_SYSTEM_VERSION VERSION_GREATER "6.0")
-    set(ZMQ_WIN32_WINNT_LIMIT "0x0600")
-  elseif(MSVC_VERSION STREQUAL "1600" AND CMAKE_SYSTEM_VERSION VERSION_GREATER "6.1")
-    set(ZMQ_WIN32_WINNT_LIMIT "0x0601")
-  elseif(MSVC_VERSION STREQUAL "1700" AND CMAKE_SYSTEM_VERSION VERSION_GREATER "6.1")
-    set(ZMQ_WIN32_WINNT_LIMIT "0x0601")
-  elseif(MSVC_VERSION STREQUAL "1800" AND CMAKE_SYSTEM_VERSION VERSION_GREATER "6.2")
-    set(ZMQ_WIN32_WINNT_LIMIT "0x0602")
-  endif()
-  if(ZMQ_WIN32_WINNT_LIMIT)
-    message(
-      STATUS
-        "Mismatch of Visual Studio Version (${MSVC_VERSION}) and CMAKE_SYSTEM_VERSION (${CMAKE_SYSTEM_VERSION}), limiting _WIN32_WINNT to ${ZMQ_WIN32_WINNT_LIMIT}, you may override this by setting ZMQ_WIN32_WINNT"
-    )
-    set(ZMQ_WIN32_WINNT_DEFAULT "${ZMQ_WIN32_WINNT_LIMIT}")
-  endif()
-
-  set(ZMQ_WIN32_WINNT
-      "${ZMQ_WIN32_WINNT_DEFAULT}"
-      CACHE STRING "Value to set _WIN32_WINNT to for building [default=autodetect from build environment]")
-
-  # On Windows Vista or greater, with MSVC 2013 or greater, default to epoll (which is required on Win 10 for ipc
-  # support)
-  if(ZMQ_WIN32_WINNT GREATER "0x05FF"
-     AND MSVC_VERSION GREATER 1799
-     AND POLLER STREQUAL ""
-     AND NOT ZMQ_HAVE_WINDOWS_UWP)
-    set(POLLER "epoll")
-  endif()
-
-  add_definitions(-D_WIN32_WINNT=${ZMQ_WIN32_WINNT})
-endif(WIN32)
-
-if(NOT MSVC)
-  if(POLLER STREQUAL "")
-    check_cxx_symbol_exists(kqueue sys/event.h HAVE_KQUEUE)
-    if(HAVE_KQUEUE)
-      set(POLLER "kqueue")
-    endif()
-  endif()
-
-  if(POLLER STREQUAL "")
-    check_cxx_symbol_exists(epoll_create sys/epoll.h HAVE_EPOLL)
-    if(HAVE_EPOLL)
-      set(POLLER "epoll")
-      check_cxx_symbol_exists(epoll_create1 sys/epoll.h HAVE_EPOLL_CLOEXEC)
-      if(HAVE_EPOLL_CLOEXEC)
-        set(ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC 1)
-      endif()
-    endif()
-  endif()
-
-  if(POLLER STREQUAL "")
-    set(CMAKE_EXTRA_INCLUDE_FILES sys/devpoll.h)
-    check_type_size("struct pollfd" DEVPOLL)
-    set(CMAKE_EXTRA_INCLUDE_FILES)
-    if(HAVE_DEVPOLL)
-      set(POLLER "devpoll")
-    endif()
-  endif()
-
-  if(POLLER STREQUAL "")
-    check_cxx_symbol_exists(pollset_create sys/pollset.h HAVE_POLLSET)
-    if(HAVE_POLLSET)
-      set(POLLER "pollset")
-    endif()
-  endif()
-
-  if(POLLER STREQUAL "")
-    check_cxx_symbol_exists(poll poll.h HAVE_POLL)
-    if(HAVE_POLL)
-      set(POLLER "poll")
-    endif()
-  endif()
-endif()
-
-if(POLLER STREQUAL "")
-  if(WIN32)
-    set(HAVE_SELECT 1)
-  else()
-    check_cxx_symbol_exists(select sys/select.h HAVE_SELECT)
-  endif()
-  if(HAVE_SELECT)
-    set(POLLER "select")
-  else()
-    message(FATAL_ERROR "Could not autodetect polling method")
-  endif()
-endif()
-
-if(POLLER STREQUAL "kqueue"
-   OR POLLER STREQUAL "epoll"
-   OR POLLER STREQUAL "devpoll"
-   OR POLLER STREQUAL "pollset"
-   OR POLLER STREQUAL "poll"
-   OR POLLER STREQUAL "select")
-  message(STATUS "Using polling method in I/O threads: ${POLLER}")
-  string(TOUPPER ${POLLER} UPPER_POLLER)
-  set(ZMQ_IOTHREAD_POLLER_USE_${UPPER_POLLER} 1)
-else()
-  message(FATAL_ERROR "Invalid polling method")
-endif()
-
-if(POLLER STREQUAL "epoll" AND WIN32)
-  message(STATUS "Including wepoll")
-  list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/external/wepoll/wepoll.c
-       ${CMAKE_CURRENT_SOURCE_DIR}/external/wepoll/wepoll.h)
-endif()
-
-if(API_POLLER STREQUAL "")
-  if(POLLER STREQUAL "select")
-    set(API_POLLER "select")
-  else()
-    set(API_POLLER "poll")
-  endif()
-endif()
-
-message(STATUS "Using polling method in zmq_poll(er)_* API: ${API_POLLER}")
-string(TOUPPER ${API_POLLER} UPPER_API_POLLER)
-set(ZMQ_POLL_BASED_ON_${UPPER_API_POLLER} 1)
-
-execute_process(
-  COMMAND getconf LEVEL1_DCACHE_LINESIZE
-  OUTPUT_VARIABLE CACHELINE_SIZE
-  ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-if(CACHELINE_SIZE STREQUAL ""
-   OR CACHELINE_SIZE EQUAL 0
-   OR CACHELINE_SIZE EQUAL -1)
-  set(ZMQ_CACHELINE_SIZE 64)
-else()
-  set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE})
-endif()
-message(STATUS "Using ${ZMQ_CACHELINE_SIZE} bytes alignment for lock-free data structures")
-
-if(NOT CYGWIN)
-  # TODO cannot we simply do 'if(WIN32) set(ZMQ_HAVE_WINDOWS ON)' or similar?
-  check_include_files(windows.h ZMQ_HAVE_WINDOWS)
-endif()
-
-if(NOT WIN32)
-  set(ZMQ_HAVE_IPC 1)
-else()
-  check_include_files("winsock2.h;afunix.h" ZMQ_HAVE_IPC)
-endif()
-
-# ##################### BEGIN condition_variable_t selection
-if(NOT ZMQ_CV_IMPL)
-  # prefer C++11 STL std::condition_variable implementation, if available
-  check_include_files(condition_variable ZMQ_HAVE_STL_CONDITION_VARIABLE LANGUAGE CXX)
-
-  if(ZMQ_HAVE_STL_CONDITION_VARIABLE)
-    set(ZMQ_CV_IMPL_DEFAULT "stl11")
-  else()
-    if(WIN32 AND NOT CMAKE_SYSTEM_VERSION VERSION_LESS "6.0")
-      # Win32API CONDITION_VARIABLE is supported from Windows Vista only
-      set(ZMQ_CV_IMPL_DEFAULT "win32api")
-    elseif(CMAKE_USE_PTHREADS_INIT)
-      set(ZMQ_CV_IMPL_DEFAULT "pthreads")
-    else()
-      set(ZMQ_CV_IMPL_DEFAULT "none")
-    endif()
-  endif()
-
-  # TODO a vxworks implementation also exists, but vxworks is not currently supported with cmake at all
-  set(ZMQ_CV_IMPL
-      "${ZMQ_CV_IMPL_DEFAULT}"
-      CACHE STRING "Choose condition_variable_t implementation. Valid values are
-       stl11, win32api, pthreads, none [default=autodetect]")
-endif()
-
-message(STATUS "Using condition_variable_t implementation: ${ZMQ_CV_IMPL}")
-if(ZMQ_CV_IMPL STREQUAL "stl11")
-  set(ZMQ_USE_CV_IMPL_STL11 1)
-elseif(ZMQ_CV_IMPL STREQUAL "win32api")
-  set(ZMQ_USE_CV_IMPL_WIN32API 1)
-elseif(ZMQ_CV_IMPL STREQUAL "pthreads")
-  set(ZMQ_USE_CV_IMPL_PTHREADS 1)
-elseif(ZMQ_CV_IMPL STREQUAL "none")
-  set(ZMQ_USE_CV_IMPL_NONE 1)
-else()
-  message(ERROR "Unknown value for ZMQ_CV_IMPL: ${ZMQ_CV_IMPL}")
-endif()
-# ##################### END condition_variable_t selection
-
-if(NOT MSVC)
-  check_include_files(ifaddrs.h ZMQ_HAVE_IFADDRS)
-  check_include_files(sys/uio.h ZMQ_HAVE_UIO)
-  check_include_files(sys/eventfd.h ZMQ_HAVE_EVENTFD)
-  if(ZMQ_HAVE_EVENTFD AND NOT CMAKE_CROSSCOMPILING)
-    zmq_check_efd_cloexec()
-  endif()
-endif()
-
-if(ZMQ_HAVE_WINDOWS)
-  # Cannot use check_library_exists because the symbol is always declared as char(*)(void)
-  set(CMAKE_REQUIRED_LIBRARIES "ws2_32.lib")
-  check_cxx_symbol_exists(WSAStartup "winsock2.h" HAVE_WS2_32)
-
-  set(CMAKE_REQUIRED_LIBRARIES "rpcrt4.lib")
-  check_cxx_symbol_exists(UuidCreateSequential "rpc.h" HAVE_RPCRT4)
-
-  set(CMAKE_REQUIRED_LIBRARIES "iphlpapi.lib")
-  check_cxx_symbol_exists(GetAdaptersAddresses "winsock2.h;iphlpapi.h" HAVE_IPHLAPI)
-
-  set(CMAKE_REQUIRED_LIBRARIES "")
-  # TODO: This not the symbol we're looking for. What is the symbol?
-  check_library_exists(ws2 fopen "" HAVE_WS2)
-else()
-  check_cxx_symbol_exists(SO_PEERCRED sys/socket.h ZMQ_HAVE_SO_PEERCRED)
-  check_cxx_symbol_exists(LOCAL_PEERCRED sys/socket.h ZMQ_HAVE_LOCAL_PEERCRED)
-endif()
-
-if(NOT MINGW)
-  find_library(RT_LIBRARY rt)
-  if(RT_LIBRARY)
-    set(pkg_config_libs_private "${pkg_config_libs_private} -lrt")
-  endif()
-endif()
-
-find_package(Threads)
-
-if(WIN32 AND NOT CYGWIN)
-  if(NOT HAVE_WS2_32 AND NOT HAVE_WS2)
-    message(FATAL_ERROR "Cannot link to ws2_32 or ws2")
-  endif()
-
-  if(NOT HAVE_RPCRT4)
-    message(FATAL_ERROR "Cannot link to rpcrt4")
-  endif()
-
-  if(NOT HAVE_IPHLAPI)
-    message(FATAL_ERROR "Cannot link to iphlapi")
-  endif()
-endif()
-
-if(NOT MSVC)
-  set(CMAKE_REQUIRED_LIBRARIES rt)
-  check_cxx_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME)
-  set(CMAKE_REQUIRED_LIBRARIES)
-
-  check_cxx_symbol_exists(fork unistd.h HAVE_FORK)
-  check_cxx_symbol_exists(gethrtimei sys/time.h HAVE_GETHRTIME)
-  check_cxx_symbol_exists(mkdtemp stdlib.h HAVE_MKDTEMP)
-  check_cxx_symbol_exists(accept4 sys/socket.h HAVE_ACCEPT4)
-  check_cxx_symbol_exists(strnlen string.h HAVE_STRNLEN)
-else()
-  set(HAVE_STRNLEN 1)
-endif()
-
-add_definitions(-D_REENTRANT -D_THREAD_SAFE)
-add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
-
-option(ENABLE_EVENTFD "Enable/disable eventfd" ZMQ_HAVE_EVENTFD)
-
-macro(zmq_check_cxx_flag_prepend flag)
-  check_cxx_compiler_flag("${flag}" HAVE_FLAG_${flag})
-
-  if(HAVE_FLAG_${flag})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-  endif()
-endmacro()
-
-option(ENABLE_ANALYSIS "Build with static analysis(make take very long)" OFF)
-
-if(MSVC)
-  if(ENABLE_ANALYSIS)
-    zmq_check_cxx_flag_prepend("/W4")
-
-    zmq_check_cxx_flag_prepend("/analyze")
-
-    # C++11/14/17-specific, but maybe possible via conditional defines
-    zmq_check_cxx_flag_prepend("/wd26440") # Function '...' can be declared 'noexcept'
-    zmq_check_cxx_flag_prepend("/wd26432") # If you define or delete any default operation in the type '...', define or
-                                           # delete them all
-    zmq_check_cxx_flag_prepend("/wd26439") # This kind of function may not throw. Declare it 'noexcept'
-    zmq_check_cxx_flag_prepend("/wd26447") # The function is declared 'noexcept' but calls function '...' which may
-                                           # throw exceptions
-    zmq_check_cxx_flag_prepend("/wd26433") # Function '...' should be marked with 'override'
-    zmq_check_cxx_flag_prepend("/wd26409") # Avoid calling new and delete explicitly, use std::make_unique<T> instead
-    # Requires GSL
-    zmq_check_cxx_flag_prepend("/wd26429") # Symbol '...' is never tested for nullness, it can be marked as not_null
-    zmq_check_cxx_flag_prepend("/wd26446") # Prefer to use gsl::at()
-    zmq_check_cxx_flag_prepend("/wd26481") # Don't use pointer arithmetic. Use span instead
-    zmq_check_cxx_flag_prepend("/wd26472") # Don't use a static_cast for arithmetic conversions. Use brace
-                                           # initialization, gsl::narrow_cast or gsl::narow
-    zmq_check_cxx_flag_prepend("/wd26448") # Consider using gsl::finally if final action is intended
-    zmq_check_cxx_flag_prepend("/wd26400") # Do not assign the result of an allocation or a function call with an
-                                           # owner<T> return value to a raw pointer, use owner<T> instead
-    zmq_check_cxx_flag_prepend("/wd26485") # Expression '...': No array to pointer decay(bounds.3)
-  else()
-    zmq_check_cxx_flag_prepend("/W3")
-  endif()
-
-  if(MSVC_IDE)
-    set(MSVC_TOOLSET "-${CMAKE_VS_PLATFORM_TOOLSET}")
-  else()
-    set(MSVC_TOOLSET "")
-  endif()
-else()
-  zmq_check_cxx_flag_prepend("-Wall")
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  zmq_check_cxx_flag_prepend("-Wextra")
-endif()
-
-option(LIBZMQ_PEDANTIC "" ON)
-option(LIBZMQ_WERROR "" OFF)
-
-# TODO: why is -Wno-long-long defined differently than in configure.ac?
-if(NOT MSVC)
-  zmq_check_cxx_flag_prepend("-Wno-long-long")
-  zmq_check_cxx_flag_prepend("-Wno-uninitialized")
-
-  if(LIBZMQ_PEDANTIC)
-    zmq_check_cxx_flag_prepend("-pedantic")
-
-    if(${CMAKE_CXX_COMPILER_ID} MATCHES "Intel")
-      zmq_check_cxx_flag_prepend("-strict-ansi")
-    endif()
-
-    if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
-      zmq_check_cxx_flag_prepend("-compat=5")
-    endif()
-  endif()
-endif()
-
-if(LIBZMQ_WERROR)
-  if(MSVC)
-    zmq_check_cxx_flag_prepend("/WX")
-  else()
-    zmq_check_cxx_flag_prepend("-Werror")
-    if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-      zmq_check_cxx_flag_prepend("-errwarn=%all")
-    endif()
-  endif()
-endif()
-
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
-  zmq_check_cxx_flag_prepend("-mcpu=v9")
-endif()
-
-if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
-  zmq_check_cxx_flag_prepend("-features=zla")
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "SunOS"
-   OR CMAKE_SYSTEM_NAME MATCHES "NetBSD"
-   OR CMAKE_SYSTEM_NAME MATCHES "QNX")
-  message(STATUS "Checking whether atomic operations can be used")
-  check_c_source_compiles(
-    "\
-  #include <atomic.h> \
-  \
-  int main() \
-  { \
-    uint32_t value; \
-    atomic_cas_32(&value, 0, 0); \
-    return 0; \
-  } \
-  "
-    HAVE_ATOMIC_H)
-
-  if(NOT HAVE_ATOMIC_H)
-    set(ZMQ_FORCE_MUTEXES 1)
-  endif()
-endif()
-
-if(NOT ANDROID)
-  zmq_check_noexcept()
-endif()
-
-# -----------------------------------------------------------------------------
-if(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)
-  zmq_check_sock_cloexec()
-  zmq_check_o_cloexec()
-  zmq_check_so_bindtodevice()
-  zmq_check_so_keepalive()
-  zmq_check_tcp_keepcnt()
-  zmq_check_tcp_keepidle()
-  zmq_check_tcp_keepintvl()
-  zmq_check_tcp_keepalive()
-  zmq_check_tcp_tipc()
-  zmq_check_pthread_setname()
-  zmq_check_pthread_setaffinity()
-  zmq_check_getrandom()
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "Linux"
-   OR CMAKE_SYSTEM_NAME MATCHES "GNU/kFreeBSD"
-   OR CMAKE_SYSTEM_NAME MATCHES "GNU/Hurd"
-   OR CYGWIN)
-  add_definitions(-D_GNU_SOURCE)
-elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-  add_definitions(-D__BSD_VISIBLE)
-elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-  add_definitions(-D_NETBSD_SOURCE)
-elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-  add_definitions(-D_OPENBSD_SOURCE)
-elseif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-  add_definitions(-D_PTHREADS)
-elseif(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-  add_definitions(-D_POSIX_C_SOURCE=200112L)
-  zmq_check_cxx_flag_prepend(-Ae)
-elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  add_definitions(-D_DARWIN_C_SOURCE)
-endif()
-
-find_package(AsciiDoc)
-
-cmake_dependent_option(WITH_DOC "Build Reference Guide documentation(requires DocBook)" ON "ASCIIDOC_FOUND;NOT WIN32"
-                       OFF) # Do not build docs on Windows due to issues with symlinks
-
-if(MSVC)
-  if(WITH_OPENPGM)
-    # set(OPENPGM_ROOT "" CACHE PATH "Location of OpenPGM")
-    set(OPENPGM_VERSION_MAJOR 5)
-    set(OPENPGM_VERSION_MINOR 2)
-    set(OPENPGM_VERSION_MICRO 122)
-    if(CMAKE_CL_64)
-      find_path(
-        OPENPGM_ROOT include/pgm/pgm.h
-        PATHS
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
-        NO_DEFAULT_PATH)
-      message(STATUS "OpenPGM x64 detected - ${OPENPGM_ROOT}")
-    else()
-      find_path(
-        OPENPGM_ROOT include/pgm/pgm.h
-        PATHS
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
-          NO_DEFAULT_PATH)
-      message(STATUS "OpenPGM x86 detected - ${OPENPGM_ROOT}")
-    endif()
-    set(OPENPGM_INCLUDE_DIRS ${OPENPGM_ROOT}/include)
-    set(OPENPGM_LIBRARY_DIRS ${OPENPGM_ROOT}/lib)
-    set(OPENPGM_LIBRARIES
-        optimized
-        libpgm${MSVC_TOOLSET}-mt-${OPENPGM_VERSION_MAJOR}_${OPENPGM_VERSION_MINOR}_${OPENPGM_VERSION_MICRO}.lib debug
-        libpgm${MSVC_TOOLSET}-mt-gd-${OPENPGM_VERSION_MAJOR}_${OPENPGM_VERSION_MINOR}_${OPENPGM_VERSION_MICRO}.lib)
-  endif()
-else()
-  if(WITH_OPENPGM)
-    # message(FATAL_ERROR "WITH_OPENPGM not implemented")
-
-    if(NOT OPENPGM_PKGCONFIG_NAME)
-      set(OPENPGM_PKGCONFIG_NAME "openpgm-5.2")
-    endif()
-
-    set(OPENPGM_PKGCONFIG_NAME
-        ${OPENPGM_PKGCONFIG_NAME}
-        CACHE STRING "Name pkg-config shall use to find openpgm libraries and include paths" FORCE)
-
-    pkg_check_modules(OPENPGM ${OPENPGM_PKGCONFIG_NAME})
-
-    if(OPENPGM_FOUND)
-      message(STATUS ${OPENPGM_PKGCONFIG_NAME}" found")
-      set(pkg_config_names_private "${pkg_config_names_private} ${OPENPGM_PKGCONFIG_NAME}")
-    else()
-      message(
-        FATAL_ERROR
-          ${OPENPGM_PKGCONFIG_NAME}"  not found. openpgm is searchd via `pkg-config ${OPENPGM_PKGCONFIG_NAME}`. Consider providing a valid OPENPGM_PKGCONFIG_NAME"
-      )
-    endif()
-
-    # DSO symbol visibility for openpgm
-    if(HAVE_FLAG_VISIBILITY_HIDDEN)
-
-    elseif(HAVE_FLAG_LDSCOPE_HIDDEN)
-
-    endif()
-  endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# force off-tree build
-
-if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
-  message(
-    FATAL_ERROR
-      "CMake generation is not allowed within the source directory! \
-    Remove the CMakeCache.txt file and try again from another folder, e.g.: \
-    \
-      rm CMakeCache.txt \
-      mkdir cmake-make \
-      cd cmake-make \
-      cmake ..")
-endif()
-
-# -----------------------------------------------------------------------------
-# default to Release build
-
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  # CMAKE_BUILD_TYPE is not used for multi-configuration generators like Visual Studio/XCode which instead use
-  # CMAKE_CONFIGURATION_TYPES
-  set(CMAKE_BUILD_TYPE
-      Release
-      CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
-endif()
-
-# -----------------------------------------------------------------------------
-# output directories
-
-zmq_set_with_default(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${ZeroMQ_BINARY_DIR}/bin")
-if(UNIX)
-  set(zmq_library_directory "lib")
-else()
-  set(zmq_library_directory "bin")
-endif()
-zmq_set_with_default(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ZeroMQ_BINARY_DIR}/${zmq_library_directory}")
-zmq_set_with_default(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${ZeroMQ_BINARY_DIR}/lib")
-
-# -----------------------------------------------------------------------------
-# platform specifics
-
-if(WIN32)
-  # Socket limit is 16K(can be raised arbitrarily)
-  add_definitions(-DFD_SETSIZE=16384)
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-  add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
-endif()
-
-if(MSVC)
-  # Parallel make.
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
-
-  # Compile the static lib with debug information included note: we assume here that the default flags contain some /Z
-  # flag
-  string(REGEX REPLACE "/Z.[^:]" "/Z7 " CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-  string(REGEX REPLACE "/Z.[^:]" "/Z7 " CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-
-  # Optimization flags. http://msdn.microsoft.com/en-us/magazine/cc301698.aspx
-  if(NOT ${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GL")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /LTCG")
-  endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# source files
-
-set(cxx-sources
-    precompiled.cpp
-    address.cpp
-    channel.cpp
-    client.cpp
-    clock.cpp
-    ctx.cpp
-    curve_mechanism_base.cpp
-    curve_client.cpp
-    curve_server.cpp
-    dealer.cpp
-    devpoll.cpp
-    dgram.cpp
-    dist.cpp
-    endpoint.cpp
-    epoll.cpp
-    err.cpp
-    fq.cpp
-    io_object.cpp
-    io_thread.cpp
-    ip.cpp
-    ipc_address.cpp
-    ipc_connecter.cpp
-    ipc_listener.cpp
-    kqueue.cpp
-    lb.cpp
-    mailbox.cpp
-    mailbox_safe.cpp
-    mechanism.cpp
-    mechanism_base.cpp
-    metadata.cpp
-    msg.cpp
-    mtrie.cpp
-    norm_engine.cpp
-    object.cpp
-    options.cpp
-    own.cpp
-    null_mechanism.cpp
-    pair.cpp
-    peer.cpp
-    pgm_receiver.cpp
-    pgm_sender.cpp
-    pgm_socket.cpp
-    pipe.cpp
-    plain_client.cpp
-    plain_server.cpp
-    poll.cpp
-    poller_base.cpp
-    polling_util.cpp
-    pollset.cpp
-    proxy.cpp
-    pub.cpp
-    pull.cpp
-    push.cpp
-    random.cpp
-    raw_encoder.cpp
-    raw_decoder.cpp
-    raw_engine.cpp
-    reaper.cpp
-    rep.cpp
-    req.cpp
-    router.cpp
-    select.cpp
-    server.cpp
-    session_base.cpp
-    signaler.cpp
-    socket_base.cpp
-    socks.cpp
-    socks_connecter.cpp
-    stream.cpp
-    stream_engine_base.cpp
-    sub.cpp
-    tcp.cpp
-    tcp_address.cpp
-    tcp_connecter.cpp
-    tcp_listener.cpp
-    thread.cpp
-    trie.cpp
-    radix_tree.cpp
-    v1_decoder.cpp
-    v1_encoder.cpp
-    v2_decoder.cpp
-    v2_encoder.cpp
-    v3_1_encoder.cpp
-    xpub.cpp
-    xsub.cpp
-    zmq.cpp
-    zmq_utils.cpp
-    decoder_allocators.cpp
-    socket_poller.cpp
-    timers.cpp
-    config.hpp
-    radio.cpp
-    dish.cpp
-    udp_engine.cpp
-    udp_address.cpp
-    scatter.cpp
-    gather.cpp
-    ip_resolver.cpp
-    zap_client.cpp
-    zmtp_engine.cpp
-    # at least for VS, the header files must also be listed
-    address.hpp
-    array.hpp
-    atomic_counter.hpp
-    atomic_ptr.hpp
-    blob.hpp
-    channel.hpp
-    client.hpp
-    clock.hpp
-    command.hpp
-    condition_variable.hpp
-    config.hpp
-    ctx.hpp
-    curve_client.hpp
-    curve_client_tools.hpp
-    curve_mechanism_base.hpp
-    curve_server.hpp
-    dbuffer.hpp
-    dealer.hpp
-    decoder.hpp
-    decoder_allocators.hpp
-    devpoll.hpp
-    dgram.hpp
-    dish.hpp
-    dist.hpp
-    encoder.hpp
-    endpoint.hpp
-    epoll.hpp
-    err.hpp
-    fd.hpp
-    fq.hpp
-    gather.hpp
-    generic_mtrie.hpp
-    generic_mtrie_impl.hpp
-    gssapi_client.hpp
-    gssapi_mechanism_base.hpp
-    gssapi_server.hpp
-    i_decoder.hpp
-    i_encoder.hpp
-    i_engine.hpp
-    i_mailbox.hpp
-    i_poll_events.hpp
-    io_object.hpp
-    io_thread.hpp
-    ip.hpp
-    ipc_address.hpp
-    ipc_connecter.hpp
-    ipc_listener.hpp
-    kqueue.hpp
-    lb.hpp
-    likely.hpp
-    macros.hpp
-    mailbox.hpp
-    mailbox_safe.hpp
-    mechanism.hpp
-    mechanism_base.hpp
-    metadata.hpp
-    msg.hpp
-    mtrie.hpp
-    mutex.hpp
-    norm_engine.hpp
-    null_mechanism.hpp
-    object.hpp
-    options.hpp
-    own.hpp
-    pair.hpp
-    peer.hpp
-    pgm_receiver.hpp
-    pgm_sender.hpp
-    pgm_socket.hpp
-    pipe.hpp
-    plain_client.hpp
-    plain_common.hpp
-    plain_server.hpp
-    poll.hpp
-    poller.hpp
-    poller_base.hpp
-    polling_util.hpp
-    pollset.hpp
-    precompiled.hpp
-    proxy.hpp
-    pub.hpp
-    pull.hpp
-    push.hpp
-    radio.hpp
-    random.hpp
-    raw_decoder.hpp
-    raw_encoder.hpp
-    raw_engine.hpp
-    reaper.hpp
-    rep.hpp
-    req.hpp
-    router.hpp
-    scatter.hpp
-    secure_allocator.hpp
-    select.hpp
-    server.hpp
-    session_base.hpp
-    signaler.hpp
-    socket_base.hpp
-    socket_poller.hpp
-    socks.hpp
-    socks_connecter.hpp
-    stdint.hpp
-    stream.hpp
-    stream_engine_base.hpp
-    stream_connecter_base.hpp
-    stream_connecter_base.cpp
-    stream_listener_base.hpp
-    stream_listener_base.cpp
-    sub.hpp
-    tcp.hpp
-    tcp_address.hpp
-    tcp_connecter.hpp
-    tcp_listener.hpp
-    thread.hpp
-    timers.hpp
-    tipc_address.hpp
-    tipc_connecter.hpp
-    tipc_listener.hpp
-    trie.hpp
-    udp_address.hpp
-    udp_engine.hpp
-    v1_decoder.hpp
-    v1_encoder.hpp
-    v2_decoder.hpp
-    v2_encoder.hpp
-    v3_1_encoder.hpp
-    v2_protocol.hpp
-    vmci.hpp
-    vmci_address.hpp
-    vmci_connecter.hpp
-    vmci_listener.hpp
-    windows.hpp
-    wire.hpp
-    xpub.hpp
-    xsub.hpp
-    ypipe.hpp
-    ypipe_base.hpp
-    ypipe_conflate.hpp
-    yqueue.hpp
-    zap_client.hpp
-    zmtp_engine.hpp)
-
-if(MINGW)
-  # Generate the right type when using -m32 or -m64
-  macro(set_rc_arch rc_target)
-    set(CMAKE_RC_COMPILER_INIT windres)
-    enable_language(RC)
-    set(CMAKE_RC_COMPILE_OBJECT
-        "<CMAKE_RC_COMPILER> <FLAGS> -O coff --target=${rc_target} <DEFINES> -i <SOURCE> -o <OBJECT>")
-  endmacro()
-
-  if(NOT CMAKE_SYSTEM_PROCESSOR)
-    set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR})
-  endif()
-
-  # Also happens on x86_64 systems...what a worthless variable
-  if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "i486"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "i586"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
-
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      set_rc_arch("pe-x86-64")
-    else()
-      set_rc_arch("pe-i386")
-    endif()
-  endif()
-endif()
-
-set(public_headers include/zmq.h include/zmq_utils.h)
-
-set(readme-docs AUTHORS COPYING COPYING.LESSER NEWS)
-
-# -----------------------------------------------------------------------------
-# optional modules
-
-if(WITH_OPENPGM)
-  add_definitions(-DZMQ_HAVE_OPENPGM)
-  include_directories(${OPENPGM_INCLUDE_DIRS})
-  link_directories(${OPENPGM_LIBRARY_DIRS})
-  set(OPTIONAL_LIBRARIES ${OPENPGM_LIBRARIES})
-endif()
-
-if(WITH_VMCI)
-  add_definitions(-DZMQ_HAVE_VMCI)
-  include_directories(${VMCI_INCLUDE_DIRS})
-  list(APPEND cxx-sources vmci_address.cpp vmci_connecter.cpp vmci_listener.cpp vmci.cpp)
-endif()
-
-if(ZMQ_HAVE_TIPC)
-  list(APPEND cxx-sources tipc_address.cpp tipc_connecter.cpp tipc_listener.cpp)
-endif()
-
-# -----------------------------------------------------------------------------
-# source generators
-
-foreach(source ${cxx-sources})
-  list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/src/${source})
-endforeach()
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-
-# Delete any src/platform.hpp left by configure
-file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/src/platform.hpp)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/platform.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/platform.hpp)
-list(APPEND sources ${CMAKE_CURRENT_BINARY_DIR}/platform.hpp)
-
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix ${prefix})
-set(libdir ${prefix}/lib)
-set(includedir ${prefix}/include)
-set(VERSION ${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libzmq.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc @ONLY)
-set(zmq-pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc)
-
-if(NOT ZMQ_BUILD_FRAMEWORK)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-endif()
-
-if(MSVC)
-  if(CMAKE_CL_64)
-    set(nsis-template ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/NSIS.template64.in)
-  else()
-    set(nsis-template ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/NSIS.template32.in)
-  endif()
-
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in
-    COMMAND ${CMAKE_COMMAND} ARGS -E copy ${nsis-template} ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in
-    DEPENDS ${nsis-template})
-endif()
-
-option(WITH_DOCS "Build html docs" ON)
-if(WITH_DOCS)
-  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc)
-  file(
-    GLOB docs
-    RELATIVE ${CMAKE_CURRENT_BINARY_DIR}/
-    "${CMAKE_CURRENT_SOURCE_DIR}/doc/*.txt")
-  set(html-docs)
-  foreach(txt ${docs})
-    string(REGEX REPLACE ".*/(.*)\\.txt" "\\1.html" html ${txt})
-    set(src ${txt})
-    set(dst doc/${html})
-    if(WITH_DOC)
-      add_custom_command(
-        OUTPUT ${dst}
-        COMMAND ${ASCIIDOC_EXECUTABLE} -d manpage -b xhtml11 -f ${CMAKE_CURRENT_SOURCE_DIR}/doc/asciidoc.conf
-                -azmq_version=${ZMQ_VERSION} -o ${dst} ${src}
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${src}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMENT "Generating ${html}")
-      list(APPEND html-docs ${CMAKE_CURRENT_BINARY_DIR}/${dst})
-    endif()
-  endforeach()
-endif()
-
-if(ZMQ_BUILD_FRAMEWORK)
-  add_custom_command(
-    TARGET libzmq
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} ARGS -E make_directory
-            "${CMAKE_LIBRARY_OUTPUT_PATH}/ZeroMQ.framework/Versions/${ZMQ_VERSION}/MacOS"
-    COMMENT "Perf tools")
-endif()
-
-option(ENABLE_PRECOMPILED "Enable precompiled headers, if possible" ON)
-if(MSVC AND ENABLE_PRECOMPILED)
-  # default for all sources is to use precompiled headers
-  foreach(source ${sources})
-    # C and C++ can not use the same precompiled header
-    if(${source} MATCHES ".cpp$" AND NOT ${source} STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}/src/precompiled.cpp")
-      set_source_files_properties(${source} PROPERTIES COMPILE_FLAGS "/Yuprecompiled.hpp" OBJECT_DEPENDS
-                                                                                          precompiled.hpp)
-    endif()
-  endforeach()
-  # create precompiled header
-  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/precompiled.cpp
-                              PROPERTIES COMPILE_FLAGS "/Ycprecompiled.hpp" OBJECT_OUTPUTS precompiled.hpp)
-endif()
-
-# -----------------------------------------------------------------------------
-# output
-option(BUILD_SHARED "Whether or not to build the shared object" ON)
-option(BUILD_STATIC "Whether or not to build the static archive" ON)
-
-if(MSVC)
-  # Suppress linker warnings caused by #ifdef omission of file content.
-  set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
-  set(PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
-  set(PDB_NAME
-      "lib${ZMQ_OUTPUT_BASENAME}${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")
-  function(enable_vs_guideline_checker target)
-    set_target_properties(
-      ${target} PROPERTIES VS_GLOBAL_EnableCppCoreCheck true VS_GLOBAL_CodeAnalysisRuleSet CppCoreCheckRules.ruleset
-                           VS_GLOBAL_RunCodeAnalysis true)
-  endfunction()
-  if(BUILD_SHARED)
-    add_library(libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs}
-                              ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    if(ENABLE_ANALYSIS)
-      enable_vs_guideline_checker(libzmq)
-    endif()
-    set_target_properties(
-      libzmq
-      PROPERTIES PUBLIC_HEADER "${public_headers}"
-                 RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 RELWITHDEBINFO_POSTFIX
-                 "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 MINSIZEREL_POSTFIX "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
-                 COMPILE_DEFINITIONS "DLL_EXPORT"
-                 OUTPUT_NAME "lib${ZMQ_OUTPUT_BASENAME}")
-    if(ZMQ_HAVE_WINDOWS_UWP)
-      set_target_properties(libzmq PROPERTIES LINK_FLAGS_DEBUG "/OPT:NOICF /OPT:NOREF")
-    endif()
-  endif()
-
-  if(BUILD_STATIC)
-    add_library(libzmq-static STATIC ${sources} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    set_target_properties(
-      libzmq-static
-      PROPERTIES PUBLIC_HEADER "${public_headers}"
-                 RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 RELWITHDEBINFO_POSTFIX
-                 "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 MINSIZEREL_POSTFIX
-                 "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-sgd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 COMPILE_FLAGS "/DZMQ_STATIC"
-                 OUTPUT_NAME "lib${ZMQ_OUTPUT_BASENAME}")
-  endif()
-else()
-  # avoid building everything twice for shared + static only on *nix, as Windows needs different preprocessor defines in
-  # static builds
-  if(NOT MINGW)
-    add_library(objects OBJECT ${sources})
-    set_property(TARGET objects PROPERTY POSITION_INDEPENDENT_CODE ON)
-    target_include_directories(
-      objects PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
-  endif()
-
-  if(BUILD_SHARED)
-    if(MINGW)
-      add_library(libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig}
-                                ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    else()
-      add_library(libzmq SHARED $<TARGET_OBJECTS:objects> ${public_headers} ${html-docs} ${readme-docs}
-                                ${zmq-pkgconfig} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    endif()
-    # NOTE: the SOVERSION and VERSION MUST be the same as the one generated by libtool! It is NOT the same as the
-    # version of the package.
-    set_target_properties(
-      libzmq PROPERTIES COMPILE_DEFINITIONS "DLL_EXPORT" PUBLIC_HEADER "${public_headers}" VERSION "5.2.3"
-                        SOVERSION "5" OUTPUT_NAME "${ZMQ_OUTPUT_BASENAME}" PREFIX "lib")
-    if(ZMQ_BUILD_FRAMEWORK)
-      set_target_properties(
-        libzmq
-        PROPERTIES FRAMEWORK TRUE MACOSX_FRAMEWORK_IDENTIFIER "org.zeromq.libzmq" MACOSX_FRAMEWORK_SHORT_VERSION_STRING
-                                                                                  ${ZMQ_VERSION}
-                   MACOSX_FRAMEWORK_BUNDLE_VERSION ${ZMQ_VERSION})
-      set_source_files_properties(${html-docs} PROPERTIES MACOSX_PACKAGE_LOCATION doc)
-      set_source_files_properties(${readme-docs} PROPERTIES MACOSX_PACKAGE_LOCATION etc)
-      set_source_files_properties(${zmq-pkgconfig} PROPERTIES MACOSX_PACKAGE_LOCATION lib/pkgconfig)
-    endif()
-  endif()
-
-  if(BUILD_STATIC)
-    if(MINGW)
-      add_library(libzmq-static STATIC ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig}
-                                       ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    else()
-      add_library(libzmq-static STATIC $<TARGET_OBJECTS:objects> ${public_headers} ${html-docs} ${readme-docs}
-                                       ${zmq-pkgconfig} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    endif()
-    if(CMAKE_SYSTEM_NAME MATCHES "QNX")
-      target_link_libraries(libzmq-static m)
-    endif()
-    set_target_properties(
-      libzmq-static PROPERTIES PUBLIC_HEADER "${public_headers}" OUTPUT_NAME "${ZMQ_OUTPUT_BASENAME}" PREFIX "lib")
-  endif()
-endif()
-
-if(BUILD_STATIC)
-  target_compile_definitions(libzmq-static PUBLIC ZMQ_STATIC)
-endif()
-
-list(APPEND target_outputs "")
-
-if(BUILD_SHARED)
-  list(APPEND target_outputs "libzmq")
-endif()
-
-if(BUILD_STATIC)
-  list(APPEND target_outputs "libzmq-static")
-endif()
-
-foreach(target ${target_outputs})
-  target_include_directories(
-    ${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
-endforeach()
-
-if(BUILD_SHARED)
-  target_link_libraries(libzmq ${CMAKE_THREAD_LIBS_INIT})
-  if(GNUTLS_FOUND)
-    target_link_libraries(libzmq ${GNUTLS_LIBRARIES})
-  endif()
-
-  if(NSS3_FOUND)
-    target_link_libraries(libzmq ${NSS3_LIBRARIES})
-  endif()
-
-  if(LIBBSD_FOUND)
-    target_link_libraries(libzmq ${LIBBSD_LIBRARIES})
-  endif()
-
-  if(SODIUM_FOUND)
-    target_link_libraries(libzmq ${SODIUM_LIBRARIES})
-    # On Solaris, libsodium depends on libssp
-    if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-      target_link_libraries(libzmq ssp)
-    endif()
-  endif()
-
-  if(HAVE_WS2_32)
-    target_link_libraries(libzmq ws2_32)
-  elseif(HAVE_WS2)
-    target_link_libraries(libzmq ws2)
-  endif()
-
-  if(HAVE_RPCRT4)
-    target_link_libraries(libzmq rpcrt4)
-  endif()
-
-  if(HAVE_IPHLAPI)
-    target_link_libraries(libzmq iphlpapi)
-  endif()
-
-  if(RT_LIBRARY)
-    target_link_libraries(libzmq -lrt)
-  endif()
-endif()
-
-if(BUILD_STATIC)
-  target_link_libraries(libzmq-static ${CMAKE_THREAD_LIBS_INIT})
-  if(GNUTLS_FOUND)
-    target_link_libraries(libzmq-static ${GNUTLS_LIBRARIES})
-  endif()
-
-  if(LIBBSD_FOUND)
-    target_link_libraries(libzmq-static ${LIBBSD_LIBRARIES})
-  endif()
-
-  if(NSS3_FOUND)
-    target_link_libraries(libzmq-static ${NSS3_LIBRARIES})
-  endif()
-
-  if(SODIUM_FOUND)
-    target_link_libraries(libzmq-static ${SODIUM_LIBRARIES})
-    # On Solaris, libsodium depends on libssp
-    if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-      target_link_libraries(libzmq-static ssp)
-    endif()
-  endif()
-
-  if(HAVE_WS2_32)
-    target_link_libraries(libzmq-static ws2_32)
-  elseif(HAVE_WS2)
-    target_link_libraries(libzmq-static ws2)
-  endif()
-
-  if(HAVE_RPCRT4)
-    target_link_libraries(libzmq-static rpcrt4)
-  endif()
-
-  if(HAVE_IPHLAPI)
-    target_link_libraries(libzmq-static iphlpapi)
-  endif()
-
-  if(RT_LIBRARY)
-    target_link_libraries(libzmq-static -lrt)
-  endif()
-
-  if(CMAKE_SYSTEM_NAME MATCHES "QNX")
-    add_definitions(-DUNITY_EXCLUDE_MATH_H)
-  endif()
-endif()
-
-if(BUILD_SHARED)
-  set(perf-tools
-      local_lat
-      remote_lat
-      local_thr
-      remote_thr
-      inproc_lat
-      inproc_thr
-      proxy_thr)
-
-  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") # Why?
-    option(WITH_PERF_TOOL "Build with perf-tools" ON)
-  else()
-    option(WITH_PERF_TOOL "Build with perf-tools" OFF)
-  endif()
-
-  if(WITH_PERF_TOOL)
-    foreach(perf-tool ${perf-tools})
-      add_executable(${perf-tool} perf/${perf-tool}.cpp)
-      target_link_libraries(${perf-tool} libzmq)
-
-      if(GNUTLS_FOUND)
-        target_link_libraries(${perf-tool} ${GNUTLS_LIBRARIES})
-      endif()
-
-      if(LIBBSD_FOUND)
-        target_link_libraries(${perf-tool} ${LIBBSD_LIBRARIES})
-      endif()
-
-      if(NSS3_FOUND)
-        target_link_libraries(${perf-tool} ${NSS3_LIBRARIES})
-      endif()
-
-      if(SODIUM_FOUND)
-        target_link_libraries(${perf-tool} ${SODIUM_LIBRARIES})
-      endif()
-
-      if(ZMQ_BUILD_FRAMEWORK)
-        # Copy perf-tools binaries into Framework
-        add_custom_command(
-          TARGET libzmq
-          ${perf-tool} POST_BUILD
-          COMMAND ${CMAKE_COMMAND} ARGS -E copy "$<TARGET_FILE:${perf-tool}>"
-                  "${LIBRARY_OUTPUT_PATH}/ZeroMQ.framework/Versions/${ZMQ_VERSION_STRING}/MacOS/${perf-tool}"
-          VERBATIM
-          COMMENT "Perf tools")
-      else()
-        install(TARGETS ${perf-tool} RUNTIME DESTINATION bin COMPONENT PerfTools)
-      endif()
-      if(ZMQ_HAVE_WINDOWS_UWP)
-        set_target_properties(${perf-tool} PROPERTIES LINK_FLAGS_DEBUG "/OPT:NOICF /OPT:NOREF")
-      endif()
-    endforeach()
-
-    if(BUILD_STATIC)
-      add_executable(benchmark_radix_tree perf/benchmark_radix_tree.cpp)
-      target_link_libraries(benchmark_radix_tree libzmq-static)
-      target_include_directories(benchmark_radix_tree PUBLIC "${CMAKE_CURRENT_LIST_DIR}/src")
-      if(ZMQ_HAVE_WINDOWS_UWP)
-        set_target_properties(benchmark_radix_tree PROPERTIES LINK_FLAGS_DEBUG "/OPT:NOICF /OPT:NOREF")
-      endif()
-    endif()
-  elseif(WITH_PERF_TOOL)
-    message(FATAL_ERROR "Shared library disabled - perf-tools unavailable.")
-  endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# tests
-
-option(BUILD_TESTS "Whether or not to build the tests" ON)
-
-set(ZMQ_BUILD_TESTS
-    ${BUILD_TESTS}
-    CACHE BOOL "Build the tests for ZeroMQ")
-
-if(ZMQ_BUILD_TESTS)
-  enable_testing() # Enable testing only works in root scope
-  add_subdirectory(tests)
-  if(BUILD_STATIC)
-    add_subdirectory(unittests)
-  else()
-    message(WARNING "Not building unit tests, since BUILD_STATIC is not enabled")
-  endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# installer
-
-if(MSVC AND (BUILD_SHARED OR BUILD_STATIC))
-  install(
-    TARGETS ${target_outputs}
-    EXPORT ${PROJECT_NAME}-targets
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT SDK)
-  if(MSVC_IDE)
-    install(
-      FILES ${PDB_OUTPUT_DIRECTORY}/\${CMAKE_INSTALL_CONFIG_NAME}/${PDB_NAME}.pdb
-      DESTINATION ${CMAKE_INSTALL_BINDIR}
-      COMPONENT SDK
-      OPTIONAL)
-  else()
-    install(
-      FILES ${PDB_OUTPUT_DIRECTORY}/${PDB_NAME}.pdb
-      DESTINATION ${CMAKE_INSTALL_BINDIR}
-      COMPONENT SDK
-      OPTIONAL)
-  endif()
-  if(BUILD_SHARED)
-    install(
-      TARGETS libzmq
-      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-      PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT Runtime)
-  endif()
-elseif(BUILD_SHARED OR BUILD_STATIC)
-  install(
-    TARGETS ${target_outputs}
-    EXPORT ${PROJECT_NAME}-targets
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    FRAMEWORK DESTINATION "Library/Frameworks"
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-endif()
-
-foreach(readme ${readme-docs})
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${readme} ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt)
-
-  if(NOT ZMQ_BUILD_FRAMEWORK)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt DESTINATION share/zmq)
-  endif()
-endforeach()
-
-if(WITH_DOC)
-  if(NOT ZMQ_BUILD_FRAMEWORK)
-    install(
-      FILES ${html-docs}
-      DESTINATION doc/zmq
-      COMPONENT RefGuide)
-  endif()
-endif()
-
-if(WIN32)
-  set(ZEROMQ_CMAKECONFIG_INSTALL_DIR
-      "CMake"
-      CACHE STRING "install path for ZeroMQConfig.cmake")
-else()
-  # CMake search path wants either "share" (AKA GNUInstallDirs DATAROOTDIR) for arch-independent, or LIBDIR for arch-
-  # dependent, plus "cmake" as prefix
-  set(ZEROMQ_CMAKECONFIG_INSTALL_DIR
-      "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-      CACHE STRING "install path for ZeroMQConfig.cmake")
-endif()
-
-if((NOT CMAKE_VERSION VERSION_LESS 3.0) AND (BUILD_SHARED OR BUILD_STATIC))
-  export(EXPORT ${PROJECT_NAME}-targets FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
-endif()
-configure_package_config_file(
-  builds/cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-  INSTALL_DESTINATION ${ZEROMQ_CMAKECONFIG_INSTALL_DIR})
-write_basic_package_version_file(
-  ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-  VERSION ${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}
-  COMPATIBILITY AnyNewerVersion)
-if(BUILD_SHARED OR BUILD_STATIC)
-  install(
-    EXPORT ${PROJECT_NAME}-targets
-    FILE ${PROJECT_NAME}Targets.cmake
-    DESTINATION ${ZEROMQ_CMAKECONFIG_INSTALL_DIR})
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-                ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-          DESTINATION ${ZEROMQ_CMAKECONFIG_INSTALL_DIR})
-endif()
-
-option(ENABLE_CPACK "Enables cpack rules" ON)
-if(MSVC AND ENABLE_CPACK)
-  if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    set(CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY TRUE)
-    set(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
-    set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
-  endif()
-  include(InstallRequiredSystemLibraries)
-
-  if(CMAKE_CL_64)
-    set(arch_name "x64")
-  else()
-    set(arch_name "x86")
-  endif()
-
-  set(CPACK_NSIS_DISPLAY_NAME "ZeroMQ ${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}(${arch_name})")
-  set(CPACK_PACKAGE_FILE_NAME "ZeroMQ-${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}-${arch_name}")
-
-  # TODO: I think this part was intended to be used when running cpack separately from cmake but I don't know how that
-  # works.
-  #
-  # macro(add_crt_version version) set(rel_dir
-  # "${CMAKE_CURRENT_BINARY_DIR}/build/${arch_name}/${version};ZeroMQ;ALL;/")
-  # set(debug_dir
-  # "${CMAKE_CURRENT_BINARY_DIR}/debug/${arch_name}/${version};ZeroMQ;ALL;/")
-  # if(EXISTS ${rel_dir}) list(APPEND CPACK_INSTALL_CMAKE_PROJECTS ${rel_dir}) endif()
-
-  # if(EXISTS ${debug_dir}) list(APPEND CPACK_INSTALL_CMAKE_PROJECTS ${rel_dir}) endmacro() endmacro()
-
-  # add_crt_version(v110) add_crt_version(v100) add_crt_version(v90)
-
-  list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR})
-  set(CPACK_GENERATOR "NSIS")
-  set(CPACK_PACKAGE_NAME "ZeroMQ")
-  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ZeroMQ lightweight messaging kernel")
-  set(CPACK_PACKAGE_VENDOR "Miru")
-  set(CPACK_NSIS_CONTACT "Steven McCoy <Steven.McCoy@miru.hk>")
-  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}\\\\COPYING.txt")
-  # set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}\\\\README.txt") set(CPACK_RESOURCE_FILE_WELCOME
-  # "${CMAKE_CURRENT_BINARY_DIR}\\\\WELCOME.txt") There is a bug in NSI that does not handle full unix paths properly.
-  # Make sure there is at least one set of four(4) backslashes.
-  set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\installer.ico")
-  set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\installer.ico")
-
-  set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\branding.bmp")
-  set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
-  set(CPACK_PACKAGE_VERSION ${ZMQ_VERSION})
-  set(CPACK_PACKAGE_VERSION_MAJOR ${ZMQ_VERSION_MAJOR})
-  set(CPACK_PACKAGE_VERSION_MINOR ${ZMQ_VERSION_MINOR})
-  set(CPACK_PACKAGE_VERSION_PATCH ${ZMQ_VERSION_PATCH})
-  # set(CPACK_PACKAGE_INSTALL_DIRECTORY "ZMQ Install Directory") set(CPACK_TEMPORARY_DIRECTORY "ZMQ Temporary CPack
-  # Directory")
-
-  include(CPack)
-
-  cpack_add_component_group(Development DISPLAY_NAME "ZeroMQ software development kit" EXPANDED)
-  cpack_add_component(PerfTools DISPLAY_NAME "ZeroMQ performance tools" INSTALL_TYPES FullInstall DevInstall)
-  cpack_add_component(SourceCode DISPLAY_NAME "ZeroMQ source code" DISABLED INSTALL_TYPES FullInstall)
-  cpack_add_component(
-    SDK
-    DISPLAY_NAME
-    "ZeroMQ headers and libraries"
-    INSTALL_TYPES
-    FullInstall
-    DevInstall
-    GROUP
-    Development)
-  if(WITH_DOC)
-    cpack_add_component(
-      RefGuide
-      DISPLAY_NAME
-      "ZeroMQ reference guide"
-      INSTALL_TYPES
-      FullInstall
-      DevInstall
-      GROUP
-      Development)
-  endif()
-  cpack_add_component(
-    Runtime
-    DISPLAY_NAME
-    "ZeroMQ runtime files"
-    REQUIRED
-    INSTALL_TYPES
-    FullInstall
-    DevInstall
-    MinInstall)
-  cpack_add_install_type(FullInstall DISPLAY_NAME "Full install, including source code")
-  cpack_add_install_type(DevInstall DISPLAY_NAME "Developer install, headers and libraries")
-  cpack_add_install_type(MinInstall DISPLAY_NAME "Minimal install, runtime only")
-endif()
-
-# Export this for library to help build this as a sub-project
-set(ZEROMQ_LIBRARY
-    libzmq
-    CACHE STRING "ZeroMQ library")
-
-# Workaround for MSVS10 to avoid the Dialog Hell FIXME: This could be removed with future version of CMake.
-if(MSVC_VERSION EQUAL 1600)
-  set(ZMQ_SLN_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/ZeroMQ.sln")
-  if(EXISTS "${ZMQ_SLN_FILENAME}")
-    file(APPEND "${ZMQ_SLN_FILENAME}" "\n# This should be regenerated!\n")
-  endif()
-endif()
-
-# this cannot be moved, as it does not only contain function/macro definitions
-option(ENABLE_CLANG "Include Clang" ON)
-if (ENABLE_CLANG)
-  include(ClangFormat)
-endif()
-
-# fixes https://github.com/zeromq/libzmq/issues/3776 The problem is, both libzmq-static libzmq try to use/generate
-# precompiled.pch at the same time Add a dependency, so they run in order and so they dont get in each others way TODO
-# still generates warning "build\x64-Debug\ninja : warning : multiple rules generate precompiled.hpp. builds involving
-# this target will not be correct; continuing anyway [-w dupbuild=warn]"
-if(MSVC
-   AND ENABLE_PRECOMPILED
-   AND BUILD_SHARED
-   AND BUILD_STATIC)
-  add_dependencies(libzmq-static libzmq)
-endif()
+cmake_minimum_required(VERSION 3.0.0)
+
+project(XCLIPS)
+
+set(XCLIPS_HEADER
+    clips/agenda.h
+    clips/analysis.h
+    clips/argacces.h
+    clips/bload.h
+    clips/bmathfun.h
+    clips/bsave.h
+    clips/classcom.h
+    clips/classexm.h
+    clips/classfun.h
+    clips/classinf.h
+    clips/classini.h
+    clips/classpsr.h
+    clips/clips.h
+    clips/clips.hpp
+    clips/clsltpsr.h
+    clips/commline.h
+    clips/conscomp.h
+    clips/constant.h
+    clips/constrct.h
+    clips/constrnt.h
+    clips/crstrtgy.h
+    clips/cstrcbin.h
+    clips/cstrccmp.h
+    clips/cstrccom.h
+    clips/cstrcpsr.h
+    clips/cstrnbin.h
+    clips/cstrnchk.h
+    clips/cstrncmp.h
+    clips/cstrnops.h
+    clips/cstrnpsr.h
+    clips/cstrnutl.h
+    clips/default.h
+    clips/defins.h
+    clips/developr.h
+    clips/dffctbin.h
+    clips/dffctbsc.h
+    clips/dffctcmp.h
+    clips/dffctdef.h
+    clips/dffctpsr.h
+    clips/dffnxbin.h
+    clips/dffnxcmp.h
+    clips/dffnxexe.h
+    clips/dffnxfun.h
+    clips/dffnxpsr.h
+    clips/dfinsbin.h
+    clips/dfinscmp.h
+    clips/drive.h
+    clips/emathfun.h
+    clips/engine.h
+    clips/entities.h
+    clips/envrnbld.h
+    clips/envrnmnt.h
+    clips/evaluatn.h
+    clips/expressn.h
+    clips/exprnbin.h
+    clips/exprnops.h
+    clips/exprnpsr.h
+    clips/extnfunc.h
+    clips/factbin.h
+    clips/factbld.h
+    clips/factcmp.h
+    clips/factcom.h
+    clips/factfun.h
+    clips/factgen.h
+    clips/facthsh.h
+    clips/factlhs.h
+    clips/factmch.h
+    clips/factmngr.h
+    clips/factprt.h
+    clips/factqpsr.h
+    clips/factqury.h
+    clips/factrete.h
+    clips/factrhs.h
+    clips/filecom.h
+    clips/filertr.h
+    clips/fileutil.h
+    clips/generate.h
+    clips/genrcbin.h
+    clips/genrccmp.h
+    clips/genrccom.h
+    clips/genrcexe.h
+    clips/genrcfun.h
+    clips/genrcpsr.h
+    clips/globlbin.h
+    clips/globlbsc.h
+    clips/globlcmp.h
+    clips/globlcom.h
+    clips/globldef.h
+    clips/globlpsr.h
+    clips/immthpsr.h
+    clips/incrrset.h
+    clips/inherpsr.h
+    clips/inscom.h
+    clips/insfile.h
+    clips/insfun.h
+    clips/insmngr.h
+    clips/insmoddp.h
+    clips/insmult.h
+    clips/inspsr.h
+    clips/insquery.h
+    clips/insqypsr.h
+    clips/iofun.h
+    clips/lgcldpnd.h
+    clips/match.h
+    clips/memalloc.h
+    clips/miscfun.h
+    clips/modulbin.h
+    clips/modulbsc.h
+    clips/modulcmp.h
+    clips/moduldef.h
+    clips/modulpsr.h
+    clips/modulutl.h
+    clips/msgcom.h
+    clips/msgfun.h
+    clips/msgpass.h
+    clips/msgpsr.h
+    clips/multifld.h
+    clips/multifun.h
+    clips/network.h
+    clips/objbin.h
+    clips/objcmp.h
+    clips/object.h
+    clips/objrtbin.h
+    clips/objrtbld.h
+    clips/objrtcmp.h
+    clips/objrtfnx.h
+    clips/objrtgen.h
+    clips/objrtmch.h
+    clips/parsefun.h
+    clips/pattern.h
+    clips/pprint.h
+    clips/prccode.h
+    clips/prcdrfun.h
+    clips/prcdrpsr.h
+    clips/prdctfun.h
+    clips/prntutil.h
+    clips/proflfun.h
+    clips/reorder.h
+    clips/reteutil.h
+    clips/retract.h
+    clips/router.h
+    clips/rulebin.h
+    clips/rulebld.h
+    clips/rulebsc.h
+    clips/rulecmp.h
+    clips/rulecom.h
+    clips/rulecstr.h
+    clips/ruledef.h
+    clips/ruledlt.h
+    clips/rulelhs.h
+    clips/rulepsr.h
+    clips/scanner.h
+    clips/setup.h
+    clips/sortfun.h
+    clips/strngfun.h
+    clips/strngrtr.h
+    clips/symblbin.h
+    clips/symblcmp.h
+    clips/symbol.h
+    clips/sysdep.h
+    clips/textpro.h
+    clips/tmpltbin.h
+    clips/tmpltbsc.h
+    clips/tmpltcmp.h
+    clips/tmpltdef.h
+    clips/tmpltfun.h
+    clips/tmpltlhs.h
+    clips/tmpltpsr.h
+    clips/tmpltrhs.h
+    clips/tmpltutl.h
+    clips/userdata.h
+    clips/usrsetup.h
+    clips/utility.h
+    clips/watch.h
+)
+set(XCLIPS_SOURCE
+    clips/agenda.c
+    clips/analysis.c
+    clips/argacces.c
+    clips/bload.c
+    clips/bmathfun.c
+    clips/bsave.c
+    clips/classcom.c
+    clips/classexm.c
+    clips/classfun.c
+    clips/classinf.c
+    clips/classini.c
+    clips/classpsr.c
+    clips/clips.cpp
+    clips/clsltpsr.c
+    clips/commline.c
+    clips/conscomp.c
+    clips/constrct.c
+    clips/constrnt.c
+    clips/crstrtgy.c
+    clips/cstrcbin.c
+    clips/cstrccom.c
+    clips/cstrcpsr.c
+    clips/cstrnbin.c
+    clips/cstrnchk.c
+    clips/cstrncmp.c
+    clips/cstrnops.c
+    clips/cstrnpsr.c
+    clips/cstrnutl.c
+    clips/default.c
+    clips/defins.c
+    clips/developr.c
+    clips/dffctbin.c
+    clips/dffctbsc.c
+    clips/dffctcmp.c
+    clips/dffctdef.c
+    clips/dffctpsr.c
+    clips/dffnxbin.c
+    clips/dffnxcmp.c
+    clips/dffnxexe.c
+    clips/dffnxfun.c
+    clips/dffnxpsr.c
+    clips/dfinsbin.c
+    clips/dfinscmp.c
+    clips/drive.c
+    clips/emathfun.c
+    clips/engine.c
+    clips/envrnbld.c
+    clips/envrnmnt.c
+    clips/evaluatn.c
+    clips/expressn.c
+    clips/exprnbin.c
+    clips/exprnops.c
+    clips/exprnpsr.c
+    clips/extnfunc.c
+    clips/factbin.c
+    clips/factbld.c
+    clips/factcmp.c
+    clips/factcom.c
+    clips/factfun.c
+    clips/factgen.c
+    clips/facthsh.c
+    clips/factlhs.c
+    clips/factmch.c
+    clips/factmngr.c
+    clips/factprt.c
+    clips/factqpsr.c
+    clips/factqury.c
+    clips/factrete.c
+    clips/factrhs.c
+    clips/filecom.c
+    clips/filertr.c
+    clips/fileutil.c
+    clips/generate.c
+    clips/genrcbin.c
+    clips/genrccmp.c
+    clips/genrccom.c
+    clips/genrcexe.c
+    clips/genrcfun.c
+    clips/genrcpsr.c
+    clips/globlbin.c
+    clips/globlbsc.c
+    clips/globlcmp.c
+    clips/globlcom.c
+    clips/globldef.c
+    clips/globlpsr.c
+    clips/immthpsr.c
+    clips/incrrset.c
+    clips/inherpsr.c
+    clips/inscom.c
+    clips/insfile.c
+    clips/insfun.c
+    clips/insmngr.c
+    clips/insmoddp.c
+    clips/insmult.c
+    clips/inspsr.c
+    clips/insquery.c
+    clips/insqypsr.c
+    clips/iofun.c
+    clips/lgcldpnd.c
+   #clips/main.c
+    clips/memalloc.c
+    clips/miscfun.c
+    clips/modulbin.c
+    clips/modulbsc.c
+    clips/modulcmp.c
+    clips/moduldef.c
+    clips/modulpsr.c
+    clips/modulutl.c
+    clips/msgcom.c
+    clips/msgfun.c
+    clips/msgpass.c
+    clips/msgpsr.c
+    clips/multifld.c
+    clips/multifun.c
+    clips/objbin.c
+    clips/objcmp.c
+    clips/objrtbin.c
+    clips/objrtbld.c
+    clips/objrtcmp.c
+    clips/objrtfnx.c
+    clips/objrtgen.c
+    clips/objrtmch.c
+    clips/parsefun.c
+    clips/pattern.c
+    clips/pprint.c
+    clips/prccode.c
+    clips/prcdrfun.c
+    clips/prcdrpsr.c
+    clips/prdctfun.c
+    clips/prntutil.c
+    clips/proflfun.c
+    clips/reorder.c
+    clips/reteutil.c
+    clips/retract.c
+    clips/router.c
+    clips/rulebin.c
+    clips/rulebld.c
+    clips/rulebsc.c
+    clips/rulecmp.c
+    clips/rulecom.c
+    clips/rulecstr.c
+    clips/ruledef.c
+    clips/ruledlt.c
+    clips/rulelhs.c
+    clips/rulepsr.c
+    clips/scanner.c
+    clips/sortfun.c
+    clips/strngfun.c
+    clips/strngrtr.c
+    clips/symblbin.c
+    clips/symblcmp.c
+    clips/symbol.c
+    clips/sysdep.c
+    clips/textpro.c
+    clips/tmpltbin.c
+    clips/tmpltbsc.c
+    clips/tmpltcmp.c
+    clips/tmpltdef.c
+    clips/tmpltfun.c
+    clips/tmpltlhs.c
+    clips/tmpltpsr.c
+    clips/tmpltrhs.c
+    clips/tmpltutl.c
+    clips/userdata.c
+   #clips/userfunctions.c
+    clips/utility.c
+    clips/watch.c
+)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+set_source_files_properties(${XCLIPS_SOURCE} PROPERTIES LANGUAGE CXX )
+
+#add_executable(xclips ${XCLIPS_HEADER} ${XCLIPS_SOURCE})
+add_library(xclips ${XCLIPS_HEADER} ${XCLIPS_SOURCE})
+
+target_include_directories(xclips PUBLIC
+                          "${PROJECT_BINARY_DIR}"
+                          "${PROJECT_SOURCE_DIR}/../boost_1_73_0"
+                          "${PROJECT_SOURCE_DIR}/../nlohmann-json.git/single_include"
+                          "${PROJECT_SOURCE_DIR}/../cppzmq.git"
+                          "${PROJECT_SOURCE_DIR}/../libzmq.git/include"
+                          "${PROJECT_SOURCE_DIR}/../mstch.git/include"
+                          "${PROJECT_SOURCE_DIR}/../fmt.git/include"
+                          )
+
+set_target_properties(xclips PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
diff --git a/COPYING b/COPYING
deleted file mode 100644
index b6f3fd5d3..000000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                      GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/COPYING.LESSER b/COPYING.LESSER
deleted file mode 100644
index 02e943c4a..000000000
--- a/COPYING.LESSER
+++ /dev/null
@@ -1,181 +0,0 @@
-		         GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
---------------------------------------------------------------------------------
-
-           SPECIAL EXCEPTION GRANTED BY COPYRIGHT HOLDERS
-
-As a special exception, copyright holders give you permission to link this
-library with independent modules to produce an executable, regardless of
-the license terms of these independent modules, and to copy and distribute
-the resulting executable under terms of your choice, provided that you also
-meet, for each linked independent module, the terms and conditions of
-the license of that module. An independent module is a module which is not
-derived from or based on this library. If you modify this library, you must
-extend this exception to your version of the library.
-
-Note: this exception relieves you of any obligations under sections 4 and 5
-of this license, and section 6 of the GNU General Public License.
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index b8460bf52..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-
-MAINTAINER ZeroMQ Project <zeromq@imatix.com>
-
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y git build-essential libtool autoconf automake pkg-config unzip libkrb5-dev
-RUN cd /tmp && git clone git://github.com/jedisct1/libsodium.git && cd libsodium && git checkout e2a30a && ./autogen.sh && ./configure && make check && make install && ldconfig
-RUN cd /tmp && git clone --depth 1 git://github.com/zeromq/libzmq.git && cd libzmq && ./autogen.sh && ./configure && make
-# RUN cd /tmp/libzmq && make check
-RUN cd /tmp/libzmq && make install && ldconfig
-RUN rm /tmp/* -rf
diff --git a/Doxygen.cfg b/Doxygen.cfg
deleted file mode 100644
index 370f19b99..000000000
--- a/Doxygen.cfg
+++ /dev/null
@@ -1,2320 +0,0 @@
-# Doxyfile 1.8.11
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = libzmq
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = master
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "ZeroMQ C++ Core Engine (LIBZMQ)"
-
-PROJECT_LOGO           = branding.bmp
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = doxygen
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = YES
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = NO
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        = ../..
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = YES
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = YES
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = YES
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = NO
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            =
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = include \
-                         src \
-                         tests \
-                         perf \
-                         README.doxygen.md
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
-# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.c \
-                         *.cpp \
-                         *.h \
-                         *.hpp
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           = tests perf
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = YES
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = README.doxygen.md
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 4
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-# HTML_HEADER            = doxygen.header
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-# HTML_FOOTER            = doxygen.footer
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-# HTML_STYLESHEET        = doxygen.css
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-# HTML_COLORSTYLE_HUE    = 240
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-#HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-#HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 200
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-#SEARCHENGINE_URL       = @searchengine_url@
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-#SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-#EXTERNAL_SEARCH_ID     = libzmq
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-#EXTRA_SEARCH_MAPPINGS  = @extra_search_mappings@
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           =
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             =
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             =
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          =
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           = include
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = YES
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = NO
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = YES
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = NO
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = YES
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 100
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 5
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 91cb0a5e0..000000000
--- a/INSTALL
+++ /dev/null
@@ -1,315 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-From GitHub
-===========
-
-If you clone the Git repository then you should start by running the
-command `./autogen.sh`. This is not necessary if you get the source
-packages.
-
-CMake installation
-==================
-
-The following options are available for cmake invocation:
-
-- `WITH_PERF_TOOL'
-    Enables the build of performance tools. Default value is ON.
-- `ZMQ_BUILD_TESTS'
-    Builds ZeroMQ tests. Default value is ON.
-- `ENABLE_CPACK'
-    Enables CPack build rules. This option has effect on Windows
-    platform only. Default value is ON. Turn it to OFF if you
-    don't want the runtime libraries to be installed (typically
-    if your installation destination already contains them).
-    
-
-Example: installing ZeroMQ on Windows with no tests, no performance
-tools, and no runtime library copy:
-
-cmake -G "NMake Makefiles" -D WITH_PERF_TOOL=OFF -D ZMQ_BUILD_TESTS=OFF
--D ENABLE_CPACK=OFF -D CMAKE_BUILD_TYPE=Release
-
-Windows Builds
-==============
-
-On Windows, use CMake for building, or for generating a Visual Studio solution file.
-
-The library can also be built for the Windows 10 UWP platform through CMake :
-cmake -H. -B<build dir> -G"Visual Studio 14 2015 Win64" \
-   -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 \
-   -DENABLE_CURVE=OFF -DZMQ_BUILD_TESTS=OFF
-
-In VS 2012 it is mandatory to increase the default stack size of 1 MB to
-at least 2 MB due to implementation of std::map intermittently requiring
-substantial amount of stack and causing stack overflow. 
-
-Windows Builds - Static
-=======================
-
-When linking statically with libzmq your CFLAGS and/or CPPFLAGS need to include
-`-DZMQ_STATIC` otherwise `__dclspec(dllimport)` will be set for all functions
-and the build will fail.
-
-This is a workaround for issue:
-https://github.com/zeromq/libzmq/issues/2788
-
-Windows Builds - Wine
-=====================
-
-To use Windows binaries on *nix via Wine, it is necessary to ensure that the
-kernel TCP buffers are large enough. On some systems, like OS X, they are too
-small by default.
-They need to be set to at least one MB as a workaround for issue:
-https://github.com/zeromq/libzmq/issues/1608
-
-sudo sysctl -w net.inet.tcp.sendspace=1300000
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.  If you are building a development version from the
-Github source, for example, use `./autogen.sh' to generate `configure'
-and other necessary installation scripts.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package. Note that `make -j check' is not supported as some
-     tests share infrastructure and cannot be run in parallel.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-OS X Builds - Documentation
-===========================
-
-Basic installation on OS X may fail in `Making all in doc' step. This
-error can be resolved by adding environment variable for shell.
-
-export XML_CATALOG_FILES=/usr/local/etc/xml/catalog 
-
-Write comamnd above in shell for instant resolve, or append command into
-shell profile file and reload for permanent resolve.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 3593665c8..000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,485 +0,0 @@
-pipeline {
-    agent { label "linux || macosx || bsd || solaris || posix || windows" }
-    parameters {
-        // Use DEFAULT_DEPLOY_BRANCH_PATTERN and DEFAULT_DEPLOY_JOB_NAME if
-        // defined in this jenkins setup -- in Jenkins Management Web-GUI
-        // see Configure System / Global properties / Environment variables
-        // Default (if unset) is empty => no deployment attempt after good test
-        // See zproject Jenkinsfile-deploy.example for an example deploy job.
-        // TODO: Try to marry MultiBranchPipeline support with pre-set defaults
-        // directly in MultiBranchPipeline plugin, or mechanism like Credentials,
-        // or a config file uploaded to master for all jobs or this job, see
-        // https://jenkins.io/doc/pipeline/examples/#configfile-provider-plugin
-        string (
-            defaultValue: '${DEFAULT_DEPLOY_BRANCH_PATTERN}',
-            description: 'Regular expression of branch names for which a deploy action would be attempted after a successful build and test; leave empty to not deploy. Reasonable value is ^(master|release/.*|feature/*)$',
-            name : 'DEPLOY_BRANCH_PATTERN')
-        string (
-            defaultValue: '${DEFAULT_DEPLOY_JOB_NAME}',
-            description: 'Name of your job that handles deployments and should accept arguments: DEPLOY_GIT_URL DEPLOY_GIT_BRANCH DEPLOY_GIT_COMMIT -- and it is up to that job what to do with this knowledge (e.g. git archive + push to packaging); leave empty to not deploy',
-            name : 'DEPLOY_JOB_NAME')
-        booleanParam (
-            defaultValue: true,
-            description: 'If the deployment is done, should THIS job wait for it to complete and include its success or failure as the build result (true), or should it schedule the job and exit quickly to free up the executor (false)',
-            name: 'DEPLOY_REPORT_RESULT')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt stable build without DRAFT API in this run?',
-            name: 'DO_BUILD_WITHOUT_DRAFT_API')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt build with DRAFT API in this run?',
-            name: 'DO_BUILD_WITH_DRAFT_API')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt a build with docs in this run? (Note: corresponding tools are required in the build environment)',
-            name: 'DO_BUILD_DOCS')
-        booleanParam (
-            defaultValue: false,
-            description: 'Publish as an archive a "dist" tarball from a build with docs in this run? (Note: corresponding tools are required in the build environment; enabling this enforces DO_BUILD_DOCS too)',
-            name: 'DO_DIST_DOCS')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt "make check" in this run?',
-            name: 'DO_TEST_CHECK')
-        booleanParam (
-            defaultValue: false,
-            description: 'Attempt "make memcheck" in this run?',
-            name: 'DO_TEST_MEMCHECK')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt "make distcheck" in this run?',
-            name: 'DO_TEST_DISTCHECK')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt a "make install" check in this run?',
-            name: 'DO_TEST_INSTALL')
-        string (
-            defaultValue: "`pwd`/tmp/_inst",
-            description: 'If attempting a "make install" check in this run, what DESTDIR to specify? (absolute path, defaults to "BUILD_DIR/tmp/_inst")',
-            name: 'USE_TEST_INSTALL_DESTDIR')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt "cppcheck" analysis before this run? (Note: corresponding tools are required in the build environment)',
-            name: 'DO_CPPCHECK')
-        booleanParam (
-            defaultValue: true,
-            description: 'Require that there are no files not discovered changed/untracked via .gitignore after builds and tests?',
-            name: 'REQUIRE_GOOD_GITIGNORE')
-        string (
-            defaultValue: "30",
-            description: 'When running tests, use this timeout (in minutes; be sure to leave enough for double-job of a distcheck too)',
-            name: 'USE_TEST_TIMEOUT')
-        booleanParam (
-            defaultValue: true,
-            description: 'When using temporary subdirs in build/test workspaces, wipe them after successful builds?',
-            name: 'DO_CLEANUP_AFTER_BUILD')
-    }
-    triggers {
-        pollSCM 'H/2 * * * *'
-    }
-// Note: your Jenkins setup may benefit from similar setup on side of agents:
-//        PATH="/usr/lib64/ccache:/usr/lib/ccache:/usr/bin:/bin:${PATH}"
-    stages {
-        stage ('prepare') {
-                    steps {
-                        dir("tmp") {
-                            sh 'if [ -s Makefile ]; then make -k distclean || true ; fi'
-                            sh 'chmod -R u+w .'
-                            deleteDir()
-                        }
-                        sh './autogen.sh'
-                        stash (name: 'prepped', includes: '**/*', excludes: '**/cppcheck.xml')
-                    }
-        }
-        stage ('compile') {
-            parallel {
-                stage ('build with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API ) } }
-                    steps {
-                      dir("tmp/build-withDRAFT") {
-                        deleteDir()
-                        unstash 'prepped'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; ./configure --enable-drafts=yes --with-docs=no'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; make -k -j4 || make'
-                        sh 'echo "Are GitIgnores good after make with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        stash (name: 'built-draft', includes: '**/*', excludes: '**/cppcheck.xml')
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('build without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API ) } }
-                    steps {
-                      dir("tmp/build-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'prepped'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; ./configure --enable-drafts=no --with-docs=no'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; make -k -j4 || make'
-                        sh 'echo "Are GitIgnores good after make without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        stash (name: 'built-nondraft', includes: '**/*', excludes: '**/cppcheck.xml')
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('build with DOCS') {
-                    when { expression { return ( params.DO_BUILD_DOCS || params.DO_DIST_DOCS ) } }
-                    steps {
-                      dir("tmp/build-DOCS") {
-                        deleteDir()
-                        unstash 'prepped'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; ./configure --enable-drafts=yes --with-docs=yes'
-                        script {
-                            if ( params.DO_DIST_DOCS ) {
-                                sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; make dist-gzip || exit ; DISTFILE="`ls -1tc *.tar.gz | head -1`" && [ -n "$DISTFILE" ] && [ -s "$DISTFILE" ] || exit ; mv -f "$DISTFILE" __dist.tar.gz'
-                                archiveArtifacts artifacts: '__dist.tar.gz'
-                                sh "rm -f __dist.tar.gz"
-                            }
-                        }
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; make -k -j4 || make'
-                        sh 'echo "Are GitIgnores good after make with docs? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        stash (name: 'built-docs', includes: '**/*', excludes: '**/cppcheck.xml')
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-            }
-        }
-        stage ('check') {
-            parallel {
-                stage ('cppcheck') {
-                    when { expression { return ( params.DO_CPPCHECK ) } }
-                    steps {
-                        dir("tmp/test-cppcheck") {
-                            deleteDir()
-                            unstash 'prepped'
-                            sh 'cppcheck --std=c++11 --enable=all --inconclusive --xml --xml-version=2 . 2>cppcheck.xml'
-                            archiveArtifacts artifacts: '**/cppcheck.xml'
-                            sh 'rm -f cppcheck.xml'
-                            script {
-                                if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                    deleteDir()
-                                }
-                            }
-                        }
-                    }
-                }
-                stage ('check with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API && params.DO_TEST_CHECK ) } }
-                    steps {
-                      dir("tmp/test-check-withDRAFT") {
-                        deleteDir()
-                        unstash 'built-draft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" check'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make check with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('check without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API && params.DO_TEST_CHECK ) } }
-                    steps {
-                      dir("tmp/test-check-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'built-nondraft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" check'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make check without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('memcheck with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API && params.DO_TEST_MEMCHECK ) } }
-                    steps {
-                      dir("tmp/test-memcheck-withDRAFT") {
-                        deleteDir()
-                        unstash 'built-draft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" memcheck && exit 0 ; echo "Re-running failed ($?) memcheck with greater verbosity" >&2 ; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" VERBOSE=1 memcheck-verbose'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make memcheck with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('memcheck without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API && params.DO_TEST_MEMCHECK ) } }
-                    steps {
-                      dir("tmp/test-memcheck-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'built-nondraft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" memcheck && exit 0 ; echo "Re-running failed ($?) memcheck with greater verbosity" >&2 ; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" VERBOSE=1 memcheck-verbose'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make memcheck without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('distcheck with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API && params.DO_TEST_DISTCHECK ) } }
-                    steps {
-                      dir("tmp/test-distcheck-withDRAFT") {
-                        deleteDir()
-                        unstash 'built-draft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; DISTCHECK_CONFIGURE_FLAGS="--enable-drafts=yes --with-docs=no" ; export DISTCHECK_CONFIGURE_FLAGS; make DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS" LD_LIBRARY_PATH="$LD_LIBRARY_PATH" distcheck'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make distcheck with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('distcheck without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API && params.DO_TEST_DISTCHECK ) } }
-                    steps {
-                      dir("tmp/test-distcheck-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'built-nondraft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; DISTCHECK_CONFIGURE_FLAGS="--enable-drafts=no --with-docs=no" ; export DISTCHECK_CONFIGURE_FLAGS; make DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS" LD_LIBRARY_PATH="$LD_LIBRARY_PATH" distcheck'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make distcheck without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('install with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API && params.DO_TEST_INSTALL ) } }
-                    steps {
-                      dir("tmp/test-install-withDRAFT") {
-                        deleteDir()
-                        unstash 'built-draft'
-                        retry(3) {
-                        timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                            sh """CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:\${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}" DESTDIR="${params.USE_TEST_INSTALL_DESTDIR}/withDRAFT" install"""
-                        }
-                        }
-                        sh """cd "${params.USE_TEST_INSTALL_DESTDIR}/withDRAFT" && find . -ls"""
-                        sh 'echo "Are GitIgnores good after make install with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('install without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API && params.DO_TEST_INSTALL ) } }
-                    steps {
-                      dir("tmp/test-install-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'built-nondraft'
-                        retry(3) {
-                        timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                            sh """CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:\${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}" DESTDIR="${params.USE_TEST_INSTALL_DESTDIR}/withoutDRAFT" install"""
-                        }
-                        }
-                        sh """cd "${params.USE_TEST_INSTALL_DESTDIR}/withoutDRAFT" && find . -ls"""
-                        sh 'echo "Are GitIgnores good after make install without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('install with DOCS') {
-                    when { expression { return ( params.DO_BUILD_DOCS && params.DO_TEST_INSTALL ) } }
-                    steps {
-                      dir("tmp/test-install-withDOCS") {
-                        deleteDir()
-                        unstash 'built-docs'
-                        retry(3) {
-                        timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                            sh """CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:\${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}" DESTDIR="${params.USE_TEST_INSTALL_DESTDIR}/withDOCS" install"""
-                        }
-                        }
-                        sh """cd "${params.USE_TEST_INSTALL_DESTDIR}/withDOCS" && find . -ls"""
-                        sh 'echo "Are GitIgnores good after make install with Docs? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-            }
-        }
-        stage ('deploy if appropriate') {
-            steps {
-                script {
-                    def myDEPLOY_JOB_NAME = sh(returnStdout: true, script: """echo "${params["DEPLOY_JOB_NAME"]}" """).trim();
-                    def myDEPLOY_BRANCH_PATTERN = sh(returnStdout: true, script: """echo "${params["DEPLOY_BRANCH_PATTERN"]}" """).trim();
-                    def myDEPLOY_REPORT_RESULT = sh(returnStdout: true, script: """echo "${params["DEPLOY_REPORT_RESULT"]}" """).trim().toBoolean();
-                    echo "Original: DEPLOY_JOB_NAME : ${params["DEPLOY_JOB_NAME"]} DEPLOY_BRANCH_PATTERN : ${params["DEPLOY_BRANCH_PATTERN"]} DEPLOY_REPORT_RESULT : ${params["DEPLOY_REPORT_RESULT"]}"
-                    echo "Used:     myDEPLOY_JOB_NAME:${myDEPLOY_JOB_NAME} myDEPLOY_BRANCH_PATTERN:${myDEPLOY_BRANCH_PATTERN} myDEPLOY_REPORT_RESULT:${myDEPLOY_REPORT_RESULT}"
-                    if ( (myDEPLOY_JOB_NAME != "") && (myDEPLOY_BRANCH_PATTERN != "") ) {
-                        if ( env.BRANCH_NAME =~ myDEPLOY_BRANCH_PATTERN ) {
-                            def GIT_URL = sh(returnStdout: true, script: """git remote -v | egrep '^origin' | awk '{print \$2}' | head -1""").trim()
-                            def GIT_COMMIT = sh(returnStdout: true, script: 'git rev-parse --verify HEAD').trim()
-                            def DIST_ARCHIVE = ""
-                            if ( params.DO_DIST_DOCS ) { DIST_ARCHIVE = env.BUILD_URL + "artifact/__dist.tar.gz" }
-                            build job: "${myDEPLOY_JOB_NAME}", parameters: [
-                                string(name: 'DEPLOY_GIT_URL', value: "${GIT_URL}"),
-                                string(name: 'DEPLOY_GIT_BRANCH', value: env.BRANCH_NAME),
-                                string(name: 'DEPLOY_GIT_COMMIT', value: "${GIT_COMMIT}"),
-                                string(name: 'DEPLOY_DIST_ARCHIVE', value: "${DIST_ARCHIVE}")
-                                ], quietPeriod: 0, wait: myDEPLOY_REPORT_RESULT, propagate: myDEPLOY_REPORT_RESULT
-                        } else {
-                            echo "Not deploying because branch '${env.BRANCH_NAME}' did not match filter '${myDEPLOY_BRANCH_PATTERN}'"
-                        }
-                    } else {
-                        echo "Not deploying because deploy-job parameters are not set"
-                    }
-                }
-            }
-        }
-    }
-    post {
-        success {
-            script {
-                if (currentBuild.getPreviousBuild()?.result != 'SUCCESS') {
-                    // Uncomment desired notification
-
-                    //slackSend (color: "#008800", message: "Build ${env.JOB_NAME} is back to normal.")
-                    //emailext (to: "qa@example.com", subject: "Build ${env.JOB_NAME} is back to normal.", body: "Build ${env.JOB_NAME} is back to normal.")
-                }
-            }
-        }
-        failure {
-            // Uncomment desired notification
-            // Section must not be empty, you can delete the sleep once you set notification
-            sleep 1
-            //slackSend (color: "#AA0000", message: "Build ${env.BUILD_NUMBER} of ${env.JOB_NAME} ${currentBuild.result} (<${env.BUILD_URL}|Open>)")
-            //emailext (to: "qa@example.com", subject: "Build ${env.JOB_NAME} failed!", body: "Build ${env.BUILD_NUMBER} of ${env.JOB_NAME} ${currentBuild.result}\nSee ${env.BUILD_URL}")
-        }
-    }
-}
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100755
index 51550a4d7..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,1466 +0,0 @@
-ACLOCAL_AMFLAGS = -I config
-
-SUBDIRS = doc
-
-DIST_SUBDIRS = doc builds builds/deprecated-msvc
-
-pkgconfig_DATA = src/libzmq.pc
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/include
-
-#
-# libraries/binaries
-#
-lib_LTLIBRARIES = src/libzmq.la
-
-include_HEADERS = \
-	include/zmq.h \
-	include/zmq_utils.h
-
-src_libzmq_la_SOURCES = \
-	src/address.cpp \
-	src/address.hpp \
-	src/array.hpp \
-	src/atomic_counter.hpp \
-	src/atomic_ptr.hpp \
-	src/blob.hpp \
-	src/channel.cpp \
-	src/channel.hpp \
-	src/client.cpp \
-	src/client.hpp \
-	src/clock.cpp \
-	src/clock.hpp \
-	src/command.hpp \
-	src/condition_variable.hpp \
-	src/config.hpp \
-	src/ctx.cpp \
-	src/ctx.hpp \
-	src/curve_client.cpp \
-	src/curve_client.hpp \
-	src/curve_client_tools.hpp \
-	src/curve_mechanism_base.cpp \
-	src/curve_mechanism_base.hpp \
-	src/curve_server.cpp \
-	src/curve_server.hpp \
-	src/dbuffer.hpp \
-	src/dealer.cpp \
-	src/dealer.hpp \
-	src/decoder.hpp \
-	src/devpoll.cpp \
-	src/devpoll.hpp \
-	src/dgram.cpp \
-	src/dgram.hpp \
-	src/dish.cpp \
-	src/dish.hpp \
-	src/dist.cpp \
-	src/dist.hpp \
-	src/encoder.hpp \
-	src/endpoint.hpp \
-	src/endpoint.cpp \
-	src/epoll.cpp \
-	src/epoll.hpp \
-	src/err.cpp \
-	src/err.hpp \
-	src/fd.hpp \
-	src/fq.cpp \
-	src/fq.hpp \
-	src/gather.cpp \
-	src/gather.hpp \
-	src/generic_mtrie.hpp \
-	src/generic_mtrie_impl.hpp \
-	src/gssapi_mechanism_base.cpp \
-	src/gssapi_mechanism_base.hpp \
-	src/gssapi_client.cpp \
-	src/gssapi_client.hpp \
-	src/gssapi_server.cpp \
-	src/gssapi_server.hpp \
-	src/i_encoder.hpp \
-	src/i_engine.hpp \
-	src/i_decoder.hpp \
-	src/i_mailbox.hpp \
-	src/i_poll_events.hpp \
-	src/io_object.cpp \
-	src/io_object.hpp \
-	src/io_thread.cpp \
-	src/io_thread.hpp \
-	src/ip.cpp \
-	src/ip.hpp \
-	src/ip_resolver.cpp \
-	src/ip_resolver.hpp \
-	src/ipc_address.cpp \
-	src/ipc_address.hpp \
-	src/ipc_connecter.cpp \
-	src/ipc_connecter.hpp \
-	src/ipc_listener.cpp \
-	src/ipc_listener.hpp \
-	src/kqueue.cpp \
-	src/kqueue.hpp \
-	src/lb.cpp \
-	src/lb.hpp \
-	src/likely.hpp \
-	src/macros.hpp \
-	src/mailbox.cpp \
-	src/mailbox.hpp \
-	src/mailbox_safe.cpp \
-	src/mailbox_safe.hpp \
-	src/mechanism.cpp \
-	src/mechanism.hpp  \
-	src/mechanism_base.cpp \
-	src/mechanism_base.hpp  \
-	src/metadata.cpp \
-	src/metadata.hpp \
-	src/msg.cpp \
-	src/msg.hpp \
-	src/mtrie.cpp \
-	src/mtrie.hpp \
-	src/mutex.hpp \
-	src/norm_engine.cpp \
-	src/norm_engine.hpp \
-	src/null_mechanism.cpp \
-	src/null_mechanism.hpp \
-	src/object.cpp \
-	src/object.hpp \
-	src/options.cpp \
-	src/options.hpp \
-	src/own.cpp \
-	src/own.hpp \
-	src/pair.cpp \
-	src/pair.hpp \
-	src/peer.cpp \
-	src/peer.hpp \
-	src/pgm_receiver.cpp \
-	src/pgm_receiver.hpp \
-	src/pgm_sender.cpp \
-	src/pgm_sender.hpp \
-	src/pgm_socket.cpp \
-	src/pgm_socket.hpp \
-	src/pipe.cpp \
-	src/pipe.hpp \
-	src/plain_client.cpp \
-	src/plain_client.hpp \
-	src/plain_common.hpp \
-	src/plain_server.cpp \
-	src/plain_server.hpp \
-	src/platform.hpp \
-	src/poll.cpp \
-	src/poll.hpp \
-	src/poller.hpp \
-	src/poller_base.cpp \
-	src/poller_base.hpp \
-	src/polling_util.cpp \
-	src/polling_util.hpp \
-	src/pollset.cpp \
-	src/pollset.hpp \
-	src/precompiled.cpp \
-	src/precompiled.hpp \
-	src/proxy.cpp \
-	src/proxy.hpp \
-	src/pub.cpp \
-	src/pub.hpp \
-	src/pull.cpp \
-	src/pull.hpp \
-	src/push.cpp \
-	src/push.hpp \
-	src/radio.cpp \
-	src/radio.hpp \
-	src/radix_tree.cpp \
-	src/radix_tree.hpp \
-	src/random.cpp \
-	src/random.hpp \
-	src/raw_decoder.cpp \
-	src/raw_decoder.hpp \
-	src/raw_encoder.cpp \
-	src/raw_encoder.hpp \
-	src/raw_engine.cpp \
-	src/raw_engine.hpp \
-	src/reaper.cpp \
-	src/reaper.hpp \
-	src/rep.cpp \
-	src/rep.hpp \
-	src/req.cpp \
-	src/req.hpp \
-	src/router.cpp \
-	src/router.hpp \
-	src/scatter.cpp \
-	src/scatter.hpp \
-	src/secure_allocator.hpp \
-	src/select.cpp \
-	src/select.hpp \
-	src/server.cpp \
-	src/server.hpp \
-	src/session_base.cpp \
-	src/session_base.hpp \
-	src/signaler.cpp \
-	src/signaler.hpp \
-	src/socket_base.cpp \
-	src/socket_base.hpp \
-	src/socks.cpp \
-	src/socks.hpp \
-	src/socks_connecter.cpp \
-	src/socks_connecter.hpp \
-	src/stdint.hpp \
-	src/stream.cpp \
-	src/stream.hpp \
-	src/stream_connecter_base.cpp \
-	src/stream_connecter_base.hpp \
-	src/stream_listener_base.cpp \
-	src/stream_listener_base.hpp \
-	src/stream_engine_base.cpp \
-	src/stream_engine_base.hpp \
-	src/sub.cpp \
-	src/sub.hpp \
-	src/tcp.cpp \
-	src/tcp.hpp \
-	src/tcp_address.cpp \
-	src/tcp_address.hpp \
-	src/tcp_connecter.cpp \
-	src/tcp_connecter.hpp \
-	src/tcp_listener.cpp \
-	src/tcp_listener.hpp \
-	src/thread.cpp \
-	src/thread.hpp \
-	src/timers.cpp \
-	src/timers.hpp \
-	src/tipc_address.cpp \
-	src/tipc_address.hpp \
-	src/tipc_connecter.cpp \
-	src/tipc_connecter.hpp \
-	src/tipc_listener.cpp \
-	src/tipc_listener.hpp \
-	src/trie.cpp \
-	src/trie.hpp \
-	src/udp_address.cpp \
-	src/udp_address.hpp \
-	src/udp_engine.cpp \
-	src/udp_engine.hpp \
-	src/v1_decoder.cpp \
-	src/v1_decoder.hpp \
-	src/v2_decoder.cpp \
-	src/v2_decoder.hpp \
-	src/v1_encoder.cpp \
-	src/v1_encoder.hpp \
-	src/v2_encoder.cpp \
-	src/v2_encoder.hpp \
-	src/v3_1_encoder.cpp \
-	src/v3_1_encoder.hpp \
-	src/v2_protocol.hpp \
-	src/vmci.cpp \
-	src/vmci.hpp \
-	src/vmci_address.cpp \
-	src/vmci_address.hpp \
-	src/vmci_connecter.cpp \
-	src/vmci_connecter.hpp \
-	src/vmci_listener.cpp \
-	src/vmci_listener.hpp \
-	src/windows.hpp \
-	src/wire.hpp \
-	src/xpub.cpp \
-	src/xpub.hpp \
-	src/xsub.cpp \
-	src/xsub.hpp \
-	src/ypipe.hpp \
-	src/ypipe_base.hpp \
-	src/ypipe_conflate.hpp \
-	src/yqueue.hpp \
-	src/zmq.cpp \
-	src/zmq_utils.cpp \
-	src/decoder_allocators.cpp \
-	src/decoder_allocators.hpp \
-	src/socket_poller.cpp \
-	src/socket_poller.hpp \
-	src/zap_client.cpp \
-	src/zap_client.hpp \
-	src/zmtp_engine.cpp \
-	src/zmtp_engine.hpp \
-	src/zmq_draft.h
-
-if USE_WEPOLL
-src_libzmq_la_SOURCES += \
-	external/wepoll/wepoll.c \
-	external/wepoll/wepoll.h
-endif
-
-if USE_TWEETNACL
-src_libzmq_la_SOURCES += \
-	src/tweetnacl.c \
-	src/tweetnacl.h
-endif
-
-if HAVE_WS
-src_libzmq_la_SOURCES += \
-	src/ws_address.cpp \
-	src/ws_address.hpp \
-	src/wss_address.cpp \
-	src/wss_address.hpp \
-	src/ws_connecter.cpp \
-	src/ws_connecter.hpp \
-	src/ws_decoder.cpp \
-	src/ws_decoder.hpp \
-	src/ws_encoder.cpp \
-	src/ws_encoder.hpp \
-	src/ws_engine.cpp \
-	src/ws_engine.hpp \
-	src/ws_listener.cpp \
-	src/ws_listener.hpp \
-	src/ws_protocol.hpp
-endif
-
-if USE_BUILTIN_SHA1
-src_libzmq_la_SOURCES += \
-	external/sha1/sha1.c \
-	external/sha1/sha1.h
-endif
-
-if HAVE_WSS
-src_libzmq_la_SOURCES += \
-	src/wss_engine.cpp \
-	src/wss_engine.hpp
-endif
-
-if ON_MINGW
-src_libzmq_la_LDFLAGS = \
-	-no-undefined \
-	-avoid-version \
-	-version-info @LTVER@ \
-	@LIBZMQ_EXTRA_LDFLAGS@
-else
-if ON_CYGWIN
-src_libzmq_la_LDFLAGS = \
-	-no-undefined \
-	-avoid-version \
-	-version-info @LTVER@ \
-	@LIBZMQ_EXTRA_LDFLAGS@
-else
-if ON_ANDROID
-src_libzmq_la_LDFLAGS = \
-	-avoid-version \
-	-version-info @LTVER@ \
-	@LIBZMQ_EXTRA_LDFLAGS@
-else
-src_libzmq_la_LDFLAGS = \
-	-version-info @LTVER@ \
-	@LIBZMQ_EXTRA_LDFLAGS@
-endif
-endif
-endif
-
-if HAVE_VSCRIPT_COMPLEX
-src_libzmq_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(srcdir)/src/libzmq.vers
-endif
-
-src_libzmq_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) $(LIBUNWIND_CFLAGS) $(LIBBSD_CFLAGS)
-src_libzmq_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(LIBUNWIND_CFLAGS) $(LIBBSD_CFLAGS)
-src_libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@ $(CODE_COVERAGE_CXXFLAGS) \
-	$(LIBUNWIND_CFLAGS) $(LIBBSD_CFLAGS)
-src_libzmq_la_LIBADD = $(CODE_COVERAGE_LDFLAGS) $(LIBUNWIND_LIBS) $(LIBBSD_LIBS)
-
-if USE_NSS
-src_libzmq_la_CPPFLAGS += ${NSS3_CFLAGS}
-src_libzmq_la_LIBADD += ${NSS3_LIBS}
-endif
-
-if USE_GNUTLS
-src_libzmq_la_CPPFLAGS += ${GNUTLS_CFLAGS}
-src_libzmq_la_LIBADD += ${GNUTLS_LIBS}
-endif
-
-if USE_LIBSODIUM
-src_libzmq_la_CPPFLAGS += ${sodium_CFLAGS}
-src_libzmq_la_LIBADD += ${sodium_LIBS}
-endif
-
-if HAVE_PGM
-src_libzmq_la_CPPFLAGS += ${pgm_CFLAGS}
-src_libzmq_la_LIBADD += ${pgm_LIBS}
-endif
-
-if HAVE_NORM
-src_libzmq_la_CPPFLAGS += ${norm_CFLAGS}
-src_libzmq_la_LIBADD += ${norm_LIBS}
-endif
-
-if BUILD_GSSAPI
-src_libzmq_la_CPPFLAGS += ${gssapi_krb5_CFLAGS}
-src_libzmq_la_LIBADD += ${gssapi_krb5_LIBS}
-endif
-
-if ENABLE_PERF
-noinst_PROGRAMS = \
-	perf/local_lat \
-	perf/remote_lat \
-	perf/local_thr \
-	perf/remote_thr \
-	perf/inproc_lat \
-	perf/inproc_thr \
-	perf/proxy_thr
-
-perf_local_lat_LDADD = src/libzmq.la
-perf_local_lat_SOURCES = perf/local_lat.cpp
-
-perf_remote_lat_LDADD = src/libzmq.la
-perf_remote_lat_SOURCES = perf/remote_lat.cpp
-
-perf_local_thr_LDADD = src/libzmq.la
-perf_local_thr_SOURCES = perf/local_thr.cpp
-
-perf_remote_thr_LDADD = src/libzmq.la
-perf_remote_thr_SOURCES = perf/remote_thr.cpp
-
-perf_inproc_lat_LDADD = src/libzmq.la
-perf_inproc_lat_SOURCES = perf/inproc_lat.cpp
-
-perf_inproc_thr_LDADD = src/libzmq.la
-perf_inproc_thr_SOURCES = perf/inproc_thr.cpp
-
-perf_proxy_thr_LDADD = src/libzmq.la
-perf_proxy_thr_SOURCES = perf/proxy_thr.cpp
-
-if ENABLE_STATIC
-noinst_PROGRAMS += \
-	perf/benchmark_radix_tree
-
-perf_benchmark_radix_tree_DEPENDENCIES = src/libzmq.la
-perf_benchmark_radix_tree_CPPFLAGS = -I$(top_srcdir)/src
-perf_benchmark_radix_tree_LDADD = $(top_builddir)/src/.libs/libzmq.a \
-	${src_libzmq_la_LIBADD}
-perf_benchmark_radix_tree_SOURCES = perf/benchmark_radix_tree.cpp
-endif
-endif
-
-if ENABLE_CURVE_KEYGEN
-bin_PROGRAMS = tools/curve_keygen
-
-tools_curve_keygen_LDADD = src/libzmq.la
-tools_curve_keygen_SOURCES = tools/curve_keygen.cpp
-endif
-
-#
-# tests
-#
-test_apps = \
-	tests/test_ancillaries \
-	tests/test_system \
-	tests/test_pair_inproc \
-	tests/test_pair_tcp \
-	tests/test_reqrep_inproc \
-	tests/test_reqrep_tcp \
-	tests/test_hwm \
-	tests/test_hwm_pubsub \
-	tests/test_reqrep_device \
-	tests/test_sub_forward \
-	tests/test_invalid_rep \
-	tests/test_msg_flags \
-	tests/test_msg_ffn \
-	tests/test_connect_resolve \
-	tests/test_immediate \
-	tests/test_last_endpoint \
-	tests/test_term_endpoint \
-	tests/test_srcfd \
-	tests/test_monitor \
-	tests/test_router_mandatory \
-	tests/test_router_mandatory_hwm \
-	tests/test_router_handover \
-	tests/test_probe_router \
-	tests/test_stream \
-	tests/test_stream_empty \
-	tests/test_stream_disconnect \
-	tests/test_stream_timeout \
-	tests/test_disconnect_inproc \
-	tests/test_unbind_wildcard \
-	tests/test_ctx_options \
-	tests/test_ctx_destroy \
-        tests/test_security_no_zap_handler \
-        tests/test_security_null \
-	tests/test_security_plain \
-	tests/test_security_zap \
-	tests/test_iov \
-	tests/test_spec_req \
-	tests/test_spec_rep \
-	tests/test_spec_dealer \
-	tests/test_spec_router \
-	tests/test_spec_pushpull \
-	tests/test_req_correlate \
-	tests/test_req_relaxed \
-	tests/test_conflate \
-	tests/test_inproc_connect \
-	tests/test_issue_566 \
-	tests/test_proxy \
-	tests/test_proxy_hwm \
-	tests/test_proxy_single_socket \
-	tests/test_proxy_terminate \
-	tests/test_getsockopt_memset \
-	tests/test_setsockopt \
-	tests/test_diffserv \
-	tests/test_connect_rid \
-	tests/test_bind_src_address \
-	tests/test_metadata \
-	tests/test_capabilities \
-	tests/test_xpub_nodrop \
-	tests/test_xpub_manual \
-	tests/test_xpub_welcome_msg \
-	tests/test_xpub_verbose \
-	tests/test_atomics \
-	tests/test_sockopt_hwm \
-	tests/test_heartbeats \
-	tests/test_stream_exceeds_buffer \
-	tests/test_pub_invert_matching \
-	tests/test_base85 \
-	tests/test_bind_after_connect_tcp \
-	tests/test_sodium \
-	tests/test_reconnect_ivl \
-	tests/test_mock_pub_sub \
-	tests/test_socket_null
-
-UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT
-UNITY_LIBS = $(top_builddir)/external/unity/libunity.a
-external_unity_libunity_a_SOURCES = external/unity/unity.c \
-	external/unity/unity.h \
-	external/unity/unity_internals.h
-
-TESTUTIL_CPPFLAGS = ${UNITY_CPPFLAGS}
-TESTUTIL_LIBS = $(top_builddir)/tests/libtestutil.a ${UNITY_LIBS}
-tests_libtestutil_a_SOURCES = \
-        tests/testutil.cpp \
-        tests/testutil.hpp \
-        tests/testutil_monitoring.cpp \
-        tests/testutil_monitoring.hpp \
-        tests/testutil_security.cpp \
-        tests/testutil_security.hpp \
-        tests/testutil_unity.cpp \
-        tests/testutil_unity.hpp
-tests_libtestutil_a_CPPFLAGS = ${UNITY_CPPFLAGS}
-
-noinst_LIBRARIES = external/unity/libunity.a tests/libtestutil.a
-
-tests_test_ancillaries_SOURCES = tests/test_ancillaries.cpp
-tests_test_ancillaries_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_ancillaries_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_system_SOURCES = tests/test_system.cpp
-tests_test_system_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_system_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pair_inproc_SOURCES = tests/test_pair_inproc.cpp
-tests_test_pair_inproc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pair_inproc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pair_tcp_SOURCES = tests/test_pair_tcp.cpp
-tests_test_pair_tcp_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pair_tcp_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_inproc_SOURCES = tests/test_reqrep_inproc.cpp
-tests_test_reqrep_inproc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_inproc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_tcp_SOURCES = tests/test_reqrep_tcp.cpp
-tests_test_reqrep_tcp_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_tcp_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_hwm_SOURCES = tests/test_hwm.cpp
-tests_test_hwm_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_hwm_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_hwm_pubsub_SOURCES = tests/test_hwm_pubsub.cpp
-tests_test_hwm_pubsub_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_hwm_pubsub_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_device_SOURCES = tests/test_reqrep_device.cpp
-tests_test_reqrep_device_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_device_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_sub_forward_SOURCES = tests/test_sub_forward.cpp
-tests_test_sub_forward_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_sub_forward_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_invalid_rep_SOURCES = tests/test_invalid_rep.cpp
-tests_test_invalid_rep_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_invalid_rep_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_msg_flags_SOURCES = tests/test_msg_flags.cpp
-tests_test_msg_flags_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_msg_flags_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_msg_ffn_SOURCES = tests/test_msg_ffn.cpp
-tests_test_msg_ffn_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_msg_ffn_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_resolve_SOURCES = tests/test_connect_resolve.cpp
-tests_test_connect_resolve_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_resolve_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_immediate_SOURCES = tests/test_immediate.cpp
-tests_test_immediate_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_immediate_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_last_endpoint_SOURCES = tests/test_last_endpoint.cpp
-tests_test_last_endpoint_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_last_endpoint_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_term_endpoint_SOURCES = tests/test_term_endpoint.cpp
-tests_test_term_endpoint_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_term_endpoint_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_srcfd_SOURCES = tests/test_srcfd.cpp
-tests_test_srcfd_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_srcfd_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_monitor_SOURCES = tests/test_monitor.cpp
-tests_test_monitor_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_monitor_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_mandatory_SOURCES = tests/test_router_mandatory.cpp
-tests_test_router_mandatory_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_mandatory_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_mandatory_hwm_SOURCES = tests/test_router_mandatory_hwm.cpp
-tests_test_router_mandatory_hwm_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_mandatory_hwm_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_handover_SOURCES = tests/test_router_handover.cpp
-tests_test_router_handover_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_handover_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_probe_router_SOURCES = tests/test_probe_router.cpp
-tests_test_probe_router_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_probe_router_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_SOURCES = tests/test_stream.cpp
-tests_test_stream_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_empty_SOURCES = tests/test_stream_empty.cpp
-tests_test_stream_empty_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_empty_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_timeout_SOURCES = tests/test_stream_timeout.cpp
-tests_test_stream_timeout_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_timeout_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_disconnect_SOURCES = tests/test_stream_disconnect.cpp
-tests_test_stream_disconnect_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_disconnect_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_disconnect_inproc_SOURCES = tests/test_disconnect_inproc.cpp
-tests_test_disconnect_inproc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_disconnect_inproc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_unbind_wildcard_SOURCES = tests/test_unbind_wildcard.cpp
-tests_test_unbind_wildcard_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_unbind_wildcard_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_ctx_options_SOURCES = tests/test_ctx_options.cpp
-tests_test_ctx_options_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_ctx_options_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_iov_SOURCES = tests/test_iov.cpp
-tests_test_iov_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_iov_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_ctx_destroy_SOURCES = tests/test_ctx_destroy.cpp
-tests_test_ctx_destroy_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_ctx_destroy_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_security_no_zap_handler_SOURCES = tests/test_security_no_zap_handler.cpp
-tests_test_security_no_zap_handler_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_no_zap_handler_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_security_null_SOURCES = tests/test_security_null.cpp
-tests_test_security_null_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_null_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_security_plain_SOURCES = tests/test_security_plain.cpp
-tests_test_security_plain_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_plain_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_security_zap_SOURCES = tests/test_security_zap.cpp
-tests_test_security_zap_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_zap_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_req_SOURCES = tests/test_spec_req.cpp
-tests_test_spec_req_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_req_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_rep_SOURCES = tests/test_spec_rep.cpp
-tests_test_spec_rep_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_rep_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_dealer_SOURCES = tests/test_spec_dealer.cpp
-tests_test_spec_dealer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_dealer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_router_SOURCES = tests/test_spec_router.cpp
-tests_test_spec_router_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_router_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_pushpull_SOURCES = tests/test_spec_pushpull.cpp
-tests_test_spec_pushpull_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_pushpull_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_req_correlate_SOURCES = tests/test_req_correlate.cpp
-tests_test_req_correlate_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_req_correlate_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_req_relaxed_SOURCES = tests/test_req_relaxed.cpp
-tests_test_req_relaxed_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_req_relaxed_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_conflate_SOURCES = tests/test_conflate.cpp
-tests_test_conflate_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_conflate_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_inproc_connect_SOURCES = tests/test_inproc_connect.cpp
-tests_test_inproc_connect_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_inproc_connect_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_issue_566_SOURCES = tests/test_issue_566.cpp
-tests_test_issue_566_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_issue_566_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_proxy_SOURCES = tests/test_proxy.cpp
-tests_test_proxy_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_proxy_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_proxy_hwm_SOURCES = tests/test_proxy_hwm.cpp
-tests_test_proxy_hwm_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_proxy_hwm_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_proxy_single_socket_SOURCES = tests/test_proxy_single_socket.cpp
-tests_test_proxy_single_socket_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_proxy_single_socket_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_proxy_terminate_SOURCES = tests/test_proxy_terminate.cpp
-tests_test_proxy_terminate_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_proxy_terminate_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_getsockopt_memset_SOURCES = tests/test_getsockopt_memset.cpp
-tests_test_getsockopt_memset_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_getsockopt_memset_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_diffserv_SOURCES = tests/test_diffserv.cpp
-tests_test_diffserv_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_diffserv_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_rid_SOURCES = tests/test_connect_rid.cpp
-tests_test_connect_rid_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_rid_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_bind_src_address_SOURCES = tests/test_bind_src_address.cpp
-tests_test_bind_src_address_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_src_address_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_metadata_SOURCES = tests/test_metadata.cpp
-tests_test_metadata_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_metadata_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_capabilities_SOURCES = tests/test_capabilities.cpp
-tests_test_capabilities_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_capabilities_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_nodrop_SOURCES = tests/test_xpub_nodrop.cpp
-tests_test_xpub_nodrop_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_nodrop_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_manual_SOURCES = tests/test_xpub_manual.cpp
-tests_test_xpub_manual_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_manual_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_welcome_msg_SOURCES = tests/test_xpub_welcome_msg.cpp
-tests_test_xpub_welcome_msg_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_welcome_msg_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_verbose_SOURCES = tests/test_xpub_verbose.cpp
-tests_test_xpub_verbose_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_verbose_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_atomics_SOURCES = tests/test_atomics.cpp
-tests_test_atomics_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_atomics_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_sockopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp
-tests_test_sockopt_hwm_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_sockopt_hwm_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_setsockopt_SOURCES = tests/test_setsockopt.cpp
-tests_test_setsockopt_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_setsockopt_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_heartbeats_SOURCES = tests/test_heartbeats.cpp
-tests_test_heartbeats_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_heartbeats_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_exceeds_buffer_SOURCES = tests/test_stream_exceeds_buffer.cpp
-tests_test_stream_exceeds_buffer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_exceeds_buffer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pub_invert_matching_SOURCES = tests/test_pub_invert_matching.cpp
-tests_test_pub_invert_matching_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pub_invert_matching_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_bind_after_connect_tcp_SOURCES = tests/test_bind_after_connect_tcp.cpp
-tests_test_bind_after_connect_tcp_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_after_connect_tcp_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_base85_SOURCES = tests/test_base85.cpp
-tests_test_base85_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_base85_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_sodium_SOURCES = tests/test_sodium.cpp
-tests_test_sodium_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_sodium_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_socket_null_SOURCES = tests/test_socket_null.cpp
-tests_test_socket_null_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_socket_null_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reconnect_ivl_SOURCES = tests/test_reconnect_ivl.cpp
-tests_test_reconnect_ivl_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reconnect_ivl_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_mock_pub_sub_SOURCES = tests/test_mock_pub_sub.cpp
-tests_test_mock_pub_sub_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_mock_pub_sub_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-if HAVE_CURVE
-
-test_apps += \
-	tests/test_security_curve
-
-tests_test_security_curve_SOURCES = \
-	tests/test_security_curve.cpp \
-        src/curve_client_tools.hpp \
-	src/clock.hpp \
-	src/clock.cpp \
-	src/random.hpp \
-	src/random.cpp \
-	src/err.hpp \
-	src/err.cpp
-
-if USE_TWEETNACL
-tests_test_security_curve_SOURCES += \
-	src/tweetnacl.c
-endif
-
-tests_test_security_curve_LDADD = \
-        ${TESTUTIL_LIBS} src/libzmq.la $(LIBUNWIND_LIBS) $(LIBBSD_LIBS)
-tests_test_security_curve_CPPFLAGS = \
-        ${TESTUTIL_CPPFLAGS} \
-	${LIBUNWIND_CFLAGS}  ${LIBBSD_CFLAGS}
-
-if USE_LIBSODIUM
-tests_test_security_curve_CPPFLAGS += \
-	${sodium_CFLAGS}
-tests_test_security_curve_LDADD += \
-	${sodium_LIBS}
-endif
-
-endif
-
-if HAVE_WS
-test_apps += \
-	tests/test_ws_transport
-tests_test_ws_transport_SOURCES = tests/test_ws_transport.cpp
-tests_test_ws_transport_LDADD = ${TESTUTIL_LIBS} src/libzmq.la ${NSS3_LIBS}
-tests_test_ws_transport_CPPFLAGS = ${TESTUTIL_CPPFLAGS} ${NSS3_CFLAGS}
-endif
-
-if HAVE_WSS
-test_apps += \
-	tests/test_wss_transport
-tests_test_wss_transport_SOURCES = tests/test_wss_transport.cpp
-tests_test_wss_transport_LDADD = ${TESTUTIL_LIBS} src/libzmq.la ${GNUTLS_LIBS}
-tests_test_wss_transport_CPPFLAGS = ${TESTUTIL_CPPFLAGS} ${GNUTLS_CFLAGS}
-endif
-
-if !ON_MINGW
-if !ON_CYGWIN
-test_apps += \
-	tests/test_shutdown_stress \
-	tests/test_ipc_wildcard \
-	tests/test_pair_ipc \
-	tests/test_rebind_ipc \
-	tests/test_reqrep_ipc \
-	tests/test_use_fd \
-	tests/test_zmq_poll_fd \
-	tests/test_timeo \
-	tests/test_filter_ipc
-
-tests_test_shutdown_stress_SOURCES = tests/test_shutdown_stress.cpp
-tests_test_shutdown_stress_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_shutdown_stress_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_ipc_wildcard_SOURCES = tests/test_ipc_wildcard.cpp
-tests_test_ipc_wildcard_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_ipc_wildcard_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pair_ipc_SOURCES = tests/test_pair_ipc.cpp
-tests_test_pair_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pair_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_rebind_ipc_SOURCES = tests/test_rebind_ipc.cpp
-tests_test_rebind_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_rebind_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_ipc_SOURCES = tests/test_reqrep_ipc.cpp
-tests_test_reqrep_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_timeo_SOURCES = tests/test_timeo.cpp
-tests_test_timeo_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_timeo_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_filter_ipc_SOURCES = tests/test_filter_ipc.cpp
-tests_test_filter_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_filter_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_use_fd_SOURCES = tests/test_use_fd.cpp
-tests_test_use_fd_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_use_fd_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_zmq_poll_fd_SOURCES = tests/test_zmq_poll_fd.cpp
-tests_test_zmq_poll_fd_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_zmq_poll_fd_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-if HAVE_FORK
-if !VALGRIND_ENABLED
-test_apps += tests/test_fork
-
-tests_test_fork_SOURCES = tests/test_fork.cpp
-tests_test_fork_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_fork_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-endif
-endif
-endif
-endif
-
-if BUILD_TIPC
-test_apps += \
-	tests/test_connect_delay_tipc \
-	tests/test_pair_tipc \
-	tests/test_reqrep_device_tipc \
-	tests/test_reqrep_tipc \
-	tests/test_router_mandatory_tipc \
-	tests/test_shutdown_stress_tipc \
-	tests/test_sub_forward_tipc \
-	tests/test_term_endpoint_tipc \
-	tests/test_address_tipc
-
-tests_test_connect_delay_tipc_SOURCES = tests/test_connect_delay_tipc.cpp
-tests_test_connect_delay_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_delay_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pair_tipc_SOURCES = tests/test_pair_tipc.cpp
-tests_test_pair_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pair_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_device_tipc_SOURCES = tests/test_reqrep_device_tipc.cpp
-tests_test_reqrep_device_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_device_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_tipc_SOURCES = tests/test_reqrep_tipc.cpp
-tests_test_reqrep_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_mandatory_tipc_SOURCES = tests/test_router_mandatory_tipc.cpp
-tests_test_router_mandatory_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_mandatory_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_shutdown_stress_tipc_SOURCES = tests/test_shutdown_stress_tipc.cpp
-tests_test_shutdown_stress_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_shutdown_stress_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_sub_forward_tipc_SOURCES = tests/test_sub_forward_tipc.cpp
-tests_test_sub_forward_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_sub_forward_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_term_endpoint_tipc_SOURCES = tests/test_term_endpoint_tipc.cpp
-tests_test_term_endpoint_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_term_endpoint_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_address_tipc_SOURCES = tests/test_address_tipc.cpp
-tests_test_address_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_address_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-endif
-
-if BUILD_GSSAPI
-test_apps += tests/test_security_gssapi
-
-tests_test_security_gssapi_SOURCES = tests/test_security_gssapi.cpp
-tests_test_security_gssapi_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_gssapi_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-endif
-
-if ON_LINUX
-test_apps += tests/test_abstract_ipc \
-	tests/test_socks
-
-tests_test_abstract_ipc_SOURCES = tests/test_abstract_ipc.cpp
-tests_test_abstract_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_abstract_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_socks_SOURCES = tests/test_socks.cpp
-tests_test_socks_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_socks_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-# TODO: enable when https://github.com/zeromq/libzmq/issues/3898 is fixed
-if !ENABLE_ASAN
-test_apps += tests/test_many_sockets
-
-tests_test_many_sockets_SOURCES = tests/test_many_sockets.cpp
-tests_test_many_sockets_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_many_sockets_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-endif
-
-endif
-
-if HAVE_VMCI
-test_apps += test_pair_vmci test_reqrep_vmci
-
-test_pair_vmci_SOURCES = tests/test_pair_vmci.cpp
-test_pair_vmci_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-test_pair_vmci_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-test_pair_vmci_LDFLAGS = @LIBZMQ_VMCI_LDFLAGS@
-test_pair_vmci_CXXFLAGS = @LIBZMQ_VMCI_CXXFLAGS@
-
-test_reqrep_vmci_SOURCES = tests/test_reqrep_vmci.cpp
-test_reqrep_vmci_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-test_reqrep_vmci_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-test_reqrep_vmci_LDFLAGS = @LIBZMQ_VMCI_LDFLAGS@
-test_reqrep_vmci_CXXFLAGS = @LIBZMQ_VMCI_CXXFLAGS@
-
-endif
-
-if ENABLE_DRAFTS
-test_apps += tests/test_poller \
-	tests/test_client_server \
-	tests/test_thread_safe \
-	tests/test_timers \
-	tests/test_radio_dish \
-	tests/test_scatter_gather \
-	tests/test_dgram \
-	tests/test_app_meta \
-	tests/test_xpub_manual_last_value \
-	tests/test_router_notify \
-	tests/test_peer \
-	tests/test_reconnect_options \
-	tests/test_msg_init \
-	tests/test_hello_msg \
-	tests/test_disconnect_msg \
-	tests/test_channel
-
-tests_test_poller_SOURCES = tests/test_poller.cpp
-tests_test_poller_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_poller_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_client_server_SOURCES = tests/test_client_server.cpp
-tests_test_client_server_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_client_server_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_thread_safe_SOURCES = tests/test_thread_safe.cpp
-tests_test_thread_safe_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_thread_safe_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_timers_SOURCES = tests/test_timers.cpp
-tests_test_timers_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_timers_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_radio_dish_SOURCES = tests/test_radio_dish.cpp
-tests_test_radio_dish_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_radio_dish_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_scatter_gather_SOURCES = tests/test_scatter_gather.cpp
-tests_test_scatter_gather_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_scatter_gather_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_dgram_SOURCES = tests/test_dgram.cpp
-tests_test_dgram_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_dgram_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_manual_last_value_SOURCES = tests/test_xpub_manual_last_value.cpp
-tests_test_xpub_manual_last_value_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_manual_last_value_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_app_meta_SOURCES = tests/test_app_meta.cpp
-tests_test_app_meta_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_app_meta_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_notify_SOURCES = tests/test_router_notify.cpp
-tests_test_router_notify_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_notify_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_peer_SOURCES = tests/test_peer.cpp
-tests_test_peer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_peer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reconnect_options_SOURCES = tests/test_reconnect_options.cpp
-tests_test_reconnect_options_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reconnect_options_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_msg_init_SOURCES = tests/test_msg_init.cpp
-tests_test_msg_init_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_msg_init_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_hello_msg_SOURCES = tests/test_hello_msg.cpp
-tests_test_hello_msg_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_hello_msg_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_disconnect_msg_SOURCES = tests/test_disconnect_msg.cpp
-tests_test_disconnect_msg_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_disconnect_msg_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_channel_SOURCES = tests/test_channel.cpp
-tests_test_channel_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_channel_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-endif
-
-if FUZZING_ENGINE_LIB
-fuzzer_apps = tests/test_bind_null_fuzzer \
-	tests/test_connect_null_fuzzer \
-	tests/test_bind_fuzzer \
-	tests/test_connect_fuzzer
-
-tests_test_bind_null_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_bind_null_fuzzer_SOURCES = tests/test_bind_null_fuzzer.cpp
-tests_test_bind_null_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_bind_null_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_bind_null_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_connect_null_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_connect_null_fuzzer_SOURCES = tests/test_connect_null_fuzzer.cpp
-tests_test_connect_null_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_connect_null_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_connect_null_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_bind_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_bind_fuzzer_SOURCES = tests/test_bind_fuzzer.cpp
-tests_test_bind_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_bind_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_bind_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_connect_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_connect_fuzzer_SOURCES = tests/test_connect_fuzzer.cpp
-tests_test_connect_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_connect_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_connect_fuzzer_CXXFLAGS = -std=c++11
-
-if HAVE_CURVE
-fuzzer_apps += tests/test_bind_curve_fuzzer \
-	tests/test_connect_curve_fuzzer \
-	tests/test_z85_decode_fuzzer
-
-tests_test_bind_curve_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_bind_curve_fuzzer_SOURCES = tests/test_bind_curve_fuzzer.cpp
-tests_test_bind_curve_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_bind_curve_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_bind_curve_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_connect_curve_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_connect_curve_fuzzer_SOURCES = tests/test_connect_curve_fuzzer.cpp
-tests_test_connect_curve_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_connect_curve_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_connect_curve_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_z85_decode_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_z85_decode_fuzzer_SOURCES = tests/test_z85_decode_fuzzer.cpp
-tests_test_z85_decode_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_z85_decode_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_z85_decode_fuzzer_CXXFLAGS = -std=c++11
-endif
-
-FUZZINGdir = ${prefix}/${FUZZING_INSTALLDIR}
-FUZZING_PROGRAMS = ${fuzzer_apps}
-FUZZING_DATA = tests/fuzzer_corpora/endpoint.dict tests/fuzzer_corpora/zmtp.dict \
-	tests/fuzzer_corpora/test_bind_curve_fuzzer.txt tests/fuzzer_corpora/test_bind_null_fuzzer.txt \
-	tests/fuzzer_corpora/test_connect_curve_fuzzer.txt tests/fuzzer_corpora/test_connect_null_fuzzer.txt
-install-data-hook:
-	$(LN_S) -r -f $(DESTDIR)/$(FUZZINGdir)/endpoint.dict $(DESTDIR)/$(FUZZINGdir)/test_bind_fuzzer.dict
-	$(LN_S) -r -f $(DESTDIR)/$(FUZZINGdir)/endpoint.dict $(DESTDIR)/$(FUZZINGdir)/test_connect_fuzzer.dict
-	$(LN_S) -r -f $(DESTDIR)/$(FUZZINGdir)/zmtp.dict $(DESTDIR)/$(FUZZINGdir)/test_bind_curve_fuzzer.dict
-	$(LN_S) -r -f $(DESTDIR)/$(FUZZINGdir)/zmtp.dict $(DESTDIR)/$(FUZZINGdir)/test_bind_null_fuzzer.dict
-	$(LN_S) -r -f $(DESTDIR)/$(FUZZINGdir)/zmtp.dict $(DESTDIR)/$(FUZZINGdir)/test_connect_curve_fuzzer.dict
-	$(LN_S) -r -f $(DESTDIR)/$(FUZZINGdir)/zmtp.dict $(DESTDIR)/$(FUZZINGdir)/test_connect_null_fuzzer.dict
-	$(shell while read -r test; do \
-		echo -n $$test | perl -e 'print pack "H*", <STDIN>' > $(DESTDIR)/$(FUZZINGdir)/test_bind_curve_fuzzer.seed; \
-		export fn=$$(cat $(DESTDIR)/$(FUZZINGdir)/test_bind_curve_fuzzer.seed | sha1sum | awk '{print $$1}'); \
-		mv $(DESTDIR)/$(FUZZINGdir)/test_bind_curve_fuzzer.seed $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		zip -j -m -g --quiet $(DESTDIR)/$(FUZZINGdir)/test_bind_curve_fuzzer_seed_corpus.zip $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		done < $(DESTDIR)/$(FUZZINGdir)/test_bind_curve_fuzzer.txt)
-	$(shell while read -r test; do \
-		echo -n $$test | perl -e 'print pack "H*", <STDIN>' > $(DESTDIR)/$(FUZZINGdir)/test_bind_null_fuzzer.seed; \
-		export fn=$$(cat $(DESTDIR)/$(FUZZINGdir)/test_bind_null_fuzzer.seed | sha1sum | awk '{print $$1}'); \
-		mv $(DESTDIR)/$(FUZZINGdir)/test_bind_null_fuzzer.seed $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		zip -j -m -g --quiet $(DESTDIR)/$(FUZZINGdir)/test_bind_null_fuzzer_seed_corpus.zip $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		done < $(DESTDIR)/$(FUZZINGdir)/test_bind_null_fuzzer.txt)
-	$(shell while read -r test; do \
-		echo -n $$test | perl -e 'print pack "H*", <STDIN>' > $(DESTDIR)/$(FUZZINGdir)/test_connect_curve_fuzzer.seed; \
-		export fn=$$(cat $(DESTDIR)/$(FUZZINGdir)/test_connect_curve_fuzzer.seed | sha1sum | awk '{print $$1}'); \
-		mv $(DESTDIR)/$(FUZZINGdir)/test_connect_curve_fuzzer.seed $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		zip -j -m -g --quiet $(DESTDIR)/$(FUZZINGdir)/test_connect_curve_fuzzer_seed_corpus.zip $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		done < $(DESTDIR)/$(FUZZINGdir)/test_connect_curve_fuzzer.txt)
-	$(shell while read -r test; do \
-		echo -n $$test | perl -e 'print pack "H*", <STDIN>' > $(DESTDIR)/$(FUZZINGdir)/test_connect_null_fuzzer.seed; \
-		export fn=$$(cat $(DESTDIR)/$(FUZZINGdir)/test_connect_null_fuzzer.seed | sha1sum | awk '{print $$1}'); \
-		mv $(DESTDIR)/$(FUZZINGdir)/test_connect_null_fuzzer.seed $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		zip -j -m -g --quiet $(DESTDIR)/$(FUZZINGdir)/test_connect_null_fuzzer_seed_corpus.zip $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		done < $(DESTDIR)/$(FUZZINGdir)/test_connect_null_fuzzer.txt)
-	$(shell while read -r test; do \
-		echo -n $$test | perl -e 'print pack "H*", <STDIN>' > $(DESTDIR)/$(FUZZINGdir)/test_bind_fuzzer.seed; \
-		export fn=$$(cat $(DESTDIR)/$(FUZZINGdir)/test_bind_fuzzer.seed | sha1sum | awk '{print $$1}'); \
-		mv $(DESTDIR)/$(FUZZINGdir)/test_bind_fuzzer.seed $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		zip -j -m -g --quiet $(DESTDIR)/$(FUZZINGdir)/test_bind_fuzzer.zip $(DESTDIR)/$(FUZZINGdir)/$$fn; \
-		done < $(DESTDIR)/$(FUZZINGdir)/test_bind_fuzzer.txt)
-	rm -f $(DESTDIR)/$(FUZZINGdir)/*.txt
-else
-test_apps += tests/test_bind_null_fuzzer \
-	tests/test_connect_null_fuzzer \
-	tests/test_bind_fuzzer \
-	tests/test_connect_fuzzer
-
-tests_test_bind_null_fuzzer_SOURCES = tests/test_bind_null_fuzzer.cpp
-tests_test_bind_null_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_null_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_null_fuzzer_SOURCES = tests/test_connect_null_fuzzer.cpp
-tests_test_connect_null_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_null_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_bind_fuzzer_SOURCES = tests/test_bind_fuzzer.cpp
-tests_test_bind_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_fuzzer_SOURCES = tests/test_connect_fuzzer.cpp
-tests_test_connect_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-if HAVE_CURVE
-test_apps += tests/test_bind_curve_fuzzer \
-	tests/test_connect_curve_fuzzer \
-	tests/test_z85_decode_fuzzer
-
-tests_test_bind_curve_fuzzer_SOURCES = tests/test_bind_curve_fuzzer.cpp
-tests_test_bind_curve_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_curve_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_curve_fuzzer_SOURCES = tests/test_connect_curve_fuzzer.cpp
-tests_test_connect_curve_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_curve_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_z85_decode_fuzzer_SOURCES = tests/test_z85_decode_fuzzer.cpp
-tests_test_z85_decode_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_z85_decode_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-endif
-endif
-
-if ENABLE_STATIC
-# unit tests - these include individual source files and test the internal functions
-test_apps += \
-	unittests/unittest_poller \
-	unittests/unittest_ypipe \
-	unittests/unittest_mtrie \
-	unittests/unittest_ip_resolver \
-	unittests/unittest_udp_address \
-	unittests/unittest_radix_tree \
-	unittests/unittest_curve_encoding
-
-unittests_unittest_poller_SOURCES = unittests/unittest_poller.cpp
-unittests_unittest_poller_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_poller_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_poller_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_ypipe_SOURCES = unittests/unittest_ypipe.cpp
-unittests_unittest_ypipe_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_ypipe_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_ypipe_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_mtrie_SOURCES = unittests/unittest_mtrie.cpp
-unittests_unittest_mtrie_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_mtrie_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_mtrie_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_ip_resolver_SOURCES = unittests/unittest_ip_resolver.cpp unittests/unittest_resolver_common.hpp
-unittests_unittest_ip_resolver_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_ip_resolver_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_ip_resolver_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_udp_address_SOURCES = unittests/unittest_udp_address.cpp unittests/unittest_resolver_common.hpp
-unittests_unittest_udp_address_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_udp_address_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_udp_address_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_radix_tree_SOURCES = unittests/unittest_radix_tree.cpp
-unittests_unittest_radix_tree_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_radix_tree_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_radix_tree_LDADD =  \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_curve_encoding_SOURCES = unittests/unittest_curve_encoding.cpp
-unittests_unittest_curve_encoding_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_curve_encoding_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_curve_encoding_LDADD =  \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-endif
-
-check_PROGRAMS = ${test_apps}
-
-#  Run the test cases
-TESTS = $(test_apps)
-XFAIL_TESTS =
-
-if !ON_LINUX
-XFAIL_TESTS += tests/test_abstract_ipc
-endif
-
-#  GNU/Hurd does not support getsockname on IPC, so ZMQ_LAST_ENDPOINT cannot be
-#  used with IPC, so the following tests will fail
-if ON_GNU
-XFAIL_TESTS += tests/test_ipc_wildcard \
-		tests/test_reqrep_ipc \
-		tests/test_pair_ipc \
-		tests/test_rebind_ipc \
-		tests/test_term_endpoint
-endif
-
-EXTRA_DIST = \
-	external/unity/license.txt \
-	external/unity/version.txt \
-	external/wepoll/license.txt \
-	external/wepoll/version.txt \
-	external/wepoll/README.md \
-	CMakeLists.txt \
-	autogen.sh	\
-	version.sh	\
-	ci_build.sh \
-	src/libzmq.vers \
-	src/version.rc.in \
-	tests/CMakeLists.txt \
-        tests/test_pair_tcp_cap_net_admin.cpp \
-	tests/fuzzer_corpora/endpoint.dict tests/fuzzer_corpora/zmtp.dict \
-	tests/fuzzer_corpora/test_bind_curve_fuzzer.txt tests/fuzzer_corpora/test_bind_null_fuzzer.txt \
-	tests/fuzzer_corpora/test_connect_curve_fuzzer.txt tests/fuzzer_corpora/test_connect_null_fuzzer.txt \
-	unittests/CMakeLists.txt \
-        tools/curve_keygen.cpp
-
-MAINTAINERCLEANFILES = \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autom4te.cache \
-	$(srcdir)/configure \
-	`find "$(srcdir)" -type f -name Makefile.in -print`
-
-if WITH_CLANG_FORMAT
-ALL_SOURCE_FILES = $(wildcard \
-	$(top_srcdir)/src/*.c \
-	$(top_srcdir)/src/*.cc \
-	$(top_srcdir)/src/*.cpp \
-	$(top_srcdir)/src/*.h \
-	$(top_srcdir)/src/*.hpp \
-	$(top_srcdir)/tests/*.c \
-	$(top_srcdir)/tests/*.cc \
-	$(top_srcdir)/tests/*.cpp \
-	$(top_srcdir)/tests/*.h \
-	$(top_srcdir)/tests/*.hpp \
-	$(top_srcdir)/perf/*.c \
-	$(top_srcdir)/perf/*.cc \
-	$(top_srcdir)/perf/*.cpp \
-	$(top_srcdir)/perf/*.h \
-	$(top_srcdir)/perf/*.hpp \
-	$(top_srcdir)/tools/*.c \
-	$(top_srcdir)/tools/*.cc \
-	$(top_srcdir)/tools/*.cpp \
-	$(top_srcdir)/tools/*.h \
-	$(top_srcdir)/tools/*.hpp \
-	$(top_srcdir)/include/*.h \
- )
-
-# Check if any sources need to be fixed, report the filenames and an error code
-clang-format-check: $(ALL_SOURCE_FILES)
-	@FAILED=0 ; IFS=";" ; IDS="`printf '\n\b'`" ; export IFS IDS; \
-	 for FILE in $(ALL_SOURCE_FILES) ; do \
-		test -s $$FILE || continue ; \
-		$(CLANG_FORMAT) -style=file -output-replacements-xml "$$FILE" | grep "<replacement " >/dev/null && \
-		{ echo "$$FILE is not correctly formatted" >&2 ; FAILED=1; } ; \
-	 done; \
-	 if test "$$FAILED" != 0 ; then \
-		exit 1 ; \
-	 fi
-
-# Change source formatting
-clang-format: $(ALL_SOURCE_FILES)
-	$(CLANG_FORMAT) -style=file -i $(ALL_SOURCE_FILES)
-
-# Change source formatting AND report the diff
-clang-format-diff: clang-format
-	git diff $(ALL_SOURCE_FILES)
-
-else
-clang-format clang-format-check clang-format-diff:
-	@echo "Install the clang-format program, reconfigure and re-run this request"
-	@exit 1
-endif
-
-@CODE_COVERAGE_RULES@
-
-dist-hook:
-	-rm $(distdir)/src/platform.hpp
-	@if test -d "$(srcdir)/.git"; \
-	then \
-		echo Creating ChangeLog && \
-		( cd "$(top_srcdir)" && \
-		  echo '# Generated by Makefile. Do not edit.'; echo; \
-		  $(top_srcdir)/config/missing --run git log --stat ) > ChangeLog.tmp \
-		  && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-		  || ( rm -f ChangeLog.tmp ; \
-		       echo Failed to generate ChangeLog >&2 ); \
-	else \
-		echo A git clone is required to generate a ChangeLog >&2; \
-	fi
-
-maintainer-clean-local:
-	-rm -rf $(top_srcdir)/config
-
-@VALGRIND_CHECK_RULES@
-
-VALGRIND_SUPPRESSIONS_FILES = builds/valgrind/valgrind.supp
diff --git a/NEWS b/NEWS
deleted file mode 100644
index de6692203..000000000
--- a/NEWS
+++ /dev/null
@@ -1,2118 +0,0 @@
-0MQ version 4.3.x stable, released on 20xx/xx/xx
-================================================
-
-* Note for packagers: an external, self-contained sha1 library is now
-  included in the source tree under external/sha1/ - it is licensed
-  under BSD-3-Clause and thus it is fully compatible with libzmq's
-  license.
-  It is only used if WebSockets support is enabled, and if neither GnuTLS nor
-  NSS are available.
-
-* Note for packagers: an internal reimplementation of strlcpy is now included,
-  for wider platform compatibility.
-  libbsd can be used and is enabled by default if available instead of the
-  internal implementation, for better security maintenance in distros.
-
-* New DRAFT (see NEWS for 4.2.0) socket option:
-  - ZMQ_ONLY_FIRST_SUBSCRIBE will cause only the first part of a multipart
-    message to be processed as a subscribe/unsubscribe message, and the rest
-    will be forwarded as user data to the application.
-  - ZMQ_RECONNECT_STOP will cause a connecting socket to stop trying to
-    reconnect in specific circumstances. In this release, this can be set to
-    ECONNREFUSED errors, which implies the other end is not listening on the
-    requested port.
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) zmq_ctx_get_ext/zmq_ctx_set_ext APIs were added
-  to allow enhancing the context options with variable data inputs.
-  See doc/zmq_ctx_get_ext.txt and doc/zmq_ctx_set_ext.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) transport options WS and WSS added for support
-  of WebSockets (and secure WebSockets via TLS) via the ZWS 2.0 protocol.
-  WSS requires the GnuTLS library for TLS support. ZMQ_WSS_ specific socket
-  options were added to support TLS.
-  WebSockets support is disabled by default if DRAFT APIs are disabled.
-
-* New DRAFT (see NEWS for 4.2.0) socket type, PEER, which is thread safe and a
-  related zmq_connect_peer function which atomically and thread-safely connects
-  and returns a routing-id.
-
-* ZMTP 3.1 is now fully implemented, and 3.1 peers will receive subscribe/cancel
-  on PUB/SUB via commands rather than using the first byte of the payload.
-
-* Fixed #3566 - malformed CURVE message can cause memory leak
-
-* Fixed #3567 - missing ZeroMQ_INCLUDE_DIR in ZeroMQConfig.cmake when only
-                static lib is built
-
-* Fixed #3576 - CURVE plaintext secrets now stored in libsodium's secure memory
-
-* Fixed #3588 - install debug libraries for debug msvc builds with CMake
-
-* Fixed #3591 - incorrect ZMQ_MAX_SOCKETS default value in doc
-
-* Fixed #3594 - fixed stream_engine use after free due to concurrent heartbeats
-
-* Fixed #3586 - error when compiling with MinGW due to usage of MS-specific
-                __except keyword
-
-* Fixed #3603 - fixed CMake build on SL6.9
-
-* Fixed #3607 - added scripts to ease performance graph generation
-
-* Fixed #3608 - fix for IPv4 mapping not supported in DragonFlyBSD
-
-* Fixed #3636 - added ENABLE_PRECOMPILED CMake option to fix build with Ninja
-
-* Fixed #2862 - UDP engine aborts on networking-related errors from socket
-                syscalls
-
-* Fixed #3656 - segfault on sending data from XSUB to XPUB
-
-* Fixed #3646 - static-only test run fails
-
-* Fixed #3668 - fixed CMAKE_CXX_FLAGS_* regexes on MSVC
-
-* Fixed #110  - do not include winsock2.h in public zmq.h header
-
-* Fixed #3683 - allow "configure --disable-maintainer-mode"
-
-* Fixed #3686 - fix documentation about sockets blocking on send operations
-
-* Fixed #3323 - fix behavior of ZMQ_CONFLATE on PUB sockets
-
-* Fixed #3698 - fix build on IBM i/PASE/os400
-
-* Fixed #3705 - zero-sized messages cause assertion when glibc assertion are on
-
-* Fixed #3713 - remove dependency on math library by avoiding std::ceil
-
-* Fixed #3694 - build targeting Windows XP is broken
-
-* Fixed #3691 - added support for IPC on Windows 10 via AF_UNIX
-
-* Fixed #3725 - disable by default test that requires sudo on CMake
-
-* Fixed #3727 - fix zmq_poller documentation example
-
-* Fixed #3729 - do not check for FD_OOB when using WSAEventSelect on Windows
-
-* Fixed #3738 - allow renaming the library in CMake
-
-* Fixed #1808 - use AF_UNIX instead of TCP for the internal socket on Windows 10
-
-* Fixed #3758 - fix pthread_set_affinity detection in CMake
-
-* Fixed #3769 - fix undefined behaviour in array.hpp
-
-* Fixed #3772 - fix compiling under msys2-mingw
-
-* Fixed #3775 - add -latomic to the private libs flag in pkg-config if needed
-
-* Fixed #3778 - fix documentation of zmq_poller's thread safety
-
-* Fixed #3792 - do not allow creation of new sockets after zmq_ctx_shutdown
-
-* Fixed #3805 - improve performance of CURVE by reducing copies
-
-* Fixed #3814 - send subscribe/cancel as commands to ZMTP 3.1 peers
-
-0MQ version 4.3.2 stable, released on 2019/07/08
-================================================
-
-* CVE-2019-13132: a remote, unauthenticated client connecting to a
-  libzmq application, running with a socket listening with CURVE
-  encryption/authentication enabled, may cause a stack overflow and
-  overwrite the stack with arbitrary data, due to a buffer overflow in
-  the library. Users running public servers with the above configuration
-  are highly encouraged to upgrade as soon as possible, as there are no
-  known mitigations. All versions from 4.0.0 and upwards are affected.
-  Thank you Fang-Pen Lin for finding the issue and reporting it!
-
-* New DRAFT (see NEWS for 4.2.0) zmq_socket_monitor_versioned API that supports
-  a versioned monitoring events protocol as a parameter. Passing 1 results in
-  the same behaviour as zmq_socket_monitor.
-  Version 2 of the events protocol allows new events, new metadata, different
-  socket types for the monitors and more. It is described in details in
-  doc/zmq_socket_monitor_versioned.txt
-
-* New DRAFT (see NEWS for 4.2.0) zmq_socket_monitor_pipes_stats that triggers
-  a new ZMQ_EVENT_PIPES_STATS to be delivered via zmq_socket_monitor_versioned
-  v2 API, which contains the current status of all the queues owned by the
-  monitored socket. See doc/zmq_socket_monitor_versioned.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) zmq_poller_fd that returns the FD of a thread
-  safe socket. See doc/zmq_poller.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) socket options:
-  - ZMQ_XPUB_MANUAL_LAST_VALUE is similar to ZMQ_XPUB_MANUAL but allows to avoid
-    duplicates when using last value caching.
-  - ZMQ_SOCKS_USERNAME and ZMQ_SOCKS_PASSWORD that implement SOCKS5 proxy
-    authentication.
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* Implemented background thread names for Windows, when the Visual Studio
-  debugger is being used.
-
-* Fixed #3358 - test_security_zap failing due to SIGBUS on SPARC64, hard-coded
-                IPC socket binds in tests cause race conditions
-
-* Fixed #3361 - enabling GSSAPI support (when using autools) does not work due
-                to regression introduced in 4.2.3
-
-* Fixed #3362 - remove documentation for ZMQ_THREAD_PRIORITY context option
-                getter, it's not implemented
-
-* Fixed #3363 - tests fail to build due to stricter compiler printf validation
-                in new versions of GCC
-
-* Fixed #3367 - try to infer cacheline size at build time, first with
-                getconf LEVEL1_DCACHE_LINESIZE, and then by reading
-                /sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size
-                (autoconf only), and only then falling back to the previous
-                default of 64 bytes. Avoids false sharing on POWER and s390x.
-                Import ax_func_posix_memalign.m4 as a more reliable check for
-                posix_memalign presence on some unix platforms.
-                Prefer c++11 atomic primitives to compiler intrinsics, when
-                both are available, as the former is more reliable.
-                Set test_pair_ipc and test_rebind_ipc to XFAIL on GNU/Hurd due
-                to non-functioning getsockname on AF_UNIX.
-
-* Fixed #3370 - Make queue length and HWM state observable
-
-* Fixed #3373 - performance regression in zmq_poll on CentOS 6/7
-
-* Fixed #3375 - assign names to all pthreads created by the library to ease
-                debugging
-
-* Fixed #3376 - assigned random TIPC port is not returned by ZMQ_LAST_ENDPOINT
-
-* Fixed #3385 - TCP port in ZMQ_LAST_ENDPOINT depends on global locale
-
-* Fixed #3404 - use std::condition_variable_any when possible
-
-* Fixed #3436 - reconnect interval exponential backoff and may lead to integer
-                overflows
-
-* Fixed #3440 - improve zmq_proxy performance by batching of up to 1000
-                consecutive messages (if any) and add perf/proxy_thr tool
-
-* Fixed #3451 - fix support of /dev/poll on Solaris
-
-* Fixed #3452 - strnlen may not be available
-
-* Fixed #1462 - test failure in test_filter_ipc due to invalid system groups
-
-* Fixed #3269 - Boost.ASIO integration stopped working with v4.3.0
-
-* Fixed #3479 - ZeroMQ does not build for QNX 6.6 with CMake
-
-* Fixed #3481 - add <ios> include to fix uClibc++ compilation
-
-* Fixed #3491 - build broken on Fedora 30
-
-* Fixed #3494 - ZeroMQConfig.cmake fails if shared libraries are not built
-
-* Fixed #3498 - syntax error on Windows related to socket descriptor type
-
-* Fixed #3500 - PLAIN HELLO message incorrectly uses WELCOME literal, regression
-                introduced in 4.3.0
-
-* Fixed #3517 - configure errors because of syntax errors in the use of test
-                shell command
-
-* Fixed #3521 - document how to achieve high performance with the PGM transport
-
-* Fixed #3526 - failure case behavior unclear in zmq_msg_send documentation
-
-* Fixed #3537 - fix build on z/OS by using pthread_equal instead of comparing
-                variables directly
-
-* Fixed #3546 - CMake links with librt on MinGW which is not available
-
-* Many coding style, duplication, testing and static analysis improvements.
-
-
-0MQ version 4.3.1 stable, released on 2019/01/12
-================================================
-
-* CVE-2019-6250: A vulnerability has been found that would allow attackers to
-  direct a peer to jump to and execute from an address indicated by the
-  attacker.
-  This issue has been present since v4.2.0. Older releases are not affected.
-  NOTE: The attacker needs to know in advance valid addresses in the peer's
-  memory to jump to, so measures like ASLR are effective mitigations.
-  NOTE: this attack can only take place after authentication, so peers behind
-  CURVE/GSSAPI are not vulnerable to unauthenticated attackers.
-  See https://github.com/zeromq/libzmq/issues/3351 for more details.
-  Thanks to Guido Vranken for uncovering the issue and providing the fix!
-
-* Note for packagers: as pkg-config's Requires.private is now used to properly
-  propagate dependencies for static builds, the libzmq*-dev or zeromq-devel or
-  equivalent package should now depend on the libfoo-dev or foo-devel packages
-  of all the libraries that zmq is linked against, or pkg-config --libs libzmq
-  will fail due to missing dependencies on end users machines.
-
-* Fixed #3351 - remote code execution vulnerability.
-
-* Fixed #3343 - race condition in ZMQ_PUSH when quickly disconnecting and
-                reconnecting causes last part of multi-part message to get
-                "stuck" and resent by mistake to the new socket.
-
-* Fixed #3336 - set Requires.private in generate pkg-config file.
-
-* Fixed #3334 - set TCP_NODELAY after connect() on Windows for the I/O socket.
-
-* Fixed #3326 - assert on Android when opening a socket and disabling WiFi.
-
-* Fixed #3320 - build failure on OpenBSD with GCC.
-
-0MQ version 4.3.0 stable, released on 2018/11/28
-================================================
-
-* The following DRAFT APIs have been marked as STABLE and will not change
-  anymore:
-  - ZMQ_MSG_T_SIZE context option (see doc/zmq_ctx_get.txt)
-  - ZMQ_THREAD_AFFINITY_CPU_ADD and ZMQ_THREAD_AFFINITY_CPU_REMOVE (Posix only)
-    context options, to add/remove CPUs to the affinity set of the I/O threads.
-    See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-  - ZMQ_THREAD_NAME_PREFIX (Posix only) context option, to add a specific
-    integer prefix to the background threads names, to easily identify them.
-    See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-  - ZMQ_GSSAPI_PRINCIPAL_NAMETYPE and ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE
-    socket options, for the corresponding GSSAPI features. Additional
-    definitions for principal name types:
-    - ZMQ_GSSAPI_NT_HOSTBASED
-    - ZMQ_GSSAPI_NT_USER_NAME
-    - ZMQ_GSSAPI_NT_KRB5_PRINCIPAL
-    See doc/zmq_gssapi.txt for details.
-  - ZMQ_BINDTODEVICE socket option (Linux only), which will bind the
-    socket(s) to the specified interface. Allows to use Linux VRF, see:
-    https://www.kernel.org/doc/Documentation/networking/vrf.txt
-    NOTE: requires the program to be ran as root OR with CAP_NET_RAW
-  - zmq_timers_* APIs. These functions can be used for cross-platforms timed
-    callbacks. See doc/zmq_timers.txt for details.
-  - The following socket monitor events:
-    - ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL: unknown errors during handshake.
-    - ZMQ_EVENT_HANDSHAKE_SUCCEEDED: Handshake completed with authentication.
-    - ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL: Protocol errors with peers or ZAP.
-    - ZMQ_EVENT_HANDSHAKE_FAILED_AUTH: Failed authentication requests.
-    See doc/zmq_socket_monitor.txt for more details and error codes.
-  - zmq_stopwatch_intermediate which returns the time elapsed without stopping
-    the stopwatch.
-  - zmq_proxy_steerable command 'STATISTICS' to retrieve stats about the amount
-    of messages and bytes sent and received by the proxy.
-    See doc/zmq_proxy_steerable.txt for more information.
-
-* The build-time configuration option to select the poller has been split, and
-  new API_POLLER (CMake) and --with-api-poller (autoconf) options will now
-  determine what system call is used to implement the zmq_poll/zmq_poller APIs.
-  The previous POLLER and --with-poller options now only affects the
-  internal I/O thread. In case API_POLLER is not specified, the behaviour keeps
-  backward compatibility intact and will be the same as with previous releases.
-
-* The non-default "poll" poller for the internal I/O thread (note: NOT for the
-  zmq_poll/zmq_poller user APIs!) has been disabled on Windows as WSAPoll does
-  not report connection failures. For more information see:
-  - https://daniel.haxx.se/blog/2012/10/10/wsapoll-is-broken/
-  - https://curl.haxx.se/mail/lib-2012-10/0038.html
-  - https://bugs.python.org/issue16507
-
-* New epoll implementation for Windows, using the following implementation:
-  https://github.com/piscisaureus/wepoll/tree/v1.5.4
-  To use this, select "epoll" as the poller option in the build system.
-  Note for distributors: the wepoll source code is embedded and distributed.
-  It is licensed under the BSD-2-Clause and thus it is compatible with LGPL-3.0.
-  Note that, if selected at build time, the license text must be distributed
-  with the binary in accordance to the license terms. A copy can be found at:
-  external/wepoll/license.txt
-
-* The pre-made Visual Studio solutions file are deprecated, and users are
-  encouraged to use the CMake solution generation feature instead.
-
-* New DRAFT (see NEWS for 4.2.0) socket options:
-  - ZMQ_ROUTER_NOTIFY to deliver a notification when a peer connects and/or
-    disconnects in the form of a routing id plus a zero-length frame.
-  - ZMQ_MULTICAST_LOOP to control whether the data sent should be looped back
-    on local listening sockets for UDP multicast sockets (ZMQ_RADIO).
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New perf tool, perf/benchmark_radix_tree, to measure the performance of the
-  different internal implementations of the trie algorithm used to track
-  subscriptions. Requires a compiler that supports C++11.
-
-* New autoconf flag "--enable-force-CXX98-compat" which will force -std=gnu++98
-  and, if the compiler supports them (clang++ at the moment), it will also add
-  -Wc++98-compat -Wc++98-compat-pedantic so that compatibility with C++98 can
-  be tested.
-
-* Many, many coding style, duplication and static analysis improvements.
-
-* Many, many improvements to the CMake build system, especially on Windows.
-
-* Many, many improvements to unit tests.
-
-* Fixed #3036 - Compilation error when -pedantic is used.
-
-* Fixed #3028 - Failure when zmq_poller_destroy is called after zmq_ctx_term.
-
-* Fixed #2989 - CMake: Linker PDB install rule does not work when Visual Studio
-                generators are used.
-
-* Fixed #3045 - configure.ac: search for dladdr only when using libunwind.
-
-* Fixed #3060 - REQ sockets terminate TCP connection after first heartbeat if
-                ZMQ_HEARTBEAT_IVL is set.
-
-* Fixed #2212 - UDP: need ability to specify bind address separately from
-                multicast address for multi-homed hosts.
-
-* Fixed #2891 - UDP: address name resolution is limited to dotted IPv4 rather
-                than being capable of IPv4, IPv6, and hostname lookup.
-
-* Fixed #3085 - autoconf/CMake getrandom test does not check if it's working but
-                only for its presence.
-
-* Fixed #3090 - compilation broken with Solaris Studio.
-
-* Fixed #3094 - UDP: pass interface via IP[V6]_MULTICAST_IF if provided.
-
-* Fixed #3061 - implement ZMTP 3.1 ping/pong context sending/receiving.
-
-* Fixed #2188 - Added documentation for new zmq_poller API.
-
-* Fixed #3088 - zmq_poller_add/zmq_poller_modify should reject invalid events
-                arguments.
-
-* Fixed #3042 - Fixed compilation on ARM with ZMQ_ATOMIC_PTR_MUTEX.
-
-* Fixed #3107 - test_immediate_3/test_reconnect_inproc do not terminate with
-                POLL as the I/O thread poller under Windows.
-
-* Fixed #3046 - Aborts when iOS abuses EBADF to report a socket has been
-                reclaimed.
-
-* Fixed #3136 - Cannot set ZMQ_HEARTBEAT_TTL to more than 655.3 seconds.
-
-* Fixed #3083 - link with -latomic when needed.
-
-* Fixed #3162 - build failure with MUSL libc.
-
-* Fixed #3158 - -1 value of ZMQ_RECONNECT_IVL was not correctly handled on some
-                platforms.
-
-* Fixed #3170 - improved documentation for ZMQ_PAIR.
-
-* Fixed #3168 - correctly use symbols map on Debian/kFreeBSD and Debian/HURD
-                to avoid exporting standard library symbols.
-
-* Fixed #3168 - correctly process ZMTP 3.1 cancel/subscribe commands.
-
-* Fixed #3171 - improve documentation for ZMQ_CONFLATE.
-
-* Fixed #2876 - stack overflow on Windows 64.
-
-* Fixed #3191 - race condition with received message causes
-                ZMQ_CONNECT_ROUTING_ID to be assigned to wrong socket.
-
-* Fixed #3005 - added documentation for new zmq_timers_* API.
-
-* Fixed #3222 - use /Z7 debug on Release builds too on Windows (CMake).
-
-* Fixed #3226 - possible PGM receiver crash.
-
-* Fixed #3236 - UDP dish socket can't bind to a multicast port already in use.
-
-* Fixed #3242 - improve HWM documentation.
-
-* Fixed #2488 - improve zmq_msg_send doc return value documentation.
-
-* Fixed #3268 - HWM in ZMQ_DGRAM socket does not respect multipart message.
-
-* Fixed #3284 - added support for ZMQ_MULTICAST_HOPS with UDP sockets.
-
-* Fixed #3245 - use-after-free reported in zmq::pipe_t::terminate.
-
-* Fixed #1400 - use patricia trie for subscription to improve performances and
-                memory usage. Note: only active in DRAFT builds for now.
-
-* Fixed #3263 - fix abort on Windows when a large TCP read is requested and
-                fails.
-
-* Fixed #3312 - fix build on Android Things 1.06 with Termux.
-
-
-0MQ version 4.2.5 stable, released on 2018/03/23
-================================================
-
-* Fixed #3018 - fix backward-incompatible change in the NULL auth
-                mechanism that slipped in 4.2.3 and made connections
-                with a ZAP domain set on a socket but without a working
-                ZAP handler fail. See ZMQ_ZAP_ENFORCE_DOMAIN and RFC27.
-
-* Fixed #3016 - clarify in zmq_close manpage that the operation will
-                complete asynchronously.
-
-* Fixed #3012 - fix CMake build problem when using LIBZMQ_WERROR and a
-                compiler other than GCC.
-
-
-0MQ version 4.2.4 stable, released on 2018/03/21
-================================================
-
-* New DRAFT (see NEWS for 4.2.0) socket options:
-  - ZMQ_LOOPBACK_FASTPATH to enable faster TCP loopback on Windows
-  - ZMQ_METADATA to set application-specific metadata on a socket
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) context options:
-  - ZMQ_ZERO_COPY_RECV to disable zero-copy receive to save memory
-    at the expense of slower performance
-  See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-
-* New DRAFT API zmq_stopwatch_intermediate which returns the time
-  elapsed without stopping the stopwatch.
-
-* TIPC: support addressing TIPC Port Identity addresses.
-
-* Added CMake option to disable tests: BUILD_TESTS
-
-* Added CMake and autotools make targets to support clang-formatter:
-  make clang-format, clang-format-check and clang-format-diff to
-  help developers make sure their code conforms to the style guidelines
-
-* For distributors: a new test framework has been added, which
-  includes a copy of the Unity source code. This source code library is
-  distributed under the MIT license and thus is compatible with
-  libzmq's LGPL3.
-
-* Fixed #2867 - add ZeroMQConfig.cmake.in to distributable tarball
-
-* Fixed #2868 - fix OpenBSD build
-
-* Fixed #2870 - fix VC++ 11.0 (VS2012) build
-
-* Fixed #2879 - prevent duplicate connections on PUB sockets
-
-* Fixed #2872 - fix CMake tests on Windows
-
-* Fixed #2895 - fix assert on Windows with POLL
-
-* Fixed #2920 - fix Windows build with Intel compiler
-
-* Fixed #2930 - use std::atomic when available with VC++ and VS2015
-
-* Fixed #2910 - fix race condition with ZMQ_LINGER socket option
-
-* Fixed #2927 - add support for ZMQ_XPUB_NODROP on ZMQ_RADIO
-
-* Fixed #2820 - further clarify ZMQ_XPUB_VERBOSE(R) documentation.
-
-* Fixed #2911 - ZMQ_DISH over UDP triggers errno_assert() after hitting
-                watermark
-
-* Fixed #2942 - ZMQ_PUB crash when due to high volume of subscribe and
-                unsubscribe messages, an unmatched unsubscribe message is
-                received in certain conditions
-
-* Fixed #2946 - fix Windows CMake build when BUILD_SHARED is off
-
-* Fixed #2960 - fix build with GCC 8
-
-* Fixed #2967 - fix race condition on thread safe sockets due to pthread
-                condvar timeouts on OSX
-
-* Fixed #2977 - fix TIPC build-time availability check to be more relaxed
-
-* Fixed #2966 - add support for WindRiver VxWorks 6.x
-
-* Fixed #2963 - fix some PVS Studio static analysis warnings
-
-* Fixed #2983 - fix MinGW cross-compilation
-
-* Fixed #2991 - fix mutex assert at shutdown when the zmq context is part
-                of a class declared as a global static
-
-
-0MQ version 4.2.3 stable, released on 2017/12/13
-================================================
-
-* API change: previously ZMQ_POLLOUT on a ZMQ_ROUTER socket returned always
-  true due to how the type works. When ZMQ_ROUTER_MANDATORY is set, sending
-  fails when the peer is not available, but ZMQ_POLLOUT always returns true
-  anyway, which does not make sense. Now when ZMQ_ROUTER_MANDATORY is set,
-  ZMQ_POLLOUT on a ZMQ_ROUTER will return true only if at least one peer is
-  available.
-  Given ZMQ_POLLOUT with ZMQ_ROUTER was not usable at all previously, we do
-  not consider this a breakage warranting a major or minor version increase.
-
-* ZMQ_IDENTITY has been renamed to ZMQ_ROUTING_ID and ZMQ_CONNECT_RID has been
-  renamed to ZMQ_CONNTECT_ROUTING_ID to disambiguate. ZMQ_IDENTITY and
-  ZMQ_CONNECT_RID are still available to keep backward compatibility, and will
-  be removed in a future release after further advance notice.
-
-* DRAFT API change: zmq_poller_wait, zmq_poller_wait_all and zmq_poller_poll
-  have been changed to be inline with other existing APIs that have a timeout
-  to return EAGAIN instead of ETIMEDOUT as the errno value.
-  See #2713 for details.
-
-* Existing non-DRAFT socket types ZMQ_REP/REQ, ZMQ_ROUTER/DEALER and
-  ZMQPUB/SUB, that were previously declared deprecated, have been reinstated
-  as stable and supported. See #2699 for details.
-
-* Tweetnacl: add support for, and use preferably if available, getrandom() as
-  a simpler and less error-prone alternative to /dev/urandom on OSes where it
-  is available (eg: Linux 3.18 with glibc 2.25).
-
-* Curve: all remaining traces of debug output to console are now removed, and
-  new DRAFT events are available to properly debug CURVE, PLAIN, GSSAPI and
-  ZAP events and failures. See below for details on the new events.
-
-* New DRAFT (see NEWS for 4.2.0) socket options:
-  - ZMQ_GSSAPI_PRINCIPAL_NAMETYPE and ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE, for
-    the corresponding GSSAPI features. Additional definitions for principal
-    name types:
-    - ZMQ_GSSAPI_NT_HOSTBASED
-    - ZMQ_GSSAPI_NT_USER_NAME
-    - ZMQ_GSSAPI_NT_KRB5_PRINCIPAL
-    See doc/zmq_gssapi.txt for details.
-  - ZMQ_BINDTODEVICE (Linux only), which will bind the socket(s) to the
-    specified interface. Allows to use Linux VRF, see:
-    https://www.kernel.org/doc/Documentation/networking/vrf.txt
-    NOTE: requires the program to be ran as root OR with CAP_NET_RAW
-  - ZMQ_ZAP_ENFORCE_DOMAIN, enables strict RFC 27 compatibility mode and makes
-    the ZAP Domain mandatory when using security. See:
-    https://rfc.zeromq.org/spec:27/ZAP
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) context options:
-  - ZMQ_THREAD_AFFINITY_CPU_ADD and ZMQ_THREAD_AFFINITY_CPU_REMOVE (Posix only),
-    to add and remove CPUs to the affinity set of the I/O threads. Useful to pin
-    the background threads to specific CPUs.
-  - ZMQ_THREAD_NAME_PREFIX (Posix only), to add a specific integer prefix to the
-    background threads names, to easily identify them for debugging purposes.
-  See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) message property name definitions to facilitate
-  the use of zmq_msg_gets:
-  - ZMQ_MSG_PROPERTY_ROUTING_ID
-  - ZMQ_MSG_PROPERTY_SOCKET_TYPE
-  - ZMQ_MSG_PROPERTY_USER_ID
-  - ZMQ_MSG_PROPERTY_PEER_ADDRESS
-  See doc/zmq_msg_gets.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) API zmq_socket_get_peer_state, to be used to
-  query the state of a specific peer (via routing-id) of a ZMQ_ROUTER socket.
-
-* New DRAFT (see NEWS for 4.2.0) Socket Monitor events:
-  - ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL, unknown system error and returns errno
-  - ZMQ_EVENT_HANDSHAKE_SUCCEEDED, handshake was successful
-  - ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL, protocol errors between peers or server
-    and ZAP handler. Returns one of ZMQ_PROTOCOL_ERROR_* - see manpage for list
-  - ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, failed authentication, returns ZAP status
-  These events trigger when the ZMTP security mechanism handshake is
-  completed or failed. See doc/zmq_socket_monitor.txt for more information.
-
-* New DRAFT (see NEWS for 4.2.0) zmq_proxy_steerable command 'STATISTICS' to
-  retrieve stats about the amount of messages and bytes sent and received by
-  the proxy. See doc/zmq_proxy_steerable.txt for more information.
-
-* Add new autoconf --disable-libunwind option to stop building with libunwind
-  even if it is available.
-
-* Add new autoconf --disable-Werror option to avoid building with the Werror
-  flag.
-
-* Use pkg-config as the first method for finding and building with external
-  optional dependencies such as libnorm, libpgm and gssapi.
-
-* On Posix platform where the feature is available, name the ZMQ background
-  threads to simplify debugging: "ZMQbg/<num_thread>"
-
-* Improve performance of zmq_poller_* (and zmq_poll and zmq_proxy when building
-  with DRAFT APIs enabled).
-
-* The TCP unit tests have been refactored to bind and connect to random ports
-  rather than hard-coded ones, to allow running tests in parallel.
-  There are 6 exceptions where it is necessary to use an hard-coded port to
-  test specific code paths that would not be exercised when binding to a
-  wildcard port. These are listed in tests/testutil.hpp so that distributions
-  can easily patch them if they wish to and so that they can be unique across
-  all the tests, allowing parallel runs.
-  The IPC unit tests have been changed as well to use unique socket file names
-  per test, where before there were some clashes.
-
-* Fixed #2349 - fix building with libsodium when using CMake
-
-* Fixed #2334 - do not assert when tuning socket options fails due to network
-  errors, but simply retry again when connecting or send a socket monitor
-  ZMQ_EVENT_ACCEPT_FAILED event when binding
-
-* Fixed #2341 - fix source files path in VS2015 solution
-
-* Fixed #2344 - Note that on Windows with VS2012 it is mandatory to increase
-  the default stack size to at least 2MB
-
-* Fixed #2348 - ZMQ_ROUTER send with ZMQ_ROUTER_MANDATORY can be stuck in case of
-  network problem
-
-* Fixed #2358 - occasional abort on zmq_connect on Windows
-
-* Fixed #2370 - zmq_curve_keypair should return an error on failure rather
-  than ignoring them and always returning 0
-
-* Fixed #2452 - __STDC_LIMIT_MACROS before precompiled headers causes VC++
-  warning
-
-* Fixed #2457 - fix building with libsodium in Visual Studio solutions
-
-* Fixed #2466 - add const qualifier to internal and public API that does not
-  modify parameters
-
-* Fixed #2471 - do more checks for OOM conditions when dynamic allocations is
-  used
-
-* Fixed #2476 - assertion causes abort after ZAP stop at shutdown
-
-* Fixed #2479 - improve zmq_poller performance on Windows
-
-* Fixed #2481 - potential memory leaks due to ZMTP handshake failures
-
-* Fixed #2531 - ZMQ_GSSAPI_PRINCIPAL sockopt has no effect on client side
-
-* Fixed #2535 - add BUILD_SHARED and BUILD_STATIC options to CMake, both on by
-  default, to toggle shared and static library builds
-
-* Fixed #2537 - use SYSTEM_CLOCK on OSX and CLOCK_MONOTONIC elsewhere for
-  internal timers to avoid races
-
-* Fixed #2540 - new zmq_poller used by zmq_poll without DRAFTs
-
-* Fixed #2552 - Fix WITH_DOC CMake build to avoid checking for asciidoc if the
-  option is disabled
-
-* Fixed #2567 - Memory leak in REP socket handling
-
-* Fixed #2579 - Compilation issue on Windows with CMake + ninja
-
-* Fixed #2588 - SIGBUS under 64-bit SunOS Sparc
-
-* Fixed #2590 - crash when using ZMQ_IMMEDIATE and ZMQ_LINGER to non-zero
-
-* Fixed #2601 - XPUB_MANUAL subscriptions not removed on peer term
-
-* Fixed #2602 - intermittent memory leak for ZMQ_REQ/REP send/recv
-
-* Fixed #2608 - CURVE server (connect) fails when client rebinds
-
-* Fixed #2610 - print backtraces in mutual exclusion to avoid mixing
-  different traces
-
-* Fixed #2621 - add missing CMake files to distributable tarball
-
-* Fixed #2630 - improve compatibility with OpenBSD w.r.t. IPV6_V6ONLY
-
-* Fixed #2638 - note in INSTALL that when using Windows builds on Linux with
-  Wine it is necessary to increase the minimum TCP buffers
-
-* Fixed #2632 - Fix file descriptor leak when using Tweetnacl (internal NACL
-  implementation) instead of Libsodium, and fix race condition when using
-  multiple ZMQ contexts with Tweetnacl
-
-* Fixed #2681 - Possible buffer overflow in CURVE mechanism handshake.
-  NOTE: this was protected by an assert previously, so there is no security
-  risk.
-
-* Fixed #2704 - test_sockopt_hwm fails occasionally on Windows
-
-* Fixed #2701 - pgm build via cmake doesn't link libzmq with libpgm
-
-* Fixed #2711 - ZAP handler communication errors should be handled consistently
-
-* Fixed #2723 - assertion in src\select.cpp:111 or hang on zmq_ctx_destroy on
-  Windows
-
-* Fixed #2728 - fix support O_CLOEXEC when building with CMake
-
-* Fixed #2761 - improve compatibility with TrueOS (FreeBSD 12)
-
-* Fixed #2764 - do not unlink IPC socket files when closing a socket to avoid
-  race conditions
-
-* Fixed #2770 - support lcov 1.13 and newer
-
-* Fixed #2787 - add libiphlpapi to PKGCFG_LIBS_PRIVATE for static mingw builds
-
-* Fixed #2788 - document that adding -DZMQ_STATIC is required for Windows
-  static builds with Mingw
-
-* Fixed #2789 - description of zmq_atomic_counter_value return value is cloned
-  from zmq_atomic_counter_new
-
-* Fixed #2791 - fix building with DRAFT APIs on CentOS 6
-
-* Fixed #2794 - router_t methods should not allocate memory for lookup in
-  outpipes
-
-* Fixed #2809 - optimize select() usage on Windows
-
-* Fixed #2816 - add CMake and autoconf check for accept4, as it is not
-  available on old Linux releases, and fallback to accept + FD_CLOEXEC
-
-* Fixed #2824 - ZMQ_REQ socket does not report ZMQ_POLLOUT when ZMQ_REQ_RELAXED
-  is set
-
-* Fixed #2827 - add support for Haiku
-
-* Fixed #2840 - fix building with VS2008
-
-* Fixed #2845 - correct the ZMQ_LINGER documentation to accurately reflect that
-  the default value is -1 (infinite). It never was 30 second in any released
-  version, it was only changed briefly and then changed back, but the manpage
-  was not reverted.
-
-* Fixed #2861 - CMake/MSVC: export ZMQ_STATIC when needed.
-
-0MQ version 4.2.2 stable, released on 2017/02/18
-=============================================
-
-* Improve compatibility with GNU Hurd
-
-* Fixed #2286 - improve CMake on Windows documentation
-
-* Fixed #1235 - improved compatibility with mingw64
-
-* Improve zmq_proxy documentation to state it can return ETERM as well
-
-* Fixed #1442 - SO_NOSIGPIPE and connection closing by peer race condition
-
-* Improve CMake functionality on Windows: ZeroMQConfig.cmake generation CPack
-  option, correct static library filename, ship FindSodium.cmake in tarball
-
-* Fixed #2228 - setting HWM after connect on inproc transport leads to infinite
-  HWM
-
-* Add support for Visual Studio 2017
-
-* New DRAFT (see NEWS for 4.2.0) zmq_has option "draft" option that returns
-  true if the library was built with DRAFT enabled. Useful for FFI bindings.
-  See doc/zmq_has.txt for more information
-
-* Fixed #2321 - zmq_z85_decode does not validate its input. The function has
-  been fixed to correctly follow RFC32 and return NULL if the input is invalid
-
-* Fixed #2323 - clock_t related crash on Apple iOS 9.3.2 and 9.3.5
-
-* Fixed #1801 - OSX: Cmake installs libzmq in a weird PATH
-
-* Fixed potential divide by zero in zmq::lb_t::sendpipe
-
-* Improve compatibility with OpenIndiana by skipping epoll and using poll/select
-
-* Fix IPv4-in-IPv6 mapped addresses parsing error
-
-
-0MQ version 4.2.1 stable, released on 2016/12/31
-=============================================
-
-* New DRAFT (see NEWS for 4.2.0) Socket Monitor events:
-  - ZMQ_EVENT_HANDSHAKE_SUCCEED
-  - ZMQ_EVENT_HANDSHAKE_FAILED
-  These events trigger when the ZMTP security mechanism handshake is
-  completed. See doc/zmq_socket_monitor.txt for more information.
-
-* New DRAFT (see NEWS for 4.2.0) Context options:
-  - ZMQ_MSG_T_SIZE
-  See doc/zmq_ctx_get.txt for more information.
-
-* Fixed #2268 - improved compatibility with mingw32
-
-* Fixed #2254 - ZMQ_PUB compatibility with libzmq 2.x broken
-
-* Fixed #2245 - added support for VS2017, Windows SDK 10.0.14393.0, toolset v141
-
-* Fixed #2242 - file descriptors leaks on fork+exec
-
-* Fixed #2239 - retired poller item crash from reaper thread
-
-* Fixed #2234 - improved compatibility with AIX 7.1
-
-* Fixed #2225 - cannot pick select for poller
-
-* Fixed #2217 - CMake build uses library version as the ABI version
-
-* Fixed #2208 - added support for ZMQ_TOS on IPv6
-
-* Fixed #2200 - no documentation for ZMQ_SOCKS_PROXY
-
-* Fixed #2199 - no documentation for zmq_curve_public
-
-* Fixed #2196 - fixed build and runtime errors on kFreeBSD
-
-
-0MQ version 4.2.0 stable, released on 2016/11/04
-=============================================
-
-* For Pieter. Thanks for making all of this possible.
-
-  "Tell them I was a writer.
-   A maker of software.
-   A humanist. A father.
-   And many things.
-   But above all, a writer.
-   Thank You. :)"
-   - Pieter Hintjens
-
-* This release introduces new APIs, but it is ABI compatible with
-  libzmq 4.1.2 and up.
-
-* Note for ARM and SPARC users: an alignment problem in zmq_msg_t that could in
-  some cases and on some CPUs cause a SIGBUS error was solved, but it requires
-  a rebuild of your application against the 4.2.0 version of include/zmq.h.
-  To clarify, this change does not affect the internals of the library but only
-  the public definition of zmq_msg_t, so there is no ABI incompatibility.
-
-* Security with Curve is now available by default thanks to Tweetnacl sources:
-  https://tweetnacl.cr.yp.to/index.html
-  Libsodium is still fully supported but has to be enabled with the build flag
-  --with-libsodium. Distribution and package maintainers are encouraged to use
-  libsodium so that the security implementation can be audited and maintained
-  separately.
-
-* New Context options:
-  - ZMQ_MAX_MSGSZ
-  - ZMQ_BLOCKY
-  See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-
-* New Socket options:
-  - ZMQ_HANDSHAKE_IVL
-  - ZMQ_SOCKS_PROXY
-  - ZMQ_XPUB_NODROP
-  - ZMQ_XPUB_MANUAL
-  - ZMQ_XPUB_WELCOME_MSG
-  - ZMQ_STREAM_NOTIFY
-  - ZMQ_INVERT_MATCHING
-  - ZMQ_HEARTBEAT_IVL
-  - ZMQ_HEARTBEAT_TTL
-  - ZMQ_HEARTBEAT_TIMEOUT
-  - ZMQ_XPUB_VERBOSER
-  - ZMQ_CONNECT_TIMEOUT
-  - ZMQ_TCP_MAXRT
-  - ZMQ_THREAD_SAFE
-  - ZMQ_MULTICAST_MAXTPDU
-  - ZMQ_VMCI_BUFFER_SIZE
-  - ZMQ_VMCI_BUFFER_MIN_SIZE
-  - ZMQ_VMCI_BUFFER_MAX_SIZE
-  - ZMQ_VMCI_CONNECT_TIMEOUT
-  - ZMQ_USE_FD
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New CURVE helper function to derive z85 public key from secret key:
-    zmq_curve_public
-
-* New cross-platform atomic counter helper functions:
-    zmq_atomic_counter_new, zmq_atomic_counter_set, zmq_atomic_counter_inc,
-    zmq_atomic_counter_dec, zmq_atomic_counter_value, zmq_atomic_counter_destroy
-  See doc/zmq_atomic_*.txt for details.
-
-* New DRAFT APIs early-release mechanism. New APIs will be introduced early
-  in public releases, and until they are stabilized and guaranteed not to
-  change anymore they will be unavailable unless the new build flag
-  --enable-drafts is used. This will allow developers and early adopters to
-  test new APIs before they are finalized.
-  NOTE: as the name implies, NO GUARANTEE is made on the stability of these APIs.
-  They might change or disappear entirely. Distributions are recommended NOT to
-  build with them.
-
-  New socket types have been introduced in DRAFT state:
-    ZMQ_SERVER, ZMQ_CLIENT, ZMQ_RADIO, ZMQ_DISH, ZMQ_GATHER, ZMQ_SCATTER,
-    ZMQ_DGRAM
-  All these sockets are THREAD SAFE, unlike the existing socket types. They do
-  NOT support multipart messages (ZMQ_SNDMORE/ZMQ_RCVMORE).
-  ZMQ_RADIO, ZMQ_DISH and ZMQ_DGRAM also support UDP as transport,
-  both unicast and multicast. See doc/zmq_udp.txt for more details.
-  New methods to support the new socket types functionality:
-    zmq_join, zmq_leave, zmq_msg_set_routing_id, zmq_msg_routing_id,
-    zmq_msg_set_group, zmq_msg_group
-  See doc/zmq_socket.txt for more details.
-
-  New poller mechanism and APIs have been introduced in DRAFT state:
-    zmq_poller_new, zmq_poller_destroy, zmq_poller_add, zmq_poller_modify,
-    zmq_poller_remove, zmq_poller_wait, zmq_poller_wait_all, zmq_poller_add_fd
-    zmq_poller_modify_fd, zmq_poller_remove_fd
-  and a new supporting struct typedef: zmq_poller_event_t
-  They support existing socket type, new thread-safe socket types and file
-  descriptors (cross-platform).
-  Documentation will be made available in the future before these APIs are declared
-  stable.
-
-  New cross-platform timers helper functions have been introduced in DRAFT state:
-    zmq_timers_new, zmq_timers_destroy, zmq_timers_add, zmq_timers_cancel,
-    zmq_timers_set_interval, zmq_timers_reset, zmq_timers_timeout,
-    zmq_timers_execute
-  and a new supporting callback typedef: zmq_timer_fn
-
-* Many, many bug fixes. The most important fixes are backported and captured in the
-  4.1.x and 4.0.x changelogs.
-
-
-0MQ version 4.2.0 rc1, released on 2016/11/01
-=============================================
-
-* Many changes, see ChangeLog.
-
-
-0MQ version 4.1.6 stable, released on 2016/11/01
-================================================
-
-* Fixed #2051 - getifaddrs can fail with ECONNREFUSED
-
-* Fixed #2091 - testutil.hpp fails to build on Windows XP
-
-* Fixed #2096 - add tests/CMakeLists.in and version.rc.in to dist tar
-
-* Fixed #2107 - zmq_connect with IPv6 "source:port;dest:port" broken
-
-* Fixed #2117 - ctx_term assert with inproc zmq_router connect-before-bind
-
-* Fixed #2158 - Socket monitor uses internal Pair from multiple threads
-
-* Fixed #2161 - messages dropped due to HWM race
-
-* Fixed #1325 - alignment issue with zmq_msg_t causes SIGBUS on SPARC and ARM
-
-
-0MQ version 4.1.5 stable, released on 2016/06/17
-================================================
-
-* Fixed #1673 - CMake on Windows put PDB in wrong directory.
-
-* Fixed #1723 - Family is not set when resolving NIC on Android.
-
-* Fixed #1608 - Windows 7 TCP slow start issue.
-
-* Fixed #1806 - uninitialised read in curve getsockopt.
-
-* Fixed #1807 - build broken with GCC 6.
-
-* Fixed #1831 - potential assertion failure with latest libsodium.
-
-* Fixed #1850 - detection issues with tweetnacl/libsodium.
-
-* Fixed #1877 - Avoid terminating connections prematurely
-
-* Fixed #1887 - zmq_bind IPv4 fallback still tries IPv6
-
-* Fixed #1866 - fails to build on SunOS 5.10 / Solaris 10
-
-* Fixed #919 - ZMQ_LINGER (related to #1877)
-
-* Fixed #114 - cannot unbind with same endpoint with IPv6 enabled.
-
-* Fixed #1952 - CMake scripts not part of release tarballs
-
-* Fixed #1542 - Fix a crash on Windows when port 5905 is in use.
-
-* Fixed #2021 - Fix building on sparc32.
-
-
-0MQ version 4.1.4 stable, released on 2015/12/18
-================================================
-
-* Fixed #1315 - socket monitor hangs if bind/setsockopt failed.
-
-* Fixed #1399 - assertion failure in tcp.cpp after network reconnect.
-
-* Fixed #1632 - build failure using latest libsodium.
-
-* Fixed #1644 - assertion failure in msg.cpp:390 on STREAM sockets.
-
-* Fixed #1661 - does not handle IPv6 link local addresses.
-
-
-0MQ version 4.1.3 stable, released on 2015/08/17
-================================================
-
-* Fixed #1532 - getsockopt ZMQ_RCVMORE now resets all bits instead of only 32
-
-* Fixed #1445 - zmq::socket_base_t::connect fails on tcp ipv6 address
-
-
-0MQ version 4.1.2 stable, released on 2015/06/15
-================================================
-
-* Added explicit reference to static link exception in every source file.
-
-* Bumped ABI version to 5:0:0 since 4.1.x changed the ABI.
-
-* Fixed STDINT event interface macros to work with CZMQ 3.0.
-
-* Fixed installation of man pages when BUILD_DOC is not set.
-
-* Fixed #1428 - regression on single-socket proxies.
-
-
-0MQ version 4.1.1 stable, released on 2015/06/02
-================================================
-
-* Fixed #1208 - fix recursion in automake packaging.
-
-* Fixed #1224 - crash when processing empty unsubscribe message.
-
-* Fixed #1213 - properties files were missing from source packages.
-
-* Fixed #1273 - V3 protocol handler vulnerable to downgrade attacks.
-
-* Fixed #1347 - lack way to get peer address.
-
-* Fixed #1362 - SUB socket sometimes fails to resubscribe properly.
-
-* Fixed #1377, #1144 - failed with WSANOTINITIALISED in some cases.
-
-* Fixed #1389 - PUB, PUSH sockets had slow memory leak.
-
-* Fixed #1382 - zmq_proxy did not terminate if there were no readers.
-
-
-0MQ version 4.1.0 rc1, released on 2014/10/14
-=============================================
-
-* All issues that were fixed in 4.0.x
-
-* Improved client reconnection strategy on errors
-
-* GSSAPI security mechanism
-
-* SOCKS5 support (ZMQ_SOCKS_PROXY)
-
-* ZMQ_ROUTER_HANDOVER
-
-* ZMQ_TOS
-
-* ZMQ_CONNECT_RID
-
-* ZMQ_HANDSHAKE_IVL
-
-* ZMQ_IDENTITY_FD
-
-* ZMQ_XPUB_NODROP
-
-* ZMQ_SRCFD and ZMQ_SHARED message options
-
-* Message metadata -- zmq_msg_gets ()
-
-* Probe library configuration -- zmq_has ()
-
-
-0MQ version 4.0.8 stable, released on 2016/06/17
-================================================
-
-* Fixed LIBZMQ-949 - zmq_unbind fails for inproc and wildcard endpoints
-
-* Fixed #1806 - uninitialised read in curve getsockopt.
-
-* Fixed #1807 - build broken with GCC 6.
-
-* Fixed #1877 - Avoid terminating connections prematurely
-
-* Fixed #1887 - zmq_bind IPv4 fallback still tries IPv6
-
-* Fixed #98 - don't require libssp without libsodium on Solaris
-
-* Fixed #919 - ZMQ_LINGER (related to #1877)
-
-* Fixed #139 - "tempnam" is deprecated.
-
-
-0MQ version 4.0.7 stable, released on 2015/06/15
-================================================
-
-* Fixed #1428 - regression on single-socket proxies.
-
-
-0MQ version 4.0.6 stable, released on 2015/06/02
-================================================
-
-* Fixed #1273 - V3 protocol handler vulnerable to downgrade attacks.
-
-* Fixed #1362 - SUB socket sometimes fails to resubscribe properly.
-
-* Fixed #1377, #1144 - failed with WSANOTINITIALISED in some cases.
-
-* Fixed #1389 - PUB, PUSH sockets had slow memory leak.
-
-* Fixed #1382 - zmq_proxy did not terminate if there were no readers.
-
-
-0MQ version 4.0.5 stable, released on 2014/10/14
-================================================
-
-* Fixed #1191; CURVE mechanism does not verify short term nonces.
-
-* Fixed #1190; stream_engine is vulnerable to downgrade attacks.
-
-* Fixed #1088; assertion failure for WSAENOTSOCK on Windows.
-
-* Fixed #1015; race condition while connecting inproc sockets.
-
-* Fixed #994; bump so library number to 4.0.0
-
-* Fixed #939, assertion failed: !more (fq.cpp:99) after many ZAP requests.
-
-* Fixed #872; lost first part of message over inproc://.
-
-* Fixed #797, keep-alive on Windows.
-
-
-0MQ version 4.0.4 stable, released on 2014/03/10
-================================================
-
-Bug Fixes
----------
-
-* Fixed #909; out of tree build issue on Linux.
-
-* Fixed #888; hangs on terminate when inproc connected but never bound.
-
-* Fixed #868; assertion failure at ip.cpp:137 when using port scanner.
-
-* Fixed #818; fix timestamp counter on s390/s390x.
-
-* Fixed #817; only export zmq_* symbols.
-
-* Fixed #797; fixed setting TCP keepalive on Windows.
-
-* Fixed #775; compile error on Windows.
-
-* Fixed #763; when talking to a ZMTP v1 peer (libzmq 2.2), a socket would
-  send an extra identity frame at the start of the connection.
-
-* Fixed LIBZMQ-576 - Crash closing a socket after zmq_msg_send returns
-  EAGAIN (reverts LIBZMQ-497)
-
-* Fixed LIBZMQ-584; subscription filters getting lost on reconnection.
-
-
-0MQ version 4.0.3 stable, released on 2013/11/24
-================================================
-
-Bug Fixes
----------
-
-* Fixed test_many_sockets case, which failed when process socket limit
-  was 1024.
-
-
-0MQ version 4.0.2 stable, released on 2013/11/24
-================================================
-
-Bug Fixes
----------
-
-* Fixed LIBZMQ-583 - improved low-res timer for Windows
-* Fixed LIBZMQ-578 - z85_decode was extremely slow
-* Fixed LIBZMQ-577 - fault in man pages.
-* Fixed LIBZMQ-574 - assertion failure when ran out of system file handles
-* Fixed LIBZMQ-571 - test_stream failing in some cases
-* Fixed LIBZMQ-569 - Socket server crashes with random client data and when
-  talking to 2.2 versions
-* Fixed LIBZMQ-39 - Bad file descriptor during shutdown
-* Pulled expected failing test_linger.cpp from release
-* Reduced pause time in tests to allow "make check" to run faster
-
-
-0MQ version 4.0.1 stable, released on 2013/10/08
-================================================
-
-Changes
--------
-
-* Updated CURVE mechanism to track revised RFC 27 (INITIATE vouch).
-
-  The INITIATE command vouch box is Box[C',S](C->S') instead of
-  Box[C'](C->S), to reduce the risk of client impersonation, as per
-  https://codesinchaos.wordpress.com/2012/09/09/curvecp-1/.
-
-* Fixed LIBZMQ-567, adding abstract namespaces for IPC sockets on Linux.
-
-  Converts an initial strudel or "at sign" (@) in the Unix socket path to
-  a NULL character ('\0') indicating that the socket uses the abstract
-  namespace instead of the filesystem namespace.  For instance, binding a
-  socket to 'ipc://@/tmp/tester' will not create a file associated with
-  the socket whereas binding to 'ipc:///tmp/tester' will create the file
-  /tmp/tester. See issue 567 for more information.
-
-* Added zmq_z85_encode and zmq_z85_decode to core libzmq API.
-
-* Added zmq_curve_keypair to core libzmq API.
-
-* Bumped library ABI version to 4:0:1.
-
-Bug fixes
----------
-
-* Fixed some build/test errors on OS/X + Clang++.
-
-* Fixed LIBZMQ-565, typo in code.
-
-* Fixed LIBZMQ-566, dealer-to-router connections sometimes failing.
-
-* Fixed builds for AIX, MSVC 2008, OS/X with clang++, Solaris.
-
-* Improved CURVE handshake error handling.
-
-
-0MQ version 4.0.0 (RC1), released on 2013/09/20
-===============================================
-
-Major changes
--------------
-
-* New wire level protocol, ZMTP/3.0, see http://rfc.zeromq.org/spec:23.
-  Does not yet implement the SUBSCRIBE, CANCEL, PING, and PONG commands.
-  
-* New security framework, from plain user+password to strong encryption, 
-  see section below. See http://hintjens.com/blog:49 for a tutorial.
-  
-* New ZMQ_STREAM socket type for working as a TCP client or server. See: 
-  tests/test_stream.cpp.
-  
-Improvements
-------------
-
-* You can now connect to an inproc:// endpoint that does not already
-  exist. This means inproc:// no longer needs careful set-up, but it may
-  break code that relied on the old behaviour. See: 
-  tests/test_inproc_connect.cpp.
- 
-* Libzmq now checks socket types at connection time, so that trying to 
-  connect a 'wrong' socket type will fail.
-  
-* New zmq_ctx_shutdown API method will shutdown a context and send ETERM
-  to blocking calls, without blocking. Use zmq_ctx_term to finalise the
-  process.
-  
-* The regression test suite has been significantly extended and improved.
-  
-* Contexts can now be terminated in forked child processes. See: 
-  tests/test_fork.cpp.
-  
-* zmq_disconnect now respects the linger setting on sockets.
-
-* New zmq_send_const API method to send constant data (without copying).
-  See: tests/test_inproc_connect.cpp.
-  
-* Added CMake support for static libraries.
-
-* Added test cases for socket semantics as defined in RFCs 28, 29, 30, 31.
-  See: tests/test_spec_*.cpp.
-
-* New socket option, ZMQ_PROBE_ROUTER triggers an empty message on connect.
-  See: tests/test_probe_router.cpp.
-  
-* New socket option, ZMQ_REQ_CORRELATE allows for correlation of replies 
-  from a REP socket. See: tests/test_req_correlate.cpp.
-  
-* New socket option, ZMQ_REQ_RELAXED, lets you disable the state machine 
-  on a REQ socket, so you can send multiple requests without waiting for 
-  replies, and without getting an EFSM error. See: 
-  tests/test_req_relaxed.cpp.
-  
-* New socket option, ZMQ_CONFLATE restricts the outgoing and incoming 
-  socket buffers to a single message. See: tests/test_conflate.cpp.
-
-Deprecated Options
-------------------
-
-* ZMQ_IPV4ONLY deprecated and renamed to ZMQ_IPV6 so that options are
-  consistently "off" by default. 
-
-* ZMQ_DELAY_ATTACH_ON_CONNECT deprecated, and renamed to ZMQ_IMMEDIATE.
-  See: tests/test_immediate.cpp.
-
-Security Framework
-------------------
-
-Based on new ZMTP wire level protocol that negotiates a security 
-"mechanism" between client and server before exchanging any other data.
-
-Security mechanisms are extensible. ZMTP defines three by default:
-
-* NULL - classic ZeroMQ, with no authentication. See 
-  http://rfc.zeromq.org/spec:23.
-  
-* PLAIN - plain-text username + password authentication. See
-  http://rfc.zeromq.org/spec:24.
-
-* CURVE - secure authentication and encryption based on elliptic curve 
-  cryptography, using the Curve25519 algorithm from Daniel Bernstein and 
-  based on CurveCP's security handshake. See http://rfc.zeromq.org/spec:25, 
-  http://rfc.zeromq.org/spec:26, and http://curvecp.org.
-  
-Authentication is done by pluggable "authenticators" that connect to libzmq
-over an inproc endpoint, see http://rfc.zeromq.org/spec:27.
-
-Socket options to configure PLAIN security on client or server:
-
-* ZMQ_PLAIN_SERVER, ZMQ_PLAIN_USERNAME, ZMQ_PLAIN_PASSWORD. See 
-  tests/test_security_plain.
-  
-Socket options to configure CURVE security on client or server:
-
-* ZMQ_CURVE_SERVER, ZMQ_CURVE_PUBLICKEY, ZMQ_CURVE_SECRETKEY, 
-  ZMQ_CURVE_SERVERKEY. See tests/test_security_curve.cpp.
-  
-Socket options to configure "domain" for ZAP handler:
- 
-* ZMQ_ZAP_DOMAIN, see tests/test_security_null.cpp.
-
-Support for encoding/decoding CURVE binary keys to ASCII:
-
-* zmq_z85_encode, zmq_z85_decode.
-
-Other issues addressed in this release
---------------------------------------
-
-* LIBZMQ-525 Multipart upstreaming from XSUB to XPUB
-
-
-0MQ version 3.2.4 stable, released on 2013/09/20
-================================================
-
-* LIBZMQ-84  (Windows) Assertion failed: Address already in use at signaler.cpp:80
-* LIBZMQ-456 ZMQ_XPUB_VERBOSE does not propagate in a tree of XPUB/XSUB devices
-* LIBZMQ-532 (Windows) critical section not released on error
-* LIBZMQ-569 Detect OpenPGM 5.2 system library
-* LIBZMQ-563 Subscribers sometimes stopped receiving messages (aka LIBZMQ-541)
-* LIBZMQ-XXX Added support for Travis Continuous Integration
-* LIBZMQ-XXX Several improvements to MSVC support
-
-
-0MQ version 3.2.3 stable, released on 2013/05/02
-================================================
-
-Issues addressed in this release
---------------------------------
-
-* LIBZMQ-526 Assertion failure "Invalid argument (tcp_connecter.cpp:285)"
-* LIBZMQ-446 Setting the DSCP bits by default causes CAP_NET_ADMIN error
-* LIBZMQ-496 Crash on heavy socket opening/closing: Device or resource busy (mutex.hpp:90)
-* LIBZMQ-462 test_connect_delay fails at test_connect_delay.cpp:80
-* LIBZMQ-497 Messages getting dropped
-* LIBZMQ-488 signaler.cpp leaks the win32 Event Handle
-* LIBZMQ-476 zmq_disconnect has no effect for inproc sockets
-* LIBZMQ-475 zmq_disconnect does not sent unsubscribe messages
-
-
-0MQ version 3.2.2 stable, released on 2012/11/23
-================================================
-
-Issues addressed in this release
---------------------------------
-
-* LIBZMQ-384 No meta data for ZMQ_EVENT_DISCONNECTED monitor event
-* LIBZMQ-414 Error in ARM/Thumb2 assembly (atomic_ptr.hpp)
-* LIBZMQ-417 zmq_assert (!incomplete_in) in session_base.cpp 228
-* LIBZMQ-447 socket_base_t::recv() packet loss and memory leak at high receiving rate
-* LIBZMQ-448 Builds fail on older versions of GCC
-* LIBZMQ-449 Builds fail on AIX
-* LIBZMQ-450 lt-test_monitor: fails with assertion at test_monitor.cpp:81
-* LIBZMQ-451 ZMQ_ROUTER_MANDATORY blocks forever
-* LIBZMQ-452 test_connect_delay.cpp:175:12: error: 'sleep' was not declared in this scope
-* LIBZMQ-458 lt-test_router_mandatory fails with assertion at test_router_mandatory.cpp:53
-* LIBZMQ-459 Assertion failed: encoder (stream_engine.cpp:266
-* LIBZMQ-464 PUB socket with HWM set leaks memory
-* LIBZMQ-465 PUB/SUB results in 80-90% of CPU load
-* LIBZMQ-468 ZMQ_XPUB_VERBOSE & unsubscribe
-* LIBZMQ-472 Segfault in zmq_poll in REQ to ROUTER dialog
-
-
-0MQ version 3.2.1 (RC2), released on 2012/10/15
-===============================================
-
-Issues addressed in this release
---------------------------------
-
-* Fixed issue xxx - handle insufficient resources on accept() properly.
-* Fixed issue 443 - added ZMQ_XPUB_VERBOSE setsocket option.
-* Fixed issue 433 - ZeroMQ died on receiving EPIPE
-* Fixed issue 423 - test_pair_tcp hangs
-* Fixed issue 416 - socket_base: fix 'va_list' has not been declared error
-* Fixed issue 409 - Pub-sub interoperability between 2.x and 3.x.
-* Fixed issue 404 - zmq_term can not safely be re-entered with pgm transport
-* Fixed issue 399 - zmq_ctx_set_monitor callback is not works properly
-* Fixed issue 393 - libzmq does not build on Android (socklen_t signed comparison)
-* Fixed issue 392 - Interaction with pyzmq on Android
-* Fixed issue 389 - Assertion failure in mtrie.cpp:317
-* Fixed issue 388 - tests/test_monitor.cpp has no newline at EOF (causes compile error)
-* Fixed issue 387 - "sa_family_t sa_family;" in pgm_socket.cpp is unused variable
-* Fixed issue 385 - Rework ZMQ_FAIL_UNROUTABLE socket option to actually work
-* Fixed issue 382 - Current libzmq doesn't compile on Android NDK
-* Fixed issue 377 - ZeroMQ will not build on Windows with OpenPGM
-* Fixed issue 375 - error: unused variable 'sa_family'
-* Fixed issue 373 - Unable to build libzmq/zeromq3.x on AIX7
-* Fixed issue 372 - Unable to build libzmq/zeromq3.x on HPUX 11iv3
-* Fixed issue 371 - Unable to build libzmq/zeromq3.x on RHEL5/SLES10
-* Fixed issue 329 - wsa_error_to_errno() calls abort() on WSAEACCES
-* Fixed issue 309 - Assertion failed: options.recv_identity (socket_base.cpp:864)
-* Fixed issue 211 - Assertion failed: msg_->flags & ZMQ_MSG_MORE (rep.cpp:81)
-
-API changes
------------
-
-* zmq_device () deprecated and replaced by zmq_proxy ().
-* zmq_ctx_set_monitor () replaced by zmq_socket_monitor ().
-* ZMQ_ROUTER_BEHAVIOR/ZMQ_FAIL_UNROUTABLE renamed experimentally to
-  ZMQ_ROUTER_MANDATORY.
-
-
-0MQ version 3.2.0 (RC1), released on 2012/06/05
-===============================================
-
-Bug fixes
----------
-
-* Fixed issue 264 - Potential bug with linger, messages dropped during
-  socket close.
-
-* Fixed issue 293 - libzmq doesn't follow the ZMTP/1.0 spec (did not
-  set reserved bits to 0).
-
-* Fixed issue 303 - Assertion failure in pgm_sender.cpp:102.
-
-* Fixed issue 320 - Assertion failure in connect_session.cpp:96 when
-  connecting epgm to an invalid endpoint.
-
-* Fixed issue 325 - Assertion failure in xrep.cpp:93, when two sockets
-  connect using the same identity.
-
-* Fixed issue 327 - Assertion failure in mtrie.cpp:246, when
-  unsubscribing from channel.
-
-* Fixed issue 346 - Assertion failure in signaler.cpp:155, when using a
-  closed socket.
-
-* Fixed issue 328 - unsubscribe wrongly clears multiple subscriptions.
-
-* Fixed issue 330 - IPC listener does not remove unix domain stream file
-  when terminated.
-
-* Fixed issue 334 - Memory leak in session_base.cpp:59.
-
-* Fixed issue 369 - ROUTER cannot close/reopen while DEALER connected.
-
-Operating systems
------------------
-
-* Fixed issue 301 - HPUX 11iv2 - build fails, CLOCK_MONOTONIC
-  undefined.
-
-* Fixed issue 324 - OS/X - build fails, ECANTROUTE undefined.
-
-* Fixed issue 368 - Solaris / Sun C++ - build fails, no insert method
-  in multimap classes.
-
-* Fixed issue 366 - Windows - ports not freed after crash.
-
-* Fixed issue 355 - Windows - build fails, MSVC solution file is out of
-  date.
-
-* Fixed issue 331 - FreeBSD 8 and 9 - getaddrinfo fails with
-  EAI_BADFLAGS on AI_V4MAPPED flag.
-
-* Fixed issue xxx - Added support for WinCE.
-
-Performance
------------
-
-* Fixed issue xxx - Implemented atomic operations for ARMv7a (runs 15-20% faster).
-
-API changes
------------
-
-* Fixed issue 337 - Cleaned-up context API:
-
-    zmq_ctx_new() - create new context (will deprecate zmq_init)
-    zmq_ctx_destroy() - destroy context (will deprecate zmq_term)
-    zmq_ctx_set() - set context property
-    zmq_ctx_get() - get context property
-
-* Fixed issue xxx - Cleaned-up message API:
-
-    zmq_msg_send() - send a message (will deprecate zmq_sendmsg)
-    zmq_msg_recv() - receive a message (will deprecate zmq_recvmsg)
-    zmq_msg_more() - indicate whether this is final part of message
-    zmq_msg_get() - get message property
-    zmq_msg_set() - set message property
-
-* Fixed issue xxx - Added context monitoring API:
-
-    zmq_ctx_set_monitor() - configure monitor callback.
-
-* Fixed issue xxx - Added unbind/disconnect API:
-
-    zmq_unbind() - unbind socket.
-    zmq_disconnect() - disconnect socket.
-
-* Fixed issue xxx - Added ZMQ_TCP_ACCEPT_FILTER setsockopt() for listening TCP sockets.
-
-* Fixed issue 336 - Removed sys: transport.
-
-* Fixed issue 333 - Added zmq_device function back to API (was removed
-  in 3.0).
-
-* Fixed issue 340 - Add support for MAX_SOCKETS to new context API.
-
-
-OMQ version 3.1.0 (beta), released on 2011/12/18
-================================================
-
-General information
--------------------
-
-Based on community consensus, the 0MQ 3.1.x release reverts a number of
-features introduced in version 3.0. The major reason for these changes is
-improving backward compatibility with 0MQ 2.1.x.
-
-Development of the 0MQ 3.0.x series will be discontinued, and users are
-encouraged to upgrade to 3.1.
-
-The 0MQ 3.1.x releases use ABI version 3.
-
-Reverted functionality
-----------------------
-
-The following functionality present in 0MQ 3.0 has been reverted:
-
-* Wire format changes. The 0MQ 3.1 wire format is identical to that of 0MQ
-  2.1.
-
-* LABELs and COMMANDs have been removed.
-
-* Explicit identies are re-introduced, however they can be used only for
-  explicit routing, not for durable sockets.
-
-* The ZMQ_ROUTER and ZMQ_DEALER socket types are once again aliases for
-  ZMQ_XREQ and ZMQ_XREP.
-
-New functionality
------------------
-
-* The zmq_getmsgopt() function has been introduced.
-
-* Experimental IPv6 support has been introduced. This is disabled by
-  default, see the zmq_setsockopt() documentation for enabling it.
-
-Other changes
--------------
-
-* The default HWM for all socket types has been set to 1000.
-
-* Many bug fixes.
-
-Building
---------
-
-* The dependency on libuuid has been removed.
-
-* Support for building on Android, and with MSVC 10 has been added.
-
-0MQ version 3.0.0 (alpha), released on 2011/07/12
-=================================================
-
-New functionality
------------------
-
-* A zmq_ctx_set_monitor() API to register a callback / event sink for changes
-  in socket state.
-
-* POSIX-compliant zmq_send and zmq_recv introduced (uses raw buffer
-  instead of message object).
-
-* ZMQ_MULTICAST_HOPS socket option added. Sets the appropriate field in
-  IP headers of PGM packets.
-
-* Subscription forwarding. Instead of filtering on consumer, the
-  subscription is moved as far as possible towards the publisher and
-  filtering is done there.
-
-* ZMQ_XPUB, ZMQ_XSUB introduced. Allow to create subscription-
-  forwarding-friendly intermediate devices.
-
-* Add sockopt ZMQ_RCVTIMEO/ZMQ_SNDTIMEO. Allow to set timeout for
-  blocking send/recv calls.
-
-* A new LABEL flag was added to the wire format. The flag distinguishes
-  message parts used by 0MQ (labels) from user payload message parts.
-
-* There is a new wire format for the REQ/REP pattern. First, the empty
-  bottom-of-the-stack message part is not needed any more, the LABEL
-  flag is used instead. Secondly, peer IDs are 32-bit integers rather
-  than 17-byte UUIDs.
-
-* The REQ socket now drops duplicate replies.
-
-* Outstanding requests & replies associated with a client are dropped
-  when the clients dies. This is a performance optimisation.
-
-* Introduced ZMQ_ROUTER and ZMQ_DEALER sockets. These mimic the
-  functionality of ZMQ_ROUTER and ZMQ_DEALER in 0MQ/2.1.x. Guarantees
-  backward compatibility for exsiting code.
-
-* Removed dependency on OS socketpair buffer size. No more asserts in
-  mailbox.cpp because of low system limit of sockepair buffer size.
-
-API improvements
-----------------
-
-* Obsolete constants ZMQ_UPSTREAM and ZMQ_DOWNSTREAM removed. Use
-  ZMQ_PUSH and ZMQ_PULL instead.
-
-* Timeout in zmq_poll is in milliseconds instead of microseconds. This
-  makes zmq_poll() compliant with POSIX poll()
-
-* ZMQ_MCAST_LOOP removed. There's no support for multicast over
-  loopback any more. Use IPC or TCP isntead.
-
-* zmq_send/zmq_recv was renamed zmq_sendmsg/zmq_recvmsg.
-
-* ZMQ_RECOVERY_IVL and ZMQ_RECOVERY_IVL_MSEC reconciled. The new option
-  is named ZMQ_RECOVERY_IVL and the unit is milliseconds.
-
-* Option types changed. Most of the numeric types are now represented
-  as 'int'.
-
-* ZMQ_HWM split into ZMQ_SNDHWM and ZMQ_RCVHWM. This makes it possible
-  to control message flow separately for each direction.
-
-* ZMQ_NOBLOCK renamed ZMQ_DONTWAIT. That makes it POSIX-compliant.
-
-Less is More
-------------
-
-* Pre-built devices and zmq_device() removed. Should be made available
-  as a separate project(s).
-
-* ZMQ_SWAP removed. Writing data to disk should be done on top of 0MQ,
-  on inside it.
-
-* C++ binding removed from the core. Now it's a separate project, same
-  as any other binding.
-
-Bug fixes
----------
-
-* Many.
-
-Building
---------
-
-* Make pkg-config dependency conditional.
-
-Distribution
-------------
-
-* Removed Debian packaging, which is now available at packages.debian.org
-  or via apt-get.
-
-
-0MQ version 2.2.0 (Stable), released on 2012/04/04
-==================================================
-
-Changes
--------
-
-* Fixed issue 349, add send/recv timeout socket options.
-
-Bug fixes
----------
-
-* Fixed issue 301, fix builds on HP-UX 11iv3 when using either gcc or aCC.
-
-* Fixed issue 305, memory leakage when using dynamic subscriptions.
-
-* Fixed issue 332, libzmq doesn't compile on Android NDK.
-
-* Fixed issue 293, libzmq doesn't follow ZMTP/1.0 spec.
-
-* Fixed issue 342, cannot build against zmq.hpp under C++11.
-
-
-0MQ version 2.1.11 (Stable), released on 2011/12/18
-===================================================
-
-Bug fixes
----------
-
-* Fixed issue 290, zmq_poll was using system time instead of monotonic
-  clock (Mika Fischer).
-
-* Fixed issue 281, crash on heavy socket creation - assertion failure in
-  mutex.hpp:91. (Mika Fischer).
-
-* Fixed issue 273, O_CLOEXEC flag used in ip.cpp:192 is supported only
-  on Linux kernels 2.6.27+
-
-* Fixed issue 261, assertion failure in kqueue.cpp:76.
-
-* Fixed issue 269, faulty diagnostic code in 2.1.10.
-
-* Fixed issue 254, assertion failure at tcp_socket.cpp:229 on ENOTCONN.
-
-Changes
--------
-
-* Now builds properly on AIX 6.1 (AJ Lewis).
-
-* Builds using libdcekt on HP-UX (AJ Lewis).
-
-* New upstream OpenPGM maintenance release 5.1.118.
-
-* Enabled debugging on assertion failure on Windows (Paul Betts).
-
-
-0MQ version 2.1.10 (Stable), released on 2011/10/03
-===================================================
-
-Bug fixes
----------
-
-* Fixed issue 140, SWAP failed with assertion failure in pipe.cpp:187
-  if the current directory was not writeable. Behavior now is to return
-  -1 at zmq_setsockopt in this situation.
-
-* Fixed issue 207, assertion failure in zmq_connecter.cpp:48, when an
-  invalid zmq_connect() string was used, or the hostname could not be
-  resolved. The zmq_connect() call now returns -1 in both those cases.
-
-* Fixed issue 218, sockets not opened with SOCK_CLOEXEC, causing fork/exec
-  to sit on sockets unnecessarily.
-
-* Fixed issue 250, build errors on Windows (Mikko Koppanen).
-
-* Fixed issue 252, assertion failure in req.cpp:87 and req.cpp:88 (Mikko
-  Koppanen).
-
-
-0MQ version 2.1.9 (Stable), released on 2011/08/29
-==================================================
-
-Bug fixes
----------
-
-* Fixed issue 240, assertion failure in pgm_socket.cpp:437.
-
-* Fixed issue 238, assertion failure in zmq.cpp:655, when zmq_poll is
-  used on an empty set, on Windows.
-
-* Fixed issue 239, assertion failure in zmq.cpp:223, when ZMQ_SWAP was
-  used with explicit identities and multiple SUB sockets.
-
-* Fixed issue 236, zmq_send() and zmq_recv() did not always return
-  error conditions such as EFSM properly. This bug was introduced in
-  version 2.1.8 by the backport of changes for issue 231.
-
-Building
---------
-
-* 0MQ support for Android added (Bill Roberts, Mikko Koppanen).
-
-
-0MQ version 2.1.8 (RC), released on 2011/07/28
-==============================================
-
-Bug fixes
----------
-
-* Fixed issue 223, assertion failure in tcp_connecter.cpp:300 when
-  connecting to a server that is on an unreachable network (errno is
-  equal to ENETUNREACH).
-
-* Fixed issue 228, assertion failure at rep.cpp:88 when HWM was reached.
-
-* Fixed issue 231, assertion failure at mailbox.cpp:183 when too many
-  pending socketpair operations were queued (major backport from 3.0).
-
-* Fixed issue 234, assertion failure at mailbox.cpp:77 when Ctrl-C was
-  used (only affected git master following backport for 231).
-
-* Fixed issue 230, SIGPIPE killing servers when client disconnected, hit
-  OS/X only.
-
-Note: this release was renamed "release candidate" due to issue 236,
-fixed in 2.1.9.
-
-
-0MQ version 2.1.7 (Stable), released on 2011/05/12
-==================================================
-
-Bug fixes
----------
-
-* Fixed issue 188, assert when closing socket that had unread multipart
-  data still on it (affected PULL, SUB, ROUTER, and DEALER sockets).
-
-* Fixed issue 191, message atomicity issue with PUB sockets (an old issue).
-
-* Fixed issue 199 (affected ROUTER/XREP sockets, an old issue).
-
-* Fixed issue 206, assertion failure in zmq.cpp:223, affected all sockets
-  (bug was introduced in 2.1.6 as part of message validity checking).
-
-* Fixed issue 211, REP socket asserted if sent malformed envelope (old issue
-  due to abuse of assertions for error checking).
-
-* Fixed issue 212, reconnect failing after resume from sleep on Windows
-  (due to not handling WSAENETDOWN).
-
-* Properly handle WSAENETUNREACH on Windows (e.g. if client connects
-  before server binds).
-
-* Fixed memory leak with threads on Windows.
-
-Changes
--------
-
-* Checks zmq_msg_t validity at each operation.
-
-* Inproc performance tests now work on Windows.
-
-* PGM wire format specification improved in zmq_pgm(7)
-
-* Added thread latency/throughput performance examples.
-
-* Added "--with-system-pgm" configure option to use already installed
-  OpenPGM.
-
-* Runtime checking of socket and context validity, to catch e.g. using a
-  socket after closing it, or passing an invalid pointer to context/socket
-  methods.
-
-* Test cases moved off port 5555, which conflicts with other services.
-
-* Clarified zmq_poll man page that the resolution of the timeout is 1msec.
-
-
-0MQ version 2.1.6 (Broken), released on 2011/04/26
-==================================================
-
-Note that this version contained a malformed patch and is not usable.
-It is not available for download, but is available in the git via the
-2.1.6 tag.
-
-0MQ version 2.1.5 (Broken), released on 2011/04/20
-==================================================
-
-Note that this version contained a malformed patch and is not usable.
-It is not available for download, but is available in the git via the
-2.1.5 tag.
-
-
-0MQ version 2.1.4 (Stable), released on 2011/03/30
-==================================================
-
-Bug fixes
----------
-
-* Fix to OpenPGM which was asserting on small messages (Steven McCoy).
-
-Changes
--------
-
-* Upgraded OpenPGM to version 5.1.115 (Pieter Hintjens).
-
-* OpenPGM build changed to not install OpenPGM artifacts.
-
-
-0MQ version 2.1.3 (Stable), released on 2011/03/21
-==================================================
-
-Bug fixes
----------
-
-* Fix to PUSH sockets, which would sometimes deliver tail frames of a
-  multipart message to new subscribers (Martin Sustrik).
-
-* Fix to PUB sockets, which would sometimes deliver tail frames of a
-  multipart message to new subscribers (Martin Sustrik).
-
-* Windows build was broken due to EPROTONOSUPPORT not being defined. This
-  has now been fixed (Martin Sustrik).
-
-* Various fixes to make OpenVMS port work (Brett Cameron).
-
-* Corrected Reference Manual to note that ZMQ_LINGER socket option may be
-  set at any time, not just before connecting/binding (Pieter Hintjens).
-
-* Fix to C++ binding to properly close sockets (Guido Goldstein).
-
-* Removed obsolete assert from pgm_socket.cpp (Martin Sustrik).
-
-Changes
--------
-
-* Removed stand-alone devices (/devices subdirectory) from distribution.
-  These undocumented programs remain available in older packages (Pieter
-  Hintjens).
-
-* OpenPGM default rate raised to 40mbps by default (Steven McCoy).
-
-* ZMQ_DEALER and ZMQ_ROUTER macros provided to ease upgrade to 0MQ/3.0.
-  These are scheduled to replace ZMQ_XREQ and ZMQ_XREP (Pieter Hintjens).
-
-* Added man page for zmq_device(3) which was hereto undocumented (Pieter
-  Hintjens).
-
-* Removed zmq_queue(3), zmq_forwarder(3), zmq_streamer(3) man pages
-  (Pieter Hintjens).
-
-OpenPGM Integration
--------------------
-
-* Upgraded OpenPGM to version 5.1.114 (Steven McCoy, Mikko Koppanen).
-
-* Build system now calls OpenPGM build process directly, allowing easier
-  future upgrades of OpenPGM (Mikko Koppanen).
-
-* Build system allows configuration with arbitrary versions of OpenPGM
-  (./configure --with-pgm=libpgm-x.y.z) (Mikko Koppanen).
-
-* OpenPGM uses new PGM_ODATA_MAX_RTE controlling original data instead of
-  PGM_TXW_MAX_RTE covering entire channel (Steven McCoy).
-
-Building
---------
-
-* 0MQ builds properly on FreeBSD (Mikko Koppanen).
-
-
-0MQ version 2.1.2 (rc2), released on 2011/03/06
-===============================================
-
-Bug fixes
----------
-
-* 0MQ now correctly handles durable inproc sockets; previously it ignored
-  explicit identities on inproc sockets.
-
-* Various memory leaks were fixed.
-
-* OpenPGM sender/receiver creation fixed.
-
-
-0MQ version 2.1.1 (rc1), released on 2011/02/23
-===============================================
-
-New functionality
------------------
-
-* New socket option ZMQ_RECONNECT_IVL_MAX added, allows for exponential
-  back-off strategy when reconnecting.
-
-* New socket option ZMQ_RECOVERY_IVL_MSEC added, as a fine-grained
-  counterpart to ZMQ_RECOVERY_IVL (for multicast transports).
-
-* If memory is exhausted, 0MQ warns with an explicit message before
-  aborting the process.
-
-* Size of inproc HWM and SWAP is sum of peers' HWMs and SWAPs (Douglas
-  Greager, Martin Sustrik).
-
-Bug fixes
----------
-
-* 0MQ no longer asserts in mailbox.cpp when multiple peers connect with
-  the same identity.
-
-* 0MQ no longer asserts when rejecting an oversized message.
-
-* 0MQ no longer asserts in pipe.cpp when the swap fills up.
-
-* zmq_poll now works correctly with an empty poll set.
-
-* Many more.
-
-Building
---------
-
-* 0MQ now builds correctly on CentOS, Debian 6, and SunOS/gcc3.
-
-* Added WithOpenPGM configuration into MSVC builds.
-
-Known issues
-------------
-
-* OpenPGM integration is still not fully stable.
-
-
-0MQ version 2.1.0 (Beta), released on 2010/12/01
-================================================
-
-New functionality
------------------
-
-* New semantics for zmq_close () and zmq_term () ensure that all messages
-  are sent before the application terminates. This behaviour may be
-  modified using the new ZMQ_LINGER socket option; for further details
-  refer to the reference manual.
-
-* The new socket options ZMQ_FD and ZMQ_EVENTS provide a way to integrate
-  0MQ sockets into existing poll/event loops.
-
-* Sockets may now be migrated between OS threads, as long as the
-  application ensures that a full memory barrier is issued.
-
-* The 0MQ ABI exported by libzmq.so has been formalised; DSO symbol
-  visibility is used on supported platforms to ensure that only public ABI
-  symbols are exported. The library ABI version has been set to 1.0.0 for
-  this release.
-
-* OpenPGM has been updated to version 5.0.92. This version no longer
-  depends on GLIB, and integration with 0MQ should be much improved.
-
-* zmq_poll() now honors timeouts precisely, and no longer returns if no
-  events are signaled.
-
-* Blocking calls now return EINTR if interrupted by the delivery of a
-  signal; this also means that language bindings which previously had
-  problems with handling SIGINT/^C should now work correctly.
-
-* The ZMQ_TYPE socket option was added; this allows retrieval of the socket
-  type after creation.
-
-* Added a ZMQ_VERSION macro to zmq.h for compile-time API version
-  detection.
-
-* The ZMQ_RECONNECT_IVL and ZMQ_BACKLOG socket options have been added.
-
-Bug fixes
----------
-
-* Forwarder and streamer devices now handle multi-part messages correctly.
-
-* 0MQ no longer asserts when malformed data is received on the wire.
-
-* 0MQ internal timers now work correctly if the TSC jumps backwards.
-
-* The internal signalling functionality (mailbox) has been improved
-  to automatically resize socket buffers on POSIX systems.
-
-* Many more.
-
-Building
---------
-
-* 0MQ now builds correctly with many more non-GCC compilers (Sun Studio,
-  Intel ICC, CLang).
-
-* AIX and HP-UX builds should work now.
-
-* FD_SETSIZE has been set to 1024 by default for MSVC builds.
-
-* Windows builds using GCC (MinGW) now work out of the box.
-
-Distribution
-------------
-
-* A simple framework for regression tests has been added, along with a few
-  basic self-tests. The tests can be run using "make check".
diff --git a/README.cygwin.md b/README.cygwin.md
deleted file mode 100755
index 64324ac46..000000000
--- a/README.cygwin.md
+++ /dev/null
@@ -1,15 +0,0 @@
-libzmq-cygwin
-=============
-
-Definitive build fixes for cygwin  (See https://github.com/zeromq/pyzmq/issues/113 for partial solution)
-
-What's changed:
-  ./Makefile.am                       Add cygwin-specific target mostly the same as mingw
-  ./configure.ac                      Add cygwin-specific target mostly the same as mingw
-  ./tests/testutil.hpp                Lengthen socket timeout to 121 seconds
-  
-What's new:
-  ./README.cygwin.md                  This file
-  ./builds/cygwin                     Folder for cygwin-specific build files
-  ./builds/cygwin/Makefile.cygwin     Makefile for cygwin targets
-  
diff --git a/README.doxygen.md b/README.doxygen.md
deleted file mode 100644
index b3ca7199f..000000000
--- a/README.doxygen.md
+++ /dev/null
@@ -1,48 +0,0 @@
-## Overview
-
-The ZeroMQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. ZeroMQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging patterns,
-message filtering (subscriptions), seamless access to multiple transport
-protocols and more.
-
-This documentation describes the internal software that makes up the
-ZeroMQ C++ core engine, and not how to use its API, however it may help
-you understand certain aspects better, such as the callgraph of an API method.
-There are no instructions on using ZeroMQ within this documentation, only
-the API internals that make up the software.
-
-**Note:** this documentation is generated directly from the source code with
-Doxygen. Since this project is constantly under active development, what you
-are about to read may be out of date! If you notice any errors in the
-documentation, or the code comments, then please send a pull request.
-
-Please refer to the README file for anything else.
-## Resources
-
-Extensive documentation is provided with the distribution. Refer to
-doc/zmq.html, or "man zmq" after you have installed libzmq on your system.
-
-* Website: http://www.zeromq.org/
-* Official API documentation: http://api.zeromq.org/
-
-Development mailing list: zeromq-dev@lists.zeromq.org
-
-Announcements mailing list: zeromq-announce@lists.zeromq.org
-
-Git repository: http://github.com/zeromq/libzmq
-
-ZeroMQ developers can also be found on the IRC channel \#zeromq, on the
-Freenode network (irc.freenode.net).
-
-## Copyright
-Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file.  
-The project license is specified in COPYING and COPYING.LESSER.
-
-The names "ØMQ", "ZeroMQ", "0MQ", and the ØMQ logo are registered trademarks
-of iMatix Corporation ("iMatix") and refers to either (a) the original libzmq
-C++ library, or (b) the community of projects hosted in the
-https://github.com/zeromq organization.
-
-This Doxygen configuration is adapted by Hiten Pandya, for the ZeroMQ project.
diff --git a/README.md b/README.md
index e31712a9e..240aa924f 100644
--- a/README.md
+++ b/README.md
@@ -1,207 +1,4 @@
-# ZeroMQ
+CLIPS-unicode
+=============
 
-[![Build Status](https://travis-ci.org/zeromq/libzmq.png?branch=master)](https://travis-ci.org/zeromq/libzmq)
-[![Build status](https://ci.appveyor.com/api/projects/status/e2ks424yrs1un3wt?svg=true)](https://ci.appveyor.com/project/zeromq/libzmq)
-[![Coverage Status](https://coveralls.io/repos/github/zeromq/libzmq/badge.svg?branch=master)](https://coveralls.io/github/zeromq/libzmq?branch=master)
-
-## Welcome
-
-The ZeroMQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. ZeroMQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging patterns,
-message filtering (subscriptions), seamless access to multiple transport
-protocols and more.
-
-## Supported platforms <a name="#platforms"/>
-
-Libzmq is mainly written in C++98 with some optional C++11-fragments. For
-configuration either autotools or CMake is employed. See below for some lists
-of platforms, where libzmq has been successfully compiled on.
-
-### Supported platforms with primary CI
-
-| OS and version                         | Architecture            | Compiler and version          | Build system | Remarks                                                                                                                               |
-|----------------------------------------|-------------------------|-------------------------------|--------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| Android NDK r20                        | arm, arm64, x86, x86_64 | llvm (see NDK)                | autotools    | DRAFT                                                                                                                                       |
-| Ubuntu 14.04.5 LTS (trusty)            | amd64                   | clang 5.0.0                   | autotools    | STABLE, extras: GSSAPI, PGM, NORM, C++98 mode only                                                                                    |
-| Ubuntu 14.04.5 LTS (trusty)            | amd64                   | gcc 4.8.4                     | autotools    | STABLE, DRAFT, extras: GSSAPI, PGM, NORM, TIPC, IPV6, also POLLER=poll, POLLER=select, also valgrind and address sanitizer executions |
-| Ubuntu 14.04.5 LTS (trusty)            | amd64                   | gcc 4.8.4                     | CMake 3.12.2 | STABLE                                                                                                                                |
-| Windows Server 2012 R2                 | x86                     | Visual Studio 2008            | CMake 3.12.2 | DRAFT                                                                                                                                 |
-| Windows Server 2012 R2                 | x86                     | Visual Studio 2010 SP1        | CMake 3.12.2 | DRAFT                                                                                                                                 |
-| Windows Server 2012 R2                 | x86                     | Visual Studio 2012 Update 5   | CMake 3.12.2 | DRAFT                                                                                                                                 |
-| Windows Server 2012 R2                 | x86, amd64              | Visual Studio 2013 Update 5   | CMake 3.12.2 | DRAFT, STABLE (x86 Release only), also POLLER=epoll                                                                                   |
-| Windows Server 2012 R2                 | x86                     | Visual Studio 2015 Update 3   | CMake 3.12.2 | DRAFT                                                                                                                                 |
-| Windows Server 2016                    | x86                     | Visual Studio 2017 15.9.6     | CMake 3.13.3 | DRAFT                                                                                                                                 |
-| cygwin 3.0.0 on Windows Server 2012 R2 | amd64                   | gcc 7.4.0                     | CMake 3.6.2  | DRAFT                                                                                                                                 |
-| MSYS2 ? on Windows Server 2012 R2      | amd64                   | gcc 6.4.0                     | CMake ?      | DRAFT                                                                                                                                 |
-| Mac OS X 10.13                         | amd64                   | Xcode 9.4.1, Apple LLVM 9.1.0 | autotools    | STABLE, DRAFT                                                                                                                         |
-| Mac OS X 10.13                         | amd64                   | Xcode 9.4.1, Apple LLVM 9.1.0 | CMake 3.11.4 | DRAFT                                                                                                                                 |
-
-Note: the platforms are regularly updated by the service providers, so this information might get out of date
-without any changes on the side of libzmq. For Appveyor, refer to https://www.appveyor.com/updates/ regarding
-platform updates. For travis-ci, refer to https://changelog.travis-ci.com/ regarding platform updates.
-
-### Supported platforms with secondary CI
-
-| OS and version               | Architecture               | Compiler and version | Build system | Remarks |
-|------------------------------|----------------------------|----------------------|--------------|---------|
-| CentOS 6                     | x86, amd64                 | ?                    | autotools    |         |
-| CentOS 7                     | amd64                      | ?                    | autotools    |         |
-| Debian 8.0                   | x86, amd64                 | ?                    | autotools    |         |
-| Debian 9.0                   | ARM64, x86, amd64          | ?                    | autotools    |         |
-| Fedora 28                    | ARM64, ARM32, amd64        | ?                    | autotools    |         |
-| Fedora 29                    | ARM64, ARM32, amd64        | ?                    | autotools    |         |
-| Fedora Rawhide               | ARM64, ARM32, amd64        | ?                    | autotools    |         |
-| RedHat Enterprise Linux 7    | amd64, ppc64               | ?                    | autotools    |         |
-| SuSE Linux Enterprise 12 SP4 | ARM64, amd64, ppc64, s390x | ?                    | autotools    |         |
-| SuSE Linux Enterprise 15     | amd64                      | ?                    | autotools    |         |
-| xUbuntu 12.04                | x86, amd64                 | ?                    | autotools    |         |
-| xUbuntu 14.04                | x86, amd64                 | ?                    | autotools    |         |
-| xUbuntu 16.04                | x86, amd64                 | ?                    | autotools    |         |
-| xUbuntu 18.04                | x86, amd64                 | ?                    | autotools    |         |
-| xUbuntu 18.10                | x86, amd64                 | ?                    | autotools    |         |
-
-### Supported platforms with known active users
-
-At the time of writing, no explicit reports have been available. Please report your experiences by opening a PR
-adding an entry or moving an entry from the section below.
-
-Under "last report", please name either the SHA1 in case of an unreleased version, or the version number in
-case of a released version.
-
-| OS and version | Architecture      | Compiler and version | Build system | Last report             | Remarks |
-|----------------|-------------------|----------------------|--------------|-------------------------|---------|
-| Solaris 10     | x86, amd64, sparc | GCC 8.1.0            | CMake        | 2019/03/18              |         |
-| DragonFly BSD  | amd64             | gcc 8.3              | autotools    | 2018/08/07 git-72854e63 |         |
-| IBM i          | ppc64             | gcc 6.3              | autotools    | 2019/10/02 git-25320a3  |         |
-| QNX 7.0        | x86_64            | gcc 5.4.0            | CMake        | 4.3.2                   |         |
-
-
-### Supported platforms without known active users
-
-Note: this list is incomplete and inaccurate and still needs some work.
-
-| OS and version         | Architecture | Compiler and version     | Build system     | Remarks |
-|------------------------|--------------|--------------------------|------------------|---------|
-| Any Linux distribution | x86, amd64   | gcc ?+, clang ?+, icc ?+ | autotools, CMake |         |
-| SunOS, Solaris         | x86, amd64   | SunPro                   | autotools, CMake |         |
-| GNU/kFreeBSD           | ?            | ?                        | autotools, CMake |         |
-| FreeBSD                | ?            | ?                        | autotools, CMake |         |
-| NetBSD                 | ?            | ?                        | autotools, CMake |         |
-| OpenBSD                | ?            | ?                        | autotools, CMake |         |
-| DragonFly BSD          | amd64        | gcc 8.3                  | autotools, CMake |         |
-| HP-UX                  | ?            | ?                        | autotools, CMake |         |
-| GNU/Hurd               | ?            | ?                        | autotools        |         |
-| VxWorks 6.8            | ?            | ?                        | ?                |         |
-| Windows CE             | ?            | ?                        | ?                |         |
-| Windows UWP            | ?            | ?                        | ?                |         |
-| OpenVMS                | ?            | ?                        | ?                |         |
-
-### Unsupported platforms
-
-| OS and version | Architecture | Compiler and version | Remarks                                                                 |
-|----------------|--------------|----------------------|-------------------------------------------------------------------------|
-| QNX 6.3        | ?            | gcc 3.3.5            | see #3371, support was added by a user, but not contributed to upstream |
-| Windows 10     | ARM, ARM64   | Visual Studio 2017   | see #3366, probably only minor issues                                   |
-
-For more details, see [here](SupportedPlatforms.md).
-
-For some platforms (Linux, Mac OS X), [prebuilt binary packages are supplied by the ZeroMQ organization](#installation).
-For other platforms, you need to [build your own binaries](#build).
-
-## Installation of binary packages <a name="installation"/>
-
-### Linux
-
-For Linux users, pre-built binary packages are available for most distributions.
-Note that DRAFT APIs can change at any time without warning, pick a STABLE build to
-avoid having them enabled.
-
-#### Latest releases
-
-##### DEB
-
-[![OBS release stable](https://img.shields.io/badge/OBS%20master-stable-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Arelease-stable&package=libzmq3-dev)
-[![OBS release draft](https://img.shields.io/badge/OBS%20master-draft-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Arelease-draft&package=libzmq3-dev)
-
-##### RPM
-
-[![OBS release stable](https://img.shields.io/badge/OBS%20master-stable-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Arelease-stable&package=zeromq-devel)
-[![OBS release draft](https://img.shields.io/badge/OBS%20master-draft-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Arelease-draft&package=zeromq-devel)
-
-#### Bleeding edge packages
-
-##### DEB
-
-[![OBS release stable](https://img.shields.io/badge/OBS%20master-stable-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Agit-stable&package=libzmq3-dev)
-[![OBS release draft](https://img.shields.io/badge/OBS%20master-draft-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Agit-draft&package=libzmq3-dev)
-
-##### RPM
-
-[![OBS release stable](https://img.shields.io/badge/OBS%20master-stable-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Agit-stable&package=zeromq-devel)
-[![OBS release draft](https://img.shields.io/badge/OBS%20master-draft-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Agit-draft&package=zeromq-devel)
-
-#### Example: Debian 9 latest release, no DRAFT apis
-
-    echo "deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/Debian_9.0/ ./" >> /etc/apt/sources.list
-    wget https://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/Debian_9.0/Release.key -O- | sudo apt-key add
-    apt-get install libzmq3-dev
-
-### OSX
-
-For OSX users, packages are available via brew.
-
-    brew install zeromq
-
-## Build from sources <a name="build"/>
-
-To build from sources, see the INSTALL file included with the distribution.
-
-### Android
-
-To build from source, see [README](./builds/android/README.md) file in the
-android build directory.
-
-## Resources
-
-Extensive documentation is provided with the distribution. Refer to
-doc/zmq.html, or "man zmq" after you have installed libzmq on your system.
-
-Website: http://www.zeromq.org/
-
-Development mailing list: zeromq-dev@lists.zeromq.org
-Announcements mailing list: zeromq-announce@lists.zeromq.org
-
-Git repository: http://github.com/zeromq/libzmq
-
-ZeroMQ developers can also be found on the IRC channel #zeromq, on the
-Freenode network (irc.freenode.net).
-
-## License
-
-The project license is specified in COPYING and COPYING.LESSER.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-## Contributing
-
-This project uses [C4(Collective Code Construction Contract)](https://rfc.zeromq.org/spec:42/C4/) process for contributions.
+Make NASA CLIPS expert system tool to support unicode!
diff --git a/RELICENSE/AnCaPepe.md b/RELICENSE/AnCaPepe.md
deleted file mode 100644
index 15ec54525..000000000
--- a/RELICENSE/AnCaPepe.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Leonardo J. Consoni
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "AnCaPepe", with
-commit author "Leonardo José Consoni <consoni_2519@hotmail.com>", are copyright of Leonardo J. Consoni.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Leonardo José Consoni 
-2017/03/19
diff --git a/RELICENSE/AndreLouisCaron.md b/RELICENSE/AndreLouisCaron.md
deleted file mode 100644
index 4acd6b878..000000000
--- a/RELICENSE/AndreLouisCaron.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andre Caron
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "AndreLouisCaron", with
-commit author "Andre Caron <andre.l.caron@gmail.com>", are copyright of Andre Caron.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Andre Caron
-2017/03/19
diff --git a/RELICENSE/Asmod4n.md b/RELICENSE/Asmod4n.md
deleted file mode 100644
index ad4728279..000000000
--- a/RELICENSE/Asmod4n.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Hendrik Beskow
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "Asmod4n", with
-commit author "Asmod4n Asmod4n@users.noreply.github.com", are copyright of Hendrik Beskow.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Hendrik Beskow
-2017/04/21
diff --git a/RELICENSE/AxelNennker.md b/RELICENSE/AxelNennker.md
deleted file mode 100644
index 9bd6bec26..000000000
--- a/RELICENSE/AxelNennker.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Axel Nennker that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "AxelNennker", with
-commit author "Axel Nennker <axel@nennker.de>", are
-copyright of Axel Nennker.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Axel Nennker
-2019/08/11
diff --git a/RELICENSE/Bklyn.md b/RELICENSE/Bklyn.md
deleted file mode 100644
index 905db56bc..000000000
--- a/RELICENSE/Bklyn.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Caleb Epstein
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Bklyn", with
-commit author "Caleb Epstein <cae@bklyn.org>", are copyright of Caleb Epstein.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Caleb Epstein
-2017/03/21
diff --git a/RELICENSE/Botje.md b/RELICENSE/Botje.md
deleted file mode 100644
index 7fc9617ca..000000000
--- a/RELICENSE/Botje.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dries Harnie
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Botje", with
-commit author "Dries Harnie <dries@harnie.be>", are copyright of Dries Harnie.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dries Harnie
-2019/10/31
diff --git a/RELICENSE/CommanderBubble.md b/RELICENSE/CommanderBubble.md
deleted file mode 100644
index cb36a603f..000000000
--- a/RELICENSE/CommanderBubble.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Lloyd
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "CommanderBubble", with
-commit author "Michael Lloyd <commander.bubble@gmail.com>", are copyright of Michael Lloyd.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Michael Lloyd
-2019/02/23
diff --git a/RELICENSE/DaiyuHurst.md b/RELICENSE/DaiyuHurst.md
deleted file mode 100644
index 812aea770..000000000
--- a/RELICENSE/DaiyuHurst.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Daiyu Hurst that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "daiyuhurst", with
-commit author "Daiyu Hurst <daiyu.hurst@gmail.com>", are
-copyright of Daiyu Hurst.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Daiyu Hurst
-2019/08/31
diff --git a/RELICENSE/Eelis.md b/RELICENSE/Eelis.md
deleted file mode 100644
index f5b9670a1..000000000
--- a/RELICENSE/Eelis.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Eelis van der Weegen that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "Eelis", with
-commit author "Eelis van der Weegen <eelis@eelis.net>", are
-copyright of Eelis van der Weegen.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Eelis van der Weegen
-2019/02/22
diff --git a/RELICENSE/FrancoFichtner.md b/RELICENSE/FrancoFichtner.md
deleted file mode 100644
index 41f9d25ae..000000000
--- a/RELICENSE/FrancoFichtner.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Franco Fichtner that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "fichtner", with
-commit author "Franco Fichtner <franco@lastsummer.de>", are copyright
-of Franco Fichtner.  This document hereby grants the libzmq project
-team to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Franco Fichtner
-2017/03/21
diff --git a/RELICENSE/FredTreg.md b/RELICENSE/FredTreg.md
deleted file mode 100644
index 5c1bf87f6..000000000
--- a/RELICENSE/FredTreg.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Frédéric Trégon
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "FredTreg", with
-commit author "Frederic Tregon <frederic.tregon@gmail.com>", are copyright of Frédéric Trégon.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Frédéric Trégon
-2020/02/03
diff --git a/RELICENSE/Hugne.md b/RELICENSE/Hugne.md
deleted file mode 100644
index 6a1288d59..000000000
--- a/RELICENSE/Hugne.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Erik Hugne
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Hugne", with
-commit author "erik.hugne@gmail.com", are copyright of Erik Hugne.
-Commits made by author "erik.hugne@ericsson.com" are NOT covered by this
-statement.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Erik Hugne
-2017/03/22
diff --git a/RELICENSE/JohanMabille.md b/RELICENSE/JohanMabille.md
deleted file mode 100644
index bbcc277aa..000000000
--- a/RELICENSE/JohanMabille.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Johan Mabille
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "JohanMabille", with
-commit author "Johan Mabille johan.mabille@gmail.com", are copyright of Johan Mabille.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Johan Mabille  
-2017/03/20
-
diff --git a/RELICENSE/JonDyte.md b/RELICENSE/JonDyte.md
deleted file mode 100644
index 9b9b50bfa..000000000
--- a/RELICENSE/JonDyte.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jon Dyte
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "JonDyte", with
-commit author "Jon Dyte <jon@totient.co.uk>", are copyright of Jon Dyte.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jon Dyte
-2019/10/03
diff --git a/RELICENSE/KLNikita.md b/RELICENSE/KLNikita.md
deleted file mode 100644
index edaecf69d..000000000
--- a/RELICENSE/KLNikita.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Nikita Kozlov
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "KLNikita", with
-commit author "nikita kozlov <nikita@elyzion.net>", are copyright of Nikita Kozlov .
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Nikita Kozlov
-6 February 2020
diff --git a/RELICENSE/Neopallium.md b/RELICENSE/Neopallium.md
deleted file mode 100644
index 628a64f79..000000000
--- a/RELICENSE/Neopallium.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Robert G. Jakabosky
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "Neopallium", with
-commit author "Robert G. Jakabosky <bobby@sharedrealm.com>", are copyright of Robert G. Jakabosky.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Robert Gabriel Jakabosky
-2019/08/17
diff --git a/RELICENSE/Quuxplusone.md b/RELICENSE/Quuxplusone.md
deleted file mode 100644
index 0420a61ec..000000000
--- a/RELICENSE/Quuxplusone.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Arthur O'Dwyer
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Quuxplusone", with
-commit author "Arthur O'Dwyer <arthur@push.am>", are copyright of Arthur O'Dwyer.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Arthur O'Dwyer  
-2019/02/17
diff --git a/RELICENSE/README.md b/RELICENSE/README.md
deleted file mode 100644
index bdb32c3f7..000000000
--- a/RELICENSE/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Permission to Relicense under MPLV2
-
-This directory collects grants from individuals and firms that hold
-copyrights in ZeroMQ to permit licensing the ZeroMQ code under
-the [Mozilla Public License, version
-2](https://www.mozilla.org/en-US/MPL/2.0/).  See [GitHub Pull
-Request #1917](https://github.com/zeromq/libzmq/pull/1917),
-the [0MQ Licensing Page](http://zeromq.org/area:licensing) and
-[original iMatix zeromq-dev license
-grant](http://lists.zeromq.org/pipermail/zeromq-dev/2016-April/030288.html)
-for some background information.
-
-Please create a separate file in this directory for each individual
-or firm holding copyright in ZeroMQ, named after the individual or
-firm holding the copyright.
-
-Each patch must be made with a GitHub handle that is clearly
-associated with the copyright owner, to guarantee the identity of
-the signatory.  Please avoid changing the files created by other
-individuals or firms granting a copyright license over their
-copyrights (if rewording is required contact them and ask them to
-submit an updated version).  This makes it easier to verify that
-the license grant was made by an authorized GitHub account.
diff --git a/RELICENSE/RPGillespie6.md b/RELICENSE/RPGillespie6.md
deleted file mode 100644
index 596c5448b..000000000
--- a/RELICENSE/RPGillespie6.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Bryan Gillespie (RPGillespie6)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "RPGillespie6", with
-commit author "Bryan Gillespie <rpgillespie6@gmail.com>", are copyright of Bryan Gillespie.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Bryan Gillespie
-2019/09/06
diff --git a/RELICENSE/Ricardicus.md b/RELICENSE/Ricardicus.md
deleted file mode 100644
index c052a8790..000000000
--- a/RELICENSE/Ricardicus.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-This is a statement by Rickard Hallerbäck that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Ricardicus", with commit author "Rickard Hallerbäck", are copyright of Rickard Hallerbäck. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Rickard Hallerbäck 2020/02/28
\ No newline at end of file
diff --git a/RELICENSE/SRombauts.md b/RELICENSE/SRombauts.md
deleted file mode 100644
index 381e43b87..000000000
--- a/RELICENSE/SRombauts.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Sébastien Rombauts
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "SRombauts", with
-commit author "Sébastien Rombauts", are copyright of Sébastien Rombauts.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Sébastien Rombauts
-2017/03/21
\ No newline at end of file
diff --git a/RELICENSE/SergheiNovac.md b/RELICENSE/SergheiNovac.md
deleted file mode 100644
index 14bd7597f..000000000
--- a/RELICENSE/SergheiNovac.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Serghei Novac
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "carbofos", with
-commit author "Serghei Novac <serghei.novac@epydoc.com>", are copyright of Serghei Novac.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Serghei Novac
-2019/03/05
diff --git a/RELICENSE/SylvainCorlay.md b/RELICENSE/SylvainCorlay.md
deleted file mode 100644
index af2bb447c..000000000
--- a/RELICENSE/SylvainCorlay.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Sylvain Corlay
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "SylvainCorlay", with
-commit author "Sylvain Corlay sylvain.corlay@gmail.com", are copyright of Sylvain Corlay .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Sylvain Corlay
-2017/03/20
-
diff --git a/RELICENSE/TTimo.md b/RELICENSE/TTimo.md
deleted file mode 100644
index 8c2b03f38..000000000
--- a/RELICENSE/TTimo.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Timothee Besset
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "TTimo", with
-commit author "Timothee Besset <ttimo@ttimo.net>", are copyright of Timothee Besset.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Timothee Besset
-2017/03/19
diff --git a/RELICENSE/ThePrez.md b/RELICENSE/ThePrez.md
deleted file mode 100644
index ae4b9eb76..000000000
--- a/RELICENSE/ThePrez.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Jesse Gorzinski
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "ThePrez", with
-commit author "ThePrez &lt;jgorzinski@gmail.com&gt;", are copyright of Jesse Gorzinski.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jesse Gorzinski
-2019/10/02
diff --git a/RELICENSE/TobiSchluter.md b/RELICENSE/TobiSchluter.md
deleted file mode 100644
index 9b901922e..000000000
--- a/RELICENSE/TobiSchluter.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tobias Schl�ter
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "TobiSchluter", with
-commit author "TobiSchluter", are copyright of Tobias Schl�ter .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Tobias Schl�ter
-2019/09/13
diff --git a/RELICENSE/WenbinHou.md b/RELICENSE/WenbinHou.md
deleted file mode 100644
index 0b6c967d0..000000000
--- a/RELICENSE/WenbinHou.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Wenbin Hou
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "WenbinHou", with
-commit author "Wenbin Hou <houwenbin@pku.edu.cn>", are copyright of Wenbin Hou.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Wenbin Hou
-2018/05/16
diff --git a/RELICENSE/a4z.md b/RELICENSE/a4z.md
deleted file mode 100644
index 248415b46..000000000
--- a/RELICENSE/a4z.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Harald Achitz
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "a4z", with
-commit author "Harald Achitz <harald.achitz@gmail.com>" or 
-"Harald Achitz <harald.achitz@tritech.se>" or 
-"Harald Achitz <harald.achitz@getinge.com>", are copyright of Harald Achitz.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Harald Achitz
-2017/03/21
diff --git a/RELICENSE/abbradar.md b/RELICENSE/abbradar.md
deleted file mode 100644
index 9ae32732a..000000000
--- a/RELICENSE/abbradar.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Nikolay Amiantov that grants permission to relicense his
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2) or any other Open Source Initiative approved license chosen by the
-current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "abbradar", with commit
-author "Nikolay Amiantov <ab@fmap.me>", are copyright of Nikolay Amiantov.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Nikolay Amiantov
-2017/03/24
diff --git a/RELICENSE/ackalker.md b/RELICENSE/ackalker.md
deleted file mode 100644
index ee8844688..000000000
--- a/RELICENSE/ackalker.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Alain Kalker
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ackalker", with
-commit author "Alain Kalker <a.c.kalker@gmail.com>", are copyright of Alain Kalker.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Alain Kalker
-2019/05/23
diff --git a/RELICENSE/acsearle.md b/RELICENSE/acsearle.md
deleted file mode 100644
index 1b6be68f4..000000000
--- a/RELICENSE/acsearle.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Liquid Instruments
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "acsearle", with
-commit author "Antony Searle", are copyright of Liquid Instruments .
-This document hereby grants the libzmq project team to relicense
-libzmq, including all past, present and future contributions of the author
-listed above.
-
-Antony Searle
-2020/02/03
diff --git a/RELICENSE/agronholm.md b/RELICENSE/agronholm.md
deleted file mode 100644
index 00e8ab718..000000000
--- a/RELICENSE/agronholm.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Alex Grönholm
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "agronholm", with
-commit author "Alex Grönholm <alex.gronholm+git@nextday.fi>", are copyright of Alex Grönholm.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Alex Grönholm
-2017/03/19
diff --git a/RELICENSE/aixxe.md b/RELICENSE/aixxe.md
deleted file mode 100644
index 0a9bfe06e..000000000
--- a/RELICENSE/aixxe.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by aixxe (aixxe)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "aixxe", with commit author
-"aixxe <me@aixxe.net>" are copyright of aixxe.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-aixxe
-2019/07/25
\ No newline at end of file
diff --git a/RELICENSE/amuraru.md b/RELICENSE/amuraru.md
deleted file mode 100644
index 3a92e0e3a..000000000
--- a/RELICENSE/amuraru.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Adrian Muraru
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "amuraru", with
-commit author "Adrian Muraru <adi.muraru@gmail.com>", are copyright of Adrian Muraru.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Adrian Muraru
-2017/03/20
diff --git a/RELICENSE/answeroo.md b/RELICENSE/answeroo.md
deleted file mode 100644
index c79c0a4b8..000000000
--- a/RELICENSE/answeroo.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ming Ji
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "answeroo", with
-commit author "answeroo <jiming@yafco.com>", are copyright of Ming Ji.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ming Ji
-2018/08/20
diff --git a/RELICENSE/antonrd.md b/RELICENSE/antonrd.md
deleted file mode 100644
index b6e38219b..000000000
--- a/RELICENSE/antonrd.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Anton Dimitrov that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "antonrd", with
-commit author "Anton Dimitrov <dimitrov.anton@gmail.com>", are
-copyright of Anton Dimitrov.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Anton Dimitrov
-
-2018/10/01
\ No newline at end of file
diff --git a/RELICENSE/arsenm.md b/RELICENSE/arsenm.md
deleted file mode 100644
index 00b3115e8..000000000
--- a/RELICENSE/arsenm.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Matthew Arsenault
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "arsenm", with
-commit author "Matt Arsenault <arsenm2@gmail.com>", are copyright of Matthew Arsenault.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Matthew Arsenault
-2017/10/12
\ No newline at end of file
diff --git a/RELICENSE/asafkahlon.md b/RELICENSE/asafkahlon.md
deleted file mode 100644
index e38175f63..000000000
--- a/RELICENSE/asafkahlon.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Asaf Kahlon
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "asafkahlon", with
-commit author "Asaf Kahlon asafka7@gmail.com", are copyright of Asaf Kahlon.
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Asaf Kahlon
-2020/02/05
diff --git a/RELICENSE/aseering.md b/RELICENSE/aseering.md
deleted file mode 100644
index 0100f489c..000000000
--- a/RELICENSE/aseering.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Adam Seering
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commit made by the Github handle "aseering", with
-commit author "Adam Seering <aseering@gmail.com>", are copyright of Adam Seering.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Adam Seering
-2017/03/20
diff --git a/RELICENSE/atomashpolskiy.md b/RELICENSE/atomashpolskiy.md
deleted file mode 100644
index 75a8223ad..000000000
--- a/RELICENSE/atomashpolskiy.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andrei Tomashpolskiy
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "atomashpolskiy", with
-commit author "Andrei Tomashpolskiy <nordmann89@gmail.com>", are copyright of Andrei Tomashpolskiy .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Andrei Tomashpolskiy  
-2019/08/22
diff --git a/RELICENSE/banburybill.md b/RELICENSE/banburybill.md
deleted file mode 100644
index 7df74dcbc..000000000
--- a/RELICENSE/banburybill.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jim Hague that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla
-Public License v2 (MPLv2) or any other Open Source Initiative approved
-license chosen by the current ZeroMQ BDFL (Benevolent Dictator for
-Life).
-
-A portion of the commits made by the Github handle "banburybill", with
-commit author "Jim Hague <jim.hague@acm.org>", are copyright of Jim
-Hague.  This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions
-of the author listed above.
-
-Jim Hague
-2017/03/20
diff --git a/RELICENSE/bbdb68.md b/RELICENSE/bbdb68.md
deleted file mode 100644
index e46846581..000000000
--- a/RELICENSE/bbdb68.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Bruno Bodin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "bbdb68", with
-commit author "Bruno Bodin <brunobodin@gmail.com>", are copyright of Bruno Bodin .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Bruno Bodin
-2017/04/04
diff --git a/RELICENSE/bebopagogo.md b/RELICENSE/bebopagogo.md
deleted file mode 100644
index 9ad78e8dc..000000000
--- a/RELICENSE/bebopagogo.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Brian Adamson that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2
-(MPLv2).
-
-A portion of the commits made by the Github handle "bebopagogo", with commit
-author "bebopagogo <bebopagogo@users.noreply.github.com>" and "Brian Adamson
-<badamson@gmail.com>", are copyright of Brian Adamson. This document hereby grants
-the libzmq project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Brian Adamson 2019/08/11 s
diff --git a/RELICENSE/benjdero.md b/RELICENSE/benjdero.md
deleted file mode 100644
index eb9813b18..000000000
--- a/RELICENSE/benjdero.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Benjamin Deroche
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "benjdero", with
-commit author "Benjamin Deroche", are copyright of Benjamin Deroche.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Benjamin Deroche
-2019/10/26
\ No newline at end of file
diff --git a/RELICENSE/bjoto.md b/RELICENSE/bjoto.md
deleted file mode 100644
index 1c772a025..000000000
--- a/RELICENSE/bjoto.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Björn Töpel that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla
-Public License v2 (MPLv2) or any other Open Source Initiative approved
-license chosen by the current ZeroMQ BDFL (Benevolent Dictator for
-Life).
-
-A portion of the commits made by the Github handle "bjoto", with
-commit author "Bjorn Topel <bjorn.topel@gmail.com>", are copyright of
-Björn Töpel.  This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions
-of the author listed above.
-
-Björn Töpel
-2017/03/26
diff --git a/RELICENSE/bjovke.md b/RELICENSE/bjovke.md
deleted file mode 100644
index 8b2221dc8..000000000
--- a/RELICENSE/bjovke.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jovan Bunjevacki that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "bjovke", with
-commit author "Jovan Bunjevacki <bjovan@gmail.com>", are
-copyright of Jovan Bunjevacki.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Jovan Bunjevacki
-2017/04/04
diff --git a/RELICENSE/bl0x.md b/RELICENSE/bl0x.md
deleted file mode 100644
index bb4001437..000000000
--- a/RELICENSE/bl0x.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Bastian Löher that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "bl0x", with
-commit author "Bastian Löher <me@l-dot.de>", are
-copyright of Bastian Löher.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Bastian Löher
-2019/08/01
diff --git a/RELICENSE/bluca.md b/RELICENSE/bluca.md
deleted file mode 100644
index cae4541e0..000000000
--- a/RELICENSE/bluca.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Luca Boccassi (bluca)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "bluca", with
-commit author "Luca Boccassi <luca.boccassi@gmail.com>" or
-"Luca Boccassi <bluca@debian.org>", are copyright of Luca Boccassi.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Luca Boccassi
-2019/02/16
diff --git a/RELICENSE/bprager.md b/RELICENSE/bprager.md
deleted file mode 100644
index e0db6d0c2..000000000
--- a/RELICENSE/bprager.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Bernd Prager
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "bprager", with
-commit author "Bernd Prager <bernd@prager.ws>", are copyright of Bernd Prager.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Bernd Prager
-2017/03/22
diff --git a/RELICENSE/brett-cameron.md b/RELICENSE/brett-cameron.md
deleted file mode 100644
index b842cd0db..000000000
--- a/RELICENSE/brett-cameron.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Brett Cameron
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "brc859844", with
-commit author "Brett Cameron <brett.r.cameron@gmail.com>" or
-"Brett Cameron <brett.cameron@vmssoftware.com>", are copyright of Brett Cameron.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Brett Russell Cameron
-2019/02/25
-
diff --git a/RELICENSE/brian-peloton.md b/RELICENSE/brian-peloton.md
deleted file mode 100644
index 92a8c2621..000000000
--- a/RELICENSE/brian-peloton.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Brian Silverman
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "brian-peloton", with
-commit author "brian@peloton-tech.com", are copyright of Brian Silverman .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Brian Silverman
-2019/08/14
\ No newline at end of file
diff --git a/RELICENSE/brocade_communications_systems.md b/RELICENSE/brocade_communications_systems.md
deleted file mode 100644
index 25805c19a..000000000
--- a/RELICENSE/brocade_communications_systems.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Brocade Communications Systems Inc.
-
-This is a statement by Brocade Communications Systems Inc. (Brocade)
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "bluca", with
-commit author "Luca Boccassi <luca.boccassi@gmail.com>" or
-"Luca Boccassi <lboccass@brocade.com>", are copyright of Brocade.
-This permission to relicense includes all past, present and future
-contributions of Brocade employees.
-
-Luca Boccassi
-Software Engineer, Brocade Communications Systems Inc.
-2016-05-16
diff --git a/RELICENSE/brubakerjeff.md b/RELICENSE/brubakerjeff.md
deleted file mode 100644
index fbd4ef2fd..000000000
--- a/RELICENSE/brubakerjeff.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jeff Brubaker that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "brubakerjeff", with
-commit author "Jeff Brubaker <brubaker.jeff@gmail.com>", are
-copyright of Jeff Brubaker.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Jeff Brubaker
-2018/11/18
diff --git a/RELICENSE/bwbuchanan.md b/RELICENSE/bwbuchanan.md
deleted file mode 100644
index e241bc852..000000000
--- a/RELICENSE/bwbuchanan.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Brian Buchanan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "bwbuchanan", with
-commit author "Brian Buchanan &lt;bwb@holo.org&gt;" or "Brian Buchanan &lt;brian@tiogalake.com&gt;", are copyright of Brian Buchanan.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Brian Buchanan
-2017/03/23
diff --git a/RELICENSE/c-rack.md b/RELICENSE/c-rack.md
deleted file mode 100644
index c427fd046..000000000
--- a/RELICENSE/c-rack.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Constantin Rack
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "c-rack", with
-commit author "Constantin Rack <constantin.rack@gmail.com>", are copyright of Constantin Rack.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Constantin Rack
-2017/03/20
diff --git a/RELICENSE/calid.md b/RELICENSE/calid.md
deleted file mode 100644
index 30b6d5622..000000000
--- a/RELICENSE/calid.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Dylan Cali
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "calid", with
-commit author "Dylan Cali <calid1984@gmail.com>", are copyright of Dylan Cali.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dylan Cali
-
-2019/02/17
diff --git a/RELICENSE/camachat.md b/RELICENSE/camachat.md
deleted file mode 100644
index 6cd2494c7..000000000
--- a/RELICENSE/camachat.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Eric Camachat
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "camachat", with
-commit author "Eric Camachat <eric@camachat.org>", are copyright of Eric Camachat.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Eric L. Camachat
-March 20, 2017
diff --git a/RELICENSE/cbusbey.md b/RELICENSE/cbusbey.md
deleted file mode 100644
index 200dff09d..000000000
--- a/RELICENSE/cbusbey.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Connamara Systems llc
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "cbusbey", with
-commit author "chris busbey", are copyright of Connamara Systems, llc.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Chris Busbey  
-2019/09/03
diff --git a/RELICENSE/cdolan.md b/RELICENSE/cdolan.md
deleted file mode 100644
index 50accf548..000000000
--- a/RELICENSE/cdolan.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christopher Dolan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "cdolan", with
-commit author "Christopher Dolan <chris@codingstream.org>", are copyright of Christopher Dolan.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Christopher Dolan
-2017/03/19
diff --git a/RELICENSE/chickenkiller.md b/RELICENSE/chickenkiller.md
deleted file mode 100644
index 3b5f38f37..000000000
--- a/RELICENSE/chickenkiller.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Lionel Orry
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "chickenkiller", with
-commit author "Lionel Orry <lionel.orry@gmail.com>", are copyright of Lionel Orry.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Lionel Orry
-2017/03/23
diff --git a/RELICENSE/chrisstaite.md b/RELICENSE/chrisstaite.md
deleted file mode 100644
index 650f4ba20..000000000
--- a/RELICENSE/chrisstaite.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Chris Staite that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "chrisstaite", with commit
-author "Chris <chris@yourdreamnet.co.uk>", are copyright of Chris Staite.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed
-above.
-
-Chris Staite
-2017/03/28
diff --git a/RELICENSE/chuckremes.md b/RELICENSE/chuckremes.md
deleted file mode 100644
index c13387e8c..000000000
--- a/RELICENSE/chuckremes.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Chuck Remes
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "chuckremes", with
-commit author "Chuck Remes", are copyright of Chuck Remes.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Chuck Remes
-2017/03/21
diff --git a/RELICENSE/chuggafan.md b/RELICENSE/chuggafan.md
deleted file mode 100644
index c15c94540..000000000
--- a/RELICENSE/chuggafan.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by  "chugga\_fan"
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "chuggafan", with
-commit author "chugga\_fan chuggafans@gmail.com", are copyright of "chugga\_fan" .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-"chugga\_fan"
-2017/03/19
diff --git a/RELICENSE/chymanfx.md b/RELICENSE/chymanfx.md
deleted file mode 100644
index 238ec1e36..000000000
--- a/RELICENSE/chymanfx.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-I happily grant permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-The portion of the commits made by the Github handle "chymanfx", are
-not copyrighted in any way.
-Chyman
-2019/08/12
diff --git a/RELICENSE/cjuniet.md b/RELICENSE/cjuniet.md
deleted file mode 100644
index 37d9403eb..000000000
--- a/RELICENSE/cjuniet.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christophe Juniet
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "cjuniet", with
-commit author "Christophe Juniet <c.juniet@gmail.com>", are copyright of Christophe Juniet.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Christophe Juniet
-2017/03/20
diff --git a/RELICENSE/ckamm.md b/RELICENSE/ckamm.md
deleted file mode 100644
index 1b36cb666..000000000
--- a/RELICENSE/ckamm.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christian Kamm
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ckamm", with
-commit author "Christian Kamm kamm@incasoftware.de", are copyright of Christian Kamm.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Christian Kamm
-2017/03/20
diff --git a/RELICENSE/claws.md b/RELICENSE/claws.md
deleted file mode 100644
index 747e56453..000000000
--- a/RELICENSE/claws.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christopher Laws
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "claws", with
-commit author "Chris Laws <clawsicus@gmail.com>", are copyright of Christopher Laws.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Christopher Laws  
-2019/08/11
diff --git a/RELICENSE/clkao.md b/RELICENSE/clkao.md
deleted file mode 100644
index 819b0825a..000000000
--- a/RELICENSE/clkao.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Chia-liang Kao
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "clkao", with
-commit author "Chia-liang Kao clkao@clkao.org", are copyright of Chia-liang Kao.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Chia-liang Kao
-2017/03/20
diff --git a/RELICENSE/colletted.md b/RELICENSE/colletted.md
deleted file mode 100644
index 37a679663..000000000
--- a/RELICENSE/colletted.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Denis Collette that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "colletted", with commit author "Denis Collette denisncollette@gmail.com", are copyright of Denis Collette. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Denis Collette 2020/01/22
diff --git a/RELICENSE/cowo78.md b/RELICENSE/cowo78.md
deleted file mode 100644
index 82e3d4934..000000000
--- a/RELICENSE/cowo78.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Giuseppe Corbelli
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "cowo78" with
-commit author "Giuseppe Corbelli <cowo78@gmail.com>", are copyright of Giuseppe Corbelli.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Giuseppe Corbelli
-2017/03/21
diff --git a/RELICENSE/crocket.md b/RELICENSE/crocket.md
deleted file mode 100644
index 7bb92e22a..000000000
--- a/RELICENSE/crocket.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by crocket
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "crocket", with
-commit author "crocket <748856+crocket@users.noreply.github.com>", are copyright of crocket.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-crocket
-2018/11/10
diff --git a/RELICENSE/cwsmith.md b/RELICENSE/cwsmith.md
deleted file mode 100644
index 2292f3353..000000000
--- a/RELICENSE/cwsmith.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Cameron Smith
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "cwsmith", with
-commit author "Cameron Smith <smithc11@rpi.edu>", are copyright of Cameron Smith.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Cameron Smith
-2020/02/05
diff --git a/RELICENSE/danielhtshih.md b/RELICENSE/danielhtshih.md
deleted file mode 100644
index fc0212258..000000000
--- a/RELICENSE/danielhtshih.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Daniel Shih
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "danielhtshih", with
-commit author "Daniel Shih <hotingwow@gmail.com>", are copyright of Daniel Shih.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Daniel Shih
-2017/03/20
diff --git a/RELICENSE/danriegsecker.md b/RELICENSE/danriegsecker.md
deleted file mode 100644
index 772ece883..000000000
--- a/RELICENSE/danriegsecker.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dan Riegsecker
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "danriegsecker", with
-commit author "Dan Riegsecker 1baldgeek@gmail.com", are copyright of
-Dan Riegsecker. This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions of
-the author listed above.
-
-Dan Riegsecker
-2017/03/20
diff --git a/RELICENSE/demozon.md b/RELICENSE/demozon.md
deleted file mode 100644
index b33947af3..000000000
--- a/RELICENSE/demozon.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tore Halvorsen
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "demozon", with
-commit author "Tore Halvorsen <tore.halvorsen@gmail.com>", are copyright of Tore Halvorsen.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Tore Halvorsen
-2017/03/20
diff --git a/RELICENSE/dennisklein.md b/RELICENSE/dennisklein.md
deleted file mode 100644
index 0cbc74868..000000000
--- a/RELICENSE/dennisklein.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dennis Klein
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "dennisklein", with
-commit author "Dennis Klein <d.klein@gsi.de>", are copyright of Dennis Klein.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Dennis Klein
-2019/08/11
diff --git a/RELICENSE/dfons.md b/RELICENSE/dfons.md
deleted file mode 100644
index 586d573f9..000000000
--- a/RELICENSE/dfons.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Diego Fons
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "dfons", with
-commit author "Diego Fons <diego.fons@gmail.com>" or "Diego Fons <diego.fons@intraway.com>", are copyright of Diego Fons.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Diego Fons
-
-2017/03/20
diff --git a/RELICENSE/dhammika.md b/RELICENSE/dhammika.md
deleted file mode 100644
index c59b2921e..000000000
--- a/RELICENSE/dhammika.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Dhammika Pathirana
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "dhammika", with
-commit author "Dhammika Pathirana <dhammika@gmail.com>", are copyright of Dhammika Pathirana .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dhammika Pathirana
-2019/08/12
diff --git a/RELICENSE/dimpase.md b/RELICENSE/dimpase.md
deleted file mode 100644
index c4b86d966..000000000
--- a/RELICENSE/dimpase.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dmitrii (Dima) Pasechnik
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "dimpase", with
-commit author "Dima Pasechnik dimpase@gmail.com", are copyright of Dmitrii Pasechnik.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dmitrii Pasechnik  2019/09/18
diff --git a/RELICENSE/diorcety.md b/RELICENSE/diorcety.md
deleted file mode 100644
index 460512a74..000000000
--- a/RELICENSE/diorcety.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Diorcet Yann
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "diorcety", with
-commit author "yann.diorcet@xenocs.com", are copyright of Diorcet Yann.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Diorcet Yann
-2019/09/04
diff --git a/RELICENSE/djelenc.md b/RELICENSE/djelenc.md
deleted file mode 100644
index 01f9fc997..000000000
--- a/RELICENSE/djelenc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by David Jelenc
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "djelenc", with
-commit author "David Jelenc <david.jelenc@fri.uni-lj.si>", are copyright of David Jelenc.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-David Jelenc
-2017/03/20
diff --git a/RELICENSE/dkrikun.md b/RELICENSE/dkrikun.md
deleted file mode 100644
index bd1ffd2e3..000000000
--- a/RELICENSE/dkrikun.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Daniel Krikun
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "dkrikun", with
-commit author "Daniel Krikun", are copyright of Daniel Krikun .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Daniel Krikun
-2019/08/17
diff --git a/RELICENSE/dmeehan1968.md b/RELICENSE/dmeehan1968.md
deleted file mode 100644
index 13abffbfd..000000000
--- a/RELICENSE/dmeehan1968.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Dave Meehan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "dmeehan1968", with
-commit author "Dave Meehan dave_meehan@replicated.co.uk", are copyright of Dave Meehan.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dave Meehan
-2019/08/31
diff --git a/RELICENSE/drbobbeaty.md b/RELICENSE/drbobbeaty.md
deleted file mode 100644
index d919d6c0d..000000000
--- a/RELICENSE/drbobbeaty.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Robert Beaty
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "drbobbeaty", with
-commit author "Bob Beaty <drbob@themanfromspud.com>", are copyright of Robert Beaty .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Robert Beaty
-2019/08/10
diff --git a/RELICENSE/drodri.md b/RELICENSE/drodri.md
deleted file mode 100644
index e156df6c8..000000000
--- a/RELICENSE/drodri.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Diego R.Losada
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "drodri", with
-commit author "drodri <diego.rlosada@gmail.com>", are copyright of Diego Rodriguez-Losada.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Diego Rodriguez-Losada
-2017/03/20
diff --git a/RELICENSE/drolevar.md b/RELICENSE/drolevar.md
deleted file mode 100644
index 47741866c..000000000
--- a/RELICENSE/drolevar.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andrij Abyzov
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "drolevar", with
-commit author "Andrij Abyzov <drolevar@gmail.com>", are copyright of Andrij Abyzov.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Andrij Abyzov
-2019/11/19
diff --git a/RELICENSE/eburkitt.md b/RELICENSE/eburkitt.md
deleted file mode 100644
index ea425d7c8..000000000
--- a/RELICENSE/eburkitt.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by G. Evan Burkitt
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "eburkitt", with
-commit author "Evan Burkitt <evanb@edulinksys.com>", are copyright of G. Evan Burkitt.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-G. Evan Burkitt
-2017/04/06
\ No newline at end of file
diff --git a/RELICENSE/egomotion.md b/RELICENSE/egomotion.md
deleted file mode 100644
index 9c47a9435..000000000
--- a/RELICENSE/egomotion.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Egomotion Limited
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "robertcastle", with
-commit author "Robert Castle <robert@egomotion.co.uk>", are copyright of Egomotion Limited.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Robert Castle, 
-Director, Egomotion Limited
-2017/03/21
\ No newline at end of file
diff --git a/RELICENSE/eldruin.md b/RELICENSE/eldruin.md
deleted file mode 100644
index 3346958e8..000000000
--- a/RELICENSE/eldruin.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Diego Barrios Romero
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "eldruin", with
-commit author "Diego Barrios Romero <eldruin@gmail.com>", are copyright of Diego Barrios Romero.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Diego Barrios Romero
-2019/11/13
\ No newline at end of file
diff --git a/RELICENSE/emtr.md b/RELICENSE/emtr.md
deleted file mode 100644
index 602f3de9b..000000000
--- a/RELICENSE/emtr.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Claudio Biagi that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "emtr", with
-commit author "Claudio Biagi <retmt@gmx.com>", are copyright
-of Claudio Biagi.  This document hereby grants the libzmq project
-team to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Claudio Biagi
-2019/03/07
diff --git a/RELICENSE/ericsson.md b/RELICENSE/ericsson.md
deleted file mode 100644
index ec7dcf1e0..000000000
--- a/RELICENSE/ericsson.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Ericsson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "hugne", with
-commit author "Erik Hugne erik.hugne@ericsson.com", are copyright of Ericsson.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jon Maloy <jon.maloy@ericsson.com>
-2019/03/27
diff --git a/RELICENSE/evoskuil.md b/RELICENSE/evoskuil.md
deleted file mode 100644
index dccd83a9e..000000000
--- a/RELICENSE/evoskuil.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Eric Voskuil
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "evoskuil", with
-commit author "Eric Voskuil <eric@voskuil.org>", are copyright of Eric Voskuil.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Eric Voskuil
-2017/03/19
\ No newline at end of file
diff --git a/RELICENSE/ezhikus.md b/RELICENSE/ezhikus.md
deleted file mode 100644
index c952aee86..000000000
--- a/RELICENSE/ezhikus.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Volodymyr Korniichuk
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ezhikus", with
-commit author "VolodymyrKorn@gmail.com", are copyright of Volodymyr Korniichuk.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Volodymyr Korniichuk  
-2017/03/21
\ No newline at end of file
diff --git a/RELICENSE/f18m.md b/RELICENSE/f18m.md
deleted file mode 100644
index 8003cc8e3..000000000
--- a/RELICENSE/f18m.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Francesco Montorsi that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "f18m", with
-commit author "Francesco Montorsi <francesco.montorsi@gmail.com>", are copyright
-of Francesco Montorsi.  This document hereby grants the libzmq project
-team to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Francesco Montorsi
-2018/09/14
diff --git a/RELICENSE/fanquake.md b/RELICENSE/fanquake.md
deleted file mode 100644
index e4d9b5d0d..000000000
--- a/RELICENSE/fanquake.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Ford that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "fanquake", with
-commit author "Michael Ford <fanquake@gmail.com>", are
-copyright of Michael Ford.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Michael Ford
-2019/08/10
-
diff --git a/RELICENSE/febeling.md b/RELICENSE/febeling.md
deleted file mode 100644
index 06bab1fce..000000000
--- a/RELICENSE/febeling.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Florian Ebeling that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "febeling", with
-commit author "Florian Ebeling <florian.ebeling@gmail.com>", are
-copyright of Florian Ebeling.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Florian Ebeling
-2017/03/20
diff --git a/RELICENSE/ferdnyc.md b/RELICENSE/ferdnyc.md
deleted file mode 100644
index 283030a55..000000000
--- a/RELICENSE/ferdnyc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Frank R. Dana Jr.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ferdnyc", with
-commit author "FeRD (Frank Dana)", are copyright of Frank R. Dana, Jr.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Frank Richard Dana, Jr.
-2020-03-16
diff --git a/RELICENSE/ffontaine.md b/RELICENSE/ffontaine.md
deleted file mode 100644
index a64c6305d..000000000
--- a/RELICENSE/ffontaine.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Fabrice Fontaine
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ffontaine", with
-commit author "Fabrice Fontaine <fontaine.fabrice@gmail.com>", are copyright of Fabrice Fontaine.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Fabrice Fontaine
-2018-09-13
diff --git a/RELICENSE/fidlej.md b/RELICENSE/fidlej.md
deleted file mode 100644
index bc64f5a3b..000000000
--- a/RELICENSE/fidlej.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ivo Danihelka
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "fidlej", with
-commit author "Ivo Danihelka <ivo@danihelka.net>", are copyright of Ivo Danihelka.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ivo Danihelka  
-2017/03/21
diff --git a/RELICENSE/flub.md b/RELICENSE/flub.md
deleted file mode 100644
index b942de61d..000000000
--- a/RELICENSE/flub.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Floris Bruynooghe
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "flub", with
-commit author "Floris Bruynooghe <flub@devork.be>", are copyright of
-Floris Bruynooghe .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Floris Bruynooghe
-2017/05/03
diff --git a/RELICENSE/gabm.md b/RELICENSE/gabm.md
deleted file mode 100644
index b4ec8dc13..000000000
--- a/RELICENSE/gabm.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Matthias Gabriel 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "gabm", with
-commit author "Matthias Gabriel <matthias.gabriel@etit.tu-chemnitz.de>", are copyright of Matthias Gabriel.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Matthias Gabriel
-2018/10/8
diff --git a/RELICENSE/garlick.md b/RELICENSE/garlick.md
deleted file mode 100644
index 764065faa..000000000
--- a/RELICENSE/garlick.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jim Garlick (garlick)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "garlick", with
-commit author "Jim Garlick <garlick.jim@gmail.com>", are copyright of
-Jim Garlick.  This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions
-of the author listed above.
-
-Jim Garlick
-2019/08/10
diff --git a/RELICENSE/gavinmcniff.md b/RELICENSE/gavinmcniff.md
deleted file mode 100644
index 98d20b445..000000000
--- a/RELICENSE/gavinmcniff.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gavin McNiff
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "gavinmcniff", with
-commit author "Gavin McNiff <gavin@mcniff.ie>", are copyright of Gavin McNiff .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Gavin McNiff
-2017/03/20
diff --git a/RELICENSE/gcsideal.md b/RELICENSE/gcsideal.md
deleted file mode 100644
index aa85b5e21..000000000
--- a/RELICENSE/gcsideal.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Laszlo Boszormenyi (GCS) that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "gcsideal", with
-commit author "Laszlo Boszormenyi (GCS) <gcs@debian.org>", are copyright of
-Laszlo Boszormenyi (GCS) .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Laszlo Boszormenyi (GCS)
-2020/02/13
diff --git a/RELICENSE/gena-moscow.md b/RELICENSE/gena-moscow.md
deleted file mode 100644
index e1ba0be7c..000000000
--- a/RELICENSE/gena-moscow.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gennady Makovetski
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "gena-moscow", with
-commit author "Gennady Makovetski <makovetski@gmail.com>", are copyright of Gennady Makovetski.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Gennady Makovetski
-2017/03/21
\ No newline at end of file
diff --git a/RELICENSE/ghpu.md b/RELICENSE/ghpu.md
deleted file mode 100644
index 27ae64a96..000000000
--- a/RELICENSE/ghpu.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ghislain PUTOIS
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ghpu", with
-commit author "Ghislain PUTOIS", are copyright of Ghislain PUTOIS.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ghislain PUTOIS 
-2017/03/20
diff --git a/RELICENSE/gitfoxi.md b/RELICENSE/gitfoxi.md
deleted file mode 100644
index 5b0273329..000000000
--- a/RELICENSE/gitfoxi.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Fox
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "gitfoxi", with
-commit author "gitfoxi", are copyright of Michael Fox.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Michael Fox
-2017/03/20
diff --git a/RELICENSE/glemercier.md b/RELICENSE/glemercier.md
deleted file mode 100644
index 97428c770..000000000
--- a/RELICENSE/glemercier.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Anton Dimitrov that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "glemercier", with
-commit author "Gregory Lemercier <greglemercier@free.fr>", are
-copyright of Gregory Lmercier.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Gregory Lemercier
-
-2018/10/07
diff --git a/RELICENSE/gonzus.md b/RELICENSE/gonzus.md
deleted file mode 100644
index b844a115f..000000000
--- a/RELICENSE/gonzus.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gonzalo Diethelm
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "gonzus", with
-commit author "Gonzalo Diethelm <gonzalo.diethelm@diethelm.org>" or "Gonzalo Diethelm <gdiethelm@dcv.cl>", are copyright of Gonzalo Diethelm .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Gonzalo Diethelm  
-2017/03/20
diff --git a/RELICENSE/goodfella.md b/RELICENSE/goodfella.md
deleted file mode 100644
index f3b68d240..000000000
--- a/RELICENSE/goodfella.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLV2 or any Open Source Initiative (OSI) approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Nick Guiffrida that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-The commits made by the Github handle "goodfella", with commit author
-"Nick Guiffrida goodfella005@gmail.com" are copyright of Nick
-Guiffrida. This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions
-of the author listed above.
diff --git a/RELICENSE/google.md b/RELICENSE/google.md
deleted file mode 100644
index 65d587b00..000000000
--- a/RELICENSE/google.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Google, Inc.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "tkoeppe", with
-commit author "Thomas Köppe", are copyright of Google, Inc.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Thomas Köppe
-2017/09/13
diff --git a/RELICENSE/grmt.md b/RELICENSE/grmt.md
deleted file mode 100644
index 7992f4cd5..000000000
--- a/RELICENSE/grmt.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by grmt.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "grmt", with
-commit author "grmt", are copyright of grmt.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-grmt (garmt.noname@gmail.com)
-2020/05/04
diff --git a/RELICENSE/guidovranken.md b/RELICENSE/guidovranken.md
deleted file mode 100644
index f7e9b62c0..000000000
--- a/RELICENSE/guidovranken.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Guido Vranken that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "guidovranken", with
-commit author "Guido Vranken <guidovranken@gmail.com>", are
-copyright of Guido Vranken.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Guido Vranken
-2019/01/08
-
diff --git a/RELICENSE/guillon.md b/RELICENSE/guillon.md
deleted file mode 100644
index 0620ab015..000000000
--- a/RELICENSE/guillon.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christophe Guillon
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "guillon", with
-commit author "Christophe Guillon <christophe.guillon.perso@gmail.com>", are copyright of Christophe Guillon .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Christophe Guillon
-2019/06/10
diff --git a/RELICENSE/gummif.md b/RELICENSE/gummif.md
deleted file mode 100644
index abe512ba0..000000000
--- a/RELICENSE/gummif.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gudmundur Adalsteinsson that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "gummif", with
-commit author "Gudmundur Adalsteinsson <ofpgummi@yahoo.com>", are
-copyright of Gudmundur Adalsteinsson.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Gudmundur Adalsteinsson
-2020/02/04
-
diff --git a/RELICENSE/herbrechtsmeier.md b/RELICENSE/herbrechtsmeier.md
deleted file mode 100644
index de42b8ea0..000000000
--- a/RELICENSE/herbrechtsmeier.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Weidmueller Interface GmbH & Co KG
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "herbrechtsmeier", with
-commit author "Stefan Herbrechtsmeier", are copyright of Weidmueller Interface GmbH & Co KG.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Stefan Herbrechtsmeier
-2019/09/09
diff --git a/RELICENSE/hewlett_packard_enterprise.md b/RELICENSE/hewlett_packard_enterprise.md
deleted file mode 100644
index 9a0741984..000000000
--- a/RELICENSE/hewlett_packard_enterprise.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Hewlett Packard Enterprise
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "brc859844", with
-commit author "Brett Cameron <Brett.Cameron@hp.com>", are copyright of Hewlett Packard Enterprise.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Hewlett Packard Enterprise
-2019/03/12
diff --git a/RELICENSE/hgourvest.md b/RELICENSE/hgourvest.md
deleted file mode 100644
index b6c77b9d1..000000000
--- a/RELICENSE/hgourvest.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Henri Gourvest that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "hgourvest", with
-commit author "Henri Gourvest <hgourvest@progdigy.com>", are
-copyright of Henri Gourvest.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Henri Gourvest
-2018/12/8
diff --git a/RELICENSE/hnwyllmm.md b/RELICENSE/hnwyllmm.md
deleted file mode 100644
index c34eaf6f5..000000000
--- a/RELICENSE/hnwyllmm.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Wang Yunlai
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "hnwyllmm", with
-commit author "hnwyllmm hnwyllmm@126.com", are copyright of Wang Yunlai .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Wang Yunlai 
-2019/08/13
diff --git a/RELICENSE/hoditohod.md b/RELICENSE/hoditohod.md
deleted file mode 100644
index d3867c619..000000000
--- a/RELICENSE/hoditohod.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Szekely Gyorgy
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "hoditohod", with
-commit author "Szekely Gyorgy <hoditohod@gmail.com>", are copyright of Szekely Gyorgy.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Szekely Gyorgy  
-2018/08/15
\ No newline at end of file
diff --git a/RELICENSE/hpsaturn.md b/RELICENSE/hpsaturn.md
deleted file mode 100644
index 9ec16058a..000000000
--- a/RELICENSE/hpsaturn.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Antonio Vanegas that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "hpsaturn", with commit author "Antonio Vanegas", are copyright of Antonio Vanegas.
-This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Antonio Vanegas
-2018/10/27
diff --git a/RELICENSE/hsw.md b/RELICENSE/hsw.md
deleted file mode 100644
index 370138592..000000000
--- a/RELICENSE/hsw.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christopher Hall that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "hxw", with commit
-author "Christopher Hall <hsw@ms2.hinet.net>", are copyright of
-Christopher Hall.  This document hereby grants the libzmq project team
-to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Christopher Hall
-2019/08/07
diff --git a/RELICENSE/ianbarber.md b/RELICENSE/ianbarber.md
deleted file mode 100644
index ae4321f50..000000000
--- a/RELICENSE/ianbarber.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ian Barber
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commit made by the Github handle "ianbarber", with
-commit author "Ian Barber <ianbarber@gmail.com>", are copyright of Ian Barber.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ian Barber
-2017/03/27
diff --git a/RELICENSE/imatix.md b/RELICENSE/imatix.md
deleted file mode 100644
index 84236018b..000000000
--- a/RELICENSE/imatix.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Permission to Relicense under MPLV2
-
-This document collects grants from firms that hold copyrights in ZeroMQ. Please add new firms at the start. Each patch must be made with a GitHub handle that guarantees identity of the signatory.
-
-## iMatix Corporation
-
-This is a statement by iMatix Corporation sprl (iMatix) that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-1. The original ZeroMQ codebase was developed from 2007-2009 by FastMQ Inc. (FastMQ) in Slovakia, which held all copyrights in code written by its staff.
-
-2. On 2009-11-01, iMatix exercised an option to acquire FastMQ and its assets,
-including ZeroMQ. On or before 2010-01-05 the FastMQ copyrights in ZeroMQ were
-transferred to iMatix ([commit](https://github.com/zeromq/libzmq/commit/4f6baf4dde627656b63cc4e2acdb78a8577ba640)). The FastMQ legal entity was subsequently liquidated.
-
-3. Between 2009 and 2016, iMatix has continued to add contributions to ZeroMQ under the GitHub handle 'hintjens'.
-
-4. This grant therefore covers what remains of the original FastMQ codebase plus all later contributions.
-
-5. iMatix hereby grants an irrevocable, global, and fully paid-up license on all its copyrights that exist in ZeroMQ, under the MPLv2.
-
--Pieter Hintjens
-CEO, iMatix Corporation sprl
-23 April 2016
diff --git a/RELICENSE/imkcy9.md b/RELICENSE/imkcy9.md
deleted file mode 100644
index 66235c284..000000000
--- a/RELICENSE/imkcy9.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Chengye Ke
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "imkcy9", with
-commit author "Chengye Ke <imkcy9@icloud.com>" or
-"Chengye Ke <imkcy9@gmail.com>", are copyright of Chengye Ke.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Chengye Ke
-2019/05/18
\ No newline at end of file
diff --git a/RELICENSE/inuik.md b/RELICENSE/inuik.md
deleted file mode 100644
index 98f939bf8..000000000
--- a/RELICENSE/inuik.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Rishi Theivendan (inuik)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "inuik", with
-commit author "Rishi Theivendran <29522253+inuik@users.noreply.github.com>" or
-"Rishi Theivendran <rishi.theivendran@rohde-schwarz.com>", are copyright of Rishi Theivendran.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Rishi Theivendran
-2019/07/18
diff --git a/RELICENSE/ipa.md b/RELICENSE/ipa.md
deleted file mode 100644
index 2e803c65e..000000000
--- a/RELICENSE/ipa.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Iwan Paolucci that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "ipa", with
-commit author "Iwan Paolucci <iwan.paolucci@gmail.com>", are
-copyright oIwan Paoluccii.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Iwan Paolucci
-2019/04/18
-
diff --git a/RELICENSE/ipechorin.md b/RELICENSE/ipechorin.md
deleted file mode 100644
index 40ddffea9..000000000
--- a/RELICENSE/ipechorin.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ivan Pechorin that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "ipechorin", with
-commit author "Ivan Pechorin <ivan.pechorin@gmail.com>", are
-copyright of Ivan Pechorin.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Ivan Pechorin
-2019/09/25
-
diff --git a/RELICENSE/jackpimbert.md b/RELICENSE/jackpimbert.md
deleted file mode 100644
index e1917f91b..000000000
--- a/RELICENSE/jackpimbert.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jack Pimbert that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "jackpimbert",
-with commit author "jackpimbert <jack.pimbert@gmail.com>", are
-copyright of Jack Pimbert.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Jack Pimbert
-2019/05/24
-
-
diff --git a/RELICENSE/jacquesg.md b/RELICENSE/jacquesg.md
deleted file mode 100644
index 119f11212..000000000
--- a/RELICENSE/jacquesg.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jacques Germishuys that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "jacquesg", with
-commit author "Jacques Germishuys <jacquesg@striata.com>", are
-copyright of Jacques Germishuys.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Jacques Germishuys
-2018/12/14
-
diff --git a/RELICENSE/jakecobb.md b/RELICENSE/jakecobb.md
deleted file mode 100644
index 3e3be4857..000000000
--- a/RELICENSE/jakecobb.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Jake Cobb
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jakecobb", with
-commit author "Jake Cobb &lt;jake.cobb@gmail.com&gt;", are copyright of Jake Cobb.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jake Cobb
-2017/04/04
diff --git a/RELICENSE/jbreams.md b/RELICENSE/jbreams.md
deleted file mode 100644
index b1c30515e..000000000
--- a/RELICENSE/jbreams.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jonathan Reams
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jbreams", with
-commit author "Jonathan Reams <jbreams@gmail.com>", are copyright of
-Jonathan Reams.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Jonathan Reams
-2019/08/31
diff --git a/RELICENSE/jcfr.md b/RELICENSE/jcfr.md
deleted file mode 100644
index 4576920ea..000000000
--- a/RELICENSE/jcfr.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Jean-Christophe Fillion-Robin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jcfr", with
-commit author "Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>", are copyright of Kitware Inc.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jean-Christophe Fillion-Robin
-2019/09/03
diff --git a/RELICENSE/jcourreges.md b/RELICENSE/jcourreges.md
deleted file mode 100644
index b20bec8d1..000000000
--- a/RELICENSE/jcourreges.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Jérémie Courrèges-Anglas
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jcourreges", with
-commit author "Jérémie Courrèges-Anglas", are copyright of Jérémie Courrèges-Anglas.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jérémie Courrèges-Anglas
-2018/12/07
diff --git a/RELICENSE/jean-airoldie.md b/RELICENSE/jean-airoldie.md
deleted file mode 100644
index 27deff76c..000000000
--- a/RELICENSE/jean-airoldie.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jean Airoldie that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jean-airoldie", with commit author "jean-airoldie <25088801+jean-airoldie@users.noreply.github.com>", are copyright of Jean Airoldie. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Jean Airoldie 2019/04/27
diff --git a/RELICENSE/jemc.md b/RELICENSE/jemc.md
deleted file mode 100644
index b7ab5ab93..000000000
--- a/RELICENSE/jemc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Joe Eli McIlvain
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jemc", with
-commit author "Joe Eli McIlvain", are copyright of Joe Eli McIlvain.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Joe Eli McIlvain
-2017/03/28
diff --git a/RELICENSE/jens.auer.md b/RELICENSE/jens.auer.md
deleted file mode 100644
index bdc20e931..000000000
--- a/RELICENSE/jens.auer.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jens Auer
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jens.auer", with
-commit author "Jens Auer", are copyright of Jens Auer.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jens Auer
-2019/11/08
diff --git a/RELICENSE/jimenezrick.md b/RELICENSE/jimenezrick.md
deleted file mode 100644
index 743ca8951..000000000
--- a/RELICENSE/jimenezrick.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Ricardo Catalinas Jimenez
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jimenezrick", with
-commit author "Ricardo Catalinas Jimenez", are copyright of Ricardo
-Catalinas Jimenez.
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Ricardo Catalinas Jimenez
-2020/02/03
diff --git a/RELICENSE/jimklimov.md b/RELICENSE/jimklimov.md
deleted file mode 100644
index 91bf335c0..000000000
--- a/RELICENSE/jimklimov.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Evgeny (Jim) Klimov
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jimklimov",
-with commit author "Jim Klimov <jim@jimklimov.com>" or
-"Jim Klimov <jimklimov@gmail.com>", are copyright of Evgeny (Jim) Klimov.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Evgeny (Jim) Klimov  
-2017/03/21
diff --git a/RELICENSE/jkryl.md b/RELICENSE/jkryl.md
deleted file mode 100644
index ecd681e6c..000000000
--- a/RELICENSE/jkryl.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jan Kryl
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jkryl", with
-commit author "Jan Kryl jan.kryl@nexenta.com", are copyright of Jan Kryl.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jan Kryl
-2017/03/19
diff --git a/RELICENSE/jlauenercern.md b/RELICENSE/jlauenercern.md
deleted file mode 100644
index b21790a18..000000000
--- a/RELICENSE/jlauenercern.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Joel Lauener
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jlauenercern", with
-commit author "Joel Lauener <Joel.Lauener@cern.ch>", are copyright of Joel Lauener .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Joel Lauener 
-2019/08/12
\ No newline at end of file
diff --git a/RELICENSE/johntconklin.md b/RELICENSE/johntconklin.md
deleted file mode 100644
index decf33311..000000000
--- a/RELICENSE/johntconklin.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by John T. Conklin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "johntconklin", with
-commit author "J.T. Conklin <jtc@acorntoolworks.com>", are copyright of John T. Conklin.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-John T. Conklin
-2017-03-19
diff --git a/RELICENSE/jruffin.md b/RELICENSE/jruffin.md
deleted file mode 100644
index 947e0f737..000000000
--- a/RELICENSE/jruffin.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by IVU Traffic Technologies AG
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jruffin", with
-commit author "Julien Ruffin <jur@ivu.de>", are copyright of IVU Traffic Technologies AG.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Henrik Benner
-Head of Department Ticketing Development, IVU Traffic Technologies AG
-2017/05/10
diff --git a/RELICENSE/jsyoo5b.md b/RELICENSE/jsyoo5b.md
deleted file mode 100644
index 655b38eca..000000000
--- a/RELICENSE/jsyoo5b.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by JaeSang Yoo
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "JSYoo5B", with
-commit author "JaeSang Yoo <jsyoo5b@gmail.com>", are copyright of JaeSang Yoo.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-JaeSang Yoo  
-2020.02.29
diff --git a/RELICENSE/kanonet.md b/RELICENSE/kanonet.md
deleted file mode 100644
index fecb27768..000000000
--- a/RELICENSE/kanonet.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christoph Kahl that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "kanonet", with commit author "Christoph Kahl", are copyright of Christoph Kahl. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Christoph Kahl  
-2020/01/09
\ No newline at end of file
diff --git a/RELICENSE/kentzo.md b/RELICENSE/kentzo.md
deleted file mode 100644
index cd9421328..000000000
--- a/RELICENSE/kentzo.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ilya Kulakov
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "kentzo", with
-commit author "Ilya Kulakov <kulakov.ilya@gmail.com>", are copyright of Ilya Kulakov.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ilya Kulakov  
-2017/05/23
diff --git a/RELICENSE/kfish.md b/RELICENSE/kfish.md
deleted file mode 100644
index 832cb969c..000000000
--- a/RELICENSE/kfish.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Conrad Parker that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "kfish", with
-commit author "Conrad Parker <conrad@metadecks.org>", are
-copyright of Conrad Parker.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Conrad Parker
-2018/10/30
-
diff --git a/RELICENSE/kobolog.md b/RELICENSE/kobolog.md
deleted file mode 100644
index bd3a1dd26..000000000
--- a/RELICENSE/kobolog.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andrey Sibiryov that grants permission to relicense its copyrights in the
-libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source
-Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "kobolog", with commit author "Andrey Sibiryov <me@kobology.ru>",
-are copyright of Andrey Sibiryov. This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Andrey Sibiryov
-2017/04/04
diff --git a/RELICENSE/kreuzberger.md b/RELICENSE/kreuzberger.md
deleted file mode 100644
index 638234de2..000000000
--- a/RELICENSE/kreuzberger.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Joerg Kreuzberger
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "kreuzberger", with
-commit author "Joerg Kreuzberger", are copyright of Joerg Kreuzberger .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Joerg Kreuzberger
-2019/09/02
diff --git a/RELICENSE/kurdybacha.md b/RELICENSE/kurdybacha.md
deleted file mode 100644
index 2345d5808..000000000
--- a/RELICENSE/kurdybacha.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Pawel Kurdybacha 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "kurdybacha", with
-commit author "Pawel Kurdybacha pawel.kurdybacha@gmail.com", are copyright of Pawel Kurdybacha .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Pawel Kurdybacha
-2017/04/13
diff --git a/RELICENSE/laplaceyang.md b/RELICENSE/laplaceyang.md
deleted file mode 100644
index f59310429..000000000
--- a/RELICENSE/laplaceyang.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Xujing Yang (laplaceyang)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "laplaceyang", with
-commit author "laplaceyang <laplace2013@outlook.com>", are copyright of Xujing Yang.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Xujing Yang
-2020/04/22
diff --git a/RELICENSE/latchmoor-services-carcich.md b/RELICENSE/latchmoor-services-carcich.md
deleted file mode 100644
index 5fda258ef..000000000
--- a/RELICENSE/latchmoor-services-carcich.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Latchmoor Services, LLC
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "drbitboy", with
-commit author "Brian Carcich <drbitboy@gmail.com>", are copyright of Latchmoor
-Services, LLC.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Latchmoor Services, LLC
-2019/07/26
diff --git a/RELICENSE/leonarf.md b/RELICENSE/leonarf.md
deleted file mode 100644
index 91e81e6df..000000000
--- a/RELICENSE/leonarf.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Léonard Michelet
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "leonarf", with
-commit author "Léonard Michelet <leonard.michelet@openwide.fr>", are copyright of Léonard Michelet.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Michelet Léonard 2017/03/29
diff --git a/RELICENSE/liedtkeInTUM.md b/RELICENSE/liedtkeInTUM.md
deleted file mode 100644
index 7348494f2..000000000
--- a/RELICENSE/liedtkeInTUM.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Sven Liedtke
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "liedtkeInTUM", with
-commit author "Sven Liedtke", are copyright of Sven Liedtke.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Sven Liedtke  
-2019/11/27
\ No newline at end of file
diff --git a/RELICENSE/linville.md b/RELICENSE/linville.md
deleted file mode 100644
index 3e5ec8bb5..000000000
--- a/RELICENSE/linville.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Aaron Linville
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "linville", with
-commit author "Aaron Linville <aaron@linville.org>", are copyright of Aaron Linville.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Aaron Linville
-2017/03/27
\ No newline at end of file
diff --git a/RELICENSE/loachfish.md b/RELICENSE/loachfish.md
deleted file mode 100644
index c6fa5bce7..000000000
--- a/RELICENSE/loachfish.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Justin.Hung
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "loachfish", with
-commit author "Justin.Hung fronront@qq.com", are copyright of Justin.Hung .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Justin.Hung
-2017/03/20
\ No newline at end of file
diff --git a/RELICENSE/lodagro.md b/RELICENSE/lodagro.md
deleted file mode 100644
index 04b1b9a6d..000000000
--- a/RELICENSE/lodagro.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Wouter Overmeire that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2) or any other Open Source Initiative approved license chosen by the
-current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "lodagro", with commit
-author "lodagro <lodagro@gmail.com>", are copyright of Wouter Overmeire.  This
-document hereby grants the libzmq project team to relicense libzmq, including
-all past, present and future contributions of the author listed above.
-
-Wouter Overmeire
-2017/04/01
diff --git a/RELICENSE/lourens.md b/RELICENSE/lourens.md
deleted file mode 100644
index 000c0741d..000000000
--- a/RELICENSE/lourens.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Lourens Naudé
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "methodmissing", with
-commit author "Lourens Naudé <lourens@methodmissing.com>", are copyright of Lourens Naudé.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Lourens Naudé  
-2019/07/01
diff --git a/RELICENSE/lstacul.md b/RELICENSE/lstacul.md
deleted file mode 100644
index b95c149a4..000000000
--- a/RELICENSE/lstacul.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Laurent Stacul
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "stac47", with
-commit author "Laurent Stacul <laurent.stacul@gmail.com>", are copyright of
-Laurent Stacul .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Laurent Stacul
-2020/02/21
diff --git a/RELICENSE/madebr.md b/RELICENSE/madebr.md
deleted file mode 100644
index d4f142a50..000000000
--- a/RELICENSE/madebr.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Anonymous Maarten
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "madebr", with
-commit author "Anonymous Maarten <anonymous.maarten@gmail.com>", are copyright of Anonymous Maarten.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Anonymous Maarten
-2017/03/27
diff --git a/RELICENSE/malexzx.md b/RELICENSE/malexzx.md
deleted file mode 100644
index 153887197..000000000
--- a/RELICENSE/malexzx.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Aleksander Melnikov
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "malexzx", with
-commit author "Aleksander Melnikov", are copyright of Aleksander Melnikov.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Aleksander Melnikov
-2019/08/11
diff --git a/RELICENSE/mancasg.md b/RELICENSE/mancasg.md
deleted file mode 100644
index 233fb0f4c..000000000
--- a/RELICENSE/mancasg.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Mancaș George
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mancasg", with
-commit author "Mancaș George <mancas.f.george@gmail.com>", are copyright of Mancaș George .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Mancaș George
-2019/07/24
diff --git a/RELICENSE/mattconnolly.md b/RELICENSE/mattconnolly.md
deleted file mode 100644
index ecb1f0cd9..000000000
--- a/RELICENSE/mattconnolly.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Matthew Connolly
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mattconnolly", with
-commit author "Matt Connolly <matt.connolly@me.com>", are copyright of Matthew Connolly.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Matthew Connolly
-2017/06/28
\ No newline at end of file
diff --git a/RELICENSE/mauri-melato.md b/RELICENSE/mauri-melato.md
deleted file mode 100644
index 4bfddeed9..000000000
--- a/RELICENSE/mauri-melato.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Maurizio Melato 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mauri-melato", with
-commit author "Maurizio Melato", are copyright of Maurizio Melato.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Maurizio Melato
-2017-04-04
diff --git a/RELICENSE/mbarbisan.md b/RELICENSE/mbarbisan.md
deleted file mode 100644
index 52606159b..000000000
--- a/RELICENSE/mbarbisan.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Mark Barbisan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mbarbisan", with
-commit author "Mark Barbisan <mark@barbisan.ca>", are copyright of Mark Barbisan.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Mark Barbisan
-2019/08/31
-
diff --git a/RELICENSE/mdionisio.md b/RELICENSE/mdionisio.md
deleted file mode 100644
index b455376fa..000000000
--- a/RELICENSE/mdionisio.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Thomas M. DuBuisson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mdionisio", with
-commit author "Michele Dionisio", are copyright of Michele Dionisio.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Michele Dionisio
-2019/07/09
diff --git a/RELICENSE/mditzel.md b/RELICENSE/mditzel.md
deleted file mode 100644
index 88f7c2e56..000000000
--- a/RELICENSE/mditzel.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Maarten Ditzel
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mditzel", with
-commit author "Maarten Ditzel <maarten.ditzel@gmail.com>", are copyright of Maarten Ditzel.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Maarten Ditzel
-2017/03/24  
diff --git a/RELICENSE/meox.md b/RELICENSE/meox.md
deleted file mode 100644
index a963d34a9..000000000
--- a/RELICENSE/meox.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gian Lorenzo Meocci
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "meox", with
-commit author "Gian Lorenzo Meocci <glmeocci@gmail.com>", are copyright of Gian Lorenzo Meocci.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Gian Lorenzo Meocci  
-2017/04/09
\ No newline at end of file
diff --git a/RELICENSE/mesegura.md b/RELICENSE/mesegura.md
deleted file mode 100644
index 5d501242d..000000000
--- a/RELICENSE/mesegura.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Manuel Segura
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mesegura", with
-commit author "Manuel Segura", are copyright of Manuel Segura .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Manuel Eduardo Segura
-2019/08/10
diff --git a/RELICENSE/mgatny.md b/RELICENSE/mgatny.md
deleted file mode 100644
index 28ed8378f..000000000
--- a/RELICENSE/mgatny.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Mike Gatny (mgatny) that grants permission to relicense
-his copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license chosen
-by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mgatny", with commit author
-"Mike Gatny <mgatny@gmail.com>" or "Mike Gatny <mgatny@connamara.com>", are
-copyright of Mike Gatny.  This document hereby grants the libzmq project team
-to relicense libzmq, including all past, present and future contributions of
-the author listed above.
-
-Mike Gatny
-2019/02/19
diff --git a/RELICENSE/michicc.md b/RELICENSE/michicc.md
deleted file mode 100644
index a0f8f120d..000000000
--- a/RELICENSE/michicc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Lutz
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "michicc", with
-commit author "Michael Lutz <michi@icosahedron.de>", are copyright of Michael Lutz.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Michael Lutz
-2017/05/01
diff --git a/RELICENSE/micromass-ricnewton.md b/RELICENSE/micromass-ricnewton.md
deleted file mode 100644
index 6aedb60c1..000000000
--- a/RELICENSE/micromass-ricnewton.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Micromass UK Limited 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ricnewton", with
-commit author "Richard Newton" are copyright of Micromass UK Limited.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Steve Smith 
-Director Micromass UK Limited
-2017/04/26
diff --git a/RELICENSE/miniway.md b/RELICENSE/miniway.md
deleted file mode 100644
index 171e87c50..000000000
--- a/RELICENSE/miniway.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dongmin Yu
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "miniway", with
-commit author "Dongmin Yu <miniway@gmail.com>", are copyright of Dongmin Yu.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dongmin Yu
-2019/08/12
diff --git a/RELICENSE/minrk.md b/RELICENSE/minrk.md
deleted file mode 100644
index 3aaea5566..000000000
--- a/RELICENSE/minrk.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Min Ragan-Kelley
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the GitHub handle "minrk", with
-commit author "Min RK benjaminrk@gmail.com", are copyright of Min Ragan-Kelley.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Min Ragan-Kelley 
-2017/07/17
diff --git a/RELICENSE/mipaaa.md b/RELICENSE/mipaaa.md
deleted file mode 100644
index c8b7f1a0c..000000000
--- a/RELICENSE/mipaaa.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Hand
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mipaaa", with
-commit author "Michael Hand <mipaaa@gmail.com>", are copyright of Michael Hand.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Michael Hand
-2017/03/21
diff --git a/RELICENSE/mjvk.md b/RELICENSE/mjvk.md
deleted file mode 100644
index a056b52ec..000000000
--- a/RELICENSE/mjvk.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Mark Jan van Kampen that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "mjvk", with
-commit author "Mark Jan van Kampen <markjanvankampen@gmail.com>", are
-copyright of Mark Jan van Kampen.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Mark Jan van Kampen
-2020/02/24
\ No newline at end of file
diff --git a/RELICENSE/mkluwe.md b/RELICENSE/mkluwe.md
deleted file mode 100644
index 3ffe98d45..000000000
--- a/RELICENSE/mkluwe.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Matthias Kluwe
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mkluwe", with
-commit author "Matthias Kluwe <mkluwe@gmail.com>", are copyright of Matthias Kluwe.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Matthias Kluwe
-2017/03/24
diff --git a/RELICENSE/mkoppanen.md b/RELICENSE/mkoppanen.md
deleted file mode 100644
index 061732d33..000000000
--- a/RELICENSE/mkoppanen.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Mikko Koppanen that grants permission to relicense his
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2) or any other Open Source Initiative approved license chosen by the
-current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mkoppanen", with commit
-author "Mikko Koppanen <mikko@kuut.io>", are copyright of Mikko Koppanen.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Mikko Koppanen
-2018/02/17
diff --git a/RELICENSE/mloy.md b/RELICENSE/mloy.md
deleted file mode 100644
index ae9044527..000000000
--- a/RELICENSE/mloy.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Matthias Loy
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mloy", with
-commit author "Matthias Loy", are copyright of Matthias Loy.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Matthias Loy
-2020/01/18
-
diff --git a/RELICENSE/mongodb.md b/RELICENSE/mongodb.md
deleted file mode 100644
index 774a34514..000000000
--- a/RELICENSE/mongodb.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jonathan Reams (of MongoDB, Inc.)
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jbreams", with
-commit author "Jonathan Reams jbreams@mongodb.com" (specifically the commits merged in pull requests #1451, #1449, #1448, and #1174), are copyright of
-MongoDB, Inc.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Jonathan Reams
-2019/10/1
diff --git a/RELICENSE/montoyaedu.md b/RELICENSE/montoyaedu.md
deleted file mode 100644
index 62df2250a..000000000
--- a/RELICENSE/montoyaedu.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by H. Eduardo Montoya Sánchez
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "montoyaedu", with
-commit author "Montoya Edu <montoya.edu@gmail.com>", are copyright of H. Eduardo Montoya Sánchez.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-H. Eduardo Montoya Sánchez
-2017/03/20
diff --git a/RELICENSE/moretromain.md b/RELICENSE/moretromain.md
deleted file mode 100644
index 88d6fb2c1..000000000
--- a/RELICENSE/moretromain.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Romain Moret that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "moretromain", with
-commit author "Romain Moret <moretromain@gmail.com>", are
-copyright of Romain Moret.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Romain Moret
-2019/05/06
\ No newline at end of file
diff --git a/RELICENSE/msune.md b/RELICENSE/msune.md
deleted file mode 100644
index 9f73c460f..000000000
--- a/RELICENSE/msune.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Marc Suñé Clos (msune)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "msune", with
-commit author "Marc Sune <marcdevel@gmail.com>" or
-"Marc Sune <marc@voltanet.io>", are copyright of Marc Suñé.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Marc Suñé Clos
-2019/08/31
diff --git a/RELICENSE/murphybytes.md b/RELICENSE/murphybytes.md
deleted file mode 100644
index 7930e4385..000000000
--- a/RELICENSE/murphybytes.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by John Murphy    
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "murphybytes", with
-commit author "John Murphy <murphybytes@gmail.com>", are copyright of John Murphy .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-John Murphy
-2019/08/12
diff --git a/RELICENSE/mvilim.md b/RELICENSE/mvilim.md
deleted file mode 100644
index 5c4d70c18..000000000
--- a/RELICENSE/mvilim.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Vilim that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "mvilim", with
-commit author "Michael Vilim <697a9b924bfa6f06a81e82975ddca4785b90a7b40d91044ce76f68d3bd65a9b8@697a9b924bfa6f06a81e82975ddca4785b90a7b40d91044ce76f68d3bd65a9b8.com>", are
-copyright of Michael Vilim.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Michael Vilim
-2019/08/31
diff --git a/RELICENSE/mystfit.md b/RELICENSE/mystfit.md
deleted file mode 100644
index b8c607fa6..000000000
--- a/RELICENSE/mystfit.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Byron Mallett
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mystfit", with
-commit author "Byron Mallett <byronated@gmail.com>", are copyright of Byron Mallett .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Byron Mallett 
-2018/9/1
diff --git a/RELICENSE/naos_ltd.md b/RELICENSE/naos_ltd.md
deleted file mode 100644
index 114073978..000000000
--- a/RELICENSE/naos_ltd.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## Naos Ltd (a New Zealand company)
-
-This is a statement by Naos Ltd (Naos) that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under
-the Mozilla Public License v2 (MPLv2).
-
-The port of libzmq to run on the z/OS Mainframe ([GitHub Pull
-request #1136](https://github.com/zeromq/libzmq/pull/1136), [GitHub Pull
-request #1138](https://github.com/zeromq/libzmq/pull/1138), and
-[GitHub Pull request #1139](https://github.com/zeromq/libzmq/pull/1139))
-was performed as work for hire under contract to iMatix Corporation
-sprl, itself under contract to a client.  Thus copyright in that
-portability work does not belong to Naos Ltd, and Naos Ltd hereby
-releases any claim to the copyright in the z/OS Mainframe portability
-work identified by the above three GitHub pull requests.
-
-Ewen McNeill  
-Managing Director, Naos Ltd  
-2016-04-25
diff --git a/RELICENSE/natano.md b/RELICENSE/natano.md
deleted file mode 100644
index fd127de1a..000000000
--- a/RELICENSE/natano.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Martin Natano
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "natano", with
-commit author "Martin Natano", are copyright of Martin Natano.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Martin Natano
-2017/03/21
diff --git a/RELICENSE/neheb.md b/RELICENSE/neheb.md
deleted file mode 100644
index d616230bd..000000000
--- a/RELICENSE/neheb.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Rosen Penev
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "flub", with
-commit author "Rosen Penev <rosenp@gmail.com>", are copyright of
-Rosen Penev .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Rosen Penev
-2019/04/19
diff --git a/RELICENSE/ninoles.md b/RELICENSE/ninoles.md
deleted file mode 100644
index 508b6e896..000000000
--- a/RELICENSE/ninoles.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Fabien Ninoles that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla
-Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "ninoles",
-with commit author "Fabien Ninoles", are copyright of Fabien Ninoles.
-
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Fabien Ninoles
-
-2020/02/11
diff --git a/RELICENSE/nixman.md b/RELICENSE/nixman.md
deleted file mode 100644
index 4b2499c39..000000000
--- a/RELICENSE/nixman.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by niXman (github.nixman@pm.me)
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "niXman", with
-commit author "niXman", are copyright of nixMan .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-niXman (github.nixman@pm.me)
-2019/10/03
diff --git a/RELICENSE/normano.md b/RELICENSE/normano.md
deleted file mode 100644
index 0d82f5f1e..000000000
--- a/RELICENSE/normano.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Norman Ovenseri
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "normano", with
-commit author "normano", are copyright of Norman Ovenseri.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-This is a statement by Norman Ovenseri
-2019/05/01
diff --git a/RELICENSE/ojura.md b/RELICENSE/ojura.md
deleted file mode 100644
index 8ebf88340..000000000
--- a/RELICENSE/ojura.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Juraj Oršulić that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "ojura", with commit author "Juraj Oršulić", are copyright of Juraj Oršulić.
-This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Juraj Oršulić
-2018/10/26
diff --git a/RELICENSE/olafmandel.md b/RELICENSE/olafmandel.md
deleted file mode 100644
index 9372bb47f..000000000
--- a/RELICENSE/olafmandel.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Olaf Mandel
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "olafmandel", with
-commit author "Olaf Mandel <o.mandel@menlosystems.com>", are copyright of Olaf Mandel.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Olaf Mandel
-2017/03/21
diff --git a/RELICENSE/omegastick.md b/RELICENSE/omegastick.md
deleted file mode 100644
index 47d46eda7..000000000
--- a/RELICENSE/omegastick.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Isaac Poulton
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Omegastick", with
-commit author "Omegastick", are copyright of Isaac Poulton.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Isaac Poulton
-2019/04/14
diff --git a/RELICENSE/opedroso.md b/RELICENSE/opedroso.md
deleted file mode 100644
index 772e8b348..000000000
--- a/RELICENSE/opedroso.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by "Osiris Pedroso"
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "opedroso", with
-commit author "Osiris Pedroso <opedroso@gmail.com>", are copyright of "Osiris Pedroso".
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Osiris Pedroso
-2017/03/21
diff --git a/RELICENSE/opensource-kymetacorp.md b/RELICENSE/opensource-kymetacorp.md
deleted file mode 100644
index 1723d2aa1..000000000
--- a/RELICENSE/opensource-kymetacorp.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Kymeta Corporation
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "opensource-kymetacorp", with
-commit author "opensource-kymetacorp", are copyright of Kymeta Corporation.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Kymeta Corporation
-2018/11/21
diff --git a/RELICENSE/paddor.md b/RELICENSE/paddor.md
deleted file mode 100644
index add5103c0..000000000
--- a/RELICENSE/paddor.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Patrik Wenger
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "paddor", with
-commit author "Patrik Wenger", are copyright of Patrik Wenger .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Patrik Wenger
-2019/08/31
diff --git a/RELICENSE/panlinux.md b/RELICENSE/panlinux.md
deleted file mode 100644
index b43a40437..000000000
--- a/RELICENSE/panlinux.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andreas Hasenack that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "panlinux", with
-commit author "Andreas Hasenack <andreas@canonical.com>", are
-copyright of Andreas Hasenack.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Andreas Hasenack
-2019/03/18
-
diff --git a/RELICENSE/pavel-pimenov.md b/RELICENSE/pavel-pimenov.md
deleted file mode 100644
index d62b5994e..000000000
--- a/RELICENSE/pavel-pimenov.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Pavel Pimenov
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle pavel-pimenov, with
-commit author Pavel Pimenov pavel.pimenov@gmail.com, are copyright of Pavel Pimenov .
-This document hereby grants the libzmq project team to relicense
-libzmq, 
-including all past, present and future contributions of the author
-listed above.
-
-Pavel Pimenov
-2020/02/04
diff --git a/RELICENSE/philippeleite.md b/RELICENSE/philippeleite.md
deleted file mode 100644
index c7aa3218e..000000000
--- a/RELICENSE/philippeleite.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Philippe Leite that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "philippeleite", with
-commit author "Philippe Leite <philippe.leite@gmail.com>", are
-copyright of Philippe Leite.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Philippe Leite
-2019/06/10
diff --git a/RELICENSE/phreed.md b/RELICENSE/phreed.md
deleted file mode 100644
index d14b99275..000000000
--- a/RELICENSE/phreed.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Fredrick Paul Eisele
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle phreed, with
-commit author "Fred Eisele", are copyright of Fred Eisele .
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Fredrick Paul Eisele
-2020/01/03
diff --git a/RELICENSE/pijyoi.md b/RELICENSE/pijyoi.md
deleted file mode 100644
index ffd890b14..000000000
--- a/RELICENSE/pijyoi.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by KIU Shueng Chuan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "pijyoi", with
-commit author "KIU Shueng Chuan <nixchuan@gmail.com>", are copyright of KIU Shueng Chuan.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-KIU Shueng Chuan
-2017/03/23
diff --git a/RELICENSE/pmienk.md b/RELICENSE/pmienk.md
deleted file mode 100644
index 513b0b79c..000000000
--- a/RELICENSE/pmienk.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Phillip Mienk
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "pmienk", with
-commit author "Phillip Mienk <mienkphi@gmail.com>", are copyright of Phillip Mienk.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Phillip Mienk
-2019/02/18
diff --git a/RELICENSE/pnnl.md b/RELICENSE/pnnl.md
deleted file mode 100644
index d3a05c996..000000000
--- a/RELICENSE/pnnl.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Pacific Northwest National Laboratory (Battelle Memorial Institute, Pacific Northwest Division)
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license (at least as permissive as the MPLv2) chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "hashstat", with
-commit author "Brandon Carpenter <brandon.carpenter@pnnl.gov>", are copyright of Pacific Northwest National Laboratory (Battelle Memorial Institute, Pacific Northwest Division).
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jereme Haack on behalf of Brandon Carpenter
-2019/02/18
diff --git a/RELICENSE/prarrot.md b/RELICENSE/prarrot.md
deleted file mode 100644
index d98cb0536..000000000
--- a/RELICENSE/prarrot.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Timothy Mossbarger
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Prarrot", with
-commit author "Prarrot", are copyright of Timothy Mossbarger .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Timothy Mossbarger
-18 Feb 2019
diff --git a/RELICENSE/psl-felipefarinon.md b/RELICENSE/psl-felipefarinon.md
deleted file mode 100644
index 80e7c3125..000000000
--- a/RELICENSE/psl-felipefarinon.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Felipe Goron Farinon (psl-felipefarinon)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "psl-felipefarinon", with
-commit author "Felipe Goron Farinon", are copyright of Felipe Goron Farinon.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Felipe Goron Farinon
-2019/09/02
diff --git a/RELICENSE/ptroja.md b/RELICENSE/ptroja.md
deleted file mode 100644
index 6a9b1e8f4..000000000
--- a/RELICENSE/ptroja.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Piotr Trojanek that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2) or any other Open Source Initiative approved license chosen by the
-current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ptroja", with
-commit author "Piotr Trojanek <piotr.trojanek@gmail.com>", are copyright of Piotr Trojanek.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Piotr Trojanek
-2017/03/19
diff --git a/RELICENSE/rcxdude.md b/RELICENSE/rcxdude.md
deleted file mode 100644
index 24514e5d2..000000000
--- a/RELICENSE/rcxdude.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Douglas Young
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "rcxdude", with
-commit author "Douglas Young <rcxdude@gmail.com>", are copyright of Douglas Young .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Douglas Young 
-2019/08/31
diff --git a/RELICENSE/reunanen.md b/RELICENSE/reunanen.md
deleted file mode 100644
index 48923857a..000000000
--- a/RELICENSE/reunanen.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Juha Reunanen, Tomaattinen Ltd, and Outotec (Finland) Oy
-that grants permission to relicense their copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the GitHub handle "reunanen", with
-commit author "Juha Reunanen <juha.reunanen@tomaattinen.com>", are copyright of Juha Reunanen.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Juha Reunanen
-2017/04/01
diff --git a/RELICENSE/reza-ebrahimi.md b/RELICENSE/reza-ebrahimi.md
deleted file mode 100644
index e393ec9e6..000000000
--- a/RELICENSE/reza-ebrahimi.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Reza Ebrahimi
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "reza-ebrahimi", with
-commit author "Reza Ebrahimi <reza.ebrahimi.dev@gmail.com>", are copyright of Reza Ebrahimi.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Reza Ebrahimi
-2017/03/22
\ No newline at end of file
diff --git a/RELICENSE/rgagnon24.md b/RELICENSE/rgagnon24.md
deleted file mode 100644
index 007f0af4e..000000000
--- a/RELICENSE/rgagnon24.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Robert Gagnon that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved
-license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rgagnon24", with commit author
-"Robert Gagnon rgagnon24+zmq@gmail.com", are copyright of Robert Gagnon.  This document hereby grants the
-libzmq project team to relicense libzmq, including all past, present and future contributions of the
-author listed above.
-
-Robert Gagnon  
-2017/03/19
diff --git a/RELICENSE/rikvdh.md b/RELICENSE/rikvdh.md
deleted file mode 100644
index 2fdcbbefa..000000000
--- a/RELICENSE/rikvdh.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Rik van der Heijden
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rikvdh", with
-commit author "Rik van der Heijden <mail@rikvanderheijden.com>" and "Rik van der Heijden <rik.vanderheijden@dualinventive.com>", are copyright of Rik van der Heijden.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Rik van der Heijden
-2017/04/23
diff --git a/RELICENSE/rlenferink.md b/RELICENSE/rlenferink.md
deleted file mode 100644
index f7b336558..000000000
--- a/RELICENSE/rlenferink.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Roy Lenferink
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rlenferink", with
-commit author "Roy Lenferink <lenferinkroy@gmail.com>" or "Roy Lenferink <rlenferink@apache.org>", are copyright of Roy Lenferink.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Roy Lenferink  
-2017/03/17
\ No newline at end of file
diff --git a/RELICENSE/roalz.md b/RELICENSE/roalz.md
deleted file mode 100644
index b3f0680f2..000000000
--- a/RELICENSE/roalz.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Roal Zanazzi that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "roalz", with commit author 
-"roalz <roal.zanazzi@gmail.com>", are copyright of Roal Zanazzi.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Roal Zanazzi  
-2017/03/21
diff --git a/RELICENSE/rodgert.md b/RELICENSE/rodgert.md
deleted file mode 100644
index 51e00691c..000000000
--- a/RELICENSE/rodgert.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Thomas Rodgers 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rodgert", with
-commit author "Thomas Rodgers <rodgert@twrodgers.com>", are copyright
-of Thomas Rodgers.
-
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Thomas W Rodgers
-2017/04/08
diff --git a/RELICENSE/rotty.md b/RELICENSE/rotty.md
deleted file mode 100644
index 0823450fa..000000000
--- a/RELICENSE/rotty.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andreas Rottmann that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other share-alike Open Source
-Initiative approved license chosen by the current ZeroMQ BDFL
-(Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rotty", with
-commit author "Andreas Rottmann <a.rottmann@gmx.at>", are copyright of
-Andreas Rottmann.  This document hereby grants the libzmq project team
-to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Andreas Rottmann
-2017/05/07
diff --git a/RELICENSE/sappo.md b/RELICENSE/sappo.md
deleted file mode 100644
index 88c919546..000000000
--- a/RELICENSE/sappo.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Kevin Sapper that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "sappo", with commit author
-"Kevin Sapper <mail@kevinsapper.de>", are copyright of Kevin Sapper. This document hereby grants the
-libzmq project team to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Kevin Sapper
-2017/03/20
diff --git a/RELICENSE/scemama.md b/RELICENSE/scemama.md
deleted file mode 100644
index d90ef8d90..000000000
--- a/RELICENSE/scemama.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Anthony Scemama
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "scemama", with
-commit author "Anthony Scemama <scemama@irsamc.ups-tlse.fr>", are copyright of Anthony Scemama.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Anthony Scemama
-2017/03/21
diff --git a/RELICENSE/schulzch.md b/RELICENSE/schulzch.md
deleted file mode 100644
index 2ed2939ae..000000000
--- a/RELICENSE/schulzch.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christoph Schulz
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "schulzch", with
-commit author "Christoph Schulz <schulzcbs@gmail.com>", are copyright of Christoph Schulz.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Christoph Schulz
-2018/09/10
diff --git a/RELICENSE/sdrsdr.md b/RELICENSE/sdrsdr.md
deleted file mode 100644
index 4d7563c9a..000000000
--- a/RELICENSE/sdrsdr.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Stoian Ivanov that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public 
-License v2 (MPLv2) or any other Open Source Initiative approved license 
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "sdrsdr", with commit 
-author "Stoian Ivanov sdr@mail.bg", are copyright of Stoian Ivanov. This 
-document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Stoian Ivanov
-2017-03-23
diff --git a/RELICENSE/serg06.md b/RELICENSE/serg06.md
deleted file mode 100644
index 59174a5c0..000000000
--- a/RELICENSE/serg06.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by serg06 (serg06)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "serg06", with commit author
-"serg06 <serkhas@hotmail.com>" are copyright of serg06.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-serg06
-2020/05/25
diff --git a/RELICENSE/shancat.md b/RELICENSE/shancat.md
deleted file mode 100644
index 5e3aeb2f7..000000000
--- a/RELICENSE/shancat.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Shannen Saez
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "shancat", with
-commit author "Shannen Saez <shannenlaptop@gmail.com>", are copyright of Shannen Saez.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Shannen Saez
-2017/03/21
diff --git a/RELICENSE/sheremetyev.md b/RELICENSE/sheremetyev.md
deleted file mode 100644
index a34123322..000000000
--- a/RELICENSE/sheremetyev.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Fedor Sheremetyev
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "sheremetyev", with
-commit author "Fedor Sheremetyev <sheremetyev@gmail.com>", are copyright of Fedor Sheremetyev.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Fedor Sheremetyev  
-2017/03/20
diff --git a/RELICENSE/shripchenko.md b/RELICENSE/shripchenko.md
deleted file mode 100644
index 932f9f4ae..000000000
--- a/RELICENSE/shripchenko.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Sergey KHripchenko
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "shripchenko", with
-commit author "Sergey KHripchenko <shripchenko@intermedia.net>", are copyright of Sergey KHripchenko.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Sergey KHripchenko  
-2017/03/20
\ No newline at end of file
diff --git a/RELICENSE/sigiesec.md b/RELICENSE/sigiesec.md
deleted file mode 100644
index c7eaf3b33..000000000
--- a/RELICENSE/sigiesec.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Simon Giesecke that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "sigiesec", with
-commit author "Simon Giesecke <simon.giesecke@btc-ag.com>", are
-copyright of Simon Giesecke.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Simon Giesecke
-2017/08/17
-
diff --git a/RELICENSE/simias.md b/RELICENSE/simias.md
deleted file mode 100644
index 1a8d89d8c..000000000
--- a/RELICENSE/simias.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Lionel Flandrin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "simias", with
-commit author "Lionel Flandrin lflandrin@ereca.fr", are copyright of Lionel Flandrin.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Lionel Flandrin
-2018/05/02
diff --git a/RELICENSE/skaller.md b/RELICENSE/skaller.md
deleted file mode 100644
index 7aa59a7a6..000000000
--- a/RELICENSE/skaller.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by John Skallwe
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any
-other Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle “skaller", with
-commit author “skaller", are copyright of John Skaller .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-John Skaller
-2019/09/01
diff --git a/RELICENSE/skicc.md b/RELICENSE/skicc.md
deleted file mode 100644
index 127d7db28..000000000
--- a/RELICENSE/skicc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by skicc
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "skicc", with
-commit author "skicc <skicc@fastmail.com>", are copyright of skicc.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-skicc
-2019/06/15
diff --git a/RELICENSE/somdoron.md b/RELICENSE/somdoron.md
deleted file mode 100644
index 6446333e8..000000000
--- a/RELICENSE/somdoron.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Doron Somech (somdoron)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "somdoron", with
-commit author "Doron Somech <somdoron@gmail.com>", are copyright of Doron Somech.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Doron Somech
-2019/02/18
diff --git a/RELICENSE/sonoware.md b/RELICENSE/sonoware.md
deleted file mode 100644
index 255027eee..000000000
--- a/RELICENSE/sonoware.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by sonoware GmbH that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "sonoware", with commit author
-"Stephan Senkbeil" are copyright of sonoware GmbH. 
-This document hereby grants the libzmq project team to relicense libzmq, including
-all past, present and future contributions of the authors listed above.
-
-Stephan Senkbeil <stephan.senkbeil@sonoware.de>
-2019/12/13
diff --git a/RELICENSE/soulik.md b/RELICENSE/soulik.md
deleted file mode 100644
index 3263d00cd..000000000
--- a/RELICENSE/soulik.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Mário Kašuba
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "soulik", with
-commit author "Mário Kašuba mario.kasuba@it-academy.sk", are copyright of Mário Kašuba.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Mário Kašuba  
-2017/03/20
\ No newline at end of file
diff --git a/RELICENSE/spotify.md b/RELICENSE/spotify.md
deleted file mode 100644
index cfda4a76d..000000000
--- a/RELICENSE/spotify.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Spotify AB that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "gimaker", with commit author
-"Staffan Gimåker", the commits made by the Github handle "danielnorberg", with
-commit author "Daniel Norberg", and the commits made by the Github handle
-"caipre", with commit author "Nick Platt", are copyright of Spotify AB. This
-document hereby grants the libzmq project team to relicense libzmq, including
-all past, present and future contributions of the authors listed above.
-
-Nick Platt <nickplatt@spotify.com>
-2019/08/21
diff --git a/RELICENSE/ssbl.md b/RELICENSE/ssbl.md
deleted file mode 100644
index 4529bd83a..000000000
--- a/RELICENSE/ssbl.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Shubham Lagwankar that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "ssbl", with
-commit author "Shubham Lagwankar <shubhu105@gmail.com>", are
-copyright of Shubham Lagwankar.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Shubham Lagwankar
-2018/10/30
-
diff --git a/RELICENSE/staticfloat.md b/RELICENSE/staticfloat.md
deleted file mode 100644
index 6b1dad16c..000000000
--- a/RELICENSE/staticfloat.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Elliot Saba
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "staticfloat", with
-commit author "Elliot Saba <staticfloat@gmail.com>", are copyright of Elliot Saba.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Elliot Saba
-2017/03/19
diff --git a/RELICENSE/std-any-emplace.md b/RELICENSE/std-any-emplace.md
deleted file mode 100644
index 09892ac7d..000000000
--- a/RELICENSE/std-any-emplace.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by the Github user "std-any-emplace"
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "std-any-emplace", with
-commit author "std-any-emplace", are copyright of the Github user "std-any-emplace".
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-"std-any-emplace"
-2020/01/19
\ No newline at end of file
diff --git a/RELICENSE/steve-o.md b/RELICENSE/steve-o.md
deleted file mode 100644
index 7ea393e66..000000000
--- a/RELICENSE/steve-o.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Steven McCoy
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "steve-o", with
-commit author "Steven McCoy <steven.mccoy@miru.hk>" and "Steve-o 
-<fnjordy@gmail.com>", are copyright of Steven McCoy.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Steven McCoy
-2019/02/24
diff --git a/RELICENSE/straubar.md b/RELICENSE/straubar.md
deleted file mode 100644
index 975f9ae1d..000000000
--- a/RELICENSE/straubar.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Alexander Straub
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "straubar", with
-commit author "Alexander Straub <alexander.straub@visus.uni-stuttgart.de>", are copyright of Alexander Straub.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Alexander Straub
-2019/09/04
diff --git a/RELICENSE/suudy.md b/RELICENSE/suudy.md
deleted file mode 100644
index d2dd9f1d0..000000000
--- a/RELICENSE/suudy.md
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a statement by Peter LaDow that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Suudy", with commit
-author "Suudy <pladow@gmail.com>", are copyright of Peter LaDow.  This
-document hereby grants the libzmq project team to relicense libzmq, including
-all past, present and future contributions of the author listed above.
-
-Peter LaDow
-14 August 2019
diff --git a/RELICENSE/swansontec.md b/RELICENSE/swansontec.md
deleted file mode 100644
index c7127cfb9..000000000
--- a/RELICENSE/swansontec.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by William Swanson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "swansontec", with
-commit author " William Swanson <swansontec@gmail.com>", are copyright of William Swanson.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-William Swanson
-2017/04/10
diff --git a/RELICENSE/t-b.md b/RELICENSE/t-b.md
deleted file mode 100644
index 5b17e1486..000000000
--- a/RELICENSE/t-b.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Thomas Braun
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "t-b", with
-commit author "thomas.braun@virtuell-zuhause.de" and "thomas.braun@byte-physics.de", are copyright of Thomas Braun.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Thomas Braun
-2017/03/27
diff --git a/RELICENSE/tSed.md b/RELICENSE/tSed.md
deleted file mode 100644
index 806896ab0..000000000
--- a/RELICENSE/tSed.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Samuel Martin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "tSed", with
-commit author "Samuel Martin <s.martin49@gmail.com>", are copyright of Samuel Martin.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Samuel Martin
-2017/03/25
diff --git a/RELICENSE/tabe.md b/RELICENSE/tabe.md
deleted file mode 100644
index 44f5e45c0..000000000
--- a/RELICENSE/tabe.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Takeshi Abe
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "tabe", with
-commit author "Takeshi Abe <tabe@fixedpoint.jp>", are copyright of Takeshi Abe.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Takeshi Abe
-2017/03/22
diff --git a/RELICENSE/tailhook.md b/RELICENSE/tailhook.md
deleted file mode 100644
index 63088b717..000000000
--- a/RELICENSE/tailhook.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Paul Colomiets
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "tailhook", with
-commit author "Paul Colomiets <paul@colomiets.name>" or "Paul Colomiets
-<pc@gafol.net>", are copyright of Paul Colomiets.  This document hereby grants
-the libzmq project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Paul Colomiets
-2017/03/19
diff --git a/RELICENSE/taotetek.md b/RELICENSE/taotetek.md
deleted file mode 100644
index 977692136..000000000
--- a/RELICENSE/taotetek.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Brian Knox
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "taotetek", with
-commit author "Brian Knox", are copyright of Brian Knox.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Brian Knox
-2017/03/19  
diff --git a/RELICENSE/tberkey.md b/RELICENSE/tberkey.md
deleted file mode 100644
index 7fe868c29..000000000
--- a/RELICENSE/tberkey.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Telford Berkey
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "tberkey", with
-commit author "Telford Berkey <tberkey@gmail.com>", are copyright of Telford Berkey.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Telford Berkey
-
-03 Feb 2020
diff --git a/RELICENSE/templates/relicense-template-mplv2-any-osi.txt b/RELICENSE/templates/relicense-template-mplv2-any-osi.txt
deleted file mode 100644
index 4af359f49..000000000
--- a/RELICENSE/templates/relicense-template-mplv2-any-osi.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by {{ name of company / name of individual }}
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "{{github username}}", with
-commit author "{{github commit author}}", are copyright of {{ name }} .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-{{ Full Name }}  
-{{ creation date of document (format: yyyy/mm/dd) }}
\ No newline at end of file
diff --git a/RELICENSE/templates/relicense-template-mplv2-share-alike-osi.txt b/RELICENSE/templates/relicense-template-mplv2-share-alike-osi.txt
deleted file mode 100644
index f530a931d..000000000
--- a/RELICENSE/templates/relicense-template-mplv2-share-alike-osi.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by {{ name of company / name of individual }}
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "{{github username}}", with
-commit author "{{github commit author}}", are copyright of {{ name }} .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-{{ Full Name }}  
-{{ creation date of document (format: yyyy/mm/dd) }}
\ No newline at end of file
diff --git a/RELICENSE/templates/relicense-template-mplv2.txt b/RELICENSE/templates/relicense-template-mplv2.txt
deleted file mode 100644
index 1cdd3ca8b..000000000
--- a/RELICENSE/templates/relicense-template-mplv2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by {{ name of company / name of individual }}
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "{{github username}}", with
-commit author "{{github commit author}}", are copyright of {{ name }} .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-{{ Full Name }}  
-{{ creation date of document (format: yyyy/mm/dd) }}
\ No newline at end of file
diff --git a/RELICENSE/thompsa.md b/RELICENSE/thompsa.md
deleted file mode 100644
index d62d38dfd..000000000
--- a/RELICENSE/thompsa.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andrew Thompson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "thompsa", with
-commit author "Andew Thompson <andy@fud.org.nz>", are copyright of Andrew Thompson.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Andrew Thompson
-2017/03/20
diff --git a/RELICENSE/tommd.md b/RELICENSE/tommd.md
deleted file mode 100644
index c75af8f8c..000000000
--- a/RELICENSE/tommd.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Thomas M. DuBuisson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "tommd", with
-commit author "Thomas M. DuBuisson", are copyright of Thomas M. DuBuisson.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Thomas M. DuBuisson
-2019/04/11
diff --git a/RELICENSE/tomzbench.md b/RELICENSE/tomzbench.md
deleted file mode 100644
index 1cbcc4fdb..000000000
--- a/RELICENSE/tomzbench.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Thomas Chiantia
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "tomzbench", with
-commit author "Thomas<Thomas@Altronix.com>", are copyright of
-Thomas Chiantia.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Thomas Chiantia
-2019/08/10
diff --git a/RELICENSE/toonetown.md b/RELICENSE/toonetown.md
deleted file mode 100644
index 62c2e8c8c..000000000
--- a/RELICENSE/toonetown.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Nathan Toone that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "toonetown", with
-commit author "Nathan Toone <nathan@toonetown.com>", are
-copyright of Nathan Toone.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Nathan Toone
-2018/11/05
-
diff --git a/RELICENSE/trevorbernard.md b/RELICENSE/trevorbernard.md
deleted file mode 100644
index 6477d303d..000000000
--- a/RELICENSE/trevorbernard.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Trevor Bernard (trevorbernard) that grants
-permission to relicense his copyrights in the libzmq C++ library
-(ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open
-Source Initiative approved license chosen by the current ZeroMQ BDFL
-(Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "trevorbernard",
-with commit author "Trevor Bernard <trevor.bernard@gmail.com>", are
-copyright of Trevor Bernard. This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Trevor Bernard
-2019/02/25
diff --git a/RELICENSE/trya.md b/RELICENSE/trya.md
deleted file mode 100644
index 8e303fef7..000000000
--- a/RELICENSE/trya.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by trya.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "trya", with
-commit author "trya", are copyright of trya.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-trya
-2019/09/23
diff --git a/RELICENSE/twhittock.md b/RELICENSE/twhittock.md
deleted file mode 100644
index 8498ed07f..000000000
--- a/RELICENSE/twhittock.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tom Whittock
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "twhittock", with
-commit author "Tom Whittock", are copyright of Tom Whittock.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Tom Whittock
-2017/04/10
diff --git a/RELICENSE/ulikoehler.md b/RELICENSE/ulikoehler.md
deleted file mode 100644
index 20f121907..000000000
--- a/RELICENSE/ulikoehler.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Uli Köhler.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-All commits made by the Github handle "ulikoehler", with
-commit author "Uli Köhler", are copyright of Uli Köhler.
-
-This document hereby grants the libzmq project team to relicense libzmq and / or CZMQ, 
-including all past, present and future contributions of the author listed above.
-
-Uli Köhler
-2017/03/25
\ No newline at end of file
diff --git a/RELICENSE/viciious.md b/RELICENSE/viciious.md
deleted file mode 100644
index 2d77b247b..000000000
--- a/RELICENSE/viciious.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Victor Luchits
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "viciious", with
-commit author "Victor Luchits", are copyright of Victor Luchits.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Victor Luchits
-2019/11/12
diff --git a/RELICENSE/vortechs2000.md b/RELICENSE/vortechs2000.md
deleted file mode 100644
index 5f63ff411..000000000
--- a/RELICENSE/vortechs2000.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Quantum Corporation
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "vortechs2000", with
-commit author "AJ Lewis aj.lewis@quantum.com", are copyright of Quantum Corporation.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-AJ Lewis
-2019/02/21
diff --git a/RELICENSE/vtellier.md b/RELICENSE/vtellier.md
deleted file mode 100644
index 3d57001e7..000000000
--- a/RELICENSE/vtellier.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Vincent Tellier
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "vtellier", with
-commit author "Vincent Tellier", are copyright of Vincent Tellier .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Vincent Louis Théophile Tellier  
-2017/03/20
\ No newline at end of file
diff --git a/RELICENSE/vyskocilm.md b/RELICENSE/vyskocilm.md
deleted file mode 100644
index ddf27f1c3..000000000
--- a/RELICENSE/vyskocilm.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by "Michal Vyskocil" that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "vyskocilm", with commit author "Michal Vyskocil michal.vyskocil@gmail.com", are copyright of "Michal Vyskocil". This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Michal Vyskocil 2017/03/24
diff --git a/RELICENSE/wallstprog.md b/RELICENSE/wallstprog.md
deleted file mode 100644
index b32a11a7e..000000000
--- a/RELICENSE/wallstprog.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Bill Torpey that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "wallstprog", with
-commit author "Bill Torpey <wallstprog@gmail.com>", are
-copyright of Bill Torpey.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Bill Torpey
-2018/11/02
diff --git a/RELICENSE/willstrang.md b/RELICENSE/willstrang.md
deleted file mode 100644
index 9484c59fc..000000000
--- a/RELICENSE/willstrang.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by William P Strang
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "willstrang", with
-commit author "Will Strang <william.p.strang@gmail.com", are copyright of William P Strang.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-William P Strang  
-2017/03/23
diff --git a/RELICENSE/xantares.md b/RELICENSE/xantares.md
deleted file mode 100644
index 8da5ba04c..000000000
--- a/RELICENSE/xantares.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Ricardo Catalinas Jimenez
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "xantares", with
-commit author "Michel Zou <xantares09@hotmail.com>", are copyright of Michel Zou.
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Michel Zou
-2020/02/03
diff --git a/RELICENSE/xaqq.md b/RELICENSE/xaqq.md
deleted file mode 100644
index dc5cb84f6..000000000
--- a/RELICENSE/xaqq.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Kapp Arnaud
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "xaqq", with
-commit author "Kapp Arnaud", are copyright of Kapp Arnaud.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Kapp Arnaud
-2017/03/30
diff --git a/RELICENSE/xqcool.mq b/RELICENSE/xqcool.mq
deleted file mode 100644
index eb7786d3f..000000000
--- a/RELICENSE/xqcool.mq
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by xqcool
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "xqcool", with
-commit author "xqcool <xuquan316@live.com>", are copyright of xqcool .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-xqcool  
-2020/01/01
diff --git a/RELICENSE/yan12125.md b/RELICENSE/yan12125.md
deleted file mode 100644
index 69832838d..000000000
--- a/RELICENSE/yan12125.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Chih-Hsuan Yen
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "yan12125", with
-commit author "Chih-Hsuan Yen <yan12125@gmail.com>", are copyright of Chih-Hsuan Yen.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Chih-Hsuan Yen
-2019/10/12
diff --git a/RELICENSE/yuvallanger.md b/RELICENSE/yuvallanger.md
deleted file mode 100644
index c5a7ea4c1..000000000
--- a/RELICENSE/yuvallanger.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Yuval Langer
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "yuvallanger", with
-commit author "Yuval Langer <yuval.langer@gmail.com>", are copyright of Yuval Langer.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Yuval Langer  
-2017-03-19
diff --git a/RELICENSE/zoobab.md b/RELICENSE/zoobab.md
deleted file mode 100644
index 216ce9769..000000000
--- a/RELICENSE/zoobab.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Benjamin HENRION
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "zoobab", with
-commit author "Benjamin HENRION", are copyright of Benjamin HENRION .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Benjamin HENRION (zoobab)
-Done in Brussels on the 2020/02/03
diff --git a/SECURITY.md b/SECURITY.md
deleted file mode 100644
index 561a39563..000000000
--- a/SECURITY.md
+++ /dev/null
@@ -1,319 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-4.x versions are supported with critical and security bug fixes.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 4.3.x   | :white_check_mark: |
-| 4.2.x   | :white_check_mark: |
-| 4.1.x   | :white_check_mark: |
-| 4.0.x   | :white_check_mark: |
-| < 4.0   | :x:                |
-
-## Reporting a Vulnerability
-
-If you believe a bug you found could have security implications,
-please send a GPG encrypted email with the details to the maintainers:
-
-| Maintainer | Email address   | GPG fingerprint |
-| ---------- | --------------- | --------------- |
-| Doron Somech | somdoron@gmail.com | E0B0 E3D1 55DD 6ED6 71FB  2B79 D0B9 CC44 867D 8F3D |
-| Luca Boccassi | luca.boccassi@gmail.com | A9EA 9081 724F FAE0 484C 35A1 A81C EA22 BC8C 7E2E |
-
-## Internal severity classification
-
-We will attempt to follow this general policy when assigning a severity to
-security issues. These are guidelines more than rules, and as such end
-results might vary.
-
-
-| Severity | Definition |
-| -------- | ---------- |
-| CRITICAL | endpoints using STRONG authentication are SILENTLY affected |
-| HIGH | endpoints using STRONG authentication are VISIBLY affected |
-| MODERATE | endpoints NOT using STRONG authentication are SILENTLY affected |
-| LOW | endpoints NOT using STRONG authentication are VISIBLY affected |
-
-STRONG authentication means transports that use cryptography, for example CURVE
-and TLS.
-
-VISIBLY affected means that platform owners are likely to immediately notice
-misbehaviours, like crashes or loss of connectivity for legitimate peers.
-
-SILENTLY affected means that without close inspection, platform owners are
-unlikely to notice misbehaviours, like remote code executions or data exfiltration.
-
-### Public keys
-<details>
-<summary>Doron Somech</summary>
-
-```
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBF0YXO8BEAD8Be6QQa+ALzIWszeDPtVK9DCGN7ZM1C4Ygq6w7llauhg4wreg
-kQy7YwOFKsFTi9cmIRfkw/lX9tIn+PkNe+kV7tOLDCdAmNCqdERvM/C46uPM/Mx4
-IdaoUXOPVIwbLcCLysiYxickq/M6ymPH7pAT5deCxH9B1DV38T2Mlq+uXXyZ1aFE
-74oCouQ7Vau31NBeOA4DkpPjpdA/WXMVEqoB3PKALUGYs1Ce5CguE0WjdueZFt2k
-DvdYtbUFb+vNLMPCejf1sBWDnUygPfsPPakyimfxBSIRsQLvw/5t6bkiWgtGU4LD
-o37skSzum7h0rw1378ryoMUYdaNu/oNlWCwbQzBjD6G+WYbmu5AB5aGSaDjUzg9K
-AIcaNbRFln7OwvHrQdvDuWypZw7JvWYbehaywBagbjSTjIwb+Umki8cF/zxi5sxI
-eFRMARDVQa5PAeErDd+4RtMcB55M2a90xWcTcfBdE/VYmwBXsMMWju4ceBtAqBCB
-DTVxxaT54tKjkOKa1Yk75zL4Xu7Sekg2BIaHh/qVMn5aTEX+X6ImeFhWRjhgsk+Q
-XoXo74nJq2aCJ2sSjLRdvnePtc3WM+WfdmdnC12JpBiBn4TFYxMBJlvqfKBxZELU
-eZBkB6eTcBO/n5U3jSdFM47SeiBgUlPRiV+0ArZJ4i2Giv9vduWO6XeMVwARAQAB
-tCFEb3JvbiBTb21lY2ggPHNvbWRvcm9uQGdtYWlsLmNvbT6JAjgEEwECACIFAl0Y
-XO8CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJENC5zESGfY89i0wP/i5k
-sYQkdaPeos9JnfUd3cV588lQzBN2bVhzCtbrjR6wXn9hRhZP9ftCNKoVp8cpC07G
-Vq87sKqeB7odaK67jS+XoF4msIUEYS0lN2lPORf523VK3Juy9FW39aEPfx+6P5+h
-h49VveR1t9I7MgdjnKVwmaELcFDKKGQaPlcWlKctSkOLRw/vYFIvajFJ30bkK9+z
-sjgtUvXbSgt4HHHOQ/M6oCNhDsY0YE1zNxDgc8EqRlRxf76+pwldMe47/sIP2U7m
-qI6d/LfsWnK6iJ0ehlp6oPP2GcUM8bH3lh2ugHH7sPSwpvh/rHqQTTxv+KiFeQOC
-yuxvWdjathnDDHRNPVahBR747iKlcebJeaK5X8wObcIDaGBecwnNIjws4hrYAFH0
-eNiROIbDkxDjwFhBYLDMfVCPW3xpBDa67EBJ6qTrabxmXOGvUDR2kB0P5lmtU/jL
-jdVeFLj9tgwuuL8PW5k/gCdeB4WSBF4VWAHBZ2vDXUPut78dHQQg+dgvHmbnRYZB
-Em6nrYUeoQ4nSOHf7VmdHf05HGwam+ZTWLN2sIEerNJlRCx6mEn20O2S7DE4RMi5
-VjBFHy8/YSR3hRtdOSYfE61AeProeDPTGiei6xxlN00MQ7K/kFhQHIjKz1Ao51LU
-o6+KGTtka2+g368boLcQALIchlfp7cfUAEp+dB7UuQINBF0YXO8BEADBXhwad2VN
-XFhD69CPwWR39KmoW019EvT8tNWzCPzx8hQeTJz+fY0bTiXYxMROZwF0SD4kqYet
-nejfH+boUFV64coxmfCmriqOQ0SGZTCfWzrjDrWjj51Xe1NWsGnFNO6vCcL1NNPB
-0ZcE/wskEaKPi6Ui0SwvlDJQFK5UnrnFehmEIxEqi8BFez2Ft7/3I/XRrhlDzMtT
-hDgMb+Ro9BydddH3TRKAdJBzIsozCrv0nn1DIXM+Pocqiuvk72E6iUxS2meeA4F6
-DTG6MIWEcf6WPRVqXdD2bCBzDJ1NYixK9TFdZjo/6jTLwwX711+/NTIblAbpc/KE
-io+0cuRG99gP8Cr+1VVZ2fcK9FpjI/u4YERmj8arMkcFz+QQDaJnXIjmNDpD0zBQ
-Dh2v6pKysoEgmOE2xDzBsJbZomluKOytLN9/KcqucB1qkjzHD5JeZe+/S1vxdZUn
-+81Us+SeepiDOfrT84xFYcqJentL+ylFj7zBdeqF4WTnZAT9/xbVuUSYnRm1Sm0z
-vr99Sum0MXUTzgNhY5x3PkFQyg91lllJUFGoXiLivG+3M8JFC7V2K7wXhHFqffVX
-Qq6UOm6+kCTjUCgzpQswMpDremB7A2fBQObKOC/3pE0Gbh3uKvylqQkMPTn4lOao
-J3VSd1hBqHAdb5uxnmxN8w3wIpnaSypBawARAQABiQIfBBgBAgAJBQJdGFzvAhsM
-AAoJENC5zESGfY895WkQAJYvJg/IYBKh0SblT8lGj9O+mLXO6K1q+HfZ6mERm9Ew
-+fgW/cwGzuUrn+DC6vfsXlqtshUwiaxaa6NJccPBfC5IGHAegK5giwnQ/sbrA70A
-7md2u+NK2tNDGK4Gxy8ZWMY1++TmwdVLzNivM5IA/NGotyYgQStDI+/Muvh+0wQ9
-xZjo/InxVXeQcnqQXVKhoouPo2GlXslHev04SRl/ZJYN5sEHCE0Qx6L++esVvrwE
-/N5NT5Rk41l4mXAN2SM0H5AB+Wf1qIiVB6pMLBzXM/7qnCnJS0FZZjf2WRiB0yXj
-xTl+/JUK9MYckkrNcAfnb6yvnvO5W3KDabZhl/Cqw08vVSvcqyYRFXIa4vduiGJP
-L6C8o3USbjVfZhBSHXpuo7JPzR0S4l52QB2ZnTCRIjSBe5vphVum6r3vR5rKAU1n
-Htytqm099TlDapj+4wixSv8TvwlJr9no0uEJloyRAMFMYms4KgLEEZfc2tqpe/sA
-nO6TM9h/hCbrImplSiesHqTxprnKAipudSYkc750zuFTiBQ5WwYbWjkCB2PSEh+l
-8ZCRM5Ropfk4ATMhXH/w2Dxa5mdaHuKWKUc14+YfSBJI8yohbVIzYVsvAclctCQY
-kAh/Z/Fl8W+ftDsZF0/1k3fxyKwExFej+AIsabcQDG0bAHscfH/44atKZRPn72FI
-=Qu19
------END PGP PUBLIC KEY BLOCK-----
-```
-
-</details>
-
-<details>
-<summary>Luca Boccassi</summary>
-
-```
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFTKss4BEAC6LdgaSpaSBbMZK8erDulfXpCszvssCvEAI5lshfNNLHqOGy4r
-g+A3xyaGe+ITjoahT56Ly+dylduRvuZaJwbKWZqOKLnZHG0/Y/4K1MSk73TtcFbS
-Vn0q1dZmr14ysTKB8E1UJ8XQZO+PO79VANjvj9oEqsYX4xJ5BenWdfqJOGa+8jn8
-ou75vYcTFkIlvSnaHT4MkCqPGnuGgqiunEScjpBRFOX6ZIdRZvXcjP4HymdQAIMA
-BDDcV/qT+3VIOwKCn2e1jtxGbgMUwyosfz7nmlNHAdLrnficbSSsjRBIKxLgKN/N
-2fk/jk87mbs7Qz5L2bSxU68emGHZ1BEkBJ4vhiO6VBx8XHolK2RpI/3v0qzdGynZ
-YKTF2yBFqBlDI12gbfxabCQ7FgxwLBmYw/C068NVtXLM0AAMFrJmXRoexE698DJi
-wL/4qxWy2Py/wBHSFInmyUSSVi2CjRkLh2zA/EJ/268HooItcnL7kGnyWo9IJZEz
-Ma7QO1FF/513xsW2QyPr/QNvuJ4GT/SyIgz+6Ln/z8wHCJQw8CM7vFRgOCuy2U3R
-srO926muRbl97pqRmCXbb+OJQMcYaA841FPKHq52kUTeGqkiJW4RocckcEGqhxhh
-zj8KjIb2wBgkYviFQWKLIpZBVxKSAjVXTl/Bzk9m2ZPETjMZKtz09xtloQARAQAB
-tCBMdWNhIEJvY2Nhc3NpIDxibHVjYUBkZWJpYW4ub3JnPokCNwQTAQoAIQUCWab4
-pwIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRCoHOoivIx+Lmx3D/0f5Nxi
-LYPDpxPOJDnEGUNqLiHlnyHwlHidV1xROfh8F6WkDrEAO5YfkASJjqBYJY93ZiZU
-/ROUdpcct9sN0K1Vw4yTAHFYpYO2G9oc3ax+3ly0rON4L7t1Xj9cvR1/b2fIIltE
-Yied0XP3ukUfjECOkwQZJbmOHjsea61i5da/JEbDFkr32witorIMMIOAsZkZ+tcL
-xo2kRhk5PT7t6yo5cRLd0rLGKvKMBkMrNcPNk/T1V1YKB6yy0gAfo+dhZyI/khNC
-VuYZB59oYX5FS5FkGn/CCmuPN3YkGBqe0vZJjYLe8PK0vPS1obg9gRuYuJXdxIQn
-P8hD/y6Cu1axoy5EPt1uNc1bUSkvWUoJ2pWkeUAEKa/E8I0xKwQfHHo93rA1Xfdc
-c3rivihyj25/CkHo3zP6Xa0fqQLjpvusdf5nxuKL5cQYCAkNV9/sITTCxxYiKhp5
-lto9jhxs5j3/D4WV0+EGaQ/jfwg0i1h5eApzJQWMG+dEiT28s9+zPgFqfYq5oqVk
-cF+3tv39Mk/k06XqEwD+TmhV3Yv/wy1BDrGxvQgMP5GtIPS6p6+PBWFE+HUYYPdZ
-/vFN5DugzvVznjxLETUvj1G7mCQyHFXIkezF3mfr3uk0WiYWYoEqQ1Jdg8nsiTq3
-iRTwW3XNsNhB28OoXH461215t/LakjGMVOmUSrQkTHVjYSBCb2NjYXNzaSA8bGJv
-Y2Nhc3NAYnJvY2FkZS5jb20+iQIzBDABCgAdBQJZozczFh0gcHJldmlvdXMgam9i
-J3MgZW1haWwACgkQqBzqIryMfi67IhAAq7Gj+p4Xt5Zc5OhMt7xaz6lGVdgXljGE
-mVmKgmyHWwMnNRpLrsXUWK8iZuvpg9Ges1o0Ckf7f+631XTOle0r3MwsVI+FgWVM
-BzAg7ft9GlIMqgY6suWlV7Rwar+rmzgf4A6tDjDWq4Lr2QTbhzjKoZeVL52Z2tpd
-nq0Iq1RKuXPQ8AEkPcfhYc3Z8ZL0MQ1cL98c42qVRYmoa1JmABen7rSUmIQL3t9v
-aZXLqnTNOEtpbJ0QLuhasBTPwUW7FOwvSFr8PSoSKtOJ9VLEGDgJD6wewc/MYJsu
-fMECdfVYipOP/mlX1hrmxyucEm0a6CjFDvrP46sUJ4JoVcmr1Te898VQYKvBRFZK
-7UxJIbp6nZdyW6jI0HdstgUNyh0IzTgOUfgdkn5m8Xw3AaJdzGIy6cu4+g0Qmief
-rbZrReVcWYPswITpnDtEAmghq7C7QJ5OB7PA2G1xWqOeLMQnE2tTGpJfWkuv6FEI
-lG+5utAKSwDz9sZ93wbYGil5/rBSLOS2XoZfS67yROQH8+f1vc2tMpdfD6Z8rtkH
-HfotVwDkx3xIKWCENdmL0ewHbzjKXglSi1VkFGdrxoXyQvpSeAgO2GE0spM3lRIR
-cfNsXrzx4J21TUDrjK9mg/+KVEGA2I7E95d/ByyjDz4w0yx6xv4nyHtptgAc72aP
-41NMSpr0qje0J0x1Y2EgQm9jY2Fzc2kgPGx1Y2EuYm9jY2Fzc2lAZ21haWwuY29t
-PokCOgQTAQgAJAIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAUCVMq0wgIZAQAK
-CRCoHOoivIx+LtL+D/4+JIaILWcbIymShr7cOhlWKu7/AqAHrT+y/0s99O3Tu6TD
-7bk5LUMUL5TBZtyVbUQh0KPjVYH+QZyDGICwn9snbkftIACvwD8LgtUv+5PbAQ1D
-of1ZtNjbl5S+VeKoD5Ev01t5QusRfThyiHzFSZOvePiLuRyRe1ixn1fzXl/NxuW2
-d7eJyxNRmyZ6N63SVDnBvOFwbNSJ4awXZa2S23edswfNcfEeYVVrEmEfBsi4U3ZY
-rjHWV+SvHoa63vEfyooynRofXgwPZLeOcsa6f2Q3jTI7WaCVnxL7K0GlxW3pd+MO
-E8HKFj/8MnK29ykQgvfOjvBtKIQmZoPHB1+FT6YIxr0fkLIK2FHGZ0azh0T7sWEh
-0WPQeieGFdDOq0z9Jf6fiWwIeetpwdeEoAzzXQZkHfRNpwzkXx7RlfITUqko3UiW
-l/w5S7t4x2HFyFHVb5osqF+NhCxGaqZGGkkegE/9RRcvFzN8pbUHNMxnwV/KQW8V
-1DZ9P7Kr+a/KV+dmEs/7vAj0vyFzCJbc8qecqOWVOLjY9tzOBjEWa1zvt6PVxZGJ
-I3i+lvdLcpvIWyAI68Gi7kOsTuu8A8iXDxEfzJ8kGlBnflq14sio3VKP6nVIPwbF
-5CwturkRM0vPkKSIliBCvS2MvnC3S+0AkKjhKRl9InBh0mCx1cRylJ8ZltHj9rQr
-THVjYSBCb2NjYXNzaSA8bHVjYS5ib2NjYXNzaUBtaWNyb3NvZnQuY29tPokCTgQT
-AQoAOBYhBKnqkIFyT/rgSEw1oagc6iK8jH4uBQJccpvuAhsDBQsJCAcDBRUKCQgL
-BRYCAwEAAh4BAheAAAoJEKgc6iK8jH4uA7kP/RbwUH1C8RfWJWvtaDsvoJ5jnoB1
-lJDxUBEd+6j+AWTUD+fAAxLE/bcqxXzsPz4dscwpnoKmqVIpAdhTN+EvRZRLA1r/
-kbKlnDFnEm89MYYS1e8dGtXqa1zAPl+IxL46Da5/l8GsepOr9HftrPBjN56R/HIf
-tOwc9Vir1NLaC+S0CsAKwyAjpq8srjvrxFWr9a82+7GiBz2Wrc60vWIfaZuDKpVE
-4RpvEaiYoGEJEUp4wNhaVdQrhe8m6C0uczwq2t5aSjxuuso+rsN3PK/jvNrmxfbS
-a0NMzwhZ92w+J7CFyg85c0OQ6hmZRTf6G2v8pFpWlbcb7sePlvYcEIeZik4Nx73T
-EkqwmX5WC0NPzj+wdBWG/G+fFIcUUaMZzcGjgy9MXD+RVVyGs6W2/Q7iPBzDxny6
-KJLjUK8xMGRLo3rvdAUqug3Gpe6dth/8XBp0cY1gk4n3OUluBWOXSEwW7zm3s77r
-K4s5JC/rBOgCeCNV+qXLydazn4qjQXixqb0ezyGGxO9w/+q9T7MBwQy5/Q25w4qL
-bcCxTLAhRpye2C1nCHt4GvH4SUjdh6wtHdkXjtyYMTRmMU40GN/PL5QFyyMS7nEC
-YiycLB99knGwsh1FX31Q4aU7qUWO6Ejhk9W43IZjQpaITXoyCwKnMaE+X6Uqk745
-io6PFV1+6ix1l8MhuQENBFieLi0BCAC8doYzfmC8HWjtP0Q0s6fpRwjwGTTOaxk8
-qOMW+vgVY5eAIWYOGX8kNdzUE1nnRgrGhqcOe+g0NvXNkE83KIeAZFL5k96/o+K9
-IJTSlrNzjWR3NsQPfjrQ4/pDcuwtxWBIaZNAF7GJNnjGeQ4dvVHwTzi1b3xrELxK
-YO3iiYkku5O2rrHxI2Pv8mBWZ/v6Zr81hutk6TtpsGGWRBEq2sAdS+qV+Bk+C8LJ
-sdOLeZLU9aVILtMPQkL0z3GTcb7IVknLPZ+aeraFRBLXO1k29J2JnTwECEkfOQep
-mBkGJ4FGHQ+eG7ejLd1i8BLFEeLk9ia2wLl6xiij1I2lplcuaLq7ABEBAAGJA1sE
-GAEKACYCGwIWIQSp6pCBck/64EhMNaGoHOoivIx+LgUCXFwb5AUJCWGINgEpwF0g
-BBkBCgAGBQJYni4tAAoJEEspZoBQeFFiy5EIAI2YXvth4tRojymdZ3oYiZRz3Xtx
-OJiiEsjZkP036k4pKdmtn1zxAPzd5W5kprk8AkWjjKyBSNS47i3lvjRFQXpKpUbG
-J0CdjDCE2CaonMb1oh/pVbQ0VvMoPRyj1Jjz/gFCeXLFq8AcXrRYjh/aW6RNPj0Q
-nqL70ta6qFSavxrLPVkm02mFWEKlWNLtb7uzLM2KfCLI/ZZdsKSkTwZhWDQybp2o
-XO1fZdI7aSoLYQFY6pIjdIuTnQrqIrRKtk+ummBMMKBS18eyiJ1FR7cIp54Vektl
-VcaFOGI+MHDrDO4+hGfE+w59szW5ma60S92keJSWgOJQD4Nu/sPor9M+ZlcJEKgc
-6iK8jH4u21wP/RtYbohWfpBDSReU+ynG5QGLcELpSMHlCRz2ZxaV8bqGblGftjiW
-eyvEZePOJpb5Sev20TnUBzzilZc1nLwOxP5tDZpEvo1j2bIY1YamZc7g7XE+xRbl
-djiwGtj9PA3z2DME0iuxM/xN0Ghaea/vHeMim1miRJ8sbOheHwmwALPQzvTUV1Cq
-Ngn8J1eUP/tC6wv/BnBwTkaHugqqmBglE9V8GptIVE5Tam/TfwVQXx72ZW2YHa4A
-bwHf+oUtH2/jOTjOj/kWT7docgSDj7kColJ7mwuZZ0NSwYhA5dKN1CWX7c65ENzN
-h4pIiM9Ula0tInRal2qK9YXy/GV0gFXwV/aFh22G/xtPRs0qqhBxr2lxGOg5XsAk
-SEu+nlCThjEZDQVXxmptdVVvHwh/+Lrconk3o/sUTFgZ9mroQYceJa1z9cIn1A1Z
-Pb2SffXWU18lOuuC2Cw7XGx8QN1rWbmVVA0mvNQ6MpUYCOICy7bVIfUYcX6xuoWh
-Tfu5lE0qUw8PhBGUaW+pqGvEDcM/PWhopx+mSqq/Ip4LfZ0Cn33KLV4SzJjnhC1Q
-RVQoUYpzBDREgOUo6eqwNSCM1ZxkOIoueOZ6TRoYrUaJUGAJOZvXVl6NfpizQ1bp
-Tu1l6dz7U3JqYG/V/kr+IKxWJf/JhYjZ73Da9mx+2SuNOKj1SFohLNL3uQENBFie
-Lj4BCADUpbwnWqJsjL6la8HdROHY/LePMvWiCJAK1tZX6HadW07FxCMlQPOhX6jj
-YI85BmYM1AZpEDRLqdkAUf6+lSY9VywXy6G8DsQTSiO+Fn6DWEJ9yYelLIQW0xMJ
-cWd55D9+tDlJFFfiE2OLjrSoxPRGjhB7iajsdNlD6JTjuJq60zAcxF7J2o6Keesw
-HVYooz460MLuVq3BeyNxH/d9B/y5n3ibSVgJc8PYkDRN2Y+ILuAXd/ia0GTphTM5
-j9R+mCJDuRRVZAgNfa9AJMPJ0QbIFnRdnwRTEGt6LYA/AIoBgwjiveTfr8N2LArD
-ARNP6rV+Ugf3rW2bZPEoCv82bsx3ABEBAAGJAjwEGAEKACYCGwwWIQSp6pCBck/6
-4EhMNaGoHOoivIx+LgUCXFwb5AUJCWGIJQAKCRCoHOoivIx+LoL6EACYK7c/yOQH
-ZtSfzkrfNpd/MiY1j6rpUr0mrbKBVKamJ1N5Ae48E2ETlRfM3B6fk+dqovKbD0gQ
-oDHcCo201770pyoFwxyHZleiSWfQjNp4JCoXvGAh+AK6xfiPZIEzfLDrm3nrd38m
-rLEsUPRPdoyemAb2kKBoMmfkPt0e6WnqKxlFBngyF35jOFXnp//yGNCWvr4gibXD
-zIlMnQUXlYzKqZPnIwdEGyQT4KWLAHLCu5lzk6JmvMJPqTPU/uKbgKcHHy8cY0Xm
-xPOAPbnSbSYsuMcJpZMiIKBRozZk26fWdDJorWBPZ91OEmfSCx2X1P99UQId67SJ
-9V4EUbZjGDrsEJcosmg1JN2bFIKzI6VTrYvxA2ghPuowXgKZ3k/BuFXMA41hnP/P
-pn8DjsYu/9yzV5TRYvQEVSGrN7c3tJGlyZrbZ3YxyDyniWZhrFmgVqdo3jZfhhgT
-xTnuSfUyhtA6jk5ECVuF+oxmWyjRzJW2XoPPpmYe9CQ2efHZ4RFqCO50keBAH0KH
-UCl3eg2E4HeALu++Aq9v07JyAyA6MYbTvHjrdMmHHDb3kHG3O/rPoH2120wYXHAW
-SBvoOOJZyT/4rF3BNcrLiPxDCi+mOe5vkX5jymHe4fho1kvh0mLLzeC9fKiJjExL
-yF2yrNrTFESt66057r3CIb8BcJXPGhxpXrkBDQRYni5MAQgAnBzmeIfxaXebmSJj
-wbH1ScEHIATXoDs1FtVumWTmfGS851lqoMBoemWPZleBoMTOza5cnv6EzPIGYRYL
-Sd+GTDOAzNdnuHxULm8gUqEdoQ8+GwcTXCSjOsvuZJvIWjJ3Siz3JRnTsM8hrYoz
-tZZhDQqsmqmCyrmw5IsxInDfTd6XrdJ834TOS87pJTwFzrt3B4UuhMMGX8IWjPsG
-Z0ZRBbUMhAxt07+JV2lW9o7AA0H733NHjhZ4/mjn62WpDVFzHIkvdVaNbb5hGXrJ
-HbRIqQUj4tX32uYEkpd0Uy7KEtqh/HI+tW1nL47Ba6EEY+3IvFO+XJiy5Zhoe0ku
-NiLebwARAQABiQI8BBgBCgAmAhsgFiEEqeqQgXJP+uBITDWhqBzqIryMfi4FAlxc
-G+QFCQlhiBcACgkQqBzqIryMfi5icA//f5d9VR2F/p/iBRbKudu5HHp3YxAxKLe/
-T5FobOd9LBM4z8G9x6puaVP5bFjN5IMB67piUTVgSTDFwvS5sj538xRddTLg6gdo
-cE8qU6gb0Caj3eDm6aaPH6sz8Dkq0lV0AibiFZAlysgH3Jb0mavTLbES92LVTC+y
-jgm6rKxazD7Xf7eKKAtU6Yv5hy8/RtkxqXUjiW5JuvM6GHrplFaoqLQqTTs84jmU
-JdAn5ocTHSZkWnrXD2ymNcSQ1Rb34JYOzhEZmqk7qID0HvTT2g7D52gP2Jw4AzNM
-kmf/tbB/ugWIBsEClwVkk6yUxjSTjjOq5p3Jg/9vqiEEml7xnSNwqY5w/FCIdwV/
-bcrDAvRYAY2whDUtjIBJrD5AzRq3A4FU9ErdkKNGToL1sAUZdyH+qsCuJl0eY/Ry
-lMdgYrKc4HWNOh+viG7ap/RxUULll3wXuwtcDapRe/lg4YABmORzgDPgXcGPODhS
-WdKeQid9kKucWUrjOXogxa28hO9P/6OhngUor9FECHqxa3dTEm9GAxRKJhJhWm8m
-wu2rTGBSOEDk918ffR+HyPJ5CoEUCj03vY1OJwcwhtCaKb83swuiXwDeZ7eXVRL7
-2nRMieLWYxNV8seKDFCm/7fXbNWpYe6HRtZfGiPVICJZbVHS73n4Kglxg03LKSXT
-ZEG+OhK+ULy5Ag0EVMqyzgEQAN1wRSjfQMyZRcelT38yhZUiSti6KqljizjkWzVY
-khFab3IXeW4m5uUv/N8J23h2tUhc4R3di1W5L3dvOMzY9cHeR4KucU3QA7TC/cUS
-Qo+tdxj0HgXLMoTHUUeo2w7mX0NTeH7Evq3zEwWOJksAXgb4+8V5t/afBl1IC0gf
-Nol/1iHkX6/49kSJ+0HoYEj7cPF8Il7IN55Xe/ZmsuucgjM6Wt3/ndJKmHyssDxA
-pUnlK5Uj++039Q7SNRDtLoc8Y1LoL544bSADOMrRAXEKj4ACYNUs8I1pf80w8CTn
-Hg7SEILesOqBMfYotz2pQ2x0KqfCOfetSe9YcZIu/Qdjx8qBm3a69Y6wSn40uIws
-W8lfEL+V2ltRsyCtmA1hNmreNc4tXtlXtWF6aZxT2wm97Gn8YjiQTEe7sfvNNcTH
-wP29KUofmIFtXCX2eMeqRWBhtqFE5uaDdI5UQyfjY9Au+Mc/d2WHMS1PGK/Z8NKy
-7huM24/yK7GxFbbPm3pZiWlV5kbl5f4bEPrBoqzdzoK0/N12UsfuWFV5m2YUIwW4
-BXaI26dzUM9Fc9ecbcoJXd7FzgmdKUi0/Gw7NYrbsL09zrAB+AQer602LHW1Aiqr
-93QkkB2ViWupYiGli2sC54qrAR4iEUATAk2AJIyXnjaI3DftExz/c4y8NuMwFXKc
-LxWHABEBAAGJAjwEGAEKACYCGwwWIQSp6pCBck/64EhMNaGoHOoivIx+LgUCXFwb
-4wUJDTUDlQAKCRCoHOoivIx+Lgf8D/0ZoaK2TUxsdcINtHxeKP8zIjnk1HJQxVDs
-LewL90rP/sqHplYdDItBHW3aQT+S82xmb2DaWcy1DJ+kDAPqKIEgYcIVCho+8dD/
-XwY3/vQQnRYt3thxj/REtLid97ldtWn0pw4f4sxwMbs0qXq/R9fnnoNXBBH6ctxA
-6dy4/QkBMY4LyaTnSYzvaB6JSwIC95MGl2/yn1WFCzdRPjxU1SLsSImCkBaG1uhK
-rX/rECSuQCktfG0hy+F2QqMxHofPonBUZTrfLchWHgqIzCx2JXXC0KsXjg7r+s4+
-m2krnB4jKOnyAaNmwhnOY+qqVcy/IvJsvOeOP1J6j2e7oTNtcrHb/tHxOhUVKiOo
-vzSoLB47PtnTv6cVtiBIOFKyfl1dS8Q+vPtRqvjWAW7vcAfygxXwvJUslGUMU46J
-vJwcFFE4RQk4Ixm69AabTCCwLUWV0Pnx3rTNJHMxl+qzpvVwVuogVydxH2oqvBTt
-BpCsfgrhH5gcYRozCBvLGDetFa9YaAV4ZvwGq3lhkFnI/h3EpIDGCeDTsJP4+C+n
-mI2wM/rXt3m1CpgeVKH87E2+vSOoliyqW/DnceBE8JHEwg3nWX50GI+iW0Vm8t2Z
-1Dx2TJsrJdXy2vHYZDFOCfnz4SO6IafJZOGMVHPGNHp2AWH5mY9ZYE2N52QMoyjk
-42IBCOLqCrkCDQRVFuFCARAA+tTCfBs+pRBg7lPr6DtI3SY4M+T5Ip2EQGuWS7t7
-riNP0rbtShc3x1GBokVNEOTOe6n28DTI0TA8D7Wa6WefKnBbDQPVe7AgWCC11gYX
-XIqcRIPlnvW7X8hZn6Fw/b+ep9Fnw6piihRk5fnYyspDBTRE/1DBBzHqOPfepHgI
-zh7qVe8MCfTdpRYsHXZEa9o0WYLoRXeg+yFvKmjj8+Bm4OyLQ5vN7uDqDT3ph8av
-M7RQvvqLZrXhycWuq4btT6Ba9oMZ10UzUF/HXaLgakscDX6FzBwgv2/lVauh3ie4
-J+Au0lA4hYHCVhNZGgLsGG6aoMEDA2Ab6vLqVIeOj7dbOXLq5wLMJlywAZwtnoSn
-zxyPPKQarCl30lYDaXFakFGZpI10nRrRSy2acRcpuS5662cnU8kZzVl9mbxyrEpI
-zkc54ND+UzHvW6FVKqJLB/y2rQ6ZRE6cLahwO74LZoDc48JpVkdXCkz+F2yI4ust
-Wcv0vdUQ+mLHbjUof6zGLcTVRMpteFpIozB6giF1ohayoNAgwywk69tMThNa5O4J
-405dDPDO4lNyl7nGLlxyL0oua16ibpz2WfYUsPsJmRJnB+8KZ5SzIGW7D/aprhYp
-orYdpz6qynPtDmkD7zl5RHQCb8PqgrkkHPVVrdjHC7UdP/CcXjq1KIuKEG446xJI
-TXcAEQEAAYkCPAQYAQoAJgIbIBYhBKnqkIFyT/rgSEw1oagc6iK8jH4uBQJcXBvk
-BQkM6NUhAAoJEKgc6iK8jH4uEfoQALPHThbHLBEZ1ueHAnyamgz3kKC7KW4HkwgG
-pTvJ/r3cqdt8SBcdPamWORK95HKq1VahEW6yqWSVrsbYxqdXl/mI2mNIJxRBiM/h
-wOuZVLSNpK4Ou/XRz3NMFllZBJtJS6JGGpRtnhGQKrvkw04UtITpDahDlweVdart
-E0FaB89TagWZy7oH32M5wzHqUHSNnOfQR5VpttRBVkuqnN4xRePjJvjJae31LsAq
-jOrJcME08Y8zG10p3Pm6x0lOvrM9nf/MMYGEaMhGQFp4XhvQ6hi736nFyyQD6uHU
-vw140+Y51kHMbceKjaoju9qHNzddmhFAL+YMZL0dtNk9F4kDpTCfMNgft4Y0IUQT
-lYAkMDxdYK1l+jYTFrsDZhw5GV1kYQo2s3j66rT+SHlXY8SbyE33Hm544WxAbCGE
-dB/H7ADaQhbFobXalTb+/QfWE2FkAYTvgiRhEhfhdr0ed2zHoolIF+zDWu58D61T
-Qj0xx1/+PbaVq4NQAWigimRfhYEJjo0dJCYUFOI9mces4Fh0aUGpB0lyvBub6zWc
-QkHM/2NSsGLWIxCOjxR1qjMdM3cfTQe6BX1ZoE4hjQf1tolhDT3rUx032x4QH1wt
-5CdP4/Wz2Mn8oGCPvRwCNzYLjT/h2V3BFqIcbwNpfiLFMGtEYf0VD6Po5y2uxHNB
-V4vxw1Q7uQINBFUXAM0BEADWd0Gq5bkX2WVMfwI8EQTnuJBRgJLmaLb8INg/Iykr
-ztnx0t/D5bxZ7SMmycRpvKEEwST2NMzutPt4bxrbNx5FAAslzy93bd1mHH0r2xQh
-M/NKSNHsYOtpoeyf7vcRPaBkCqu6UzeWCrYcFzbrEDmMqKoeAekSWFyij/1Sm0hP
-YWK9qHYG7dhqS+t5rq0IGuX2LhcSbDubHysCZLvJxWzZspudrFgGkCX68oS94uy3
-ERgrUUt9QFweWueC6XJxj+FIlK/1j3ZgKUnJZ13iRXrz2vOr84C82MLpAw/HPmcU
-73qZM5V0+RFCKRP4ISKeGhrLFSMVOLVkyNHYYBq+0os21VIGBA/L2kWv1Gy/MnPD
-yI4p05zzwXUu6f3iAwPqwwRqA+/gj2J5YooZa1mPGUutkz3KmKWymTBlbdr1MR/l
-dnuUAwdgXdOEj/YPskb8VsVzyEjyNpaPTQW1KmsWDJPztuQ/6cAPXCeaECL/110M
-TFY1esS4SM7zd75Rgg1w68hFm0D1TotmuPVW59DN2TzjVUCamOVgMSEfUBERGo00
-PHuGYqDlVt+gLeyOM/WOLJizTEAJEUVpR9tRspFHf9nXIOJdSaoL4opXtLog5nVB
-2sqT9qt9qPtBPbQiHJXimv5rBpjaPeBZA+RxolTMpPkFsSXVkNcvhx3P/uKvD9um
-0QARAQABiQRbBBgBCgAmAhsCFiEEqeqQgXJP+uBITDWhqBzqIryMfi4FAlxcG+QF
-CQzotZYCKcFdIAQZAQgABgUCVRcAzQAKCRAoa/fvzXckHteED/9mP07v96WdQwx/
-oNJ2gCAmee43Xll5kLVa4TCuYLI+iPtLt1gKrtViw+M+oYhst5KT2jlfaj6T0GpD
-bbpqBGCzJ2Eas0dsnJRtN6zuvXX+tYWe28/PCEuB9QSOHqkVPG84aabqAsletGhW
-TKHWTQf7Aa1xlXgdBJ8NkZBUkwWQ5MGkKS0BP7xvaK6z5nOZSPskpodhKl51d4IR
-gWwK+j0tKdgsDqSjeSOfw2eM7/z4kSzDTsdxoBWvskaSQtMnw9qibfUrI5zgi/Yc
-kh2ModEoxdIAQWEtKR0dEHwVhOId76lq19sS6I4MKTfHZ7xGnXTozbeqjcTX0edA
-031aFC4XGpDTDlyA/XXABu97582NOvXLkPMcj/N8/P0MWJgtwJHMNwDqBHCsZmSy
-K7ZKHLC71yh5mUCSnLiu0cz/7rLB+VHI+SwPXBO8iPCZAupmf+cyICkINFCwgFyu
-LKYYARhSr6LqbOzo/ekQvz8b9q73ODqvhEN0T945AJdAt2BPtzb0LYOBaAxdEZsu
-2BcnWE+xERVK7mSeGHmfnh6smEZSx6uRawMYm6Y/YLtzQp6iBTqtNwYryl+PbRJ1
-v28e5ispmylCrRyb0CSgNqKbQufhKO71+peBBytb0Nj9VUYXGYe7vHCeZxgvTUnP
-bHoVjUXZSu+Tiu1Gky1EOFtEW/Se8QkQqBzqIryMfi7vyQ//Ttd4ZNBdaZkMYQh+
-CP3WsuXD4Vip8Gh+tcg/+zJMDWqkgoW9OOkWh1MjxJBSBjSLqm8e23GrgJrHdRBm
-fR6WbMCXST5ZmRzEN2MZ9DPFGKuzOe1BeWx3hFc6crCB7h5/I3yiiMhagF/kCiZz
-zQu4Ebcc8gzRH65BbBHbathVWF4EmP4ZUy2hPOspwMClCmGsqVY1zt4KPp1BeB/Y
-gZ5eL1kdLuvCRQkFglPNELDgziKREJYO89g8f6V6teJDy+l6DtuzwnkO3BT1PntQ
-17I8etv3lgGfL42q1QUjhXn0ER6cfWOEeD36MThkZ6WTdtZ+45ROZsvCSl9BlE05
-hT13mBluscvxu0bo1ReAFYG2aHG05mZ/2qyoVY1eJa+Eq/rDhdJP5E8IhDfr/kCm
-Ahcpb/916Jc0BTSpinIcuWMQaeWtpwz332Pa87M3SLLm0p390p9R7P+OI2FYVMYU
-/6dEqz9vrsTWaBLZV8bnItjn6r2MOXn7bGD6HW6euE78Bt+/Q9N/D53cgw3HGaDE
-0JqFt4gzT9d7D+jCYy3K5uAWBnKjua3mwMcBnO4GmQwVLauWex8BARlYpBoqqL/V
-5CorLVbhjFLWAiy1GsX4RM9RksG9TN8CMvNp1ZTpnqouwEuTmrWKwdQek1rPBRj0
-XNBso9Rw94Z5NVIXEcH3O44UsWI=
-=AXgM
------END PGP PUBLIC KEY BLOCK-----
-```
-
-</details>
diff --git a/SupportedPlatforms.md b/SupportedPlatforms.md
deleted file mode 100644
index a5f51b84a..000000000
--- a/SupportedPlatforms.md
+++ /dev/null
@@ -1,32 +0,0 @@
-libzmq supports a large variety of platforms. The list of platforms can be found in the [README](README.md#platforms).
-The degree to which this support is tested varies.
-
-Platforms are currently assigned to one of the following categories:
-- supported platforms with primary CI (travis-ci.org, appveyor.com): https://travis-ci.org/zeromq/libzmq, https://ci.appveyor.com/project/zeromq/libzmq
-- supported platforms with secondary CI (openSUSE Build Service): https://build.opensuse.org/project/subprojects/network:messaging:zeromq
-- supported platforms with known active users
-- supported platforms without known active users
-- unsupported platforms
-
-Supported platforms with primary CI
-- have builds and tests run for the master branch
-- have builds and tests run for every pull request
-- it is a precondition for merging a pull request that no builds or tests of these platforms are broken
-- contributors can easily enable these builds and tests for their branches in their fork
-
-Suported platforms with secondary CI
-- have builds and tests run for the master branch
-- these are monitored periodically by the project maintainers, and efforts are made to fix any broken builds or tests in a timely manner
-- it is a precondition for a release that no builds or tests of these platforms are broken
-
-Supported platforms with known active users
-- have recently been reported to the maintainers (e.g. via pull requests modifying this document) as having working builds and possibly tests
-
-Supported platforms without known active users
-- have some platform-specific code within libzmq, but it is not known if it is still working
-- have been reported to the maintainers as having working builds and possibly tests only significant time/changes ago 
-- or are assumed to work due to similarity to the above platforms
-
-Unsupported platforms
-- are either reported to be non-working for some reason that is not trivial to fix or are explicitly missing some required platform-specific code
-
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 387a3d2a1..000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,1232 +0,0 @@
-dnl ##############################################################################
-dnl # LIBZMQ_CONFIG_LIBTOOL                                                      #
-dnl # Configure libtool. Requires AC_CANONICAL_HOST                              #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CONFIG_LIBTOOL],  [{
-    AC_REQUIRE([AC_CANONICAL_HOST])
-
-    # Libtool configuration for different targets
-    case "${host_os}" in
-        *mingw*|*cygwin*|*msys*)
-            # Disable static build by default
-            AC_DISABLE_STATIC
-        ;;
-        *)
-            # Everything else with static enabled
-            AC_ENABLE_STATIC
-        ;;
-    esac
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_ICC([action-if-found], [action-if-not-found])            #
-dnl # Check if the current language is compiled using ICC                        #
-dnl # Adapted from http://software.intel.com/en-us/forums/showthread.php?t=67984 #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_ICC],
-          [AC_CACHE_CHECK([whether we are using Intel _AC_LANG compiler],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler],
-          [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[#ifndef __INTEL_COMPILER
-       error if not ICC
-#endif
-]])],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler="yes" ; $1],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler="no" ; $2])
-])])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_SUN_STUDIO([action-if-found], [action-if-not-found])     #
-dnl # Check if the current language is compiled using Sun Studio                 #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_SUN_STUDIO],
-          [AC_CACHE_CHECK([whether we are using Sun Studio _AC_LANG compiler],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler],
-          [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[#if !defined(__SUNPRO_CC) && !defined(__SUNPRO_C)
-       error if not sun studio
-#endif
-]])],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler="yes" ; $1],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler="no" ; $2])
-])])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_CLANG([action-if-found], [action-if-not-found])          #
-dnl # Check if the current language is compiled using clang                      #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_CLANG],
-          [AC_CACHE_CHECK([whether we are using clang _AC_LANG compiler],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler],
-          [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[#ifndef __clang__
-       error if not clang
-#endif
-]])],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler="yes" ; $1],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler="no" ; $2])
-])])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_GCC4([action-if-found], [action-if-not-found])           #
-dnl # Check if the current language is compiled using clang                      #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_GCC4],
-          [AC_CACHE_CHECK([whether we are using gcc >= 4 _AC_LANG compiler],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_gcc4_compiler],
-          [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[#if (!defined __GNUC__ || __GNUC__ < 4)
-       error if not gcc4 or higher
-#endif
-]])],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_gcc4_compiler="yes" ; $1],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_gcc4_compiler="no" ; $2])
-])])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_DOC_BUILD                                                     #
-dnl # Check whether to build documentation and install man-pages                 #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_DOC_BUILD], [{
-
-    # Man pages are built/installed if asciidoc and xmlto are present
-    #   --with-docs=no overrides this
-    AC_ARG_WITH([docs],
-        AS_HELP_STRING([--without-docs],
-            [Don't build and install man pages [default=build]]),
-        [with_docs=$withval])
-    AC_ARG_WITH([documentation], [AS_HELP_STRING([--without-documentation],
-        [Don't build and install man pages [default=build] DEPRECATED: use --without-docs])])
-
-    if test "x$with_documentation" = "xno"; then
-        AC_MSG_WARN([--without-documentation is DEPRECATED and will be removed in the next release, use --without-docs])
-    fi
-    if test "x$with_docs" = "xno" || test "x$with_documentation" = "xno"; then
-        libzmq_build_doc="no"
-        libzmq_install_man="no"
-    else
-        # Determine whether or not documentation should be built and installed.
-        libzmq_build_doc="yes"
-        libzmq_install_man="yes"
-        # Check for asciidoc and xmlto and don't build the docs if these are not installed.
-        AC_CHECK_PROG(libzmq_have_asciidoc, asciidoc, yes, no)
-        AC_CHECK_PROG(libzmq_have_xmlto, xmlto, yes, no)
-        if test "x$libzmq_have_asciidoc" = "xno" -o "x$libzmq_have_xmlto" = "xno"; then
-            libzmq_build_doc="no"
-            # Tarballs built with 'make dist' ship with prebuilt documentation.
-            if ! test -f doc/zmq.7; then
-                libzmq_install_man="no"
-                AC_MSG_WARN([You are building an unreleased version of 0MQ and asciidoc or xmlto are not installed.])
-                AC_MSG_WARN([Documentation will not be built and manual pages will not be installed.])
-            fi
-        fi
-
-        # Do not install man pages if on mingw
-        if test "x$libzmq_on_mingw" = "xyes"; then
-            libzmq_install_man="no"
-        fi
-    fi
-
-    AC_MSG_CHECKING([whether to build documentation])
-    AC_MSG_RESULT([$libzmq_build_doc])
-
-    AC_MSG_CHECKING([whether to install manpages])
-    AC_MSG_RESULT([$libzmq_install_man])
-
-    AM_CONDITIONAL(BUILD_DOC, test "x$libzmq_build_doc" = "xyes")
-    AM_CONDITIONAL(INSTALL_MAN, test "x$libzmq_install_man" = "xyes")
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_COMPILER([action-if-found], [action-if-not-found])       #
-dnl # Check that compiler for the current language actually works                #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_COMPILER], [{
-    # Test that compiler for the current language actually works
-    AC_CACHE_CHECK([whether the _AC_LANG compiler works],
-                   [libzmq_cv_[]_AC_LANG_ABBREV[]_compiler_works],
-                   [AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-                   [libzmq_cv_[]_AC_LANG_ABBREV[]_compiler_works="yes" ; $1],
-                   [libzmq_cv_[]_AC_LANG_ABBREV[]_compiler_works="no" ; $2])
-                   ])
-
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_compiler_works" != "xyes"; then
-        AC_MSG_ERROR([Unable to find a working _AC_LANG compiler])
-    fi
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_COMPILERS                                                     #
-dnl # Check compiler characteristics. This is so that we can AC_REQUIRE checks   #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_COMPILERS], [{
-    # For that the compiler works and try to come up with the type
-    AC_LANG_PUSH([C])
-    LIBZMQ_CHECK_LANG_COMPILER
-
-    LIBZMQ_CHECK_LANG_ICC
-    LIBZMQ_CHECK_LANG_SUN_STUDIO
-    LIBZMQ_CHECK_LANG_CLANG
-    LIBZMQ_CHECK_LANG_GCC4
-    AC_LANG_POP([C])
-
-    AC_LANG_PUSH(C++)
-    LIBZMQ_CHECK_LANG_COMPILER
-
-    LIBZMQ_CHECK_LANG_ICC
-    LIBZMQ_CHECK_LANG_SUN_STUDIO
-    LIBZMQ_CHECK_LANG_CLANG
-    LIBZMQ_CHECK_LANG_GCC4
-    AC_LANG_POP([C++])
-
-    # Set GCC and GXX variables correctly
-    if test "x$GCC" = "xyes"; then
-        if test "xyes" = "x$libzmq_cv_c_intel_compiler"; then
-            GCC="no"
-        fi
-    fi
-
-    if test "x$GXX" = "xyes"; then
-        if test "xyes" = "x$libzmq_cv_cxx_intel_compiler"; then
-            GXX="no"
-        fi
-    fi
-}])
-
-dnl ############################################################################
-dnl # LIBZMQ_CHECK_LANG_FLAG([flag], [action-if-found], [action-if-not-found]) #
-dnl # Check if the compiler supports given flag. Works for C and C++           #
-dnl # Sets libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_[FLAG]=yes/no           #
-dnl ############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_FLAG], [{
-
-    AC_REQUIRE([AC_PROG_GREP])
-
-    AC_MSG_CHECKING([whether _AC_LANG compiler supports $1])
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag_save=$ac_[]_AC_LANG_ABBREV[]_werror_flag
-    ac_[]_AC_LANG_ABBREV[]_werror_flag="yes"
-
-    case "x[]_AC_LANG_ABBREV" in
-        xc)
-            libzmq_cv_check_lang_flag_save_CFLAGS="$CFLAGS"
-            CFLAGS="$CFLAGS $1"
-        ;;
-        xcxx)
-            libzmq_cv_check_lang_flag_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $1"
-        ;;
-        *)
-            AC_MSG_WARN([testing compiler characteristic on an unknown language])
-        ;;
-    esac
-
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-                      # This hack exist for ICC, which outputs unknown options as remarks
-                      # Remarks are not turned into errors even with -Werror on
-                      [if ($GREP 'ignoring unknown' conftest.err ||
-                           $GREP 'not supported' conftest.err) >/dev/null 2>&1; then
-                           eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)="no"
-                       else
-                           eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)="yes"
-                       fi],
-                      [eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)="no"])
-
-    case "x[]_AC_LANG_ABBREV" in
-        xc)
-            CFLAGS="$libzmq_cv_check_lang_flag_save_CFLAGS"
-        ;;
-        xcxx)
-            CPPFLAGS="$libzmq_cv_check_lang_flag_save_CPPFLAGS"
-        ;;
-        *)
-            # nothing to restore
-        ;;
-    esac
-
-    # Restore the werror flag
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag_save
-
-    # Call the action as the flags are restored
-    AS_IF([eval test x$]AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)[ = "xyes"],
-          [AC_MSG_RESULT(yes) ; $2], [AC_MSG_RESULT(no) ; $3])
-
-}])
-
-dnl ####################################################################################
-dnl # LIBZMQ_CHECK_LANG_FLAG_PREPEND([flag], [action-if-found], [action-if-not-found]) #
-dnl # Check if the compiler supports given flag. Works for C and C++                   #
-dnl # This macro prepends the flag to CFLAGS or CPPFLAGS accordingly                   #
-dnl # Sets libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_[FLAG]=yes/no                   #
-dnl ####################################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_FLAG_PREPEND], [{
-    LIBZMQ_CHECK_LANG_FLAG([$1])
-    case "x[]_AC_LANG_ABBREV" in
-       xc)
-            AS_IF([eval test x$]AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)[ = "xyes"],
-                  [CFLAGS="$1 $CFLAGS"; $2], $3)
-       ;;
-       xcxx)
-            AS_IF([eval test x$]AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)[ = "xyes"],
-                  [CPPFLAGS="$1 $CPPFLAGS"; $2], $3)
-       ;;
-    esac
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_ENABLE_DEBUG([action-if-found], [action-if-not-found])        #
-dnl # Check whether to enable debug build and set compiler flags accordingly     #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_ENABLE_DEBUG], [{
-
-    # Require compiler specifics
-    AC_REQUIRE([LIBZMQ_CHECK_COMPILERS])
-
-    # This flag is checked also in
-    AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
-        [enable debugging information [default=disabled]])])
-
-    AC_MSG_CHECKING(whether to enable debugging information)
-
-    if test "x$enable_debug" = "xyes"; then
-
-        # GCC, clang and ICC
-        if test "x$GCC" = "xyes" -o \
-                "x$libzmq_cv_c_intel_compiler" = "xyes" -o \
-                "x$libzmq_cv_c_clang_compiler" = "xyes"; then
-            CFLAGS="-g -O0 "
-        elif test "x$libzmq_cv_c_sun_studio_compiler" = "xyes"; then
-            CFLAGS="-g0 "
-        fi
-
-        # GCC, clang and ICC
-        if test "x$GXX" = "xyes" -o \
-                "x$libzmq_cv_cxx_intel_compiler" = "xyes" -o \
-                "x$libzmq_cv_cxx_clang_compiler" = "xyes"; then
-            CPPFLAGS="-g -O0 "
-            CXXFLAGS="-g -O0 "
-        # Sun studio
-        elif test "x$libzmq_cv_cxx_sun_studio_compiler" = "xyes"; then
-            CPPFLAGS="-g0 "
-            CXXFLAGS="-g0 "
-        fi
-
-        if test "x$ZMQ_ORIG_CFLAGS" != "xnone"; then
-            CFLAGS="${CFLAGS} ${ZMQ_ORIG_CFLAGS}"
-        fi
-        if test "x$ZMQ_ORIG_CPPFLAGS" != "xnone"; then
-            CPPFLAGS="${CPPFLAGS} ${ZMQ_ORIG_CPPFLAGS}"
-        fi
-        if test "x$ZMQ_ORIG_CXXFLAGS" != "xnone"; then
-            CXXFLAGS="${CXXFLAGS} ${ZMQ_ORIG_CXXFLAGS}"
-        fi
-        AC_MSG_RESULT(yes)
-    else
-        AC_MSG_RESULT(no)
-    fi
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_WITH_GCOV([action-if-found], [action-if-not-found])                 #
-dnl # Check whether to build with code coverage                                  #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_WITH_GCOV], [{
-    # Require compiler specifics
-    AC_REQUIRE([LIBZMQ_CHECK_COMPILERS])
-
-    AC_ARG_WITH(gcov, [AS_HELP_STRING([--with-gcov=yes/no],
-                      [with GCC Code Coverage reporting.])],
-                      [ZMQ_GCOV="$withval"])
-
-    AC_MSG_CHECKING(whether to enable code coverage)
-
-    if test "x$ZMQ_GCOV" = "xyes"; then
-
-        if test "x$GXX" != "xyes"; then
-            AC_MSG_ERROR([--with-gcov=yes works only with GCC])
-        fi
-
-        CFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
-        if test "x${ZMQ_ORIG_CPPFLAGS}" != "xnone"; then
-            CFLAGS="${CFLAGS} ${ZMQ_ORIG_CFLAGS}"
-        fi
-
-        CPPFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
-        if test "x${ZMQ_ORIG_CPPFLAGS}" != "xnone"; then
-            CPPFLAGS="${CPPFLAGS} ${ZMQ_ORIG_CPPFLAGS}"
-        fi
-
-        CXXFLAGS="-fprofile-arcs"
-        if test "x${ZMQ_ORIG_CXXFLAGS}" != "xnone"; then
-            CXXFLAGS="${CXXFLAGS} ${ZMQ_ORIG_CXXFLAGS}"
-        fi
-
-        LIBS="-lgcov ${LIBS}"
-    fi
-
-    AS_IF([test "x$ZMQ_GCOV" = "xyes"],
-          [AC_MSG_RESULT(yes) ; $1], [AC_MSG_RESULT(no) ; $2])
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_WITH_FLAG([flags], [macro])                                   #
-dnl # Runs a normal autoconf check with compiler flags                           #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_WITH_FLAG], [{
-    libzmq_check_with_flag_save_CFLAGS="$CFLAGS"
-    libzmq_check_with_flag_save_CPPFLAGS="$CPPFLAGS"
-
-    CFLAGS="$CFLAGS $1"
-    CPPFLAGS="$CPPFLAGS $1"
-
-    # Execute the macro
-    $2
-
-    CFLAGS="$libzmq_check_with_flag_save_CFLAGS"
-    CPPFLAGS="$libzmq_check_with_flag_save_CPPFLAGS"
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_LANG_WALL([action-if-found], [action-if-not-found])                 #
-dnl # How to define -Wall for the current compiler                               #
-dnl # Sets libzmq_cv_[]_AC_LANG_ABBREV[]__wall_flag variable to found style      #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_LANG_WALL], [{
-
-    AC_MSG_CHECKING([how to enable additional warnings for _AC_LANG compiler])
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag=""
-
-    # C compilers
-    case "x[]_AC_LANG_ABBREV" in
-       xc)
-            # GCC, clang and ICC
-            if test "x$GCC" = "xyes" -o \
-                    "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes" -o \
-                    "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag="-Wall"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag="-v"
-            fi
-       ;;
-       xcxx)
-            # GCC, clang and ICC
-            if test "x$GXX" = "xyes" -o \
-                    "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes" -o \
-                    "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag="-Wall"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag="+w"
-            fi
-       ;;
-       *)
-       ;;
-    esac
-
-    # Call the action
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag" != "x"; then
-        AC_MSG_RESULT([$libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag])
-        $1
-    else
-        AC_MSG_RESULT([not found])
-        $2
-    fi
-}])
-
-dnl ####################################################################
-dnl # LIBZMQ_LANG_STRICT([action-if-found], [action-if-not-found])     #
-dnl # Check how to turn on strict standards compliance                 #
-dnl ####################################################################
-AC_DEFUN([LIBZMQ_LANG_STRICT], [{
-    AC_MSG_CHECKING([how to enable strict standards compliance in _AC_LANG compiler])
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag=""
-
-    # C compilers
-    case "x[]_AC_LANG_ABBREV" in
-       xc)
-            # GCC, clang and ICC
-            if test "x$GCC" = "xyes" -o "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-pedantic"
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-strict-ansi"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-Xc"
-            fi
-       ;;
-       xcxx)
-            # GCC, clang and ICC
-            if test "x$GXX" = "xyes" -o "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-pedantic"
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-strict-ansi"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-compat=5"
-            fi
-       ;;
-       *)
-       ;;
-    esac
-
-    # Call the action
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag" != "x"; then
-        AC_MSG_RESULT([$libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag])
-        $1
-    else
-        AC_MSG_RESULT([not found])
-        $2
-    fi
-}])
-
-dnl ########################################################################
-dnl # LIBZMQ_LANG_WERROR([action-if-found], [action-if-not-found])         #
-dnl # Check how to turn warnings to errors                                 #
-dnl ########################################################################
-AC_DEFUN([LIBZMQ_LANG_WERROR], [{
-    AC_MSG_CHECKING([how to turn warnings to errors in _AC_LANG compiler])
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag=""
-
-    # C compilers
-    case "x[]_AC_LANG_ABBREV" in
-       xc)
-            # GCC, clang and ICC
-            if test "x$GCC" = "xyes" -o "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag="-Werror"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag="-errwarn=%all"
-            fi
-       ;;
-       xcxx)
-            # GCC, clang and ICC
-            if test "x$GXX" = "xyes" -o "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag="-Werror"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag="-errwarn=%all"
-            fi
-       ;;
-       *)
-       ;;
-    esac
-
-    # Call the action
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag" != "x"; then
-        AC_MSG_RESULT([$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag])
-        $1
-    else
-        AC_MSG_RESULT([not found])
-        $2
-    fi
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_LANG_PRAGMA([pragma], [action-if-found], [action-if-not-found]) #
-dnl # Check if the compiler supports given pragma                                  #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_PRAGMA], [{
-    # Need to know how to enable all warnings
-    LIBZMQ_LANG_WALL
-
-    AC_MSG_CHECKING([whether _AC_LANG compiler supports pragma $1])
-
-    # Save flags
-    libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag_save=$ac_[]_AC_LANG_ABBREV[]_werror_flag
-    ac_[]_AC_LANG_ABBREV[]_werror_flag="yes"
-
-    if test "x[]_AC_LANG_ABBREV" = "xc"; then
-        libzmq_cv_check_lang_pragma_save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag"
-    elif test "x[]_AC_LANG_ABBREV" = "xcxx"; then
-        libzmq_cv_check_lang_pragma_save_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag"
-    else
-        AC_MSG_WARN([testing compiler characteristic on an unknown language])
-    fi
-
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#pragma $1]])],
-                      [eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_pragma_$1)="yes" ; AC_MSG_RESULT(yes)],
-                      [eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_pragma_$1)="no" ; AC_MSG_RESULT(no)])
-
-    if test "x[]_AC_LANG_ABBREV" = "xc"; then
-        CFLAGS="$libzmq_cv_check_lang_pragma_save_CFLAGS"
-    elif test "x[]_AC_LANG_ABBREV" = "xcxx"; then
-        CPPFLAGS="$libzmq_cv_check_lang_pragma_save_CPPFLAGS"
-    fi
-
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag_save
-
-    # Call the action as the flags are restored
-    AS_IF([eval test x$]AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_pragma_$1)[ = "xyes"],
-          [$2], [$3])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_LANG_VISIBILITY([action-if-found], [action-if-not-found])       #
-dnl # Check if the compiler supports dso visibility                                #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_VISIBILITY], [{
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag=""
-
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes" -o \
-            "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes" -o \
-            "x$libzmq_cv_[]_AC_LANG_ABBREV[]_gcc4_compiler" = "xyes"; then
-        LIBZMQ_CHECK_LANG_FLAG([-fvisibility=hidden],
-                               [libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag="-fvisibility=hidden"])
-    elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-        LIBZMQ_CHECK_LANG_FLAG([-xldscope=hidden],
-                               [libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag="-xldscope=hidden"])
-    fi
-
-    AC_MSG_CHECKING(whether _AC_LANG compiler supports dso visibility)
-
-    AS_IF([test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag" != "x"],
-          [AC_MSG_RESULT(yes) ; $1], [AC_MSG_RESULT(no) ; $2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found])          #
-dnl # Check if SOCK_CLOEXEC is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_SOCK_CLOEXEC], [{
-    AC_CACHE_CHECK([whether SOCK_CLOEXEC is supported], [libzmq_cv_sock_cloexec],
-        [AC_TRY_RUN([/* SOCK_CLOEXEC test */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main (int argc, char *argv [])
-{
-    int s = socket (PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
-    return (s == -1);
-}
-        ],
-        [libzmq_cv_sock_cloexec="yes"],
-        [libzmq_cv_sock_cloexec="no"],
-        [libzmq_cv_sock_cloexec="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_sock_cloexec" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_O_CLOEXEC([action-if-found], [action-if-not-found])          #
-dnl # Check if O_CLOEXEC is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_O_CLOEXEC], [{
-    AC_CACHE_CHECK([whether O_CLOEXEC is supported], [libzmq_cv_o_cloexec],
-        [AC_TRY_RUN([/* O_CLOEXEC test */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-int main (int argc, char *argv [])
-{
-    int s = open ("/dev/null", O_CLOEXEC | O_RDONLY);
-    return (s == -1);
-}
-        ],
-        [libzmq_cv_o_cloexec="yes"],
-        [libzmq_cv_o_cloexec="no"],
-        [libzmq_cv_o_cloexec="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_o_cloexec" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_EVENTFD_CLOEXEC([action-if-found], [action-if-not-found])          #
-dnl # Check if EFD_CLOEXEC is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_EVENTFD_CLOEXEC], [{
-    AC_CACHE_CHECK([whether EFD_CLOEXEC is supported], [libzmq_cv_efd_cloexec],
-        [AC_TRY_RUN([/* EFD_CLOEXEC test */
-#include <sys/eventfd.h>
-
-int main (int argc, char *argv [])
-{
-    int s = eventfd (0, EFD_CLOEXEC);
-    return (s == -1);
-}
-        ],
-        [libzmq_cv_efd_cloexec="yes"],
-        [libzmq_cv_efd_cloexec="no"],
-        [libzmq_cv_efd_cloexec="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_efd_cloexec" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_ATOMIC_INSTRINSICS([action-if-found], [action-if-not-found])    #
-dnl # Check if compiler supoorts __atomic_Xxx intrinsics                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_ATOMIC_INTRINSICS], [{
-    AC_MSG_CHECKING(whether compiler supports __atomic_Xxx intrinsics)
-    AC_LINK_IFELSE([AC_LANG_SOURCE([
-/* atomic intrinsics test */
-int v = 0;
-int main (int, char **)
-{
-    int t = __atomic_add_fetch (&v, 1, __ATOMIC_ACQ_REL);
-    return t;
-}
-    ])],
-    [AC_MSG_RESULT(yes) ; GCC_ATOMIC_BUILTINS_SUPPORTED=1 libzmq_cv_has_atomic_instrisics="yes" ; $1])
-
-    if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" != x1; then
-        save_LIBS=$LIBS
-        LIBS="$LIBS -latomic"
-        AC_LINK_IFELSE([AC_LANG_SOURCE([
-        /* atomic intrinsics test */
-        int v = 0;
-        int main (int, char **)
-        {
-            int t = __atomic_add_fetch (&v, 1, __ATOMIC_ACQ_REL);
-            return t;
-        }
-        ])],
-        [AC_MSG_RESULT(yes) ; libzmq_cv_has_atomic_instrisics="yes" PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -latomic" ; $1],
-        [AC_MSG_RESULT(no) ; libzmq_cv_has_atomic_instrisics="no" LIBS=$save_LIBS ; $2])
-    fi
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_SO_BINDTODEVICE([action-if-found], [action-if-not-found])          #
-dnl # Check if SO_BINDTODEVICE is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_SO_BINDTODEVICE], [{
-    AC_CACHE_CHECK([whether SO_BINDTODEVICE is supported], [libzmq_cv_so_bindtodevice],
-        [AC_TRY_RUN([/* SO_BINDTODEVICE test */
-#include <sys/socket.h>
-
-int main (int argc, char *argv [])
-{
-/* Actually making the setsockopt() call requires CAP_NET_RAW */
-#ifndef SO_BINDTODEVICE
-    return 1;
-#else
-    return 0;
-#endif
-}
-        ],
-        [libzmq_cv_so_bindtodevice="yes"],
-        [libzmq_cv_so_bindtodevice="no"],
-        [libzmq_cv_so_bindtodevice="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_so_bindtodevice" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_SO_KEEPALIVE([action-if-found], [action-if-not-found])          #
-dnl # Check if SO_KEEPALIVE is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_SO_KEEPALIVE], [{
-    AC_CACHE_CHECK([whether SO_KEEPALIVE is supported], [libzmq_cv_so_keepalive],
-        [AC_TRY_RUN([/* SO_KEEPALIVE test */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_so_keepalive="yes"],
-        [libzmq_cv_so_keepalive="no"],
-        [libzmq_cv_so_keepalive="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_so_keepalive" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_TCP_KEEPCNT([action-if-found], [action-if-not-found])           #
-dnl # Check if TCP_KEEPCNT is supported                                            #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPCNT], [{
-    AC_CACHE_CHECK([whether TCP_KEEPCNT is supported], [libzmq_cv_tcp_keepcnt],
-        [AC_TRY_RUN([/* TCP_KEEPCNT test */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) ||
-        ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPCNT, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_tcp_keepcnt="yes"],
-        [libzmq_cv_tcp_keepcnt="no"],
-        [libzmq_cv_tcp_keepcnt="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_tcp_keepcnt" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_TCP_KEEPIDLE([action-if-found], [action-if-not-found])          #
-dnl # Check if TCP_KEEPIDLE is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPIDLE], [{
-    AC_CACHE_CHECK([whether TCP_KEEPIDLE is supported], [libzmq_cv_tcp_keepidle],
-        [AC_TRY_RUN([/* TCP_KEEPIDLE test */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) ||
-        ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPIDLE, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_tcp_keepidle="yes"],
-        [libzmq_cv_tcp_keepidle="no"],
-        [libzmq_cv_tcp_keepidle="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_tcp_keepidle" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_TCP_KEEPINTVL([action-if-found], [action-if-not-found])          #
-dnl # Check if TCP_KEEPINTVL is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPINTVL], [{
-    AC_CACHE_CHECK([whether TCP_KEEPINTVL is supported], [libzmq_cv_tcp_keepintvl],
-        [AC_TRY_RUN([/* TCP_KEEPINTVL test */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) ||
-        ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPINTVL, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_tcp_keepintvl="yes"],
-        [libzmq_cv_tcp_keepintvl="no"],
-        [libzmq_cv_tcp_keepintvl="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_tcp_keepintvl" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_TCP_KEEPALIVE([action-if-found], [action-if-not-found])         #
-dnl # Check if TCP_KEEPALIVE is supported                                          #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPALIVE], [{
-    AC_CACHE_CHECK([whether TCP_KEEPALIVE is supported], [libzmq_cv_tcp_keepalive],
-        [AC_TRY_RUN([/* TCP_KEEPALIVE test */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) ||
-        ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPALIVE, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_tcp_keepalive="yes"],
-        [libzmq_cv_tcp_keepalive="no"],
-        [libzmq_cv_tcp_keepalive="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_tcp_keepalive" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_GETRANDOM([action-if-found], [action-if-not-found])  #
-dnl # Checks if getrandom is supported                                  #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_GETRANDOM], [{
-    AC_CACHE_CHECK([whether getrandom is supported], [libzmq_cv_getrandom],
-        [AC_TRY_RUN([/* thread-local storage test */
-#include <sys/random.h>
-
-int main (int argc, char *argv [])
-{
-    char buf[4];
-    int rc = getrandom(buf, 4, 0);
-    return rc == -1 ? 1 : 0;
-}
-        ],
-        [libzmq_cv_getrandom="yes"],
-        [libzmq_cv_getrandom="no"],
-        [libzmq_cv_getrandom="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_getrandom" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_KQUEUE([action-if-found], [action-if-not-found])         #
-dnl # Checks kqueue polling system                                                 #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_KQUEUE], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/time.h>
-        ],[[
-struct kevent t_kev;
-kqueue();
-        ]])],
-        [$1], [$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_EPOLL_RUN([action-if-found], [action-if-not-found])      #
-dnl # LIBZMQ_CHECK_POLLER_EPOLL_CLOEXEC([action-if-found], [action-if-not-found])  #
-dnl # Checks epoll polling system can actually run #
-dnl # For cross-compile, only requires that epoll can link #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_EPOLL], [{
-    AC_RUN_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/epoll.h>
-        ],[[
-struct epoll_event t_ev;
-int r;
-r = epoll_create(10);
-return(r < 0);
-        ]])],
-        [$1],[$2],[
-            AC_LINK_IFELSE([
-                AC_LANG_PROGRAM([
-#include <sys/epoll.h>
-                ],[[
-struct epoll_event t_ev;
-epoll_create(10);
-                ]])],
-                [$1], [$2]
-            )
-        ]
-    )
-}])
-
-AC_DEFUN([LIBZMQ_CHECK_POLLER_EPOLL_CLOEXEC], [{
-    AC_RUN_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/epoll.h>
-        ],[[
-struct epoll_event t_ev;
-int r;
-r = epoll_create1(EPOLL_CLOEXEC);
-return(r < 0);
-        ]])],
-        [$1],[$2],[
-            AC_LINK_IFELSE([
-                AC_LANG_PROGRAM([
-#include <sys/epoll.h>
-                ],[[
-struct epoll_event t_ev;
-epoll_create1(EPOLL_CLOEXEC);
-                ]])],
-                [$1], [$2]
-            )
-        ]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_DEVPOLL([action-if-found], [action-if-not-found])        #
-dnl # Checks devpoll polling system                                                #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_DEVPOLL], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/devpoll.h>
-        ],[[
-struct pollfd t_devpoll;
-int fd = open("/dev/poll", O_RDWR);
-        ]])],
-        [$1], [$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_POLLSET([action-if-found], [action-if-not-found])        #
-dnl # Checks pollset polling system                                                #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_POLLSET], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/poll.h>
-#include <sys/pollset.h>
-        ],[[
-pollset_t ps = pollset_create(-1);
-        ]])],
-        [$1], [$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_POLL([action-if-found], [action-if-not-found])           #
-dnl # Checks poll polling system                                                   #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_POLL], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#include <poll.h>
-        ],[[
-struct pollfd t_poll;
-poll(&t_poll, 1, 1);
-        ]])],
-        [$1], [$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_SELECT([action-if-found], [action-if-not-found])         #
-dnl # Checks select polling system                                                 #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_SELECT], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#ifdef ZMQ_HAVE_WINDOWS
-#include "winsock2.h"
-#elif defined ZMQ_HAVE_OPENVMS
-#include <sys/types.h>
-#include <sys/time.h>
-#else
-#include <sys/select.h>
-#endif
-        ],[[
-fd_set t_rfds;
-struct timeval tv;
-FD_ZERO(&t_rfds);
-FD_SET(0, &t_rfds);
-tv.tv_sec = 5;
-tv.tv_usec = 0;
-select(1, &t_rfds, 0, 0, &tv);
-        ]])],
-        [$1],[$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER([action-if-found], [action-if-not-found])                #
-dnl # Choose polling system                                                        #
-dnl ################################################################################
-
-AC_DEFUN([LIBZMQ_CHECK_POLLER], [{
-    # Allow user to override poller autodetection
-    AC_ARG_WITH([poller],
-        [AS_HELP_STRING([--with-poller],
-        [choose I/O thread polling system manually. Valid values are 'kqueue', 'epoll', 'devpoll', 'pollset', 'poll', 'select', 'wepoll', or 'auto'. [default=auto]])])
-
-    # Allow user to override poller autodetection
-    AC_ARG_WITH([api_poller],
-        [AS_HELP_STRING([--with-api-poller],
-        [choose zmq_poll(er)_* API polling system manually. Valid values are 'poll', 'select', or 'auto'. [default=auto]])])
-
-    if test "x$with_poller" = "x"; then
-        pollers=auto
-    else
-        pollers=$with_poller
-    fi
-    if test "$pollers" = "auto"; then
-        # We search for pollers in this order
-        pollers="kqueue epoll devpoll pollset poll select"
-    fi
-
-    # try to find suitable polling system. the order of testing is:
-    AC_MSG_NOTICE([Choosing I/O thread polling system from '$pollers'...])
-    poller_found=0
-    for poller in $pollers; do
-        case "$poller" in
-            kqueue)
-                LIBZMQ_CHECK_POLLER_KQUEUE([
-                    AC_MSG_NOTICE([Using 'kqueue' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_KQUEUE, 1, [Use 'kqueue' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            epoll)
-                case "$host_os" in
-                    solaris*|sunos*)
-                        # Recent illumos and Solaris systems did add epoll()
-                        # syntax, but it does not fully satisfy expectations
-                        # that ZMQ has from Linux systems. Unless you undertake
-                        # to fix the integration, do not disable this exception
-                        # and use select() or poll() on Solarish OSes for now.
-                        AC_MSG_NOTICE([NOT using 'epoll' I/O thread polling system on '$host_os']) ;;
-                    *)
-                        LIBZMQ_CHECK_POLLER_EPOLL_CLOEXEC([
-                            AC_MSG_NOTICE([Using 'epoll' I/O thread polling system with CLOEXEC])
-                            AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_EPOLL, 1, [Use 'epoll' I/O thread polling system])
-                            AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC, 1, [Use 'epoll' I/O thread polling system with CLOEXEC])
-                            poller_found=1
-                            ],[
-                            LIBZMQ_CHECK_POLLER_EPOLL([
-                                AC_MSG_NOTICE([Using 'epoll' I/O thread polling system with CLOEXEC])
-                                AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_EPOLL, 1, [Use 'epoll' I/O thread polling system])
-                                poller_found=1
-                            ])
-                        ])
-                        ;;
-                esac
-            ;;
-            devpoll)
-                LIBZMQ_CHECK_POLLER_DEVPOLL([
-                    AC_MSG_NOTICE([Using 'devpoll' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_DEVPOLL, 1, [Use 'devpoll' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            pollset)
-                LIBZMQ_CHECK_POLLER_POLLSET([
-                    AC_MSG_NOTICE([Using 'pollset' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_POLLSET, 1, [Use 'pollset' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            poll)
-                LIBZMQ_CHECK_POLLER_POLL([
-                    AC_MSG_NOTICE([Using 'poll' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_POLL, 1, [Use 'poll' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            select)
-                LIBZMQ_CHECK_POLLER_SELECT([
-                    AC_MSG_NOTICE([Using 'select' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_SELECT, 1, [Use 'select' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            wepoll)
-                # wepoll can only be manually selected
-                AC_MSG_NOTICE([Using 'wepoll' I/O thread polling system])
-                AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_EPOLL, 1, [Use 'epoll' I/O thread polling system])
-                poller_found=1
-            ;;
-        esac
-        test $poller_found -eq 1 && break
-    done
-    if test $poller_found -eq 0; then
-        AC_MSG_ERROR([None of '$pollers' are valid pollers on this platform])
-    fi
-    if test "x$with_api_poller" = "x"; then
-        with_api_poller=auto
-    fi
-	if test "x$with_api_poller" = "xauto"; then
-		if test $poller = "select"; then
-			api_poller=select
-		elif test $poller = "wepoll"; then
-			api_poller=select
-		else		
-			api_poller=poll
-		fi
-	else
-		api_poller=$with_api_poller
-	fi
-	if test "$api_poller" = "select"; then
-		AC_MSG_NOTICE([Using 'select' zmq_poll(er)_* API polling system])
-		AC_DEFINE(ZMQ_POLL_BASED_ON_SELECT, 1, [Use 'select' zmq_poll(er)_* API polling system])
-	elif test "$api_poller" = "poll"; then
-		AC_MSG_NOTICE([Using 'poll' zmq_poll(er)_* API polling system])
-		AC_DEFINE(ZMQ_POLL_BASED_ON_POLL, 1, [Use 'poll' zmq_poll(er)_* API polling system])
-	else
-        AC_MSG_ERROR([Invalid API poller '$api_poller' specified])
-	fi
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_CACHELINE                                                     #
-dnl # Check cacheline size for alignment purposes                                #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_CACHELINE], [{
-
-    zmq_cacheline_size=64
-    AC_CHECK_TOOL(libzmq_getconf, getconf)
-    if ! test "x$libzmq_getconf" = "x"; then
-        zmq_cacheline_size=$($libzmq_getconf LEVEL1_DCACHE_LINESIZE 2>/dev/null || echo 64)
-        if test "x$zmq_cacheline_size" = "x0" -o  "x$zmq_cacheline_size" = "x-1"; then
-            # getconf on some architectures does not know the size, try to fallback to
-            # the value the kernel knows on Linux
-            zmq_cacheline_size=$(cat /sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size 2>/dev/null || echo 64)
-        fi
-    fi
-	AC_MSG_NOTICE([Using "$zmq_cacheline_size" bytes alignment for lock-free data structures])
-	AC_DEFINE_UNQUOTED(ZMQ_CACHELINE_SIZE, $zmq_cacheline_size, [Using "$zmq_cacheline_size" bytes alignment for lock-free data structures])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_CV_IMPL([action-if-found], [action-if-not-found])               #
-dnl # Choose condition variable implementation                                     #
-dnl ################################################################################
-
-AC_DEFUN([LIBZMQ_CHECK_CV_IMPL], [{
-    # Allow user to override condition variable autodetection
-    AC_ARG_WITH([cv-impl],
-        [AS_HELP_STRING([--with-cv-impl],
-        [choose condition variable implementation manually. Valid values are 'stl11', 'pthread', 'none', or 'auto'. [default=auto]])])
-
-    if test "x$with_cv_impl" = "x"; then
-        cv_impl=auto
-    else
-        cv_impl=$with_cv_impl
-    fi
-    case $host_os in
-      vxworks*)
-        cv_impl="vxworks"
-        AC_DEFINE(ZMQ_USE_CV_IMPL_VXWORKS, 1, [Use vxworks condition variable implementation.])
-      ;;
-    esac
-    if test "$cv_impl" = "auto" || test "$cv_impl" = "stl11"; then
-        AC_LANG_PUSH([C++])
-        AC_CHECK_HEADERS(condition_variable, [stl11="yes"
-            AC_DEFINE(ZMQ_USE_CV_IMPL_STL11, 1, [Use stl11 condition variable implementation.])],
-            [stl11="no"])
-        AC_LANG_POP([C++])
-        if test "$cv_impl" = "stl11" && test "x$stl11" = "xno"; then
-            AC_MSG_ERROR([--with-cv-impl set to stl11 but cannot find condition_variable])
-        fi
-    fi
-    if test "$cv_impl" = "pthread" || test "x$stl11" = "xno"; then
-        AC_DEFINE(ZMQ_USE_CV_IMPL_PTHREADS, 1, [Use pthread condition variable implementation.])
-    fi
-    if test "$cv_impl" = "none"; then
-        AC_DEFINE(ZMQ_USE_CV_IMPL_NONE, 1, [Use no condition variable implementation.])
-    fi
-       AC_MSG_NOTICE([Using "$cv_impl" condition variable implementation.])
-}])
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index b401c3143..000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,337 +0,0 @@
-version: build-{build}
-
-shallow_clone: true
-
-os: Visual Studio 2013
-
-environment:
-  CMAKE_GENERATOR: "Visual Studio 12 2013"
-  MSVCVERSION: "v120"
-  MSVCYEAR: "vs2013"
-  ENABLE_DRAFTS: ON
-  matrix:
-    - platform: x64
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      CMAKE_GENERATOR: "Visual Studio 16 2019"
-      MSVCVERSION: "v142"
-      MSVCYEAR: "vs2019"
-      ARTIFACT_NAME: v142-x64
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: OFF # unavailable build files for VS2008
-      ENABLE_CURVE: ON
-      CMAKE_GENERATOR: "Visual Studio 9 2008"
-      MSVCVERSION: "v90"
-      MSVCYEAR: "vs2008"
-      ARTIFACT_NAME: v90
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      CMAKE_GENERATOR: "Visual Studio 10 2010"
-      MSVCVERSION: "v100"
-      MSVCYEAR: "vs2010"
-      ARTIFACT_NAME: v100
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      ARTIFACT_NAME: v120
-    - platform: x64
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      ARTIFACT_NAME: v120-x64
-    - platform: Win32
-      configuration: Release
-      POLLER: epoll
-      API_POLLER: poll
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v120-epoll
-    - platform: Win32
-      configuration: Debug
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v120-gd
-    - platform: x64
-      configuration: Debug
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v120-gd-x64
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: OFF
-      ENABLE_DRAFTS: OFF
-      ARTIFACT_NAME: v120-nocurve
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      CMAKE_GENERATOR: "Visual Studio 14 2015"
-      MSVCVERSION: "v140"
-      MSVCYEAR: "vs2015"
-      ARTIFACT_NAME: v140
-    - platform: x64
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      CMAKE_GENERATOR: "Visual Studio 14 2015"
-      MSVCVERSION: "v140"
-      MSVCYEAR: "vs2015"
-      ARTIFACT_NAME: v140-x64
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      MSVCVERSION: "v141"
-      MSVCYEAR: "vs2017"
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v141
-    - platform: x64
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      MSVCVERSION: "v141"
-      MSVCYEAR: "vs2017"
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v141-x64
-    - platform: cygwin64
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: ON
-      CMAKE_GENERATOR: "Unix Makefiles"
-      ARTIFACT_NAME: cygwin64
-    - platform: mingw64
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: ON
-      CMAKE_GENERATOR: "MSYS Makefiles"
-      ARTIFACT_NAME: mingw64
-    - platform: Win32-uwp
-      configuration: Debug
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: OFF
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      MSVCVERSION: "v141"
-      MSVCYEAR: "vs2017"
-      ARTIFACT_NAME: v141-gd-uwp
-      CMAKE_SYSTEM_NAME: WindowsStore
-      CMAKE_SYSTEM_VERSION: 10.0.18362
-      EXTRA_FLAGS: -DCMAKE_SYSTEM_NAME=%CMAKE_SYSTEM_NAME% -DCMAKE_SYSTEM_VERSION=%CMAKE_SYSTEM_VERSION% -DBUILD_TESTS=OFF
-    - platform: Win32-uwp
-      configuration: Release
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: OFF
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      MSVCVERSION: "v141"
-      MSVCYEAR: "vs2017"
-      ARTIFACT_NAME: v141-uwp
-      CMAKE_SYSTEM_NAME: WindowsStore
-      CMAKE_SYSTEM_VERSION: 10.0.18362
-      EXTRA_FLAGS: -DCMAKE_SYSTEM_NAME=%CMAKE_SYSTEM_NAME% -DCMAKE_SYSTEM_VERSION=%CMAKE_SYSTEM_VERSION% -DBUILD_TESTS=OFF
-
-matrix:
-  fast_finish: false
-  allow_failures:
-    - platform: cygwin64 # TODO allow failures until tests are fixed
-    - platform: mingw64  # TODO allow failures until tests are fixed
-
-init:
-  - cmd: if "%NO_PR%"=="TRUE" (
-            if "%APPVEYOR_PULL_REQUEST_NUMBER%" NEQ "" (
-                echo "Build is disabled for PRs, aborting" &&
-                appveyor exit
-            )
-         )
-  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-  - cmake --version
-  - msbuild /version
-  - cmd: reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v UserAuthentication /t REG_DWORD /d 0 /f
-
-cache:
-    - C:\projects\libsodium
-    - C:\cygwin64\var\cache\setup
-
-install:
-  - cmd: if "%Platform%"=="cygwin64" C:\cygwin64\setup-x86_64.exe --quiet-mode --no-shortcuts --upgrade-also --packages cmake,cygwin-devel,gcc-g++,libncurses-devel,make,pkg-config
-  - cmd: if "%Platform%"=="cygwin64" set PATH=C:\cygwin64\bin;%PATH%
-  - cmd: if "%Platform%"=="mingw64" C:\msys64\usr\bin\bash -lc "pacman -Qg"
-  - cmd: if "%Platform%"=="mingw64" set PATH=C:\msys64\usr\bin;%PATH%
-  - cmd: if "%Platform%"=="x64" (if not "%MSVCVERSION%"=="v142" set "CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64")
-  - cmd: echo "Generator='%CMAKE_GENERATOR%'"
-  - cmd: echo "Platform='%Platform%'"
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" set LIBSODIUMDIR=C:\projects\libsodium
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" (
-            if not exist "%LIBSODIUMDIR%" (
-                git clone --branch stable --depth 1 --quiet "https://github.com/jedisct1/libsodium.git" %LIBSODIUMDIR%
-            ) else (
-                git -C "%LIBSODIUMDIR%" pull
-            )
-         )
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" msbuild /v:minimal /maxcpucount:%NUMBER_OF_PROCESSORS% /p:Configuration=%Configuration%DLL %LIBSODIUMDIR%\builds\msvc\%MSVCYEAR%\libsodium\libsodium.vcxproj
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" set SODIUM_LIBRARY_DIR="%LIBSODIUMDIR%\bin\%Platform%\%Configuration%\%MSVCVERSION%\dynamic"
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" set SODIUM_INCLUDE_DIR="%LIBSODIUMDIR%\src\libsodium\include"
-  - ps: if (${env:WITH_LIBSODIUM} -eq "ON") { Copy-Item "C:\projects\libsodium\bin\${env:Platform}\${env:Configuration}\${env:MSVCVERSION}\dynamic\libsodium.lib" -Destination "C:\projects\libsodium\bin\${env:Platform}\${env:Configuration}\${env:MSVCVERSION}\dynamic\sodium.lib" }
-
-clone_folder: C:\projects\libzmq
-
-before_build:
-  - cmd: set LIBZMQ_SRCDIR=%cd%
-  - cmd: set LIBZMQ_BUILDDIR=C:\projects\build_libzmq
-  # TODO this does not work with sonarcloud.io, as it misses the sonar-cxx plugin
-  # - cmd: curl -L https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.1.0.1141-windows.zip -o sonar-scanner-cli-3.1.0.1141-windows.zip
-  # - cmd: unzip sonar-scanner-cli-3.1.0.1141-windows.zip
-  # - cmd: set BUILDLOG="%LIBZMQ_SRCDIR%\build.log"
-  - cmd: md "%LIBZMQ_BUILDDIR%"
-  - cd "%LIBZMQ_BUILDDIR%"
-  - cmd: if "%PLATFORM%" == "cygwin64" set APPVEYOR_BUILD_FOLDER=/cygdrive/C/projects/libzmq
-  - cmd: if "%ENABLE_ANALYSIS%"=="ON" ( set LIBZMQ_WERROR="OFF" ) else ( set LIBZMQ_WERROR="ON" )
-  - cmd: cmake -D CMAKE_INCLUDE_PATH="%SODIUM_INCLUDE_DIR%" -D CMAKE_LIBRARY_PATH="%SODIUM_LIBRARY_DIR%" -D WITH_LIBSODIUM="%WITH_LIBSODIUM%" -D ENABLE_DRAFTS="%ENABLE_DRAFTS%" -D ENABLE_ANALYSIS="%ENABLE_ANALYSIS%" -D ENABLE_CURVE="%ENABLE_CURVE%" -D API_POLLER="%API_POLLER%" -D POLLER="%POLLER%" %EXTRA_FLAGS% -D WITH_LIBSODIUM="%WITH_LIBSODIUM%" -D LIBZMQ_WERROR="%LIBZMQ_WERROR%" -G "%CMAKE_GENERATOR%" "%APPVEYOR_BUILD_FOLDER%"
-  - cmd: cd "%LIBZMQ_SRCDIR%"
-  - ps: $env:ZMQ_VERSION_MAJOR = (Select-String -Path .\include\zmq.h -Pattern ".*#define ZMQ_VERSION_MAJOR ([0-9]+).*").Matches.Groups[1].Value
-  - ps: $env:ZMQ_VERSION_MINOR = (Select-String -Path .\include\zmq.h -Pattern ".*#define ZMQ_VERSION_MINOR ([0-9]+).*").Matches.Groups[1].Value
-  - ps: $env:ZMQ_VERSION_PATCH = (Select-String -Path .\include\zmq.h -Pattern ".*#define ZMQ_VERSION_PATCH ([0-9]+).*").Matches.Groups[1].Value
-  - ps: $env:ZMQ_VERSION = "${env:ZMQ_VERSION_MAJOR}.${env:ZMQ_VERSION_MINOR}.${env:ZMQ_VERSION_PATCH}"
-  - cmd: echo "ZMQ_VERSION is %ZMQ_VERSION%"
-
-build_script:
-  - cmd: set verbosity=Minimal
-  - cmd: if "%MSVCYEAR%"=="vs2008" set verbosity=Normal
-  - cmd: if "%MSVCYEAR%"=="vs2008" set path=C:\Windows\Microsoft.NET\Framework\v3.5;%path% 
-  - cmd: cd "%LIBZMQ_BUILDDIR%"
-  - cmd: if "%PLATFORM:~0,5%" == "Win32" (
-            if "%MSVCYEAR%"=="vs2008" (
-                cmake --build %LIBZMQ_BUILDDIR% --config %configuration% --target install
-            ) else (
-                cmake --build %LIBZMQ_BUILDDIR% --config %configuration% --target install -- -verbosity:Minimal -maxcpucount -logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-            )
-         )
-  - cmd: if "%PLATFORM%" == "x64" (
-            cmake --build %LIBZMQ_BUILDDIR% --config %configuration% --target install -- -verbosity:Minimal -maxcpucount -logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-         )
-  - cmd: if "%PLATFORM%" == "cygwin64" (
-            cmake --build . -- -j5
-         )
-  - cmd: if "%PLATFORM%" == "mingw64" (
-            cmake --build . -- -j5
-         )
-
-# TODO this does not work with sonarcloud.io, as it misses the sonar-cxx plugin
-# build_script:
-  # - cmd: msbuild %LIBZMQ_BUILDDIR%\ZeroMQ.sln /verbosity:detailed >%BUILDLOG%
-
-after_build:
-  # TODO this does not work with sonarcloud.io, as it misses the sonar-cxx plugin
-  # - cmd: cd "%LIBZMQ_SRCDIR%"
-  # - cmd: dir
-  # - cmd: sonar-scanner-3.1.0.1141-windows\bin\sonar-scanner 
-            # -Dsonar.scm.provider=git 
-            # -Dsonar.projectKey=libzmq-msvc 
-            # -Dsonar.organization=sigiesec-github 
-            # -Dsonar.sources=include,src,tests,unittests 
-            # -Dsonar.host.url=https://sonarcloud.io 
-            # -Dsonar.login=%SONARQUBE_TOKEN% 
-            # -Dsonar.cxx.compiler.parser="Visual C++" 
-            # -Dsonar.cxx.compiler.reportPath=build.log 
-            # -Dsonar.cxx.compiler.charset=UTF-8 
-            # -Dsonar.cxx.compiler.regex=^(?<filename>.*)\\((?<line>[0-9]+)\\):\\x20warning\\x20(?<id>C\\d\\d\\d\\d):(?<message>.*)$
-# TODO this should be done differently, using the INSTALL cmake target, the current handling depends on the details of the CMakeLists.txt
-  - cmd: cd %LIBZMQ_BUILDDIR%\bin\%Configuration%"
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" copy "%SODIUM_LIBRARY_DIR%\libsodium.dll" .
-  - cmd: copy "%LIBZMQ_SRCDIR%\include\zmq.h" .
-  - cmd: copy ..\..\lib\%Configuration%\libzmq*.lib . & exit 0
-  - cmd: 7z a -y -bd -mx=9 libzmq.zip *.exe *.dll *.pdb *.h *.lib
-  - ps: Push-AppveyorArtifact "libzmq.zip" -Filename "libzmq-${env:ARTIFACT_NAME}-${env:ZMQ_VERSION_MAJOR}_${env:ZMQ_VERSION_MINOR}_${env:ZMQ_VERSION_PATCH}.zip"
-
-test_script:
-  - cmd: cd "%LIBZMQ_BUILDDIR%"
-# TODO run tests in parallel only on selected platforms, since they fail on others, see https://github.com/zeromq/libzmq/issues/3123
-  - cmd: if "%CMAKE_GENERATOR%"=="Visual Studio 12 2013" set PARALLELIZE=ON
-  - cmd: if "%CMAKE_GENERATOR%"=="Visual Studio 14 2015" set PARALLELIZE=ON
-  - cmd: if "%CMAKE_GENERATOR%"=="Visual Studio 12 2013 Win64" set PARALLELIZE=ON
-  - cmd: if "%CMAKE_GENERATOR%"=="Visual Studio 14 2015 Win64" set PARALLELIZE=ON
-  - cmd: if not defined TEST_OPTIONS set "TEST_OPTIONS= "
-  - cmd: if "%PARALLELIZE%"=="ON" (
-            echo "Running tests in parallel" &&
-            set TEST_OPTIONS=%TEST_OPTIONS% -j5
-         )
-  - cmd: if "%APPVEYOR_REPO_TAG%"=="false" (ctest -C "%Configuration%" -V %TEST_OPTIONS%)
-
-deploy:
-  - provider: BinTray
-    username: somdoron
-    api_key:
-      secure: B4TC4GvUMbwX13Skh2Kvyc6SnqLkjNS9W0gtN2yxUC2Y4oQSCK2F4eRgtpMpCasg
-    subject: zeromq
-    repo: generic
-    package: libzmq
-    publish: true
-    override: true
-    version: ${ZMQ_VERSION}
-    on:
-      APPVEYOR_REPO_TAG: true
-
-# the analysis build is repeated; apparently appveyor only uses the first section that matches some branch
-for:
--
-    branches:
-        only:
-            - master
-    environment:
-        matrix:
-            - platform: Win32
-              configuration: Release
-              API_POLLER: poll
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              NO_PR: TRUE
-            - platform: x64
-              configuration: Release
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              NO_PR: TRUE
-            - platform: Win32
-              configuration: Release
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              NO_PR: TRUE
-            - platform: Win32
-              configuration: Release
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              ENABLE_ANALYSIS: ON
-              APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-              CMAKE_GENERATOR: "Visual Studio 15 2017"
-              MSVCVERSION: "v141"
-              MSVCYEAR: "vs2017"
-              NO_PR: TRUE
--
-    branches:
-        only:
-            - /.*analyze$/
-    environment:
-        matrix:
-            - platform: Win32
-              configuration: Release
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              ENABLE_ANALYSIS: ON
-              APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-              CMAKE_GENERATOR: "Visual Studio 15 2017"
-              MSVCVERSION: "v141"
-              MSVCYEAR: "vs2017"
-              NO_PR: TRUE
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index e99dc5b34..000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-#    Copyright (c) 2007-2009 iMatix Corporation
-#    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
-#
-#   This file is part of 0MQ.
-#
-#   0MQ is free software; you can redistribute it and/or modify it under
-#   the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   0MQ is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU Lesser General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Script to generate all required files from fresh git checkout.
-
-# Debian and Ubuntu do not ship libtool anymore, but OSX does not ship libtoolize.
-command -v libtoolize >/dev/null 2>&1
-if  [ $? -ne 0 ]; then
-    command -v libtool >/dev/null 2>&1
-    if  [ $? -ne 0 ]; then
-        echo "autogen.sh: error: could not find libtool.  libtool is required to run autogen.sh." 1>&2
-        exit 1
-    fi
-fi
-
-command -v autoreconf >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-    echo "autogen.sh: error: could not find autoreconf.  autoconf and automake are required to run autogen.sh." 1>&2
-    exit 1
-fi
-
-mkdir -p ./config
-if [ $? -ne 0 ]; then
-    echo "autogen.sh: error: could not create directory: ./config." 1>&2
-    exit 1
-fi
-
-autoreconf --install --force --verbose -I config
-if [ $? -ne 0 ]; then
-    echo "autogen.sh: error: autoreconf exited with status $?" 1>&2
-    exit 1
-fi
diff --git a/branding.bmp b/branding.bmp
deleted file mode 100755
index cf0ee284de24bfc7bade92907ee4c08f65493582..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25818
zcmeHP33OJ)6;9Z}5D*k1C{Wh0TPRheQDjG;1XT7#Py~-+&!NTL3L+6xDIBU4OD%d%
zl_~~WiWMx<+EPyK5ut*Bfb2Vjge74UzkV+-nauy*%)EL3|3e%5zmq>_-n^N6@7!<h
zEcecP-3DxbAgSp3KL4llH=n=G{3R!)@xObmO-)L2ekB(YS3&~`4J0&>&_F^12@NDP
z@U7Iq=>nWNt8Llk%h<giIm__eY>XO(F5Qs+gW|u=J#p{7`00ztS%EM2;p?xpME<WH
zeDe+V9mR)hkTnk@M&i!Cr5fvyfgwZi#B{v54BNKh!UdCJPM*Z%srcdxQ<<V?1?P}C
z4ub~a)TxNF6y)#`%$<wdd!cq+Bqt*&$@G_62VHw1dp`CY0_#R`O?V95hbsOuC*aWW
zDCh-LVc#78xPqN4!-b0h)%}mz=-hm~{w@X##Pv5?Xe<>s--2hJ#rEyE?9&+G$jo#U
z-lh$<ZuN5$Ikdn5V~UaK*AMym#ZSK4hli#j^;#2XI!G&}VC4PSut6}fO|)yLW>+%}
zI}Y0tu`hS&GMaZ*b7a%bowKLpl;lt~<#E)grzNOU7xODu#yw-Pc6}*F0zo)Ll@={@
z)_D9l`reJ?a;0Tyjr;fGiD{^FLusa<6e>}p1}6Ok$4-{Y6__fc7}8>A%t74-v1+Vp
zb&Q(;S`Psv5FTx}ZHp~iJSseL1igBB3$k8nsv^@v&;GV?W32etcAhMY7_Q%fj6370
zv6^*}k)bA-p6*PcCD(})=-D%Pz_!QAP%@<kUU~_aES5WE3q#Iee^`#R`f7a}6cWoL
zs;I~sx!UQ|=c;n%dg#%|aXx63P_{6f{~D^KTvau?;6L~vE%Ef}i1{*>Zed@yd<8r*
z6&H=xSXMBk1^#Lws#N(e0C?A3;22tTan|HmYL9@YWYt=z*$CBZhoexg9G;sAuIP1F
zS;3H7<**i5HO0|bN?JILdDKqG#KxgWhq<}v+t-$4g$hV-g(*+q?N!*i6DLmM<Z0yQ
zVeel2{v%9%60KXKV#Q!;)v96nhdKyRCNTVB7wX>>+){Sf1`RM_0v3PZEJRM^7HKRW
zd-h`4-|_Tw=-4@&B@-+{=DYUnLG|jv;#91R`LCm(z*k?&IDZ}=tU{MQpzNOB<GF3v
z2nUWzHKpYLK8EMcBcpdf1KHlT?Xl=BkIhK!EJ|Lwgw?CjqleYX^7fue07>Y_PX~+R
zBG6+njw?EWS1#_9UR{K`4UJ@z@yKNLh#EVFM~^zbzfV8)3Z}e|Vvj#(LBw|2(>-}x
ztp=t}$Eh<)hTcr7w3|hbAla^&xNyl^9oV!9*Ij2+cBE&mcW>n7`N=49Hf%<EdlO~4
zCDy9c93zI@@w$_IlP1`_Ss|DwD=dZwkKra`_pDbBOaJI$qP?XusZxJ0Q08zhd+$9D
zDf%<VJZMWmQ0?9wCrX@g9)h0R0|(IF2qXOv{>4o!7!trc?kH_h)23K2xvo6oxwoM(
zq{g0|SxR5%L?qJEf;kE?xVG#rxzYp?L!v_$oGBCpnBbU0UznkW?or<X0mHoDvVJqJ
zucKwbjsKP%qHJ*@Y7CDZb9_!7uY9v+Iv-;(yHFSw7J}xjQ%lvVShB?19Nj(FmiDVj
z!Ld>mtX?CNeDN1raYQ9ug4Recfz6eZV_K|EdCD8!hz>(qVArnd=1}XOeWsN(6o!kJ
zsad#Mdgd7|7taH#jtbQ2)|@|hj0kUByolRw*OCcbSdtHSnl^JI`)==nT1M&ZP<TF~
zg;8Kgx4qv2WlhlIubUe~VR-LoZ9{HsinIFYtK7o8eB3oyOGg%4nNF=G2Ei|Pfp^MM
zoI4jT#GMvS-0p<YVs8A$dhZY?^ZoZOxrL$khqOSOKFzst<HiU^?u|W$xo1(oky>MH
z&fEnG;{Gi5dMZtBzB1h@100!^kC?fpcsO0UR9mD)Yvi4EX3K8fv}FYO{+T!#w1{S8
zUuRvUv*5Q8P1TiD#t#E6P{_$d%a+bM+;iDu_{m08s-{**oqE`{&qG*oOGQy#vPjA_
z)qeOeGKXqQmJHfYJ+Cb?@v&n5oOk7Ao{}Lmd-fOBtq|PJnyFvTJ@8OOEqe^bHbN(u
zKc7pS&p(e~XOH2+H?$h#!3vwp0E;Usr?7!Ti<SACx3%ng^mn-pzFS-5cPmQ;qMmF9
z)&7G5tZ~g>w8LpeW+^+SEHUK5+&l;R0d#X(wTiGtdkm-OyWy<th$iT6-g(CqnB|K4
zzWYkg!fg5q*Jw^qunAnw0PXebqMbV<grI}Y#v1z!G+E=${ivzgWH2@@Up5$WoR1}N
zCT}?GG2}@wUBCF#-{cmU(#w|Nnwknaw7}7$BV3sbEH%<hzc)0*A;)2sew%_4Wh_^|
zv?~Z<sIx$8WH;*HU%TNrmWP`ft2s7o7_p)Y#E^X|_RuxEvOB0+V#wV+Tc^Wtn{SsZ
zROe5;vjnM;FcQGAW1VQA=VHiS$+6ar*yVVe8)=?j+XQD-2Z1<t4I38h%<jjzQRNq>
zvz!Zjr9{N=jI=5;W60jbJ&lr%oY|=}%2x^~*1WlMQp^%V`jZTN4<7VrKj8NLKci*|
zj0BJtE^9zkzWG*l6G|`)Wrr?Rb`;t>dCJ=Iq#bMgp<>?{7d!mt=HNNd>C+Q&wh&o!
zOuhwIYzE6VY_vMp7DqdDmAP^yYS(s@NtOC7&@B^WhxYTK=oU<n+sKjH)rr7!zyR-n
z9Q%BDO?7<l7E||exsMxHJgZRaJi${b$Qqk92d5VyxhEl?O^nNYC@YgN@<@daK;{R{
zhnDM7nWvkk)w4Ch))=|rh<#n^(XRj2vA{>c;GVcR0M4ErY>j?WB1gtB_I0Tc%uTSD
zF@C7KEY_t@WotX%k4pB3I`Z5%ju>HKjhV<TIW->p{!r*umtYLWAEG9Vv*tz*ql{tf
z`$L^RmH8I?!=-xnZHu<ZiwJNic+fXU7|qt0l#DL@92n!`r_n*je2T%Hm282s#DwwX
zmr*gQ!%H%TvHNLcsmy5}xH32dO8hh?e`!U$yTZ)Fc}myc@Znlx7Ao&H7&)s<Mr-LW
z6$Jf>Q4cFDP;S82mywkX`hop*%{elLaq*YRQW?@acG&n!&2bCHZh1H+@M28DX2Zcl
zP&!rF$1Ri;9N)$SoHM>R<hFv7Pj+_j634?u#*lOZ;ufksS)dO61vqeUSn)_AZl$;d
ztD577uSB|{{jA&^TH{c?cUExLCG6veN(vkZ{BxjAR1WD`Stws#s~$fK4~7Bp!)ZFs
z;quq4LyG>~u@pZfS?-q&aeVGx*8R(hIjxZ}2F#5~3e8bc-y0xWf2l{ow7{{GtSr#e
zhFSB#Xt;-(?$(20;W;#EsjV9-j_;95+#WiH@90_h;`kh1#+1CWrffumR@iP4QXzlW
z8mU($9bIOq^E5IMG8%Rt3M__Dp&OClJ0DqdZLQIRAvG4q^E5&vk>L7|%Llooo^*$f
zp7S)U8hEa)Q5&rLMDQ>rxNi()jbYEV$*mc4e~2MeDfG-2tyZcY3`r`!=h|f1cJ4(N
zqZ`pV*QQ=;2A(giRU7l(L_yGQgW}K{8A-FU#_;D$T?|Ql$QTqxWr4E79BZ5tY>j>l
zNhH4KOG%JB{pIg#J=mi2b|0iXU+O46A1ynX?AN97-CMDEaX|0qQg+FENYNbe5V9~)
zEd`q*BV0nkI-j>&oh~BFV=IE7Au;1;0o#8ihTMq8_nbGq>4B?>TJ^ATi=inW{nhHY
zK5aQJ?^_TJnp2N^kmrlGP)Hqyjs*@0=tPD#Dj(4RX3jQQqY^`sy2|fc@O`n@eywbQ
zocYT)P(gnPM>Zjmj_$oDQJo3G=s%02!*Il;cv_%nJC`Zbr)#ZIhas!yT&?$>lFMV#
zlQys4a(<XLJ@gh>1|*6!O{>?C;IoM=#?=zTNmuBiHNNnI+KXer(0TvxT~rC#@xy9~
zZ67uq)}QBanvxaT8p8@Dmv{Y~p83shhjeBuL!@zpl&+C!(-bfoFm$<J(f5G)p^MSu
z6~S0z!`ZjyFEVZXWdveO6TtD~6~m*9A<Imh82SSv#wKbX(u?!_3{;4WHwI!zja{Ml
z@%e`F!%yR)J~*XqiSyv&wP?{Xc%^EOVXE)dDuTlkBueX&G348qfm$>+CEP>0#$S#M
zR9SM5|93Ic@K%l~x@gg`{8RD#KF#417&+NFZRNsF07bOjFN=#I%S@sxElyr!KNnpN
z2i1A=oX`EZqS^}(_wUo_Bn+7!$L~ZHoX4oij$$}T)4``ZfItCV3^~l&>n~)p0*Z4`
zoinF+ZVW3!e7_SFAgJwQF1<^?*H$~&2jhINtt+x$QGBnBOW)Cx9Sfw7+;B1Mb=BrT
zofvF2KT$_(42vNNej~ouHZ%_3Ytu;>RXzuq-MeG`ZX#7;29To7el;4+Mb#!#C0gUp
o=i4vp6{Oe^;_}@@1?faqLIVj6Bs7rFKtclv4J0)1Ez-b$09^Eg5dZ)H

diff --git a/builds/Makefile.am b/builds/Makefile.am
deleted file mode 100644
index e7fe5e09f..000000000
--- a/builds/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#  Specify all build files that have to go into source packages.
-#  msvc directory does its own stuff.
-
-EXTRA_DIST = \
- 	cygwin/Makefile.cygwin \
-	zos/makelibzmq \
-	zos/cxxall \
-	zos/README.md \
-	zos/makeclean \
-	zos/platform.hpp \
-	zos/zc++ \
-	zos/test_fork.cpp \
-	zos/maketests \
-	zos/runtests \
-	cygwin/Makefile.cygwin \
-	mingw32/Makefile.mingw32 \
-	mingw32/platform.hpp \
-	cmake/ci_build.sh \
-	cmake/Modules \
-	cmake/NSIS.template32.in \
-	cmake/NSIS.template64.in \
-	cmake/ZeroMQConfig.cmake.in \
-	cmake/clang-format-check.sh.in \
-	cmake/platform.hpp.in \
-	valgrind/ci_build.sh \
-	valgrind/valgrind.supp \
-	valgrind/vg \
-	nuget/readme.nuget \
-	nuget/libzmq.autopkg \
-	android/Dockerfile \
-	android/README.md \
-	android/android_build_helper.sh \
-	android/ci_build.sh \
-	android/build.sh
diff --git a/builds/README b/builds/README
deleted file mode 100644
index 0cbe32e43..000000000
--- a/builds/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory holds build tools, i.e. tools we use to build the current
-code tree. Packaging tools (which take released tarballs or github code
-repos) should go into /packaging.
-
-Note: 'deprecated-msvc' contains deprecated prepared Visual Studio Solution 
-files for various Visual Studio versions. These are no longer maintained, 
-and may or may not work. Please use cmake instead to build with Visual
-Studio. Rationale: The solution and project files are hard to maintain,
-since there are different variants for each Visual Studio version.
-The tests have never been included there for this reason, so they were
-never usable for actual development of libzmq. If you encounter that 
-something that worked before does not work with CMake, please open as 
-issue at https://github.com/zeromq/libzmq/issues.
-
diff --git a/builds/abi-compliance-checker/ci_build.sh b/builds/abi-compliance-checker/ci_build.sh
deleted file mode 100755
index f969f46e6..000000000
--- a/builds/abi-compliance-checker/ci_build.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-cd ../../
-
-mkdir tmp
-BUILD_PREFIX=$PWD/tmp
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("CFLAGS=-I${BUILD_PREFIX}/include -g -Og")
-CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CXXFLAGS=-I${BUILD_PREFIX}/include -g -Og")
-CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
-CONFIG_OPTS+=("--enable-drafts=no")
-
-function print_abi_api_breakages() {
-   echo "ABI breakages detected:"
-   cat compat_reports/libzmq/${LATEST_VERSION}_to_HEAD/abi_affected.txt | c++filt
-   echo "API breakages detected:"
-   cat compat_reports/libzmq/${LATEST_VERSION}_to_HEAD/src_affected.txt | c++filt
-   exit 1
-}
-
-git fetch --unshallow
-git fetch --all --tags
-LATEST_VERSION=$(git describe --abbrev=0 --tags)
-
-./autogen.sh
-./configure "${CONFIG_OPTS[@]}"
-make VERBOSE=1 -j5
-abi-dumper src/.libs/libzmq.so -o ${BUILD_PREFIX}/libzmq.head.dump -lver HEAD
-
-git clone --depth 1 -b ${LATEST_VERSION} https://github.com/zeromq/libzmq.git latest_release
-cd latest_release
-./autogen.sh
-./configure "${CONFIG_OPTS[@]}"
-make VERBOSe=1 -j5
-abi-dumper src/.libs/libzmq.so -o ${BUILD_PREFIX}/libzmq.latest.dump -lver ${LATEST_VERSION}
-
-abi-compliance-checker -l libzmq -d1 ${BUILD_PREFIX}/libzmq.latest.dump -d2 ${BUILD_PREFIX}/libzmq.head.dump -list-affected || print_abi_api_breakages
diff --git a/builds/android/Dockerfile b/builds/android/Dockerfile
deleted file mode 100644
index 336bbca7f..000000000
--- a/builds/android/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:14.04
-MAINTAINER Benjamin Henrion <zoobab@gmail.com>
- 
-RUN DEBIAN_FRONTEND=noninteractive apt-get update -y -q
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes tar git curl nano wget dialog net-tools build-essential vim emacs apt-utils file uuid-dev cmake asciidoc python autoconf automake libtool pkg-config xmlto sudo gettext apt-utils
-
-RUN useradd -d /home/zmq -m -s /bin/bash zmq
-RUN echo "zmq ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/zmq
-RUN chmod 0440 /etc/sudoers.d/zmq
-
-USER zmq
-# install android-ndk
-RUN cd ~ && wget -q http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -O android-ndk-r10e-linux-x86_64.bin && chmod +x android-ndk-r10e-linux-x86_64.bin
-RUN cd ~ && ./android-ndk-r10e-linux-x86_64.bin
-ENV ANDROID_NDK_ROOT /home/zmq/android-ndk-r10e
-ENV TOOLCHAIN_NAME arm-linux-androideabi-4.9
-ENV TOOLCHAIN_HOST arm-linux-androideabi
-ENV TOOLCHAIN_PATH ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_NAME}/prebuilt/linux-x86_64/bin
-ENV TOOLCHAIN_ARCH arm
-# build libzmq for android
-RUN cd ~ && git clone --depth 1 https://github.com/zeromq/libzmq.git
-RUN cd ~/libzmq/builds/android && ./build.sh
diff --git a/builds/android/README.md b/builds/android/README.md
deleted file mode 100644
index 326b1e314..000000000
--- a/builds/android/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Android Build
-
-## Prerequisites
-
-You need the Android Native Development Kit (NDK) installed. See
-[here](https://developer.android.com/ndk) to download it.
-
-This project is tested against Android NDK version r20.
-
-If you installed version r20 all you have to do is to expose the NDK root
-directory as environment variable, e.g:
-
-    export ANDROID_NDK_ROOT=$HOME/android-ndk-r20
-
-If you installed another version you have to expose the NDK root directory as
-well as the NDK version, e.g:
-
-    export ANDROID_NDK_ROOT=$HOME/android-ndk-r17c
-    export NDK_VERSION=android-ndk-r17c
-
-To specify the minimum sdk version set the environment variable below:
-
-    export MIN_SDK_VERSION=21   # Default value if unset
-
-To specify the prefix directory set the environment variable below:
-
-    export ANDROID_BUILD_DIR=./builds/android/prefix/<android_arch> # Default value if unset
-
-## Build
-
-In the android directory, run:
-
-    ./build.sh [ arm | arm64 | x86 | x86_64 ]
diff --git a/builds/android/android_build_helper.sh b/builds/android/android_build_helper.sh
deleted file mode 100644
index bd09f1aa5..000000000
--- a/builds/android/android_build_helper.sh
+++ /dev/null
@@ -1,301 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2014, Joe Eli McIlvain
-# 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. Neither the name of the copyright holder nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#    this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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.
-#
-###
-#
-# https://github.com/jemc/android_build_helper
-#   android_build_helper.sh
-#
-# The following is a helper script for setting up android builds for
-# "native" libraries maintained with an autotools build system.
-# It merely helps to create the proper cross-compile environment.
-# It makes no attempt to wrap the library or make it accessible to Java code;
-# the intention is to make the bare library available to other "native" code.
-#
-# To get the latest version of this script, please download from:
-#   https://github.com/jemc/android_build_helper
-#
-# You are free to modify this script, but if you add improvements,
-# please consider submitting a pull request to the aforementioned upstream
-# repository for the benefit of other users.
-#
-
-# Get directory of current script (if not already set)
-# This directory is also the basis for the build directories the get created.
-if [ -z "$ANDROID_BUILD_DIR" ]; then
-    ANDROID_BUILD_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-fi
-
-# Set up a variable to hold the global failure reasons, separated by newlines
-# (Empty string indicates no failure)
-ANDROID_BUILD_FAIL=()
-
-function android_build_check_fail {
-    if [ ! ${#ANDROID_BUILD_FAIL[@]} -eq 0 ]; then
-        echo "Android (${TOOLCHAIN_ARCH}) build failed for the following reasons:"
-        for reason in "${ANDROID_BUILD_FAIL[@]}"; do
-            local formatted_reason="  ${reason}"
-            echo "${formatted_reason}"
-        done
-        exit 1
-    fi
-}
-
-function android_build_set_env {
-    BUILD_ARCH=$1
-
-    export TOOLCHAIN_PATH="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${HOST_PLATFORM}/bin"
-
-    # Set variables for each architecture
-    if [ $BUILD_ARCH == "arm" ]; then
-        export TOOLCHAIN_HOST="arm-linux-androideabi"
-        export TOOLCHAIN_COMP="armv7a-linux-androideabi${MIN_SDK_VERSION}"
-        export TOOLCHAIN_ABI="armeabi-v7a"
-        export TOOLCHAIN_ARCH="arm"
-    elif [ $BUILD_ARCH == "x86" ]; then
-        export TOOLCHAIN_HOST="i686-linux-android"
-        export TOOLCHAIN_COMP="i686-linux-android${MIN_SDK_VERSION}"
-        export TOOLCHAIN_ABI="x86"
-        export TOOLCHAIN_ARCH="x86"
-    elif [ $BUILD_ARCH == "arm64" ]; then
-        export TOOLCHAIN_HOST="aarch64-linux-android"
-        export TOOLCHAIN_COMP="aarch64-linux-android${MIN_SDK_VERSION}"
-        export TOOLCHAIN_ABI="arm64-v8a"
-        export TOOLCHAIN_ARCH="arm64"
-    elif [ $BUILD_ARCH == "x86_64" ]; then
-        export TOOLCHAIN_HOST="x86_64-linux-android"
-        export TOOLCHAIN_COMP="x86_64-linux-android${MIN_SDK_VERSION}"
-        export TOOLCHAIN_ABI="x86_64"
-        export TOOLCHAIN_ARCH="x86_64"
-    fi
-
-    export ANDROID_BUILD_SYSROOT="${ANDROID_NDK_ROOT}/platforms/android-${MIN_SDK_VERSION}/arch-${TOOLCHAIN_ARCH}"
-    export ANDROID_BUILD_PREFIX="${ANDROID_BUILD_DIR}/prefix/${TOOLCHAIN_ARCH}"
-}
-
-function android_build_env {
-    ##
-    # Check that necessary environment variables are set
-
-    if [ -z "$ANDROID_NDK_ROOT" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the ANDROID_NDK_ROOT environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r20\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_PATH" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_PATH environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r20/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_HOST" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_HOST environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"arm-linux-androideabi\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_COMP" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_COMP environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"armv7a-linux-androideabi\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_ABI" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_ABI environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"armeabi-v7a\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_ARCH" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_ARCH environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"arm\")")
-    fi
-
-    android_build_check_fail
-
-    ##
-    # Check that directories given by environment variables exist
-
-    if [ ! -d "$ANDROID_NDK_ROOT" ]; then
-        ANDROID_BUILD_FAIL+=("The ANDROID_NDK_ROOT directory does not exist")
-        ANDROID_BUILD_FAIL+=("  ${ANDROID_NDK_ROOT}")
-    fi
-
-    if [ ! -d "$TOOLCHAIN_PATH" ]; then
-        ANDROID_BUILD_FAIL+=("The TOOLCHAIN_PATH directory does not exist")
-        ANDROID_BUILD_FAIL+=("  ${TOOLCHAIN_PATH}")
-    fi
-
-    ##
-    # Set up some local variables and check them
-
-    if [ ! -d "$ANDROID_BUILD_SYSROOT" ]; then
-        ANDROID_BUILD_FAIL+=("The ANDROID_BUILD_SYSROOT directory does not exist")
-        ANDROID_BUILD_FAIL+=("  ${ANDROID_BUILD_SYSROOT}")
-    fi
-
-    mkdir -p "$ANDROID_BUILD_PREFIX" || {
-        ANDROID_BUILD_FAIL+=("Failed to make ANDROID_BUILD_PREFIX directory")
-        ANDROID_BUILD_FAIL+=("  ${ANDROID_BUILD_PREFIX}")
-    }
-
-    android_build_check_fail
-}
-
-function _android_build_opts_process_binaries {
-    local TOOLCHAIN="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${HOST_PLATFORM}"
-    local CC="${TOOLCHAIN_PATH}/${TOOLCHAIN_COMP}-clang"
-    local CXX="${TOOLCHAIN_PATH}/${TOOLCHAIN_COMP}-clang++"
-    local LD="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ld"
-    local AS="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-as"
-    local AR="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ar"
-    local RANLIB="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ranlib"
-    local STRIP="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-strip"
-
-    if [ ! -x "${CC}" ]; then
-        ANDROID_BUILD_FAIL+=("The CC binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${CC}")
-    fi
-
-    if [ ! -x "${CXX}" ]; then
-        ANDROID_BUILD_FAIL+=("The CXX binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${CXX}")
-    fi
-
-    if [ ! -x "${LD}" ]; then
-        ANDROID_BUILD_FAIL+=("The LD binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${LD}")
-    fi
-
-    if [ ! -x "${AS}" ]; then
-        ANDROID_BUILD_FAIL+=("The AS binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${AS}")
-    fi
-
-    if [ ! -x "${AR}" ]; then
-        ANDROID_BUILD_FAIL+=("The AR binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${AR}")
-    fi
-
-    if [ ! -x "${RANLIB}" ]; then
-        ANDROID_BUILD_FAIL+=("The RANLIB binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${RANLIB}")
-    fi
-
-    if [ ! -x "${STRIP}" ]; then
-        ANDROID_BUILD_FAIL+=("The STRIP binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${STRIP}")
-    fi
-
-    ANDROID_BUILD_OPTS+=("TOOLCHAIN=${TOOLCHAIN}")
-    ANDROID_BUILD_OPTS+=("CC=${CC}")
-    ANDROID_BUILD_OPTS+=("CXX=${CXX}")
-    ANDROID_BUILD_OPTS+=("LD=${LD}")
-    ANDROID_BUILD_OPTS+=("AS=${AS}")
-    ANDROID_BUILD_OPTS+=("AR=${AR}")
-    ANDROID_BUILD_OPTS+=("RANLIB=${RANLIB}")
-    ANDROID_BUILD_OPTS+=("STRIP=${STRIP}")
-
-    android_build_check_fail
-}
-
-# Set the ANDROID_BUILD_OPTS variable to a bash array of configure options
-function android_build_opts {
-    ANDROID_BUILD_OPTS=()
-
-    _android_build_opts_process_binaries
-
-    local LIBS="-lc -lgcc -ldl -lm -llog -lc++_shared"
-    local LDFLAGS="-L${ANDROID_BUILD_PREFIX}/lib"
-    LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${TOOLCHAIN_ABI}"
-    CFLAGS+=" -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE"
-    CPPFLAGS+=" -I${ANDROID_BUILD_PREFIX}/include"
-
-    ANDROID_BUILD_OPTS+=("CFLAGS=${CFLAGS} ${ANDROID_BUILD_EXTRA_CFLAGS}")
-    ANDROID_BUILD_OPTS+=("CPPFLAGS=${CPPFLAGS} ${ANDROID_BUILD_EXTRA_CPPFLAGS}")
-    ANDROID_BUILD_OPTS+=("CXXFLAGS=${CXXFLAGS} ${ANDROID_BUILD_EXTRA_CXXFLAGS}")
-    ANDROID_BUILD_OPTS+=("LDFLAGS=${LDFLAGS} ${ANDROID_BUILD_EXTRA_LDFLAGS}")
-    ANDROID_BUILD_OPTS+=("LIBS=${LIBS} ${ANDROID_BUILD_EXTRA_LIBS}")
-
-    ANDROID_BUILD_OPTS+=("PKG_CONFIG_LIBDIR=${ANDROID_NDK_ROOT}/prebuilt/${HOST_PLATFORM}/lib/pkgconfig")
-    ANDROID_BUILD_OPTS+=("PKG_CONFIG_PATH=${ANDROID_BUILD_PREFIX}/lib/pkgconfig")
-    ANDROID_BUILD_OPTS+=("PKG_CONFIG_SYSROOT_DIR=${ANDROID_BUILD_SYSROOT}")
-    ANDROID_BUILD_OPTS+=("PKG_CONFIG_DIR=")
-    ANDROID_BUILD_OPTS+=("--with-sysroot=${ANDROID_BUILD_SYSROOT}")
-    ANDROID_BUILD_OPTS+=("--host=${TOOLCHAIN_HOST}")
-    ANDROID_BUILD_OPTS+=("--prefix=${ANDROID_BUILD_PREFIX}")
-
-    android_build_check_fail
-}
-
-# Parse readelf output to verify the correct linking of libraries.
-#   The first argument should be the soname of the newly built library.
-#   The rest of the arguments should be the sonames of dependencies.
-#   All sonames should be unversioned for android (no trailing numbers).
-function android_build_verify_so {
-    local soname="$1"
-    shift # Get rid of first argument - the rest represent dependencies
-
-    local sofile="${ANDROID_BUILD_PREFIX}/lib/${soname}"
-    if [ ! -f "${sofile}" ]; then
-        ANDROID_BUILD_FAIL+=("Found no library named ${soname}")
-        ANDROID_BUILD_FAIL+=("  ${sofile}")
-    fi
-    android_build_check_fail
-
-    if command -v readelf >/dev/null 2>&1 ; then
-        local readelf_bin="readelf"
-    elif command -v greadelf >/dev/null 2>&1 ; then
-        local readelf_bin="greadelf"
-    else
-        ANDROID_BUILD_FAIL+=("Could not find [g]readelf")
-    fi
-    android_build_check_fail
-
-    local elfoutput=$(LC_ALL=C $readelf_bin -d ${sofile})
-
-    local soname_regexp='soname: \[([[:alnum:]\.]+)\]'
-    if [[ $elfoutput =~ $soname_regexp ]]; then
-        local parsed_soname="${BASH_REMATCH[1]}"
-        if [ "${parsed_soname}" != "${soname}" ]; then
-            ANDROID_BUILD_FAIL+=("Actual soname of library ${soname} is incorrect (or versioned):")
-            ANDROID_BUILD_FAIL+=("  ${parsed_soname}")
-        fi
-    else
-        ANDROID_BUILD_FAIL+=("Failed to meaningfully parse readelf output for library ${soname}:")
-        ANDROID_BUILD_FAIL+=("  ${elfoutput}")
-    fi
-
-    for dep_soname do
-        if [[ $elfoutput != *"library: [${dep_soname}]"* ]]; then
-            ANDROID_BUILD_FAIL+=("Library ${soname} was expected to be linked to library with soname:")
-            ANDROID_BUILD_FAIL+=("  ${dep_soname}")
-        fi
-    done
-
-    android_build_check_fail
-}
diff --git a/builds/android/build.sh b/builds/android/build.sh
deleted file mode 100755
index 490599b27..000000000
--- a/builds/android/build.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env bash
-
-function usage {
-    echo "Usage ./build.sh [ arm | arm64 | x86 | x86_64 ]"
-}
-
-# Use directory of current script as the build directory and working directory
-cd "$( dirname "${BASH_SOURCE[0]}" )"
-ANDROID_BUILD_DIR="${ANDROID_BUILD_DIR:-`pwd`}"
-
-# Get access to android_build functions and variables
-source ./android_build_helper.sh
-
-# Choose a C++ standard library implementation from the ndk
-ANDROID_BUILD_CXXSTL="gnustl_shared_49"
-
-BUILD_ARCH=$1
-if [ -z $BUILD_ARCH ]; then
-    usage
-    exit 1
-fi
-
-case $(uname | tr '[:upper:]' '[:lower:]') in
-  linux*)
-    export HOST_PLATFORM=linux-x86_64
-    ;;
-  darwin*)
-    export HOST_PLATFORM=darwin-x86_64
-    ;;
-  *)
-    echo "Unsupported platform"
-    exit 1
-    ;;
-esac
-
-# Set default values used in ci builds
-
-export NDK_VERSION=${NDK_VERSION:-android-ndk-r20}
-# With NDK r20, the minimum SDK version range is [16, 29].
-# SDK version 21 is the minimum version for 64-bit builds.
-export MIN_SDK_VERSION=${MIN_SDK_VERSION:-21}
-
-# Set up android build environment and set ANDROID_BUILD_OPTS array
-android_build_set_env $BUILD_ARCH
-android_build_env
-android_build_opts
-
-# Use a temporary build directory
-cache="/tmp/android_build/${TOOLCHAIN_ARCH}"
-rm -rf "${cache}"
-mkdir -p "${cache}"
-
-# Check for environment variable to clear the prefix and do a clean build
-if [[ $ANDROID_BUILD_CLEAN ]]; then
-    echo "Doing a clean build (removing previous build and depedencies)..."
-    rm -rf "${ANDROID_BUILD_PREFIX}"/*
-fi
-
-if [ -z $CURVE ]; then
-    CURVE="--disable-curve"
-    VERIFY="libzmq.so"
-elif [ $CURVE == "libsodium" ]; then
-    CURVE="--with-libsodium=yes"
-    VERIFY="libzmq.so libsodium.so"
-    ##
-    # Build libsodium from latest master branch
-
-    (android_build_verify_so "libsodium.so" &> /dev/null) || {
-        rm -rf "${cache}/libsodium"
-        (cd "${cache}" && git clone -b stable --depth 1 git://github.com/jedisct1/libsodium.git) || exit 1
-        (cd "${cache}/libsodium" && ./autogen.sh \
-            && ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" --disable-soname-versions \
-            && make -j 4 \
-            && make install) || exit 1
-    }
-elif [ $CURVE == "tweetnacl" ]; then
-    # Default
-    CURVE=""
-    VERIFY="libzmq.so"
-fi
-
-##
-# Build libzmq from local source
-
-LIBTOOL_EXTRA_LDFLAGS='-avoid-version'
-
-(android_build_verify_so ${VERIFY} &> /dev/null) || {
-    rm -rf "${cache}/libzmq"
-    (cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && make clean)
-
-    (cd "${cache}/libzmq" && ./autogen.sh \
-        && ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" ${CURVE} --without-docs \
-        && make -j 4 \
-        && make install) || exit 1
-}
-
-##
-# Verify shared libraries in prefix
-
-android_build_verify_so ${VERIFY}
-echo "libzmq android build succeeded"
diff --git a/builds/android/ci_build.sh b/builds/android/ci_build.sh
deleted file mode 100755
index baa89b971..000000000
--- a/builds/android/ci_build.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-export NDK_VERSION=android-ndk-r20
-export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}"
-
-case $(uname | tr '[:upper:]' '[:lower:]') in
-  linux*)
-    HOST_PLATFORM=linux-x86_64
-    ;;
-  darwin*)
-    HOST_PLATFORM=darwin-x86_64
-    ;;
-  *)
-    echo "Unsupported platform"
-    exit 1
-    ;;
-esac
-
-if [ ! -d "${ANDROID_NDK_ROOT}" ]; then
-    export FILENAME=$NDK_VERSION-$HOST_PLATFORM.zip
-
-    (cd '/tmp' \
-        && wget http://dl.google.com/android/repository/$FILENAME -O $FILENAME &> /dev/null \
-        && unzip -q $FILENAME) || exit 1
-    unset FILENAME
-fi
-
-./build.sh "arm"
-./build.sh "arm64"
-./build.sh "x86"
-./build.sh "x86_64"
diff --git a/builds/cmake/Modules/ClangFormat.cmake b/builds/cmake/Modules/ClangFormat.cmake
deleted file mode 100644
index f36ea0692..000000000
--- a/builds/cmake/Modules/ClangFormat.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-# additional target to perform clang-format run, requires clang-format
-
-# get all project files
-file(GLOB_RECURSE ALL_SOURCE_FILES 
-     RELATIVE ${CMAKE_CURRENT_BINARY_DIR} 
-     ${CMAKE_SOURCE_DIR}/src/*.cpp ${CMAKE_SOURCE_DIR}/src/*.h ${CMAKE_SOURCE_DIR}/src/*.hpp 
-     ${CMAKE_SOURCE_DIR}/tests/*.cpp ${CMAKE_SOURCE_DIR}/tests/*.h ${CMAKE_SOURCE_DIR}/tests/*.hpp 
-     ${CMAKE_SOURCE_DIR}/perf/*.cpp ${CMAKE_SOURCE_DIR}/perf/*.h ${CMAKE_SOURCE_DIR}/perf/*.hpp 
-     ${CMAKE_SOURCE_DIR}/tools/*.cpp ${CMAKE_SOURCE_DIR}/tools/*.h ${CMAKE_SOURCE_DIR}/tools/*.hpp 
-     ${CMAKE_SOURCE_DIR}/include/*.h
-    )
-
-if("${CLANG_FORMAT}" STREQUAL "")
-  set(CLANG_FORMAT "clang-format")
-endif()
-
-add_custom_target(
-        clang-format
-        COMMAND ${CLANG_FORMAT} -style=file -i ${ALL_SOURCE_FILES}
-)
-
-function(JOIN VALUES GLUE OUTPUT)
-  string (REPLACE ";" "${GLUE}" _TMP_STR "${VALUES}")
-  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
-endfunction()
-
-configure_file(builds/cmake/clang-format-check.sh.in clang-format-check.sh @ONLY)
-
-add_custom_target(
-        clang-format-check
-        COMMAND chmod +x clang-format-check.sh
-        COMMAND ./clang-format-check.sh
-        COMMENT "Checking correct formatting according to .clang-format file using ${CLANG_FORMAT}"
-)
-
-add_custom_target(
-        clang-format-diff
-        COMMAND ${CLANG_FORMAT} -style=file -i ${ALL_SOURCE_FILES}
-        COMMAND git diff ${ALL_SOURCE_FILES}
-        COMMENT "Formatting with clang-format (using ${CLANG_FORMAT}) and showing differences with latest commit"
-)
diff --git a/builds/cmake/Modules/FindAsciiDoc.cmake b/builds/cmake/Modules/FindAsciiDoc.cmake
deleted file mode 100644
index 049ac0076..000000000
--- a/builds/cmake/Modules/FindAsciiDoc.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# - Find Asciidoc
-# this module looks for asciidoc and a2x
-#
-# ASCIIDOC_EXECUTABLE - the full path to asciidoc
-# ASCIIDOC_FOUND - If false, don't attempt to use asciidoc.
-# A2X_EXECUTABLE - the full path to a2x
-# A2X_FOUND - If false, don't attempt to use a2x.
-
-set (PROGRAMFILESX86 "PROGRAMFILES(X86)")
-
-find_program(ASCIIDOC_EXECUTABLE asciidoc asciidoc.py
-             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   "$ENV{PROGRAMW6432}/asciidoc"
-                   "$ENV{PROGRAMFILES}/asciidoc"
-                   "$ENV{${PROGRAMFILESX86}}/asciidoc")
-
-find_program(A2X_EXECUTABLE a2x
-             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   "$ENV{PROGRAMW6432}/asciidoc"
-                   "$ENV{PROGRAMFILES}/asciidoc"
-                   "$ENV{${PROGRAMFILESX86}}/asciidoc")
-
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_ARGS(AsciiDoc REQUIRED_VARS ASCIIDOC_EXECUTABLE)
-mark_as_advanced(ASCIIDOC_EXECUTABLE A2X_EXECUTABLE)
diff --git a/builds/cmake/Modules/FindNSS3.cmake b/builds/cmake/Modules/FindNSS3.cmake
deleted file mode 100644
index 9adb4db2b..000000000
--- a/builds/cmake/Modules/FindNSS3.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-if (NOT MSVC)
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(NSS3 "nss>=3.19")
-    find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LIBRARIES NSS3_CFLAGS)
-endif()
-
diff --git a/builds/cmake/Modules/FindSodium.cmake b/builds/cmake/Modules/FindSodium.cmake
deleted file mode 100644
index 9ec36d1da..000000000
--- a/builds/cmake/Modules/FindSodium.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-################################################################################
-#  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
-#  Please refer to the README for information about making permanent changes.  #
-################################################################################
-
-if (NOT MSVC)
-find_package(PkgConfig REQUIRED) 
-pkg_check_modules(PC_SODIUM "libsodium")
-if (PC_SODIUM_FOUND)
-  set(pkg_config_names_private "${pkg_config_names_private} libsodium")
-endif()
-if (NOT PC_SODIUM_FOUND)
-    pkg_check_modules(PC_SODIUM "sodium")
-    if (PC_SODIUM_FOUND)
-      set(pkg_config_names_private "${pkg_config_names_private} sodium")
-    endif()
-endif (NOT PC_SODIUM_FOUND)
-if (PC_SODIUM_FOUND)
-  set(SODIUM_INCLUDE_HINTS ${PC_SODIUM_INCLUDE_DIRS} ${PC_SODIUM_INCLUDE_DIRS}/*)
-  set(SODIUM_LIBRARY_HINTS ${PC_SODIUM_LIBRARY_DIRS} ${PC_SODIUM_LIBRARY_DIRS}/*)
-else()
-  set(pkg_config_libs_private "${pkg_config_libs_private} -lsodium")
-endif()
-endif (NOT MSVC)
-
-# some libraries install the headers is a subdirectory of the include dir
-# returned by pkg-config, so use a wildcard match to improve chances of finding
-# headers and libraries.
-find_path(
-    SODIUM_INCLUDE_DIRS
-    NAMES sodium.h
-    HINTS ${SODIUM_INCLUDE_HINTS}
-)
-
-find_library(
-    SODIUM_LIBRARIES
-    NAMES libsodium sodium
-    HINTS ${SODIUM_LIBRARY_HINTS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(sodium DEFAULT_MSG SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)
-mark_as_advanced(SODIUM_FOUND SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)
-
-################################################################################
-#  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
-#  Please refer to the README for information about making permanent changes.  #
-################################################################################
diff --git a/builds/cmake/Modules/TestZMQVersion.cmake b/builds/cmake/Modules/TestZMQVersion.cmake
deleted file mode 100644
index 49a3f3099..000000000
--- a/builds/cmake/Modules/TestZMQVersion.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-
-file(READ "${PROJECT_SOURCE_DIR}/include/zmq.h" _ZMQ_H_CONTENTS)
-string(REGEX REPLACE ".*#define ZMQ_VERSION_MAJOR ([0-9]+).*" "\\1" ZMQ_VERSION_MAJOR "${_ZMQ_H_CONTENTS}")
-string(REGEX REPLACE ".*#define ZMQ_VERSION_MINOR ([0-9]+).*" "\\1" ZMQ_VERSION_MINOR "${_ZMQ_H_CONTENTS}")
-string(REGEX REPLACE ".*#define ZMQ_VERSION_PATCH ([0-9]+).*" "\\1" ZMQ_VERSION_PATCH "${_ZMQ_H_CONTENTS}")
-set(ZMQ_VERSION "${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}")
-
-message(STATUS "Detected ZMQ Version - ${ZMQ_VERSION}")
diff --git a/builds/cmake/Modules/ZMQSourceRunChecks.cmake b/builds/cmake/Modules/ZMQSourceRunChecks.cmake
deleted file mode 100644
index 98c9e5de5..000000000
--- a/builds/cmake/Modules/ZMQSourceRunChecks.cmake
+++ /dev/null
@@ -1,313 +0,0 @@
-
-
-macro(zmq_check_sock_cloexec)
-  message(STATUS "Checking whether SOCK_CLOEXEC is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main(int argc, char *argv [])
-{
-    int s = socket(PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
-    return(s == -1);
-}
-"
-    ZMQ_HAVE_SOCK_CLOEXEC)
-endmacro()
-
-macro(zmq_check_efd_cloexec)
-  message(STATUS "Checking whether EFD_CLOEXEC is supported")
-  check_c_source_runs(
-    "
-#include <sys/eventfd.h>
-
-int main(int argc, char *argv [])
-{
-    int s = eventfd (0, EFD_CLOEXEC);
-    return(s == -1);
-}
-"
-    ZMQ_HAVE_EVENTFD_CLOEXEC)
-endmacro()
-
-macro(zmq_check_o_cloexec)
-  message(STATUS "Checking whether O_CLOEXEC is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-int main(int argc, char *argv [])
-{
-    int s = open (\"/dev/null\", O_CLOEXEC | O_RDONLY);
-    return s == -1;
-}
-"
-    ZMQ_HAVE_O_CLOEXEC)
-endmacro()
-
-macro(zmq_check_so_bindtodevice)
-  message(STATUS "Checking whether SO_BINDTODEVICE is supported")
-  check_c_source_runs(
-"
-#include <sys/socket.h>
-
-int main(int argc, char *argv [])
-{
-/* Actually making the setsockopt() call requires CAP_NET_RAW */
-#ifndef SO_BINDTODEVICE
-    return 1;
-#else
-    return 0;
-#endif
-}
-"
-    ZMQ_HAVE_SO_BINDTODEVICE)
-endmacro()
-
-# TCP keep-alives Checks.
-
-macro(zmq_check_so_keepalive)
-  message(STATUS "Checking whether SO_KEEPALIVE is supported")
-  check_c_source_runs(
-"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-"
-    ZMQ_HAVE_SO_KEEPALIVE)
-endmacro()
-
-macro(zmq_check_tcp_keepcnt)
-  message(STATUS "Checking whether TCP_KEEPCNT is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1) ||
-       ((rc = setsockopt(s, IPPROTO_TCP, TCP_KEEPCNT,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-"
-    ZMQ_HAVE_TCP_KEEPCNT)
-endmacro()
-
-macro(zmq_check_tcp_keepidle)
-  message(STATUS "Checking whether TCP_KEEPIDLE is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1) ||
-       ((rc = setsockopt(s, IPPROTO_TCP, TCP_KEEPIDLE,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-"
-    ZMQ_HAVE_TCP_KEEPIDLE)
-endmacro()
-
-
-macro(zmq_check_tcp_keepintvl)
-  message(STATUS "Checking whether TCP_KEEPINTVL is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1) ||
-       ((rc = setsockopt(s, IPPROTO_TCP, TCP_KEEPINTVL,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-
-"
-    ZMQ_HAVE_TCP_KEEPINTVL)
-endmacro()
-
-
-macro(zmq_check_tcp_keepalive)
-  message(STATUS "Checking whether TCP_KEEPALIVE is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1) ||
-       ((rc = setsockopt(s, IPPROTO_TCP, TCP_KEEPALIVE,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-"
-    ZMQ_HAVE_TCP_KEEPALIVE)
-endmacro()
-
-
-macro(zmq_check_tcp_tipc)
-  message(STATUS "Checking whether TIPC is supported")
-  check_c_source_runs(
-    "
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <linux/tipc.h>
-
-int main(int argc, char *argv [])
-{
-    struct sockaddr_tipc topsrv;
-    int sd = socket(AF_TIPC, SOCK_SEQPACKET, 0);
-    memset(&topsrv, 0, sizeof(topsrv));
-    topsrv.family = AF_TIPC;
-    topsrv.addrtype = TIPC_ADDR_NAME;
-    topsrv.addr.name.name.type = TIPC_TOP_SRV;
-    topsrv.addr.name.name.instance = TIPC_TOP_SRV;
-    fcntl(sd, F_SETFL, O_NONBLOCK);
-}
-"
-    ZMQ_HAVE_TIPC)
-endmacro()
-
-
-macro(zmq_check_pthread_setname)
-  message(STATUS "Checking pthread_setname signature")
-  set(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-D_GNU_SOURCE -Werror -pthread")
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    pthread_setname_np (\"foo\");
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SETNAME_1)
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    pthread_setname_np (pthread_self(), \"foo\");
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SETNAME_2)
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    pthread_setname_np (pthread_self(), \"foo\", (void *)0);
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SETNAME_3)
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    pthread_set_name_np (pthread_self(), \"foo\");
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SET_NAME)
-  set(CMAKE_REQUIRED_FLAGS ${SAVE_CMAKE_REQUIRED_FLAGS})
-endmacro()
-
-macro(zmq_check_pthread_setaffinity)
-  message(STATUS "Checking pthread_setaffinity signature")
-  set(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-D_GNU_SOURCE -Werror -pthread")
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    cpu_set_t test; 
-    pthread_setaffinity_np (pthread_self(), sizeof(cpu_set_t), &test);
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SET_AFFINITY)
-  set(CMAKE_REQUIRED_FLAGS ${SAVE_CMAKE_REQUIRED_FLAGS})
-endmacro()
-
-
-macro(zmq_check_getrandom)
-  message(STATUS "Checking whether getrandom is supported")
-  check_c_source_runs(
-    "
-#include <sys/random.h>
-
-int main (int argc, char *argv [])
-{
-    char buf[4];
-    int rc = getrandom(buf, 4, 0);
-    return rc == -1 ? 1 : 0;
-}
-"
-    ZMQ_HAVE_GETRANDOM)
-endmacro()
-
-macro(zmq_check_noexcept)
-  message(STATUS "Checking whether noexcept is supported")
-  check_cxx_source_compiles(
-"
-struct X 
-{
-    X(int i) noexcept {}
-};
-
-int main(int argc, char *argv [])
-{
-    X x(5);
-    return 0;
-}
-"
-    ZMQ_HAVE_NOEXCEPT)
-endmacro()
diff --git a/builds/cmake/Modules/ZMQSupportMacros.cmake b/builds/cmake/Modules/ZMQSupportMacros.cmake
deleted file mode 100644
index 5139015f8..000000000
--- a/builds/cmake/Modules/ZMQSupportMacros.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-macro (zmq_set_with_default var value)
-  if (NOT ${var})
-    set(${var} "${value}")
-  endif ()
-endmacro ()
diff --git a/builds/cmake/NSIS.template32.in b/builds/cmake/NSIS.template32.in
deleted file mode 100644
index bc6ab8d5e..000000000
--- a/builds/cmake/NSIS.template32.in
+++ /dev/null
@@ -1,952 +0,0 @@
-; CPack install script designed for a nmake build
-
-;--------------------------------
-; You must define these values
-
-  !define VERSION "@CPACK_PACKAGE_VERSION@"
-  !define PATCH  "@CPACK_PACKAGE_VERSION_PATCH@"
-  !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
-
-;--------------------------------
-;Variables
-
-  Var MUI_TEMP
-  Var STARTMENU_FOLDER
-  Var SV_ALLUSERS
-  Var START_MENU
-  Var DO_NOT_ADD_TO_PATH
-  Var ADD_TO_PATH_ALL_USERS
-  Var ADD_TO_PATH_CURRENT_USER
-  Var INSTALL_DESKTOP
-  Var IS_DEFAULT_INSTALLDIR
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI.nsh"
-
-  ;Default installation folder
-  InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-  ;InstallDir "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-;--------------------------------
-;General
-
-  ;Name and file
-  Name "@CPACK_NSIS_PACKAGE_NAME@"
-  OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
-
-  ;Set compression
-  SetCompressor @CPACK_NSIS_COMPRESSOR@
-
-@CPACK_NSIS_DEFINES@   
-
-  !include Sections.nsh
-
-;--- Component support macros: ---
-; The code for the add/remove functionality is from:
-;   http://nsis.sourceforge.net/Add/Remove_Functionality
-; It has been modified slightly and extended to provide
-; inter-component dependencies.
-Var AR_SecFlags
-Var AR_RegFlags
-@CPACK_NSIS_SECTION_SELECTED_VARS@
-
-; Loads the "selected" flag for the section named SecName into the
-; variable VarName.
-!macro LoadSectionSelectedIntoVar SecName VarName
- SectionGetFlags ${${SecName}} $${VarName}
- IntOp $${VarName} $${VarName} & ${SF_SELECTED}  ;Turn off all other bits
-!macroend
-
-; Loads the value of a variable... can we get around this?
-!macro LoadVar VarName
-  IntOp $R0 0 + $${VarName}
-!macroend
-
-; Sets the value of a variable
-!macro StoreVar VarName IntValue
-  IntOp $${VarName} 0 + ${IntValue}
-!macroend
-
-!macro InitSection SecName
-  ;  This macro reads component installed flag from the registry and
-  ;changes checked state of the section on the components page.
-  ;Input: section index constant name specified in Section command.
-   
-  ClearErrors
-  ;Reading component status from registry
-  ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" "Installed"
-  IfErrors "default_${SecName}"
-    ;Status will stay default if registry value not found
-    ;(component was never installed)
-  IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading default section flags
-  IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE  ;Turn lowest (enabled) bit off
-  IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags      ;Change lowest bit
-
-  ; Note whether this component was installed before
-  !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags
-  IntOp $R0 $AR_RegFlags & $AR_RegFlags
-  
-  ;Writing modified flags
-  SectionSetFlags ${${SecName}} $AR_SecFlags
-  
- "default_${SecName}:"
- !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-!macroend
- 
-!macro FinishSection SecName
-  ;  This macro reads section flag set by user and removes the section
-  ;if it is not selected.
-  ;Then it writes component installed flag to registry
-  ;Input: section index constant name specified in Section command.
- 
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading section flags
-  ;Checking lowest bit:
-  IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED}
-  IntCmp $AR_SecFlags 1 "leave_${SecName}"
-    ;Section is not selected:
-    ;Calling Section uninstall macro and writing zero installed flag
-    !insertmacro "Remove_${${SecName}}"
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
-  "Installed" 0
-    Goto "exit_${SecName}"
- 
- "leave_${SecName}:"
-    ;Section is selected:
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
-  "Installed" 1
- 
- "exit_${SecName}:"
-!macroend
- 
-!macro RemoveSection SecName
-  ;  This macro is used to call section's Remove_... macro
-  ;from the uninstaller.
-  ;Input: section index constant name specified in Section command.
- 
-  !insertmacro "Remove_${${SecName}}"
-!macroend
-
-; Determine whether the selection of SecName changed
-!macro MaybeSelectionChanged SecName
-  !insertmacro LoadVar ${SecName}_selected
-  SectionGetFlags ${${SecName}} $R1
-  IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits
-  
-  ; See if the status has changed:
-  IntCmp $R0 $R1 "${SecName}_unchanged"
-  !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-  
-  IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected"
-  !insertmacro "Deselect_required_by_${SecName}"
-  goto "${SecName}_unchanged"
-  
-  "${SecName}_was_selected:"
-  !insertmacro "Select_${SecName}_depends"
-  
-  "${SecName}_unchanged:"
-!macroend
-;--- End of Add/Remove macros ---
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_HEADERIMAGE
-  !define MUI_ABORTWARNING
-    
-;--------------------------------
-; path functions
-
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-
-;----------------------------------------
-; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02"
-;----------------------------------------
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-;====================================================
-; get_NT_environment 
-;     Returns: the selected environment
-;     Output : head of the stack
-;====================================================
-!macro select_NT_profile UN
-Function ${UN}select_NT_profile
-   StrCmp $ADD_TO_PATH_ALL_USERS "1" 0 environment_single
-      DetailPrint "Selected environment for all users"
-      Push "all"
-      Return
-   environment_single:
-      DetailPrint "Selected environment for current user only."
-      Push "current"
-      Return
-FunctionEnd
-!macroend
-!insertmacro select_NT_profile ""
-!insertmacro select_NT_profile "un."
-;----------------------------------------------------
-!define NT_current_env 'HKCU "Environment"'
-!define NT_all_env     'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-
-!ifndef WriteEnvStr_RegKey
-  !ifdef ALL_USERS
-    !define WriteEnvStr_RegKey \
-       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-  !else
-    !define WriteEnvStr_RegKey 'HKCU "Environment"'
-  !endif
-!endif
- 
-; AddToPath - Adds the given dir to the search path.
-;        Input - head of the stack
-;        Note - Win9x systems requires reboot
- 
-Function AddToPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
- 
-  # don't add if the path doesn't exist
-  IfFileExists "$0\*.*" "" AddToPath_done
- 
-  ReadEnvStr $1 PATH
-  ; if the path is too long for a NSIS variable NSIS will return a 0 
-  ; length string.  If we find that, then warn and skip any path
-  ; modification as it will trash the existing path.
-  StrLen $2 $1
-  IntCmp $2 0 CheckPathLength_ShowPathWarning CheckPathLength_Done CheckPathLength_Done
-    CheckPathLength_ShowPathWarning:
-    Messagebox MB_OK|MB_ICONEXCLAMATION "Warning! PATH too long installer unable to modify PATH!"
-    Goto AddToPath_done
-  CheckPathLength_Done:
-  Push "$1;"
-  Push "$0;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$0\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  GetFullPathName /SHORT $3 $0
-  Push "$1;"
-  Push "$3;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$3\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
- 
-  Call IsNT
-  Pop $1
-  StrCmp $1 1 AddToPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" a
-    FileSeek $1 -1 END
-    FileReadByte $1 $2
-    IntCmp $2 26 0 +2 +2 # DOS EOF
-      FileSeek $1 -1 END # write over EOF
-    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
-    FileClose $1
-    SetRebootFlag true
-    Goto AddToPath_done
- 
-  AddToPath_NT:
-    StrCmp $ADD_TO_PATH_ALL_USERS "1" ReadAllKey
-      ReadRegStr $1 ${NT_current_env} "PATH"
-      Goto DoTrim
-    ReadAllKey:
-      ReadRegStr $1 ${NT_all_env} "PATH"
-    DoTrim:
-    StrCmp $1 "" AddToPath_NTdoIt
-      Push $1
-      Call Trim
-      Pop $1
-      StrCpy $0 "$1;$0"
-    AddToPath_NTdoIt:
-      StrCmp $ADD_TO_PATH_ALL_USERS "1" WriteAllKey
-        WriteRegExpandStr ${NT_current_env} "PATH" $0
-        Goto DoSend
-      WriteAllKey:
-        WriteRegExpandStr ${NT_all_env} "PATH" $0
-      DoSend:
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  AddToPath_done:
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
- 
-; RemoveFromPath - Remove a given dir from the path
-;     Input: head of the stack
- 
-Function un.RemoveFromPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
- 
-  IntFmt $6 "%c" 26 # DOS EOF
- 
-  Call un.IsNT
-  Pop $1
-  StrCmp $1 1 unRemoveFromPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" r
-    GetTempFileName $4
-    FileOpen $2 $4 w
-    GetFullPathName /SHORT $0 $0
-    StrCpy $0 "SET PATH=%PATH%;$0"
-    Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoop:
-      FileRead $1 $3
-      StrCpy $5 $3 1 -1 # read last char
-      StrCmp $5 $6 0 +2 # if DOS EOF
-        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
-      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
-      FileWrite $2 $3
-      Goto unRemoveFromPath_dosLoop
-      unRemoveFromPath_dosLoopRemoveLine:
-        SetRebootFlag true
-        Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoopEnd:
-      FileClose $2
-      FileClose $1
-      StrCpy $1 $WINDIR 2
-      Delete "$1\autoexec.bat"
-      CopyFiles /SILENT $4 "$1\autoexec.bat"
-      Delete $4
-      Goto unRemoveFromPath_done
- 
-  unRemoveFromPath_NT:
-    StrCmp $ADD_TO_PATH_ALL_USERS "1" unReadAllKey
-      ReadRegStr $1 ${NT_current_env} "PATH"
-      Goto unDoTrim
-    unReadAllKey:
-      ReadRegStr $1 ${NT_all_env} "PATH"
-    unDoTrim:
-    StrCpy $5 $1 1 -1 # copy last char
-    StrCmp $5 ";" +2 # if last char != ;
-      StrCpy $1 "$1;" # append ;
-    Push $1
-    Push "$0;"
-    Call un.StrStr ; Find `$0;` in $1
-    Pop $2 ; pos of our dir
-    StrCmp $2 "" unRemoveFromPath_done
-      ; else, it is in path
-      # $0 - path to add
-      # $1 - path var
-      StrLen $3 "$0;"
-      StrLen $4 $2
-      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
-      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
-      StrCpy $3 $5$6
- 
-      StrCpy $5 $3 1 -1 # copy last char
-      StrCmp $5 ";" 0 +2 # if last char == ;
-        StrCpy $3 $3 -1 # remove last char
- 
-      StrCmp $ADD_TO_PATH_ALL_USERS "1" unWriteAllKey
-        WriteRegExpandStr ${NT_current_env} "PATH" $3
-        Goto unDoSend
-      unWriteAllKey:
-        WriteRegExpandStr ${NT_all_env} "PATH" $3
-      unDoSend:
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  unRemoveFromPath_done:
-    Pop $6
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
- 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-###########################################
-#            Utility Functions            #
-###########################################
- 
-;====================================================
-; IsNT - Returns 1 if the current system is NT, 0
-;        otherwise.
-;     Output: head of the stack
-;====================================================
-; IsNT
-; no input
-; output, top of the stack = 1 if NT or 0 if not
-;
-; Usage:
-;   Call IsNT
-;   Pop $R0
-;  ($R0 at this point is 1 or 0)
- 
-!macro IsNT un
-Function ${un}IsNT
-  Push $0
-  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  StrCmp $0 "" 0 IsNT_yes
-  ; we are not NT.
-  Pop $0
-  Push 0
-  Return
- 
-  IsNT_yes:
-    ; NT!!!
-    Pop $0
-    Push 1
-FunctionEnd
-!macroend
-!insertmacro IsNT ""
-!insertmacro IsNT "un."
- 
-; StrStr
-; input, top of stack = string to search for
-;        top of stack-1 = string to search in
-; output, top of stack (replaces with the portion of the string remaining)
-; modifies no other variables.
-;
-; Usage:
-;   Push "this is a long ass string"
-;   Push "ass"
-;   Call StrStr
-;   Pop $R0
-;  ($R0 at this point is "ass string")
- 
-!macro StrStr un
-Function ${un}StrStr
-Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
-  loop:
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 done
-    StrCmp $R5 "" done
-    IntOp $R4 $R4 + 1
-    Goto loop
-done:
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-FunctionEnd
-!macroend
-!insertmacro StrStr ""
-!insertmacro StrStr "un."
-
-Function Trim ; Added by Pelaca
-	Exch $R1
-	Push $R2
-Loop:
-	StrCpy $R2 "$R1" 1 -1
-	StrCmp "$R2" " " RTrim
-	StrCmp "$R2" "$\n" RTrim
-	StrCmp "$R2" "$\r" RTrim
-	StrCmp "$R2" ";" RTrim
-	GoTo Done
-RTrim:	
-	StrCpy $R1 "$R1" -1
-	Goto Loop
-Done:
-	Pop $R2
-	Exch $R1
-FunctionEnd
-
-Function ConditionalAddToRegisty
-  Pop $0
-  Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
-    WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
-    "$1" "$0"
-    ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
-    DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
-FunctionEnd
-
-;--------------------------------
-
-!ifdef CPACK_USES_DOWNLOAD
-Function DownloadFile
-    IfFileExists $INSTDIR\* +2
-    CreateDirectory $INSTDIR
-    Pop $0
-
-    ; Skip if already downloaded
-    IfFileExists $INSTDIR\$0 0 +2
-    Return
-
-    StrCpy $1 "@CPACK_DOWNLOAD_SITE@"
-
-  try_again:
-    NSISdl::download "$1/$0" "$INSTDIR\$0"
-    
-    Pop $1
-    StrCmp $1 "success" success
-    StrCmp $1 "Cancelled" cancel
-    MessageBox MB_OK "Download failed: $1"
-  cancel:
-    Return
-  success:
-FunctionEnd
-!endif
-
-;--------------------------------
-; Installation types
-@CPACK_NSIS_INSTALLATION_TYPES@
-
-;--------------------------------
-; Component sections
-@CPACK_NSIS_COMPONENT_SECTIONS@
-
-;--------------------------------
-; Define some macro setting for the gui
-@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
-@CPACK_NSIS_INSTALLER_ICON_CODE@
-@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
-
-;--------------------------------
-;Pages
-  !insertmacro MUI_PAGE_WELCOME
-
-  !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
-  Page custom InstallOptionsPage
-  !insertmacro MUI_PAGE_DIRECTORY
-  
-  ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" 
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" 
-  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"
-
-  @CPACK_NSIS_PAGE_COMPONENTS@
-
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_PAGE_FINISH
-
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-  !insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
-  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
-  !insertmacro MUI_LANGUAGE "Albanian"
-  !insertmacro MUI_LANGUAGE "Arabic"
-  !insertmacro MUI_LANGUAGE "Basque"
-  !insertmacro MUI_LANGUAGE "Belarusian"
-  !insertmacro MUI_LANGUAGE "Bosnian"
-  !insertmacro MUI_LANGUAGE "Breton"
-  !insertmacro MUI_LANGUAGE "Bulgarian"
-  !insertmacro MUI_LANGUAGE "Croatian"
-  !insertmacro MUI_LANGUAGE "Czech"
-  !insertmacro MUI_LANGUAGE "Danish"
-  !insertmacro MUI_LANGUAGE "Dutch"
-  !insertmacro MUI_LANGUAGE "Estonian"
-  !insertmacro MUI_LANGUAGE "Farsi"
-  !insertmacro MUI_LANGUAGE "Finnish"
-  !insertmacro MUI_LANGUAGE "French"
-  !insertmacro MUI_LANGUAGE "German"
-  !insertmacro MUI_LANGUAGE "Greek"
-  !insertmacro MUI_LANGUAGE "Hebrew"
-  !insertmacro MUI_LANGUAGE "Hungarian"
-  !insertmacro MUI_LANGUAGE "Icelandic"
-  !insertmacro MUI_LANGUAGE "Indonesian"
-  !insertmacro MUI_LANGUAGE "Irish"
-  !insertmacro MUI_LANGUAGE "Italian"
-  !insertmacro MUI_LANGUAGE "Japanese"
-  !insertmacro MUI_LANGUAGE "Korean"
-  !insertmacro MUI_LANGUAGE "Kurdish"
-  !insertmacro MUI_LANGUAGE "Latvian"
-  !insertmacro MUI_LANGUAGE "Lithuanian"
-  !insertmacro MUI_LANGUAGE "Luxembourgish"
-  !insertmacro MUI_LANGUAGE "Macedonian"
-  !insertmacro MUI_LANGUAGE "Malay"
-  !insertmacro MUI_LANGUAGE "Mongolian"
-  !insertmacro MUI_LANGUAGE "Norwegian"
-  !insertmacro MUI_LANGUAGE "Polish"
-  !insertmacro MUI_LANGUAGE "Portuguese"
-  !insertmacro MUI_LANGUAGE "PortugueseBR"
-  !insertmacro MUI_LANGUAGE "Romanian"
-  !insertmacro MUI_LANGUAGE "Russian"
-  !insertmacro MUI_LANGUAGE "Serbian"
-  !insertmacro MUI_LANGUAGE "SerbianLatin"
-  !insertmacro MUI_LANGUAGE "SimpChinese"
-  !insertmacro MUI_LANGUAGE "Slovak"
-  !insertmacro MUI_LANGUAGE "Slovenian"
-  !insertmacro MUI_LANGUAGE "Spanish"
-  !insertmacro MUI_LANGUAGE "Swedish"
-  !insertmacro MUI_LANGUAGE "Thai"
-  !insertmacro MUI_LANGUAGE "TradChinese"
-  !insertmacro MUI_LANGUAGE "Turkish"
-  !insertmacro MUI_LANGUAGE "Ukrainian"
-  !insertmacro MUI_LANGUAGE "Welsh"
-
-
-;--------------------------------
-;Reserve Files
-
-  ;These files should be inserted before other files in the data block
-  ;Keep these lines before any File command
-  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
-
-  ReserveFile "NSIS.InstallOptions.ini"
-  !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-
-;--------------------------------
-;Installer Sections
-
-Section "-Core installation"
-  ;Use the entire tree produced by the INSTALL target.  Keep the
-  ;list of directories here in sync with the RMDir commands below.
-  SetOutPath "$INSTDIR"
-  @CPACK_NSIS_FULL_INSTALL@
-  
-  ;Store installation folder
-  WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
-  
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  Push "DisplayName"
-  Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
-  Push "DisplayVersion"
-  Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
-  Push "Publisher"
-  Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
-  Push "UninstallString"
-  Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
-  Push "NoRepair"
-  Push "1"
-  Call ConditionalAddToRegisty
-  
-  !ifdef CPACK_NSIS_ADD_REMOVE
-  ;Create add/remove functionality
-  Push "ModifyPath"
-  Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
-  !else
-  Push "NoModify"
-  Push "1"
-  Call ConditionalAddToRegisty
-  !endif
-  
-  ; Optional registration
-  Push "DisplayIcon"
-  Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
-  Push "HelpLink"
-  Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
-  Push "URLInfoAbout"
-  Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
-  Push "Contact"
-  Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
-  !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State"
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-  
-  ;Create shortcuts
-  CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-@CPACK_NSIS_CREATE_ICONS@
-@CPACK_NSIS_CREATE_ICONS_EXTRA@
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-
-  ;Read a value from an InstallOptions INI file
-  !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS "NSIS.InstallOptions.ini" "Field 3" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_CURRENT_USER "NSIS.InstallOptions.ini" "Field 4" "State"
-
-  ; Write special uninstall registry entries
-  Push "StartMenu"
-  Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
-  Push "DoNotAddToPath"
-  Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
-  Push "AddToPathAllUsers"
-  Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
-  Push "AddToPathCurrentUser"
-  Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
-  Push "InstallToDesktop"
-  Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
-
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
-
-SectionEnd
-
-Section "-Add to path"
-  Push $INSTDIR\bin
-  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath
-  StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0  
-    Call AddToPath
-  doNotAddToPath:
-SectionEnd
-
-;--------------------------------
-; Create custom pages
-Function InstallOptionsPage
-  !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_PACKAGE_NAME@"
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
-
-FunctionEnd
-
-;--------------------------------
-; determine admin versus local install
-Function un.onInit
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    Goto done
-    
-  noLM:
-    ;Get installation folder from registry if available
-
-  done:
-    
-FunctionEnd
-
-;--- Add/Remove callback functions: ---
-!macro SectionList MacroName
-  ;This macro used to perform operation on multiple sections.
-  ;List all of your components in following manner here.
-@CPACK_NSIS_COMPONENT_SECTION_LIST@
-!macroend
- 
-Section -FinishComponents
-  ;Removes unselected components and writes component status to registry
-  !insertmacro SectionList "FinishSection"
-  
-!ifdef CPACK_NSIS_ADD_REMOVE  
-  ; Get the name of the installer executable
-  System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1'
-  StrCpy $R3 $R0
-  
-  ; Strip off the last 13 characters, to see if we have AddRemove.exe
-  StrLen $R1 $R0
-  IntOp $R1 $R0 - 13
-  StrCpy $R2 $R0 13 $R1
-  StrCmp $R2 "AddRemove.exe" addremove_installed
-  
-  ; We're not running AddRemove.exe, so install it
-  CopyFiles $R3 $INSTDIR\AddRemove.exe
-  
-  addremove_installed:
-!endif
-SectionEnd
-;--- End of Add/Remove callback functions ---
-
-;--------------------------------
-; Component dependencies
-Function .onSelChange
-  !insertmacro SectionList MaybeSelectionChanged
-FunctionEnd
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-  ReadRegStr $START_MENU SHCTX \
-   "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "StartMenu"
-  ;MessageBox MB_OK "Start menu is in: $START_MENU"
-  ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "DoNotAddToPath"
-  ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathAllUsers"
-  ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathCurrentUser"
-  ;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
-  ReadRegStr $INSTALL_DESKTOP SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "InstallToDesktop"
-  ;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
-
-@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
-
-  ;Remove files we installed.
-  ;Keep the list of directories here in sync with the File commands above.
-@CPACK_NSIS_DELETE_FILES@
-@CPACK_NSIS_DELETE_DIRECTORIES@
-
-!ifdef CPACK_NSIS_ADD_REMOVE  
-  ;Remove the add/remove program
-  Delete "$INSTDIR\AddRemove.exe"
-!endif
-
-  ;Remove the uninstaller itself.
-  Delete "$INSTDIR\Uninstall.exe"
-  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@"
-
-  ;Remove the installation directory if it is empty.
-  RMDir "$INSTDIR"
-
-  ; Remove the registry entries.
-  DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
-  
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-    
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-@CPACK_NSIS_DELETE_ICONS@
-@CPACK_NSIS_DELETE_ICONS_EXTRA@
-  
-  ;Delete empty start menu parent diretories
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-  startMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-    
-    IfErrors startMenuDeleteLoopDone
-  
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
-  startMenuDeleteLoopDone:
-
-  ; If the user changed the shortcut, then untinstall may not work. This should
-  ; try to fix it.
-  StrCpy $MUI_TEMP "$START_MENU"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-@CPACK_NSIS_DELETE_ICONS_EXTRA@
-  
-  ;Delete empty start menu parent diretories
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-  secondStartMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-    
-    IfErrors secondStartMenuDeleteLoopDone
-  
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" secondStartMenuDeleteLoopDone secondStartMenuDeleteLoop
-  secondStartMenuDeleteLoopDone:
-
-  DeleteRegKey /ifempty SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  Push $INSTDIR\bin
-  StrCmp $DO_NOT_ADD_TO_PATH_ "1" doNotRemoveFromPath 0
-    Call un.RemoveFromPath
-  doNotRemoveFromPath:
-SectionEnd
-
-;--------------------------------
-; determine admin versus local install
-; Is install for "AllUsers" or "JustMe"?
-; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
-; This function is used for the very first "custom page" of the installer.
-; This custom page does not show up visibly, but it executes prior to the
-; first visible page and sets up $INSTDIR properly...
-; Choose different default installation folder based on SV_ALLUSERS...
-; "Program Files" for AllUsers, "My Documents" for JustMe...
-
-Function .onInit
-  ; Reads components status for registry
-  !insertmacro SectionList "InitSection"
-
-  ; check to see if /D has been used to change 
-  ; the install directory by comparing it to the 
-  ; install directory that is expected to be the
-  ; default
-  StrCpy $IS_DEFAULT_INSTALLDIR 0
-  StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
-    StrCpy $IS_DEFAULT_INSTALLDIR 1
-  
-  StrCpy $SV_ALLUSERS "JustMe"
-  ; if default install dir then change the default
-  ; if it is installed for JustMe
-  StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-    StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-    
-  noLM:
-    StrCpy $SV_ALLUSERS "AllUsers"
-    ;Get installation folder from registry if available
-
-  done:
-  StrCmp $SV_ALLUSERS "AllUsers" 0 +3
-    StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-      StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
-    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
-
-  noOptionsPage:
-FunctionEnd
diff --git a/builds/cmake/NSIS.template64.in b/builds/cmake/NSIS.template64.in
deleted file mode 100644
index 2deaa4ec1..000000000
--- a/builds/cmake/NSIS.template64.in
+++ /dev/null
@@ -1,960 +0,0 @@
-; CPack install script designed for a nmake build
-
-;--------------------------------
-; You must define these values
-
-  !define VERSION "@CPACK_PACKAGE_VERSION@"
-  !define PATCH  "@CPACK_PACKAGE_VERSION_PATCH@"
-  !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
-
-;--------------------------------
-;Variables
-
-  Var MUI_TEMP
-  Var STARTMENU_FOLDER
-  Var SV_ALLUSERS
-  Var START_MENU
-  Var DO_NOT_ADD_TO_PATH
-  Var ADD_TO_PATH_ALL_USERS
-  Var ADD_TO_PATH_CURRENT_USER
-  Var INSTALL_DESKTOP
-  Var IS_DEFAULT_INSTALLDIR
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI.nsh"
-
-  ;Default installation folder
-  ;InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-  InstallDir "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-;--------------------------------
-;General
-
-  ;Name and file
-  Name "@CPACK_NSIS_PACKAGE_NAME@"
-  OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
-
-  ;Set compression
-  SetCompressor @CPACK_NSIS_COMPRESSOR@
-
-@CPACK_NSIS_DEFINES@   
-
-  !include Sections.nsh
-
-;--- Component support macros: ---
-; The code for the add/remove functionality is from:
-;   http://nsis.sourceforge.net/Add/Remove_Functionality
-; It has been modified slightly and extended to provide
-; inter-component dependencies.
-Var AR_SecFlags
-Var AR_RegFlags
-@CPACK_NSIS_SECTION_SELECTED_VARS@
-
-; Loads the "selected" flag for the section named SecName into the
-; variable VarName.
-!macro LoadSectionSelectedIntoVar SecName VarName
- SectionGetFlags ${${SecName}} $${VarName}
- IntOp $${VarName} $${VarName} & ${SF_SELECTED}  ;Turn off all other bits
-!macroend
-
-; Loads the value of a variable... can we get around this?
-!macro LoadVar VarName
-  IntOp $R0 0 + $${VarName}
-!macroend
-
-; Sets the value of a variable
-!macro StoreVar VarName IntValue
-  IntOp $${VarName} 0 + ${IntValue}
-!macroend
-
-!macro InitSection SecName
-  ;  This macro reads component installed flag from the registry and
-  ;changes checked state of the section on the components page.
-  ;Input: section index constant name specified in Section command.
-   
-  ClearErrors
-  ;Reading component status from registry
-  ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)\Components\${SecName}" "Installed"
-  IfErrors "default_${SecName}"
-    ;Status will stay default if registry value not found
-    ;(component was never installed)
-  IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading default section flags
-  IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE  ;Turn lowest (enabled) bit off
-  IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags      ;Change lowest bit
-
-  ; Note whether this component was installed before
-  !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags
-  IntOp $R0 $AR_RegFlags & $AR_RegFlags
-  
-  ;Writing modified flags
-  SectionSetFlags ${${SecName}} $AR_SecFlags
-  
- "default_${SecName}:"
- !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-!macroend
- 
-!macro FinishSection SecName
-  ;  This macro reads section flag set by user and removes the section
-  ;if it is not selected.
-  ;Then it writes component installed flag to registry
-  ;Input: section index constant name specified in Section command.
- 
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading section flags
-  ;Checking lowest bit:
-  IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED}
-  IntCmp $AR_SecFlags 1 "leave_${SecName}"
-    ;Section is not selected:
-    ;Calling Section uninstall macro and writing zero installed flag
-    !insertmacro "Remove_${${SecName}}"
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)\Components\${SecName}" \
-  "Installed" 0
-    Goto "exit_${SecName}"
- 
- "leave_${SecName}:"
-    ;Section is selected:
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)\Components\${SecName}" \
-  "Installed" 1
- 
- "exit_${SecName}:"
-!macroend
- 
-!macro RemoveSection SecName
-  ;  This macro is used to call section's Remove_... macro
-  ;from the uninstaller.
-  ;Input: section index constant name specified in Section command.
- 
-  !insertmacro "Remove_${${SecName}}"
-!macroend
-
-; Determine whether the selection of SecName changed
-!macro MaybeSelectionChanged SecName
-  !insertmacro LoadVar ${SecName}_selected
-  SectionGetFlags ${${SecName}} $R1
-  IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits
-  
-  ; See if the status has changed:
-  IntCmp $R0 $R1 "${SecName}_unchanged"
-  !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-  
-  IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected"
-  !insertmacro "Deselect_required_by_${SecName}"
-  goto "${SecName}_unchanged"
-  
-  "${SecName}_was_selected:"
-  !insertmacro "Select_${SecName}_depends"
-  
-  "${SecName}_unchanged:"
-!macroend
-;--- End of Add/Remove macros ---
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_HEADERIMAGE
-  !define MUI_ABORTWARNING
-    
-;--------------------------------
-; path functions
-
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-
-;----------------------------------------
-; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02"
-;----------------------------------------
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-;====================================================
-; get_NT_environment 
-;     Returns: the selected environment
-;     Output : head of the stack
-;====================================================
-!macro select_NT_profile UN
-Function ${UN}select_NT_profile
-   StrCmp $ADD_TO_PATH_ALL_USERS "1" 0 environment_single
-      DetailPrint "Selected environment for all users"
-      Push "all"
-      Return
-   environment_single:
-      DetailPrint "Selected environment for current user only."
-      Push "current"
-      Return
-FunctionEnd
-!macroend
-!insertmacro select_NT_profile ""
-!insertmacro select_NT_profile "un."
-;----------------------------------------------------
-!define NT_current_env 'HKCU "Environment"'
-!define NT_all_env     'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-
-!ifndef WriteEnvStr_RegKey
-  !ifdef ALL_USERS
-    !define WriteEnvStr_RegKey \
-       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-  !else
-    !define WriteEnvStr_RegKey 'HKCU "Environment"'
-  !endif
-!endif
- 
-; AddToPath - Adds the given dir to the search path.
-;        Input - head of the stack
-;        Note - Win9x systems requires reboot
- 
-Function AddToPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
- 
-  # don't add if the path doesn't exist
-  IfFileExists "$0\*.*" "" AddToPath_done
- 
-  ReadEnvStr $1 PATH
-  ; if the path is too long for a NSIS variable NSIS will return a 0 
-  ; length string.  If we find that, then warn and skip any path
-  ; modification as it will trash the existing path.
-  StrLen $2 $1
-  IntCmp $2 0 CheckPathLength_ShowPathWarning CheckPathLength_Done CheckPathLength_Done
-    CheckPathLength_ShowPathWarning:
-    Messagebox MB_OK|MB_ICONEXCLAMATION "Warning! PATH too long installer unable to modify PATH!"
-    Goto AddToPath_done
-  CheckPathLength_Done:
-  Push "$1;"
-  Push "$0;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$0\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  GetFullPathName /SHORT $3 $0
-  Push "$1;"
-  Push "$3;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$3\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
- 
-  Call IsNT
-  Pop $1
-  StrCmp $1 1 AddToPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" a
-    FileSeek $1 -1 END
-    FileReadByte $1 $2
-    IntCmp $2 26 0 +2 +2 # DOS EOF
-      FileSeek $1 -1 END # write over EOF
-    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
-    FileClose $1
-    SetRebootFlag true
-    Goto AddToPath_done
- 
-  AddToPath_NT:
-    StrCmp $ADD_TO_PATH_ALL_USERS "1" ReadAllKey
-      ReadRegStr $1 ${NT_current_env} "PATH"
-      Goto DoTrim
-    ReadAllKey:
-      ReadRegStr $1 ${NT_all_env} "PATH"
-    DoTrim:
-    StrCmp $1 "" AddToPath_NTdoIt
-      Push $1
-      Call Trim
-      Pop $1
-      StrCpy $0 "$1;$0"
-    AddToPath_NTdoIt:
-      StrCmp $ADD_TO_PATH_ALL_USERS "1" WriteAllKey
-        WriteRegExpandStr ${NT_current_env} "PATH" $0
-        Goto DoSend
-      WriteAllKey:
-        WriteRegExpandStr ${NT_all_env} "PATH" $0
-      DoSend:
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  AddToPath_done:
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
- 
-; RemoveFromPath - Remove a given dir from the path
-;     Input: head of the stack
- 
-Function un.RemoveFromPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
- 
-  IntFmt $6 "%c" 26 # DOS EOF
- 
-  Call un.IsNT
-  Pop $1
-  StrCmp $1 1 unRemoveFromPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" r
-    GetTempFileName $4
-    FileOpen $2 $4 w
-    GetFullPathName /SHORT $0 $0
-    StrCpy $0 "SET PATH=%PATH%;$0"
-    Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoop:
-      FileRead $1 $3
-      StrCpy $5 $3 1 -1 # read last char
-      StrCmp $5 $6 0 +2 # if DOS EOF
-        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
-      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
-      FileWrite $2 $3
-      Goto unRemoveFromPath_dosLoop
-      unRemoveFromPath_dosLoopRemoveLine:
-        SetRebootFlag true
-        Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoopEnd:
-      FileClose $2
-      FileClose $1
-      StrCpy $1 $WINDIR 2
-      Delete "$1\autoexec.bat"
-      CopyFiles /SILENT $4 "$1\autoexec.bat"
-      Delete $4
-      Goto unRemoveFromPath_done
- 
-  unRemoveFromPath_NT:
-    StrCmp $ADD_TO_PATH_ALL_USERS "1" unReadAllKey
-      ReadRegStr $1 ${NT_current_env} "PATH"
-      Goto unDoTrim
-    unReadAllKey:
-      ReadRegStr $1 ${NT_all_env} "PATH"
-    unDoTrim:
-    StrCpy $5 $1 1 -1 # copy last char
-    StrCmp $5 ";" +2 # if last char != ;
-      StrCpy $1 "$1;" # append ;
-    Push $1
-    Push "$0;"
-    Call un.StrStr ; Find `$0;` in $1
-    Pop $2 ; pos of our dir
-    StrCmp $2 "" unRemoveFromPath_done
-      ; else, it is in path
-      # $0 - path to add
-      # $1 - path var
-      StrLen $3 "$0;"
-      StrLen $4 $2
-      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
-      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
-      StrCpy $3 $5$6
- 
-      StrCpy $5 $3 1 -1 # copy last char
-      StrCmp $5 ";" 0 +2 # if last char == ;
-        StrCpy $3 $3 -1 # remove last char
- 
-      StrCmp $ADD_TO_PATH_ALL_USERS "1" unWriteAllKey
-        WriteRegExpandStr ${NT_current_env} "PATH" $3
-        Goto unDoSend
-      unWriteAllKey:
-        WriteRegExpandStr ${NT_all_env} "PATH" $3
-      unDoSend:
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  unRemoveFromPath_done:
-    Pop $6
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
- 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-###########################################
-#            Utility Functions            #
-###########################################
- 
-;====================================================
-; IsNT - Returns 1 if the current system is NT, 0
-;        otherwise.
-;     Output: head of the stack
-;====================================================
-; IsNT
-; no input
-; output, top of the stack = 1 if NT or 0 if not
-;
-; Usage:
-;   Call IsNT
-;   Pop $R0
-;  ($R0 at this point is 1 or 0)
- 
-!macro IsNT un
-Function ${un}IsNT
-  Push $0
-  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  StrCmp $0 "" 0 IsNT_yes
-  ; we are not NT.
-  Pop $0
-  Push 0
-  Return
- 
-  IsNT_yes:
-    ; NT!!!
-    Pop $0
-    Push 1
-FunctionEnd
-!macroend
-!insertmacro IsNT ""
-!insertmacro IsNT "un."
- 
-; StrStr
-; input, top of stack = string to search for
-;        top of stack-1 = string to search in
-; output, top of stack (replaces with the portion of the string remaining)
-; modifies no other variables.
-;
-; Usage:
-;   Push "this is a long ass string"
-;   Push "ass"
-;   Call StrStr
-;   Pop $R0
-;  ($R0 at this point is "ass string")
- 
-!macro StrStr un
-Function ${un}StrStr
-Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
-  loop:
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 done
-    StrCmp $R5 "" done
-    IntOp $R4 $R4 + 1
-    Goto loop
-done:
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-FunctionEnd
-!macroend
-!insertmacro StrStr ""
-!insertmacro StrStr "un."
-
-Function Trim ; Added by Pelaca
-	Exch $R1
-	Push $R2
-Loop:
-	StrCpy $R2 "$R1" 1 -1
-	StrCmp "$R2" " " RTrim
-	StrCmp "$R2" "$\n" RTrim
-	StrCmp "$R2" "$\r" RTrim
-	StrCmp "$R2" ";" RTrim
-	GoTo Done
-RTrim:	
-	StrCpy $R1 "$R1" -1
-	Goto Loop
-Done:
-	Pop $R2
-	Exch $R1
-FunctionEnd
-
-Function ConditionalAddToRegisty
-  Pop $0
-  Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
-    WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" \
-    "$1" "$0"
-    ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
-    DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
-FunctionEnd
-
-;--------------------------------
-
-!ifdef CPACK_USES_DOWNLOAD
-Function DownloadFile
-    IfFileExists $INSTDIR\* +2
-    CreateDirectory $INSTDIR
-    Pop $0
-
-    ; Skip if already downloaded
-    IfFileExists $INSTDIR\$0 0 +2
-    Return
-
-    StrCpy $1 "@CPACK_DOWNLOAD_SITE@"
-
-  try_again:
-    NSISdl::download "$1/$0" "$INSTDIR\$0"
-    
-    Pop $1
-    StrCmp $1 "success" success
-    StrCmp $1 "Cancelled" cancel
-    MessageBox MB_OK "Download failed: $1"
-  cancel:
-    Return
-  success:
-FunctionEnd
-!endif
-
-;--------------------------------
-; Installation types
-@CPACK_NSIS_INSTALLATION_TYPES@
-
-;--------------------------------
-; Component sections
-@CPACK_NSIS_COMPONENT_SECTIONS@
-
-;--------------------------------
-; Define some macro setting for the gui
-@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
-@CPACK_NSIS_INSTALLER_ICON_CODE@
-@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
-
-;--------------------------------
-;Pages
-  !insertmacro MUI_PAGE_WELCOME
-
-  !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
-  Page custom InstallOptionsPage
-  !insertmacro MUI_PAGE_DIRECTORY
-  
-  ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" 
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" 
-  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"
-
-  @CPACK_NSIS_PAGE_COMPONENTS@
-
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_PAGE_FINISH
-
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-  !insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
-  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
-  !insertmacro MUI_LANGUAGE "Albanian"
-  !insertmacro MUI_LANGUAGE "Arabic"
-  !insertmacro MUI_LANGUAGE "Basque"
-  !insertmacro MUI_LANGUAGE "Belarusian"
-  !insertmacro MUI_LANGUAGE "Bosnian"
-  !insertmacro MUI_LANGUAGE "Breton"
-  !insertmacro MUI_LANGUAGE "Bulgarian"
-  !insertmacro MUI_LANGUAGE "Croatian"
-  !insertmacro MUI_LANGUAGE "Czech"
-  !insertmacro MUI_LANGUAGE "Danish"
-  !insertmacro MUI_LANGUAGE "Dutch"
-  !insertmacro MUI_LANGUAGE "Estonian"
-  !insertmacro MUI_LANGUAGE "Farsi"
-  !insertmacro MUI_LANGUAGE "Finnish"
-  !insertmacro MUI_LANGUAGE "French"
-  !insertmacro MUI_LANGUAGE "German"
-  !insertmacro MUI_LANGUAGE "Greek"
-  !insertmacro MUI_LANGUAGE "Hebrew"
-  !insertmacro MUI_LANGUAGE "Hungarian"
-  !insertmacro MUI_LANGUAGE "Icelandic"
-  !insertmacro MUI_LANGUAGE "Indonesian"
-  !insertmacro MUI_LANGUAGE "Irish"
-  !insertmacro MUI_LANGUAGE "Italian"
-  !insertmacro MUI_LANGUAGE "Japanese"
-  !insertmacro MUI_LANGUAGE "Korean"
-  !insertmacro MUI_LANGUAGE "Kurdish"
-  !insertmacro MUI_LANGUAGE "Latvian"
-  !insertmacro MUI_LANGUAGE "Lithuanian"
-  !insertmacro MUI_LANGUAGE "Luxembourgish"
-  !insertmacro MUI_LANGUAGE "Macedonian"
-  !insertmacro MUI_LANGUAGE "Malay"
-  !insertmacro MUI_LANGUAGE "Mongolian"
-  !insertmacro MUI_LANGUAGE "Norwegian"
-  !insertmacro MUI_LANGUAGE "Polish"
-  !insertmacro MUI_LANGUAGE "Portuguese"
-  !insertmacro MUI_LANGUAGE "PortugueseBR"
-  !insertmacro MUI_LANGUAGE "Romanian"
-  !insertmacro MUI_LANGUAGE "Russian"
-  !insertmacro MUI_LANGUAGE "Serbian"
-  !insertmacro MUI_LANGUAGE "SerbianLatin"
-  !insertmacro MUI_LANGUAGE "SimpChinese"
-  !insertmacro MUI_LANGUAGE "Slovak"
-  !insertmacro MUI_LANGUAGE "Slovenian"
-  !insertmacro MUI_LANGUAGE "Spanish"
-  !insertmacro MUI_LANGUAGE "Swedish"
-  !insertmacro MUI_LANGUAGE "Thai"
-  !insertmacro MUI_LANGUAGE "TradChinese"
-  !insertmacro MUI_LANGUAGE "Turkish"
-  !insertmacro MUI_LANGUAGE "Ukrainian"
-  !insertmacro MUI_LANGUAGE "Welsh"
-
-
-;--------------------------------
-;Reserve Files
-
-  ;These files should be inserted before other files in the data block
-  ;Keep these lines before any File command
-  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
-
-  ReserveFile "NSIS.InstallOptions.ini"
-  !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-
-;--------------------------------
-;Installer Sections
-
-Section "-Core installation"
-  ;Use the entire tree produced by the INSTALL target.  Keep the
-  ;list of directories here in sync with the RMDir commands below.
-  SetOutPath "$INSTDIR"
-  @CPACK_NSIS_FULL_INSTALL@
-  
-  ;Store installation folder
-  WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
-  
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  Push "DisplayName"
-  Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
-  Push "DisplayVersion"
-  Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
-  Push "Publisher"
-  Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
-  Push "UninstallString"
-  Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
-  Push "NoRepair"
-  Push "1"
-  Call ConditionalAddToRegisty
-  
-  !ifdef CPACK_NSIS_ADD_REMOVE
-  ;Create add/remove functionality
-  Push "ModifyPath"
-  Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
-  !else
-  Push "NoModify"
-  Push "1"
-  Call ConditionalAddToRegisty
-  !endif
-  
-  ; Optional registration
-  Push "DisplayIcon"
-  Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
-  Push "HelpLink"
-  Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
-  Push "URLInfoAbout"
-  Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
-  Push "Contact"
-  Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
-  !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State"
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-  
-  ;Create shortcuts
-  CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-@CPACK_NSIS_CREATE_ICONS@
-@CPACK_NSIS_CREATE_ICONS_EXTRA@
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-
-  ;Read a value from an InstallOptions INI file
-  !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS "NSIS.InstallOptions.ini" "Field 3" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_CURRENT_USER "NSIS.InstallOptions.ini" "Field 4" "State"
-
-  ; Write special uninstall registry entries
-  Push "StartMenu"
-  Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
-  Push "DoNotAddToPath"
-  Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
-  Push "AddToPathAllUsers"
-  Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
-  Push "AddToPathCurrentUser"
-  Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
-  Push "InstallToDesktop"
-  Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
-
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
-
-SectionEnd
-
-Section "-Add to path"
-  Push $INSTDIR\bin
-  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath
-  StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0  
-    Call AddToPath
-  doNotAddToPath:
-SectionEnd
-
-;--------------------------------
-; Create custom pages
-Function InstallOptionsPage
-  !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_PACKAGE_NAME@"
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
-
-FunctionEnd
-
-;--------------------------------
-; determine admin versus local install
-Function un.onInit
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    Goto done
-    
-  noLM:
-    ;Get installation folder from registry if available
-
-  done:
-
-  ;Disable WoW64 redirection
-  SetRegView 64
-    
-FunctionEnd
-
-;--- Add/Remove callback functions: ---
-!macro SectionList MacroName
-  ;This macro used to perform operation on multiple sections.
-  ;List all of your components in following manner here.
-@CPACK_NSIS_COMPONENT_SECTION_LIST@
-!macroend
- 
-Section -FinishComponents
-  ;Removes unselected components and writes component status to registry
-  !insertmacro SectionList "FinishSection"
-  
-!ifdef CPACK_NSIS_ADD_REMOVE  
-  ; Get the name of the installer executable
-  System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1'
-  StrCpy $R3 $R0
-  
-  ; Strip off the last 13 characters, to see if we have AddRemove.exe
-  StrLen $R1 $R0
-  IntOp $R1 $R0 - 13
-  StrCpy $R2 $R0 13 $R1
-  StrCmp $R2 "AddRemove.exe" addremove_installed
-  
-  ; We're not running AddRemove.exe, so install it
-  CopyFiles $R3 $INSTDIR\AddRemove.exe
-  
-  addremove_installed:
-!endif
-SectionEnd
-;--- End of Add/Remove callback functions ---
-
-;--------------------------------
-; Component dependencies
-Function .onSelChange
-  !insertmacro SectionList MaybeSelectionChanged
-FunctionEnd
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-  ReadRegStr $START_MENU SHCTX \
-   "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "StartMenu"
-  ;MessageBox MB_OK "Start menu is in: $START_MENU"
-  ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "DoNotAddToPath"
-  ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "AddToPathAllUsers"
-  ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "AddToPathCurrentUser"
-  ;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
-  ReadRegStr $INSTALL_DESKTOP SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "InstallToDesktop"
-  ;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
-
-@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
-
-  ;Remove files we installed.
-  ;Keep the list of directories here in sync with the File commands above.
-@CPACK_NSIS_DELETE_FILES@
-@CPACK_NSIS_DELETE_DIRECTORIES@
-
-!ifdef CPACK_NSIS_ADD_REMOVE  
-  ;Remove the add/remove program
-  Delete "$INSTDIR\AddRemove.exe"
-!endif
-
-  ;Remove the uninstaller itself.
-  Delete "$INSTDIR\Uninstall.exe"
-  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)"
-
-  ;Remove the installation directory if it is empty.
-  RMDir "$INSTDIR"
-
-  ; Remove the registry entries.
-  DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
-  
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-    
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-@CPACK_NSIS_DELETE_ICONS@
-@CPACK_NSIS_DELETE_ICONS_EXTRA@
-  
-  ;Delete empty start menu parent diretories
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-  startMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-    
-    IfErrors startMenuDeleteLoopDone
-  
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
-  startMenuDeleteLoopDone:
-
-  ; If the user changed the shortcut, then untinstall may not work. This should
-  ; try to fix it.
-  StrCpy $MUI_TEMP "$START_MENU"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-@CPACK_NSIS_DELETE_ICONS_EXTRA@
-  
-  ;Delete empty start menu parent diretories
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-  secondStartMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-    
-    IfErrors secondStartMenuDeleteLoopDone
-  
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" secondStartMenuDeleteLoopDone secondStartMenuDeleteLoop
-  secondStartMenuDeleteLoopDone:
-
-  DeleteRegKey /ifempty SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  Push $INSTDIR\bin
-  StrCmp $DO_NOT_ADD_TO_PATH_ "1" doNotRemoveFromPath 0
-    Call un.RemoveFromPath
-  doNotRemoveFromPath:
-SectionEnd
-
-;--------------------------------
-; determine admin versus local install
-; Is install for "AllUsers" or "JustMe"?
-; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
-; This function is used for the very first "custom page" of the installer.
-; This custom page does not show up visibly, but it executes prior to the
-; first visible page and sets up $INSTDIR properly...
-; Choose different default installation folder based on SV_ALLUSERS...
-; "Program Files" for AllUsers, "My Documents" for JustMe...
-
-Function .onInit
-  ; Reads components status for registry
-  !insertmacro SectionList "InitSection"
-
-  ; check to see if /D has been used to change 
-  ; the install directory by comparing it to the 
-  ; install directory that is expected to be the
-  ; default
-  StrCpy $IS_DEFAULT_INSTALLDIR 0
-  ;StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
-  StrCmp "$INSTDIR" "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
-    StrCpy $IS_DEFAULT_INSTALLDIR 1
-  
-  StrCpy $SV_ALLUSERS "JustMe"
-  ; if default install dir then change the default
-  ; if it is installed for JustMe
-  StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-    StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-  ;Disable WoW64 redirection
-  SetRegView 64
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-    
-  noLM:
-    StrCpy $SV_ALLUSERS "AllUsers"
-    ;Get installation folder from registry if available
-
-  done:
-  StrCmp $SV_ALLUSERS "AllUsers" 0 +3
-    StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-      ;StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-      StrCpy $INSTDIR "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
-    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
-
-  noOptionsPage:
-FunctionEnd
diff --git a/builds/cmake/ZeroMQConfig.cmake.in b/builds/cmake/ZeroMQConfig.cmake.in
deleted file mode 100644
index 3f16e5958..000000000
--- a/builds/cmake/ZeroMQConfig.cmake.in
+++ /dev/null
@@ -1,34 +0,0 @@
-# ZeroMQ cmake module
-#
-# The following import targets are created
-#
-# ::
-#
-#   libzmq-static
-#   libzmq
-#
-# This module sets the following variables in your project::
-#
-#   ZeroMQ_FOUND - true if ZeroMQ found on the system
-#   ZeroMQ_INCLUDE_DIR - the directory containing ZeroMQ headers
-#   ZeroMQ_LIBRARY - 
-#   ZeroMQ_STATIC_LIBRARY
-
-@PACKAGE_INIT@
-
-if(NOT TARGET libzmq AND NOT TARGET libzmq-static)
-  include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
-
-  if (TARGET libzmq)
-    get_target_property(@PROJECT_NAME@_INCLUDE_DIR libzmq INTERFACE_INCLUDE_DIRECTORIES)
-  else ()
-    get_target_property(@PROJECT_NAME@_INCLUDE_DIR libzmq-static INTERFACE_INCLUDE_DIRECTORIES)
-  endif()
-
-  if (TARGET libzmq)
-    get_target_property(@PROJECT_NAME@_LIBRARY libzmq LOCATION)
-  endif()
-  if (TARGET libzmq-static)
-    get_target_property(@PROJECT_NAME@_STATIC_LIBRARY libzmq-static LOCATION)
-  endif()
-endif()
diff --git a/builds/cmake/ci_build.sh b/builds/cmake/ci_build.sh
deleted file mode 100755
index 009202eea..000000000
--- a/builds/cmake/ci_build.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env bash
-
-set -x -e
-
-cd ../..
-
-# always install custom builds from dist
-# to make sure that `make dist` doesn't omit any files required to build & test
-if [ -z "$DO_CLANG_FORMAT_CHECK" -a -z "$CLANG_TIDY" ]; then
-    ./autogen.sh
-    ./configure
-    make -j5 dist-gzip
-    V=$(./version.sh)
-    tar -xzf zeromq-$V.tar.gz
-    cd zeromq-$V
-fi
-
-mkdir tmp || true
-BUILD_PREFIX=$PWD/tmp
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("CFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CXXFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-
-CMAKE_OPTS=()
-CMAKE_OPTS+=("-DCMAKE_INSTALL_PREFIX:PATH=${BUILD_PREFIX}")
-CMAKE_OPTS+=("-DCMAKE_PREFIX_PATH:PATH=${BUILD_PREFIX}")
-CMAKE_OPTS+=("-DCMAKE_LIBRARY_PATH:PATH=${BUILD_PREFIX}/lib")
-CMAKE_OPTS+=("-DCMAKE_INCLUDE_PATH:PATH=${BUILD_PREFIX}/include")
-CMAKE_OPTS+=("-DENABLE_CAPSH=ON")
-
-if [ "$CLANG_FORMAT" != "" ] ; then
-    CMAKE_OPTS+=("-DCLANG_FORMAT=${CLANG_FORMAT}")
-fi
-
-if [ -z $CURVE ]; then
-    CMAKE_OPTS+=("-DENABLE_CURVE=OFF")
-elif [ $CURVE == "libsodium" ]; then
-    CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
-
-    if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
-            (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
-        git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
-    fi
-fi
-
-CMAKE_PREFIXES=()
-MAKE_PREFIXES=()
-PARALLEL_MAKE_OPT="-j5"
-if [ -n "$CLANG_TIDY" ] ; then
-    CMAKE_OPTS+=("-DCMAKE_BUILD_TYPE=Debug") # do a debug build to avoid unused variable warnings with assertions, and to speed up build
-    CMAKE_OPTS+=("-DCMAKE_CXX_CLANG_TIDY:STRING=${CLANG_TIDY}")
-    if [ -n ${SONARCLOUD_BUILD_WRAPPER_PATH} ] ; then
-        MAKE_PREFIXES+=("${SONARCLOUD_BUILD_WRAPPER_PATH}build-wrapper-linux-x86-64")
-        MAKE_PREFIXES+=("--out-dir")
-        MAKE_PREFIXES+=("${TRAVIS_BUILD_DIR}/bw-output")
-        
-    fi
-    CMAKE_PREFIXES+=("scan-build-8")
-    MAKE_PREFIXES+=("scan-build-8")
-    MAKE_PREFIXES+=("-plist-html")
-    SCAN_BUILD_OUTPUT="$(pwd)/scan-build-report"
-    MAKE_PREFIXES+=("-o ${SCAN_BUILD_OUTPUT}")
-    # TODO this does not work with sonarcloud.io as it misses the sonar-cxx plugin
-    #MAKE_PREFIXES+=("-plist")
-    IFS="/" read -ra GITHUB_USER <<< "${TRAVIS_REPO_SLUG}"
-    PARALLEL_MAKE_OPT=""
-fi
-
-# Build, check, and install from local source
-mkdir build_cmake
-cd build_cmake
-if [ "$DO_CLANG_FORMAT_CHECK" = "1" ] ; then
-    if ! ( PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig cmake "${CMAKE_OPTS[@]}" .. && make clang-format-check) ; then
-        make clang-format-diff
-        exit 1
-    fi
-else
-    if [ -n "$CLANG_TIDY" ] ; then
-        ${CLANG_TIDY} -explain-config
-    fi
-
-    export CTEST_OUTPUT_ON_FAILURE=1
-    PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig ${CMAKE_PREFIXES[@]} cmake "${CMAKE_OPTS[@]}" ..
-    ${MAKE_PREFIXES[@]} make ${PARALLEL_MAKE_OPT} all VERBOSE=1 | tee clang-tidy-report
-    
-    if [ -n "${SONAR_SCANNER_CLI_PATH}" ] ; then
-        find ${SCAN_BUILD_OUTPUT} || echo "WARNING: ${SCAN_BUILD_OUTPUT} does not exist"
-    
-        ${SONAR_SCANNER_CLI_PATH}sonar-scanner \
-            -Dsonar.projectKey=${GITHUB_USER}-libzmq \
-            -Dsonar.organization=${GITHUB_USER}-github \
-            -Dsonar.projectBaseDir=.. \
-            -Dsonar.sources=${TRAVIS_BUILD_DIR}/include,${TRAVIS_BUILD_DIR}/src,${TRAVIS_BUILD_DIR}/tests,${TRAVIS_BUILD_DIR}/unittests \
-            -Dsonar.cfamily.build-wrapper-output=${TRAVIS_BUILD_DIR}/bw-output \
-            -Dsonar.host.url=https://sonarcloud.io \
-            -Dsonar.login=${SONARQUBE_TOKEN}
-
-            # TODO this does not work with sonarcloud.io as it misses the sonar-cxx plugin
-            # -Dsonar.cxx.clangtidy.reportPath=clang-tidy-report \
-            # -Dsonar.cxx.clangsa.reportPath=*.plist \
-            
-    fi
-
-    make install
-    make ${PARALLEL_MAKE_OPT} test ARGS="-V"
-fi
diff --git a/builds/cmake/clang-format-check.sh.in b/builds/cmake/clang-format-check.sh.in
deleted file mode 100644
index 7ff40196c..000000000
--- a/builds/cmake/clang-format-check.sh.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-FAILED=0
-IFS=";"
-FILES="@ALL_SOURCE_FILES@"
-IDS=$(echo -en "\n\b")
-for FILE in $FILES
-do
-	@CLANG_FORMAT@ -style=file -output-replacements-xml "$FILE" | grep "<replacement " >/dev/null &&
-    {
-      echo "$FILE is not correctly formatted"
-	  FAILED=1
-	}
-done
-if [ "$FAILED" -eq "1" ] ; then exit 1 ; fi
diff --git a/builds/cmake/platform.hpp.in b/builds/cmake/platform.hpp.in
deleted file mode 100644
index acdd58440..000000000
--- a/builds/cmake/platform.hpp.in
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__
-#define __ZMQ_PLATFORM_HPP_INCLUDED__
-
-#cmakedefine ZMQ_USE_CV_IMPL_STL11
-#cmakedefine ZMQ_USE_CV_IMPL_WIN32API
-#cmakedefine ZMQ_USE_CV_IMPL_PTHREADS
-#cmakedefine ZMQ_USE_CV_IMPL_NONE
-
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_KQUEUE
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_EPOLL
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_DEVPOLL
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_POLL
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_SELECT
-
-#cmakedefine ZMQ_POLL_BASED_ON_SELECT
-#cmakedefine ZMQ_POLL_BASED_ON_POLL
-
-#cmakedefine ZMQ_CACHELINE_SIZE @ZMQ_CACHELINE_SIZE@
-
-#cmakedefine ZMQ_FORCE_MUTEXES
-
-#cmakedefine HAVE_FORK
-#cmakedefine HAVE_CLOCK_GETTIME
-#cmakedefine HAVE_GETHRTIME
-#cmakedefine HAVE_MKDTEMP
-#cmakedefine ZMQ_HAVE_UIO
-
-#cmakedefine ZMQ_HAVE_NOEXCEPT
-
-#cmakedefine ZMQ_HAVE_EVENTFD
-#cmakedefine ZMQ_HAVE_EVENTFD_CLOEXEC
-#cmakedefine ZMQ_HAVE_IFADDRS
-#cmakedefine ZMQ_HAVE_SO_BINDTODEVICE
-
-#cmakedefine ZMQ_HAVE_SO_PEERCRED
-#cmakedefine ZMQ_HAVE_LOCAL_PEERCRED
-
-#cmakedefine ZMQ_HAVE_O_CLOEXEC
-
-#cmakedefine ZMQ_HAVE_SOCK_CLOEXEC
-#cmakedefine ZMQ_HAVE_SO_KEEPALIVE
-#cmakedefine ZMQ_HAVE_TCP_KEEPCNT
-#cmakedefine ZMQ_HAVE_TCP_KEEPIDLE
-#cmakedefine ZMQ_HAVE_TCP_KEEPINTVL
-#cmakedefine ZMQ_HAVE_TCP_KEEPALIVE
-#cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_1
-#cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_2
-#cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_3
-#cmakedefine ZMQ_HAVE_PTHREAD_SET_NAME
-#cmakedefine ZMQ_HAVE_PTHREAD_SET_AFFINITY
-#cmakedefine HAVE_ACCEPT4
-#cmakedefine HAVE_STRNLEN
-#cmakedefine ZMQ_HAVE_STRLCPY
-#cmakedefine ZMQ_HAVE_LIBBSD
-
-#cmakedefine ZMQ_HAVE_IPC
-
-#cmakedefine ZMQ_USE_BUILTIN_SHA1
-#cmakedefine ZMQ_USE_NSS
-#cmakedefine ZMQ_HAVE_WS
-#cmakedefine ZMQ_HAVE_WSS
-#cmakedefine ZMQ_HAVE_TIPC
-
-#cmakedefine ZMQ_HAVE_OPENPGM
-#cmakedefine ZMQ_MAKE_VALGRIND_HAPPY
-
-#cmakedefine ZMQ_BUILD_DRAFT_API
-#cmakedefine ZMQ_HAVE_CURVE
-#cmakedefine ZMQ_USE_TWEETNACL
-#cmakedefine ZMQ_USE_LIBSODIUM
-#cmakedefine SODIUM_STATIC
-#cmakedefine ZMQ_USE_GNUTLS
-#cmakedefine ZMQ_USE_RADIX_TREE
-
-#ifdef _AIX
-  #define ZMQ_HAVE_AIX
-#endif
-
-#if defined __ANDROID__
-  #define ZMQ_HAVE_ANDROID
-#endif
-
-#if defined __CYGWIN__
-  #define ZMQ_HAVE_CYGWIN
-#endif
-
-#if defined __MINGW32__
-  #define ZMQ_HAVE_MINGW32
-#endif
-
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-  #define ZMQ_HAVE_FREEBSD
-#endif
-
-#if defined(__DragonFly__)
-  #define ZMQ_HAVE_FREEBSD
-  #define ZMQ_HAVE_DRAGONFLY
-#endif
-
-#if defined __hpux
-  #define ZMQ_HAVE_HPUX
-#endif
-
-#if defined __linux__
-  #define ZMQ_HAVE_LINUX
-#endif
-
-#if defined __NetBSD__
-  #define ZMQ_HAVE_NETBSD
-#endif
-
-#if defined __OpenBSD__
-  #define ZMQ_HAVE_OPENBSD
-#endif
-
-// TODO better move OS-specific defines to the automake files, and check for availability of IPC with an explicit test there
-#if defined __VMS
-  #define ZMQ_HAVE_OPENVMS
-  #undef ZMQ_HAVE_IPC
-#endif
-
-#if defined __APPLE__
-  #define ZMQ_HAVE_OSX
-#endif
-
-#if defined __QNXNTO__
-  #define ZMQ_HAVE_QNXNTO
-#endif
-
-#if defined(sun) || defined(__sun)
-  #define ZMQ_HAVE_SOLARIS
-#endif
-
-#cmakedefine ZMQ_HAVE_WINDOWS
-#cmakedefine ZMQ_HAVE_WINDOWS_UWP
-
-#endif
diff --git a/builds/coverage/ci_build.sh b/builds/coverage/ci_build.sh
deleted file mode 100755
index da6dd732c..000000000
--- a/builds/coverage/ci_build.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-mkdir tmp
-BUILD_PREFIX=$PWD/tmp
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("CFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CXXFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
-CONFIG_OPTS+=("--enable-code-coverage")
-
-if [ -z $CURVE ]; then
-    CMAKE_OPTS+=("-DENABLE_CURVE=OFF")
-elif [ $CURVE == "libsodium" ]; then
-    CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
-
-    if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
-            (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
-        git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
-    fi
-fi
-
-pip install --user cpp-coveralls
-
-# Build, check, and install from local source
-( cd ../..; ./autogen.sh && ./configure "${CONFIG_OPTS[@]}" && make VERBOSE=1 -j5 check && coveralls --exclude tests --exclude src/tweetnacl.c --exclude src/tweetnacl.h --build-root . --gcov-options '\-lp') || exit 1
diff --git a/builds/cygwin/Makefile.cygwin b/builds/cygwin/Makefile.cygwin
deleted file mode 100755
index 11830ce60..000000000
--- a/builds/cygwin/Makefile.cygwin
+++ /dev/null
@@ -1,48 +0,0 @@
-CC=gcc
-CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -I.
-LIBS=-lws2_32
-
-OBJS = ctx.o reaper.o dist.o err.o \
-	clock.o metadata.o random.o \
-	object.o own.o \
-	io_object.o io_thread.o \
-	lb.o fq.o \
-	address.o tcp_address.o ipc_address.o \
-	ipc_connecter.o ipc_listener.o \
-	tcp_connecter.o tcp_listener.o \
-	mailbox.o msg.o mtrie.o \
-	pipe.o precompiled.o proxy.o \
-	signaler.o stream_engine.o \
-	thread.o trie.o \
-	ip.o tcp.o \
-	pgm_socket.o pgm_receiver.o pgm_sender.o \
-	raw_decoder.o raw_encoder.o \
-	v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
-        udp_address.o upd_engine.o radio.o dish.o \
-	socket_base.o session_base.o options.o \
-	req.o rep.o push.o pull.o pub.o sub.o pair.o \
-	dealer.o router.o xpub.o xsub.o stream.o \
-	poller_base.o select.o poll.o epoll.o kqueue.o devpoll.o \
-	curve_client.o curve_server.o \
-	mechanism.o null_mechanism.o plain_client.o plain_server.o \
-	zmq.o zmq_utils.o
-
-%.o: ../../src/%.cpp
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-%.o: ../../perf/%.cpp
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-all: libzmq.dll
-
-perf: inproc_lat.exe inproc_thr.exe local_lat.exe local_thr.exe remote_lat.exe remote_thr.exe
-
-libzmq.dll: $(OBJS)
-	g++ -shared -o $@ $^ -Wl,--out-implib,-Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive $@.a -Wl,--no-whole-archive $(LIBS)
-
-%.exe: %.o libzmq.dll
-	g++ -o $@ $^
-
-clean:
-	del *.o *.a *.dll *.exe
-	
diff --git a/builds/deprecated-msvc/.gitignore b/builds/deprecated-msvc/.gitignore
deleted file mode 100644
index 8070544ff..000000000
--- a/builds/deprecated-msvc/.gitignore
+++ /dev/null
@@ -1,256 +0,0 @@
-## Visual Studio 2015 experimental Visual C/C++ Intellisense database
-*.VC.db
-
-
-## From https://github.com/github/gitignore
-##
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
diff --git a/builds/deprecated-msvc/Makefile.am b/builds/deprecated-msvc/Makefile.am
deleted file mode 100644
index d36010433..000000000
--- a/builds/deprecated-msvc/Makefile.am
+++ /dev/null
@@ -1,94 +0,0 @@
-LIBZMQ_DIST = vs2008/libzmq.sln \
-              vs2008/libzmq/libzmq.vcproj \
-              vs2010/libzmq.sln \
-              vs2010/libzmq/libzmq.vcxproj \
-              vs2010/libzmq/libzmq.vcxproj.filters \
-              vs2012/libzmq.sln \
-              vs2012/libzmq/libzmq.vcxproj \
-              vs2012/libzmq/libzmq.vcxproj.filters \
-              vs2013/libzmq.sln \
-              vs2013/libzmq/libzmq.vcxproj \
-              vs2013/libzmq/libzmq.vcxproj.filters \
-              vs2015/libzmq.sln \
-              vs2015/libzmq/libzmq.vcxproj \
-              vs2015/libzmq/libzmq.vcxproj.filters \
-              vs2015/libzmq/libzmq.props \
-              vs2015/libzmq/libzmq.xml \
-              vs2015/libzmq.import.props \
-              vs2015/libzmq.import.xml \
-              errno.cpp \
-              errno.hpp \
-              platform.hpp \
-              resource.h \
-              resource.rc
-
-PERF_DIST = vs2008/local_lat/local_lat.vcproj \
-            vs2008/local_thr/local_thr.vcproj \
-            vs2008/remote_lat/remote_lat.vcproj \
-            vs2008/remote_thr/remote_thr.vcproj \
-            vs2008/inproc_lat/inproc_lat.vcproj \
-            vs2008/inproc_thr/inproc_thr.vcproj \
-            vs2010/local_lat/local_lat.vcxproj \
-            vs2010/local_thr/local_thr.vcxproj \
-            vs2010/remote_lat/remote_lat.vcxproj \
-            vs2010/remote_thr/remote_thr.vcxproj \
-            vs2010/inproc_lat/inproc_lat.vcxproj \
-            vs2010/inproc_thr/inproc_thr.vcxproj \
-            vs2012/local_lat/local_lat.vcxproj \
-            vs2012/local_thr/local_thr.vcxproj \
-            vs2012/remote_lat/remote_lat.vcxproj \
-            vs2012/remote_thr/remote_thr.vcxproj \
-            vs2012/inproc_lat/inproc_lat.vcxproj \
-            vs2012/inproc_thr/inproc_thr.vcxproj \
-            vs2013/local_lat/local_lat.vcxproj \
-            vs2013/local_thr/local_thr.vcxproj \
-            vs2013/remote_lat/remote_lat.vcxproj \
-            vs2013/remote_thr/remote_thr.vcxproj \
-            vs2013/inproc_lat/inproc_lat.vcxproj \
-            vs2013/inproc_thr/inproc_thr.vcxproj \
-            vs2015/local_lat/local_lat.vcxproj \
-            vs2015/local_lat/local_lat.props \
-            vs2015/local_thr/local_thr.vcxproj \
-            vs2015/local_thr/local_thr.props \
-            vs2015/remote_lat/remote_lat.vcxproj \
-            vs2015/remote_lat/remote_lat.props \
-            vs2015/remote_thr/remote_thr.vcxproj \
-            vs2015/remote_thr/remote_thr.props \
-            vs2015/inproc_lat/inproc_lat.vcxproj \
-            vs2015/inproc_lat/inproc_lat.props \
-            vs2015/inproc_thr/inproc_thr.vcxproj \
-            vs2015/inproc_thr/inproc_thr.props
-
-PROPERTIES_DIST = properties/Common.props \
-                  properties/Debug.props \
-                  properties/DebugDEXE.props \
-                  properties/DebugDLL.props \
-                  properties/DebugLEXE.props \
-                  properties/DebugLIB.props \
-                  properties/DebugLTCG.props \
-                  properties/DebugSEXE.props \
-                  properties/DLL.props \
-                  properties/EXE.props \
-                  properties/LIB.props \
-                  properties/Link.props \
-                  properties/LTCG.props \
-                  properties/Messages.props \
-                  properties/Output.props \
-                  properties/Release.props \
-                  properties/ReleaseDEXE.props \
-                  properties/ReleaseDLL.props \
-                  properties/ReleaseLEXE.props \
-                  properties/ReleaseLIB.props \
-                  properties/ReleaseLTCG.props \
-                  properties/ReleaseSEXE.props \
-                  properties/Win32.props \
-                  properties/x64.props
-
-PRECOMPILED_DIST = ../../src/precompiled.hpp \
-                   ../../src/precompiled.cpp
-
-BUILD_DIST = build/build.bat \
-             build/buildall.bat \
-             build/buildbase.bat
-
-EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) $(BUILD_DIST)
\ No newline at end of file
diff --git a/builds/deprecated-msvc/build/build.bat b/builds/deprecated-msvc/build/build.bat
deleted file mode 100644
index cdb268b8c..000000000
--- a/builds/deprecated-msvc/build/build.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@ECHO OFF
-:: Usage: build.bat [Clean]
-@setlocal
-
-:: validate environment
-if "%VSINSTALLDIR%" == "" @echo Error: Attempt to build without proper DevStudio environment.&@goto :done
-
-:: record starting time
-set STARTTIME=%DATE% %TIME%
-@echo Start Time: %STARTTIME%
-
-
-:: validate optional argument (and make sure it is spelled "Clean")
-set MAKECLEAN=%%1
-if NOT "%%1" == "" if /I "%%1" == "clean" set MAKECLEAN=Clean
-
-
-::
-:: uses the environment from the DevStudio CMD window to figure out which version to build
-::
-
-set VSVER=%VSINSTALLDIR:~-5,2%
-set DIRVER=%VSVER%
-if %VSVER% gtr 10 set /a DIRVER = DIRVER + 1
-
-CALL buildbase.bat ..\vs20%DIRVER%\libzmq.sln %VSVER% %MAKECLEAN%
-
-set STOPTIME=%DATE% %TIME%
-@echo Stop  Time: %STOPTIME%
-@echo Start Time: %STARTTIME%
-
-:done
-@endlocal
diff --git a/builds/deprecated-msvc/build/buildall.bat b/builds/deprecated-msvc/build/buildall.bat
deleted file mode 100644
index 3ec7fa85f..000000000
--- a/builds/deprecated-msvc/build/buildall.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-@ECHO OFF
-:: Usage: buildall.bat
-
-:: Build all configurations for all solutions.
-call buildbase.bat ..\vs2017\libzmq.sln 15
-ECHO.
-CALL buildbase.bat ..\vs2015\libzmq.sln 14
-ECHO.
-CALL buildbase.bat ..\vs2013\libzmq.sln 12
-ECHO.
-CALL buildbase.bat ..\vs2012\libzmq.sln 11
-ECHO.
-CALL buildbase.bat ..\vs2010\libzmq.sln 10
-ECHO.
-
-PAUSE
diff --git a/builds/deprecated-msvc/build/buildbase.bat b/builds/deprecated-msvc/build/buildbase.bat
deleted file mode 100644
index adca71e3d..000000000
--- a/builds/deprecated-msvc/build/buildbase.bat
+++ /dev/null
@@ -1,73 +0,0 @@
-@ECHO OFF
-@setlocal
-REM Usage: [buildbase.bat ..\vs2013\mysolution.sln 12 [Clean]]
-
-SET solution=%1
-SET version=%2
-
-:: supports passing in Clean as third argument if "make clean" behavior is desired
-SET target=%3
-SET ACTION=Building
-if NOT "%target%" == "" set target=/t:%target%&set ACTION=Cleaning
-
-SET log=build_%version%.log
-SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
-if "%version%" == "15" SET tools=Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
-SET environment="%programfiles(x86)%\%tools%"
-IF NOT EXIST %environment% SET environment="%programfiles%\%tools%"
-IF NOT EXIST %environment% GOTO no_tools
-
-@ECHO %ACTION% %solution%
-
-SET __CURRENT_DIR__=%CD%
-CALL %environment% x86 >%SystemDrive%\nul 2>&1
-ECHO Platform=x86 2> %log%
-CD /D %__CURRENT_DIR__%
-SET __CURRENT_DIR__=
-
-
-ECHO Configuration=DynDebug
-msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=DynRelease
-msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=LtcgDebug
-msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=LtcgRelease
-msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=StaticDebug
-msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=StaticRelease
-msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-
-SET __CURRENT_DIR__=%CD%
-CALL %environment% x86_amd64 >%SystemDrive%\nul 2>&1
-ECHO Platform=x64
-CD /D %__CURRENT_DIR__%
-SET __CURRENT_DIR__=
-
-
-ECHO Configuration=DynDebug
-msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=DynRelease
-msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=LtcgDebug
-msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=LtcgRelease
-msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=StaticDebug
-msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=StaticRelease
-msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-
-ECHO %ACTION% complete: %solution%
-GOTO end
-
-:error
-ECHO *** ERROR, build terminated early, see: %log%
-GOTO end
-
-:no_tools
-ECHO *** ERROR, build tools not found: %tools%
-
-:end
-@endlocal
diff --git a/builds/deprecated-msvc/errno.cpp b/builds/deprecated-msvc/errno.cpp
deleted file mode 100644
index 81f2c714b..000000000
--- a/builds/deprecated-msvc/errno.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#if defined _WIN32_WCE
-
-//#include "..\..\include\zmq.h"
-#include "..\..\src\err.hpp"
-
-int errno;
-int _doserrno;
-int _sys_nerr;
-
-char* error_desc_buff = NULL;
-
-char* strerror(int errno)
-{
-    if (NULL != error_desc_buff)
-    {
-        LocalFree(error_desc_buff);
-        error_desc_buff = NULL;
-    }
-
-    FormatMessage(
-        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER,
-        NULL,
-        errno,
-        0,
-        (LPTSTR)&error_desc_buff,
-        1024,
-        NULL
-        );
-    return error_desc_buff;
-}
-
-#endif
\ No newline at end of file
diff --git a/builds/deprecated-msvc/errno.hpp b/builds/deprecated-msvc/errno.hpp
deleted file mode 100644
index 1530f279b..000000000
--- a/builds/deprecated-msvc/errno.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef ERRNO_H
-#define ERRNO_H 1
-
-//#define EPERM           1
-//#define ENOENT          2
-//#define ESRCH           3
-#define EINTR           4
-//#define EIO             5
-//#define ENXIO           6
-//#define E2BIG           7
-//#define ENOEXEC         8
-#define EBADF           9
-//#define ECHILD          10
-#define EAGAIN          11
-//#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-//#define EOSERR          15 // rk
-//#define EBUSY           16
-//#define EEXIST          17
-//#define EXDEV           18
-//#define ENODEV          19
-//#define ENOTDIR         20
-//#define EISDIR          21
-#define EINVAL          22
-//#define ENFILE          23
-#define EMFILE          24
-//#define ENOTTY          25
-//#define EFBIG           27
-//#define ENOSPC          28
-//#define ESPIPE          29
-//#define EROFS           30
-//#define EMLINK          31
-//#define EPIPE           32
-//#define EDOM            33
-//#define ERANGE          34
-//#define EDEADLK         36
-//#define ENOSYS          37
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int errno;
-extern int _doserrno;
-extern int _sys_nerr;
-
-char* strerror(int errno);
-
-#define sys_nerr _sys_nerr
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif
\ No newline at end of file
diff --git a/builds/deprecated-msvc/platform.hpp b/builds/deprecated-msvc/platform.hpp
deleted file mode 100644
index 964ee9005..000000000
--- a/builds/deprecated-msvc/platform.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __PLATFORM_HPP_INCLUDED__
-#define __PLATFORM_HPP_INCLUDED__
-
-#define ZMQ_HAVE_WINDOWS
-
-// MSVC build configuration is controlled via options exposed in the Visual
-// Studio user interface. The option to use libsodium is not exposed in the
-// user interface unless a sibling `libsodium` directory to that of this
-// repository exists and contains the following files:
-//
-// \builds\msvc\vs2015\libsodium.import.props
-// \builds\msvc\vs2015\libsodium.import.xml
-
-#endif
diff --git a/builds/deprecated-msvc/properties/Common.props b/builds/deprecated-msvc/properties/Common.props
deleted file mode 100644
index 72588d6e3..000000000
--- a/builds/deprecated-msvc/properties/Common.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(Platform).props" />
-  </ImportGroup>  
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/DLL.props b/builds/deprecated-msvc/properties/DLL.props
deleted file mode 100644
index b5aa1f07f..000000000
--- a/builds/deprecated-msvc/properties/DLL.props
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Library</_PropertySheetDisplayName>
-    <DefaultLinkage>dynamic</DefaultLinkage>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/Debug.props b/builds/deprecated-msvc/properties/Debug.props
deleted file mode 100644
index 6fa741962..000000000
--- a/builds/deprecated-msvc/properties/Debug.props
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Debug Settings</_PropertySheetDisplayName>
-    <DebugOrRelease>Debug</DebugOrRelease>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>    
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/DebugDEXE.props b/builds/deprecated-msvc/properties/DebugDEXE.props
deleted file mode 100644
index fe8b577f7..000000000
--- a/builds/deprecated-msvc/properties/DebugDEXE.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Dynamic</_PropertySheetDisplayName>
-    <DefaultLinkage>dynamic</DefaultLinkage>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/DebugDLL.props b/builds/deprecated-msvc/properties/DebugDLL.props
deleted file mode 100644
index a451d0bf4..000000000
--- a/builds/deprecated-msvc/properties/DebugDLL.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Debug Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="DLL.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/DebugLEXE.props b/builds/deprecated-msvc/properties/DebugLEXE.props
deleted file mode 100644
index 7fa92c035..000000000
--- a/builds/deprecated-msvc/properties/DebugLEXE.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Link Time Code Generation</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="Link.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/DebugLIB.props b/builds/deprecated-msvc/properties/DebugLIB.props
deleted file mode 100644
index c5f101282..000000000
--- a/builds/deprecated-msvc/properties/DebugLIB.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Debug Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="LIB.props" />
-  </ImportGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/DebugLTCG.props b/builds/deprecated-msvc/properties/DebugLTCG.props
deleted file mode 100644
index 42b22ffe2..000000000
--- a/builds/deprecated-msvc/properties/DebugLTCG.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="LTCG.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/DebugSEXE.props b/builds/deprecated-msvc/properties/DebugSEXE.props
deleted file mode 100644
index 2615ffcff..000000000
--- a/builds/deprecated-msvc/properties/DebugSEXE.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Static</_PropertySheetDisplayName>
-    <DefaultLinkage>static</DefaultLinkage>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/EXE.props b/builds/deprecated-msvc/properties/EXE.props
deleted file mode 100644
index 354906458..000000000
--- a/builds/deprecated-msvc/properties/EXE.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Application</_PropertySheetDisplayName>
-    <IsExe>true</IsExe>    
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/LIB.props b/builds/deprecated-msvc/properties/LIB.props
deleted file mode 100644
index 3835777cf..000000000
--- a/builds/deprecated-msvc/properties/LIB.props
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Library</_PropertySheetDisplayName>
-    <DefaultLinkage>static</DefaultLinkage>
-    <TargetExt>.lib</TargetExt>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/LTCG.props b/builds/deprecated-msvc/properties/LTCG.props
deleted file mode 100644
index 02292938c..000000000
--- a/builds/deprecated-msvc/properties/LTCG.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="LIB.props" />
-    <Import Project="Link.props" />
-  </ImportGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/Link.props b/builds/deprecated-msvc/properties/Link.props
deleted file mode 100644
index db15fbb40..000000000
--- a/builds/deprecated-msvc/properties/Link.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Link Time Code Generation Settings</_PropertySheetDisplayName>
-    <DefaultLinkage>ltcg</DefaultLinkage>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <Lib>
-      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/Messages.props b/builds/deprecated-msvc/properties/Messages.props
deleted file mode 100644
index 06a1ab090..000000000
--- a/builds/deprecated-msvc/properties/Messages.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Build Messages</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
-    <Message Text="Configuration     : $(Configuration)" Importance="high"/>
-    <Message Text="PlatformToolset   : $(PlatformToolset)" Importance="high"/>
-    <Message Text="TargetPath        : $(TargetPath)" Importance="high"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/Output.props b/builds/deprecated-msvc/properties/Output.props
deleted file mode 100644
index 492876cfa..000000000
--- a/builds/deprecated-msvc/properties/Output.props
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- 
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Output Settings</_PropertySheetDisplayName>
-    <!-- BuildRoot, RepoRoot, SourceRoot, DebugOrRelease and DefaultLinkage are custom props and should therefore not be referenced from *.import.props or nuget target files. -->
-    <BuildRoot>$(ProjectDir)..\..\</BuildRoot>
-    <RepoRoot>$(ProjectDir)..\..\..\..\</RepoRoot>
-    <SourceRoot>$(ProjectDir)..\..\..\..\..\</SourceRoot>    
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\..\..\obj\$(TargetName)\$(PlatformName)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\</IntDir>
-    <TargetDir>$(OutDir)</TargetDir>
-    <TargetName>$(TargetName)</TargetName>
-    <TargetPath>$(TargetDir)$(TargetName)$(TargetExt)</TargetPath>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <Link>
-      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
-    </Link>
-    <BuildLog>
-      <Path>$(OutDir)$(TargetName).log</Path>
-    </BuildLog> 
-  </ItemDefinitionGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>    
-  
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/Release.props b/builds/deprecated-msvc/properties/Release.props
deleted file mode 100644
index 1c5415bcb..000000000
--- a/builds/deprecated-msvc/properties/Release.props
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Release Settings</_PropertySheetDisplayName>
-    <DebugOrRelease>Release</DebugOrRelease>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions>
-      <!--<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>-->
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <MinimalRebuild>false</MinimalRebuild>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <!--<GenerateDebugInformation>true</GenerateDebugInformation>-->
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link> 
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Processor)' == 'x86'">
-    <ClCompile>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/ReleaseDEXE.props b/builds/deprecated-msvc/properties/ReleaseDEXE.props
deleted file mode 100644
index 73deeae93..000000000
--- a/builds/deprecated-msvc/properties/ReleaseDEXE.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Dynamic</_PropertySheetDisplayName>
-    <DefaultLinkage>dynamic</DefaultLinkage>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/ReleaseDLL.props b/builds/deprecated-msvc/properties/ReleaseDLL.props
deleted file mode 100644
index 2071b33f6..000000000
--- a/builds/deprecated-msvc/properties/ReleaseDLL.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Release Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="DLL.props" />
-  </ImportGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/ReleaseLEXE.props b/builds/deprecated-msvc/properties/ReleaseLEXE.props
deleted file mode 100644
index beb73ef27..000000000
--- a/builds/deprecated-msvc/properties/ReleaseLEXE.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Link Time Code Generation</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="Link.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/ReleaseLIB.props b/builds/deprecated-msvc/properties/ReleaseLIB.props
deleted file mode 100644
index 2b250d579..000000000
--- a/builds/deprecated-msvc/properties/ReleaseLIB.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Release Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="LIB.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/ReleaseLTCG.props b/builds/deprecated-msvc/properties/ReleaseLTCG.props
deleted file mode 100644
index 1814c6f3d..000000000
--- a/builds/deprecated-msvc/properties/ReleaseLTCG.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Release Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="LTCG.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/ReleaseSEXE.props b/builds/deprecated-msvc/properties/ReleaseSEXE.props
deleted file mode 100644
index 2f5600a06..000000000
--- a/builds/deprecated-msvc/properties/ReleaseSEXE.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Static</_PropertySheetDisplayName>
-    <DefaultLinkage>static</DefaultLinkage>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/Win32.props b/builds/deprecated-msvc/properties/Win32.props
deleted file mode 100644
index f7b1df629..000000000
--- a/builds/deprecated-msvc/properties/Win32.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>x86 Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/properties/x64.props b/builds/deprecated-msvc/properties/x64.props
deleted file mode 100644
index 0831f69bd..000000000
--- a/builds/deprecated-msvc/properties/x64.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>x64 Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-    
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Note that Win64 defines may cause WIN32 to become defined when using windows headers, 
-      but _WIN32 implies Windows 32 bit or above. If the standard headers are not included 
-      these are sometimes required even for 64 bit builds and should never cause harm there.-->
-      <PreprocessorDefinitions>WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X64 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/readme.txt b/builds/deprecated-msvc/readme.txt
deleted file mode 100644
index 19720cd40..000000000
--- a/builds/deprecated-msvc/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-For building on Windows, use:
-
-     cd build
-     ./build.bat
-
-This requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE window. Also, make sure that the name of the project folder is libzmq (not e.g. libzmq-master) as this is required for correct linking.
-
-Visual Studio product and C++ compiler Versions:
-
-Visual C++ 2008 => Visual C++ 9
-Visual C++ 2010 => Visual C++ 10
-Visual C++ 2012 => Visual C++ 11
-Visual C++ 2013 => Visual C++ 12
-Visual C++ 2015 => Visual C++ 14
-Visual C++ 2017 => Visual C++ 15
-
-Note that solution file icons reflect the compiler version ([9], [10], [11], [12], [14], [15]), not the product version.
-
-The vs2017/vs2015/vs2013/vs2012/vs2010 solution and project files differ only in versioning.
-
-More info here:
-
-http://en.wikipedia.org/wiki/Visual_C%2B%2B
-
-If multiple DevStudio versions are installed, you can run build.bat in separate windows each created by the desired DevStudio target.
-
-To build for all versions of Visual Studio (excluding vs2008), you can run buildall.bat. This is generally a maintainer task.
diff --git a/builds/deprecated-msvc/resource.h b/builds/deprecated-msvc/resource.h
deleted file mode 100644
index 27e2900cb..000000000
--- a/builds/deprecated-msvc/resource.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by resource.rc
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/builds/deprecated-msvc/resource.rc b/builds/deprecated-msvc/resource.rc
deleted file mode 100644
index e2c3120df3a8701ec0a4df03f5d8c35bf7331326..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4650
zcmdUzS#J_i6vxlAiQi$QFE%#a6XRnSij7ceS)!&1=>nCAP#GGv@w2PH|GnHY!wgkg
zA25^QZfD=_8Gij-vo(vXVqLqip$#nN?bwLDCVR2n*qQZM?b!>S$gZqyecmDaBgRYi
zhK$0yVRpehVkK%_y9Q>}p4t<*thsTC-9D#1pf4S4A%nkaAFbe^g}LP5Iu1{?ckI||
zR=0-j+o4shWhYi-cc1x@mF+z{HGV6$%TAej;4c{#?+Ma{F|rbNnYM8UD-G;3`j4=V
z>`+JRcl;ir^&Wc49!2&yd8a+{XCHiZ_Vsva`!Alwf<!(#Zm^Xise|4Ri;ZCUKzFgm
zAYFua`{Z8_PsPMQWY6(=pH;}i8Z)1ju`TCBL7d2`uCv#(RBl~DamNmbDxXs|@~1&|
z?ZLT4bd`BT_Xkfj6SEGD6Jodp))Dy2j%%6SBX%2%B^Re*$HSGNeMqjpwiRgCfZJuq
z<4i-eIQ3cWBS5;$jsWFH6HVU0b^pJs1^HPXVnU<d4Q!SV8M*UabT7F|A?RrQ<X7HP
zTOU_n`OjNSSgI=z;gMJI3zn@n1v{l~of6T$_D`goCDGOcC7PGdlB>s;WSVM>e^ev#
z>P<G<f{zxfswAb6gj$DDcfW4<7>x(`BkTuFnq*%Km?C*zb9e9&YiWK!o(Vg768421
z0dYuP7pGt%+a~WfdAEqZ6<!a042LQ)*q{d0{}Lx~IB@l&goG99NR9lDp!*FD9Zp1F
zkvXXxs&GZBPJ>KI%Q~UtDQw)~x2eW4wz?mFJpr$~N?g+zRpj%uw~<lL_84bku{u4?
zF%o*Xmzi^4Gt*FkbAJA-!d9`YEK@*&5k6OUc7>O^Xx7G8ePkU>Wn@0JkQr&J(q!FU
zIgQTwP3QImC$Bz*(=ayiqxu}#pn%-!hpxHt`u3gJJ7d*mU-w4=`77=&?Ba2CuLE?u
zcE7qIeO%|ulFuzzWFH>M?lw^JTt9HCKCNPJ;i{YZiko^wwQJwaBPVAJl`~Ggy(9bN
zFxB<-X4vR{xzZUMtgub@y~(SrTAgYAe9H2@I*TErz5%8!eCy8SgD-PQTn6vTQIuD%
z@tva1+bPJMJyExF;ku7a^w=2RM!pkHTYZNw3-!qIc#PKbc)2>3MP8B4!RuNjqf4GW
zw_B(CDjD6I(`(1@8Gv_#PNR%vllsgfeVXcHB4Tp$huFyOr1QLqg@$+bdPv<!XLlWH
z%Ip}+CNoxfrYi2MidKpRRZL$|y}T1?Co`STzRCYhZ=JkV7i%u<ldr$~?)!4eb~1~l
rQBoRdrgaz}`wgwm^8Rn=V9TTwi#3;ov*W!_{n5WX*)Qg--$m&+^8+hY

diff --git a/builds/deprecated-msvc/vs2008/inproc_lat/inproc_lat.vcproj b/builds/deprecated-msvc/vs2008/inproc_lat/inproc_lat.vcproj
deleted file mode 100644
index f046316ff..000000000
--- a/builds/deprecated-msvc/vs2008/inproc_lat/inproc_lat.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9,00" Name="inproc_lat" ProjectGUID="{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}" RootNamespace="inproc_lat" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/inproc_lat.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/inproc_lat.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\inproc_lat.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/builds/deprecated-msvc/vs2008/inproc_thr/inproc_thr.vcproj b/builds/deprecated-msvc/vs2008/inproc_thr/inproc_thr.vcproj
deleted file mode 100644
index 74eab6590..000000000
--- a/builds/deprecated-msvc/vs2008/inproc_thr/inproc_thr.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9,00" Name="inproc_thr" ProjectGUID="{1077E977-95DD-4E73-A692-74647DD0CC1E}" RootNamespace="inproc_thr" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/inproc_thr.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/inproc_thr.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\inproc_thr.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/builds/deprecated-msvc/vs2008/libzmq.sln b/builds/deprecated-msvc/vs2008/libzmq.sln
deleted file mode 100644
index 4541240e2..000000000
--- a/builds/deprecated-msvc/vs2008/libzmq.sln
+++ /dev/null
@@ -1,95 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticRelease|Win32 = StaticRelease|Win32
-		WithOpenPGM|Win32 = WithOpenPGM|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.Debug|Win32.Build.0 = Debug|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.Release|Win32.ActiveCfg = Release|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.Release|Win32.Build.0 = Release|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = StaticDebug|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = StaticDebug|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = StaticRelease|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = StaticRelease|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.WithOpenPGM|Win32.ActiveCfg = WithOpenPGM|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.WithOpenPGM|Win32.Build.0 = WithOpenPGM|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.Debug|Win32.Build.0 = Debug|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.Release|Win32.ActiveCfg = Release|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.Release|Win32.Build.0 = Release|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.Debug|Win32.Build.0 = Debug|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.Release|Win32.ActiveCfg = Release|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.Release|Win32.Build.0 = Release|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.Debug|Win32.Build.0 = Debug|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.Release|Win32.ActiveCfg = Release|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.Release|Win32.Build.0 = Release|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.Debug|Win32.Build.0 = Debug|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.Release|Win32.ActiveCfg = Release|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.Release|Win32.Build.0 = Release|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.Debug|Win32.Build.0 = Debug|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.Release|Win32.ActiveCfg = Release|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.Release|Win32.Build.0 = Release|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.Debug|Win32.Build.0 = Debug|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.Release|Win32.ActiveCfg = Release|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.Release|Win32.Build.0 = Release|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.WithOpenPGM|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/builds/deprecated-msvc/vs2008/libzmq/libzmq.vcproj b/builds/deprecated-msvc/vs2008/libzmq/libzmq.vcproj
deleted file mode 100644
index 62802981b..000000000
--- a/builds/deprecated-msvc/vs2008/libzmq/libzmq.vcproj
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9,00" Name="libzmq" ProjectGUID="{641C5F36-32EE-4323-B740-992B651CF9D6}" RootNamespace="libzmq" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="0" PreprocessorDefinitions="NOMINMAX" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq.dll" LinkDLL="true" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq.dll" LinkDLL="true" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="StaticDebug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DZMQ_STATIC -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="0" PreprocessorDefinitions="NOMINMAX" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" AdditionalOptions="/ignore:4006" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq_d.lib" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="StaticRelease|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DZMQ_STATIC -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" AdditionalOptions="/ignore:4006" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq.lib" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="WithOpenPGM|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../OpenPGM/include" PreprocessorDefinitions="ZMQ_HAVE_OPENPGM" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib libpgm.lib" OutputFile="../../../../lib/libzmq.dll" AdditionalLibraryDirectories="../../../../../OpenPGM/lib" LinkDLL="true" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\errno.cpp" />
-      <File RelativePath="..\..\..\..\src\address.cpp" />
-      <File RelativePath="..\..\..\..\src\client.cpp" />
-      <File RelativePath="..\..\..\..\src\clock.cpp" />
-      <File RelativePath="..\..\..\..\src\ctx.cpp" />
-      <File RelativePath="..\..\..\..\src\curve_client.cpp" />
-      <File RelativePath="..\..\..\..\src\curve_mechanism_base.cpp" />
-      <File RelativePath="..\..\..\..\src\curve_server.cpp" />
-      <File RelativePath="..\..\..\..\src\dealer.cpp" />
-      <File RelativePath="..\..\..\..\src\decoder_allocators.cpp" />
-      <File RelativePath="..\..\..\..\src\devpoll.cpp" />
-      <File RelativePath="..\..\..\..\src\dgram.cpp" />
-      <File RelativePath="..\..\..\..\src\dish.cpp" />
-      <File RelativePath="..\..\..\..\src\dist.cpp" />
-      <File RelativePath="..\..\..\..\src\epoll.cpp" />
-      <File RelativePath="..\..\..\..\src\err.cpp" />
-      <File RelativePath="..\..\..\..\src\fq.cpp" />
-      <File RelativePath="..\..\..\..\src\gather.cpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_client.cpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_server.cpp" />
-      <File RelativePath="..\..\..\..\src\io_object.cpp" />
-      <File RelativePath="..\..\..\..\src\io_thread.cpp" />
-      <File RelativePath="..\..\..\..\src\ipc_address.cpp" />
-      <File RelativePath="..\..\..\..\src\ipc_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\ipc_listener.cpp" />
-      <File RelativePath="..\..\..\..\src\ip.cpp" />
-      <File RelativePath="..\..\..\..\src\kqueue.cpp" />
-      <File RelativePath="..\..\..\..\src\lb.cpp" />
-      <File RelativePath="..\..\..\..\src\mailbox.cpp" />
-      <File RelativePath="..\..\..\..\src\mailbox_safe.cpp" />
-      <File RelativePath="..\..\..\..\src\mechanism_base.cpp" />
-      <File RelativePath="..\..\..\..\src\mechanism.cpp" />
-      <File RelativePath="..\..\..\..\src\metadata.cpp" />
-      <File RelativePath="..\..\..\..\src\msg.cpp" />
-      <File RelativePath="..\..\..\..\src\mtrie.cpp" />
-      <File RelativePath="..\..\..\..\src\norm_engine.cpp" />
-      <File RelativePath="..\..\..\..\src\null_mechanism.cpp" />
-      <File RelativePath="..\..\..\..\src\object.cpp" />
-      <File RelativePath="..\..\..\..\src\options.cpp" />
-      <File RelativePath="..\..\..\..\src\own.cpp" />
-      <File RelativePath="..\..\..\..\src\pair.cpp" />
-      <File RelativePath="..\..\..\..\src\pgm_receiver.cpp" />
-      <File RelativePath="..\..\..\..\src\pgm_sender.cpp" />
-      <File RelativePath="..\..\..\..\src\pgm_socket.cpp" />
-      <File RelativePath="..\..\..\..\src\pipe.cpp" />
-      <File RelativePath="..\..\..\..\src\plain_client.cpp" />
-      <File RelativePath="..\..\..\..\src\plain_server.cpp" />
-      <File RelativePath="..\..\..\..\src\poll.cpp" />
-      <File RelativePath="..\..\..\..\src\poller_base.cpp" />
-      <File RelativePath="..\..\..\..\src\pollset.cpp" />
-      <File RelativePath="..\..\..\..\src\precompiled.cpp" />
-      <File RelativePath="..\..\..\..\src\proxy.cpp" />
-      <File RelativePath="..\..\..\..\src\pub.cpp" />
-      <File RelativePath="..\..\..\..\src\pull.cpp" />
-      <File RelativePath="..\..\..\..\src\push.cpp" />
-      <File RelativePath="..\..\..\..\src\radio.cpp" />
-      <File RelativePath="..\..\..\..\src\random.cpp" />
-      <File RelativePath="..\..\..\..\src\raw_decoder.cpp" />
-      <File RelativePath="..\..\..\..\src\raw_encoder.cpp" />
-      <File RelativePath="..\..\..\..\src\reaper.cpp" />
-      <File RelativePath="..\..\..\..\src\rep.cpp" />
-      <File RelativePath="..\..\..\..\src\req.cpp" />
-      <File RelativePath="..\..\..\..\src\router.cpp" />
-      <File RelativePath="..\..\..\..\src\scatter.cpp" />
-      <File RelativePath="..\..\..\..\src\select.cpp" />
-      <File RelativePath="..\..\..\..\src\server.cpp" />
-      <File RelativePath="..\..\..\..\src\session_base.cpp" />
-      <File RelativePath="..\..\..\..\src\signaler.cpp" />
-      <File RelativePath="..\..\..\..\src\socket_base.cpp" />
-      <File RelativePath="..\..\..\..\src\socket_poller.cpp" />
-      <File RelativePath="..\..\..\..\src\socks_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\socks.cpp" />
-      <File RelativePath="..\..\..\..\src\stream.cpp" />
-      <File RelativePath="..\..\..\..\src\stream_engine.cpp" />
-      <File RelativePath="..\..\..\..\src\sub.cpp" />
-      <File RelativePath="..\..\..\..\src\tcp_address.cpp" />
-      <File RelativePath="..\..\..\..\src\tcp_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\tcp.cpp" />
-      <File RelativePath="..\..\..\..\src\tcp_listener.cpp" />
-      <File RelativePath="..\..\..\..\src\thread.cpp" />
-      <File RelativePath="..\..\..\..\src\timers.cpp" />
-      <File RelativePath="..\..\..\..\src\tipc_address.cpp" />
-      <File RelativePath="..\..\..\..\src\tipc_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\tipc_listener.cpp" />
-      <File RelativePath="..\..\..\..\src\trie.cpp" />
-      <File RelativePath="..\..\..\..\src\udp_address.cpp" />
-      <File RelativePath="..\..\..\..\src\udp_engine.cpp" />
-      <File RelativePath="..\..\..\..\src\v1_decoder.cpp" />
-      <File RelativePath="..\..\..\..\src\v1_encoder.cpp" />
-      <File RelativePath="..\..\..\..\src\v2_decoder.cpp" />
-      <File RelativePath="..\..\..\..\src\v2_encoder.cpp" />
-      <File RelativePath="..\..\..\..\src\vmci_address.cpp" />
-      <File RelativePath="..\..\..\..\src\vmci_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\vmci.cpp" />
-      <File RelativePath="..\..\..\..\src\vmci_listener.cpp" />
-      <File RelativePath="..\..\..\..\src\xpub.cpp" />
-      <File RelativePath="..\..\..\..\src\xsub.cpp" />
-      <File RelativePath="..\..\..\..\src\zap_client.cpp" />
-      <File RelativePath="..\..\..\..\src\zmq.cpp" />
-      <File RelativePath="..\..\..\..\src\zmq_utils.cpp" />
-    </Filter>
-    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\errno.hpp" />
-      <File RelativePath="..\..\..\..\src\address.hpp" />
-      <File RelativePath="..\..\..\..\src\array.hpp" />
-      <File RelativePath="..\..\..\..\src\atomic_counter.hpp" />
-      <File RelativePath="..\..\..\..\src\atomic_ptr.hpp" />
-      <File RelativePath="..\..\..\..\src\blob.hpp" />
-      <File RelativePath="..\..\..\..\src\client.hpp" />
-      <File RelativePath="..\..\..\..\src\clock.hpp" />
-      <File RelativePath="..\..\..\..\src\command.hpp" />
-      <File RelativePath="..\..\..\..\src\condition_variable.hpp" />
-      <File RelativePath="..\..\..\..\src\config.hpp" />
-      <File RelativePath="..\..\..\..\src\ctx.hpp" />
-      <File RelativePath="..\..\..\..\src\curve_client.hpp" />
-      <File RelativePath="..\..\..\..\src\curve_client_tools.hpp" />
-      <File RelativePath="..\..\..\..\src\curve_mechanism_base.hpp" />
-      <File RelativePath="..\..\..\..\src\curve_server.hpp" />
-      <File RelativePath="..\..\..\..\src\dbuffer.hpp" />
-      <File RelativePath="..\..\..\..\src\dealer.hpp" />
-      <File RelativePath="..\..\..\..\src\decoder_allocators.hpp" />
-      <File RelativePath="..\..\..\..\src\decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\devpoll.hpp" />
-      <File RelativePath="..\..\..\..\src\dgram.hpp" />
-      <File RelativePath="..\..\..\..\src\dish.hpp" />
-      <File RelativePath="..\..\..\..\src\dist.hpp" />
-      <File RelativePath="..\..\..\..\src\encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\epoll.hpp" />
-      <File RelativePath="..\..\..\..\src\err.hpp" />
-      <File RelativePath="..\..\..\..\src\fd.hpp" />
-      <File RelativePath="..\..\..\..\src\fq.hpp" />
-      <File RelativePath="..\..\..\..\src\gather.hpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_client.hpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_server.hpp" />
-      <File RelativePath="..\..\..\..\src\i_decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\i_encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\i_engine.hpp" />
-      <File RelativePath="..\..\..\..\src\i_mailbox.hpp" />
-      <File RelativePath="..\..\..\..\src\io_object.hpp" />
-      <File RelativePath="..\..\..\..\src\io_thread.hpp" />
-      <File RelativePath="..\..\..\..\src\ipc_address.hpp" />
-      <File RelativePath="..\..\..\..\src\ipc_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\ipc_listener.hpp" />
-      <File RelativePath="..\..\..\..\src\ip.hpp" />
-      <File RelativePath="..\..\..\..\src\i_poll_events.hpp" />
-      <File RelativePath="..\..\..\..\src\kqueue.hpp" />
-      <File RelativePath="..\..\..\..\src\lb.hpp" />
-      <File RelativePath="..\..\..\..\src\likely.hpp" />
-      <File RelativePath="..\..\..\..\src\macros.hpp" />
-      <File RelativePath="..\..\..\..\src\mailbox.hpp" />
-      <File RelativePath="..\..\..\..\src\mailbox_safe.hpp" />
-      <File RelativePath="..\..\..\..\src\mechanism_base.hpp" />
-      <File RelativePath="..\..\..\..\src\mechanism.hpp" />
-      <File RelativePath="..\..\..\..\src\metadata.hpp" />
-      <File RelativePath="..\..\..\..\src\msg.hpp" />
-      <File RelativePath="..\..\..\..\src\mtrie.hpp" />
-      <File RelativePath="..\..\..\..\src\mutex.hpp" />
-      <File RelativePath="..\..\..\..\src\norm_engine.hpp" />
-      <File RelativePath="..\..\..\..\src\null_mechanism.hpp" />
-      <File RelativePath="..\..\..\..\src\object.hpp" />
-      <File RelativePath="..\..\..\..\src\options.hpp" />
-      <File RelativePath="..\..\..\..\src\own.hpp" />
-      <File RelativePath="..\..\..\..\src\pair.hpp" />
-      <File RelativePath="..\..\..\..\src\pgm_receiver.hpp" />
-      <File RelativePath="..\..\..\..\src\pgm_sender.hpp" />
-      <File RelativePath="..\..\..\..\src\pgm_socket.hpp" />
-      <File RelativePath="..\..\..\..\src\pipe.hpp" />
-      <File RelativePath="..\..\..\..\src\plain_client.hpp" />
-      <File RelativePath="..\..\..\..\src\plain_server.hpp" />
-      <File RelativePath="..\..\..\..\src\platform.hpp" />
-      <File RelativePath="..\..\..\..\src\poller_base.hpp" />
-      <File RelativePath="..\..\..\..\src\poller.hpp" />
-      <File RelativePath="..\..\..\..\src\poll.hpp" />
-      <File RelativePath="..\..\..\..\src\pollset.hpp" />
-      <File RelativePath="..\..\..\..\src\precompiled.hpp" />
-      <File RelativePath="..\..\..\..\src\proxy.hpp" />
-      <File RelativePath="..\..\..\..\src\pub.hpp" />
-      <File RelativePath="..\..\..\..\src\pull.hpp" />
-      <File RelativePath="..\..\..\..\src\push.hpp" />
-      <File RelativePath="..\..\..\..\src\radio.hpp" />
-      <File RelativePath="..\..\..\..\src\random.hpp" />
-      <File RelativePath="..\..\..\..\src\raw_decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\raw_encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\reaper.hpp" />
-      <File RelativePath="..\..\..\..\src\rep.hpp" />
-      <File RelativePath="..\..\..\..\src\req.hpp" />
-      <File RelativePath="..\..\..\..\src\router.hpp" />
-      <File RelativePath="..\..\..\..\src\scatter.hpp" />
-      <File RelativePath="..\..\..\..\src\select.hpp" />
-      <File RelativePath="..\..\..\..\src\server.hpp" />
-      <File RelativePath="..\..\..\..\src\session_base.hpp" />
-      <File RelativePath="..\..\..\..\src\signaler.hpp" />
-      <File RelativePath="..\..\..\..\src\socket_base.hpp" />
-      <File RelativePath="..\..\..\..\src\socket_poller.hpp" />
-      <File RelativePath="..\..\..\..\src\socks_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\socks.hpp" />
-      <File RelativePath="..\..\..\..\src\stdint.hpp" />
-      <File RelativePath="..\..\..\..\src\stream_engine.hpp" />
-      <File RelativePath="..\..\..\..\src\stream.hpp" />
-      <File RelativePath="..\..\..\..\src\sub.hpp" />
-      <File RelativePath="..\..\..\..\src\tcp_address.hpp" />
-      <File RelativePath="..\..\..\..\src\tcp_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\tcp.hpp" />
-      <File RelativePath="..\..\..\..\src\tcp_listener.hpp" />
-      <File RelativePath="..\..\..\..\src\thread.hpp" />
-      <File RelativePath="..\..\..\..\src\timers.hpp" />
-      <File RelativePath="..\..\..\..\src\tipc_address.hpp" />
-      <File RelativePath="..\..\..\..\src\tipc_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\tipc_listener.hpp" />
-      <File RelativePath="..\..\..\..\src\trie.hpp" />
-      <File RelativePath="..\..\..\..\src\udp_address.hpp" />
-      <File RelativePath="..\..\..\..\src\udp_engine.hpp" />
-      <File RelativePath="..\..\..\..\src\v1_decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\v1_encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\v2_decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\v2_encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\v2_protocol.hpp" />
-      <File RelativePath="..\..\..\..\src\vmci_address.hpp" />
-      <File RelativePath="..\..\..\..\src\vmci_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\vmci.hpp" />
-      <File RelativePath="..\..\..\..\src\vmci_listener.hpp" />
-      <File RelativePath="..\..\..\..\src\windows.hpp" />
-      <File RelativePath="..\..\..\..\src\wire.hpp" />
-      <File RelativePath="..\..\..\..\src\xpub.hpp" />
-      <File RelativePath="..\..\..\..\src\xsub.hpp" />
-      <File RelativePath="..\..\..\..\src\ypipe_base.hpp" />
-      <File RelativePath="..\..\..\..\src\ypipe_conflate.hpp" />
-      <File RelativePath="..\..\..\..\src\ypipe.hpp" />
-      <File RelativePath="..\..\..\..\src\yqueue.hpp" />
-      <File RelativePath="..\..\..\..\src\zap_client.hpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/builds/deprecated-msvc/vs2008/local_lat/local_lat.vcproj b/builds/deprecated-msvc/vs2008/local_lat/local_lat.vcproj
deleted file mode 100644
index 7a0bc3fb9..000000000
--- a/builds/deprecated-msvc/vs2008/local_lat/local_lat.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="local_lat" ProjectGUID="{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}" RootNamespace="local_lat" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../bindings/c" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/local_lat.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../bindings/c" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/local_lat.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\local_lat.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/builds/deprecated-msvc/vs2008/local_thr/local_thr.vcproj b/builds/deprecated-msvc/vs2008/local_thr/local_thr.vcproj
deleted file mode 100644
index b0e2b0494..000000000
--- a/builds/deprecated-msvc/vs2008/local_thr/local_thr.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="local_thr" ProjectGUID="{8EF2DF6B-6646-460F-8032-913B70FE0E94}" RootNamespace="local_thr" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../bindings/c" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/local_thr.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../bindings/c" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/local_thr.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\local_thr.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/builds/deprecated-msvc/vs2008/remote_lat/remote_lat.vcproj b/builds/deprecated-msvc/vs2008/remote_lat/remote_lat.vcproj
deleted file mode 100644
index c902e78f2..000000000
--- a/builds/deprecated-msvc/vs2008/remote_lat/remote_lat.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="remote_lat" ProjectGUID="{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}" RootNamespace="remote_lat" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../bindings/c" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/remote_lat.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../bindings/c" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/remote_lat.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\remote_lat.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/builds/deprecated-msvc/vs2008/remote_thr/remote_thr.vcproj b/builds/deprecated-msvc/vs2008/remote_thr/remote_thr.vcproj
deleted file mode 100644
index f51fcfae3..000000000
--- a/builds/deprecated-msvc/vs2008/remote_thr/remote_thr.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="remote_thr" ProjectGUID="{B15E059C-0CBB-4A82-8C42-6567FB650802}" RootNamespace="remote_thr" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../bindings/c" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/remote_thr.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../bindings/c" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/remote_thr.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\remote_thr.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.props b/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b40..000000000
--- a/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.vcxproj b/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index 8fbb87037..000000000
--- a/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.props b/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba50589b..000000000
--- a/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.vcxproj b/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index 5d32fb838..000000000
--- a/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/libsodium.import.props b/builds/deprecated-msvc/vs2010/libsodium.import.props
deleted file mode 100644
index b3d7e4fd8..000000000
--- a/builds/deprecated-msvc/vs2010/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/libsodium.import.xml b/builds/deprecated-msvc/vs2010/libsodium.import.xml
deleted file mode 100644
index dbcf4e5ab..000000000
--- a/builds/deprecated-msvc/vs2010/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/libzmq.import.props b/builds/deprecated-msvc/vs2010/libzmq.import.props
deleted file mode 100644
index 2f71ff846..000000000
--- a/builds/deprecated-msvc/vs2010/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/libzmq.import.xml b/builds/deprecated-msvc/vs2010/libzmq.import.xml
deleted file mode 100644
index a25a1ba92..000000000
--- a/builds/deprecated-msvc/vs2010/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/libzmq.sln b/builds/deprecated-msvc/vs2010/libzmq.sln
deleted file mode 100644
index 45a13cba2..000000000
--- a/builds/deprecated-msvc/vs2010/libzmq.sln
+++ /dev/null
@@ -1,206 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/builds/deprecated-msvc/vs2010/libzmq/libzmq.props b/builds/deprecated-msvc/vs2010/libzmq/libzmq.props
deleted file mode 100644
index 22da05ab7..000000000
--- a/builds/deprecated-msvc/vs2010/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj b/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj
deleted file mode 100644
index bc07be2ba..000000000
--- a/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj.filters b/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009b3..000000000
--- a/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/libzmq/libzmq.xml b/builds/deprecated-msvc/vs2010/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe035..000000000
--- a/builds/deprecated-msvc/vs2010/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/local_lat/local_lat.props b/builds/deprecated-msvc/vs2010/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e564..000000000
--- a/builds/deprecated-msvc/vs2010/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/local_lat/local_lat.vcxproj b/builds/deprecated-msvc/vs2010/local_lat/local_lat.vcxproj
deleted file mode 100644
index 76bfb4f76..000000000
--- a/builds/deprecated-msvc/vs2010/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/local_thr/local_thr.props b/builds/deprecated-msvc/vs2010/local_thr/local_thr.props
deleted file mode 100644
index 1d017d40d..000000000
--- a/builds/deprecated-msvc/vs2010/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/local_thr/local_thr.vcxproj b/builds/deprecated-msvc/vs2010/local_thr/local_thr.vcxproj
deleted file mode 100644
index a493408fd..000000000
--- a/builds/deprecated-msvc/vs2010/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.props b/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5ec..000000000
--- a/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.vcxproj b/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index a58083f3a..000000000
--- a/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.props b/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.props
deleted file mode 100644
index 001e48133..000000000
--- a/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.vcxproj b/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index 6724a5bbb..000000000
--- a/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.props b/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b40..000000000
--- a/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.vcxproj b/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index 0b5a8a113..000000000
--- a/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.props b/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba50589b..000000000
--- a/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.vcxproj b/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index 6a44c5c14..000000000
--- a/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/libsodium.import.props b/builds/deprecated-msvc/vs2012/libsodium.import.props
deleted file mode 100644
index b3d7e4fd8..000000000
--- a/builds/deprecated-msvc/vs2012/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/libsodium.import.xml b/builds/deprecated-msvc/vs2012/libsodium.import.xml
deleted file mode 100644
index dbcf4e5ab..000000000
--- a/builds/deprecated-msvc/vs2012/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/libzmq.import.props b/builds/deprecated-msvc/vs2012/libzmq.import.props
deleted file mode 100644
index 2f71ff846..000000000
--- a/builds/deprecated-msvc/vs2012/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/libzmq.import.xml b/builds/deprecated-msvc/vs2012/libzmq.import.xml
deleted file mode 100644
index a25a1ba92..000000000
--- a/builds/deprecated-msvc/vs2012/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/libzmq.sln b/builds/deprecated-msvc/vs2012/libzmq.sln
deleted file mode 100644
index 15f41ac70..000000000
--- a/builds/deprecated-msvc/vs2012/libzmq.sln
+++ /dev/null
@@ -1,206 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/builds/deprecated-msvc/vs2012/libzmq/libzmq.props b/builds/deprecated-msvc/vs2012/libzmq/libzmq.props
deleted file mode 100644
index 22da05ab7..000000000
--- a/builds/deprecated-msvc/vs2012/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj b/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj
deleted file mode 100644
index cc0d84fd3..000000000
--- a/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj.filters b/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009b3..000000000
--- a/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/libzmq/libzmq.xml b/builds/deprecated-msvc/vs2012/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe035..000000000
--- a/builds/deprecated-msvc/vs2012/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/local_lat/local_lat.props b/builds/deprecated-msvc/vs2012/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e564..000000000
--- a/builds/deprecated-msvc/vs2012/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/local_lat/local_lat.vcxproj b/builds/deprecated-msvc/vs2012/local_lat/local_lat.vcxproj
deleted file mode 100644
index 03aab15b7..000000000
--- a/builds/deprecated-msvc/vs2012/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/local_thr/local_thr.props b/builds/deprecated-msvc/vs2012/local_thr/local_thr.props
deleted file mode 100644
index 1d017d40d..000000000
--- a/builds/deprecated-msvc/vs2012/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/local_thr/local_thr.vcxproj b/builds/deprecated-msvc/vs2012/local_thr/local_thr.vcxproj
deleted file mode 100644
index 98b1db853..000000000
--- a/builds/deprecated-msvc/vs2012/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.props b/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5ec..000000000
--- a/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.vcxproj b/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index ce24b7061..000000000
--- a/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.props b/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.props
deleted file mode 100644
index 001e48133..000000000
--- a/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.vcxproj b/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index 942e2d331..000000000
--- a/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.props b/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b40..000000000
--- a/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.vcxproj b/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index f2809531b..000000000
--- a/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.props b/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba50589b..000000000
--- a/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.vcxproj b/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index c587b6559..000000000
--- a/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/libsodium.import.props b/builds/deprecated-msvc/vs2013/libsodium.import.props
deleted file mode 100644
index b3d7e4fd8..000000000
--- a/builds/deprecated-msvc/vs2013/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/libsodium.import.xml b/builds/deprecated-msvc/vs2013/libsodium.import.xml
deleted file mode 100644
index dbcf4e5ab..000000000
--- a/builds/deprecated-msvc/vs2013/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/libzmq.import.props b/builds/deprecated-msvc/vs2013/libzmq.import.props
deleted file mode 100644
index 2f71ff846..000000000
--- a/builds/deprecated-msvc/vs2013/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/libzmq.import.xml b/builds/deprecated-msvc/vs2013/libzmq.import.xml
deleted file mode 100644
index a25a1ba92..000000000
--- a/builds/deprecated-msvc/vs2013/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/libzmq.sln b/builds/deprecated-msvc/vs2013/libzmq.sln
deleted file mode 100644
index e390e7f62..000000000
--- a/builds/deprecated-msvc/vs2013/libzmq.sln
+++ /dev/null
@@ -1,208 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/builds/deprecated-msvc/vs2013/libzmq/libzmq.props b/builds/deprecated-msvc/vs2013/libzmq/libzmq.props
deleted file mode 100644
index 22da05ab7..000000000
--- a/builds/deprecated-msvc/vs2013/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj b/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj
deleted file mode 100644
index 3d42eaa68..000000000
--- a/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj.filters b/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009b3..000000000
--- a/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/libzmq/libzmq.xml b/builds/deprecated-msvc/vs2013/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe035..000000000
--- a/builds/deprecated-msvc/vs2013/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/local_lat/local_lat.props b/builds/deprecated-msvc/vs2013/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e564..000000000
--- a/builds/deprecated-msvc/vs2013/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/local_lat/local_lat.vcxproj b/builds/deprecated-msvc/vs2013/local_lat/local_lat.vcxproj
deleted file mode 100644
index 97386bcb9..000000000
--- a/builds/deprecated-msvc/vs2013/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/local_thr/local_thr.props b/builds/deprecated-msvc/vs2013/local_thr/local_thr.props
deleted file mode 100644
index 1d017d40d..000000000
--- a/builds/deprecated-msvc/vs2013/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/local_thr/local_thr.vcxproj b/builds/deprecated-msvc/vs2013/local_thr/local_thr.vcxproj
deleted file mode 100644
index ee15fa5a1..000000000
--- a/builds/deprecated-msvc/vs2013/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.props b/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5ec..000000000
--- a/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.vcxproj b/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index a6f0bd637..000000000
--- a/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.props b/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.props
deleted file mode 100644
index 001e48133..000000000
--- a/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.vcxproj b/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index 0a53c12d9..000000000
--- a/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.props b/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b40..000000000
--- a/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.vcxproj b/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index d5ce1970d..000000000
--- a/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.props b/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba50589b..000000000
--- a/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.vcxproj b/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index fa3127f89..000000000
--- a/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/libsodium.import.props b/builds/deprecated-msvc/vs2015/libsodium.import.props
deleted file mode 100644
index b3d7e4fd8..000000000
--- a/builds/deprecated-msvc/vs2015/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/libsodium.import.xml b/builds/deprecated-msvc/vs2015/libsodium.import.xml
deleted file mode 100644
index dbcf4e5ab..000000000
--- a/builds/deprecated-msvc/vs2015/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/libzmq.import.props b/builds/deprecated-msvc/vs2015/libzmq.import.props
deleted file mode 100644
index 2f71ff846..000000000
--- a/builds/deprecated-msvc/vs2015/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/libzmq.import.xml b/builds/deprecated-msvc/vs2015/libzmq.import.xml
deleted file mode 100644
index a25a1ba92..000000000
--- a/builds/deprecated-msvc/vs2015/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/libzmq.sln b/builds/deprecated-msvc/vs2015/libzmq.sln
deleted file mode 100644
index 34be09f50..000000000
--- a/builds/deprecated-msvc/vs2015/libzmq.sln
+++ /dev/null
@@ -1,208 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/builds/deprecated-msvc/vs2015/libzmq/libzmq.props b/builds/deprecated-msvc/vs2015/libzmq/libzmq.props
deleted file mode 100644
index 22da05ab7..000000000
--- a/builds/deprecated-msvc/vs2015/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj b/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj
deleted file mode 100644
index 3211e8a88..000000000
--- a/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip_resolver.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip_resolver.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj.filters b/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009b3..000000000
--- a/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/libzmq/libzmq.xml b/builds/deprecated-msvc/vs2015/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe035..000000000
--- a/builds/deprecated-msvc/vs2015/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/local_lat/local_lat.props b/builds/deprecated-msvc/vs2015/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e564..000000000
--- a/builds/deprecated-msvc/vs2015/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/local_lat/local_lat.vcxproj b/builds/deprecated-msvc/vs2015/local_lat/local_lat.vcxproj
deleted file mode 100644
index 4f905e63d..000000000
--- a/builds/deprecated-msvc/vs2015/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/local_thr/local_thr.props b/builds/deprecated-msvc/vs2015/local_thr/local_thr.props
deleted file mode 100644
index 1d017d40d..000000000
--- a/builds/deprecated-msvc/vs2015/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/local_thr/local_thr.vcxproj b/builds/deprecated-msvc/vs2015/local_thr/local_thr.vcxproj
deleted file mode 100644
index 79be83b23..000000000
--- a/builds/deprecated-msvc/vs2015/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.props b/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5ec..000000000
--- a/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.vcxproj b/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index 98faec58d..000000000
--- a/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.props b/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.props
deleted file mode 100644
index 001e48133..000000000
--- a/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.vcxproj b/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index d803d1556..000000000
--- a/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015_xp/libzmq.vcxproj b/builds/deprecated-msvc/vs2015_xp/libzmq.vcxproj
deleted file mode 100644
index 69623b5ab..000000000
--- a/builds/deprecated-msvc/vs2015_xp/libzmq.vcxproj
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{217AD6A0-8CEA-428D-908F-C34B23CECAAF}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libzmq</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;LIBZMQ_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;LIBZMQ_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\src\norm_engine.cpp" />
-    <ClCompile Include="..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\src\pollset.cpp" />
-    <ClCompile Include="..\..\..\src\precompiled.cpp" />
-    <ClCompile Include="..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\src\tipc_address.cpp" />
-    <ClCompile Include="..\..\..\src\tipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\tipc_listener.cpp" />
-    <ClCompile Include="..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\src\vmci.cpp" />
-    <ClCompile Include="..\..\..\src\vmci_address.cpp" />
-    <ClCompile Include="..\..\..\src\vmci_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\vmci_listener.cpp" />
-    <ClCompile Include="..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\src\zmq.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\src\mutex.hpp" />
-    <ClInclude Include="platform.hpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2015_xp/platform.hpp b/builds/deprecated-msvc/vs2015_xp/platform.hpp
deleted file mode 100644
index 1694bc121..000000000
--- a/builds/deprecated-msvc/vs2015_xp/platform.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __PLATFORM_HPP_INCLUDED__
-#define __PLATFORM_HPP_INCLUDED__
-
-#define ZMQ_HAVE_WINDOWS
-#define ZMQ_HAVE_WINDOWS_TARGET_XP
-
-#define ZMQ_BUILD_DRAFT_API
-
-#define ZMQ_USE_SELECT
-#define FD_SETSIZE 1024
-
-#pragma comment(lib,"ws2_32.lib")
-#pragma comment(lib,"Iphlpapi.lib")
-
-#endif
diff --git a/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp b/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp
deleted file mode 100644
index 30971040c..000000000
--- a/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-Server thread listen ZMQ_SERVER socket and transfer incoming message 
-to worker threads by ZMQ_PUSH-ZMQ_PULL
-Worker thread receive message and send back to ZMQ_SERVER socket
-
-Each client thread open CLIENT_CONNECTION ZMQ_CLIENT sockets, 
-send random size message to each socket and check server answer
-*/
-
-#define ZMQ_BUILD_DRAFT_API
-#include "../../../../include/zmq.h"
-
-#pragma comment(lib,"libzmq.lib")
-
-#include <assert.h>
-#include <stdlib.h>
-#include <thread>
-#include <atomic>
-
-#define SERVER_ADDR "tcp://127.0.0.1:12345"
-#define SERVER_WORKER_COUNT 3	// worker threads count
-
-#define CLIENT_COUNT 5			// client threads count
-#define CLIENT_CONNECTION 100	// ZMQ_CLIENT sockets at each client
-#define CLIENT_RECCONECT 1000	// reconnect one socket after messages
-
-#define MESSAGE_MAX_SIZE 1024
-
-//*******************************************************************
-//****** MESSAGE ****************************************************
-//*******************************************************************
-
-void message_fill(zmq_msg_t* msg, int val) {
-	assert(val > 0);
-	int size = sizeof(int) * 2 + val;
-	int rc = zmq_msg_init_size(msg, size); assert(rc == 0);
-	uint8_t* data = (uint8_t*)zmq_msg_data(msg);
-	memcpy(data, &val, sizeof(int));
-	data += sizeof(int);
-	memset(data, val & 0xFF, val);
-	int check_sum = val + (val & 0xFF) * val;
-	data += val;
-	memcpy(data, &check_sum, sizeof(int));
-}
-
-int message_check(zmq_msg_t* msg) {
-	uint8_t* data = (uint8_t*)zmq_msg_data(msg);
-	int size = zmq_msg_size(msg);
-	assert(size > sizeof(int) * 2);
-	// check size
-	int val;
-	memcpy(&val, data, sizeof(int));
-	if(size != sizeof(int) * 2 + val) { 
-		fprintf(stderr, "wrong message: val = %d size = %d\n", val, size);
-		return -1;
-	}
-	// check sum
-	data += sizeof(int);
-	int cs = val;
-	for(int i = 0; i < val; i++) {
-		cs += data[i];
-	}
-	data += val;
-	int check_sum;
-	memcpy(&check_sum, data, sizeof(int));
-	if(check_sum != cs) {
-		fprintf(stderr, "wrong message: cs = %d check_sum = %d\n", cs, check_sum);
-		return -1;
-	}
-	return val;
-}
-
-//*******************************************************************
-//****** SERVER *****************************************************
-//*******************************************************************
-
-void *server_ctx = NULL;
-void *server_sock = NULL;
-
-std::atomic<int> worker_cnt[SERVER_WORKER_COUNT] = {0}; // statistic
-
-// worker thread
-void worker(int num) {
-	printf("worker %d start\n", num);
-	void* queue = zmq_socket(server_ctx, ZMQ_PULL); assert(queue);
-	int rc = zmq_connect(queue, "inproc://queue"); assert(rc == 0);
-
-	while (1) {
-		// receive messages from the queue
-		zmq_msg_t msg;
-		rc = zmq_msg_init(&msg); assert(rc == 0);
-		rc = zmq_msg_recv(&msg, queue, 0); assert(rc > 0);
-		// check message
-		//printf("worker %d recv %d bytes at %X from %X\n", num, zmq_msg_size(&msg), zmq_msg_data(&msg), zmq_msg_routing_id(&msg));
-		// send to client
-		rc = zmq_msg_send(&msg, server_sock, 0); assert(rc != -1);
-		worker_cnt[num]++;
-	}
-	zmq_close(queue);
-}
-
-// server thread
-void server() {
-	server_ctx = zmq_ctx_new(); assert(server_ctx);
-	// create queue
-	void* queue = zmq_socket(server_ctx, ZMQ_PUSH);	assert(queue);
-	int rc = zmq_bind(queue, "inproc://queue"); assert(rc == 0);
-	// start workers
-	std::thread w[SERVER_WORKER_COUNT];
-	for (int i = 0; i < SERVER_WORKER_COUNT; i++) w[i] = std::thread(worker, i);
-	// ZMQ_SERVER for client messages
-	server_sock = zmq_socket(server_ctx, ZMQ_SERVER); assert(server_sock);
-	rc = zmq_bind(server_sock, SERVER_ADDR); assert(rc == 0);
-
-	while (1) {
-		// wait client message
-		zmq_msg_t msg;
-		rc = zmq_msg_init(&msg); assert(rc == 0); 
-		rc = zmq_msg_recv(&msg, server_sock, 0); assert(rc > 0);
-		//printf("recv %d bytes at %X from %X\n", zmq_msg_size(&msg), zmq_msg_data(&msg), zmq_msg_routing_id(&msg));
-		// send message to queue
-		rc = zmq_msg_send(&msg, queue, 0); assert(rc > 0);
-	}
-}
-
-//*******************************************************************
-//****** CLIENT *****************************************************
-//*******************************************************************
-
-std::atomic<int> client_cnt[CLIENT_COUNT] = { 0 }; // statistic
-std::atomic<int> client_ready = 0; 
-
-// client thread
-void client(int num)
-{
-	//printf("client %d start. Open %d connections\n", num, CLIENT_CONNECTION);
-
-	void *ctx = zmq_ctx_new(); assert(ctx);
-
-	void *sock[CLIENT_CONNECTION];
-	int rc;
-	// open ZMQ_CLIENT connections
-	for (int i = 0; i < CLIENT_CONNECTION; i++) {
-		sock[i] = zmq_socket(ctx, ZMQ_CLIENT); assert(sock[i]);
-		rc = zmq_connect(sock[i], SERVER_ADDR); assert(rc == 0);
-		// test connection
-		zmq_msg_t msg;
-		int v = rand() % 256 + 1;
-		message_fill(&msg, v);
-		rc = zmq_msg_send(&msg, sock[i], 0); assert(rc > 0);
-		rc = zmq_msg_init(&msg); assert(rc == 0);
-		rc = zmq_msg_recv(&msg, sock[i], 0); assert(rc > 0);
-		rc = message_check(&msg); assert(rc == v);
-		zmq_msg_close(&msg);
-	}
-	printf("client %d open %d connections\n", num, CLIENT_CONNECTION);
-	client_ready++;
-	while (client_ready < CLIENT_COUNT) Sleep(10); // wait while all clients open sockets
-
-	int recconect = 0;
-	while(1) {
-		int val[CLIENT_CONNECTION];
-		zmq_msg_t msg;
-		// send messages
-		for(int i = 0; i < CLIENT_CONNECTION; i++) {
-			val[i] = rand() % MESSAGE_MAX_SIZE + 1;
-			message_fill(&msg, val[i]);
-			rc = zmq_msg_send(&msg, sock[i], 0); assert(rc > 0);
-		}
-		// recv and check
-		for (int i = 0; i < CLIENT_CONNECTION; i++) {
-			rc = zmq_msg_init(&msg); assert(rc == 0);
-			rc = zmq_msg_recv(&msg, sock[i], 0); assert(rc > 0);
-			rc = message_check(&msg);
-			if(rc != val[i] && rc > 0) {
-				fprintf(stderr, "wrong message: send %d recv %d     \n", val[i], rc);
-			}
-			zmq_msg_close(&msg);
-			client_cnt[num]++;
-		}
-		// reconnect one
-		recconect++;
-		if(recconect == CLIENT_RECCONECT) {
-			int n = rand() % CLIENT_CONNECTION;
-			zmq_close(sock[n]);
-			sock[n] = zmq_socket(ctx, ZMQ_CLIENT); assert(sock[n]);
-			int rc = zmq_connect(sock[n], SERVER_ADDR); assert(rc == 0);
-		}
-	}
-}
-
-//*******************************************************************
-int main (void) {
-	int v1, v2, v3; zmq_version(&v1, &v2, &v3);
-	printf("ZMQ version %d.%d.%d. Compile %s %s\n", v1, v2, v3, __DATE__, __TIME__);
-
-	std::thread ct[CLIENT_COUNT];
-	for (int i = 0; i < CLIENT_COUNT; i++) ct[i] = std::thread(client, i);
-
-	std::thread st(server);
-
-	int w[SERVER_WORKER_COUNT] = { 0 };
-	int c[CLIENT_COUNT] = { 0 };
-	int total = 0;
-
-	while(1) {
-		Sleep(1000);
-		if (client_ready < CLIENT_COUNT) continue;
-		// check workers
-		for(int i = 0; i < SERVER_WORKER_COUNT; i++) {
-			if(w[i] == worker_cnt[i]) {
-				fprintf(stderr, "worker %d not work        \n", i);
-			}
-			w[i] = worker_cnt[i];
-		}
-		// check clients
-		int t = 0;
-		for (int i = 0; i < CLIENT_COUNT; i++) {
-			if (c[i] == client_cnt[i]) {
-				fprintf(stderr, "client %d not work        \n", i);
-			}
-			c[i] = client_cnt[i];
-			t += c[i];
-		}
-		printf("\rTotal %d messages. Speed %d per second  ", t, t - total);
-		total = t;
-	}
-	return 0;
-}
diff --git a/builds/deprecated-msvc/vs2015_xp/test_zmq/test_zmq.vcxproj b/builds/deprecated-msvc/vs2015_xp/test_zmq/test_zmq.vcxproj
deleted file mode 100644
index 32a459975..000000000
--- a/builds/deprecated-msvc/vs2015_xp/test_zmq/test_zmq.vcxproj
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{101324AB-CF3E-4D99-8B69-2000CEA487B6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>test_zmq</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="test_multithread.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.props b/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b40..000000000
--- a/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.vcxproj b/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index fd01a39b6..000000000
--- a/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.props b/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba50589b..000000000
--- a/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.vcxproj b/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index 5aedaf658..000000000
--- a/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/libsodium.import.props b/builds/deprecated-msvc/vs2017/libsodium.import.props
deleted file mode 100644
index b3d7e4fd8..000000000
--- a/builds/deprecated-msvc/vs2017/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/libsodium.import.xml b/builds/deprecated-msvc/vs2017/libsodium.import.xml
deleted file mode 100644
index dbcf4e5ab..000000000
--- a/builds/deprecated-msvc/vs2017/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/libzmq.import.props b/builds/deprecated-msvc/vs2017/libzmq.import.props
deleted file mode 100644
index 2f71ff846..000000000
--- a/builds/deprecated-msvc/vs2017/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/libzmq.import.xml b/builds/deprecated-msvc/vs2017/libzmq.import.xml
deleted file mode 100644
index a25a1ba92..000000000
--- a/builds/deprecated-msvc/vs2017/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/libzmq.sln b/builds/deprecated-msvc/vs2017/libzmq.sln
deleted file mode 100644
index 17f13dec7..000000000
--- a/builds/deprecated-msvc/vs2017/libzmq.sln
+++ /dev/null
@@ -1,208 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.23107.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/builds/deprecated-msvc/vs2017/libzmq/libzmq.props b/builds/deprecated-msvc/vs2017/libzmq/libzmq.props
deleted file mode 100644
index 22da05ab7..000000000
--- a/builds/deprecated-msvc/vs2017/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj b/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj
deleted file mode 100644
index 8f3eee8d8..000000000
--- a/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj.filters b/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009b3..000000000
--- a/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/libzmq/libzmq.xml b/builds/deprecated-msvc/vs2017/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe035..000000000
--- a/builds/deprecated-msvc/vs2017/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/local_lat/local_lat.props b/builds/deprecated-msvc/vs2017/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e564..000000000
--- a/builds/deprecated-msvc/vs2017/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/local_lat/local_lat.vcxproj b/builds/deprecated-msvc/vs2017/local_lat/local_lat.vcxproj
deleted file mode 100644
index 4e54ed157..000000000
--- a/builds/deprecated-msvc/vs2017/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/local_thr/local_thr.props b/builds/deprecated-msvc/vs2017/local_thr/local_thr.props
deleted file mode 100644
index 1d017d40d..000000000
--- a/builds/deprecated-msvc/vs2017/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/local_thr/local_thr.vcxproj b/builds/deprecated-msvc/vs2017/local_thr/local_thr.vcxproj
deleted file mode 100644
index 2b3d6de44..000000000
--- a/builds/deprecated-msvc/vs2017/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.props b/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5ec..000000000
--- a/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.vcxproj b/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index 668410cd4..000000000
--- a/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.props b/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.props
deleted file mode 100644
index 001e48133..000000000
--- a/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.vcxproj b/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index 2e7d072f5..000000000
--- a/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/builds/gyp/.gitignore b/builds/gyp/.gitignore
deleted file mode 100644
index 9cd514819..000000000
--- a/builds/gyp/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-project.Makefile
-*.mk
-out/
-Makefile
-
diff --git a/builds/gyp/build.bat b/builds/gyp/build.bat
deleted file mode 100644
index 693de9e04..000000000
--- a/builds/gyp/build.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-:-  Needs Visual Studio 2015
-"\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
-msbuild /m /v:m project.sln
diff --git a/builds/gyp/platform.hpp b/builds/gyp/platform.hpp
deleted file mode 100644
index c463ca196..000000000
--- a/builds/gyp/platform.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__
-#define __ZMQ_PLATFORM_HPP_INCLUDED__
-
-//  This file provides the configuration for Linux, Windows, and OS/X
-//  as determined by ZMQ_HAVE_XXX macros passed from project.gyp
-
-//  Check that we're being called from our gyp makefile
-#ifndef ZMQ_GYP_BUILD
-#   error "foreign platform.hpp detected, please re-configure"
-#endif
-
-//  Set for all platforms
-#define ZMQ_HAVE_CURVE 1
-#define ZMQ_USE_TWEETNACL 1
-
-#if defined ZMQ_HAVE_WINDOWS
-#   define ZMQ_USE_SELECT 1
-
-#elif defined ZMQ_HAVE_OSX
-#   define ZMQ_USE_KQUEUE 1
-#   define HAVE_POSIX_MEMALIGN 1
-#   define ZMQ_HAVE_IFADDRS 1
-#   define ZMQ_HAVE_SO_KEEPALIVE 1
-#   define ZMQ_HAVE_TCP_KEEPALIVE 1
-#   define ZMQ_HAVE_TCP_KEEPCNT 1
-#   define ZMQ_HAVE_TCP_KEEPINTVL 1
-#   define ZMQ_HAVE_UIO 1
-#   define HAVE_FORK 1
-
-#elif defined ZMQ_HAVE_LINUX
-#   define ZMQ_USE_EPOLL 1
-#   define HAVE_POSIX_MEMALIGN 1
-#   define ZMQ_HAVE_EVENTFD 1
-#   define ZMQ_HAVE_IFADDRS 1
-#   define ZMQ_HAVE_SOCK_CLOEXEC 1
-#   define ZMQ_HAVE_SO_BINDTODEVICE 1
-#   define ZMQ_HAVE_SO_KEEPALIVE 1
-#   define ZMQ_HAVE_SO_PEERCRED 1
-#   define ZMQ_HAVE_TCP_KEEPCNT 1
-#   define ZMQ_HAVE_TCP_KEEPIDLE 1
-#   define ZMQ_HAVE_TCP_KEEPINTVL 1
-#   define ZMQ_HAVE_UIO 1
-#   define HAVE_CLOCK_GETTIME 1
-#   define HAVE_FORK 1
-#   define HAVE_ACCEPT4 1
-
-#else
-#   error "No platform defined, abandoning"
-#endif
-
-#endif
diff --git a/builds/gyp/project-tests.gsl b/builds/gyp/project-tests.gsl
deleted file mode 100644
index 2d0da0de3..000000000
--- a/builds/gyp/project-tests.gsl
+++ /dev/null
@@ -1,19 +0,0 @@
-.echo "Generating project-tests.gypi..."
-.output "project-tests.gypi"
-{
-  'targets': [
-.for test
-    {
-      'target_name': '$(name)',
-      'type': 'executable',
-      'sources': [
-        '../../tests/$(name).cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    }$(last ()?? ""? ",")
-.endfor
-  ]
-}
diff --git a/builds/gyp/project-tests.gypi b/builds/gyp/project-tests.gypi
deleted file mode 100644
index 8cb2d8f4a..000000000
--- a/builds/gyp/project-tests.gypi
+++ /dev/null
@@ -1,906 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'test_system',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_system.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_pair_inproc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_pair_inproc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_pair_tcp',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_pair_tcp.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_reqrep_inproc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_reqrep_inproc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_reqrep_tcp',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_reqrep_tcp.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_hwm',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_hwm.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_hwm_pubsub',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_hwm_pubsub.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_reqrep_device',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_reqrep_device.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_sub_forward',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_sub_forward.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_invalid_rep',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_invalid_rep.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_msg_flags',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_msg_flags.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_msg_ffn',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_msg_ffn.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_msg_init',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_msg_init.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_connect_resolve',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_connect_resolve.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_immediate',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_immediate.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_last_endpoint',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_last_endpoint.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_term_endpoint',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_term_endpoint.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_srcfd',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_srcfd.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_monitor',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_monitor.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_router_mandatory',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_router_mandatory.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_router_mandatory_hwm',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_router_mandatory_hwm.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_router_handover',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_router_handover.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_probe_router',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_probe_router.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream_empty',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream_empty.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream_disconnect',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream_disconnect.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream_timeout',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream_timeout.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_disconnect_inproc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_disconnect_inproc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_unbind_inproc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_unbind_inproc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_unbind_wildcard',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_unbind_wildcard.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_ctx_options',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_ctx_options.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_ctx_destroy',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_ctx_destroy.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_security_null',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_security_null.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_security_plain',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_security_plain.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_security_curve',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_security_curve.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_security_zap',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_security_zap.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_iov',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_iov.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_req',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_req.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_rep',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_rep.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_dealer',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_dealer.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_router',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_router.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_pushpull',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_pushpull.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_req_correlate',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_req_correlate.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_req_relaxed',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_req_relaxed.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_conflate',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_conflate.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_inproc_connect',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_inproc_connect.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_issue_566',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_issue_566.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_proxy',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_proxy.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_proxy_single_socket',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_proxy_single_socket.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_proxy_terminate',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_proxy_terminate.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_getsockopt_memset',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_getsockopt_memset.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_setsockopt',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_setsockopt.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_many_sockets',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_many_sockets.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_ipc_wildcard',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_ipc_wildcard.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_diffserv',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_diffserv.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_connect_rid',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_connect_rid.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_bind_src_address',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_bind_src_address.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_metadata',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_metadata.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_capabilities',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_capabilities.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_xpub_nodrop',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_xpub_nodrop.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_xpub_manual',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_xpub_manual.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_xpub_welcome_msg',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_xpub_welcome_msg.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_atomics',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_atomics.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_client_server',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_client_server.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_thread_safe',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_thread_safe.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_sockopt_hwm',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_sockopt_hwm.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_heartbeats',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_heartbeats.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream_exceeds_buffer',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream_exceeds_buffer.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_poller',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_poller.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_timers',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_timers.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_radio_dish',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_radio_dish.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_udp',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_udp.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_shutdown_stress',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_shutdown_stress.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_pair_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_pair_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_rebind_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_rebind_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_reqrep_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_reqrep_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_use_fd_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_use_fd_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_use_fd_tcp',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_use_fd_tcp.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_timeo',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_timeo.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_filter_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_filter_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_fork',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_fork.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_abstract_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_abstract_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    }
-  ]
-}
diff --git a/builds/gyp/project-tests.xml b/builds/gyp/project-tests.xml
deleted file mode 100644
index b70780396..000000000
--- a/builds/gyp/project-tests.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<tests script = "project-tests">
-    <test name = "test_system" />
-    <test name = "test_pair_inproc" />
-    <test name = "test_pair_tcp" />
-    <test name = "test_reqrep_inproc" />
-    <test name = "test_reqrep_tcp" />
-    <test name = "test_hwm" />
-    <test name = "test_hwm_pubsub" />
-    <test name = "test_reqrep_device" />
-    <test name = "test_sub_forward" />
-    <test name = "test_invalid_rep" />
-    <test name = "test_msg_flags" />
-    <test name = "test_msg_ffn" />
-    <test name = "test_msg_init" />
-    <test name = "test_connect_resolve" />
-    <test name = "test_immediate" />
-    <test name = "test_last_endpoint" />
-    <test name = "test_term_endpoint" />
-    <test name = "test_srcfd" />
-    <test name = "test_monitor" />
-    <test name = "test_router_mandatory" />
-    <test name = "test_router_mandatory_hwm" />
-    <test name = "test_router_handover" />
-    <test name = "test_probe_router" />
-    <test name = "test_stream" />
-    <test name = "test_stream_empty" />
-    <test name = "test_stream_disconnect" />
-    <test name = "test_stream_timeout" />
-    <test name = "test_disconnect_inproc" />
-    <test name = "test_unbind_inproc" />
-    <test name = "test_unbind_wildcard" />
-    <test name = "test_ctx_options" />
-    <test name = "test_ctx_destroy" />
-    <test name = "test_security_null" />
-    <test name = "test_security_plain" />
-    <test name = "test_security_curve" />
-    <test name = "test_security_zap" />
-    <test name = "test_iov" />
-    <test name = "test_spec_req" />
-    <test name = "test_spec_rep" />
-    <test name = "test_spec_dealer" />
-    <test name = "test_spec_router" />
-    <test name = "test_spec_pushpull" />
-    <test name = "test_req_correlate" />
-    <test name = "test_req_relaxed" />
-    <test name = "test_conflate" />
-    <test name = "test_inproc_connect" />
-    <test name = "test_issue_566" />
-    <test name = "test_proxy" />
-    <test name = "test_proxy_single_socket" />
-    <test name = "test_proxy_terminate" />
-    <test name = "test_getsockopt_memset" />
-    <test name = "test_setsockopt" />
-    <test name = "test_many_sockets" />
-    <test name = "test_ipc_wildcard" />
-    <test name = "test_diffserv" />
-    <test name = "test_connect_rid" />
-    <test name = "test_bind_src_address" />
-    <test name = "test_metadata" />
-    <test name = "test_capabilities" />
-    <test name = "test_xpub_nodrop" />
-    <test name = "test_xpub_manual" />
-    <test name = "test_xpub_welcome_msg" />
-    <test name = "test_atomics" />
-    <test name = "test_client_server" />
-    <test name = "test_thread_safe" />
-    <test name = "test_sockopt_hwm" />
-    <test name = "test_heartbeats" />
-    <test name = "test_stream_exceeds_buffer" />
-    <test name = "test_poller" />
-    <test name = "test_timers" />
-    <test name = "test_radio_dish" />
-    <test name = "test_udp" />
-    <test name = "test_shutdown_stress" />
-    <test name = "test_pair_ipc" />
-    <test name = "test_rebind_ipc" />
-    <test name = "test_reqrep_ipc" />
-    <test name = "test_use_fd_ipc" />
-    <test name = "test_use_fd_tcp" />
-    <test name = "test_timeo" />
-    <test name = "test_filter_ipc" />
-    <test name = "test_fork" />
-    <test name = "test_abstract_ipc" />
-</tests>
diff --git a/builds/gyp/project.gyp b/builds/gyp/project.gyp
deleted file mode 100644
index a89366c02..000000000
--- a/builds/gyp/project.gyp
+++ /dev/null
@@ -1,295 +0,0 @@
-#
-#   This is the gyp script for libzmq
-#
-#   Run in builds/gyp, as follows:
-#
-#       gyp --depth=. --format=make
-#       make
-{
-  'includes': [
-    'project-tests.gypi',
-  ],
-  'target_defaults': {
-    'include_dirs': [
-      '../../include',
-      '.'
-    ],
-    'defines': [
-      '_REENTRANT',
-      '_THREAD_SAFE',
-      'ZMQ_CUSTOM_PLATFORM_HPP',
-      'ZMQ_GYP_BUILD'
-    ],
-    'conditions': [
-      [ 'OS=="win"', {
-        'defines': [
-          'ZMQ_HAVE_WINDOWS',
-          'ZMQ_STATIC',
-          'FD_SETSIZE=16384',
-          '_CRT_SECURE_NO_WARNINGS',
-          '_WINSOCK_DEPRECATED_NO_WARNINGS'
-        ],
-        'libraries': [
-          'ws2_32',
-          'advapi32',
-          'iphlpapi'
-        ]
-      }],
-      [ 'OS=="mac"', {
-        'defines': [
-          'ZMQ_HAVE_OSX'
-        ],
-        'xcode_settings': {
-          'GCC_ENABLE_CPP_RTTI': 'YES'
-        }
-      }],
-      [ 'OS=="linux"', {
-        'defines': [
-          'ZMQ_HAVE_LINUX'
-        ],
-        'cflags_cc!': [
-          '-fno-rtti'
-        ],
-        'libraries': [
-          '-lpthread'
-        ]
-      }]
-    ]
-  },
-  'targets': [
-    {
-      'target_name': 'libzmq',
-      'type': 'static_library',
-      'sources': [
-        'platform.hpp',
-        '../../include/zmq.h',
-        '../../src/address.cpp',
-        '../../src/address.hpp',
-        '../../src/array.hpp',
-        '../../src/atomic_counter.hpp',
-        '../../src/atomic_ptr.hpp',
-        '../../src/blob.hpp',
-        '../../src/client.cpp',
-        '../../src/client.hpp',
-        '../../src/clock.cpp',
-        '../../src/clock.hpp',
-        '../../src/command.hpp',
-        '../../src/condition_variable.hpp',
-        '../../src/config.hpp',
-        '../../src/ctx.cpp',
-        '../../src/ctx.hpp',
-        '../../src/curve_client.cpp',
-        '../../src/curve_client.hpp',
-        '../../src/curve_client_tools.hpp',
-        '../../src/curve_mechanism_base.cpp',
-        '../../src/curve_mechanism_base.hpp',
-        '../../src/curve_server.cpp',
-        '../../src/curve_server.hpp',
-        '../../src/dbuffer.hpp',
-        '../../src/dealer.cpp',
-        '../../src/dealer.hpp',
-        '../../src/decoder.hpp',
-        '../../src/decoder_allocators.cpp',
-        '../../src/decoder_allocators.hpp',
-        '../../src/devpoll.cpp',
-        '../../src/devpoll.hpp',
-        '../../src/dish.cpp',
-        '../../src/dish.hpp',
-        '../../src/dist.cpp',
-        '../../src/dist.hpp',
-        '../../src/encoder.hpp',
-        '../../src/epoll.cpp',
-        '../../src/epoll.hpp',
-        '../../src/err.cpp',
-        '../../src/err.hpp',
-        '../../src/fd.hpp',
-        '../../src/fq.cpp',
-        '../../src/fq.hpp',
-        '../../src/gssapi_client.cpp',
-        '../../src/gssapi_client.hpp',
-        '../../src/gssapi_mechanism_base.cpp',
-        '../../src/gssapi_mechanism_base.hpp',
-        '../../src/gssapi_server.cpp',
-        '../../src/gssapi_server.hpp',
-        '../../src/i_decoder.hpp',
-        '../../src/i_encoder.hpp',
-        '../../src/i_engine.hpp',
-        '../../src/i_mailbox.hpp',
-        '../../src/i_poll_events.hpp',
-        '../../src/io_object.cpp',
-        '../../src/io_object.hpp',
-        '../../src/io_thread.cpp',
-        '../../src/io_thread.hpp',
-        '../../src/ip.cpp',
-        '../../src/ip.hpp',
-        '../../src/ipc_address.cpp',
-        '../../src/ipc_address.hpp',
-        '../../src/ipc_connecter.cpp',
-        '../../src/ipc_connecter.hpp',
-        '../../src/ipc_listener.cpp',
-        '../../src/ipc_listener.hpp',
-        '../../src/kqueue.cpp',
-        '../../src/kqueue.hpp',
-        '../../src/lb.cpp',
-        '../../src/lb.hpp',
-        '../../src/likely.hpp',
-        '../../src/mailbox.cpp',
-        '../../src/mailbox.hpp',
-        '../../src/mailbox_safe.cpp',
-        '../../src/mailbox_safe.hpp',
-        '../../src/mechanism.cpp',
-        '../../src/mechanism.hpp ',
-        '../../src/mechanism_base.cpp',
-        '../../src/mechanism_base.hpp ',
-        '../../src/metadata.cpp',
-        '../../src/metadata.hpp',
-        '../../src/msg.cpp',
-        '../../src/msg.hpp',
-        '../../src/mtrie.cpp',
-        '../../src/mtrie.hpp',
-        '../../src/mutex.hpp',
-        '../../src/norm_engine.cpp',
-        '../../src/norm_engine.hpp',
-        '../../src/null_mechanism.cpp',
-        '../../src/null_mechanism.hpp',
-        '../../src/object.cpp',
-        '../../src/object.hpp',
-        '../../src/options.cpp',
-        '../../src/options.hpp',
-        '../../src/own.cpp',
-        '../../src/own.hpp',
-        '../../src/pair.cpp',
-        '../../src/pair.hpp',
-        '../../src/pgm_receiver.cpp',
-        '../../src/pgm_receiver.hpp',
-        '../../src/pgm_sender.cpp',
-        '../../src/pgm_sender.hpp',
-        '../../src/pgm_socket.cpp',
-        '../../src/pgm_socket.hpp',
-        '../../src/pipe.cpp',
-        '../../src/pipe.hpp',
-        '../../src/plain_client.cpp',
-        '../../src/plain_client.hpp',
-        '../../src/plain_server.cpp',
-        '../../src/plain_server.hpp',
-        '../../src/poll.cpp',
-        '../../src/poll.hpp',
-        '../../src/poller.hpp',
-        '../../src/poller_base.cpp',
-        '../../src/poller_base.hpp',
-        '../../src/proxy.cpp',
-        '../../src/proxy.hpp',
-        '../../src/pub.cpp',
-        '../../src/pub.hpp',
-        '../../src/pull.cpp',
-        '../../src/pull.hpp',
-        '../../src/push.cpp',
-        '../../src/push.hpp',
-        '../../src/radio.cpp',
-        '../../src/radio.hpp',
-        '../../src/random.cpp',
-        '../../src/random.hpp',
-        '../../src/raw_decoder.cpp',
-        '../../src/raw_decoder.hpp',
-        '../../src/raw_encoder.cpp',
-        '../../src/raw_encoder.hpp',
-        '../../src/reaper.cpp',
-        '../../src/reaper.hpp',
-        '../../src/rep.cpp',
-        '../../src/rep.hpp',
-        '../../src/req.cpp',
-        '../../src/req.hpp',
-        '../../src/router.cpp',
-        '../../src/router.hpp',
-        '../../src/select.cpp',
-        '../../src/select.hpp',
-        '../../src/server.cpp',
-        '../../src/server.hpp',
-        '../../src/session_base.cpp',
-        '../../src/session_base.hpp',
-        '../../src/signaler.cpp',
-        '../../src/signaler.hpp',
-        '../../src/socket_base.cpp',
-        '../../src/socket_base.hpp',
-        '../../src/socket_poller.cpp',
-        '../../src/socket_poller.hpp',
-        '../../src/socks.cpp',
-        '../../src/socks.hpp',
-        '../../src/socks_connecter.cpp',
-        '../../src/socks_connecter.hpp',
-        '../../src/stdint.hpp',
-        '../../src/stream.cpp',
-        '../../src/stream.hpp',
-        '../../src/stream_engine.cpp',
-        '../../src/stream_engine.hpp',
-        '../../src/sub.cpp',
-        '../../src/sub.hpp',
-        '../../src/tcp.cpp',
-        '../../src/tcp.hpp',
-        '../../src/tcp_address.cpp',
-        '../../src/tcp_address.hpp',
-        '../../src/tcp_connecter.cpp',
-        '../../src/tcp_connecter.hpp',
-        '../../src/tcp_listener.cpp',
-        '../../src/tcp_listener.hpp',
-        '../../src/thread.cpp',
-        '../../src/thread.hpp',
-        '../../src/timers.cpp',
-        '../../src/timers.hpp',
-        '../../src/tipc_address.cpp',
-        '../../src/tipc_address.hpp',
-        '../../src/tipc_connecter.cpp',
-        '../../src/tipc_connecter.hpp',
-        '../../src/tipc_listener.cpp',
-        '../../src/tipc_listener.hpp',
-        '../../src/trie.cpp',
-        '../../src/trie.hpp',
-        '../../src/tweetnacl.c',
-        '../../src/tweetnacl.h',
-        '../../src/udp_address.cpp',
-        '../../src/udp_address.hpp',
-        '../../src/udp_engine.cpp',
-        '../../src/udp_engine.hpp',
-        '../../src/v1_decoder.cpp',
-        '../../src/v1_decoder.hpp',
-        '../../src/v1_encoder.cpp',
-        '../../src/v1_encoder.hpp',
-        '../../src/v2_decoder.cpp',
-        '../../src/v2_decoder.hpp',
-        '../../src/v2_encoder.cpp',
-        '../../src/v2_encoder.hpp',
-        '../../src/v2_protocol.hpp',
-        '../../src/vmci.cpp',
-        '../../src/vmci.hpp',
-        '../../src/vmci_address.cpp',
-        '../../src/vmci_address.hpp',
-        '../../src/vmci_connecter.cpp',
-        '../../src/vmci_connecter.hpp',
-        '../../src/vmci_listener.cpp',
-        '../../src/vmci_listener.hpp',
-        '../../src/windows.hpp',
-        '../../src/wire.hpp',
-        '../../src/xpub.cpp',
-        '../../src/xpub.hpp',
-        '../../src/xsub.cpp',
-        '../../src/xsub.hpp',
-        '../../src/ypipe.hpp',
-        '../../src/ypipe_base.hpp',
-        '../../src/ypipe_conflate.hpp',
-        '../../src/yqueue.hpp',
-        '../../src/zap_client.cpp',
-        '../../src/zap_client.hpp',
-        '../../src/zmq.cpp',
-        '../../src/zmq_utils.cpp'
-      ],
-      'copies': [
-        {
-          'destination': '../../src',
-          'files': [
-              'platform.hpp'
-          ]
-        }
-      ]
-    }
-  ]
-}
diff --git a/builds/mingw32/Makefile.mingw32 b/builds/mingw32/Makefile.mingw32
deleted file mode 100644
index 3d9177fc6..000000000
--- a/builds/mingw32/Makefile.mingw32
+++ /dev/null
@@ -1,49 +0,0 @@
-CC=gcc
-CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -I.
-LIBS=-lws2_32 -lIphlpapi -lsodium
-
-OBJS = ctx.o reaper.o dist.o err.o \
-	clock.o metadata.o random.o \
-	object.o own.o \
-	io_object.o io_thread.o \
-	lb.o fq.o \
-	address.o tcp_address.o ipc_address.o \
-	ipc_connecter.o ipc_listener.o \
-	tcp_connecter.o tcp_listener.o \
-	mailbox.o msg.o mtrie.o \
-	pipe.o precompiled.o proxy.o \
-	signaler.o stream_engine.o \
-	thread.o trie.o \
-	ip.o tcp.o \
-	pgm_socket.o pgm_receiver.o pgm_sender.o \
-	raw_decoder.o raw_encoder.o \
-	v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
-        udp_address.o udp_engine.o radio.o dish.o \
-	socket_base.o session_base.o options.o \
-	req.o rep.o push.o pull.o pub.o sub.o pair.o \
-	dealer.o router.o xpub.o xsub.o stream.o \
-	poller_base.o select.o poll.o epoll.o kqueue.o devpoll.o \
-	curve_client.o curve_server.o \
-	mechanism.o null_mechanism.o plain_client.o plain_server.o \
-	socks.o server.o decoder_allocators.o socks_connecter.o \
-	socket_poller.o mailbox_safe.o plain_server.o client.o timers.o \
-	zmq.o zmq_utils.o gather.o scatter.o dgram.o
-
-%.o: ../../src/%.cpp
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-%.o: ../../perf/%.cpp
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-all: libzmq.dll
-
-perf: inproc_lat.exe inproc_thr.exe local_lat.exe local_thr.exe remote_lat.exe remote_thr.exe
-
-libzmq.dll: $(OBJS)
-	g++ -shared -static -O2 -s -o $@ $^ -Wl,--out-implib,$@.a $(LIBS)
-
-%.exe: %.o libzmq.dll
-	g++ -o -O2 $@ $^
-
-clean:
-	del *.o *.a *.dll *.exe
diff --git a/builds/mingw32/platform.hpp b/builds/mingw32/platform.hpp
deleted file mode 100644
index 988d7176f..000000000
--- a/builds/mingw32/platform.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__
-#define __ZMQ_PLATFORM_HPP_INCLUDED__
-
-//  This is the platform definition for the MSVC platform.
-//  As a first step of the build process it is copied to
-//  zmq directory to take place of platform.hpp generated from
-//  platform.hpp.in on platforms supported by GNU autotools.
-//  Place any MSVC-specific definitions here.
-
-#define ZMQ_HAVE_WINDOWS
-
-#define ZMQ_USE_LIBSODIUM
-
-#endif
diff --git a/builds/nuget/libzmq.autopkg b/builds/nuget/libzmq.autopkg
deleted file mode 100644
index 8b8b3657c..000000000
--- a/builds/nuget/libzmq.autopkg
+++ /dev/null
@@ -1,52 +0,0 @@
-nuget{
-  nuspec{
-    id = libzmq;
-    version : 4.1.0-alpha;
-    title: ZMQ - Code Connected;
-    authors: { zeromq };
-    owners: { phreed, jgoz };
-    licenseUrl: "https://www.gnu.org/licenses/lgpl.html";
-    projectUrl: "http://www.zeromq.org/";
-    iconUrl: "http://www.zeromq.org/local--files/admin:css/logo.gif";
-    requireLicenseAcceptance: false;
-    summary: Code Connected;
-    description: @" 
-ZeroMQ \zeromq\:
-- Connect your code in any language, on any platform.
-- Carries messages across inproc, IPC, TCP, TPIC, multicast.
-- Smart patterns like pub-sub, push-pull, and router-dealer.
-- High-speed asynchronous I/O engines, in a tiny library.
-- Backed by a large and active open source community.
-- Supports every modern language and platform.
-- Build any architecture: centralized, distributed, small, or large.
-- Free software with full commercial support.";
-    releaseNotes: "Made a NuGet package.";
-    copyright: Copyright 2012 iMatix Corporation and Contributors;
-    tags: {0mq, zeromq, nuget, native; }
-  }
-
-  files{
-    #defines {
-       SDK_ROOT = ..\..\;
-       SDK_2010 = ..\msvc\;
-    }  
-    include: { "${SDK_ROOT}include\*" };
-    docs: { "${SDK_ROOT}doc\*.txt" };
-
-    [x64,v100,debug] {
-       lib: ${SDK_2010}Debug\libzmq.lib;     
-       symbols: ${SDK_2010}Debug\libzmq.pdb;     
-    }    
-
-    [x64,v100,release] {
-       lib: ${SDK_2010}Release\libzmq.lib;     
-       bin: ${SDK_2010}..\..\lib\libzmq.dll; 
-    }    
-
-    targets{
-       Defines += HAS_CPP_ZMQ_SDK;
-    }
-  }
-}
-
-
diff --git a/builds/nuget/readme.nuget b/builds/nuget/readme.nuget
deleted file mode 100644
index 633743a94..000000000
--- a/builds/nuget/readme.nuget
+++ /dev/null
@@ -1,20 +0,0 @@
-
-NuGet is a package management system for MS-Windows.
-It is similar in spirit to tools like Maven or Gradle.
-
-It was originaly for .Net only packages but it has 
-recently been augmented to working with native packages.
-http://docs.nuget.org/docs/reference/support-for-native-projects
-
-The instructions for building a NuGet package can be found here:
-http://coapp.org/pages/tutorials.html
-
-
-The basic procedure is to first build all 
-the artifacts and then run ...
- Write-NuGetPackage .\libzmq.autopkg 
-
-The *.nuget files thus produced can then be installed
-in a local repository or uploaded to one of the nuget servers.
-
-
diff --git a/builds/openwrt/Makefile b/builds/openwrt/Makefile
deleted file mode 100644
index 1884a9b85..000000000
--- a/builds/openwrt/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) [2011-2012] [TheClashingRocks.org]
-#
-# Author: Jiva Nath Bagale <jnbagale@gmail.com>
-# author: Victor Perron <victor@iso3103.net>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zeromq
-PKG_VERSION:=master
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/zeromq/libzmq.git
-PKG_SOURCE:=$(PKG_NAME).tar.gz
-PKG_SOURCE_VERSION:=HEAD
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/zeromq
-    MAINTAINER:=victor@iso3103.net
-    TITLE:=zeromq
-    SECTION:=libs
-    DEPENDS:=+libstdcpp +libpthread +librt +libsodium
-    CATEGORY:=Libraries
-    URL:=http://www.zeromq.org/
-endef
-
-define Package/zeromq/description
-    The library provides light weight messaging services using an intelligent transport layer. 
-    It can carry messages across inproc, IPC, TCP and multicast and is faster than TCP for 
-    clustered products and supercomputing.
-endef
-
-define Build/Configure
-	( cd $(PKG_BUILD_DIR); ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-TARGET_CPPFLAGS:=$(filter-out -Werror, $(TARGET_CFLAGS))
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/lib 	\
-		$(1)/usr/include \
-		$(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig \
-		$(1)/usr/lib/
-
-endef
-
-define Package/zeromq/install
-	$(INSTALL_DIR) $(1)/usr/lib 
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,zeromq))
diff --git a/builds/qnx/ToolchainQNX6.6_x86.cmake b/builds/qnx/ToolchainQNX6.6_x86.cmake
deleted file mode 100644
index 9d5645c68..000000000
--- a/builds/qnx/ToolchainQNX6.6_x86.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-set(CMAKE_SYSTEM_NAME QNX)
-
-set(arch gcc_ntox86)
-set(ntoarch x86)
-set(QNX_PROCESSOR x86)
-
-set(CMAKE_C_COMPILER qcc )
-set(CMAKE_C_COMPILER_TARGET ${arch})
-
-set(CMAKE_CXX_COMPILER QCC -lang-c++ -g)
-set(CMAKE_CXX_COMPILER_TARGET ${arch})
-
-set(CMAKE_ASM_COMPILER qcc -V${arch})
-set(CMAKE_ASM_DEFINE_FLAG "-Wa,--defsym,")
-
-set(CMAKE_RANLIB $ENV{QNX_HOST}/usr/bin/nto${ntoarch}-ranlib
-	    CACHE PATH "QNX ranlib Program" FORCE)
-    set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/nto${ntoarch}-ar
-	        CACHE PATH "QNX ar Program" FORCE)
-
diff --git a/builds/valgrind/ci_build.sh b/builds/valgrind/ci_build.sh
deleted file mode 100755
index cc7db104c..000000000
--- a/builds/valgrind/ci_build.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-mkdir tmp
-BUILD_PREFIX=$PWD/tmp
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("CFLAGS=-g")
-CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CXXFLAGS=-g")
-CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
-CONFIG_OPTS+=("--enable-valgrind")
-
-if [ -n "$TLS" ] && [ "$TLS" == "enabled" ]; then
-    CONFIG_OPTS+=("--with-tls=yes")
-fi
-
-if [ -z $CURVE ]; then
-    CONFIG_OPTS+=("--disable-curve")
-elif [ $CURVE == "libsodium" ]; then
-    CONFIG_OPTS+=("--with-libsodium=yes")
-
-    if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
-            (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
-        git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
-    fi
-fi
-
-# Build, check, and install from local source
-( cd ../..; ./autogen.sh && ./configure "${CONFIG_OPTS[@]}" && make -j5 && make VERBOSE=1 check-valgrind-memcheck) || exit 1
diff --git a/builds/valgrind/valgrind.supp b/builds/valgrind/valgrind.supp
deleted file mode 100644
index b8a6bc779..000000000
--- a/builds/valgrind/valgrind.supp
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-   <socketcall_sendto>
-   Memcheck:Param
-   socketcall.sendto(msg)
-   fun:send
-   ...
-}
-{
-   <socketcall_sendto>
-   Memcheck:Param
-   socketcall.send(msg)
-   fun:send
-   ...
-}
-{
-   <glibc_freeres>
-   Memcheck:Free
-   fun:free
-   ...
-   fun:__libc_freeres
-   ...
-}
diff --git a/builds/valgrind/vg b/builds/valgrind/vg
deleted file mode 100755
index 9dfbfb575..000000000
--- a/builds/valgrind/vg
+++ /dev/null
@@ -1 +0,0 @@
-valgrind --tool=memcheck --leak-check=full --suppressions=valgrind.supp $*
diff --git a/builds/vxworks/platform.hpp b/builds/vxworks/platform.hpp
deleted file mode 100644
index df18f138e..000000000
--- a/builds/vxworks/platform.hpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/* src/platform.hpp.  Generated from platform.hpp.in by configure.  */
-/* src/platform.hpp.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <alloca.h> header file. */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the `clock_gettime' function. */
-#define HAVE_CLOCK_GETTIME 1
-
-/* Define to 1 if you have the declaration of `LOCAL_PEERCRED', and to 0 if
-   you don't. */
-#define HAVE_DECL_LOCAL_PEERCRED 0
-
-/* Define to 1 if you have the declaration of `SO_PEERCRED', and to 0 if you
-   don't. */
-#define HAVE_DECL_SO_PEERCRED 0
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define to 1 if you have the `freeifaddrs' function. */
-#define HAVE_FREEIFADDRS 1
-
-/* Define to 1 if you have the `gethrtime' function. */
-/* #undef HAVE_GETHRTIME */
-
-/* Define to 1 if you have the `getifaddrs' function. */
-#define HAVE_GETIFADDRS 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the <ifaddrs.h> header file. */
-//#define HAVE_IFADDRS_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `gssapi_krb5' library (-lgssapi_krb5). */
-/* #undef HAVE_LIBGSSAPI_KRB5 */
-
-/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */
-/* #undef HAVE_LIBIPHLPAPI */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-/* #undef HAVE_LIBPTHREAD */
-
-/* Define to 1 if you have the `rpcrt4' library (-lrpcrt4). */
-/* #undef HAVE_LIBRPCRT4 */
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef HAVE_LIBRT */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the `sodium' library (-lsodium). */
-/* #undef HAVE_LIBSODIUM */
-
-/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
-/* #undef HAVE_LIBWS2_32 */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the `perror' function. */
-#define HAVE_PERROR 1
-
-/* Define to 1 if you have the `socket' function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-/* #undef HAVE_SYS_EVENTFD_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <windows.h> header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "zeromq"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "zeromq-dev@lists.zeromq.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "zeromq"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "zeromq 4.1.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "zeromq"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.0"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Version number of package */
-#define VERSION "4.1.0"
-
-/* Enable militant API assertions */
-/* #undef ZMQ_ACT_MILITANT */
-
-/* Force to use mutexes */
-/* #undef ZMQ_FORCE_MUTEXES */
-
-/* Have VxWorks OS */
-#define ZMQ_HAVE_VXWORKS 1
-
-/* Have AIX OS */
-/* #undef ZMQ_HAVE_AIX */
-
-/* Have Android OS */
-/* #undef ZMQ_HAVE_ANDROID */
-
-/* Have Cygwin */
-/* #undef ZMQ_HAVE_CYGWIN */
-
-/* Have eventfd extension. */
-/* #undef ZMQ_HAVE_EVENTFD */
-
-/* Have FreeBSD OS */
-/* #undef ZMQ_HAVE_FREEBSD */
-
-/* Have HPUX OS */
-/* #undef ZMQ_HAVE_HPUX */
-
-/* Have ifaddrs.h header. */
-//#define ZMQ_HAVE_IFADDRS 1
-
-/* Have Linux OS */
-/* #undef ZMQ_HAVE_LINUX */
-
-/* Have LOCAL_PEERCRED socket option */
-/* #undef ZMQ_HAVE_LOCAL_PEERCRED */
-
-/* Have MinGW32 */
-/* #undef ZMQ_HAVE_MINGW32 */
-
-/* Have NetBSD OS */
-/* #undef ZMQ_HAVE_NETBSD */
-
-/* Have NORM protocol extension */
-/* #undef ZMQ_HAVE_NORM */
-
-/* Have OpenBSD OS */
-/* #undef ZMQ_HAVE_OPENBSD */
-
-/* Have OpenPGM extension */
-/* #undef ZMQ_HAVE_OPENPGM */
-
-/* Have DarwinOSX OS */
-/* #undef ZMQ_HAVE_OSX */
-
-/* Have QNX Neutrino OS */
-/* #undef ZMQ_HAVE_QNXNTO */
-
-/* Whether SOCK_CLOEXEC is defined and functioning. */
-/* #undef ZMQ_HAVE_SOCK_CLOEXEC */
-
-/* Have Solaris OS */
-/* #undef ZMQ_HAVE_SOLARIS */
-
-/* Whether SO_KEEPALIVE is supported. */
-#define ZMQ_HAVE_SO_KEEPALIVE 1
-
-/* Have SO_PEERCRED socket option */
-/* #undef ZMQ_HAVE_SO_PEERCRED */
-
-/* Whether TCP_KEEPALIVE is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPALIVE */
-
-/* Whether TCP_KEEPCNT is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPCNT */
-
-/* Whether TCP_KEEPIDLE is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPIDLE */
-
-/* Whether TCP_KEEPINTVL is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPINTVL */
-
-/* Have TIPC support */
-#define ZMQ_HAVE_TIPC 1
-
-/* Have uio.h header. */
-//#define ZMQ_HAVE_UIO 1
-
-#define ZMQ_USE_SELECT 1
-
-/* Have Windows OS */
-/* #undef ZMQ_HAVE_WINDOWS */
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-/* #undef _UINT32_T */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef uint32_t */
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
-   code using `volatile' can become incorrect without. Disable with care. */
-/* #undef volatile */
-
-/* ---- Special case for z/OS Unix Services: openedition ---- */
-#include <vxWorks.h>
-
-#ifndef   NI_MAXHOST
-#define   NI_MAXHOST 1025
-#endif
diff --git a/builds/zos/README.md b/builds/zos/README.md
deleted file mode 100644
index f15c182fd..000000000
--- a/builds/zos/README.md
+++ /dev/null
@@ -1,463 +0,0 @@
-# ZeroMQ on z/OS UNIX System Services
-
-ZeroMQ has been successfully built on z/OS, using [z/OS UNIX System
-Services](http://www-03.ibm.com/systems/z/os/zos/features/unix/),
-a certified UNIX environment for the [IBM
-z-series](http://www-03.ibm.com/systems/z/).  The build is possible
-with the shell scripts in this directory, as described below.
-
-Tested build combinations:
-
-* ZeroMQ 4.0.4, using IBM XL C/C++ compiler, as XPLINK in ILP32 mode
-
-* ZeroMQ 4.0.4, using IBM XL C/C++ compiler, as XPLINK in LP64 mode
-
-* ZeroMQ 4.1-git, using IBM XL C/C++ compiler, as XPLINK in ILP32 mode
-
-Other combinations are likely to work, possibly with minor changes,
-but have not been tested.  Both static library and DLL modes have been
-tested.
-
-There are some minor limitations (detailed below), but all core
-functionality tests run successfully.
-
-
-## Quickstart: building ZeroMQ on z/OS UNIX System Services
-
-Assuming [z/OS UNIX System
-Services](http://www-03.ibm.com/systems/z/os/zos/features/unix/) is
-installed, and the [z/OS XL C/C++
-compiler suite](http://www-03.ibm.com/software/products/en/czos) is 
-installed, ZeroMQ can be built as follows:
-
-*   Download and extract ZeroMQ tar file
-
-*   Ensure contents of this directory are present at `builds/zos`
-    within that extracted diretory (eg, `zeromq-VERSION/builds/zos/`; 
-    copy these files in, if not already present, and make sure the
-    shell scripts are executable)
-
-*   (Optional) set ZCXXFLAGS for additional compile flags (see below)
-
-*   Build `libzmq.a` static library and `libzmq.so` dynamic
-    library, with:
-
-        cd zeromq-VERSION
-        builds/zos/makelibzmq
-
-    or to skip the `libzmq.so` dynamic library (only building `libzmq.a`):
-
-        cd zeromq-VERSION
-        BUILD_DLL=false
-        export BUILD_DLL
-        builds/zos/makelibzmq
-
-*   (Optional, but recommended) build and run the core tests with:
-
-        cd zeromq-VERSION
-        builds/zos/maketests
-        builds/zos/runtests
-
-*   To remove built files, to start again (eg, rebuild with different
-    compile/link flags):
-
-        cd zeromq-VERSION
-        builds/zos/makeclean
-
-There are details on specifying alternative compilation flags below.
-
-
-## Quickstart: using ZeroMQ on z/OS UNIX System Services
-
-### Static linking
-
-Install `include/*.h` somewhere on your compiler include path.
-
-Install `src/libzmq.a` somewhere on your library search path.
-
-Compile and link application with:
-
-    c++ -Wc,xplink -Wl,xplink ... -+ -o myprog myprog.cpp -lzmq
-
-Run with:
-
-    ./myprog
-
-
-### Dynamic linking
-
-Install `include/*.h` somewhere on your compiler include path.
-
-Install `src/libzmq.so` somewhere on your LIBPATH.
-
-Install `src/libzmq.x` somewhere you can reference for import linking.
-
-Compile and link application:
-
-    c++ -Wc,xplink -Wc,dll ... -+ -c -o myprog.o myprog.cpp
-    c++ -Wl,xplink -o myprog myprog.o /PATH/TO/libzmq.x
-
-Run with:
-
-    LIBPATH=/DIR/OF/LIBZMQ.SO:/lib:/usr/lib:...    # if not in default path
-    export LIBPATH
-    ./myprog
-
-
-## ZeroMQ on z/OS UNIX System Services: Application considerations
-
-z/0S UNIX System Services does not provide a way to block the
-[`SIGPIPE` signal being generated when a thread writes to a closed socket](http://pic.dhe.ibm.com/infocenter/zvm/v6r2/index.jsp?topic=%2Fcom.ibm.zos.r12.cbcpx01%2Fcbcpg1b0287.htm)
-(compare with other platforms that support the `SO_NOSIGPIPE` socket
-option, and/or the `MSG_NOSIGNAL` flag on `send()`; z/OS UNIX System
-Services supports neither).
-
-As a result, applications using ZeroMQ on z/OS UNIX System Services
-have to expect to encounter `SIGPIPE` at various times during the use
-of the library, if sockets are unexpectedly disconnected.  Normally
-`SIGPIPE` will terminate the application.
-
-A simple solution, if `SIGPIPE` is not required for normal operation
-of the application (eg, it is not part of a unix pipeline, the
-traditional use of `SIGPIPE`), is to set `SIGPIPE` to be ignored
-with code like:
-
-    #include <signal.h>
-    ...
-    signal(SIGPIPE, SIG_IGN);
-
-near the start of the application (eg, before initialising the ZeroMQ
-library).
-
-If `SIGPIPE` is required for normal operation it is recommended that
-the application install a signal handler that flags the signal was
-received, and allows the application main loop to determine if it
-was received for one of its own file descriptors -- and ignores it if it
-none of the applications own file descriptors seems to have changed.
-
-Linking to the `libzmq.a` static library will pull in substantially
-all of the library code, which will add about 4MB to the application
-size (per executable statically linked with ZeroMQ).  If this is a
-significant consideration, use of the DLL version is recommended.
-
-See also ZeroMQ test status on z/OS UNIX System Services below
-for other caveats.
-
-
-## Setting other compilation flags
-
-### Optimisation
-
-To build with optimisation:
-
-*   set `ZCXXFLAGS` to "`-O2`" before starting build process above
-
-
-### Full debugging symbols
-
-To build with debugging symbols:
-
-*   set `ZCXXFLAGS` to "`-g`" before starting build process above
-
-### 64-bit mode (LP64/amode=64)
-
-To build in 64-bit mode:
-
-The default build is
-[ILP32](http://publib.boulder.ibm.com/infocenter/zvm/v6r1/index.jsp?topic=/com.ibm.zos.r9.cbcux01/lp64cop.htm),
-the default for the IBM XL C/C++ compiler.  To build in LP64 mode
-(64-bit):
-
-*    set  `ZCXXFLAGS` to "`-Wc,lp64 -Wl,lp64`" before starting build
-
-(64-bit mode can be combined with optimisation or debug symbols.)
-
-### Combining compilation flags
-
-Other build flags can be used in `ZXCCFLAGS` if desired.  Beware that
-they are passed through (Bourne) shell expansion, and passed to both
-the compile and link stages; some experimentation of argument quoting
-may be required (and arguments requiring parenthesis are particularly
-complicated).
-
-
-## ZeroMQ test status on z/OS UNIX System Services
-
-As of 2014-07-22, 41 of the 43 tests in the core ZeroMQ test suite
-pass. There are two tests that are expected to fail:
-
-0.  `test_abstract_ipc`: tests Linux-specific IPC functions, and is
-    expected to fail on non-Linux platforms.
-
-0.  `test_fork`: tests ability to use ZeroMQ both before *and* after
-    fork (and before exec()); this relies on the ability to use 
-    pthreads both before *and* after fork.  On z/OS (and some other
-    UNIX compliant platforms) functions like `pthreads_create` (used
-    by ZeroMQ) cannot be used after fork and before exec; on z/OS the
-    call after fork fails with `ELEMULTITHREADFORK` (errno=257) if
-    ZeroMQ was also used before fork.  (On z/OS it appears possible
-    to use z/OS *after* fork, *providing* it has not been used before
-    fork -- the problem is the two separate initialisations of the
-    threading library, before and after fork, attempting to mix
-    together.)  In practice this is unlikely to affect many real-world
-    programs -- most programs use threads or fork without exec, but
-    not both.
-
-0.  `test_diffserv`: tests ability to set IP_TOS ([IP Type of
-    Service](http://en.wikipedia.org/wiki/Type_of_service), or
-    [DiffServ](http://en.wikipedia.org/wiki/Differentiated_Services_Code_Point))
-    values on sockets.  While z/OS UNIX System Services has the
-    preprocessor defines required, it appears not to support the
-    required functionality (call fails with "EDC8109I Protocol not
-    available.")
-
-These three "expected to fail" tests are listed as XFAIL_TESTS, and
-`runtests` will still consider the test run successful when they fail
-as expected.  (`builds/zos/runtests` will automatically skip these
-"expected to fail" tests if running "all" tests.)
-
-In addition `test_security_curve` does not do any meaningful testing,
-as a result of the CURVE support not being compiled in; it requires
-[`libsodium`](http://doc.libsodium.org/), which has not been
-ported to z/OS UNIX System Services yet.
-
-Multicast (via `libpgm`) is also not ported or compiled in.
-
-[TIPC](http://hintjens.com/blog:70), a cluster IPC protocol,
-is only supported on Linux, so it is not compiled into the z/OS
-UNIX System Services port -- and the tests are automatically skipped
-if running "all" tests.  (However they are not listed in XFAIL_TESTS
-because without the TIPC support there is no point in even running
-them, and it would be non-trivial to track them by hand.)
-
-
-## ZeroMQ on z/OS UNIX System Services: Library portability notes
-
-### *.cpp
-
-The source code in ZeroMQ is a combination of a C++ core library
-(in `*.cpp` and `*.hpp` files), and a C wrapper (also in `*.cpp`
-files).  It is all compiled with the C++ compiler.  The IBM XL C/C++
-complier (at least the version used for initial porting) insists
-that C++ source be in `*.C` files (note capital C).  To work around
-this issue the compile flag `-+` is used (specified in the `zc++`
-compiler wrapper), which tells the compiler the file should be
-considered C++ despite the file extension.
-
-### XPLINK
-
-The library (and tests) are built in
-[XPLINK](http://www.redbooks.ibm.com/abstracts/sg245991.html) mode
-with the flags `-Wc,xplink -Wl,xplink` (specified in  the `zc++`
-compiler wrapper).  This is [recommended by IBM for C++
-code](http://publib.boulder.ibm.com/infocenter/zvm/v5r4/index.jsp?topic=/com.ibm.zos.r9.ceea200/xplrunt.htm)
-due to the small functions.  (Amongst other things, using XPLINK
-enables function calls with some arguments passed in registers.)
-
-### long long
-
-ZeroMQ makes use of `uint64_t` (which is `unsigned long long` in ILP32
-mode).  To enable this the compile flag `-Wc,lang(longlong)` is passed
-to enable `long long`.  This is passed from the `zc++` compiler wrapper
-in order to be able to specifically quote the argument to protect the 
-parentheses from shell expansion.
-
-### BSD-style sockets, with IPv6 support
-
-ZeroMQ uses BSD-style socket handling, with extensions to support IPv6.
-BSD-style sockets were merged into SysV-derived UNIX at least a decade
-ago, and are required as part of the X/Open Portability Guide at least
-as of XPG 4.2.  To access this functionality two feature macros are 
-defined:
-
-    _XOPEN_SOURCE_EXTENDED=1
-
-    _OPEN_SYS_SOCK_IPV6
-
-The first enables the XPG 4.2 features (including functionality like
-`getsockname()`), and the latter exposes IPv6 specific functionality
-like `sa_family_t`.  These flags are defined in the `cxxall` script.
-
-(The traditional BSD-sockets API, exposed with `_OE_SOCKETS` cannot
-be used because it does not support functions like `getsockname()`,
-nor does it support IPv6 -- and the API definitions prevent compiling
-in LP64 mode due to assumptions about long being 32 bits.  Using
-`_XOPEN_SOURCE_EXTENDED=1` avoids all these problems.)
-
-### pthreads
-
-ZeroMQ uses the pthreads library to create additional threads to handle
-background communication without blocking the main application.  This
-functionaity is enabled on z/OS UNIX System Services by defining:
-
-    _OPEN_THREADS=3
-
-which is done in the `cxxall` script.  (The "3" value exposes later
-pthreads functionality like `pthread_atfork`, although ZeroMQ does not
-currently use all these features.)
-
-If compiling on a *recent* version of z/OS UNIX System Services it
-may be worth compiling with:
-
-    _UNIX03_THREADS=1
-
-which enables a later version of the threading support, potentially
-including `pthread_getschedparam` and pthread_setschedparam`; at
-present in the z/OS UNIX System Services port these functions are
-hidden and never called.  (See [IBM z/OS pthread.h
-documentation](http://pic.dhe.ibm.com/infocenter/zos/v1r11/index.jsp?topic=/com.ibm.zos.r11.bpxbd00/pthrdh.htm)
-for details on the differences.)
-
-
-## `platform.hpp` on z/OS UNIX System Services
-
-The build (described above) on z/OS UNIX System Services uses a static
-pre-built `platform.hpp` file.  (By default `src/platform.hpp` is 
-dynamically generated as a result of running the `./configure` script.)
-The master version of this is in `builds/zos/platform.hpp`.
-
-Beware that this file contains the version number for libzmq (usually
-included during the configure phase).  If taking the `platform.hpp` from
-an older version to use on a newer libzmq be sure to update the version
-information near the top of the file.
-
-The pre-built file is used because z/OS does not have the GNU auto tools
-(`automake`, `autoconf`, `libtool`, etc) installed, and particularly the
-libtool replacement does not work properly with the IBM XL C/C++
-compiler.
-
-The `./configure` script (only supplied in the tarballs); built with
-`automake` and `autoconf` on another platform), with one small edit,
-was used to generate the z/OS `platform.hpp` and then two small changes
-(described below) were made by hand to the generated `platform.hpp`.
-
-To be able to run the ./configure script to completion (in tcsh 
-syntax):
-
-*   Edit `./configure` and add:
-
-        openedition)
-              ;;
-
-    immediately before the line:
-
-        as_fn_error $? "unsupported system: ${host_os}." "$LINENO" 5
-
-    (somewhere around 17637).  This avoids the configure script giving
-    up early because `openedition` is not recognised.
-
-*   set `CXX` to point that the full  path to the `builds/zos/zc++` wrapper, eg
-
-        setenv CXX "/u/0mq/zeromq-4.0.4/builds/zos/zc++"
-
-*   set `CPPFLAGS` to for the feature macros required, eg:
-
-        setenv CPPFLAGS "-D_XOPEN_SOURCE_EXTENDED=1 -D_OPEN_THREADS=3 -D_OPEN_SYS_SOCK_IPV6 -DZMQ_HAVE_ZOS"
-
-*   set `CXXFLAGS` to enable XPLINK:
-
-        setenv CXXFLAGS "-Wc,xplink -Wl,xplink -+"
-
-*   run configure script with `--disable-eventfd` (`sys/eventfd.h` does
-    not exist, but the test for its existance has a false positive on
-    z/OS UNIX System Services, apparently due to the way the `c++`
-    compiler wrapper passes errors back from the IBM XL C/C++ compiler),
-    and with `--with-poller=poll` because `poll` is the most advanced
-    of the file descriptor status tests available on z/OS.  That is:
-
-        ./configure --disable-eventfd --with-poller=poll
-
-All going well several Makefiles, and `src/platform.hpp` should be
-produced.  Two additional changes are required to `src/platform.hpp`
-which can be appended to the end:
-
-    /* ---- Special case for z/OS Unix Services: openedition ---- */
-    #include <pthread.h>
-    #ifndef   NI_MAXHOST
-    #define   NI_MAXHOST 1025
-    #endif
-
-(many includes require pthreads-related methods or data structures to
-be defined, but not all of them include `pthread.h`, and the value
-`NI_MAXHOST` is not defined on z/OS UNIX System Services -- the 1025
-value is the conventional value on other platforms).
-
-Having done this the Makefiles can be used to compile individual files
-if desired, eg:
-
-    cd src
-    make zmq.o
-
-but note:
-
-*   IBM Make will warn of duplicate prerequisites on *every* run of
-    `make`, and both the generated `src/Makefile` and `tests/Makefile`
-    have several duplicates.  (For `src/Makefile` edit
-    `libzmq_la_SOURCES` to remove the duplicates.)
-
-*   IBM Make does not understand the `@` prefix (eg, `@echo`) as a way
-    to avoid echoing the command, resulting in an error and the command
-    being echoed anyway.
-
-*   Many of the make targets result in GNU auto tools (`aclocal`, etc)
-    being invoked, which are likely to fail, and most of the
-    library-related targets will invoke `libtool` which will cause
-    compile failures (due to differences in expected arguments).
-
-However running `./configure` to regenerate `src/platform.hpp` may 
-be useful for later versions of ZeroMQ which add more feature tests.
-
-
-## Transferring from GitHub to z/OS UNIX System Services
-
-The process of transferring files from GitHub to z/OS UNIX System
-Services is somewhat convoluted because:
-
-*   There is not a port of git for z/OS UNIX System Services; and
-
-*   z/OS uses the EBCDIC (IBM-1047) character set rather than the
-    ASCII/ISO-8859-1 character set used by the ZeroMQ source code
-    on GitHub
-
-A workable transfer process is:
-
-*   On an ASCII/ISO-8859-1/UTF-8 system with `git` (eg, a Linux system):
-
-        git clone https://github.com/zeromq/libzmq.git
-        git archive --prefix=libzmq-git/ -o /var/tmp/libzmq-git.tar master
-
-*   On a ASCII/ISO-8859-1/UTF-8 system with `tar`, and `pax`, and
-    optionally the GNU auto tools (eg, the same Linux system):
-
-        mkdir /var/tmp/zos
-        cd /var/tmp/zos
-        tar -xpf /var/tmp/libzmq-git.tar
-        cd libzmq-git
-        ./autogen.sh             # Optional: to be able to run ./configure
-        cd ..
-        pax -wf /var/tmp/libzmq-git.pax libzmq-git
-        compress libzmq-git.pax  # If available, reduce transfer size
-
-*   Transfer the resulting file (`libzmq-git.pax` or `libzmq-git.pax.Z`)
-    to the z/OS UNIX System Services system.  If using FTP be sure to
-    transfer the file in `bin` (binary/Image) mode to avoid corruption.
-
-*   On the z/OS UNIX System Services system, unpack the `pax` file and
-    convert all the files to EBCDIC with:
-
-        pax -o from=iso8859-1 -pp -rvf  libzmq-git-2014-07-23.pax
-
-    or if the file was compressed:
-
-        pax -o from=iso8859-1 -pp -rvzf libzmq-git-2014-07-23.pax.Z
-
-The result should be a `libzmq-git` directory with the source in
-EBCDIC format, on the z/OS UNIX System Services system ready to start
-building.
-
-See also the [`pax` man
-page](http://pic.dhe.ibm.com/infocenter/zos/v1r13/index.jsp?topic=%2Fcom.ibm.zos.r13.bpxa500%2Fr4paxsh.htm),
-some [`pax` conversion
-examples](http://pic.dhe.ibm.com/infocenter/zos/v1r13/index.jsp?topic=%2Fcom.ibm.zos.r13.bpxa400%2Fbpxza4c0291.htm),
-and [IBM's advice on ASCII to EBCDIC conversion
-options](http://www-03.ibm.com/systems/z/os/zos/features/unix/bpxa1p03.html)
diff --git a/builds/zos/cxxall b/builds/zos/cxxall
deleted file mode 100755
index 87867d6fa..000000000
--- a/builds/zos/cxxall
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Attempt to compile all *.cpp files in the current directory, that are
-# not already compiled.  Uses zc++ wrapper around C++ compiler, to add
-# additional compile arguments.
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-19
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-24
-#---------------------------------------------------------------------------
-
-VERBOSE="${VERBOSE:-}"    # Set to non-empty for already done status
-export VERBOSE
-
-# Locate compiler wrapper
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-ZCXX="${BIN_DIR}/zc++"
-
-# Determine compile flags
-CPPFLAGS="-D_XOPEN_SOURCE_EXTENDED=1 -D_OPEN_THREADS=3 -D_OPEN_SYS_SOCK_IPV6"
-CXXFLAGS="-DZMQ_HAVE_ZOS -DHAVE_CONFIG_H -D_REENTRANT -D_THREAD_SAFE -DZMQ_USE_POLL"
-case $(pwd) in
-  *src)   CXXFLAGS="${CXXFLAGS} -I."
-          ;;
-  *tests) CXXFLAGS="${CXXFLAGS} -I. -I../src -I../include"
-          ;;
-  *)      echo "Currently only builds in src/ and tests/" >&2
-          exit 1
-          ;;
-esac
-
-skip() {
-  SRC="$1"
-  OBJ="$2"
-  if [ -n "${VERBOSE}" ]; then
-    echo "    ${SRC} compiled already"
-  fi
-}
-
-compile() {
-  SRC="$1"
-  OBJ="$2"
-  echo "CXX ${SRC}"
-  "${ZCXX}" ${CXXFLAGS} ${CPPFLAGS} -+ -c -o "${OBJ}" "${SRC}"
-}
-
-for SRC in *.cpp; do 
-  OBJ=$(echo $SRC | sed 's/\.cpp/.o/;')
-  if [ -f "${OBJ}" ]; then 
-    if [ "${OBJ}" -nt "${SRC}" ]; then
-      skip "${SRC}" "${OBJ}"
-    else
-      compile "${SRC}" "${OBJ}"
-    fi
-  else
-    compile "${SRC}" "${OBJ}"
-  fi
-done
diff --git a/builds/zos/makeclean b/builds/zos/makeclean
deleted file mode 100755
index 4b46b7263..000000000
--- a/builds/zos/makeclean
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Remove built object files and test executables
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-22
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-24
-#---------------------------------------------------------------------------
-
-set -e    # Stop on errors
-
-# Figure out where we are
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-
-# Locate top of source tree, assuming we're in builds/zos
-TOP="${BIN_DIR}/../.."
-SRC="${TOP}/src"
-TESTS="${TOP}/tests"
-
-# Remove object/library files
-echo "Removing libzmq built files"
-(cd "${SRC}" && rm -f *.o *.a *.dbg *.x *.so libzmq)
-
-# Remove test object files
-echo "Removing libzmq tests"
-(cd "${TESTS}" && rm -f *.o *.dbg)
-(cd "${TESTS}"; 
- EXES=$(ls test_* | grep -v "\.")
- if [ -n "${EXES}" ]; then
-   rm ${EXES}
- fi
-)
diff --git a/builds/zos/makelibzmq b/builds/zos/makelibzmq
deleted file mode 100755
index eaed58fa5..000000000
--- a/builds/zos/makelibzmq
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Build libzmq.a static library and libzmq.so dynamic library
-#
-# Usage: makelibzmq
-#        BUILD_DLL=false makelibzmq     # Skip building DLL
-#
-# NOTE: We do a single compile run for both static and dynamic libraries
-# which results in the static library having -Wc,exportall compiled objects;
-# in practice this doesn't seem to cause a problem beyond using some extra
-# space (around 10%).
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-21
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-22
-#---------------------------------------------------------------------------
-
-set -e    # Stop on errors
-
-BUILD_DLL="${BUILD_DLL:-true}"     # Build DLL by default
-
-# Figure out where we are
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-ZCXX="${BIN_DIR}/zc++"
-
-# Locate top of source tree, assuming we're in builds/zos
-TOP="${BIN_DIR}/../.."
-SRC="${TOP}/src"
-
-# Install pre-generated platform.hpp
-cp -p "${BIN_DIR}/platform.hpp" "${SRC}/platform.hpp"
-
-# Compile all the source (optionally ready for a DLL)
-if [ "${BUILD_DLL}" = "true" ]; then
-  ZCXXFLAGS="${ZCXXFLAGS} -Wc,exportall"
-  export ZCXXFLAGS
-  #echo "Building DLL with ${ZCXXFLAGS}"
-fi
-
-cd "${SRC}"
-"${BIN_DIR}/cxxall"
-
-# Make static library
-ar r libzmq.a *.o
-
-# Optionally Make dynamic library
-if [ "${BUILD_DLL}" = "true" ]; then
-  #echo "Building libzmq.so DLL"
-  "${ZCXX}" -Wl,DLL -o libzmq.so *.o
-fi
diff --git a/builds/zos/maketests b/builds/zos/maketests
deleted file mode 100755
index 5b8a4b984..000000000
--- a/builds/zos/maketests
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-# Build tests/* executables; assumes that libzmq.a or libzmq.so/libzmq.x
-# is already built
-#
-# If libzmq.so and libzmq.x exist, then dynamic linking is used, otherwise
-# static linking is used.
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-21
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-22
-#---------------------------------------------------------------------------
-
-set -e    # Stop on errors
-
-VERBOSE="${VERBOSE:-}"    # Set to non-empty for already done status
-export VERBOSE
-
-# Figure out where we are
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-
-# Locate compiler wrapper
-ZCXX="${BIN_DIR}/zc++"
-
-# Locate top of source tree, assuming we're in builds/zos
-TOP="${BIN_DIR}/../.."
-SRC="${TOP}/src"
-TESTS="${TOP}/tests"
-
-# Figure out how we are going to link to ZMQ
-LINK_TYPE=unknown
-
-if [ -f "${SRC}/platform.hpp" -a -f "${SRC}/libzmq.so" -a -f "${SRC}/libzmq.x" ]; then
-  LINK_TYPE=dynamic
-elif [ -f "${SRC}/platform.hpp" -a -f "${SRC}/libzmq.a" ]; then
-  LINK_TYPE=static
-else
-  echo "Error: run makezmqlib to build libzmq.a and/or libzmq.so/libzmq.x first" >&2
-  exit 1
-fi
-
-# Copy in replacement test with timeout, if main version is not already
-# up to date
-#
-if [ -f "${TESTS}/test_fork.cpp" ] && 
-     grep "TIMEOUT" "${TESTS}/test_fork.cpp" >/dev/null 2>&1; then
-  :  # Already copied in
-else
-  echo "Updating test_fork.cpp to version with master timeout"
-  cp -p "${BIN_DIR}/test_fork.cpp" "${TESTS}/test_fork.cpp"
-fi
-
-# Compile all the source
-if [ "${LINK_TYPE}" = "dynamic" ]; then
-  ZCXXFLAGS="${ZCXXFLAGS} -Wc,DLL"
-  export ZXCCFLAGS
-  echo "Building tests to use DLL: ${ZCXXFLAGS}"
-fi
-
-cd "${TESTS}"
-"${BIN_DIR}/cxxall"
-
-# Link all the executables that are not already linked
-skip() {
-  OBJ="$1"
-  EXE="$2"
-  if [ -n "${VERBOSE}" ]; then
-    echo "${OBJ} linked to ${EXE}"
-  fi    
-}
-
-link() {
-  OBJ="$1"
-  EXE="$2"
-  echo " LD ${EXE}"
-  case "${LINK_TYPE}" in
-    static)  "${ZCXX}" -L ../src -o "${EXE}" "${OBJ}" -lzmq
-             ;;
-    dynamic) "${ZCXX}" -o "${EXE}" "${OBJ}" ../src/libzmq.x
-             ;;
-    *)       echo "Do not know how to do ${LINK_TYPE} linking!" 2>&1
-             exit 1
-             ;;
-  esac
-}
-
-for OBJ in *.o; do 
-  EXE=$(echo "${OBJ}" | sed 's/\.o//;')
-  if [ -f "${EXE}" ]; then 
-    if [ "${EXE}" -nt	"${OBJ}" ]; then
-      skip "${OBJ}" "${EXE}"
-    else
-      link "${OBJ}" "${EXE}"
-    fi
-  else
-    link "${OBJ}" "${EXE}"
-  fi
-done
diff --git a/builds/zos/platform.hpp b/builds/zos/platform.hpp
deleted file mode 100644
index b4442b56e..000000000
--- a/builds/zos/platform.hpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/* src/platform.hpp.  Generated from platform.hpp.in by configure.  */
-/* src/platform.hpp.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <alloca.h> header file. */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the `clock_gettime' function. */
-/* #undef HAVE_CLOCK_GETTIME */
-
-/* Define to 1 if you have the declaration of `LOCAL_PEERCRED', and to 0 if
-   you don't. */
-#define HAVE_DECL_LOCAL_PEERCRED 0
-
-/* Define to 1 if you have the declaration of `SO_PEERCRED', and to 0 if you
-   don't. */
-#define HAVE_DECL_SO_PEERCRED 0
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define to 1 if you have the `freeifaddrs' function. */
-#define HAVE_FREEIFADDRS 1
-
-/* Define to 1 if you have the `gethrtime' function. */
-/* #undef HAVE_GETHRTIME */
-
-/* Define to 1 if you have the `getifaddrs' function. */
-#define HAVE_GETIFADDRS 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the <ifaddrs.h> header file. */
-#define HAVE_IFADDRS_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `gssapi_krb5' library (-lgssapi_krb5). */
-/* #undef HAVE_LIBGSSAPI_KRB5 */
-
-/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */
-/* #undef HAVE_LIBIPHLPAPI */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-/* #undef HAVE_LIBPTHREAD */
-
-/* Define to 1 if you have the `rpcrt4' library (-lrpcrt4). */
-/* #undef HAVE_LIBRPCRT4 */
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef HAVE_LIBRT */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the `sodium' library (-lsodium). */
-/* #undef HAVE_LIBSODIUM */
-
-/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
-/* #undef HAVE_LIBWS2_32 */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the `perror' function. */
-#define HAVE_PERROR 1
-
-/* Define to 1 if you have the `socket' function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if stdbool.h conforms to C99. */
-/* #undef HAVE_STDBOOL_H */
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-/* #undef HAVE_SYS_EVENTFD_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <windows.h> header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "zeromq"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "zeromq-dev@lists.zeromq.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "zeromq"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "zeromq 4.1.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "zeromq"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.0"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Version number of package */
-#define VERSION "4.1.0"
-
-/* Enable militant API assertions */
-/* #undef ZMQ_ACT_MILITANT */
-
-/* Force to use mutexes */
-/* #undef ZMQ_FORCE_MUTEXES */
-
-/* Have AIX OS */
-/* #undef ZMQ_HAVE_AIX */
-
-/* Have Android OS */
-/* #undef ZMQ_HAVE_ANDROID */
-
-/* Have Cygwin */
-/* #undef ZMQ_HAVE_CYGWIN */
-
-/* Have eventfd extension. */
-/* #undef ZMQ_HAVE_EVENTFD */
-
-/* Have FreeBSD OS */
-/* #undef ZMQ_HAVE_FREEBSD */
-
-/* Have HPUX OS */
-/* #undef ZMQ_HAVE_HPUX */
-
-/* Have ifaddrs.h header. */
-#define ZMQ_HAVE_IFADDRS 1
-
-/* Have Linux OS */
-/* #undef ZMQ_HAVE_LINUX */
-
-/* Have LOCAL_PEERCRED socket option */
-/* #undef ZMQ_HAVE_LOCAL_PEERCRED */
-
-/* Have MinGW32 */
-/* #undef ZMQ_HAVE_MINGW32 */
-
-/* Have NetBSD OS */
-/* #undef ZMQ_HAVE_NETBSD */
-
-/* Have NORM protocol extension */
-/* #undef ZMQ_HAVE_NORM */
-
-/* Have OpenBSD OS */
-/* #undef ZMQ_HAVE_OPENBSD */
-
-/* Have OpenPGM extension */
-/* #undef ZMQ_HAVE_OPENPGM */
-
-/* Have DarwinOSX OS */
-/* #undef ZMQ_HAVE_OSX */
-
-/* Have QNX Neutrino OS */
-/* #undef ZMQ_HAVE_QNXNTO */
-
-/* Whether SOCK_CLOEXEC is defined and functioning. */
-/* #undef ZMQ_HAVE_SOCK_CLOEXEC */
-
-/* Have Solaris OS */
-/* #undef ZMQ_HAVE_SOLARIS */
-
-/* Whether SO_KEEPALIVE is supported. */
-#define ZMQ_HAVE_SO_KEEPALIVE 1
-
-/* Have SO_PEERCRED socket option */
-/* #undef ZMQ_HAVE_SO_PEERCRED */
-
-/* Whether TCP_KEEPALIVE is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPALIVE */
-
-/* Whether TCP_KEEPCNT is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPCNT */
-
-/* Whether TCP_KEEPIDLE is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPIDLE */
-
-/* Whether TCP_KEEPINTVL is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPINTVL */
-
-/* Have TIPC support */
-/* #undef ZMQ_HAVE_TIPC */
-
-/* Have uio.h header. */
-#define ZMQ_HAVE_UIO 1
-
-/* Have Windows OS */
-/* #undef ZMQ_HAVE_WINDOWS */
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-/* #undef _UINT32_T */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef uint32_t */
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
-   code using `volatile' can become incorrect without. Disable with care. */
-/* #undef volatile */
-
-/* ---- Special case for z/OS Unix Services: openedition ---- */
-#include <pthread.h>
-#ifndef   NI_MAXHOST
-#define   NI_MAXHOST 1025
-#endif
diff --git a/builds/zos/runtests b/builds/zos/runtests
deleted file mode 100755
index e7963e360..000000000
--- a/builds/zos/runtests
+++ /dev/null
@@ -1,188 +0,0 @@
-#! /bin/sh
-# Run ZeroMQ tests, in order.  This is extracted from the tests/Makefile
-# which won't run as-is because it relies on libtool building things, and 
-# thus creating various libtool files, which don't work well on z/OS
-#
-# noinst_PROGRAMS needs to be kept in sync with tests/Makefile.am, as it
-# defines the order in which tests are run.
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-19
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-24
-#---------------------------------------------------------------------------
-
-set -e    # Stop if a test fails
-
-#---------------------------------------------------------------------------
-# Change to tests directory if necessary
-
-# Figure out where we are
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-
-# Locate top of source tree, assuming we're in builds/zos
-TOP="${BIN_DIR}/../.."
-SRCDIR="${TOP}/src"
-TESTDIR="${TOP}/tests"
-
-case "$(pwd)" in
-  *tests) ;;
-  *)      echo "Changing to ${TESTDIR}"
-          cd "${TESTDIR}"
-          ;;
-esac
-
-if [ -x "test_system" ]; then
-  :
-else
-  echo "Run makelibzmq and maketests before runtests" >&2
-  exit 1
-fi
-
-#---------------------------------------------------------------------------
-# Explanation of tests expected to fail:
-# test_abstract_ipc: Relies on Linux-specific IPC functionality
-# test_fork:         Relies on using pthreads _after_ fork, _before_ exec
-# test_diffserv:     Needs IP_PROTO, IP_TOS setsockopt(); the headers
-#                    are present on z/OS UNIX System Services, but
-#                    fails with:
-#                    EDC8109I Protocol not available. (./ip.cpp:164)
-#    NOTE: not listed as a valid IP setsockopt() option at:
-#       http://pic.dhe.ibm.com/infocenter/zos/v2r1/index.jsp?topic=%2Fcom.ibm.zos.v2r1.bpxbd00%2Fsetopt.htm
-#
-XFAIL_TESTS="test_abstract_ipc|test_fork|test_diffserv"
-
-# BUILD_TIPC is not defined, so we skip all these tests
-SKIP_TESTS="test_.*_tipc"
-
-# Extract list of all test programs from tests/Makefile.am
-#
-# Excluding tests we know will fail because of missing functionality
-#
-noinst_PROGRAMS=$(grep "test_" Makefile.am | egrep -v "_SOURCES|XFAIL" |
-                  sed 's/noinst_PROGRAMS.* test/test/; s/^ *//; s/ *\\ *$//;' |
-                  grep -v "${SKIP_TESTS}" | egrep -v "${XFAIL_TESTS}")
-#echo "Found tetsts: ${noinst_PROGRAMS}"
-
-# Run tests on command line, or all tests we found
-if [ -n "${1}" ]; then
-  TESTS="$*"     # Run tests on command line
-else
-  TESTS="${noinst_PROGRAMS}"
-fi
-
-verbose() {
-   echo "Starting: $@" >&2
-   "$@"
-}
-
-# Uncomment TESTS_ENVIRONMENT=verbose to see "Starting: TEST" messages
-#TESTS_ENVIRONMENT=verbose
-TESTS_ENVIRONMENT=
-
-#---------------------------------------------------------------------------
-# Explicitly add SRCDIR into library serach path, to make sure we
-# use our just-built version
-LIBPATH="${SRCDIR}:/lib:/usr/lib"
-export LIBPATH
-
-#---------------------------------------------------------------------------
-# check-TESTS: target from tests/Makefile, converted from Make syntax to
-# shell syntax
-
-failed=0; all=0; xfail=0; xpass=0; skip=0; 
-srcdir=.; export srcdir; 
-list="${TESTS}";
-red=""; grn=""; lgn=""; blu=""; std="";
-if test -n "$list"; then 
-  for tst in $list; do 
-    if test -f ./$tst; then dir=./; 
-    elif test -f $tst; then dir=; 
-    else dir="${srcdir}/"; fi; 
-    if ${TESTS_ENVIRONMENT} ${dir}$tst; then 
-      all=`expr $all + 1`; 
-      case " ${XFAIL_TESTS} " in 
-      *"$tst"*) 
-        xpass=`expr $xpass + 1`; 
-        failed=`expr $failed + 1`; 
-        col=$red; res=XPASS; 
-      ;; 
-      *) 
-        col=$grn; res=PASS; 
-      ;; 
-      esac; 
-    elif test $? -ne 77; then 
-      all=`expr $all + 1`; 
-      case " ${XFAIL_TESTS} " in 
-       *"$tst"*) 
-        xfail=`expr $xfail + 1`; 
-        col=$lgn; res=XFAIL; 
-      ;; 
-      *) 
-        failed=`expr $failed + 1`; 
-        col=$red; res=FAIL; 
-      ;; 
-      esac; 
-    else 
-      skip=`expr $skip + 1`; 
-      col=$blu; res=SKIP; 
-    fi; 
-    echo "${col}$res${std}: $tst"; 
-  done; 
-  if test "$all" -eq 1; then 
-    tests="test"; 
-    All=""; 
-  else 
-    tests="tests"; 
-    All="All "; 
-  fi; 
-  if test "$failed" -eq 0; then 
-    if test "$xfail" -eq 0; then 
-      banner="$All$all $tests passed"; 
-    else 
-      if test "$xfail" -eq 1; then failures=failure; else failures=failures; fi;
-      banner="$All$all $tests behaved as expected ($xfail expected $failures)"; 
-    fi; 
-  else 
-    if test "$xpass" -eq 0; then 
-      banner="$failed of $all $tests failed"; 
-    else 
-      if test "$xpass" -eq 1; then passes=pass; else passes=passes; fi;
-      
-      banner="$failed of $all $tests did not behave as expected ($xpass unexpected $passes)"; 
-    fi; 
-  fi; 
-  dashes="$banner"; 
-  skipped=""; 
-  if test "$skip" -ne 0; then 
-    if test "$skip" -eq 1; then 
-      skipped="($skip test was not run)"; 
-    else 
-      skipped="($skip tests were not run)"; 
-    fi; 
-    test `echo "$skipped" | wc -c` -le `echo "$banner" | wc -c` || 
-       dashes="$skipped"; \        
-  fi; 
-  report=""; 
-  if test "$failed" -ne 0 && test -n "${PACKAGE_BUGREPORT}"; then 
-    report="Please report to ${PACKAGE_BUGREPORT}"; 
-    test `echo "$report" | wc -c` -le `echo "$banner" | wc -c` || 
-      dashes="$report"; 
-  fi; 
-  dashes=`echo "$dashes" | sed s/./=/g`; 
-  if test "$failed" -eq 0; then 
-    col="$grn"; 
-  else 
-    col="$red"; 
-  fi; 
-  echo "${col}$dashes${std}"; 
-  echo "${col}$banner${std}"; 
-  test -z "$skipped" || echo "${col}$skipped${std}"; 
-  test -z "$report" || echo "${col}$report${std}"; 
-  echo "${col}$dashes${std}"; 
-  test "$failed" -eq 0; 
-else :; fi
diff --git a/builds/zos/test_fork.cpp b/builds/zos/test_fork.cpp
deleted file mode 100644
index 54bba09f4..000000000
--- a/builds/zos/test_fork.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include <unistd.h>           // For alarm()
-
-const char *address = "tcp://127.0.0.1:6571";
-
-#define NUM_MESSAGES 5
-#define TIMEOUT_SECS 5        // Global timeout
-
-int main (void)
-{
-    setup_test_environment ();
-    void *ctx = zmq_ctx_new ();
-    assert (ctx);
-
-    //  Create and bind pull socket to receive messages
-    void *pull = zmq_socket (ctx, ZMQ_PULL);
-    assert (pull);
-    int rc = zmq_bind (pull, address);
-    assert (rc == 0);
-
-    int pid = fork ();
-    if (pid == 0) {
-        //  Child process
-        //  Immediately close parent sockets and context
-        zmq_close (pull);
-        zmq_ctx_term (ctx);
-
-        //  Create new context, socket, connect and send some messages
-        void *child_ctx = zmq_ctx_new ();
-        assert (child_ctx);
-        void *push = zmq_socket (child_ctx, ZMQ_PUSH);
-        assert (push);
-        rc = zmq_connect (push, address);
-        assert (rc == 0);
-        int count;
-        for (count = 0; count < NUM_MESSAGES; count++)
-            zmq_send (push, "Hello", 5, 0);
-
-        zmq_close (push);
-        zmq_ctx_destroy (child_ctx);
-        exit (0);
-    }
-    else {
-        //  Parent process
-        alarm(TIMEOUT_SECS);   // Set upper limit on runtime
-
-        int count;
-        for (count = 0; count < NUM_MESSAGES; count++) {
-            char buffer [5];
-            int num_bytes = zmq_recv (pull, buffer, 5, 0);
-            assert (num_bytes == 5);
-        }
-        int child_status;
-        while (true) {
-            rc = waitpid (pid, &child_status, 0);
-            if (rc == -1 && errno == EINTR)
-                continue;
-            assert (rc > 0);
-            //  Verify the status code of the child was zero
-            assert (WEXITSTATUS (child_status) == 0);
-            break;
-        }
-        exit (0);
-    }
-    return 0;
-}
diff --git a/builds/zos/zc++ b/builds/zos/zc++
deleted file mode 100755
index f78456845..000000000
--- a/builds/zos/zc++
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Wrapper around IBM C++ compiler to add "-+" to preprocessor calls
-# and thus work with C++ in files other than *.C.  Also add -Wc,lang(longlong)
-# with appropriate quoting to avoid shell confusion -- this is difficult 
-# to get through both ./configure arguments _and_ Makefile/shell expansion
-# safely so more easily added in this wrapper.
-#
-# Finally, by default will enable xplink for C++ compatibilty and performance
-# (c++ standard library requires xplink enabled).
-#
-# Additional compile/link flags can be passed in as ZCXXFLAGS, eg:
-#
-# For debug:  ZXCCFLAGS=-g ...
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-18
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-21
-#---------------------------------------------------------------------------
-
-CPPFLAGS="-+"
-LONGLONG="-Wc,lang(longlong)"
-XPLINK="${XPLINK:--Wc,xplink -Wl,xplink}"
-CXX="/bin/c++"
-ZCXXFLAGS="${ZCXXFLAGS:-}"   # Extra compile/link arguments, eg "-g"
-
-# For debugging calling conventions issues
-#echo "Called with: $0 $@" >>/tmp/zc++.log 2>&1
-#exec >>/tmp/zc++.log 2>&1
-#set -x
-
-case "$1" in 
-  -E) exec "${CXX}"                            "${CPPFLAGS}"           "$@"
-      ;;
-  -o) exec "${CXX}" ${ZCXXFLAGS} "${LONGLONG}" "${CPPFLAGS}" ${XPLINK} "$@"
-      ;;
-  -c) exec "${CXX}" ${ZCXXFLAGS} "${LONGLONG}" "${CPPFLAGS}" ${XPLINK} "$@"
-      ;;
-  -L) # Special case for linking via C++, called from linkall
-      exec "${CXX}" ${ZCXXFLAGS}                             ${XPLINK} "$@"
-      ;;
-  *)  exec "${CXX}" ${ZCXXFLAGS} "${LONGLONG}"               ${XPLINK} "$@"
-      ;;
-esac
diff --git a/ci_build.sh b/ci_build.sh
deleted file mode 100755
index c176cbc92..000000000
--- a/ci_build.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-if [ $BUILD_TYPE = "default" ]; then
-    mkdir tmp
-    BUILD_PREFIX=$PWD/tmp
-
-    CONFIG_OPTS=()
-    CONFIG_OPTS+=("CFLAGS=-g")
-    CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-    CONFIG_OPTS+=("CXXFLAGS=-g")
-    CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-    CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-    CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
-    CHECK="distcheck"
-
-    if [ -n "$ADDRESS_SANITIZER" ] && [ "$ADDRESS_SANITIZER" = "enabled" ]; then
-        CONFIG_OPTS+=("--enable-address-sanitizer=yes")
-        # distcheck does an out-of-tree build, and the fuzzer tests use a hard-coded relative path for simplicity
-        CHECK="check"
-    fi
-
-    if [ "$USE_NSS" = "yes" ]; then
-        CONFIG_OPTS+=("--with-nss")
-    fi
-
-    if [ -z "$CURVE" ]; then
-        CONFIG_OPTS+=("--disable-curve")
-    elif [ "$CURVE" = "libsodium" ]; then
-        CONFIG_OPTS+=("--with-libsodium=yes")
-
-        if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
-                (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
-            git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-            ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
-        fi
-    fi
-
-    if [ -n "$GSSAPI" ] && [ "$GSSAPI" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-libgssapi_krb5=yes")
-    fi
-
-    if [ -n "$PGM" ] && [ "$PGM" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-pgm=yes")
-    fi
-
-    if [ -n "$NORM" ] && [ "$NORM" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-norm=yes")
-    fi
-
-    if [ -n "$TIPC" ] && [ "$TIPC" = "enabled" ]; then
-        sudo modprobe tipc
-    fi
-
-    if [ -n "$POLLER" ]; then
-        CONFIG_OPTS+=("--with-poller=${POLLER}")
-    fi
-
-    if [ -n "$TLS" ] && [ "$TLS" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-tls=yes")
-    fi
-
-    if [ -z "$DRAFT" ] || [ "$DRAFT" = "disabled" ]; then
-        CONFIG_OPTS+=("--enable-drafts=no")
-    elif [ "$DRAFT" = "enabled" ]; then
-        CONFIG_OPTS+=("--enable-drafts=yes")
-    fi
-
-    if [ -n "$FORCE_98" ] && [ "$FORCE_98" = "enabled" ]; then
-        CONFIG_OPTS+=("--enable-force-CXX98-compat=yes")
-    fi
-
-    # Build and check this project
-    (
-        ./autogen.sh &&
-        ./configure "${CONFIG_OPTS[@]}" &&
-        export DISTCHECK_CONFIGURE_FLAGS="${CONFIG_OPTS[@]}" &&
-        make VERBOSE=1 -j5 ${CHECK}
-    ) || exit 1
-else
-    cd ./builds/${BUILD_TYPE} && ./ci_build.sh
-fi
diff --git a/ci_deploy.sh b/ci_deploy.sh
deleted file mode 100644
index a1982182e..000000000
--- a/ci_deploy.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# do NOT set -x or it will log the secret tokens!
-set -e
-
-if [[ $BUILD_TYPE == "default" && $CURVE == "libsodium" && -z $DRAFT ]]; then
-    # Tell travis to deploy all files in dist
-    mkdir dist
-    export LIBZMQ_DEPLOYMENT=dist/*
-    # Move archives to dist
-    mv *.tar.gz dist
-    mv *.zip dist
-    # Generate hash sums
-    cd dist
-    md5sum *.zip *.tar.gz > MD5SUMS
-    sha1sum *.zip *.tar.gz > SHA1SUMS
-    cd -
-
-    # Trigger source run on new tag on OBS. The latest tag will be fetched.
-    if [ -n "${OBS_STABLE_TOKEN}" ]; then
-        curl -H "Authorization: Token ${OBS_STABLE_TOKEN}" -X POST https://api.opensuse.org/trigger/runservice
-    fi
-    if [ -n "${OBS_DRAFT_TOKEN}" ]; then
-        curl -H "Authorization: Token ${OBS_DRAFT_TOKEN}" -X POST https://api.opensuse.org/trigger/runservice
-    fi
-else
-    export LIBZMQ_DEPLOYMENT=""
-fi
diff --git a/clips/agenda.c b/clips/agenda.c
new file mode 100755
index 000000000..154522929
--- /dev/null
+++ b/clips/agenda.c
@@ -0,0 +1,1363 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/04/17             */
+   /*                                                     */
+   /*                    AGENDA MODULE                    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*   Provides functionality for examining, manipulating,     */
+/*   adding, and removing activations from the agenda.       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES         */
+/*            and DYNAMIC_SALIENCE compilation flags.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added EnvGetActivationBasisPPForm function.    */
+/*                                                           */
+/*      6.30: Added salience groups to improve performance   */
+/*            with large numbers of activations of different */
+/*            saliences.                                     */
+/*                                                           */
+/*            Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include "argacces.h"
+#include "constant.h"
+#include "crstrtgy.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "moduldef.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "retract.h"
+#include "router.h"
+#include "rulebsc.h"
+#include "ruledef.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+#include "watch.h"
+
+#include "agenda.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    PrintActivation(Environment *,const char *,Activation *);
+   static void                    AgendaClearFunction(Environment *,void *);
+   static const char             *SalienceEvaluationName(int);
+   static int                     EvaluateSalience(Environment *,Defrule *);
+   static struct salienceGroup   *ReuseOrCreateSalienceGroup(Environment *,struct defruleModule *,int);
+   static struct salienceGroup   *FindSalienceGroup(struct defruleModule *,int);
+   static void                    RemoveActivationFromGroup(Environment *,Activation *,struct defruleModule *);
+
+/*************************************************/
+/* InitializeAgenda: Initializes the activations */
+/*   watch item and the H/L commands for         */
+/*   manipulating the agenda.                    */
+/*************************************************/
+void InitializeAgenda(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,AGENDA_DATA,sizeof(struct agendaData),NULL);
+
+   AgendaData(theEnv)->SalienceEvaluation = WHEN_DEFINED;
+
+   AgendaData(theEnv)->Strategy = DEFAULT_STRATEGY;
+
+   AddClearFunction(theEnv,"agenda",AgendaClearFunction,0,NULL);
+#if DEBUGGING_FUNCTIONS
+   AddWatchItem(theEnv,"activations",1,&AgendaData(theEnv)->WatchActivations,40,DefruleWatchAccess,DefruleWatchPrint);
+#endif
+#if ! RUN_TIME
+   AddUDF(theEnv,"refresh","v",1,1,"y",RefreshCommand,"RefreshCommand",NULL);
+   AddUDF(theEnv,"refresh-agenda","v",0,1,"y",RefreshAgendaCommand,"RefreshAgendaCommand",NULL);
+   AddUDF(theEnv,"get-salience-evaluation","y",0,0,NULL,GetSalienceEvaluationCommand,"GetSalienceEvaluationCommand",NULL);
+   AddUDF(theEnv,"set-salience-evaluation","y",1,1,"y",SetSalienceEvaluationCommand,"SetSalienceEvaluationCommand",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"agenda","v",0,1,"y",AgendaCommand,"AgendaCommand",NULL);
+#endif
+#endif
+  }
+
+/*****************************************************************/
+/* AddActivation: Creates a rule activation to be added to the   */
+/*   Agenda and links the activation with its associated partial */
+/*   match. The function PlaceActivation is then called to place */
+/*   the activation on the Agenda. Typically called when all     */
+/*   patterns on the LHS of a rule have been satisfied.          */
+/*****************************************************************/
+void AddActivation(
+  Environment *theEnv,
+  Defrule *theRule,
+  PartialMatch *binds)
+  {
+   Activation *newActivation;
+   struct defruleModule *theModuleItem;
+   struct salienceGroup *theGroup;
+
+   /*=======================================*/
+   /* Focus on the module if the activation */
+   /* is from an auto-focus rule.           */
+   /*=======================================*/
+
+   if (theRule->autoFocus)
+     { Focus(theRule->header.whichModule->theModule); }
+
+   /*=======================================================*/
+   /* Create the activation. The activation stores pointers */
+   /* to its associated partial match and defrule. The      */
+   /* activation is given a time tag, its salience is       */
+   /* evaluated, and it is assigned a random number for use */
+   /* with the random conflict resolution strategy.         */
+   /*=======================================================*/
+
+   newActivation = get_struct(theEnv,activation);
+   newActivation->theRule = theRule;
+   newActivation->basis = binds;
+   newActivation->timetag = AgendaData(theEnv)->CurrentTimetag++;
+   newActivation->salience = EvaluateSalience(theEnv,theRule);
+
+   newActivation->randomID = genrand();
+   newActivation->prev = NULL;
+   newActivation->next = NULL;
+
+   AgendaData(theEnv)->NumberOfActivations++;
+
+   /*=======================================================*/
+   /* Point the partial match to the activation to complete */
+   /* the link between the join network and the agenda.     */
+   /*=======================================================*/
+
+   binds->marker = newActivation;
+
+   /*====================================================*/
+   /* If activations are being watch, display a message. */
+   /*====================================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if (newActivation->theRule->watchActivation &&
+       (! ConstructData(theEnv)->ClearReadyInProgress) &&
+       (! ConstructData(theEnv)->ClearInProgress))
+     {
+      WriteString(theEnv,STDOUT,"==> Activation ");
+      PrintActivation(theEnv,STDOUT,newActivation);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+#endif
+
+    /*=====================================*/
+    /* Place the activation on the agenda. */
+    /*=====================================*/
+
+    theModuleItem = (struct defruleModule *) theRule->header.whichModule;
+
+    theGroup = ReuseOrCreateSalienceGroup(theEnv,theModuleItem,newActivation->salience);
+
+    PlaceActivation(theEnv,&(theModuleItem->agenda),newActivation,theGroup);
+   }
+
+/*******************************/
+/* ReuseOrCreateSalienceGroup: */
+/*******************************/
+static struct salienceGroup *ReuseOrCreateSalienceGroup(
+  Environment *theEnv,
+  struct defruleModule *theRuleModule,
+  int salience)
+  {
+   struct salienceGroup *theGroup, *lastGroup, *newGroup;
+
+   for (lastGroup = NULL, theGroup = theRuleModule->groupings;
+        theGroup != NULL;
+        lastGroup = theGroup, theGroup = theGroup->next)
+     {
+      if (theGroup->salience == salience)
+        { return(theGroup); }
+
+      if (theGroup->salience < salience)
+        { break; }
+     }
+
+   newGroup = get_struct(theEnv,salienceGroup);
+   newGroup->salience = salience;
+   newGroup->first = NULL;
+   newGroup->last = NULL;
+   newGroup->next = theGroup;
+   newGroup->prev = lastGroup;
+
+   if (newGroup->next != NULL)
+     { newGroup->next->prev = newGroup; }
+
+   if (newGroup->prev != NULL)
+     { newGroup->prev->next = newGroup; }
+
+   if (lastGroup == NULL)
+     { theRuleModule->groupings = newGroup; }
+
+   return newGroup;
+  }
+
+/**********************/
+/* FindSalienceGroup: */
+/**********************/
+static struct salienceGroup *FindSalienceGroup(
+  struct defruleModule *theRuleModule,
+  int salience)
+  {
+   struct salienceGroup *theGroup;
+
+   for (theGroup = theRuleModule->groupings;
+        theGroup != NULL;
+        theGroup = theGroup->next)
+     {
+      if (theGroup->salience == salience)
+        { return(theGroup); }
+
+      if (theGroup->salience < salience)
+        { break; }
+     }
+
+   return NULL;
+  }
+
+/***************************************************************/
+/* ClearRuleFromAgenda: Clears the agenda of a specified rule. */
+/***************************************************************/
+void ClearRuleFromAgenda(
+  Environment *theEnv,
+  Defrule *theRule)
+  {
+   Defrule *tempRule;
+   struct activation *agendaPtr, *agendaNext;
+
+   /*============================================*/
+   /* Get a pointer to the agenda for the module */
+   /* in which the rule is contained.            */
+   /*============================================*/
+
+   agendaPtr = ((struct defruleModule *) theRule->header.whichModule)->agenda;
+
+   /*==============================================*/
+   /* Loop through every activation on the agenda. */
+   /*==============================================*/
+
+   while (agendaPtr != NULL)
+     {
+      agendaNext = agendaPtr->next;
+
+      /*========================================================*/
+      /* Check each disjunct of the rule against the activation */
+      /* to determine if the activation points to the rule. If  */
+      /* it does, then remove the activation from the agenda.   */
+      /*========================================================*/
+
+      for (tempRule = theRule;
+           tempRule != NULL;
+           tempRule = tempRule->disjunct)
+        {
+         if (agendaPtr->theRule == tempRule)
+           {
+            RemoveActivation(theEnv,agendaPtr,true,true);
+            break;
+           }
+        }
+
+      agendaPtr = agendaNext;
+     }
+  }
+
+/***************************************************************/
+/* GetNextActivation: Returns an activation from the Agenda.   */
+/*   If its argument is NULL, then the first activation on the */
+/*   Agenda is returned. If its argument is not NULL, the next */
+/*   activation after the argument is returned.                */
+/***************************************************************/
+Activation *GetNextActivation(
+  Environment *theEnv,
+  Activation *actPtr)
+  {
+   struct defruleModule *theModuleItem;
+
+   if (actPtr == NULL)
+     {
+      theModuleItem = (struct defruleModule *) GetModuleItem(theEnv,NULL,DefruleData(theEnv)->DefruleModuleIndex);
+      if (theModuleItem == NULL) return NULL;
+      return theModuleItem->agenda;
+     }
+   else
+     { return actPtr->next; }
+  }
+
+/*********************************************/
+/* GetActivationBasis: Returns the basis of  */
+/*   the rule associated with an activation. */
+/*********************************************/
+struct partialMatch *GetActivationBasis(
+  Environment *theEnv,
+  Activation *actPtr)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+   return actPtr->basis;
+  }
+
+/*********************************************/
+/* ActivationRuleName: Returns the name of   */
+/*   the rule associated with an activation. */
+/*********************************************/
+const char *ActivationRuleName(
+  Activation *actPtr)
+  {
+   return actPtr->theRule->header.name->contents;
+  }
+
+/***************************************/
+/* GetActivationRule: Returns the rule */
+/*   associated with an activation.    */
+/***************************************/
+Defrule *GetActivationRule(
+  Environment *theEnv,
+  Activation *actPtr)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+   return actPtr->theRule;
+  }
+
+/************************************************/
+/* ActivationGetSalience: Returns the salience  */
+/*   of the rule associated with an activation. */
+/************************************************/
+int ActivationGetSalience(
+  Activation *actPtr)
+  {
+   return actPtr->salience;
+  }
+
+/**************************************/
+/* ActivationSetSalience: Sets the    */
+/*   salience value of an activation. */
+/**************************************/
+int ActivationSetSalience(
+  Activation *actPtr,
+  int value)
+  {
+   int temp;
+
+   if (value > MAX_DEFRULE_SALIENCE)
+     { value = MAX_DEFRULE_SALIENCE; }
+   else if (value < MIN_DEFRULE_SALIENCE)
+     { value = MIN_DEFRULE_SALIENCE; }
+    
+   temp = actPtr->salience;
+   actPtr->salience = value;
+   return temp;
+  }
+
+/********************************************/
+/* ActivationPPForm: Returns the pretty     */
+/*   print representation of an activation. */
+/********************************************/
+void ActivationPPForm(
+  Activation *theActivation,
+  StringBuilder *theSB)
+  {
+   Environment *theEnv = theActivation->theRule->header.env;
+   
+   OpenStringBuilderDestination(theEnv,"ActPPForm",theSB);
+   PrintActivation(theEnv,"ActPPForm",theActivation);
+   CloseStringBuilderDestination(theEnv,"ActPPForm");
+  }
+
+/****************************************************/
+/* GetActivationBasisPPForm: Returns the pretty     */
+/*   print representation of an activation's basis. */
+/****************************************************/
+void GetActivationBasisPPForm(
+  Environment *theEnv,
+  char *buffer,
+  size_t bufferLength,
+  Activation *theActivation)
+  {
+   OpenStringDestination(theEnv,"ActPPForm",buffer,bufferLength);
+   PrintPartialMatch(theEnv,"ActPPForm",theActivation->basis);
+   CloseStringDestination(theEnv,"ActPPForm");
+  }
+
+/********************************************/
+/* MoveActivationToTop: Moves the specified */
+/*   activation to the top of the agenda.   */
+/********************************************/
+bool MoveActivationToTop(
+  Environment *theEnv,
+  Activation *theActivation)
+  {
+   struct activation *prevPtr;
+   struct defruleModule *theModuleItem;
+
+   /*====================================*/
+   /* Determine the module of the agenda */
+   /* in which the activation is stored. */
+   /*====================================*/
+
+   theModuleItem = (struct defruleModule *) theActivation->theRule->header.whichModule;
+
+   /*============================================*/
+   /* If the activation is already at the top of */
+   /* the agenda, then nothing needs to be done. */
+   /*============================================*/
+
+   if (theActivation == theModuleItem->agenda) return false;
+
+   /*=================================================*/
+   /* Update the pointers of the activation preceding */
+   /* and following the activation being moved.       */
+   /*=================================================*/
+
+   prevPtr = theActivation->prev;
+   prevPtr->next = theActivation->next;
+   if (theActivation->next != NULL) theActivation->next->prev = prevPtr;
+
+   /*=======================================================*/
+   /* Move the activation and then update its pointers, the */
+   /* pointers of the activation following it, and the      */
+   /* module pointer to the top activation on the agenda.   */
+   /*=======================================================*/
+
+   theActivation->next = theModuleItem->agenda;
+   theModuleItem->agenda->prev = theActivation;
+   theActivation->prev = NULL;
+   theModuleItem->agenda = theActivation;
+
+   /*=============================*/
+   /* Mark the agenda as changed. */
+   /*=============================*/
+
+   AgendaData(theEnv)->AgendaChanged = true;
+
+   return true;
+  }
+
+/*******************************************/
+/* DeleteActivation: Removes the specified */
+/*   activation from the agenda.           */
+/*******************************************/
+void DeleteActivation(
+  Activation *theActivation)
+  {
+   RemoveActivation(theActivation->theRule->header.env,theActivation,true,true);
+  }
+
+/*************************************************/
+/* DeleteAllActivations: Removes all activations */
+/*   from the agenda of the specified module.    */
+/*************************************************/
+void DeleteAllActivations(
+  Defmodule *theModule)
+  {
+   struct activation *tempPtr, *theActivation;
+   struct salienceGroup *theGroup, *tempGroup;
+   Environment *theEnv = theModule->header.env;
+
+   theActivation = GetDefruleModuleItem(theEnv,NULL)->agenda;
+   while (theActivation != NULL)
+     {
+      tempPtr = theActivation->next;
+      RemoveActivation(theEnv,theActivation,true,true);
+      theActivation = tempPtr;
+     }
+
+   theGroup = GetDefruleModuleItem(theEnv,NULL)->groupings;
+   while (theGroup != NULL)
+     {
+      tempGroup = theGroup->next;
+      rtn_struct(theEnv,salienceGroup,theGroup);
+      theGroup = tempGroup;
+     }
+ }
+
+/*******************************************************/
+/* DetachActivation: Detaches the specified activation */
+/*   from the list of activations on the Agenda.       */
+/*******************************************************/
+bool DetachActivation(
+  Environment *theEnv,
+  Activation *theActivation)
+  {
+   struct defruleModule *theModuleItem;
+
+   /*============================*/
+   /* A NULL pointer is invalid. */
+   /*============================*/
+
+   if (theActivation == NULL) SystemError(theEnv,"AGENDA",1);
+
+   /*====================================*/
+   /* Determine the module of the agenda */
+   /* in which the activation is stored. */
+   /*====================================*/
+
+   theModuleItem = (struct defruleModule *) theActivation->theRule->header.whichModule;
+
+   RemoveActivationFromGroup(theEnv,theActivation,theModuleItem);
+
+   /*========================================================*/
+   /* If the activation is the top activation on the agenda, */
+   /* then update the module pointer to agenda.              */
+   /*========================================================*/
+
+   if (theActivation == theModuleItem->agenda)
+     { theModuleItem->agenda = theActivation->next; }
+
+   /*==================================================*/
+   /* Update the pointers in the preceding activation. */
+   /*==================================================*/
+
+   if (theActivation->prev != NULL)
+     { theActivation->prev->next = theActivation->next; }
+
+   /*==================================================*/
+   /* Update the pointers in the following activation. */
+   /*==================================================*/
+
+   if (theActivation->next != NULL)
+     { theActivation->next->prev = theActivation->prev; }
+
+   /*=================================================*/
+   /* Update the pointers in the detached activation. */
+   /*=================================================*/
+
+   theActivation->prev = NULL;
+   theActivation->next = NULL;
+
+   /*=============================*/
+   /* Mark the agenda as changed. */
+   /*=============================*/
+
+   AgendaData(theEnv)->AgendaChanged = true;
+
+   return true;
+  }
+
+/****************************************************************************/
+/* PrintActivation: Prints an activation in a "pretty" format. Salience,    */
+/*   rule name, and the partial match which activated the rule are printed. */
+/****************************************************************************/
+static void PrintActivation(
+  Environment *theEnv,
+  const char *logicalName,
+  Activation *theActivation)
+  {
+   char printSpace[20];
+
+   gensprintf(printSpace,"%-6d ",theActivation->salience);
+   WriteString(theEnv,logicalName,printSpace);
+   WriteString(theEnv,logicalName,theActivation->theRule->header.name->contents);
+   WriteString(theEnv,logicalName,": ");
+   PrintPartialMatch(theEnv,logicalName,theActivation->basis);
+  }
+
+/*****************************/
+/* Agenda: C access routine  */
+/*   for the agenda command. */
+/*****************************/
+void Agenda(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListItemsDriver(theEnv,logicalName,theModule,"activation","activations",
+                   (GetNextItemFunction *) GetNextActivation,
+                   NULL,
+                   (PrintItemFunction *) PrintActivation,
+                   NULL);
+  }
+
+/*******************************************************************/
+/* RemoveActivation: Returns an activation and its associated data */
+/*   structures to the Memory Manager. Links to other activations  */
+/*   and partial matches may also be updated.                      */
+/*******************************************************************/
+void RemoveActivation(
+  Environment *theEnv,
+  Activation *theActivation,
+  bool updateAgenda,
+  bool updateLinks)
+  {
+   struct defruleModule *theModuleItem;
+
+   /*====================================*/
+   /* Determine the module of the agenda */
+   /* in which the activation is stored. */
+   /*====================================*/
+
+   theModuleItem = (struct defruleModule *) theActivation->theRule->header.whichModule;
+
+   /*=================================*/
+   /* Update the agenda if necessary. */
+   /*=================================*/
+
+   if (updateAgenda == true)
+     {
+      RemoveActivationFromGroup(theEnv,theActivation,theModuleItem);
+
+      /*===============================================*/
+      /* Update the pointer links between activations. */
+      /*===============================================*/
+
+      if (theActivation->prev == NULL)
+        {
+         theModuleItem->agenda = theModuleItem->agenda->next;
+         if (theModuleItem->agenda != NULL) theModuleItem->agenda->prev = NULL;
+        }
+      else
+        {
+         theActivation->prev->next = theActivation->next;
+         if (theActivation->next != NULL)
+           { theActivation->next->prev = theActivation->prev; }
+        }
+
+      /*===================================*/
+      /* Indicate removal of activation if */
+      /* activations are being watched.    */
+      /*===================================*/
+
+#if DEBUGGING_FUNCTIONS
+      if (theActivation->theRule->watchActivation &&
+          (! ConstructData(theEnv)->ClearReadyInProgress) &&
+          (! ConstructData(theEnv)->ClearInProgress))
+        {
+         WriteString(theEnv,STDOUT,"<== Activation ");
+         PrintActivation(theEnv,STDOUT,theActivation);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+#endif
+
+      /*=============================*/
+      /* Mark the agenda as changed. */
+      /*=============================*/
+
+      AgendaData(theEnv)->AgendaChanged = true;
+     }
+
+   /*============================================*/
+   /* Update join and agenda links if necessary. */
+   /*============================================*/
+
+   if ((updateLinks == true) && (theActivation->basis != NULL))
+     { theActivation->basis->marker = NULL; }
+
+   /*================================================*/
+   /* Return the activation to the free memory pool. */
+   /*================================================*/
+
+   AgendaData(theEnv)->NumberOfActivations--;
+
+   rtn_struct(theEnv,activation,theActivation);
+  }
+
+/******************************/
+/* RemoveActivationFromGroup: */
+/******************************/
+static void RemoveActivationFromGroup(
+  Environment *theEnv,
+  Activation *theActivation,
+  struct defruleModule *theRuleModule)
+  {
+   struct salienceGroup *theGroup;
+
+   theGroup = FindSalienceGroup(theRuleModule,theActivation->salience);
+   if (theGroup == NULL) return;
+
+   if (theActivation == theGroup->first)
+     {
+      /*====================================================*/
+      /* If the activation is the only remaining activation */
+      /* in the group, then the group needs to be removed.  */
+      /*====================================================*/
+
+      if (theActivation == theGroup->last)
+        {
+         if (theGroup->prev == NULL)
+           { theRuleModule->groupings = theGroup->next; }
+         else
+           { theGroup->prev->next = theGroup->next; }
+
+         if (theGroup->next != NULL)
+           { theGroup->next->prev = theGroup->prev; }
+
+         rtn_struct(theEnv,salienceGroup,theGroup);
+        }
+
+      /*======================================================*/
+      /* Otherwise this is the first activation in the group, */
+      /* but there are other activations which follow.        */
+      /*======================================================*/
+
+      else
+        { theGroup->first = theActivation->next; }
+     }
+   else
+     {
+      /*====================================================*/
+      /* Otherwise if the activation isn't the first in the */
+      /* group, then check to see if it's the last.         */
+      /*====================================================*/
+
+      if (theActivation == theGroup->last)
+        { theGroup->last = theActivation->prev; }
+
+      /*==================================================*/
+      /* Otherwise the activation is in the middle of the */
+      /* group and no first/last updates are needed.      */
+      /*==================================================*/
+
+      else
+        { return; }
+     }
+  }
+
+/**************************************************************/
+/* AgendaClearFunction: Agenda clear routine for use with the */
+/*   clear command. Resets the current time tag to zero.      */
+/**************************************************************/
+static void AgendaClearFunction(
+  Environment *theEnv,
+  void *context)
+  {
+   AgendaData(theEnv)->CurrentTimetag = 1;
+  }
+
+/*************************************************/
+/* RemoveAllActivations: Removes all activations */
+/*   from the agenda of the current module.      */
+/*************************************************/
+void RemoveAllActivations(
+  Environment *theEnv)
+  {
+   struct activation *tempPtr, *theActivation;
+   struct salienceGroup *theGroup, *tempGroup;
+
+   theActivation = GetDefruleModuleItem(theEnv,NULL)->agenda;
+   while (theActivation != NULL)
+     {
+      tempPtr = theActivation->next;
+      RemoveActivation(theEnv,theActivation,true,true);
+      theActivation = tempPtr;
+     }
+
+   theGroup = GetDefruleModuleItem(theEnv,NULL)->groupings;
+   while (theGroup != NULL)
+     {
+      tempGroup = theGroup->next;
+      rtn_struct(theEnv,salienceGroup,theGroup);
+      theGroup = tempGroup;
+     }
+ }
+
+/**********************************************/
+/* GetAgendaChanged: Returns the value of the */
+/*   boolean flag which indicates whether any */
+/*   changes have been made to the agenda.    */
+/**********************************************/
+bool GetAgendaChanged(
+  Environment *theEnv)
+  {
+   return(AgendaData(theEnv)->AgendaChanged);
+  }
+
+/*****************************************************************/
+/* SetAgendaChanged: Sets the value of the boolean flag which    */
+/*   indicates whether any changes have been made to the agenda. */
+/*****************************************************************/
+void SetAgendaChanged(
+  Environment *theEnv,
+  bool value)
+  {
+   AgendaData(theEnv)->AgendaChanged = value;
+  }
+
+/**********************/
+/* ReorderAllAgendas: */
+/**********************/
+void ReorderAllAgendas(
+  Environment *theEnv)
+  {
+   Defmodule *theModule;
+   
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     { ReorderAgenda(theModule); }
+  }
+
+/*******************************************************/
+/* ReorderAgenda: Completely reorders the agenda based */
+/*   on the current conflict resolution strategy.      */
+/*******************************************************/
+void ReorderAgenda(
+  Defmodule *theModule)
+  {
+   struct activation *theActivation, *tempPtr;
+   struct defruleModule *theModuleItem;
+   struct salienceGroup *theGroup, *tempGroup;
+   Environment *theEnv;
+
+   if (theModule == NULL) return;
+   theEnv = theModule->header.env;
+     
+   /*=================================*/
+   /* Get the list of activations and */
+   /* remove them from the agenda.    */
+   /*=================================*/
+
+   theModuleItem = GetDefruleModuleItem(theEnv,theModule);
+   theActivation = theModuleItem->agenda;
+   theModuleItem->agenda = NULL;
+
+   theGroup = theModuleItem->groupings;
+   while (theGroup != NULL)
+     {
+      tempGroup = theGroup->next;
+      rtn_struct(theEnv,salienceGroup,theGroup);
+      theGroup = tempGroup;
+     }
+
+   theModuleItem->groupings = NULL;
+
+   /*=========================================*/
+   /* Reorder the activations by placing them */
+   /* back on the agenda one by one.          */
+   /*=========================================*/
+
+   while (theActivation != NULL)
+     {
+      tempPtr = theActivation->next;
+      theActivation->next = NULL;
+      theActivation->prev = NULL;
+      theGroup = ReuseOrCreateSalienceGroup(theEnv,theModuleItem,theActivation->salience);
+      PlaceActivation(theEnv,&(theModuleItem->agenda),theActivation,theGroup);
+      theActivation = tempPtr;
+     }
+  }
+
+/****************************************************/
+/* GetNumberOfActivations: Returns the value of the */
+/*   total number of activations on all agendas.    */
+/****************************************************/
+unsigned long GetNumberOfActivations(
+  Environment *theEnv)
+  {
+   return(AgendaData(theEnv)->NumberOfActivations);
+  }
+
+/******************************************************/
+/* RefreshCommand: H/L Command for refreshing a rule. */
+/*   Syntax: (refresh <defrule-name>)                 */
+/******************************************************/
+void RefreshCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *ruleName;
+   Defrule *rulePtr;
+
+   /*===========================*/
+   /* Get the name of the rule. */
+   /*===========================*/
+
+   ruleName = GetConstructName(context,"refresh","rule name");
+   if (ruleName == NULL) return;
+
+   /*===============================*/
+   /* Determine if the rule exists. */
+   /*===============================*/
+
+   rulePtr = FindDefrule(theEnv,ruleName);
+   if (rulePtr == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defrule",ruleName,true);
+      return;
+     }
+
+   /*===================*/
+   /* Refresh the rule. */
+   /*===================*/
+
+   Refresh(rulePtr);
+  }
+
+/***********************************************************/
+/* Refresh: Refreshes a defrule. Activations of the rule   */
+/*   that have already been fired are added to the agenda. */
+/***********************************************************/
+void Refresh(
+  Defrule *theRule)
+  {
+   Defrule *rulePtr;
+   struct partialMatch *listOfMatches;
+   unsigned long b;
+   Environment *theEnv = theRule->header.env;
+
+   /*====================================*/
+   /* Refresh each disjunct of the rule. */
+   /*====================================*/
+
+   for (rulePtr = theRule;
+        rulePtr != NULL;
+        rulePtr = rulePtr->disjunct)
+     {
+      /*================================*/
+      /* Check each partial match that  */
+      /* satisfies the LHS of the rule. */
+      /*================================*/
+
+      for (b = 0; b < rulePtr->lastJoin->leftMemory->size; b++)
+        {
+         for (listOfMatches = rulePtr->lastJoin->leftMemory->beta[b];
+              listOfMatches != NULL;
+              listOfMatches = listOfMatches->nextInMemory)
+           {
+            /*=======================================================*/
+            /* If the partial match is associated with an activation */
+            /* (which it should always be), then place a new         */
+            /* activation on the agenda if this partial matchdoesn't */
+            /* have an activation associated with it.                */
+            /*=======================================================*/
+
+            if (((struct joinNode *) listOfMatches->owner)->ruleToActivate != NULL)
+              {
+               if (listOfMatches->marker == NULL)
+                 { AddActivation(theEnv,rulePtr,listOfMatches); }
+              }
+           }
+        }
+     }
+  }
+
+/**********************************************/
+/* RefreshAgendaCommand: H/L access routine   */
+/*   for the refresh-agenda command.          */
+/**********************************************/
+void RefreshAgendaCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int numArgs;
+   bool error;
+   Defmodule *theModule;
+
+   /*==============================================*/
+   /* This function can have at most one argument. */
+   /*==============================================*/
+
+   numArgs = UDFArgumentCount(context);
+
+   /*===============================================================*/
+   /* If a module name is specified, then the agenda of that module */
+   /* is refreshed. Otherwise, the agenda of the current module is  */
+   /* refreshed.                                                    */
+   /*===============================================================*/
+
+   if (numArgs == 1)
+     {
+      theModule = GetModuleName(context,1,&error);
+      if (error) return;
+     }
+   else
+     { theModule = GetCurrentModule(theEnv); }
+
+   /*===============================================*/
+   /* Refresh the agenda of the appropriate module. */
+   /*===============================================*/
+
+   if (theModule == NULL)
+     { RefreshAllAgendas(theEnv); }
+   else
+     { RefreshAgenda(theModule); }
+  }
+
+/**********************/
+/* RefreshAllAgendas: */
+/**********************/
+void RefreshAllAgendas(
+  Environment *theEnv)
+  {
+  Defmodule *theModule;
+  
+  for (theModule = GetNextDefmodule(theEnv,NULL);
+       theModule != NULL;
+       theModule = GetNextDefmodule(theEnv,theModule))
+     { RefreshAgenda(theModule); }
+  }
+
+/*************************************/
+/* RefreshAgenda: C access routine   */
+/*   for the refresh-agenda command. */
+/*************************************/
+void RefreshAgenda(
+  Defmodule *theModule)
+  {
+   Activation *theActivation;
+   SalienceEvaluationType oldValue;
+   Environment *theEnv;
+   
+   if (theModule == NULL) return;
+   theEnv = theModule->header.env;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*=======================================================*/
+   /* Remember the current setting for salience evaluation. */
+   /* To perform the refresh, the when activated setting is */
+   /* used to recompute the salience values.                */
+   /*=======================================================*/
+
+   oldValue = GetSalienceEvaluation(theEnv);
+   SetSalienceEvaluation(theEnv,WHEN_ACTIVATED);
+
+   /*============================*/
+   /* Change the current module. */
+   /*============================*/
+
+   SetCurrentModule(theEnv,theModule);
+
+   /*================================================================*/
+   /* Recompute the salience values for the current module's agenda. */
+   /*================================================================*/
+
+   for (theActivation = GetNextActivation(theEnv,NULL);
+        theActivation != NULL;
+        theActivation = GetNextActivation(theEnv,theActivation))
+     { theActivation->salience = EvaluateSalience(theEnv,theActivation->theRule); }
+
+   /*======================================================*/
+   /* Reorder the agenda based on the new salience values. */
+   /*======================================================*/
+
+   ReorderAgenda(theModule);
+
+   /*==========================================*/
+   /* Restore the salience evaluation setting. */
+   /*==========================================*/
+
+   SetSalienceEvaluation(theEnv,oldValue);
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+  }
+
+/*********************************************************/
+/* SetSalienceEvaluationCommand: H/L Command for setting */
+/*   the salience evaluation behavior.                   */
+/*   Syntax: (set-salience-evaluation-behavior <symbol>) */
+/*********************************************************/
+void SetSalienceEvaluationCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue value;
+   const char *argument;
+   const char *oldValue;
+
+   /*==================================================*/
+   /* Get the current setting for salience evaluation. */
+   /*==================================================*/
+
+   oldValue = SalienceEvaluationName(GetSalienceEvaluation(theEnv));
+
+   /*=========================================*/
+   /* This function expects a single argument */
+   /* which must be a symbol.                 */
+   /*=========================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&value))
+     { return; }
+
+   /*=============================================================*/
+   /* The allowed symbols to pass as an argument to this function */
+   /* are when-defined, when-activated, and every-cycle.          */
+   /*=============================================================*/
+
+   argument = value.lexemeValue->contents;
+
+   if (strcmp(argument,"when-defined") == 0)
+     { SetSalienceEvaluation(theEnv,WHEN_DEFINED); }
+   else if (strcmp(argument,"when-activated") == 0)
+     { SetSalienceEvaluation(theEnv,WHEN_ACTIVATED); }
+   else if (strcmp(argument,"every-cycle") == 0)
+     { SetSalienceEvaluation(theEnv,EVERY_CYCLE); }
+   else
+     {
+      UDFInvalidArgumentMessage(context,
+         "symbol with value when-defined, when-activated, or every-cycle");
+      returnValue->lexemeValue = CreateSymbol(theEnv,oldValue);
+      return;
+     }
+
+   /*=================================================*/
+   /* Return the old setting for salience evaluation. */
+   /*=================================================*/
+
+   returnValue->lexemeValue = CreateSymbol(theEnv,oldValue);
+  }
+
+/*********************************************************/
+/* GetSalienceEvaluationCommand: H/L Command for getting */
+/*   the salience evaluation behavior.                   */
+/*   Syntax: (get-salience-evaluation-behavior)          */
+/*********************************************************/
+void GetSalienceEvaluationCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateSymbol(theEnv,SalienceEvaluationName(GetSalienceEvaluation(theEnv)));
+  }
+
+/*****************************************************************/
+/* SalienceEvaluationName: Given the integer value corresponding */
+/*   to a specified salience evaluation behavior, returns a      */
+/*   character string of the behavior's name.                    */
+/*****************************************************************/
+static const char *SalienceEvaluationName(
+  int strategy)
+  {
+   const char *sname;
+
+   switch (strategy)
+     {
+      case WHEN_DEFINED:
+        sname = "when-defined";
+        break;
+      case WHEN_ACTIVATED:
+        sname = "when-activated";
+        break;
+      case EVERY_CYCLE:
+        sname = "every-cycle";
+        break;
+      default:
+        sname = "unknown";
+        break;
+     }
+
+   return sname;
+  }
+
+/*******************************************************/
+/* GetSalienceEvaluation: Returns the value of current */
+/*  type of salience evaluation (e.g., when defined,   */
+/*  when activated, or every cycle).                   */
+/*******************************************************/
+SalienceEvaluationType GetSalienceEvaluation(
+  Environment *theEnv)
+  {
+   return AgendaData(theEnv)->SalienceEvaluation;
+  }
+
+/**********************************************/
+/* SetSalienceEvaluation: Sets the value of   */
+/*   the current type of salience evaluation. */
+/**********************************************/
+SalienceEvaluationType SetSalienceEvaluation(
+  Environment *theEnv,
+  SalienceEvaluationType value)
+  {
+   SalienceEvaluationType ov;
+
+   ov = AgendaData(theEnv)->SalienceEvaluation;
+   AgendaData(theEnv)->SalienceEvaluation = value;
+   return ov;
+  }
+
+/*****************************************************************/
+/* EvaluateSalience: Returns the salience value of the specified */
+/*   defrule. If salience evaluation is currently set to         */
+/*   when-defined, then the current value of the rule's salience */
+/*   is returned. Otherwise the salience expression associated   */
+/*   with the rule is reevaluated, the value is stored as the    */
+/*   rule's current salience, and it is then returned.           */
+/*****************************************************************/
+static int EvaluateSalience(
+  Environment *theEnv,
+  Defrule *theDefrule)
+  {
+   UDFValue salienceValue;
+   long long salience;
+
+  /*==================================================*/
+  /* If saliences are only being evaluated when rules */
+  /* are defined, then just return the last salience  */
+  /* value evaluated for the rule.                    */
+  /*==================================================*/
+
+  if (GetSalienceEvaluation(theEnv) == WHEN_DEFINED)
+    { return theDefrule->salience; }
+
+  /*=================================================================*/
+  /* If the rule's salience value was defined as an integer constant */
+  /* (i.e., not an expression or global variable which could change  */
+  /* on reevaluation), then just return the salience value computed  */
+  /* for the rule when it was defined.                               */
+  /*=================================================================*/
+
+  if (theDefrule->dynamicSalience == NULL) return theDefrule->salience;
+
+  /*====================================================*/
+  /* Reevaluate the rule's salience. If an error occurs */
+  /* during evaluation, print an error message.         */
+  /*====================================================*/
+
+  SetEvaluationError(theEnv,false);
+  if (EvaluateExpression(theEnv,theDefrule->dynamicSalience,&salienceValue))
+    {
+     SalienceInformationError(theEnv,"defrule",theDefrule->header.name->contents);
+     return theDefrule->salience;
+    }
+
+  /*========================================*/
+  /* The salience value must be an integer. */
+  /*========================================*/
+
+  if (salienceValue.header->type != INTEGER_TYPE)
+    {
+     SalienceNonIntegerError(theEnv);
+     SalienceInformationError(theEnv,"defrule",theDefrule->header.name->contents);
+     SetEvaluationError(theEnv,true);
+     return theDefrule->salience;
+    }
+
+  /*==========================================*/
+  /* The salience value must fall between the */
+  /* minimum and maximum allowed values.      */
+  /*==========================================*/
+
+  salience = salienceValue.integerValue->contents;
+
+  if ((salience > MAX_DEFRULE_SALIENCE) || (salience < MIN_DEFRULE_SALIENCE))
+    {
+     SalienceRangeError(theEnv,MIN_DEFRULE_SALIENCE,MAX_DEFRULE_SALIENCE);
+     SetEvaluationError(theEnv,true);
+     SalienceInformationError(theEnv,"defrule",theDefrule->header.name->contents);
+     return theDefrule->salience;
+    }
+
+  /*===================================*/
+  /* Store the new salience value with */
+  /* the rule and return this value.   */
+  /*===================================*/
+
+  theDefrule->salience = (int) salience;
+  return theDefrule->salience;
+ }
+
+#if DEBUGGING_FUNCTIONS
+
+/***********************************************/
+/* AgendaCommand: Prints out the agenda of the */
+/*   rules that are ready to fire.             */
+/*   Syntax: (agenda)                          */
+/***********************************************/
+void AgendaCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int numArgs;
+   bool error;
+   Defmodule *theModule;
+
+   /*===============================================================*/
+   /* If a module name is specified, then the agenda of that module */
+   /* is displayed. Otherwise, the agenda of the current module is  */
+   /* displayed.                                                    */
+   /*===============================================================*/
+
+   numArgs = UDFArgumentCount(context);
+   if (numArgs == 1)
+     {
+      theModule = GetModuleName(context,1,&error);
+      if (error) return;
+     }
+   else
+     { theModule = GetCurrentModule(theEnv); }
+
+   /*===============================================*/
+   /* Display the agenda of the appropriate module. */
+   /*===============================================*/
+
+   Agenda(theEnv,STDOUT,theModule);
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#endif /* DEFRULE_CONSTRUCT */
+
diff --git a/clips/agenda.h b/clips/agenda.h
new file mode 100755
index 000000000..33989b1bd
--- /dev/null
+++ b/clips/agenda.h
@@ -0,0 +1,169 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                 AGENDA HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*   Provides functionality for examining, manipulating,     */
+/*   adding, and removing activations from the agenda.       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES and     */
+/*            DYNAMIC_SALIENCE compilation flags.            */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added EnvGetActivationBasisPPForm function.    */
+/*                                                           */
+/*      6.30: Added salience groups to improve performance   */
+/*            with large numbers of activations of different */
+/*            saliences.                                     */
+/*                                                           */
+/*            Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_agenda
+
+#pragma once
+
+#define _H_agenda
+
+typedef struct activation Activation;
+
+#include "ruledef.h"
+#include "symbol.h"
+#include "match.h"
+
+typedef enum
+  {
+   WHEN_DEFINED,
+   WHEN_ACTIVATED,
+   EVERY_CYCLE
+  } SalienceEvaluationType;
+
+#define MAX_DEFRULE_SALIENCE  10000
+#define MIN_DEFRULE_SALIENCE -10000
+
+/*******************/
+/* DATA STRUCTURES */
+/*******************/
+
+struct activation
+  {
+   Defrule *theRule;
+   struct partialMatch *basis;
+   int salience;
+   unsigned long long timetag;
+   int randomID;
+   struct activation *prev;
+   struct activation *next;
+  };
+
+struct salienceGroup
+  {
+   int salience;
+   struct activation *first;
+   struct activation *last;
+   struct salienceGroup *next;
+   struct salienceGroup *prev;
+  };
+
+#include "crstrtgy.h"
+
+#define AGENDA_DATA 17
+
+struct agendaData
+  {
+#if DEBUGGING_FUNCTIONS
+   bool WatchActivations;
+#endif
+   unsigned long NumberOfActivations;
+   unsigned long long CurrentTimetag;
+   bool AgendaChanged;
+   SalienceEvaluationType SalienceEvaluation;
+   StrategyType Strategy;
+  };
+
+#define AgendaData(theEnv) ((struct agendaData *) GetEnvironmentData(theEnv,AGENDA_DATA))
+
+/****************************************/
+/* GLOBAL EXTERNAL FUNCTION DEFINITIONS */
+/****************************************/
+
+   void                    AddActivation(Environment *,Defrule *,PartialMatch *);
+   void                    ClearRuleFromAgenda(Environment *,Defrule *);
+   Activation             *GetNextActivation(Environment *,Activation *);
+   struct partialMatch    *GetActivationBasis(Environment *,Activation *);
+   const char             *ActivationRuleName(Activation *);
+   Defrule                *GetActivationRule(Environment *,Activation *);
+   int                     ActivationGetSalience(Activation *);
+   int                     ActivationSetSalience(Activation *,int);
+   void                    ActivationPPForm(Activation *,StringBuilder *);
+   void                    GetActivationBasisPPForm(Environment *,char *,size_t,Activation *);
+   bool                    MoveActivationToTop(Environment *,Activation *);
+   void                    DeleteActivation(Activation *);
+   bool                    DetachActivation(Environment *,Activation *);
+   void                    DeleteAllActivations(Defmodule *);
+   void                    Agenda(Environment *,const char *,Defmodule *);
+   void                    RemoveActivation(Environment *,Activation *,bool,bool);
+   void                    RemoveAllActivations(Environment *);
+   bool                    GetAgendaChanged(Environment *);
+   void                    SetAgendaChanged(Environment *,bool);
+   unsigned long           GetNumberOfActivations(Environment *);
+   SalienceEvaluationType  GetSalienceEvaluation(Environment *);
+   SalienceEvaluationType  SetSalienceEvaluation(Environment *,SalienceEvaluationType);
+   void                    RefreshAgenda(Defmodule *);
+   void                    RefreshAllAgendas(Environment *);
+   void                    ReorderAgenda(Defmodule *);
+   void                    ReorderAllAgendas(Environment *);
+   void                    InitializeAgenda(Environment *);
+   void                    SetSalienceEvaluationCommand(Environment *,UDFContext *,UDFValue *);
+   void                    GetSalienceEvaluationCommand(Environment *,UDFContext *,UDFValue *);
+   void                    RefreshAgendaCommand(Environment *,UDFContext *,UDFValue *);
+   void                    RefreshCommand(Environment *,UDFContext *,UDFValue *);
+   void                    Refresh(Defrule *);
+#if DEBUGGING_FUNCTIONS
+   void                    AgendaCommand(Environment *,UDFContext *,UDFValue *);
+#endif
+
+#endif
+
+
+
+
+
+
diff --git a/clips/analysis.c b/clips/analysis.c
new file mode 100755
index 000000000..63abd778a
--- /dev/null
+++ b/clips/analysis.c
@@ -0,0 +1,1136 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/11/16             */
+   /*                                                     */
+   /*                  ANALYSIS MODULE                    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Analyzes LHS patterns to check for semantic      */
+/*   errors and to determine variable comparisons and other  */
+/*   tests which must be performed either in the pattern or  */
+/*   join networks.                                          */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Join network rework and optimizations.         */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Static constraint checking is always enabled.  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if (! RUN_TIME) && (! BLOAD_ONLY) && DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+
+#include "constant.h"
+#include "cstrnchk.h"
+#include "cstrnutl.h"
+#include "cstrnops.h"
+#include "exprnpsr.h"
+#include "generate.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pattern.h"
+#include "prntutil.h"
+#include "reorder.h"
+#include "router.h"
+#include "rulecstr.h"
+#include "ruledef.h"
+#include "rulepsr.h"
+#include "symbol.h"
+#include "watch.h"
+
+#include "analysis.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    GetVariables(Environment *,struct lhsParseNode *,ParseNodeType,struct nandFrame *);
+   static bool                    UnboundVariablesInPattern(Environment *,struct lhsParseNode *,unsigned short);
+   static bool                    PropagateVariableToNodes(Environment *,struct lhsParseNode *,ParseNodeType,
+                                                           CLIPSLexeme *,struct lhsParseNode *,
+                                                           int,bool,bool);
+   static struct lhsParseNode    *CheckExpression(Environment *,struct lhsParseNode *,struct lhsParseNode *,
+                                                  unsigned short,CLIPSLexeme *,unsigned short);
+   static void                    VariableReferenceErrorMessage(Environment *,
+                                                                CLIPSLexeme *,
+                                                                struct lhsParseNode *,
+                                                                int,
+                                                                CLIPSLexeme *,
+                                                                int);
+   static bool                    ProcessField(Environment *,
+                                               struct lhsParseNode *,
+                                               struct lhsParseNode *,
+                                               struct lhsParseNode *,
+                                               ParseNodeType,
+                                               struct nandFrame *);
+   static bool                    ProcessVariable(Environment *,
+                                               struct lhsParseNode *,
+                                               struct lhsParseNode *,
+                                               struct lhsParseNode *,
+                                               ParseNodeType,
+                                               struct nandFrame *);
+   static void                    VariableMixingErrorMessage(Environment *,CLIPSLexeme *);
+   static bool                    PropagateVariableDriver(Environment *,
+                                                          struct lhsParseNode *,
+                                                          struct lhsParseNode *,
+                                                          struct lhsParseNode *,
+                                                          ParseNodeType,CLIPSLexeme *,
+                                                          struct lhsParseNode *,
+                                                          bool,ParseNodeType);
+   static bool                    TestCEAnalysis(Environment *,struct lhsParseNode *,struct lhsParseNode *,bool,bool *,struct nandFrame *);
+   static void                    ReleaseNandFrames(Environment *,struct nandFrame *);
+
+/******************************************************************/
+/* VariableAnalysis: Propagates variables references to other     */
+/*   variables in the LHS and determines if there are any illegal */
+/*   variable references (e.g. referring to an unbound variable). */
+/*   The propagation of variable references simply means all      */
+/*   subsequent references of a variable are made to "point" back */
+/*   to the variable being propagated.                            */
+/******************************************************************/
+bool VariableAnalysis(
+  Environment *theEnv,
+  struct lhsParseNode *patternPtr)
+  {
+   bool errorFlag = false;
+   struct nandFrame *theNandFrames = NULL, *tempNandPtr;
+   int currentDepth = 1;
+
+   /*======================================================*/
+   /* Loop through all of the CEs in the rule to determine */
+   /* which variables refer to other variables and whether */
+   /* any semantic errors exist when refering to variables */
+   /* (such as referring to a variable that was not        */
+   /* previously bound).                                   */
+   /*======================================================*/
+
+   while (patternPtr != NULL)
+     {
+      /*==================================*/
+      /* If the nand depth is increasing, */
+      /* create a new nand frame.         */
+      /*==================================*/
+
+      while (patternPtr->beginNandDepth > currentDepth)
+        {
+         tempNandPtr = get_struct(theEnv,nandFrame);
+         tempNandPtr->nandCE = patternPtr;
+         tempNandPtr->depth = currentDepth;
+         tempNandPtr->next = theNandFrames;
+         theNandFrames = tempNandPtr;
+         currentDepth++;
+        }
+
+      /*=========================================================*/
+      /* If a pattern CE is encountered, propagate any variables */
+      /* found in the pattern and note any illegal references to */
+      /* other variables.                                        */
+      /*=========================================================*/
+
+      if (patternPtr->pnType == PATTERN_CE_NODE)
+        {
+         /*====================================================*/
+         /* Determine if the fact address associated with this */
+         /* pattern illegally refers to other variables.       */
+         /*====================================================*/
+
+         if ((patternPtr->value != NULL) &&
+             (patternPtr->referringNode != NULL))
+           {
+            errorFlag = true;
+            if (patternPtr->referringNode->index == NO_INDEX)
+              {
+               PrintErrorID(theEnv,"ANALYSIS",1,true);
+               WriteString(theEnv,STDERR,"Duplicate pattern-address ?");
+               WriteString(theEnv,STDERR,patternPtr->lexemeValue->contents);
+               WriteString(theEnv,STDERR," found in CE #");
+               WriteInteger(theEnv,STDERR,patternPtr->whichCE);
+               WriteString(theEnv,STDERR,".\n");
+              }
+            else
+              {
+               PrintErrorID(theEnv,"ANALYSIS",2,true);
+               WriteString(theEnv,STDERR,"Pattern-address ?");
+               WriteString(theEnv,STDERR,patternPtr->lexemeValue->contents);
+               WriteString(theEnv,STDERR," used in CE #");
+               WriteInteger(theEnv,STDERR,patternPtr->whichCE);
+               WriteString(theEnv,STDERR," was previously bound within a pattern CE.\n");
+              }
+           }
+
+         /*====================================================*/
+         /* Propagate the pattern and field location of bound  */
+         /* variables found in this pattern to other variables */
+         /* in the same semantic scope as the bound variable.  */
+         /*====================================================*/
+
+         if (GetVariables(theEnv,patternPtr,PATTERN_CE_NODE,theNandFrames))
+           {
+            ReleaseNandFrames(theEnv,theNandFrames);
+            return true;
+           }
+
+         /*==========================================================*/
+         /* Analyze any test CE that's been attached to the pattern. */
+         /*==========================================================*/
+
+         if (TestCEAnalysis(theEnv,patternPtr,patternPtr->expression,false,&errorFlag,theNandFrames) == true)
+           {
+            ReleaseNandFrames(theEnv,theNandFrames);
+            return true;
+           }
+
+         if (TestCEAnalysis(theEnv,patternPtr,patternPtr->secondaryExpression,true,&errorFlag,theNandFrames) == true)
+           {
+            ReleaseNandFrames(theEnv,theNandFrames);
+            return true;
+           }
+        }
+
+      /*==============================================================*/
+      /* If a test CE is encountered, make sure that all references   */
+      /* to variables have been previously bound. If they are bound   */
+      /* then replace the references to variables with function calls */
+      /* to retrieve the variables.                                   */
+      /*==============================================================*/
+
+      else if (patternPtr->pnType == TEST_CE_NODE)
+        {
+         if (TestCEAnalysis(theEnv,patternPtr,patternPtr->expression,false,&errorFlag,theNandFrames) == true)
+           {
+            ReleaseNandFrames(theEnv,theNandFrames);
+            return true;
+           }
+        }
+
+      /*==================================*/
+      /* If the nand depth is decreasing, */
+      /* release the nand frames.         */
+      /*==================================*/
+
+      while (patternPtr->endNandDepth < currentDepth)
+        {
+         tempNandPtr = theNandFrames->next;
+         rtn_struct(theEnv,nandFrame,theNandFrames);
+         theNandFrames = tempNandPtr;
+         currentDepth--;
+        }
+
+      /*=====================================================*/
+      /* Move on to the next pattern in the LHS of the rule. */
+      /*=====================================================*/
+
+      patternPtr = patternPtr->bottom;
+     }
+
+   /*==========================================*/
+   /* Return the error status of the analysis. */
+   /*==========================================*/
+
+   return(errorFlag);
+  }
+
+/******************************************************/
+/* ReleaseNandFrames: Releases a list of nand frames. */
+/******************************************************/
+static void ReleaseNandFrames(
+  Environment *theEnv,
+  struct nandFrame *theFrames)
+  {
+   struct nandFrame *tmpFrame;
+
+   while (theFrames != NULL)
+     {
+      tmpFrame = theFrames->next;
+      rtn_struct(theEnv,nandFrame,theFrames);
+      theFrames = tmpFrame;
+     }
+  }
+
+/*******************************************************************/
+/* TestCEAnalysis: If a test CE is encountered, make sure that all */
+/*   references to variables have been previously bound. If they   */
+/*   are bound then replace the references to variables with       */
+/*   function calls to retrieve the variables.                     */
+/*******************************************************************/
+static bool TestCEAnalysis(
+  Environment *theEnv,
+  struct lhsParseNode *patternPtr,
+  struct lhsParseNode *theExpression,
+  bool secondary,
+  bool *errorFlag,
+  struct nandFrame *theNandFrames)
+  {
+   struct lhsParseNode *rv, *theList, *tempList, *tempRight;
+
+   if (theExpression == NULL) return false;
+
+   /*=====================================================*/
+   /* Verify that all variables were referenced properly. */
+   /*=====================================================*/
+
+   rv = CheckExpression(theEnv,theExpression,NULL,patternPtr->whichCE,NULL,0);
+
+   /*====================================================================*/
+   /* Temporarily disconnect the right nodes. If this is a pattern node  */
+   /* with an attached test CE, we only want to propagate to following   */
+   /* patterns, not to nodes of this pattern which preceded the test CE. */
+   /*====================================================================*/
+
+   tempRight = patternPtr->right;
+   patternPtr->right = NULL;
+
+   /*=========================================================*/
+   /* Determine the type and value constraints implied by the */
+   /* expression and propagate these constraints to other     */
+   /* variables in the LHS. For example, the expression       */
+   /* (+ ?x 1) implies that ?x is a number.                   */
+   /*=========================================================*/
+
+   theList = GetExpressionVarConstraints(theEnv,theExpression);
+   for (tempList = theList; tempList != NULL; tempList = tempList->right)
+      {
+       if (PropagateVariableDriver(theEnv,patternPtr,patternPtr,NULL,SF_VARIABLE_NODE,
+                                   tempList->lexemeValue,tempList,false,TEST_CE_NODE))
+         {
+          ReturnLHSParseNodes(theEnv,theList);
+          patternPtr->right = tempRight;
+          return true;
+         }
+      }
+
+   ReturnLHSParseNodes(theEnv,theList);
+
+   /*============================*/
+   /* Reconnect the right nodes. */
+   /*============================*/
+
+   patternPtr->right = tempRight;
+
+   /*========================================================*/
+   /* If the variables in the expression were all referenced */
+   /* properly, then create the expression to use in the     */
+   /* join network.                                          */
+   /*========================================================*/
+
+   if (rv != NULL)
+     { *errorFlag = true; }
+   else if (secondary)
+     { patternPtr->secondaryNetworkTest = CombineExpressions(theEnv,patternPtr->secondaryNetworkTest,GetvarReplace(theEnv,theExpression,false,theNandFrames)); }
+   else
+     { patternPtr->networkTest = CombineExpressions(theEnv,patternPtr->networkTest,GetvarReplace(theEnv,theExpression,false,theNandFrames)); }
+
+   return false;
+  }
+
+/****************************************************************/
+/* GetVariables: Loops through each field/slot within a pattern */
+/*   and propagates the pattern and field location of bound     */
+/*   variables found in the pattern to other variables within   */
+/*   the same semantic scope as the bound variables.            */
+/****************************************************************/
+static bool GetVariables(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern,
+  ParseNodeType patternHeadType,
+  struct nandFrame *theNandFrames)
+  {
+   struct lhsParseNode *patternHead = thePattern;
+   struct lhsParseNode *multifieldHeader = NULL;
+
+   /*======================================================*/
+   /* Loop through all the fields/slots found in a pattern */
+   /* looking for binding instances of variables.          */
+   /*======================================================*/
+
+   while (thePattern != NULL)
+     {
+      /*================================================*/
+      /* A multifield slot contains a sublist of fields */
+      /* that must be traversed and checked.            */
+      /*================================================*/
+
+      if (thePattern->multifieldSlot)
+        {
+         multifieldHeader = thePattern;
+         thePattern = thePattern->bottom;
+        }
+
+      /*==================================================*/
+      /* Propagate the binding occurences of single field */
+      /* variables, multifield variables, and fact        */
+      /* addresses to other occurences of the variable.   */
+      /* If an error is encountered, return true.         */
+      /*==================================================*/
+
+      if (thePattern != NULL)
+        {
+         if ((thePattern->pnType == SF_VARIABLE_NODE) ||
+             (thePattern->pnType == MF_VARIABLE_NODE) ||
+             ((thePattern->pnType == PATTERN_CE_NODE) && (thePattern->value != NULL)))
+           {
+            if (ProcessVariable(theEnv,thePattern,multifieldHeader,patternHead,patternHeadType,theNandFrames))
+              { return true; }
+           }
+         else
+           {
+            if (ProcessField(theEnv,thePattern,multifieldHeader,patternHead,patternHeadType,theNandFrames))
+              { return true; }
+           }
+        }
+
+      /*===============================================*/
+      /* Move on to the next field/slot in the pattern */
+      /* or to the next field in a multifield slot.    */
+      /*===============================================*/
+
+      if (thePattern == NULL)
+        { thePattern = multifieldHeader; }
+      else if ((thePattern->right == NULL) && (multifieldHeader != NULL))
+        {
+         thePattern = multifieldHeader;
+         multifieldHeader = NULL;
+        }
+
+      thePattern = thePattern->right;
+     }
+
+   /*===============================*/
+   /* Return false to indicate that */
+   /* no errors were detected.      */
+   /*===============================*/
+
+   return false;
+  }
+
+/******************************************************/
+/* ProcessVariable: Processes a single occurence of a */
+/*   variable by propagating references to it.        */
+/******************************************************/
+static bool ProcessVariable(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern,
+  struct lhsParseNode *multifieldHeader,
+  struct lhsParseNode *patternHead,
+  ParseNodeType patternHeadType,
+  struct nandFrame *theNandFrames)
+  {
+   ParseNodeType theType;
+   CLIPSLexeme *theVariable;
+   struct constraintRecord *theConstraints;
+
+   /*=============================================================*/
+   /* If a pattern address is being propagated, then treat it as  */
+   /* a single field pattern variable and create a constraint     */
+   /* which indicates that is must be a fact or instance address. */
+   /* This code will have to be modified for new data types which */
+   /* can match patterns.                                         */
+   /*=============================================================*/
+
+   if (thePattern->pnType == PATTERN_CE_NODE)
+     {
+      theType = SF_VARIABLE_NODE;
+      theVariable = (CLIPSLexeme *) thePattern->value;
+      if (thePattern->derivedConstraints) RemoveConstraint(theEnv,thePattern->constraints);
+      theConstraints = GetConstraintRecord(theEnv);
+      thePattern->constraints = theConstraints;
+      thePattern->constraints->anyAllowed = false;
+      thePattern->constraints->instanceAddressesAllowed = true;
+      thePattern->constraints->factAddressesAllowed = true;
+      thePattern->derivedConstraints = true;
+     }
+
+   /*===================================================*/
+   /* Otherwise a pattern variable is being propagated. */
+   /*===================================================*/
+
+   else
+     {
+      theType = thePattern->pnType;
+      theVariable = (CLIPSLexeme *) thePattern->value;
+     }
+
+   /*===================================================*/
+   /* Propagate the variable location to any additional */
+   /* fields associated with the binding variable.      */
+   /*===================================================*/
+
+   if (thePattern->pnType != PATTERN_CE_NODE)
+     {
+      PropagateVariableToNodes(theEnv,thePattern->bottom,theType,theVariable,
+                               thePattern,patternHead->beginNandDepth,
+                               true,false);
+
+      if (ProcessField(theEnv,thePattern,multifieldHeader,patternHead,patternHeadType,theNandFrames))
+        { return true; }
+     }
+
+   /*=================================================================*/
+   /* Propagate the constraints to other fields, slots, and patterns. */
+   /*=================================================================*/
+
+   return(PropagateVariableDriver(theEnv,patternHead,thePattern,multifieldHeader,theType,
+                                  theVariable,thePattern,true,patternHeadType));
+  }
+
+/*******************************************/
+/* PropagateVariableDriver: Driver routine */
+/*   for propagating variable references.  */
+/*******************************************/
+static bool PropagateVariableDriver(
+  Environment *theEnv,
+  struct lhsParseNode *patternHead,
+  struct lhsParseNode *theNode,
+  struct lhsParseNode *multifieldHeader,
+  ParseNodeType theType,
+  CLIPSLexeme *variableName,
+  struct lhsParseNode *theReference,
+  bool assignReference,
+  ParseNodeType patternHeadType)
+  {
+   /*===================================================*/
+   /* Propagate the variable location to any additional */
+   /* constraints associated with the binding variable. */
+   /*===================================================*/
+
+   if (multifieldHeader != NULL)
+     {
+      if (PropagateVariableToNodes(theEnv,multifieldHeader->right,theType,variableName,
+                                   theReference,patternHead->beginNandDepth,assignReference,false))
+        {
+         VariableMixingErrorMessage(theEnv,variableName);
+         return true;
+        }
+     }
+
+   /*========================================================*/
+   /* Propagate the variable location to fields/slots in the */
+   /* same pattern which appear after the binding variable.  */
+   /*========================================================*/
+
+   if (PropagateVariableToNodes(theEnv,theNode->right,theType,variableName,theReference,
+                                patternHead->beginNandDepth,assignReference,false))
+     {
+      VariableMixingErrorMessage(theEnv,variableName);
+      return true;
+     }
+
+   /*==============================================*/
+   /* Propagate the variable location to any test  */
+   /* CEs which have been attached to the pattern. */
+   /*==============================================*/
+
+   if (PropagateVariableToNodes(theEnv,patternHead->expression,theType,variableName,theReference,
+                                patternHead->beginNandDepth,assignReference,true))
+     { return true; }
+
+   if (PropagateVariableToNodes(theEnv,patternHead->secondaryExpression,theType,variableName,theReference,
+                                patternHead->beginNandDepth,assignReference,true))
+     { return true; }
+
+   /*======================================================*/
+   /* Propagate values to other patterns if the pattern in */
+   /* which the variable is found is not a "not" CE or the */
+   /* last pattern within a nand CE.                       */
+   /*======================================================*/
+
+   if (((patternHead->pnType == PATTERN_CE_NODE) || (patternHead->pnType == TEST_CE_NODE)) &&
+       (patternHead->negated == false) &&
+       (patternHead->exists == false) &&
+       (patternHead->beginNandDepth <= patternHead->endNandDepth))
+     {
+      bool ignoreVariableMixing;
+
+      /*============================================================*/
+      /* If the variables are propagated from a test CE, then don't */
+      /* check for mixing of single and multifield variables (since */
+      /* previously bound multifield variables typically have the $ */
+      /* removed when passed as an argument to a function unless    */
+      /* sequence expansion is desired).                            */
+      /*============================================================*/
+
+      if (patternHeadType == TEST_CE_NODE) ignoreVariableMixing = true;
+      else ignoreVariableMixing = false;
+
+      /*==========================*/
+      /* Propagate the reference. */
+      /*==========================*/
+
+      if (PropagateVariableToNodes(theEnv,patternHead->bottom,theType,variableName,theReference,
+                                   patternHead->beginNandDepth,assignReference,
+                                   ignoreVariableMixing))
+       {
+         VariableMixingErrorMessage(theEnv,variableName);
+         return true;
+        }
+     }
+
+   /*==============================================*/
+   /* Return false to indicate that no errors were */
+   /* generated by the variable propagation.       */
+   /*==============================================*/
+
+   return false;
+  }
+
+/********************************************************/
+/* ProcessField: Processes a field or slot of a pattern */
+/*   which does not contain a binding variable.         */
+/********************************************************/
+static bool ProcessField(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern,
+  struct lhsParseNode *multifieldHeader,
+  struct lhsParseNode *patternHead,
+  ParseNodeType patternHeadType,
+  struct nandFrame *theNandFrames)
+  {
+   struct lhsParseNode *theList, *tempList;
+
+   /*====================================================*/
+   /* Nothing needs to be done for the node representing */
+   /* the entire pattern. Return false to indicate that  */
+   /* no errors were generated.                          */
+   /*====================================================*/
+
+   if (thePattern->pnType == PATTERN_CE_NODE) return false;
+
+   /*====================================================================*/
+   /* Derive a set of constraints based on values found in the slot or   */
+   /* field. For example, if a slot can only contain the values 1, 2, or */
+   /* 3, the field constraint ~2 would generate a constraint record that */
+   /* only allows the value 1 or 3. Once generated, the constraints are  */
+   /* propagated to other slots and fields.                              */
+   /*====================================================================*/
+
+   theList = DeriveVariableConstraints(theEnv,thePattern);
+   for (tempList = theList; tempList != NULL; tempList = tempList->right)
+     {
+      if (PropagateVariableDriver(theEnv,patternHead,thePattern,multifieldHeader,tempList->pnType,
+                                  tempList->lexemeValue,tempList,false,patternHeadType))
+        {
+         ReturnLHSParseNodes(theEnv,theList);
+         return true;
+        }
+     }
+   ReturnLHSParseNodes(theEnv,theList);
+
+   /*===========================================================*/
+   /* Check for "variable referenced, but not previously bound" */
+   /* errors. Return true if this type of error is detected.    */
+   /*===========================================================*/
+
+   if (UnboundVariablesInPattern(theEnv,thePattern,patternHead->whichCE))
+     { return true; }
+
+   /*==================================================*/
+   /* Check for constraint errors for this slot/field. */
+   /* If the slot/field has unmatchable constraints    */
+   /* then return true to indicate a semantic error.   */
+   /*==================================================*/
+
+   if (ProcessConnectedConstraints(theEnv,thePattern,multifieldHeader,patternHead))
+     { return true; }
+
+   /*==============================================================*/
+   /* Convert the slot/field constraint to a series of expressions */
+   /* that will be used in the pattern and join networks.          */
+   /*==============================================================*/
+
+   FieldConversion(theEnv,thePattern,patternHead,theNandFrames);
+
+   /*=========================================================*/
+   /* Return false to indicate that no errors were generated. */
+   /*=========================================================*/
+
+   return false;
+  }
+
+/*************************************************************/
+/* PropagateVariableToNodes: Propagates variable references  */
+/*  to all other variables within the semantic scope of the  */
+/*  bound variable. That is, a variable reference cannot be  */
+/*  beyond an enclosing not/and CE combination. The          */
+/*  restriction of propagating variables beyond an enclosing */
+/*  not CE is handled within the GetVariables function.      */
+/*************************************************************/
+static bool PropagateVariableToNodes(
+  Environment *theEnv,
+  struct lhsParseNode *theNode,
+  ParseNodeType theType,
+  CLIPSLexeme *variableName,
+  struct lhsParseNode *theReference,
+  int startDepth,
+  bool assignReference,
+  bool ignoreVariableTypes)
+  {
+   struct constraintRecord *tempConstraints;
+
+   /*===========================================*/
+   /* Traverse the nodes using the bottom link. */
+   /*===========================================*/
+
+   while (theNode != NULL)
+     {
+      /*==================================================*/
+      /* If the field/slot contains a predicate or return */
+      /* value constraint, then propagate the variable to */
+      /* the expression associated with that constraint.  */
+      /*==================================================*/
+
+      if (theNode->expression != NULL)
+        {
+         PropagateVariableToNodes(theEnv,theNode->expression,theType,variableName,
+                                  theReference,startDepth,assignReference,true);
+        }
+
+      if (theNode->secondaryExpression != NULL)
+        {
+         PropagateVariableToNodes(theEnv,theNode->secondaryExpression,theType,variableName,
+                                  theReference,startDepth,assignReference,true);
+        }
+
+      /*======================================================*/
+      /* If the field/slot is a single or multifield variable */
+      /* with the same name as the propagated variable,       */
+      /* then propagate the variable location to this node.   */
+      /*======================================================*/
+
+      else if (((theNode->pnType == SF_VARIABLE_NODE) || (theNode->pnType == MF_VARIABLE_NODE)) &&
+               (theNode->value == (void *) variableName))
+        {
+         /*======================================================*/
+         /* Check for mixing of single and multifield variables. */
+         /*======================================================*/
+
+         if (ignoreVariableTypes == false)
+           {
+            if (((theType == SF_VARIABLE_NODE) && (theNode->pnType == MF_VARIABLE_NODE)) ||
+                ((theType == MF_VARIABLE_NODE) && (theNode->pnType == SF_VARIABLE_NODE)))
+              { return true; }
+           }
+
+         /*======================================================*/
+         /* Intersect the propagated variable's constraints with */
+         /* the current constraints for this field/slot.         */
+         /*======================================================*/
+
+         if ((theReference->constraints != NULL) && (! theNode->negated))
+           {
+            tempConstraints = theNode->constraints;
+            theNode->constraints = IntersectConstraints(theEnv,theReference->constraints,
+                                                        tempConstraints);
+            if (theNode->derivedConstraints)
+              { RemoveConstraint(theEnv,tempConstraints); }
+
+            theNode->derivedConstraints = true;
+           }
+
+         /*=====================================================*/
+         /* Don't propagate the variable if it originates from  */
+         /* a different type of pattern object and the variable */
+         /* reference has already been resolved.                */
+         /*=====================================================*/
+
+         if (assignReference)
+           {
+            if (theNode->referringNode == NULL)
+              { theNode->referringNode = theReference; }
+            else if (theReference->pattern == theNode->pattern)
+              { theNode->referringNode = theReference; }
+            else if (theReference->patternType == theNode->patternType)
+              { theNode->referringNode = theReference; }
+           }
+        }
+
+      /*========================================================*/
+      /* If the field/slot is the node representing the entire  */
+      /* pattern, then propagate the variable location to the   */
+      /* fact address associated with the pattern (if it is the */
+      /* same variable name).                                   */
+      /*========================================================*/
+
+      else if ((theNode->pnType == PATTERN_CE_NODE) &&
+               (theNode->value == (void *) variableName) &&
+               (assignReference == true))
+        {
+         if (theType == MF_VARIABLE) return true;
+
+         theNode->referringNode = theReference;
+        }
+
+      /*=====================================================*/
+      /* Propagate the variable to other fields contained    */
+      /* within the same & field constraint or same pattern. */
+      /*=====================================================*/
+
+      if (theNode->right != NULL)
+        {
+         if (PropagateVariableToNodes(theEnv,theNode->right,theType,variableName,
+                                      theReference,startDepth,assignReference,ignoreVariableTypes))
+           { return true; }
+        }
+
+      /*============================================================*/
+      /* Propagate the variable to other patterns within the same   */
+      /* semantic scope (if dealing with the node for an entire     */
+      /* pattern) or to the next | field constraint within a field. */
+      /*============================================================*/
+
+      if ((theNode->pnType == PATTERN_CE_NODE) || (theNode->pnType == TEST_CE_NODE))
+        {
+         if (theNode->endNandDepth < startDepth) theNode = NULL;
+         else theNode = theNode->bottom;
+        }
+      else
+        { theNode = theNode->bottom; }
+     }
+
+   /*========================================================*/
+   /* Return false to indicate that no errors were detected. */
+   /*========================================================*/
+
+   return false;
+  }
+
+/*************************************************************/
+/* UnboundVariablesInPattern: Verifies that variables within */
+/*   a slot/field have been referenced properly (i.e. that   */
+/*   variables have been previously bound if they are not a  */
+/*   binding occurrence).                                    */
+/*************************************************************/
+static bool UnboundVariablesInPattern(
+  Environment *theEnv,
+  struct lhsParseNode *theSlot,
+  unsigned short pattern)
+  {
+   struct lhsParseNode *andField;
+   struct lhsParseNode *rv;
+   ConstraintViolationType result;
+   struct lhsParseNode *orField;
+   CLIPSLexeme *slotName;
+   CONSTRAINT_RECORD *theConstraints;
+   unsigned short theField;
+
+   /*===================================================*/
+   /* If a multifield slot is being checked, then check */
+   /* each of the fields grouped with the multifield.   */
+   /*===================================================*/
+
+   if (theSlot->multifieldSlot)
+     {
+      theSlot = theSlot->bottom;
+      while (theSlot != NULL)
+        {
+         if (UnboundVariablesInPattern(theEnv,theSlot,pattern))
+           { return true; }
+         theSlot = theSlot->right;
+        }
+
+      return false;
+     }
+
+   /*=======================*/
+   /* Check a single field. */
+   /*=======================*/
+
+   slotName = theSlot->slot;
+   theField = theSlot->index;
+   theConstraints = theSlot->constraints;
+
+   /*===========================================*/
+   /* Loop through each of the '|' constraints. */
+   /*===========================================*/
+
+   for (orField = theSlot->bottom;
+        orField != NULL;
+        orField = orField->bottom)
+     {
+      /*===========================================*/
+      /* Loop through each of the fields connected */
+      /* by the '&' within the '|' constraint.     */
+      /*===========================================*/
+
+      for (andField = orField;
+           andField != NULL;
+           andField = andField->right)
+        {
+         /*=======================================================*/
+         /* If this is not a binding occurence of a variable and  */
+         /* there is no previous binding occurence of a variable, */
+         /* then generate an error message for a variable that is */
+         /* referred to but not bound.                            */
+         /*=======================================================*/
+
+         if (((andField->pnType == SF_VARIABLE_NODE) || (andField->pnType == MF_VARIABLE_NODE)) &&
+             (andField->referringNode == NULL))
+           {
+            VariableReferenceErrorMessage(theEnv,andField->lexemeValue,NULL,pattern,
+                                          slotName,theField);
+            return true;
+           }
+
+         /*==============================================*/
+         /* Check predicate and return value constraints */
+         /* to insure that all variables used within the */
+         /* constraint have been previously bound.       */
+         /*==============================================*/
+
+         else if ((andField->pnType == PREDICATE_CONSTRAINT_NODE) ||
+                  (andField->pnType == RETURN_VALUE_CONSTRAINT_NODE))
+           {
+            rv = CheckExpression(theEnv,andField->expression,NULL,pattern,slotName,theField);
+            if (rv != NULL) return true;
+           }
+
+         /*========================================================*/
+         /* If static constraint checking is being performed, then */
+         /* determine if constant values have violated the set of  */
+         /* derived constraints for the slot/field (based on the   */
+         /* deftemplate definition and propagated constraints).    */
+         /*========================================================*/
+
+         else if (((andField->pnType == INTEGER_NODE) || (andField->pnType == FLOAT_NODE) ||
+                   (andField->pnType == SYMBOL_NODE) || (andField->pnType == STRING_NODE) ||
+                   (andField->pnType == INSTANCE_NAME_NODE)))
+           {
+            result = ConstraintCheckValue(theEnv,NodeTypeToType(andField),andField->value,theConstraints);
+            if (result != NO_VIOLATION)
+              {
+               ConstraintViolationErrorMessage(theEnv,"A literal restriction value",
+                                               NULL,false,pattern,
+                                               slotName,theField,result,
+                                               theConstraints,true);
+               return true;
+              }
+           }
+        }
+     }
+
+   /*===============================*/
+   /* Return false to indicate that */
+   /* no errors were detected.      */
+   /*===============================*/
+
+   return false;
+  }
+
+/******************************************************************/
+/* CheckExpression: Verifies that variables within an expression  */
+/*   have been referenced properly. All variables within an       */
+/*   expression must have been previously bound.                  */
+/******************************************************************/
+static struct lhsParseNode *CheckExpression(
+  Environment *theEnv,
+  struct lhsParseNode *exprPtr,
+  struct lhsParseNode *lastOne,
+  unsigned short whichCE,
+  CLIPSLexeme *slotName,
+  unsigned short theField)
+  {
+   struct lhsParseNode *rv;
+   unsigned short i = 1;
+     
+   while (exprPtr != NULL)
+     {
+      /*===============================================================*/
+      /* Check that single field variables contained in the expression */
+      /* were previously defined in the LHS. Also check to see if the  */
+      /* variable has unmatchable constraints.                         */
+      /*===============================================================*/
+
+      if (exprPtr->pnType == SF_VARIABLE_NODE)
+        {
+         if (exprPtr->referringNode == NULL)
+           {
+            VariableReferenceErrorMessage(theEnv,exprPtr->lexemeValue,lastOne,
+                                          whichCE,slotName,theField);
+            return exprPtr;
+           }
+         else if (UnmatchableConstraint(exprPtr->constraints))
+           {
+            ConstraintReferenceErrorMessage(theEnv,exprPtr->lexemeValue,lastOne,i,
+                                            whichCE,slotName,theField);
+            return exprPtr;
+           }
+        }
+
+      /*==================================================*/
+      /* Check that multifield variables contained in the */
+      /* expression were previously defined in the LHS.   */
+      /*==================================================*/
+
+      else if ((exprPtr->pnType == MF_VARIABLE_NODE) && (exprPtr->referringNode == NULL))
+        {
+         VariableReferenceErrorMessage(theEnv,exprPtr->lexemeValue,lastOne,
+                                       whichCE,slotName,theField);
+         return exprPtr;
+        }
+
+      /*=====================================================*/
+      /* Check that global variables are referenced properly */
+      /* (i.e. if you reference a global variable, it must   */
+      /* already be defined by a defglobal construct).       */
+      /*=====================================================*/
+
+#if DEFGLOBAL_CONSTRUCT
+      else if (exprPtr->pnType == GBL_VARIABLE_NODE)
+        {
+         unsigned int count;
+
+         if (FindImportedConstruct(theEnv,"defglobal",NULL,exprPtr->lexemeValue->contents,
+                                   &count,true,NULL) == NULL)
+           {
+            VariableReferenceErrorMessage(theEnv,exprPtr->lexemeValue,lastOne,
+                                          whichCE,slotName,theField);
+            return exprPtr;
+           }
+        }
+#endif
+
+      /*============================================*/
+      /* Recursively check other function calls to  */
+      /* insure variables are referenced correctly. */
+      /*============================================*/
+
+      else if (((exprPtr->pnType == FCALL_NODE)
+#if DEFGENERIC_CONSTRUCT
+             || (exprPtr->pnType == GCALL_NODE)
+#endif
+#if DEFFUNCTION_CONSTRUCT
+             || (exprPtr->pnType == PCALL_NODE)
+#endif
+         ) && (exprPtr->bottom != NULL))
+        {
+         if ((rv = CheckExpression(theEnv,exprPtr->bottom,exprPtr,whichCE,slotName,theField)) != NULL)
+           { return rv; }
+        }
+
+      /*=============================================*/
+      /* Move on to the next part of the expression. */
+      /*=============================================*/
+
+      i++;
+      exprPtr = exprPtr->right;
+     }
+
+   /*================================================*/
+   /* Return NULL to indicate no error was detected. */
+   /*================================================*/
+
+   return NULL;
+  }
+
+/********************************************************/
+/* VariableReferenceErrorMessage: Generic error message */
+/*   for referencing a variable before it is defined.   */
+/********************************************************/
+static void VariableReferenceErrorMessage(
+  Environment *theEnv,
+  CLIPSLexeme *theVariable,
+  struct lhsParseNode *theExpression,
+  int whichCE,
+  CLIPSLexeme *slotName,
+  int theField)
+  {
+   struct expr *temprv;
+
+   /*=============================*/
+   /* Print the error message ID. */
+   /*=============================*/
+
+   PrintErrorID(theEnv,"ANALYSIS",4,true);
+
+   /*=================================*/
+   /* Print the name of the variable. */
+   /*=================================*/
+
+   WriteString(theEnv,STDERR,"Variable ?");
+   WriteString(theEnv,STDERR,theVariable->contents);
+   WriteString(theEnv,STDERR," ");
+
+   /*=================================================*/
+   /* If the variable was found inside an expression, */
+   /* then print the expression.                      */
+   /*=================================================*/
+
+   if (theExpression != NULL)
+     {
+      whichCE = theExpression->whichCE;
+      temprv = LHSParseNodesToExpression(theEnv,theExpression);
+      ReturnExpression(theEnv,temprv->nextArg);
+      temprv->nextArg = NULL;
+      WriteString(theEnv,STDERR,"found in the expression ");
+      PrintExpression(theEnv,STDERR,temprv);
+      WriteString(theEnv,STDERR,"\n");
+      ReturnExpression(theEnv,temprv);
+     }
+
+   /*====================================================*/
+   /* Print the CE in which the variable was referenced. */
+   /*====================================================*/
+
+   WriteString(theEnv,STDERR,"was referenced in CE #");
+   WriteInteger(theEnv,STDERR,whichCE);
+
+   /*=====================================*/
+   /* Identify the slot or field in which */
+   /* the variable was found.             */
+   /*=====================================*/
+
+   if (slotName == NULL)
+     {
+      if (theField > 0)
+        {
+         WriteString(theEnv,STDERR," field #");
+         WriteInteger(theEnv,STDERR,theField);
+        }
+     }
+   else
+     {
+      WriteString(theEnv,STDERR," slot '");
+      WriteString(theEnv,STDERR,slotName->contents);
+      WriteString(theEnv,STDERR,"'");
+     }
+
+   WriteString(theEnv,STDERR," before being defined.\n");
+  }
+
+/************************************************************/
+/* VariableMixingErrorMessage: Prints the error message for */
+/*   the illegal mixing of single and multifield variables  */
+/*   on the LHS of a rule.                                  */
+/************************************************************/
+static void VariableMixingErrorMessage(
+  Environment *theEnv,
+  CLIPSLexeme *theVariable)
+  {
+   PrintErrorID(theEnv,"ANALYSIS",3,true);
+   WriteString(theEnv,STDERR,"Variable ?");
+   WriteString(theEnv,STDERR,theVariable->contents);
+   WriteString(theEnv,STDERR," is used as both a single and multifield variable in the LHS.\n");
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) && DEFRULE_CONSTRUCT */
+
+
diff --git a/clips/analysis.h b/clips/analysis.h
new file mode 100755
index 000000000..24c7fa3cd
--- /dev/null
+++ b/clips/analysis.h
@@ -0,0 +1,61 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                ANALYSIS HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Analyzes LHS patterns to check for semantic      */
+/*   errors and to determine variable comparisons and other  */
+/*   tests which must be performed either in the pattern or  */
+/*   join networks.                                          */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Join network rework and optimizations.         */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_analysis
+
+#pragma once
+
+#define _H_analysis
+
+#include "expressn.h"
+#include "reorder.h"
+
+/*****************************************************/
+/* nandFrame structure: Stores information about the */
+/*   current position in the nesting of not/and CEs  */
+/*   as the patterns of a rule are analyzed.         */
+/*****************************************************/
+struct nandFrame
+  {
+   int depth;
+   struct lhsParseNode *nandCE;
+   struct nandFrame *next;
+  };
+
+   bool                           VariableAnalysis(Environment *,struct lhsParseNode *);
+
+#endif
+
diff --git a/clips/argacces.c b/clips/argacces.c
new file mode 100755
index 000000000..93c07fde3
--- /dev/null
+++ b/clips/argacces.c
@@ -0,0 +1,509 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  09/20/17             */
+   /*                                                     */
+   /*               ARGUMENT ACCESS MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides access routines for accessing arguments */
+/*   passed to user or system functions defined using the    */
+/*   DefineFunction protocol.                                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added IllegalLogicalNameMessage function.      */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Support for fact-address arguments.            */
+/*                                                           */
+/*      6.31: Modified the GetFactOrInstanceArgument         */
+/*            function so that error messages are now        */
+/*            generated when the timetag, dependencies, and  */
+/*            dependents functions are given a retracted     */
+/*            fact.                                          */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+
+#include "cstrnchk.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "factmngr.h"
+#include "insfun.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+
+#include "argacces.h"
+
+/*********************************************************************/
+/* GetLogicalName: Retrieves the nth argument passed to the function */
+/*   call currently being evaluated and determines if it is a valid  */
+/*   logical name. If valid, the logical name is returned, otherwise */
+/*   NULL is returned.                                               */
+/*********************************************************************/
+const char *GetLogicalName(
+  UDFContext *context,
+  const char *defaultLogicalName)
+  {
+   Environment *theEnv = context->environment;
+   const char *logicalName;
+   UDFValue theArg;
+
+   if (! UDFNextArgument(context,ANY_TYPE_BITS,&theArg))
+     { return NULL; }
+
+   if (CVIsType(&theArg,LEXEME_BITS) ||
+       CVIsType(&theArg,INSTANCE_NAME_BIT))
+     {
+      logicalName = theArg.lexemeValue->contents;
+      if ((strcmp(logicalName,"t") == 0) || (strcmp(logicalName,"T") == 0))
+        { logicalName = defaultLogicalName; }
+     }
+   else if (CVIsType(&theArg,FLOAT_BIT))
+     {
+      logicalName = CreateSymbol(theEnv,FloatToString(theEnv,theArg.floatValue->contents))->contents;
+     }
+   else if (CVIsType(&theArg,INTEGER_BIT))
+     {
+      logicalName = CreateSymbol(theEnv,LongIntegerToString(theEnv,theArg.integerValue->contents))->contents;
+     }
+   else
+     { logicalName = NULL; }
+
+   return(logicalName);
+  }
+
+/************************************************************/
+/* GetFileName: Retrieves the nth argument passed to the    */
+/*   function call currently being evaluated and determines */
+/*   if it is a valid file name. If valid, the file name is */
+/*   returned, otherwise NULL is returned.                  */
+/************************************************************/
+const char *GetFileName(
+  UDFContext *context)
+  {
+   UDFValue theArg;
+
+   if (! UDFNextArgument(context,LEXEME_BITS,&theArg))
+     { return NULL; }
+
+   return theArg.lexemeValue->contents;
+  }
+
+/******************************************************************/
+/* OpenErrorMessage: Generalized error message for opening files. */
+/******************************************************************/
+void OpenErrorMessage(
+  Environment *theEnv,
+  const char *functionName,
+  const char *fileName)
+  {
+   PrintErrorID(theEnv,"ARGACCES",3,false);
+   WriteString(theEnv,STDERR,"Function '");
+   WriteString(theEnv,STDERR,functionName);
+   WriteString(theEnv,STDERR,"' was unable to open file '");
+   WriteString(theEnv,STDERR,fileName);
+   WriteString(theEnv,STDERR,"'.\n");
+  }
+
+/************************************************************/
+/* GetModuleName: Retrieves the nth argument passed to the  */
+/*   function call currently being evaluated and determines */
+/*   if it is a valid module name. If valid, the module     */
+/*   name is returned or NULL is returned to indicate all   */
+/*   modules.                                               */
+/************************************************************/
+Defmodule *GetModuleName(
+  UDFContext *context,
+  unsigned int whichArgument,
+  bool *error)
+  {
+   UDFValue returnValue;
+   Defmodule *theModule;
+   Environment *theEnv = context->environment;
+   const char *functionName = UDFContextFunctionName(context);
+
+   *error = false;
+
+   /*========================*/
+   /* Retrieve the argument. */
+   /*========================*/
+
+   if (! UDFNthArgument(context,1,SYMBOL_BIT,&returnValue))
+     {
+      *error = true;
+      return NULL;
+     }
+
+   /*=======================================*/
+   /* Check to see that the symbol actually */
+   /* corresponds to a defined module.      */
+   /*=======================================*/
+
+   if ((theModule = FindDefmodule(theEnv,returnValue.lexemeValue->contents)) == NULL)
+     {
+      if (strcmp("*",returnValue.lexemeValue->contents) != 0)
+        {
+         ExpectedTypeError1(theEnv,functionName,whichArgument,"'defmodule name'");
+         *error = true;
+        }
+      return NULL;
+     }
+
+   /*=================================*/
+   /* Return a pointer to the module. */
+   /*=================================*/
+
+   return(theModule);
+  }
+
+/****************************************************************/
+/* GetConstructName: Retrieves the 1st argument passed to the   */
+/*   function call currently being evaluated and determines if  */
+/*   it is a valid name for a construct. Also checks that the   */
+/*   function is only passed a single argument. This routine    */
+/*   is used by functions such as ppdeftemplate, undefrule,     */
+/*   etc... to retrieve the construct name on which to operate. */
+/****************************************************************/
+const char *GetConstructName(
+  UDFContext *context,
+  const char *functionName,
+  const char *constructType)
+  {
+   UDFValue returnValue;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&returnValue))
+     { return NULL; }
+
+   if (! CVIsType(&returnValue,SYMBOL_BIT))
+     {
+      UDFInvalidArgumentMessage(context,constructType);
+      return NULL;
+     }
+
+   return(returnValue.lexemeValue->contents);
+  }
+
+/*********************************************************/
+/* ExpectedCountError: Prints the error message for an   */
+/*   incorrect number of arguments passed to a function. */
+/*********************************************************/
+void ExpectedCountError(
+  Environment *theEnv,
+  const char *functionName,
+  int countRelation,
+  unsigned int expectedNumber)
+  {
+   PrintErrorID(theEnv,"ARGACCES",1,false);
+   WriteString(theEnv,STDERR,"Function '");
+   WriteString(theEnv,STDERR,functionName);
+   WriteString(theEnv,STDERR,"'");
+
+   if (countRelation == EXACTLY)
+     { WriteString(theEnv,STDERR," expected exactly "); }
+   else if (countRelation == AT_LEAST)
+     { WriteString(theEnv,STDERR," expected at least "); }
+   else if (countRelation == NO_MORE_THAN)
+     { WriteString(theEnv,STDERR," expected no more than "); }
+   else
+     { WriteString(theEnv,STDERR," generated an illegal argument check for "); }
+
+   PrintUnsignedInteger(theEnv,STDERR,expectedNumber);
+   
+   if (expectedNumber == 1)
+     { WriteString(theEnv,STDERR," argument.\n"); }
+   else
+     { WriteString(theEnv,STDERR," arguments.\n"); }
+  }
+
+/*************************************************************/
+/*  NAME         : CheckFunctionArgCount                     */
+/*  DESCRIPTION  : Checks the number of arguments against    */
+/*                 the system function restriction list      */
+/*  INPUTS       : 1) Name of the calling function           */
+/*                 2) The restriction list can be NULL       */
+/*                 3) The number of arguments                */
+/*  RETURNS      : True if OK, false otherwise               */
+/*  SIDE EFFECTS : EvaluationError set on errrors            */
+/*  NOTES        : Used to check generic function implicit   */
+/*                 method (system function) calls and system */
+/*                 function calls which have the sequence    */
+/*                 expansion operator in their argument list */
+/*************************************************************/
+bool CheckFunctionArgCount(
+  Environment *theEnv,
+  struct functionDefinition *func,
+  int argumentCount)
+  {
+   unsigned short minArguments, maxArguments;
+   const char *functionName;
+
+   functionName = func->callFunctionName->contents;
+
+   /*===========================================*/
+   /* Determine the minimum number of arguments */
+   /* required by the function.                 */
+   /*===========================================*/
+
+   minArguments = func->minArgs;
+
+   /*===========================================*/
+   /* Determine the maximum number of arguments */
+   /* required by the function.                 */
+   /*===========================================*/
+
+   maxArguments = func->maxArgs;
+
+   /*=====================================*/
+   /* If the function has no restrictions */
+   /* on function arguments, return true. */
+   /*=====================================*/
+
+   if ((minArguments == UNBOUNDED) && (maxArguments == UNBOUNDED))
+     { return true; }
+
+   /*==============================================*/
+   /* If the function expects exactly N arguments, */
+   /* then check to see if there are N arguments.  */
+   /*==============================================*/
+
+   if (minArguments == maxArguments)
+     {
+      if (argumentCount != minArguments)
+        {
+         ExpectedCountError(theEnv,functionName,EXACTLY,minArguments);
+         SetEvaluationError(theEnv,true);
+         return false;
+        }
+      return true;
+     }
+
+   /*==================================*/
+   /* Check to see if there were fewer */
+   /* arguments passed than expected.  */
+   /*==================================*/
+
+   if (argumentCount < minArguments)
+     {
+      ExpectedCountError(theEnv,functionName,AT_LEAST,minArguments);
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+
+   /*=================================*/
+   /* Check to see if there were more */
+   /* arguments passed than expected. */
+   /*=================================*/
+
+   if ((maxArguments != UNBOUNDED) && (argumentCount > maxArguments))
+     {
+      ExpectedCountError(theEnv,functionName,NO_MORE_THAN,maxArguments);
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+
+   /*===============================*/
+   /* The number of arguments falls */
+   /* within the expected range.    */
+   /*===============================*/
+
+   return true;
+  }
+
+/*******************************************************************/
+/* ExpectedTypeError0: Prints the error message for the wrong type */
+/*   of argument passed to a user or system defined function.      */
+/*******************************************************************/
+void ExpectedTypeError0(
+  Environment *theEnv,
+  const char *functionName,
+  unsigned int whichArg)
+  {
+   PrintErrorID(theEnv,"ARGACCES",2,false);
+   WriteString(theEnv,STDERR,"Function '");
+   WriteString(theEnv,STDERR,functionName);
+   WriteString(theEnv,STDERR,"' expected argument #");
+   WriteInteger(theEnv,STDERR,whichArg);
+   WriteString(theEnv,STDERR," to be of type ");
+  }
+
+/*******************************************************************/
+/* ExpectedTypeError1: Prints the error message for the wrong type */
+/*   of argument passed to a user or system defined function. The  */
+/*   expected type is passed as a string to this function.         */
+/*******************************************************************/
+void ExpectedTypeError1(
+  Environment *theEnv,
+  const char *functionName,
+  unsigned int whichArg,
+  const char *expectedType)
+  {
+   ExpectedTypeError0(theEnv,functionName,whichArg);
+   WriteString(theEnv,STDERR,expectedType);
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/**************************************************************/
+/* ExpectedTypeError2: Prints the error message for the wrong */
+/*   type of argument passed to a user or system defined      */
+/*   function. The expected type is derived by examining the  */
+/*   function's argument restriction list.                    */
+/**************************************************************/
+void ExpectedTypeError2(
+  Environment *theEnv,
+  const char *functionName,
+  unsigned int whichArg)
+  {
+   unsigned theRestriction;
+   struct functionDefinition *theFunction;
+
+   theFunction = FindFunction(theEnv,functionName);
+
+   if (theFunction == NULL) return;
+
+   theRestriction = GetNthRestriction(theEnv,theFunction,whichArg);
+   ExpectedTypeError0(theEnv,functionName,whichArg);
+   PrintTypesString(theEnv,STDERR,theRestriction,true);
+  }
+
+/***************************************************/
+/* GetFactOrInstanceArgument: Utility routine for  */
+/*   retrieving a fact or instance argument        */
+/***************************************************/
+void *GetFactOrInstanceArgument(
+  UDFContext *context,
+  unsigned int thePosition,
+  UDFValue *item)
+  {
+   Environment *theEnv = context->environment;
+#if DEFTEMPLATE_CONSTRUCT || OBJECT_SYSTEM
+   void *ptr;
+#endif
+
+   /*==============================*/
+   /* Retrieve the first argument. */
+   /*==============================*/
+
+   UDFNthArgument(context,thePosition,ANY_TYPE_BITS,item);
+
+   /*==================================================*/
+   /* Fact and instance addresses are valid arguments. */
+   /*==================================================*/
+
+   if (CVIsType(item,FACT_ADDRESS_BIT))
+     {
+      if (item->factValue->garbage)
+        {
+         FactRetractedErrorMessage(theEnv,item->factValue);
+         return NULL;
+        }
+        
+      return item->value;
+     }
+
+   else if (CVIsType(item,INSTANCE_ADDRESS_BIT))
+     {
+      if (item->instanceValue->garbage)
+        {
+         CantFindItemErrorMessage(theEnv,"instance",item->instanceValue->name->contents,false);
+         return NULL;
+        }
+        
+      return item->value;
+     }
+
+   /*==================================================*/
+   /* An integer is a valid argument if it corresponds */
+   /* to the fact index of an existing fact.           */
+   /*==================================================*/
+
+#if DEFTEMPLATE_CONSTRUCT
+   else if (item->header->type == INTEGER_TYPE)
+     {
+      if ((ptr = (void *) FindIndexedFact(theEnv,item->integerValue->contents)) == NULL)
+        {
+         char tempBuffer[20];
+         gensprintf(tempBuffer,"f-%lld",item->integerValue->contents);
+         CantFindItemErrorMessage(theEnv,"fact",tempBuffer,false);
+        }
+      return ptr;
+     }
+#endif
+
+   /*================================================*/
+   /* Instance names and symbols are valid arguments */
+   /* if they correspond to an existing instance.    */
+   /*================================================*/
+
+#if OBJECT_SYSTEM
+   else if (CVIsType(item,INSTANCE_NAME_BIT | SYMBOL_BIT))
+     {
+      if ((ptr = (void *) FindInstanceBySymbol(theEnv,item->lexemeValue)) == NULL)
+        {
+         CantFindItemErrorMessage(theEnv,"instance",item->lexemeValue->contents,false);
+        }
+      return ptr;
+     }
+#endif
+
+   /*========================================*/
+   /* Any other type is an invalid argument. */
+   /*========================================*/
+
+   ExpectedTypeError2(theEnv,UDFContextFunctionName(context),thePosition);
+   return NULL;
+  }
+
+/****************************************************/
+/* IllegalLogicalNameMessage: Generic error message */
+/*   for illegal logical names.                     */
+/****************************************************/
+void IllegalLogicalNameMessage(
+  Environment *theEnv,
+  const char *theFunction)
+  {
+   PrintErrorID(theEnv,"IOFUN",1,false);
+   WriteString(theEnv,STDERR,"Illegal logical name used for '");
+   WriteString(theEnv,STDERR,theFunction);
+   WriteString(theEnv,STDERR,"' function.\n");
+  }
diff --git a/clips/argacces.h b/clips/argacces.h
new file mode 100755
index 000000000..8aeb4e7bd
--- /dev/null
+++ b/clips/argacces.h
@@ -0,0 +1,77 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*             ARGUMENT ACCESS HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides access routines for accessing arguments */
+/*   passed to user or system functions defined using the    */
+/*   DefineFunction protocol.                                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added IllegalLogicalNameMessage function.      */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_argacces
+
+#pragma once
+
+#define _H_argacces
+
+#include "expressn.h"
+#include "evaluatn.h"
+#include "moduldef.h"
+
+   const char                    *GetLogicalName(UDFContext *,const char *);
+   const char                    *GetFileName(UDFContext *);
+   const char                    *GetConstructName(UDFContext *,const char *,const char *);
+   void                           ExpectedCountError(Environment *,const char *,int,unsigned int);
+   void                           OpenErrorMessage(Environment *,const char *,const char *);
+   bool                           CheckFunctionArgCount(Environment *,struct functionDefinition *,int);
+   void                           ExpectedTypeError0(Environment *,const char *,unsigned int);
+   void                           ExpectedTypeError1(Environment *,const char *,unsigned int,const char *);
+   void                           ExpectedTypeError2(Environment *,const char *,unsigned int);
+   Defmodule                     *GetModuleName(UDFContext *,unsigned int,bool *);
+   void                          *GetFactOrInstanceArgument(UDFContext *,unsigned int,UDFValue *);
+   void                           IllegalLogicalNameMessage(Environment *,const char *);
+
+#endif
+
+
+
+
+
+
diff --git a/clips/bload.c b/clips/bload.c
new file mode 100755
index 000000000..dce969eac
--- /dev/null
+++ b/clips/bload.c
@@ -0,0 +1,880 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/04/17             */
+   /*                                                     */
+   /*                    BLOAD MODULE                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides core routines for loading constructs    */
+/*   from a binary file.                                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.31: Data sizes written to binary files for         */
+/*            validation when loaded.                        */
+/*                                                           */
+/*      6.40: Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "bsave.h"
+#include "constrct.h"
+#include "cstrnbin.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+
+#include "bload.h"
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static struct functionDefinition **ReadNeededFunctions(Environment *,unsigned long *,bool *);
+   static struct functionDefinition  *FastFindFunction(Environment *,const char *,struct functionDefinition *);
+   static bool                        ClearBload(Environment *);
+   static void                        ClearBloadCallback(Environment *,void *);
+   static void                        AbortBload(Environment *);
+   static bool                        BloadOutOfMemoryFunction(Environment *,size_t);
+   static void                        DeallocateBloadData(Environment *);
+
+/**********************************************/
+/* InitializeBloadData: Allocates environment */
+/*    data for the bload command.             */
+/**********************************************/
+void InitializeBloadData(
+  Environment *theEnv)
+  {
+   char sizeBuffer[20];
+   sprintf(sizeBuffer,"%2zu%2zu%2zu%2zu%2zu",sizeof(void *),sizeof(double),
+                                             sizeof(int),sizeof(long),sizeof(long long));
+
+   AllocateEnvironmentData(theEnv,BLOAD_DATA,sizeof(struct bloadData),NULL);
+   AddEnvironmentCleanupFunction(theEnv,"bload",DeallocateBloadData,-1500);
+   AddClearFunction(theEnv,"bload",ClearBloadCallback,10000,NULL);
+
+   BloadData(theEnv)->BinaryPrefixID = "\1\2\3\4CLIPS";
+   BloadData(theEnv)->BinaryVersionID = "V6.40";
+   BloadData(theEnv)->BinarySizes = (char *) genalloc(theEnv,strlen(sizeBuffer) + 1);
+   genstrcpy(BloadData(theEnv)->BinarySizes,sizeBuffer);
+  }
+
+/************************************************/
+/* DeallocateBloadData: Deallocates environment */
+/*    data for the bload command.               */
+/************************************************/
+static void DeallocateBloadData(
+  Environment *theEnv)
+  {
+   DeallocateVoidCallList(theEnv,BloadData(theEnv)->BeforeBloadFunctions);
+   DeallocateVoidCallList(theEnv,BloadData(theEnv)->AfterBloadFunctions);
+   DeallocateBoolCallList(theEnv,BloadData(theEnv)->ClearBloadReadyFunctions);
+   DeallocateVoidCallList(theEnv,BloadData(theEnv)->AbortBloadFunctions);
+   genfree(theEnv,BloadData(theEnv)->BinarySizes,strlen(BloadData(theEnv)->BinarySizes) + 1);
+  }
+
+/****************************/
+/* Bload: C access routine  */
+/*   for the bload command. */
+/****************************/
+bool Bload(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   unsigned long numberOfFunctions;
+   unsigned long space;
+   bool error;
+   char IDbuffer[20];
+   char sizesBuffer[20];
+   char constructBuffer[CONSTRUCT_HEADER_SIZE];
+   struct BinaryItem *biPtr;
+   struct voidCallFunctionItem *bfPtr;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*================*/
+   /* Open the file. */
+   /*================*/
+
+   if (GenOpenReadBinary(theEnv,"bload",fileName) == 0)
+     {
+      OpenErrorMessage(theEnv,"bload",fileName);
+      return false;
+     }
+
+   /*=====================================*/
+   /* Determine if this is a binary file. */
+   /*=====================================*/
+
+   GenReadBinary(theEnv,IDbuffer,strlen(BloadData(theEnv)->BinaryPrefixID) + 1);
+   if (strcmp(IDbuffer,BloadData(theEnv)->BinaryPrefixID) != 0)
+     {
+      PrintErrorID(theEnv,"BLOAD",2,false);
+      WriteString(theEnv,STDERR,"File '");
+      WriteString(theEnv,STDERR,fileName);
+      WriteString(theEnv,STDERR,"' is not a binary construct file.\n");
+      GenCloseBinary(theEnv);
+      return false;
+     }
+
+   /*=======================================*/
+   /* Determine if it's a binary file using */
+   /* a format from a different version.    */
+   /*=======================================*/
+
+   GenReadBinary(theEnv,IDbuffer,strlen(BloadData(theEnv)->BinaryVersionID) + 1);
+   if (strcmp(IDbuffer,BloadData(theEnv)->BinaryVersionID) != 0)
+     {
+      PrintErrorID(theEnv,"BLOAD",3,false);
+      WriteString(theEnv,STDERR,"File '");
+      WriteString(theEnv,STDERR,fileName);
+      WriteString(theEnv,STDERR,"' is an incompatible binary construct file.\n");
+      GenCloseBinary(theEnv);
+      return false;
+     }
+
+   /*===========================================*/
+   /* Determine if it's a binary file using the */
+   /* correct size for pointers and numbers.    */
+   /*===========================================*/
+
+   GenReadBinary(theEnv,sizesBuffer,strlen(BloadData(theEnv)->BinarySizes) + 1);
+   if (strcmp(sizesBuffer,BloadData(theEnv)->BinarySizes) != 0)
+     {
+      PrintErrorID(theEnv,"BLOAD",3,false);
+      WriteString(theEnv,STDERR,"File '");
+      WriteString(theEnv,STDERR,fileName);
+      WriteString(theEnv,STDERR,"' is an incompatible binary construct file.\n");
+      GenCloseBinary(theEnv);
+      return false;
+     }
+
+   /*====================*/
+   /* Clear environment. */
+   /*====================*/
+
+   if (BloadData(theEnv)->BloadActive)
+     {
+      if (ClearBload(theEnv) == false)
+        {
+         GenCloseBinary(theEnv);
+         return false;
+        }
+     }
+
+   /*=================================*/
+   /* Determine if the KB environment */
+   /* was successfully cleared.       */
+   /*=================================*/
+
+   if (ClearReady(theEnv) == false)
+     {
+      GenCloseBinary(theEnv);
+      PrintErrorID(theEnv,"BLOAD",4,false);
+      WriteString(theEnv,STDERR,"The ");
+      WriteString(theEnv,STDERR,APPLICATION_NAME);
+      WriteString(theEnv,STDERR," environment could not be cleared.\n");
+      WriteString(theEnv,STDERR,"Binary load cannot continue.\n");
+      return false;
+     }
+
+   /*==================================*/
+   /* Call the list of functions to be */
+   /* executed before a bload occurs.  */
+   /*==================================*/
+
+   ConstructData(theEnv)->ClearInProgress = true;
+   for (bfPtr = BloadData(theEnv)->BeforeBloadFunctions;
+        bfPtr != NULL;
+        bfPtr = bfPtr->next)
+     { (*bfPtr->func)(theEnv,bfPtr->context); }
+
+   ConstructData(theEnv)->ClearInProgress = false;
+
+   /*====================================================*/
+   /* Read in the functions needed by this binary image. */
+   /*====================================================*/
+
+   BloadData(theEnv)->FunctionArray = ReadNeededFunctions(theEnv,&numberOfFunctions,&error);
+   if (error)
+     {
+      GenCloseBinary(theEnv);
+      AbortBload(theEnv);
+      return false;
+     }
+
+   /*================================================*/
+   /* Read in the atoms needed by this binary image. */
+   /*================================================*/
+
+   ReadNeededAtomicValues(theEnv);
+
+   /*===========================================*/
+   /* Determine the number of expressions to be */
+   /* read and allocate the appropriate space   */
+   /*===========================================*/
+
+   AllocateExpressions(theEnv);
+
+   /*==========================================================*/
+   /* Read in the memory requirements of the constructs stored */
+   /* in this binary image and allocate the necessary space    */
+   /*==========================================================*/
+
+   for (GenReadBinary(theEnv,constructBuffer,CONSTRUCT_HEADER_SIZE);
+        strncmp(constructBuffer,BloadData(theEnv)->BinaryPrefixID,CONSTRUCT_HEADER_SIZE) != 0;
+        GenReadBinary(theEnv,constructBuffer,CONSTRUCT_HEADER_SIZE))
+     {
+      bool found;
+
+      /*================================================*/
+      /* Search for the construct type in the list of   */
+      /* binary items. If found, allocate the storage   */
+      /* needed by the construct for this binary image. */
+      /*================================================*/
+
+      found = false;
+      for (biPtr = BsaveData(theEnv)->ListOfBinaryItems;
+           biPtr != NULL;
+           biPtr = biPtr->next)
+        {
+         if (strncmp(biPtr->name,constructBuffer,CONSTRUCT_HEADER_SIZE) == 0)
+           {
+            if (biPtr->bloadStorageFunction != NULL)
+              {
+               (*biPtr->bloadStorageFunction)(theEnv);
+               found = true;
+              }
+            break;
+           }
+        }
+
+      /*==========================================*/
+      /* If the construct type wasn't found, skip */
+      /* the storage binary load information for  */
+      /* this construct.                          */
+      /*==========================================*/
+
+      if (! found)
+        {
+         GenReadBinary(theEnv,&space,sizeof(unsigned long));
+         GetSeekCurBinary(theEnv,(long) space);
+         if (space != 0)
+           {
+            WriteString(theEnv,STDOUT,"\nSkipping ");
+            WriteString(theEnv,STDOUT,constructBuffer);
+            WriteString(theEnv,STDOUT," constructs because of unavailability\n");
+           }
+        }
+     }
+
+   /*======================================*/
+   /* Refresh the pointers in expressions. */
+   /*======================================*/
+
+   RefreshExpressions(theEnv);
+
+   /*==========================*/
+   /* Read in the constraints. */
+   /*==========================*/
+
+   ReadNeededConstraints(theEnv);
+
+   /*======================================================*/
+   /* Read in the constructs stored in this binary image.  */
+   /*======================================================*/
+
+   for (GenReadBinary(theEnv,constructBuffer,CONSTRUCT_HEADER_SIZE);
+        strncmp(constructBuffer,BloadData(theEnv)->BinaryPrefixID,CONSTRUCT_HEADER_SIZE) != 0;
+        GenReadBinary(theEnv,constructBuffer,CONSTRUCT_HEADER_SIZE))
+     {
+      bool found;
+
+      /*==================================================*/
+      /* Search for the function to load the construct    */
+      /* into the previously allocated storage. If found, */
+      /* call the function to load the construct.         */
+      /*==================================================*/
+
+      found = false;
+      for (biPtr = BsaveData(theEnv)->ListOfBinaryItems;
+           biPtr != NULL;
+           biPtr = biPtr->next)
+        {
+         if (strncmp(biPtr->name,constructBuffer,CONSTRUCT_HEADER_SIZE) == 0)
+           {
+            if (biPtr->bloadFunction != NULL)
+              {
+               (*biPtr->bloadFunction)(theEnv);
+               found = true;
+              }
+            break;
+           }
+        }
+
+      /*==========================================*/
+      /* If the construct type wasn't found, skip */
+      /* the binary data for this construct.      */
+      /*==========================================*/
+
+      if (! found)
+        {
+         GenReadBinary(theEnv,&space,sizeof(unsigned long));
+         GetSeekCurBinary(theEnv,(long) space);
+        }
+     }
+
+   /*=================*/
+   /* Close the file. */
+   /*=================*/
+
+   GenCloseBinary(theEnv);
+
+   /*========================================*/
+   /* Free up temporary storage used for the */
+   /* function and atomic value information. */
+   /*========================================*/
+
+   if (BloadData(theEnv)->FunctionArray != NULL)
+     {
+      genfree(theEnv,BloadData(theEnv)->FunctionArray,
+              sizeof(struct functionDefinition *) * numberOfFunctions);
+     }
+   FreeAtomicValueStorage(theEnv);
+
+   /*==================================*/
+   /* Call the list of functions to be */
+   /* executed after a bload occurs.   */
+   /*==================================*/
+
+   for (bfPtr = BloadData(theEnv)->AfterBloadFunctions;
+        bfPtr != NULL;
+        bfPtr = bfPtr->next)
+     { (*bfPtr->func)(theEnv,bfPtr->context); }
+
+   /*=======================================*/
+   /* Add a clear function to remove binary */
+   /* load when a clear command is issued.  */
+   /*=======================================*/
+
+   BloadData(theEnv)->BloadActive = true;
+
+   /*=============================*/
+   /* Return true to indicate the */
+   /* binary load was successful. */
+   /*=============================*/
+
+   return true;
+  }
+
+/************************************************************
+  NAME         : BloadandRefresh
+  DESCRIPTION  : Loads and refreshes objects - will bload
+                 all objects at once, if possible, but
+                 will aslo work in increments if memory is
+                 restricted
+  INPUTS       : 1) the number of objects to bload and update
+                 2) the size of one object
+                 3) An update function which takes a bloaded
+                    object buffer and the index of the object
+                    to refresh as arguments
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Objects bloaded and updated
+  NOTES        : Assumes binary file pointer is positioned
+                 for bloads of the objects
+ ************************************************************/
+void BloadandRefresh(
+  Environment *theEnv,
+  unsigned long objcnt,
+  size_t objsz,
+  void (*objupdate)(Environment *,void *,unsigned long))
+  {
+   unsigned long i, bi;
+   char *buf;
+   unsigned long objsmaxread, objsread;
+   size_t space;
+   OutOfMemoryFunction *oldOutOfMemoryFunction;
+
+   if (objcnt == 0L) return;
+
+   oldOutOfMemoryFunction = SetOutOfMemoryFunction(theEnv,BloadOutOfMemoryFunction);
+   objsmaxread = objcnt;
+   do
+     {
+      space = objsmaxread * objsz;
+      buf = (char *) genalloc(theEnv,space);
+      if (buf == NULL)
+        {
+         if ((objsmaxread / 2) == 0)
+           {
+            if ((*oldOutOfMemoryFunction)(theEnv,space) == true)
+              {
+               SetOutOfMemoryFunction(theEnv,oldOutOfMemoryFunction);
+               return;
+              }
+           }
+         else
+           objsmaxread /= 2;
+        }
+     }
+   while (buf == NULL);
+
+   SetOutOfMemoryFunction(theEnv,oldOutOfMemoryFunction);
+
+   i = 0L;
+   do
+     {
+      objsread = (objsmaxread > (objcnt - i)) ? (objcnt - i) : objsmaxread;
+      GenReadBinary(theEnv,buf,objsread * objsz);
+      for (bi = 0L ; bi < objsread ; bi++ , i++)
+        (*objupdate)(theEnv,buf + objsz * bi,i);
+     }
+   while (i < objcnt);
+   genfree(theEnv,buf,space);
+  }
+
+/**********************************************/
+/* ReadNeededFunctions: Reads in the names of */
+/*   functions needed by the binary image.    */
+/**********************************************/
+static struct functionDefinition **ReadNeededFunctions(
+  Environment *theEnv,
+  unsigned long *numberOfFunctions,
+  bool *error)
+  {
+   char *functionNames, *namePtr;
+   unsigned long space;
+   size_t temp;
+   unsigned long i;
+   struct functionDefinition **newFunctionArray, *functionPtr;
+   bool functionsNotFound = false;
+
+   /*===================================================*/
+   /* Determine the number of function names to be read */
+   /* and the space required for them.                  */
+   /*===================================================*/
+
+   GenReadBinary(theEnv,numberOfFunctions,sizeof(long));
+   GenReadBinary(theEnv,&space,sizeof(unsigned long));
+   if (*numberOfFunctions == 0)
+     {
+      *error = false;
+      return NULL;
+     }
+
+   /*=======================================*/
+   /* Allocate area for strings to be read. */
+   /*=======================================*/
+
+   functionNames = (char *) genalloc(theEnv,space);
+   GenReadBinary(theEnv,functionNames,space);
+
+   /*====================================================*/
+   /* Store the function pointers in the function array. */
+   /*====================================================*/
+
+   temp = sizeof(struct functionDefinition *) * *numberOfFunctions;
+   newFunctionArray = (struct functionDefinition **) genalloc(theEnv,temp);
+   namePtr = functionNames;
+   functionPtr = NULL;
+   for (i = 0; i < *numberOfFunctions; i++)
+     {
+      if ((functionPtr = FastFindFunction(theEnv,namePtr,functionPtr)) == NULL)
+        {
+         if (! functionsNotFound)
+           {
+            PrintErrorID(theEnv,"BLOAD",6,false);
+            WriteString(theEnv,STDERR,"The following undefined functions are ");
+            WriteString(theEnv,STDERR,"referenced by this binary image:\n");
+           }
+
+         WriteString(theEnv,STDERR,"   ");
+         WriteString(theEnv,STDERR,namePtr);
+         WriteString(theEnv,STDERR,"\n");
+         functionsNotFound = true;
+        }
+
+      newFunctionArray[i] = functionPtr;
+      namePtr += strlen(namePtr) + 1;
+     }
+
+   /*==========================================*/
+   /* Free the memory used by the name buffer. */
+   /*==========================================*/
+
+   genfree(theEnv,functionNames,space);
+
+   /*==================================================*/
+   /* If any of the required functions were not found, */
+   /* then free the memory used by the function array. */
+   /*==================================================*/
+
+   if (functionsNotFound)
+     {
+      genfree(theEnv,newFunctionArray,temp);
+      newFunctionArray = NULL;
+     }
+
+   /*===================================*/
+   /* Set globals to appropriate values */
+   /* and return the function array.    */
+   /*===================================*/
+
+   *error = functionsNotFound;
+   return newFunctionArray;
+  }
+
+/*****************************************/
+/* FastFindFunction: Search the function */
+/*   list for a specific function.       */
+/*****************************************/
+static struct functionDefinition *FastFindFunction(
+  Environment *theEnv,
+  const char *functionName,
+  struct functionDefinition *lastFunction)
+  {
+   struct functionDefinition *theList, *theFunction;
+
+   /*========================*/
+   /* Get the function list. */
+   /*========================*/
+
+   theList = GetFunctionList(theEnv);
+   if (theList == NULL) { return NULL; }
+
+   /*=======================================*/
+   /* If we completed a previous function   */
+   /* search, start where we last left off. */
+   /*=======================================*/
+
+   if (lastFunction != NULL)
+     { theFunction = lastFunction->next; }
+   else
+     { theFunction = theList; }
+
+   /*======================================================*/
+   /* Traverse the rest of the function list searching for */
+   /* the named function wrapping around if necessary.     */
+   /*======================================================*/
+
+   while (strcmp(functionName,theFunction->callFunctionName->contents) != 0)
+     {
+      theFunction = theFunction->next;
+      if (theFunction == lastFunction) return NULL;
+      if (theFunction == NULL) theFunction = theList;
+     }
+
+   /*=======================*/
+   /* Return the pointer to */
+   /* the found function.   */
+   /*=======================*/
+
+   return(theFunction);
+  }
+
+/******************************************/
+/* Bloaded: Returns true if the current   */
+/*   environment is the result of a bload */
+/*   command, otherwise returns false.    */
+/******************************************/
+bool Bloaded(
+  Environment *theEnv)
+  {
+   return BloadData(theEnv)->BloadActive;
+  }
+
+/***************************************/
+/* ClearBloadCallback: Clears a binary */
+/*   image from the KB environment.    */
+/***************************************/
+static void ClearBloadCallback(
+  Environment *theEnv,
+  void *context)
+  {
+   ClearBload(theEnv);
+  }
+
+/*************************************/
+/* ClearBload: Clears a binary image */
+/*   from the KB environment.        */
+/*************************************/
+static bool ClearBload(
+  Environment *theEnv)
+  {
+   struct BinaryItem *biPtr;
+   struct boolCallFunctionItem *bfPtr;
+   bool ready, error;
+
+   /*======================================*/
+   /* If bload is not active, then there's */
+   /* no need to clear bload data.         */
+   /*======================================*/
+
+   if (! BloadData(theEnv)->BloadActive)
+     { return true; }
+
+   /*=================================================*/
+   /* Make sure it's safe to clear the bloaded image. */
+   /*=================================================*/
+
+   error = false;
+   for (bfPtr = BloadData(theEnv)->ClearBloadReadyFunctions;
+        bfPtr != NULL;
+        bfPtr = bfPtr->next)
+     {
+      ready = (bfPtr->func)(theEnv,bfPtr->context);
+
+      if (ready == false)
+        {
+         if (! error)
+           {
+            PrintErrorID(theEnv,"BLOAD",5,false);
+            WriteString(theEnv,STDERR,
+                       "Some constructs are still in use by the current binary image:\n");
+           }
+         WriteString(theEnv,STDERR,"   ");
+         WriteString(theEnv,STDERR,bfPtr->name);
+         WriteString(theEnv,STDERR,"\n");
+         error = true;
+        }
+     }
+
+   /*==================================================*/
+   /* If some constructs are still in use and can't be */
+   /* cleared, indicate the binary load can't continue */
+   /* and return false to indicate this condition.     */
+   /*==================================================*/
+
+   if (error == true)
+     {
+      WriteString(theEnv,STDERR,"Binary clear cannot continue.\n");
+      return false;
+     }
+
+   /*=============================*/
+   /* Call bload clear functions. */
+   /*=============================*/
+
+   for (biPtr = BsaveData(theEnv)->ListOfBinaryItems;
+        biPtr != NULL;
+        biPtr = biPtr->next)
+     { if (biPtr->clearFunction != NULL) (*biPtr->clearFunction)(theEnv); }
+
+   /*===========================*/
+   /* Free bloaded expressions. */
+   /*===========================*/
+
+   ClearBloadedExpressions(theEnv);
+
+   /*===========================*/
+   /* Free bloaded constraints. */
+   /*===========================*/
+
+   ClearBloadedConstraints(theEnv);
+
+   /*==================================*/
+   /* Remove the bload clear function. */
+   /*==================================*/
+
+   BloadData(theEnv)->BloadActive = false;
+
+   /*====================================*/
+   /* Return true to indicate the binary */
+   /* image was successfully cleared.    */
+   /*====================================*/
+
+   return true;
+  }
+
+/*************************************************/
+/* AbortBload: Cleans up effects of before-bload */
+/*   functions in event of failure.              */
+/*************************************************/
+static void AbortBload(
+  Environment *theEnv)
+  {
+   struct voidCallFunctionItem *bfPtr;
+
+   for (bfPtr = BloadData(theEnv)->AbortBloadFunctions;
+        bfPtr != NULL;
+        bfPtr = bfPtr->next)
+     { (*bfPtr->func)(theEnv,bfPtr->context); }
+  }
+
+/********************************************/
+/* AddBeforeBloadFunction: Adds a function  */
+/*   to the list of functions called before */
+/*   a binary load occurs.                  */
+/********************************************/
+void AddBeforeBloadFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunction *func,
+  int priority,
+  void *context)
+  {
+   BloadData(theEnv)->BeforeBloadFunctions =
+     AddVoidFunctionToCallList(theEnv,name,priority,func,BloadData(theEnv)->BeforeBloadFunctions,context);
+  }
+
+/*******************************************/
+/* AddAfterBloadFunction: Adds a function  */
+/*   to the list of functions called after */
+/*   a binary load occurs.                 */
+/*******************************************/
+void AddAfterBloadFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunction *func,
+  int priority,
+  void *context)
+  {
+   BloadData(theEnv)->AfterBloadFunctions =
+      AddVoidFunctionToCallList(theEnv,name,priority,func,BloadData(theEnv)->AfterBloadFunctions,context);
+  }
+
+/**************************************************/
+/* AddClearBloadReadyFunction: Adds a function to */
+/*   the list of functions called to determine if */
+/*   a binary image can be cleared.               */
+/**************************************************/
+void AddClearBloadReadyFunction(
+  Environment *theEnv,
+  const char *name,
+  BoolCallFunction *func,
+  int priority,
+  void *context)
+  {
+   BloadData(theEnv)->ClearBloadReadyFunctions =
+      AddBoolFunctionToCallList(theEnv,name,priority,func,
+                                BloadData(theEnv)->ClearBloadReadyFunctions,context);
+  }
+
+/*********************************************/
+/* AddAbortBloadFunction: Adds a function to */
+/*   the list of functions called if a bload */
+/*   has to be aborted.                      */
+/*********************************************/
+void AddAbortBloadFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunction *func,
+  int priority,
+  void *context)
+  {
+   BloadData(theEnv)->AbortBloadFunctions =
+      AddVoidFunctionToCallList(theEnv,name,priority,func,
+                                BloadData(theEnv)->AbortBloadFunctions,context);
+  }
+
+/*******************************************************
+  NAME         : BloadOutOfMemoryFunction
+  DESCRIPTION  : Memory function used by bload to
+                   prevent exiting when out of
+                   memory - used by BloadandRefresh
+  INPUTS       : The memory request size (unused)
+  RETURNS      : True (indicates a failure and for
+                 the memory functions to simply
+                 return a NULL pointer)
+  SIDE EFFECTS : None
+  NOTES        : None
+ *******************************************************/
+static bool BloadOutOfMemoryFunction(
+  Environment *theEnv,
+  size_t size)
+  {
+#if MAC_XCD
+#pragma unused(size,theEnv)
+#endif
+   return true;
+  }
+
+/*****************************************************/
+/* CannotLoadWithBloadMessage: Generic error message */
+/*   for indicating that a construct can't be loaded */
+/*   when a binary image is active.                  */
+/*****************************************************/
+void CannotLoadWithBloadMessage(
+  Environment *theEnv,
+  const char *constructName)
+  {
+   PrintErrorID(theEnv,"BLOAD",1,true);
+   WriteString(theEnv,STDERR,"Cannot load ");
+   WriteString(theEnv,STDERR,constructName);
+   WriteString(theEnv,STDERR," construct with binary load in effect.\n");
+  }
+
+#endif /* (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) */
+
+/**************************************/
+/* BloadCommand: H/L access routine   */
+/*   for the bload command.           */
+/**************************************/
+void BloadCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if (! RUN_TIME) && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+   const char *fileName;
+
+   fileName = GetFileName(context);
+   if (fileName != NULL)
+     {
+      returnValue->lexemeValue = CreateBoolean(theEnv,Bload(theEnv,fileName));
+      return;
+     }
+#else
+#if MAC_XCD
+#pragma unused(theEnv,context)
+#endif
+#endif
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+  }
diff --git a/clips/bload.h b/clips/bload.h
new file mode 100755
index 000000000..af46b3efe
--- /dev/null
+++ b/clips/bload.h
@@ -0,0 +1,94 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/01/16            */
+   /*                                                     */
+   /*                 BLOAD HEADER FILE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.31: Data sizes written to binary files for         */
+/*            validation when loaded.                        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_bload
+
+#pragma once
+
+#define _H_bload
+
+#include "utility.h"
+#include "extnfunc.h"
+#include "exprnbin.h"
+#include "symbol.h"
+#include "sysdep.h"
+#include "symblbin.h"
+
+#define BLOAD_DATA 38
+
+struct bloadData
+  {
+   const char *BinaryPrefixID;
+   const char *BinaryVersionID;
+   char *BinarySizes;
+   struct functionDefinition **FunctionArray;
+   bool BloadActive;
+   struct voidCallFunctionItem *BeforeBloadFunctions;
+   struct voidCallFunctionItem *AfterBloadFunctions;
+   struct boolCallFunctionItem *ClearBloadReadyFunctions;
+   struct voidCallFunctionItem *AbortBloadFunctions;
+  };
+
+#define BloadData(theEnv) ((struct bloadData *) GetEnvironmentData(theEnv,BLOAD_DATA))
+
+#define FunctionPointer(i) ((((i) == ULONG_MAX) ? NULL : BloadData(theEnv)->FunctionArray[i]))
+
+   void                    InitializeBloadData(Environment *);
+   void                    BloadCommand(Environment *,UDFContext *,UDFValue *);
+   bool                    Bload(Environment *,const char *);
+   void                    BloadandRefresh(Environment *,unsigned long,size_t,void (*)(Environment *,void *,unsigned long));
+   bool                    Bloaded(Environment *);
+   void                    AddBeforeBloadFunction(Environment *,const char *,VoidCallFunction *,int,void *);
+   void                    AddAfterBloadFunction(Environment *,const char *,VoidCallFunction *,int,void *);
+   void                    AddClearBloadReadyFunction(Environment *,const char *,BoolCallFunction *,int,void *);
+   void                    AddAbortBloadFunction(Environment *,const char *,VoidCallFunction *,int,void *);
+   void                    CannotLoadWithBloadMessage(Environment *,const char *);
+
+#endif
+
diff --git a/clips/bmathfun.c b/clips/bmathfun.c
new file mode 100755
index 000000000..f20bd981c
--- /dev/null
+++ b/clips/bmathfun.c
@@ -0,0 +1,557 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  01/29/18             */
+   /*                                                     */
+   /*             BASIC MATH FUNCTIONS MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for numerous basic math        */
+/*   functions including +, *, -, /, integer, float, div,    */
+/*   abs,set-auto-float-dividend, get-auto-float-dividend,   */
+/*   min, and max.                                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.31: Fix for overflow error in div function.        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Auto-float-dividend always enabled.            */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "bmathfun.h"
+
+/***************************************************************/
+/* BasicMathFunctionDefinitions: Defines basic math functions. */
+/***************************************************************/
+void BasicMathFunctionDefinitions(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"+","ld",2,UNBOUNDED,"ld",AdditionFunction,"AdditionFunction",NULL);
+   AddUDF(theEnv,"*","ld",2,UNBOUNDED,"ld",MultiplicationFunction,"MultiplicationFunction",NULL);
+   AddUDF(theEnv,"-","ld",2,UNBOUNDED,"ld",SubtractionFunction,"SubtractionFunction",NULL);
+   AddUDF(theEnv,"/","d",2,UNBOUNDED,"ld",DivisionFunction,"DivisionFunction",NULL);
+   AddUDF(theEnv,"div","l",2,UNBOUNDED,"ld",DivFunction,"DivFunction",NULL);
+   AddUDF(theEnv,"integer","l",1,1,"ld",IntegerFunction,"IntegerFunction",NULL);
+   AddUDF(theEnv,"float","d",1,1,"ld",FloatFunction,"FloatFunction",NULL);
+   AddUDF(theEnv,"abs","ld",1,1,"ld",AbsFunction,"AbsFunction",NULL);
+   AddUDF(theEnv,"min","ld",1,UNBOUNDED,"ld",MinFunction,"MinFunction",NULL);
+   AddUDF(theEnv,"max","ld",1,UNBOUNDED,"ld",MaxFunction,"MaxFunction",NULL);
+#endif
+  }
+
+/**********************************/
+/* AdditionFunction: H/L access   */
+/*   routine for the + function.  */
+/**********************************/
+void AdditionFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double ftotal = 0.0;
+   long long ltotal = 0LL;
+   bool useFloatTotal = false;
+   UDFValue theArg;
+
+   /*=================================================*/
+   /* Loop through each of the arguments adding it to */
+   /* a running total. If a floating point number is  */
+   /* encountered, then do all subsequent operations  */
+   /* using floating point values.                    */
+   /*=================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&theArg))
+        { return; }
+
+      if (useFloatTotal)
+        { ftotal += CVCoerceToFloat(&theArg); }
+      else
+        {
+         if (CVIsType(&theArg,INTEGER_BIT))
+           { ltotal += theArg.integerValue->contents; }
+         else
+           {
+            ftotal = (double) ltotal + CVCoerceToFloat(&theArg);
+            useFloatTotal = true;
+           }
+        }
+     }
+
+   /*======================================================*/
+   /* If a floating point number was in the argument list, */
+   /* then return a float, otherwise return an integer.    */
+   /*======================================================*/
+
+   if (useFloatTotal)
+     { returnValue->floatValue = CreateFloat(theEnv,ftotal); }
+   else
+     { returnValue->integerValue = CreateInteger(theEnv,ltotal); }
+  }
+
+/****************************************/
+/* MultiplicationFunction: CLIPS access */
+/*   routine for the * function.        */
+/****************************************/
+void MultiplicationFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double ftotal = 1.0;
+   long long ltotal = 1LL;
+   bool useFloatTotal = false;
+   UDFValue theArg;
+
+   /*===================================================*/
+   /* Loop through each of the arguments multiplying it */
+   /* by a running product. If a floating point number  */
+   /* is encountered, then do all subsequent operations */
+   /* using floating point values.                      */
+   /*===================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&theArg))
+        { return; }
+
+      if (useFloatTotal)
+        { ftotal *= CVCoerceToFloat(&theArg); }
+      else
+        {
+         if (CVIsType(&theArg,INTEGER_BIT))
+           { ltotal *= theArg.integerValue->contents; }
+         else
+           {
+            ftotal = (double) ltotal * CVCoerceToFloat(&theArg);
+            useFloatTotal = true;
+           }
+        }
+     }
+
+   /*======================================================*/
+   /* If a floating point number was in the argument list, */
+   /* then return a float, otherwise return an integer.    */
+   /*======================================================*/
+
+   if (useFloatTotal)
+     { returnValue->floatValue = CreateFloat(theEnv,ftotal); }
+   else
+     { returnValue->integerValue = CreateInteger(theEnv,ltotal); }
+  }
+
+/*************************************/
+/* SubtractionFunction: CLIPS access */
+/*   routine for the - function.     */
+/*************************************/
+void SubtractionFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double ftotal = 0.0;
+   long long ltotal = 0LL;
+   bool useFloatTotal = false;
+   UDFValue theArg;
+
+   /*=================================================*/
+   /* Get the first argument. This number which will  */
+   /* be the starting total from which all subsequent */
+   /* arguments will subtracted.                      */
+   /*=================================================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&theArg))
+     { return; }
+
+   if (CVIsType(&theArg,INTEGER_BIT))
+     { ltotal = theArg.integerValue->contents; }
+   else
+     {
+      ftotal = CVCoerceToFloat(&theArg);
+      useFloatTotal = true;
+     }
+
+   /*===================================================*/
+   /* Loop through each of the arguments subtracting it */
+   /* from a running total. If a floating point number  */
+   /* is encountered, then do all subsequent operations */
+   /* using floating point values.                      */
+   /*===================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&theArg))
+        { return; }
+
+      if (useFloatTotal)
+        { ftotal -= CVCoerceToFloat(&theArg); }
+      else
+        {
+         if (CVIsType(&theArg,INTEGER_BIT))
+           { ltotal -= theArg.integerValue->contents; }
+         else
+           {
+            ftotal = (double) ltotal - theArg.floatValue->contents;
+            useFloatTotal = true;
+           }
+        }
+     }
+
+   /*======================================================*/
+   /* If a floating point number was in the argument list, */
+   /* then return a float, otherwise return an integer.    */
+   /*======================================================*/
+
+   if (useFloatTotal)
+     { returnValue->floatValue = CreateFloat(theEnv,ftotal); }
+   else
+     { returnValue->integerValue = CreateInteger(theEnv,ltotal); }
+  }
+
+/***********************************/
+/* DivisionFunction:  CLIPS access */
+/*   routine for the / function.   */
+/***********************************/
+void DivisionFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double ftotal = 1.0;
+   double theNumber;
+   UDFValue theArg;
+
+   /*===================================================*/
+   /* Get the first argument. This number which will be */
+   /* the starting product from which all subsequent    */
+   /* arguments will divide. If the auto float dividend */
+   /* feature is enable, then this number is converted  */
+   /* to a float if it is an integer.                   */
+   /*===================================================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&theArg))
+     { return; }
+
+   ftotal = CVCoerceToFloat(&theArg);
+
+   /*====================================================*/
+   /* Loop through each of the arguments dividing it     */
+   /* into a running product. If a floating point number */
+   /* is encountered, then do all subsequent operations  */
+   /* using floating point values. Each argument is      */
+   /* checked to prevent a divide by zero error.         */
+   /*====================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&theArg))
+        { return; }
+
+      theNumber = CVCoerceToFloat(&theArg);
+
+      if (theNumber == 0.0)
+        {
+         DivideByZeroErrorMessage(theEnv,"/");
+         SetEvaluationError(theEnv,true);
+         returnValue->floatValue = CreateFloat(theEnv,1.0);
+         return;
+        }
+
+      ftotal /= theNumber;
+     }
+
+   /*======================================================*/
+   /* If a floating point number was in the argument list, */
+   /* then return a float, otherwise return an integer.    */
+   /*======================================================*/
+
+   returnValue->floatValue = CreateFloat(theEnv,ftotal);
+  }
+
+/*************************************/
+/* DivFunction: H/L access routine   */
+/*   for the div function.           */
+/*************************************/
+void DivFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   long long total = 1LL;
+   UDFValue theArg;
+   long long theNumber;
+
+   /*===================================================*/
+   /* Get the first argument. This number which will be */
+   /* the starting product from which all subsequent    */
+   /* arguments will divide.                            */
+   /*===================================================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&theArg))
+     { return; }
+   total = CVCoerceToInteger(&theArg);
+
+   /*=====================================================*/
+   /* Loop through each of the arguments dividing it into */
+   /* a running product. Floats are converted to integers */
+   /* and each argument is checked to prevent a divide by */
+   /* zero error.                                         */
+   /*=====================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&theArg))
+        { return; }
+
+      theNumber = CVCoerceToInteger(&theArg);
+
+      if (theNumber == 0LL)
+        {
+         DivideByZeroErrorMessage(theEnv,"div");
+         SetEvaluationError(theEnv,true);
+         returnValue->integerValue = CreateInteger(theEnv,1L);
+         return;
+        }
+
+      if ((total == LLONG_MIN) && (theNumber == -1))
+        {
+         ArgumentOverUnderflowErrorMessage(theEnv,"div",true);
+         SetEvaluationError(theEnv,true);
+         returnValue->integerValue = CreateInteger(theEnv,1L);
+         return;
+        }
+      
+      total /= theNumber;
+     }
+
+   /*======================================================*/
+   /* The result of the div function is always an integer. */
+   /*======================================================*/
+
+   returnValue->integerValue = CreateInteger(theEnv,total);
+  }
+
+/*****************************************/
+/* IntegerFunction: H/L access routine   */
+/*   for the integer function.           */
+/*****************************************/
+void IntegerFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*======================================*/
+   /* Check that the argument is a number. */
+   /*======================================*/
+
+   if (! UDFNthArgument(context,1,NUMBER_BITS,returnValue))
+     { return; }
+
+   /*============================================*/
+   /* Convert a float type to integer, otherwise */
+   /* return the argument unchanged.             */
+   /*============================================*/
+
+   if (CVIsType(returnValue,FLOAT_BIT))
+     { returnValue->integerValue = CreateInteger(theEnv,CVCoerceToInteger(returnValue)); }
+  }
+
+/***************************************/
+/* FloatFunction: H/L access routine   */
+/*   for the float function.           */
+/***************************************/
+void FloatFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*======================================*/
+   /* Check that the argument is a number. */
+   /*======================================*/
+
+   if (! UDFNthArgument(context,1,NUMBER_BITS,returnValue))
+     { return; }
+
+   /*=============================================*/
+   /* Convert an integer type to float, otherwise */
+   /* return the argument unchanged.              */
+   /*=============================================*/
+
+   if (CVIsType(returnValue,INTEGER_BIT))
+     { returnValue->floatValue = CreateFloat(theEnv,CVCoerceToFloat(returnValue)); }
+  }
+
+/*************************************/
+/* AbsFunction: H/L access routine   */
+/*   for the abs function.           */
+/*************************************/
+void AbsFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*======================================*/
+   /* Check that the argument is a number. */
+   /*======================================*/
+
+   if (! UDFNthArgument(context,1,NUMBER_BITS,returnValue))
+     { return; }
+
+   /*==========================================*/
+   /* Return the absolute value of the number. */
+   /*==========================================*/
+
+   if (CVIsType(returnValue,INTEGER_BIT))
+     {
+      long long lv = returnValue->integerValue->contents;
+      if (lv < 0L)
+        { returnValue->integerValue = CreateInteger(theEnv,-lv); }
+     }
+   else
+     {
+      double dv = returnValue->floatValue->contents;
+      if (dv < 0.0)
+        { returnValue->floatValue = CreateFloat(theEnv,-dv); }
+     }
+  }
+
+/*************************************/
+/* MinFunction: H/L access routine   */
+/*   for the min function.           */
+/*************************************/
+void MinFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue nextPossible;
+
+   /*============================================*/
+   /* Check that the first argument is a number. */
+   /*============================================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,returnValue))
+     { return; }
+
+   /*===========================================================*/
+   /* Loop through the remaining arguments, first checking each */
+   /* argument to see that it is a number, and then determining */
+   /* if the argument is less than the previous arguments and   */
+   /* is thus the minimum value.                                */
+   /*===========================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&nextPossible))
+        { return; }
+
+      /*=============================================*/
+      /* If either argument is a float, convert both */
+      /* to floats. Otherwise compare two integers.  */
+      /*=============================================*/
+
+      if (CVIsType(returnValue,FLOAT_BIT) || CVIsType(&nextPossible,FLOAT_BIT))
+        {
+         if (CVCoerceToFloat(returnValue) > CVCoerceToFloat(&nextPossible))
+           { returnValue->value = nextPossible.value; }
+        }
+      else
+        {
+         if (returnValue->integerValue->contents > nextPossible.integerValue->contents)
+           { returnValue->value = nextPossible.value; }
+        }
+     }
+  }
+
+/*************************************/
+/* MaxFunction: H/L access routine   */
+/*   for the max function.           */
+/*************************************/
+void MaxFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue nextPossible;
+
+   /*============================================*/
+   /* Check that the first argument is a number. */
+   /*============================================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,returnValue))
+     { return; }
+
+   /*===========================================================*/
+   /* Loop through the remaining arguments, first checking each */
+   /* argument to see that it is a number, and then determining */
+   /* if the argument is greater than the previous arguments    */
+   /* and is thus the maximum value.                            */
+   /*===========================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&nextPossible))
+        { return; }
+
+      /*=============================================*/
+      /* If either argument is a float, convert both */
+      /* to floats. Otherwise compare two integers.  */
+      /*=============================================*/
+
+      if (CVIsType(returnValue,FLOAT_BIT) || CVIsType(&nextPossible,FLOAT_BIT))
+        {
+         if (CVCoerceToFloat(returnValue) < CVCoerceToFloat(&nextPossible))
+           { returnValue->value = nextPossible.value; }
+        }
+      else
+        {
+         if (returnValue->integerValue->contents < nextPossible.integerValue->contents)
+           { returnValue->value = nextPossible.value; }
+        }
+     }
+  }
+
diff --git a/clips/bmathfun.h b/clips/bmathfun.h
new file mode 100755
index 000000000..649c75fa6
--- /dev/null
+++ b/clips/bmathfun.h
@@ -0,0 +1,66 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*             BASIC MATH FUNCTIONS MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Auto-float-dividend always enabled.            */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_bmathfun
+
+#pragma once
+
+#define _H_bmathfun
+
+#include "evaluatn.h"
+
+   void                    BasicMathFunctionDefinitions(Environment *);
+   void                    AdditionFunction(Environment *,UDFContext *,UDFValue *);
+   void                    MultiplicationFunction(Environment *,UDFContext *,UDFValue *);
+   void                    SubtractionFunction(Environment *,UDFContext *,UDFValue *);
+   void                    DivisionFunction(Environment *,UDFContext *,UDFValue *);
+   void                    DivFunction(Environment *,UDFContext *,UDFValue *);
+   void                    IntegerFunction(Environment *,UDFContext *,UDFValue *);
+   void                    FloatFunction(Environment *,UDFContext *,UDFValue *);
+   void                    AbsFunction(Environment *,UDFContext *,UDFValue *);
+   void                    MinFunction(Environment *,UDFContext *,UDFValue *);
+   void                    MaxFunction(Environment *,UDFContext *,UDFValue *);
+
+#endif
+
+
+
+
diff --git a/clips/bsave.c b/clips/bsave.c
new file mode 100755
index 000000000..0fa5af32b
--- /dev/null
+++ b/clips/bsave.c
@@ -0,0 +1,634 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/04/17             */
+   /*                                                     */
+   /*                     BSAVE MODULE                    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides core routines for saving constructs to  */
+/*   a binary file.                                          */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Used genstrncpy instead of strncpy.            */
+/*                                                           */
+/*            Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.31: Data sizes written to binary files for         */
+/*            validation when loaded.                        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "bload.h"
+#include "cstrnbin.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "moduldef.h"
+#include "prntutil.h"
+#include "router.h"
+#include "symblbin.h"
+
+#include "bsave.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                        FindNeededItems(Environment *);
+   static void                        InitializeFunctionNeededFlags(Environment *);
+   static void                        WriteNeededFunctions(Environment *,FILE *);
+   static size_t                      FunctionBinarySize(Environment *);
+   static void                        WriteBinaryHeader(Environment *,FILE *);
+   static void                        WriteBinaryFooter(Environment *,FILE *);
+#endif
+   static void                        DeallocateBsaveData(Environment *);
+
+/**********************************************/
+/* InitializeBsaveData: Allocates environment */
+/*    data for the bsave command.             */
+/**********************************************/
+void InitializeBsaveData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,BSAVE_DATA,sizeof(struct bsaveData),DeallocateBsaveData);
+  }
+
+/************************************************/
+/* DeallocateBsaveData: Deallocates environment */
+/*    data for the bsave command.               */
+/************************************************/
+static void DeallocateBsaveData(
+  Environment *theEnv)
+  {
+   struct BinaryItem *tmpPtr, *nextPtr;
+
+   tmpPtr = BsaveData(theEnv)->ListOfBinaryItems;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      rtn_struct(theEnv,BinaryItem,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/**************************************/
+/* BsaveCommand: H/L access routine   */
+/*   for the bsave command.           */
+/**************************************/
+void BsaveCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if (! RUN_TIME) && BLOAD_AND_BSAVE
+   const char *fileName;
+
+   fileName = GetFileName(context);
+   if (fileName != NULL)
+     {
+      if (Bsave(theEnv,fileName))
+        {
+         returnValue->lexemeValue = TrueSymbol(theEnv);
+         return;
+        }
+     }
+#else
+#if MAC_XCD
+#pragma unused(theEnv,context)
+#endif
+#endif
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+  }
+
+#if BLOAD_AND_BSAVE
+
+/****************************/
+/* Bsave: C access routine  */
+/*   for the bsave command. */
+/****************************/
+bool Bsave(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   FILE *fp;
+   struct BinaryItem *biPtr;
+   char constructBuffer[CONSTRUCT_HEADER_SIZE];
+   unsigned long saveExpressionCount;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*===================================*/
+   /* A bsave can't occur when a binary */
+   /* image is already loaded.          */
+   /*===================================*/
+
+   if (Bloaded(theEnv))
+     {
+      PrintErrorID(theEnv,"BSAVE",1,false);
+      WriteString(theEnv,STDERR,
+          "Cannot perform a binary save while a binary load is in effect.\n");
+      return false;
+     }
+
+   /*================*/
+   /* Open the file. */
+   /*================*/
+
+   if ((fp = GenOpen(theEnv,fileName,"wb")) == NULL)
+     {
+      OpenErrorMessage(theEnv,"bsave",fileName);
+      return false;
+     }
+
+   /*==============================*/
+   /* Remember the current module. */
+   /*==============================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*==================================*/
+   /* Write binary header to the file. */
+   /*==================================*/
+
+   WriteBinaryHeader(theEnv,fp);
+
+   /*===========================================*/
+   /* Initialize count variables, index values, */
+   /* and determine some of the data structures */
+   /* which need to be saved.                   */
+   /*===========================================*/
+
+   ExpressionData(theEnv)->ExpressionCount = 0;
+   InitializeFunctionNeededFlags(theEnv);
+   InitAtomicValueNeededFlags(theEnv);
+   FindHashedExpressions(theEnv);
+   FindNeededItems(theEnv);
+   SetAtomicValueIndices(theEnv,false);
+
+   /*===============================*/
+   /* Save the functions and atoms. */
+   /*===============================*/
+
+   WriteNeededFunctions(theEnv,fp);
+   WriteNeededAtomicValues(theEnv,fp);
+
+   /*=========================================*/
+   /* Write out the number of expression data */
+   /* structures in the binary image.         */
+   /*=========================================*/
+
+   GenWrite(&ExpressionData(theEnv)->ExpressionCount,sizeof(unsigned long),fp);
+
+   /*===========================================*/
+   /* Save the numbers indicating the amount of */
+   /* memory needed to bload the constructs.    */
+   /*===========================================*/
+
+   for (biPtr = BsaveData(theEnv)->ListOfBinaryItems;
+        biPtr != NULL;
+        biPtr = biPtr->next)
+     {
+      if (biPtr->bsaveStorageFunction != NULL)
+        {
+         genstrncpy(constructBuffer,biPtr->name,CONSTRUCT_HEADER_SIZE);
+         GenWrite(constructBuffer,CONSTRUCT_HEADER_SIZE,fp);
+         (*biPtr->bsaveStorageFunction)(theEnv,fp);
+        }
+     }
+
+   /*====================================*/
+   /* Write a binary footer to the file. */
+   /*====================================*/
+
+   WriteBinaryFooter(theEnv,fp);
+
+   /*===================*/
+   /* Save expressions. */
+   /*===================*/
+
+   ExpressionData(theEnv)->ExpressionCount = 0;
+   BsaveHashedExpressions(theEnv,fp);
+   saveExpressionCount = ExpressionData(theEnv)->ExpressionCount;
+   BsaveConstructExpressions(theEnv,fp);
+   ExpressionData(theEnv)->ExpressionCount = saveExpressionCount;
+
+   /*===================*/
+   /* Save constraints. */
+   /*===================*/
+
+   WriteNeededConstraints(theEnv,fp);
+
+   /*==================*/
+   /* Save constructs. */
+   /*==================*/
+
+   for (biPtr = BsaveData(theEnv)->ListOfBinaryItems;
+        biPtr != NULL;
+        biPtr = biPtr->next)
+     {
+      if (biPtr->bsaveFunction != NULL)
+        {
+         genstrncpy(constructBuffer,biPtr->name,CONSTRUCT_HEADER_SIZE);
+         GenWrite(constructBuffer,CONSTRUCT_HEADER_SIZE,fp);
+         (*biPtr->bsaveFunction)(theEnv,fp);
+        }
+     }
+
+   /*===================================*/
+   /* Save a binary footer to the file. */
+   /*===================================*/
+
+   WriteBinaryFooter(theEnv,fp);
+
+   /*===========*/
+   /* Clean up. */
+   /*===========*/
+
+   RestoreAtomicValueBuckets(theEnv);
+
+   /*=================*/
+   /* Close the file. */
+   /*=================*/
+
+   GenClose(theEnv,fp);
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+
+   /*==================================*/
+   /* Return true to indicate success. */
+   /*==================================*/
+
+   return true;
+  }
+
+/*********************************************/
+/* InitializeFunctionNeededFlags: Marks each */
+/*   function in the list of functions as    */
+/*   being unneeded by this binary image.    */
+/*********************************************/
+static void InitializeFunctionNeededFlags(
+  Environment *theEnv)
+  {
+   struct functionDefinition *functionList;
+
+   for (functionList = GetFunctionList(theEnv);
+        functionList != NULL;
+        functionList = functionList->next)
+     { functionList->neededFunction = false; }
+  }
+
+/**********************************************************/
+/* FindNeededItems: Searches through the constructs for   */
+/*   the functions, constraints, or atoms that are needed */
+/*   by that construct. This routine also counts the      */
+/*   number of expressions in use (through a global).     */
+/**********************************************************/
+static void FindNeededItems(
+  Environment *theEnv)
+  {
+   struct BinaryItem *biPtr;
+
+   for (biPtr = BsaveData(theEnv)->ListOfBinaryItems;
+        biPtr != NULL;
+        biPtr = biPtr->next)
+     { if (biPtr->findFunction != NULL) (*biPtr->findFunction)(theEnv); }
+  }
+
+/****************************************************/
+/* WriteNeededFunctions: Writes the names of needed */
+/*   functions to the binary save file.             */
+/****************************************************/
+static void WriteNeededFunctions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   unsigned long count = 0;
+   size_t space, length;
+   struct functionDefinition *functionList;
+
+   /*================================================*/
+   /* Assign each function an index if it is needed. */
+   /*================================================*/
+
+   for (functionList = GetFunctionList(theEnv);
+        functionList != NULL;
+        functionList = functionList->next)
+     {
+      if (functionList->neededFunction)
+        { functionList->bsaveIndex = count++; }
+      else
+        { functionList->bsaveIndex = ULONG_MAX; }
+     }
+
+   /*===================================================*/
+   /* Write the number of function names to be written. */
+   /*===================================================*/
+
+   GenWrite(&count,sizeof(unsigned long),fp);
+   if (count == 0)
+     {
+      GenWrite(&count,sizeof(unsigned long),fp);
+      return;
+     }
+
+   /*================================*/
+   /* Determine the amount of space  */
+   /* needed for the function names. */
+   /*================================*/
+
+   space = FunctionBinarySize(theEnv);
+   GenWrite(&space,sizeof(unsigned long),fp);
+
+   /*===============================*/
+   /* Write out the function names. */
+   /*===============================*/
+
+   for (functionList = GetFunctionList(theEnv);
+        functionList != NULL;
+        functionList = functionList->next)
+     {
+      if (functionList->neededFunction)
+        {
+         length = strlen(functionList->callFunctionName->contents) + 1;
+         GenWrite((void *) functionList->callFunctionName->contents,length,fp);
+        }
+     }
+  }
+
+/*********************************************/
+/* FunctionBinarySize: Determines the number */
+/*   of bytes needed to save all of the      */
+/*   function names in the binary save file. */
+/*********************************************/
+static size_t FunctionBinarySize(
+  Environment *theEnv)
+  {
+   size_t size = 0;
+   struct functionDefinition *functionList;
+
+   for (functionList = GetFunctionList(theEnv);
+        functionList != NULL;
+        functionList = functionList->next)
+     {
+      if (functionList->neededFunction)
+        { size += strlen(functionList->callFunctionName->contents) + 1; }
+     }
+
+   return(size);
+  }
+
+/***************************************************/
+/* SaveBloadCount: Used to save the data structure */
+/*   count values when a binary save command is    */
+/*   issued when a binary image is loaded.         */
+/***************************************************/
+void SaveBloadCount(
+  Environment *theEnv,
+  unsigned long cnt)
+  {
+   BLOADCNTSV *tmp, *prv;
+
+   tmp = get_struct(theEnv,bloadcntsv);
+   tmp->val = cnt;
+   tmp->nxt = NULL;
+
+   if (BsaveData(theEnv)->BloadCountSaveTop == NULL)
+     { BsaveData(theEnv)->BloadCountSaveTop = tmp; }
+   else
+     {
+      prv = BsaveData(theEnv)->BloadCountSaveTop;
+      while (prv->nxt != NULL)
+        { prv = prv->nxt; }
+      prv->nxt = tmp;
+     }
+  }
+
+/**************************************************/
+/* RestoreBloadCount: Restores the data structure */
+/*   count values after a binary save command is  */
+/*   completed when a binary image is loaded.     */
+/**************************************************/
+void RestoreBloadCount(
+  Environment *theEnv,
+  unsigned long *cnt)
+  {
+   BLOADCNTSV *tmp;
+
+   *cnt = BsaveData(theEnv)->BloadCountSaveTop->val;
+   tmp = BsaveData(theEnv)->BloadCountSaveTop;
+   BsaveData(theEnv)->BloadCountSaveTop = BsaveData(theEnv)->BloadCountSaveTop->nxt;
+   rtn_struct(theEnv,bloadcntsv,tmp);
+  }
+
+/**********************************************/
+/* MarkNeededItems: Examines an expression to */
+/*   determine which items are needed to save */
+/*   an expression as part of a binary image. */
+/**********************************************/
+void MarkNeededItems(
+  Environment *theEnv,
+  struct expr *testPtr)
+  {
+   while (testPtr != NULL)
+     {
+      switch (testPtr->type)
+        {
+         case SYMBOL_TYPE:
+         case STRING_TYPE:
+         case GBL_VARIABLE:
+         case INSTANCE_NAME_TYPE:
+            testPtr->lexemeValue->neededSymbol = true;
+            break;
+
+         case FLOAT_TYPE:
+            testPtr->floatValue->neededFloat = true;
+            break;
+
+         case INTEGER_TYPE:
+            testPtr->integerValue->neededInteger = true;
+            break;
+
+         case FCALL:
+            testPtr->functionValue->neededFunction = true;
+            break;
+
+         case VOID_TYPE:
+           break;
+
+         default:
+           if (EvaluationData(theEnv)->PrimitivesArray[testPtr->type] == NULL) break;
+           if (EvaluationData(theEnv)->PrimitivesArray[testPtr->type]->bitMap)
+             { ((CLIPSBitMap *) testPtr->value)->neededBitMap = true; }
+           break;
+
+        }
+
+      if (testPtr->argList != NULL)
+        { MarkNeededItems(theEnv,testPtr->argList); }
+
+      testPtr = testPtr->nextArg;
+     }
+  }
+
+/******************************************************/
+/* WriteBinaryHeader: Writes a binary header used for */
+/*   verification when a binary image is loaded.      */
+/******************************************************/
+static void WriteBinaryHeader(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   GenWrite((void *) BloadData(theEnv)->BinaryPrefixID,strlen(BloadData(theEnv)->BinaryPrefixID) + 1,fp);
+   GenWrite((void *) BloadData(theEnv)->BinaryVersionID,strlen(BloadData(theEnv)->BinaryVersionID) + 1,fp);
+   GenWrite((void *) BloadData(theEnv)->BinarySizes,strlen(BloadData(theEnv)->BinarySizes) + 1,fp);
+  }
+
+/******************************************************/
+/* WriteBinaryFooter: Writes a binary footer used for */
+/*   verification when a binary image is loaded.      */
+/******************************************************/
+static void WriteBinaryFooter(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   char footerBuffer[CONSTRUCT_HEADER_SIZE];
+
+   genstrncpy(footerBuffer,BloadData(theEnv)->BinaryPrefixID,CONSTRUCT_HEADER_SIZE);
+   GenWrite(footerBuffer,CONSTRUCT_HEADER_SIZE,fp);
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+
+/**********************************************************/
+/* AddBinaryItem: Informs the bload/bsave commands of the */
+/*   appropriate access functions needed to save/load the */
+/*   data structures of a construct or other "item" to a  */
+/*   binary file.                                         */
+/**********************************************************/
+bool AddBinaryItem(
+  Environment *theEnv,
+  const char *name,
+  int priority,
+  void (*findFunction)(Environment *),
+  void (*expressionFunction)(Environment *,FILE *),
+  void (*bsaveStorageFunction)(Environment *,FILE *),
+  void (*bsaveFunction)(Environment *,FILE *),
+  void (*bloadStorageFunction)(Environment *),
+  void (*bloadFunction)(Environment *),
+  void (*clearFunction)(Environment *))
+  {
+   struct BinaryItem *newPtr, *currentPtr, *lastPtr = NULL;
+
+   /*========================================*/
+   /* Create the binary item data structure. */
+   /*========================================*/
+
+   newPtr = get_struct(theEnv,BinaryItem);
+
+   newPtr->name = name;
+   newPtr->findFunction = findFunction;
+   newPtr->expressionFunction = expressionFunction;
+   newPtr->bsaveStorageFunction = bsaveStorageFunction;
+   newPtr->bsaveFunction = bsaveFunction;
+   newPtr->bloadStorageFunction = bloadStorageFunction;
+   newPtr->bloadFunction = bloadFunction;
+   newPtr->clearFunction = clearFunction;
+   newPtr->priority = priority;
+
+   /*=================================*/
+   /* If no binary items are defined, */
+   /* just put the item on the list.  */
+   /*=================================*/
+
+   if (BsaveData(theEnv)->ListOfBinaryItems == NULL)
+     {
+      newPtr->next = NULL;
+      BsaveData(theEnv)->ListOfBinaryItems = newPtr;
+      return true;
+     }
+
+   /*=========================================*/
+   /* Otherwise, place the binary item at the */
+   /* appropriate place in the list of binary */
+   /* items based on its priority.            */
+   /*=========================================*/
+
+   currentPtr = BsaveData(theEnv)->ListOfBinaryItems;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = BsaveData(theEnv)->ListOfBinaryItems;
+      BsaveData(theEnv)->ListOfBinaryItems = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   /*==================================*/
+   /* Return true to indicate the item */
+   /* was successfully added.          */
+   /*==================================*/
+
+   return true;
+  }
+
+#endif /* BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE */
+
+
+
+
diff --git a/clips/bsave.h b/clips/bsave.h
new file mode 100755
index 000000000..b9c530211
--- /dev/null
+++ b/clips/bsave.h
@@ -0,0 +1,130 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                 BSAVE HEADER FILE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Used genstrncpy instead of strncpy.            */
+/*                                                           */
+/*            Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_bsave
+
+#pragma once
+
+#define _H_bsave
+
+struct BinaryItem;
+
+#include <stdio.h>
+
+#include "expressn.h"
+
+struct BinaryItem
+  {
+   const char *name;
+   void (*findFunction)(Environment *);
+   void (*bloadStorageFunction)(Environment *);
+   void (*bloadFunction)(Environment *);
+   void (*clearFunction)(Environment *);
+   void (*expressionFunction)(Environment *,FILE *);
+   void (*bsaveStorageFunction)(Environment *,FILE *);
+   void (*bsaveFunction)(Environment *,FILE *);
+   int priority;
+   struct BinaryItem *next;
+  };
+
+#if BLOAD_AND_BSAVE
+typedef struct bloadcntsv
+  {
+   unsigned long val;
+   struct bloadcntsv *nxt;
+  } BLOADCNTSV;
+#endif
+
+typedef struct bsave_expr
+  {
+   unsigned short type;
+   unsigned long value;
+   unsigned long arg_list;
+   unsigned long next_arg;
+  } BSAVE_EXPRESSION;
+
+#define CONSTRUCT_HEADER_SIZE 20
+
+#define BSAVE_DATA 39
+
+struct bsaveData
+  {
+   struct BinaryItem *ListOfBinaryItems;
+#if BLOAD_AND_BSAVE
+   BLOADCNTSV *BloadCountSaveTop;
+#endif
+  };
+
+#define BsaveData(theEnv) ((struct bsaveData *) GetEnvironmentData(theEnv,BSAVE_DATA))
+
+   void                    InitializeBsaveData(Environment *);
+   void                    BsaveCommand(Environment *,UDFContext *,UDFValue *);
+#if BLOAD_AND_BSAVE
+   bool                    Bsave(Environment *,const char *);
+   void                    MarkNeededItems(Environment *,struct expr *);
+   void                    SaveBloadCount(Environment *,unsigned long);
+   void                    RestoreBloadCount(Environment *,unsigned long *);
+#endif
+   bool                    AddBinaryItem(Environment *,const char *,int,
+                                         void (*)(Environment *),
+                                         void (*)(Environment *,FILE *),
+                                         void (*)(Environment *,FILE *),
+                                         void (*)(Environment *,FILE *),
+                                         void (*)(Environment *),
+                                         void (*)(Environment *),
+                                         void (*)(Environment *));
+
+
+#endif /* _H_bsave */
+
+
+
+
+
+
+
diff --git a/clips/classcom.c b/clips/classcom.c
new file mode 100755
index 000000000..c46e4d51a
--- /dev/null
+++ b/clips/classcom.c
@@ -0,0 +1,976 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*                  CLASS COMMANDS MODULE              */
+   /*******************************************************/
+
+/**************************************************************/
+/* Purpose: Kernel Interface Commands for Object System       */
+/*                                                            */
+/* Principal Programmer(s):                                   */
+/*      Brian L. Dantes                                       */
+/*                                                            */
+/* Contributing Programmer(s):                                */
+/*                                                            */
+/* Revision History:                                          */
+/*                                                            */
+/*      6.23: Corrected compilation errors for files          */
+/*            generated by constructs-to-c. DR0861            */
+/*                                                            */
+/*            Changed name of variable log to logName         */
+/*            because of Unix compiler warnings of shadowed   */
+/*            definitions.                                    */
+/*                                                            */
+/*      6.24: Renamed BOOLEAN macro type to intBool.          */
+/*                                                            */
+/*            Added pragmas to remove compilation warnings.   */
+/*                                                            */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior  */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.     */
+/*                                                            */
+/*            Added const qualifiers to remove C++            */
+/*            deprecation warnings.                           */
+/*                                                            */
+/*            Converted API macros to function calls.         */
+/*                                                            */
+/*            Changed find construct functionality so that    */
+/*            imported modules are search when locating a     */
+/*            named construct.                                */
+/*                                                            */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+
+#include <string.h>
+
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#include "argacces.h"
+#include "classfun.h"
+#include "classini.h"
+#include "envrnmnt.h"
+#include "modulutl.h"
+#include "msgcom.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "classcom.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! BLOAD_ONLY) && (! RUN_TIME) && DEBUGGING_FUNCTIONS
+   static void                    SaveDefclass(Environment *,ConstructHeader *,void *);
+#endif
+   static const char             *GetClassDefaultsModeName(unsigned short);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*******************************************************************
+  NAME         : FindDefclass
+  DESCRIPTION  : Looks up a specified class in the class hash table
+                 (Only looks in current or specified module)
+  INPUTS       : The name-string of the class (including module)
+  RETURNS      : The address of the found class, NULL otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ******************************************************************/
+Defclass *FindDefclass( // TBD Needs to look in imported
+  Environment *theEnv,
+  const char *classAndModuleName)
+  {
+   CLIPSLexeme *classSymbol = NULL;
+   Defclass *cls;
+   Defmodule *theModule = NULL;
+   const char *className;
+
+   SaveCurrentModule(theEnv);
+
+   className = ExtractModuleAndConstructName(theEnv,classAndModuleName);
+   if (className != NULL)
+     {
+      classSymbol = FindSymbolHN(theEnv,ExtractModuleAndConstructName(theEnv,classAndModuleName),SYMBOL_BIT);
+      theModule = GetCurrentModule(theEnv);
+     }
+
+   RestoreCurrentModule(theEnv);
+
+   if (classSymbol == NULL)
+     { return NULL; }
+
+   cls = DefclassData(theEnv)->ClassTable[HashClass(classSymbol)];
+   while (cls != NULL)
+     {
+      if (cls->header.name == classSymbol)
+        {
+         if (cls->system || (cls->header.whichModule->theModule == theModule))
+           { return cls->installed ? cls : NULL; }
+        }
+      cls = cls->nxtHash;
+     }
+
+   return NULL;
+  }
+
+/*******************************************************************
+  NAME         : FindDefclassInModule
+  DESCRIPTION  : Looks up a specified class in the class hash table
+                 (Only looks in current or specified module)
+  INPUTS       : The name-string of the class (including module)
+  RETURNS      : The address of the found class, NULL otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ******************************************************************/
+Defclass *FindDefclassInModule(
+  Environment *theEnv,
+  const char *classAndModuleName)
+  {
+   CLIPSLexeme *classSymbol = NULL;
+   Defclass *cls;
+   Defmodule *theModule = NULL;
+   const char *className;
+
+   SaveCurrentModule(theEnv);
+   className = ExtractModuleAndConstructName(theEnv,classAndModuleName);
+   if (className != NULL)
+     {
+      classSymbol = FindSymbolHN(theEnv,ExtractModuleAndConstructName(theEnv,classAndModuleName),SYMBOL_BIT);
+      theModule = GetCurrentModule(theEnv);
+     }
+   RestoreCurrentModule(theEnv);
+
+   if (classSymbol == NULL)
+     { return NULL; }
+
+   cls = DefclassData(theEnv)->ClassTable[HashClass(classSymbol)];
+   while (cls != NULL)
+     {
+      if (cls->header.name == classSymbol)
+        {
+         if (cls->system || (cls->header.whichModule->theModule == theModule))
+           { return cls->installed ? cls : NULL; }
+        }
+      cls = cls->nxtHash;
+     }
+
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : LookupDefclassByMdlOrScope
+  DESCRIPTION  : Finds a class anywhere (if module
+                 is specified) or in current or
+                 imported modules
+  INPUTS       : The class name
+  RETURNS      : The class (NULL if not found)
+  SIDE EFFECTS : Error message printed on
+                  ambiguous references
+  NOTES        : Assumes no two classes of the same
+                 name are ever in the same scope
+ ***************************************************/
+Defclass *LookupDefclassByMdlOrScope(
+  Environment *theEnv,
+  const char *classAndModuleName)
+  {
+   Defclass *cls;
+   const char *className;
+   CLIPSLexeme *classSymbol;
+   Defmodule *theModule;
+
+   if (FindModuleSeparator(classAndModuleName) == 0)
+     { return LookupDefclassInScope(theEnv,classAndModuleName); }
+
+   SaveCurrentModule(theEnv);
+   className = ExtractModuleAndConstructName(theEnv,classAndModuleName);
+   theModule = GetCurrentModule(theEnv);
+   RestoreCurrentModule(theEnv);
+
+   if (className == NULL)
+     { return NULL; }
+
+   if ((classSymbol = FindSymbolHN(theEnv,className,SYMBOL_BIT)) == NULL)
+     { return NULL; }
+
+   cls = DefclassData(theEnv)->ClassTable[HashClass(classSymbol)];
+   while (cls != NULL)
+     {
+      if ((cls->header.name == classSymbol) &&
+          (cls->header.whichModule->theModule == theModule))
+        return(cls->installed ? cls : NULL);
+      cls = cls->nxtHash;
+     }
+
+   return NULL;
+  }
+
+/****************************************************
+  NAME         : LookupDefclassInScope
+  DESCRIPTION  : Finds a class in current or imported
+                   modules (module specifier
+                   is not allowed)
+  INPUTS       : The class name
+  RETURNS      : The class (NULL if not found)
+  SIDE EFFECTS : Error message printed on
+                  ambiguous references
+  NOTES        : Assumes no two classes of the same
+                 name are ever in the same scope
+ ****************************************************/
+Defclass *LookupDefclassInScope(
+  Environment *theEnv,
+  const char *className)
+  {
+   Defclass *cls;
+   CLIPSLexeme *classSymbol;
+
+   if ((classSymbol = FindSymbolHN(theEnv,className,SYMBOL_BIT)) == NULL)
+     { return NULL; }
+
+   cls = DefclassData(theEnv)->ClassTable[HashClass(classSymbol)];
+   while (cls != NULL)
+     {
+      if ((cls->header.name == classSymbol) && DefclassInScope(theEnv,cls,NULL))
+        return cls->installed ? cls : NULL;
+      cls = cls->nxtHash;
+     }
+
+   return NULL;
+  }
+
+/******************************************************
+  NAME         : LookupDefclassAnywhere
+  DESCRIPTION  : Finds a class in specified
+                 (or any) module
+  INPUTS       : 1) The module (NULL if don't care)
+                 2) The class name (module specifier
+                    in name not allowed)
+  RETURNS      : The class (NULL if not found)
+  SIDE EFFECTS : None
+  NOTES        : Does *not* generate an error if
+                 multiple classes of the same name
+                 exist as do the other lookup functions
+ ******************************************************/
+Defclass *LookupDefclassAnywhere(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *className)
+  {
+   Defclass *cls;
+   CLIPSLexeme *classSymbol;
+
+   if ((classSymbol = FindSymbolHN(theEnv,className,SYMBOL_BIT)) == NULL)
+     { return NULL; }
+
+   cls = DefclassData(theEnv)->ClassTable[HashClass(classSymbol)];
+   while (cls != NULL)
+     {
+      if ((cls->header.name == classSymbol) &&
+          ((theModule == NULL) ||
+           (cls->header.whichModule->theModule == theModule)))
+        { return cls->installed ? cls : NULL; }
+      cls = cls->nxtHash;
+     }
+
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : DefclassInScope
+  DESCRIPTION  : Determines if a defclass is in
+                 scope of the given module
+  INPUTS       : 1) The defclass
+                 2) The module (NULL for current
+                    module)
+  RETURNS      : True if in scope,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool DefclassInScope(
+  Environment *theEnv,
+  Defclass *theDefclass,
+  Defmodule *theModule)
+  {
+#if DEFMODULE_CONSTRUCT
+   unsigned long moduleID;
+   char *scopeMap;
+
+   scopeMap = (char *) theDefclass->scopeMap->contents;
+   if (theModule == NULL)
+     { theModule = GetCurrentModule(theEnv); }
+   moduleID = theModule->header.bsaveID;
+
+   return TestBitMap(scopeMap,moduleID);
+#else
+#if MAC_XCD
+#pragma unused(theEnv,theDefclass,theModule)
+#endif
+   return true;
+#endif
+  }
+
+/***********************************************************
+  NAME         : GetNextDefclass
+  DESCRIPTION  : Finds first or next defclass
+  INPUTS       : The address of the current defclass
+  RETURNS      : The address of the next defclass
+                   (NULL if none)
+  SIDE EFFECTS : None
+  NOTES        : If ptr == NULL, the first defclass
+                    is returned.
+ ***********************************************************/
+Defclass *GetNextDefclass(
+  Environment *theEnv,
+  Defclass *theDefclass)
+  {
+   return (Defclass *) GetNextConstructItem(theEnv,&theDefclass->header,
+                                            DefclassData(theEnv)->DefclassModuleIndex);
+  }
+
+/***************************************************
+  NAME         : DefclassIsDeletable
+  DESCRIPTION  : Determines if a defclass
+                   can be deleted
+  INPUTS       : Address of the defclass
+  RETURNS      : True if deletable,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool DefclassIsDeletable(
+  Defclass *theDefclass)
+  {
+  Environment *theEnv = theDefclass->header.env;
+  
+  if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   if (theDefclass->system == 1)
+     { return false; }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   return (IsClassBeingUsed(theDefclass) == false) ? true : false;
+#else
+   return false;
+#endif
+  }
+
+/*************************************************************
+  NAME         : UndefclassCommand
+  DESCRIPTION  : Deletes a class and its subclasses, as
+                 well as their associated instances
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Syntax : (undefclass <class-name> | *)
+ *************************************************************/
+void UndefclassCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UndefconstructCommand(context,"undefclass",DefclassData(theEnv)->DefclassConstruct);
+  }
+
+/********************************************************
+  NAME         : Undefclass
+  DESCRIPTION  : Deletes the named defclass
+  INPUTS       : None
+  RETURNS      : True if deleted, or false
+  SIDE EFFECTS : Defclass and handlers removed
+  NOTES        : Interface for AddConstruct()
+ ********************************************************/
+bool Undefclass(
+  Defclass *theDefclass,
+  Environment *allEnv)
+  {   
+#if RUN_TIME || BLOAD_ONLY
+   return false;
+#else
+   Environment *theEnv;
+   bool success;
+   GCBlock gcb;
+   
+   if (theDefclass == NULL)
+     { theEnv = allEnv; }
+   else
+     { theEnv = theDefclass->header.env; }
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv))
+     return false;
+#endif
+
+   GCBlockStart(theEnv,&gcb);
+   if (theDefclass == NULL)
+     {
+      success = RemoveAllUserClasses(theEnv);
+      GCBlockEnd(theEnv,&gcb);
+      return success;
+     }
+
+   success = DeleteClassUAG(theEnv,theDefclass);
+   GCBlockEnd(theEnv,&gcb);
+   return success;
+#endif
+  }
+
+
+#if DEBUGGING_FUNCTIONS
+
+/*********************************************************
+  NAME         : PPDefclassCommand
+  DESCRIPTION  : Displays the pretty print form of
+                 a class to stdout.
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Syntax : (ppdefclass <class-name>)
+ *********************************************************/
+void PPDefclassCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PPConstructCommand(context,"ppdefclass",DefclassData(theEnv)->DefclassConstruct,returnValue);
+  }
+
+/***************************************************
+  NAME         : ListDefclassesCommand
+  DESCRIPTION  : Displays all defclass names
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass names printed
+  NOTES        : H/L Interface
+ ***************************************************/
+void ListDefclassesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListConstructCommand(context,DefclassData(theEnv)->DefclassConstruct);
+  }
+
+/***************************************************
+  NAME         : ListDefclasses
+  DESCRIPTION  : Displays all defclass names
+  INPUTS       : 1) The logical name of the output
+                 2) The module
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass names printed
+  NOTES        : C Interface
+ ***************************************************/
+void ListDefclasses(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListConstruct(theEnv,DefclassData(theEnv)->DefclassConstruct,logicalName,theModule);
+  }
+
+/*********************************************************
+  NAME         : DefclassGetWatchInstances
+  DESCRIPTION  : Determines if deletions/creations of
+                 instances of this class will generate
+                 trace messages or not
+  INPUTS       : A pointer to the class
+  RETURNS      : True if a trace is active,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************************/
+bool DefclassGetWatchInstances(
+  Defclass *theDefclass)
+  {
+   return theDefclass->traceInstances;
+  }
+
+/*********************************************************
+  NAME         : DefclassSetWatchInstances
+  DESCRIPTION  : Sets the trace to ON/OFF for the
+                 creation/deletion of instances
+                 of the class
+  INPUTS       : 1) true to set the trace on,
+                    false to set it off
+                 2) A pointer to the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Watch flag for the class set
+  NOTES        : None
+ *********************************************************/
+void DefclassSetWatchInstances(
+  Defclass *theDefclass,
+  bool newState)
+  {
+   if (theDefclass->abstract)
+     { return; }
+
+   theDefclass->traceInstances = newState;
+  }
+
+/*********************************************************
+  NAME         : DefclassGetWatchSlots
+  DESCRIPTION  : Determines if changes to slots of
+                 instances of this class will generate
+                 trace messages or not
+  INPUTS       : A pointer to the class
+  RETURNS      : True if a trace is active,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************************/
+bool DefclassGetWatchSlots(
+  Defclass *theDefclass)
+  {
+   return theDefclass->traceSlots;
+  }
+
+/**********************************************************
+  NAME         : SetDefclassWatchSlots
+  DESCRIPTION  : Sets the trace to ON/OFF for the
+                 changes to slots of instances of the class
+  INPUTS       : 1) true to set the trace on,
+                    false to set it off
+                 2) A pointer to the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Watch flag for the class set
+  NOTES        : None
+ **********************************************************/
+void DefclassSetWatchSlots(
+  Defclass *theDefclass,
+  bool newState)
+  {
+   theDefclass->traceSlots = newState;
+  }
+
+/******************************************************************
+  NAME         : DefclassWatchAccess
+  DESCRIPTION  : Parses a list of class names passed by
+                 AddWatchItem() and sets the traces accordingly
+  INPUTS       : 1) A code indicating which trace flag is to be set
+                    0 - Watch instance creation/deletion
+                    1 - Watch slot changes to instances
+                 2) The value to which to set the trace flags
+                 3) A list of expressions containing the names
+                    of the classes for which to set traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags set in specified classes
+  NOTES        : Accessory function for AddWatchItem()
+ ******************************************************************/
+bool DefclassWatchAccess(
+  Environment *theEnv,
+  int code,
+  bool newState,
+  Expression *argExprs)
+  {
+   if (code)
+     return(ConstructSetWatchAccess(theEnv,DefclassData(theEnv)->DefclassConstruct,newState,argExprs,
+                                    (ConstructGetWatchFunction *) DefclassGetWatchSlots,
+                                    (ConstructSetWatchFunction *) DefclassSetWatchSlots));
+   else
+     return(ConstructSetWatchAccess(theEnv,DefclassData(theEnv)->DefclassConstruct,newState,argExprs,
+                                    (ConstructGetWatchFunction *) DefclassGetWatchInstances,
+                                    (ConstructSetWatchFunction *) DefclassSetWatchInstances));
+  }
+
+/***********************************************************************
+  NAME         : DefclassWatchPrint
+  DESCRIPTION  : Parses a list of class names passed by
+                 AddWatchItem() and displays the traces accordingly
+  INPUTS       : 1) The logical name of the output
+                 2) A code indicating which trace flag is to be examined
+                    0 - Watch instance creation/deletion
+                    1 - Watch slot changes to instances
+                 3) A list of expressions containing the names
+                    of the classes for which to examine traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags displayed for specified classes
+  NOTES        : Accessory function for AddWatchItem()
+ ***********************************************************************/
+bool DefclassWatchPrint(
+  Environment *theEnv,
+  const char *logName,
+  int code,
+  Expression *argExprs)
+  {
+   if (code)
+     return(ConstructPrintWatchAccess(theEnv,DefclassData(theEnv)->DefclassConstruct,logName,argExprs,
+                                      (ConstructGetWatchFunction *) DefclassGetWatchSlots,
+                                      (ConstructSetWatchFunction *) DefclassSetWatchSlots));
+   else
+     return(ConstructPrintWatchAccess(theEnv,DefclassData(theEnv)->DefclassConstruct,logName,argExprs,
+                                      (ConstructGetWatchFunction *) DefclassGetWatchInstances,
+                                      (ConstructSetWatchFunction *) DefclassSetWatchInstances));
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/*********************************************************
+  NAME         : GetDefclassListFunction
+  DESCRIPTION  : Groups names of all defclasses into
+                   a multifield variable
+  INPUTS       : A data object buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield set to list of classes
+  NOTES        : None
+ *********************************************************/
+void GetDefclassListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   GetConstructListFunction(context,returnValue,DefclassData(theEnv)->DefclassConstruct);
+  }
+
+/***************************************************************
+  NAME         : GetDefclassList
+  DESCRIPTION  : Groups all defclass names into
+                 a multifield list
+  INPUTS       : 1) A data object buffer to hold
+                    the multifield result
+                 2) The module from which to obtain defclasses
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield allocated and filled
+  NOTES        : External C access
+ ***************************************************************/
+void GetDefclassList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defmodule *theModule)
+  {
+   UDFValue result;
+   
+   GetConstructList(theEnv,&result,DefclassData(theEnv)->DefclassConstruct,theModule);
+   NormalizeMultifield(theEnv,&result);
+   returnValue->value = result.value;
+  }
+
+/*****************************************************
+  NAME         : HasSuperclass
+  DESCRIPTION  : Determines if class-2 is a superclass
+                   of class-1
+  INPUTS       : 1) Class-1
+                 2) Class-2
+  RETURNS      : True if class-2 is a superclass of
+                   class-1, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+bool HasSuperclass(
+  Defclass *c1,
+  Defclass *c2)
+  {
+   unsigned long i;
+
+   for (i = 1 ; i < c1->allSuperclasses.classCount ; i++)
+     if (c1->allSuperclasses.classArray[i] == c2)
+       return true;
+   return false;
+  }
+
+/********************************************************************
+  NAME         : CheckClassAndSlot
+  DESCRIPTION  : Checks class and slot argument for various functions
+  INPUTS       : 1) Name of the calling function
+                 2) Buffer for class address
+  RETURNS      : Slot symbol, NULL on errors
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************************/
+CLIPSLexeme *CheckClassAndSlot(
+   UDFContext *context,
+   const char *func,
+   Defclass **cls)
+  {
+   UDFValue theArg;
+   Environment *theEnv = context->environment;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     return NULL;
+
+   *cls = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if (*cls == NULL)
+     {
+      ClassExistError(theEnv,func,theArg.lexemeValue->contents);
+      return NULL;
+     }
+
+   if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+     return NULL;
+
+   return theArg.lexemeValue;
+  }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/***************************************************
+  NAME         : SaveDefclasses
+  DESCRIPTION  : Prints pretty print form of
+                   defclasses to specified output
+  INPUTS       : The  logical name of the output
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void SaveDefclasses(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logName,
+  void *context)
+  {
+#if DEBUGGING_FUNCTIONS
+   DoForAllConstructsInModule(theEnv,theModule,SaveDefclass,
+                              DefclassData(theEnv)->DefclassModuleIndex,
+                              false,(void *) logName);
+#else
+#if MAC_XCD
+#pragma unused(theEnv,theModule,logName)
+#endif
+#endif
+  }
+
+#endif
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if (! BLOAD_ONLY) && (! RUN_TIME) && DEBUGGING_FUNCTIONS
+
+/***************************************************
+  NAME         : SaveDefclass
+  DESCRIPTION  : Writes out the pretty-print forms
+                 of a class and all its handlers
+  INPUTS       : 1) The class
+                 2) The logical name of the output
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Class and handlers written
+  NOTES        : None
+ ***************************************************/
+static void SaveDefclass(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *userBuffer)
+  {
+   const char *logName = (const char *) userBuffer;
+   Defclass *theDefclass = (Defclass *) theConstruct;
+   unsigned hnd;
+   const char *ppForm;
+
+   ppForm = DefclassPPForm(theDefclass);
+   if (ppForm != NULL)
+     {
+      WriteString(theEnv,logName,ppForm);
+      WriteString(theEnv,logName,"\n");
+      hnd = GetNextDefmessageHandler(theDefclass,0);
+      while (hnd != 0)
+        {
+         ppForm = DefmessageHandlerPPForm(theDefclass,hnd);
+         if (ppForm != NULL)
+           {
+            WriteString(theEnv,logName,ppForm);
+            WriteString(theEnv,logName,"\n");
+           }
+         hnd = GetNextDefmessageHandler(theDefclass,hnd);
+        }
+     }
+  }
+
+#endif
+
+/********************************************/
+/* SetClassDefaultsMode: Allows the setting */
+/*    of the class defaults mode.           */
+/********************************************/
+ClassDefaultsMode SetClassDefaultsMode(
+  Environment *theEnv,
+  ClassDefaultsMode value)
+  {
+   ClassDefaultsMode ov;
+
+   ov = DefclassData(theEnv)->ClassDefaultsModeValue;
+   DefclassData(theEnv)->ClassDefaultsModeValue = value;
+   return ov;
+  }
+
+/****************************************/
+/* GetClassDefaultsMode: Returns the    */
+/*    value of the class defaults mode. */
+/****************************************/
+ClassDefaultsMode GetClassDefaultsMode(
+  Environment *theEnv)
+  {
+   return DefclassData(theEnv)->ClassDefaultsModeValue;
+  }
+
+/***************************************************/
+/* GetClassDefaultsModeCommand: H/L access routine */
+/*   for the get-class-defaults-mode command.      */
+/***************************************************/
+void GetClassDefaultsModeCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateSymbol(theEnv,GetClassDefaultsModeName(GetClassDefaultsMode(theEnv)));
+  }
+
+/***************************************************/
+/* SetClassDefaultsModeCommand: H/L access routine */
+/*   for the set-class-defaults-mode command.      */
+/***************************************************/
+void SetClassDefaultsModeCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   const char *argument;
+   unsigned short oldMode;
+
+   oldMode = DefclassData(theEnv)->ClassDefaultsModeValue;
+
+   /*=====================================================*/
+   /* Check for the correct number and type of arguments. */
+   /*=====================================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   argument = theArg.lexemeValue->contents;
+
+   /*=============================================*/
+   /* Set the strategy to the specified strategy. */
+   /*=============================================*/
+
+   if (strcmp(argument,"conservation") == 0)
+     { SetClassDefaultsMode(theEnv,CONSERVATION_MODE); }
+   else if (strcmp(argument,"convenience") == 0)
+     { SetClassDefaultsMode(theEnv,CONVENIENCE_MODE); }
+   else
+     {
+      UDFInvalidArgumentMessage(context,"symbol with value conservation or convenience");
+      returnValue->lexemeValue = CreateSymbol(theEnv,GetClassDefaultsModeName(GetClassDefaultsMode(theEnv)));
+      return;
+     }
+
+   /*===================================*/
+   /* Return the old value of the mode. */
+   /*===================================*/
+
+   returnValue->lexemeValue = CreateSymbol(theEnv,GetClassDefaultsModeName(oldMode));
+  }
+
+/*******************************************************************/
+/* GetClassDefaultsModeName: Given the integer value corresponding */
+/*   to a specified class defaults mode, return a character string */
+/*   of the class defaults mode's name.                            */
+/*******************************************************************/
+static const char *GetClassDefaultsModeName(
+  unsigned short mode)
+  {
+   const char *sname;
+
+   switch (mode)
+     {
+      case CONSERVATION_MODE:
+        sname = "conservation";
+        break;
+      case CONVENIENCE_MODE:
+        sname = "convenience";
+        break;
+      default:
+        sname = "unknown";
+        break;
+     }
+
+   return(sname);
+  }
+
+/*#############################*/
+/* Additional Access Functions */
+/*#############################*/
+
+CLIPSLexeme *GetDefclassNamePointer(
+  Defclass *theClass)
+  {
+   return GetConstructNamePointer(&theClass->header);
+  }
+
+void SetNextDefclass(
+  Defclass *theClass,
+  Defclass *targetClass)
+  {
+   SetNextConstruct(&theClass->header,
+                    &targetClass->header);
+  }
+
+/*##################################*/
+/* Additional Environment Functions */
+/*##################################*/
+
+const char *DefclassName(
+  Defclass *theClass)
+  {
+   return GetConstructNameString(&theClass->header);
+  }
+
+const char *DefclassPPForm(
+  Defclass *theClass)
+  {
+   return GetConstructPPForm(&theClass->header);
+  }
+
+struct defmoduleItemHeader *GetDefclassModule(
+  Environment *theEnv,
+  Defclass *theClass)
+  {
+   return GetConstructModuleItem(&theClass->header);
+  }
+
+const char *DefclassModule(
+  Defclass *theClass)
+  {
+   return GetConstructModuleName(&theClass->header);
+  }
+
+void SetDefclassPPForm(
+  Environment *theEnv,
+  Defclass *theClass,
+  char *thePPForm)
+  {
+   SetConstructPPForm(theEnv,&theClass->header,thePPForm);
+  }
+
+#endif /* OBJECT_SYSTEM */
diff --git a/clips/classcom.h b/clips/classcom.h
new file mode 100755
index 000000000..8769868f7
--- /dev/null
+++ b/clips/classcom.h
@@ -0,0 +1,115 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*              CLASS COMMANDS HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_classcom
+
+#pragma once
+
+#define _H_classcom
+
+typedef enum
+  {
+   CONVENIENCE_MODE,
+   CONSERVATION_MODE
+  } ClassDefaultsMode;
+
+#include "cstrccom.h"
+#include "moduldef.h"
+#include "object.h"
+#include "symbol.h"
+
+   const char             *DefclassName(Defclass *);
+   const char             *DefclassPPForm(Defclass *);
+   struct defmoduleItemHeader
+                          *GetDefclassModule(Environment *,Defclass *);
+   const char             *DefclassModule(Defclass *);
+   CLIPSLexeme            *GetDefclassNamePointer(Defclass *);
+   void                    SetNextDefclass(Defclass *,Defclass *);
+   void                    SetDefclassPPForm(Environment *,Defclass *,char *);
+
+   Defclass               *FindDefclass(Environment *,const char *);
+   Defclass               *FindDefclassInModule(Environment *,const char *);
+   Defclass               *LookupDefclassByMdlOrScope(Environment *,const char *);
+   Defclass               *LookupDefclassInScope(Environment *,const char *);
+   Defclass               *LookupDefclassAnywhere(Environment *,Defmodule *,const char *);
+   bool                    DefclassInScope(Environment *,Defclass *,Defmodule *);
+   Defclass               *GetNextDefclass(Environment *,Defclass *);
+   bool                    DefclassIsDeletable(Defclass *);
+
+   void                    UndefclassCommand(Environment *,UDFContext *,UDFValue *);
+   ClassDefaultsMode       SetClassDefaultsMode(Environment *,ClassDefaultsMode);
+   ClassDefaultsMode       GetClassDefaultsMode(Environment *);
+   void                    GetClassDefaultsModeCommand(Environment *,UDFContext *,UDFValue *);
+   void                    SetClassDefaultsModeCommand(Environment *,UDFContext *,UDFValue *);
+
+#if DEBUGGING_FUNCTIONS
+   void                    PPDefclassCommand(Environment *,UDFContext *,UDFValue *);
+   void                    ListDefclassesCommand(Environment *,UDFContext *,UDFValue *);
+   void                    ListDefclasses(Environment *,const char *,Defmodule *);
+   bool                    DefclassGetWatchInstances(Defclass *);
+   void                    DefclassSetWatchInstances(Defclass *,bool);
+   bool                    DefclassGetWatchSlots(Defclass *);
+   void                    DefclassSetWatchSlots(Defclass *,bool);
+   bool                    DefclassWatchAccess(Environment *,int,bool,Expression *);
+   bool                    DefclassWatchPrint(Environment *,const char *,int,Expression *);
+#endif
+
+   void                    GetDefclassListFunction(Environment *,UDFContext *,UDFValue *);
+   void                    GetDefclassList(Environment *,CLIPSValue *,Defmodule *);
+   bool                    Undefclass(Defclass *,Environment *);
+   bool                    HasSuperclass(Defclass *,Defclass *);
+
+   CLIPSLexeme            *CheckClassAndSlot(UDFContext *,const char *,Defclass **);
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   void                    SaveDefclasses(Environment *,Defmodule *,const char *,void *);
+#endif
+
+#endif /* _H_classcom */
diff --git a/clips/classexm.c b/clips/classexm.c
new file mode 100755
index 000000000..dc78c8743
--- /dev/null
+++ b/clips/classexm.c
@@ -0,0 +1,1385 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  06/22/18             */
+   /*                                                     */
+   /*                 CLASS EXAMINATION MODULE            */
+   /*******************************************************/
+
+/**************************************************************/
+/* Purpose: Class browsing and examination commands           */
+/*                                                            */
+/* Principal Programmer(s):                                   */
+/*      Brian L. Dantes                                       */
+/*                                                            */
+/* Contributing Programmer(s):                                */
+/*                                                            */
+/* Revision History:                                          */
+/*                                                            */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859   */
+/*                                                            */
+/*            Modified the slot-writablep function to return  */
+/*            FALSE for slots having initialize-only access.  */
+/*            DR0860                                          */
+/*                                                            */
+/*      6.24: Added allowed-classes slot facet.               */
+/*                                                            */
+/*            Converted INSTANCE_PATTERN_MATCHING to          */
+/*            DEFRULE_CONSTRUCT.                              */
+/*                                                            */
+/*            Renamed BOOLEAN macro type to intBool.          */
+/*                                                            */
+/*            The slot-default-value function crashes when no */
+/*            default exists for a slot (the ?NONE value was  */
+/*            specified). DR0870                              */
+/*                                                            */
+/*      6.30: Used %zd for printing size_t arguments.         */
+/*                                                            */
+/*            Added EnvSlotDefaultP function.                 */
+/*                                                            */
+/*            Borland C (IBM_TBC) and Metrowerks CodeWarrior  */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.     */
+/*                                                            */
+/*            Used gensprintf and genstrcat instead of        */
+/*            sprintf and strcat.                             */
+/*                                                            */
+/*            Added const qualifiers to remove C++            */
+/*            deprecation warnings.                           */
+/*                                                            */
+/*            Converted API macros to function calls.         */
+/*                                                            */
+/*      6.40: Added Env prefix to GetEvaluationError and      */
+/*            SetEvaluationError functions.                   */
+/*                                                            */
+/*            Pragma once and other inclusion changes.        */
+/*                                                            */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/**************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include <string.h>
+
+#include "argacces.h"
+#include "classcom.h"
+#include "classfun.h"
+#include "classini.h"
+#include "envrnmnt.h"
+#include "insfun.h"
+#include "memalloc.h"
+#include "msgcom.h"
+#include "msgfun.h"
+#include "prntutil.h"
+#include "router.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+
+#include "classexm.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    CheckTwoClasses(UDFContext *,const char *,Defclass **,Defclass **);
+   static SlotDescriptor         *CheckSlotExists(UDFContext *,const char *,Defclass **,bool,bool);
+   static SlotDescriptor         *LookupSlot(Environment *,Defclass *,const char *,bool);
+
+#if DEBUGGING_FUNCTIONS
+   static Defclass               *CheckClass(Environment *,const char *,const char *);
+   static const char             *GetClassNameArgument(UDFContext *);
+   static void                    PrintClassBrowse(Environment *,const char *,Defclass *,unsigned long);
+   static void                    DisplaySeparator(Environment *,const char *,char *,int,int);
+   static void                    DisplaySlotBasicInfo(Environment *,const char *,const char *,const char *,
+                                                       char *,Defclass *);
+   static bool                    PrintSlotSources(Environment *,const char *,CLIPSLexeme *,PACKED_CLASS_LINKS *,
+                                                   unsigned long,bool);
+   static void                    DisplaySlotConstraintInfo(Environment *,const char *,const char *,char *,unsigned,Defclass *);
+   static const char             *ConstraintCode(CONSTRAINT_RECORD *,unsigned,unsigned);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if DEBUGGING_FUNCTIONS
+
+/****************************************************************
+  NAME         : BrowseClassesCommand
+  DESCRIPTION  : Displays a "graph" of the class hierarchy
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Syntax : (browse-classes [<class>])
+ ****************************************************************/
+void BrowseClassesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *cls;
+
+   if (UDFArgumentCount(context) == 0)
+      /* ================================================
+         Find the OBJECT root class (has no superclasses)
+         ================================================ */
+      cls = LookupDefclassByMdlOrScope(theEnv,OBJECT_TYPE_NAME);
+   else
+     {
+      UDFValue theArg;
+
+      if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+        return;
+      cls = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+      if (cls == NULL)
+        {
+         ClassExistError(theEnv,"browse-classes",theArg.lexemeValue->contents);
+         return;
+        }
+     }
+   BrowseClasses(cls,STDOUT);
+  }
+
+/****************************************************************
+  NAME         : BrowseClasses
+  DESCRIPTION  : Displays a "graph" of the class hierarchy
+  INPUTS       : 1) The logical name of the output
+                 2) Class pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ****************************************************************/
+void BrowseClasses(
+  Defclass *theDefclass,
+  const char *logicalName)
+  {
+   Environment *theEnv = theDefclass->header.env;
+   
+   PrintClassBrowse(theEnv,logicalName,theDefclass,0);
+  }
+
+/****************************************************************
+  NAME         : DescribeClassCommand
+  DESCRIPTION  : Displays direct superclasses and
+                   subclasses and the entire precedence
+                   list for a class
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Syntax : (describe-class <class-name>)
+ ****************************************************************/
+void DescribeClassCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *className;
+   Defclass *theDefclass;
+
+   className = GetClassNameArgument(context);
+
+   if (className == NULL)
+     { return; }
+
+   theDefclass = CheckClass(theEnv,"describe-class",className);
+
+   if (theDefclass == NULL)
+     { return; }
+
+   DescribeClass(theDefclass,STDOUT);
+  }
+
+/******************************************************
+  NAME         : DescribeClass
+  DESCRIPTION  : Displays direct superclasses and
+                   subclasses and the entire precedence
+                   list for a class
+  INPUTS       : 1) The logical name of the output
+                 2) Class pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ******************************************************/
+void DescribeClass(
+  Defclass *theDefclass,
+  const char *logicalName)
+  {
+   char buf[83],
+        slotNamePrintFormat[12],
+        overrideMessagePrintFormat[12];
+   bool messageBanner;
+   unsigned long i;
+   size_t slotNameLength, maxSlotNameLength;
+   size_t overrideMessageLength, maxOverrideMessageLength;
+   Environment *theEnv = theDefclass->header.env;
+  
+   DisplaySeparator(theEnv,logicalName,buf,82,'=');
+   DisplaySeparator(theEnv,logicalName,buf,82,'*');
+   if (theDefclass->abstract)
+     WriteString(theEnv,logicalName,"Abstract: direct instances of this class cannot be created.\n\n");
+   else
+     {
+      WriteString(theEnv,logicalName,"Concrete: direct instances of this class can be created.\n");
+#if DEFRULE_CONSTRUCT
+      if (theDefclass->reactive)
+        WriteString(theEnv,logicalName,"Reactive: direct instances of this class can match defrule patterns.\n\n");
+      else
+        WriteString(theEnv,logicalName,"Non-reactive: direct instances of this class cannot match defrule patterns.\n\n");
+#else
+      WriteString(theEnv,logicalName,"\n");
+#endif
+     }
+   PrintPackedClassLinks(theEnv,logicalName,"Direct Superclasses:",&theDefclass->directSuperclasses);
+   PrintPackedClassLinks(theEnv,logicalName,"Inheritance Precedence:",&theDefclass->allSuperclasses);
+   PrintPackedClassLinks(theEnv,logicalName,"Direct Subclasses:",&theDefclass->directSubclasses);
+   if (theDefclass->instanceTemplate != NULL)
+     {
+      DisplaySeparator(theEnv,logicalName,buf,82,'-');
+      maxSlotNameLength = 5;
+      maxOverrideMessageLength = 8;
+      for (i = 0 ; i < theDefclass->instanceSlotCount ; i++)
+        {
+         slotNameLength = strlen(theDefclass->instanceTemplate[i]->slotName->name->contents);
+         if (slotNameLength > maxSlotNameLength)
+           maxSlotNameLength = slotNameLength;
+         if (theDefclass->instanceTemplate[i]->noWrite == 0)
+           {
+            overrideMessageLength =
+              strlen(theDefclass->instanceTemplate[i]->overrideMessage->contents);
+            if (overrideMessageLength > maxOverrideMessageLength)
+              maxOverrideMessageLength = overrideMessageLength;
+           }
+        }
+      if (maxSlotNameLength > 16)
+        maxSlotNameLength = 16;
+      if (maxOverrideMessageLength > 12)
+        maxOverrideMessageLength = 12;
+/*        
+#if WIN_MVC
+      gensprintf(slotNamePrintFormat,"%%-%Id.%Ids : ",maxSlotNameLength,maxSlotNameLength);
+      gensprintf(overrideMessagePrintFormat,"%%-%Id.%Ids ",maxOverrideMessageLength,
+                                              maxOverrideMessageLength);
+#elif WIN_GCC
+      gensprintf(slotNamePrintFormat,"%%-%ld.%lds : ",(long) maxSlotNameLength,(long) maxSlotNameLength);
+      gensprintf(overrideMessagePrintFormat,"%%-%ld.%lds ",(long) maxOverrideMessageLength,
+                                            (long) maxOverrideMessageLength);
+#else
+*/
+      gensprintf(slotNamePrintFormat,"%%-%zd.%zds : ",maxSlotNameLength,maxSlotNameLength);
+      gensprintf(overrideMessagePrintFormat,"%%-%zd.%zds ",maxOverrideMessageLength,
+                                              maxOverrideMessageLength);
+/*
+#endif
+*/
+      DisplaySlotBasicInfo(theEnv,logicalName,slotNamePrintFormat,overrideMessagePrintFormat,buf,theDefclass);
+      WriteString(theEnv,logicalName,"\nConstraint information for slots:\n\n");
+      DisplaySlotConstraintInfo(theEnv,logicalName,slotNamePrintFormat,buf,82,theDefclass);
+     }
+   if (theDefclass->handlerCount > 0)
+     messageBanner = true;
+   else
+     {
+      messageBanner = false;
+      for (i = 1 ; i < theDefclass->allSuperclasses.classCount ; i++)
+        if (theDefclass->allSuperclasses.classArray[i]->handlerCount > 0)
+          {
+           messageBanner = true;
+           break;
+          }
+     }
+   if (messageBanner)
+     {
+      DisplaySeparator(theEnv,logicalName,buf,82,'-');
+      WriteString(theEnv,logicalName,"Recognized message-handlers:\n");
+      DisplayHandlersInLinks(theEnv,logicalName,&theDefclass->allSuperclasses,0);
+     }
+   DisplaySeparator(theEnv,logicalName,buf,82,'*');
+   DisplaySeparator(theEnv,logicalName,buf,82,'=');
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/**********************************************************
+  NAME         : GetCreateAccessorString
+  DESCRIPTION  : Gets a string describing which
+                 accessors are implicitly created
+                 for a slot: R, W, RW or NIL
+  INPUTS       : The slot descriptor
+  RETURNS      : The string description
+  SIDE EFFECTS : None
+  NOTES        : Used by (describe-class) and (slot-facets)
+ **********************************************************/
+const char *GetCreateAccessorString(
+  SlotDescriptor *sd)
+  {
+   if (sd->createReadAccessor && sd->createWriteAccessor)
+     return("RW");
+
+   if ((sd->createReadAccessor == 0) && (sd->createWriteAccessor == 0))
+     return("NIL");
+   else
+     {
+      if (sd->createReadAccessor) return "R";
+      else return "W";
+     }
+  }
+
+/************************************************************
+  NAME         : GetDefclassModuleCommand
+  DESCRIPTION  : Determines to which module a class belongs
+  INPUTS       : None
+  RETURNS      : The symbolic name of the module
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (defclass-module <class-name>)
+ ************************************************************/
+void GetDefclassModuleCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->value = GetConstructModuleCommand(context,"defclass-module",DefclassData(theEnv)->DefclassConstruct);
+  }
+
+/*********************************************************************
+  NAME         : SuperclassPCommand
+  DESCRIPTION  : Determines if a class is a superclass of another
+  INPUTS       : None
+  RETURNS      : True if class-1 is a superclass of class-2
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (superclassp <class-1> <class-2>)
+ *********************************************************************/
+void SuperclassPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *c1, *c2;
+
+   if (CheckTwoClasses(context,"superclassp",&c1,&c2) == false)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,SuperclassP(c1,c2));
+  }
+
+/***************************************************
+  NAME         : SuperclassP
+  DESCRIPTION  : Determines if the first class is
+                 a superclass of the other
+  INPUTS       : 1) First class
+                 2) Second class
+  RETURNS      : True if first class is a
+                 superclass of the first,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool SuperclassP(
+  Defclass *firstClass,
+  Defclass *secondClass)
+  {
+   return HasSuperclass(secondClass,firstClass);
+  }
+
+/*********************************************************************
+  NAME         : SubclassPCommand
+  DESCRIPTION  : Determines if a class is a subclass of another
+  INPUTS       : None
+  RETURNS      : True if class-1 is a subclass of class-2
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (subclassp <class-1> <class-2>)
+ *********************************************************************/
+void SubclassPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *c1, *c2;
+
+   if (CheckTwoClasses(context,"subclassp",&c1,&c2) == false)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,SubclassP(c1,c2));
+  }
+
+/***************************************************
+  NAME         : SubclassP
+  DESCRIPTION  : Determines if the first class is
+                 a subclass of the other
+  INPUTS       : 1) First class
+                 2) Second class
+  RETURNS      : True if first class is a
+                 subclass of the first,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool SubclassP(
+  Defclass *firstClass,
+  Defclass *secondClass)
+  {
+   return HasSuperclass(firstClass,secondClass);
+  }
+
+/*********************************************************************
+  NAME         : SlotExistPCommand
+  DESCRIPTION  : Determines if a slot is present in a class
+  INPUTS       : None
+  RETURNS      : True if the slot exists, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (slot-existp <class> <slot> [inherit])
+ *********************************************************************/
+void SlotExistPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *cls;
+   SlotDescriptor *sd;
+   bool inheritFlag = false;
+   UDFValue theArg;
+
+   sd = CheckSlotExists(context,"slot-existp",&cls,false,true);
+   if (sd == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+        { return; }
+
+      if (strcmp(theArg.lexemeValue->contents,"inherit") != 0)
+        {
+         UDFInvalidArgumentMessage(context,"keyword \"inherit\"");
+         SetEvaluationError(theEnv,true);
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+      inheritFlag = true;
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,((sd->cls == cls) ? true : inheritFlag));
+  }
+
+/***************************************************
+  NAME         : SlotExistP
+  DESCRIPTION  : Determines if a slot exists
+  INPUTS       : 1) The class
+                 2) The slot name
+                 3) A flag indicating if the slot
+                    can be inherited or not
+  RETURNS      : True if slot exists,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool SlotExistP(
+  Defclass *theDefclass,
+  const char *slotName,
+  bool inheritFlag)
+  {
+   Environment *theEnv = theDefclass->header.env;
+
+   return (LookupSlot(theEnv,theDefclass,slotName,inheritFlag) != NULL)
+           ? true : false;
+  }
+
+/************************************************************************************
+  NAME         : MessageHandlerExistPCommand
+  DESCRIPTION  : Determines if a message-handler is present in a class
+  INPUTS       : None
+  RETURNS      : True if the message header is present, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (message-handler-existp <class> <hnd> [<type>])
+ ************************************************************************************/
+void MessageHandlerExistPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *cls;
+   CLIPSLexeme *mname;
+   UDFValue theArg;
+   unsigned mtype = MPRIMARY;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+   cls = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if (cls == NULL)
+     {
+      ClassExistError(theEnv,"message-handler-existp",theArg.lexemeValue->contents);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+        { return; }
+
+   mname = theArg.lexemeValue;
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+        { return; }
+
+      mtype = HandlerType(theEnv,"message-handler-existp",true,theArg.lexemeValue->contents);
+      if (mtype == MERROR)
+        {
+         SetEvaluationError(theEnv,true);
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+
+   if (FindHandlerByAddress(cls,mname,mtype) != NULL)
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/**********************************************************************
+  NAME         : SlotWritablePCommand
+  DESCRIPTION  : Determines if an existing slot can be written to
+  INPUTS       : None
+  RETURNS      : True if the slot is writable, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (slot-writablep <class> <slot>)
+ **********************************************************************/
+void SlotWritablePCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *theDefclass;
+   SlotDescriptor *sd;
+
+   sd = CheckSlotExists(context,"slot-writablep",&theDefclass,true,true);
+   if (sd == NULL)
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = CreateBoolean(theEnv,(sd->noWrite || sd->initializeOnly) ? false : true); }
+  }
+
+/***************************************************
+  NAME         : SlotWritableP
+  DESCRIPTION  : Determines if a slot is writable
+  INPUTS       : 1) The class
+                 2) The slot name
+  RETURNS      : True if slot is writable,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool SlotWritableP(
+  Defclass *theDefclass,
+  const char *slotName)
+  {
+   SlotDescriptor *sd;
+   Environment *theEnv = theDefclass->header.env;
+  
+   if ((sd = LookupSlot(theEnv,theDefclass,slotName,true)) == NULL)
+     return false;
+   return((sd->noWrite || sd->initializeOnly) ? false : true);
+  }
+
+/**********************************************************************
+  NAME         : SlotInitablePCommand
+  DESCRIPTION  : Determines if an existing slot can be initialized
+                   via an init message-handler or slot-override
+  INPUTS       : None
+  RETURNS      : True if the slot is writable, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (slot-initablep <class> <slot>)
+ **********************************************************************/
+void SlotInitablePCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *theDefclass;
+   SlotDescriptor *sd;
+
+   sd = CheckSlotExists(context,"slot-initablep",&theDefclass,true,true);
+   if (sd == NULL)
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = CreateBoolean(theEnv,(sd->noWrite && (sd->initializeOnly == 0)) ? false : true); }
+  }
+
+/***************************************************
+  NAME         : SlotInitableP
+  DESCRIPTION  : Determines if a slot is initable
+  INPUTS       : 1) The class
+                 2) The slot name
+  RETURNS      : True if slot is initable,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool SlotInitableP(
+  Defclass *theDefclass,
+  const char *slotName)
+  {
+   SlotDescriptor *sd;
+   Environment *theEnv = theDefclass->header.env;
+
+   if ((sd = LookupSlot(theEnv,theDefclass,slotName,true)) == NULL)
+     return false;
+   return((sd->noWrite && (sd->initializeOnly == 0)) ? false : true);
+  }
+
+/**********************************************************************
+  NAME         : SlotPublicPCommand
+  DESCRIPTION  : Determines if an existing slot is publicly visible
+                   for direct reference by subclasses
+  INPUTS       : None
+  RETURNS      : True if the slot is public, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (slot-publicp <class> <slot>)
+ **********************************************************************/
+void SlotPublicPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *theDefclass;
+   SlotDescriptor *sd;
+
+   sd = CheckSlotExists(context,"slot-publicp",&theDefclass,true,false);
+   if (sd == NULL)
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = CreateBoolean(theEnv,(sd->publicVisibility ? true : false)); }
+  }
+
+/***************************************************
+  NAME         : SlotPublicP
+  DESCRIPTION  : Determines if a slot is public
+  INPUTS       : 1) The class
+                 2) The slot name
+  RETURNS      : True if slot is public,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool SlotPublicP(
+  Defclass *theDefclass,
+  const char *slotName)
+  {
+   SlotDescriptor *sd;
+   Environment *theEnv = theDefclass->header.env;
+
+   if ((sd = LookupSlot(theEnv,theDefclass,slotName,false)) == NULL)
+     return false;
+   return(sd->publicVisibility ? true : false);
+  }
+
+/***************************************************
+  NAME         : SlotDefaultP
+  DESCRIPTION  : Determines if a slot has a default value
+  INPUTS       : 1) The class
+                 2) The slot name
+  RETURNS      : True if slot is public,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+int SlotDefaultP(
+  Environment *theEnv,
+  Defclass *theDefclass,
+  const char *slotName)
+  {
+   SlotDescriptor *sd;
+
+   if ((sd = LookupSlot(theEnv,theDefclass,slotName,false)) == NULL)
+     return(NO_DEFAULT);
+
+   if (sd->noDefault)
+     { return(NO_DEFAULT); }
+   else if (sd->dynamicDefault)
+     { return(DYNAMIC_DEFAULT); }
+
+   return(STATIC_DEFAULT);
+  }
+
+
+/**********************************************************************
+  NAME         : SlotDirectAccessPCommand
+  DESCRIPTION  : Determines if an existing slot can be directly
+                   referenced by the class - i.e., if the slot is
+                   private, is the slot defined in the class
+  INPUTS       : None
+  RETURNS      : True if the slot is private,
+                    false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (slot-direct-accessp <class> <slot>)
+ **********************************************************************/
+void SlotDirectAccessPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *theDefclass;
+   SlotDescriptor *sd;
+
+   sd = CheckSlotExists(context,"slot-direct-accessp",&theDefclass,true,true);
+   if (sd == NULL)
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = CreateBoolean(theEnv,((sd->publicVisibility || (sd->cls == theDefclass)) ? true : false)); }
+  }
+
+/***************************************************
+  NAME         : SlotDirectAccessP
+  DESCRIPTION  : Determines if a slot is directly
+                 accessible from message-handlers
+                 on class
+  INPUTS       : 1) The class
+                 2) The slot name
+  RETURNS      : True if slot is directly
+                 accessible, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool SlotDirectAccessP(
+  Defclass *theDefclass,
+  const char *slotName)
+  {
+   SlotDescriptor *sd;
+   Environment *theEnv = theDefclass->header.env;
+
+   if ((sd = LookupSlot(theEnv,theDefclass,slotName,true)) == NULL)
+     return false;
+   return((sd->publicVisibility || (sd->cls == theDefclass)) ?
+           true : false);
+  }
+
+/**********************************************************************
+  NAME         : SlotDefaultValueCommand
+  DESCRIPTION  : Determines the default avlue for the specified slot
+                 of the specified class
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (slot-default-value <class> <slot>)
+ **********************************************************************/
+void SlotDefaultValueCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *theDefclass;
+   SlotDescriptor *sd;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   sd = CheckSlotExists(context,"slot-default-value",&theDefclass,true,true);
+   if (sd == NULL)
+     return;
+
+   if (sd->noDefault)
+     {
+      returnValue->lexemeValue = CreateSymbol(theEnv,"?NONE");
+      return;
+     }
+
+   if (sd->dynamicDefault)
+     EvaluateAndStoreInDataObject(theEnv,sd->multiple,
+                                  (Expression *) sd->defaultValue,
+                                  returnValue,true);
+   else
+     GenCopyMemory(UDFValue,1,returnValue,sd->defaultValue);
+  }
+
+/*********************************************************
+  NAME         : SlotDefaultValue
+  DESCRIPTION  : Determines the default value for
+                 the specified slot of the specified class
+  INPUTS       : 1) The class
+                 2) The slot name
+  RETURNS      : True if slot default value is set,
+                 false otherwise
+  SIDE EFFECTS : Slot default value evaluated - dynamic
+                 defaults will cause any side effects
+  NOTES        : None
+ *********************************************************/
+bool SlotDefaultValue(
+  Defclass *theDefclass,
+  const char *slotName,
+  CLIPSValue *theValue)
+  {
+   SlotDescriptor *sd;
+   bool rv;
+   UDFValue result;
+   UDFValue *tmpPtr;
+   Environment *theEnv = theDefclass->header.env;
+   
+   theValue->value = FalseSymbol(theEnv);
+   if ((sd = LookupSlot(theEnv,theDefclass,slotName,true)) == NULL)
+     { return false; }
+
+   if (sd->noDefault)
+     {
+      theValue->value = CreateSymbol(theEnv,"?NONE");
+      return true;
+     }
+
+   if (sd->dynamicDefault)
+     {
+      rv = EvaluateAndStoreInDataObject(theEnv,sd->multiple,
+                                         (Expression *) sd->defaultValue,
+                                         &result,true);
+      NormalizeMultifield(theEnv,&result);
+      theValue->value = result.value;
+      return rv;
+     }
+     
+   tmpPtr = (UDFValue *) sd->defaultValue;
+   theValue->value = tmpPtr->value;
+   return true;
+  }
+
+/********************************************************
+  NAME         : ClassExistPCommand
+  DESCRIPTION  : Determines if a class exists
+  INPUTS       : None
+  RETURNS      : True if class exists, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (class-existp <arg>)
+ ********************************************************/
+void ClassExistPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,((LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents) != NULL) ? true : false));
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/******************************************************
+  NAME         : CheckTwoClasses
+  DESCRIPTION  : Checks for exactly two class arguments
+                    for a H/L function
+  INPUTS       : 1) The function name
+                 2) Caller's buffer for first class
+                 3) Caller's buffer for second class
+  RETURNS      : True if both found, false otherwise
+  SIDE EFFECTS : Caller's buffers set
+  NOTES        : Assumes exactly 2 arguments
+ ******************************************************/
+static bool CheckTwoClasses(
+  UDFContext *context,
+  const char *func,
+  Defclass **c1,
+  Defclass **c2)
+  {
+   UDFValue theArg;
+   Environment *theEnv = context->environment;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return false; }
+
+   *c1 = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if (*c1 == NULL)
+     {
+      ClassExistError(theEnv,func,theArg.lexemeValue->contents);
+      return false;
+     }
+
+   if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+     { return false; }
+
+   *c2 = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if (*c2 == NULL)
+     {
+      ClassExistError(theEnv,func,theArg.lexemeValue->contents);
+      return false;
+     }
+
+   return true;
+  }
+
+/***************************************************
+  NAME         : CheckSlotExists
+  DESCRIPTION  : Checks first two arguments of
+                 a function for a valid class
+                 and (inherited) slot
+  INPUTS       : 1) The name of the function
+                 2) A buffer to hold the found class
+                 3) A flag indicating whether the
+                    non-existence of the slot should
+                    be an error
+                 4) A flag indicating if the slot
+                    can be inherited or not
+  RETURNS      : NULL if slot not found, slot
+                 descriptor otherwise
+  SIDE EFFECTS : Class buffer set if no errors,
+                 NULL on errors
+  NOTES        : None
+ ***************************************************/
+static SlotDescriptor *CheckSlotExists(
+  UDFContext *context,
+  const char *func,
+  Defclass **classBuffer,
+  bool existsErrorFlag,
+  bool inheritFlag)
+  {
+   CLIPSLexeme *ssym;
+   int slotIndex;
+   SlotDescriptor *sd;
+   Environment *theEnv = context->environment;
+
+   ssym = CheckClassAndSlot(context,func,classBuffer);
+   if (ssym == NULL)
+     return NULL;
+
+   slotIndex = FindInstanceTemplateSlot(theEnv,*classBuffer,ssym);
+   if (slotIndex == -1)
+     {
+      if (existsErrorFlag)
+        {
+         SlotExistError(theEnv,ssym->contents,func);
+         SetEvaluationError(theEnv,true);
+        }
+      return NULL;
+     }
+
+   sd = (*classBuffer)->instanceTemplate[slotIndex];
+   if ((sd->cls == *classBuffer) || inheritFlag)
+     { return sd; }
+
+   PrintErrorID(theEnv,"CLASSEXM",1,false);
+   WriteString(theEnv,STDERR,"Inherited slot '");
+   WriteString(theEnv,STDERR,ssym->contents);
+   WriteString(theEnv,STDERR,"' from class ");
+   PrintClassName(theEnv,STDERR,sd->cls,true,false);
+   WriteString(theEnv,STDERR," is not valid for function '");
+   WriteString(theEnv,STDERR,func);
+   WriteString(theEnv,STDERR,"'.\n");
+   SetEvaluationError(theEnv,true);
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : LookupSlot
+  DESCRIPTION  : Finds a slot in a class
+  INPUTS       : 1) The class
+                 2) The slot name
+                 3) A flag indicating if inherited
+                    slots are OK or not
+  RETURNS      : The slot descriptor address, or
+                 NULL if not found
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static SlotDescriptor *LookupSlot(
+  Environment *theEnv,
+  Defclass *theDefclass,
+  const char *slotName,
+  bool inheritFlag)
+  {
+   CLIPSLexeme *slotSymbol;
+   int slotIndex;
+   SlotDescriptor *sd;
+
+   slotSymbol = FindSymbolHN(theEnv,slotName,SYMBOL_BIT);
+   if (slotSymbol == NULL)
+     { return NULL; }
+
+   slotIndex = FindInstanceTemplateSlot(theEnv,theDefclass,slotSymbol);
+   if (slotIndex == -1)
+     { return NULL; }
+
+   sd = theDefclass->instanceTemplate[slotIndex];
+   if ((sd->cls != theDefclass) && (inheritFlag == false))
+     { return NULL; }
+
+   return sd;
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/*****************************************************
+  NAME         : CheckClass
+  DESCRIPTION  : Used for to check class name for
+                 class accessor functions such
+                 as ppdefclass and undefclass
+  INPUTS       : 1) The name of the H/L function
+                 2) Name of the class
+  RETURNS      : The class address,
+                   or NULL if ther was an error
+  SIDE EFFECTS : None
+  NOTES        : None
+ ******************************************************/
+static Defclass *CheckClass(
+  Environment *theEnv,
+  const char *func,
+  const char *cname)
+  {
+   Defclass *cls;
+
+   cls = LookupDefclassByMdlOrScope(theEnv,cname);
+   if (cls == NULL)
+     ClassExistError(theEnv,func,cname);
+   return(cls);
+  }
+
+/*********************************************************
+  NAME         : GetClassNameArgument
+  DESCRIPTION  : Gets a class name-string
+  INPUTS       : Calling function name
+  RETURNS      : Class name (NULL on errors)
+  SIDE EFFECTS : None
+  NOTES        : Assumes only 1 argument
+ *********************************************************/
+static const char *GetClassNameArgument(
+  UDFContext *context)
+  {
+   UDFValue theArg;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return NULL; }
+
+   return theArg.lexemeValue->contents;
+  }
+
+/****************************************************************
+  NAME         : PrintClassBrowse
+  DESCRIPTION  : Displays a "graph" of class and subclasses
+  INPUTS       : 1) The logical name of the output
+                 2) The class address
+                 3) The depth of the graph
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ****************************************************************/
+static void PrintClassBrowse(
+  Environment *theEnv,
+  const char *logicalName,
+  Defclass *cls,
+  unsigned long depth)
+  {
+   unsigned long i;
+
+   for (i = 0 ; i < depth ; i++)
+     WriteString(theEnv,logicalName,"  ");
+   WriteString(theEnv,logicalName,DefclassName(cls));
+   if (cls->directSuperclasses.classCount > 1)
+     WriteString(theEnv,logicalName," *");
+   WriteString(theEnv,logicalName,"\n");
+   for (i = 0 ;i < cls->directSubclasses.classCount ; i++)
+     PrintClassBrowse(theEnv,logicalName,cls->directSubclasses.classArray[i],depth+1);
+  }
+
+/*********************************************************
+  NAME         : DisplaySeparator
+  DESCRIPTION  : Prints a separator line for DescribeClass
+  INPUTS       : 1) The logical name of the output
+                 2) The buffer to use for the line
+                 3) The buffer size
+                 4) The character to use
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Buffer overwritten and displayed
+  NOTES        : None
+ *********************************************************/
+static void DisplaySeparator(
+  Environment *theEnv,
+  const char *logicalName,
+  char *buf,
+  int maxlen,
+  int sepchar)
+  {
+   int i;
+
+   for (i = 0 ; i < maxlen-2 ; i++)
+     buf[i] = (char) sepchar;
+   buf[i++] = '\n';
+   buf[i] = '\0';
+   WriteString(theEnv,logicalName,buf);
+  }
+
+/*************************************************************
+  NAME         : DisplaySlotBasicInfo
+  DESCRIPTION  : Displays a table summary of basic
+                  facets for the slots of a class
+                  including:
+                  single/multiple
+                  default/no-default/default-dynamic
+                  inherit/no-inherit
+                  read-write/initialize-only/read-only
+                  local/shared
+                  composite/exclusive
+                  reactive/non-reactive
+                  public/private
+                  create-accessor read/write
+                  override-message
+
+                  The function also displays the source
+                  class(es) for the facets
+  INPUTS       : 1) The logical name of the output
+                 2) A format string for use in sprintf
+                    (for printing slot names)
+                 3) A format string for use in sprintf
+                    (for printing slot override message names)
+                 4) A buffer to store the display in
+                 5) A pointer to the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Buffer written to and displayed
+  NOTES        : None
+ *************************************************************/
+static void DisplaySlotBasicInfo(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *slotNamePrintFormat,
+  const char *overrideMessagePrintFormat,
+  char *buf,
+  Defclass *cls)
+  {
+   long i;
+   SlotDescriptor *sp;
+   const char *createString;
+
+   gensprintf(buf,slotNamePrintFormat,"SLOTS");
+#if DEFRULE_CONSTRUCT
+   genstrcat(buf,"FLD DEF PRP ACC STO MCH SRC VIS CRT ");
+#else
+   genstrcat(buf,"FLD DEF PRP ACC STO SRC VIS CRT ");
+#endif
+   WriteString(theEnv,logicalName,buf);
+   gensprintf(buf,overrideMessagePrintFormat,"OVRD-MSG");
+   WriteString(theEnv,logicalName,buf);
+   WriteString(theEnv,logicalName,"SOURCE(S)\n");
+   for (i = 0 ; i < cls->instanceSlotCount ; i++)
+     {
+      sp = cls->instanceTemplate[i];
+      gensprintf(buf,slotNamePrintFormat,sp->slotName->name->contents);
+      genstrcat(buf,sp->multiple ? "MLT " : "SGL ");
+      if (sp->noDefault)
+        genstrcat(buf,"NIL ");
+      else
+        genstrcat(buf,sp->dynamicDefault ? "DYN " : "STC ");
+      genstrcat(buf,sp->noInherit ? "NIL " : "INH ");
+      if (sp->initializeOnly)
+        genstrcat(buf,"INT ");
+      else if (sp->noWrite)
+        genstrcat(buf," R  ");
+      else
+        genstrcat(buf,"RW  ");
+      genstrcat(buf,sp->shared ? "SHR " : "LCL ");
+#if DEFRULE_CONSTRUCT
+      genstrcat(buf,sp->reactive ? "RCT " : "NIL ");
+#endif
+      genstrcat(buf,sp->composite ? "CMP " : "EXC ");
+      genstrcat(buf,sp->publicVisibility ? "PUB " : "PRV ");
+      createString = GetCreateAccessorString(sp);
+      if (createString[1] == '\0')
+        genstrcat(buf," ");
+      genstrcat(buf,createString);
+      if ((createString[1] == '\0') ? true : (createString[2] == '\0'))
+        genstrcat(buf," ");
+      genstrcat(buf," ");
+      WriteString(theEnv,logicalName,buf);
+      gensprintf(buf,overrideMessagePrintFormat,
+              sp->noWrite ? "NIL" : sp->overrideMessage->contents);
+      WriteString(theEnv,logicalName,buf);
+      PrintSlotSources(theEnv,logicalName,sp->slotName->name,&sp->cls->allSuperclasses,0,true);
+      WriteString(theEnv,logicalName,"\n");
+     }
+  }
+
+/***************************************************
+  NAME         : PrintSlotSources
+  DESCRIPTION  : Displays a list of source classes
+                   for a composite class (in order
+                   of most general to specific)
+  INPUTS       : 1) The logical name of the output
+                 2) The name of the slot
+                 3) The precedence list of the class
+                    of the slot (the source class
+                    shold be first in the list)
+                 4) The index into the packed
+                    links array
+                 5) Flag indicating whether to
+                    disregard noniherit facet
+  RETURNS      : True if a class is printed, false
+                 otherwise
+  SIDE EFFECTS : Recursively prints out appropriate
+                 memebers from list in reverse order
+  NOTES        : None
+ ***************************************************/
+static bool PrintSlotSources(
+  Environment *theEnv,
+  const char *logicalName,
+  CLIPSLexeme *sname,
+  PACKED_CLASS_LINKS *sprec,
+  unsigned long theIndex,
+  bool inhp)
+  {
+   SlotDescriptor *csp;
+
+   if (theIndex == sprec->classCount)
+     return false;
+   csp = FindClassSlot(sprec->classArray[theIndex],sname);
+   if ((csp != NULL) ? ((csp->noInherit == 0) || inhp) : false)
+     {
+      if (csp->composite)
+        {
+         if (PrintSlotSources(theEnv,logicalName,sname,sprec,theIndex+1,false))
+           WriteString(theEnv,logicalName," ");
+        }
+      PrintClassName(theEnv,logicalName,sprec->classArray[theIndex],false,false);
+      return true;
+     }
+   else
+     return(PrintSlotSources(theEnv,logicalName,sname,sprec,theIndex+1,false));
+  }
+
+/*********************************************************
+  NAME         : DisplaySlotConstraintInfo
+  DESCRIPTION  : Displays a table summary of type-checking
+                  facets for the slots of a class
+                  including:
+                  type
+                  allowed-symbols
+                  allowed-integers
+                  allowed-floats
+                  allowed-values
+                  allowed-instance-names
+                  range
+                  min-number-of-elements
+                  max-number-of-elements
+
+                  The function also displays the source
+                  class(es) for the facets
+  INPUTS       : 1) A format string for use in sprintf
+                 2) A buffer to store the display in
+                 3) Maximum buffer size
+                 4) A pointer to the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Buffer written to and displayed
+  NOTES        : None
+ *********************************************************/
+static void DisplaySlotConstraintInfo(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *slotNamePrintFormat,
+  char *buf,
+  unsigned maxlen,
+  Defclass *cls)
+  {
+   long i;
+   CONSTRAINT_RECORD *cr;
+   const char *strdest = "***describe-class***";
+
+   gensprintf(buf,slotNamePrintFormat,"SLOTS");
+   genstrcat(buf,"SYM STR INN INA EXA FTA INT FLT\n");
+   WriteString(theEnv,logicalName,buf);
+   for (i = 0 ; i < cls->instanceSlotCount ; i++)
+     {
+      cr = cls->instanceTemplate[i]->constraint;
+      gensprintf(buf,slotNamePrintFormat,cls->instanceTemplate[i]->slotName->name->contents);
+      if (cr != NULL)
+        {
+         genstrcat(buf,ConstraintCode(cr,cr->symbolsAllowed,cr->symbolRestriction));
+         genstrcat(buf,ConstraintCode(cr,cr->stringsAllowed,cr->stringRestriction));
+         genstrcat(buf,ConstraintCode(cr,cr->instanceNamesAllowed,
+                                      (cr->instanceNameRestriction || cr->classRestriction)));
+         genstrcat(buf,ConstraintCode(cr,cr->instanceAddressesAllowed,cr->classRestriction));
+         genstrcat(buf,ConstraintCode(cr,cr->externalAddressesAllowed,0));
+         genstrcat(buf,ConstraintCode(cr,cr->factAddressesAllowed,0));
+         genstrcat(buf,ConstraintCode(cr,cr->integersAllowed,cr->integerRestriction));
+         genstrcat(buf,ConstraintCode(cr,cr->floatsAllowed,cr->floatRestriction));
+         OpenStringDestination(theEnv,strdest,buf + strlen(buf),(maxlen - strlen(buf) - 1));
+         if (cr->integersAllowed || cr->floatsAllowed || cr->anyAllowed)
+           {
+            WriteString(theEnv,strdest,"RNG:[");
+            PrintExpression(theEnv,strdest,cr->minValue);
+            WriteString(theEnv,strdest,"..");
+            PrintExpression(theEnv,strdest,cr->maxValue);
+            WriteString(theEnv,strdest,"] ");
+           }
+         if (cls->instanceTemplate[i]->multiple)
+           {
+            WriteString(theEnv,strdest,"CRD:[");
+            PrintExpression(theEnv,strdest,cr->minFields);
+            WriteString(theEnv,strdest,"..");
+            PrintExpression(theEnv,strdest,cr->maxFields);
+            WriteString(theEnv,strdest,"]");
+           }
+        }
+      else
+        {
+         OpenStringDestination(theEnv,strdest,buf,maxlen);
+         WriteString(theEnv,strdest," +   +   +   +   +   +   +   +  RNG:[-oo..+oo]");
+         if (cls->instanceTemplate[i]->multiple)
+           WriteString(theEnv,strdest," CRD:[0..+oo]");
+        }
+      WriteString(theEnv,strdest,"\n");
+      CloseStringDestination(theEnv,strdest);
+      WriteString(theEnv,logicalName,buf);
+     }
+  }
+
+/******************************************************
+  NAME         : ConstraintCode
+  DESCRIPTION  : Gives a string code representing the
+                 type of constraint
+  INPUTS       : 1) The constraint record
+                 2) Allowed Flag
+                 3) Restricted Values flag
+  RETURNS      : "    " for type not allowed
+                 " +  " for any value of type allowed
+                 " #  " for some values of type allowed
+  SIDE EFFECTS : None
+  NOTES        : Used by DisplaySlotConstraintInfo
+ ******************************************************/
+static const char *ConstraintCode(
+  CONSTRAINT_RECORD *cr,
+  unsigned allow,
+  unsigned restrictValues)
+  {
+   if (allow || cr->anyAllowed)
+     {
+      if (restrictValues || cr->anyRestriction) return " #  ";
+      else return " +  ";
+     }
+   return("    ");
+  }
+
+#endif
+
+#endif
+
diff --git a/clips/classexm.h b/clips/classexm.h
new file mode 100755
index 000000000..c584bb555
--- /dev/null
+++ b/clips/classexm.h
@@ -0,0 +1,97 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*             CLASS EXAMINATION HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: The DescribeClass macros were incorrectly      */
+/*            defined. DR0862                                */
+/*                                                           */
+/*            Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added EnvSlotDefaultP function.                */
+/*                                                           */
+/*            Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Used gensprintf and genstrcat instead of       */
+/*            sprintf and strcat.                            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_classexm
+
+#pragma once
+
+#define _H_classexm
+
+#include "entities.h"
+#include "object.h"
+
+#if DEBUGGING_FUNCTIONS
+
+   void                           BrowseClassesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           BrowseClasses(Defclass *,const char *);
+   void                           DescribeClassCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DescribeClass(Defclass *,const char *);
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+   const char                    *GetCreateAccessorString(SlotDescriptor *);
+   void                           GetDefclassModuleCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SuperclassPCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SuperclassP(Defclass *,Defclass *);
+   void                           SubclassPCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SubclassP(Defclass *,Defclass *);
+   void                           SlotExistPCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SlotExistP(Defclass *,const char *,bool);
+   void                           MessageHandlerExistPCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SlotWritablePCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SlotWritableP(Defclass *,const char *);
+   void                           SlotInitablePCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SlotInitableP(Defclass *,const char *);
+   void                           SlotPublicPCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SlotPublicP(Defclass *,const char *);
+   void                           SlotDirectAccessPCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SlotDirectAccessP(Defclass *,const char *);
+   void                           SlotDefaultValueCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SlotDefaultValue(Defclass *,const char *,CLIPSValue *);
+   void                           ClassExistPCommand(Environment *,UDFContext *,UDFValue *);
+   int                            SlotDefaultP(Environment *,Defclass *,const char *);
+
+#endif /* _H_classexm */
diff --git a/clips/classfun.c b/clips/classfun.c
new file mode 100755
index 000000000..d56be3a57
--- /dev/null
+++ b/clips/classfun.c
@@ -0,0 +1,1364 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  02/03/18             */
+   /*                                                     */
+   /*                CLASS FUNCTIONS MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Internal class manipulation routines             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warning.                              */
+/*                                                           */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Used genstrcpy and genstrcat instead of strcpy */
+/*            and strcat.                                    */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_AND_SAVE        */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.31: Optimization of slot ID creation previously    */
+/*            provided by NewSlotNameID function.            */
+/*                                                           */
+/*            Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+
+#include <stdlib.h>
+
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#include "classcom.h"
+#include "classini.h"
+#include "constant.h"
+#include "constrct.h"
+#include "cstrccom.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "inscom.h"
+#include "insfun.h"
+#include "insmngr.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "msgfun.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "classfun.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define BIG_PRIME          11329
+
+#define CLASS_ID_MAP_CHUNK 30
+
+#define PUT_PREFIX         "put-"
+#define PUT_PREFIX_LENGTH  4
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static unsigned int            HashSlotName(CLIPSLexeme *);
+
+#if (! RUN_TIME)
+   static void                    DeassignClassID(Environment *,unsigned short);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : IncrementDefclassBusyCount
+  DESCRIPTION  : Increments use count of defclass
+  INPUTS       : The class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Busy count incremented
+  NOTES        : None
+ ***************************************************/
+void IncrementDefclassBusyCount(
+  Environment *theEnv,
+  Defclass *theDefclass)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   theDefclass->busy++;
+  }
+
+/***************************************************
+  NAME         : DecrementDefclassBusyCount
+  DESCRIPTION  : Decrements use count of defclass
+  INPUTS       : The class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Busy count decremented
+  NOTES        : Since use counts are ignored on
+                 a clear and defclasses might be
+                 deleted already anyway, this is
+                 a no-op on a clear
+ ***************************************************/
+void DecrementDefclassBusyCount(
+  Environment *theEnv,
+  Defclass *theDefclass)
+  {
+   if (! ConstructData(theEnv)->ClearInProgress)
+     { theDefclass->busy--; }
+  }
+
+/****************************************************
+  NAME         : InstancesPurge
+  DESCRIPTION  : Removes all instances
+  INPUTS       : None
+  RETURNS      : True if all instances deleted,
+                 false otherwise
+  SIDE EFFECTS : The instance hash table is cleared
+  NOTES        : None
+ ****************************************************/
+bool InstancesPurge(
+  Environment *theEnv,
+  void *context)
+  {
+   DestroyAllInstances(theEnv,NULL);
+   CleanupInstances(theEnv,NULL);
+   return((InstanceData(theEnv)->InstanceList != NULL) ? false : true);
+  }
+
+#if ! RUN_TIME
+
+/***************************************************
+  NAME         : InitializeClasses
+  DESCRIPTION  : Allocates class hash table
+                 Initializes class hash table
+                   to all NULL addresses
+                 Creates system classes
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Hash table initialized
+  NOTES        : None
+ ***************************************************/
+void InitializeClasses(
+  Environment *theEnv)
+  {
+   int i;
+
+   DefclassData(theEnv)->ClassTable =
+      (Defclass **) gm2(theEnv,(sizeof(Defclass *) * CLASS_TABLE_HASH_SIZE));
+   for (i = 0 ; i < CLASS_TABLE_HASH_SIZE ; i++)
+     DefclassData(theEnv)->ClassTable[i] = NULL;
+   DefclassData(theEnv)->SlotNameTable =
+      (SLOT_NAME **) gm2(theEnv,(sizeof(SLOT_NAME *) * SLOT_NAME_TABLE_HASH_SIZE));
+   for (i = 0 ; i < SLOT_NAME_TABLE_HASH_SIZE ; i++)
+     DefclassData(theEnv)->SlotNameTable[i] = NULL;
+  }
+
+#endif
+
+/********************************************************
+  NAME         : FindClassSlot
+  DESCRIPTION  : Searches for a named slot in a class
+  INPUTS       : 1) The class address
+                 2) The symbolic slot name
+  RETURNS      : Address of slot if found, NULL otherwise
+  SIDE EFFECTS : None
+  NOTES        : Only looks in class defn, does not
+                   examine inheritance paths
+ ********************************************************/
+SlotDescriptor *FindClassSlot(
+  Defclass *cls,
+  CLIPSLexeme *sname)
+  {
+   long i;
+
+   for (i = 0 ; i < cls->slotCount ; i++)
+     {
+      if (cls->slots[i].slotName->name == sname)
+        return(&cls->slots[i]);
+     }
+   return NULL;
+  }
+
+/***************************************************************
+  NAME         : ClassExistError
+  DESCRIPTION  : Prints out error message for non-existent class
+  INPUTS       : 1) Name of function having the error
+                 2) The name of the non-existent class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************************/
+void ClassExistError(
+  Environment *theEnv,
+  const char *func,
+  const char *cname)
+  {
+   PrintErrorID(theEnv,"CLASSFUN",1,false);
+   WriteString(theEnv,STDERR,"Unable to find class '");
+   WriteString(theEnv,STDERR,cname);
+   WriteString(theEnv,STDERR,"' in function '");
+   WriteString(theEnv,STDERR,func);
+   WriteString(theEnv,STDERR,"'.\n");
+   SetEvaluationError(theEnv,true);
+  }
+
+/*********************************************
+  NAME         : DeleteClassLinks
+  DESCRIPTION  : Deallocates a class link list
+  INPUTS       : The address of the list
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************/
+void DeleteClassLinks(
+  Environment *theEnv,
+  CLASS_LINK *clink)
+  {
+   CLASS_LINK *ctmp;
+
+   for (ctmp = clink ; ctmp != NULL ; ctmp = clink)
+     {
+      clink = clink->nxt;
+      rtn_struct(theEnv,classLink,ctmp);
+     }
+  }
+
+/******************************************************
+  NAME         : PrintClassName
+  DESCRIPTION  : Displays a class's name
+  INPUTS       : 1) Logical name of output
+                 2) The class
+                 3) Flag indicating whether to
+                    print carriage-return at end
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Class name printed (and module name
+                 too if class is not in current module)
+  NOTES        : None
+ ******************************************************/
+void PrintClassName(
+  Environment *theEnv,
+  const char *logicalName,
+  Defclass *theDefclass,
+  bool useQuotes,
+  bool linefeedFlag)
+  {
+   if (useQuotes) WriteString(theEnv,logicalName,"'");
+   if ((theDefclass->header.whichModule->theModule != GetCurrentModule(theEnv)) &&
+       (theDefclass->system == 0))
+     {
+      WriteString(theEnv,logicalName,
+                DefmoduleName(theDefclass->header.whichModule->theModule));
+      WriteString(theEnv,logicalName,"::");
+     }
+   WriteString(theEnv,logicalName,theDefclass->header.name->contents);
+   if (useQuotes) WriteString(theEnv,logicalName,"'");
+   if (linefeedFlag)
+     WriteString(theEnv,logicalName,"\n");
+  }
+
+#if DEBUGGING_FUNCTIONS || ((! BLOAD_ONLY) && (! RUN_TIME))
+
+/***************************************************
+  NAME         : PrintPackedClassLinks
+  DESCRIPTION  : Displays the names of classes in
+                 a list with a title
+  INPUTS       : 1) The logical name of the output
+                 2) Title string
+                 3) List of class links
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void PrintPackedClassLinks(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *title,
+  PACKED_CLASS_LINKS *plinks)
+  {
+   unsigned long i;
+
+   WriteString(theEnv,logicalName,title);
+   for (i = 0 ; i < plinks->classCount ; i++)
+     {
+      WriteString(theEnv,logicalName," ");
+      PrintClassName(theEnv,logicalName,plinks->classArray[i],false,false);
+     }
+   WriteString(theEnv,logicalName,"\n");
+  }
+
+#endif
+
+#if ! RUN_TIME
+
+/*******************************************************
+  NAME         : PutClassInTable
+  DESCRIPTION  : Inserts a class in the class hash table
+  INPUTS       : The class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Class inserted
+  NOTES        : None
+ *******************************************************/
+void PutClassInTable(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   cls->hashTableIndex = HashClass(GetDefclassNamePointer(cls));
+   cls->nxtHash = DefclassData(theEnv)->ClassTable[cls->hashTableIndex];
+   DefclassData(theEnv)->ClassTable[cls->hashTableIndex] = cls;
+  }
+
+/*********************************************************
+  NAME         : RemoveClassFromTable
+  DESCRIPTION  : Removes a class from the class hash table
+  INPUTS       : The class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Class removed
+  NOTES        : None
+ *********************************************************/
+void RemoveClassFromTable(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   Defclass *prvhsh,*hshptr;
+
+   prvhsh = NULL;
+   hshptr = DefclassData(theEnv)->ClassTable[cls->hashTableIndex];
+   while (hshptr != cls)
+     {
+      prvhsh = hshptr;
+      hshptr = hshptr->nxtHash;
+     }
+   if (prvhsh == NULL)
+     DefclassData(theEnv)->ClassTable[cls->hashTableIndex] = cls->nxtHash;
+   else
+     prvhsh->nxtHash = cls->nxtHash;
+  }
+
+/***************************************************
+  NAME         : AddClassLink
+  DESCRIPTION  : Adds a class link from one class to
+                  another
+  INPUTS       : 1) The packed links in which to
+                    insert the new class
+                 2) The subclass pointer
+                 3) A flag indicating if the link
+                    should be appended.
+                 4) Index of where to place the
+                    class if not appended
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Link created and attached
+  NOTES        : Assumes the pack structure belongs
+                 to a class and does not need to
+                 be deallocated
+ ***************************************************/
+void AddClassLink(
+  Environment *theEnv,
+  PACKED_CLASS_LINKS *src,
+  Defclass *cls,
+  bool append,
+  unsigned int posn)
+  {
+   PACKED_CLASS_LINKS dst;
+
+   dst.classArray = (Defclass **) gm2(theEnv,(sizeof(Defclass *) * (src->classCount + 1)));
+
+   if (append)
+     {
+      GenCopyMemory(Defclass *,src->classCount,dst.classArray,src->classArray);
+      dst.classArray[src->classCount] = cls;
+     }
+   else
+     {
+      if (posn != 0)
+        GenCopyMemory(Defclass *,posn,dst.classArray,src->classArray);
+      GenCopyMemory(Defclass *,src->classCount - posn,
+                 dst.classArray + posn + 1,src->classArray + posn);
+      dst.classArray[posn] = cls;
+     }
+   dst.classCount = src->classCount + 1;
+   DeletePackedClassLinks(theEnv,src,false);
+   src->classCount = dst.classCount;
+   src->classArray = dst.classArray;
+  }
+
+/***************************************************
+  NAME         : DeleteSubclassLink
+  DESCRIPTION  : Removes a class from another
+                 class's subclass list
+  INPUTS       : 1) The superclass whose subclass
+                    list is to be modified
+                 2) The subclass to be removed
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The subclass list is changed
+  NOTES        : None
+ ***************************************************/
+void DeleteSubclassLink(
+  Environment *theEnv,
+  Defclass *sclass,
+  Defclass *cls)
+  {
+   unsigned long deletedIndex;
+   PACKED_CLASS_LINKS *src,dst;
+
+   src = &sclass->directSubclasses;
+
+   for (deletedIndex = 0 ; deletedIndex < src->classCount ; deletedIndex++)
+     if (src->classArray[deletedIndex] == cls)
+       break;
+   if (deletedIndex == src->classCount)
+     return;
+   if (src->classCount > 1)
+     {
+      dst.classArray = (Defclass **) gm2(theEnv,(sizeof(Defclass *) * (src->classCount - 1)));
+      if (deletedIndex != 0)
+        GenCopyMemory(Defclass *,deletedIndex,dst.classArray,src->classArray);
+      GenCopyMemory(Defclass *,src->classCount - deletedIndex - 1,
+                 dst.classArray + deletedIndex,src->classArray + deletedIndex + 1);
+     }
+   else
+     dst.classArray = NULL;
+     
+   dst.classCount = src->classCount - 1;
+   DeletePackedClassLinks(theEnv,src,false);
+   src->classCount = dst.classCount;
+   src->classArray = dst.classArray;
+  }
+
+
+/***************************************************
+  NAME         : DeleteSuperclassLink
+  DESCRIPTION  : Removes a class from another
+                 class's superclass list
+  INPUTS       : 1) The subclass whose superclass
+                    list is to be modified
+                 2) The superclass to be removed
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The subclass list is changed
+  NOTES        : None
+ ***************************************************/
+void DeleteSuperclassLink(
+  Environment *theEnv,
+  Defclass *sclass,
+  Defclass *cls)
+  {
+   unsigned long deletedIndex;
+   PACKED_CLASS_LINKS *src,dst;
+
+   src = &sclass->directSuperclasses;
+
+   for (deletedIndex = 0 ; deletedIndex < src->classCount ; deletedIndex++)
+     if (src->classArray[deletedIndex] == cls)
+       break;
+   if (deletedIndex == src->classCount)
+     return;
+   if (src->classCount > 1)
+     {
+      dst.classArray = (Defclass **) gm2(theEnv,(sizeof(Defclass *) * (src->classCount - 1)));
+      if (deletedIndex != 0)
+        GenCopyMemory(Defclass *,deletedIndex,dst.classArray,src->classArray);
+      GenCopyMemory(Defclass *,src->classCount - deletedIndex - 1,
+                 dst.classArray + deletedIndex,src->classArray + deletedIndex + 1);
+     }
+   else
+     dst.classArray = NULL;
+     
+   dst.classCount = src->classCount - 1;
+   DeletePackedClassLinks(theEnv,src,false);
+   src->classCount = dst.classCount;
+   src->classArray = dst.classArray;
+  }
+
+/**************************************************************
+  NAME         : NewClass
+  DESCRIPTION  : Allocates and initalizes a new class structure
+  INPUTS       : The symbolic name of the new class
+  RETURNS      : The address of the new class
+  SIDE EFFECTS : None
+  NOTES        : None
+ **************************************************************/
+Defclass *NewClass(
+  Environment *theEnv,
+  CLIPSLexeme *className)
+  {
+   Defclass *cls;
+
+   cls = get_struct(theEnv,defclass);
+   InitializeConstructHeader(theEnv,"defclass",DEFCLASS,&cls->header,className);
+
+   cls->id = 0;
+   cls->installed = 0;
+   cls->busy = 0;
+   cls->system = 0;
+   cls->abstract = 0;
+   cls->reactive = 1;
+#if DEBUGGING_FUNCTIONS
+   cls->traceInstances = DefclassData(theEnv)->WatchInstances;
+   cls->traceSlots = DefclassData(theEnv)->WatchSlots;
+#endif
+   cls->hashTableIndex = 0;
+   cls->directSuperclasses.classCount = 0;
+   cls->directSuperclasses.classArray = NULL;
+   cls->directSubclasses.classCount = 0;
+   cls->directSubclasses.classArray = NULL;
+   cls->allSuperclasses.classCount = 0;
+   cls->allSuperclasses.classArray = NULL;
+   cls->slots = NULL;
+   cls->instanceTemplate = NULL;
+   cls->slotNameMap = NULL;
+   cls->instanceSlotCount = 0;
+   cls->localInstanceSlotCount = 0;
+   cls->slotCount = 0;
+   cls->maxSlotNameID = 0;
+   cls->handlers = NULL;
+   cls->handlerOrderMap = NULL;
+   cls->handlerCount = 0;
+   cls->instanceList = NULL;
+   cls->instanceListBottom = NULL;
+   cls->nxtHash = NULL;
+   cls->scopeMap = NULL;
+   ClearBitString(cls->traversalRecord,TRAVERSAL_BYTES);
+   cls->relevant_terminal_alpha_nodes = NULL;
+   return(cls);
+  }
+
+/***************************************************
+  NAME         : DeletePackedClassLinks
+  DESCRIPTION  : Dealloacates a contiguous array
+                 holding class links
+  INPUTS       : 1) The class link segment
+                 2) A flag indicating whether to
+                    delete the top pack structure
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Class links deallocated
+  NOTES        : None
+ ***************************************************/
+void DeletePackedClassLinks(
+  Environment *theEnv,
+  PACKED_CLASS_LINKS *plp,
+  bool deleteTop)
+  {
+   if (plp->classCount > 0)
+     {
+      rm(theEnv,plp->classArray,(sizeof(Defclass *) * plp->classCount));
+      plp->classCount = 0;
+      plp->classArray = NULL;
+     }
+   if (deleteTop)
+     rtn_struct(theEnv,packedClassLinks,plp);
+  }
+
+/***************************************************
+  NAME         : AssignClassID
+  DESCRIPTION  : Assigns a unique id to a class
+                 and puts its address in the
+                 id map
+  INPUTS       : The class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Class id assigned and map set
+  NOTES        : None
+ ***************************************************/
+void AssignClassID(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   unsigned short i;
+
+   if ((DefclassData(theEnv)->MaxClassID % CLASS_ID_MAP_CHUNK) == 0)
+     {
+      DefclassData(theEnv)->ClassIDMap =
+         (Defclass **) genrealloc(theEnv,DefclassData(theEnv)->ClassIDMap,
+                                  (DefclassData(theEnv)->MaxClassID * sizeof(Defclass *)),
+                                  ((DefclassData(theEnv)->MaxClassID + CLASS_ID_MAP_CHUNK) * sizeof(Defclass *)));
+      DefclassData(theEnv)->AvailClassID += CLASS_ID_MAP_CHUNK;
+
+      for (i = DefclassData(theEnv)->MaxClassID ; i < (DefclassData(theEnv)->MaxClassID + CLASS_ID_MAP_CHUNK) ; i++)
+        DefclassData(theEnv)->ClassIDMap[i] = NULL;
+     }
+   DefclassData(theEnv)->ClassIDMap[DefclassData(theEnv)->MaxClassID] = cls;
+   cls->id = DefclassData(theEnv)->MaxClassID++;
+  }
+
+/*********************************************************
+  NAME         : AddSlotName
+  DESCRIPTION  : Adds a new slot entry (or increments
+                 the use count of an existing node).
+  INPUTS       : 1) The slot name
+                 2) The new canonical id for the slot name
+                 3) A flag indicating whether the
+                    given id must be used or not
+  RETURNS      : The id of the (old) node
+  SIDE EFFECTS : Slot name entry added or use count
+                 incremented
+  NOTES        : None
+ *********************************************************/
+SLOT_NAME *AddSlotName(
+  Environment *theEnv,
+  CLIPSLexeme *slotName,
+  unsigned short newid,
+  bool usenewid)
+  {
+   SLOT_NAME *snp;
+   unsigned hashTableIndex;
+   char *buf;
+   size_t bufsz;
+
+   hashTableIndex = HashSlotName(slotName);
+   snp = DefclassData(theEnv)->SlotNameTable[hashTableIndex];
+   while ((snp != NULL) ? (snp->name != slotName) : false)
+     snp = snp->nxt;
+   if (snp != NULL)
+     {
+      if (usenewid && (newid != snp->id))
+        {
+         SystemError(theEnv,"CLASSFUN",1);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+      snp->use++;
+     }
+   else
+     {
+      snp = get_struct(theEnv,slotName);
+      snp->name = slotName;
+      snp->hashTableIndex = hashTableIndex;
+      snp->use = 1;
+      snp->id = (unsigned short) (usenewid ? newid : DefclassData(theEnv)->newSlotID++);
+      snp->nxt = DefclassData(theEnv)->SlotNameTable[hashTableIndex];
+      DefclassData(theEnv)->SlotNameTable[hashTableIndex] = snp;
+      IncrementLexemeCount(slotName);
+      bufsz = (sizeof(char) *
+                     (PUT_PREFIX_LENGTH + strlen(slotName->contents) + 1));
+      buf = (char *) gm2(theEnv,bufsz);
+      genstrcpy(buf,PUT_PREFIX);
+      genstrcat(buf,slotName->contents);
+      snp->putHandlerName = CreateSymbol(theEnv,buf);
+      IncrementLexemeCount(snp->putHandlerName);
+      rm(theEnv,buf,bufsz);
+      snp->bsaveIndex = 0L;
+    }
+   return(snp);
+  }
+
+/***************************************************
+  NAME         : DeleteSlotName
+  DESCRIPTION  : Removes a slot name entry from
+                 the table of all slot names if
+                 no longer in use
+  INPUTS       : The slot name hash node
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot name entry deleted or use
+                 count decremented
+  NOTES        : None
+ ***************************************************/
+void DeleteSlotName(
+  Environment *theEnv,
+  SLOT_NAME *slotName)
+  {
+   SLOT_NAME *snp,*prv;
+
+   if (slotName == NULL)
+     return;
+   prv = NULL;
+   snp = DefclassData(theEnv)->SlotNameTable[slotName->hashTableIndex];
+   while (snp != slotName)
+     {
+      prv = snp;
+      snp = snp->nxt;
+     }
+   snp->use--;
+   if (snp->use != 0)
+     return;
+   if (prv == NULL)
+     DefclassData(theEnv)->SlotNameTable[snp->hashTableIndex] = snp->nxt;
+   else
+     prv->nxt = snp->nxt;
+   ReleaseLexeme(theEnv,snp->name);
+   ReleaseLexeme(theEnv,snp->putHandlerName);
+   rtn_struct(theEnv,slotName,snp);
+  }
+
+/*******************************************************************
+  NAME         : RemoveDefclass
+  DESCRIPTION  : Deallocates a class structure and
+                 all its fields - returns all symbols
+                 in use by the class back to the symbol
+                 manager for ephemeral removal
+  INPUTS       : The address of the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Assumes class has no subclasses
+                 IMPORTANT WARNING!! : Assumes class
+                   busy count and all instances' busy
+                   counts are 0 and all handlers' busy counts are 0!
+ *******************************************************************/
+void RemoveDefclass(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   DefmessageHandler *hnd;
+   unsigned long i;
+   CLASS_ALPHA_LINK *currentAlphaLink;
+   CLASS_ALPHA_LINK *nextAlphaLink;
+
+   /* ====================================================
+      Remove all of this class's superclasses' links to it
+      ==================================================== */
+   for (i = 0 ; i < cls->directSuperclasses.classCount ; i++)
+     DeleteSubclassLink(theEnv,cls->directSuperclasses.classArray[i],cls);
+
+   /* ====================================================
+      Remove all of this class's subclasses' links to it
+      ==================================================== */
+   for (i = 0 ; i < cls->directSubclasses.classCount ; i++)
+     DeleteSuperclassLink(theEnv,cls->directSubclasses.classArray[i],cls);
+
+   RemoveClassFromTable(theEnv,cls);
+
+   InstallClass(theEnv,cls,false);
+
+   DeletePackedClassLinks(theEnv,&cls->directSuperclasses,false);
+   DeletePackedClassLinks(theEnv,&cls->allSuperclasses,false);
+   DeletePackedClassLinks(theEnv,&cls->directSubclasses,false);
+
+   for (i = 0 ; i < cls->slotCount ; i++)
+     {
+      if (cls->slots[i].defaultValue != NULL)
+        {
+         if (cls->slots[i].dynamicDefault)
+           ReturnPackedExpression(theEnv,(Expression *) cls->slots[i].defaultValue);
+         else
+           rtn_struct(theEnv,udfValue,cls->slots[i].defaultValue);
+        }
+      DeleteSlotName(theEnv,cls->slots[i].slotName);
+      RemoveConstraint(theEnv,cls->slots[i].constraint);
+     }
+
+   if (cls->instanceSlotCount != 0)
+     {
+      rm(theEnv,cls->instanceTemplate,
+         (sizeof(SlotDescriptor *) * cls->instanceSlotCount));
+      rm(theEnv,cls->slotNameMap,
+         (sizeof(unsigned) * (cls->maxSlotNameID + 1)));
+     }
+   if (cls->slotCount != 0)
+     rm(theEnv,cls->slots,(sizeof(SlotDescriptor) * cls->slotCount));
+
+   for (i = 0 ; i < cls->handlerCount ; i++)
+     {
+      hnd = &cls->handlers[i];
+      if (hnd->actions != NULL)
+        ReturnPackedExpression(theEnv,hnd->actions);
+      if (hnd->header.ppForm != NULL)
+        rm(theEnv,(void *) hnd->header.ppForm,(sizeof(char) * (strlen(hnd->header.ppForm)+1)));
+      if (hnd->header.usrData != NULL)
+        { ClearUserDataList(theEnv,hnd->header.usrData); }
+     }
+   if (cls->handlerCount != 0)
+     {
+      rm(theEnv,cls->handlers,(sizeof(DefmessageHandler) * cls->handlerCount));
+      rm(theEnv,cls->handlerOrderMap,(sizeof(unsigned) * cls->handlerCount));
+     }
+
+   currentAlphaLink = cls->relevant_terminal_alpha_nodes;
+   while (currentAlphaLink != NULL)
+     {
+      nextAlphaLink = currentAlphaLink->next;
+      rtn_struct(theEnv,classAlphaLink,currentAlphaLink);
+      currentAlphaLink = nextAlphaLink;
+     }
+   cls->relevant_terminal_alpha_nodes = NULL;
+
+   SetDefclassPPForm(theEnv,cls,NULL);
+   DeassignClassID(theEnv,cls->id);
+   rtn_struct(theEnv,defclass,cls);
+  }
+
+#endif
+
+/*******************************************************************
+  NAME         : DestroyDefclass
+  DESCRIPTION  : Deallocates a class structure and
+                 all its fields.
+  INPUTS       : The address of the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        :
+ *******************************************************************/
+void DestroyDefclass(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   long i;
+   CLASS_ALPHA_LINK *currentAlphaLink;
+   CLASS_ALPHA_LINK *nextAlphaLink;
+
+#if ! RUN_TIME
+   DefmessageHandler *hnd;
+   DeletePackedClassLinks(theEnv,&cls->directSuperclasses,false);
+   DeletePackedClassLinks(theEnv,&cls->allSuperclasses,false);
+   DeletePackedClassLinks(theEnv,&cls->directSubclasses,false);
+#endif
+   for (i = 0 ; i < cls->slotCount ; i++)
+     {
+      if (cls->slots[i].defaultValue != NULL)
+        {
+#if ! RUN_TIME
+         if (cls->slots[i].dynamicDefault)
+           ReturnPackedExpression(theEnv,(Expression *) cls->slots[i].defaultValue);
+         else
+           rtn_struct(theEnv,udfValue,cls->slots[i].defaultValue);
+#else
+         if (cls->slots[i].dynamicDefault == 0)
+           rtn_struct(theEnv,udfValue,cls->slots[i].defaultValue);
+#endif
+        }
+     }
+
+#if ! RUN_TIME
+   if (cls->instanceSlotCount != 0)
+     {
+      rm(theEnv,cls->instanceTemplate,
+         (sizeof(SlotDescriptor *) * cls->instanceSlotCount));
+      rm(theEnv,cls->slotNameMap,
+         (sizeof(unsigned) * (cls->maxSlotNameID + 1)));
+     }
+
+   if (cls->slotCount != 0)
+     rm(theEnv,cls->slots,(sizeof(SlotDescriptor) * cls->slotCount));
+
+   for (i = 0 ; i < cls->handlerCount ; i++)
+     {
+      hnd = &cls->handlers[i];
+      if (hnd->actions != NULL)
+        ReturnPackedExpression(theEnv,hnd->actions);
+
+      if (hnd->header.ppForm != NULL)
+        rm(theEnv,(void *) hnd->header.ppForm,(sizeof(char) * (strlen(hnd->header.ppForm)+1)));
+
+      if (hnd->header.usrData != NULL)
+        { ClearUserDataList(theEnv,hnd->header.usrData); }
+     }
+
+   if (cls->handlerCount != 0)
+     {
+      rm(theEnv,cls->handlers,(sizeof(DefmessageHandler) * cls->handlerCount));
+      rm(theEnv,cls->handlerOrderMap,(sizeof(unsigned) * cls->handlerCount));
+     }
+
+   currentAlphaLink = cls->relevant_terminal_alpha_nodes;
+   while (currentAlphaLink != NULL)
+     {
+      nextAlphaLink = currentAlphaLink->next;
+      rtn_struct(theEnv, classAlphaLink, currentAlphaLink);
+      currentAlphaLink = nextAlphaLink;
+     }
+   cls->relevant_terminal_alpha_nodes = NULL;
+
+   DestroyConstructHeader(theEnv,&cls->header);
+
+   rtn_struct(theEnv,defclass,cls);
+#else
+#if MAC_XCD
+#pragma unused(hnd)
+#endif
+#endif
+  }
+
+#if ! RUN_TIME
+
+/***************************************************
+  NAME         : InstallClass
+  DESCRIPTION  : In(De)crements all symbol counts for
+                 for symbols in use by class
+                 Disallows (allows) symbols to become
+                 ephemeral.
+  INPUTS       : 1) The class address
+                 2) 1 - install, 0 - deinstall
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void InstallClass(
+  Environment *theEnv,
+  Defclass *cls,
+  bool set)
+  {
+   SlotDescriptor *slot;
+   DefmessageHandler *hnd;
+   long i;
+
+   if ((set && cls->installed) ||
+       ((set == false) && (cls->installed == 0)))
+     return;
+
+   /* ==================================================================
+      Handler installation is handled when message-handlers are defined:
+      see ParseDefmessageHandler() in MSGCOM.C
+
+      Slot installation is handled by ParseSlot() in CLASSPSR.C
+      Scope map installation is handled by CreateClassScopeMap()
+      ================================================================== */
+   if (set == false)
+     {
+      cls->installed = 0;
+
+      ReleaseLexeme(theEnv,cls->header.name);
+
+#if DEFMODULE_CONSTRUCT
+      DecrementBitMapReferenceCount(theEnv,cls->scopeMap);
+#endif
+      ClearUserDataList(theEnv,cls->header.usrData);
+
+      for (i = 0 ; i < cls->slotCount ; i++)
+        {
+         slot = &cls->slots[i];
+         ReleaseLexeme(theEnv,slot->overrideMessage);
+         if (slot->defaultValue != NULL)
+           {
+            if (slot->dynamicDefault)
+              ExpressionDeinstall(theEnv,(Expression *) slot->defaultValue);
+            else
+              ReleaseUDFV(theEnv,(UDFValue *) slot->defaultValue);
+           }
+        }
+      for (i = 0 ; i < cls->handlerCount ; i++)
+        {
+         hnd = &cls->handlers[i];
+         ReleaseLexeme(theEnv,hnd->header.name);
+         if (hnd->actions != NULL)
+           ExpressionDeinstall(theEnv,hnd->actions);
+        }
+     }
+   else
+     {
+      cls->installed = 1;
+      IncrementLexemeCount(cls->header.name);
+     }
+  }
+
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/***************************************************
+  NAME         : IsClassBeingUsed
+  DESCRIPTION  : Checks the busy flag of a class
+                   and ALL classes that inherit from
+                   it to make sure that it is not
+                   in use before deletion
+  INPUTS       : The class
+  RETURNS      : True if in use, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : Recursively examines all subclasses
+ ***************************************************/
+bool IsClassBeingUsed(
+  Defclass *cls)
+  {
+   unsigned long i;
+
+   if (cls->busy > 0)
+     return true;
+   for (i = 0 ; i < cls->directSubclasses.classCount ; i++)
+     if (IsClassBeingUsed(cls->directSubclasses.classArray[i]))
+       return true;
+   return false;
+  }
+
+/***************************************************
+  NAME         : RemoveAllUserClasses
+  DESCRIPTION  : Removes all classes
+  INPUTS       : None
+  RETURNS      : True if succesful, false otherwise
+  SIDE EFFECTS : The class hash table is cleared
+  NOTES        : None
+ ***************************************************/
+bool RemoveAllUserClasses(
+  Environment *theEnv)
+  {
+   Defclass *userClasses, *ctmp;
+   bool success = true;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv))
+     return false;
+#endif
+   /* ====================================================
+      Don't delete built-in system classes at head of list
+      ==================================================== */
+   userClasses = GetNextDefclass(theEnv,NULL);
+   while (userClasses != NULL)
+     {
+      if (userClasses->system == 0)
+        break;
+      userClasses = GetNextDefclass(theEnv,userClasses);
+     }
+   while (userClasses != NULL)
+     {
+      ctmp = userClasses;
+      userClasses = GetNextDefclass(theEnv,userClasses);
+      if (DefclassIsDeletable(ctmp))
+        {
+         RemoveConstructFromModule(theEnv,&ctmp->header);
+         RemoveDefclass(theEnv,ctmp);
+        }
+      else
+        {
+         success = false;
+         CantDeleteItemErrorMessage(theEnv,"defclass",DefclassName(ctmp));
+        }
+     }
+   return(success);
+  }
+
+/****************************************************
+  NAME         : DeleteClassUAG
+  DESCRIPTION  : Deallocates a class and all its
+                 subclasses
+  INPUTS       : The address of the class
+  RETURNS      : 1 if successful, 0 otherwise
+  SIDE EFFECTS : Removes the class from each of
+                 its superclasses' subclass lists
+  NOTES        : None
+ ****************************************************/
+bool DeleteClassUAG(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   unsigned long subCount;
+
+   while (cls->directSubclasses.classCount != 0)
+     {
+      subCount = cls->directSubclasses.classCount;
+      DeleteClassUAG(theEnv,cls->directSubclasses.classArray[0]);
+      if (cls->directSubclasses.classCount == subCount)
+        return false;
+     }
+   if (DefclassIsDeletable(cls))
+     {
+      RemoveConstructFromModule(theEnv,&cls->header);
+      RemoveDefclass(theEnv,cls);
+      return true;
+     }
+   return false;
+  }
+
+/*********************************************************
+  NAME         : MarkBitMapSubclasses
+  DESCRIPTION  : Recursively marks the ids of a class
+                 and all its subclasses in a bitmap
+  INPUTS       : 1) The bitmap
+                 2) The class
+                 3) A code indicating whether to set
+                    or clear the bits of the map
+                    corresponding to the class ids
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : BitMap marked
+  NOTES        : IMPORTANT!!!!  Assumes the bitmap is
+                 large enough to hold all ids encountered!
+ *********************************************************/
+void MarkBitMapSubclasses(
+  char *map,
+  Defclass *cls,
+  int set)
+  {
+   unsigned long i;
+
+   if (set)
+     SetBitMap(map,cls->id);
+   else
+     ClearBitMap(map,cls->id);
+   for (i = 0 ; i < cls->directSubclasses.classCount ; i++)
+     MarkBitMapSubclasses(map,cls->directSubclasses.classArray[i],set);
+  }
+
+#endif
+
+/***************************************************
+  NAME         : FindSlotNameID
+  DESCRIPTION  : Finds the id of a slot name
+  INPUTS       : The slot name
+  RETURNS      : The slot name id (-1 if not found)
+  SIDE EFFECTS : None
+  NOTES        : A slot name always has the same
+                 id regardless of what class uses
+                 it.  In this way, a slot can
+                 be referred to by index independent
+                 of class.  Each class stores a
+                 map showing which slot name indices
+                 go to which slot.  This provides
+                 for immediate lookup of slots
+                 given the index (object pattern
+                 matching uses this).
+ ***************************************************/
+unsigned short FindSlotNameID(
+  Environment *theEnv,
+  CLIPSLexeme *slotName)
+  {
+   SLOT_NAME *snp;
+
+   snp = DefclassData(theEnv)->SlotNameTable[HashSlotName(slotName)];
+   
+   while ((snp != NULL) ? (snp->name != slotName) : false)
+     { snp = snp->nxt; }
+     
+   return (snp != NULL) ? snp->id : SLOT_NAME_NOT_FOUND;
+  }
+
+/***************************************************
+  NAME         : FindIDSlotName
+  DESCRIPTION  : Finds the slot anme for an id
+  INPUTS       : The id
+  RETURNS      : The slot name (NULL if not found)
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+CLIPSLexeme *FindIDSlotName(
+  Environment *theEnv,
+  unsigned short id)
+  {
+   SLOT_NAME *snp;
+
+   snp = FindIDSlotNameHash(theEnv,id);
+   
+   return((snp != NULL) ? snp->name : NULL);
+  }
+
+/***************************************************
+  NAME         : FindIDSlotNameHash
+  DESCRIPTION  : Finds the slot anme for an id
+  INPUTS       : The id
+  RETURNS      : The slot name (NULL if not found)
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+SLOT_NAME *FindIDSlotNameHash(
+  Environment *theEnv,
+  unsigned short id)
+  {
+   unsigned short i;
+   SLOT_NAME *snp;
+
+   for (i = 0 ; i < SLOT_NAME_TABLE_HASH_SIZE ; i++)
+     {
+      snp = DefclassData(theEnv)->SlotNameTable[i];
+      while (snp != NULL)
+        {
+         if (snp->id == id)
+           return snp;
+         snp = snp->nxt;
+        }
+     }
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : GetTraversalID
+  DESCRIPTION  : Returns a unique integer ID for a
+                  traversal into the class hierarchy
+  INPUTS       : None
+  RETURNS      : The id, or -1 if none available
+  SIDE EFFECTS : EvaluationError set when no ids
+                   available
+  NOTES        : Used for recursive traversals of
+                  class hierarchy to assure that a
+                  class is only visited once
+ ***************************************************/
+int GetTraversalID(
+  Environment *theEnv)
+  {
+   unsigned i;
+   Defclass *cls;
+
+   if (DefclassData(theEnv)->CTID >= MAX_TRAVERSALS)
+     {
+      PrintErrorID(theEnv,"CLASSFUN",2,false);
+      WriteString(theEnv,STDERR,"Maximum number of simultaneous class hierarchy\n  traversals exceeded ");
+      WriteInteger(theEnv,STDERR,MAX_TRAVERSALS);
+      WriteString(theEnv,STDERR,".\n");
+      SetEvaluationError(theEnv,true);
+      return(-1);
+     }
+
+   for (i = 0 ; i < CLASS_TABLE_HASH_SIZE ; i++)
+     for (cls = DefclassData(theEnv)->ClassTable[i] ; cls != NULL ; cls = cls->nxtHash)
+       ClearTraversalID(cls->traversalRecord,DefclassData(theEnv)->CTID);
+   return(DefclassData(theEnv)->CTID++);
+  }
+
+/***************************************************
+  NAME         : ReleaseTraversalID
+  DESCRIPTION  : Releases an ID for future use
+                 Also clears id from all classes
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Old ID released for later reuse
+  NOTES        : Releases ID returned by most recent
+                   call to GetTraversalID()
+ ***************************************************/
+void ReleaseTraversalID(
+  Environment *theEnv)
+  {
+   DefclassData(theEnv)->CTID--;
+  }
+
+/*******************************************************
+  NAME         : HashClass
+  DESCRIPTION  : Generates a hash index for a given
+                 class name
+  INPUTS       : The address of the class name SYMBOL_HN
+  RETURNS      : The hash index value
+  SIDE EFFECTS : None
+  NOTES        : Counts on the fact that the symbol
+                 has already been hashed into the
+                 symbol table - uses that hash value
+                 multiplied by a prime for a new hash
+ *******************************************************/
+unsigned int HashClass(
+  CLIPSLexeme *cname)
+  {
+   unsigned int tally;
+
+   tally = cname->bucket * BIG_PRIME;
+   
+   return tally % CLASS_TABLE_HASH_SIZE;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*******************************************************
+  NAME         : HashSlotName
+  DESCRIPTION  : Generates a hash index for a given
+                 slot name
+  INPUTS       : The address of the slot name SYMBOL_HN
+  RETURNS      : The hash index value
+  SIDE EFFECTS : None
+  NOTES        : Counts on the fact that the symbol
+                 has already been hashed into the
+                 symbol table - uses that hash value
+                 multiplied by a prime for a new hash
+ *******************************************************/
+static unsigned int HashSlotName(
+  CLIPSLexeme *sname)
+  {
+   unsigned int tally;
+
+   tally = sname->bucket * BIG_PRIME;
+   
+   return tally % SLOT_NAME_TABLE_HASH_SIZE;
+  }
+
+#if (! RUN_TIME)
+
+/***************************************************
+  NAME         : DeassignClassID
+  DESCRIPTION  : Reduces id map and MaxClassID if
+                 no ids in use above the one being
+                 released.
+  INPUTS       : The id
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : ID map and MaxClassID possibly
+                 reduced
+  NOTES        : None
+ ***************************************************/
+static void DeassignClassID(
+  Environment *theEnv,
+  unsigned short id)
+  {
+   unsigned short i;
+   bool reallocReqd;
+   unsigned short oldChunk = 0, newChunk = 0;
+
+   DefclassData(theEnv)->ClassIDMap[id] = NULL;
+   for (i = id + 1 ; i < DefclassData(theEnv)->MaxClassID ; i++)
+     if (DefclassData(theEnv)->ClassIDMap[i] != NULL)
+       return;
+      
+   reallocReqd = false;
+   while (DefclassData(theEnv)->ClassIDMap[id] == NULL)
+     {
+      DefclassData(theEnv)->MaxClassID = id;
+      if ((DefclassData(theEnv)->MaxClassID % CLASS_ID_MAP_CHUNK) == 0)
+        {
+         newChunk = DefclassData(theEnv)->MaxClassID;
+         if (reallocReqd == false)
+           {
+            oldChunk = (DefclassData(theEnv)->MaxClassID + CLASS_ID_MAP_CHUNK);
+            reallocReqd = true;
+           }
+        }
+      if (id == 0)
+        break;
+      id--;
+     }
+   if (reallocReqd)
+     {
+      DefclassData(theEnv)->ClassIDMap = (Defclass **) genrealloc(theEnv,DefclassData(theEnv)->ClassIDMap,
+                       (oldChunk * sizeof(Defclass *)),
+                       (newChunk * sizeof(Defclass *)));
+
+      DefclassData(theEnv)->AvailClassID = newChunk;
+     }
+  }
+
+#endif
+
+#endif
diff --git a/clips/classfun.h b/clips/classfun.h
new file mode 100755
index 000000000..d6c285320
--- /dev/null
+++ b/clips/classfun.h
@@ -0,0 +1,160 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  01/21/18            */
+   /*                                                     */
+   /*             CLASS FUNCTIONS HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Used genstrcpy and genstrcat instead of strcpy */
+/*            and strcat.                                    */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Optimization of slot ID creation previously    */
+/*            provided by NewSlotNameID function.            */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed initial-object support.                */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_classfun
+
+#pragma once
+
+#define _H_classfun
+
+#include "object.h"
+#include "scanner.h"
+
+#define TestTraversalID(traversalRecord,id) TestBitMap(traversalRecord,id)
+#define SetTraversalID(traversalRecord,id) SetBitMap(traversalRecord,id)
+#define ClearTraversalID(traversalRecord,id) ClearBitMap(traversalRecord,id)
+
+#define CLASS_TABLE_HASH_SIZE     167 // TBD Larger?
+#define SLOT_NAME_TABLE_HASH_SIZE 167 // TBD Larger?
+
+#define ISA_ID  0
+#define NAME_ID 1
+
+#define SLOT_NAME_NOT_FOUND USHRT_MAX
+
+   void                           IncrementDefclassBusyCount(Environment *,Defclass *);
+   void                           DecrementDefclassBusyCount(Environment *,Defclass *);
+   bool                           InstancesPurge(Environment *,void *);
+
+#if ! RUN_TIME
+   void                           InitializeClasses(Environment *);
+#endif
+   SlotDescriptor                *FindClassSlot(Defclass *,CLIPSLexeme *);
+   void                           ClassExistError(Environment *,const char *,const char *);
+   void                           DeleteClassLinks(Environment *,CLASS_LINK *);
+   void                           PrintClassName(Environment *,const char *,Defclass *,bool,bool);
+
+#if DEBUGGING_FUNCTIONS || ((! BLOAD_ONLY) && (! RUN_TIME))
+   void                           PrintPackedClassLinks(Environment *,const char *,const char *,PACKED_CLASS_LINKS *);
+#endif
+
+#if ! RUN_TIME
+   void                           PutClassInTable(Environment *,Defclass *);
+   void                           RemoveClassFromTable(Environment *,Defclass *);
+   void                           AddClassLink(Environment *,PACKED_CLASS_LINKS *,Defclass *,bool,unsigned int);
+   void                           DeleteSubclassLink(Environment *,Defclass *,Defclass *);
+   void                           DeleteSuperclassLink(Environment *,Defclass *,Defclass *);
+   Defclass                      *NewClass(Environment *,CLIPSLexeme *);
+   void                           DeletePackedClassLinks(Environment *,PACKED_CLASS_LINKS *,bool);
+   void                           AssignClassID(Environment *,Defclass *);
+   SLOT_NAME                     *AddSlotName(Environment *,CLIPSLexeme *,unsigned short,bool);
+   void                           DeleteSlotName(Environment *,SLOT_NAME *);
+   void                           RemoveDefclass(Environment *,Defclass *);
+   void                           InstallClass(Environment *,Defclass *,bool);
+#endif
+   void                           DestroyDefclass(Environment *,Defclass *);
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   bool                           IsClassBeingUsed(Defclass *);
+   bool                           RemoveAllUserClasses(Environment *);
+   bool                           DeleteClassUAG(Environment *,Defclass *);
+   void                           MarkBitMapSubclasses(char *,Defclass *,int);
+#endif
+
+   unsigned short                 FindSlotNameID(Environment *,CLIPSLexeme *);
+   CLIPSLexeme                   *FindIDSlotName(Environment *,unsigned short);
+   SLOT_NAME                     *FindIDSlotNameHash(Environment *,unsigned short); 
+   int                            GetTraversalID(Environment *);
+   void                           ReleaseTraversalID(Environment *);
+   unsigned int                   HashClass(CLIPSLexeme *);
+
+#define DEFCLASS_DATA 21
+
+#define PRIMITIVE_CLASSES 9
+
+#include "classcom.h"
+
+struct defclassData
+  {
+   Construct *DefclassConstruct;
+   unsigned DefclassModuleIndex;
+   EntityRecord DefclassEntityRecord;
+   Defclass *PrimitiveClassMap[PRIMITIVE_CLASSES];
+   Defclass **ClassIDMap;
+   Defclass **ClassTable;
+   unsigned short MaxClassID;
+   unsigned short AvailClassID;
+   SLOT_NAME **SlotNameTable;
+   CLIPSLexeme *ISA_SYMBOL;
+   CLIPSLexeme *NAME_SYMBOL;
+#if DEBUGGING_FUNCTIONS
+   bool WatchInstances;
+   bool WatchSlots;
+#endif
+   unsigned short CTID;
+   struct token ObjectParseToken;
+   ClassDefaultsMode ClassDefaultsModeValue;
+   int newSlotID;
+  };
+
+#define DefclassData(theEnv) ((struct defclassData *) GetEnvironmentData(theEnv,DEFCLASS_DATA))
+
+#endif
+
+
+
+
+
+
+
+
+
diff --git a/clips/classinf.c b/clips/classinf.c
new file mode 100755
index 000000000..ebfecf256
--- /dev/null
+++ b/clips/classinf.c
@@ -0,0 +1,1245 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*        CLASS INFO PROGRAMMATIC ACCESS MODULE        */
+   /*******************************************************/
+
+/**************************************************************/
+/* Purpose: Class Information Interface Support Routines      */
+/*                                                            */
+/* Principal Programmer(s):                                   */
+/*      Brian L. Dantes                                       */
+/*                                                            */
+/* Contributing Programmer(s):                                */
+/*                                                            */
+/* Revision History:                                          */
+/*                                                            */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859   */
+/*                                                            */
+/*            Changed name of variable exp to theExp          */
+/*            because of Unix compiler warnings of shadowed   */
+/*            definitions.                                    */
+/*                                                            */
+/*      6.24: Added allowed-classes slot facet.               */
+/*                                                            */
+/*            Converted INSTANCE_PATTERN_MATCHING to          */
+/*            DEFRULE_CONSTRUCT.                              */
+/*                                                            */
+/*            Renamed BOOLEAN macro type to intBool.          */
+/*                                                            */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior  */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.     */
+/*                                                            */
+/*            Changed integer type/precision.                 */
+/*                                                            */
+/*            Added const qualifiers to remove C++            */
+/*            deprecation warnings.                           */
+/*                                                            */
+/*            Converted API macros to function calls.         */
+/*                                                            */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/**************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "classcom.h"
+#include "classexm.h"
+#include "classfun.h"
+#include "classini.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "insfun.h"
+#include "msgcom.h"
+#include "msgfun.h"
+#include "multifld.h"
+#include "prntutil.h"
+
+#include "classinf.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    SlotInfoSupportFunction(UDFContext *,UDFValue *,const char *,bool (*)(Defclass *,const char *,CLIPSValue *));
+   static unsigned                CountSubclasses(Defclass *,bool,int);
+   static unsigned                StoreSubclasses(Multifield *,unsigned,Defclass *,int,int,bool);
+   static SlotDescriptor         *SlotInfoSlot(Environment *,UDFValue *,Defclass *,const char *,const char *);
+
+/*********************************************************************
+  NAME         : ClassAbstractPCommand
+  DESCRIPTION  : Determines if direct instances of a class can be made
+  INPUTS       : None
+  RETURNS      : True (1) if class is abstract, false (0) if concrete
+  SIDE EFFECTS : None
+  NOTES        : Syntax: (class-abstractp <class>)
+ *********************************************************************/
+void ClassAbstractPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Defclass *cls;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   cls = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if (cls == NULL)
+     {
+      ClassExistError(theEnv,"class-abstractp",theArg.lexemeValue->contents);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,(ClassAbstractP(cls)));
+  }
+
+#if DEFRULE_CONSTRUCT
+
+/*****************************************************************
+  NAME         : ClassReactivePCommand
+  DESCRIPTION  : Determines if instances of a class can match rule
+                 patterns
+  INPUTS       : None
+  RETURNS      : True (1) if class is reactive, false (0)
+                 if non-reactive
+  SIDE EFFECTS : None
+  NOTES        : Syntax: (class-reactivep <class>)
+ *****************************************************************/
+void ClassReactivePCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Defclass *cls;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   cls = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if (cls == NULL)
+     {
+      ClassExistError(theEnv,"class-reactivep",theArg.lexemeValue->contents);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,ClassReactiveP(cls));
+  }
+
+#endif
+
+/***********************************************************
+  NAME         : ClassInfoFnxArgs
+  DESCRIPTION  : Examines arguments for:
+                   class-slots, get-defmessage-handler-list,
+                   class-superclasses and class-subclasses
+  INPUTS       : 1) Name of function
+                 2) A buffer to hold a flag indicating if
+                    the inherit keyword was specified
+  RETURNS      : Pointer to the class on success,
+                   NULL on errors
+  SIDE EFFECTS : inhp flag set
+                 error flag set
+  NOTES        : None
+ ***********************************************************/
+Defclass *ClassInfoFnxArgs(
+  UDFContext *context,
+  const char *fnx,
+  bool *inhp)
+  {
+   Defclass *clsptr;
+   UDFValue theArg;
+   Environment *theEnv = context->environment;
+
+   *inhp = false;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return NULL; }
+
+   clsptr = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if (clsptr == NULL)
+     {
+      ClassExistError(theEnv,fnx,theArg.lexemeValue->contents);
+      return NULL;
+     }
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+        { return NULL; }
+
+      if (strcmp(theArg.lexemeValue->contents,"inherit") == 0)
+        { *inhp = true; }
+      else
+        {
+         SyntaxErrorMessage(theEnv,fnx);
+         SetEvaluationError(theEnv,true);
+         return NULL;
+        }
+     }
+
+   return clsptr;
+  }
+
+/********************************************************************
+  NAME         : ClassSlotsCommand
+  DESCRIPTION  : Groups slot info for a class into a multifield value
+                   for dynamic perusal
+  INPUTS       : Data object buffer to hold the slots of the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the names of
+                    the slots of the class
+  NOTES        : Syntax: (class-slots <class> [inherit])
+ ********************************************************************/
+void ClassSlotsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool inhp;
+   Defclass *clsptr;
+   CLIPSValue result;
+
+   clsptr = ClassInfoFnxArgs(context,"class-slots",&inhp);
+   if (clsptr == NULL)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+   ClassSlots(clsptr,&result,inhp);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/************************************************************************
+  NAME         : ClassSuperclassesCommand
+  DESCRIPTION  : Groups superclasses for a class into a multifield value
+                   for dynamic perusal
+  INPUTS       : Data object buffer to hold the superclasses of the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the names of
+                    the superclasses of the class
+  NOTES        : Syntax: (class-superclasses <class> [inherit])
+ ************************************************************************/
+void ClassSuperclassesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool inhp;
+   Defclass *clsptr;
+   CLIPSValue result;
+
+   clsptr = ClassInfoFnxArgs(context,"class-superclasses",&inhp);
+   if (clsptr == NULL)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+   ClassSuperclasses(clsptr,&result,inhp);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/************************************************************************
+  NAME         : ClassSubclassesCommand
+  DESCRIPTION  : Groups subclasses for a class into a multifield value
+                   for dynamic perusal
+  INPUTS       : Data object buffer to hold the subclasses of the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the names of
+                    the subclasses of the class
+  NOTES        : Syntax: (class-subclasses <class> [inherit])
+ ************************************************************************/
+void ClassSubclassesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool inhp;
+   Defclass *clsptr;
+   CLIPSValue result;
+
+   clsptr = ClassInfoFnxArgs(context,"class-subclasses",&inhp);
+   if (clsptr == NULL)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+   ClassSubclasses(clsptr,&result,inhp);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/***********************************************************************
+  NAME         : GetDefmessageHandlersListCmd
+  DESCRIPTION  : Groups message-handlers for a class into a multifield
+                   value for dynamic perusal
+  INPUTS       : Data object buffer to hold the handlers of the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the names of
+                    the message-handlers of the class
+  NOTES        : Syntax: (get-defmessage-handler-list <class> [inherit])
+ ***********************************************************************/
+void GetDefmessageHandlersListCmd(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool inhp;
+   Defclass *clsptr;
+   CLIPSValue result;
+
+   if (! UDFHasNextArgument(context))
+     {
+      GetDefmessageHandlerList(theEnv,NULL,&result,false);
+      CLIPSToUDFValue(&result,returnValue);
+     }
+   else
+     {
+      clsptr = ClassInfoFnxArgs(context,"get-defmessage-handler-list",&inhp);
+      if (clsptr == NULL)
+        {
+         SetMultifieldErrorValue(theEnv,returnValue);
+         return;
+        }
+        
+      GetDefmessageHandlerList(theEnv,clsptr,&result,inhp);
+      CLIPSToUDFValue(&result,returnValue);
+     }
+  }
+
+/*********************************
+ Slot Information Access Functions
+ *********************************/
+void SlotFacetsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   SlotInfoSupportFunction(context,returnValue,"slot-facets",SlotFacets);
+  }
+
+void SlotSourcesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   SlotInfoSupportFunction(context,returnValue,"slot-sources",SlotSources);
+  }
+
+void SlotTypesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   SlotInfoSupportFunction(context,returnValue,"slot-types",SlotTypes);
+  }
+
+void SlotAllowedValuesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   SlotInfoSupportFunction(context,returnValue,"slot-allowed-values",SlotAllowedValues);
+  }
+
+void SlotAllowedClassesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   SlotInfoSupportFunction(context,returnValue,"slot-allowed-classes",SlotAllowedClasses);
+  }
+
+void SlotRangeCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   SlotInfoSupportFunction(context,returnValue,"slot-range",SlotRange);
+  }
+
+void SlotCardinalityCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   SlotInfoSupportFunction(context,returnValue,"slot-cardinality",SlotCardinality);
+  }
+
+/********************************************************************
+  NAME         : ClassAbstractP
+  DESCRIPTION  : Determines if a class is abstract or not
+  INPUTS       : Generic pointer to class
+  RETURNS      : 1 if class is abstract, 0 otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************************/
+bool ClassAbstractP(
+  Defclass *theDefclass)
+  {
+   return theDefclass->abstract;
+  }
+
+#if DEFRULE_CONSTRUCT
+
+/********************************************************************
+  NAME         : ClassReactiveP
+  DESCRIPTION  : Determines if a class is reactive or not
+  INPUTS       : Generic pointer to class
+  RETURNS      : 1 if class is reactive, 0 otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************************/
+bool ClassReactiveP(
+  Defclass *theDefclass)
+  {
+   return theDefclass->reactive;
+  }
+
+#endif
+
+/********************************************************************
+  NAME         : ClassSlots
+  DESCRIPTION  : Groups slot info for a class into a multifield value
+                   for dynamic perusal
+  INPUTS       : 1) Generic pointer to class
+                 2) Data object buffer to hold the slots of the class
+                 3) Include (1) or exclude (0) inherited slots
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the names of
+                    the slots of the class
+  NOTES        : None
+ ********************************************************************/
+void ClassSlots(
+  Defclass *theDefclass,
+  CLIPSValue *returnValue,
+  bool inhp)
+  {
+   size_t size;
+   unsigned i;
+   Environment *theEnv = theDefclass->header.env;
+
+   size = inhp ? theDefclass->instanceSlotCount : theDefclass->slotCount;
+
+   returnValue->value = CreateMultifield(theEnv,size);
+
+   if (size == 0)
+     { return; }
+
+   if (inhp)
+     {
+      for (i = 0 ; i < theDefclass->instanceSlotCount ; i++)
+        {
+         returnValue->multifieldValue->contents[i].value =
+            theDefclass->instanceTemplate[i]->slotName->name;
+        }
+     }
+   else
+     {
+      for (i = 0 ; i < theDefclass->slotCount ; i++)
+        {
+         returnValue->multifieldValue->contents[i].value =
+            theDefclass->slots[i].slotName->name;
+        }
+     }
+  }
+
+/************************************************************************
+  NAME         : GetDefmessageHandlerList
+  DESCRIPTION  : Groups handler info for a class into a multifield value
+                   for dynamic perusal
+  INPUTS       : 1) Generic pointer to class (NULL to get handlers for
+                    all classes)
+                 2) Data object buffer to hold the handlers of the class
+                 3) Include (1) or exclude (0) inherited handlers
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the names and types of
+                    the message-handlers of the class
+  NOTES        : None
+ ************************************************************************/
+void GetDefmessageHandlerList(
+  Environment *theEnv,
+  Defclass *theDefclass,
+  CLIPSValue *returnValue,
+  bool inhp)
+  {
+   Defclass *cls,*svcls,*svnxt,*supcls;
+   long j;
+   unsigned long classi, classiLimit;
+   unsigned long i, sublen, len;
+
+   if (theDefclass == NULL)
+     {
+      inhp = 0;
+      cls = GetNextDefclass(theEnv,NULL);
+      svnxt = GetNextDefclass(theEnv,cls);
+     }
+   else
+     {
+      cls = theDefclass;
+      svnxt = GetNextDefclass(theEnv,theDefclass);
+      SetNextDefclass(cls,NULL);
+     }
+
+   for (svcls = cls , i = 0 ;
+        cls != NULL ;
+        cls = GetNextDefclass(theEnv,cls))
+     {
+      classiLimit = inhp ? cls->allSuperclasses.classCount : 1;
+      for (classi = 0 ; classi < classiLimit ; classi++)
+        { i += cls->allSuperclasses.classArray[classi]->handlerCount; }
+     }
+
+   len = i * 3;
+
+   returnValue->value = CreateMultifield(theEnv,len);
+
+   for (cls = svcls , sublen = 0 ;
+        cls != NULL ;
+        cls = GetNextDefclass(theEnv,cls))
+     {
+      classiLimit = inhp ? cls->allSuperclasses.classCount : 1;
+      for (classi = 0 ; classi < classiLimit ; classi++)
+        {
+         supcls = cls->allSuperclasses.classArray[classi];
+
+         if (inhp == 0)
+           { i = sublen; }
+         else
+           { i = len - (supcls->handlerCount * 3) - sublen; }
+
+         for (j = 0 ; j < supcls->handlerCount ; j++)
+           {
+            returnValue->multifieldValue->contents[i++].value = GetDefclassNamePointer(supcls);
+            returnValue->multifieldValue->contents[i++].value = supcls->handlers[j].header.name;
+            returnValue->multifieldValue->contents[i++].value = CreateSymbol(theEnv,MessageHandlerData(theEnv)->hndquals[supcls->handlers[j].type]);
+           }
+
+         sublen += supcls->handlerCount * 3;
+        }
+     }
+
+   if (svcls != NULL)
+     { SetNextDefclass(svcls,svnxt); }
+  }
+
+/***************************************************************************
+  NAME         : ClassSuperclasses
+  DESCRIPTION  : Groups the names of superclasses into a multifield
+                   value for dynamic perusal
+  INPUTS       : 1) Generic pointer to class
+                 2) Data object buffer to hold the superclasses of the class
+                 3) Include (1) or exclude (0) indirect superclasses
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the names of
+                    the superclasses of the class
+  NOTES        : None
+ ***************************************************************************/
+void ClassSuperclasses(
+  Defclass *theDefclass,
+  CLIPSValue *returnValue,
+  bool inhp)
+  {
+   PACKED_CLASS_LINKS *plinks;
+   unsigned offset;
+   unsigned long i, j;
+   Environment *theEnv = theDefclass->header.env;
+   
+   if (inhp)
+     {
+      plinks = &theDefclass->allSuperclasses;
+      offset = 1;
+     }
+   else
+     {
+      plinks = &theDefclass->directSuperclasses;
+      offset = 0;
+     }
+
+   returnValue->value = CreateMultifield(theEnv,(plinks->classCount - offset));
+
+   if (returnValue->multifieldValue->length == 0)
+     { return; }
+
+   for (i = offset, j = 0 ; i < plinks->classCount; i++, j++)
+     {
+      returnValue->multifieldValue->contents[j].value = GetDefclassNamePointer(plinks->classArray[i]);
+     }
+  }
+
+/**************************************************************************
+  NAME         : ClassSubclasses
+  DESCRIPTION  : Groups the names of subclasses for a class into a
+                   multifield value for dynamic perusal
+  INPUTS       : 1) Generic pointer to class
+                 2) Data object buffer to hold the sublclasses of the class
+                 3) Include (1) or exclude (0) indirect subclasses
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the names
+                    the subclasses of the class
+  NOTES        : None
+ **************************************************************************/
+void ClassSubclasses(
+  Defclass *theDefclass,
+  CLIPSValue *returnValue,
+  bool inhp)
+  {
+   unsigned i;
+   int id;
+   Environment *theEnv = theDefclass->header.env;
+
+   if ((id = GetTraversalID(theEnv)) == -1)
+     { return; }
+
+   i = CountSubclasses(theDefclass,inhp,id);
+
+   ReleaseTraversalID(theEnv);
+
+   returnValue->value = CreateMultifield(theEnv,i);
+
+   if (i == 0)
+     { return; }
+
+   if ((id = GetTraversalID(theEnv)) == -1)
+     { return; }
+
+   StoreSubclasses(returnValue->multifieldValue,0,theDefclass,inhp,id,true);
+   ReleaseTraversalID(theEnv);
+  }
+
+/**************************************************************************
+  NAME         : ClassSubclassAddresses
+  DESCRIPTION  : Groups the class addresses of subclasses for a class into a
+                   multifield value for dynamic perusal
+  INPUTS       : 1) Generic pointer to class
+                 2) Data object buffer to hold the sublclasses of the class
+                 3) Include (1) or exclude (0) indirect subclasses
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the subclass
+                    addresss of the class
+  NOTES        : None
+ **************************************************************************/
+void ClassSubclassAddresses(
+  Environment *theEnv,
+  Defclass *theDefclass,
+  UDFValue *returnValue,
+  bool inhp)
+  {
+   unsigned i;
+   int id;
+
+   if ((id = GetTraversalID(theEnv)) == -1)
+     { return; }
+
+   i = CountSubclasses(theDefclass,inhp,id);
+
+   ReleaseTraversalID(theEnv);
+
+   returnValue->begin = 0;
+   returnValue->range = i;
+   returnValue->value = CreateMultifield(theEnv,i);
+
+   if (i == 0)
+     { return; }
+
+   if ((id = GetTraversalID(theEnv)) == -1)
+     { return; }
+
+   StoreSubclasses(returnValue->multifieldValue,0,theDefclass,inhp,id,false);
+   ReleaseTraversalID(theEnv);
+  }
+/**************************************************************************
+  NAME         : Slot...  Slot information access functions
+  DESCRIPTION  : Groups the sources/facets/types/allowed-values/range or
+                   cardinality  of a slot for a class into a multifield
+                   value for dynamic perusal
+  INPUTS       : 1) Generic pointer to class
+                 2) Name of the slot
+                 3) Data object buffer to hold the attributes of the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates a multifield storing the attributes for the slot
+                   of the class
+  NOTES        : None
+ **************************************************************************/
+
+/**************/
+/* SlotFacets */
+/**************/
+bool SlotFacets(
+  Defclass *theDefclass,
+  const char *sname,
+  CLIPSValue *returnValue)
+  {
+   SlotDescriptor *sp;
+   UDFValue result;
+   Environment *theEnv = theDefclass->header.env;
+
+   if ((sp = SlotInfoSlot(theEnv,&result,theDefclass,sname,"slot-facets")) == NULL)
+     {
+      NormalizeMultifield(theEnv,&result);
+      returnValue->value = result.value;
+      return false;
+     }
+
+#if DEFRULE_CONSTRUCT
+   returnValue->value = CreateMultifield(theEnv,10L);
+#else
+   returnValue->value = CreateMultifield(theEnv,9L);
+#endif
+
+   if (sp->multiple)
+     { returnValue->multifieldValue->contents[0].lexemeValue = CreateSymbol(theEnv,"MLT"); }
+   else
+     { returnValue->multifieldValue->contents[0].lexemeValue = CreateSymbol(theEnv,"SGL"); }
+
+   if (sp->noDefault)
+     returnValue->multifieldValue->contents[1].lexemeValue = CreateSymbol(theEnv,"NIL");
+   else
+     {
+      if (sp->dynamicDefault)
+        { returnValue->multifieldValue->contents[1].lexemeValue = CreateSymbol(theEnv,"DYN"); }
+      else
+        { returnValue->multifieldValue->contents[1].lexemeValue = CreateSymbol(theEnv,"STC"); }
+     }
+
+   if (sp->noInherit)
+     returnValue->multifieldValue->contents[2].lexemeValue = CreateSymbol(theEnv,"NIL");
+   else
+     returnValue->multifieldValue->contents[2].lexemeValue = CreateSymbol(theEnv,"INH");
+
+   if (sp->initializeOnly)
+     returnValue->multifieldValue->contents[3].lexemeValue = CreateSymbol(theEnv,"INT");
+   else if (sp->noWrite)
+     returnValue->multifieldValue->contents[3].lexemeValue = CreateSymbol(theEnv,"R");
+   else
+     returnValue->multifieldValue->contents[3].lexemeValue = CreateSymbol(theEnv,"RW");
+
+   if (sp->shared)
+     returnValue->multifieldValue->contents[4].lexemeValue = CreateSymbol(theEnv,"SHR");
+   else
+     returnValue->multifieldValue->contents[4].lexemeValue = CreateSymbol(theEnv,"LCL");
+
+#if DEFRULE_CONSTRUCT
+   if (sp->reactive)
+     returnValue->multifieldValue->contents[5].lexemeValue = CreateSymbol(theEnv,"RCT");
+   else
+     returnValue->multifieldValue->contents[5].lexemeValue = CreateSymbol(theEnv,"NIL");
+
+   if (sp->composite)
+     returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"CMP");
+   else
+     returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"EXC");
+
+   if (sp->publicVisibility)
+     returnValue->multifieldValue->contents[7].lexemeValue = CreateSymbol(theEnv,"PUB");
+   else
+     returnValue->multifieldValue->contents[7].lexemeValue = CreateSymbol(theEnv,"PRV");
+
+   returnValue->multifieldValue->contents[8].lexemeValue = CreateSymbol(theEnv,GetCreateAccessorString(sp));
+   returnValue->multifieldValue->contents[9].lexemeValue = (sp->noWrite ? CreateSymbol(theEnv,"NIL") : sp->overrideMessage);
+#else
+   if (sp->composite)
+     returnValue->multifieldValue->contents[5].lexemeValue = CreateSymbol(theEnv,"CMP");
+   else
+     returnValue->multifieldValue->contents[5].lexemeValue = CreateSymbol(theEnv,"EXC");
+
+   if (sp->publicVisibility)
+     returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"PUB");
+   else
+     returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"PRV");
+
+   returnValue->multifieldValue->contents[7].lexemeValue = CreateSymbol(theEnv,GetCreateAccessorString(sp));
+   returnValue->multifieldValue->contents[8].lexemeValue = (sp->noWrite ? CreateSymbol(theEnv,"NIL") : sp->overrideMessage);
+#endif
+
+   return true;
+  }
+
+/***************/
+/* SlotSources */
+/***************/
+bool SlotSources(
+  Defclass *theDefclass,
+  const char *sname,
+  CLIPSValue *returnValue)
+  {
+   unsigned i;
+   unsigned classi;
+   SlotDescriptor *sp, *csp;
+   CLASS_LINK *ctop,*ctmp;
+   Defclass *cls;
+   UDFValue result;
+   Environment *theEnv = theDefclass->header.env;
+
+   if ((sp = SlotInfoSlot(theEnv,&result,theDefclass,sname,"slot-sources")) == NULL)
+     {
+      NormalizeMultifield(theEnv,&result);
+      returnValue->value = result.value;
+      return false;
+     }
+   i = 1;
+   ctop = get_struct(theEnv,classLink);
+   ctop->cls = sp->cls;
+   ctop->nxt = NULL;
+   if (sp->composite)
+     {
+      for (classi = 1 ; classi < sp->cls->allSuperclasses.classCount ; classi++)
+        {
+         cls = sp->cls->allSuperclasses.classArray[classi];
+         csp = FindClassSlot(cls,sp->slotName->name);
+         if ((csp != NULL) ? (csp->noInherit == 0) : false)
+           {
+            ctmp = get_struct(theEnv,classLink);
+            ctmp->cls = cls;
+            ctmp->nxt = ctop;
+            ctop = ctmp;
+            i++;
+            if (csp->composite == 0)
+              break;
+           }
+        }
+     }
+
+   returnValue->value = CreateMultifield(theEnv,i);
+   for (ctmp = ctop , i = 0 ; ctmp != NULL ; ctmp = ctmp->nxt , i++)
+     {
+      returnValue->multifieldValue->contents[i].value = GetDefclassNamePointer(ctmp->cls);
+     }
+   DeleteClassLinks(theEnv,ctop);
+   
+   return true;
+  }
+
+/*************/
+/* SlotTypes */
+/*************/
+bool SlotTypes(
+  Defclass *theDefclass,
+  const char *sname,
+  CLIPSValue *returnValue)
+  {
+   unsigned i,j;
+   SlotDescriptor *sp;
+   char typemap[2];
+   unsigned msize;
+   UDFValue result;
+   Environment *theEnv = theDefclass->header.env;
+   
+   if ((sp = SlotInfoSlot(theEnv,&result,theDefclass,sname,"slot-types")) == NULL)
+     {
+      NormalizeMultifield(theEnv,&result);
+      returnValue->value = result.value;
+      return false;
+     }
+     
+   if ((sp->constraint != NULL) ? sp->constraint->anyAllowed : true)
+     {
+      typemap[0] = typemap[1] = (char) 0xFF;
+      ClearBitMap(typemap,MULTIFIELD_TYPE);
+      msize = 8;
+     }
+   else
+     {
+      typemap[0] = typemap[1] = (char) 0x00;
+      msize = 0;
+      if (sp->constraint->symbolsAllowed)
+        {
+         msize++;
+         SetBitMap(typemap,SYMBOL_TYPE);
+        }
+      if (sp->constraint->stringsAllowed)
+        {
+         msize++;
+         SetBitMap(typemap,STRING_TYPE);
+        }
+      if (sp->constraint->floatsAllowed)
+        {
+         msize++;
+         SetBitMap(typemap,FLOAT_TYPE);
+        }
+      if (sp->constraint->integersAllowed)
+        {
+         msize++;
+         SetBitMap(typemap,INTEGER_TYPE);
+        }
+      if (sp->constraint->instanceNamesAllowed)
+        {
+         msize++;
+         SetBitMap(typemap,INSTANCE_NAME_TYPE);
+        }
+      if (sp->constraint->instanceAddressesAllowed)
+        {
+         msize++;
+         SetBitMap(typemap,INSTANCE_ADDRESS_TYPE);
+        }
+      if (sp->constraint->externalAddressesAllowed)
+        {
+         msize++;
+         SetBitMap(typemap,EXTERNAL_ADDRESS_TYPE);
+        }
+      if (sp->constraint->factAddressesAllowed)
+        {
+         msize++;
+         SetBitMap(typemap,FACT_ADDRESS_TYPE);
+        }
+     }
+
+   returnValue->value = CreateMultifield(theEnv,msize);
+   i = 0;
+   j = 0;
+   while (i < msize)
+     {
+      if (TestBitMap(typemap,j))
+       {
+        returnValue->multifieldValue->contents[i].value =
+                   GetDefclassNamePointer(DefclassData(theEnv)->PrimitiveClassMap[j]);
+        i++;
+       }
+      j++;
+     }
+     
+   return true;
+  }
+
+/*********************/
+/* SlotAllowedValues */
+/*********************/
+bool SlotAllowedValues(
+  Defclass *theDefclass,
+  const char *sname,
+  CLIPSValue *returnValue)
+  {
+   int i;
+   SlotDescriptor *sp;
+   Expression *theExp;
+   UDFValue result;
+   Environment *theEnv = theDefclass->header.env;
+
+   if ((sp = SlotInfoSlot(theEnv,&result,theDefclass,sname,"slot-allowed-values")) == NULL)
+     {
+      NormalizeMultifield(theEnv,&result);
+      returnValue->value = result.value;
+      return false;
+     }
+
+   if ((sp->constraint != NULL) ? (sp->constraint->restrictionList == NULL) : true)
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      return true;
+     }
+
+   returnValue->value = CreateMultifield(theEnv,ExpressionSize(sp->constraint->restrictionList));
+   i = 0;
+   theExp = sp->constraint->restrictionList;
+   while (theExp != NULL)
+     {
+      returnValue->multifieldValue->contents[i].value = theExp->value;
+      theExp = theExp->nextArg;
+      i++;
+     }
+     
+   return true;
+  }
+
+/**********************/
+/* SlotAllowedClasses */
+/**********************/
+bool SlotAllowedClasses(
+  Defclass *theDefclass,
+  const char *sname,
+  CLIPSValue *returnValue)
+  {
+   int i;
+   SlotDescriptor *sp;
+   Expression *theExp;
+   UDFValue result;
+   Environment *theEnv = theDefclass->header.env;
+
+   if ((sp = SlotInfoSlot(theEnv,&result,theDefclass,sname,"slot-allowed-classes")) == NULL)
+     {
+      NormalizeMultifield(theEnv,&result);
+      returnValue->value = result.value;
+      return false;
+     }
+   if ((sp->constraint != NULL) ? (sp->constraint->classList == NULL) : true)
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      return true;
+     }
+   returnValue->value = CreateMultifield(theEnv,ExpressionSize(sp->constraint->classList));
+   i = 0;
+   theExp = sp->constraint->classList;
+   while (theExp != NULL)
+     {
+      returnValue->multifieldValue->contents[i].value = theExp->value;
+      theExp = theExp->nextArg;
+      i++;
+     }
+     
+   return true;
+  }
+
+/*************/
+/* SlotRange */
+/*************/
+bool SlotRange(
+  Defclass *theDefclass,
+  const char *sname,
+  CLIPSValue *returnValue)
+  {
+   SlotDescriptor *sp;
+   UDFValue result;
+   Environment *theEnv = theDefclass->header.env;
+
+   if ((sp = SlotInfoSlot(theEnv,&result,theDefclass,sname,"slot-range")) == NULL)
+     {
+      NormalizeMultifield(theEnv,&result);
+      returnValue->value = result.value;
+      return false;
+     }
+   if ((sp->constraint == NULL) ? false :
+       (sp->constraint->anyAllowed || sp->constraint->floatsAllowed ||
+        sp->constraint->integersAllowed))
+     {
+      returnValue->value = CreateMultifield(theEnv,2L);
+      returnValue->multifieldValue->contents[0].value = sp->constraint->minValue->value;
+      returnValue->multifieldValue->contents[1].value = sp->constraint->maxValue->value;
+     }
+   else
+     {
+      returnValue->value = FalseSymbol(theEnv);
+     }
+   return true;
+  }
+
+/*******************/
+/* SlotCardinality */
+/*******************/
+bool SlotCardinality(
+  Defclass *theDefclass,
+  const char *sname,
+  CLIPSValue *returnValue)
+  {
+   SlotDescriptor *sp;
+   UDFValue result;
+   Environment *theEnv = theDefclass->header.env;
+     
+   if ((sp = SlotInfoSlot(theEnv,&result,theDefclass,sname,"slot-cardinality")) == NULL)
+     {
+      NormalizeMultifield(theEnv,&result);
+      returnValue->value = result.value;
+      return false;
+     }
+     
+   if (sp->multiple == 0)
+     {
+      returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+      return true;
+     }
+
+   returnValue->value = CreateMultifield(theEnv,2L);
+   if (sp->constraint != NULL)
+     {
+      returnValue->multifieldValue->contents[0].value = sp->constraint->minFields->value;
+      returnValue->multifieldValue->contents[1].value = sp->constraint->maxFields->value;
+     }
+   else
+     {
+      returnValue->multifieldValue->contents[0].value = SymbolData(theEnv)->Zero;
+      returnValue->multifieldValue->contents[1].value = SymbolData(theEnv)->PositiveInfinity;
+     }
+     
+   return true;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*****************************************************
+  NAME         : SlotInfoSupportFunction
+  DESCRIPTION  : Support routine for slot-sources,
+                   slot-facets, et. al.
+  INPUTS       : 1) Data object buffer
+                 2) Name of the H/L caller
+                 3) Pointer to support function to call
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Support function called and data
+                  object buffer set
+  NOTES        : None
+ *****************************************************/
+static void SlotInfoSupportFunction(
+  UDFContext *context,
+  UDFValue *returnValue,
+  const char *fnxname,
+  bool (*fnx)(Defclass *,const char *,CLIPSValue *))
+  {
+   CLIPSLexeme *ssym;
+   Defclass *cls;
+   CLIPSValue result;
+
+   ssym = CheckClassAndSlot(context,fnxname,&cls);
+   if (ssym == NULL)
+     {
+      SetMultifieldErrorValue(context->environment,returnValue);
+      return;
+     }
+   (*fnx)(cls,ssym->contents,&result);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/*****************************************************************
+  NAME         : CountSubclasses
+  DESCRIPTION  : Counts the number of direct or indirect
+                   subclasses for a class
+  INPUTS       : 1) Address of class
+                 2) Include (1) or exclude (0) indirect subclasses
+                 3) Traversal id
+  RETURNS      : The number of subclasses
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************************/
+static unsigned CountSubclasses(
+  Defclass *cls,
+  bool inhp,
+  int tvid)
+  {
+   unsigned i, cnt;
+   Defclass *subcls;
+
+   for (cnt = 0 , i = 0 ; i < cls->directSubclasses.classCount ; i++)
+     {
+      subcls = cls->directSubclasses.classArray[i];
+      if (TestTraversalID(subcls->traversalRecord,tvid) == 0)
+        {
+         cnt++;
+         SetTraversalID(subcls->traversalRecord,tvid);
+         if (inhp && (subcls->directSubclasses.classCount != 0))
+           cnt += CountSubclasses(subcls,inhp,tvid);
+        }
+     }
+   return cnt;
+  }
+
+/*********************************************************************
+  NAME         : StoreSubclasses
+  DESCRIPTION  : Stores the names of direct or indirect
+                   subclasses for a class in a mutlifield
+  INPUTS       : 1) Caller's multifield buffer
+                 2) Starting index
+                 3) Address of the class
+                 4) Include (1) or exclude (0) indirect subclasses
+                 5) Traversal id
+  RETURNS      : The number of subclass names stored in the multifield
+  SIDE EFFECTS : Multifield set with subclass names
+  NOTES        : Assumes multifield is big enough to hold subclasses
+ *********************************************************************/
+static unsigned StoreSubclasses(
+  Multifield *mfval,
+  unsigned si,
+  Defclass *cls,
+  int inhp,
+  int tvid,
+  bool storeName)
+  {
+   unsigned i, classi;
+   Defclass *subcls;
+
+   for (i = si , classi = 0 ; classi < cls->directSubclasses.classCount ; classi++)
+     {
+      subcls = cls->directSubclasses.classArray[classi];
+      if (TestTraversalID(subcls->traversalRecord,tvid) == 0)
+        {
+         SetTraversalID(subcls->traversalRecord,tvid);
+         if (storeName)
+           {
+            mfval->contents[i++].value = GetDefclassNamePointer(subcls);
+           }
+         else
+           {
+            mfval->contents[i++].value = subcls;
+           }
+
+         if (inhp && (subcls->directSubclasses.classCount != 0))
+           i += StoreSubclasses(mfval,i,subcls,inhp,tvid,storeName);
+        }
+     }
+   return i - si;
+  }
+
+/*********************************************************
+  NAME         : SlotInfoSlot
+  DESCRIPTION  : Runtime support routine for slot-sources,
+                   slot-facets, et. al. which looks up
+                   a slot
+  INPUTS       : 1) Data object buffer
+                 2) Class pointer
+                 3) Name-string of slot to find
+                 4) The name of the calling function
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Support function called and data object
+                  buffer initialized
+  NOTES        : None
+ *********************************************************/
+static SlotDescriptor *SlotInfoSlot(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  Defclass *cls,
+  const char *sname,
+  const char *fnxname)
+  {
+   CLIPSLexeme *ssym;
+   int i;
+
+   if ((ssym = FindSymbolHN(theEnv,sname,SYMBOL_BIT)) == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return NULL;
+     }
+     
+   i = FindInstanceTemplateSlot(theEnv,cls,ssym);
+   if (i == -1)
+     {
+      SlotExistError(theEnv,sname,fnxname);
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return NULL;
+     }
+     
+   returnValue->begin = 0;
+   
+   return cls->instanceTemplate[i];
+  }
+
+#endif
diff --git a/clips/classinf.h b/clips/classinf.h
new file mode 100755
index 000000000..8cd512451
--- /dev/null
+++ b/clips/classinf.h
@@ -0,0 +1,94 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*     CLASS INFO PROGRAMMATIC ACCESS HEADER FILE      */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                            */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_classinf
+
+#pragma once
+
+#define _H_classinf
+
+#include "evaluatn.h"
+
+   void                           ClassAbstractPCommand(Environment *,UDFContext *,UDFValue *);
+#if DEFRULE_CONSTRUCT
+   void                           ClassReactivePCommand(Environment *,UDFContext *,UDFValue *);
+#endif
+   Defclass                      *ClassInfoFnxArgs(UDFContext *,const char *,bool *);
+   void                           ClassSlotsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ClassSuperclassesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ClassSubclassesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetDefmessageHandlersListCmd(Environment *,UDFContext *,UDFValue *);
+   void                           SlotFacetsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SlotSourcesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SlotTypesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SlotAllowedValuesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SlotAllowedClassesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SlotRangeCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SlotCardinalityCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           ClassAbstractP(Defclass *);
+#if DEFRULE_CONSTRUCT
+   bool                           ClassReactiveP(Defclass *);
+#endif
+   void                           ClassSlots(Defclass *,CLIPSValue *,bool);
+   void                           GetDefmessageHandlerList(Environment *,Defclass *,CLIPSValue *,bool);
+   void                           ClassSuperclasses(Defclass *,CLIPSValue *,bool);
+   void                           ClassSubclasses(Defclass *,CLIPSValue *,bool);
+   void                           ClassSubclassAddresses(Environment *,Defclass *,UDFValue *,bool);
+   bool                           SlotFacets(Defclass *,const char *,CLIPSValue *);
+   bool                           SlotSources(Defclass *,const char *,CLIPSValue *);
+   bool                           SlotTypes(Defclass *,const char *,CLIPSValue *);
+   bool                           SlotAllowedValues(Defclass *,const char *,CLIPSValue *);
+   bool                           SlotAllowedClasses(Defclass *,const char *,CLIPSValue *);
+   bool                           SlotRange(Defclass *,const char *,CLIPSValue *);
+   bool                           SlotCardinality(Defclass *,const char *,CLIPSValue *);
+
+#endif /* _H_classinf */
+
+
+
+
+
diff --git a/clips/classini.c b/clips/classini.c
new file mode 100755
index 000000000..909c9ec65
--- /dev/null
+++ b/clips/classini.c
@@ -0,0 +1,834 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*               CLASS INITIALIZATION MODULE           */
+   /*******************************************************/
+
+/**************************************************************/
+/* Purpose: Defclass Initialization Routines                  */
+/*                                                            */
+/* Principal Programmer(s):                                   */
+/*      Brian L. Dantes                                       */
+/*                                                            */
+/* Contributing Programmer(s):                                */
+/*                                                            */
+/* Revision History:                                          */
+/*                                                            */
+/*      6.23: Corrected compilation errors for files          */
+/*            generated by constructs-to-c. DR0861            */
+/*                                                            */
+/*      6.24: Added allowed-classes slot facet.               */
+/*                                                            */
+/*            Converted INSTANCE_PATTERN_MATCHING to          */
+/*            DEFRULE_CONSTRUCT.                              */
+/*                                                            */
+/*            Corrected code to remove run-time program       */
+/*            compiler warning.                               */
+/*                                                            */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior  */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.     */
+/*                                                            */
+/*            Changed integer type/precision.                 */
+/*                                                            */
+/*            Support for hashed alpha memories.              */
+/*                                                            */
+/*            Added const qualifiers to remove C++            */
+/*            deprecation warnings.                           */
+/*                                                            */
+/*            Changed find construct functionality so that    */
+/*            imported modules are search when locating a     */
+/*            named construct.                                */
+/*                                                            */
+/*      6.31: Optimization of slot ID creation previously    */
+/*            provided by NewSlotNameID function.            */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.        */
+/*                                                            */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed initial-object support.                 */
+/*                                                            */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/**************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include <stdio.h>
+
+#include "classcom.h"
+#include "classexm.h"
+#include "classfun.h"
+#include "classinf.h"
+#include "classpsr.h"
+#include "cstrccom.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "inscom.h"
+#include "memalloc.h"
+#include "modulpsr.h"
+#include "modulutl.h"
+#include "msgcom.h"
+#include "watch.h"
+
+#if DEFINSTANCES_CONSTRUCT
+#include "defins.h"
+#endif
+
+#if INSTANCE_SET_QUERIES
+#include "insquery.h"
+#endif
+
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+#include "bload.h"
+#include "objbin.h"
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "objcmp.h"
+#endif
+
+#if DEFRULE_CONSTRUCT
+#include "objrtbld.h"
+#include "objrtfnx.h"
+#include "objrtmch.h"
+#endif
+
+#if RUN_TIME
+#include "insfun.h"
+#include "msgfun.h"
+#include "pattern.h"
+#endif
+
+#include "classini.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define SUPERCLASS_RLN       "is-a"
+#define NAME_RLN             "name"
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+   static void                    SetupDefclasses(Environment *);
+   static void                    DeallocateDefclassData(Environment *);
+
+#if (! RUN_TIME)
+   static void                    DestroyDefclassAction(Environment *,ConstructHeader *,void *);
+   static Defclass               *AddSystemClass(Environment *,const char *,Defclass *);
+   static void                   *AllocateModule(Environment *);
+   static void                    ReturnModule(Environment *,void *);
+#else
+   static void                    SearchForHashedPatternNodes(Environment *,OBJECT_PATTERN_NODE *);
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME) && DEFMODULE_CONSTRUCT
+   static void                    UpdateDefclassesScope(Environment *,void *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/**********************************************************
+  NAME         : SetupObjectSystem
+  DESCRIPTION  : Initializes all COOL constructs, functions,
+                   and data structures
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : COOL initialized
+  NOTES        : Order of setup calls is important
+ **********************************************************/
+void SetupObjectSystem(
+  Environment *theEnv)
+  {
+   EntityRecord defclassEntityRecord = { "DEFCLASS_PTR", DEFCLASS_PTR,1,0,0,
+                                              NULL,NULL,NULL,NULL,NULL,
+                                              (EntityBusyCountFunction *) DecrementDefclassBusyCount,
+                                              (EntityBusyCountFunction *) IncrementDefclassBusyCount,
+                                              NULL,NULL,NULL,NULL,NULL };
+
+   AllocateEnvironmentData(theEnv,DEFCLASS_DATA,sizeof(struct defclassData),NULL);
+   AddEnvironmentCleanupFunction(theEnv,"defclasses",DeallocateDefclassData,-500);
+
+   memcpy(&DefclassData(theEnv)->DefclassEntityRecord,&defclassEntityRecord,sizeof(struct entityRecord));
+
+   DefclassData(theEnv)->newSlotID = 2; // IS_A and NAME assigned 0 and 1
+
+#if ! RUN_TIME
+   DefclassData(theEnv)->ClassDefaultsModeValue = CONVENIENCE_MODE;
+   DefclassData(theEnv)->ISA_SYMBOL = CreateSymbol(theEnv,SUPERCLASS_RLN);
+   IncrementLexemeCount(DefclassData(theEnv)->ISA_SYMBOL);
+   DefclassData(theEnv)->NAME_SYMBOL = CreateSymbol(theEnv,NAME_RLN);
+   IncrementLexemeCount(DefclassData(theEnv)->NAME_SYMBOL);
+#endif
+
+   SetupDefclasses(theEnv);
+   SetupInstances(theEnv);
+   SetupMessageHandlers(theEnv);
+
+#if DEFINSTANCES_CONSTRUCT
+   SetupDefinstances(theEnv);
+#endif
+
+#if INSTANCE_SET_QUERIES
+   SetupQuery(theEnv);
+#endif
+
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+   SetupObjectsBload(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   SetupObjectsCompiler(theEnv);
+#endif
+
+#if DEFRULE_CONSTRUCT
+   SetupObjectPatternStuff(theEnv);
+#endif
+  }
+
+/***************************************************/
+/* DeallocateDefclassData: Deallocates environment */
+/*    data for the defclass construct.             */
+/***************************************************/
+static void DeallocateDefclassData(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   SLOT_NAME *tmpSNPPtr, *nextSNPPtr;
+   int i;
+   struct defclassModule *theModuleItem;
+   Defmodule *theModule;
+   bool bloaded = false;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv)) bloaded = true;
+#endif
+
+   /*=============================*/
+   /* Destroy all the defclasses. */
+   /*=============================*/
+
+   if (! bloaded)
+     {
+      DoForAllConstructs(theEnv,DestroyDefclassAction,DefclassData(theEnv)->DefclassModuleIndex,false,NULL);
+
+      for (theModule = GetNextDefmodule(theEnv,NULL);
+           theModule != NULL;
+           theModule = GetNextDefmodule(theEnv,theModule))
+        {
+         theModuleItem = (struct defclassModule *)
+                         GetModuleItem(theEnv,theModule,
+                                       DefclassData(theEnv)->DefclassModuleIndex);
+         rtn_struct(theEnv,defclassModule,theModuleItem);
+        }
+     }
+
+   /*==========================*/
+   /* Remove the class tables. */
+   /*==========================*/
+
+   if (! bloaded)
+     {
+      if (DefclassData(theEnv)->ClassIDMap != NULL)
+        {
+         genfree(theEnv,DefclassData(theEnv)->ClassIDMap,DefclassData(theEnv)->AvailClassID * sizeof(Defclass *));
+        }
+     }
+
+   if (DefclassData(theEnv)->ClassTable != NULL)
+     {
+      genfree(theEnv,DefclassData(theEnv)->ClassTable,sizeof(Defclass *) * CLASS_TABLE_HASH_SIZE);
+     }
+
+   /*==============================*/
+   /* Free up the slot name table. */
+   /*==============================*/
+
+   if (! bloaded)
+     {
+      for (i = 0; i < SLOT_NAME_TABLE_HASH_SIZE; i++)
+        {
+         tmpSNPPtr = DefclassData(theEnv)->SlotNameTable[i];
+
+         while (tmpSNPPtr != NULL)
+           {
+            nextSNPPtr = tmpSNPPtr->nxt;
+            rtn_struct(theEnv,slotName,tmpSNPPtr);
+            tmpSNPPtr = nextSNPPtr;
+           }
+        }
+     }
+
+   if (DefclassData(theEnv)->SlotNameTable != NULL)
+     {
+      genfree(theEnv,DefclassData(theEnv)->SlotNameTable,sizeof(SLOT_NAME *) * SLOT_NAME_TABLE_HASH_SIZE);
+     }
+#else
+   Defclass *cls;
+   void *tmpexp;
+   unsigned int i;
+   int j;
+
+   if (DefclassData(theEnv)->ClassTable != NULL)
+     {
+      for (j = 0 ; j < CLASS_TABLE_HASH_SIZE ; j++)
+        for (cls = DefclassData(theEnv)->ClassTable[j] ; cls != NULL ; cls = cls->nxtHash)
+          {
+           for (i = 0 ; i < cls->slotCount ; i++)
+             {
+              if ((cls->slots[i].defaultValue != NULL) && (cls->slots[i].dynamicDefault == 0))
+                {
+                 tmpexp = ((UDFValue *) cls->slots[i].defaultValue)->supplementalInfo;
+                 rtn_struct(theEnv,udfValue,cls->slots[i].defaultValue);
+                 cls->slots[i].defaultValue = tmpexp;
+                }
+             }
+          }
+     }
+#endif
+  }
+
+#if ! RUN_TIME
+/*********************************************************/
+/* DestroyDefclassAction: Action used to remove defclass */
+/*   as a result of DestroyEnvironment.                  */
+/*********************************************************/
+static void DestroyDefclassAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Defclass *theDefclass = (Defclass *) theConstruct;
+
+   if (theDefclass == NULL) return;
+
+#if (! BLOAD_ONLY)
+   DestroyDefclass(theEnv,theDefclass);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+#endif
+
+#if RUN_TIME
+
+/***************************************************
+  NAME         : ObjectsRunTimeInitialize
+  DESCRIPTION  : Initializes objects system lists
+                   in a run-time module
+  INPUTS       : 1) Pointer to new class hash table
+                 2) Pointer to new slot name table
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Global pointers set
+  NOTES        : None
+ ***************************************************/
+void ObjectsRunTimeInitialize(
+  Environment *theEnv,
+  Defclass *ctable[],
+  SLOT_NAME *sntable[],
+  Defclass **cidmap,
+  unsigned short mid)
+  {
+   Defclass *cls;
+   void *tmpexp;
+   unsigned int i,j;
+
+   if (DefclassData(theEnv)->ClassTable != NULL)
+     {
+      for (j = 0 ; j < CLASS_TABLE_HASH_SIZE ; j++)
+        for (cls = DefclassData(theEnv)->ClassTable[j] ; cls != NULL ; cls = cls->nxtHash)
+          {
+           for (i = 0 ; i < cls->slotCount ; i++)
+             {
+              /* =====================================================================
+                 For static default values, the data object value needs to deinstalled
+                 and deallocated, and the expression needs to be restored (which was
+                 temporarily stored in the supplementalInfo field of the data object)
+                 ===================================================================== */
+              if ((cls->slots[i].defaultValue != NULL) && (cls->slots[i].dynamicDefault == 0))
+                {
+                 tmpexp = ((UDFValue *) cls->slots[i].defaultValue)->supplementalInfo;
+                 ReleaseUDFV(theEnv,(UDFValue *) cls->slots[i].defaultValue);
+                 rtn_struct(theEnv,udfValue,cls->slots[i].defaultValue);
+                 cls->slots[i].defaultValue = tmpexp;
+                }
+             }
+          }
+     }
+
+   InstanceQueryData(theEnv)->QUERY_DELIMITER_SYMBOL = FindSymbolHN(theEnv,QUERY_DELIMITER_STRING,SYMBOL_BIT);
+   MessageHandlerData(theEnv)->INIT_SYMBOL = FindSymbolHN(theEnv,INIT_STRING,SYMBOL_BIT);
+   MessageHandlerData(theEnv)->DELETE_SYMBOL = FindSymbolHN(theEnv,DELETE_STRING,SYMBOL_BIT);
+   MessageHandlerData(theEnv)->CREATE_SYMBOL = FindSymbolHN(theEnv,CREATE_STRING,SYMBOL_BIT);
+   DefclassData(theEnv)->ISA_SYMBOL = FindSymbolHN(theEnv,SUPERCLASS_RLN,SYMBOL_BIT);
+   DefclassData(theEnv)->NAME_SYMBOL = FindSymbolHN(theEnv,NAME_RLN,SYMBOL_BIT);
+
+   DefclassData(theEnv)->ClassTable = (Defclass **) ctable;
+   DefclassData(theEnv)->SlotNameTable = (SLOT_NAME **) sntable;
+   DefclassData(theEnv)->ClassIDMap = (Defclass **) cidmap;
+   DefclassData(theEnv)->MaxClassID = mid;
+   DefclassData(theEnv)->PrimitiveClassMap[FLOAT_TYPE] =
+     LookupDefclassByMdlOrScope(theEnv,FLOAT_TYPE_NAME);
+   DefclassData(theEnv)->PrimitiveClassMap[INTEGER_TYPE] =
+     LookupDefclassByMdlOrScope(theEnv,INTEGER_TYPE_NAME);
+   DefclassData(theEnv)->PrimitiveClassMap[STRING_TYPE] =
+     LookupDefclassByMdlOrScope(theEnv,STRING_TYPE_NAME);
+   DefclassData(theEnv)->PrimitiveClassMap[SYMBOL_TYPE] =
+     LookupDefclassByMdlOrScope(theEnv,SYMBOL_TYPE_NAME);
+   DefclassData(theEnv)->PrimitiveClassMap[MULTIFIELD_TYPE] =
+     LookupDefclassByMdlOrScope(theEnv,MULTIFIELD_TYPE_NAME);
+   DefclassData(theEnv)->PrimitiveClassMap[EXTERNAL_ADDRESS_TYPE] =
+     LookupDefclassByMdlOrScope(theEnv,EXTERNAL_ADDRESS_TYPE_NAME);
+   DefclassData(theEnv)->PrimitiveClassMap[FACT_ADDRESS_TYPE] =
+     LookupDefclassByMdlOrScope(theEnv,FACT_ADDRESS_TYPE_NAME);
+   DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_NAME_TYPE] =
+     LookupDefclassByMdlOrScope(theEnv,INSTANCE_NAME_TYPE_NAME);
+   DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_ADDRESS_TYPE] =
+     LookupDefclassByMdlOrScope(theEnv,INSTANCE_ADDRESS_TYPE_NAME);
+
+   for (j = 0 ; j < CLASS_TABLE_HASH_SIZE ; j++)
+     for (cls = DefclassData(theEnv)->ClassTable[j] ; cls != NULL ; cls = cls->nxtHash)
+     {
+      cls->header.env = theEnv;
+         
+      for (i = 0; i < cls->handlerCount; i++)
+        { cls->handlers[i].header.env = theEnv; }
+
+      for (i = 0 ; i < cls->slotCount ; i++)
+        {
+         if ((cls->slots[i].defaultValue != NULL) && (cls->slots[i].dynamicDefault == 0))
+           {
+            tmpexp = cls->slots[i].defaultValue;
+            cls->slots[i].defaultValue = get_struct(theEnv,udfValue);
+            EvaluateAndStoreInDataObject(theEnv,cls->slots[i].multiple,(Expression *) tmpexp,
+                                         (UDFValue *) cls->slots[i].defaultValue,true);
+            RetainUDFV(theEnv,(UDFValue *) cls->slots[i].defaultValue);
+            ((UDFValue *) cls->slots[i].defaultValue)->supplementalInfo = tmpexp;
+           }
+        }
+     }
+
+   SearchForHashedPatternNodes(theEnv,ObjectReteData(theEnv)->ObjectPatternNetworkPointer);
+  }
+
+/********************************/
+/* SearchForHashedPatternNodes: */
+/********************************/
+static void SearchForHashedPatternNodes(
+   Environment *theEnv,
+   OBJECT_PATTERN_NODE *theNode)
+   {
+    while (theNode != NULL)
+      {
+       if ((theNode->lastLevel != NULL) && (theNode->lastLevel->selector))
+        { AddHashedPatternNode(theEnv,theNode->lastLevel,theNode,theNode->networkTest->type,theNode->networkTest->value); }
+
+       SearchForHashedPatternNodes(theEnv,theNode->nextLevel);
+
+       theNode = theNode->rightNode;
+      }
+   }
+
+#else
+
+/***************************************************************
+  NAME         : CreateSystemClasses
+  DESCRIPTION  : Creates the built-in system classes
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : System classes inserted in the
+                   class hash table
+  NOTES        : The binary/load save indices for the primitive
+                   types (integer, float, symbol and string,
+                   multifield, external-address and fact-address)
+                   are very important.  Need to be able to refer
+                   to types with the same index regardless of
+                   whether the object system is installed or
+                   not.  Thus, the bsave/blaod indices of these
+                   classes match their integer codes.
+                WARNING!!: Assumes no classes exist yet!
+ ***************************************************************/
+void CreateSystemClasses(
+  Environment *theEnv,
+  void *context)
+  {
+   Defclass *user,*any,*primitive,*number,*lexeme,*address,*instance;
+
+   /* ===================================
+      Add canonical slot name entries for
+      the is-a and name fields - used for
+      object patterns
+      =================================== */
+   AddSlotName(theEnv,DefclassData(theEnv)->ISA_SYMBOL,ISA_ID,true);
+   AddSlotName(theEnv,DefclassData(theEnv)->NAME_SYMBOL,NAME_ID,true);
+   
+   DefclassData(theEnv)->newSlotID = 2; // IS_A and NAME assigned 0 and 1
+
+   /* =========================================================
+      Bsave Indices for non-primitive classes start at 9
+               Object is 9, Primitive is 10, Number is 11,
+               Lexeme is 12, Address is 13, and Instance is 14.
+      because: float = 0, integer = 1, symbol = 2, string = 3,
+               multifield = 4, and external-address = 5 and
+               fact-address = 6, instance-adress = 7 and
+               instance-name = 8.
+      ========================================================= */
+   any = AddSystemClass(theEnv,OBJECT_TYPE_NAME,NULL);
+   primitive = AddSystemClass(theEnv,PRIMITIVE_TYPE_NAME,any);
+   user = AddSystemClass(theEnv,USER_TYPE_NAME,any);
+
+   number = AddSystemClass(theEnv,NUMBER_TYPE_NAME,primitive);
+   DefclassData(theEnv)->PrimitiveClassMap[INTEGER_TYPE] = AddSystemClass(theEnv,INTEGER_TYPE_NAME,number);
+   DefclassData(theEnv)->PrimitiveClassMap[FLOAT_TYPE] = AddSystemClass(theEnv,FLOAT_TYPE_NAME,number);
+   lexeme = AddSystemClass(theEnv,LEXEME_TYPE_NAME,primitive);
+   DefclassData(theEnv)->PrimitiveClassMap[SYMBOL_TYPE] = AddSystemClass(theEnv,SYMBOL_TYPE_NAME,lexeme);
+   DefclassData(theEnv)->PrimitiveClassMap[STRING_TYPE] = AddSystemClass(theEnv,STRING_TYPE_NAME,lexeme);
+   DefclassData(theEnv)->PrimitiveClassMap[MULTIFIELD_TYPE] = AddSystemClass(theEnv,MULTIFIELD_TYPE_NAME,primitive);
+   address = AddSystemClass(theEnv,ADDRESS_TYPE_NAME,primitive);
+   DefclassData(theEnv)->PrimitiveClassMap[EXTERNAL_ADDRESS_TYPE] = AddSystemClass(theEnv,EXTERNAL_ADDRESS_TYPE_NAME,address);
+   DefclassData(theEnv)->PrimitiveClassMap[FACT_ADDRESS_TYPE] = AddSystemClass(theEnv,FACT_ADDRESS_TYPE_NAME,address);
+   instance = AddSystemClass(theEnv,INSTANCE_TYPE_NAME,primitive);
+   DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_ADDRESS_TYPE] = AddSystemClass(theEnv,INSTANCE_ADDRESS_TYPE_NAME,instance);
+   DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_NAME_TYPE] = AddSystemClass(theEnv,INSTANCE_NAME_TYPE_NAME,instance);
+
+   /* ================================================================================
+       INSTANCE-ADDRESS is-a INSTANCE and ADDRESS.  The links between INSTANCE-ADDRESS
+       and ADDRESS still need to be made.
+       =============================================================================== */
+   AddClassLink(theEnv,&DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_ADDRESS_TYPE]->directSuperclasses,address,true,0);
+   AddClassLink(theEnv,&DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_ADDRESS_TYPE]->allSuperclasses,address,false,2);
+   AddClassLink(theEnv,&address->directSubclasses,DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_ADDRESS_TYPE],true,0);
+
+   /* =======================================================================
+      The order of the class in the list MUST correspond to their type codes!
+      See CONSTANT.H
+      ======================================================================= */
+   AddConstructToModule(&DefclassData(theEnv)->PrimitiveClassMap[FLOAT_TYPE]->header);
+   AddConstructToModule(&DefclassData(theEnv)->PrimitiveClassMap[INTEGER_TYPE]->header);
+   AddConstructToModule(&DefclassData(theEnv)->PrimitiveClassMap[SYMBOL_TYPE]->header);
+   AddConstructToModule(&DefclassData(theEnv)->PrimitiveClassMap[STRING_TYPE]->header);
+   AddConstructToModule(&DefclassData(theEnv)->PrimitiveClassMap[MULTIFIELD_TYPE]->header);
+   AddConstructToModule(&DefclassData(theEnv)->PrimitiveClassMap[EXTERNAL_ADDRESS_TYPE]->header);
+   AddConstructToModule(&DefclassData(theEnv)->PrimitiveClassMap[FACT_ADDRESS_TYPE]->header);
+   AddConstructToModule(&DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_ADDRESS_TYPE]->header);
+   AddConstructToModule(&DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_NAME_TYPE]->header);
+   AddConstructToModule(&any->header);
+   AddConstructToModule(&primitive->header);
+   AddConstructToModule(&number->header);
+   AddConstructToModule(&lexeme->header);
+   AddConstructToModule(&address->header);
+   AddConstructToModule(&instance->header);
+   AddConstructToModule(&user->header);
+
+   for (any = GetNextDefclass(theEnv,NULL) ;
+        any != NULL ;
+        any = GetNextDefclass(theEnv,any))
+     AssignClassID(theEnv,any);
+  }
+
+#endif
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*********************************************************
+  NAME         : SetupDefclasses
+  DESCRIPTION  : Initializes Class Hash Table,
+                   Function Parsers, and Data Structures
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS :
+  NOTES        : None
+ *********************************************************/
+static void SetupDefclasses(
+  Environment *theEnv)
+  {
+   InstallPrimitive(theEnv,&DefclassData(theEnv)->DefclassEntityRecord,DEFCLASS_PTR);
+
+   DefclassData(theEnv)->DefclassModuleIndex =
+                RegisterModuleItem(theEnv,"defclass",
+#if (! RUN_TIME)
+                                    AllocateModule,
+                                    ReturnModule,
+#else
+                                    NULL,NULL,
+#endif
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+                                    BloadDefclassModuleReference,
+#else
+                                    NULL,
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+                                    DefclassCModuleReference,
+#else
+                                    NULL,
+#endif
+                                    (FindConstructFunction *) FindDefclassInModule);
+
+   DefclassData(theEnv)->DefclassConstruct =  AddConstruct(theEnv,"defclass","defclasses",
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+                                     ParseDefclass,
+#else
+                                     NULL,
+#endif
+                                     (FindConstructFunction *) FindDefclass,
+                                     GetConstructNamePointer,GetConstructPPForm,
+                                     GetConstructModuleItem,
+                                     (GetNextConstructFunction *) GetNextDefclass,
+                                     SetNextConstruct,
+                                     (IsConstructDeletableFunction *) DefclassIsDeletable,
+                                     (DeleteConstructFunction *) Undefclass,
+#if (! RUN_TIME)
+                                     (FreeConstructFunction *) RemoveDefclass
+#else
+                                     NULL
+#endif
+                                     );
+
+   AddClearReadyFunction(theEnv,"defclass",InstancesPurge,0,NULL);
+
+#if ! RUN_TIME
+   AddClearFunction(theEnv,"defclass",CreateSystemClasses,0,NULL);
+   InitializeClasses(theEnv);
+
+#if ! BLOAD_ONLY
+#if DEFMODULE_CONSTRUCT
+   AddPortConstructItem(theEnv,"defclass",SYMBOL_TOKEN);
+   AddAfterModuleDefinedFunction(theEnv,"defclass",UpdateDefclassesScope,0,NULL);
+#endif
+   AddUDF(theEnv,"undefclass","v",1,1,"y",UndefclassCommand,"UndefclassCommand",NULL);
+
+   AddSaveFunction(theEnv,"defclass",SaveDefclasses,10,NULL);
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"list-defclasses","v",0,1,"y",ListDefclassesCommand,"ListDefclassesCommand",NULL);
+   AddUDF(theEnv,"ppdefclass","vs",1,2,";y;ldsyn",PPDefclassCommand,"PPDefclassCommand",NULL);
+   AddUDF(theEnv,"describe-class","v",1,1,"y",DescribeClassCommand,"DescribeClassCommand",NULL);
+   AddUDF(theEnv,"browse-classes","v",0,1,"y",BrowseClassesCommand,"BrowseClassesCommand",NULL);
+#endif
+
+   AddUDF(theEnv,"get-defclass-list","m",0,1,"y",GetDefclassListFunction,"GetDefclassListFunction",NULL);
+   AddUDF(theEnv,"superclassp","b",2,2,"y",SuperclassPCommand,"SuperclassPCommand",NULL);
+   AddUDF(theEnv,"subclassp","b",2,2,"y",SubclassPCommand,"SubclassPCommand",NULL);
+   AddUDF(theEnv,"class-existp","b", 1,1,"y",ClassExistPCommand,"ClassExistPCommand",NULL);
+   AddUDF(theEnv,"message-handler-existp","b",2,3,"y",MessageHandlerExistPCommand,"MessageHandlerExistPCommand",NULL);
+   AddUDF(theEnv,"class-abstractp","b",1,1,"y",ClassAbstractPCommand,"ClassAbstractPCommand",NULL);
+#if DEFRULE_CONSTRUCT
+   AddUDF(theEnv,"class-reactivep","b",1,1,"y",ClassReactivePCommand,"ClassReactivePCommand",NULL);
+#endif
+   AddUDF(theEnv,"class-slots","m",1,2,"y",ClassSlotsCommand,"ClassSlotsCommand",NULL);
+   AddUDF(theEnv,"class-superclasses","m",1,2,"y",ClassSuperclassesCommand,"ClassSuperclassesCommand",NULL);
+   AddUDF(theEnv,"class-subclasses","m",1,2,"y",ClassSubclassesCommand,"ClassSubclassesCommand",NULL);
+   AddUDF(theEnv,"get-defmessage-handler-list","m",0,2,"y",GetDefmessageHandlersListCmd,"GetDefmessageHandlersListCmd",NULL);
+   AddUDF(theEnv,"slot-existp","b",2,3,"y",SlotExistPCommand,"SlotExistPCommand",NULL);
+   AddUDF(theEnv,"slot-facets","m",2,2,"y",SlotFacetsCommand,"SlotFacetsCommand",NULL);
+   AddUDF(theEnv,"slot-sources","m",2,2,"y",SlotSourcesCommand,"SlotSourcesCommand",NULL);
+   AddUDF(theEnv,"slot-types","m",2,2,"y",SlotTypesCommand,"SlotTypesCommand",NULL);
+   AddUDF(theEnv,"slot-allowed-values","m",2,2,"y",SlotAllowedValuesCommand,"SlotAllowedValuesCommand",NULL);
+   AddUDF(theEnv,"slot-allowed-classes","m",2,2,"y",SlotAllowedClassesCommand,"SlotAllowedClassesCommand",NULL);
+   AddUDF(theEnv,"slot-range","m",2,2,"y",SlotRangeCommand,"SlotRangeCommand",NULL);
+   AddUDF(theEnv,"slot-cardinality","m",2,2,"y",SlotCardinalityCommand,"SlotCardinalityCommand",NULL);
+   AddUDF(theEnv,"slot-writablep","b",2,2,"y",SlotWritablePCommand,"SlotWritablePCommand",NULL);
+   AddUDF(theEnv,"slot-initablep","b",2,2,"y",SlotInitablePCommand,"SlotInitablePCommand",NULL);
+   AddUDF(theEnv,"slot-publicp","b",2,2,"y",SlotPublicPCommand,"SlotPublicPCommand",NULL);
+   AddUDF(theEnv,"slot-direct-accessp","b",2,2,"y",SlotDirectAccessPCommand,"SlotDirectAccessPCommand",NULL);
+   AddUDF(theEnv,"slot-default-value","*",2,2,"y",SlotDefaultValueCommand,"SlotDefaultValueCommand",NULL);
+   AddUDF(theEnv,"defclass-module","y",1,1,"y",GetDefclassModuleCommand,"GetDefclassModuleCommand",NULL);
+   AddUDF(theEnv,"get-class-defaults-mode","y",0,0,NULL,GetClassDefaultsModeCommand,"GetClassDefaultsModeCommand",NULL);
+   AddUDF(theEnv,"set-class-defaults-mode","y",1,1,"y",SetClassDefaultsModeCommand,"SetClassDefaultsModeCommand",NULL);
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   AddWatchItem(theEnv,"instances",0,&DefclassData(theEnv)->WatchInstances,75,DefclassWatchAccess,DefclassWatchPrint);
+   AddWatchItem(theEnv,"slots",1,&DefclassData(theEnv)->WatchSlots,74,DefclassWatchAccess,DefclassWatchPrint);
+#endif
+  }
+
+#if (! RUN_TIME)
+
+/*********************************************************
+  NAME         : AddSystemClass
+  DESCRIPTION  : Performs all necessary allocations
+                   for adding a system class
+  INPUTS       : 1) The name-string of the system class
+                 2) The address of the parent class
+                    (NULL if none)
+  RETURNS      : The address of the new system class
+  SIDE EFFECTS : Allocations performed
+  NOTES        : Assumes system-class name is unique
+                 Also assumes SINGLE INHERITANCE for
+                   system classes to simplify precedence
+                   list determination
+                 Adds classes to has table but NOT to
+                  class list (this is responsibility
+                  of caller)
+ *********************************************************/
+static Defclass *AddSystemClass(
+  Environment *theEnv,
+  const char *name,
+  Defclass *parent)
+  {
+   Defclass *sys;
+   unsigned long i;
+   char defaultScopeMap[1];
+
+   sys = NewClass(theEnv,CreateSymbol(theEnv,name));
+   sys->abstract = 1;
+#if DEFRULE_CONSTRUCT
+   sys->reactive = 0;
+#endif
+   IncrementLexemeCount(sys->header.name);
+   sys->installed = 1;
+   sys->system = 1;
+   sys->hashTableIndex = HashClass(sys->header.name);
+
+   AddClassLink(theEnv,&sys->allSuperclasses,sys,true,0);
+   if (parent != NULL)
+     {
+      AddClassLink(theEnv,&sys->directSuperclasses,parent,true,0);
+      AddClassLink(theEnv,&parent->directSubclasses,sys,true,0);
+      AddClassLink(theEnv,&sys->allSuperclasses,parent,true,0);
+      for (i = 1 ; i < parent->allSuperclasses.classCount ; i++)
+        AddClassLink(theEnv,&sys->allSuperclasses,parent->allSuperclasses.classArray[i],true,0);
+     }
+   sys->nxtHash = DefclassData(theEnv)->ClassTable[sys->hashTableIndex];
+   DefclassData(theEnv)->ClassTable[sys->hashTableIndex] = sys;
+
+   /* =========================================
+      Add default scope maps for a system class
+      There is only one module (MAIN) so far -
+      which has an id of 0
+      ========================================= */
+   ClearBitString(defaultScopeMap,sizeof(char));
+   SetBitMap(defaultScopeMap,0);
+#if DEFMODULE_CONSTRUCT
+   sys->scopeMap = (CLIPSBitMap *) AddBitMap(theEnv,defaultScopeMap,sizeof(char));
+   IncrementBitMapCount(sys->scopeMap);
+#endif
+   return(sys);
+  }
+
+/*****************************************************
+  NAME         : AllocateModule
+  DESCRIPTION  : Creates and initializes a
+                 list of defclasses for a new module
+  INPUTS       : None
+  RETURNS      : The new defclass module
+  SIDE EFFECTS : Defclass module created
+  NOTES        : None
+ *****************************************************/
+static void *AllocateModule(
+  Environment *theEnv)
+  {
+   return (void *) get_struct(theEnv,defclassModule);
+  }
+
+/***************************************************
+  NAME         : ReturnModule
+  DESCRIPTION  : Removes a defclass module and
+                 all associated defclasses
+  INPUTS       : The defclass module
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Module and defclasses deleted
+  NOTES        : None
+ ***************************************************/
+static void ReturnModule(
+  Environment *theEnv,
+  void *theItem)
+  {
+   FreeConstructHeaderModule(theEnv,(struct defmoduleItemHeader *) theItem,DefclassData(theEnv)->DefclassConstruct);
+   DeleteSlotName(theEnv,FindIDSlotNameHash(theEnv,ISA_ID));
+   DeleteSlotName(theEnv,FindIDSlotNameHash(theEnv,NAME_ID));
+   rtn_struct(theEnv,defclassModule,theItem);
+  }
+
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME) && DEFMODULE_CONSTRUCT
+
+/***************************************************
+  NAME         : UpdateDefclassesScope
+  DESCRIPTION  : This function updates the scope
+                 bitmaps for existing classes when
+                 a new module is defined
+  INPUTS       : None
+  RETURNS      : Nothing
+  SIDE EFFECTS : Class scope bitmaps are updated
+  NOTES        : None
+ ***************************************************/
+static void UpdateDefclassesScope(
+  Environment *theEnv,
+  void *context)
+  {
+   unsigned i;
+   Defclass *theDefclass;
+   unsigned long newModuleID;
+   unsigned int count;
+   char *newScopeMap;
+   unsigned short newScopeMapSize;
+   const char *className;
+   Defmodule *matchModule;
+
+   newModuleID = GetCurrentModule(theEnv)->header.bsaveID;
+   newScopeMapSize = (sizeof(char) * ((GetNumberOfDefmodules(theEnv) / BITS_PER_BYTE) + 1));
+   newScopeMap = (char *) gm2(theEnv,newScopeMapSize);
+   for (i = 0 ; i < CLASS_TABLE_HASH_SIZE ; i++)
+     for (theDefclass = DefclassData(theEnv)->ClassTable[i] ;
+          theDefclass != NULL ;
+          theDefclass = theDefclass->nxtHash)
+       {
+        matchModule = theDefclass->header.whichModule->theModule;
+        className = theDefclass->header.name->contents;
+        ClearBitString(newScopeMap,newScopeMapSize);
+        GenCopyMemory(char,theDefclass->scopeMap->size,
+                   newScopeMap,theDefclass->scopeMap->contents);
+        DecrementBitMapReferenceCount(theEnv,theDefclass->scopeMap);
+        if (theDefclass->system)
+          SetBitMap(newScopeMap,newModuleID);
+        else if (FindImportedConstruct(theEnv,"defclass",matchModule,
+                                       className,&count,true,NULL) != NULL)
+          SetBitMap(newScopeMap,newModuleID);
+        theDefclass->scopeMap = (CLIPSBitMap *) AddBitMap(theEnv,newScopeMap,newScopeMapSize);
+        IncrementBitMapCount(theDefclass->scopeMap);
+       }
+   rm(theEnv,newScopeMap,newScopeMapSize);
+  }
+
+#endif
+
+#endif
diff --git a/clips/classini.h b/clips/classini.h
new file mode 100755
index 000000000..47b29f7db
--- /dev/null
+++ b/clips/classini.h
@@ -0,0 +1,75 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*          CLASS INITIALIZATION HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warning.                              */
+/*                                                           */
+/*      6.30: Borland C (IBM_TBC) and Metrowerks CodeWarrior */
+/*            (MAC_MCW, IBM_MCW) are no longer supported.    */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Support for hashed alpha memories.             */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_classini
+
+#pragma once
+
+#define _H_classini
+
+#include "constrct.h"
+#include "object.h"
+
+#if OBJECT_SYSTEM
+
+   void                           SetupObjectSystem(Environment *);
+
+#if RUN_TIME
+   void                           ObjectsRunTimeInitialize(Environment *,Defclass *[],SLOT_NAME *[],Defclass *[],unsigned short);
+#else
+   void                           CreateSystemClasses(Environment *,void *);
+#endif /* RUN_TIME */
+
+#endif /* OBJECT_SYSTEM */
+
+#endif /* _H_classini */
+
+
+
+
+
diff --git a/clips/classpsr.c b/clips/classpsr.c
new file mode 100755
index 000000000..b7add4ef1
--- /dev/null
+++ b/clips/classpsr.c
@@ -0,0 +1,950 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  05/16/18             */
+   /*                                                     */
+   /*                  CLASS PARSER MODULE                */
+   /*******************************************************/
+
+/**************************************************************/
+/* Purpose: Parsing Routines for Defclass Construct           */
+/*                                                            */
+/* Principal Programmer(s):                                   */
+/*      Brian L. Dantes                                       */
+/*                                                            */
+/* Contributing Programmer(s):                                */
+/*                                                            */
+/* Revision History:                                          */
+/*                                                            */
+/*      6.24: Added allowed-classes slot facet.               */
+/*                                                            */
+/*            Converted INSTANCE_PATTERN_MATCHING to          */
+/*            DEFRULE_CONSTRUCT.                              */
+/*                                                            */
+/*            Renamed BOOLEAN macro type to intBool.          */
+/*                                                            */
+/*      6.30: Added support to allow CreateClassScopeMap to   */
+/*            be used by other functions.                     */
+/*                                                            */
+/*            Changed integer type/precision.                 */
+/*                                                            */
+/*            GetConstructNameAndComment API change.          */
+/*                                                            */
+/*            Added const qualifiers to remove C++            */
+/*            deprecation warnings.                           */
+/*                                                            */
+/*            Converted API macros to function calls.         */
+/*                                                            */
+/*            Changed find construct functionality so that    */
+/*            imported modules are search when locating a     */
+/*            named construct.                                */
+/*                                                            */
+/*      6.40: Pragma once and other inclusion changes.        */
+/*                                                            */
+/*            Added support for booleans with <stdbool.h>.    */
+/*                                                            */
+/*            Removed use of void pointers for specific       */
+/*            data structures.                                */
+/*                                                            */
+/*            Eval support for run time and bload only.       */
+/*                                                            */
+/*            Removed use of single-slot in class             */
+/*            definitions.                                    */
+/*                                                            */
+/**************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#include "classcom.h"
+#include "classfun.h"
+#include "clsltpsr.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "inherpsr.h"
+#include "memalloc.h"
+#include "modulpsr.h"
+#include "modulutl.h"
+#include "msgpsr.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+
+#include "classpsr.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define ROLE_RLN             "role"
+#define ABSTRACT_RLN         "abstract"
+#define CONCRETE_RLN         "concrete"
+
+#define HANDLER_DECL         "message-handler"
+
+#define SLOT_RLN             "slot"
+#define MLT_SLOT_RLN         "multislot"
+
+#define DIRECT               0
+#define INHERIT              1
+
+#if OBJECT_SYSTEM && (! BLOAD_ONLY) && (! RUN_TIME)
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    ValidClassName(Environment *,const char *,Defclass **);
+   static bool                    ParseSimpleQualifier(Environment *,const char *,const char *,const char *,const char *,bool *,bool *);
+   static bool                    ReadUntilClosingParen(Environment *,const char *,struct token *);
+   static void                    AddClass(Environment *,Defclass *);
+   static void                    BuildSubclassLinks(Environment *,Defclass *);
+   static void                    FormInstanceTemplate(Environment *,Defclass *);
+   static void                    FormSlotNameMap(Environment *,Defclass *);
+   static TEMP_SLOT_LINK         *MergeSlots(Environment *,TEMP_SLOT_LINK *,Defclass *,unsigned short *,unsigned short);
+   static void                    PackSlots(Environment *,Defclass *,TEMP_SLOT_LINK *);
+   static void                    CreatePublicSlotMessageHandlers(Environment *,Defclass *);
+
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************************************************
+  NAME         : ParseDefclass
+  DESCRIPTION  : (defclass ...) is a construct (as
+                 opposed to a function), thus no variables
+                 may be used.  This means classes may only
+                 be STATICALLY defined (like rules).
+  INPUTS       : The logical name of the router
+                    for the parser input
+  RETURNS      : False if successful parse, true otherwise
+  SIDE EFFECTS : Inserts valid class definition into
+                 Class Table.
+  NOTES        : H/L Syntax :
+                 (defclass <name> [<comment>]
+                    (is-a <superclass-name>+)
+                    <class-descriptor>*)
+
+                 <class-descriptor> :== (slot <name> <slot-descriptor>*) |
+                                        (role abstract|concrete) |
+                                        (pattern-match reactive|non-reactive)
+
+                                        These are for documentation only:
+                                        (message-handler <name> [<type>])
+
+                 <slot-descriptor>  :== (default <default-expression>) |
+                                        (default-dynamic <default-expression>) |
+                                        (storage shared|local) |
+                                        (access read-only|read-write|initialize-only) |
+                                        (propagation no-inherit|inherit) |
+                                        (source composite|exclusive)
+                                        (pattern-match reactive|non-reactive)
+                                        (visibility public|private)
+                                        (override-message <message-name>)
+                                        (type ...) |
+                                        (cardinality ...) |
+                                        (allowed-symbols ...) |
+                                        (allowed-strings ...) |
+                                        (allowed-numbers ...) |
+                                        (allowed-integers ...) |
+                                        (allowed-floats ...) |
+                                        (allowed-values ...) |
+                                        (allowed-instance-names ...) |
+                                        (allowed-classes ...) |
+                                        (range ...)
+
+               <default-expression> ::= ?NONE | ?VARIABLE | <expression>*
+  ***************************************************************************************/
+bool ParseDefclass(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   CLIPSLexeme *cname;
+   Defclass *cls;
+   PACKED_CLASS_LINKS *sclasses,*preclist;
+   TEMP_SLOT_LINK *slots = NULL;
+   bool parseError;
+   bool roleSpecified = false, abstract = false;
+#if DEFRULE_CONSTRUCT
+   bool patternMatchSpecified = false;
+   bool reactive = true;
+#endif
+
+   SetPPBufferStatus(theEnv,true);
+   FlushPPBuffer(theEnv);
+   SetIndentDepth(theEnv,3);
+   SavePPBuffer(theEnv,"(defclass ");
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv)) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"defclass");
+      return true;
+     }
+#endif
+
+   cname = GetConstructNameAndComment(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken,"defclass",
+                                      (FindConstructFunction *) FindDefclassInModule,NULL,"#",true,
+                                      true,true,false);
+   if (cname == NULL)
+     return true;
+
+   if (ValidClassName(theEnv,cname->contents,&cls) == false)
+     return true;
+
+   sclasses = ParseSuperclasses(theEnv,readSource,cname);
+   if (sclasses == NULL)
+     return true;
+   preclist = FindPrecedenceList(theEnv,cls,sclasses);
+   if (preclist == NULL)
+     {
+      DeletePackedClassLinks(theEnv,sclasses,true);
+      return true;
+     }
+   parseError = false;
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   while (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      if (DefclassData(theEnv)->ObjectParseToken.tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"defclass");
+         parseError = true;
+         break;
+        }
+      PPBackup(theEnv);
+      PPCRAndIndent(theEnv);
+      SavePPBuffer(theEnv,"(");
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"defclass");
+         parseError = true;
+         break;
+        }
+      if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,ROLE_RLN) == 0)
+        {
+         if (ParseSimpleQualifier(theEnv,readSource,ROLE_RLN,CONCRETE_RLN,ABSTRACT_RLN,
+                                  &roleSpecified,&abstract) == false)
+           {
+            parseError = true;
+            break;
+           }
+        }
+#if DEFRULE_CONSTRUCT
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,MATCH_RLN) == 0)
+        {
+         if (ParseSimpleQualifier(theEnv,readSource,MATCH_RLN,NONREACTIVE_RLN,REACTIVE_RLN,
+                                  &patternMatchSpecified,&reactive) == false)
+           {
+            parseError = true;
+            break;
+           }
+        }
+#endif
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,SLOT_RLN) == 0)
+        {
+         slots = ParseSlot(theEnv,readSource,cname->contents,slots,preclist,false);
+         if (slots == NULL)
+           {
+            parseError = true;
+            break;
+           }
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,MLT_SLOT_RLN) == 0)
+        {
+         slots = ParseSlot(theEnv,readSource,cname->contents,slots,preclist,true);
+         if (slots == NULL)
+           {
+            parseError = true;
+            break;
+           }
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,HANDLER_DECL) == 0)
+        {
+         if (ReadUntilClosingParen(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken) == false)
+           {
+            parseError = true;
+            break;
+           }
+        }
+      else
+        {
+         SyntaxErrorMessage(theEnv,"defclass");
+         parseError = true;
+         break;
+        }
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+     }
+
+   if ((DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN) ||
+       (parseError == true))
+     {
+      DeletePackedClassLinks(theEnv,sclasses,true);
+      DeletePackedClassLinks(theEnv,preclist,true);
+      DeleteSlots(theEnv,slots);
+      return true;
+     }
+   SavePPBuffer(theEnv,"\n");
+
+   /* =========================================================================
+      The abstract/reactive qualities of a class are inherited if not specified
+      ========================================================================= */
+   if (roleSpecified == false)
+     {
+      if (preclist->classArray[1]->system &&                             /* Change to cause         */
+          (DefclassData(theEnv)->ClassDefaultsModeValue == CONVENIENCE_MODE)) /* default role of         */
+        { abstract = false; }                                            /* classes to be concrete. */
+      else
+        { abstract = preclist->classArray[1]->abstract; }
+     }
+#if DEFRULE_CONSTRUCT
+   if (patternMatchSpecified == false)
+     {
+      if ((preclist->classArray[1]->system) &&                           /* Change to cause       */
+          (! abstract) &&                                                /* default pattern-match */
+          (DefclassData(theEnv)->ClassDefaultsModeValue == CONVENIENCE_MODE)) /* of classes to be      */
+        { reactive = true; }                                             /* reactive.             */
+      else
+        { reactive = preclist->classArray[1]->reactive; }
+     }
+
+   /* ================================================================
+      An abstract class cannot have direct instances, thus it makes no
+      sense for it to be reactive since it will have no objects to
+      respond to pattern-matching
+      ================================================================ */
+   if (abstract && reactive)
+     {
+      PrintErrorID(theEnv,"CLASSPSR",1,false);
+      WriteString(theEnv,STDERR,"An abstract class cannot be reactive.\n");
+      DeletePackedClassLinks(theEnv,sclasses,true);
+      DeletePackedClassLinks(theEnv,preclist,true);
+      DeleteSlots(theEnv,slots);
+      return true;
+     }
+
+#endif
+
+   /* =======================================================
+      If we're only checking syntax, don't add the
+      successfully parsed defclass to the KB.
+      ======================================================= */
+
+   if (ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      DeletePackedClassLinks(theEnv,sclasses,true);
+      DeletePackedClassLinks(theEnv,preclist,true);
+      DeleteSlots(theEnv,slots);
+      return false;
+     }
+
+   cls = NewClass(theEnv,cname);
+   cls->abstract = abstract;
+#if DEFRULE_CONSTRUCT
+   cls->reactive = reactive;
+#endif
+   cls->directSuperclasses.classCount = sclasses->classCount;
+   cls->directSuperclasses.classArray = sclasses->classArray;
+
+   /* =======================================================
+      This is a hack to let functions which need to iterate
+      over a class AND its superclasses to conveniently do so
+
+      The real precedence list starts in position 1
+      ======================================================= */
+   preclist->classArray[0] = cls;
+   cls->allSuperclasses.classCount = preclist->classCount;
+   cls->allSuperclasses.classArray = preclist->classArray;
+   rtn_struct(theEnv,packedClassLinks,sclasses);
+   rtn_struct(theEnv,packedClassLinks,preclist);
+
+   /* =================================
+      Shove slots into contiguous array
+      ================================= */
+   if (slots != NULL)
+     PackSlots(theEnv,cls,slots);
+   AddClass(theEnv,cls);
+
+   return false;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : ValidClassName
+  DESCRIPTION  : Determines if a new class of the given
+                 name can be defined in the current module
+  INPUTS       : 1) The new class name
+                 2) Buffer to hold class address
+  RETURNS      : True if OK, false otherwise
+  SIDE EFFECTS : Error message printed if not OK
+  NOTES        : GetConstructNameAndComment() (called before
+                 this function) ensures that the defclass
+                 name does not conflict with one from
+                 another module
+ ***********************************************************/
+static bool ValidClassName(
+  Environment *theEnv,
+  const char *theClassName,
+  Defclass **theDefclass)
+  {
+   *theDefclass = FindDefclassInModule(theEnv,theClassName);
+   if (*theDefclass != NULL)
+     {
+      /* ===================================
+         System classes (which are visible
+         in all modules) cannot be redefined
+         =================================== */
+      if ((*theDefclass)->system)
+        {
+         PrintErrorID(theEnv,"CLASSPSR",2,false);
+         WriteString(theEnv,STDERR,"Cannot redefine a predefined system class.\n");
+         return false;
+        }
+
+      /* ===============================================
+         A class in the current module can only be
+         redefined if it is not in use, e.g., instances,
+         generic function method restrictions, etc.
+         =============================================== */
+      if ((DefclassIsDeletable(*theDefclass) == false) &&
+          (! ConstructData(theEnv)->CheckSyntaxMode))
+        {
+         PrintErrorID(theEnv,"CLASSPSR",3,false);
+         WriteString(theEnv,STDERR,"Class '");
+         WriteString(theEnv,STDERR,DefclassName(*theDefclass));
+         WriteString(theEnv,STDERR,"' cannot be redefined while ");
+         WriteString(theEnv,STDERR,"outstanding references to it still exist.\n");
+         return false;
+        }
+     }
+   return true;
+  }
+
+/***************************************************************
+  NAME         : ParseSimpleQualifier
+  DESCRIPTION  : Parses abstract/concrete role and
+                 pattern-matching reactivity for class
+  INPUTS       : 1) The input logical name
+                 2) The name of the qualifier being parsed
+                 3) The qualifier value indicating that the
+                    qualifier should be false
+                 4) The qualifier value indicating that the
+                    qualifier should be true
+                 5) A pointer to a bitmap indicating
+                    if the qualifier has already been parsed
+                 6) A buffer to store the value of the qualifier
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Bitmap and qualifier buffers set
+                 Messages printed on errors
+  NOTES        : None
+ ***************************************************************/
+static bool ParseSimpleQualifier(
+  Environment *theEnv,
+  const char *readSource,
+  const char *classQualifier,
+  const char *clearRelation,
+  const char *setRelation,
+  bool *alreadyTestedFlag,
+  bool *binaryFlag)
+  {
+   if (*alreadyTestedFlag)
+     {
+      PrintErrorID(theEnv,"CLASSPSR",4,false);
+      WriteString(theEnv,STDERR,"The '");
+      WriteString(theEnv,STDERR,classQualifier);
+      WriteString(theEnv,STDERR,"' class attribute is already specified.\n");
+      return false;
+     }
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+     goto ParseSimpleQualifierError;
+   if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,setRelation) == 0)
+     *binaryFlag = true;
+   else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,clearRelation) == 0)
+     *binaryFlag = false;
+   else
+     goto ParseSimpleQualifierError;
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     goto ParseSimpleQualifierError;
+   *alreadyTestedFlag = true;
+   return true;
+
+ParseSimpleQualifierError:
+   SyntaxErrorMessage(theEnv,"defclass");
+   return false;
+  }
+
+/***************************************************
+  NAME         : ReadUntilClosingParen
+  DESCRIPTION  : Skips over tokens until a ')' is
+                 encountered.
+  INPUTS       : 1) The logical input source
+                 2) A buffer for scanned tokens
+  RETURNS      : True if ')' read, otherwise false
+                 otherwise
+  SIDE EFFECTS : Tokens read
+  NOTES        : Expects first token after opening
+                 paren has already been scanned
+ ***************************************************/
+static bool ReadUntilClosingParen(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *inputToken)
+  {
+   int cnt = 1;
+   bool lparen_read = false;
+
+   do
+     {
+      if (lparen_read == false)
+        SavePPBuffer(theEnv," ");
+      GetToken(theEnv,readSource,inputToken);
+      if (inputToken->tknType == STOP_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"message-handler declaration");
+         return false;
+        }
+      else if (inputToken->tknType == LEFT_PARENTHESIS_TOKEN)
+        {
+         lparen_read = true;
+         cnt++;
+        }
+      else if (inputToken->tknType == RIGHT_PARENTHESIS_TOKEN)
+        {
+         cnt--;
+         if (lparen_read == false)
+           {
+            PPBackup(theEnv);
+            PPBackup(theEnv);
+            SavePPBuffer(theEnv,")");
+           }
+         lparen_read = false;
+        }
+      else
+        lparen_read = false;
+     }
+   while (cnt > 0);
+
+   return true;
+  }
+
+/*****************************************************************************
+  NAME         : AddClass
+  DESCRIPTION  : Determines the precedence list of the new class.
+                 If it is valid, the routine checks to see if the class
+                 already exists.  If it does not, all the subclass
+                 links are made from the class's direct superclasses,
+                 and the class is inserted in the hash table.  If it
+                 does, all sublclasses are deleted. An error will occur
+                 if any instances of the class (direct or indirect) exist.
+                 If all checks out, the old definition is replaced by the new.
+  INPUTS       : The new class description
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The class is deleted if there is an error.
+  NOTES        : No change in the class graph state will occur
+                 if there were any errors.
+                 Assumes class is not busy!!!
+ *****************************************************************************/
+static void AddClass(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   Defclass *ctmp;
+#if DEBUGGING_FUNCTIONS
+   bool oldTraceInstances = false,
+       oldTraceSlots = false;
+#endif
+
+   /* ===============================================
+      If class does not already exist, insert and
+      form progeny links with all direct superclasses
+      =============================================== */
+   cls->hashTableIndex = HashClass(GetDefclassNamePointer(cls));
+   ctmp = FindDefclassInModule(theEnv,DefclassName(cls));
+
+   if (ctmp != NULL)
+     {
+#if DEBUGGING_FUNCTIONS
+      oldTraceInstances = ctmp->traceInstances;
+      oldTraceSlots = ctmp->traceSlots;
+#endif
+      DeleteClassUAG(theEnv,ctmp);
+     }
+   PutClassInTable(theEnv,cls);
+
+   BuildSubclassLinks(theEnv,cls);
+   InstallClass(theEnv,cls,true);
+   AddConstructToModule(&cls->header);
+
+   FormInstanceTemplate(theEnv,cls);
+   FormSlotNameMap(theEnv,cls);
+
+   AssignClassID(theEnv,cls);
+
+#if DEBUGGING_FUNCTIONS
+   if (cls->abstract)
+     {
+      cls->traceInstances = false;
+      cls->traceSlots = false;
+     }
+   else
+     {
+      if (oldTraceInstances)
+        cls->traceInstances = true;
+      if (oldTraceSlots)
+        cls->traceSlots = true;
+     }
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   if (GetConserveMemory(theEnv) == false)
+     SetDefclassPPForm(theEnv,cls,CopyPPBuffer(theEnv));
+#endif
+
+#if DEFMODULE_CONSTRUCT
+
+   /* =========================================
+      Create a bitmap indicating whether this
+      class is in scope or not for every module
+      ========================================= */
+   cls->scopeMap = (CLIPSBitMap *) CreateClassScopeMap(theEnv,cls);
+
+#endif
+
+   /* ==============================================
+      Define get- and put- handlers for public slots
+      ============================================== */
+   CreatePublicSlotMessageHandlers(theEnv,cls);
+  }
+
+/*******************************************************
+  NAME         : BuildSubclassLinks
+  DESCRIPTION  : Follows the list of superclasses
+                 for a class and puts the class in
+                 each of the superclasses' subclass
+                 list.
+  INPUTS       : The address of the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The subclass lists for every superclass
+                 are modified.
+  NOTES        : Assumes the superclass list is formed.
+ *******************************************************/
+static void BuildSubclassLinks(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   unsigned long i;
+
+   for (i = 0 ; i < cls->directSuperclasses.classCount ; i++)
+     AddClassLink(theEnv,&cls->directSuperclasses.classArray[i]->directSubclasses,cls,true,0);
+  }
+
+/**********************************************************
+  NAME         : FormInstanceTemplate
+  DESCRIPTION  : Forms a contiguous array of instance
+                  slots for use in creating instances later
+                 Also used in determining instance slot
+                  indices a priori during handler defns
+  INPUTS       : The class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Contiguous array of instance slots formed
+  NOTES        : None
+ **********************************************************/
+static void FormInstanceTemplate(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   TEMP_SLOT_LINK *islots = NULL,*stmp;
+   unsigned short scnt = 0;
+   unsigned long i;
+
+   /* ========================
+      Get direct class's slots
+      ======================== */
+   islots = MergeSlots(theEnv,islots,cls,&scnt,DIRECT);
+
+   /* ===================================================================
+      Get all inherited slots - a more specific slot takes precedence
+      over more general, i.e. the first class in the precedence list with
+      a particular slot gets to specify its default value
+      =================================================================== */
+   for (i = 1 ; i < cls->allSuperclasses.classCount ; i++)
+     islots = MergeSlots(theEnv,islots,cls->allSuperclasses.classArray[i],&scnt,INHERIT);
+
+   /* ===================================================
+      Allocate a contiguous array to store all the slots.
+      =================================================== */
+   cls->instanceSlotCount = scnt;
+   cls->localInstanceSlotCount = 0;
+   if (scnt > 0)
+     cls->instanceTemplate = (SlotDescriptor **) gm2(theEnv,(scnt * sizeof(SlotDescriptor *)));
+   for (i = 0 ; i < scnt ; i++)
+     {
+      stmp = islots;
+      islots = islots->nxt;
+      cls->instanceTemplate[i] = stmp->desc;
+      if (stmp->desc->shared == 0)
+        cls->localInstanceSlotCount++;
+      rtn_struct(theEnv,tempSlotLink,stmp);
+     }
+  }
+
+/**********************************************************
+  NAME         : FormSlotNameMap
+  DESCRIPTION  : Forms a mapping of the slot name ids into
+                 the instance template.  Given the slot
+                 name id, this map provides a much faster
+                 lookup of a slot.  The id is stored
+                 statically in object patterns and can
+                 be looked up via a hash table at runtime
+                 as well.
+  INPUTS       : The class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Contiguous array of integers formed
+                 The position in the array corresponding
+                 to a slot name id holds an the index
+                 into the instance template array holding
+                 the slot
+                 The max slot name id for the class is
+                 also stored to make deletion of the slots
+                 easier
+  NOTES        : Assumes the instance template has already
+                 been formed
+ **********************************************************/
+static void FormSlotNameMap(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   unsigned i;
+
+   cls->maxSlotNameID = 0;
+   cls->slotNameMap = NULL;
+   if (cls->instanceSlotCount == 0)
+     return;
+   for (i = 0 ; i < cls->instanceSlotCount ; i++)
+     if (cls->instanceTemplate[i]->slotName->id > cls->maxSlotNameID)
+       cls->maxSlotNameID = cls->instanceTemplate[i]->slotName->id;
+   cls->slotNameMap = (unsigned *) gm2(theEnv,(sizeof(unsigned) * (cls->maxSlotNameID + 1)));
+   for (i = 0 ; i <= cls->maxSlotNameID ; i++)
+     cls->slotNameMap[i] = 0;
+   for (i = 0 ; i < cls->instanceSlotCount ; i++)
+     cls->slotNameMap[cls->instanceTemplate[i]->slotName->id] = i + 1;
+  }
+
+/********************************************************************
+  NAME         : MergeSlots
+  DESCRIPTION  : Adds non-duplicate slots to list and increments
+                   slot count for the class instance template
+  INPUTS       : 1) The old slot list
+                 2) The address of class containing new slots
+                 3) Caller's buffer for # of slots
+                 4) A flag indicating whether the new list of slots
+                    is from the direct parent-class or not.
+  RETURNS      : The address of the new expanded list, or NULL
+                   for an empty list
+  SIDE EFFECTS : The list is expanded
+                 Caller's slot count is adjusted.
+  NOTES        : Lists are assumed to contain no duplicates
+ *******************************************************************/
+static TEMP_SLOT_LINK *MergeSlots(
+  Environment *theEnv,
+  TEMP_SLOT_LINK *old,
+  Defclass *cls,
+  unsigned short *scnt,
+  unsigned short src)
+  {
+   TEMP_SLOT_LINK *cur,*tmp;
+   unsigned int i;
+   SlotDescriptor *newSlot;
+   
+   /*=========================================*/
+   /* Process the slots in reverse order      */
+   /* since we are pushing them onto a stack. */
+   /*=========================================*/
+      
+   for (i = cls->slotCount; i > 0 ; i--)
+     {
+      newSlot = &cls->slots[i-1];
+
+      /*=============================================*/
+      /* A class can prevent it slots from being     */
+      /* propagated to all but its direct instances. */
+      /*=============================================*/
+      
+      if ((newSlot->noInherit == 0) ? true : (src == DIRECT))
+        {
+         cur = old;
+         while ((cur != NULL) ? (newSlot->slotName != cur->desc->slotName) : false)
+           cur = cur->nxt;
+         if (cur == NULL)
+           {
+            tmp = get_struct(theEnv,tempSlotLink);
+            tmp->desc = newSlot;
+            tmp->nxt = old;
+            old = tmp;
+            (*scnt)++;
+           }
+        }
+     }
+     
+   return old;
+  }
+
+/***********************************************************************
+  NAME         : PackSlots
+  DESCRIPTION  : Groups class-slots into a contiguous array
+                  "slots" field points to array
+                  "slotCount" field set
+  INPUTS       : 1) The class
+                 2) The list of slots
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Temporary list deallocated, contiguous array allocated,
+                   and nxt pointers linked
+                 Class pointer set for slots
+  NOTES        : Assumes class->slotCount == 0 && class->slots == NULL
+ ***********************************************************************/
+static void PackSlots(
+  Environment *theEnv,
+  Defclass *cls,
+  TEMP_SLOT_LINK *slots)
+  {
+   TEMP_SLOT_LINK *stmp,*sprv;
+   long i;
+
+   stmp = slots;
+   while  (stmp != NULL)
+     {
+      stmp->desc->cls = cls;
+      cls->slotCount++;
+      stmp = stmp->nxt;
+     }
+   cls->slots = (SlotDescriptor *) gm2(theEnv,(sizeof(SlotDescriptor) * cls->slotCount));
+   stmp = slots;
+   for (i = 0 ; i < cls->slotCount ; i++)
+     {
+      sprv = stmp;
+      stmp = stmp->nxt;
+      GenCopyMemory(SlotDescriptor,1,&(cls->slots[i]),sprv->desc);
+      cls->slots[i].sharedValue.desc = &(cls->slots[i]);
+      cls->slots[i].sharedValue.value = NULL;
+      rtn_struct(theEnv,slotDescriptor,sprv->desc);
+      rtn_struct(theEnv,tempSlotLink,sprv);
+     }
+  }
+
+/*****************************************************************************
+  NAME         : CreatePublicSlotMessageHandlers
+  DESCRIPTION  : Creates a get-<slot-name> and
+                 put-<slot-name> handler for every
+                 public slot in a class.
+
+                 The syntax of the message-handlers
+                 created are:
+
+                 (defmessage-handler <class> get-<slot-name> primary ()
+                    ?self:<slot-name>)
+
+                 For single-field slots:
+
+                 (defmessage-handler <class> put-<slot-name> primary (?value)
+                    (bind ?self:<slot-name> ?value))
+
+                 For multifield slots:
+
+                 (defmessage-handler <class> put-<slot-name> primary ($?value)
+                    (bind ?self:<slot-name> ?value))
+  INPUTS       : The defclass
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Message-handlers created
+  NOTES        : None
+ ******************************************************************************/
+static void CreatePublicSlotMessageHandlers(
+  Environment *theEnv,
+  Defclass *theDefclass)
+  {
+   long i;
+   SlotDescriptor *sd;
+
+   for (i = 0 ; i < theDefclass->slotCount ; i++)
+     {
+      sd = &theDefclass->slots[i];
+        CreateGetAndPutHandlers(theEnv,sd);
+     }
+   for (i = 0 ; i < theDefclass->handlerCount ; i++)
+     theDefclass->handlers[i].system = true;
+  }
+
+#endif
+
+#if DEFMODULE_CONSTRUCT && OBJECT_SYSTEM
+
+/********************************************************
+  NAME         : CreateClassScopeMap
+  DESCRIPTION  : Creates a bitmap where each bit position
+                 corresponds to a module id. If the bit
+                 is set, the class is in scope for that
+                 module, otherwise it is not.
+  INPUTS       : The class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Scope bitmap created and attached
+  NOTES        : Uses FindImportedConstruct()
+ ********************************************************/
+void *CreateClassScopeMap(
+  Environment *theEnv,
+  Defclass *theDefclass)
+  {
+   unsigned short scopeMapSize;
+   char *scopeMap;
+   const char *className;
+   Defmodule *matchModule, *theModule;
+   unsigned long moduleID;
+   unsigned int count;
+   void *theBitMap;
+
+   className = theDefclass->header.name->contents;
+   matchModule = theDefclass->header.whichModule->theModule;
+
+   scopeMapSize = (sizeof(char) * ((GetNumberOfDefmodules(theEnv) / BITS_PER_BYTE) + 1));
+   scopeMap = (char *) gm2(theEnv,scopeMapSize);
+
+   ClearBitString(scopeMap,scopeMapSize);
+   SaveCurrentModule(theEnv);
+   for (theModule = GetNextDefmodule(theEnv,NULL) ;
+        theModule != NULL ;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+      moduleID = theModule->header.bsaveID;
+      if (FindImportedConstruct(theEnv,"defclass",matchModule,
+                                className,&count,true,NULL) != NULL)
+        SetBitMap(scopeMap,moduleID);
+     }
+   RestoreCurrentModule(theEnv);
+   theBitMap = (CLIPSBitMap *) AddBitMap(theEnv,scopeMap,scopeMapSize);
+   IncrementBitMapCount(theBitMap);
+   rm(theEnv,scopeMap,scopeMapSize);
+   return(theBitMap);
+  }
+
+#endif
+
diff --git a/clips/classpsr.h b/clips/classpsr.h
new file mode 100755
index 000000000..a6fbb6b2b
--- /dev/null
+++ b/clips/classpsr.h
@@ -0,0 +1,73 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*               CLASS PARSER HEADER FILE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.               */
+/*                                                            */
+/*            Converted INSTANCE_PATTERN_MATCHING to          */
+/*            DEFRULE_CONSTRUCT.                              */
+/*                                                            */
+/*            Renamed BOOLEAN macro type to intBool.          */
+/*                                                            */
+/*      6.30: Added support to allow CreateClassScopeMap to   */
+/*            be used by other functions.                     */
+/*                                                            */
+/*            Changed integer type/precision.                 */
+/*                                                            */
+/*            GetConstructNameAndComment API change.          */
+/*                                                            */
+/*            Added const qualifiers to remove C++            */
+/*            deprecation warnings.                           */
+/*                                                            */
+/*            Converted API macros to function calls.         */
+/*                                                            */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_classpsr
+
+#pragma once
+
+#define _H_classpsr
+
+#if OBJECT_SYSTEM
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   bool                    ParseDefclass(Environment *,const char *);
+
+#endif
+
+#if DEFMODULE_CONSTRUCT
+   void                   *CreateClassScopeMap(Environment *,Defclass *);
+#endif
+
+#endif /* OBJECT_SYSTEM */
+
+#endif /* _H_classpsr */
+
+
+
diff --git a/clips/clips.cpp b/clips/clips.cpp
new file mode 100644
index 000000000..2d62cdfae
--- /dev/null
+++ b/clips/clips.cpp
@@ -0,0 +1,1644 @@
+//
+//  clips.cpp
+//  ThinkerDraw-macOS
+//
+//  Created by 熊 春雷 on 2020/4/24.
+//  Copyright © 2020 pandaxcl. All rights reserved.
+//
+
+#include "clips.h"
+#include "clips.hpp"
+
+#ifdef system // defined in usrsetup.h for iOS
+#   undef system // but here use boost::process::system instead
+#endif
+
+#ifdef LHS // conflict with uuidgen
+#   undef LHS
+#endif
+
+#ifdef RHS // conflict with uuidgen
+#   undef RHS
+#endif
+
+void UserFunctions(Environment *environment)
+{
+#if CLIPS_EXTENSION_TEST_BENCH_ENABLED
+    clips::extension::test_benchmark_initialize(environment);
+#endif//CLIPS_EXTENSION_TEST_BENCH_ENABLED
+    
+#if CLIPS_EXTENSION_UTILITY_ENABLED
+    clips::extension::utility_initialize(environment);
+#endif//CLIPS_EXTENSION_UTILITY_ENABLED
+    
+#if CLIPS_EXTENSION_SOCKET_ENABLED
+    clips::extension::socket_initialize(environment);
+#endif//CLIPS_EXTENSION_SOCKET_ENABLED
+    
+#if CLIPS_EXTENSION_ZEROMQ_ENABLED
+    clips::extension::zeromq_initialize(environment);
+#endif//CLIPS_EXTENSION_ZEROMQ_ENABLED
+
+#if CLIPS_EXTENSION_MUSTACHE_ENABLED
+    clips::extension::mustache_initialize(environment);
+#endif//CLIPS_EXTENSION_MUSTACHE_ENABLED
+    
+#if CLIPS_EXTENSION_PROCESS_ENABLED
+    clips::extension::process_initialize(environment);
+#endif//CLIPS_EXTENSION_PROCESS_ENABLED
+    
+}
+
+#if CLIPS_EXTENSION_TEST_BENCH_ENABLED
+
+template<char code> std::ostream&
+operator<<(std::ostream&os, const std::tuple<std::string, std::integral_constant<char, code>>&x)
+{
+    return os << std::get<0>(x);
+}
+
+#include <boost/core/lightweight_test.hpp>
+#include <boost/format.hpp>
+#include <nlohmann/json.hpp>
+
+namespace clips::extension {
+
+void test_benchmark_initialize(Environment*environment)
+{
+    clips::user_function<__LINE__>(environment, "test-benchmark", test_benchmark);
+}
+
+void test_benchmark()
+{
+    {
+        clips::CLIPS CLIPS;
+        BOOST_TEST_NOT(CompleteCommand(""));
+        BOOST_TEST_NOT(CompleteCommand("\n"));
+        BOOST_TEST_NOT(CompleteCommand("\n\n"));
+        BOOST_TEST_NOT(CompleteCommand("\n\n\n"));
+        
+        BOOST_TEST_NOT(CompleteCommand("?A"));
+        BOOST_TEST_NOT(CompleteCommand("\n\n\n?A"));
+        BOOST_TEST(    CompleteCommand(      "?A\n\n\n"));
+        BOOST_TEST(    CompleteCommand("\n\n\n?A\n\n\n"));
+        
+        BOOST_TEST_NOT(CompleteCommand("(expand$ ?A)"));
+        BOOST_TEST_NOT(CompleteCommand("\n\n\n(expand$ ?A)"));
+        BOOST_TEST(    CompleteCommand(      "(expand$ ?A)\n\n\n"));
+        BOOST_TEST(    CompleteCommand("\n\n\n(expand$ ?A)\n\n\n"));
+    }
+    {
+        clips::CLIPS CLIPS;
+        BOOST_TEST_EQ(1 +2+3, std::any_cast<clips::integer>(CLIPS.eval("(+ 1  2 3)")));
+        BOOST_TEST_EQ(1.+2+3, std::any_cast<clips::real   >(CLIPS.eval("(+ 1. 2 3)")));
+        
+        BOOST_TEST_EQ(clips::string{"2019-10-10"}, std::any_cast<clips::string>(CLIPS.eval("(str-cat 2019 - 10 - 10)")));
+        BOOST_TEST_EQ(clips::symbol{"2019-10-10"}, std::any_cast<clips::symbol>(CLIPS.eval("(sym-cat 2019 - 10 - 10)")));
+    }
+    
+    {
+        clips::CLIPS CLIPS;
+        {
+            using namespace std::string_literals;
+            //char argumentsCode[128] = {'*', '\0'};
+            std::string argumentsCode = "*";
+            BOOST_TEST_EQ("*;v"s, (clips::build_arguments_code<void,         void>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;b"s, (clips::build_arguments_code<void,         bool>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;l"s, (clips::build_arguments_code<void,         char>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;l"s, (clips::build_arguments_code<void,        short>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;l"s, (clips::build_arguments_code<void,          int>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;l"s, (clips::build_arguments_code<void,         long>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;l"s, (clips::build_arguments_code<void,    long long>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;d"s, (clips::build_arguments_code<void,        float>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;d"s, (clips::build_arguments_code<void,       double>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;d"s, (clips::build_arguments_code<void,  long double>::apply(argumentsCode, 1)));
+            
+            BOOST_TEST_EQ("*;sy"s, (clips::build_arguments_code<void,        char*>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;sy"s, (clips::build_arguments_code<void,  const char*>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;e"s, (clips::build_arguments_code<void,         void*>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;e"s, (clips::build_arguments_code<void,  std::string*>::apply(argumentsCode, 1)));
+            
+            BOOST_TEST_EQ("*;b"s, (clips::build_arguments_code<void,       clips::boolean>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;s"s, (clips::build_arguments_code<void,        clips::string>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;y"s, (clips::build_arguments_code<void,        clips::symbol>::apply(argumentsCode, 1)));
+            BOOST_TEST_EQ("*;n"s, (clips::build_arguments_code<void, clips::instance_name>::apply(argumentsCode, 1)));
+            
+#define TEST_ARGUMENTS bool, int, float, const char*, std::string, clips::string, clips::boolean, clips::symbol, clips::instance_name
+            clips::user_function<__LINE__>(CLIPS, "test", static_cast<void(*)(TEST_ARGUMENTS)>([](TEST_ARGUMENTS){ }));
+            BOOST_TEST_EQ("*;b;l;d;sy;sy;s;b;y;n"s, (clips::build_arguments_code<void, TEST_ARGUMENTS>::apply(argumentsCode, 1)));
+#undef  TEST_ARGUMENTS
+        }
+        
+        clips::user_function<__LINE__>(CLIPS, "hello", static_cast<clips::string(*)()>([]{ return clips::string{"hello"}; }));
+        clips::user_function<__LINE__>(CLIPS, "world", static_cast<clips::string(*)()>([]{ return clips::string{"world"}; }));
+        
+        BOOST_TEST_EQ(clips::string{"hello"}, std::any_cast<clips::string>(CLIPS.eval("(hello)")));
+        BOOST_TEST_EQ(clips::string{"world"}, std::any_cast<clips::string>(CLIPS.eval("(world)")));
+        BOOST_TEST_EQ(clips::string{"helloworld"}, std::any_cast<clips::string>(CLIPS.eval("(str-cat (hello) (world))")));
+        
+        
+        clips::user_function<__LINE__>(CLIPS, "good", static_cast<clips::string(*)(Environment*)>([](Environment*){ return clips::string{"good"}; }));
+        clips::user_function<__LINE__>(CLIPS, "luck", static_cast<clips::string(*)(Environment*)>([](Environment*){ return clips::string{"luck"}; }));
+        
+        BOOST_TEST_EQ(clips::string{"good"}, std::any_cast<clips::string>(CLIPS.eval("(good)")));
+        BOOST_TEST_EQ(clips::string{"luck"}, std::any_cast<clips::string>(CLIPS.eval("(luck)")));
+        BOOST_TEST_EQ(clips::string{"goodluck"}, std::any_cast<clips::string>(CLIPS.eval("(str-cat (good) (luck))")));
+        
+        {
+            auto&&multifield = std::any_cast<clips::multifield>(CLIPS.eval("(create$ (good) (luck))"));
+            BOOST_TEST_EQ(clips::string{"good"}, std::any_cast<clips::string>(multifield.at(0)));
+            BOOST_TEST_EQ(clips::string{"luck"}, std::any_cast<clips::string>(multifield.at(1)));
+        }
+        {
+            clips::user_function<__LINE__>(CLIPS, "return-multifiled$", static_cast<clips::multifield(*)(Environment*)>([](Environment*){
+                return clips::multifield{
+                    clips::string{"good"},
+                    clips::symbol{"luck"},
+                    clips::integer    {1},
+                    clips::real     {2.5},
+                    clips::boolean {true}
+                };
+            }));
+            const auto&&multifield = std::any_cast<clips::multifield>(CLIPS.eval("(return-multifiled$)"));
+            BOOST_TEST_EQ(clips::string{"good"}, std::any_cast<clips::string >(multifield.at(0)));
+            BOOST_TEST_EQ(clips::symbol{"luck"}, std::any_cast<clips::symbol >(multifield.at(1)));
+            BOOST_TEST_EQ(clips::integer    {1}, std::any_cast<clips::integer>(multifield.at(2)));
+            BOOST_TEST_EQ(clips::real     {2.5}, std::any_cast<clips::real   >(multifield.at(3)));
+            BOOST_TEST_EQ(clips::boolean {true}, std::any_cast<clips::boolean>(multifield.at(4)));
+        }
+        {
+            {
+                auto&&joined = std::any_cast<clips::symbol>(CLIPS.eval(u8R"((sym-join$ (create$ Hello "World" TRUE FALSE) ", "))"));
+                BOOST_TEST_EQ(clips::symbol{"Hello, World, TRUE, FALSE"}, std::any_cast<clips::symbol>(joined));
+            }
+            {
+                auto&&joined = std::any_cast<clips::string>(CLIPS.eval(u8R"((str-join$ (create$ Hello "World" TRUE FALSE) ", "))"));
+                BOOST_TEST_EQ(clips::string{"Hello, World, TRUE, FALSE"}, std::any_cast<clips::string>(joined));
+            }
+        }
+        {
+            {
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-starts-with  HelloWorld   Hello ))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-starts-with  HelloWorld  "Hello"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-starts-with "HelloWorld" "Hello"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-starts-with "HelloWorld"  Hello ))")));
+                
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-istarts-with  HelloWorld   helLo ))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-istarts-with  HelloWorld  "helLo"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-istarts-with "HelloWorld" "helLo"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-istarts-with "HelloWorld"  helLo ))")));
+            }
+            {
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-ends-with  HelloWorld   World ))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-ends-with  HelloWorld  "World"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-ends-with "HelloWorld" "World"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-ends-with "HelloWorld"  World ))")));
+                
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-iends-with  HelloWorld   worLd ))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-iends-with  HelloWorld  "worLd"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-iends-with "HelloWorld" "worLd"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-iends-with "HelloWorld"  worLd ))")));
+            }
+            {
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-contains  HelloWorld   Wor ))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-contains  HelloWorld  "Wor"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-contains "HelloWorld" "Wor"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-contains "HelloWorld"  Wor ))")));
+                
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-icontains  HelloWorld   woR ))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-icontains  HelloWorld  "woR"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-icontains "HelloWorld" "woR"))")));
+                BOOST_TEST_EQ(clips::boolean{true}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-icontains "HelloWorld"  woR ))")));
+            }
+            {
+                BOOST_TEST_EQ(clips::boolean{false}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-starts-with  "HelloWorld" Good))")));
+                BOOST_TEST_EQ(clips::boolean{false}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-istarts-with "HelloWorld" Good))")));
+                BOOST_TEST_EQ(clips::boolean{false}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-ends-with    "HelloWorld" Good))")));
+                BOOST_TEST_EQ(clips::boolean{false}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-iends-with   "HelloWorld" Good))")));
+                BOOST_TEST_EQ(clips::boolean{false}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-contains     "HelloWorld" Good))")));
+                BOOST_TEST_EQ(clips::boolean{false}, std::any_cast<clips::boolean>(CLIPS.eval(u8R"((lexeme-icontains    "HelloWorld" Good))")));
+            }
+        }
+    }
+#if CLIPS_EXTENSION_UTILITY_ENABLED
+    {
+        {
+            clips::CLIPS CLIPS;
+            void*json = std::any_cast<void*>(CLIPS.eval(u8R"===( (bind ?json (json-create `{
+                                                        "a":1,
+                                                        "b":"hello",
+                                                        "c":12.5,
+                                                        "baz": ["one", "two", "three"],
+                                                        "foo": "bar"
+                                                        }`)) )==="));
+            BOOST_TEST(nullptr != json);
+            
+            BOOST_TEST_EQ(clips::integer{1      }, std::any_cast<clips::integer>(CLIPS.eval(u8R"===((json-value-for-path ?json /a)    )===")));
+            BOOST_TEST_EQ(clips::string {"hello"}, std::any_cast<clips::string >(CLIPS.eval(u8R"===((json-value-for-path ?json /b)    )===")));
+            BOOST_TEST_EQ(clips::real   {12.5   }, std::any_cast<clips::real   >(CLIPS.eval(u8R"===((json-value-for-path ?json /c)    )===")));
+            BOOST_TEST_EQ(clips::string {"one"  }, std::any_cast<clips::string >(CLIPS.eval(u8R"===((json-value-for-path ?json /baz/0))===")));
+            BOOST_TEST_EQ(clips::string {"two"  }, std::any_cast<clips::string >(CLIPS.eval(u8R"===((json-value-for-path ?json /baz/1))===")));
+            BOOST_TEST_EQ(clips::string {"three"}, std::any_cast<clips::string >(CLIPS.eval(u8R"===((json-value-for-path ?json /baz/2))===")));
+            BOOST_TEST_EQ(clips::string {"bar"  }, std::any_cast<clips::string >(CLIPS.eval(u8R"===((json-value-for-path ?json /foo)  )===")));
+            
+            CLIPS.eval("(json-set-value-for-path ?json /baz/0 100)");
+            BOOST_TEST_EQ(clips::integer{100}, std::any_cast<clips::integer>(CLIPS.eval(u8R"===((json-value-for-path ?json /baz/0))===")));
+            
+            CLIPS.eval(R"===( (json-set-value-for-path ?json /baz/1 `{"hello":200}`) )===");
+            BOOST_TEST_EQ(clips::integer{200}, std::any_cast<clips::integer>(CLIPS.eval(u8R"===((json-value-for-path ?json /baz/1/hello))===")));
+            
+            CLIPS.eval("(json-dispose ?json)");
+        }
+        {
+            clips::CLIPS CLIPS;
+            const std::string original = u8R"===({
+            "baz": ["one", "two", "three"],
+            "foo": "bar"
+            })===";
+            const std::string patch = u8R"===([
+            { "op": "replace", "path": "/baz", "value": "boo" },
+            { "op": "remove", "path": "/foo"},
+            { "op": "add", "path": "/hello", "value": ["world"] }
+            ])===";
+            const std::string result = u8R"===({
+            "baz": "boo",
+            "hello": ["world"]
+            })===";
+            CLIPS.eval((boost::format("(bind ?original (json-create `%1%`))")%original).str().c_str());
+            CLIPS.eval((boost::format("(bind ?patch    (json-create `%1%`))")%patch   ).str().c_str());
+            CLIPS.eval((boost::format("(bind ?result   (json-create `%1%`))")%result  ).str().c_str());
+            
+            CLIPS.eval("(bind ?original-with-patch  (json-patch ?original ?patch ))");
+            CLIPS.eval("(bind ?original-diff-result (json-diff  ?original ?result))");
+            
+            BOOST_TEST_EQ(nlohmann::json::parse(result), nlohmann::json::parse(std::get<0>(std::any_cast<clips::symbol>(CLIPS.eval("(json-dump ?original-with-patch  -1)")))));
+            BOOST_TEST_EQ(nlohmann::json::parse(patch ), nlohmann::json::parse(std::get<0>(std::any_cast<clips::symbol>(CLIPS.eval("(json-dump ?original-diff-result -1)")))));
+            
+            BOOST_TEST_EQ(nlohmann::json::parse(original), nlohmann::json::parse(std::get<0>(std::any_cast<clips::symbol>(CLIPS.eval("(json-dump ?original -1)")))));
+            BOOST_TEST_EQ(nlohmann::json::parse(patch   ), nlohmann::json::parse(std::get<0>(std::any_cast<clips::symbol>(CLIPS.eval("(json-dump ?patch    -1)")))));
+            BOOST_TEST_EQ(nlohmann::json::parse(result  ), nlohmann::json::parse(std::get<0>(std::any_cast<clips::symbol>(CLIPS.eval("(json-dump ?result   -1)")))));
+            
+            CLIPS.eval("(json-dispose ?original            )");
+            CLIPS.eval("(json-dispose ?patch               )");
+            CLIPS.eval("(json-dispose ?result              )");
+            CLIPS.eval("(json-dispose ?original-with-patch )");
+            CLIPS.eval("(json-dispose ?original-diff-result)");
+        }
+        {
+            clips::CLIPS CLIPS;
+            // a JSON value
+            const std::string document = R"({
+            "a": "b",
+            "c": { "d": "e", "f": "g" }
+            })";
+            
+            // a patch
+            const std::string patch = R"({
+            "a":"z",
+            "c": { "f": null }
+            })";
+            
+            // the merge patch result
+            const std::string result = R"({
+            "a": "z",
+            "c": { "d": "e" }
+            })";
+            
+            CLIPS.eval((boost::format("(bind ?document (json-create `%1%`))")%document).str().c_str());
+            CLIPS.eval((boost::format("(bind ?patch    (json-create `%1%`))")%patch   ).str().c_str());
+            
+            CLIPS.eval("(bind ?document-merge-patch  (json-merge-patch ?document ?patch))");
+            
+            BOOST_TEST_EQ(nlohmann::json::parse(result), nlohmann::json::parse(std::get<0>(std::any_cast<clips::symbol>(CLIPS.eval("(json-dump ?document-merge-patch -1)")))));
+            
+            BOOST_TEST_EQ(nlohmann::json::parse(result), nlohmann::json::parse(std::get<0>(std::any_cast<clips::symbol>(CLIPS.eval("(json-dump ?document -1)")))));
+            BOOST_TEST_EQ(nlohmann::json::parse(patch ), nlohmann::json::parse(std::get<0>(std::any_cast<clips::symbol>(CLIPS.eval("(json-dump ?patch    -1)")))));
+            
+            CLIPS.eval("(json-dispose ?document)");
+            CLIPS.eval("(json-dispose ?patch   )");
+        }
+    }
+#endif// CLIPS_EXTENSION_UTILITY_ENABLED
+#if CLIPS_EXTENSION_MUSTACHE_ENABLED
+    {
+        {
+            std::string origin = u8R"(
+            Hello
+            World
+            Happy
+            )";
+            std::string expected =
+            "Hello\n"
+            "World\n"
+            "Happy";
+            
+            BOOST_TEST_EQ(clips::string{expected}, mustache_trim(origin.c_str()));
+        }
+        {
+            clips::CLIPS CLIPS;
+            std::string view{"{{#names}}Hi {{name}}!\n{{/names}}"};
+            std::string context {
+                u8R"=========(
+                {
+                    "names":[
+                        { "name": "Chris" },
+                        { "name": "Mark" },
+                        { "name": "Scott" }
+                    ]
+                }
+                )========="
+            };
+            
+            const char*expected =
+            "Hi Chris!\n"
+            "Hi Mark!\n"
+            "Hi Scott!\n";
+            BOOST_TEST_EQ(clips::string{expected}, mustache_render(CLIPS, view.c_str(), context.c_str()));
+        }
+        {
+            clips::CLIPS CLIPS;
+            std::string view{"{{#names}}Hi {{> user}}!\n{{/names}}"};
+            std::string partials{
+                u8R"=========(
+                {
+                    "user":"<strong>{{name}}</strong>"
+                }
+                )========="
+            };
+            std::string context {
+                u8R"=========(
+                {
+                    "names":[
+                        { "name": "Chris" },
+                        { "name": "Mark" },
+                        { "name": "Scott" }
+                    ]
+                }
+                )========="
+            };
+            
+            const char*expected =
+            "Hi <strong>Chris</strong>!\n"
+            "Hi <strong>Mark</strong>!\n"
+            "Hi <strong>Scott</strong>!\n"
+            ;
+            BOOST_TEST_EQ(clips::string{expected}, mustache_render_with_partials(CLIPS, view.c_str(), context.c_str(), partials.c_str()));
+        }
+        
+    }
+#endif//CLIPS_EXTENSION_MUSTACHE_ENABLED
+    boost::report_errors();
+}
+
+} // clips::extension
+
+#endif//CLIPS_EXTENSION_TEST_BENCH_ENABLED
+
+#if CLIPS_EXTENSION_UTILITY_ENABLED
+#include <nlohmann/json.hpp>
+#include <future>
+#include <algorithm>
+#include <boost/algorithm/string.hpp>
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_io.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+#include <boost/algorithm/string/join.hpp>
+
+namespace clips::extension {
+
+clips::string utility_read_command(Environment*environment, const char*logicalName)
+{
+    std::string command;
+    while(!CompleteCommand(command.c_str())) {
+        int inchar = ReadRouter(environment, logicalName);
+        if (EOF == inchar)
+            break;
+        command += inchar;
+    }
+    return clips::string{command};
+}
+
+clips::string utility_read_json(Environment*environment, const char*logicalName)
+{
+    std::string json;
+    while(!nlohmann::json::accept(json)) {
+        int inchar = ReadRouter(environment, logicalName);
+        if (EOF == inchar)
+            break;
+        json += inchar;
+    }
+    return clips::string{json};
+}
+
+clips::string utility_read_until(Environment*environment, const char*logicalName, const char*MATCH)
+{
+    std::string buffer;
+    while(!boost::ends_with(buffer, MATCH)) {
+        int inchar = ReadRouter(environment, logicalName);
+        if (EOF == inchar)
+            break;
+        buffer += inchar;
+    }
+    return clips::string{buffer.substr(0, buffer.length()-std::strlen(MATCH))};
+}
+
+clips::string utility_expand_for_eval(Environment*environment, const char*CODE)
+{
+    std::string str1(u8R"===({"abc":",?A","def":",(expand$ ?B)"})===");
+    
+    std::vector<std::string> items;
+    
+    std::string buffer;
+    for (char c: std::string{str1}) {
+        buffer += c;
+        
+        /*  */ if (boost::ends_with(buffer, ",?")) {
+            items.push_back(buffer.substr(0, buffer.length()-2));
+            buffer = "?";
+        } else if (boost::ends_with(buffer, ",(")) {
+            items.push_back(buffer.substr(0, buffer.length()-2));
+            buffer = "(";
+        } else if (boost::starts_with(buffer, "?") && boost::is_any_of("'(`\"\n\t")(c)) {
+            items.push_back(" " + buffer.substr(0, buffer.length()-1) + " ");
+            buffer = buffer.substr(buffer.length()-1);
+        } else if (boost::starts_with(buffer, "(") && CompleteCommand((buffer+"\n").c_str())) {
+            items.push_back(" " + buffer + " ");
+            buffer.clear();
+        }
+    }
+    if (!buffer.empty()) {
+        items.push_back(buffer);
+    }
+    
+    for (auto&&item:items) {
+        std::cout << "item: [" << item << "]" << std::endl;
+    }
+    
+    buffer = "(str-cat `" + boost::join(items, "`") + "`)";
+    std::cout << buffer << std::endl;
+    
+    return clips::string{buffer};
+}
+
+clips::string utility_expand_and_eval(Environment*environment, const char*CODE)
+{
+    auto buffer = utility_expand_for_eval(environment, CODE);
+    CLIPSValue value;
+    EvalError err = Eval(environment, std::get<0>(buffer).c_str(), &value);
+    if (EE_NO_ERROR == err) {
+        return clips::string{value.lexemeValue->contents};
+    }
+    return clips::string{""};
+}
+
+clips::integer utility_max_integer(Environment*environment)
+{
+    return std::numeric_limits<clips::integer>::max();
+}
+clips::integer utility_min_integer(Environment*environment)
+{
+    return std::numeric_limits<clips::integer>::min();
+}
+
+clips::symbol utility_newline(Environment*environment)
+{
+    return clips::symbol{"\n"};
+}
+
+clips::symbol utility_uuidgen(Environment*environment)
+{
+    boost::uuids::uuid uuid = boost::uuids::random_generator()();
+    return clips::symbol{boost::uuids::to_string(uuid)};
+}
+
+static std::string _utility_string_join(Environment*environment, const clips::multifield&m, const char* sep)
+{
+    std::vector<std::string> vs;
+    for (auto&&v:m) {
+        /*  */ if (typeid(clips::symbol) == v.type()) {
+            vs.push_back(std::get<0>(std::any_cast<clips::symbol>(v)));
+        } else if (typeid(clips::string) == v.type()) {
+            vs.push_back(std::get<0>(std::any_cast<clips::string>(v)));
+        } else {
+            WriteString(environment, STDERR, "ERROR: in xxx-join$ expect element with type [STRING] or [SYMBOL], but got: ");
+            /*  */ if (typeid(clips::integer) == v.type()) {
+                Writeln(environment, std::to_string(std::any_cast<clips::integer>(v)).c_str());
+            } else if (typeid(clips::real) == v.type()) {
+                Writeln(environment, std::to_string(std::any_cast<clips::real>(v)).c_str());
+            } else if (typeid(clips::boolean) == v.type()) {
+                Writeln(environment, std::to_string(std::any_cast<clips::boolean>(v)).c_str());
+            } else {
+                Writeln(environment, "unknown data in multifield");
+            }
+        }
+    }
+    return boost::algorithm::join(vs, sep);
+}
+clips::symbol utility_sym_join(Environment*environment, const clips::multifield&m, const char* sep)
+{
+    return clips::symbol{_utility_string_join(environment, m, sep)};
+}
+clips::string utility_str_join(Environment*environment, const clips::multifield&m, const char* sep)
+{
+    return clips::string{_utility_string_join(environment, m, sep)};
+}
+
+clips::boolean utility_lexeme_starts_with(Environment*environment, const char*input, const char* with)
+{
+    return clips::boolean{boost::algorithm::starts_with(input, with)};
+}
+clips::boolean utility_lexeme_istarts_with(Environment*environment, const char*input, const char* with)
+{
+    return clips::boolean{boost::algorithm::istarts_with(input, with)};
+}
+clips::boolean utility_lexeme_ends_with(Environment*environment, const char*input, const char* with)
+{
+    return clips::boolean{boost::algorithm::ends_with(input, with)};
+}
+clips::boolean utility_lexeme_iends_with(Environment*environment, const char*input, const char* with)
+{
+    return clips::boolean{boost::algorithm::iends_with(input, with)};
+}
+clips::boolean utility_lexeme_contains(Environment*environment, const char*input, const char* with)
+{
+    return clips::boolean{boost::algorithm::contains(input, with)};
+}
+clips::boolean utility_lexeme_icontains(Environment*environment, const char*input, const char* with)
+{
+    return clips::boolean{boost::algorithm::icontains(input, with)};
+}
+
+void utility_sleep_seconds(Environment*environment, clips::integer n)
+{
+    std::this_thread::sleep_for(std::chrono::seconds(n));
+}
+void utility_sleep_milliseconds(Environment*environment, clips::integer n)
+{
+    std::this_thread::sleep_for(std::chrono::milliseconds(n));
+}
+void utility_sleep_microseconds(Environment*environment, clips::integer n)
+{
+    std::this_thread::sleep_for(std::chrono::microseconds(n));
+}
+void utility_sleep_nanoseconds(Environment*environment, clips::integer n)
+{
+    std::this_thread::sleep_for(std::chrono::nanoseconds(n));
+}
+
+clips::external_address utility_json_create(Environment*environment, const char*JSON)
+{
+    void *pointer = genalloc(environment, sizeof(nlohmann::json));
+    new (pointer) nlohmann::json(nlohmann::json::parse(JSON));
+    return clips::external_address{pointer};
+}
+
+void utility_json_dispose(Environment*environment, void*pointer)
+{
+    static_cast<nlohmann::json*>(pointer)->~basic_json();
+    genfree(environment, pointer, sizeof(nlohmann::json));
+}
+
+clips::boolean utility_json_validate(Environment*environment, const char*JSON)
+{
+    return clips::boolean{nlohmann::json::accept(JSON)};
+}
+clips::symbol utility_json_dump(Environment*environment, nlohmann::json*json, int indent)
+{
+    return clips::symbol{static_cast<nlohmann::json*>(json)->dump(indent)};
+}
+clips::symbol utility_json_dump_dispose(Environment*environment, nlohmann::json*json, int indent)
+{
+    auto symbol_dump = utility_json_dump(environment, json, indent);
+    utility_json_dispose(environment, json);
+    return symbol_dump;
+}
+clips::external_address utility_json_diff(Environment*environment, nlohmann::json*A, nlohmann::json*B)
+{
+    void *pointer = genalloc(environment, sizeof(nlohmann::json));
+    new (pointer) nlohmann::json(nlohmann::json::diff(*A, *B));
+    return clips::external_address{pointer};
+}
+clips::external_address utility_json_patch(Environment*environment, nlohmann::json*A, nlohmann::json*B)
+{
+    void *pointer = genalloc(environment, sizeof(nlohmann::json));
+    new (pointer) nlohmann::json(A->patch(*B));
+    return clips::external_address{pointer};
+}
+clips::external_address utility_json_merge_patch(Environment*environment, nlohmann::json*A, nlohmann::json*B)
+{
+    A->merge_patch(*B);
+    return clips::external_address{A};
+}
+
+// void*pointer, const char*KEY, const char*DEFAULT
+static void _UDF_utility_json_value_for_path(Environment*environment, UDFContext *context, UDFValue*out)
+{
+    UDFValue pointer, key;
+    
+    UDFFirstArgument(context, clips::argument_code<clips::external_address>::expect_bits, &pointer);
+    UDFNextArgument (context,
+                     clips::argument_code<clips::string>::expect_bits|
+                     clips::argument_code<clips::symbol>::expect_bits, &key);
+    if (UDFHasNextArgument(context)) {
+        UDFNextArgument (context,
+                         clips::argument_code<clips::boolean>::expect_bits|
+                         clips::argument_code<clips::integer>::expect_bits|
+                         clips::argument_code<clips::real   >::expect_bits|
+                         clips::argument_code<clips::string >::expect_bits|
+                         clips::argument_code<clips::symbol >::expect_bits, out);
+    }
+    try {
+        nlohmann::json* json = static_cast<nlohmann::json*>(pointer.externalAddressValue->contents);
+        nlohmann::json_pointer pointer = nlohmann::json::json_pointer(key.lexemeValue->contents);
+        if (json->contains(pointer)) {
+            nlohmann::json&value = json->at(pointer);
+            
+            /*  */ if (value.is_string()) {
+                out->lexemeValue = CreateString(environment, value.get<std::string>().c_str());
+            } else if (value.is_boolean()) {
+                out->lexemeValue = CreateBoolean(environment, value.get<bool>());
+            } else if (value.is_number_float()) {
+                out->floatValue = CreateFloat(environment, value.get<double>());
+            } else if (value.is_number_integer() || value.is_number_unsigned()) {
+                out->integerValue = CreateInteger(environment, value.get<long long>());
+            } else {
+                out->lexemeValue = CreateSymbol(environment, value.dump().c_str());
+            }
+        }
+    } catch (const std::exception&e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+        UDFThrowError(context);
+    }
+}
+
+static void _AddUDF_utility_json_value_for_path(Environment*environment)
+{
+    char returnCode[] = {
+        clips::return_code<clips::boolean>::value,
+        clips::return_code<clips::integer>::value,
+        clips::return_code<clips::real   >::value,
+        clips::return_code<clips::string >::value,
+        clips::return_code<clips::symbol >::value, 0
+    };
+    char argumentsCode[] = { '*', ';',
+        clips::argument_code<clips::external_address>::value, ';',
+        
+        clips::argument_code<clips::string>::value,
+        clips::argument_code<clips::symbol>::value, ';',
+        
+        clips::argument_code<clips::boolean>::value,
+        clips::argument_code<clips::integer>::value,
+        clips::argument_code<clips::real   >::value,
+        clips::argument_code<clips::string >::value,
+        clips::argument_code<clips::symbol >::value, 0
+    };
+    AddUDF(environment, "json-value-for-path", returnCode, 2, 3, argumentsCode,
+           _UDF_utility_json_value_for_path, "_UDF_utility_json_value_for_path", nullptr);
+}
+
+static void _UDF_utility_json_set_value_for_path(Environment*environment, UDFContext *context, UDFValue*out)
+{
+    UDFValue pointer, key, value;
+    
+    UDFFirstArgument(context, clips::argument_code<clips::external_address>::expect_bits, &pointer);
+    UDFNextArgument (context,
+                     clips::argument_code<clips::string>::expect_bits|
+                     clips::argument_code<clips::symbol>::expect_bits, &key);
+    UDFNextArgument (context,
+                     clips::argument_code<clips::boolean>::expect_bits|
+                     clips::argument_code<clips::integer>::expect_bits|
+                     clips::argument_code<clips::real   >::expect_bits|
+                     clips::argument_code<clips::string >::expect_bits|
+                     clips::argument_code<clips::symbol >::expect_bits|
+                     clips::argument_code<clips::external_address>::expect_bits, &value);
+    try {
+        nlohmann::json* json = static_cast<nlohmann::json*>(pointer.externalAddressValue->contents);
+        nlohmann::json_pointer pointer = nlohmann::json::json_pointer(key.lexemeValue->contents);
+        nlohmann::json&json_target = json->operator[](pointer);
+        auto try_parse_value_as_json = [&json_target, &value]() {
+            try {
+                if (auto&&tmp = nlohmann::json::parse(value.lexemeValue->contents);
+                    tmp.is_object() or tmp.is_array())
+                {
+                    json_target = tmp;
+                }
+            } catch (const std::exception&) {
+                json_target = value.lexemeValue->contents;
+            }
+        };
+            
+        /*  */ if (STRING_TYPE == value.header->type) {
+            try_parse_value_as_json();
+        } else if (SYMBOL_TYPE == value.header->type) {
+            /*  */ if (TrueSymbol(environment) == value.lexemeValue) {
+                json_target = true;
+            } else if (FalseSymbol(environment) == value.lexemeValue) {
+                json_target = false;
+            } else {
+                try_parse_value_as_json();
+            }
+        } else if (FLOAT_TYPE == value.header->type) {
+            json_target = value.floatValue->contents;
+        } else if (INTEGER_TYPE == value.header->type) {
+            json_target = value.integerValue->contents;
+        } else if (EXTERNAL_ADDRESS_TYPE == value.header->type){
+            nlohmann::json*pointer = static_cast<nlohmann::json*>(value.externalAddressValue->contents);
+            json_target = *pointer;
+        } else {
+            throw std::invalid_argument((boost::format("[ERROR] invalid argument for json key path: %1%")%key.lexemeValue->contents).str());
+        }
+    } catch (const std::exception&e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+        UDFThrowError(context);
+    }
+}
+static void _AddUDF_utility_json_set_value_for_path(Environment*environment)
+{
+    char returnCode[] = {
+        clips::return_code<clips::boolean>::value,
+        clips::return_code<clips::integer>::value,
+        clips::return_code<clips::real   >::value,
+        clips::return_code<clips::string >::value,
+        clips::return_code<clips::symbol >::value, 0
+    };
+    char argumentsCode[] = { '*', ';',
+        clips::argument_code<clips::external_address>::value, ';',
+        
+        clips::argument_code<clips::string>::value,
+        clips::argument_code<clips::symbol>::value, ';',
+        
+        clips::argument_code<clips::boolean>::value,
+        clips::argument_code<clips::integer>::value,
+        clips::argument_code<clips::real   >::value,
+        clips::argument_code<clips::string >::value,
+        clips::argument_code<clips::symbol >::value, 0
+    };
+    AddUDF(environment, "json-set-value-for-path", returnCode, 3, 3, argumentsCode,
+           _UDF_utility_json_set_value_for_path, "_UDF_utility_json_set_value_for_path", nullptr);
+}
+
+void utility_initialize(Environment*environment)
+{
+    clips::user_function<__LINE__>(environment, "read-command", utility_read_command);
+    clips::user_function<__LINE__>(environment, "read-json",    utility_read_json);
+    clips::user_function<__LINE__>(environment, "read-until",   utility_read_until);
+    
+    clips::user_function<__LINE__>(environment, "max-integer",  utility_max_integer);
+    clips::user_function<__LINE__>(environment, "min-integer",  utility_min_integer);
+    
+    clips::user_function<__LINE__>(environment, "newline", utility_newline);
+    clips::user_function<__LINE__>(environment, "uuidgen", utility_uuidgen);
+    
+    clips::user_function<__LINE__>(environment, "sym-join$", utility_sym_join);
+    clips::user_function<__LINE__>(environment, "str-join$", utility_str_join);
+    
+    clips::user_function<__LINE__>(environment, "lexeme-starts-with",   utility_lexeme_starts_with);
+    clips::user_function<__LINE__>(environment, "lexeme-istarts-with",  utility_lexeme_istarts_with);
+    clips::user_function<__LINE__>(environment, "lexeme-ends-with",     utility_lexeme_ends_with);
+    clips::user_function<__LINE__>(environment, "lexeme-iends-with",    utility_lexeme_iends_with);
+    clips::user_function<__LINE__>(environment, "lexeme-contains",      utility_lexeme_contains);
+    clips::user_function<__LINE__>(environment, "lexeme-icontains",     utility_lexeme_icontains);
+    
+    clips::user_function<__LINE__>(environment, "sleep-seconds",      utility_sleep_seconds);
+    clips::user_function<__LINE__>(environment, "sleep-milliseconds", utility_sleep_milliseconds);
+    clips::user_function<__LINE__>(environment, "sleep-microseconds", utility_sleep_microseconds);
+    clips::user_function<__LINE__>(environment, "sleep-nanoseconds",  utility_sleep_nanoseconds);
+    
+    //clips::user_function<__LINE__>(environment, "expand-for-eval", utility_expand_for_eval);
+    //clips::user_function<__LINE__>(environment, "expand-and-eval", utility_expand_and_eval);
+    
+    clips::user_function<__LINE__>(environment, "json-validate",    utility_json_validate);
+
+    clips::user_function<__LINE__>(environment, "json-create",      utility_json_create);
+    clips::user_function<__LINE__>(environment, "json-dispose",     utility_json_dispose);
+    clips::user_function<__LINE__>(environment, "json-dump-dispose",utility_json_dump_dispose);
+    clips::user_function<__LINE__>(environment, "json-dump",        utility_json_dump);
+    clips::user_function<__LINE__>(environment, "json-diff",        utility_json_diff);
+    clips::user_function<__LINE__>(environment, "json-patch",       utility_json_patch);
+    clips::user_function<__LINE__>(environment, "json-merge-patch", utility_json_merge_patch);
+    
+    _AddUDF_utility_json_value_for_path(environment);
+    _AddUDF_utility_json_set_value_for_path(environment);
+}
+
+}// namespace clips::extension {
+#endif//CLIPS_EXTENSION_UTILITY_ENABLED
+
+#if CLIPS_EXTENSION_SOCKET_ENABLED
+#include <boost/asio.hpp>
+#include <nlohmann/json.hpp>
+#include <iostream>
+#include <unordered_map>
+#include <array>
+
+namespace clips::extension {
+
+using boost::asio::ip::tcp;
+struct socketData {
+    boost::asio::io_context         io_context;
+    std::shared_ptr<tcp::acceptor>  acceptor;
+    std::shared_ptr<tcp::resolver>  resolver;
+    struct Session {
+        std::string                     router;
+        std::shared_ptr<tcp::socket>    socket;
+        boost::asio::streambuf          buffer_recv;
+        bool                            block_reading{false};
+    };
+    std::unordered_map<std::string, std::shared_ptr<Session>>   session_list;
+};
+
+#define SOCKET_DATA                USER_ENVIRONMENT_DATA + 1
+#define SocketData(environment)    static_cast<socketData*>(GetEnvironmentData(environment, SOCKET_DATA))
+
+void _socket_make_session(Environment*environment, std::shared_ptr<tcp::socket>socket, const char*ROUTER)
+{
+    auto session = std::make_shared<socketData::Session>();
+    session->router = ROUTER;
+    session->socket = socket;
+    SocketData(environment)->session_list[ROUTER] = session;
+
+    /* prepare router for network */{
+        auto RouterQueryFunction = [](Environment *environment, const char *logicalName, void *context) {
+            auto session = static_cast<socketData::Session*>(context);
+            return logicalName == session->router;
+        };
+        auto RouterWriteFunction = [](Environment *environment, const char *logicalName, const char *str, void *context){
+            auto session = static_cast<socketData::Session*>(context);
+            boost::system::error_code ignored_error;
+            boost::asio::write(*session->socket,
+                               boost::asio::const_buffer(str, std::strlen(str)),
+                               ignored_error);
+        };
+        auto RouterReadFunction = [](Environment *environment,const char *logicalName,void *context)->int {
+            auto session = static_cast<socketData::Session*>(context);
+            
+            if (0 == session->buffer_recv.size()) {
+                
+                std::size_t bytes_available = session->socket->available();
+                
+                 if (0 == bytes_available && session->block_reading) {
+                    bytes_available = 1;
+                }
+                
+                if (bytes_available > 0) {
+                    boost::system::error_code ignored_error;
+                    boost::asio::read(*session->socket,
+                                      session->buffer_recv,
+                                      boost::asio::transfer_exactly(bytes_available),
+                                      ignored_error);
+                }
+            }
+            
+            std::istream is(&session->buffer_recv);
+            return is.get();
+        };
+        auto RouterUnreadFunction =[](Environment *environment,const char *logicalName,int inchar,void *context)->int {
+            auto session = static_cast<socketData::Session*>(context);
+            
+            std::istream is(&session->buffer_recv);
+            is.putback(inchar);
+            
+            return static_cast<int>(true);
+        };
+        
+        AddRouter(environment, ROUTER, 20,
+                  /* RouterQueryFunction  * */RouterQueryFunction,
+                  /* RouterWriteFunction  * */RouterWriteFunction,
+                  /* RouterReadFunction   * */RouterReadFunction,
+                  /* RouterUnreadFunction * */RouterUnreadFunction,
+                  /* RouterExitFunction   * */nullptr,
+                  /* void                 * */session.get());
+    }
+}
+
+void socket_accept(Environment*environment, const char*ROUTER, const int PORT)
+{
+    if (nullptr == SocketData(environment)->acceptor) {
+        SocketData(environment)->acceptor = std::make_shared<tcp::acceptor>(SocketData(environment)->io_context,
+                                                                             tcp::endpoint(tcp::v4(), PORT));
+    }
+
+    try {
+        auto&io_context = SocketData(environment)->io_context;
+        auto acceptor = SocketData(environment)->acceptor;
+
+        auto socket = std::make_shared<tcp::socket>(io_context);
+        acceptor->accept(*socket);
+
+        _socket_make_session(environment, socket, ROUTER);
+
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+}
+
+void socket_connect(Environment*environment, const char*ROUTER, const char* HOST, const char* PORT)
+{
+    if (nullptr == SocketData(environment)->acceptor) {
+        SocketData(environment)->resolver = std::make_shared<tcp::resolver>(SocketData(environment)->io_context);
+    }
+
+    try {
+        auto&io_context = SocketData(environment)->io_context;
+        auto&  resolver = SocketData(environment)->resolver;
+        
+        tcp::resolver::results_type endpoints = resolver->resolve(HOST, PORT);
+
+        auto socket = std::make_shared<tcp::socket>(io_context);
+        boost::asio::connect(*socket, endpoints);
+        
+        _socket_make_session(environment, socket, ROUTER);
+
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+}
+
+clips::string socket_peek_available(Environment*environment, const char*ROUTER)
+{
+    const char* content = "";
+    try{
+        auto session = SocketData(environment)->session_list.at(ROUTER);
+        std::size_t bytes_available = session->socket->available();
+        
+        if (bytes_available > 0) {
+            boost::system::error_code ignored_error;
+            boost::asio::read(*session->socket,
+                              session->buffer_recv,
+                              boost::asio::transfer_exactly(bytes_available),
+                              ignored_error);
+        }
+        
+        content = boost::asio::buffer_cast<const char*>(session->buffer_recv.data());
+    } catch (const std::exception&e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+    return clips::string{content};
+}
+
+clips::boolean socket_block_reading(Environment*environment, const char*ROUTER, bool block_reading)
+{
+    bool last_block_reading{false};
+    try{
+        auto session = SocketData(environment)->session_list.at(ROUTER);
+        last_block_reading = session->block_reading;
+        session->block_reading = block_reading;
+    } catch (const std::exception&e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+    return clips::boolean{last_block_reading};
+}
+
+void socket_initialize(Environment*environment)
+{
+    if (nullptr == SocketData(environment)) {
+        AllocateEnvironmentData(environment, SOCKET_DATA, sizeof(socketData), [](Environment*environment){
+            SocketData(environment)->~socketData();
+        });
+        new (SocketData(environment)) socketData();
+    }
+
+    clips::user_function<__LINE__>(environment, "socket-accept",         socket_accept);
+    clips::user_function<__LINE__>(environment, "socket-connect",        socket_connect);
+    clips::user_function<__LINE__>(environment, "socket-peek-available", socket_peek_available);
+    clips::user_function<__LINE__>(environment, "socket-block-reading",  socket_block_reading);
+}
+
+}// namespace clips::extension {
+
+#endif// CLIPS_EXTENSION_SOCKET_ENABLED
+
+#if CLIPS_EXTENSION_ZEROMQ_ENABLED
+
+#include <zmq.hpp>
+#include <iostream>
+#include <unordered_map>
+#include <boost/asio/streambuf.hpp>
+
+namespace clips::extension {
+
+struct zeromqData {
+    zmq::context_t context;
+    struct Session {
+        std::string                     router;
+        std::shared_ptr<zmq::socket_t>  socket;
+        boost::asio::streambuf          buffer; // 接收缓冲区
+    };
+    std::unordered_map<std::string, std::shared_ptr<Session>    >   session_map;
+    std::unordered_map<std::string, std::vector<zmq::pollitem_t>>   pollitems_map;
+};
+
+#define ZEROMQ_DATA                USER_ENVIRONMENT_DATA + 2
+#define ZeromqData(environment)    static_cast<zeromqData*>(GetEnvironmentData(environment, ZEROMQ_DATA))
+
+void _zeromq_make_session(Environment*environment, std::shared_ptr<zmq::socket_t>socket, const char*ROUTER)
+{
+    auto session = std::make_shared<zeromqData::Session>();
+    session->router = ROUTER;
+    session->socket = socket;
+    ZeromqData(environment)->session_map[ROUTER] = session;
+    
+    /* prepare router for network */{
+        auto RouterQueryFunction = [](Environment *environment, const char *logicalName, void *context) {
+            auto session = static_cast<zeromqData::Session*>(context);
+            return logicalName == session->router;
+        };
+        auto RouterWriteFunction = [](Environment *environment, const char *logicalName, const char *str, void *context){
+            try {
+                auto session = static_cast<zeromqData::Session*>(context);
+                session->socket->send(zmq::const_buffer(str, std::strlen(str)), zmq::send_flags::dontwait);
+            } catch (const std::exception&e) {
+                static char message[1024] = "";
+                gensprintf(message, "[ZMQ]: Throw while write [%s] to router [%s]: ", str, logicalName);
+                WriteString(environment, STDERR, message);
+                WriteString(environment, STDERR, e.what());
+                WriteString(environment, STDERR, "\n");
+            }
+        };
+        auto RouterReadFunction = [](Environment *environment,const char *logicalName,void *context)->int {
+            auto session = static_cast<zeromqData::Session*>(context);
+            try {
+                if (0 == session->buffer.size()) {
+                    zmq::message_t message;
+                    if (auto n = session->socket->recv(message); *n >0 ) {
+                        std::ostream os(&session->buffer);
+                        os.write(static_cast<char*>(message.data()), *n);
+                    }
+                }
+            } catch (const std::exception&e) {
+                static char message[1024] = "";
+                gensprintf(message, "[ZMQ]: Throw while read from router [%s]: ", logicalName);
+                WriteString(environment, STDERR, message);
+                WriteString(environment, STDERR, e.what());
+                WriteString(environment, STDERR, "\n");
+            }
+            std::istream is(&session->buffer);
+            return is.get();
+        };
+        auto RouterUnreadFunction =[](Environment *environment,const char *logicalName,int inchar,void *context)->int {
+            auto session = static_cast<zeromqData::Session*>(context);
+
+            std::istream is(&session->buffer);
+            is.putback(inchar);
+            
+            return static_cast<int>(true);
+        };
+        
+        AddRouter(environment, ROUTER, 20,
+                  /* RouterQueryFunction  * */RouterQueryFunction,
+                  /* RouterWriteFunction  * */RouterWriteFunction,
+                  /* RouterReadFunction   * */RouterReadFunction,
+                  /* RouterUnreadFunction * */RouterUnreadFunction,
+                  /* RouterExitFunction   * */nullptr,
+                  /* void                 * */session.get());
+    }
+}
+
+zmq::socket_type _zeromq_socket_type_from_string(const char*SOCKET_TYPE)
+{
+    zmq::socket_type socket_type;
+    
+    /* */if (0 == std::strcmp(SOCKET_TYPE, "req"   )) return zmq::socket_type::req;
+    else if (0 == std::strcmp(SOCKET_TYPE, "rep"   )) return zmq::socket_type::rep;
+    else if (0 == std::strcmp(SOCKET_TYPE, "dealer")) return zmq::socket_type::dealer;
+    else if (0 == std::strcmp(SOCKET_TYPE, "router")) return zmq::socket_type::router;
+    else if (0 == std::strcmp(SOCKET_TYPE, "pub"   )) return zmq::socket_type::pub;
+    else if (0 == std::strcmp(SOCKET_TYPE, "sub"   )) return zmq::socket_type::sub;
+    else if (0 == std::strcmp(SOCKET_TYPE, "xpub"  )) return zmq::socket_type::xpub;
+    else if (0 == std::strcmp(SOCKET_TYPE, "xsub"  )) return zmq::socket_type::xsub;
+    else if (0 == std::strcmp(SOCKET_TYPE, "push"  )) return zmq::socket_type::push;
+    else if (0 == std::strcmp(SOCKET_TYPE, "pull"  )) return zmq::socket_type::pull;
+        
+#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 0)
+    else if (0 == std::strcmp(SOCKET_TYPE, "server")) return zmq::socket_type::server;
+    else if (0 == std::strcmp(SOCKET_TYPE, "client")) return zmq::socket_type::client;
+    else if (0 == std::strcmp(SOCKET_TYPE, "radio" )) return zmq::socket_type::radio;
+    else if (0 == std::strcmp(SOCKET_TYPE, "dish"  )) return zmq::socket_type::dish;
+#endif
+    
+#if ZMQ_VERSION_MAJOR >= 4
+    else if (0 == std::strcmp(SOCKET_TYPE, "stream")) return zmq::socket_type::stream;
+#endif
+    
+    else if (0 == std::strcmp(SOCKET_TYPE, "pair")) return zmq::socket_type::pull;
+    
+    else {
+        throw std::invalid_argument("\nERROR:\tzeromq socket type only support: \n\n"
+                                    "\treq, rep, dealer, router, pub, sub, xpub, xsub, push, pull,\n"
+#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 0)
+                                    "\tserver, client, radio, dish,\n"
+#endif
+#if ZMQ_VERSION_MAJOR >= 4
+                                    "\tstream,\n"
+#endif
+                                    "\tpair\n");
+    }
+    
+    return socket_type;
+}
+void zeromq_bind(Environment*environment, const char* ROUTER, const char* ADDRESS, const char* SOCKET_TYPE)
+{
+    try {
+        
+        zmq::socket_type socket_type = _zeromq_socket_type_from_string(SOCKET_TYPE);
+        auto socket = std::make_shared<zmq::socket_t>(ZeromqData(environment)->context, socket_type);
+        
+        _zeromq_make_session(environment, socket, ROUTER);
+        
+        socket->bind(ADDRESS);
+        
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, __PRETTY_FUNCTION__);
+        WriteString(environment, STDERR, ": ");
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+}
+
+void zeromq_connect(Environment*environment, const char* ROUTER, const char* ADDRESS, const char* SOCKET_TYPE)
+{
+    try {
+        
+        zmq::socket_type socket_type = _zeromq_socket_type_from_string(SOCKET_TYPE);
+        auto socket = std::make_shared<zmq::socket_t>(ZeromqData(environment)->context, socket_type);
+        
+        _zeromq_make_session(environment, socket, ROUTER);
+        
+        socket->connect(ADDRESS);
+        
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, __PRETTY_FUNCTION__);
+        WriteString(environment, STDERR, ": ");
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+}
+
+void zeromq_close(Environment*environment, const char* ROUTER)
+{
+    try {
+        auto session = ZeromqData(environment)->session_map.at(ROUTER);
+        session->socket = nullptr;
+        
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, __PRETTY_FUNCTION__);
+        WriteString(environment, STDERR, ": ");
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+}
+
+static void _UDF_zeromq_poll_create(Environment*environment, UDFContext *context, UDFValue*out)
+{
+    try {
+        std::string                  key;
+        std::vector<zmq::pollitem_t> items;
+        
+        constexpr auto expect_bits = clips::argument_code<clips::string>::expect_bits|
+        /*                        */ clips::argument_code<clips::symbol>::expect_bits;
+        
+        {
+            UDFValue value;
+            UDFFirstArgument(context, expect_bits, &value);
+            assert(1 == value.lexemeValue->count);
+            key = std::string(value.lexemeValue->contents);
+        }
+        
+        while(UDFHasNextArgument(context)) {
+            UDFValue value;
+            UDFNextArgument(context, expect_bits, &value);
+            assert(1 == value.lexemeValue->count);
+            std::string router(value.lexemeValue->contents);
+            auto session = ZeromqData(environment)->session_map.at(router);
+            items.push_back({static_cast<void*>(*session->socket), 0, ZMQ_POLLIN, 0});
+        }
+        
+        ZeromqData(environment)->pollitems_map[key] = items;
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, __PRETTY_FUNCTION__);
+        WriteString(environment, STDERR, ": ");
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+}
+
+static void _AddUDF_zeromq_poll_create(Environment*environment)
+{
+    char returnCode[] = {
+        clips::return_code<clips::integer>::value, 0
+    };
+    char argumentsCode[] = {
+        clips::argument_code<clips::string>::value,
+        clips::argument_code<clips::symbol>::value, ';',
+        
+        clips::argument_code<clips::string>::value,
+        clips::argument_code<clips::symbol>::value, ';', 0
+    };
+    AddUDF(environment, "zmq-poll-create", returnCode, 2, UNBOUNDED, argumentsCode,
+           _UDF_zeromq_poll_create, "_UDF_zeromq_poll_create", nullptr);
+}
+
+static void zeromq_poll(Environment*environment, const char* KEY)
+{
+    try {
+        auto&&items = ZeromqData(environment)->pollitems_map.at(KEY);
+        zmq::poll(items);
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, __PRETTY_FUNCTION__);
+        WriteString(environment, STDERR, ": ");
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "! KEY: ");
+        WriteString(environment, STDERR, KEY);
+        WriteString(environment, STDERR, "\n");
+    }
+}
+
+static clips::boolean zeromq_poll_router_has_message(Environment*environment, const char* KEY, const char*ROUTER)
+{
+    try {
+        const auto& session = ZeromqData(environment)->session_map.at(ROUTER);
+        const auto&   items = ZeromqData(environment)->pollitems_map.at(KEY);
+        for (auto&&item : items) {
+            if (item.socket == static_cast<void*>(*session->socket)) {
+                if (item.revents & ZMQ_POLLIN) {
+                    return clips::boolean{true};
+                }
+            }
+        }
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, __PRETTY_FUNCTION__);
+        WriteString(environment, STDERR, ": ");
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "! KEY: ");
+        WriteString(environment, STDERR, KEY);
+        WriteString(environment, STDERR, ", ROUTER: ");
+        WriteString(environment, STDERR, ROUTER);
+        WriteString(environment, STDERR, "\n");
+    }
+    
+    return clips::boolean{false};
+}
+
+static clips::multifield zeromq_poll_routers_with_message(Environment*environment, const char* KEY)
+{
+    clips::multifield multifield;
+    try {
+        std::unordered_map<void*, std::string> to_router;
+        for (auto&&[router, session] : ZeromqData(environment)->session_map) {
+            to_router[static_cast<void*>(*session->socket)] = router;
+        }
+        const auto& items = ZeromqData(environment)->pollitems_map.at(KEY);
+        for (auto&&item : items) {
+            if (item.revents & ZMQ_POLLIN) {
+                std::string router = to_router.at(item.socket);
+                multifield.push_back(clips::symbol{router});
+            }
+        }
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, __PRETTY_FUNCTION__);
+        WriteString(environment, STDERR, ": ");
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "! KEY: ");
+        WriteString(environment, STDERR, KEY);
+        WriteString(environment, STDERR, "\n");
+    }
+    
+    return multifield;
+}
+
+clips::symbol zeromq_version(Environment*environment)
+{
+    return clips::symbol{std::to_string(ZMQ_VERSION)};
+}
+
+void zeromq_initialize(Environment*environment)
+{
+    if (nullptr == ZeromqData(environment)) {
+        AllocateEnvironmentData(environment, ZEROMQ_DATA, sizeof(zeromqData), [](Environment*environment){
+            ZeromqData(environment)->~zeromqData();
+        });
+        new (ZeromqData(environment)) zeromqData();
+    }
+    
+    clips::user_function<__LINE__>(environment, "zmq-bind",             zeromq_bind);
+    clips::user_function<__LINE__>(environment, "zmq-connect",          zeromq_connect);
+    clips::user_function<__LINE__>(environment, "zmq-close",            zeromq_close);
+    clips::user_function<__LINE__>(environment, "zmq-version",          zeromq_version);
+    
+    _AddUDF_zeromq_poll_create(environment); // zmq-poll-create
+    clips::user_function<__LINE__>(environment, "zmq-poll",                         zeromq_poll);
+    clips::user_function<__LINE__>(environment, "zmq-poll-router-has-message",      zeromq_poll_router_has_message);
+    clips::user_function<__LINE__>(environment, "zmq-poll-routers-with-message",    zeromq_poll_routers_with_message);
+    
+    // Prepare:
+    //(zmq-poll-create ITEMS express cucumber)
+    
+    // Sample 1:
+    //(while TRUE do (zmq-poll ITEMS)
+    //    (if (zmq-poll-router-has-message  express) then (read-command  express))
+    //    (if (zmq-poll-router-has-message cucumber) then (read-command cucumber)))
+    
+    // Sample 2:
+    //(while TRUE do (zmq-poll ITEMS)
+    //(progn$ (router (zmq-poll-routers-with-message))
+    //    (do-something (read-command router)))
+}
+
+}// namespace clips::extension {
+#endif// CLIPS_EXTENSION_ZEROMQ_ENABLED
+
+#if CLIPS_EXTENSION_MUSTACHE_ENABLED
+
+#include <mstch/mstch.hpp>
+#include <nlohmann/json.hpp>
+#include <boost/algorithm/string.hpp>
+
+namespace clips::extension {
+
+mstch::node mstch_node_from_json(const nlohmann::json&json)
+{
+    /**/   if (json.is_null()) {
+        return nullptr;
+    } else if (json.is_number_float()) {
+        return static_cast<double>(json.get<nlohmann::json::number_float_t>());
+    } else if (json.is_number_integer()) {
+        return static_cast<int>(json.get<nlohmann::json::number_integer_t>());
+    } else if (json.is_number_unsigned()) {
+        return static_cast<int>(json.get<nlohmann::json::number_unsigned_t>());
+    } else if (json.is_boolean()) {
+        return static_cast<bool>(json.get<nlohmann::json::boolean_t>());
+    } else if (json.is_string()) {
+        return json.get<nlohmann::json::string_t>();
+    } else if (json.is_object()) {
+        mstch::map map;
+        for (auto& [key, val] : json.items()) {
+            map[key] = mstch_node_from_json(val);
+        }
+        return map;
+    } else if (json.is_array()) {
+        mstch::array array;
+        for (auto& [key, val] : json.items()) {
+            array.push_back(mstch_node_from_json(val));
+        }
+        return array;
+    }
+    
+    return nullptr;
+}
+
+void trim_prefix(std::string&Input)
+{
+    if (Input.empty())
+        return;
+    
+    std::vector<std::string> v; // #2: Search for tokens
+    boost::trim_right(Input);
+    boost::split(v, Input, boost::is_any_of("\n"), boost::token_compress_on);
+    
+    if (v.empty())
+        return;
+    if (1 == v.size())
+        return;
+    
+    v.erase(std::remove_if(std::begin(v), std::end(v), [](auto x){ return x.empty(); }), std::end(v));
+    if (v.size() >= 2) {
+        auto n = std::size(v[0]) - std::size(boost::trim_left_copy(v[0]));
+        std::for_each(std::begin(v), std::end(v), [n](auto&&x){ boost::erase_head(x, static_cast<int>(n)); });
+    }
+    Input = boost::join(v, "\n");
+}
+
+clips::string mustache_trim(const char* input)
+{
+    std::string tmp(input);
+    trim_prefix(tmp);
+    return clips::string{tmp};
+}
+
+clips::string mustache_render(Environment*environment, const char* VIEW, const char* CONTEXT)
+{
+    try {
+        mstch::node context = mstch_node_from_json(nlohmann::json::parse(CONTEXT));
+        return clips::string{mstch::render(VIEW, context)};
+    } catch (const std::exception&e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+    return clips::string{""};
+}
+
+clips::string mustache_render_with_partials(Environment*environment, const char* VIEW, const char* CONTEXT, const char*PARTIALS)
+{
+    try {
+        mstch::node context  = mstch_node_from_json(nlohmann::json::parse(CONTEXT));
+        mstch::node partials = mstch_node_from_json(nlohmann::json::parse(PARTIALS));
+        std::map<std::string,std::string> partials_map;
+        
+        for (auto&&[key, node]:boost::get<mstch::map>(partials)) {
+            partials_map[key] = boost::get<std::string>(node);
+        }
+        return clips::string{mstch::render(VIEW, context, partials_map)};
+    } catch (const std::exception&e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+    return clips::string{""};
+}
+
+static void _UDF_mustache_render(Environment*environment, UDFContext *context, UDFValue*out)
+{
+    try {
+        std::string VIEW;
+        std::string CONTEXT;
+        std::string PARTIALS;
+        constexpr auto expect_bits = clips::argument_code<clips::string>::expect_bits|
+        /*                        */ clips::argument_code<clips::symbol>::expect_bits;
+        
+        {
+            UDFValue value;
+            UDFFirstArgument(context, expect_bits, &value);
+            VIEW = std::string(value.lexemeValue->contents, value.lexemeValue->count);
+        }
+        {
+            UDFValue value;
+            UDFNextArgument(context, expect_bits, &value);
+            CONTEXT = std::string(value.lexemeValue->contents, value.lexemeValue->count);
+        }
+        
+        clips::string result;
+        if(UDFHasNextArgument(context)) {
+            UDFValue value;
+            UDFNextArgument(context, expect_bits, &value);
+            PARTIALS = std::string(value.lexemeValue->contents, value.lexemeValue->count);
+            result = mustache_render_with_partials(environment, VIEW.c_str(), CONTEXT.c_str(), PARTIALS.c_str());
+        } else {
+            result = mustache_render(environment, VIEW.c_str(), CONTEXT.c_str());
+        }
+        
+        out->lexemeValue = CreateString(environment, std::get<0>(result).c_str());
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+}
+
+static void _AddUDF_mustache_render(Environment*environment)
+{
+    char returnCode[] = {
+        clips::return_code<clips::integer>::value, 0
+    };
+    char argumentsCode[] = {
+        clips::argument_code<clips::string>::value,
+        clips::argument_code<clips::symbol>::value, ';', 0
+    };
+    AddUDF(environment, "mustache-render", returnCode, 2, 3, argumentsCode,
+           _UDF_mustache_render, "_UDF_mustache_render", nullptr);
+}
+
+
+void mustache_initialize(Environment*environment)
+{
+    clips::user_function<__LINE__>(environment, "mustache-trim",    mustache_trim);
+//    clips::user_function<__LINE__>(environment, "mustache-render",  mustache_render);
+//    clips::user_function<__LINE__>(environment, "mustache-render-with-partials",  mustache_render_with_partials);
+    _AddUDF_mustache_render(environment);
+}
+
+}// namespace clips::extension {
+#endif// CLIPS_EXTENSION_MUSTACHE_ENABLED
+
+
+#if CLIPS_EXTENSION_PROCESS_ENABLED
+
+#include <boost/asio.hpp>
+#include <boost/process.hpp>
+#include <boost/asio/signal_set.hpp>
+
+namespace clips::extension {
+
+struct processData {
+    struct Terminal {
+        std::string                 router;
+        
+        boost::process::opstream    in;
+        boost::process::ipstream    out;
+        std::shared_ptr<boost::process::child> child;
+    };
+    std::unordered_map<std::string, std::shared_ptr<Terminal>>   terminal_list;
+};
+
+#define PROCESS_DATA                USER_ENVIRONMENT_DATA + 3
+#define ProcessData(environment)    static_cast<processData*>(GetEnvironmentData(environment, PROCESS_DATA))
+
+void _process_make_terminal(Environment*environment, const char*ROUTER)
+{
+    auto terminal = std::make_shared<processData::Terminal>();
+    terminal->router = ROUTER;
+    ProcessData(environment)->terminal_list[ROUTER] = terminal;
+    
+    /* prepare router for terminal */{
+        auto RouterQueryFunction = [](Environment *environment, const char *logicalName, void *context) {
+            auto terminal = static_cast<processData::Terminal*>(context);
+            return logicalName == terminal->router;
+        };
+        auto RouterWriteFunction = [](Environment *environment, const char *logicalName, const char *str, void *context){
+            auto terminal = static_cast<processData::Terminal*>(context);
+            try {
+                terminal->in << str << std::flush;
+            } catch (std::exception&e) {
+                WriteString(environment, STDERR, e.what());
+                WriteString(environment, STDERR, "\n");
+            }
+        };
+        auto RouterReadFunction = [](Environment *environment,const char *logicalName,void *context)->int {
+            auto terminal = static_cast<processData::Terminal*>(context);
+            return terminal->out.get();
+        };
+        auto RouterUnreadFunction =[](Environment *environment,const char *logicalName,int inchar,void *context)->int {
+            auto terminal = static_cast<processData::Terminal*>(context);
+            terminal->out.putback(inchar);
+            return static_cast<int>(true);
+        };
+        
+        //auto RouterExitFunction = [](Environment *,int,void *){ };
+        
+        AddRouter(environment, ROUTER, 20,
+                  /* RouterQueryFunction  * */RouterQueryFunction,
+                  /* RouterWriteFunction  * */RouterWriteFunction,
+                  /* RouterReadFunction   * */RouterReadFunction,
+                  /* RouterUnreadFunction * */RouterUnreadFunction,
+                  /* RouterExitFunction   * */nullptr,
+                  /* void                 * */terminal.get());
+    }
+}
+
+clips::string process_system_output(Environment*environment, const char* shellCommand)
+{
+    std::future<std::string> output, error;
+    
+    try {
+        boost::asio::io_context io_context;
+        boost::process::child c(std::string{shellCommand},
+                                //boost::process::std_in.close(),
+                                (boost::process::std_out & boost::process::std_err) > output,
+                                io_context);
+        
+        io_context.run();
+    } catch (const std::exception&e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+    
+    return clips::string{output.get()};
+}
+
+void process_terminal_start(Environment*environment, const char* ROUTER, const char*SHELL_COMMAND)
+{
+    try {
+        _process_make_terminal(environment, ROUTER);
+        auto terminal = ProcessData(environment)->terminal_list.at(ROUTER);
+        terminal->child = std::make_shared<boost::process::child>(SHELL_COMMAND,
+                                                                  boost::process::std_out > terminal->out,
+                                                                  boost::process::std_in  < terminal->in);
+        
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+}
+clips::boolean process_terminal_stop(Environment*environment, const char* ROUTER)
+{
+    try {
+        auto terminal = ProcessData(environment)->terminal_list.at(ROUTER);
+        DeleteRouter(environment, ROUTER);
+        ProcessData(environment)->terminal_list.erase(ROUTER);
+        return clips::boolean{true};
+    } catch (const std::exception& e) {
+        WriteString(environment, STDERR, e.what());
+        WriteString(environment, STDERR, "\n");
+    }
+    return clips::boolean{false};
+}
+
+void process_initialize(Environment*environment)
+{
+    if (nullptr == ProcessData(environment)) {
+        AllocateEnvironmentData(environment, PROCESS_DATA, sizeof(processData), [](Environment*environment){
+            ProcessData(environment)->~processData();
+        });
+        new (ProcessData(environment)) processData();
+    }
+    
+    clips::user_function<__LINE__>(environment, "system-output",  process_system_output);
+    clips::user_function<__LINE__>(environment, "terminal-start", process_terminal_start);
+    clips::user_function<__LINE__>(environment, "terminal-stop",  process_terminal_stop);
+}
+
+}// namespace clips::extension {
+#endif// CLIPS_EXTENSION_PROCESS_ENABLED
diff --git a/clips/clips.h b/clips/clips.h
new file mode 100755
index 000000000..60ee9b62f
--- /dev/null
+++ b/clips/clips.h
@@ -0,0 +1,131 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  06/28/16             */
+   /*                                                     */
+   /*                   API HEADER FILE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added filertr.h and tmpltfun.h to include      */
+/*            list.                                          */
+/*                                                           */
+/*      6.30: Added classpsr.h, iofun.h, and strngrtr.h to   */
+/*            include list.                                  */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_CLIPS_API
+
+#pragma once
+
+#define _H_CLIPS_API
+
+#include <stdio.h>
+
+#include "setup.h"
+#include "argacces.h"
+#include "constant.h"
+#include "memalloc.h"
+#include "cstrcpsr.h"
+#include "fileutil.h"
+#include "strngfun.h"
+#include "envrnmnt.h"
+#include "envrnbld.h"
+#include "commline.h"
+#include "symbol.h"
+
+#include "prntutil.h"
+#include "router.h"
+#include "filertr.h"
+#include "strngrtr.h"
+
+#include "iofun.h"
+
+#include "sysdep.h"
+#include "bmathfun.h"
+#include "expressn.h"
+#include "exprnpsr.h"
+#include "evaluatn.h"
+#include "constrct.h"
+#include "utility.h"
+#include "watch.h"
+#include "modulbsc.h"
+
+#if BLOAD_ONLY || BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#if BLOAD_AND_BSAVE
+#include "bsave.h"
+#endif
+
+#if DEFRULE_CONSTRUCT
+#include "ruledef.h"
+#include "rulebsc.h"
+#include "engine.h"
+#include "drive.h"
+#include "incrrset.h"
+#include "rulecom.h"
+#include "crstrtgy.h"
+#endif
+
+#if DEFFACTS_CONSTRUCT
+#include "dffctdef.h"
+#include "dffctbsc.h"
+#endif
+
+#if DEFTEMPLATE_CONSTRUCT
+#include "tmpltdef.h"
+#include "tmpltbsc.h"
+#include "tmpltfun.h"
+#include "factcom.h"
+#include "factfun.h"
+#include "factmngr.h"
+#include "facthsh.h"
+#endif
+
+#if DEFGLOBAL_CONSTRUCT
+#include "globldef.h"
+#include "globlbsc.h"
+#include "globlcom.h"
+#endif
+
+#if DEFFUNCTION_CONSTRUCT
+#include "dffnxfun.h"
+#endif
+
+#if DEFGENERIC_CONSTRUCT
+#include "genrccom.h"
+#include "genrcfun.h"
+#endif
+
+#if OBJECT_SYSTEM
+#include "classcom.h"
+#include "classexm.h"
+#include "classfun.h"
+#include "classinf.h"
+#include "classini.h"
+#include "classpsr.h"
+#include "defins.h"
+#include "inscom.h"
+#include "insfile.h"
+#include "insfun.h"
+#include "insmngr.h"
+#include "msgcom.h"
+#include "msgpass.h"
+#include "objrtmch.h"
+#endif
+
+#endif /* _H_CLIPS_API */
diff --git a/clips/clips.hpp b/clips/clips.hpp
new file mode 100644
index 000000000..328110832
--- /dev/null
+++ b/clips/clips.hpp
@@ -0,0 +1,539 @@
+//
+//  clips.hpp
+//  CLIPS_unicode
+//
+//  Created by chunlei.xiong on 13-11-12.
+//  Copyright (c) 2013年 熊春雷. All rights reserved.
+//
+//  MUST be compiled by C++11 and later compiler.
+
+//  Update at 2019-10-17:
+//  1. update import user C++ function to CLIPS with 6.40 beta3 version.
+
+#pragma once
+
+#include <functional>
+#include <cassert>
+#include <vector>
+#include <string>
+#include <any>
+
+namespace clips {
+    /* The following codes are supported for return values and argument types:
+       +------+---------------------------------------------------+
+       | Code | Type                                              |
+       +------+---------------------------------------------------+
+       |  b   | Boolean                                           |
+       |  d   | Double Precision Float                            |
+       |  e   | External Address                                  |
+       |  f   | Fact Address                                      |
+       |  i   | Instance Address                                  |
+       |  l   | Long Long Integer                                 |
+       |  m   | Multifield                                        |
+       |  n   | Instance Name                                     |
+       |  s   | String                                            |
+       |  y   | Symbol                                            |
+       |  v   | Void—No Return Value                              |
+       |  *   | Any Type                                          |
+       +------+---------------------------------------------------+ */
+    
+    using integer           = long long;
+    using real              = double;
+    using boolean           = bool;//std::tuple<bool,        std::integral_constant<char,'b'>>;
+    using string            = std::tuple<std::string, std::integral_constant<char,'s'>>;
+    using symbol            = std::tuple<std::string, std::integral_constant<char,'y'>>;
+    using instance_name     = std::tuple<std::string, std::integral_constant<char,'n'>>;
+    using external_address  = std::tuple<void*,       std::integral_constant<char,'e'>>;
+    using multifield        = std::vector<std::any>;
+//    inline std::ostream&operator<<(std::ostream&os, const string&x) { return os << std::get<0>(x); }
+//    inline std::ostream&operator<<(std::ostream&os, const symbol&x) { return os << std::get<0>(x); }
+    // ////////////////////////////////////////////////////////////////////////////////////////
+    template<typename>struct type_code      {enum{value='*', expect_bits=0};};// * Any Type
+    template<>struct type_code<bool>        {enum{value='b', expect_bits=BOOLEAN_BIT};};// b Boolean
+//    template<>struct type_code<boolean>     {enum{value='b', expect_bits=BOOLEAN_BIT};};// b Boolean
+
+    template<>struct type_code<float>       {enum{value='d', expect_bits=FLOAT_BIT};};// d Double Precision Float
+    template<>struct type_code<double>      {enum{value='d', expect_bits=FLOAT_BIT};};// d Double Precision Float
+    template<>struct type_code<long double> {enum{value='d', expect_bits=FLOAT_BIT};};// d Double Precision Float
+
+    template<>struct type_code</*     */char>      {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+    template<>struct type_code</*     */short>     {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+    template<>struct type_code</*     */int>       {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+    template<>struct type_code</*     */long>      {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+    template<>struct type_code</*     */long long> {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+    template<>struct type_code<unsigned char>      {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+    template<>struct type_code<unsigned short>     {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+    template<>struct type_code<unsigned int>       {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+    template<>struct type_code<unsigned long>      {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+    template<>struct type_code<unsigned long long> {enum{value='l', expect_bits=INTEGER_BIT};};// l Long Long Integer
+
+    template<>struct type_code<      char*>        {enum{value='s', expect_bits=STRING_BIT|SYMBOL_BIT};};// s String, y Symbol
+    template<>struct type_code<const char*>        {enum{value='s', expect_bits=STRING_BIT|SYMBOL_BIT};};// s String, y Symbol
+    template<>struct type_code<std::string>        {enum{value='s', expect_bits=STRING_BIT|SYMBOL_BIT};};// s String, y Symbol
+    template<>struct type_code<string>             {enum{value='s', expect_bits=STRING_BIT           };};// s String
+    template<>struct type_code<symbol>             {enum{value='y', expect_bits=SYMBOL_BIT           };};// y Symbol
+    template<>struct type_code<instance_name>      {enum{value='n', expect_bits=INSTANCE_NAME_BIT    };};// n Instance Name
+    template<>struct type_code<void>               {enum{value='v', expect_bits=VOID_BIT             };};// v Void—No Return Value
+  //template<>struct type_code<double>             {enum{value='f', expect_bits=VOID_BIT             };};// f Fact Address
+  //template<>struct type_code<short>              {enum{value='i', expect_bits=VOID_BIT             };};// i Instance Address
+    template<>struct type_code<multifield>         {enum{value='m', expect_bits=MULTIFIELD_BIT       };};// m Multifield
+    template<>struct type_code<external_address>   {enum{value='e', expect_bits=EXTERNAL_ADDRESS_BIT };};// e External Address
+    template<typename T>struct type_code<T*>       {enum{value='e', expect_bits=EXTERNAL_ADDRESS_BIT };};// e External Address
+
+    template<typename T>struct type_code<const T>{ enum{
+        value=type_code<T>::value,
+        expect_bits=type_code<T>::expect_bits
+    };};
+
+    template<typename T>using   return_code = type_code<T>;
+    template<typename T>using argument_code = type_code<T>;
+
+    template<typename T>struct argument;
+    template<typename T>struct primitive_value;
+#define CLIPS_ARGUMENT_VALUE(float, udfv_contents)                              \
+/**/    static float value(Environment*CLIPS, UDFContext *udfc, unsigned i){    \
+/**/        UDFValue udfv;                                                      \
+/**/        UDFNthArgument(udfc, i, argument_code<float>::expect_bits, &udfv);  \
+/**/        return udfv_contents;                                               \
+/**/    }/* CLIPS_ARGUMENT_VALUE */
+#define CLIPS_ARGUMENT_TEMPLATE(float, udfv_contents)                           \
+/**/    template<>struct argument<float> {                                      \
+/**/        CLIPS_ARGUMENT_VALUE(float, udfv_contents)                          \
+/**/    };                                                                      \
+/**/    template<>struct primitive_value<float> {                               \
+/**/        static float apply(Environment*CLIPS, const CLIPSValue&udfv) {      \
+/**/            return udfv_contents;                                           \
+/**/        }                                                                   \
+/**/    };/* CLIPS_ARGUMENT_TEMPLATE */
+
+    CLIPS_ARGUMENT_TEMPLATE(             float, /*                      */udfv.floatValue->contents)
+    CLIPS_ARGUMENT_TEMPLATE(            double, /*                      */udfv.floatValue->contents)
+    CLIPS_ARGUMENT_TEMPLATE(              char, /*                      */udfv.integerValue->contents)
+    CLIPS_ARGUMENT_TEMPLATE(             short, /*                      */udfv.integerValue->contents)
+    CLIPS_ARGUMENT_TEMPLATE(               int, static_cast<         int>(udfv.integerValue->contents))
+    CLIPS_ARGUMENT_TEMPLATE(              long, /*                      */udfv.integerValue->contents)
+    CLIPS_ARGUMENT_TEMPLATE(         long long, /*                      */udfv.integerValue->contents)
+    CLIPS_ARGUMENT_TEMPLATE(unsigned      char, /*                      */udfv.integerValue->contents)
+    CLIPS_ARGUMENT_TEMPLATE(unsigned     short, /*                      */udfv.integerValue->contents)
+    CLIPS_ARGUMENT_TEMPLATE(unsigned       int, static_cast<unsigned int>(udfv.integerValue->contents))
+    CLIPS_ARGUMENT_TEMPLATE(unsigned      long, /*                      */udfv.integerValue->contents)
+    CLIPS_ARGUMENT_TEMPLATE(unsigned long long, /*                      */udfv.integerValue->contents)
+
+    CLIPS_ARGUMENT_TEMPLATE(              bool,               udfv.lexemeValue != FalseSymbol(CLIPS))
+//  CLIPS_ARGUMENT_TEMPLATE(           boolean,       boolean{udfv.lexemeValue->contents})
+    CLIPS_ARGUMENT_TEMPLATE(       const char*,               udfv.lexemeValue->contents )
+    CLIPS_ARGUMENT_TEMPLATE(       std::string,   std::string{udfv.lexemeValue->contents})
+    CLIPS_ARGUMENT_TEMPLATE(            string,        string{udfv.lexemeValue->contents})
+    CLIPS_ARGUMENT_TEMPLATE(            symbol,        symbol{udfv.lexemeValue->contents})
+    CLIPS_ARGUMENT_TEMPLATE(     instance_name, instance_name{udfv.lexemeValue->contents})
+
+    template<>struct primitive_value<clips::multifield> {
+        static clips::multifield apply(Environment*CLIPS, const UDFValue&udfv) {
+            clips::multifield multifield;
+            for (int i=0; i<udfv.multifieldValue->length; i++) {
+                CLIPSValue&v = udfv.multifieldValue->contents[i];
+                /*  */ if (v.header->type == FLOAT_TYPE) {
+                    auto&&x = primitive_value<clips::real>::apply(CLIPS, v);
+                    multifield.push_back(x);
+                } else if (v.header->type == INTEGER_TYPE) {
+                    auto&&x = primitive_value<clips::integer>::apply(CLIPS, v);
+                    multifield.push_back(x);
+                } else if (v.header->type == SYMBOL_TYPE) {
+                    auto&&x = primitive_value<clips::symbol>::apply(CLIPS, v);
+                    multifield.push_back(x);
+                } else if (v.header->type == STRING_TYPE) {
+                    auto&&x = primitive_value<clips::string>::apply(CLIPS, v);
+                    multifield.push_back(x);
+                } else if (v.header->type == INSTANCE_NAME_TYPE) {
+                    auto&&x = primitive_value<clips::instance_name>::apply(CLIPS, v);
+                    multifield.push_back(x);
+                }
+            }
+            return multifield;
+        }
+    };
+
+    template<>struct argument<clips::multifield> {
+        static clips::multifield value(Environment*CLIPS, UDFContext *udfc, unsigned i){
+            UDFValue udfv;
+            UDFNthArgument(udfc, i, argument_code<clips::multifield>::expect_bits, &udfv);
+            return primitive_value<clips::multifield>::apply(CLIPS, udfv);
+        }
+    };
+
+    template<class T>struct argument<T*> {
+        CLIPS_ARGUMENT_VALUE(T*, static_cast<T*>(udfv.externalAddressValue->contents));
+    };
+    template<class T>struct argument<const T> {
+        static const T value(/* Environment*CLIPS, */UDFContext *udfc, unsigned i){
+            return argument<T>::value(udfc, i);
+        }
+        static const T value(   Environment*CLIPS,   UDFContext *udfc, unsigned i){
+            return argument<T>::value(CLIPS, udfc, i);
+        }
+    };
+    template<typename T>struct argument<T&> {
+        static T value(/* Environment*CLIPS, */UDFContext *udfc, unsigned i){
+            return argument<T>::value(udfc, i);
+        }
+        static T value(   Environment*CLIPS,   UDFContext *udfc, unsigned i){
+            return argument<T>::value(CLIPS, udfc, i);
+        }
+    };
+#undef CLIPS_ARGUMENT_VALUE
+#undef CLIPS_ARGUMENT_TEMPLATE
+    
+    template<char code> struct create_primitive_value;
+#define CLIPS_CREATE_PRIMITIVE_VALUE(code, CreateValue)         \
+/**/    template<> struct create_primitive_value<code> {        \
+/**/        template<typename R> static                         \
+/**/        void apply(Environment*CLIPS, UDFValue*udfv, R&&x){ \
+/**/            udfv->value = CreateValue/*(CLIPS, x)*/;        \
+/**/        }                                                   \
+/**/    };/* CLIPS_CREATE_PRIMITIVE_VALUE */
+    CLIPS_CREATE_PRIMITIVE_VALUE('b', CreateBoolean/*     */(CLIPS,x))
+    CLIPS_CREATE_PRIMITIVE_VALUE('s', CreateString/*      */(CLIPS,std::get<0>(x).c_str()))
+    CLIPS_CREATE_PRIMITIVE_VALUE('y', CreateSymbol/*      */(CLIPS,std::get<0>(x).c_str()))
+    CLIPS_CREATE_PRIMITIVE_VALUE('n', CreateInstanceName/**/(CLIPS,std::get<0>(x).c_str()))
+    CLIPS_CREATE_PRIMITIVE_VALUE('d', CreateFloat/*       */(CLIPS,x))
+    CLIPS_CREATE_PRIMITIVE_VALUE('l', CreateInteger/*     */(CLIPS,x))
+    CLIPS_CREATE_PRIMITIVE_VALUE('e', CreateCExternalAddress(CLIPS,std::get<0>(x)/*    */))
+
+    template<> struct create_primitive_value<return_code<multifield>::value> {
+        static void apply(Environment*CLIPS, UDFValue*udfv, const multifield&x){
+            MultifieldBuilder* mBuilder = CreateMultifieldBuilder(CLIPS, x.size());
+            for (auto&&y:x) {
+                if (y.has_value()) {
+                    /*  */ if (typeid(integer) == y.type()) {
+                        MBAppendInteger(mBuilder, std::any_cast<integer>(y));
+                    } else if (typeid(real) == y.type()) {
+                        MBAppendFloat(mBuilder, std::any_cast<real>(y));
+                    } else if (typeid(boolean) == y.type()) {
+                        if (std::any_cast<boolean>(y)) {
+                            MBAppendCLIPSLexeme(mBuilder, TrueSymbol(CLIPS));
+                        } else {
+                            MBAppendCLIPSLexeme(mBuilder, FalseSymbol(CLIPS));
+                        }
+                    } else if (typeid(string) == y.type()) {
+                        MBAppendString(mBuilder, std::get<0>(std::any_cast<string>(y)).c_str());
+                    } else if (typeid(symbol) == y.type()) {
+                        MBAppendSymbol(mBuilder, std::get<0>(std::any_cast<symbol>(y)).c_str());
+                    } else if (typeid(instance_name) == y.type()) {
+                        MBAppendInstanceName(mBuilder, std::get<0>(std::any_cast<instance_name>(y)).c_str());
+                    } else if (typeid(external_address) == y.type()) {
+                        CLIPSExternalAddress*externalAddress = CreateCExternalAddress(CLIPS, std::get<0>(std::any_cast<external_address>(y)));
+                        MBAppendCLIPSExternalAddress(mBuilder, externalAddress);
+                    }
+                }
+            }
+            udfv->value = MBCreate(mBuilder);
+            MBDispose(mBuilder);
+        }
+    };
+#undef CLIPS_CREATE_PRIMITIVE_VALUE
+    
+    template<typename R, typename ... Args>struct build_arguments_code;
+    template<typename R, typename A1, typename ... Args>
+    struct build_arguments_code<R, A1, Args...> {
+        static const std::string& apply(std::string&code, unsigned long i) {
+            if (i <= 1) { code = "*"; }
+            std::string currentCode = ";";
+            if constexpr(std::is_same_v<const char*, A1> || std::is_same_v<char*, A1> ||
+                         std::is_same_v<std::string, std::remove_reference_t<std::remove_cv_t<A1>>>) {
+                currentCode += argument_code<clips::string>::value;
+                currentCode += argument_code<clips::symbol>::value;
+            } else {
+                currentCode += argument_code<A1>::value;
+            }
+            return build_arguments_code<R,Args...>::apply(code+=currentCode, i+std::size(currentCode));
+        }
+    };
+    template<typename R>struct build_arguments_code<R> {
+        static const std::string& apply(std::string&code, unsigned long i) {
+            return code;
+        }
+    };
+ 
+    namespace __private{
+        template<typename...i>struct m {};
+        template<unsigned...i>struct n { enum { value=sizeof...(i), max_value=0xF}; };
+        template<unsigned>struct build_n;
+        template<>struct build_n<0x1> { typedef n<0x1> type; };
+        template<>struct build_n<0x2> { typedef n<0x1,0x2> type; };
+        template<>struct build_n<0x3> { typedef n<0x1,0x2,0x3> type; };
+        template<>struct build_n<0x4> { typedef n<0x1,0x2,0x3,0x4> type; };
+        template<>struct build_n<0x5> { typedef n<0x1,0x2,0x3,0x4,0x5> type; };
+        template<>struct build_n<0x6> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6> type; };
+        template<>struct build_n<0x7> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6,0x7> type; };
+        template<>struct build_n<0x8> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8> type; };
+        template<>struct build_n<0x9> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9> type; };
+        template<>struct build_n<0xA> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA> type; };
+        template<>struct build_n<0xB> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA,0xB> type; };
+        template<>struct build_n<0xC> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA,0xB,0xC> type; };
+        template<>struct build_n<0xD> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA,0xB,0xC,0xD> type; };
+        template<>struct build_n<0xE> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA,0xB,0xC,0xD,0xE> type; };
+        template<>struct build_n<0xF> { typedef n<0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA,0xB,0xC,0xD,0xE,0xF> type; };
+        
+        template<typename R, typename, typename A,typename B>struct _invoke;
+        template<typename R, typename...Args, int...i> struct _invoke<R, std::integral_constant<int, 0>, m<Args...>, n<i...>> {
+            static R _function(Environment*CLIPS,std::function<R(Args...)>&&theFunc, UDFContext*udfc/*=nullptr*/) {
+                return theFunc(argument<Args>::value(CLIPS, udfc, i)...);
+            }
+        };
+        template<typename R, typename...Args, int...i> struct _invoke<R, Environment*, m<Args...>, n<i...>> {
+            static R _function(Environment*CLIPS,std::function<R(Environment*, Args...)>&&theFunc, UDFContext*udfc/*=nullptr*/) {
+                return theFunc(CLIPS, argument<Args>::value(CLIPS, udfc, i)...);
+            }
+        };
+    }
+    
+    template<typename R, typename...Args>
+    R invoke_function(Environment*CLIPS,std::function<R(Args...)>&&lambda, UDFContext*udfc/*=nullptr*/) {
+        using namespace __private;
+        static_assert(sizeof...(Args)<=n<>::max_value, "Error: Only support max 15 arguments in CLIPS's C function");
+        return _invoke<R, std::integral_constant<int,0>, m<Args...>, typename build_n<sizeof...(Args)>::type>
+        /*  */ ::_function(CLIPS, std::move(lambda), udfc);
+    }
+    template<typename R, typename...Args>
+    R invoke_function(Environment*CLIPS,std::function<R(Environment*,Args...)>&&lambda, UDFContext*udfc/*=nullptr*/) {
+        using namespace __private;
+        static_assert(sizeof...(Args)<=n<>::max_value, "Error: Only support max 15 arguments in CLIPS's C function");
+        return _invoke<R, Environment*, m<Args...>, typename build_n<sizeof...(Args)>::type>
+        /*  */ ::_function(CLIPS, std::move(lambda), udfc);
+    }
+
+    template<typename R>
+    R invoke_function(Environment*CLIPS,std::function<R(Environment*)>&&lambda, UDFContext*udfc/*=nullptr*/) {
+        return lambda(CLIPS);
+    }
+
+    template<typename R>
+    R invoke_function(Environment*CLIPS,std::function<R()>&&lambda, UDFContext*udfc/*=nullptr*/) {
+        return lambda();
+    }
+    
+    template<unsigned i, class R, class...Args> struct is_void_return {
+        static std::function<R(Args...)> lambda;
+        static void f(Environment*CLIPS, UDFContext *udfc, UDFValue*udfv) {
+            enum { code = return_code<R>::value };
+            create_primitive_value<code>::apply(CLIPS, udfv, invoke_function(CLIPS, std::move(lambda), udfc));
+        }
+    };
+    template<unsigned i, class...Args> struct is_void_return<i, void, Args...> {
+        static std::function<void(Args...)>lambda;
+        static void f(Environment*CLIPS, UDFContext *udfc, UDFValue*udfv) {
+            invoke_function(CLIPS,std::move(lambda), udfc);
+        }
+    };
+    template<unsigned i,class R,class...Args> struct is_void_return<i, R, Environment*, Args...> {
+        static std::function<R(Environment*, Args...)> lambda;
+        static void f(Environment*CLIPS, UDFContext *udfc, UDFValue*udfv) {
+            enum { code = return_code<R>::value };
+            create_primitive_value<code>::apply(CLIPS, udfv, invoke_function(CLIPS, std::move(lambda), udfc));
+        }
+    };
+    template<unsigned i,class...Args> struct is_void_return<i, void, Environment*, Args...> {
+        static std::function<void(Environment*, Args...)>lambda;
+        static void f(Environment*CLIPS, UDFContext *udfc, UDFValue*udfv) {
+            invoke_function(CLIPS,std::move(lambda), udfc);
+        }
+    };
+    
+    template<unsigned i, typename R, typename...Args> std::function<   R(/*          */Args...)> is_void_return<i,   R,Args...>::lambda;
+    template<unsigned i, /*       */ typename...Args> std::function<void(/*          */Args...)> is_void_return<i,void,Args...>::lambda;
+    template<unsigned i, typename R, typename...Args> std::function<   R(Environment*, Args...)> is_void_return<i,    R, Environment*, Args...>::lambda;
+    template<unsigned i, /*       */ typename...Args> std::function<void(Environment*, Args...)> is_void_return<i, void, Environment*, Args...>::lambda;
+    template<unsigned i, typename R, typename...Args>
+    void user_function(Environment*CLIPS, const char*name, std::function<R(Args...)>lambda, void*context=nullptr) {
+        using namespace __private;
+        std::string argumentsCode = "*";
+        build_arguments_code<R, Args...>::apply(argumentsCode, 1);
+        char returnCode[2] = {return_code<R>::value, '\0'};
+        using UDF = is_void_return<i,R,Args...>;
+        UDF::lambda = lambda;
+        AddUDFError ok = \
+        AddUDF(/* Environment*                   theEnv = */CLIPS,
+               /* const char *        clipsFunctionName = */name,
+               /* const char *              returnTypes = */returnCode,
+               /* unsigned short                minArgs = */sizeof...(Args),
+               /* unsigned short                maxArgs = */sizeof...(Args),
+               /* const char *            argumentTypes = */argumentsCode.c_str(),
+               /* UserDefinedFunction *cFunctionPointer = */UDF::f,
+               /* const char *            cFunctionName = */name,
+               /* void *                        context = */context);
+        assert(AUE_NO_ERROR == ok);
+    };
+    template<unsigned i, typename R, typename...Args>
+    void user_function(Environment*CLIPS, const char*name, std::function<R(Environment*, Args...)>lambda, void*context=nullptr) {
+        using namespace __private;
+        std::string argumentsCode = "*";
+        build_arguments_code<R, Args...>::apply(argumentsCode, 1);// 参数数量和上面的不一样
+        char returnCode[2] = {return_code<R>::value, '\0'};
+        using UDF = is_void_return<i, R, Environment*, Args...>; // 这里也和上面不一样
+        UDF::lambda = lambda;
+        AddUDFError ok = \
+        AddUDF(/* Environment*                   theEnv = */CLIPS,
+               /* const char *        clipsFunctionName = */name,
+               /* const char *              returnTypes = */returnCode,
+               /* unsigned short                minArgs = */sizeof...(Args),
+               /* unsigned short                maxArgs = */sizeof...(Args),
+               /* const char *            argumentTypes = */argumentsCode.c_str(),
+               /* UserDefinedFunction *cFunctionPointer = */UDF::f,
+               /* const char *            cFunctionName = */name,
+               /* void *                        context = */context);
+        assert(AUE_NO_ERROR == ok);
+    };
+    
+    template<unsigned i, typename R, typename...Args>
+    void user_function(Environment*CLIPS,const char*name, R(*f)(Args...), void*context=nullptr) {
+        user_function<i>(CLIPS, name, std::function<R(Args...)>(f), context);
+    };
+
+}//namespace clips
+
+namespace clips {
+
+    class CLIPS {
+        std::shared_ptr<Environment> env;
+    public:
+        CLIPS():CLIPS(nullptr) {}
+        explicit CLIPS(Environment*environment) {
+            if (nullptr == environment) {
+                this->env = std::shared_ptr<Environment>(CreateEnvironment(), [](Environment*x){
+                    DestroyEnvironment(x);
+                });
+            } else {
+                this->env = std::shared_ptr<Environment>(environment, [](Environment*x){
+                    
+                });
+            }
+        }
+        operator Environment*() { return this->env.get(); }
+        inline bool clear() { return Clear(env.get()); }
+        inline void reset() { Reset(env.get()); }
+        inline long long run(long long steps = -1) { return Run(env.get(), steps); }
+        inline bool load(const char*file) {
+            LoadError ok = Load(env.get(), file);
+            assert(LE_NO_ERROR == ok);
+            return LE_NO_ERROR == ok;
+        }
+        inline bool load_from_string(const char*script) {
+            return LoadFromString(env.get(), script, std::strlen(script));
+        }
+        inline bool batch(const char*file) {
+            return Batch(env.get(), file);
+        }
+        inline bool batch_star(const char*file) {
+            return BatchStar(env.get(), file);
+        }
+        inline void build(const char*script) {
+            BuildError ok = Build(env.get(), script);
+            assert(BE_NO_ERROR == ok);
+        }
+        inline std::any eval(const char*script) {
+            std::any ret;
+            CLIPSValue value;
+            if (EE_NO_ERROR != Eval(env.get(), script, &value)) {
+                WriteString(*this, STDERR, "[ERROR] eval script: \n");
+                WriteString(*this, STDERR, script);
+                WriteString(*this, STDERR, "\n");
+            } else {
+                ret = from_clips_value(value);
+            }
+            return ret;
+        }
+        std::any from_clips_value(CLIPSValue value)
+        {
+            if (INTEGER_TYPE == value.header->type) {
+                return value.integerValue->contents;
+            }
+            if (FLOAT_TYPE == value.header->type) {
+                return value.floatValue->contents;
+            }
+            if (SYMBOL_TYPE == value.header->type) {
+                /*  */ if (value.lexemeValue == TrueSymbol(this->env.get())) {
+                    return clips::boolean{true};
+                } else if (value.lexemeValue == FalseSymbol(this->env.get())) {
+                    return clips::boolean{false};
+                } else {
+                    return clips::symbol{value.lexemeValue->contents};
+                }
+            }
+            if (STRING_TYPE == value.header->type) {
+                return clips::string{value.lexemeValue->contents};
+            }
+            if (INSTANCE_NAME_TYPE == value.header->type) {
+                return clips::instance_name{value.lexemeValue->contents};
+            }
+            if (EXTERNAL_ADDRESS_TYPE == value.header->type) {
+                return value.externalAddressValue->contents;
+            }
+            if (MULTIFIELD_TYPE == value.header->type) {
+                clips::multifield ret;
+                for (int i=0; i<value.multifieldValue->length; i++) {
+                    ret.push_back(from_clips_value(value.multifieldValue->contents[i]));
+                }
+                return ret;
+            }
+            return clips::boolean{false};
+        }
+    };
+}//namespace clips
+
+#ifndef CLIPS_EXTENSION_TEST_BENCH_ENABLED
+#   define CLIPS_EXTENSION_TEST_BENCH_ENABLED 1
+#endif//CLIPS_EXTENSION_TEST_BENCH_ENABLED
+
+#ifndef CLIPS_EXTENSION_UTILITY_ENABLED
+#   define CLIPS_EXTENSION_UTILITY_ENABLED 1
+#endif//CLIPS_EXTENSION_UTILITY_ENABLED
+
+#ifndef CLIPS_EXTENSION_SOCKET_ENABLED
+#   define CLIPS_EXTENSION_SOCKET_ENABLED 1
+#endif//CLIPS_EXTENSION_SOCKET_ENABLED
+
+#ifndef CLIPS_EXTENSION_ZEROMQ_ENABLED
+#   define CLIPS_EXTENSION_ZEROMQ_ENABLED 1
+#endif//CLIPS_EXTENSION_ZEROMQ_ENABLED
+
+#ifndef CLIPS_EXTENSION_MUSTACHE_ENABLED
+#   define CLIPS_EXTENSION_MUSTACHE_ENABLED 1
+#endif//CLIPS_EXTENSION_MUSTACHE_ENABLED
+
+#ifndef CLIPS_EXTENSION_PROCESS_ENABLED
+#   define CLIPS_EXTENSION_PROCESS_ENABLED 1
+#endif//CLIPS_EXTENSION_PROCESS_ENABLED
+
+namespace clips::extension {
+
+#if CLIPS_EXTENSION_TEST_BENCH_ENABLED
+    void test_benchmark_initialize(Environment*environment);
+    void test_benchmark();
+#endif//CLIPS_EXTENSION_TEST_BENCH_ENABLED
+
+#if CLIPS_EXTENSION_UTILITY_ENABLED
+    void utility_initialize(Environment*environment);
+#endif//CLIPS_EXTENSION_UTILITY_ENABLED
+
+#if CLIPS_EXTENSION_SOCKET_ENABLED
+    void socket_initialize(Environment*environment);
+#endif// CLIPS_EXTENSION_SOCKET_ENABLED
+
+#if CLIPS_EXTENSION_ZEROMQ_ENABLED
+    void zeromq_initialize(Environment*environment);
+#endif// CLIPS_EXTENSION_ZEROMQ_ENABLED
+
+#if CLIPS_EXTENSION_MUSTACHE_ENABLED
+    void          mustache_initialize(Environment*environment);
+    clips::string mustache_trim(const char*input);
+    clips::string mustache_render(Environment*environment, const char*VIEW, const char*CONTEXT);
+    clips::string mustache_render_with_partials(Environment*environment, const char* VIEW, const char* CONTEXT, const char*PARTIALS);
+#endif// CLIPS_EXTENSION_MUSTACHE_ENABLED
+
+#if CLIPS_EXTENSION_PROCESS_ENABLED
+    void process_initialize(Environment*environment);
+#endif// CLIPS_EXTENSION_PROCESS_ENABLED
+
+}// namespace clips::extension {
+
+
diff --git a/clips/clsltpsr.c b/clips/clsltpsr.c
new file mode 100755
index 000000000..d09295660
--- /dev/null
+++ b/clips/clsltpsr.c
@@ -0,0 +1,914 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  05/16/18             */
+   /*                                                     */
+   /*                 CLASS PARSER MODULE                 */
+   /*******************************************************/
+
+/**************************************************************/
+/* Purpose: Parsing Routines for Defclass Construct           */
+/*                                                            */
+/* Principal Programmer(s):                                   */
+/*      Brian L. Dantes                                       */
+/*                                                            */
+/* Contributing Programmer(s):                                */
+/*                                                            */
+/* Revision History:                                          */
+/*                                                            */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to          */
+/*            DEFRULE_CONSTRUCT.                              */
+/*                                                            */
+/*            Renamed BOOLEAN macro type to intBool.          */
+/*                                                            */
+/*      6.30: Changed integer type/precision.                 */
+/*                                                            */
+/*            Support for long long integers.                 */
+/*                                                            */
+/*            Added const qualifiers to remove C++            */
+/*            deprecation warnings.                           */
+/*                                                            */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Static constraint checking is always enabled.   */
+/*                                                            */
+/*            UDF redesign.                                  */
+/*                                                           */
+/**************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#include <string.h>
+
+#include "classcom.h"
+#include "classfun.h"
+#include "cstrnchk.h"
+#include "cstrnpsr.h"
+#include "cstrnutl.h"
+#include "default.h"
+#include "envrnmnt.h"
+#include "insfun.h"
+#include "memalloc.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+
+#include "clsltpsr.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define DEFAULT_FACET         "default"
+#define DYNAMIC_FACET         "default-dynamic"
+#define VARIABLE_VAR          "VARIABLE"
+
+#define STORAGE_FACET         "storage"
+#define SLOT_SHARE_RLN        "shared"
+#define SLOT_LOCAL_RLN        "local"
+
+#define ACCESS_FACET          "access"
+#define SLOT_RDONLY_RLN       "read-only"
+#define SLOT_RDWRT_RLN        "read-write"
+#define SLOT_INIT_RLN         "initialize-only"
+
+#define PROPAGATION_FACET     "propagation"
+#define SLOT_NO_INH_RLN       "no-inherit"
+#define SLOT_INH_RLN          "inherit"
+
+#define SOURCE_FACET          "source"
+#define SLOT_COMPOSITE_RLN    "composite"
+#define SLOT_EXCLUSIVE_RLN    "exclusive"
+
+#define MATCH_FACET           MATCH_RLN
+#define SLOT_REACTIVE_RLN     REACTIVE_RLN
+#define SLOT_NONREACTIVE_RLN  NONREACTIVE_RLN
+
+#define VISIBILITY_FACET      "visibility"
+#define SLOT_PUBLIC_RLN       "public"
+#define SLOT_PRIVATE_RLN      "private"
+
+#define CREATE_ACCESSOR_FACET "create-accessor"
+#define SLOT_READ_RLN         "read"
+#define SLOT_WRITE_RLN        "write"
+#define SLOT_NONE_RLN         "NONE"
+
+#define OVERRIDE_MSG_FACET    "override-message"
+#define SLOT_DEFAULT_RLN      "DEFAULT"
+
+#define STORAGE_BIT           0
+#define FIELD_BIT             1
+#define ACCESS_BIT            2
+#define PROPAGATION_BIT       3
+#define SOURCE_BIT            4
+#define MATCH_BIT             5
+#define DEFAULT_BIT           6
+#define DEFAULT_DYNAMIC_BIT   7
+#define VISIBILITY_BIT        8
+#define CREATE_ACCESSOR_BIT   9
+#define OVERRIDE_MSG_BIT      10
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static SlotDescriptor          *NewSlot(Environment *,CLIPSLexeme *);
+   static TEMP_SLOT_LINK          *InsertSlot(Environment *,const char *,TEMP_SLOT_LINK *,SlotDescriptor *);
+   static int                      ParseSimpleFacet(Environment *,const char *,SlotDescriptor *,char*,const char *,int,const char *,
+                                                    const char *,const char *,const char *,CLIPSLexeme **);
+   static bool                    ParseDefaultFacet(Environment *,const char *,char *,SlotDescriptor *);
+   static void                    BuildCompositeFacets(Environment *,SlotDescriptor *,PACKED_CLASS_LINKS *,const char *,
+                                                       CONSTRAINT_PARSE_RECORD *);
+   static bool                    CheckForFacetConflicts(Environment *,SlotDescriptor *,CONSTRAINT_PARSE_RECORD *);
+   static bool                    EvaluateSlotDefaultValue(Environment *,SlotDescriptor *,const char *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/************************************************************
+  NAME         : ParseSlot
+  DESCRIPTION  : Parses slot definitions for a
+                   defclass statement
+  INPUTS       : 1) The logical name of the input source
+                 2) The current slot list
+                 3) The class precedence list for the class
+                    to which this slot is being attached
+                    (used to find facets for composite slots)
+                 4) A flag indicating if this is a multifield
+                    slot or not
+                 5) A flag indicating if the type of slot
+                    (single or multi) was explicitly
+                    specified or not
+  RETURNS      : The address of the list of slots,
+                   NULL if there was an error
+  SIDE EFFECTS : The slot list is allocated
+  NOTES        : Assumes "(slot" has already been parsed.
+ ************************************************************/
+TEMP_SLOT_LINK *ParseSlot(
+  Environment *theEnv,
+  const char *readSource,
+  const char *className,
+  TEMP_SLOT_LINK *slist,
+  PACKED_CLASS_LINKS *preclist,
+  bool multiSlot)
+  {
+   SlotDescriptor *slot;
+   CONSTRAINT_PARSE_RECORD parsedConstraint;
+   char specbits[2];
+   int rtnCode;
+   CLIPSLexeme *newOverrideMsg;
+
+   /* ===============================================================
+      Bits in specbits are when slot qualifiers are specified so that
+      duplicate or conflicting qualifiers can be detected.
+
+      Shared/local                          bit-0
+      Single/multiple                       bit-1
+      Read-only/Read-write/Initialize-Only  bit-2
+      Inherit/No-inherit                    bit-3
+      Composite/Exclusive                   bit-4
+      Reactive/Nonreactive                  bit-5
+      Default                               bit-6
+      Default-dynamic                       bit-7
+      Visibility                            bit-8
+      Override-message                      bit-9
+      =============================================================== */
+   SavePPBuffer(theEnv," ");
+   specbits[0] = specbits[1] = '\0';
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+     {
+      DeleteSlots(theEnv,slist);
+      SyntaxErrorMessage(theEnv,"defclass slot");
+      return NULL;
+     }
+   if ((DefclassData(theEnv)->ObjectParseToken.value == (void *) DefclassData(theEnv)->ISA_SYMBOL) ||
+       (DefclassData(theEnv)->ObjectParseToken.value == (void *) DefclassData(theEnv)->NAME_SYMBOL))
+     {
+      DeleteSlots(theEnv,slist);
+      SyntaxErrorMessage(theEnv,"defclass slot");
+      return NULL;
+     }
+   slot = NewSlot(theEnv,DefclassData(theEnv)->ObjectParseToken.lexemeValue);
+   slist = InsertSlot(theEnv,className,slist,slot);
+   if (slist == NULL)
+     return NULL;
+   if (multiSlot)
+     {
+      slot->multiple = true;
+      SetBitMap(specbits,FIELD_BIT);
+     }
+      
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   IncrementIndentDepth(theEnv,3);
+   InitializeConstraintParseRecord(&parsedConstraint);
+   while (DefclassData(theEnv)->ObjectParseToken.tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      PPCRAndIndent(theEnv);
+      SavePPBuffer(theEnv,"(");
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"defclass slot");
+         goto ParseSlotError;
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,DEFAULT_FACET) == 0)
+        {
+         if (ParseDefaultFacet(theEnv,readSource,specbits,slot) == false)
+           goto ParseSlotError;
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,DYNAMIC_FACET) == 0)
+        {
+         SetBitMap(specbits,DEFAULT_DYNAMIC_BIT);
+         if (ParseDefaultFacet(theEnv,readSource,specbits,slot) == false)
+           goto ParseSlotError;
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,ACCESS_FACET) == 0)
+        {
+         rtnCode = ParseSimpleFacet(theEnv,readSource,slot,specbits,ACCESS_FACET,ACCESS_BIT,
+                                    SLOT_RDWRT_RLN,SLOT_RDONLY_RLN,SLOT_INIT_RLN,
+                                    NULL,NULL);
+         if (rtnCode == -1)
+           goto ParseSlotError;
+         else if (rtnCode == 1)
+           slot->noWrite = 1;
+         else if (rtnCode == 2)
+           slot->initializeOnly = 1;
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,STORAGE_FACET) == 0)
+        {
+         rtnCode = ParseSimpleFacet(theEnv,readSource,slot,specbits,STORAGE_FACET,STORAGE_BIT,
+                                    SLOT_LOCAL_RLN,SLOT_SHARE_RLN,NULL,NULL,NULL);
+         if (rtnCode == -1)
+           goto ParseSlotError;
+         slot->shared = (rtnCode == 0) ? false : true;
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,PROPAGATION_FACET) == 0)
+        {
+         rtnCode = ParseSimpleFacet(theEnv,readSource,slot,specbits,PROPAGATION_FACET,PROPAGATION_BIT,
+                                    SLOT_INH_RLN,SLOT_NO_INH_RLN,NULL,NULL,NULL);
+         if (rtnCode == -1)
+           goto ParseSlotError;
+         slot->noInherit = (rtnCode == 0) ? false : true;
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,SOURCE_FACET) == 0)
+        {
+         rtnCode = ParseSimpleFacet(theEnv,readSource,slot,specbits,SOURCE_FACET,SOURCE_BIT,
+                                    SLOT_EXCLUSIVE_RLN,SLOT_COMPOSITE_RLN,NULL,NULL,NULL);
+         if (rtnCode == -1)
+           goto ParseSlotError;
+         slot->composite = (rtnCode == 0) ? false : true;
+        }
+#if DEFRULE_CONSTRUCT
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,MATCH_FACET) == 0)
+        {
+         rtnCode = ParseSimpleFacet(theEnv,readSource,slot,specbits,MATCH_FACET,MATCH_BIT,
+                                    SLOT_NONREACTIVE_RLN,SLOT_REACTIVE_RLN,NULL,NULL,NULL);
+         if (rtnCode == -1)
+           goto ParseSlotError;
+         slot->reactive = (rtnCode == 0) ? false : true;
+        }
+#endif
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,VISIBILITY_FACET) == 0)
+        {
+         rtnCode = ParseSimpleFacet(theEnv,readSource,slot,specbits,VISIBILITY_FACET,VISIBILITY_BIT,
+                                    SLOT_PRIVATE_RLN,SLOT_PUBLIC_RLN,NULL,NULL,NULL);
+         if (rtnCode == -1)
+           goto ParseSlotError;
+         slot->publicVisibility = (rtnCode == 0) ? false : true;
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,CREATE_ACCESSOR_FACET) == 0)
+        {
+         rtnCode = ParseSimpleFacet(theEnv,readSource,slot,specbits,CREATE_ACCESSOR_FACET,
+                                    CREATE_ACCESSOR_BIT,
+                                    SLOT_READ_RLN,SLOT_WRITE_RLN,SLOT_RDWRT_RLN,
+                                    SLOT_NONE_RLN,NULL);
+         if (rtnCode == -1)
+           goto ParseSlotError;
+         if ((rtnCode == 0) || (rtnCode == 2))
+           slot->createReadAccessor = true;
+         if ((rtnCode == 1) || (rtnCode == 2))
+           slot->createWriteAccessor = true;
+        }
+      else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,OVERRIDE_MSG_FACET) == 0)
+        {
+         rtnCode = ParseSimpleFacet(theEnv,readSource,slot,specbits,OVERRIDE_MSG_FACET,OVERRIDE_MSG_BIT,
+                                    NULL,NULL,NULL,SLOT_DEFAULT_RLN,&newOverrideMsg);
+         if (rtnCode == -1)
+           goto ParseSlotError;
+         if (rtnCode == 4)
+           {
+            ReleaseLexeme(theEnv,slot->overrideMessage);
+            slot->overrideMessage = newOverrideMsg;
+            IncrementLexemeCount(slot->overrideMessage);
+           }
+         slot->overrideMessageSpecified = true;
+        }
+      else if (StandardConstraint(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents))
+        {
+         if (ParseStandardConstraint(theEnv,readSource,DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,
+                slot->constraint,&parsedConstraint,true) == false)
+           goto ParseSlotError;
+        }
+      else
+        {
+         SyntaxErrorMessage(theEnv,"defclass slot");
+         goto ParseSlotError;
+        }
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+     }
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"defclass slot");
+      goto ParseSlotError;
+     }
+
+   if (DefclassData(theEnv)->ClassDefaultsModeValue == CONVENIENCE_MODE)
+     {
+      if (! TestBitMap(specbits,CREATE_ACCESSOR_BIT))
+        {
+         slot->createReadAccessor = true;
+
+         if (! slot->noWrite)
+           { slot->createWriteAccessor = true; }
+        }
+     }
+
+   if (slot->composite)
+     BuildCompositeFacets(theEnv,slot,preclist,specbits,&parsedConstraint);
+   if (CheckForFacetConflicts(theEnv,slot,&parsedConstraint) == false)
+     goto ParseSlotError;
+   if (CheckConstraintParseConflicts(theEnv,slot->constraint) == false)
+     goto ParseSlotError;
+   if (EvaluateSlotDefaultValue(theEnv,slot,specbits) == false)
+     goto ParseSlotError;
+   if ((slot->dynamicDefault == 0) && (slot->noWrite == 1) &&
+       (slot->initializeOnly == 0))
+     slot->shared = 1;
+   slot->constraint = AddConstraint(theEnv,slot->constraint);
+   DecrementIndentDepth(theEnv,3);
+   return(slist);
+
+ParseSlotError:
+   DecrementIndentDepth(theEnv,3);
+   DeleteSlots(theEnv,slist);
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : DeleteSlots
+  DESCRIPTION  : Deallocates a list of slots and
+                   their values
+  INPUTS       : The address of the slot list
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The slot list is destroyed
+  NOTES        : None
+ ***************************************************/
+void DeleteSlots(
+  Environment *theEnv,
+  TEMP_SLOT_LINK *slots)
+  {
+   TEMP_SLOT_LINK *stmp;
+
+   while (slots != NULL)
+     {
+      stmp = slots;
+      slots = slots->nxt;
+      DeleteSlotName(theEnv,stmp->desc->slotName);
+      ReleaseLexeme(theEnv,stmp->desc->overrideMessage);
+      RemoveConstraint(theEnv,stmp->desc->constraint);
+      if (stmp->desc->dynamicDefault == 1)
+        {
+         ExpressionDeinstall(theEnv,(Expression *) stmp->desc->defaultValue);
+         ReturnPackedExpression(theEnv,(Expression *) stmp->desc->defaultValue);
+        }
+      else if (stmp->desc->defaultValue != NULL)
+        {
+         ReleaseUDFV(theEnv,(UDFValue *) stmp->desc->defaultValue);
+         rtn_struct(theEnv,udfValue,stmp->desc->defaultValue);
+        }
+      rtn_struct(theEnv,slotDescriptor,stmp->desc);
+      rtn_struct(theEnv,tempSlotLink,stmp);
+     }
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/**************************************************************
+  NAME         : NewSlot
+  DESCRIPTION  : Allocates and initalizes a new slot structure
+  INPUTS       : The symbolic name of the new slot
+  RETURNS      : The address of the new slot
+  SIDE EFFECTS : None
+  NOTES        : Also adds symbols of the form get-<name> and
+                   put-<name> for slot accessors
+ **************************************************************/
+static SlotDescriptor *NewSlot(
+  Environment *theEnv,
+  CLIPSLexeme *name)
+  {
+   SlotDescriptor *slot;
+
+   slot = get_struct(theEnv,slotDescriptor);
+   slot->dynamicDefault = 1;
+   slot->defaultSpecified = 0;
+   slot->noDefault = 0;
+#if DEFRULE_CONSTRUCT
+   slot->reactive = 1;
+#endif
+   slot->noInherit = 0;
+   slot->noWrite = 0;
+   slot->initializeOnly = 0;
+   slot->shared = 0;
+   slot->multiple = 0;
+   slot->composite = 0;
+   slot->sharedCount = 0;
+   slot->publicVisibility = 0;
+   slot->createReadAccessor = false;
+   slot->createWriteAccessor = false;
+   slot->overrideMessageSpecified = 0;
+   slot->cls = NULL;
+   slot->defaultValue = NULL;
+   slot->constraint = GetConstraintRecord(theEnv);
+   slot->slotName = AddSlotName(theEnv,name,0,false);
+   slot->overrideMessage = slot->slotName->putHandlerName;
+   IncrementLexemeCount(slot->overrideMessage);
+   return(slot);
+  }
+
+/**********************************************************
+  NAME         : InsertSlot
+  DESCRIPTION  : Inserts a slot into the list of slots
+  INPUTS       : 1) The current head of the slot list
+                 2) The slot to be inserted
+  RETURNS      : The head of the slot list
+  SIDE EFFECTS : The slot is inserted if no errors,
+                   otherwise the original list and the
+                   new slot are destroyed
+  NOTES        : None
+ **********************************************************/
+static TEMP_SLOT_LINK *InsertSlot(
+  Environment *theEnv,
+  const char *className,
+  TEMP_SLOT_LINK *slist,
+  SlotDescriptor *slot)
+  {
+   TEMP_SLOT_LINK *stmp,*sprv,*tmp;
+
+   tmp = get_struct(theEnv,tempSlotLink);
+   tmp->desc = slot;
+   tmp->nxt = NULL;
+   if (slist == NULL)
+     slist = tmp;
+   else
+     {
+      stmp = slist;
+      sprv = NULL;
+      while (stmp != NULL)
+        {
+         if (stmp->desc->slotName == slot->slotName)
+           {
+            tmp->nxt = slist;
+            DeleteSlots(theEnv,tmp);
+            PrintErrorID(theEnv,"CLSLTPSR",1,false);
+            WriteString(theEnv,STDERR,"The '");
+            WriteString(theEnv,STDERR,slot->slotName->name->contents);
+            WriteString(theEnv,STDERR,"' slot for class '");
+            WriteString(theEnv,STDERR,className);
+            WriteString(theEnv,STDERR,"' is already specified.\n");
+            return NULL;
+           }
+         sprv = stmp;
+         stmp = stmp->nxt;
+        }
+      sprv->nxt = tmp;
+     }
+   return(slist);
+  }
+
+/****************************************************************
+  NAME         : ParseSimpleFacet
+  DESCRIPTION  : Parses the following facets for a slot:
+                   access, source, propagation, storage,
+                   pattern-match, visibility and override-message
+  INPUTS       : 1) The input logical name
+                 2) The bitmap indicating which facets have
+                    already been parsed
+                 3) The name of the facet
+                 4) The bit to test/set in arg #2 for this facet
+                 5) The facet value string which indicates the
+                    facet should be false
+                 6) The facet value string which indicates the
+                    facet should be true
+                 7) An alternate value string for use when the
+                    first two don't match (can be NULL)
+                 7) An alternate value string for use when the
+                    first three don't match (can be NULL)
+                    (will be an SF_VARIABLE type)
+                 9) A buffer to hold the facet value symbol
+                    (can be NULL - only set if args #5 and #6
+                     are both NULL)
+  RETURNS      : -1 on errors
+                  0 if first value string matched
+                  1 if second value string matched
+                  2 if alternate value string matched
+                  3 if variable value string matched
+                  4 if facet value buffer was set
+  SIDE EFFECTS : Messages printed on errors
+                 Bitmap marked indicating facet was parsed
+                 Facet value symbol buffer set, if appropriate
+  NOTES        : None
+ *****************************************************************/
+static int ParseSimpleFacet(
+  Environment *theEnv,
+  const char *readSource,
+  SlotDescriptor *slot,
+  char *specbits,
+  const char *facetName,
+  int testBit,
+  const char *clearRelation,
+  const char *setRelation,
+  const char *alternateRelation,
+  const char *varRelation,
+  CLIPSLexeme **facetSymbolicValue)
+  {
+   int rtnCode;
+
+   if (TestBitMap(specbits,testBit))
+     {
+      PrintErrorID(theEnv,"CLSLTPSR",2,false);
+      WriteString(theEnv,STDERR,"The '");
+      WriteString(theEnv,STDERR,facetName);
+      WriteString(theEnv,STDERR,"' facet for slot '");
+      WriteString(theEnv,STDERR,slot->slotName->name->contents);
+      WriteString(theEnv,STDERR,"' is already specified.\n");
+      return -1;
+     }
+   SetBitMap(specbits,testBit);
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+
+   /* ===============================
+      Check for the variable relation
+      =============================== */
+   if (DefclassData(theEnv)->ObjectParseToken.tknType == SF_VARIABLE_TOKEN)
+     {
+      if ((varRelation == NULL) ? false :
+          (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,varRelation) == 0))
+        rtnCode = 3;
+      else
+        goto ParseSimpleFacetError;
+     }
+   else
+     {
+      if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+        goto ParseSimpleFacetError;
+
+      /* ===================================================
+         If the facet value buffer is non-NULL
+         simply get the value and do not check any relations
+         =================================================== */
+      if (facetSymbolicValue == NULL)
+        {
+         if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,clearRelation) == 0)
+           rtnCode = 0;
+         else if (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,setRelation) == 0)
+           rtnCode = 1;
+         else if ((alternateRelation == NULL) ? false :
+                  (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,alternateRelation) == 0))
+           rtnCode = 2;
+         else
+           goto ParseSimpleFacetError;
+        }
+      else
+        {
+         rtnCode = 4;
+         *facetSymbolicValue = DefclassData(theEnv)->ObjectParseToken.lexemeValue;
+        }
+     }
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     goto ParseSimpleFacetError;
+   return(rtnCode);
+
+ParseSimpleFacetError:
+   SyntaxErrorMessage(theEnv,"slot facet");
+   return(-1);
+  }
+
+/*************************************************************
+  NAME         : ParseDefaultFacet
+  DESCRIPTION  : Parses the facet for a slot
+  INPUTS       : 1) The input logical name
+                 2) The bitmap indicating which facets have
+                    already been parsed
+                 3) The slot descriptor to set
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Slot  set and parsed facet bitmap set
+  NOTES        : Syntax: (default ?NONE|<expression>*)
+                         (default-dynamic <expression>*)
+ *************************************************************/
+static bool ParseDefaultFacet(
+  Environment *theEnv,
+  const char *readSource,
+  char *specbits,
+  SlotDescriptor *slot)
+  {
+   Expression *tmp;
+   bool error, noneSpecified, deriveSpecified;
+
+   if (TestBitMap(specbits,DEFAULT_BIT))
+     {
+      PrintErrorID(theEnv,"CLSLTPSR",2,false);
+      WriteString(theEnv,STDERR,"The 'default' facet for slot '");
+      WriteString(theEnv,STDERR,slot->slotName->name->contents);
+      WriteString(theEnv,STDERR,"' is already specified.\n");
+      return false;
+     }
+   SetBitMap(specbits,DEFAULT_BIT);
+   error = false;
+   tmp = ParseDefault(theEnv,readSource,true,TestBitMap(specbits,DEFAULT_DYNAMIC_BIT),
+                      false,&noneSpecified,&deriveSpecified,&error);
+   if (error == true)
+     return false;
+   if (noneSpecified || deriveSpecified)
+     {
+     if (noneSpecified)
+       {
+        slot->noDefault = 1;
+        slot->defaultSpecified = 1;
+       }
+      else
+        ClearBitMap(specbits,DEFAULT_BIT);
+     }
+   else
+     {
+      slot->defaultValue = PackExpression(theEnv,tmp);
+      ReturnExpression(theEnv,tmp);
+      ExpressionInstall(theEnv,(Expression *) slot->defaultValue);
+      slot->defaultSpecified = 1;
+     }
+   return true;
+  }
+
+/**************************************************************************
+  NAME         : BuildCompositeFacets
+  DESCRIPTION  : Composite slots are ones that get their facets
+                   from more than one class.  By default, the most
+                   specific class in object's precedence list specifies
+                   the complete set of facets for a slot.  The composite
+                   facet in a slot allows facets that are not overridden
+                   by the most specific class to be obtained from other
+                   classes.
+
+                 Since all superclasses are predetermined before creating
+                   a new class based on them, this routine need only
+                   examine the immediately next most specific class for
+                   extra facets.  Even if that slot is also composite, the
+                   other facets have already been filtered down.  If the
+                   slot is no-inherit, the next most specific class must
+                   be examined.
+  INPUTS       : 1) The slot descriptor
+                 2) The class precedence list
+                 3) The bitmap marking which facets were specified in
+                    the original slot definition
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Composite slot is updated to reflect facets from
+                   a less specific class
+  NOTES        : Assumes slot is composite
+ *************************************************************************/
+static void BuildCompositeFacets(
+  Environment *theEnv,
+  SlotDescriptor *sd,
+  PACKED_CLASS_LINKS *preclist,
+  const char *specbits,
+  CONSTRAINT_PARSE_RECORD *parsedConstraint)
+  {
+   SlotDescriptor *compslot = NULL;
+   unsigned long i;
+
+   for (i = 1 ; i < preclist->classCount ; i++)
+     {
+      compslot = FindClassSlot(preclist->classArray[i],sd->slotName->name);
+      if ((compslot != NULL) ? (compslot->noInherit == 0) : false)
+        break;
+     }
+   if (compslot != NULL)
+     {
+      if ((sd->defaultSpecified == 0) && (compslot->defaultSpecified == 1))
+        {
+         sd->dynamicDefault = compslot->dynamicDefault;
+         sd->noDefault = compslot->noDefault;
+         sd->defaultSpecified = 1;
+         if (compslot->defaultValue != NULL)
+           {
+            if (sd->dynamicDefault)
+              {
+               sd->defaultValue = PackExpression(theEnv,(Expression *) compslot->defaultValue);
+               ExpressionInstall(theEnv,(Expression *) sd->defaultValue);
+              }
+            else
+              {
+               sd->defaultValue = get_struct(theEnv,udfValue);
+               GenCopyMemory(UDFValue,1,sd->defaultValue,compslot->defaultValue);
+               RetainUDFV(theEnv,(UDFValue *) sd->defaultValue);
+              }
+           }
+        }
+      if (! TestBitMap(specbits,FIELD_BIT))
+        sd->multiple = compslot->multiple;
+      if (! TestBitMap(specbits,STORAGE_BIT))
+        sd->shared = compslot->shared;
+      if (! TestBitMap(specbits,ACCESS_BIT))
+        {
+         sd->noWrite = compslot->noWrite;
+         sd->initializeOnly = compslot->initializeOnly;
+        }
+#if DEFRULE_CONSTRUCT
+      if (! TestBitMap(specbits,MATCH_BIT))
+        sd->reactive = compslot->reactive;
+#endif
+      if (! TestBitMap(specbits,VISIBILITY_BIT))
+        sd->publicVisibility = compslot->publicVisibility;
+      if (! TestBitMap(specbits,CREATE_ACCESSOR_BIT))
+        {
+         sd->createReadAccessor = compslot->createReadAccessor;
+         sd->createWriteAccessor = compslot->createWriteAccessor;
+        }
+      if ((! TestBitMap(specbits,OVERRIDE_MSG_BIT)) &&
+          compslot->overrideMessageSpecified)
+        {
+         ReleaseLexeme(theEnv,sd->overrideMessage);
+         sd->overrideMessage = compslot->overrideMessage;
+         IncrementLexemeCount(sd->overrideMessage);
+         sd->overrideMessageSpecified = true;
+        }
+      OverlayConstraint(theEnv,parsedConstraint,sd->constraint,compslot->constraint);
+     }
+  }
+
+/***************************************************
+  NAME         : CheckForFacetConflicts
+  DESCRIPTION  : Determines if all facets specified
+                 (and inherited) for a slot are
+                 consistent
+  INPUTS       : 1) The slot descriptor
+                 2) The parse record for the
+                    type constraints on the slot
+  RETURNS      : True if all OK,
+                 false otherwise
+  SIDE EFFECTS : Min and Max fields replaced in
+                 constraint for single-field slot
+  NOTES        : None
+ ***************************************************/
+static bool CheckForFacetConflicts(
+  Environment *theEnv,
+  SlotDescriptor *sd,
+  CONSTRAINT_PARSE_RECORD *parsedConstraint)
+  {
+   if (sd->multiple == 0)
+     {
+      if (parsedConstraint->cardinality)
+        {
+         PrintErrorID(theEnv,"CLSLTPSR",3,true);
+         WriteString(theEnv,STDERR,"The 'cardinality' facet can only be used with multifield slots.\n");
+         return false;
+        }
+      else
+        {
+         ReturnExpression(theEnv,sd->constraint->minFields);
+         ReturnExpression(theEnv,sd->constraint->maxFields);
+         sd->constraint->minFields = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,1LL));
+         sd->constraint->maxFields = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,1LL));
+        }
+     }
+   if (sd->noDefault && sd->noWrite)
+     {
+      PrintErrorID(theEnv,"CLSLTPSR",4,true);
+      WriteString(theEnv,STDERR,"Slots with an 'access' facet value of 'read-only' must have a default value.\n");
+      return false;
+     }
+   if (sd->noWrite && (sd->createWriteAccessor || sd->overrideMessageSpecified))
+     {
+      PrintErrorID(theEnv,"CLSLTPSR",5,true);
+      WriteString(theEnv,STDERR,"Slots with an 'access' facet value of 'read-only' cannot have a write accessor.\n");
+      return false;
+     }
+   if (sd->noInherit && sd->publicVisibility)
+     {
+      PrintErrorID(theEnv,"CLSLTPSR",6,true);
+      WriteString(theEnv,STDERR,"Slots with a 'propagation' facet value of 'no-inherit' cannot have a 'visibility' facet value of 'public'.\n");
+      return false;
+     }
+   return true;
+  }
+
+/********************************************************************
+  NAME         : EvaluateSlotDefaultValue
+  DESCRIPTION  : Checks the default value against the slot
+                 constraints and evaluates static default values
+  INPUTS       : 1) The slot descriptor
+                 2) The bitmap marking which facets were specified in
+                    the original slot definition
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Static default value expressions deleted and
+                 replaced with data object evaluation
+  NOTES        : On errors, slot is marked as dynamix so that
+                 DeleteSlots() will erase the slot expression
+ ********************************************************************/
+static bool EvaluateSlotDefaultValue(
+  Environment *theEnv,
+  SlotDescriptor *sd,
+  const char *specbits)
+  {
+   UDFValue temp;
+   bool oldce,olddcc, vPass;
+   ConstraintViolationType vCode;
+
+   /* ===================================================================
+      Slot default value expression is marked as dynamic until now so
+      that DeleteSlots() would erase in the event of an error.  The delay
+      was so that the evaluation of a static default value could be
+      delayed until all the constraints were parsed.
+      =================================================================== */
+   if (! TestBitMap(specbits,DEFAULT_DYNAMIC_BIT))
+     sd->dynamicDefault = 0;
+
+   if (sd->noDefault)
+     return true;
+
+   if (sd->dynamicDefault == 0)
+     {
+      if (TestBitMap(specbits,DEFAULT_BIT))
+        {
+         oldce = ExecutingConstruct(theEnv);
+         SetExecutingConstruct(theEnv,true);
+         olddcc = SetDynamicConstraintChecking(theEnv,true);
+         vPass = EvaluateAndStoreInDataObject(theEnv,sd->multiple,
+                  (Expression *) sd->defaultValue,&temp,true);
+         if (vPass != false)
+           vPass = (ValidSlotValue(theEnv,&temp,sd,NULL,"the 'default' facet") == PSE_NO_ERROR);
+         SetDynamicConstraintChecking(theEnv,olddcc);
+         SetExecutingConstruct(theEnv,oldce);
+         if (vPass)
+           {
+            ExpressionDeinstall(theEnv,(Expression *) sd->defaultValue);
+            ReturnPackedExpression(theEnv,(Expression *) sd->defaultValue);
+            sd->defaultValue = get_struct(theEnv,udfValue);
+            GenCopyMemory(UDFValue,1,sd->defaultValue,&temp);
+            RetainUDFV(theEnv,(UDFValue *) sd->defaultValue);
+           }
+         else
+           {
+            sd->dynamicDefault = 1;
+            return false;
+           }
+        }
+      else if (sd->defaultSpecified == 0)
+        {
+         sd->defaultValue = get_struct(theEnv,udfValue);
+         DeriveDefaultFromConstraints(theEnv,sd->constraint,
+                                      (UDFValue *) sd->defaultValue,sd->multiple,true);
+         RetainUDFV(theEnv,(UDFValue *) sd->defaultValue);
+        }
+     }
+   else
+     {
+      vCode = ConstraintCheckExpressionChain(theEnv,(Expression *) sd->defaultValue,sd->constraint);
+      if (vCode != NO_VIOLATION)
+        {
+         PrintErrorID(theEnv,"CSTRNCHK",1,false);
+         WriteString(theEnv,STDERR,"Expression for ");
+         PrintSlot(theEnv,STDERR,sd,NULL,"dynamic default value");
+         ConstraintViolationErrorMessage(theEnv,NULL,NULL,0,0,NULL,0,
+                                         vCode,sd->constraint,false);
+         return false;
+        }
+     }
+   return true;
+  }
+
+#endif
+
diff --git a/clips/clsltpsr.h b/clips/clsltpsr.h
new file mode 100755
index 000000000..26fc8c1ec
--- /dev/null
+++ b/clips/clsltpsr.h
@@ -0,0 +1,72 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  05/16/18             */
+   /*                                                     */
+   /*              CLASS PARSER HEADER FILE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_clsltpsr
+
+#pragma once
+
+#define _H_clsltpsr
+
+#if OBJECT_SYSTEM && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#define MATCH_RLN            "pattern-match"
+#define REACTIVE_RLN         "reactive"
+#define NONREACTIVE_RLN      "non-reactive"
+
+#include "object.h"
+
+typedef struct tempSlotLink
+  {
+   SlotDescriptor *desc;
+   struct tempSlotLink *nxt;
+  } TEMP_SLOT_LINK;
+
+   TEMP_SLOT_LINK                *ParseSlot(Environment *,const char *,const char *,TEMP_SLOT_LINK *,PACKED_CLASS_LINKS *,bool);
+   void                           DeleteSlots(Environment *,TEMP_SLOT_LINK *);
+
+#endif
+
+#endif
+
+
+
+
+
diff --git a/clips/commline.c b/clips/commline.c
new file mode 100755
index 000000000..68d08ab40
--- /dev/null
+++ b/clips/commline.c
@@ -0,0 +1,1216 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/13/17             */
+   /*                                                     */
+   /*                COMMAND LINE MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides a set of routines for processing        */
+/*   commands entered at the top level prompt.               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Refactored several functions and added         */
+/*            additional functions for use by an interface   */
+/*            layered on top of CLIPS.                       */
+/*                                                           */
+/*      6.30: Local variables set with the bind function     */
+/*            persist until a reset/clear command is issued. */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Metrowerks CodeWarrior (MAC_MCW, IBM_MCW) is   */
+/*            no longer supported.                           */
+/*                                                           */
+/*            UTF-8 support.                                 */
+/*                                                           */
+/*            Command history and editing support            */
+/*                                                           */
+/*            Used genstrcpy instead of strcpy.              */
+/*                                                           */
+/*            Added before command execution callback        */
+/*            function.                                      */
+/*                                                           */
+/*            Fixed RouteCommand return value.               */
+/*                                                           */
+/*            Added AwaitingInput flag.                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*            Added STDOUT and STDIN logical name            */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.40: Added call to FlushParsingMessages to clear    */
+/*            message buffer after each command.             */
+/*                                                           */
+/*            Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*            Removed fflush of stdin.                       */
+/*                                                           */
+/*            Use of ?<var>, $?<var>, ?*<var>, and  $?*var*  */
+/*            by itself at the command prompt and within     */
+/*            the eval function now consistently returns the */
+/*            value of  the variable.                        */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "setup.h"
+#include "constant.h"
+
+#include "argacces.h"
+#include "constrct.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "fileutil.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "pprint.h"
+#include "prcdrfun.h"
+#include "prcdrpsr.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "strngrtr.h"
+#include "symbol.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "commline.h"
+
+/***************/
+/* DEFINITIONS */
+/***************/
+
+#define NO_SWITCH         0
+#define BATCH_SWITCH      1
+#define BATCH_STAR_SWITCH 2
+#define LOAD_SWITCH       3
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if ! RUN_TIME
+   static int                     DoString(const char *,int,bool *,int delimiterChar);
+   static int                     DoComment(const char *,int);
+   static int                     DoWhiteSpace(const char *,int);
+   static void                    DefaultGetNextEvent(Environment *);
+#endif
+   static void                    DeallocateCommandLineData(Environment *);
+
+/****************************************************/
+/* InitializeCommandLineData: Allocates environment */
+/*    data for command line functionality.          */
+/****************************************************/
+void InitializeCommandLineData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,COMMANDLINE_DATA,sizeof(struct commandLineData),DeallocateCommandLineData);
+
+#if ! RUN_TIME
+   CommandLineData(theEnv)->BannerString = BANNER_STRING;
+   CommandLineData(theEnv)->EventCallback = DefaultGetNextEvent;
+#endif
+  }
+
+/*******************************************************/
+/* DeallocateCommandLineData: Deallocates environment */
+/*    data for the command line functionality.        */
+/******************************************************/
+static void DeallocateCommandLineData(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   if (CommandLineData(theEnv)->CommandString != NULL)
+     { rm(theEnv,CommandLineData(theEnv)->CommandString,CommandLineData(theEnv)->MaximumCharacters); }
+
+   if (CommandLineData(theEnv)->CurrentCommand != NULL)
+     { ReturnExpression(theEnv,CommandLineData(theEnv)->CurrentCommand); }
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+/*************************************************/
+/* RerouteStdin: Processes the -f, -f2, and -l   */
+/*   options available on machines which support */
+/*   argc and arv command line options.          */
+/*************************************************/
+void RerouteStdin(
+  Environment *theEnv,
+  int argc,
+  char *argv[])
+  {
+   int i;
+   int theSwitch = NO_SWITCH;
+
+   /*======================================*/
+   /* If there aren't enough arguments for */
+   /* the -f argument, then return.        */
+   /*======================================*/
+
+   if (argc < 3)
+     { return; }
+
+   /*=====================================*/
+   /* If argv was not passed then return. */
+   /*=====================================*/
+
+   if (argv == NULL) return;
+
+   /*=============================================*/
+   /* Process each of the command line arguments. */
+   /*=============================================*/
+
+   for (i = 1 ; i < argc ; i++)
+     {
+      if (strcmp(argv[i],"-f") == 0) theSwitch = BATCH_SWITCH;
+#if ! RUN_TIME
+      else if (strcmp(argv[i],"-f2") == 0) theSwitch = BATCH_STAR_SWITCH;
+      else if (strcmp(argv[i],"-l") == 0) theSwitch = LOAD_SWITCH;
+#endif
+      else if (theSwitch == NO_SWITCH)
+        {
+         PrintErrorID(theEnv,"SYSDEP",2,false);
+         WriteString(theEnv,STDERR,"Invalid option '");
+         WriteString(theEnv,STDERR,argv[i]);
+         WriteString(theEnv,STDERR,"'.\n");
+        }
+
+      if (i > (argc-1))
+        {
+         PrintErrorID(theEnv,"SYSDEP",1,false);
+         WriteString(theEnv,STDERR,"No file found for '");
+
+         switch(theSwitch)
+           {
+            case BATCH_SWITCH:
+               WriteString(theEnv,STDERR,"-f");
+               break;
+
+            case BATCH_STAR_SWITCH:
+               WriteString(theEnv,STDERR,"-f2");
+               break;
+
+            case LOAD_SWITCH:
+               WriteString(theEnv,STDERR,"-l");
+           }
+
+         WriteString(theEnv,STDERR,"' option.\n");
+         return;
+        }
+
+      switch(theSwitch)
+        {
+         case BATCH_SWITCH:
+            OpenBatch(theEnv,argv[++i],true);
+            break;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+         case BATCH_STAR_SWITCH:
+            BatchStar(theEnv,argv[++i]);
+            break;
+
+         case LOAD_SWITCH:
+            Load(theEnv,argv[++i]);
+            break;
+#endif
+        }
+     }
+  }
+
+#if ! RUN_TIME
+
+/***************************************************/
+/* ExpandCommandString: Appends a character to the */
+/*   command string. Returns true if the command   */
+/*   string was successfully expanded, otherwise   */
+/*   false. Expanding the string also includes     */
+/*   adding a backspace character which reduces    */
+/*   string's length.                              */
+/***************************************************/
+bool ExpandCommandString(
+  Environment *theEnv,
+  int inchar)
+  {
+   size_t k;
+
+   k = RouterData(theEnv)->CommandBufferInputCount;
+   CommandLineData(theEnv)->CommandString = ExpandStringWithChar(theEnv,inchar,CommandLineData(theEnv)->CommandString,&RouterData(theEnv)->CommandBufferInputCount,
+                                        &CommandLineData(theEnv)->MaximumCharacters,CommandLineData(theEnv)->MaximumCharacters+80);
+   return((RouterData(theEnv)->CommandBufferInputCount != k) ? true : false);
+  }
+
+/******************************************************************/
+/* FlushCommandString: Empties the contents of the CommandString. */
+/******************************************************************/
+void FlushCommandString(
+  Environment *theEnv)
+  {
+   if (CommandLineData(theEnv)->CommandString != NULL) rm(theEnv,CommandLineData(theEnv)->CommandString,CommandLineData(theEnv)->MaximumCharacters);
+   CommandLineData(theEnv)->CommandString = NULL;
+   CommandLineData(theEnv)->MaximumCharacters = 0;
+   RouterData(theEnv)->CommandBufferInputCount = 0;
+   RouterData(theEnv)->InputUngets = 0;
+   RouterData(theEnv)->AwaitingInput = true;
+  }
+
+/*********************************************************************************/
+/* SetCommandString: Sets the contents of the CommandString to a specific value. */
+/*********************************************************************************/
+void SetCommandString(
+  Environment *theEnv,
+  const char *str)
+  {
+   size_t length;
+
+   FlushCommandString(theEnv);
+   length = strlen(str);
+   CommandLineData(theEnv)->CommandString = (char *)
+                   genrealloc(theEnv,CommandLineData(theEnv)->CommandString,
+                              CommandLineData(theEnv)->MaximumCharacters,
+                              CommandLineData(theEnv)->MaximumCharacters + length + 1);
+
+   genstrcpy(CommandLineData(theEnv)->CommandString,str);
+   CommandLineData(theEnv)->MaximumCharacters += (length + 1);
+   RouterData(theEnv)->CommandBufferInputCount += length;
+  }
+
+/*************************************************************/
+/* SetNCommandString: Sets the contents of the CommandString */
+/*   to a specific value up to N characters.                 */
+/*************************************************************/
+void SetNCommandString(
+  Environment *theEnv,
+  const char *str,
+  unsigned length)
+  {
+   FlushCommandString(theEnv);
+   CommandLineData(theEnv)->CommandString = (char *)
+                   genrealloc(theEnv,CommandLineData(theEnv)->CommandString,
+                              CommandLineData(theEnv)->MaximumCharacters,
+                              CommandLineData(theEnv)->MaximumCharacters + length + 1);
+
+   genstrncpy(CommandLineData(theEnv)->CommandString,str,length);
+   CommandLineData(theEnv)->CommandString[CommandLineData(theEnv)->MaximumCharacters + length] = 0;
+   CommandLineData(theEnv)->MaximumCharacters += (length + 1);
+   RouterData(theEnv)->CommandBufferInputCount += length;
+  }
+
+/******************************************************************************/
+/* AppendCommandString: Appends a value to the contents of the CommandString. */
+/******************************************************************************/
+void AppendCommandString(
+  Environment *theEnv,
+  const char *str)
+  {
+   CommandLineData(theEnv)->CommandString = AppendToString(theEnv,str,CommandLineData(theEnv)->CommandString,&RouterData(theEnv)->CommandBufferInputCount,&CommandLineData(theEnv)->MaximumCharacters);
+  }
+
+/******************************************************************************/
+/* InsertCommandString: Inserts a value in the contents of the CommandString. */
+/******************************************************************************/
+void InsertCommandString(
+  Environment *theEnv,
+  const char *str,
+  unsigned int position)
+  {
+   CommandLineData(theEnv)->CommandString =
+      InsertInString(theEnv,str,position,CommandLineData(theEnv)->CommandString,
+                     &RouterData(theEnv)->CommandBufferInputCount,&CommandLineData(theEnv)->MaximumCharacters);
+  }
+
+/************************************************************/
+/* AppendNCommandString: Appends a value up to N characters */
+/*   to the contents of the CommandString.                  */
+/************************************************************/
+void AppendNCommandString(
+  Environment *theEnv,
+  const char *str,
+  unsigned length)
+  {
+   CommandLineData(theEnv)->CommandString = AppendNToString(theEnv,str,CommandLineData(theEnv)->CommandString,length,&RouterData(theEnv)->CommandBufferInputCount,&CommandLineData(theEnv)->MaximumCharacters);
+  }
+
+/*****************************************************************************/
+/* GetCommandString: Returns a pointer to the contents of the CommandString. */
+/*****************************************************************************/
+char *GetCommandString(
+  Environment *theEnv)
+  {
+   return(CommandLineData(theEnv)->CommandString);
+  }
+
+/**************************************************************************/
+/* CompleteCommand: Determines whether a string forms a complete command. */
+/*   A complete command is either a constant, a variable, or a function   */
+/*   call which is followed (at some point) by a carriage return. Once a  */
+/*   complete command is found (not including the parenthesis),           */
+/*   extraneous parenthesis and other tokens are ignored. If a complete   */
+/*   command exists, then 1 is returned. 0 is returned if the command was */
+/*   not complete and without errors. -1 is returned if the command       */
+/*   contains an error.                                                   */
+/**************************************************************************/
+int CompleteCommand(
+  const char *mstring)
+  {
+   int i;
+   char inchar;
+   int depth = 0;
+   bool moreThanZero = false;
+   bool complete;
+   bool error = false;
+
+   if (mstring == NULL) return 0;
+
+   /*===================================================*/
+   /* Loop through each character of the command string */
+   /* to determine if there is a complete command.      */
+   /*===================================================*/
+
+   i = 0;
+   while ((inchar = mstring[i++]) != EOS)
+     {
+      switch(inchar)
+        {
+         /*======================================================*/
+         /* If a carriage return or line feed is found, there is */
+         /* at least one completed token in the command buffer,  */
+         /* and parentheses are balanced, then a complete        */
+         /* command has been found. Otherwise, remove all white  */
+         /* space beginning with the current character.          */
+         /*======================================================*/
+
+         case '\n' :
+         case '\r' :
+           if (error) return(-1);
+           if (moreThanZero && (depth == 0)) return 1;
+           i = DoWhiteSpace(mstring,i);
+           break;
+
+         /*=====================*/
+         /* Remove white space. */
+         /*=====================*/
+
+         case ' ' :
+         case '\f' :
+         case '\t' :
+           i = DoWhiteSpace(mstring,i);
+           break;
+
+         /*======================================================*/
+         /* If the opening quotation of a string is encountered, */
+         /* determine if the closing quotation of the string is  */
+         /* in the command buffer. Until the closing quotation   */
+         /* is found, a complete command can not be made.        */
+         /*======================================================*/
+
+         case '`' :
+         case '\'' :
+         case '"' :
+           i = DoString(mstring,i,&complete, inchar);
+           if ((depth == 0) && complete) moreThanZero = true;
+           break;
+
+         /*====================*/
+         /* Process a comment. */
+         /*====================*/
+
+         case ';' :
+           i = DoComment(mstring,i);
+           if (moreThanZero && (depth == 0) && (mstring[i] != EOS))
+             {
+              if (error) return -1;
+              else return 1;
+             }
+           else if (mstring[i] != EOS) i++;
+           break;
+
+         /*====================================================*/
+         /* A left parenthesis increases the nesting depth of  */
+         /* the current command by 1. Don't bother to increase */
+         /* the depth if the first token encountered was not   */
+         /* a parenthesis (e.g. for the command string         */
+         /* "red (+ 3 4", the symbol red already forms a       */
+         /* complete command, so the next carriage return will */
+         /* cause evaluation of red--the closing parenthesis   */
+         /* for "(+ 3 4" does not have to be found).           */
+         /*====================================================*/
+
+         case '(' :
+           if ((depth > 0) || (moreThanZero == false))
+             {
+              depth++;
+              moreThanZero = true;
+             }
+           break;
+
+         /*====================================================*/
+         /* A right parenthesis decreases the nesting depth of */
+         /* the current command by 1. If the parenthesis is    */
+         /* the first token of the command, then an error is   */
+         /* generated.                                         */
+         /*====================================================*/
+
+         case ')' :
+           if (depth > 0) depth--;
+           else if (moreThanZero == false) error = true;
+           break;
+
+         /*=====================================================*/
+         /* If the command begins with any other character and  */
+         /* an opening parenthesis hasn't yet been found, then  */
+         /* skip all characters on the same line. If a carriage */
+         /* return or line feed is found, then a complete       */
+         /* command exists.                                     */
+         /*=====================================================*/
+
+         default:
+           if (depth == 0)
+             {
+              if (IsUTF8MultiByteStart(inchar) || isprint(inchar))
+                {
+                 while ((inchar = mstring[i++]) != EOS)
+                   {
+                    if ((inchar == '\n') || (inchar == '\r'))
+                      {
+                       if (error) return -1;
+                       else return 1;
+                      }
+                   }
+                 return 0;
+                }
+             }
+           break;
+        }
+     }
+
+   /*====================================================*/
+   /* Return 0 because a complete command was not found. */
+   /*====================================================*/
+
+   return 0;
+  }
+
+/***********************************************************/
+/* DoString: Skips over a string contained within a string */
+/*   until the closing quotation mark is encountered.      */
+/***********************************************************/
+static int DoString(
+  const char *str,
+  int pos,
+  bool *complete,
+  int delimiterChar)
+  {
+   int inchar;
+
+   /*=================================================*/
+   /* Process the string character by character until */
+   /* the closing quotation mark is found.            */
+   /*=================================================*/
+
+   inchar = str[pos];
+   while (inchar  != delimiterChar)
+     {
+      /*=====================================================*/
+      /* If a \ is found, then the next character is ignored */
+      /* even if it is a closing quotation mark.             */
+      /*=====================================================*/
+
+      if (inchar == '\\')
+        {
+         pos++;
+         inchar = str[pos];
+        }
+
+      /*===================================================*/
+      /* If the end of input is reached before the closing */
+      /* quotation mark is found, the return the last      */
+      /* position that was reached and indicate that a     */
+      /* complete string was not found.                    */
+      /*===================================================*/
+
+      if (inchar == EOS)
+        {
+         *complete = false;
+         return(pos);
+        }
+
+      /*================================*/
+      /* Move on to the next character. */
+      /*================================*/
+
+      pos++;
+      inchar = str[pos];
+     }
+
+   /*======================================================*/
+   /* Indicate that a complete string was found and return */
+   /* the position of the closing quotation mark.          */
+   /*======================================================*/
+
+   pos++;
+   *complete = true;
+   return(pos);
+  }
+
+/*************************************************************/
+/* DoComment: Skips over a comment contained within a string */
+/*   until a line feed or carriage return is encountered.    */
+/*************************************************************/
+static int DoComment(
+  const char *str,
+  int pos)
+  {
+   int inchar;
+
+   inchar = str[pos];
+   while ((inchar != '\n') && (inchar != '\r'))
+     {
+      if (inchar == EOS)
+        { return(pos); }
+
+      pos++;
+      inchar = str[pos];
+     }
+
+   return(pos);
+  }
+
+/**************************************************************/
+/* DoWhiteSpace: Skips over white space consisting of spaces, */
+/*   tabs, and form feeds that is contained within a string.  */
+/**************************************************************/
+static int DoWhiteSpace(
+  const char *str,
+  int pos)
+  {
+   int inchar;
+
+   inchar = str[pos];
+   while ((inchar == ' ') || (inchar == '\f') || (inchar == '\t'))
+     {
+      pos++;
+      inchar = str[pos];
+     }
+
+   return(pos);
+  }
+
+/********************************************************************/
+/* CommandLoop: Endless loop which waits for user commands and then */
+/*   executes them. The command loop will bypass the EventFunction  */
+/*   if there is an active batch file.                              */
+/********************************************************************/
+void CommandLoop(
+  Environment *theEnv)
+  {
+   int inchar;
+
+   WriteString(theEnv,STDOUT,CommandLineData(theEnv)->BannerString);
+   SetHaltExecution(theEnv,false);
+   SetEvaluationError(theEnv,false);
+
+   CleanCurrentGarbageFrame(theEnv,NULL);
+   CallPeriodicTasks(theEnv);
+
+   PrintPrompt(theEnv);
+   RouterData(theEnv)->CommandBufferInputCount = 0;
+   RouterData(theEnv)->InputUngets = 0;
+   RouterData(theEnv)->AwaitingInput = true;
+
+   while (true)
+     {
+      /*===================================================*/
+      /* If a batch file is active, grab the command input */
+      /* directly from the batch file, otherwise call the  */
+      /* event function.                                   */
+      /*===================================================*/
+
+      if (BatchActive(theEnv) == true)
+        {
+         inchar = LLGetcBatch(theEnv,STDIN,true);
+         if (inchar == EOF)
+           { (*CommandLineData(theEnv)->EventCallback)(theEnv); }
+         else
+           { ExpandCommandString(theEnv,(char) inchar); }
+        }
+      else
+        { (*CommandLineData(theEnv)->EventCallback)(theEnv); }
+
+      /*=================================================*/
+      /* If execution was halted, then remove everything */
+      /* from the command buffer.                        */
+      /*=================================================*/
+
+      if (GetHaltExecution(theEnv) == true)
+        {
+         SetHaltExecution(theEnv,false);
+         SetEvaluationError(theEnv,false);
+         FlushCommandString(theEnv);
+         WriteString(theEnv,STDOUT,"\n");
+         PrintPrompt(theEnv);
+        }
+
+      /*=========================================*/
+      /* If a complete command is in the command */
+      /* buffer, then execute it.                */
+      /*=========================================*/
+
+      ExecuteIfCommandComplete(theEnv);
+     }
+  }
+
+/***********************************************************/
+/* CommandLoopBatch: Loop which waits for commands from a  */
+/*   batch file and then executes them. Returns when there */
+/*   are no longer any active batch files.                 */
+/***********************************************************/
+void CommandLoopBatch(
+  Environment *theEnv)
+  {
+   SetHaltExecution(theEnv,false);
+   SetEvaluationError(theEnv,false);
+
+   CleanCurrentGarbageFrame(theEnv,NULL);
+   CallPeriodicTasks(theEnv);
+
+   PrintPrompt(theEnv);
+   RouterData(theEnv)->CommandBufferInputCount = 0;
+   RouterData(theEnv)->InputUngets = 0;
+   RouterData(theEnv)->AwaitingInput = true;
+
+   CommandLoopBatchDriver(theEnv);
+  }
+
+/************************************************************/
+/* CommandLoopOnceThenBatch: Loop which waits for commands  */
+/*   from a batch file and then executes them. Returns when */
+/*   there are no longer any active batch files.            */
+/************************************************************/
+void CommandLoopOnceThenBatch(
+  Environment *theEnv)
+  {
+   if (! ExecuteIfCommandComplete(theEnv)) return;
+
+   CommandLoopBatchDriver(theEnv);
+  }
+
+/*********************************************************/
+/* CommandLoopBatchDriver: Loop which waits for commands */
+/*   from a batch file and then executes them. Returns   */
+/*   when there are no longer any active batch files.    */
+/*********************************************************/
+void CommandLoopBatchDriver(
+  Environment *theEnv)
+  {
+   int inchar;
+
+   while (true)
+     {
+      if (GetHaltCommandLoopBatch(theEnv) == true)
+        {
+         CloseAllBatchSources(theEnv);
+         SetHaltCommandLoopBatch(theEnv,false);
+        }
+
+      /*===================================================*/
+      /* If a batch file is active, grab the command input */
+      /* directly from the batch file, otherwise call the  */
+      /* event function.                                   */
+      /*===================================================*/
+
+      if (BatchActive(theEnv) == true)
+        {
+         inchar = LLGetcBatch(theEnv,STDIN,true);
+         if (inchar == EOF)
+           { return; }
+         else
+           { ExpandCommandString(theEnv,(char) inchar); }
+        }
+      else
+        { return; }
+
+      /*=================================================*/
+      /* If execution was halted, then remove everything */
+      /* from the command buffer.                        */
+      /*=================================================*/
+
+      if (GetHaltExecution(theEnv) == true)
+        {
+         SetHaltExecution(theEnv,false);
+         SetEvaluationError(theEnv,false);
+         FlushCommandString(theEnv);
+         WriteString(theEnv,STDOUT,"\n");
+         PrintPrompt(theEnv);
+        }
+
+      /*=========================================*/
+      /* If a complete command is in the command */
+      /* buffer, then execute it.                */
+      /*=========================================*/
+
+      ExecuteIfCommandComplete(theEnv);
+     }
+  }
+
+/**********************************************************/
+/* ExecuteIfCommandComplete: Checks to determine if there */
+/*   is a completed command and if so executes it.        */
+/**********************************************************/
+bool ExecuteIfCommandComplete(
+  Environment *theEnv)
+  {
+   if ((CompleteCommand(CommandLineData(theEnv)->CommandString) == 0) ||
+       (RouterData(theEnv)->CommandBufferInputCount == 0) ||
+       (RouterData(theEnv)->AwaitingInput == false))
+     { return false; }
+
+   if (CommandLineData(theEnv)->BeforeCommandExecutionCallback != NULL)
+     {
+      if (! (*CommandLineData(theEnv)->BeforeCommandExecutionCallback)(theEnv))
+        { return false; }
+     }
+
+   FlushPPBuffer(theEnv);
+   SetPPBufferStatus(theEnv,false);
+   RouterData(theEnv)->CommandBufferInputCount = 0;
+   RouterData(theEnv)->InputUngets = 0;
+   RouterData(theEnv)->AwaitingInput = false;
+   RouteCommand(theEnv,CommandLineData(theEnv)->CommandString,true);
+   FlushPPBuffer(theEnv);
+#if (! BLOAD_ONLY)
+   FlushParsingMessages(theEnv);
+#endif
+   SetHaltExecution(theEnv,false);
+   SetEvaluationError(theEnv,false);
+   FlushCommandString(theEnv);
+
+   CleanCurrentGarbageFrame(theEnv,NULL);
+   CallPeriodicTasks(theEnv);
+
+   PrintPrompt(theEnv);
+
+   return true;
+  }
+
+/*******************************/
+/* CommandCompleteAndNotEmpty: */
+/*******************************/
+bool CommandCompleteAndNotEmpty(
+  Environment *theEnv)
+  {
+   if ((CompleteCommand(CommandLineData(theEnv)->CommandString) == 0) ||
+       (RouterData(theEnv)->CommandBufferInputCount == 0) ||
+       (RouterData(theEnv)->AwaitingInput == false))
+     { return false; }
+
+   return true;
+  }
+
+/*******************************************/
+/* PrintPrompt: Prints the command prompt. */
+/*******************************************/
+void PrintPrompt(
+   Environment *theEnv)
+   {
+    WriteString(theEnv,STDOUT,COMMAND_PROMPT);
+
+    if (CommandLineData(theEnv)->AfterPromptCallback != NULL)
+      { (*CommandLineData(theEnv)->AfterPromptCallback)(theEnv); }
+   }
+
+/*****************************************/
+/* PrintBanner: Prints the CLIPS banner. */
+/*****************************************/
+void PrintBanner(
+   Environment *theEnv)
+   {
+    WriteString(theEnv,STDOUT,CommandLineData(theEnv)->BannerString);
+   }
+
+/************************************************/
+/* SetAfterPromptFunction: Replaces the current */
+/*   value of AfterPromptFunction.              */
+/************************************************/
+void SetAfterPromptFunction(
+  Environment *theEnv,
+  AfterPromptFunction *funptr)
+  {
+   CommandLineData(theEnv)->AfterPromptCallback = funptr;
+  }
+
+/***********************************************************/
+/* SetBeforeCommandExecutionFunction: Replaces the current */
+/*   value of BeforeCommandExecutionFunction.              */
+/***********************************************************/
+void SetBeforeCommandExecutionFunction(
+  Environment *theEnv,
+  BeforeCommandExecutionFunction *funptr)
+  {
+   CommandLineData(theEnv)->BeforeCommandExecutionCallback = funptr;
+  }
+
+/*********************************************************/
+/* RouteCommand: Processes a completed command. Returns  */
+/*   true if a command could be parsed, otherwise false. */
+/*********************************************************/
+bool RouteCommand(
+  Environment *theEnv,
+  const char *command,
+  bool printResult)
+  {
+   UDFValue returnValue;
+   struct expr *top;
+   const char *commandName;
+   struct token theToken;
+   int danglingConstructs;
+
+   if (command == NULL)
+     { return false; }
+
+   /*========================================*/
+   /* Open a string input source and get the */
+   /* first token from that source.          */
+   /*========================================*/
+
+   OpenStringSource(theEnv,"command",command,0);
+
+   GetToken(theEnv,"command",&theToken);
+
+   /*=====================*/
+   /* Evaluate constants. */
+   /*=====================*/
+
+   if ((theToken.tknType == SYMBOL_TOKEN) || (theToken.tknType == STRING_TOKEN) ||
+       (theToken.tknType == FLOAT_TOKEN) || (theToken.tknType == INTEGER_TOKEN) ||
+       (theToken.tknType == INSTANCE_NAME_TOKEN))
+     {
+      CloseStringSource(theEnv,"command");
+      if (printResult)
+        {
+         PrintAtom(theEnv,STDOUT,TokenTypeToType(theToken.tknType),theToken.value);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+      return true;
+     }
+
+   /*=====================*/
+   /* Evaluate variables. */
+   /*=====================*/
+
+   if ((theToken.tknType == GBL_VARIABLE_TOKEN) ||
+       (theToken.tknType == MF_GBL_VARIABLE_TOKEN) ||
+       (theToken.tknType == SF_VARIABLE_TOKEN) ||
+       (theToken.tknType == MF_VARIABLE_TOKEN))
+     {
+      CloseStringSource(theEnv,"command");
+      top = GenConstant(theEnv,TokenTypeToType(theToken.tknType),theToken.value);
+      EvaluateExpression(theEnv,top,&returnValue);
+      rtn_struct(theEnv,expr,top);
+      if (printResult)
+        {
+         WriteUDFValue(theEnv,STDOUT,&returnValue);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+      return true;
+     }
+
+   /*========================================================*/
+   /* If the next token isn't the beginning left parenthesis */
+   /* of a command or construct, then whatever was entered   */
+   /* cannot be evaluated at the command prompt.             */
+   /*========================================================*/
+
+   if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      PrintErrorID(theEnv,"COMMLINE",1,false);
+      WriteString(theEnv,STDERR,"Expected a '(', constant, or variable.\n");
+      CloseStringSource(theEnv,"command");
+      return false;
+     }
+
+   /*===========================================================*/
+   /* The next token must be a function name or construct type. */
+   /*===========================================================*/
+
+   GetToken(theEnv,"command",&theToken);
+   if (theToken.tknType != SYMBOL_TOKEN)
+     {
+      PrintErrorID(theEnv,"COMMLINE",2,false);
+      WriteString(theEnv,STDERR,"Expected a command.\n");
+      CloseStringSource(theEnv,"command");
+      return false;
+     }
+
+   commandName = theToken.lexemeValue->contents;
+
+   /*======================*/
+   /* Evaluate constructs. */
+   /*======================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   {
+    BuildError errorFlag;
+
+    errorFlag = ParseConstruct(theEnv,commandName,"command");
+    if (errorFlag != BE_CONSTRUCT_NOT_FOUND_ERROR)
+      {
+       CloseStringSource(theEnv,"command");
+       if (errorFlag == BE_PARSING_ERROR)
+         {
+          WriteString(theEnv,STDERR,"\nERROR:\n");
+          WriteString(theEnv,STDERR,GetPPBuffer(theEnv));
+          WriteString(theEnv,STDERR,"\n");
+         }
+       DestroyPPBuffer(theEnv);
+       
+       SetWarningFileName(theEnv,NULL);
+       SetErrorFileName(theEnv,NULL);
+
+       if (errorFlag == BE_NO_ERROR) return true;
+       else return false;
+      }
+   }
+#endif
+
+   /*========================*/
+   /* Parse a function call. */
+   /*========================*/
+
+   danglingConstructs = ConstructData(theEnv)->DanglingConstructs;
+   CommandLineData(theEnv)->ParsingTopLevelCommand = true;
+   top = Function2Parse(theEnv,"command",commandName);
+   CommandLineData(theEnv)->ParsingTopLevelCommand = false;
+   ClearParsedBindNames(theEnv);
+
+   /*================================*/
+   /* Close the string input source. */
+   /*================================*/
+
+   CloseStringSource(theEnv,"command");
+
+   /*=========================*/
+   /* Evaluate function call. */
+   /*=========================*/
+
+   if (top == NULL)
+     {
+      SetWarningFileName(theEnv,NULL);
+      SetErrorFileName(theEnv,NULL);
+      ConstructData(theEnv)->DanglingConstructs = danglingConstructs;
+      return false;
+     }
+
+   ExpressionInstall(theEnv,top);
+
+   CommandLineData(theEnv)->EvaluatingTopLevelCommand = true;
+   CommandLineData(theEnv)->CurrentCommand = top;
+   EvaluateExpression(theEnv,top,&returnValue);
+   CommandLineData(theEnv)->CurrentCommand = NULL;
+   CommandLineData(theEnv)->EvaluatingTopLevelCommand = false;
+
+   ExpressionDeinstall(theEnv,top);
+   ReturnExpression(theEnv,top);
+   ConstructData(theEnv)->DanglingConstructs = danglingConstructs;
+   
+   SetWarningFileName(theEnv,NULL);
+   SetErrorFileName(theEnv,NULL);
+
+   /*=================================================*/
+   /* Print the return value of the function/command. */
+   /*=================================================*/
+
+   if ((returnValue.header->type != VOID_TYPE) && printResult)
+     {
+      WriteUDFValue(theEnv,STDOUT,&returnValue);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+
+   return true;
+  }
+
+/*****************************************************************/
+/* DefaultGetNextEvent: Default event-handling function. Handles */
+/*   only keyboard events by first calling ReadRouter to get a   */
+/*   character and then calling ExpandCommandString to add the   */
+/*   character to the CommandString.                             */
+/*****************************************************************/
+static void DefaultGetNextEvent(
+  Environment *theEnv)
+  {
+   int inchar;
+
+   inchar = ReadRouter(theEnv,STDIN);
+
+   if (inchar == EOF) inchar = '\n';
+
+   ExpandCommandString(theEnv,(char) inchar);
+  }
+
+/*************************************/
+/* SetEventFunction: Replaces the    */
+/*   current value of EventFunction. */
+/*************************************/
+EventFunction *SetEventFunction(
+  Environment *theEnv,
+  EventFunction *theFunction)
+  {
+   EventFunction *tmp_ptr;
+
+   tmp_ptr = CommandLineData(theEnv)->EventCallback;
+   CommandLineData(theEnv)->EventCallback = theFunction;
+   return tmp_ptr;
+  }
+
+/****************************************/
+/* TopLevelCommand: Indicates whether a */
+/*   top-level command is being parsed. */
+/****************************************/
+bool TopLevelCommand(
+  Environment *theEnv)
+  {
+   return(CommandLineData(theEnv)->ParsingTopLevelCommand);
+  }
+
+/***********************************************************/
+/* GetCommandCompletionString: Returns the last token in a */
+/*   string if it is a valid token for command completion. */
+/***********************************************************/
+const char *GetCommandCompletionString(
+  Environment *theEnv,
+  const char *theString,
+  size_t maxPosition)
+  {
+   struct token lastToken;
+   struct token theToken;
+   char lastChar;
+   const char *rs;
+   size_t length;
+
+   /*=========================*/
+   /* Get the command string. */
+   /*=========================*/
+
+   if (theString == NULL) return("");
+
+   /*=========================================================================*/
+   /* If the last character in the command string is a space, character       */
+   /* return, or quotation mark, then the command completion can be anything. */
+   /*=========================================================================*/
+
+   lastChar = theString[maxPosition - 1];
+   if ((lastChar == ' ') || (lastChar == '"') ||
+       (lastChar == '\t') || (lastChar == '\f') ||
+       (lastChar == '\n') || (lastChar == '\r'))
+     { return(""); }
+
+   /*============================================*/
+   /* Find the last token in the command string. */
+   /*============================================*/
+
+   OpenTextSource(theEnv,"CommandCompletion",theString,0,maxPosition);
+   ScannerData(theEnv)->IgnoreCompletionErrors = true;
+   GetToken(theEnv,"CommandCompletion",&theToken);
+   CopyToken(&lastToken,&theToken);
+   while (theToken.tknType != STOP_TOKEN)
+     {
+      CopyToken(&lastToken,&theToken);
+      GetToken(theEnv,"CommandCompletion",&theToken);
+     }
+   CloseStringSource(theEnv,"CommandCompletion");
+   ScannerData(theEnv)->IgnoreCompletionErrors = false;
+
+   /*===============================================*/
+   /* Determine if the last token can be completed. */
+   /*===============================================*/
+
+   if (lastToken.tknType == SYMBOL_TOKEN)
+     {
+      rs = lastToken.lexemeValue->contents;
+      if (rs[0] == '[') return (&rs[1]);
+      return lastToken.lexemeValue->contents;
+     }
+   else if (lastToken.tknType == SF_VARIABLE_TOKEN)
+     { return lastToken.lexemeValue->contents; }
+   else if (lastToken.tknType == MF_VARIABLE_TOKEN)
+     { return lastToken.lexemeValue->contents; }
+   else if ((lastToken.tknType == GBL_VARIABLE_TOKEN) ||
+            (lastToken.tknType == MF_GBL_VARIABLE_TOKEN) ||
+            (lastToken.tknType == INSTANCE_NAME_TOKEN))
+     { return NULL; }
+   else if (lastToken.tknType == STRING_TOKEN)
+     {
+      length = strlen(lastToken.lexemeValue->contents);
+      return GetCommandCompletionString(theEnv,lastToken.lexemeValue->contents,length);
+     }
+   else if ((lastToken.tknType == FLOAT_TOKEN) ||
+            (lastToken.tknType == INTEGER_TOKEN))
+     { return NULL; }
+
+   return("");
+  }
+
+/****************************************************************/
+/* SetHaltCommandLoopBatch: Sets the HaltCommandLoopBatch flag. */
+/****************************************************************/
+void SetHaltCommandLoopBatch(
+  Environment *theEnv,
+  bool value)
+  {
+   CommandLineData(theEnv)->HaltCommandLoopBatch = value;
+  }
+
+/*******************************************************************/
+/* GetHaltCommandLoopBatch: Returns the HaltCommandLoopBatch flag. */
+/*******************************************************************/
+bool GetHaltCommandLoopBatch(
+  Environment *theEnv)
+  {
+   return(CommandLineData(theEnv)->HaltCommandLoopBatch);
+  }
+
+#endif
+
diff --git a/clips/commline.h b/clips/commline.h
new file mode 100755
index 000000000..1f3e50b82
--- /dev/null
+++ b/clips/commline.h
@@ -0,0 +1,131 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*              COMMAND LINE HEADER FILE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides a set of routines for processing        */
+/*   commands entered at the top level prompt.               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Refactored several functions and added         */
+/*            additional functions for use by an interface   */
+/*            layered on top of CLIPS.                       */
+/*                                                           */
+/*      6.30: Local variables set with the bind function     */
+/*            persist until a reset/clear command is issued. */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Metrowerks CodeWarrior (MAC_MCW, IBM_MCW) is   */
+/*            no longer supported.                           */
+/*                                                           */
+/*            UTF-8 support.                                 */
+/*                                                           */
+/*            Command history and editing support            */
+/*                                                           */
+/*            Used genstrcpy instead of strcpy.              */
+/*                                                           */
+/*            Added before command execution callback        */
+/*            function.                                      */
+/*                                                           */
+/*            Fixed RouteCommand return value.               */
+/*                                                           */
+/*            Added AwaitingInput flag.                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_commline
+
+#pragma once
+
+#define _H_commline
+
+#define COMMANDLINE_DATA 40
+
+#include <stdlib.h>
+
+typedef void AfterPromptFunction(Environment *);
+typedef bool BeforeCommandExecutionFunction(Environment *);
+typedef void EventFunction(Environment *);
+
+struct commandLineData
+  {
+   bool EvaluatingTopLevelCommand;
+   bool HaltCommandLoopBatch;
+#if ! RUN_TIME
+   struct expr *CurrentCommand;
+   char *CommandString;
+   size_t MaximumCharacters;
+   bool ParsingTopLevelCommand;
+   const char *BannerString;
+   EventFunction *EventCallback;
+   AfterPromptFunction *AfterPromptCallback;
+   BeforeCommandExecutionFunction *BeforeCommandExecutionCallback;
+#endif
+  };
+
+#define CommandLineData(theEnv) ((struct commandLineData *) GetEnvironmentData(theEnv,COMMANDLINE_DATA))
+
+   void                           InitializeCommandLineData(Environment *);
+   bool                           ExpandCommandString(Environment *,int);
+   void                           FlushCommandString(Environment *);
+   void                           SetCommandString(Environment *,const char *);
+   void                           AppendCommandString(Environment *,const char *);
+   void                           InsertCommandString(Environment *,const char *,unsigned);
+   char                          *GetCommandString(Environment *);
+   int                            CompleteCommand(const char *);
+   void                           CommandLoop(Environment *);
+   void                           CommandLoopBatch(Environment *);
+   void                           CommandLoopBatchDriver(Environment *);
+   void                           PrintPrompt(Environment *);
+   void                           PrintBanner(Environment *);
+   void                           SetAfterPromptFunction(Environment *,AfterPromptFunction *);
+   void                           SetBeforeCommandExecutionFunction(Environment *,BeforeCommandExecutionFunction *);
+   bool                           RouteCommand(Environment *,const char *,bool);
+   EventFunction                 *SetEventFunction(Environment *,EventFunction *);
+   bool                           TopLevelCommand(Environment *);
+   void                           AppendNCommandString(Environment *,const char *,unsigned);
+   void                           SetNCommandString(Environment *,const char *,unsigned);
+   const char                    *GetCommandCompletionString(Environment *,const char *,size_t);
+   bool                           ExecuteIfCommandComplete(Environment *);
+   void                           CommandLoopOnceThenBatch(Environment *);
+   bool                           CommandCompleteAndNotEmpty(Environment *);
+   void                           SetHaltCommandLoopBatch(Environment *,bool);
+   bool                           GetHaltCommandLoopBatch(Environment *);
+   void                           RerouteStdin(Environment *,int,char *[]);
+
+#endif
+
+
+
+
+
diff --git a/clips/conscomp.c b/clips/conscomp.c
new file mode 100755
index 000000000..9399abcb1
--- /dev/null
+++ b/clips/conscomp.c
@@ -0,0 +1,1590 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  02/08/18            */
+   /*                                                     */
+   /*              CONSTRUCT COMPILER MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides core routines for the constructs-to-c   */
+/*   command.                                                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*      Barry Cameron                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Modifications to use the system constant       */
+/*            FILENAME_MAX to check file name lengths.       */
+/*            DR0856                                         */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Used EnvClear rather than Clear in             */
+/*            InitCImage initialization code.                */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Removed SHORT_LINK_NAMES code as this option   */
+/*            is no longer supported.                        */
+/*                                                           */
+/*            Support for run-time programs directly passing */
+/*            the hash tables for initialization.            */
+/*                                                           */
+/*      6.30: Added path name argument to constructs-to-c.   */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW, MAC_MCW, */
+/*            IBM_TBC, IBM_MSC, IBM_ICB, IBM_ZTC, and        */
+/*            IBM_SC).                                       */
+/*                                                           */
+/*            Use genstrcpy instead of strcpy.               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Changed restrictions from char * to            */
+/*            CLIPSLexeme * to support strings               */
+/*            originating from sources that are not          */
+/*            statically allocated.                          */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed VAX_VMS support.                       */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "constant.h"
+#include "constrct.h"
+#include "cstrccom.h"
+#include "cstrncmp.h"
+#include "exprnpsr.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "modulcmp.h"
+#include "prntutil.h"
+#include "router.h"
+#include "symbol.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#if DEFRULE_CONSTRUCT
+#include "network.h"
+#endif
+
+#if DEFFUNCTION_CONSTRUCT
+#include "dffnxcmp.h"
+#endif
+
+#if DEFTEMPLATE_CONSTRUCT
+#include "tmpltcmp.h"
+#endif
+
+#if DEFGLOBAL_CONSTRUCT
+#include "globlcmp.h"
+#endif
+
+#if DEFGENERIC_CONSTRUCT
+#include "genrccmp.h"
+#endif
+
+#if OBJECT_SYSTEM
+#include "objcmp.h"
+#endif
+
+#include "conscomp.h"
+
+/***************/
+/* DEFINITIONS */
+/***************/
+
+#define EXTRA_FILE_NAME 20
+
+/**********************************************/
+/* CONSTRUCT CODES DEFINITIONS: The codes F,  */
+/*   I, B, S, E, P, L, and C are not included */
+/*   because those are already taken.         */
+/*                                            */
+/*   B: BitMap hash nodes                     */
+/*   C: Constraint hash nodes                 */
+/*   E: Expression hash nodes                 */
+/*   F: Float hash nodes                      */
+/*   I: Integer hash nodes                    */
+/*   L: Bitmaps                               */
+/*   P: Functions                             */
+/*   S: Symbol hash nodes                     */
+/**********************************************/
+
+#define PRIMARY_CODES   "ADGHJKMNOQRTUVWXYZ"
+#define PRIMARY_LEN     18
+
+const char *SecondaryCodes[] = { "A" , "B", "C", "D", "E" , "F" , "G" , "H", "I", "J" , "K",
+                                 "L" , "M", "N", "O", "P" , "Q" , "R" , "S", "T", "U" , "V",
+                                 "W" , "X", "Y", "Z", "AA", "BB", "CC", "DD", "EE" , "FF" };
+
+#define SECONDARY_LEN   32
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   void                               ConstructsToCCommand(Environment *,UDFContext *,UDFValue *);
+   static bool                        ConstructsToC(Environment *,const char *,const char *,char *,long long,long long);
+   static void                        WriteFunctionExternDeclarations(Environment *,FILE *);
+   static bool                        FunctionsToCode(Environment *theEnv,const char *,const char *,char *);
+   static bool                        WriteInitializationFunction(Environment *,const char *,const char *,char *);
+   static void                        DumpExpression(Environment *,struct expr *);
+   static void                        MarkConstruct(Environment *,ConstructHeader *,void *);
+   static void                        HashedExpressionsToCode(Environment *);
+   static void                        DeallocateConstructCompilerData(Environment *);
+
+/**********************************************************/
+/* InitializeConstructCompilerData: Allocates environment */
+/*    data for the constructs-to-c command.               */
+/**********************************************************/
+void InitializeConstructCompilerData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,CONSTRUCT_COMPILER_DATA,sizeof(struct constructCompilerData),DeallocateConstructCompilerData);
+
+   ConstructCompilerData(theEnv)->MaxIndices = 2000;
+   ConstructCompilerData(theEnv)->CodeGeneratorCount = 0;
+  }
+
+/************************************************************/
+/* DeallocateConstructCompilerData: Deallocates environment */
+/*    data for the constructs-to-c command.                 */
+/************************************************************/
+static void DeallocateConstructCompilerData(
+  Environment *theEnv)
+  {
+   struct CodeGeneratorItem *tmpPtr, *nextPtr;
+   unsigned int i;
+
+   tmpPtr = ConstructCompilerData(theEnv)->ListOfCodeGeneratorItems;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+
+      for (i = 0; i < tmpPtr->arrayCount ; i++)
+        { rm(theEnv,tmpPtr->arrayNames[i],strlen(tmpPtr->arrayNames[i]) + 1); }
+
+      if (tmpPtr->arrayCount != 0)
+        { rm(theEnv,tmpPtr->arrayNames,sizeof(char *) * tmpPtr->arrayCount); }
+
+      rtn_struct(theEnv,CodeGeneratorItem,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/**********************************************/
+/* ConstructsToCCommand: H/L access routine   */
+/*   for the constructs-to-c command.         */
+/**********************************************/
+void ConstructsToCCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileName;
+   char *fileNameBuffer;
+   const char *pathName;
+   UDFValue theArg;
+   long long id, max;
+   size_t nameLength, pathLength;
+#if WIN_MVC
+   int i;
+#endif
+
+   /*====================================================*/
+   /* Get the name of the file in which to place C code. */
+   /*====================================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&theArg))
+     { return; }
+
+   fileName = theArg.lexemeValue->contents;
+   nameLength = strlen(fileName);
+
+   /*================================*/
+   /* File names for the VAX and IBM */
+   /* PCs can't contain a period.    */
+   /*================================*/
+
+#if WIN_MVC
+   for (i = 0 ; *(fileName+i) ; i++)
+     {
+      if (*(fileName+i) == '.')
+        {
+         PrintErrorID(theEnv,"CONSCOMP",1,false);
+         WriteString(theEnv,STDERR,"Invalid file name ");
+         WriteString(theEnv,STDERR,fileName);
+         WriteString(theEnv,STDERR," contains \'.\'\n");
+         return;
+        }
+      }
+#endif
+
+   /*==========================================================*/
+   /* The maximum file name size that can be passed into fopen */
+   /* is specified by FILENAME_MAX. Assume that the most       */
+   /* characters that will be appended to the file prefix will */
+   /* be 20 and check that the prefix plus the additional      */
+   /* characters is less than the supported maximum.           */
+   /*==========================================================*/
+
+   if ((nameLength + EXTRA_FILE_NAME) > FILENAME_MAX)
+     {
+      PrintErrorID(theEnv,"CONSCOMP",2,false);
+      WriteString(theEnv,STDERR,"Aborting because the base file name may cause the fopen maximum of ");
+      WriteInteger(theEnv,STDERR,FILENAME_MAX);
+      WriteString(theEnv,STDERR," to be violated when file names are generated.\n");
+      return;
+     }
+
+   /*====================================*/
+   /* Get the runtime image ID argument. */
+   /*====================================*/
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+     { return; }
+
+   id = theArg.integerValue->contents;
+   if (id < 0)
+     {
+      ExpectedTypeError1(theEnv,"constructs-to-c",2,"'positive integer'");
+      return;
+     }
+
+   /*==================================================*/
+   /* Get the path name argument if one was specified. */
+   /*==================================================*/
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,LEXEME_BITS,&theArg))
+        { return; }
+
+      pathName = theArg.lexemeValue->contents;
+      pathLength = strlen(pathName);
+     }
+   else
+     {
+      pathName = "";
+      pathLength = 0;
+     }
+
+   /*===========================================*/
+   /* Get the maximum number of data structures */
+   /* to store per file argument (if supplied). */
+   /*===========================================*/
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+        { return; }
+
+      max = theArg.integerValue->contents;
+
+      if (max < 0)
+        {
+         ExpectedTypeError1(theEnv,"constructs-to-c",4,"'positive integer'");
+         return;
+        }
+     }
+   else
+     { max = 10000; }
+
+   /*============================*/
+   /* Call the driver routine to */
+   /* generate the C code.       */
+   /*============================*/
+
+   fileNameBuffer = (char *) genalloc(theEnv,nameLength + pathLength + EXTRA_FILE_NAME);
+
+   ConstructsToC(theEnv,fileName,pathName,fileNameBuffer,id,max);
+
+   genfree(theEnv,fileNameBuffer,nameLength + pathLength + EXTRA_FILE_NAME);
+  }
+
+/***************************************/
+/* ConstructsToC: C access routine for */
+/*   the constructs-to-c command.      */
+/***************************************/
+static bool ConstructsToC(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  long long theImageID,
+  long long max)
+  {
+   unsigned fileVersion;
+   struct CodeGeneratorItem *cgPtr;
+
+   /*===============================================*/
+   /* Set the global MaxIndices variable indicating */
+   /* the maximum number of data structures to save */
+   /* in each file.                                 */
+   /*===============================================*/
+
+   ConstructCompilerData(theEnv)->MaxIndices = (unsigned) max; /* TBD */
+
+   /*=====================================================*/
+   /* Open a header file for dumping general information. */
+   /*=====================================================*/
+
+   gensprintf(fileNameBuffer,"%s%s.h",pathName,fileName);
+   if ((ConstructCompilerData(theEnv)->HeaderFP = GenOpen(theEnv,fileNameBuffer,"w")) == NULL)
+     {
+      OpenErrorMessage(theEnv,"constructs-to-c",fileNameBuffer);
+      return false;
+     }
+
+   /*============================================*/
+   /* Open a file for dumping fixup information. */
+   /*============================================*/
+
+   gensprintf(fileNameBuffer,"%s%s_init.c",pathName,fileName);
+   if ((ConstructCompilerData(theEnv)->FixupFP = GenOpen(theEnv,fileNameBuffer,"w")) == NULL)
+     {
+      OpenErrorMessage(theEnv,"constructs-to-c",fileNameBuffer);
+      return false;
+     }
+
+   /*==================================*/
+   /* Call the list of functions to be */
+   /* executed before generating code. */
+   /*==================================*/
+
+   for (cgPtr = ConstructCompilerData(theEnv)->ListOfCodeGeneratorItems;
+        cgPtr != NULL;
+        cgPtr = cgPtr->next)
+     { if (cgPtr->beforeFunction != NULL) (*cgPtr->beforeFunction)(theEnv); }
+
+   /*=====================================*/
+   /* Initialize some global information. */
+   /*=====================================*/
+
+   ConstructCompilerData(theEnv)->FilePrefix = fileName;
+   ConstructCompilerData(theEnv)->PathName = pathName;
+   ConstructCompilerData(theEnv)->FileNameBuffer = fileNameBuffer;
+   ConstructCompilerData(theEnv)->ImageID = (unsigned) theImageID; /* TBD */
+   ConstructCompilerData(theEnv)->ExpressionFP = NULL;
+   ConstructCompilerData(theEnv)->ExpressionVersion = 1;
+   ConstructCompilerData(theEnv)->ExpressionHeader = true;
+   ConstructCompilerData(theEnv)->ExpressionCount = 0;
+
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"#ifndef _CONSTRUCT_COMPILER_HEADER_\n");
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"#define _CONSTRUCT_COMPILER_HEADER_\n\n");
+
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"#include <stdio.h>\n");
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"#include \"setup.h\"\n");
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"#include \"expressn.h\"\n");
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"#include \"extnfunc.h\"\n");
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"#include \"%s\"\n",API_HEADER);
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"\n#define VS (void *)\n");
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"\n");
+
+   /*=========================================================*/
+   /* Give extern declarations for user and system functions. */
+   /*=========================================================*/
+
+   WriteFunctionExternDeclarations(theEnv,ConstructCompilerData(theEnv)->HeaderFP);
+
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"\n#endif\n\n");
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"/****************************/\n");
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"/* EXTERN ARRAY DEFINITIONS */\n");
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"/****************************/\n\n");
+
+   /*================================================*/
+   /* Write out the first portion of the fixup file. */
+   /*================================================*/
+
+   fprintf(ConstructCompilerData(theEnv)->FixupFP,"#include \"%s.h\"\n",fileName);
+   fprintf(ConstructCompilerData(theEnv)->FixupFP,"\n");
+
+   fprintf(ConstructCompilerData(theEnv)->FixupFP,"\n");
+   fprintf(ConstructCompilerData(theEnv)->FixupFP,"/**********************************/\n");
+   fprintf(ConstructCompilerData(theEnv)->FixupFP,"/* CONSTRUCT IMAGE FIXUP FUNCTION */\n");
+   fprintf(ConstructCompilerData(theEnv)->FixupFP,"/**********************************/\n");
+
+   fprintf(ConstructCompilerData(theEnv)->FixupFP,"\nvoid FixupCImage_%d(\n",ConstructCompilerData(theEnv)->ImageID);
+   fprintf(ConstructCompilerData(theEnv)->FixupFP,"  Environment *theEnv)\n");
+   fprintf(ConstructCompilerData(theEnv)->FixupFP,"  {\n");
+
+   /*==================================*/
+   /* Generate code for atomic values, */
+   /* function definitions, hashed     */
+   /* expressions, and constructs.     */
+   /*==================================*/
+
+   AtomicValuesToCode(theEnv,fileName,pathName,fileNameBuffer);
+
+   FunctionsToCode(theEnv,fileName,pathName,fileNameBuffer);
+
+   HashedExpressionsToCode(theEnv);
+
+   ConstraintsToCode(theEnv,fileName,pathName,fileNameBuffer,4,
+                     ConstructCompilerData(theEnv)->HeaderFP,
+                     ConstructCompilerData(theEnv)->ImageID,
+                     ConstructCompilerData(theEnv)->MaxIndices);
+
+   /*===============================*/
+   /* Call each code generator item */
+   /* for the various constructs.   */
+   /*===============================*/
+
+   fileVersion = 5;
+   for (cgPtr = ConstructCompilerData(theEnv)->ListOfCodeGeneratorItems;
+        cgPtr != NULL;
+        cgPtr = cgPtr->next)
+     {
+      if (cgPtr->generateFunction != NULL)
+        {
+         (*cgPtr->generateFunction)(theEnv,fileName,pathName,fileNameBuffer,fileVersion,ConstructCompilerData(theEnv)->HeaderFP,ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->MaxIndices);
+         fileVersion++;
+        }
+     }
+
+   /*=========================================*/
+   /* Restore the atomic data bucket values   */
+   /* (which were set to an index reference). */
+   /*=========================================*/
+
+   RestoreAtomicValueBuckets(theEnv);
+
+   /*============================*/
+   /* Close the expression file. */
+   /*============================*/
+
+   if (ConstructCompilerData(theEnv)->ExpressionFP != NULL)
+     {
+      fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"};\n");
+      GenClose(theEnv,ConstructCompilerData(theEnv)->ExpressionFP);
+     }
+
+   /*=======================*/
+   /* Close the fixup file. */
+   /*=======================*/
+
+   if (ConstructCompilerData(theEnv)->FixupFP != NULL)
+     {
+      fprintf(ConstructCompilerData(theEnv)->FixupFP,"  }\n");
+      GenClose(theEnv,ConstructCompilerData(theEnv)->FixupFP);
+     }
+
+   /*====================================*/
+   /* Write the initialization function. */
+   /*====================================*/
+
+   WriteInitializationFunction(theEnv,fileName,pathName,fileNameBuffer);
+
+   /*========================*/
+   /* Close the header file. */
+   /*========================*/
+
+   GenClose(theEnv,ConstructCompilerData(theEnv)->HeaderFP);
+
+   /*==================================================*/
+   /* Return true to indicate that the constructs-to-c */
+   /* command was successfully executed.               */
+   /*==================================================*/
+
+   return true;
+  }
+
+/*******************************************************/
+/* WriteFunctionExternDeclarations: Loop through the   */
+/*   list of function definitions and generates extern */
+/*   declarations for them in the specified file.      */
+/*******************************************************/
+static void WriteFunctionExternDeclarations(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   struct functionDefinition *theFunction;
+
+   fprintf(fp,"\n");
+   fprintf(fp,"/************************************/\n");
+   fprintf(fp,"/* EXTERNAL FUNCTION DEFINITIONS    */\n");
+   fprintf(fp,"/************************************/\n\n");
+
+   for (theFunction = GetFunctionList(theEnv);
+        theFunction != NULL;
+        theFunction = theFunction->next)
+     {
+      fprintf(fp,"extern ");
+      fprintf(fp,"void ");
+
+      fprintf(fp,"%s(",theFunction->actualFunctionName);
+
+      fprintf(fp,"Environment *,UDFContext *,UDFValue *");
+
+      fprintf(fp,");\n");
+     }
+  }
+
+/****************************************************/
+/* FunctionsToCode: Generates C code to represent   */
+/*   the function declaration data structures (used */
+/*   to declare system and user defined functions). */
+/****************************************************/
+static bool FunctionsToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer)
+  {
+   unsigned short i = 0;
+   FILE *fp;
+   unsigned version = 1;
+   bool newHeader = true;
+   struct functionDefinition *fctnPtr;
+
+   /*=============================*/
+   /* Assign a reference index to */
+   /* each of the functions.      */
+   /*=============================*/
+
+   for (fctnPtr = GetFunctionList(theEnv);
+        fctnPtr != NULL;
+        fctnPtr = fctnPtr->next)
+     { fctnPtr->bsaveIndex = i++; }
+
+   /*=======================================*/
+   /* Create the file in which to store the */
+   /* function definition data structures.  */
+   /*=======================================*/
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,2,version,false)) == NULL)
+     { return false; }
+
+   /*===============================================*/
+   /* Construct the definition of the function list */
+   /* from the definitions of the functions.        */
+   /*===============================================*/
+
+   fprintf(fp,"\n\n");
+   fprintf(fp,"/************************************/\n");
+   fprintf(fp,"/* FUNCTION LIST DEFINITION         */\n");
+   fprintf(fp,"/************************************/\n\n");
+
+   i = 1;
+   fctnPtr = GetFunctionList(theEnv);
+   while (fctnPtr != NULL)
+     {
+      if (newHeader)
+        {
+         fprintf(fp,"struct functionDefinition P%d_%d[] = {\n",ConstructCompilerData(theEnv)->ImageID,version);
+         fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern struct functionDefinition P%d_%d[];\n",ConstructCompilerData(theEnv)->ImageID,version);
+         newHeader = false;
+        }
+
+      fprintf(fp,"{");
+      PrintSymbolReference(theEnv,fp,fctnPtr->callFunctionName);
+      fprintf(fp,",\"%s\",",fctnPtr->actualFunctionName);
+      fprintf(fp,"%u,",fctnPtr->unknownReturnValueType);
+      fprintf(fp,"%s,",fctnPtr->actualFunctionName);
+      fprintf(fp,"NULL,");
+
+      PrintSymbolReference(theEnv,fp,fctnPtr->restrictions);
+
+      fprintf(fp,",%d,%d,0,0,0,0,",fctnPtr->minArgs,fctnPtr->maxArgs);
+
+      PrintFunctionReference(theEnv,fp,fctnPtr->next);
+
+      i++;
+      fctnPtr = fctnPtr->next;
+      if ((i > ConstructCompilerData(theEnv)->MaxIndices) || (fctnPtr == NULL))
+        {
+         fprintf(fp,"}};\n");
+         GenClose(theEnv,fp);
+         i = 1;
+         version++;
+         if (fctnPtr != NULL)
+           {
+            if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,2,version,false)) == NULL) return false;
+            newHeader = true;
+           }
+        }
+      else
+        { fprintf(fp,"},\n"); }
+     }
+
+   return true;
+  }
+
+/************************************************************/
+/* PrintFunctionReference: Writes the C code representation */
+/*   of a pointer to a function definition data structure.  */
+/************************************************************/
+void PrintFunctionReference(
+  Environment *theEnv,
+  FILE *fp,
+  struct functionDefinition *funcPtr)
+  {
+   if (funcPtr == NULL) fprintf(fp,"NULL");
+   else
+      fprintf(fp,"&P%d_%lu[%lu]",ConstructCompilerData(theEnv)->ImageID,
+                                  (funcPtr->bsaveIndex / ConstructCompilerData(theEnv)->MaxIndices) + 1,
+                                   funcPtr->bsaveIndex % ConstructCompilerData(theEnv)->MaxIndices);
+  }
+
+/******************************************/
+/* WriteInitializationFunction: Generates */
+/*   the C initialization function for    */
+/*   this constructs-to-c module.         */
+/******************************************/
+static bool WriteInitializationFunction(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer)
+  {
+   FILE *fp;
+   struct CodeGeneratorItem *cgPtr;
+
+   /*===============================*/
+   /* Open the initialization file. */
+   /*===============================*/
+
+   gensprintf(fileNameBuffer,"%s%s.c",pathName,fileName);
+   if ((fp = GenOpen(theEnv,fileNameBuffer,"w")) == NULL)
+     {
+      OpenErrorMessage(theEnv,"constructs-to-c",fileNameBuffer);
+      return false;
+     }
+
+   /*=====================================*/
+   /* Write out #includes and prototypes. */
+   /*=====================================*/
+
+   fprintf(fp,"#include \"%s.h\"\n",fileName);
+   fprintf(fp,"\n");
+   fprintf(fp,"#include \"utility.h\"\n");
+   fprintf(fp,"#include \"generate.h\"\n");
+   fprintf(fp,"#include \"envrnmnt.h\"\n");
+   fprintf(fp,"#include \"expressn.h\"\n");
+   fprintf(fp,"#include \"extnfunc.h\"\n");
+   fprintf(fp,"#include \"objrtmch.h\"\n");
+   fprintf(fp,"#include \"rulebld.h\"\n\n");
+
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"   Environment *InitCImage_%d(void);\n",ConstructCompilerData(theEnv)->ImageID);
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"   void FixupCImage_%d(Environment *);\n",ConstructCompilerData(theEnv)->ImageID);
+
+   /*============================================*/
+   /* Begin writing the initialization function. */
+   /*============================================*/
+
+   fprintf(fp,"\n");
+   fprintf(fp,"/*******************************************/\n");
+   fprintf(fp,"/* CONSTRUCT IMAGE INITIALIZATION FUNCTION */\n");
+   fprintf(fp,"/*******************************************/\n");
+
+   fprintf(fp,"\nEnvironment *InitCImage_%d()\n",ConstructCompilerData(theEnv)->ImageID);
+   fprintf(fp,"  {\n");
+   fprintf(fp,"   static Environment *theEnv = NULL;\n\n");
+   fprintf(fp,"   if (theEnv != NULL) return NULL;\n\n");
+   fprintf(fp,"   theEnv = CreateRuntimeEnvironment(sht%d,fht%d,iht%d,bmht%d,P%d_1);\n\n",
+           ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->ImageID,
+           ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->ImageID,
+           ConstructCompilerData(theEnv)->ImageID);
+
+   fprintf(fp,"   Clear(theEnv);\n");
+
+   fprintf(fp,"   RefreshSpecialSymbols(theEnv);\n");
+   fprintf(fp,"   InitExpressionPointers(theEnv);\n");
+   fprintf(fp,"   FixupCImage_%d(theEnv);\n\n",ConstructCompilerData(theEnv)->ImageID);
+
+   /*==========================================*/
+   /* Write construct specific initialization. */
+   /*==========================================*/
+
+   cgPtr = ConstructCompilerData(theEnv)->ListOfCodeGeneratorItems;
+   while (cgPtr != NULL)
+     {
+      if (cgPtr->initFunction != NULL)
+        {
+         (*cgPtr->initFunction)(theEnv,fp,ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->MaxIndices);
+         fprintf(fp,"\n");
+        }
+      cgPtr = cgPtr->next;
+     }
+
+   /*================================*/
+   /* Close the initialization file. */
+   /*================================*/
+
+   fprintf(fp,"   return(theEnv);\n");
+   fprintf(fp,"  }\n");
+
+   GenClose(theEnv,fp);
+
+   /*========================================*/
+   /* Return true to indicate initialization */
+   /* file was successfully written.         */
+   /*========================================*/
+
+   return true;
+  }
+
+/**************************************************/
+/* NewCFile: Opens a new file for writing C code. */
+/**************************************************/
+FILE *NewCFile(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned id,
+  unsigned version,
+  bool reopenOldFile)
+  {
+   FILE *newFP;
+
+   gensprintf(fileNameBuffer,"%s%s%d_%d.c",pathName,fileName,id,version);
+
+   if (reopenOldFile)
+     { newFP = GenOpen(theEnv,fileNameBuffer,"a"); }
+   else
+     { newFP = GenOpen(theEnv,fileNameBuffer,"w"); }
+
+   if (newFP == NULL)
+     {
+      OpenErrorMessage(theEnv,"constructs-to-c",fileNameBuffer);
+      return NULL;
+     }
+
+   if (reopenOldFile == false)
+     {
+      fprintf(newFP,"#include \"%s.h\"\n",fileName);
+      fprintf(newFP,"\n");
+     }
+
+   return(newFP);
+  }
+
+/**********************************************************/
+/* HashedExpressionsToCode: Traverses the expression hash */
+/*   table and calls ExpressionToCode to write the C      */
+/*   code representation to a file of every expression in */
+/*   the table.                                           */
+/**********************************************************/
+static void HashedExpressionsToCode(
+  Environment *theEnv)
+  {
+   unsigned i;
+   EXPRESSION_HN *exphash;
+
+   for (i = 0; i < EXPRESSION_HASH_SIZE; i++)
+     {
+      for (exphash = ExpressionData(theEnv)->ExpressionHashTable[i];
+           exphash != NULL;
+           exphash = exphash->next)
+        {
+         exphash->bsaveID = ConstructCompilerData(theEnv)->ExpressionCount + (ConstructCompilerData(theEnv)->MaxIndices * ConstructCompilerData(theEnv)->ExpressionVersion);
+         ExpressionToCode(theEnv,NULL,exphash->exp);
+        }
+     }
+  }
+
+/*****************************************************/
+/* PrintHashedExpressionReference: Writes the C code */
+/*   representation of a pointer to an expression    */
+/*   stored in the expression hash table.            */
+/*****************************************************/
+void PrintHashedExpressionReference(
+  Environment *theEnv,
+  FILE *theFile,
+  struct expr *theExpression,
+  unsigned imageID,
+  unsigned maxIndices)
+  {
+   unsigned long theIDValue;
+
+   if (theExpression == NULL)
+     { fprintf(theFile,"NULL"); }
+   else
+     {
+      theIDValue = HashedExpressionIndex(theEnv,theExpression);
+
+      fprintf(theFile,"&E%d_%ld[%ld]",
+                      imageID,
+                      theIDValue / maxIndices,
+                      theIDValue % maxIndices);
+     }
+  }
+
+/**************************************************************/
+/* ExpressionToCode: Writes the C code reference of a pointer */
+/*   to an expression and then calls DumpExpression to write  */
+/*   the C code for the expression to the expression file.    */
+/**************************************************************/
+int ExpressionToCode(
+  Environment *theEnv,
+  FILE *fp,
+  struct expr *exprPtr)
+  {
+   /*========================================*/
+   /* Print the reference to the expression. */
+   /*========================================*/
+
+   if (exprPtr == NULL)
+     {
+      if (fp != NULL) fprintf(fp,"NULL");
+      return 0;
+     }
+   else if (fp != NULL)
+     { fprintf(fp,"&E%d_%d[%ld]",ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->ExpressionVersion,ConstructCompilerData(theEnv)->ExpressionCount); }
+
+   /*==================================================*/
+   /* Create a new expression code file, if necessary. */
+   /*==================================================*/
+
+   if (ConstructCompilerData(theEnv)->ExpressionHeader == true)
+     {
+      if ((ConstructCompilerData(theEnv)->ExpressionFP = NewCFile(theEnv,ConstructCompilerData(theEnv)->FilePrefix,
+                                                                  ConstructCompilerData(theEnv)->PathName,
+                                                                  ConstructCompilerData(theEnv)->FileNameBuffer,
+                                                                  3,ConstructCompilerData(theEnv)->ExpressionVersion,false)) == NULL)
+        { return(-1); }
+
+      fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"struct expr E%d_%d[] = {\n",ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->ExpressionVersion);
+      fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern struct expr E%d_%d[];\n",ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->ExpressionVersion);
+      ConstructCompilerData(theEnv)->ExpressionHeader = false;
+     }
+   else
+     { fprintf(ConstructCompilerData(theEnv)->ExpressionFP,",\n"); }
+
+   /*===========================*/
+   /* Dump the expression code. */
+   /*===========================*/
+
+   DumpExpression(theEnv,exprPtr);
+
+   /*=========================================*/
+   /* Close the expression file if necessary. */
+   /*=========================================*/
+
+   if (ConstructCompilerData(theEnv)->ExpressionCount >= ConstructCompilerData(theEnv)->MaxIndices)
+     {
+      ConstructCompilerData(theEnv)->ExpressionCount = 0;
+      ConstructCompilerData(theEnv)->ExpressionVersion++;
+      fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"};\n");
+      GenClose(theEnv,ConstructCompilerData(theEnv)->ExpressionFP);
+      ConstructCompilerData(theEnv)->ExpressionFP = NULL;
+      ConstructCompilerData(theEnv)->ExpressionHeader = true;
+     }
+
+   /*==========================================*/
+   /* Return 1 to indicate the expression      */
+   /* reference and expression data structures */
+   /* were succcessfully written to the file.  */
+   /*==========================================*/
+
+   return 1;
+  }
+
+/**********************************************************/
+/* DumpExpression: Writes the C code representation of an */
+/*   expression data structure to the expression file.    */
+/**********************************************************/
+static void DumpExpression(
+  Environment *theEnv,
+  struct expr *exprPtr)
+  {
+   while (exprPtr != NULL)
+     {
+      fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"{");
+      fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"%d,",exprPtr->type);
+      fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"{ ");
+      switch (exprPtr->type)
+        {
+         case FCALL:
+           PrintFunctionReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,exprPtr->functionValue);
+           break;
+
+         case INTEGER_TYPE:
+           PrintIntegerReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,exprPtr->integerValue);
+           break;
+
+         case FLOAT_TYPE:
+           PrintFloatReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,exprPtr->floatValue);
+           break;
+
+         case PCALL:
+#if DEFFUNCTION_CONSTRUCT
+           PrintDeffunctionReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,(Deffunction *) exprPtr->value,
+                                     ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->MaxIndices);
+#else
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+#endif
+           break;
+
+         case GCALL:
+#if DEFGENERIC_CONSTRUCT
+           PrintGenericFunctionReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,(Defgeneric *) exprPtr->value,
+                                         ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->MaxIndices);
+#else
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+#endif
+           break;
+
+         case DEFTEMPLATE_PTR:
+#if DEFTEMPLATE_CONSTRUCT
+           DeftemplateCConstructReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,
+                                          (Deftemplate *) exprPtr->value,ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->MaxIndices);
+#else
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+#endif
+           break;
+
+         case DEFGLOBAL_PTR:
+#if DEFGLOBAL_CONSTRUCT
+           DefglobalCConstructReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,
+                                        (Defglobal *) exprPtr->value,ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->MaxIndices);
+#else
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+#endif
+           break;
+
+         case DEFCLASS_PTR:
+#if OBJECT_SYSTEM
+           PrintClassReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,
+                               (Defclass *) exprPtr->value,ConstructCompilerData(theEnv)->ImageID,
+                               ConstructCompilerData(theEnv)->MaxIndices);
+#else
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+#endif
+           break;
+
+          case FACT_ADDRESS_TYPE:
+#if DEFTEMPLATE_CONSTRUCT
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+           fprintf(ConstructCompilerData(theEnv)->FixupFP,
+                   "   E%d_%d[%ld].value = &FactData(theEnv)->DummyFact;\n",
+                   ConstructCompilerData(theEnv)->ImageID,
+                   ConstructCompilerData(theEnv)->ExpressionVersion,
+                   ConstructCompilerData(theEnv)->ExpressionCount);
+#else
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+#endif
+           break;
+
+         case INSTANCE_ADDRESS_TYPE:
+#if OBJECT_SYSTEM
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+           fprintf(ConstructCompilerData(theEnv)->FixupFP,
+                   "   E%d_%d[%ld].value = &InstanceData(theEnv)->DummyInstance;\n",
+                   ConstructCompilerData(theEnv)->ImageID,
+                   ConstructCompilerData(theEnv)->ExpressionVersion,
+                   ConstructCompilerData(theEnv)->ExpressionCount);
+#else
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+#endif
+           break;
+
+         case STRING_TYPE:
+         case SYMBOL_TYPE:
+         case INSTANCE_NAME_TYPE:
+         case GBL_VARIABLE:
+           PrintSymbolReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,exprPtr->lexemeValue);
+           break;
+
+         case VOID_TYPE:
+           fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL");
+           break;
+
+         default:
+           if (EvaluationData(theEnv)->PrimitivesArray[exprPtr->type] == NULL)
+             { fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL"); }
+           else if (EvaluationData(theEnv)->PrimitivesArray[exprPtr->type]->bitMap)
+             { PrintBitMapReference(theEnv,ConstructCompilerData(theEnv)->ExpressionFP,(CLIPSBitMap *) exprPtr->value); }
+           else
+             { fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL"); }
+           break;
+        }
+
+      fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"},");
+
+      ConstructCompilerData(theEnv)->ExpressionCount++;
+      if (exprPtr->argList == NULL)
+        { fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL,"); }
+      else
+        {
+         fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"&E%d_%d[%ld],",ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->ExpressionVersion,
+                                                       ConstructCompilerData(theEnv)->ExpressionCount);
+        }
+
+      if (exprPtr->nextArg == NULL)
+        { fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"NULL}"); }
+      else
+        {
+         fprintf(ConstructCompilerData(theEnv)->ExpressionFP,"&E%d_%d[%ld]}",ConstructCompilerData(theEnv)->ImageID,ConstructCompilerData(theEnv)->ExpressionVersion,
+                              ConstructCompilerData(theEnv)->ExpressionCount + ExpressionSize(exprPtr->argList));
+        }
+
+      if (exprPtr->argList != NULL)
+        {
+         fprintf(ConstructCompilerData(theEnv)->ExpressionFP,",\n");
+         DumpExpression(theEnv,exprPtr->argList);
+        }
+
+      exprPtr = exprPtr->nextArg;
+      if (exprPtr != NULL) fprintf(ConstructCompilerData(theEnv)->ExpressionFP,",\n");
+     }
+  }
+
+/***********************************************/
+/* ConstructsToCCommandDefinition: Initializes */
+/*   the constructs-to-c command.              */
+/***********************************************/
+void ConstructsToCCommandDefinition(
+  Environment *theEnv)
+  {
+   AddUDF(theEnv,"constructs-to-c","v",2,4,"*;sy;l;sy;l",ConstructsToCCommand,"ConstructsToCCommand",NULL);
+  }
+
+/*********************************************************/
+/* AddCodeGeneratorItem: Adds another code generator     */
+/*   item to the list of items for which code is         */
+/*   generated bythe constructs-to-c function. Typically */
+/*   each construct has its own code generator item.     */
+/*********************************************************/
+struct CodeGeneratorItem *AddCodeGeneratorItem(
+  Environment *theEnv,
+  const char *name,
+  int priority,
+  void (*beforeFunction)(Environment *),
+  void (*initFunction)(Environment *,FILE *,unsigned,unsigned),
+  bool (*generateFunction)(Environment *,const char *,const char *,char *,
+                           unsigned int,FILE *,unsigned int,unsigned int),
+  unsigned arrayCount)
+  {
+   struct CodeGeneratorItem *newPtr, *currentPtr, *lastPtr = NULL;
+   unsigned int i;
+   char theBuffer[4];
+
+   /*======================================*/
+   /* Create the code generator item data  */
+   /* structure and initialize its values. */
+   /*======================================*/
+
+   newPtr = get_struct(theEnv,CodeGeneratorItem);
+
+   newPtr->name = name;
+   newPtr->beforeFunction = beforeFunction;
+   newPtr->initFunction = initFunction;
+   newPtr->generateFunction = generateFunction;
+   newPtr->priority = priority;
+   newPtr->arrayCount = arrayCount;
+
+   /*================================================*/
+   /* Create the primary and secondary codes used to */
+   /* provide names for the C data structure arrays. */
+   /* (The maximum number of arrays is currently     */
+   /* limited to 47.                                 */
+   /*================================================*/
+
+   if (arrayCount != 0)
+     {
+      if ((arrayCount + ConstructCompilerData(theEnv)->CodeGeneratorCount) > (PRIMARY_LEN + SECONDARY_LEN))
+        {
+         SystemError(theEnv,"CONSCOMP",3);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+
+      newPtr->arrayNames = (char **) gm2(theEnv,(sizeof(char *) * arrayCount));
+
+      for (i = 0 ; i < arrayCount ; i++)
+        {
+         if (ConstructCompilerData(theEnv)->CodeGeneratorCount < PRIMARY_LEN)
+           { gensprintf(theBuffer,"%c",PRIMARY_CODES[ConstructCompilerData(theEnv)->CodeGeneratorCount]); }
+         else
+           { gensprintf(theBuffer,"%s_",SecondaryCodes[ConstructCompilerData(theEnv)->CodeGeneratorCount - PRIMARY_LEN]); }
+         ConstructCompilerData(theEnv)->CodeGeneratorCount++;
+         newPtr->arrayNames[i] = (char *) gm2(theEnv,(strlen(theBuffer) + 1));
+         genstrcpy(newPtr->arrayNames[i],theBuffer);
+        }
+     }
+   else
+     { newPtr->arrayNames = NULL; }
+
+   /*===========================================*/
+   /* Add the new item in the appropriate place */
+   /* in the code generator item list.          */
+   /*===========================================*/
+
+   if (ConstructCompilerData(theEnv)->ListOfCodeGeneratorItems == NULL)
+     {
+      newPtr->next = NULL;
+      ConstructCompilerData(theEnv)->ListOfCodeGeneratorItems = newPtr;
+      return(newPtr);
+     }
+
+   currentPtr = ConstructCompilerData(theEnv)->ListOfCodeGeneratorItems;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = ConstructCompilerData(theEnv)->ListOfCodeGeneratorItems;
+      ConstructCompilerData(theEnv)->ListOfCodeGeneratorItems = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   /*=========================*/
+   /* Return a pointer to the */
+   /* code generator item.    */
+   /*=========================*/
+
+   return(newPtr);
+  }
+
+/************************************************************/
+/* CloseFileIfNeeded: Determines if a C file to which data  */
+/*   structures have been written should be closed. The     */
+/*   file is closed either when all data structures of      */
+/*   that specific type are written to files or the maximum */
+/*   number of array entries for a single file has been     */
+/*   exceeded.                                              */
+/************************************************************/
+FILE *CloseFileIfNeeded(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned int *theCount,
+  unsigned int *arrayVersion,
+  unsigned int maxIndices,
+  bool *canBeReopened,
+  struct CodeGeneratorFile *codeFile)
+  {
+   /*==========================================*/
+   /* If the maximum number of entries for the */
+   /* file hasn't been exceeded, then...       */
+   /*==========================================*/
+
+   if (*theCount < maxIndices)
+     {
+      /*====================================*/
+      /* If the file can be reopened later, */
+      /* close it. Otherwise, keep it open. */
+      /*====================================*/
+
+      if (canBeReopened != NULL)
+        {
+         *canBeReopened = true;
+         GenClose(theEnv,theFile);
+         return NULL;
+        }
+
+      return theFile;
+     }
+
+   /*===========================================*/
+   /* Otherwise, the number of entries allowed  */
+   /* in a file has been reached. Indicate that */
+   /* the file can't be reopened.               */
+   /*===========================================*/
+
+   if (canBeReopened != NULL)
+     { *canBeReopened = false; }
+
+   /*===============================================*/
+   /* If the file is closed, then we need to reopen */
+   /* it to print the final closing right brace.    */
+   /*===============================================*/
+
+   if (theFile == NULL)
+     {
+      if ((canBeReopened == NULL) || (codeFile == NULL))
+        {
+         SystemError(theEnv,"CONSCOMP",4);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+
+      if (codeFile->filePrefix == NULL)
+        { return NULL; }
+
+      theFile = NewCFile(theEnv,codeFile->filePrefix,codeFile->pathName,
+                         codeFile->fileNameBuffer,
+                         codeFile->id,codeFile->version,true);
+      if (theFile == NULL)
+        {
+         SystemError(theEnv,"CONSCOMP",5);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+     }
+
+   /*================================*/
+   /* Print the final closing brace. */
+   /*================================*/
+
+   fprintf(theFile,"};\n");
+   GenClose(theEnv,theFile);
+
+   /*============================================*/
+   /* Update index values for subsequent writing */
+   /* of data structures to files.               */
+   /*============================================*/
+
+   *theCount = 0;
+   (*arrayVersion)++;
+
+   /*=========================*/
+   /* Return NULL to indicate */
+   /* the file is closed.     */
+   /*=========================*/
+
+   return NULL;
+  }
+
+/**************************************************************/
+/* OpenFileIfNeeded: Determines if a C file to which data  */
+/*   structures have been written should be closed. The     */
+/*   file is closed either when all data structures of      */
+/*   that specific type are written to files or the maximum */
+/*   number of array entries for a single file has been     */
+/*   exceeded.                                              */
+/******************************************************************/
+FILE *OpenFileIfNeeded(
+  Environment *theEnv,
+  FILE *theFile,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned fileID,
+  unsigned int imageID,
+  unsigned *fileCount,
+  unsigned int arrayVersion,
+  FILE *headerFP,
+  const char *structureName,
+  char *structPrefix,
+  bool reopenOldFile,
+  struct CodeGeneratorFile *codeFile)
+  {
+   char arrayName[80];
+   const char *newName;
+   unsigned int newID, newVersion;
+
+   /*===========================================*/
+   /* If a file is being reopened, use the same */
+   /* version number, name, and ID as before.   */
+   /*===========================================*/
+
+   if (reopenOldFile)
+     {
+      if (codeFile == NULL)
+        {
+         SystemError(theEnv,"CONSCOMP",6);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+
+      newName = codeFile->filePrefix;
+      newID = codeFile->id;
+      newVersion = codeFile->version;
+     }
+
+   /*=====================================================*/
+   /* Otherwise, use the specified version number, name,  */
+   /* and ID. If the appropriate argument is supplied,    */
+   /* remember these values for later reopening the file. */
+   /*=====================================================*/
+
+   else
+     {
+      newName = fileName;
+      newVersion = *fileCount;
+      newID = fileID;
+
+      if (codeFile != NULL)
+        {
+         codeFile->version = newVersion;
+         codeFile->filePrefix = newName;
+         codeFile->id = newID;
+        }
+     }
+
+   /*=========================================*/
+   /* If the file is already open, return it. */
+   /*=========================================*/
+
+   if (theFile != NULL)
+     {
+      fprintf(theFile,",\n");
+      return(theFile);
+     }
+
+   /*================*/
+   /* Open the file. */
+   /*================*/
+
+   if ((theFile = NewCFile(theEnv,newName,pathName,fileNameBuffer,newID,newVersion,reopenOldFile)) == NULL)
+     { return NULL; }
+
+   /*=========================================*/
+   /* If this is the first time the file has  */
+   /* been opened, write out the beginning of */
+   /* the array variable definition.          */
+   /*=========================================*/
+
+   if (reopenOldFile == false)
+     {
+      (*fileCount)++;
+      gensprintf(arrayName,"%s%d_%d",structPrefix,imageID,arrayVersion);
+      fprintf(theFile,"%s %s[] = {\n",structureName,arrayName);
+      fprintf(headerFP,"extern %s %s[];\n",structureName,arrayName);
+     }
+   else
+     { fprintf(theFile,",\n"); }
+
+   /*==================*/
+   /* Return the file. */
+   /*==================*/
+
+   return(theFile);
+  }
+
+/*************************************************/
+/* MarkConstructBsaveIDs: Mark all occurences of */
+/*  a specific construct with a unique ID.       */
+/*************************************************/
+void MarkConstructBsaveIDs(
+  Environment *theEnv,
+  unsigned int constructModuleIndex)
+  {
+   long theCount = 0;
+
+   DoForAllConstructs(theEnv,MarkConstruct,constructModuleIndex,false,&theCount);
+  }
+
+/*************************************************************/
+/* MarkConstruct: Sets the bsaveID for a specific construct. */
+/*  Used with the MarkConstructBsaveIDs function to mark all */
+/*  occurences of a specific construct with a unique ID.     */
+/*************************************************************/
+static void MarkConstruct(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *vTheBuffer)
+  {
+   unsigned long *count = (unsigned long *) vTheBuffer;
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   theConstruct->bsaveID = (*count)++;
+  }
+
+/***********************************************************/
+/* ConstructHeaderToCode: Writes the C code representation */
+/*   of a single construct header to the specified file.   */
+/***********************************************************/
+void ConstructHeaderToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  ConstructHeader *theConstruct,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount,
+  const char *constructModulePrefix,
+  const char *constructPrefix)
+  {
+   /*================*/
+   /* Construct Name */
+   /*================*/
+
+   fprintf(theFile,"{");
+   
+   switch (theConstruct->constructType)
+     {
+      case DEFMODULE:
+        fprintf(theFile,"DEFMODULE,");
+        break;
+      case DEFRULE:
+        fprintf(theFile,"DEFRULE,");
+        break;
+      case DEFTEMPLATE:
+        fprintf(theFile,"DEFTEMPLATE,");
+        break;
+      case DEFFACTS:
+        fprintf(theFile,"DEFFACTS,");
+        break;
+      case DEFGLOBAL:
+        fprintf(theFile,"DEFGLOBAL,");
+        break;
+      case DEFFUNCTION:
+        fprintf(theFile,"DEFFUNCTION,");
+        break;
+      case DEFGENERIC:
+        fprintf(theFile,"DEFGENERIC,");
+        break;
+      case DEFMETHOD:
+        fprintf(theFile,"DEFMETHOD,");
+        break;
+      case DEFCLASS:
+        fprintf(theFile,"DEFCLASS,");
+        break;
+      case DEFMESSAGE_HANDLER:
+        fprintf(theFile,"DEFMESSAGE_HANDLER,");
+        break;
+      case DEFINSTANCES:
+        fprintf(theFile,"DEFINSTANCES,");
+        break;
+     }
+
+   PrintSymbolReference(theEnv,theFile,theConstruct->name);
+
+   /*===================*/
+   /* Pretty Print Form */
+   /*===================*/
+
+   fprintf(theFile,",NULL,");
+
+   /*==================*/
+   /* Construct Module */
+   /*==================*/
+
+   if (theConstruct->whichModule != NULL)
+     {
+      fprintf(theFile,"MIHS &%s%d_%d[%d],",
+                      constructModulePrefix,
+                      imageID,
+                      (moduleCount / maxIndices) + 1,
+                      moduleCount % maxIndices);
+     }
+   else
+     { fprintf(theFile,"NULL,"); }
+
+   /*==========*/
+   /* Bsave ID */
+   /*==========*/
+
+   fprintf(theFile,"0,");
+
+   /*================*/
+   /* Next Construct */
+   /*================*/
+
+   if (theConstruct->next == NULL)
+     { fprintf(theFile,"NULL}"); }
+   else
+     {
+      fprintf(theFile,"CHS &%s%d_%ld[%ld]}",
+                      constructPrefix,
+                      imageID,
+                      (theConstruct->next->bsaveID / maxIndices) + 1,
+                      theConstruct->next->bsaveID % maxIndices);
+     }
+  }
+
+/***********************************************************/
+/* ConstructModuleToCode: Writes the C code representation */
+/*   of a single construct module to the specified file.   */
+/***********************************************************/
+void ConstructModuleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int constructIndex,
+  const char *constructPrefix)
+  {
+   struct defmoduleItemHeader *theModuleItem;
+
+   /*======================*/
+   /* Associated Defmodule */
+   /*======================*/
+
+   fprintf(theFile,"{");
+
+   theModuleItem = (struct defmoduleItemHeader *)
+                   GetModuleItem(theEnv,theModule,constructIndex);
+
+   PrintDefmoduleReference(theEnv,theFile,theModule);
+
+   fprintf(theFile,",");
+
+   /*=============================*/
+   /* First Construct Module Item */
+   /*=============================*/
+
+   if (theModuleItem->firstItem == NULL) fprintf(theFile,"NULL,");
+   else fprintf(theFile,"CHS &%s%d_%ld[%ld],",
+                        constructPrefix,
+                        imageID,
+                        (theModuleItem->firstItem->bsaveID / maxIndices) + 1,
+                        theModuleItem->firstItem->bsaveID % maxIndices);
+
+   /*============================*/
+   /* Last Construct Module Item */
+   /*============================*/
+
+   if (theModuleItem->lastItem == NULL) fprintf(theFile,"NULL");
+   else fprintf(theFile,"CHS &%s%d_%ld[%ld]",
+                        constructPrefix,
+                        imageID,
+                        (theModuleItem->lastItem->bsaveID / maxIndices) + 1,
+                        theModuleItem->lastItem->bsaveID % maxIndices);
+
+   fprintf(theFile,"}");
+  }
+
+#else /* CONSTRUCT_COMPILER && (! RUN_TIME) */
+
+   void                               ConstructsToCCommand(Environment *,UDFContext *,UDFValue *);
+
+/************************************/
+/* ConstructsToCCommand: Definition */
+/*   for rule compiler stub.        */
+/************************************/
+void ConstructsToCCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+  }
+
+#endif /* CONSTRUCT_COMPILER && (! RUN_TIME) */
diff --git a/clips/conscomp.h b/clips/conscomp.h
new file mode 100755
index 000000000..f080e24c9
--- /dev/null
+++ b/clips/conscomp.h
@@ -0,0 +1,150 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*           CONSTRUCT COMPILER HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Modifications to use the system constant       */
+/*            FILENAME_MAX to check file name lengths.       */
+/*            DR0856                                         */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Used EnvClear rather than Clear in             */
+/*            InitCImage initialization code.                */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Removed SHORT_LINK_NAMES code as this option   */
+/*            is no longer supported.                        */
+/*                                                           */
+/*            Support for run-time programs directly passing */
+/*            the hash tables for initialization.            */
+/*                                                           */
+/*      6.30: Added path name argument to constructs-to-c.   */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW, MAC_MCW, */
+/*            IBM_TBC, IBM_MSC, IBM_ICB, IBM_ZTC, and        */
+/*            IBM_SC).                                       */
+/*                                                           */
+/*            Use genstrcpy instead of strcpy.               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_conscomp
+
+#pragma once
+
+#define _H_conscomp
+
+#define ArbitraryPrefix(codeItem,i)    (codeItem)->arrayNames[(i)]
+
+#define ModulePrefix(codeItem)         (codeItem)->arrayNames[0]
+#define ConstructPrefix(codeItem)      (codeItem)->arrayNames[1]
+
+#include <stdio.h>
+
+#include "constrct.h"
+#include "extnfunc.h"
+#include "symblcmp.h"
+#include "moduldef.h"
+
+#define CONSTRUCT_COMPILER_DATA 41
+
+struct CodeGeneratorItem
+  {
+   const char *name;
+   void (*beforeFunction)(Environment *);
+   void (*initFunction)(Environment *,FILE *,unsigned,unsigned);
+   bool (*generateFunction)(Environment *,const char *,const char *,char *,
+                            unsigned int,FILE *,unsigned int,unsigned int);
+   int priority;
+   char **arrayNames;
+   unsigned int arrayCount;
+   struct CodeGeneratorItem *next;
+  };
+
+struct constructCompilerData
+  {
+   unsigned ImageID;
+   FILE *HeaderFP;
+   unsigned MaxIndices;
+   FILE *ExpressionFP;
+   FILE *FixupFP;
+   const char *FilePrefix;
+   const char *PathName;
+   char *FileNameBuffer;
+   bool ExpressionHeader;
+   unsigned long ExpressionCount;
+   unsigned ExpressionVersion;
+   unsigned CodeGeneratorCount;
+   struct CodeGeneratorItem *ListOfCodeGeneratorItems;
+  };
+
+#define ConstructCompilerData(theEnv) ((struct constructCompilerData *) GetEnvironmentData(theEnv,CONSTRUCT_COMPILER_DATA))
+
+struct CodeGeneratorFile
+ {
+  const char *filePrefix;
+  const char *pathName;
+  char *fileNameBuffer;
+  unsigned int id;
+  unsigned int version;
+ };
+
+   void                      InitializeConstructCompilerData(Environment *);
+   void                      ConstructsToCCommandDefinition(Environment *);
+   FILE                     *NewCFile(Environment *,const char *,const char *,char *,unsigned,unsigned,bool);
+   int                       ExpressionToCode(Environment *,FILE *,struct expr *);
+   void                      PrintFunctionReference(Environment *,FILE *,struct functionDefinition *);
+   struct CodeGeneratorItem *AddCodeGeneratorItem(Environment *,const char *,int,
+                                                  void (*)(Environment *),
+                                                  void (*)(Environment *,FILE *,unsigned,unsigned),
+                                                  bool (*)(Environment *,const char *,const char *,char *,
+                                                           unsigned int,FILE *,unsigned int,unsigned int),
+                                                  unsigned);
+   FILE                     *CloseFileIfNeeded(Environment *,FILE *,unsigned int *,unsigned int *,unsigned int,
+                                               bool *,struct CodeGeneratorFile *);
+   FILE                     *OpenFileIfNeeded(Environment *,FILE *,const char *,const char *,char *,unsigned int,
+                                              unsigned int,unsigned int *,unsigned int,FILE *,const char *,char *,bool,struct CodeGeneratorFile *);
+   void                      MarkConstructBsaveIDs(Environment *,unsigned int);
+   void                      ConstructHeaderToCode(Environment *,FILE *,ConstructHeader *,unsigned int,
+                                                   unsigned int,unsigned int,const char *,const char *);
+   void                      ConstructModuleToCode(Environment *,FILE *,Defmodule *,unsigned int,
+                                                   unsigned int,unsigned int,const char *);
+   void                      PrintHashedExpressionReference(Environment *,FILE *,struct expr *,unsigned,unsigned);
+
+#endif
+
+
+
+
diff --git a/clips/constant.h b/clips/constant.h
new file mode 100755
index 000000000..a4ba59028
--- /dev/null
+++ b/clips/constant.h
@@ -0,0 +1,264 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/21/18             */
+   /*                                                     */
+   /*                CONSTANTS HEADER FILE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Moved default type constants (NO_DEFAULT,      */
+/*            STATIC_DEFAULT, and DYNAMIC_DEFAULT) to        */
+/*            constant.h                                     */
+/*                                                           */
+/*            Added DATA_OBJECT_ARRAY primitive type.        */
+/*                                                           */
+/*            Added NESTED_RHS constant.                     */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed DATA_OBJECT_ARRAY primitive type.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_constant
+
+#pragma once
+
+#define _H_constant
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <limits.h>
+
+#define EXACTLY       0
+#define AT_LEAST      1
+#define NO_MORE_THAN  2
+#define RANGE         3
+
+#define UNBOUNDED    USHRT_MAX
+
+#define LHS           0
+#define RHS           1
+#define NESTED_RHS    2
+#define NEGATIVE      0
+#define POSITIVE      1
+#define EOS        '\0'
+
+#define INSIDE        0
+#define OUTSIDE       1
+
+#define LESS_THAN     0
+#define GREATER_THAN  1
+#define EQUAL         2
+
+typedef enum
+  {
+   LOCAL_SAVE,
+   VISIBLE_SAVE
+  } SaveScope;
+
+typedef enum
+  {
+   NO_DEFAULT,
+   STATIC_DEFAULT,
+   DYNAMIC_DEFAULT
+  } DefaultType;
+  
+typedef enum
+  {
+   PSE_NO_ERROR = 0,
+   PSE_NULL_POINTER_ERROR,
+   PSE_INVALID_TARGET_ERROR,
+   PSE_SLOT_NOT_FOUND_ERROR,
+   PSE_TYPE_ERROR,
+   PSE_RANGE_ERROR,
+   PSE_ALLOWED_VALUES_ERROR,
+   PSE_CARDINALITY_ERROR,
+   PSE_ALLOWED_CLASSES_ERROR,
+   PSE_EVALUATION_ERROR,
+   PSE_RULE_NETWORK_ERROR
+  } PutSlotError;
+
+typedef enum
+  {
+   GSE_NO_ERROR = 0,
+   GSE_NULL_POINTER_ERROR,
+   GSE_INVALID_TARGET_ERROR,
+   GSE_SLOT_NOT_FOUND_ERROR
+  } GetSlotError;
+
+#ifndef APPLICATION_NAME
+#define APPLICATION_NAME "CLIPS"
+#endif
+
+#ifndef COMMAND_PROMPT
+#define COMMAND_PROMPT "CLIPS> "
+#endif
+
+#ifndef VERSION_STRING
+#define VERSION_STRING "6.40"
+#endif
+
+#ifndef CREATION_DATE_STRING
+#define CREATION_DATE_STRING "8/21/18"
+#endif
+
+#ifndef BANNER_STRING
+#define BANNER_STRING "         CLIPS (Cypher Beta 8/21/18)\n"
+#endif
+
+/*************************/
+/* TOKEN AND TYPE VALUES */
+/*************************/
+
+#define OBJECT_TYPE_NAME               "OBJECT"
+#define USER_TYPE_NAME                 "USER"
+#define PRIMITIVE_TYPE_NAME            "PRIMITIVE"
+#define NUMBER_TYPE_NAME               "NUMBER"
+#define INTEGER_TYPE_NAME              "INTEGER"
+#define FLOAT_TYPE_NAME                "FLOAT"
+#define SYMBOL_TYPE_NAME               "SYMBOL"
+#define STRING_TYPE_NAME               "STRING"
+#define MULTIFIELD_TYPE_NAME           "MULTIFIELD"
+#define LEXEME_TYPE_NAME               "LEXEME"
+#define ADDRESS_TYPE_NAME              "ADDRESS"
+#define EXTERNAL_ADDRESS_TYPE_NAME     "EXTERNAL-ADDRESS"
+#define FACT_ADDRESS_TYPE_NAME         "FACT-ADDRESS"
+#define INSTANCE_TYPE_NAME             "INSTANCE"
+#define INSTANCE_NAME_TYPE_NAME        "INSTANCE-NAME"
+#define INSTANCE_ADDRESS_TYPE_NAME     "INSTANCE-ADDRESS"
+
+/*************************************************************************/
+/* The values of these constants should not be changed.  They are set to */
+/* start after the primitive type codes in CONSTANT.H.  These codes are  */
+/* used to let the generic function bsave image be used whether COOL is  */
+/* present or not.                                                       */
+/*************************************************************************/
+
+#define OBJECT_TYPE_CODE                9
+#define PRIMITIVE_TYPE_CODE            10
+#define NUMBER_TYPE_CODE               11
+#define LEXEME_TYPE_CODE               12
+#define ADDRESS_TYPE_CODE              13
+#define INSTANCE_TYPE_CODE             14
+
+typedef enum
+  {
+   FLOAT_BIT = (1 << 0),
+   INTEGER_BIT = (1 << 1),
+   SYMBOL_BIT = (1 << 2),
+   STRING_BIT = (1 << 3),
+   MULTIFIELD_BIT = (1 << 4),
+   EXTERNAL_ADDRESS_BIT = (1 << 5),
+   FACT_ADDRESS_BIT = (1 << 6),
+   INSTANCE_ADDRESS_BIT = (1 << 7),
+   INSTANCE_NAME_BIT = (1 << 8),
+   VOID_BIT = (1 << 9),
+   BOOLEAN_BIT = (1 << 10),
+  } CLIPSType;
+
+#define NUMBER_BITS (INTEGER_BIT | FLOAT_BIT)
+#define LEXEME_BITS (SYMBOL_BIT | STRING_BIT)
+#define ADDRESS_BITS (EXTERNAL_ADDRESS_BIT | FACT_ADDRESS_BIT | INSTANCE_ADDRESS_BIT)
+#define INSTANCE_BITS (INSTANCE_ADDRESS_BIT | INSTANCE_NAME_BIT)
+#define SINGLEFIELD_BITS (NUMBER_BITS | LEXEME_BITS | ADDRESS_BITS | INSTANCE_NAME_BIT)
+#define ANY_TYPE_BITS (VOID_BIT | SINGLEFIELD_BITS | MULTIFIELD_BIT)
+
+/****************************************************/
+/* The first 9 primitive types need to retain their */
+/* values!! Sorted arrays depend on their values!!  */
+/****************************************************/
+
+#define FLOAT_TYPE                      0
+#define INTEGER_TYPE                    1
+#define SYMBOL_TYPE                     2
+#define STRING_TYPE                     3
+#define MULTIFIELD_TYPE                 4
+#define EXTERNAL_ADDRESS_TYPE           5
+#define FACT_ADDRESS_TYPE               6
+#define INSTANCE_ADDRESS_TYPE           7
+#define INSTANCE_NAME_TYPE              8
+
+#define VOID_TYPE                       9
+
+#define BITMAP_TYPE                    11
+
+#define FCALL                          30
+#define GCALL                          31
+#define PCALL                          32
+#define GBL_VARIABLE                   33
+#define MF_GBL_VARIABLE                34
+
+#define SF_VARIABLE                    35
+#define MF_VARIABLE                    36
+#define BITMAPARRAY                    39
+
+#define FACT_PN_CMP1                   50
+#define FACT_JN_CMP1                   51
+#define FACT_JN_CMP2                   52
+#define FACT_SLOT_LENGTH               53
+#define FACT_PN_VAR1                   54
+#define FACT_PN_VAR2                   55
+#define FACT_PN_VAR3                   56
+#define FACT_JN_VAR1                   57
+#define FACT_JN_VAR2                   58
+#define FACT_JN_VAR3                   59
+#define FACT_PN_CONSTANT1              60
+#define FACT_PN_CONSTANT2              61
+#define FACT_STORE_MULTIFIELD          62
+#define DEFTEMPLATE_PTR                63
+
+#define OBJ_GET_SLOT_PNVAR1            70
+#define OBJ_GET_SLOT_PNVAR2            71
+#define OBJ_GET_SLOT_JNVAR1            72
+#define OBJ_GET_SLOT_JNVAR2            73
+#define OBJ_SLOT_LENGTH                74
+#define OBJ_PN_CONSTANT                75
+#define OBJ_PN_CMP1                    76
+#define OBJ_JN_CMP1                    77
+#define OBJ_PN_CMP2                    78
+#define OBJ_JN_CMP2                    79
+#define OBJ_PN_CMP3                    80
+#define OBJ_JN_CMP3                    81
+#define DEFCLASS_PTR                   82
+#define HANDLER_GET                    83
+#define HANDLER_PUT                    84
+
+#define DEFGLOBAL_PTR                  90
+
+#define PROC_PARAM                     95
+#define PROC_WILD_PARAM                96
+#define PROC_GET_BIND                  97
+#define PROC_BIND                      98
+
+#define UNKNOWN_VALUE                 173
+
+#define INTEGER_OR_FLOAT              180
+#define SYMBOL_OR_STRING              181
+#define INSTANCE_OR_INSTANCE_NAME     182
+
+/*************************/
+/* Macintosh Definitions */
+/*************************/
+
+#define CREATOR_STRING "CLIS"
+#define CREATOR_CODE   'CLIS'
+
+#endif
diff --git a/clips/constrct.c b/clips/constrct.c
new file mode 100755
index 000000000..9aab66d7d
--- /dev/null
+++ b/clips/constrct.c
@@ -0,0 +1,1063 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/10/17             */
+   /*                                                     */
+   /*                  CONSTRUCT MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides basic functionality for creating new    */
+/*   types of constructs, saving constructs to a file, and   */
+/*   adding new functionality to the clear and reset         */
+/*   commands.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added code for capturing errors/warnings       */
+/*            (EnvSetParserErrorCallback).                   */
+/*                                                           */
+/*            Fixed issue with save function when multiple   */
+/*            defmodules exist.                              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            Increment/DecrementClearReadyLocks API.        */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*      6.31: Error flags reset before Clear processed when  */
+/*            called from embedded controller.               */
+/*                                                           */
+/*      6.40: Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Modified EnvClear to return completion status. */
+/*                                                           */
+/*            Compilation watch flag defaults to off.        */
+/*                                                           */
+/*            File name/line count displayed for errors      */
+/*            and warnings during load command.              */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "commline.h"
+#include "constant.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "miscfun.h"
+#include "moduldef.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "prcdrfun.h"
+#include "prcdrpsr.h"
+#include "prntutil.h"
+#include "router.h"
+#include "ruledef.h"
+#include "scanner.h"
+#include "sysdep.h"
+#include "utility.h"
+#include "watch.h"
+
+#include "constrct.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                        DeallocateConstructData(Environment *);
+
+/**************************************************/
+/* InitializeConstructData: Allocates environment */
+/*    data for constructs.                        */
+/**************************************************/
+void InitializeConstructData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,CONSTRUCT_DATA,sizeof(struct constructData),DeallocateConstructData);
+  }
+
+/****************************************************/
+/* DeallocateConstructData: Deallocates environment */
+/*    data for constructs.                          */
+/****************************************************/
+static void DeallocateConstructData(
+  Environment *theEnv)
+  {
+   Construct *tmpPtr, *nextPtr;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   DeallocateSaveCallList(theEnv,ConstructData(theEnv)->ListOfSaveFunctions);
+#endif
+   DeallocateVoidCallList(theEnv,ConstructData(theEnv)->ListOfResetFunctions);
+   DeallocateVoidCallList(theEnv,ConstructData(theEnv)->ListOfClearFunctions);
+   DeallocateBoolCallList(theEnv,ConstructData(theEnv)->ListOfClearReadyFunctions);
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   if (ConstructData(theEnv)->ErrorString != NULL)
+     { genfree(theEnv,ConstructData(theEnv)->ErrorString,sizeof(ConstructData(theEnv)->ErrorString) + 1); }
+
+   if (ConstructData(theEnv)->WarningString != NULL)
+     { genfree(theEnv,ConstructData(theEnv)->WarningString,sizeof(ConstructData(theEnv)->WarningString) + 1); }
+
+   ConstructData(theEnv)->ErrorString = NULL;
+   ConstructData(theEnv)->WarningString = NULL;
+
+   SetParsingFileName(theEnv,NULL);
+   SetWarningFileName(theEnv,NULL);
+   SetErrorFileName(theEnv,NULL);
+#endif
+
+   tmpPtr = ConstructData(theEnv)->ListOfConstructs;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      rtn_struct(theEnv,construct,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/***********************************************/
+/* SetParserErrorCallback: Allows the function */
+/*   which is called when a construct parsing  */
+/*    error occurs to be changed.              */
+/***********************************************/
+ParserErrorFunction *SetParserErrorCallback(
+   Environment *theEnv,
+   ParserErrorFunction *functionPtr,
+   void *context)
+  {
+   ParserErrorFunction *tmpPtr;
+
+   tmpPtr = ConstructData(theEnv)->ParserErrorCallback;
+   ConstructData(theEnv)->ParserErrorCallback = functionPtr;
+   ConstructData(theEnv)->ParserErrorContext = context;
+   return tmpPtr;
+  }
+
+/*************************************************/
+/* FindConstruct: Determines whether a construct */
+/*   type is in the ListOfConstructs.            */
+/*************************************************/
+Construct *FindConstruct(
+  Environment *theEnv,
+  const char *name)
+  {
+   Construct *currentPtr;
+
+   for (currentPtr = ConstructData(theEnv)->ListOfConstructs;
+        currentPtr != NULL;
+        currentPtr = currentPtr->next)
+     {
+      if (strcmp(name,currentPtr->constructName) == 0)
+        { return currentPtr; }
+     }
+
+   return NULL;
+  }
+
+/***********************************************************/
+/* RemoveConstruct: Removes a construct and its associated */
+/*   parsing function from the ListOfConstructs. Returns   */
+/*   true if the construct type was removed, otherwise     */
+/*   false.                                                */
+/***********************************************************/
+bool RemoveConstruct(
+  Environment *theEnv,
+  const char *name)
+  {
+   Construct *currentPtr, *lastPtr = NULL;
+
+   for (currentPtr = ConstructData(theEnv)->ListOfConstructs;
+        currentPtr != NULL;
+        currentPtr = currentPtr->next)
+     {
+      if (strcmp(name,currentPtr->constructName) == 0)
+        {
+         if (lastPtr == NULL)
+           { ConstructData(theEnv)->ListOfConstructs = currentPtr->next; }
+         else
+           { lastPtr->next = currentPtr->next; }
+         rtn_struct(theEnv,construct,currentPtr);
+         return true;
+        }
+
+      lastPtr = currentPtr;
+     }
+
+   return false;
+  }
+
+/************************************************/
+/* Save: C access routine for the save command. */
+/************************************************/
+bool Save(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   struct saveCallFunctionItem *saveFunction;
+   FILE *filePtr;
+   Defmodule *defmodulePtr;
+   bool updated = false;
+   bool unvisited = true;
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*=====================*/
+   /* Open the save file. */
+   /*=====================*/
+
+   if ((filePtr = GenOpen(theEnv,fileName,"w")) == NULL)
+     { return false; }
+
+   /*===========================*/
+   /* Bypass the router system. */
+   /*===========================*/
+
+   SetFastSave(theEnv,filePtr);
+
+   /*================================*/
+   /* Mark all modules as unvisited. */
+   /*================================*/
+
+   MarkModulesAsUnvisited(theEnv);
+
+   /*===============================================*/
+   /* Save the constructs. Repeatedly loop over the */
+   /* modules until each module has been save.      */
+   /*===============================================*/
+
+   while (unvisited)
+     {
+      unvisited = false;
+      updated = false;
+
+      for (defmodulePtr = GetNextDefmodule(theEnv,NULL);
+           defmodulePtr != NULL;
+           defmodulePtr = GetNextDefmodule(theEnv,defmodulePtr))
+        {
+         /*=================================================================*/
+         /* We only want to save a module if all of the modules it imports  */
+         /* from have already been saved. Since there can't be circular     */
+         /* dependencies in imported modules, this should save the modules  */
+         /* that don't import anything first and then work back from those. */
+         /*=================================================================*/
+
+         if (defmodulePtr->visitedFlag)
+           { /* Module has already been saved. */ }
+         else if (AllImportedModulesVisited(theEnv,defmodulePtr))
+           {
+            for (saveFunction = ConstructData(theEnv)->ListOfSaveFunctions;
+                 saveFunction != NULL;
+                 saveFunction = saveFunction->next)
+              { (*saveFunction->func)(theEnv,defmodulePtr,(char *) filePtr,saveFunction->context); }
+
+            updated = true;
+            defmodulePtr->visitedFlag = true;
+           }
+         else
+           { unvisited = true; }
+        }
+
+      /*=====================================================================*/
+      /* At least one module should be saved in every pass. If all have been */
+      /* visited/saved, then both flags will be false. If all remaining      */
+      /* unvisited/unsaved modules were visited/saved, then unvisited will   */
+      /* be false and updated will be true. If some, but not all, remaining  */
+      /* unvisited/unsaved modules are visited/saved, then  unvisited will   */
+      /* be true and updated will be true. This leaves the case where there  */
+      /* are remaining unvisited/unsaved modules, but none were              */
+      /* visited/saved: unvisited is true and updated is false.              */
+      /*=====================================================================*/
+
+      if (unvisited && (! updated))
+        {
+         SystemError(theEnv,"CONSTRCT",2);
+         break;
+        }
+     }
+
+   /*======================*/
+   /* Close the save file. */
+   /*======================*/
+
+   GenClose(theEnv,filePtr);
+
+   /*===========================*/
+   /* Remove the router bypass. */
+   /*===========================*/
+
+   SetFastSave(theEnv,NULL);
+
+   /*=========================*/
+   /* Return true to indicate */
+   /* successful completion.  */
+   /*=========================*/
+
+   return true;
+  }
+
+/*******************************************************/
+/* RemoveSaveFunction: Removes a function from the     */
+/*   ListOfSaveFunctions. Returns true if the function */
+/*   was successfully removed, otherwise false.        */
+/*******************************************************/
+bool RemoveSaveFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   ConstructData(theEnv)->ListOfSaveFunctions =
+     RemoveSaveFunctionFromCallList(theEnv,name,ConstructData(theEnv)->ListOfSaveFunctions,&found);
+
+   if (found) return true;
+
+   return false;
+  }
+
+/**********************************/
+/* SetCompilationsWatch: Sets the */
+/*   value of WatchCompilations.  */
+/**********************************/
+void SetCompilationsWatch(
+  Environment *theEnv,
+  bool value)
+  {
+   ConstructData(theEnv)->WatchCompilations = value;
+  }
+
+/*************************************/
+/* GetCompilationsWatch: Returns the */
+/*   value of WatchCompilations.     */
+/*************************************/
+bool GetCompilationsWatch(
+  Environment *theEnv)
+  {
+   return ConstructData(theEnv)->WatchCompilations;
+  }
+
+/**********************************/
+/* SetPrintWhileLoading: Sets the */
+/*   value of PrintWhileLoading.  */
+/**********************************/
+void SetPrintWhileLoading(
+  Environment *theEnv,
+  bool value)
+  {
+   ConstructData(theEnv)->PrintWhileLoading = value;
+  }
+
+/*************************************/
+/* GetPrintWhileLoading: Returns the */
+/*   value of PrintWhileLoading.     */
+/*************************************/
+bool GetPrintWhileLoading(
+  Environment *theEnv)
+  {
+   return(ConstructData(theEnv)->PrintWhileLoading);
+  }
+
+/*******************************/
+/* SetLoadInProgress: Sets the */
+/*   value of LoadInProgress.  */
+/*******************************/
+void SetLoadInProgress(
+  Environment *theEnv,
+  bool value)
+  {
+   ConstructData(theEnv)->LoadInProgress = value;
+  }
+
+/**********************************/
+/* GetLoadInProgress: Returns the */
+/*   value of LoadInProgress.     */
+/**********************************/
+bool GetLoadInProgress(
+  Environment *theEnv)
+  {
+   return(ConstructData(theEnv)->LoadInProgress);
+  }
+
+#endif
+
+/*************************************/
+/* InitializeConstructs: Initializes */
+/*   the Construct Manager.          */
+/*************************************/
+void InitializeConstructs(
+  Environment *theEnv)
+  {
+#if (! RUN_TIME)
+   AddUDF(theEnv,"clear","v",0,0,NULL,ClearCommand,"ClearCommand",NULL);
+   AddUDF(theEnv,"reset","v",0,0,NULL,ResetCommand,"ResetCommand",NULL);
+
+#if DEBUGGING_FUNCTIONS && (! BLOAD_ONLY)
+   AddWatchItem(theEnv,"compilations",0,&ConstructData(theEnv)->WatchCompilations,30,NULL,NULL);
+#endif
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+/**************************************/
+/* ClearCommand: H/L access routine   */
+/*   for the clear command.           */
+/**************************************/
+void ClearCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Clear(theEnv);
+  }
+
+/**************************************/
+/* ResetCommand: H/L access routine   */
+/*   for the reset command.           */
+/**************************************/
+void ResetCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Reset(theEnv);
+  }
+
+/****************************/
+/* Reset: C access routine  */
+/*   for the reset command. */
+/****************************/
+void Reset(
+  Environment *theEnv)
+  {
+   struct voidCallFunctionItem *resetPtr;
+   GCBlock gcb;
+
+   /*=====================================*/
+   /* The reset command can't be executed */
+   /* while a reset is in progress.       */
+   /*=====================================*/
+
+   if (ConstructData(theEnv)->ResetInProgress) return;
+
+   ConstructData(theEnv)->ResetInProgress = true;
+   ConstructData(theEnv)->ResetReadyInProgress = true;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+   SetErrorValue(theEnv,NULL);
+    
+   /*========================================*/
+   /* Set up the frame for tracking garbage. */
+   /*========================================*/
+
+   GCBlockStart(theEnv,&gcb);
+
+   /*=======================================================*/
+   /* Call the before reset function to determine if the    */
+   /* reset should continue. [Used by the some of the       */
+   /* windowed interfaces to query the user whether a       */
+   /* reset should proceed with activations on the agenda.] */
+   /*=======================================================*/
+
+   if ((ConstructData(theEnv)->BeforeResetCallback != NULL) ?
+       ((*ConstructData(theEnv)->BeforeResetCallback)(theEnv) == false) : false)
+     {
+      ConstructData(theEnv)->ResetReadyInProgress = false;
+      ConstructData(theEnv)->ResetInProgress = false;
+      return;
+     }
+   ConstructData(theEnv)->ResetReadyInProgress = false;
+
+   /*===========================*/
+   /* Call each reset function. */
+   /*===========================*/
+
+   for (resetPtr = ConstructData(theEnv)->ListOfResetFunctions;
+        (resetPtr != NULL) && (GetHaltExecution(theEnv) == false);
+        resetPtr = resetPtr->next)
+     { (*resetPtr->func)(theEnv,resetPtr->context); }
+
+   /*============================================*/
+   /* Set the current module to the MAIN module. */
+   /*============================================*/
+
+   SetCurrentModule(theEnv,FindDefmodule(theEnv,"MAIN"));
+
+   /*===========================================*/
+   /* Perform periodic cleanup if the reset was */
+   /* issued from an embedded controller.       */
+   /*===========================================*/
+
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+
+   /*===================================*/
+   /* A reset is no longer in progress. */
+   /*===================================*/
+
+   ConstructData(theEnv)->ResetInProgress = false;
+  }
+
+/************************************/
+/* SetBeforeResetFunction: Sets the */
+/*  value of BeforeResetFunction.   */
+/************************************/
+BeforeResetFunction *SetBeforeResetFunction(
+  Environment *theEnv,
+  BeforeResetFunction *theFunction)
+  {
+   BeforeResetFunction *tempFunction;
+
+   tempFunction = ConstructData(theEnv)->BeforeResetCallback;
+   ConstructData(theEnv)->BeforeResetCallback = theFunction;
+   return tempFunction;
+  }
+
+/*************************************/
+/* AddResetFunction: Adds a function */
+/*   to ListOfResetFunctions.        */
+/*************************************/
+bool AddResetFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunction *functionPtr,
+  int priority,
+  void *context)
+  {
+   ConstructData(theEnv)->ListOfResetFunctions =
+      AddVoidFunctionToCallList(theEnv,name,priority,functionPtr,
+                                ConstructData(theEnv)->ListOfResetFunctions,context);
+   return true;
+  }
+
+/*******************************************/
+/* RemoveResetFunction: Removes a function */
+/*   from the ListOfResetFunctions.        */
+/*******************************************/
+bool RemoveResetFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   ConstructData(theEnv)->ListOfResetFunctions =
+      RemoveVoidFunctionFromCallList(theEnv,name,ConstructData(theEnv)->ListOfResetFunctions,&found);
+
+   return found;
+  }
+
+/****************************************/
+/* IncrementClearReadyLocks: Increments */
+/*   the number of clear ready locks.   */
+/****************************************/
+void IncrementClearReadyLocks(
+  Environment *theEnv)
+  {
+   ConstructData(theEnv)->ClearReadyLocks++;
+  }
+
+/*******************************************/
+/* DecrementClearReadyLocks: Decrements    */
+/*   the number of clear locks.            */
+/*******************************************/
+void DecrementClearReadyLocks(
+  Environment *theEnv)
+  {
+   if (ConstructData(theEnv)->ClearReadyLocks > 0)
+     { ConstructData(theEnv)->ClearReadyLocks--; }
+  }
+
+/**************************************************/
+/* Clear: C access routine for the clear command. */
+/**************************************************/
+bool Clear(
+  Environment *theEnv)
+  {
+   struct voidCallFunctionItem *theFunction;
+   GCBlock gcb;
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+   SetErrorValue(theEnv,NULL);
+   
+   /*===================================*/
+   /* Determine if a clear is possible. */
+   /*===================================*/
+
+   ConstructData(theEnv)->ClearReadyInProgress = true;
+   if ((ConstructData(theEnv)->ClearReadyLocks > 0) ||
+       (ConstructData(theEnv)->DanglingConstructs > 0) ||
+       (ClearReady(theEnv) == false))
+     {
+      PrintErrorID(theEnv,"CONSTRCT",1,false);
+      WriteString(theEnv,STDERR,"Some constructs are still in use. Clear cannot continue.\n");
+      ConstructData(theEnv)->ClearReadyInProgress = false;
+      return false;
+     }
+   ConstructData(theEnv)->ClearReadyInProgress = false;
+
+   /*========================================*/
+   /* Set up the frame for tracking garbage. */
+   /*========================================*/
+   
+   GCBlockStart(theEnv,&gcb);
+
+   /*===========================*/
+   /* Call all clear functions. */
+   /*===========================*/
+
+   ConstructData(theEnv)->ClearInProgress = true;
+
+   for (theFunction = ConstructData(theEnv)->ListOfClearFunctions;
+        theFunction != NULL;
+        theFunction = theFunction->next)
+     { (*theFunction->func)(theEnv,theFunction->context); }
+
+   /*================================*/
+   /* Restore the old garbage frame. */
+   /*================================*/
+   
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+
+   /*===========================*/
+   /* Clear has been completed. */
+   /*===========================*/
+
+   ConstructData(theEnv)->ClearInProgress = false;
+
+#if DEFRULE_CONSTRUCT
+   if ((DefruleData(theEnv)->RightPrimeJoins != NULL) ||
+       (DefruleData(theEnv)->LeftPrimeJoins != NULL))
+     { SystemError(theEnv,"CONSTRCT",1); }
+#endif
+
+   /*============================*/
+   /* Perform reset after clear. */
+   /*============================*/
+
+   Reset(theEnv);
+
+   return true;
+  }
+
+/*********************************************************/
+/* ClearReady: Returns true if a clear can be performed, */
+/*   otherwise false. Note that this is destructively    */
+/*   determined (e.g. facts will be deleted as part of   */
+/*   the determination).                                 */
+/*********************************************************/
+bool ClearReady(
+  Environment *theEnv)
+  {
+   struct boolCallFunctionItem *theFunction;
+
+   for (theFunction = ConstructData(theEnv)->ListOfClearReadyFunctions;
+        theFunction != NULL;
+        theFunction = theFunction->next)
+     {
+      if ((*theFunction->func)(theEnv,theFunction->context) == false)
+        { return false; }
+     }
+
+   return true;
+  }
+
+/******************************************/
+/* AddClearReadyFunction: Adds a function */
+/*   to ListOfClearReadyFunctions.        */
+/******************************************/
+bool AddClearReadyFunction(
+  Environment *theEnv,
+  const char *name,
+  BoolCallFunction *functionPtr,
+  int priority,
+  void *context)
+  {
+   ConstructData(theEnv)->ListOfClearReadyFunctions =
+     AddBoolFunctionToCallList(theEnv,name,priority,functionPtr,
+                               ConstructData(theEnv)->ListOfClearReadyFunctions,context);
+   return true;
+  }
+
+/************************************************/
+/* RemoveClearReadyFunction: Removes a function */
+/*   from the ListOfClearReadyFunctions.        */
+/************************************************/
+bool RemoveClearReadyFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   ConstructData(theEnv)->ListOfClearReadyFunctions =
+      RemoveBoolFunctionFromCallList(theEnv,name,ConstructData(theEnv)->ListOfClearReadyFunctions,&found);
+
+   if (found) return true;
+
+   return false;
+  }
+
+/*************************************/
+/* AddClearFunction: Adds a function */
+/*   to ListOfClearFunctions.        */
+/*************************************/
+bool AddClearFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunction *functionPtr,
+  int priority,
+  void *context)
+  {
+   ConstructData(theEnv)->ListOfClearFunctions =
+      AddVoidFunctionToCallList(theEnv,name,priority,functionPtr,
+                                ConstructData(theEnv)->ListOfClearFunctions,context);
+   return true;
+  }
+
+/*******************************************/
+/* RemoveClearFunction: Removes a function */
+/*    from the ListOfClearFunctions.       */
+/*******************************************/
+bool RemoveClearFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   ConstructData(theEnv)->ListOfClearFunctions =
+     RemoveVoidFunctionFromCallList(theEnv,name,ConstructData(theEnv)->ListOfClearFunctions,&found);
+
+   if (found) return true;
+
+   return false;
+  }
+
+/********************************************/
+/* ExecutingConstruct: Returns true if a    */
+/*   construct is currently being executed, */
+/*   otherwise false.                       */
+/********************************************/
+bool ExecutingConstruct(
+  Environment *theEnv)
+  {
+   return ConstructData(theEnv)->Executing;
+  }
+
+/********************************************/
+/* SetExecutingConstruct: Sets the value of */
+/*   the executing variable indicating that */
+/*   actions such as reset, clear, etc      */
+/*   should not be performed.               */
+/********************************************/
+void SetExecutingConstruct(
+  Environment *theEnv,
+  bool value)
+  {
+   ConstructData(theEnv)->Executing = value;
+  }
+
+/*******************************************************/
+/* DeinstallConstructHeader: Decrements the busy count */
+/*   of a construct name and frees its pretty print    */
+/*   representation string (both of which are stored   */
+/*   in the generic construct header).                 */
+/*******************************************************/
+void DeinstallConstructHeader(
+  Environment *theEnv,
+  ConstructHeader *theHeader)
+  {
+   ReleaseLexeme(theEnv,theHeader->name);
+   if (theHeader->ppForm != NULL)
+     {
+      rm(theEnv,(void *) theHeader->ppForm,
+         sizeof(char) * (strlen(theHeader->ppForm) + 1));
+      theHeader->ppForm = NULL;
+     }
+
+   if (theHeader->usrData != NULL)
+     {
+      ClearUserDataList(theEnv,theHeader->usrData);
+      theHeader->usrData = NULL;
+     }
+  }
+
+/**************************************************/
+/* DestroyConstructHeader: Frees the pretty print */
+/*   representation string and user data (both of */
+/*   which are stored in the generic construct    */
+/*   header).                                     */
+/**************************************************/
+void DestroyConstructHeader(
+  Environment *theEnv,
+  ConstructHeader *theHeader)
+  {
+   if (theHeader->ppForm != NULL)
+     {
+      rm(theEnv,(void *) theHeader->ppForm,
+         sizeof(char) * (strlen(theHeader->ppForm) + 1));
+      theHeader->ppForm = NULL;
+     }
+
+   if (theHeader->usrData != NULL)
+     {
+      ClearUserDataList(theEnv,theHeader->usrData);
+      theHeader->usrData = NULL;
+     }
+  }
+
+/*****************************************************/
+/* AddConstruct: Adds a construct and its associated */
+/*   parsing function to the ListOfConstructs.       */
+/*****************************************************/
+Construct *AddConstruct(
+  Environment *theEnv,
+  const char *name,
+  const char *pluralName,
+  bool (*parseFunction)(Environment *,const char *),
+  FindConstructFunction *findFunction,
+  CLIPSLexeme *(*getConstructNameFunction)(ConstructHeader *),
+  const char *(*getPPFormFunction)(ConstructHeader *),
+  struct defmoduleItemHeader *(*getModuleItemFunction)(ConstructHeader *),
+  GetNextConstructFunction *getNextItemFunction,
+  void (*setNextItemFunction)(ConstructHeader *,ConstructHeader *),
+  IsConstructDeletableFunction *isConstructDeletableFunction,
+  DeleteConstructFunction *deleteFunction,
+  FreeConstructFunction *freeFunction)
+  {
+   Construct *newPtr;
+
+   /*=============================*/
+   /* Allocate and initialize the */
+   /* construct data structure.   */
+   /*=============================*/
+
+   newPtr = get_struct(theEnv,construct);
+
+   newPtr->constructName = name;
+   newPtr->pluralName = pluralName;
+   newPtr->parseFunction = parseFunction;
+   newPtr->findFunction = findFunction;
+   newPtr->getConstructNameFunction = getConstructNameFunction;
+   newPtr->getPPFormFunction = getPPFormFunction;
+   newPtr->getModuleItemFunction = getModuleItemFunction;
+   newPtr->getNextItemFunction = getNextItemFunction;
+   newPtr->setNextItemFunction = setNextItemFunction;
+   newPtr->isConstructDeletableFunction = isConstructDeletableFunction;
+   newPtr->deleteFunction = deleteFunction;
+   newPtr->freeFunction = freeFunction;
+
+   /*===============================*/
+   /* Add the construct to the list */
+   /* of constructs and return it.  */
+   /*===============================*/
+
+   newPtr->next = ConstructData(theEnv)->ListOfConstructs;
+   ConstructData(theEnv)->ListOfConstructs = newPtr;
+   return(newPtr);
+  }
+
+/************************************/
+/* AddSaveFunction: Adds a function */
+/*   to the ListOfSaveFunctions.    */
+/************************************/
+bool AddSaveFunction(
+  Environment *theEnv,
+  const char *name,
+  SaveCallFunction *functionPtr,
+  int priority,
+  void *context)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   ConstructData(theEnv)->ListOfSaveFunctions =
+     AddSaveFunctionToCallList(theEnv,name,priority,
+                           functionPtr,
+                           ConstructData(theEnv)->ListOfSaveFunctions,context);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+
+   return true;
+  }
+
+/**********************************************************/
+/* AddSaveFunctionToCallList: Adds a function to a list   */
+/*   of functions which are called to perform certain     */
+/*   operations (e.g. clear, reset, and bload functions). */
+/**********************************************************/
+SaveCallFunctionItem *AddSaveFunctionToCallList(
+  Environment *theEnv,
+  const char *name,
+  int priority,
+  SaveCallFunction *func,
+  struct saveCallFunctionItem *head,
+  void *context)
+  {
+   struct saveCallFunctionItem *newPtr, *currentPtr, *lastPtr = NULL;
+   char  *nameCopy;
+
+   newPtr = get_struct(theEnv,saveCallFunctionItem);
+
+   nameCopy = (char *) genalloc(theEnv,strlen(name) + 1);
+   genstrcpy(nameCopy,name);
+   newPtr->name = nameCopy;
+
+   newPtr->func = func;
+   newPtr->priority = priority;
+   newPtr->context = context;
+
+   if (head == NULL)
+     {
+      newPtr->next = NULL;
+      return(newPtr);
+     }
+
+   currentPtr = head;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = head;
+      head = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   return(head);
+  }
+
+/******************************************************************/
+/* RemoveSaveFunctionFromCallList: Removes a function from a list */
+/*   of functions which are called to perform certain operations  */
+/*   (e.g. clear, reset, and bload functions).                    */
+/******************************************************************/
+struct saveCallFunctionItem *RemoveSaveFunctionFromCallList(
+  Environment *theEnv,
+  const char *name,
+  struct saveCallFunctionItem *head,
+  bool *found)
+  {
+   struct saveCallFunctionItem *currentPtr, *lastPtr;
+
+   *found = false;
+   lastPtr = NULL;
+   currentPtr = head;
+
+   while (currentPtr != NULL)
+     {
+      if (strcmp(name,currentPtr->name) == 0)
+        {
+         *found = true;
+         if (lastPtr == NULL)
+           { head = currentPtr->next; }
+         else
+           { lastPtr->next = currentPtr->next; }
+
+         genfree(theEnv,(void *) currentPtr->name,strlen(currentPtr->name) + 1);
+         rtn_struct(theEnv,saveCallFunctionItem,currentPtr);
+         return head;
+        }
+
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   return head;
+  }
+
+/*************************************************************/
+/* DeallocateSaveCallList: Removes all functions from a list */
+/*   of functions which are called to perform certain        */
+/*   operations (e.g. clear, reset, and bload functions).    */
+/*************************************************************/
+void DeallocateSaveCallList(
+  Environment *theEnv,
+  struct saveCallFunctionItem *theList)
+  {
+   struct saveCallFunctionItem *tmpPtr, *nextPtr;
+
+   tmpPtr = theList;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      genfree(theEnv,(void *) tmpPtr->name,strlen(tmpPtr->name) + 1);
+      rtn_struct(theEnv,saveCallFunctionItem,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
diff --git a/clips/constrct.h b/clips/constrct.h
new file mode 100755
index 000000000..f089cb942
--- /dev/null
+++ b/clips/constrct.h
@@ -0,0 +1,216 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/01/16            */
+   /*                                                     */
+   /*                  CONSTRUCT MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added code for capturing errors/warnings       */
+/*            (EnvSetParserErrorCallback).                   */
+/*                                                           */
+/*            Fixed issue with save function when multiple   */
+/*            defmodules exist.                              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            Increment/DecrementClearReadyLocks API.        */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Modified EnvClear to return completion status. */
+/*                                                           */
+/*            File name/line count displayed for errors      */
+/*            and warnings during load command.              */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_constrct
+
+#pragma once
+
+#define _H_constrct
+
+typedef struct construct Construct;
+
+#include "entities.h"
+#include "userdata.h"
+#include "moduldef.h"
+#include "utility.h"
+
+typedef void SaveCallFunction(Environment *,Defmodule *,const char *,void *);
+typedef struct saveCallFunctionItem SaveCallFunctionItem;
+
+typedef void ParserErrorFunction(Environment *,const char *,const char *,const char *,long,void *);
+typedef bool BeforeResetFunction(Environment *);
+
+#define CHS (ConstructHeader *)
+
+struct saveCallFunctionItem
+  {
+   const char *name;
+   SaveCallFunction *func;
+   int priority;
+   SaveCallFunctionItem *next;
+   void *context;
+  };
+
+struct construct
+  {
+   const char *constructName;
+   const char *pluralName;
+   bool (*parseFunction)(Environment *,const char *);
+   FindConstructFunction *findFunction;
+   CLIPSLexeme *(*getConstructNameFunction)(ConstructHeader *);
+   const char *(*getPPFormFunction)(ConstructHeader *);
+   struct defmoduleItemHeader *(*getModuleItemFunction)(ConstructHeader *);
+   GetNextConstructFunction *getNextItemFunction;
+   void (*setNextItemFunction)(ConstructHeader *,ConstructHeader *);
+   IsConstructDeletableFunction *isConstructDeletableFunction;
+   DeleteConstructFunction *deleteFunction;
+   FreeConstructFunction *freeFunction;
+   Construct *next;
+  };
+
+#define CONSTRUCT_DATA 42
+
+struct constructData
+  {
+   bool ClearReadyInProgress;
+   bool ClearInProgress;
+   bool ResetReadyInProgress;
+   bool ResetInProgress;
+   short ClearReadyLocks;
+   int DanglingConstructs;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   SaveCallFunctionItem *ListOfSaveFunctions;
+   bool PrintWhileLoading;
+   bool LoadInProgress;
+   bool WatchCompilations;
+   bool CheckSyntaxMode;
+   bool ParsingConstruct;
+   char *ErrorString;
+   char *WarningString;
+   char *ParsingFileName;
+   char *ErrorFileName;
+   char *WarningFileName;
+   long ErrLineNumber;
+   long WrnLineNumber;
+   int errorCaptureRouterCount;
+   size_t MaxErrChars;
+   size_t CurErrPos;
+   size_t MaxWrnChars;
+   size_t CurWrnPos;
+   ParserErrorFunction *ParserErrorCallback;
+   void *ParserErrorContext;
+#endif
+   Construct *ListOfConstructs;
+   struct voidCallFunctionItem *ListOfResetFunctions;
+   struct voidCallFunctionItem *ListOfClearFunctions;
+   struct boolCallFunctionItem *ListOfClearReadyFunctions;
+   bool Executing;
+   BeforeResetFunction *BeforeResetCallback;
+  };
+
+#define ConstructData(theEnv) ((struct constructData *) GetEnvironmentData(theEnv,CONSTRUCT_DATA))
+
+   bool                           Clear(Environment *);
+   void                           Reset(Environment *);
+   bool                           Save(Environment *,const char *);
+
+   void                           InitializeConstructData(Environment *);
+   bool                           AddResetFunction(Environment *,const char *,VoidCallFunction *,int,void *);
+   bool                           RemoveResetFunction(Environment *,const char *);
+   bool                           AddClearReadyFunction(Environment *,const char *,BoolCallFunction *,int,void *);
+   bool                           RemoveClearReadyFunction(Environment *,const char *);
+   bool                           AddClearFunction(Environment *,const char *,VoidCallFunction *,int,void *);
+   bool                           RemoveClearFunction(Environment *,const char *);
+   void                           IncrementClearReadyLocks(Environment *);
+   void                           DecrementClearReadyLocks(Environment *);
+   Construct                     *AddConstruct(Environment *,const char *,const char *,
+                                               bool (*)(Environment *,const char *),
+                                               FindConstructFunction *,
+                                               CLIPSLexeme *(*)(ConstructHeader *),
+                                               const char *(*)(ConstructHeader *),
+                                               struct defmoduleItemHeader *(*)(ConstructHeader *),
+                                               GetNextConstructFunction *,
+                                               void (*)(ConstructHeader *,ConstructHeader *),
+                                               IsConstructDeletableFunction *,
+                                               DeleteConstructFunction *,
+                                               FreeConstructFunction *);
+   bool                           RemoveConstruct(Environment *,const char *);
+   void                           SetCompilationsWatch(Environment *,bool);
+   bool                           GetCompilationsWatch(Environment *);
+   void                           SetPrintWhileLoading(Environment *,bool);
+   bool                           GetPrintWhileLoading(Environment *);
+   void                           SetLoadInProgress(Environment *,bool);
+   bool                           GetLoadInProgress(Environment *);
+   bool                           ExecutingConstruct(Environment *);
+   void                           SetExecutingConstruct(Environment *,bool);
+   void                           InitializeConstructs(Environment *);
+   BeforeResetFunction           *SetBeforeResetFunction(Environment *,BeforeResetFunction *);
+   void                           ResetCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ClearCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           ClearReady(Environment *);
+   Construct                     *FindConstruct(Environment *,const char *);
+   void                           DeinstallConstructHeader(Environment *,ConstructHeader *);
+   void                           DestroyConstructHeader(Environment *,ConstructHeader *);
+   ParserErrorFunction           *SetParserErrorCallback(Environment *,ParserErrorFunction *,void *);
+   
+   bool                           AddSaveFunction(Environment *,const char *,SaveCallFunction *,int,void *);
+   bool                           RemoveSaveFunction(Environment *,const char *);
+   SaveCallFunctionItem          *AddSaveFunctionToCallList(Environment *,const char *,int,
+                                                            SaveCallFunction *,SaveCallFunctionItem *,void *);
+   SaveCallFunctionItem          *RemoveSaveFunctionFromCallList(Environment *,const char *,
+                                                                 SaveCallFunctionItem *,bool *);
+   void                           DeallocateSaveCallList(Environment *,SaveCallFunctionItem *);
+
+#endif /* _H_constrct */
+
+
+
+
diff --git a/clips/constrnt.c b/clips/constrnt.c
new file mode 100755
index 000000000..525136a28
--- /dev/null
+++ b/clips/constrnt.c
@@ -0,0 +1,554 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*                 CONSTRAINT MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for creating and removing     */
+/*   constraint records, adding them to the contraint hash   */
+/*   table, and enabling and disabling static and dynamic    */
+/*   constraint checking.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian Dantes                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Static constraint checking is always enabled.  */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "router.h"
+#include "scanner.h"
+
+#include "constrnt.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static void                     InstallConstraintRecord(Environment *,CONSTRAINT_RECORD *);
+   static bool                     ConstraintCompare(struct constraintRecord *,struct constraintRecord *);
+#endif
+   static void                     ReturnConstraintRecord(Environment *,CONSTRAINT_RECORD *);
+   static void                     DeinstallConstraintRecord(Environment *,CONSTRAINT_RECORD *);
+   static void                     DeallocateConstraintData(Environment *);
+
+/*****************************************************/
+/* InitializeConstraints: Initializes the constraint */
+/*   hash table to NULL and defines the static and   */
+/*   dynamic constraint access functions.            */
+/*****************************************************/
+void InitializeConstraints(
+  Environment *theEnv)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   int i;
+#endif
+
+   AllocateEnvironmentData(theEnv,CONSTRAINT_DATA,sizeof(struct constraintData),DeallocateConstraintData);
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+    ConstraintData(theEnv)->ConstraintHashtable = (struct constraintRecord **)
+                          gm2(theEnv,sizeof (struct constraintRecord *) *
+                                    SIZE_CONSTRAINT_HASH);
+
+    if (ConstraintData(theEnv)->ConstraintHashtable == NULL) ExitRouter(theEnv,EXIT_FAILURE);
+
+    for (i = 0; i < SIZE_CONSTRAINT_HASH; i++) ConstraintData(theEnv)->ConstraintHashtable[i] = NULL;
+#endif
+
+#if (! RUN_TIME)
+   AddUDF(theEnv,"get-dynamic-constraint-checking","b",0,0,NULL,GDCCommand,"GDCCommand",NULL);
+   AddUDF(theEnv,"set-dynamic-constraint-checking","b",1,1,NULL,SDCCommand,"SDCCommand",NULL);
+#endif
+  }
+
+/*****************************************************/
+/* DeallocateConstraintData: Deallocates environment */
+/*    data for constraints.                          */
+/*****************************************************/
+static void DeallocateConstraintData(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   struct constraintRecord *tmpPtr, *nextPtr;
+   int i;
+
+   for (i = 0; i < SIZE_CONSTRAINT_HASH; i++)
+     {
+      tmpPtr = ConstraintData(theEnv)->ConstraintHashtable[i];
+      while (tmpPtr != NULL)
+        {
+         nextPtr = tmpPtr->next;
+         ReturnConstraintRecord(theEnv,tmpPtr);
+         tmpPtr = nextPtr;
+        }
+     }
+
+   rm(theEnv,ConstraintData(theEnv)->ConstraintHashtable,
+      sizeof(struct constraintRecord *) * SIZE_CONSTRAINT_HASH);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   if (ConstraintData(theEnv)->NumberOfConstraints != 0)
+     {
+      genfree(theEnv,ConstraintData(theEnv)->ConstraintArray,
+              (sizeof(CONSTRAINT_RECORD) * ConstraintData(theEnv)->NumberOfConstraints));
+     }
+#endif
+  }
+
+/*************************************************************/
+/* ReturnConstraintRecord: Frees the data structures used by */
+/*   a constraint record. If the returnOnlyFields argument   */
+/*   is false, then the constraint record is also freed.     */
+/*************************************************************/
+static void ReturnConstraintRecord(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraints)
+  {
+   if (constraints == NULL) return;
+
+   if (! constraints->installed)
+     {
+      ReturnExpression(theEnv,constraints->classList);
+      ReturnExpression(theEnv,constraints->restrictionList);
+      ReturnExpression(theEnv,constraints->maxValue);
+      ReturnExpression(theEnv,constraints->minValue);
+      ReturnExpression(theEnv,constraints->minFields);
+      ReturnExpression(theEnv,constraints->maxFields);
+     }
+
+   ReturnConstraintRecord(theEnv,constraints->multifield);
+
+   rtn_struct(theEnv,constraintRecord,constraints);
+  }
+
+/***************************************************/
+/* DeinstallConstraintRecord: Decrements the count */
+/*   values of all occurrences of primitive data   */
+/*   types found in a constraint record.           */
+/***************************************************/
+static void DeinstallConstraintRecord(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraints)
+  {
+   if (constraints->installed)
+     {
+      RemoveHashedExpression(theEnv,constraints->classList);
+      RemoveHashedExpression(theEnv,constraints->restrictionList);
+      RemoveHashedExpression(theEnv,constraints->maxValue);
+      RemoveHashedExpression(theEnv,constraints->minValue);
+      RemoveHashedExpression(theEnv,constraints->minFields);
+      RemoveHashedExpression(theEnv,constraints->maxFields);
+     }
+   else
+     {
+      ExpressionDeinstall(theEnv,constraints->classList);
+      ExpressionDeinstall(theEnv,constraints->restrictionList);
+      ExpressionDeinstall(theEnv,constraints->maxValue);
+      ExpressionDeinstall(theEnv,constraints->minValue);
+      ExpressionDeinstall(theEnv,constraints->minFields);
+      ExpressionDeinstall(theEnv,constraints->maxFields);
+     }
+
+   if (constraints->multifield != NULL)
+     { DeinstallConstraintRecord(theEnv,constraints->multifield); }
+  }
+
+/******************************************/
+/* RemoveConstraint: Removes a constraint */
+/*   from the constraint hash table.      */
+/******************************************/
+void RemoveConstraint(
+  Environment *theEnv,
+  struct constraintRecord *theConstraint)
+  {
+   struct constraintRecord *tmpPtr, *prevPtr = NULL;
+
+   if (theConstraint == NULL) return;
+
+   /*========================================*/
+   /* If the bucket value is less than zero, */
+   /* then the constraint wasn't stored in   */
+   /* the hash table.                        */
+   /*========================================*/
+
+   if (! theConstraint->installed)
+     {
+      ReturnConstraintRecord(theEnv,theConstraint);
+      return;
+     }
+
+   /*================================*/
+   /* Find and remove the constraint */
+   /* from the contraint hash table. */
+   /*================================*/
+
+   tmpPtr = ConstraintData(theEnv)->ConstraintHashtable[theConstraint->bucket];
+   while (tmpPtr != NULL)
+     {
+      if (tmpPtr == theConstraint)
+        {
+         theConstraint->count--;
+         if (theConstraint->count == 0)
+           {
+            if (prevPtr == NULL)
+              { ConstraintData(theEnv)->ConstraintHashtable[theConstraint->bucket] = theConstraint->next; }
+            else
+              { prevPtr->next = theConstraint->next; }
+            DeinstallConstraintRecord(theEnv,theConstraint);
+            ReturnConstraintRecord(theEnv,theConstraint);
+           }
+         return;
+        }
+
+      prevPtr = tmpPtr;
+      tmpPtr = tmpPtr->next;
+     }
+
+   return;
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/***********************************/
+/* HashConstraint: Returns a hash  */
+/*   value for a given constraint. */
+/***********************************/
+unsigned long HashConstraint(
+  struct constraintRecord *theConstraint)
+  {
+   unsigned short i = 0;
+   unsigned long count = 0;
+   unsigned long hashValue;
+   struct expr *tmpPtr;
+
+   count +=
+      (theConstraint->anyAllowed * 17) +
+      (theConstraint->symbolsAllowed * 5) +
+      (theConstraint->stringsAllowed * 23) +
+      (theConstraint->floatsAllowed * 19) +
+      (theConstraint->integersAllowed * 29) +
+      (theConstraint->instanceNamesAllowed * 31) +
+      (theConstraint->instanceAddressesAllowed * 17);
+
+   count +=
+      (theConstraint->externalAddressesAllowed * 29) +
+      (theConstraint->voidAllowed * 29) +
+      (theConstraint->multifieldsAllowed * 29) +
+      (theConstraint->factAddressesAllowed * 79) +
+      (theConstraint->anyRestriction * 59) +
+      (theConstraint->symbolRestriction * 61);
+
+   count +=
+      (theConstraint->stringRestriction * 3) +
+      (theConstraint->floatRestriction * 37) +
+      (theConstraint->integerRestriction * 9) +
+      (theConstraint->classRestriction * 11) +
+      (theConstraint->instanceNameRestriction * 7);
+
+   for (tmpPtr = theConstraint->classList; tmpPtr != NULL; tmpPtr = tmpPtr->nextArg)
+     { count += GetAtomicHashValue(tmpPtr->type,tmpPtr->value,i++); }
+
+   for (tmpPtr = theConstraint->restrictionList; tmpPtr != NULL; tmpPtr = tmpPtr->nextArg)
+     { count += GetAtomicHashValue(tmpPtr->type,tmpPtr->value,i++); }
+
+   for (tmpPtr = theConstraint->minValue; tmpPtr != NULL; tmpPtr = tmpPtr->nextArg)
+     { count += GetAtomicHashValue(tmpPtr->type,tmpPtr->value,i++); }
+
+   for (tmpPtr = theConstraint->maxValue; tmpPtr != NULL; tmpPtr = tmpPtr->nextArg)
+     { count += GetAtomicHashValue(tmpPtr->type,tmpPtr->value,i++); }
+
+   for (tmpPtr = theConstraint->minFields; tmpPtr != NULL; tmpPtr = tmpPtr->nextArg)
+     { count += GetAtomicHashValue(tmpPtr->type,tmpPtr->value,i++); }
+
+   for (tmpPtr = theConstraint->maxFields; tmpPtr != NULL; tmpPtr = tmpPtr->nextArg)
+     { count += GetAtomicHashValue(tmpPtr->type,tmpPtr->value,i++); }
+
+   if (theConstraint->multifield != NULL)
+     { count += HashConstraint(theConstraint->multifield); }
+
+   hashValue = count % SIZE_CONSTRAINT_HASH;
+
+   return hashValue;
+  }
+
+/**********************************************/
+/* ConstraintCompare: Compares two constraint */
+/*   records and returns true if they are     */
+/*   identical, otherwise false.              */
+/**********************************************/
+static bool ConstraintCompare(
+  struct constraintRecord *constraint1,
+  struct constraintRecord *constraint2)
+  {
+   struct expr *tmpPtr1, *tmpPtr2;
+
+   if ((constraint1->anyAllowed != constraint2->anyAllowed) ||
+       (constraint1->symbolsAllowed != constraint2->symbolsAllowed) ||
+       (constraint1->stringsAllowed != constraint2->stringsAllowed) ||
+       (constraint1->floatsAllowed != constraint2->floatsAllowed) ||
+       (constraint1->integersAllowed != constraint2->integersAllowed) ||
+       (constraint1->instanceNamesAllowed != constraint2->instanceNamesAllowed) ||
+       (constraint1->instanceAddressesAllowed != constraint2->instanceAddressesAllowed) ||
+       (constraint1->externalAddressesAllowed != constraint2->externalAddressesAllowed) ||
+       (constraint1->voidAllowed != constraint2->voidAllowed) ||
+       (constraint1->multifieldsAllowed != constraint2->multifieldsAllowed) ||
+       (constraint1->singlefieldsAllowed != constraint2->singlefieldsAllowed) ||
+       (constraint1->factAddressesAllowed != constraint2->factAddressesAllowed) ||
+       (constraint1->anyRestriction != constraint2->anyRestriction) ||
+       (constraint1->symbolRestriction != constraint2->symbolRestriction) ||
+       (constraint1->stringRestriction != constraint2->stringRestriction) ||
+       (constraint1->floatRestriction != constraint2->floatRestriction) ||
+       (constraint1->integerRestriction != constraint2->integerRestriction) ||
+       (constraint1->classRestriction != constraint2->classRestriction) ||
+       (constraint1->instanceNameRestriction != constraint2->instanceNameRestriction))
+     { return false; }
+
+   for (tmpPtr1 = constraint1->classList, tmpPtr2 = constraint2->classList;
+        (tmpPtr1 != NULL) && (tmpPtr2 != NULL);
+        tmpPtr1 = tmpPtr1->nextArg, tmpPtr2 = tmpPtr2->nextArg)
+     {
+      if ((tmpPtr1->type != tmpPtr2->type) || (tmpPtr1->value != tmpPtr2->value))
+        { return false; }
+     }
+   if (tmpPtr1 != tmpPtr2) return false;
+
+   for (tmpPtr1 = constraint1->restrictionList, tmpPtr2 = constraint2->restrictionList;
+        (tmpPtr1 != NULL) && (tmpPtr2 != NULL);
+        tmpPtr1 = tmpPtr1->nextArg, tmpPtr2 = tmpPtr2->nextArg)
+     {
+      if ((tmpPtr1->type != tmpPtr2->type) || (tmpPtr1->value != tmpPtr2->value))
+        { return false; }
+     }
+   if (tmpPtr1 != tmpPtr2) return false;
+
+   for (tmpPtr1 = constraint1->minValue, tmpPtr2 = constraint2->minValue;
+        (tmpPtr1 != NULL) && (tmpPtr2 != NULL);
+        tmpPtr1 = tmpPtr1->nextArg, tmpPtr2 = tmpPtr2->nextArg)
+     {
+      if ((tmpPtr1->type != tmpPtr2->type) || (tmpPtr1->value != tmpPtr2->value))
+        { return false; }
+     }
+   if (tmpPtr1 != tmpPtr2) return false;
+
+   for (tmpPtr1 = constraint1->maxValue, tmpPtr2 = constraint2->maxValue;
+        (tmpPtr1 != NULL) && (tmpPtr2 != NULL);
+        tmpPtr1 = tmpPtr1->nextArg, tmpPtr2 = tmpPtr2->nextArg)
+     {
+      if ((tmpPtr1->type != tmpPtr2->type) || (tmpPtr1->value != tmpPtr2->value))
+        { return false; }
+     }
+   if (tmpPtr1 != tmpPtr2) return false;
+
+   for (tmpPtr1 = constraint1->minFields, tmpPtr2 = constraint2->minFields;
+        (tmpPtr1 != NULL) && (tmpPtr2 != NULL);
+        tmpPtr1 = tmpPtr1->nextArg, tmpPtr2 = tmpPtr2->nextArg)
+     {
+      if ((tmpPtr1->type != tmpPtr2->type) || (tmpPtr1->value != tmpPtr2->value))
+        { return false; }
+     }
+   if (tmpPtr1 != tmpPtr2) return false;
+
+   for (tmpPtr1 = constraint1->maxFields, tmpPtr2 = constraint2->maxFields;
+        (tmpPtr1 != NULL) && (tmpPtr2 != NULL);
+        tmpPtr1 = tmpPtr1->nextArg, tmpPtr2 = tmpPtr2->nextArg)
+     {
+      if ((tmpPtr1->type != tmpPtr2->type) || (tmpPtr1->value != tmpPtr2->value))
+        { return false; }
+     }
+   if (tmpPtr1 != tmpPtr2) return false;
+
+   if (((constraint1->multifield == NULL) && (constraint2->multifield != NULL)) ||
+       ((constraint1->multifield != NULL) && (constraint2->multifield == NULL)))
+     { return false; }
+   else if (constraint1->multifield == constraint2->multifield)
+     { return true; }
+
+   return(ConstraintCompare(constraint1->multifield,constraint2->multifield));
+  }
+
+/************************************/
+/* AddConstraint: Adds a constraint */
+/*   to the constraint hash table.  */
+/************************************/
+struct constraintRecord *AddConstraint(
+  Environment *theEnv,
+  struct constraintRecord *theConstraint)
+  {
+   struct constraintRecord *tmpPtr;
+   unsigned long hashValue;
+
+   if (theConstraint == NULL) return NULL;
+
+   hashValue = HashConstraint(theConstraint);
+
+   for (tmpPtr = ConstraintData(theEnv)->ConstraintHashtable[hashValue];
+        tmpPtr != NULL;
+        tmpPtr = tmpPtr->next)
+     {
+      if (ConstraintCompare(theConstraint,tmpPtr))
+        {
+         tmpPtr->count++;
+         ReturnConstraintRecord(theEnv,theConstraint);
+         return tmpPtr;
+        }
+     }
+
+   InstallConstraintRecord(theEnv,theConstraint);
+   theConstraint->count = 1;
+   theConstraint->bucket = (unsigned int) hashValue;
+   theConstraint->installed = true;
+   theConstraint->next = ConstraintData(theEnv)->ConstraintHashtable[hashValue];
+   ConstraintData(theEnv)->ConstraintHashtable[hashValue] = theConstraint;
+   return theConstraint;
+  }
+
+/*************************************************/
+/* InstallConstraintRecord: Increments the count */
+/*   values of all occurrences of primitive data */
+/*   types found in a constraint record.         */
+/*************************************************/
+static void InstallConstraintRecord(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraints)
+  {
+   struct expr *tempExpr;
+
+   tempExpr = AddHashedExpression(theEnv,constraints->classList);
+   ReturnExpression(theEnv,constraints->classList);
+   constraints->classList = tempExpr;
+
+   tempExpr = AddHashedExpression(theEnv,constraints->restrictionList);
+   ReturnExpression(theEnv,constraints->restrictionList);
+   constraints->restrictionList = tempExpr;
+
+   tempExpr = AddHashedExpression(theEnv,constraints->maxValue);
+   ReturnExpression(theEnv,constraints->maxValue);
+   constraints->maxValue = tempExpr;
+
+   tempExpr = AddHashedExpression(theEnv,constraints->minValue);
+   ReturnExpression(theEnv,constraints->minValue);
+   constraints->minValue = tempExpr;
+
+   tempExpr = AddHashedExpression(theEnv,constraints->minFields);
+   ReturnExpression(theEnv,constraints->minFields);
+   constraints->minFields = tempExpr;
+
+   tempExpr = AddHashedExpression(theEnv,constraints->maxFields);
+   ReturnExpression(theEnv,constraints->maxFields);
+   constraints->maxFields = tempExpr;
+
+   if (constraints->multifield != NULL)
+     { InstallConstraintRecord(theEnv,constraints->multifield); }
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+/**********************************************/
+/* SDCCommand: H/L access routine for the     */
+/*   set-dynamic-constraint-checking command. */
+/**********************************************/
+void SDCCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,GetDynamicConstraintChecking(theEnv));
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+
+   SetDynamicConstraintChecking(theEnv,theArg.value != FalseSymbol(theEnv));
+  }
+
+/**********************************************/
+/* GDCCommand: H/L access routine for the     */
+/*   get-dynamic-constraint-checking command. */
+/**********************************************/
+void GDCCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateBoolean(theEnv,GetDynamicConstraintChecking(theEnv));
+  }
+
+/******************************************************/
+/* SetDynamicConstraintChecking: C access routine     */
+/*   for the set-dynamic-constraint-checking command. */
+/******************************************************/
+bool SetDynamicConstraintChecking(
+  Environment *theEnv,
+  bool value)
+  {
+   bool ov;
+   ov = ConstraintData(theEnv)->DynamicConstraintChecking;
+   ConstraintData(theEnv)->DynamicConstraintChecking = value;
+   return(ov);
+  }
+
+/******************************************************/
+/* GetDynamicConstraintChecking: C access routine     */
+/*   for the get-dynamic-constraint-checking command. */
+/******************************************************/
+bool GetDynamicConstraintChecking(
+  Environment *theEnv)
+  {
+   return(ConstraintData(theEnv)->DynamicConstraintChecking);
+  }
+
diff --git a/clips/constrnt.h b/clips/constrnt.h
new file mode 100755
index 000000000..358c3d4bd
--- /dev/null
+++ b/clips/constrnt.h
@@ -0,0 +1,132 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*                CONSTRAINT HEADER FILE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for creating and removing     */
+/*   constraint records, adding them to the contraint hash   */
+/*   table, and enabling and disabling static and dynamic    */
+/*   constraint checking.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Static constraint checking is always enabled.  */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_constrnt
+
+#pragma once
+
+#define _H_constrnt
+
+struct constraintRecord;
+typedef struct constraintRecord CONSTRAINT_RECORD;
+
+#include "evaluatn.h"
+
+struct constraintRecord
+  {
+   unsigned int anyAllowed : 1;
+   unsigned int symbolsAllowed : 1;
+   unsigned int stringsAllowed : 1;
+   unsigned int floatsAllowed : 1;
+   unsigned int integersAllowed : 1;
+   unsigned int instanceNamesAllowed : 1;
+   unsigned int instanceAddressesAllowed : 1;
+   unsigned int externalAddressesAllowed : 1;
+   unsigned int factAddressesAllowed : 1;
+   unsigned int voidAllowed : 1;
+   unsigned int anyRestriction : 1;
+   unsigned int symbolRestriction : 1;
+   unsigned int stringRestriction : 1;
+   unsigned int floatRestriction : 1;
+   unsigned int integerRestriction : 1;
+   unsigned int classRestriction : 1;
+   unsigned int instanceNameRestriction : 1;
+   unsigned int multifieldsAllowed : 1;
+   unsigned int singlefieldsAllowed : 1;
+   unsigned int installed : 1;
+   unsigned short bsaveIndex;
+   struct expr *classList;
+   struct expr *restrictionList;
+   struct expr *minValue;
+   struct expr *maxValue;
+   struct expr *minFields;
+   struct expr *maxFields;
+   struct constraintRecord *multifield;
+   struct constraintRecord *next;
+   unsigned int bucket;
+   unsigned int count;
+  };
+
+#define SIZE_CONSTRAINT_HASH  167
+
+#define CONSTRAINT_DATA 43
+
+struct constraintData
+  {
+   struct constraintRecord **ConstraintHashtable;
+   bool DynamicConstraintChecking;
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   struct constraintRecord *ConstraintArray;
+   unsigned long NumberOfConstraints;
+#endif
+  };
+
+#define ConstraintData(theEnv) ((struct constraintData *) GetEnvironmentData(theEnv,CONSTRAINT_DATA))
+
+   void                           InitializeConstraints(Environment *);
+   void                           GDCCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SDCCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SetDynamicConstraintChecking(Environment *,bool);
+   bool                           GetDynamicConstraintChecking(Environment *);
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   unsigned long                  HashConstraint(struct constraintRecord *);
+   struct constraintRecord       *AddConstraint(Environment *,struct constraintRecord *);
+#endif
+   void                           RemoveConstraint(Environment *,struct constraintRecord *);
+
+#endif
+
+
+
+
diff --git a/clips/crstrtgy.c b/clips/crstrtgy.c
new file mode 100755
index 000000000..e9ccc019e
--- /dev/null
+++ b/clips/crstrtgy.c
@@ -0,0 +1,1088 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*         CONFLICT RESOLUTION STRATEGY MODULE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Used to determine where a new activation is      */
+/*   placed on the agenda based on the current conflict      */
+/*   resolution strategy (depth, breadth, mea, lex,          */
+/*   simplicity, or complexity). Also provides the           */
+/*   set-strategy and get-strategy commands.                 */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES         */
+/*            compilation flag.                              */
+/*                                                           */
+/*      6.30: Added salience groups to improve performance   */
+/*            with large numbers of activations of different */
+/*            saliences.                                     */
+/*                                                           */
+/*            Removed pseudo-facts used for not CEs.         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include "agenda.h"
+#include "argacces.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "pattern.h"
+#include "reteutil.h"
+
+#include "crstrtgy.h"
+
+#define GetMatchingItem(x,i) ((x->basis->binds[i].gm.theMatch != NULL) ? \
+                              (x->basis->binds[i].gm.theMatch->matchingItem) : NULL)
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static Activation             *PlaceDepthActivation(Activation *,struct salienceGroup *);
+   static Activation             *PlaceBreadthActivation(Activation *,struct salienceGroup *);
+   static Activation             *PlaceLEXActivation(Environment *,Activation *,struct salienceGroup *);
+   static Activation             *PlaceMEAActivation(Environment *,Activation *,struct salienceGroup *);
+   static Activation             *PlaceComplexityActivation(Activation *,struct salienceGroup *);
+   static Activation             *PlaceSimplicityActivation(Activation *,struct salienceGroup *);
+   static Activation             *PlaceRandomActivation(Activation *,struct salienceGroup *);
+   static int                     ComparePartialMatches(Environment *,Activation *,Activation *);
+   static const char             *GetStrategyName(StrategyType);
+   static unsigned long long     *SortPartialMatch(Environment *,struct partialMatch *);
+
+/******************************************************************/
+/* PlaceActivation: Coordinates placement of an activation on the */
+/*   Agenda based on the current conflict resolution strategy.    */
+/******************************************************************/
+void PlaceActivation(
+  Environment *theEnv,
+  Activation **whichAgenda,
+  Activation *newActivation,
+  struct salienceGroup *theGroup)
+  {
+   Activation *placeAfter = NULL;
+
+   /*================================================*/
+   /* Set the flag which indicates that a change has */
+   /* been made to the agenda.                       */
+   /*================================================*/
+
+   SetAgendaChanged(theEnv,true);
+
+   /*=============================================*/
+   /* Determine the location where the activation */
+   /* should be placed in the agenda based on the */
+   /* current conflict resolution strategy.       */
+   /*==============================================*/
+
+   if (*whichAgenda != NULL)
+     {
+      switch (AgendaData(theEnv)->Strategy)
+        {
+         case DEPTH_STRATEGY:
+           placeAfter = PlaceDepthActivation(newActivation,theGroup);
+           break;
+
+         case BREADTH_STRATEGY:
+           placeAfter = PlaceBreadthActivation(newActivation,theGroup);
+           break;
+
+         case LEX_STRATEGY:
+           placeAfter = PlaceLEXActivation(theEnv,newActivation,theGroup);
+           break;
+
+         case MEA_STRATEGY:
+           placeAfter = PlaceMEAActivation(theEnv,newActivation,theGroup);
+           break;
+
+         case COMPLEXITY_STRATEGY:
+           placeAfter = PlaceComplexityActivation(newActivation,theGroup);
+           break;
+
+         case SIMPLICITY_STRATEGY:
+           placeAfter = PlaceSimplicityActivation(newActivation,theGroup);
+           break;
+
+         case RANDOM_STRATEGY:
+           placeAfter = PlaceRandomActivation(newActivation,theGroup);
+           break;
+        }
+     }
+   else
+     {
+      theGroup->first = newActivation;
+      theGroup->last = newActivation;
+     }
+
+   /*==============================================================*/
+   /* Place the activation at the appropriate place in the agenda. */
+   /*==============================================================*/
+
+   if (placeAfter == NULL) /* then place it at the beginning of then agenda. */
+     {
+      newActivation->next = *whichAgenda;
+      *whichAgenda = newActivation;
+      if (newActivation->next != NULL) newActivation->next->prev = newActivation;
+     }
+   else /* insert it in the agenda. */
+     {
+      newActivation->next = placeAfter->next;
+      newActivation->prev = placeAfter;
+      placeAfter->next = newActivation;
+      if (newActivation->next != NULL)
+        { newActivation->next->prev = newActivation; }
+     }
+  }
+
+/*******************************************************************/
+/* PlaceDepthActivation: Determines the location in the agenda     */
+/*    where a new activation should be placed for the depth        */
+/*    strategy. Returns a pointer to the activation after which    */
+/*    the new activation should be placed (or NULL if the          */
+/*    activation should be placed at the beginning of the agenda). */
+/*******************************************************************/
+static Activation *PlaceDepthActivation(
+  Activation *newActivation,
+  struct salienceGroup *theGroup)
+  {
+   Activation *lastAct, *actPtr;
+   unsigned long long timetag;
+
+   /*============================================*/
+   /* Set up initial information for the search. */
+   /*============================================*/
+
+   timetag = newActivation->timetag;
+   if (theGroup->prev == NULL)
+     { lastAct = NULL; }
+   else
+     { lastAct = theGroup->prev->last; }
+
+   /*=========================================================*/
+   /* Find the insertion point in the agenda. The activation  */
+   /* is placed before activations of lower salience and      */
+   /* after activations of higher salience. Among activations */
+   /* of equal salience, the activation is placed before      */
+   /* activations with an equal or lower timetag (yielding    */
+   /* depth first traversal).                                 */
+   /*=========================================================*/
+
+   actPtr = theGroup->first;
+   while (actPtr != NULL)
+     {
+      if (timetag < actPtr->timetag)
+        {
+         lastAct = actPtr;
+         if (actPtr == theGroup->last)
+           { break; }
+         else
+           { actPtr = actPtr->next; }
+        }
+      else
+        { break; }
+     }
+
+   /*========================================*/
+   /* Update the salience group information. */
+   /*========================================*/
+
+   if ((lastAct == NULL) ||
+       ((theGroup->prev != NULL) && (theGroup->prev->last == lastAct)))
+     { theGroup->first = newActivation; }
+
+   if ((theGroup->last == NULL) || (theGroup->last == lastAct))
+     { theGroup->last = newActivation; }
+
+   /*===========================================*/
+   /* Return the insertion point in the agenda. */
+   /*===========================================*/
+
+   return(lastAct);
+  }
+
+/*******************************************************************/
+/* PlaceBreadthActivation: Determines the location in the agenda   */
+/*    where a new activation should be placed for the breadth      */
+/*    strategy. Returns a pointer to the activation after which    */
+/*    the new activation should be placed (or NULL if the          */
+/*    activation should be placed at the beginning of the agenda). */
+/*******************************************************************/
+static Activation *PlaceBreadthActivation(
+  Activation *newActivation,
+  struct salienceGroup *theGroup)
+  {
+   unsigned long long timetag;
+   Activation *lastAct, *actPtr;
+
+   /*============================================*/
+   /* Set up initial information for the search. */
+   /*============================================*/
+
+   timetag = newActivation->timetag;
+   if (theGroup->last == NULL)
+     {
+      if (theGroup->prev == NULL)
+        { lastAct = NULL; }
+      else
+        { lastAct = theGroup->prev->last; }
+     }
+   else
+     { lastAct = theGroup->last; }
+
+   /*=========================================================*/
+   /* Find the insertion point in the agenda. The activation  */
+   /* is placed before activations of lower salience and      */
+   /* after activations of higher salience. Among activations */
+   /* of equal salience, the activation is placed after       */
+   /* activations with a lessor timetag (yielding breadth     */
+   /* first traversal).                                       */
+   /*=========================================================*/
+
+   actPtr = theGroup->last;
+   while (actPtr != NULL)
+     {
+      if (timetag < actPtr->timetag)
+        {
+         if (actPtr == theGroup->first)
+           {
+            if (theGroup->prev == NULL)
+              { lastAct = NULL; }
+            else
+              { lastAct = theGroup->prev->last; }
+            break;
+           }
+         else
+           { actPtr = actPtr->prev; }
+        }
+      else
+        {
+         lastAct = actPtr;
+         break;
+        }
+     }
+
+   /*========================================*/
+   /* Update the salience group information. */
+   /*========================================*/
+
+   if ((lastAct == NULL) ||
+       ((theGroup->prev != NULL) && (theGroup->prev->last == lastAct)))
+     { theGroup->first = newActivation; }
+
+   if ((theGroup->last == NULL) || (theGroup->last == lastAct))
+     { theGroup->last = newActivation; }
+
+   /*===========================================*/
+   /* Return the insertion point in the agenda. */
+   /*===========================================*/
+
+   return lastAct;
+  }
+
+/*******************************************************************/
+/* PlaceLEXActivation: Determines the location in the agenda       */
+/*    where a new activation should be placed for the lex          */
+/*    strategy. Returns a pointer to the activation after which    */
+/*    the new activation should be placed (or NULL if the          */
+/*    activation should be placed at the beginning of the agenda). */
+/*******************************************************************/
+static Activation *PlaceLEXActivation(
+  Environment *theEnv,
+  Activation *newActivation,
+  struct salienceGroup *theGroup)
+  {
+   unsigned long long timetag;
+   Activation *lastAct, *actPtr;
+   int flag;
+
+   /*============================================*/
+   /* Set up initial information for the search. */
+   /*============================================*/
+
+   timetag = newActivation->timetag;
+   if (theGroup->prev == NULL)
+     { lastAct = NULL; }
+   else
+     { lastAct = theGroup->prev->last; }
+
+   /*================================================*/
+   /* Look first at the very end of the group to see */
+   /* if the activation should be placed there.      */
+   /*================================================*/
+
+   actPtr = theGroup->last;
+   if (actPtr != NULL)
+     {
+      flag = ComparePartialMatches(theEnv,actPtr,newActivation);
+
+      if ((flag == LESS_THAN) ||
+          ((flag == EQUAL) &&  (timetag > actPtr->timetag)))
+        {
+         theGroup->last = newActivation;
+
+         return actPtr;
+        }
+     }
+
+   /*=========================================================*/
+   /* Find the insertion point in the agenda. The activation  */
+   /* is placed before activations of lower salience and      */
+   /* after activations of higher salience. Among activations */
+   /* of equal salience, the OPS5 lex strategy is used for    */
+   /* determining placement.                                  */
+   /*=========================================================*/
+
+   actPtr = theGroup->first;
+   while (actPtr != NULL)
+     {
+      flag = ComparePartialMatches(theEnv,actPtr,newActivation);
+
+      if (flag == LESS_THAN)
+        {
+         lastAct = actPtr;
+         if (actPtr == theGroup->last)
+           { break; }
+         else
+           { actPtr = actPtr->next; }
+        }
+      else if (flag == GREATER_THAN)
+        { break; }
+      else /* flag == EQUAL */
+        {
+         if (timetag > actPtr->timetag)
+           {
+            lastAct = actPtr;
+            if (actPtr == theGroup->last)
+              { break; }
+            else
+              { actPtr = actPtr->next; }
+           }
+         else
+           { break; }
+        }
+     }
+
+   /*========================================*/
+   /* Update the salience group information. */
+   /*========================================*/
+
+   if ((lastAct == NULL) ||
+       ((theGroup->prev != NULL) && (theGroup->prev->last == lastAct)))
+     { theGroup->first = newActivation; }
+
+   if ((theGroup->last == NULL) || (theGroup->last == lastAct))
+     { theGroup->last = newActivation; }
+
+   /*===========================================*/
+   /* Return the insertion point in the agenda. */
+   /*===========================================*/
+
+   return lastAct;
+  }
+
+/*******************************************************************/
+/* PlaceMEAActivation: Determines the location in the agenda       */
+/*    where a new activation should be placed for the mea          */
+/*    strategy. Returns a pointer to the activation after which    */
+/*    the new activation should be placed (or NULL if the          */
+/*    activation should be placed at the beginning of the agenda). */
+/*******************************************************************/
+static Activation *PlaceMEAActivation(
+  Environment *theEnv,
+  Activation *newActivation,
+  struct salienceGroup *theGroup)
+  {
+   unsigned long long timetag;
+   Activation *lastAct, *actPtr;
+   int flag;
+   unsigned long long cWhoset = 0, oWhoset = 0;
+   bool cSet, oSet;
+
+   /*============================================*/
+   /* Set up initial information for the search. */
+   /*============================================*/
+
+   timetag = newActivation->timetag;
+   if (theGroup->prev == NULL)
+     { lastAct = NULL; }
+   else
+     { lastAct = theGroup->prev->last; }
+
+   /*================================================*/
+   /* Look first at the very end of the group to see */
+   /* if the activation should be placed there.      */
+   /*================================================*/
+
+   actPtr = theGroup->last;
+   if (actPtr != NULL)
+     {
+      if (GetMatchingItem(newActivation,0) != NULL)
+        {
+         cWhoset = GetMatchingItem(newActivation,0)->timeTag;
+         cSet = true;
+        }
+      else
+        { cSet = false; }
+
+      if (GetMatchingItem(actPtr,0) != NULL)
+        {
+         oWhoset = GetMatchingItem(actPtr,0)->timeTag;
+         oSet = true;
+        }
+      else
+        { oSet = false; }
+
+      if ((cSet == false) && (oSet == false))
+        { flag = ComparePartialMatches(theEnv,actPtr,newActivation); }
+      else if ((cSet == true) && (oSet == false))
+        { flag = GREATER_THAN; }
+      else if ((cSet == false) && (oSet == true))
+        { flag = LESS_THAN; }
+      else if (oWhoset < cWhoset)
+        { flag = GREATER_THAN; }
+      else if (oWhoset > cWhoset)
+        { flag = LESS_THAN; }
+      else
+        { flag = ComparePartialMatches(theEnv,actPtr,newActivation); }
+
+      if ((flag == LESS_THAN) ||
+          ((flag == EQUAL) &&  (timetag > actPtr->timetag)))
+        {
+         theGroup->last = newActivation;
+
+         return actPtr;
+        }
+     }
+
+   /*=========================================================*/
+   /* Find the insertion point in the agenda. The activation  */
+   /* is placed before activations of lower salience and      */
+   /* after activations of higher salience. Among activations */
+   /* of equal salience, the OPS5 mea strategy is used for    */
+   /* determining placement.                                  */
+   /*=========================================================*/
+
+   actPtr = theGroup->first;
+   while (actPtr != NULL)
+     {
+      cWhoset = 0;
+      oWhoset = 0;
+      if (GetMatchingItem(newActivation,0) != NULL)
+        { cWhoset = GetMatchingItem(newActivation,0)->timeTag; }
+
+      if (GetMatchingItem(actPtr,0) != NULL)
+        { oWhoset = GetMatchingItem(actPtr,0)->timeTag; }
+
+      if (oWhoset < cWhoset)
+        {
+         if (cWhoset > 0) flag = GREATER_THAN;
+         else flag = LESS_THAN;
+        }
+      else if (oWhoset > cWhoset)
+        {
+         if (oWhoset > 0) flag = LESS_THAN;
+         else flag = GREATER_THAN;
+        }
+      else
+        { flag = ComparePartialMatches(theEnv,actPtr,newActivation); }
+
+      if (flag == LESS_THAN)
+        {
+         lastAct = actPtr;
+         if (actPtr == theGroup->last)
+           { break; }
+         else
+           { actPtr = actPtr->next; }
+        }
+      else if (flag == GREATER_THAN)
+        { break; }
+      else /* flag == EQUAL */
+        {
+         if (timetag > actPtr->timetag)
+           {
+            lastAct = actPtr;
+            if (actPtr == theGroup->last)
+              { break; }
+            else
+              { actPtr = actPtr->next; }
+           }
+         else
+           { break; }
+        }
+     }
+
+   /*========================================*/
+   /* Update the salience group information. */
+   /*========================================*/
+
+   if ((lastAct == NULL) ||
+       ((theGroup->prev != NULL) && (theGroup->prev->last == lastAct)))
+     { theGroup->first = newActivation; }
+
+   if ((theGroup->last == NULL) || (theGroup->last == lastAct))
+     { theGroup->last = newActivation; }
+
+   /*===========================================*/
+   /* Return the insertion point in the agenda. */
+   /*===========================================*/
+
+   return lastAct;
+  }
+
+/*********************************************************************/
+/* PlaceComplexityActivation: Determines the location in the agenda  */
+/*    where a new activation should be placed for the complexity     */
+/*    strategy. Returns a pointer to the activation  after which the */
+/*    new activation should be placed (or NULL if the activation     */
+/*    should be placed at the beginning of the agenda).              */
+/*********************************************************************/
+static Activation *PlaceComplexityActivation(
+  Activation *newActivation,
+  struct salienceGroup *theGroup)
+  {
+   unsigned int complexity;
+   unsigned long long timetag;
+   Activation *lastAct, *actPtr;
+
+   /*========================================*/
+   /* Set up initial information for search. */
+   /*========================================*/
+
+   timetag = newActivation->timetag;
+   complexity = newActivation->theRule->complexity;
+   if (theGroup->prev == NULL)
+     { lastAct = NULL; }
+   else
+     { lastAct = theGroup->prev->last; }
+
+   /*=========================================================*/
+   /* Find the insertion point in the agenda. The activation  */
+   /* is placed before activations of lower salience and      */
+   /* after activations of higher salience. Among activations */
+   /* of equal salience, the activation is placed before      */
+   /* activations of equal or lessor complexity.              */
+   /*=========================================================*/
+
+   actPtr = theGroup->first;
+   while (actPtr != NULL)
+     {
+      if (complexity < actPtr->theRule->complexity)
+        {
+         lastAct = actPtr;
+         if (actPtr == theGroup->last)
+           { break; }
+         else
+           { actPtr = actPtr->next; }
+        }
+      else if (complexity > actPtr->theRule->complexity)
+        { break; }
+      else if (timetag > actPtr->timetag)
+        {
+         lastAct = actPtr;
+         if (actPtr == theGroup->last)
+           { break; }
+         else
+           { actPtr = actPtr->next; }
+        }
+      else
+        { break; }
+     }
+
+   /*========================================*/
+   /* Update the salience group information. */
+   /*========================================*/
+
+   if ((lastAct == NULL) ||
+       ((theGroup->prev != NULL) && (theGroup->prev->last == lastAct)))
+     { theGroup->first = newActivation; }
+
+   if ((theGroup->last == NULL) || (theGroup->last == lastAct))
+     { theGroup->last = newActivation; }
+
+   /*===========================================*/
+   /* Return the insertion point in the agenda. */
+   /*===========================================*/
+
+   return lastAct;
+  }
+
+/*********************************************************************/
+/* PlaceSimplicityActivation: Determines the location in the agenda  */
+/*    where a new activation should be placed for the simplicity     */
+/*    strategy. Returns a pointer to the activation  after which the */
+/*    new activation should be placed (or NULL if the activation     */
+/*    should be placed at the beginning of the agenda).              */
+/*********************************************************************/
+static Activation *PlaceSimplicityActivation(
+  Activation *newActivation,
+  struct salienceGroup *theGroup)
+  {
+   unsigned int complexity;
+   unsigned long long timetag;
+   Activation *lastAct, *actPtr;
+
+   /*============================================*/
+   /* Set up initial information for the search. */
+   /*============================================*/
+
+   timetag = newActivation->timetag;
+   complexity = newActivation->theRule->complexity;
+   if (theGroup->prev == NULL)
+     { lastAct = NULL; }
+   else
+     { lastAct = theGroup->prev->last; }
+
+   /*=========================================================*/
+   /* Find the insertion point in the agenda. The activation  */
+   /* is placed before activations of lower salience and      */
+   /* after activations of higher salience. Among activations */
+   /* of equal salience, the activation is placed after       */
+   /* activations of equal or greater complexity.             */
+   /*=========================================================*/
+
+   actPtr = theGroup->first;
+   while (actPtr != NULL)
+     {
+      if (complexity > actPtr->theRule->complexity)
+        {
+         lastAct = actPtr;
+         if (actPtr == theGroup->last)
+           { break; }
+         else
+           { actPtr = actPtr->next; }
+        }
+      else if (complexity < actPtr->theRule->complexity)
+        { break; }
+      else if (timetag > actPtr->timetag)
+        {
+         lastAct = actPtr;
+         if (actPtr == theGroup->last)
+           { break; }
+         else
+           { actPtr = actPtr->next; }
+        }
+      else
+       { break; }
+     }
+
+   /*========================================*/
+   /* Update the salience group information. */
+   /*========================================*/
+
+   if ((lastAct == NULL) ||
+       ((theGroup->prev != NULL) && (theGroup->prev->last == lastAct)))
+     { theGroup->first = newActivation; }
+
+   if ((theGroup->last == NULL) || (theGroup->last == lastAct))
+     { theGroup->last = newActivation; }
+
+   /*===========================================*/
+   /* Return the insertion point in the agenda. */
+   /*===========================================*/
+
+   return(lastAct);
+  }
+
+/*******************************************************************/
+/* PlaceRandomActivation: Determines the location in the agenda    */
+/*    where a new activation should be placed for the random       */
+/*    strategy. Returns a pointer to the activation  after which   */
+/*    the new activation should be placed (or NULL if the          */
+/*    activation should be placed at the beginning of the agenda). */
+/*******************************************************************/
+static Activation *PlaceRandomActivation(
+  Activation *newActivation,
+  struct salienceGroup *theGroup)
+  {
+   int randomID;
+   unsigned long long timetag;
+   Activation *lastAct, *actPtr;
+
+   /*============================================*/
+   /* Set up initial information for the search. */
+   /*============================================*/
+
+   timetag = newActivation->timetag;
+   randomID = newActivation->randomID;
+   if (theGroup->prev == NULL)
+     { lastAct = NULL; }
+   else
+     { lastAct = theGroup->prev->last; }
+
+   /*=========================================================*/
+   /* Find the insertion point in the agenda. The activation  */
+   /* is placed before activations of lower salience and      */
+   /* after activations of higher salience. Among activations */
+   /* of equal salience, the placement of the activation is   */
+   /* determined through the generation of a random number.   */
+   /*=========================================================*/
+
+   actPtr = theGroup->first;
+   while (actPtr != NULL)
+     {
+      if (randomID > actPtr->randomID)
+        {
+         lastAct = actPtr;
+         if (actPtr == theGroup->last)
+           { break; }
+         else
+           { actPtr = actPtr->next; }
+        }
+      else if (randomID < actPtr->randomID)
+       { break; }
+      else if (timetag > actPtr->timetag)
+        {
+         lastAct = actPtr;
+         if (actPtr == theGroup->last)
+           { break; }
+         else
+           { actPtr = actPtr->next; }
+        }
+      else
+       { break; }
+     }
+
+   /*========================================*/
+   /* Update the salience group information. */
+   /*========================================*/
+
+   if ((lastAct == NULL) ||
+       ((theGroup->prev != NULL) && (theGroup->prev->last == lastAct)))
+     { theGroup->first = newActivation; }
+
+   if ((theGroup->last == NULL) || (theGroup->last == lastAct))
+     { theGroup->last = newActivation; }
+
+   /*===========================================*/
+   /* Return the insertion point in the agenda. */
+   /*===========================================*/
+
+   return(lastAct);
+  }
+
+/*********************************************************/
+/* SortPartialMatch: Creates an array of sorted timetags */
+/*    in ascending order from a partial match.           */
+/*********************************************************/
+static unsigned long long *SortPartialMatch(
+  Environment *theEnv,
+  struct partialMatch *binds)
+  {
+   unsigned long long *nbinds;
+   unsigned long long temp;
+   bool flag;
+   unsigned short j, k;
+
+   /*====================================================*/
+   /* Copy the array. Use 0 to represent the timetags of */
+   /* negated patterns. Patterns matching fact/instances */
+   /* should have timetags greater than 0.               */
+   /*====================================================*/
+
+   nbinds = (unsigned long long *) get_mem(theEnv,sizeof(long long) * binds->bcount);
+
+   for (j = 0; j < binds->bcount; j++)
+     {
+      if ((binds->binds[j].gm.theMatch != NULL) &&
+          (binds->binds[j].gm.theMatch->matchingItem != NULL))
+        { nbinds[j] = binds->binds[j].gm.theMatch->matchingItem->timeTag; }
+      else
+        { nbinds[j] = 0; }
+     }
+
+   /*=================*/
+   /* Sort the array. */
+   /*=================*/
+
+   for (flag = true, k = binds->bcount - 1;
+        flag == true;
+        k--)
+     {
+      flag = false;
+      for (j = 0 ; j < k ; j++)
+        {
+         if (nbinds[j] < nbinds[j + 1])
+           {
+            temp = nbinds[j];
+            nbinds[j] = nbinds[j+1];
+            nbinds[j+1] = temp;
+            flag = true;
+           }
+        }
+     }
+
+   /*===================*/
+   /* Return the array. */
+   /*===================*/
+
+   return nbinds;
+  }
+
+/**************************************************************************/
+/* ComparePartialMatches: Compares two activations using the lex conflict */
+/*   resolution strategy to determine which activation should be placed   */
+/*   first on the agenda. This lexicographic comparison function is used  */
+/*   for both the lex and mea strategies.                                 */
+/**************************************************************************/
+static int ComparePartialMatches(
+  Environment *theEnv,
+  Activation *actPtr,
+  Activation *newActivation)
+  {
+   unsigned cCount, oCount, mCount, i;
+   unsigned long long *basis1, *basis2;
+
+   /*=================================================*/
+   /* If the activation already on the agenda doesn't */
+   /* have a set of sorted timetags, then create one. */
+   /*=================================================*/
+
+   basis1 = SortPartialMatch(theEnv,newActivation->basis);
+   basis2 = SortPartialMatch(theEnv,actPtr->basis);
+
+   /*==============================================================*/
+   /* Determine the number of timetags in each of the activations. */
+   /* The number of timetags to be compared is the lessor of these */
+   /* two numbers.                                                 */
+   /*==============================================================*/
+
+   cCount = newActivation->basis->bcount;
+   oCount = actPtr->basis->bcount;
+
+   if (oCount > cCount) mCount = cCount;
+   else mCount = oCount;
+
+   /*===========================================================*/
+   /* Compare the sorted timetags one by one until there are no */
+   /* more timetags to compare or the timetags being compared   */
+   /* are not equal. If the timetags aren't equal, then the     */
+   /* activation containing the larger timetag is placed before */
+   /* the activation containing the smaller timetag.            */
+   /*===========================================================*/
+
+   for (i = 0 ; i < mCount ; i++)
+     {
+      if (basis1[i] < basis2[i])
+        {
+         rtn_mem(theEnv,sizeof(long long) * cCount,basis1);
+         rtn_mem(theEnv,sizeof(long long) * oCount,basis2);
+         return(LESS_THAN);
+        }
+      else if (basis1[i] > basis2[i])
+        {
+         rtn_mem(theEnv,sizeof(long long) * cCount,basis1);
+         rtn_mem(theEnv,sizeof(long long) * oCount,basis2);
+         return(GREATER_THAN);
+        }
+     }
+
+   rtn_mem(theEnv,sizeof(long long) * cCount,basis1);
+   rtn_mem(theEnv,sizeof(long long) * oCount,basis2);
+
+   /*==========================================================*/
+   /* If the sorted timetags are identical up to the number of */
+   /* timetags contained in the smaller partial match, then    */
+   /* the activation containing more timetags should be        */
+   /* placed before the activation containing fewer timetags.  */
+   /*==========================================================*/
+
+   if (cCount < oCount) return(LESS_THAN);
+   else if (cCount > oCount) return(GREATER_THAN);
+
+   /*=========================================================*/
+   /* If the sorted partial matches for both activations are  */
+   /* identical (containing the same number and values of     */
+   /* timetags), then the activation associated with the rule */
+   /* having the highest complexity is placed before the      */
+   /* other partial match.                                    */
+   /*=========================================================*/
+
+   if (newActivation->theRule->complexity < actPtr->theRule->complexity)
+     { return(LESS_THAN); }
+   else if (newActivation->theRule->complexity > actPtr->theRule->complexity)
+     { return(GREATER_THAN); }
+
+   /*================================================*/
+   /* The two partial matches are equal for purposes */
+   /* of placement on the agenda for the lex and mea */
+   /* conflict resolution strategies.                */
+   /*================================================*/
+
+   return(EQUAL);
+  }
+
+/***********************************/
+/* SetStrategy: C access routine   */
+/*   for the set-strategy command. */
+/***********************************/
+StrategyType SetStrategy(
+  Environment *theEnv,
+  StrategyType value)
+  {
+   StrategyType oldStrategy;
+
+   oldStrategy = AgendaData(theEnv)->Strategy;
+   AgendaData(theEnv)->Strategy = value;
+
+   if (oldStrategy != AgendaData(theEnv)->Strategy)
+     { ReorderAllAgendas(theEnv); }
+
+   return oldStrategy;
+  }
+
+/***********************************/
+/* GetStrategy: C access routine   */
+/*   for the get-strategy command. */
+/***********************************/
+StrategyType GetStrategy(
+  Environment *theEnv)
+  {
+   return AgendaData(theEnv)->Strategy;
+  }
+
+/********************************************/
+/* GetStrategyCommand: H/L access routine   */
+/*   for the get-strategy command.          */
+/********************************************/
+void GetStrategyCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateSymbol(theEnv,GetStrategyName(GetStrategy(theEnv)));
+  }
+
+/********************************************/
+/* SetStrategyCommand: H/L access routine   */
+/*   for the set-strategy command.          */
+/********************************************/
+void SetStrategyCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   const char *argument;
+   StrategyType oldStrategy;
+
+   /*=======================*/
+   /* Set the return value. */
+   /*=======================*/
+
+   oldStrategy = GetStrategy(theEnv);
+   returnValue->lexemeValue = CreateSymbol(theEnv,GetStrategyName(oldStrategy));
+
+   /*=========================================*/
+   /* Check for the correct type of argument. */
+   /*=========================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   /*=============================================*/
+   /* Set the strategy to the specified strategy. */
+   /*=============================================*/
+
+   argument = theArg.lexemeValue->contents;
+
+   if (strcmp(argument,"depth") == 0)
+     { SetStrategy(theEnv,DEPTH_STRATEGY); }
+   else if (strcmp(argument,"breadth") == 0)
+     { SetStrategy(theEnv,BREADTH_STRATEGY); }
+   else if (strcmp(argument,"lex") == 0)
+     { SetStrategy(theEnv,LEX_STRATEGY); }
+   else if (strcmp(argument,"mea") == 0)
+     { SetStrategy(theEnv,MEA_STRATEGY); }
+   else if (strcmp(argument,"complexity") == 0)
+     { SetStrategy(theEnv,COMPLEXITY_STRATEGY); }
+   else if (strcmp(argument,"simplicity") == 0)
+     { SetStrategy(theEnv,SIMPLICITY_STRATEGY); }
+   else if (strcmp(argument,"random") == 0)
+     { SetStrategy(theEnv,RANDOM_STRATEGY); }
+   else
+     {
+      UDFInvalidArgumentMessage(context,
+         "symbol with value depth, breadth, lex, mea, complexity, simplicity, or random");
+     }
+  }
+
+/**********************************************************/
+/* GetStrategyName: Given the integer value corresponding */
+/*   to a specified strategy, return a character string   */
+/*   of the strategy's name.                              */
+/**********************************************************/
+static const char *GetStrategyName(
+  StrategyType strategy)
+  {
+   const char *sname;
+
+   switch (strategy)
+     {
+      case DEPTH_STRATEGY:
+        sname = "depth";
+        break;
+      case BREADTH_STRATEGY:
+        sname = "breadth";
+        break;
+      case LEX_STRATEGY:
+        sname = "lex";
+        break;
+      case MEA_STRATEGY:
+        sname = "mea";
+        break;
+      case COMPLEXITY_STRATEGY:
+        sname = "complexity";
+        break;
+      case SIMPLICITY_STRATEGY:
+        sname = "simplicity";
+        break;
+      case RANDOM_STRATEGY:
+        sname = "random";
+        break;
+      default:
+        sname = "unknown";
+        break;
+     }
+
+   return(sname);
+  }
+
+#endif /* DEFRULE_CONSTRUCT */
+
diff --git a/clips/crstrtgy.h b/clips/crstrtgy.h
new file mode 100755
index 000000000..fea7114bb
--- /dev/null
+++ b/clips/crstrtgy.h
@@ -0,0 +1,85 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*      CONFLICT RESOLUTION STRATEGY HEADER MODULE     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Used to determine where a new activation is      */
+/*   placed on the agenda based on the current conflict      */
+/*   resolution strategy (depth, breadth, mea, lex,          */
+/*   simplicity, or complexity). Also provides the           */
+/*   set-strategy and get-strategy commands.                 */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES         */
+/*            compilation flag.                              */
+/*                                                           */
+/*      6.30: Added salience groups to improve performance   */
+/*            with large numbers of activations of different */
+/*            saliences.                                     */
+/*                                                           */
+/*            Removed pseudo-facts used for not CEs.         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_crstrtgy
+
+#pragma once
+
+#define _H_crstrtgy
+
+typedef enum
+  {
+   DEPTH_STRATEGY,
+   BREADTH_STRATEGY,
+   LEX_STRATEGY,
+   MEA_STRATEGY,
+   COMPLEXITY_STRATEGY,
+   SIMPLICITY_STRATEGY,
+   RANDOM_STRATEGY
+  } StrategyType;
+
+#include "agenda.h"
+#include "entities.h"
+
+#define DEFAULT_STRATEGY DEPTH_STRATEGY
+
+   void                           PlaceActivation(Environment *,Activation **,Activation *,struct salienceGroup *);
+   StrategyType                   SetStrategy(Environment *,StrategyType);
+   StrategyType                   GetStrategy(Environment *);
+   void                           SetStrategyCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetStrategyCommand(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_crstrtgy */
+
+
diff --git a/clips/cstrcbin.c b/clips/cstrcbin.c
new file mode 100755
index 000000000..fa1fb1ccd
--- /dev/null
+++ b/clips/cstrcbin.c
@@ -0,0 +1,185 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*          CONSTRUCT BINARY LOAD/SAVE MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Binary load/save functions for construct         */
+/*   headers.                                                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+
+#include "bload.h"
+#include "envrnmnt.h"
+
+#if BLOAD_AND_BSAVE
+#include "bsave.h"
+#endif
+
+#include "moduldef.h"
+
+#include "cstrcbin.h"
+
+#if BLOAD_AND_BSAVE
+
+/***************************************************
+  NAME         : MarkConstructHeaderNeededItems
+  DESCRIPTION  : Marks symbols and other ephemerals
+                 needed by a construct header, and
+                 sets the binary-save id for the
+                 construct
+  INPUTS       : 1) The construct header
+                 2) The binary-save id to assign
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Id set and items marked
+  NOTES        : None
+ ***************************************************/
+void MarkConstructHeaderNeededItems(
+  ConstructHeader *theConstruct,
+  unsigned long theBsaveID)
+  {
+   theConstruct->name->neededSymbol = true;
+   theConstruct->bsaveID = theBsaveID;
+  }
+
+/******************************************************
+  NAME         : AssignBsaveConstructHeaderVals
+  DESCRIPTION  : Assigns value to the construct
+                 header for saving in the binary file
+  INPUTS       : 1) The binary-save buffer for the
+                    construct header values
+                 2) The actual construct header
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary-save buffer for construct
+                 header written with appropriate values
+  NOTES        : Assumes that module items for this
+                 construct were saved in the same
+                 order as the defmodules.
+                 The defmodule binary-save id is
+                 used for the whichModule id of
+                 this construct.
+ ******************************************************/
+void AssignBsaveConstructHeaderVals(
+  struct bsaveConstructHeader *theBsaveConstruct,
+  ConstructHeader *theConstruct)
+  {
+   if (theConstruct->name != NULL)
+     { theBsaveConstruct->name = theConstruct->name->bucket; }
+   else
+     { theBsaveConstruct->name = ULONG_MAX; }
+   
+   if ((theConstruct->whichModule != NULL) &&
+       (theConstruct->whichModule->theModule != NULL))
+     { theBsaveConstruct->whichModule = theConstruct->whichModule->theModule->header.bsaveID; }
+   else
+     { theBsaveConstruct->whichModule = ULONG_MAX; }
+     
+   if (theConstruct->next != NULL)
+     theBsaveConstruct->next = theConstruct->next->bsaveID;
+   else
+     theBsaveConstruct->next = ULONG_MAX;
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+/***************************************************
+  NAME         : UpdateConstructHeader
+  DESCRIPTION  : Determines field values for
+                 construct header from binary-load
+                 buffer
+  INPUTS       : 1) The binary-load data for the
+                    construct header
+                 2) The actual construct header
+                 3) The size of a defmodule item for
+                    this construct
+                 4) The array of all defmodule items
+                    for this construct
+                 5) The size of this construct
+                 6) The array of these constructs
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Header values set
+  NOTES        : None
+ ***************************************************/
+void UpdateConstructHeader(
+  Environment *theEnv,
+  struct bsaveConstructHeader *theBsaveConstruct,
+  ConstructHeader *theConstruct,
+  ConstructType theType,
+  size_t itemModuleSize,
+  void *itemModuleArray,
+  size_t itemSize,
+  void *itemArray)
+  {
+   size_t moduleOffset, itemOffset;
+
+   if (theBsaveConstruct->whichModule != ULONG_MAX)
+     {
+      moduleOffset = itemModuleSize * theBsaveConstruct->whichModule;
+      theConstruct->whichModule =
+        (struct defmoduleItemHeader *) &((char *) itemModuleArray)[moduleOffset];
+     }
+   else
+     { theConstruct->whichModule = NULL; }
+     
+   if (theBsaveConstruct->name != ULONG_MAX)
+     {
+      theConstruct->name = SymbolPointer(theBsaveConstruct->name);
+      IncrementLexemeCount(theConstruct->name);
+     }
+   else
+     { theConstruct->name = NULL; }
+     
+   if (theBsaveConstruct->next != ULONG_MAX)
+     {
+      itemOffset = itemSize * theBsaveConstruct->next;
+      theConstruct->next = (ConstructHeader *) &((char *) itemArray)[itemOffset];
+     }
+   else
+     { theConstruct->next = NULL; }
+
+   theConstruct->constructType = theType;
+   theConstruct->env = theEnv;
+   theConstruct->ppForm = NULL;
+   theConstruct->bsaveID = 0L;
+   theConstruct->usrData = NULL;
+  }
+
+/*******************************************************
+  NAME         : UnmarkConstructHeader
+  DESCRIPTION  : Releases any ephemerals (symbols, etc.)
+                 of a construct header for removal
+  INPUTS       : The construct header
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Busy counts fo ephemerals decremented
+  NOTES        : None
+ *******************************************************/
+void UnmarkConstructHeader(
+  Environment *theEnv,
+  ConstructHeader *theConstruct)
+  {
+   ReleaseLexeme(theEnv,theConstruct->name);
+  }
+
+#endif /* BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE */
+
diff --git a/clips/cstrcbin.h b/clips/cstrcbin.h
new file mode 100755
index 000000000..0a0021cc9
--- /dev/null
+++ b/clips/cstrcbin.h
@@ -0,0 +1,61 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrcbin
+
+#pragma once
+
+#define _H_cstrcbin
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+
+struct bsaveConstructHeader
+  {
+   unsigned long name;
+   unsigned long whichModule;
+   unsigned long next;
+  };
+
+#include "constrct.h"
+
+#if BLOAD_AND_BSAVE
+void MarkConstructHeaderNeededItems(ConstructHeader *,unsigned long);
+void AssignBsaveConstructHeaderVals(struct bsaveConstructHeader *,
+                                    ConstructHeader *);
+#endif
+
+void UpdateConstructHeader(Environment *,struct bsaveConstructHeader *,
+                           ConstructHeader *,ConstructType,size_t,void *,size_t,void *);
+void UnmarkConstructHeader(Environment *,ConstructHeader *);
+
+#endif
+
+#endif
+
+
+
+
diff --git a/clips/cstrccmp.h b/clips/cstrccmp.h
new file mode 100755
index 000000000..1635bda16
--- /dev/null
+++ b/clips/cstrccmp.h
@@ -0,0 +1,43 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  06/20/16            */
+   /*                                                     */
+   /*           CONSTRUCT CONSTRUCTS-TO-C HEADER          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*      Support functions for the constructs-to-c of         */
+/*      construct headers and related items.                 */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed ANSI_COMPILER compilation flag.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrccmp
+
+#pragma once
+
+#define _H_cstrccmp
+
+#include <stdio.h>
+
+   void                           MarkConstructHeaders(int);
+
+#endif /* _H_cstrccmp */
+
+
+
+
diff --git a/clips/cstrccom.c b/clips/cstrccom.c
new file mode 100755
index 000000000..aefb60551
--- /dev/null
+++ b/clips/cstrccom.c
@@ -0,0 +1,1776 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*              CONSTRUCT COMMANDS MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains generic routines for deleting, pretty   */
+/*   printing, finding, obtaining module information,        */
+/*   obtaining lists of constructs, listing constructs, and  */
+/*   manipulation routines.                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Modified GetConstructList to remove buffer     */
+/*            overflow problem with large construct/module   */
+/*            names. DR0858                                  */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*            Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Corrected an error when compiling as a C++     */
+/*            file. DR0868                                   */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added ConstructsDeletable function.            */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Change find construct functionality so that    */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.31: Fixed use after free issue for deallocation    */
+/*            functions passed to DoForAllConstructs.        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include <string.h>
+
+#include "setup.h"
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "moduldef.h"
+#include "argacces.h"
+#include "multifld.h"
+#include "modulutl.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+#include "commline.h"
+#include "sysdep.h"
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+#include "cstrcpsr.h"
+#endif
+
+#include "cstrccom.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if DEBUGGING_FUNCTIONS
+   static void                    ConstructPrintWatch(Environment *,const char *,Construct *,
+                                                      ConstructHeader *,
+                                                      ConstructGetWatchFunction *);
+   static bool                    ConstructWatchSupport(Environment *,Construct *,const char *,
+                                                        const char *,Expression *,bool,
+                                                        bool,ConstructGetWatchFunction *,
+                                                        ConstructSetWatchFunction *);
+#endif
+
+#if (! RUN_TIME)
+
+/************************************/
+/* AddConstructToModule: Adds a     */
+/* construct to the current module. */
+/************************************/
+void AddConstructToModule(
+  ConstructHeader *theConstruct)
+  {
+   if (theConstruct->whichModule->lastItem == NULL)
+     { theConstruct->whichModule->firstItem = theConstruct; }
+   else
+     { theConstruct->whichModule->lastItem->next = theConstruct; }
+
+   theConstruct->whichModule->lastItem = theConstruct;
+   theConstruct->next = NULL;
+  }
+
+#endif /* (! RUN_TIME) */
+
+/****************************************************/
+/* DeleteNamedConstruct: Generic driver routine for */
+/*   deleting a specific construct from a module.   */
+/****************************************************/
+bool DeleteNamedConstruct(
+  Environment *theEnv,
+  const char *constructName,
+  Construct *constructClass)
+  {
+#if (! BLOAD_ONLY)
+   ConstructHeader *constructPtr;
+
+   /*=============================*/
+   /* Constructs can't be deleted */
+   /* while a bload is in effect. */
+   /*=============================*/
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv) == true) return false;
+#endif
+
+   /*===============================*/
+   /* Look for the named construct. */
+   /*===============================*/
+
+   constructPtr = (*constructClass->findFunction)(theEnv,constructName);
+
+   /*========================================*/
+   /* If the construct was found, delete it. */
+   /*========================================*/
+
+   if (constructPtr != NULL)
+     { return (*constructClass->deleteFunction)(constructPtr,theEnv); }
+
+   /*========================================*/
+   /* If the construct wasn't found, but the */
+   /* special symbol * was used, then delete */
+   /* all constructs of the specified type.  */
+   /*========================================*/
+
+   if (strcmp("*",constructName) == 0)
+     {
+      (*constructClass->deleteFunction)(NULL,theEnv);
+      return true;
+     }
+
+   /*===============================*/
+   /* Otherwise, return false to    */
+   /* indicate no deletion occured. */
+   /*===============================*/
+
+   return false;
+#else
+#if MAC_XCD
+#pragma unused(theEnv,constructName,constructClass)
+#endif
+   return false;
+#endif
+  }
+
+/********************************************************/
+/* FindNamedConstructInModuleOrImports: Generic routine */
+/*   for searching for a specified construct.           */
+/********************************************************/
+ConstructHeader *FindNamedConstructInModuleOrImports(
+  Environment *theEnv,
+  const char *constructName,
+  Construct *constructClass)
+  {
+   ConstructHeader *theConstruct;
+   unsigned int count;
+
+   /*================================================*/
+   /* First look in the current or specified module. */
+   /*================================================*/
+
+   theConstruct = FindNamedConstructInModule(theEnv,constructName,constructClass);
+   if (theConstruct != NULL) return theConstruct;
+
+   /*=====================================*/
+   /* If there's a module specifier, then */
+   /* the construct does not exist.       */
+   /*=====================================*/
+
+   if (FindModuleSeparator(constructName))
+     { return NULL; }
+
+   /*========================================*/
+   /* Otherwise, search in imported modules. */
+   /*========================================*/
+
+   theConstruct = FindImportedConstruct(theEnv,constructClass->constructName,NULL,
+                                        constructName,&count,true,NULL);
+
+   if (count > 1)
+     {
+      AmbiguousReferenceErrorMessage(theEnv,constructClass->constructName,constructName);
+      return NULL;
+     }
+
+   return theConstruct;
+  }
+
+/***********************************************/
+/* FindNamedConstructInModule: Generic routine */
+/*   for searching for a specified construct.  */
+/***********************************************/
+ConstructHeader *FindNamedConstructInModule(
+  Environment *theEnv,
+  const char *constructName,
+  Construct *constructClass)
+  {
+   ConstructHeader *theConstruct;
+   CLIPSLexeme *findValue;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*=========================================================*/
+   /* Extract the construct name. If a module was specified,  */
+   /* then ExtractModuleAndConstructName will set the current */
+   /* module to the module specified in the name.             */
+   /*=========================================================*/
+
+   constructName = ExtractModuleAndConstructName(theEnv,constructName);
+
+   /*=================================================*/
+   /* If a valid construct name couldn't be extracted */
+   /* or the construct name isn't in the symbol table */
+   /* (which means the construct doesn't exist), then */
+   /* return NULL to indicate the specified construct */
+   /* couldn't be found.                              */
+   /*=================================================*/
+
+   if ((constructName == NULL) ?
+       true :
+       ((findValue = FindSymbolHN(theEnv,constructName,SYMBOL_BIT)) == NULL))
+     {
+      RestoreCurrentModule(theEnv);
+      return NULL;
+     }
+
+   /*===============================================*/
+   /* If we find the symbol for the construct name, */
+   /* but it has a count of 0, then it can't be for */
+   /* a construct that's currently defined.         */
+   /*===============================================*/
+
+   if (findValue->count == 0)
+     {
+      RestoreCurrentModule(theEnv);
+      return NULL;
+     }
+
+   /*===============================================*/
+   /* Loop through every construct of the specified */
+   /* class in the current module checking to see   */
+   /* if the construct's name matches the construct */
+   /* being sought. If found, restore the current   */
+   /* module and return a pointer to the construct. */
+   /*===============================================*/
+
+   for (theConstruct = (*constructClass->getNextItemFunction)(theEnv,NULL);
+        theConstruct != NULL;
+        theConstruct = (*constructClass->getNextItemFunction)(theEnv,theConstruct))
+     {
+      if (findValue == (*constructClass->getConstructNameFunction)(theConstruct))
+        {
+         RestoreCurrentModule(theEnv);
+         return theConstruct;
+        }
+     }
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+
+   /*====================================*/
+   /* Return NULL to indicated the named */
+   /* construct was not found.           */
+   /*====================================*/
+
+   return NULL;
+  }
+
+/*****************************************/
+/* UndefconstructCommand: Driver routine */
+/*   for the undef<construct> commands.  */
+/*****************************************/
+void UndefconstructCommand(
+  UDFContext *context,
+  const char *command,
+  Construct *constructClass)
+  {
+   Environment *theEnv = context->environment;
+   const char *constructName;
+   char buffer[80];
+
+   /*==============================================*/
+   /* Get the name of the construct to be deleted. */
+   /*==============================================*/
+
+   gensprintf(buffer,"%s name",constructClass->constructName);
+
+   constructName = GetConstructName(context,command,buffer);
+   if (constructName == NULL) return;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+   /*=============================================*/
+   /* Check to see if the named construct exists. */
+   /*=============================================*/
+
+   if (((*constructClass->findFunction)(theEnv,constructName) == NULL) &&
+       (strcmp("*",constructName) != 0))
+     {
+      CantFindItemErrorMessage(theEnv,constructClass->constructName,constructName,true);
+      return;
+     }
+
+   /*===============================================*/
+   /* If the construct does exist, try deleting it. */
+   /*===============================================*/
+
+   else if (DeleteNamedConstruct(theEnv,constructName,constructClass) == false)
+     {
+      CantDeleteItemErrorMessage(theEnv,constructClass->constructName,constructName);
+      return;
+     }
+
+   return;
+#else
+   /*=====================================*/
+   /* Constructs can't be deleted in a    */
+   /* run-time or bload only environment. */
+   /*=====================================*/
+
+   CantDeleteItemErrorMessage(theEnv,constructClass->constructName,constructName);
+   return;
+#endif
+  }
+
+/******************************************/
+/* PPConstructCommand: Driver routine for */
+/*   the ppdef<construct> commands.       */
+/******************************************/
+void PPConstructCommand(
+  UDFContext *context,
+  const char *command,
+  Construct *constructClass,
+  UDFValue *returnValue)
+  {
+   Environment *theEnv = context->environment;
+   const char *constructName;
+   const char *logicalName;
+   const char *ppForm;
+   char buffer[80];
+
+   /*===============================*/
+   /* Get the name of the construct */
+   /* to be "pretty printed."       */
+   /*===============================*/
+
+   gensprintf(buffer,"%s name",constructClass->constructName);
+
+   constructName = GetConstructName(context,command,buffer);
+   if (constructName == NULL) return;
+   
+   if (UDFHasNextArgument(context))
+     {
+      logicalName = GetLogicalName(context,STDOUT);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,command);
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+     }
+   else
+     { logicalName = STDOUT; }
+
+   /*================================*/
+   /* Call the driver routine for    */
+   /* pretty printing the construct. */
+   /*================================*/
+
+   if (strcmp(logicalName,"nil") == 0)
+     {
+      ppForm = PPConstructNil(theEnv,constructName,constructClass);
+      
+      if (ppForm == NULL)
+        { CantFindItemErrorMessage(theEnv,constructClass->constructName,constructName,true); }
+
+      returnValue->lexemeValue = CreateString(theEnv,ppForm);
+      
+      return;
+     }
+
+   if (PPConstruct(theEnv,constructName,logicalName,constructClass) == false)
+     { CantFindItemErrorMessage(theEnv,constructClass->constructName,constructName,true); }
+  }
+
+/******************************************************/
+/* PPConstructNil: Driver routine for pretty printing */
+/*   a construct using the logical name nil.          */
+/******************************************************/
+const char *PPConstructNil(
+  Environment *theEnv,
+  const char *constructName,
+  Construct *constructClass)
+  {
+   ConstructHeader *constructPtr;
+
+   /*==================================*/
+   /* Use the construct's name to find */
+   /* a pointer to actual construct.   */
+   /*==================================*/
+
+   constructPtr = (*constructClass->findFunction)(theEnv,constructName);
+   if (constructPtr == NULL) return NULL;
+
+   /*==============================================*/
+   /* If the pretty print form is NULL (because of */
+   /* conserve-mem), return "" (which indicates    */
+   /* the construct was found).                    */
+   /*==============================================*/
+
+   if ((*constructClass->getPPFormFunction)(constructPtr) == NULL)
+     { return ""; }
+
+   /*=================================*/
+   /* Return the pretty print string. */
+   /*=================================*/
+
+   return (*constructClass->getPPFormFunction)(constructPtr);
+  }
+
+/***********************************/
+/* PPConstruct: Driver routine for */
+/*   pretty printing a construct.  */
+/***********************************/
+bool PPConstruct(
+  Environment *theEnv,
+  const char *constructName,
+  const char *logicalName,
+  Construct *constructClass)
+  {
+   ConstructHeader *constructPtr;
+
+   /*==================================*/
+   /* Use the construct's name to find */
+   /* a pointer to actual construct.   */
+   /*==================================*/
+
+   constructPtr = (*constructClass->findFunction)(theEnv,constructName);
+   if (constructPtr == NULL) return false;
+
+   /*==============================================*/
+   /* If the pretty print form is NULL (because of */
+   /* conserve-mem), return true (which indicates  */
+   /* the construct was found).                    */
+   /*==============================================*/
+
+   if ((*constructClass->getPPFormFunction)(constructPtr) == NULL)
+     { return true; }
+
+   /*================================*/
+   /* Print the pretty print string. */
+   /*================================*/
+
+   WriteString(theEnv,logicalName,(*constructClass->getPPFormFunction)(constructPtr));
+
+   /*=======================================*/
+   /* Return true to indicate the construct */
+   /* was found and pretty printed.         */
+   /*=======================================*/
+
+   return true;
+  }
+
+/*********************************************/
+/* GetConstructModuleCommand: Driver routine */
+/*   for def<construct>-module routines      */
+/*********************************************/
+CLIPSLexeme *GetConstructModuleCommand(
+  UDFContext *context,
+  const char *command,
+  Construct *constructClass)
+  {
+   Environment *theEnv = context->environment;
+   const char *constructName;
+   char buffer[80];
+   Defmodule *constructModule;
+
+   /*=========================================*/
+   /* Get the name of the construct for which */
+   /* we want to determine its module.        */
+   /*=========================================*/
+
+   gensprintf(buffer,"%s name",constructClass->constructName);
+
+   constructName = GetConstructName(context,command,buffer);
+   if (constructName == NULL) return FalseSymbol(theEnv);
+
+   /*==========================================*/
+   /* Get a pointer to the construct's module. */
+   /*==========================================*/
+
+   constructModule = GetConstructModule(theEnv,constructName,constructClass);
+   if (constructModule == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,constructClass->constructName,constructName,true);
+      return FalseSymbol(theEnv);
+     }
+
+   /*============================================*/
+   /* Return the name of the construct's module. */
+   /*============================================*/
+
+   return constructModule->header.name;
+  }
+
+/******************************************/
+/* GetConstructModule: Driver routine for */
+/*   getting the module for a construct   */
+/******************************************/
+Defmodule *GetConstructModule(
+  Environment *theEnv,
+  const char *constructName,
+  Construct *constructClass)
+  {
+   ConstructHeader *constructPtr;
+   unsigned int count;
+   unsigned position;
+   CLIPSLexeme *theName;
+
+   /*====================================================*/
+   /* If the construct name contains a module specifier, */
+   /* then get a pointer to the defmodule associated     */
+   /* with the specified name.                           */
+   /*====================================================*/
+
+   if ((position = FindModuleSeparator(constructName)) != 0)
+     {
+      theName = ExtractModuleName(theEnv,position,constructName);
+      if (theName != NULL)
+        { return FindDefmodule(theEnv,theName->contents); }
+     }
+
+   /*============================================*/
+   /* No module was specified, so search for the */
+   /* named construct in the current module and  */
+   /* modules from which it imports.             */
+   /*============================================*/
+
+   constructPtr = FindImportedConstruct(theEnv,constructClass->constructName,NULL,constructName,
+                                        &count,true,NULL);
+   if (constructPtr == NULL) return NULL;
+
+   return(constructPtr->whichModule->theModule);
+  }
+
+/****************************************/
+/* UndefconstructAll: Generic C routine */
+/*   for deleting all constructs.       */
+/****************************************/
+bool UndefconstructAll(
+  Environment *theEnv,
+  Construct *constructClass)
+  {
+#if BLOAD_ONLY || RUN_TIME
+#if MAC_XCD
+#pragma unused(constructClass)
+#pragma unused(theEnv)
+#endif
+   return false;
+#else
+   ConstructHeader *currentConstruct, *nextConstruct;
+   bool success = true;
+   GCBlock gcb;
+
+   /*===================================================*/
+   /* Loop through all of the constructs in the module. */
+   /*===================================================*/
+
+   GCBlockStart(theEnv,&gcb);
+   
+   currentConstruct = (*constructClass->getNextItemFunction)(theEnv,NULL);
+   while (currentConstruct != NULL)
+     {
+      /*==============================*/
+      /* Remember the next construct. */
+      /*==============================*/
+
+      nextConstruct = (*constructClass->getNextItemFunction)(theEnv,currentConstruct);
+
+      /*=============================*/
+      /* Try deleting the construct. */
+      /*=============================*/
+
+      if ((*constructClass->isConstructDeletableFunction)(currentConstruct))
+        {
+         RemoveConstructFromModule(theEnv,currentConstruct);
+         (*constructClass->freeFunction)(theEnv,currentConstruct);
+        }
+      else
+        {
+         CantDeleteItemErrorMessage(theEnv,constructClass->constructName,
+                        (*constructClass->getConstructNameFunction)(currentConstruct)->contents);
+         success = false;
+        }
+
+      /*================================*/
+      /* Move on to the next construct. */
+      /*================================*/
+
+      currentConstruct = nextConstruct;
+     }
+     
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+   
+   /*============================================*/
+   /* Return true if all constructs successfully */
+   /* deleted, otherwise false.                  */
+   /*============================================*/
+
+   return success;
+
+#endif
+  }
+
+/*************************************/
+/* Undefconstruct: Generic C routine */
+/*   for deleting a construct.       */
+/*************************************/
+bool Undefconstruct(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  Construct *constructClass)
+  {
+#if BLOAD_ONLY || RUN_TIME
+#if MAC_XCD
+#pragma unused(theConstruct)
+#pragma unused(constructClass)
+#pragma unused(theEnv)
+#endif
+   return false;
+#else
+   GCBlock gcb;
+
+   /*================================================*/
+   /* Delete all constructs of the specified type if */
+   /* the construct pointer is the NULL pointer.     */
+   /*================================================*/
+
+   if (theConstruct == NULL)
+     { return UndefconstructAll(theEnv,constructClass); }
+
+   /*==================================================*/
+   /* Return false if the construct cannot be deleted. */
+   /*==================================================*/
+
+   if ((*constructClass->isConstructDeletableFunction)(theConstruct) == false)
+     { return false; }
+     
+   /*===================================*/
+   /* Start a garbage collection block. */
+   /*===================================*/
+   
+   GCBlockStart(theEnv,&gcb);
+
+   /*===========================*/
+   /* Remove the construct from */
+   /* the list in its module.   */
+   /*===========================*/
+
+   RemoveConstructFromModule(theEnv,theConstruct);
+
+   /*=======================*/
+   /* Delete the construct. */
+   /*=======================*/
+
+   (*constructClass->freeFunction)(theEnv,theConstruct);
+
+   /*===================================*/
+   /* End the garbage collection block. */
+   /*===================================*/
+   
+   GCBlockEnd(theEnv,&gcb);
+
+   /*=============================*/
+   /* Return true to indicate the */
+   /* construct was deleted.      */
+   /*=============================*/
+
+   return true;
+#endif
+  }
+
+/***********************************/
+/* SaveConstruct: Generic routine  */
+/*   for saving a construct class. */
+/***********************************/
+void SaveConstruct(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logicalName,
+  Construct *constructClass)
+  {
+   const char *ppform;
+   ConstructHeader *theConstruct;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*===========================*/
+   /* Set the current module to */
+   /* the one we're examining.  */
+   /*===========================*/
+
+   SetCurrentModule(theEnv,theModule);
+
+   /*==============================================*/
+   /* Loop through each construct of the specified */
+   /* construct class in the module.               */
+   /*==============================================*/
+
+   for (theConstruct = (*constructClass->getNextItemFunction)(theEnv,NULL);
+        theConstruct != NULL;
+        theConstruct = (*constructClass->getNextItemFunction)(theEnv,theConstruct))
+     {
+      /*==========================================*/
+      /* Print the construct's pretty print form. */
+      /*==========================================*/
+
+      ppform = (*constructClass->getPPFormFunction)(theConstruct);
+      if (ppform != NULL)
+        {
+         WriteString(theEnv,logicalName,ppform);
+         WriteString(theEnv,logicalName,"\n");
+        }
+      }
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+  }
+
+/*********************************************************/
+/* GetConstructModuleName: Generic routine for returning */
+/*   the name of the module to which a construct belongs */
+/*********************************************************/
+const char *GetConstructModuleName(
+  ConstructHeader *theConstruct)
+  { return DefmoduleName(theConstruct->whichModule->theModule); }
+
+/*********************************************************/
+/* GetConstructNameString: Generic routine for returning */
+/*   the name string of a construct.                     */
+/*********************************************************/
+const char *GetConstructNameString(
+  ConstructHeader *theConstruct)
+  { return theConstruct->name->contents; }
+
+/**********************************************************/
+/* GetConstructNamePointer: Generic routine for returning */
+/*   the name pointer of a construct.                     */
+/**********************************************************/
+CLIPSLexeme *GetConstructNamePointer(
+  ConstructHeader *theConstruct)
+  { return theConstruct->name; }
+
+/************************************************/
+/* GetConstructListFunction: Generic Routine    */
+/*   for retrieving the constructs in a module. */
+/************************************************/
+void GetConstructListFunction(
+  UDFContext *context,
+  UDFValue *returnValue,
+  Construct *constructClass)
+  {
+   Defmodule *theModule;
+   UDFValue result;
+   unsigned int numArgs;
+   Environment *theEnv = context->environment;
+
+   /*====================================*/
+   /* If an argument was given, check to */
+   /* see that it's a valid module name. */
+   /*====================================*/
+
+   numArgs = UDFArgumentCount(context);
+   if (numArgs == 1)
+     {
+      /*======================================*/
+      /* Only symbols are valid module names. */
+      /*======================================*/
+
+      if (! UDFFirstArgument(context,SYMBOL_BIT,&result))
+        { return; }
+
+      /*===========================================*/
+      /* Verify that the named module exists or is */
+      /* the symbol * (for obtaining the construct */
+      /* list for all modules).                    */
+      /*===========================================*/
+
+      if ((theModule = FindDefmodule(theEnv,result.lexemeValue->contents)) == NULL)
+        {
+         if (strcmp("*",result.lexemeValue->contents) != 0)
+           {
+            SetMultifieldErrorValue(theEnv,returnValue);
+            ExpectedTypeError1(theEnv,UDFContextFunctionName(context),1,"'defmodule name'");
+            return;
+           }
+
+         theModule = NULL;
+        }
+     }
+
+   /*=====================================*/
+   /* Otherwise use the current module to */
+   /* generate the construct list.        */
+   /*=====================================*/
+
+   else
+     { theModule = GetCurrentModule(theEnv); }
+
+   /*=============================*/
+   /* Call the driver routine to  */
+   /* get the list of constructs. */
+   /*=============================*/
+
+   GetConstructList(theEnv,returnValue,constructClass,theModule);
+  }
+
+/********************************************/
+/* GetConstructList: Generic C Routine for  */
+/*   retrieving the constructs in a module. */
+/********************************************/
+void GetConstructList(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  Construct *constructClass,
+  Defmodule *theModule)
+  {
+   ConstructHeader *theConstruct;
+   unsigned long count = 0;
+   Multifield *theList;
+   CLIPSLexeme *theName;
+   Defmodule *loopModule;
+   bool allModules = false;
+   size_t largestConstructNameSize = 0, bufferSize = 80;  /* prevents warning */
+   char *buffer;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*=======================================*/
+   /* If the module specified is NULL, then */
+   /* get all constructs in all modules.    */
+   /*=======================================*/
+
+   if (theModule == NULL)
+     {
+      theModule = GetNextDefmodule(theEnv,NULL);
+      allModules = true;
+     }
+
+   /*======================================================*/
+   /* Count the number of constructs to  be retrieved and  */
+   /* determine the buffer size needed to store the        */
+   /* module-name::construct-names that will be generated. */
+   /*======================================================*/
+
+   loopModule = theModule;
+   while (loopModule != NULL)
+     {
+      size_t tempSize;
+
+      /*======================================================*/
+      /* Set the current module to the module being examined. */
+      /*======================================================*/
+
+      SetCurrentModule(theEnv,loopModule);
+
+      /*===========================================*/
+      /* Loop over every construct in the  module. */
+      /*===========================================*/
+
+      theConstruct = NULL;
+      largestConstructNameSize = 0;
+
+      while ((theConstruct = (*constructClass->getNextItemFunction)(theEnv,theConstruct)) != NULL)
+        {
+         /*================================*/
+         /* Increment the construct count. */
+         /*================================*/
+
+         count++;
+
+         /*=================================================*/
+         /* Is this the largest construct name encountered? */
+         /*=================================================*/
+
+         tempSize = strlen((*constructClass->getConstructNameFunction)(theConstruct)->contents);
+         if (tempSize > largestConstructNameSize)
+           { largestConstructNameSize = tempSize; }
+        }
+
+      /*========================================*/
+      /* Determine the size of the module name. */
+      /*========================================*/
+
+      tempSize = strlen(DefmoduleName(loopModule));
+
+      /*======================================================*/
+      /* The buffer must be large enough for the module name, */
+      /* the largest name of all the constructs, and the ::.  */
+      /*======================================================*/
+
+      if ((tempSize + largestConstructNameSize + 5) > bufferSize)
+        { bufferSize = tempSize + largestConstructNameSize + 5; }
+
+      /*=============================*/
+      /* Move on to the next module. */
+      /*=============================*/
+
+      if (allModules) loopModule = GetNextDefmodule(theEnv,loopModule);
+      else loopModule = NULL;
+     }
+
+   /*===========================*/
+   /* Allocate the name buffer. */
+   /*===========================*/
+
+   buffer = (char *) genalloc(theEnv,bufferSize);
+
+   /*================================*/
+   /* Create the multifield value to */
+   /* store the construct names.     */
+   /*================================*/
+
+   returnValue->begin = 0;
+   returnValue->range = count;
+   theList = CreateMultifield(theEnv,count);
+   returnValue->value = theList;
+
+   /*===========================*/
+   /* Store the construct names */
+   /* in the multifield value.  */
+   /*===========================*/
+
+   loopModule = theModule;
+   count = 0;
+   while (loopModule != NULL)
+     {
+      /*============================*/
+      /* Set the current module to  */
+      /* the module being examined. */
+      /*============================*/
+
+      SetCurrentModule(theEnv,loopModule);
+
+      /*===============================*/
+      /* Add each construct name found */
+      /* in the module to the list.    */
+      /*===============================*/
+
+      theConstruct = NULL;
+      while ((theConstruct = (*constructClass->getNextItemFunction)(theEnv,theConstruct)) != NULL)
+        {
+         theName = (*constructClass->getConstructNameFunction)(theConstruct);
+         if (allModules)
+           {
+            genstrcpy(buffer,DefmoduleName(loopModule));
+            genstrcat(buffer,"::");
+            genstrcat(buffer,theName->contents);
+            theList->contents[count].value = CreateSymbol(theEnv,buffer);
+           }
+         else
+           { theList->contents[count].value = CreateSymbol(theEnv,theName->contents); }
+         count++;
+        }
+
+      /*==================================*/
+      /* Move on to the next module (if   */
+      /* the list is to contain the names */
+      /* of constructs from all modules). */
+      /*==================================*/
+
+      if (allModules) loopModule = GetNextDefmodule(theEnv,loopModule);
+      else loopModule = NULL;
+     }
+
+   /*=========================*/
+   /* Return the name buffer. */
+   /*=========================*/
+
+   genfree(theEnv,buffer,bufferSize);
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+  }
+
+/*********************************************/
+/* ListConstructCommand: Generic Routine for */
+/*   listing the constructs in a module.     */
+/*********************************************/
+void ListConstructCommand(
+  UDFContext *context,
+  Construct *constructClass)
+  {
+   Defmodule *theModule;
+   UDFValue result;
+   unsigned int numArgs;
+   Environment *theEnv = context->environment;
+
+   /*====================================*/
+   /* If an argument was given, check to */
+   /* see that it's a valid module name. */
+   /*====================================*/
+
+   numArgs = UDFArgumentCount(context);
+   if (numArgs == 1)
+     {
+      /*======================================*/
+      /* Only symbols are valid module names. */
+      /*======================================*/
+
+      if (! UDFFirstArgument(context,SYMBOL_BIT,&result))
+        { return; }
+
+      /*===========================================*/
+      /* Verify that the named module exists or is */
+      /* the symbol * (for obtaining the construct */
+      /* list for all modules).                    */
+      /*===========================================*/
+
+      if ((theModule = FindDefmodule(theEnv,result.lexemeValue->contents)) == NULL)
+        {
+         if (strcmp("*",result.lexemeValue->contents) != 0)
+           {
+            ExpectedTypeError1(theEnv,UDFContextFunctionName(context),1,"'defmodule name'");
+            return;
+           }
+
+         theModule = NULL;
+        }
+     }
+
+   /*=====================================*/
+   /* Otherwise use the current module to */
+   /* generate the construct list.        */
+   /*=====================================*/
+
+   else
+     { theModule = GetCurrentModule(theEnv); }
+
+   /*=========================*/
+   /* Call the driver routine */
+   /* to list the constructs. */
+   /*=========================*/
+
+   ListConstruct(theEnv,constructClass,STDOUT,theModule);
+  }
+
+/*****************************************/
+/* ListConstruct: Generic C Routine for  */
+/*   listing the constructs in a module. */
+/*****************************************/
+void ListConstruct(
+  Environment *theEnv,
+  Construct *constructClass,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ConstructHeader *constructPtr;
+   CLIPSLexeme *constructName;
+   unsigned long count = 0;
+   bool allModules = false;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*=======================================*/
+   /* If the module specified is NULL, then */
+   /* list all constructs in all modules.   */
+   /*=======================================*/
+
+   if (theModule == NULL)
+     {
+      theModule = GetNextDefmodule(theEnv,NULL);
+      allModules = true;
+     }
+
+   /*==================================*/
+   /* Loop through all of the modules. */
+   /*==================================*/
+
+   while (theModule != NULL)
+     {
+      /*========================================*/
+      /* If we're printing the construct in all */
+      /* modules, then preface each module      */
+      /* listing with the name of the module.   */
+      /*========================================*/
+
+      if (allModules)
+        {
+         WriteString(theEnv,logicalName,DefmoduleName(theModule));
+         WriteString(theEnv,logicalName,":\n");
+        }
+
+      /*===============================*/
+      /* Set the current module to the */
+      /* module we're examining.       */
+      /*===============================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*===========================================*/
+      /* List all of the constructs in the module. */
+      /*===========================================*/
+
+      for (constructPtr = (*constructClass->getNextItemFunction)(theEnv,NULL);
+           constructPtr != NULL;
+           constructPtr = (*constructClass->getNextItemFunction)(theEnv,constructPtr))
+        {
+         if (EvaluationData(theEnv)->HaltExecution == true) return;
+
+         constructName = (*constructClass->getConstructNameFunction)(constructPtr);
+
+         if (constructName != NULL)
+           {
+            if (allModules) WriteString(theEnv,STDOUT,"   ");
+            WriteString(theEnv,logicalName,constructName->contents);
+            WriteString(theEnv,logicalName,"\n");
+           }
+
+         count++;
+        }
+
+      /*====================================*/
+      /* Move on to the next module (if the */
+      /* listing is to contain the names of */
+      /* constructs from all modules).      */
+      /*====================================*/
+
+      if (allModules) theModule = GetNextDefmodule(theEnv,theModule);
+      else theModule = NULL;
+     }
+
+   /*=================================================*/
+   /* Print the tally and restore the current module. */
+   /*=================================================*/
+
+   PrintTally(theEnv,STDOUT,count,constructClass->constructName,
+              constructClass->pluralName);
+
+   RestoreCurrentModule(theEnv);
+  }
+
+/**********************************************************/
+/* SetNextConstruct: Sets the next field of one construct */
+/*   to point to another construct of the same type.      */
+/**********************************************************/
+void SetNextConstruct(
+  ConstructHeader *theConstruct,
+  ConstructHeader *targetConstruct)
+  { theConstruct->next = targetConstruct; }
+
+/********************************************************************/
+/* GetConstructModuleItem: Returns the construct module for a given */
+/*   construct (note that this is a pointer to a data structure     */
+/*   like the deffactsModule, not a pointer to an environment       */
+/*   module which contains a number of types of constructs.         */
+/********************************************************************/
+struct defmoduleItemHeader *GetConstructModuleItem(
+  ConstructHeader *theConstruct)
+  { return(theConstruct->whichModule); }
+
+/*************************************************/
+/* GetConstructPPForm: Returns the pretty print  */
+/*   representation for the specified construct. */
+/*************************************************/
+const char *GetConstructPPForm(
+  ConstructHeader *theConstruct)
+  {
+   return theConstruct->ppForm;
+  }
+
+/****************************************************/
+/* GetNextConstructItem: Returns the next construct */
+/*   items from a list of constructs.               */
+/****************************************************/
+ConstructHeader *GetNextConstructItem(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  unsigned moduleIndex)
+  {
+   struct defmoduleItemHeader *theModuleItem;
+
+   if (theConstruct == NULL)
+     {
+      theModuleItem = (struct defmoduleItemHeader *)
+                      GetModuleItem(theEnv,NULL,moduleIndex);
+      if (theModuleItem == NULL) return NULL;
+      return(theModuleItem->firstItem);
+     }
+
+   return(theConstruct->next);
+  }
+
+/*******************************************************/
+/* GetConstructModuleItemByIndex: Returns a pointer to */
+/*  the defmodule item for the specified construct. If */
+/*  theModule is NULL, then the construct module item  */
+/*  for the current module is returned, otherwise the  */
+/*  construct module item for the specified construct  */
+/*  is returned.                                       */
+/*******************************************************/
+struct defmoduleItemHeader *GetConstructModuleItemByIndex(
+  Environment *theEnv,
+  Defmodule *theModule,
+  unsigned moduleIndex)
+  {
+   if (theModule != NULL)
+     {
+      return((struct defmoduleItemHeader *)
+             GetModuleItem(theEnv,theModule,moduleIndex));
+     }
+
+   return((struct defmoduleItemHeader *)
+          GetModuleItem(theEnv,GetCurrentModule(theEnv),moduleIndex));
+  }
+
+/******************************************/
+/* FreeConstructHeaderModule: Deallocates */
+/*   the data structures associated with  */
+/*   the construct module item header.    */
+/******************************************/
+void FreeConstructHeaderModule(
+  Environment *theEnv,
+  struct defmoduleItemHeader *theModuleItem,
+  Construct *constructClass)
+  {
+   ConstructHeader *thisOne, *nextOne;
+
+   thisOne = theModuleItem->firstItem;
+
+   while (thisOne != NULL)
+     {
+      nextOne = thisOne->next;
+      (*constructClass->freeFunction)(theEnv,thisOne);
+      thisOne = nextOne;
+     }
+  }
+
+/**********************************************/
+/* DoForAllConstructs: Executes an action for */
+/*   all constructs of a specified type.      */
+/**********************************************/
+void DoForAllConstructs(
+  Environment *theEnv,
+  void (*actionFunction)(Environment *,ConstructHeader *,void *),
+  unsigned moduleItemIndex,
+  bool interruptable,
+  void *userBuffer)
+  {
+   ConstructHeader *theConstruct, *next = NULL;
+   struct defmoduleItemHeader *theModuleItem;
+   Defmodule *theModule;
+   long moduleCount = 0L;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*==================================*/
+   /* Loop through all of the modules. */
+   /*==================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule), moduleCount++)
+     {
+      /*=============================*/
+      /* Set the current module to   */
+      /* the module we're examining. */
+      /*=============================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*================================================*/
+      /* Perform the action for each of the constructs. */
+      /*================================================*/
+
+      theModuleItem = (struct defmoduleItemHeader *)
+                      GetModuleItem(theEnv,theModule,moduleItemIndex);
+
+      for (theConstruct = theModuleItem->firstItem;
+           theConstruct != NULL;
+           theConstruct = next)
+        {
+         /*==========================================*/
+         /* Check to see iteration should be halted. */
+         /*==========================================*/
+
+         if (interruptable)
+           {
+            if (GetHaltExecution(theEnv) == true)
+              {
+               RestoreCurrentModule(theEnv);
+               return;
+              }
+           }
+
+         /*===============================================*/
+         /* Determine the next construct since the action */
+         /* could delete the current construct.           */
+         /*===============================================*/
+
+         next = theConstruct->next;
+
+         /*===============================================*/
+         /* Perform the action for the current construct. */
+         /*===============================================*/
+
+         (*actionFunction)(theEnv,theConstruct,userBuffer);
+        }
+     }
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+  }
+
+/******************************************************/
+/* DoForAllConstructsInModule: Executes an action for */
+/*   all constructs of a specified type in a module.  */
+/******************************************************/
+void DoForAllConstructsInModule(
+  Environment *theEnv,
+  Defmodule *theModule,
+  ConstructActionFunction *actionFunction,
+  unsigned moduleItemIndex,
+  bool interruptable,
+  void *userBuffer)
+  {
+   ConstructHeader *theConstruct;
+   struct defmoduleItemHeader *theModuleItem;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*=============================*/
+   /* Set the current module to   */
+   /* the module we're examining. */
+   /*=============================*/
+
+   SetCurrentModule(theEnv,theModule);
+
+   /*================================================*/
+   /* Perform the action for each of the constructs. */
+   /*================================================*/
+
+   theModuleItem = (struct defmoduleItemHeader *)
+                   GetModuleItem(theEnv,theModule,moduleItemIndex);
+
+   for (theConstruct = theModuleItem->firstItem;
+        theConstruct != NULL;
+        theConstruct = theConstruct->next)
+     {
+      if (interruptable)
+        {
+         if (GetHaltExecution(theEnv) == true)
+           {
+            RestoreCurrentModule(theEnv);
+            return;
+           }
+        }
+
+      (*actionFunction)(theEnv,theConstruct,userBuffer);
+     }
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+  }
+
+/*****************************************************/
+/* InitializeConstructHeader: Initializes construct  */
+/*   header info, including to which module item the */
+/*   new construct belongs                           */
+/*****************************************************/
+void InitializeConstructHeader(
+  Environment *theEnv,
+  const char *constructNameString,
+  ConstructType theType,
+  ConstructHeader *theConstruct,
+  CLIPSLexeme *theConstructName)
+  {
+   struct moduleItem *theModuleItem;
+   struct defmoduleItemHeader *theItemHeader;
+
+   theModuleItem = FindModuleItem(theEnv,constructNameString);
+   theItemHeader = (struct defmoduleItemHeader *)
+                   GetModuleItem(theEnv,NULL,theModuleItem->moduleIndex);
+
+   theConstruct->whichModule = theItemHeader;
+   theConstruct->name = theConstructName;
+   theConstruct->ppForm = NULL;
+   theConstruct->bsaveID = 0L;
+   theConstruct->next = NULL;
+   theConstruct->usrData = NULL;
+   theConstruct->constructType = theType;
+   theConstruct->env = theEnv;
+  }
+
+/*************************************************/
+/* SetConstructPPForm: Sets a construct's pretty */
+/*   print form and deletes the old one.         */
+/*************************************************/
+void SetConstructPPForm(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  const char *ppForm)
+  {
+   if (theConstruct->ppForm != NULL)
+     {
+      rm(theEnv,(void *) theConstruct->ppForm,
+         ((strlen(theConstruct->ppForm) + 1) * sizeof(char)));
+     }
+   theConstruct->ppForm = ppForm;
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/******************************************************/
+/* ConstructPrintWatchAccess: Provides an interface   */
+/*   to the list-watch-items function for a construct */
+/******************************************************/
+bool ConstructPrintWatchAccess(
+  Environment *theEnv,
+  Construct *constructClass,
+  const char *logName,
+  Expression *argExprs,
+  ConstructGetWatchFunction *getWatchFunc,
+  ConstructSetWatchFunction *setWatchFunc)
+  {
+   return(ConstructWatchSupport(theEnv,constructClass,"list-watch-items",logName,argExprs,
+                                false,false,getWatchFunc,setWatchFunc));
+  }
+
+/**************************************************/
+/* ConstructSetWatchAccess: Provides an interface */
+/*   to the watch function for a construct        */
+/**************************************************/
+bool ConstructSetWatchAccess(
+  Environment *theEnv,
+  Construct *constructClass,
+  bool newState,
+  Expression *argExprs,
+  ConstructGetWatchFunction *getWatchFunc,
+  ConstructSetWatchFunction *setWatchFunc)
+  {
+   return(ConstructWatchSupport(theEnv,constructClass,"watch",STDERR,argExprs,
+                                true,newState,getWatchFunc,setWatchFunc));
+  }
+
+/******************************************************/
+/* ConstructWatchSupport: Generic construct interface */
+/*   into watch and list-watch-items.                 */
+/******************************************************/
+static bool ConstructWatchSupport(
+  Environment *theEnv,
+  Construct *constructClass,
+  const char *funcName,
+  const char *logName,
+  Expression *argExprs,
+  bool setFlag,
+  bool newState,
+  ConstructGetWatchFunction *getWatchFunc,
+  ConstructSetWatchFunction *setWatchFunc)
+  {
+   Defmodule *theModule;
+   ConstructHeader *theConstruct;
+   UDFValue constructName;
+   unsigned int argIndex = 2;
+
+   /*========================================*/
+   /* If no constructs are specified, then   */
+   /* show/set the trace for all constructs. */
+   /*========================================*/
+
+   if (argExprs == NULL)
+     {
+      /*==========================*/
+      /* Save the current module. */
+      /*==========================*/
+
+      SaveCurrentModule(theEnv);
+
+      /*===========================*/
+      /* Loop through each module. */
+      /*===========================*/
+
+      for (theModule = GetNextDefmodule(theEnv,NULL);
+           theModule != NULL;
+           theModule = GetNextDefmodule(theEnv,theModule))
+        {
+         /*============================*/
+         /* Set the current module to  */
+         /* the module being examined. */
+         /*============================*/
+
+         SetCurrentModule(theEnv,theModule);
+
+         /*====================================================*/
+         /* If we're displaying the names of constructs with   */
+         /* watch flags enabled, then preface each module      */
+         /* listing of constructs with the name of the module. */
+         /*====================================================*/
+
+         if (setFlag == false)
+           {
+            WriteString(theEnv,logName,DefmoduleName(theModule));
+            WriteString(theEnv,logName,":\n");
+           }
+
+         /*============================================*/
+         /* Loop through each construct in the module. */
+         /*============================================*/
+
+         for (theConstruct = (*constructClass->getNextItemFunction)(theEnv,NULL);
+              theConstruct != NULL;
+              theConstruct = (*constructClass->getNextItemFunction)(theEnv,theConstruct))
+           {
+            /*=============================================*/
+            /* Either set the watch flag for the construct */
+            /* or display its current state.               */
+            /*=============================================*/
+
+            if (setFlag)
+              { (*setWatchFunc)(theConstruct,newState); }
+            else
+              {
+               WriteString(theEnv,logName,"   ");
+               ConstructPrintWatch(theEnv,logName,constructClass,theConstruct,getWatchFunc);
+              }
+           }
+        }
+
+      /*=============================*/
+      /* Restore the current module. */
+      /*=============================*/
+
+      RestoreCurrentModule(theEnv);
+
+      /*====================================*/
+      /* Return true to indicate successful */
+      /* completion of the command.         */
+      /*====================================*/
+
+      return true;
+     }
+
+   /*==================================================*/
+   /* Show/set the trace for each specified construct. */
+   /*==================================================*/
+
+   while (argExprs != NULL)
+     {
+      /*==========================================*/
+      /* Evaluate the argument that should be a   */
+      /* construct name. Return false is an error */
+      /* occurs when evaluating the argument.     */
+      /*==========================================*/
+
+      if (EvaluateExpression(theEnv,argExprs,&constructName))
+        { return false; }
+
+      /*================================================*/
+      /* Check to see that it's a valid construct name. */
+      /*================================================*/
+
+      if ((constructName.header->type != SYMBOL_TYPE) ? true :
+          ((theConstruct = LookupConstruct(theEnv,constructClass,
+                                           constructName.lexemeValue->contents,true)) == NULL))
+        {
+         ExpectedTypeError1(theEnv,funcName,argIndex,constructClass->constructName);
+         return false;
+        }
+
+      /*=============================================*/
+      /* Either set the watch flag for the construct */
+      /* or display its current state.               */
+      /*=============================================*/
+
+      if (setFlag)
+        { (*setWatchFunc)(theConstruct,newState); }
+      else
+        { ConstructPrintWatch(theEnv,logName,constructClass,theConstruct,getWatchFunc); }
+
+      /*===============================*/
+      /* Move on to the next argument. */
+      /*===============================*/
+
+      argIndex++;
+      argExprs = GetNextArgument(argExprs);
+     }
+
+   /*====================================*/
+   /* Return true to indicate successful */
+   /* completion of the command.         */
+   /*====================================*/
+
+   return true;
+  }
+
+/*************************************************/
+/* ConstructPrintWatch: Displays the trace value */
+/*   of a construct for list-watch-items         */
+/*************************************************/
+static void ConstructPrintWatch(
+  Environment *theEnv,
+  const char *logName,
+  Construct *constructClass,
+  ConstructHeader *theConstruct,
+  ConstructGetWatchFunction *getWatchFunc)
+  {
+   WriteString(theEnv,logName,(*constructClass->getConstructNameFunction)(theConstruct)->contents);
+   if ((*getWatchFunc)(theConstruct))
+     WriteString(theEnv,logName," = on\n");
+   else
+     WriteString(theEnv,logName," = off\n");
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/*****************************************************/
+/* LookupConstruct: Finds a construct in the current */
+/*   or imported modules. If specified, will also    */
+/*   look for construct in a non-imported module.    */
+/*****************************************************/
+ConstructHeader *LookupConstruct(
+  Environment *theEnv,
+  Construct *constructClass,
+  const char *constructName,
+  bool moduleNameAllowed)
+  {
+   ConstructHeader *theConstruct;
+   const char *constructType;
+   unsigned int moduleCount;
+
+   /*============================================*/
+   /* Look for the specified construct in the    */
+   /* current module or in any imported modules. */
+   /*============================================*/
+
+   constructType = constructClass->constructName;
+   theConstruct = FindImportedConstruct(theEnv,constructType,NULL,constructName,
+                                        &moduleCount,true,NULL);
+
+   /*===========================================*/
+   /* Return NULL if the reference is ambiguous */
+   /* (it was found in more than one module).   */
+   /*===========================================*/
+
+   if (theConstruct != NULL)
+     {
+      if (moduleCount > 1)
+        {
+         AmbiguousReferenceErrorMessage(theEnv,constructType,constructName);
+         return NULL;
+        }
+      return(theConstruct);
+     }
+
+   /*=============================================*/
+   /* If specified, check to see if the construct */
+   /* is in a non-imported module.                */
+   /*=============================================*/
+
+   if (moduleNameAllowed && FindModuleSeparator(constructName))
+     { theConstruct = (*constructClass->findFunction)(theEnv,constructName); }
+
+   /*====================================*/
+   /* Return a pointer to the construct. */
+   /*====================================*/
+
+   return(theConstruct);
+  }
+
+/***********************************************************/
+/* ConstructsDeletable: Returns a boolean value indicating */
+/*   whether constructs in general can be deleted.         */
+/***********************************************************/
+bool ConstructsDeletable(
+  Environment *theEnv)
+  {
+#if BLOAD_ONLY || RUN_TIME || ((! BLOAD) && (! BLOAD_AND_BSAVE))
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+
+#if BLOAD_ONLY || RUN_TIME
+   return false;
+#elif BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv))
+     return false;
+   return true;
+#else
+   return true;
+#endif
+  }
diff --git a/clips/cstrccom.h b/clips/cstrccom.h
new file mode 100755
index 000000000..e91ebdc3a
--- /dev/null
+++ b/clips/cstrccom.h
@@ -0,0 +1,115 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/02/18            */
+   /*                                                     */
+   /*           CONSTRUCT COMMAND HEADER MODULE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added ConstructsDeletable function.            */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrccom
+
+#pragma once
+
+#define _H_cstrccom
+
+typedef bool ConstructGetWatchFunction(void *);
+typedef void ConstructSetWatchFunction(void *,bool);
+
+#include "moduldef.h"
+#include "constrct.h"
+
+typedef void ConstructActionFunction(Environment *,ConstructHeader *,void *);
+
+#if (! RUN_TIME)
+   void                           AddConstructToModule(ConstructHeader *);
+#endif
+   bool                           DeleteNamedConstruct(Environment *,const char *,Construct *);
+   ConstructHeader               *FindNamedConstructInModule(Environment *,const char *,Construct *);
+   ConstructHeader               *FindNamedConstructInModuleOrImports(Environment *,const char *,Construct *);
+   void                           UndefconstructCommand(UDFContext *,const char *,Construct *);
+   bool                           PPConstruct(Environment *,const char *,const char *,Construct *);
+   const char                    *PPConstructNil(Environment *,const char *,Construct *);
+   CLIPSLexeme                   *GetConstructModuleCommand(UDFContext *,const char *,Construct *);
+   Defmodule                     *GetConstructModule(Environment *,const char *,Construct *);
+   bool                           Undefconstruct(Environment *,ConstructHeader *,Construct *);
+   bool                           UndefconstructAll(Environment *,Construct *);
+   void                           SaveConstruct(Environment *,Defmodule *,const char *,Construct *);
+   const char                    *GetConstructNameString(ConstructHeader *);
+   const char                    *GetConstructModuleName(ConstructHeader *);
+   CLIPSLexeme                   *GetConstructNamePointer(ConstructHeader *);
+   void                           GetConstructListFunction(UDFContext *,UDFValue *,Construct *);
+   void                           GetConstructList(Environment *,UDFValue *,Construct *,
+                                                   Defmodule *);
+   void                           ListConstructCommand(UDFContext *,Construct *);
+   void                           ListConstruct(Environment *,Construct *,const char *,Defmodule *);
+   void                           SetNextConstruct(ConstructHeader *,ConstructHeader *);
+   struct defmoduleItemHeader    *GetConstructModuleItem(ConstructHeader *);
+   const char                    *GetConstructPPForm(ConstructHeader *);
+   void                           PPConstructCommand(UDFContext *,const char *,Construct *,UDFValue *);
+   ConstructHeader               *GetNextConstructItem(Environment *,ConstructHeader *,unsigned);
+   struct defmoduleItemHeader    *GetConstructModuleItemByIndex(Environment *,Defmodule *,unsigned);
+   void                           FreeConstructHeaderModule(Environment *,struct defmoduleItemHeader *,
+                                                                   Construct *);
+   void                           DoForAllConstructs(Environment *,
+                                                     ConstructActionFunction *,
+                                                     unsigned,bool,void *);
+   void                           DoForAllConstructsInModule(Environment *,Defmodule *,
+                                                             ConstructActionFunction *,
+                                                             unsigned,bool,void *);
+   void                           InitializeConstructHeader(Environment *,const char *,ConstructType,
+                                                            ConstructHeader *,CLIPSLexeme *);
+   void                           SetConstructPPForm(Environment *,ConstructHeader *,const char *);
+   ConstructHeader        *LookupConstruct(Environment *,Construct *,const char *,bool);
+#if DEBUGGING_FUNCTIONS
+   bool                           ConstructPrintWatchAccess(Environment *,Construct *,const char *,
+                                            Expression *,
+                                            ConstructGetWatchFunction *,
+                                            ConstructSetWatchFunction *);
+   bool                           ConstructSetWatchAccess(Environment *,Construct *,bool,
+                                            Expression *,
+                                            ConstructGetWatchFunction *,
+                                            ConstructSetWatchFunction *);
+#endif
+   bool                           ConstructsDeletable(Environment *);
+
+#endif
+
+
+
diff --git a/clips/cstrcpsr.c b/clips/cstrcpsr.c
new file mode 100755
index 000000000..f22b09b03
--- /dev/null
+++ b/clips/cstrcpsr.c
@@ -0,0 +1,835 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/13/17             */
+   /*                                                     */
+   /*              CONSTRUCT PARSER MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parsing routines and utilities for parsing       */
+/*   constructs.                                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Made the construct redefinition message more   */
+/*            prominent.                                     */
+/*                                                           */
+/*            Added pragmas to remove compilation warnings.  */
+/*                                                           */
+/*      6.30: Added code for capturing errors/warnings.      */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW, MAC_MCW, */
+/*            and IBM_TBC).                                  */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Changed return values for router functions.    */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*            File name/line count displayed for errors      */
+/*            and warnings during load command.              */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "envrnmnt.h"
+#include "router.h"
+#include "watch.h"
+#include "constrct.h"
+#include "prcdrpsr.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "modulpsr.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "cstrcpsr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    FindConstructBeginning(Environment *,const char *,struct token *,bool,bool *);
+
+/**********************************************************/
+/* Load: C access routine for the load command. Returns   */
+/*   LE_OPEN_FILE_ERROR if the file couldn't be opened,   */
+/*   LE_PARSING_ERROR if the file was opened but an error */
+/*   occurred while loading constructs, and LE_NO_ERROR   */
+/*   if the file was opened and no errors occured while   */
+/*   loading.                                             */
+/**********************************************************/
+LoadError Load(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   FILE *theFile;
+   char *oldParsingFileName;
+   int noErrorsDetected;
+
+   /*=======================================*/
+   /* Open the file specified by file name. */
+   /*=======================================*/
+
+   if ((theFile = GenOpen(theEnv,fileName,"r")) == NULL)
+     { return LE_OPEN_FILE_ERROR; }
+
+   /*===================================================*/
+   /* Read in the constructs. Enabling fast load allows */
+   /* the router system to be bypassed for quicker load */
+   /* times.                                            */
+   /*===================================================*/
+
+   SetFastLoad(theEnv,theFile);
+
+   oldParsingFileName = CopyString(theEnv,GetParsingFileName(theEnv));
+   SetParsingFileName(theEnv,fileName);
+
+   SetLoadInProgress(theEnv,true);
+   noErrorsDetected = LoadConstructsFromLogicalName(theEnv,(char *) theFile);
+   SetLoadInProgress(theEnv,false);
+
+   SetParsingFileName(theEnv,oldParsingFileName);
+   DeleteString(theEnv,oldParsingFileName);
+
+   SetWarningFileName(theEnv,NULL);
+   SetErrorFileName(theEnv,NULL);
+
+   SetFastLoad(theEnv,NULL);
+
+   /*=================*/
+   /* Close the file. */
+   /*=================*/
+
+   GenClose(theEnv,theFile);
+
+   /*=================================================*/
+   /* If no errors occurred during the load, return   */
+   /* LE_NO_ERROR, otherwise return LE_PARSING_ERROR. */
+   /*=================================================*/
+
+   if (noErrorsDetected)
+     { return LE_NO_ERROR; }
+
+   return LE_PARSING_ERROR;
+  }
+
+/*******************/
+/* LoadFromString: */
+/*******************/
+bool LoadFromString(
+  Environment *theEnv,
+  const char *theString,
+  size_t theMax)
+  {
+   bool rv;
+   const char *theStrRouter = "*** load-from-string ***";
+
+   /*==========================*/
+   /* Initialize string router */
+   /*==========================*/
+
+   if ((theMax == SIZE_MAX) ? (! OpenStringSource(theEnv,theStrRouter,theString,0)) :
+                              (! OpenTextSource(theEnv,theStrRouter,theString,0,theMax)))
+     return false;
+     
+   /*======================*/
+   /* Load the constructs. */
+   /*======================*/
+
+   rv = LoadConstructsFromLogicalName(theEnv,theStrRouter);
+      
+   /*=================*/
+   /* Close router.   */
+   /*=================*/
+
+   CloseStringSource(theEnv,theStrRouter);
+
+   return rv;
+  }
+
+/****************************************************/
+/* SetParsingFileName: Sets the file name currently */
+/*   being parsed by the load/batch command.        */
+/****************************************************/
+void SetParsingFileName(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   char *fileNameCopy = NULL;
+
+   if (fileName != NULL)
+     {
+      fileNameCopy = (char *) genalloc(theEnv,strlen(fileName) + 1);
+      genstrcpy(fileNameCopy,fileName);
+     }
+
+   if (ConstructData(theEnv)->ParsingFileName != NULL)
+     { genfree(theEnv,ConstructData(theEnv)->ParsingFileName,strlen(ConstructData(theEnv)->ParsingFileName) + 1); }
+
+   ConstructData(theEnv)->ParsingFileName = fileNameCopy;
+  }
+
+/*******************************************************/
+/* GetParsingFileName: Returns the file name currently */
+/*   being parsed by the load/batch command.           */
+/*******************************************************/
+char *GetParsingFileName(
+  Environment *theEnv)
+  {
+   return ConstructData(theEnv)->ParsingFileName;
+  }
+
+/**********************************************/
+/* SetErrorFileName: Sets the file name       */
+/*   associated with the last error detected. */
+/**********************************************/
+void SetErrorFileName(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   char *fileNameCopy = NULL;
+
+   if (fileName != NULL)
+     {
+      fileNameCopy = (char *) genalloc(theEnv,strlen(fileName) + 1);
+      genstrcpy(fileNameCopy,fileName);
+     }
+
+   if (ConstructData(theEnv)->ErrorFileName != NULL)
+     { genfree(theEnv,ConstructData(theEnv)->ErrorFileName,strlen(ConstructData(theEnv)->ErrorFileName) + 1); }
+
+   ConstructData(theEnv)->ErrorFileName = fileNameCopy;
+  }
+
+/**********************************************/
+/* GetErrorFileName: Returns the file name    */
+/*   associated with the last error detected. */
+/**********************************************/
+char *GetErrorFileName(
+  Environment *theEnv)
+  {
+   return ConstructData(theEnv)->ErrorFileName;
+  }
+
+/************************************************/
+/* SetWarningFileName: Sets the file name       */
+/*   associated with the last warning detected. */
+/************************************************/
+void SetWarningFileName(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   char *fileNameCopy = NULL;
+
+   if (fileName != NULL)
+     {
+      fileNameCopy = (char *) genalloc(theEnv,strlen(fileName) + 1);
+      genstrcpy(fileNameCopy,fileName);
+     }
+
+   if (ConstructData(theEnv)->WarningFileName != NULL)
+     { genfree(theEnv,ConstructData(theEnv)->WarningFileName,strlen(ConstructData(theEnv)->WarningFileName) + 1); }
+
+   ConstructData(theEnv)->WarningFileName = fileNameCopy;
+  }
+
+/************************************************/
+/* GetWarningFileName: Returns the file name    */
+/*   associated with the last warning detected. */
+/************************************************/
+char *GetWarningFileName(
+  Environment *theEnv)
+  {
+   return ConstructData(theEnv)->WarningFileName;
+  }
+
+/*****************************************************************/
+/* LoadConstructsFromLogicalName: Loads a set of constructs into */
+/*   the current environment from a specified logical name.      */
+/*****************************************************************/
+bool LoadConstructsFromLogicalName(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   BuildError constructFlag;
+   struct token theToken;
+   bool noErrors = true;
+   bool foundConstruct;
+   GCBlock gcb;
+   long oldLineCountValue;
+   const char *oldLineCountRouter;
+
+   /*===================================================*/
+   /* Create a router to capture the error information. */
+   /*===================================================*/
+
+   CreateErrorCaptureRouter(theEnv);
+
+   /*==============================*/
+   /* Initialize the line counter. */
+   /*==============================*/
+
+   oldLineCountValue = SetLineCount(theEnv,1);
+   oldLineCountRouter = RouterData(theEnv)->LineCountRouter;
+   RouterData(theEnv)->LineCountRouter = readSource;
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*==========================================*/
+   /* Set up the frame for garbage collection. */
+   /*==========================================*/
+
+   GCBlockStart(theEnv,&gcb);
+
+   /*========================================================*/
+   /* Find the beginning of the first construct in the file. */
+   /*========================================================*/
+
+   GetToken(theEnv,readSource,&theToken);
+   foundConstruct = FindConstructBeginning(theEnv,readSource,&theToken,false,&noErrors);
+
+   /*==================================================*/
+   /* Parse the file until the end of file is reached. */
+   /*==================================================*/
+
+   while ((foundConstruct == true) && (GetHaltExecution(theEnv) == false))
+     {
+      /*===========================================================*/
+      /* Clear the pretty print buffer in preparation for parsing. */
+      /*===========================================================*/
+
+      FlushPPBuffer(theEnv);
+
+      /*======================*/
+      /* Parse the construct. */
+      /*======================*/
+
+      constructFlag = ParseConstruct(theEnv,theToken.lexemeValue->contents,readSource);
+
+      /*==============================================================*/
+      /* If an error occurred while parsing, then find the beginning  */
+      /* of the next construct (but don't generate any more error     */
+      /* messages--in effect, skip everything until another construct */
+      /* is found).                                                   */
+      /*==============================================================*/
+
+      if (constructFlag == BE_PARSING_ERROR)
+        {
+         WriteString(theEnv,STDERR,"\nERROR:\n");
+         WriteString(theEnv,STDERR,GetPPBuffer(theEnv));
+         WriteString(theEnv,STDERR,"\n");
+
+         FlushParsingMessages(theEnv);
+
+         noErrors = false;
+         GetToken(theEnv,readSource,&theToken);
+         foundConstruct = FindConstructBeginning(theEnv,readSource,&theToken,true,&noErrors);
+        }
+
+      /*======================================================*/
+      /* Otherwise, find the beginning of the next construct. */
+      /*======================================================*/
+
+      else
+        {
+         FlushParsingMessages(theEnv);
+         GetToken(theEnv,readSource,&theToken);
+         foundConstruct = FindConstructBeginning(theEnv,readSource,&theToken,false,&noErrors);
+        }
+
+      /*=====================================================*/
+      /* Yield time if necessary to foreground applications. */
+      /*=====================================================*/
+
+      if (foundConstruct)
+         { IncrementLexemeCount(theToken.value); }
+
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+
+      YieldTime(theEnv);
+
+      if (foundConstruct)
+         { ReleaseLexeme(theEnv,theToken.lexemeValue); }
+     }
+
+   /*========================================================*/
+   /* Print a carriage return if a single character is being */
+   /* printed to indicate constructs are being processed.    */
+   /*========================================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if ((GetWatchItem(theEnv,"compilations") != 1) && GetPrintWhileLoading(theEnv))
+#else
+   if (GetPrintWhileLoading(theEnv))
+#endif
+     { WriteString(theEnv,STDOUT,"\n"); }
+
+   /*=============================================================*/
+   /* Once the load is complete, destroy the pretty print buffer. */
+   /* This frees up any memory that was used to create the pretty */
+   /* print forms for constructs during parsing. Thus calls to    */
+   /* the mem-used function will accurately reflect the amount of */
+   /* memory being used after a load command.                     */
+   /*=============================================================*/
+
+   DestroyPPBuffer(theEnv);
+
+   /*======================================*/
+   /* Remove the garbage collection frame. */
+   /*======================================*/
+
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+
+   /*==============================*/
+   /* Deactivate the line counter. */
+   /*==============================*/
+
+   SetLineCount(theEnv,oldLineCountValue);
+   RouterData(theEnv)->LineCountRouter = oldLineCountRouter;
+
+   /*===========================================*/
+   /* Invoke the parser error callback function */
+   /* and delete the error capture router.      */
+   /*===========================================*/
+
+   FlushParsingMessages(theEnv);
+   DeleteErrorCaptureRouter(theEnv);
+
+   /*==========================================================*/
+   /* Return a boolean flag which indicates whether any errors */
+   /* were encountered while loading the constructs.           */
+   /*==========================================================*/
+
+   return noErrors;
+  }
+
+/********************************************************************/
+/* FindConstructBeginning: Searches for a left parenthesis followed */
+/*   by the name of a valid construct. Used by the load command to  */
+/*   find the next construct to be parsed. Returns true is the      */
+/*   beginning of a construct was found, otherwise false.           */
+/********************************************************************/
+static bool FindConstructBeginning(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  bool errorCorrection,
+  bool *noErrors)
+  {
+   bool leftParenthesisFound = false;
+   bool firstAttempt = true;
+
+   /*===================================================*/
+   /* Process tokens until the beginning of a construct */
+   /* is found or there are no more tokens.             */
+   /*===================================================*/
+
+   while (theToken->tknType != STOP_TOKEN)
+     {
+      /*=====================================================*/
+      /* Constructs begin with a left parenthesis. Make note */
+      /* that the opening parenthesis has been found.        */
+      /*=====================================================*/
+
+      if (theToken->tknType == LEFT_PARENTHESIS_TOKEN)
+        { leftParenthesisFound = true; }
+
+      /*=================================================================*/
+      /* The name of the construct follows the opening left parenthesis. */
+      /* If it is the name of a valid construct, then return true.       */
+      /* Otherwise, reset the flags to look for the beginning of a       */
+      /* construct. If error correction is being performed (i.e. the     */
+      /* last construct parsed had an error in it), then don't bother to */
+      /* print an error message, otherwise, print an error message.      */
+      /*=================================================================*/
+
+      else if ((theToken->tknType == SYMBOL_TOKEN) && (leftParenthesisFound == true))
+        {
+         /*===========================================================*/
+         /* Is this a valid construct name (e.g., defrule, deffacts). */
+         /*===========================================================*/
+
+         if (FindConstruct(theEnv,theToken->lexemeValue->contents) != NULL) return true;
+
+         /*===============================================*/
+         /* The construct name is invalid. Print an error */
+         /* message if one hasn't already been printed.   */
+         /*===============================================*/
+
+         if (firstAttempt && (! errorCorrection))
+           {
+            errorCorrection = true;
+            *noErrors = false;
+            PrintErrorID(theEnv,"CSTRCPSR",1,true);
+            WriteString(theEnv,STDERR,"Expected the beginning of a construct.\n");
+           }
+
+         /*======================================================*/
+         /* Indicate that an error has been found and that we're */
+         /* looking for a left parenthesis again.                */
+         /*======================================================*/
+
+         firstAttempt = false;
+         leftParenthesisFound = false;
+        }
+
+      /*====================================================================*/
+      /* Any token encountered other than a left parenthesis or a construct */
+      /* name following a left parenthesis is illegal. Again, if error      */
+      /* correction is in progress, no error message is printed, otherwise, */
+      /*  an error message is printed.                                      */
+      /*====================================================================*/
+
+      else
+        {
+         if (firstAttempt && (! errorCorrection))
+           {
+            errorCorrection = true;
+            *noErrors = false;
+            PrintErrorID(theEnv,"CSTRCPSR",1,true);
+            WriteString(theEnv,STDERR,"Expected the beginning of a construct.\n");
+           }
+
+         firstAttempt = false;
+         leftParenthesisFound = false;
+        }
+
+      /*============================================*/
+      /* Move on to the next token to be processed. */
+      /*============================================*/
+
+      GetToken(theEnv,readSource,theToken);
+     }
+
+   /*===================================================================*/
+   /* Couldn't find the beginning of a construct, so false is returned. */
+   /*===================================================================*/
+
+   return false;
+  }
+
+/***********************************************************/
+/* QueryErrorCallback: Query routine for the error router. */
+/***********************************************************/
+static bool QueryErrorCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+#if MAC_XCD
+#pragma unused(theEnv,context)
+#endif
+
+   if ((strcmp(logicalName,STDERR) == 0) ||
+       (strcmp(logicalName,STDWRN) == 0))
+     { return true; }
+
+    return false;
+  }
+
+/***********************************************************/
+/* WriteErrorCallback: Write routine for the error router. */
+/***********************************************************/
+static void WriteErrorCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *str,
+  void *context)
+  {
+   if (strcmp(logicalName,STDERR) == 0)
+     {
+      ConstructData(theEnv)->ErrorString =
+         AppendToString(theEnv,str,ConstructData(theEnv)->ErrorString,
+                                   &ConstructData(theEnv)->CurErrPos,
+                                   &ConstructData(theEnv)->MaxErrChars);
+     }
+   else if (strcmp(logicalName,STDWRN) == 0)
+     {
+      ConstructData(theEnv)->WarningString =
+         AppendToString(theEnv,str,ConstructData(theEnv)->WarningString,
+                                   &ConstructData(theEnv)->CurWrnPos,
+                                   &ConstructData(theEnv)->MaxWrnChars);
+     }
+
+   DeactivateRouter(theEnv,"error-capture");
+   WriteString(theEnv,logicalName,str);
+   ActivateRouter(theEnv,"error-capture");
+  }
+
+/***********************************************/
+/* CreateErrorCaptureRouter: Creates the error */
+/*   capture router if it doesn't exists.      */
+/***********************************************/
+void CreateErrorCaptureRouter(
+  Environment *theEnv)
+  {
+   /*===========================================================*/
+   /* Don't bother creating the error capture router if there's */
+   /* no parser callback. The implication of this is that the   */
+   /* parser callback should be created before any routines     */
+   /* which could generate errors are called.                   */
+   /*===========================================================*/
+
+   if (ConstructData(theEnv)->ParserErrorCallback == NULL) return;
+
+   /*=======================================================*/
+   /* If the router hasn't already been created, create it. */
+   /*=======================================================*/
+
+   if (ConstructData(theEnv)->errorCaptureRouterCount == 0)
+     {
+      AddRouter(theEnv,"error-capture",40,
+                QueryErrorCallback,WriteErrorCallback,
+                NULL,NULL,NULL,NULL);
+     }
+
+   /*==================================================*/
+   /* Increment the count for the number of references */
+   /* that want the error capture router functioning.  */
+   /*==================================================*/
+
+   ConstructData(theEnv)->errorCaptureRouterCount++;
+  }
+
+/***********************************************/
+/* DeleteErrorCaptureRouter: Deletes the error */
+/*   capture router if it exists.              */
+/***********************************************/
+void DeleteErrorCaptureRouter(
+   Environment *theEnv)
+   {
+   /*===========================================================*/
+   /* Don't bother deleting the error capture router if there's */
+   /* no parser callback. The implication of this is that the   */
+   /* parser callback should be created before any routines     */
+   /* which could generate errors are called.                   */
+   /*===========================================================*/
+
+   if (ConstructData(theEnv)->ParserErrorCallback == NULL) return;
+
+    ConstructData(theEnv)->errorCaptureRouterCount--;
+
+    if (ConstructData(theEnv)->errorCaptureRouterCount == 0)
+      { DeleteRouter(theEnv,"error-capture"); }
+   }
+
+/*******************************************************/
+/* FlushParsingMessages: Invokes the callback routines */
+/*   for any existing warning/error messages.          */
+/*******************************************************/
+void FlushParsingMessages(
+  Environment *theEnv)
+  {
+   /*===========================================================*/
+   /* Don't bother flushing the error capture router if there's */
+   /* no parser callback. The implication of this is that the   */
+   /* parser callback should be created before any routines     */
+   /* which could generate errors are called.                   */
+   /*===========================================================*/
+
+   if (ConstructData(theEnv)->ParserErrorCallback == NULL) return;
+
+   /*=================================*/
+   /* If an error occurred invoke the */
+   /* parser error callback function. */
+   /*=================================*/
+
+   if (ConstructData(theEnv)->ErrorString != NULL)
+     {
+      (*ConstructData(theEnv)->ParserErrorCallback)(theEnv,GetErrorFileName(theEnv),
+                                                           NULL,ConstructData(theEnv)->ErrorString,
+                                                           ConstructData(theEnv)->ErrLineNumber,
+                                                           ConstructData(theEnv)->ParserErrorContext);
+     }
+
+   if (ConstructData(theEnv)->WarningString != NULL)
+     {
+      (*ConstructData(theEnv)->ParserErrorCallback)(theEnv,GetWarningFileName(theEnv),
+                                                           ConstructData(theEnv)->WarningString,NULL,
+                                                           ConstructData(theEnv)->WrnLineNumber,
+                                                           ConstructData(theEnv)->ParserErrorContext);
+     }
+
+   /*===================================*/
+   /* Delete the error capture strings. */
+   /*===================================*/
+
+   SetErrorFileName(theEnv,NULL);
+   if (ConstructData(theEnv)->ErrorString != NULL)
+     { genfree(theEnv,ConstructData(theEnv)->ErrorString,strlen(ConstructData(theEnv)->ErrorString) + 1); }
+   ConstructData(theEnv)->ErrorString = NULL;
+   ConstructData(theEnv)->CurErrPos = 0;
+   ConstructData(theEnv)->MaxErrChars = 0;
+
+   SetWarningFileName(theEnv,NULL);
+   if (ConstructData(theEnv)->WarningString != NULL)
+     { genfree(theEnv,ConstructData(theEnv)->WarningString,strlen(ConstructData(theEnv)->WarningString) + 1); }
+   ConstructData(theEnv)->WarningString = NULL;
+   ConstructData(theEnv)->CurWrnPos = 0;
+   ConstructData(theEnv)->MaxWrnChars = 0;
+  }
+
+/***************************************/
+/* ParseConstruct: Parses a construct. */
+/***************************************/
+BuildError ParseConstruct(
+  Environment *theEnv,
+  const char *name,
+  const char *logicalName)
+  {
+   Construct *currentPtr;
+   BuildError rv;
+   bool ov;
+   GCBlock gcb;
+
+   /*=================================*/
+   /* Look for a valid construct name */
+   /* (e.g. defrule, deffacts).       */
+   /*=================================*/
+
+   currentPtr = FindConstruct(theEnv,name);
+   if (currentPtr == NULL) return BE_CONSTRUCT_NOT_FOUND_ERROR;
+
+   /*==========================================*/
+   /* Set up the frame for garbage collection. */
+   /*==========================================*/
+
+   GCBlockStart(theEnv,&gcb);
+
+   /*==================================*/
+   /* Prepare the parsing environment. */
+   /*==================================*/
+
+   ov = GetHaltExecution(theEnv);
+   SetEvaluationError(theEnv,false);
+   SetHaltExecution(theEnv,false);
+   ClearParsedBindNames(theEnv);
+   PushRtnBrkContexts(theEnv);
+   ExpressionData(theEnv)->ReturnContext = false;
+   ExpressionData(theEnv)->BreakContext = false;
+
+   /*=======================================*/
+   /* Call the construct's parsing routine. */
+   /*=======================================*/
+
+   ConstructData(theEnv)->ParsingConstruct = true;
+   
+   if ((*currentPtr->parseFunction)(theEnv,logicalName))
+     { rv = BE_PARSING_ERROR; }
+   else
+     { rv = BE_NO_ERROR; }
+     
+   ConstructData(theEnv)->ParsingConstruct = false;
+
+   /*===============================*/
+   /* Restore environment settings. */
+   /*===============================*/
+
+   PopRtnBrkContexts(theEnv);
+
+   ClearParsedBindNames(theEnv);
+   SetPPBufferStatus(theEnv,false);
+   SetHaltExecution(theEnv,ov);
+
+   /*======================================*/
+   /* Remove the garbage collection frame. */
+   /*======================================*/
+
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+
+   /*==============================*/
+   /* Return the status of parsing */
+   /* the construct.               */
+   /*==============================*/
+
+   return rv;
+  }
+
+/******************************************************/
+/* ImportExportConflictMessage: Generic error message */
+/*   for an import/export module conflict detected    */
+/*   when a construct is being defined.               */
+/******************************************************/
+void ImportExportConflictMessage(
+  Environment *theEnv,
+  const char *constructName,
+  const char *itemName,
+  const char *causedByConstruct,
+  const char *causedByName)
+  {
+   PrintErrorID(theEnv,"CSTRCPSR",3,true);
+   WriteString(theEnv,STDERR,"Cannot define ");
+   WriteString(theEnv,STDERR,constructName);
+   WriteString(theEnv,STDERR," '");
+   WriteString(theEnv,STDERR,itemName);
+   WriteString(theEnv,STDERR,"' because of an import/export conflict");
+
+   if (causedByConstruct == NULL) WriteString(theEnv,STDERR,".\n");
+   else
+     {
+      WriteString(theEnv,STDERR," caused by the ");
+      WriteString(theEnv,STDERR,causedByConstruct);
+      WriteString(theEnv,STDERR," '");
+      WriteString(theEnv,STDERR,causedByName);
+      WriteString(theEnv,STDERR,"'.\n");
+     }
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+
diff --git a/clips/cstrcpsr.h b/clips/cstrcpsr.h
new file mode 100755
index 000000000..7eab5c3e6
--- /dev/null
+++ b/clips/cstrcpsr.h
@@ -0,0 +1,97 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/13/17            */
+   /*                                                     */
+   /*              CONSTRUCT PARSER MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parsing routines and utilities for parsing       */
+/*   constructs.                                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Made the construct redefinition message more   */
+/*            prominent.                                     */
+/*                                                           */
+/*            Added pragmas to remove compilation warnings.  */
+/*                                                           */
+/*      6.30: Added code for capturing errors/warnings.      */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW, MAC_MCW, */
+/*            and IBM_TBC).                                  */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrcpsr
+
+#pragma once
+
+#define _H_cstrcpsr
+
+#include "strngfun.h"
+
+typedef enum
+  {
+   LE_NO_ERROR = 0,
+   LE_OPEN_FILE_ERROR,
+   LE_PARSING_ERROR,
+  } LoadError;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   LoadError                      Load(Environment *,const char *);
+   bool                           LoadConstructsFromLogicalName(Environment *,const char *);
+   bool                           LoadFromString(Environment *,const char *,size_t);
+   BuildError                     ParseConstruct(Environment *,const char *,const char *);
+   void                           ImportExportConflictMessage(Environment *,const char *,const char *,
+                                                              const char *,const char *);
+   void                           FlushParsingMessages(Environment *);
+   char                          *GetParsingFileName(Environment *);
+   void                           SetParsingFileName(Environment *,const char *);
+   char                          *GetErrorFileName(Environment *);
+   void                           SetErrorFileName(Environment *,const char *);
+   char                          *GetWarningFileName(Environment *);
+   void                           SetWarningFileName(Environment *,const char *);
+   void                           CreateErrorCaptureRouter(Environment *);
+   void                           DeleteErrorCaptureRouter(Environment *);
+#endif
+
+#endif
+
+
+
+
+
+
+
diff --git a/clips/cstrnbin.c b/clips/cstrnbin.c
new file mode 100755
index 000000000..130ed70e0
--- /dev/null
+++ b/clips/cstrnbin.c
@@ -0,0 +1,282 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*            CONSTRAINT BLOAD/BSAVE MODULE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for      */
+/*    constraint records.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "router.h"
+#include "bload.h"
+
+#if BLOAD_AND_BSAVE
+#include "bsave.h"
+#endif
+
+#include "cstrnbin.h"
+
+/*******************/
+/* DATA STRUCTURES */
+/*******************/
+
+struct bsaveConstraintRecord
+  {
+   unsigned int anyAllowed : 1;
+   unsigned int symbolsAllowed : 1;
+   unsigned int stringsAllowed : 1;
+   unsigned int floatsAllowed : 1;
+   unsigned int integersAllowed : 1;
+   unsigned int instanceNamesAllowed : 1;
+   unsigned int instanceAddressesAllowed : 1;
+   unsigned int externalAddressesAllowed : 1;
+   unsigned int factAddressesAllowed : 1;
+   unsigned int anyRestriction : 1;
+   unsigned int symbolRestriction : 1;
+   unsigned int stringRestriction : 1;
+   unsigned int numberRestriction : 1;
+   unsigned int floatRestriction : 1;
+   unsigned int integerRestriction : 1;
+   unsigned int classRestriction : 1;
+   unsigned int instanceNameRestriction : 1;
+   unsigned int multifieldsAllowed : 1;
+   unsigned int singlefieldsAllowed : 1;
+   unsigned long classList;
+   unsigned long restrictionList;
+   unsigned long minValue;
+   unsigned long maxValue;
+   unsigned long minFields;
+   unsigned long maxFields;
+  };
+
+typedef struct bsaveConstraintRecord BSAVE_CONSTRAINT_RECORD;
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                    CopyToBsaveConstraintRecord(Environment *,CONSTRAINT_RECORD *,BSAVE_CONSTRAINT_RECORD *);
+#endif
+   static void                    CopyFromBsaveConstraintRecord(Environment *,void *,unsigned long);
+
+#if BLOAD_AND_BSAVE
+
+/**************************************************/
+/* WriteNeededConstraints: Writes the constraints */
+/*   in the constraint table to the binary image  */
+/*   currently being saved.                       */
+/**************************************************/
+void WriteNeededConstraints(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   int i;
+   unsigned short theIndex = 0;
+   unsigned long numberOfUsedConstraints = 0;
+   CONSTRAINT_RECORD *tmpPtr;
+   BSAVE_CONSTRAINT_RECORD bsaveConstraints;
+
+   /*================================*/
+   /* Get the number of constraints. */
+   /*================================*/
+
+   for (i = 0; i < SIZE_CONSTRAINT_HASH; i++)
+     {
+      for (tmpPtr = ConstraintData(theEnv)->ConstraintHashtable[i];
+           tmpPtr != NULL;
+           tmpPtr = tmpPtr->next)
+        {
+         tmpPtr->bsaveIndex = theIndex++;
+         numberOfUsedConstraints++;
+        }
+     }
+
+   /*=============================================*/
+   /* If dynamic constraint checking is disabled, */
+   /* then no constraints are saved.              */
+   /*=============================================*/
+
+   if ((! GetDynamicConstraintChecking(theEnv)) && (numberOfUsedConstraints != 0))
+     {
+      numberOfUsedConstraints = 0;
+      PrintWarningID(theEnv,"CSTRNBIN",1,false);
+      WriteString(theEnv,STDWRN,"Constraints are not saved with a binary image\n");
+      WriteString(theEnv,STDWRN,"  when dynamic constraint checking is disabled.\n");
+     }
+
+   /*============================================*/
+   /* Write out the number of constraints in the */
+   /* constraint table followed by each of the   */
+   /* constraints in the constraint table.       */
+   /*============================================*/
+
+   GenWrite(&numberOfUsedConstraints,sizeof(unsigned long),fp);
+   if (numberOfUsedConstraints == 0) return;
+
+   for (i = 0 ; i < SIZE_CONSTRAINT_HASH; i++)
+     {
+      for (tmpPtr = ConstraintData(theEnv)->ConstraintHashtable[i];
+           tmpPtr != NULL;
+           tmpPtr = tmpPtr->next)
+        {
+         CopyToBsaveConstraintRecord(theEnv,tmpPtr,&bsaveConstraints);
+         GenWrite(&bsaveConstraints,sizeof(BSAVE_CONSTRAINT_RECORD),fp);
+        }
+     }
+  }
+
+/****************************************************/
+/* CopyToBsaveConstraintRecord: Copies a constraint */
+/*   record to the data structure used for storing  */
+/*   constraints in a binary image.                 */
+/****************************************************/
+static void CopyToBsaveConstraintRecord(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraints,
+  BSAVE_CONSTRAINT_RECORD *bsaveConstraints)
+  {
+   bsaveConstraints->anyAllowed = constraints->anyAllowed;
+   bsaveConstraints->symbolsAllowed = constraints->symbolsAllowed;
+   bsaveConstraints->stringsAllowed = constraints->stringsAllowed;
+   bsaveConstraints->floatsAllowed = constraints->floatsAllowed;
+   bsaveConstraints->integersAllowed = constraints->integersAllowed;
+   bsaveConstraints->instanceNamesAllowed = constraints->instanceNamesAllowed;
+   bsaveConstraints->instanceAddressesAllowed = constraints->instanceAddressesAllowed;
+   bsaveConstraints->externalAddressesAllowed = constraints->externalAddressesAllowed;
+   bsaveConstraints->multifieldsAllowed = constraints->multifieldsAllowed;
+   bsaveConstraints->singlefieldsAllowed = constraints->singlefieldsAllowed;
+   bsaveConstraints->factAddressesAllowed = constraints->factAddressesAllowed;
+   bsaveConstraints->anyRestriction = constraints->anyRestriction;
+   bsaveConstraints->symbolRestriction = constraints->symbolRestriction;
+   bsaveConstraints->stringRestriction = constraints->stringRestriction;
+   bsaveConstraints->floatRestriction = constraints->floatRestriction;
+   bsaveConstraints->integerRestriction = constraints->integerRestriction;
+   bsaveConstraints->classRestriction = constraints->classRestriction;
+   bsaveConstraints->instanceNameRestriction = constraints->instanceNameRestriction;
+
+   bsaveConstraints->restrictionList = HashedExpressionIndex(theEnv,constraints->restrictionList);
+   bsaveConstraints->classList = HashedExpressionIndex(theEnv,constraints->classList);
+   bsaveConstraints->minValue = HashedExpressionIndex(theEnv,constraints->minValue);
+   bsaveConstraints->maxValue = HashedExpressionIndex(theEnv,constraints->maxValue);
+   bsaveConstraints->minFields = HashedExpressionIndex(theEnv,constraints->minFields);
+   bsaveConstraints->maxFields = HashedExpressionIndex(theEnv,constraints->maxFields);
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+/********************************************************/
+/* ReadNeededConstraints: Reads in the constraints used */
+/*   by the binary image currently being loaded.        */
+/********************************************************/
+void ReadNeededConstraints(
+  Environment *theEnv)
+  {
+   GenReadBinary(theEnv,&ConstraintData(theEnv)->NumberOfConstraints,sizeof(unsigned long));
+   if (ConstraintData(theEnv)->NumberOfConstraints == 0) return;
+
+   ConstraintData(theEnv)->ConstraintArray = (CONSTRAINT_RECORD *)
+           genalloc(theEnv,(sizeof(CONSTRAINT_RECORD) * ConstraintData(theEnv)->NumberOfConstraints));
+
+   BloadandRefresh(theEnv,ConstraintData(theEnv)->NumberOfConstraints,sizeof(BSAVE_CONSTRAINT_RECORD),
+                   CopyFromBsaveConstraintRecord);
+  }
+
+/*****************************************************/
+/* CopyFromBsaveConstraintRecord: Copies values to a */
+/*   constraint record from the data structure used  */
+/*   for storing constraints in a binary image.      */
+/*****************************************************/
+static void CopyFromBsaveConstraintRecord(
+  Environment *theEnv,
+  void *buf,
+  unsigned long theIndex)
+  {
+   BSAVE_CONSTRAINT_RECORD *bsaveConstraints;
+   CONSTRAINT_RECORD *constraints;
+
+   bsaveConstraints = (BSAVE_CONSTRAINT_RECORD *) buf;
+   constraints = (CONSTRAINT_RECORD *) &ConstraintData(theEnv)->ConstraintArray[theIndex];
+
+   constraints->anyAllowed = bsaveConstraints->anyAllowed;
+   constraints->symbolsAllowed = bsaveConstraints->symbolsAllowed;
+   constraints->stringsAllowed = bsaveConstraints->stringsAllowed;
+   constraints->floatsAllowed = bsaveConstraints->floatsAllowed;
+   constraints->integersAllowed = bsaveConstraints->integersAllowed;
+   constraints->instanceNamesAllowed = bsaveConstraints->instanceNamesAllowed;
+   constraints->instanceAddressesAllowed = bsaveConstraints->instanceAddressesAllowed;
+   constraints->externalAddressesAllowed = bsaveConstraints->externalAddressesAllowed;
+   constraints->voidAllowed = false;
+   constraints->multifieldsAllowed = bsaveConstraints->multifieldsAllowed;
+   constraints->singlefieldsAllowed = bsaveConstraints->singlefieldsAllowed;
+   constraints->factAddressesAllowed = bsaveConstraints->factAddressesAllowed;
+   constraints->anyRestriction = bsaveConstraints->anyRestriction;
+   constraints->symbolRestriction = bsaveConstraints->symbolRestriction;
+   constraints->stringRestriction = bsaveConstraints->stringRestriction;
+   constraints->floatRestriction = bsaveConstraints->floatRestriction;
+   constraints->integerRestriction = bsaveConstraints->integerRestriction;
+   constraints->classRestriction = bsaveConstraints->classRestriction;
+   constraints->instanceNameRestriction = bsaveConstraints->instanceNameRestriction;
+
+   constraints->restrictionList = HashedExpressionPointer(bsaveConstraints->restrictionList);
+   constraints->classList = HashedExpressionPointer(bsaveConstraints->classList);
+   constraints->minValue = HashedExpressionPointer(bsaveConstraints->minValue);
+   constraints->maxValue = HashedExpressionPointer(bsaveConstraints->maxValue);
+   constraints->minFields = HashedExpressionPointer(bsaveConstraints->minFields);
+   constraints->maxFields = HashedExpressionPointer(bsaveConstraints->maxFields);
+   constraints->multifield = NULL;
+  }
+
+/********************************************************/
+/* ClearBloadedConstraints: Releases memory associated  */
+/*   with constraints loaded from binary image          */
+/********************************************************/
+void ClearBloadedConstraints(
+  Environment *theEnv)
+  {
+   if (ConstraintData(theEnv)->NumberOfConstraints != 0)
+     {
+      genfree(theEnv,ConstraintData(theEnv)->ConstraintArray,
+                     (sizeof(CONSTRAINT_RECORD) * ConstraintData(theEnv)->NumberOfConstraints));
+      ConstraintData(theEnv)->NumberOfConstraints = 0;
+     }
+  }
+
+#endif /* (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME) */
+
+
+
+
+
diff --git a/clips/cstrnbin.h b/clips/cstrnbin.h
new file mode 100755
index 000000000..673dcad88
--- /dev/null
+++ b/clips/cstrnbin.h
@@ -0,0 +1,55 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*    CONSTRAINT BLOAD/BSAVE/CONSTRUCTS-TO-C HEADER    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for      */
+/*    constraint records.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrnbin
+
+#pragma once
+
+#define _H_cstrnbin
+
+#include <stdio.h>
+
+#include "evaluatn.h"
+#include "constrnt.h"
+
+#define ConstraintIndex(theConstraint) (((! GetDynamicConstraintChecking(theEnv)) || (theConstraint == NULL)) ? ULONG_MAX : (theConstraint->bsaveIndex))
+#define ConstraintPointer(i) (((i) == ULONG_MAX) ? NULL : (CONSTRAINT_RECORD *) &ConstraintData(theEnv)->ConstraintArray[i])
+
+#if BLOAD_AND_BSAVE
+   void                           WriteNeededConstraints(Environment *,FILE *);
+#endif
+   void                           ReadNeededConstraints(Environment *);
+   void                           ClearBloadedConstraints(Environment *);
+
+#endif /* _H_cstrnbin */
+
+
diff --git a/clips/cstrnchk.c b/clips/cstrnchk.c
new file mode 100755
index 000000000..166fb6e18
--- /dev/null
+++ b/clips/cstrnchk.c
@@ -0,0 +1,826 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*             CONSTRAINT CHECKING MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for constraint checking of    */
+/*   data types.                                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian Dantes                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Dynamic constraint checking for the            */
+/*            allowed-classes constraint now searches        */
+/*            imported modules.                              */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "setup.h"
+
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "router.h"
+
+#if OBJECT_SYSTEM
+#include "classcom.h"
+#include "classexm.h"
+#include "inscom.h"
+#include "insfun.h"
+#endif
+
+#include "cstrnchk.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    CheckRangeAgainstCardinalityConstraint(Environment *,int,int,CONSTRAINT_RECORD *);
+   static bool                    CheckFunctionReturnType(unsigned,CONSTRAINT_RECORD *);
+   static bool                    CheckTypeConstraint(int,CONSTRAINT_RECORD *);
+   static bool                    CheckRangeConstraint(Environment *,int,void *,CONSTRAINT_RECORD *);
+   static void                    PrintRange(Environment *,const char *,CONSTRAINT_RECORD *);
+
+/******************************************************/
+/* CheckFunctionReturnType: Checks a functions return */
+/*   type against a set of permissable return values. */
+/*   Returns true if the return type is included      */
+/*   among the permissible values, otherwise false.   */
+/******************************************************/
+static bool CheckFunctionReturnType(
+  unsigned functionReturnType,
+  CONSTRAINT_RECORD *constraints)
+  {
+   if (constraints == NULL) return true;
+
+   if (constraints->anyAllowed) return true;
+
+   if (constraints->voidAllowed)
+     { if (functionReturnType & VOID_BIT) return true; }
+
+   if (constraints->symbolsAllowed)
+     { if (functionReturnType & SYMBOL_BIT) return true; }
+
+   if (constraints->stringsAllowed)
+     { if (functionReturnType & STRING_BIT) return true; }
+
+   if (constraints->instanceNamesAllowed)
+     { if (functionReturnType & INSTANCE_NAME_BIT) return true; }
+
+   if (constraints->floatsAllowed)
+     { if (functionReturnType & FLOAT_BIT) return true; }
+
+   if (constraints->integersAllowed)
+     { if (functionReturnType & INTEGER_BIT) return true; }
+
+   if (constraints->multifieldsAllowed)
+     { if (functionReturnType & MULTIFIELD_BIT) return true; }
+
+   if (constraints->externalAddressesAllowed)
+     { if (functionReturnType & EXTERNAL_ADDRESS_BIT) return true; }
+
+   if (constraints->factAddressesAllowed)
+     { if (functionReturnType & FACT_ADDRESS_BIT) return true; }
+
+   if (constraints->instanceAddressesAllowed)
+     { if (functionReturnType & INSTANCE_ADDRESS_BIT) return true; }
+
+   return false;
+  }
+
+/****************************************************/
+/* CheckTypeConstraint: Determines if a primitive   */
+/*   data type satisfies the type constraint fields */
+/*   of aconstraint record.                         */
+/****************************************************/
+static bool CheckTypeConstraint(
+  int type,
+  CONSTRAINT_RECORD *constraints)
+  {
+   if (type == VOID_TYPE) return false;
+
+   if (constraints == NULL) return true;
+
+   if (constraints->anyAllowed == true) return true;
+
+   if ((type == SYMBOL_TYPE) && (constraints->symbolsAllowed != true))
+     { return false; }
+
+   if ((type == STRING_TYPE) && (constraints->stringsAllowed != true))
+     { return false; }
+
+   if ((type == FLOAT_TYPE) && (constraints->floatsAllowed != true))
+     { return false; }
+
+   if ((type == INTEGER_TYPE) && (constraints->integersAllowed != true))
+     { return false; }
+
+#if OBJECT_SYSTEM
+   if ((type == INSTANCE_NAME_TYPE) && (constraints->instanceNamesAllowed != true))
+     { return false; }
+
+   if ((type == INSTANCE_ADDRESS_TYPE) && (constraints->instanceAddressesAllowed != true))
+     { return false; }
+#endif
+
+   if ((type == EXTERNAL_ADDRESS_TYPE) && (constraints->externalAddressesAllowed != true))
+     { return false; }
+
+   if ((type == VOID_TYPE) && (constraints->voidAllowed != true))
+     { return false; }
+
+   if ((type == FACT_ADDRESS_TYPE) && (constraints->factAddressesAllowed != true))
+     { return false; }
+
+   return true;
+  }
+
+/********************************************************/
+/* CheckCardinalityConstraint: Determines if an integer */
+/*   falls within the range of allowed cardinalities    */
+/*   for a constraint record.                           */
+/********************************************************/
+bool CheckCardinalityConstraint(
+  Environment *theEnv,
+  size_t number,
+  CONSTRAINT_RECORD *constraints)
+  {
+   /*=========================================*/
+   /* If the constraint record is NULL, there */
+   /* are no cardinality restrictions.        */
+   /*=========================================*/
+
+   if (constraints == NULL) return true;
+
+   /*==================================*/
+   /* Determine if the integer is less */
+   /* than the minimum cardinality.    */
+   /*==================================*/
+
+   if (constraints->minFields != NULL)
+     {
+      if (constraints->minFields->value != SymbolData(theEnv)->NegativeInfinity)
+        {
+         if (number < (size_t) constraints->minFields->integerValue->contents)
+           { return false; }
+        }
+     }
+
+   /*=====================================*/
+   /* Determine if the integer is greater */
+   /* than the maximum cardinality.       */
+   /*=====================================*/
+
+   if (constraints->maxFields != NULL)
+     {
+      if (constraints->maxFields->value != SymbolData(theEnv)->PositiveInfinity)
+        {
+         if (number > (size_t) constraints->maxFields->integerValue->contents)
+           { return false; }
+        }
+     }
+
+   /*=========================================================*/
+   /* The integer falls within the allowed cardinality range. */
+   /*=========================================================*/
+
+   return true;
+  }
+
+/*****************************************************************/
+/* CheckRangeAgainstCardinalityConstraint: Determines if a range */
+/*   of numbers could possibly fall within the range of allowed  */
+/*   cardinalities for a constraint record. Returns true if at   */
+/*   least one of the numbers in the range is within the allowed */
+/*   cardinality, otherwise false is returned.                   */
+/*****************************************************************/
+static bool CheckRangeAgainstCardinalityConstraint(
+  Environment *theEnv,
+  int min,
+  int max,
+  CONSTRAINT_RECORD *constraints)
+  {
+   /*=========================================*/
+   /* If the constraint record is NULL, there */
+   /* are no cardinality restrictions.        */
+   /*=========================================*/
+
+   if (constraints == NULL) return true;
+
+   /*===============================================================*/
+   /* If the minimum value of the range is greater than the maximum */
+   /* value of the cardinality, then there are no numbers in the    */
+   /* range which could fall within the cardinality range, and so   */
+   /* false is returned.                                            */
+   /*===============================================================*/
+
+   if (constraints->maxFields != NULL)
+     {
+      if (constraints->maxFields->value != SymbolData(theEnv)->PositiveInfinity)
+        {
+         if (min > constraints->maxFields->integerValue->contents)
+           { return false; }
+        }
+     }
+
+   /*===============================================================*/
+   /* If the maximum value of the range is less than the minimum    */
+   /* value of the cardinality, then there are no numbers in the    */
+   /* range which could fall within the cardinality range, and so   */
+   /* false is returned. A maximum range value of -1 indicates that */
+   /* the maximum possible value of the range is positive infinity. */
+   /*===============================================================*/
+
+   if ((constraints->minFields != NULL) && (max != -1))
+     {
+      if (constraints->minFields->value != SymbolData(theEnv)->NegativeInfinity)
+        {
+         if (max < constraints->minFields->integerValue->contents)
+           { return false; }
+        }
+     }
+
+   /*=============================================*/
+   /* At least one number in the specified range  */
+   /* falls within the allowed cardinality range. */
+   /*=============================================*/
+
+   return true;
+  }
+
+/**********************************************************************/
+/* CheckAllowedValuesConstraint: Determines if a primitive data type  */
+/*   satisfies the allowed-... constraint fields of a constraint      */
+/*   record. Returns true if the constraints are satisfied, otherwise */
+/*   false is returned.                                               */
+/**********************************************************************/
+bool CheckAllowedValuesConstraint(
+  int type,
+  void *vPtr,
+  CONSTRAINT_RECORD *constraints)
+  {
+   struct expr *tmpPtr;
+
+   /*=========================================*/
+   /* If the constraint record is NULL, there */
+   /* are no allowed-... restrictions.        */
+   /*=========================================*/
+
+   if (constraints == NULL) return true;
+
+   /*=====================================================*/
+   /* Determine if there are any allowed-... restrictions */
+   /* for the type of the value being checked.            */
+   /*=====================================================*/
+
+   switch (type)
+     {
+      case SYMBOL_TYPE:
+        if ((constraints->symbolRestriction == false) &&
+            (constraints->anyRestriction == false))
+          { return true; }
+        break;
+
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+        if ((constraints->instanceNameRestriction == false) &&
+            (constraints->anyRestriction == false))
+          { return true; }
+        break;
+#endif
+
+      case STRING_TYPE:
+        if ((constraints->stringRestriction == false) &&
+            (constraints->anyRestriction == false))
+          { return true; }
+        break;
+
+      case INTEGER_TYPE:
+        if ((constraints->integerRestriction == false) &&
+            (constraints->anyRestriction == false))
+          { return true; }
+        break;
+
+      case FLOAT_TYPE:
+        if ((constraints->floatRestriction == false) &&
+            (constraints->anyRestriction == false))
+          { return true; }
+        break;
+
+      default:
+        return true;
+     }
+
+   /*=========================================================*/
+   /* Search through the restriction list to see if the value */
+   /* matches one of the allowed values in the list.          */
+   /*=========================================================*/
+
+   for (tmpPtr = constraints->restrictionList;
+        tmpPtr != NULL;
+        tmpPtr = tmpPtr->nextArg)
+     {
+      if ((tmpPtr->type == type) && (tmpPtr->value == vPtr)) return true;
+     }
+
+   /*====================================================*/
+   /* If the value wasn't found in the list, then return */
+   /* false because the constraint has been violated.    */
+   /*====================================================*/
+
+   return false;
+  }
+
+/**********************************************************************/
+/* CheckAllowedClassesConstraint: Determines if a primitive data type */
+/*   satisfies the allowed-classes constraint fields of a constraint  */
+/*   record. Returns true if the constraints are satisfied, otherwise */
+/*   false is returned.                                               */
+/**********************************************************************/
+bool CheckAllowedClassesConstraint(
+  Environment *theEnv,
+  int type,
+  void *vPtr,
+  CONSTRAINT_RECORD *constraints)
+  {
+#if OBJECT_SYSTEM
+   struct expr *tmpPtr;
+   Instance *ins;
+   Defclass *insClass, *cmpClass;
+
+   /*=========================================*/
+   /* If the constraint record is NULL, there */
+   /* is no allowed-classes restriction.      */
+   /*=========================================*/
+
+   if (constraints == NULL) return true;
+
+   /*======================================*/
+   /* The constraint is satisfied if there */
+   /* aren't any class restrictions.       */
+   /*======================================*/
+
+   if (constraints->classList == NULL)
+     { return true; }
+
+   /*==================================*/
+   /* Class restrictions only apply to */
+   /* instances and instance names.    */
+   /*==================================*/
+
+   if ((type != INSTANCE_ADDRESS_TYPE) && (type != INSTANCE_NAME_TYPE))
+     { return true; }
+
+   /*=============================================*/
+   /* If an instance name is specified, determine */
+   /* whether the instance exists.                */
+   /*=============================================*/
+
+   if (type == INSTANCE_ADDRESS_TYPE)
+     { ins = (Instance *) vPtr; }
+   else
+     { ins = FindInstanceBySymbol(theEnv,(CLIPSLexeme *) vPtr); }
+
+   if (ins == NULL)
+     { return false; }
+
+   /*======================================================*/
+   /* Search through the class list to see if the instance */
+   /* belongs to one of the allowed classes in the list.   */
+   /*======================================================*/
+
+   insClass = InstanceClass(ins);
+   for (tmpPtr = constraints->classList;
+        tmpPtr != NULL;
+        tmpPtr = tmpPtr->nextArg)
+     {
+      cmpClass = LookupDefclassByMdlOrScope(theEnv,tmpPtr->lexemeValue->contents);
+      if (cmpClass == NULL) continue;
+      if (cmpClass == insClass) return true;
+      if (SubclassP(insClass,cmpClass)) return true;
+     }
+
+   /*=========================================================*/
+   /* If a parent class wasn't found in the list, then return */
+   /* false because the constraint has been violated.         */
+   /*=========================================================*/
+
+   return false;
+#else
+
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(type)
+#pragma unused(vPtr)
+#pragma unused(constraints)
+#endif
+
+   return true;
+#endif
+  }
+
+/*************************************************************/
+/* CheckRangeConstraint: Determines if a primitive data type */
+/*   satisfies the range constraint of a constraint record.  */
+/*************************************************************/
+static bool CheckRangeConstraint(
+  Environment *theEnv,
+  int type,
+  void *vPtr,
+  CONSTRAINT_RECORD *constraints)
+  {
+   struct expr *minList, *maxList;
+
+   /*===================================*/
+   /* If the constraint record is NULL, */
+   /* there are no range restrictions.  */
+   /*===================================*/
+
+   if (constraints == NULL) return true;
+
+   /*============================================*/
+   /* If the value being checked isn't a number, */
+   /* then the range restrictions don't apply.   */
+   /*============================================*/
+
+   if ((type != INTEGER_TYPE) && (type != FLOAT_TYPE)) return true;
+
+   /*=====================================================*/
+   /* Check each of the range restrictions to see if the  */
+   /* number falls within at least one of the allowed     */
+   /* ranges. If it falls within one of the ranges, then  */
+   /* return true since the constraint is satisifed.      */
+   /*=====================================================*/
+
+   minList = constraints->minValue;
+   maxList = constraints->maxValue;
+
+   while (minList != NULL)
+     {
+      if (CompareNumbers(theEnv,type,vPtr,minList->type,minList->value) == LESS_THAN)
+        {
+         minList = minList->nextArg;
+         maxList = maxList->nextArg;
+        }
+      else if (CompareNumbers(theEnv,type,vPtr,maxList->type,maxList->value) == GREATER_THAN)
+        {
+         minList = minList->nextArg;
+         maxList = maxList->nextArg;
+        }
+      else
+        { return true; }
+     }
+
+   /*===========================================*/
+   /* Return false since the number didn't fall */
+   /* within one of the allowed numeric ranges. */
+   /*===========================================*/
+
+   return false;
+  }
+
+/************************************************/
+/* ConstraintViolationErrorMessage: Generalized */
+/*   error message for constraint violations.   */
+/************************************************/
+void ConstraintViolationErrorMessage(
+  Environment *theEnv,
+  const char *theWhat,
+  const char *thePlace,
+  bool command,
+  unsigned short thePattern,
+  CLIPSLexeme *theSlot,
+  unsigned short theField,
+  int violationType,
+  CONSTRAINT_RECORD *theConstraint,
+  bool printPrelude)
+  {
+   /*======================================================*/
+   /* Don't print anything other than the tail explanation */
+   /* of the error unless asked to do so.                  */
+   /*======================================================*/
+
+   if (printPrelude)
+     {
+      /*===================================*/
+      /* Print the name of the thing which */
+      /* caused the constraint violation.  */
+      /*===================================*/
+
+      if (violationType == FUNCTION_RETURN_TYPE_VIOLATION)
+        {
+         PrintErrorID(theEnv,"CSTRNCHK",1,true);
+         WriteString(theEnv,STDERR,"The function return value");
+        }
+      else if (theWhat != NULL)
+        {
+         PrintErrorID(theEnv,"CSTRNCHK",1,true);
+         WriteString(theEnv,STDERR,theWhat);
+        }
+
+      /*=======================================*/
+      /* Print the location of the thing which */
+      /* caused the constraint violation.      */
+      /*=======================================*/
+
+      if (thePlace != NULL)
+        {
+         WriteString(theEnv,STDERR," found in ");
+         if (command) WriteString(theEnv,STDERR,"the '");
+         WriteString(theEnv,STDERR,thePlace);
+         if (command) WriteString(theEnv,STDERR,"' command");
+        }
+
+      /*================================================*/
+      /* If the violation occured in the LHS of a rule, */
+      /* indicate which pattern was at fault.           */
+      /*================================================*/
+
+      if (thePattern > 0)
+        {
+         WriteString(theEnv,STDERR," found in CE #");
+         WriteInteger(theEnv,STDERR,thePattern);
+        }
+     }
+
+   /*===============================================================*/
+   /* Indicate the type of constraint violation (type, range, etc). */
+   /*===============================================================*/
+
+   if ((violationType == TYPE_VIOLATION) ||
+       (violationType == FUNCTION_RETURN_TYPE_VIOLATION))
+     { WriteString(theEnv,STDERR," does not match the allowed types"); }
+   else if (violationType == RANGE_VIOLATION)
+     {
+      WriteString(theEnv,STDERR," does not fall in the allowed range ");
+      PrintRange(theEnv,STDERR,theConstraint);
+     }
+   else if (violationType == ALLOWED_VALUES_VIOLATION)
+     { WriteString(theEnv,STDERR," does not match the allowed values"); }
+   else if (violationType == CARDINALITY_VIOLATION)
+     { WriteString(theEnv,STDERR," does not satisfy the cardinality restrictions"); }
+   else if (violationType == ALLOWED_CLASSES_VIOLATION)
+     { WriteString(theEnv,STDERR," does not match the allowed classes"); }
+
+   /*==============================================*/
+   /* Print either the slot name or field position */
+   /* where the constraint violation occured.      */
+   /*==============================================*/
+
+   if (theSlot != NULL)
+     {
+      WriteString(theEnv,STDERR," for slot '");
+      WriteString(theEnv,STDERR,theSlot->contents);
+      WriteString(theEnv,STDERR,"'");
+     }
+   else if (theField > 0)
+     {
+      WriteString(theEnv,STDERR," for field #");
+      WriteInteger(theEnv,STDERR,theField);
+     }
+
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/********************************************************************/
+/* PrintRange: Prints the range restriction of a constraint record. */
+/*   For example, 8 to +00 (eight to positive infinity).            */
+/********************************************************************/
+static void PrintRange(
+  Environment *theEnv,
+  const char *logicalName,
+  CONSTRAINT_RECORD *theConstraint)
+  {
+   if (theConstraint->minValue->value == SymbolData(theEnv)->NegativeInfinity)
+     { WriteString(theEnv,logicalName,SymbolData(theEnv)->NegativeInfinity->contents); }
+   else PrintExpression(theEnv,logicalName,theConstraint->minValue);
+   WriteString(theEnv,logicalName," to ");
+   if (theConstraint->maxValue->value == SymbolData(theEnv)->PositiveInfinity)
+     { WriteString(theEnv,logicalName,SymbolData(theEnv)->PositiveInfinity->contents); }
+   else PrintExpression(theEnv,logicalName,theConstraint->maxValue);
+  }
+
+/*************************************************************/
+/* ConstraintCheckDataObject: Given a value stored in a data */
+/*   object structure and a constraint record, determines if */
+/*   the data object satisfies the constraint record.        */
+/*************************************************************/
+ConstraintViolationType ConstraintCheckDataObject(
+  Environment *theEnv,
+  UDFValue *theData,
+  CONSTRAINT_RECORD *theConstraints)
+  {
+   size_t i; /* 6.04 Bug Fix */
+   ConstraintViolationType rv;
+   CLIPSValue *theMultifield;
+
+   if (theConstraints == NULL) return NO_VIOLATION;
+
+   if (theData->header->type == MULTIFIELD_TYPE)
+     {
+      if (CheckCardinalityConstraint(theEnv,theData->range,theConstraints) == false)
+        { return CARDINALITY_VIOLATION; }
+
+      theMultifield = theData->multifieldValue->contents;
+      for (i = theData->begin; i < theData->begin + theData->range; i++)
+        {
+         if ((rv = ConstraintCheckValue(theEnv,theMultifield[i].header->type,
+                                        theMultifield[i].value,
+                                        theConstraints)) != NO_VIOLATION)
+           { return rv; }
+        }
+
+      return NO_VIOLATION;
+     }
+
+   if (CheckCardinalityConstraint(theEnv,1,theConstraints) == false)
+    { return CARDINALITY_VIOLATION; }
+
+   return ConstraintCheckValue(theEnv,theData->header->type,theData->value,theConstraints);
+  }
+
+/****************************************************************/
+/* ConstraintCheckValue: Given a value and a constraint record, */
+/*   determines if the value satisfies the constraint record.   */
+/****************************************************************/
+ConstraintViolationType ConstraintCheckValue(
+  Environment *theEnv,
+  int theType,
+  void *theValue,
+  CONSTRAINT_RECORD *theConstraints)
+  {
+   if (CheckTypeConstraint(theType,theConstraints) == false)
+     { return TYPE_VIOLATION; }
+
+   else if (CheckAllowedValuesConstraint(theType,theValue,theConstraints) == false)
+     { return ALLOWED_VALUES_VIOLATION; }
+
+   else if (CheckAllowedClassesConstraint(theEnv,theType,theValue,theConstraints) == false)
+     { return ALLOWED_CLASSES_VIOLATION; }
+
+   else if (CheckRangeConstraint(theEnv,theType,theValue,theConstraints) == false)
+     { return RANGE_VIOLATION; }
+
+   else if (theType == FCALL)
+     {
+      if (CheckFunctionReturnType(UnknownFunctionType(theValue),theConstraints) == false)
+        { return FUNCTION_RETURN_TYPE_VIOLATION; }
+     }
+
+   return NO_VIOLATION;
+  }
+
+/********************************************************************/
+/* ConstraintCheckExpressionChain: Checks an expression and nextArg */
+/* links for constraint conflicts (argList is not followed).        */
+/********************************************************************/
+ConstraintViolationType ConstraintCheckExpressionChain(
+  Environment *theEnv,
+  struct expr *theExpression,
+  CONSTRAINT_RECORD *theConstraints)
+  {
+   struct expr *theExp;
+   int min = 0, max = 0;
+   ConstraintViolationType vCode;
+
+   /*===========================================================*/
+   /* Determine the minimum and maximum number of value which   */
+   /* can be derived from the expression chain (max of -1 means */
+   /* positive infinity).                                       */
+   /*===========================================================*/
+
+   for (theExp = theExpression ; theExp != NULL ; theExp = theExp->nextArg)
+     {
+      if (ConstantType(theExp->type)) min++;
+      else if (theExp->type == FCALL)
+        {
+         unsigned restriction = ExpressionUnknownFunctionType(theExp);
+         if (restriction & MULTIFIELD_BIT)
+           { max = -1; }
+         else
+           { min++; }
+        }
+      else max = -1;
+     }
+
+   /*====================================*/
+   /* Check for a cardinality violation. */
+   /*====================================*/
+
+   if (max == 0) max = min;
+   if (CheckRangeAgainstCardinalityConstraint(theEnv,min,max,theConstraints) == false)
+     { return CARDINALITY_VIOLATION; }
+
+   /*========================================*/
+   /* Check for other constraint violations. */
+   /*========================================*/
+
+   for (theExp = theExpression ; theExp != NULL ; theExp = theExp->nextArg)
+     {
+      vCode = ConstraintCheckValue(theEnv,theExp->type,theExp->value,theConstraints);
+      if (vCode != NO_VIOLATION)
+        return vCode;
+     }
+
+   return NO_VIOLATION;
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/***************************************************/
+/* ConstraintCheckExpression: Checks an expression */
+/*   for constraint conflicts. Returns zero if     */
+/*   conflicts are found, otherwise non-zero.      */
+/***************************************************/
+ConstraintViolationType ConstraintCheckExpression(
+  Environment *theEnv,
+  struct expr *theExpression,
+  CONSTRAINT_RECORD *theConstraints)
+  {
+   ConstraintViolationType rv = NO_VIOLATION;
+
+   if (theConstraints == NULL) return(rv);
+
+   while (theExpression != NULL)
+     {
+      rv = ConstraintCheckValue(theEnv,theExpression->type,
+                                theExpression->value,
+                                theConstraints);
+      if (rv != NO_VIOLATION) return rv;
+      rv = ConstraintCheckExpression(theEnv,theExpression->argList,theConstraints);
+      if (rv != NO_VIOLATION) return rv;
+      theExpression = theExpression->nextArg;
+     }
+
+   return rv;
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+/*****************************************************/
+/* UnmatchableConstraint: Determines if a constraint */
+/*  record can still be satisfied by some value.     */
+/*****************************************************/
+bool UnmatchableConstraint(
+  CONSTRAINT_RECORD *theConstraint)
+  {
+   if (theConstraint == NULL) return false;
+
+   if ((! theConstraint->anyAllowed) &&
+       (! theConstraint->symbolsAllowed) &&
+       (! theConstraint->stringsAllowed) &&
+       (! theConstraint->floatsAllowed) &&
+       (! theConstraint->integersAllowed) &&
+       (! theConstraint->instanceNamesAllowed) &&
+       (! theConstraint->instanceAddressesAllowed) &&
+       (! theConstraint->multifieldsAllowed) &&
+       (! theConstraint->externalAddressesAllowed) &&
+       (! theConstraint->voidAllowed) &&
+       (! theConstraint->factAddressesAllowed))
+     { return true; }
+
+   return false;
+  }
+
diff --git a/clips/cstrnchk.h b/clips/cstrnchk.h
new file mode 100755
index 000000000..ea98411b8
--- /dev/null
+++ b/clips/cstrnchk.h
@@ -0,0 +1,91 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*            CONSTRAINT CHECKING HEADER FILE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for constraint checking of    */
+/*   data types.                                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Dynamic constraint checking for the            */
+/*            allowed-classes constraint now searches        */
+/*            imported modules.                              */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrnchk
+
+#pragma once
+
+#define _H_cstrnchk
+
+#include "constrnt.h"
+#include "evaluatn.h"
+
+typedef enum
+  {
+   NO_VIOLATION,
+   TYPE_VIOLATION,
+   RANGE_VIOLATION,
+   ALLOWED_VALUES_VIOLATION,
+   FUNCTION_RETURN_TYPE_VIOLATION,
+   CARDINALITY_VIOLATION,
+   ALLOWED_CLASSES_VIOLATION
+  } ConstraintViolationType;
+
+   bool                           CheckCardinalityConstraint(Environment *,size_t,CONSTRAINT_RECORD *);
+   bool                           CheckAllowedValuesConstraint(int,void *,CONSTRAINT_RECORD *);
+   bool                           CheckAllowedClassesConstraint(Environment *,int,void *,CONSTRAINT_RECORD *);
+   ConstraintViolationType        ConstraintCheckExpressionChain(Environment *,struct expr *,
+                                                                     CONSTRAINT_RECORD *);
+   void                           ConstraintViolationErrorMessage(Environment *,const char *,const char *,bool,
+                                                                  unsigned short,CLIPSLexeme *,unsigned short,
+                                                                  int,CONSTRAINT_RECORD *,bool);
+   ConstraintViolationType        ConstraintCheckValue(Environment *,int,void *,CONSTRAINT_RECORD *);
+   ConstraintViolationType        ConstraintCheckDataObject(Environment *,UDFValue *,CONSTRAINT_RECORD *);
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   ConstraintViolationType        ConstraintCheckExpression(Environment *,struct expr *,
+                                                            CONSTRAINT_RECORD *);
+#endif
+   bool                           UnmatchableConstraint(struct constraintRecord *);
+
+#endif /* _H_cstrnchk */
+
+
+
diff --git a/clips/cstrncmp.c b/clips/cstrncmp.c
new file mode 100755
index 000000000..7cec63c28
--- /dev/null
+++ b/clips/cstrncmp.c
@@ -0,0 +1,237 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*          CONSTRAINT CONSTRUCTS-TO-C MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for       */
+/*    constraint records.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include "constant.h"
+
+#include "conscomp.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+
+#include "cstrncmp.h"
+
+/***********************************************/
+/* ConstraintsToCode: Produces the constraint  */
+/*   record code for a run-time module created */
+/*   using the constructs-to-c function.       */
+/***********************************************/
+void ConstraintsToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned fileID,
+  FILE *headerFP,
+  unsigned imageID,
+  unsigned maxIndices)
+  {
+   unsigned int i, j, count;
+   bool newHeader = true;
+   FILE *fp;
+   unsigned int version = 1;
+   int arrayVersion = 1;
+   unsigned short numberOfConstraints = 0;
+   CONSTRAINT_RECORD *tmpPtr;
+
+   /*===============================================*/
+   /* Count the total number of constraint records. */
+   /*===============================================*/
+
+   for (i = 0 ; i < SIZE_CONSTRAINT_HASH; i++)
+     {
+      for (tmpPtr = ConstraintData(theEnv)->ConstraintHashtable[i];
+           tmpPtr != NULL;
+           tmpPtr = tmpPtr->next)
+        { tmpPtr->bsaveIndex = numberOfConstraints++; }
+     }
+
+   /*=====================================================*/
+   /* If dynamic constraint checking is disabled, then    */
+   /* contraints won't be saved. If there are constraints */
+   /* which could be saved, then issue a warning message. */
+   /*=====================================================*/
+
+   if ((! GetDynamicConstraintChecking(theEnv)) && (numberOfConstraints != 0))
+     {
+      numberOfConstraints = 0;
+      PrintWarningID(theEnv,"CSTRNCMP",1,false);
+      WriteString(theEnv,STDWRN,"Constraints are not saved with a constructs-to-c image\n");
+      WriteString(theEnv,STDWRN,"  when dynamic constraint checking is disabled.\n");
+     }
+
+   if (numberOfConstraints == 0)
+     { return; }
+
+   /*=================================================*/
+   /* Print the extern definition in the header file. */
+   /*=================================================*/
+
+   for (i = 1; i <= (numberOfConstraints / maxIndices) + 1 ; i++)
+     { fprintf(headerFP,"extern CONSTRAINT_RECORD C%d_%d[];\n",imageID,i); }
+
+   /*==================*/
+   /* Create the file. */
+   /*==================*/
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,fileID,version,false)) == NULL) return;
+
+   /*===================*/
+   /* List the entries. */
+   /*===================*/
+
+   j = 0;
+   count = 0;
+
+   for (i = 0; i < SIZE_CONSTRAINT_HASH; i++)
+     {
+      for (tmpPtr = ConstraintData(theEnv)->ConstraintHashtable[i];
+           tmpPtr != NULL;
+           tmpPtr = tmpPtr->next)
+        {
+         if (newHeader)
+           {
+            fprintf(fp,"CONSTRAINT_RECORD C%d_%d[] = {\n",imageID,arrayVersion);
+            newHeader = false;
+           }
+
+         fprintf(fp,"{%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
+                 tmpPtr->anyAllowed,
+                 tmpPtr->symbolsAllowed,
+                 tmpPtr->stringsAllowed,
+                 tmpPtr->floatsAllowed,
+                 tmpPtr->integersAllowed,
+                 tmpPtr->instanceNamesAllowed,
+                 tmpPtr->instanceAddressesAllowed,
+                 tmpPtr->externalAddressesAllowed,
+                 tmpPtr->factAddressesAllowed,
+                 0, /* void allowed */
+                 tmpPtr->anyRestriction,
+                 tmpPtr->symbolRestriction,
+                 tmpPtr->stringRestriction,
+                 tmpPtr->floatRestriction,
+                 tmpPtr->integerRestriction,
+                 tmpPtr->classRestriction,
+                 tmpPtr->instanceNameRestriction,
+                 tmpPtr->multifieldsAllowed,
+                 tmpPtr->singlefieldsAllowed,
+                 tmpPtr->installed);
+
+         fprintf(fp,",0,"); /* bsaveIndex */
+
+         PrintHashedExpressionReference(theEnv,fp,tmpPtr->classList,imageID,maxIndices);
+         fprintf(fp,",");
+         PrintHashedExpressionReference(theEnv,fp,tmpPtr->restrictionList,imageID,maxIndices);
+         fprintf(fp,",");
+         PrintHashedExpressionReference(theEnv,fp,tmpPtr->minValue,imageID,maxIndices);
+         fprintf(fp,",");
+         PrintHashedExpressionReference(theEnv,fp,tmpPtr->maxValue,imageID,maxIndices);
+         fprintf(fp,",");
+         PrintHashedExpressionReference(theEnv,fp,tmpPtr->minFields,imageID,maxIndices);
+         fprintf(fp,",");
+         PrintHashedExpressionReference(theEnv,fp,tmpPtr->maxFields,imageID,maxIndices);
+
+         /* multifield slot */
+
+         fprintf(fp,",NULL");
+
+         /* next slot */
+
+         if (tmpPtr->next == NULL)
+           { fprintf(fp,",NULL,"); }
+         else
+           {
+            if ((j + 1) >= maxIndices)
+              { fprintf(fp,",&C%d_%d[%d],",imageID,arrayVersion + 1,0); }
+            else
+              { fprintf(fp,",&C%d_%d[%d],",imageID,arrayVersion,j + 1); }
+           }
+
+         fprintf(fp,"%u,%u",tmpPtr->bucket,tmpPtr->count + 1);
+
+         count++;
+         j++;
+
+         if ((count == numberOfConstraints) || (j >= maxIndices))
+           {
+            fprintf(fp,"}};\n");
+            GenClose(theEnv,fp);
+            j = 0;
+            version++;
+            arrayVersion++;
+            if (count < numberOfConstraints)
+              {
+               if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL)
+                 { return; }
+               newHeader = true;
+              }
+           }
+         else
+           { fprintf(fp,"},\n"); }
+        }
+     }
+  }
+
+/**********************************************************/
+/* PrintConstraintReference: Prints C code representation */
+/*   of a constraint record data structure reference.     */
+/**********************************************************/
+void PrintConstraintReference(
+  Environment *theEnv,
+  FILE *fp,
+  CONSTRAINT_RECORD *cPtr,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   if ((cPtr == NULL) || (! GetDynamicConstraintChecking(theEnv)))
+     { fprintf(fp,"NULL"); }
+   else fprintf(fp,"&C%u_%u[%u]",imageID,
+                                 (cPtr->bsaveIndex / maxIndices) + 1,
+                                 cPtr->bsaveIndex % maxIndices);
+  }
+
+#endif /* CONSTRUCT_COMPILER && (! RUN_TIME) */
+
+
+
diff --git a/clips/cstrncmp.h b/clips/cstrncmp.h
new file mode 100755
index 000000000..f2c86e428
--- /dev/null
+++ b/clips/cstrncmp.h
@@ -0,0 +1,57 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*          CONSTRAINT CONSTRUCTS-TO-C HEADER          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for       */
+/*    constraint records.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrncmp
+
+#pragma once
+
+#define _H_cstrncmp
+
+#include "evaluatn.h"
+#include "constrnt.h"
+
+#include <stdio.h>
+
+   void                           PrintConstraintReference(Environment *,FILE *,CONSTRAINT_RECORD *,
+                                                           unsigned int,unsigned int);
+   void                           ConstraintRecordToCode(FILE *,CONSTRAINT_RECORD *);
+   void                           ConstraintsToCode(Environment *,const char *,const char *,char *,
+                                                    unsigned int,FILE *,unsigned int,unsigned int);
+
+#endif /* _H_cstrncmp */
+
diff --git a/clips/cstrnops.c b/clips/cstrnops.c
new file mode 100755
index 000000000..87b815e87
--- /dev/null
+++ b/clips/cstrnops.c
@@ -0,0 +1,1176 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*            CONSTRAINT OPERATIONS MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for performing operations on  */
+/*   constraint records including computing the intersection */
+/*   and union of constraint records.                        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "constant.h"
+#include "constrnt.h"
+#include "cstrnchk.h"
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "router.h"
+#include "scanner.h"
+
+#include "cstrnops.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                     IntersectNumericExpressions(Environment *,
+                                                               CONSTRAINT_RECORD *,
+                                                               CONSTRAINT_RECORD *,
+                                                               CONSTRAINT_RECORD *,bool);
+   static void                     IntersectAllowedValueExpressions(Environment *,
+                                                                    CONSTRAINT_RECORD *,
+                                                                    CONSTRAINT_RECORD *,
+                                                                    CONSTRAINT_RECORD *);
+   static void                     IntersectAllowedClassExpressions(Environment *,
+                                                                    CONSTRAINT_RECORD *,
+                                                                    CONSTRAINT_RECORD *,
+                                                                    CONSTRAINT_RECORD *);
+   static bool                     FindItemInExpression(int,void *,bool,struct expr *);
+   static void                     UpdateRestrictionFlags(CONSTRAINT_RECORD *);
+   static void                     UnionRangeMinMaxValueWithList(Environment *,
+                                                                 struct expr *,
+                                                                 struct expr *,
+                                                                 struct expr **,
+                                                                 struct expr **);
+   static void                     UnionNumericExpressions(Environment *,
+                                                         CONSTRAINT_RECORD *,
+                                                         CONSTRAINT_RECORD *,
+                                                         CONSTRAINT_RECORD *,bool);
+   static struct expr             *AddToUnionList(Environment *,
+                                                  struct expr *,struct expr *,
+                                                  CONSTRAINT_RECORD *);
+   static void                     UnionAllowedValueExpressions(Environment *,
+                                                                CONSTRAINT_RECORD *,
+                                                                CONSTRAINT_RECORD *,
+                                                                CONSTRAINT_RECORD *);
+   static void                     UnionAllowedClassExpressions(Environment *,
+                                                                CONSTRAINT_RECORD *,
+                                                                CONSTRAINT_RECORD *,
+                                                                CONSTRAINT_RECORD *);
+   static bool                     RestrictionOnType(int,CONSTRAINT_RECORD *);
+
+/**************************************************************/
+/* IntersectConstraints: Creates a new constraint record that */
+/*   is the intersection of two other constraint records.     */
+/**************************************************************/
+struct constraintRecord *IntersectConstraints(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *c1,
+  CONSTRAINT_RECORD *c2)
+  {
+   struct constraintRecord *rv;
+   bool c1Changed = false, c2Changed = false;
+
+   /*=================================================*/
+   /* If both constraint records are NULL,then create */
+   /* a constraint record that allows any value.      */
+   /*=================================================*/
+
+   if ((c1 == NULL) && (c2 == NULL))
+     {
+      rv = GetConstraintRecord(theEnv);
+      rv->multifieldsAllowed = true;
+      return(rv);
+     }
+
+   /*=================================================*/
+   /* If one of the constraint records is NULL, then  */
+   /* the intersection is the other constraint record */
+   /* (a NULL value means no constraints).            */
+   /*=================================================*/
+
+   if (c1 == NULL) return(CopyConstraintRecord(theEnv,c2));
+
+   if (c2 == NULL) return(CopyConstraintRecord(theEnv,c1));
+
+   /*=================================*/
+   /* Create a new constraint record. */
+   /*=================================*/
+
+   rv = GetConstraintRecord(theEnv);
+
+   /*==============================*/
+   /* Intersect the allowed types. */
+   /*==============================*/
+
+   if ((c1->multifieldsAllowed != c2->multifieldsAllowed) &&
+       (c1->singlefieldsAllowed != c2->singlefieldsAllowed))
+     {
+      rv->anyAllowed = false;
+      return(rv);
+     }
+
+   if (c1->multifieldsAllowed && c2->multifieldsAllowed)
+     { rv->multifieldsAllowed = true; }
+   else
+     { rv->multifieldsAllowed = false; }
+
+   if (c1->singlefieldsAllowed && c2->singlefieldsAllowed)
+     { rv->singlefieldsAllowed = true; }
+   else
+     { rv->singlefieldsAllowed = false; }
+
+   if (c1->anyAllowed && c2->anyAllowed) rv->anyAllowed = true;
+   else
+     {
+      if (c1->anyAllowed)
+        {
+         c1Changed = true;
+         SetAnyAllowedFlags(c1,false);
+        }
+      else if (c2->anyAllowed)
+        {
+         c2Changed = true;
+         SetAnyAllowedFlags(c2,false);
+        }
+
+      rv->anyAllowed = false;
+      rv->symbolsAllowed = (c1->symbolsAllowed && c2->symbolsAllowed);
+      rv->stringsAllowed = (c1->stringsAllowed && c2->stringsAllowed);
+      rv->floatsAllowed = (c1->floatsAllowed && c2->floatsAllowed);
+      rv->integersAllowed = (c1->integersAllowed && c2->integersAllowed);
+      rv->instanceNamesAllowed = (c1->instanceNamesAllowed && c2->instanceNamesAllowed);
+      rv->instanceAddressesAllowed = (c1->instanceAddressesAllowed && c2->instanceAddressesAllowed);
+      rv->externalAddressesAllowed = (c1->externalAddressesAllowed && c2->externalAddressesAllowed);
+      rv->voidAllowed = (c1->voidAllowed && c2->voidAllowed);
+      rv->multifieldsAllowed = (c1->multifieldsAllowed && c2->multifieldsAllowed);
+      rv->factAddressesAllowed = (c1->factAddressesAllowed && c2->factAddressesAllowed);
+
+      if (c1Changed) SetAnyAllowedFlags(c1,true);
+      if (c2Changed) SetAnyAllowedFlags(c2,true);
+     }
+
+   /*=====================================*/
+   /* Intersect the allowed-values flags. */
+   /*=====================================*/
+
+   if (c1->anyRestriction || c2->anyRestriction) rv->anyRestriction = true;
+   else
+     {
+      rv->anyRestriction = false;
+      rv->symbolRestriction = (c1->symbolRestriction || c2->symbolRestriction);
+      rv->stringRestriction = (c1->stringRestriction || c2->stringRestriction);
+      rv->floatRestriction = (c1->floatRestriction || c2->floatRestriction);
+      rv->integerRestriction = (c1->integerRestriction || c2->integerRestriction);
+      rv->classRestriction = (c1->classRestriction || c2->classRestriction);
+      rv->instanceNameRestriction = (c1->instanceNameRestriction || c2->instanceNameRestriction);
+     }
+
+   /*==================================================*/
+   /* Intersect the allowed values list, allowed class */
+   /* list, min and max values, and the range values.  */
+   /*==================================================*/
+
+   IntersectAllowedValueExpressions(theEnv,c1,c2,rv);
+   IntersectAllowedClassExpressions(theEnv,c1,c2,rv);
+   IntersectNumericExpressions(theEnv,c1,c2,rv,true);
+   IntersectNumericExpressions(theEnv,c1,c2,rv,false);
+
+   /*==========================================*/
+   /* Update the allowed-values flags based on */
+   /* the previous intersection for allowed,   */
+   /* min and max, and range values.           */
+   /*==========================================*/
+
+   UpdateRestrictionFlags(rv);
+
+   /*============================================*/
+   /* If multifields are allowed, then intersect */
+   /* the constraint record for them.            */
+   /*============================================*/
+
+   if (rv->multifieldsAllowed)
+     {
+      rv->multifield = IntersectConstraints(theEnv,c1->multifield,c2->multifield);
+      if (UnmatchableConstraint(rv->multifield))
+        { rv->multifieldsAllowed = false; }
+     }
+
+   /*========================*/
+   /* Return the intersected */
+   /* constraint record.     */
+   /*========================*/
+
+   return(rv);
+  }
+
+/*************************************************/
+/* IntersectAllowedValueExpressions: Creates the */
+/*   intersection of two allowed-values lists.   */
+/*************************************************/
+static void IntersectAllowedValueExpressions(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraint1,
+  CONSTRAINT_RECORD *constraint2,
+  CONSTRAINT_RECORD *newConstraint)
+  {
+   struct expr *theList1, *theList2;
+   struct expr *theHead = NULL, *tmpExpr;
+
+   /*===========================================*/
+   /* Loop through each value in allowed-values */
+   /* list of the first constraint record. Add  */
+   /* each value to a list if it satisfies the  */
+   /* restrictions for both constraint records. */
+   /*===========================================*/
+
+   for (theList1 = constraint1->restrictionList;
+        theList1 != NULL;
+        theList1 = theList1->nextArg)
+     {
+      if (CheckAllowedValuesConstraint(theList1->type,theList1->value,constraint1) &&
+          CheckAllowedValuesConstraint(theList1->type,theList1->value,constraint2))
+        {
+         tmpExpr = GenConstant(theEnv,theList1->type,theList1->value);
+         tmpExpr->nextArg = theHead;
+         theHead = tmpExpr;
+        }
+     }
+
+   /*===========================================*/
+   /* Loop through each value in allowed-values */
+   /* list of the second constraint record. Add */
+   /* each value to a list if it satisfies the  */
+   /* restrictions for both constraint records. */
+   /*===========================================*/
+
+   for (theList2 = constraint2->restrictionList;
+        theList2 != NULL;
+        theList2 = theList2->nextArg)
+     {
+      if (FindItemInExpression(theList2->type,theList2->value,true,theHead))
+        { /* The value is already in the list--Do nothing */ }
+      else if (CheckAllowedValuesConstraint(theList2->type,theList2->value,constraint1) &&
+               CheckAllowedValuesConstraint(theList2->type,theList2->value,constraint2))
+        {
+         tmpExpr = GenConstant(theEnv,theList2->type,theList2->value);
+         tmpExpr->nextArg = theHead;
+         theHead = tmpExpr;
+        }
+     }
+
+   /*================================================*/
+   /* Set the allowed values list for the constraint */
+   /* record to the intersected values of the two    */
+   /* other constraint records.                      */
+   /*================================================*/
+
+   newConstraint->restrictionList = theHead;
+  }
+
+/*************************************************/
+/* IntersectAllowedClassExpressions: Creates the */
+/*   intersection of two allowed-classes lists.  */
+/*************************************************/
+static void IntersectAllowedClassExpressions(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraint1,
+  CONSTRAINT_RECORD *constraint2,
+  CONSTRAINT_RECORD *newConstraint)
+  {
+   struct expr *theList1, *theList2;
+   struct expr *theHead = NULL, *tmpExpr;
+
+   /*============================================*/
+   /* Loop through each value in allowed-classes */
+   /* list of the first constraint record. Add   */
+   /* each value to a list if it satisfies the   */
+   /* restrictions for both constraint records.  */
+   /*============================================*/
+
+   for (theList1 = constraint1->classList;
+        theList1 != NULL;
+        theList1 = theList1->nextArg)
+     {
+      if (CheckAllowedClassesConstraint(theEnv,theList1->type,theList1->value,constraint1) &&
+          CheckAllowedClassesConstraint(theEnv,theList1->type,theList1->value,constraint2))
+        {
+         tmpExpr = GenConstant(theEnv,theList1->type,theList1->value);
+         tmpExpr->nextArg = theHead;
+         theHead = tmpExpr;
+        }
+     }
+
+   /*============================================*/
+   /* Loop through each value in allowed-classes */
+   /* list of the second constraint record. Add  */
+   /* each value to a list if it satisfies the   */
+   /* restrictions for both constraint records.  */
+   /*============================================*/
+
+   for (theList2 = constraint2->classList;
+        theList2 != NULL;
+        theList2 = theList2->nextArg)
+     {
+      if (FindItemInExpression(theList2->type,theList2->value,true,theHead))
+        { /* The value is already in the list--Do nothing */ }
+      else if (CheckAllowedClassesConstraint(theEnv,theList2->type,theList2->value,constraint1) &&
+               CheckAllowedClassesConstraint(theEnv,theList2->type,theList2->value,constraint2))
+        {
+         tmpExpr = GenConstant(theEnv,theList2->type,theList2->value);
+         tmpExpr->nextArg = theHead;
+         theHead = tmpExpr;
+        }
+     }
+
+   /*=================================================*/
+   /* Set the allowed classes list for the constraint */
+   /* record to the intersected values of the two     */
+   /* other constraint records.                       */
+   /*=================================================*/
+
+   newConstraint->classList = theHead;
+  }
+
+/*********************************************************/
+/* IntersectNumericExpressions: Creates the intersection */
+/*   of two range or two min/max-fields constraints.     */
+/*********************************************************/
+static void IntersectNumericExpressions(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraint1,
+  CONSTRAINT_RECORD *constraint2,
+  CONSTRAINT_RECORD *newConstraint,
+  bool range)
+  {
+   struct expr *tmpmin1, *tmpmax1, *tmpmin2, *tmpmax2, *theMin, *theMax;
+   struct expr *theMinList, *theMaxList, *lastMin = NULL, *lastMax = NULL;
+   int cmaxmax, cminmin, cmaxmin, cminmax;
+
+   /*==========================================*/
+   /* Initialize the new range/min/max values  */
+   /* for the intersection of the constraints. */
+   /*==========================================*/
+
+   theMinList = NULL;
+   theMaxList = NULL;
+
+   /*=================================*/
+   /* Determine the min/max values of */
+   /* the first constraint record.    */
+   /*=================================*/
+
+   if (range)
+     {
+      tmpmin1 = constraint1->minValue;
+      tmpmax1 = constraint1->maxValue;
+     }
+   else
+     {
+      tmpmin1 = constraint1->minFields;
+      tmpmax1 = constraint1->maxFields;
+     }
+
+   /*===========================================*/
+   /* Loop through each of range/min/max values */
+   /* from the first constraint record.         */
+   /*===========================================*/
+
+   for (;
+        tmpmin1 != NULL;
+        tmpmin1 = tmpmin1->nextArg, tmpmax1 = tmpmax1->nextArg)
+     {
+      /*============================================*/
+      /* Get the appropriate values from the second */
+      /* constraint record for comparison.          */
+      /*============================================*/
+
+      if (range)
+        {
+         tmpmin2 = constraint2->minValue;
+         tmpmax2 = constraint2->maxValue;
+        }
+      else
+        {
+         tmpmin2 = constraint2->minFields;
+         tmpmax2 = constraint2->maxFields;
+        }
+
+      /*================================================*/
+      /* Loop through each of range/min/max values from */
+      /* the second constraint record comparing it to   */
+      /* the values from the first constraint record.   */
+      /*================================================*/
+
+      for (;
+           tmpmin2 != NULL;
+           tmpmin2 = tmpmin2->nextArg, tmpmax2 = tmpmax2->nextArg)
+        {
+         /*==============================================*/
+         /* Determine the relationship between the four  */
+         /* combinations of min/max values (>, <, or =). */
+         /*==============================================*/
+
+         cmaxmax = CompareNumbers(theEnv,tmpmax1->type,tmpmax1->value,
+                                  tmpmax2->type,tmpmax2->value);
+
+         cminmin = CompareNumbers(theEnv,tmpmin1->type,tmpmin1->value,
+                                  tmpmin2->type,tmpmin2->value);
+
+         cmaxmin = CompareNumbers(theEnv,tmpmax1->type,tmpmax1->value,
+                                  tmpmin2->type,tmpmin2->value);
+
+         cminmax = CompareNumbers(theEnv,tmpmin1->type,tmpmin1->value,
+                                  tmpmax2->type,tmpmax2->value);
+
+         /*============================================*/
+         /* If the range/min/max values don't overlap, */
+         /* then proceed to the next pair of numbers   */
+         /* to see if they overlap.                    */
+         /*============================================*/
+
+         if ((cmaxmin == LESS_THAN) || (cminmax == GREATER_THAN))
+           { continue; }
+
+         /*=======================================*/
+         /* Compute the new minimum value for the */
+         /* intersected range/min/max values.     */
+         /*=======================================*/
+
+         if (cminmin == GREATER_THAN)
+           { theMin = GenConstant(theEnv,tmpmin1->type,tmpmin1->value); }
+         else
+           { theMin = GenConstant(theEnv,tmpmin2->type,tmpmin2->value); }
+
+         /*=======================================*/
+         /* Compute the new maximum value for the */
+         /* intersected range/min/max values.     */
+         /*=======================================*/
+
+         if (cmaxmax == LESS_THAN)
+           { theMax = GenConstant(theEnv,tmpmax1->type,tmpmax1->value); }
+         else
+           { theMax = GenConstant(theEnv,tmpmax2->type,tmpmax2->value); }
+
+         /*==================================*/
+         /* Add the new range/min/max values */
+         /* to the intersection list.        */
+         /*==================================*/
+
+         if (lastMin == NULL)
+           {
+            theMinList = theMin;
+            theMaxList = theMax;
+           }
+         else
+           {
+            lastMin->nextArg = theMin;
+            lastMax->nextArg = theMax;
+           }
+
+         lastMin = theMin;
+         lastMax = theMax;
+        }
+     }
+
+   /*============================================================*/
+   /* If the intersection produced a pair of valid range/min/max */
+   /* values, then replace the previous values of the constraint */
+   /* record to the new intersected values.                      */
+   /*============================================================*/
+
+   if (theMinList != NULL)
+     {
+      if (range)
+        {
+         ReturnExpression(theEnv,newConstraint->minValue);
+         ReturnExpression(theEnv,newConstraint->maxValue);
+         newConstraint->minValue = theMinList;
+         newConstraint->maxValue = theMaxList;
+        }
+      else
+        {
+         ReturnExpression(theEnv,newConstraint->minFields);
+         ReturnExpression(theEnv,newConstraint->maxFields);
+         newConstraint->minFields = theMinList;
+         newConstraint->maxFields = theMaxList;
+        }
+     }
+
+   /*===============================================================*/
+   /* Otherwise, the intersection produced no valid range/min/max   */
+   /* values. For the range attribute, this means that no numbers   */
+   /* can satisfy the constraint. For the min/max fields attribute, */
+   /* it means that no value can satisfy the constraint.            */
+   /*===============================================================*/
+
+   else
+     {
+      if (range)
+        {
+         if (newConstraint->anyAllowed) SetAnyAllowedFlags(newConstraint,false);
+         newConstraint->integersAllowed = false;
+         newConstraint->floatsAllowed = false;
+        }
+      else
+        {
+         SetAnyAllowedFlags(newConstraint,true);
+         newConstraint->singlefieldsAllowed = false;
+         newConstraint->multifieldsAllowed = false;
+         newConstraint->anyAllowed = false;
+        }
+     }
+  }
+
+/************************************************************/
+/* UpdateRestrictionFlags: Updates the types allowed flags  */
+/*   based on the allowed values in a constraint record.    */
+/*   Intended to be called after the allowed values list    */
+/*   has been changed (for example after intersecting the   */
+/*   allowed-values list there may no be any values of a    */
+/*   particular type left even though the type is allowed). */
+/************************************************************/
+static void UpdateRestrictionFlags(
+  CONSTRAINT_RECORD *rv)
+  {
+   if ((rv->anyRestriction) && (rv->restrictionList == NULL))
+     {
+      SetAnyAllowedFlags(rv,true);
+      rv->anyAllowed = false;
+     }
+
+   if ((rv->symbolRestriction) && (rv->symbolsAllowed))
+     { rv->symbolsAllowed = FindItemInExpression(SYMBOL_TYPE,NULL,false,rv->restrictionList); }
+
+   if ((rv->stringRestriction)  && (rv->stringsAllowed))
+     { rv->stringsAllowed = FindItemInExpression(STRING_TYPE,NULL,false,rv->restrictionList); }
+
+   if ((rv->floatRestriction) && (rv->floatsAllowed))
+     { rv->floatsAllowed = FindItemInExpression(FLOAT_TYPE,NULL,false,rv->restrictionList); }
+
+   if ((rv->integerRestriction) && (rv->integersAllowed))
+     { rv->integersAllowed = FindItemInExpression(INTEGER_TYPE,NULL,false,rv->restrictionList); }
+
+   if ((rv->instanceNameRestriction) && (rv->instanceNamesAllowed))
+     { rv->instanceNamesAllowed = FindItemInExpression(INSTANCE_NAME_TYPE,NULL,false,rv->restrictionList); }
+  }
+
+/*************************************************************/
+/* FindItemInExpression: Determines if a particular constant */
+/*   (such as 27) or a class of constants (such as integers) */
+/*   can be found in a list of constants. Returns true if    */
+/*   such a constant can be found, otherwise false.          */
+/*************************************************************/
+static bool FindItemInExpression(
+  int theType,
+  void *theValue,
+  bool useValue,
+  struct expr *theList)
+  {
+   while (theList != NULL)
+     {
+      if (theList->type == theType)
+        {
+         if (! useValue) return true;
+         else if (theList->value == theValue) return true;
+        }
+
+      theList = theList->nextArg;
+     }
+
+   return false;
+  }
+
+/**************************************************/
+/* RestrictionOnType: Determines if a restriction */
+/*   is present for a specific type. Returns true */
+/*   if there is, otherwise false.                */
+/**************************************************/
+static bool RestrictionOnType(
+  int theType,
+  CONSTRAINT_RECORD *theConstraint)
+  {
+   if (theConstraint == NULL) return false;
+
+   if ((theConstraint->anyRestriction) ||
+       (theConstraint->symbolRestriction && (theType == SYMBOL_TYPE)) ||
+       (theConstraint->stringRestriction && (theType == STRING_TYPE)) ||
+       (theConstraint->floatRestriction && (theType == FLOAT_TYPE)) ||
+       (theConstraint->integerRestriction && (theType == INTEGER_TYPE)) ||
+       (theConstraint->classRestriction && ((theType == INSTANCE_ADDRESS_TYPE) ||
+                                            (theType == INSTANCE_NAME_TYPE))) ||
+       (theConstraint->instanceNameRestriction && (theType == INSTANCE_NAME_TYPE)))
+     { return true; }
+
+   return false;
+  }
+
+/**********************************************************/
+/* UnionConstraints: Creates a new constraint record that */
+/*   is the union of two other constraint records.        */
+/**********************************************************/
+struct constraintRecord *UnionConstraints(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *c1,
+  CONSTRAINT_RECORD *c2)
+  {
+   struct constraintRecord *rv;
+   bool c1Changed = false, c2Changed = false;
+
+   /*=================================================*/
+   /* If both constraint records are NULL,then create */
+   /* a constraint record that allows any value.      */
+   /*=================================================*/
+
+   if ((c1 == NULL) && (c2 == NULL)) return(GetConstraintRecord(theEnv));
+
+   /*=====================================================*/
+   /* If one of the constraint records is NULL, then the  */
+   /* union is the other constraint record. Note that     */
+   /* this is different from the way that intersections   */
+   /* were handled (a NULL constraint record implied that */
+   /*  any value was legal which in turn would imply that */
+   /* the union would allow any value as well).           */
+   /*=====================================================*/
+
+   if (c1 == NULL) return(CopyConstraintRecord(theEnv,c2));
+
+   if (c2 == NULL) return(CopyConstraintRecord(theEnv,c1));
+
+   /*=================================*/
+   /* Create a new constraint record. */
+   /*=================================*/
+
+   rv = GetConstraintRecord(theEnv);
+
+   /*==========================*/
+   /* Union the allowed types. */
+   /*==========================*/
+
+   if (c1->multifieldsAllowed || c2->multifieldsAllowed)
+     { rv->multifieldsAllowed = true; }
+
+   if (c1->singlefieldsAllowed || c2->singlefieldsAllowed)
+     { rv->singlefieldsAllowed = true; }
+
+   if (c1->anyAllowed || c2->anyAllowed) rv->anyAllowed = true;
+   else
+     {
+      rv->anyAllowed = false;
+      rv->symbolsAllowed = (c1->symbolsAllowed || c2->symbolsAllowed);
+      rv->stringsAllowed = (c1->stringsAllowed || c2->stringsAllowed);
+      rv->floatsAllowed = (c1->floatsAllowed || c2->floatsAllowed);
+      rv->integersAllowed = (c1->integersAllowed || c2->integersAllowed);
+      rv->instanceNamesAllowed = (c1->instanceNamesAllowed || c2->instanceNamesAllowed);
+      rv->instanceAddressesAllowed = (c1->instanceAddressesAllowed || c2->instanceAddressesAllowed);
+      rv->externalAddressesAllowed = (c1->externalAddressesAllowed || c2->externalAddressesAllowed);
+      rv->voidAllowed = (c1->voidAllowed || c2->voidAllowed);
+      rv->factAddressesAllowed = (c1->factAddressesAllowed || c2->factAddressesAllowed);
+     }
+
+   /*=================================*/
+   /* Union the allowed-values flags. */
+   /*=================================*/
+
+   if (c1->anyRestriction && c2->anyRestriction) rv->anyRestriction = true;
+   else
+     {
+      if (c1->anyRestriction)
+        {
+         c1Changed = true;
+         SetAnyRestrictionFlags(c1,false);
+        }
+      else if (c2->anyRestriction)
+        {
+         c2Changed = true;
+         SetAnyRestrictionFlags(c2,false);
+        }
+
+      rv->anyRestriction = false;
+      rv->symbolRestriction = (c1->symbolRestriction && c2->symbolRestriction);
+      rv->stringRestriction = (c1->stringRestriction && c2->stringRestriction);
+      rv->floatRestriction = (c1->floatRestriction && c2->floatRestriction);
+      rv->integerRestriction = (c1->integerRestriction && c2->integerRestriction);
+      rv->classRestriction = (c1->classRestriction && c2->classRestriction);
+      rv->instanceNameRestriction = (c1->instanceNameRestriction && c2->instanceNameRestriction);
+
+      if (c1Changed) SetAnyRestrictionFlags(c1,false);
+      else if (c2Changed) SetAnyRestrictionFlags(c2,false);
+     }
+
+   /*========================================*/
+   /* Union the allowed values list, the min */
+   /* and max values, and the range values.  */
+   /*========================================*/
+
+   UnionAllowedValueExpressions(theEnv,c1,c2,rv);
+   UnionAllowedClassExpressions(theEnv,c1,c2,rv);
+   UnionNumericExpressions(theEnv,c1,c2,rv,true);
+   UnionNumericExpressions(theEnv,c1,c2,rv,false);
+
+   /*========================================*/
+   /* If multifields are allowed, then union */
+   /* the constraint record for them.        */
+   /*========================================*/
+
+   if (rv->multifieldsAllowed)
+     { rv->multifield = UnionConstraints(theEnv,c1->multifield,c2->multifield); }
+
+   /*====================*/
+   /* Return the unioned */
+   /* constraint record. */
+   /*====================*/
+
+   return(rv);
+  }
+
+/**************************************************/
+/* UnionNumericExpressions: Creates the union of  */
+/*   two range or two min/max-fields constraints. */
+/**************************************************/
+static void UnionNumericExpressions(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraint1,
+  CONSTRAINT_RECORD *constraint2,
+  CONSTRAINT_RECORD *newConstraint,
+  bool range)
+  {
+   struct expr *tmpmin, *tmpmax;
+   struct expr *theMinList, *theMaxList;
+
+   /*=========================================*/
+   /* Initialize the new range/min/max values */
+   /* for the union of the constraints.       */
+   /*=========================================*/
+
+   theMinList = NULL;
+   theMaxList = NULL;
+
+   /*=================================*/
+   /* Determine the min/max values of */
+   /* the first constraint record.    */
+   /*=================================*/
+
+   if (range)
+     {
+      tmpmin = constraint1->minValue;
+      tmpmax = constraint1->maxValue;
+     }
+   else
+     {
+      tmpmin = constraint1->minFields;
+      tmpmax = constraint1->maxFields;
+     }
+
+   /*============================================*/
+   /* Add each range/min/max pair from the first */
+   /* constraint record to the union list.       */
+   /*============================================*/
+
+   for (;
+        tmpmin != NULL;
+        tmpmin = tmpmin->nextArg,tmpmax = tmpmax->nextArg)
+     { UnionRangeMinMaxValueWithList(theEnv,tmpmin,tmpmax,&theMinList,&theMaxList); }
+
+   /*=================================*/
+   /* Determine the min/max values of */
+   /* the second constraint record.   */
+   /*=================================*/
+
+   if (range)
+     {
+      tmpmin = constraint2->minValue;
+      tmpmax = constraint2->maxValue;
+     }
+   else
+     {
+      tmpmin = constraint2->minFields;
+      tmpmax = constraint2->maxFields;
+     }
+
+   /*=============================================*/
+   /* Add each range/min/max pair from the second */
+   /* constraint record to the union list.        */
+   /*=============================================*/
+
+   for (;
+        tmpmin != NULL;
+        tmpmin = tmpmin->nextArg,tmpmax = tmpmax->nextArg)
+     { UnionRangeMinMaxValueWithList(theEnv,tmpmin,tmpmax,&theMinList,&theMaxList); }
+
+   /*=====================================================*/
+   /* If the union produced a pair of valid range/min/max */
+   /* values, then replace the previous values of the     */
+   /* constraint record to the new unioned values.        */
+   /*=====================================================*/
+
+   if (theMinList != NULL)
+     {
+      if (range)
+        {
+         ReturnExpression(theEnv,newConstraint->minValue);
+         ReturnExpression(theEnv,newConstraint->maxValue);
+         newConstraint->minValue = theMinList;
+         newConstraint->maxValue = theMaxList;
+        }
+      else
+        {
+         ReturnExpression(theEnv,newConstraint->minFields);
+         ReturnExpression(theEnv,newConstraint->maxFields);
+         newConstraint->minFields = theMinList;
+         newConstraint->maxFields = theMaxList;
+        }
+     }
+
+   /*==============================================================*/
+   /* Otherwise, the union produced no valid range/min/max values. */
+   /* For the range attribute, this means that no numbers can      */
+   /* satisfy the constraint. For the min/max fields attribute, it */
+   /* means that no value can satisfy the constraint.              */
+   /*==============================================================*/
+
+   else
+     {
+      if (range)
+        {
+         if (newConstraint->anyAllowed) SetAnyAllowedFlags(newConstraint,false);
+         newConstraint->integersAllowed = false;
+         newConstraint->floatsAllowed = false;
+        }
+      else
+        {
+         SetAnyAllowedFlags(newConstraint,true);
+         newConstraint->anyAllowed = true;
+        }
+     }
+  }
+
+/*********************************************************/
+/* UnionRangeMinMaxValueWithList: Unions a range/min/max */
+/*   pair of values with a list of such values.          */
+/*********************************************************/
+static void UnionRangeMinMaxValueWithList(
+  Environment *theEnv,
+  struct expr *addmin,
+  struct expr *addmax,
+  struct expr **theMinList,
+  struct expr **theMaxList)
+  {
+   struct expr *tmpmin, *tmpmax, *lastmin, *lastmax;
+   struct expr *themin, *themax, *nextmin, *nextmax;
+   int cmaxmin, cmaxmax, cminmin, cminmax;
+
+   /*=========================================================*/
+   /* If no values are on the lists, then use the new values. */
+   /*=========================================================*/
+
+   if (*theMinList == NULL)
+     {
+      *theMinList = GenConstant(theEnv,addmin->type,addmin->value);
+      *theMaxList = GenConstant(theEnv,addmax->type,addmax->value);
+      return;
+     }
+
+   lastmin = NULL;
+   lastmax = NULL;
+   tmpmin = (*theMinList);
+   tmpmax = (*theMaxList);
+
+   while (tmpmin != NULL)
+     {
+      cmaxmax = CompareNumbers(theEnv,addmax->type,addmax->value,
+                               tmpmax->type,tmpmax->value);
+
+      cminmin = CompareNumbers(theEnv,addmin->type,addmin->value,
+                               tmpmin->type,tmpmin->value);
+
+      cmaxmin = CompareNumbers(theEnv,addmax->type,addmax->value,
+                               tmpmin->type,tmpmin->value);
+
+      cminmax = CompareNumbers(theEnv,addmin->type,addmin->value,
+                               tmpmax->type,tmpmax->value);
+
+      /*=================================*/
+      /* Check to see if the range is    */
+      /* contained within another range. */
+      /*=================================*/
+
+      if (((cmaxmax == LESS_THAN) || (cmaxmax == EQUAL)) &&
+          ((cminmin == GREATER_THAN) || (cminmin == EQUAL)))
+        { return; }
+
+      /*================================*/
+      /* Extend the greater than range. */
+      /*================================*/
+
+      if ((cmaxmax == GREATER_THAN) &&
+          ((cminmax == LESS_THAN) || (cminmax == EQUAL)))
+        {
+         tmpmax->type = addmax->type;
+         tmpmax->value = addmax->value;
+        }
+
+      /*=============================*/
+      /* Extend the less than range. */
+      /*=============================*/
+
+      if ((cminmin == LESS_THAN) &&
+          ((cmaxmin == GREATER_THAN) || (cmaxmin == EQUAL)))
+        {
+         tmpmin->type = addmin->type;
+         tmpmin->value = addmin->value;
+        }
+
+      /*====================*/
+      /* Handle insertions. */
+      /*====================*/
+
+      if (cmaxmin == LESS_THAN)
+        {
+         if (lastmax == NULL)
+           {
+            themin = GenConstant(theEnv,addmin->type,addmin->value);
+            themax = GenConstant(theEnv,addmax->type,addmax->value);
+            themin->nextArg = *theMinList;
+            themax->nextArg = *theMaxList;
+            *theMinList = themin;
+            *theMaxList = themax;
+            return;
+           }
+
+         if (CompareNumbers(theEnv,addmin->type,addmin->value,
+                            lastmax->type,lastmax->value) == GREATER_THAN)
+           {
+            themin = GenConstant(theEnv,addmin->type,addmin->value);
+            themax = GenConstant(theEnv,addmax->type,addmax->value);
+
+            themin->nextArg = lastmin->nextArg;
+            themax->nextArg = lastmax->nextArg;
+
+            lastmin->nextArg = themin;
+            lastmax->nextArg = themax;
+            return;
+           }
+        }
+
+      /*==========================*/
+      /* Move on to the next one. */
+      /*==========================*/
+
+      tmpmin = tmpmin->nextArg;
+      tmpmax = tmpmax->nextArg;
+     }
+
+   /*===========================*/
+   /* Merge overlapping ranges. */
+   /*===========================*/
+
+   tmpmin = (*theMinList);
+   tmpmax = (*theMaxList);
+
+   while (tmpmin != NULL)
+     {
+      nextmin = tmpmin->nextArg;
+      nextmax = tmpmax->nextArg;
+      if (nextmin != NULL)
+        {
+         cmaxmin = CompareNumbers(theEnv,tmpmax->type,tmpmax->value,
+                                  nextmin->type,nextmin->value);
+         if ((cmaxmin == GREATER_THAN) || (cmaxmin == EQUAL))
+           {
+            tmpmax->type = nextmax->type;
+            tmpmax->value = nextmax->value;
+            tmpmax->nextArg = nextmax->nextArg;
+            tmpmin->nextArg = nextmin->nextArg;
+
+            rtn_struct(theEnv,expr,nextmin);
+            rtn_struct(theEnv,expr,nextmax);
+           }
+         else
+           {
+            tmpmin = tmpmin->nextArg;
+            tmpmax = tmpmax->nextArg;
+           }
+        }
+      else
+        {
+         tmpmin = nextmin;
+         tmpmax = nextmax;
+        }
+     }
+  }
+
+/***************************************************/
+/* UnionAllowedClassExpressions: Creates the union */
+/*   of two sets of allowed-classes expressions.   */
+/***************************************************/
+static void UnionAllowedClassExpressions(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraint1,
+  CONSTRAINT_RECORD *constraint2,
+  CONSTRAINT_RECORD *newConstraint)
+  {
+   struct expr *theHead = NULL;
+
+   theHead = AddToUnionList(theEnv,constraint1->classList,theHead,newConstraint);
+   theHead = AddToUnionList(theEnv,constraint2->classList,theHead,newConstraint);
+
+   newConstraint->classList = theHead;
+  }
+
+/***************************************************/
+/* UnionAllowedValueExpressions: Creates the union */
+/*   of two sets of allowed value expressions.     */
+/***************************************************/
+static void UnionAllowedValueExpressions(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraint1,
+  CONSTRAINT_RECORD *constraint2,
+  CONSTRAINT_RECORD *newConstraint)
+  {
+   struct expr *theHead = NULL;
+
+   theHead = AddToUnionList(theEnv,constraint1->restrictionList,theHead,newConstraint);
+   theHead = AddToUnionList(theEnv,constraint2->restrictionList,theHead,newConstraint);
+
+   newConstraint->restrictionList = theHead;
+  }
+
+/************************************************************/
+/* AddToUnionList: Adds a list of values to a unioned list  */
+/*   making sure that duplicates are not added and that any */
+/*   value added satisfies the constraints for the list.    */
+/************************************************************/
+static struct expr *AddToUnionList(
+  Environment *theEnv,
+  struct expr *theList1,
+  struct expr *theHead,
+  CONSTRAINT_RECORD *theConstraint)
+  {
+   struct expr *theList2;
+   bool flag;
+
+   /*======================================*/
+   /* Loop through each value in the list  */
+   /* being added to the unioned set.      */
+   /*======================================*/
+
+   for (;theList1 != NULL; theList1 = theList1->nextArg)
+     {
+      /*===================================*/
+      /* Determine if the value is already */
+      /* in the unioned list.              */
+      /*===================================*/
+
+      flag = true;
+      for (theList2 = theHead;
+           theList2 != NULL;
+           theList2 = theList2->nextArg)
+        {
+         if ((theList1->type == theList2->type) &&
+             (theList1->value == theList2->value))
+           {
+            flag = false;
+            break;
+           }
+        }
+
+      /*=====================================================*/
+      /* If the value wasn't in the unioned list and doesn't */
+      /* violate any of the unioned list's constraints, then */
+      /* add it to the list.                                 */
+      /*=====================================================*/
+
+      if (flag)
+        {
+         if (RestrictionOnType(theList1->type,theConstraint))
+           {
+            theList2 = GenConstant(theEnv,theList1->type,theList1->value);
+            theList2->nextArg = theHead;
+            theHead = theList2;
+           }
+        }
+     }
+
+   /*==============================*/
+   /* Return the new unioned list. */
+   /*==============================*/
+
+   return(theHead);
+  }
+
+#if (! BLOAD_ONLY)
+
+/****************************************************/
+/* RemoveConstantFromConstraint: Removes a constant */
+/*   value (including any duplicates) from the      */
+/*   restriction list of a constraint record.       */
+/****************************************************/
+void RemoveConstantFromConstraint(
+  Environment *theEnv,
+  int theType,
+  void *theValue,
+  CONSTRAINT_RECORD *theConstraint)
+  {
+   struct expr *theList, *lastOne = NULL, *tmpList;
+
+   if (theConstraint == NULL) return;
+
+   theList = theConstraint->restrictionList;
+   theConstraint->restrictionList = NULL;
+
+   while (theList != NULL)
+     {
+      if ((theList->type != theType) || (theList->value != theValue))
+        {
+         if (lastOne == NULL)
+           { theConstraint->restrictionList = theList; }
+         else
+           { lastOne->nextArg = theList; }
+         lastOne = theList;
+         theList = theList->nextArg;
+         lastOne->nextArg = NULL;
+        }
+      else
+        {
+         tmpList = theList;
+         theList = theList->nextArg;
+         tmpList->nextArg = NULL;
+         ReturnExpression(theEnv,tmpList);
+        }
+     }
+
+   UpdateRestrictionFlags(theConstraint);
+  }
+
+#endif /* (! BLOAD_ONLY) */
diff --git a/clips/cstrnops.h b/clips/cstrnops.h
new file mode 100755
index 000000000..e6e58ff04
--- /dev/null
+++ b/clips/cstrnops.h
@@ -0,0 +1,47 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*           CONSTRAINT OPERATIONS HEADER FILE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for performing operations on  */
+/*   constraint records including computing the intersection */
+/*   and union of constraint records.                        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrnops
+
+#pragma once
+
+#define _H_cstrnops
+
+#include "evaluatn.h"
+#include "constrnt.h"
+
+   struct constraintRecord       *IntersectConstraints(Environment *,struct constraintRecord *,struct constraintRecord *);
+   struct constraintRecord       *UnionConstraints(Environment *,struct constraintRecord *,struct constraintRecord *);
+#if (! BLOAD_ONLY)
+   void                           RemoveConstantFromConstraint(Environment *,int,void *,CONSTRAINT_RECORD *);
+#endif
+
+#endif /* _H_cstrnops */
diff --git a/clips/cstrnpsr.c b/clips/cstrnpsr.c
new file mode 100755
index 000000000..eb94b16e2
--- /dev/null
+++ b/clips/cstrnpsr.c
@@ -0,0 +1,1391 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*               CONSTRAINT PARSER MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for parsing constraint        */
+/*   declarations.                                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian Dantes                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Slot cardinality bug fix for minimum < 0.      */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "setup.h"
+
+#include "constant.h"
+#include "cstrnchk.h"
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "expressn.h"
+#include "memalloc.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "sysdep.h"
+
+#include "cstrnpsr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static bool                    ParseRangeCardinalityAttribute(Environment *,
+                                                                 const char *,CONSTRAINT_RECORD *,
+                                                                 CONSTRAINT_PARSE_RECORD *,
+                                                                 const char *,bool);
+   static bool                    ParseTypeAttribute(Environment *,const char *,CONSTRAINT_RECORD *);
+   static void                    AddToRestrictionList(Environment *,int,CONSTRAINT_RECORD *,
+                                                       CONSTRAINT_RECORD *);
+   static bool                    ParseAllowedValuesAttribute(Environment *,const char *,const char *,
+                                                              CONSTRAINT_RECORD *,
+                                                              CONSTRAINT_PARSE_RECORD *);
+   static int                     GetConstraintTypeFromAllowedName(const char *);
+   static int                     GetConstraintTypeFromTypeName(const char *);
+   static bool                    GetAttributeParseValue(const char *,CONSTRAINT_PARSE_RECORD *);
+   static void                    SetRestrictionFlag(int,CONSTRAINT_RECORD *,bool);
+   static void                    SetParseFlag(CONSTRAINT_PARSE_RECORD *,const char *);
+   static void                    NoConjunctiveUseError(Environment *,const char *,const char *);
+#endif
+
+/********************************************************************/
+/* CheckConstraintParseConflicts: Determines if a constraint record */
+/*   has any conflicts in the attribute specifications. Returns     */
+/*   true if no conflicts were detected, otherwise false.           */
+/********************************************************************/
+bool CheckConstraintParseConflicts(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraints)
+  {
+   /*===================================================*/
+   /* Check to see if any of the allowed-... attributes */
+   /* conflict with the type attribute.                 */
+   /*===================================================*/
+
+   if (constraints->anyAllowed == true)
+     { /* Do Nothing */ }
+   else if (constraints->symbolRestriction &&
+            (constraints->symbolsAllowed == false))
+     {
+      AttributeConflictErrorMessage(theEnv,"type","allowed-symbols");
+      return false;
+     }
+   else if (constraints->stringRestriction &&
+            (constraints->stringsAllowed == false))
+     {
+      AttributeConflictErrorMessage(theEnv,"type","allowed-strings");
+      return false;
+     }
+   else if (constraints->integerRestriction &&
+            (constraints->integersAllowed == false))
+     {
+      AttributeConflictErrorMessage(theEnv,"type","allowed-integers/numbers");
+      return false;
+     }
+   else if (constraints->floatRestriction &&
+            (constraints->floatsAllowed == false))
+     {
+      AttributeConflictErrorMessage(theEnv,"type","allowed-floats/numbers");
+      return false;
+     }
+   else if (constraints->classRestriction &&
+            (constraints->instanceAddressesAllowed == false) &&
+            (constraints->instanceNamesAllowed == false))
+     {
+      AttributeConflictErrorMessage(theEnv,"type","allowed-classes");
+      return false;
+     }
+   else if (constraints->instanceNameRestriction &&
+            (constraints->instanceNamesAllowed == false))
+     {
+      AttributeConflictErrorMessage(theEnv,"type","allowed-instance-names");
+      return false;
+     }
+   else if (constraints->anyRestriction)
+     {
+      struct expr *theExp;
+
+      for (theExp = constraints->restrictionList;
+           theExp != NULL;
+           theExp = theExp->nextArg)
+        {
+         if (ConstraintCheckValue(theEnv,theExp->type,theExp->value,constraints) != NO_VIOLATION)
+           {
+            AttributeConflictErrorMessage(theEnv,"type","allowed-values");
+            return false;
+           }
+        }
+     }
+
+   /*================================================================*/
+   /* Check to see if range attribute conflicts with type attribute. */
+   /*================================================================*/
+
+   if ((constraints->maxValue != NULL) &&
+       (constraints->anyAllowed == false))
+     {
+      if (((constraints->maxValue->type == INTEGER_TYPE) &&
+          (constraints->integersAllowed == false)) ||
+          ((constraints->maxValue->type == FLOAT_TYPE) &&
+           (constraints->floatsAllowed == false)))
+        {
+         AttributeConflictErrorMessage(theEnv,"type","range");
+         return false;
+        }
+     }
+
+   if ((constraints->minValue != NULL) &&
+       (constraints->anyAllowed == false))
+     {
+      if (((constraints->minValue->type == INTEGER_TYPE) &&
+          (constraints->integersAllowed == false)) ||
+          ((constraints->minValue->type == FLOAT_TYPE) &&
+           (constraints->floatsAllowed == false)))
+        {
+         AttributeConflictErrorMessage(theEnv,"type","range");
+         return false;
+        }
+     }
+
+   /*=========================================*/
+   /* Check to see if allowed-class attribute */
+   /* conflicts with type attribute.          */
+   /*=========================================*/
+
+   if ((constraints->classList != NULL) &&
+       (constraints->anyAllowed == false) &&
+       (constraints->instanceNamesAllowed == false) &&
+       (constraints->instanceAddressesAllowed == false))
+     {
+      AttributeConflictErrorMessage(theEnv,"type","allowed-class");
+      return false;
+     }
+
+   /*=====================================================*/
+   /* Return true to indicate no conflicts were detected. */
+   /*=====================================================*/
+
+   return true;
+  }
+
+/********************************************************/
+/* AttributeConflictErrorMessage: Generic error message */
+/*   for a constraint attribute conflict.               */
+/********************************************************/
+void AttributeConflictErrorMessage(
+  Environment *theEnv,
+  const char *attribute1,
+  const char *attribute2)
+  {
+   PrintErrorID(theEnv,"CSTRNPSR",1,true);
+   WriteString(theEnv,STDERR,"The '");
+   WriteString(theEnv,STDERR,attribute1);
+   WriteString(theEnv,STDERR,"' attribute conflicts with the '");
+   WriteString(theEnv,STDERR,attribute2);
+   WriteString(theEnv,STDERR,"' attribute.\n");
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/***************************************************************************/
+/* InitializeConstraintParseRecord: Initializes the values of a constraint */
+/*   parse record which is used to determine whether one of the standard   */
+/*   constraint specifications has already been parsed.                    */
+/***************************************************************************/
+void InitializeConstraintParseRecord(
+  CONSTRAINT_PARSE_RECORD *parsedConstraints)
+  {
+   parsedConstraints->type = false;
+   parsedConstraints->range = false;
+   parsedConstraints->allowedSymbols = false;
+   parsedConstraints->allowedStrings = false;
+   parsedConstraints->allowedLexemes = false;
+   parsedConstraints->allowedIntegers = false;
+   parsedConstraints->allowedFloats = false;
+   parsedConstraints->allowedNumbers = false;
+   parsedConstraints->allowedValues = false;
+   parsedConstraints->allowedInstanceNames = false;
+   parsedConstraints->allowedClasses = false;
+   parsedConstraints->cardinality = false;
+  }
+
+/************************************************************************/
+/* StandardConstraint: Returns true if the specified name is one of the */
+/*   standard constraints parseable by the routines in this module.     */
+/************************************************************************/
+bool StandardConstraint(
+  const char *constraintName)
+  {
+   if ((strcmp(constraintName,"type") == 0) ||
+       (strcmp(constraintName,"range") == 0) ||
+       (strcmp(constraintName,"cardinality") == 0) ||
+       (strcmp(constraintName,"allowed-symbols") == 0) ||
+       (strcmp(constraintName,"allowed-strings") == 0) ||
+       (strcmp(constraintName,"allowed-lexemes") == 0) ||
+       (strcmp(constraintName,"allowed-integers") == 0) ||
+       (strcmp(constraintName,"allowed-floats") == 0) ||
+       (strcmp(constraintName,"allowed-numbers") == 0) ||
+       (strcmp(constraintName,"allowed-instance-names") == 0) ||
+       (strcmp(constraintName,"allowed-classes") == 0) ||
+       (strcmp(constraintName,"allowed-values") == 0))
+
+     { return true; }
+
+   return false;
+  }
+
+/***********************************************************************/
+/* ParseStandardConstraint: Parses a standard constraint. Returns true */
+/*   if the constraint was successfully parsed, otherwise false.       */
+/***********************************************************************/
+bool ParseStandardConstraint(
+  Environment *theEnv,
+  const char *readSource,
+  const char *constraintName,
+  CONSTRAINT_RECORD *constraints,
+  CONSTRAINT_PARSE_RECORD *parsedConstraints,
+  bool multipleValuesAllowed)
+  {
+   bool rv = false;
+
+   /*=====================================================*/
+   /* Determine if the attribute has already been parsed. */
+   /*=====================================================*/
+
+   if (GetAttributeParseValue(constraintName,parsedConstraints))
+     {
+      AlreadyParsedErrorMessage(theEnv,"attribute ",constraintName);
+      return false;
+     }
+
+   /*==========================================*/
+   /* If specified, parse the range attribute. */
+   /*==========================================*/
+
+   if (strcmp(constraintName,"range") == 0)
+     {
+      rv = ParseRangeCardinalityAttribute(theEnv,readSource,constraints,parsedConstraints,
+                                          constraintName,multipleValuesAllowed);
+     }
+
+   /*================================================*/
+   /* If specified, parse the cardinality attribute. */
+   /*================================================*/
+
+   else if (strcmp(constraintName,"cardinality") == 0)
+     {
+      rv = ParseRangeCardinalityAttribute(theEnv,readSource,constraints,parsedConstraints,
+                                          constraintName,multipleValuesAllowed);
+     }
+
+   /*=========================================*/
+   /* If specified, parse the type attribute. */
+   /*=========================================*/
+
+   else if (strcmp(constraintName,"type") == 0)
+     { rv = ParseTypeAttribute(theEnv,readSource,constraints); }
+
+   /*================================================*/
+   /* If specified, parse the allowed-... attribute. */
+   /*================================================*/
+
+   else if ((strcmp(constraintName,"allowed-symbols") == 0) ||
+            (strcmp(constraintName,"allowed-strings") == 0) ||
+            (strcmp(constraintName,"allowed-lexemes") == 0) ||
+            (strcmp(constraintName,"allowed-integers") == 0) ||
+            (strcmp(constraintName,"allowed-floats") == 0) ||
+            (strcmp(constraintName,"allowed-numbers") == 0) ||
+            (strcmp(constraintName,"allowed-instance-names") == 0) ||
+            (strcmp(constraintName,"allowed-classes") == 0) ||
+            (strcmp(constraintName,"allowed-values") == 0))
+     {
+      rv = ParseAllowedValuesAttribute(theEnv,readSource,constraintName,
+                                       constraints,parsedConstraints);
+     }
+
+   /*=========================================*/
+   /* Remember which constraint attribute was */
+   /* parsed and return the error status.     */
+   /*=========================================*/
+
+   SetParseFlag(parsedConstraints,constraintName);
+   return(rv);
+  }
+
+/***********************************************************/
+/* OverlayConstraint: Overlays fields of source constraint */
+/* record on destination based on which fields are set in  */
+/* the parsed constraint record. Assumes AddConstraint has */
+/* not yet been called for the destination constraint      */
+/* record.                                                 */
+/***********************************************************/
+void OverlayConstraint(
+  Environment *theEnv,
+  CONSTRAINT_PARSE_RECORD *pc,
+  CONSTRAINT_RECORD *cdst,
+  CONSTRAINT_RECORD *csrc)
+  {
+   if (pc->type == 0)
+     {
+      cdst->anyAllowed = csrc->anyAllowed;
+      cdst->symbolsAllowed = csrc->symbolsAllowed;
+      cdst->stringsAllowed = csrc->stringsAllowed;
+      cdst->floatsAllowed = csrc->floatsAllowed;
+      cdst->integersAllowed = csrc->integersAllowed;
+      cdst->instanceNamesAllowed = csrc->instanceNamesAllowed;
+      cdst->instanceAddressesAllowed = csrc->instanceAddressesAllowed;
+      cdst->externalAddressesAllowed = csrc->externalAddressesAllowed;
+      cdst->voidAllowed = csrc->voidAllowed;
+      cdst->factAddressesAllowed = csrc->factAddressesAllowed;
+     }
+
+   if (pc->range == 0)
+     {
+      ReturnExpression(theEnv,cdst->minValue);
+      ReturnExpression(theEnv,cdst->maxValue);
+      cdst->minValue = CopyExpression(theEnv,csrc->minValue);
+      cdst->maxValue = CopyExpression(theEnv,csrc->maxValue);
+     }
+
+   if (pc->allowedClasses == 0)
+     {
+      ReturnExpression(theEnv,cdst->classList);
+      cdst->classList = CopyExpression(theEnv,csrc->classList);
+     }
+
+   if (pc->allowedValues == 0)
+     {
+      if ((pc->allowedSymbols == 0) &&
+          (pc->allowedStrings == 0) &&
+          (pc->allowedLexemes == 0) &&
+          (pc->allowedIntegers == 0) &&
+          (pc->allowedFloats == 0) &&
+          (pc->allowedNumbers == 0) &&
+          (pc->allowedInstanceNames == 0))
+        {
+         cdst->anyRestriction = csrc->anyRestriction;
+         cdst->symbolRestriction = csrc->symbolRestriction;
+         cdst->stringRestriction = csrc->stringRestriction;
+         cdst->floatRestriction = csrc->floatRestriction;
+         cdst->integerRestriction = csrc->integerRestriction;
+         cdst->classRestriction = csrc->classRestriction;
+         cdst->instanceNameRestriction = csrc->instanceNameRestriction;
+         cdst->restrictionList = CopyExpression(theEnv,csrc->restrictionList);
+        }
+      else
+        {
+         if ((pc->allowedSymbols == 0) && csrc->symbolRestriction)
+           {
+            cdst->symbolRestriction = 1;
+            AddToRestrictionList(theEnv,SYMBOL_TYPE,cdst,csrc);
+           }
+         if ((pc->allowedStrings == 0) && csrc->stringRestriction)
+           {
+            cdst->stringRestriction = 1;
+            AddToRestrictionList(theEnv,STRING_TYPE,cdst,csrc);
+           }
+         if ((pc->allowedLexemes == 0) && csrc->symbolRestriction && csrc->stringRestriction)
+           {
+            cdst->symbolRestriction = 1;
+            cdst->stringRestriction = 1;
+            AddToRestrictionList(theEnv,SYMBOL_TYPE,cdst,csrc);
+            AddToRestrictionList(theEnv,STRING_TYPE,cdst,csrc);
+           }
+         if ((pc->allowedIntegers == 0) && csrc->integerRestriction)
+           {
+            cdst->integerRestriction = 1;
+            AddToRestrictionList(theEnv,INTEGER_TYPE,cdst,csrc);
+           }
+         if ((pc->allowedFloats == 0) && csrc->floatRestriction)
+           {
+            cdst->floatRestriction = 1;
+            AddToRestrictionList(theEnv,FLOAT_TYPE,cdst,csrc);
+           }
+         if ((pc->allowedNumbers == 0) && csrc->integerRestriction && csrc->floatRestriction)
+           {
+            cdst->integerRestriction = 1;
+            cdst->floatRestriction = 1;
+            AddToRestrictionList(theEnv,INTEGER_TYPE,cdst,csrc);
+            AddToRestrictionList(theEnv,FLOAT_TYPE,cdst,csrc);
+           }
+         if ((pc->allowedInstanceNames == 0) && csrc->instanceNameRestriction)
+           {
+            cdst->instanceNameRestriction = 1;
+            AddToRestrictionList(theEnv,INSTANCE_NAME_TYPE,cdst,csrc);
+           }
+        }
+     }
+
+   if (pc->cardinality == 0)
+     {
+      ReturnExpression(theEnv,cdst->minFields);
+      ReturnExpression(theEnv,cdst->maxFields);
+      cdst->minFields = CopyExpression(theEnv,csrc->minFields);
+      cdst->maxFields = CopyExpression(theEnv,csrc->maxFields);
+     }
+  }
+
+/**********************************************/
+/* OverlayConstraintParseRecord: Performs a   */
+/*   field-wise "or" of the destination parse */
+/*   record with the source parse record.     */
+/**********************************************/
+void OverlayConstraintParseRecord(
+  CONSTRAINT_PARSE_RECORD *dst,
+  CONSTRAINT_PARSE_RECORD *src)
+  {
+   if (src->type) dst->type = true;
+   if (src->range) dst->range = true;
+   if (src->allowedSymbols) dst->allowedSymbols = true;
+   if (src->allowedStrings) dst->allowedStrings = true;
+   if (src->allowedLexemes) dst->allowedLexemes = true;
+   if (src->allowedIntegers) dst->allowedIntegers = true;
+   if (src->allowedFloats) dst->allowedFloats = true;
+   if (src->allowedNumbers) dst->allowedNumbers = true;
+   if (src->allowedValues) dst->allowedValues = true;
+   if (src->allowedInstanceNames) dst->allowedInstanceNames = true;
+   if (src->allowedClasses) dst->allowedClasses = true;
+   if (src->cardinality) dst->cardinality = true;
+  }
+
+/************************************************************/
+/* AddToRestrictionList: Prepends atoms of the specified    */
+/* type from the source restriction list to the destination */
+/************************************************************/
+static void AddToRestrictionList(
+  Environment *theEnv,
+  int type,
+  CONSTRAINT_RECORD *cdst,
+  CONSTRAINT_RECORD *csrc)
+  {
+   struct expr *theExp,*tmp;
+
+   for (theExp = csrc->restrictionList; theExp != NULL; theExp = theExp->nextArg)
+     {
+      if (theExp->type == type)
+        {
+         tmp = GenConstant(theEnv,theExp->type,theExp->value);
+         tmp->nextArg = cdst->restrictionList;
+         cdst->restrictionList = tmp;
+        }
+     }
+  }
+
+/*******************************************************************/
+/* ParseAllowedValuesAttribute: Parses the allowed-... attributes. */
+/*******************************************************************/
+static bool ParseAllowedValuesAttribute(
+  Environment *theEnv,
+  const char *readSource,
+  const char *constraintName,
+  CONSTRAINT_RECORD *constraints,
+  CONSTRAINT_PARSE_RECORD *parsedConstraints)
+  {
+   struct token inputToken;
+   int expectedType, restrictionType;
+   bool error = false;
+   struct expr *newValue, *lastValue;
+   bool constantParsed = false, variableParsed = false;
+   const char *tempPtr = NULL;
+   unsigned short genType;
+
+   /*======================================================*/
+   /* The allowed-values attribute is not allowed if other */
+   /* allowed-... attributes have already been parsed.     */
+   /*======================================================*/
+
+   if ((strcmp(constraintName,"allowed-values") == 0) &&
+       ((parsedConstraints->allowedSymbols) ||
+        (parsedConstraints->allowedStrings) ||
+        (parsedConstraints->allowedLexemes) ||
+        (parsedConstraints->allowedIntegers) ||
+        (parsedConstraints->allowedFloats) ||
+        (parsedConstraints->allowedNumbers) ||
+        (parsedConstraints->allowedInstanceNames)))
+     {
+      if (parsedConstraints->allowedSymbols) tempPtr = "allowed-symbols";
+      else if (parsedConstraints->allowedStrings) tempPtr = "allowed-strings";
+      else if (parsedConstraints->allowedLexemes) tempPtr = "allowed-lexemes";
+      else if (parsedConstraints->allowedIntegers) tempPtr = "allowed-integers";
+      else if (parsedConstraints->allowedFloats) tempPtr = "allowed-floats";
+      else if (parsedConstraints->allowedNumbers) tempPtr = "allowed-numbers";
+      else if (parsedConstraints->allowedInstanceNames) tempPtr = "allowed-instance-names";
+      NoConjunctiveUseError(theEnv,"allowed-values",tempPtr);
+      return false;
+     }
+
+   /*=======================================================*/
+   /* The allowed-values/numbers/integers/floats attributes */
+   /* are not allowed with the range attribute.             */
+   /*=======================================================*/
+
+   if (((strcmp(constraintName,"allowed-values") == 0) ||
+        (strcmp(constraintName,"allowed-numbers") == 0) ||
+        (strcmp(constraintName,"allowed-integers") == 0) ||
+        (strcmp(constraintName,"allowed-floats") == 0)) &&
+       (parsedConstraints->range))
+     {
+      NoConjunctiveUseError(theEnv,constraintName,"range");
+      return false;
+     }
+
+   /*===================================================*/
+   /* The allowed-... attributes are not allowed if the */
+   /* allowed-values attribute has already been parsed. */
+   /*===================================================*/
+
+   if ((strcmp(constraintName,"allowed-values") != 0) &&
+            (parsedConstraints->allowedValues))
+     {
+      NoConjunctiveUseError(theEnv,constraintName,"allowed-values");
+      return false;
+     }
+
+   /*==================================================*/
+   /* The allowed-numbers attribute is not allowed if  */
+   /* the allowed-integers or allowed-floats attribute */
+   /* has already been parsed.                         */
+   /*==================================================*/
+
+   if ((strcmp(constraintName,"allowed-numbers") == 0) &&
+       ((parsedConstraints->allowedFloats) || (parsedConstraints->allowedIntegers)))
+     {
+      if (parsedConstraints->allowedFloats) tempPtr = "allowed-floats";
+      else tempPtr = "allowed-integers";
+      NoConjunctiveUseError(theEnv,"allowed-numbers",tempPtr);
+      return false;
+     }
+
+   /*============================================================*/
+   /* The allowed-integers/floats attributes are not allowed if  */
+   /* the allowed-numbers attribute has already been parsed.     */
+   /*============================================================*/
+
+   if (((strcmp(constraintName,"allowed-integers") == 0) ||
+        (strcmp(constraintName,"allowed-floats") == 0)) &&
+       (parsedConstraints->allowedNumbers))
+     {
+      NoConjunctiveUseError(theEnv,constraintName,"allowed-number");
+      return false;
+     }
+
+   /*==================================================*/
+   /* The allowed-lexemes attribute is not allowed if  */
+   /* the allowed-symbols or allowed-strings attribute */
+   /* has already been parsed.                         */
+   /*==================================================*/
+
+   if ((strcmp(constraintName,"allowed-lexemes") == 0) &&
+       ((parsedConstraints->allowedSymbols) || (parsedConstraints->allowedStrings)))
+     {
+      if (parsedConstraints->allowedSymbols) tempPtr = "allowed-symbols";
+      else tempPtr = "allowed-strings";
+      NoConjunctiveUseError(theEnv,"allowed-lexemes",tempPtr);
+      return false;
+     }
+
+   /*===========================================================*/
+   /* The allowed-symbols/strings attributes are not allowed if */
+   /* the allowed-lexemes attribute has already been parsed.    */
+   /*===========================================================*/
+
+   if (((strcmp(constraintName,"allowed-symbols") == 0) ||
+        (strcmp(constraintName,"allowed-strings") == 0)) &&
+       (parsedConstraints->allowedLexemes))
+     {
+      NoConjunctiveUseError(theEnv,constraintName,"allowed-lexemes");
+      return false;
+     }
+
+   /*========================*/
+   /* Get the expected type. */
+   /*========================*/
+
+   restrictionType = GetConstraintTypeFromAllowedName(constraintName);
+   SetRestrictionFlag(restrictionType,constraints,true);
+   if (strcmp(constraintName,"allowed-classes") == 0)
+     { expectedType = SYMBOL_TYPE; }
+   else
+     { expectedType = restrictionType; }
+
+   /*=================================================*/
+   /* Get the last value in the restriction list (the */
+   /* allowed values will be appended there).         */
+   /*=================================================*/
+
+   if (strcmp(constraintName,"allowed-classes") == 0)
+     { lastValue = constraints->classList; }
+   else
+     { lastValue = constraints->restrictionList; }
+
+   if (lastValue != NULL)
+     { while (lastValue->nextArg != NULL) lastValue = lastValue->nextArg; }
+
+   /*==================================================*/
+   /* Read the allowed values and add them to the list */
+   /* until a right parenthesis is encountered.        */
+   /*==================================================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,&inputToken);
+
+   while (inputToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SavePPBuffer(theEnv," ");
+
+      /*=============================================*/
+      /* Determine the type of the token just parsed */
+      /* and if it is an appropriate value.          */
+      /*=============================================*/
+
+      switch(inputToken.tknType)
+        {
+         case INTEGER_TOKEN:
+           if ((expectedType != UNKNOWN_VALUE) &&
+               (expectedType != INTEGER_TYPE) &&
+               (expectedType != INTEGER_OR_FLOAT)) error = true;
+           constantParsed = true;
+           genType = INTEGER_TYPE;
+           break;
+
+         case FLOAT_TOKEN:
+           if ((expectedType != UNKNOWN_VALUE) &&
+               (expectedType != FLOAT_TYPE) &&
+               (expectedType != INTEGER_OR_FLOAT)) error = true;
+           constantParsed = true;
+           genType = FLOAT_TYPE;
+           break;
+
+         case STRING_TOKEN:
+           if ((expectedType != UNKNOWN_VALUE) &&
+               (expectedType != STRING_TYPE) &&
+               (expectedType != SYMBOL_OR_STRING)) error = true;
+           constantParsed = true;
+           genType = STRING_TYPE;
+           break;
+
+         case SYMBOL_TOKEN:
+           if ((expectedType != UNKNOWN_VALUE) &&
+               (expectedType != SYMBOL_TYPE) &&
+               (expectedType != SYMBOL_OR_STRING)) error = true;
+           constantParsed = true;
+           genType = SYMBOL_TYPE;
+           break;
+
+#if OBJECT_SYSTEM
+         case INSTANCE_NAME_TOKEN:
+           if ((expectedType != UNKNOWN_VALUE) &&
+               (expectedType != INSTANCE_NAME_TYPE)) error = true;
+           constantParsed = true;
+           genType = INSTANCE_NAME_TYPE;
+           break;
+#endif
+
+         case SF_VARIABLE_TOKEN:
+           if (strcmp(inputToken.printForm,"?VARIABLE") == 0)
+             {
+              variableParsed = true;
+              genType = SF_VARIABLE;
+             }
+           else
+             {
+              char tempBuffer[120];
+              gensprintf(tempBuffer,"%s attribute",constraintName);
+              SyntaxErrorMessage(theEnv,tempBuffer);
+              return false;
+             }
+
+           break;
+
+         default:
+           {
+            char tempBuffer[120];
+            gensprintf(tempBuffer,"%s attribute",constraintName);
+            SyntaxErrorMessage(theEnv,tempBuffer);
+           }
+           return false;
+        }
+
+      /*=====================================*/
+      /* Signal an error if an inappropriate */
+      /* value was found.                    */
+      /*=====================================*/
+
+      if (error)
+        {
+         PrintErrorID(theEnv,"CSTRNPSR",4,true);
+         WriteString(theEnv,STDERR,"Value does not match the expected type for the '");
+         WriteString(theEnv,STDERR,constraintName);
+         WriteString(theEnv,STDERR,"' attribute.\n");
+         return false;
+        }
+
+      /*======================================*/
+      /* The ?VARIABLE argument can't be used */
+      /* in conjunction with constants.       */
+      /*======================================*/
+
+      if (constantParsed && variableParsed)
+        {
+         char tempBuffer[120];
+         gensprintf(tempBuffer,"%s attribute",constraintName);
+         SyntaxErrorMessage(theEnv,tempBuffer);
+         return false;
+        }
+
+      /*===========================================*/
+      /* Add the constant to the restriction list. */
+      /*===========================================*/
+
+      newValue = GenConstant(theEnv,genType,inputToken.value);
+      
+      if (lastValue == NULL)
+        {
+         if (strcmp(constraintName,"allowed-classes") == 0)
+           { constraints->classList = newValue; }
+         else
+           { constraints->restrictionList = newValue; }
+        }
+      else
+        { lastValue->nextArg = newValue; }
+      lastValue = newValue;
+
+      /*=======================================*/
+      /* Begin parsing the next allowed value. */
+      /*=======================================*/
+
+      GetToken(theEnv,readSource,&inputToken);
+     }
+
+   /*======================================================*/
+   /* There must be at least one value for this attribute. */
+   /*======================================================*/
+
+   if ((! constantParsed) && (! variableParsed))
+     {
+      char tempBuffer[120];
+      gensprintf(tempBuffer,"%s attribute",constraintName);
+      SyntaxErrorMessage(theEnv,tempBuffer);
+      return false;
+     }
+
+   /*======================================*/
+   /* If ?VARIABLE was parsed, then remove */
+   /* the restrictions for the type being  */
+   /* restricted.                          */
+   /*======================================*/
+
+   if (variableParsed)
+     {
+      switch(restrictionType)
+        {
+         case UNKNOWN_VALUE:
+           constraints->anyRestriction = false;
+           break;
+
+         case SYMBOL_TYPE:
+           constraints->symbolRestriction = false;
+           break;
+
+         case STRING_TYPE:
+           constraints->stringRestriction = false;
+           break;
+
+         case INTEGER_TYPE:
+           constraints->integerRestriction = false;
+           break;
+
+         case FLOAT_TYPE:
+           constraints->floatRestriction = false;
+           break;
+
+         case INTEGER_OR_FLOAT:
+           constraints->floatRestriction = false;
+           constraints->integerRestriction = false;
+           break;
+
+         case SYMBOL_OR_STRING:
+           constraints->symbolRestriction = false;
+           constraints->stringRestriction = false;
+           break;
+
+         case INSTANCE_NAME_TYPE:
+           constraints->instanceNameRestriction = false;
+           break;
+
+         case INSTANCE_OR_INSTANCE_NAME:
+           constraints->classRestriction = false;
+           break;
+        }
+     }
+
+   /*=====================================*/
+   /* Fix up pretty print representation. */
+   /*=====================================*/
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+
+   /*=======================================*/
+   /* Return true to indicate the attribute */
+   /* was successfully parsed.              */
+   /*=======================================*/
+
+   return true;
+  }
+
+/***********************************************************/
+/* NoConjunctiveUseError: Generic error message indicating */
+/*   that two attributes can't be used in conjunction.     */
+/***********************************************************/
+static void NoConjunctiveUseError(
+  Environment *theEnv,
+  const char *attribute1,
+  const char *attribute2)
+  {
+   PrintErrorID(theEnv,"CSTRNPSR",3,true);
+   WriteString(theEnv,STDERR,"The '");
+   WriteString(theEnv,STDERR,attribute1);
+   WriteString(theEnv,STDERR,"' attribute cannot be used ");
+   WriteString(theEnv,STDERR,"in conjunction with the '");
+   WriteString(theEnv,STDERR,attribute2);
+   WriteString(theEnv,STDERR,"' attribute.\n");
+  }
+
+/**************************************************/
+/* ParseTypeAttribute: Parses the type attribute. */
+/**************************************************/
+static bool ParseTypeAttribute(
+  Environment *theEnv,
+  const char *readSource,
+  CONSTRAINT_RECORD *constraints)
+  {
+   bool typeParsed = false;
+   bool variableParsed = false;
+   int theType;
+   struct token inputToken;
+
+   /*======================================*/
+   /* Continue parsing types until a right */
+   /* parenthesis is encountered.          */
+   /*======================================*/
+
+   SavePPBuffer(theEnv," ");
+   for (GetToken(theEnv,readSource,&inputToken);
+        inputToken.tknType != RIGHT_PARENTHESIS_TOKEN;
+        GetToken(theEnv,readSource,&inputToken))
+     {
+      SavePPBuffer(theEnv," ");
+
+      /*==================================*/
+      /* If the token is a symbol then... */
+      /*==================================*/
+
+      if (inputToken.tknType == SYMBOL_TOKEN)
+        {
+         /*==============================================*/
+         /* ?VARIABLE can't be used with type constants. */
+         /*==============================================*/
+
+         if (variableParsed == true)
+           {
+            SyntaxErrorMessage(theEnv,"type attribute");
+            return false;
+           }
+
+         /*========================================*/
+         /* Check for an appropriate type constant */
+         /* (e.g. SYMBOL_TYPE, FLOAT_TYPE, INTEGER_TYPE, etc.).   */
+         /*========================================*/
+
+         theType = GetConstraintTypeFromTypeName(inputToken.lexemeValue->contents);
+         if (theType < 0)
+           {
+            SyntaxErrorMessage(theEnv,"type attribute");
+            return false;
+           }
+
+         /*==================================================*/
+         /* Change the type restriction flags to reflect the */
+         /* type restriction. If the type restriction was    */
+         /* already specified, then a error is generated.    */
+         /*==================================================*/
+
+         if (SetConstraintType(theType,constraints))
+           {
+            SyntaxErrorMessage(theEnv,"type attribute");
+            return false;
+           }
+
+         constraints->anyAllowed = false;
+
+         /*===========================================*/
+         /* Remember that a type constant was parsed. */
+         /*===========================================*/
+
+         typeParsed = true;
+        }
+
+      /*==============================================*/
+      /* Otherwise if the token is a variable then... */
+      /*==============================================*/
+
+      else if (inputToken.tknType == SF_VARIABLE_TOKEN)
+        {
+         /*========================================*/
+         /* The only variable allowd is ?VARIABLE. */
+         /*========================================*/
+
+         if (strcmp(inputToken.printForm,"?VARIABLE") != 0)
+           {
+            SyntaxErrorMessage(theEnv,"type attribute");
+            return false;
+           }
+
+         /*===================================*/
+         /* ?VARIABLE can't be used more than */
+         /* once or with type constants.      */
+         /*===================================*/
+
+         if (typeParsed || variableParsed)
+           {
+            SyntaxErrorMessage(theEnv,"type attribute");
+            return false;
+           }
+
+         /*======================================*/
+         /* Remember that a variable was parsed. */
+         /*======================================*/
+
+         variableParsed = true;
+        }
+
+      /*====================================*/
+      /* Otherwise this is an invalid value */
+      /* for the type attribute.            */
+      /*====================================*/
+
+       else
+        {
+         SyntaxErrorMessage(theEnv,"type attribute");
+         return false;
+        }
+     }
+
+   /*=====================================*/
+   /* Fix up pretty print representation. */
+   /*=====================================*/
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+
+   /*=======================================*/
+   /* The type attribute must have a value. */
+   /*=======================================*/
+
+   if ((! typeParsed) && (! variableParsed))
+     {
+      SyntaxErrorMessage(theEnv,"type attribute");
+      return false;
+     }
+
+   /*===========================================*/
+   /* Return true indicating the type attibuted */
+   /* was successfully parsed.                  */
+   /*===========================================*/
+
+   return true;
+  }
+
+/***************************************************************************/
+/* ParseRangeCardinalityAttribute: Parses the range/cardinality attribute. */
+/***************************************************************************/
+static bool ParseRangeCardinalityAttribute(
+  Environment *theEnv,
+  const char *readSource,
+  CONSTRAINT_RECORD *constraints,
+  CONSTRAINT_PARSE_RECORD *parsedConstraints,
+  const char *constraintName,
+  bool multipleValuesAllowed)
+  {
+   struct token inputToken;
+   bool range;
+   const char *tempPtr = NULL;
+
+   /*=================================*/
+   /* Determine if we're parsing the  */
+   /* range or cardinality attribute. */
+   /*=================================*/
+
+   if (strcmp(constraintName,"range") == 0)
+     {
+      parsedConstraints->range = true;
+      range = true;
+     }
+   else
+     {
+      parsedConstraints->cardinality = true;
+      range = false;
+     }
+
+   /*===================================================================*/
+   /* The cardinality attribute can only be used with multifield slots. */
+   /*===================================================================*/
+
+   if ((range == false) &&
+       (multipleValuesAllowed == false))
+     {
+      PrintErrorID(theEnv,"CSTRNPSR",5,true);
+      WriteString(theEnv,STDERR,"The 'cardinality' attribute ");
+      WriteString(theEnv,STDERR,"can only be used with multifield slots.\n");
+      return false;
+     }
+
+   /*====================================================*/
+   /* The range attribute is not allowed with the        */
+   /* allowed-values/numbers/integers/floats attributes. */
+   /*====================================================*/
+
+   if ((range == true) &&
+       (parsedConstraints->allowedValues ||
+        parsedConstraints->allowedNumbers ||
+        parsedConstraints->allowedIntegers ||
+        parsedConstraints->allowedFloats))
+     {
+      if (parsedConstraints->allowedValues) tempPtr = "allowed-values";
+      else if (parsedConstraints->allowedIntegers) tempPtr = "allowed-integers";
+      else if (parsedConstraints->allowedFloats) tempPtr = "allowed-floats";
+      else if (parsedConstraints->allowedNumbers) tempPtr = "allowed-numbers";
+      NoConjunctiveUseError(theEnv,"range",tempPtr);
+      return false;
+     }
+
+   /*==========================*/
+   /* Parse the minimum value. */
+   /*==========================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,&inputToken);
+   if ((inputToken.tknType == INTEGER_TOKEN) || ((inputToken.tknType == FLOAT_TOKEN) && range))
+     {
+      if (range)
+        {
+         ReturnExpression(theEnv,constraints->minValue);
+         if (inputToken.tknType == INTEGER_TOKEN)
+           { constraints->minValue = GenConstant(theEnv,INTEGER_TYPE,inputToken.value); }
+         else
+           { constraints->minValue = GenConstant(theEnv,FLOAT_TYPE,inputToken.value); }
+        }
+      else
+        {
+         if (inputToken.integerValue->contents < 0LL)
+           {
+            PrintErrorID(theEnv,"CSTRNPSR",6,true);
+            WriteString(theEnv,STDERR,"Minimum 'cardinality' value must be greater than or equal to zero.\n");
+            return false;
+           }
+
+         ReturnExpression(theEnv,constraints->minFields);
+         if (inputToken.tknType == INTEGER_TOKEN)
+           { constraints->minFields = GenConstant(theEnv,INTEGER_TYPE,inputToken.value); }
+         else
+           { constraints->minFields = GenConstant(theEnv,FLOAT_TYPE,inputToken.value); }
+        }
+     }
+   else if ((inputToken.tknType == SF_VARIABLE_TOKEN) && (strcmp(inputToken.printForm,"?VARIABLE") == 0))
+     { /* Do nothing. */ }
+   else
+     {
+      char tempBuffer[120];
+      gensprintf(tempBuffer,"%s attribute",constraintName);
+      SyntaxErrorMessage(theEnv,tempBuffer);
+      return false;
+     }
+
+   /*==========================*/
+   /* Parse the maximum value. */
+   /*==========================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,&inputToken);
+   if ((inputToken.tknType == INTEGER_TOKEN) || ((inputToken.tknType == FLOAT_TOKEN) && range))
+     {
+      if (range)
+        {
+         ReturnExpression(theEnv,constraints->maxValue);
+         if (inputToken.tknType == INTEGER_TOKEN)
+           { constraints->maxValue = GenConstant(theEnv,INTEGER_TYPE,inputToken.value); }
+         else
+           { constraints->maxValue = GenConstant(theEnv,FLOAT_TYPE,inputToken.value); }
+        }
+      else
+        {
+         ReturnExpression(theEnv,constraints->maxFields);
+         if (inputToken.tknType == INTEGER_TOKEN)
+           { constraints->maxFields = GenConstant(theEnv,INTEGER_TYPE,inputToken.value); }
+         else
+           { constraints->maxFields = GenConstant(theEnv,FLOAT_TYPE,inputToken.value); }
+        }
+     }
+   else if ((inputToken.tknType == SF_VARIABLE_TOKEN) && (strcmp(inputToken.printForm,"?VARIABLE") == 0))
+     { /* Do nothing. */ }
+   else
+     {
+      char tempBuffer[120];
+      gensprintf(tempBuffer,"%s attribute",constraintName);
+      SyntaxErrorMessage(theEnv,tempBuffer);
+      return false;
+     }
+
+   /*================================*/
+   /* Parse the closing parenthesis. */
+   /*================================*/
+
+   GetToken(theEnv,readSource,&inputToken);
+   if (inputToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"range attribute");
+      return false;
+     }
+
+   /*====================================================*/
+   /* Minimum value must be less than the maximum value. */
+   /*====================================================*/
+
+   if (range)
+     {
+      if (CompareNumbers(theEnv,constraints->minValue->type,
+                         constraints->minValue->value,
+                         constraints->maxValue->type,
+                         constraints->maxValue->value) == GREATER_THAN)
+        {
+         PrintErrorID(theEnv,"CSTRNPSR",2,true);
+         WriteString(theEnv,STDERR,"Minimum 'range' value must be less than ");
+         WriteString(theEnv,STDERR,"or equal to the maximum 'range' value.\n");
+         return false;
+        }
+     }
+   else
+     {
+      if (CompareNumbers(theEnv,constraints->minFields->type,
+                         constraints->minFields->value,
+                         constraints->maxFields->type,
+                         constraints->maxFields->value) == GREATER_THAN)
+        {
+         PrintErrorID(theEnv,"CSTRNPSR",2,true);
+         WriteString(theEnv,STDERR,"Minimum 'cardinality' value must be less than ");
+         WriteString(theEnv,STDERR,"or equal to the maximum 'cardinality' value.\n");
+         return false;
+        }
+     }
+
+   /*====================================*/
+   /* Return true to indicate that the   */
+   /* attribute was successfully parsed. */
+   /*====================================*/
+
+   return true;
+  }
+
+/******************************************************************/
+/* GetConstraintTypeFromAllowedName: Returns the type restriction */
+/*   associated with an allowed-... attribute.                    */
+/******************************************************************/
+static int GetConstraintTypeFromAllowedName(
+  const char *constraintName)
+  {
+   if (strcmp(constraintName,"allowed-values") == 0) return(UNKNOWN_VALUE);
+   else if (strcmp(constraintName,"allowed-symbols") == 0) return(SYMBOL_TYPE);
+   else if (strcmp(constraintName,"allowed-strings") == 0) return(STRING_TYPE);
+   else if (strcmp(constraintName,"allowed-lexemes") == 0) return(SYMBOL_OR_STRING);
+   else if (strcmp(constraintName,"allowed-integers") == 0) return(INTEGER_TYPE);
+   else if (strcmp(constraintName,"allowed-numbers") == 0) return(INTEGER_OR_FLOAT);
+   else if (strcmp(constraintName,"allowed-instance-names") == 0) return(INSTANCE_NAME_TYPE);
+   else if (strcmp(constraintName,"allowed-classes") == 0) return(INSTANCE_OR_INSTANCE_NAME);
+   else if (strcmp(constraintName,"allowed-floats") == 0) return(FLOAT_TYPE);
+
+   return(-1);
+  }
+
+/*******************************************************/
+/* GetConstraintTypeFromTypeName: Converts a type name */
+/*   to its equivalent integer type restriction.       */
+/*******************************************************/
+static int GetConstraintTypeFromTypeName(
+  const char *constraintName)
+  {
+   if (strcmp(constraintName,"SYMBOL") == 0) return(SYMBOL_TYPE);
+   else if (strcmp(constraintName,"STRING") == 0) return(STRING_TYPE);
+   else if (strcmp(constraintName,"LEXEME") == 0) return(SYMBOL_OR_STRING);
+   else if (strcmp(constraintName,"INTEGER") == 0) return(INTEGER_TYPE);
+   else if (strcmp(constraintName,"FLOAT") == 0) return(FLOAT_TYPE);
+   else if (strcmp(constraintName,"NUMBER") == 0) return(INTEGER_OR_FLOAT);
+   else if (strcmp(constraintName,"INSTANCE-NAME") == 0) return(INSTANCE_NAME_TYPE);
+   else if (strcmp(constraintName,"INSTANCE-ADDRESS") == 0) return(INSTANCE_ADDRESS_TYPE);
+   else if (strcmp(constraintName,"INSTANCE") == 0) return(INSTANCE_OR_INSTANCE_NAME);
+   else if (strcmp(constraintName,"EXTERNAL-ADDRESS") == 0) return(EXTERNAL_ADDRESS_TYPE);
+   else if (strcmp(constraintName,"FACT-ADDRESS") == 0) return(FACT_ADDRESS_TYPE);
+
+   return(-1);
+  }
+
+/**************************************************************/
+/* GetAttributeParseValue: Returns a boolean value indicating */
+/*   whether a specific attribute has already been parsed.    */
+/**************************************************************/
+static bool GetAttributeParseValue(
+  const char *constraintName,
+  CONSTRAINT_PARSE_RECORD *parsedConstraints)
+  {
+   if (strcmp(constraintName,"type") == 0)
+     { return(parsedConstraints->type); }
+   else if (strcmp(constraintName,"range") == 0)
+     { return(parsedConstraints->range); }
+   else if (strcmp(constraintName,"cardinality") == 0)
+     { return(parsedConstraints->cardinality); }
+   else if (strcmp(constraintName,"allowed-values") == 0)
+     { return(parsedConstraints->allowedValues); }
+   else if (strcmp(constraintName,"allowed-symbols") == 0)
+     { return(parsedConstraints->allowedSymbols); }
+   else if (strcmp(constraintName,"allowed-strings") == 0)
+     { return(parsedConstraints->allowedStrings); }
+   else if (strcmp(constraintName,"allowed-lexemes") == 0)
+     { return(parsedConstraints->allowedLexemes); }
+   else if (strcmp(constraintName,"allowed-instance-names") == 0)
+     { return(parsedConstraints->allowedInstanceNames); }
+   else if (strcmp(constraintName,"allowed-classes") == 0)
+     { return(parsedConstraints->allowedClasses); }
+   else if (strcmp(constraintName,"allowed-integers") == 0)
+     { return(parsedConstraints->allowedIntegers); }
+   else if (strcmp(constraintName,"allowed-floats") == 0)
+     { return(parsedConstraints->allowedFloats); }
+   else if (strcmp(constraintName,"allowed-numbers") == 0)
+     { return(parsedConstraints->allowedNumbers); }
+
+   return true;
+  }
+
+/**********************************************************/
+/* SetRestrictionFlag: Sets the restriction flag of a     */
+/*   constraint record indicating whether a specific      */
+/*   type has an associated allowed-... restriction list. */
+/**********************************************************/
+static void SetRestrictionFlag(
+  int restriction,
+  CONSTRAINT_RECORD *constraints,
+  bool value)
+  {
+   switch (restriction)
+     {
+      case UNKNOWN_VALUE:
+         constraints->anyRestriction = value;
+         break;
+
+      case SYMBOL_TYPE:
+         constraints->symbolRestriction = value;
+         break;
+
+      case STRING_TYPE:
+         constraints->stringRestriction = value;
+         break;
+
+      case INTEGER_TYPE:
+         constraints->integerRestriction = value;
+         break;
+
+      case FLOAT_TYPE:
+         constraints->floatRestriction = value;
+         break;
+
+      case INTEGER_OR_FLOAT:
+         constraints->integerRestriction = value;
+         constraints->floatRestriction = value;
+         break;
+
+      case SYMBOL_OR_STRING:
+         constraints->symbolRestriction = value;
+         constraints->stringRestriction = value;
+         break;
+
+      case INSTANCE_NAME_TYPE:
+         constraints->instanceNameRestriction = value;
+         break;
+
+      case INSTANCE_OR_INSTANCE_NAME:
+         constraints->classRestriction = value;
+         break;
+     }
+  }
+
+/********************************************************************/
+/* SetParseFlag: Sets the flag in a parsed constraints data         */
+/*  structure indicating that a specific attribute has been parsed. */
+/********************************************************************/
+static void SetParseFlag(
+  CONSTRAINT_PARSE_RECORD *parsedConstraints,
+  const char *constraintName)
+  {
+   if (strcmp(constraintName,"range") == 0)
+     { parsedConstraints->range = true; }
+   else if (strcmp(constraintName,"type") == 0)
+     { parsedConstraints->type = true; }
+   else if (strcmp(constraintName,"cardinality") == 0)
+     { parsedConstraints->cardinality = true; }
+   else if (strcmp(constraintName,"allowed-symbols") == 0)
+     { parsedConstraints->allowedSymbols = true; }
+   else if (strcmp(constraintName,"allowed-strings") == 0)
+     { parsedConstraints->allowedStrings = true; }
+   else if (strcmp(constraintName,"allowed-lexemes") == 0)
+     { parsedConstraints->allowedLexemes = true; }
+   else if (strcmp(constraintName,"allowed-integers") == 0)
+     { parsedConstraints->allowedIntegers = true; }
+   else if (strcmp(constraintName,"allowed-floats") == 0)
+     { parsedConstraints->allowedFloats = true; }
+   else if (strcmp(constraintName,"allowed-numbers") == 0)
+     { parsedConstraints->allowedNumbers = true; }
+   else if (strcmp(constraintName,"allowed-values") == 0)
+     { parsedConstraints->allowedValues = true; }
+   else if (strcmp(constraintName,"allowed-classes") == 0)
+     { parsedConstraints->allowedClasses = true; }
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
diff --git a/clips/cstrnpsr.h b/clips/cstrnpsr.h
new file mode 100755
index 000000000..8141536f7
--- /dev/null
+++ b/clips/cstrnpsr.h
@@ -0,0 +1,88 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*             CONSTRAINT PARSER HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for parsing constraint        */
+/*   declarations.                                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrnpsr
+
+#pragma once
+
+#define _H_cstrnpsr
+
+#include "constrnt.h"
+
+struct constraintParseRecord
+  {
+   unsigned int type : 1;
+   unsigned int range : 1;
+   unsigned int allowedSymbols : 1;
+   unsigned int allowedStrings : 1;
+   unsigned int allowedLexemes : 1;
+   unsigned int allowedFloats : 1;
+   unsigned int allowedIntegers : 1;
+   unsigned int allowedNumbers : 1;
+   unsigned int allowedValues : 1;
+   unsigned int allowedClasses : 1;
+   unsigned int allowedInstanceNames : 1;
+   unsigned int cardinality : 1;
+  };
+
+typedef struct constraintParseRecord CONSTRAINT_PARSE_RECORD;
+
+   bool                           CheckConstraintParseConflicts(Environment *,CONSTRAINT_RECORD *);
+   void                           AttributeConflictErrorMessage(Environment *,const char *,const char *);
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   void                           InitializeConstraintParseRecord(CONSTRAINT_PARSE_RECORD *);
+   bool                           StandardConstraint(const char *);
+   bool                           ParseStandardConstraint(Environment *,const char *,const char *,
+                                                                 CONSTRAINT_RECORD *,
+                                                                 CONSTRAINT_PARSE_RECORD *,
+                                                                 bool);
+   void                           OverlayConstraint(Environment *,CONSTRAINT_PARSE_RECORD *,
+                                                           CONSTRAINT_RECORD *,CONSTRAINT_RECORD *);
+   void                           OverlayConstraintParseRecord(CONSTRAINT_PARSE_RECORD *,
+                                                                      CONSTRAINT_PARSE_RECORD *);
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* _H_cstrnpsr */
+
+
+
diff --git a/clips/cstrnutl.c b/clips/cstrnutl.c
new file mode 100755
index 000000000..96e2a044b
--- /dev/null
+++ b/clips/cstrnutl.c
@@ -0,0 +1,553 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*             CONSTRAINT UTILITY MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Utility routines for manipulating, initializing, */
+/*   creating, copying, and comparing constraint records.    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian Dantes                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added allowed-classes slot facet.              */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "router.h"
+#include "scanner.h"
+
+#include "cstrnutl.h"
+
+/************************************************/
+/* GetConstraintRecord: Creates and initializes */
+/*   the values of a constraint record.         */
+/************************************************/
+struct constraintRecord *GetConstraintRecord(
+  Environment *theEnv)
+  {
+   CONSTRAINT_RECORD *constraints;
+   unsigned i;
+
+   constraints = get_struct(theEnv,constraintRecord);
+
+   for (i = 0 ; i < sizeof(CONSTRAINT_RECORD) ; i++)
+     { ((char *) constraints)[i] = '\0'; }
+
+   SetAnyAllowedFlags(constraints,true);
+
+   constraints->multifieldsAllowed = false;
+   constraints->singlefieldsAllowed = true;
+
+   constraints->anyRestriction = false;
+   constraints->symbolRestriction = false;
+   constraints->stringRestriction = false;
+   constraints->floatRestriction = false;
+   constraints->integerRestriction = false;
+   constraints->classRestriction = false;
+   constraints->instanceNameRestriction = false;
+   constraints->classList = NULL;
+   constraints->restrictionList = NULL;
+   constraints->minValue = GenConstant(theEnv,SYMBOL_TYPE,SymbolData(theEnv)->NegativeInfinity);
+   constraints->maxValue = GenConstant(theEnv,SYMBOL_TYPE,SymbolData(theEnv)->PositiveInfinity);
+   constraints->minFields = GenConstant(theEnv,INTEGER_TYPE,SymbolData(theEnv)->Zero);
+   constraints->maxFields = GenConstant(theEnv,SYMBOL_TYPE,SymbolData(theEnv)->PositiveInfinity);
+   constraints->installed = false;
+   constraints->bucket = 0;
+   constraints->count = 0;
+   constraints->multifield = NULL;
+   constraints->next = NULL;
+
+   return constraints;
+  }
+
+/********************************************************/
+/* SetAnyAllowedFlags: Sets the allowed type flags of a */
+/*   constraint record to allow all types. If passed an */
+/*   argument of true, just the "any allowed" flag is   */
+/*   set to true. If passed an argument of false, then  */
+/*   all of the individual type flags are set to true.  */
+/********************************************************/
+void SetAnyAllowedFlags(
+  CONSTRAINT_RECORD *theConstraint,
+  bool justOne)
+  {
+   bool flag1, flag2;
+
+   if (justOne)
+     {
+      flag1 = true;
+      flag2 = false;
+     }
+   else
+     {
+      flag1 = false;
+      flag2 = true;
+     }
+
+   theConstraint->anyAllowed = flag1;
+   theConstraint->symbolsAllowed = flag2;
+   theConstraint->stringsAllowed = flag2;
+   theConstraint->floatsAllowed = flag2;
+   theConstraint->integersAllowed = flag2;
+   theConstraint->instanceNamesAllowed = flag2;
+   theConstraint->instanceAddressesAllowed = flag2;
+   theConstraint->externalAddressesAllowed = flag2;
+   theConstraint->voidAllowed = flag2;
+   theConstraint->factAddressesAllowed = flag2;
+  }
+
+/*****************************************************/
+/* CopyConstraintRecord: Copies a constraint record. */
+/*****************************************************/
+struct constraintRecord *CopyConstraintRecord(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *sourceConstraint)
+  {
+   CONSTRAINT_RECORD *theConstraint;
+
+   if (sourceConstraint == NULL) return NULL;
+
+   theConstraint = get_struct(theEnv,constraintRecord);
+
+   theConstraint->anyAllowed = sourceConstraint->anyAllowed;
+   theConstraint->symbolsAllowed = sourceConstraint->symbolsAllowed;
+   theConstraint->stringsAllowed = sourceConstraint->stringsAllowed;
+   theConstraint->floatsAllowed = sourceConstraint->floatsAllowed;
+   theConstraint->integersAllowed = sourceConstraint->integersAllowed;
+   theConstraint->instanceNamesAllowed = sourceConstraint->instanceNamesAllowed;
+   theConstraint->instanceAddressesAllowed = sourceConstraint->instanceAddressesAllowed;
+   theConstraint->externalAddressesAllowed = sourceConstraint->externalAddressesAllowed;
+   theConstraint->voidAllowed = sourceConstraint->voidAllowed;
+   theConstraint->multifieldsAllowed = sourceConstraint->multifieldsAllowed;
+   theConstraint->singlefieldsAllowed = sourceConstraint->singlefieldsAllowed;
+   theConstraint->factAddressesAllowed = sourceConstraint->factAddressesAllowed;
+   theConstraint->anyRestriction = sourceConstraint->anyRestriction;
+   theConstraint->symbolRestriction = sourceConstraint->symbolRestriction;
+   theConstraint->stringRestriction = sourceConstraint->stringRestriction;
+   theConstraint->floatRestriction = sourceConstraint->floatRestriction;
+   theConstraint->integerRestriction = sourceConstraint->integerRestriction;
+   theConstraint->classRestriction = sourceConstraint->classRestriction;
+   theConstraint->instanceNameRestriction = sourceConstraint->instanceNameRestriction;
+   theConstraint->classList = CopyExpression(theEnv,sourceConstraint->classList);
+   theConstraint->restrictionList = CopyExpression(theEnv,sourceConstraint->restrictionList);
+   theConstraint->minValue = CopyExpression(theEnv,sourceConstraint->minValue);
+   theConstraint->maxValue = CopyExpression(theEnv,sourceConstraint->maxValue);
+   theConstraint->minFields = CopyExpression(theEnv,sourceConstraint->minFields);
+   theConstraint->maxFields = CopyExpression(theEnv,sourceConstraint->maxFields);
+   theConstraint->bucket = 0;
+   theConstraint->installed = false;
+   theConstraint->count = 0;
+   theConstraint->multifield = CopyConstraintRecord(theEnv,sourceConstraint->multifield);
+   theConstraint->next = NULL;
+
+   return(theConstraint);
+  }
+
+/**************************************************************/
+/* SetAnyRestrictionFlags: Sets the restriction type flags of */
+/*   a constraint record to indicate there are restriction on */
+/*   all types. If passed an argument of true, just the       */
+/*   "any restriction" flag is set to true. If passed an      */
+/*   argument of false, then all of the individual type       */
+/*   restriction flags are set to true.                       */
+/**************************************************************/
+void SetAnyRestrictionFlags(
+  CONSTRAINT_RECORD *theConstraint,
+  bool justOne)
+  {
+   bool flag1, flag2;
+
+   if (justOne)
+     {
+      flag1 = true;
+      flag2 = false;
+     }
+   else
+     {
+      flag1 = false;
+      flag2 = true;
+     }
+
+   theConstraint->anyRestriction = flag1;
+   theConstraint->symbolRestriction = flag2;
+   theConstraint->stringRestriction = flag2;
+   theConstraint->floatRestriction = flag2;
+   theConstraint->integerRestriction = flag2;
+   theConstraint->instanceNameRestriction = flag2;
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/*****************************************************/
+/* SetConstraintType: Given a constraint type and a  */
+/*   constraint, sets the allowed type flags for the */
+/*   specified type in the constraint to true.       */
+/*****************************************************/
+bool SetConstraintType(
+  int theType,
+  CONSTRAINT_RECORD *constraints)
+  {
+   bool rv = true;
+
+   switch(theType)
+     {
+      case UNKNOWN_VALUE:
+         rv = constraints->anyAllowed;
+         constraints->anyAllowed = true;
+         break;
+
+      case SYMBOL_TYPE:
+         rv = constraints->symbolsAllowed;
+         constraints->symbolsAllowed = true;
+         break;
+
+      case STRING_TYPE:
+         rv = constraints->stringsAllowed;
+         constraints->stringsAllowed = true;
+         break;
+
+      case SYMBOL_OR_STRING:
+         rv = (constraints->stringsAllowed || constraints->symbolsAllowed);
+         constraints->symbolsAllowed = true;
+         constraints->stringsAllowed = true;
+         break;
+
+      case INTEGER_TYPE:
+         rv = constraints->integersAllowed;
+         constraints->integersAllowed = true;
+         break;
+
+      case FLOAT_TYPE:
+         rv = constraints->floatsAllowed;
+         constraints->floatsAllowed = true;
+         break;
+
+      case INTEGER_OR_FLOAT:
+         rv = (constraints->integersAllowed || constraints->floatsAllowed);
+         constraints->integersAllowed = true;
+         constraints->floatsAllowed = true;
+         break;
+
+      case INSTANCE_ADDRESS_TYPE:
+         rv = constraints->instanceAddressesAllowed;
+         constraints->instanceAddressesAllowed = true;
+         break;
+
+      case INSTANCE_NAME_TYPE:
+         rv = constraints->instanceNamesAllowed;
+         constraints->instanceNamesAllowed = true;
+         break;
+
+      case INSTANCE_OR_INSTANCE_NAME:
+         rv = (constraints->instanceNamesAllowed || constraints->instanceAddressesAllowed);
+         constraints->instanceNamesAllowed = true;
+         constraints->instanceAddressesAllowed = true;
+         break;
+
+      case EXTERNAL_ADDRESS_TYPE:
+         rv = constraints->externalAddressesAllowed;
+         constraints->externalAddressesAllowed = true;
+         break;
+
+      case VOID_TYPE:
+         rv = constraints->voidAllowed;
+         constraints->voidAllowed = true;
+         break;
+
+      case FACT_ADDRESS_TYPE:
+         rv = constraints->factAddressesAllowed;
+         constraints->factAddressesAllowed = true;
+         break;
+
+      case MULTIFIELD_TYPE:
+         rv = constraints->multifieldsAllowed;
+         constraints->multifieldsAllowed = true;
+         break;
+     }
+
+   if (theType != UNKNOWN_VALUE) constraints->anyAllowed = false;
+   return(rv);
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+/*************************************************************/
+/* CompareNumbers: Given two numbers (which can be integers, */
+/*   floats, or the symbols for positive/negative infinity)  */
+/*   returns the relationship between the numbers (greater   */
+/*   than, less than or equal).                              */
+/*************************************************************/
+int CompareNumbers(
+  Environment *theEnv,
+  int type1,
+  void *vptr1,
+  int type2,
+  void *vptr2)
+  {
+   /*============================================*/
+   /* Handle the situation in which the values   */
+   /* are exactly equal (same type, same value). */
+   /*============================================*/
+
+   if (vptr1 == vptr2) return(EQUAL);
+
+   /*=======================================*/
+   /* Handle the special cases for positive */
+   /* and negative infinity.                */
+   /*=======================================*/
+
+   if (vptr1 == SymbolData(theEnv)->PositiveInfinity) return(GREATER_THAN);
+
+   if (vptr1 == SymbolData(theEnv)->NegativeInfinity) return(LESS_THAN);
+
+   if (vptr2 == SymbolData(theEnv)->PositiveInfinity) return(LESS_THAN);
+
+   if (vptr2 == SymbolData(theEnv)->NegativeInfinity) return(GREATER_THAN);
+
+   /*=======================*/
+   /* Compare two integers. */
+   /*=======================*/
+
+   if ((type1 == INTEGER_TYPE) && (type2 == INTEGER_TYPE))
+     {
+      if (((CLIPSInteger *) vptr1)->contents < ((CLIPSInteger *) vptr2)->contents)
+        { return(LESS_THAN); }
+      else if (((CLIPSInteger *) vptr1)->contents > ((CLIPSInteger *) vptr2)->contents)
+        { return(GREATER_THAN); }
+
+      return(EQUAL);
+     }
+
+   /*=====================*/
+   /* Compare two floats. */
+   /*=====================*/
+
+   if ((type1 == FLOAT_TYPE) && (type2 == FLOAT_TYPE))
+     {
+      if (((CLIPSFloat *) vptr1)->contents < ((CLIPSFloat *) vptr2)->contents)
+        { return(LESS_THAN); }
+      else if (((CLIPSFloat *) vptr1)->contents > ((CLIPSFloat *) vptr2)->contents)
+        { return(GREATER_THAN); }
+
+      return(EQUAL);
+     }
+
+   /*================================*/
+   /* Compare an integer to a float. */
+   /*================================*/
+
+   if ((type1 == INTEGER_TYPE) && (type2 == FLOAT_TYPE))
+     {
+      if (((double) ((CLIPSInteger *) vptr1)->contents) < ((CLIPSFloat *) vptr2)->contents)
+        { return(LESS_THAN); }
+      else if (((double) ((CLIPSInteger *) vptr1)->contents) > ((CLIPSFloat *) vptr2)->contents)
+        { return(GREATER_THAN); }
+
+      return(EQUAL);
+     }
+
+   /*================================*/
+   /* Compare a float to an integer. */
+   /*================================*/
+
+   if ((type1 == FLOAT_TYPE) && (type2 == INTEGER_TYPE))
+     {
+      if (((CLIPSFloat *) vptr1)->contents < ((double) ((CLIPSInteger *) vptr2)->contents))
+        { return(LESS_THAN); }
+      else if (((CLIPSFloat *) vptr1)->contents > ((double) ((CLIPSInteger *) vptr2)->contents))
+        { return(GREATER_THAN); }
+
+      return(EQUAL);
+     }
+
+   /*===================================*/
+   /* One of the arguments was invalid. */
+   /* Return -1 to indicate an error.   */
+   /*===================================*/
+
+   return(-1);
+  }
+
+/****************************************************************/
+/* ExpressionToConstraintRecord: Converts an expression into a  */
+/*   constraint record. For example, an expression representing */
+/*   the symbol BLUE would be converted to a  record with       */
+/*   allowed types SYMBOL_TYPE and allow-values BLUE.                */
+/****************************************************************/
+CONSTRAINT_RECORD *ExpressionToConstraintRecord(
+  Environment *theEnv,
+  struct expr *theExpression)
+  {
+   CONSTRAINT_RECORD *rv;
+
+   /*================================================*/
+   /* A NULL expression is converted to a constraint */
+   /* record with no values allowed.                 */
+   /*================================================*/
+
+   if (theExpression == NULL)
+     {
+      rv = GetConstraintRecord(theEnv);
+      rv->anyAllowed = false;
+      return(rv);
+     }
+
+   /*=============================================================*/
+   /* Convert variables and function calls to constraint records. */
+   /*=============================================================*/
+
+   if ((theExpression->type == SF_VARIABLE) ||
+       (theExpression->type == MF_VARIABLE) ||
+#if DEFGENERIC_CONSTRUCT
+       (theExpression->type == GCALL) ||
+#endif
+#if DEFFUNCTION_CONSTRUCT
+       (theExpression->type == PCALL) ||
+#endif
+       (theExpression->type == GBL_VARIABLE) ||
+       (theExpression->type == MF_GBL_VARIABLE))
+     {
+      rv = GetConstraintRecord(theEnv);
+      rv->multifieldsAllowed = true;
+      return(rv);
+     }
+   else if (theExpression->type == FCALL)
+     { return(FunctionCallToConstraintRecord(theEnv,theExpression->value)); }
+
+   /*============================================*/
+   /* Convert a constant to a constraint record. */
+   /*============================================*/
+
+   rv = GetConstraintRecord(theEnv);
+   rv->anyAllowed = false;
+
+   switch (theExpression->type)
+     {
+      case FLOAT_TYPE:
+        rv->floatRestriction = true;
+        rv->floatsAllowed = true;
+        break;
+        
+      case INTEGER_TYPE:
+        rv->integerRestriction = true;
+        rv->integersAllowed = true;
+        break;
+        
+      case SYMBOL_TYPE:
+        rv->symbolRestriction = true;
+        rv->symbolsAllowed = true;
+        break;
+        
+      case STRING_TYPE:
+        rv->stringRestriction = true;
+        rv->stringsAllowed = true;
+        break;
+        
+      case INSTANCE_NAME_TYPE:
+      rv->instanceNameRestriction = true;
+      rv->instanceNamesAllowed = true;
+        break;
+        
+      case INSTANCE_ADDRESS_TYPE:
+        rv->instanceAddressesAllowed = true;
+        break;
+        
+      default:
+        break;
+     }
+
+   if (rv->floatsAllowed || rv->integersAllowed || rv->symbolsAllowed ||
+       rv->stringsAllowed || rv->instanceNamesAllowed)
+     { rv->restrictionList = GenConstant(theEnv,theExpression->type,theExpression->value); }
+
+   return rv;
+  }
+
+/*******************************************************/
+/* FunctionCallToConstraintRecord: Converts a function */
+/*   call to a constraint record. For example, the +   */
+/*   function when converted would be a constraint     */
+/*   record with allowed types INTEGER_TYPE and FLOAT_TYPE.      */
+/*******************************************************/
+CONSTRAINT_RECORD *FunctionCallToConstraintRecord(
+  Environment *theEnv,
+  void *theFunction)
+  {
+   return ArgumentTypeToConstraintRecord(theEnv,UnknownFunctionType(theFunction));
+  }
+
+/*********************************************/
+/* ArgumentTypeToConstraintRecord2: Uses the */
+/*   new argument type codes for 6.4.        */
+/*********************************************/
+CONSTRAINT_RECORD *ArgumentTypeToConstraintRecord(
+  Environment *theEnv,
+  unsigned bitTypes)
+  {
+   CONSTRAINT_RECORD *rv;
+
+   rv = GetConstraintRecord(theEnv);
+   rv->anyAllowed = false;
+
+   if (bitTypes & VOID_BIT)
+     { rv->voidAllowed = true; }
+   if (bitTypes & FLOAT_BIT)
+     { rv->floatsAllowed = true; }
+   if (bitTypes & INTEGER_BIT)
+     { rv->integersAllowed = true; }
+   if (bitTypes & SYMBOL_BIT)
+     { rv->symbolsAllowed = true; }
+   if (bitTypes & STRING_BIT)
+     { rv->stringsAllowed = true; }
+   if (bitTypes & MULTIFIELD_BIT)
+     { rv->multifieldsAllowed = true; }
+   if (bitTypes & EXTERNAL_ADDRESS_BIT)
+     { rv->externalAddressesAllowed = true; }
+   if (bitTypes & FACT_ADDRESS_BIT)
+     { rv->factAddressesAllowed = true; }
+   if (bitTypes & INSTANCE_ADDRESS_BIT)
+     { rv->instanceAddressesAllowed = true; }
+   if (bitTypes & INSTANCE_NAME_BIT)
+     { rv->instanceNamesAllowed = true; }
+   if (bitTypes & BOOLEAN_BIT)
+     { rv->symbolsAllowed = true; }
+
+   if (bitTypes == ANY_TYPE_BITS)
+     { rv->anyAllowed = true; }
+
+   return(rv);
+  }
+
diff --git a/clips/cstrnutl.h b/clips/cstrnutl.h
new file mode 100755
index 000000000..9f0c9d4ef
--- /dev/null
+++ b/clips/cstrnutl.h
@@ -0,0 +1,54 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*            CONSTRAINT UTILITY HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Utility routines for manipulating, initializing, */
+/*   creating, copying, and comparing constraint records.    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian Dantes                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_cstrnutl
+
+#pragma once
+
+#define _H_cstrnutl
+
+#include "constrnt.h"
+
+   struct constraintRecord       *GetConstraintRecord(Environment *);
+   int                            CompareNumbers(Environment *,int,void *,int,void *);
+   struct constraintRecord       *CopyConstraintRecord(Environment *,CONSTRAINT_RECORD *);
+   bool                           SetConstraintType(int,CONSTRAINT_RECORD *);
+   void                           SetAnyAllowedFlags(CONSTRAINT_RECORD *,bool);
+   void                           SetAnyRestrictionFlags(CONSTRAINT_RECORD *,bool);
+   CONSTRAINT_RECORD             *FunctionCallToConstraintRecord(Environment *,void *);
+   CONSTRAINT_RECORD             *ExpressionToConstraintRecord(Environment *,struct expr *);
+   CONSTRAINT_RECORD             *ArgumentTypeToConstraintRecord(Environment *,unsigned);
+
+#endif /* _H_cstrnutl */
+
+
diff --git a/clips/default.c b/clips/default.c
new file mode 100755
index 000000000..3d1d212de
--- /dev/null
+++ b/clips/default.c
@@ -0,0 +1,454 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*               DEFAULT ATTRIBUTE MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for parsing the default       */
+/*   attribute and determining default values based on       */
+/*   slot constraints.                                       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian Dantes                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Support for deftemplate-slot-default-value     */
+/*            function.                                      */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "constant.h"
+#include "constrnt.h"
+#include "cstrnchk.h"
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "factmngr.h"
+#include "inscom.h"
+#include "multifld.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+
+#include "default.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    *FindDefaultValue(Environment *,int,CONSTRAINT_RECORD *,void *);
+
+/********************************************************/
+/* DeriveDefaultFromConstraints: Returns an appropriate */
+/*   default value for the supplied constraints.        */
+/********************************************************/
+void DeriveDefaultFromConstraints(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *constraints,
+  UDFValue *theDefault,
+  bool multifield,
+  bool garbageMultifield)
+  {
+   unsigned long minFields;
+   void *theValue;
+
+   /*=============================================================*/
+   /* If no constraints are specified, then use the symbol nil as */
+   /* a default for single field slots and a multifield of length */
+   /* 0 as a default for multifield slots.                        */
+   /*=============================================================*/
+
+   if (constraints == NULL)
+     {
+      if (multifield)
+        {
+         theDefault->begin = 0;
+         theDefault->range = 0;
+         if (garbageMultifield) theDefault->value = CreateMultifield(theEnv,0L);
+         else theDefault->value = CreateUnmanagedMultifield(theEnv,0L);
+        }
+      else
+        { theDefault->value = CreateSymbol(theEnv,"nil"); }
+
+      return;
+     }
+
+   /*=========================================*/
+   /* Determine the default's type and value. */
+   /*=========================================*/
+
+   if (constraints->anyAllowed || constraints->symbolsAllowed)
+     { theValue = FindDefaultValue(theEnv,SYMBOL_TYPE,constraints,CreateSymbol(theEnv,"nil")); }
+
+   else if (constraints->stringsAllowed)
+     { theValue = FindDefaultValue(theEnv,STRING_TYPE,constraints,CreateString(theEnv,"")); }
+
+   else if (constraints->integersAllowed)
+     { theValue = FindDefaultValue(theEnv,INTEGER_TYPE,constraints,CreateInteger(theEnv,0LL)); }
+
+   else if (constraints->floatsAllowed)
+     { theValue = FindDefaultValue(theEnv,FLOAT_TYPE,constraints,CreateFloat(theEnv,0.0)); }
+#if OBJECT_SYSTEM
+   else if (constraints->instanceNamesAllowed)
+     { theValue = FindDefaultValue(theEnv,INSTANCE_NAME_TYPE,constraints,CreateInstanceName(theEnv,"nil")); }
+
+   else if (constraints->instanceAddressesAllowed)
+     { theValue = &InstanceData(theEnv)->DummyInstance; }
+#endif
+#if DEFTEMPLATE_CONSTRUCT
+   else if (constraints->factAddressesAllowed)
+     { theValue = &FactData(theEnv)->DummyFact; }
+#endif
+   else if (constraints->externalAddressesAllowed)
+     { theValue = CreateExternalAddress(theEnv,NULL,0); }
+
+   else
+     { theValue = CreateSymbol(theEnv,"nil"); }
+
+   /*=========================================================*/
+   /* If the default is for a multifield slot, then create a  */
+   /* multifield default value that satisfies the cardinality */
+   /* constraints for the slot. The default value for a       */
+   /* multifield slot is a multifield of length 0.            */
+   /*=========================================================*/
+
+   if (multifield)
+     {
+      if (constraints->minFields == NULL) minFields = 0;
+      else if (constraints->minFields->value == SymbolData(theEnv)->NegativeInfinity) minFields = 0;
+      else minFields = (unsigned long) constraints->minFields->integerValue->contents;
+
+      theDefault->begin = 0;
+      theDefault->range = minFields;
+      if (garbageMultifield) theDefault->value = CreateMultifield(theEnv,minFields);
+      else theDefault->value = CreateUnmanagedMultifield(theEnv,minFields);
+
+      for (; minFields > 0; minFields--)
+        { theDefault->multifieldValue->contents[minFields-1].value = theValue; }
+     }
+   else
+     {
+      theDefault->value = theValue;
+     }
+  }
+
+/***********************************************************************/
+/* FindDefaultValue: Searches the list of restriction values for a     */
+/*   constraint to find a default value of the specified type. For     */
+/*   example, if the attribute (allowed-symbols on off) was specified, */
+/*   then the symbol "on" would be used as a default value rather than */
+/*   the symbol "nil". For integers and floats, the range attribute is */
+/*   also used to select a suitable default value. If a minimum value  */
+/*   was specified, then this value is used first followed by the      */
+/*   maximum value.                                                    */
+/************************************************************************/
+static void *FindDefaultValue(
+  Environment *theEnv,
+  int theType,
+  CONSTRAINT_RECORD *theConstraints,
+  void *standardDefault)
+  {
+   struct expr *theList;
+
+   /*=====================================================*/
+   /* Look on the the allowed values list to see if there */
+   /* is a value of the requested type. Return the first  */
+   /* value found of the requested type.                  */
+   /*=====================================================*/
+
+   theList = theConstraints->restrictionList;
+   while (theList != NULL)
+     {
+      if (theList->type == theType) return(theList->value);
+      theList = theList->nextArg;
+     }
+
+   /*=============================================================*/
+   /* If no specific values were available for the default value, */
+   /* and the type requested is a float or integer, then use the  */
+   /* range attribute to select a default value.                  */
+   /*=============================================================*/
+
+   if (theType == INTEGER_TYPE)
+     {
+      if (theConstraints->minValue->type == INTEGER_TYPE)
+        { return(theConstraints->minValue->value); }
+      else if (theConstraints->minValue->type == FLOAT_TYPE)
+        { return(CreateInteger(theEnv,(long long) theConstraints->minValue->floatValue->contents)); }
+      else if (theConstraints->maxValue->type == INTEGER_TYPE)
+        { return(theConstraints->maxValue->value); }
+      else if (theConstraints->maxValue->type == FLOAT_TYPE)
+        { return(CreateInteger(theEnv,(long long) theConstraints->maxValue->floatValue->contents)); }
+     }
+   else if (theType == FLOAT_TYPE)
+     {
+      if (theConstraints->minValue->type == FLOAT_TYPE)
+        { return(theConstraints->minValue->value); }
+      else if (theConstraints->minValue->type == INTEGER_TYPE)
+        { return(CreateFloat(theEnv,(double) theConstraints->minValue->integerValue->contents)); }
+      else if (theConstraints->maxValue->type == FLOAT_TYPE)
+        { return(theConstraints->maxValue->value); }
+      else if (theConstraints->maxValue->type == INTEGER_TYPE)
+        { return(CreateFloat(theEnv,(double) theConstraints->maxValue->integerValue->contents)); }
+     }
+
+   /*======================================*/
+   /* Use the standard default value (such */
+   /* as nil if symbols are allowed).      */
+   /*======================================*/
+
+   return(standardDefault);
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/**********************************************/
+/* ParseDefault: Parses a default value list. */
+/**********************************************/
+struct expr *ParseDefault(
+  Environment *theEnv,
+  const char *readSource,
+  bool multifield,
+  bool dynamic,
+  bool evalStatic,
+  bool *noneSpecified,
+  bool *deriveSpecified,
+  bool *error)
+  {
+   struct expr *defaultList = NULL, *lastDefault = NULL;
+   struct expr *newItem, *tmpItem;
+   struct token theToken;
+   UDFValue theValue;
+   CONSTRAINT_RECORD *rv;
+   int specialVarCode;
+
+   *noneSpecified = false;
+   *deriveSpecified = false;
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,&theToken);
+
+   /*===================================================*/
+   /* Read the items contained in the default attribute */
+   /* until a closing right parenthesis is encountered. */
+   /*===================================================*/
+
+   while (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      /*========================================*/
+      /* Get the next item in the default list. */
+      /*========================================*/
+
+      newItem = ParseAtomOrExpression(theEnv,readSource,&theToken);
+      if (newItem == NULL)
+        {
+         ReturnExpression(theEnv,defaultList);
+         *error = true;
+         return NULL;
+        }
+
+      /*===========================================================*/
+      /* Check for invalid variable usage. With the expection of   */
+      /* ?NONE for the default attribute, local variables may not  */
+      /* be used within the default or default-dynamic attributes. */
+      /*===========================================================*/
+
+      if ((newItem->type == SF_VARIABLE) || (newItem->type == MF_VARIABLE))
+        {
+         if (strcmp(newItem->lexemeValue->contents,"NONE") == 0)
+           { specialVarCode = 0; }
+         else if (strcmp(newItem->lexemeValue->contents,"DERIVE") == 0)
+           { specialVarCode = 1; }
+         else
+           { specialVarCode = -1; }
+
+         if ((dynamic) ||
+             (newItem->type == MF_VARIABLE) ||
+             (specialVarCode == -1) ||
+             ((specialVarCode != -1) && (defaultList != NULL)))
+           {
+            if (dynamic) SyntaxErrorMessage(theEnv,"default-dynamic attribute");
+            else SyntaxErrorMessage(theEnv,"default attribute");
+            ReturnExpression(theEnv,newItem);
+            ReturnExpression(theEnv,defaultList);
+            *error = true;
+            return NULL;
+           }
+
+         ReturnExpression(theEnv,newItem);
+
+         /*============================================*/
+         /* Check for the closing right parenthesis of */
+         /* the default or default dynamic attribute.  */
+         /*============================================*/
+
+         GetToken(theEnv,readSource,&theToken);
+
+         if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+           {
+            if (dynamic) SyntaxErrorMessage(theEnv,"default-dynamic attribute");
+            else SyntaxErrorMessage(theEnv,"default attribute");
+            PPBackup(theEnv);
+            SavePPBuffer(theEnv," ");
+            SavePPBuffer(theEnv,theToken.printForm);
+            *error = true;
+           }
+
+         if (specialVarCode == 0)
+           *noneSpecified = true;
+         else
+           *deriveSpecified = true;
+         return NULL;
+        }
+
+      /*====================================================*/
+      /* Look to see if any variables have been used within */
+      /* expressions contained within the default list.     */
+      /*====================================================*/
+
+      if (ExpressionContainsVariables(newItem,false) == true)
+        {
+         ReturnExpression(theEnv,defaultList);
+         ReturnExpression(theEnv,newItem);
+         *error = true;
+         if (dynamic) SyntaxErrorMessage(theEnv,"default-dynamic attribute");
+         else SyntaxErrorMessage(theEnv,"default attribute");
+         return NULL;
+        }
+
+      /*============================================*/
+      /* Add the default value to the default list. */
+      /*============================================*/
+
+      if (lastDefault == NULL)
+        { defaultList = newItem; }
+      else
+        { lastDefault->nextArg = newItem; }
+      lastDefault = newItem;
+
+      /*=======================================*/
+      /* Begin parsing the next default value. */
+      /*=======================================*/
+
+      SavePPBuffer(theEnv," ");
+      GetToken(theEnv,readSource,&theToken);
+     }
+
+   /*=====================================*/
+   /* Fix up pretty print representation. */
+   /*=====================================*/
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+
+   /*=========================================*/
+   /* A single field slot's default attribute */
+   /* must contain a single value.            */
+   /*=========================================*/
+
+   if (multifield == false)
+     {
+      if (defaultList == NULL)
+        { *error = true; }
+      else if (defaultList->nextArg != NULL)
+        { *error = true; }
+      else
+        {
+         rv = ExpressionToConstraintRecord(theEnv,defaultList);
+         rv->multifieldsAllowed = false;
+         if (UnmatchableConstraint(rv)) *error = true;
+         RemoveConstraint(theEnv,rv);
+        }
+
+      if (*error)
+        {
+         PrintErrorID(theEnv,"DEFAULT",1,true);
+         WriteString(theEnv,STDERR,"The default value for a single field slot must be a single field value.\n");
+         ReturnExpression(theEnv,defaultList);
+         return NULL;
+        }
+     }
+
+   /*=======================================================*/
+   /* If the dynamic-default attribute is not being parsed, */
+   /* evaluate the expressions to make the default value.   */
+   /*=======================================================*/
+
+   if (dynamic || (! evalStatic) || (defaultList == NULL)) return(defaultList);
+
+   tmpItem = defaultList;
+   newItem = defaultList;
+
+   defaultList = NULL;
+
+   while (newItem != NULL)
+     {
+      SetEvaluationError(theEnv,false);
+      if (EvaluateExpression(theEnv,newItem,&theValue)) *error = true;
+
+      if ((theValue.header->type == MULTIFIELD_TYPE) &&
+          (multifield == false) &&
+          (*error == false))
+        {
+         PrintErrorID(theEnv,"DEFAULT",1,true);
+         WriteString(theEnv,STDERR,"The default value for a single field slot must be a single field value.\n");
+         *error = true;
+        }
+
+      if (*error)
+        {
+         ReturnExpression(theEnv,tmpItem);
+         ReturnExpression(theEnv,defaultList);
+         *error = true;
+         return NULL;
+        }
+
+      lastDefault = ConvertValueToExpression(theEnv,&theValue);
+
+      defaultList = AppendExpressions(defaultList,lastDefault);
+
+      newItem = newItem->nextArg;
+     }
+
+   ReturnExpression(theEnv,tmpItem);
+
+   /*==========================*/
+   /* Return the default list. */
+   /*==========================*/
+
+   return(defaultList);
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
diff --git a/clips/default.h b/clips/default.h
new file mode 100755
index 000000000..bd9666a31
--- /dev/null
+++ b/clips/default.h
@@ -0,0 +1,57 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*            DEFAULT ATTRIBUTE HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functions for parsing the default       */
+/*   attribute and determining default values based on       */
+/*   slot constraints.                                       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Support for deftemplate-slot-default-value     */
+/*            function.                                      */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_default
+
+#pragma once
+
+#define _H_default
+
+#include "constrnt.h"
+#include "evaluatn.h"
+
+   void                           DeriveDefaultFromConstraints(Environment *,CONSTRAINT_RECORD *,UDFValue *,bool,bool);
+   struct expr                   *ParseDefault(Environment *,const char *,bool,bool,bool,bool *,bool *,bool *);
+
+#endif /* _H_default */
+
+
+
diff --git a/clips/defins.c b/clips/defins.c
new file mode 100755
index 000000000..aa0271892
--- /dev/null
+++ b/clips/defins.c
@@ -0,0 +1,971 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*                  DEFINSTANCES MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Kernel definstances interface commands           */
+/*              and routines                                 */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed initial-object support.                */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFINSTANCES_CONSTRUCT
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#include "dfinsbin.h"
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "dfinscmp.h"
+#endif
+
+#include "argacces.h"
+#include "classcom.h"
+#include "classfun.h"
+#include "cstrccom.h"
+#include "cstrcpsr.h"
+#include "constant.h"
+#include "constrct.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "extnfunc.h"
+#include "insfun.h"
+#include "inspsr.h"
+#include "memalloc.h"
+#include "modulpsr.h"
+#include "modulutl.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "symbol.h"
+#include "utility.h"
+
+#include "defins.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define ACTIVE_RLN "active"
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   static bool                    ParseDefinstances(Environment *,const char *);
+   static CLIPSLexeme            *ParseDefinstancesName(Environment *,const char *,bool *);
+   static void                    RemoveDefinstances(Environment *,Definstances *);
+   static void                    SaveDefinstances(Environment *,Defmodule *,const char *,void *);
+#endif
+
+#if ! RUN_TIME
+   static void                   *AllocateModule(Environment *);
+   static void                    ReturnModule(Environment *,void *);
+   static bool                    ClearDefinstancesReady(Environment *,void *);
+   static void                    CheckDefinstancesBusy(Environment *,ConstructHeader *,void *);
+   static void                    DestroyDefinstancesAction(Environment *,ConstructHeader *,void *);
+#else
+   static void                    RuntimeDefinstancesAction(Environment *,ConstructHeader *,void *);
+#endif
+
+   static void                    ResetDefinstances(Environment *,void *);
+   static void                    ResetDefinstancesAction(Environment *,ConstructHeader *,void *);
+   static void                    DeallocateDefinstancesData(Environment *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupDefinstances
+  DESCRIPTION  : Adds the definstance support routines
+                   to the Kernel
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Appropriate function lists modified
+  NOTES        : None
+ ***************************************************/
+void SetupDefinstances(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,DEFINSTANCES_DATA,sizeof(struct definstancesData),DeallocateDefinstancesData);
+
+   DefinstancesData(theEnv)->DefinstancesModuleIndex =
+                RegisterModuleItem(theEnv,"definstances",
+#if (! RUN_TIME)
+                                    AllocateModule,
+                                    ReturnModule,
+#else
+                                    NULL,NULL,
+#endif
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+                                    BloadDefinstancesModuleRef,
+#else
+                                    NULL,
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+                                    DefinstancesCModuleReference,
+#else
+                                    NULL,
+#endif
+                                    (FindConstructFunction *) FindDefinstancesInModule);
+
+   DefinstancesData(theEnv)->DefinstancesConstruct =
+      AddConstruct(theEnv,"definstances","definstances",
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+                   ParseDefinstances,
+#else
+                   NULL,
+#endif
+                   (FindConstructFunction *) FindDefinstances,
+                   GetConstructNamePointer,GetConstructPPForm,
+                   GetConstructModuleItem,
+                   (GetNextConstructFunction *) GetNextDefinstances,
+                   SetNextConstruct,
+                   (IsConstructDeletableFunction *) DefinstancesIsDeletable,
+                   (DeleteConstructFunction *) Undefinstances,
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+                   (FreeConstructFunction *) RemoveDefinstances
+#else
+                   NULL
+#endif
+                   );
+
+#if ! RUN_TIME
+   AddClearReadyFunction(theEnv,"definstances",ClearDefinstancesReady,0,NULL);
+
+#if ! BLOAD_ONLY
+   AddUDF(theEnv,"undefinstances","v",1,1,"y",UndefinstancesCommand,"UndefinstancesCommand",NULL);
+   AddSaveFunction(theEnv,"definstances",SaveDefinstances,0,NULL);
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"ppdefinstances","vs",1,2,";y;ldsyn",PPDefinstancesCommand,"PPDefinstancesCommand",NULL);
+   AddUDF(theEnv,"list-definstances","v",0,1,"y",ListDefinstancesCommand,"ListDefinstancesCommand",NULL);
+#endif
+
+   AddUDF(theEnv,"get-definstances-list","m",0,1,"y",GetDefinstancesListFunction,"GetDefinstancesListFunction",NULL);
+   AddUDF(theEnv,"definstances-module","y",1,1,"y",GetDefinstancesModuleCommand,"GetDefinstancesModuleCommand",NULL);
+
+#endif
+   AddResetFunction(theEnv,"definstances",ResetDefinstances,0,NULL);
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+   SetupDefinstancesBload(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   SetupDefinstancesCompiler(theEnv);
+#endif
+  }
+
+/*******************************************************/
+/* DeallocateDefinstancesData: Deallocates environment */
+/*    data for the definstances construct.             */
+/*******************************************************/
+static void DeallocateDefinstancesData(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   struct definstancesModule *theModuleItem;
+   Defmodule *theModule;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv)) return;
+#endif
+
+   DoForAllConstructs(theEnv,DestroyDefinstancesAction,DefinstancesData(theEnv)->DefinstancesModuleIndex,false,NULL);
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      theModuleItem = (struct definstancesModule *)
+                      GetModuleItem(theEnv,theModule,
+                                    DefinstancesData(theEnv)->DefinstancesModuleIndex);
+      rtn_struct(theEnv,definstancesModule,theModuleItem);
+     }
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+#if ! RUN_TIME
+/*****************************************************/
+/* DestroyDefinstancesAction: Action used to remove  */
+/*   definstances as a result of DestroyEnvironment. */
+/*****************************************************/
+static void DestroyDefinstancesAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   struct definstances *theDefinstances = (struct definstances *) theConstruct;
+
+   if (theDefinstances == NULL) return;
+
+   ReturnPackedExpression(theEnv,theDefinstances->mkinstance);
+
+   DestroyConstructHeader(theEnv,&theDefinstances->header);
+
+   rtn_struct(theEnv,definstances,theDefinstances);
+#else
+#if MAC_XCD
+#pragma unused(theConstruct,theEnv)
+#endif
+#endif
+  }
+#endif
+
+#if RUN_TIME
+
+/***************************************************/
+/* RuntimeDefinstancesAction: Action to be applied */
+/*   to each definstances construct when a runtime */
+/*   initialization occurs.                        */
+/***************************************************/
+static void RuntimeDefinstancesAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Definstances *theDefinstances = (Definstances *) theConstruct;
+   
+   theDefinstances->header.env = theEnv;
+  }
+
+/**********************************/
+/* DefinstancesRunTimeInitialize: */
+/**********************************/
+void DefinstancesRunTimeInitialize(
+  Environment *theEnv)
+  {
+   DoForAllConstructs(theEnv,RuntimeDefinstancesAction,DefinstancesData(theEnv)->DefinstancesModuleIndex,true,NULL);
+  }
+
+#endif
+
+/***********************************************************
+  NAME         : GetNextDefinstances
+  DESCRIPTION  : Finds first or next definstances
+  INPUTS       : The address of the current definstances
+  RETURNS      : The address of the next definstances
+                   (NULL if none)
+  SIDE EFFECTS : None
+  NOTES        : If ptr == NULL, the first definstances
+                    is returned.
+ ***********************************************************/
+Definstances *GetNextDefinstances(
+  Environment *theEnv,
+  Definstances *theDefinstances)
+  {
+   return (Definstances *) GetNextConstructItem(theEnv,&theDefinstances->header,
+                                                DefinstancesData(theEnv)->DefinstancesModuleIndex);
+  }
+
+/***************************************************
+  NAME         : FindDefinstances
+  DESCRIPTION  : Looks up a definstance construct
+                   by name-string
+  INPUTS       : The symbolic name
+  RETURNS      : The definstance address, or NULL
+                    if not found
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Definstances *FindDefinstances(
+  Environment *theEnv,
+  const char *name)
+  {
+   return (Definstances *) FindNamedConstructInModuleOrImports(theEnv,name,DefinstancesData(theEnv)->DefinstancesConstruct);
+  }
+
+/***************************************************
+  NAME         : FindDefinstancesInModule
+  DESCRIPTION  : Looks up a definstance construct
+                   by name-string
+  INPUTS       : The symbolic name
+  RETURNS      : The definstance address, or NULL
+                    if not found
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Definstances *FindDefinstancesInModule(
+  Environment *theEnv,
+  const char *name)
+  {
+   return (Definstances *) FindNamedConstructInModule(theEnv,name,DefinstancesData(theEnv)->DefinstancesConstruct);
+  }
+
+/***************************************************
+  NAME         : DefinstancesIsDeletable
+  DESCRIPTION  : Determines if a definstances
+                   can be deleted
+  INPUTS       : Address of the definstances
+  RETURNS      : True if deletable, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool DefinstancesIsDeletable(
+  Definstances *theDefinstances)
+  {
+   Environment *theEnv = theDefinstances->header.env;
+   
+   if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   return (theDefinstances->busy == 0) ? true : false;
+  }
+
+/***********************************************************
+  NAME         : UndefinstancesCommand
+  DESCRIPTION  : Removes a definstance
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Definstance deallocated
+  NOTES        : H/L Syntax : (undefinstances <name> | *)
+ ***********************************************************/
+void UndefinstancesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UndefconstructCommand(context,"undefinstances",DefinstancesData(theEnv)->DefinstancesConstruct);
+  }
+
+/*****************************************************************
+  NAME         : GetDefinstancesModuleCommand
+  DESCRIPTION  : Determines to which module a definstances belongs
+  INPUTS       : None
+  RETURNS      : The symbolic name of the module
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (definstances-module <defins-name>)
+ *****************************************************************/
+void GetDefinstancesModuleCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->value = GetConstructModuleCommand(context,"definstances-module",DefinstancesData(theEnv)->DefinstancesConstruct);
+  }
+
+/***********************************************************
+  NAME         : Undefinstances
+  DESCRIPTION  : Removes a definstance
+  INPUTS       : Address of definstances to remove
+  RETURNS      : True if successful,
+                 false otherwise
+  SIDE EFFECTS : Definstance deallocated
+  NOTES        : None
+ ***********************************************************/
+bool Undefinstances(
+  Definstances *theDefinstances,
+  Environment *allEnv)
+  {
+   Environment *theEnv;
+   
+   if (theDefinstances == NULL)
+     {
+      theEnv = allEnv;
+      return Undefconstruct(theEnv,NULL,DefinstancesData(theEnv)->DefinstancesConstruct);
+     }
+   else
+     {
+      theEnv = theDefinstances->header.env;
+      return Undefconstruct(theEnv,&theDefinstances->header,DefinstancesData(theEnv)->DefinstancesConstruct);
+     }
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/***************************************************************
+  NAME         : PPDefinstancesCommand
+  DESCRIPTION  : Prints out the pretty-print form of a definstance
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (ppdefinstances <name>)
+ ***************************************************************/
+void PPDefinstancesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PPConstructCommand(context,"ppdefinstances",DefinstancesData(theEnv)->DefinstancesConstruct,returnValue);
+  }
+
+/***************************************************
+  NAME         : ListDefinstancesCommand
+  DESCRIPTION  : Displays all definstances names
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Definstances name sprinted
+  NOTES        : H/L Interface
+ ***************************************************/
+void ListDefinstancesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListConstructCommand(context,DefinstancesData(theEnv)->DefinstancesConstruct);
+  }
+
+/***************************************************
+  NAME         : ListDefinstances
+  DESCRIPTION  : Displays all definstances names
+  INPUTS       : 1) The logical name of the output
+                 2) The module
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Definstances names printed
+  NOTES        : C Interface
+ ***************************************************/
+void ListDefinstances(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListConstruct(theEnv,DefinstancesData(theEnv)->DefinstancesConstruct,logicalName,theModule);
+  }
+
+#endif
+
+/****************************************************************
+  NAME         : GetDefinstancesListFunction
+  DESCRIPTION  : Groups all definstances names into
+                 a multifield list
+  INPUTS       : A data object buffer to hold
+                 the multifield result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield allocated and filled
+  NOTES        : H/L Syntax: (get-definstances-list [<module>])
+ ****************************************************************/
+void GetDefinstancesListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   GetConstructListFunction(context,returnValue,DefinstancesData(theEnv)->DefinstancesConstruct);
+  }
+
+/***************************************************************
+  NAME         : GetDefinstancesList
+  DESCRIPTION  : Groups all definstances names into
+                 a multifield list
+  INPUTS       : 1) A data object buffer to hold
+                    the multifield result
+                 2) The module from which to obtain definstances
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield allocated and filled
+  NOTES        : External C access
+ ***************************************************************/
+void GetDefinstancesList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defmodule *theModule)
+  {
+   UDFValue result;
+   
+   GetConstructList(theEnv,&result,DefinstancesData(theEnv)->DefinstancesConstruct,theModule);
+   NormalizeMultifield(theEnv,&result);
+   returnValue->value = result.value;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/*********************************************************************
+  NAME         : ParseDefinstances
+  DESCRIPTION  : Parses and allocates a definstances construct
+  INPUTS       : The logical name of the input source
+  RETURNS      : False if no errors, true otherwise
+  SIDE EFFECTS : Definstances parsed and created
+  NOTES        : H/L Syntax :
+
+                 (definstances  <name> [active] [<comment>]
+                    <instance-definition>+)
+
+                 <instance-definition> ::=
+                    (<instance-name> of <class-name> <slot-override>*)
+
+                 <slot-override> ::= (<slot-name> <value-expression>*)
+ *********************************************************************/
+static bool ParseDefinstances(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   CLIPSLexeme *dname;
+   struct functionDefinition *mkinsfcall;
+   Expression *mkinstance,*mkbot = NULL;
+   Definstances *dobj;
+   bool active;
+
+   SetPPBufferStatus(theEnv,true);
+   FlushPPBuffer(theEnv);
+   SetIndentDepth(theEnv,3);
+   SavePPBuffer(theEnv,"(definstances ");
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv)) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"definstances");
+      return true;
+     }
+#endif
+   dname = ParseDefinstancesName(theEnv,readSource,&active);
+   if (dname == NULL)
+     return true;
+
+   dobj = get_struct(theEnv,definstances);
+   InitializeConstructHeader(theEnv,"definstances",DEFINSTANCES,&dobj->header,dname);
+   dobj->busy = 0;
+   dobj->mkinstance = NULL;
+#if DEFRULE_CONSTRUCT
+   if (active)
+     mkinsfcall = FindFunction(theEnv,"active-make-instance");
+   else
+     mkinsfcall = FindFunction(theEnv,"make-instance");
+#else
+   mkinsfcall = FindFunction(theEnv,"make-instance");
+#endif
+   while (DefclassData(theEnv)->ObjectParseToken.tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      mkinstance = GenConstant(theEnv,UNKNOWN_VALUE,mkinsfcall);
+      mkinstance = ParseInitializeInstance(theEnv,mkinstance,readSource);
+      if (mkinstance == NULL)
+        {
+         ReturnExpression(theEnv,dobj->mkinstance);
+         rtn_struct(theEnv,definstances,dobj);
+         return true;
+        }
+      if (ExpressionContainsVariables(mkinstance,false) == true)
+        {
+         LocalVariableErrorMessage(theEnv,"definstances");
+         ReturnExpression(theEnv,mkinstance);
+         ReturnExpression(theEnv,dobj->mkinstance);
+         rtn_struct(theEnv,definstances,dobj);
+         return true;
+        }
+      if (mkbot == NULL)
+        dobj->mkinstance = mkinstance;
+      else
+        GetNextArgument(mkbot) = mkinstance;
+      mkbot = mkinstance;
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      PPBackup(theEnv);
+      PPCRAndIndent(theEnv);
+      SavePPBuffer(theEnv,DefclassData(theEnv)->ObjectParseToken.printForm);
+     }
+
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      ReturnExpression(theEnv,dobj->mkinstance);
+      rtn_struct(theEnv,definstances,dobj);
+      SyntaxErrorMessage(theEnv,"definstances");
+      return true;
+     }
+   else
+     {
+      if (ConstructData(theEnv)->CheckSyntaxMode)
+        {
+         ReturnExpression(theEnv,dobj->mkinstance);
+         rtn_struct(theEnv,definstances,dobj);
+         return false;
+        }
+#if DEBUGGING_FUNCTIONS
+      if (GetConserveMemory(theEnv) == false)
+        {
+         if (dobj->mkinstance != NULL)
+           PPBackup(theEnv);
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv,")\n");
+         SetDefinstancesPPForm(theEnv,dobj,CopyPPBuffer(theEnv));
+        }
+#endif
+      mkinstance = dobj->mkinstance;
+      dobj->mkinstance = PackExpression(theEnv,mkinstance);
+      ReturnExpression(theEnv,mkinstance);
+      IncrementLexemeCount(GetDefinstancesNamePointer(theEnv,dobj));
+      ExpressionInstall(theEnv,dobj->mkinstance);
+     }
+
+   AddConstructToModule(&dobj->header);
+   return false;
+  }
+
+/*************************************************************
+  NAME         : ParseDefinstancesName
+  DESCRIPTION  : Parses definstance name and optional comment
+                 and optional "active" keyword
+  INPUTS       : 1) The logical name of the input source
+                 2) Buffer to hold flag indicating if
+                    definstances should cause pattern-matching
+                    to occur during slot-overrides
+  RETURNS      : Address of name symbol, or
+                   NULL if there was an error
+  SIDE EFFECTS : Token after name or comment is scanned
+  NOTES        : Assumes "(definstances" has already
+                   been scanned.
+ *************************************************************/
+static CLIPSLexeme *ParseDefinstancesName(
+  Environment *theEnv,
+  const char *readSource,
+  bool *active)
+  {
+   CLIPSLexeme *dname;
+
+   *active = false;
+   dname = GetConstructNameAndComment(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken,"definstances",
+                                      (FindConstructFunction *) FindDefinstancesInModule,
+                                      (DeleteConstructFunction *) Undefinstances,"@",
+                                      true,false,true,false);
+   if (dname == NULL)
+     return NULL;
+
+#if DEFRULE_CONSTRUCT
+   if ((DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN) ? false :
+       (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,ACTIVE_RLN) == 0))
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,DefclassData(theEnv)->ObjectParseToken.printForm);
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      *active = true;
+     }
+#endif
+   if (DefclassData(theEnv)->ObjectParseToken.tknType == STRING_TOKEN)
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,DefclassData(theEnv)->ObjectParseToken.printForm);
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+     }
+   return(dname);
+  }
+
+/**************************************************************
+  NAME         : RemoveDefinstances
+  DESCRIPTION  : Deallocates and removes a definstance construct
+  INPUTS       : The definstance address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Existing definstance construct deleted
+  NOTES        : Assumes busy count of definstance is 0
+ **************************************************************/
+static void RemoveDefinstances(
+  Environment *theEnv,
+  Definstances *theDefinstances)
+  {
+   ReleaseLexeme(theEnv,theDefinstances->header.name);
+   ExpressionDeinstall(theEnv,theDefinstances->mkinstance);
+   ReturnPackedExpression(theEnv,theDefinstances->mkinstance);
+   SetDefinstancesPPForm(theEnv,theDefinstances,NULL);
+   ClearUserDataList(theEnv,theDefinstances->header.usrData);
+   rtn_struct(theEnv,definstances,theDefinstances);
+  }
+
+/***************************************************
+  NAME         : SaveDefinstances
+  DESCRIPTION  : Prints pretty print form of
+                   definstances to specified output
+  INPUTS       : The logical name of the output
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static void SaveDefinstances(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logName,
+  void *context)
+  {
+   SaveConstruct(theEnv,theModule,logName,DefinstancesData(theEnv)->DefinstancesConstruct);
+  }
+
+#endif
+
+#if ! RUN_TIME
+
+/*****************************************************
+  NAME         : AllocateModule
+  DESCRIPTION  : Creates and initializes a
+                 list of definstances for a new module
+  INPUTS       : None
+  RETURNS      : The new definstances module
+  SIDE EFFECTS : Definstances module created
+  NOTES        : None
+ *****************************************************/
+static void *AllocateModule(
+  Environment *theEnv)
+  {
+   return (void *) get_struct(theEnv,definstancesModule);
+  }
+
+/***************************************************
+  NAME         : ReturnModule
+  DESCRIPTION  : Removes a definstances module and
+                 all associated definstances
+  INPUTS       : The definstances module
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Module and definstances deleted
+  NOTES        : None
+ ***************************************************/
+static void ReturnModule(
+  Environment *theEnv,
+  void *theItem)
+  {
+#if (! BLOAD_ONLY)
+   FreeConstructHeaderModule(theEnv,(struct defmoduleItemHeader *) theItem,DefinstancesData(theEnv)->DefinstancesConstruct);
+#endif
+   rtn_struct(theEnv,definstancesModule,theItem);
+  }
+
+/***************************************************
+  NAME         : ClearDefinstancesReady
+  DESCRIPTION  : Determines if it is safe to
+                 remove all definstances
+                 Assumes *all* constructs will be
+                 deleted
+  INPUTS       : None
+  RETURNS      : True if all definstances can
+                 be deleted, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : Used by (clear) and (bload)
+ ***************************************************/
+static bool ClearDefinstancesReady(
+  Environment *theEnv,
+  void *context)
+  {
+   bool flagBuffer = true;
+
+   DoForAllConstructs(theEnv,CheckDefinstancesBusy,DefinstancesData(theEnv)->DefinstancesModuleIndex,
+                      false,&flagBuffer);
+   return(flagBuffer);
+  }
+
+/***************************************************
+  NAME         : CheckDefinstancesBusy
+  DESCRIPTION  : Determines if a definstances is
+                 in use or not
+  INPUTS       : 1) The definstances
+                 2) A buffer to set to 0 if the
+                    the definstances is busy
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Buffer set to 0 if definstances
+                 busy
+  NOTES        : The flag buffer is not modified
+                 if definstances is not busy
+                 (assumed to be initialized to 1)
+ ***************************************************/
+static void CheckDefinstancesBusy(
+  Environment *theEnv,
+  ConstructHeader *theDefinstances,
+  void *userBuffer)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   if (((Definstances *) theDefinstances)->busy > 0)
+     { *((bool *) userBuffer) = false; }
+  }
+
+#endif
+
+/***************************************************
+  NAME         : ResetDefinstances
+  DESCRIPTION  : Calls EvaluateExpression for each of
+                   the make-instance calls in all
+                   of the definstances constructs
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : All instances in the definstances
+                   are evaluated (and created if
+                   there are no errors)
+                 Any previously existing instances
+                 are deleted first.
+  NOTES        : None
+ ***************************************************/
+static void ResetDefinstances(
+  Environment *theEnv,
+  void *context)
+  {
+   DoForAllConstructs(theEnv,ResetDefinstancesAction,DefinstancesData(theEnv)->DefinstancesModuleIndex,true,NULL);
+  }
+
+/***************************************************
+  NAME         : ResetDefinstancesAction
+  DESCRIPTION  : Performs all the make-instance
+                 calls in a definstances
+  INPUTS       : 1) The definstances
+                 2) User data buffer (ignored)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instances created
+  NOTES        : None
+ ***************************************************/
+static void ResetDefinstancesAction(
+  Environment *theEnv,
+  ConstructHeader *vDefinstances,
+  void *userBuffer)
+  {
+#if MAC_XCD
+#pragma unused(userBuffer)
+#endif
+   Definstances *theDefinstances = (Definstances *) vDefinstances;
+   Expression *theExp;
+   UDFValue temp;
+
+   SaveCurrentModule(theEnv);
+   SetCurrentModule(theEnv,vDefinstances->whichModule->theModule);
+   theDefinstances->busy++;
+   for (theExp = theDefinstances->mkinstance ;
+        theExp != NULL ;
+        theExp = GetNextArgument(theExp))
+     {
+      EvaluateExpression(theEnv,theExp,&temp);
+      if (EvaluationData(theEnv)->HaltExecution ||
+          (temp.value == FalseSymbol(theEnv)))
+        {
+         RestoreCurrentModule(theEnv);
+         theDefinstances->busy--;
+         return;
+        }
+     }
+   theDefinstances->busy--;
+   RestoreCurrentModule(theEnv);
+  }
+
+/*##################################*/
+/* Additional Environment Functions */
+/*##################################*/
+
+const char *DefinstancesName(
+  Definstances *theDefinstances)
+  {
+   return GetConstructNameString(&theDefinstances->header);
+  }
+
+const char *DefinstancesPPForm(
+  Definstances *theDefinstances)
+  {
+   return GetConstructPPForm(&theDefinstances->header);
+  }
+
+void SetDefinstancesPPForm(
+  Environment *theEnv,
+  Definstances *theDefinstances,
+  const char *thePPForm)
+  {
+   SetConstructPPForm(theEnv,&theDefinstances->header,thePPForm);
+  }
+
+const char *DefinstancesModule(
+  Definstances *theDefinstances)
+  {
+   return GetConstructModuleName(&theDefinstances->header);
+  }
+
+CLIPSLexeme *GetDefinstancesNamePointer(
+  Environment *theEnv,
+  Definstances *theDefinstances)
+  {
+   return GetConstructNamePointer(&theDefinstances->header);
+  }
+
+const char *DefinstancesModuleName(
+  Environment *theEnv,
+  Definstances *theDefinstances)
+  {
+   return GetConstructModuleName(&theDefinstances->header);
+  }
+
+#endif
+
+
diff --git a/clips/defins.h b/clips/defins.h
new file mode 100755
index 000000000..97903c06d
--- /dev/null
+++ b/clips/defins.h
@@ -0,0 +1,127 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*               DEFINSTANCES HEADER FILE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_defins
+
+#pragma once
+
+#define _H_defins
+
+#if DEFINSTANCES_CONSTRUCT
+
+struct definstances;
+
+#include "conscomp.h"
+#include "constrct.h"
+#include "cstrccom.h"
+#include "moduldef.h"
+#include "object.h"
+
+typedef struct definstancesModule
+  {
+   struct defmoduleItemHeader header;
+  } DEFINSTANCES_MODULE;
+
+typedef struct definstances
+  {
+   ConstructHeader header;
+   unsigned busy;
+   Expression *mkinstance;
+  } Definstances;
+
+#define DEFINSTANCES_DATA 22
+
+struct definstancesData
+  {
+   Construct *DefinstancesConstruct;
+   unsigned DefinstancesModuleIndex;
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   struct CodeGeneratorItem *DefinstancesCodeItem;
+#endif
+  };
+
+#define DefinstancesData(theEnv) ((struct definstancesData *) GetEnvironmentData(theEnv,DEFINSTANCES_DATA))
+
+   const char                    *DefinstancesModule(Definstances *);
+   const char                    *DefinstancesModuleName(Environment *,Definstances *);
+   Definstances                  *FindDefinstances(Environment *,const char *);
+   Definstances                  *FindDefinstancesInModule(Environment *,const char *);
+   void                           GetDefinstancesList(Environment *,CLIPSValue *,Defmodule *);
+   const char                    *DefinstancesName(Definstances *);
+   CLIPSLexeme                   *GetDefinstancesNamePointer(Environment *,Definstances *);
+   const char                    *DefinstancesPPForm(Definstances *);
+   Definstances                  *GetNextDefinstances(Environment *,Definstances *);
+   bool                           DefinstancesIsDeletable(Definstances *);
+   void                           SetDefinstancesPPForm(Environment *,Definstances *,const char *);
+   bool                           Undefinstances(Definstances *,Environment *);
+   void                           GetDefinstancesListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetDefinstancesModuleCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SetupDefinstances(Environment *);
+   void                           UndefinstancesCommand(Environment *,UDFContext *,UDFValue *);
+#if DEBUGGING_FUNCTIONS
+   void                           PPDefinstancesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ListDefinstancesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ListDefinstances(Environment *,const char *,Defmodule *);
+#endif
+
+#if RUN_TIME
+   void                           DefinstancesRunTimeInitialize(Environment *);
+#endif
+
+#endif /* DEFINSTANCES_CONSTRUCT */
+
+#endif /* _H_defins */
+
+
+
+
diff --git a/clips/developr.c b/clips/developr.c
new file mode 100755
index 000000000..bbbbfa548
--- /dev/null
+++ b/clips/developr.c
@@ -0,0 +1,677 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                   DEVELOPER MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines useful for browsing various    */
+/*   data structures. The functions are provided for         */
+/*   development use.                                        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*            Functions enable-gc-heuristics and             */
+/*            disable-gc-heuristics are no longer supported. */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers and type casts to       */
+/*            remove C++ warnings.                           */
+/*                                                           */
+/*            Replaced deprecated WCLIPS logical name with   */
+/*            WPROMPT.                                       */
+/*                                                           */
+/*      6.31: Crash fix for show-opn.                        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "factmngr.h"
+#include "inscom.h"
+#include "modulutl.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+
+#if DEFRULE_CONSTRUCT && DEFTEMPLATE_CONSTRUCT
+#include "tmpltdef.h"
+#include "factbld.h"
+#include "facthsh.h"
+#endif
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+#include "classcom.h"
+#include "classfun.h"
+#include "objrtmch.h"
+#endif
+#if OBJECT_SYSTEM
+#include "insfun.h"
+#endif
+
+#include "developr.h"
+
+#if DEVELOPER
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+   static void                    PrintOPNLevel(Environment *,OBJECT_PATTERN_NODE *,char *,int);
+#endif
+
+/**************************************************/
+/* DeveloperCommands: Sets up developer commands. */
+/**************************************************/
+void DeveloperCommands(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"primitives-info","v",0,0,NULL,PrimitiveTablesInfoCommand,"PrimitiveTablesInfoCommand",NULL);
+   AddUDF(theEnv,"primitives-usage","v",0,0,NULL,PrimitiveTablesUsageCommand,"PrimitiveTablesUsageCommand",NULL);
+
+#if DEFRULE_CONSTRUCT && DEFTEMPLATE_CONSTRUCT
+   AddUDF(theEnv,"validate-fact-integrity","b", 0,0,NULL,ValidateFactIntegrityCommand,"ValidateFactIntegrityCommand",NULL);
+
+   AddUDF(theEnv,"show-fpn","v",1,1,"y",ShowFactPatternNetworkCommand,"ShowFactPatternNetworkCommand",NULL);
+   AddUDF(theEnv,"show-fht","v",0,0,NULL,ShowFactHashTableCommand,"ShowFactHashTableCommand",NULL);
+#endif
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+   AddUDF(theEnv,"show-opn","v",0,0,NULL,PrintObjectPatternNetworkCommand,"PrintObjectPatternNetworkCommand",NULL);
+#endif
+
+#if OBJECT_SYSTEM
+   AddUDF(theEnv,"instance-table-usage","v",0,0,NULL,InstanceTableUsageCommand,"InstanceTableUsageCommand",NULL);
+#endif
+
+#endif
+  }
+
+/******************************************************/
+/* PrimitiveTablesInfo: Prints information about the  */
+/*   symbol, float, integer, and bitmap tables.       */
+/******************************************************/
+void PrimitiveTablesInfoCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned long i;
+   CLIPSLexeme **symbolArray, *symbolPtr;
+   CLIPSFloat **floatArray, *floatPtr;
+   CLIPSInteger **integerArray, *integerPtr;
+   CLIPSBitMap **bitMapArray, *bitMapPtr;
+   unsigned long long symbolCount = 0, integerCount = 0;
+   unsigned long long floatCount = 0, bitMapCount = 0;
+
+   /*====================================*/
+   /* Count entries in the symbol table. */
+   /*====================================*/
+
+   symbolArray = GetSymbolTable(theEnv);
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      for (symbolPtr = symbolArray[i]; symbolPtr != NULL; symbolPtr = symbolPtr->next)
+        { symbolCount++; }
+     }
+
+   /*====================================*/
+   /* Count entries in the integer table. */
+   /*====================================*/
+
+   integerArray = GetIntegerTable(theEnv);
+   for (i = 0; i < INTEGER_HASH_SIZE; i++)
+     {
+      for (integerPtr = integerArray[i]; integerPtr != NULL; integerPtr = integerPtr->next)
+        { integerCount++; }
+     }
+
+   /*====================================*/
+   /* Count entries in the float table. */
+   /*====================================*/
+
+   floatArray = GetFloatTable(theEnv);
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+     {
+      for (floatPtr = floatArray[i]; floatPtr != NULL; floatPtr = floatPtr->next)
+        { floatCount++; }
+     }
+
+   /*====================================*/
+   /* Count entries in the bitmap table. */
+   /*====================================*/
+
+   bitMapArray = GetBitMapTable(theEnv);
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      for (bitMapPtr = bitMapArray[i]; bitMapPtr != NULL; bitMapPtr = bitMapPtr->next)
+        { bitMapCount++; }
+     }
+
+   /*========================*/
+   /* Print the information. */
+   /*========================*/
+
+   WriteString(theEnv,STDOUT,"Symbols: ");
+   PrintUnsignedInteger(theEnv,STDOUT,symbolCount);
+   WriteString(theEnv,STDOUT,"\n");
+   WriteString(theEnv,STDOUT,"Integers: ");
+   PrintUnsignedInteger(theEnv,STDOUT,integerCount);
+   WriteString(theEnv,STDOUT,"\n");
+   WriteString(theEnv,STDOUT,"Floats: ");
+   PrintUnsignedInteger(theEnv,STDOUT,floatCount);
+   WriteString(theEnv,STDOUT,"\n");
+   WriteString(theEnv,STDOUT,"BitMaps: ");
+   PrintUnsignedInteger(theEnv,STDOUT,bitMapCount);
+   WriteString(theEnv,STDOUT,"\n");
+  }
+
+#define COUNT_SIZE 21
+
+/*********************************************************/
+/* PrimitiveTablesUsageCommand: Prints information about */
+/*   the symbol, float, integer, and bitmap tables.      */
+/*********************************************************/
+void PrimitiveTablesUsageCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned long i;
+   unsigned long long symbolCounts[COUNT_SIZE], floatCounts[COUNT_SIZE];
+   CLIPSLexeme **symbolArray, *symbolPtr;
+   CLIPSFloat **floatArray, *floatPtr;
+   unsigned long long symbolCount, totalSymbolCount = 0;
+   unsigned long long floatCount, totalFloatCount = 0;
+
+   for (i = 0; i < 21; i++)
+     {
+      symbolCounts[i] = 0;
+      floatCounts[i] = 0;
+     }
+
+   /*====================================*/
+   /* Count entries in the symbol table. */
+   /*====================================*/
+
+   symbolArray = GetSymbolTable(theEnv);
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      symbolCount = 0;
+      for (symbolPtr = symbolArray[i]; symbolPtr != NULL; symbolPtr = symbolPtr->next)
+        {
+         symbolCount++;
+         totalSymbolCount++;
+        }
+
+      if (symbolCount < (COUNT_SIZE - 1))
+        { symbolCounts[symbolCount]++; }
+      else
+        { symbolCounts[COUNT_SIZE - 1]++; }
+     }
+
+   /*===================================*/
+   /* Count entries in the float table. */
+   /*===================================*/
+
+   floatArray = GetFloatTable(theEnv);
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+     {
+      floatCount = 0;
+      for (floatPtr = floatArray[i]; floatPtr != NULL; floatPtr = floatPtr->next)
+        {
+         floatCount++;
+         totalFloatCount++;
+        }
+
+      if (floatCount < (COUNT_SIZE - 1))
+        { floatCounts[floatCount]++; }
+      else
+        { floatCounts[COUNT_SIZE - 1]++; }
+     }
+
+   /*========================*/
+   /* Print the information. */
+   /*========================*/
+
+   WriteString(theEnv,STDOUT,"Total Symbols: ");
+   PrintUnsignedInteger(theEnv,STDOUT,totalSymbolCount);
+   WriteString(theEnv,STDOUT,"\n");
+   for (i = 0; i < COUNT_SIZE; i++)
+     {
+      PrintUnsignedInteger(theEnv,STDOUT,i);
+      WriteString(theEnv,STDOUT," ");
+      PrintUnsignedInteger(theEnv,STDOUT,symbolCounts[i]);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+
+   WriteString(theEnv,STDOUT,"\nTotal Floats: ");
+   PrintUnsignedInteger(theEnv,STDOUT,totalFloatCount);
+   WriteString(theEnv,STDOUT,"\n");
+   for (i = 0; i < COUNT_SIZE; i++)
+     {
+      PrintUnsignedInteger(theEnv,STDOUT,i);
+      WriteString(theEnv,STDOUT," ");
+      PrintUnsignedInteger(theEnv,STDOUT,floatCounts[i]);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+
+  }
+
+#if DEFRULE_CONSTRUCT && DEFTEMPLATE_CONSTRUCT
+
+/******************************************************/
+/* ValidateFactIntegrityCommand: Command for checking */
+/*   the facts for atom value integrity.              */
+/******************************************************/
+void ValidateFactIntegrityCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Fact *theFact;
+   Multifield *theSegment;
+   size_t i;
+   CLIPSLexeme *theSymbol;
+   CLIPSFloat *theFloat;
+   CLIPSInteger *theInteger;
+
+   if (theEnv->initialized == false)
+     {
+      returnValue->lexemeValue = TrueSymbol(theEnv);
+      return;
+     }
+
+   for (theFact = GetNextFact(theEnv,NULL);
+        theFact != NULL;
+        theFact = GetNextFact(theEnv,theFact))
+     {
+      if (theFact->patternHeader.busyCount <= 0)
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+
+      theSegment = &theFact->theProposition;
+
+      for (i = 0 ; i < theSegment->length ; i++)
+        {
+         if ((theSegment->contents[i].header->type == SYMBOL_TYPE) ||
+             (theSegment->contents[i].header->type == STRING_TYPE) ||
+             (theSegment->contents[i].header->type == INSTANCE_NAME_TYPE))
+           {
+            theSymbol = theSegment->contents[i].lexemeValue;
+            if (theSymbol->count <= 0)
+              {
+               returnValue->lexemeValue = FalseSymbol(theEnv);
+               return;
+              }
+           }
+
+         if (theSegment->contents[i].header->type == INTEGER_TYPE)
+           {
+            theInteger = theSegment->contents[i].integerValue;
+            if (theInteger->count <= 0)
+              {
+               returnValue->lexemeValue = FalseSymbol(theEnv);
+               return;
+              }
+           }
+
+         if (theSegment->contents[i].header->type == FLOAT_TYPE)
+           {
+            theFloat = theSegment->contents[i].floatValue;
+            if (theFloat->count <= 0)
+              {
+               returnValue->lexemeValue = FalseSymbol(theEnv);
+               return;
+              }
+           }
+        }
+     }
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/*************************************************************/
+/* ShowFactPatternNetworkCommand: Command for displaying the */
+/*   fact pattern network for a specified deftemplate.       */
+/*************************************************************/
+void ShowFactPatternNetworkCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   struct factPatternNode *patternPtr;
+   Deftemplate *theDeftemplate;
+   const char *theName;
+   int depth = 0, i;
+
+   theName = GetConstructName(context,"show-fpn","template name");
+   if (theName == NULL) return;
+
+   theDeftemplate = FindDeftemplate(theEnv,theName);
+   if (theDeftemplate == NULL) return;
+
+   patternPtr = theDeftemplate->patternNetwork;
+   while (patternPtr != NULL)
+     {
+      for (i = 0; i < depth; i++) WriteString(theEnv,STDOUT," ");
+      if (patternPtr->header.singlefieldNode) WriteString(theEnv,STDOUT,"SF   ");
+      else if (patternPtr->header.multifieldNode)
+        {
+         WriteString(theEnv,STDOUT,"MF");
+         if (patternPtr->header.endSlot) WriteString(theEnv,STDOUT,")");
+         else WriteString(theEnv,STDOUT,"*");
+         PrintUnsignedInteger(theEnv,STDOUT,patternPtr->leaveFields);
+         WriteString(theEnv,STDOUT," ");
+        }
+
+      WriteString(theEnv,STDOUT,"Slot: ");
+
+      PrintUnsignedInteger(theEnv,STDOUT,patternPtr->whichSlot);
+      WriteString(theEnv,STDOUT," Field: ");
+      PrintUnsignedInteger(theEnv,STDOUT,patternPtr->whichField);
+      WriteString(theEnv,STDOUT," Expression: ");
+      if (patternPtr->networkTest == NULL) WriteString(theEnv,STDOUT,"None");
+      else PrintExpression(theEnv,STDOUT,patternPtr->networkTest);
+      WriteString(theEnv,STDOUT," RightHash: ");
+      if (patternPtr->header.rightHash == NULL) WriteString(theEnv,STDOUT,"None");
+      else PrintExpression(theEnv,STDOUT,patternPtr->header.rightHash);
+      WriteString(theEnv,STDOUT,"\n");
+
+      if (patternPtr->nextLevel == NULL)
+        {
+         while (patternPtr->rightNode == NULL)
+           {
+            patternPtr = patternPtr->lastLevel;
+            depth--;
+            if (patternPtr == NULL) return;
+           }
+         patternPtr = patternPtr->rightNode;
+        }
+      else
+        {
+         patternPtr = patternPtr->nextLevel;
+         depth++;
+        }
+     }
+  }
+
+#endif
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+
+/***************************************************
+  NAME         : PrintObjectPatternNetworkCommand
+  DESCRIPTION  : Displays an indented printout of
+                 the object pattern network
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Object pattern network displayed
+  NOTES        : None
+ ***************************************************/
+void PrintObjectPatternNetworkCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   char indentbuf[80];
+
+   indentbuf[0] = '\0';
+   PrintOPNLevel(theEnv,ObjectNetworkPointer(theEnv),indentbuf,0);
+  }
+
+/**********************************************************
+  NAME         : PrintOPNLevel
+  DESCRIPTION  : Recursivley prints object pattern network
+  INPUTS       : 1) The current object pattern network node
+                 2) A buffer holding preceding indentation
+                    text showing the level in the tree
+                 3) The length of the indentation text
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pattern nodes recursively printed
+  NOTES        : None
+ **********************************************************/
+static void PrintOPNLevel(
+  Environment *theEnv,
+  OBJECT_PATTERN_NODE *pptr,
+  char *indentbuf,
+  int ilen)
+  {
+   CLASS_BITMAP *cbmp;
+   SLOT_BITMAP *sbmp;
+   unsigned i;
+   OBJECT_PATTERN_NODE *uptr;
+   OBJECT_ALPHA_NODE *alphaPtr;
+
+   while (pptr != NULL)
+     {
+      WriteString(theEnv,STDOUT,indentbuf);
+      if (pptr->alphaNode != NULL)
+        WriteString(theEnv,STDOUT,"+");
+      WriteString(theEnv,STDOUT,FindIDSlotName(theEnv,pptr->slotNameID)->contents);
+      WriteString(theEnv,STDOUT," (");
+      PrintUnsignedInteger(theEnv,STDOUT,pptr->slotNameID);
+      WriteString(theEnv,STDOUT,") ");
+      WriteString(theEnv,STDOUT,pptr->endSlot ? "EPF#" : "PF#");
+      PrintUnsignedInteger(theEnv,STDOUT,pptr->whichField);
+      WriteString(theEnv,STDOUT," ");
+      WriteString(theEnv,STDOUT,pptr->multifieldNode ? "$? " : "? ");
+      if (pptr->networkTest != NULL)
+        PrintExpression(theEnv,STDOUT,pptr->networkTest);
+      WriteString(theEnv,STDOUT,"\n");
+      alphaPtr = pptr->alphaNode;
+      while (alphaPtr != NULL)
+        {
+         WriteString(theEnv,STDOUT,indentbuf);
+         WriteString(theEnv,STDOUT,"     Classes:");
+         cbmp = (CLASS_BITMAP *) alphaPtr->classbmp->contents;
+         for (i = 0 ; i <= cbmp->maxid ; i++)
+           if (TestBitMap(cbmp->map,i))
+             {
+              WriteString(theEnv,STDOUT," ");
+              WriteString(theEnv,STDOUT,DefclassName(DefclassData(theEnv)->ClassIDMap[i]));
+             }
+         if (alphaPtr->slotbmp != NULL)
+           {
+            sbmp = (SLOT_BITMAP *) alphaPtr->slotbmp->contents;
+            WriteString(theEnv,STDOUT," *** Slots:");
+            for (i = NAME_ID ; i <= sbmp->maxid ; i++)
+              if (TestBitMap(sbmp->map,i))
+                {
+                 for (uptr = pptr ; uptr != NULL ; uptr  = uptr->lastLevel)
+                   if (uptr->slotNameID == i)
+                     break;
+                 if (uptr == NULL)
+                   {
+                    WriteString(theEnv,STDOUT," ");
+                    WriteString(theEnv,STDOUT,FindIDSlotName(theEnv,i)->contents);
+                   }
+                }
+           }
+         if (alphaPtr->header.rightHash != NULL)
+           {
+            WriteString(theEnv,STDOUT," RH: ");
+            PrintExpression(theEnv,STDOUT,alphaPtr->header.rightHash);
+           }
+
+         WriteString(theEnv,STDOUT,"\n");
+         alphaPtr = alphaPtr->nxtInGroup;
+        }
+      indentbuf[ilen++] = (char) ((pptr->rightNode != NULL) ? '|' : ' ');
+      indentbuf[ilen++] = ' ';
+      indentbuf[ilen++] = ' ';
+      indentbuf[ilen] = '\0';
+      PrintOPNLevel(theEnv,pptr->nextLevel,indentbuf,ilen);
+      ilen -= 3;
+      indentbuf[ilen] = '\0';
+      pptr = pptr->rightNode;
+     }
+  }
+
+#endif
+
+#if OBJECT_SYSTEM
+
+/*******************************************************/
+/* InstanceTableUsageCommand: Prints information about */
+/*   the instances in the instance hash table.         */
+/*******************************************************/
+void InstanceTableUsageCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned long i;
+   int instanceCounts[COUNT_SIZE];
+   Instance *ins;
+   unsigned long instanceCount, totalInstanceCount = 0;
+
+   for (i = 0; i < COUNT_SIZE; i++)
+     { instanceCounts[i] = 0; }
+
+   /*======================================*/
+   /* Count entries in the instance table. */
+   /*======================================*/
+
+   for (i = 0; i < INSTANCE_TABLE_HASH_SIZE; i++)
+     {
+      instanceCount = 0;
+      for (ins = InstanceData(theEnv)->InstanceTable[i]; ins != NULL; ins = ins->nxtHash)
+        {
+         instanceCount++;
+         totalInstanceCount++;
+        }
+
+      if (instanceCount < (COUNT_SIZE - 1))
+        { instanceCounts[instanceCount]++; }
+      else
+        { instanceCounts[COUNT_SIZE - 1]++; }
+     }
+
+   /*========================*/
+   /* Print the information. */
+   /*========================*/
+
+   WriteString(theEnv,STDOUT,"Total Instances: ");
+   PrintUnsignedInteger(theEnv,STDOUT,totalInstanceCount);
+   WriteString(theEnv,STDOUT,"\n");
+   for (i = 0; i < COUNT_SIZE; i++)
+     {
+      PrintUnsignedInteger(theEnv,STDOUT,i);
+      WriteString(theEnv,STDOUT," ");
+      PrintUnsignedInteger(theEnv,STDOUT,instanceCounts[i]);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+  }
+
+#endif
+
+#if DEFRULE_CONSTRUCT
+
+/******************/
+/* ExamineMemory: */
+/******************/
+static void ExamineMemory(
+  Environment *theEnv,
+  struct joinNode *theJoin,
+  struct betaMemory *theMemory)
+  {
+#if MAC_XCD
+#pragma unused(theJoin)
+#endif
+   if (theMemory->size > 10000)
+     {
+      /* Set a break point here */
+     }
+  }
+
+/*************************/
+/* TraverseBetaMemories: */
+/*************************/
+static void TraverseBetaMemories(
+  Environment *theEnv,
+  struct joinNode *theJoin)
+  {
+   if (theJoin == NULL)
+     { return; }
+
+   if (theJoin->lastLevel != NULL)
+     { TraverseBetaMemories(theEnv,theJoin->lastLevel); }
+
+   if (theJoin->depth > 2)
+     { ExamineMemory(theEnv,theJoin,theJoin->leftMemory); }
+
+   if (theJoin->joinFromTheRight)
+     { TraverseBetaMemories(theEnv,(struct joinNode *) theJoin->rightSideEntryStructure); }
+
+   if ((theJoin->joinFromTheRight) &&
+       (((struct joinNode *) (theJoin->rightSideEntryStructure))->depth > 1))
+     { ExamineMemory(theEnv,theJoin,theJoin->rightMemory); }
+  }
+
+/***********************************/
+/* ValidateRuleBetaMemoriesAction: */
+/***********************************/
+static void ValidateRuleBetaMemoriesAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Defrule *rulePtr;
+
+   for (rulePtr = (Defrule *) theConstruct;
+        rulePtr != NULL;
+        rulePtr = rulePtr->disjunct)
+     {
+      TraverseBetaMemories(theEnv,rulePtr->lastJoin);
+     }
+  }
+
+/*******************************/
+/* ValidateBetaMemoriesCommand */
+/*******************************/
+void ValidateBetaMemoriesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   WriteString(theEnv,STDOUT,"ValidateBetaMemories");
+   DoForAllConstructs(theEnv,ValidateRuleBetaMemoriesAction,DefruleData(theEnv)->DefruleModuleIndex,false,NULL);
+  }
+
+#endif
+
+#endif
+
+
diff --git a/clips/developr.h b/clips/developr.h
new file mode 100755
index 000000000..7bad4bb65
--- /dev/null
+++ b/clips/developr.h
@@ -0,0 +1,69 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                 DEVELOPER HEADER FILE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*            Functions enable-gc-heuristics and             */
+/*            disable-gc-heuristics are no longer supported. */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_developr
+
+#pragma once
+
+#define _H_developr
+
+   void                           DeveloperCommands(Environment *);
+   void                           PrimitiveTablesInfoCommand(Environment *,UDFContext *,UDFValue *);
+   void                           PrimitiveTablesUsageCommand(Environment *,UDFContext *,UDFValue *);
+
+#if DEFRULE_CONSTRUCT && DEFTEMPLATE_CONSTRUCT
+   void                           ShowFactPatternNetworkCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ValidateFactIntegrityCommand(Environment *,UDFContext *,UDFValue *);
+#endif
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+   void                           PrintObjectPatternNetworkCommand(Environment *,UDFContext *,UDFValue *);
+#endif
+#if OBJECT_SYSTEM
+   void                           InstanceTableUsageCommand(Environment *,UDFContext *,UDFValue *);
+#endif
+#if DEFRULE_CONSTRUCT
+   void                           ValidateBetaMemoriesCommand(Environment *,UDFContext *,UDFValue *);
+#endif
+
+#endif /* _H_developr */
+
+
diff --git a/clips/dffctbin.c b/clips/dffctbin.c
new file mode 100755
index 000000000..cc48477db
--- /dev/null
+++ b/clips/dffctbin.c
@@ -0,0 +1,477 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*             DEFFACTS BSAVE/BLOAD MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for the  */
+/*    deffacts construct.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFFACTS_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+
+#include <stdio.h>
+
+#include "bload.h"
+#include "bsave.h"
+#include "dffctdef.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "moduldef.h"
+
+#include "dffctbin.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                    BsaveFind(Environment *);
+   static void                    BsaveExpressions(Environment *,FILE *);
+   static void                    BsaveStorage(Environment *,FILE *);
+   static void                    BsaveBinaryItem(Environment *,FILE *);
+#endif
+   static void                    BloadStorage(Environment *);
+   static void                    BloadBinaryItem(Environment *);
+   static void                    UpdateDeffactsModule(Environment *,void *,unsigned long);
+   static void                    UpdateDeffacts(Environment *,void *,unsigned long);
+   static void                    ClearBload(Environment *);
+   static void                    DeallocateDeffactsBloadData(Environment *);
+
+/********************************************/
+/* DeffactsBinarySetup: Installs the binary */
+/*   save/load feature for deffacts.        */
+/********************************************/
+void DeffactsBinarySetup(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,DFFCTBIN_DATA,sizeof(struct deffactsBinaryData),DeallocateDeffactsBloadData);
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"deffacts",0,BsaveFind,BsaveExpressions,
+                             BsaveStorage,BsaveBinaryItem,
+                             BloadStorage,BloadBinaryItem,
+                             ClearBload);
+#endif
+
+#if (BLOAD || BLOAD_ONLY)
+   AddBinaryItem(theEnv,"deffacts",0,NULL,NULL,NULL,NULL,
+                             BloadStorage,BloadBinaryItem,
+                             ClearBload);
+#endif
+  }
+
+/********************************************************/
+/* DeallocateDeffactsBloadData: Deallocates environment */
+/*    data for the deffacts bsave functionality.        */
+/********************************************************/
+static void DeallocateDeffactsBloadData(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   space = DeffactsBinaryData(theEnv)->NumberOfDeffacts * sizeof(Deffacts);
+   if (space != 0) genfree(theEnv,DeffactsBinaryData(theEnv)->DeffactsArray,space);
+
+   space = DeffactsBinaryData(theEnv)->NumberOfDeffactsModules * sizeof(struct deffactsModule);
+   if (space != 0) genfree(theEnv,DeffactsBinaryData(theEnv)->ModuleArray,space);
+  }
+
+#if BLOAD_AND_BSAVE
+
+/*********************************************************/
+/* BsaveFind: Counts the number of data structures which */
+/*   must be saved in the binary image for the deffacts  */
+/*   in the current environment.                         */
+/*********************************************************/
+static void BsaveFind(
+  Environment *theEnv)
+  {
+   Deffacts *theDeffacts;
+   Defmodule *theModule;
+
+   /*=======================================================*/
+   /* If a binary image is already loaded, then temporarily */
+   /* save the count values since these will be overwritten */
+   /* in the process of saving the binary image.            */
+   /*=======================================================*/
+
+   SaveBloadCount(theEnv,DeffactsBinaryData(theEnv)->NumberOfDeffactsModules);
+   SaveBloadCount(theEnv,DeffactsBinaryData(theEnv)->NumberOfDeffacts);
+
+   /*========================================*/
+   /* Set the count of deffacts and deffacts */
+   /* module data structures to zero.        */
+   /*========================================*/
+
+   DeffactsBinaryData(theEnv)->NumberOfDeffacts = 0;
+   DeffactsBinaryData(theEnv)->NumberOfDeffactsModules = 0;
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*===============================================*/
+      /* Set the current module to the module being    */
+      /* examined and increment the number of deffacts */
+      /* modules encountered.                          */
+      /*===============================================*/
+
+      SetCurrentModule(theEnv,theModule);
+      DeffactsBinaryData(theEnv)->NumberOfDeffactsModules++;
+
+      /*===================================================*/
+      /* Loop through each deffacts in the current module. */
+      /*===================================================*/
+
+      for (theDeffacts = GetNextDeffacts(theEnv,NULL);
+           theDeffacts != NULL;
+           theDeffacts = GetNextDeffacts(theEnv,theDeffacts))
+        {
+         /*======================================================*/
+         /* Initialize the construct header for the binary save. */
+         /*======================================================*/
+
+         MarkConstructHeaderNeededItems(&theDeffacts->header,DeffactsBinaryData(theEnv)->NumberOfDeffacts++);
+
+         /*============================================================*/
+         /* Count the number of expressions contained in the deffacts' */
+         /* assertion list and mark any atomic values contained there  */
+         /* as in use.                                                 */
+         /*============================================================*/
+
+         ExpressionData(theEnv)->ExpressionCount += ExpressionSize(theDeffacts->assertList);
+         MarkNeededItems(theEnv,theDeffacts->assertList);
+        }
+     }
+  }
+
+/************************************************/
+/* BsaveExpressions: Saves the expressions used */
+/*   by deffacts to the binary save file.       */
+/************************************************/
+static void BsaveExpressions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   Deffacts *theDeffacts;
+   Defmodule *theModule;
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*======================================================*/
+      /* Set the current module to the module being examined. */
+      /*======================================================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*==================================================*/
+      /* Loop through each deffacts in the current module */
+      /* and save the assertion list expression.          */
+      /*==================================================*/
+
+      for (theDeffacts = GetNextDeffacts(theEnv,NULL);
+           theDeffacts != NULL;
+           theDeffacts = GetNextDeffacts(theEnv,theDeffacts))
+        { BsaveExpression(theEnv,theDeffacts->assertList,fp); }
+     }
+  }
+
+/******************************************************/
+/* BsaveStorage: Writes out the storage requirements  */
+/*    for all deffacts structures to the binary file. */
+/******************************************************/
+static void BsaveStorage(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+
+   /*=================================================================*/
+   /* Only two data structures are saved as part of a deffacts binary */
+   /* image: the deffacts data structure and the deffactsModule data  */
+   /* structure. The assertion list expressions are not save with the */
+   /* deffacts portion of the binary image.                           */
+   /*=================================================================*/
+
+   space = sizeof(long) * 2;
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&DeffactsBinaryData(theEnv)->NumberOfDeffacts,sizeof(long),fp);
+   GenWrite(&DeffactsBinaryData(theEnv)->NumberOfDeffactsModules,sizeof(long),fp);
+  }
+
+/********************************************/
+/* BsaveBinaryItem: Writes out all deffacts */
+/*   structures to the binary file.         */
+/********************************************/
+static void BsaveBinaryItem(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   Deffacts *theDeffacts;
+   struct bsaveDeffacts newDeffacts;
+   Defmodule *theModule;
+   struct bsaveDeffactsModule tempDeffactsModule;
+   struct deffactsModule *theModuleItem;
+
+   /*=========================================================*/
+   /* Write out the amount of space taken up by the deffacts  */
+   /* and deffactsModule data structures in the binary image. */
+   /*=========================================================*/
+
+   space = DeffactsBinaryData(theEnv)->NumberOfDeffacts * sizeof(struct bsaveDeffacts) +
+           (DeffactsBinaryData(theEnv)->NumberOfDeffactsModules * sizeof(struct bsaveDeffactsModule));
+   GenWrite(&space,sizeof(size_t),fp);
+
+   /*================================================*/
+   /* Write out each deffacts module data structure. */
+   /*================================================*/
+
+   DeffactsBinaryData(theEnv)->NumberOfDeffacts = 0;
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      theModuleItem = (struct deffactsModule *) GetModuleItem(theEnv,NULL,DeffactsData(theEnv)->DeffactsModuleIndex);
+      AssignBsaveDefmdlItemHdrVals(&tempDeffactsModule.header,&theModuleItem->header);
+      GenWrite(&tempDeffactsModule,sizeof(struct bsaveDeffactsModule),fp);
+     }
+
+   /*==========================*/
+   /* Write out each deffacts. */
+   /*==========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      for (theDeffacts = GetNextDeffacts(theEnv,NULL);
+           theDeffacts != NULL;
+           theDeffacts = GetNextDeffacts(theEnv,theDeffacts))
+        {
+         AssignBsaveConstructHeaderVals(&newDeffacts.header,&theDeffacts->header);
+         if (theDeffacts->assertList != NULL)
+           {
+            newDeffacts.assertList = ExpressionData(theEnv)->ExpressionCount;
+            ExpressionData(theEnv)->ExpressionCount += ExpressionSize(theDeffacts->assertList);
+           }
+         else
+           { newDeffacts.assertList = ULONG_MAX; }
+
+         GenWrite(&newDeffacts,sizeof(struct bsaveDeffacts),fp);
+        }
+     }
+
+   /*=============================================================*/
+   /* If a binary image was already loaded when the bsave command */
+   /* was issued, then restore the counts indicating the number   */
+   /* of deffacts and deffacts modules in the binary image (these */
+   /* were overwritten by the binary save).                       */
+   /*=============================================================*/
+
+   RestoreBloadCount(theEnv,&DeffactsBinaryData(theEnv)->NumberOfDeffactsModules);
+   RestoreBloadCount(theEnv,&DeffactsBinaryData(theEnv)->NumberOfDeffacts);
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+/****************************************************/
+/* BloadStorage: Allocates storage requirements for */
+/*   the deffacts used by this binary image.        */
+/****************************************************/
+static void BloadStorage(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*=====================================================*/
+   /* Determine the number of deffacts and deffactsModule */
+   /* data structures to be read.                         */
+   /*=====================================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   GenReadBinary(theEnv,&DeffactsBinaryData(theEnv)->NumberOfDeffacts,sizeof(long));
+   GenReadBinary(theEnv,&DeffactsBinaryData(theEnv)->NumberOfDeffactsModules,sizeof(long));
+
+   /*===================================*/
+   /* Allocate the space needed for the */
+   /* deffactsModule data structures.   */
+   /*===================================*/
+
+   if (DeffactsBinaryData(theEnv)->NumberOfDeffactsModules == 0)
+     {
+      DeffactsBinaryData(theEnv)->DeffactsArray = NULL;
+      DeffactsBinaryData(theEnv)->ModuleArray = NULL;
+      return;
+     }
+
+   space = DeffactsBinaryData(theEnv)->NumberOfDeffactsModules * sizeof(struct deffactsModule);
+   DeffactsBinaryData(theEnv)->ModuleArray = (struct deffactsModule *) genalloc(theEnv,space);
+
+   /*===================================*/
+   /* Allocate the space needed for the */
+   /* deffacts data structures.         */
+   /*===================================*/
+
+   if (DeffactsBinaryData(theEnv)->NumberOfDeffacts == 0)
+     {
+      DeffactsBinaryData(theEnv)->DeffactsArray = NULL;
+      return;
+     }
+
+   space = (DeffactsBinaryData(theEnv)->NumberOfDeffacts * sizeof(Deffacts));
+   DeffactsBinaryData(theEnv)->DeffactsArray = (Deffacts *) genalloc(theEnv,space);
+  }
+
+/*****************************************************/
+/* BloadBinaryItem: Loads and refreshes the deffacts */
+/*   constructs used by this binary image.           */
+/*****************************************************/
+static void BloadBinaryItem(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*======================================================*/
+   /* Read in the amount of space used by the binary image */
+   /* (this is used to skip the construct in the event it  */
+   /* is not available in the version being run).          */
+   /*======================================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+
+   /*============================================*/
+   /* Read in the deffactsModule data structures */
+   /* and refresh the pointers.                  */
+   /*============================================*/
+
+   BloadandRefresh(theEnv,DeffactsBinaryData(theEnv)->NumberOfDeffactsModules,
+                   sizeof(struct bsaveDeffactsModule),UpdateDeffactsModule);
+
+   /*======================================*/
+   /* Read in the deffacts data structures */
+   /* and refresh the pointers.            */
+   /*======================================*/
+
+   BloadandRefresh(theEnv,DeffactsBinaryData(theEnv)->NumberOfDeffacts,
+                   sizeof(struct bsaveDeffacts),UpdateDeffacts);
+  }
+
+/***************************************************/
+/* UpdateDeffactsModule: Bload refresh routine for */
+/*   deffacts module data structures.              */
+/***************************************************/
+static void UpdateDeffactsModule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveDeffactsModule *bdmPtr;
+
+   bdmPtr = (struct bsaveDeffactsModule *) buf;
+   UpdateDefmoduleItemHeader(theEnv,&bdmPtr->header,&DeffactsBinaryData(theEnv)->ModuleArray[obji].header,
+                             sizeof(Deffacts),DeffactsBinaryData(theEnv)->DeffactsArray);
+  }
+
+/*********************************************/
+/* UpdateDeffacts: Bload refresh routine for */
+/*   deffacts data structures.               */
+/*********************************************/
+static void UpdateDeffacts(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveDeffacts *bdp;
+
+   bdp = (struct bsaveDeffacts *) buf;
+   UpdateConstructHeader(theEnv,&bdp->header,&DeffactsBinaryData(theEnv)->DeffactsArray[obji].header,
+                         DEFFACTS,sizeof(struct deffactsModule),DeffactsBinaryData(theEnv)->ModuleArray,
+                         sizeof(Deffacts),DeffactsBinaryData(theEnv)->DeffactsArray);
+   DeffactsBinaryData(theEnv)->DeffactsArray[obji].assertList = ExpressionPointer(bdp->assertList);
+  }
+
+/**************************************/
+/* ClearBload: Deffacts clear routine */
+/*   when a binary load is in effect. */
+/**************************************/
+static void ClearBload(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   size_t space;
+
+   /*=============================================*/
+   /* Decrement in use counters for atomic values */
+   /* contained in the construct headers.         */
+   /*=============================================*/
+
+   for (i = 0; i < DeffactsBinaryData(theEnv)->NumberOfDeffacts; i++)
+     { UnmarkConstructHeader(theEnv,&DeffactsBinaryData(theEnv)->DeffactsArray[i].header); }
+
+   /*=============================================================*/
+   /* Deallocate the space used for the deffacts data structures. */
+   /*=============================================================*/
+
+   space = DeffactsBinaryData(theEnv)->NumberOfDeffacts * sizeof(Deffacts);
+   if (space != 0) genfree(theEnv,DeffactsBinaryData(theEnv)->DeffactsArray,space);
+   DeffactsBinaryData(theEnv)->NumberOfDeffacts = 0;
+
+   /*====================================================================*/
+   /* Deallocate the space used for the deffacts module data structures. */
+   /*====================================================================*/
+
+   space = DeffactsBinaryData(theEnv)->NumberOfDeffactsModules * sizeof(struct deffactsModule);
+   if (space != 0) genfree(theEnv,DeffactsBinaryData(theEnv)->ModuleArray,space);
+   DeffactsBinaryData(theEnv)->NumberOfDeffactsModules = 0;
+  }
+
+/******************************************************/
+/* BloadDeffactsModuleReference: Returns the deffacts */
+/*   module pointer for use with the bload function.  */
+/******************************************************/
+void *BloadDeffactsModuleReference(
+  Environment *theEnv,
+  unsigned long theIndex)
+  {
+   return (void *) &DeffactsBinaryData(theEnv)->ModuleArray[theIndex];
+  }
+
+#endif /* DEFFACTS_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME) */
+
+
diff --git a/clips/dffctbin.h b/clips/dffctbin.h
new file mode 100755
index 000000000..3571e2672
--- /dev/null
+++ b/clips/dffctbin.h
@@ -0,0 +1,76 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*           DEFFACTS BSAVE/BLOAD HEADER FILE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffctbin
+
+#pragma once
+
+#define _H_dffctbin
+
+#if (! RUN_TIME)
+
+#include "constrct.h"
+#include "cstrcbin.h"
+#include "dffctdef.h"
+#include "modulbin.h"
+
+struct bsaveDeffacts
+  {
+   struct bsaveConstructHeader header;
+   unsigned long assertList;
+  };
+
+struct bsaveDeffactsModule
+  {
+   struct bsaveDefmoduleItemHeader header;
+  };
+
+#define DFFCTBIN_DATA 26
+
+struct deffactsBinaryData
+  {
+   Deffacts *DeffactsArray;
+   unsigned long NumberOfDeffacts;
+   struct deffactsModule *ModuleArray;
+   unsigned long NumberOfDeffactsModules;
+  };
+
+#define DeffactsBinaryData(theEnv) ((struct deffactsBinaryData *) GetEnvironmentData(theEnv,DFFCTBIN_DATA))
+
+   void                           DeffactsBinarySetup(Environment *);
+   void                          *BloadDeffactsModuleReference(Environment *,unsigned long);
+
+#endif /* (! RUN_TIME) */
+
+#endif /* _H_dffctbin */
+
+
+
+
diff --git a/clips/dffctbsc.c b/clips/dffctbsc.c
new file mode 100755
index 000000000..3e291961d
--- /dev/null
+++ b/clips/dffctbsc.c
@@ -0,0 +1,308 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*         DEFFACTS BASIC COMMANDS HEADER FILE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements core commands for the deffacts        */
+/*   construct such as clear, reset, save, undeffacts,       */
+/*   ppdeffacts, list-deffacts, and get-deffacts-list.       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed initial-fact support.                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFFACTS_CONSTRUCT
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "constrct.h"
+#include "cstrccom.h"
+#include "cstrcpsr.h"
+#include "dffctdef.h"
+#include "dffctpsr.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "factrhs.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "router.h"
+#include "scanner.h"
+#include "tmpltdef.h"
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "dffctbin.h"
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "dffctcmp.h"
+#endif
+
+#include "dffctbsc.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ResetDeffacts(Environment *,void *);
+   static void                    SaveDeffacts(Environment *,Defmodule *,const char *,void *);
+   static void                    ResetDeffactsAction(Environment *,ConstructHeader *,void *);
+
+/***************************************************************/
+/* DeffactsBasicCommands: Initializes basic deffacts commands. */
+/***************************************************************/
+void DeffactsBasicCommands(
+  Environment *theEnv)
+  {
+   AddResetFunction(theEnv,"deffacts",ResetDeffacts,0,NULL);
+   AddSaveFunction(theEnv,"deffacts",SaveDeffacts,10,NULL);
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"get-deffacts-list","m",0,1,"y",GetDeffactsListFunction,"GetDeffactsListFunction",NULL);
+   AddUDF(theEnv,"undeffacts","v",1,1,"y",UndeffactsCommand,"UndeffactsCommand",NULL);
+   AddUDF(theEnv,"deffacts-module","y",1,1,"y",DeffactsModuleFunction,"DeffactsModuleFunction",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"list-deffacts","v",0,1,"y",ListDeffactsCommand,"ListDeffactsCommand",NULL);
+   AddUDF(theEnv,"ppdeffacts","vs",1,2,";y;ldsyn",PPDeffactsCommand,"PPDeffactsCommand",NULL);
+#endif
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+   DeffactsBinarySetup(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   DeffactsCompilerSetup(theEnv);
+#endif
+
+#endif
+  }
+
+/**********************************************************/
+/* ResetDeffacts: Deffacts reset routine for use with the */
+/*   reset command. Asserts all of the facts contained in */
+/*   deffacts constructs.                                 */
+/**********************************************************/
+static void ResetDeffacts(
+  Environment *theEnv,
+  void *context)
+  {
+   DoForAllConstructs(theEnv,
+                      ResetDeffactsAction,
+                      DeffactsData(theEnv)->DeffactsModuleIndex,
+                      true,NULL);
+  }
+
+/*****************************************************/
+/* ResetDeffactsAction: Action to be applied to each */
+/*   deffacts construct during a reset command.      */
+/*****************************************************/
+static void ResetDeffactsAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   UDFValue returnValue;
+   Deffacts *theDeffacts = (Deffacts *) theConstruct;
+
+   if (theDeffacts->assertList == NULL) return;
+
+   SetEvaluationError(theEnv,false);
+
+   EvaluateExpression(theEnv,theDeffacts->assertList,&returnValue);
+  }
+
+/***************************************/
+/* SaveDeffacts: Deffacts save routine */
+/*   for use with the save command.    */
+/***************************************/
+static void SaveDeffacts(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logicalName,
+  void *context)
+  {
+   SaveConstruct(theEnv,theModule,logicalName,DeffactsData(theEnv)->DeffactsConstruct);
+  }
+
+/*******************************************/
+/* UndeffactsCommand: H/L access routine   */
+/*   for the undeffacts command.           */
+/*******************************************/
+void UndeffactsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UndefconstructCommand(context,"undeffacts",DeffactsData(theEnv)->DeffactsConstruct);
+  }
+
+/*********************************/
+/* Undeffacts: C access routine  */
+/*   for the undeffacts command. */
+/*********************************/
+bool Undeffacts(
+  Deffacts *theDeffacts,
+  Environment *allEnv)
+  {
+   Environment *theEnv;
+   
+   if (theDeffacts == NULL)
+     {
+      theEnv = allEnv;
+      return Undefconstruct(theEnv,NULL,DeffactsData(theEnv)->DeffactsConstruct);
+     }
+   else
+     {
+      theEnv = theDeffacts->header.env;
+      return Undefconstruct(theEnv,&theDeffacts->header,DeffactsData(theEnv)->DeffactsConstruct);
+     }
+  }
+
+/*************************************************/
+/* GetDeffactsListFunction: H/L access routine   */
+/*   for the get-deffacts-list function.         */
+/*************************************************/
+void GetDeffactsListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   GetConstructListFunction(context,returnValue,DeffactsData(theEnv)->DeffactsConstruct);
+  }
+
+/*****************************************/
+/* GetDeffactsList: C access routine     */
+/*   for the get-deffacts-list function. */
+/*****************************************/
+void GetDeffactsList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defmodule *theModule)
+  {
+   UDFValue result;
+   
+   GetConstructList(theEnv,&result,DeffactsData(theEnv)->DeffactsConstruct,theModule);
+   NormalizeMultifield(theEnv,&result);
+   returnValue->value = result.value;
+  }
+
+/************************************************/
+/* DeffactsModuleFunction: H/L access routine   */
+/*   for the deffacts-module function.          */
+/************************************************/
+void DeffactsModuleFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->value = GetConstructModuleCommand(context,"deffacts-module",DeffactsData(theEnv)->DeffactsConstruct);
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/*******************************************/
+/* PPDeffactsCommand: H/L access routine   */
+/*   for the ppdeffacts command.           */
+/*******************************************/
+void PPDeffactsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PPConstructCommand(context,"ppdeffacts",DeffactsData(theEnv)->DeffactsConstruct,returnValue);
+  }
+
+/************************************/
+/* PPDeffacts: C access routine for */
+/*   the ppdeffacts command.        */
+/************************************/
+bool PPDeffacts(
+  Environment *theEnv,
+  const char *deffactsName,
+  const char *logicalName)
+  {
+   return(PPConstruct(theEnv,deffactsName,logicalName,DeffactsData(theEnv)->DeffactsConstruct));
+  }
+
+/*********************************************/
+/* ListDeffactsCommand: H/L access routine   */
+/*   for the list-deffacts command.          */
+/*********************************************/
+void ListDeffactsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListConstructCommand(context,DeffactsData(theEnv)->DeffactsConstruct);
+  }
+
+/************************************/
+/* ListDeffacts: C access routine   */
+/*   for the list-deffacts command. */
+/************************************/
+void ListDeffacts(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListConstruct(theEnv,DeffactsData(theEnv)->DeffactsConstruct,logicalName,theModule);
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#endif /* DEFFACTS_CONSTRUCT */
+
+
diff --git a/clips/dffctbsc.h b/clips/dffctbsc.h
new file mode 100755
index 000000000..afc562f25
--- /dev/null
+++ b/clips/dffctbsc.h
@@ -0,0 +1,72 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*         DEFFACTS BASIC COMMANDS HEADER FILE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements core commands for the deffacts        */
+/*   construct such as clear, reset, save, undeffacts,       */
+/*   ppdeffacts, list-deffacts, and get-deffacts-list.       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffctbsc
+
+#pragma once
+
+#define _H_dffctbsc
+
+#include "dffctdef.h"
+#include "evaluatn.h"
+
+   void                           DeffactsBasicCommands(Environment *);
+   void                           UndeffactsCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           Undeffacts(Deffacts *,Environment *);
+   void                           GetDeffactsListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetDeffactsList(Environment *,CLIPSValue *,Defmodule *);
+   void                           DeffactsModuleFunction(Environment *,UDFContext *,UDFValue *);
+   void                           PPDeffactsCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           PPDeffacts(Environment *,const char *,const char *);
+   void                           ListDeffactsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ListDeffacts(Environment *,const char *,Defmodule *);
+
+#endif /* _H_dffctbsc */
+
diff --git a/clips/dffctcmp.c b/clips/dffctcmp.c
new file mode 100755
index 000000000..f8e984b09
--- /dev/null
+++ b/clips/dffctcmp.c
@@ -0,0 +1,297 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*            DEFFACTS CONSTRUCTS-TO-C MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for the   */
+/*    deffacts construct.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFFACTS_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include <stdio.h>
+
+#include "conscomp.h"
+#include "dffctdef.h"
+#include "envrnmnt.h"
+
+#include "dffctcmp.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    ConstructToCode(Environment *,const char *,const char *,char *,
+                                                  unsigned int,FILE *,unsigned int,unsigned int);
+   static void                    DeffactsToCode(Environment *,FILE *,Deffacts *,
+                                                 unsigned int,unsigned int,unsigned int);
+   static void                    DeffactsModuleToCode(Environment *,FILE *,Defmodule *,
+                                                       unsigned int,unsigned int,unsigned int);
+   static void                    CloseDeffactsFiles(Environment *,FILE *,FILE *,unsigned int);
+   static void                    BeforeDeffactsToCode(Environment *);
+   static void                    InitDeffactsCode(Environment *,FILE *,unsigned,unsigned int);
+
+/*************************************************************/
+/* DeffactsCompilerSetup: Initializes the deffacts construct */
+/*    for use with the constructs-to-c command.              */
+/*************************************************************/
+void DeffactsCompilerSetup(
+  Environment *theEnv)
+  {
+   DeffactsData(theEnv)->DeffactsCodeItem =
+      AddCodeGeneratorItem(theEnv,"deffacts",0,BeforeDeffactsToCode,
+                           InitDeffactsCode,ConstructToCode,2);
+  }
+
+/*************************************************************/
+/* BeforeDeffactsToCode: Assigns each deffacts a unique ID   */
+/*   which will be used for pointer references when the data */
+/*   structures are written to a file as C code              */
+/*************************************************************/
+static void BeforeDeffactsToCode(
+  Environment *theEnv)
+  {
+   MarkConstructBsaveIDs(theEnv,DeffactsData(theEnv)->DeffactsModuleIndex);
+  }
+
+/***********************************************/
+/* InitDeffactsCode: Writes out initialization */
+/*   code for deffacts for a run-time module.  */
+/***********************************************/
+static void InitDeffactsCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned imageID,
+  unsigned maxIndices)
+  {
+#if MAC_XCD
+#pragma unused(maxIndices)
+#pragma unused(imageID)
+#pragma unused(theEnv)
+#endif
+   fprintf(initFP,"   DeffactsRunTimeInitialize(theEnv);\n");
+  }
+
+/**********************************************************/
+/* ConstructToCode: Produces deffacts code for a run-time */
+/*   module created using the constructs-to-c function.   */
+/**********************************************************/
+static bool ConstructToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int fileCount = 1;
+   Defmodule *theModule;
+   Deffacts *theDeffacts;
+   unsigned int moduleCount = 0, moduleArrayCount = 0, moduleArrayVersion = 1;
+   unsigned int deffactsArrayCount = 0, deffactsArrayVersion = 1;
+   FILE *moduleFile = NULL, *deffactsFile = NULL;
+
+   /*===============================================*/
+   /* Include the appropriate deffacts header file. */
+   /*===============================================*/
+
+   fprintf(headerFP,"#include \"dffctdef.h\"\n");
+
+   /*=================================================================*/
+   /* Loop through all the modules and all the deffacts writing their */
+   /* C code representation to the file as they are traversed.        */
+   /*=================================================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      moduleFile = OpenFileIfNeeded(theEnv,moduleFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                    moduleArrayVersion,headerFP,
+                                    "struct deffactsModule",ModulePrefix(DeffactsData(theEnv)->DeffactsCodeItem),
+                                    false,NULL);
+
+      if (moduleFile == NULL)
+        {
+         CloseDeffactsFiles(theEnv,moduleFile,deffactsFile,maxIndices);
+         return false;
+        }
+
+      DeffactsModuleToCode(theEnv,moduleFile,theModule,imageID,maxIndices,moduleCount);
+      moduleFile = CloseFileIfNeeded(theEnv,moduleFile,&moduleArrayCount,&moduleArrayVersion,
+                                     maxIndices,NULL,NULL);
+
+      /*===================================================*/
+      /* Loop through each of the deffacts in this module. */
+      /*===================================================*/
+
+      for (theDeffacts = GetNextDeffacts(theEnv,NULL);
+           theDeffacts != NULL;
+           theDeffacts = GetNextDeffacts(theEnv,theDeffacts))
+        {
+         deffactsFile = OpenFileIfNeeded(theEnv,deffactsFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                         deffactsArrayVersion,headerFP,
+                                         "Deffacts",ConstructPrefix(DeffactsData(theEnv)->DeffactsCodeItem),
+                                         false,NULL);
+         if (deffactsFile == NULL)
+           {
+            CloseDeffactsFiles(theEnv,moduleFile,deffactsFile,maxIndices);
+            return false;
+           }
+
+         DeffactsToCode(theEnv,deffactsFile,theDeffacts,imageID,maxIndices,moduleCount);
+         deffactsArrayCount++;
+         deffactsFile = CloseFileIfNeeded(theEnv,deffactsFile,&deffactsArrayCount,
+                                          &deffactsArrayVersion,maxIndices,NULL,NULL);
+        }
+
+      moduleCount++;
+      moduleArrayCount++;
+     }
+
+   CloseDeffactsFiles(theEnv,moduleFile,deffactsFile,maxIndices);
+
+   return true;
+  }
+
+/*********************************************************/
+/* CloseDeffactsFiles: Closes all of the C files created */
+/*   for deffacts. Called when an error occurs or when   */
+/*   the deffacts have all been written to the files.    */
+/*********************************************************/
+static void CloseDeffactsFiles(
+  Environment *theEnv,
+  FILE *moduleFile,
+  FILE *deffactsFile,
+  unsigned maxIndices)
+  {
+   unsigned int count = maxIndices;
+   unsigned int arrayVersion = 0;
+
+   if (deffactsFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,deffactsFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+
+   if (moduleFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,moduleFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+  }
+
+/**********************************************************/
+/* DeffactsModuleToCode: Writes the C code representation */
+/*   of a single deffacts module to the specified file.   */
+/**********************************************************/
+static void DeffactsModuleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount)
+  {
+#if MAC_XCD
+#pragma unused(moduleCount)
+#endif
+
+   fprintf(theFile,"{");
+
+   ConstructModuleToCode(theEnv,theFile,theModule,imageID,maxIndices,
+                                  DeffactsData(theEnv)->DeffactsModuleIndex,
+                                  ConstructPrefix(DeffactsData(theEnv)->DeffactsCodeItem));
+
+   fprintf(theFile,"}");
+  }
+
+/*********************************************************/
+/* DeffactsToCode: Writes the C code representation of a */
+/*   single deffacts construct to the specified file.    */
+/*********************************************************/
+static void DeffactsToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Deffacts *theDeffacts,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount)
+  {
+   /*=================*/
+   /* Deffacts Header */
+   /*=================*/
+
+   fprintf(theFile,"{");
+
+   ConstructHeaderToCode(theEnv,theFile,&theDeffacts->header,imageID,maxIndices,
+                         moduleCount,ModulePrefix(DeffactsData(theEnv)->DeffactsCodeItem),
+                         ConstructPrefix(DeffactsData(theEnv)->DeffactsCodeItem));
+
+   fprintf(theFile,",");
+
+   /*=============*/
+   /* Assert List */
+   /*=============*/
+
+   ExpressionToCode(theEnv,theFile,theDeffacts->assertList);
+   fprintf(theFile,"}");
+  }
+
+/**************************************************************/
+/* DeffactsCModuleReference: Writes the C code representation */
+/*   of a reference to a deffacts module data structure.      */
+/**************************************************************/
+void DeffactsCModuleReference(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned long count,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"MIHS &%s%u_%lu[%lu]",
+                      ModulePrefix(DeffactsData(theEnv)->DeffactsCodeItem),
+                      imageID,
+                      (count / maxIndices) + 1,
+                      (count % maxIndices));
+  }
+
+#endif /* DEFFACTS_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME) */
+
+
diff --git a/clips/dffctcmp.h b/clips/dffctcmp.h
new file mode 100755
index 000000000..8bbab4102
--- /dev/null
+++ b/clips/dffctcmp.h
@@ -0,0 +1,44 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*        DEFFACTS CONSTRUCT COMPILER HEADER FILE      */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffctcmp
+
+#pragma once
+
+#define _H_dffctcmp
+
+   void                           DeffactsCompilerSetup(Environment *);
+   void                           DeffactsCModuleReference(Environment *,FILE *,unsigned long,unsigned int,unsigned int);
+
+#endif /* _H_dffctcmp */
diff --git a/clips/dffctdef.c b/clips/dffctdef.c
new file mode 100755
index 000000000..5c4565900
--- /dev/null
+++ b/clips/dffctdef.c
@@ -0,0 +1,364 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/06/16             */
+   /*                                                     */
+   /*              DEFFACTS DEFINITION MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Defines basic deffacts primitive functions such  */
+/*   as allocating and deallocating, traversing, and finding */
+/*   deffacts data structures.                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warning.                              */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFFACTS_CONSTRUCT
+
+#include <stdio.h>
+
+#include "dffctbsc.h"
+#include "dffctpsr.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#include "dffctbin.h"
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "dffctcmp.h"
+#endif
+
+#include "dffctdef.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                   *AllocateModule(Environment *);
+   static void                    ReturnModule(Environment *,void *);
+   static void                    ReturnDeffacts(Environment *,Deffacts *);
+   static void                    InitializeDeffactsModules(Environment *);
+   static void                    DeallocateDeffactsData(Environment *);
+#if ! RUN_TIME
+   static void                    DestroyDeffactsAction(Environment *,ConstructHeader *,void *);
+#else
+   static void                    RuntimeDeffactsAction(Environment *,ConstructHeader *,void *);
+#endif
+
+/***********************************************************/
+/* InitializeDeffacts: Initializes the deffacts construct. */
+/***********************************************************/
+void InitializeDeffacts(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,DEFFACTS_DATA,sizeof(struct deffactsData),DeallocateDeffactsData);
+
+   InitializeDeffactsModules(theEnv);
+
+   DeffactsBasicCommands(theEnv);
+
+   DeffactsData(theEnv)->DeffactsConstruct =
+      AddConstruct(theEnv,"deffacts","deffacts",ParseDeffacts,
+                   (FindConstructFunction *) FindDeffacts,
+                   GetConstructNamePointer,GetConstructPPForm,
+                   GetConstructModuleItem,
+                   (GetNextConstructFunction *) GetNextDeffacts,
+                   SetNextConstruct,
+                   (IsConstructDeletableFunction *) DeffactsIsDeletable,
+                   (DeleteConstructFunction *) Undeffacts,
+                   (FreeConstructFunction *) ReturnDeffacts);
+  }
+
+/***************************************************/
+/* DeallocateDeffactsData: Deallocates environment */
+/*    data for the deffacts construct.             */
+/***************************************************/
+static void DeallocateDeffactsData(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   struct deffactsModule *theModuleItem;
+   Defmodule *theModule;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv)) return;
+#endif
+
+   DoForAllConstructs(theEnv,
+                      DestroyDeffactsAction,
+                      DeffactsData(theEnv)->DeffactsModuleIndex,
+                      false,NULL);
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      theModuleItem = (struct deffactsModule *)
+                      GetModuleItem(theEnv,theModule,
+                                    DeffactsData(theEnv)->DeffactsModuleIndex);
+      rtn_struct(theEnv,deffactsModule,theModuleItem);
+     }
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+#if ! RUN_TIME
+/*********************************************************/
+/* DestroyDeffactsAction: Action used to remove deffacts */
+/*   as a result of DestroyEnvironment.                  */
+/*********************************************************/
+static void DestroyDeffactsAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   Deffacts *theDeffacts = (Deffacts *) theConstruct;
+
+   if (theDeffacts == NULL) return;
+
+   ReturnPackedExpression(theEnv,theDeffacts->assertList);
+
+   DestroyConstructHeader(theEnv,&theDeffacts->header);
+
+   rtn_struct(theEnv,deffacts,theDeffacts);
+#else
+#if MAC_XCD
+#pragma unused(theEnv,theConstruct)
+#endif
+#endif
+  }
+#endif
+
+#if RUN_TIME
+
+/***********************************************/
+/* RuntimeDeffactsAction: Action to be applied */
+/*   to each deffacts construct when a runtime */
+/*   initialization occurs.                    */
+/***********************************************/
+static void RuntimeDeffactsAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Deffacts *theDeffacts = (Deffacts *) theConstruct;
+   
+   theDeffacts->header.env = theEnv;
+  }
+
+/******************************/
+/* DeffactsRunTimeInitialize: */
+/******************************/
+void DeffactsRunTimeInitialize(
+  Environment *theEnv)
+  {
+   DoForAllConstructs(theEnv,RuntimeDeffactsAction,DeffactsData(theEnv)->DeffactsModuleIndex,true,NULL);
+  }
+
+#endif
+
+/*******************************************************/
+/* InitializeDeffactsModules: Initializes the deffacts */
+/*   construct for use with the defmodule construct.   */
+/*******************************************************/
+static void InitializeDeffactsModules(
+  Environment *theEnv)
+  {
+   DeffactsData(theEnv)->DeffactsModuleIndex =
+      RegisterModuleItem(theEnv,"deffacts",
+                         AllocateModule,
+                         ReturnModule,
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+                         BloadDeffactsModuleReference,
+#else
+                         NULL,
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+                         DeffactsCModuleReference,
+#else
+                         NULL,
+#endif
+                         (FindConstructFunction *) FindDeffactsInModule);
+  }
+
+/************************************************/
+/* AllocateModule: Allocates a deffacts module. */
+/************************************************/
+static void *AllocateModule(
+  Environment *theEnv)
+  {
+   return((void *) get_struct(theEnv,deffactsModule));
+  }
+
+/************************************************/
+/* ReturnModule: Deallocates a deffacts module. */
+/************************************************/
+static void ReturnModule(
+  Environment *theEnv,
+  void *theItem)
+  {
+   FreeConstructHeaderModule(theEnv,(struct defmoduleItemHeader *) theItem,DeffactsData(theEnv)->DeffactsConstruct);
+   rtn_struct(theEnv,deffactsModule,theItem);
+  }
+
+/*************************************************************/
+/* GetDeffactsModuleItem: Returns a pointer to the defmodule */
+/*  item for the specified deffacts or defmodule.            */
+/*************************************************************/
+struct deffactsModule *GetDeffactsModuleItem(
+  Environment *theEnv,
+  Defmodule *theModule)
+  {
+   return((struct deffactsModule *) GetConstructModuleItemByIndex(theEnv,theModule,DeffactsData(theEnv)->DeffactsModuleIndex));
+  }
+
+/************************************************/
+/* FindDeffacts: Searches for a deffact in the  */
+/*   list of deffacts. Returns a pointer to the */
+/*   deffact if found, otherwise NULL.          */
+/************************************************/
+Deffacts *FindDeffacts(
+  Environment *theEnv,
+  const char *deffactsName)
+  {
+   return (Deffacts *) FindNamedConstructInModuleOrImports(theEnv,deffactsName,DeffactsData(theEnv)->DeffactsConstruct);
+  }
+
+/************************************************/
+/* FindDeffactsInModule: Searches for a deffact */
+/*   in the list of deffacts. Returns a pointer */
+/*   to the deffact if found, otherwise NULL.   */
+/************************************************/
+Deffacts *FindDeffactsInModule(
+  Environment *theEnv,
+  const char *deffactsName)
+  {
+   return (Deffacts *) FindNamedConstructInModule(theEnv,deffactsName,DeffactsData(theEnv)->DeffactsConstruct);
+  }
+
+/*********************************************************/
+/* GetNextDeffacts: If passed a NULL pointer, returns    */
+/*   the first deffacts in the ListOfDeffacts. Otherwise */
+/*   returns the next deffacts following the deffacts    */
+/*   passed as an argument.                              */
+/*********************************************************/
+Deffacts *GetNextDeffacts(
+  Environment *theEnv,
+  Deffacts *deffactsPtr)
+  {
+   return (Deffacts *) GetNextConstructItem(theEnv,&deffactsPtr->header,DeffactsData(theEnv)->DeffactsModuleIndex);
+  }
+
+/*******************************************************/
+/* DeffactsIsDeletable: Returns true if a particular   */
+/*   deffacts can be deleted, otherwise returns false. */
+/*******************************************************/
+bool DeffactsIsDeletable(
+  Deffacts *theDeffacts)
+  {
+   Environment *theEnv = theDeffacts->header.env;
+
+   if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   if (ConstructData(theEnv)->ResetInProgress) return false;
+
+   return true;
+  }
+
+/***********************************************************/
+/* ReturnDeffacts: Returns the data structures associated  */
+/*   with a deffacts construct to the pool of free memory. */
+/***********************************************************/
+static void ReturnDeffacts(
+  Environment *theEnv,
+  Deffacts *theDeffacts)
+  {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   if (theDeffacts == NULL) return;
+
+   ExpressionDeinstall(theEnv,theDeffacts->assertList);
+   ReturnPackedExpression(theEnv,theDeffacts->assertList);
+
+   DeinstallConstructHeader(theEnv,&theDeffacts->header);
+
+   rtn_struct(theEnv,deffacts,theDeffacts);
+#endif
+  }
+
+/*##################################*/
+/* Additional Environment Functions */
+/*##################################*/
+
+const char *DeffactsModule(
+  Deffacts *theDeffacts)
+  {
+   return GetConstructModuleName(&theDeffacts->header);
+  }
+
+const char *DeffactsName(
+  Deffacts *theDeffacts)
+  {
+   return GetConstructNameString(&theDeffacts->header);
+  }
+
+const char *DeffactsPPForm(
+  Deffacts *theDeffacts)
+  {
+   return GetConstructPPForm(&theDeffacts->header);
+  }
+
+
+#endif /* DEFFACTS_CONSTRUCT */
+
+
diff --git a/clips/dffctdef.h b/clips/dffctdef.h
new file mode 100755
index 000000000..b37d154da
--- /dev/null
+++ b/clips/dffctdef.h
@@ -0,0 +1,104 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/06/16            */
+   /*                                                     */
+   /*                DEFFACTS HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffctdef
+
+#pragma once
+
+#define _H_dffctdef
+
+typedef struct deffacts Deffacts;
+
+#include "constrct.h"
+#include "conscomp.h"
+#include "cstrccom.h"
+#include "evaluatn.h"
+#include "expressn.h"
+#include "moduldef.h"
+#include "symbol.h"
+
+#define DEFFACTS_DATA 0
+
+struct deffactsData
+  {
+   Construct *DeffactsConstruct;
+   unsigned DeffactsModuleIndex;
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   struct CodeGeneratorItem *DeffactsCodeItem;
+#endif
+  };
+
+struct deffacts
+  {
+   ConstructHeader header;
+   struct expr *assertList;
+  };
+
+struct deffactsModule
+  {
+   struct defmoduleItemHeader header;
+  };
+
+#define DeffactsData(theEnv) ((struct deffactsData *) GetEnvironmentData(theEnv,DEFFACTS_DATA))
+
+   void                           InitializeDeffacts(Environment *);
+   Deffacts                      *FindDeffacts(Environment *,const char *);
+   Deffacts                      *FindDeffactsInModule(Environment *,const char *);
+   Deffacts                      *GetNextDeffacts(Environment *,Deffacts *);
+   void                           CreateInitialFactDeffacts(void);
+   bool                           DeffactsIsDeletable(Deffacts *);
+   struct deffactsModule         *GetDeffactsModuleItem(Environment *,Defmodule *);
+   const char                    *DeffactsModule(Deffacts *);
+   const char                    *DeffactsName(Deffacts *);
+   const char                    *DeffactsPPForm(Deffacts *);
+#if RUN_TIME
+   void                           DeffactsRunTimeInitialize(Environment *);
+#endif
+
+#endif /* _H_dffctdef */
+
+
diff --git a/clips/dffctpsr.c b/clips/dffctpsr.c
new file mode 100755
index 000000000..719ce7cc0
--- /dev/null
+++ b/clips/dffctpsr.c
@@ -0,0 +1,179 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                DEFFACTS PARSER MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parses a deffacts construct.                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFFACTS_CONSTRUCT
+
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#include "cstrcpsr.h"
+#include "dffctbsc.h"
+#include "dffctdef.h"
+#include "envrnmnt.h"
+#include "factrhs.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "dffctpsr.h"
+
+/************************************************************/
+/* ParseDeffacts: Coordinates all actions necessary for the */
+/*   addition of a deffacts construct into the current      */
+/*   environment. Called when parsing a construct after the */
+/*   deffacts keyword has been found.                       */
+/************************************************************/
+bool ParseDeffacts(
+  Environment *theEnv,
+  const char *readSource)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   CLIPSLexeme *deffactsName;
+   struct expr *temp;
+   Deffacts *newDeffacts;
+   bool deffactsError;
+   struct token inputToken;
+
+   /*=========================*/
+   /* Parsing initialization. */
+   /*=========================*/
+
+   deffactsError = false;
+   SetPPBufferStatus(theEnv,true);
+
+   FlushPPBuffer(theEnv);
+   SetIndentDepth(theEnv,3);
+   SavePPBuffer(theEnv,"(deffacts ");
+
+   /*==========================================================*/
+   /* Deffacts can not be added when a binary image is loaded. */
+   /*==========================================================*/
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv) == true) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"deffacts");
+      return true;
+     }
+#endif
+
+   /*============================*/
+   /* Parse the deffacts header. */
+   /*============================*/
+
+   deffactsName = GetConstructNameAndComment(theEnv,readSource,&inputToken,"deffacts",
+                                             (FindConstructFunction *) FindDeffactsInModule,
+                                             (DeleteConstructFunction *) Undeffacts,"$",true,
+                                             true,true,false);
+   if (deffactsName == NULL) { return true; }
+
+   /*===============================================*/
+   /* Parse the list of facts in the deffacts body. */
+   /*===============================================*/
+
+   temp = BuildRHSAssert(theEnv,readSource,&inputToken,&deffactsError,false,false,"deffacts");
+
+   if (deffactsError == true) { return true; }
+
+   if (ExpressionContainsVariables(temp,false))
+     {
+      LocalVariableErrorMessage(theEnv,"a deffacts construct");
+      ReturnExpression(theEnv,temp);
+      return true;
+     }
+
+   SavePPBuffer(theEnv,"\n");
+
+   /*==============================================*/
+   /* If we're only checking syntax, don't add the */
+   /* successfully parsed deffacts to the KB.      */
+   /*==============================================*/
+
+   if (ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      ReturnExpression(theEnv,temp);
+      return false;
+     }
+
+   /*==========================*/
+   /* Create the new deffacts. */
+   /*==========================*/
+
+   ExpressionInstall(theEnv,temp);
+   newDeffacts = get_struct(theEnv,deffacts);
+   IncrementLexemeCount(deffactsName);
+   InitializeConstructHeader(theEnv,"deffacts",DEFFACTS,&newDeffacts->header,deffactsName);
+
+   newDeffacts->assertList = PackExpression(theEnv,temp);
+   ReturnExpression(theEnv,temp);
+
+   /*=======================================================*/
+   /* Save the pretty print representation of the deffacts. */
+   /*=======================================================*/
+
+   if (GetConserveMemory(theEnv) == true)
+     { newDeffacts->header.ppForm = NULL; }
+   else
+     { newDeffacts->header.ppForm = CopyPPBuffer(theEnv); }
+
+   /*=============================================*/
+   /* Add the deffacts to the appropriate module. */
+   /*=============================================*/
+
+   AddConstructToModule(&newDeffacts->header);
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+   /*================================================================*/
+   /* Return false to indicate the deffacts was successfully parsed. */
+   /*================================================================*/
+
+   return false;
+  }
+
+#endif /* DEFFACTS_CONSTRUCT */
+
+
diff --git a/clips/dffctpsr.h b/clips/dffctpsr.h
new file mode 100755
index 000000000..b961bfc93
--- /dev/null
+++ b/clips/dffctpsr.h
@@ -0,0 +1,49 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*             DEFFACTS PARSER HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffctpsr
+
+#pragma once
+
+#define _H_dffctpsr
+
+   bool                           ParseDeffacts(Environment *,const char *);
+
+#endif /* _H_dffctpsr */
+
diff --git a/clips/dffnxbin.c b/clips/dffnxbin.c
new file mode 100755
index 000000000..c1b86a256
--- /dev/null
+++ b/clips/dffnxbin.c
@@ -0,0 +1,520 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Binary Load/Save Functions for Deffunctions      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFFUNCTION_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+
+#include "bload.h"
+#include "bsave.h"
+#include "cstrcbin.h"
+#include "cstrccom.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "modulbin.h"
+
+#include "dffnxbin.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+typedef struct bsaveDeffunctionModule
+  {
+   struct bsaveDefmoduleItemHeader header;
+  } BSAVE_DEFFUNCTION_MODULE;
+
+typedef struct bsaveDeffunctionStruct
+  {
+   struct bsaveConstructHeader header;
+   unsigned short minNumberOfParameters;
+   unsigned short maxNumberOfParameters;
+   unsigned short numberOfLocalVars;
+   unsigned long name;
+   unsigned long code;
+  } BSAVE_DEFFUNCTION;
+
+/****************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS  */
+/****************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                    BsaveDeffunctionFind(Environment *);
+   static void                    MarkDeffunctionItems(Environment *,ConstructHeader *,void *);
+   static void                    BsaveDeffunctionExpressions(Environment *,FILE *);
+   static void                    BsaveDeffunctionExpression(Environment *,ConstructHeader *,void *);
+   static void                    BsaveStorageDeffunctions(Environment *,FILE *);
+   static void                    BsaveDeffunctions(Environment *,FILE *);
+   static void                    BsaveDeffunction(Environment *,ConstructHeader *,void *);
+#endif
+
+   static void                    BloadStorageDeffunctions(Environment *);
+   static void                    BloadDeffunctions(Environment *);
+   static void                    UpdateDeffunctionModule(Environment *,void *,unsigned long);
+   static void                    UpdateDeffunction(Environment *,void *,unsigned long);
+   static void                    ClearDeffunctionBload(Environment *);
+   static void                    DeallocateDeffunctionBloadData(Environment *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : SetupDeffunctionsBload
+  DESCRIPTION  : Initializes data structures and
+                   routines for binary loads of deffunctions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Routines defined and structures initialized
+  NOTES        : None
+ ***********************************************************/
+void SetupDeffunctionsBload(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,DFFNXBIN_DATA,sizeof(struct deffunctionBinaryData),DeallocateDeffunctionBloadData);
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"deffunctions",0,BsaveDeffunctionFind,BsaveDeffunctionExpressions,
+                             BsaveStorageDeffunctions,BsaveDeffunctions,
+                             BloadStorageDeffunctions,BloadDeffunctions,
+                             ClearDeffunctionBload);
+#else
+   AddBinaryItem(theEnv,"deffunctions",0,NULL,NULL,NULL,NULL,
+                             BloadStorageDeffunctions,BloadDeffunctions,
+                             ClearDeffunctionBload);
+#endif
+  }
+
+/***********************************************************/
+/* DeallocateDeffunctionBloadData: Deallocates environment */
+/*    data for the deffunction bsave functionality.        */
+/***********************************************************/
+static void DeallocateDeffunctionBloadData(
+  Environment *theEnv)
+  {
+   size_t space;
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   space = DeffunctionBinaryData(theEnv)->DeffunctionCount * sizeof(Deffunction);
+   if (space != 0) genfree(theEnv,DeffunctionBinaryData(theEnv)->DeffunctionArray,space);
+
+   space =  DeffunctionBinaryData(theEnv)->ModuleCount * sizeof(struct deffunctionModuleData);
+   if (space != 0) genfree(theEnv,DeffunctionBinaryData(theEnv)->ModuleArray,space);
+#endif
+  }
+
+/***************************************************
+  NAME         : BloadDeffunctionModuleReference
+  DESCRIPTION  : Returns a pointer to the
+                 appropriate deffunction module
+  INPUTS       : The index of the module
+  RETURNS      : A pointer to the module
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void *BloadDeffunctionModuleReference(
+  Environment *theEnv,
+  unsigned long theIndex)
+  {
+   return (void *) &DeffunctionBinaryData(theEnv)->ModuleArray[theIndex];
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if BLOAD_AND_BSAVE
+
+/***************************************************************************
+  NAME         : BsaveDeffunctionFind
+  DESCRIPTION  : For all deffunctions, this routine marks all
+                   the needed symbols.
+                 Also, it also counts the number of
+                   expression structures needed.
+                 Also, counts total number of deffunctions.
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : ExpressionCount (a global from BSAVE.C) is incremented
+                   for every expression needed
+                 Symbols are marked in their structures
+  NOTES        : Also sets bsaveIndex for each deffunction (assumes
+                   deffunctions will be bsaved in order of binary list)
+ ***************************************************************************/
+static void BsaveDeffunctionFind(
+  Environment *theEnv)
+  {
+   SaveBloadCount(theEnv,DeffunctionBinaryData(theEnv)->ModuleCount);
+   SaveBloadCount(theEnv,DeffunctionBinaryData(theEnv)->DeffunctionCount);
+   DeffunctionBinaryData(theEnv)->DeffunctionCount = 0L;
+
+   DeffunctionBinaryData(theEnv)->ModuleCount = GetNumberOfDefmodules(theEnv);
+   
+   DoForAllConstructs(theEnv,MarkDeffunctionItems,
+                      DeffunctionData(theEnv)->DeffunctionModuleIndex,
+                      false,NULL);
+  }
+
+/***************************************************
+  NAME         : MarkDeffunctionItems
+  DESCRIPTION  : Marks the needed items for
+                 a deffunction bsave
+  INPUTS       : 1) The deffunction
+                 2) User data buffer (ignored)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Needed items marked
+  NOTES        : None
+ ***************************************************/
+static void MarkDeffunctionItems(
+  Environment *theEnv,
+  ConstructHeader *theDeffunction,
+  void *userBuffer)
+  {
+#if MAC_XCD
+#pragma unused(userBuffer)
+#endif
+
+   MarkConstructHeaderNeededItems(theDeffunction,DeffunctionBinaryData(theEnv)->DeffunctionCount++);
+   ExpressionData(theEnv)->ExpressionCount += ExpressionSize(((Deffunction *) theDeffunction)->code);
+   MarkNeededItems(theEnv,((Deffunction *) theDeffunction)->code);
+  }
+
+/***************************************************
+  NAME         : BsaveDeffunctionExpressions
+  DESCRIPTION  : Writes out all expressions needed
+                   by deffunctyions
+  INPUTS       : The file pointer of the binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : File updated
+  NOTES        : None
+ ***************************************************/
+static void BsaveDeffunctionExpressions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   DoForAllConstructs(theEnv,BsaveDeffunctionExpression,DeffunctionData(theEnv)->DeffunctionModuleIndex,
+                      false,fp);
+  }
+
+/***************************************************
+  NAME         : BsaveDeffunctionExpression
+  DESCRIPTION  : Saves the needed expressions for
+                 a deffunction bsave
+  INPUTS       : 1) The deffunction
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Expressions saved
+  NOTES        : None
+ ***************************************************/
+static void BsaveDeffunctionExpression(
+  Environment *theEnv,
+  ConstructHeader *theDeffunction,
+  void *userBuffer)
+  {
+   BsaveExpression(theEnv,((Deffunction *) theDeffunction)->code,(FILE *) userBuffer);
+  }
+
+/***********************************************************
+  NAME         : BsaveStorageDeffunctions
+  DESCRIPTION  : Writes out number of each type of structure
+                   required for deffunctions
+                 Space required for counts (unsigned long)
+  INPUTS       : File pointer of binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary file adjusted
+  NOTES        : None
+ ***********************************************************/
+static void BsaveStorageDeffunctions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+
+   space = sizeof(unsigned long) * 2;
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&DeffunctionBinaryData(theEnv)->ModuleCount,sizeof(unsigned long),fp);
+   GenWrite(&DeffunctionBinaryData(theEnv)->DeffunctionCount,sizeof(unsigned long),fp);
+  }
+
+/*************************************************************************************
+  NAME         : BsaveDeffunctions
+  DESCRIPTION  : Writes out deffunction in binary format
+                 Space required (unsigned long)
+                 All deffunctions (sizeof(Deffunction) * Number of deffunctions)
+  INPUTS       : File pointer of binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary file adjusted
+  NOTES        : None
+ *************************************************************************************/
+static void BsaveDeffunctions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   Defmodule *theModule;
+   DeffunctionModuleData *theModuleItem;
+   BSAVE_DEFFUNCTION_MODULE dummy_mitem;
+
+   space = ((sizeof(BSAVE_DEFFUNCTION_MODULE) * DeffunctionBinaryData(theEnv)->ModuleCount) +
+            (sizeof(BSAVE_DEFFUNCTION) * DeffunctionBinaryData(theEnv)->DeffunctionCount));
+   GenWrite(&space,sizeof(size_t),fp);
+
+   /* =================================
+      Write out each deffunction module
+      ================================= */
+   DeffunctionBinaryData(theEnv)->DeffunctionCount = 0L;
+   theModule = GetNextDefmodule(theEnv,NULL);
+   while (theModule != NULL)
+     {
+      theModuleItem = (DeffunctionModuleData *)
+                      GetModuleItem(theEnv,theModule,FindModuleItem(theEnv,"deffunction")->moduleIndex);
+      AssignBsaveDefmdlItemHdrVals(&dummy_mitem.header,&theModuleItem->header);
+      GenWrite(&dummy_mitem,sizeof(BSAVE_DEFFUNCTION_MODULE),fp);
+      theModule = GetNextDefmodule(theEnv,theModule);
+     }
+
+   /* ==========================
+      Write out each deffunction
+      ========================== */
+   DoForAllConstructs(theEnv,BsaveDeffunction,DeffunctionData(theEnv)->DeffunctionModuleIndex,
+                      false,fp);
+
+   RestoreBloadCount(theEnv,&DeffunctionBinaryData(theEnv)->ModuleCount);
+   RestoreBloadCount(theEnv,&DeffunctionBinaryData(theEnv)->DeffunctionCount);
+  }
+
+/***************************************************
+  NAME         : BsaveDeffunction
+  DESCRIPTION  : Bsaves a deffunction
+  INPUTS       : 1) The deffunction
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction saved
+  NOTES        : None
+ ***************************************************/
+static void BsaveDeffunction(
+  Environment *theEnv,
+  ConstructHeader *theDeffunction,
+  void *userBuffer)
+  {
+   Deffunction *dptr = (Deffunction *) theDeffunction;
+   BSAVE_DEFFUNCTION dummy_df;
+
+   AssignBsaveConstructHeaderVals(&dummy_df.header,&dptr->header);
+   dummy_df.minNumberOfParameters = dptr->minNumberOfParameters;
+   dummy_df.maxNumberOfParameters = dptr->maxNumberOfParameters;
+   dummy_df.numberOfLocalVars = dptr->numberOfLocalVars;
+   if (dptr->code != NULL)
+     {
+      dummy_df.code = ExpressionData(theEnv)->ExpressionCount;
+      ExpressionData(theEnv)->ExpressionCount += ExpressionSize(dptr->code);
+     }
+   else
+     dummy_df.code = ULONG_MAX;
+   GenWrite(&dummy_df,sizeof(BSAVE_DEFFUNCTION),(FILE *) userBuffer);
+  }
+
+#endif
+
+/***********************************************************************
+  NAME         : BloadStorageDeffunctions
+  DESCRIPTION  : This routine space required for deffunction
+                   structures and allocates space for them
+  INPUTS       : Nothing
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Arrays allocated and set
+  NOTES        : This routine makes no attempt to reset any pointers
+                   within the structures
+ ***********************************************************************/
+static void BloadStorageDeffunctions(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   if (space == 0L)
+     return;
+   GenReadBinary(theEnv,&DeffunctionBinaryData(theEnv)->ModuleCount,sizeof(unsigned long));
+   GenReadBinary(theEnv,&DeffunctionBinaryData(theEnv)->DeffunctionCount,sizeof(unsigned long));
+   if (DeffunctionBinaryData(theEnv)->ModuleCount == 0L)
+     {
+      DeffunctionBinaryData(theEnv)->ModuleArray = NULL;
+      DeffunctionBinaryData(theEnv)->DeffunctionArray = NULL;
+      return;
+     }
+
+   space = (DeffunctionBinaryData(theEnv)->ModuleCount * sizeof(DeffunctionModuleData));
+   DeffunctionBinaryData(theEnv)->ModuleArray = (DeffunctionModuleData *) genalloc(theEnv,space);
+
+   if (DeffunctionBinaryData(theEnv)->DeffunctionCount == 0L)
+     {
+      DeffunctionBinaryData(theEnv)->DeffunctionArray = NULL;
+      return;
+     }
+
+   space = (DeffunctionBinaryData(theEnv)->DeffunctionCount * sizeof(Deffunction));
+   DeffunctionBinaryData(theEnv)->DeffunctionArray = (Deffunction *) genalloc(theEnv,space);
+  }
+
+/*********************************************************************
+  NAME         : BloadDeffunctions
+  DESCRIPTION  : This routine reads deffunction information from
+                   a binary file
+                 This routine moves through the deffunction
+                   binary array updating pointers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pointers reset from array indices
+  NOTES        : Assumes all loading is finished
+ ********************************************************************/
+static void BloadDeffunctions(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   BloadandRefresh(theEnv,DeffunctionBinaryData(theEnv)->ModuleCount,sizeof(BSAVE_DEFFUNCTION_MODULE),UpdateDeffunctionModule);
+   BloadandRefresh(theEnv,DeffunctionBinaryData(theEnv)->DeffunctionCount,sizeof(BSAVE_DEFFUNCTION),UpdateDeffunction);
+  }
+
+/*******************************************************
+  NAME         : UpdateDeffunctionModule
+  DESCRIPTION  : Updates deffunction module with binary
+                 load data - sets pointers from
+                 offset information
+  INPUTS       : 1) A pointer to the bloaded data
+                 2) The index of the binary array
+                    element to update
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction moudle pointers updated
+  NOTES        : None
+ *******************************************************/
+static void UpdateDeffunctionModule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_DEFFUNCTION_MODULE *bdptr;
+
+   bdptr = (BSAVE_DEFFUNCTION_MODULE *) buf;
+   UpdateDefmoduleItemHeader(theEnv,&bdptr->header,&DeffunctionBinaryData(theEnv)->ModuleArray[obji].header,
+                             sizeof(Deffunction),DeffunctionBinaryData(theEnv)->DeffunctionArray);
+  }
+
+/***************************************************
+  NAME         : UpdateDeffunction
+  DESCRIPTION  : Updates deffunction with binary
+                 load data - sets pointers from
+                 offset information
+  INPUTS       : 1) A pointer to the bloaded data
+                 2) The index of the binary array
+                    element to update
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction pointers upadted
+  NOTES        : None
+ ***************************************************/
+static void UpdateDeffunction(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_DEFFUNCTION *bdptr;
+   Deffunction *dptr;
+
+   bdptr = (BSAVE_DEFFUNCTION *) buf;
+   dptr = &DeffunctionBinaryData(theEnv)->DeffunctionArray[obji];
+
+   UpdateConstructHeader(theEnv,&bdptr->header,&dptr->header,DEFFUNCTION,
+                         sizeof(DeffunctionModuleData),DeffunctionBinaryData(theEnv)->ModuleArray,
+                         sizeof(Deffunction),DeffunctionBinaryData(theEnv)->DeffunctionArray);
+
+   dptr->code = ExpressionPointer(bdptr->code);
+   dptr->busy = 0;
+   dptr->executing = 0;
+#if DEBUGGING_FUNCTIONS
+   dptr->trace = DeffunctionData(theEnv)->WatchDeffunctions;
+#endif
+   dptr->minNumberOfParameters = bdptr->minNumberOfParameters;
+   dptr->maxNumberOfParameters = bdptr->maxNumberOfParameters;
+   dptr->numberOfLocalVars = bdptr->numberOfLocalVars;
+  }
+
+/***************************************************************
+  NAME         : ClearDeffunctionBload
+  DESCRIPTION  : Release all binary-loaded deffunction
+                   structure arrays
+                 Resets deffunction list to NULL
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Memory cleared
+  NOTES        : Deffunction name symbol counts decremented
+ ***************************************************************/
+static void ClearDeffunctionBload(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   size_t space;
+
+   space = (sizeof(DeffunctionModuleData) * DeffunctionBinaryData(theEnv)->ModuleCount);
+   if (space == 0L)
+     return;
+   genfree(theEnv,DeffunctionBinaryData(theEnv)->ModuleArray,space);
+   DeffunctionBinaryData(theEnv)->ModuleArray = NULL;
+   DeffunctionBinaryData(theEnv)->ModuleCount = 0L;
+
+   for (i = 0 ; i < DeffunctionBinaryData(theEnv)->DeffunctionCount ; i++)
+     UnmarkConstructHeader(theEnv,&DeffunctionBinaryData(theEnv)->DeffunctionArray[i].header);
+   space = (sizeof(Deffunction) * DeffunctionBinaryData(theEnv)->DeffunctionCount);
+   if (space == 0)
+     return;
+   genfree(theEnv,DeffunctionBinaryData(theEnv)->DeffunctionArray,space);
+   DeffunctionBinaryData(theEnv)->DeffunctionArray = NULL;
+   DeffunctionBinaryData(theEnv)->DeffunctionCount = 0L;
+  }
+
+#endif
+
diff --git a/clips/dffnxbin.h b/clips/dffnxbin.h
new file mode 100755
index 000000000..d2b524578
--- /dev/null
+++ b/clips/dffnxbin.h
@@ -0,0 +1,67 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffnxbin
+
+#pragma once
+
+#define _H_dffnxbin
+
+#if DEFFUNCTION_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+
+#include "dffnxfun.h"
+
+   void                           SetupDeffunctionsBload(Environment *);
+   void                          *BloadDeffunctionModuleReference(Environment *,unsigned long);
+
+#define DFFNXBIN_DATA 24
+
+struct deffunctionBinaryData
+  {
+   Deffunction *DeffunctionArray;
+   unsigned long DeffunctionCount;
+   unsigned long ModuleCount;
+   DeffunctionModuleData *ModuleArray;
+  };
+
+#define DeffunctionBinaryData(theEnv) ((struct deffunctionBinaryData *) GetEnvironmentData(theEnv,DFFNXBIN_DATA))
+
+#define DeffunctionPointer(i) (((i) == ULONG_MAX) ? NULL : &DeffunctionBinaryData(theEnv)->DeffunctionArray[i])
+
+#endif /* DEFFUNCTION_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) */
+
+#endif /* _H_dffnxbin */
+
+
+
+
diff --git a/clips/dffnxcmp.c b/clips/dffnxcmp.c
new file mode 100755
index 000000000..a26396d15
--- /dev/null
+++ b/clips/dffnxcmp.c
@@ -0,0 +1,378 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Generic Function Construct Compiler Code         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFFUNCTION_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include "conscomp.h"
+#include "envrnmnt.h"
+
+#include "dffnxcmp.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ReadyDeffunctionsForCode(Environment *);
+   static bool                    DeffunctionsToCode(Environment *,const char *,const char *,char *,
+                                                     unsigned int,FILE *,unsigned int,unsigned int);
+   static void                    CloseDeffunctionFiles(Environment *,FILE *,FILE *,unsigned int);
+   static void                    DeffunctionModuleToCode(Environment *,FILE *,Defmodule *,unsigned int,unsigned int);
+   static void                    SingleDeffunctionToCode(Environment *,FILE *,Deffunction *,
+                                                          unsigned int,unsigned int,unsigned int);
+   static void                    InitDeffunctionCode(Environment *,FILE *,unsigned int,unsigned int);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupDeffunctionCompiler
+  DESCRIPTION  : Initializes the construct compiler
+                   item for deffunctions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Code generator item initialized
+  NOTES        : None
+ ***************************************************/
+void SetupDeffunctionCompiler(
+  Environment *theEnv)
+  {
+   DeffunctionData(theEnv)->DeffunctionCodeItem = AddCodeGeneratorItem(theEnv,"deffunctions",0,ReadyDeffunctionsForCode,
+                                              InitDeffunctionCode,DeffunctionsToCode,2);
+  }
+
+
+/***************************************************
+  NAME         : PrintDeffunctionReference
+  DESCRIPTION  : Prints a reference to the run-time
+                 deffunction array for the construct
+                 compiler
+  INPUTS       : 1) The file output destination
+                 2) A pointer to the deffunction
+                 3) The id of the run-time image
+                 4) The maximum number of indices
+                    in any array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Reference printed
+  NOTES        : None
+ ***************************************************/
+void PrintDeffunctionReference(
+  Environment *theEnv,
+  FILE *fp,
+  Deffunction *dfPtr,
+  unsigned imageID,
+  unsigned maxIndices)
+  {
+   if (dfPtr == NULL)
+     fprintf(fp,"NULL");
+   else
+     fprintf(fp,"&%s%d_%lu[%lu]",ConstructPrefix(DeffunctionData(theEnv)->DeffunctionCodeItem),imageID,
+                                ((dfPtr->header.bsaveID / maxIndices) + 1),
+                                (dfPtr->header.bsaveID % maxIndices));
+  }
+
+/****************************************************
+  NAME         : DeffunctionCModuleReference
+  DESCRIPTION  : Prints out a reference to a
+                 deffunction module
+  INPUTS       : 1) The output file
+                 2) The id of the module item
+                 3) The id of the image
+                 4) The maximum number of elements
+                    allowed in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction module reference printed
+  NOTES        : None
+ ****************************************************/
+void DeffunctionCModuleReference(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned long count,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"MIHS &%s%u_%lu[%lu]",
+                      ModulePrefix(DeffunctionData(theEnv)->DeffunctionCodeItem),
+                      imageID,
+                      (count / maxIndices) + 1,
+                      (count % maxIndices));
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : ReadyDeffunctionsForCode
+  DESCRIPTION  : Sets index of deffunctions
+                   for use in compiled expressions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : BsaveIndices set
+  NOTES        : None
+ ***************************************************/
+static void ReadyDeffunctionsForCode(
+  Environment *theEnv)
+  {
+   MarkConstructBsaveIDs(theEnv,DeffunctionData(theEnv)->DeffunctionModuleIndex);
+  }
+
+/**************************************************/
+/* InitDeffunctionCode: Writes out initialization */
+/*   code for deffunction for a run-time module.  */
+/**************************************************/
+static void InitDeffunctionCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+#if MAC_XCD
+#pragma unused(maxIndices)
+#pragma unused(imageID)
+#pragma unused(theEnv)
+#endif
+   fprintf(initFP,"   DeffunctionRunTimeInitialize(theEnv);\n");
+  }
+
+/*******************************************************
+  NAME         : DeffunctionsToCode
+  DESCRIPTION  : Writes out static array code for
+                   deffunctions
+  INPUTS       : 1) The base name of the construct set
+                 2) The base id for this construct
+                 3) The file pointer for the header file
+                 4) The base id for the construct set
+                 5) The max number of indices allowed
+                    in an array
+  RETURNS      : False on errors,
+                 True if deffunctions written
+  SIDE EFFECTS : Code written to files
+  NOTES        : None
+ *******************************************************/
+static bool DeffunctionsToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int fileCount = 1;
+   Defmodule *theModule;
+   Deffunction *theDeffunction;
+   unsigned int moduleCount = 0, moduleArrayCount = 0, moduleArrayVersion = 1;
+   unsigned int deffunctionArrayCount = 0, deffunctionArrayVersion = 1;
+   FILE *moduleFile = NULL, *deffunctionFile = NULL;
+
+   /* ===============================================
+      Include the appropriate deffunction header file
+      =============================================== */
+   fprintf(headerFP,"#include \"dffnxfun.h\"\n");
+
+   /* =============================================================
+      Loop through all the modules and all the deffunctions writing
+      their C code representation to the file as they are traversed
+      ============================================================= */
+   theModule = GetNextDefmodule(theEnv,NULL);
+
+   while (theModule != NULL)
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      moduleFile = OpenFileIfNeeded(theEnv,moduleFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                    moduleArrayVersion,headerFP,
+                                    "DeffunctionModuleData",ModulePrefix(DeffunctionData(theEnv)->DeffunctionCodeItem),
+                                    false,NULL);
+
+      if (moduleFile == NULL)
+        {
+         CloseDeffunctionFiles(theEnv,moduleFile,deffunctionFile,maxIndices);
+         return false;
+        }
+
+      DeffunctionModuleToCode(theEnv,moduleFile,theModule,imageID,maxIndices);
+      moduleFile = CloseFileIfNeeded(theEnv,moduleFile,&moduleArrayCount,&moduleArrayVersion,
+                                     maxIndices,NULL,NULL);
+
+      theDeffunction = GetNextDeffunction(theEnv,NULL);
+
+      while (theDeffunction != NULL)
+        {
+         deffunctionFile = OpenFileIfNeeded(theEnv,deffunctionFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                            deffunctionArrayVersion,headerFP,
+                                            "Deffunction",ConstructPrefix(DeffunctionData(theEnv)->DeffunctionCodeItem),
+                                            false,NULL);
+         if (deffunctionFile == NULL)
+           {
+            CloseDeffunctionFiles(theEnv,moduleFile,deffunctionFile,maxIndices);
+            return false;
+           }
+
+         SingleDeffunctionToCode(theEnv,deffunctionFile,theDeffunction,imageID,
+                                 maxIndices,moduleCount);
+         deffunctionArrayCount++;
+         deffunctionFile = CloseFileIfNeeded(theEnv,deffunctionFile,&deffunctionArrayCount,
+                                             &deffunctionArrayVersion,maxIndices,NULL,NULL);
+
+         theDeffunction = GetNextDeffunction(theEnv,theDeffunction);
+        }
+
+      theModule = GetNextDefmodule(theEnv,theModule);
+      moduleCount++;
+      moduleArrayCount++;
+     }
+
+   CloseDeffunctionFiles(theEnv,moduleFile,deffunctionFile,maxIndices);
+
+   return true;
+  }
+
+/***************************************************
+  NAME         : CloseDeffunctionFiles
+  DESCRIPTION  : Closes construct compiler files
+                  for deffunction structures
+  INPUTS       : 1) The deffunction module file
+                 2) The deffunction structure file
+                 3) The maximum number of indices
+                    allowed in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Files closed
+  NOTES        : None
+ ***************************************************/
+static void CloseDeffunctionFiles(
+  Environment *theEnv,
+  FILE *moduleFile,
+  FILE *deffunctionFile,
+  unsigned int maxIndices)
+  {
+   unsigned int count = maxIndices;
+   unsigned int arrayVersion = 0;
+
+   if (deffunctionFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,deffunctionFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+
+   if (moduleFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,moduleFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+  }
+
+/***************************************************
+  NAME         : DeffunctionModuleToCode
+  DESCRIPTION  : Writes out the C values for a
+                 deffunction module item
+  INPUTS       : 1) The output file
+                 2) The module for the deffunctions
+                 3) The compile image id
+                 4) The maximum number of elements
+                    in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction module item written
+  NOTES        : None
+ ***************************************************/
+static void DeffunctionModuleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"{");
+   ConstructModuleToCode(theEnv,theFile,theModule,imageID,maxIndices,
+                         DeffunctionData(theEnv)->DeffunctionModuleIndex,ConstructPrefix(DeffunctionData(theEnv)->DeffunctionCodeItem));
+   fprintf(theFile,"}");
+  }
+
+/***************************************************
+  NAME         : SingleDeffunctionToCode
+  DESCRIPTION  : Writes out a single deffunction's
+                 data to the file
+  INPUTS       : 1) The output file
+                 2) The deffunction
+                 3) The compile image id
+                 4) The maximum number of
+                    elements in an array
+                 5) The module index
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction data written
+  NOTES        : None
+ ***************************************************/
+static void SingleDeffunctionToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Deffunction *theDeffunction,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount)
+  {
+   /* ==================
+      Deffunction Header
+      ================== */
+
+   fprintf(theFile,"{");
+   ConstructHeaderToCode(theEnv,theFile,&theDeffunction->header,imageID,maxIndices,moduleCount,
+                         ModulePrefix(DeffunctionData(theEnv)->DeffunctionCodeItem),
+                         ConstructPrefix(DeffunctionData(theEnv)->DeffunctionCodeItem));
+
+   /* =========================
+      Deffunction specific data
+      ========================= */
+   fprintf(theFile,",0,0,0,");
+   ExpressionToCode(theEnv,theFile,theDeffunction->code);
+   fprintf(theFile,",%d,%d,%d",
+           theDeffunction->minNumberOfParameters,
+           theDeffunction->maxNumberOfParameters,
+           theDeffunction->numberOfLocalVars);
+
+   fprintf(theFile,"}");
+  }
+
+#endif
diff --git a/clips/dffnxcmp.h b/clips/dffnxcmp.h
new file mode 100755
index 000000000..74f3374cb
--- /dev/null
+++ b/clips/dffnxcmp.h
@@ -0,0 +1,54 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Deffunction Construct Compiler Code              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffnxcmp
+
+#pragma once
+
+#define _H_dffnxcmp
+
+#if DEFFUNCTION_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include <stdio.h>
+
+#include "dffnxfun.h"
+
+   void                           SetupDeffunctionCompiler(Environment *);
+   void                           PrintDeffunctionReference(Environment *,FILE *,Deffunction *,unsigned,unsigned);
+   void                           DeffunctionCModuleReference(Environment *,FILE *,unsigned long,unsigned int,unsigned int);
+
+#endif /* DEFFUNCTION_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME) */
+
+#endif /* _H_dffnxcmp */
+
+
diff --git a/clips/dffnxexe.c b/clips/dffnxexe.c
new file mode 100755
index 000000000..929b0d3fb
--- /dev/null
+++ b/clips/dffnxexe.c
@@ -0,0 +1,241 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/01/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Deffunction Execution Routines                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.30: Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFFUNCTION_CONSTRUCT
+
+#include <stdio.h>
+#include <string.h>
+
+#include "constrct.h"
+#include "envrnmnt.h"
+#include "prcdrfun.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "proflfun.h"
+#include "router.h"
+#include "utility.h"
+#include "watch.h"
+
+#include "dffnxexe.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define BEGIN_TRACE ">> "
+#define END_TRACE   "<< "
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+   static void                    UnboundDeffunctionErr(Environment *,const char *);
+
+#if DEBUGGING_FUNCTIONS
+   static void                    WatchDeffunction(Environment *,const char *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/****************************************************
+  NAME         : CallDeffunction
+  DESCRIPTION  : Executes the body of a deffunction
+  INPUTS       : 1) The deffunction
+                 2) Argument expressions
+                 3) Data object buffer to hold result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction executed and result
+                 stored in data object buffer
+  NOTES        : Used in EvaluateExpression(theEnv,)
+ ****************************************************/
+void CallDeffunction(
+  Environment *theEnv,
+  Deffunction *dptr,
+  Expression *args,
+  UDFValue *returnValue)
+  {
+   bool oldce;
+   Deffunction *previouslyExecutingDeffunction;
+   GCBlock gcb;
+#if PROFILING_FUNCTIONS
+   struct profileFrameInfo profileFrame;
+#endif
+
+   returnValue->value = FalseSymbol(theEnv);
+   EvaluationData(theEnv)->EvaluationError = false;
+   if (EvaluationData(theEnv)->HaltExecution)
+     return;
+
+   GCBlockStart(theEnv,&gcb);
+
+   oldce = ExecutingConstruct(theEnv);
+   SetExecutingConstruct(theEnv,true);
+   previouslyExecutingDeffunction = DeffunctionData(theEnv)->ExecutingDeffunction;
+   DeffunctionData(theEnv)->ExecutingDeffunction = dptr;
+   EvaluationData(theEnv)->CurrentEvaluationDepth++;
+   dptr->executing++;
+   PushProcParameters(theEnv,args,CountArguments(args),DeffunctionName(dptr),
+                      "deffunction",UnboundDeffunctionErr);
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      dptr->executing--;
+      DeffunctionData(theEnv)->ExecutingDeffunction = previouslyExecutingDeffunction;
+      EvaluationData(theEnv)->CurrentEvaluationDepth--;
+
+      GCBlockEndUDF(theEnv,&gcb,returnValue);
+      CallPeriodicTasks(theEnv);
+
+      SetExecutingConstruct(theEnv,oldce);
+      return;
+     }
+
+#if DEBUGGING_FUNCTIONS
+   if (dptr->trace)
+     WatchDeffunction(theEnv,BEGIN_TRACE);
+#endif
+
+#if PROFILING_FUNCTIONS
+   StartProfile(theEnv,&profileFrame,
+                &dptr->header.usrData,
+                ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+   EvaluateProcActions(theEnv,dptr->header.whichModule->theModule,
+                       dptr->code,dptr->numberOfLocalVars,
+                       returnValue,UnboundDeffunctionErr);
+
+#if PROFILING_FUNCTIONS
+    EndProfile(theEnv,&profileFrame);
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   if (dptr->trace)
+     WatchDeffunction(theEnv,END_TRACE);
+#endif
+   ProcedureFunctionData(theEnv)->ReturnFlag = false;
+
+   dptr->executing--;
+   PopProcParameters(theEnv);
+   DeffunctionData(theEnv)->ExecutingDeffunction = previouslyExecutingDeffunction;
+   EvaluationData(theEnv)->CurrentEvaluationDepth--;
+
+   GCBlockEndUDF(theEnv,&gcb,returnValue);
+   CallPeriodicTasks(theEnv);
+
+   SetExecutingConstruct(theEnv,oldce);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*******************************************************
+  NAME         : UnboundDeffunctionErr
+  DESCRIPTION  : Print out a synopis of the currently
+                   executing deffunction for unbound
+                   variable errors
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error synopsis printed to STDERR
+  NOTES        : None
+ *******************************************************/
+static void UnboundDeffunctionErr(
+  Environment *theEnv,
+  const char *logName)
+  {
+   WriteString(theEnv,logName,"deffunction '");
+   WriteString(theEnv,logName,DeffunctionName(DeffunctionData(theEnv)->ExecutingDeffunction));
+   WriteString(theEnv,logName,"'.\n");
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/***************************************************
+  NAME         : WatchDeffunction
+  DESCRIPTION  : Displays a message indicating when
+                 a deffunction began and ended
+                 execution
+  INPUTS       : The beginning or end trace string
+                 to print when deffunction starts
+                 or finishes respectively
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Watch message printed
+  NOTES        : None
+ ***************************************************/
+static void WatchDeffunction(
+  Environment *theEnv,
+  const char *tstring)
+  {
+   if (ConstructData(theEnv)->ClearReadyInProgress ||
+       ConstructData(theEnv)->ClearInProgress)
+     { return; }
+
+   WriteString(theEnv,STDOUT,"DFN ");
+   WriteString(theEnv,STDOUT,tstring);
+   if (DeffunctionData(theEnv)->ExecutingDeffunction->header.whichModule->theModule != GetCurrentModule(theEnv))
+     {
+      WriteString(theEnv,STDOUT,DeffunctionModule(DeffunctionData(theEnv)->ExecutingDeffunction));;
+      WriteString(theEnv,STDOUT,"::");
+     }
+   WriteString(theEnv,STDOUT,DeffunctionData(theEnv)->ExecutingDeffunction->header.name->contents);
+   WriteString(theEnv,STDOUT," ED:");
+   WriteInteger(theEnv,STDOUT,EvaluationData(theEnv)->CurrentEvaluationDepth);
+   PrintProcParamArray(theEnv,STDOUT);
+  }
+
+#endif
+#endif
diff --git a/clips/dffnxexe.h b/clips/dffnxexe.h
new file mode 100755
index 000000000..dc17b06ec
--- /dev/null
+++ b/clips/dffnxexe.h
@@ -0,0 +1,58 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.30: Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffnxexe
+
+#pragma once
+
+#define _H_dffnxexe
+
+#if DEFFUNCTION_CONSTRUCT
+
+#include "entities.h"
+#include "dffnxfun.h"
+
+   void                           CallDeffunction(Environment *,Deffunction *,Expression *,UDFValue *);
+
+#endif /* DEFFUNCTION_CONSTRUCT */
+
+#endif /* _H_dffnxexe */
+
+
+
+
diff --git a/clips/dffnxfun.c b/clips/dffnxfun.c
new file mode 100755
index 000000000..d6bd7d62c
--- /dev/null
+++ b/clips/dffnxfun.c
@@ -0,0 +1,1192 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*                 DEFFUNCTION MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warning.                              */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added missing initializer for ENTITY_RECORD.   */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFFUNCTION_CONSTRUCT
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+#include "bload.h"
+#include "dffnxbin.h"
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "dffnxcmp.h"
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+#include "constrct.h"
+#include "cstrcpsr.h"
+#include "dffnxpsr.h"
+#include "modulpsr.h"
+#endif
+
+#include "envrnmnt.h"
+
+#if (! RUN_TIME)
+#include "extnfunc.h"
+#endif
+
+#include "dffnxexe.h"
+
+#if DEBUGGING_FUNCTIONS
+#include "watch.h"
+#endif
+
+#include "argacces.h"
+#include "cstrccom.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "dffnxfun.h"
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+   static void                    PrintDeffunctionCall(Environment *,const char *,Deffunction *);
+   static bool                    EvaluateDeffunctionCall(Environment *,Deffunction *,UDFValue *);
+   static void                    DecrementDeffunctionBusyCount(Environment *,Deffunction *);
+   static void                    IncrementDeffunctionBusyCount(Environment *,Deffunction *);
+   static void                    DeallocateDeffunctionData(Environment *);
+
+#if ! RUN_TIME
+   static void                    DestroyDeffunctionAction(Environment *,ConstructHeader *,void *);
+   static void                   *AllocateModule(Environment *);
+   static void                    ReturnModule(Environment *,void *);
+   static bool                    ClearDeffunctionsReady(Environment *,void *);
+#else
+   static void                    RuntimeDeffunctionAction(Environment *,ConstructHeader *,void *);
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   static bool                    RemoveAllDeffunctions(Environment *);
+   static void                    DeffunctionDeleteError(Environment *,const char *);
+   static void                    SaveDeffunctionHeaders(Environment *,Defmodule *,const char *,void *);
+   static void                    SaveDeffunctionHeader(Environment *,ConstructHeader *,void *);
+   static void                    SaveDeffunctions(Environment *,Defmodule *,const char *,void *);
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   static bool                    DeffunctionWatchAccess(Environment *,int,bool,Expression *);
+   static bool                    DeffunctionWatchPrint(Environment *,const char *,int,Expression *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupDeffunctions
+  DESCRIPTION  : Initializes parsers and access
+                 functions for deffunctions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction environment initialized
+  NOTES        : None
+ ***************************************************/
+void SetupDeffunctions(
+  Environment *theEnv)
+  {
+   EntityRecord deffunctionEntityRecord =
+                     { "PCALL", PCALL,0,0,1,
+                       (EntityPrintFunction *) PrintDeffunctionCall,
+                       (EntityPrintFunction *) PrintDeffunctionCall,
+                       NULL,
+                       (EntityEvaluationFunction *) EvaluateDeffunctionCall,
+                       NULL,
+                       (EntityBusyCountFunction *) DecrementDeffunctionBusyCount,
+                       (EntityBusyCountFunction *) IncrementDeffunctionBusyCount,
+                       NULL,NULL,NULL,NULL,NULL };
+
+   AllocateEnvironmentData(theEnv,DEFFUNCTION_DATA,sizeof(struct deffunctionData),DeallocateDeffunctionData);
+   memcpy(&DeffunctionData(theEnv)->DeffunctionEntityRecord,&deffunctionEntityRecord,sizeof(struct entityRecord));
+
+   InstallPrimitive(theEnv,&DeffunctionData(theEnv)->DeffunctionEntityRecord,PCALL);
+
+   DeffunctionData(theEnv)->DeffunctionModuleIndex =
+                RegisterModuleItem(theEnv,"deffunction",
+#if (! RUN_TIME)
+                                    AllocateModule,
+                                    ReturnModule,
+#else
+                                    NULL,NULL,
+#endif
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+                                    BloadDeffunctionModuleReference,
+#else
+                                    NULL,
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+                                    DeffunctionCModuleReference,
+#else
+                                    NULL,
+#endif
+                                    (FindConstructFunction *) FindDeffunctionInModule);
+   DeffunctionData(theEnv)->DeffunctionConstruct = AddConstruct(theEnv,"deffunction","deffunctions",
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+                                       ParseDeffunction,
+#else
+                                       NULL,
+#endif
+                                       (FindConstructFunction *) FindDeffunction,
+                                       GetConstructNamePointer,GetConstructPPForm,
+                                       GetConstructModuleItem,
+                                       (GetNextConstructFunction *) GetNextDeffunction,
+                                       SetNextConstruct,
+                                       (IsConstructDeletableFunction *) DeffunctionIsDeletable,
+                                       (DeleteConstructFunction *) Undeffunction,
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+                                       (FreeConstructFunction *) RemoveDeffunction
+#else
+                                       NULL
+#endif
+                                       );
+
+#if ! RUN_TIME
+   AddClearReadyFunction(theEnv,"deffunction",ClearDeffunctionsReady,0,NULL);
+
+#if ! BLOAD_ONLY
+#if DEFMODULE_CONSTRUCT
+   AddPortConstructItem(theEnv,"deffunction",SYMBOL_TOKEN);
+#endif
+   AddSaveFunction(theEnv,"deffunction-headers",SaveDeffunctionHeaders,1000,NULL);
+   AddSaveFunction(theEnv,"deffunctions",SaveDeffunctions,0,NULL);
+   AddUDF(theEnv,"undeffunction","v",1,1,"y",UndeffunctionCommand,"UndeffunctionCommand",NULL);
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"list-deffunctions","v",0,1,"y",ListDeffunctionsCommand,"ListDeffunctionsCommand",NULL);
+   AddUDF(theEnv,"ppdeffunction","vs",1,2,";y;ldsyn",PPDeffunctionCommand,"PPDeffunctionCommand",NULL);
+#endif
+
+   AddUDF(theEnv,"get-deffunction-list","m",0,1,"y",GetDeffunctionListFunction,"GetDeffunctionListFunction",NULL);
+   AddUDF(theEnv,"deffunction-module","y",1,1,"y",GetDeffunctionModuleCommand,"GetDeffunctionModuleCommand",NULL);
+
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+   SetupDeffunctionsBload(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER
+   SetupDeffunctionCompiler(theEnv);
+#endif
+
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   AddWatchItem(theEnv,"deffunctions",0,&DeffunctionData(theEnv)->WatchDeffunctions,32,
+                DeffunctionWatchAccess,DeffunctionWatchPrint);
+#endif
+
+  }
+
+/******************************************************/
+/* DeallocateDeffunctionData: Deallocates environment */
+/*    data for the deffunction construct.             */
+/******************************************************/
+static void DeallocateDeffunctionData(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   DeffunctionModuleData *theModuleItem;
+   Defmodule *theModule;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv)) return;
+#endif
+
+   DoForAllConstructs(theEnv,
+                      DestroyDeffunctionAction,
+                      DeffunctionData(theEnv)->DeffunctionModuleIndex,false,NULL);
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      theModuleItem = (struct deffunctionModuleData *)
+                      GetModuleItem(theEnv,theModule,
+                                    DeffunctionData(theEnv)->DeffunctionModuleIndex);
+      rtn_struct(theEnv,deffunctionModuleData,theModuleItem);
+     }
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+#if ! RUN_TIME
+/*****************************************************/
+/* DestroyDeffunctionAction: Action used to remove   */
+/*   deffunctions as a result of DestroyEnvironment. */
+/*****************************************************/
+static void DestroyDeffunctionAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   Deffunction *theDeffunction = (Deffunction *) theConstruct;
+
+   if (theDeffunction == NULL) return;
+
+   ReturnPackedExpression(theEnv,theDeffunction->code);
+
+   DestroyConstructHeader(theEnv,&theDeffunction->header);
+
+   rtn_struct(theEnv,deffunction,theDeffunction);
+#else
+#if MAC_XCD
+#pragma unused(theConstruct,theEnv)
+#endif
+#endif
+  }
+#endif
+
+/***************************************************
+  NAME         : FindDeffunction
+  DESCRIPTION  : Searches for a deffunction
+  INPUTS       : The name of the deffunction
+                 (possibly including a module name)
+  RETURNS      : Pointer to the deffunction if
+                 found, otherwise NULL
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Deffunction *FindDeffunction(
+  Environment *theEnv,
+  const char *dfnxModuleAndName)
+  {
+   return (Deffunction *) FindNamedConstructInModuleOrImports(theEnv,dfnxModuleAndName,DeffunctionData(theEnv)->DeffunctionConstruct);
+  }
+
+/***************************************************
+  NAME         : FindDeffunctionInModule
+  DESCRIPTION  : Searches for a deffunction
+  INPUTS       : The name of the deffunction
+                 (possibly including a module name)
+  RETURNS      : Pointer to the deffunction if
+                 found, otherwise NULL
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Deffunction *FindDeffunctionInModule(
+  Environment *theEnv,
+  const char *dfnxModuleAndName)
+  {
+   return (Deffunction *) FindNamedConstructInModule(theEnv,dfnxModuleAndName,DeffunctionData(theEnv)->DeffunctionConstruct);
+  }
+
+/***************************************************
+  NAME         : LookupDeffunctionByMdlOrScope
+  DESCRIPTION  : Finds a deffunction anywhere (if
+                 module is specified) or in current
+                 or imported modules
+  INPUTS       : The deffunction name
+  RETURNS      : The deffunction (NULL if not found)
+  SIDE EFFECTS : Error message printed on
+                  ambiguous references
+  NOTES        : None
+ ***************************************************/
+Deffunction *LookupDeffunctionByMdlOrScope(
+  Environment *theEnv,
+  const char *deffunctionName)
+  {
+   return((Deffunction *) LookupConstruct(theEnv,DeffunctionData(theEnv)->DeffunctionConstruct,deffunctionName,true));
+  }
+
+/***************************************************
+  NAME         : LookupDeffunctionInScope
+  DESCRIPTION  : Finds a deffunction in current or
+                   imported modules (module
+                   specifier is not allowed)
+  INPUTS       : The deffunction name
+  RETURNS      : The deffunction (NULL if not found)
+  SIDE EFFECTS : Error message printed on
+                  ambiguous references
+  NOTES        : None
+ ***************************************************/
+Deffunction *LookupDeffunctionInScope(
+  Environment *theEnv,
+  const char *deffunctionName)
+  {
+   return (Deffunction *) LookupConstruct(theEnv,DeffunctionData(theEnv)->DeffunctionConstruct,deffunctionName,false);
+  }
+
+/***************************************************
+  NAME         : Undeffunction
+  DESCRIPTION  : External interface routine for
+                 removing a deffunction
+  INPUTS       : Deffunction pointer
+  RETURNS      : False if unsuccessful,
+                 true otherwise
+  SIDE EFFECTS : Deffunction deleted, if possible
+  NOTES        : None
+ ***************************************************/
+bool Undeffunction(
+  Deffunction *theDeffunction,
+  Environment *allEnv)
+  {   
+#if BLOAD_ONLY || RUN_TIME
+   return false;
+#else
+   Environment *theEnv;
+   bool success;
+   GCBlock gcb;
+  
+   if (theDeffunction == NULL)
+     { theEnv = allEnv; }
+   else
+     { theEnv = theDeffunction->header.env; }
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv) == true)
+     return false;
+#endif
+
+   GCBlockStart(theEnv,&gcb);
+   if (theDeffunction == NULL)
+     {
+      success = RemoveAllDeffunctions(theEnv);
+      GCBlockEnd(theEnv,&gcb);
+      return success;
+     }
+      
+   if (DeffunctionIsDeletable(theDeffunction) == false)
+     {
+      GCBlockEnd(theEnv,&gcb);
+      return false;
+     }
+     
+   RemoveConstructFromModule(theEnv,&theDeffunction->header);
+   RemoveDeffunction(theEnv,theDeffunction);
+   GCBlockEnd(theEnv,&gcb);
+
+   return true;
+#endif
+  }
+
+/****************************************************
+  NAME         : GetNextDeffunction
+  DESCRIPTION  : Accesses list of deffunctions
+  INPUTS       : Deffunction pointer
+  RETURNS      : The next deffunction, or the
+                 first deffunction (if input is NULL)
+  SIDE EFFECTS : None
+  NOTES        : None
+ ****************************************************/
+Deffunction *GetNextDeffunction(
+  Environment *theEnv,
+  Deffunction *theDeffunction)
+  {
+   return (Deffunction *)
+          GetNextConstructItem(theEnv,&theDeffunction->header,
+                               DeffunctionData(theEnv)->DeffunctionModuleIndex);
+  }
+
+/***************************************************
+  NAME         : DeffunctionIsDeletable
+  DESCRIPTION  : Determines if a deffunction is
+                 executing or referenced by another
+                 expression
+  INPUTS       : Deffunction pointer
+  RETURNS      : True if the deffunction can
+                 be deleted, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool DeffunctionIsDeletable(
+  Deffunction *theDeffunction)
+  {
+   Environment *theEnv = theDeffunction->header.env;
+
+   if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   return(((theDeffunction->busy == 0) && (theDeffunction->executing == 0)) ? true : false);
+  }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/***************************************************
+  NAME         : RemoveDeffunction
+  DESCRIPTION  : Removes a deffunction
+  INPUTS       : Deffunction pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction deallocated
+  NOTES        : Assumes deffunction is not in use!!
+ ***************************************************/
+void RemoveDeffunction(
+  Environment *theEnv,
+  Deffunction *theDeffunction)
+  {
+   if (theDeffunction == NULL)
+     return;
+   ReleaseLexeme(theEnv,GetDeffunctionNamePointer(theEnv,theDeffunction));
+   ExpressionDeinstall(theEnv,theDeffunction->code);
+   ReturnPackedExpression(theEnv,theDeffunction->code);
+   SetDeffunctionPPForm(theEnv,theDeffunction,NULL);
+   ClearUserDataList(theEnv,theDeffunction->header.usrData);
+   rtn_struct(theEnv,deffunction,theDeffunction);
+  }
+
+#endif
+
+/********************************************************
+  NAME         : UndeffunctionCommand
+  DESCRIPTION  : Deletes the named deffunction(s)
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction(s) removed
+  NOTES        : H/L Syntax: (undeffunction <name> | *)
+ ********************************************************/
+void UndeffunctionCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UndefconstructCommand(context,"undeffunction",DeffunctionData(theEnv)->DeffunctionConstruct);
+  }
+
+/****************************************************************
+  NAME         : GetDeffunctionModuleCommand
+  DESCRIPTION  : Determines to which module a deffunction belongs
+  INPUTS       : None
+  RETURNS      : The symbolic name of the module
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (deffunction-module <dfnx-name>)
+ ****************************************************************/
+void GetDeffunctionModuleCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->value = GetConstructModuleCommand(context,"deffunction-module",DeffunctionData(theEnv)->DeffunctionConstruct);
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/****************************************************
+  NAME         : PPDeffunctionCommand
+  DESCRIPTION  : Displays the pretty-print form of a
+                 deffunction
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pretty-print form displayed to
+                 STDOUT logical name
+  NOTES        : H/L Syntax: (ppdeffunction <name>)
+ ****************************************************/
+void PPDeffunctionCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PPConstructCommand(context,"ppdeffunction",DeffunctionData(theEnv)->DeffunctionConstruct,returnValue);
+  }
+
+/***************************************************
+  NAME         : ListDeffunctionsCommand
+  DESCRIPTION  : Displays all deffunction names
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction name sprinted
+  NOTES        : H/L Interface
+ ***************************************************/
+void ListDeffunctionsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListConstructCommand(context,DeffunctionData(theEnv)->DeffunctionConstruct);
+  }
+
+/***************************************************
+  NAME         : ListDeffunctions
+  DESCRIPTION  : Displays all deffunction names
+  INPUTS       : 1) The logical name of the output
+                 2) The module
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deffunction name sprinted
+  NOTES        : C Interface
+ ***************************************************/
+void ListDeffunctions(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListConstruct(theEnv,DeffunctionData(theEnv)->DeffunctionConstruct,logicalName,theModule);
+  }
+
+#endif
+
+/***************************************************************
+  NAME         : GetDeffunctionListFunction
+  DESCRIPTION  : Groups all deffunction names into
+                 a multifield list
+  INPUTS       : A data object buffer to hold
+                 the multifield result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield allocated and filled
+  NOTES        : H/L Syntax: (get-deffunction-list [<module>])
+ ***************************************************************/
+void GetDeffunctionListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   GetConstructListFunction(context,returnValue,DeffunctionData(theEnv)->DeffunctionConstruct);
+  }
+
+/***************************************************************
+  NAME         : GetDeffunctionList
+  DESCRIPTION  : Groups all deffunction names into
+                 a multifield list
+  INPUTS       : 1) A data object buffer to hold
+                    the multifield result
+                 2) The module from which to obtain deffunctions
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield allocated and filled
+  NOTES        : External C access
+ ***************************************************************/
+void GetDeffunctionList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defmodule *theModule)
+  {
+   UDFValue result;
+   
+   GetConstructList(theEnv,&result,DeffunctionData(theEnv)->DeffunctionConstruct,theModule);
+   NormalizeMultifield(theEnv,&result);
+   returnValue->value = result.value;
+  }
+
+/*******************************************************
+  NAME         : CheckDeffunctionCall
+  DESCRIPTION  : Checks the number of arguments
+                 passed to a deffunction
+  INPUTS       : 1) Deffunction pointer
+                 2) The number of arguments
+  RETURNS      : True if OK, false otherwise
+  SIDE EFFECTS : Message printed on errors
+  NOTES        : None
+ *******************************************************/
+bool CheckDeffunctionCall(
+  Environment *theEnv,
+  Deffunction *theDeffunction,
+  int args)
+  {
+   if (theDeffunction == NULL)
+     return false;
+
+   if (args < theDeffunction->minNumberOfParameters)
+     {
+      if (theDeffunction->maxNumberOfParameters == PARAMETERS_UNBOUNDED)
+        ExpectedCountError(theEnv,DeffunctionName(theDeffunction),
+                           AT_LEAST,theDeffunction->minNumberOfParameters);
+      else
+        ExpectedCountError(theEnv,DeffunctionName(theDeffunction),
+                           EXACTLY,theDeffunction->minNumberOfParameters);
+      return false;
+     }
+   else if ((args > theDeffunction->minNumberOfParameters) &&
+            (theDeffunction->maxNumberOfParameters != PARAMETERS_UNBOUNDED))
+     {
+      ExpectedCountError(theEnv,DeffunctionName(theDeffunction),
+                         EXACTLY,theDeffunction->minNumberOfParameters);
+      return false;
+     }
+   return true;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : PrintDeffunctionCall
+  DESCRIPTION  : PrintExpression() support function
+                 for deffunction calls
+  INPUTS       : 1) The output logical name
+                 2) The deffunction
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Call expression printed
+  NOTES        : None
+ ***************************************************/
+static void PrintDeffunctionCall(
+  Environment *theEnv,
+  const char *logName,
+  Deffunction *theDeffunction)
+  {
+#if DEVELOPER
+
+   WriteString(theEnv,logName,"(");
+   WriteString(theEnv,logName,DeffunctionName(theDeffunction));
+   if (GetFirstArgument() != NULL)
+     {
+      WriteString(theEnv,logName," ");
+      PrintExpression(theEnv,logName,GetFirstArgument());
+     }
+   WriteString(theEnv,logName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logName)
+#pragma unused(theDeffunction)
+#endif
+#endif
+  }
+
+/*******************************************************
+  NAME         : EvaluateDeffunctionCall
+  DESCRIPTION  : Primitive support function for
+                 calling a deffunction
+  INPUTS       : 1) The deffunction
+                 2) A data object buffer to hold
+                    the evaluation result
+  RETURNS      : False if the deffunction
+                 returns the symbol false,
+                 true otherwise
+  SIDE EFFECTS : Data obejct buffer set and any
+                 side-effects of calling the deffunction
+  NOTES        : None
+ *******************************************************/
+static bool EvaluateDeffunctionCall(
+  Environment *theEnv,
+  Deffunction *theDeffunction,
+  UDFValue *returnValue)
+  {
+   CallDeffunction(theEnv,theDeffunction,GetFirstArgument(),returnValue);
+   if (returnValue->value == FalseSymbol(theEnv))
+     { return false; }
+   return true;
+  }
+
+/***************************************************
+  NAME         : DecrementDeffunctionBusyCount
+  DESCRIPTION  : Lowers the busy count of a
+                 deffunction construct
+  INPUTS       : The deffunction
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Busy count decremented if a clear
+                 is not in progress (see comment)
+  NOTES        : None
+ ***************************************************/
+static void DecrementDeffunctionBusyCount(
+  Environment *theEnv,
+  Deffunction *theDeffunction)
+  {
+   /* ==============================================
+      The deffunctions to which expressions in other
+      constructs may refer may already have been
+      deleted - thus, it is important not to modify
+      the busy flag during a clear.
+      ============================================== */
+   if (! ConstructData(theEnv)->ClearInProgress)
+     theDeffunction->busy--;
+  }
+
+/***************************************************
+  NAME         : IncrementDeffunctionBusyCount
+  DESCRIPTION  : Raises the busy count of a
+                 deffunction construct
+  INPUTS       : The deffunction
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Busy count incremented
+  NOTES        : None
+ ***************************************************/
+static void IncrementDeffunctionBusyCount(
+  Environment *theEnv,
+  Deffunction *theDeffunction)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   if (! ConstructData(theEnv)->ParsingConstruct)
+     { ConstructData(theEnv)->DanglingConstructs++; }
+#endif
+
+   theDeffunction->busy++;
+  }
+
+#if ! RUN_TIME
+
+/*****************************************************
+  NAME         : AllocateModule
+  DESCRIPTION  : Creates and initializes a
+                 list of deffunctions for a new module
+  INPUTS       : None
+  RETURNS      : The new deffunction module
+  SIDE EFFECTS : Deffunction module created
+  NOTES        : None
+ *****************************************************/
+static void *AllocateModule(
+  Environment *theEnv)
+  {
+   return (void *) get_struct(theEnv,deffunctionModuleData);
+  }
+
+/***************************************************
+  NAME         : ReturnModule
+  DESCRIPTION  : Removes a deffunction module and
+                 all associated deffunctions
+  INPUTS       : The deffunction module
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Module and deffunctions deleted
+  NOTES        : None
+ ***************************************************/
+static void ReturnModule(
+  Environment *theEnv,
+  void *theItem)
+  {
+#if (! BLOAD_ONLY)
+   FreeConstructHeaderModule(theEnv,(struct defmoduleItemHeader *) theItem,DeffunctionData(theEnv)->DeffunctionConstruct);
+#endif
+   rtn_struct(theEnv,deffunctionModuleData,theItem);
+  }
+
+/***************************************************
+  NAME         : ClearDeffunctionsReady
+  DESCRIPTION  : Determines if it is safe to
+                 remove all deffunctions
+                 Assumes *all* constructs will be
+                 deleted - only checks to see if
+                 any deffunctions are currently
+                 executing
+  INPUTS       : None
+  RETURNS      : True if no deffunctions are
+                 executing, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : Used by (clear) and (bload)
+ ***************************************************/
+static bool ClearDeffunctionsReady(
+  Environment *theEnv,
+  void *context)
+  {
+   return((DeffunctionData(theEnv)->ExecutingDeffunction != NULL) ? false : true);
+  }
+
+#endif
+
+#if RUN_TIME
+
+/**************************************************/
+/* RuntimeDeffunctionAction: Action to be applied */
+/*   to each deffunction construct when a runtime */
+/*   initialization occurs.                       */
+/**************************************************/
+static void RuntimeDeffunctionAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Deffunction *theDeffunction = (Deffunction *) theConstruct;
+   
+   theDeffunction->header.env = theEnv;
+  }
+
+/*********************************/
+/* DeffunctionRunTimeInitialize: */
+/*********************************/
+void DeffunctionRunTimeInitialize(
+  Environment *theEnv)
+  {
+   DoForAllConstructs(theEnv,RuntimeDeffunctionAction,DeffunctionData(theEnv)->DeffunctionModuleIndex,true,NULL);
+  }
+
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/***************************************************
+  NAME         : RemoveAllDeffunctions
+  DESCRIPTION  : Removes all deffunctions
+  INPUTS       : None
+  RETURNS      : True if all deffunctions
+                 removed, false otherwise
+  SIDE EFFECTS : Deffunctions removed
+  NOTES        : None
+ ***************************************************/
+static bool RemoveAllDeffunctions(
+  Environment *theEnv)
+  {
+   Deffunction *dptr, *dtmp;
+   unsigned oldbusy;
+   bool success = true;
+
+#if BLOAD || BLOAD_AND_BSAVE
+
+   if (Bloaded(theEnv) == true)
+     return false;
+#endif
+
+   dptr = GetNextDeffunction(theEnv,NULL);
+   while (dptr != NULL)
+     {
+      if (dptr->executing > 0)
+        {
+         DeffunctionDeleteError(theEnv,DeffunctionName(dptr));
+         success = false;
+        }
+      else
+        {
+         oldbusy = dptr->busy;
+         ExpressionDeinstall(theEnv,dptr->code);
+         dptr->busy = oldbusy;
+         ReturnPackedExpression(theEnv,dptr->code);
+         dptr->code = NULL;
+        }
+      dptr = GetNextDeffunction(theEnv,dptr);
+     }
+
+   dptr = GetNextDeffunction(theEnv,NULL);
+   while (dptr != NULL)
+     {
+      dtmp = dptr;
+      dptr = GetNextDeffunction(theEnv,dptr);
+      if (dtmp->executing == 0)
+        {
+         if (dtmp->busy > 0)
+           {
+            PrintWarningID(theEnv,"DFFNXFUN",1,false);
+            WriteString(theEnv,STDWRN,"Deffunction '");
+            WriteString(theEnv,STDWRN,DeffunctionName(dtmp));
+            WriteString(theEnv,STDWRN,"' only partially deleted due to usage by other constructs.\n");
+            SetDeffunctionPPForm(theEnv,dtmp,NULL);
+            success = false;
+           }
+         else
+           {
+            RemoveConstructFromModule(theEnv,&dtmp->header);
+            RemoveDeffunction(theEnv,dtmp);
+           }
+        }
+     }
+   return(success);
+  }
+
+/****************************************************
+  NAME         : DeffunctionDeleteError
+  DESCRIPTION  : Prints out an error message when
+                 a deffunction deletion attempt fails
+  INPUTS       : The deffunction name
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error message printed
+  NOTES        : None
+ ****************************************************/
+static void DeffunctionDeleteError(
+  Environment *theEnv,
+  const char *dfnxName)
+  {
+   CantDeleteItemErrorMessage(theEnv,"deffunction",dfnxName);
+  }
+
+/***************************************************
+  NAME         : SaveDeffunctionHeaders
+  DESCRIPTION  : Writes out deffunction forward
+                 declarations for (save) command
+  INPUTS       : The logical output name
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Writes out deffunctions with no
+                 body of actions
+  NOTES        : Used for deffunctions which are
+                 mutually recursive with other
+                 constructs
+ ***************************************************/
+static void SaveDeffunctionHeaders(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logicalName,
+  void *context)
+  {
+   DoForAllConstructsInModule(theEnv,theModule,
+                              SaveDeffunctionHeader,
+                              DeffunctionData(theEnv)->DeffunctionModuleIndex,
+                              false,(void *) logicalName);
+  }
+
+/***************************************************
+  NAME         : SaveDeffunctionHeader
+  DESCRIPTION  : Writes a deffunction forward
+                 declaration to the save file
+  INPUTS       : 1) The deffunction
+                 2) The logical name of the output
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defffunction header written
+  NOTES        : None
+ ***************************************************/
+static void SaveDeffunctionHeader(
+  Environment *theEnv,
+  ConstructHeader *theDeffunction,
+  void *userBuffer)
+  {
+   Deffunction *dfnxPtr = (Deffunction *) theDeffunction;
+   const char *logicalName = (const char *) userBuffer;
+   unsigned short i;
+
+   if (DeffunctionPPForm(dfnxPtr) != NULL)
+     {
+      WriteString(theEnv,logicalName,"(deffunction ");
+      WriteString(theEnv,logicalName,DeffunctionModule(dfnxPtr));
+      WriteString(theEnv,logicalName,"::");
+      WriteString(theEnv,logicalName,DeffunctionName(dfnxPtr));
+      WriteString(theEnv,logicalName," (");
+      for (i = 0 ; i < dfnxPtr->minNumberOfParameters ; i++)
+        {
+         WriteString(theEnv,logicalName,"?p");
+         PrintUnsignedInteger(theEnv,logicalName,i);
+         if ((i + 1) != dfnxPtr->minNumberOfParameters)
+           WriteString(theEnv,logicalName," ");
+        }
+      if (dfnxPtr->maxNumberOfParameters == PARAMETERS_UNBOUNDED)
+        {
+         if (dfnxPtr->minNumberOfParameters != 0)
+           WriteString(theEnv,logicalName," ");
+         WriteString(theEnv,logicalName,"$?wildargs))\n\n");
+        }
+      else
+        WriteString(theEnv,logicalName,"))\n\n");
+     }
+  }
+
+/***************************************************
+  NAME         : SaveDeffunctions
+  DESCRIPTION  : Writes out deffunctions
+                 for (save) command
+  INPUTS       : The logical output name
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Writes out deffunctions
+  NOTES        : None
+ ***************************************************/
+static void SaveDeffunctions(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logicalName,
+  void *context)
+  {
+   SaveConstruct(theEnv,theModule,logicalName,DeffunctionData(theEnv)->DeffunctionConstruct);
+  }
+
+#endif
+
+#if DEBUGGING_FUNCTIONS
+
+/******************************************************************
+  NAME         : DeffunctionWatchAccess
+  DESCRIPTION  : Parses a list of deffunction names passed by
+                 AddWatchItem() and sets the traces accordingly
+  INPUTS       : 1) A code indicating which trace flag is to be set
+                    Ignored
+                 2) The value to which to set the trace flags
+                 3) A list of expressions containing the names
+                    of the deffunctions for which to set traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags set in specified deffunctions
+  NOTES        : Accessory function for AddWatchItem()
+ ******************************************************************/
+static bool DeffunctionWatchAccess(
+  Environment *theEnv,
+  int code,
+  bool newState,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+
+   return(ConstructSetWatchAccess(theEnv,DeffunctionData(theEnv)->DeffunctionConstruct,newState,argExprs,
+                                  (ConstructGetWatchFunction *) DeffunctionGetWatch,
+                                  (ConstructSetWatchFunction *) DeffunctionSetWatch));
+  }
+
+/***********************************************************************
+  NAME         : DeffunctionWatchPrint
+  DESCRIPTION  : Parses a list of deffunction names passed by
+                 AddWatchItem() and displays the traces accordingly
+  INPUTS       : 1) The logical name of the output
+                 2) A code indicating which trace flag is to be examined
+                    Ignored
+                 3) A list of expressions containing the names
+                    of the deffunctions for which to examine traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags displayed for specified deffunctions
+  NOTES        : Accessory function for AddWatchItem()
+ ***********************************************************************/
+static bool DeffunctionWatchPrint(
+  Environment *theEnv,
+  const char *logName,
+  int code,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+
+   return(ConstructPrintWatchAccess(theEnv,DeffunctionData(theEnv)->DeffunctionConstruct,logName,argExprs,
+                                    (ConstructGetWatchFunction *) DeffunctionGetWatch,
+                                    (ConstructSetWatchFunction *) DeffunctionSetWatch));
+  }
+
+/*********************************************************
+  NAME         : DeffunctionSetWatch
+  DESCRIPTION  : Sets the trace to ON/OFF for the
+                 deffunction
+  INPUTS       : 1) True to set the trace on,
+                    false to set it off
+                 2) A pointer to the deffunction
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Watch flag for the deffunction set
+  NOTES        : None
+ *********************************************************/
+void DeffunctionSetWatch(
+  Deffunction *theDeffunction,
+  bool newState)
+  {
+   theDeffunction->trace = newState;
+  }
+
+/*********************************************************
+  NAME         : DeffunctionGetWatch
+  DESCRIPTION  : Determines if trace messages are
+                 gnerated when executing deffunction
+  INPUTS       : A pointer to the deffunction
+  RETURNS      : True if a trace is active,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************************/
+bool DeffunctionGetWatch(
+  Deffunction *theDeffunction)
+  {
+   return theDeffunction->trace;
+  }
+
+#endif
+
+/*##################################*/
+/* Additional Environment Functions */
+/*##################################*/
+
+const char *DeffunctionModule(
+  Deffunction *theDeffunction)
+  {
+   return GetConstructModuleName(&theDeffunction->header);
+  }
+
+const char *DeffunctionName(
+  Deffunction *theDeffunction)
+  {
+   return GetConstructNameString(&theDeffunction->header);
+  }
+
+const char *DeffunctionPPForm(
+  Deffunction *theDeffunction)
+  {
+   return GetConstructPPForm(&theDeffunction->header);
+  }
+
+CLIPSLexeme *GetDeffunctionNamePointer(
+  Environment *theEnv,
+  Deffunction *theDeffunction)
+  {
+   return GetConstructNamePointer(&theDeffunction->header);
+  }
+
+void SetDeffunctionPPForm(
+  Environment *theEnv,
+  Deffunction *theDeffunction,
+  const char *thePPForm)
+  {
+   SetConstructPPForm(theEnv,&theDeffunction->header,thePPForm);
+  }
+
+#endif
+
+
diff --git a/clips/dffnxfun.h b/clips/dffnxfun.h
new file mode 100755
index 000000000..427e11a4a
--- /dev/null
+++ b/clips/dffnxfun.h
@@ -0,0 +1,155 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*              DEFFUNCTION HEADER FILE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warning.                              */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added missing initializer for ENTITY_RECORD.   */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffnxfun
+
+#pragma once
+
+#define _H_dffnxfun
+
+typedef struct deffunction Deffunction;
+typedef struct deffunctionModuleData DeffunctionModuleData;
+
+#include "entities.h"
+#include "moduldef.h"
+#include "constrct.h"
+#include "evaluatn.h"
+
+struct deffunctionModuleData
+  {
+   struct defmoduleItemHeader header;
+  };
+
+struct deffunction
+  {
+   ConstructHeader header;
+   unsigned busy;
+   unsigned executing;
+   bool trace;
+   Expression *code;
+   unsigned short minNumberOfParameters;
+   unsigned short maxNumberOfParameters;
+   unsigned short numberOfLocalVars;
+  };
+
+#define DEFFUNCTION_DATA 23
+
+struct deffunctionData
+  {
+   Construct *DeffunctionConstruct;
+   unsigned DeffunctionModuleIndex;
+   EntityRecord DeffunctionEntityRecord;
+#if DEBUGGING_FUNCTIONS
+   bool WatchDeffunctions;
+#endif
+   struct CodeGeneratorItem *DeffunctionCodeItem;
+   Deffunction *ExecutingDeffunction;
+  };
+
+#define DeffunctionData(theEnv) ((struct deffunctionData *) GetEnvironmentData(theEnv,DEFFUNCTION_DATA))
+
+   bool                           CheckDeffunctionCall(Environment *,Deffunction *,int);
+   void                           DeffunctionGetBind(UDFValue *);
+   void                           DFRtnUnknown(UDFValue *);
+   void                           DFWildargs(UDFValue *);
+   const char                    *DeffunctionModule(Deffunction *);
+   Deffunction                   *FindDeffunction(Environment *,const char *);
+   Deffunction                   *FindDeffunctionInModule(Environment *,const char *);
+   void                           GetDeffunctionList(Environment *,CLIPSValue *,Defmodule *);
+   const char                    *DeffunctionName(Deffunction *);
+   CLIPSLexeme                   *GetDeffunctionNamePointer(Environment *,Deffunction *);
+   const char                    *DeffunctionPPForm(Deffunction *);
+   Deffunction                   *GetNextDeffunction(Environment *,Deffunction *);
+   bool                           DeffunctionIsDeletable(Deffunction *);
+   void                           SetDeffunctionPPForm(Environment *,Deffunction *,const char *);
+   bool                           Undeffunction(Deffunction *,Environment *);
+   void                           GetDeffunctionListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetDeffunctionModuleCommand(Environment *,UDFContext *,UDFValue *);
+   Deffunction                   *LookupDeffunctionByMdlOrScope(Environment *,const char *);
+   Deffunction                   *LookupDeffunctionInScope(Environment *,const char *);
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   void                           RemoveDeffunction(Environment *,Deffunction *);
+#endif
+   void                           SetupDeffunctions(Environment *);
+   void                           UndeffunctionCommand(Environment *,UDFContext *,UDFValue *);
+#if DEBUGGING_FUNCTIONS
+   bool                           DeffunctionGetWatch(Deffunction *);
+   void                           ListDeffunctions(Environment *,const char *,Defmodule *);
+   void                           DeffunctionSetWatch(Deffunction *,bool);
+   void                           ListDeffunctionsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           PPDeffunctionCommand(Environment *,UDFContext *,UDFValue *);
+#endif
+
+#if RUN_TIME
+   void                           DeffunctionRunTimeInitialize(Environment *);
+#endif
+
+#endif /* _H_dffnxfun */
+
+
+
+
+
+
diff --git a/clips/dffnxpsr.c b/clips/dffnxpsr.c
new file mode 100755
index 000000000..79e4e72a9
--- /dev/null
+++ b/clips/dffnxpsr.c
@@ -0,0 +1,512 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Deffunction Parsing Routines                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            If the last construct in a loaded file is a    */
+/*            deffunction or defmethod with no closing right */
+/*            parenthesis, an error should be issued, but is */
+/*            not. DR0872                                    */
+/*                                                           */
+/*            Added pragmas to prevent unused variable       */
+/*            warnings.                                      */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            ENVIRONMENT_API_ONLY no longer supported.      */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFFUNCTION_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#if DEFRULE_CONSTRUCT
+#include "network.h"
+#endif
+
+#if DEFGENERIC_CONSTRUCT
+#include "genrccom.h"
+#endif
+
+#include "constant.h"
+#include "cstrccom.h"
+#include "cstrcpsr.h"
+#include "constrct.h"
+#include "dffnxfun.h"
+#include "envrnmnt.h"
+#include "expressn.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pprint.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "symbol.h"
+
+#include "dffnxpsr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    ValidDeffunctionName(Environment *,const char *);
+   static Deffunction            *AddDeffunction(Environment *,CLIPSLexeme *,Expression *,unsigned short,unsigned short,unsigned short,bool);
+
+/***************************************************************************
+  NAME         : ParseDeffunction
+  DESCRIPTION  : Parses the deffunction construct
+  INPUTS       : The input logical name
+  RETURNS      : False if successful parse, true otherwise
+  SIDE EFFECTS : Creates valid deffunction definition
+  NOTES        : H/L Syntax :
+                 (deffunction <name> [<comment>]
+                    (<single-field-varible>* [<multifield-variable>])
+                    <action>*)
+ ***************************************************************************/
+bool ParseDeffunction(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   CLIPSLexeme *deffunctionName;
+   Expression *actions;
+   Expression *parameterList;
+   CLIPSLexeme *wildcard;
+   unsigned short min, max;
+   unsigned short lvars;
+   bool deffunctionError = false;
+   bool overwrite = false;
+   unsigned short owMin = 0, owMax = 0;
+   Deffunction *dptr;
+   struct token inputToken;
+   
+   SetPPBufferStatus(theEnv,true);
+
+   FlushPPBuffer(theEnv);
+   SetIndentDepth(theEnv,3);
+   SavePPBuffer(theEnv,"(deffunction ");
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv) == true) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"deffunctions");
+      return true;
+     }
+#endif
+
+   /*=======================================================*/
+   /* Parse the name and comment fields of the deffunction. */
+   /*=======================================================*/
+
+   deffunctionName = GetConstructNameAndComment(theEnv,readSource,&inputToken,"deffunction",
+                                                (FindConstructFunction *) FindDeffunctionInModule,
+                                                NULL,
+                                                "!",true,true,true,false);
+
+   if (deffunctionName == NULL)
+     { return true; }
+
+   if (ValidDeffunctionName(theEnv,deffunctionName->contents) == false)
+     { return true; }
+
+   /*==========================*/
+   /* Parse the argument list. */
+   /*==========================*/
+
+   parameterList = ParseProcParameters(theEnv,readSource,&inputToken,
+                                       NULL,&wildcard,&min,&max,&deffunctionError,NULL);
+   if (deffunctionError)
+     { return true; }
+
+   /*===================================================================*/
+   /* Go ahead and add the deffunction so it can be recursively called. */
+   /*===================================================================*/
+
+   if (ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      dptr = FindDeffunctionInModule(theEnv,deffunctionName->contents);
+      if (dptr == NULL)
+        { dptr = AddDeffunction(theEnv,deffunctionName,NULL,min,max,0,true); }
+      else
+        {
+         overwrite = true;
+         owMin = dptr->minNumberOfParameters;
+         owMax = dptr->maxNumberOfParameters;
+         dptr->minNumberOfParameters = min;
+         dptr->maxNumberOfParameters = max;
+        }
+     }
+   else
+     { dptr = AddDeffunction(theEnv,deffunctionName,NULL,min,max,0,true); }
+
+   if (dptr == NULL)
+     {
+      ReturnExpression(theEnv,parameterList);
+      return true;
+     }
+
+   /*==================================================*/
+   /* Parse the actions contained within the function. */
+   /*==================================================*/
+
+   PPCRAndIndent(theEnv);
+
+   ExpressionData(theEnv)->ReturnContext = true;
+   actions = ParseProcActions(theEnv,"deffunction",readSource,
+                              &inputToken,parameterList,wildcard,
+                              NULL,NULL,&lvars,NULL);
+
+   /*=============================================================*/
+   /* Check for the closing right parenthesis of the deffunction. */
+   /*=============================================================*/
+
+   if ((inputToken.tknType != RIGHT_PARENTHESIS_TOKEN) && /* DR0872 */
+       (actions != NULL))
+     {
+      SyntaxErrorMessage(theEnv,"deffunction");
+
+      ReturnExpression(theEnv,parameterList);
+      ReturnPackedExpression(theEnv,actions);
+
+      if (overwrite)
+        {
+         dptr->minNumberOfParameters = owMin;
+         dptr->maxNumberOfParameters = owMax;
+        }
+
+      if ((dptr->busy == 0) && (! overwrite))
+        {
+         RemoveConstructFromModule(theEnv,&dptr->header);
+         RemoveDeffunction(theEnv,dptr);
+        }
+
+      return true;
+     }
+
+   if (actions == NULL)
+     {
+      ReturnExpression(theEnv,parameterList);
+      if (overwrite)
+        {
+         dptr->minNumberOfParameters = owMin;
+         dptr->maxNumberOfParameters = owMax;
+        }
+
+      if ((dptr->busy == 0) && (! overwrite))
+        {
+         RemoveConstructFromModule(theEnv,&dptr->header);
+         RemoveDeffunction(theEnv,dptr);
+        }
+      return true;
+     }
+
+   /*==============================================*/
+   /* If we're only checking syntax, don't add the */
+   /* successfully parsed deffunction to the KB.   */
+   /*==============================================*/
+
+   if (ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      ReturnExpression(theEnv,parameterList);
+      ReturnPackedExpression(theEnv,actions);
+      if (overwrite)
+        {
+         dptr->minNumberOfParameters = owMin;
+         dptr->maxNumberOfParameters = owMax;
+        }
+      else
+        {
+         RemoveConstructFromModule(theEnv,&dptr->header);
+         RemoveDeffunction(theEnv,dptr);
+        }
+      return false;
+     }
+
+   /*=============================*/
+   /* Reformat the closing token. */
+   /*=============================*/
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,inputToken.printForm);
+   SavePPBuffer(theEnv,"\n");
+
+   /*======================*/
+   /* Add the deffunction. */
+   /*======================*/
+
+   AddDeffunction(theEnv,deffunctionName,actions,min,max,lvars,false);
+
+   ReturnExpression(theEnv,parameterList);
+
+   return(deffunctionError);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/************************************************************
+  NAME         : ValidDeffunctionName
+  DESCRIPTION  : Determines if a new deffunction of the given
+                 name can be defined in the current module
+  INPUTS       : The new deffunction name
+  RETURNS      : True if OK, false otherwise
+  SIDE EFFECTS : Error message printed if not OK
+  NOTES        : GetConstructNameAndComment() (called before
+                 this function) ensures that the deffunction
+                 name does not conflict with one from
+                 another module
+ ************************************************************/
+static bool ValidDeffunctionName(
+  Environment *theEnv,
+  const char *theDeffunctionName)
+  {
+   Deffunction *theDeffunction;
+#if DEFGENERIC_CONSTRUCT
+   Defmodule *theModule;
+   Defgeneric *theDefgeneric;
+#endif
+
+   /*==============================================*/
+   /* A deffunction cannot be named the same as a  */
+   /* construct type, e.g, defclass, defrule, etc. */
+   /*==============================================*/
+
+   if (FindConstruct(theEnv,theDeffunctionName) != NULL)
+     {
+      PrintErrorID(theEnv,"DFFNXPSR",1,false);
+      WriteString(theEnv,STDERR,"Deffunctions are not allowed to replace constructs.\n");
+      return false;
+     }
+
+   /*========================================*/
+   /* A deffunction cannot be named the same */
+   /* as a pre-defined system function, e.g, */
+   /* watch, list-defrules, etc.             */
+   /*========================================*/
+
+   if (FindFunction(theEnv,theDeffunctionName) != NULL)
+     {
+      PrintErrorID(theEnv,"DFFNXPSR",2,false);
+      WriteString(theEnv,STDERR,"Deffunctions are not allowed to replace external functions.\n");
+      return false;
+     }
+
+#if DEFGENERIC_CONSTRUCT
+
+   /*===========================================*/
+   /* A deffunction cannot be named the same as */
+   /* a generic function (either in this module */
+   /* or imported from another).                */
+   /*===========================================*/
+
+   theDefgeneric = LookupDefgenericInScope(theEnv,theDeffunctionName);
+
+   if (theDefgeneric != NULL)
+     {
+      theModule = GetConstructModuleItem(&theDefgeneric->header)->theModule;
+      if (theModule != GetCurrentModule(theEnv))
+        {
+         PrintErrorID(theEnv,"DFFNXPSR",5,false);
+         WriteString(theEnv,STDERR,"Defgeneric ");
+         WriteString(theEnv,STDERR,DefgenericName(theDefgeneric));
+         WriteString(theEnv,STDERR," imported from module ");
+         WriteString(theEnv,STDERR,DefmoduleName(theModule));
+         WriteString(theEnv,STDERR," conflicts with this deffunction.\n");
+         return false;
+        }
+      else
+        {
+         PrintErrorID(theEnv,"DFFNXPSR",3,false);
+         WriteString(theEnv,STDERR,"Deffunctions are not allowed to replace generic functions.\n");
+        }
+      return false;
+     }
+#endif
+
+   theDeffunction = FindDeffunctionInModule(theEnv,theDeffunctionName);
+   if (theDeffunction != NULL)
+     {
+      /*=============================================*/
+      /* And a deffunction in the current module can */
+      /* only be redefined if it is not executing.   */
+      /*=============================================*/
+
+      if (theDeffunction->executing)
+        {
+         PrintErrorID(theEnv,"DFFNXPSR",4,false);
+         WriteString(theEnv,STDERR,"Deffunction '");
+         WriteString(theEnv,STDERR,DeffunctionName(theDeffunction));
+         WriteString(theEnv,STDERR,"' may not be redefined while it is executing.\n");
+         return false;
+        }
+     }
+   return true;
+  }
+
+/****************************************************
+  NAME         : AddDeffunction
+  DESCRIPTION  : Adds a deffunction to the list of
+                 deffunctions
+  INPUTS       : 1) The symbolic name
+                 2) The action expressions
+                 3) The minimum number of arguments
+                 4) The maximum number of arguments
+                    (can be -1)
+                 5) The number of local variables
+                 6) A flag indicating if this is
+                    a header call so that the
+                    deffunction can be recursively
+                    called
+  RETURNS      : The new deffunction (NULL on errors)
+  SIDE EFFECTS : Deffunction structures allocated
+  NOTES        : Assumes deffunction is not executing
+ ****************************************************/
+static Deffunction *AddDeffunction(
+  Environment *theEnv,
+  CLIPSLexeme *name,
+  Expression *actions,
+  unsigned short min,
+  unsigned short max,
+  unsigned short lvars,
+  bool headerp)
+  {
+   Deffunction *dfuncPtr;
+   unsigned oldbusy;
+#if DEBUGGING_FUNCTIONS
+   bool DFHadWatch = false;
+#else
+#if MAC_XCD
+#pragma unused(headerp)
+#endif
+#endif
+
+   /*===============================================================*/
+   /* If the deffunction doesn't exist, create a new structure to   */
+   /* contain it and add it to the List of deffunctions. Otherwise, */
+   /* use the existing structure and remove the pretty print form   */
+   /* and interpretive code.                                        */
+   /*===============================================================*/
+
+   dfuncPtr = FindDeffunctionInModule(theEnv,name->contents);
+   if (dfuncPtr == NULL)
+     {
+      dfuncPtr = get_struct(theEnv,deffunction);
+      InitializeConstructHeader(theEnv,"deffunction",DEFFUNCTION,&dfuncPtr->header,name);
+      IncrementLexemeCount(name);
+      dfuncPtr->code = NULL;
+      dfuncPtr->minNumberOfParameters = min;
+      dfuncPtr->maxNumberOfParameters = max;
+      dfuncPtr->numberOfLocalVars = lvars;
+      dfuncPtr->busy = 0;
+      dfuncPtr->executing = 0;
+     }
+   else
+     {
+#if DEBUGGING_FUNCTIONS
+      DFHadWatch = DeffunctionGetWatch(dfuncPtr);
+#endif
+      dfuncPtr->minNumberOfParameters = min;
+      dfuncPtr->maxNumberOfParameters = max;
+      dfuncPtr->numberOfLocalVars = lvars;
+      oldbusy = dfuncPtr->busy;
+      ExpressionDeinstall(theEnv,dfuncPtr->code);
+      dfuncPtr->busy = oldbusy;
+      ReturnPackedExpression(theEnv,dfuncPtr->code);
+      dfuncPtr->code = NULL;
+      SetDeffunctionPPForm(theEnv,dfuncPtr,NULL);
+
+      /*======================================*/
+      /* Remove the deffunction from the list */
+      /* so that it can be added at the end.  */
+      /*======================================*/
+
+      RemoveConstructFromModule(theEnv,&dfuncPtr->header);
+     }
+
+   AddConstructToModule(&dfuncPtr->header);
+
+   /*====================================*/
+   /* Install the new interpretive code. */
+   /*====================================*/
+
+   if (actions != NULL)
+     {
+      /*=================================================*/
+      /* If a deffunction is recursive, do not increment */
+      /* its busy count based on self-references.        */
+      /*=================================================*/
+
+      oldbusy = dfuncPtr->busy;
+      ExpressionInstall(theEnv,actions);
+      dfuncPtr->busy = oldbusy;
+      dfuncPtr->code = actions;
+     }
+
+   /*==================================*/
+   /* Install the pretty print form if */
+   /* memory is not being conserved.   */
+   /*==================================*/
+
+#if DEBUGGING_FUNCTIONS
+   DeffunctionSetWatch(dfuncPtr,DFHadWatch ? true : DeffunctionData(theEnv)->WatchDeffunctions);
+
+   if ((GetConserveMemory(theEnv) == false) && (headerp == false))
+     { SetDeffunctionPPForm(theEnv,dfuncPtr,CopyPPBuffer(theEnv)); }
+#endif
+
+   return dfuncPtr;
+  }
+
+#endif /* DEFFUNCTION_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME) */
+
diff --git a/clips/dffnxpsr.h b/clips/dffnxpsr.h
new file mode 100755
index 000000000..296f0aa62
--- /dev/null
+++ b/clips/dffnxpsr.h
@@ -0,0 +1,57 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dffnxpsr
+
+#pragma once
+
+#define _H_dffnxpsr
+
+#if DEFFUNCTION_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME)
+
+   bool                           ParseDeffunction(Environment *,const char *);
+
+#endif /* DEFFUNCTION_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME) */
+
+#endif /* _H_dffnxpsr */
+
+
+
+
diff --git a/clips/dfinsbin.c b/clips/dfinsbin.c
new file mode 100755
index 000000000..99e689d7c
--- /dev/null
+++ b/clips/dfinsbin.c
@@ -0,0 +1,509 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Binary Load/Save Functions for Definstances      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFINSTANCES_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+
+#include "bload.h"
+#include "bsave.h"
+#include "cstrcbin.h"
+#include "defins.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "modulbin.h"
+
+#include "dfinsbin.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+typedef struct bsaveDefinstancesModule
+  {
+   struct bsaveDefmoduleItemHeader header;
+  } BSAVE_DEFINSTANCES_MODULE;
+
+typedef struct bsaveDefinstances
+  {
+   struct bsaveConstructHeader header;
+   unsigned long mkinstance;
+  } BSAVE_DEFINSTANCES;
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+#if BLOAD_AND_BSAVE
+   static void                    BsaveDefinstancesFind(Environment *);
+   static void                    MarkDefinstancesItems(Environment *,ConstructHeader *,void *);
+   static void                    BsaveDefinstancesExpressions(Environment *,FILE *);
+   static void                    BsaveDefinstancesExpression(Environment *,ConstructHeader *,void *);
+   static void                    BsaveStorageDefinstances(Environment *,FILE *);
+   static void                    BsaveDefinstancesDriver(Environment *,FILE *);
+   static void                    BsaveDefinstances(Environment *,ConstructHeader *,void *);
+#endif
+
+   static void                    BloadStorageDefinstances(Environment *);
+   static void                    BloadDefinstances(Environment *);
+   static void                    UpdateDefinstancesModule(Environment *,void *,unsigned long);
+   static void                    UpdateDefinstances(Environment *,void *,unsigned long);
+   static void                    ClearDefinstancesBload(Environment *);
+   static void                    DeallocateDefinstancesBinaryData(Environment *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : SetupDefinstancesBload
+  DESCRIPTION  : Initializes data structures and
+                   routines for binary loads of definstances
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Routines defined and structures initialized
+  NOTES        : None
+ ***********************************************************/
+void SetupDefinstancesBload(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,DFINSBIN_DATA,sizeof(struct definstancesBinaryData),DeallocateDefinstancesBinaryData);
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"definstances",0,BsaveDefinstancesFind,BsaveDefinstancesExpressions,
+                             BsaveStorageDefinstances,BsaveDefinstancesDriver,
+                             BloadStorageDefinstances,BloadDefinstances,
+                             ClearDefinstancesBload);
+#else
+   AddBinaryItem(theEnv,"definstances",0,NULL,NULL,NULL,NULL,
+                             BloadStorageDefinstances,BloadDefinstances,
+                             ClearDefinstancesBload);
+#endif
+  }
+
+/*************************************************************/
+/* DeallocateDefinstancesBinaryData: Deallocates environment */
+/*    data for the definstances binary functionality.        */
+/*************************************************************/
+static void DeallocateDefinstancesBinaryData(
+  Environment *theEnv)
+  {
+   size_t space;
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   space = DefinstancesBinaryData(theEnv)->DefinstancesCount * sizeof(struct definstances);
+   if (space != 0) genfree(theEnv,DefinstancesBinaryData(theEnv)->DefinstancesArray,space);
+
+   space =  DefinstancesBinaryData(theEnv)->ModuleCount * sizeof(struct definstancesModule);
+   if (space != 0) genfree(theEnv,DefinstancesBinaryData(theEnv)->ModuleArray,space);
+#endif
+  }
+
+/***************************************************
+  NAME         : BloadDefinstancesModuleRef
+  DESCRIPTION  : Returns a pointer to the
+                 appropriate definstances module
+  INPUTS       : The index of the module
+  RETURNS      : A pointer to the module
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void *BloadDefinstancesModuleRef(
+  Environment *theEnv,
+  unsigned long theIndex)
+  {
+   return ((void *) &DefinstancesBinaryData(theEnv)->ModuleArray[theIndex]);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if BLOAD_AND_BSAVE
+
+/***************************************************************************
+  NAME         : BsaveDefinstancesFind
+  DESCRIPTION  : For all definstances, this routine marks all
+                   the needed symbols.
+                 Also, it also counts the number of
+                   expression structures needed.
+                 Also, counts total number of definstances.
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : ExpressionCount (a global from BSAVE.C) is incremented
+                   for every expression needed
+                 Symbols are marked in their structures
+  NOTES        : Also sets bsaveIndex for each definstances (assumes
+                   definstances will be bsaved in order of binary list)
+ ***************************************************************************/
+static void BsaveDefinstancesFind(
+  Environment *theEnv)
+  {
+   SaveBloadCount(theEnv,DefinstancesBinaryData(theEnv)->ModuleCount);
+   SaveBloadCount(theEnv,DefinstancesBinaryData(theEnv)->DefinstancesCount);
+   DefinstancesBinaryData(theEnv)->DefinstancesCount = 0L;
+
+   DefinstancesBinaryData(theEnv)->ModuleCount = GetNumberOfDefmodules(theEnv);
+    
+   DoForAllConstructs(theEnv,MarkDefinstancesItems,
+                      DefinstancesData(theEnv)->DefinstancesModuleIndex,
+                      false,NULL);
+  }
+
+
+/***************************************************
+  NAME         : MarkDefinstancesItems
+  DESCRIPTION  : Marks the needed items for
+                 a definstances bsave
+  INPUTS       : 1) The definstances
+                 2) User data buffer (ignored)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Needed items marked
+  NOTES        : None
+ ***************************************************/
+static void MarkDefinstancesItems(
+  Environment *theEnv,
+  ConstructHeader *theDefinstances,
+  void *userBuffer)
+  {
+#if MAC_XCD
+#pragma unused(userBuffer)
+#endif
+
+   MarkConstructHeaderNeededItems(theDefinstances,DefinstancesBinaryData(theEnv)->DefinstancesCount++);
+   ExpressionData(theEnv)->ExpressionCount += ExpressionSize(((Definstances *) theDefinstances)->mkinstance);
+   MarkNeededItems(theEnv,((Definstances *) theDefinstances)->mkinstance);
+  }
+
+/***************************************************
+  NAME         : BsaveDefinstancesExpressions
+  DESCRIPTION  : Writes out all expressions needed
+                   by deffunctyions
+  INPUTS       : The file pointer of the binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : File updated
+  NOTES        : None
+ ***************************************************/
+static void BsaveDefinstancesExpressions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   DoForAllConstructs(theEnv,BsaveDefinstancesExpression,DefinstancesData(theEnv)->DefinstancesModuleIndex,
+                      false,fp);
+  }
+
+/***************************************************
+  NAME         : BsaveDefinstancesExpression
+  DESCRIPTION  : Saves the needed expressions for
+                 a definstances bsave
+  INPUTS       : 1) The definstances
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Expressions saved
+  NOTES        : None
+ ***************************************************/
+static void BsaveDefinstancesExpression(
+  Environment *theEnv,
+  ConstructHeader *theDefinstances,
+  void *userBuffer)
+  {
+   BsaveExpression(theEnv,((Definstances *) theDefinstances)->mkinstance,(FILE *) userBuffer);
+  }
+
+/***********************************************************
+  NAME         : BsaveStorageDefinstances
+  DESCRIPTION  : Writes out number of each type of structure
+                   required for definstances
+                 Space required for counts (unsigned long)
+  INPUTS       : File pointer of binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary file adjusted
+  NOTES        : None
+ ***********************************************************/
+static void BsaveStorageDefinstances(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+
+   space = sizeof(unsigned long) * 2;
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&DefinstancesBinaryData(theEnv)->ModuleCount,sizeof(unsigned long),fp);
+   GenWrite(&DefinstancesBinaryData(theEnv)->DefinstancesCount,sizeof(unsigned long),fp);
+  }
+
+/*************************************************************************************
+  NAME         : BsaveDefinstancesDriver
+  DESCRIPTION  : Writes out definstances in binary format
+                 Space required (unsigned long)
+                 All definstances (sizeof(Definstances) * Number of definstances)
+  INPUTS       : File pointer of binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary file adjusted
+  NOTES        : None
+ *************************************************************************************/
+static void BsaveDefinstancesDriver(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   Defmodule *theModule;
+   DEFINSTANCES_MODULE *theModuleItem;
+   BSAVE_DEFINSTANCES_MODULE dummy_mitem;
+
+   space = ((sizeof(BSAVE_DEFINSTANCES_MODULE) * DefinstancesBinaryData(theEnv)->ModuleCount) +
+            (sizeof(BSAVE_DEFINSTANCES) * DefinstancesBinaryData(theEnv)->DefinstancesCount));
+   GenWrite(&space,sizeof(size_t),fp);
+
+   /* =================================
+      Write out each definstances module
+      ================================= */
+   DefinstancesBinaryData(theEnv)->DefinstancesCount = 0L;
+   theModule = GetNextDefmodule(theEnv,NULL);
+   while (theModule != NULL)
+     {
+      theModuleItem = (DEFINSTANCES_MODULE *)
+                      GetModuleItem(theEnv,theModule,FindModuleItem(theEnv,"definstances")->moduleIndex);
+      AssignBsaveDefmdlItemHdrVals(&dummy_mitem.header,&theModuleItem->header);
+      GenWrite(&dummy_mitem,sizeof(BSAVE_DEFINSTANCES_MODULE),fp);
+      theModule = GetNextDefmodule(theEnv,theModule);
+     }
+
+   /*==============================*/
+   /* Write out each definstances. */
+   /*==============================*/
+
+   DoForAllConstructs(theEnv,BsaveDefinstances,DefinstancesData(theEnv)->DefinstancesModuleIndex,
+                      false,fp);
+
+   RestoreBloadCount(theEnv,&DefinstancesBinaryData(theEnv)->ModuleCount);
+   RestoreBloadCount(theEnv,&DefinstancesBinaryData(theEnv)->DefinstancesCount);
+  }
+
+/***************************************************
+  NAME         : BsaveDefinstances
+  DESCRIPTION  : Bsaves a definstances
+  INPUTS       : 1) The definstances
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Definstances saved
+  NOTES        : None
+ ***************************************************/
+static void BsaveDefinstances(
+  Environment *theEnv,
+  ConstructHeader *theDefinstances,
+  void *userBuffer)
+  {
+   Definstances *dptr = (Definstances *) theDefinstances;
+   BSAVE_DEFINSTANCES dummy_df;
+
+   AssignBsaveConstructHeaderVals(&dummy_df.header,&dptr->header);
+  if (dptr->mkinstance != NULL)
+     {
+      dummy_df.mkinstance = ExpressionData(theEnv)->ExpressionCount;
+      ExpressionData(theEnv)->ExpressionCount += ExpressionSize(dptr->mkinstance);
+     }
+   else
+    dummy_df.mkinstance = ULONG_MAX;
+   GenWrite(&dummy_df,sizeof(BSAVE_DEFINSTANCES),(FILE *) userBuffer);
+  }
+
+#endif
+
+/***********************************************************************
+  NAME         : BloadStorageDefinstances
+  DESCRIPTION  : This routine space required for definstances
+                   structures and allocates space for them
+  INPUTS       : Nothing
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Arrays allocated and set
+  NOTES        : This routine makes no attempt to reset any pointers
+                   within the structures
+ ***********************************************************************/
+static void BloadStorageDefinstances(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   if (space == 0L)
+     return;
+   GenReadBinary(theEnv,&DefinstancesBinaryData(theEnv)->ModuleCount,sizeof(unsigned long));
+   GenReadBinary(theEnv,&DefinstancesBinaryData(theEnv)->DefinstancesCount,sizeof(unsigned long));
+   if (DefinstancesBinaryData(theEnv)->ModuleCount == 0L)
+     {
+      DefinstancesBinaryData(theEnv)->ModuleArray = NULL;
+      DefinstancesBinaryData(theEnv)->DefinstancesArray = NULL;
+      return;
+     }
+
+   space = (DefinstancesBinaryData(theEnv)->ModuleCount * sizeof(DEFINSTANCES_MODULE));
+   DefinstancesBinaryData(theEnv)->ModuleArray = (DEFINSTANCES_MODULE *) genalloc(theEnv,space);
+
+   if (DefinstancesBinaryData(theEnv)->DefinstancesCount == 0L)
+     {
+      DefinstancesBinaryData(theEnv)->DefinstancesArray = NULL;
+      return;
+     }
+
+   space = (DefinstancesBinaryData(theEnv)->DefinstancesCount * sizeof(Definstances));
+   DefinstancesBinaryData(theEnv)->DefinstancesArray = (Definstances *) genalloc(theEnv,space);
+  }
+
+/*********************************************************************
+  NAME         : BloadDefinstances
+  DESCRIPTION  : This routine reads definstances information from
+                   a binary file
+                 This routine moves through the definstances
+                   binary array updating pointers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pointers reset from array indices
+  NOTES        : Assumes all loading is finished
+ ********************************************************************/
+static void BloadDefinstances(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   BloadandRefresh(theEnv,DefinstancesBinaryData(theEnv)->ModuleCount,sizeof(BSAVE_DEFINSTANCES_MODULE),UpdateDefinstancesModule);
+   BloadandRefresh(theEnv,DefinstancesBinaryData(theEnv)->DefinstancesCount,sizeof(BSAVE_DEFINSTANCES),UpdateDefinstances);
+  }
+
+/*******************************************************
+  NAME         : UpdateDefinstancesModule
+  DESCRIPTION  : Updates definstances module with binary
+                 load data - sets pointers from
+                 offset information
+  INPUTS       : 1) A pointer to the bloaded data
+                 2) The index of the binary array
+                    element to update
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Definstances moudle pointers updated
+  NOTES        : None
+ *******************************************************/
+static void UpdateDefinstancesModule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_DEFINSTANCES_MODULE *bdptr;
+
+   bdptr = (BSAVE_DEFINSTANCES_MODULE *) buf;
+   UpdateDefmoduleItemHeader(theEnv,&bdptr->header,&DefinstancesBinaryData(theEnv)->ModuleArray[obji].header,
+                             sizeof(Definstances),DefinstancesBinaryData(theEnv)->DefinstancesArray);
+  }
+
+/***************************************************
+  NAME         : UpdateDefinstances
+  DESCRIPTION  : Updates definstances with binary
+                 load data - sets pointers from
+                 offset information
+  INPUTS       : 1) A pointer to the bloaded data
+                 2) The index of the binary array
+                    element to update
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Definstances pointers upadted
+  NOTES        : None
+ ***************************************************/
+static void UpdateDefinstances(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_DEFINSTANCES *bdptr;
+   Definstances *dfiptr;
+
+   bdptr = (BSAVE_DEFINSTANCES *) buf;
+   dfiptr = (Definstances *) &DefinstancesBinaryData(theEnv)->DefinstancesArray[obji];
+
+   UpdateConstructHeader(theEnv,&bdptr->header,&dfiptr->header,DEFINSTANCES,
+                         sizeof(DEFINSTANCES_MODULE),DefinstancesBinaryData(theEnv)->ModuleArray,
+                         sizeof(Definstances),DefinstancesBinaryData(theEnv)->DefinstancesArray);
+   dfiptr->mkinstance = ExpressionPointer(bdptr->mkinstance);
+   dfiptr->busy = 0;
+  }
+
+/***************************************************************
+  NAME         : ClearDefinstancesBload
+  DESCRIPTION  : Release all binary-loaded definstances
+                   structure arrays
+                 Resets definstances list to NULL
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Memory cleared
+  NOTES        : Definstances name symbol counts decremented
+ ***************************************************************/
+static void ClearDefinstancesBload(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   size_t space;
+
+   space = (sizeof(DEFINSTANCES_MODULE) * DefinstancesBinaryData(theEnv)->ModuleCount);
+   if (space == 0L)
+     return;
+   genfree(theEnv,DefinstancesBinaryData(theEnv)->ModuleArray,space);
+   DefinstancesBinaryData(theEnv)->ModuleArray = NULL;
+   DefinstancesBinaryData(theEnv)->ModuleCount = 0L;
+
+   for (i = 0 ; i < DefinstancesBinaryData(theEnv)->DefinstancesCount ; i++)
+     UnmarkConstructHeader(theEnv,&DefinstancesBinaryData(theEnv)->DefinstancesArray[i].header);
+   space = (sizeof(Definstances) * DefinstancesBinaryData(theEnv)->DefinstancesCount);
+   if (space == 0)
+     return;
+   genfree(theEnv,DefinstancesBinaryData(theEnv)->DefinstancesArray,space);
+   DefinstancesBinaryData(theEnv)->DefinstancesArray = NULL;
+   DefinstancesBinaryData(theEnv)->DefinstancesCount = 0L;
+  }
+
+#endif
+
diff --git a/clips/dfinsbin.h b/clips/dfinsbin.h
new file mode 100755
index 000000000..0e5fa086d
--- /dev/null
+++ b/clips/dfinsbin.h
@@ -0,0 +1,66 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dfinsbin
+
+#pragma once
+
+#define _H_dfinsbin
+
+#if DEFINSTANCES_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+
+#include "defins.h"
+
+#define DFINSBIN_DATA 25
+
+struct definstancesBinaryData
+  {
+   Definstances *DefinstancesArray;
+   unsigned long DefinstancesCount;
+   unsigned long ModuleCount;
+   DEFINSTANCES_MODULE *ModuleArray;
+  };
+
+#define DefinstancesBinaryData(theEnv) ((struct definstancesBinaryData *) GetEnvironmentData(theEnv,DFINSBIN_DATA))
+
+   void                           SetupDefinstancesBload(Environment *);
+   void                          *BloadDefinstancesModuleRef(Environment *,unsigned long);
+
+#endif /* DEFINSTANCES_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) */
+
+#endif /* _H_dfinsbin */
+
+
+
diff --git a/clips/dfinscmp.c b/clips/dfinscmp.c
new file mode 100755
index 000000000..3ed60cec8
--- /dev/null
+++ b/clips/dfinscmp.c
@@ -0,0 +1,345 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Definstances Construct Compiler Code             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFINSTANCES_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include "conscomp.h"
+#include "defins.h"
+#include "envrnmnt.h"
+
+#include "dfinscmp.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ReadyDefinstancesForCode(Environment *);
+   static bool                    DefinstancesToCode(Environment *,const char *,const char *,char *,unsigned int,
+                                                     FILE *,unsigned int,unsigned int);
+   static void                    CloseDefinstancesFiles(Environment *,FILE *,FILE *,unsigned int);
+   static void                    DefinstancesModuleToCode(Environment *,FILE *,Defmodule *,unsigned int,unsigned int);
+   static void                    SingleDefinstancesToCode(Environment*,FILE *,Definstances *,unsigned int,unsigned int,unsigned int);
+   static void                    InitDefinstancesCode(Environment *,FILE *,unsigned int,unsigned int);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupDefinstancesCompiler
+  DESCRIPTION  : Initializes the construct compiler
+                   item for definstances
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Code generator item initialized
+  NOTES        : None
+ ***************************************************/
+void SetupDefinstancesCompiler(
+  Environment *theEnv)
+  {
+   DefinstancesData(theEnv)->DefinstancesCodeItem = AddCodeGeneratorItem(theEnv,"definstances",0,ReadyDefinstancesForCode,
+                                               InitDefinstancesCode,DefinstancesToCode,2);
+  }
+
+
+/****************************************************
+  NAME         : DefinstancesCModuleReference
+  DESCRIPTION  : Prints out a reference to a
+                 definstances module
+  INPUTS       : 1) The output file
+                 2) The id of the module item
+                 3) The id of the image
+                 4) The maximum number of elements
+                    allowed in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Definstances module reference printed
+  NOTES        : None
+ ****************************************************/
+void DefinstancesCModuleReference(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned long count,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"MIHS &%s%u_%lu[%lu]",
+                      ModulePrefix(DefinstancesData(theEnv)->DefinstancesCodeItem),
+                      imageID,
+                      (count / maxIndices) + 1,
+                      (count % maxIndices));
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : ReadyDefinstancesForCode
+  DESCRIPTION  : Sets index of deffunctions
+                   for use in compiled expressions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : BsaveIndices set
+  NOTES        : None
+ ***************************************************/
+static void ReadyDefinstancesForCode(
+  Environment *theEnv)
+  {
+   MarkConstructBsaveIDs(theEnv,DefinstancesData(theEnv)->DefinstancesModuleIndex);
+  }
+
+/***************************************************/
+/* InitDefinstancesCode: Writes out initialization */
+/*   code for definstances for a run-time module.  */
+/***************************************************/
+static void InitDefinstancesCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+#if MAC_XCD
+#pragma unused(maxIndices)
+#pragma unused(imageID)
+#pragma unused(theEnv)
+#endif
+   fprintf(initFP,"   DefinstancesRunTimeInitialize(theEnv);\n");
+  }
+
+/*******************************************************
+  NAME         : DefinstancesToCode
+  DESCRIPTION  : Writes out static array code for
+                   definstances
+  INPUTS       : 1) The base name of the construct set
+                 2) The base id for this construct
+                 3) The file pointer for the header file
+                 4) The base id for the construct set
+                 5) The max number of indices allowed
+                    in an array
+  RETURNS      : False on errors,
+                 True if definstances written
+  SIDE EFFECTS : Code written to files
+  NOTES        : None
+ *******************************************************/
+static bool DefinstancesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int fileCount = 1;
+   Defmodule *theModule;
+   Definstances *theDefinstances;
+   unsigned int moduleCount = 0, moduleArrayCount = 0, moduleArrayVersion = 1;
+   unsigned int definstancesArrayCount = 0, definstancesArrayVersion = 1;
+   FILE *moduleFile = NULL, *definstancesFile = NULL;
+
+   /* ================================================
+      Include the appropriate definstances header file
+      ================================================ */
+   fprintf(headerFP,"#include \"defins.h\"\n");
+
+   /* =============================================================
+      Loop through all the modules and all the definstances writing
+      their C code representation to the file as they are traversed
+      ============================================================= */
+   theModule = GetNextDefmodule(theEnv,NULL);
+
+   while (theModule != NULL)
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      moduleFile = OpenFileIfNeeded(theEnv,moduleFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                    moduleArrayVersion,headerFP,
+                                    "DEFINSTANCES_MODULE",ModulePrefix(DefinstancesData(theEnv)->DefinstancesCodeItem),
+                                    false,NULL);
+
+      if (moduleFile == NULL)
+        {
+         CloseDefinstancesFiles(theEnv,moduleFile,definstancesFile,maxIndices);
+         return false;
+        }
+
+      DefinstancesModuleToCode(theEnv,moduleFile,theModule,imageID,maxIndices);
+      moduleFile = CloseFileIfNeeded(theEnv,moduleFile,&moduleArrayCount,&moduleArrayVersion,
+                                     maxIndices,NULL,NULL);
+
+      theDefinstances = GetNextDefinstances(theEnv,NULL);
+
+      while (theDefinstances != NULL)
+        {
+         definstancesFile = OpenFileIfNeeded(theEnv,definstancesFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                             definstancesArrayVersion,headerFP,
+                                             "Definstances",ConstructPrefix(DefinstancesData(theEnv)->DefinstancesCodeItem),
+                                             false,NULL);
+         if (definstancesFile == NULL)
+           {
+            CloseDefinstancesFiles(theEnv,moduleFile,definstancesFile,maxIndices);
+            return false;
+           }
+
+         SingleDefinstancesToCode(theEnv,definstancesFile,theDefinstances,imageID,
+                                  maxIndices,moduleCount);
+         definstancesArrayCount++;
+         definstancesFile = CloseFileIfNeeded(theEnv,definstancesFile,&definstancesArrayCount,
+                                              &definstancesArrayVersion,maxIndices,NULL,NULL);
+
+         theDefinstances = GetNextDefinstances(theEnv,theDefinstances);
+        }
+
+      theModule = GetNextDefmodule(theEnv,theModule);
+      moduleCount++;
+      moduleArrayCount++;
+     }
+
+   CloseDefinstancesFiles(theEnv,moduleFile,definstancesFile,maxIndices);
+
+   return true;
+  }
+
+/***************************************************
+  NAME         : CloseDefinstancesFiles
+  DESCRIPTION  : Closes construct compiler files
+                  for definstances structures
+  INPUTS       : 1) The definstances module file
+                 2) The definstances structure file
+                 3) The maximum number of indices
+                    allowed in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Files closed
+  NOTES        : None
+ ***************************************************/
+static void CloseDefinstancesFiles(
+  Environment *theEnv,
+  FILE *moduleFile,
+  FILE *definstancesFile,
+  unsigned int maxIndices)
+  {
+   unsigned int count = maxIndices;
+   unsigned int arrayVersion = 0;
+
+   if (definstancesFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,definstancesFile,&count,&arrayVersion,
+                                         maxIndices,NULL,NULL);
+     }
+
+   if (moduleFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,moduleFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+  }
+
+/***************************************************
+  NAME         : DefinstancesModuleToCode
+  DESCRIPTION  : Writes out the C values for a
+                 definstances module item
+  INPUTS       : 1) The output file
+                 2) The module for the definstances
+                 3) The compile image id
+                 4) The maximum number of elements
+                    in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Definstances module item written
+  NOTES        : None
+ ***************************************************/
+static void DefinstancesModuleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"{");
+   ConstructModuleToCode(theEnv,theFile,theModule,imageID,maxIndices,
+                         DefinstancesData(theEnv)->DefinstancesModuleIndex,ConstructPrefix(DefinstancesData(theEnv)->DefinstancesCodeItem));
+   fprintf(theFile,"}");
+  }
+
+/***************************************************
+  NAME         : SingleDefinstancesToCode
+  DESCRIPTION  : Writes out a single definstances'
+                 data to the file
+  INPUTS       : 1) The output file
+                 2) The definstances
+                 3) The compile image id
+                 4) The maximum number of
+                    elements in an array
+                 5) The module index
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Definstances data written
+  NOTES        : None
+ ***************************************************/
+static void SingleDefinstancesToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Definstances *theDefinstances,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount)
+  {
+   /* ===================
+      Definstances Header
+      =================== */
+
+   fprintf(theFile,"{");
+   ConstructHeaderToCode(theEnv,theFile,&theDefinstances->header,imageID,maxIndices,moduleCount,
+                         ModulePrefix(DefinstancesData(theEnv)->DefinstancesCodeItem),
+                         ConstructPrefix(DefinstancesData(theEnv)->DefinstancesCodeItem));
+
+   /* ==========================
+      Definstances specific data
+      ========================== */
+   fprintf(theFile,",0,");
+   ExpressionToCode(theEnv,theFile,theDefinstances->mkinstance);
+   fprintf(theFile,"}");
+  }
+
+#endif
diff --git a/clips/dfinscmp.h b/clips/dfinscmp.h
new file mode 100755
index 000000000..c3a561e25
--- /dev/null
+++ b/clips/dfinscmp.h
@@ -0,0 +1,48 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Definstances Construct Compiler Code             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_dfinscmp
+
+#pragma once
+
+#define _H_dfinscmp
+
+#if DEFINSTANCES_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include <stdio.h>
+
+   void                           SetupDefinstancesCompiler(Environment *);
+   void                           DefinstancesCModuleReference(Environment *,FILE *,unsigned long,unsigned int,unsigned int);
+
+#endif /* DEFINSTANCES_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME) */
+
+#endif /* _H_dfinscmp */
+
+
diff --git a/clips/drive.c b/clips/drive.c
new file mode 100755
index 000000000..7d593f24b
--- /dev/null
+++ b/clips/drive.c
@@ -0,0 +1,1191 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/01/16             */
+   /*                                                     */
+   /*                    DRIVE MODULE                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Handles join network activity associated with    */
+/*   with the addition of a data entity such as a fact or    */
+/*   instance.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET and                  */
+/*            LOGICAL_DEPENDENCIES compilation flags.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Rule with exists CE has incorrect activation.  */
+/*            DR0867                                         */
+/*                                                           */
+/*      6.30: Added support for hashed memories.             */
+/*                                                           */
+/*            Added additional developer statistics to help  */
+/*            analyze join network performance.              */
+/*                                                           */
+/*            Removed pseudo-facts used in not CE.           */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include "agenda.h"
+#include "constant.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "incrrset.h"
+#include "lgcldpnd.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "retract.h"
+#include "router.h"
+
+#include "drive.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    EmptyDrive(Environment *,struct joinNode *,struct partialMatch *,int);
+   static void                    JoinNetErrorMessage(Environment *,struct joinNode *);
+
+/************************************************/
+/* NetworkAssert: Primary routine for filtering */
+/*   a partial match through the join network.  */
+/************************************************/
+void NetworkAssert(
+  Environment *theEnv,
+  struct partialMatch *binds,
+  struct joinNode *join)
+  {
+   /*=========================================================*/
+   /* If an incremental reset is being performed and the join */
+   /* is not part of the network to be reset, then return.    */
+   /*=========================================================*/
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   if (EngineData(theEnv)->IncrementalResetInProgress && (join->initialize == false)) return;
+#endif
+
+   /*==================================================*/
+   /* Use a special routine if this is the first join. */
+   /*==================================================*/
+
+   if (join->firstJoin)
+     {
+      EmptyDrive(theEnv,join,binds,NETWORK_ASSERT);
+      return;
+     }
+
+   /*================================*/
+   /* Enter the join from the right. */
+   /*================================*/
+
+   NetworkAssertRight(theEnv,binds,join,NETWORK_ASSERT);
+
+   return;
+  }
+
+/*****************************************************/
+/* NetworkAssertRight: Primary routine for filtering */
+/*   a partial match through the join network from   */
+/*   the RHS of a join.                              */
+/*****************************************************/
+void NetworkAssertRight(
+  Environment *theEnv,
+  struct partialMatch *rhsBinds,
+  struct joinNode *join,
+  int operation)
+  {
+   struct partialMatch *lhsBinds, *nextBind;
+   bool exprResult, restore = false;
+   struct partialMatch *oldLHSBinds = NULL;
+   struct partialMatch *oldRHSBinds = NULL;
+   struct joinNode *oldJoin = NULL;
+
+   /*=========================================================*/
+   /* If an incremental reset is being performed and the join */
+   /* is not part of the network to be reset, then return.    */
+   /*=========================================================*/
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   if (EngineData(theEnv)->IncrementalResetInProgress && (join->initialize == false)) return;
+#endif
+
+   if (join->firstJoin)
+     {
+      EmptyDrive(theEnv,join,rhsBinds,operation);
+      return;
+     }
+
+   /*=====================================================*/
+   /* The partial matches entering from the LHS of a join */
+   /* are stored in the left beta memory of the join.     */
+   /*=====================================================*/
+
+   lhsBinds = GetLeftBetaMemory(join,rhsBinds->hashValue);
+
+#if DEVELOPER
+   if (lhsBinds != NULL)
+     { EngineData(theEnv)->rightToLeftLoops++; }
+#endif
+
+   /*====================================*/
+   /* Set up the evaluation environment. */
+   /*====================================*/
+
+   if (lhsBinds != NULL)
+     {
+      oldLHSBinds = EngineData(theEnv)->GlobalLHSBinds;
+      oldRHSBinds = EngineData(theEnv)->GlobalRHSBinds;
+      oldJoin = EngineData(theEnv)->GlobalJoin;
+      EngineData(theEnv)->GlobalRHSBinds = rhsBinds;
+      EngineData(theEnv)->GlobalJoin = join;
+      restore = true;
+     }
+
+   /*===================================================*/
+   /* Compare each set of binds on the opposite side of */
+   /* the join with the set of binds that entered this  */
+   /* join. If the binds don't mismatch, then perform   */
+   /* the appropriate action for the logic of the join. */
+   /*===================================================*/
+
+   while (lhsBinds != NULL)
+     {
+      nextBind = lhsBinds->nextInMemory;
+      join->memoryCompares++;
+
+      /*===========================================================*/
+      /* Initialize some variables pointing to the partial matches */
+      /* in the LHS and RHS of the join.                           */
+      /*===========================================================*/
+
+      if (lhsBinds->hashValue != rhsBinds->hashValue)
+        {
+#if DEVELOPER
+         if (join->leftMemory->size == 1)
+           { EngineData(theEnv)->betaHashListSkips++; }
+         else
+           { EngineData(theEnv)->betaHashHTSkips++; }
+
+         if (lhsBinds->marker != NULL)
+           { EngineData(theEnv)->unneededMarkerCompare++; }
+#endif
+         lhsBinds = nextBind;
+         continue;
+        }
+
+      /*===============================================================*/
+      /* If there already is an associated RHS partial match stored in */
+      /* the LHS partial match from the beta memory of this join, then */
+      /* the exists/nand CE has already been satisfied and we can move */
+      /* on to the next partial match found in the beta memory.        */
+      /*===============================================================*/
+
+      if (lhsBinds->marker != NULL)
+        {
+#if DEVELOPER
+         EngineData(theEnv)->unneededMarkerCompare++;
+#endif
+         lhsBinds = nextBind;
+         continue;
+        }
+
+      /*===================================================*/
+      /* If the join has no expression associated with it, */
+      /* then the new partial match derived from the LHS   */
+      /* and RHS partial matches is valid.                 */
+      /*===================================================*/
+
+      if (join->networkTest == NULL)
+        { exprResult = true; }
+
+      /*=========================================================*/
+      /* If the join has an expression associated with it, then  */
+      /* evaluate the expression to determine if the new partial */
+      /* match derived from the LHS and RHS partial matches is   */
+      /* valid (i.e. variable bindings are consistent and        */
+      /* predicate expressions evaluate to true).                */
+      /*=========================================================*/
+
+      else
+        {
+#if DEVELOPER
+         EngineData(theEnv)->rightToLeftComparisons++;
+#endif
+         EngineData(theEnv)->GlobalLHSBinds = lhsBinds;
+         exprResult = EvaluateJoinExpression(theEnv,join->networkTest,join);
+         if (EvaluationData(theEnv)->EvaluationError)
+           {
+            if (join->patternIsNegated) exprResult = true;
+            SetEvaluationError(theEnv,false);
+           }
+
+#if DEVELOPER
+         if (exprResult)
+           { EngineData(theEnv)->rightToLeftSucceeds++; }
+#endif
+        }
+
+      if ((join->secondaryNetworkTest != NULL) && exprResult)
+        {
+         EngineData(theEnv)->GlobalLHSBinds = lhsBinds;
+         exprResult = EvaluateJoinExpression(theEnv,join->secondaryNetworkTest,join);
+         if (EvaluationData(theEnv)->EvaluationError)
+           { SetEvaluationError(theEnv,false); }
+        }
+
+      /*====================================================*/
+      /* If the join expression evaluated to true (i.e.     */
+      /* there were no conflicts between variable bindings, */
+      /* all tests were satisfied, etc.), then perform the  */
+      /* appropriate action given the logic of this join.   */
+      /*====================================================*/
+
+      if (exprResult != false)
+        {
+         if (join->patternIsExists)
+           {
+            AddBlockedLink(lhsBinds,rhsBinds);
+            PPDrive(theEnv,lhsBinds,NULL,join,operation);
+           }
+         else if (join->patternIsNegated || join->joinFromTheRight)
+           {
+            AddBlockedLink(lhsBinds,rhsBinds);
+            if (lhsBinds->children != NULL)
+              { PosEntryRetractBeta(theEnv,lhsBinds,lhsBinds->children,operation); }
+            /*
+            if (lhsBinds->dependents != NULL)
+              { RemoveLogicalSupport(theEnv,lhsBinds); }
+            */
+           }
+         else
+           { PPDrive(theEnv,lhsBinds,rhsBinds,join,operation); }
+        }
+
+      /*====================================*/
+      /* Move on to the next partial match. */
+      /*====================================*/
+
+      lhsBinds = nextBind;
+     }
+
+   /*=========================================*/
+   /* Restore the old evaluation environment. */
+   /*=========================================*/
+
+   if (restore)
+     {
+      EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+      EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+      EngineData(theEnv)->GlobalJoin = oldJoin;
+     }
+
+   return;
+  }
+
+/****************************************************/
+/* NetworkAssertLeft: Primary routine for filtering */
+/*   a partial match through the join network when  */
+/*   entering through the left side of a join.      */
+/****************************************************/
+void NetworkAssertLeft(
+  Environment *theEnv,
+  struct partialMatch *lhsBinds,
+  struct joinNode *join,
+  int operation)
+  {
+   struct partialMatch *rhsBinds;
+   bool exprResult, restore = false;
+   unsigned long entryHashValue;
+   struct partialMatch *oldLHSBinds = NULL;
+   struct partialMatch *oldRHSBinds = NULL;
+   struct joinNode *oldJoin = NULL;
+
+   if ((operation == NETWORK_RETRACT) && PartialMatchWillBeDeleted(theEnv,lhsBinds))
+     { return; }
+
+   /*=========================================================*/
+   /* If an incremental reset is being performed and the join */
+   /* is not part of the network to be reset, then return.    */
+   /*=========================================================*/
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   if (EngineData(theEnv)->IncrementalResetInProgress && (join->initialize == false)) return;
+#endif
+
+   /*===================================*/
+   /* The only action for the last join */
+   /* of a rule is to activate it.      */
+   /*===================================*/
+
+   if (join->ruleToActivate != NULL)
+     {
+      AddActivation(theEnv,join->ruleToActivate,lhsBinds);
+      return;
+     }
+
+   /*=====================================*/
+   /* Handle a join handling a test CE at */
+   /* the beginning of a not/and group.   */
+   /*=====================================*/
+
+   if (join->rightSideEntryStructure == NULL)
+     {
+      exprResult = true;
+
+      if (join->networkTest != NULL)
+        {
+         oldLHSBinds = EngineData(theEnv)->GlobalLHSBinds;
+         oldRHSBinds = EngineData(theEnv)->GlobalRHSBinds;
+         oldJoin = EngineData(theEnv)->GlobalJoin;
+
+         EngineData(theEnv)->GlobalLHSBinds = lhsBinds;
+         EngineData(theEnv)->GlobalRHSBinds = NULL;
+         EngineData(theEnv)->GlobalJoin = join;
+
+         exprResult = EvaluateJoinExpression(theEnv,join->networkTest,join);
+         if (EvaluationData(theEnv)->EvaluationError)
+           { SetEvaluationError(theEnv,false); }
+
+         EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+         EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+         EngineData(theEnv)->GlobalJoin = oldJoin;
+        }
+
+      if (exprResult)
+        { PPDrive(theEnv,lhsBinds,NULL,join,operation); }
+
+      return;
+     }
+
+   /*==================================================*/
+   /* Initialize some variables used to indicate which */
+   /* side is being compared to the new partial match. */
+   /*==================================================*/
+
+   entryHashValue = lhsBinds->hashValue;
+   if (join->joinFromTheRight)
+     { rhsBinds = GetRightBetaMemory(join,entryHashValue); }
+   else
+     { rhsBinds = GetAlphaMemory(theEnv,(struct patternNodeHeader *) join->rightSideEntryStructure,entryHashValue); }
+
+#if DEVELOPER
+   if (rhsBinds != NULL)
+     { EngineData(theEnv)->leftToRightLoops++; }
+#endif
+
+   /*====================================*/
+   /* Set up the evaluation environment. */
+   /*====================================*/
+
+   if ((rhsBinds != NULL) || (join->secondaryNetworkTest != NULL))
+     {
+      oldLHSBinds = EngineData(theEnv)->GlobalLHSBinds;
+      oldRHSBinds = EngineData(theEnv)->GlobalRHSBinds;
+      oldJoin = EngineData(theEnv)->GlobalJoin;
+      EngineData(theEnv)->GlobalLHSBinds = lhsBinds;
+      EngineData(theEnv)->GlobalJoin = join;
+      restore = true;
+     }
+
+   /*===================================================*/
+   /* Compare each set of binds on the opposite side of */
+   /* the join with the set of binds that entered this  */
+   /* join. If the binds don't mismatch, then perform   */
+   /* the appropriate action for the logic of the join. */
+   /*===================================================*/
+
+   while (rhsBinds != NULL)
+     {
+      if ((operation == NETWORK_RETRACT) && PartialMatchWillBeDeleted(theEnv,rhsBinds))
+        {
+         rhsBinds = rhsBinds->nextInMemory;
+         continue;
+        }
+
+      join->memoryCompares++;
+
+      /*===================================================*/
+      /* If the join has no expression associated with it, */
+      /* then the new partial match derived from the LHS   */
+      /* and RHS partial matches is valid.                 */
+      /*===================================================*/
+
+      if (join->networkTest == NULL)
+        { exprResult = true; }
+
+      /*=========================================================*/
+      /* If the join has an expression associated with it, then  */
+      /* evaluate the expression to determine if the new partial */
+      /* match derived from the LHS and RHS partial matches is   */
+      /* valid (i.e. variable bindings are consistent and        */
+      /* predicate expressions evaluate to true).                */
+      /*=========================================================*/
+
+      else
+        {
+#if DEVELOPER
+         EngineData(theEnv)->leftToRightComparisons++;
+#endif
+         EngineData(theEnv)->GlobalRHSBinds = rhsBinds;
+
+         exprResult = EvaluateJoinExpression(theEnv,join->networkTest,join);
+         if (EvaluationData(theEnv)->EvaluationError)
+           {
+            if (join->patternIsNegated) exprResult = true;
+            SetEvaluationError(theEnv,false);
+           }
+
+#if DEVELOPER
+         if (exprResult)
+           { EngineData(theEnv)->leftToRightSucceeds++; }
+#endif
+        }
+
+      // Bug Fix - Need to evaluate secondary network test for exists CE 0881
+
+      if ((join->secondaryNetworkTest != NULL) && exprResult && join->patternIsExists)
+        {
+         EngineData(theEnv)->GlobalRHSBinds = rhsBinds;
+         exprResult = EvaluateJoinExpression(theEnv,join->secondaryNetworkTest,join);
+         if (EvaluationData(theEnv)->EvaluationError)
+           { SetEvaluationError(theEnv,false); }
+        }
+
+      /*====================================================*/
+      /* If the join expression evaluated to true (i.e.     */
+      /* there were no conflicts between variable bindings, */
+      /* all tests were satisfied, etc.), then perform the  */
+      /* appropriate action given the logic of this join.   */
+      /*====================================================*/
+
+      if (exprResult != false)
+        {
+         /*==============================================*/
+         /* Use the PPDrive routine when the join isn't  */
+         /* associated with a not CE and it doesn't have */
+         /* a join from the right.                       */
+         /*==============================================*/
+
+         if ((join->patternIsNegated == false) &&
+             (join->patternIsExists == false) &&
+             (join->joinFromTheRight == false))
+           { PPDrive(theEnv,lhsBinds,rhsBinds,join,operation); }
+
+         /*==================================================*/
+         /* At most, one partial match will be generated for */
+         /* a match from the right memory of an exists CE.   */
+         /*==================================================*/
+
+         else if (join->patternIsExists)
+           {
+            AddBlockedLink(lhsBinds,rhsBinds);
+            PPDrive(theEnv,lhsBinds,NULL,join,operation);
+            EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+            EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+            EngineData(theEnv)->GlobalJoin = oldJoin;
+            return;
+           }
+
+         /*===========================================================*/
+         /* If the new partial match entered from the LHS of the join */
+         /* and the join is either associated with a not CE or the    */
+         /* join has a join from the right, then mark the LHS partial */
+         /* match indicating that there is a RHS partial match        */
+         /* preventing this join from being satisfied. Once this has  */
+         /* happened, the other RHS partial matches don't have to be  */
+         /* tested since it only takes one partial match to prevent   */
+         /* the LHS from being satisfied.                             */
+         /*===========================================================*/
+
+         else
+           {
+            AddBlockedLink(lhsBinds,rhsBinds);
+            break;
+           }
+        }
+
+      /*====================================*/
+      /* Move on to the next partial match. */
+      /*====================================*/
+
+      rhsBinds = rhsBinds->nextInMemory;
+     }
+
+   /*==================================================================*/
+   /* If a join with an associated not CE or join from the right was   */
+   /* entered from the LHS side of the join, and the join expression   */
+   /* failed for all sets of matches for the new bindings on the LHS   */
+   /* side (there was no RHS partial match preventing the LHS partial  */
+   /* match from being satisfied), then the LHS partial match appended */
+   /* with an pseudo-fact that represents the instance of the not      */
+   /* pattern or join from the right that was satisfied should be sent */
+   /* to the joins below this join.                                    */
+   /*==================================================================*/
+
+   if ((join->patternIsNegated || join->joinFromTheRight) &&
+       (! join->patternIsExists) &&
+       (lhsBinds->marker == NULL))
+     {
+      if (join->secondaryNetworkTest != NULL)
+        {
+         EngineData(theEnv)->GlobalRHSBinds = NULL;
+
+         exprResult = EvaluateJoinExpression(theEnv,join->secondaryNetworkTest,join);
+         if (EvaluationData(theEnv)->EvaluationError)
+           { SetEvaluationError(theEnv,false); }
+
+         if (exprResult)
+            { PPDrive(theEnv,lhsBinds,NULL,join,operation); }
+		}
+      else
+        { PPDrive(theEnv,lhsBinds,NULL,join,operation); }
+     }
+
+   /*=========================================*/
+   /* Restore the old evaluation environment. */
+   /*=========================================*/
+
+   if (restore)
+     {
+      EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+      EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+      EngineData(theEnv)->GlobalJoin = oldJoin;
+     }
+
+   return;
+  }
+
+/*******************************************************/
+/* EvaluateJoinExpression: Evaluates join expressions. */
+/*   Performs a faster evaluation for join expressions */
+/*   than if EvaluateExpression was used directly.     */
+/*******************************************************/
+bool EvaluateJoinExpression(
+  Environment *theEnv,
+  struct expr *joinExpr,
+  struct joinNode *joinPtr)
+  {
+   UDFValue theResult;
+   bool andLogic, result = true;
+
+   /*======================================*/
+   /* A NULL expression evaluates to true. */
+   /*======================================*/
+
+   if (joinExpr == NULL) return true;
+
+   /*====================================================*/
+   /* Initialize some variables which allow this routine */
+   /* to avoid calling the "and" and "or" functions if   */
+   /* they are the first part of the expression to be    */
+   /* evaluated. Most of the join expressions do not use */
+   /* deeply nested and/or functions so this technique   */
+   /* speeds up evaluation.                              */
+   /*====================================================*/
+
+   if (joinExpr->value == ExpressionData(theEnv)->PTR_AND)
+     {
+      andLogic = true;
+      joinExpr = joinExpr->argList;
+     }
+   else if (joinExpr->value == ExpressionData(theEnv)->PTR_OR)
+     {
+      andLogic = false;
+      joinExpr = joinExpr->argList;
+     }
+   else
+     { andLogic = true; }
+
+   /*=========================================*/
+   /* Evaluate each of the expressions linked */
+   /* together in the join expression.        */
+   /*=========================================*/
+
+   while (joinExpr != NULL)
+     {
+      /*================================*/
+      /* Evaluate a primitive function. */
+      /*================================*/
+
+      if ((EvaluationData(theEnv)->PrimitivesArray[joinExpr->type] == NULL) ?
+          false :
+          EvaluationData(theEnv)->PrimitivesArray[joinExpr->type]->evaluateFunction != NULL)
+        {
+         struct expr *oldArgument;
+
+         oldArgument = EvaluationData(theEnv)->CurrentExpression;
+         EvaluationData(theEnv)->CurrentExpression = joinExpr;
+         result = (*EvaluationData(theEnv)->PrimitivesArray[joinExpr->type]->evaluateFunction)(theEnv,joinExpr->value,&theResult);
+         EvaluationData(theEnv)->CurrentExpression = oldArgument;
+        }
+
+      /*=============================*/
+      /* Evaluate the "or" function. */
+      /*=============================*/
+
+      else if (joinExpr->value == ExpressionData(theEnv)->PTR_OR)
+        {
+         result = false;
+         if (EvaluateJoinExpression(theEnv,joinExpr,joinPtr) == true)
+           {
+            if (EvaluationData(theEnv)->EvaluationError)
+              { return false; }
+            result = true;
+           }
+         else if (EvaluationData(theEnv)->EvaluationError)
+           { return false; }
+        }
+
+      /*==============================*/
+      /* Evaluate the "and" function. */
+      /*==============================*/
+
+      else if (joinExpr->value == ExpressionData(theEnv)->PTR_AND)
+        {
+         result = true;
+         if (EvaluateJoinExpression(theEnv,joinExpr,joinPtr) == false)
+           {
+            if (EvaluationData(theEnv)->EvaluationError)
+              { return false; }
+            result = false;
+           }
+         else if (EvaluationData(theEnv)->EvaluationError)
+           { return false; }
+        }
+
+      /*==========================================================*/
+      /* Evaluate all other expressions using EvaluateExpression. */
+      /*==========================================================*/
+
+      else
+        {
+         EvaluateExpression(theEnv,joinExpr,&theResult);
+
+         if (EvaluationData(theEnv)->EvaluationError)
+           {
+            JoinNetErrorMessage(theEnv,joinPtr);
+            return false;
+           }
+
+         if (theResult.value == FalseSymbol(theEnv))
+           { result = false; }
+         else
+           { result = true; }
+        }
+
+      /*====================================*/
+      /* Handle the short cut evaluation of */
+      /* the "and" and "or" functions.      */
+      /*====================================*/
+
+      if ((andLogic == true) && (result == false))
+        { return false; }
+      else if ((andLogic == false) && (result == true))
+        { return true; }
+
+      /*==============================================*/
+      /* Move to the next expression to be evaluated. */
+      /*==============================================*/
+
+      joinExpr = joinExpr->nextArg;
+     }
+
+   /*=================================================*/
+   /* Return the result of evaluating the expression. */
+   /*=================================================*/
+
+   return(result);
+  }
+
+/*********************************/
+/* EvaluateSecondaryNetworkTest: */
+/*********************************/
+bool EvaluateSecondaryNetworkTest(
+  Environment *theEnv,
+  struct partialMatch *leftMatch,
+  struct joinNode *joinPtr)
+  {
+   bool joinExpr;
+   struct partialMatch *oldLHSBinds;
+   struct partialMatch *oldRHSBinds;
+   struct joinNode *oldJoin;
+
+   if (joinPtr->secondaryNetworkTest == NULL)
+     { return true; }
+
+#if DEVELOPER
+   EngineData(theEnv)->rightToLeftComparisons++;
+#endif
+   oldLHSBinds = EngineData(theEnv)->GlobalLHSBinds;
+   oldRHSBinds = EngineData(theEnv)->GlobalRHSBinds;
+   oldJoin = EngineData(theEnv)->GlobalJoin;
+   EngineData(theEnv)->GlobalLHSBinds = leftMatch;
+   EngineData(theEnv)->GlobalRHSBinds = NULL;
+   EngineData(theEnv)->GlobalJoin = joinPtr;
+
+   joinExpr = EvaluateJoinExpression(theEnv,joinPtr->secondaryNetworkTest,joinPtr);
+   EvaluationData(theEnv)->EvaluationError = false;
+
+   EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+   EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+   EngineData(theEnv)->GlobalJoin = oldJoin;
+
+   return(joinExpr);
+  }
+
+/************************/
+/* BetaMemoryHashValue: */
+/************************/
+unsigned long BetaMemoryHashValue(
+  Environment *theEnv,
+  struct expr *hashExpr,
+  struct partialMatch *lbinds,
+  struct partialMatch *rbinds,
+  struct joinNode *joinPtr)
+  {
+   UDFValue theResult;
+   struct partialMatch *oldLHSBinds;
+   struct partialMatch *oldRHSBinds;
+   struct joinNode *oldJoin;
+   unsigned long hashValue = 0;
+   unsigned long multiplier = 1;
+   union
+     {
+      void *vv;
+      unsigned long liv;
+     } fis;
+
+   /*======================================*/
+   /* A NULL expression evaluates to zero. */
+   /*======================================*/
+
+   if (hashExpr == NULL)
+     { return 0; }
+
+   /*=========================================*/
+   /* Initialize some of the global variables */
+   /* used when evaluating expressions.       */
+   /*=========================================*/
+
+   oldLHSBinds = EngineData(theEnv)->GlobalLHSBinds;
+   oldRHSBinds = EngineData(theEnv)->GlobalRHSBinds;
+   oldJoin = EngineData(theEnv)->GlobalJoin;
+   EngineData(theEnv)->GlobalLHSBinds = lbinds;
+   EngineData(theEnv)->GlobalRHSBinds = rbinds;
+   EngineData(theEnv)->GlobalJoin = joinPtr;
+
+   /*=========================================*/
+   /* Evaluate each of the expressions linked */
+   /* together in the join expression.        */
+   /*=========================================*/
+
+   while (hashExpr != NULL)
+     {
+      /*================================*/
+      /* Evaluate a primitive function. */
+      /*================================*/
+
+      if ((EvaluationData(theEnv)->PrimitivesArray[hashExpr->type] == NULL) ?
+          false :
+          EvaluationData(theEnv)->PrimitivesArray[hashExpr->type]->evaluateFunction != NULL)
+        {
+         struct expr *oldArgument;
+
+         oldArgument = EvaluationData(theEnv)->CurrentExpression;
+         EvaluationData(theEnv)->CurrentExpression = hashExpr;
+         (*EvaluationData(theEnv)->PrimitivesArray[hashExpr->type]->evaluateFunction)(theEnv,hashExpr->value,&theResult);
+         EvaluationData(theEnv)->CurrentExpression = oldArgument;
+        }
+
+      /*==========================================================*/
+      /* Evaluate all other expressions using EvaluateExpression. */
+      /*==========================================================*/
+
+      else
+        { EvaluateExpression(theEnv,hashExpr,&theResult); }
+
+      switch (theResult.header->type)
+        {
+         case STRING_TYPE:
+         case SYMBOL_TYPE:
+         case INSTANCE_NAME_TYPE:
+           hashValue += theResult.lexemeValue->bucket * multiplier;
+           break;
+
+         case INTEGER_TYPE:
+            hashValue += (theResult.integerValue->bucket * multiplier);
+            break;
+
+         case FLOAT_TYPE:
+           hashValue += (theResult.floatValue->bucket * multiplier);
+           break;
+
+          case FACT_ADDRESS_TYPE:
+#if OBJECT_SYSTEM
+          case INSTANCE_ADDRESS_TYPE:
+#endif
+            fis.liv = 0;
+            fis.vv = theResult.value;
+            hashValue += fis.liv * multiplier;
+            break;
+
+          case EXTERNAL_ADDRESS_TYPE:
+            fis.liv = 0;
+            fis.vv = theResult.externalAddressValue->contents;
+            hashValue += fis.liv * multiplier;
+            break;
+        }
+
+      /*==============================================*/
+      /* Move to the next expression to be evaluated. */
+      /*==============================================*/
+
+      hashExpr = hashExpr->nextArg;
+	  multiplier = multiplier * 509;
+	 }
+
+   /*=======================================*/
+   /* Restore some of the global variables. */
+   /*=======================================*/
+
+   EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+   EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+   EngineData(theEnv)->GlobalJoin = oldJoin;
+
+   /*=================================================*/
+   /* Return the result of evaluating the expression. */
+   /*=================================================*/
+
+   return hashValue;
+  }
+
+/*******************************************************************/
+/* PPDrive: Handles the merging of an alpha memory partial match   */
+/*   with a beta memory partial match for a join that has positive */
+/*   LHS entry and positive RHS entry. The partial matches being   */
+/*   merged have previously been checked to determine that they    */
+/*   satisify the constraints for the join. Once merged, the new   */
+/*   partial match is sent to each child join of the join from     */
+/*   which the merge took place.                                   */
+/*******************************************************************/
+void PPDrive(
+  Environment *theEnv,
+  struct partialMatch *lhsBinds,
+  struct partialMatch *rhsBinds,
+  struct joinNode *join,
+  int operation)
+  {
+   struct partialMatch *linker;
+   struct joinLink *listOfJoins;
+   unsigned long hashValue;
+
+   /*================================================*/
+   /* Send the new partial match to all child joins. */
+   /*================================================*/
+
+   listOfJoins = join->nextLinks;
+   if (listOfJoins == NULL) return;
+
+   /*===============================================================*/
+   /* In the current implementation, all children of this join must */
+   /* be entered from the same side (either all left or all right). */
+   /*===============================================================*/
+
+   while (listOfJoins != NULL)
+     {
+      /*==================================================*/
+      /* Merge the alpha and beta memory partial matches. */
+      /*==================================================*/
+
+      linker = MergePartialMatches(theEnv,lhsBinds,rhsBinds);
+
+      /*================================================*/
+      /* Determine the hash value of the partial match. */
+      /*================================================*/
+
+      if (listOfJoins->enterDirection == LHS)
+        {
+         if (listOfJoins->join->leftHash != NULL)
+           { hashValue = BetaMemoryHashValue(theEnv,listOfJoins->join->leftHash,linker,NULL,listOfJoins->join); }
+         else
+           { hashValue = 0; }
+        }
+      else
+        {
+         if (listOfJoins->join->rightHash != NULL)
+           { hashValue = BetaMemoryHashValue(theEnv,listOfJoins->join->rightHash,linker,NULL,listOfJoins->join); }
+         else
+           { hashValue = 0; }
+        }
+
+      /*=======================================================*/
+      /* Add the partial match to the beta memory of the join. */
+      /*=======================================================*/
+
+      UpdateBetaPMLinks(theEnv,linker,lhsBinds,rhsBinds,listOfJoins->join,hashValue,listOfJoins->enterDirection);
+
+      if (listOfJoins->enterDirection == LHS)
+        { NetworkAssertLeft(theEnv,linker,listOfJoins->join,operation); }
+      else
+        { NetworkAssertRight(theEnv,linker,listOfJoins->join,operation); }
+
+      listOfJoins = listOfJoins->next;
+     }
+
+   return;
+  }
+
+/***********************************************************************/
+/* EPMDrive: Drives an empty partial match to the next level of joins. */
+/*   An empty partial match is usually associated with a negated CE    */
+/*   that is the first CE of a rule.                                   */
+/***********************************************************************/
+void EPMDrive(
+  Environment *theEnv,
+  struct partialMatch *parent,
+  struct joinNode *join,
+  int operation)
+  {
+   struct partialMatch *linker;
+   struct joinLink *listOfJoins;
+
+   listOfJoins = join->nextLinks;
+   if (listOfJoins == NULL) return;
+
+   while (listOfJoins != NULL)
+     {
+      linker = CreateEmptyPartialMatch(theEnv);
+
+      UpdateBetaPMLinks(theEnv,linker,parent,NULL,listOfJoins->join,0,listOfJoins->enterDirection);
+
+      if (listOfJoins->enterDirection == LHS)
+        { NetworkAssertLeft(theEnv,linker,listOfJoins->join,operation); }
+      else
+        { NetworkAssertRight(theEnv,linker,listOfJoins->join,operation); }
+
+      listOfJoins = listOfJoins->next;
+     }
+  }
+
+/***************************************************************/
+/* EmptyDrive: Handles the entry of a alpha memory partial     */
+/*   match from the RHS of a join that is the first join of    */
+/*   a rule (i.e. a join that cannot be entered from the LHS). */
+/***************************************************************/
+static void EmptyDrive(
+  Environment *theEnv,
+  struct joinNode *join,
+  struct partialMatch *rhsBinds,
+  int operation)
+  {
+   struct partialMatch *linker, *existsParent = NULL, *notParent;
+   struct joinLink *listOfJoins;
+   bool joinExpr;
+   unsigned long hashValue;
+   struct partialMatch *oldLHSBinds;
+   struct partialMatch *oldRHSBinds;
+   struct joinNode *oldJoin;
+
+   /*======================================================*/
+   /* Determine if the alpha memory partial match satifies */
+   /* the join expression. If it doesn't then no further   */
+   /* action is taken.                                     */
+   /*======================================================*/
+
+   if (join->networkTest != NULL)
+     {
+
+#if DEVELOPER
+      EngineData(theEnv)->rightToLeftComparisons++;
+#endif
+      oldLHSBinds = EngineData(theEnv)->GlobalLHSBinds;
+      oldRHSBinds = EngineData(theEnv)->GlobalRHSBinds;
+      oldJoin = EngineData(theEnv)->GlobalJoin;
+      EngineData(theEnv)->GlobalLHSBinds = NULL;
+      EngineData(theEnv)->GlobalRHSBinds = rhsBinds;
+      EngineData(theEnv)->GlobalJoin = join;
+
+      joinExpr = EvaluateJoinExpression(theEnv,join->networkTest,join);
+      EvaluationData(theEnv)->EvaluationError = false;
+
+      EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+      EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+      EngineData(theEnv)->GlobalJoin = oldJoin;
+
+      if (joinExpr == false) return;
+     }
+
+   if (join->secondaryNetworkTest != NULL)
+     {
+#if DEVELOPER
+      EngineData(theEnv)->rightToLeftComparisons++;
+#endif
+      oldLHSBinds = EngineData(theEnv)->GlobalLHSBinds;
+      oldRHSBinds = EngineData(theEnv)->GlobalRHSBinds;
+      oldJoin = EngineData(theEnv)->GlobalJoin;
+      EngineData(theEnv)->GlobalLHSBinds = NULL;
+      EngineData(theEnv)->GlobalRHSBinds = rhsBinds;
+      EngineData(theEnv)->GlobalJoin = join;
+
+      joinExpr = EvaluateJoinExpression(theEnv,join->secondaryNetworkTest,join);
+      EvaluationData(theEnv)->EvaluationError = false;
+
+      EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+      EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+      EngineData(theEnv)->GlobalJoin = oldJoin;
+
+      if (joinExpr == false) return;
+     }
+
+   /*========================================================*/
+   /* Handle a negated first pattern or join from the right. */
+   /*========================================================*/
+
+   if (join->patternIsNegated || (join->joinFromTheRight && (! join->patternIsExists))) /* reorder to remove patternIsExists test */
+     {
+      notParent = join->leftMemory->beta[0];
+      if (notParent->marker != NULL)
+        { return; }
+
+      AddBlockedLink(notParent,rhsBinds);
+
+      if (notParent->children != NULL)
+        { PosEntryRetractBeta(theEnv,notParent,notParent->children,operation); }
+      /*
+      if (notParent->dependents != NULL)
+		{ RemoveLogicalSupport(theEnv,notParent); }
+        */
+
+      return;
+     }
+
+   /*=====================================================*/
+   /* For exists CEs used as the first pattern of a rule, */
+   /* a special partial match in the left memory of the   */
+   /* join is used to track the RHS partial match         */
+   /* satisfying the CE.                                  */
+   /*=====================================================*/
+  /* TBD reorder */
+   if (join->patternIsExists)
+     {
+      existsParent = join->leftMemory->beta[0];
+      if (existsParent->marker != NULL)
+        { return; }
+      AddBlockedLink(existsParent,rhsBinds);
+     }
+
+   /*============================================*/
+   /* Send the partial match to all child joins. */
+   /*============================================*/
+
+   listOfJoins = join->nextLinks;
+   if (listOfJoins == NULL) return;
+
+   while (listOfJoins != NULL)
+     {
+      /*===================================================================*/
+      /* An exists CE as the first pattern of a rule can generate at most  */
+      /* one partial match, so if there's already a partial match in the   */
+      /* beta memory nothing further needs to be done. Since there are no  */
+      /* variable bindings which child joins can use for indexing, the     */
+      /* partial matches will always be stored in the bucket with index 0. */
+      /* Although an exists is associated with a specific fact/instance    */
+      /* (through its rightParent link) that allows it to be satisfied,    */
+      /* the bindings in the partial match will be empty for this CE.      */
+      /*===================================================================*/
+
+      if (join->patternIsExists)
+        { linker = CreateEmptyPartialMatch(theEnv); }
+
+      /*=============================================================*/
+      /* Othewise just copy the partial match from the alpha memory. */
+      /*=============================================================*/
+
+      else
+        { linker = CopyPartialMatch(theEnv,rhsBinds); }
+
+      /*================================================*/
+      /* Determine the hash value of the partial match. */
+      /*================================================*/
+
+      if (listOfJoins->enterDirection == LHS)
+        {
+         if (listOfJoins->join->leftHash != NULL)
+           { hashValue = BetaMemoryHashValue(theEnv,listOfJoins->join->leftHash,linker,NULL,listOfJoins->join); }
+         else
+           { hashValue = 0; }
+        }
+      else
+        {
+         if (listOfJoins->join->rightHash != NULL)
+           { hashValue = BetaMemoryHashValue(theEnv,listOfJoins->join->rightHash,linker,NULL,listOfJoins->join); }
+         else
+           { hashValue = 0; }
+        }
+
+      /*=======================================================*/
+      /* Add the partial match to the beta memory of the join. */
+      /*=======================================================*/
+
+      if (join->patternIsExists)
+        { UpdateBetaPMLinks(theEnv,linker,existsParent,NULL,listOfJoins->join,hashValue,listOfJoins->enterDirection); }
+      else
+        { UpdateBetaPMLinks(theEnv,linker,NULL,rhsBinds,listOfJoins->join,hashValue,listOfJoins->enterDirection); }
+
+      if (listOfJoins->enterDirection == LHS)
+        { NetworkAssertLeft(theEnv,linker,listOfJoins->join,operation); }
+      else
+        { NetworkAssertRight(theEnv,linker,listOfJoins->join,operation); }
+
+      listOfJoins = listOfJoins->next;
+     }
+  }
+
+/********************************************************************/
+/* JoinNetErrorMessage: Prints an informational message indicating  */
+/*   which join of a rule generated an error when a join expression */
+/*   was being evaluated.                                           */
+/********************************************************************/
+static void JoinNetErrorMessage(
+  Environment *theEnv,
+  struct joinNode *joinPtr)
+  {
+   PrintErrorID(theEnv,"DRIVE",1,true);
+   WriteString(theEnv,STDERR,"This error occurred in the join network.\n");
+   WriteString(theEnv,STDERR,"   Problem resides in associated join\n"); /* TBD generate test case for join with JFTR */
+   TraceErrorToRule(theEnv,joinPtr,"      ");
+   WriteString(theEnv,STDERR,"\n");
+  }
+
+#endif /* DEFRULE_CONSTRUCT */
diff --git a/clips/drive.h b/clips/drive.h
new file mode 100755
index 000000000..e366fbabd
--- /dev/null
+++ b/clips/drive.h
@@ -0,0 +1,65 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                  DRIVE HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Handles join network activity associated with    */
+/*   with the addition of a data entity such as a fact or    */
+/*   instance.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added support for hashed memories.             */
+/*                                                           */
+/*            Added additional developer statistics to help  */
+/*            analyze join network performance.              */
+/*                                                           */
+/*            Removed pseudo-facts used in not CE.           */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_drive
+
+#pragma once
+
+#define _H_drive
+
+#include "expressn.h"
+#include "match.h"
+#include "network.h"
+
+   void                           NetworkAssert(Environment *,struct partialMatch *,struct joinNode *);
+   bool                           EvaluateJoinExpression(Environment *,struct expr *,struct joinNode *);
+   void                           NetworkAssertLeft(Environment *,struct partialMatch *,struct joinNode *,int);
+   void                           NetworkAssertRight(Environment *,struct partialMatch *,struct joinNode *,int);
+   void                           PPDrive(Environment *,struct partialMatch *,struct partialMatch *,struct joinNode *,int);
+   unsigned long                  BetaMemoryHashValue(Environment *,struct expr *,struct partialMatch *,struct partialMatch *,struct joinNode *);
+   bool                           EvaluateSecondaryNetworkTest(Environment *,struct partialMatch *,struct joinNode *);
+   void                           EPMDrive(Environment *,struct partialMatch *,struct joinNode *,int);
+
+#endif /* _H_drive */
+
+
+
+
+
diff --git a/clips/emathfun.c b/clips/emathfun.c
new file mode 100755
index 000000000..ecc5bae19
--- /dev/null
+++ b/clips/emathfun.c
@@ -0,0 +1,1167 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  01/29/18             */
+   /*                                                     */
+   /*            EXTENDED MATH FUNCTIONS MODULE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for numerous extended math     */
+/*   functions including cos, sin, tan, sec, csc, cot, acos, */
+/*   asin, atan, asec, acsc, acot, cosh, sinh, tanh, sech,   */
+/*   csch, coth, acosh, asinh, atanh, asech, acsch, acoth,   */
+/*   mod, exp, log, log10, sqrt, pi, deg-rad, rad-deg,       */
+/*   deg-grad, grad-deg, **, and round.                      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Renamed EX_MATH compiler flag to               */
+/*            EXTENDED_MATH_FUNCTIONS.                       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Fix for overflow error in div function.        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added error codes for get-error and            */
+/*            clear-error functions.                         */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "miscfun.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "emathfun.h"
+
+#if EXTENDED_MATH_FUNCTIONS
+
+#include <math.h>
+
+/***************/
+/* DEFINITIONS */
+/***************/
+
+#ifndef PI
+#define PI   3.14159265358979323846
+#endif
+
+#ifndef PID2
+#define PID2 1.57079632679489661923 /* PI divided by 2 */
+#endif
+
+#define SMALLEST_ALLOWED_NUMBER 1e-15
+#define dtrunc(x) (((x) < 0.0) ? ceil(x) : floor(x))
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    SingleNumberCheck(UDFContext *,UDFValue *);
+   static bool                    TestProximity(double,double);
+   static void                    DomainErrorMessage(UDFContext *,UDFValue *);
+   static void                    ArgumentOverflowErrorMessage(UDFContext *,UDFValue *);
+   static void                    SingularityErrorMessage(UDFContext *,UDFValue *);
+   static double                  genacosh(double);
+   static double                  genasinh(double);
+   static double                  genatanh(double);
+   static double                  genasech(double);
+   static double                  genacsch(double);
+   static double                  genacoth(double);
+
+/************************************************/
+/* ExtendedMathFunctionDefinitions: Initializes */
+/*   the extended math functions.               */
+/************************************************/
+void ExtendedMathFunctionDefinitions(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"cos","d",1,1,"ld",CosFunction,"CosFunction",NULL);
+   AddUDF(theEnv,"sin","d",1,1,"ld",SinFunction,"SinFunction",NULL);
+   AddUDF(theEnv,"tan","d",1,1,"ld",TanFunction,"TanFunction",NULL);
+   AddUDF(theEnv,"sec","d",1,1,"ld",SecFunction,"SecFunction",NULL);
+   AddUDF(theEnv,"csc","d",1,1,"ld",CscFunction,"CscFunction",NULL);
+   AddUDF(theEnv,"cot","d",1,1,"ld",CotFunction,"CotFunction",NULL);
+   AddUDF(theEnv,"acos","d",1,1,"ld",AcosFunction,"AcosFunction",NULL);
+   AddUDF(theEnv,"asin","d",1,1,"ld",AsinFunction,"AsinFunction",NULL);
+   AddUDF(theEnv,"atan","d",1,1,"ld",AtanFunction,"AtanFunction",NULL);
+   AddUDF(theEnv,"asec","d",1,1,"ld",AsecFunction,"AsecFunction",NULL);
+   AddUDF(theEnv,"acsc","d",1,1,"ld",AcscFunction,"AcscFunction",NULL);
+   AddUDF(theEnv,"acot","d",1,1,"ld",AcotFunction,"AcotFunction",NULL);
+   AddUDF(theEnv,"cosh","d",1,1,"ld",CoshFunction,"CoshFunction",NULL);
+   AddUDF(theEnv,"sinh","d",1,1,"ld",SinhFunction,"SinhFunction",NULL);
+   AddUDF(theEnv,"tanh","d",1,1,"ld",TanhFunction,"TanhFunction",NULL);
+   AddUDF(theEnv,"sech","d",1,1,"ld",SechFunction,"SechFunction",NULL);
+   AddUDF(theEnv,"csch","d",1,1,"ld",CschFunction,"CschFunction",NULL);
+   AddUDF(theEnv,"coth","d",1,1,"ld",CothFunction,"CothFunction",NULL);
+   AddUDF(theEnv,"acosh","d",1,1,"ld",AcoshFunction,"AcoshFunction",NULL);
+   AddUDF(theEnv,"asinh","d",1,1,"ld",AsinhFunction,"AsinhFunction",NULL);
+   AddUDF(theEnv,"atanh","d",1,1,"ld",AtanhFunction,"AtanhFunction",NULL);
+   AddUDF(theEnv,"asech","d",1,1,"ld",AsechFunction,"AsechFunction",NULL);
+   AddUDF(theEnv,"acsch","d",1,1,"ld",AcschFunction,"AcschFunction",NULL);
+   AddUDF(theEnv,"acoth","d",1,1,"ld",AcothFunction,"AcothFunction",NULL);
+
+   AddUDF(theEnv,"mod","ld",2,2,"ld",ModFunction,"ModFunction",NULL);
+   AddUDF(theEnv,"exp","d", 1,1,"ld",ExpFunction,"ExpFunction",NULL);
+   AddUDF(theEnv,"log","d",1,1,"ld",LogFunction,"LogFunction",NULL);
+   AddUDF(theEnv,"log10","d",1,1,"ld",Log10Function,"Log10Function",NULL);
+   AddUDF(theEnv,"sqrt","d",1,1,"ld",SqrtFunction,"SqrtFunction",NULL);
+   AddUDF(theEnv,"pi","d",0,0,NULL,PiFunction, "PiFunction",NULL);
+   AddUDF(theEnv,"deg-rad","d",1,1,"ld",DegRadFunction, "DegRadFunction",NULL);
+   AddUDF(theEnv,"rad-deg","d",1,1,"ld",RadDegFunction, "RadDegFunction",NULL);
+   AddUDF(theEnv,"deg-grad","d",1,1,"ld",DegGradFunction,"DegGradFunction",NULL);
+   AddUDF(theEnv,"grad-deg","d",1,1,"ld",GradDegFunction,"GradDegFunction",NULL);
+   AddUDF(theEnv,"**","d",2,2,"ld",PowFunction,"PowFunction",NULL);
+   AddUDF(theEnv,"round","l", 1,1,"ld",RoundFunction,"RoundFunction",NULL);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+/************************************************************/
+/* SingleNumberCheck: Retrieves the numeric argument for    */
+/*   extended math functions which expect a single floating */
+/*   point argument.                                        */
+/************************************************************/
+static bool SingleNumberCheck(
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*======================================*/
+   /* Check that the argument is a number. */
+   /*======================================*/
+
+   if (! UDFNthArgument(context,1,NUMBER_BITS,returnValue))
+     {
+      returnValue->floatValue = CreateFloat(context->environment,0.0);
+      return false;
+     }
+
+   return true;
+  }
+
+/**************************************************************/
+/* TestProximity: Returns true if the specified number falls  */
+/*   within the specified range, otherwise false is returned. */
+/**************************************************************/
+static bool TestProximity(
+  double theNumber,
+  double range)
+  {
+   if ((theNumber >= (- range)) && (theNumber <= range)) return true;
+   else return false;
+  }
+
+/********************************************************/
+/* DomainErrorMessage: Generic error message used when  */
+/*   a domain error is detected during a call to one of */
+/*   the extended math functions.                       */
+/********************************************************/
+static void DomainErrorMessage(
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Environment *theEnv = context->environment;
+
+   SetErrorValue(theEnv,&CreateSymbol(theEnv,"DOMAIN_ERROR")->header);
+   PrintErrorID(theEnv,"EMATHFUN",1,false);
+   WriteString(theEnv,STDERR,"Domain error for '");
+   WriteString(theEnv,STDERR,UDFContextFunctionName(context));
+   WriteString(theEnv,STDERR,"' function.\n");
+   SetHaltExecution(theEnv,true);
+   SetEvaluationError(theEnv,true);
+   returnValue->floatValue = CreateFloat(theEnv,0.0);
+  }
+
+/************************************************************/
+/* ArgumentOverflowErrorMessage: Generic error message used */
+/*   when an argument overflow is detected during a call to */
+/*   one of the extended math functions.                    */
+/************************************************************/
+static void ArgumentOverflowErrorMessage(
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Environment *theEnv = context->environment;
+
+   SetErrorValue(theEnv,&CreateSymbol(theEnv,"ARGUMENT_OVERFLOW")->header);
+   PrintErrorID(theEnv,"EMATHFUN",2,false);
+   WriteString(theEnv,STDERR,"Argument overflow for '");
+   WriteString(theEnv,STDERR,UDFContextFunctionName(context));
+   WriteString(theEnv,STDERR,"' function.\n");
+   SetHaltExecution(theEnv,true);
+   SetEvaluationError(theEnv,true);
+   returnValue->floatValue = CreateFloat(theEnv,0.0);
+  }
+
+/************************************************************/
+/* SingularityErrorMessage: Generic error message used when */
+/*   a singularity is detected during a call to one of the  */
+/*   extended math functions.                               */
+/************************************************************/
+static void SingularityErrorMessage(
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Environment *theEnv = context->environment;
+
+   SetErrorValue(theEnv,&CreateSymbol(theEnv,"SINGULARITY_AT_ASYMPTOTE")->header);
+   PrintErrorID(theEnv,"EMATHFUN",3,false);
+   WriteString(theEnv,STDERR,"Singularity at asymptote in '");
+   WriteString(theEnv,STDERR,UDFContextFunctionName(context));
+   WriteString(theEnv,STDERR,"' function.\n");
+   SetHaltExecution(theEnv,true);
+   SetEvaluationError(theEnv,true);
+   returnValue->floatValue = CreateFloat(theEnv,0.0);
+  }
+
+/*************************************/
+/* CosFunction: H/L access routine   */
+/*   for the cos function.           */
+/*************************************/
+void CosFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,cos(CVCoerceToFloat(returnValue)));
+  }
+
+/*************************************/
+/* SinFunction: H/L access routine   */
+/*   for the sin function.           */
+/*************************************/
+void SinFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,sin(CVCoerceToFloat(returnValue)));
+  }
+
+/*************************************/
+/* TanFunction: H/L access routine   */
+/*   for the tan function.           */
+/*************************************/
+void TanFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double tv;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   tv = cos(CVCoerceToFloat(returnValue));
+   if ((tv < SMALLEST_ALLOWED_NUMBER) && (tv > -SMALLEST_ALLOWED_NUMBER))
+     {
+      SingularityErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,sin(CVCoerceToFloat(returnValue)) / tv);
+  }
+
+/*************************************/
+/* SecFunction: H/L access routine   */
+/*   for the sec function.           */
+/*************************************/
+void SecFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double tv;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   tv = cos(CVCoerceToFloat(returnValue));
+   if ((tv < SMALLEST_ALLOWED_NUMBER) && (tv > -SMALLEST_ALLOWED_NUMBER))
+     {
+      SingularityErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,1.0 / tv);
+  }
+
+/*************************************/
+/* CscFunction: H/L access routine   */
+/*   for the csc function.           */
+/*************************************/
+void CscFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double tv;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   tv = sin(CVCoerceToFloat(returnValue));
+   if ((tv < SMALLEST_ALLOWED_NUMBER) && (tv > -SMALLEST_ALLOWED_NUMBER))
+     {
+      SingularityErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,1.0 / tv);
+  }
+
+/*************************************/
+/* CotFunction: H/L access routine   */
+/*   for the cot function.           */
+/*************************************/
+void CotFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double tv;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+    tv = sin(CVCoerceToFloat(returnValue));
+    if ((tv < SMALLEST_ALLOWED_NUMBER) && (tv > -SMALLEST_ALLOWED_NUMBER))
+      {
+       SingularityErrorMessage(context,returnValue);
+       return;
+      }
+
+    returnValue->floatValue = CreateFloat(theEnv,cos(CVCoerceToFloat(returnValue)) / tv);
+  }
+
+/**************************************/
+/* AcosFunction: H/L access routine   */
+/*   for the acos function.           */
+/**************************************/
+void AcosFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+
+   ClearErrorValue(theEnv);
+   
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+
+   if ((num > 1.0) || (num < -1.0))
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+    returnValue->floatValue = CreateFloat(theEnv,acos(num));
+  }
+
+/**************************************/
+/* AsinFunction: H/L access routine   */
+/*   for the asin function.           */
+/**************************************/
+void AsinFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if ((num > 1.0) || (num < -1.0))
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,asin(num));
+  }
+
+/**************************************/
+/* AtanFunction: H/L access routine   */
+/*   for the atan function.           */
+/**************************************/
+void AtanFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,atan(CVCoerceToFloat(returnValue)));
+  }
+
+/**************************************/
+/* AsecFunction: H/L access routine   */
+/*   for the asec function.           */
+/**************************************/
+void AsecFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if ((num < 1.0) && (num > -1.0))
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   num = 1.0 / num;
+   returnValue->floatValue = CreateFloat(theEnv,acos(num));
+  }
+
+/**************************************/
+/* AcscFunction: H/L access routine   */
+/*   for the acsc function.           */
+/**************************************/
+void AcscFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if ((num < 1.0) && (num > -1.0))
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   num = 1.0 / num;
+   returnValue->floatValue = CreateFloat(theEnv,asin(num));
+  }
+
+/**************************************/
+/* AcotFunction: H/L access routine   */
+/*   for the acot function.           */
+/**************************************/
+void AcotFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if (TestProximity(num,1e-25) == true)
+     {
+      returnValue->floatValue = CreateFloat(theEnv,PID2);
+      return;
+     }
+
+   num = 1.0 / num;
+   returnValue->floatValue = CreateFloat(theEnv,atan(num));
+  }
+
+/**************************************/
+/* CoshFunction: H/L access routine   */
+/*   for the cosh function.           */
+/**************************************/
+void CoshFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,cosh(CVCoerceToFloat(returnValue)));
+  }
+
+/**************************************/
+/* SinhFunction: H/L access routine   */
+/*   for the sinh function.           */
+/**************************************/
+void SinhFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,sinh(CVCoerceToFloat(returnValue)));
+  }
+
+/**************************************/
+/* TanhFunction: H/L access routine   */
+/*   for the tanh function.           */
+/**************************************/
+void TanhFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,tanh(CVCoerceToFloat(returnValue)));
+  }
+
+/**************************************/
+/* SechFunction: H/L access routine   */
+/*   for the sech function.           */
+/**************************************/
+void SechFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,1.0 / cosh(CVCoerceToFloat(returnValue)));
+  }
+
+/**************************************/
+/* CschFunction: H/L access routine   */
+/*   for the csch function.           */
+/**************************************/
+void CschFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if (num == 0.0)
+     {
+      SingularityErrorMessage(context,returnValue);
+      return;
+     }
+   else if (TestProximity(num,1e-25) == true)
+     {
+      ArgumentOverflowErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,1.0 / sinh(num));
+  }
+
+/**************************************/
+/* CothFunction: H/L access routine   */
+/*   for the coth function.           */
+/**************************************/
+void CothFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if (num == 0.0)
+     {
+      SingularityErrorMessage(context,returnValue);
+      return;
+     }
+   else if (TestProximity(num,1e-25) == true)
+     {
+      ArgumentOverflowErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,1.0 / tanh(num));
+  }
+
+/***************************************/
+/* AcoshFunction: H/L access routine   */
+/*   for the acosh function.           */
+/***************************************/
+void AcoshFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if (num < 1.0)
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,genacosh(num));
+  }
+
+/***************************************/
+/* AsinhFunction: H/L access routine   */
+/*   for the asinh function.           */
+/***************************************/
+void AsinhFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,genasinh(CVCoerceToFloat(returnValue)));
+  }
+
+/***************************************/
+/* AtanhFunction: H/L access routine   */
+/*   for the atanh function.           */
+/***************************************/
+void AtanhFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if ((num >= 1.0) || (num <= -1.0))
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,genatanh(num));
+  }
+
+/***************************************/
+/* AsechFunction: H/L access routine   */
+/*   for the asech function.           */
+/***************************************/
+void AsechFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if ((num > 1.0) || (num <= 0.0))
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,genasech(num));
+  }
+
+/***************************************/
+/* AcschFunction: H/L access routine   */
+/*   for the acsch function.           */
+/***************************************/
+void AcschFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if (num == 0.0)
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,genacsch(num));
+  }
+
+/***************************************/
+/* AcothFunction: H/L access routine   */
+/*   for the acoth function.           */
+/***************************************/
+void AcothFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if ((num <= 1.0) && (num >= -1.0))
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,genacoth(num));
+  }
+
+/*************************************/
+/* ExpFunction: H/L access routine   */
+/*   for the exp function.           */
+/*************************************/
+void ExpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,exp(CVCoerceToFloat(returnValue)));
+  }
+
+/*************************************/
+/* LogFunction: H/L access routine   */
+/*   for the log function.           */
+/*************************************/
+void LogFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if (num < 0.0)
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+   else if (num == 0.0)
+     {
+      ArgumentOverflowErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,log(num));
+  }
+
+/***************************************/
+/* Log10Function: H/L access routine   */
+/*   for the log10 function.           */
+/***************************************/
+void Log10Function(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if (num < 0.0)
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+   else if (num == 0.0)
+     {
+      ArgumentOverflowErrorMessage(context,returnValue);
+      return;
+     }
+
+    returnValue->floatValue = CreateFloat(theEnv,log10(num));
+   }
+
+/**************************************/
+/* SqrtFunction: H/L access routine   */
+/*   for the sqrt function.           */
+/**************************************/
+void SqrtFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double num;
+   
+   ClearErrorValue(theEnv);
+
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   num = CVCoerceToFloat(returnValue);
+   if (num < 0.00000)
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   returnValue->floatValue = CreateFloat(theEnv,sqrt(num));
+  }
+
+/*************************************/
+/* PowFunction: H/L access routine   */
+/*   for the pow function.           */
+/*************************************/
+void PowFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue value1, value2;
+   double num1, num2;
+   
+   ClearErrorValue(theEnv);
+
+   /*==================================*/
+   /* Check for two numeric arguments. */
+   /*==================================*/
+
+   if (! UDFNthArgument(context,1,NUMBER_BITS,&value1))
+     { return; }
+
+   if (! UDFNthArgument(context,2,NUMBER_BITS,&value2))
+     { return; }
+
+    /*=====================*/
+    /* Domain error check. */
+    /*=====================*/
+
+    num1 = CVCoerceToFloat(&value1);
+    num2 = CVCoerceToFloat(&value2);
+
+    if (((num1 == 0.0) && (num2 <= 0.0)) ||
+       ((num1 < 0.0) && (dtrunc(num2) != num2)))
+     {
+      DomainErrorMessage(context,returnValue);
+      return;
+     }
+
+   /*============================*/
+   /* Compute and set the value. */
+   /*============================*/
+
+   returnValue->floatValue = CreateFloat(theEnv,pow(num1,num2));
+  }
+
+/*************************************/
+/* ModFunction: H/L access routine   */
+/*   for the mod function.           */
+/*************************************/
+void ModFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item1, item2;
+   double fnum1, fnum2;
+   long long lnum1, lnum2;
+
+   /*==================================*/
+   /* Check for two numeric arguments. */
+   /*==================================*/
+
+   if (! UDFNthArgument(context,1,NUMBER_BITS,&item1))
+     { return; }
+
+   if (! UDFNthArgument(context,2,NUMBER_BITS,&item2))
+     { return; }
+
+   /*===========================*/
+   /* Check for divide by zero. */
+   /*===========================*/
+
+   if ((CVIsType(&item2,INTEGER_BIT) ? (item2.integerValue->contents == 0L) : false) ||
+       (CVIsType(&item2,FLOAT_BIT) ? (item2.floatValue->contents == 0.0) : false))
+     {
+      DivideByZeroErrorMessage(theEnv,"mod");
+      SetEvaluationError(theEnv,true);
+      returnValue->integerValue = CreateInteger(theEnv,0);
+      return;
+     }
+
+   /*===========================*/
+   /* Compute the return value. */
+   /*===========================*/
+
+   if (CVIsType(&item1,FLOAT_BIT) || CVIsType(&item2,FLOAT_BIT))
+     {
+      fnum1 = CVCoerceToFloat(&item1);
+      fnum2 = CVCoerceToFloat(&item2);
+      returnValue->floatValue = CreateFloat(theEnv,fnum1 - (dtrunc(fnum1 / fnum2) * fnum2));
+     }
+   else
+     {
+      lnum1 = item1.integerValue->contents;
+      lnum2 = item2.integerValue->contents;
+      
+      if ((lnum1 == LLONG_MIN) && (lnum2 == -1))
+        {
+         ArgumentOverUnderflowErrorMessage(theEnv,"mod",true);
+         SetEvaluationError(theEnv,true);
+         returnValue->integerValue = CreateInteger(theEnv,0);
+         return;
+        }
+
+      returnValue->integerValue = CreateInteger(theEnv,lnum1 - (lnum1 / lnum2) * lnum2);
+     }
+  }
+
+/************************************/
+/* PiFunction: H/L access routine   */
+/*   for the pi function.           */
+/************************************/
+void PiFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->floatValue = CreateFloat(theEnv,acos(-1.0));
+  }
+
+/****************************************/
+/* DegRadFunction: H/L access routine   */
+/*   for the deg-rad function.          */
+/****************************************/
+void DegRadFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,CVCoerceToFloat(returnValue) * PI / 180.0);
+  }
+
+/****************************************/
+/* RadDegFunction: H/L access routine   */
+/*   for the rad-deg function.          */
+/****************************************/
+void RadDegFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,CVCoerceToFloat(returnValue) * 180.0 / PI);
+  }
+
+/*****************************************/
+/* DegGradFunction: H/L access routine   */
+/*   for the deg-grad function.          */
+/*****************************************/
+void DegGradFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,CVCoerceToFloat(returnValue) / 0.9);
+  }
+
+/*****************************************/
+/* GradDegFunction: H/L access routine   */
+/*   for the grad-deg function.          */
+/*****************************************/
+void GradDegFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! SingleNumberCheck(context,returnValue))
+     { return; }
+
+   returnValue->floatValue = CreateFloat(theEnv,CVCoerceToFloat(returnValue) * 0.9);
+  }
+
+/***************************************/
+/* RoundFunction: H/L access routine   */
+/*   for the round function.           */
+/***************************************/
+void RoundFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*======================================*/
+   /* Check that the argument is a number. */
+   /*======================================*/
+
+   if (! UDFNthArgument(context,1,NUMBER_BITS,returnValue))
+     { return; }
+
+   /*==============================*/
+   /* Round float type to integer. */
+   /*==============================*/
+
+   if (CVIsType(returnValue,FLOAT_BIT))
+     { returnValue->integerValue = CreateInteger(theEnv,(long long) ceil(returnValue->floatValue->contents - 0.5)); }
+  }
+
+/*******************************************/
+/* genacosh: Generic routine for computing */
+/*   the hyperbolic arccosine.             */
+/*******************************************/
+static double genacosh(
+  double num)
+  {
+   return(log(num + sqrt(num * num - 1.0)));
+  }
+
+/*******************************************/
+/* genasinh: Generic routine for computing */
+/*   the hyperbolic arcsine.               */
+/*******************************************/
+static double genasinh(
+  double num)
+  {
+   return(log(num + sqrt(num * num + 1.0)));
+  }
+
+/*******************************************/
+/* genatanh: Generic routine for computing */
+/*   the hyperbolic arctangent.            */
+/*******************************************/
+static double genatanh(
+  double num)
+  {
+   return((0.5) * log((1.0 + num) / (1.0 - num)));
+  }
+
+/*******************************************/
+/* genasech: Generic routine for computing */
+/*   the hyperbolic arcsecant.             */
+/*******************************************/
+static double genasech(
+  double num)
+  {
+   return(log(1.0 / num + sqrt(1.0 / (num * num) - 1.0)));
+  }
+
+/*******************************************/
+/* genacsch: Generic routine for computing */
+/*   the hyperbolic arccosecant.           */
+/*******************************************/
+static double genacsch(
+  double num)
+  {
+   return(log(1.0 / num + sqrt(1.0 / (num * num) + 1.0)));
+  }
+
+/*******************************************/
+/* genacoth: Generic routine for computing */
+/*   the hyperbolic arccotangent.          */
+/*******************************************/
+static double genacoth(
+  double num)
+  {
+   return((0.5) * log((num + 1.0) / (num - 1.0)));
+  }
+
+#endif
+
diff --git a/clips/emathfun.h b/clips/emathfun.h
new file mode 100755
index 000000000..4d34108de
--- /dev/null
+++ b/clips/emathfun.h
@@ -0,0 +1,96 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*          EXTENDED MATH FUNCTIONS HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for numerous extended math     */
+/*   functions including cos, sin, tan, sec, csc, cot, acos, */
+/*   asin, atan, asec, acsc, acot, cosh, sinh, tanh, sech,   */
+/*   csch, coth, acosh, asinh, atanh, asech, acsch, acoth,   */
+/*   mod, exp, log, log10, sqrt, pi, deg-rad, rad-deg,       */
+/*   deg-grad, grad-deg, **, and round.                      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Renamed EX_MATH compiler flag to               */
+/*            EXTENDED_MATH_FUNCTIONS.                       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_emathfun
+
+#pragma once
+
+#define _H_emathfun
+
+   void                           ExtendedMathFunctionDefinitions(Environment *);
+#if EXTENDED_MATH_FUNCTIONS
+   void                           CosFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SinFunction(Environment *,UDFContext *,UDFValue *);
+   void                           TanFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SecFunction(Environment *,UDFContext *,UDFValue *);
+   void                           CscFunction(Environment *,UDFContext *,UDFValue *);
+   void                           CotFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AcosFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AsinFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AtanFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AsecFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AcscFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AcotFunction(Environment *,UDFContext *,UDFValue *);
+   void                           CoshFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SinhFunction(Environment *,UDFContext *,UDFValue *);
+   void                           TanhFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SechFunction(Environment *,UDFContext *,UDFValue *);
+   void                           CschFunction(Environment *,UDFContext *,UDFValue *);
+   void                           CothFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AcoshFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AsinhFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AtanhFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AsechFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AcschFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AcothFunction(Environment *,UDFContext *,UDFValue *);
+   void                           RoundFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ModFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ExpFunction(Environment *,UDFContext *,UDFValue *);
+   void                           LogFunction(Environment *,UDFContext *,UDFValue *);
+   void                           Log10Function(Environment *,UDFContext *,UDFValue *);
+   void                           SqrtFunction(Environment *,UDFContext *,UDFValue *);
+   void                           PiFunction(Environment *,UDFContext *,UDFValue *);
+   void                           DegRadFunction(Environment *,UDFContext *,UDFValue *);
+   void                           RadDegFunction(Environment *,UDFContext *,UDFValue *);
+   void                           DegGradFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GradDegFunction(Environment *,UDFContext *,UDFValue *);
+   void                           PowFunction(Environment *,UDFContext *,UDFValue *);
+#endif
+
+#endif /* _H_emathfun */
+
+
+
diff --git a/clips/engine.c b/clips/engine.c
new file mode 100755
index 000000000..cf80ae223
--- /dev/null
+++ b/clips/engine.c
@@ -0,0 +1,1565 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/04/17             */
+   /*                                                     */
+   /*                    ENGINE MODULE                    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functionality primarily associated with */
+/*   the run and focus commands.                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Bebe Ly                                              */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE, INCREMENTAL_RESET,   */
+/*            and LOGICAL_DEPENDENCIES compilation flags.    */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added access functions to the HaltRules flag.  */
+/*                                                           */
+/*            Added EnvGetNextFocus, EnvGetFocusChanged, and */
+/*            EnvSetFocusChanged functions.                  */
+/*                                                           */
+/*      6.30: Added additional developer statistics to help  */
+/*            analyze join network performance.              */
+/*                                                           */
+/*            Removed pseudo-facts used in not CEs.          */
+/*                                                           */
+/*            Added context information for run functions.   */
+/*                                                           */
+/*            Added before rule firing callback function.    */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added EnvHalt function.                        */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.31: Fixed dangling construct issue.                */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            Incremental reset is always enabled.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include "agenda.h"
+#include "argacces.h"
+#include "commline.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "factmngr.h"
+#include "inscom.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "prccode.h"
+#include "prcdrfun.h"
+#include "prntutil.h"
+#include "proflfun.h"
+#include "reteutil.h"
+#include "retract.h"
+#include "router.h"
+#include "ruledlt.h"
+#include "sysdep.h"
+#include "utility.h"
+#include "watch.h"
+
+#include "engine.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static Defmodule              *RemoveFocus(Environment *,Defmodule *);
+   static void                    DeallocateEngineData(Environment *);
+
+/*****************************************************************************/
+/* InitializeEngine: Initializes the activations and statistics watch items. */
+/*****************************************************************************/
+void InitializeEngine(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,ENGINE_DATA,sizeof(struct engineData),DeallocateEngineData);
+
+#if DEBUGGING_FUNCTIONS
+   AddWatchItem(theEnv,"statistics",0,&EngineData(theEnv)->WatchStatistics,20,NULL,NULL);
+   AddWatchItem(theEnv,"focus",0,&EngineData(theEnv)->WatchFocus,0,NULL,NULL);
+#endif
+  }
+
+/*************************************************/
+/* DeallocateEngineData: Deallocates environment */
+/*    data for engine functionality.             */
+/*************************************************/
+static void DeallocateEngineData(
+  Environment *theEnv)
+  {
+   FocalModule *tmpPtr, *nextPtr;
+
+   DeallocateRuleFiredCallList(theEnv,EngineData(theEnv)->ListOfAfterRuleFiresFunctions);
+   DeallocateRuleFiredCallList(theEnv,EngineData(theEnv)->ListOfBeforeRuleFiresFunctions);
+
+   tmpPtr = EngineData(theEnv)->CurrentFocus;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      rtn_struct(theEnv,focalModule,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/**********************************************/
+/* Run: C access routine for the run command. */
+/**********************************************/
+long long Run(
+  Environment *theEnv,
+  long long runLimit)
+  {
+   long long rulesFired = 0;
+   UDFValue returnValue;
+   RuleFiredFunctionItem *ruleFiresFunction;
+#if DEBUGGING_FUNCTIONS
+   unsigned long maxActivations = 0, sumActivations = 0;
+#if DEFTEMPLATE_CONSTRUCT
+   unsigned long maxFacts = 0, sumFacts = 0;
+#endif
+#if OBJECT_SYSTEM
+   unsigned long maxInstances = 0, sumInstances = 0;
+#endif
+#if (! GENERIC)
+   double endTime, startTime = 0.0;
+#endif
+   unsigned long tempValue;
+#endif
+   unsigned short i;
+   struct patternEntity *theMatchingItem;
+   struct partialMatch *theBasis;
+   Activation *theActivation;
+   const char *ruleFiring;
+#if PROFILING_FUNCTIONS
+   struct profileFrameInfo profileFrame;
+#endif
+   struct trackedMemory *theTM;
+   int danglingConstructs;
+   GCBlock gcb;
+   bool error = false;
+
+   /*=====================================================*/
+   /* Make sure the run command is not already executing. */
+   /*=====================================================*/
+
+   if (EngineData(theEnv)->AlreadyRunning)
+     { return 0; }
+   EngineData(theEnv)->AlreadyRunning = true;
+
+   /*========================================*/
+   /* Set up the frame for tracking garbage. */
+   /*========================================*/
+
+   GCBlockStart(theEnv,&gcb);
+
+   /*================================*/
+   /* Set up statistics information. */
+   /*================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if (EngineData(theEnv)->WatchStatistics)
+     {
+#if DEFTEMPLATE_CONSTRUCT
+      maxFacts = GetNumberOfFacts(theEnv);
+      sumFacts = maxFacts;
+#endif
+#if OBJECT_SYSTEM
+      maxInstances = GetGlobalNumberOfInstances(theEnv);
+      sumInstances = maxInstances;
+#endif
+      maxActivations = GetNumberOfActivations(theEnv);
+      sumActivations = maxActivations;
+#if (! GENERIC)
+      startTime = gentime();
+#endif
+     }
+#endif
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*=============================*/
+   /* Set up execution variables. */
+   /*=============================*/
+
+   EngineData(theEnv)->HaltRules = false;
+
+#if DEVELOPER
+   EngineData(theEnv)->leftToRightComparisons = 0;
+   EngineData(theEnv)->rightToLeftComparisons = 0;
+   EngineData(theEnv)->leftToRightSucceeds = 0;
+   EngineData(theEnv)->rightToLeftSucceeds = 0;
+   EngineData(theEnv)->leftToRightLoops = 0;
+   EngineData(theEnv)->rightToLeftLoops = 0;
+   EngineData(theEnv)->findNextConflictingComparisons = 0;
+   EngineData(theEnv)->betaHashListSkips = 0;
+   EngineData(theEnv)->betaHashHTSkips = 0;
+   EngineData(theEnv)->unneededMarkerCompare = 0;
+#endif
+
+   /*=====================================================*/
+   /* Fire rules until the agenda is empty, the run limit */
+   /* has been reached, or a rule execution error occurs. */
+   /*=====================================================*/
+
+   theActivation = NextActivationToFire(theEnv);
+   while ((theActivation != NULL) &&
+          (runLimit != 0) &&
+          (EvaluationData(theEnv)->HaltExecution == false) &&
+          (EngineData(theEnv)->HaltRules == false))
+     {
+      /*========================================*/
+      /* Execute the list of functions that are */
+      /* to be called before each rule firing.  */
+      /*========================================*/
+
+      for (ruleFiresFunction = EngineData(theEnv)->ListOfBeforeRuleFiresFunctions;
+           ruleFiresFunction != NULL;
+           ruleFiresFunction = ruleFiresFunction->next)
+        {
+         (*ruleFiresFunction->func)(theEnv,theActivation,ruleFiresFunction->context);
+        }
+
+      /*===========================================*/
+      /* Detach the activation from the agenda and */
+      /* determine which rule is firing.           */
+      /*===========================================*/
+
+      DetachActivation(theEnv,theActivation);
+      theTM = AddTrackedMemory(theEnv,theActivation,sizeof(struct activation));
+      ruleFiring = ActivationRuleName(theActivation);
+      theBasis = (struct partialMatch *) GetActivationBasis(theEnv,theActivation);
+      EngineData(theEnv)->ExecutingRule = GetActivationRule(theEnv,theActivation);
+
+      /*=============================================*/
+      /* Update the number of rules that have fired. */
+      /*=============================================*/
+
+      rulesFired++;
+      if (runLimit > 0) { runLimit--; }
+
+      /*==================================*/
+      /* If rules are being watched, then */
+      /* print an information message.    */
+      /*==================================*/
+
+#if DEBUGGING_FUNCTIONS
+      if (EngineData(theEnv)->ExecutingRule->watchFiring)
+        {
+         char printSpace[60];
+
+         gensprintf(printSpace,"FIRE %4lld ",rulesFired);
+         WriteString(theEnv,STDOUT,printSpace);
+         WriteString(theEnv,STDOUT,ruleFiring);
+         WriteString(theEnv,STDOUT,": ");
+         PrintPartialMatch(theEnv,STDOUT,theBasis);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+#endif
+
+      /*=================================================*/
+      /* Remove the link between the activation and the  */
+      /* completed match for the rule. Set the busy flag */
+      /* for the completed match to true (so the match   */
+      /* upon which our RHS variables are dependent is   */
+      /* not deleted while our rule is firing). Set up   */
+      /* the global pointers to the completed match for  */
+      /* routines which do variable extractions.         */
+      /*=================================================*/
+
+      theBasis->marker = NULL;
+      theBasis->busy = true;
+
+      EngineData(theEnv)->GlobalLHSBinds = theBasis;
+      EngineData(theEnv)->GlobalRHSBinds = NULL;
+
+      /*===================================================================*/
+      /* Increment the count for each of the facts/objects associated with */
+      /* the rule activation so that the facts/objects cannot be deleted   */
+      /* by garbage collection while the rule is executing.                */
+      /*===================================================================*/
+
+      for (i = 0; i < theBasis->bcount; i++)
+        {
+         if (theBasis->binds[i].gm.theMatch == NULL) continue;
+         theMatchingItem = theBasis->binds[i].gm.theMatch->matchingItem;
+         if (theMatchingItem != NULL)
+           { (*theMatchingItem->theInfo->incrementBasisCount)(theEnv,theMatchingItem); }
+        }
+
+      /*====================================================*/
+      /* If the rule has logical CEs, set up the pointer to */
+      /* the rules logical join so the assert command will  */
+      /* attach the appropriate dependencies to the facts.  */
+      /*====================================================*/
+
+      EngineData(theEnv)->TheLogicalJoin = EngineData(theEnv)->ExecutingRule->logicalJoin;
+
+      if (EngineData(theEnv)->TheLogicalJoin != NULL)
+        {
+         EngineData(theEnv)->TheLogicalBind = FindLogicalBind(EngineData(theEnv)->TheLogicalJoin,EngineData(theEnv)->GlobalLHSBinds);
+         EngineData(theEnv)->TheLogicalBind->busy = true;
+        }
+      else
+        { EngineData(theEnv)->TheLogicalBind = NULL; }
+
+      /*=============================================*/
+      /* Execute the rule's right hand side actions. */
+      /*=============================================*/
+
+      EvaluationData(theEnv)->CurrentEvaluationDepth++;
+      SetEvaluationError(theEnv,false);
+      EngineData(theEnv)->ExecutingRule->executing = true;
+      danglingConstructs = ConstructData(theEnv)->DanglingConstructs;
+
+#if PROFILING_FUNCTIONS
+      StartProfile(theEnv,&profileFrame,
+                   &EngineData(theEnv)->ExecutingRule->header.usrData,
+                   ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+      EvaluateProcActions(theEnv,EngineData(theEnv)->ExecutingRule->header.whichModule->theModule,
+                          EngineData(theEnv)->ExecutingRule->actions,EngineData(theEnv)->ExecutingRule->localVarCnt,
+                          &returnValue,NULL);
+
+#if PROFILING_FUNCTIONS
+      EndProfile(theEnv,&profileFrame);
+#endif
+
+      error = GetEvaluationError(theEnv);
+      EngineData(theEnv)->ExecutingRule->executing = false;
+      SetEvaluationError(theEnv,false);
+      EvaluationData(theEnv)->CurrentEvaluationDepth--;
+      if (EvaluationData(theEnv)->CurrentExpression == NULL)
+        { ConstructData(theEnv)->DanglingConstructs = danglingConstructs; }
+        
+      /*========================================*/
+      /* Execute the list of functions that are */
+      /* to be called after each rule firing.   */
+      /*========================================*/
+
+      for (ruleFiresFunction = EngineData(theEnv)->ListOfAfterRuleFiresFunctions;
+           ruleFiresFunction != NULL;
+           ruleFiresFunction = ruleFiresFunction->next)
+        { (*ruleFiresFunction->func)(theEnv,theActivation,ruleFiresFunction->context); }
+
+      /*=====================================*/
+      /* Remove information for logical CEs. */
+      /*=====================================*/
+
+      EngineData(theEnv)->TheLogicalJoin = NULL;
+
+      if (EngineData(theEnv)->TheLogicalBind != NULL)
+        {
+         EngineData(theEnv)->TheLogicalBind->busy = false;
+         EngineData(theEnv)->TheLogicalBind = NULL;
+        }
+
+      /*=====================================================*/
+      /* If rule execution was halted, then print a message. */
+      /*=====================================================*/
+
+#if DEBUGGING_FUNCTIONS
+      if ((EvaluationData(theEnv)->HaltExecution) || (EngineData(theEnv)->HaltRules && EngineData(theEnv)->ExecutingRule->watchFiring))
+#else
+      if ((EvaluationData(theEnv)->HaltExecution) || (EngineData(theEnv)->HaltRules))
+#endif
+
+        {
+         const char *logName;
+
+         if (error)
+           {
+            PrintErrorID(theEnv,"PRCCODE",4,false);
+            logName = STDERR;
+           }
+         else
+           {
+            PrintWarningID(theEnv,"PRCCODE",4,false);
+            logName = STDWRN;
+           }
+
+         WriteString(theEnv,logName,"Execution halted during the actions of defrule '");
+         WriteString(theEnv,logName,ruleFiring);
+         WriteString(theEnv,logName,"'.\n");
+        }
+
+      /*===================================================*/
+      /* Decrement the count for each of the facts/objects */
+      /* associated with the rule activation.              */
+      /*===================================================*/
+
+      theBasis->busy = false;
+
+      for (i = 0; i < (theBasis->bcount); i++)
+        {
+         if (theBasis->binds[i].gm.theMatch == NULL) continue;
+         theMatchingItem = theBasis->binds[i].gm.theMatch->matchingItem;
+         if (theMatchingItem != NULL)
+           { (*theMatchingItem->theInfo->decrementBasisCount)(theEnv,theMatchingItem); }
+        }
+
+      /*========================================*/
+      /* Return the agenda node to free memory. */
+      /*========================================*/
+
+      RemoveTrackedMemory(theEnv,theTM);
+      RemoveActivation(theEnv,theActivation,false,false);
+
+      /*======================================*/
+      /* Get rid of partial matches discarded */
+      /* while executing the rule's RHS.      */
+      /*======================================*/
+
+      FlushGarbagePartialMatches(theEnv);
+
+      /*==================================*/
+      /* Get rid of other garbage created */
+      /* while executing the rule's RHS.  */
+      /*==================================*/
+
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+
+      /*==========================*/
+      /* Keep up with statistics. */
+      /*==========================*/
+
+#if DEBUGGING_FUNCTIONS
+      if (EngineData(theEnv)->WatchStatistics)
+        {
+#if DEFTEMPLATE_CONSTRUCT
+         tempValue = GetNumberOfFacts(theEnv);
+         if (tempValue > maxFacts) maxFacts = tempValue;
+         sumFacts += tempValue;
+#endif
+#if OBJECT_SYSTEM
+         tempValue = GetGlobalNumberOfInstances(theEnv);
+         if (tempValue > maxInstances) maxInstances = tempValue;
+         sumInstances += tempValue;
+#endif
+         tempValue = GetNumberOfActivations(theEnv);
+         if (tempValue > maxActivations) maxActivations = tempValue;
+         sumActivations += tempValue;
+        }
+#endif
+
+      /*==================================*/
+      /* Update saliences if appropriate. */
+      /*==================================*/
+
+      if (GetSalienceEvaluation(theEnv) == EVERY_CYCLE)
+        { RefreshAllAgendas(theEnv); }
+
+      /*========================================*/
+      /* If a return was issued on the RHS of a */
+      /* rule, then remove *that* rule's module */
+      /* from the focus stack                   */
+      /*========================================*/
+
+      if (ProcedureFunctionData(theEnv)->ReturnFlag == true)
+        { RemoveFocus(theEnv,EngineData(theEnv)->ExecutingRule->header.whichModule->theModule); }
+      ProcedureFunctionData(theEnv)->ReturnFlag = false;
+
+      /*========================================*/
+      /* Determine the next activation to fire. */
+      /*========================================*/
+
+      theActivation = (struct activation *) NextActivationToFire(theEnv);
+
+      /*==============================*/
+      /* Check for a rule breakpoint. */
+      /*==============================*/
+
+      if (theActivation != NULL)
+        {
+         if (GetActivationRule(theEnv,theActivation)->afterBreakpoint)
+           {
+            EngineData(theEnv)->HaltRules = true;
+            WriteString(theEnv,STDOUT,"Breaking on rule ");
+            WriteString(theEnv,STDOUT,ActivationRuleName(theActivation));
+            WriteString(theEnv,STDOUT,".\n");
+           }
+        }
+     }
+
+   /*=====================================================*/
+   /* Make sure run functions are executed at least once. */
+   /*=====================================================*/
+
+   if (rulesFired == 0)
+     {
+      for (ruleFiresFunction = EngineData(theEnv)->ListOfAfterRuleFiresFunctions;
+           ruleFiresFunction != NULL;
+           ruleFiresFunction = ruleFiresFunction->next)
+        { (*ruleFiresFunction->func)(theEnv,NULL,ruleFiresFunction->context); }
+     }
+
+   /*======================================================*/
+   /* If rule execution was halted because the rule firing */
+   /* limit was reached, then print a message.             */
+   /*======================================================*/
+
+   if (runLimit == rulesFired)
+     { WriteString(theEnv,STDOUT,"rule firing limit reached\n"); }
+
+   /*==============================*/
+   /* Restore execution variables. */
+   /*==============================*/
+
+   EngineData(theEnv)->ExecutingRule = NULL;
+   EngineData(theEnv)->HaltRules = false;
+
+   /*=================================================*/
+   /* Print out statistics if they are being watched. */
+   /*=================================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if (EngineData(theEnv)->WatchStatistics)
+     {
+#if DEFTEMPLATE_CONSTRUCT || OBJECT_SYSTEM || DEVELOPER
+      char printSpace[60];
+#endif
+#if (! GENERIC)
+      endTime = gentime();
+#endif
+
+      WriteInteger(theEnv,STDOUT,rulesFired);
+      WriteString(theEnv,STDOUT," rules fired");
+
+#if (! GENERIC)
+      if (startTime != endTime)
+        {
+         WriteString(theEnv,STDOUT,"        Run time is ");
+         WriteFloat(theEnv,STDOUT,endTime - startTime);
+         WriteString(theEnv,STDOUT," seconds.\n");
+         WriteFloat(theEnv,STDOUT,(double) rulesFired / (endTime - startTime));
+         WriteString(theEnv,STDOUT," rules per second.\n");
+        }
+      else
+        { WriteString(theEnv,STDOUT,"\n"); }
+#else
+      WriteString(theEnv,STDOUT,"\n");
+#endif
+
+#if DEFTEMPLATE_CONSTRUCT
+      gensprintf(printSpace,"%ld mean number of facts (%ld maximum).\n",
+                          (long) (((double) sumFacts / (rulesFired + 1)) + 0.5),
+                          maxFacts);
+      WriteString(theEnv,STDOUT,printSpace);
+#endif
+
+#if OBJECT_SYSTEM
+      gensprintf(printSpace,"%ld mean number of instances (%ld maximum).\n",
+                          (long) (((double) sumInstances / (rulesFired + 1)) + 0.5),
+                          maxInstances);
+      WriteString(theEnv,STDOUT,printSpace);
+#endif
+
+      gensprintf(printSpace,"%ld mean number of activations (%ld maximum).\n",
+                          (long) (((double) sumActivations / (rulesFired + 1)) + 0.5),
+                          maxActivations);
+      WriteString(theEnv,STDOUT,printSpace);
+
+#if DEVELOPER
+      gensprintf(printSpace,"%9ld left to right comparisons.\n",
+                          EngineData(theEnv)->leftToRightComparisons);
+      WriteString(theEnv,STDOUT,printSpace);
+
+      gensprintf(printSpace,"%9ld left to right succeeds.\n",
+                          EngineData(theEnv)->leftToRightSucceeds);
+      WriteString(theEnv,STDOUT,printSpace);
+
+      gensprintf(printSpace,"%9ld left to right loops.\n",
+                          EngineData(theEnv)->leftToRightLoops);
+      WriteString(theEnv,STDOUT,printSpace);
+
+      gensprintf(printSpace,"%9ld right to left comparisons.\n",
+                          EngineData(theEnv)->rightToLeftComparisons);
+      WriteString(theEnv,STDOUT,printSpace);
+
+      gensprintf(printSpace,"%9ld right to left succeeds.\n",
+                          EngineData(theEnv)->rightToLeftSucceeds);
+      WriteString(theEnv,STDOUT,printSpace);
+
+      gensprintf(printSpace,"%9ld right to left loops.\n",
+                          EngineData(theEnv)->rightToLeftLoops);
+      WriteString(theEnv,STDOUT,printSpace);
+
+      gensprintf(printSpace,"%9ld find next conflicting comparisons.\n",
+                          EngineData(theEnv)->findNextConflictingComparisons);
+      WriteString(theEnv,STDOUT,printSpace);
+
+      gensprintf(printSpace,"%9ld beta hash list skips.\n",
+                          EngineData(theEnv)->betaHashListSkips);
+      WriteString(theEnv,STDOUT,printSpace);
+
+      gensprintf(printSpace,"%9ld beta hash hash table skips.\n",
+                          EngineData(theEnv)->betaHashHTSkips);
+      WriteString(theEnv,STDOUT,printSpace);
+
+      gensprintf(printSpace,"%9ld unneeded marker compare.\n",
+                          EngineData(theEnv)->unneededMarkerCompare);
+      WriteString(theEnv,STDOUT,printSpace);
+
+#endif
+     }
+#endif
+
+   /*==========================================*/
+   /* The current module should be the current */
+   /* focus when the run finishes.             */
+   /*==========================================*/
+
+   if (EngineData(theEnv)->CurrentFocus != NULL)
+     {
+      if (EngineData(theEnv)->CurrentFocus->theModule != GetCurrentModule(theEnv))
+        { SetCurrentModule(theEnv,EngineData(theEnv)->CurrentFocus->theModule); }
+     }
+
+   /*================================*/
+   /* Restore the old garbage frame. */
+   /*================================*/
+
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+
+   /*===================================*/
+   /* Return the number of rules fired. */
+   /*===================================*/
+
+   EngineData(theEnv)->AlreadyRunning = false;
+   return rulesFired;
+  }
+
+/***********************************************************/
+/* NextActivationToFire: Returns the next activation which */
+/*   should be executed based on the current focus.        */
+/***********************************************************/
+Activation *NextActivationToFire(
+  Environment *theEnv)
+  {
+   struct activation *theActivation;
+   Defmodule *theModule;
+
+   /*====================================*/
+   /* If there is no current focus, then */
+   /* focus on the MAIN module.          */
+   /*====================================*/
+
+   if (EngineData(theEnv)->CurrentFocus == NULL)
+     {
+      theModule = FindDefmodule(theEnv,"MAIN");
+      Focus(theModule);
+     }
+
+   /*===========================================================*/
+   /* Determine the top activation on the agenda of the current */
+   /* focus. If the current focus has no activations on its     */
+   /* agenda, then pop the focus off the focus stack until      */
+   /* a focus that has an activation on its agenda is found.    */
+   /*===========================================================*/
+
+   theActivation = EngineData(theEnv)->CurrentFocus->theDefruleModule->agenda;
+   while ((theActivation == NULL) && (EngineData(theEnv)->CurrentFocus != NULL))
+     {
+      if (EngineData(theEnv)->CurrentFocus != NULL) PopFocus(theEnv);
+      if (EngineData(theEnv)->CurrentFocus != NULL) theActivation = EngineData(theEnv)->CurrentFocus->theDefruleModule->agenda;
+     }
+
+   /*=========================================*/
+   /* Return the next activation to be fired. */
+   /*=========================================*/
+
+   return(theActivation);
+  }
+
+/***************************************************/
+/* RemoveFocus: Removes the first occurence of the */
+/*   specified module from the focus stack.        */
+/***************************************************/
+static Defmodule *RemoveFocus(
+  Environment *theEnv,
+  Defmodule *theModule)
+  {
+   FocalModule *tempFocus,*prevFocus, *nextFocus;
+   bool found = false;
+   bool currentFocusRemoved = false;
+
+   /*====================================*/
+   /* Return NULL if there is nothing on */
+   /* the focus stack to remove.         */
+   /*====================================*/
+
+   if (EngineData(theEnv)->CurrentFocus == NULL) return NULL;
+
+   /*=============================================*/
+   /* Remove the first occurence of the specified */
+   /* module from the focus stack.                */
+   /*=============================================*/
+
+   prevFocus = NULL;
+   tempFocus = EngineData(theEnv)->CurrentFocus;
+   while ((tempFocus != NULL) && (! found))
+     {
+      if (tempFocus->theModule == theModule)
+        {
+         found = true;
+
+         nextFocus = tempFocus->next;
+         rtn_struct(theEnv,focalModule,tempFocus);
+         tempFocus = nextFocus;
+
+         if (prevFocus == NULL)
+           {
+            currentFocusRemoved = true;
+            EngineData(theEnv)->CurrentFocus = tempFocus;
+           }
+         else
+           { prevFocus->next = tempFocus; }
+        }
+      else
+        {
+         prevFocus = tempFocus;
+         tempFocus = tempFocus->next;
+        }
+     }
+
+   /*=========================================*/
+   /* If the given module is not in the focus */
+   /* stack, simply return the current focus  */
+   /*=========================================*/
+
+   if (! found) return EngineData(theEnv)->CurrentFocus->theModule;
+
+   /*========================================*/
+   /* If the current focus is being watched, */
+   /* then print an informational message.   */
+   /*========================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if (EngineData(theEnv)->WatchFocus &&
+       (! ConstructData(theEnv)->ClearReadyInProgress) &&
+       (! ConstructData(theEnv)->ClearInProgress))
+     {
+      WriteString(theEnv,STDOUT,"<== Focus ");
+      WriteString(theEnv,STDOUT,theModule->header.name->contents);
+
+      if ((EngineData(theEnv)->CurrentFocus != NULL) && currentFocusRemoved)
+        {
+         WriteString(theEnv,STDOUT," to ");
+         WriteString(theEnv,STDOUT,EngineData(theEnv)->CurrentFocus->theModule->header.name->contents);
+        }
+
+      WriteString(theEnv,STDOUT,"\n");
+     }
+#endif
+
+   /*======================================================*/
+   /* Set the current module to the module associated with */
+   /* the current focus (if it changed) and set a boolean  */
+   /* flag indicating that the focus has changed.          */
+   /*======================================================*/
+
+   if ((EngineData(theEnv)->CurrentFocus != NULL) && currentFocusRemoved)
+     { SetCurrentModule(theEnv,EngineData(theEnv)->CurrentFocus->theModule); }
+   EngineData(theEnv)->FocusChanged = true;
+
+   /*====================================*/
+   /* Return the module that was removed */
+   /* from the focus stack.              */
+   /*====================================*/
+
+   return(theModule);
+  }
+
+/**********************************************************/
+/* PopFocus: C access routine for the pop-focus function. */
+/**********************************************************/
+Defmodule *PopFocus(
+  Environment *theEnv)
+  {
+   if (EngineData(theEnv)->CurrentFocus == NULL) return NULL;
+   return RemoveFocus(theEnv,EngineData(theEnv)->CurrentFocus->theModule);
+  }
+
+/************************************************************/
+/* GetNextFocus: Returns the next focus on the focus stack. */
+/************************************************************/
+FocalModule *GetNextFocus(
+  Environment *theEnv,
+  FocalModule *theFocus)
+  {
+   /*==================================================*/
+   /* If NULL is passed as an argument, return the top */
+   /* focus on the focus stack (the current focus).    */
+   /*==================================================*/
+
+   if (theFocus == NULL) return EngineData(theEnv)->CurrentFocus;
+
+   /*=======================================*/
+   /* Otherwise, return the focus following */
+   /* the focus passed as an argument.      */
+   /*=======================================*/
+
+   return theFocus->next;
+  }
+
+/*********************************************************/
+/* FocalModuleName: Returns the name of the FocalModule. */
+/*********************************************************/
+const char *FocalModuleName(
+  FocalModule *theFocus)
+  {
+   return theFocus->theModule->header.name->contents;
+  }
+
+/****************************************************************/
+/* FocalModuleModule: Returns the Defmodule of the FocalModule. */
+/****************************************************************/
+Defmodule *FocalModuleModule(
+  FocalModule *theFocus)
+  {
+   return theFocus->theModule;
+  }
+
+/***************************************************/
+/* Focus: C access routine for the focus function. */
+/***************************************************/
+void Focus(
+  Defmodule *theModule)
+  {
+   FocalModule *tempFocus;
+   Environment *theEnv;
+   
+   if (theModule == NULL) return;
+    
+   theEnv = theModule->header.env;
+
+   /*==================================================*/
+   /* Make the specified module be the current module. */
+   /* If the specified module is the current focus,    */
+   /* then no further action is needed.                */
+   /*==================================================*/
+
+   SetCurrentModule(theEnv,theModule);
+   if (EngineData(theEnv)->CurrentFocus != NULL)
+     { if (EngineData(theEnv)->CurrentFocus->theModule == theModule) return; }
+
+   /*=====================================*/
+   /* If the focus is being watched, then */
+   /* print an information message.       */
+   /*=====================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if (EngineData(theEnv)->WatchFocus &&
+       (! ConstructData(theEnv)->ClearReadyInProgress) &&
+       (! ConstructData(theEnv)->ClearInProgress))
+     {
+      WriteString(theEnv,STDOUT,"==> Focus ");
+      WriteString(theEnv,STDOUT,theModule->header.name->contents);
+      if (EngineData(theEnv)->CurrentFocus != NULL)
+        {
+         WriteString(theEnv,STDOUT," from ");
+         WriteString(theEnv,STDOUT,EngineData(theEnv)->CurrentFocus->theModule->header.name->contents);
+        }
+      WriteString(theEnv,STDOUT,"\n");
+     }
+#endif
+
+   /*=======================================*/
+   /* Add the new focus to the focus stack. */
+   /*=======================================*/
+
+   tempFocus = get_struct(theEnv,focalModule);
+   tempFocus->theModule = theModule;
+   tempFocus->theDefruleModule = GetDefruleModuleItem(theEnv,theModule);
+   tempFocus->next = EngineData(theEnv)->CurrentFocus;
+   EngineData(theEnv)->CurrentFocus = tempFocus;
+   EngineData(theEnv)->FocusChanged = true;
+  }
+
+/************************************************/
+/* ClearFocusStackCommand: H/L access routine   */
+/*   for the clear-focus-stack command.         */
+/************************************************/
+void ClearFocusStackCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ClearFocusStack(theEnv);
+  }
+
+/****************************************/
+/* ClearFocusStack: C access routine    */
+/*   for the clear-focus-stack command. */
+/****************************************/
+void ClearFocusStack(
+  Environment *theEnv)
+  {
+   while (EngineData(theEnv)->CurrentFocus != NULL) PopFocus(theEnv);
+
+   EngineData(theEnv)->FocusChanged = true;
+  }
+
+/**********************************************/
+/* AddAfterRuleFiresFunction: Adds a function */
+/*   to the ListOfAfterRuleFiresFunctions.    */
+/**********************************************/
+bool AddAfterRuleFiresFunction(
+  Environment *theEnv,
+  const char *name,
+  RuleFiredFunction *functionPtr,
+  int priority,
+  void *context)
+  {
+   EngineData(theEnv)->ListOfAfterRuleFiresFunctions =
+      AddRuleFiredFunctionToCallList(theEnv,name,priority,functionPtr,
+                                     EngineData(theEnv)->ListOfAfterRuleFiresFunctions,context);
+   return true;
+  }
+
+/***********************************************/
+/* AddBeforeRuleFiresFunction: Adds a function */
+/*   to the ListOfBeforeRuleFiresFunctions.    */
+/***********************************************/
+bool AddBeforeRuleFiresFunction(
+  Environment *theEnv,
+  const char *name,
+  RuleFiredFunction *functionPtr,
+  int priority,
+  void *context)
+  {
+   EngineData(theEnv)->ListOfBeforeRuleFiresFunctions =
+      AddRuleFiredFunctionToCallList(theEnv,name,priority,functionPtr,
+                                     EngineData(theEnv)->ListOfBeforeRuleFiresFunctions,context);
+   return true;
+  }
+
+/****************************************************/
+/* RemoveAfterRuleFiresFunction: Removes a function */
+/*   from the ListOfAfterRuleFiresFunctions.        */
+/****************************************************/
+bool RemoveAfterRuleFiresFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   EngineData(theEnv)->ListOfAfterRuleFiresFunctions =
+      RemoveRuleFiredFunctionFromCallList(theEnv,name,EngineData(theEnv)->ListOfAfterRuleFiresFunctions,&found);
+
+   return found;
+  }
+
+/*****************************************************/
+/* RemoveBeforeRuleFiresFunction: Removes a function */
+/*   from the ListOfBeforeRuleFiresFunctions.        */
+/*****************************************************/
+bool RemoveBeforeRuleFiresFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   EngineData(theEnv)->ListOfBeforeRuleFiresFunctions =
+      RemoveRuleFiredFunctionFromCallList(theEnv,name,EngineData(theEnv)->ListOfBeforeRuleFiresFunctions,&found);
+
+   return found;
+  }
+
+/***************************************************/
+/* AddRuleFiredFunctionToCallList: Adds a function */
+/*   to a rule fired function list.                */
+/***************************************************/
+RuleFiredFunctionItem *AddRuleFiredFunctionToCallList(
+  Environment *theEnv,
+  const char *name,
+  int priority,
+  RuleFiredFunction *func,
+  RuleFiredFunctionItem *head,
+  void *context)
+  {
+   RuleFiredFunctionItem *newPtr, *currentPtr, *lastPtr = NULL;
+   char  *nameCopy;
+
+   newPtr = get_struct(theEnv,ruleFiredFunctionItem);
+
+   nameCopy = (char *) genalloc(theEnv,strlen(name) + 1);
+   genstrcpy(nameCopy,name);
+   newPtr->name = nameCopy;
+
+   newPtr->func = func;
+   newPtr->priority = priority;
+   newPtr->context = context;
+
+   if (head == NULL)
+     {
+      newPtr->next = NULL;
+      return newPtr;
+     }
+
+   currentPtr = head;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = head;
+      head = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   return head;
+  }
+
+/***********************************************************/
+/* RemoveRuleFiredFunctionFromCallList: Removes a function */
+/*   from a rule fired function list.                      */
+/***********************************************************/
+RuleFiredFunctionItem *RemoveRuleFiredFunctionFromCallList(
+  Environment *theEnv,
+  const char *name,
+  RuleFiredFunctionItem *head,
+  bool *found)
+  {
+   RuleFiredFunctionItem *currentPtr, *lastPtr;
+
+   *found = false;
+   lastPtr = NULL;
+   currentPtr = head;
+
+   while (currentPtr != NULL)
+     {
+      if (strcmp(name,currentPtr->name) == 0)
+        {
+         *found = true;
+         if (lastPtr == NULL)
+           { head = currentPtr->next; }
+         else
+           { lastPtr->next = currentPtr->next; }
+
+         genfree(theEnv,(void *) currentPtr->name,strlen(currentPtr->name) + 1);
+         rtn_struct(theEnv,voidCallFunctionItem,currentPtr);
+         return head;
+        }
+
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   return head;
+  }
+
+/******************************************************/
+/* DeallocateRuleFiredCallList: Removes all functions */
+/*   from a list of rule fired functions.             */
+/******************************************************/
+void DeallocateRuleFiredCallList(
+  Environment *theEnv,
+  RuleFiredFunctionItem *theList)
+  {
+   RuleFiredFunctionItem *tmpPtr, *nextPtr;
+
+   tmpPtr = theList;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      genfree(theEnv,(void *) tmpPtr->name,strlen(tmpPtr->name) + 1);
+      rtn_struct(theEnv,ruleFiredFunctionItem,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/*******************************************************/
+/* RunCommand: H/L access routine for the run command. */
+/*******************************************************/
+void RunCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int numArgs;
+   long long runLimit = -1LL;
+   UDFValue theArg;
+
+   numArgs = UDFArgumentCount(context);
+   if (numArgs == 0)
+     { runLimit = -1LL; }
+   else if (numArgs == 1)
+     {
+      if (! UDFFirstArgument(context,INTEGER_BIT,&theArg)) return;
+      runLimit = theArg.integerValue->contents;
+     }
+
+   Run(theEnv,runLimit);
+  }
+
+/***********************************************/
+/* HaltCommand: Causes rule execution to halt. */
+/***********************************************/
+void HaltCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Halt(theEnv);
+  }
+
+/***************************/
+/* Halt: C access routine  */
+/*   for the halt command. */
+/***************************/
+void Halt(
+  Environment *theEnv)
+  {
+   EngineData(theEnv)->HaltRules = true;
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/********************************/
+/* SetBreak: C access routine   */
+/*   for the set-break command. */
+/********************************/
+void SetBreak(
+  Defrule *theRule)
+  {
+   Defrule *thePtr;
+
+   for (thePtr = theRule;
+        thePtr != NULL;
+        thePtr = thePtr->disjunct)
+     { thePtr->afterBreakpoint = 1; }
+  }
+
+/***********************************/
+/* RemoveBreak: C access routine   */
+/*   for the remove-break command. */
+/***********************************/
+bool RemoveBreak(
+  Defrule *theRule)
+  {
+   Defrule *thePtr;
+   bool rv = false;
+
+   for (thePtr = theRule;
+        thePtr != NULL;
+        thePtr = thePtr->disjunct)
+     {
+      if (thePtr->afterBreakpoint == 1)
+        {
+         thePtr->afterBreakpoint = 0;
+         rv = true;
+        }
+     }
+
+   return rv;
+  }
+
+/**************************************************/
+/* RemoveAllBreakpoints: Removes all breakpoints. */
+/**************************************************/
+void RemoveAllBreakpoints(
+  Environment *theEnv)
+  {
+   Defrule *theRule;
+   Defmodule *theDefmodule = NULL;
+
+   while ((theDefmodule = GetNextDefmodule(theEnv,theDefmodule)) != NULL)
+     {
+      theRule = NULL;
+      while ((theRule = GetNextDefrule(theEnv,theRule)) != NULL)
+        { RemoveBreak(theRule); }
+     }
+  }
+
+/**********************************/
+/* ShowBreaks: C access routine   */
+/*   for the show-breaks command. */
+/**********************************/
+void ShowBreaks(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListItemsDriver(theEnv,logicalName,theModule,
+                   NULL,NULL,
+                   (GetNextItemFunction *) GetNextDefrule,
+                   (const char *(*)(void *)) GetConstructNameString,
+                   NULL,
+                   (bool (*)(void *)) DefruleHasBreakpoint);
+   }
+
+/***********************************************/
+/* DefruleHasBreakpoint: Indicates whether the */
+/*   specified rule has a breakpoint set.      */
+/***********************************************/
+bool DefruleHasBreakpoint(
+  Defrule *theRule)
+  {
+   return theRule->afterBreakpoint;
+  }
+
+/*****************************************/
+/* SetBreakCommand: H/L access routine   */
+/*   for the set-break command.          */
+/*****************************************/
+void SetBreakCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   const char *argument;
+   Defrule *defrulePtr;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg)) return;
+
+   argument = theArg.lexemeValue->contents;
+
+   if ((defrulePtr = FindDefrule(theEnv,argument)) == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defrule",argument,true);
+      return;
+     }
+
+   SetBreak(defrulePtr);
+  }
+
+/********************************************/
+/* RemoveBreakCommand: H/L access routine   */
+/*   for the remove-break command.          */
+/********************************************/
+void RemoveBreakCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   const char *argument;
+   Defrule *defrulePtr;
+
+   if (UDFArgumentCount(context) == 0)
+     {
+      RemoveAllBreakpoints(theEnv);
+      return;
+     }
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg)) return;
+
+   argument = theArg.lexemeValue->contents;
+
+   if ((defrulePtr = FindDefrule(theEnv,argument)) == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defrule",argument,true);
+      return;
+     }
+
+   if (RemoveBreak(defrulePtr) == false)
+     {
+      WriteString(theEnv,STDERR,"Rule ");
+      WriteString(theEnv,STDERR,argument);
+      WriteString(theEnv,STDERR," does not have a breakpoint set.\n");
+     }
+  }
+
+/*******************************************/
+/* ShowBreaksCommand: H/L access routine   */
+/*   for the show-breaks command.          */
+/*******************************************/
+void ShowBreaksCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int numArgs;
+   bool error;
+   Defmodule *theModule;
+
+   numArgs = UDFArgumentCount(context);
+
+   if (numArgs == 1)
+     {
+      theModule = GetModuleName(context,1,&error);
+      if (error) return;
+     }
+   else
+     { theModule = GetCurrentModule(theEnv); }
+
+   ShowBreaks(theEnv,STDOUT,theModule);
+  }
+
+/***********************************************/
+/* ListFocusStackCommand: H/L access routine   */
+/*   for the list-focus-stack command.         */
+/***********************************************/
+void ListFocusStackCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListFocusStack(theEnv,STDOUT);
+  }
+
+/***************************************/
+/* ListFocusStack: C access routine    */
+/*   for the list-focus-stack command. */
+/***************************************/
+void ListFocusStack(
+  Environment *theEnv,
+  const char *logicalName)
+  {
+   FocalModule *theFocus;
+
+   for (theFocus = EngineData(theEnv)->CurrentFocus;
+        theFocus != NULL;
+        theFocus = theFocus->next)
+     {
+      WriteString(theEnv,logicalName,DefmoduleName(theFocus->theModule));
+      WriteString(theEnv,logicalName,"\n");
+     }
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/***********************************************/
+/* GetFocusStackFunction: H/L access routine   */
+/*   for the get-focus-stack function.         */
+/***********************************************/
+void GetFocusStackFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   CLIPSValue result;
+   
+   GetFocusStack(theEnv,&result);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/***************************************/
+/* GetFocusStack: C access routine     */
+/*   for the get-focus-stack function. */
+/***************************************/
+void GetFocusStack(
+  Environment *theEnv,
+  CLIPSValue *returnValue)
+  {
+   FocalModule *theFocus;
+   Multifield *theList;
+   unsigned long count = 0;
+
+   /*===========================================*/
+   /* If there is no current focus, then return */
+   /* a multifield value of length zero.        */
+   /*===========================================*/
+
+   if (EngineData(theEnv)->CurrentFocus == NULL)
+     {
+      returnValue->value = CreateMultifield(theEnv,0L);
+      return;
+     }
+
+   /*=====================================================*/
+   /* Determine the number of modules on the focus stack. */
+   /*=====================================================*/
+
+   for (theFocus = EngineData(theEnv)->CurrentFocus; theFocus != NULL; theFocus = theFocus->next)
+     { count++; }
+
+   /*=============================================*/
+   /* Create a multifield of the appropriate size */
+   /* in which to store the module names.         */
+   /*=============================================*/
+
+   theList = CreateMultifield(theEnv,count);
+   returnValue->multifieldValue = theList;
+
+   /*=================================================*/
+   /* Store the module names in the multifield value. */
+   /*=================================================*/
+
+   for (theFocus = EngineData(theEnv)->CurrentFocus, count = 0;
+        theFocus != NULL;
+        theFocus = theFocus->next, count++)
+     {
+      theList->contents[count].value = theFocus->theModule->header.name;
+     }
+  }
+
+/******************************************/
+/* PopFocusFunction: H/L access routine   */
+/*   for the pop-focus function.          */
+/******************************************/
+void PopFocusFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defmodule *theModule;
+
+   theModule = PopFocus(theEnv);
+   if (theModule == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->value = theModule->header.name;
+  }
+
+/**************************************/
+/* FocusCommand: H/L access routine   */
+/*   for the focus function.          */
+/**************************************/
+void FocusCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   const char *argument;
+   Defmodule *theModule;
+   unsigned int argCount, i;
+
+   /*===========================================*/
+   /* Focus on the specified defrule module(s). */
+   /*===========================================*/
+
+   argCount = UDFArgumentCount(context);
+
+   for (i = argCount; i > 0; i--)
+     {
+      if (! UDFNthArgument(context,i,SYMBOL_BIT,&theArg))
+        { return; }
+
+      argument = theArg.lexemeValue->contents;
+      theModule = FindDefmodule(theEnv,argument);
+
+      if (theModule == NULL)
+        {
+         CantFindItemErrorMessage(theEnv,"defmodule",argument,true);
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+
+      Focus(theModule);
+     }
+
+   /*===================================================*/
+   /* Return true to indicate success of focus command. */
+   /*===================================================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/********************************************************************/
+/* GetFocusChanged: Returns the value of the variable FocusChanged. */
+/********************************************************************/
+bool GetFocusChanged(
+  Environment *theEnv)
+  {
+   return EngineData(theEnv)->FocusChanged;
+  }
+
+/*****************************************************************/
+/* SetFocusChanged: Sets the value of the variable FocusChanged. */
+/*****************************************************************/
+void SetFocusChanged(
+  Environment *theEnv,
+  bool value)
+  {
+   EngineData(theEnv)->FocusChanged = value;
+  }
+
+/******************************************/
+/* SetHaltRules: Sets the HaltRules flag. */
+/******************************************/
+void SetHaltRules(
+  Environment *theEnv,
+  bool value)
+  {
+   EngineData(theEnv)->HaltRules = value;
+  }
+
+/*************************************************/
+/* GetHaltRules: Returns the HaltExecution flag. */
+/*************************************************/
+bool GetHaltRules(
+  Environment *theEnv)
+  {
+   return(EngineData(theEnv)->HaltRules);
+  }
+
+#endif /* DEFRULE_CONSTRUCT */
+
diff --git a/clips/engine.h b/clips/engine.h
new file mode 100755
index 000000000..0e8bad2df
--- /dev/null
+++ b/clips/engine.h
@@ -0,0 +1,203 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                 ENGINE HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functionality primarily associated with */
+/*   the run and focus commands.                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE, INCREMENTAL_RESET,   */
+/*            and LOGICAL_DEPENDENCIES compilation flags.    */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added access functions to the HaltRules flag.  */
+/*                                                           */
+/*            Added EnvGetNextFocus, EnvGetFocusChanged, and */
+/*            EnvSetFocusChanged functions.                  */
+/*                                                           */
+/*      6.30: Added additional developer statistics to help  */
+/*            analyze join network performance.              */
+/*                                                           */
+/*            Removed pseudo-facts used in not CEs.          */
+/*                                                           */
+/*            Added context information for run functions.   */
+/*                                                           */
+/*            Added before rule firing callback function.    */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added EnvHalt function.                        */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Incremental reset is always enabled.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_engine
+
+#pragma once
+
+#define _H_engine
+
+typedef struct focalModule FocalModule;
+
+#include "lgcldpnd.h"
+#include "ruledef.h"
+#include "network.h"
+#include "moduldef.h"
+#include "retract.h"
+
+struct focalModule
+  {
+   Defmodule *theModule;
+   struct defruleModule *theDefruleModule;
+   FocalModule *next;
+  };
+
+typedef struct ruleFiredFunctionItem RuleFiredFunctionItem;
+typedef void RuleFiredFunction(Environment *,Activation *,void *);
+
+struct ruleFiredFunctionItem
+  {
+   const char *name;
+   RuleFiredFunction *func;
+   int priority;
+   RuleFiredFunctionItem *next;
+   void *context;
+  };
+
+#define ENGINE_DATA 18
+
+struct engineData
+  {
+   Defrule *ExecutingRule;
+   bool HaltRules;
+   struct joinNode *TheLogicalJoin;
+   struct partialMatch *TheLogicalBind;
+   struct dependency *UnsupportedDataEntities;
+   bool alreadyEntered;
+   RuleFiredFunctionItem *ListOfAfterRuleFiresFunctions;
+   RuleFiredFunctionItem *ListOfBeforeRuleFiresFunctions;
+   FocalModule *CurrentFocus;
+   bool FocusChanged;
+#if DEBUGGING_FUNCTIONS
+   bool WatchStatistics;
+   bool WatchFocus;
+#endif
+   bool IncrementalResetInProgress;
+   bool JoinOperationInProgress;
+   struct partialMatch *GlobalLHSBinds;
+   struct partialMatch *GlobalRHSBinds;
+   struct joinNode *GlobalJoin;
+   struct partialMatch *GarbagePartialMatches;
+   struct alphaMatch *GarbageAlphaMatches;
+   bool AlreadyRunning;
+#if DEVELOPER
+   long leftToRightComparisons;
+   long rightToLeftComparisons;
+   long leftToRightSucceeds;
+   long rightToLeftSucceeds;
+   long leftToRightLoops;
+   long rightToLeftLoops;
+   long findNextConflictingComparisons;
+   long betaHashHTSkips;
+   long betaHashListSkips;
+   long unneededMarkerCompare;
+#endif
+  };
+
+#define EngineData(theEnv) ((struct engineData *) GetEnvironmentData(theEnv,ENGINE_DATA))
+
+#define MAX_PATTERNS_CHECKED 64
+
+   long long               Run(Environment *,long long);
+   bool                    AddAfterRuleFiresFunction(Environment *,const char *,
+                                                     RuleFiredFunction *,int,void *);
+   bool                    RemoveAfterRuleFiresFunction(Environment *,const char *);
+   bool                    AddBeforeRuleFiresFunction(Environment *,const char *,
+                                                      RuleFiredFunction *,int,void *);
+   bool                    RemoveBeforeRuleFiresFunction(Environment *,const char *);
+   RuleFiredFunctionItem  *AddRuleFiredFunctionToCallList(Environment *,const char *,int,RuleFiredFunction *,
+                                                          RuleFiredFunctionItem *,void *);
+   RuleFiredFunctionItem  *RemoveRuleFiredFunctionFromCallList(Environment *,const char *,
+                                                               RuleFiredFunctionItem *,bool *);
+   void                    DeallocateRuleFiredCallList(Environment *,RuleFiredFunctionItem *);
+   void                    InitializeEngine(Environment *);
+   void                    SetBreak(Defrule *);
+   void                    Halt(Environment *);
+   bool                    RemoveBreak(Defrule *);
+   void                    RemoveAllBreakpoints(Environment *);
+   void                    ShowBreaks(Environment *,const char *,Defmodule *);
+   bool                    DefruleHasBreakpoint(Defrule *);
+   void                    RunCommand(Environment *,UDFContext *,UDFValue *);
+   void                    SetBreakCommand(Environment *,UDFContext *,UDFValue *);
+   void                    RemoveBreakCommand(Environment *,UDFContext *,UDFValue *);
+   void                    ShowBreaksCommand(Environment *,UDFContext *,UDFValue *);
+   void                    HaltCommand(Environment *,UDFContext *,UDFValue *);
+   void                    FocusCommand(Environment *,UDFContext *,UDFValue *);
+   void                    ClearFocusStackCommand(Environment *,UDFContext *,UDFValue *);
+   void                    ClearFocusStack(Environment *);
+   FocalModule            *GetNextFocus(Environment *,FocalModule *);
+   const char             *FocalModuleName(FocalModule *);
+   Defmodule              *FocalModuleModule(FocalModule *);
+   void                    Focus(Defmodule *);
+   bool                    GetFocusChanged(Environment *);
+   void                    SetFocusChanged(Environment *,bool);
+   void                    ListFocusStackCommand(Environment *,UDFContext *,UDFValue *);
+   void                    ListFocusStack(Environment *,const char *);
+   void                    GetFocusStackFunction(Environment *,UDFContext *,UDFValue *);
+   void                    GetFocusStack(Environment *,CLIPSValue *);
+   void                    PopFocusFunction(Environment *,UDFContext *,UDFValue *);
+   Defmodule              *PopFocus(Environment *);
+   bool                    GetHaltRules(Environment *);
+   void                    SetHaltRules(Environment *,bool);
+   Activation             *NextActivationToFire(Environment *);
+
+#endif /* _H_engine */
+
+
+
+
+
+
diff --git a/clips/entities.h b/clips/entities.h
new file mode 100755
index 000000000..1ff90f4fd
--- /dev/null
+++ b/clips/entities.h
@@ -0,0 +1,276 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*                ENTITIES HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Created to store key data structures.          */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_entities
+
+#pragma once
+
+#define _H_entities
+
+typedef struct clipsVoid CLIPSVoid;
+typedef struct clipsLexeme CLIPSLexeme;
+typedef struct clipsFloat CLIPSFloat;
+typedef struct clipsInteger CLIPSInteger;
+typedef struct clipsBitMap CLIPSBitMap;
+typedef struct clipsExternalAddress CLIPSExternalAddress;
+typedef struct typeHeader TypeHeader;
+
+typedef struct multifield Multifield;
+
+typedef struct clipsValue CLIPSValue;
+typedef struct udfValue UDFValue;
+
+typedef struct fact Fact;
+typedef struct instance Instance;
+
+typedef struct expr Expression;
+typedef struct functionDefinition FunctionDefinition;
+typedef struct udfContext UDFContext;
+
+typedef struct entityRecord EntityRecord;
+
+typedef void EntityPrintFunction(Environment *,const char *,void *);
+typedef bool EntityEvaluationFunction(Environment *,void *,UDFValue *);
+typedef void EntityBusyCountFunction(Environment *,void *);
+
+typedef struct patternEntityRecord PatternEntityRecord;
+typedef struct patternEntity PatternEntity;
+
+typedef bool BoolCallFunction(Environment *,void *);
+typedef void VoidCallFunction(Environment *,void *);
+typedef void VoidCallFunctionWithArg(Environment *,void *,void *);
+
+/**************/
+/* typeHeader */
+/**************/
+
+struct typeHeader
+  {
+   unsigned short type;
+  };
+
+/*************/
+/* clipsVoid */
+/*************/
+struct clipsVoid
+  {
+   TypeHeader header;
+  };
+
+/***************/
+/* clipsLexeme */
+/***************/
+struct clipsLexeme
+  {
+   TypeHeader header;
+   CLIPSLexeme *next;
+   long count;
+   unsigned int permanent : 1;
+   unsigned int markedEphemeral : 1;
+   unsigned int neededSymbol : 1;
+   unsigned int bucket : 29;
+   const char *contents;
+  };
+
+/**************/
+/* clipsFloat */
+/**************/
+struct clipsFloat
+  {
+   TypeHeader header;
+   CLIPSFloat *next;
+   long count;
+   unsigned int permanent : 1;
+   unsigned int markedEphemeral : 1;
+   unsigned int neededFloat : 1;
+   unsigned int bucket : 29;
+   double contents;
+  };
+
+/****************/
+/* clipsInteger */
+/****************/
+struct clipsInteger
+  {
+   TypeHeader header;
+   CLIPSInteger *next;
+   long count;
+   unsigned int permanent : 1;
+   unsigned int markedEphemeral : 1;
+   unsigned int neededInteger : 1;
+   unsigned int bucket : 29;
+   long long contents;
+  };
+
+/***************/
+/* clipsBitMap */
+/***************/
+struct clipsBitMap
+  {
+   TypeHeader header;
+   CLIPSBitMap *next;
+   long count;
+   unsigned int permanent : 1;
+   unsigned int markedEphemeral : 1;
+   unsigned int neededBitMap : 1;
+   unsigned int bucket : 29;
+   const char *contents;
+   unsigned short size;
+  };
+
+/************************/
+/* clipsExternalAddress */
+/************************/
+struct clipsExternalAddress
+  {
+   TypeHeader header;
+   CLIPSExternalAddress *next;
+   long count;
+   unsigned int permanent : 1;
+   unsigned int markedEphemeral : 1;
+   unsigned int neededPointer : 1;
+   unsigned int bucket : 29;
+   void *contents;
+   unsigned short type;
+  };
+
+/**************/
+/* clipsValue */
+/**************/
+struct clipsValue
+  {
+   union
+     {
+      void *value;
+      TypeHeader *header;
+      CLIPSLexeme *lexemeValue;
+      CLIPSFloat *floatValue;
+      CLIPSInteger *integerValue;
+      CLIPSVoid *voidValue;
+      Multifield *multifieldValue;
+      Fact *factValue;
+      Instance *instanceValue;
+      CLIPSExternalAddress *externalAddressValue;
+     };
+  };
+
+/**************/
+/* multifield */
+/**************/
+struct multifield
+  {
+   TypeHeader header;
+   unsigned busyCount;
+   size_t length;
+   Multifield *next;
+   CLIPSValue contents[1];
+  };
+
+/************/
+/* udfValue */
+/************/
+struct udfValue
+  {
+   void *supplementalInfo;
+   union
+     {
+      void *value;
+      TypeHeader *header;
+      CLIPSLexeme *lexemeValue;
+      CLIPSFloat *floatValue;
+      CLIPSInteger *integerValue;
+      CLIPSVoid *voidValue;
+      Multifield *multifieldValue;
+      Fact *factValue;
+      Instance *instanceValue;
+      CLIPSExternalAddress *externalAddressValue;
+     };
+   size_t begin;
+   size_t range;
+   struct udfValue *next;
+  };
+
+/**************/
+/* udfContext */
+/**************/
+struct udfContext
+  {
+   Environment *environment;
+   void *context;
+   FunctionDefinition *theFunction;
+   unsigned int lastPosition;
+   Expression *lastArg;
+   UDFValue *returnValue;
+  };
+
+/****************/
+/* entityRecord */
+/****************/
+struct entityRecord
+  {
+   const char *name;
+   unsigned int type : 13;
+   unsigned int copyToEvaluate : 1;
+   unsigned int bitMap : 1;
+   unsigned int addsToRuleComplexity : 1;
+   EntityPrintFunction *shortPrintFunction;
+   EntityPrintFunction *longPrintFunction;
+   bool (*deleteFunction)(void *,Environment *);
+   EntityEvaluationFunction *evaluateFunction;
+   void *(*getNextFunction)(void *,void *);
+   EntityBusyCountFunction *decrementBusyCount;
+   EntityBusyCountFunction *incrementBusyCount;
+   void (*propagateDepth)(void *,void *);
+   void (*markNeeded)(void *,void *);
+   void (*install)(void *,void *);
+   void (*deinstall)(void *,void *);
+   struct userData *usrData;
+  };
+
+/***********************/
+/* patternEntityRecord */
+/***********************/
+struct patternEntityRecord
+  {
+   struct entityRecord base;
+   void (*decrementBasisCount)(Environment *,void *);
+   void (*incrementBasisCount)(Environment *,void *);
+   void (*matchFunction)(Environment *,void *);
+   bool (*synchronized)(Environment *,void *);
+   bool (*isDeleted)(Environment *,void *);
+  };
+
+/*****************/
+/* patternEntity */
+/*****************/
+struct patternEntity
+  {
+   TypeHeader header;
+   struct patternEntityRecord *theInfo;
+   void *dependents;
+   unsigned busyCount;
+   unsigned long long timeTag;
+  };
+
+#endif /* _H_entities */
+
+
diff --git a/clips/envrnbld.c b/clips/envrnbld.c
new file mode 100755
index 000000000..f133317ad
--- /dev/null
+++ b/clips/envrnbld.c
@@ -0,0 +1,770 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*             ENVIRONMENT BUILD MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for supporting multiple environments.   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Added to separate environment creation and     */
+/*            deletion code.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "bmathfun.h"
+#include "commline.h"
+#include "emathfun.h"
+#include "envrnmnt.h"
+#include "engine.h"
+#include "filecom.h"
+#include "iofun.h"
+#include "memalloc.h"
+#include "miscfun.h"
+#include "multifun.h"
+#include "parsefun.h"
+#include "pprint.h"
+#include "prccode.h"
+#include "prcdrfun.h"
+#include "prdctfun.h"
+#include "prntutil.h"
+#include "proflfun.h"
+#include "router.h"
+#include "sortfun.h"
+#include "strngfun.h"
+#include "sysdep.h"
+#include "textpro.h"
+#include "utility.h"
+#include "watch.h"
+
+#if DEFFACTS_CONSTRUCT
+#include "dffctdef.h"
+#endif
+
+#if DEFRULE_CONSTRUCT
+#include "ruledef.h"
+#endif
+
+#if DEFGENERIC_CONSTRUCT
+#include "genrccom.h"
+#endif
+
+#if DEFFUNCTION_CONSTRUCT
+#include "dffnxfun.h"
+#endif
+
+#if DEFGLOBAL_CONSTRUCT
+#include "globldef.h"
+#endif
+
+#if DEFTEMPLATE_CONSTRUCT
+#include "tmpltdef.h"
+#endif
+
+#if OBJECT_SYSTEM
+#include "classini.h"
+#endif
+
+#if DEVELOPER
+#include "developr.h"
+#endif
+
+#include "envrnbld.h"
+
+/****************************************/
+/* GLOBAL EXTERNAL FUNCTION DEFINITIONS */
+/****************************************/
+
+   extern void                    UserFunctions(Environment *);
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    RemoveEnvironmentCleanupFunctions(struct environmentData *);
+   static Environment            *CreateEnvironmentDriver(CLIPSLexeme **,CLIPSFloat **,
+                                                          CLIPSInteger **,CLIPSBitMap **,
+                                                          CLIPSExternalAddress **,
+                                                          struct functionDefinition *);
+   static void                    SystemFunctionDefinitions(Environment *);
+   static void                    InitializeKeywords(Environment *);
+   static void                    InitializeEnvironment(Environment *,CLIPSLexeme **,CLIPSFloat **,
+					   								       CLIPSInteger **,CLIPSBitMap **,
+														   CLIPSExternalAddress **,
+                                                           struct functionDefinition *);
+
+/************************************************************/
+/* CreateEnvironment: Creates an environment data structure */
+/*   and initializes its content to zero/null.              */
+/************************************************************/
+Environment *CreateEnvironment()
+  {
+   return CreateEnvironmentDriver(NULL,NULL,NULL,NULL,NULL,NULL);
+  }
+
+/**********************************************************/
+/* CreateRuntimeEnvironment: Creates an environment data  */
+/*   structure and initializes its content to zero/null.  */
+/**********************************************************/
+Environment *CreateRuntimeEnvironment(
+  CLIPSLexeme **symbolTable,
+  CLIPSFloat **floatTable,
+  CLIPSInteger **integerTable,
+  CLIPSBitMap **bitmapTable,
+  struct functionDefinition *functions)
+  {
+   return CreateEnvironmentDriver(symbolTable,floatTable,integerTable,bitmapTable,NULL,functions);
+  }
+
+/*********************************************************/
+/* CreateEnvironmentDriver: Creates an environment data  */
+/*   structure and initializes its content to zero/null. */
+/*********************************************************/
+Environment *CreateEnvironmentDriver(
+  CLIPSLexeme **symbolTable,
+  CLIPSFloat **floatTable,
+  CLIPSInteger **integerTable,
+  CLIPSBitMap **bitmapTable,
+  CLIPSExternalAddress **externalAddressTable,
+  struct functionDefinition *functions)
+  {
+   struct environmentData *theEnvironment;
+   void *theData;
+
+   theEnvironment = (struct environmentData *) malloc(sizeof(struct environmentData));
+
+   if (theEnvironment == NULL)
+     {
+      printf("\n[ENVRNMNT5] Unable to create new environment.\n");
+      return NULL;
+     }
+
+   theData = malloc(sizeof(void *) * MAXIMUM_ENVIRONMENT_POSITIONS);
+
+   if (theData == NULL)
+     {
+      free(theEnvironment);
+      printf("\n[ENVRNMNT6] Unable to create environment data.\n");
+      return NULL;
+     }
+
+   memset(theData,0,sizeof(void *) * MAXIMUM_ENVIRONMENT_POSITIONS);
+
+   theEnvironment->initialized = false;
+   theEnvironment->theData = (void **) theData;
+   theEnvironment->next = NULL;
+   theEnvironment->listOfCleanupEnvironmentFunctions = NULL;
+   theEnvironment->context = NULL;
+
+   /*=============================================*/
+   /* Allocate storage for the cleanup functions. */
+   /*=============================================*/
+
+   theData = malloc(sizeof(void (*)(struct environmentData *)) * MAXIMUM_ENVIRONMENT_POSITIONS);
+
+   if (theData == NULL)
+     {
+      free(theEnvironment->theData);
+      free(theEnvironment);
+      printf("\n[ENVRNMNT7] Unable to create environment data.\n");
+      return NULL;
+     }
+
+   memset(theData,0,sizeof(void (*)(struct environmentData *)) * MAXIMUM_ENVIRONMENT_POSITIONS);
+   theEnvironment->cleanupFunctions = (void (**)(Environment *))theData;
+
+   InitializeEnvironment(theEnvironment,symbolTable,floatTable,integerTable,
+                         bitmapTable,externalAddressTable,functions);
+      
+   CleanCurrentGarbageFrame(theEnvironment,NULL);
+
+   return theEnvironment;
+  }
+
+/**********************************************/
+/* DestroyEnvironment: Destroys the specified */
+/*   environment returning all of its memory. */
+/**********************************************/
+bool DestroyEnvironment(
+  Environment *theEnvironment)
+  {
+   struct environmentCleanupFunction *cleanupPtr;
+   int i;
+   struct memoryData *theMemData;
+   bool rv = true;
+/*
+   if (EvaluationData(theEnvironment)->CurrentExpression != NULL)
+     { return false; }
+
+#if DEFRULE_CONSTRUCT
+   if (EngineData(theEnvironment)->ExecutingRule != NULL)
+     { return false; }
+#endif
+*/
+   theMemData = MemoryData(theEnvironment);
+
+   ReleaseMem(theEnvironment,-1);
+
+   for (i = 0; i < MAXIMUM_ENVIRONMENT_POSITIONS; i++)
+     {
+      if (theEnvironment->cleanupFunctions[i] != NULL)
+        { (*theEnvironment->cleanupFunctions[i])(theEnvironment); }
+     }
+
+   free(theEnvironment->cleanupFunctions);
+
+   for (cleanupPtr = theEnvironment->listOfCleanupEnvironmentFunctions;
+        cleanupPtr != NULL;
+        cleanupPtr = cleanupPtr->next)
+     { (*cleanupPtr->func)(theEnvironment); }
+
+   RemoveEnvironmentCleanupFunctions(theEnvironment);
+
+   ReleaseMem(theEnvironment,-1);
+
+   if ((theMemData->MemoryAmount != 0) || (theMemData->MemoryCalls != 0))
+     {
+      printf("\n[ENVRNMNT8] Environment data not fully deallocated.\n");
+      printf("\n[ENVRNMNT8] MemoryAmount = %lld.\n",theMemData->MemoryAmount);
+      printf("\n[ENVRNMNT8] MemoryCalls = %lld.\n",theMemData->MemoryCalls);
+      rv = false;
+     }
+
+#if (MEM_TABLE_SIZE > 0)
+   free(theMemData->MemoryTable);
+#endif
+
+   for (i = 0; i < MAXIMUM_ENVIRONMENT_POSITIONS; i++)
+     {
+      if (theEnvironment->theData[i] != NULL)
+        {
+         free(theEnvironment->theData[i]);
+         theEnvironment->theData[i] = NULL;
+        }
+     }
+
+   free(theEnvironment->theData);
+
+   free(theEnvironment);
+
+   return rv;
+  }
+
+/**************************************************/
+/* RemoveEnvironmentCleanupFunctions: Removes the */
+/*   list of environment cleanup functions.       */
+/**************************************************/
+static void RemoveEnvironmentCleanupFunctions(
+  struct environmentData *theEnv)
+  {
+   struct environmentCleanupFunction *nextPtr;
+
+   while (theEnv->listOfCleanupEnvironmentFunctions != NULL)
+     {
+      nextPtr = theEnv->listOfCleanupEnvironmentFunctions->next;
+      free(theEnv->listOfCleanupEnvironmentFunctions);
+      theEnv->listOfCleanupEnvironmentFunctions = nextPtr;
+     }
+  }
+
+/**************************************************/
+/* InitializeEnvironment: Performs initialization */
+/*   of the KB environment.                       */
+/**************************************************/
+static void InitializeEnvironment(
+  Environment *theEnvironment,
+  CLIPSLexeme **symbolTable,
+  CLIPSFloat **floatTable,
+  CLIPSInteger **integerTable,
+  CLIPSBitMap **bitmapTable,
+  CLIPSExternalAddress **externalAddressTable,
+  struct functionDefinition *functions)
+  {
+   /*================================================*/
+   /* Don't allow the initialization to occur twice. */
+   /*================================================*/
+
+   if (theEnvironment->initialized) return;
+
+   /*================================*/
+   /* Initialize the memory manager. */
+   /*================================*/
+
+   InitializeMemory(theEnvironment);
+
+   /*===================================================*/
+   /* Initialize environment data for various features. */
+   /*===================================================*/
+
+   InitializeCommandLineData(theEnvironment);
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   InitializeConstructCompilerData(theEnvironment);
+#endif
+   InitializeConstructData(theEnvironment);
+   InitializeEvaluationData(theEnvironment);
+   InitializeExternalFunctionData(theEnvironment);
+   InitializePrettyPrintData(theEnvironment);
+   InitializePrintUtilityData(theEnvironment);
+   InitializeScannerData(theEnvironment);
+   InitializeSystemDependentData(theEnvironment);
+   InitializeUserDataData(theEnvironment);
+   InitializeUtilityData(theEnvironment);
+#if DEBUGGING_FUNCTIONS
+   InitializeWatchData(theEnvironment);
+#endif
+
+   /*===============================================*/
+   /* Initialize the hash tables for atomic values. */
+   /*===============================================*/
+
+   InitializeAtomTables(theEnvironment,symbolTable,floatTable,integerTable,bitmapTable,externalAddressTable);
+
+   /*=========================================*/
+   /* Initialize file and string I/O routers. */
+   /*=========================================*/
+
+   InitializeDefaultRouters(theEnvironment);
+
+   /*=========================================================*/
+   /* Initialize some system dependent features such as time. */
+   /*=========================================================*/
+
+   InitializeNonportableFeatures(theEnvironment);
+
+   /*=============================================*/
+   /* Register system and user defined functions. */
+   /*=============================================*/
+
+   if (functions != NULL)
+     { InstallFunctionList(theEnvironment,functions); }
+
+   SystemFunctionDefinitions(theEnvironment);
+   UserFunctions(theEnvironment);
+
+   /*====================================*/
+   /* Initialize the constraint manager. */
+   /*====================================*/
+
+   InitializeConstraints(theEnvironment);
+
+   /*==========================================*/
+   /* Initialize the expression hash table and */
+   /* pointers to specific functions.          */
+   /*==========================================*/
+
+   InitExpressionData(theEnvironment);
+
+   /*===================================*/
+   /* Initialize the construct manager. */
+   /*===================================*/
+
+#if ! RUN_TIME
+   InitializeConstructs(theEnvironment);
+#endif
+
+   /*=====================================*/
+   /* Initialize the defmodule construct. */
+   /*=====================================*/
+
+   AllocateDefmoduleGlobals(theEnvironment);
+
+   /*===================================*/
+   /* Initialize the defrule construct. */
+   /*===================================*/
+
+#if DEFRULE_CONSTRUCT
+   InitializeDefrules(theEnvironment);
+#endif
+
+   /*====================================*/
+   /* Initialize the deffacts construct. */
+   /*====================================*/
+
+#if DEFFACTS_CONSTRUCT
+   InitializeDeffacts(theEnvironment);
+#endif
+
+   /*=====================================================*/
+   /* Initialize the defgeneric and defmethod constructs. */
+   /*=====================================================*/
+
+#if DEFGENERIC_CONSTRUCT
+   SetupGenericFunctions(theEnvironment);
+#endif
+
+   /*=======================================*/
+   /* Initialize the deffunction construct. */
+   /*=======================================*/
+
+#if DEFFUNCTION_CONSTRUCT
+   SetupDeffunctions(theEnvironment);
+#endif
+
+   /*=====================================*/
+   /* Initialize the defglobal construct. */
+   /*=====================================*/
+
+#if DEFGLOBAL_CONSTRUCT
+   InitializeDefglobals(theEnvironment);
+#endif
+
+   /*=======================================*/
+   /* Initialize the deftemplate construct. */
+   /*=======================================*/
+
+#if DEFTEMPLATE_CONSTRUCT
+   InitializeDeftemplates(theEnvironment);
+#endif
+
+   /*=============================*/
+   /* Initialize COOL constructs. */
+   /*=============================*/
+
+#if OBJECT_SYSTEM
+   SetupObjectSystem(theEnvironment);
+#endif
+
+   /*=====================================*/
+   /* Initialize the defmodule construct. */
+   /*=====================================*/
+
+   InitializeDefmodules(theEnvironment);
+
+   /*======================================================*/
+   /* Register commands and functions for development use. */
+   /*======================================================*/
+
+#if DEVELOPER
+   DeveloperCommands(theEnvironment);
+#endif
+
+   /*=========================================*/
+   /* Install the special function primitives */
+   /* used by procedural code in constructs.  */
+   /*=========================================*/
+
+   InstallProcedurePrimitives(theEnvironment);
+
+   /*==============================================*/
+   /* Install keywords in the symbol table so that */
+   /* they are available for command completion.   */
+   /*==============================================*/
+
+   InitializeKeywords(theEnvironment);
+
+   /*========================*/
+   /* Issue a clear command. */
+   /*========================*/
+
+   Clear(theEnvironment);
+
+   /*=============================*/
+   /* Initialization is complete. */
+   /*=============================*/
+
+   theEnvironment->initialized = true;
+  }
+
+/**************************************************/
+/* SystemFunctionDefinitions: Sets up definitions */
+/*   of system defined functions.                 */
+/**************************************************/
+static void SystemFunctionDefinitions(
+  Environment *theEnv)
+  {
+   ProceduralFunctionDefinitions(theEnv);
+   MiscFunctionDefinitions(theEnv);
+
+#if IO_FUNCTIONS
+   IOFunctionDefinitions(theEnv);
+#endif
+
+   PredicateFunctionDefinitions(theEnv);
+   BasicMathFunctionDefinitions(theEnv);
+   FileCommandDefinitions(theEnv);
+   SortFunctionDefinitions(theEnv);
+
+#if DEBUGGING_FUNCTIONS
+   WatchFunctionDefinitions(theEnv);
+#endif
+
+#if MULTIFIELD_FUNCTIONS
+   MultifieldFunctionDefinitions(theEnv);
+#endif
+
+#if STRING_FUNCTIONS
+   StringFunctionDefinitions(theEnv);
+#endif
+
+#if EXTENDED_MATH_FUNCTIONS
+   ExtendedMathFunctionDefinitions(theEnv);
+#endif
+
+#if TEXTPRO_FUNCTIONS
+   HelpFunctionDefinitions(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   ConstructsToCCommandDefinition(theEnv);
+#endif
+
+#if PROFILING_FUNCTIONS
+   ConstructProfilingFunctionDefinitions(theEnv);
+#endif
+
+   ParseFunctionDefinitions(theEnv);
+  }
+
+/*********************************************/
+/* InitializeKeywords: Adds key words to the */
+/*   symbol table so that they are available */
+/*   for command completion.                 */
+/*********************************************/
+static void InitializeKeywords(
+  Environment *theEnv)
+  {
+#if (! RUN_TIME) && WINDOW_INTERFACE
+   void *ts;
+
+   /*====================*/
+   /* construct keywords */
+   /*====================*/
+
+   ts = CreateSymbol(theEnv,"defrule");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"defglobal");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"deftemplate");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"deffacts");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"deffunction");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"defmethod");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"defgeneric");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"defclass");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"defmessage-handler");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"definstances");
+   IncrementLexemeCount(ts);
+
+   /*=======================*/
+   /* set-strategy keywords */
+   /*=======================*/
+
+   ts = CreateSymbol(theEnv,"depth");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"breadth");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"lex");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"mea");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"simplicity");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"complexity");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"random");
+   IncrementLexemeCount(ts);
+
+   /*==================================*/
+   /* set-salience-evaluation keywords */
+   /*==================================*/
+
+   ts = CreateSymbol(theEnv,"when-defined");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"when-activated");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"every-cycle");
+   IncrementLexemeCount(ts);
+
+   /*======================*/
+   /* deftemplate keywords */
+   /*======================*/
+
+   ts = CreateSymbol(theEnv,"field");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"multifield");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"default");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"type");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"allowed-symbols");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"allowed-strings");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"allowed-numbers");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"allowed-integers");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"allowed-floats");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"allowed-values");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"min-number-of-elements");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"max-number-of-elements");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"NONE");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"VARIABLE");
+   IncrementLexemeCount(ts);
+
+   /*==================*/
+   /* defrule keywords */
+   /*==================*/
+
+   ts = CreateSymbol(theEnv,"declare");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"salience");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"test");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"or");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"and");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"not");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"logical");
+   IncrementLexemeCount(ts);
+
+   /*===============*/
+   /* COOL keywords */
+   /*===============*/
+
+   ts = CreateSymbol(theEnv,"is-a");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"role");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"abstract");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"concrete");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"pattern-match");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"reactive");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"non-reactive");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"slot");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"field");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"multiple");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"single");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"storage");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"shared");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"local");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"access");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"read");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"write");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"read-only");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"read-write");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"initialize-only");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"propagation");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"inherit");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"no-inherit");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"source");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"composite");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"exclusive");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"allowed-lexemes");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"allowed-instances");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"around");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"before");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"primary");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"after");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"of");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"self");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"visibility");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"override-message");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"private");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"public");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"create-accessor");
+   IncrementLexemeCount(ts);
+
+   /*================*/
+   /* watch keywords */
+   /*================*/
+
+   ts = CreateSymbol(theEnv,"compilations");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"deffunctions");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"globals");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"rules");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"activations");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"statistics");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"facts");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"generic-functions");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"methods");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"instances");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"slots");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"messages");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"message-handlers");
+   IncrementLexemeCount(ts);
+   ts = CreateSymbol(theEnv,"focus");
+   IncrementLexemeCount(ts);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
diff --git a/clips/envrnbld.h b/clips/envrnbld.h
new file mode 100755
index 000000000..db4c1a972
--- /dev/null
+++ b/clips/envrnbld.h
@@ -0,0 +1,40 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*             ENVRNMNT BUILD HEADER FILE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for supporting multiple environments.   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Added to separate environment creation and     */
+/*            deletion code.                                 */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_envrnbld
+
+#pragma once
+
+#define _H_envrnbld
+
+#include <stdbool.h>
+
+#include "envrnmnt.h"
+#include "extnfunc.h"
+
+   Environment                   *CreateEnvironment(void);
+   Environment                   *CreateRuntimeEnvironment(CLIPSLexeme **,CLIPSFloat **,
+                                                           CLIPSInteger **,CLIPSBitMap **,
+                                                           struct functionDefinition *);
+   bool                           DestroyEnvironment(Environment *);
+
+#endif /* _H_envrnbld */
+
diff --git a/clips/envrnmnt.c b/clips/envrnmnt.c
new file mode 100755
index 000000000..4a6c816c0
--- /dev/null
+++ b/clips/envrnmnt.c
@@ -0,0 +1,257 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*                ENVIRONMENT MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for supporting multiple environments.   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added code to CreateEnvironment to free        */
+/*            already allocated data if one of the malloc    */
+/*            calls fail.                                    */
+/*                                                           */
+/*            Modified AllocateEnvironmentData to print a    */
+/*            message if it was unable to allocate memory.   */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added CreateRuntimeEnvironment function.       */
+/*                                                           */
+/*            Added support for context information when an  */
+/*            environment is created (i.e a pointer from the */
+/*            CLIPS environment to its parent environment).  */
+/*                                                           */
+/*      6.30: Added support for passing context information  */
+/*            to user defined functions and callback         */
+/*            functions.                                     */
+/*                                                           */
+/*            Support for hashing EXTERNAL_ADDRESS_TYPE      */
+/*            data type.                                     */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Removed deallocating message parameter from    */
+/*            EnvReleaseMem.                                 */
+/*                                                           */
+/*            Removed support for BLOCK_MEMORY.              */
+/*                                                           */
+/*      6.40: Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "bmathfun.h"
+#include "commline.h"
+#include "emathfun.h"
+#include "engine.h"
+#include "filecom.h"
+#include "iofun.h"
+#include "memalloc.h"
+#include "miscfun.h"
+#include "multifun.h"
+#include "parsefun.h"
+#include "prccode.h"
+#include "prcdrfun.h"
+#include "prdctfun.h"
+#include "prntutil.h"
+#include "proflfun.h"
+#include "router.h"
+#include "sortfun.h"
+#include "strngfun.h"
+#include "sysdep.h"
+#include "textpro.h"
+#include "utility.h"
+#include "watch.h"
+
+#if DEFFACTS_CONSTRUCT
+#include "dffctdef.h"
+#endif
+
+#if DEFRULE_CONSTRUCT
+#include "ruledef.h"
+#endif
+
+#if DEFGENERIC_CONSTRUCT
+#include "genrccom.h"
+#endif
+
+#if DEFFUNCTION_CONSTRUCT
+#include "dffnxfun.h"
+#endif
+
+#if DEFGLOBAL_CONSTRUCT
+#include "globldef.h"
+#endif
+
+#if DEFTEMPLATE_CONSTRUCT
+#include "tmpltdef.h"
+#endif
+
+#if OBJECT_SYSTEM
+#include "classini.h"
+#endif
+
+#if DEVELOPER
+#include "developr.h"
+#endif
+
+#include "envrnmnt.h"
+
+#define SIZE_ENVIRONMENT_HASH  131
+
+/*******************************************************/
+/* AllocateEnvironmentData: Allocates environment data */
+/*    for the specified environment data record.       */
+/*******************************************************/
+bool AllocateEnvironmentData(
+  Environment *theEnvironment,
+  unsigned position,
+  size_t size,
+  EnvironmentCleanupFunction *cleanupFunction)
+  {
+   /*================================================================*/
+   /* Check to see if the data position exceeds the maximum allowed. */
+   /*================================================================*/
+
+   if (position >= MAXIMUM_ENVIRONMENT_POSITIONS)
+     {
+      printf("\n[ENVRNMNT2] Environment data position %d exceeds the maximum allowed.\n",position);
+      return false;
+     }
+
+   /*============================================================*/
+   /* Check if the environment data has already been registered. */
+   /*============================================================*/
+
+   if (theEnvironment->theData[position] != NULL)
+     {
+      printf("\n[ENVRNMNT3] Environment data position %d already allocated.\n",position);
+      return false;
+     }
+
+   /*====================*/
+   /* Allocate the data. */
+   /*====================*/
+
+   theEnvironment->theData[position] = malloc(size);
+   if (theEnvironment->theData[position] == NULL)
+     {
+      printf("\n[ENVRNMNT4] Environment data position %d could not be allocated.\n",position);
+      return false;
+     }
+
+   memset(theEnvironment->theData[position],0,size);
+
+   /*=============================*/
+   /* Store the cleanup function. */
+   /*=============================*/
+
+   theEnvironment->cleanupFunctions[position] = cleanupFunction;
+
+   /*===============================*/
+   /* Data successfully registered. */
+   /*===============================*/
+
+   return true;
+  }
+
+/**********************************************/
+/* GetEnvironmentContext: Returns the context */
+/*   of the specified environment.            */
+/**********************************************/
+void *GetEnvironmentContext(
+  Environment *theEnvironment)
+  {
+   return theEnvironment->context;
+  }
+
+/*******************************************/
+/* SetEnvironmentContext: Sets the context */
+/*   of the specified environment.         */
+/*******************************************/
+void *SetEnvironmentContext(
+  Environment *theEnvironment,
+  void *theContext)
+  {
+   void *oldContext;
+
+   oldContext = theEnvironment->context;
+
+   theEnvironment->context = theContext;
+
+   return oldContext;
+  }
+
+/**************************************************/
+/* AddEnvironmentCleanupFunction: Adds a function */
+/*   to the ListOfCleanupEnvironmentFunctions.    */
+/**************************************************/
+bool AddEnvironmentCleanupFunction(
+  Environment *theEnv,
+  const char *name,
+  EnvironmentCleanupFunction *functionPtr,
+  int priority)
+  {
+   struct environmentCleanupFunction *newPtr, *currentPtr, *lastPtr = NULL;
+
+   newPtr = (struct environmentCleanupFunction *) malloc(sizeof(struct environmentCleanupFunction));
+   if (newPtr == NULL)
+     { return false; }
+
+   newPtr->name = name;
+   newPtr->func = functionPtr;
+   newPtr->priority = priority;
+
+   if (theEnv->listOfCleanupEnvironmentFunctions == NULL)
+     {
+      newPtr->next = NULL;
+      theEnv->listOfCleanupEnvironmentFunctions = newPtr;
+      return true;
+     }
+
+   currentPtr = theEnv->listOfCleanupEnvironmentFunctions;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = theEnv->listOfCleanupEnvironmentFunctions;
+      theEnv->listOfCleanupEnvironmentFunctions = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   return true;
+  }
diff --git a/clips/envrnmnt.h b/clips/envrnmnt.h
new file mode 100755
index 000000000..a494448aa
--- /dev/null
+++ b/clips/envrnmnt.h
@@ -0,0 +1,112 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*                ENVRNMNT HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for supporting multiple environments.   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added code to CreateEnvironment to free        */
+/*            already allocated data if one of the malloc    */
+/*            calls fail.                                    */
+/*                                                           */
+/*            Modified AllocateEnvironmentData to print a    */
+/*            message if it was unable to allocate memory.   */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added CreateRuntimeEnvironment function.       */
+/*                                                           */
+/*            Added support for context information when an  */
+/*            environment is created (i.e a pointer from the */
+/*            CLIPS environment to its parent environment).  */
+/*                                                           */
+/*      6.30: Added support for passing context information  */
+/*            to user defined functions and callback         */
+/*            functions.                                     */
+/*                                                           */
+/*            Support for hashing EXTERNAL_ADDRESS_TYPE data */
+/*            type.                                          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_envrnmnt
+
+#pragma once
+
+#define _H_envrnmnt
+
+#include <stdbool.h>
+#include <stdlib.h>
+
+typedef struct environmentData Environment;
+
+typedef void EnvironmentCleanupFunction(Environment *);
+
+#include "entities.h"
+
+#define USER_ENVIRONMENT_DATA 70
+#define MAXIMUM_ENVIRONMENT_POSITIONS 100
+
+struct environmentCleanupFunction
+  {
+   const char *name;
+   void (*func)(Environment *);
+   int priority;
+   struct environmentCleanupFunction *next;
+  };
+
+struct environmentData
+  {
+   unsigned int initialized : 1;
+   void *context;
+   CLIPSLexeme *TrueSymbol;
+   CLIPSLexeme *FalseSymbol;
+   CLIPSVoid *VoidConstant;
+   void **theData;
+   void (**cleanupFunctions)(Environment *);
+   struct environmentCleanupFunction *listOfCleanupEnvironmentFunctions;
+   struct environmentData *next;
+  };
+
+#define VoidConstant(theEnv) (theEnv->VoidConstant)
+#define FalseSymbol(theEnv) (theEnv->FalseSymbol)
+#define TrueSymbol(theEnv) (theEnv->TrueSymbol)
+
+#define GetEnvironmentData(theEnv,position) (((struct environmentData *) theEnv)->theData[position])
+#define SetEnvironmentData(theEnv,position,value) (((struct environmentData *) theEnv)->theData[position] = value)
+
+   bool                           AllocateEnvironmentData(Environment *,unsigned,size_t,EnvironmentCleanupFunction *);
+   bool                           AddEnvironmentCleanupFunction(Environment *,const char *,EnvironmentCleanupFunction *,int);
+   void                          *GetEnvironmentContext(Environment *);
+   void                          *SetEnvironmentContext(Environment *,void *);
+
+#endif /* _H_envrnmnt */
+
diff --git a/clips/evaluatn.c b/clips/evaluatn.c
new file mode 100755
index 000000000..537ee0d19
--- /dev/null
+++ b/clips/evaluatn.c
@@ -0,0 +1,1718 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  12/07/17             */
+   /*                                                     */
+   /*                  EVALUATION MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for evaluating expressions.    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added EvaluateAndStoreInDataObject function.   */
+/*                                                           */
+/*      6.30: Added support for passing context information  */
+/*            to user defined functions.                     */
+/*                                                           */
+/*            Added support for external address hash table  */
+/*            and subtyping.                                 */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Support for DATA_OBJECT_ARRAY primitive.       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed DATA_OBJECT_ARRAY primitive type.      */
+/*                                                           */
+/*            Modified GetFunctionReference to handle module */
+/*            specifier for funcall.                         */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "commline.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "factmngr.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "router.h"
+#include "prcdrfun.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "exprnpsr.h"
+#include "utility.h"
+#include "proflfun.h"
+#include "sysdep.h"
+
+#if DEFFUNCTION_CONSTRUCT
+#include "dffnxfun.h"
+#endif
+
+#if DEFGENERIC_CONSTRUCT
+#include "genrccom.h"
+#endif
+
+#if OBJECT_SYSTEM
+#include "object.h"
+#include "inscom.h"
+#endif
+
+#include "evaluatn.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    DeallocateEvaluationData(Environment *);
+   static void                    PrintCAddress(Environment *,const char *,void *);
+   static void                    NewCAddress(UDFContext *,UDFValue *);
+   /*
+   static bool                    DiscardCAddress(void *,void *);
+   */
+
+/**************************************************/
+/* InitializeEvaluationData: Allocates environment */
+/*    data for expression evaluation.             */
+/**************************************************/
+void InitializeEvaluationData(
+  Environment *theEnv)
+  {
+   struct externalAddressType cPointer = { "C", PrintCAddress, PrintCAddress, NULL, NewCAddress, NULL };
+
+   AllocateEnvironmentData(theEnv,EVALUATION_DATA,sizeof(struct evaluationData),DeallocateEvaluationData);
+
+   InstallExternalAddressType(theEnv,&cPointer);
+  }
+
+/*****************************************************/
+/* DeallocateEvaluationData: Deallocates environment */
+/*    data for evaluation data.                      */
+/*****************************************************/
+static void DeallocateEvaluationData(
+  Environment *theEnv)
+  {
+   int i;
+
+   for (i = 0; i < EvaluationData(theEnv)->numberOfAddressTypes; i++)
+     { rtn_struct(theEnv,externalAddressType,EvaluationData(theEnv)->ExternalAddressTypes[i]); }
+  }
+
+/**************************************************************/
+/* EvaluateExpression: Evaluates an expression. Returns false */
+/*   if no errors occurred during evaluation, otherwise true. */
+/**************************************************************/
+bool EvaluateExpression(
+  Environment *theEnv,
+  struct expr *problem,
+  UDFValue *returnValue)
+  {
+   struct expr *oldArgument;
+   struct functionDefinition *fptr;
+   UDFContext theUDFContext;
+#if PROFILING_FUNCTIONS
+   struct profileFrameInfo profileFrame;
+#endif
+
+   returnValue->voidValue = VoidConstant(theEnv);
+   returnValue->begin = 0;
+   returnValue->range = SIZE_MAX;
+
+   if (problem == NULL)
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      return(EvaluationData(theEnv)->EvaluationError);
+     }
+
+   switch (problem->type)
+     {
+      case STRING_TYPE:
+      case SYMBOL_TYPE:
+      case FLOAT_TYPE:
+      case INTEGER_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+      case INSTANCE_ADDRESS_TYPE:
+#endif
+      case FACT_ADDRESS_TYPE:
+      case EXTERNAL_ADDRESS_TYPE:
+        returnValue->value = problem->value;
+        break;
+
+      case FCALL:
+        {
+         fptr = problem->functionValue;
+
+#if PROFILING_FUNCTIONS
+         StartProfile(theEnv,&profileFrame,
+                      &fptr->usrData,
+                      ProfileFunctionData(theEnv)->ProfileUserFunctions);
+#endif
+
+         oldArgument = EvaluationData(theEnv)->CurrentExpression;
+         EvaluationData(theEnv)->CurrentExpression = problem;
+
+         theUDFContext.environment = theEnv;
+         theUDFContext.context = fptr->context;
+         theUDFContext.theFunction = fptr;
+         theUDFContext.lastArg = problem->argList;
+         theUDFContext.lastPosition = 1;
+         theUDFContext.returnValue = returnValue;
+         fptr->functionPointer(theEnv,&theUDFContext,returnValue);
+         if ((returnValue->header->type == MULTIFIELD_TYPE) &&
+             (returnValue->range == SIZE_MAX))
+           { returnValue->range = returnValue->multifieldValue->length; }
+
+#if PROFILING_FUNCTIONS
+        EndProfile(theEnv,&profileFrame);
+#endif
+
+        EvaluationData(theEnv)->CurrentExpression = oldArgument;
+        break;
+        }
+
+     case MULTIFIELD_TYPE:
+        returnValue->value = ((UDFValue *) (problem->value))->value;
+        returnValue->begin = ((UDFValue *) (problem->value))->begin;
+        returnValue->range = ((UDFValue *) (problem->value))->range;
+        break;
+
+     case MF_VARIABLE:
+     case SF_VARIABLE:
+        if (GetBoundVariable(theEnv,returnValue,problem->lexemeValue) == false)
+          {
+           PrintErrorID(theEnv,"EVALUATN",1,false);
+           WriteString(theEnv,STDERR,"Variable ");
+           if (problem->type == MF_VARIABLE)
+             { WriteString(theEnv,STDERR,"$?"); }
+           else
+             { WriteString(theEnv,STDERR,"?"); }
+           WriteString(theEnv,STDERR,problem->lexemeValue->contents);
+           WriteString(theEnv,STDERR," is unbound.\n");
+           returnValue->value = FalseSymbol(theEnv);
+           SetEvaluationError(theEnv,true);
+          }
+        break;
+
+      default:
+        if (EvaluationData(theEnv)->PrimitivesArray[problem->type] == NULL)
+          {
+           SystemError(theEnv,"EVALUATN",3);
+           ExitRouter(theEnv,EXIT_FAILURE);
+          }
+
+        if (EvaluationData(theEnv)->PrimitivesArray[problem->type]->copyToEvaluate)
+          {
+           returnValue->value = problem->value;
+           break;
+          }
+
+        if (EvaluationData(theEnv)->PrimitivesArray[problem->type]->evaluateFunction == NULL)
+          {
+           SystemError(theEnv,"EVALUATN",4);
+           ExitRouter(theEnv,EXIT_FAILURE);
+          }
+
+        oldArgument = EvaluationData(theEnv)->CurrentExpression;
+        EvaluationData(theEnv)->CurrentExpression = problem;
+
+#if PROFILING_FUNCTIONS
+        StartProfile(theEnv,&profileFrame,
+                     &EvaluationData(theEnv)->PrimitivesArray[problem->type]->usrData,
+                     ProfileFunctionData(theEnv)->ProfileUserFunctions);
+#endif
+
+        (*EvaluationData(theEnv)->PrimitivesArray[problem->type]->evaluateFunction)(theEnv,problem->value,returnValue);
+
+#if PROFILING_FUNCTIONS
+        EndProfile(theEnv,&profileFrame);
+#endif
+
+        EvaluationData(theEnv)->CurrentExpression = oldArgument;
+        break;
+     }
+     
+   return EvaluationData(theEnv)->EvaluationError;
+  }
+
+/******************************************/
+/* InstallPrimitive: Installs a primitive */
+/*   data type in the primitives array.   */
+/******************************************/
+void InstallPrimitive(
+  Environment *theEnv,
+  struct entityRecord *thePrimitive,
+  int whichPosition)
+  {
+   if (EvaluationData(theEnv)->PrimitivesArray[whichPosition] != NULL)
+     {
+      SystemError(theEnv,"EVALUATN",5);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   EvaluationData(theEnv)->PrimitivesArray[whichPosition] = thePrimitive;
+  }
+
+/******************************************************/
+/* InstallExternalAddressType: Installs an external   */
+/*   address type in the external address type array. */
+/******************************************************/
+int InstallExternalAddressType(
+  Environment *theEnv,
+  struct externalAddressType *theAddressType)
+  {
+   struct externalAddressType *copyEAT;
+
+   int rv = EvaluationData(theEnv)->numberOfAddressTypes;
+
+   if (EvaluationData(theEnv)->numberOfAddressTypes == MAXIMUM_EXTERNAL_ADDRESS_TYPES)
+     {
+      SystemError(theEnv,"EVALUATN",6);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   copyEAT = (struct externalAddressType *) genalloc(theEnv,sizeof(struct externalAddressType));
+   memcpy(copyEAT,theAddressType,sizeof(struct externalAddressType));
+   EvaluationData(theEnv)->ExternalAddressTypes[EvaluationData(theEnv)->numberOfAddressTypes++] = copyEAT;
+
+   return rv;
+  }
+
+/*******************/
+/* ResetErrorFlags */
+/*******************/
+void ResetErrorFlags(
+  Environment *theEnv)
+  {
+   EvaluationData(theEnv)->EvaluationError = false;
+   EvaluationData(theEnv)->HaltExecution = false;
+  }
+
+/******************************************************/
+/* SetEvaluationError: Sets the EvaluationError flag. */
+/******************************************************/
+void SetEvaluationError(
+  Environment *theEnv,
+  bool value)
+  {
+   EvaluationData(theEnv)->EvaluationError = value;
+   if (value == true)
+     { EvaluationData(theEnv)->HaltExecution = true; }
+  }
+
+/*********************************************************/
+/* GetEvaluationError: Returns the EvaluationError flag. */
+/*********************************************************/
+bool GetEvaluationError(
+  Environment *theEnv)
+  {
+   return(EvaluationData(theEnv)->EvaluationError);
+  }
+
+/**************************************************/
+/* SetHaltExecution: Sets the HaltExecution flag. */
+/**************************************************/
+void SetHaltExecution(
+  Environment *theEnv,
+  bool value)
+  {
+   EvaluationData(theEnv)->HaltExecution = value;
+  }
+
+/*****************************************************/
+/* GetHaltExecution: Returns the HaltExecution flag. */
+/*****************************************************/
+bool GetHaltExecution(
+  Environment *theEnv)
+  {
+   return(EvaluationData(theEnv)->HaltExecution);
+  }
+
+/*****************************************************/
+/* ReturnValues: Returns a linked list of UDFValue */
+/*   structures to the pool of free memory.          */
+/*****************************************************/
+void ReturnValues(
+  Environment *theEnv,
+  UDFValue *garbagePtr,
+  bool decrementSupplementalInfo)
+  {
+   UDFValue *nextPtr;
+
+   while (garbagePtr != NULL)
+     {
+      nextPtr = garbagePtr->next;
+      ReleaseUDFV(theEnv,garbagePtr);
+      if ((garbagePtr->supplementalInfo != NULL) && decrementSupplementalInfo)
+        { ReleaseLexeme(theEnv,(CLIPSLexeme *) garbagePtr->supplementalInfo); }
+      rtn_struct(theEnv,udfValue,garbagePtr);
+      garbagePtr = nextPtr;
+     }
+  }
+
+/**************************************************/
+/* WriteCLIPSValue: Prints a CLIPSValue structure */
+/*   to the specified logical name.               */
+/**************************************************/
+void WriteCLIPSValue(
+  Environment *theEnv,
+  const char *fileid,
+  CLIPSValue *argPtr)
+  {
+   switch(argPtr->header->type)
+     {
+      case VOID_TYPE:
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+      case INTEGER_TYPE:
+      case FLOAT_TYPE:
+      case EXTERNAL_ADDRESS_TYPE:
+      case FACT_ADDRESS_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+      case INSTANCE_ADDRESS_TYPE:
+#endif
+        PrintAtom(theEnv,fileid,argPtr->header->type,argPtr->value);
+        break;
+
+      case MULTIFIELD_TYPE:
+        PrintMultifieldDriver(theEnv,fileid,argPtr->multifieldValue,
+                              0,argPtr->multifieldValue->length,true);
+        break;
+
+      default:
+        WriteString(theEnv,fileid,"<UnknownPrintType");
+        WriteInteger(theEnv,fileid,argPtr->header->type);
+        WriteString(theEnv,fileid,">");
+        SetHaltExecution(theEnv,true);
+        SetEvaluationError(theEnv,true);
+        break;
+     }
+  }
+
+/**********************************************/
+/* WriteUDFValue: Prints a UDFValue structure */
+/*   to the specified logical name.           */
+/**********************************************/
+void WriteUDFValue(
+  Environment *theEnv,
+  const char *fileid,
+  UDFValue *argPtr)
+  {
+   switch(argPtr->header->type)
+     {
+      case VOID_TYPE:
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+      case INTEGER_TYPE:
+      case FLOAT_TYPE:
+      case EXTERNAL_ADDRESS_TYPE:
+      case FACT_ADDRESS_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+      case INSTANCE_ADDRESS_TYPE:
+#endif
+        PrintAtom(theEnv,fileid,argPtr->header->type,argPtr->value);
+        break;
+
+      case MULTIFIELD_TYPE:
+        PrintMultifieldDriver(theEnv,fileid,argPtr->multifieldValue,
+                              argPtr->begin,argPtr->range,true);
+        break;
+
+      default:
+        WriteString(theEnv,fileid,"<UnknownPrintType");
+        WriteInteger(theEnv,fileid,argPtr->header->type);
+        WriteString(theEnv,fileid,">");
+        SetHaltExecution(theEnv,true);
+        SetEvaluationError(theEnv,true);
+        break;
+     }
+  }
+
+/*************************************************/
+/* SetMultifieldErrorValue: Creates a multifield */
+/*   value of length zero for error returns.     */
+/*************************************************/
+void SetMultifieldErrorValue(
+  Environment *theEnv,
+  UDFValue *returnValue)
+  {
+   returnValue->value = CreateMultifield(theEnv,0L);
+   returnValue->begin = 0;
+   returnValue->range = 0;
+  }
+
+/***********************************************/
+/* RetainUDFV: Increments the appropriate count */
+/*   (in use) values for a UDFValue structure. */
+/***********************************************/
+void RetainUDFV(
+  Environment *theEnv,
+  UDFValue *vPtr)
+  {
+   if (vPtr->header->type == MULTIFIELD_TYPE)
+     { IncrementCLIPSValueMultifieldReferenceCount(theEnv,vPtr->multifieldValue); }
+   else
+     { Retain(theEnv,vPtr->header); }
+  }
+
+/***********************************************/
+/* RetainUDFV: Decrements the appropriate count */
+/*   (in use) values for a UDFValue structure. */
+/***********************************************/
+void ReleaseUDFV(
+  Environment *theEnv,
+  UDFValue *vPtr)
+  {
+   if (vPtr->header->type == MULTIFIELD_TYPE)
+     { DecrementCLIPSValueMultifieldReferenceCount(theEnv,vPtr->multifieldValue); }
+   else
+     { Release(theEnv,vPtr->header); }
+  }
+
+/*************************************************/
+/* RetainCV: Increments the appropriate count    */
+/*   (in use) values for a CLIPSValue structure. */
+/*************************************************/
+void RetainCV(
+  Environment *theEnv,
+  CLIPSValue *vPtr)
+  {
+   if (vPtr->header->type == MULTIFIELD_TYPE)
+     { IncrementCLIPSValueMultifieldReferenceCount(theEnv,vPtr->multifieldValue); }
+   else
+     { Retain(theEnv,vPtr->header); }
+  }
+
+/*************************************************/
+/* ReleaseCV: Decrements the appropriate count   */
+/*   (in use) values for a CLIPSValue structure. */
+/*************************************************/
+void ReleaseCV(
+  Environment *theEnv,
+  CLIPSValue *vPtr)
+  {
+   if (vPtr->header->type == MULTIFIELD_TYPE)
+     { DecrementCLIPSValueMultifieldReferenceCount(theEnv,vPtr->multifieldValue); }
+   else
+     { Release(theEnv,vPtr->header); }
+  }
+
+/******************************************/
+/* Retain: Increments the reference count */
+/*   of an atomic data type.              */
+/******************************************/
+void Retain(
+  Environment *theEnv,
+  TypeHeader *th)
+  {
+   switch (th->type)
+     {
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+#endif
+        IncrementLexemeCount(th);
+        break;
+
+      case FLOAT_TYPE:
+        IncrementFloatCount(th);
+        break;
+
+      case INTEGER_TYPE:
+        IncrementIntegerCount(th);
+        break;
+
+      case EXTERNAL_ADDRESS_TYPE:
+        IncrementExternalAddressCount(th);
+        break;
+
+      case MULTIFIELD_TYPE:
+        RetainMultifield(theEnv,(Multifield *) th);
+        break;
+        
+#if OBJECT_SYSTEM
+      case INSTANCE_ADDRESS_TYPE:
+        RetainInstance((Instance *) th);
+        break;
+#endif
+
+#if DEFTEMPLATE_CONSTRUCT
+      case FACT_ADDRESS_TYPE:
+        RetainFact((Fact *) th);
+        break;
+#endif
+     
+      case VOID_TYPE:
+        break;
+
+      default:
+        SystemError(theEnv,"EVALUATN",7);
+        ExitRouter(theEnv,EXIT_FAILURE);
+        break;
+     }
+  }
+
+/*************************************/
+/* Release: Decrements the reference */
+/*   count of an atomic data type.   */
+/*************************************/
+void Release(
+  Environment *theEnv,
+  TypeHeader *th)
+  {
+   switch (th->type)
+     {
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+#endif
+        ReleaseLexeme(theEnv,(CLIPSLexeme *) th);
+        break;
+
+      case FLOAT_TYPE:
+        ReleaseFloat(theEnv,(CLIPSFloat *) th);
+        break;
+
+      case INTEGER_TYPE:
+        ReleaseInteger(theEnv,(CLIPSInteger *) th);
+        break;
+
+      case EXTERNAL_ADDRESS_TYPE:
+        ReleaseExternalAddress(theEnv,(CLIPSExternalAddress *) th);
+        break;
+
+      case MULTIFIELD_TYPE:
+        ReleaseMultifield(theEnv,(Multifield *) th);
+        break;
+        
+#if OBJECT_SYSTEM
+      case INSTANCE_ADDRESS_TYPE:
+        ReleaseInstance((Instance *) th);
+        break;
+#endif
+     
+#if DEFTEMPLATE_CONSTRUCT
+      case FACT_ADDRESS_TYPE:
+        ReleaseFact((Fact *) th);
+        break;
+#endif
+
+      case VOID_TYPE:
+        break;
+
+      default:
+        SystemError(theEnv,"EVALUATN",8);
+        ExitRouter(theEnv,EXIT_FAILURE);
+        break;
+     }
+  }
+
+/*****************************************/
+/* AtomInstall: Increments the reference */
+/*   count of an atomic data type.       */
+/*****************************************/
+void AtomInstall(
+  Environment *theEnv,
+  unsigned short type,
+  void *vPtr)
+  {
+   switch (type)
+     {
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+#if DEFGLOBAL_CONSTRUCT
+      case GBL_VARIABLE:
+#endif
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+#endif
+        IncrementLexemeCount(vPtr);
+        break;
+
+      case FLOAT_TYPE:
+        IncrementFloatCount(vPtr);
+        break;
+
+      case INTEGER_TYPE:
+        IncrementIntegerCount(vPtr);
+        break;
+
+      case EXTERNAL_ADDRESS_TYPE:
+        IncrementExternalAddressCount(vPtr);
+        break;
+
+      case MULTIFIELD_TYPE:
+        RetainMultifield(theEnv,(Multifield *) vPtr);
+        break;
+
+      case VOID_TYPE:
+        break;
+
+      default:
+        if (EvaluationData(theEnv)->PrimitivesArray[type] == NULL) break;
+        if (EvaluationData(theEnv)->PrimitivesArray[type]->bitMap) IncrementBitMapCount(vPtr);
+        else if (EvaluationData(theEnv)->PrimitivesArray[type]->incrementBusyCount)
+          { (*EvaluationData(theEnv)->PrimitivesArray[type]->incrementBusyCount)(theEnv,vPtr); }
+        break;
+     }
+  }
+
+/*******************************************/
+/* AtomDeinstall: Decrements the reference */
+/*   count of an atomic data type.         */
+/*******************************************/
+void AtomDeinstall(
+  Environment *theEnv,
+  unsigned short type,
+  void *vPtr)
+  {
+   switch (type)
+     {
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+#if DEFGLOBAL_CONSTRUCT
+      case GBL_VARIABLE:
+#endif
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+#endif
+        ReleaseLexeme(theEnv,(CLIPSLexeme *) vPtr);
+        break;
+
+      case FLOAT_TYPE:
+        ReleaseFloat(theEnv,(CLIPSFloat *) vPtr);
+        break;
+
+      case INTEGER_TYPE:
+        ReleaseInteger(theEnv,(CLIPSInteger *) vPtr);
+        break;
+
+      case EXTERNAL_ADDRESS_TYPE:
+        ReleaseExternalAddress(theEnv,(CLIPSExternalAddress *) vPtr);
+        break;
+
+      case MULTIFIELD_TYPE:
+        ReleaseMultifield(theEnv,(Multifield *) vPtr);
+        break;
+
+      case VOID_TYPE:
+        break;
+
+      default:
+        if (EvaluationData(theEnv)->PrimitivesArray[type] == NULL) break;
+        if (EvaluationData(theEnv)->PrimitivesArray[type]->bitMap) DecrementBitMapReferenceCount(theEnv,(CLIPSBitMap *) vPtr);
+        else if (EvaluationData(theEnv)->PrimitivesArray[type]->decrementBusyCount)
+          { (*EvaluationData(theEnv)->PrimitivesArray[type]->decrementBusyCount)(theEnv,vPtr); }
+     }
+  }
+
+/***************************************************/
+/* CopyDataObject: Copies the values from a source */
+/*   UDFValue to a destination UDFValue.           */
+/***************************************************/
+void CopyDataObject(
+  Environment *theEnv,
+  UDFValue *dst,
+  UDFValue *src,
+  int garbageMultifield)
+  {
+   if (src->header->type != MULTIFIELD_TYPE)
+     {
+      dst->value = src->value;
+     }
+   else
+     {
+      DuplicateMultifield(theEnv,dst,src);
+      if (garbageMultifield)
+        { AddToMultifieldList(theEnv,dst->multifieldValue); }
+     }
+  }
+
+/***********************************************/
+/* TransferDataObjectValues: Copies the values */
+/*   directly from a source UDFValue to a    */
+/*   destination UDFValue.                   */
+/***********************************************/
+void TransferDataObjectValues(
+  UDFValue *dst,
+  UDFValue *src)
+  {
+   dst->value = src->value;
+   dst->begin = src->begin;
+   dst->range = src->range;
+   dst->supplementalInfo = src->supplementalInfo;
+   dst->next = src->next;
+  }
+
+/************************************************************************/
+/* ConvertValueToExpression: Converts the value stored in a data object */
+/*   into an expression. For multifield values, a chain of expressions  */
+/*   is generated and the chain is linked by the nextArg field. For a   */
+/*   single field value, a single expression is created.                */
+/************************************************************************/
+struct expr *ConvertValueToExpression(
+  Environment *theEnv,
+  UDFValue *theValue)
+  {
+   size_t i;
+   struct expr *head = NULL, *last = NULL, *newItem;
+
+   if (theValue->header->type != MULTIFIELD_TYPE)
+     { return(GenConstant(theEnv,theValue->header->type,theValue->value)); }
+
+   for (i = theValue->begin; i < (theValue->begin + theValue->range); i++)
+     {
+      newItem = GenConstant(theEnv,theValue->multifieldValue->contents[i].header->type,
+                                   theValue->multifieldValue->contents[i].value);
+      if (last == NULL) head = newItem;
+      else last->nextArg = newItem;
+      last = newItem;
+     }
+
+   if (head == NULL)
+     return(GenConstant(theEnv,FCALL,FindFunction(theEnv,"create$")));
+
+   return(head);
+  }
+
+/****************************************/
+/* GetAtomicHashValue: Returns the hash */
+/*   value for an atomic data type.     */
+/****************************************/
+unsigned long GetAtomicHashValue(
+  unsigned short type,
+  void *value,
+  unsigned short position)
+  {
+   unsigned long tvalue;
+   union
+     {
+      double fv;
+      void *vv;
+      unsigned long liv;
+     } fis;
+
+   switch (type)
+     {
+      case FLOAT_TYPE:
+        fis.liv = 0;
+        fis.fv = ((CLIPSFloat *) value)->contents;
+        tvalue = fis.liv;
+        break;
+
+      case INTEGER_TYPE:
+        tvalue = (unsigned long) ((CLIPSInteger *) value)->contents;
+        break;
+
+      case EXTERNAL_ADDRESS_TYPE:
+         fis.liv = 0;
+         fis.vv = ((CLIPSExternalAddress *) value)->contents;
+         tvalue = fis.liv;
+         break;
+
+      case FACT_ADDRESS_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_ADDRESS_TYPE:
+#endif
+         fis.liv = 0;
+         fis.vv = value;
+         tvalue = fis.liv;
+         break;
+
+      case STRING_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+#endif
+      case SYMBOL_TYPE:
+        tvalue = ((CLIPSLexeme *) value)->bucket;
+        break;
+
+      default:
+        tvalue = type;
+     }
+
+   return tvalue * (position + 29);
+  }
+
+/***********************************************************/
+/* FunctionReferenceExpression: Returns an expression with */
+/*   an appropriate expression reference to the specified  */
+/*   name if it is the name of a deffunction, defgeneric,  */
+/*   or user/system defined function.                      */
+/***********************************************************/
+struct expr *FunctionReferenceExpression(
+  Environment *theEnv,
+  const char *name)
+  {
+#if DEFGENERIC_CONSTRUCT
+   Defgeneric *gfunc;
+#endif
+#if DEFFUNCTION_CONSTRUCT
+   Deffunction *dptr;
+#endif
+   struct functionDefinition *fptr;
+
+   /*=====================================================*/
+   /* Check to see if the function call is a deffunction. */
+   /*=====================================================*/
+
+#if DEFFUNCTION_CONSTRUCT
+   if ((dptr = LookupDeffunctionInScope(theEnv,name)) != NULL)
+     { return(GenConstant(theEnv,PCALL,dptr)); }
+#endif
+
+   /*====================================================*/
+   /* Check to see if the function call is a defgeneric. */
+   /*====================================================*/
+
+#if DEFGENERIC_CONSTRUCT
+   if ((gfunc = LookupDefgenericInScope(theEnv,name)) != NULL)
+     { return(GenConstant(theEnv,GCALL,gfunc)); }
+#endif
+
+   /*======================================*/
+   /* Check to see if the function call is */
+   /* a system or user defined function.   */
+   /*======================================*/
+
+   if ((fptr = FindFunction(theEnv,name)) != NULL)
+     { return(GenConstant(theEnv,FCALL,fptr)); }
+
+   /*===================================================*/
+   /* The specified function name is not a deffunction, */
+   /* defgeneric, or user/system defined function.      */
+   /*===================================================*/
+
+   return NULL;
+  }
+
+/******************************************************************/
+/* GetFunctionReference: Fills an expression with an appropriate  */
+/*   expression reference to the specified name if it is the      */
+/*   name of a deffunction, defgeneric, or user/system defined    */
+/*   function.                                                    */
+/******************************************************************/
+bool GetFunctionReference(
+  Environment *theEnv,
+  const char *name,
+  Expression *theReference)
+  {
+#if DEFGENERIC_CONSTRUCT
+   Defgeneric *gfunc;
+#endif
+#if DEFFUNCTION_CONSTRUCT
+   Deffunction *dptr;
+#endif
+   struct functionDefinition *fptr;
+   bool moduleSpecified = false;
+   unsigned position;
+   CLIPSLexeme *moduleName = NULL, *constructName = NULL;
+
+   theReference->nextArg = NULL;
+   theReference->argList = NULL;
+   theReference->type = VOID_TYPE;
+   theReference->value = NULL;
+   
+   /*==============================*/
+   /* Look for a module specifier. */
+   /*==============================*/
+
+   if ((position = FindModuleSeparator(name)) != 0)
+     {
+      moduleName = ExtractModuleName(theEnv,position,name);
+      constructName = ExtractConstructName(theEnv,position,name,SYMBOL_TYPE);
+      moduleSpecified = true;
+     }
+
+   /*====================================================*/
+   /* Check to see if the function call is a defgeneric. */
+   /*====================================================*/
+
+#if DEFGENERIC_CONSTRUCT
+   if (moduleSpecified)
+     {
+      if (ConstructExported(theEnv,"defgeneric",moduleName,constructName) ||
+          GetCurrentModule(theEnv) == FindDefmodule(theEnv,moduleName->contents))
+        {
+         if ((gfunc = FindDefgenericInModule(theEnv,name)) != NULL)
+           {
+            theReference->type = GCALL;
+            theReference->value = gfunc;
+            return true;
+           }
+        }
+     }
+   else
+     {
+      if ((gfunc = LookupDefgenericInScope(theEnv,name)) != NULL)
+        {
+         theReference->type = GCALL;
+         theReference->value = gfunc;
+         return true;
+        }
+     }
+#endif
+
+   /*=====================================================*/
+   /* Check to see if the function call is a deffunction. */
+   /*=====================================================*/
+
+#if DEFFUNCTION_CONSTRUCT
+   if (moduleSpecified)
+     {
+      if (ConstructExported(theEnv,"deffunction",moduleName,constructName) ||
+          GetCurrentModule(theEnv) == FindDefmodule(theEnv,moduleName->contents))
+        {
+         if ((dptr = FindDeffunctionInModule(theEnv,name)) != NULL)
+           {
+            theReference->type = PCALL;
+            theReference->value = dptr;
+            return true;
+           }
+        }
+     }
+   else
+     {
+      if ((dptr = LookupDeffunctionInScope(theEnv,name)) != NULL)
+        {
+         theReference->type = PCALL;
+         theReference->value = dptr;
+         return true;
+        }
+     }
+#endif
+
+   /*======================================*/
+   /* Check to see if the function call is */
+   /* a system or user defined function.   */
+   /*======================================*/
+
+   if ((fptr = FindFunction(theEnv,name)) != NULL)
+     {
+      theReference->type = FCALL;
+      theReference->value = fptr;
+      return true;
+     }
+
+   /*===================================================*/
+   /* The specified function name is not a deffunction, */
+   /* defgeneric, or user/system defined function.      */
+   /*===================================================*/
+
+   return false;
+  }
+
+/*******************************************************/
+/* DOsEqual: Determines if two DATA_OBJECTS are equal. */
+/*******************************************************/
+bool DOsEqual(
+  UDFValue *dobj1,
+  UDFValue *dobj2)
+  {
+   if (dobj1->header->type != dobj2->header->type)
+     { return false; }
+
+   if (dobj1->header->type == MULTIFIELD_TYPE)
+     {
+      if (MultifieldDOsEqual(dobj1,dobj2) == false)
+        { return false; }
+     }
+   else if (dobj1->value != dobj2->value)
+     { return false; }
+
+   return true;
+  }
+
+/***********************************************************
+  NAME         : EvaluateAndStoreInDataObject
+  DESCRIPTION  : Evaluates slot-value expressions
+                   and stores the result in a
+                   Kernel data object
+  INPUTS       : 1) Flag indicating if multifields are OK
+                 2) The value-expression
+                 3) The data object structure
+                 4) Flag indicating if a multifield value
+                    should be placed on the garbage list.
+  RETURNS      : False on errors, true otherwise
+  SIDE EFFECTS : Segment allocated for storing
+                 multifield values
+  NOTES        : None
+ ***********************************************************/
+bool EvaluateAndStoreInDataObject(
+  Environment *theEnv,
+  bool mfp,
+  Expression *theExp,
+  UDFValue *val,
+  bool garbageSegment)
+  {
+   val->begin = 0;
+   val->range = 0;
+
+   if (theExp == NULL)
+     {
+      if (garbageSegment) val->value = CreateMultifield(theEnv,0L);
+      else val->value = CreateUnmanagedMultifield(theEnv,0L);
+
+      return true;
+     }
+
+   if ((mfp == false) && (theExp->nextArg == NULL))
+     EvaluateExpression(theEnv,theExp,val);
+   else
+     StoreInMultifield(theEnv,val,theExp,garbageSegment);
+
+   return(EvaluationData(theEnv)->EvaluationError ? false : true);
+  }
+
+/******************/
+/* PrintCAddress: */
+/******************/
+static void PrintCAddress(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+   char buffer[20];
+
+   WriteString(theEnv,logicalName,"<Pointer-C-");
+
+   gensprintf(buffer,"%p",((CLIPSExternalAddress *) theValue)->contents);
+   WriteString(theEnv,logicalName,buffer);
+   WriteString(theEnv,logicalName,">");
+  }
+
+/****************/
+/* NewCAddress: */
+/****************/
+static void NewCAddress(
+  UDFContext *context,
+  UDFValue *rv)
+  {
+   unsigned int numberOfArguments;
+   Environment *theEnv = context->environment;
+
+   numberOfArguments = UDFArgumentCount(context);
+
+   if (numberOfArguments != 1)
+     {
+      PrintErrorID(theEnv,"NEW",1,false);
+      WriteString(theEnv,STDERR,"Function new expected no additional arguments for the C external language type.\n");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+   rv->value = CreateExternalAddress(theEnv,NULL,0);
+  }
+
+/******************************/
+/* CreateFunctionCallBuilder: */
+/******************************/
+FunctionCallBuilder *CreateFunctionCallBuilder(
+  Environment *theEnv,
+  size_t theSize)
+  {
+   FunctionCallBuilder *theFC;
+
+   if (theEnv == NULL) return NULL;
+   
+   theFC = get_struct(theEnv,functionCallBuilder);
+   
+   theFC->fcbEnv = theEnv;
+   theFC->bufferReset = theSize;
+   theFC->bufferMaximum = theSize;
+   theFC->length = 0;
+   
+   if (theSize == 0)
+     { theFC->contents = NULL; }
+   else
+     { theFC->contents = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * theSize); }
+     
+   return theFC;
+  }
+
+/**********************/
+/* FCBAppendUDFValue: */
+/**********************/
+void FCBAppendUDFValue(
+  FunctionCallBuilder *theFCB,
+  UDFValue *theValue)
+  {
+   Environment *theEnv = theFCB->fcbEnv;
+   size_t i, neededSize, newSize;
+   CLIPSValue *newArray;
+
+   /*==============================================*/
+   /* A void value can't be added to a multifield. */
+   /*==============================================*/
+   
+   if (theValue->header->type == VOID_TYPE)
+     { return; }
+
+   /*=======================================*/
+   /* Determine the amount of space needed. */
+   /*=======================================*/
+   
+   neededSize = theFCB->length + 1;
+
+   /*============================================*/
+   /* Increase the size of the buffer if needed. */
+   /*============================================*/
+   
+   if (neededSize > theFCB->bufferMaximum)
+     {
+      newSize = neededSize * 2;
+      
+      newArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * newSize);
+      
+      for (i = 0; i < theFCB->length; i++)
+        { newArray[i] = theFCB->contents[i]; }
+        
+      if (theFCB->bufferMaximum != 0)
+        { rm(theFCB->fcbEnv,theFCB->contents,sizeof(CLIPSValue) * theFCB->bufferMaximum); }
+        
+      theFCB->bufferMaximum = newSize;
+      theFCB->contents = newArray;
+     }
+     
+   /*==================================*/
+   /* Copy the new value to the array. */
+   /*==================================*/
+    
+   if (theValue->header->type == MULTIFIELD_TYPE)
+     {
+      CLIPSValue newValue;
+      
+      UDFToCLIPSValue(theEnv,theValue,&newValue);
+      theFCB->contents[theFCB->length].value = newValue.value;
+     }
+   else
+     { theFCB->contents[theFCB->length].value = theValue->value; }
+     
+   Retain(theEnv,theFCB->contents[theFCB->length].header);
+   theFCB->length++;
+  }
+
+/**************/
+/* FCBAppend: */
+/**************/
+void FCBAppend(
+  FunctionCallBuilder *theFCB,
+  CLIPSValue *theValue)
+  {
+   Environment *theEnv = theFCB->fcbEnv;
+   size_t i, neededSize, newSize;
+   CLIPSValue *newArray;
+
+   /*==============================================*/
+   /* A void value can't be added to a multifield. */
+   /*==============================================*/
+   
+   if (theValue->header->type == VOID_TYPE)
+     { return; }
+
+   /*=======================================*/
+   /* Determine the amount of space needed. */
+   /*=======================================*/
+   
+   neededSize = theFCB->length + 1;
+
+   /*============================================*/
+   /* Increase the size of the buffer if needed. */
+   /*============================================*/
+   
+   if (neededSize > theFCB->bufferMaximum)
+     {
+      newSize = neededSize * 2;
+      
+      newArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * newSize);
+      
+      for (i = 0; i < theFCB->length; i++)
+        { newArray[i] = theFCB->contents[i]; }
+        
+      if (theFCB->bufferMaximum != 0)
+        { rm(theFCB->fcbEnv,theFCB->contents,sizeof(CLIPSValue) * theFCB->bufferMaximum); }
+        
+      theFCB->bufferMaximum = newSize;
+      theFCB->contents = newArray;
+     }
+     
+   /*===================================*/
+   /* Copy the new values to the array. */
+   /*===================================*/
+
+   theFCB->contents[theFCB->length].value = theValue->value;
+   Retain(theEnv,theFCB->contents[theFCB->length].header);
+   theFCB->length++;
+  }
+
+/**************************/
+/* FCBAppendCLIPSInteger: */
+/**************************/
+void FCBAppendCLIPSInteger(
+  FunctionCallBuilder *theFCB,
+  CLIPSInteger *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.integerValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/*********************/
+/* FCBAppendInteger: */
+/*********************/
+void FCBAppendInteger(
+  FunctionCallBuilder *theFCB,
+  long long intValue)
+  {
+   CLIPSValue theValue;
+   CLIPSInteger *pv = CreateInteger(theFCB->fcbEnv,intValue);
+   
+   theValue.integerValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/************************/
+/* FCBAppendCLIPSFloat: */
+/************************/
+void FCBAppendCLIPSFloat(
+  FunctionCallBuilder *theFCB,
+  CLIPSFloat *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.floatValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/*******************/
+/* FCBAppendFloat: */
+/*******************/
+void FCBAppendFloat(
+  FunctionCallBuilder *theFCB,
+  double floatValue)
+  {
+   CLIPSValue theValue;
+   CLIPSFloat *pv = CreateFloat(theFCB->fcbEnv,floatValue);
+   
+   theValue.floatValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/*************************/
+/* FCBAppendCLIPSLexeme: */
+/*************************/
+void FCBAppendCLIPSLexeme(
+  FunctionCallBuilder *theFCB,
+  CLIPSLexeme *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.lexemeValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/********************/
+/* FCBAppendSymbol: */
+/********************/
+void FCBAppendSymbol(
+  FunctionCallBuilder *theFCB,
+  const char *strValue)
+  {
+   CLIPSValue theValue;
+   CLIPSLexeme *pv = CreateSymbol(theFCB->fcbEnv,strValue);
+   
+   theValue.lexemeValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/********************/
+/* FCBAppendString: */
+/********************/
+void FCBAppendString(
+  FunctionCallBuilder *theFCB,
+  const char *strValue)
+  {
+   CLIPSValue theValue;
+   CLIPSLexeme *pv = CreateString(theFCB->fcbEnv,strValue);
+   
+   theValue.lexemeValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/**************************/
+/* FCBAppendInstanceName: */
+/**************************/
+void FCBAppendInstanceName(
+  FunctionCallBuilder *theFCB,
+  const char *strValue)
+  {
+   CLIPSValue theValue;
+   CLIPSLexeme *pv = CreateInstanceName(theFCB->fcbEnv,strValue);
+   
+   theValue.lexemeValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/**********************************/
+/* FCBAppendCLIPSExternalAddress: */
+/**********************************/
+void FCBAppendCLIPSExternalAddress(
+  FunctionCallBuilder *theFCB,
+  CLIPSExternalAddress *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.externalAddressValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/******************/
+/* FCBAppendFact: */
+/******************/
+void FCBAppendFact(
+  FunctionCallBuilder *theFCB,
+  Fact *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.factValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/**********************/
+/* FCBAppendInstance: */
+/**********************/
+void FCBAppendInstance(
+  FunctionCallBuilder *theFCB,
+  Instance *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.instanceValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/************************/
+/* FCBAppendMultifield: */
+/************************/
+void FCBAppendMultifield(
+  FunctionCallBuilder *theFCB,
+  Multifield *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.multifieldValue = pv;
+   FCBAppend(theFCB,&theValue);
+  }
+
+/***********/
+/* FCBCall */
+/***********/
+FunctionCallBuilderError FCBCall(
+  FunctionCallBuilder *theFCB,
+  const char *functionName,
+  CLIPSValue *returnValue)
+  {
+   Environment *theEnv;
+   Expression theReference, *lastAdd = NULL, *nextAdd, *multiAdd;
+   struct functionDefinition *theFunction = NULL;
+   size_t i, j;
+   UDFValue udfReturnValue;
+   GCBlock gcb;
+
+   /*==========================*/
+   /* Check for NULL pointers. */
+   /*==========================*/
+   
+   if ((theFCB == NULL) || (functionName == NULL))
+     { return FCBE_NULL_POINTER_ERROR; }
+   
+   /*======================================*/
+   /* Check to see if the function exists. */
+   /*======================================*/
+   
+   if (! GetFunctionReference(theFCB->fcbEnv,functionName,&theReference))
+     { return FCBE_FUNCTION_NOT_FOUND_ERROR; }
+     
+   /*============================================*/
+   /* Functions with specialized parsers  cannot */
+   /* be used with a FunctionCallBuilder.        */
+   /*============================================*/
+   
+   if (theReference.type == FCALL)
+     {
+      theFunction = FindFunction(theFCB->fcbEnv,functionName);
+      if (theFunction->parser != NULL)
+        { return FCBE_INVALID_FUNCTION_ERROR; }
+     }
+   
+   /*=======================================*/
+   /* Append the arguments for the function */
+   /* call to the expression.               */
+   /*=======================================*/
+   
+   theEnv = theFCB->fcbEnv;
+   
+   for (i = 0; i < theFCB->length; i++)
+     {
+      /*====================================================*/
+      /* Multifield values have to be dynamically recreated */
+      /* through a create$ expression call.                 */
+      /*====================================================*/
+      
+      if (theFCB->contents[i].header->type == MULTIFIELD_TYPE)
+        {
+         nextAdd = GenConstant(theEnv,FCALL,FindFunction(theEnv,"create$"));
+         
+         if (lastAdd == NULL)
+           { theReference.argList = nextAdd; }
+         else
+           { lastAdd->nextArg = nextAdd; }
+           
+         lastAdd = nextAdd;
+         
+         multiAdd = NULL;
+         for (j = 0; j < theFCB->contents[i].multifieldValue->length; j++)
+           {
+            nextAdd = GenConstant(theEnv,theFCB->contents[i].multifieldValue->contents[j].header->type,
+                                         theFCB->contents[i].multifieldValue->contents[j].value);
+               
+            if (multiAdd == NULL)
+              { lastAdd->argList = nextAdd; }
+            else
+               { multiAdd->nextArg = nextAdd; }
+            multiAdd = nextAdd;
+           }
+        }
+        
+      /*================================================================*/
+      /* Single field values can just be appended to the argument list. */
+      /*================================================================*/
+      
+      else
+        {
+         nextAdd = GenConstant(theEnv,theFCB->contents[i].header->type,theFCB->contents[i].value);
+         
+         if (lastAdd == NULL)
+           { theReference.argList = nextAdd; }
+         else
+           { lastAdd->nextArg = nextAdd; }
+         lastAdd = nextAdd;
+        }
+     }
+      
+   ExpressionInstall(theEnv,&theReference);
+   
+   /*===========================================================*/
+   /* Verify a deffunction has the correct number of arguments. */
+   /*===========================================================*/
+
+#if DEFFUNCTION_CONSTRUCT
+   if (theReference.type == PCALL)
+     {
+      if (CheckDeffunctionCall(theEnv,(Deffunction *) theReference.value,CountArguments(theReference.argList)) == false)
+        {
+         ExpressionDeinstall(theEnv,&theReference);
+         ReturnExpression(theEnv,theReference.argList);
+         return FCBE_ARGUMENT_COUNT_ERROR;
+        }
+     }
+#endif
+
+   /*=========================================*/
+   /* Verify the correct number of arguments. */
+   /*=========================================*/
+
+// TBD Support run time check of arguments
+#if ! RUN_TIME
+   if (theReference.type == FCALL)
+     {
+      FunctionArgumentsError theError;
+      if ((theError = CheckExpressionAgainstRestrictions(theEnv,&theReference,theFunction,functionName)) != FAE_NO_ERROR)
+        {
+         ExpressionDeinstall(theEnv,&theReference);
+         ReturnExpression(theEnv,theReference.argList);
+         if (theError == FAE_TYPE_ERROR) return FCBE_ARGUMENT_TYPE_ERROR;
+         else if (theError == FAE_COUNT_ERROR) return FCBE_ARGUMENT_COUNT_ERROR;
+         else
+           {
+            SystemError(theEnv,"EVALUATN",9);
+            ExitRouter(theEnv,EXIT_FAILURE);
+           }
+        }
+     }
+#endif
+   /*========================================*/
+   /* Set up the frame for tracking garbage. */
+   /*========================================*/
+   
+   GCBlockStart(theEnv,&gcb);
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*======================*/
+   /* Call the expression. */
+   /*======================*/
+
+   EvaluateExpression(theEnv,&theReference,&udfReturnValue);
+
+   /*====================================================*/
+   /* Convert a partial multifield to a full multifield. */
+   /*====================================================*/
+   
+   NormalizeMultifield(theEnv,&udfReturnValue);
+   
+   /*========================================*/
+   /* Return the expression data structures. */
+   /*========================================*/
+
+   ExpressionDeinstall(theEnv,&theReference);
+   ReturnExpression(theEnv,theReference.argList);
+
+   /*================================*/
+   /* Restore the old garbage frame. */
+   /*================================*/
+   
+   if (returnValue != NULL)
+     { GCBlockEndUDF(theEnv,&gcb,&udfReturnValue); }
+   else
+     { GCBlockEnd(theEnv,&gcb); }
+     
+   /*==========================================*/
+   /* Perform periodic cleanup if the eval was */
+   /* issued from an embedded controller.      */
+   /*==========================================*/
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     {
+      if (returnValue != NULL)
+        { CleanCurrentGarbageFrame(theEnv,&udfReturnValue); }
+      else
+        { CleanCurrentGarbageFrame(theEnv,NULL); }
+      CallPeriodicTasks(theEnv);
+     }
+     
+   if (returnValue != NULL)
+     { returnValue->value = udfReturnValue.value; }
+     
+   if (GetEvaluationError(theEnv)) return FCBE_PROCESSING_ERROR;
+
+   return FCBE_NO_ERROR;
+  }
+
+/*************/
+/* FCBReset: */
+/*************/
+void FCBReset(
+  FunctionCallBuilder *theFCB)
+  {
+   size_t i;
+   
+   for (i = 0; i < theFCB->length; i++)
+     { Release(theFCB->fcbEnv,theFCB->contents[i].header); }
+     
+   if (theFCB->bufferReset != theFCB->bufferMaximum)
+     {
+      if (theFCB->bufferMaximum != 0)
+        { rm(theFCB->fcbEnv,theFCB->contents,sizeof(CLIPSValue) * theFCB->bufferMaximum); }
+      
+      if (theFCB->bufferReset == 0)
+        { theFCB->contents = NULL; }
+      else
+        { theFCB->contents = (CLIPSValue *) gm2(theFCB->fcbEnv,sizeof(CLIPSValue) * theFCB->bufferReset); }
+      
+      theFCB->bufferMaximum = theFCB->bufferReset;
+     }
+     
+   theFCB->length = 0;
+  }
+
+/***************/
+/* FCBDispose: */
+/***************/
+void FCBDispose(
+  FunctionCallBuilder *theFCB)
+  {
+   Environment *theEnv = theFCB->fcbEnv;
+   size_t i;
+   
+   for (i = 0; i < theFCB->length; i++)
+     { Release(theFCB->fcbEnv,theFCB->contents[i].header); }
+   
+   if (theFCB->bufferMaximum != 0)
+     { rm(theFCB->fcbEnv,theFCB->contents,sizeof(CLIPSValue) * theFCB->bufferMaximum); }
+     
+   rtn_struct(theEnv,multifieldBuilder,theFCB);
+  }
+
+/*******************************/
+/* DiscardCAddress: TBD Remove */
+/*******************************/
+/*
+static bool DiscardCAddress(
+  Environment *theEnv,
+  void *theValue)
+  {
+   WriteString(theEnv,STDOUT,"Discarding C Address\n");
+
+   return true;
+  }
+*/
+
diff --git a/clips/evaluatn.h b/clips/evaluatn.h
new file mode 100755
index 000000000..43f46ee6a
--- /dev/null
+++ b/clips/evaluatn.h
@@ -0,0 +1,208 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/17/17            */
+   /*                                                     */
+   /*               EVALUATION HEADER FILE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for evaluating expressions.    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added EvaluateAndStoreInDataObject function.   */
+/*                                                           */
+/*      6.30: Added support for passing context information  */
+/*            to user defined functions.                     */
+/*                                                           */
+/*            Added support for external address hash table  */
+/*            and subtyping.                                 */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Support for DATA_OBJECT_ARRAY primitive.       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed DATA_OBJECT_ARRAY primitive type.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_evaluatn
+
+#pragma once
+
+#define _H_evaluatn
+
+#include "constant.h"
+#include "entities.h"
+
+typedef struct functionCallBuilder FunctionCallBuilder;
+
+struct functionCallBuilder
+  {
+   Environment *fcbEnv;
+   CLIPSValue *contents;
+   size_t bufferReset;
+   size_t length;
+   size_t bufferMaximum;
+  };
+
+typedef enum
+  {
+   FCBE_NO_ERROR = 0,
+   FCBE_NULL_POINTER_ERROR,
+   FCBE_FUNCTION_NOT_FOUND_ERROR,
+   FCBE_INVALID_FUNCTION_ERROR,
+   FCBE_ARGUMENT_COUNT_ERROR,
+   FCBE_ARGUMENT_TYPE_ERROR,
+   FCBE_PROCESSING_ERROR
+  } FunctionCallBuilderError;
+
+#define PARAMETERS_UNBOUNDED USHRT_MAX
+
+#define C_POINTER_EXTERNAL_ADDRESS 0
+
+struct externalAddressType
+  {
+   const  char *name;
+   void (*shortPrintFunction)(Environment *,const char *,void *);
+   void (*longPrintFunction)(Environment *,const char *,void *);
+   bool (*discardFunction)(Environment *,void *);
+   void (*newFunction)(UDFContext *,UDFValue *);
+   bool (*callFunction)(UDFContext *,UDFValue *,UDFValue *);
+  };
+
+#define CoerceToLongInteger(t,v) ((t == INTEGER_TYPE) ? ValueToLong(v) : (long) ValueToDouble(v))
+#define CoerceToInteger(t,v) ((t == INTEGER_TYPE) ? (int) ValueToLong(v) : (int) ValueToDouble(v))
+#define CoerceToDouble(t,v) ((t == INTEGER_TYPE) ? (double) ValueToLong(v) : ValueToDouble(v))
+
+#define GetFirstArgument()           (EvaluationData(theEnv)->CurrentExpression->argList)
+#define GetNextArgument(ep)          (ep->nextArg)
+
+#define MAXIMUM_PRIMITIVES 150
+#define MAXIMUM_EXTERNAL_ADDRESS_TYPES 10
+
+#define BITS_PER_BYTE    8
+
+#define BitwiseTest(n,b)   (((n) & (char) (1 << (b))) ? true : false)
+#define BitwiseSet(n,b)    (n |= (char) (1 << (b)))
+#define BitwiseClear(n,b)  (n &= (char) ~(1 << (b)))
+
+#define CountToBitMapSize(c) (((c) + (BITS_PER_BYTE - 1)) / BITS_PER_BYTE) 
+#define TestBitMap(map,id)  BitwiseTest(map[(id) / BITS_PER_BYTE],(id) % BITS_PER_BYTE)
+#define SetBitMap(map,id)   BitwiseSet(map[(id) / BITS_PER_BYTE],(id) % BITS_PER_BYTE)
+#define ClearBitMap(map,id) BitwiseClear(map[(id) / BITS_PER_BYTE],(id) % BITS_PER_BYTE)
+
+#define EVALUATION_DATA 44
+
+struct evaluationData
+  {
+   struct expr *CurrentExpression;
+   bool EvaluationError;
+   bool HaltExecution;
+   int CurrentEvaluationDepth;
+   int numberOfAddressTypes;
+   struct entityRecord *PrimitivesArray[MAXIMUM_PRIMITIVES];
+   struct externalAddressType *ExternalAddressTypes[MAXIMUM_EXTERNAL_ADDRESS_TYPES];
+  };
+
+#define EvaluationData(theEnv) ((struct evaluationData *) GetEnvironmentData(theEnv,EVALUATION_DATA))
+
+   void                           InitializeEvaluationData(Environment *);
+   bool                           EvaluateExpression(Environment *,struct expr *,UDFValue *);
+   void                           SetEvaluationError(Environment *,bool);
+   bool                           GetEvaluationError(Environment *);
+   void                           SetHaltExecution(Environment *,bool);
+   bool                           GetHaltExecution(Environment *);
+   void                           ReturnValues(Environment *,UDFValue *,bool);
+   void                           WriteUDFValue(Environment *,const char *,UDFValue *);
+   void                           WriteCLIPSValue(Environment *,const char *,CLIPSValue *);
+   void                           SetMultifieldErrorValue(Environment *,UDFValue *);
+   void                           CopyDataObject(Environment *,UDFValue *,UDFValue *,int);
+   void                           AtomInstall(Environment *,unsigned short,void *);
+   void                           AtomDeinstall(Environment *,unsigned short,void *);
+   void                           Retain(Environment *,TypeHeader *);
+   void                           Release(Environment *,TypeHeader *);
+   void                           RetainCV(Environment *,CLIPSValue *);
+   void                           ReleaseCV(Environment *,CLIPSValue *);
+   void                           RetainUDFV(Environment *,UDFValue *);
+   void                           ReleaseUDFV(Environment *,UDFValue *);
+   struct expr                   *ConvertValueToExpression(Environment *,UDFValue *);
+   unsigned long                  GetAtomicHashValue(unsigned short,void *,unsigned short);
+   void                           InstallPrimitive(Environment *,struct entityRecord *,int);
+   int                            InstallExternalAddressType(Environment *,struct externalAddressType *);
+   void                           TransferDataObjectValues(UDFValue *,UDFValue *);
+   struct expr                   *FunctionReferenceExpression(Environment *,const char *);
+   bool                           GetFunctionReference(Environment *,const char *,Expression *);
+   bool                           DOsEqual(UDFValue *,UDFValue *);
+   bool                           EvaluateAndStoreInDataObject(Environment *,bool,Expression *,UDFValue *,bool);
+   void                           ResetErrorFlags(Environment *);
+   FunctionCallBuilder           *CreateFunctionCallBuilder(Environment *,size_t);
+   void                           FCBAppendUDFValue(FunctionCallBuilder *,UDFValue *);
+   void                           FCBAppend(FunctionCallBuilder *,CLIPSValue *);
+   void                           FCBAppendCLIPSInteger(FunctionCallBuilder *,CLIPSInteger *);
+   void                           FCBAppendInteger(FunctionCallBuilder *,long long);
+   void                           FCBAppendCLIPSFloat(FunctionCallBuilder *,CLIPSFloat *);
+   void                           FCBAppendFloat(FunctionCallBuilder *,double);
+   void                           FCBAppendCLIPSLexeme(FunctionCallBuilder *,CLIPSLexeme *);
+   void                           FCBAppendSymbol(FunctionCallBuilder *,const char *);
+   void                           FCBAppendString(FunctionCallBuilder *,const char *);
+   void                           FCBAppendInstanceName(FunctionCallBuilder *,const char *);
+   void                           FCBAppendCLIPSExternalAddress(FunctionCallBuilder *,CLIPSExternalAddress *);
+   void                           FCBAppendFact(FunctionCallBuilder *,Fact *);
+   void                           FCBAppendInstance(FunctionCallBuilder *,Instance *);
+   void                           FCBAppendMultifield(FunctionCallBuilder *,Multifield *);
+   void                           FCBDispose(FunctionCallBuilder *);
+   void                           FCBReset(FunctionCallBuilder *);
+   FunctionCallBuilderError       FCBCall(FunctionCallBuilder *,const char *,CLIPSValue *);
+   
+#define CVIsType(cv,cvType) (((1 << (((TypeHeader *) (cv)->value)->type)) & (cvType)) ? true : false)
+
+#define ValueIsType(value,vType) ((1 << (((TypeHeader *) value)->type)) & (vType))
+
+#define CVCoerceToFloat(cv) (((cv)->header->type == FLOAT_TYPE) ? \
+                             ((cv)->floatValue->contents) : \
+                             ((double) (cv)->integerValue->contents))
+
+#define CVCoerceToInteger(cv) (((cv)->header->type == INTEGER_TYPE) ? \
+                               ((cv)->integerValue->contents) : \
+                               ((long long) (cv)->floatValue->contents))
+
+#endif /* _H_evaluatn */
diff --git a/clips/expressn.c b/clips/expressn.c
new file mode 100755
index 000000000..0a1af9c8d
--- /dev/null
+++ b/clips/expressn.c
@@ -0,0 +1,494 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                  EXPRESSION MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains routines for creating, deleting,        */
+/*   compacting, installing, and hashing expressions.        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Corrected link errors with non-default         */
+/*            setup.h configuration settings.                */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed expression hashing value.              */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "bload.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "exprnops.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "expressn.h"
+
+#define PRIME_ONE   257
+#define PRIME_TWO   263
+#define PRIME_THREE 269
+
+/****************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS  */
+/****************************************/
+
+#if (! RUN_TIME)
+   static unsigned long           ListToPacked(struct expr *,struct expr *,unsigned long);
+#endif
+   static EXPRESSION_HN          *FindHashedExpression(Environment *,Expression *,unsigned *,EXPRESSION_HN **);
+   static unsigned                HashExpression(Expression *);
+   static void                    DeallocateExpressionData(Environment *);
+
+/**************************************************/
+/* InitExpressionData: Initializes the function   */
+/*   pointers used in generating some expressions */
+/*   and the expression hash table.               */
+/**************************************************/
+void InitExpressionData(
+  Environment *theEnv)
+  {
+   unsigned i;
+
+   AllocateEnvironmentData(theEnv,EXPRESSION_DATA,sizeof(struct expressionData),DeallocateExpressionData);
+
+#if ! RUN_TIME
+   InitExpressionPointers(theEnv);
+#endif
+
+   ExpressionData(theEnv)->ExpressionHashTable = (EXPRESSION_HN **)
+     gm2(theEnv,sizeof(EXPRESSION_HN *) * EXPRESSION_HASH_SIZE);
+   for (i = 0 ; i < EXPRESSION_HASH_SIZE ; i++)
+     ExpressionData(theEnv)->ExpressionHashTable[i] = NULL;
+  }
+
+/*****************************************/
+/* DeallocateExpressionData: Deallocates */
+/*    environment data for expressions.  */
+/*****************************************/
+static void DeallocateExpressionData(
+  Environment *theEnv)
+  {
+   int i;
+   EXPRESSION_HN *tmpPtr, *nextPtr;
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+   if (! Bloaded(theEnv))
+#endif
+     {
+      for (i = 0; i < EXPRESSION_HASH_SIZE; i++)
+        {
+         tmpPtr = ExpressionData(theEnv)->ExpressionHashTable[i];
+         while (tmpPtr != NULL)
+           {
+            nextPtr = tmpPtr->next;
+            ReturnPackedExpression(theEnv,tmpPtr->exp);
+            rtn_struct(theEnv,exprHashNode,tmpPtr);
+            tmpPtr = nextPtr;
+           }
+        }
+     }
+
+   rm(theEnv,ExpressionData(theEnv)->ExpressionHashTable,
+      sizeof(EXPRESSION_HN *) * EXPRESSION_HASH_SIZE);
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+   if ((ExpressionData(theEnv)->NumberOfExpressions != 0) && Bloaded(theEnv))
+     {
+      genfree(theEnv,ExpressionData(theEnv)->ExpressionArray,
+              ExpressionData(theEnv)->NumberOfExpressions * sizeof(struct expr));
+     }
+#endif
+  }
+
+/****************************************************/
+/* InitExpressionPointers: Initializes the function */
+/*   pointers used in generating some expressions.  */
+/****************************************************/
+void InitExpressionPointers(
+  Environment *theEnv)
+  {
+   ExpressionData(theEnv)->PTR_AND = FindFunction(theEnv,"and");
+   ExpressionData(theEnv)->PTR_OR = FindFunction(theEnv,"or");
+   ExpressionData(theEnv)->PTR_EQ = FindFunction(theEnv,"eq");
+   ExpressionData(theEnv)->PTR_NEQ = FindFunction(theEnv,"neq");
+   ExpressionData(theEnv)->PTR_NOT = FindFunction(theEnv,"not");
+
+   if ((ExpressionData(theEnv)->PTR_AND == NULL) || (ExpressionData(theEnv)->PTR_OR == NULL) ||
+       (ExpressionData(theEnv)->PTR_EQ == NULL) || (ExpressionData(theEnv)->PTR_NEQ == NULL) || (ExpressionData(theEnv)->PTR_NOT == NULL))
+     {
+      SystemError(theEnv,"EXPRESSN",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+  }
+
+/***************************************************/
+/* ExpressionInstall: Increments the busy count of */
+/*   atomic data values found in an expression.    */
+/***************************************************/
+void ExpressionInstall(
+  Environment *theEnv,
+  struct expr *expression)
+  {
+   if (expression == NULL) return;
+
+   while (expression != NULL)
+     {
+      AtomInstall(theEnv,expression->type,expression->value);
+      ExpressionInstall(theEnv,expression->argList);
+      expression = expression->nextArg;
+     }
+  }
+
+/*****************************************************/
+/* ExpressionDeinstall: Decrements the busy count of */
+/*   atomic data values found in an expression.      */
+/*****************************************************/
+void ExpressionDeinstall(
+  Environment *theEnv,
+  struct expr *expression)
+  {
+   if (expression == NULL) return;
+
+   while (expression != NULL)
+     {
+      AtomDeinstall(theEnv,expression->type,expression->value);
+      ExpressionDeinstall(theEnv,expression->argList);
+      expression = expression->nextArg;
+     }
+  }
+
+#if (! RUN_TIME)
+
+/***********************************************************************/
+/* PackExpression: Copies an expression (created using multiple memory */
+/*   requests) into an array (created using a single memory request)   */
+/*   while maintaining all appropriate links in the expression. A      */
+/*   packed expression requires less total memory because it reduces   */
+/*   the overhead required for multiple memory allocations.            */
+/***********************************************************************/
+struct expr *PackExpression(
+  Environment *theEnv,
+  struct expr *original)
+  {
+   struct expr *packPtr;
+
+   if (original == NULL) return NULL;
+   
+   packPtr = (struct expr *)
+             gm2(theEnv,sizeof (struct expr) * ExpressionSize(original));
+   ListToPacked(original,packPtr,0);
+   
+   return packPtr;
+  }
+
+/***********************************************************/
+/* ListToPacked: Copies a list of expressions to an array. */
+/***********************************************************/
+static unsigned long ListToPacked(
+  struct expr *original,
+  struct expr *destination,
+  unsigned long count)
+  {
+   unsigned long i;
+
+   if (original == NULL) { return count; }
+
+   while (original != NULL)
+     {
+      i = count;
+      count++;
+
+      destination[i].type = original->type;
+      destination[i].value = original->value;
+
+      if (original->argList == NULL)
+        { destination[i].argList = NULL; }
+      else
+        {
+         destination[i].argList =
+           (struct expr *) &destination[count];
+         count = ListToPacked(original->argList,destination,count);
+        }
+
+      if (original->nextArg == NULL)
+        { destination[i].nextArg = NULL; }
+      else
+        {
+         destination[i].nextArg = &destination[count];
+        }
+
+      original = original->nextArg;
+     }
+
+   return count;
+  }
+
+#endif /* (! RUN_TIME) */
+
+/***************************************************************/
+/* ReturnPackedExpression: Returns a packed expression created */
+/*   using PackExpression to the memory manager.               */
+/***************************************************************/
+void ReturnPackedExpression(
+  Environment *theEnv,
+  struct expr *packPtr)
+  {
+   if (packPtr != NULL)
+     {
+      rm(theEnv,packPtr,sizeof (struct expr) * ExpressionSize(packPtr));
+     }
+  }
+
+/***********************************************/
+/* ReturnExpression: Returns a multiply linked */
+/*   list of expr data structures.             */
+/***********************************************/
+void ReturnExpression(
+  Environment *theEnv,
+  struct expr *waste)
+  {
+   struct expr *tmp;
+
+   while (waste != NULL)
+     {
+      if (waste->argList != NULL) ReturnExpression(theEnv,waste->argList);
+      tmp = waste;
+      waste = waste->nextArg;
+      rtn_struct(theEnv,expr,tmp);
+     }
+  }
+
+/***************************************************
+  NAME         : FindHashedExpression
+  DESCRIPTION  : Determines if a given expression
+                 is in the expression hash table
+  INPUTS       : 1) The expression
+                 2) A buffer to hold the hash
+                    value
+                 3) A buffer to hold the previous
+                    node in the hash chain
+  RETURNS      : The expression hash table entry
+                 (NULL if not found)
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static EXPRESSION_HN *FindHashedExpression(
+  Environment *theEnv,
+  Expression *theExp,
+  unsigned *hashval,
+  EXPRESSION_HN **prv)
+  {
+   EXPRESSION_HN *exphash;
+
+   if (theExp == NULL)
+     return NULL;
+   *hashval = HashExpression(theExp);
+   *prv = NULL;
+   exphash = ExpressionData(theEnv)->ExpressionHashTable[*hashval];
+   while (exphash != NULL)
+     {
+      if (IdenticalExpression(exphash->exp,theExp))
+        return(exphash);
+      *prv = exphash;
+      exphash = exphash->next;
+     }
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : HashExpression
+  DESCRIPTION  : Assigns a deterministic number to
+                 an expression
+  INPUTS       : The expression
+  RETURNS      : The "value" of the expression
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static unsigned HashExpression(
+  Expression *theExp)
+  {
+   unsigned long tally = PRIME_THREE;
+   union
+     {
+      void *vv;
+      unsigned long uv;
+     } fis;
+
+   if (theExp->argList != NULL)
+     tally += HashExpression(theExp->argList) * PRIME_ONE;
+   while (theExp != NULL)
+     {
+      tally += theExp->type * PRIME_TWO;
+      fis.uv = 0;
+      fis.vv = theExp->value;
+      tally += fis.uv;
+      theExp = theExp->nextArg;
+     }
+   return (unsigned) (tally % EXPRESSION_HASH_SIZE);
+  }
+
+/***************************************************
+  NAME         : RemoveHashedExpression
+  DESCRIPTION  : Removes a hashed expression from
+                 the hash table
+  INPUTS       : The expression
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Hash node removed (or use count
+                 decremented).  If the hash node
+                 is removed, the expression is
+                 deinstalled and deleted
+  NOTES        : If the expression is in use by
+                 others, then the use count is
+                 merely decremented
+ ***************************************************/
+void RemoveHashedExpression(
+  Environment *theEnv,
+  Expression *theExp)
+  {
+   EXPRESSION_HN *exphash,*prv;
+   unsigned hashval;
+
+   exphash = FindHashedExpression(theEnv,theExp,&hashval,&prv);
+   if (exphash == NULL)
+     return;
+   if (--exphash->count != 0)
+     return;
+   if (prv == NULL)
+     ExpressionData(theEnv)->ExpressionHashTable[hashval] = exphash->next;
+   else
+     prv->next = exphash->next;
+   ExpressionDeinstall(theEnv,exphash->exp);
+   ReturnPackedExpression(theEnv,exphash->exp);
+   rtn_struct(theEnv,exprHashNode,exphash);
+  }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/*****************************************************
+  NAME         : AddHashedExpression
+  DESCRIPTION  : Adds a new expression to the
+                 expression hash table (or increments
+                 the use count if it is already there)
+  INPUTS       : The (new) expression
+  RETURNS      : A pointer to the (new) hash node
+  SIDE EFFECTS : Adds the new hash node or increments
+                 the count of an existing one
+  NOTES        : It is the caller's responsibility to
+                 delete the passed expression.  This
+                 routine copies, packs and installs
+                 the given expression
+ *****************************************************/
+Expression *AddHashedExpression(
+  Environment *theEnv,
+  Expression *theExp)
+  {
+   EXPRESSION_HN *prv,*exphash;
+   unsigned hashval;
+
+   if (theExp == NULL) return NULL;
+   exphash = FindHashedExpression(theEnv,theExp,&hashval,&prv);
+   if (exphash != NULL)
+     {
+      exphash->count++;
+      return(exphash->exp);
+     }
+   exphash = get_struct(theEnv,exprHashNode);
+   exphash->hashval = hashval;
+   exphash->count = 1;
+   exphash->exp = PackExpression(theEnv,theExp);
+   ExpressionInstall(theEnv,exphash->exp);
+   exphash->next = ExpressionData(theEnv)->ExpressionHashTable[exphash->hashval];
+   ExpressionData(theEnv)->ExpressionHashTable[exphash->hashval] = exphash;
+   exphash->bsaveID = 0L;
+   return(exphash->exp);
+  }
+
+#endif /* (! BLOAD_ONLY) && (! RUN_TIME) */
+
+#if (BLOAD_AND_BSAVE || BLOAD_ONLY || BLOAD || CONSTRUCT_COMPILER) && (! RUN_TIME)
+
+/***************************************************
+  NAME         : HashedExpressionIndex
+  DESCRIPTION  : Finds the expression bload array
+                 index for a hashed expression
+  INPUTS       : The expression
+  RETURNS      : The bload index
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+unsigned long HashedExpressionIndex(
+  Environment *theEnv,
+  Expression *theExp)
+  {
+   EXPRESSION_HN *exphash,*prv;
+   unsigned hashval;
+
+   if (theExp == NULL)
+     return ULONG_MAX;
+   exphash = FindHashedExpression(theEnv,theExp,&hashval,&prv);
+   return((exphash != NULL) ? exphash->bsaveID : ULONG_MAX);
+  }
+
+#endif /* (BLOAD_AND_BSAVE || BLOAD_ONLY || BLOAD || CONSTRUCT_COMPILER) && (! RUN_TIME) */
+
+/********************************************************/
+/* SetSequenceOperatorRecognition: C access routine     */
+/*   for the set-sequence-operator-recognition function */
+/********************************************************/
+bool SetSequenceOperatorRecognition(
+  Environment *theEnv,
+  bool value)
+  {
+   bool ov;
+
+   ov = ExpressionData(theEnv)->SequenceOpMode;
+   ExpressionData(theEnv)->SequenceOpMode = value;
+   return ov;
+  }
+
+/********************************************************/
+/* GetSequenceOperatorRecognition: C access routine     */
+/*   for the Get-sequence-operator-recognition function */
+/********************************************************/
+bool GetSequenceOperatorRecognition(
+  Environment *theEnv)
+  {
+   return ExpressionData(theEnv)->SequenceOpMode;
+  }
+
diff --git a/clips/expressn.h b/clips/expressn.h
new file mode 100755
index 000000000..16eda402b
--- /dev/null
+++ b/clips/expressn.h
@@ -0,0 +1,151 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*               EXPRESSION HEADER FILE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains routines for creating, deleting,        */
+/*   compacting, installing, and hashing expressions.        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed expression hashing value.              */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_expressn
+
+#pragma once
+
+#define _H_expressn
+
+struct exprHashNode;
+typedef struct savedContexts SavedContexts;
+
+#include "entities.h"
+#include "exprnops.h"
+#include "constrct.h"
+
+/******************************/
+/* Expression Data Structures */
+/******************************/
+
+struct expr
+   {
+    unsigned short type;
+    union
+      {
+       void *value;
+       CLIPSLexeme *lexemeValue;
+       CLIPSFloat *floatValue;
+       CLIPSInteger *integerValue;
+       CLIPSBitMap *bitMapValue;
+       ConstructHeader *constructValue;
+       FunctionDefinition *functionValue;
+      };
+    Expression *argList;
+    Expression *nextArg;
+   };
+
+#define arg_list argList
+#define next_arg nextArg
+
+typedef struct exprHashNode
+  {
+   unsigned hashval;
+   unsigned count;
+   Expression *exp;
+   struct exprHashNode *next;
+   unsigned long bsaveID;
+  } EXPRESSION_HN;
+
+struct savedContexts
+  {
+   bool rtn;
+   bool brk;
+   struct savedContexts *nxt;
+  };
+
+#define EXPRESSION_HASH_SIZE 503
+
+/********************/
+/* ENVIRONMENT DATA */
+/********************/
+
+#define EXPRESSION_DATA 45
+
+struct expressionData
+  {
+   FunctionDefinition *PTR_AND;
+   FunctionDefinition *PTR_OR;
+   FunctionDefinition *PTR_EQ;
+   FunctionDefinition *PTR_NEQ;
+   FunctionDefinition *PTR_NOT;
+   EXPRESSION_HN **ExpressionHashTable;
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+   unsigned long NumberOfExpressions;
+   Expression *ExpressionArray;
+   unsigned long ExpressionCount;
+#endif
+   SavedContexts *svContexts;
+   bool ReturnContext;
+   bool BreakContext;
+   bool SequenceOpMode;
+  };
+
+#define ExpressionData(theEnv) ((struct expressionData *) GetEnvironmentData(theEnv,EXPRESSION_DATA))
+
+/********************/
+/* Global Functions */
+/********************/
+
+   void                           ReturnExpression(Environment *,Expression *);
+   void                           ExpressionInstall(Environment *,Expression *);
+   void                           ExpressionDeinstall(Environment *,Expression *);
+   Expression                    *PackExpression(Environment *,Expression *);
+   void                           ReturnPackedExpression(Environment *,Expression *);
+   void                           InitExpressionData(Environment *);
+   void                           InitExpressionPointers(Environment *);
+   bool                           SetSequenceOperatorRecognition(Environment *,bool);
+   bool                           GetSequenceOperatorRecognition(Environment *);
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   Expression                    *AddHashedExpression(Environment *,Expression *);
+#endif
+   void                           RemoveHashedExpression(Environment *,Expression *);
+#if BLOAD_AND_BSAVE || BLOAD_ONLY || BLOAD || CONSTRUCT_COMPILER
+   unsigned long                  HashedExpressionIndex(Environment *,Expression *);
+#endif
+
+#endif
+
+
+
+
diff --git a/clips/exprnbin.c b/clips/exprnbin.c
new file mode 100755
index 000000000..8d879f1a2
--- /dev/null
+++ b/clips/exprnbin.c
@@ -0,0 +1,531 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*             EXPRESSION BSAVE/BLOAD MODULE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for the  */
+/*    expression data structure.                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+
+#include <stdio.h>
+
+#include "bload.h"
+#include "bsave.h"
+#include "constrct.h"
+#include "dffctdef.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "moduldef.h"
+
+#if DEFRULE_CONSTRUCT
+#include "network.h"
+#endif
+
+#if DEFGENERIC_CONSTRUCT
+#include "genrcbin.h"
+#endif
+
+#if DEFFUNCTION_CONSTRUCT
+#include "dffnxbin.h"
+#endif
+
+#if DEFTEMPLATE_CONSTRUCT
+#include "factmngr.h"
+#include "tmpltbin.h"
+#endif
+
+#if DEFGLOBAL_CONSTRUCT
+#include "globlbin.h"
+#endif
+
+#if OBJECT_SYSTEM
+#include "objbin.h"
+#include "insfun.h"
+#include "inscom.h"
+#endif
+
+#include "exprnbin.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                        UpdateExpression(Environment *,void *,unsigned long);
+
+/***********************************************************/
+/* AllocateExpressions: Determines the amount of space     */
+/*   required for loading the binary image of expressions  */
+/*   and allocates that amount of space.                   */
+/***********************************************************/
+void AllocateExpressions(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   GenReadBinary(theEnv,&ExpressionData(theEnv)->NumberOfExpressions,sizeof(long));
+   if (ExpressionData(theEnv)->NumberOfExpressions == 0L)
+     ExpressionData(theEnv)->ExpressionArray = NULL;
+   else
+     {
+      space = ExpressionData(theEnv)->NumberOfExpressions * sizeof(struct expr);
+      ExpressionData(theEnv)->ExpressionArray = (struct expr *) genalloc(theEnv,space);
+     }
+  }
+
+/**********************************************/
+/* RefreshExpressions: Refreshes the pointers */
+/*   used by the expression binary image.     */
+/**********************************************/
+void RefreshExpressions(
+  Environment *theEnv)
+  {
+   if (ExpressionData(theEnv)->ExpressionArray == NULL) return;
+
+   BloadandRefresh(theEnv,ExpressionData(theEnv)->NumberOfExpressions,
+                   sizeof(BSAVE_EXPRESSION),UpdateExpression);
+  }
+
+/*********************************************************
+  NAME         : UpdateExpression
+  DESCRIPTION  : Given a bloaded expression buffer,
+                   this routine refreshes the pointers
+                   in the expression array
+  INPUTS       : 1) a bloaded expression buffer
+                 2) the index of the expression to refresh
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Expression updated
+  NOTES        : None
+ *********************************************************/
+static void UpdateExpression(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_EXPRESSION *bexp;
+   unsigned long theIndex;
+
+   bexp = (BSAVE_EXPRESSION *) buf;
+   ExpressionData(theEnv)->ExpressionArray[obji].type = bexp->type;
+   switch(bexp->type)
+     {
+      case FCALL:
+        ExpressionData(theEnv)->ExpressionArray[obji].value = BloadData(theEnv)->FunctionArray[bexp->value];
+        break;
+
+      case GCALL:
+#if DEFGENERIC_CONSTRUCT
+        ExpressionData(theEnv)->ExpressionArray[obji].value = GenericPointer(bexp->value);
+#else
+        ExpressionData(theEnv)->ExpressionArray[obji].value = NULL;
+#endif
+        break;
+
+      case PCALL:
+#if DEFFUNCTION_CONSTRUCT
+        ExpressionData(theEnv)->ExpressionArray[obji].value = DeffunctionPointer(bexp->value);
+#else
+        ExpressionData(theEnv)->ExpressionArray[obji].value = NULL;
+#endif
+        break;
+
+      case DEFTEMPLATE_PTR:
+#if DEFTEMPLATE_CONSTRUCT
+        ExpressionData(theEnv)->ExpressionArray[obji].value = DeftemplatePointer(bexp->value);
+#else
+        ExpressionData(theEnv)->ExpressionArray[obji].value = NULL;
+#endif
+        break;
+
+     case DEFCLASS_PTR:
+#if OBJECT_SYSTEM
+        ExpressionData(theEnv)->ExpressionArray[obji].value = DefclassPointer(bexp->value);
+#else
+        ExpressionData(theEnv)->ExpressionArray[obji].value = NULL;
+#endif
+        break;
+
+      case DEFGLOBAL_PTR:
+
+#if DEFGLOBAL_CONSTRUCT
+        ExpressionData(theEnv)->ExpressionArray[obji].value = DefglobalPointer(bexp->value);
+#else
+        ExpressionData(theEnv)->ExpressionArray[obji].value = NULL;
+#endif
+        break;
+
+
+      case INTEGER_TYPE:
+        ExpressionData(theEnv)->ExpressionArray[obji].value = SymbolData(theEnv)->IntegerArray[bexp->value];
+        IncrementIntegerCount(ExpressionData(theEnv)->ExpressionArray[obji].integerValue);
+        break;
+
+      case FLOAT_TYPE:
+        ExpressionData(theEnv)->ExpressionArray[obji].value = SymbolData(theEnv)->FloatArray[bexp->value];
+        IncrementFloatCount(ExpressionData(theEnv)->ExpressionArray[obji].floatValue);
+        break;
+
+      case INSTANCE_NAME_TYPE:
+#if ! OBJECT_SYSTEM
+        ExpressionData(theEnv)->ExpressionArray[obji].type = SYMBOL_TYPE;
+#endif
+      case GBL_VARIABLE:
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+        ExpressionData(theEnv)->ExpressionArray[obji].value = SymbolData(theEnv)->SymbolArray[bexp->value];
+        IncrementLexemeCount(ExpressionData(theEnv)->ExpressionArray[obji].lexemeValue);
+        break;
+
+#if DEFTEMPLATE_CONSTRUCT
+      case FACT_ADDRESS_TYPE:
+        ExpressionData(theEnv)->ExpressionArray[obji].value = &FactData(theEnv)->DummyFact;
+        RetainFact((Fact *) ExpressionData(theEnv)->ExpressionArray[obji].value);
+        break;
+#endif
+
+#if OBJECT_SYSTEM
+      case INSTANCE_ADDRESS_TYPE:
+        ExpressionData(theEnv)->ExpressionArray[obji].value = &InstanceData(theEnv)->DummyInstance;
+        RetainInstance((Instance *) ExpressionData(theEnv)->ExpressionArray[obji].value);
+        break;
+#endif
+
+      case EXTERNAL_ADDRESS_TYPE:
+        ExpressionData(theEnv)->ExpressionArray[obji].value = NULL;
+        break;
+
+      case VOID_TYPE:
+        break;
+
+      default:
+        if (EvaluationData(theEnv)->PrimitivesArray[bexp->type] == NULL) break;
+        if (EvaluationData(theEnv)->PrimitivesArray[bexp->type]->bitMap)
+          {
+           ExpressionData(theEnv)->ExpressionArray[obji].value = SymbolData(theEnv)->BitMapArray[bexp->value];
+           IncrementBitMapCount((CLIPSBitMap *) ExpressionData(theEnv)->ExpressionArray[obji].value);
+          }
+        break;
+     }
+
+   theIndex = bexp->nextArg;
+   if (theIndex == ULONG_MAX)
+     { ExpressionData(theEnv)->ExpressionArray[obji].nextArg = NULL; }
+   else
+     { ExpressionData(theEnv)->ExpressionArray[obji].nextArg = (struct expr *) &ExpressionData(theEnv)->ExpressionArray[theIndex]; }
+
+   theIndex = bexp->argList;
+   if (theIndex == ULONG_MAX)
+     { ExpressionData(theEnv)->ExpressionArray[obji].argList = NULL; }
+   else
+     { ExpressionData(theEnv)->ExpressionArray[obji].argList = (struct expr *) &ExpressionData(theEnv)->ExpressionArray[theIndex]; }
+  }
+
+/*********************************************/
+/* ClearBloadedExpressions: Clears the space */
+/*   utilized by an expression binary image. */
+/*********************************************/
+void ClearBloadedExpressions(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   size_t space;
+
+   /*===============================================*/
+   /* Update the busy counts of atomic data values. */
+   /*===============================================*/
+
+   for (i = 0; i < ExpressionData(theEnv)->NumberOfExpressions; i++)
+     {
+      switch (ExpressionData(theEnv)->ExpressionArray[i].type)
+        {
+         case SYMBOL_TYPE          :
+         case STRING_TYPE          :
+         case INSTANCE_NAME_TYPE   :
+         case GBL_VARIABLE    :
+           ReleaseLexeme(theEnv,ExpressionData(theEnv)->ExpressionArray[i].lexemeValue);
+           break;
+         case FLOAT_TYPE           :
+           ReleaseFloat(theEnv,ExpressionData(theEnv)->ExpressionArray[i].floatValue);
+           break;
+         case INTEGER_TYPE         :
+           ReleaseInteger(theEnv,ExpressionData(theEnv)->ExpressionArray[i].integerValue);
+           break;
+
+#if DEFTEMPLATE_CONSTRUCT
+         case FACT_ADDRESS_TYPE    :
+           ReleaseFact((Fact *) ExpressionData(theEnv)->ExpressionArray[i].value);
+           break;
+#endif
+
+#if OBJECT_SYSTEM
+         case INSTANCE_ADDRESS_TYPE :
+           ReleaseInstance((Instance *) ExpressionData(theEnv)->ExpressionArray[i].value);
+           break;
+#endif
+
+         case VOID_TYPE:
+           break;
+
+         default:
+           if (EvaluationData(theEnv)->PrimitivesArray[ExpressionData(theEnv)->ExpressionArray[i].type] == NULL) break;
+           if (EvaluationData(theEnv)->PrimitivesArray[ExpressionData(theEnv)->ExpressionArray[i].type]->bitMap)
+             { DecrementBitMapReferenceCount(theEnv,(CLIPSBitMap *) ExpressionData(theEnv)->ExpressionArray[i].value); }
+           break;
+        }
+     }
+
+   /*===================================*/
+   /* Free the binary expression array. */
+   /*===================================*/
+
+   space = ExpressionData(theEnv)->NumberOfExpressions * sizeof(struct expr);
+   if (space != 0) genfree(theEnv,ExpressionData(theEnv)->ExpressionArray,space);
+   ExpressionData(theEnv)->ExpressionArray = 0;
+  }
+
+
+#if BLOAD_AND_BSAVE
+
+/***************************************************
+  NAME         : FindHashedExpressions
+  DESCRIPTION  : Sets the bsave expression array
+                 indices for hashed expression nodes
+                 and marks the items needed by
+                 these expressions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Atoms marked and ids set
+  NOTES        : None
+ ***************************************************/
+void FindHashedExpressions(
+  Environment *theEnv)
+  {
+   unsigned i;
+   EXPRESSION_HN *exphash;
+
+   for (i = 0 ; i < EXPRESSION_HASH_SIZE ; i++)
+     for (exphash = ExpressionData(theEnv)->ExpressionHashTable[i] ; exphash != NULL ; exphash = exphash->next)
+       {
+        MarkNeededItems(theEnv,exphash->exp);
+        exphash->bsaveID = ExpressionData(theEnv)->ExpressionCount;
+        ExpressionData(theEnv)->ExpressionCount += ExpressionSize(exphash->exp);
+       }
+  }
+
+/***************************************************
+  NAME         : BsaveHashedExpressions
+  DESCRIPTION  : Writes out hashed expressions
+  INPUTS       : Bsave file stream pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Expressions written
+  NOTES        : None
+ ***************************************************/
+void BsaveHashedExpressions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   unsigned i;
+   EXPRESSION_HN *exphash;
+
+   for (i = 0 ; i < EXPRESSION_HASH_SIZE ; i++)
+     for (exphash = ExpressionData(theEnv)->ExpressionHashTable[i] ; exphash != NULL ; exphash = exphash->next)
+       BsaveExpression(theEnv,exphash->exp,fp);
+  }
+
+/***************************************************************/
+/* BsaveConstructExpressions: Writes all expression needed by  */
+/*   constructs for this binary image to the binary save file. */
+/***************************************************************/
+void BsaveConstructExpressions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   struct BinaryItem *biPtr;
+
+   for (biPtr = BsaveData(theEnv)->ListOfBinaryItems;
+        biPtr != NULL;
+        biPtr = biPtr->next)
+     {
+      if (biPtr->expressionFunction != NULL)
+        { (*biPtr->expressionFunction)(theEnv,fp); }
+     }
+  }
+
+/***************************************/
+/* BsaveExpression: Recursively saves  */
+/*   an expression to the binary file. */
+/***************************************/
+void BsaveExpression(
+  Environment *theEnv,
+  struct expr *testPtr,
+  FILE *fp)
+  {
+   BSAVE_EXPRESSION newTest;
+   unsigned long newIndex;
+
+   while (testPtr != NULL)
+     {
+      ExpressionData(theEnv)->ExpressionCount++;
+
+      /*================*/
+      /* Copy the type. */
+      /*================*/
+
+      newTest.type = testPtr->type;
+
+      /*=======================================*/
+      /* Convert the argList slot to an index. */
+      /*=======================================*/
+
+      if (testPtr->argList == NULL)
+        { newTest.argList = ULONG_MAX; }
+      else
+        { newTest.argList = ExpressionData(theEnv)->ExpressionCount; }
+
+      /*========================================*/
+      /* Convert the nextArg slot to an index. */
+      /*========================================*/
+
+      if (testPtr->nextArg == NULL)
+        { newTest.nextArg = ULONG_MAX; }
+      else
+        {
+         newIndex = ExpressionData(theEnv)->ExpressionCount + ExpressionSize(testPtr->argList);
+         newTest.nextArg = newIndex;
+        }
+
+      /*=========================*/
+      /* Convert the value slot. */
+      /*=========================*/
+
+      switch(testPtr->type)
+        {
+         case FLOAT_TYPE:
+           newTest.value = testPtr->floatValue->bucket;
+           break;
+
+         case INTEGER_TYPE:
+           newTest.value = testPtr->integerValue->bucket;
+           break;
+
+         case FCALL:
+           newTest.value = testPtr->functionValue->bsaveIndex;
+           break;
+
+         case GCALL:
+#if DEFGENERIC_CONSTRUCT
+           if (testPtr->value != NULL)
+             newTest.value = testPtr->constructValue->bsaveID;
+           else
+#endif
+             newTest.value = ULONG_MAX;
+           break;
+
+         case PCALL:
+#if DEFFUNCTION_CONSTRUCT
+           if (testPtr->value != NULL)
+             newTest.value = testPtr->constructValue->bsaveID;
+           else
+#endif
+             newTest.value = ULONG_MAX;
+           break;
+
+         case DEFTEMPLATE_PTR:
+#if DEFTEMPLATE_CONSTRUCT
+           if (testPtr->value != NULL)
+             newTest.value = testPtr->constructValue->bsaveID;
+           else
+#endif
+             newTest.value = ULONG_MAX;
+           break;
+
+         case DEFCLASS_PTR:
+#if OBJECT_SYSTEM
+           if (testPtr->value != NULL)
+             newTest.value = testPtr->constructValue->bsaveID;
+           else
+#endif
+             newTest.value = ULONG_MAX;
+           break;
+
+         case DEFGLOBAL_PTR:
+#if DEFGLOBAL_CONSTRUCT
+           if (testPtr->value != NULL)
+             newTest.value = testPtr->constructValue->bsaveID;
+           else
+#endif
+             newTest.value = ULONG_MAX;
+           break;
+
+#if OBJECT_SYSTEM
+         case INSTANCE_NAME_TYPE:
+#endif
+         case SYMBOL_TYPE:
+         case GBL_VARIABLE:
+         case STRING_TYPE:
+           newTest.value = testPtr->lexemeValue->bucket;
+           break;
+
+         case FACT_ADDRESS_TYPE:
+         case INSTANCE_ADDRESS_TYPE:
+         case EXTERNAL_ADDRESS_TYPE:
+           newTest.value = ULONG_MAX;
+           break;
+
+         case VOID_TYPE:
+           break;
+
+         default:
+           if (EvaluationData(theEnv)->PrimitivesArray[testPtr->type] == NULL) break;
+           if (EvaluationData(theEnv)->PrimitivesArray[testPtr->type]->bitMap)
+             { newTest.value = ((CLIPSBitMap *) testPtr->value)->bucket; }
+           break;
+        }
+
+     /*===========================*/
+     /* Write out the expression. */
+     /*===========================*/
+
+     GenWrite(&newTest,sizeof(BSAVE_EXPRESSION),fp);
+
+     /*==========================*/
+     /* Write out argument list. */
+     /*==========================*/
+
+     if (testPtr->argList != NULL)
+       {
+        BsaveExpression(theEnv,testPtr->argList,fp);
+       }
+
+     testPtr = testPtr->nextArg;
+    }
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+#endif /* (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) */
+
diff --git a/clips/exprnbin.h b/clips/exprnbin.h
new file mode 100755
index 000000000..6ee258fac
--- /dev/null
+++ b/clips/exprnbin.h
@@ -0,0 +1,60 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*           EXPRESSION BLOAD/BSAVE HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for the  */
+/*    expression data structure.                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_exprnbin
+
+#pragma once
+
+#define _H_exprnbin
+
+#include <stdio.h>
+
+#include "expressn.h"
+
+#define ExpressionPointer(i) ((struct expr *) (((i) == ULONG_MAX) ? NULL : &ExpressionData(theEnv)->ExpressionArray[i]))
+#define HashedExpressionPointer(i) ExpressionPointer(i)
+
+   void                        AllocateExpressions(Environment *);
+   void                        RefreshExpressions(Environment *);
+   void                        ClearBloadedExpressions(Environment *);
+   void                        FindHashedExpressions(Environment *);
+   void                        BsaveHashedExpressions(Environment *,FILE *);
+   void                        BsaveConstructExpressions(Environment *,FILE *);
+   void                        BsaveExpression(Environment *,struct expr *,FILE *);
+
+#endif /* _H_exprnbin */
+
+
+
+
+
+
+
diff --git a/clips/exprnops.c b/clips/exprnops.c
new file mode 100755
index 000000000..6a25ba1b5
--- /dev/null
+++ b/clips/exprnops.c
@@ -0,0 +1,562 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*             EXPRESSION OPERATIONS MODULE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides utility routines for manipulating and   */
+/*   examining expressions.                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Add NegateExpression function.                 */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "cstrnchk.h"
+#include "cstrnops.h"
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "exprnops.h"
+
+/************************************/
+/* CheckArgumentAgainstRestriction: */
+/************************************/
+bool CheckArgumentAgainstRestriction(
+  Environment *theEnv,
+  struct expr *theExpression,
+  unsigned theRestriction)
+  {
+   CONSTRAINT_RECORD *cr1, *cr2, *cr3;
+
+   /*=============================================*/
+   /* Generate a constraint record for the actual */
+   /* argument passed to the function.            */
+   /*=============================================*/
+
+   cr1 = ExpressionToConstraintRecord(theEnv,theExpression);
+
+   /*================================================*/
+   /* Generate a constraint record based on the type */
+   /* of argument expected by the function.          */
+   /*================================================*/
+
+   cr2 = ArgumentTypeToConstraintRecord(theEnv,theRestriction);
+
+   /*===============================================*/
+   /* Intersect the two constraint records and then */
+   /* discard them.                                 */
+   /*===============================================*/
+
+   cr3 = IntersectConstraints(theEnv,cr1,cr2);
+
+   RemoveConstraint(theEnv,cr1);
+   RemoveConstraint(theEnv,cr2);
+
+   /*====================================================*/
+   /* If the intersection of the two constraint records  */
+   /* is empty, then the argument passed to the function */
+   /* doesn't satisfy the restrictions for the argument. */
+   /*====================================================*/
+
+   if (UnmatchableConstraint(cr3))
+     {
+      RemoveConstraint(theEnv,cr3);
+      return true;
+     }
+
+   /*===================================================*/
+   /* The argument satisfies the function restrictions. */
+   /*===================================================*/
+
+   RemoveConstraint(theEnv,cr3);
+   return false;
+  }
+
+/******************************************************/
+/* ConstantExpression: Returns true if the expression */
+/*   is a constant, otherwise false.                  */
+/******************************************************/
+bool ConstantExpression(
+  struct expr *testPtr)
+  {
+   while (testPtr != NULL)
+     {
+      if ((testPtr->type != SYMBOL_TYPE) && (testPtr->type != STRING_TYPE) &&
+#if OBJECT_SYSTEM
+          (testPtr->type != INSTANCE_NAME_TYPE) && (testPtr->type != INSTANCE_ADDRESS_TYPE) &&
+#endif
+          (testPtr->type != INTEGER_TYPE) && (testPtr->type != FLOAT_TYPE))
+        { return false; }
+      testPtr = testPtr->nextArg;
+     }
+
+   return true;
+  }
+
+/******************************************/
+/* ConstantType: Returns true if the type */
+/*   is a constant, otherwise false.      */
+/******************************************/
+bool ConstantType(
+  int theType)
+  {
+   switch (theType)
+     {
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+      case INTEGER_TYPE:
+      case FLOAT_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+      case INSTANCE_ADDRESS_TYPE:
+#endif
+        return true;
+     }
+
+   return false;
+  }
+
+/*****************************************************************************/
+/* IdenticalExpression: Determines if two expressions are identical. Returns */
+/*   true if the expressions are identical, otherwise false is returned.     */
+/*****************************************************************************/
+bool IdenticalExpression(
+  struct expr *firstList,
+  struct expr *secondList)
+  {
+   /*==============================================*/
+   /* Compare each argument in both expressions by */
+   /* following the nextArg list.                  */
+   /*==============================================*/
+
+   for (;
+        (firstList != NULL) && (secondList != NULL);
+        firstList = firstList->nextArg, secondList = secondList->nextArg)
+     {
+      /*=========================*/
+      /* Compare type and value. */
+      /*=========================*/
+
+      if (firstList->type != secondList->type)
+        { return false; }
+
+      if (firstList->value != secondList->value)
+        { return false; }
+
+      /*==============================*/
+      /* Compare the arguments lists. */
+      /*==============================*/
+
+      if (IdenticalExpression(firstList->argList,secondList->argList) == false)
+        { return false; }
+     }
+
+   /*=====================================================*/
+   /* If firstList and secondList aren't both NULL, then  */
+   /* one of the lists contains more expressions than the */
+   /* other.                                              */
+   /*=====================================================*/
+
+   if (firstList != secondList) return false;
+
+   /*============================*/
+   /* Expressions are identical. */
+   /*============================*/
+
+   return true;
+  }
+
+/****************************************************/
+/* CountArguments: Returns the number of structures */
+/*   stored in an expression as traversed through   */
+/*   the nextArg pointer but not the argList        */
+/*   pointer.                                       */
+/****************************************************/
+unsigned short CountArguments(
+  struct expr *testPtr)
+  {
+   unsigned short size = 0;
+
+   while (testPtr != NULL)
+     {
+      size++;
+      testPtr = testPtr->nextArg;
+     }
+
+   return size;
+  }
+
+/******************************************/
+/* CopyExpresssion: Copies an expression. */
+/******************************************/
+struct expr *CopyExpression(
+  Environment *theEnv,
+  struct expr *original)
+  {
+   struct expr *topLevel, *next, *last;
+
+   if (original == NULL) return NULL;
+
+   topLevel = GenConstant(theEnv,original->type,original->value);
+   topLevel->argList = CopyExpression(theEnv,original->argList);
+
+   last = topLevel;
+   original = original->nextArg;
+   while (original != NULL)
+     {
+      next = GenConstant(theEnv,original->type,original->value);
+      next->argList = CopyExpression(theEnv,original->argList);
+
+      last->nextArg = next;
+      last = next;
+      original = original->nextArg;
+     }
+
+   return(topLevel);
+  }
+
+/************************************************************/
+/* ExpressionContainsVariables: Determines if an expression */
+/*   contains any variables. Returns true if the expression */
+/*   contains any variables, otherwise false is returned.   */
+/************************************************************/
+bool ExpressionContainsVariables(
+  struct expr *theExpression,
+  bool globalsAreVariables)
+  {
+   while (theExpression != NULL)
+     {
+      if (theExpression->argList != NULL)
+        {
+         if (ExpressionContainsVariables(theExpression->argList,globalsAreVariables))
+           { return true; }
+        }
+
+      if ((theExpression->type == MF_VARIABLE) ||
+          (theExpression->type == SF_VARIABLE) ||
+          (theExpression->type == FACT_ADDRESS_TYPE) ||
+          (((theExpression->type == GBL_VARIABLE) ||
+            (theExpression->type == MF_GBL_VARIABLE)) &&
+           (globalsAreVariables == true)))
+        { return true; }
+
+      theExpression = theExpression->nextArg;
+     }
+
+   return false;
+  }
+
+/*****************************************/
+/* ExpressionSize: Returns the number of */
+/*   structures stored in an expression. */
+/*****************************************/
+unsigned long ExpressionSize(
+  struct expr *testPtr)
+  {
+   unsigned long size = 0;
+
+   while (testPtr != NULL)
+     {
+      size++;
+      if (testPtr->argList != NULL)
+        { size += ExpressionSize(testPtr->argList); }
+      testPtr = testPtr->nextArg;
+     }
+   return size;
+  }
+
+/************************************************/
+/* GenConstant: Generates a constant expression */
+/*   value of type string, symbol, or number.   */
+/************************************************/
+struct expr *GenConstant(
+  Environment *theEnv,
+  unsigned short type,
+  void *value)
+  {
+   struct expr *top;
+
+   top = get_struct(theEnv,expr);
+   top->nextArg = NULL;
+   top->argList = NULL;
+   top->type = type;
+   top->value = value;
+
+   return top;
+  }
+
+/*************************************************/
+/* PrintExpression: Pretty prints an expression. */
+/*************************************************/
+void PrintExpression(
+  Environment *theEnv,
+  const char *fileid,
+  struct expr *theExpression)
+  {
+   struct expr *oldExpression;
+
+   if (theExpression == NULL)
+     { return; }
+
+   while (theExpression != NULL)
+     {
+      switch (theExpression->type)
+        {
+         case SF_VARIABLE:
+         case GBL_VARIABLE:
+            WriteString(theEnv,fileid,"?");
+            WriteString(theEnv,fileid,theExpression->lexemeValue->contents);
+            break;
+
+         case MF_VARIABLE:
+         case MF_GBL_VARIABLE:
+            WriteString(theEnv,fileid,"$?");
+            WriteString(theEnv,fileid,theExpression->lexemeValue->contents);
+            break;
+
+         case FCALL:
+           WriteString(theEnv,fileid,"(");
+           WriteString(theEnv,fileid,ExpressionFunctionCallName(theExpression)->contents);
+           if (theExpression->argList != NULL) { WriteString(theEnv,fileid," "); }
+           PrintExpression(theEnv,fileid,theExpression->argList);
+           WriteString(theEnv,fileid,")");
+           break;
+
+         default:
+           oldExpression = EvaluationData(theEnv)->CurrentExpression;
+           EvaluationData(theEnv)->CurrentExpression = theExpression;
+           PrintAtom(theEnv,fileid,theExpression->type,theExpression->value);
+           EvaluationData(theEnv)->CurrentExpression = oldExpression;
+           break;
+        }
+
+      theExpression = theExpression->nextArg;
+      if (theExpression != NULL) WriteString(theEnv,fileid," ");
+     }
+
+   return;
+  }
+
+/*************************************************************************/
+/* CombineExpressions: Combines two expressions into a single equivalent */
+/*   expression. Mainly serves to merge expressions containing "and"     */
+/*   and "or" expressions without unnecessary duplication of the "and"   */
+/*   and "or" expressions (i.e., two "and" expressions can be merged by  */
+/*   placing them as arguments within another "and" expression, but it   */
+/*   is more efficient to add the arguments of one of the "and"          */
+/*   expressions to the list of arguments for the other and expression). */
+/*************************************************************************/
+struct expr *CombineExpressions(
+  Environment *theEnv,
+  struct expr *expr1,
+  struct expr *expr2)
+  {
+   struct expr *tempPtr;
+
+   /*===========================================================*/
+   /* If the 1st expression is NULL, return the 2nd expression. */
+   /*===========================================================*/
+
+   if (expr1 == NULL) return(expr2);
+
+   /*===========================================================*/
+   /* If the 2nd expression is NULL, return the 1st expression. */
+   /*===========================================================*/
+
+   if (expr2 == NULL) return(expr1);
+
+   /*============================================================*/
+   /* If the 1st expression is an "and" expression, and the 2nd  */
+   /* expression is not an "and" expression, then include the    */
+   /* 2nd expression in the argument list of the 1st expression. */
+   /*============================================================*/
+
+   if ((expr1->value == ExpressionData(theEnv)->PTR_AND) &&
+       (expr2->value != ExpressionData(theEnv)->PTR_AND))
+     {
+      tempPtr = expr1->argList;
+      if (tempPtr == NULL)
+        {
+         rtn_struct(theEnv,expr,expr1);
+         return(expr2);
+        }
+
+      while (tempPtr->nextArg != NULL)
+        { tempPtr = tempPtr->nextArg; }
+
+      tempPtr->nextArg = expr2;
+      return(expr1);
+     }
+
+   /*============================================================*/
+   /* If the 2nd expression is an "and" expression, and the 1st  */
+   /* expression is not an "and" expression, then include the    */
+   /* 1st expression in the argument list of the 2nd expression. */
+   /*============================================================*/
+
+   if ((expr1->value != ExpressionData(theEnv)->PTR_AND) &&
+       (expr2->value == ExpressionData(theEnv)->PTR_AND))
+     {
+      tempPtr = expr2->argList;
+      if (tempPtr == NULL)
+        {
+         rtn_struct(theEnv,expr,expr2);
+         return(expr1);
+        }
+
+      expr2->argList = expr1;
+      expr1->nextArg = tempPtr;
+
+      return(expr2);
+     }
+
+   /*===========================================================*/
+   /* If both expressions are "and" expressions, then add the   */
+   /* 2nd expression to the argument list of the 1st expression */
+   /* and throw away the extraneous "and" expression.           */
+   /*===========================================================*/
+
+   if ((expr1->value == ExpressionData(theEnv)->PTR_AND) &&
+       (expr2->value == ExpressionData(theEnv)->PTR_AND))
+     {
+      tempPtr = expr1->argList;
+      if (tempPtr == NULL)
+        {
+         rtn_struct(theEnv,expr,expr1);
+         return(expr2);
+        }
+
+      while (tempPtr->nextArg != NULL)
+        { tempPtr = tempPtr->nextArg; }
+
+      tempPtr->nextArg = expr2->argList;
+      rtn_struct(theEnv,expr,expr2);
+
+      return(expr1);
+     }
+
+   /*=====================================================*/
+   /* If neither expression is an "and" expression, then  */
+   /* create an "and" expression and add both expressions */
+   /* to the argument list of that "and" expression.      */
+   /*=====================================================*/
+
+   tempPtr = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_AND);
+   tempPtr->argList = expr1;
+   expr1->nextArg = expr2;
+   return(tempPtr);
+  }
+
+/*********************/
+/* NegateExpression: */
+/*********************/
+struct expr *NegateExpression(
+  Environment *theEnv,
+  struct expr *theExpression)
+  {
+   struct expr *tempPtr;
+
+   /*=========================================*/
+   /* If the expression is NULL, return NULL. */
+   /*=========================================*/
+
+   if (theExpression == NULL) return NULL;
+
+   /*==================================================*/
+   /* The expression is already wrapped within a "not" */
+   /* function call, just remove the function call.    */
+   /*==================================================*/
+
+   if (theExpression->value == ExpressionData(theEnv)->PTR_NOT)
+     {
+      tempPtr = theExpression->argList;
+      rtn_struct(theEnv,expr,theExpression);
+      return(tempPtr);
+     }
+
+   /*===================================================*/
+   /* Wrap the expression within a "not" function call. */
+   /*===================================================*/
+
+   tempPtr = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NOT);
+   tempPtr->argList = theExpression;
+
+   return(tempPtr);
+  }
+
+/********************************************************/
+/* AppendExpressions: Attaches an expression to the end */
+/*   of another expression's nextArg list.              */
+/********************************************************/
+struct expr *AppendExpressions(
+  struct expr *expr1,
+  struct expr *expr2)
+  {
+   struct expr *tempPtr;
+
+   /*===========================================================*/
+   /* If the 1st expression is NULL, return the 2nd expression. */
+   /*===========================================================*/
+
+   if (expr1 == NULL) return(expr2);
+
+   /*===========================================================*/
+   /* If the 2nd expression is NULL, return the 1st expression. */
+   /*===========================================================*/
+
+   if (expr2 == NULL) return(expr1);
+
+   /*====================================*/
+   /* Find the end of the 1st expression */
+   /* and attach the 2nd expression.     */
+   /*====================================*/
+
+   tempPtr = expr1;
+   while (tempPtr->nextArg != NULL) tempPtr = tempPtr->nextArg;
+   tempPtr->nextArg = expr2;
+
+   /*===============================*/
+   /* Return the merged expression. */
+   /*===============================*/
+
+   return(expr1);
+  }
+
diff --git a/clips/exprnops.h b/clips/exprnops.h
new file mode 100755
index 000000000..a7c0f8aa9
--- /dev/null
+++ b/clips/exprnops.h
@@ -0,0 +1,67 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*          EXPRESSION OPERATIONS HEADER FILE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides utility routines for manipulating and   */
+/*   examining expressions.                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Add NegateExpression function.                 */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_exprnops
+
+#pragma once
+
+#define _H_exprnops
+
+#include "expressn.h"
+
+   bool                           ConstantExpression(struct expr *);
+   void                           PrintExpression(Environment *,const char *,struct expr *);
+   unsigned long                  ExpressionSize(struct expr *);
+   unsigned short                 CountArguments(struct expr *);
+   struct expr                   *CopyExpression(Environment *,struct expr *);
+   bool                           ExpressionContainsVariables(struct expr *,bool);
+   bool                           IdenticalExpression(struct expr *,struct expr *);
+   struct expr                   *GenConstant(Environment *,unsigned short,void *);
+   bool                           CheckArgumentAgainstRestriction(Environment *,struct expr *,unsigned);
+   bool                           ConstantType(int);
+   struct expr                   *CombineExpressions(Environment *,struct expr *,struct expr *);
+   struct expr                   *AppendExpressions(struct expr *,struct expr *);
+   struct expr                   *NegateExpression(Environment *,struct expr *);
+
+#endif /* _H_exprnops */
+
+
diff --git a/clips/exprnpsr.c b/clips/exprnpsr.c
new file mode 100755
index 000000000..0417c8ed8
--- /dev/null
+++ b/clips/exprnpsr.c
@@ -0,0 +1,1099 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  01/15/18             */
+   /*                                                     */
+   /*              EXPRESSION PARSER MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for parsing expressions.       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Module specifier can be used within an         */
+/*            expression to refer to a deffunction or        */
+/*            defgeneric exported by the specified module,   */
+/*            but not necessarily imported by the current    */
+/*            module.                                        */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.31: Fixed bug where sequence expansion was always  */
+/*            occurring when using $ with global variables.  */
+/*                                                           */
+/*            Fast router used for ParseConstantArguments.   */
+/*                                                           */
+/*      6.40: Changed restrictions from char * to            */
+/*            CLIPSLexeme * to support strings               */
+/*            originating from sources that are not          */
+/*            statically allocated.                          */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Static constraint checking is always enabled.  */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "argacces.h"
+#include "constant.h"
+#include "cstrnchk.h"
+#include "envrnmnt.h"
+#include "expressn.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pprint.h"
+#include "prcdrfun.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "strngrtr.h"
+
+#if DEFRULE_CONSTRUCT
+#include "network.h"
+#endif
+
+#if DEFGENERIC_CONSTRUCT
+#include "genrccom.h"
+#endif
+
+#if DEFFUNCTION_CONSTRUCT
+#include "dffnxfun.h"
+#endif
+
+#include "exprnpsr.h"
+
+#if (! RUN_TIME)
+
+/***************************************************/
+/* Function0Parse: Parses a function. Assumes that */
+/*   none of the function has been parsed yet.     */
+/***************************************************/
+struct expr *Function0Parse(
+  Environment *theEnv,
+  const char *logicalName)
+  {
+   struct token theToken;
+   struct expr *top;
+
+   /*=================================*/
+   /* All functions begin with a '('. */
+   /*=================================*/
+
+   GetToken(theEnv,logicalName,&theToken);
+   if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"function calls");
+      return NULL;
+     }
+
+   /*=================================*/
+   /* Parse the rest of the function. */
+   /*=================================*/
+
+   top = Function1Parse(theEnv,logicalName);
+   return(top);
+  }
+
+#endif
+
+/*******************************************************/
+/* Function1Parse: Parses a function. Assumes that the */
+/*   opening left parenthesis has already been parsed. */
+/*******************************************************/
+struct expr *Function1Parse(
+  Environment *theEnv,
+  const char *logicalName)
+  {
+   struct token theToken;
+   struct expr *top;
+
+   /*========================*/
+   /* Get the function name. */
+   /*========================*/
+
+   GetToken(theEnv,logicalName,&theToken);
+   if (theToken.tknType != SYMBOL_TOKEN)
+     {
+      PrintErrorID(theEnv,"EXPRNPSR",1,true);
+      WriteString(theEnv,STDERR,"A function name must be a symbol.\n");
+      return NULL;
+     }
+
+   /*=================================*/
+   /* Parse the rest of the function. */
+   /*=================================*/
+
+   top = Function2Parse(theEnv,logicalName,theToken.lexemeValue->contents);
+   return(top);
+  }
+
+/****************************************************/
+/* Function2Parse: Parses a function. Assumes that  */
+/*   the opening left parenthesis and function name */
+/*   have already been parsed.                      */
+/****************************************************/
+struct expr *Function2Parse(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *name)
+  {
+   struct functionDefinition *theFunction;
+   struct expr *top;
+   bool moduleSpecified = false;
+   unsigned position;
+   CLIPSLexeme *moduleName = NULL, *constructName = NULL;
+#if DEFGENERIC_CONSTRUCT
+   Defgeneric *gfunc;
+#endif
+#if DEFFUNCTION_CONSTRUCT
+   Deffunction *dptr;
+#endif
+
+   /*==============================*/
+   /* Look for a module specifier. */
+   /*==============================*/
+
+   if ((position = FindModuleSeparator(name)) != 0)
+     {
+      moduleName = ExtractModuleName(theEnv,position,name);
+      constructName = ExtractConstructName(theEnv,position,name,SYMBOL_TYPE);
+      moduleSpecified = true;
+     }
+
+   /*================================*/
+   /* Has the function been defined? */
+   /*================================*/
+
+   theFunction = FindFunction(theEnv,name);
+
+#if DEFGENERIC_CONSTRUCT
+   if (moduleSpecified)
+     {
+      if (ConstructExported(theEnv,"defgeneric",moduleName,constructName) ||
+          GetCurrentModule(theEnv) == FindDefmodule(theEnv,moduleName->contents))
+        { gfunc = FindDefgenericInModule(theEnv,name); }
+      else
+        { gfunc = NULL; }
+     }
+   else
+     { gfunc = LookupDefgenericInScope(theEnv,name); }
+#endif
+
+#if DEFFUNCTION_CONSTRUCT
+#if DEFGENERIC_CONSTRUCT
+   if ((theFunction == NULL)
+        && (gfunc == NULL))
+#else
+   if (theFunction == NULL)
+#endif
+     if (moduleSpecified)
+       {
+        if (ConstructExported(theEnv,"deffunction",moduleName,constructName) ||
+            GetCurrentModule(theEnv) == FindDefmodule(theEnv,moduleName->contents))
+          { dptr = FindDeffunctionInModule(theEnv,name); }
+        else
+          { dptr = NULL; }
+       }
+     else
+       { dptr = LookupDeffunctionInScope(theEnv,name); }
+   else
+     dptr = NULL;
+#endif
+
+   /*=============================*/
+   /* Define top level structure. */
+   /*=============================*/
+
+#if DEFFUNCTION_CONSTRUCT
+   if (dptr != NULL)
+     top = GenConstant(theEnv,PCALL,dptr);
+   else
+#endif
+#if DEFGENERIC_CONSTRUCT
+   if (gfunc != NULL)
+     top = GenConstant(theEnv,GCALL,gfunc);
+   else
+#endif
+   if (theFunction != NULL)
+     top = GenConstant(theEnv,FCALL,theFunction);
+   else
+     {
+      PrintErrorID(theEnv,"EXPRNPSR",3,true);
+      WriteString(theEnv,STDERR,"Missing function declaration for '");
+      WriteString(theEnv,STDERR,name);
+      WriteString(theEnv,STDERR,"'.\n");
+      return NULL;
+     }
+
+   /*=======================================================*/
+   /* Check to see if function has its own parsing routine. */
+   /*=======================================================*/
+
+   PushRtnBrkContexts(theEnv);
+   ExpressionData(theEnv)->ReturnContext = false;
+   ExpressionData(theEnv)->BreakContext = false;
+
+#if DEFGENERIC_CONSTRUCT || DEFFUNCTION_CONSTRUCT
+   if (top->type == FCALL)
+#endif
+     {
+      if (theFunction->parser != NULL)
+        {
+         top = (*theFunction->parser)(theEnv,top,logicalName);
+         PopRtnBrkContexts(theEnv);
+         if (top == NULL) return NULL;
+         if (ReplaceSequenceExpansionOps(theEnv,top->argList,top,FindFunction(theEnv,"(expansion-call)"),
+                                         FindFunction(theEnv,"expand$")))
+           {
+            ReturnExpression(theEnv,top);
+            return NULL;
+           }
+         return(top);
+        }
+     }
+
+   /*========================================*/
+   /* Default parsing routine for functions. */
+   /*========================================*/
+
+   top = CollectArguments(theEnv,top,logicalName);
+   PopRtnBrkContexts(theEnv);
+   if (top == NULL) return NULL;
+
+   if (ReplaceSequenceExpansionOps(theEnv,top->argList,top,FindFunction(theEnv,"(expansion-call)"),
+                                    FindFunction(theEnv,"expand$")))
+     {
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   /*============================================================*/
+   /* If the function call uses the sequence expansion operator, */
+   /* its arguments cannot be checked until runtime.             */
+   /*============================================================*/
+
+   if (top->value == FindFunction(theEnv,"(expansion-call)"))
+     { return(top); }
+
+   /*============================*/
+   /* Check for argument errors. */
+   /*============================*/
+
+   if (top->type == FCALL)
+     {
+      if (CheckExpressionAgainstRestrictions(theEnv,top,theFunction,name))
+        {
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+     }
+
+#if DEFFUNCTION_CONSTRUCT
+   else if (top->type == PCALL)
+     {
+      if (CheckDeffunctionCall(theEnv,(Deffunction *) top->value,CountArguments(top->argList)) == false)
+        {
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+     }
+#endif
+
+   /*========================*/
+   /* Return the expression. */
+   /*========================*/
+
+   return(top);
+  }
+
+/***********************************************************************
+  NAME         : ReplaceSequenceExpansionOps
+  DESCRIPTION  : Replaces function calls which have multifield
+                   references as arguments into a call to a
+                   special function which expands the multifield
+                   into single arguments at run-time.
+                 Multifield references which are not function
+                   arguments are errors
+  INPUTS       : 1) The expression
+                 2) The current function call
+                 3) The address of the internal H/L function
+                    (expansion-call)
+                 4) The address of the H/L function expand$
+  RETURNS      : False if OK, true on errors
+  SIDE EFFECTS : Function call expressions modified, if necessary
+  NOTES        : Function calls which truly want a multifield
+                   to be passed need use only a single-field
+                   refernce (i.e. ? instead of $? - the $ is
+                   being treated as a special expansion operator)
+ **********************************************************************/
+bool ReplaceSequenceExpansionOps(
+  Environment *theEnv,
+  Expression *actions,
+  Expression *fcallexp,
+  void *expcall,
+  void *expmult)
+  {
+   Expression *theExp;
+
+   while (actions != NULL)
+     {
+      if ((ExpressionData(theEnv)->SequenceOpMode == false) &&
+          ((actions->type == MF_VARIABLE) || (actions->type == MF_GBL_VARIABLE)))
+        {
+         if (actions->type == MF_VARIABLE)
+           { actions->type = SF_VARIABLE; }
+         else if (actions->type == MF_GBL_VARIABLE)
+           { actions->type = GBL_VARIABLE; }
+        }
+        
+      if ((actions->type == MF_VARIABLE) || (actions->type == MF_GBL_VARIABLE) ||
+          (actions->value == expmult))
+        {
+         if ((fcallexp->type != FCALL) ? false :
+             (fcallexp->functionValue->sequenceuseok == false))
+           {
+            PrintErrorID(theEnv,"EXPRNPSR",4,false);
+            WriteString(theEnv,STDERR,"$ Sequence operator not a valid argument for function '");
+            WriteString(theEnv,STDERR,fcallexp->functionValue->callFunctionName->contents);
+            WriteString(theEnv,STDERR,"'.\n");
+            return true;
+           }
+         if (fcallexp->value != expcall)
+           {
+            theExp = GenConstant(theEnv,fcallexp->type,fcallexp->value);
+            theExp->argList = fcallexp->argList;
+            theExp->nextArg = NULL;
+            fcallexp->type = FCALL;
+            fcallexp->value = expcall;
+            fcallexp->argList = theExp;
+           }
+         if (actions->value != expmult)
+           {
+            theExp = GenConstant(theEnv,SF_VARIABLE,actions->value);
+            if (actions->type == MF_GBL_VARIABLE)
+              theExp->type = GBL_VARIABLE;
+            actions->argList = theExp;
+            actions->type = FCALL;
+            actions->value = expmult;
+           }
+        }
+      if (actions->argList != NULL)
+        {
+         if ((actions->type == GCALL) ||
+             (actions->type == PCALL) ||
+             (actions->type == FCALL))
+           theExp = actions;
+         else
+           theExp = fcallexp;
+         if (ReplaceSequenceExpansionOps(theEnv,actions->argList,theExp,expcall,expmult))
+           return true;
+        }
+      actions = actions->nextArg;
+     }
+   return false;
+  }
+
+/*************************************************/
+/* PushRtnBrkContexts: Saves the current context */
+/*   for the break/return functions.             */
+/*************************************************/
+void PushRtnBrkContexts(
+  Environment *theEnv)
+  {
+   SavedContexts *svtmp;
+
+   svtmp = get_struct(theEnv,savedContexts);
+   svtmp->rtn = ExpressionData(theEnv)->ReturnContext;
+   svtmp->brk = ExpressionData(theEnv)->BreakContext;
+   svtmp->nxt = ExpressionData(theEnv)->svContexts;
+   ExpressionData(theEnv)->svContexts = svtmp;
+  }
+
+/***************************************************/
+/* PopRtnBrkContexts: Restores the current context */
+/*   for the break/return functions.               */
+/***************************************************/
+void PopRtnBrkContexts(
+  Environment *theEnv)
+  {
+   SavedContexts *svtmp;
+
+   ExpressionData(theEnv)->ReturnContext = ExpressionData(theEnv)->svContexts->rtn;
+   ExpressionData(theEnv)->BreakContext = ExpressionData(theEnv)->svContexts->brk;
+   svtmp = ExpressionData(theEnv)->svContexts;
+   ExpressionData(theEnv)->svContexts = ExpressionData(theEnv)->svContexts->nxt;
+   rtn_struct(theEnv,savedContexts,svtmp);
+  }
+  
+#if (! RUN_TIME)
+
+/**********************/
+/* RestrictionExists: */
+/**********************/
+bool RestrictionExists(
+   const char *restrictionString,
+   int position)
+   {
+    int i = 0, currentPosition = 0;
+
+    if (restrictionString == NULL)
+      { return false; }
+      
+    while (restrictionString[i] != '\0')
+      {
+       if (restrictionString[i] == ';')
+         {
+          if (currentPosition == position) return true;
+          currentPosition++;
+         }
+       i++;
+      }
+
+    if (position == currentPosition) return true;
+
+    return false;
+   }
+
+#endif
+
+/*****************************************************************/
+/* CheckExpressionAgainstRestrictions: Compares the arguments to */
+/*   a function to the set of restrictions for that function to  */
+/*   determine if any incompatibilities exist. If so, the value  */
+/*   true is returned, otherwise false is returned.              */
+/*****************************************************************/
+FunctionArgumentsError CheckExpressionAgainstRestrictions(
+  Environment *theEnv,
+  struct expr *theExpression,
+  struct functionDefinition *theFunction,
+  const char *functionName)
+  {
+   unsigned int j = 1;
+   unsigned short number1, number2;
+   unsigned short argCount;
+   struct expr *argPtr;
+   const char *restrictions;
+   unsigned defaultRestriction2, argRestriction2;
+
+   if (theFunction->restrictions == NULL)
+     { restrictions = NULL; }
+   else
+     { restrictions = theFunction->restrictions->contents; }
+
+   /*=========================================*/
+   /* Count the number of function arguments. */
+   /*=========================================*/
+
+   argCount = CountArguments(theExpression->argList);
+
+   /*======================================*/
+   /* Get the minimum number of arguments. */
+   /*======================================*/
+
+   number1 = theFunction->minArgs;
+
+   /*======================================*/
+   /* Get the maximum number of arguments. */
+   /*======================================*/
+
+   number2 = theFunction->maxArgs;
+
+   /*============================================*/
+   /* Check for the correct number of arguments. */
+   /*============================================*/
+
+   if ((number1 == UNBOUNDED) && (number2 == UNBOUNDED))
+     { /* Any number of arguments allowed. */ }
+   else if (number1 == number2)
+     {
+      if (argCount != number1)
+        {
+         ExpectedCountError(theEnv,functionName,EXACTLY,number1);
+         return FAE_COUNT_ERROR;
+        }
+     }
+   else if (argCount < number1)
+     {
+      ExpectedCountError(theEnv,functionName,AT_LEAST,number1);
+      return FAE_COUNT_ERROR;
+     }
+   else if ((number2 != UNBOUNDED) && (argCount > number2))
+     {
+      ExpectedCountError(theEnv,functionName,NO_MORE_THAN,number2);
+      return FAE_COUNT_ERROR;
+     }
+
+   /*===============================================*/
+   /* Return if there are no argument restrictions. */
+   /*===============================================*/
+
+   if (restrictions == NULL) return FAE_NO_ERROR;
+
+   /*=======================================*/
+   /* Check for the default argument types. */
+   /*=======================================*/
+
+   PopulateRestriction(theEnv,&defaultRestriction2,ANY_TYPE_BITS,restrictions,0);
+
+   /*======================*/
+   /* Check each argument. */
+   /*======================*/
+
+   for (argPtr = theExpression->argList;
+        argPtr != NULL;
+        argPtr = argPtr->nextArg)
+     {
+      PopulateRestriction(theEnv,&argRestriction2,defaultRestriction2,restrictions,j);
+
+      if (CheckArgumentAgainstRestriction(theEnv,argPtr,argRestriction2))
+        {
+         ExpectedTypeError0(theEnv,functionName,j);
+         PrintTypesString(theEnv,STDERR,argRestriction2,true);
+         return FAE_TYPE_ERROR;
+        }
+
+      j++;
+     }
+
+   return FAE_NO_ERROR;
+  }
+
+/*******************************************************/
+/* CollectArguments: Parses and groups together all of */
+/*   the arguments for a function call expression.     */
+/*******************************************************/
+struct expr *CollectArguments(
+  Environment *theEnv,
+  struct expr *top,
+  const char *logicalName)
+  {
+   bool errorFlag;
+   struct expr *lastOne, *nextOne;
+
+   /*========================================*/
+   /* Default parsing routine for functions. */
+   /*========================================*/
+
+   lastOne = NULL;
+
+   while (true)
+     {
+      SavePPBuffer(theEnv," ");
+
+      errorFlag = false;
+      nextOne = ArgumentParse(theEnv,logicalName,&errorFlag);
+
+      if (errorFlag == true)
+        {
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+
+      if (nextOne == NULL)
+        {
+         PPBackup(theEnv);
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv,")");
+         return(top);
+        }
+
+      if (lastOne == NULL)
+        { top->argList = nextOne; }
+      else
+        { lastOne->nextArg = nextOne; }
+
+      lastOne = nextOne;
+     }
+  }
+
+/********************************************/
+/* ArgumentParse: Parses an argument within */
+/*   a function call expression.            */
+/********************************************/
+struct expr *ArgumentParse(
+  Environment *theEnv,
+  const char *logicalName,
+  bool *errorFlag)
+  {
+   struct expr *top;
+   struct token theToken;
+
+   /*===============*/
+   /* Grab a token. */
+   /*===============*/
+
+   GetToken(theEnv,logicalName,&theToken);
+
+   /*============================*/
+   /* ')' counts as no argument. */
+   /*============================*/
+
+   if (theToken.tknType == RIGHT_PARENTHESIS_TOKEN)
+     { return NULL; }
+
+   /*================================*/
+   /* Parse constants and variables. */
+   /*================================*/
+
+   if ((theToken.tknType == SF_VARIABLE_TOKEN) || (theToken.tknType == MF_VARIABLE_TOKEN) ||
+       (theToken.tknType == SYMBOL_TOKEN) || (theToken.tknType == STRING_TOKEN) ||
+#if DEFGLOBAL_CONSTRUCT
+       (theToken.tknType == GBL_VARIABLE_TOKEN) ||
+       (theToken.tknType == MF_GBL_VARIABLE_TOKEN) ||
+#endif
+#if OBJECT_SYSTEM
+       (theToken.tknType == INSTANCE_NAME_TOKEN) ||
+#endif
+       (theToken.tknType == FLOAT_TOKEN) || (theToken.tknType == INTEGER_TOKEN))
+     { return(GenConstant(theEnv,TokenTypeToType(theToken.tknType),theToken.value)); }
+
+   /*======================*/
+   /* Parse function call. */
+   /*======================*/
+
+   if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      PrintErrorID(theEnv,"EXPRNPSR",2,true);
+      WriteString(theEnv,STDERR,"Expected a constant, variable, or expression.\n");
+      *errorFlag = true;
+      return NULL;
+     }
+
+   top = Function1Parse(theEnv,logicalName);
+   if (top == NULL) *errorFlag = true;
+   return(top);
+  }
+
+/************************************************************/
+/* ParseAtomOrExpression: Parses an expression which may be */
+/*   a function call, atomic value (string, symbol, etc.),  */
+/*   or variable (local or global).                         */
+/************************************************************/
+struct expr *ParseAtomOrExpression(
+  Environment *theEnv,
+  const char *logicalName,
+  struct token *useToken)
+  {
+   struct token theToken, *thisToken;
+   struct expr *rv;
+
+   if (useToken == NULL)
+     {
+      thisToken = &theToken;
+      GetToken(theEnv,logicalName,thisToken);
+     }
+   else thisToken = useToken;
+
+   if ((thisToken->tknType == SYMBOL_TOKEN) || (thisToken->tknType == STRING_TOKEN) ||
+       (thisToken->tknType == INTEGER_TOKEN) || (thisToken->tknType == FLOAT_TOKEN) ||
+#if OBJECT_SYSTEM
+       (thisToken->tknType == INSTANCE_NAME_TOKEN) ||
+#endif
+#if DEFGLOBAL_CONSTRUCT
+       (thisToken->tknType == GBL_VARIABLE_TOKEN) ||
+       (thisToken->tknType == MF_GBL_VARIABLE_TOKEN) ||
+#endif
+       (thisToken->tknType == SF_VARIABLE_TOKEN) || (thisToken->tknType == MF_VARIABLE_TOKEN))
+     { rv = GenConstant(theEnv,TokenTypeToType(thisToken->tknType),thisToken->value); }
+   else if (thisToken->tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      rv = Function1Parse(theEnv,logicalName);
+      if (rv == NULL) return NULL;
+     }
+   else
+     {
+      PrintErrorID(theEnv,"EXPRNPSR",2,true);
+      WriteString(theEnv,STDERR,"Expected a constant, variable, or expression.\n");
+      return NULL;
+     }
+
+   return(rv);
+  }
+
+/*********************************************/
+/* GroupActions: Groups together a series of */
+/*   actions within a progn expression. Used */
+/*   for example to parse the RHS of a rule. */
+/*********************************************/
+struct expr *GroupActions(
+  Environment *theEnv,
+  const char *logicalName,
+  struct token *theToken,
+  bool readFirstToken,
+  const char *endWord,
+  bool functionNameParsed)
+  {
+   struct expr *top, *nextOne, *lastOne = NULL;
+
+   /*=============================*/
+   /* Create the enclosing progn. */
+   /*=============================*/
+
+   top = GenConstant(theEnv,FCALL,FindFunction(theEnv,"progn"));
+
+   /*========================================================*/
+   /* Continue until all appropriate commands are processed. */
+   /*========================================================*/
+
+   while (true)
+     {
+      /*================================================*/
+      /* Skip reading in the token if this is the first */
+      /* pass and the initial token was already read    */
+      /* before calling this function.                  */
+      /*================================================*/
+
+      if (readFirstToken)
+        { GetToken(theEnv,logicalName,theToken); }
+      else
+        { readFirstToken = true; }
+
+      /*=================================================*/
+      /* Look to see if a symbol has terminated the list */
+      /* of actions (such as "else" in an if function).  */
+      /*=================================================*/
+
+      if ((theToken->tknType == SYMBOL_TOKEN) &&
+          (endWord != NULL) &&
+          (! functionNameParsed))
+        {
+         if (strcmp(theToken->lexemeValue->contents,endWord) == 0)
+           { return(top); }
+        }
+
+      /*====================================*/
+      /* Process a function if the function */
+      /* name has already been read.        */
+      /*====================================*/
+
+      if (functionNameParsed)
+        {
+         nextOne = Function2Parse(theEnv,logicalName,theToken->lexemeValue->contents);
+         functionNameParsed = false;
+        }
+
+      /*========================================*/
+      /* Process a constant or global variable. */
+      /*========================================*/
+
+      else if ((theToken->tknType == SYMBOL_TOKEN) || (theToken->tknType == STRING_TOKEN) ||
+          (theToken->tknType == INTEGER_TOKEN) || (theToken->tknType == FLOAT_TOKEN) ||
+#if DEFGLOBAL_CONSTRUCT
+          (theToken->tknType == GBL_VARIABLE_TOKEN) ||
+          (theToken->tknType == MF_GBL_VARIABLE_TOKEN) ||
+#endif
+#if OBJECT_SYSTEM
+          (theToken->tknType == INSTANCE_NAME_TOKEN) ||
+#endif
+          (theToken->tknType == SF_VARIABLE_TOKEN) || (theToken->tknType == MF_VARIABLE_TOKEN))
+        { nextOne = GenConstant(theEnv,TokenTypeToType(theToken->tknType),theToken->value); }
+
+      /*=============================*/
+      /* Otherwise parse a function. */
+      /*=============================*/
+
+      else if (theToken->tknType == LEFT_PARENTHESIS_TOKEN)
+        { nextOne = Function1Parse(theEnv,logicalName); }
+
+      /*======================================*/
+      /* Otherwise replace sequence expansion */
+      /* variables and return the expression. */
+      /*======================================*/
+
+      else
+        {
+         if (ReplaceSequenceExpansionOps(theEnv,top,NULL,
+                                         FindFunction(theEnv,"(expansion-call)"),
+                                         FindFunction(theEnv,"expand$")))
+           {
+            ReturnExpression(theEnv,top);
+            return NULL;
+           }
+
+         return(top);
+        }
+
+      /*===========================*/
+      /* Add the new action to the */
+      /* list of progn arguments.  */
+      /*===========================*/
+
+      if (nextOne == NULL)
+        {
+         theToken->tknType = UNKNOWN_VALUE_TOKEN;
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+
+      if (lastOne == NULL)
+        { top->argList = nextOne; }
+      else
+        { lastOne->nextArg = nextOne; }
+
+      lastOne = nextOne;
+
+      PPCRAndIndent(theEnv);
+     }
+  }
+
+/************************/
+/* PopulateRestriction: */
+/************************/
+void PopulateRestriction(
+   Environment *theEnv,
+   unsigned *restriction,
+   unsigned defaultRestriction,
+   const char *restrictionString,
+   unsigned int position)
+   {
+    unsigned int i = 0, currentPosition = 0, valuesRead = 0;
+    char buffer[2];
+
+    *restriction = 0;
+
+    if (restrictionString == NULL)
+      {
+       *restriction = defaultRestriction;
+       return;
+      }
+
+    while (restrictionString[i] != '\0')
+      {
+       char theChar = restrictionString[i];
+
+       switch(theChar)
+         {
+          case ';':
+            if (currentPosition == position) return;
+            currentPosition++;
+            *restriction = 0;
+            valuesRead = 0;
+            break;
+
+          case 'l':
+            *restriction |= INTEGER_BIT;
+            valuesRead++;
+            break;
+
+          case 'd':
+            *restriction |= FLOAT_BIT;
+            valuesRead++;
+            break;
+
+          case 's':
+            *restriction |= STRING_BIT;
+            valuesRead++;
+            break;
+
+          case 'y':
+            *restriction |= SYMBOL_BIT;
+            valuesRead++;
+            break;
+
+          case 'n':
+            *restriction |= INSTANCE_NAME_BIT;
+            valuesRead++;
+            break;
+
+          case 'm':
+            *restriction |= MULTIFIELD_BIT;
+            valuesRead++;
+            break;
+
+          case 'f':
+            *restriction |= FACT_ADDRESS_BIT;
+            valuesRead++;
+            break;
+
+          case 'i':
+            *restriction |= INSTANCE_ADDRESS_BIT;
+            valuesRead++;
+            break;
+
+          case 'e':
+            *restriction |= EXTERNAL_ADDRESS_BIT;
+            valuesRead++;
+            break;
+
+          case 'v':
+            *restriction |= VOID_BIT;
+            valuesRead++;
+            break;
+
+          case 'b':
+            *restriction |= BOOLEAN_BIT;
+            valuesRead++;
+            break;
+
+          case '*':
+            *restriction |= ANY_TYPE_BITS;
+            valuesRead++;
+            break;
+
+          default:
+            buffer[0] = theChar;
+            buffer[1] = 0;
+            WriteString(theEnv,STDERR,"Invalid argument type character ");
+            WriteString(theEnv,STDERR,buffer);
+            WriteString(theEnv,STDERR,"\n");
+            valuesRead++;
+            break;
+         }
+
+       i++;
+      }
+
+    if (position == currentPosition)
+      {
+       if (valuesRead == 0)
+         { *restriction = defaultRestriction; }
+       return;
+      }
+
+    *restriction = defaultRestriction;
+   }
+
+/*******************************************/
+/* ParseConstantArguments: Parses a string */
+/*    into a set of constant expressions.  */
+/*******************************************/
+Expression *ParseConstantArguments(
+  Environment *theEnv,
+  const char *argstr,
+  bool *error)
+  {
+   Expression *top = NULL,*bot = NULL,*tmp;
+   const char *router = "***FNXARGS***";
+   struct token tkn;
+   const char *oldRouter;
+   const char *oldString;
+   long oldIndex;
+
+   *error = false;
+
+   if (argstr == NULL) return NULL;
+
+   /*=============================*/
+   /* Use the fast router bypass. */
+   /*=============================*/
+
+   oldRouter = RouterData(theEnv)->FastCharGetRouter;
+   oldString = RouterData(theEnv)->FastCharGetString;
+   oldIndex  = RouterData(theEnv)->FastCharGetIndex;
+
+   RouterData(theEnv)->FastCharGetRouter = router;
+   RouterData(theEnv)->FastCharGetString = argstr;
+   RouterData(theEnv)->FastCharGetIndex  = 0;
+
+   /*======================*/
+   /* Parse the constants. */
+   /*======================*/
+
+   GetToken(theEnv,router,&tkn);
+   while (tkn.tknType != STOP_TOKEN)
+     {
+      if ((tkn.tknType != SYMBOL_TOKEN) && (tkn.tknType != STRING_TOKEN) &&
+          (tkn.tknType != FLOAT_TOKEN) && (tkn.tknType != INTEGER_TOKEN) &&
+          (tkn.tknType != INSTANCE_NAME_TOKEN))
+        {
+         PrintErrorID(theEnv,"EXPRNPSR",6,false);
+         WriteString(theEnv,STDERR,"Only constant arguments allowed for external function call.\n");
+         ReturnExpression(theEnv,top);
+         *error = true;
+         CloseStringSource(theEnv,router);
+         return NULL;
+        }
+      tmp = GenConstant(theEnv,TokenTypeToType(tkn.tknType),tkn.value);
+      if (top == NULL)
+        top = tmp;
+      else
+        bot->nextArg = tmp;
+      bot = tmp;
+      GetToken(theEnv,router,&tkn);
+     }
+
+   /*===========================================*/
+   /* Restore the old state of the fast router. */
+   /*===========================================*/
+
+   RouterData(theEnv)->FastCharGetRouter = oldRouter;
+   RouterData(theEnv)->FastCharGetString = oldString;
+   RouterData(theEnv)->FastCharGetIndex  = oldIndex;
+
+   /*=======================*/
+   /* Return the arguments. */
+   /*=======================*/
+
+   return(top);
+  }
+
+/************************/
+/* RemoveUnneededProgn: */
+/************************/
+struct expr *RemoveUnneededProgn(
+  Environment *theEnv,
+  struct expr *theExpression)
+  {
+   struct functionDefinition *fptr;
+   struct expr *temp;
+
+   if (theExpression == NULL) return(theExpression);
+
+   if (theExpression->type != FCALL) return(theExpression);
+
+   fptr = theExpression->functionValue;
+
+   if (fptr->functionPointer != PrognFunction)
+     { return(theExpression); }
+
+   if ((theExpression->argList != NULL) &&
+       (theExpression->argList->nextArg == NULL))
+     {
+      temp = theExpression;
+      theExpression = theExpression->argList;
+      temp->argList = NULL;
+      temp->nextArg = NULL;
+      ReturnExpression(theEnv,temp);
+     }
+
+   return(theExpression);
+  }
+
diff --git a/clips/exprnpsr.h b/clips/exprnpsr.h
new file mode 100755
index 000000000..c98f33f79
--- /dev/null
+++ b/clips/exprnpsr.h
@@ -0,0 +1,98 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/17/17            */
+   /*                                                     */
+   /*            EXPRESSION PARSER HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for parsing expressions.       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Module specifier can be used within an         */
+/*            expression to refer to a deffunction or        */
+/*            defgeneric exported by the specified module,   */
+/*            but not necessarily imported by the current    */
+/*            module.                                        */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_exprnpsr
+
+#pragma once
+
+#define _H_exprnpsr
+
+typedef enum
+  {
+   FAE_NO_ERROR = 0,
+   FAE_COUNT_ERROR,
+   FAE_TYPE_ERROR
+  } FunctionArgumentsError;
+
+#include "extnfunc.h"
+#include "scanner.h"
+
+   struct expr                   *Function0Parse(Environment *,const char *);
+   struct expr                   *Function1Parse(Environment *,const char *);
+   struct expr                   *Function2Parse(Environment *,const char *,const char *);
+   void                           PushRtnBrkContexts(Environment *);
+   void                           PopRtnBrkContexts(Environment *);
+   bool                           ReplaceSequenceExpansionOps(Environment *,struct expr *,struct expr *,
+                                                                     void *,void *);
+   struct expr                   *CollectArguments(Environment *,struct expr *,const char *);
+   struct expr                   *ArgumentParse(Environment *,const char *,bool *);
+   struct expr                   *ParseAtomOrExpression(Environment *,const char *,struct token *);
+   Expression                    *ParseConstantArguments(Environment *,const char *,bool *);
+   struct expr                   *GroupActions(Environment *,const char *,struct token *,
+                                                      bool,const char *,bool);
+   struct expr                   *RemoveUnneededProgn(Environment *,struct expr *);
+   void                           PopulateRestriction(Environment *,unsigned *,unsigned,const char *,unsigned int);
+
+
+   FunctionArgumentsError         CheckExpressionAgainstRestrictions(Environment *,struct expr *,
+                                                                     struct functionDefinition *,const char *);
+
+#if (! RUN_TIME)
+   bool                           RestrictionExists(const char *,int);
+
+#endif
+
+#endif /* _H_exprnpsr */
+
+
+
+
diff --git a/clips/extnfunc.c b/clips/extnfunc.c
new file mode 100755
index 000000000..47c7d2d9c
--- /dev/null
+++ b/clips/extnfunc.c
@@ -0,0 +1,1016 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/24/17             */
+   /*                                                     */
+   /*               EXTERNAL FUNCTION MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for adding new user or system defined   */
+/*   functions.                                              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Corrected code to remove run-time program      */
+/*            compiler warning.                              */
+/*                                                           */
+/*      6.30: Added support for passing context information  */
+/*            to user defined functions.                     */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Changed restrictions from char * to            */
+/*            CLIPSLexeme * to support strings               */
+/*            originating from sources that are not          */
+/*            statically allocated.                          */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+
+#include "argacces.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "factmngr.h"
+#include "memalloc.h"
+#include "router.h"
+
+#if OBJECT_SYSTEM
+#include "inscom.h"
+#endif
+
+#include "extnfunc.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    AddHashFunction(Environment *,struct functionDefinition *);
+   static void                    InitializeFunctionHashTable(Environment *);
+   static void                    DeallocateExternalFunctionData(Environment *);
+#if (! RUN_TIME)
+   static bool                    RemoveHashFunction(Environment *,struct functionDefinition *);
+   static AddUDFError             DefineFunction(Environment *,const char *,unsigned,void (*)(Environment *,UDFContext *,UDFValue *),
+                                                 const char *,unsigned short,unsigned short,const char *,void *);
+#endif
+   static void                    PrintType(Environment *,const char *,int,int *,const char *);
+   static void                    AssignErrorValue(UDFContext *);
+
+/*********************************************************/
+/* InitializeExternalFunctionData: Allocates environment */
+/*    data for external functions.                       */
+/*********************************************************/
+void InitializeExternalFunctionData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,EXTERNAL_FUNCTION_DATA,sizeof(struct externalFunctionData),DeallocateExternalFunctionData);
+  }
+
+/***********************************************************/
+/* DeallocateExternalFunctionData: Deallocates environment */
+/*    data for external functions.                         */
+/***********************************************************/
+static void DeallocateExternalFunctionData(
+  Environment *theEnv)
+  {
+   struct FunctionHash *fhPtr, *nextFHPtr;
+   int i;
+
+#if ! RUN_TIME
+   struct functionDefinition *tmpPtr, *nextPtr;
+
+   tmpPtr = ExternalFunctionData(theEnv)->ListOfFunctions;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      rtn_struct(theEnv,functionDefinition,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+#endif
+
+   if (ExternalFunctionData(theEnv)->FunctionHashtable == NULL)
+     { return; }
+
+   for (i = 0; i < SIZE_FUNCTION_HASH; i++)
+     {
+      fhPtr = ExternalFunctionData(theEnv)->FunctionHashtable[i];
+      while (fhPtr != NULL)
+        {
+         nextFHPtr = fhPtr->next;
+         rtn_struct(theEnv,FunctionHash,fhPtr);
+         fhPtr = nextFHPtr;
+        }
+     }
+
+   genfree(theEnv,ExternalFunctionData(theEnv)->FunctionHashtable,
+           sizeof (struct FunctionHash *) * SIZE_FUNCTION_HASH);
+  }
+
+#if (! RUN_TIME)
+
+/****************************************************/
+/* AddUDF: Used to define a system or user external */
+/*   function so that the KB can access it.         */
+/****************************************************/
+AddUDFError AddUDF(
+  Environment *theEnv,
+  const char *clipsFunctionName,
+  const char *returnTypes,
+  unsigned short minArgs,
+  unsigned short maxArgs,
+  const char *argumentTypes,
+  UserDefinedFunction *cFunctionPointer,
+  const char *cFunctionName,
+  void *context)
+  {
+   unsigned returnTypeBits;
+   size_t i;
+
+   if ((minArgs != UNBOUNDED) && (minArgs > maxArgs))
+     { return AUE_MIN_EXCEEDS_MAX_ERROR; }
+
+   if (argumentTypes != NULL)
+     {
+      for (i = 0; argumentTypes[i] != EOS; i++)
+        {
+         if (strchr("bdefilmnsyv*;",argumentTypes[i]) == NULL)
+           { return AUE_INVALID_ARGUMENT_TYPE_ERROR; }
+        }
+     }
+     
+   if (returnTypes != NULL)
+     {
+      for (i = 0; returnTypes[i] != EOS; i++)
+        {
+         if (strchr("bdefilmnsyv*;",returnTypes[i]) == NULL)
+           { return AUE_INVALID_RETURN_TYPE_ERROR; }
+        }
+
+      PopulateRestriction(theEnv,&returnTypeBits,ANY_TYPE_BITS,returnTypes,0);
+     }
+   else
+     { returnTypeBits = ANY_TYPE_BITS; }
+
+   return DefineFunction(theEnv,clipsFunctionName,returnTypeBits,cFunctionPointer,
+                         cFunctionName,minArgs,maxArgs,argumentTypes,context);
+  }
+
+/*************************************************************/
+/* DefineFunction: Used to define a system or user external  */
+/*   function so that the KB can access it. Allows argument  */
+/*   restrictions to be attached to the function.            */
+/*************************************************************/
+static AddUDFError DefineFunction(
+  Environment *theEnv,
+  const char *name,
+  unsigned returnTypeBits,
+  void (*pointer)(Environment *,UDFContext *,UDFValue *),
+  const char *actualName,
+  unsigned short minArgs,
+  unsigned short maxArgs,
+  const char *restrictions,
+  void *context)
+  {
+   struct functionDefinition *newFunction;
+
+   newFunction = FindFunction(theEnv,name);
+   if (newFunction != NULL)
+     { return AUE_FUNCTION_NAME_IN_USE_ERROR; }
+
+   newFunction = get_struct(theEnv,functionDefinition);
+   newFunction->callFunctionName = CreateSymbol(theEnv,name);
+   IncrementLexemeCount(newFunction->callFunctionName);
+   newFunction->next = GetFunctionList(theEnv);
+   ExternalFunctionData(theEnv)->ListOfFunctions = newFunction;
+   AddHashFunction(theEnv,newFunction);
+
+   newFunction->unknownReturnValueType = returnTypeBits;
+   newFunction->functionPointer = pointer;
+   newFunction->actualFunctionName = actualName;
+
+   newFunction->minArgs = minArgs;
+   newFunction->maxArgs = maxArgs;
+
+   if (restrictions == NULL)
+     { newFunction->restrictions = NULL; }
+   else
+     {
+      newFunction->restrictions = CreateString(theEnv,restrictions);
+      IncrementLexemeCount(newFunction->restrictions);
+     }
+
+   newFunction->parser = NULL;
+   newFunction->overloadable = true;
+   newFunction->sequenceuseok = true;
+   newFunction->usrData = NULL;
+   newFunction->context = context;
+
+   return AUE_NO_ERROR;
+  }
+
+/********************************************/
+/* RemoveUDF: Used to remove a function     */
+/*   definition from the list of functions. */
+/********************************************/
+bool RemoveUDF(
+  Environment *theEnv,
+  const char *functionName)
+  {
+   CLIPSLexeme *findValue;
+   struct functionDefinition *fPtr, *lastPtr = NULL;
+
+   findValue = FindSymbolHN(theEnv,functionName,SYMBOL_BIT);
+
+   for (fPtr = ExternalFunctionData(theEnv)->ListOfFunctions;
+        fPtr != NULL;
+        fPtr = fPtr->next)
+     {
+      if (fPtr->callFunctionName == findValue)
+        {
+         ReleaseLexeme(theEnv,fPtr->callFunctionName);
+         RemoveHashFunction(theEnv,fPtr);
+
+         if (lastPtr == NULL)
+           { ExternalFunctionData(theEnv)->ListOfFunctions = fPtr->next; }
+         else
+           { lastPtr->next = fPtr->next; }
+
+         if (fPtr->restrictions != NULL)
+           { ReleaseLexeme(theEnv,fPtr->restrictions); }
+         ClearUserDataList(theEnv,fPtr->usrData);
+         rtn_struct(theEnv,functionDefinition,fPtr);
+         return true;
+        }
+
+      lastPtr = fPtr;
+     }
+
+   return false;
+  }
+
+/******************************************/
+/* RemoveHashFunction: Removes a function */
+/*   from the function hash table.        */
+/******************************************/
+static bool RemoveHashFunction(
+  Environment *theEnv,
+  struct functionDefinition *fdPtr)
+  {
+   struct FunctionHash *fhPtr, *lastPtr = NULL;
+   size_t hashValue;
+
+   hashValue = HashSymbol(fdPtr->callFunctionName->contents,SIZE_FUNCTION_HASH);
+
+   for (fhPtr = ExternalFunctionData(theEnv)->FunctionHashtable[hashValue];
+        fhPtr != NULL;
+        fhPtr = fhPtr->next)
+     {
+      if (fhPtr->fdPtr == fdPtr)
+        {
+         if (lastPtr == NULL)
+           { ExternalFunctionData(theEnv)->FunctionHashtable[hashValue] = fhPtr->next; }
+         else
+           { lastPtr->next = fhPtr->next; }
+
+         rtn_struct(theEnv,FunctionHash,fhPtr);
+         return true;
+        }
+
+      lastPtr = fhPtr;
+     }
+
+   return false;
+  }
+
+#endif
+
+/***************************************************************************/
+/* AddFunctionParser: Associates a specialized expression parsing function */
+/*   with the function entry for a function which was defined using        */
+/*   DefineFunction. When this function is parsed, the specialized parsing */
+/*   function will be called to parse the arguments of the function. Only  */
+/*   user and system defined functions can have specialized parsing        */
+/*   routines. Generic functions and deffunctions can not have specialized */
+/*   parsing routines.                                                     */
+/***************************************************************************/
+bool AddFunctionParser(
+  Environment *theEnv,
+  const char *functionName,
+  struct expr *(*fpPtr)(Environment *,struct expr *,const char *))
+  {
+   struct functionDefinition *fdPtr;
+
+   fdPtr = FindFunction(theEnv,functionName);
+   if (fdPtr == NULL)
+     {
+      WriteString(theEnv,STDERR,"Function parsers can only be added for existing functions.\n");
+      return false;
+     }
+
+   fdPtr->parser = fpPtr;
+   fdPtr->overloadable = false;
+
+   return true;
+  }
+
+#if (! RUN_TIME)
+
+/*********************************************************************/
+/* RemoveFunctionParser: Removes a specialized expression parsing    */
+/*   function (if it exists) from the function entry for a function. */
+/*********************************************************************/
+bool RemoveFunctionParser(
+  Environment *theEnv,
+  const char *functionName)
+  {
+   struct functionDefinition *fdPtr;
+
+   fdPtr = FindFunction(theEnv,functionName);
+   if (fdPtr == NULL)
+     {
+      WriteString(theEnv,STDERR,"Function parsers can only be removed from existing functions.\n");
+      return false;
+     }
+
+   fdPtr->parser = NULL;
+
+   return true;
+  }
+
+/*****************************************************************/
+/* FuncSeqOvlFlags: Makes a system function overloadable or not, */
+/* i.e. can the function be a method for a generic function.     */
+/*****************************************************************/
+bool FuncSeqOvlFlags(
+  Environment *theEnv,
+  const char *functionName,
+  bool seqp,
+  bool ovlp)
+  {
+   struct functionDefinition *fdPtr;
+
+   fdPtr = FindFunction(theEnv,functionName);
+   if (fdPtr == NULL)
+     {
+      WriteString(theEnv,STDERR,"Only existing functions can be marked as using sequence expansion arguments/overloadable or not.\n");
+      return false;
+     }
+     
+   fdPtr->sequenceuseok = (seqp ? true : false);
+   fdPtr->overloadable = (ovlp ? true : false);
+   
+   return true;
+  }
+
+#endif
+
+/***********************************************/
+/* GetNthRestriction: Returns the restriction  */
+/*   type for the nth parameter of a function. */
+/***********************************************/
+unsigned GetNthRestriction(
+  Environment *theEnv,
+  struct functionDefinition *theFunction,
+  unsigned int position)
+  {
+   unsigned rv, df;
+   const char *restrictions;
+
+   if (theFunction == NULL) return(ANY_TYPE_BITS);
+
+   if (theFunction->restrictions == NULL) return(ANY_TYPE_BITS);
+   restrictions = theFunction->restrictions->contents;
+
+   PopulateRestriction(theEnv,&df,ANY_TYPE_BITS,restrictions,0);
+   PopulateRestriction(theEnv,&rv,df,restrictions,position);
+
+   return rv;
+  }
+
+/*************************************************/
+/* GetFunctionList: Returns the ListOfFunctions. */
+/*************************************************/
+struct functionDefinition *GetFunctionList(
+  Environment *theEnv)
+  {
+   return(ExternalFunctionData(theEnv)->ListOfFunctions);
+  }
+
+/**************************************************************/
+/* InstallFunctionList: Sets the ListOfFunctions and adds all */
+/*   the function entries to the FunctionHashTable.           */
+/**************************************************************/
+void InstallFunctionList(
+  Environment *theEnv,
+  struct functionDefinition *value)
+  {
+   int i;
+   struct FunctionHash *fhPtr, *nextPtr;
+
+   if (ExternalFunctionData(theEnv)->FunctionHashtable != NULL)
+     {
+      for (i = 0; i < SIZE_FUNCTION_HASH; i++)
+        {
+         fhPtr = ExternalFunctionData(theEnv)->FunctionHashtable[i];
+         while (fhPtr != NULL)
+           {
+            nextPtr = fhPtr->next;
+            rtn_struct(theEnv,FunctionHash,fhPtr);
+            fhPtr = nextPtr;
+           }
+         ExternalFunctionData(theEnv)->FunctionHashtable[i] = NULL;
+        }
+     }
+
+   ExternalFunctionData(theEnv)->ListOfFunctions = value;
+
+   while (value != NULL)
+     {
+      AddHashFunction(theEnv,value);
+      value = value->next;
+     }
+  }
+
+/********************************************************/
+/* FindFunction: Returns a pointer to the corresponding */
+/*   functionDefinition structure if a function name is */
+/*   in the function list, otherwise returns NULL.      */
+/********************************************************/
+struct functionDefinition *FindFunction(
+  Environment *theEnv,
+  const char *functionName)
+  {
+   struct FunctionHash *fhPtr;
+   size_t hashValue;
+   CLIPSLexeme *findValue;
+
+   if (ExternalFunctionData(theEnv)->FunctionHashtable == NULL) return NULL;
+
+   hashValue = HashSymbol(functionName,SIZE_FUNCTION_HASH);
+
+   findValue = FindSymbolHN(theEnv,functionName,SYMBOL_BIT);
+
+   for (fhPtr = ExternalFunctionData(theEnv)->FunctionHashtable[hashValue];
+        fhPtr != NULL;
+        fhPtr = fhPtr->next)
+     {
+      if (fhPtr->fdPtr->callFunctionName == findValue)
+        { return(fhPtr->fdPtr); }
+     }
+
+   return NULL;
+  }
+
+/********************************************************/
+/* GetUDFContext: Returns the context associated a UDF. */
+/********************************************************/
+void *GetUDFContext(
+  Environment *theEnv,
+  const char *functionName)
+  {
+   struct FunctionHash *fhPtr;
+   size_t hashValue;
+   CLIPSLexeme *findValue;
+
+   if (ExternalFunctionData(theEnv)->FunctionHashtable == NULL) return NULL;
+
+   hashValue = HashSymbol(functionName,SIZE_FUNCTION_HASH);
+
+   findValue = FindSymbolHN(theEnv,functionName,SYMBOL_BIT);
+
+   for (fhPtr = ExternalFunctionData(theEnv)->FunctionHashtable[hashValue];
+        fhPtr != NULL;
+        fhPtr = fhPtr->next)
+     {
+      if (fhPtr->fdPtr->callFunctionName == findValue)
+        { return fhPtr->fdPtr->context; }
+     }
+
+   return NULL;
+  }
+
+/*********************************************************/
+/* InitializeFunctionHashTable: Purpose is to initialize */
+/*   the function hash table to NULL.                    */
+/*********************************************************/
+static void InitializeFunctionHashTable(
+  Environment *theEnv)
+  {
+   int i;
+
+   ExternalFunctionData(theEnv)->FunctionHashtable = (struct FunctionHash **)
+                       gm2(theEnv,sizeof (struct FunctionHash *) *
+                           SIZE_FUNCTION_HASH);
+
+   for (i = 0; i < SIZE_FUNCTION_HASH; i++) ExternalFunctionData(theEnv)->FunctionHashtable[i] = NULL;
+  }
+
+/****************************************************************/
+/* AddHashFunction: Adds a function to the function hash table. */
+/****************************************************************/
+static void AddHashFunction(
+  Environment *theEnv,
+  struct functionDefinition *fdPtr)
+  {
+   struct FunctionHash *newhash, *temp;
+   size_t hashValue;
+
+   if (ExternalFunctionData(theEnv)->FunctionHashtable == NULL) InitializeFunctionHashTable(theEnv);
+
+   newhash = get_struct(theEnv,FunctionHash);
+   newhash->fdPtr = fdPtr;
+
+   hashValue = HashSymbol(fdPtr->callFunctionName->contents,SIZE_FUNCTION_HASH);
+
+   temp = ExternalFunctionData(theEnv)->FunctionHashtable[hashValue];
+   ExternalFunctionData(theEnv)->FunctionHashtable[hashValue] = newhash;
+   newhash->next = temp;
+  }
+
+/*************************************************/
+/* GetMinimumArgs: Returns the minimum number of */
+/*   arguments expected by an external function. */
+/*************************************************/
+int GetMinimumArgs(
+  struct functionDefinition *theFunction)
+  {
+   return theFunction->minArgs;
+  }
+
+/*************************************************/
+/* GetMaximumArgs: Returns the maximum number of */
+/*   arguments expected by an external function. */
+/*************************************************/
+int GetMaximumArgs(
+  struct functionDefinition *theFunction)
+  {
+   return theFunction->maxArgs;
+  }
+
+/********************/
+/* AssignErrorValue */
+/********************/
+void AssignErrorValue(
+  UDFContext *context)
+  {
+   if (context->theFunction->unknownReturnValueType & BOOLEAN_BIT)
+     { context->returnValue->lexemeValue = context->environment->FalseSymbol; }
+   else if (context->theFunction->unknownReturnValueType & STRING_BIT)
+     { context->returnValue->lexemeValue = CreateString(context->environment,""); }
+   else if (context->theFunction->unknownReturnValueType & SYMBOL_BIT)
+     { context->returnValue->lexemeValue = CreateSymbol(context->environment,"nil"); }
+   else if (context->theFunction->unknownReturnValueType & INTEGER_BIT)
+     { context->returnValue->integerValue = CreateInteger(context->environment,0); }
+   else if (context->theFunction->unknownReturnValueType & FLOAT_BIT)
+     { context->returnValue->floatValue = CreateFloat(context->environment,0.0); }
+   else if (context->theFunction->unknownReturnValueType & MULTIFIELD_BIT)
+     { SetMultifieldErrorValue(context->environment,context->returnValue); }
+   else if (context->theFunction->unknownReturnValueType & INSTANCE_NAME_BIT)
+     { context->returnValue->lexemeValue = CreateInstanceName(context->environment,"nil"); }
+   else if (context->theFunction->unknownReturnValueType & FACT_ADDRESS_BIT)
+     { context->returnValue->factValue = &FactData(context->environment)->DummyFact; }
+#if OBJECT_SYSTEM
+   else if (context->theFunction->unknownReturnValueType & INSTANCE_ADDRESS_BIT)
+     { context->returnValue->value = &InstanceData(context->environment)->DummyInstance; }
+#endif
+   else if (context->theFunction->unknownReturnValueType & EXTERNAL_ADDRESS_BIT)
+     { context->returnValue->value = CreateExternalAddress(context->environment,NULL,0); }
+   else
+     { context->returnValue->value = context->environment->VoidConstant; }
+  }
+
+/*********************/
+/* UDFArgumentCount: */
+/*********************/
+unsigned int UDFArgumentCount(
+  UDFContext *context)
+  {
+   unsigned int count = 0;
+   struct expr *argPtr;
+
+   for (argPtr = EvaluationData(context->environment)->CurrentExpression->argList;
+        argPtr != NULL;
+        argPtr = argPtr->nextArg)
+     { count++; }
+
+   return count;
+  }
+
+/*********************/
+/* UDFFirstArgument: */
+/*********************/
+bool UDFFirstArgument(
+  UDFContext *context,
+  unsigned expectedType,
+  UDFValue *returnValue)
+  {
+   context->lastArg = EvaluationData(context->environment)->CurrentExpression->argList;
+   context->lastPosition = 1;
+   return UDFNextArgument(context,expectedType,returnValue);
+  }
+
+/********************/
+/* UDFNextArgument: */
+/********************/
+bool UDFNextArgument(
+  UDFContext *context,
+  unsigned expectedType,
+  UDFValue *returnValue)
+  {
+   struct expr *argPtr = context->lastArg;
+   unsigned int argumentPosition = context->lastPosition;
+   Environment *theEnv = context->environment;
+
+   if (argPtr == NULL)
+     {
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+
+   context->lastPosition++;
+   context->lastArg = context->lastArg->nextArg;
+
+   switch (argPtr->type)
+     {
+      case INTEGER_TYPE:
+        returnValue->value = argPtr->value;
+        if (expectedType & INTEGER_BIT) return true;
+        ExpectedTypeError0(theEnv,UDFContextFunctionName(context),argumentPosition);
+        PrintTypesString(theEnv,STDERR,expectedType,true);
+        SetHaltExecution(theEnv,true);
+        SetEvaluationError(theEnv,true);
+        AssignErrorValue(context);
+        return false;
+        break;
+
+      case FLOAT_TYPE:
+        returnValue->value = argPtr->value;
+        if (expectedType & FLOAT_BIT) return true;
+        ExpectedTypeError0(theEnv,UDFContextFunctionName(context),argumentPosition);
+        PrintTypesString(theEnv,STDERR,expectedType,true);
+        SetHaltExecution(theEnv,true);
+        SetEvaluationError(theEnv,true);
+        AssignErrorValue(context);
+        return false;
+        break;
+
+      case SYMBOL_TYPE:
+        returnValue->value = argPtr->value;
+        if (expectedType & SYMBOL_BIT) return true;
+        if (expectedType & BOOLEAN_BIT)
+          {
+           if ((returnValue->lexemeValue == FalseSymbol(theEnv)) ||
+               (returnValue->lexemeValue == TrueSymbol(theEnv)))
+             { return true; }
+          }
+        ExpectedTypeError0(theEnv,UDFContextFunctionName(context),argumentPosition);
+        PrintTypesString(theEnv,STDERR,expectedType,true);
+        SetHaltExecution(theEnv,true);
+        SetEvaluationError(theEnv,true);
+        AssignErrorValue(context);
+        return false;
+        break;
+
+      case STRING_TYPE:
+        returnValue->value = argPtr->value;
+        if (expectedType & STRING_BIT) return true;
+        ExpectedTypeError0(theEnv,UDFContextFunctionName(context),argumentPosition);
+        PrintTypesString(theEnv,STDERR,expectedType,true);
+        SetHaltExecution(theEnv,true);
+        SetEvaluationError(theEnv,true);
+        AssignErrorValue(context);
+        return false;
+        break;
+
+      case INSTANCE_NAME_TYPE:
+        returnValue->value = argPtr->value;
+        if (expectedType & INSTANCE_NAME_BIT) return true;
+        ExpectedTypeError0(theEnv,UDFContextFunctionName(context),argumentPosition);
+        PrintTypesString(theEnv,STDERR,expectedType,true);
+        SetHaltExecution(theEnv,true);
+        SetEvaluationError(theEnv,true);
+        AssignErrorValue(context);
+        return false;
+        break;
+     }
+
+   EvaluateExpression(theEnv,argPtr,returnValue);
+
+   switch (returnValue->header->type)
+     {
+      case VOID_TYPE:
+        if (expectedType & VOID_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+        break;
+
+      case INTEGER_TYPE:
+        if (expectedType & INTEGER_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+        break;
+
+      case FLOAT_TYPE:
+        if (expectedType & FLOAT_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+        break;
+
+      case SYMBOL_TYPE:
+        if (expectedType & SYMBOL_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+          
+        if (expectedType & BOOLEAN_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else if ((returnValue->lexemeValue == FalseSymbol(theEnv)) ||
+                    (returnValue->lexemeValue == TrueSymbol(theEnv)))
+             { return true; }
+          }
+
+        break;
+
+      case STRING_TYPE:
+        if (expectedType & STRING_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+        break;
+
+      case INSTANCE_NAME_TYPE:
+        if (expectedType & INSTANCE_NAME_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+        break;
+
+      case EXTERNAL_ADDRESS_TYPE:
+        if (expectedType & EXTERNAL_ADDRESS_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+        break;
+
+      case FACT_ADDRESS_TYPE:
+        if (expectedType & FACT_ADDRESS_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+        break;
+
+      case INSTANCE_ADDRESS_TYPE:
+        if (expectedType & INSTANCE_ADDRESS_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+        break;
+
+      case MULTIFIELD_TYPE:
+        if (expectedType & MULTIFIELD_BIT)
+          {
+           if (EvaluationData(theEnv)->EvaluationError)
+             {
+              AssignErrorValue(context);
+              return false;
+             }
+           else return true;
+          }
+        break;
+     }
+
+   ExpectedTypeError0(theEnv,UDFContextFunctionName(context),argumentPosition);
+   PrintTypesString(theEnv,STDERR,expectedType,true);
+
+   SetHaltExecution(theEnv,true);
+   SetEvaluationError(theEnv,true);
+   AssignErrorValue(context);
+
+   return false;
+  }
+
+/*******************/
+/* UDFNthArgument: */
+/*******************/
+bool UDFNthArgument(
+  UDFContext *context,
+  unsigned int argumentPosition,
+  unsigned expectedType,
+  UDFValue *returnValue)
+  {
+   if (argumentPosition < context->lastPosition)
+     {
+      context->lastArg = EvaluationData(context->environment)->CurrentExpression->argList;
+      context->lastPosition = 1;
+     }
+
+   for ( ; (context->lastArg != NULL) && (context->lastPosition < argumentPosition) ;
+           context->lastArg = context->lastArg->nextArg)
+     { context->lastPosition++; }
+
+   return UDFNextArgument(context,expectedType,returnValue);
+  }
+
+/******************************/
+/* UDFInvalidArgumentMessage: */
+/******************************/
+void UDFInvalidArgumentMessage(
+  UDFContext *context,
+  const char *typeString)
+  {
+   ExpectedTypeError1(context->environment,
+                      UDFContextFunctionName(context),
+                      context->lastPosition-1,typeString);
+  }
+
+/******************/
+/* UDFThrowError: */
+/******************/
+void UDFThrowError(
+  UDFContext *context)
+  {
+   Environment *theEnv = context->environment;
+
+   SetHaltExecution(theEnv,true);
+   SetEvaluationError(theEnv,true);
+  }
+
+/***************************/
+/* UDFContextFunctionName: */
+/***************************/
+const char *UDFContextFunctionName(
+  UDFContext *context)
+  {
+   return context->theFunction->callFunctionName->contents;
+  }
+
+/**************/
+/* PrintType: */
+/**************/
+static void PrintType(
+  Environment *theEnv,
+  const char *logicalName,
+  int typeCount,
+  int *typesPrinted,
+  const char *typeName)
+  {
+   if (*typesPrinted == 0)
+     {
+      WriteString(theEnv,logicalName,typeName);
+      (*typesPrinted)++;
+      return;
+     }
+
+   if (typeCount == 2)
+     { WriteString(theEnv,logicalName," or "); }
+   else if (((*typesPrinted) + 1) == typeCount)
+     { WriteString(theEnv,logicalName,", or "); }
+   else
+     { WriteString(theEnv,logicalName,", "); }
+
+   WriteString(theEnv,logicalName,typeName);
+   (*typesPrinted)++;
+  }
+
+/********************/
+/* PrintTypesString */
+/********************/
+void PrintTypesString(
+  Environment *theEnv,
+  const char *logicalName,
+  unsigned expectedType,
+  bool printCRLF)
+  {
+   int typeCount, typesPrinted;
+
+   typeCount = 0;
+   if (expectedType & INTEGER_BIT) typeCount++;
+   if (expectedType & FLOAT_BIT) typeCount++;
+   if (expectedType & BOOLEAN_BIT) typeCount++;
+   if (expectedType & SYMBOL_BIT) typeCount++;
+   if (expectedType & STRING_BIT) typeCount++;
+   if (expectedType & INSTANCE_NAME_BIT) typeCount++;
+   if (expectedType & INSTANCE_ADDRESS_BIT) typeCount++;
+   if (expectedType & FACT_ADDRESS_BIT) typeCount++;
+   if (expectedType & EXTERNAL_ADDRESS_BIT) typeCount++;
+   if (expectedType & MULTIFIELD_BIT) typeCount++;
+
+   typesPrinted = 0;
+   if (expectedType & INTEGER_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"integer"); }
+
+    if (expectedType & FLOAT_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"float"); }
+
+   if (expectedType & BOOLEAN_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"boolean"); }
+
+   if (expectedType & SYMBOL_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"symbol"); }
+
+   if (expectedType & STRING_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"string"); }
+
+   if (expectedType & INSTANCE_NAME_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"instance name"); }
+
+   if (expectedType & INSTANCE_ADDRESS_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"instance address"); }
+
+   if (expectedType & FACT_ADDRESS_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"fact address"); }
+
+   if (expectedType & EXTERNAL_ADDRESS_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"external address"); }
+
+   if (expectedType & MULTIFIELD_BIT)
+     { PrintType(theEnv,logicalName,typeCount,&typesPrinted,"multifield"); }
+
+   if (printCRLF)
+     { WriteString(theEnv,logicalName,".\n"); }
+  }
diff --git a/clips/extnfunc.h b/clips/extnfunc.h
new file mode 100755
index 000000000..d60d466ff
--- /dev/null
+++ b/clips/extnfunc.h
@@ -0,0 +1,157 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/24/17            */
+   /*                                                     */
+   /*            EXTERNAL FUNCTIONS HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for adding new user or system defined   */
+/*   functions.                                              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added support for passing context information  */
+/*            to user defined functions.                     */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Replaced ALLOW_ENVIRONMENT_GLOBALS macros      */
+/*            with functions.                                */
+/*                                                           */
+/*      6.40: Changed restrictions from char * to            */
+/*            CLIPSLexeme * to support strings               */
+/*            originating from sources that are not          */
+/*            statically allocated.                          */
+/*                                                           */
+/*            Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_extnfunc
+
+#pragma once
+
+#define _H_extnfunc
+
+#include "entities.h"
+
+#include "evaluatn.h"
+#include "expressn.h"
+#include "symbol.h"
+#include "userdata.h"
+
+typedef void UserDefinedFunction(Environment *,UDFContext *,UDFValue *);
+
+struct functionDefinition
+  {
+   CLIPSLexeme *callFunctionName;
+   const char *actualFunctionName;
+   unsigned unknownReturnValueType;
+   void (*functionPointer)(Environment *,UDFContext *,UDFValue *);
+   struct expr *(*parser)(Environment *,struct expr *,const char *);
+   CLIPSLexeme *restrictions;
+   unsigned short minArgs;
+   unsigned short maxArgs;
+   bool overloadable;
+   bool sequenceuseok;
+   bool neededFunction;
+   unsigned long bsaveIndex;
+   struct functionDefinition *next;
+   struct userData *usrData;
+   void *context;
+  };
+
+#define UnknownFunctionType(target) (((struct functionDefinition *) target)->unknownReturnValueType)
+#define ExpressionFunctionPointer(target) ((target)->functionValue->functionPointer)
+#define ExpressionFunctionCallName(target) ((target)->functionValue->callFunctionName)
+#define ExpressionFunctionRealName(target) ((target)->functionValue->actualFunctionName)
+#define ExpressionUnknownFunctionType(target) ((target)->functionValue->unknownReturnValueType)
+
+/*==================*/
+/* ENVIRONMENT DATA */
+/*==================*/
+
+#define EXTERNAL_FUNCTION_DATA 50
+
+struct externalFunctionData
+  {
+   struct functionDefinition *ListOfFunctions;
+   struct FunctionHash **FunctionHashtable;
+  };
+
+#define ExternalFunctionData(theEnv) ((struct externalFunctionData *) GetEnvironmentData(theEnv,EXTERNAL_FUNCTION_DATA))
+
+typedef enum
+  {
+   AUE_NO_ERROR = 0,
+   AUE_MIN_EXCEEDS_MAX_ERROR,
+   AUE_FUNCTION_NAME_IN_USE_ERROR,
+   AUE_INVALID_ARGUMENT_TYPE_ERROR,
+   AUE_INVALID_RETURN_TYPE_ERROR
+  } AddUDFError;
+
+struct FunctionHash
+  {
+   struct functionDefinition *fdPtr;
+   struct FunctionHash *next;
+  };
+
+#define SIZE_FUNCTION_HASH 517
+
+   void                           InitializeExternalFunctionData(Environment *);
+   AddUDFError                    AddUDF(Environment *,const char *,const char *,
+                                         unsigned short,unsigned short,const char *,
+                                         UserDefinedFunction *,
+                                         const char *,void *);
+   bool                           AddFunctionParser(Environment *,const char *,
+                                                           struct expr *(*)( Environment *,struct expr *,const char *));
+   bool                           RemoveFunctionParser(Environment *,const char *);
+   bool                           FuncSeqOvlFlags(Environment *,const char *,bool,bool);
+   struct functionDefinition     *GetFunctionList(Environment *);
+   void                           InstallFunctionList(Environment *,struct functionDefinition *);
+   struct functionDefinition     *FindFunction(Environment *,const char *);
+   unsigned                       GetNthRestriction(Environment *,struct functionDefinition *,unsigned int);
+   bool                           RemoveUDF(Environment *,const char *);
+   int                            GetMinimumArgs(struct functionDefinition *);
+   int                            GetMaximumArgs(struct functionDefinition *);
+   unsigned int                   UDFArgumentCount(UDFContext *);
+   bool                           UDFNthArgument(UDFContext *,unsigned int,unsigned,UDFValue *);
+   void                           UDFInvalidArgumentMessage(UDFContext *,const char *);
+   const char                    *UDFContextFunctionName(UDFContext *);
+   void                           PrintTypesString(Environment *,const char *,unsigned,bool);
+   bool                           UDFFirstArgument(UDFContext *,unsigned,UDFValue *);
+   bool                           UDFNextArgument(UDFContext *,unsigned,UDFValue *);
+   void                           UDFThrowError(UDFContext *);
+   void                          *GetUDFContext(Environment *,const char *);
+
+#define UDFHasNextArgument(context) (context->lastArg != NULL)
+
+#endif /* _H_extnfunc */
+
+
+
diff --git a/clips/factbin.c b/clips/factbin.c
new file mode 100755
index 000000000..ee8e54b5c
--- /dev/null
+++ b/clips/factbin.c
@@ -0,0 +1,447 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                FACT BSAVE/BLOAD MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for the  */
+/*    fact pattern network.                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+
+#include <stdio.h>
+
+#include "bload.h"
+#include "bsave.h"
+#include "envrnmnt.h"
+#include "factmngr.h"
+#include "memalloc.h"
+#include "moduldef.h"
+#include "pattern.h"
+#include "reteutil.h"
+#include "rulebin.h"
+#include "tmpltdef.h"
+
+#include "factbin.h"
+
+/********************************************/
+/* INTERNAL DATA STRUCTURES AND DEFINITIONS */
+/********************************************/
+
+struct bsaveFactPatternNode
+  {
+   struct bsavePatternNodeHeader header;
+   unsigned short whichSlot;
+   unsigned short whichField;
+   unsigned short leaveFields;
+   unsigned long networkTest;
+   unsigned long nextLevel;
+   unsigned long lastLevel;
+   unsigned long leftNode;
+   unsigned long rightNode;
+  };
+
+#define BSAVE_FIND         0
+#define BSAVE_PATTERNS     1
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                    BsaveDriver(Environment *,int,FILE *,struct factPatternNode *);
+   static void                    BsaveFind(Environment *);
+   static void                    BsaveStorage(Environment *,FILE *);
+   static void                    BsaveFactPatterns(Environment *,FILE *);
+   static void                    BsavePatternNode(Environment *,struct factPatternNode *,FILE *);
+#endif
+   static void                    BloadStorage(Environment *);
+   static void                    BloadBinaryItem(Environment *);
+   static void                    UpdateFactPatterns(Environment *,void *,unsigned long);
+   static void                    ClearBload(Environment *);
+   static void                    DeallocateFactBloadData(Environment *);
+
+/*****************************************************/
+/* FactBinarySetup: Initializes the binary load/save */
+/*   feature for the fact pattern network.           */
+/*****************************************************/
+void FactBinarySetup(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,FACTBIN_DATA,sizeof(struct factBinaryData),DeallocateFactBloadData);
+
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"facts",0,BsaveFind,NULL,
+                            BsaveStorage,BsaveFactPatterns,
+                            BloadStorage,BloadBinaryItem,
+                            ClearBload);
+#endif
+#if BLOAD || BLOAD_ONLY
+   AddBinaryItem(theEnv,"facts",0,NULL,NULL,NULL,NULL,
+                            BloadStorage,BloadBinaryItem,
+                            ClearBload);
+#endif
+  }
+
+/****************************************************/
+/* DeallocateFactBloadData: Deallocates environment */
+/*    data for the fact bsave functionality.        */
+/****************************************************/
+static void DeallocateFactBloadData(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long i;
+
+   for (i = 0; i < FactBinaryData(theEnv)->NumberOfPatterns; i++)
+     { DestroyAlphaMemory(theEnv,&FactBinaryData(theEnv)->FactPatternArray[i].header,false); }
+
+   space = FactBinaryData(theEnv)->NumberOfPatterns * sizeof(struct factPatternNode);
+   if (space != 0) genfree(theEnv,FactBinaryData(theEnv)->FactPatternArray,space);
+  }
+
+#if BLOAD_AND_BSAVE
+
+/*********************************************************/
+/* BsaveFind: Counts the number of data structures which */
+/*   must be saved in the binary image for the fact      */
+/*   pattern network in the current environment.         */
+/*********************************************************/
+static void BsaveFind(
+  Environment *theEnv)
+  {
+   Deftemplate *theDeftemplate;
+   Defmodule *theModule;
+
+   /*=======================================================*/
+   /* If a binary image is already loaded, then temporarily */
+   /* save the count values since these will be overwritten */
+   /* in the process of saving the binary image.            */
+   /*=======================================================*/
+
+   SaveBloadCount(theEnv,FactBinaryData(theEnv)->NumberOfPatterns);
+
+   /*=======================================*/
+   /* Set the count of fact pattern network */
+   /* data structures to zero.              */
+   /*=======================================*/
+
+   FactBinaryData(theEnv)->NumberOfPatterns = 0L;
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*===============================*/
+      /* Set the current module to the */
+      /* module being examined.        */
+      /*===============================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*=====================================================*/
+      /* Loop through each deftemplate in the current module */
+      /* and count the number of data structures which must  */
+      /* be saved for its pattern network.                   */
+      /*=====================================================*/
+
+      for (theDeftemplate = GetNextDeftemplate(theEnv,NULL);
+           theDeftemplate != NULL;
+           theDeftemplate = GetNextDeftemplate(theEnv,theDeftemplate))
+        { BsaveDriver(theEnv,BSAVE_FIND,NULL,theDeftemplate->patternNetwork); }
+     }
+  }
+
+/**********************************************************/
+/* BsaveDriver: Binary save driver routine which handles  */
+/*   both finding/marking the data structures to be saved */
+/*   and saving the data structures to a file.            */
+/**********************************************************/
+static void BsaveDriver(
+  Environment *theEnv,
+  int action,
+  FILE *fp,
+  struct factPatternNode *thePattern)
+  {
+   while (thePattern != NULL)
+     {
+      switch(action)
+        {
+         case BSAVE_FIND:
+           thePattern->bsaveID = FactBinaryData(theEnv)->NumberOfPatterns++;
+           break;
+
+         case BSAVE_PATTERNS:
+           BsavePatternNode(theEnv,thePattern,fp);
+           break;
+
+         default:
+           break;
+        }
+
+      if (thePattern->nextLevel == NULL)
+        {
+         while (thePattern->rightNode == NULL)
+           {
+            thePattern = thePattern->lastLevel;
+            if (thePattern == NULL) return;
+           }
+         thePattern = thePattern->rightNode;
+        }
+      else
+        { thePattern = thePattern->nextLevel; }
+     }
+  }
+
+/*********************************************************/
+/* BsaveStorage: Writes out storage requirements for all */
+/*   factPatternNode data structures to the binary file  */
+/*********************************************************/
+static void BsaveStorage(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+
+   space = sizeof(long);
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&FactBinaryData(theEnv)->NumberOfPatterns,sizeof(long),fp);
+  }
+
+/*****************************************************/
+/* BsaveFactPatterns: Writes out all factPatternNode */
+/*    data structures to the binary file.            */
+/*****************************************************/
+static void BsaveFactPatterns(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   Deftemplate *theDeftemplate;
+   Defmodule *theModule;
+
+   /*========================================*/
+   /* Write out the amount of space taken up */
+   /* by the factPatternNode data structures */
+   /* in the binary image.                   */
+   /*========================================*/
+
+   space = FactBinaryData(theEnv)->NumberOfPatterns * sizeof(struct bsaveFactPatternNode);
+   GenWrite(&space,sizeof(size_t),fp);
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*=====================================================*/
+      /* Loop through each deftemplate in the current module */
+      /* and save its fact pattern network to the file.      */
+      /*=====================================================*/
+
+      SetCurrentModule(theEnv,theModule);
+      for (theDeftemplate = GetNextDeftemplate(theEnv,NULL);
+           theDeftemplate != NULL;
+           theDeftemplate = GetNextDeftemplate(theEnv,theDeftemplate))
+        { BsaveDriver(theEnv,BSAVE_PATTERNS,fp,theDeftemplate->patternNetwork); }
+    }
+
+   /*=============================================================*/
+   /* If a binary image was already loaded when the bsave command */
+   /* was issued, then restore the counts indicating the number   */
+   /* of factPatternNode data structures in the binary image      */
+   /* (these were overwritten by the binary save).                */
+   /*=============================================================*/
+
+   RestoreBloadCount(theEnv,&FactBinaryData(theEnv)->NumberOfPatterns);
+  }
+
+/******************************************************/
+/* BsavePatternNode: Writes out a single fact pattern */
+/*   node to the binary image save file.              */
+/******************************************************/
+static void BsavePatternNode(
+  Environment *theEnv,
+  struct factPatternNode *thePattern,
+  FILE *fp)
+  {
+   struct bsaveFactPatternNode tempNode;
+
+   AssignBsavePatternHeaderValues(theEnv,&tempNode.header,&thePattern->header);
+
+   tempNode.whichField = thePattern->whichField;
+   tempNode.leaveFields = thePattern->leaveFields;
+   tempNode.whichSlot = thePattern->whichSlot;
+   tempNode.networkTest = HashedExpressionIndex(theEnv,thePattern->networkTest);
+   tempNode.nextLevel =  BsaveFactPatternIndex(thePattern->nextLevel);
+   tempNode.lastLevel =  BsaveFactPatternIndex(thePattern->lastLevel);
+   tempNode.leftNode =  BsaveFactPatternIndex(thePattern->leftNode);
+   tempNode.rightNode =  BsaveFactPatternIndex(thePattern->rightNode);
+
+   GenWrite(&tempNode,sizeof(struct bsaveFactPatternNode),fp);
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+/*****************************************************/
+/* BloadStorage: Allocates storage requirements for  */
+/*   the factPatternNodes used by this binary image. */
+/*****************************************************/
+static void BloadStorage(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*=========================================*/
+   /* Determine the number of factPatternNode */
+   /* data structures to be read.             */
+   /*=========================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   GenReadBinary(theEnv,&FactBinaryData(theEnv)->NumberOfPatterns,sizeof(long));
+
+   /*===================================*/
+   /* Allocate the space needed for the */
+   /* factPatternNode data structures.  */
+   /*===================================*/
+
+   if (FactBinaryData(theEnv)->NumberOfPatterns == 0)
+     {
+      FactBinaryData(theEnv)->FactPatternArray = NULL;
+      return;
+     }
+
+   space = FactBinaryData(theEnv)->NumberOfPatterns * sizeof(struct factPatternNode);
+   FactBinaryData(theEnv)->FactPatternArray = (struct factPatternNode *) genalloc(theEnv,space);
+  }
+
+/************************************************************/
+/* BloadBinaryItem: Loads and refreshes the factPatternNode */
+/*   data structures used by this binary image.             */
+/************************************************************/
+static void BloadBinaryItem(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long i;
+
+   /*======================================================*/
+   /* Read in the amount of space used by the binary image */
+   /* (this is used to skip the construct in the event it  */
+   /* is not available in the version being run).          */
+   /*======================================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+
+   /*=============================================*/
+   /* Read in the factPatternNode data structures */
+   /* and refresh the pointers.                   */
+   /*=============================================*/
+
+   BloadandRefresh(theEnv,FactBinaryData(theEnv)->NumberOfPatterns,sizeof(struct bsaveFactPatternNode),
+                   UpdateFactPatterns);
+
+   for (i = 0; i < FactBinaryData(theEnv)->NumberOfPatterns; i++)
+     {
+      if ((FactBinaryData(theEnv)->FactPatternArray[i].lastLevel != NULL) &&
+          (FactBinaryData(theEnv)->FactPatternArray[i].lastLevel->header.selector))
+        {
+         AddHashedPatternNode(theEnv,FactBinaryData(theEnv)->FactPatternArray[i].lastLevel,
+                                     &FactBinaryData(theEnv)->FactPatternArray[i],
+                                     FactBinaryData(theEnv)->FactPatternArray[i].networkTest->type,
+                                     FactBinaryData(theEnv)->FactPatternArray[i].networkTest->value);
+        }
+     }
+  }
+
+/*************************************************/
+/* UpdateFactPatterns: Bload refresh routine for */
+/*   the factPatternNode structure.              */
+/*************************************************/
+static void UpdateFactPatterns(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveFactPatternNode *bp;
+
+   bp = (struct bsaveFactPatternNode *) buf;
+
+   UpdatePatternNodeHeader(theEnv,&FactBinaryData(theEnv)->FactPatternArray[obji].header,&bp->header);
+
+   FactBinaryData(theEnv)->FactPatternArray[obji].bsaveID = 0L;
+   FactBinaryData(theEnv)->FactPatternArray[obji].whichField = bp->whichField;
+   FactBinaryData(theEnv)->FactPatternArray[obji].leaveFields = bp->leaveFields;
+   FactBinaryData(theEnv)->FactPatternArray[obji].whichSlot = bp->whichSlot;
+
+   FactBinaryData(theEnv)->FactPatternArray[obji].networkTest = HashedExpressionPointer(bp->networkTest);
+   FactBinaryData(theEnv)->FactPatternArray[obji].rightNode = BloadFactPatternPointer(bp->rightNode);
+   FactBinaryData(theEnv)->FactPatternArray[obji].nextLevel = BloadFactPatternPointer(bp->nextLevel);
+   FactBinaryData(theEnv)->FactPatternArray[obji].lastLevel = BloadFactPatternPointer(bp->lastLevel);
+   FactBinaryData(theEnv)->FactPatternArray[obji].leftNode  = BloadFactPatternPointer(bp->leftNode);
+  }
+
+/***************************************************/
+/* ClearBload:  Fact pattern network clear routine */
+/*   when a binary load is in effect.              */
+/***************************************************/
+static void ClearBload(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long i;
+
+   for (i = 0; i < FactBinaryData(theEnv)->NumberOfPatterns; i++)
+     {
+      if ((FactBinaryData(theEnv)->FactPatternArray[i].lastLevel != NULL) &&
+          (FactBinaryData(theEnv)->FactPatternArray[i].lastLevel->header.selector))
+        {
+         RemoveHashedPatternNode(theEnv,FactBinaryData(theEnv)->FactPatternArray[i].lastLevel,
+                                        &FactBinaryData(theEnv)->FactPatternArray[i],
+                                        FactBinaryData(theEnv)->FactPatternArray[i].networkTest->type,
+                                        FactBinaryData(theEnv)->FactPatternArray[i].networkTest->value);
+        }
+     }
+
+
+   space = FactBinaryData(theEnv)->NumberOfPatterns * sizeof(struct factPatternNode);
+   if (space != 0) genfree(theEnv,FactBinaryData(theEnv)->FactPatternArray,space);
+   FactBinaryData(theEnv)->NumberOfPatterns = 0;
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME) */
+
+
diff --git a/clips/factbin.h b/clips/factbin.h
new file mode 100755
index 000000000..becff7e0d
--- /dev/null
+++ b/clips/factbin.h
@@ -0,0 +1,56 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*            FACT BLOAD/BSAVE HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factbin
+
+#pragma once
+
+#define _H_factbin
+
+#include "factbld.h"
+
+#define FACTBIN_DATA 62
+
+struct factBinaryData
+  {
+   struct factPatternNode *FactPatternArray;
+   unsigned long NumberOfPatterns;
+  };
+
+#define FactBinaryData(theEnv) ((struct factBinaryData *) GetEnvironmentData(theEnv,FACTBIN_DATA))
+
+   void                           FactBinarySetup(Environment *);
+
+#define BsaveFactPatternIndex(patPtr) ((patPtr == NULL) ? ULONG_MAX : ((struct factPatternNode *) patPtr)->bsaveID)
+#define BloadFactPatternPointer(i) ((struct factPatternNode *) ((i == ULONG_MAX) ? NULL : &FactBinaryData(theEnv)->FactPatternArray[i]))
+
+#endif
+
diff --git a/clips/factbld.c b/clips/factbld.c
new file mode 100755
index 000000000..ce6bee586
--- /dev/null
+++ b/clips/factbld.c
@@ -0,0 +1,1035 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  12/07/17             */
+   /*                                                     */
+   /*                   FACT BUILD MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Given a new fact pattern, adds the pattern to    */
+/*   the pattern network of the associated deftemplate. Also */
+/*   contains routines for deleting a pattern from the fact  */
+/*   pattern network.                                        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed initial-fact support.                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "factcmp.h"
+#include "factgen.h"
+#include "factlhs.h"
+#include "factmch.h"
+#include "factmngr.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "reorder.h"
+#include "reteutil.h"
+#include "router.h"
+#include "tmpltdef.h"
+
+#include "factbld.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static struct factPatternNode    *FindPatternNode(struct factPatternNode *,struct lhsParseNode *,
+                                                  struct factPatternNode **,bool,bool);
+   static struct factPatternNode    *CreateNewPatternNode(Environment *,struct lhsParseNode *,struct factPatternNode *,
+                                                       struct factPatternNode *,bool,bool);
+   static void                       ClearPatternMatches(Environment *,struct factPatternNode *);
+   static void                       DetachFactPattern(Environment *,struct patternNodeHeader *);
+   static struct patternNodeHeader  *PlaceFactPattern(Environment *,struct lhsParseNode *);
+   static struct lhsParseNode       *RemoveUnneededSlots(Environment *,struct lhsParseNode *);
+   static void                       FindAndSetDeftemplatePatternNetwork(Environment *,struct factPatternNode *,struct factPatternNode *);
+#endif
+
+/*********************************************************/
+/* InitializeFactPatterns: Adds fact patterns to the set */
+/*   of patterns recognized by the rule pattern parsing  */
+/*   and pattern/join network integration routines.      */
+/*********************************************************/
+void InitializeFactPatterns(
+  Environment *theEnv)
+  {
+#if DEFRULE_CONSTRUCT
+   struct patternParser *newPtr;
+
+   InitializeFactReteFunctions(theEnv);
+
+   newPtr = get_struct(theEnv,patternParser);
+
+   newPtr->name = "facts";
+   newPtr->priority = 0;
+   newPtr->entityType = &FactData(theEnv)->FactInfo;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   newPtr->recognizeFunction = FactPatternParserFind;
+   newPtr->parseFunction = FactPatternParse;
+   newPtr->postAnalysisFunction = NULL;
+   newPtr->addPatternFunction = PlaceFactPattern;
+   newPtr->removePatternFunction = DetachFactPattern;
+   newPtr->genJNConstantFunction = NULL;
+   newPtr->replaceGetJNValueFunction = FactReplaceGetvar;
+   newPtr->genGetJNValueFunction = FactGenGetvar;
+   newPtr->genCompareJNValuesFunction = FactJNVariableComparison;
+   newPtr->genPNConstantFunction = FactGenPNConstant;
+   newPtr->replaceGetPNValueFunction = FactReplaceGetfield;
+   newPtr->genGetPNValueFunction = FactGenGetfield;
+   newPtr->genComparePNValuesFunction = FactPNVariableComparison;
+   newPtr->returnUserDataFunction = NULL;
+   newPtr->copyUserDataFunction = NULL;
+#else
+   newPtr->recognizeFunction = NULL;
+   newPtr->parseFunction = NULL;
+   newPtr->postAnalysisFunction = NULL;
+   newPtr->addPatternFunction = NULL;
+   newPtr->removePatternFunction = NULL;
+   newPtr->genJNConstantFunction = NULL;
+   newPtr->replaceGetJNValueFunction = NULL;
+   newPtr->genGetJNValueFunction = NULL;
+   newPtr->genCompareJNValuesFunction = NULL;
+   newPtr->genPNConstantFunction = NULL;
+   newPtr->replaceGetPNValueFunction = NULL;
+   newPtr->genGetPNValueFunction = NULL;
+   newPtr->genComparePNValuesFunction = NULL;
+   newPtr->returnUserDataFunction = NULL;
+   newPtr->copyUserDataFunction = NULL;
+#endif
+
+   newPtr->markIRPatternFunction = MarkFactPatternForIncrementalReset;
+   newPtr->incrementalResetFunction = FactsIncrementalReset;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+#if CONSTRUCT_COMPILER
+   newPtr->codeReferenceFunction = FactPatternNodeReference;
+#else
+   newPtr->codeReferenceFunction = NULL;
+#endif
+#else
+   newPtr->codeReferenceFunction = NULL;
+#endif
+
+   AddPatternParser(theEnv,newPtr);
+#endif
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/******************************************************************************/
+/* PlaceFactPattern: Integrates a fact pattern into the fact pattern network. */
+/******************************************************************************/
+static struct patternNodeHeader *PlaceFactPattern(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern)
+  {
+   struct lhsParseNode *tempPattern;
+   struct factPatternNode *currentLevel, *lastLevel;
+   struct factPatternNode *nodeBeforeMatch, *newNode = NULL;
+   bool endSlot;
+   unsigned int count;
+   const char *deftemplateName;
+
+   /*======================================================================*/
+   /* Get the name of the deftemplate associated with the pattern being    */
+   /* added (recall that the first field of any pattern must be a symbol). */
+   /*======================================================================*/
+
+   deftemplateName = thePattern->right->bottom->lexemeValue->contents;
+
+   /*=====================================================*/
+   /* Remove any slot tests that test only for existance. */
+   /*=====================================================*/
+
+   thePattern->right = RemoveUnneededSlots(theEnv,thePattern->right);
+
+   /*========================================================*/
+   /* If the constant test for the relation name is the only */
+   /* pattern network test and there are no other network    */
+   /* tests, then remove the test, but keep the node since   */
+   /* there must be a link from the fact pattern network to  */
+   /* the join network. Otherwise, remove the test for the   */
+   /* relation name since this test has already been done    */
+   /* before entering the pattern network (since each        */
+   /* deftemplate has its own pattern network).              */
+   /*========================================================*/
+
+   if (thePattern->right->right == NULL)
+     {
+      ReturnExpression(theEnv,thePattern->right->networkTest);
+      ReturnExpression(theEnv,thePattern->right->constantSelector);
+      ReturnExpression(theEnv,thePattern->right->constantValue);
+      thePattern->right->networkTest = NULL;
+      thePattern->right->constantSelector = NULL;
+      thePattern->right->constantValue = NULL;
+     }
+   else
+     {
+      tempPattern = thePattern->right;
+      thePattern->right = thePattern->right->right;
+      tempPattern->right = NULL;
+	  ReturnLHSParseNodes(theEnv,tempPattern);
+     }
+
+   /*====================================================*/
+   /* Get the expression for hashing in the alpha memory */
+   /* and attach it to the last node of the pattern.     */
+   /*====================================================*/
+
+   tempPattern = thePattern->right;
+   while (tempPattern->right != NULL)
+     { tempPattern = tempPattern->right; }
+
+   if ((tempPattern->multifieldSlot) && (tempPattern->bottom != NULL))
+     {
+      tempPattern = tempPattern->bottom;
+
+      while (tempPattern->right != NULL)
+        { tempPattern = tempPattern->right; }
+     }
+
+   tempPattern->rightHash = thePattern->rightHash;
+   thePattern->rightHash = NULL;
+
+   tempPattern = NULL;
+
+   /*============================================================*/
+   /* Get a pointer to the deftemplate data structure associated */
+   /* with the pattern (use the deftemplate name extracted from  */
+   /* the first field of the pattern).                           */
+   /*============================================================*/
+
+   FactData(theEnv)->CurrentDeftemplate = (Deftemplate *)
+                        FindImportedConstruct(theEnv,"deftemplate",NULL,
+                                              deftemplateName,&count,
+                                              true,NULL);
+
+   /*================================================*/
+   /* Initialize some pointers to indicate where the */
+   /* pattern is being added to the pattern network. */
+   /*================================================*/
+
+   currentLevel = FactData(theEnv)->CurrentDeftemplate->patternNetwork;
+   lastLevel = NULL;
+   thePattern = thePattern->right;
+
+   /*===========================================*/
+   /* Loop until all fields in the pattern have */
+   /* been added to the pattern network.        */
+   /*===========================================*/
+
+   while (thePattern != NULL)
+     {
+      /*===========================================================*/
+      /* If a multifield slot is being processed, then process the */
+      /* pattern nodes attached to the multifield pattern node.    */
+      /*===========================================================*/
+
+      if (thePattern->multifieldSlot)
+        {
+         tempPattern = thePattern;
+         thePattern = thePattern->bottom;
+        }
+
+      /*============================================*/
+      /* Determine if the last pattern field within */
+      /* a multifield slot is being processed.      */
+      /*============================================*/
+
+      if ((thePattern->right == NULL) && (tempPattern != NULL))
+        { endSlot = true; }
+      else
+        { endSlot = false; }
+
+      /*========================================*/
+      /* Is there a node in the pattern network */
+      /* that can be reused (shared)?           */
+      /*========================================*/
+
+      newNode = FindPatternNode(currentLevel,thePattern,&nodeBeforeMatch,endSlot,false);
+
+      /*================================================*/
+      /* If the pattern node cannot be shared, then add */
+      /* a new pattern node to the pattern network.     */
+      /*================================================*/
+
+      if (newNode == NULL)
+        { newNode = CreateNewPatternNode(theEnv,thePattern,nodeBeforeMatch,lastLevel,endSlot,false); }
+
+      if (thePattern->constantSelector != NULL)
+        {
+         currentLevel = newNode->nextLevel;
+         lastLevel = newNode;
+         newNode = FindPatternNode(currentLevel,thePattern,&nodeBeforeMatch,endSlot,true);
+
+         if (newNode == NULL)
+           { newNode = CreateNewPatternNode(theEnv,thePattern,nodeBeforeMatch,lastLevel,endSlot,true); }
+        }
+
+      /*===========================================================*/
+      /* Move on to the next field in the new pattern to be added. */
+      /*===========================================================*/
+
+      if ((thePattern->right == NULL) && (tempPattern != NULL))
+        {
+         thePattern = tempPattern;
+         tempPattern = NULL;
+        }
+
+      thePattern = thePattern->right;
+
+      /*==========================================================*/
+      /* If there are no more pattern nodes to be added to the    */
+      /* pattern network, then mark the last pattern node added   */
+      /* as a stop node (i.e. if you get to this node and the     */
+      /* network test succeeds, then a pattern has been matched). */
+      /*==========================================================*/
+
+      if (thePattern == NULL) newNode->header.stopNode = true;
+
+      /*================================================*/
+      /* Update the pointers which indicate where we're */
+      /* trying to add the new pattern to the currently */
+      /* existing pattern network.                      */
+      /*================================================*/
+
+      lastLevel = newNode;
+      currentLevel = newNode->nextLevel;
+     }
+
+   /*==================================================*/
+   /* Return the leaf node of the newly added pattern. */
+   /*==================================================*/
+
+   return((struct patternNodeHeader *) newNode);
+  }
+
+/*************************************************************/
+/* FindPatternNode: Looks for a pattern node at a specified  */
+/*  level in the pattern network that can be reused (shared) */
+/*  with a pattern field being added to the pattern network. */
+/*************************************************************/
+static struct factPatternNode *FindPatternNode(
+  struct factPatternNode *listOfNodes,
+  struct lhsParseNode *thePattern,
+  struct factPatternNode **nodeBeforeMatch,
+  bool endSlot,
+  bool constantSelector)
+  {
+   struct expr *compareTest;
+   *nodeBeforeMatch = NULL;
+
+   if (constantSelector)
+     { compareTest = thePattern->constantValue; }
+   else if (thePattern->constantSelector != NULL)
+     { compareTest = thePattern->constantSelector; }
+   else
+     { compareTest = thePattern->networkTest; }
+
+   /*==========================================================*/
+   /* Loop through the nodes at the given level in the pattern */
+   /* network looking for a node that can be reused (shared)?  */
+   /*==========================================================*/
+
+   while (listOfNodes != NULL)
+     {
+      /*==========================================================*/
+      /* If the type of the pattern node and the expression being */
+      /* tested by the pattern node are the same as the type and  */
+      /* expression for the pattern field being added, then       */
+      /* return the pattern node because it can be shared with    */
+      /* the pattern field being added.                           */
+      /*==========================================================*/
+
+      if ((thePattern->pnType == SF_WILDCARD_NODE) || (thePattern->pnType == SF_VARIABLE_NODE))
+        {
+         if ((listOfNodes->header.singlefieldNode) &&
+             (listOfNodes->header.endSlot == endSlot) &&
+             (listOfNodes->whichField == thePattern->index) &&
+             (listOfNodes->whichSlot == (thePattern->slotNumber - 1)) &&
+             IdenticalExpression(listOfNodes->networkTest,compareTest) &&
+             IdenticalExpression(listOfNodes->header.rightHash,thePattern->rightHash))
+           { return(listOfNodes); }
+        }
+      else if ((thePattern->pnType == MF_WILDCARD_NODE) || (thePattern->pnType == MF_VARIABLE_NODE))
+        {
+         if ((listOfNodes->header.multifieldNode) &&
+             (listOfNodes->header.endSlot == endSlot) &&
+             (listOfNodes->leaveFields == thePattern->singleFieldsAfter) &&
+             (listOfNodes->whichField == thePattern->index) &&
+             (listOfNodes->whichSlot == (thePattern->slotNumber - 1)) &&
+             IdenticalExpression(listOfNodes->networkTest,compareTest) &&
+             IdenticalExpression(listOfNodes->header.rightHash,thePattern->rightHash))
+           { return(listOfNodes); }
+        }
+
+      /*==================================*/
+      /* Move on to the next node at this */
+      /* level in the pattern network.    */
+      /*==================================*/
+
+      *nodeBeforeMatch = listOfNodes;
+      listOfNodes = listOfNodes->rightNode;
+     }
+
+   /*==============================================*/
+   /* A shareable pattern node could not be found. */
+   /*==============================================*/
+
+   return NULL;
+  }
+
+/*************************************************************/
+/* RemoveUnneededSlots: Removes fact pattern nodes that have */
+/*   no effect on pattern matching. For example, given the   */
+/*   following deftemplate and a pattern using it,           */
+/*                                                           */
+/*   (deftemplate foo (slot x) (slot y))                     */
+/*                                                           */
+/*   (foo (x ?x) (y ?y))                                     */
+/*                                                           */
+/*   The x and y slot pattern nodes can be discarded since   */
+/*   all foo facts will have these two slots in the fact     */
+/*   data structure used to store them.                      */
+/*************************************************************/
+static struct lhsParseNode *RemoveUnneededSlots(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern)
+  {
+   struct lhsParseNode *tempPattern = thePattern;
+   struct lhsParseNode *lastPattern = NULL, *head = thePattern;
+   struct expr *theTest;
+
+   while (tempPattern != NULL)
+     {
+      /*=============================================================*/
+      /* A single field slot that has no pattern network expression  */
+      /* associated with it can be removed (i.e. any value contained */
+      /* in this slot will satisfy the pattern being matched).       */
+      /*=============================================================*/
+
+      if (((tempPattern->pnType == SF_WILDCARD_NODE) || (tempPattern->pnType == SF_VARIABLE_NODE)) &&
+          (tempPattern->networkTest == NULL))
+        {
+         if (lastPattern != NULL) lastPattern->right = tempPattern->right;
+         else head = tempPattern->right;
+
+         tempPattern->right = NULL;
+         ReturnLHSParseNodes(theEnv,tempPattern);
+
+         if (lastPattern != NULL) tempPattern = lastPattern->right;
+         else tempPattern = head;
+        }
+
+      /*=======================================================*/
+      /* A multifield variable or wildcard within a multifield */
+      /* slot can be removed if there are no other multifield  */
+      /* variables or wildcards contained in the same slot     */
+      /* (and the multifield has no expressions which must be  */
+      /* evaluated in the fact pattern network).               */
+      /*=======================================================*/
+
+      else if (((tempPattern->pnType == MF_WILDCARD_NODE) || (tempPattern->pnType == MF_VARIABLE_NODE)) &&
+               (tempPattern->multifieldSlot == false) &&
+               (tempPattern->networkTest == NULL) &&
+               (tempPattern->multiFieldsBefore == 0) &&
+               (tempPattern->multiFieldsAfter == 0))
+        {
+         if (lastPattern != NULL) lastPattern->right = tempPattern->right;
+         else head = tempPattern->right;
+
+         tempPattern->right = NULL;
+         ReturnLHSParseNodes(theEnv,tempPattern);
+
+         if (lastPattern != NULL) tempPattern = lastPattern->right;
+         else tempPattern = head;
+        }
+
+      /*==================================================================*/
+      /* A multifield wildcard or variable contained in a multifield slot */
+      /* that contains no other multifield wildcards or variables, but    */
+      /* does have an expression that must be evaluated, can be changed   */
+      /* to a single field pattern node with the same expression.         */
+      /*==================================================================*/
+
+      else if (((tempPattern->pnType == MF_WILDCARD_NODE) || (tempPattern->pnType == MF_VARIABLE_NODE)) &&
+               (tempPattern->multifieldSlot == false) &&
+               (tempPattern->networkTest != NULL) &&
+               (tempPattern->multiFieldsBefore == 0) &&
+               (tempPattern->multiFieldsAfter == 0))
+        {
+         tempPattern->pnType = SF_WILDCARD_NODE;
+         lastPattern = tempPattern;
+         tempPattern = tempPattern->right;
+        }
+
+      /*=========================================================*/
+      /* If we're dealing with a multifield slot with no slot    */
+      /* restrictions, then treat the multfield slot as a single */
+      /* field slot, but attach a test which verifies that the   */
+      /* slot contains a zero length multifield value.           */
+      /*=========================================================*/
+
+      else if ((tempPattern->pnType == MF_WILDCARD_NODE) &&
+               (tempPattern->multifieldSlot == true) &&
+               (tempPattern->bottom == NULL))
+        {
+         tempPattern->pnType = SF_WILDCARD_NODE;
+         tempPattern->networkTest = FactGenCheckZeroLength(theEnv,tempPattern->slotNumber);
+         tempPattern->multifieldSlot = false;
+         lastPattern = tempPattern;
+         tempPattern = tempPattern->right;
+        }
+
+      /*===================================================*/
+      /* Recursively call RemoveUnneededSlots for the slot */
+      /* restrictions contained within a multifield slot.  */
+      /*===================================================*/
+
+      else if ((tempPattern->pnType == MF_WILDCARD_NODE) &&
+               (tempPattern->multifieldSlot == true))
+        {
+         /*=======================================================*/
+         /* Add an expression to the first pattern restriction in */
+         /* the multifield slot that determines whether or not    */
+         /* the fact's slot value contains the minimum number of  */
+         /* required fields to satisfy the pattern restrictions   */
+         /* for this slot. The length check is place before any   */
+         /* other tests, so that preceeding checks do not have to */
+         /* determine if there are enough fields in the slot to   */
+         /* safely retrieve a value.                              */
+         /*=======================================================*/
+
+         theTest = FactGenCheckLength(theEnv,tempPattern->bottom);
+         if (tempPattern->bottom->constantSelector != NULL)
+           { tempPattern->bottom->constantSelector->nextArg = CopyExpression(theEnv,theTest); }
+         theTest = CombineExpressions(theEnv,theTest,tempPattern->bottom->networkTest);
+         tempPattern->bottom->networkTest = theTest;
+
+         /*=========================================================*/
+         /* Remove any unneeded pattern restrictions from the slot. */
+         /*=========================================================*/
+
+         tempPattern->bottom = RemoveUnneededSlots(theEnv,tempPattern->bottom);
+
+         /*===========================================================*/
+         /* If the slot no longer contains any restrictions, then the */
+         /* multifield slot can be completely removed. In any case,   */
+         /* move on to the next slot to be examined for removal.      */
+         /*===========================================================*/
+
+         if (tempPattern->bottom == NULL)
+           {
+            if (lastPattern != NULL) lastPattern->right = tempPattern->right;
+            else head = tempPattern->right;
+
+            tempPattern->right = NULL;
+            ReturnLHSParseNodes(theEnv,tempPattern);
+
+            if (lastPattern != NULL) tempPattern = lastPattern->right;
+            else tempPattern = head;
+           }
+         else
+           {
+            lastPattern = tempPattern;
+            tempPattern = tempPattern->right;
+           }
+        }
+
+      /*=======================================================*/
+      /* If none of the other tests for removing slots or slot */
+      /* restrictions apply, then move on to the next slot or  */
+      /* slot restriction to be tested.                        */
+      /*=======================================================*/
+
+      else
+        {
+         lastPattern = tempPattern;
+         tempPattern = tempPattern->right;
+        }
+     }
+
+   /*======================================*/
+   /* Return the pattern with unused slots */
+   /* and slot restrictions removed.       */
+   /*======================================*/
+
+   return(head);
+  }
+
+/****************************************************/
+/* CreateNewPatternNode: Creates a new pattern node */
+/*   and initializes all of its values.             */
+/****************************************************/
+static struct factPatternNode *CreateNewPatternNode(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern,
+  struct factPatternNode *nodeBeforeMatch,
+  struct factPatternNode *upperLevel,
+  bool endSlot,
+  bool constantSelector)
+  {
+   struct factPatternNode *newNode;
+
+   /*========================================*/
+   /* Create the pattern node and initialize */
+   /* its slots to the default values.       */
+   /*========================================*/
+
+   newNode = get_struct(theEnv,factPatternNode);
+   newNode->nextLevel = NULL;
+   newNode->rightNode = NULL;
+   newNode->leftNode = NULL;
+   newNode->leaveFields = thePattern->singleFieldsAfter;
+   InitializePatternHeader(theEnv,(struct patternNodeHeader *) &newNode->header);
+
+   if (thePattern->index > 0)
+     { newNode->whichField = thePattern->index; }
+   else newNode->whichField = 0;
+
+   if (thePattern->slotNumber != UNSPECIFIED_SLOT)
+     { newNode->whichSlot = thePattern->slotNumber - 1; }
+   else
+     { newNode->whichSlot = newNode->whichField; }
+
+   if ((thePattern->constantSelector != NULL) && (! constantSelector))
+     { newNode->header.selector = true; }
+
+   /*=============================================================*/
+   /* Set the slot values which indicate whether the pattern node */
+   /* is a single-field, multifield, or end-of-pattern node.      */
+   /*=============================================================*/
+
+   if ((thePattern->pnType == SF_WILDCARD_NODE) || (thePattern->pnType == SF_VARIABLE_NODE))
+     { newNode->header.singlefieldNode = true; }
+   else if ((thePattern->pnType == MF_WILDCARD_NODE) || (thePattern->pnType == MF_VARIABLE_NODE))
+     { newNode->header.multifieldNode = true; }
+   newNode->header.endSlot = endSlot;
+
+   /*===========================================================*/
+   /* Install the expression associated with this pattern node. */
+   /*===========================================================*/
+
+   if (constantSelector)
+     { newNode->networkTest = AddHashedExpression(theEnv,thePattern->constantValue); }
+   else if (thePattern->constantSelector != NULL)
+     { newNode->networkTest = AddHashedExpression(theEnv,thePattern->constantSelector); }
+   else
+     { newNode->networkTest = AddHashedExpression(theEnv,thePattern->networkTest); }
+
+   /*==========================================*/
+   /* Add the expression used for adding alpha */
+   /* matches to the alpha memory.             */
+   /*==========================================*/
+
+   newNode->header.rightHash = AddHashedExpression(theEnv,thePattern->rightHash);
+
+   /*===============================================*/
+   /* Set the upper level pointer for the new node. */
+   /*===============================================*/
+
+   newNode->lastLevel = upperLevel;
+
+   if ((upperLevel != NULL) && (upperLevel->header.selector))
+     { AddHashedPatternNode(theEnv,upperLevel,newNode,newNode->networkTest->type,newNode->networkTest->value); }
+
+   /*======================================================*/
+   /* If there are no nodes on this level, then attach the */
+   /* new node to the child pointer of the upper level.    */
+   /*======================================================*/
+
+   if (nodeBeforeMatch == NULL)
+     {
+      if (upperLevel == NULL) FactData(theEnv)->CurrentDeftemplate->patternNetwork = newNode;
+      else upperLevel->nextLevel = newNode;
+      return(newNode);
+     }
+
+   /*=====================================================*/
+   /* If there is an upper level above the new node, then */
+   /* place the new node as the first child in the upper  */
+   /* level's nextLevel (child) link.                     */
+   /*=====================================================*/
+
+   if (upperLevel != NULL)
+     {
+      newNode->rightNode = upperLevel->nextLevel;
+      if (upperLevel->nextLevel != NULL)
+        { upperLevel->nextLevel->leftNode = newNode; }
+      upperLevel->nextLevel = newNode;
+      return(newNode);
+     }
+
+   /*=====================================================*/
+   /* Since there is no upper level above the new node,   */
+   /* (i.e. the new node is being added to the highest    */
+   /* level in the pattern network), the new node becomes */
+   /* the first node visited in the pattern network.      */
+   /*=====================================================*/
+
+   newNode->rightNode = FactData(theEnv)->CurrentDeftemplate->patternNetwork;
+   if (FactData(theEnv)->CurrentDeftemplate->patternNetwork != NULL)
+     { FactData(theEnv)->CurrentDeftemplate->patternNetwork->leftNode = newNode; }
+
+   FactData(theEnv)->CurrentDeftemplate->patternNetwork = newNode;
+   return(newNode);
+  }
+
+/*************************************************************/
+/* DetachFactPattern: Removes a pattern node and all of its  */
+/*   parent nodes from the pattern network. Nodes are only   */
+/*   removed if they are no longer shared (i.e. a pattern    */
+/*   node that has more than one child node is shared). A    */
+/*   pattern from a rule is typically removed by removing    */
+/*   the bottom most pattern node used by the pattern and    */
+/*   then removing any parent nodes which are not shared by  */
+/*   other patterns.                                         */
+/*                                                           */
+/*   Example:                                                */
+/*     Patterns (a b c d) and (a b e f) would be represented */
+/*     by the pattern net shown on the left.  If (a b c d)   */
+/*     was detached, the resultant pattern net would be the  */
+/*     one shown on the right.                               */
+/*                                                           */
+/*           a                  a                            */
+/*           |                  |                            */
+/*           b                  b                            */
+/*           |                  |                            */
+/*           c--e               e                            */
+/*           |  |               |                            */
+/*           d  f               f                            */
+/*                                                           */
+/*************************************************************/
+static void DetachFactPattern(
+  Environment *theEnv,
+  struct patternNodeHeader *thePattern)
+  {
+   struct factPatternNode *patternPtr;
+   struct factPatternNode *upperLevel;
+
+   /*=====================================================*/
+   /* Get rid of any matches stored in the alpha memory.  */
+   /*=====================================================*/
+
+   patternPtr = (struct factPatternNode *) thePattern;
+   ClearPatternMatches(theEnv,patternPtr);
+
+   /*=======================================================*/
+   /* If there are no joins entered from this pattern, then */
+   /* the pattern node is no longer a stop node. Also if    */
+   /* the pattern has a next level pointer, then it can     */
+   /* not be removed since other patterns make use of it.   */
+   /*=======================================================*/
+
+   if (patternPtr->header.entryJoin == NULL) patternPtr->header.stopNode = false;
+   if (patternPtr->nextLevel != NULL) return;
+
+   /*==============================================================*/
+   /* Loop until all appropriate pattern nodes have been detached. */
+   /*==============================================================*/
+
+   upperLevel = patternPtr;
+   while (upperLevel != NULL)
+     {
+      if ((upperLevel->leftNode == NULL) &&
+          (upperLevel->rightNode == NULL))
+        {
+         /*===============================================*/
+         /* Pattern node is the only node on this level.  */
+         /* Remove it and continue detaching other nodes  */
+         /* above this one, because no other patterns are */
+         /* dependent upon this node.                     */
+         /*===============================================*/
+
+         patternPtr = upperLevel;
+         upperLevel = patternPtr->lastLevel;
+
+         if (upperLevel == NULL)
+           { FindAndSetDeftemplatePatternNetwork(theEnv,patternPtr,NULL); }
+         else
+           {
+            if (upperLevel->header.selector)
+              { RemoveHashedPatternNode(theEnv,upperLevel,patternPtr,patternPtr->networkTest->type,patternPtr->networkTest->value); }
+
+            upperLevel->nextLevel = NULL;
+            if (upperLevel->header.stopNode) upperLevel = NULL;
+           }
+
+         RemoveHashedExpression(theEnv,patternPtr->networkTest);
+         RemoveHashedExpression(theEnv,patternPtr->header.rightHash);
+         rtn_struct(theEnv,factPatternNode,patternPtr);
+        }
+      else if (upperLevel->leftNode != NULL)
+        {
+         /*====================================================*/
+         /* Pattern node has another pattern node which must   */
+         /* be checked preceding it.  Remove the pattern node, */
+         /* but do not detach any nodes above this one.        */
+         /*====================================================*/
+
+         patternPtr = upperLevel;
+
+         if ((patternPtr->lastLevel != NULL) &&
+             (patternPtr->lastLevel->header.selector))
+           { RemoveHashedPatternNode(theEnv,patternPtr->lastLevel,patternPtr,patternPtr->networkTest->type,patternPtr->networkTest->value); }
+
+         upperLevel->leftNode->rightNode = upperLevel->rightNode;
+         if (upperLevel->rightNode != NULL)
+           { upperLevel->rightNode->leftNode = upperLevel->leftNode; }
+
+         RemoveHashedExpression(theEnv,patternPtr->networkTest);
+         RemoveHashedExpression(theEnv,patternPtr->header.rightHash);
+         rtn_struct(theEnv,factPatternNode,patternPtr);
+         upperLevel = NULL;
+        }
+      else
+        {
+         /*====================================================*/
+         /* Pattern node has no pattern node preceding it, but */
+         /* does have one succeeding it. Remove the pattern    */
+         /* node, but do not detach any nodes above this one.  */
+         /*====================================================*/
+
+         patternPtr = upperLevel;
+         upperLevel = upperLevel->lastLevel;
+         if (upperLevel == NULL)
+           { FindAndSetDeftemplatePatternNetwork(theEnv,patternPtr,patternPtr->rightNode); }
+         else
+           {
+           if (upperLevel->header.selector)
+              { RemoveHashedPatternNode(theEnv,upperLevel,patternPtr,patternPtr->networkTest->type,patternPtr->networkTest->value); }
+
+            upperLevel->nextLevel = patternPtr->rightNode;
+           }
+         patternPtr->rightNode->leftNode = NULL;
+
+         RemoveHashedExpression(theEnv,patternPtr->networkTest);
+         RemoveHashedExpression(theEnv,patternPtr->header.rightHash);
+         rtn_struct(theEnv,factPatternNode,patternPtr);
+         upperLevel = NULL;
+        }
+     }
+  }
+
+#endif
+
+/**************************************************************/
+/* DestroyFactPatternNetwork: Deallocates the data structures */
+/*   associated with a fact pattern network.                  */
+/**************************************************************/
+void DestroyFactPatternNetwork(
+  Environment *theEnv,
+  struct factPatternNode *thePattern)
+  {
+   struct factPatternNode *patternPtr;
+
+   if (thePattern == NULL) return;
+
+   while (thePattern != NULL)
+     {
+      patternPtr = thePattern->rightNode;
+
+      DestroyFactPatternNetwork(theEnv,thePattern->nextLevel);
+
+      DestroyAlphaMemory(theEnv,&thePattern->header,false);
+
+      if ((thePattern->lastLevel != NULL) &&
+          (thePattern->lastLevel->header.selector))
+        { RemoveHashedPatternNode(theEnv,thePattern->lastLevel,thePattern,thePattern->networkTest->type,thePattern->networkTest->value); }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+      rtn_struct(theEnv,factPatternNode,thePattern);
+#endif
+
+      thePattern = patternPtr;
+     }
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/***********************************************************/
+/* FindAndSetDeftemplatePatternNetwork: When a deftemplate */
+/*   pattern is detached from the fact pattern network, it */
+/*   is not possible to directly detach the link from the  */
+/*   deftemplate to the pattern network (it is a one way   */
+/*   link). Therefore if the top most pointer to a         */
+/*   deftemplates pattern network must be changed, it is   */
+/*   necessary to search the list of deftemplates to find  */
+/*   the appropriate one to modify.                        */
+/***********************************************************/
+static void FindAndSetDeftemplatePatternNetwork(
+  Environment *theEnv,
+  struct factPatternNode *rootNode,
+  struct factPatternNode *newRootNode)
+  {
+   Deftemplate *theDeftemplate;
+   Defmodule *theModule;
+
+   /*=======================================================*/
+   /* Save the current module since we will be changing it. */
+   /*=======================================================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*=======================================================*/
+   /* Loop through every module looking for the deftemplate */
+   /* associated with the specified root node.              */
+   /*=======================================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*======================================================*/
+      /* Set the current module to the module being examined. */
+      /*======================================================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*======================================================*/
+      /* Loop through every deftemplate in the current module */
+      /* searching for the deftemplate associated with the    */
+      /* specified root node.                                 */
+      /*======================================================*/
+
+      for (theDeftemplate = GetNextDeftemplate(theEnv,NULL);
+           theDeftemplate != NULL;
+           theDeftemplate = GetNextDeftemplate(theEnv,theDeftemplate))
+        {
+         /*===========================================================*/
+         /* When the associated deftemplate is found, change its root */
+         /* node from the current value to the new value. Restore the */
+         /* current module before leaving this routine.               */
+         /*===========================================================*/
+
+         if (theDeftemplate->patternNetwork == rootNode)
+           {
+            RestoreCurrentModule(theEnv);
+            theDeftemplate->patternNetwork = newRootNode;
+            return;
+           }
+        }
+     }
+
+   /*========================================================*/
+   /* If the deftemplate wasn't found, then we're presumably */
+   /* we're in the the middle of a clear and the deftemplate */
+   /* has already been deleted so there's no need to update  */
+   /* the links to the fact pattern network.                 */
+   /*========================================================*/
+
+   RestoreCurrentModule(theEnv);
+  }
+
+/***************************************************************/
+/* ClearPatternMatches: Clears the fact list of all pointers   */
+/*   which point to a specific pattern.  The pointers are used */
+/*   to remember which patterns were matched by a fact to      */
+/*   make retraction easier.  When a rule is excised, the      */
+/*   pointers need to be removed.                              */
+/***************************************************************/
+static void ClearPatternMatches(
+  Environment *theEnv,
+  struct factPatternNode *patternPtr)
+  {
+   Fact *theFact;
+   struct patternMatch *lastMatch, *theMatch;
+
+   /*===========================================*/
+   /* Loop through every fact in the fact list. */
+   /*===========================================*/
+
+   for (theFact = GetNextFact(theEnv,NULL);
+        theFact != NULL;
+        theFact = GetNextFact(theEnv,theFact))
+     {
+      /*========================================*/
+      /* Loop through every match for the fact. */
+      /*========================================*/
+
+      lastMatch = NULL;
+      theMatch = (struct patternMatch *) theFact->list;
+
+      while (theMatch != NULL)
+        {
+         /*================================================*/
+         /* If the match is for the pattern being deleted, */
+         /* then remove the match.                         */
+         /*================================================*/
+
+         if (theMatch->matchingPattern == (struct patternNodeHeader *) patternPtr)
+           {
+            if (lastMatch == NULL)
+              {
+               /*=====================================*/
+               /* Remove the first match of the fact. */
+               /*=====================================*/
+
+               theFact->list = theMatch->next;
+               rtn_struct(theEnv,patternMatch,theMatch);
+               theMatch = (struct patternMatch *) theFact->list;
+              }
+            else
+             {
+               /*===================================*/
+               /* Remove a match for the fact which */
+               /* follows the first match.          */
+               /*===================================*/
+
+              lastMatch->next = theMatch->next;
+              rtn_struct(theEnv,patternMatch,theMatch);
+              theMatch = lastMatch->next;
+             }
+           }
+
+         /*====================================================*/
+         /* If the match is not for the pattern being deleted, */
+         /* then move on to the next match for the fact.       */
+         /*====================================================*/
+
+         else
+          {
+           lastMatch = theMatch;
+           theMatch = theMatch->next;
+          }
+       }
+    }
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT */
+
+
+
diff --git a/clips/factbld.h b/clips/factbld.h
new file mode 100755
index 000000000..bfb8cf195
--- /dev/null
+++ b/clips/factbld.h
@@ -0,0 +1,61 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                FACT BUILD HEADER FILE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factbld
+
+#pragma once
+
+#define _H_factbld
+
+struct factPatternNode;
+
+#include "network.h"
+#include "expressn.h"
+
+struct factPatternNode
+  {
+   struct patternNodeHeader header;
+   unsigned long bsaveID;
+   unsigned short whichField; // TBD seems to be 1 based rather than 0 based
+   unsigned short whichSlot;
+   unsigned short leaveFields;
+   struct expr *networkTest;
+   struct factPatternNode *nextLevel;
+   struct factPatternNode *lastLevel;
+   struct factPatternNode *leftNode;
+   struct factPatternNode *rightNode;
+  };
+
+   void                           InitializeFactPatterns(Environment *);
+   void                           DestroyFactPatternNetwork(Environment *,struct factPatternNode *);
+
+#endif /* _H_factbld */
diff --git a/clips/factcmp.c b/clips/factcmp.c
new file mode 100755
index 000000000..ab7f0523c
--- /dev/null
+++ b/clips/factcmp.c
@@ -0,0 +1,386 @@
+
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*     FACT PATTERN NETWORK CONSTRUCTS-TO-C MODULE     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for the   */
+/*    fact pattern network.                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && (! RUN_TIME) && DEFTEMPLATE_CONSTRUCT && CONSTRUCT_COMPILER
+
+#define FactPrefix() ArbitraryPrefix(FactData(theEnv)->FactCodeItem,0)
+
+#include <stdio.h>
+
+#include "factbld.h"
+#include "factmngr.h"
+#include "conscomp.h"
+#include "factcmp.h"
+#include "tmpltdef.h"
+#include "envrnmnt.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    PatternNetworkToCode(Environment *,const char *,const char *,char *,
+                                                       unsigned int,FILE *,unsigned int,unsigned int);
+   static void                    BeforePatternNetworkToCode(Environment *);
+   static struct factPatternNode *GetNextPatternNode(struct factPatternNode *);
+   static void                    CloseNetworkFiles(Environment *,FILE *,unsigned int);
+   static void                    PatternNodeToCode(Environment *,FILE *,struct factPatternNode *,unsigned int,unsigned int);
+
+/**************************************************************/
+/* FactPatternsCompilerSetup: Initializes the constructs-to-c */
+/*   command for use with the fact pattern network.           */
+/**************************************************************/
+void FactPatternsCompilerSetup(
+  Environment *theEnv)
+  {
+   FactData(theEnv)->FactCodeItem = AddCodeGeneratorItem(theEnv,"facts",0,BeforePatternNetworkToCode,
+                                       NULL,PatternNetworkToCode,1);
+  }
+
+/****************************************************************/
+/* BeforePatternNetworkToCode: Assigns each pattern node with a */
+/*   unique ID which will be used for pointer references when   */
+/*   the data structures are written to a file as C code        */
+/****************************************************************/
+static void BeforePatternNetworkToCode(
+  Environment *theEnv)
+  {
+   unsigned int whichPattern = 0;
+   unsigned int whichDeftemplate = 0;
+   Defmodule *theModule;
+   Deftemplate *theDeftemplate;
+   struct factPatternNode *thePattern;
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*=========================*/
+      /* Set the current module. */
+      /*=========================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*======================================================*/
+      /* Loop through each deftemplate in the current module. */
+      /*======================================================*/
+
+      for (theDeftemplate = GetNextDeftemplate(theEnv,NULL);
+           theDeftemplate != NULL;
+           theDeftemplate = GetNextDeftemplate(theEnv,theDeftemplate))
+        {
+         /*=================================================*/
+         /* Assign each pattern node in the pattern network */
+         /* for the deftemplate a unique integer ID.        */
+         /*=================================================*/
+
+         theDeftemplate->header.bsaveID = whichDeftemplate++;
+         for (thePattern = theDeftemplate->patternNetwork;
+              thePattern != NULL;
+              thePattern = GetNextPatternNode(thePattern))
+           { thePattern->bsaveID = whichPattern++; }
+        }
+     }
+  }
+
+/********************************************************************/
+/* GetNextPatternNode: Returns the next node in a pattern network   */
+/*   tree. The next node is computed using a depth first traversal. */
+/********************************************************************/
+static struct factPatternNode *GetNextPatternNode(
+  struct factPatternNode *thePattern)
+  {
+   /*=========================================*/
+   /* If it's possible to go deeper into the  */
+   /* tree, then move down to the next level. */
+   /*=========================================*/
+
+   if (thePattern->nextLevel != NULL) return(thePattern->nextLevel);
+
+   /*========================================*/
+   /* Keep backing up toward the root of the */
+   /* tree until a side branch can be taken. */
+   /*========================================*/
+
+   while (thePattern->rightNode == NULL)
+     {
+      /*========================================*/
+      /* Back up to check the next side branch. */
+      /*========================================*/
+
+      thePattern = thePattern->lastLevel;
+
+      /*======================================*/
+      /* If we branched up from the root, the */
+      /* entire tree has been traversed.      */
+      /*======================================*/
+
+      if (thePattern == NULL) return NULL;
+     }
+
+   /*==================================*/
+   /* Move on to the next side branch. */
+   /*==================================*/
+
+   return(thePattern->rightNode);
+  }
+
+/********************************************************************/
+/* PatternNetworkToCode: Produces the fact pattern network code for */
+/*   a run-time module created using the constructs-to-c function.  */
+/********************************************************************/
+static bool PatternNetworkToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int fileCount = 1;
+   Defmodule *theModule;
+   Deftemplate *theTemplate;
+   struct factPatternNode *thePatternNode;
+   unsigned int networkArrayCount = 0, networkArrayVersion = 1;
+   FILE *networkFile = NULL;
+
+   /*===========================================================*/
+   /* Include the appropriate fact pattern network header file. */
+   /*===========================================================*/
+
+   fprintf(headerFP,"#include \"factbld.h\"\n");
+
+   /*===============================*/
+   /* Loop through all the modules. */
+   /*===============================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*=========================*/
+      /* Set the current module. */
+      /*=========================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*======================================*/
+      /* Loop through all of the deftemplates */
+      /* in the current module.               */
+      /*======================================*/
+
+      for (theTemplate = GetNextDeftemplate(theEnv,NULL);
+           theTemplate != NULL;
+           theTemplate = GetNextDeftemplate(theEnv,theTemplate))
+        {
+         /*======================================================*/
+         /* Loop through each pattern node in the deftemplate's  */
+         /* pattern network writing its C code representation to */
+         /* the file as it is traversed.                         */
+         /*======================================================*/
+
+         for (thePatternNode = theTemplate->patternNetwork;
+              thePatternNode != NULL;
+              thePatternNode = GetNextPatternNode(thePatternNode))
+           {
+            networkFile = OpenFileIfNeeded(theEnv,networkFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                         networkArrayVersion,headerFP,
+                                         "struct factPatternNode",FactPrefix(),false,NULL);
+            if (networkFile == NULL)
+              {
+               CloseNetworkFiles(theEnv,networkFile,maxIndices);
+               return false;
+              }
+
+            PatternNodeToCode(theEnv,networkFile,thePatternNode,imageID,maxIndices);
+            networkArrayCount++;
+            networkFile = CloseFileIfNeeded(theEnv,networkFile,&networkArrayCount,
+                                            &networkArrayVersion,maxIndices,NULL,NULL);
+           }
+        }
+     }
+
+   /*==============================*/
+   /* Close any C files left open. */
+   /*==============================*/
+
+   CloseNetworkFiles(theEnv,networkFile,maxIndices);
+
+   /*===============================*/
+   /* Return true to indicate the C */
+   /* code was successfully saved.  */
+   /*===============================*/
+
+   return true;
+  }
+
+/****************************************************************/
+/* CloseNetworkFiles: Closes all of the C files created for the */
+/*   fact pattern network. Called when an error occurs or when  */
+/*   the fact pattern network data structures have all been     */
+/*   written to the files.                                      */
+/****************************************************************/
+static void CloseNetworkFiles(
+  Environment *theEnv,
+  FILE *networkFile,
+  unsigned int maxIndices)
+  {
+   unsigned int count = maxIndices;
+   unsigned int arrayVersion = 0;
+
+   if (networkFile != NULL)
+     {
+      CloseFileIfNeeded(theEnv,networkFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+  }
+
+/************************************************************/
+/* PatternNodeToCode: Writes the C code representation of a */
+/*   single fact pattern node slot to the specified file.   */
+/************************************************************/
+static void PatternNodeToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  struct factPatternNode *thePatternNode,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"{");
+
+   /*=====================*/
+   /* Pattern Node Header */
+   /*=====================*/
+
+   PatternNodeHeaderToCode(theEnv,theFile,&thePatternNode->header,imageID,maxIndices);
+
+   /*========================*/
+   /* Field and Slot Indices */
+   /*========================*/
+
+   fprintf(theFile,",0,%d,%d,%d,",thePatternNode->whichField,
+                             thePatternNode->whichSlot,
+                             thePatternNode->leaveFields);
+
+   /*===============*/
+   /* Network Tests */
+   /*===============*/
+
+   PrintHashedExpressionReference(theEnv,theFile,thePatternNode->networkTest,imageID,maxIndices);
+
+   /*============*/
+   /* Next Level */
+   /*============*/
+
+   if (thePatternNode->nextLevel == NULL)
+     { fprintf(theFile,",NULL,"); }
+   else
+     {
+      fprintf(theFile,",&%s%d_%ld[%ld],",FactPrefix(),
+                 imageID,(thePatternNode->nextLevel->bsaveID / maxIndices) + 1,
+                         thePatternNode->nextLevel->bsaveID % maxIndices);
+     }
+
+   /*============*/
+   /* Last Level */
+   /*============*/
+
+   if (thePatternNode->lastLevel == NULL)
+     { fprintf(theFile,"NULL,"); }
+   else
+     {
+      fprintf(theFile,"&%s%d_%ld[%ld],",FactPrefix(),
+              imageID,(thePatternNode->lastLevel->bsaveID / maxIndices) + 1,
+                   thePatternNode->lastLevel->bsaveID % maxIndices);
+     }
+
+   /*===========*/
+   /* Left Node */
+   /*===========*/
+
+   if (thePatternNode->leftNode == NULL)
+     { fprintf(theFile,"NULL,"); }
+   else
+     {
+      fprintf(theFile,"&%s%d_%ld[%ld],",FactPrefix(),
+             imageID,(thePatternNode->leftNode->bsaveID / maxIndices) + 1,
+                  thePatternNode->leftNode->bsaveID % maxIndices);
+     }
+
+   /*============*/
+   /* Right Node */
+   /*============*/
+
+   if (thePatternNode->rightNode == NULL)
+     { fprintf(theFile,"NULL}"); }
+   else
+     {
+      fprintf(theFile,"&%s%d_%ld[%ld]}",FactPrefix(),
+            imageID,(thePatternNode->rightNode->bsaveID / maxIndices) + 1,
+                thePatternNode->rightNode->bsaveID % maxIndices);
+     }
+  }
+
+/**********************************************************/
+/* FactPatternNodeReference: Prints C code representation */
+/*   of a fact pattern node data structure reference.     */
+/**********************************************************/
+void FactPatternNodeReference(
+  Environment *theEnv,
+  void *theVPattern,
+  FILE *theFile,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   struct factPatternNode *thePattern = (struct factPatternNode *) theVPattern;
+
+   if (thePattern == NULL) fprintf(theFile,"NULL");
+   else
+     {
+      fprintf(theFile,"&%s%u_%lu[%lu]",FactPrefix(),
+                    imageID,(thePattern->bsaveID / maxIndices) + 1,
+                            thePattern->bsaveID % maxIndices);
+     }
+  }
+
+#endif /* DEFRULE_CONSTRUCT && (! RUN_TIME) && DEFTEMPLATE_CONSTRUCT && CONSTRUCT_COMPILER */
+
+
diff --git a/clips/factcmp.h b/clips/factcmp.h
new file mode 100755
index 000000000..9e5f66ce1
--- /dev/null
+++ b/clips/factcmp.h
@@ -0,0 +1,46 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*          FACT CONSTRUCT COMPILER HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factcmp
+
+#pragma once
+
+#define _H_factcmp
+
+#include "network.h"
+#include "pattern.h"
+
+   void                           FactPatternsCompilerSetup(Environment *);
+   void                           FactPatternNodeReference(Environment *,void *,FILE *,unsigned int,unsigned int);
+
+#endif /* _H_factcmp */
diff --git a/clips/factcom.c b/clips/factcom.c
new file mode 100755
index 000000000..887b2562e
--- /dev/null
+++ b/clips/factcom.c
@@ -0,0 +1,1306 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/04/17             */
+   /*                                                     */
+   /*                FACT COMMANDS MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides the facts, assert, retract, save-facts, */
+/*   load-facts, set-fact-duplication, get-fact-duplication, */
+/*   assert-string, and fact-index commands and functions.   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            Increment/DecrementClearReadyLocks API.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.31: Error messages are now generated when the      */
+/*            fact-index function is given a retracted       */
+/*            fact.                                          */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*            Watch facts for modify command only prints     */
+/*            changed slots.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#include "argacces.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "extnfunc.h"
+#include "facthsh.h"
+#include "factmch.h"
+#include "factmngr.h"
+#include "factrhs.h"
+#include "match.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+#include "tmpltdef.h"
+#include "tmpltfun.h"
+#include "tmpltpsr.h"
+#include "tmpltutl.h"
+
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+#include "bload.h"
+#endif
+
+#include "factcom.h"
+
+#define INVALID     -2L
+#define UNSPECIFIED -1L
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static struct expr            *AssertParse(Environment *,struct expr *,const char *);
+#if DEBUGGING_FUNCTIONS
+   static long long               GetFactsArgument(UDFContext *);
+#endif
+   static struct expr            *StandardLoadFact(Environment *,const char *,struct token *);
+   static Deftemplate           **GetSaveFactsDeftemplateNames(Environment *,struct expr *,int,
+                                                               unsigned int *,bool *);
+
+/***************************************/
+/* FactCommandDefinitions: Initializes */
+/*   fact commands and functions.      */
+/***************************************/
+void FactCommandDefinitions(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"facts","v",0,4,"l;*",FactsCommand,"FactsCommand",NULL);
+#endif
+
+   AddUDF(theEnv,"assert","bf",0,UNBOUNDED,NULL,AssertCommand,"AssertCommand",NULL);
+   AddUDF(theEnv,"retract", "v",1,UNBOUNDED,"fly",RetractCommand,"RetractCommand",NULL);
+   AddUDF(theEnv,"assert-string","bf",1,1,"s",AssertStringFunction,"AssertStringFunction",NULL);
+   AddUDF(theEnv,"str-assert","bf",1,1,"s",AssertStringFunction,"AssertStringFunction",NULL);
+
+   AddUDF(theEnv,"get-fact-duplication","b",0,0,NULL,GetFactDuplicationCommand,"GetFactDuplicationCommand", NULL);
+   AddUDF(theEnv,"set-fact-duplication","b",1,1,NULL,SetFactDuplicationCommand,"SetFactDuplicationCommand", NULL);
+
+   AddUDF(theEnv,"save-facts","b",1,UNBOUNDED,"y;sy",SaveFactsCommand,"SaveFactsCommand",NULL);
+   AddUDF(theEnv,"load-facts","b",1,1,"sy",LoadFactsCommand,"LoadFactsCommand",NULL);
+   AddUDF(theEnv,"fact-index","l",1,1,"f",FactIndexFunction,"FactIndexFunction",NULL);
+
+   FuncSeqOvlFlags(theEnv,"assert",false,false);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+   AddFunctionParser(theEnv,"assert",AssertParse);
+  }
+
+/***************************************/
+/* AssertCommand: H/L access routine   */
+/*   for the assert function.          */
+/***************************************/
+void AssertCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSValue *theField;
+   UDFValue theValue;
+   struct expr *theExpression;
+   struct templateSlot *slotPtr;
+   Fact *newFact;
+   bool error = false;
+   int i;
+   Fact *theFact;
+
+   /*================================*/
+   /* Get the deftemplate associated */
+   /* with the fact being asserted.  */
+   /*================================*/
+
+   theExpression = GetFirstArgument();
+   theDeftemplate = (Deftemplate *) theExpression->value;
+
+   /*=======================================*/
+   /* Create the fact and store the name of */
+   /* the deftemplate as the 1st field.     */
+   /*=======================================*/
+
+   if (theDeftemplate->implied == false)
+     {
+      newFact = CreateFactBySize(theEnv,theDeftemplate->numberOfSlots);
+      slotPtr = theDeftemplate->slotList;
+     }
+   else
+     {
+      newFact = CreateFactBySize(theEnv,1);
+      if (theExpression->nextArg == NULL)
+        {
+         newFact->theProposition.contents[0].multifieldValue = CreateUnmanagedMultifield(theEnv,0L);
+        }
+      slotPtr = NULL;
+     }
+
+   newFact->whichDeftemplate = theDeftemplate;
+
+   /*===================================================*/
+   /* Evaluate the expression associated with each slot */
+   /* and store the result in the appropriate slot of   */
+   /* the newly created fact.                           */
+   /*===================================================*/
+
+   IncrementClearReadyLocks(theEnv);
+
+   theField = newFact->theProposition.contents;
+
+   for (theExpression = theExpression->nextArg, i = 0;
+        theExpression != NULL;
+        theExpression = theExpression->nextArg, i++)
+     {
+      /*===================================================*/
+      /* Evaluate the expression to be stored in the slot. */
+      /*===================================================*/
+
+      EvaluateExpression(theEnv,theExpression,&theValue);
+
+      /*============================================================*/
+      /* A multifield value can't be stored in a single field slot. */
+      /*============================================================*/
+
+      if ((slotPtr != NULL) ?
+          (slotPtr->multislot == false) && (theValue.header->type == MULTIFIELD_TYPE) :
+          false)
+        {
+         MultiIntoSingleFieldSlotError(theEnv,slotPtr,theDeftemplate);
+         theValue.value = FalseSymbol(theEnv);
+         error = true;
+        }
+
+      /*==============================*/
+      /* Store the value in the slot. */
+      /*==============================*/
+
+      theField[i].value = theValue.value;
+
+      /*========================================*/
+      /* Get the information for the next slot. */
+      /*========================================*/
+
+      if (slotPtr != NULL) slotPtr = slotPtr->next;
+     }
+
+   DecrementClearReadyLocks(theEnv);
+
+   /*============================================*/
+   /* If an error occured while generating the   */
+   /* fact's slot values, then abort the assert. */
+   /*============================================*/
+
+   if (error)
+     {
+      ReturnFact(theEnv,newFact);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*================================*/
+   /* Add the fact to the fact-list. */
+   /*================================*/
+
+   theFact = Assert(newFact);
+
+   /*========================================*/
+   /* The asserted fact is the return value. */
+   /*========================================*/
+
+   if (theFact != NULL)
+     { returnValue->factValue = theFact; }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+
+   return;
+  }
+
+/****************************************/
+/* RetractCommand: H/L access routine   */
+/*   for the retract command.           */
+/****************************************/
+void RetractCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   long long factIndex;
+   Fact *ptr;
+   UDFValue theArg;
+
+   /*================================*/
+   /* Iterate through each argument. */
+   /*================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      /*========================*/
+      /* Evaluate the argument. */
+      /*========================*/
+
+      if (! UDFNextArgument(context,INTEGER_BIT | FACT_ADDRESS_BIT | SYMBOL_BIT,&theArg))
+        { return; }
+
+      /*======================================*/
+      /* If the argument evaluates to a fact  */
+      /* address, we can directly retract it. */
+      /*======================================*/
+
+      if (CVIsType(&theArg,FACT_ADDRESS_BIT))
+        { Retract(theArg.factValue); }
+
+      /*===============================================*/
+      /* If the argument evaluates to an integer, then */
+      /* it's assumed to be the fact index of the fact */
+      /* to be retracted.                              */
+      /*===============================================*/
+
+      else if (CVIsType(&theArg,INTEGER_BIT))
+        {
+         /*==========================================*/
+         /* A fact index must be a positive integer. */
+         /*==========================================*/
+
+         factIndex = theArg.integerValue->contents;
+         if (factIndex < 0)
+           {
+            UDFInvalidArgumentMessage(context,"fact-address, fact-index, or the symbol *");
+            return;
+           }
+
+         /*================================================*/
+         /* See if a fact with the specified index exists. */
+         /*================================================*/
+
+         ptr = FindIndexedFact(theEnv,factIndex);
+
+         /*=====================================*/
+         /* If the fact exists then retract it, */
+         /* otherwise print an error message.   */
+         /*=====================================*/
+
+         if (ptr != NULL)
+           { Retract(ptr); }
+         else
+           {
+            char tempBuffer[20];
+            gensprintf(tempBuffer,"f-%lld",factIndex);
+            CantFindItemErrorMessage(theEnv,"fact",tempBuffer,false);
+           }
+        }
+
+      /*============================================*/
+      /* Otherwise if the argument evaluates to the */
+      /* symbol *, then all facts are retracted.    */
+      /*============================================*/
+
+      else if ((CVIsType(&theArg,SYMBOL_BIT)) ?
+               (strcmp(theArg.lexemeValue->contents,"*") == 0) : false)
+        {
+         RetractAllFacts(theEnv);
+         return;
+        }
+
+      /*============================================*/
+      /* Otherwise the argument has evaluated to an */
+      /* illegal value for the retract command.     */
+      /*============================================*/
+
+      else
+        {
+         UDFInvalidArgumentMessage(context,"fact-address, fact-index, or the symbol *");
+         SetEvaluationError(theEnv,true);
+        }
+     }
+  }
+
+/***************************************************/
+/* SetFactDuplicationCommand: H/L access routine   */
+/*   for the set-fact-duplication command.         */
+/***************************************************/
+void SetFactDuplicationCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   /*=====================================================*/
+   /* Get the old value of the fact duplication behavior. */
+   /*=====================================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,GetFactDuplication(theEnv));
+
+   /*========================*/
+   /* Evaluate the argument. */
+   /*========================*/
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+
+   /*===============================================================*/
+   /* If the argument evaluated to false, then the fact duplication */
+   /* behavior is disabled, otherwise it is enabled.                */
+   /*===============================================================*/
+
+   SetFactDuplication(theEnv,theArg.value != FalseSymbol(theEnv));
+  }
+
+/***************************************************/
+/* GetFactDuplicationCommand: H/L access routine   */
+/*   for the get-fact-duplication command.         */
+/***************************************************/
+void GetFactDuplicationCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateBoolean(theEnv,GetFactDuplication(theEnv));
+  }
+
+/*******************************************/
+/* FactIndexFunction: H/L access routine   */
+/*   for the fact-index function.          */
+/*******************************************/
+void FactIndexFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   /*======================================*/
+   /* The argument must be a fact address. */
+   /*======================================*/
+
+   if (! UDFFirstArgument(context,FACT_ADDRESS_BIT,&theArg))
+     { return; }
+
+   /*================================================*/
+   /* Return the fact index associated with the fact */
+   /* address. If the fact has been retracted, then  */
+   /* return -1 for the fact index.                  */
+   /*================================================*/
+
+   if (theArg.factValue->garbage)
+     {
+      FactRetractedErrorMessage(theEnv,theArg.factValue);
+      returnValue->integerValue = CreateInteger(theEnv,-1L);
+      return;
+     }
+
+   returnValue->integerValue = CreateInteger(theEnv,FactIndex(theArg.factValue));
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/**************************************/
+/* FactsCommand: H/L access routine   */
+/*   for the facts command.           */
+/**************************************/
+void FactsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   long long start = UNSPECIFIED, end = UNSPECIFIED, max = UNSPECIFIED;
+   Defmodule *theModule;
+   UDFValue theArg;
+
+   /*==================================*/
+   /* The default module for the facts */
+   /* command is the current module.   */
+   /*==================================*/
+
+   theModule = GetCurrentModule(theEnv);
+
+   /*==========================================*/
+   /* If no arguments were specified, then use */
+   /* the default values to list the facts.    */
+   /*==========================================*/
+
+   if (! UDFHasNextArgument(context))
+     {
+      Facts(theEnv,STDOUT,theModule,start,end,max);
+      return;
+     }
+
+   /*========================================================*/
+   /* Since there are one or more arguments, see if a module */
+   /* or start index was specified as the first argument.    */
+   /*========================================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT | INTEGER_BIT,&theArg)) return;
+
+   /*===============================================*/
+   /* If the first argument is a symbol, then check */
+   /* to see that a valid module was specified.     */
+   /*===============================================*/
+
+   if (CVIsType(&theArg,SYMBOL_BIT))
+     {
+      theModule = FindDefmodule(theEnv,theArg.lexemeValue->contents);
+      if ((theModule == NULL) && (strcmp(theArg.lexemeValue->contents,"*") != 0))
+        {
+         SetEvaluationError(theEnv,true);
+         CantFindItemErrorMessage(theEnv,"defmodule",theArg.lexemeValue->contents,true);
+         return;
+        }
+
+      if ((start = GetFactsArgument(context)) == INVALID) return;
+     }
+
+   /*================================================*/
+   /* Otherwise if the first argument is an integer, */
+   /* check to see that a valid index was specified. */
+   /*================================================*/
+
+   else if (CVIsType(&theArg,INTEGER_BIT))
+     {
+      start = theArg.integerValue->contents;
+      if (start < 0)
+        {
+         ExpectedTypeError1(theEnv,"facts",1,"symbol or 'positive number'");
+         UDFThrowError(context);
+         return;
+        }
+     }
+
+   /*==========================================*/
+   /* Otherwise the first argument is invalid. */
+   /*==========================================*/
+
+   else
+     {
+      UDFInvalidArgumentMessage(context,"symbol or 'positive number'");
+      UDFThrowError(context);
+      return;
+     }
+
+   /*==========================*/
+   /* Get the other arguments. */
+   /*==========================*/
+
+   if ((end = GetFactsArgument(context)) == INVALID) return;
+   if ((max = GetFactsArgument(context)) == INVALID) return;
+
+   /*=================*/
+   /* List the facts. */
+   /*=================*/
+
+   Facts(theEnv,STDOUT,theModule,start,end,max);
+  }
+
+/**************************************************/
+/* Facts: C access routine for the facts command. */
+/**************************************************/
+void Facts(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule,
+  long long start,
+  long long end,
+  long long max)
+  {
+   Fact *factPtr;
+   unsigned long count = 0;
+   Defmodule *oldModule;
+   bool allModules = false;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   oldModule = GetCurrentModule(theEnv);
+
+   /*=========================================================*/
+   /* Determine if facts from all modules are to be displayed */
+   /* or just facts from the current module.                  */
+   /*=========================================================*/
+
+   if (theModule == NULL) allModules = true;
+   else SetCurrentModule(theEnv,theModule);
+
+   /*=====================================*/
+   /* Get the first fact to be displayed. */
+   /*=====================================*/
+
+   if (allModules) factPtr = GetNextFact(theEnv,NULL);
+   else factPtr = GetNextFactInScope(theEnv,NULL);
+
+   /*===============================*/
+   /* Display facts until there are */
+   /* no more facts to display.     */
+   /*===============================*/
+
+   while (factPtr != NULL)
+     {
+      /*==================================================*/
+      /* Abort the display of facts if the Halt Execution */
+      /* flag has been set (normally by user action).     */
+      /*==================================================*/
+
+      if (GetHaltExecution(theEnv) == true)
+        {
+         SetCurrentModule(theEnv,oldModule);
+         return;
+        }
+
+      /*===============================================*/
+      /* If the maximum fact index of facts to display */
+      /* has been reached, then stop displaying facts. */
+      /*===============================================*/
+
+      if ((factPtr->factIndex > end) && (end != UNSPECIFIED))
+        {
+         PrintTally(theEnv,logicalName,count,"fact","facts");
+         SetCurrentModule(theEnv,oldModule);
+         return;
+        }
+
+      /*================================================*/
+      /* If the maximum number of facts to be displayed */
+      /* has been reached, then stop displaying facts.  */
+      /*================================================*/
+
+      if (max == 0)
+        {
+         PrintTally(theEnv,logicalName,count,"fact","facts");
+         SetCurrentModule(theEnv,oldModule);
+         return;
+        }
+
+      /*======================================================*/
+      /* If the index of the fact is greater than the minimum */
+      /* starting fact index, then display the fact.          */
+      /*======================================================*/
+
+      if (factPtr->factIndex >= start)
+        {
+         PrintFactWithIdentifier(theEnv,logicalName,factPtr,NULL);
+         WriteString(theEnv,logicalName,"\n");
+         count++;
+         if (max > 0) max--;
+        }
+
+      /*========================================*/
+      /* Proceed to the next fact to be listed. */
+      /*========================================*/
+
+      if (allModules) factPtr = GetNextFact(theEnv,factPtr);
+      else factPtr = GetNextFactInScope(theEnv,factPtr);
+     }
+
+   /*===================================================*/
+   /* Print the total of the number of facts displayed. */
+   /*===================================================*/
+
+   PrintTally(theEnv,logicalName,count,"fact","facts");
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   SetCurrentModule(theEnv,oldModule);
+  }
+
+/****************************************************************/
+/* GetFactsArgument: Returns an argument for the facts command. */
+/*  A return value of -1 indicates that no value was specified. */
+/*  A return value of -2 indicates that the value specified is  */
+/*  invalid.                                                    */
+/****************************************************************/
+static long long GetFactsArgument(
+  UDFContext *context)
+  {
+   long long factIndex;
+   UDFValue theArg;
+
+   if (! UDFHasNextArgument(context)) return(UNSPECIFIED);
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+     { return(INVALID); }
+
+   factIndex = theArg.integerValue->contents;
+
+   if (factIndex < 0)
+     {
+      UDFInvalidArgumentMessage(context,"positive number");
+      UDFThrowError(context);
+      return(INVALID);
+     }
+
+   return(factIndex);
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/**********************************************/
+/* AssertStringFunction: H/L access routine   */
+/*   for the assert-string function.          */
+/**********************************************/
+void AssertStringFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Fact *theFact;
+
+   /*=====================================================*/
+   /* Check for the correct number and type of arguments. */
+   /*=====================================================*/
+
+   if (! UDFFirstArgument(context,STRING_BIT,&theArg))
+     { return; }
+
+   /*==========================================*/
+   /* Call the driver routine for converting a */
+   /* string to a fact and then assert it.     */
+   /*==========================================*/
+
+   theFact = AssertString(theEnv,theArg.lexemeValue->contents);
+   if (theFact != NULL)
+     { returnValue->factValue = theFact; }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/******************************************/
+/* SaveFactsCommand: H/L access routine   */
+/*   for the save-facts command.          */
+/******************************************/
+void SaveFactsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileName;
+   unsigned int numArgs;
+   SaveScope saveCode = LOCAL_SAVE;
+   const char *argument;
+   UDFValue theValue;
+   struct expr *theList = NULL;
+
+   /*============================================*/
+   /* Check for the correct number of arguments. */
+   /*============================================*/
+
+   numArgs = UDFArgumentCount(context);
+
+   /*=================================================*/
+   /* Get the file name to which facts will be saved. */
+   /*=================================================*/
+
+   if ((fileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*=============================================================*/
+   /* If specified, the second argument to save-facts indicates   */
+   /* whether just facts local to the current module or all facts */
+   /* visible to the current module will be saved.                */
+   /*=============================================================*/
+
+   if (numArgs > 1)
+     {
+      if (! UDFNextArgument(context,SYMBOL_BIT,&theValue))
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+
+      argument = theValue.lexemeValue->contents;
+
+      if (strcmp(argument,"local") == 0)
+        { saveCode = LOCAL_SAVE; }
+      else if (strcmp(argument,"visible") == 0)
+        { saveCode = VISIBLE_SAVE; }
+      else
+        {
+         ExpectedTypeError1(theEnv,"save-facts",2,"symbol with value local or visible");
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+
+   /*======================================================*/
+   /* Subsequent arguments indicate that only those facts  */
+   /* associated with the specified deftemplates should be */
+   /* saved to the file.                                   */
+   /*======================================================*/
+
+   if (numArgs > 2) theList = GetFirstArgument()->nextArg->nextArg;
+
+   /*====================================*/
+   /* Call the SaveFacts driver routine. */
+   /*====================================*/
+
+   if (SaveFactsDriver(theEnv,fileName,saveCode,theList) == false)
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+  }
+
+/******************************************/
+/* LoadFactsCommand: H/L access routine   */
+/*   for the load-facts command.          */
+/******************************************/
+void LoadFactsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileName;
+
+   /*====================================================*/
+   /* Get the file name from which facts will be loaded. */
+   /*====================================================*/
+
+   if ((fileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*====================================*/
+   /* Call the LoadFacts driver routine. */
+   /*====================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,LoadFacts(theEnv,fileName));
+  }
+
+/***********************************************************/
+/* SaveFacts: C access routine for the save-facts command. */
+/***********************************************************/
+bool SaveFacts(
+  Environment *theEnv,
+  const char *fileName,
+  SaveScope saveCode)
+  {
+   return SaveFactsDriver(theEnv,fileName,saveCode,NULL);
+  }
+
+/*****************************************************************/
+/* SaveFactsDriver: C access routine for the save-facts command. */
+/*****************************************************************/
+bool SaveFactsDriver(
+  Environment *theEnv,
+  const char *fileName,
+  SaveScope saveCode,
+  struct expr *theList)
+  {
+   bool tempValue1, tempValue2, tempValue3;
+   Fact *theFact;
+   FILE *filePtr;
+   Defmodule *theModule;
+   Deftemplate **deftemplateArray;
+   unsigned int count, i;
+   bool printFact, error;
+
+   /*======================================================*/
+   /* Open the file. Use either "fast save" or I/O Router. */
+   /*======================================================*/
+
+   if ((filePtr = GenOpen(theEnv,fileName,"w")) == NULL)
+     {
+      OpenErrorMessage(theEnv,"save-facts",fileName);
+      return false;
+     }
+
+   SetFastSave(theEnv,filePtr);
+
+   /*===========================================*/
+   /* Set the print flags so that addresses and */
+   /* strings are printed properly to the file. */
+   /*===========================================*/
+
+   tempValue1 = PrintUtilityData(theEnv)->PreserveEscapedCharacters;
+   PrintUtilityData(theEnv)->PreserveEscapedCharacters = true;
+   tempValue2 = PrintUtilityData(theEnv)->AddressesToStrings;
+   PrintUtilityData(theEnv)->AddressesToStrings = true;
+   tempValue3 = PrintUtilityData(theEnv)->InstanceAddressesToNames;
+   PrintUtilityData(theEnv)->InstanceAddressesToNames = true;
+
+   /*===================================================*/
+   /* Determine the list of specific facts to be saved. */
+   /*===================================================*/
+
+   deftemplateArray = GetSaveFactsDeftemplateNames(theEnv,theList,saveCode,&count,&error);
+
+   if (error)
+     {
+      PrintUtilityData(theEnv)->PreserveEscapedCharacters = tempValue1;
+      PrintUtilityData(theEnv)->AddressesToStrings = tempValue2;
+      PrintUtilityData(theEnv)->InstanceAddressesToNames = tempValue3;
+      GenClose(theEnv,filePtr);
+      SetFastSave(theEnv,NULL);
+      return false;
+     }
+
+   /*=================*/
+   /* Save the facts. */
+   /*=================*/
+
+   theModule = GetCurrentModule(theEnv);
+
+   for (theFact = GetNextFactInScope(theEnv,NULL);
+        theFact != NULL;
+        theFact = GetNextFactInScope(theEnv,theFact))
+     {
+      /*===========================================================*/
+      /* If we're doing a local save and the facts's corresponding */
+      /* deftemplate isn't in the current module, then don't save  */
+      /* the fact.                                                 */
+      /*===========================================================*/
+
+      if ((saveCode == LOCAL_SAVE) &&
+          (theFact->whichDeftemplate->header.whichModule->theModule != theModule))
+        { printFact = false; }
+
+      /*=====================================================*/
+      /* Otherwise, if the list of facts to be printed isn't */
+      /* restricted, then set the print flag to true.        */
+      /*=====================================================*/
+
+      else if (theList == NULL)
+        { printFact = true; }
+
+      /*=======================================================*/
+      /* Otherwise see if the fact's corresponding deftemplate */
+      /* is in the list of deftemplates whose facts are to be  */
+      /* saved. If it's in the list, then set the print flag   */
+      /* to true, otherwise set it to false.                   */
+      /*=======================================================*/
+
+      else
+        {
+         printFact = false;
+         for (i = 0; i < count; i++)
+           {
+            if (deftemplateArray[i] == theFact->whichDeftemplate)
+              {
+               printFact = true;
+               break;
+              }
+           }
+        }
+
+      /*===================================*/
+      /* If the print flag is set to true, */
+      /* then save the fact to the file.   */
+      /*===================================*/
+
+      if (printFact)
+        {
+         PrintFact(theEnv,(char *) filePtr,theFact,false,false,NULL);
+         WriteString(theEnv,(char *) filePtr,"\n");
+        }
+     }
+
+   /*==========================*/
+   /* Restore the print flags. */
+   /*==========================*/
+
+   PrintUtilityData(theEnv)->PreserveEscapedCharacters = tempValue1;
+   PrintUtilityData(theEnv)->AddressesToStrings = tempValue2;
+   PrintUtilityData(theEnv)->InstanceAddressesToNames = tempValue3;
+
+   /*=================*/
+   /* Close the file. */
+   /*=================*/
+
+   GenClose(theEnv,filePtr);
+   SetFastSave(theEnv,NULL);
+
+   /*==================================*/
+   /* Free the deftemplate name array. */
+   /*==================================*/
+
+   if (theList != NULL)
+     { rm(theEnv,deftemplateArray,sizeof(Deftemplate *) * count); }
+
+   /*===================================*/
+   /* Return true to indicate no errors */
+   /* occurred while saving the facts.  */
+   /*===================================*/
+
+   return true;
+  }
+
+/*******************************************************************/
+/* GetSaveFactsDeftemplateNames: Retrieves the list of deftemplate */
+/*   names for saving specific facts with the save-facts command.  */
+/*******************************************************************/
+static Deftemplate **GetSaveFactsDeftemplateNames(
+  Environment *theEnv,
+  struct expr *theList,
+  int saveCode,
+  unsigned int *count,
+  bool *error)
+  {
+   struct expr *tempList;
+   Deftemplate **deftemplateArray;
+   UDFValue tempArg;
+   unsigned int i, tempCount;
+   Deftemplate *theDeftemplate = NULL;
+
+   /*=============================*/
+   /* Initialize the error state. */
+   /*=============================*/
+
+   *error = false;
+
+   /*=====================================================*/
+   /* If no deftemplate names were specified as arguments */
+   /* then the deftemplate name list is empty.            */
+   /*=====================================================*/
+
+   if (theList == NULL)
+     {
+      *count = 0;
+      return NULL;
+     }
+
+   /*======================================*/
+   /* Determine the number of deftemplate  */
+   /* names to be stored in the name list. */
+   /*======================================*/
+
+   for (tempList = theList, *count = 0;
+        tempList != NULL;
+        tempList = tempList->nextArg, (*count)++)
+     { /* Do Nothing */ }
+
+   /*=========================================*/
+   /* Allocate the storage for the name list. */
+   /*=========================================*/
+
+   deftemplateArray = (Deftemplate **) gm2(theEnv,sizeof(Deftemplate *) * *count);
+
+   /*=====================================*/
+   /* Loop through each of the arguments. */
+   /*=====================================*/
+
+   for (tempList = theList, i = 0;
+        i < *count;
+        tempList = tempList->nextArg, i++)
+     {
+      /*========================*/
+      /* Evaluate the argument. */
+      /*========================*/
+
+      EvaluateExpression(theEnv,tempList,&tempArg);
+
+      if (EvaluationData(theEnv)->EvaluationError)
+        {
+         *error = true;
+         rm(theEnv,deftemplateArray,sizeof(Deftemplate *) * *count);
+         return NULL;
+        }
+
+      /*======================================*/
+      /* A deftemplate name must be a symbol. */
+      /*======================================*/
+
+      if (tempArg.header->type != SYMBOL_TYPE)
+        {
+         *error = true;
+         ExpectedTypeError1(theEnv,"save-facts",3+i,"symbol");
+         rm(theEnv,deftemplateArray,sizeof(Deftemplate *) * *count);
+         return NULL;
+        }
+
+      /*===================================================*/
+      /* Find the deftemplate. For a local save, look only */
+      /* in the current module. For a visible save, look   */
+      /* in all visible modules.                           */
+      /*===================================================*/
+
+      if (saveCode == LOCAL_SAVE)
+        {
+         theDeftemplate = FindDeftemplateInModule(theEnv,tempArg.lexemeValue->contents);
+         if (theDeftemplate == NULL)
+           {
+            *error = true;
+            ExpectedTypeError1(theEnv,"save-facts",3+i,"'local deftemplate name'");
+            rm(theEnv,deftemplateArray,sizeof(Deftemplate *) * *count);
+            return NULL;
+           }
+        }
+      else if (saveCode == VISIBLE_SAVE)
+        {
+         theDeftemplate = (Deftemplate *)
+           FindImportedConstruct(theEnv,"deftemplate",NULL,
+                                 tempArg.lexemeValue->contents,
+                                 &tempCount,true,NULL);
+         if (theDeftemplate == NULL)
+           {
+            *error = true;
+            ExpectedTypeError1(theEnv,"save-facts",3+i,"'visible deftemplate name'");
+            rm(theEnv,deftemplateArray,sizeof(Deftemplate *) * *count);
+            return NULL;
+           }
+        }
+
+      /*==================================*/
+      /* Add a pointer to the deftemplate */
+      /* to the array being created.      */
+      /*==================================*/
+
+      deftemplateArray[i] = theDeftemplate;
+     }
+
+   /*===================================*/
+   /* Return the array of deftemplates. */
+   /*===================================*/
+
+   return deftemplateArray;
+  }
+
+/***********************************************************/
+/* LoadFacts: C access routine for the load-facts command. */
+/***********************************************************/
+bool LoadFacts(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   FILE *filePtr;
+   struct token theToken;
+   struct expr *testPtr;
+   UDFValue rv;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*======================================================*/
+   /* Open the file. Use either "fast save" or I/O Router. */
+   /*======================================================*/
+
+   if ((filePtr = GenOpen(theEnv,fileName,"r")) == NULL)
+     {
+      OpenErrorMessage(theEnv,"load-facts",fileName);
+      return false;
+     }
+
+   SetFastLoad(theEnv,filePtr);
+
+   /*=================*/
+   /* Load the facts. */
+   /*=================*/
+
+   theToken.tknType = LEFT_PARENTHESIS_TOKEN;
+   while (theToken.tknType != STOP_TOKEN)
+     {
+      testPtr = StandardLoadFact(theEnv,(char *) filePtr,&theToken);
+      if (testPtr == NULL) theToken.tknType = STOP_TOKEN;
+      else EvaluateExpression(theEnv,testPtr,&rv);
+      ReturnExpression(theEnv,testPtr);
+     }
+
+   /*=================*/
+   /* Close the file. */
+   /*=================*/
+
+   SetFastLoad(theEnv,NULL);
+   GenClose(theEnv,filePtr);
+
+   /*================================================*/
+   /* Return true if no error occurred while loading */
+   /* the facts, otherwise return false.             */
+   /*================================================*/
+
+   if (EvaluationData(theEnv)->EvaluationError) return false;
+   return true;
+  }
+
+/******************************************/
+/* LoadFactsFromString: C access routine. */
+/******************************************/
+bool LoadFactsFromString(
+  Environment *theEnv,
+  const char *theString,
+  size_t theMax)
+  {
+   const char *theStrRouter = "*** load-facts-from-string ***";
+   struct token theToken;
+   struct expr *testPtr;
+   UDFValue rv;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*==========================*/
+   /* Initialize string router */
+   /*==========================*/
+
+   if ((theMax == SIZE_MAX) ? (! OpenStringSource(theEnv,theStrRouter,theString,0)) :
+                              (! OpenTextSource(theEnv,theStrRouter,theString,0,theMax)))
+     return false;
+
+   /*=================*/
+   /* Load the facts. */
+   /*=================*/
+
+   theToken.tknType = LEFT_PARENTHESIS_TOKEN;
+   while (theToken.tknType != STOP_TOKEN)
+     {
+      testPtr = StandardLoadFact(theEnv,theStrRouter,&theToken);
+      if (testPtr == NULL) theToken.tknType = STOP_TOKEN;
+      else EvaluateExpression(theEnv,testPtr,&rv);
+      ReturnExpression(theEnv,testPtr);
+     }
+
+   /*=================*/
+   /* Close router.   */
+   /*=================*/
+
+   CloseStringSource(theEnv,theStrRouter);
+
+   /*================================================*/
+   /* Return true if no error occurred while loading */
+   /* the facts, otherwise return false.             */
+   /*================================================*/
+
+   if (EvaluationData(theEnv)->EvaluationError) return false;
+   return true;
+  }
+
+/**************************************************************************/
+/* StandardLoadFact: Loads a single fact from the specified logical name. */
+/**************************************************************************/
+static struct expr *StandardLoadFact(
+  Environment *theEnv,
+  const char *logicalName,
+  struct token *theToken)
+  {
+   bool error = false;
+   struct expr *temp;
+
+   GetToken(theEnv,logicalName,theToken);
+   if (theToken->tknType != LEFT_PARENTHESIS_TOKEN) return NULL;
+
+   temp = GenConstant(theEnv,FCALL,FindFunction(theEnv,"assert"));
+   temp->argList = GetRHSPattern(theEnv,logicalName,theToken,&error,
+                                  true,false,true,RIGHT_PARENTHESIS_TOKEN);
+
+   if (error == true)
+     {
+      WriteString(theEnv,STDERR,"Function load-facts encountered an error\n");
+      SetEvaluationError(theEnv,true);
+      ReturnExpression(theEnv,temp);
+      return NULL;
+     }
+
+   if (ExpressionContainsVariables(temp,true))
+     {
+      ReturnExpression(theEnv,temp);
+      return NULL;
+     }
+
+   return(temp);
+  }
+
+/****************************************************************/
+/* AssertParse: Driver routine for parsing the assert function. */
+/****************************************************************/
+static struct expr *AssertParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *logicalName)
+  {
+   bool error;
+   struct expr *rv;
+   struct token theToken;
+
+   ReturnExpression(theEnv,top);
+   SavePPBuffer(theEnv," ");
+   IncrementIndentDepth(theEnv,8);
+   rv = BuildRHSAssert(theEnv,logicalName,&theToken,&error,true,true,"assert command");
+   DecrementIndentDepth(theEnv,8);
+   return(rv);
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
+
diff --git a/clips/factcom.h b/clips/factcom.h
new file mode 100755
index 000000000..8463f25ab
--- /dev/null
+++ b/clips/factcom.h
@@ -0,0 +1,84 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*               FACT COMMANDS HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            Increment/DecrementClearReadyLocks API.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factcom
+
+#pragma once
+
+#define _H_factcom
+
+#include "evaluatn.h"
+
+   void                           FactCommandDefinitions(Environment *);
+   void                           AssertCommand(Environment *,UDFContext *,UDFValue *);
+   void                           RetractCommand(Environment *,UDFContext *,UDFValue *);
+   void                           AssertStringFunction(Environment *,UDFContext *,UDFValue *);
+   void                           FactsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           Facts(Environment *,const char *,Defmodule *,long long,long long,long long);
+   void                           SetFactDuplicationCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetFactDuplicationCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SaveFactsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           LoadFactsCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SaveFacts(Environment *,const char *,SaveScope);
+   bool                           SaveFactsDriver(Environment *,const char *,SaveScope,struct expr *);
+   bool                           LoadFacts(Environment *,const char *);
+   bool                           LoadFactsFromString(Environment *,const char *,size_t);
+   void                           FactIndexFunction(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_factcom */
+
+
diff --git a/clips/factfun.c b/clips/factfun.c
new file mode 100755
index 000000000..3a63476b3
--- /dev/null
+++ b/clips/factfun.c
@@ -0,0 +1,656 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*               FACT FUNCTIONS MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/*                                                           */
+/* (fact-existp <fact-address-or-index>)                     */
+/*    Returns TRUE if the fact exists, otherwise FALSE is    */
+/*    returned.                                              */
+/*                                                           */
+/* (fact-relation <fact-address-or-index>)                   */
+/*    Returns the deftemplate name of the fact. Returns      */
+/*    FALSE if the specified fact doesn't exist.             */
+/*                                                           */
+/* (fact-slot-value <fact-address-or-index> <slot-name>)     */
+/*    Returns the contents of a slot (use the slot name      */
+/*    implied for the implied multifield slot of an ordered  */
+/*    fact). Returns the value FALSE if the slot name is     */
+/*    invalid or the fact doesn't exist.                     */
+/*                                                           */
+/* (fact-slot-names <fact-address-or-index>)                 */
+/*    Returns the slot names associated with a fact in a     */
+/*    multifield value. Returns FALSE if the fact doesn't    */
+/*    exist.                                                 */
+/*                                                           */
+/* (get-fact-list [<module-name>])                           */
+/*    Returns the list of facts visible to the specified     */
+/*    module or to the current module if none is specified.  */
+/*    If * is specified then all facts are returned.         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Added ppfact function.                         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Added STDOUT and STDIN logical name            */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.31: Calling EnvFactExistp for a fact that has      */
+/*            been created, but not asserted now returns     */
+/*            FALSE.                                         */
+/*                                                           */
+/*            Error messages are now generated when the      */
+/*            fact-relation, fact-slot-value,                */
+/*            fact-slot-names, and ppfact functions are      */
+/*            given a retracted fact.                        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Watch facts for modify command only prints     */
+/*            changed slots.                                 */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+#include "tmpltutl.h"
+
+#include "factfun.h"
+
+/****************************************************/
+/* FactFunctionDefinitions: Defines fact functions. */
+/****************************************************/
+void FactFunctionDefinitions(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"fact-existp","b",1,1,"lf",FactExistpFunction,"FactExistpFunction",NULL);
+   AddUDF(theEnv,"fact-relation","y",1,1,"lf",FactRelationFunction,"FactRelationFunction",NULL);
+   AddUDF(theEnv,"fact-slot-value","*",2,2,";lf;y",FactSlotValueFunction,"FactSlotValueFunction",NULL);
+   AddUDF(theEnv,"fact-slot-names","*",1,1,"lf",FactSlotNamesFunction,"FactSlotNamesFunction",NULL);
+   AddUDF(theEnv,"get-fact-list","m",0,1,"y",GetFactListFunction,"GetFactListFunction",NULL);
+   AddUDF(theEnv,"ppfact","vs",1,3,"*;lf;ldsyn",PPFactFunction,"PPFactFunction",NULL);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+/**********************************************/
+/* FactRelationFunction: H/L access routine   */
+/*   for the fact-relation function.          */
+/**********************************************/
+void FactRelationFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Fact *theFact;
+
+   theFact = GetFactAddressOrIndexArgument(context,true);
+
+   if (theFact == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->value = FactRelation(theFact);
+  }
+
+/**************************************/
+/* FactRelation: C access routine for */
+/*   the fact-relation function.      */
+/**************************************/
+CLIPSLexeme *FactRelation(
+  Fact *theFact)
+  {
+   return theFact->whichDeftemplate->header.name;
+  }
+
+/***************************************/
+/* FactDeftemplate: C access routine   */
+/*   to retrieve a fact's deftemplate. */
+/***************************************/
+Deftemplate *FactDeftemplate(
+  Fact *theFact)
+  {
+   return theFact->whichDeftemplate;
+  }
+
+/********************************************/
+/* FactExistpFunction: H/L access routine   */
+/*   for the fact-existp function.          */
+/********************************************/
+void FactExistpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Fact *theFact;
+
+   theFact = GetFactAddressOrIndexArgument(context,false);
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,FactExistp(theFact));
+  }
+
+/***********************************/
+/* FactExistp: C access routine    */
+/*   for the fact-existp function. */
+/***********************************/
+bool FactExistp(
+  Fact *theFact)
+  {
+   if (theFact == NULL) return false;
+
+   if (theFact->garbage) return false;
+
+   if (theFact->factIndex == 0LL) return false;
+
+   return true;
+  }
+
+/***********************************************/
+/* FactSlotValueFunction: H/L access routine   */
+/*   for the fact-slot-value function.         */
+/***********************************************/
+void FactSlotValueFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Fact *theFact;
+   UDFValue theArg;
+   CLIPSValue result;
+
+   /*================================*/
+   /* Get the reference to the fact. */
+   /*================================*/
+
+   theFact = GetFactAddressOrIndexArgument(context,true);
+   if (theFact == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*===========================*/
+   /* Get the name of the slot. */
+   /*===========================*/
+
+   if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   /*=======================*/
+   /* Get the slot's value. */
+   /*=======================*/
+
+   FactSlotValue(theEnv,theFact,theArg.lexemeValue->contents,&result);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/***************************************/
+/* FactSlotValue: C access routine for */
+/*   the fact-slot-value function.     */
+/***************************************/
+void FactSlotValue(
+  Environment *theEnv,
+  Fact *theFact,
+  const char *theSlotName,
+  CLIPSValue *returnValue)
+  {
+   /*==================================================*/
+   /* Make sure the slot exists (the symbol implied is */
+   /* used for the implied slot of an ordered fact).   */
+   /*==================================================*/
+
+   if (theFact->whichDeftemplate->implied)
+     {
+      if (strcmp(theSlotName,"implied") != 0)
+        {
+         SetEvaluationError(theEnv,true);
+         InvalidDeftemplateSlotMessage(theEnv,theSlotName,
+                                       theFact->whichDeftemplate->header.name->contents,false);
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+
+   else if (FindSlot(theFact->whichDeftemplate,CreateSymbol(theEnv,theSlotName),NULL) == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      InvalidDeftemplateSlotMessage(theEnv,theSlotName,
+                                    theFact->whichDeftemplate->header.name->contents,false);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*==========================*/
+   /* Return the slot's value. */
+   /*==========================*/
+
+   if (theFact->whichDeftemplate->implied)
+     { GetFactSlot(theFact,NULL,returnValue); }
+   else
+     { GetFactSlot(theFact,theSlotName,returnValue); }
+  }
+
+/***********************************************/
+/* FactSlotNamesFunction: H/L access routine   */
+/*   for the fact-slot-names function.         */
+/***********************************************/
+void FactSlotNamesFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Fact *theFact;
+   CLIPSValue result;
+
+   /*================================*/
+   /* Get the reference to the fact. */
+   /*================================*/
+
+   theFact = GetFactAddressOrIndexArgument(context,true);
+   if (theFact == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*=====================*/
+   /* Get the slot names. */
+   /*=====================*/
+
+   FactSlotNames(theFact,&result);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/***************************************/
+/* FactSlotNames: C access routine     */
+/*   for the fact-slot-names function. */
+/***************************************/
+void FactSlotNames(
+  Fact *theFact,
+  CLIPSValue *returnValue)
+  {
+   Multifield *theList;
+   struct templateSlot *theSlot;
+   unsigned long count;
+   Environment *theEnv = theFact->whichDeftemplate->header.env;
+
+   /*===============================================*/
+   /* If we're dealing with an implied deftemplate, */
+   /* then the only slot names is "implied."        */
+   /*===============================================*/
+
+   if (theFact->whichDeftemplate->implied)
+     {
+      theList = CreateMultifield(theEnv,1);
+      theList->contents[0].lexemeValue = CreateSymbol(theEnv,"implied");
+      returnValue->value = theList;
+      return;
+     }
+
+   /*=================================*/
+   /* Count the number of slot names. */
+   /*=================================*/
+
+   for (count = 0, theSlot = theFact->whichDeftemplate->slotList;
+        theSlot != NULL;
+        count++, theSlot = theSlot->next)
+     { /* Do Nothing */ }
+
+   /*=============================================================*/
+   /* Create a multifield value in which to store the slot names. */
+   /*=============================================================*/
+
+   theList = CreateMultifield(theEnv,count);
+   returnValue->value = theList;
+
+   /*===============================================*/
+   /* Store the slot names in the multifield value. */
+   /*===============================================*/
+
+   for (count = 0, theSlot = theFact->whichDeftemplate->slotList;
+        theSlot != NULL;
+        count++, theSlot = theSlot->next)
+     {
+      theList->contents[count].lexemeValue = theSlot->slotName;
+     }
+  }
+
+/*********************************************/
+/* GetFactListFunction: H/L access routine   */
+/*   for the get-fact-list function.         */
+/*********************************************/
+void GetFactListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defmodule *theModule;
+   UDFValue theArg;
+   CLIPSValue result;
+
+   /*===========================================*/
+   /* Determine if a module name was specified. */
+   /*===========================================*/
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+        { return; }
+
+      if ((theModule = FindDefmodule(theEnv,theArg.lexemeValue->contents)) == NULL)
+        {
+         if (strcmp("*",theArg.lexemeValue->contents) != 0)
+           {
+            SetMultifieldErrorValue(theEnv,returnValue);
+            UDFInvalidArgumentMessage(context,"defmodule name");
+            return;
+           }
+
+         theModule = NULL;
+        }
+     }
+   else
+     { theModule = GetCurrentModule(theEnv); }
+
+   /*=====================*/
+   /* Get the constructs. */
+   /*=====================*/
+
+   GetFactList(theEnv,&result,theModule);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/*************************************/
+/* GetFactList: C access routine     */
+/*   for the get-fact-list function. */
+/*************************************/
+void GetFactList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defmodule *theModule)
+  {
+   Fact *theFact;
+   unsigned long count;
+   Multifield *theList;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*============================================*/
+   /* Count the number of facts to be retrieved. */
+   /*============================================*/
+
+   if (theModule == NULL)
+     {
+      for (theFact = GetNextFact(theEnv,NULL), count = 0;
+           theFact != NULL;
+           theFact = GetNextFact(theEnv,theFact), count++)
+        { /* Do Nothing */ }
+     }
+   else
+     {
+      SetCurrentModule(theEnv,theModule);
+      UpdateDeftemplateScope(theEnv);
+      for (theFact = GetNextFactInScope(theEnv,NULL), count = 0;
+           theFact != NULL;
+           theFact = GetNextFactInScope(theEnv,theFact), count++)
+        { /* Do Nothing */ }
+     }
+
+   /*===========================================================*/
+   /* Create the multifield value to store the construct names. */
+   /*===========================================================*/
+
+   theList = CreateMultifield(theEnv,count);
+   returnValue->value = theList;
+
+   /*==================================================*/
+   /* Store the fact pointers in the multifield value. */
+   /*==================================================*/
+
+   if (theModule == NULL)
+     {
+      for (theFact = GetNextFact(theEnv,NULL), count = 0;
+           theFact != NULL;
+           theFact = GetNextFact(theEnv,theFact), count++)
+        {
+         theList->contents[count].factValue = theFact;
+        }
+     }
+   else
+     {
+      for (theFact = GetNextFactInScope(theEnv,NULL), count = 0;
+           theFact != NULL;
+           theFact = GetNextFactInScope(theEnv,theFact), count++)
+        {
+         theList->contents[count].factValue = theFact;
+        }
+     }
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+   UpdateDeftemplateScope(theEnv);
+  }
+
+/**************************************/
+/* PPFactFunction: H/L access routine */
+/*   for the ppfact function.         */
+/**************************************/
+void PPFactFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Fact *theFact;
+   const char *logicalName = NULL;      /* Avoids warning */
+   bool ignoreDefaults = false;
+   UDFValue theArg;
+
+   theFact = GetFactAddressOrIndexArgument(context,true);
+   if (theFact == NULL) return;
+
+   /*===============================================================*/
+   /* Determine the logical name to which the fact will be printed. */
+   /*===============================================================*/
+
+   if (UDFHasNextArgument(context))
+     {
+      logicalName = GetLogicalName(context,STDOUT);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"ppfact");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+     }
+   else
+     { logicalName = STDOUT; }
+
+   /*=========================================*/
+   /* Should slot values be printed if they   */
+   /* are the same as the default slot value. */
+   /*=========================================*/
+
+   if (UDFHasNextArgument(context))
+     {
+      UDFNextArgument(context,ANY_TYPE_BITS,&theArg);
+
+      if (theArg.value == FalseSymbol(theEnv))
+        { ignoreDefaults = false; }
+      else
+        { ignoreDefaults = true; }
+     }
+
+   /*============================================================*/
+   /* Determine if any router recognizes the output destination. */
+   /*============================================================*/
+
+   if (strcmp(logicalName,"nil") == 0)
+     {
+      StringBuilder *theSB;
+      
+      theSB = CreateStringBuilder(theEnv,256);
+      
+      FactPPForm(theFact,theSB,ignoreDefaults);
+      returnValue->lexemeValue = CreateString(theEnv,theSB->contents);
+      
+      SBDispose(theSB);
+
+      return;
+     }
+   else if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      return;
+     }
+
+   PPFact(theFact,logicalName,ignoreDefaults);
+  }
+
+/******************************/
+/* PPFact: C access routine   */
+/*   for the ppfact function. */
+/******************************/
+void PPFact(
+  Fact *theFact,
+  const char *logicalName,
+  bool ignoreDefaults)
+  {
+   Environment *theEnv = theFact->whichDeftemplate->header.env;
+   
+   if (theFact == NULL) return;
+
+   if (theFact->garbage) return;
+
+   PrintFact(theEnv,logicalName,theFact,true,ignoreDefaults,NULL);
+
+   WriteString(theEnv,logicalName,"\n");
+  }
+
+/**************************************************************/
+/* GetFactAddressOrIndexArgument: Retrieves an argument for a */
+/*   function which should be a reference to a valid fact.    */
+/**************************************************************/
+Fact *GetFactAddressOrIndexArgument(
+  UDFContext *context,
+  bool noFactError)
+  {
+   UDFValue theArg;
+   long long factIndex;
+   Fact *theFact;
+   Environment *theEnv = context->environment;
+   char tempBuffer[20];
+
+   if (! UDFNextArgument(context,ANY_TYPE_BITS,&theArg))
+     { return NULL; }
+
+   if (theArg.header->type == FACT_ADDRESS_TYPE)
+     {
+      if (theArg.factValue->garbage)
+        {
+         if (noFactError)
+           {
+            FactRetractedErrorMessage(theEnv,theArg.factValue);
+            SetEvaluationError(theEnv,true);
+           }
+         return NULL;
+        }
+      else return theArg.factValue;
+     }
+   else if (theArg.header->type == INTEGER_TYPE)
+     {
+      factIndex = theArg.integerValue->contents;
+      if (factIndex < 0)
+        {
+         UDFInvalidArgumentMessage(context,"fact-address or fact-index");
+         return NULL;
+        }
+
+      theFact = FindIndexedFact(theEnv,factIndex);
+      if ((theFact == NULL) && noFactError)
+        {
+         gensprintf(tempBuffer,"f-%lld",factIndex);
+         CantFindItemErrorMessage(theEnv,"fact",tempBuffer,false);
+         return NULL;
+        }
+
+      return theFact;
+     }
+
+   UDFInvalidArgumentMessage(context,"fact-address or fact-index");
+   return NULL;
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
+
diff --git a/clips/factfun.h b/clips/factfun.h
new file mode 100755
index 000000000..d9e30fbb5
--- /dev/null
+++ b/clips/factfun.h
@@ -0,0 +1,75 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*              FACT FUNCTIONS HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Added ppfact function.                         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factfun
+
+#pragma once
+
+#define _H_factfun
+
+#include "factmngr.h"
+
+   void                           FactFunctionDefinitions(Environment *);
+   void                           FactRelationFunction(Environment *,UDFContext *,UDFValue *);
+   CLIPSLexeme                   *FactRelation(Fact *);
+   Deftemplate                   *FactDeftemplate(Fact *);
+   void                           FactExistpFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           FactExistp(Fact *);
+   void                           FactSlotValueFunction(Environment *,UDFContext *,UDFValue *);
+   void                           FactSlotValue(Environment *,Fact *,const char *,CLIPSValue *);
+   void                           FactSlotNamesFunction(Environment *,UDFContext *,UDFValue *);
+   void                           FactSlotNames(Fact *,CLIPSValue *);
+   void                           GetFactListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetFactList(Environment *,CLIPSValue *,Defmodule *);
+   void                           PPFactFunction(Environment *,UDFContext *,UDFValue *);
+   void                           PPFact(Fact *,const char *,bool);
+   Fact                          *GetFactAddressOrIndexArgument(UDFContext *,bool);
+
+#endif /* _H_factfun */
+
diff --git a/clips/factgen.c b/clips/factgen.c
new file mode 100755
index 000000000..ad3aa82c0
--- /dev/null
+++ b/clips/factgen.c
@@ -0,0 +1,1282 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  12/07/17             */
+   /*                                                     */
+   /*          FACT RETE FUNCTION GENERATION MODULE       */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Creates expressions used by the fact pattern     */
+/*   matcher and the join network. The expressions created   */
+/*   are used to extract and compare values from facts as    */
+/*   needed by the Rete pattern matching algorithm. These    */
+/*   expressions are also used to extract values from facts  */
+/*   needed by expressions on the RHS of a rule.             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Support for performance optimizations.         */
+/*                                                           */
+/*            Increased maximum values for pattern/slot      */
+/*            indices.                                       */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+
+#include "constant.h"
+#include "constrct.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "factmch.h"
+#include "factmngr.h"
+#include "factprt.h"
+#include "factrete.h"
+#include "memalloc.h"
+#include "network.h"
+#include "pattern.h"
+#include "prcdrpsr.h"
+#include "reteutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "sysdep.h"
+#include "tmpltdef.h"
+#include "tmpltfun.h"
+#include "tmpltlhs.h"
+#include "tmpltutl.h"
+
+#include "factgen.h"
+
+#define FACTGEN_DATA 2
+
+struct factgenData
+  {
+   struct entityRecord   FactJNGV1Info;
+   struct entityRecord   FactJNGV2Info;
+   struct entityRecord   FactJNGV3Info;
+   struct entityRecord   FactPNGV1Info;
+   struct entityRecord   FactPNGV2Info;
+   struct entityRecord   FactPNGV3Info;
+   struct entityRecord   FactJNCV1Info;
+   struct entityRecord   FactJNCV2Info;
+   struct entityRecord   FactPNCV1Info;
+   struct entityRecord   FactStoreMFInfo;
+   struct entityRecord   FactSlotLengthInfo;
+   struct entityRecord   FactPNConstant1Info;
+   struct entityRecord   FactPNConstant2Info;
+  };
+
+#define FactgenData(theEnv) ((struct factgenData *) GetEnvironmentData(theEnv,FACTGEN_DATA))
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static void                      *FactGetVarJN1(Environment *,struct lhsParseNode *,int);
+   static void                      *FactGetVarJN2(Environment *,struct lhsParseNode *,int);
+   static void                      *FactGetVarJN3(Environment *,struct lhsParseNode *,int);
+   static void                      *FactGetVarPN1(Environment *,struct lhsParseNode *);
+   static void                      *FactGetVarPN2(Environment *,struct lhsParseNode *);
+   static void                      *FactGetVarPN3(Environment *,struct lhsParseNode *);
+#endif
+
+/*******************************************************************/
+/* InitializeFactReteFunctions: Installs the fact pattern matching */
+/*   and value access routines as primitive operations.            */
+/*******************************************************************/
+void InitializeFactReteFunctions(
+  Environment *theEnv)
+  {
+#if DEFRULE_CONSTRUCT
+   struct entityRecord   factJNGV1Info = { "FACT_JN_VAR1", FACT_JN_VAR1,0,1,0,
+                                                  PrintFactJNGetVar1,
+                                                  PrintFactJNGetVar1,NULL,
+                                                  FactJNGetVar1,
+                                                  NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factJNGV2Info = { "FACT_JN_VAR2", FACT_JN_VAR2,0,1,0,
+                                                  PrintFactJNGetVar2,
+                                                  PrintFactJNGetVar2,NULL,
+                                                  FactJNGetVar2,
+                                                  NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factJNGV3Info = { "FACT_JN_VAR3", FACT_JN_VAR3,0,1,0,
+                                                  PrintFactJNGetVar3,
+                                                  PrintFactJNGetVar3,NULL,
+                                                  FactJNGetVar3,
+                                                  NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factPNGV1Info = { "FACT_PN_VAR1", FACT_PN_VAR1,0,1,0,
+                                                  PrintFactPNGetVar1,
+                                                  PrintFactPNGetVar1,NULL,
+                                                  FactPNGetVar1,
+                                                  NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factPNGV2Info = { "FACT_PN_VAR2", FACT_PN_VAR2,0,1,0,
+                                                  PrintFactPNGetVar2,
+                                                  PrintFactPNGetVar2,NULL,
+                                                  FactPNGetVar2,
+                                                  NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factPNGV3Info = { "FACT_PN_VAR3", FACT_PN_VAR3,0,1,0,
+                                                  PrintFactPNGetVar3,
+                                                  PrintFactPNGetVar3,NULL,
+                                                  FactPNGetVar3,
+                                                  NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factJNCV1Info = { "FACT_JN_CMP1", FACT_JN_CMP1,0,1,1,
+                                                  PrintFactJNCompVars1,
+                                                  PrintFactJNCompVars1,NULL,
+                                                  FactJNCompVars1,
+                                                  NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factJNCV2Info = { "FACT_JN_CMP2", FACT_JN_CMP2,0,1,1,
+                                                  PrintFactJNCompVars2,
+                                                  PrintFactJNCompVars2,NULL,
+                                                  FactJNCompVars2,
+                                                  NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factPNCV1Info = { "FACT_PN_CMP1", FACT_PN_CMP1,0,1,1,
+                                                  PrintFactPNCompVars1,
+                                                  PrintFactPNCompVars1,NULL,
+                                                  FactPNCompVars1,
+                                                  NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factStoreMFInfo = { "FACT_STORE_MULTIFIELD",
+                                                    FACT_STORE_MULTIFIELD,0,1,0,
+                                                    NULL,NULL,NULL,
+                                                    (EntityEvaluationFunction *) FactStoreMultifield,
+                                                    NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factSlotLengthInfo = { "FACT_SLOT_LENGTH",
+                                                       FACT_SLOT_LENGTH,0,1,0,
+                                                       PrintFactSlotLength,
+                                                       PrintFactSlotLength,NULL,
+                                                       FactSlotLength,
+                                                       NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factPNConstant1Info = { "FACT_PN_CONSTANT1",
+                                                        FACT_PN_CONSTANT1,0,1,1,
+                                                        PrintFactPNConstant1,
+                                                        PrintFactPNConstant1,NULL,
+                                                        FactPNConstant1,
+                                                        NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord   factPNConstant2Info = { "FACT_PN_CONSTANT2",
+                                                        FACT_PN_CONSTANT2,0,1,1,
+                                                        PrintFactPNConstant2,
+                                                        PrintFactPNConstant2,NULL,
+                                                        FactPNConstant2,
+                                                        NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   AllocateEnvironmentData(theEnv,FACTGEN_DATA,sizeof(struct factgenData),NULL);
+
+   memcpy(&FactgenData(theEnv)->FactJNGV1Info,&factJNGV1Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactJNGV2Info,&factJNGV2Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactJNGV3Info,&factJNGV3Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactPNGV1Info,&factPNGV1Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactPNGV2Info,&factPNGV2Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactPNGV3Info,&factPNGV3Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactJNCV1Info,&factJNCV1Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactJNCV2Info,&factJNCV2Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactPNCV1Info,&factPNCV1Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactStoreMFInfo,&factStoreMFInfo,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactSlotLengthInfo,&factSlotLengthInfo,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactPNConstant1Info,&factPNConstant1Info,sizeof(struct entityRecord));
+   memcpy(&FactgenData(theEnv)->FactPNConstant2Info,&factPNConstant2Info,sizeof(struct entityRecord));
+
+   InstallPrimitive(theEnv,(EntityRecord *) &FactData(theEnv)->FactInfo,FACT_ADDRESS_TYPE);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactJNGV1Info,FACT_JN_VAR1);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactJNGV2Info,FACT_JN_VAR2);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactJNGV3Info,FACT_JN_VAR3);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactPNGV1Info,FACT_PN_VAR1);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactPNGV2Info,FACT_PN_VAR2);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactPNGV3Info,FACT_PN_VAR3);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactJNCV1Info,FACT_JN_CMP1);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactJNCV2Info,FACT_JN_CMP2);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactPNCV1Info,FACT_PN_CMP1);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactStoreMFInfo,FACT_STORE_MULTIFIELD);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactSlotLengthInfo,FACT_SLOT_LENGTH);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactPNConstant1Info,FACT_PN_CONSTANT1);
+   InstallPrimitive(theEnv,&FactgenData(theEnv)->FactPNConstant2Info,FACT_PN_CONSTANT2);
+#endif
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/******************************************************************/
+/* FactGenPNConstant: Generates an expression for use in the fact */
+/*   pattern network that compares a field from a single field or */
+/*   multifield slot against a constant.                          */
+/******************************************************************/
+struct expr *FactGenPNConstant(
+  Environment *theEnv,
+  struct lhsParseNode *theField)
+  {
+   struct expr *top;
+   ParseNodeType tempValue;
+   struct factConstantPN1Call hack1;
+   struct factConstantPN2Call hack2;
+
+   /*=================================================================*/
+   /* If the value of a single field slot (or relation name) is being */
+   /* compared against a constant, then use specialized routines for  */
+   /* doing the comparison.                                           */
+   /*=================================================================*/
+
+   if (theField->withinMultifieldSlot == false)
+     {
+      ClearBitString(&hack1,sizeof(struct factConstantPN1Call));
+
+      if (theField->negated) hack1.testForEquality = false;
+      else hack1.testForEquality = true;
+
+      hack1.whichSlot = (theField->slotNumber - 1);
+
+      top = GenConstant(theEnv,FACT_PN_CONSTANT1,AddBitMap(theEnv,&hack1,sizeof(struct factConstantPN1Call)));
+
+      top->argList = GenConstant(theEnv,NodeTypeToType(theField),theField->value);
+
+      return(top);
+     }
+
+   /*=================================================================*/
+   /* If a constant comparison is being done within a multifield slot */
+   /* and the constant's position has no multifields to the left,     */
+   /* then use the same routine used for the single field slot case,  */
+   /* but include the offset from the beginning of the slot.          */
+   /*=================================================================*/
+
+   else if ((theField->multiFieldsBefore == 0) ||
+            ((theField->multiFieldsBefore == 1) && (theField->multiFieldsAfter == 0)))
+     {
+      ClearBitString(&hack2,sizeof(struct factConstantPN2Call));
+
+      if (theField->negated) hack2.testForEquality = false;
+      else hack2.testForEquality = true;
+
+      hack2.whichSlot = (theField->slotNumber - 1);
+
+      if (theField->multiFieldsBefore == 0)
+        {
+         hack2.fromBeginning = true;
+         hack2.offset = theField->singleFieldsBefore;
+        }
+      else
+        {
+         hack2.fromBeginning = false;
+         hack2.offset = theField->singleFieldsAfter;
+        }
+
+      top = GenConstant(theEnv,FACT_PN_CONSTANT2,AddBitMap(theEnv,&hack2,sizeof(struct factConstantPN2Call)));
+
+      top->argList = GenConstant(theEnv,NodeTypeToType(theField),theField->value);
+
+      return(top);
+     }
+
+   /*===============================================================*/
+   /* Otherwise, use the equality or inequality function to compare */
+   /* the constant against the value returned by the appropriate    */
+   /* pattern network variable retrieval function call.             */
+   /*===============================================================*/
+
+   else
+     {
+      if (theField->negated)
+        { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NEQ); }
+      else
+        { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_EQ); }
+
+      tempValue = theField->pnType;
+      theField->pnType = SF_VARIABLE_NODE;
+      top->argList = FactGenGetfield(theEnv,theField);
+      theField->pnType = tempValue;
+
+      top->argList->nextArg = GenConstant(theEnv,NodeTypeToType(theField),theField->value);
+     }
+
+   /*===============================================================*/
+   /* Return the expression for performing the constant comparison. */
+   /*===============================================================*/
+
+   return(top);
+  }
+
+/*******************************************************/
+/* FactGenGetfield: Generates an expression for use in */
+/*   the fact pattern network that retrieves a value   */
+/*   from a single or multifield slot.                 */
+/*******************************************************/
+struct expr *FactGenGetfield(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   /*===================================================*/
+   /* Generate call to retrieve single field slot value */
+   /* or the fact relation name.                        */
+   /*===================================================*/
+
+   if ((theNode->slotNumber > 0) && (theNode->slotNumber != UNSPECIFIED_SLOT) && (theNode->withinMultifieldSlot == false))
+     { return(GenConstant(theEnv,FACT_PN_VAR2,FactGetVarPN2(theEnv,theNode))); }
+
+   /*=====================================================*/
+   /* Generate call to retrieve a value from a multifield */
+   /* slot that contains at most one multifield variable  */
+   /* or contains no multifield variables before the      */
+   /* value to be retrieved.                              */
+   /*=====================================================*/
+
+   if (((theNode->pnType == SF_WILDCARD_NODE) || (theNode->pnType == SF_VARIABLE_NODE) || ConstantNode(theNode)) &&
+       ((theNode->multiFieldsBefore == 0) ||
+        ((theNode->multiFieldsBefore == 1) && (theNode->multiFieldsAfter == 0))))
+     { return(GenConstant(theEnv,FACT_PN_VAR3,FactGetVarPN3(theEnv,theNode))); }
+
+   if (((theNode->pnType == MF_WILDCARD_NODE) || (theNode->pnType == MF_VARIABLE_NODE)) &&
+       (theNode->multiFieldsBefore == 0) && (theNode->multiFieldsAfter == 0))
+     { return(GenConstant(theEnv,FACT_PN_VAR3,FactGetVarPN3(theEnv,theNode))); }
+
+   /*=========================================*/
+   /* Generate call to retrieve a value using */
+   /* the most general retrieval function.    */
+   /*=========================================*/
+
+   return(GenConstant(theEnv,FACT_PN_VAR1,FactGetVarPN1(theEnv,theNode)));
+  }
+
+/**************************************************/
+/* FactGenGetvar: Generates an expression for use */
+/*   in the join network that retrieves a value   */
+/*   from a single or multifield slot of a fact.  */
+/**************************************************/
+struct expr *FactGenGetvar(
+  Environment *theEnv,
+  struct lhsParseNode *theNode,
+  int side)
+  {
+   /*====================================================*/
+   /* Generate call to retrieve single field slot value. */
+   /*====================================================*/
+
+   if ((theNode->slotNumber > 0) && (theNode->slotNumber != UNSPECIFIED_SLOT) && (theNode->withinMultifieldSlot == false))
+     { return(GenConstant(theEnv,FACT_JN_VAR2,FactGetVarJN2(theEnv,theNode,side))); }
+
+   /*=====================================================*/
+   /* Generate call to retrieve a value from a multifield */
+   /* slot that contains at most one multifield variable  */
+   /* or contains no multifield variables before the      */
+   /* value to be retrieved.                              */
+   /*=====================================================*/
+
+   if (((theNode->pnType == SF_WILDCARD_NODE) || (theNode->pnType == SF_VARIABLE_NODE)) &&
+       ((theNode->multiFieldsBefore == 0) ||
+        ((theNode->multiFieldsBefore == 1) && (theNode->multiFieldsAfter == 0))))
+     { return(GenConstant(theEnv,FACT_JN_VAR3,FactGetVarJN3(theEnv,theNode,side))); }
+
+   if (((theNode->pnType == MF_WILDCARD_NODE) || (theNode->pnType == MF_VARIABLE_NODE)) &&
+       (theNode->multiFieldsBefore == 0) &&
+       (theNode->multiFieldsAfter == 0))
+     { return(GenConstant(theEnv,FACT_JN_VAR3,FactGetVarJN3(theEnv,theNode,side))); }
+
+   /*=========================================*/
+   /* Generate call to retrieve a value using */
+   /* the most general retrieval function.    */
+   /*=========================================*/
+
+   return(GenConstant(theEnv,FACT_JN_VAR1,FactGetVarJN1(theEnv,theNode,side)));
+  }
+
+/**************************************************************/
+/* FactGenCheckLength: Generates an expression for use in the */
+/*   fact pattern network that determines if the value of a   */
+/*   multifield slot contains enough fields to satisfy the    */
+/*   number of pattern matching constaints. For example, the  */
+/*   slot constraints (foo ?x a $? ?y) couldn't be matched    */
+/*   unless the foo slot contained at least 3 fields.         */
+/**************************************************************/
+struct expr *FactGenCheckLength(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   struct factCheckLengthPNCall hack;
+
+   /*===================================================*/
+   /* If the slot contains no single field constraints, */
+   /* then a length test is not necessary.              */
+   /*===================================================*/
+
+   if ((theNode->singleFieldsAfter == 0) &&
+       (theNode->pnType != SF_VARIABLE_NODE) &&
+       (theNode->pnType != SF_WILDCARD_NODE))
+     { return NULL; }
+
+   /*=======================================*/
+   /* Initialize the length test arguments. */
+   /*=======================================*/
+
+   ClearBitString(&hack,sizeof(struct factCheckLengthPNCall));
+   hack.whichSlot = (theNode->slotNumber - 1);
+
+   /*============================================*/
+   /* If the slot has no multifield constraints, */
+   /* then the length must match exactly.        */
+   /*============================================*/
+
+   if ((theNode->pnType != MF_VARIABLE_NODE) &&
+       (theNode->pnType != MF_WILDCARD_NODE) &&
+       (theNode->multiFieldsAfter == 0))
+     { hack.exactly = 1; }
+   else
+     { hack.exactly = 0; }
+
+   /*============================================*/
+   /* The minimum length is the number of single */
+   /* field constraints contained in the slot.   */
+   /*============================================*/
+
+   if ((theNode->pnType == SF_VARIABLE_NODE) || (theNode->pnType == SF_WILDCARD_NODE))
+     { hack.minLength = 1 + theNode->singleFieldsAfter; }
+   else
+     { hack.minLength = theNode->singleFieldsAfter; }
+
+   /*========================================================*/
+   /* Generate call to test the length of a multifield slot. */
+   /*========================================================*/
+
+   return(GenConstant(theEnv,FACT_SLOT_LENGTH,AddBitMap(theEnv,&hack,sizeof(struct factCheckLengthPNCall))));
+  }
+
+/**************************************************************/
+/* FactGenCheckZeroLength: Generates an expression for use in */
+/*   the fact pattern network that determines if the value of */
+/*   a multifield slot is a zero length multifield value.     */
+/**************************************************************/
+struct expr *FactGenCheckZeroLength(
+  Environment *theEnv,
+  unsigned short theSlot)
+  {
+   struct factCheckLengthPNCall hack;
+
+   ClearBitString(&hack,sizeof(struct factCheckLengthPNCall));
+
+   hack.whichSlot = theSlot - 1;
+   hack.exactly = true;
+   hack.minLength = 0;
+
+   return(GenConstant(theEnv,FACT_SLOT_LENGTH,AddBitMap(theEnv,&hack,sizeof(struct factCheckLengthPNCall))));
+  }
+
+/*********************************************************************/
+/* FactReplaceGetvar: Replaces a variable reference in an expression */
+/*   with a function call to retrieve the variable using the join    */
+/*   network variable access functions for facts.                    */
+/*********************************************************************/
+void FactReplaceGetvar(
+  Environment *theEnv,
+  struct expr *theItem,
+  struct lhsParseNode *theNode,
+  int side)
+  {
+   /*====================================================*/
+   /* Generate call to retrieve single field slot value. */
+   /*====================================================*/
+
+   if ((theNode->slotNumber > 0) &&
+       (theNode->slotNumber != UNSPECIFIED_SLOT) &&
+       (theNode->withinMultifieldSlot == false))
+     {
+      theItem->type = FACT_JN_VAR2;
+      theItem->value = FactGetVarJN2(theEnv,theNode,side);
+      return;
+     }
+
+   /*=====================================================*/
+   /* Generate call to retrieve a value from a multifield */
+   /* slot that contains at most one multifield variable  */
+   /* or contains no multifield variables before the      */
+   /* value to be retrieved.                              */
+   /*=====================================================*/
+
+   if (((theNode->pnType == SF_WILDCARD_NODE) || (theNode->pnType == SF_VARIABLE_NODE)) &&
+       ((theNode->multiFieldsBefore == 0) ||
+        ((theNode->multiFieldsBefore == 1) && (theNode->multiFieldsAfter == 0))))
+     {
+      theItem->type = FACT_JN_VAR3;
+      theItem->value = FactGetVarJN3(theEnv,theNode,side);
+      return;
+     }
+
+   if (((theNode->pnType == MF_WILDCARD_NODE) || (theNode->pnType == MF_VARIABLE_NODE)) &&
+       (theNode->multiFieldsBefore == 0) &&
+       (theNode->multiFieldsAfter == 0))
+     {
+      theItem->type = FACT_JN_VAR3;
+      theItem->value = FactGetVarJN3(theEnv,theNode,side);
+      return;
+     }
+
+   /*=========================================*/
+   /* Generate call to retrieve a value using */
+   /* the most general retrieval function.    */
+   /*=========================================*/
+
+   theItem->type = FACT_JN_VAR1;
+   theItem->value = FactGetVarJN1(theEnv,theNode,side);
+  }
+
+/***********************************************************************/
+/* FactReplaceGetfield: Replaces a variable reference in an expression */
+/*   with a function call to retrieve the variable using the pattern   */
+/*   network variable access functions for facts.                      */
+/***********************************************************************/
+void FactReplaceGetfield(
+  Environment *theEnv,
+  struct expr *theItem,
+  struct lhsParseNode *theNode)
+  {
+   /*====================================================*/
+   /* Generate call to retrieve single field slot value. */
+   /*====================================================*/
+
+   if (theNode->withinMultifieldSlot == false)
+     {
+      theItem->type = FACT_PN_VAR2;
+      theItem->value = FactGetVarPN2(theEnv,theNode);
+      return;
+     }
+
+   /*=====================================================*/
+   /* Generate call to retrieve a value from a multifield */
+   /* slot that contains at most one multifield variable  */
+   /* or contains no multifield variables before the      */
+   /* value to be retrieved.                              */
+   /*=====================================================*/
+
+   if (((theNode->pnType == SF_WILDCARD_NODE) || (theNode->pnType == SF_VARIABLE_NODE)) &&
+       ((theNode->multiFieldsBefore == 0) ||
+        ((theNode->multiFieldsBefore == 1) && (theNode->multiFieldsAfter == 0))))
+     {
+      theItem->type = FACT_PN_VAR3;
+      theItem->value = FactGetVarPN3(theEnv,theNode);
+      return;
+     }
+
+   if (((theNode->pnType == MF_WILDCARD_NODE) || (theNode->pnType == MF_VARIABLE_NODE)) &&
+       (theNode->multiFieldsBefore == 0) &&
+       (theNode->multiFieldsAfter == 0))
+     {
+      theItem->type = FACT_PN_VAR3;
+      theItem->value = FactGetVarPN3(theEnv,theNode);
+      return;
+     }
+
+   /*=========================================*/
+   /* Generate call to retrieve a value using */
+   /* the most general retrieval function.    */
+   /*=========================================*/
+
+   theItem->type = FACT_PN_VAR1;
+   theItem->value = FactGetVarPN1(theEnv,theNode);
+  }
+
+/*************************************************************/
+/* FactGetVarJN1: Creates the arguments for the most general */
+/*   routine for retrieving a variable's value from the slot */
+/*   of a fact. The retrieval relies on information stored   */
+/*   in a partial match, so this retrieval mechanism is used */
+/*   by expressions in the join network or from the RHS of a */
+/*   rule.                                                   */
+/*************************************************************/
+static void *FactGetVarJN1(
+  Environment *theEnv,
+  struct lhsParseNode *theNode,
+  int side)
+  {
+   struct factGetVarJN1Call hack;
+
+   /*===================================================*/
+   /* Clear the bitmap for storing the argument values. */
+   /*===================================================*/
+
+   ClearBitString(&hack,sizeof(struct factGetVarJN1Call));
+
+   /*=========================================*/
+   /* Store the position in the partial match */
+   /* from which the fact will be retrieved.  */
+   /*=========================================*/
+
+   if (side == LHS)
+     {
+      hack.lhs = 1;
+      hack.whichPattern = theNode->joinDepth;
+     }
+   else if (side == RHS)
+     {
+      hack.rhs = 1;
+      hack.whichPattern = 0;
+     }
+   else if (side == NESTED_RHS)
+     {
+      hack.rhs = 1;
+      hack.whichPattern = theNode->joinDepth;
+     }
+   else
+     { hack.whichPattern = theNode->joinDepth; }
+
+   /*========================================*/
+   /* A slot value of zero indicates that we */
+   /* want the pattern address returned.     */
+   /*========================================*/
+
+   if ((theNode->slotNumber == 0) || (theNode->slotNumber == UNSPECIFIED_SLOT))
+     {
+      hack.factAddress = 1;
+      hack.allFields = 0;
+      hack.whichSlot = 0;
+      hack.whichField = 0;
+     }
+
+   /*=====================================================*/
+   /* A slot value greater than zero and a field value of */
+   /* zero indicate that we want the entire contents of   */
+   /* the slot whether it is a single field or multifield */
+   /* slot.                                               */
+   /*=====================================================*/
+
+   else if (theNode->index <= 0)
+     {
+      hack.factAddress = 0;
+      hack.allFields = 1;
+      hack.whichSlot = theNode->slotNumber - 1;
+      hack.whichField = 0;
+     }
+
+   /*=====================================================*/
+   /* A slot value, m, and a field value, n, both greater */
+   /* than zero indicate that we want the nth field of    */
+   /* the mth slot.                                       */
+   /*=====================================================*/
+
+   else
+     {
+      hack.factAddress = 0;
+      hack.allFields = 0;
+      hack.whichSlot = theNode->slotNumber - 1;
+      hack.whichField = theNode->index - 1;
+     }
+
+   /*=============================*/
+   /* Return the argument bitmap. */
+   /*=============================*/
+
+   return(AddBitMap(theEnv,&hack,sizeof(struct factGetVarJN1Call)));
+  }
+
+/**************************************************************/
+/* FactGetVarJN2: Creates the arguments for the routine which */
+/*   retrieves a variable's value from a single field slot of */
+/*   a fact. The retrieval relies on information stored in a  */
+/*   partial match, so this retrieval mechanism is used by    */
+/*   expressions in the join network or from the RHS of a     */
+/*   rule.                                                    */
+/**************************************************************/
+static void *FactGetVarJN2(
+  Environment *theEnv,
+  struct lhsParseNode *theNode,
+  int side)
+  {
+   struct factGetVarJN2Call hack;
+
+   /*===================================================*/
+   /* Clear the bitmap for storing the argument values. */
+   /*===================================================*/
+
+   ClearBitString(&hack,sizeof(struct factGetVarJN2Call));
+
+   /*=====================================================*/
+   /* Store the position in the partial match from which  */
+   /* the fact will be retrieved and the slot in the fact */
+   /* from which the value will be retrieved.             */
+   /*=====================================================*/
+
+   hack.whichSlot = theNode->slotNumber - 1;
+
+   if (side == LHS)
+     {
+      hack.lhs = 1;
+      hack.whichPattern = theNode->joinDepth;
+     }
+   else if (side == RHS)
+     {
+      hack.rhs = 1;
+      hack.whichPattern = 0;
+     }
+   else if (side == NESTED_RHS)
+     {
+      hack.rhs = 1;
+      hack.whichPattern = theNode->joinDepth;
+     }
+   else
+     { hack.whichPattern = theNode->joinDepth; }
+
+   /*=============================*/
+   /* Return the argument bitmap. */
+   /*=============================*/
+
+   return AddBitMap(theEnv,&hack,sizeof(struct factGetVarJN2Call));
+  }
+
+/*************************************************************/
+/* FactGetVarJN3: Creates the arguments for the routine for  */
+/*   retrieving a variable's value from a multifield slot of */
+/*   a fact. For this routine, the variable's value must be  */
+/*   from a multifield slot that contains at most one        */
+/*   multifield variable or contains no multifield variables */
+/*   before the variable's value to be retrieved. The        */
+/*   retrieval relies on information stored in a partial     */
+/*   match, so this retrieval mechanism is used by           */
+/*   expressions in the join network or from the RHS of a    */
+/*   rule.                                                   */
+/*************************************************************/
+static void *FactGetVarJN3(
+  Environment *theEnv,
+  struct lhsParseNode *theNode,
+  int side)
+  {
+   struct factGetVarJN3Call hack;
+
+   /*===================================================*/
+   /* Clear the bitmap for storing the argument values. */
+   /*===================================================*/
+
+   ClearBitString(&hack,sizeof(struct factGetVarJN3Call));
+
+   /*=====================================================*/
+   /* Store the position in the partial match from which  */
+   /* the fact will be retrieved and the slot in the fact */
+   /* from which the value will be retrieved.             */
+   /*=====================================================*/
+
+   hack.whichSlot = theNode->slotNumber - 1;
+
+   if (side == LHS)
+     {
+      hack.lhs = 1;
+      hack.whichPattern = theNode->joinDepth;
+     }
+   else if (side == RHS)
+     {
+      hack.rhs = 1;
+      hack.whichPattern = 0;
+     }
+   else if (side == NESTED_RHS)
+     {
+      hack.rhs = 1;
+      hack.whichPattern = theNode->joinDepth;
+     }
+   else
+     { hack.whichPattern = theNode->joinDepth; }
+
+   /*==============================================================*/
+   /* If a single field variable value is being retrieved, then... */
+   /*==============================================================*/
+
+   if ((theNode->pnType == SF_WILDCARD_NODE) || (theNode->pnType == SF_VARIABLE_NODE))
+     {
+      /*=========================================================*/
+      /* If no multifield values occur before the variable, then */
+      /* the variable's value can be retrieved based on its      */
+      /* offset from the beginning of the slot's value           */
+      /* regardless of the number of multifield variables or     */
+      /* wildcards following the variable being retrieved.       */
+      /*=========================================================*/
+
+      if (theNode->multiFieldsBefore == 0)
+        {
+         hack.fromBeginning = 1;
+         hack.fromEnd = 0;
+         hack.beginOffset = theNode->singleFieldsBefore;
+         hack.endOffset = 0;
+        }
+
+      /*===============================================*/
+      /* Otherwise the variable is retrieved based its */
+      /* position relative to the end of the slot.     */
+      /*===============================================*/
+
+      else
+        {
+         hack.fromBeginning = 0;
+         hack.fromEnd = 1;
+         hack.beginOffset = 0;
+         hack.endOffset = theNode->singleFieldsAfter;
+        }
+
+      /*=============================*/
+      /* Return the argument bitmap. */
+      /*=============================*/
+
+      return(AddBitMap(theEnv,&hack,sizeof(struct factGetVarJN3Call)));
+     }
+
+   /*============================================================*/
+   /* A multifield variable value is being retrieved. This means */
+   /* that there are no other multifield variables or wildcards  */
+   /* in the slot. The multifield value is retrieved by storing  */
+   /* the number of single field values which come before and    */
+   /* after the multifield value. The multifield value can then  */
+   /* be retrieved based on the length of the value in the slot  */
+   /* and the number of single field values which must occur     */
+   /* before and after the multifield value.                     */
+   /*============================================================*/
+
+   hack.fromBeginning = 1;
+   hack.fromEnd = 1;
+   hack.beginOffset = theNode->singleFieldsBefore;
+   hack.endOffset = theNode->singleFieldsAfter;
+
+   /*=============================*/
+   /* Return the argument bitmap. */
+   /*=============================*/
+
+   return AddBitMap(theEnv,&hack,sizeof(struct factGetVarJN3Call));
+  }
+
+/**************************************************************/
+/* FactGetVarPN1: Creates the arguments for the most general  */
+/*   routine for retrieving a variable's value from the slot  */
+/*   of a fact. The retrieval relies on information stored    */
+/*   during fact pattern matching, so this retrieval          */
+/*   mechanism is only used by expressions in the pattern     */
+/*   network.                                                 */
+/**************************************************************/
+static void *FactGetVarPN1(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   struct factGetVarPN1Call hack;
+
+   /*===================================================*/
+   /* Clear the bitmap for storing the argument values. */
+   /*===================================================*/
+
+   ClearBitString(&hack,sizeof(struct factGetVarPN1Call));
+
+   /*========================================*/
+   /* A slot value of zero indicates that we */
+   /* want the pattern address returned.     */
+   /*========================================*/
+
+   if ((theNode->slotNumber == 0) ||
+       (theNode->slotNumber == UNSPECIFIED_SLOT))
+     {
+      hack.factAddress = 1;
+      hack.allFields = 0;
+      hack.whichSlot = 0;
+      hack.whichField = 0;
+     }
+
+   /*=====================================================*/
+   /* A slot value greater than zero and a field value of */
+   /* zero indicate that we want the entire contents of   */
+   /* the slot whether it is a single field or multifield */
+   /* slot.                                               */
+   /*=====================================================*/
+
+   else if (theNode->index <= 0)
+     {
+      hack.factAddress = 0;
+      hack.allFields = 1;
+      hack.whichSlot = theNode->slotNumber - 1;
+      hack.whichField = 0;
+     }
+
+   /*=============================================*/
+   /* A slot value, m, and a field value, n, both */
+   /* greater than zero indicate that we want the */
+   /* nth field of the mth slot.                  */
+   /*=============================================*/
+
+   else
+     {
+      hack.factAddress = 0;
+      hack.allFields = 0;
+      hack.whichSlot = theNode->slotNumber - 1;
+      hack.whichField = theNode->index - 1;
+     }
+
+   /*=============================*/
+   /* Return the argument bitmap. */
+   /*=============================*/
+
+   return AddBitMap(theEnv,&hack,sizeof(struct factGetVarPN1Call));
+  }
+
+/***************************************************************/
+/* FactGetVarPN2: Creates the arguments for the routine which  */
+/*   retrieves a variable's value from a single field slot of  */
+/*   a fact. The retrieval relies on information stored during */
+/*   fact pattern matching, so this retrieval mechanism is     */
+/*   only used by expressions in the pattern network.          */
+/***************************************************************/
+static void *FactGetVarPN2(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   struct factGetVarPN2Call hack;
+
+   /*===================================================*/
+   /* Clear the bitmap for storing the argument values. */
+   /*===================================================*/
+
+   ClearBitString(&hack,sizeof(struct factGetVarPN2Call));
+
+   /*=======================================*/
+   /* Store the slot in the fact from which */
+   /* the value will be retrieved.          */
+   /*=======================================*/
+
+   hack.whichSlot = theNode->slotNumber - 1;
+
+   /*=============================*/
+   /* Return the argument bitmap. */
+   /*=============================*/
+
+   return AddBitMap(theEnv,&hack,sizeof(struct factGetVarPN2Call));
+  }
+
+/*************************************************************/
+/* FactGetVarPN3: Creates the arguments for the routine for  */
+/*   retrieving a variable's value from a multifield slot of */
+/*   a fact. For this routine, the variable's value must be  */
+/*   from a multifield slot that contains at most one        */
+/*   multifield variable or contains no multifield variables */
+/*   before the variable's value to be retrieved. The        */
+/*   retrieval relies on information stored during fact      */
+/*   pattern matching, so this retrieval mechanism is only   */
+/*   used by expressions in the pattern network.             */
+/*************************************************************/
+static void *FactGetVarPN3(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   struct factGetVarPN3Call hack;
+
+   /*===================================================*/
+   /* Clear the bitmap for storing the argument values. */
+   /*===================================================*/
+
+   ClearBitString(&hack,sizeof(struct factGetVarPN3Call));
+
+   /*=======================================*/
+   /* Store the slot in the fact from which */
+   /* the value will be retrieved.          */
+   /*=======================================*/
+
+   hack.whichSlot = theNode->slotNumber - 1;
+
+   /*==============================================================*/
+   /* If a single field variable value is being retrieved, then... */
+   /*==============================================================*/
+
+   if ((theNode->pnType == SF_WILDCARD_NODE) || (theNode->pnType == SF_VARIABLE_NODE) || ConstantNode(theNode))
+     {
+      /*=========================================================*/
+      /* If no multifield values occur before the variable, then */
+      /* the variable's value can be retrieved based on its      */
+      /* offset from the beginning of the slot's value           */
+      /* regardless of the number of multifield variables or     */
+      /* wildcards following the variable being retrieved.       */
+      /*=========================================================*/
+
+      if (theNode->multiFieldsBefore == 0)
+        {
+         hack.fromBeginning = 1;
+         hack.fromEnd = 0;
+         hack.beginOffset = theNode->singleFieldsBefore;
+         hack.endOffset = 0;
+        }
+
+      /*===============================================*/
+      /* Otherwise the variable is retrieved based its */
+      /* position relative to the end of the slot.     */
+      /*===============================================*/
+
+      else
+        {
+         hack.fromBeginning = 0;
+         hack.fromEnd = 1;
+         hack.beginOffset = 0;
+         hack.endOffset = theNode->singleFieldsAfter;
+        }
+
+      return(AddBitMap(theEnv,&hack,sizeof(struct factGetVarPN3Call)));
+     }
+
+   /*============================================================*/
+   /* A multifield variable value is being retrieved. This means */
+   /* that there are no other multifield variables or wildcards  */
+   /* in the slot. The multifield value is retrieved by storing  */
+   /* the number of single field values which come before and    */
+   /* after the multifield value. The multifield value can then  */
+   /* be retrieved based on the length of the value in the slot  */
+   /* and the number of single field values which must occur     */
+   /* before and after the multifield value.                     */
+   /*============================================================*/
+
+   hack.fromBeginning = 1;
+   hack.fromEnd = 1;
+   hack.beginOffset = theNode->singleFieldsBefore;
+   hack.endOffset = theNode->singleFieldsAfter;
+
+   /*=============================*/
+   /* Return the argument bitmap. */
+   /*=============================*/
+
+   return AddBitMap(theEnv,&hack,sizeof(struct factGetVarPN3Call));
+  }
+
+/*************************************************************/
+/* FactPNVariableComparison: Generates an expression for use */
+/*   in the fact pattern network to compare two variables of */
+/*   the same name found in the same pattern.                */
+/*************************************************************/
+struct expr *FactPNVariableComparison(
+  Environment *theEnv,
+  struct lhsParseNode *selfNode,
+  struct lhsParseNode *referringNode)
+  {
+   struct expr *top;
+   struct factCompVarsPN1Call hack;
+
+   /*===================================================*/
+   /* Clear the bitmap for storing the argument values. */
+   /*===================================================*/
+
+   ClearBitString(&hack,sizeof(struct factCompVarsPN1Call));
+
+   /*================================================================*/
+   /* If two single field slots of a deftemplate are being compared, */
+   /* then use the following specified variable comparison routine.  */
+   /*================================================================*/
+
+   if ((selfNode->withinMultifieldSlot == false) &&
+       (selfNode->slotNumber > 0) &&
+       (selfNode->slotNumber != UNSPECIFIED_SLOT) &&
+       (referringNode->withinMultifieldSlot == false) &&
+       (referringNode->slotNumber > 0) &&
+       (referringNode->slotNumber != UNSPECIFIED_SLOT))
+     {
+      hack.pass = 0;
+      hack.fail = 0;
+      hack.field1 = selfNode->slotNumber - 1;
+      hack.field2 = referringNode->slotNumber - 1;
+
+      if (selfNode->negated) hack.fail = 1;
+      else hack.pass = 1;
+
+      top = GenConstant(theEnv,FACT_PN_CMP1,AddBitMap(theEnv,&hack,sizeof(struct factCompVarsPN1Call)));
+     }
+
+   /*================================================================*/
+   /* Otherwise, use the eq function to compare the values retrieved */
+   /* by the appropriate get variable value functions.               */
+   /*================================================================*/
+
+   else
+     {
+      if (selfNode->negated) top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NEQ);
+      else top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_EQ);
+
+      top->argList = FactGenGetfield(theEnv,selfNode);
+      top->argList->nextArg = FactGenGetfield(theEnv,referringNode);
+     }
+
+   /*======================================*/
+   /* Return the expression for performing */
+   /* the variable comparison.             */
+   /*======================================*/
+
+   return top;
+  }
+
+/*********************************************************/
+/* FactJNVariableComparison: Generates an expression for */
+/*   use in the join network to compare two variables of */
+/*   the same name found in different patterns.          */
+/*********************************************************/
+struct expr *FactJNVariableComparison(
+  Environment *theEnv,
+  struct lhsParseNode *selfNode,
+  struct lhsParseNode *referringNode,
+  bool nandJoin)
+  {
+   struct expr *top;
+   struct factCompVarsJN1Call hack1;
+   struct factCompVarsJN2Call hack2;
+   struct lhsParseNode *firstNode;
+
+   /*================================================================*/
+   /* If two single field slots of a deftemplate are being compared, */
+   /* then use the following specified variable comparison routine.  */
+   /*================================================================*/
+
+   if ((selfNode->withinMultifieldSlot == false) &&
+       (selfNode->slotNumber > 0) &&
+       (selfNode->slotNumber != UNSPECIFIED_SLOT) &&
+       (referringNode->withinMultifieldSlot == false) &&
+       (referringNode->slotNumber > 0) &&
+       (referringNode->slotNumber != UNSPECIFIED_SLOT))
+     {
+      ClearBitString(&hack1,sizeof(struct factCompVarsJN1Call));
+      hack1.pass = 0;
+      hack1.fail = 0;
+
+      if (nandJoin)
+        { firstNode = referringNode; }
+      else
+        { firstNode = selfNode; }
+
+      hack1.slot1 = firstNode->slotNumber - 1;
+
+      if (nandJoin)
+        { hack1.pattern1 = referringNode->joinDepth; }
+      else
+        { hack1.pattern1 = 0; }
+
+      hack1.p1rhs = true;
+      hack1.p2lhs = true;
+
+      hack1.pattern2 = referringNode->joinDepth;
+
+      if (referringNode->index == NO_INDEX) hack1.slot2 = 0;
+      else hack1.slot2 = referringNode->slotNumber - 1;
+
+      if (selfNode->negated) hack1.fail = 1;
+      else hack1.pass = 1;
+
+      top = GenConstant(theEnv,FACT_JN_CMP1,AddBitMap(theEnv,&hack1,sizeof(struct factCompVarsJN1Call)));
+     }
+
+   /*===============================================================*/
+   /* If two single field values are compared and either or both of */
+   /* them are contained in multifield slots (and the value can be  */
+   /* accessed relative to either the beginning or end of the slot  */
+   /* with no intervening multifield variables), then use the       */
+   /* following specified variable comparison routine.              */
+   /*===============================================================*/
+
+   else if ((selfNode->slotNumber > 0) &&
+            (selfNode->slotNumber != UNSPECIFIED_SLOT) &&
+            (selfNode->pnType == SF_VARIABLE_NODE) &&
+            ((selfNode->multiFieldsBefore == 0) ||
+             ((selfNode->multiFieldsBefore == 1) &&
+              (selfNode->multiFieldsAfter == 0))) &&
+            (referringNode->slotNumber > 0) &&
+            (referringNode->slotNumber != UNSPECIFIED_SLOT) &&
+            (referringNode->pnType == SF_VARIABLE_NODE) &&
+            ((referringNode->multiFieldsBefore == 0) ||
+             (referringNode->multiFieldsAfter == 0)))
+     {
+      ClearBitString(&hack2,sizeof(struct factCompVarsJN2Call));
+      hack2.pass = 0;
+      hack2.fail = 0;
+
+      if (nandJoin)
+        { firstNode = referringNode; }
+      else
+        { firstNode = selfNode; }
+
+      hack2.slot1 = firstNode->slotNumber - 1;
+
+      if (nandJoin)
+        { hack2.pattern1 = referringNode->joinDepth; }
+      else
+        { hack2.pattern1 = 0; }
+
+      hack2.p1rhs = true;
+      hack2.p2lhs = true;
+
+      hack2.pattern2 = referringNode->joinDepth;
+      hack2.slot2 = referringNode->slotNumber - 1;
+
+      if (firstNode->multiFieldsBefore == 0)
+        {
+         hack2.fromBeginning1 = 1;
+         hack2.offset1 = firstNode->singleFieldsBefore;
+        }
+      else
+        {
+         hack2.fromBeginning1 = 0;
+         hack2.offset1 = firstNode->singleFieldsAfter;
+        }
+
+      if (referringNode->multiFieldsBefore == 0)
+        {
+         hack2.fromBeginning2 = 1;
+         hack2.offset2 = referringNode->singleFieldsBefore;
+        }
+      else
+        {
+         hack2.fromBeginning2 = 0;
+         hack2.offset2 = referringNode->singleFieldsAfter;
+        }
+
+      if (selfNode->negated) hack2.fail = 1;
+      else hack2.pass = 1;
+
+      top = GenConstant(theEnv,FACT_JN_CMP2,AddBitMap(theEnv,&hack2,sizeof(struct factCompVarsJN2Call)));
+     }
+
+   /*===============================================================*/
+   /* Otherwise, use the equality or inequality function to compare */
+   /* the values returned by the appropriate join network variable  */
+   /* retrieval function call.                                      */
+   /*===============================================================*/
+
+   else
+     {
+      if (selfNode->negated)
+        { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NEQ); }
+      else
+        { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_EQ); }
+
+      if (nandJoin)
+        { top->argList = FactGenGetvar(theEnv,selfNode,NESTED_RHS); }
+      else
+        { top->argList = FactGenGetvar(theEnv,selfNode,RHS); }
+
+      top->argList->nextArg = FactGenGetvar(theEnv,referringNode,LHS);
+     }
+
+   /*======================================*/
+   /* Return the expression for performing */
+   /* the variable comparison.             */
+   /*======================================*/
+
+   return(top);
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT */
+
+
diff --git a/clips/factgen.h b/clips/factgen.h
new file mode 100755
index 000000000..6e92fd410
--- /dev/null
+++ b/clips/factgen.h
@@ -0,0 +1,229 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*        FACT RETE FUNCTION GENERATION HEADER FILE    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Support for performance optimizations.         */
+/*                                                           */
+/*            Increased maximum values for pattern/slot      */
+/*            indices.                                       */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factgen
+
+#pragma once
+
+#define _H_factgen
+
+#include "reorder.h"
+
+/**********************************************************/
+/* factGetVarPN1Call: This structure is used to store the */
+/*   arguments to the most general extraction routine for */
+/*   retrieving a variable from the fact pattern network. */
+/**********************************************************/
+struct factGetVarPN1Call
+  {
+   unsigned int factAddress : 1;
+   unsigned int allFields : 1;
+   unsigned short whichField;
+   unsigned short whichSlot;
+  };
+
+/***********************************************************/
+/* factGetVarPN2Call: This structure is used to store the  */
+/*   arguments to the most specific extraction routine for */
+/*   retrieving a variable from the fact pattern network.  */
+/*   It is used for retrieving the single value stored in  */
+/*   a single field slot (the slot index can be used to    */
+/*   directly to retrieve the value from the fact array).  */
+/***********************************************************/
+struct factGetVarPN2Call
+  {
+   unsigned short whichSlot;
+  };
+
+/**********************************************************/
+/* factGetVarPN3Call:  */
+/**********************************************************/
+struct factGetVarPN3Call
+  {
+   unsigned int fromBeginning : 1;
+   unsigned int fromEnd : 1;
+   unsigned short beginOffset;
+   unsigned short endOffset;
+   unsigned short whichSlot;
+  };
+
+/**************************************************************/
+/* factConstantPN1Call: Used for testing for a constant value */
+/*   in the fact pattern network. Compare the value of a      */
+/*   single field slot to a constant.                         */
+/**************************************************************/
+struct factConstantPN1Call
+  {
+   unsigned int testForEquality : 1;
+   unsigned short whichSlot;
+  };
+
+/******************************************************************/
+/* factConstantPN2Call: Used for testing for a constant value in  */
+/*   the fact pattern network. Compare the value of a multifield  */
+/*   slot to a constant (where the value retrieved for comparison */
+/*   from the slot contains no multifields before or only one     */
+/*   multifield before and none after).                           */
+/******************************************************************/
+struct factConstantPN2Call
+  {
+   unsigned int testForEquality : 1;
+   unsigned int fromBeginning : 1;
+   unsigned short offset;
+   unsigned short whichSlot;
+  };
+
+/**********************************************************/
+/* factGetVarJN1Call: This structure is used to store the */
+/*   arguments to the most general extraction routine for */
+/*   retrieving a fact variable from the join network.    */
+/**********************************************************/
+struct factGetVarJN1Call
+  {
+   unsigned int factAddress : 1;
+   unsigned int allFields : 1;
+   unsigned int lhs : 1;
+   unsigned int rhs : 1;
+   unsigned short whichPattern;
+   unsigned short whichSlot;
+   unsigned short whichField;
+  };
+
+/**********************************************************/
+/* factGetVarJN2Call:  */
+/**********************************************************/
+struct factGetVarJN2Call
+  {
+   unsigned int lhs : 1;
+   unsigned int rhs : 1;
+   unsigned short whichPattern;
+   unsigned short whichSlot;
+  };
+
+/**********************************************************/
+/* factGetVarJN3Call:  */
+/**********************************************************/
+struct factGetVarJN3Call
+  {
+   unsigned int fromBeginning : 1;
+   unsigned int fromEnd : 1;
+   unsigned int lhs : 1;
+   unsigned int rhs : 1;
+   unsigned short beginOffset;
+   unsigned short endOffset;
+   unsigned short whichPattern;
+   unsigned short whichSlot;
+  };
+
+/**********************************************************/
+/* factCompVarsPN1Call:  */
+/**********************************************************/
+struct factCompVarsPN1Call
+  {
+   unsigned int pass : 1;
+   unsigned int fail : 1;
+   unsigned short field1;
+   unsigned short field2;
+  };
+
+/**********************************************************/
+/* factCompVarsJN1Call:  */
+/**********************************************************/
+struct factCompVarsJN1Call
+  {
+   unsigned int pass : 1;
+   unsigned int fail : 1;
+   unsigned int p1lhs: 1;
+   unsigned int p1rhs: 1;
+   unsigned int p2lhs: 1;
+   unsigned int p2rhs: 1;
+   unsigned short pattern1;
+   unsigned short pattern2;
+   unsigned short slot1;
+   unsigned short slot2;
+  };
+
+/**********************************************************/
+/* factCompVarsJN2Call:  */
+/**********************************************************/
+struct factCompVarsJN2Call
+  {
+   unsigned int pass : 1;
+   unsigned int fail : 1;
+   unsigned int p1lhs: 1;
+   unsigned int p1rhs: 1;
+   unsigned int p2lhs: 1;
+   unsigned int p2rhs: 1;
+   unsigned int fromBeginning1 : 1;
+   unsigned int fromBeginning2 : 1;
+   unsigned short offset1;
+   unsigned short offset2;
+   unsigned short pattern1;
+   unsigned short pattern2;
+   unsigned short slot1;
+   unsigned short slot2;
+  };
+
+/**********************************************************/
+/* factCheckLengthPNCall: This structure is used to store */
+/*   the  arguments to the routine for determining if the */
+/*   length of a multifield slot is equal or greater than */
+/*   a specified value.                                   */
+/**********************************************************/
+
+struct factCheckLengthPNCall
+  {
+    unsigned int exactly : 1;
+    unsigned short minLength;
+    unsigned short whichSlot;
+  };
+
+/****************************************/
+/* GLOBAL EXTERNAL FUNCTION DEFINITIONS */
+/****************************************/
+
+   void                       InitializeFactReteFunctions(Environment *);
+   struct expr               *FactPNVariableComparison(Environment *,struct lhsParseNode *,
+                                                              struct lhsParseNode *);
+   struct expr               *FactJNVariableComparison(Environment *,struct lhsParseNode *,
+                                                              struct lhsParseNode *,bool);
+   void                       FactReplaceGetvar(Environment *,struct expr *,struct lhsParseNode *,int);
+   void                       FactReplaceGetfield(Environment *,struct expr *,struct lhsParseNode *);
+   struct expr               *FactGenPNConstant(Environment *,struct lhsParseNode *);
+   struct expr               *FactGenGetfield(Environment *,struct lhsParseNode *);
+   struct expr               *FactGenGetvar(Environment *,struct lhsParseNode *,int);
+   struct expr               *FactGenCheckLength(Environment *,struct lhsParseNode *);
+   struct expr               *FactGenCheckZeroLength(Environment *,unsigned short);
+
+#endif /* _H_factgen */
diff --git a/clips/facthsh.c b/clips/facthsh.c
new file mode 100755
index 000000000..8ecee1a75
--- /dev/null
+++ b/clips/facthsh.c
@@ -0,0 +1,435 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  12/30/16             */
+   /*                                                     */
+   /*                 FACT HASHING MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for maintaining a fact hash    */
+/*   table so that duplication of facts can quickly be       */
+/*   determined.                                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Fact hash table is resizable.                  */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added FactWillBeAsserted.                      */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Modify command preserves fact id and address.  */
+/*                                                           */
+/*            Assert returns duplicate fact. FALSE is now    */
+/*            returned only if an error occurs.              */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "factmngr.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "router.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#if DEFRULE_CONSTRUCT
+#include "lgcldpnd.h"
+#endif
+
+#include "facthsh.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static Fact                   *FactExists(Environment *,Fact *,size_t);
+   static struct factHashEntry  **CreateFactHashTable(Environment *,size_t);
+   static void                    ResizeFactHashTable(Environment *);
+   static void                    ResetFactHashTable(Environment *);
+
+/************************************************/
+/* HashFact: Returns the hash value for a fact. */
+/************************************************/
+size_t HashFact(
+  Fact *theFact)
+  {
+   size_t count = 0;
+
+   /*============================================*/
+   /* Get a hash value for the deftemplate name. */
+   /*============================================*/
+
+   count += theFact->whichDeftemplate->header.name->bucket * 73981;
+
+   /*=================================================*/
+   /* Add in the hash value for the rest of the fact. */
+   /*=================================================*/
+
+   count += HashMultifield(&theFact->theProposition,0);
+
+   /*================================*/
+   /* Make sure the hash value falls */
+   /* in the appropriate range.      */
+   /*================================*/
+
+   theFact->hashValue = (unsigned long) count;
+
+   /*========================*/
+   /* Return the hash value. */
+   /*========================*/
+
+   return count;
+  }
+
+/**********************************************/
+/* FactExists: Determines if a specified fact */
+/*   already exists in the fact hash table.   */
+/**********************************************/
+static Fact *FactExists(
+  Environment *theEnv,
+  Fact *theFact,
+  size_t hashValue)
+  {
+   struct factHashEntry *theFactHash;
+
+   hashValue = (hashValue % FactData(theEnv)->FactHashTableSize);
+
+   for (theFactHash = FactData(theEnv)->FactHashTable[hashValue];
+        theFactHash != NULL;
+        theFactHash = theFactHash->next)
+     {
+      if (theFact->hashValue != theFactHash->theFact->hashValue)
+        { continue; }
+
+      if ((theFact->whichDeftemplate == theFactHash->theFact->whichDeftemplate) ?
+          MultifieldsEqual(&theFact->theProposition,
+                           &theFactHash->theFact->theProposition) : false)
+        { return(theFactHash->theFact); }
+     }
+
+   return NULL;
+  }
+
+/************************************************************/
+/* AddHashedFact: Adds a fact entry to the fact hash table. */
+/************************************************************/
+void AddHashedFact(
+  Environment *theEnv,
+  Fact *theFact,
+  size_t hashValue)
+  {
+   struct factHashEntry *newhash, *temp;
+
+   if (FactData(theEnv)->NumberOfFacts > FactData(theEnv)->FactHashTableSize)
+     { ResizeFactHashTable(theEnv); }
+
+   newhash = get_struct(theEnv,factHashEntry);
+   newhash->theFact = theFact;
+
+   hashValue = (hashValue % FactData(theEnv)->FactHashTableSize);
+
+   temp = FactData(theEnv)->FactHashTable[hashValue];
+   FactData(theEnv)->FactHashTable[hashValue] = newhash;
+   newhash->next = temp;
+  }
+
+/******************************************/
+/* RemoveHashedFact: Removes a fact entry */
+/*   from the fact hash table.            */
+/******************************************/
+bool RemoveHashedFact(
+  Environment *theEnv,
+  Fact *theFact)
+  {
+   size_t hashValue;
+   struct factHashEntry *hptr, *prev;
+
+   hashValue = HashFact(theFact);
+   hashValue = (hashValue % FactData(theEnv)->FactHashTableSize);
+
+   for (hptr = FactData(theEnv)->FactHashTable[hashValue], prev = NULL;
+        hptr != NULL;
+        hptr = hptr->next)
+     {
+      if (hptr->theFact == theFact)
+        {
+         if (prev == NULL)
+           {
+            FactData(theEnv)->FactHashTable[hashValue] = hptr->next;
+            rtn_struct(theEnv,factHashEntry,hptr);
+            if (FactData(theEnv)->NumberOfFacts == 1)
+              { ResetFactHashTable(theEnv); }
+            return true;
+           }
+         else
+           {
+            prev->next = hptr->next;
+            rtn_struct(theEnv,factHashEntry,hptr);
+            if (FactData(theEnv)->NumberOfFacts == 1)
+              { ResetFactHashTable(theEnv); }
+            return true;
+           }
+        }
+      prev = hptr;
+     }
+
+   return false;
+  }
+
+/****************************************************/
+/* FactWillBeAsserted: Determines if a fact will be */
+/*   asserted based on the duplication settings.    */
+/****************************************************/
+bool FactWillBeAsserted(
+  Environment *theEnv,
+  Fact *theFact)
+  {
+   Fact *tempPtr;
+   size_t hashValue;
+
+   if (FactData(theEnv)->FactDuplication) return true;
+
+   hashValue = HashFact(theFact);
+
+   tempPtr = FactExists(theEnv,theFact,hashValue);
+   if (tempPtr == NULL) return true;
+
+   return false;
+  }
+
+/*****************************************************/
+/* HandleFactDuplication: Determines if a fact to be */
+/*   added to the fact-list is a duplicate entry and */
+/*   takes appropriate action based on the current   */
+/*   setting of the fact-duplication flag.           */
+/*****************************************************/
+size_t HandleFactDuplication(
+  Environment *theEnv,
+  Fact *theFact,
+  Fact **duplicate,
+  long long reuseIndex)
+  {
+   size_t hashValue;
+   *duplicate = NULL;
+
+   hashValue = HashFact(theFact);
+
+   if (FactData(theEnv)->FactDuplication)
+     { return hashValue; }
+
+   *duplicate = FactExists(theEnv,theFact,hashValue);
+   if (*duplicate == NULL) return hashValue;
+
+   if (reuseIndex == 0)
+     { ReturnFact(theEnv,theFact); }
+   else
+     {
+      theFact->nextFact = FactData(theEnv)->GarbageFacts;
+      FactData(theEnv)->GarbageFacts = theFact;
+      UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+      theFact->garbage = true;
+     }
+
+#if DEFRULE_CONSTRUCT
+   AddLogicalDependencies(theEnv,(struct patternEntity *) *duplicate,true);
+#endif
+
+   return 0;
+  }
+
+/*******************************************/
+/* GetFactDuplication: C access routine    */
+/*   for the get-fact-duplication command. */
+/*******************************************/
+bool GetFactDuplication(
+  Environment *theEnv)
+  {
+   return FactData(theEnv)->FactDuplication;
+  }
+
+/*******************************************/
+/* SetFactDuplication: C access routine    */
+/*   for the set-fact-duplication command. */
+/*******************************************/
+bool SetFactDuplication(
+  Environment *theEnv,
+  bool value)
+  {
+   bool ov;
+
+   ov = FactData(theEnv)->FactDuplication;
+   FactData(theEnv)->FactDuplication = value;
+   return ov;
+  }
+
+/**************************************************/
+/* InitializeFactHashTable: Initializes the table */
+/*   entries in the fact hash table to NULL.      */
+/**************************************************/
+void InitializeFactHashTable(
+   Environment *theEnv)
+   {
+    FactData(theEnv)->FactHashTable = CreateFactHashTable(theEnv,SIZE_FACT_HASH);
+    FactData(theEnv)->FactHashTableSize = SIZE_FACT_HASH;
+   }
+
+/*******************************************************************/
+/* CreateFactHashTable: Creates and initializes a fact hash table. */
+/*******************************************************************/
+static struct factHashEntry **CreateFactHashTable(
+   Environment *theEnv,
+   size_t tableSize)
+   {
+    unsigned long i;
+    struct factHashEntry **theTable;
+
+    theTable = (struct factHashEntry **)
+               gm2(theEnv,sizeof (struct factHashEntry *) * tableSize);
+
+    if (theTable == NULL) ExitRouter(theEnv,EXIT_FAILURE);
+
+    for (i = 0; i < tableSize; i++) theTable[i] = NULL;
+
+    return theTable;
+   }
+
+/************************/
+/* ResizeFactHashTable: */
+/************************/
+static void ResizeFactHashTable(
+   Environment *theEnv)
+   {
+    unsigned long i, newSize, newLocation;
+    struct factHashEntry **theTable, **newTable;
+    struct factHashEntry *theEntry, *nextEntry;
+
+    theTable = FactData(theEnv)->FactHashTable;
+
+    newSize = (FactData(theEnv)->FactHashTableSize * 2) + 1;
+    newTable = CreateFactHashTable(theEnv,newSize);
+
+    /*========================================*/
+    /* Copy the old entries to the new table. */
+    /*========================================*/
+
+    for (i = 0; i < FactData(theEnv)->FactHashTableSize; i++)
+      {
+       theEntry = theTable[i];
+       while (theEntry != NULL)
+         {
+          nextEntry = theEntry->next;
+
+          newLocation = theEntry->theFact->hashValue % newSize;
+          theEntry->next = newTable[newLocation];
+          newTable[newLocation] = theEntry;
+
+          theEntry = nextEntry;
+         }
+      }
+
+    /*=====================================================*/
+    /* Replace the old hash table with the new hash table. */
+    /*=====================================================*/
+
+    rm(theEnv,theTable,sizeof(struct factHashEntry *) * FactData(theEnv)->FactHashTableSize);
+    FactData(theEnv)->FactHashTableSize = newSize;
+    FactData(theEnv)->FactHashTable = newTable;
+   }
+
+/***********************/
+/* ResetFactHashTable: */
+/***********************/
+static void ResetFactHashTable(
+   Environment *theEnv)
+   {
+    struct factHashEntry **newTable;
+
+    /*=============================================*/
+    /* Don't reset the table unless the hash table */
+    /* has been expanded from its original size.   */
+    /*=============================================*/
+
+    if (FactData(theEnv)->FactHashTableSize == SIZE_FACT_HASH)
+      { return; }
+
+    /*=======================*/
+    /* Create the new table. */
+    /*=======================*/
+
+    newTable = CreateFactHashTable(theEnv,SIZE_FACT_HASH);
+
+    /*=====================================================*/
+    /* Replace the old hash table with the new hash table. */
+    /*=====================================================*/
+
+    rm(theEnv,FactData(theEnv)->FactHashTable,sizeof(struct factHashEntry *) * FactData(theEnv)->FactHashTableSize);
+    FactData(theEnv)->FactHashTableSize = SIZE_FACT_HASH;
+    FactData(theEnv)->FactHashTable = newTable;
+   }
+
+#if DEVELOPER
+
+/****************************************************/
+/* ShowFactHashTableCommand: Displays the number of */
+/*   entries in each slot of the fact hash table.   */
+/****************************************************/
+void ShowFactHashTableCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned long i, count;
+   struct factHashEntry *theEntry;
+   char buffer[20];
+
+   for (i = 0; i < FactData(theEnv)->FactHashTableSize; i++)
+     {
+      for (theEntry =  FactData(theEnv)->FactHashTable[i], count = 0;
+           theEntry != NULL;
+           theEntry = theEntry->next)
+        { count++; }
+
+      if (count != 0)
+        {
+         gensprintf(buffer,"%4lu: %4d\n",i,count);
+         WriteString(theEnv,STDOUT,buffer);
+        }
+     }
+  }
+
+#endif /* DEVELOPER */
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
diff --git a/clips/facthsh.h b/clips/facthsh.h
new file mode 100755
index 000000000..2a2a4cc90
--- /dev/null
+++ b/clips/facthsh.h
@@ -0,0 +1,81 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  12/30/16            */
+   /*                                                     */
+   /*                 FACT HASHING MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Fact hash table is resizable.                  */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added FactWillBeAsserted.                      */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Modify command preserves fact id and address.  */
+/*                                                           */
+/*            Assert returns duplicate fact. FALSE is now    */
+/*            returned only if an error occurs.              */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_facthsh
+
+#pragma once
+
+#define _H_facthsh
+
+#include "entities.h"
+
+typedef struct factHashEntry FactHashEntry;
+
+struct factHashEntry
+  {
+   Fact *theFact;
+   FactHashEntry *next;
+  };
+
+#define SIZE_FACT_HASH 16231
+
+   void                           AddHashedFact(Environment *,Fact *,size_t);
+   bool                           RemoveHashedFact(Environment *,Fact *);
+   size_t                         HandleFactDuplication(Environment *,Fact *,Fact **,long long);
+   bool                           GetFactDuplication(Environment *);
+   bool                           SetFactDuplication(Environment *,bool);
+   void                           InitializeFactHashTable(Environment *);
+   void                           ShowFactHashTableCommand(Environment *,UDFContext *,UDFValue *);
+   size_t                         HashFact(Fact *);
+   bool                           FactWillBeAsserted(Environment *,Fact *);
+
+#endif /* _H_facthsh */
+
+
diff --git a/clips/factlhs.c b/clips/factlhs.c
new file mode 100755
index 000000000..bfae9bdf5
--- /dev/null
+++ b/clips/factlhs.c
@@ -0,0 +1,250 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*           FACT LHS PATTERN PARSING MODULE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains routines for integration of ordered and */
+/*   deftemplate fact patterns with the defrule LHS pattern  */
+/*   parser including routines for recognizing fact          */
+/*   patterns, parsing ordered fact patterns, and initiating */
+/*   the parsing of deftemplate fact patterns.               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Initialize the exists member.                  */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed initial-fact support.                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT && (! RUN_TIME) && (! BLOAD_ONLY)
+
+#include <stdio.h>
+
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "modulpsr.h"
+#include "modulutl.h"
+#include "pattern.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "reorder.h"
+#include "router.h"
+#include "tmpltdef.h"
+#include "tmpltlhs.h"
+#include "tmpltpsr.h"
+#include "tmpltutl.h"
+
+#include "factlhs.h"
+
+/***********************************************/
+/* SequenceRestrictionParse: Parses an ordered */
+/*   fact pattern conditional element.         */
+/*                                             */
+/*   <ordered-fact-pattern-CE>                 */
+/*             ::= (<symbol> <constraint>+)    */
+/***********************************************/
+struct lhsParseNode *SequenceRestrictionParse(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken)
+  {
+   struct lhsParseNode *topNode;
+   struct lhsParseNode *nextField;
+
+   /*================================================*/
+   /* Create the pattern node for the relation name. */
+   /*================================================*/
+
+   topNode = GetLHSParseNode(theEnv);
+   topNode->pnType = SF_WILDCARD_NODE;
+   topNode->negated = false;
+   topNode->exists = false;
+   topNode->index = NO_INDEX;
+   topNode->slotNumber = 1;
+   topNode->bottom = GetLHSParseNode(theEnv);
+   topNode->bottom->pnType = SYMBOL_NODE;
+   topNode->bottom->negated = false;
+   topNode->bottom->exists = false;
+   topNode->bottom->value = theToken->value;
+
+   /*======================================================*/
+   /* Connective constraints cannot be used in conjunction */
+   /* with the first field of a pattern.                   */
+   /*======================================================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,theToken);
+   if ((theToken->tknType == OR_CONSTRAINT_TOKEN) ||
+       (theToken->tknType == AND_CONSTRAINT_TOKEN))
+     {
+      ReturnLHSParseNodes(theEnv,topNode);
+      SyntaxErrorMessage(theEnv,"the first field of a pattern");
+      return NULL;
+     }
+
+   /*============================================================*/
+   /* Treat the remaining constraints of an ordered fact pattern */
+   /* as if they were contained in a multifield slot.            */
+   /*============================================================*/
+
+   nextField = RestrictionParse(theEnv,readSource,theToken,true,NULL,1,NULL,1);
+   if (nextField == NULL)
+     {
+      ReturnLHSParseNodes(theEnv,topNode);
+      return NULL;
+     }
+   topNode->right = nextField;
+
+   /*================================================*/
+   /* The pattern must end with a right parenthesis. */
+   /*================================================*/
+
+   if (theToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,theToken->printForm);
+      SyntaxErrorMessage(theEnv,"fact patterns");
+      ReturnLHSParseNodes(theEnv,topNode);
+      return NULL;
+     }
+
+   /*====================================*/
+   /* Fix the pretty print output if the */
+   /* slot contained no restrictions.    */
+   /*====================================*/
+
+   if (nextField->bottom == NULL)
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+     }
+
+   /*===================================*/
+   /* If no errors, return the pattern. */
+   /*===================================*/
+
+   return(topNode);
+  }
+
+/**********************************************************************/
+/* FactPatternParserFind: This function is the pattern find function  */
+/*   for facts. It tells the pattern parsing code that the specified  */
+/*   pattern can be parsed as a fact pattern. By default, any pattern */
+/*   beginning with a symbol can be parsed as a fact pattern. Since   */
+/*   all patterns begin with a symbol, it follows that all patterns   */
+/*   can be parsed as a fact pattern.                                 */
+/**********************************************************************/
+bool FactPatternParserFind(
+  CLIPSLexeme *theRelation)
+  {
+#if MAC_XCD
+#pragma unused(theRelation)
+#endif
+   return true;
+  }
+
+/******************************************************/
+/* FactPatternParse: This function is called to parse */
+/*  both deftemplate and ordered fact patterns.       */
+/******************************************************/
+struct lhsParseNode *FactPatternParse(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken)
+  {
+   Deftemplate *theDeftemplate;
+   unsigned int count;
+
+   /*=========================================*/
+   /* A module separator can not be included  */
+   /* as part of the pattern's relation name. */
+   /*=========================================*/
+
+   if (FindModuleSeparator(theToken->lexemeValue->contents))
+     {
+      IllegalModuleSpecifierMessage(theEnv);
+      return NULL;
+     }
+
+   /*=========================================================*/
+   /* Find the deftemplate associated with the relation name. */
+   /*=========================================================*/
+
+   theDeftemplate = (Deftemplate *)
+                    FindImportedConstruct(theEnv,"deftemplate",NULL,theToken->lexemeValue->contents,
+                                          &count,true,NULL);
+
+   if (count > 1)
+     {
+      AmbiguousReferenceErrorMessage(theEnv,"deftemplate",theToken->lexemeValue->contents);
+      return NULL;
+     }
+
+   /*======================================================*/
+   /* If no deftemplate exists with the specified relation */
+   /* name, then create an implied deftemplate.            */
+   /*======================================================*/
+
+   if (theDeftemplate == NULL)
+     {
+#if DEFMODULE_CONSTRUCT
+      if (FindImportExportConflict(theEnv,"deftemplate",GetCurrentModule(theEnv),theToken->lexemeValue->contents))
+        {
+         ImportExportConflictMessage(theEnv,"implied deftemplate",theToken->lexemeValue->contents,NULL,NULL);
+         return NULL;
+        }
+#endif /* DEFMODULE_CONSTRUCT */
+
+      if (! ConstructData(theEnv)->CheckSyntaxMode)
+        { theDeftemplate = CreateImpliedDeftemplate(theEnv,theToken->lexemeValue,true); }
+      else
+        { theDeftemplate = NULL; }
+     }
+
+   /*===============================================*/
+   /* If an explicit deftemplate exists, then parse */
+   /* the pattern as a deftemplate pattern.         */
+   /*===============================================*/
+
+   if ((theDeftemplate != NULL) && (theDeftemplate->implied == false))
+     { return(DeftemplateLHSParse(theEnv,readSource,theDeftemplate)); }
+
+   /*================================*/
+   /* Parse an ordered fact pattern. */
+   /*================================*/
+
+   return(SequenceRestrictionParse(theEnv,readSource,theToken));
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT && (! RUN_TIME) && (! BLOAD_ONLY) */
+
+
+
diff --git a/clips/factlhs.h b/clips/factlhs.h
new file mode 100755
index 000000000..e6ac822ff
--- /dev/null
+++ b/clips/factlhs.h
@@ -0,0 +1,54 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                FACT BUILD HEADER FILE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Initialize the exists member.                  */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed initial-fact support.                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factlhs
+
+#pragma once
+
+#define _H_factlhs
+
+#include "scanner.h"
+#include "symbol.h"
+
+   bool                           FactPatternParserFind(CLIPSLexeme *);
+   struct lhsParseNode           *FactPatternParse(Environment *,const char *,struct token *);
+   struct lhsParseNode           *SequenceRestrictionParse(Environment *,const char *,struct token *);
+
+#endif /* _H_factlhs */
diff --git a/clips/factmch.c b/clips/factmch.c
new file mode 100755
index 000000000..7cb9d747f
--- /dev/null
+++ b/clips/factmch.c
@@ -0,0 +1,902 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*                 FACT MATCH MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the algorithm for pattern matching in */
+/*   the fact pattern network.                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Fix for DR0880. 2008-01-24                     */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Watch facts for modify command only prints     */
+/*            changed slots.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT
+
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "factgen.h"
+#include "factrete.h"
+#include "incrrset.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "router.h"
+#include "sysdep.h"
+#include "tmpltdef.h"
+
+#include "factmch.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                     EvaluatePatternExpression(Environment *,struct factPatternNode *,struct expr *);
+   static void                     TraceErrorToJoin(Environment *,struct factPatternNode *,bool);
+   static void                     ProcessFactAlphaMatch(Environment *,Fact *,struct multifieldMarker *,struct factPatternNode *);
+   static struct factPatternNode  *GetNextFactPatternNode(Environment *,bool,struct factPatternNode *);
+   static bool                     SkipFactPatternNode(Environment *,struct factPatternNode *);
+   static void                     ProcessMultifieldNode(Environment *,
+                                                         struct factPatternNode *,
+                                                         struct multifieldMarker *,
+                                                         struct multifieldMarker *,size_t,size_t);
+   static void                     PatternNetErrorMessage(Environment *,struct factPatternNode *);
+
+/*************************************************************************/
+/* FactPatternMatch: Implements the core loop for fact pattern matching. */
+/*************************************************************************/
+void FactPatternMatch(
+  Environment *theEnv,
+  Fact *theFact,
+  struct factPatternNode *patternPtr,
+  size_t offset,
+  size_t multifieldsProcessed,
+  struct multifieldMarker *markers,
+  struct multifieldMarker *endMark)
+  {
+   size_t theSlotField;
+   unsigned short offsetSlot;
+   UDFValue theResult;
+   struct factPatternNode *tempPtr;
+     
+   /*=========================================================*/
+   /* If there's nothing left in the pattern network to match */
+   /* against, then the current traversal of the pattern      */
+   /* network needs to back up.                               */
+   /*=========================================================*/
+
+   if (patternPtr == NULL) return;
+
+   /*=======================================================*/
+   /* The offsetSlot variable indicates the current offset  */
+   /* within the multifield slot being pattern matched.     */
+   /* (Recall that a multifield wildcard or variable        */
+   /* recursively iterates through all possible  bindings.) */
+   /* Once a new slot starts being pattern matched, the     */
+   /* offset is reset to zero.                              */
+   /*=======================================================*/
+
+   offsetSlot = patternPtr->whichSlot;
+
+   /*================================================*/
+   /* Set up some global parameters for use by the   */
+   /* Rete access functions and general convenience. */
+   /*================================================*/
+
+   FactData(theEnv)->CurrentPatternFact = theFact;
+   FactData(theEnv)->CurrentPatternMarks = markers;
+
+   /*============================================*/
+   /* Loop through each node in pattern network. */
+   /*============================================*/
+
+   while (patternPtr != NULL)
+     {
+      /*=============================================================*/
+      /* Determine the position of the field we're going to pattern  */
+      /* match. If this routine has been entered recursively because */
+      /* of multifield wildcards or variables, then add in the       */
+      /* additional offset caused by the values which match these    */
+      /* multifields. This offset may be negative (if for example a  */
+      /* a multifield matched a zero length value).                  */
+      /*=============================================================*/
+
+      theSlotField = patternPtr->whichField;
+      if (offsetSlot == patternPtr->whichSlot)
+        { theSlotField = theSlotField + offset - multifieldsProcessed; }
+        
+      /*===================================*/
+      /* Determine if we want to skip this */
+      /* node during an incremental reset. */
+      /*===================================*/
+
+      if (SkipFactPatternNode(theEnv,patternPtr))
+        { patternPtr = GetNextFactPatternNode(theEnv,true,patternPtr); }
+
+      /*=========================================================*/
+      /* If this is a single field pattern node, then determine  */
+      /* if the constraints for the node have been satisfied for */
+      /* the current field in the slot being examined.           */
+      /*=========================================================*/
+
+      else if (patternPtr->header.singlefieldNode)
+        {
+         /*==================================================*/
+         /* If we're at the last slot in the pattern, make   */
+         /* sure the number of fields in the fact correspond */
+         /* to the number of fields required by the pattern  */
+         /* based on the binding of multifield variables.    */
+         /*==================================================*/
+
+         bool skipit = false;
+         if (patternPtr->header.endSlot &&
+             ((FactData(theEnv)->CurrentPatternMarks == NULL) ?
+              false :
+              (FactData(theEnv)->CurrentPatternMarks->where.whichSlotNumber == patternPtr->whichSlot)) &&
+             (FactData(theEnv)->CurrentPatternFact->theProposition.contents
+                  [patternPtr->whichSlot].header->type == MULTIFIELD_TYPE))
+           {
+            if ((patternPtr->leaveFields + theSlotField) !=
+                  FactData(theEnv)->CurrentPatternFact->theProposition.contents
+                                      [patternPtr->whichSlot].multifieldValue->length)
+              { skipit = true; }
+           }
+
+         if (skipit)
+           { patternPtr = GetNextFactPatternNode(theEnv,true,patternPtr); }
+         else
+
+         if (patternPtr->header.selector)
+           {
+            if (EvaluatePatternExpression(theEnv,patternPtr,patternPtr->networkTest->nextArg))
+              {
+               EvaluateExpression(theEnv,patternPtr->networkTest,&theResult);
+
+               tempPtr = (struct factPatternNode *) FindHashedPatternNode(theEnv,patternPtr,theResult.header->type,theResult.value);
+              }
+            else
+              { tempPtr = NULL; }
+
+            if (tempPtr != NULL)
+              {
+               if (SkipFactPatternNode(theEnv,tempPtr))
+                 { patternPtr = GetNextFactPatternNode(theEnv,true,patternPtr); }
+               else
+                 {
+                  if (tempPtr->header.stopNode)
+                    { ProcessFactAlphaMatch(theEnv,theFact,markers,tempPtr); }
+
+                  patternPtr = GetNextFactPatternNode(theEnv,false,tempPtr);
+                 }
+              }
+            else
+              { patternPtr = GetNextFactPatternNode(theEnv,true,patternPtr); }
+           }
+
+         /*=============================================*/
+         /* If the constraints are satisified, then ... */
+         /*=============================================*/
+
+         else if (EvaluatePatternExpression(theEnv,patternPtr,patternPtr->networkTest))
+           {
+            /*=======================================================*/
+            /* If a leaf pattern node has been successfully reached, */
+            /* then the pattern has been satisified. Generate an     */
+            /* alpha match to store in the pattern node.             */
+            /*=======================================================*/
+
+            if (patternPtr->header.stopNode)
+              { ProcessFactAlphaMatch(theEnv,theFact,markers,patternPtr); }
+
+            /*===================================*/
+            /* Move on to the next pattern node. */
+            /*===================================*/
+
+            patternPtr = GetNextFactPatternNode(theEnv,false,patternPtr);
+           }
+
+         /*==============================================*/
+         /* Otherwise, move on to the next pattern node. */
+         /*==============================================*/
+
+         else
+           { patternPtr = GetNextFactPatternNode(theEnv,true,patternPtr); }
+        }
+
+      /*======================================================*/
+      /* If this is a multifield pattern node, then determine */
+      /* if the constraints for the node have been satisfied  */
+      /* for the current field in the slot being examined.    */
+      /*======================================================*/
+
+      else if (patternPtr->header.multifieldNode)
+        {
+         /*========================================================*/
+         /* Determine if the multifield pattern node's constraints */
+         /* are satisfied. If we've traversed to a different slot  */
+         /* than the one we started this routine with, then the    */
+         /* offset into the slot is reset to zero.                 */
+         /*========================================================*/
+
+         if (offsetSlot == patternPtr->whichSlot)
+           { ProcessMultifieldNode(theEnv,patternPtr,markers,endMark,offset,multifieldsProcessed); }
+         else
+           { ProcessMultifieldNode(theEnv,patternPtr,markers,endMark,0,0); }
+
+         /*===================================================*/
+         /* Move on to the next pattern node. Since the lower */
+         /* branches of the pattern network have already been */
+         /* recursively processed by ProcessMultifieldNode,   */
+         /* we get the next pattern node by treating this     */
+         /* multifield pattern node as if it were a single    */
+         /* field pattern node that failed its constraint.    */
+         /*===================================================*/
+
+         patternPtr = GetNextFactPatternNode(theEnv,true,patternPtr);
+        }
+     }
+  }
+
+/**************************************************************/
+/* ProcessMultifieldNode: Handles recursive pattern matching  */
+/*  when a multifield wildcard or variable is encountered as  */
+/*  a slot constraint. The pattern matching routine is called */
+/*  iteratively for each possible binding of the multifield   */
+/*  wildcard or variable.                                     */
+/**************************************************************/
+static void ProcessMultifieldNode(
+  Environment *theEnv,
+  struct factPatternNode *thePattern,
+  struct multifieldMarker *markers,
+  struct multifieldMarker *endMark,
+  size_t offset,
+  size_t multifieldsProcessed)
+  {
+   struct multifieldMarker *newMark, *oldMark;
+   size_t fieldsRemaining;
+   size_t i;
+   size_t repeatCount;
+   Multifield *theSlotValue;
+   UDFValue theResult;
+   struct factPatternNode *tempPtr;
+   bool success;
+
+   /*========================================*/
+   /* Get a pointer to the slot value of the */
+   /* multifield slot being pattern matched. */
+   /*========================================*/
+
+   theSlotValue =
+     FactData(theEnv)->CurrentPatternFact->theProposition.contents[thePattern->whichSlot].multifieldValue;
+
+   /*===============================================*/
+   /* Save the value of the markers already stored. */
+   /*===============================================*/
+
+   oldMark = markers;
+
+   /*===========================================*/
+   /* Create a new multifield marker and append */
+   /* it to the end of the current list.        */
+   /*===========================================*/
+
+   newMark = get_struct(theEnv,multifieldMarker);
+   
+   newMark->whichField = thePattern->whichField - 1;
+   newMark->where.whichSlotNumber = thePattern->whichSlot;
+   newMark->startPosition = (thePattern->whichField - 1) + offset - multifieldsProcessed;
+   newMark->next = NULL;
+
+   if (endMark == NULL)
+     {
+      markers = newMark;
+      FactData(theEnv)->CurrentPatternMarks = markers;
+     }
+   else
+     { endMark->next = newMark; }
+
+   /*============================================*/
+   /* Handle a multifield constraint as the last */
+   /* constraint of a slot as a special case.    */
+   /*============================================*/
+
+   if (thePattern->header.endSlot)
+     {
+      if (theSlotValue->length < (newMark->startPosition + thePattern->leaveFields))
+        { newMark->range = 0; }
+      else
+        { newMark->range = theSlotValue->length - (newMark->startPosition + thePattern->leaveFields); }
+
+      /*===========================================*/
+      /* Determine if the constraint is satisfied. */
+      /*===========================================*/
+
+      if (thePattern->header.selector)
+        {
+         if (EvaluatePatternExpression(theEnv,thePattern,thePattern->networkTest->nextArg))
+           {
+            EvaluateExpression(theEnv,thePattern->networkTest,&theResult);
+
+            thePattern = (struct factPatternNode *) FindHashedPatternNode(theEnv,thePattern,theResult.header->type,theResult.value);
+            if (thePattern != NULL)
+              { success = true; }
+            else
+              { success = false; }
+           }
+         else
+           { success = false; }
+        }
+      else if ((thePattern->networkTest == NULL) ?
+          true :
+          (EvaluatePatternExpression(theEnv,thePattern,thePattern->networkTest)))
+        { success = true; }
+      else
+        { success = false; }
+
+      if (success)
+        {
+         /*=======================================================*/
+         /* If a leaf pattern node has been successfully reached, */
+         /* then the pattern has been satisified. Generate an     */
+         /* alpha match to store in the pattern node.             */
+         /*=======================================================*/
+
+         if (thePattern->header.stopNode)
+           { ProcessFactAlphaMatch(theEnv,FactData(theEnv)->CurrentPatternFact,FactData(theEnv)->CurrentPatternMarks,thePattern); }
+
+         /*=============================================*/
+         /* Recursively continue pattern matching based */
+         /* on the multifield binding just generated.   */
+         /*=============================================*/
+
+         FactPatternMatch(theEnv,FactData(theEnv)->CurrentPatternFact,
+                          thePattern->nextLevel,0,0,FactData(theEnv)->CurrentPatternMarks,newMark);
+        }
+
+      /*================================================*/
+      /* Discard the multifield marker since we've done */
+      /* all the pattern matching for this binding of   */
+      /* the multifield slot constraint.                */
+      /*================================================*/
+
+      rtn_struct(theEnv,multifieldMarker,newMark);
+      if (endMark != NULL) endMark->next = NULL;
+      FactData(theEnv)->CurrentPatternMarks = oldMark;
+      return;
+     }
+
+   /*===============================================================*/
+   /* Stop matching if there aren't enough values left in the fact. */
+   /*===============================================================*/
+
+   if (theSlotValue->length < (newMark->startPosition + thePattern->leaveFields))
+     {
+      rtn_struct(theEnv,multifieldMarker,newMark);
+      if (endMark != NULL) endMark->next = NULL;
+      FactData(theEnv)->CurrentPatternMarks = oldMark;
+      return;
+     }
+     
+   /*==============================================*/
+   /* Perform matching for nodes beneath this one. */
+   /*==============================================*/
+   
+   fieldsRemaining = theSlotValue->length - (newMark->startPosition + thePattern->leaveFields);
+     
+   for (i = 0; i <= fieldsRemaining; i++)
+     {
+      repeatCount = fieldsRemaining - i;
+      
+      newMark->range = repeatCount;
+
+      if (thePattern->header.selector)
+        {
+         if (EvaluatePatternExpression(theEnv,thePattern,thePattern->networkTest->nextArg))
+           {
+            EvaluateExpression(theEnv,thePattern->networkTest,&theResult);
+
+            tempPtr = (struct factPatternNode *) FindHashedPatternNode(theEnv,thePattern,theResult.header->type,theResult.value);
+            if (tempPtr != NULL)
+              {
+               FactPatternMatch(theEnv,FactData(theEnv)->CurrentPatternFact,
+                                tempPtr->nextLevel,offset + repeatCount,multifieldsProcessed+1,
+                                FactData(theEnv)->CurrentPatternMarks,newMark);
+              }
+           }
+        }
+      else if ((thePattern->networkTest == NULL) ?
+               true :
+               (EvaluatePatternExpression(theEnv,thePattern,thePattern->networkTest)))
+        {
+         FactPatternMatch(theEnv,FactData(theEnv)->CurrentPatternFact,
+                          thePattern->nextLevel,offset + repeatCount,multifieldsProcessed+1,
+                          FactData(theEnv)->CurrentPatternMarks,newMark);
+        }
+     }
+
+    /*======================================================*/
+    /* Get rid of the marker created for a multifield node. */
+    /*======================================================*/
+
+    rtn_struct(theEnv,multifieldMarker,newMark);
+    if (endMark != NULL) endMark->next = NULL;
+    FactData(theEnv)->CurrentPatternMarks = oldMark;
+   }
+
+/******************************************************/
+/* GetNextFactPatternNode: Returns the next node in a */
+/*   pattern network tree to be traversed. The next   */
+/*   node is computed using a depth first traversal.  */
+/******************************************************/
+static struct factPatternNode *GetNextFactPatternNode(
+  Environment *theEnv,
+  bool finishedMatching,
+  struct factPatternNode *thePattern)
+  {
+   EvaluationData(theEnv)->EvaluationError = false;
+
+   /*===================================================*/
+   /* If pattern matching was successful at the current */
+   /* node in the tree and it's possible to go deeper   */
+   /* into the tree, then move down to the next level.  */
+   /*===================================================*/
+
+   if (finishedMatching == false)
+     { if (thePattern->nextLevel != NULL) return(thePattern->nextLevel); }
+
+   /*================================================*/
+   /* Keep backing up toward the root of the pattern */
+   /* network until a side branch can be taken.      */
+   /*================================================*/
+
+   while ((thePattern->rightNode == NULL) ||
+          ((thePattern->lastLevel != NULL) &&
+           (thePattern->lastLevel->header.selector)))
+     {
+      /*========================================*/
+      /* Back up to check the next side branch. */
+      /*========================================*/
+
+      thePattern = thePattern->lastLevel;
+
+      /*======================================*/
+      /* If we branched up from the root, the */
+      /* entire tree has been traversed.      */
+      /*======================================*/
+
+      if (thePattern == NULL) return NULL;
+
+      /*======================================*/
+      /* Skip selector constants and pop back */
+      /* back to the selector node.           */
+      /*======================================*/
+
+      if ((thePattern->lastLevel != NULL) &&
+          (thePattern->lastLevel->header.selector))
+        { thePattern = thePattern->lastLevel; }
+
+      /*===================================================*/
+      /* If we branched up to a multifield node, then stop */
+      /* since these nodes are handled recursively. The    */
+      /* previous call to the pattern matching algorithm   */
+      /* on the stack will handle backing up to the nodes  */
+      /* above the multifield node in the pattern network. */
+      /*===================================================*/
+
+      if (thePattern->header.multifieldNode) return NULL;
+     }
+
+   /*==================================*/
+   /* Move on to the next side branch. */
+   /*==================================*/
+
+   return(thePattern->rightNode);
+  }
+
+/*******************************************************/
+/* ProcessFactAlphaMatch: When a fact pattern has been */
+/*   satisfied, this routine creates an alpha match to */
+/*   store in the pattern network and then sends the   */
+/*   new alpha match through the join network.         */
+/*******************************************************/
+static void ProcessFactAlphaMatch(
+  Environment *theEnv,
+  Fact *theFact,
+  struct multifieldMarker *theMarks,
+  struct factPatternNode *thePattern)
+  {
+   struct partialMatch *theMatch;
+   struct patternMatch *listOfMatches;
+   struct joinNode *listOfJoins;
+   unsigned long hashValue;
+
+  /*============================================*/
+  /* Create the hash value for the alpha match. */
+  /*============================================*/
+
+  hashValue = ComputeRightHashValue(theEnv,&thePattern->header);
+
+  /*===========================================*/
+  /* Create the partial match for the pattern. */
+  /*===========================================*/
+
+  theMatch = CreateAlphaMatch(theEnv,theFact,theMarks,(struct patternNodeHeader *) &thePattern->header,hashValue);
+  theMatch->owner = &thePattern->header;
+
+  /*=======================================================*/
+  /* Add the pattern to the list of matches for this fact. */
+  /*=======================================================*/
+
+  listOfMatches = (struct patternMatch *) theFact->list;
+  theFact->list = get_struct(theEnv,patternMatch);
+  ((struct patternMatch *) theFact->list)->next = listOfMatches;
+  ((struct patternMatch *) theFact->list)->matchingPattern = (struct patternNodeHeader *) thePattern;
+  ((struct patternMatch *) theFact->list)->theMatch = theMatch;
+
+  /*================================================================*/
+  /* Send the partial match to the joins connected to this pattern. */
+  /*================================================================*/
+
+  for (listOfJoins = thePattern->header.entryJoin;
+       listOfJoins != NULL;
+       listOfJoins = listOfJoins->rightMatchNode)
+     { NetworkAssert(theEnv,theMatch,listOfJoins); }
+  }
+
+/*****************************************************************/
+/* EvaluatePatternExpression: Performs a faster evaluation for   */
+/*   fact pattern network expressions than if EvaluateExpression */
+/*   were used directly.                                         */
+/*****************************************************************/
+static bool EvaluatePatternExpression(
+  Environment *theEnv,
+  struct factPatternNode *patternPtr,
+  struct expr *theTest)
+  {
+   UDFValue theResult;
+   struct expr *oldArgument;
+   bool rv;
+
+   /*=====================================*/
+   /* A pattern node without a constraint */
+   /* is always satisfied.                */
+   /*=====================================*/
+
+   if (theTest == NULL) return true;
+
+   /*======================================*/
+   /* Evaluate pattern network primitives. */
+   /*======================================*/
+
+   switch(theTest->type)
+     {
+      /*==============================================*/
+      /* This primitive compares the value stored in  */
+      /* a single field slot to a constant for either */
+      /* equality or inequality.                      */
+      /*==============================================*/
+
+      case FACT_PN_CONSTANT1:
+        oldArgument = EvaluationData(theEnv)->CurrentExpression;
+        EvaluationData(theEnv)->CurrentExpression = theTest;
+        rv = FactPNConstant1(theEnv,theTest->value,&theResult);
+        EvaluationData(theEnv)->CurrentExpression = oldArgument;
+        return(rv);
+
+      /*=============================================*/
+      /* This primitive compares the value stored in */
+      /* a multifield slot to a constant for either  */
+      /* equality or inequality.                     */
+      /*=============================================*/
+
+      case FACT_PN_CONSTANT2:
+        oldArgument = EvaluationData(theEnv)->CurrentExpression;
+        EvaluationData(theEnv)->CurrentExpression = theTest;
+        rv = FactPNConstant2(theEnv,theTest->value,&theResult);
+        EvaluationData(theEnv)->CurrentExpression = oldArgument;
+        return(rv);
+
+      /*================================================*/
+      /* This primitive determines if a multifield slot */
+      /* contains at least a certain number of fields.  */
+      /*================================================*/
+
+      case FACT_SLOT_LENGTH:
+        oldArgument = EvaluationData(theEnv)->CurrentExpression;
+        EvaluationData(theEnv)->CurrentExpression = theTest;
+        rv = FactSlotLength(theEnv,theTest->value,&theResult);
+        EvaluationData(theEnv)->CurrentExpression = oldArgument;
+        return(rv);
+     }
+
+   /*==============================================*/
+   /* Evaluate "or" expressions by evaluating each */
+   /* argument and return true if any of them      */
+   /* evaluated to true, otherwise return false.   */
+   /*==============================================*/
+
+   if (theTest->value == ExpressionData(theEnv)->PTR_OR)
+     {
+      for (theTest = theTest->argList;
+           theTest != NULL;
+           theTest = theTest->nextArg)
+        {
+         if (EvaluatePatternExpression(theEnv,patternPtr,theTest) == true)
+           {
+            if (EvaluationData(theEnv)->EvaluationError) return false;
+            return true;
+           }
+         if (EvaluationData(theEnv)->EvaluationError) return false;
+        }
+
+      return false;
+     }
+
+   /*===============================================*/
+   /* Evaluate "and" expressions by evaluating each */
+   /* argument and return false if any of them      */
+   /* evaluated to false, otherwise return true.    */
+   /*===============================================*/
+
+   else if (theTest->value == ExpressionData(theEnv)->PTR_AND)
+     {
+      for (theTest = theTest->argList;
+           theTest != NULL;
+           theTest = theTest->nextArg)
+        {
+         if (EvaluatePatternExpression(theEnv,patternPtr,theTest) == false)
+           { return false; }
+         if (EvaluationData(theEnv)->EvaluationError) return false;
+        }
+
+      return true;
+     }
+
+   /*==========================================================*/
+   /* Evaluate all other expressions using EvaluateExpression. */
+   /*==========================================================*/
+
+   if (EvaluateExpression(theEnv,theTest,&theResult))
+     {
+      PatternNetErrorMessage(theEnv,patternPtr);
+      return false;
+     }
+
+   if (theResult.value == FalseSymbol(theEnv))
+     { return false; }
+
+   return true;
+  }
+
+/************************************************************************/
+/* PatternNetErrorMessage: Prints the informational header to the error */
+/*   message that occurs when a error occurs as the  result of          */
+/*   evaluating an expression in the fact pattern network. Prints the   */
+/*   fact currently being pattern matched and the field number or slot  */
+/*   name in the pattern from which the error originated. The error is  */
+/*   then trace to the point where the pattern enters the join network  */
+/*   so that the names of the rule which utilize the pattern can also   */
+/*   be printed.                                                        */
+/************************************************************************/
+static void PatternNetErrorMessage(
+  Environment *theEnv,
+  struct factPatternNode *patternPtr)
+  {
+   char buffer[60];
+   struct templateSlot *theSlots;
+   unsigned short i;
+
+   /*=======================================*/
+   /* Print the fact being pattern matched. */
+   /*=======================================*/
+
+   PrintErrorID(theEnv,"FACTMCH",1,true);
+   WriteString(theEnv,STDERR,"This error occurred in the fact pattern network.\n");
+   WriteString(theEnv,STDERR,"   Currently active fact: ");
+   PrintFact(theEnv,STDERR,FactData(theEnv)->CurrentPatternFact,false,false,NULL);
+   WriteString(theEnv,STDERR,"\n");
+
+   /*==============================================*/
+   /* Print the field position or slot name of the */
+   /* pattern from which the error originated.     */
+   /*==============================================*/
+
+   if (FactData(theEnv)->CurrentPatternFact->whichDeftemplate->implied)
+     { gensprintf(buffer,"   Problem resides in field #%d\n",patternPtr->whichField); }
+   else
+     {
+      theSlots = FactData(theEnv)->CurrentPatternFact->whichDeftemplate->slotList;
+      for (i = 0; i < patternPtr->whichSlot; i++) theSlots = theSlots->next;
+      gensprintf(buffer,"   Problem resides in slot %s\n",theSlots->slotName->contents);
+     }
+
+   WriteString(theEnv,STDERR,buffer);
+
+   /*==========================================================*/
+   /* Trace the pattern to its entry point to the join network */
+   /* (which then traces to the defrule data structure so that */
+   /* the name(s) of the rule(s) utilizing the patterns can be */
+   /* printed).                                                */
+   /*==========================================================*/
+
+   TraceErrorToJoin(theEnv,patternPtr,false);
+   WriteString(theEnv,STDERR,"\n");
+  }
+
+/***************************************************************************/
+/* TraceErrorToJoin: Traces the cause of an evaluation error which occured */
+/*   in the fact pattern network to the entry join in the join network for */
+/*   the pattern from which the error originated. Once the entry join is   */
+/*   reached, the error is then traced to the defrule data structures so   */
+/*   that the name of the rule(s) containing the pattern can be printed.   */
+/***************************************************************************/
+static void TraceErrorToJoin(
+  Environment *theEnv,
+  struct factPatternNode *patternPtr,
+  bool traceRight)
+  {
+   struct joinNode *joinPtr;
+
+   while (patternPtr != NULL)
+     {
+      if (patternPtr->header.stopNode)
+        {
+         for (joinPtr = patternPtr->header.entryJoin;
+              joinPtr != NULL;
+              joinPtr = joinPtr->rightMatchNode)
+           { TraceErrorToRule(theEnv,joinPtr,"      "); }
+        }
+      else
+        { TraceErrorToJoin(theEnv,patternPtr->nextLevel,true); }
+
+      if (traceRight) patternPtr = patternPtr->rightNode;
+      else patternPtr = NULL;
+     }
+  }
+
+/***********************************************************************/
+/* SkipFactPatternNode: During an incremental reset, only fact pattern */
+/*   nodes associated with new patterns are traversed. Given a pattern */
+/*   node, this routine will return true if the pattern node should be */
+/*   traversed during incremental reset pattern matching or false if   */
+/*   the node should be skipped.                                       */
+/***********************************************************************/
+static bool SkipFactPatternNode(
+  Environment *theEnv,
+  struct factPatternNode *thePattern)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   if (EngineData(theEnv)->IncrementalResetInProgress &&
+       (thePattern->header.initialize == false))
+     { return true; }
+#endif
+
+   return false;
+  }
+
+/***************************************************************/
+/* MarkFactPatternForIncrementalReset: Sets the initialization */
+/*  field of a fact pattern for use with incremental reset.    */
+/*  This is called before an incremental reset for newly added */
+/*  patterns to indicate that the pattern nodes should be      */
+/*  traversed and then after an incremental reset to indicate  */
+/*  that the nodes were traversed ("initialized") by the       */
+/*  incremental reset.                                         */
+/***************************************************************/
+void MarkFactPatternForIncrementalReset(
+  Environment *theEnv,
+  struct patternNodeHeader *thePattern,
+  bool value)
+  {
+   struct factPatternNode *patternPtr = (struct factPatternNode *) thePattern;
+   struct joinNode *theJoin;
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   /*=====================================*/
+   /* We should be passed a valid pointer */
+   /* to a fact pattern network node.     */
+   /*=====================================*/
+
+   Bogus(patternPtr == NULL);
+
+   /*===============================================================*/
+   /* If the pattern was previously initialized,  then don't bother */
+   /* with it unless the pattern was subsumed by another pattern    */
+   /* and associated with a join that hasn't been initialized.      */
+   /* DR0880 2008-01-24                                             */
+   /*===============================================================*/
+
+   if (patternPtr->header.initialize == false)
+     {
+      for (theJoin = patternPtr->header.entryJoin;
+           theJoin != NULL;
+           theJoin = theJoin->rightMatchNode)
+        {
+         if (theJoin->initialize == false)
+           { return; }
+        }
+     }
+
+   /*======================================================*/
+   /* Set the initialization field of this pattern network */
+   /* node and all pattern network nodes which preceed it. */
+   /*======================================================*/
+
+   while (patternPtr != NULL)
+     {
+      patternPtr->header.initialize = value;
+      patternPtr = patternPtr->lastLevel;
+     }
+  }
+
+/**************************************************************/
+/* FactsIncrementalReset: Incremental reset function for the  */
+/*   fact pattern network. Asserts all facts in the fact-list */
+/*   so that they repeat the pattern matching process. During */
+/*   an incremental reset, newly added patterns should be the */
+/*   only active patterns in the fact pattern network.        */
+/**************************************************************/
+void FactsIncrementalReset(
+  Environment *theEnv)
+  {
+   Fact *factPtr;
+
+   for (factPtr = GetNextFact(theEnv,NULL);
+        factPtr != NULL;
+        factPtr = GetNextFact(theEnv,factPtr))
+     {
+      EngineData(theEnv)->JoinOperationInProgress = true;
+      FactPatternMatch(theEnv,factPtr,
+                       factPtr->whichDeftemplate->patternNetwork,
+                       0,0,NULL,NULL);
+      EngineData(theEnv)->JoinOperationInProgress = false;
+     }
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT */
+
diff --git a/clips/factmch.h b/clips/factmch.h
new file mode 100755
index 000000000..f448e1d9f
--- /dev/null
+++ b/clips/factmch.h
@@ -0,0 +1,68 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*               FACT MATCH HEADER FILE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Fix for DR0880. 2008-01-24                     */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factmch
+
+#pragma once
+
+#define _H_factmch
+
+#include "evaluatn.h"
+#include "factbld.h"
+#include "factmngr.h"
+
+   void                           FactPatternMatch(Environment *,Fact *,
+                                                   struct factPatternNode *,size_t,size_t,
+                                                   struct multifieldMarker *,
+                                                   struct multifieldMarker *);
+   void                           MarkFactPatternForIncrementalReset(Environment *,struct patternNodeHeader *,bool);
+   void                           FactsIncrementalReset(Environment *);
+
+#endif /* _H_factmch */
+
+
+
+
+
+
diff --git a/clips/factmngr.c b/clips/factmngr.c
new file mode 100755
index 000000000..ae2827932
--- /dev/null
+++ b/clips/factmngr.c
@@ -0,0 +1,3345 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*                 FACT MANAGER MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides core routines for maintaining the fact  */
+/*   list including assert/retract operations, data          */
+/*   structure creation/deletion, printing, slot access,     */
+/*   and other utility functions.                            */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            AssignFactSlotDefaults function does not       */
+/*            properly handle defaults for multifield slots. */
+/*            DR0869                                         */
+/*                                                           */
+/*            Support for ppfact command.                    */
+/*                                                           */
+/*      6.30: Callback function support for assertion,       */
+/*            retraction, and modification of facts.         */
+/*                                                           */
+/*            Updates to fact pattern entity record.         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Removed unused global variables.               */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            JoinOperationInProgress mechanism.             */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*      6.31: Added NULL check for slotName in function      */
+/*            EnvGetFactSlot. Return value of FALSE now      */
+/*            returned if garbage flag set for fact.         */
+/*                                                           */
+/*            Added constraint checking for slot value in    */
+/*            EnvPutFactSlot function.                       */
+/*                                                           */
+/*            Calling EnvFactExistp for a fact that has      */
+/*            been created, but not asserted now returns     */
+/*            FALSE.                                         */
+/*                                                           */
+/*            Calling EnvRetract for a fact that has been    */
+/*            created, but not asserted now returns FALSE.   */
+/*                                                           */
+/*            Calling EnvAssignFactSlotDefaults or           */
+/*            EnvPutFactSlot for a fact that has been        */
+/*            asserted now returns FALSE.                    */
+/*                                                           */
+/*            Retracted and existing facts cannot be         */
+/*            asserted.                                      */
+/*                                                           */
+/*            Crash bug fix for modifying fact with invalid  */
+/*            slot name.                                     */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed initial-fact support.                  */
+/*                                                           */
+/*            Watch facts for modify command only prints     */
+/*            changed slots.                                 */
+/*                                                           */
+/*            Modify command preserves fact id and address.  */
+/*                                                           */
+/*            Assert returns duplicate fact. FALSE is now    */
+/*            returned only if an error occurs.              */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT
+
+#include "commline.h"
+#include "default.h"
+#include "engine.h"
+#include "factbin.h"
+#include "factcmp.h"
+#include "factcom.h"
+#include "factfun.h"
+#include "factmch.h"
+#include "factqury.h"
+#include "factrhs.h"
+#include "lgcldpnd.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "retract.h"
+#include "prntutil.h"
+#include "router.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+#include "tmpltbsc.h"
+#include "tmpltfun.h"
+#include "tmpltutl.h"
+#include "utility.h"
+#include "watch.h"
+#include "cstrnchk.h"
+
+#include "factmngr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ResetFacts(Environment *,void *);
+   static bool                    ClearFactsReady(Environment *,void *);
+   static void                    RemoveGarbageFacts(Environment *,void *);
+   static void                    DeallocateFactData(Environment *);
+   static bool                    RetractCallback(Fact *,Environment *);
+
+/**************************************************************/
+/* InitializeFacts: Initializes the fact data representation. */
+/*   Facts are only available when both the defrule and       */
+/*   deftemplate constructs are available.                    */
+/**************************************************************/
+void InitializeFacts(
+  Environment *theEnv)
+  {
+   struct patternEntityRecord factInfo =
+      { { "FACT_ADDRESS_TYPE", FACT_ADDRESS_TYPE,1,0,0,
+          (EntityPrintFunction *) PrintFactIdentifier,
+          (EntityPrintFunction *) PrintFactIdentifierInLongForm,
+          (bool (*)(void *,Environment *)) RetractCallback,
+          NULL,
+          (void *(*)(void *,void *)) GetNextFact,
+          (EntityBusyCountFunction *) DecrementFactCallback,
+          (EntityBusyCountFunction *) IncrementFactCallback,
+          NULL,NULL,NULL,NULL,NULL
+        },
+        (void (*)(Environment *,void *)) DecrementFactBasisCount,
+        (void (*)(Environment *,void *)) IncrementFactBasisCount,
+        (void (*)(Environment *,void *)) MatchFactFunction,
+        NULL,
+        (bool (*)(Environment *,void *)) FactIsDeleted
+      };
+
+   Fact dummyFact = { { { { FACT_ADDRESS_TYPE } , NULL, NULL, 0, 0L } },
+                      NULL, NULL, -1L, 0, 1,
+                      NULL, NULL, NULL, NULL, NULL, 
+                      { {MULTIFIELD_TYPE } , 1, 0UL, NULL, { { { NULL } } } } };
+
+   AllocateEnvironmentData(theEnv,FACTS_DATA,sizeof(struct factsData),DeallocateFactData);
+
+   memcpy(&FactData(theEnv)->FactInfo,&factInfo,sizeof(struct patternEntityRecord));
+   dummyFact.patternHeader.theInfo = &FactData(theEnv)->FactInfo;
+   memcpy(&FactData(theEnv)->DummyFact,&dummyFact,sizeof(struct fact));
+   FactData(theEnv)->LastModuleIndex = -1;
+
+   /*=========================================*/
+   /* Initialize the fact hash table (used to */
+   /* quickly determine if a fact exists).    */
+   /*=========================================*/
+
+   InitializeFactHashTable(theEnv);
+
+   /*============================================*/
+   /* Initialize the fact callback functions for */
+   /* use with the reset and clear commands.     */
+   /*============================================*/
+
+   AddResetFunction(theEnv,"facts",ResetFacts,60,NULL);
+   AddClearReadyFunction(theEnv,"facts",ClearFactsReady,0,NULL);
+
+   /*=============================*/
+   /* Initialize periodic garbage */
+   /* collection for facts.       */
+   /*=============================*/
+
+   AddCleanupFunction(theEnv,"facts",RemoveGarbageFacts,0,NULL);
+
+   /*===================================*/
+   /* Initialize fact pattern matching. */
+   /*===================================*/
+
+   InitializeFactPatterns(theEnv);
+
+   /*==================================*/
+   /* Initialize the facts keyword for */
+   /* use with the watch command.      */
+   /*==================================*/
+
+#if DEBUGGING_FUNCTIONS
+   AddWatchItem(theEnv,"facts",0,&FactData(theEnv)->WatchFacts,80,
+                DeftemplateWatchAccess,DeftemplateWatchPrint);
+#endif
+
+   /*=========================================*/
+   /* Initialize fact commands and functions. */
+   /*=========================================*/
+
+   FactCommandDefinitions(theEnv);
+   FactFunctionDefinitions(theEnv);
+
+   /*==============================*/
+   /* Initialize fact set queries. */
+   /*==============================*/
+
+#if FACT_SET_QUERIES
+   SetupFactQuery(theEnv);
+#endif
+
+   /*==================================*/
+   /* Initialize fact patterns for use */
+   /* with the bload/bsave commands.   */
+   /*==================================*/
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   FactBinarySetup(theEnv);
+#endif
+
+   /*===================================*/
+   /* Initialize fact patterns for use  */
+   /* with the constructs-to-c command. */
+   /*===================================*/
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   FactPatternsCompilerSetup(theEnv);
+#endif
+  }
+
+/***********************************/
+/* DeallocateFactData: Deallocates */
+/*   environment data for facts.   */
+/***********************************/
+static void DeallocateFactData(
+  Environment *theEnv)
+  {
+   struct factHashEntry *tmpFHEPtr, *nextFHEPtr;
+   Fact *tmpFactPtr, *nextFactPtr;
+   unsigned long i;
+   struct patternMatch *theMatch, *tmpMatch;
+
+   for (i = 0; i < FactData(theEnv)->FactHashTableSize; i++)
+     {
+      tmpFHEPtr = FactData(theEnv)->FactHashTable[i];
+
+      while (tmpFHEPtr != NULL)
+        {
+         nextFHEPtr = tmpFHEPtr->next;
+         rtn_struct(theEnv,factHashEntry,tmpFHEPtr);
+         tmpFHEPtr = nextFHEPtr;
+        }
+     }
+
+   rm(theEnv,FactData(theEnv)->FactHashTable,
+       sizeof(struct factHashEntry *) * FactData(theEnv)->FactHashTableSize);
+
+   tmpFactPtr = FactData(theEnv)->FactList;
+   while (tmpFactPtr != NULL)
+     {
+      nextFactPtr = tmpFactPtr->nextFact;
+
+      theMatch = (struct patternMatch *) tmpFactPtr->list;
+      while (theMatch != NULL)
+        {
+         tmpMatch = theMatch->next;
+         rtn_struct(theEnv,patternMatch,theMatch);
+         theMatch = tmpMatch;
+        }
+
+      ReturnEntityDependencies(theEnv,(struct patternEntity *) tmpFactPtr);
+
+      ReturnFact(theEnv,tmpFactPtr);
+      tmpFactPtr = nextFactPtr;
+     }
+
+   tmpFactPtr = FactData(theEnv)->GarbageFacts;
+   while (tmpFactPtr != NULL)
+     {
+      nextFactPtr = tmpFactPtr->nextFact;
+      ReturnFact(theEnv,tmpFactPtr);
+      tmpFactPtr = nextFactPtr;
+     }
+
+   DeallocateCallListWithArg(theEnv,FactData(theEnv)->ListOfAssertFunctions);
+   DeallocateCallListWithArg(theEnv,FactData(theEnv)->ListOfRetractFunctions);
+   DeallocateModifyCallList(theEnv,FactData(theEnv)->ListOfModifyFunctions);
+  }
+
+/**********************************************/
+/* PrintFactWithIdentifier: Displays a single */
+/*   fact preceded by its fact identifier.    */
+/**********************************************/
+void PrintFactWithIdentifier(
+  Environment *theEnv,
+  const char *logicalName,
+  Fact *factPtr,
+  const char *changeMap)
+  {
+   char printSpace[20];
+
+   gensprintf(printSpace,"f-%-5lld ",factPtr->factIndex);
+   WriteString(theEnv,logicalName,printSpace);
+   PrintFact(theEnv,logicalName,factPtr,false,false,changeMap);
+  }
+
+/****************************************************/
+/* PrintFactIdentifier: Displays a fact identifier. */
+/****************************************************/
+void PrintFactIdentifier(
+  Environment *theEnv,
+  const char *logicalName,
+  Fact *factPtr)
+  {
+   char printSpace[20];
+
+   gensprintf(printSpace,"f-%lld",factPtr->factIndex);
+   WriteString(theEnv,logicalName,printSpace);
+  }
+
+/********************************************/
+/* PrintFactIdentifierInLongForm: Display a */
+/*   fact identifier in a longer format.    */
+/********************************************/
+void PrintFactIdentifierInLongForm(
+  Environment *theEnv,
+  const char *logicalName,
+  Fact *factPtr)
+  {
+   if (PrintUtilityData(theEnv)->AddressesToStrings) WriteString(theEnv,logicalName,"\"");
+   if (factPtr != &FactData(theEnv)->DummyFact)
+     {
+      WriteString(theEnv,logicalName,"<Fact-");
+      WriteInteger(theEnv,logicalName,factPtr->factIndex);
+      WriteString(theEnv,logicalName,">");
+     }
+   else
+     { WriteString(theEnv,logicalName,"<Dummy Fact>"); }
+
+   if (PrintUtilityData(theEnv)->AddressesToStrings) WriteString(theEnv,logicalName,"\"");
+  }
+
+/*******************************************/
+/* DecrementFactBasisCount: Decrements the */
+/*   partial match busy count of a fact    */
+/*******************************************/
+void DecrementFactBasisCount(
+  Environment *theEnv,
+  Fact *factPtr)
+  {
+   Multifield *theSegment;
+   size_t i;
+
+   ReleaseFact(factPtr);
+
+   if (factPtr->basisSlots != NULL)
+     {
+      theSegment = factPtr->basisSlots;
+      factPtr->basisSlots->busyCount--;
+     }
+   else
+     { theSegment = &factPtr->theProposition; }
+
+   for (i = 0 ; i < theSegment->length ; i++)
+     { AtomDeinstall(theEnv,theSegment->contents[i].header->type,theSegment->contents[i].value); }
+
+   if ((factPtr->basisSlots != NULL) && (factPtr->basisSlots->busyCount == 0))
+     {
+      ReturnMultifield(theEnv,factPtr->basisSlots);
+      factPtr->basisSlots = NULL;
+     }
+  }
+
+/*******************************************/
+/* IncrementFactBasisCount: Increments the */
+/*   partial match busy count of a fact.   */
+/*******************************************/
+void IncrementFactBasisCount(
+  Environment *theEnv,
+  Fact *factPtr)
+  {
+   Multifield *theSegment;
+   size_t i;
+
+   RetainFact(factPtr);
+
+   theSegment = &factPtr->theProposition;
+
+   if (theSegment->length != 0)
+     {
+      if (factPtr->basisSlots != NULL)
+        {
+         factPtr->basisSlots->busyCount++;
+        }
+      else
+        {
+         factPtr->basisSlots = CopyMultifield(theEnv,theSegment);
+         factPtr->basisSlots->busyCount = 1;
+        }
+      theSegment = factPtr->basisSlots;
+     }
+
+   for (i = 0 ; i < theSegment->length ; i++)
+     {
+      AtomInstall(theEnv,theSegment->contents[i].header->type,theSegment->contents[i].value);
+     }
+  }
+
+/******************/
+/* FactIsDeleted: */
+/******************/
+bool FactIsDeleted(
+  Environment *theEnv,
+  Fact *theFact)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   return theFact->garbage;
+  }
+
+/**************************************************/
+/* PrintFact: Displays the printed representation */
+/*   of a fact containing the relation name and   */
+/*   all of the fact's slots or fields.           */
+/**************************************************/
+void PrintFact(
+  Environment *theEnv,
+  const char *logicalName,
+  Fact *factPtr,
+  bool separateLines,
+  bool ignoreDefaults,
+  const char *changeMap)
+  {
+   Multifield *theMultifield;
+
+   /*=========================================*/
+   /* Print a deftemplate (non-ordered) fact. */
+   /*=========================================*/
+
+   if (factPtr->whichDeftemplate->implied == false)
+     {
+      PrintTemplateFact(theEnv,logicalName,factPtr,separateLines,ignoreDefaults,changeMap);
+      return;
+     }
+
+   /*==============================*/
+   /* Print an ordered fact (which */
+   /* has an implied deftemplate). */
+   /*==============================*/
+
+   WriteString(theEnv,logicalName,"(");
+
+   WriteString(theEnv,logicalName,factPtr->whichDeftemplate->header.name->contents);
+
+   theMultifield = factPtr->theProposition.contents[0].multifieldValue;
+   if (theMultifield->length != 0)
+     {
+      WriteString(theEnv,logicalName," ");
+      PrintMultifieldDriver(theEnv,logicalName,theMultifield,0,
+                            theMultifield->length,false);
+     }
+
+   WriteString(theEnv,logicalName,")");
+  }
+
+/*********************************************/
+/* MatchFactFunction: Filters a fact through */
+/*   the appropriate fact pattern network.   */
+/*********************************************/
+void MatchFactFunction(
+  Environment *theEnv,
+  Fact *theFact)
+  {
+   FactPatternMatch(theEnv,theFact,theFact->whichDeftemplate->patternNetwork,0,0,NULL,NULL);
+  }
+
+/**********************************************/
+/* RetractDriver: Driver routine for Retract. */
+/**********************************************/
+RetractError RetractDriver(
+  Environment *theEnv,
+  Fact *theFact,
+  bool modifyOperation,
+  char *changeMap)
+  {
+   Deftemplate *theTemplate = theFact->whichDeftemplate;
+   struct callFunctionItemWithArg *theRetractFunction;
+
+   FactData(theEnv)->retractError = RE_NO_ERROR;
+
+   /*===========================================*/
+   /* Retracting a retracted fact does nothing. */
+   /*===========================================*/
+
+   if (theFact->garbage)
+     { return RE_NO_ERROR; }
+
+   /*===========================================*/
+   /* A fact can not be retracted while another */
+   /* fact is being asserted or retracted.      */
+   /*===========================================*/
+
+   if (EngineData(theEnv)->JoinOperationInProgress)
+     {
+      PrintErrorID(theEnv,"FACTMNGR",1,true);
+      WriteString(theEnv,STDERR,"Facts may not be retracted during pattern-matching.\n");
+      SetEvaluationError(theEnv,true);
+      FactData(theEnv)->retractError = RE_COULD_NOT_RETRACT_ERROR;
+      return RE_COULD_NOT_RETRACT_ERROR;
+     }
+
+   /*====================================*/
+   /* A NULL fact pointer indicates that */
+   /* all facts should be retracted.     */
+   /*====================================*/
+
+   if (theFact == NULL)
+     { return RetractAllFacts(theEnv); }
+
+   /*=================================================*/
+   /* Check to see if the fact has not been asserted. */
+   /*=================================================*/
+   
+   if (theFact->factIndex == 0)
+     {
+      SystemError(theEnv,"FACTMNGR",5);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+   
+   /*===========================================*/
+   /* Execute the list of functions that are    */
+   /* to be called before each fact retraction. */
+   /*===========================================*/
+
+   for (theRetractFunction = FactData(theEnv)->ListOfRetractFunctions;
+        theRetractFunction != NULL;
+        theRetractFunction = theRetractFunction->next)
+     {
+      (*theRetractFunction->func)(theEnv,theFact,theRetractFunction->context);
+     }
+
+   /*============================*/
+   /* Print retraction output if */
+   /* facts are being watched.   */
+   /*============================*/
+
+#if DEBUGGING_FUNCTIONS
+   if (theFact->whichDeftemplate->watch &&
+       (! ConstructData(theEnv)->ClearReadyInProgress) &&
+       (! ConstructData(theEnv)->ClearInProgress))
+     {
+      WriteString(theEnv,STDOUT,"<== ");
+      PrintFactWithIdentifier(theEnv,STDOUT,theFact,changeMap);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+#endif
+
+   /*==================================*/
+   /* Set the change flag to indicate  */
+   /* the fact-list has been modified. */
+   /*==================================*/
+
+   FactData(theEnv)->ChangeToFactList = true;
+
+   /*===============================================*/
+   /* Remove any links between the fact and partial */
+   /* matches in the join network. These links are  */
+   /* used to keep track of logical dependencies.   */
+   /*===============================================*/
+
+   RemoveEntityDependencies(theEnv,(struct patternEntity *) theFact);
+
+   /*===========================================*/
+   /* Remove the fact from the fact hash table. */
+   /*===========================================*/
+
+   RemoveHashedFact(theEnv,theFact);
+
+   /*=========================================*/
+   /* Remove the fact from its template list. */
+   /*=========================================*/
+
+   if (theFact == theTemplate->lastFact)
+     { theTemplate->lastFact = theFact->previousTemplateFact; }
+
+   if (theFact->previousTemplateFact == NULL)
+     {
+      theTemplate->factList = theTemplate->factList->nextTemplateFact;
+      if (theTemplate->factList != NULL)
+        { theTemplate->factList->previousTemplateFact = NULL; }
+     }
+   else
+     {
+      theFact->previousTemplateFact->nextTemplateFact = theFact->nextTemplateFact;
+      if (theFact->nextTemplateFact != NULL)
+        { theFact->nextTemplateFact->previousTemplateFact = theFact->previousTemplateFact; }
+     }
+
+   /*=====================================*/
+   /* Remove the fact from the fact list. */
+   /*=====================================*/
+
+   if (theFact == FactData(theEnv)->LastFact)
+     { FactData(theEnv)->LastFact = theFact->previousFact; }
+
+   if (theFact->previousFact == NULL)
+     {
+      FactData(theEnv)->FactList = FactData(theEnv)->FactList->nextFact;
+      if (FactData(theEnv)->FactList != NULL)
+        { FactData(theEnv)->FactList->previousFact = NULL; }
+     }
+   else
+     {
+      theFact->previousFact->nextFact = theFact->nextFact;
+      if (theFact->nextFact != NULL)
+        { theFact->nextFact->previousFact = theFact->previousFact; }
+     }
+
+   /*===================================================*/
+   /* Add the fact to the fact garbage list unless this */
+   /* fact is being retract as part of a modify action. */
+   /*===================================================*/
+
+   if (! modifyOperation)
+     {
+      theFact->nextFact = FactData(theEnv)->GarbageFacts;
+      FactData(theEnv)->GarbageFacts = theFact;
+      UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+     }
+   else
+     {
+      theFact->nextFact = NULL;
+     }
+   theFact->garbage = true;
+
+   /*===================================================*/
+   /* Reset the evaluation error flag since expressions */
+   /* will be evaluated as part of the retract.         */
+   /*===================================================*/
+
+   SetEvaluationError(theEnv,false);
+
+   /*===========================================*/
+   /* Loop through the list of all the patterns */
+   /* that matched the fact and process the     */
+   /* retract operation for each one.           */
+   /*===========================================*/
+
+   EngineData(theEnv)->JoinOperationInProgress = true;
+   NetworkRetract(theEnv,(struct patternMatch *) theFact->list);
+   theFact->list = NULL;
+   EngineData(theEnv)->JoinOperationInProgress = false;
+
+   /*=========================================*/
+   /* Free partial matches that were released */
+   /* by the retraction of the fact.          */
+   /*=========================================*/
+
+   if (EngineData(theEnv)->ExecutingRule == NULL)
+     { FlushGarbagePartialMatches(theEnv); }
+
+   /*=========================================*/
+   /* Retract other facts that were logically */
+   /* dependent on the fact just retracted.   */
+   /*=========================================*/
+
+   ForceLogicalRetractions(theEnv);
+
+   /*==================================*/
+   /* Update busy counts and ephemeral */
+   /* garbage information.             */
+   /*==================================*/
+
+   FactDeinstall(theEnv,theFact);
+
+   /*====================================*/
+   /* Return the appropriate error code. */
+   /*====================================*/
+
+   if (GetEvaluationError(theEnv))
+     {
+      FactData(theEnv)->retractError = RE_RULE_NETWORK_ERROR;
+      return RE_RULE_NETWORK_ERROR;
+     }
+
+   FactData(theEnv)->retractError = RE_NO_ERROR;
+   return RE_NO_ERROR;
+  }
+
+/*******************/
+/* RetractCallback */
+/*******************/
+static bool RetractCallback(
+  Fact *theFact,
+  Environment *theEnv)
+  {
+   return (RetractDriver(theEnv,theFact,false,NULL) == RE_NO_ERROR);
+  }
+
+/******************************************************/
+/* Retract: C access routine for the retract command. */
+/******************************************************/
+RetractError Retract(
+  Fact *theFact)
+  {
+   GCBlock gcb;
+   RetractError rv;
+   Environment *theEnv;
+   
+   if (theFact == NULL)
+     { return RE_NULL_POINTER_ERROR; }
+
+   if (theFact->garbage)
+     { return RE_NO_ERROR; }
+
+   theEnv = theFact->whichDeftemplate->header.env;
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   GCBlockStart(theEnv,&gcb);
+   rv = RetractDriver(theEnv,theFact,false,NULL);
+   GCBlockEnd(theEnv,&gcb);
+   
+   return rv;
+  }
+
+/*******************************************************************/
+/* RemoveGarbageFacts: Returns facts that have been retracted to   */
+/*   the pool of available memory. It is necessary to postpone     */
+/*   returning the facts to memory because RHS actions retrieve    */
+/*   their variable bindings directly from the fact data structure */
+/*   and the facts may be in use in other data structures.         */
+/*******************************************************************/
+static void RemoveGarbageFacts(
+  Environment *theEnv,
+  void *context)
+  {
+   Fact *factPtr, *nextPtr, *lastPtr = NULL;
+
+   factPtr = FactData(theEnv)->GarbageFacts;
+
+   while (factPtr != NULL)
+     {
+      nextPtr = factPtr->nextFact;
+        
+      if (factPtr->patternHeader.busyCount == 0)
+        {
+         Multifield *theSegment;
+         size_t i;
+         
+         theSegment = &factPtr->theProposition;
+         for (i = 0 ; i < theSegment->length ; i++)
+           { AtomDeinstall(theEnv,theSegment->contents[i].header->type,theSegment->contents[i].value); }
+
+         ReturnFact(theEnv,factPtr);
+         if (lastPtr == NULL) FactData(theEnv)->GarbageFacts = nextPtr;
+         else lastPtr->nextFact = nextPtr;
+        }
+      else
+        { lastPtr = factPtr; }
+
+      factPtr = nextPtr;
+     }
+  }
+
+/********************************************************/
+/* AssertDriver: Driver routine for the assert command. */
+/********************************************************/
+Fact *AssertDriver(
+  Fact *theFact,
+  long long reuseIndex,
+  Fact *factListPosition,
+  Fact *templatePosition,
+  char *changeMap)
+  {
+   size_t hashValue;
+   size_t length, i;
+   CLIPSValue *theField;
+   Fact *duplicate;
+   struct callFunctionItemWithArg *theAssertFunction;
+   Environment *theEnv = theFact->whichDeftemplate->header.env;
+
+   FactData(theEnv)->assertError = AE_NO_ERROR;
+   
+   /*==================================================*/
+   /* Retracted and existing facts cannot be asserted. */
+   /*==================================================*/
+   
+   if (theFact->garbage)
+     {
+      FactData(theEnv)->assertError = AE_RETRACTED_ERROR;
+      return NULL;
+     }
+
+   if (reuseIndex != theFact->factIndex)
+     {
+      SystemError(theEnv,"FACTMNGR",6);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   /*==========================================*/
+   /* A fact can not be asserted while another */
+   /* fact is being asserted or retracted.     */
+   /*==========================================*/
+
+   if (EngineData(theEnv)->JoinOperationInProgress)
+     {
+      FactData(theEnv)->assertError = AE_COULD_NOT_ASSERT_ERROR;
+      ReturnFact(theEnv,theFact);
+      PrintErrorID(theEnv,"FACTMNGR",2,true);
+      WriteString(theEnv,STDERR,"Facts may not be asserted during pattern-matching.\n");
+      return NULL;
+     }
+
+   /*=============================================================*/
+   /* Replace invalid data types in the fact with the symbol nil. */
+   /*=============================================================*/
+
+   length = theFact->theProposition.length;
+   theField = theFact->theProposition.contents;
+
+   for (i = 0; i < length; i++)
+     {
+      if (theField[i].value == VoidConstant(theEnv))
+        { theField[i].value = CreateSymbol(theEnv,"nil"); }
+     }
+
+   /*========================================================*/
+   /* If fact assertions are being checked for duplications, */
+   /* then search the fact list for a duplicate fact.        */
+   /*========================================================*/
+
+   hashValue = HandleFactDuplication(theEnv,theFact,&duplicate,reuseIndex);
+   if (duplicate != NULL) return duplicate;
+
+   /*==========================================================*/
+   /* If necessary, add logical dependency links between the   */
+   /* fact and the partial match which is its logical support. */
+   /*==========================================================*/
+
+   if (AddLogicalDependencies(theEnv,(struct patternEntity *) theFact,false) == false)
+     {
+      if (reuseIndex == 0)
+        { ReturnFact(theEnv,theFact); }
+      else
+        {
+         theFact->nextFact = FactData(theEnv)->GarbageFacts;
+         FactData(theEnv)->GarbageFacts = theFact;
+         UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+         theFact->garbage = true;
+        }
+        
+      FactData(theEnv)->assertError = AE_COULD_NOT_ASSERT_ERROR;
+      return NULL;
+     }
+
+   /*======================================*/
+   /* Add the fact to the fact hash table. */
+   /*======================================*/
+
+   AddHashedFact(theEnv,theFact,hashValue);
+
+   /*================================*/
+   /* Add the fact to the fact list. */
+   /*================================*/
+
+   if (reuseIndex == 0)
+     { factListPosition = FactData(theEnv)->LastFact; }
+
+   if (factListPosition == NULL)
+     {
+      theFact->nextFact = FactData(theEnv)->FactList;
+      FactData(theEnv)->FactList = theFact;
+      theFact->previousFact = NULL;
+      if (theFact->nextFact != NULL)
+        { theFact->nextFact->previousFact = theFact; }
+     }
+   else
+     {
+      theFact->nextFact = factListPosition->nextFact;
+      theFact->previousFact = factListPosition;
+      factListPosition->nextFact = theFact;
+      if (theFact->nextFact != NULL)
+        { theFact->nextFact->previousFact = theFact; }
+     }
+
+   if ((FactData(theEnv)->LastFact == NULL) || (theFact->nextFact == NULL))
+     { FactData(theEnv)->LastFact = theFact; }
+
+   /*====================================*/
+   /* Add the fact to its template list. */
+   /*====================================*/
+
+   if (reuseIndex == 0)
+     { templatePosition = theFact->whichDeftemplate->lastFact; }
+
+   if (templatePosition == NULL)
+     {
+      theFact->nextTemplateFact = theFact->whichDeftemplate->factList;
+      theFact->whichDeftemplate->factList = theFact;
+      theFact->previousTemplateFact = NULL;
+      if (theFact->nextTemplateFact != NULL)
+        { theFact->nextTemplateFact->previousTemplateFact = theFact; }
+     }
+   else
+     {
+      theFact->nextTemplateFact = templatePosition->nextTemplateFact;
+      theFact->previousTemplateFact = templatePosition;
+      templatePosition->nextTemplateFact = theFact;
+      if (theFact->nextTemplateFact != NULL)
+        { theFact->nextTemplateFact->previousTemplateFact = theFact; }
+     }
+
+   if ((theFact->whichDeftemplate->lastFact == NULL) || (theFact->nextTemplateFact == NULL))
+     { theFact->whichDeftemplate->lastFact = theFact; }
+
+   /*==================================*/
+   /* Set the fact index and time tag. */
+   /*==================================*/
+
+   if (reuseIndex > 0)
+     { theFact->factIndex = reuseIndex; }
+   else
+     { theFact->factIndex = FactData(theEnv)->NextFactIndex++; }
+
+   theFact->patternHeader.timeTag = DefruleData(theEnv)->CurrentEntityTimeTag++;
+
+   /*=====================*/
+   /* Update busy counts. */
+   /*=====================*/
+
+   FactInstall(theEnv,theFact);
+
+   if (reuseIndex == 0)
+     {
+      Multifield *theSegment = &theFact->theProposition;
+      for (i = 0 ; i < theSegment->length ; i++)
+        {
+         AtomInstall(theEnv,theSegment->contents[i].header->type,theSegment->contents[i].value);
+        }
+     }
+
+   /*==========================================*/
+   /* Execute the list of functions that are   */
+   /* to be called before each fact assertion. */
+   /*==========================================*/
+
+   for (theAssertFunction = FactData(theEnv)->ListOfAssertFunctions;
+        theAssertFunction != NULL;
+        theAssertFunction = theAssertFunction->next)
+     { (*theAssertFunction->func)(theEnv,theFact,theAssertFunction->context); }
+
+   /*==========================*/
+   /* Print assert output if   */
+   /* facts are being watched. */
+   /*==========================*/
+
+#if DEBUGGING_FUNCTIONS
+   if (theFact->whichDeftemplate->watch &&
+       (! ConstructData(theEnv)->ClearReadyInProgress) &&
+       (! ConstructData(theEnv)->ClearInProgress))
+     {
+      WriteString(theEnv,STDOUT,"==> ");
+      PrintFactWithIdentifier(theEnv,STDOUT,theFact,changeMap);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+#endif
+
+   /*==================================*/
+   /* Set the change flag to indicate  */
+   /* the fact-list has been modified. */
+   /*==================================*/
+
+   FactData(theEnv)->ChangeToFactList = true;
+
+   /*==========================================*/
+   /* Check for constraint errors in the fact. */
+   /*==========================================*/
+
+   CheckTemplateFact(theEnv,theFact);
+
+   /*===================================================*/
+   /* Reset the evaluation error flag since expressions */
+   /* will be evaluated as part of the assert .         */
+   /*===================================================*/
+
+   SetEvaluationError(theEnv,false);
+
+   /*=============================================*/
+   /* Pattern match the fact using the associated */
+   /* deftemplate's pattern network.              */
+   /*=============================================*/
+
+   EngineData(theEnv)->JoinOperationInProgress = true;
+   FactPatternMatch(theEnv,theFact,theFact->whichDeftemplate->patternNetwork,0,0,NULL,NULL);
+   EngineData(theEnv)->JoinOperationInProgress = false;
+
+   /*===================================================*/
+   /* Retract other facts that were logically dependent */
+   /* on the non-existence of the fact just asserted.   */
+   /*===================================================*/
+
+   ForceLogicalRetractions(theEnv);
+
+   /*=========================================*/
+   /* Free partial matches that were released */
+   /* by the assertion of the fact.           */
+   /*=========================================*/
+
+   if (EngineData(theEnv)->ExecutingRule == NULL) FlushGarbagePartialMatches(theEnv);
+
+   /*===============================*/
+   /* Return a pointer to the fact. */
+   /*===============================*/
+
+   if (EvaluationData(theEnv)->EvaluationError)
+     { FactData(theEnv)->assertError = AE_RULE_NETWORK_ERROR; }
+
+   return theFact;
+  }
+
+/*****************************************************/
+/* Assert: C access routine for the assert function. */
+/*****************************************************/
+Fact *Assert(
+  Fact *theFact)
+  {
+   return AssertDriver(theFact,0,NULL,NULL,NULL);
+  }
+
+/*************************/
+/* GetAssertStringError: */
+/*************************/
+AssertStringError GetAssertStringError(
+  Environment *theEnv)
+  {
+   return FactData(theEnv)->assertStringError;
+  }
+
+/**************************************/
+/* RetractAllFacts: Loops through the */
+/*   fact-list and removes each fact. */
+/**************************************/
+RetractError RetractAllFacts(
+  Environment *theEnv)
+  {
+   RetractError rv;
+   
+   while (FactData(theEnv)->FactList != NULL)
+     {
+      if ((rv = Retract(FactData(theEnv)->FactList)) != RE_NO_ERROR)
+        { return rv; }
+     }
+     
+   return RE_NO_ERROR;
+  }
+
+/*********************************************/
+/* CreateFact: Creates a fact data structure */
+/*   of the specified deftemplate.           */
+/*********************************************/
+Fact *CreateFact(
+  Deftemplate *theDeftemplate)
+  {
+   Fact *newFact;
+   unsigned short i;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*=================================*/
+   /* A deftemplate must be specified */
+   /* in order to create a fact.      */
+   /*=================================*/
+
+   if (theDeftemplate == NULL) return NULL;
+
+   /*============================================*/
+   /* Create a fact for an explicit deftemplate. */
+   /*============================================*/
+
+   if (theDeftemplate->implied == false)
+     {
+      newFact = CreateFactBySize(theEnv,theDeftemplate->numberOfSlots);
+      for (i = 0;
+           i < theDeftemplate->numberOfSlots;
+           i++)
+        { newFact->theProposition.contents[i].voidValue = VoidConstant(theEnv); }
+     }
+
+   /*===========================================*/
+   /* Create a fact for an implied deftemplate. */
+   /*===========================================*/
+
+   else
+     {
+      newFact = CreateFactBySize(theEnv,1);
+      newFact->theProposition.contents[0].value = CreateUnmanagedMultifield(theEnv,0L);
+     }
+
+   /*===============================*/
+   /* Return a pointer to the fact. */
+   /*===============================*/
+
+   newFact->whichDeftemplate = theDeftemplate;
+
+   return newFact;
+  }
+
+/****************************************/
+/* GetFactSlot: Returns the slot value  */
+/*   from the specified slot of a fact. */
+/****************************************/
+GetSlotError GetFactSlot(
+  Fact *theFact,
+  const char *slotName,
+  CLIPSValue *theValue)
+  {
+   Deftemplate *theDeftemplate;
+   unsigned short whichSlot;
+   Environment *theEnv = theFact->whichDeftemplate->header.env;
+   
+   if (theFact == NULL)
+     {
+      return GSE_NULL_POINTER_ERROR;
+     }
+     
+   if (theFact->garbage)
+     {
+      theValue->lexemeValue = FalseSymbol(theEnv);
+      return GSE_INVALID_TARGET_ERROR;
+     }
+
+   /*===============================================*/
+   /* Get the deftemplate associated with the fact. */
+   /*===============================================*/
+
+   theDeftemplate = theFact->whichDeftemplate;
+
+   /*==============================================*/
+   /* Handle retrieving the slot value from a fact */
+   /* having an implied deftemplate. An implied    */
+   /* facts has a single multifield slot.          */
+   /*==============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (slotName != NULL)
+        {
+         if (strcmp(slotName,"implied") != 0)
+           { return GSE_SLOT_NOT_FOUND_ERROR; }
+        }
+        
+      theValue->value = theFact->theProposition.contents[0].value;
+      return GSE_NO_ERROR;
+     }
+
+   /*===================================*/
+   /* Make sure the slot name requested */
+   /* corresponds to a valid slot name. */
+   /*===================================*/
+
+   if (slotName == NULL) return GSE_NULL_POINTER_ERROR;
+   if (FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),&whichSlot) == NULL)
+     { return GSE_SLOT_NOT_FOUND_ERROR; }
+
+   /*========================*/
+   /* Return the slot value. */
+   /*========================*/
+
+   theValue->value = theFact->theProposition.contents[whichSlot].value;
+
+   return GSE_NO_ERROR;
+  }
+
+/**************************************/
+/* PutFactSlot: Sets the slot value   */
+/*   of the specified slot of a fact. */
+/**************************************/
+bool PutFactSlot(
+  Fact *theFact,
+  const char *slotName,
+  CLIPSValue *theValue)
+  {
+   Deftemplate *theDeftemplate;
+   struct templateSlot *theSlot;
+   unsigned short whichSlot;
+   Environment *theEnv = theFact->whichDeftemplate->header.env;
+
+   /*========================================*/
+   /* This function cannot be used on a fact */
+   /* that's already been asserted.          */
+   /*========================================*/
+   
+   if (theFact->factIndex != 0LL)
+     { return false; }
+     
+   /*===============================================*/
+   /* Get the deftemplate associated with the fact. */
+   /*===============================================*/
+
+   theDeftemplate = theFact->whichDeftemplate;
+
+   /*============================================*/
+   /* Handle setting the slot value of a fact    */
+   /* having an implied deftemplate. An implied  */
+   /* facts has a single multifield slot.        */
+   /*============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if ((slotName != NULL) || (theValue->header->type != MULTIFIELD_TYPE))
+        { return false; }
+
+      if (theFact->theProposition.contents[0].header->type == MULTIFIELD_TYPE)
+        { ReturnMultifield(theEnv,theFact->theProposition.contents[0].multifieldValue); }
+
+      theFact->theProposition.contents[0].value = CopyMultifield(theEnv,theValue->multifieldValue);
+
+      return true;
+     }
+
+   /*===================================*/
+   /* Make sure the slot name requested */
+   /* corresponds to a valid slot name. */
+   /*===================================*/
+
+   if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),&whichSlot)) == NULL)
+     { return false; }
+
+   /*=============================================*/
+   /* Make sure a single field value is not being */
+   /* stored in a multifield slot or vice versa.  */
+   /*=============================================*/
+
+   if (((theSlot->multislot == 0) && (theValue->header->type == MULTIFIELD_TYPE)) ||
+       ((theSlot->multislot == 1) && (theValue->header->type != MULTIFIELD_TYPE)))
+     { return false; }
+     
+   /*=================================*/
+   /* Check constraints for the slot. */
+   /*=================================*/
+   
+   if (theSlot->constraints != NULL)
+     {
+      if (ConstraintCheckValue(theEnv,theValue->header->type,theValue->value,theSlot->constraints) != NO_VIOLATION)
+        { return false; }
+     }
+
+   /*=====================*/
+   /* Set the slot value. */
+   /*=====================*/
+
+   if (theFact->theProposition.contents[whichSlot].header->type == MULTIFIELD_TYPE)
+     { ReturnMultifield(theEnv,theFact->theProposition.contents[whichSlot].multifieldValue); }
+
+   if (theValue->header->type == MULTIFIELD_TYPE)
+     { theFact->theProposition.contents[whichSlot].multifieldValue = CopyMultifield(theEnv,theValue->multifieldValue); }
+   else
+     { theFact->theProposition.contents[whichSlot].value = theValue->value; }
+
+   return true;
+  }
+
+/*******************************************************/
+/* AssignFactSlotDefaults: Sets a fact's slot values   */
+/*   to its default value if the value of the slot has */
+/*   not yet been set.                                 */
+/*******************************************************/
+bool AssignFactSlotDefaults(
+  Fact *theFact)
+  {
+   Deftemplate *theDeftemplate;
+   struct templateSlot *slotPtr;
+   unsigned short i;
+   UDFValue theResult;
+   Environment *theEnv = theFact->whichDeftemplate->header.env;
+
+   /*========================================*/
+   /* This function cannot be used on a fact */
+   /* that's already been asserted.          */
+   /*========================================*/
+   
+   if (theFact->factIndex != 0LL)
+     { return false; }
+     
+   /*===============================================*/
+   /* Get the deftemplate associated with the fact. */
+   /*===============================================*/
+
+   theDeftemplate = theFact->whichDeftemplate;
+
+   /*================================================*/
+   /* The value for the implied multifield slot of   */
+   /* an implied deftemplate is set to a multifield  */
+   /* of length zero when the fact is created.       */
+   /*================================================*/
+
+   if (theDeftemplate->implied) return true;
+
+   /*============================================*/
+   /* Loop through each slot of the deftemplate. */
+   /*============================================*/
+
+   for (i = 0, slotPtr = theDeftemplate->slotList;
+        i < theDeftemplate->numberOfSlots;
+        i++, slotPtr = slotPtr->next)
+     {
+      /*===================================*/
+      /* If the slot's value has been set, */
+      /* then move on to the next slot.    */
+      /*===================================*/
+
+      if (theFact->theProposition.contents[i].value != VoidConstant(theEnv)) continue;
+
+      /*======================================================*/
+      /* Assign the default value for the slot if one exists. */
+      /*======================================================*/
+
+      if (DeftemplateSlotDefault(theEnv,theDeftemplate,slotPtr,&theResult,false))
+        {
+         theFact->theProposition.contents[i].value = theResult.value;
+        }
+     }
+
+   /*==========================================*/
+   /* Return true to indicate that the default */
+   /* values have been successfully set.       */
+   /*==========================================*/
+
+   return true;
+  }
+
+/********************************************************/
+/* DeftemplateSlotDefault: Determines the default value */
+/*   for the specified slot of a deftemplate.           */
+/********************************************************/
+bool DeftemplateSlotDefault(
+  Environment *theEnv,
+  Deftemplate *theDeftemplate,
+  struct templateSlot *slotPtr,
+  UDFValue *theResult,
+  bool garbageMultifield)
+  {
+   /*================================================*/
+   /* The value for the implied multifield slot of an */
+   /* implied deftemplate does not have a default.    */
+   /*=================================================*/
+
+   if (theDeftemplate->implied) return false;
+
+   /*===============================================*/
+   /* If the (default ?NONE) attribute was declared */
+   /* for the slot, then return false to indicate   */
+   /* the default values for the fact couldn't be   */
+   /* supplied since this attribute requires that a */
+   /* default value can't be used for the slot.     */
+   /*===============================================*/
+
+   if (slotPtr->noDefault) return false;
+
+   /*==============================================*/
+   /* Otherwise if a static default was specified, */
+   /* use this as the default value.               */
+   /*==============================================*/
+
+   else if (slotPtr->defaultPresent)
+     {
+      if (slotPtr->multislot)
+        {
+         StoreInMultifield(theEnv,theResult,slotPtr->defaultList,garbageMultifield);
+        }
+      else
+        {
+         theResult->value = slotPtr->defaultList->value;
+        }
+     }
+
+   /*================================================*/
+   /* Otherwise if a dynamic-default was specified,  */
+   /* evaluate it and use this as the default value. */
+   /*================================================*/
+
+   else if (slotPtr->defaultDynamic)
+     {
+      if (! EvaluateAndStoreInDataObject(theEnv,slotPtr->multislot,
+                                         (Expression *) slotPtr->defaultList,
+                                         theResult,garbageMultifield))
+        { return false; }
+     }
+
+   /*====================================*/
+   /* Otherwise derive the default value */
+   /* from the slot's constraints.       */
+   /*====================================*/
+
+   else
+     {
+      DeriveDefaultFromConstraints(theEnv,slotPtr->constraints,theResult,
+                                   slotPtr->multislot,garbageMultifield);
+     }
+
+   /*==========================================*/
+   /* Return true to indicate that the default */
+   /* values have been successfully set.       */
+   /*==========================================*/
+
+   return true;
+  }
+
+/***************************************************************/
+/* CopyFactSlotValues: Copies the slot values from one fact to */
+/*   another. Both facts must have the same relation name.     */
+/***************************************************************/
+bool CopyFactSlotValues(
+  Environment *theEnv,
+  Fact *theDestFact,
+  Fact *theSourceFact)
+  {
+   Deftemplate *theDeftemplate;
+   struct templateSlot *slotPtr;
+   unsigned short i;
+
+   /*===================================*/
+   /* Both facts must be the same type. */
+   /*===================================*/
+
+   theDeftemplate = theSourceFact->whichDeftemplate;
+   if (theDestFact->whichDeftemplate != theDeftemplate)
+     { return false; }
+
+   /*===================================================*/
+   /* Loop through each slot of the deftemplate copying */
+   /* the source fact value to the destination fact.    */
+   /*===================================================*/
+
+   for (i = 0, slotPtr = theDeftemplate->slotList;
+        i < theDeftemplate->numberOfSlots;
+        i++, slotPtr = slotPtr->next)
+     {
+      if (theSourceFact->theProposition.contents[i].header->type != MULTIFIELD_TYPE)
+        {
+         theDestFact->theProposition.contents[i].value =
+           theSourceFact->theProposition.contents[i].value;
+        }
+      else
+        {
+         theDestFact->theProposition.contents[i].value = 
+           CopyMultifield(theEnv,theSourceFact->theProposition.contents[i].multifieldValue);
+        }
+     }
+
+   /*========================================*/
+   /* Return true to indicate that fact slot */
+   /* values were successfully copied.       */
+   /*========================================*/
+
+   return true;
+  }
+
+/*********************************************/
+/* CreateFactBySize: Allocates a fact data   */
+/*   structure based on the number of slots. */
+/*********************************************/
+Fact *CreateFactBySize(
+  Environment *theEnv,
+  size_t size)
+  {
+   Fact *theFact;
+   size_t newSize;
+
+   if (size <= 0) newSize = 1;
+   else newSize = size;
+
+   theFact = get_var_struct(theEnv,fact,sizeof(struct clipsValue) * (newSize - 1));
+
+   theFact->patternHeader.header.type = FACT_ADDRESS_TYPE;
+   theFact->garbage = false;
+   theFact->factIndex = 0LL;
+   theFact->patternHeader.busyCount = 0;
+   theFact->patternHeader.theInfo = &FactData(theEnv)->FactInfo;
+   theFact->patternHeader.dependents = NULL;
+   theFact->whichDeftemplate = NULL;
+   theFact->nextFact = NULL;
+   theFact->previousFact = NULL;
+   theFact->previousTemplateFact = NULL;
+   theFact->nextTemplateFact = NULL;
+   theFact->list = NULL;
+   theFact->basisSlots = NULL;
+
+   theFact->theProposition.length = size;
+   theFact->theProposition.busyCount = 0;
+
+   return(theFact);
+  }
+
+/*********************************************/
+/* ReturnFact: Returns a fact data structure */
+/*   to the pool of free memory.             */
+/*********************************************/
+void ReturnFact(
+  Environment *theEnv,
+  Fact *theFact)
+  {
+   Multifield *theSegment, *subSegment;
+   size_t newSize, i;
+
+   theSegment = &theFact->theProposition;
+
+   for (i = 0; i < theSegment->length; i++)
+     {
+      if (theSegment->contents[i].header->type == MULTIFIELD_TYPE)
+        {
+         subSegment = theSegment->contents[i].multifieldValue;
+         if (subSegment != NULL)
+           {
+            if (subSegment->busyCount == 0)
+              { ReturnMultifield(theEnv,subSegment); }
+            else
+              { AddToMultifieldList(theEnv,subSegment); }
+           }
+        }
+     }
+
+   if (theFact->theProposition.length == 0) newSize = 1;
+   else newSize = theFact->theProposition.length;
+
+   rtn_var_struct(theEnv,fact,sizeof(struct clipsValue) * (newSize - 1),theFact);
+  }
+
+/*************************************************************/
+/* FactInstall: Increments the fact, deftemplate, and atomic */
+/*   data value busy counts associated with the fact.        */
+/*************************************************************/
+void FactInstall(
+  Environment *theEnv,
+  Fact *newFact)
+  {
+   FactData(theEnv)->NumberOfFacts++;
+   newFact->whichDeftemplate->busyCount++;
+   newFact->patternHeader.busyCount++;
+  }
+
+/***************************************************************/
+/* FactDeinstall: Decrements the fact, deftemplate, and atomic */
+/*   data value busy counts associated with the fact.          */
+/***************************************************************/
+void FactDeinstall(
+  Environment *theEnv,
+  Fact *newFact)
+  {
+   FactData(theEnv)->NumberOfFacts--;
+   newFact->whichDeftemplate->busyCount--;
+   newFact->patternHeader.busyCount--;
+  }
+
+/***********************************************/
+/* IncrementFactCallback: Increments the       */
+/*   number of references to a specified fact. */
+/***********************************************/
+void IncrementFactCallback(
+  Environment *theEnv,
+  Fact *factPtr)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+   if (factPtr == NULL) return;
+
+   factPtr->patternHeader.busyCount++;
+  }
+
+/***********************************************/
+/* DecrementFactCallback: Decrements the       */
+/*   number of references to a specified fact. */
+/***********************************************/
+void DecrementFactCallback(
+  Environment *theEnv,
+  Fact *factPtr)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+   if (factPtr == NULL) return;
+
+   factPtr->patternHeader.busyCount--;
+  }
+
+/****************************************/
+/* RetainFact: Increments the number of */
+/*   references to a specified fact.    */
+/****************************************/
+void RetainFact(
+  Fact *factPtr)
+  {
+   if (factPtr == NULL) return;
+
+   factPtr->patternHeader.busyCount++;
+  }
+
+/*****************************************/
+/* ReleaseFact: Decrements the number of */
+/*   references to a specified fact.     */
+/*****************************************/
+void ReleaseFact(
+  Fact *factPtr)
+  {
+   if (factPtr == NULL) return;
+
+   factPtr->patternHeader.busyCount--;
+  }
+
+/*********************************************************/
+/* GetNextFact: If passed a NULL pointer, returns the */
+/*   first fact in the fact-list. Otherwise returns the  */
+/*   next fact following the fact passed as an argument. */
+/*********************************************************/
+Fact *GetNextFact(
+  Environment *theEnv,
+  Fact *factPtr)
+  {
+   if (factPtr == NULL)
+     { return FactData(theEnv)->FactList; }
+
+   if (factPtr->garbage) return NULL;
+
+   return factPtr->nextFact;
+  }
+
+/**************************************************/
+/* GetNextFactInScope: Returns the next fact that */
+/*   is in scope of the current module. Works in  */
+/*   a similar fashion to GetNextFact, but skips  */
+/*   facts that are out of scope.                 */
+/**************************************************/
+Fact *GetNextFactInScope(
+  Environment *theEnv,
+  Fact *theFact)
+  {
+   /*=======================================================*/
+   /* If fact passed as an argument is a NULL pointer, then */
+   /* we're just beginning a traversal of the fact list. If */
+   /* the module index has changed since that last time the */
+   /* fact list was traversed by this routine, then         */
+   /* determine all of the deftemplates that are in scope   */
+   /* of the current module.                                */
+   /*=======================================================*/
+
+   if (theFact == NULL)
+     {
+      theFact = FactData(theEnv)->FactList;
+      if (FactData(theEnv)->LastModuleIndex != DefmoduleData(theEnv)->ModuleChangeIndex)
+        {
+         UpdateDeftemplateScope(theEnv);
+         FactData(theEnv)->LastModuleIndex = DefmoduleData(theEnv)->ModuleChangeIndex;
+        }
+     }
+
+   /*==================================================*/
+   /* Otherwise, if the fact passed as an argument has */
+   /* been retracted, then there's no way to determine */
+   /* the next fact, so return a NULL pointer.         */
+   /*==================================================*/
+
+   else if (theFact->garbage)
+     { return NULL; }
+
+   /*==================================================*/
+   /* Otherwise, start the search for the next fact in */
+   /* scope with the fact immediately following the    */
+   /* fact passed as an argument.                      */
+   /*==================================================*/
+
+   else
+     { theFact = theFact->nextFact; }
+
+   /*================================================*/
+   /* Continue traversing the fact-list until a fact */
+   /* is found that's associated with a deftemplate  */
+   /* that's in scope.                               */
+   /*================================================*/
+
+   while (theFact != NULL)
+     {
+      if (theFact->whichDeftemplate->inScope) return theFact;
+
+      theFact = theFact->nextFact;
+     }
+
+   return NULL;
+  }
+
+/*************************************/
+/* FactPPForm: Returns the pretty    */
+/*   print representation of a fact. */
+/*************************************/
+void FactPPForm(
+  Fact *theFact,
+  StringBuilder *theSB,
+  bool ignoreDefaults)
+  {
+   Environment *theEnv = theFact->whichDeftemplate->header.env;
+   
+   OpenStringBuilderDestination(theEnv,"FactPPForm",theSB);
+   PrintFact(theEnv,"FactPPForm",theFact,true,ignoreDefaults,NULL);
+   CloseStringBuilderDestination(theEnv,"FactPPForm");
+  }
+
+/**********************************/
+/* FactIndex: C access routine    */
+/*   for the fact-index function. */
+/**********************************/
+long long FactIndex(
+  Fact *factPtr)
+  {
+   return factPtr->factIndex;
+  }
+
+/*************************************/
+/* AssertString: C access routine    */
+/*   for the assert-string function. */
+/*************************************/
+Fact *AssertString(
+  Environment *theEnv,
+  const char *theString)
+  {
+   Fact *theFact, *rv;
+   GCBlock gcb;
+   int danglingConstructs;
+      
+   if (theString == NULL)
+     {
+      FactData(theEnv)->assertStringError = ASE_NULL_POINTER_ERROR;
+      return NULL;
+     }
+     
+   danglingConstructs = ConstructData(theEnv)->DanglingConstructs;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   GCBlockStart(theEnv,&gcb);
+
+   if ((theFact = StringToFact(theEnv,theString)) == NULL)
+     {
+      FactData(theEnv)->assertStringError = ASE_PARSING_ERROR;
+      GCBlockEnd(theEnv,&gcb);
+      return NULL;
+     }
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ConstructData(theEnv)->DanglingConstructs = danglingConstructs; }
+
+   rv = Assert(theFact);
+   
+   GCBlockEnd(theEnv,&gcb);
+   
+   switch(FactData(theEnv)->assertError)
+     {
+      case AE_NO_ERROR:
+        FactData(theEnv)->assertStringError = ASE_NO_ERROR;
+        break;
+             
+      case AE_COULD_NOT_ASSERT_ERROR:
+        FactData(theEnv)->assertStringError = ASE_COULD_NOT_ASSERT_ERROR;
+        
+      case AE_RULE_NETWORK_ERROR:
+        FactData(theEnv)->assertStringError = ASE_RULE_NETWORK_ERROR;
+        break;
+      
+      case AE_NULL_POINTER_ERROR:
+      case AE_RETRACTED_ERROR:
+        SystemError(theEnv,"FACTMNGR",4);
+        ExitRouter(theEnv,EXIT_FAILURE);
+        break;
+     }
+   
+   return rv;
+  }
+
+/******************************************************/
+/* GetFactListChanged: Returns the flag indicating    */
+/*   whether a change to the fact-list has been made. */
+/******************************************************/
+bool GetFactListChanged(
+  Environment *theEnv)
+  {
+   return(FactData(theEnv)->ChangeToFactList);
+  }
+
+/********************************************************/
+/* SetFactListChanged: Sets the flag indicating whether */
+/*   a change to the fact-list has been made.           */
+/********************************************************/
+void SetFactListChanged(
+  Environment *theEnv,
+  bool value)
+  {
+   FactData(theEnv)->ChangeToFactList = value;
+  }
+
+/****************************************/
+/* GetNumberOfFacts: Returns the number */
+/* of facts in the fact-list.           */
+/****************************************/
+unsigned long GetNumberOfFacts(
+  Environment *theEnv)
+  {
+   return(FactData(theEnv)->NumberOfFacts);
+  }
+
+/***********************************************************/
+/* ResetFacts: Reset function for facts. Sets the starting */
+/*   fact index to zero and removes all facts.             */
+/***********************************************************/
+static void ResetFacts(
+  Environment *theEnv,
+  void *context)
+  {
+   /*====================================*/
+   /* Initialize the fact index to zero. */
+   /*====================================*/
+
+   FactData(theEnv)->NextFactIndex = 1L;
+
+   /*======================================*/
+   /* Remove all facts from the fact list. */
+   /*======================================*/
+
+   RetractAllFacts(theEnv);
+  }
+
+/************************************************************/
+/* ClearFactsReady: Clear ready function for facts. Returns */
+/*   true if facts were successfully removed and the clear  */
+/*   command can continue, otherwise false.                 */
+/************************************************************/
+static bool ClearFactsReady(
+  Environment *theEnv,
+  void *context)
+  {
+   /*======================================*/
+   /* Facts can not be deleted when a join */
+   /* operation is already in progress.    */
+   /*======================================*/
+
+   if (EngineData(theEnv)->JoinOperationInProgress) return false;
+
+   /*====================================*/
+   /* Initialize the fact index to zero. */
+   /*====================================*/
+
+   FactData(theEnv)->NextFactIndex = 1L;
+
+   /*======================================*/
+   /* Remove all facts from the fact list. */
+   /*======================================*/
+
+   RetractAllFacts(theEnv);
+
+   /*==============================================*/
+   /* If for some reason there are any facts still */
+   /* remaining, don't continue with the clear.    */
+   /*==============================================*/
+
+   if (GetNextFact(theEnv,NULL) != NULL) return false;
+
+   /*=============================*/
+   /* Return true to indicate the */
+   /* clear command can continue. */
+   /*=============================*/
+
+   return true;
+  }
+
+/***************************************************/
+/* FindIndexedFact: Returns a pointer to a fact in */
+/*   the fact list with the specified fact index.  */
+/***************************************************/
+Fact *FindIndexedFact(
+  Environment *theEnv,
+  long long factIndexSought)
+  {
+   Fact *theFact;
+
+   for (theFact = GetNextFact(theEnv,NULL);
+        theFact != NULL;
+        theFact = GetNextFact(theEnv,theFact))
+     {
+      if (theFact->factIndex == factIndexSought)
+        { return(theFact); }
+     }
+
+   return NULL;
+  }
+
+/**************************************/
+/* AddAssertFunction: Adds a function */
+/*   to the ListOfAssertFunctions.    */
+/**************************************/
+bool AddAssertFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunctionWithArg *functionPtr,
+  int priority,
+  void *context)
+  {
+   FactData(theEnv)->ListOfAssertFunctions =
+      AddFunctionToCallListWithArg(theEnv,name,priority,functionPtr,
+                                   FactData(theEnv)->ListOfAssertFunctions,context);
+   return true;
+  }
+
+/********************************************/
+/* RemoveAssertFunction: Removes a function */
+/*   from the ListOfAssertFunctions.        */
+/********************************************/
+bool RemoveAssertFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   FactData(theEnv)->ListOfAssertFunctions =
+      RemoveFunctionFromCallListWithArg(theEnv,name,FactData(theEnv)->ListOfAssertFunctions,&found);
+
+   if (found) return true;
+
+   return false;
+  }
+
+/***************************************/
+/* AddRetractFunction: Adds a function */
+/*   to the ListOfRetractFunctions.    */
+/***************************************/
+bool AddRetractFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunctionWithArg *functionPtr,
+  int priority,
+  void *context)
+  {
+   FactData(theEnv)->ListOfRetractFunctions =
+      AddFunctionToCallListWithArg(theEnv,name,priority,functionPtr,
+                                   FactData(theEnv)->ListOfRetractFunctions,context);
+   return true;
+  }
+
+/*********************************************/
+/* RemoveRetractFunction: Removes a function */
+/*   from the ListOfRetractFunctions.        */
+/*********************************************/
+bool RemoveRetractFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   FactData(theEnv)->ListOfRetractFunctions =
+      RemoveFunctionFromCallListWithArg(theEnv,name,FactData(theEnv)->ListOfRetractFunctions,&found);
+
+   if (found) return true;
+
+   return false;
+  }
+
+/**************************************/
+/* AddModifyFunction: Adds a function */
+/*   to the ListOfModifyFunctions.    */
+/**************************************/
+bool AddModifyFunction(
+  Environment *theEnv,
+  const char *name,
+  ModifyCallFunction *functionPtr,
+  int priority,
+  void *context)
+  {
+   FactData(theEnv)->ListOfModifyFunctions =
+      AddModifyFunctionToCallList(theEnv,name,priority,functionPtr,
+                                  FactData(theEnv)->ListOfModifyFunctions,context);
+      
+   return true;
+  }
+
+/********************************************/
+/* RemoveModifyFunction: Removes a function */
+/*   from the ListOfModifyFunctions.        */
+/********************************************/
+bool RemoveModifyFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   FactData(theEnv)->ListOfModifyFunctions =
+      RemoveModifyFunctionFromCallList(theEnv,name,FactData(theEnv)->ListOfModifyFunctions,&found);
+
+   if (found) return true;
+
+   return false;
+  }
+
+/**********************************************************/
+/* AddModifyFunctionToCallList: Adds a function to a list */
+/*   of functions which are called to perform certain     */
+/*   operations (e.g. clear, reset, and bload functions). */
+/**********************************************************/
+ModifyCallFunctionItem *AddModifyFunctionToCallList(
+  Environment *theEnv,
+  const char *name,
+  int priority,
+  ModifyCallFunction *func,
+  ModifyCallFunctionItem *head,
+  void *context)
+  {
+   ModifyCallFunctionItem *newPtr, *currentPtr, *lastPtr = NULL;
+   char  *nameCopy;
+
+   newPtr = get_struct(theEnv,modifyCallFunctionItem);
+
+   nameCopy = (char *) genalloc(theEnv,strlen(name) + 1);
+   genstrcpy(nameCopy,name);
+   newPtr->name = nameCopy;
+
+   newPtr->func = func;
+   newPtr->priority = priority;
+   newPtr->context = context;
+
+   if (head == NULL)
+     {
+      newPtr->next = NULL;
+      return(newPtr);
+     }
+
+   currentPtr = head;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = head;
+      head = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   return(head);
+  }
+
+/********************************************************************/
+/* RemoveModifyFunctionFromCallList: Removes a function from a list */
+/*   of functions which are called to perform certain operations    */
+/*   (e.g. clear, reset, and bload functions).                      */
+/********************************************************************/
+ModifyCallFunctionItem *RemoveModifyFunctionFromCallList(
+  Environment *theEnv,
+  const char *name,
+  ModifyCallFunctionItem *head,
+  bool *found)
+  {
+   ModifyCallFunctionItem *currentPtr, *lastPtr;
+
+   *found = false;
+   lastPtr = NULL;
+   currentPtr = head;
+
+   while (currentPtr != NULL)
+     {
+      if (strcmp(name,currentPtr->name) == 0)
+        {
+         *found = true;
+         if (lastPtr == NULL)
+           { head = currentPtr->next; }
+         else
+           { lastPtr->next = currentPtr->next; }
+
+         genfree(theEnv,(void *) currentPtr->name,strlen(currentPtr->name) + 1);
+         rtn_struct(theEnv,modifyCallFunctionItem,currentPtr);
+         return head;
+        }
+
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   return head;
+  }
+
+
+/***************************************************************/
+/* DeallocateModifyCallList: Removes all functions from a list */
+/*   of functions which are called to perform certain          */
+/*   operations (e.g. clear, reset, and bload functions).      */
+/***************************************************************/
+void DeallocateModifyCallList(
+  Environment *theEnv,
+  ModifyCallFunctionItem *theList)
+  {
+   ModifyCallFunctionItem *tmpPtr, *nextPtr;
+
+   tmpPtr = theList;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      genfree(theEnv,(void *) tmpPtr->name,strlen(tmpPtr->name) + 1);
+      rtn_struct(theEnv,modifyCallFunctionItem,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/**********************/
+/* CreateFactBuilder: */
+/**********************/
+FactBuilder *CreateFactBuilder(
+  Environment *theEnv,
+  const char *deftemplateName)
+  {
+   FactBuilder *theFB;
+   Deftemplate *theDeftemplate;
+   int i;
+   
+   if (theEnv == NULL) return NULL;
+      
+   if (deftemplateName != NULL)
+     {
+      theDeftemplate = FindDeftemplate(theEnv,deftemplateName);
+      if (theDeftemplate == NULL)
+        {
+         FactData(theEnv)->factBuilderError = FBE_DEFTEMPLATE_NOT_FOUND_ERROR;
+         return NULL;
+        }
+   
+      if (theDeftemplate->implied)
+        {
+         FactData(theEnv)->factBuilderError = FBE_IMPLIED_DEFTEMPLATE_ERROR;
+         return NULL;
+        }
+     }
+   else
+     { theDeftemplate = NULL; }
+     
+   theFB = get_struct(theEnv,factBuilder);
+   theFB->fbEnv = theEnv;
+   theFB->fbDeftemplate = theDeftemplate;
+      
+   if ((theDeftemplate == NULL) || (theDeftemplate->numberOfSlots == 0))
+     { theFB->fbValueArray = NULL; }
+   else
+     {
+      theFB->fbValueArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * theDeftemplate->numberOfSlots);
+      for (i = 0; i < theDeftemplate->numberOfSlots; i++)
+        { theFB->fbValueArray[i].voidValue = VoidConstant(theEnv); }
+     }
+
+   FactData(theEnv)->factBuilderError = FBE_NO_ERROR;
+   
+   return theFB;
+  }
+
+/*************************/
+/* FBPutSlotCLIPSInteger */
+/*************************/
+PutSlotError FBPutSlotCLIPSInteger(
+  FactBuilder *theFB,
+  const char *slotName,
+  CLIPSInteger *slotValue)
+  {
+   CLIPSValue theValue;
+
+   theValue.integerValue = slotValue;
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/********************/
+/* FBPutSlotInteger */
+/********************/
+PutSlotError FBPutSlotInteger(
+  FactBuilder *theFB,
+  const char *slotName,
+  long long longLongValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theFB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.integerValue = CreateInteger(theFB->fbEnv,longLongValue);
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/************************/
+/* FBPutSlotCLIPSLexeme */
+/************************/
+PutSlotError FBPutSlotCLIPSLexeme(
+  FactBuilder *theFB,
+  const char *slotName,
+  CLIPSLexeme *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.lexemeValue = slotValue;
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/*******************/
+/* FBPutSlotSymbol */
+/*******************/
+PutSlotError FBPutSlotSymbol(
+  FactBuilder *theFB,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theFB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.lexemeValue = CreateSymbol(theFB->fbEnv,stringValue);
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/*******************/
+/* FBPutSlotString */
+/*******************/
+PutSlotError FBPutSlotString(
+  FactBuilder *theFB,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theFB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.lexemeValue = CreateString(theFB->fbEnv,stringValue);
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/*************************/
+/* FBPutSlotInstanceName */
+/*************************/
+PutSlotError FBPutSlotInstanceName(
+  FactBuilder *theFB,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theFB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.lexemeValue = CreateInstanceName(theFB->fbEnv,stringValue);
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/***********************/
+/* FBPutSlotCLIPSFloat */
+/***********************/
+PutSlotError FBPutSlotCLIPSFloat(
+  FactBuilder *theFB,
+  const char *slotName,
+  CLIPSFloat *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.floatValue = slotValue;
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/******************/
+/* FBPutSlotFloat */
+/******************/
+PutSlotError FBPutSlotFloat(
+  FactBuilder *theFB,
+  const char *slotName,
+  double floatValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theFB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.floatValue = CreateFloat(theFB->fbEnv,floatValue);
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/*****************/
+/* FBPutSlotFact */
+/*****************/
+PutSlotError FBPutSlotFact(
+  FactBuilder *theFB,
+  const char *slotName,
+  Fact *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.factValue = slotValue;
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/*********************/
+/* FBPutSlotInstance */
+/*********************/
+PutSlotError FBPutSlotInstance(
+  FactBuilder *theFB,
+  const char *slotName,
+  Instance *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.instanceValue = slotValue;
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/*********************************/
+/* FBPutSlotCLIPSExternalAddress */
+/*********************************/
+PutSlotError FBPutSlotCLIPSExternalAddress(
+  FactBuilder *theFB,
+  const char *slotName,
+  CLIPSExternalAddress *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.externalAddressValue = slotValue;
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/***********************/
+/* FBPutSlotMultifield */
+/***********************/
+PutSlotError FBPutSlotMultifield(
+  FactBuilder *theFB,
+  const char *slotName,
+  Multifield *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.multifieldValue = slotValue;
+   return FBPutSlot(theFB,slotName,&theValue);
+  }
+
+/**************/
+/* FBPutSlot: */
+/**************/
+PutSlotError FBPutSlot(
+  FactBuilder *theFB,
+  const char *slotName,
+  CLIPSValue *slotValue)
+  {
+   Environment *theEnv;
+   struct templateSlot *theSlot;
+   unsigned short whichSlot;
+   CLIPSValue oldValue;
+   int i;
+   ConstraintViolationType cvType;
+     
+   /*==========================*/
+   /* Check for NULL pointers. */
+   /*==========================*/
+   
+   if ((theFB == NULL) || (slotName == NULL) || (slotValue == NULL))
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   if ((theFB->fbDeftemplate == NULL) || (slotValue->value == NULL))
+     { return PSE_NULL_POINTER_ERROR; }
+   
+   theEnv = theFB->fbEnv;
+     
+   /*===================================*/
+   /* Make sure the slot name requested */
+   /* corresponds to a valid slot name. */
+   /*===================================*/
+
+   if ((theSlot = FindSlot(theFB->fbDeftemplate,CreateSymbol(theFB->fbEnv,slotName),&whichSlot)) == NULL)
+     { return PSE_SLOT_NOT_FOUND_ERROR; }
+     
+   /*=============================================*/
+   /* Make sure a single field value is not being */
+   /* stored in a multifield slot or vice versa.  */
+   /*=============================================*/
+
+   if (((theSlot->multislot == 0) && (slotValue->header->type == MULTIFIELD_TYPE)) ||
+       ((theSlot->multislot == 1) && (slotValue->header->type != MULTIFIELD_TYPE)))
+     { return PSE_CARDINALITY_ERROR; }
+     
+   /*=================================*/
+   /* Check constraints for the slot. */
+   /*=================================*/
+   
+   if (theSlot->constraints != NULL)
+     {
+      if ((cvType = ConstraintCheckValue(theEnv,slotValue->header->type,slotValue->value,theSlot->constraints)) != NO_VIOLATION)
+        {
+         switch(cvType)
+           {
+            case NO_VIOLATION:
+            case FUNCTION_RETURN_TYPE_VIOLATION:
+              SystemError(theEnv,"FACTMNGR",2);
+              ExitRouter(theEnv,EXIT_FAILURE);
+              break;
+        
+            case TYPE_VIOLATION:
+              return PSE_TYPE_ERROR;
+              
+            case RANGE_VIOLATION:
+              return PSE_RANGE_ERROR;
+              
+            case ALLOWED_VALUES_VIOLATION:
+              return PSE_ALLOWED_VALUES_ERROR;
+              
+            case CARDINALITY_VIOLATION:
+              return PSE_CARDINALITY_ERROR;
+            
+            case ALLOWED_CLASSES_VIOLATION:
+              return PSE_ALLOWED_CLASSES_ERROR;
+           }
+        }
+     }
+
+   /*==========================*/
+   /* Set up the change array. */
+   /*==========================*/
+
+   if (theFB->fbValueArray == NULL)
+     {
+      theFB->fbValueArray = (CLIPSValue *) gm2(theFB->fbEnv,sizeof(CLIPSValue) * theFB->fbDeftemplate->numberOfSlots);
+      for (i = 0; i < theFB->fbDeftemplate->numberOfSlots; i++)
+        { theFB->fbValueArray[i].voidValue = theFB->fbEnv->VoidConstant; }
+     }
+
+   /*=====================*/
+   /* Set the slot value. */
+   /*=====================*/
+   
+   oldValue.value = theFB->fbValueArray[whichSlot].value;
+   
+   if (oldValue.header->type == MULTIFIELD_TYPE)
+     {
+      if (MultifieldsEqual(oldValue.multifieldValue,slotValue->multifieldValue))
+        { return PSE_NO_ERROR; }
+     }
+   else
+     {
+      if (oldValue.value == slotValue->value)
+        { return PSE_NO_ERROR; }
+     }
+   
+   Release(theEnv,oldValue.header);
+   
+   if (oldValue.header->type == MULTIFIELD_TYPE)
+     { ReturnMultifield(theEnv,oldValue.multifieldValue); }
+
+   if (slotValue->header->type == MULTIFIELD_TYPE)
+     { theFB->fbValueArray[whichSlot].multifieldValue = CopyMultifield(theEnv,slotValue->multifieldValue); }
+   else
+     { theFB->fbValueArray[whichSlot].value = slotValue->value; }
+      
+   Retain(theEnv,theFB->fbValueArray[whichSlot].header);
+   
+   return PSE_NO_ERROR;
+  }
+
+/*************/
+/* FBAssert: */
+/*************/
+Fact *FBAssert(
+  FactBuilder *theFB)
+  {
+   Environment *theEnv;
+   int i;
+   Fact *theFact;
+   
+   if (theFB == NULL) return NULL;
+   theEnv = theFB->fbEnv;
+   
+   if (theFB->fbDeftemplate == NULL)
+     {
+      FactData(theEnv)->factBuilderError = FBE_NULL_POINTER_ERROR;
+      return NULL;
+     }
+     
+   theFact = CreateFact(theFB->fbDeftemplate);
+   
+   for (i = 0; i < theFB->fbDeftemplate->numberOfSlots; i++)
+     {
+      if (theFB->fbValueArray[i].voidValue != VoidConstant(theEnv))
+        {
+         theFact->theProposition.contents[i].value = theFB->fbValueArray[i].value;
+         Release(theEnv,theFB->fbValueArray[i].header);
+         theFB->fbValueArray[i].voidValue = VoidConstant(theEnv);
+        }
+     }
+
+   AssignFactSlotDefaults(theFact);
+   
+   theFact = Assert(theFact);
+      
+   switch (FactData(theEnv)->assertError)
+     {
+      case AE_NO_ERROR:
+        FactData(theEnv)->factBuilderError = FBE_NO_ERROR;
+        break;
+        
+      case AE_NULL_POINTER_ERROR:
+      case AE_RETRACTED_ERROR:
+        SystemError(theEnv,"FACTMNGR",1);
+        ExitRouter(theEnv,EXIT_FAILURE);
+        break;
+        
+      case AE_COULD_NOT_ASSERT_ERROR:
+        FactData(theEnv)->factBuilderError = FBE_COULD_NOT_ASSERT_ERROR;
+        break;
+      
+      case AE_RULE_NETWORK_ERROR:
+        FactData(theEnv)->factBuilderError = FBE_RULE_NETWORK_ERROR;
+        break;
+     }
+   
+   return theFact;
+  }
+
+/**************/
+/* FBDispose: */
+/**************/
+void FBDispose(
+  FactBuilder *theFB)
+  {
+   Environment *theEnv;
+
+   if (theFB == NULL) return;
+   
+   theEnv = theFB->fbEnv;
+
+   FBAbort(theFB);
+   
+   if (theFB->fbValueArray != NULL)
+     { rm(theEnv,theFB->fbValueArray,sizeof(CLIPSValue) * theFB->fbDeftemplate->numberOfSlots); }
+   
+   rtn_struct(theEnv,factBuilder,theFB);
+  }
+
+/************/
+/* FBAbort: */
+/************/
+void FBAbort(
+  FactBuilder *theFB)
+  {
+   Environment *theEnv;
+   GCBlock gcb;
+   int i;
+   
+   if (theFB == NULL) return;
+   
+   if (theFB->fbDeftemplate == NULL) return;
+
+   theEnv = theFB->fbEnv;
+
+   GCBlockStart(theEnv,&gcb);
+   
+   for (i = 0; i < theFB->fbDeftemplate->numberOfSlots; i++)
+     {
+      Release(theEnv,theFB->fbValueArray[i].header);
+      
+      if (theFB->fbValueArray[i].header->type == MULTIFIELD_TYPE)
+        { ReturnMultifield(theEnv,theFB->fbValueArray[i].multifieldValue); }
+        
+      theFB->fbValueArray[i].voidValue = VoidConstant(theEnv);
+     }
+     
+   GCBlockEnd(theEnv,&gcb);
+  }
+
+/********************/
+/* FBSetDeftemplate */
+/********************/
+FactBuilderError FBSetDeftemplate(
+  FactBuilder *theFB,
+  const char *deftemplateName)
+  {
+   Deftemplate *theDeftemplate;
+   Environment *theEnv;
+   int i;
+   
+   if (theFB == NULL)
+     { return FBE_NULL_POINTER_ERROR; }
+   
+   theEnv = theFB->fbEnv;
+
+   FBAbort(theFB);
+   
+   if (deftemplateName != NULL)
+     {
+      theDeftemplate = FindDeftemplate(theFB->fbEnv,deftemplateName);
+   
+      if (theDeftemplate == NULL)
+        {
+         FactData(theEnv)->factBuilderError = FBE_DEFTEMPLATE_NOT_FOUND_ERROR;
+         return FBE_DEFTEMPLATE_NOT_FOUND_ERROR;
+        }
+     
+      if (theDeftemplate->implied)
+        {
+         FactData(theEnv)->factBuilderError = FBE_IMPLIED_DEFTEMPLATE_ERROR;
+         return FBE_IMPLIED_DEFTEMPLATE_ERROR;
+        }
+     }
+   else
+     { theDeftemplate = NULL; }
+
+   if (theFB->fbValueArray != NULL)
+     { rm(theEnv,theFB->fbValueArray,sizeof(CLIPSValue) * theFB->fbDeftemplate->numberOfSlots); }
+
+   theFB->fbDeftemplate = theDeftemplate;
+   
+   if ((theDeftemplate == NULL) || (theDeftemplate->numberOfSlots == 0))
+     { theFB->fbValueArray = NULL; }
+   else
+     {
+      theFB->fbValueArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * theDeftemplate->numberOfSlots);
+      for (i = 0; i < theDeftemplate->numberOfSlots; i++)
+        { theFB->fbValueArray[i].voidValue = VoidConstant(theEnv); }
+     }
+
+   FactData(theEnv)->factBuilderError = FBE_NO_ERROR;
+   return FBE_NO_ERROR;
+  }
+
+/************/
+/* FBError: */
+/************/
+FactBuilderError FBError(
+  Environment *theEnv)
+  {
+   return FactData(theEnv)->factBuilderError;
+  }
+
+/***********************/
+/* CreateFactModifier: */
+/***********************/
+FactModifier *CreateFactModifier(
+  Environment *theEnv,
+  Fact *oldFact)
+  {
+   FactModifier *theFM;
+   int i;
+
+   if (theEnv == NULL) return NULL;
+     
+   if (oldFact != NULL)
+     {
+      if (oldFact->garbage)
+        {
+         FactData(theEnv)->factModifierError = FME_RETRACTED_ERROR;
+         return NULL;
+        }
+     
+      if (oldFact->whichDeftemplate->implied)
+        {
+         FactData(theEnv)->factModifierError = FME_IMPLIED_DEFTEMPLATE_ERROR;
+         return NULL;
+        }
+        
+      RetainFact(oldFact);
+     }
+     
+   theFM = get_struct(theEnv,factModifier);
+   theFM->fmEnv = theEnv;
+   theFM->fmOldFact = oldFact;
+      
+   if ((oldFact == NULL) || (oldFact->whichDeftemplate->numberOfSlots == 0))
+     {
+      theFM->fmValueArray = NULL;
+      theFM->changeMap = NULL;
+     }
+   else
+     {
+      theFM->fmValueArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * oldFact->whichDeftemplate->numberOfSlots);
+
+      for (i = 0; i < oldFact->whichDeftemplate->numberOfSlots; i++)
+        { theFM->fmValueArray[i].voidValue = VoidConstant(theEnv); }
+
+      theFM->changeMap = (char *) gm2(theEnv,CountToBitMapSize(oldFact->whichDeftemplate->numberOfSlots));
+      ClearBitString((void *) theFM->changeMap,CountToBitMapSize(oldFact->whichDeftemplate->numberOfSlots));
+     }
+
+   FactData(theEnv)->factModifierError = FME_NO_ERROR;
+   return theFM;
+  }
+
+/*************************/
+/* FMPutSlotCLIPSInteger */
+/*************************/
+PutSlotError FMPutSlotCLIPSInteger(
+  FactModifier *theFM,
+  const char *slotName,
+  CLIPSInteger *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.integerValue = slotValue;
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/********************/
+/* FMPutSlotInteger */
+/********************/
+PutSlotError FMPutSlotInteger(
+  FactModifier *theFM,
+  const char *slotName,
+  long long longLongValue)
+  {
+   CLIPSValue theValue;
+      
+   if (theFM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.integerValue = CreateInteger(theFM->fmEnv,longLongValue);
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/************************/
+/* FMPutSlotCLIPSLexeme */
+/************************/
+PutSlotError FMPutSlotCLIPSLexeme(
+  FactModifier *theFM,
+  const char *slotName,
+  CLIPSLexeme *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.lexemeValue = slotValue;
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/*******************/
+/* FMPutSlotSymbol */
+/*******************/
+PutSlotError FMPutSlotSymbol(
+  FactModifier *theFM,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+      
+   if (theFM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.lexemeValue = CreateSymbol(theFM->fmEnv,stringValue);
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/*******************/
+/* FMPutSlotString */
+/*******************/
+PutSlotError FMPutSlotString(
+  FactModifier *theFM,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+      
+   if (theFM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.lexemeValue = CreateString(theFM->fmEnv,stringValue);
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/*************************/
+/* FMPutSlotInstanceName */
+/*************************/
+PutSlotError FMPutSlotInstanceName(
+  FactModifier *theFM,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+      
+   if (theFM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.lexemeValue = CreateInstanceName(theFM->fmEnv,stringValue);
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/***********************/
+/* FMPutSlotCLIPSFloat */
+/***********************/
+PutSlotError FMPutSlotCLIPSFloat(
+  FactModifier *theFM,
+  const char *slotName,
+  CLIPSFloat *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.floatValue = slotValue;
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/******************/
+/* FMPutSlotFloat */
+/******************/
+PutSlotError FMPutSlotFloat(
+  FactModifier *theFM,
+  const char *slotName,
+  double floatValue)
+  {
+   CLIPSValue theValue;
+      
+   if (theFM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.floatValue = CreateFloat(theFM->fmEnv,floatValue);
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/*****************/
+/* FMPutSlotFact */
+/*****************/
+PutSlotError FMPutSlotFact(
+  FactModifier *theFM,
+  const char *slotName,
+  Fact *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.factValue = slotValue;
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/*********************/
+/* FMPutSlotInstance */
+/*********************/
+PutSlotError FMPutSlotInstance(
+  FactModifier *theFM,
+  const char *slotName,
+  Instance *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.instanceValue = slotValue;
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/****************************/
+/* FMPutSlotExternalAddress */
+/****************************/
+PutSlotError FMPutSlotExternalAddress(
+  FactModifier *theFM,
+  const char *slotName,
+  CLIPSExternalAddress *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.externalAddressValue = slotValue;
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/***********************/
+/* FMPutSlotMultifield */
+/***********************/
+PutSlotError FMPutSlotMultifield(
+  FactModifier *theFM,
+  const char *slotName,
+  Multifield *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.multifieldValue = slotValue;
+   return FMPutSlot(theFM,slotName,&theValue);
+  }
+
+/**************/
+/* FMPutSlot: */
+/**************/
+PutSlotError FMPutSlot(
+  FactModifier *theFM,
+  const char *slotName,
+  CLIPSValue *slotValue)
+  {
+   Environment *theEnv;
+   struct templateSlot *theSlot;
+   unsigned short whichSlot;
+   CLIPSValue oldValue;
+   CLIPSValue oldFactValue;
+   int i;
+   ConstraintViolationType cvType;
+   
+   /*==========================*/
+   /* Check for NULL pointers. */
+   /*==========================*/
+
+   if ((theFM == NULL) || (slotName == NULL) || (slotValue == NULL))
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   if ((theFM->fmOldFact == NULL) || (slotValue->value == NULL))
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   theEnv = theFM->fmEnv;
+   
+   /*==================================*/
+   /* Deleted facts can't be modified. */
+   /*==================================*/
+   
+   if (theFM->fmOldFact->garbage)
+     { return PSE_INVALID_TARGET_ERROR; }
+     
+   /*===================================*/
+   /* Make sure the slot name requested */
+   /* corresponds to a valid slot name. */
+   /*===================================*/
+
+   if ((theSlot = FindSlot(theFM->fmOldFact->whichDeftemplate,CreateSymbol(theEnv,slotName),&whichSlot)) == NULL)
+     { return PSE_SLOT_NOT_FOUND_ERROR; }
+
+   /*=============================================*/
+   /* Make sure a single field value is not being */
+   /* stored in a multifield slot or vice versa.  */
+   /*=============================================*/
+
+   if (((theSlot->multislot == 0) && (slotValue->header->type == MULTIFIELD_TYPE)) ||
+       ((theSlot->multislot == 1) && (slotValue->header->type != MULTIFIELD_TYPE)))
+     { return PSE_CARDINALITY_ERROR; }
+   
+   /*=================================*/
+   /* Check constraints for the slot. */
+   /*=================================*/
+   
+   if (theSlot->constraints != NULL)
+     {
+      if ((cvType = ConstraintCheckValue(theEnv,slotValue->header->type,slotValue->value,theSlot->constraints)) != NO_VIOLATION)
+        {
+         switch(cvType)
+           {
+            case NO_VIOLATION:
+            case FUNCTION_RETURN_TYPE_VIOLATION:
+              SystemError(theEnv,"FACTMNGR",3);
+              ExitRouter(theEnv,EXIT_FAILURE);
+              break;
+              
+            case TYPE_VIOLATION:
+              return PSE_TYPE_ERROR;
+              
+            case RANGE_VIOLATION:
+              return PSE_RANGE_ERROR;
+              
+            case ALLOWED_VALUES_VIOLATION:
+              return PSE_ALLOWED_VALUES_ERROR;
+              
+            case CARDINALITY_VIOLATION:
+              return PSE_CARDINALITY_ERROR;
+            
+            case ALLOWED_CLASSES_VIOLATION:
+              return PSE_ALLOWED_CLASSES_ERROR;
+           }
+        }
+     }
+
+   /*===========================*/
+   /* Set up the change arrays. */
+   /*===========================*/
+   
+   if (theFM->fmValueArray == NULL)
+     {
+      theFM->fmValueArray = (CLIPSValue *) gm2(theFM->fmEnv,sizeof(CLIPSValue) * theFM->fmOldFact->whichDeftemplate->numberOfSlots);
+      for (i = 0; i < theFM->fmOldFact->whichDeftemplate->numberOfSlots; i++)
+        { theFM->fmValueArray[i].voidValue = theFM->fmEnv->VoidConstant; }
+     }
+
+   if (theFM->changeMap == NULL)
+     {
+      theFM->changeMap = (char *) gm2(theFM->fmEnv,CountToBitMapSize(theFM->fmOldFact->whichDeftemplate->numberOfSlots));
+      ClearBitString((void *) theFM->changeMap,CountToBitMapSize(theFM->fmOldFact->whichDeftemplate->numberOfSlots));
+     }
+
+   /*=====================*/
+   /* Set the slot value. */
+   /*=====================*/
+
+   oldValue.value = theFM->fmValueArray[whichSlot].value;
+   oldFactValue.value = theFM->fmOldFact->theProposition.contents[whichSlot].value;
+
+   if (oldFactValue.header->type == MULTIFIELD_TYPE)
+     {
+      if (MultifieldsEqual(oldFactValue.multifieldValue,slotValue->multifieldValue))
+        {
+         Release(theFM->fmEnv,oldValue.header);
+         if (oldValue.header->type == MULTIFIELD_TYPE)
+           { ReturnMultifield(theFM->fmEnv,oldValue.multifieldValue); }
+         theFM->fmValueArray[whichSlot].voidValue = theFM->fmEnv->VoidConstant;
+         ClearBitMap(theFM->changeMap,whichSlot);
+         return PSE_NO_ERROR;
+        }
+
+      if (MultifieldsEqual(oldValue.multifieldValue,slotValue->multifieldValue))
+        { return PSE_NO_ERROR; }
+     }
+   else
+     {
+      if (slotValue->value == oldFactValue.value)
+        {
+         Release(theFM->fmEnv,oldValue.header);
+         theFM->fmValueArray[whichSlot].voidValue = theFM->fmEnv->VoidConstant;
+         ClearBitMap(theFM->changeMap,whichSlot);
+         return PSE_NO_ERROR;
+        }
+        
+      if (oldValue.value == slotValue->value)
+        { return PSE_NO_ERROR; }
+     }
+
+   SetBitMap(theFM->changeMap,whichSlot);
+
+   Release(theFM->fmEnv,oldValue.header);
+
+   if (oldValue.header->type == MULTIFIELD_TYPE)
+     { ReturnMultifield(theFM->fmEnv,oldValue.multifieldValue); }
+      
+   if (slotValue->header->type == MULTIFIELD_TYPE)
+     { theFM->fmValueArray[whichSlot].multifieldValue = CopyMultifield(theFM->fmEnv,slotValue->multifieldValue); }
+   else
+     { theFM->fmValueArray[whichSlot].value = slotValue->value; }
+
+   Retain(theFM->fmEnv,theFM->fmValueArray[whichSlot].header);
+
+   return PSE_NO_ERROR;
+  }
+
+/*************/
+/* FMModify: */
+/*************/
+Fact *FMModify(
+  FactModifier *theFM)
+  {
+   Environment *theEnv;
+   Fact *rv;
+   
+   if (theFM == NULL)
+     { return NULL; }
+     
+   theEnv = theFM->fmEnv;
+   
+   if (theFM->fmOldFact == NULL)
+     {
+      FactData(theEnv)->factModifierError = FME_NULL_POINTER_ERROR;
+      return NULL;
+     }
+
+   if (theFM->fmOldFact->garbage)
+     {
+      FactData(theEnv)->factModifierError = FME_RETRACTED_ERROR;
+      return NULL;
+     }
+     
+   if (theFM->changeMap == NULL)
+     { return theFM->fmOldFact; }
+     
+   if (! BitStringHasBitsSet(theFM->changeMap,CountToBitMapSize(theFM->fmOldFact->whichDeftemplate->numberOfSlots)))
+     { return theFM->fmOldFact; }
+     
+   rv = ReplaceFact(theFM->fmEnv,theFM->fmOldFact,theFM->fmValueArray,theFM->changeMap);
+
+   if ((FactData(theEnv)->assertError == AE_RULE_NETWORK_ERROR) ||
+       (FactData(theEnv)->retractError == RE_RULE_NETWORK_ERROR))
+     { FactData(theEnv)->factModifierError = FME_RULE_NETWORK_ERROR; }
+   else if ((FactData(theEnv)->retractError == RE_COULD_NOT_RETRACT_ERROR) ||
+            (FactData(theEnv)->assertError == AE_COULD_NOT_ASSERT_ERROR))
+     { FactData(theEnv)->factModifierError = FME_COULD_NOT_MODIFY_ERROR; }
+   else
+     { FactData(theEnv)->factModifierError = FME_NO_ERROR; }
+
+   FMAbort(theFM);
+   
+   if ((rv != NULL) && (rv != theFM->fmOldFact))
+     {
+      ReleaseFact(theFM->fmOldFact);
+      theFM->fmOldFact = rv;
+      RetainFact(theFM->fmOldFact);
+     }
+   
+   return rv;
+  }
+
+/**************/
+/* FMDispose: */
+/**************/
+void FMDispose(
+  FactModifier *theFM)
+  {
+   GCBlock gcb;
+   Environment *theEnv = theFM->fmEnv;
+   int i;
+
+   GCBlockStart(theEnv,&gcb);
+   
+   /*========================*/
+   /* Clear the value array. */
+   /*========================*/
+   
+   if (theFM->fmOldFact != NULL)
+     {
+      for (i = 0; i < theFM->fmOldFact->whichDeftemplate->numberOfSlots; i++)
+        {
+         Release(theEnv,theFM->fmValueArray[i].header);
+
+         if (theFM->fmValueArray[i].header->type == MULTIFIELD_TYPE)
+           { ReturnMultifield(theEnv,theFM->fmValueArray[i].multifieldValue); }
+        }
+     }
+   
+   /*=====================================*/
+   /* Return the value and change arrays. */
+   /*=====================================*/
+   
+   if (theFM->fmValueArray != NULL)
+     { rm(theEnv,theFM->fmValueArray,sizeof(CLIPSValue) * theFM->fmOldFact->whichDeftemplate->numberOfSlots); }
+      
+   if (theFM->changeMap != NULL)
+     { rm(theEnv,(void *) theFM->changeMap,CountToBitMapSize(theFM->fmOldFact->whichDeftemplate->numberOfSlots)); }
+
+   /*====================================*/
+   /* Return the FactModifier structure. */
+   /*====================================*/
+   
+   if (theFM->fmOldFact != NULL)
+     { ReleaseFact(theFM->fmOldFact); }
+      
+   rtn_struct(theEnv,factModifier,theFM);
+
+   GCBlockEnd(theEnv,&gcb);
+  }
+
+/************/
+/* FMAbort: */
+/************/
+void FMAbort(
+  FactModifier *theFM)
+  {
+   GCBlock gcb;
+   Environment *theEnv;
+   unsigned int i;
+   
+   if (theFM == NULL) return;
+   
+   if (theFM->fmOldFact == NULL) return;
+
+   theEnv = theFM->fmEnv;
+
+   GCBlockStart(theEnv,&gcb);
+
+   for (i = 0; i < theFM->fmOldFact->whichDeftemplate->numberOfSlots; i++)
+     {
+      Release(theEnv,theFM->fmValueArray[i].header);
+
+      if (theFM->fmValueArray[i].header->type == MULTIFIELD_TYPE)
+        { ReturnMultifield(theEnv,theFM->fmValueArray[i].multifieldValue); }
+        
+      theFM->fmValueArray[i].voidValue = theFM->fmEnv->VoidConstant;
+     }
+      
+   if (theFM->changeMap != NULL)
+     { ClearBitString((void *) theFM->changeMap,CountToBitMapSize(theFM->fmOldFact->whichDeftemplate->numberOfSlots)); }
+     
+   GCBlockEnd(theEnv,&gcb);
+  }
+
+/**************/
+/* FMSetFact: */
+/**************/
+FactModifierError FMSetFact(
+  FactModifier *theFM,
+  Fact *oldFact)
+  {
+   Environment *theEnv;
+   unsigned short currentSlotCount, newSlotCount;
+   unsigned int i;
+      
+   if (theFM == NULL)
+     { return FME_NULL_POINTER_ERROR; }
+     
+   theEnv = theFM->fmEnv;
+
+   /*=================================================*/
+   /* Modifiers can only be created for non-retracted */
+   /* deftemplate facts with at least one slot.       */
+   /*=================================================*/
+   
+   if (oldFact != NULL)
+     {
+      if (oldFact->garbage)
+        {
+         FactData(theEnv)->factModifierError = FME_RETRACTED_ERROR;
+         return FME_RETRACTED_ERROR;
+        }
+      
+      if (oldFact->whichDeftemplate->implied)
+        {
+         FactData(theEnv)->factModifierError = FME_IMPLIED_DEFTEMPLATE_ERROR;
+         return FME_IMPLIED_DEFTEMPLATE_ERROR;
+        }
+     }
+     
+   /*========================*/
+   /* Clear the value array. */
+   /*========================*/
+   
+   if (theFM->fmValueArray != NULL)
+     {
+      for (i = 0; i < theFM->fmOldFact->whichDeftemplate->numberOfSlots; i++)
+        {
+         Release(theEnv,theFM->fmValueArray[i].header);
+
+         if (theFM->fmValueArray[i].header->type == MULTIFIELD_TYPE)
+           { ReturnMultifield(theEnv,theFM->fmValueArray[i].multifieldValue); }
+        }
+     }
+
+   /*==================================================*/
+   /* Resize the value and change arrays if necessary. */
+   /*==================================================*/
+
+   if (theFM->fmOldFact == NULL)
+     { currentSlotCount = 0; }
+   else
+     { currentSlotCount = theFM->fmOldFact->whichDeftemplate->numberOfSlots; }
+   
+   if (oldFact == NULL)
+     { newSlotCount = 0; }
+   else
+     { newSlotCount = oldFact->whichDeftemplate->numberOfSlots; }
+     
+   if (newSlotCount != currentSlotCount)
+     {
+      if (theFM->fmValueArray != NULL)
+        { rm(theEnv,theFM->fmValueArray,sizeof(CLIPSValue) * currentSlotCount); }
+      
+      if (theFM->changeMap != NULL)
+        { rm(theEnv,(void *) theFM->changeMap,currentSlotCount); }
+        
+      if (newSlotCount == 0)
+        {
+         theFM->fmValueArray = NULL;
+         theFM->changeMap = NULL;
+        }
+      else
+        {
+         theFM->fmValueArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * newSlotCount);
+         theFM->changeMap = (char *) gm2(theEnv,CountToBitMapSize(newSlotCount));
+        }
+     }
+
+   /*=================================*/
+   /* Update the fact being modified. */
+   /*=================================*/
+   
+   RetainFact(oldFact);
+   ReleaseFact(theFM->fmOldFact);
+   theFM->fmOldFact = oldFact;
+
+   /*=========================================*/
+   /* Initialize the value and change arrays. */
+   /*=========================================*/
+   
+   for (i = 0; i < newSlotCount; i++)
+     { theFM->fmValueArray[i].voidValue = theFM->fmEnv->VoidConstant; }
+   
+   if (newSlotCount != 0)
+     { ClearBitString((void *) theFM->changeMap,CountToBitMapSize(newSlotCount)); }
+
+   /*================================================================*/
+   /* Return true to indicate the modifier was successfully created. */
+   /*================================================================*/
+      
+   FactData(theEnv)->factModifierError = FME_NO_ERROR;
+   return FME_NO_ERROR;
+  }
+
+/************/
+/* FMError: */
+/************/
+FactModifierError FMError(
+  Environment *theEnv)
+  {
+   return FactData(theEnv)->factModifierError;
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT */
+
diff --git a/clips/factmngr.h b/clips/factmngr.h
new file mode 100755
index 000000000..9e8abeea0
--- /dev/null
+++ b/clips/factmngr.h
@@ -0,0 +1,325 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/02/18            */
+   /*                                                     */
+   /*              FACTS MANAGER HEADER FILE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            AssignFactSlotDefaults function does not       */
+/*            properly handle defaults for multifield slots. */
+/*            DR0869                                         */
+/*                                                           */
+/*            Support for ppfact command.                    */
+/*                                                           */
+/*      6.30: Callback function support for assertion,       */
+/*            retraction, and modification of facts.         */
+/*                                                           */
+/*            Updates to fact pattern entity record.         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Removed unused global variables.               */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            JoinOperationInProgress mechanism.             */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Watch facts for modify command only prints     */
+/*            changed slots.                                 */
+/*                                                           */
+/*            Modify command preserves fact id and address.  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factmngr
+
+#pragma once
+
+#define _H_factmngr
+
+typedef struct factBuilder FactBuilder;
+typedef struct factModifier FactModifier;
+
+#include "entities.h"
+#include "conscomp.h"
+#include "tmpltdef.h"
+
+typedef void ModifyCallFunction(Environment *,Fact *,Fact *,void *);
+typedef struct modifyCallFunctionItem ModifyCallFunctionItem;
+
+typedef enum
+  {
+   RE_NO_ERROR = 0,
+   RE_NULL_POINTER_ERROR,
+   RE_COULD_NOT_RETRACT_ERROR,
+   RE_RULE_NETWORK_ERROR
+  } RetractError;
+
+typedef enum
+  {
+   AE_NO_ERROR = 0,
+   AE_NULL_POINTER_ERROR,
+   AE_RETRACTED_ERROR,
+   AE_COULD_NOT_ASSERT_ERROR,
+   AE_RULE_NETWORK_ERROR
+  } AssertError;
+
+typedef enum
+  {
+   ASE_NO_ERROR = 0,
+   ASE_NULL_POINTER_ERROR,
+   ASE_PARSING_ERROR,
+   ASE_COULD_NOT_ASSERT_ERROR,
+   ASE_RULE_NETWORK_ERROR
+  } AssertStringError;
+
+typedef enum
+  {
+   FBE_NO_ERROR = 0,
+   FBE_NULL_POINTER_ERROR,
+   FBE_DEFTEMPLATE_NOT_FOUND_ERROR,
+   FBE_IMPLIED_DEFTEMPLATE_ERROR,
+   FBE_COULD_NOT_ASSERT_ERROR,
+   FBE_RULE_NETWORK_ERROR
+  } FactBuilderError;
+
+typedef enum
+  {
+   FME_NO_ERROR = 0,
+   FME_NULL_POINTER_ERROR,
+   FME_RETRACTED_ERROR,
+   FME_IMPLIED_DEFTEMPLATE_ERROR,
+   FME_COULD_NOT_MODIFY_ERROR,
+   FME_RULE_NETWORK_ERROR
+  } FactModifierError;
+
+struct modifyCallFunctionItem
+  {
+   const char *name;
+   ModifyCallFunction *func;
+   int priority;
+   ModifyCallFunctionItem *next;
+   void *context;
+  };
+
+struct fact
+  {
+   union
+     {
+      struct patternEntity patternHeader;
+      TypeHeader header;
+     };
+   Deftemplate *whichDeftemplate;
+   void *list;
+   long long factIndex;
+   unsigned long hashValue;
+   unsigned int garbage : 1;
+   Fact *previousFact;
+   Fact *nextFact;
+   Fact *previousTemplateFact;
+   Fact *nextTemplateFact;
+   Multifield *basisSlots;
+   Multifield theProposition;
+  };
+
+struct factBuilder
+  {
+   Environment *fbEnv;
+   Deftemplate *fbDeftemplate;
+   CLIPSValue *fbValueArray;
+  };
+
+struct factModifier
+  {
+   Environment *fmEnv;
+   Fact *fmOldFact;
+   CLIPSValue *fmValueArray;
+   char *changeMap;
+  };
+
+#include "facthsh.h"
+
+#define FACTS_DATA 3
+
+struct factsData
+  {
+   bool ChangeToFactList;
+#if DEBUGGING_FUNCTIONS
+   bool WatchFacts;
+#endif
+   Fact DummyFact;
+   Fact *GarbageFacts;
+   Fact *LastFact;
+   Fact *FactList;
+   long long NextFactIndex;
+   unsigned long NumberOfFacts;
+   struct callFunctionItemWithArg *ListOfAssertFunctions;
+   struct callFunctionItemWithArg *ListOfRetractFunctions;
+   ModifyCallFunctionItem *ListOfModifyFunctions;
+   struct patternEntityRecord  FactInfo;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   Deftemplate *CurrentDeftemplate;
+#endif
+#if DEFRULE_CONSTRUCT && (! RUN_TIME) && DEFTEMPLATE_CONSTRUCT && CONSTRUCT_COMPILER
+   struct CodeGeneratorItem *FactCodeItem;
+#endif
+   struct factHashEntry **FactHashTable;
+   unsigned long FactHashTableSize;
+   bool FactDuplication;
+#if DEFRULE_CONSTRUCT
+   Fact                    *CurrentPatternFact;
+   struct multifieldMarker *CurrentPatternMarks;
+#endif
+   long LastModuleIndex;
+   RetractError retractError;
+   AssertError assertError;
+   AssertStringError assertStringError;
+   FactModifierError factModifierError;
+   FactBuilderError factBuilderError;
+  };
+
+#define FactData(theEnv) ((struct factsData *) GetEnvironmentData(theEnv,FACTS_DATA))
+
+   Fact                          *Assert(Fact *);
+   AssertStringError              GetAssertStringError(Environment *);
+   Fact                          *AssertDriver(Fact *,long long,Fact *,Fact *,char *);
+   Fact                          *AssertString(Environment *,const char *);
+   Fact                          *CreateFact(Deftemplate *);
+   void                           ReleaseFact(Fact *);
+   void                           DecrementFactCallback(Environment *,Fact *);
+   long long                      FactIndex(Fact *);
+   GetSlotError                   GetFactSlot(Fact *,const char *,CLIPSValue *);
+   void                           PrintFactWithIdentifier(Environment *,const char *,Fact *,const char *);
+   void                           PrintFact(Environment *,const char *,Fact *,bool,bool,const char *);
+   void                           PrintFactIdentifierInLongForm(Environment *,const char *,Fact *);
+   RetractError                   Retract(Fact *);
+   RetractError                   RetractDriver(Environment *,Fact *,bool,char *);
+   RetractError                   RetractAllFacts(Environment *);
+   Fact                          *CreateFactBySize(Environment *,size_t);
+   void                           FactInstall(Environment *,Fact *);
+   void                           FactDeinstall(Environment *,Fact *);
+   Fact                          *GetNextFact(Environment *,Fact *);
+   Fact                          *GetNextFactInScope(Environment *,Fact *);
+   void                           FactPPForm(Fact *,StringBuilder *,bool);
+   bool                           GetFactListChanged(Environment *);
+   void                           SetFactListChanged(Environment *,bool);
+   unsigned long                  GetNumberOfFacts(Environment *);
+   void                           InitializeFacts(Environment *);
+   Fact                          *FindIndexedFact(Environment *,long long);
+   void                           RetainFact(Fact *);
+   void                           IncrementFactCallback(Environment *,Fact *);
+   void                           PrintFactIdentifier(Environment *,const char *,Fact *);
+   void                           DecrementFactBasisCount(Environment *,Fact *);
+   void                           IncrementFactBasisCount(Environment *,Fact *);
+   bool                           FactIsDeleted(Environment *,Fact *);
+   void                           ReturnFact(Environment *,Fact *);
+   void                           MatchFactFunction(Environment *,Fact *);
+   bool                           PutFactSlot(Fact *,const char *,CLIPSValue *);
+   bool                           AssignFactSlotDefaults(Fact *);
+   bool                           CopyFactSlotValues(Environment *,Fact *,Fact *);
+   bool                           DeftemplateSlotDefault(Environment *,Deftemplate *,
+                                                         struct templateSlot *,UDFValue *,bool);
+   bool                           AddAssertFunction(Environment *,const char *,
+                                                    VoidCallFunctionWithArg *,int,void *);
+   bool                           RemoveAssertFunction(Environment *,const char *);
+   bool                           AddRetractFunction(Environment *,const char *,
+                                                     VoidCallFunctionWithArg *,int,void *);
+   bool                           RemoveRetractFunction(Environment *,const char *);
+   FactBuilder                   *CreateFactBuilder(Environment *,const char *);
+   PutSlotError                   FBPutSlot(FactBuilder *,const char *,CLIPSValue *);
+   Fact                          *FBAssert(FactBuilder *);
+   void                           FBDispose(FactBuilder *);
+   void                           FBAbort(FactBuilder *);
+   FactBuilderError               FBSetDeftemplate(FactBuilder *,const char *);
+   PutSlotError                   FBPutSlotCLIPSInteger(FactBuilder *,const char *,CLIPSInteger *);
+   PutSlotError                   FBPutSlotInteger(FactBuilder *,const char *,long long);
+   PutSlotError                   FBPutSlotCLIPSFloat(FactBuilder *,const char *,CLIPSFloat *);
+   PutSlotError                   FBPutSlotFloat(FactBuilder *,const char *,double);
+   PutSlotError                   FBPutSlotCLIPSLexeme(FactBuilder *,const char *,CLIPSLexeme *);
+   PutSlotError                   FBPutSlotSymbol(FactBuilder *,const char *,const char *);
+   PutSlotError                   FBPutSlotString(FactBuilder *,const char *,const char *);
+   PutSlotError                   FBPutSlotInstanceName(FactBuilder *,const char *,const char *);
+   PutSlotError                   FBPutSlotFact(FactBuilder *,const char *,Fact *);
+   PutSlotError                   FBPutSlotInstance(FactBuilder *,const char *,Instance *);
+   PutSlotError                   FBPutSlotCLIPSExternalAddress(FactBuilder *,const char *,CLIPSExternalAddress *);
+   PutSlotError                   FBPutSlotMultifield(FactBuilder *,const char *,Multifield *);
+   FactBuilderError               FBError(Environment *);
+   FactModifier                  *CreateFactModifier(Environment *,Fact *);
+   PutSlotError                   FMPutSlot(FactModifier *,const char *,CLIPSValue *);
+   Fact                          *FMModify(FactModifier *);
+   void                           FMDispose(FactModifier *);
+   void                           FMAbort(FactModifier *);
+   FactModifierError              FMSetFact(FactModifier *,Fact *);
+   PutSlotError                   FMPutSlotCLIPSInteger(FactModifier *,const char *,CLIPSInteger *);
+   PutSlotError                   FMPutSlotInteger(FactModifier *,const char *,long long);
+   PutSlotError                   FMPutSlotCLIPSFloat(FactModifier *,const char *,CLIPSFloat *);
+   PutSlotError                   FMPutSlotFloat(FactModifier *,const char *,double);
+   PutSlotError                   FMPutSlotCLIPSLexeme(FactModifier *,const char *,CLIPSLexeme *);
+   PutSlotError                   FMPutSlotSymbol(FactModifier *,const char *,const char *);
+   PutSlotError                   FMPutSlotString(FactModifier *,const char *,const char *);
+   PutSlotError                   FMPutSlotInstanceName(FactModifier *,const char *,const char *);
+   PutSlotError                   FMPutSlotFact(FactModifier *,const char *,Fact *);
+   PutSlotError                   FMPutSlotInstance(FactModifier *,const char *,Instance *);
+   PutSlotError                   FMPutSlotExternalAddress(FactModifier *,const char *,CLIPSExternalAddress *);
+   PutSlotError                   FMPutSlotMultifield(FactModifier *,const char *,Multifield *);
+   FactModifierError              FMError(Environment *);
+
+   bool                           AddModifyFunction(Environment *,const char *,ModifyCallFunction *,int,void *);
+   bool                           RemoveModifyFunction(Environment *,const char *);
+   ModifyCallFunctionItem        *AddModifyFunctionToCallList(Environment *,const char *,int,
+                                                              ModifyCallFunction *,ModifyCallFunctionItem *,void *);
+   ModifyCallFunctionItem        *RemoveModifyFunctionFromCallList(Environment *,const char *,
+                                                                   ModifyCallFunctionItem *,bool *);
+   void                           DeallocateModifyCallList(Environment *,ModifyCallFunctionItem *);
+
+#endif /* _H_factmngr */
+
+
+
+
+
diff --git a/clips/factprt.c b/clips/factprt.c
new file mode 100755
index 000000000..d9cb3c9d9
--- /dev/null
+++ b/clips/factprt.c
@@ -0,0 +1,498 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/01/16             */
+   /*                                                     */
+   /*           FACT RETE PRINT FUNCTIONS MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Print routines for the fact rete primitives.     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Updates to support new struct members.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT
+
+#include "envrnmnt.h"
+#include "factgen.h"
+#include "prntutil.h"
+#include "router.h"
+#include "symbol.h"
+
+#include "factprt.h"
+
+/***************************************/
+/* PrintFactJNCompVars1: Print routine */
+/*   for the FactJNCompVars1 function. */
+/***************************************/
+void PrintFactJNCompVars1(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factCompVarsJN1Call *hack;
+
+   hack = (struct factCompVarsJN1Call *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(fact-jn-cmp-vars1 ");
+   if (hack->pass) WriteString(theEnv,logicalName,"= ");
+   else WriteString(theEnv,logicalName,"<> ");
+
+   WriteString(theEnv,logicalName,"p");
+   PrintUnsignedInteger(theEnv,logicalName,hack->pattern1 + 1);
+
+   if (hack->p1lhs)
+     { WriteString(theEnv,logicalName," L"); }
+   else if (hack->p1rhs)
+     { WriteString(theEnv,logicalName," R"); }
+
+   WriteString(theEnv,logicalName," s");
+   PrintUnsignedInteger(theEnv,logicalName,hack->slot1);
+
+   WriteString(theEnv,logicalName," p");
+   PrintUnsignedInteger(theEnv,logicalName,hack->pattern2 + 1);
+
+   if (hack->p2lhs)
+     { WriteString(theEnv,logicalName," L"); }
+   else if (hack->p2rhs)
+     { WriteString(theEnv,logicalName," R"); }
+
+   WriteString(theEnv,logicalName," s");
+   PrintUnsignedInteger(theEnv,logicalName,hack->slot2);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/***************************************/
+/* PrintFactJNCompVars2: Print routine */
+/*   for the FactJNCompVars2 function. */
+/***************************************/
+void PrintFactJNCompVars2(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factCompVarsJN2Call *hack;
+
+   hack = (struct factCompVarsJN2Call *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(fact-jn-cmp-vars2 ");
+   if (hack->pass) WriteString(theEnv,logicalName,"= ");
+   else WriteString(theEnv,logicalName,"<> ");
+
+   WriteString(theEnv,logicalName,"p");
+   PrintUnsignedInteger(theEnv,logicalName,hack->pattern1 + 1);
+
+   if (hack->p1lhs)
+     { WriteString(theEnv,logicalName," L"); }
+   else if (hack->p1rhs)
+     { WriteString(theEnv,logicalName," R"); }
+
+   WriteString(theEnv,logicalName," s");
+   PrintUnsignedInteger(theEnv,logicalName,hack->slot1);
+
+   if (hack->fromBeginning1) WriteString(theEnv,logicalName, " b");
+   else WriteString(theEnv,logicalName," e");
+
+   WriteString(theEnv,logicalName," f");
+   PrintUnsignedInteger(theEnv,logicalName,hack->offset1);
+
+   WriteString(theEnv,logicalName," p");
+   PrintUnsignedInteger(theEnv,logicalName,hack->pattern2 + 1);
+
+   if (hack->p2lhs)
+     { WriteString(theEnv,logicalName," L"); }
+   else if (hack->p2rhs)
+     { WriteString(theEnv,logicalName," R"); }
+
+   WriteString(theEnv,logicalName," s");
+   PrintUnsignedInteger(theEnv,logicalName,hack->slot2);
+
+   if (hack->fromBeginning2) WriteString(theEnv,logicalName," b");
+   else WriteString(theEnv,logicalName," e");
+
+   WriteString(theEnv,logicalName," f");
+   PrintUnsignedInteger(theEnv,logicalName,hack->offset2);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/***************************************/
+/* PrintFactPNCompVars1: Print routine */
+/*   for the FactPNCompVars1 function. */
+/***************************************/
+void PrintFactPNCompVars1(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factCompVarsPN1Call *hack;
+
+   hack = (struct factCompVarsPN1Call *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(fact-pn-cmp-vars ");
+   if (hack->pass) WriteString(theEnv,logicalName,"p ");
+   else WriteString(theEnv,logicalName,"n ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->field1);
+   WriteString(theEnv,logicalName," ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->field2);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/**************************************/
+/* PrintFactSlotLength: Print routine */
+/*   for the FactSlotLength function. */
+/**************************************/
+void PrintFactSlotLength(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factCheckLengthPNCall *hack;
+
+   hack = (struct factCheckLengthPNCall *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(slot-length ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichSlot);
+   WriteString(theEnv,logicalName," ");
+   if (hack->exactly) WriteString(theEnv,logicalName,"= ");
+   else WriteString(theEnv,logicalName,">= ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->minLength);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/*************************************/
+/* PrintFactJNGetVar1: Print routine */
+/*   for the FactJNGetvar1 function. */
+/*************************************/
+void PrintFactJNGetVar1(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factGetVarJN1Call *hack;
+
+   hack = (struct factGetVarJN1Call *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(fact-jn-getvar-1 ");
+   if (hack->factAddress) WriteString(theEnv,logicalName,"t ");
+   else WriteString(theEnv,logicalName,"f ");
+   if (hack->allFields) WriteString(theEnv,logicalName,"t ");
+   else WriteString(theEnv,logicalName,"f ");
+
+   WriteString(theEnv,logicalName,"p");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichPattern + 1);
+   WriteString(theEnv,logicalName," ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichField);
+   WriteString(theEnv,logicalName," s");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichSlot);
+
+   if (hack->lhs)
+     { WriteString(theEnv,logicalName," L"); }
+   else if (hack->rhs)
+     { WriteString(theEnv,logicalName," R"); }
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/*************************************/
+/* PrintFactJNGetVar2: Print routine */
+/*   for the FactJNGetvar2 function. */
+/*************************************/
+void PrintFactJNGetVar2(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factGetVarJN2Call *hack;
+
+   hack = (struct factGetVarJN2Call *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(fact-jn-getvar-2");
+
+   WriteString(theEnv,logicalName," p");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichPattern + 1);
+   WriteString(theEnv,logicalName," s");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichSlot);
+   if (hack->lhs)
+     { WriteString(theEnv,logicalName," L"); }
+   else if (hack->rhs)
+     { WriteString(theEnv,logicalName," R"); }
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/*************************************/
+/* PrintFactJNGetVar3: Print routine */
+/*   for the FactJNGetVar3 function. */
+/*************************************/
+void PrintFactJNGetVar3(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factGetVarJN3Call *hack;
+
+   hack = (struct factGetVarJN3Call *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(fact-jn-getvar-3 ");
+   if (hack->fromBeginning) WriteString(theEnv,logicalName,"t ");
+   else WriteString(theEnv,logicalName,"f ");
+   if (hack->fromEnd) WriteString(theEnv,logicalName,"t ");
+   else WriteString(theEnv,logicalName,"f ");
+
+   PrintUnsignedInteger(theEnv,logicalName,hack->beginOffset);
+   WriteString(theEnv,logicalName," ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->endOffset);
+   WriteString(theEnv,logicalName," ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichSlot);
+
+   WriteString(theEnv,logicalName," p");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichPattern + 1);
+
+   if (hack->lhs)
+     { WriteString(theEnv,logicalName," L"); }
+   else if (hack->rhs)
+     { WriteString(theEnv,logicalName," R"); }
+
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/*************************************/
+/* PrintFactPNGetVar1: Print routine */
+/*   for the FactPNGetvar1 function. */
+/*************************************/
+void PrintFactPNGetVar1(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factGetVarPN1Call *hack;
+
+   hack = (struct factGetVarPN1Call *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(fact-pn-getvar-1 ");
+   if (hack->factAddress) WriteString(theEnv,logicalName,"t ");
+   else WriteString(theEnv,logicalName,"f ");
+   if (hack->allFields) WriteString(theEnv,logicalName,"t F");
+   else WriteString(theEnv,logicalName,"f F");
+
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichField);
+   WriteString(theEnv,logicalName," S");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichSlot);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/*************************************/
+/* PrintFactPNGetVar2: Print routine */
+/*   for the FactPNGetvar2 function. */
+/*************************************/
+void PrintFactPNGetVar2(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factGetVarPN2Call *hack;
+
+   hack = (struct factGetVarPN2Call *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(fact-pn-getvar-2 S");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichSlot);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/*************************************/
+/* PrintFactPNGetVar3: Print routine */
+/*   for the FactPNGetvar3 function. */
+/*************************************/
+void PrintFactPNGetVar3(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factGetVarPN3Call *hack;
+
+   hack = (struct factGetVarPN3Call *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(fact-pn-getvar-3 ");
+
+   if (hack->fromBeginning) WriteString(theEnv,logicalName,"t ");
+   else WriteString(theEnv,logicalName,"f ");
+   if (hack->fromEnd) WriteString(theEnv,logicalName,"t B");
+   else WriteString(theEnv,logicalName,"f B");
+
+   PrintUnsignedInteger(theEnv,logicalName,hack->beginOffset);
+   WriteString(theEnv,logicalName," E");
+   PrintUnsignedInteger(theEnv,logicalName,hack->endOffset);
+   WriteString(theEnv,logicalName," S");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichSlot);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/***************************************/
+/* PrintFactPNConstant1: Print routine */
+/*   for the FactPNConstant1 function. */
+/***************************************/
+void PrintFactPNConstant1(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factConstantPN1Call *hack;
+
+   hack = (struct factConstantPN1Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(fact-pn-constant1 ");
+
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichSlot);
+
+   if (hack->testForEquality) WriteString(theEnv,logicalName," = ");
+   else WriteString(theEnv,logicalName," != ");
+
+   PrintAtom(theEnv,logicalName,GetFirstArgument()->type,GetFirstArgument()->value);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/***************************************/
+/* PrintFactPNConstant2: Print routine */
+/*   for the FactPNConstant2 function. */
+/***************************************/
+void PrintFactPNConstant2(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct factConstantPN2Call *hack;
+
+   hack = (struct factConstantPN2Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(fact-pn-constant2 ");
+
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichSlot);
+
+   WriteString(theEnv,logicalName," ");
+
+   PrintUnsignedInteger(theEnv,logicalName,hack->offset);
+
+   if (hack->testForEquality) WriteString(theEnv,logicalName," = ");
+   else WriteString(theEnv,logicalName," != ");
+
+   PrintAtom(theEnv,logicalName,GetFirstArgument()->type,GetFirstArgument()->value);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT */
+
+
diff --git a/clips/factprt.h b/clips/factprt.h
new file mode 100755
index 000000000..aa382c758
--- /dev/null
+++ b/clips/factprt.h
@@ -0,0 +1,60 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*         FACT RETE PRINT FUNCTIONS HEADER FILE       */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Updates to support new struct members.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factprt
+
+#pragma once
+
+#define _H_factprt
+
+   void                           PrintFactJNCompVars1(Environment *,const char *,void *);
+   void                           PrintFactJNCompVars2(Environment *,const char *,void *);
+   void                           PrintFactPNCompVars1(Environment *,const char *,void *);
+   void                           PrintFactJNGetVar1(Environment *,const char *,void *);
+   void                           PrintFactJNGetVar2(Environment *,const char *,void *);
+   void                           PrintFactJNGetVar3(Environment *,const char *,void *);
+   void                           PrintFactPNGetVar1(Environment *,const char *,void *);
+   void                           PrintFactPNGetVar2(Environment *,const char *,void *);
+   void                           PrintFactPNGetVar3(Environment *,const char *,void *);
+   void                           PrintFactSlotLength(Environment *,const char *,void *);
+   void                           PrintFactPNConstant1(Environment *,const char *,void *);
+   void                           PrintFactPNConstant2(Environment *,const char *,void *);
+
+#endif /* _H_factprt */
+
+
diff --git a/clips/factqpsr.c b/clips/factqpsr.c
new file mode 100644
index 000000000..08a71e444
--- /dev/null
+++ b/clips/factqpsr.c
@@ -0,0 +1,796 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  09/22/17             */
+   /*                                                     */
+   /*            FACT-SET QUERIES PARSER MODULE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Fact_set Queries Parsing Routines                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added fact-set queries.                        */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Fixed memory leaks when error occurred.        */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*      6.31: Error check for non-symbolic slot names.       */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if FACT_SET_QUERIES
+
+#include <string.h>
+
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "extnfunc.h"
+#include "factqury.h"
+#include "modulutl.h"
+#include "prcdrpsr.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "strngrtr.h"
+
+#include "factqpsr.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define FACT_SLOT_REF ':'
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static Expression             *ParseQueryRestrictions(Environment *,Expression *,const char *,struct token *);
+   static bool                    ReplaceTemplateNameWithReference(Environment *,Expression *);
+   static bool                    ParseQueryTestExpression(Environment *,Expression *,const char *);
+   static bool                    ParseQueryActionExpression(Environment *,Expression *,const char *,Expression *,struct token *);
+   static bool                    ReplaceFactVariables(Environment *,Expression *,Expression *,bool,int);
+   static bool                    ReplaceSlotReference(Environment *,Expression *,Expression *,
+                                                       struct functionDefinition *,int);
+   static bool                    IsQueryFunction(Expression *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************************
+  NAME         : FactParseQueryNoAction
+  DESCRIPTION  : Parses the following functions :
+                   (any-factp)
+                   (find-first-fact)
+                   (find-all-facts)
+  INPUTS       : 1) The address of the top node of the query function
+                 2) The logical name of the input
+  RETURNS      : The completed expression chain, or NULL on errors
+  SIDE EFFECTS : The expression chain is extended, or the "top" node
+                 is deleted on errors
+  NOTES        : H/L Syntax :
+
+                 (<function> <query-block>)
+
+                 <query-block>  :== (<fact-var>+) <query-expression>
+                 <fact-var> :== (<var-name> <template-name>+)
+
+                 Parses into following form :
+
+                 <query-function>
+                      |
+                      V
+                 <query-expression>  ->
+
+                 <template-1a> -> <template-1b> -> (QDS) ->
+
+                 <template-2a> -> <template-2b> -> (QDS) -> ...
+ ***********************************************************************/
+Expression *FactParseQueryNoAction(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource)
+  {
+   Expression *factQuerySetVars;
+   struct token queryInputToken;
+
+   factQuerySetVars = ParseQueryRestrictions(theEnv,top,readSource,&queryInputToken);
+   if (factQuerySetVars == NULL)
+     { return NULL; }
+
+   IncrementIndentDepth(theEnv,3);
+   PPCRAndIndent(theEnv);
+
+   if (ParseQueryTestExpression(theEnv,top,readSource) == false)
+     {
+      DecrementIndentDepth(theEnv,3);
+      ReturnExpression(theEnv,factQuerySetVars);
+      return NULL;
+     }
+
+   DecrementIndentDepth(theEnv,3);
+
+   GetToken(theEnv,readSource,&queryInputToken);
+   if (queryInputToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"fact-set query function");
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,factQuerySetVars);
+      return NULL;
+     }
+
+   if (ReplaceFactVariables(theEnv,factQuerySetVars,top->argList,true,0))
+     {
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,factQuerySetVars);
+      return NULL;
+     }
+     
+   ReturnExpression(theEnv,factQuerySetVars);
+
+   return top;
+  }
+
+/***********************************************************************
+  NAME         : FactParseQueryAction
+  DESCRIPTION  : Parses the following functions :
+                   (do-for-fact)
+                   (do-for-all-facts)
+                   (delayed-do-for-all-facts)
+  INPUTS       : 1) The address of the top node of the query function
+                 2) The logical name of the input
+  RETURNS      : The completed expression chain, or NULL on errors
+  SIDE EFFECTS : The expression chain is extended, or the "top" node
+                 is deleted on errors
+  NOTES        : H/L Syntax :
+
+                 (<function> <query-block> <query-action>)
+
+                 <query-block>  :== (<fact-var>+) <query-expression>
+                 <fact-var> :== (<var-name> <template-name>+)
+
+                 Parses into following form :
+
+                 <query-function>
+                      |
+                      V
+                 <query-expression> -> <query-action>  ->
+
+                 <template-1a> -> <template-1b> -> (QDS) ->
+
+                 <template-2a> -> <template-2b> -> (QDS) -> ...
+ ***********************************************************************/
+Expression *FactParseQueryAction(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource)
+  {
+   Expression *factQuerySetVars;
+   struct token queryInputToken;
+
+   factQuerySetVars = ParseQueryRestrictions(theEnv,top,readSource,&queryInputToken);
+   if (factQuerySetVars == NULL)
+     { return NULL; }
+
+   IncrementIndentDepth(theEnv,3);
+   PPCRAndIndent(theEnv);
+
+   if (ParseQueryTestExpression(theEnv,top,readSource) == false)
+     {
+      DecrementIndentDepth(theEnv,3);
+      ReturnExpression(theEnv,factQuerySetVars);
+      return NULL;
+     }
+
+   PPCRAndIndent(theEnv);
+
+   if (ParseQueryActionExpression(theEnv,top,readSource,factQuerySetVars,&queryInputToken) == false)
+     {
+      DecrementIndentDepth(theEnv,3);
+      ReturnExpression(theEnv,factQuerySetVars);
+      return NULL;
+     }
+
+   DecrementIndentDepth(theEnv,3);
+
+   if (queryInputToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"fact-set query function");
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,factQuerySetVars);
+      return NULL;
+     }
+
+   if (ReplaceFactVariables(theEnv,factQuerySetVars,top->argList,true,0))
+     {
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,factQuerySetVars);
+      return NULL;
+     }
+
+   if (ReplaceFactVariables(theEnv,factQuerySetVars,top->argList->nextArg,false,0))
+     {
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,factQuerySetVars);
+      return NULL;
+     }
+
+   ReturnExpression(theEnv,factQuerySetVars);
+
+   return top;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************************
+  NAME         : ParseQueryRestrictions
+  DESCRIPTION  : Parses the template restrictions for a query
+  INPUTS       : 1) The top node of the query expression
+                 2) The logical name of the input
+                 3) Caller's token buffer
+  RETURNS      : The fact-variable expressions
+  SIDE EFFECTS : Entire query expression deleted on errors
+                 Nodes allocated for restrictions and fact
+                   variable expressions
+                 Template restrictions attached to query-expression
+                   as arguments
+  NOTES        : Expects top != NULL
+ ***************************************************************/
+static Expression *ParseQueryRestrictions(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource,
+  struct token *queryInputToken)
+  {
+   Expression *factQuerySetVars = NULL,*lastFactQuerySetVars = NULL,
+              *templateExp = NULL,*lastTemplateExp,
+              *tmp,*lastOne = NULL;
+   bool error = false;
+
+   SavePPBuffer(theEnv," ");
+
+   GetToken(theEnv,readSource,queryInputToken);
+   if (queryInputToken->tknType != LEFT_PARENTHESIS_TOKEN)
+     { goto ParseQueryRestrictionsError1; }
+
+   GetToken(theEnv,readSource,queryInputToken);
+   if (queryInputToken->tknType != LEFT_PARENTHESIS_TOKEN)
+     { goto ParseQueryRestrictionsError1; }
+
+   while (queryInputToken->tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      GetToken(theEnv,readSource,queryInputToken);
+      if (queryInputToken->tknType != SF_VARIABLE_TOKEN)
+        { goto ParseQueryRestrictionsError1; }
+
+      tmp = factQuerySetVars;
+      while (tmp != NULL)
+        {
+         if (tmp->value == queryInputToken->value)
+           {
+            PrintErrorID(theEnv,"FACTQPSR",1,false);
+            WriteString(theEnv,STDERR,"Duplicate fact member variable name in function ");
+            WriteString(theEnv,STDERR,ExpressionFunctionCallName(top)->contents);
+            WriteString(theEnv,STDERR,".\n");
+            goto ParseQueryRestrictionsError2;
+           }
+
+         tmp = tmp->nextArg;
+        }
+
+      tmp = GenConstant(theEnv,SF_VARIABLE,queryInputToken->value);
+      if (factQuerySetVars == NULL)
+        { factQuerySetVars = tmp; }
+      else
+        { lastFactQuerySetVars->nextArg = tmp; }
+
+      lastFactQuerySetVars = tmp;
+      SavePPBuffer(theEnv," ");
+
+      templateExp = ArgumentParse(theEnv,readSource,&error);
+
+      if (error)
+        { goto ParseQueryRestrictionsError2; }
+
+      if (templateExp == NULL)
+        { goto ParseQueryRestrictionsError1; }
+
+      if (ReplaceTemplateNameWithReference(theEnv,templateExp) == false)
+        { goto ParseQueryRestrictionsError2; }
+
+      lastTemplateExp = templateExp;
+      SavePPBuffer(theEnv," ");
+
+      while ((tmp = ArgumentParse(theEnv,readSource,&error)) != NULL)
+        {
+         if (ReplaceTemplateNameWithReference(theEnv,tmp) == false)
+           goto ParseQueryRestrictionsError2;
+         lastTemplateExp->nextArg = tmp;
+         lastTemplateExp = tmp;
+         SavePPBuffer(theEnv," ");
+        }
+
+      if (error)
+        { goto ParseQueryRestrictionsError2; }
+
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+
+      tmp = GenConstant(theEnv,SYMBOL_TYPE,FactQueryData(theEnv)->QUERY_DELIMITER_SYMBOL);
+
+      lastTemplateExp->nextArg = tmp;
+      lastTemplateExp = tmp;
+
+      if (top->argList == NULL)
+        { top->argList = templateExp; }
+      else
+        { lastOne->nextArg = templateExp; }
+
+      lastOne = lastTemplateExp;
+      templateExp = NULL;
+      SavePPBuffer(theEnv," ");
+      GetToken(theEnv,readSource,queryInputToken);
+     }
+
+   if (queryInputToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     { goto ParseQueryRestrictionsError1; }
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+   return(factQuerySetVars);
+
+ParseQueryRestrictionsError1:
+   SyntaxErrorMessage(theEnv,"fact-set query function");
+
+ParseQueryRestrictionsError2:
+   ReturnExpression(theEnv,templateExp);
+   ReturnExpression(theEnv,top);
+   ReturnExpression(theEnv,factQuerySetVars);
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : ReplaceTemplateNameWithReference
+  DESCRIPTION  : In parsing an fact-set query,
+                 this function replaces a constant
+                 template name with an actual pointer
+                 to the template
+  INPUTS       : The expression
+  RETURNS      : True if all OK, otherwise false
+                 if template cannot be found
+  SIDE EFFECTS : The expression type and value are
+                 modified if template is found
+  NOTES        : Searches current and imported
+                 modules for reference
+ ***************************************************/
+static bool ReplaceTemplateNameWithReference(
+  Environment *theEnv,
+  Expression *theExp)
+  {
+   const char *theTemplateName;
+   void *theDeftemplate;
+   unsigned int count;
+
+   if (theExp->type == SYMBOL_TYPE)
+     {
+      theTemplateName = theExp->lexemeValue->contents;
+
+      theDeftemplate = (Deftemplate *)
+                       FindImportedConstruct(theEnv,"deftemplate",NULL,theTemplateName,
+                                             &count,true,NULL);
+
+      if (theDeftemplate == NULL)
+        {
+         CantFindItemErrorMessage(theEnv,"deftemplate",theTemplateName,true);
+         return false;
+        }
+
+      if (count > 1)
+        {
+         AmbiguousReferenceErrorMessage(theEnv,"deftemplate",theTemplateName);
+         return false;
+        }
+
+      theExp->type = DEFTEMPLATE_PTR;
+      theExp->value = theDeftemplate;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      if (! ConstructData(theEnv)->ParsingConstruct)
+        { ConstructData(theEnv)->DanglingConstructs++; }
+#endif
+     }
+
+   return true;
+  }
+
+/*************************************************************
+  NAME         : ParseQueryTestExpression
+  DESCRIPTION  : Parses the test-expression for a query
+  INPUTS       : 1) The top node of the query expression
+                 2) The logical name of the input
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Entire query-expression deleted on errors
+                 Nodes allocated for new expression
+                 Test shoved in front of class-restrictions on
+                    query argument list
+  NOTES        : Expects top != NULL
+ *************************************************************/
+static bool ParseQueryTestExpression(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource)
+  {
+   Expression *qtest;
+   bool error;
+   struct BindInfo *oldBindList;
+
+   error = false;
+   oldBindList = GetParsedBindNames(theEnv);
+   SetParsedBindNames(theEnv,NULL);
+
+   qtest = ArgumentParse(theEnv,readSource,&error);
+
+   if (error == true)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      ReturnExpression(theEnv,top);
+      return false;
+     }
+
+   if (qtest == NULL)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      SyntaxErrorMessage(theEnv,"fact-set query function");
+      ReturnExpression(theEnv,top);
+      return false;
+     }
+
+   qtest->nextArg = top->argList;
+   top->argList = qtest;
+
+   if (ParsedBindNamesEmpty(theEnv) == false)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      PrintErrorID(theEnv,"FACTQPSR",2,false);
+      WriteString(theEnv,STDERR,"Binds are not allowed in fact-set query in function ");
+      WriteString(theEnv,STDERR,ExpressionFunctionCallName(top)->contents);
+      WriteString(theEnv,STDERR,".\n");
+      ReturnExpression(theEnv,top);
+      return false;
+     }
+
+   SetParsedBindNames(theEnv,oldBindList);
+
+   return true;
+  }
+
+/*************************************************************
+  NAME         : ParseQueryActionExpression
+  DESCRIPTION  : Parses the action-expression for a query
+  INPUTS       : 1) The top node of the query expression
+                 2) The logical name of the input
+                 3) List of query parameters
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Entire query-expression deleted on errors
+                 Nodes allocated for new expression
+                 Action shoved in front of template-restrictions
+                    and in back of test-expression on query
+                    argument list
+  NOTES        : Expects top != NULL && top->argList != NULL
+ *************************************************************/
+static bool ParseQueryActionExpression(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource,
+  Expression *factQuerySetVars,
+  struct token *queryInputToken)
+  {
+   Expression *qaction,*tmpFactSetVars;
+   struct BindInfo *oldBindList,*newBindList,*prev;
+
+   oldBindList = GetParsedBindNames(theEnv);
+   SetParsedBindNames(theEnv,NULL);
+
+   ExpressionData(theEnv)->BreakContext = true;
+   ExpressionData(theEnv)->ReturnContext = ExpressionData(theEnv)->svContexts->rtn;
+
+   qaction = GroupActions(theEnv,readSource,queryInputToken,true,NULL,false);
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,queryInputToken->printForm);
+
+   ExpressionData(theEnv)->BreakContext = false;
+
+   if (qaction == NULL)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      SyntaxErrorMessage(theEnv,"fact-set query function");
+      ReturnExpression(theEnv,top);
+      return false;
+     }
+
+   qaction->nextArg = top->argList->nextArg;
+   top->argList->nextArg = qaction;
+
+   newBindList = GetParsedBindNames(theEnv);
+   prev = NULL;
+   while (newBindList != NULL)
+     {
+      tmpFactSetVars = factQuerySetVars;
+      while (tmpFactSetVars != NULL)
+        {
+         if (tmpFactSetVars->value == (void *) newBindList->name)
+           {
+            ClearParsedBindNames(theEnv);
+            SetParsedBindNames(theEnv,oldBindList);
+            PrintErrorID(theEnv,"FACTQPSR",3,false);
+            WriteString(theEnv,STDERR,"Cannot rebind fact-set member variable ");
+            WriteString(theEnv,STDERR,tmpFactSetVars->lexemeValue->contents);
+            WriteString(theEnv,STDERR," in function ");
+            WriteString(theEnv,STDERR,ExpressionFunctionCallName(top)->contents);
+            WriteString(theEnv,STDERR,".\n");
+            ReturnExpression(theEnv,top);
+            return false;
+           }
+         tmpFactSetVars = tmpFactSetVars->nextArg;
+        }
+      prev = newBindList;
+      newBindList = newBindList->next;
+     }
+
+   if (prev == NULL)
+     { SetParsedBindNames(theEnv,oldBindList); }
+   else
+     { prev->next = oldBindList; }
+
+   return true;
+  }
+
+/***********************************************************************************
+  NAME         : ReplaceFactVariables
+  DESCRIPTION  : Replaces all references to fact-variables within an
+                   fact query-function with function calls to query-fact
+                   (which references the fact array at run-time)
+  INPUTS       : 1) The fact-variable list
+                 2) A boolean expression containing variable references
+                 3) A flag indicating whether to allow slot references of the type
+                    <fact-query-variable>:<slot-name> for direct slot access
+                    or not
+                 4) Nesting depth of query functions
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : If a SF_VARIABLE node is found and is on the list of fact
+                   variables, it is replaced with a query-fact function call.
+  NOTES        : Other SF_VARIABLE(S) are left alone for replacement by other
+                   parsers.  This implies that a user may use defgeneric,
+                   defrule, and defmessage-handler variables within a query-function
+                   where they do not conflict with fact-variable names.
+ ***********************************************************************************/
+static bool ReplaceFactVariables(
+  Environment *theEnv,
+  Expression *vlist,
+  Expression *bexp,
+  bool sdirect,
+  int ndepth)
+  {
+   Expression *eptr;
+   struct functionDefinition *rindx_func, *rslot_func;
+   int posn;
+
+   rindx_func = FindFunction(theEnv,"(query-fact)");
+   rslot_func = FindFunction(theEnv,"(query-fact-slot)");
+   while (bexp != NULL)
+     {
+      if (bexp->type == SF_VARIABLE)
+        {
+         eptr = vlist;
+         posn = 0;
+         while ((eptr != NULL) ? (eptr->value != bexp->value) : false)
+           {
+            eptr = eptr->nextArg;
+            posn++;
+           }
+         if (eptr != NULL)
+           {
+            bexp->type = FCALL;
+            bexp->value = rindx_func;
+            eptr = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,ndepth));
+            eptr->nextArg = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,posn));
+            bexp->argList = eptr;
+           }
+         else if (sdirect == true)
+           {
+            if (ReplaceSlotReference(theEnv,vlist,bexp,rslot_func,ndepth))
+              { return true; }
+           }
+        }
+      if (bexp->argList != NULL)
+        {
+         if (IsQueryFunction(bexp))
+           {
+            if (ReplaceFactVariables(theEnv,vlist,bexp->argList,sdirect,ndepth+1))
+              { return true; }
+           }
+         else
+           {
+            if (ReplaceFactVariables(theEnv,vlist,bexp->argList,sdirect,ndepth))
+              { return true; }
+           }
+        }
+      bexp = bexp->nextArg;
+     }
+     
+   return false;
+  }
+
+/*************************************************************************
+  NAME         : ReplaceSlotReference
+  DESCRIPTION  : Replaces fact-set query function variable
+                   references of the form: <fact-variable>:<slot-name>
+                   with function calls to get these fact-slots at run
+                   time
+  INPUTS       : 1) The fact-set variable list
+                 2) The expression containing the variable
+                 3) The address of the fact slot access function
+                 4) Nesting depth of query functions
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : If the variable is a slot reference, then it is replaced
+                   with the appropriate function-call.
+  NOTES        : None
+ *************************************************************************/
+static bool ReplaceSlotReference(
+  Environment *theEnv,
+  Expression *vlist,
+  Expression *theExp,
+  struct functionDefinition *func,
+  int ndepth)
+  {
+   size_t len;
+   int posn;
+   bool oldpp;
+   size_t i;
+   const char *str;
+   Expression *eptr;
+   struct token itkn;
+
+   str = theExp->lexemeValue->contents;
+   len =  strlen(str);
+   if (len < 3)
+     { return false; }
+     
+   for (i = len-2 ; i >= 1 ; i--)
+     {
+      if ((str[i] == FACT_SLOT_REF) ? (i >= 1) : false)
+        {
+         eptr = vlist;
+         posn = 0;
+         while (eptr && ((i != strlen(eptr->lexemeValue->contents)) ||
+                         strncmp(eptr->lexemeValue->contents,str,
+                                 (STD_SIZE) i)))
+           {
+            eptr = eptr->nextArg;
+            posn++;
+           }
+         if (eptr != NULL)
+           {
+            OpenStringSource(theEnv,"query-var",str+i+1,0);
+            oldpp = GetPPBufferStatus(theEnv);
+            SetPPBufferStatus(theEnv,false);
+            GetToken(theEnv,"query-var",&itkn);
+            SetPPBufferStatus(theEnv,oldpp);
+            CloseStringSource(theEnv,"query-var");
+            
+            if (itkn.tknType != SYMBOL_TOKEN)
+              {
+               InvalidVarSlotErrorMessage(theEnv,str);
+               SetEvaluationError(theEnv,true);
+               return true;
+              }
+              
+            theExp->type = FCALL;
+            theExp->value = func;
+            theExp->argList = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,ndepth));
+            theExp->argList->nextArg = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,posn));
+            theExp->argList->nextArg->nextArg = GenConstant(theEnv,TokenTypeToType(itkn.tknType),itkn.value);
+            theExp->argList->nextArg->nextArg->nextArg = GenConstant(theEnv,SYMBOL_TYPE,CreateSymbol(theEnv,str));
+            return false;
+           }
+        }
+     }
+     
+   return false;
+  }
+
+/********************************************************************
+  NAME         : IsQueryFunction
+  DESCRIPTION  : Determines if an expression is a query function call
+  INPUTS       : The expression
+  RETURNS      : True if query function call, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************************/
+static bool IsQueryFunction(
+  Expression *theExp)
+  {
+   int (*fptr)(void);
+
+   if (theExp->type != FCALL)
+     return false;
+   fptr = (int (*)(void)) ExpressionFunctionPointer(theExp);
+
+   if (fptr == (int (*)(void)) AnyFacts)
+     return true;
+   if (fptr == (int (*)(void)) QueryFindFact)
+     return true;
+   if (fptr == (int (*)(void)) QueryFindAllFacts)
+     return true;
+   if (fptr == (int (*)(void)) QueryDoForFact)
+     return true;
+   if (fptr == (int (*)(void)) QueryDoForAllFacts)
+     return true;
+   if (fptr == (int (*)(void)) DelayedQueryDoForAllFacts)
+     return true;
+
+   return false;
+  }
+
+#endif
diff --git a/clips/factqpsr.h b/clips/factqpsr.h
new file mode 100644
index 000000000..3dfaf9fa5
--- /dev/null
+++ b/clips/factqpsr.h
@@ -0,0 +1,61 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added fact-set queries.                        */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Fixed memory leaks when error occurred.        */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factqpsr
+
+#pragma once
+
+#define _H_factqpsr
+
+#if FACT_SET_QUERIES
+
+#include "expressn.h"
+
+   Expression                    *FactParseQueryNoAction(Environment *,Expression *,const char *);
+   Expression                    *FactParseQueryAction(Environment *,Expression *,const char *);
+
+#endif /* FACT_SET_QUERIES */
+
+#endif /* _H_factqpsr */
diff --git a/clips/factqury.c b/clips/factqury.c
new file mode 100644
index 000000000..e3e099bdb
--- /dev/null
+++ b/clips/factqury.c
@@ -0,0 +1,1261 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  09/28/17             */
+   /*                                                     */
+   /*                  FACT QUERY MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Query Functions for Objects                      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added fact-set queries.                        */
+/*                                                           */
+/*      6.24: Corrected errors when compiling as a C++ file. */
+/*            DR0868                                         */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Fixes for run-time use of query functions.     */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Retrieval for fact query slot function         */
+/*            generates an error if the fact has been        */
+/*            retracted.                                     */
+/*                                                           */
+/*            Functions delayed-do-for-all-facts and         */
+/*            do-for-fact increment the busy count of        */
+/*            matching fact sets so that actions can         */
+/*            detect retracted facts.                        */
+/*                                                           */
+/*            Matching fact sets containing retracted facts  */
+/*            are pruned.                                    */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if FACT_SET_QUERIES
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "exprnpsr.h"
+#include "modulutl.h"
+#include "tmpltutl.h"
+#include "insfun.h"
+#include "factqpsr.h"
+#include "prcdrfun.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+
+#include "factqury.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    PushQueryCore(Environment *);
+   static void                    PopQueryCore(Environment *);
+   static QUERY_CORE             *FindQueryCore(Environment *,long long);
+   static QUERY_TEMPLATE         *DetermineQueryTemplates(Environment *,Expression *,const char *,unsigned *);
+   static QUERY_TEMPLATE         *FormChain(Environment *,const char *,Deftemplate *,UDFValue *);
+   static void                    DeleteQueryTemplates(Environment *,QUERY_TEMPLATE *);
+   static bool                    TestForFirstInChain(Environment *,QUERY_TEMPLATE *,unsigned);
+   static bool                    TestForFirstFactInTemplate(Environment *,Deftemplate *,QUERY_TEMPLATE *,unsigned);
+   static void                    TestEntireChain(Environment *,QUERY_TEMPLATE *,unsigned);
+   static void                    TestEntireTemplate(Environment *,Deftemplate *,QUERY_TEMPLATE *,unsigned);
+   static void                    AddSolution(Environment *);
+   static void                    PopQuerySoln(Environment *);
+
+/****************************************************
+  NAME         : SetupFactQuery
+  DESCRIPTION  : Initializes fact query H/L
+                   functions and parsers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Sets up kernel functions and parsers
+  NOTES        : None
+ ****************************************************/
+void SetupFactQuery(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,FACT_QUERY_DATA,sizeof(struct factQueryData),NULL);
+
+#if RUN_TIME
+   FactQueryData(theEnv)->QUERY_DELIMITER_SYMBOL = FindSymbolHN(theEnv,QUERY_DELIMITER_STRING,SYMBOL_BIT);
+#endif
+
+#if ! RUN_TIME
+   FactQueryData(theEnv)->QUERY_DELIMITER_SYMBOL = CreateSymbol(theEnv,QUERY_DELIMITER_STRING);
+   IncrementLexemeCount(FactQueryData(theEnv)->QUERY_DELIMITER_SYMBOL);
+
+   AddUDF(theEnv,"(query-fact)","f",0,UNBOUNDED,NULL,GetQueryFact,"GetQueryFact",NULL);
+
+   AddUDF(theEnv,"(query-fact-slot)","*",0,UNBOUNDED,NULL,GetQueryFactSlot,"GetQueryFactSlot",NULL);
+
+   AddUDF(theEnv,"any-factp","b",0,UNBOUNDED,NULL,AnyFacts,"AnyFacts",NULL);
+
+   AddUDF(theEnv,"find-fact","m",0,UNBOUNDED,NULL,QueryFindFact,"QueryFindFact",NULL);
+
+   AddUDF(theEnv,"find-all-facts","m",0,UNBOUNDED,NULL,QueryFindAllFacts,"QueryFindAllFacts",NULL);
+
+   AddUDF(theEnv,"do-for-fact","*",0,UNBOUNDED,NULL,QueryDoForFact,"QueryDoForFact",NULL);
+
+   AddUDF(theEnv,"do-for-all-facts","*",0,UNBOUNDED,NULL,QueryDoForAllFacts,"QueryDoForAllFacts",NULL);
+
+   AddUDF(theEnv,"delayed-do-for-all-facts","*",0,UNBOUNDED,NULL,DelayedQueryDoForAllFacts,"DelayedQueryDoForAllFacts",NULL);
+#endif
+
+   AddFunctionParser(theEnv,"any-factp",FactParseQueryNoAction);
+   AddFunctionParser(theEnv,"find-fact",FactParseQueryNoAction);
+   AddFunctionParser(theEnv,"find-all-facts",FactParseQueryNoAction);
+   AddFunctionParser(theEnv,"do-for-fact",FactParseQueryAction);
+   AddFunctionParser(theEnv,"do-for-all-facts",FactParseQueryAction);
+   AddFunctionParser(theEnv,"delayed-do-for-all-facts",FactParseQueryAction);
+  }
+
+/*************************************************************
+  NAME         : GetQueryFact
+  DESCRIPTION  : Internal function for referring to fact
+                    array on fact-queries
+  INPUTS       : None
+  RETURNS      : The name of the specified fact-set member
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : ((query-fact) <index>)
+ *************************************************************/
+void GetQueryFact(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_CORE *core;
+
+   core = FindQueryCore(theEnv,GetFirstArgument()->integerValue->contents);
+
+   returnValue->factValue = core->solns[GetFirstArgument()->nextArg->integerValue->contents];
+  }
+
+/***************************************************************************
+  NAME         : GetQueryFactSlot
+  DESCRIPTION  : Internal function for referring to slots of fact in
+                    fact array on fact-queries
+  INPUTS       : The caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Caller's result buffer set appropriately
+  NOTES        : H/L Syntax : ((query-fact-slot) <index> <slot-name>)
+ **************************************************************************/
+void GetQueryFactSlot(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Fact *theFact;
+   UDFValue temp;
+   QUERY_CORE *core;
+   unsigned short position;
+   const char *varSlot;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   core = FindQueryCore(theEnv,GetFirstArgument()->integerValue->contents);
+   theFact = core->solns[GetFirstArgument()->nextArg->integerValue->contents];
+   varSlot = GetFirstArgument()->nextArg->nextArg->nextArg->lexemeValue->contents;
+   
+   /*=========================================*/
+   /* Accessing the slot value of a retracted */
+   /* fact generates an error.                */
+   /*=========================================*/
+
+   if (theFact->garbage)
+     {
+      FactVarSlotErrorMessage1(theEnv,theFact,varSlot);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   
+   /*=========================*/
+   /* Retrieve the slot name. */
+   /*=========================*/
+   
+   EvaluateExpression(theEnv,GetFirstArgument()->nextArg->nextArg,&temp);
+   if (temp.header->type != SYMBOL_TYPE)
+     {
+      InvalidVarSlotErrorMessage(theEnv,varSlot);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+   /*==================================================*/
+   /* Make sure the slot exists (the symbol implied is */
+   /* used for the implied slot of an ordered fact).   */
+   /*==================================================*/
+
+   if (theFact->whichDeftemplate->implied)
+     {
+      if (strcmp(temp.lexemeValue->contents,"implied") != 0)
+        {
+         FactVarSlotErrorMessage2(theEnv,theFact,varSlot);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+      position = 0;
+     }
+
+   else if (FindSlot(theFact->whichDeftemplate,
+                     (CLIPSLexeme *) temp.value,&position) == NULL)
+     {
+      FactVarSlotErrorMessage2(theEnv,theFact,varSlot);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+   returnValue->value = theFact->theProposition.contents[position].value;
+   if (returnValue->header->type == MULTIFIELD_TYPE)
+     {
+      returnValue->begin = 0;
+      returnValue->range = returnValue->multifieldValue->length;
+     }
+  }
+
+/* =============================================================================
+   =============================================================================
+   Following are the instance query functions :
+
+     any-factp         : Determines if any facts satisfy the query
+     find-fact         : Finds first (set of) fact(s) which satisfies
+                               the query and stores it in a multi-field
+     find-all-facts    : Finds all (sets of) facts which satisfy the
+                               the query and stores them in a multi-field
+     do-for-fact       : Executes a given action for the first (set of)
+                               fact(s) which satisfy the query
+     do-for-all-facts  : Executes an action for all facts which satisfy
+                               the query as they are found
+     delayed-do-for-all-facts : Same as above - except that the list of facts
+                               which satisfy the query is formed before any
+                               actions are executed
+
+     Fact candidate search algorithm :
+
+     All permutations of first restriction template facts with other
+       restriction template facts (Rightmost are varied first)
+
+     For any one template, fact are examined in the order they were defined
+
+     Example :
+     (deftemplate a (slot v))
+     (deftemplate b (slot v))
+     (deftemplate c (slot v))
+     (assert (a (v a1)))
+     (assert (a (v a2)))
+     (assert (b (v b1)))
+     (assert (b (v b2)))
+     (assert (c (v c1)))
+     (assert (c (v c2)))
+     (assert (d (v d1)))
+     (assert (d (v d2)))
+
+     (any-factp ((?a a b) (?b c)) <query>)
+
+     The permutations (?a ?b) would be examined in the following order :
+
+     (a1 c1),(a1 c2),(a2 c1),(a2 c2),
+     (b1 c1),(b1 c2),(b2 c1),(b2 c2)
+
+   =============================================================================
+   ============================================================================= */
+
+/******************************************************************************
+  NAME         : AnyFacts
+  DESCRIPTION  : Determines if there any existing facts which satisfy
+                   the query
+  INPUTS       : None
+  RETURNS      : True if the query is satisfied, false otherwise
+  SIDE EFFECTS : The query template-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   zero or more times (depending on fact restrictions
+                   and how early the expression evaluates to true - if at all).
+  NOTES        : H/L Syntax : See FactParseQueryNoAction()
+ ******************************************************************************/
+void AnyFacts(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_TEMPLATE *qtemplates;
+   unsigned rcnt;
+   bool testResult;
+
+   qtemplates = DetermineQueryTemplates(theEnv,GetFirstArgument()->nextArg,
+                                      "any-factp",&rcnt);
+   if (qtemplates == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   PushQueryCore(theEnv);
+   FactQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   FactQueryData(theEnv)->QueryCore->solns = (Fact **) gm2(theEnv,(sizeof(Fact *) * rcnt));
+   FactQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   testResult = TestForFirstInChain(theEnv,qtemplates,0);
+   FactQueryData(theEnv)->AbortQuery = false;
+   rm(theEnv,FactQueryData(theEnv)->QueryCore->solns,(sizeof(Fact *) * rcnt));
+   rtn_struct(theEnv,query_core,FactQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryTemplates(theEnv,qtemplates);
+   returnValue->lexemeValue = CreateBoolean(theEnv,testResult);
+  }
+
+/******************************************************************************
+  NAME         : QueryFindFact
+  DESCRIPTION  : Finds the first set of facts which satisfy the query and
+                   stores their addresses in the user's multi-field variable
+  INPUTS       : Caller's result buffer
+  RETURNS      : True if the query is satisfied, false otherwise
+  SIDE EFFECTS : The query template-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   zero or more times (depending on fact restrictions
+                   and how early the expression evaulates to true - if at all).
+  NOTES        : H/L Syntax : See ParseQueryNoAction()
+ ******************************************************************************/
+void QueryFindFact(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_TEMPLATE *qtemplates;
+   unsigned rcnt,i;
+
+   returnValue->begin = 0;
+   returnValue->range = 0;
+   qtemplates = DetermineQueryTemplates(theEnv,GetFirstArgument()->nextArg,
+                                      "find-fact",&rcnt);
+   if (qtemplates == NULL)
+     {
+      returnValue->value = CreateMultifield(theEnv,0L);
+      return;
+     }
+   PushQueryCore(theEnv);
+   FactQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   FactQueryData(theEnv)->QueryCore->solns = (Fact **)
+                      gm2(theEnv,(sizeof(Fact *) * rcnt));
+   FactQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   if (TestForFirstInChain(theEnv,qtemplates,0) == true)
+     {
+      returnValue->value = CreateMultifield(theEnv,rcnt);
+      returnValue->range = rcnt;
+      for (i = 0 ; i < rcnt ; i++)
+        {
+         returnValue->multifieldValue->contents[i].value = FactQueryData(theEnv)->QueryCore->solns[i];
+        }
+     }
+   else
+      returnValue->value = CreateMultifield(theEnv,0L);
+   FactQueryData(theEnv)->AbortQuery = false;
+   rm(theEnv,FactQueryData(theEnv)->QueryCore->solns,(sizeof(Fact *) * rcnt));
+   rtn_struct(theEnv,query_core,FactQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryTemplates(theEnv,qtemplates);
+  }
+
+/******************************************************************************
+  NAME         : QueryFindAllFacts
+  DESCRIPTION  : Finds all sets of facts which satisfy the query and
+                   stores their names in the user's multi-field variable
+
+                 The sets are stored sequentially :
+
+                   Number of sets = (Multi-field length) / (Set length)
+
+                 The first set is if the first (set length) atoms of the
+                   multi-field variable, and so on.
+  INPUTS       : Caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The query template-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   once for every fact set.
+  NOTES        : H/L Syntax : See ParseQueryNoAction()
+ ******************************************************************************/
+void QueryFindAllFacts(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_TEMPLATE *qtemplates;
+   unsigned rcnt;
+   size_t i, j;
+
+   returnValue->begin = 0;
+   returnValue->range = 0;
+   qtemplates = DetermineQueryTemplates(theEnv,GetFirstArgument()->nextArg,
+                                      "find-all-facts",&rcnt);
+   if (qtemplates == NULL)
+     {
+      returnValue->value = CreateMultifield(theEnv,0L);
+      return;
+     }
+   PushQueryCore(theEnv);
+   FactQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   FactQueryData(theEnv)->QueryCore->solns = (Fact **) gm2(theEnv,(sizeof(Fact *) * rcnt));
+   FactQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   FactQueryData(theEnv)->QueryCore->action = NULL;
+   FactQueryData(theEnv)->QueryCore->soln_set = NULL;
+   FactQueryData(theEnv)->QueryCore->soln_size = rcnt;
+   FactQueryData(theEnv)->QueryCore->soln_cnt = 0;
+   TestEntireChain(theEnv,qtemplates,0);
+   FactQueryData(theEnv)->AbortQuery = false;
+   returnValue->value = CreateMultifield(theEnv,FactQueryData(theEnv)->QueryCore->soln_cnt * rcnt);
+   while (FactQueryData(theEnv)->QueryCore->soln_set != NULL)
+     {
+      for (i = 0 , j = returnValue->range ; i < rcnt ; i++ , j++)
+        {
+         returnValue->multifieldValue->contents[j].value = FactQueryData(theEnv)->QueryCore->soln_set->soln[i];
+        }
+      returnValue->range = j;
+      PopQuerySoln(theEnv);
+     }
+   rm(theEnv,FactQueryData(theEnv)->QueryCore->solns,(sizeof(Fact *) * rcnt));
+   rtn_struct(theEnv,query_core,FactQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryTemplates(theEnv,qtemplates);
+  }
+
+/******************************************************************************
+  NAME         : QueryDoForFact
+  DESCRIPTION  : Finds the first set of facts which satisfy the query and
+                   executes a user-action with that set
+  INPUTS       : None
+  RETURNS      : Caller's result buffer
+  SIDE EFFECTS : The query template-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   zero or more times (depending on fact restrictions
+                   and how early the expression evaulates to true - if at all).
+                   Also the action expression is executed zero or once.
+                 Caller's result buffer holds result of user-action
+  NOTES        : H/L Syntax : See ParseQueryAction()
+ ******************************************************************************/
+void QueryDoForFact(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_TEMPLATE *qtemplates;
+   unsigned i, rcnt;
+
+   returnValue->value = FalseSymbol(theEnv);
+   qtemplates = DetermineQueryTemplates(theEnv,GetFirstArgument()->nextArg->nextArg,
+                                      "do-for-fact",&rcnt);
+   if (qtemplates == NULL)
+     return;
+   PushQueryCore(theEnv);
+   FactQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   FactQueryData(theEnv)->QueryCore->solns = (Fact **) gm2(theEnv,(sizeof(Fact *) * rcnt));
+   FactQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   FactQueryData(theEnv)->QueryCore->action = GetFirstArgument()->nextArg;
+   
+   if (TestForFirstInChain(theEnv,qtemplates,0) == true)
+     {
+      for (i = 0; i < rcnt; i++)
+        { FactQueryData(theEnv)->QueryCore->solns[i]->patternHeader.busyCount++; }
+      
+      EvaluateExpression(theEnv,FactQueryData(theEnv)->QueryCore->action,returnValue);
+
+      for (i = 0; i < rcnt; i++)
+        { FactQueryData(theEnv)->QueryCore->solns[i]->patternHeader.busyCount--; }
+     }
+     
+   FactQueryData(theEnv)->AbortQuery = false;
+   ProcedureFunctionData(theEnv)->BreakFlag = false;
+   rm(theEnv,FactQueryData(theEnv)->QueryCore->solns,(sizeof(Fact *) * rcnt));
+   rtn_struct(theEnv,query_core,FactQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryTemplates(theEnv,qtemplates);
+  }
+
+/******************************************************************************
+  NAME         : QueryDoForAllFacts
+  DESCRIPTION  : Finds all sets of facts which satisfy the query and
+                   executes a user-function for each set as it is found
+  INPUTS       : Caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The query template-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   once for every fact set.  Also, the action is
+                   executed for every fact set.
+                 Caller's result buffer holds result of last action executed.
+  NOTES        : H/L Syntax : See FactParseQueryAction()
+ ******************************************************************************/
+void QueryDoForAllFacts(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_TEMPLATE *qtemplates;
+   unsigned rcnt;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   qtemplates = DetermineQueryTemplates(theEnv,GetFirstArgument()->nextArg->nextArg,
+                                      "do-for-all-facts",&rcnt);
+   if (qtemplates == NULL)
+     return;
+
+   PushQueryCore(theEnv);
+   FactQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   FactQueryData(theEnv)->QueryCore->solns = (Fact **) gm2(theEnv,(sizeof(Fact *) * rcnt));
+   FactQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   FactQueryData(theEnv)->QueryCore->action = GetFirstArgument()->nextArg;
+   FactQueryData(theEnv)->QueryCore->result = returnValue;
+   RetainUDFV(theEnv,FactQueryData(theEnv)->QueryCore->result);
+   TestEntireChain(theEnv,qtemplates,0);
+   ReleaseUDFV(theEnv,FactQueryData(theEnv)->QueryCore->result);
+
+   FactQueryData(theEnv)->AbortQuery = false;
+   ProcedureFunctionData(theEnv)->BreakFlag = false;
+   rm(theEnv,FactQueryData(theEnv)->QueryCore->solns,(sizeof(Fact *) * rcnt));
+   rtn_struct(theEnv,query_core,FactQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryTemplates(theEnv,qtemplates);
+  }
+
+/******************************************************************************
+  NAME         : DelayedQueryDoForAllFacts
+  DESCRIPTION  : Finds all sets of facts which satisfy the query and
+                   and exceutes a user-action for each set
+
+                 This function differs from QueryDoForAllFacts() in
+                   that it forms the complete list of query satisfactions
+                   BEFORE executing any actions.
+  INPUTS       : Caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The query template-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   once for every fact set.  The action is executed
+                   for evry query satisfaction.
+                 Caller's result buffer holds result of last action executed.
+  NOTES        : H/L Syntax : See FactParseQueryNoAction()
+ ******************************************************************************/
+void DelayedQueryDoForAllFacts(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_TEMPLATE *qtemplates;
+   unsigned rcnt;
+   unsigned i;
+   GCBlock gcb;
+   QUERY_SOLN *theSet;
+
+   returnValue->value = FalseSymbol(theEnv);
+   qtemplates = DetermineQueryTemplates(theEnv,GetFirstArgument()->nextArg->nextArg,
+                                      "delayed-do-for-all-facts",&rcnt);
+   if (qtemplates == NULL)
+     return;
+
+   PushQueryCore(theEnv);
+   FactQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   FactQueryData(theEnv)->QueryCore->solns = (Fact **) gm2(theEnv,(sizeof(Fact *) * rcnt));
+   FactQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   FactQueryData(theEnv)->QueryCore->action = NULL;
+   FactQueryData(theEnv)->QueryCore->soln_set = NULL;
+   FactQueryData(theEnv)->QueryCore->soln_size = rcnt;
+   FactQueryData(theEnv)->QueryCore->soln_cnt = 0;
+   TestEntireChain(theEnv,qtemplates,0);
+   FactQueryData(theEnv)->AbortQuery = false;
+   FactQueryData(theEnv)->QueryCore->action = GetFirstArgument()->nextArg;
+
+   /*==============================================================*/
+   /* Increment the busy count for all facts in the solution sets. */
+   /*==============================================================*/
+   
+   GCBlockStart(theEnv,&gcb);
+
+   for (theSet = FactQueryData(theEnv)->QueryCore->soln_set;
+        theSet != NULL;
+        theSet = theSet->nxt)
+     {
+      for (i = 0; i < rcnt; i++)
+        { theSet->soln[i]->patternHeader.busyCount++; }
+     }
+
+   /*=====================*/
+   /* Perform the action. */
+   /*=====================*/
+
+   for (theSet = FactQueryData(theEnv)->QueryCore->soln_set;
+        theSet != NULL; )
+     {
+      for (i = 0 ; i < rcnt ; i++)
+        {
+         if (theSet->soln[i]->garbage)
+           { goto nextSet; }
+         FactQueryData(theEnv)->QueryCore->solns[i] = theSet->soln[i];
+        }
+        
+      EvaluateExpression(theEnv,FactQueryData(theEnv)->QueryCore->action,returnValue);
+
+      if (EvaluationData(theEnv)->HaltExecution || ProcedureFunctionData(theEnv)->BreakFlag || ProcedureFunctionData(theEnv)->ReturnFlag)
+        { break; }
+
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+      
+      nextSet: theSet = theSet->nxt;
+     }
+
+   /*==============================================================*/
+   /* Decrement the busy count for all facts in the solution sets. */
+   /*==============================================================*/
+   
+   for (theSet = FactQueryData(theEnv)->QueryCore->soln_set;
+        theSet != NULL;
+        theSet = theSet->nxt)
+     {
+      for (i = 0; i < rcnt; i++)
+        { theSet->soln[i]->patternHeader.busyCount--; }
+     }
+
+   GCBlockEndUDF(theEnv,&gcb,returnValue);
+   CallPeriodicTasks(theEnv);
+
+   /*==================================*/
+   /* Deallocate the query structures. */
+   /*==================================*/
+   
+   while (FactQueryData(theEnv)->QueryCore->soln_set != NULL)
+     { PopQuerySoln(theEnv); }
+
+   ProcedureFunctionData(theEnv)->BreakFlag = false;
+   rm(theEnv,FactQueryData(theEnv)->QueryCore->solns,(sizeof(Fact *) * rcnt));
+   rtn_struct(theEnv,query_core,FactQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryTemplates(theEnv,qtemplates);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*******************************************************
+  NAME         : PushQueryCore
+  DESCRIPTION  : Pushes the current QueryCore onto stack
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Allocates new stack node and changes
+                   QueryCoreStack
+  NOTES        : None
+ *******************************************************/
+static void PushQueryCore(
+  Environment *theEnv)
+  {
+   QUERY_STACK *qptr;
+
+   qptr = get_struct(theEnv,query_stack);
+   qptr->core = FactQueryData(theEnv)->QueryCore;
+   qptr->nxt = FactQueryData(theEnv)->QueryCoreStack;
+   FactQueryData(theEnv)->QueryCoreStack = qptr;
+  }
+
+/******************************************************
+  NAME         : PopQueryCore
+  DESCRIPTION  : Pops top of QueryCore stack and
+                   restores QueryCore to this core
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Stack node deallocated, QueryCoreStack
+                   changed and QueryCore reset
+  NOTES        : Assumes stack is not empty
+ ******************************************************/
+static void PopQueryCore(
+  Environment *theEnv)
+  {
+   QUERY_STACK *qptr;
+
+   FactQueryData(theEnv)->QueryCore = FactQueryData(theEnv)->QueryCoreStack->core;
+   qptr = FactQueryData(theEnv)->QueryCoreStack;
+   FactQueryData(theEnv)->QueryCoreStack = FactQueryData(theEnv)->QueryCoreStack->nxt;
+   rtn_struct(theEnv,query_stack,qptr);
+  }
+
+/***************************************************
+  NAME         : FindQueryCore
+  DESCRIPTION  : Looks up a QueryCore Stack Frame
+                    Depth 0 is current frame
+                    1 is next deepest, etc.
+  INPUTS       : Depth
+  RETURNS      : Address of query core stack frame
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static QUERY_CORE *FindQueryCore(
+  Environment *theEnv,
+  long long depth)
+  {
+   QUERY_STACK *qptr;
+
+   if (depth == 0)
+     return FactQueryData(theEnv)->QueryCore;
+     
+   qptr = FactQueryData(theEnv)->QueryCoreStack;
+   while (depth > 1)
+     {
+      qptr = qptr->nxt;
+      depth--;
+     }
+     
+   return qptr->core;
+  }
+
+/**********************************************************
+  NAME         : DetermineQueryTemplates
+  DESCRIPTION  : Builds a list of templates to be used in
+                   fact queries - uses parse form.
+  INPUTS       : 1) The parse template expression chain
+                 2) The name of the function being executed
+                 3) Caller's buffer for restriction count
+                    (# of separate lists)
+  RETURNS      : The query list, or NULL on errors
+  SIDE EFFECTS : Memory allocated for list
+                 Busy count incremented for all templates
+  NOTES        : Each restriction is linked by nxt pointer,
+                   multiple templates in a restriction are
+                   linked by the chain pointer.
+                 Rcnt caller's buffer is set to reflect the
+                   total number of chains
+                 Assumes templateExp is not NULL and that each
+                   restriction chain is terminated with
+                   the QUERY_DELIMITER_SYMBOL "(QDS)"
+ **********************************************************/
+static QUERY_TEMPLATE *DetermineQueryTemplates(
+  Environment *theEnv,
+  Expression *templateExp,
+  const char *func,
+  unsigned *rcnt)
+  {
+   QUERY_TEMPLATE *clist = NULL, *cnxt = NULL, *cchain = NULL, *tmp;
+   bool new_list = false;
+   UDFValue temp;
+   Deftemplate *theDeftemplate;
+
+   *rcnt = 0;
+   while (templateExp != NULL)
+     {
+      theDeftemplate = NULL;
+      
+      if (templateExp->type == DEFTEMPLATE_PTR)
+        { theDeftemplate = (Deftemplate *) templateExp->value; }
+      else if (EvaluateExpression(theEnv,templateExp,&temp))
+        {
+         DeleteQueryTemplates(theEnv,clist);
+         return NULL;
+        }
+        
+      if ((theDeftemplate == NULL) &&
+          (temp.value == (void *) FactQueryData(theEnv)->QUERY_DELIMITER_SYMBOL))
+        {
+         new_list = true;
+         (*rcnt)++;
+        }
+      else if ((tmp = FormChain(theEnv,func,theDeftemplate,&temp)) != NULL)
+        {
+         if (clist == NULL)
+           { clist = cnxt = cchain = tmp; }
+         else if (new_list == true)
+           {
+            new_list = false;
+            cnxt->nxt = tmp;
+            cnxt = cchain = tmp;
+           }
+         else
+           { cchain->chain = tmp; }
+           
+         while (cchain->chain != NULL)
+           { cchain = cchain->chain; }
+        }
+      else
+        {
+         SyntaxErrorMessage(theEnv,"fact-set query class restrictions");
+         DeleteQueryTemplates(theEnv,clist);
+         SetEvaluationError(theEnv,true);
+         return NULL;
+        }
+        
+      templateExp = templateExp->nextArg;
+     }
+     
+   return clist;
+  }
+
+/*************************************************************
+  NAME         : FormChain
+  DESCRIPTION  : Builds a list of deftemplates to be used in
+                   fact queries - uses parse form.
+  INPUTS       : 1) Name of calling function for error msgs
+                 2) Data object - must be a symbol or a
+                      multifield value containing all symbols
+                 The symbols must be names of existing templates
+  RETURNS      : The query chain, or NULL on errors
+  SIDE EFFECTS : Memory allocated for chain
+                 Busy count incremented for all templates
+  NOTES        : None
+ *************************************************************/
+static QUERY_TEMPLATE *FormChain(
+  Environment *theEnv,
+  const char *func,
+  Deftemplate *theDeftemplate,
+  UDFValue *val)
+  {
+   Deftemplate *templatePtr;
+   QUERY_TEMPLATE *head, *bot, *tmp;
+   size_t i; /* 6.04 Bug Fix */
+   const char *templateName;
+   unsigned int count;
+
+   if (theDeftemplate != NULL)
+     {
+      IncrementDeftemplateBusyCount(theEnv,theDeftemplate);
+      head = get_struct(theEnv,query_template);
+      head->templatePtr = theDeftemplate;
+
+      head->chain = NULL;
+      head->nxt = NULL;
+      return head;
+     }
+
+   if (val->header->type == SYMBOL_TYPE)
+     {
+      /*============================================*/
+      /* Allow instance-set query restrictions to   */
+      /* have module specifier as part of the class */
+      /* name, but search imported defclasses too   */
+      /* if a module specifier is not given.        */
+      /*============================================*/
+
+      templatePtr = (Deftemplate *)
+                       FindImportedConstruct(theEnv,"deftemplate",NULL,val->lexemeValue->contents,
+                                             &count,true,NULL);
+         
+      if (templatePtr == NULL)
+        {
+         CantFindItemInFunctionErrorMessage(theEnv,"deftemplate",val->lexemeValue->contents,func,true);
+         return NULL;
+        }
+        
+      IncrementDeftemplateBusyCount(theEnv,templatePtr);
+      head = get_struct(theEnv,query_template);
+      head->templatePtr = templatePtr;
+
+      head->chain = NULL;
+      head->nxt = NULL;
+      return head;
+     }
+     
+   if (val->header->type == MULTIFIELD_TYPE)
+     {
+      head = bot = NULL;
+
+      for (i = val->begin ; i < (val->begin + val->range) ; i++)
+        {
+         if (val->multifieldValue->contents[i].header->type == SYMBOL_TYPE)
+           {
+            templateName = val->multifieldValue->contents[i].lexemeValue->contents;
+
+            templatePtr = (Deftemplate *)
+                          FindImportedConstruct(theEnv,"deftemplate",NULL,templateName,
+                                                &count,true,NULL);
+
+            if (templatePtr == NULL)
+              {
+               CantFindItemInFunctionErrorMessage(theEnv,"deftemplate",templateName,func,true);
+               DeleteQueryTemplates(theEnv,head);
+               return NULL;
+              }
+           }
+         else
+           {
+            DeleteQueryTemplates(theEnv,head);
+            return NULL;
+           }
+           
+         IncrementDeftemplateBusyCount(theEnv,templatePtr);
+         tmp = get_struct(theEnv,query_template);
+         tmp->templatePtr = templatePtr;
+
+         tmp->chain = NULL;
+         tmp->nxt = NULL;
+         
+         if (head == NULL)
+           { head = tmp; }
+         else
+           { bot->chain = tmp; }
+         
+         bot = tmp;
+        }
+        
+      return head;
+     }
+   return NULL;
+  }
+
+/******************************************************
+  NAME         : DeleteQueryTemplates
+  DESCRIPTION  : Deletes a query class-list
+  INPUTS       : The query list address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Nodes deallocated
+                 Busy count decremented for all templates
+  NOTES        : None
+ ******************************************************/
+static void DeleteQueryTemplates(
+  Environment *theEnv,
+  QUERY_TEMPLATE *qlist)
+  {
+   QUERY_TEMPLATE *tmp;
+
+   while (qlist != NULL)
+     {
+      while (qlist->chain != NULL)
+        {
+         tmp = qlist->chain;
+         qlist->chain = qlist->chain->chain;
+         DecrementDeftemplateBusyCount(theEnv,tmp->templatePtr);
+         rtn_struct(theEnv,query_template,tmp);
+        }
+      tmp = qlist;
+      qlist = qlist->nxt;
+      DecrementDeftemplateBusyCount(theEnv,tmp->templatePtr);
+      rtn_struct(theEnv,query_template,tmp);
+     }
+  }
+
+/************************************************************
+  NAME         : TestForFirstInChain
+  DESCRIPTION  : Processes all templates in a restriction chain
+                   until success or done
+  INPUTS       : 1) The current chain
+                 2) The index of the chain restriction
+                     (e.g. the 4th query-variable)
+  RETURNS      : True if query succeeds, false otherwise
+  SIDE EFFECTS : Sets current restriction class
+                 Fact variable values set
+  NOTES        : None
+ ************************************************************/
+static bool TestForFirstInChain(
+  Environment *theEnv,
+  QUERY_TEMPLATE *qchain,
+  unsigned indx)
+  {
+   QUERY_TEMPLATE *qptr;
+
+   FactQueryData(theEnv)->AbortQuery = true;
+   for (qptr = qchain ; qptr != NULL ; qptr = qptr->chain)
+     {
+      FactQueryData(theEnv)->AbortQuery = false;
+
+      if (TestForFirstFactInTemplate(theEnv,qptr->templatePtr,qchain,indx))
+        { return true; }
+
+      if ((EvaluationData(theEnv)->HaltExecution == true) || (FactQueryData(theEnv)->AbortQuery == true))
+        return false;
+     }
+   return false;
+  }
+
+/*****************************************************************
+  NAME         : TestForFirstFactInTemplate
+  DESCRIPTION  : Processes all facts in a template
+  INPUTS       : 1) Visitation traversal id
+                 2) The template
+                 3) The current template restriction chain
+                 4) The index of the current restriction
+  RETURNS      : True if query succeeds, false otherwise
+  SIDE EFFECTS : Fact variable values set
+  NOTES        : None
+ *****************************************************************/
+static bool TestForFirstFactInTemplate(
+  Environment *theEnv,
+  Deftemplate *templatePtr,
+  QUERY_TEMPLATE *qchain,
+  unsigned indx)
+  {
+   Fact *theFact;
+   UDFValue temp;
+   GCBlock gcb;
+   unsigned j;
+
+   GCBlockStart(theEnv,&gcb);
+
+   theFact = templatePtr->factList;
+   while (theFact != NULL)
+     {
+      FactQueryData(theEnv)->QueryCore->solns[indx] = theFact;
+      if (qchain->nxt != NULL)
+        {
+         theFact->patternHeader.busyCount++;
+         if (TestForFirstInChain(theEnv,qchain->nxt,indx+1) == true)
+           {
+            theFact->patternHeader.busyCount--;
+            break;
+           }
+         theFact->patternHeader.busyCount--;
+         if ((EvaluationData(theEnv)->HaltExecution == true) || (FactQueryData(theEnv)->AbortQuery == true))
+           break;
+        }
+      else
+        {
+         for (j = 0; j < indx; j++)
+           {
+            if (FactQueryData(theEnv)->QueryCore->solns[j]->garbage)
+              {
+               theFact = NULL;
+               goto endTest;
+              }
+           }
+           
+         theFact->patternHeader.busyCount++;
+         
+         EvaluateExpression(theEnv,FactQueryData(theEnv)->QueryCore->query,&temp);
+
+         CleanCurrentGarbageFrame(theEnv,NULL);
+         CallPeriodicTasks(theEnv);
+
+         theFact->patternHeader.busyCount--;
+         
+         if (EvaluationData(theEnv)->HaltExecution == true)
+           { break; }
+           
+         if (temp.value != FalseSymbol(theEnv))
+           { break; }
+        }
+        
+      /*================================================*/
+      /* Get the next fact that has not been retracted. */
+      /*================================================*/
+      
+      theFact = theFact->nextTemplateFact;
+      while ((theFact != NULL) ? (theFact->garbage == 1) : false)
+        { theFact = theFact->nextTemplateFact; }
+     }
+     
+   endTest:
+   
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+
+   if (theFact != NULL)
+     return(((EvaluationData(theEnv)->HaltExecution == true) || (FactQueryData(theEnv)->AbortQuery == true))
+             ? false : true);
+
+   return false;
+  }
+
+/************************************************************
+  NAME         : TestEntireChain
+  DESCRIPTION  : Processes all templates in a restriction chain
+                   until done
+  INPUTS       : 1) The current chain
+                 2) The index of the chain restriction
+                     (i.e. the 4th query-variable)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Sets current restriction template
+                 Query fact variables set
+                 Solution sets stored in global list
+  NOTES        : None
+ ************************************************************/
+static void TestEntireChain(
+  Environment *theEnv,
+  QUERY_TEMPLATE *qchain,
+  unsigned indx)
+  {
+   QUERY_TEMPLATE *qptr;
+
+   FactQueryData(theEnv)->AbortQuery = true;
+   for (qptr = qchain ; qptr != NULL ; qptr = qptr->chain)
+     {
+      FactQueryData(theEnv)->AbortQuery = false;
+
+      TestEntireTemplate(theEnv,qptr->templatePtr,qchain,indx);
+
+      if ((EvaluationData(theEnv)->HaltExecution == true) || (FactQueryData(theEnv)->AbortQuery == true))
+        return;
+     }
+  }
+
+/*****************************************************************
+  NAME         : TestEntireTemplate
+  DESCRIPTION  : Processes all facts in a template
+  INPUTS       : 1) The module for which templates tested must be
+                    in scope
+                 3) The template
+                 4) The current template restriction chain
+                 5) The index of the current restriction
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance variable values set
+                 Solution sets stored in global list
+  NOTES        : None
+ *****************************************************************/
+static void TestEntireTemplate(
+  Environment *theEnv,
+  Deftemplate *templatePtr,
+  QUERY_TEMPLATE *qchain,
+  unsigned indx)
+  {
+   Fact *theFact;
+   UDFValue temp;
+   GCBlock gcb;
+   unsigned j;
+
+   GCBlockStart(theEnv,&gcb);
+
+   theFact = templatePtr->factList;
+   while (theFact != NULL)
+     {
+      FactQueryData(theEnv)->QueryCore->solns[indx] = theFact;
+      if (qchain->nxt != NULL)
+        {
+         theFact->patternHeader.busyCount++;
+         TestEntireChain(theEnv,qchain->nxt,indx+1);
+         theFact->patternHeader.busyCount--;
+         if ((EvaluationData(theEnv)->HaltExecution == true) || (FactQueryData(theEnv)->AbortQuery == true))
+           break;
+        }
+      else
+        {
+         for (j = 0; j < indx; j++)
+           {
+            if (FactQueryData(theEnv)->QueryCore->solns[j]->garbage)
+              { goto endTest; }
+           }
+           
+         theFact->patternHeader.busyCount++;
+
+         EvaluateExpression(theEnv,FactQueryData(theEnv)->QueryCore->query,&temp);
+
+         theFact->patternHeader.busyCount--;
+         if (EvaluationData(theEnv)->HaltExecution == true)
+           break;
+         if (temp.value != FalseSymbol(theEnv))
+           {
+            if (FactQueryData(theEnv)->QueryCore->action != NULL)
+              {
+               theFact->patternHeader.busyCount++;
+               ReleaseUDFV(theEnv,FactQueryData(theEnv)->QueryCore->result);
+               EvaluateExpression(theEnv,FactQueryData(theEnv)->QueryCore->action,FactQueryData(theEnv)->QueryCore->result);
+               RetainUDFV(theEnv,FactQueryData(theEnv)->QueryCore->result);
+
+               theFact->patternHeader.busyCount--;
+               if (ProcedureFunctionData(theEnv)->BreakFlag || ProcedureFunctionData(theEnv)->ReturnFlag)
+                 {
+                  FactQueryData(theEnv)->AbortQuery = true;
+                  break;
+                 }
+               if (EvaluationData(theEnv)->HaltExecution == true)
+                 break;
+              }
+            else
+              AddSolution(theEnv);
+           }
+        }
+
+      theFact = theFact->nextTemplateFact;
+      while ((theFact != NULL) ? (theFact->garbage == 1) : false)
+       { theFact = theFact->nextTemplateFact; }
+
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+     }
+
+   endTest:
+   
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+  }
+
+/***************************************************************************
+  NAME         : AddSolution
+  DESCRIPTION  : Adds the current fact set to a global list of
+                   solutions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Global list and count updated
+  NOTES        : Solutions are stored as sequential arrays of Fact *
+ ***************************************************************************/
+static void AddSolution(
+  Environment *theEnv)
+  {
+   QUERY_SOLN *new_soln;
+   unsigned i;
+
+   new_soln = (QUERY_SOLN *) gm2(theEnv,sizeof(QUERY_SOLN));
+   new_soln->soln = (Fact **)
+                    gm2(theEnv,(sizeof(Fact *) * (FactQueryData(theEnv)->QueryCore->soln_size)));
+   for (i = 0 ; i < FactQueryData(theEnv)->QueryCore->soln_size ; i++)
+     new_soln->soln[i] = FactQueryData(theEnv)->QueryCore->solns[i];
+   new_soln->nxt = NULL;
+   if (FactQueryData(theEnv)->QueryCore->soln_set == NULL)
+     FactQueryData(theEnv)->QueryCore->soln_set = new_soln;
+   else
+     FactQueryData(theEnv)->QueryCore->soln_bottom->nxt = new_soln;
+   FactQueryData(theEnv)->QueryCore->soln_bottom = new_soln;
+   FactQueryData(theEnv)->QueryCore->soln_cnt++;
+  }
+
+/***************************************************
+  NAME         : PopQuerySoln
+  DESCRIPTION  : Deallocates the topmost solution
+                   set for an fact-set query
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Solution set deallocated
+  NOTES        : Assumes QueryCore->soln_set != 0
+ ***************************************************/
+static void PopQuerySoln(
+  Environment *theEnv)
+  {
+   FactQueryData(theEnv)->QueryCore->soln_bottom = FactQueryData(theEnv)->QueryCore->soln_set;
+   FactQueryData(theEnv)->QueryCore->soln_set = FactQueryData(theEnv)->QueryCore->soln_set->nxt;
+   rm(theEnv,FactQueryData(theEnv)->QueryCore->soln_bottom->soln,
+      (sizeof(Fact *) * FactQueryData(theEnv)->QueryCore->soln_size));
+   rm(theEnv,FactQueryData(theEnv)->QueryCore->soln_bottom,sizeof(QUERY_SOLN));
+  }
+
+#endif
+
+
diff --git a/clips/factqury.h b/clips/factqury.h
new file mode 100644
index 000000000..ef791d51f
--- /dev/null
+++ b/clips/factqury.h
@@ -0,0 +1,109 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added fact-set queries.                        */
+/*                                                           */
+/*      6.24: Corrected errors when compiling as a C++ file. */
+/*            DR0868                                         */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Fixes for run-time use of query functions.     */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factqury
+
+#pragma once
+
+#define _H_factqury
+
+#if FACT_SET_QUERIES
+
+#include "factmngr.h"
+
+typedef struct query_template
+  {
+   Deftemplate *templatePtr;
+   struct query_template *chain, *nxt;
+  } QUERY_TEMPLATE;
+
+typedef struct query_soln
+  {
+   Fact **soln;
+   struct query_soln *nxt;
+  } QUERY_SOLN;
+
+typedef struct query_core
+  {
+   Fact **solns;
+   Expression *query,*action;
+   QUERY_SOLN *soln_set,*soln_bottom;
+   unsigned soln_size,soln_cnt;
+   UDFValue *result;
+  } QUERY_CORE;
+
+typedef struct query_stack
+  {
+   QUERY_CORE *core;
+   struct query_stack *nxt;
+  } QUERY_STACK;
+
+#define FACT_QUERY_DATA 63
+
+struct factQueryData
+  {
+   CLIPSLexeme *QUERY_DELIMITER_SYMBOL;
+   QUERY_CORE *QueryCore;
+   QUERY_STACK *QueryCoreStack;
+   bool AbortQuery;
+  };
+
+#define FactQueryData(theEnv) ((struct factQueryData *) GetEnvironmentData(theEnv,FACT_QUERY_DATA))
+
+#define QUERY_DELIMITER_STRING     "(QDS)"
+
+   void                           SetupFactQuery(Environment *);
+   void                           GetQueryFact(Environment *,UDFContext *,UDFValue *);
+   void                           GetQueryFactSlot(Environment *,UDFContext *,UDFValue *);
+   void                           AnyFacts(Environment *,UDFContext *,UDFValue *);
+   void                           QueryFindFact(Environment *,UDFContext *,UDFValue *);
+   void                           QueryFindAllFacts(Environment *,UDFContext *,UDFValue *);
+   void                           QueryDoForFact(Environment *,UDFContext *,UDFValue *);
+   void                           QueryDoForAllFacts(Environment *,UDFContext *,UDFValue *);
+   void                           DelayedQueryDoForAllFacts(Environment *,UDFContext *,UDFValue *);
+
+#endif /* FACT_SET_QUERIES */
+
+#endif /* _H_factqury */
diff --git a/clips/factrete.c b/clips/factrete.c
new file mode 100755
index 000000000..7e84949af
--- /dev/null
+++ b/clips/factrete.c
@@ -0,0 +1,945 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*          FACT RETE ACCESS FUNCTIONS MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Rete access functions for fact pattern matching. */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for hashing optimizations.             */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT
+
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "factgen.h"
+#include "factmch.h"
+#include "incrrset.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "reteutil.h"
+#include "router.h"
+
+#include "factrete.h"
+
+/***************************************************************/
+/* FactPNGetVar1: Fact pattern network function for extracting */
+/*   a variable's value. This is the most generalized routine. */
+/***************************************************************/
+bool FactPNGetVar1(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *returnValue)
+  {
+   size_t adjustedField;
+   unsigned short theField, theSlot;
+   Fact *factPtr;
+   CLIPSValue *fieldPtr;
+   struct multifieldMarker *marks;
+   Multifield *segmentPtr;
+   size_t extent;
+   struct factGetVarPN1Call *hack;
+
+   /*==========================================*/
+   /* Retrieve the arguments for the function. */
+   /*==========================================*/
+
+   hack = (struct factGetVarPN1Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*=====================================================*/
+   /* Get the pointer to the fact from the partial match. */
+   /*=====================================================*/
+
+   factPtr = FactData(theEnv)->CurrentPatternFact;
+   marks = FactData(theEnv)->CurrentPatternMarks;
+
+   /*==========================================================*/
+   /* Determine if we want to retrieve the fact address of the */
+   /* fact, rather than retrieving a field from the fact.      */
+   /*==========================================================*/
+
+   if (hack->factAddress)
+     {
+      returnValue->value = factPtr;
+      return true;
+     }
+
+   /*=========================================================*/
+   /* Determine if we want to retrieve the entire slot value. */
+   /*=========================================================*/
+
+   if (hack->allFields)
+     {
+      theSlot = hack->whichSlot;
+      fieldPtr = &factPtr->theProposition.contents[theSlot];
+      returnValue->value = fieldPtr->value;
+      if (returnValue->header->type == MULTIFIELD_TYPE)
+        {
+         returnValue->begin = 0;
+         returnValue->range = fieldPtr->multifieldValue->length;
+        }
+
+      return true;
+     }
+
+   /*====================================================*/
+   /* If the slot being accessed is a single field slot, */
+   /* then just return the single value found in that    */
+   /* slot. The multifieldMarker data structures do not  */
+   /* have to be considered since access to a single     */
+   /* field slot is not affected by variable bindings    */
+   /* from multifield slots.                             */
+   /*====================================================*/
+
+   theField = hack->whichField;
+   theSlot = hack->whichSlot;
+   fieldPtr = &factPtr->theProposition.contents[theSlot];
+
+   /*==========================================================*/
+   /* Retrieve a value from a multifield slot. First determine */
+   /* the range of fields for the variable being retrieved.    */
+   /*==========================================================*/
+
+   extent = SIZE_MAX;
+   adjustedField = AdjustFieldPosition(theEnv,marks,theField,theSlot,&extent);
+
+   /*=============================================================*/
+   /* If a range of values are being retrieved (i.e. a multifield */
+   /* variable), then return the values as a multifield.          */
+   /*=============================================================*/
+
+   if (extent != SIZE_MAX)
+     {
+      returnValue->value = fieldPtr->value;
+      returnValue->begin = adjustedField;
+      returnValue->range = extent;
+      return true;
+     }
+
+   /*========================================================*/
+   /* Otherwise a single field value is being retrieved from */
+   /* a multifield slot. Just return the type and value.     */
+   /*========================================================*/
+
+   segmentPtr = fieldPtr->multifieldValue;
+   fieldPtr = &segmentPtr->contents[adjustedField];
+
+   returnValue->value = fieldPtr->value;
+
+   return true;
+  }
+
+/**************************************************/
+/* FactPNGetVar2: Fact pattern network function   */
+/*   for extracting a variable's value. The value */
+/*   extracted is from a single field slot.       */
+/**************************************************/
+bool FactPNGetVar2(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *returnValue)
+  {
+   Fact *factPtr;
+   struct factGetVarPN2Call *hack;
+   CLIPSValue *fieldPtr;
+
+   /*==========================================*/
+   /* Retrieve the arguments for the function. */
+   /*==========================================*/
+
+   hack = (struct factGetVarPN2Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*==============================*/
+   /* Get the pointer to the fact. */
+   /*==============================*/
+
+   factPtr = FactData(theEnv)->CurrentPatternFact;
+
+   /*============================================*/
+   /* Extract the value from the specified slot. */
+   /*============================================*/
+
+   fieldPtr = &factPtr->theProposition.contents[hack->whichSlot];
+
+   returnValue->value = fieldPtr->value;
+
+   return true;
+  }
+
+/*****************************************************************/
+/* FactPNGetVar3: Fact pattern network function for extracting a */
+/*   variable's value. The value extracted is from a multifield  */
+/*   slot that contains at most one multifield variable.         */
+/*****************************************************************/
+bool FactPNGetVar3(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *returnValue)
+  {
+   Fact *factPtr;
+   Multifield *segmentPtr;
+   CLIPSValue *fieldPtr;
+   struct factGetVarPN3Call *hack;
+
+   /*==========================================*/
+   /* Retrieve the arguments for the function. */
+   /*==========================================*/
+
+   hack = (struct factGetVarPN3Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*==============================*/
+   /* Get the pointer to the fact. */
+   /*==============================*/
+
+   factPtr = FactData(theEnv)->CurrentPatternFact;
+
+   /*============================================================*/
+   /* Get the multifield value from which the data is retrieved. */
+   /*============================================================*/
+
+   segmentPtr = factPtr->theProposition.contents[hack->whichSlot].multifieldValue;
+
+   /*=========================================*/
+   /* If the beginning and end flags are set, */
+   /* then retrieve a multifield value.       */
+   /*=========================================*/
+
+   if (hack->fromBeginning && hack->fromEnd)
+     {
+      returnValue->value = segmentPtr;
+      returnValue->begin = hack->beginOffset;
+      returnValue->range = segmentPtr->length - (hack->endOffset + hack->beginOffset);
+      return true;
+     }
+
+   /*=====================================================*/
+   /* Return a single field value from a multifield slot. */
+   /*=====================================================*/
+
+   if (hack->fromBeginning)
+     { fieldPtr = &segmentPtr->contents[hack->beginOffset]; }
+   else
+     { fieldPtr = &segmentPtr->contents[segmentPtr->length - (hack->endOffset + 1)]; }
+
+   returnValue->value = fieldPtr->value;
+
+   return true;
+  }
+
+/******************************************************/
+/* FactPNConstant1: Fact pattern network function for */
+/*   comparing a value stored in a single field slot  */
+/*   to a constant for either equality or inequality. */
+/******************************************************/
+bool FactPNConstant1(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *returnValue)
+  {
+#if MAC_XCD
+#pragma unused(returnValue)
+#endif
+   struct factConstantPN1Call *hack;
+   CLIPSValue *fieldPtr;
+   struct expr *theConstant;
+
+   /*==========================================*/
+   /* Retrieve the arguments for the function. */
+   /*==========================================*/
+
+   hack = (struct factConstantPN1Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*============================================*/
+   /* Extract the value from the specified slot. */
+   /*============================================*/
+
+   fieldPtr = &FactData(theEnv)->CurrentPatternFact->theProposition.contents[hack->whichSlot];
+
+   /*====================================*/
+   /* Compare the value to the constant. */
+   /*====================================*/
+
+   theConstant = GetFirstArgument();
+   if (theConstant->value != fieldPtr->value)
+     {
+      if (1 - hack->testForEquality)
+        { return true; }
+      else
+        { return false; }
+     }
+
+   if (hack->testForEquality)
+     { return true; }
+   else
+     { return false; }
+  }
+
+/****************************************************************/
+/* FactPNConstant2: Fact pattern network function for comparing */
+/*   a value stored in a slot to a constant for either equality */
+/*   or inequality. The value being retrieved from the slot has */
+/*   no multifields to its right (thus it can be retrieved      */
+/*   relative to the beginning).                                */
+/****************************************************************/
+bool FactPNConstant2(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *returnValue)
+  {
+#if MAC_XCD
+#pragma unused(returnValue)
+#endif
+   struct factConstantPN2Call *hack;
+   CLIPSValue *fieldPtr;
+   struct expr *theConstant;
+   Multifield *segmentPtr;
+
+   /*==========================================*/
+   /* Retrieve the arguments for the function. */
+   /*==========================================*/
+
+   hack = (struct factConstantPN2Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*==========================================================*/
+   /* Extract the value from the specified slot. Note that the */
+   /* test to determine the slot's type (multifield) should be */
+   /* unnecessary since this routine should only be used for   */
+   /* multifield slots.                                        */
+   /*==========================================================*/
+
+   fieldPtr = &FactData(theEnv)->CurrentPatternFact->theProposition.contents[hack->whichSlot];
+
+   if (fieldPtr->header->type == MULTIFIELD_TYPE)
+     {
+      segmentPtr = fieldPtr->multifieldValue;
+
+      if (hack->fromBeginning)
+        { fieldPtr = &segmentPtr->contents[hack->offset]; }
+      else
+        {
+         fieldPtr = &segmentPtr->contents[segmentPtr->length -
+                    (hack->offset + 1)];
+        }
+     }
+
+   /*====================================*/
+   /* Compare the value to the constant. */
+   /*====================================*/
+
+   theConstant = GetFirstArgument();
+   if (theConstant->value != fieldPtr->value)
+     {
+      if (1 - hack->testForEquality)
+        { return true; }
+      else
+        { return false; }
+     }
+   
+   if (hack->testForEquality)
+     { return true; }
+   else
+     { return false; }
+  }
+
+/**************************************************************/
+/* FactJNGetVar1: Fact join network function for extracting a */
+/*   variable's value. This is the most generalized routine.  */
+/**************************************************************/
+bool FactJNGetVar1(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *returnValue)
+  {
+   size_t adjustedField;
+   unsigned short theField, theSlot;
+   Fact *factPtr;
+   CLIPSValue *fieldPtr;
+   struct multifieldMarker *marks;
+   Multifield *segmentPtr;
+   size_t extent;
+   struct factGetVarJN1Call *hack;
+   Multifield *theSlots = NULL;
+
+   /*==========================================*/
+   /* Retrieve the arguments for the function. */
+   /*==========================================*/
+
+   hack = (struct factGetVarJN1Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*=====================================================*/
+   /* Get the pointer to the fact from the partial match. */
+   /*=====================================================*/
+
+   if (hack->lhs)
+     {
+      factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->matchingItem;
+      marks = get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->markers;
+     }
+   else if (hack->rhs)
+     {
+      factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,hack->whichPattern)->matchingItem;
+      marks = get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,hack->whichPattern)->markers;
+     }
+   else if (EngineData(theEnv)->GlobalRHSBinds == NULL)
+     {
+      factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->matchingItem;
+      marks = get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->markers;
+     }
+   else if ((EngineData(theEnv)->GlobalJoin->depth - 1) == hack->whichPattern)
+     {
+      factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,0)->matchingItem;
+      marks = get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,0)->markers;
+     }
+   else
+     {
+      factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->matchingItem;
+      marks = get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->markers;
+     }
+
+   /*==========================================================*/
+   /* Determine if we want to retrieve the fact address of the */
+   /* fact, rather than retrieving a field from the fact.      */
+   /*==========================================================*/
+
+   if (hack->factAddress)
+     {
+      returnValue->value = factPtr;
+      return true;
+     }
+
+   if ((factPtr->basisSlots != NULL) &&
+       (! EngineData(theEnv)->JoinOperationInProgress))
+     { theSlots = factPtr->basisSlots; }
+   else
+     { theSlots = &factPtr->theProposition; }
+
+   /*=========================================================*/
+   /* Determine if we want to retrieve the entire slot value. */
+   /*=========================================================*/
+
+   if (hack->allFields)
+     {
+      theSlot = hack->whichSlot;
+      fieldPtr = &theSlots->contents[theSlot];
+      returnValue->value = fieldPtr->value;
+      if (returnValue->header->type == MULTIFIELD_TYPE)
+        {
+         returnValue->begin = 0;
+         returnValue->range = fieldPtr->multifieldValue->length;
+        }
+
+      return true;
+     }
+
+   /*====================================================*/
+   /* If the slot being accessed is a single field slot, */
+   /* then just return the single value found in that    */
+   /* slot. The multifieldMarker data structures do not  */
+   /* have to be considered since access to a single     */
+   /* field slot is not affected by variable bindings    */
+   /* from multifield slots.                             */
+   /*====================================================*/
+
+   theField = hack->whichField;
+   theSlot = hack->whichSlot;
+   fieldPtr = &theSlots->contents[theSlot];
+
+   if (fieldPtr->header->type != MULTIFIELD_TYPE)
+     {
+      returnValue->value = fieldPtr->value;
+      return true;
+     }
+
+   /*==========================================================*/
+   /* Retrieve a value from a multifield slot. First determine */
+   /* the range of fields for the variable being retrieved.    */
+   /*==========================================================*/
+
+   extent = SIZE_MAX;
+   adjustedField = AdjustFieldPosition(theEnv,marks,theField,theSlot,&extent);
+
+   /*=============================================================*/
+   /* If a range of values are being retrieved (i.e. a multifield */
+   /* variable), then return the values as a multifield.          */
+   /*=============================================================*/
+
+   if (extent != SIZE_MAX)
+     {
+      returnValue->value = fieldPtr->value;
+      returnValue->begin = adjustedField;
+      returnValue->range = extent;
+      return true;
+     }
+
+   /*========================================================*/
+   /* Otherwise a single field value is being retrieved from */
+   /* a multifield slot. Just return the type and value.     */
+   /*========================================================*/
+
+   segmentPtr = theSlots->contents[theSlot].multifieldValue;
+   fieldPtr = &segmentPtr->contents[adjustedField];
+
+   returnValue->value = fieldPtr->value;
+
+   return true;
+  }
+
+/*************************************************/
+/* FactJNGetVar2: Fact join network function for */
+/*   extracting a variable's value. The value    */
+/*   extracted is from a single field slot.      */
+/*************************************************/
+bool FactJNGetVar2(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *returnValue)
+  {
+   Fact *factPtr;
+   struct factGetVarJN2Call *hack;
+   CLIPSValue *fieldPtr;
+
+   /*==========================================*/
+   /* Retrieve the arguments for the function. */
+   /*==========================================*/
+
+   hack = (struct factGetVarJN2Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*=====================================================*/
+   /* Get the pointer to the fact from the partial match. */
+   /*=====================================================*/
+
+   if (hack->lhs)
+     { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->matchingItem; }
+   else if (hack->rhs)
+     { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,hack->whichPattern)->matchingItem; }
+   else if (EngineData(theEnv)->GlobalRHSBinds == NULL)
+     { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->matchingItem; }
+   else if ((EngineData(theEnv)->GlobalJoin->depth - 1) == hack->whichPattern)
+	 { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,0)->matchingItem; }
+   else
+     { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->matchingItem; }
+
+   /*============================================*/
+   /* Extract the value from the specified slot. */
+   /*============================================*/
+
+   if ((factPtr->basisSlots != NULL) &&
+       (! EngineData(theEnv)->JoinOperationInProgress))
+     { fieldPtr = &factPtr->basisSlots->contents[hack->whichSlot]; }
+   else
+     { fieldPtr = &factPtr->theProposition.contents[hack->whichSlot]; }
+
+   returnValue->value = fieldPtr->value;
+
+   return true;
+  }
+
+/****************************************************************/
+/* FactJNGetVar3: Fact join network function for extracting a   */
+/*   variable's value. The value extracted is from a multifield */
+/*   slot that contains at most one multifield variable.        */
+/****************************************************************/
+bool FactJNGetVar3(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *returnValue)
+  {
+   Fact *factPtr;
+   Multifield *segmentPtr;
+   CLIPSValue *fieldPtr;
+   struct factGetVarJN3Call *hack;
+
+   /*==========================================*/
+   /* Retrieve the arguments for the function. */
+   /*==========================================*/
+
+   hack = (struct factGetVarJN3Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*=====================================================*/
+   /* Get the pointer to the fact from the partial match. */
+   /*=====================================================*/
+
+   if (hack->lhs)
+     { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->matchingItem; }
+   else if (hack->rhs)
+     { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,hack->whichPattern)->matchingItem; }
+   else if (EngineData(theEnv)->GlobalRHSBinds == NULL)
+     { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->matchingItem; }
+   else if ((EngineData(theEnv)->GlobalJoin->depth - 1) == hack->whichPattern)
+     { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,0)->matchingItem; }
+   else
+     { factPtr = (Fact *) get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,hack->whichPattern)->matchingItem; }
+
+   /*============================================================*/
+   /* Get the multifield value from which the data is retrieved. */
+   /*============================================================*/
+
+   if ((factPtr->basisSlots != NULL) &&
+       (! EngineData(theEnv)->JoinOperationInProgress))
+     { segmentPtr = factPtr->basisSlots->contents[hack->whichSlot].multifieldValue; }
+   else
+     { segmentPtr = factPtr->theProposition.contents[hack->whichSlot].multifieldValue; }
+
+   /*=========================================*/
+   /* If the beginning and end flags are set, */
+   /* then retrieve a multifield value.       */
+   /*=========================================*/
+
+   if (hack->fromBeginning && hack->fromEnd)
+     {
+      returnValue->value = segmentPtr;
+      returnValue->begin = hack->beginOffset;
+      returnValue->range = segmentPtr->length - (hack->endOffset + hack->beginOffset);
+      return true;
+     }
+
+   /*=====================================================*/
+   /* Return a single field value from a multifield slot. */
+   /*=====================================================*/
+
+   if (hack->fromBeginning)
+     { fieldPtr = &segmentPtr->contents[hack->beginOffset]; }
+   else
+     { fieldPtr = &segmentPtr->contents[segmentPtr->length - (hack->endOffset + 1)]; }
+
+   returnValue->value = fieldPtr->value;
+
+   return true;
+  }
+
+/****************************************************/
+/* FactSlotLength: Determines if the length of a    */
+/*  multifield slot falls within a specified range. */
+/****************************************************/
+bool FactSlotLength(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *returnValue)
+  {
+   struct factCheckLengthPNCall *hack;
+   Multifield *segmentPtr;
+   size_t extraOffset = 0;
+   struct multifieldMarker *tempMark;
+
+   returnValue->value = FalseSymbol(theEnv);
+
+   hack = (struct factCheckLengthPNCall *) ((CLIPSBitMap *) theValue)->contents;
+
+   for (tempMark = FactData(theEnv)->CurrentPatternMarks;
+        tempMark != NULL;
+        tempMark = tempMark->next)
+     {
+      if (tempMark->where.whichSlotNumber != hack->whichSlot) continue;
+      extraOffset += tempMark->range;
+     }
+
+   segmentPtr = FactData(theEnv)->CurrentPatternFact->theProposition.contents[hack->whichSlot].multifieldValue;
+
+   if (segmentPtr->length < (hack->minLength + extraOffset))
+     { return false; }
+
+   if (hack->exactly && (segmentPtr->length > (hack->minLength + extraOffset)))
+     { return false; }
+
+   returnValue->value = TrueSymbol(theEnv);
+   return true;
+  }
+
+/************************************************************/
+/* FactJNCompVars1: Fact join network routine for comparing */
+/*   the values of two single field slots.                  */
+/************************************************************/
+bool FactJNCompVars1(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+#if MAC_XCD
+#pragma unused(theResult)
+#endif
+   unsigned short p1, e1, p2, e2;
+   Fact *fact1, *fact2;
+   struct factCompVarsJN1Call *hack;
+
+   /*=========================================*/
+   /* Retrieve the arguments to the function. */
+   /*=========================================*/
+
+   hack = (struct factCompVarsJN1Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*=================================================*/
+   /* Extract the fact pointers for the two patterns. */
+   /*=================================================*/
+
+   p1 = hack->pattern1;
+   p2 = hack->pattern2;
+
+   fact1 = (Fact *) EngineData(theEnv)->GlobalRHSBinds->binds[p1].gm.theMatch->matchingItem;
+
+   if (hack->p2rhs)
+     { fact2 = (Fact *) EngineData(theEnv)->GlobalRHSBinds->binds[p2].gm.theMatch->matchingItem; }
+   else
+     { fact2 = (Fact *) EngineData(theEnv)->GlobalLHSBinds->binds[p2].gm.theMatch->matchingItem; }
+
+   /*=====================*/
+   /* Compare the values. */
+   /*=====================*/
+
+   e1 = hack->slot1;
+   e2 = hack->slot2;
+
+   if (fact1->theProposition.contents[e1].value !=
+       fact2->theProposition.contents[e2].value)
+     { return hack->fail; }
+
+   return hack->pass;
+  }
+
+/*****************************************************************/
+/* FactJNCompVars2:  Fact join network routine for comparing the */
+/*   two single field value that are found in the first slot     */
+/*   (which must also be a multifield slot) of a deftemplate.    */
+/*   This function is provided so that variable comparisons of   */
+/*   implied deftemplates will be faster.                        */
+/*****************************************************************/
+bool FactJNCompVars2(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+#if MAC_XCD
+#pragma unused(theResult)
+#endif
+   unsigned short p1, s1, p2, s2;
+   Fact *fact1, *fact2;
+   struct factCompVarsJN2Call *hack;
+   Multifield *segment;
+   CLIPSValue *fieldPtr1, *fieldPtr2;
+
+   /*=========================================*/
+   /* Retrieve the arguments to the function. */
+   /*=========================================*/
+
+   hack = (struct factCompVarsJN2Call *) ((CLIPSBitMap *) theValue)->contents;
+
+   /*=================================================*/
+   /* Extract the fact pointers for the two patterns. */
+   /*=================================================*/
+
+   p1 = hack->pattern1;
+   p2 = hack->pattern2;
+   s1 = hack->slot1;
+   s2 = hack->slot2;
+
+   fact1 = (Fact *) EngineData(theEnv)->GlobalRHSBinds->binds[p1].gm.theMatch->matchingItem;
+
+   if (hack->p2rhs)
+     { fact2 = (Fact *) EngineData(theEnv)->GlobalRHSBinds->binds[p2].gm.theMatch->matchingItem; }
+   else
+     { fact2 = (Fact *) EngineData(theEnv)->GlobalLHSBinds->binds[p2].gm.theMatch->matchingItem; }
+
+   /*======================*/
+   /* Retrieve the values. */
+   /*======================*/
+
+   if (fact1->theProposition.contents[s1].header->type != MULTIFIELD_TYPE)
+     { fieldPtr1 = &fact1->theProposition.contents[s1]; }
+   else
+     {
+      segment = fact1->theProposition.contents[s1].multifieldValue;
+
+      if (hack->fromBeginning1)
+        { fieldPtr1 = &segment->contents[hack->offset1]; }
+      else
+        { fieldPtr1 = &segment->contents[segment->length - (hack->offset1 + 1)]; }
+     }
+
+   if (fact2->theProposition.contents[s2].header->type != MULTIFIELD_TYPE)
+     { fieldPtr2 = &fact2->theProposition.contents[s2]; }
+   else
+     {
+      segment = fact2->theProposition.contents[s2].multifieldValue;
+
+      if (hack->fromBeginning2)
+        { fieldPtr2 = &segment->contents[hack->offset2]; }
+      else
+        { fieldPtr2 = &segment->contents[segment->length - (hack->offset2 + 1)]; }
+     }
+
+   /*=====================*/
+   /* Compare the values. */
+   /*=====================*/
+
+   if (fieldPtr1->value != fieldPtr2->value)
+     { return hack->fail; }
+
+   return hack->pass;
+  }
+
+/*****************************************************/
+/* FactPNCompVars1: Fact pattern network routine for */
+/*   comparing the values of two single field slots. */
+/*****************************************************/
+bool FactPNCompVars1(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   bool rv;
+   CLIPSValue *fieldPtr1, *fieldPtr2;
+   struct factCompVarsPN1Call *hack;
+
+   /*========================================*/
+   /* Extract the arguments to the function. */
+   /*========================================*/
+
+   hack = (struct factCompVarsPN1Call *) ((CLIPSBitMap *) theValue)->contents;
+   fieldPtr1 = &FactData(theEnv)->CurrentPatternFact->theProposition.contents[hack->field1];
+   fieldPtr2 = &FactData(theEnv)->CurrentPatternFact->theProposition.contents[hack->field2];
+
+   /*=====================*/
+   /* Compare the values. */
+   /*=====================*/
+
+   if (fieldPtr1->value != fieldPtr2->value) rv = (bool) hack->fail;
+   else rv = (bool) hack->pass;
+
+   if (rv) theResult->value = TrueSymbol(theEnv);
+   else theResult->value = FalseSymbol(theEnv);
+
+   return rv;
+  }
+
+/*************************************************************************/
+/* AdjustFieldPosition: Given a list of multifield markers and the index */
+/*   to a variable in a slot, this function computes the index to the    */
+/*   field in the slot where the variable begins. In the case of         */
+/*   multifield variables, it also computes the extent (or length) of    */
+/*   the multifield. Note that the extent should be given a default      */
+/*   value of either -1 or 1 for variables other than multifield         */
+/*   variables before calling this routine.  An extent of -1 for these   */
+/*   variables will distinguish their extent as being different when it  */
+/*   is necessary to note their difference from a multifield variable    */
+/*   with an extent of 1. For example, given the slot pattern            */
+/*   (data $?x c $?y ?z) and the slot value (data a b c d e f x), the    */
+/*   actual index in the fact for the 5th item in the pattern (the       */
+/*   variable ?z) would be 8 since $?x binds to 2 fields and $?y binds   */
+/*   to 3 fields.                                                        */
+/*************************************************************************/
+size_t AdjustFieldPosition(
+  Environment *theEnv,
+  struct multifieldMarker *markList,
+  unsigned short whichField,
+  unsigned short whichSlot,
+  size_t *extent)
+  {
+   size_t actualIndex;
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   actualIndex = whichField;
+   for (;
+        markList != NULL;
+        markList = markList->next)
+     {
+      /*===============================================*/
+      /* Skip over multifield markers for other slots. */
+      /*===============================================*/
+
+      if (markList->where.whichSlotNumber != whichSlot) continue;
+
+      /*=========================================================*/
+      /* If the multifield marker occurs exactly at the field in */
+      /* question, then the actual index needs to be adjusted    */
+      /* and the extent needs to be computed since the value is  */
+      /* a multifield value.                                     */
+      /*=========================================================*/
+
+      if (markList->whichField == whichField)
+        {
+         *extent = markList->range;
+         return actualIndex;
+        }
+
+      /*=====================================================*/
+      /* Otherwise if the multifield marker occurs after the */
+      /* field in question, then the actual index has been   */
+      /* completely computed and can be returned.            */
+      /*=====================================================*/
+
+      else if (markList->whichField > whichField)
+        { return actualIndex; }
+
+      /*==========================================================*/
+      /* Adjust the actual index to the field based on the number */
+      /* of fields taken up by the preceding multifield variable. */
+      /*==========================================================*/
+
+      actualIndex = actualIndex + markList->range - 1;
+     }
+
+   /*=======================================*/
+   /* Return the actual index to the field. */
+   /*=======================================*/
+
+   return actualIndex;
+  }
+
+/*****************************************************/
+/* FactStoreMultifield: This primitive is used by a  */
+/*   number of multifield functions for grouping a   */
+/*   series of valuesinto a single multifield value. */
+/*****************************************************/
+bool FactStoreMultifield(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+#if MAC_XCD
+#pragma unused(theValue)
+#endif
+
+   StoreInMultifield(theEnv,theResult,GetFirstArgument(),false);
+   return true;
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT */
+
diff --git a/clips/factrete.h b/clips/factrete.h
new file mode 100755
index 000000000..3d05c1d00
--- /dev/null
+++ b/clips/factrete.h
@@ -0,0 +1,70 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*        FACT RETE ACCESS FUNCTIONS HEADER FILE       */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for hashing optimizations.             */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factrete
+
+#pragma once
+
+#define _H_factrete
+
+#include "evaluatn.h"
+
+   bool                           FactPNGetVar1(Environment *,void *,UDFValue *);
+   bool                           FactPNGetVar2(Environment *,void *,UDFValue *);
+   bool                           FactPNGetVar3(Environment *,void *,UDFValue *);
+   bool                           FactJNGetVar1(Environment *,void *,UDFValue *);
+   bool                           FactJNGetVar2(Environment *,void *,UDFValue *);
+   bool                           FactJNGetVar3(Environment *,void *,UDFValue *);
+   bool                           FactSlotLength(Environment *,void *,UDFValue *);
+   bool                           FactJNCompVars1(Environment *,void *,UDFValue *);
+   bool                           FactJNCompVars2(Environment *,void *,UDFValue *);
+   bool                           FactPNCompVars1(Environment *,void *,UDFValue *);
+   bool                           FactPNConstant1(Environment *,void *,UDFValue *);
+   bool                           FactPNConstant2(Environment *,void *,UDFValue *);
+   bool                           FactStoreMultifield(Environment *,void *,UDFValue *);
+   size_t                         AdjustFieldPosition(Environment *,struct multifieldMarker *,
+                                                      unsigned short,unsigned short,size_t *);
+
+#endif
+
+
diff --git a/clips/factrhs.c b/clips/factrhs.c
new file mode 100755
index 000000000..ae68fdfb5
--- /dev/null
+++ b/clips/factrhs.c
@@ -0,0 +1,667 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*            FACT RHS PATTERN PARSER MODULE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides a number of routines for parsing fact   */
+/*   patterns typically found on the RHS of a rule (such as  */
+/*   the assert command). Also contains some functions for   */
+/*   parsing RHS slot values (used by functions such as      */
+/*   assert, modify, and duplicate).                         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Chris Culbert                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            Increment/DecrementClearReadyLocks API.        */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+#include "bload.h"
+#endif
+
+#include "constant.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "modulutl.h"
+#include "modulpsr.h"
+#include "pattern.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "strngrtr.h"
+#include "tmpltpsr.h"
+#include "tmpltrhs.h"
+#include "tmpltutl.h"
+
+#include "factrhs.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if RUN_TIME || BLOAD_ONLY || BLOAD || BLOAD_AND_BSAVE
+   static void                       NoSuchTemplateError(Environment *,const char *);
+#endif
+
+/**********************************************************************/
+/* BuildRHSAssert: Parses zero or more RHS fact patterns (the format  */
+/*   which is used by the assert command and the deffacts construct). */
+/*   Each of the RHS patterns is attached to an assert command and if */
+/*   there is more than one assert command, then a progn command is   */
+/*   wrapped around all of the assert commands.                       */
+/**********************************************************************/
+struct expr *BuildRHSAssert(
+  Environment *theEnv,
+  const char *logicalName,
+  struct token *theToken,
+  bool *error,
+  bool atLeastOne,
+  bool readFirstParen,
+  const char *whereParsed)
+  {
+   struct expr *lastOne, *nextOne, *assertList, *stub;
+
+   *error = false;
+
+   /*===============================================================*/
+   /* If the first parenthesis of the RHS fact pattern has not been */
+   /* read yet, then get the next token. If a right parenthesis is  */
+   /* encountered then exit (however, set the error return value if */
+   /* at least one fact was expected).                              */
+   /*===============================================================*/
+
+   if (readFirstParen == false)
+     {
+      if (theToken->tknType == RIGHT_PARENTHESIS_TOKEN)
+        {
+         if (atLeastOne)
+           {
+            *error = true;
+            SyntaxErrorMessage(theEnv,whereParsed);
+           }
+         return NULL;
+        }
+     }
+
+   /*================================================*/
+   /* Parse the facts until no more are encountered. */
+   /*================================================*/
+
+   lastOne = assertList = NULL;
+   while ((nextOne = GetRHSPattern(theEnv,logicalName,theToken,
+                                   error,false,readFirstParen,
+                                   true,RIGHT_PARENTHESIS_TOKEN)) != NULL)
+     {
+      PPCRAndIndent(theEnv);
+
+      stub = GenConstant(theEnv,FCALL,FindFunction(theEnv,"assert"));
+      stub->argList = nextOne;
+      nextOne = stub;
+
+      if (lastOne == NULL)
+        { assertList = nextOne; }
+      else
+        { lastOne->nextArg = nextOne; }
+      lastOne = nextOne;
+
+      readFirstParen = true;
+     }
+
+   /*======================================================*/
+   /* If an error was detected while parsing, then return. */
+   /*======================================================*/
+
+   if (*error)
+     {
+      ReturnExpression(theEnv,assertList);
+      return NULL;
+     }
+
+   /*======================================*/
+   /* Fix the pretty print representation. */
+   /*======================================*/
+
+   if (theToken->tknType == RIGHT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+     }
+
+   /*==============================================================*/
+   /* If no facts are being asserted then return NULL. In addition */
+   /* if at least one fact was required, then signal an error.     */
+   /*==============================================================*/
+
+   if (assertList == NULL)
+     {
+      if (atLeastOne)
+        {
+         *error = true;
+         SyntaxErrorMessage(theEnv,whereParsed);
+        }
+
+      return NULL;
+     }
+
+   /*===============================================*/
+   /* If more than one fact is being asserted, then */
+   /* wrap the assert commands within a progn call. */
+   /*===============================================*/
+
+   if (assertList->nextArg != NULL)
+     {
+      stub = GenConstant(theEnv,FCALL,FindFunction(theEnv,"progn"));
+      stub->argList = assertList;
+      assertList = stub;
+     }
+
+   /*==========================================================*/
+   /* Return the expression for asserting the specified facts. */
+   /*==========================================================*/
+
+   return assertList;
+  }
+
+/***************************************************************/
+/* GetRHSPattern: Parses a single RHS fact pattern. The return */
+/*   value is the fact just parsed (or NULL if the delimiter   */
+/*   for no more facts is the first token parsed). If an error */
+/*   occurs, then the error flag passed as an argument is set. */
+/***************************************************************/
+struct expr *GetRHSPattern(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *tempToken,
+  bool *error,
+  bool constantsOnly,
+  bool readFirstParen,
+  bool checkFirstParen,
+  TokenType endType)
+  {
+   struct expr *lastOne = NULL;
+   struct expr *nextOne, *firstOne, *argHead = NULL;
+   bool printError;
+   unsigned int count;
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *templateName;
+   const char *nullBitMap = "\0";
+
+   /*=================================================*/
+   /* Get the opening parenthesis of the RHS pattern. */
+   /*=================================================*/
+
+   *error = false;
+
+   if (readFirstParen) GetToken(theEnv,readSource,tempToken);
+
+   if (checkFirstParen)
+     {
+      if (tempToken->tknType == endType) return NULL;
+
+      if (tempToken->tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"RHS patterns");
+         *error = true;
+         return NULL;
+        }
+     }
+
+   /*======================================================*/
+   /* The first field of an asserted fact must be a symbol */
+   /* (but not = or : which have special significance).    */
+   /*======================================================*/
+
+   GetToken(theEnv,readSource,tempToken);
+   if (tempToken->tknType != SYMBOL_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"first field of a RHS pattern");
+      *error = true;
+      return NULL;
+     }
+   else if ((strcmp(tempToken->lexemeValue->contents,"=") == 0) ||
+            (strcmp(tempToken->lexemeValue->contents,":") == 0))
+     {
+      SyntaxErrorMessage(theEnv,"first field of a RHS pattern");
+      *error = true;
+      return NULL;
+     }
+
+   /*=========================================================*/
+   /* Check to see if the relation name is a reserved symbol. */
+   /*=========================================================*/
+
+   templateName = (CLIPSLexeme *) tempToken->value;
+
+   if (ReservedPatternSymbol(theEnv,templateName->contents,NULL))
+     {
+      ReservedPatternSymbolErrorMsg(theEnv,templateName->contents,"a relation name");
+      *error = true;
+      return NULL;
+     }
+
+   /*============================================================*/
+   /* A module separator in the name is illegal in this context. */
+   /*============================================================*/
+
+   if (FindModuleSeparator(templateName->contents))
+     {
+      IllegalModuleSpecifierMessage(theEnv);
+
+      *error = true;
+      return NULL;
+     }
+
+   /*=============================================================*/
+   /* Determine if there is an associated deftemplate. If so, let */
+   /* the deftemplate parsing functions parse the RHS pattern and */
+   /* then return the fact pattern that was parsed.               */
+   /*=============================================================*/
+
+   theDeftemplate = (Deftemplate *)
+                    FindImportedConstruct(theEnv,"deftemplate",NULL,templateName->contents,
+                                          &count,true,NULL);
+
+   if (count > 1)
+     {
+      AmbiguousReferenceErrorMessage(theEnv,"deftemplate",templateName->contents);
+      *error = true;
+      return NULL;
+     }
+
+   /*======================================================*/
+   /* If no deftemplate exists with the specified relation */
+   /* name, then create an implied deftemplate.            */
+   /*======================================================*/
+
+   if (theDeftemplate == NULL)
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+     {
+#if BLOAD || BLOAD_AND_BSAVE
+      if ((Bloaded(theEnv)) && (! ConstructData(theEnv)->CheckSyntaxMode))
+        {
+         NoSuchTemplateError(theEnv,templateName->contents);
+         *error = true;
+         return NULL;
+        }
+#endif
+#if DEFMODULE_CONSTRUCT
+      if (FindImportExportConflict(theEnv,"deftemplate",GetCurrentModule(theEnv),templateName->contents))
+        {
+         ImportExportConflictMessage(theEnv,"implied deftemplate",templateName->contents,NULL,NULL);
+         *error = true;
+         return NULL;
+        }
+#endif
+      if (! ConstructData(theEnv)->CheckSyntaxMode)
+        { theDeftemplate = CreateImpliedDeftemplate(theEnv,templateName,true); }
+     }
+#else
+    {
+     NoSuchTemplateError(theEnv,templateName->contents);
+     *error = true;
+     return NULL;
+    }
+#endif
+
+   /*=========================================*/
+   /* If an explicit deftemplate exists, then */
+   /* parse the fact as a deftemplate fact.   */
+   /*=========================================*/
+
+   if ((theDeftemplate != NULL) && (theDeftemplate->implied == false))
+     {
+      firstOne = GenConstant(theEnv,DEFTEMPLATE_PTR,theDeftemplate);
+      firstOne->nextArg = ParseAssertTemplate(theEnv,readSource,tempToken,
+                                              error,endType,
+                                              constantsOnly,theDeftemplate);
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      if (! ConstructData(theEnv)->ParsingConstruct)
+        { ConstructData(theEnv)->DanglingConstructs++; }
+#endif
+
+      if (*error)
+        {
+         ReturnExpression(theEnv,firstOne);
+         firstOne = NULL;
+        }
+
+      return(firstOne);
+     }
+
+   /*========================================*/
+   /* Parse the fact as an ordered RHS fact. */
+   /*========================================*/
+
+   firstOne = GenConstant(theEnv,DEFTEMPLATE_PTR,theDeftemplate);
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   if (! ConstructData(theEnv)->ParsingConstruct)
+     { ConstructData(theEnv)->DanglingConstructs++; }
+#endif
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   SavePPBuffer(theEnv," ");
+#endif
+
+   while ((nextOne = GetAssertArgument(theEnv,readSource,tempToken,
+                                        error,endType,constantsOnly,&printError)) != NULL)
+     {
+      if (argHead == NULL) argHead = nextOne;
+      else lastOne->nextArg = nextOne;
+      lastOne = nextOne;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      SavePPBuffer(theEnv," ");
+#endif
+     }
+
+   /*===========================================================*/
+   /* If an error occurred, set the error flag and return NULL. */
+   /*===========================================================*/
+
+   if (*error)
+     {
+      if (printError) SyntaxErrorMessage(theEnv,"RHS patterns");
+      ReturnExpression(theEnv,firstOne);
+      ReturnExpression(theEnv,argHead);
+      return NULL;
+     }
+
+   /*=====================================*/
+   /* Fix the pretty print representation */
+   /* of the RHS ordered fact.            */
+   /*=====================================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,tempToken->printForm);
+#endif
+
+   /*==========================================================*/
+   /* Ordered fact assertions are processed by stuffing all of */
+   /* the fact's proposition (except the relation name) into a */
+   /* single multifield slot.                                  */
+   /*==========================================================*/
+
+   firstOne->nextArg = GenConstant(theEnv,FACT_STORE_MULTIFIELD,AddBitMap(theEnv,(void *) nullBitMap,1));
+   firstOne->nextArg->argList = argHead;
+
+   /*==============================*/
+   /* Return the RHS ordered fact. */
+   /*==============================*/
+
+   return(firstOne);
+  }
+
+/********************************************************************/
+/* GetAssertArgument: Parses a single RHS slot value and returns an */
+/*   expression representing the value. When parsing a deftemplate  */
+/*   slot, the slot name has already been parsed when this function */
+/*   is called. NULL is returned if a slot or fact delimiter is     */
+/*   encountered. In the event of a parse error, the error flag     */
+/*   passed as an argument is set.                                  */
+/********************************************************************/
+struct expr *GetAssertArgument(
+  Environment *theEnv,
+  const char *logicalName,
+  struct token *theToken,
+  bool *error,
+  TokenType endType,
+  bool constantsOnly,
+  bool *printError)
+  {
+#if ! RUN_TIME
+   struct expr *nextField;
+#else
+   struct expr *nextField = NULL;
+#endif
+
+   /*=================================================*/
+   /* Read in the first token of the slot's value. If */
+   /* the end delimiter is encountered, then return.  */
+   /*=================================================*/
+
+   *printError = true;
+   GetToken(theEnv,logicalName,theToken);
+   if (theToken->tknType == endType) return NULL;
+
+   /*=============================================================*/
+   /* If an equal sign of left parenthesis was parsed, then parse */
+   /* a function which is to be evaluated to determine the slot's */
+   /* value. The equal sign corresponds to the return value       */
+   /* constraint which can be used in LHS fact patterns. The      */
+   /* equal sign is no longer necessary on either the LHS or RHS  */
+   /* of a rule to indicate that a function is being evaluated to */
+   /* determine its value either for assignment or pattern        */
+   /* matching.                                                   */
+   /*=============================================================*/
+
+   if ((theToken->tknType == SYMBOL_TOKEN) ?
+       (strcmp(theToken->lexemeValue->contents,"=") == 0) :
+       (theToken->tknType == LEFT_PARENTHESIS_TOKEN))
+     {
+      if (constantsOnly)
+        {
+         *error = true;
+         return NULL;
+        }
+
+#if ! RUN_TIME
+      if (theToken->tknType == LEFT_PARENTHESIS_TOKEN) nextField = Function1Parse(theEnv,logicalName);
+      else nextField = Function0Parse(theEnv,logicalName);
+      if (nextField == NULL)
+#endif
+        {
+         *printError = false;
+         *error = true;
+        }
+#if ! RUN_TIME
+      else
+        {
+         theToken->tknType= RIGHT_PARENTHESIS_TOKEN;
+         theToken->value = CreateString(theEnv,")");
+         theToken->printForm = ")";
+        }
+#endif
+
+      return(nextField);
+     }
+
+   /*==================================================*/
+   /* Constants are always allowed as RHS slot values. */
+   /*==================================================*/
+
+   if ((theToken->tknType == SYMBOL_TOKEN) || (theToken->tknType == STRING_TOKEN) ||
+#if OBJECT_SYSTEM
+           (theToken->tknType == INSTANCE_NAME_TOKEN) ||
+#endif
+           (theToken->tknType == FLOAT_TOKEN) || (theToken->tknType == INTEGER_TOKEN))
+     { return(GenConstant(theEnv,TokenTypeToType(theToken->tknType),theToken->value)); }
+
+   /*========================================*/
+   /* Variables are also allowed as RHS slot */
+   /* values under some circumstances.       */
+   /*========================================*/
+
+   if ((theToken->tknType == SF_VARIABLE_TOKEN) ||
+#if DEFGLOBAL_CONSTRUCT
+            (theToken->tknType == GBL_VARIABLE_TOKEN) ||
+            (theToken->tknType == MF_GBL_VARIABLE_TOKEN) ||
+#endif
+            (theToken->tknType == MF_VARIABLE_TOKEN))
+     {
+      if (constantsOnly)
+        {
+         *error = true;
+         return NULL;
+        }
+
+      return(GenConstant(theEnv,TokenTypeToType(theToken->tknType),theToken->value));
+     }
+
+   /*==========================================================*/
+   /* If none of the other cases have been satisfied, then the */
+   /* token parsed is not appropriate for a RHS slot value.    */
+   /*==========================================================*/
+
+   *error = true;
+   return NULL;
+  }
+
+/****************************************************/
+/* StringToFact: Converts the string representation */
+/*   of a fact to a fact data structure.            */
+/****************************************************/
+Fact *StringToFact(
+  Environment *theEnv,
+  const char *str)
+  {
+   struct token theToken;
+   Fact *factPtr;
+   unsigned numberOfFields = 0, whichField;
+   struct expr *assertArgs, *tempPtr;
+   bool error = false;
+   UDFValue theResult;
+
+   /*=========================================*/
+   /* Open a string router and parse the fact */
+   /* using the router as an input source.    */
+   /*=========================================*/
+
+   SetEvaluationError(theEnv,false);
+
+   OpenStringSource(theEnv,"assert_str",str,0);
+
+   assertArgs = GetRHSPattern(theEnv,"assert_str",&theToken,
+                              &error,false,true,
+                              true,RIGHT_PARENTHESIS_TOKEN);
+
+   CloseStringSource(theEnv,"assert_str");
+
+   /*===========================================*/
+   /* Check for errors or the use of variables. */
+   /*===========================================*/
+
+   if ((assertArgs == NULL) && (! error))
+     {
+      SyntaxErrorMessage(theEnv,"RHS patterns");
+      ReturnExpression(theEnv,assertArgs);
+      return NULL;
+     }
+
+   if (error)
+     {
+      ReturnExpression(theEnv,assertArgs);
+      return NULL;
+     }
+
+   if (ExpressionContainsVariables(assertArgs,false))
+     {
+      LocalVariableErrorMessage(theEnv,"the assert-string function");
+      SetEvaluationError(theEnv,true);
+      ReturnExpression(theEnv,assertArgs);
+      return NULL;
+     }
+
+   /*=======================================================*/
+   /* Count the number of fields needed for the fact and    */
+   /* create a fact data structure of the appropriate size. */
+   /*=======================================================*/
+
+   for (tempPtr = assertArgs->nextArg; tempPtr != NULL; tempPtr = tempPtr->nextArg)
+     { numberOfFields++; }
+
+   factPtr = CreateFactBySize(theEnv,numberOfFields);
+   factPtr->whichDeftemplate = (Deftemplate *) assertArgs->value;
+
+   /*=============================================*/
+   /* Copy the fields to the fact data structure. */
+   /*=============================================*/
+
+   IncrementClearReadyLocks(theEnv);
+   ExpressionInstall(theEnv,assertArgs); /* DR0836 */
+   whichField = 0;
+   for (tempPtr = assertArgs->nextArg; tempPtr != NULL; tempPtr = tempPtr->nextArg)
+     {
+      EvaluateExpression(theEnv,tempPtr,&theResult);
+      factPtr->theProposition.contents[whichField].value = theResult.value;
+      whichField++;
+     }
+   ExpressionDeinstall(theEnv,assertArgs); /* DR0836 */
+   ReturnExpression(theEnv,assertArgs);
+   DecrementClearReadyLocks(theEnv);
+
+   /*==================*/
+   /* Return the fact. */
+   /*==================*/
+
+   return(factPtr);
+  }
+
+#if RUN_TIME || BLOAD_ONLY || BLOAD || BLOAD_AND_BSAVE
+
+/*********************************************************/
+/* NoSuchTemplateError: Prints out an error message      */
+/* in a BLOAD_ONLY, RUN_TIME or bload active environment */
+/* when an implied deftemplate cannot be created for     */
+/* an assert                                             */
+/*********************************************************/
+static void NoSuchTemplateError(
+  Environment *theEnv,
+  const char *templateName)
+  {
+   PrintErrorID(theEnv,"FACTRHS",1,false);
+   WriteString(theEnv,STDERR,"Implied deftemplate '");
+   WriteString(theEnv,STDERR,templateName);
+   WriteString(theEnv,STDERR,"' cannot be created with binary load in effect.\n");
+  }
+
+#endif /* RUN_TIME || BLOAD_ONLY || BLOAD || BLOAD_AND_BSAVE */
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
+
diff --git a/clips/factrhs.h b/clips/factrhs.h
new file mode 100755
index 000000000..8dc2c8b6b
--- /dev/null
+++ b/clips/factrhs.h
@@ -0,0 +1,55 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*        FACT RHS PATTERN PARSER HEADER MODULE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            Increment/DecrementClearReadyLocks API.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_factrhs
+
+#pragma once
+
+#define _H_factrhs
+
+#include "expressn.h"
+#include "factmngr.h"
+#include "scanner.h"
+#include "symbol.h"
+
+   struct expr                   *BuildRHSAssert(Environment *,const char *,struct token *,bool *,bool,bool,const char *);
+   struct expr                   *GetAssertArgument(Environment *,const char *,struct token *,bool *,TokenType,bool,bool *);
+   struct expr                   *GetRHSPattern(Environment*,const char *,struct token *,bool *,bool,
+                                                       bool,bool,TokenType);
+   Fact                          *StringToFact(Environment *,const char *);
+
+#endif /* _H_factrhs */
+
diff --git a/clips/filecom.c b/clips/filecom.c
new file mode 100755
index 000000000..1f1e47148
--- /dev/null
+++ b/clips/filecom.c
@@ -0,0 +1,353 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/24/17            */
+   /*                                                     */
+   /*                 FILE COMMANDS MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for file commands including    */
+/*   batch, dribble-on, dribble-off, save, load, bsave, and  */
+/*   bload.                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Bebe Ly                                              */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added code for capturing errors/warnings.      */
+/*                                                           */
+/*            Added AwaitingInput flag.                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*            Added STDOUT and STDIN logical name            */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.31: Unprocessed batch files did not deallocate     */
+/*            all memory on exit.                            */
+/*                                                           */
+/*      6.40: Split inputSource to fileSource and            */
+/*            logicalSource.                                 */
+/*                                                           */
+/*            Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Changed return values for router functions.    */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#include "bsave.h"
+#endif
+#include "commline.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "fileutil.h"
+#include "memalloc.h"
+#include "router.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "filecom.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    DeallocateFileCommandData(Environment *);
+
+/***************************************/
+/* FileCommandDefinitions: Initializes */
+/*   file commands.                    */
+/***************************************/
+void FileCommandDefinitions(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,FILECOM_DATA,sizeof(struct fileCommandData),DeallocateFileCommandData);
+
+#if ! RUN_TIME
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"batch","b",1,1,"sy",BatchCommand,"BatchCommand",NULL);
+   AddUDF(theEnv,"batch*","b",1,1,"sy",BatchStarCommand,"BatchStarCommand",NULL);
+   AddUDF(theEnv,"dribble-on","b",1,1,"sy",DribbleOnCommand,"DribbleOnCommand",NULL);
+   AddUDF(theEnv,"dribble-off","b",0,0,NULL,DribbleOffCommand,"DribbleOffCommand",NULL);
+   AddUDF(theEnv,"save","b",1,1,"sy",SaveCommand,"SaveCommand",NULL);
+#endif
+   AddUDF(theEnv,"load","b",1,1,"sy",LoadCommand,"LoadCommand",NULL);
+   AddUDF(theEnv,"load*","b",1,1,"sy",LoadStarCommand,"LoadStarCommand",NULL);
+#if BLOAD_AND_BSAVE
+   AddUDF(theEnv,"bsave","b",1,1,"sy",BsaveCommand,"BsaveCommand",NULL);
+#endif
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+   InitializeBsaveData(theEnv);
+   InitializeBloadData(theEnv);
+   AddUDF(theEnv,"bload","b",1,1,"sy",BloadCommand,"BloadCommand",NULL);
+#endif
+#endif
+  }
+
+/******************************************************/
+/* DeallocateFileCommandData: Deallocates environment */
+/*    data for file commands.                         */
+/******************************************************/
+static void DeallocateFileCommandData(
+  Environment *theEnv)
+  {
+   struct batchEntry *theEntry, *nextEntry;
+
+   theEntry = FileCommandData(theEnv)->TopOfBatchList;
+   while (theEntry != NULL)
+     {
+      nextEntry = theEntry->next;
+
+      if (theEntry->batchType == FILE_BATCH)
+        { GenClose(theEnv,FileCommandData(theEnv)->TopOfBatchList->fileSource); }
+      else
+        { rm(theEnv,(void *) theEntry->theString,strlen(theEntry->theString) + 1); }
+
+      DeleteString(theEnv,(char *) theEntry->fileName);
+      DeleteString(theEnv,(char *) theEntry->logicalSource);
+      rtn_struct(theEnv,batchEntry,theEntry);
+
+      theEntry = nextEntry;
+     }
+
+   if (FileCommandData(theEnv)->BatchBuffer != NULL)
+     { rm(theEnv,FileCommandData(theEnv)->BatchBuffer,FileCommandData(theEnv)->BatchMaximumPosition); }
+
+   DeleteString(theEnv,FileCommandData(theEnv)->batchPriorParsingFile);
+   FileCommandData(theEnv)->batchPriorParsingFile = NULL;
+
+#if DEBUGGING_FUNCTIONS
+   if (FileCommandData(theEnv)->DribbleBuffer != NULL)
+     { rm(theEnv,FileCommandData(theEnv)->DribbleBuffer,FileCommandData(theEnv)->DribbleMaximumPosition); }
+
+   if (FileCommandData(theEnv)->DribbleFP != NULL)
+     { GenClose(theEnv,FileCommandData(theEnv)->DribbleFP); }
+#endif
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/******************************************/
+/* DribbleOnCommand: H/L access routine   */
+/*   for the dribble-on command.          */
+/******************************************/
+void DribbleOnCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileName;
+
+   if ((fileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,DribbleOn(theEnv,fileName));
+  }
+
+/*******************************************/
+/* DribbleOffCommand: H/L access  routine  */
+/*   for the dribble-off command.          */
+/*******************************************/
+void DribbleOffCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateBoolean(theEnv,DribbleOff(theEnv));
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/**************************************/
+/* BatchCommand: H/L access routine   */
+/*   for the batch command.           */
+/**************************************/
+void BatchCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileName;
+
+   if ((fileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,OpenBatch(theEnv,fileName,false));
+  }
+
+/******************************************/
+/* BatchStarCommand: H/L access routine   */
+/*   for the batch* command.              */
+/******************************************/
+void BatchStarCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileName;
+
+   if ((fileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,BatchStar(theEnv,fileName));
+  }
+
+/***********************************************************/
+/* LoadCommand: H/L access routine for the load command.   */
+/***********************************************************/
+void LoadCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   const char *theFileName;
+   LoadError rv;
+
+   if ((theFileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if (CommandLineData(theEnv)->EvaluatingTopLevelCommand)
+     { SetPrintWhileLoading(theEnv,true); }
+
+   if ((rv = Load(theEnv,theFileName)) == LE_OPEN_FILE_ERROR)
+     {
+      SetPrintWhileLoading(theEnv,false);
+      OpenErrorMessage(theEnv,"load",theFileName);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if (CommandLineData(theEnv)->EvaluatingTopLevelCommand)
+     { SetPrintWhileLoading(theEnv,false); }
+
+   if (rv == LE_PARSING_ERROR) returnValue->lexemeValue = FalseSymbol(theEnv);
+   else returnValue->lexemeValue = TrueSymbol(theEnv);
+#else
+   WriteString(theEnv,STDOUT,"Load is not available in this environment\n");
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+#endif
+  }
+
+/****************************************************************/
+/* LoadStarCommand: H/L access routine for the load* command.   */
+/****************************************************************/
+void LoadStarCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   const char *theFileName;
+   LoadError rv;
+
+   if ((theFileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if ((rv = Load(theEnv,theFileName)) == LE_OPEN_FILE_ERROR)
+     {
+      OpenErrorMessage(theEnv,"load*",theFileName);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if (rv == LE_PARSING_ERROR) returnValue->lexemeValue = FalseSymbol(theEnv);
+   else returnValue->lexemeValue = TrueSymbol(theEnv);
+#else
+   WriteString(theEnv,STDOUT,"Load* is not available in this environment\n");
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+#endif
+  }
+
+#if DEBUGGING_FUNCTIONS
+/*********************************************************/
+/* SaveCommand: H/L access routine for the save command. */
+/*********************************************************/
+void SaveCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   const char *theFileName;
+
+   if ((theFileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if (Save(theEnv,theFileName) == false)
+     {
+      OpenErrorMessage(theEnv,"save",theFileName);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+#else
+   WriteString(theEnv,STDOUT,"Save is not available in this environment\n");
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+#endif
+  }
+#endif
diff --git a/clips/filecom.h b/clips/filecom.h
new file mode 100755
index 000000000..02ceea07f
--- /dev/null
+++ b/clips/filecom.h
@@ -0,0 +1,133 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*              FILE COMMANDS HEADER FILE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for file commands including    */
+/*   batch, dribble-on, dribble-off, save, load, bsave, and  */
+/*   bload.                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added code for capturing errors/warnings.      */
+/*                                                           */
+/*            Added AwaitingInput flag.                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_filecom
+
+#pragma once
+
+#define _H_filecom
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "entities.h"
+
+typedef struct batchEntry BatchEntry;
+
+/***************/
+/* STRUCTURES  */
+/***************/
+
+struct batchEntry
+  {
+   int batchType;
+   FILE *fileSource;
+   const char *logicalSource;
+   const char *theString;
+   const char *fileName;
+   long lineNumber;
+   BatchEntry *next;
+  };
+
+/***************/
+/* DEFINITIONS */
+/***************/
+
+#define FILE_BATCH      0
+#define STRING_BATCH    1
+
+#define BUFFER_SIZE   120
+
+#define FILECOM_DATA 14
+
+struct fileCommandData
+  {
+#if DEBUGGING_FUNCTIONS
+   FILE *DribbleFP;
+   char *DribbleBuffer;
+   size_t DribbleCurrentPosition;
+   size_t DribbleMaximumPosition;
+   int (*DribbleStatusFunction)(Environment *,bool);
+#endif
+   int BatchType;
+   FILE *BatchFileSource;
+   const char *BatchLogicalSource;
+   char *BatchBuffer;
+   size_t BatchCurrentPosition;
+   size_t BatchMaximumPosition;
+   BatchEntry *TopOfBatchList;
+   BatchEntry *BottomOfBatchList;
+   char *batchPriorParsingFile;
+  };
+
+#define FileCommandData(theEnv) ((struct fileCommandData *) GetEnvironmentData(theEnv,FILECOM_DATA))
+
+   void                           FileCommandDefinitions(Environment *);
+   void                           BatchCommand(Environment *,UDFContext *,UDFValue *);
+   void                           BatchStarCommand(Environment *,UDFContext *,UDFValue *);
+   void                           LoadCommand(Environment *,UDFContext *,UDFValue *);
+   void                           LoadStarCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SaveCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DribbleOnCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DribbleOffCommand(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_filecom */
+
+
+
+
+
+
diff --git a/clips/filertr.c b/clips/filertr.c
new file mode 100755
index 000000000..e8c2ecc3a
--- /dev/null
+++ b/clips/filertr.c
@@ -0,0 +1,481 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/19/17             */
+   /*                                                     */
+   /*               FILE I/O ROUTER MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: I/O Router routines which allow files to be used */
+/*   as input and output sources.                            */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Added pragmas to remove compilation warnings.  */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Used gengetc and genungetchar rather than      */
+/*            getc and ungetc.                               */
+/*                                                           */
+/*            Replaced BASIC_IO and ADVANCED_IO compiler     */
+/*            flags with the single IO_FUNCTIONS compiler    */
+/*            flag.                                          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Added STDOUT and STDIN logical name            */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.31: Output to logical WERROR is now sent to stderr */
+/*            rather than stdout.                            */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Changed return values for router functions.    */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Added flush, rewind, tell, and seek functions. */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "router.h"
+#include "sysdep.h"
+
+#include "filertr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ExitFileCallback(Environment *,int,void *);
+   static void                    WriteFileCallback(Environment *,const char *,const char *,void *);
+   static int                     ReadFileCallback(Environment *,const char *,void *);
+   static int                     UnreadFileCallback(Environment *,const char *,int,void *);
+   static void                    DeallocateFileRouterData(Environment *);
+
+/***************************************************************/
+/* InitializeFileRouter: Initializes file input/output router. */
+/***************************************************************/
+void InitializeFileRouter(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,FILE_ROUTER_DATA,sizeof(struct fileRouterData),DeallocateFileRouterData);
+
+   AddRouter(theEnv,"fileio",0,FindFile,
+             WriteFileCallback,ReadFileCallback,
+             UnreadFileCallback,ExitFileCallback,NULL);
+  }
+
+/*****************************************/
+/* DeallocateFileRouterData: Deallocates */
+/*    environment data for file routers. */
+/*****************************************/
+static void DeallocateFileRouterData(
+  Environment *theEnv)
+  {
+   struct fileRouter *tmpPtr, *nextPtr;
+
+   tmpPtr = FileRouterData(theEnv)->ListOfFileRouters;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      GenClose(theEnv,tmpPtr->stream);
+      rm(theEnv,(void *) tmpPtr->logicalName,strlen(tmpPtr->logicalName) + 1);
+      rtn_struct(theEnv,fileRouter,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/*****************************************/
+/* FindFptr: Returns a pointer to a file */
+/*   stream for a given logical name.    */
+/*****************************************/
+FILE *FindFptr(
+  Environment *theEnv,
+  const char *logicalName)
+  {
+   struct fileRouter *fptr;
+
+   /*========================================================*/
+   /* Check to see if standard input or output is requested. */
+   /*========================================================*/
+
+   if (strcmp(logicalName,STDOUT) == 0)
+     { return stdout; }
+   else if (strcmp(logicalName,STDIN) == 0)
+     { return stdin;  }
+   else if (strcmp(logicalName,STDERR) == 0)
+     { return stderr; }
+   else if (strcmp(logicalName,STDWRN) == 0)
+     { return stdout; }
+
+   /*==============================================================*/
+   /* Otherwise, look up the logical name on the global file list. */
+   /*==============================================================*/
+
+   fptr = FileRouterData(theEnv)->ListOfFileRouters;
+   while ((fptr != NULL) ? (strcmp(logicalName,fptr->logicalName) != 0) : false)
+     { fptr = fptr->next; }
+
+   if (fptr != NULL) return fptr->stream;
+
+   return NULL;
+  }
+
+/*****************************************************/
+/* FindFile: Find routine for file router logical    */
+/*   names. Returns true if the specified logical    */
+/*   name has an associated file stream (which means */
+/*   that the logical name can be handled by the     */
+/*   file router). Otherwise, false is returned.     */
+/*****************************************************/
+bool FindFile(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+   if (FindFptr(theEnv,logicalName) != NULL) return true;
+
+   return false;
+  }
+
+/***************************************************/
+/* ExitFileCallback: Exit routine for file router. */
+/***************************************************/
+static void ExitFileCallback(
+  Environment *theEnv,
+  int num,
+  void *context)
+  {
+#if MAC_XCD
+#pragma unused(num)
+#endif
+#if IO_FUNCTIONS
+   CloseAllFiles(theEnv);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+/******************************************************/
+/* WriteFileCallback: Write callback for file router. */
+/******************************************************/
+static void WriteFileCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *str,
+  void *context)
+  {
+   FILE *fptr;
+
+   fptr = FindFptr(theEnv,logicalName);
+
+   genprintfile(theEnv,fptr,str);
+  }
+
+/****************************************************/
+/* ReadFileCallback: Read callback for file router. */
+/****************************************************/
+static int ReadFileCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+   FILE *fptr;
+   int theChar;
+
+   fptr = FindFptr(theEnv,logicalName);
+
+   if (fptr == stdin)
+     { theChar = gengetchar(theEnv); }
+   else
+     { theChar = getc(fptr); }
+
+   /*=================================================*/
+   /* The following code prevents Control-D on UNIX   */
+   /* machines from terminating all input from stdin. */
+   /*=================================================*/
+
+   if ((fptr == stdin) && (theChar == EOF)) clearerr(stdin);
+
+   return theChar;
+  }
+
+/********************************************************/
+/* UnreadFileCallback: Unread callback for file router. */
+/********************************************************/
+static int UnreadFileCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  int ch,
+  void *context)
+  {
+   FILE *fptr;
+
+   fptr = FindFptr(theEnv,logicalName);
+
+   if (fptr == stdin)
+     { return genungetchar(theEnv,ch); }
+   else
+     { return ungetc(ch,fptr); }
+  }
+
+/*********************************************************/
+/* OpenFile: Opens a file with the specified access mode */
+/*   and stores the opened stream on the list of files   */
+/*   associated with logical names Returns true if the   */
+/*   file was succesfully opened, otherwise false.       */
+/*********************************************************/
+bool OpenAFile(
+  Environment *theEnv,
+  const char *fileName,
+  const char *accessMode,
+  const char *logicalName)
+  {
+   FILE *newstream;
+   struct fileRouter *newRouter;
+   char *theName;
+
+   /*==================================*/
+   /* Make sure the file can be opened */
+   /* with the specified access mode.  */
+   /*==================================*/
+
+   if ((newstream = GenOpen(theEnv,fileName,accessMode)) == NULL)
+     { return false; }
+
+   /*===========================*/
+   /* Create a new file router. */
+   /*===========================*/
+
+   newRouter = get_struct(theEnv,fileRouter);
+   theName = (char *) gm2(theEnv,strlen(logicalName) + 1);
+   genstrcpy(theName,logicalName);
+   newRouter->logicalName = theName;
+   newRouter->stream = newstream;
+
+   /*==========================================*/
+   /* Add the newly opened file to the list of */
+   /* files associated with logical names.     */
+   /*==========================================*/
+
+   newRouter->next = FileRouterData(theEnv)->ListOfFileRouters;
+   FileRouterData(theEnv)->ListOfFileRouters = newRouter;
+
+   /*==================================*/
+   /* Return true to indicate the file */
+   /* was opened successfully.         */
+   /*==================================*/
+
+   return true;
+  }
+
+/*************************************************************/
+/* CloseFile: Closes the file associated with the specified  */
+/*   logical name. Returns true if the file was successfully */
+/*   closed, otherwise false.                                */
+/*************************************************************/
+bool CloseFile(
+  Environment *theEnv,
+  const char *fid)
+  {
+   struct fileRouter *fptr, *prev;
+
+   for (fptr = FileRouterData(theEnv)->ListOfFileRouters, prev = NULL;
+        fptr != NULL;
+        fptr = fptr->next)
+     {
+      if (strcmp(fptr->logicalName,fid) == 0)
+        {
+         GenClose(theEnv,fptr->stream);
+         rm(theEnv,(void *) fptr->logicalName,strlen(fptr->logicalName) + 1);
+         if (prev == NULL)
+           { FileRouterData(theEnv)->ListOfFileRouters = fptr->next; }
+         else
+           { prev->next = fptr->next; }
+         rm(theEnv,fptr,sizeof(struct fileRouter));
+
+         return true;
+        }
+
+      prev = fptr;
+     }
+
+   return false;
+  }
+
+/**********************************************/
+/* CloseAllFiles: Closes all files associated */
+/*   with a file I/O router. Returns true if  */
+/*   any file was closed, otherwise false.    */
+/**********************************************/
+bool CloseAllFiles(
+  Environment *theEnv)
+  {
+   struct fileRouter *fptr, *prev;
+
+   if (FileRouterData(theEnv)->ListOfFileRouters == NULL) return false;
+
+   fptr = FileRouterData(theEnv)->ListOfFileRouters;
+
+   while (fptr != NULL)
+     {
+      GenClose(theEnv,fptr->stream);
+      prev = fptr;
+      rm(theEnv,(void *) fptr->logicalName,strlen(fptr->logicalName) + 1);
+      fptr = fptr->next;
+      rm(theEnv,prev,sizeof(struct fileRouter));
+     }
+
+   FileRouterData(theEnv)->ListOfFileRouters = NULL;
+
+   return true;
+  }
+
+/*************************************************************/
+/* FlushFile: Flushes the file associated with the specified */
+/*   logical name. Returns true if the file was successfully */
+/*   flushed, otherwise false.                               */
+/*************************************************************/
+bool FlushFile(
+  Environment *theEnv,
+  const char *fid)
+  {
+   struct fileRouter *fptr;
+
+   for (fptr = FileRouterData(theEnv)->ListOfFileRouters;
+        fptr != NULL;
+        fptr = fptr->next)
+     {
+      if (strcmp(fptr->logicalName,fid) == 0)
+        {
+         GenFlush(theEnv,fptr->stream);
+         return true;
+        }
+     }
+
+   return false;
+  }
+
+/***********************************************/
+/* FlushAllFiles: Flushes all files associated */
+/*   with a file I/O router. Returns true if   */
+/*   any file was flushed, otherwise false.    */
+/***********************************************/
+bool FlushAllFiles(
+  Environment *theEnv)
+  {
+   struct fileRouter *fptr;
+
+   if (FileRouterData(theEnv)->ListOfFileRouters == NULL) return false;
+
+   for (fptr = FileRouterData(theEnv)->ListOfFileRouters;
+        fptr != NULL;
+        fptr = fptr->next)
+     { GenFlush(theEnv,fptr->stream); }
+
+   return true;
+  }
+
+/*****************************************************/
+/* RewindFile: Rewinds the file associated with the  */
+/*   specified logical name. Returns true if the     */
+/*   file was successfully rewound, otherwise false. */
+/*****************************************************/
+bool RewindFile(
+  Environment *theEnv,
+  const char *fid)
+  {
+   struct fileRouter *fptr;
+
+   for (fptr = FileRouterData(theEnv)->ListOfFileRouters;
+        fptr != NULL;
+        fptr = fptr->next)
+     {
+      if (strcmp(fptr->logicalName,fid) == 0)
+        {
+         GenRewind(theEnv,fptr->stream);
+         return true;
+        }
+     }
+
+   return false;
+  }
+
+/**************************************************/
+/* TellFile: Returns the file position associated */
+/*   with the specified logical name.             */
+/**************************************************/
+long long TellFile(
+  Environment *theEnv,
+  const char *fid)
+  {
+   struct fileRouter *fptr;
+
+   for (fptr = FileRouterData(theEnv)->ListOfFileRouters;
+        fptr != NULL;
+        fptr = fptr->next)
+     {
+      if (strcmp(fptr->logicalName,fid) == 0)
+        { return GenTell(theEnv,fptr->stream); }
+     }
+
+   return LLONG_MIN;
+  }
+
+/***********************************************/
+/* SeekFile: Sets the file position associated */
+/*   with the specified logical name.          */
+/***********************************************/
+bool SeekFile(
+  Environment *theEnv,
+  const char *fid,
+  long offset,
+  int whereFrom)
+  {
+   struct fileRouter *fptr;
+
+   for (fptr = FileRouterData(theEnv)->ListOfFileRouters;
+        fptr != NULL;
+        fptr = fptr->next)
+     {
+      if (strcmp(fptr->logicalName,fid) == 0)
+        {
+         if (GenSeek(theEnv,fptr->stream,offset,whereFrom))
+           { return false; }
+         else
+           { return true; }
+        }
+     }
+
+   return false;
+  }
+
diff --git a/clips/filertr.h b/clips/filertr.h
new file mode 100755
index 000000000..564b65c91
--- /dev/null
+++ b/clips/filertr.h
@@ -0,0 +1,94 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/19/17            */
+   /*                                                     */
+   /*             FILE I/O ROUTER HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: I/O Router routines which allow files to be used */
+/*   as input and output sources.                            */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Added pragmas to remove compilation warnings.  */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Used gengetc and genungetchar rather than      */
+/*            getc and ungetc.                               */
+/*                                                           */
+/*            Replaced BASIC_IO and ADVANCED_IO compiler     */
+/*            flags with the single IO_FUNCTIONS compiler    */
+/*            flag.                                          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Added flush, rewind, tell, and seek functions. */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_filertr
+
+#pragma once
+
+#define _H_filertr
+
+#include <stdio.h>
+
+#define FILE_ROUTER_DATA 47
+
+struct fileRouter
+  {
+   const char *logicalName;
+   FILE *stream;
+   struct fileRouter *next;
+  };
+
+struct fileRouterData
+  {
+   struct fileRouter *ListOfFileRouters;
+  };
+
+#define FileRouterData(theEnv) ((struct fileRouterData *) GetEnvironmentData(theEnv,FILE_ROUTER_DATA))
+
+   void                           InitializeFileRouter(Environment *);
+   FILE                          *FindFptr(Environment *,const char *);
+   bool                           OpenAFile(Environment *,const char *,const char *,const char *);
+   bool                           CloseAllFiles(Environment *);
+   bool                           CloseFile(Environment *,const char *);
+   bool                           FindFile(Environment *,const char *,void *);
+   bool                           FlushAllFiles(Environment *);
+   bool                           FlushFile(Environment *,const char *);
+   bool                           RewindFile(Environment *,const char *);
+   long long                      TellFile(Environment *,const char *);
+   bool                           SeekFile(Environment *,const char *,long,int);
+
+#endif /* _H_filertr */
+
+
+
+
+
+
diff --git a/clips/fileutil.c b/clips/fileutil.c
new file mode 100755
index 000000000..6a400c07a
--- /dev/null
+++ b/clips/fileutil.c
@@ -0,0 +1,1012 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/19/17            */
+   /*                                                     */
+   /*                 FILE UTILITY MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for file commands including    */
+/*   batch, dribble-on, dribble-off, save, load, bsave, and  */
+/*   bload.                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Bebe Ly                                              */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.31: Fixed error in AppendDribble for older         */
+/*            compilers not allowing variable definition     */
+/*            within for statement.                          */
+/*                                                           */
+/*      6.40: Split from filecom.c                           */
+/*                                                           */
+/*            Fix for the batch* command so that the last    */
+/*            command will execute if there is not a crlf.   */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "commline.h"
+#include "cstrcpsr.h"
+#include "memalloc.h"
+#include "prcdrfun.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+#include "filecom.h"
+#include "utility.h"
+
+#include "fileutil.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if DEBUGGING_FUNCTIONS
+   static bool                    QueryDribbleCallback(Environment *,const char *,void *);
+   static int                     ReadDribbleCallback(Environment *,const char *,void *);
+   static int                     UnreadDribbleCallback(Environment *,const char *,int,void *);
+   static void                    ExitDribbleCallback(Environment *,int,void *);
+   static void                    WriteDribbleCallback(Environment *,const char *,const char *,void *);
+   static void                    PutcDribbleBuffer(Environment *,int);
+#endif
+   static bool                    QueryBatchCallback(Environment *,const char *,void *);
+   static int                     ReadBatchCallback(Environment *,const char *,void *);
+   static int                     UnreadBatchCallback(Environment *,const char *,int,void *);
+   static void                    ExitBatchCallback(Environment *,int,void *);
+   static void                    AddBatch(Environment *,bool,FILE *,const char *,int,const char *,const char *);
+
+#if DEBUGGING_FUNCTIONS
+/****************************************/
+/* QueryDribbleCallback: Query callback */
+/*   for the dribble router.            */
+/****************************************/
+static bool QueryDribbleCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+#if MAC_XCD
+#pragma unused(theEnv,context)
+#endif
+
+   if ( (strcmp(logicalName,STDOUT) == 0) ||
+        (strcmp(logicalName,STDIN) == 0) ||
+        (strcmp(logicalName,STDERR) == 0) ||
+        (strcmp(logicalName,STDWRN) == 0) )
+     { return true; }
+
+    return false;
+  }
+
+/******************/
+/* AppendDribble: */
+/******************/
+void AppendDribble(
+  Environment *theEnv,
+  const char *str)
+  {
+   int i;
+
+   if (! DribbleActive(theEnv)) return;
+   
+   for (i = 0 ; str[i] != EOS ; i++)
+     { PutcDribbleBuffer(theEnv,str[i]); }
+  }
+
+/****************************************/
+/* WriteDribbleCallback: Write callback */
+/*    for the dribble router.           */
+/****************************************/
+static void WriteDribbleCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *str,
+  void *context)
+  {
+   int i;
+
+   /*======================================*/
+   /* Send the output to the dribble file. */
+   /*======================================*/
+
+   for (i = 0 ; str[i] != EOS ; i++)
+     { PutcDribbleBuffer(theEnv,str[i]); }
+
+   /*===========================================================*/
+   /* Send the output to any routers interested in printing it. */
+   /*===========================================================*/
+
+   DeactivateRouter(theEnv,"dribble");
+   WriteString(theEnv,logicalName,str);
+   ActivateRouter(theEnv,"dribble");
+  }
+
+/**************************************/
+/* ReadDribbleCallback: Read callback */
+/*    for the dribble router.         */
+/**************************************/
+static int ReadDribbleCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+   int rv;
+
+   /*===========================================*/
+   /* Deactivate the dribble router and get the */
+   /* character from another active router.     */
+   /*===========================================*/
+
+   DeactivateRouter(theEnv,"dribble");
+   rv = ReadRouter(theEnv,logicalName);
+   ActivateRouter(theEnv,"dribble");
+
+   /*==========================================*/
+   /* Put the character retrieved from another */
+   /* router into the dribble buffer.          */
+   /*==========================================*/
+
+   PutcDribbleBuffer(theEnv,rv);
+
+   /*=======================*/
+   /* Return the character. */
+   /*=======================*/
+
+   return(rv);
+  }
+
+/***********************************************************/
+/* PutcDribbleBuffer: Putc routine for the dribble router. */
+/***********************************************************/
+static void PutcDribbleBuffer(
+  Environment *theEnv,
+  int rv)
+  {
+   /*===================================================*/
+   /* Receiving an end-of-file character will cause the */
+   /* contents of the dribble buffer to be flushed.     */
+   /*===================================================*/
+
+   if (rv == EOF)
+     {
+      if (FileCommandData(theEnv)->DribbleCurrentPosition > 0)
+        {
+         fprintf(FileCommandData(theEnv)->DribbleFP,"%s",FileCommandData(theEnv)->DribbleBuffer);
+         FileCommandData(theEnv)->DribbleCurrentPosition = 0;
+         FileCommandData(theEnv)->DribbleBuffer[0] = EOS;
+        }
+     }
+
+   /*===========================================================*/
+   /* If we aren't receiving command input, then the character  */
+   /* just received doesn't need to be placed in the dribble    */
+   /* buffer--It can be written directly to the file. This will */
+   /* occur for example when the command prompt is being        */
+   /* printed (the AwaitingInput variable will be false because */
+   /* command input has not been receivied yet). Before writing */
+   /* the character to the file, the dribble buffer is flushed. */
+   /*===========================================================*/
+
+   else if (RouterData(theEnv)->AwaitingInput == false)
+     {
+      if (FileCommandData(theEnv)->DribbleCurrentPosition > 0)
+        {
+         fprintf(FileCommandData(theEnv)->DribbleFP,"%s",FileCommandData(theEnv)->DribbleBuffer);
+         FileCommandData(theEnv)->DribbleCurrentPosition = 0;
+         FileCommandData(theEnv)->DribbleBuffer[0] = EOS;
+        }
+
+      fputc(rv,FileCommandData(theEnv)->DribbleFP);
+     }
+
+   /*=====================================================*/
+   /* Otherwise, add the character to the dribble buffer. */
+   /*=====================================================*/
+
+   else
+     {
+      FileCommandData(theEnv)->DribbleBuffer = ExpandStringWithChar(theEnv,rv,FileCommandData(theEnv)->DribbleBuffer,
+                                           &FileCommandData(theEnv)->DribbleCurrentPosition,
+                                           &FileCommandData(theEnv)->DribbleMaximumPosition,
+                                           FileCommandData(theEnv)->DribbleMaximumPosition+BUFFER_SIZE);
+     }
+  }
+
+/******************************************/
+/* UnreadDribbleCallback: Unread callback */
+/*    for the dribble router.             */
+/******************************************/
+static int UnreadDribbleCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  int ch,
+  void *context)
+  {
+   int rv;
+
+   /*===============================================*/
+   /* Remove the character from the dribble buffer. */
+   /*===============================================*/
+
+   if (FileCommandData(theEnv)->DribbleCurrentPosition > 0) FileCommandData(theEnv)->DribbleCurrentPosition--;
+   FileCommandData(theEnv)->DribbleBuffer[FileCommandData(theEnv)->DribbleCurrentPosition] = EOS;
+
+   /*=============================================*/
+   /* Deactivate the dribble router and pass the  */
+   /* ungetc request to the other active routers. */
+   /*=============================================*/
+
+   DeactivateRouter(theEnv,"dribble");
+   rv = UnreadRouter(theEnv,logicalName,ch);
+   ActivateRouter(theEnv,"dribble");
+
+   /*==========================================*/
+   /* Return the result of the ungetc request. */
+   /*==========================================*/
+
+   return(rv);
+  }
+
+/**************************************/
+/* ExitDribbleCallback: Exit callback */
+/*    for the dribble router.         */
+/**************************************/
+static void ExitDribbleCallback(
+  Environment *theEnv,
+  int num,
+  void *context)
+  {
+#if MAC_XCD
+#pragma unused(num)
+#endif
+
+   if (FileCommandData(theEnv)->DribbleCurrentPosition > 0)
+     { fprintf(FileCommandData(theEnv)->DribbleFP,"%s",FileCommandData(theEnv)->DribbleBuffer); }
+
+   if (FileCommandData(theEnv)->DribbleFP != NULL) GenClose(theEnv,FileCommandData(theEnv)->DribbleFP);
+  }
+
+/*********************************/
+/* DribbleOn: C access routine   */
+/*   for the dribble-on command. */
+/*********************************/
+bool DribbleOn(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   /*==============================*/
+   /* If a dribble file is already */
+   /* open, then close it.         */
+   /*==============================*/
+
+   if (FileCommandData(theEnv)->DribbleFP != NULL)
+     { DribbleOff(theEnv); }
+
+   /*========================*/
+   /* Open the dribble file. */
+   /*========================*/
+
+   FileCommandData(theEnv)->DribbleFP = GenOpen(theEnv,fileName,"w");
+   if (FileCommandData(theEnv)->DribbleFP == NULL)
+     {
+      OpenErrorMessage(theEnv,"dribble-on",fileName);
+      return false;
+     }
+
+   /*============================*/
+   /* Create the dribble router. */
+   /*============================*/
+
+   AddRouter(theEnv,"dribble",40,
+             QueryDribbleCallback,WriteDribbleCallback,
+             ReadDribbleCallback,UnreadDribbleCallback,
+             ExitDribbleCallback,NULL);
+
+   FileCommandData(theEnv)->DribbleCurrentPosition = 0;
+
+   /*================================================*/
+   /* Call the dribble status function. This is used */
+   /* by some of the machine specific interfaces to  */
+   /* do things such as changing the wording of menu */
+   /* items from "Turn Dribble On..." to             */
+   /* "Turn Dribble Off..."                          */
+   /*================================================*/
+
+   if (FileCommandData(theEnv)->DribbleStatusFunction != NULL)
+     { (*FileCommandData(theEnv)->DribbleStatusFunction)(theEnv,true); }
+
+   /*=====================================*/
+   /* Return true to indicate the dribble */
+   /* file was successfully opened.       */
+   /*=====================================*/
+
+   return true;
+  }
+
+/**********************************************/
+/* DribbleActive: Returns true if the dribble */
+/*   router is active, otherwise false.       */
+/**********************************************/
+bool DribbleActive(
+  Environment *theEnv)
+  {
+   if (FileCommandData(theEnv)->DribbleFP != NULL) return true;
+
+   return false;
+  }
+
+/**********************************/
+/* DribbleOff: C access routine   */
+/*   for the dribble-off command. */
+/**********************************/
+bool DribbleOff(
+  Environment *theEnv)
+  {
+   bool rv = false;
+
+   /*================================================*/
+   /* Call the dribble status function. This is used */
+   /* by some of the machine specific interfaces to  */
+   /* do things such as changing the wording of menu */
+   /* items from "Turn Dribble On..." to             */
+   /* "Turn Dribble Off..."                          */
+   /*================================================*/
+
+   if (FileCommandData(theEnv)->DribbleStatusFunction != NULL)
+     { (*FileCommandData(theEnv)->DribbleStatusFunction)(theEnv,false); }
+
+   /*=======================================*/
+   /* Close the dribble file and deactivate */
+   /* the dribble router.                   */
+   /*=======================================*/
+
+   if (FileCommandData(theEnv)->DribbleFP != NULL)
+     {
+      if (FileCommandData(theEnv)->DribbleCurrentPosition > 0)
+        { fprintf(FileCommandData(theEnv)->DribbleFP,"%s",FileCommandData(theEnv)->DribbleBuffer); }
+      DeleteRouter(theEnv,"dribble");
+      if (GenClose(theEnv,FileCommandData(theEnv)->DribbleFP) == 0) rv = true;
+     }
+   else
+     { rv = true; }
+
+   FileCommandData(theEnv)->DribbleFP = NULL;
+
+   /*============================================*/
+   /* Free the space used by the dribble buffer. */
+   /*============================================*/
+
+   if (FileCommandData(theEnv)->DribbleBuffer != NULL)
+     {
+      rm(theEnv,FileCommandData(theEnv)->DribbleBuffer,FileCommandData(theEnv)->DribbleMaximumPosition);
+      FileCommandData(theEnv)->DribbleBuffer = NULL;
+     }
+
+   FileCommandData(theEnv)->DribbleCurrentPosition = 0;
+   FileCommandData(theEnv)->DribbleMaximumPosition = 0;
+
+   /*============================================*/
+   /* Return true if the dribble file was closed */
+   /* without error, otherwise return false.     */
+   /*============================================*/
+
+   return(rv);
+  }
+  
+#endif /* DEBUGGING_FUNCTIONS */
+
+/**************************************/
+/* QueryBatchCallback: Query callback */
+/*    for the batch router.           */
+/**************************************/
+static bool QueryBatchCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   if (strcmp(logicalName,STDIN) == 0)
+     { return true; }
+
+   return false;
+  }
+
+/************************************/
+/* ReadBatchCallback: Read callback */
+/*    for the batch router.         */
+/************************************/
+static int ReadBatchCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+   return(LLGetcBatch(theEnv,logicalName,false));
+  }
+
+/***************************************************/
+/* LLGetcBatch: Lower level routine for retrieving */
+/*   a character when a batch file is active.      */
+/***************************************************/
+int LLGetcBatch(
+  Environment *theEnv,
+  const char *logicalName,
+  bool returnOnEOF)
+  {
+   int rv = EOF, flag = 1;
+
+   /*=================================================*/
+   /* Get a character until a valid character appears */
+   /* or no more batch files are left.                */
+   /*=================================================*/
+
+   while ((rv == EOF) && (flag == 1))
+     {
+      if (FileCommandData(theEnv)->BatchType == FILE_BATCH)
+        { rv = getc(FileCommandData(theEnv)->BatchFileSource); }
+      else
+        { rv = ReadRouter(theEnv,FileCommandData(theEnv)->BatchLogicalSource); }
+
+      if (rv == EOF)
+        {
+         if (FileCommandData(theEnv)->BatchCurrentPosition > 0) WriteString(theEnv,STDOUT,(char *) FileCommandData(theEnv)->BatchBuffer);
+         flag = RemoveBatch(theEnv);
+        }
+     }
+
+   /*=========================================================*/
+   /* If the character retrieved is an end-of-file character, */
+   /* then there are no batch files with character input      */
+   /* remaining. Remove the batch router.                     */
+   /*=========================================================*/
+
+   if (rv == EOF)
+     {
+      if (FileCommandData(theEnv)->BatchCurrentPosition > 0) WriteString(theEnv,STDOUT,(char *) FileCommandData(theEnv)->BatchBuffer);
+      DeleteRouter(theEnv,"batch");
+      RemoveBatch(theEnv);
+      if (returnOnEOF == true)
+        { return (EOF); }
+      else
+        { return ReadRouter(theEnv,logicalName); }
+     }
+
+   /*========================================*/
+   /* Add the character to the batch buffer. */
+   /*========================================*/
+
+   if (RouterData(theEnv)->InputUngets == 0)
+     {
+      FileCommandData(theEnv)->BatchBuffer = ExpandStringWithChar(theEnv,(char) rv,FileCommandData(theEnv)->BatchBuffer,&FileCommandData(theEnv)->BatchCurrentPosition,
+                                         &FileCommandData(theEnv)->BatchMaximumPosition,FileCommandData(theEnv)->BatchMaximumPosition+BUFFER_SIZE);
+     }
+      
+   /*======================================*/
+   /* If a carriage return is encountered, */
+   /* then flush the batch buffer.         */
+   /*======================================*/
+
+   if ((char) rv == '\n')
+     {
+      WriteString(theEnv,STDOUT,(char *) FileCommandData(theEnv)->BatchBuffer);
+      FileCommandData(theEnv)->BatchCurrentPosition = 0;
+      if ((FileCommandData(theEnv)->BatchBuffer != NULL) && (FileCommandData(theEnv)->BatchMaximumPosition > BUFFER_SIZE))
+        {
+         rm(theEnv,FileCommandData(theEnv)->BatchBuffer,FileCommandData(theEnv)->BatchMaximumPosition);
+         FileCommandData(theEnv)->BatchMaximumPosition = 0;
+         FileCommandData(theEnv)->BatchBuffer = NULL;
+        }
+     }
+
+   /*=============================*/
+   /* Increment the line counter. */
+   /*=============================*/
+
+   if (((char) rv == '\r') || ((char) rv == '\n'))
+     { IncrementLineCount(theEnv); }
+
+   /*=====================================================*/
+   /* Return the character retrieved from the batch file. */
+   /*=====================================================*/
+
+   return(rv);
+  }
+
+/****************************************/
+/* UnreadBatchCallback: Unread callback */
+/*    for the batch router.             */
+/****************************************/
+static int UnreadBatchCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  int ch,
+  void *context)
+  {
+#if MAC_XCD
+#pragma unused(logicalName)
+#endif
+
+   if (FileCommandData(theEnv)->BatchCurrentPosition > 0) FileCommandData(theEnv)->BatchCurrentPosition--;
+   if (FileCommandData(theEnv)->BatchBuffer != NULL) FileCommandData(theEnv)->BatchBuffer[FileCommandData(theEnv)->BatchCurrentPosition] = EOS;
+   if (FileCommandData(theEnv)->BatchType == FILE_BATCH)
+     { return ungetc(ch,FileCommandData(theEnv)->BatchFileSource); }
+
+   return UnreadRouter(theEnv,FileCommandData(theEnv)->BatchLogicalSource,ch);
+  }
+
+/************************************/
+/* ExitBatchCallback: Exit callback */
+/*    for the batch router.         */
+/************************************/
+static void ExitBatchCallback(
+  Environment *theEnv,
+  int num,
+  void *context)
+  {
+#if MAC_XCD
+#pragma unused(num,context)
+#endif
+   CloseAllBatchSources(theEnv);
+  }
+
+/**************************************************/
+/* Batch: C access routine for the batch command. */
+/**************************************************/
+bool Batch(
+  Environment *theEnv,
+  const char *fileName)
+  { return(OpenBatch(theEnv,fileName,false)); }
+
+/***********************************************/
+/* OpenBatch: Adds a file to the list of files */
+/*   opened with the batch command.            */
+/***********************************************/
+bool OpenBatch(
+  Environment *theEnv,
+  const char *fileName,
+  bool placeAtEnd)
+  {
+   FILE *theFile;
+
+   /*======================*/
+   /* Open the batch file. */
+   /*======================*/
+
+   theFile = GenOpen(theEnv,fileName,"r");
+
+   if (theFile == NULL)
+     {
+      OpenErrorMessage(theEnv,"batch",fileName);
+      return false;
+     }
+
+   /*============================*/
+   /* Create the batch router if */
+   /* it doesn't already exist.  */
+   /*============================*/
+
+   if (FileCommandData(theEnv)->TopOfBatchList == NULL)
+     {
+      AddRouter(theEnv,"batch",20,QueryBatchCallback,NULL,
+                ReadBatchCallback,UnreadBatchCallback,
+                ExitBatchCallback,NULL);
+     }
+
+   /*===============================================================*/
+   /* If a batch file is already open, save its current line count. */
+   /*===============================================================*/
+
+   if (FileCommandData(theEnv)->TopOfBatchList != NULL)
+     { FileCommandData(theEnv)->TopOfBatchList->lineNumber = GetLineCount(theEnv); }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+   /*========================================================================*/
+   /* If this is the first batch file, remember the prior parsing file name. */
+   /*========================================================================*/
+
+   if (FileCommandData(theEnv)->TopOfBatchList == NULL)
+     { FileCommandData(theEnv)->batchPriorParsingFile = CopyString(theEnv,GetParsingFileName(theEnv)); }
+
+   /*=======================================================*/
+   /* Create the error capture router if it does not exist. */
+   /*=======================================================*/
+
+   SetParsingFileName(theEnv,fileName);
+   SetLineCount(theEnv,0);
+
+   CreateErrorCaptureRouter(theEnv);
+#endif
+
+   /*====================================*/
+   /* Add the newly opened batch file to */
+   /* the list of batch files opened.    */
+   /*====================================*/
+
+   AddBatch(theEnv,placeAtEnd,theFile,NULL,FILE_BATCH,NULL,fileName);
+
+   /*===================================*/
+   /* Return true to indicate the batch */
+   /* file was successfully opened.     */
+   /*===================================*/
+
+   return true;
+  }
+
+/*****************************************************************/
+/* OpenStringBatch: Opens a string source for batch processing.  */
+/*   The memory allocated for the argument stringName must be    */
+/*   deallocated by the user. The memory allocated for theString */
+/*   will be deallocated by the batch routines when batch        */
+/*   processing for the  string is completed.                    */
+/*****************************************************************/
+bool OpenStringBatch(
+  Environment *theEnv,
+  const char *stringName,
+  const char *theString,
+  bool placeAtEnd)
+  {
+   if (OpenStringSource(theEnv,stringName,theString,0) == false)
+     { return false; }
+
+   if (FileCommandData(theEnv)->TopOfBatchList == NULL)
+     {
+      AddRouter(theEnv,"batch", 20,
+                QueryBatchCallback,NULL,
+                ReadBatchCallback,UnreadBatchCallback,
+                ExitBatchCallback,NULL);
+     }
+
+   AddBatch(theEnv,placeAtEnd,NULL,stringName,STRING_BATCH,theString,NULL);
+
+   return true;
+  }
+
+/*******************************************************/
+/* AddBatch: Creates the batch file data structure and */
+/*   adds it to the list of opened batch files.        */
+/*******************************************************/
+static void AddBatch(
+  Environment *theEnv,
+  bool placeAtEnd,
+  FILE *theFileSource,
+  const char *theLogicalSource,
+  int type,
+  const char *theString,
+  const char *theFileName)
+  {
+   struct batchEntry *bptr;
+
+   /*=========================*/
+   /* Create the batch entry. */
+   /*=========================*/
+
+   bptr = get_struct(theEnv,batchEntry);
+   bptr->batchType = type;
+   bptr->fileSource = theFileSource;
+   bptr->logicalSource = CopyString(theEnv,theLogicalSource);
+   bptr->theString = theString;
+   bptr->fileName = CopyString(theEnv,theFileName);
+   bptr->lineNumber = 0;
+   bptr->next = NULL;
+
+   /*============================*/
+   /* Add the entry to the list. */
+   /*============================*/
+
+   if (FileCommandData(theEnv)->TopOfBatchList == NULL)
+     {
+      FileCommandData(theEnv)->TopOfBatchList = bptr;
+      FileCommandData(theEnv)->BottomOfBatchList = bptr;
+      FileCommandData(theEnv)->BatchType = type;
+      FileCommandData(theEnv)->BatchFileSource = theFileSource;
+      FileCommandData(theEnv)->BatchLogicalSource = bptr->logicalSource;
+      FileCommandData(theEnv)->BatchCurrentPosition = 0;
+     }
+   else if (placeAtEnd == false)
+     {
+      bptr->next = FileCommandData(theEnv)->TopOfBatchList;
+      FileCommandData(theEnv)->TopOfBatchList = bptr;
+      FileCommandData(theEnv)->BatchType = type;
+      FileCommandData(theEnv)->BatchFileSource = theFileSource;
+      FileCommandData(theEnv)->BatchLogicalSource = bptr->logicalSource;
+      FileCommandData(theEnv)->BatchCurrentPosition = 0;
+     }
+   else
+     {
+      FileCommandData(theEnv)->BottomOfBatchList->next = bptr;
+      FileCommandData(theEnv)->BottomOfBatchList = bptr;
+     }
+  }
+
+/******************************************************************/
+/* RemoveBatch: Removes the top entry on the list of batch files. */
+/******************************************************************/
+bool RemoveBatch(
+  Environment *theEnv)
+  {
+   struct batchEntry *bptr;
+   bool rv, fileBatch = false;
+
+   if (FileCommandData(theEnv)->TopOfBatchList == NULL) return false;
+
+   /*==================================================*/
+   /* Close the source from which batch input is read. */
+   /*==================================================*/
+
+   if (FileCommandData(theEnv)->TopOfBatchList->batchType == FILE_BATCH)
+     {
+      fileBatch = true;
+      GenClose(theEnv,FileCommandData(theEnv)->TopOfBatchList->fileSource);
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      FlushParsingMessages(theEnv);
+      DeleteErrorCaptureRouter(theEnv);
+#endif
+     }
+   else
+     {
+      CloseStringSource(theEnv,FileCommandData(theEnv)->TopOfBatchList->logicalSource);
+      rm(theEnv,(void *) FileCommandData(theEnv)->TopOfBatchList->theString,
+         strlen(FileCommandData(theEnv)->TopOfBatchList->theString) + 1);
+     }
+
+   /*=================================*/
+   /* Remove the entry from the list. */
+   /*=================================*/
+
+   DeleteString(theEnv,(char *) FileCommandData(theEnv)->TopOfBatchList->fileName);
+   bptr = FileCommandData(theEnv)->TopOfBatchList;
+   FileCommandData(theEnv)->TopOfBatchList = FileCommandData(theEnv)->TopOfBatchList->next;
+
+   DeleteString(theEnv,(char *) bptr->logicalSource);
+   rtn_struct(theEnv,batchEntry,bptr);
+
+   /*========================================================*/
+   /* If there are no batch files remaining to be processed, */
+   /* then free the space used by the batch buffer.          */
+   /*========================================================*/
+
+   if (FileCommandData(theEnv)->TopOfBatchList == NULL)
+     {
+      FileCommandData(theEnv)->BottomOfBatchList = NULL;
+      FileCommandData(theEnv)->BatchFileSource = NULL;
+      FileCommandData(theEnv)->BatchLogicalSource = NULL;
+      if (FileCommandData(theEnv)->BatchBuffer != NULL)
+        {
+         rm(theEnv,FileCommandData(theEnv)->BatchBuffer,FileCommandData(theEnv)->BatchMaximumPosition);
+         FileCommandData(theEnv)->BatchBuffer = NULL;
+        }
+      FileCommandData(theEnv)->BatchCurrentPosition = 0;
+      FileCommandData(theEnv)->BatchMaximumPosition = 0;
+      rv = false;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      if (fileBatch)
+        {
+         SetParsingFileName(theEnv,FileCommandData(theEnv)->batchPriorParsingFile);
+         DeleteString(theEnv,FileCommandData(theEnv)->batchPriorParsingFile);
+         FileCommandData(theEnv)->batchPriorParsingFile = NULL;
+        }
+#endif
+     }
+
+   /*===========================================*/
+   /* Otherwise move on to the next batch file. */
+   /*===========================================*/
+
+   else
+     {
+      FileCommandData(theEnv)->BatchType = FileCommandData(theEnv)->TopOfBatchList->batchType;
+      FileCommandData(theEnv)->BatchFileSource = FileCommandData(theEnv)->TopOfBatchList->fileSource;
+      FileCommandData(theEnv)->BatchLogicalSource = FileCommandData(theEnv)->TopOfBatchList->logicalSource;
+      FileCommandData(theEnv)->BatchCurrentPosition = 0;
+      rv = true;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      if (FileCommandData(theEnv)->TopOfBatchList->batchType == FILE_BATCH)
+        { SetParsingFileName(theEnv,FileCommandData(theEnv)->TopOfBatchList->fileName); }
+
+      SetLineCount(theEnv,FileCommandData(theEnv)->TopOfBatchList->lineNumber);
+#endif
+     }
+
+   /*====================================================*/
+   /* Return true if a batch file if there are remaining */
+   /* batch files to be processed, otherwise false.      */
+   /*====================================================*/
+
+   return(rv);
+  }
+
+/****************************************/
+/* BatchActive: Returns true if a batch */
+/*   file is open, otherwise false.     */
+/****************************************/
+bool BatchActive(
+  Environment *theEnv)
+  {
+   if (FileCommandData(theEnv)->TopOfBatchList != NULL) return true;
+
+   return false;
+  }
+
+/******************************************************/
+/* CloseAllBatchSources: Closes all open batch files. */
+/******************************************************/
+void CloseAllBatchSources(
+  Environment *theEnv)
+  {
+   /*================================================*/
+   /* Free the batch buffer if it contains anything. */
+   /*================================================*/
+
+   if (FileCommandData(theEnv)->BatchBuffer != NULL)
+     {
+      if (FileCommandData(theEnv)->BatchCurrentPosition > 0) WriteString(theEnv,STDOUT,(char *) FileCommandData(theEnv)->BatchBuffer);
+      rm(theEnv,FileCommandData(theEnv)->BatchBuffer,FileCommandData(theEnv)->BatchMaximumPosition);
+      FileCommandData(theEnv)->BatchBuffer = NULL;
+      FileCommandData(theEnv)->BatchCurrentPosition = 0;
+      FileCommandData(theEnv)->BatchMaximumPosition = 0;
+     }
+
+   /*==========================*/
+   /* Delete the batch router. */
+   /*==========================*/
+
+   DeleteRouter(theEnv,"batch");
+
+   /*=====================================*/
+   /* Close each of the open batch files. */
+   /*=====================================*/
+
+   while (RemoveBatch(theEnv))
+     { /* Do Nothing */ }
+  }
+
+#if ! RUN_TIME
+
+/*******************************************************/
+/* BatchStar: C access routine for the batch* command. */
+/*******************************************************/
+bool BatchStar(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   int inchar;
+   bool done = false;
+   FILE *theFile;
+   char *theString = NULL;
+   size_t position = 0;
+   size_t maxChars = 0;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   char *oldParsingFileName;
+   long oldLineCountValue;
+#endif
+   /*======================*/
+   /* Open the batch file. */
+   /*======================*/
+
+   theFile = GenOpen(theEnv,fileName,"r");
+
+   if (theFile == NULL)
+     {
+      OpenErrorMessage(theEnv,"batch",fileName);
+      return false;
+     }
+
+   /*======================================*/
+   /* Setup for capturing errors/warnings. */
+   /*======================================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   oldParsingFileName = CopyString(theEnv,GetParsingFileName(theEnv));
+   SetParsingFileName(theEnv,fileName);
+
+   CreateErrorCaptureRouter(theEnv);
+
+   oldLineCountValue = SetLineCount(theEnv,1);
+#endif
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*=============================================*/
+   /* Evaluate commands from the file one by one. */
+   /*=============================================*/
+
+   while (! done)
+     {
+      inchar = getc(theFile);
+      if (inchar == EOF)
+        {
+         inchar = '\n';
+         done = true;
+        }
+        
+      theString = ExpandStringWithChar(theEnv,inchar,theString,&position,
+                                       &maxChars,maxChars+80);
+
+      if (CompleteCommand(theString) != 0)
+        {
+         FlushPPBuffer(theEnv);
+         SetPPBufferStatus(theEnv,false);
+         RouteCommand(theEnv,theString,false);
+         FlushPPBuffer(theEnv);
+         SetHaltExecution(theEnv,false);
+         SetEvaluationError(theEnv,false);
+         FlushBindList(theEnv,NULL);
+         genfree(theEnv,theString,maxChars);
+         theString = NULL;
+         maxChars = 0;
+         position = 0;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+         FlushParsingMessages(theEnv);
+#endif
+        }
+
+      if ((inchar == '\r') || (inchar == '\n'))
+        { IncrementLineCount(theEnv); }
+     }
+
+   if (theString != NULL)
+     { genfree(theEnv,theString,maxChars); }
+
+   /*=======================*/
+   /* Close the batch file. */
+   /*=======================*/
+
+   GenClose(theEnv,theFile);
+
+   /*========================================*/
+   /* Cleanup for capturing errors/warnings. */
+   /*========================================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   FlushParsingMessages(theEnv);
+   DeleteErrorCaptureRouter(theEnv);
+
+   SetLineCount(theEnv,oldLineCountValue);
+
+   SetParsingFileName(theEnv,oldParsingFileName);
+   DeleteString(theEnv,oldParsingFileName);
+#endif
+
+   return true;
+  }
+
+#else
+
+/***********************************************/
+/* BatchStar: This is the non-functional stub  */
+/*   provided for use with a run-time version. */
+/***********************************************/
+bool BatchStar(
+  Environment *theEnv,
+  const char *fileName)
+  {
+   PrintErrorID(theEnv,"FILECOM",1,false);
+   WriteString(theEnv,STDERR,"Function batch* does not work in run time modules.\n");
+   return false;
+  }
+
+#endif
diff --git a/clips/fileutil.h b/clips/fileutil.h
new file mode 100755
index 000000000..ba6e8ee87
--- /dev/null
+++ b/clips/fileutil.h
@@ -0,0 +1,50 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*              FILE COMMANDS HEADER FILE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for file commands including    */
+/*   batch, dribble-on, dribble-off, save, load, bsave, and  */
+/*   bload.                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Split from filecom.c                           */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_fileutil
+
+#pragma once
+
+#define _H_fileutil
+
+   bool                           DribbleOn(Environment *,const char *);
+   bool                           DribbleActive(Environment *);
+   bool                           DribbleOff(Environment *);
+   void                           AppendDribble(Environment *,const char *);
+   int                            LLGetcBatch(Environment *,const char *,bool);
+   bool                           Batch(Environment *,const char *);
+   bool                           OpenBatch(Environment *,const char *,bool);
+   bool                           OpenStringBatch(Environment *,const char *,const char *,bool);
+   bool                           RemoveBatch(Environment *);
+   bool                           BatchActive(Environment *);
+   void                           CloseAllBatchSources(Environment *);
+   bool                           BatchStar(Environment *,const char *);
+
+#endif /* _H_fileutil */
+
+
+
+
+
+
diff --git a/clips/generate.c b/clips/generate.c
new file mode 100755
index 000000000..015cf73f8
--- /dev/null
+++ b/clips/generate.c
@@ -0,0 +1,1079 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                   GENERATE MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for converting field           */
+/*   constraints to expressions which can be used            */
+/*   in the pattern and join networks.                       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Reimplemented algorithm for comparisons to     */
+/*            variables contained within not/and CEs.        */
+/*                                                           */
+/*      6.31: Not/and unification was only occurring for the */
+/*            first not/and group referencing a variable.    */
+/*            Use of the marked flag was unneccessary since  */
+/*            the referring variable is always the closest   */
+/*            and unification does not occur within the same */
+/*            non/and group.                                 */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "setup.h"
+
+#if (! RUN_TIME) && (! BLOAD_ONLY) && DEFRULE_CONSTRUCT
+
+#include "argacces.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+
+#if DEFGLOBAL_CONSTRUCT
+#include "globlpsr.h"
+#endif
+
+#include "memalloc.h"
+#include "pattern.h"
+#include "prntutil.h"
+#include "router.h"
+#include "ruledef.h"
+#include "symbol.h"
+
+#include "generate.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ExtractAnds(Environment *,struct lhsParseNode *,bool,
+                                              struct expr **,struct expr **,struct expr **,
+                                              struct expr **,struct nandFrame *);
+   static void                    ExtractFieldTest(Environment *,struct lhsParseNode *,bool,
+                                                   struct expr **,struct expr **,struct expr **,
+                                                   struct expr **,struct nandFrame *);
+   static struct expr            *GetfieldReplace(Environment *,struct lhsParseNode *);
+   static struct expr            *GenPNConstant(Environment *,struct lhsParseNode *);
+   static struct expr            *GenJNConstant(Environment *,struct lhsParseNode *,bool);
+   static struct expr            *GenJNColon(Environment *,struct lhsParseNode *,bool,struct nandFrame *);
+   static struct expr            *GenPNColon(Environment *,struct lhsParseNode *);
+   static struct expr            *GenJNEq(Environment *,struct lhsParseNode *,bool,struct nandFrame *);
+   static struct expr            *GenPNEq(Environment *,struct lhsParseNode *);
+   static struct expr            *GenJNVariableComparison(Environment *,struct lhsParseNode *,
+                                                          struct lhsParseNode *,bool);
+   static struct expr            *GenPNVariableComparison(Environment *,struct lhsParseNode *,
+                                                          struct lhsParseNode *);
+   static bool                    AllVariablesInPattern(struct lhsParseNode *,
+                                                        int);
+   static bool                    AllVariablesInExpression(struct lhsParseNode *,
+                                                           int);
+
+/*******************************************************/
+/* FieldConversion: Generates join and pattern network */
+/*   expressions for a field constraint.               */
+/*******************************************************/
+void FieldConversion(
+  Environment *theEnv,
+  struct lhsParseNode *theField,
+  struct lhsParseNode *thePattern,
+  struct nandFrame *theNandFrames)
+  {
+   bool testInPatternNetwork = true;
+   struct lhsParseNode *patternPtr;
+   struct expr *headOfPNExpression, *headOfJNExpression;
+   struct expr *lastPNExpression, *lastJNExpression;
+   struct expr *tempExpression;
+   struct expr *patternNetTest = NULL;
+   struct expr *joinNetTest = NULL;
+   struct expr *constantSelector = NULL;
+   struct expr *constantValue = NULL;
+
+   /*==================================================*/
+   /* Consider a NULL pointer to be an internal error. */
+   /*==================================================*/
+
+   if (theField == NULL)
+     {
+      SystemError(theEnv,"ANALYSIS",3);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   /*========================================================*/
+   /* Determine if constant testing must be performed in the */
+   /* join network. Only possible when a field contains an   */
+   /* or ('|') and references are made to variables outside  */
+   /* the pattern.                                           */
+   /*========================================================*/
+
+   if (theField->bottom != NULL)
+     {
+      if (theField->bottom->bottom != NULL)
+        { testInPatternNetwork = AllVariablesInPattern(theField->bottom,theField->pattern); }
+     }
+
+   /*=============================================================*/
+   /* Extract pattern and join network expressions. Loop through  */
+   /* the or'ed constraints of the field, extracting pattern and  */
+   /* join network expressions and adding them to a running list. */
+   /*=============================================================*/
+
+   headOfPNExpression = lastPNExpression = NULL;
+   headOfJNExpression = lastJNExpression = NULL;
+
+   for (patternPtr = theField->bottom;
+        patternPtr != NULL;
+        patternPtr = patternPtr->bottom)
+     {
+      /*=============================================*/
+      /* Extract pattern and join network tests from */
+      /* the or'ed constraint being examined.        */
+      /*=============================================*/
+
+      ExtractAnds(theEnv,patternPtr,testInPatternNetwork,&patternNetTest,&joinNetTest,
+                  &constantSelector,&constantValue,theNandFrames);
+
+      /*=============================================================*/
+      /* Constant hashing is only used in the pattern network if the */
+      /* field doesn't contain an or'ed constraint. For example, the */
+      /* constaint "red | blue" can not use hashing.                 */
+      /*=============================================================*/
+
+      if (constantSelector != NULL)
+        {
+         if ((patternPtr == theField->bottom) &&
+             (patternPtr->bottom == NULL))
+           {
+            theField->constantSelector = constantSelector;
+            theField->constantValue = constantValue;
+           }
+         else
+           {
+            ReturnExpression(theEnv,constantSelector);
+            ReturnExpression(theEnv,constantValue);
+            ReturnExpression(theEnv,theField->constantSelector);
+            ReturnExpression(theEnv,theField->constantValue);
+            theField->constantSelector = NULL;
+            theField->constantValue = NULL;
+           }
+        }
+
+      /*=====================================================*/
+      /* Add the new pattern network expressions to the list */
+      /* of pattern network expressions being constructed.   */
+      /*=====================================================*/
+
+      if (patternNetTest != NULL)
+        {
+         if (lastPNExpression == NULL)
+           { headOfPNExpression = patternNetTest; }
+         else
+           { lastPNExpression->nextArg = patternNetTest; }
+         lastPNExpression = patternNetTest;
+        }
+
+      /*==================================================*/
+      /* Add the new join network expressions to the list */
+      /* of join network expressions being constructed.   */
+      /*==================================================*/
+
+      if (joinNetTest != NULL)
+        {
+         if (lastJNExpression == NULL)
+           { headOfJNExpression = joinNetTest; }
+         else
+           { lastJNExpression->nextArg = joinNetTest; }
+         lastJNExpression = joinNetTest;
+        }
+     }
+
+   /*==========================================================*/
+   /* If there was more than one expression generated from the */
+   /* or'ed field constraints for the pattern network, then    */
+   /* enclose the expressions within an "or" function call.    */
+   /*==========================================================*/
+
+   if ((headOfPNExpression != NULL) ? (headOfPNExpression->nextArg != NULL) : false)
+     {
+      tempExpression = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_OR);
+      tempExpression->argList = headOfPNExpression;
+      headOfPNExpression = tempExpression;
+     }
+
+   /*==========================================================*/
+   /* If there was more than one expression generated from the */
+   /* or'ed field constraints for the join network, then       */
+   /* enclose the expressions within an "or" function call.    */
+   /*==========================================================*/
+
+   if ((headOfJNExpression != NULL) ? (headOfJNExpression->nextArg != NULL) : false)
+     {
+      tempExpression = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_OR);
+      tempExpression->argList = headOfJNExpression;
+      headOfJNExpression = tempExpression;
+     }
+
+   /*===============================================================*/
+   /* If the field constraint binds a variable that was previously  */
+   /* bound somewhere in the LHS of the rule, then generate an      */
+   /* expression to compare this binding occurrence of the variable */
+   /* to the previous binding occurrence.                           */
+   /*===============================================================*/
+
+   if (((theField->pnType == MF_VARIABLE_NODE) || (theField->pnType == SF_VARIABLE_NODE)) &&
+       (theField->referringNode != NULL))
+     {
+      /*================================================================*/
+      /* If the previous variable reference is within the same pattern, */
+      /* then the variable comparison can occur in the pattern network. */
+      /*================================================================*/
+
+      if (theField->referringNode->pattern == theField->pattern)
+        {
+         tempExpression = GenPNVariableComparison(theEnv,theField,theField->referringNode);
+         headOfPNExpression = CombineExpressions(theEnv,tempExpression,headOfPNExpression);
+        }
+
+      /*====================================*/
+      /* Otherwise, the variable comparison */
+      /* must occur in the join network.    */
+      /*====================================*/
+
+      else if (theField->referringNode->pattern > 0)
+        {
+         AddNandUnification(theEnv,theField,theNandFrames);
+
+         /*====================================*/
+         /* Generate an expression to test the */
+         /* variable in a non-nand join.       */
+         /*====================================*/
+
+         tempExpression = GenJNVariableComparison(theEnv,theField,theField->referringNode,false);
+         headOfJNExpression = CombineExpressions(theEnv,tempExpression,headOfJNExpression);
+
+         /*==========================*/
+         /* Generate the hash index. */
+         /*==========================*/
+
+         if (theField->patternType->genGetPNValueFunction != NULL)
+           {
+            tempExpression = (*theField->patternType->genGetPNValueFunction)(theEnv,theField);
+            thePattern->rightHash = AppendExpressions(tempExpression,thePattern->rightHash);
+           }
+
+         if (theField->referringNode->patternType->genGetJNValueFunction)
+           {
+            tempExpression = (*theField->referringNode->patternType->genGetJNValueFunction)(theEnv,theField->referringNode,LHS);
+            thePattern->leftHash = AppendExpressions(tempExpression,thePattern->leftHash);
+           }
+        }
+     }
+
+   /*======================================================*/
+   /* Attach the pattern network expressions to the field. */
+   /*======================================================*/
+
+   theField->networkTest = headOfPNExpression;
+
+   /*=====================================================*/
+   /* Attach the join network expressions to the pattern. */
+   /*=====================================================*/
+
+   thePattern->networkTest = CombineExpressions(theEnv,thePattern->networkTest,headOfJNExpression);
+  }
+
+/****************************************************************************/
+/* ExtractAnds: Loops through a single set of subfields bound together by   */
+/*   an & connective constraint in a field and generates expressions needed */
+/*   for testing conditions in the pattern and join network.                */
+/****************************************************************************/
+static void ExtractAnds(
+  Environment *theEnv,
+  struct lhsParseNode *andField,
+  bool testInPatternNetwork,
+  struct expr **patternNetTest,
+  struct expr **joinNetTest,
+  struct expr **constantSelector,
+  struct expr **constantValue,
+  struct nandFrame *theNandFrames)
+  {
+   struct expr *newPNTest, *newJNTest, *newConstantSelector, *newConstantValue;
+
+   /*=================================================*/
+   /* Before starting, the subfield has no pattern or */
+   /* join network expressions associated with it.    */
+   /*=================================================*/
+
+   *patternNetTest = NULL;
+   *joinNetTest = NULL;
+   *constantSelector = NULL;
+   *constantValue = NULL;
+
+   /*=========================================*/
+   /* Loop through each of the subfields tied */
+   /* together by the & constraint.           */
+   /*=========================================*/
+
+   for (;
+        andField != NULL;
+        andField = andField->right)
+     {
+      /*======================================*/
+      /* Extract the pattern and join network */
+      /* expressions from the subfield.       */
+      /*======================================*/
+
+      ExtractFieldTest(theEnv,andField,testInPatternNetwork,&newPNTest,&newJNTest,
+                       &newConstantSelector,&newConstantValue,theNandFrames);
+
+      /*=================================================*/
+      /* Add the new expressions to the list of pattern  */
+      /* and join network expressions being constructed. */
+      /*=================================================*/
+
+      *patternNetTest = CombineExpressions(theEnv,*patternNetTest,newPNTest);
+      *joinNetTest = CombineExpressions(theEnv,*joinNetTest,newJNTest);
+      *constantSelector = CombineExpressions(theEnv,*constantSelector,newConstantSelector);
+      *constantValue = CombineExpressions(theEnv,*constantValue,newConstantValue);
+     }
+  }
+
+/************************************************************************/
+/* ExtractFieldTest: Generates the pattern or join network expression   */
+/*   associated with the basic field constraints: constants, predicate, */
+/*   return value, and variable constraints. Based on the context in    */
+/*   which a constraint is used, some constraints may be tested in the  */
+/*   pattern network while other constraints must be tested in the join */
+/*   network. Constraints which refer to variables in other patterns    */
+/*   must be tested in the join network. The predicate constraint       */
+/*   associated with a test CE is tested in the join network (even if   */
+/*   all the variables it refers to are contained in the previous       */
+/*   pattern CE). If one of the or'ed constraints in a field refers to  */
+/*   a binding occurrence of a variable in another pattern, then the    */
+/*   other constraints in the field must be tested in the join network  */
+/*   (this is how some constant constraint tests must occasionally be   */
+/*   performed in the join network).                                    */
+/************************************************************************/
+static void ExtractFieldTest(
+  Environment *theEnv,
+  struct lhsParseNode *theField,
+  bool testInPatternNetwork,
+  struct expr **patternNetTest,
+  struct expr **joinNetTest,
+  struct expr **constantSelector,
+  struct expr **constantValue,
+  struct nandFrame *theNandFrames)
+  {
+   *patternNetTest = NULL;
+   *joinNetTest = NULL;
+   *constantSelector = NULL;
+   *constantValue = NULL;
+
+   /*==========================================================*/
+   /* Generate a network expression for a constant constraint. */
+   /*==========================================================*/
+
+   if ((theField->pnType == STRING_NODE) || (theField->pnType == SYMBOL_NODE) ||
+#if OBJECT_SYSTEM
+       (theField->pnType == INSTANCE_NAME_NODE) ||
+#endif
+       (theField->pnType == FLOAT_NODE) || (theField->pnType == INTEGER_NODE))
+     {
+      if (testInPatternNetwork == true)
+        {
+         *patternNetTest = GenPNConstant(theEnv,theField);
+
+         if (! theField->negated)
+           {
+            *constantSelector = (*theField->patternType->genGetPNValueFunction)(theEnv,theField);
+            *constantValue = GenConstant(theEnv,NodeTypeToType(theField),theField->value);
+           }
+        }
+      else
+        { *joinNetTest = GenJNConstant(theEnv,theField,false); } // TBD Remove false
+     }
+
+   /*===========================================================*/
+   /* Generate a network expression for a predicate constraint. */
+   /*===========================================================*/
+
+   else if (theField->pnType == PREDICATE_CONSTRAINT_NODE)
+     {
+      if ((testInPatternNetwork == true) &&
+          (AllVariablesInExpression(theField->expression,theField->pattern) == true))
+        { *patternNetTest = GenPNColon(theEnv,theField); }
+      else
+        { *joinNetTest = GenJNColon(theEnv,theField,false,theNandFrames); } // TBD Remove false
+     }
+
+   /*==============================================================*/
+   /* Generate a network expression for a return value constraint. */
+   /*==============================================================*/
+
+   else if (theField->pnType == RETURN_VALUE_CONSTRAINT_NODE)
+     {
+      if ((testInPatternNetwork == true) &&
+          (AllVariablesInExpression(theField->expression,theField->pattern) == true))
+        { *patternNetTest = GenPNEq(theEnv,theField); }
+      else
+        { *joinNetTest = GenJNEq(theEnv,theField,false,theNandFrames); } // TBD Remove false
+     }
+
+   /*=====================================================================*/
+   /* Generate a network expression for a variable comparison constraint. */
+   /*=====================================================================*/
+
+   else if ((theField->pnType == SF_VARIABLE_NODE) || (theField->pnType == MF_VARIABLE_NODE))
+     {
+      if ((testInPatternNetwork == true) &&
+          ((theField->referringNode != NULL) ?
+           (theField->referringNode->pattern == theField->pattern) :
+           false))
+        { *patternNetTest = GenPNVariableComparison(theEnv,theField,theField->referringNode); }
+      else
+        {
+         *joinNetTest = GenJNVariableComparison(theEnv,theField,theField->referringNode,false);
+         AddNandUnification(theEnv,theField,theNandFrames);
+        }
+     }
+  }
+
+/*********************************************************/
+/* GenPNConstant: Generates an expression for use in the */
+/*  pattern network of a data entity (such as a fact or  */
+/*  instance). The expression generated is for comparing */
+/*  a constant value against a specified slot/field in   */
+/*  the data entity for equality or inequality.          */
+/*********************************************************/
+static struct expr *GenPNConstant(
+  Environment *theEnv,
+  struct lhsParseNode *theField)
+  {
+   struct expr *top;
+
+   /*===============================================*/
+   /* If the pattern parser is capable of creating  */
+   /* a specialized test, then call the function to */
+   /* generate the pattern network test and return  */
+   /* the expression generated.                     */
+   /*===============================================*/
+
+   if (theField->patternType->genPNConstantFunction != NULL)
+     { return (*theField->patternType->genPNConstantFunction)(theEnv,theField); }
+
+   /*===================================================*/
+   /* Otherwise, generate a test which uses the eq/neq  */
+   /* function to compare the pattern field/slot to the */
+   /* constant and then return the expression.          */
+   /*===================================================*/
+
+   if (theField->negated)
+     { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NEQ); }
+   else
+     { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_EQ); }
+
+   top->argList = (*theField->patternType->genGetPNValueFunction)(theEnv,theField);
+   top->argList->nextArg = GenConstant(theEnv,NodeTypeToType(theField),theField->value);
+
+   return(top);
+  }
+
+/************************************************************/
+/* GenJNConstant: Generates an expression for use in the    */
+/*  join network. The expression generated is for comparing */
+/*  a constant value against a specified slot/field in the  */
+/*  data entity for equality or inequality.                 */
+/************************************************************/
+static struct expr *GenJNConstant(
+  Environment *theEnv,
+  struct lhsParseNode *theField,
+  bool isNand)
+  {
+   struct expr *top;
+
+   /*===============================================*/
+   /* If the pattern parser is capable of creating  */
+   /* a specialized test, then call the function to */
+   /* generate the join network test and return the */
+   /* expression generated.                         */
+   /*===============================================*/
+
+   if (theField->patternType->genJNConstantFunction != NULL)
+     {
+      if (isNand)
+        { return (*theField->patternType->genJNConstantFunction)(theEnv,theField,NESTED_RHS); }
+      else
+        { return (*theField->patternType->genJNConstantFunction)(theEnv,theField,RHS); }
+     }
+
+   /*===================================================*/
+   /* Otherwise, generate a test which uses the eq/neq  */
+   /* function to compare the pattern field/slot to the */
+   /* constant and then return the expression.          */
+   /*===================================================*/
+
+   if (theField->negated)
+     { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NEQ); }
+   else
+     { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_EQ); }
+
+   if (isNand)
+      { top->argList = (*theField->patternType->genGetJNValueFunction)(theEnv,theField,NESTED_RHS); }
+   else
+      { top->argList = (*theField->patternType->genGetJNValueFunction)(theEnv,theField,RHS); }
+
+   top->argList->nextArg = GenConstant(theEnv,NodeTypeToType(theField),theField->value);
+
+   return(top);
+  }
+
+/******************************************************/
+/* GenJNColon: Generates an expression for use in the */
+/*  join network. The expression generated is for a   */
+/*  predicate field constraint (the : constraint).    */
+/******************************************************/
+static struct expr *GenJNColon(
+  Environment *theEnv,
+  struct lhsParseNode *theField,
+  bool isNand,
+  struct nandFrame *theNandFrames)
+  {
+   struct expr *top, *conversion;
+
+   /*==================================================*/
+   /* Replace variables with function calls to extract */
+   /* the appropriate value from the data entity.      */
+   /*==================================================*/
+
+   if (isNand)
+     { conversion = GetvarReplace(theEnv,theField->expression,true,theNandFrames); }
+   else
+     { conversion = GetvarReplace(theEnv,theField->expression,false,theNandFrames); }
+
+   /*================================================*/
+   /* If the predicate constraint is negated by a ~, */
+   /* then wrap a "not" function call around the     */
+   /* expression before returning it. Otherwise,     */
+   /* just return the expression.                    */
+   /*================================================*/
+
+   if (theField->negated)
+     {
+      top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NOT);
+      top->argList = conversion;
+     }
+   else
+     { top = conversion; }
+
+   return(top);
+  }
+
+/******************************************************/
+/* GenPNColon: Generates an expression for use in the */
+/*  pattern network. The expression generated is for  */
+/*  a predicate field constraint (the : constraint).  */
+/******************************************************/
+static struct expr *GenPNColon(
+  Environment *theEnv,
+  struct lhsParseNode *theField)
+  {
+   struct expr *top, *conversion;
+
+   /*==================================================*/
+   /* Replace variables with function calls to extract */
+   /* the appropriate value from the data entity.      */
+   /*==================================================*/
+
+   conversion = GetfieldReplace(theEnv,theField->expression);
+
+   /*================================================*/
+   /* If the predicate constraint is negated by a ~, */
+   /* then wrap a "not" function call around the     */
+   /* expression before returning it. Otherwise,     */
+   /* just return the expression.                    */
+   /*================================================*/
+
+   if (theField->negated)
+     {
+      top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NOT);
+      top->argList = conversion;
+     }
+   else
+     { top = conversion; }
+
+   return(top);
+  }
+
+/******************************************************/
+/* GenJNEq: Generates an expression for use in the    */
+/*  join network. The expression generated is for a   */
+/*  return value field constraint (the = constraint). */
+/******************************************************/
+static struct expr *GenJNEq(
+  Environment *theEnv,
+  struct lhsParseNode *theField,
+  bool isNand,
+  struct nandFrame *theNandFrames)
+  {
+   struct expr *top, *conversion;
+
+   /*==================================================*/
+   /* Replace variables with function calls to extract */
+   /* the appropriate value from the data entity.      */
+   /*==================================================*/
+
+   if (isNand)
+     { conversion = GetvarReplace(theEnv,theField->expression,true,theNandFrames); }
+   else
+     { conversion = GetvarReplace(theEnv,theField->expression,false,theNandFrames); }
+
+   /*============================================================*/
+   /* If the return value constraint is negated by a ~, then use */
+   /* the neq function to compare the value of the field to the  */
+   /* value returned by the function call. Otherwise, use eq to  */
+   /* compare the two values.                                    */
+   /*============================================================*/
+
+   if (theField->negated)
+     { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NEQ); }
+   else
+     { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_EQ); }
+
+   if (isNand)
+     { top->argList = (*theField->patternType->genGetJNValueFunction)(theEnv,theField,NESTED_RHS); }
+   else
+     { top->argList = (*theField->patternType->genGetJNValueFunction)(theEnv,theField,RHS); }
+
+   top->argList->nextArg = conversion;
+
+   return(top);
+  }
+
+/*******************************************************/
+/* GenPNEq: Generates an expression for use in the     */
+/*  pattern network. The expression generated is for a */
+/*  return value field constraint (the = constraint).  */
+/*******************************************************/
+static struct expr *GenPNEq(
+  Environment *theEnv,
+  struct lhsParseNode *theField)
+  {
+   struct expr *top, *conversion;
+
+   /*==================================================*/
+   /* Replace variables with function calls to extract */
+   /* the appropriate value from the data entity.      */
+   /*==================================================*/
+
+   conversion = GetfieldReplace(theEnv,theField->expression);
+
+   /*============================================================*/
+   /* If the return value constraint is negated by a ~, then use */
+   /* the neq function to compare the value of the field to the  */
+   /* value returned by the function call. Otherwise, use eq to  */
+   /* compare the two values.                                    */
+   /*============================================================*/
+
+   if (theField->negated)
+     { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NEQ); }
+   else
+     { top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_EQ); }
+
+   top->argList = (*theField->patternType->genGetPNValueFunction)(theEnv,theField);
+   top->argList->nextArg = conversion;
+
+   return(top);
+  }
+
+/************************************************************************/
+/* AddNandUnification: Adds expressions to the nand joins to unify the  */
+/*   variable bindings that need to match from the left and right paths */
+/*   taken through the join network for not/and CE group.               */
+/************************************************************************/
+void AddNandUnification(
+  Environment *theEnv,
+  struct lhsParseNode *nodeList,
+  struct nandFrame *theNandFrames)
+  {
+   struct nandFrame *theFrame;
+   struct expr *tempExpression;
+
+   /*====================================================*/
+   /* If the reference is to a prior variable within the */
+   /* same nand group, then there's no need to create an */
+   /* external network test.                             */
+   /*====================================================*/
+
+   if (nodeList->beginNandDepth == nodeList->referringNode->beginNandDepth)
+     { return; }
+
+   /*=========================================*/
+   /* Don't generate an external network test */
+   /* if one has already been generated.      */
+   /*=========================================*/
+
+   // if (nodeList->referringNode->marked)
+   //   { return; }
+
+   /*======================================================*/
+   /* Find the frame to which the test should be attached. */
+   /*======================================================*/
+
+   for (theFrame = theNandFrames;
+        theFrame != NULL;
+        theFrame = theFrame->next)
+     {
+      if (theFrame->depth >= nodeList->referringNode->beginNandDepth)
+        {
+         // nodeList->referringNode->marked = true;
+
+         tempExpression = GenJNVariableComparison(theEnv,nodeList->referringNode,nodeList->referringNode,true);
+
+         theFrame->nandCE->externalNetworkTest = CombineExpressions(theEnv,theFrame->nandCE->externalNetworkTest,tempExpression);
+
+         tempExpression = (*nodeList->referringNode->patternType->genGetJNValueFunction)(theEnv,nodeList->referringNode,LHS);
+         theFrame->nandCE->externalRightHash = AppendExpressions(theFrame->nandCE->externalRightHash,tempExpression);
+
+         tempExpression = (*nodeList->referringNode->patternType->genGetJNValueFunction)(theEnv,nodeList->referringNode,LHS);
+         theFrame->nandCE->externalLeftHash = AppendExpressions(theFrame->nandCE->externalLeftHash,tempExpression);
+        }
+     }
+  }
+
+/*******************************************************************/
+/* GetvarReplace: Replaces occurences of variables in expressions */
+/*   with function calls that will extract the variable's value    */
+/*   from a partial match (i.e. from information stored in the     */
+/*   join network or the activation of the rule).                  */
+/*******************************************************************/
+struct expr *GetvarReplace(
+  Environment *theEnv,
+  struct lhsParseNode *nodeList,
+  bool isNand,
+  struct nandFrame *theNandFrames)
+  {
+   struct expr *newList;
+
+   /*====================================*/
+   /* Return NULL for a NULL pointer     */
+   /* (i.e. nothing has to be replaced). */
+   /*====================================*/
+
+   if (nodeList == NULL) return NULL;
+
+   /*=====================================================*/
+   /* Create an expression data structure and recursively */
+   /* replace variables in its argument list and next     */
+   /* argument links.                                     */
+   /*=====================================================*/
+
+   newList = get_struct(theEnv,expr);
+   newList->type = NodeTypeToType(nodeList);
+   newList->value = nodeList->value;
+   newList->nextArg = GetvarReplace(theEnv,nodeList->right,isNand,theNandFrames);
+   newList->argList = GetvarReplace(theEnv,nodeList->bottom,isNand,theNandFrames);
+
+   /*=========================================================*/
+   /* If the present node being examined is either a local or */
+   /* global variable, then replace it with a function call   */
+   /* that will return the variable's value.                  */
+   /*=========================================================*/
+
+   if ((nodeList->pnType == SF_VARIABLE_NODE) || (nodeList->pnType == MF_VARIABLE_NODE))
+     {
+      AddNandUnification(theEnv,nodeList,theNandFrames);
+
+      /*=============================================================*/
+      /* Referencing a variable outside the scope of the immediately */
+      /* enclosing not/and CE requires that the test be performed in */
+      /* the "join from the right" join.                             */
+      /*=============================================================*/
+
+      if (isNand)
+        {
+         if (nodeList->beginNandDepth > nodeList->referringNode->beginNandDepth)
+           {
+            (*nodeList->referringNode->patternType->replaceGetJNValueFunction)
+               (theEnv,newList,nodeList->referringNode,LHS);
+           }
+         else
+           {
+            (*nodeList->referringNode->patternType->replaceGetJNValueFunction)
+               (theEnv,newList,nodeList->referringNode,NESTED_RHS);
+           }
+        }
+      else
+        {
+         if (nodeList->joinDepth != nodeList->referringNode->joinDepth)
+           {
+            (*nodeList->referringNode->patternType->replaceGetJNValueFunction)
+               (theEnv,newList,nodeList->referringNode,LHS);
+           }
+         else
+           {
+            (*nodeList->referringNode->patternType->replaceGetJNValueFunction)
+               (theEnv,newList,nodeList->referringNode,RHS);
+           }
+        }
+     }
+#if DEFGLOBAL_CONSTRUCT
+   else if (newList->type == GBL_VARIABLE)
+     { ReplaceGlobalVariable(theEnv,newList); }
+#endif
+
+   /*====================================================*/
+   /* Return the expression with its variables replaced. */
+   /*====================================================*/
+
+   return(newList);
+  }
+
+/**********************************************************************/
+/* GetfieldReplace: Replaces occurences of variables in expressions   */
+/*   with function calls that will extract the variable's value       */
+/*   given a pointer to the data entity that contains the value (i.e. */
+/*   from information stored in the pattern network).                 */
+/**********************************************************************/
+static struct expr *GetfieldReplace(
+  Environment *theEnv,
+  struct lhsParseNode *nodeList)
+  {
+   struct expr *newList;
+
+   /*====================================*/
+   /* Return NULL for a NULL pointer     */
+   /* (i.e. nothing has to be replaced). */
+   /*====================================*/
+
+   if (nodeList == NULL) return NULL;
+
+   /*=====================================================*/
+   /* Create an expression data structure and recursively */
+   /* replace variables in its argument list and next     */
+   /* argument links.                                     */
+   /*=====================================================*/
+
+   newList = get_struct(theEnv,expr);
+   newList->type = NodeTypeToType(nodeList);
+   newList->value = nodeList->value;
+   newList->nextArg = GetfieldReplace(theEnv,nodeList->right);
+   newList->argList = GetfieldReplace(theEnv,nodeList->bottom);
+
+   /*=========================================================*/
+   /* If the present node being examined is either a local or */
+   /* global variable, then replace it with a function call   */
+   /* that will return the variable's value.                  */
+   /*=========================================================*/
+
+   if ((nodeList->pnType == SF_VARIABLE_NODE) || (nodeList->pnType == MF_VARIABLE_NODE))
+     {
+      (*nodeList->referringNode->patternType->replaceGetPNValueFunction)
+         (theEnv,newList,nodeList->referringNode);
+     }
+#if DEFGLOBAL_CONSTRUCT
+   else if (newList->type == GBL_VARIABLE)
+     { ReplaceGlobalVariable(theEnv,newList); }
+#endif
+
+   /*====================================================*/
+   /* Return the expression with its variables replaced. */
+   /*====================================================*/
+
+   return(newList);
+  }
+
+/**************************************************************/
+/* GenJNVariableComparison: Generates a join network test for */
+/*   comparing two variables found in different patterns.     */
+/**************************************************************/
+static struct expr *GenJNVariableComparison(
+  Environment *theEnv,
+  struct lhsParseNode *selfNode,
+  struct lhsParseNode *referringNode,
+  bool isNand)
+  {
+   struct expr *top;
+
+   /*========================================================*/
+   /* If either pattern is missing a function for generating */
+   /* the appropriate test, then no test is generated.       */
+   /*========================================================*/
+
+   if ((selfNode->patternType->genCompareJNValuesFunction == NULL) ||
+       (referringNode->patternType->genCompareJNValuesFunction == NULL))
+     { return NULL; }
+
+   /*=====================================================*/
+   /* If both patterns are of the same type, then use the */
+   /* special function for generating the join test.      */
+   /*=====================================================*/
+
+   if (selfNode->patternType->genCompareJNValuesFunction ==
+       referringNode->patternType->genCompareJNValuesFunction)
+
+     {
+      return (*selfNode->patternType->genCompareJNValuesFunction)(theEnv,selfNode,
+                                                                  referringNode,isNand);
+     }
+
+   /*===========================================================*/
+   /* If the patterns are of different types, then generate a   */
+   /* join test by using the eq/neq function with its arguments */
+   /* being function calls to retrieve the appropriate values   */
+   /* from the patterns.                                        */
+   /*===========================================================*/
+
+   if (selfNode->negated) top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_NEQ);
+   else top = GenConstant(theEnv,FCALL,ExpressionData(theEnv)->PTR_EQ);
+
+   top->argList = (*selfNode->patternType->genGetJNValueFunction)(theEnv,selfNode,RHS);
+   top->argList->nextArg = (*referringNode->patternType->genGetJNValueFunction)(theEnv,referringNode,LHS);
+
+   return(top);
+  }
+
+/*************************************************************/
+/* GenPNVariableComparison: Generates a pattern network test */
+/*   for comparing two variables found in the same pattern.  */
+/*************************************************************/
+static struct expr *GenPNVariableComparison(
+  Environment *theEnv,
+  struct lhsParseNode *selfNode,
+  struct lhsParseNode *referringNode)
+  {
+   if (selfNode->patternType->genComparePNValuesFunction != NULL)
+     {
+      return (*selfNode->patternType->genComparePNValuesFunction)(theEnv,selfNode,referringNode);
+     }
+
+   return NULL;
+  }
+
+/************************************************************/
+/* AllVariablesInPattern: Determines if all of the variable */
+/*   references in a field constraint can be referenced     */
+/*   within thepattern in which the field is contained.     */
+/************************************************************/
+static bool AllVariablesInPattern(
+  struct lhsParseNode *orField,
+  int pattern)
+  {
+   struct lhsParseNode *andField;
+
+   /*=========================================*/
+   /* Loop through each of the | constraints. */
+   /*=========================================*/
+
+   for (;
+        orField != NULL;
+        orField = orField->bottom)
+     {
+      /*=========================================*/
+      /* Loop through each of the & constraints. */
+      /*=========================================*/
+
+      for (andField = orField;
+           andField != NULL;
+           andField = andField->right)
+        {
+         /*========================================================*/
+         /* If a variable is found, make sure the pattern in which */
+         /* the variable was previously bound is the same as the   */
+         /* pattern being checked.                                 */
+         /*========================================================*/
+
+         if ((andField->pnType == SF_VARIABLE_NODE) || (andField->pnType == MF_VARIABLE_NODE))
+           { if (andField->referringNode->pattern != pattern) return false; }
+
+         /*========================================================*/
+         /* Check predicate and return value constraints to see    */
+         /* that all variables can be referenced from the pattern. */
+         /*========================================================*/
+
+         else if ((andField->pnType == PREDICATE_CONSTRAINT_NODE) ||
+                  (andField->pnType == RETURN_VALUE_CONSTRAINT_NODE))
+           {
+            if (AllVariablesInExpression(andField->expression,pattern) == false)
+              { return false; }
+           }
+        }
+     }
+
+   /*=====================================*/
+   /* All variables in the field can be   */
+   /* referenced from within the pattern. */
+   /*=====================================*/
+
+   return true;
+  }
+
+/**************************************************************************/
+/* AllVariablesInExpression: Determines if all of the variable references */
+/*   in an expression can be referenced within the pattern in which the   */
+/*   expression is contained.                                             */
+/**************************************************************************/
+static bool AllVariablesInExpression(
+  struct lhsParseNode *theExpression,
+  int pattern)
+  {
+   /*==========================================*/
+   /* Check all expressions in the right link. */
+   /*==========================================*/
+
+   for (;
+        theExpression != NULL;
+        theExpression = theExpression->right)
+     {
+      /*========================================================*/
+      /* If a variable is found, make sure the pattern in which */
+      /* the variable is bound is the same as the pattern being */
+      /* checked.                                               */
+      /*========================================================*/
+
+      if ((theExpression->pnType == SF_VARIABLE_NODE) ||
+          (theExpression->pnType == MF_VARIABLE_NODE))
+        { if (theExpression->referringNode->pattern != pattern) return false; }
+
+      /*=======================================================*/
+      /* Recursively check all expressions in the bottom link. */
+      /*=======================================================*/
+
+      if (AllVariablesInExpression(theExpression->bottom,pattern) == false)
+        { return false; }
+     }
+
+   /*========================================*/
+   /* All variables in the expression can be */
+   /* referenced from within the pattern.    */
+   /*========================================*/
+
+   return true;
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) && DEFRULE_CONSTRUCT */
+
+
diff --git a/clips/generate.h b/clips/generate.h
new file mode 100755
index 000000000..82680bfa9
--- /dev/null
+++ b/clips/generate.h
@@ -0,0 +1,57 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                GENERATE HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for converting field           */
+/*   constraints to expressions which can be used            */
+/*   in the pattern and join networks.                       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Reimplemented algorithm for comparisons to     */
+/*            variables contained within not/and CEs.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_generate
+
+#pragma once
+
+#define _H_generate
+
+#include "analysis.h"
+#include "expressn.h"
+#include "reorder.h"
+
+   void                           FieldConversion(Environment *,struct lhsParseNode *,struct lhsParseNode *,struct nandFrame *);
+   struct expr                   *GetvarReplace(Environment *,struct lhsParseNode *,bool,struct nandFrame *);
+   void                           AddNandUnification(Environment *,struct lhsParseNode *,struct nandFrame *);
+
+#endif /* _H_generate */
+
+
+
diff --git a/clips/genrcbin.c b/clips/genrcbin.c
new file mode 100755
index 000000000..217cbcb23
--- /dev/null
+++ b/clips/genrcbin.c
@@ -0,0 +1,902 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Binary Load/Save Functions for Generic Functions */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+
+#include "setup.h"
+
+#if DEFGENERIC_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+
+#include "bload.h"
+#include "bsave.h"
+#include "constant.h"
+#include "cstrcbin.h"
+#include "cstrccom.h"
+#include "envrnmnt.h"
+#include "genrccom.h"
+#include "memalloc.h"
+#include "modulbin.h"
+#if OBJECT_SYSTEM
+#include "objbin.h"
+#else
+#include "prntutil.h"
+#endif
+#include "router.h"
+
+#include "genrcbin.h"
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+
+#define MethodPointer(i) (((i) == ULONG_MAX) ? NULL : (&DefgenericBinaryData(theEnv)->MethodArray[i]))
+#define RestrictionPointer(i) (((i) == ULONG_MAX) ? NULL : (RESTRICTION *) &DefgenericBinaryData(theEnv)->RestrictionArray[i])
+#define TypePointer(i) (((i) == ULONG_MAX) ? NULL : (void **) &DefgenericBinaryData(theEnv)->TypeArray[i])
+
+typedef struct bsaveRestriction
+  {
+   unsigned long types;
+   unsigned long query;
+   unsigned short tcnt;
+  } BSAVE_RESTRICTION;
+
+typedef struct bsaveMethod
+  {
+   struct bsaveConstructHeader header;
+   unsigned short index;
+   unsigned short restrictionCount;
+   unsigned short minRestrictions, maxRestrictions;
+   unsigned short localVarCount;
+   unsigned system;
+   unsigned long restrictions;
+   unsigned long actions;
+  } BSAVE_METHOD;
+
+typedef struct bsaveGenericFunc
+  {
+   struct bsaveConstructHeader header;
+   unsigned long methods;
+   unsigned short mcnt;
+  } BSAVE_GENERIC;
+
+typedef struct bsaveGenericModule
+  {
+   struct bsaveDefmoduleItemHeader header;
+  } BSAVE_DEFGENERIC_MODULE;
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+
+   static void                    BsaveGenericsFind(Environment *);
+   static void                    MarkDefgenericItems(Environment *,ConstructHeader *,void *);
+   static void                    BsaveGenericsExpressions(Environment *,FILE *);
+   static void                    BsaveMethodExpressions(Environment *,ConstructHeader *,void *);
+   static void                    BsaveRestrictionExpressions(Environment *,ConstructHeader *,void *);
+   static void                    BsaveGenerics(Environment *,FILE *);
+   static void                    BsaveDefgenericHeader(Environment *,ConstructHeader *,void *);
+   static void                    BsaveMethods(Environment *,ConstructHeader *,void *);
+   static void                    BsaveMethodRestrictions(Environment *,ConstructHeader *,void *);
+   static void                    BsaveRestrictionTypes(Environment *,ConstructHeader *,void *);
+   static void                    BsaveStorageGenerics(Environment *,FILE *);
+
+#endif
+
+   static void                    BloadStorageGenerics(Environment *);
+   static void                    BloadGenerics(Environment *);
+   static void                    UpdateGenericModule(Environment *,void *,unsigned long);
+   static void                    UpdateGeneric(Environment *,void *,unsigned long);
+   static void                    UpdateMethod(Environment *,void *,unsigned long);
+   static void                    UpdateRestriction(Environment *,void *,unsigned long);
+   static void                    UpdateType(Environment *,void *,unsigned long);
+   static void                    ClearBloadGenerics(Environment *);
+   static void                    DeallocateDefgenericBinaryData(Environment *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : SetupGenericsBload
+  DESCRIPTION  : Initializes data structures and
+                   routines for binary loads of
+                   generic function constructs
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Routines defined and structures initialized
+  NOTES        : None
+ ***********************************************************/
+void SetupGenericsBload(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,GENRCBIN_DATA,sizeof(struct defgenericBinaryData),DeallocateDefgenericBinaryData);
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"generic functions",0,BsaveGenericsFind,BsaveGenericsExpressions,
+                             BsaveStorageGenerics,BsaveGenerics,
+                             BloadStorageGenerics,BloadGenerics,
+                             ClearBloadGenerics);
+#endif
+#if BLOAD || BLOAD_ONLY
+   AddBinaryItem(theEnv,"generic functions",0,NULL,NULL,NULL,NULL,
+                             BloadStorageGenerics,BloadGenerics,
+                             ClearBloadGenerics);
+#endif
+  }
+
+/***********************************************************/
+/* DeallocateDefgenericBinaryData: Deallocates environment */
+/*    data for the defgeneric binary functionality.        */
+/***********************************************************/
+static void DeallocateDefgenericBinaryData(
+  Environment *theEnv)
+  {
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   size_t space;
+
+   space = DefgenericBinaryData(theEnv)->GenericCount * sizeof(Defgeneric);
+   if (space != 0) genfree(theEnv,DefgenericBinaryData(theEnv)->DefgenericArray,space);
+
+   space = DefgenericBinaryData(theEnv)->MethodCount * sizeof(Defmethod);
+   if (space != 0) genfree(theEnv,DefgenericBinaryData(theEnv)->MethodArray,space);
+
+   space = DefgenericBinaryData(theEnv)->RestrictionCount * sizeof(struct restriction);
+   if (space != 0) genfree(theEnv,DefgenericBinaryData(theEnv)->RestrictionArray,space);
+
+   space = DefgenericBinaryData(theEnv)->TypeCount * sizeof(void *);
+   if (space != 0) genfree(theEnv,DefgenericBinaryData(theEnv)->TypeArray,space);
+
+   space =  DefgenericBinaryData(theEnv)->ModuleCount * sizeof(struct defgenericModule);
+   if (space != 0) genfree(theEnv,DefgenericBinaryData(theEnv)->ModuleArray,space);
+#endif
+  }
+
+/***************************************************
+  NAME         : BloadDefgenericModuleReference
+  DESCRIPTION  : Returns a pointer to the
+                 appropriate defgeneric module
+  INPUTS       : The index of the module
+  RETURNS      : A pointer to the module
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void *BloadDefgenericModuleReference(
+  Environment *theEnv,
+  unsigned long theIndex)
+  {
+   return ((void *) &DefgenericBinaryData(theEnv)->ModuleArray[theIndex]);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if BLOAD_AND_BSAVE
+
+/***************************************************************************
+  NAME         : BsaveGenericsFind
+  DESCRIPTION  : For all generic functions and their
+                   methods, this routine marks all
+                   the needed symbols and system functions.
+                 Also, it also counts the number of
+                   expression structures needed.
+                 Also, counts total number of generics, methods,
+                   restrictions and types.
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : ExpressionCount (a global from BSAVE.C) is incremented
+                   for every expression needed
+                 Symbols and system function are marked in their structures
+  NOTES        : Also sets bsaveIndex for each generic function (assumes
+                   generic functions will be bsaved in order of binary list)
+ ***************************************************************************/
+static void BsaveGenericsFind(
+  Environment *theEnv)
+  {
+   SaveBloadCount(theEnv,DefgenericBinaryData(theEnv)->ModuleCount);
+   SaveBloadCount(theEnv,DefgenericBinaryData(theEnv)->GenericCount);
+   SaveBloadCount(theEnv,DefgenericBinaryData(theEnv)->MethodCount);
+   SaveBloadCount(theEnv,DefgenericBinaryData(theEnv)->RestrictionCount);
+   SaveBloadCount(theEnv,DefgenericBinaryData(theEnv)->TypeCount);
+
+   DefgenericBinaryData(theEnv)->GenericCount = 0L;
+   DefgenericBinaryData(theEnv)->MethodCount = 0L;
+   DefgenericBinaryData(theEnv)->RestrictionCount = 0L;
+   DefgenericBinaryData(theEnv)->TypeCount = 0L;
+
+   DefgenericBinaryData(theEnv)->ModuleCount = GetNumberOfDefmodules(theEnv);
+   
+   DoForAllConstructs(theEnv,MarkDefgenericItems,
+                      DefgenericData(theEnv)->DefgenericModuleIndex,
+                      false,NULL);
+  }
+
+/***************************************************
+  NAME         : MarkDefgenericItems
+  DESCRIPTION  : Marks the needed items for
+                 a defgeneric (and methods) bsave
+  INPUTS       : 1) The defgeneric
+                 2) User data buffer (ignored)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Needed items marked
+  NOTES        : None
+ ***************************************************/
+static void MarkDefgenericItems(
+  Environment *theEnv,
+  ConstructHeader *theDefgeneric,
+  void *userBuffer)
+  {
+#if MAC_XCD
+#pragma unused(userBuffer)
+#endif
+   Defgeneric *gfunc = (Defgeneric *) theDefgeneric;
+   long i,j;
+   Defmethod *meth;
+   RESTRICTION *rptr;
+
+   MarkConstructHeaderNeededItems(&gfunc->header,DefgenericBinaryData(theEnv)->GenericCount++);
+   DefgenericBinaryData(theEnv)->MethodCount += gfunc->mcnt;
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     {
+      meth = &gfunc->methods[i];
+      ExpressionData(theEnv)->ExpressionCount += ExpressionSize(meth->actions);
+      MarkNeededItems(theEnv,meth->actions);
+      DefgenericBinaryData(theEnv)->RestrictionCount += meth->restrictionCount;
+      for (j = 0 ; j < meth->restrictionCount ; j++)
+        {
+         rptr = &meth->restrictions[j];
+         ExpressionData(theEnv)->ExpressionCount += ExpressionSize(rptr->query);
+         MarkNeededItems(theEnv,rptr->query);
+         DefgenericBinaryData(theEnv)->TypeCount += rptr->tcnt;
+        }
+     }
+  }
+
+/***************************************************
+  NAME         : BsaveGenericsExpressions
+  DESCRIPTION  : Writes out all expressions needed
+                   by generic functions
+  INPUTS       : The file pointer of the binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : File updated
+  NOTES        : None
+ ***************************************************/
+static void BsaveGenericsExpressions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   /*===================================================================*/
+   /* Important to save all expressions for methods before any          */
+   /* expressions for restrictions, since methods will be stored first. */
+   /*===================================================================*/
+
+   DoForAllConstructs(theEnv,BsaveMethodExpressions,DefgenericData(theEnv)->DefgenericModuleIndex,
+                      false,fp);
+
+   DoForAllConstructs(theEnv,BsaveRestrictionExpressions,DefgenericData(theEnv)->DefgenericModuleIndex,
+                      false,fp);
+  }
+
+/***************************************************
+  NAME         : BsaveMethodExpressions
+  DESCRIPTION  : Saves the needed expressions for
+                 a defgeneric methods bsave
+  INPUTS       : 1) The defgeneric
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Method action expressions saved
+  NOTES        : None
+ ***************************************************/
+static void BsaveMethodExpressions(
+  Environment *theEnv,
+  ConstructHeader *theDefgeneric,
+  void *userBuffer)
+  {
+   Defgeneric *gfunc = (Defgeneric *) theDefgeneric;
+   long i;
+
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     BsaveExpression(theEnv,gfunc->methods[i].actions,(FILE *) userBuffer);
+  }
+
+/***************************************************
+  NAME         : BsaveRestrictionExpressions
+  DESCRIPTION  : Saves the needed expressions for
+                 a defgeneric method restriction
+                 queries bsave
+  INPUTS       : 1) The defgeneric
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Method restriction query
+                 expressions saved
+  NOTES        : None
+ ***************************************************/
+static void BsaveRestrictionExpressions(
+  Environment *theEnv,
+  ConstructHeader *theDefgeneric,
+  void *userBuffer)
+  {
+   Defgeneric *gfunc = (Defgeneric *) theDefgeneric;
+   long i,j;
+   Defmethod *meth;
+
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     {
+      meth = &gfunc->methods[i];
+      for (j = 0 ; j < meth->restrictionCount ; j++)
+        BsaveExpression(theEnv,meth->restrictions[j].query,(FILE *) userBuffer);
+     }
+  }
+
+/***********************************************************
+  NAME         : BsaveStorageGenerics
+  DESCRIPTION  : Writes out number of each type of structure
+                   required for generics
+                 Space required for counts (unsigned long)
+  INPUTS       : File pointer of binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary file adjusted
+  NOTES        : None
+ ***********************************************************/
+static void BsaveStorageGenerics(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+
+   space = sizeof(long) * 5;
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&DefgenericBinaryData(theEnv)->ModuleCount,sizeof(long),fp);
+   GenWrite(&DefgenericBinaryData(theEnv)->GenericCount,sizeof(long),fp);
+   GenWrite(&DefgenericBinaryData(theEnv)->MethodCount,sizeof(long),fp);
+   GenWrite(&DefgenericBinaryData(theEnv)->RestrictionCount,sizeof(long),fp);
+   GenWrite(&DefgenericBinaryData(theEnv)->TypeCount,sizeof(long),fp);
+  }
+
+/****************************************************************************************
+  NAME         : BsaveGenerics
+  DESCRIPTION  : Writes out generic function in binary format
+                 Space required (unsigned long)
+                 All generic modules (sizeof(DEFGENERIC_MODULE) * Number of generic modules)
+                 All generic headers (sizeof(Defgeneric) * Number of generics)
+                 All methods (sizeof(Defmethod) * Number of methods)
+                 All method restrictions (sizeof(RESTRICTION) * Number of restriction
+                 All restriction type arrays (sizeof(void *) * # of types)
+  INPUTS       : File pointer of binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary file adjusted
+  NOTES        : None
+ ****************************************************************************************/
+static void BsaveGenerics(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   Defmodule *theModule;
+   DEFGENERIC_MODULE *theModuleItem;
+   size_t space;
+   BSAVE_DEFGENERIC_MODULE dummy_generic_module;
+
+   /* =====================================================================
+      Space is: Sum over all structures(sizeof(structure) * structure-cnt))
+      ===================================================================== */
+   space = (DefgenericBinaryData(theEnv)->ModuleCount * sizeof(BSAVE_DEFGENERIC_MODULE)) +
+           (DefgenericBinaryData(theEnv)->GenericCount * sizeof(BSAVE_GENERIC)) +
+           (DefgenericBinaryData(theEnv)->MethodCount * sizeof(BSAVE_METHOD)) +
+           (DefgenericBinaryData(theEnv)->RestrictionCount * sizeof(BSAVE_RESTRICTION)) +
+           (DefgenericBinaryData(theEnv)->TypeCount * sizeof(unsigned long));
+
+   /* ================================================================
+      Write out the total amount of space required:  modules,headers,
+      methods, restrictions, types
+      ================================================================ */
+   GenWrite(&space,sizeof(size_t),fp);
+
+   /* ======================================
+      Write out the generic function modules
+      ====================================== */
+   DefgenericBinaryData(theEnv)->GenericCount = 0L;
+   theModule = GetNextDefmodule(theEnv,NULL);
+   while (theModule != NULL)
+     {
+      theModuleItem = (DEFGENERIC_MODULE *)
+                      GetModuleItem(theEnv,theModule,FindModuleItem(theEnv,"defgeneric")->moduleIndex);
+      AssignBsaveDefmdlItemHdrVals(&dummy_generic_module.header,
+                                           &theModuleItem->header);
+      GenWrite(&dummy_generic_module,
+               sizeof(BSAVE_DEFGENERIC_MODULE),fp);
+      theModule = GetNextDefmodule(theEnv,theModule);
+     }
+
+
+   /* ======================================
+      Write out the generic function headers
+      ====================================== */
+   DefgenericBinaryData(theEnv)->MethodCount = 0L;
+   DoForAllConstructs(theEnv,BsaveDefgenericHeader,DefgenericData(theEnv)->DefgenericModuleIndex,
+                      false,fp);
+
+   /* =====================
+      Write out the methods
+      ===================== */
+   DefgenericBinaryData(theEnv)->RestrictionCount = 0L;
+   DoForAllConstructs(theEnv,BsaveMethods,DefgenericData(theEnv)->DefgenericModuleIndex,
+                      false,fp);
+
+   /* =================================
+      Write out the method restrictions
+      ================================= */
+   DefgenericBinaryData(theEnv)->TypeCount = 0L;
+   DoForAllConstructs(theEnv,BsaveMethodRestrictions,DefgenericData(theEnv)->DefgenericModuleIndex,
+                      false,fp);
+
+   /* =============================================================
+      Finally, write out the type lists for the method restrictions
+      ============================================================= */
+   DoForAllConstructs(theEnv,BsaveRestrictionTypes,DefgenericData(theEnv)->DefgenericModuleIndex,
+                      false,fp);
+
+   RestoreBloadCount(theEnv,&DefgenericBinaryData(theEnv)->ModuleCount);
+   RestoreBloadCount(theEnv,&DefgenericBinaryData(theEnv)->GenericCount);
+   RestoreBloadCount(theEnv,&DefgenericBinaryData(theEnv)->MethodCount);
+   RestoreBloadCount(theEnv,&DefgenericBinaryData(theEnv)->RestrictionCount);
+   RestoreBloadCount(theEnv,&DefgenericBinaryData(theEnv)->TypeCount);
+  }
+
+/***************************************************
+  NAME         : BsaveDefgenericHeader
+  DESCRIPTION  : Bsaves a generic function header
+  INPUTS       : 1) The defgeneric
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defgeneric header saved
+  NOTES        : None
+ ***************************************************/
+static void BsaveDefgenericHeader(
+  Environment *theEnv,
+  ConstructHeader *theDefgeneric,
+  void *userBuffer)
+  {
+   Defgeneric *gfunc = (Defgeneric *) theDefgeneric;
+   BSAVE_GENERIC dummy_generic;
+
+   AssignBsaveConstructHeaderVals(&dummy_generic.header,&gfunc->header);
+   dummy_generic.mcnt = gfunc->mcnt;
+   if (gfunc->methods != NULL)
+     {
+      dummy_generic.methods = DefgenericBinaryData(theEnv)->MethodCount;
+      DefgenericBinaryData(theEnv)->MethodCount += gfunc->mcnt;
+     }
+   else
+     dummy_generic.methods = ULONG_MAX;
+   GenWrite(&dummy_generic,sizeof(BSAVE_GENERIC),(FILE *) userBuffer);
+  }
+
+/***************************************************
+  NAME         : BsaveMethods
+  DESCRIPTION  : Bsaves defgeneric methods
+  INPUTS       : 1) The defgeneric
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defgeneric methods saved
+  NOTES        : None
+ ***************************************************/
+static void BsaveMethods(
+  Environment *theEnv,
+  ConstructHeader *theDefgeneric,
+  void *userBuffer)
+  {
+   Defgeneric *gfunc = (Defgeneric *) theDefgeneric;
+   Defmethod *meth;
+   BSAVE_METHOD dummy_method;
+   long i;
+
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     {
+      meth = &gfunc->methods[i];
+      
+      AssignBsaveConstructHeaderVals(&dummy_method.header,&meth->header);
+
+      dummy_method.index = meth->index;
+      dummy_method.restrictionCount = meth->restrictionCount;
+      dummy_method.minRestrictions = meth->minRestrictions;
+      dummy_method.maxRestrictions = meth->maxRestrictions;
+      dummy_method.localVarCount = meth->localVarCount;
+      dummy_method.system = meth->system;
+      if (meth->restrictions != NULL)
+        {
+         dummy_method.restrictions = DefgenericBinaryData(theEnv)->RestrictionCount;
+         DefgenericBinaryData(theEnv)->RestrictionCount += meth->restrictionCount;
+        }
+      else
+        dummy_method.restrictions = ULONG_MAX;
+      if (meth->actions != NULL)
+        {
+         dummy_method.actions = ExpressionData(theEnv)->ExpressionCount;
+         ExpressionData(theEnv)->ExpressionCount += ExpressionSize(meth->actions);
+        }
+      else
+        dummy_method.actions = ULONG_MAX;
+      GenWrite(&dummy_method,sizeof(BSAVE_METHOD),(FILE *) userBuffer);
+     }
+  }
+
+/******************************************************
+  NAME         : BsaveMethodRestrictions
+  DESCRIPTION  : Bsaves defgeneric methods' retrictions
+  INPUTS       : 1) The defgeneric
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defgeneric methods' restrictions saved
+  NOTES        : None
+ ******************************************************/
+static void BsaveMethodRestrictions(
+  Environment *theEnv,
+  ConstructHeader *theDefgeneric,
+  void *userBuffer)
+  {
+   Defgeneric *gfunc = (Defgeneric *) theDefgeneric;
+   BSAVE_RESTRICTION dummy_restriction;
+   RESTRICTION *rptr;
+   short i,j;
+
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     {
+      for (j = 0 ; j < gfunc->methods[i].restrictionCount ; j++)
+        {
+         rptr = &gfunc->methods[i].restrictions[j];
+         dummy_restriction.tcnt = rptr->tcnt;
+         if (rptr->types != NULL)
+           {
+            dummy_restriction.types = DefgenericBinaryData(theEnv)->TypeCount;
+            DefgenericBinaryData(theEnv)->TypeCount += rptr->tcnt;
+           }
+         else
+           dummy_restriction.types = ULONG_MAX;
+         if (rptr->query != NULL)
+           {
+            dummy_restriction.query = ExpressionData(theEnv)->ExpressionCount;
+            ExpressionData(theEnv)->ExpressionCount += ExpressionSize(rptr->query);
+           }
+         else
+           dummy_restriction.query = ULONG_MAX;
+         GenWrite(&dummy_restriction,
+                  sizeof(BSAVE_RESTRICTION),(FILE *) userBuffer);
+        }
+     }
+  }
+
+/*************************************************************
+  NAME         : BsaveRestrictionTypes
+  DESCRIPTION  : Bsaves defgeneric methods' retrictions' types
+  INPUTS       : 1) The defgeneric
+                 2) Output data file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defgeneric methods' restrictions' types saved
+  NOTES        : None
+ *************************************************************/
+static void BsaveRestrictionTypes(
+  Environment *theEnv,
+  ConstructHeader *theDefgeneric,
+  void *userBuffer)
+  {
+   Defgeneric *gfunc = (Defgeneric *) theDefgeneric;
+   unsigned long dummy_type;
+   RESTRICTION *rptr;
+   short i,j,k;
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     {
+      for (j = 0 ; j < gfunc->methods[i].restrictionCount ; j++)
+        {
+         rptr = &gfunc->methods[i].restrictions[j];
+         for (k = 0 ; k < rptr->tcnt ; k++)
+           {
+#if OBJECT_SYSTEM
+            dummy_type = DefclassIndex(rptr->types[k]);
+#else
+            dummy_type = (unsigned long) ((CLIPSInteger *) rptr->types[k])->contents;
+#endif
+            GenWrite(&dummy_type,sizeof(unsigned long),(FILE *) userBuffer);
+           }
+        }
+     }
+  }
+
+#endif
+
+/***********************************************************************
+  NAME         : BloadStorageGenerics
+  DESCRIPTION  : This routine space required for generic function
+                   structures and allocates space for them
+  INPUTS       : Nothing
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Arrays allocated and set
+  NOTES        : This routine makes no attempt to reset any pointers
+                   within the structures
+ ***********************************************************************/
+static void BloadStorageGenerics(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long counts[5];
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   if (space == 0L)
+     return;
+   GenReadBinary(theEnv,counts,space);
+   DefgenericBinaryData(theEnv)->ModuleCount = counts[0];
+   DefgenericBinaryData(theEnv)->GenericCount = counts[1];
+   DefgenericBinaryData(theEnv)->MethodCount = counts[2];
+   DefgenericBinaryData(theEnv)->RestrictionCount = counts[3];
+   DefgenericBinaryData(theEnv)->TypeCount = counts[4];
+   if (DefgenericBinaryData(theEnv)->ModuleCount != 0L)
+     {
+      space = (sizeof(DEFGENERIC_MODULE) * DefgenericBinaryData(theEnv)->ModuleCount);
+      DefgenericBinaryData(theEnv)->ModuleArray = (DEFGENERIC_MODULE *) genalloc(theEnv,space);
+     }
+   else
+     return;
+   if (DefgenericBinaryData(theEnv)->GenericCount != 0L)
+     {
+      space = (sizeof(Defgeneric) * DefgenericBinaryData(theEnv)->GenericCount);
+      DefgenericBinaryData(theEnv)->DefgenericArray = (Defgeneric *) genalloc(theEnv,space);
+     }
+   else
+     return;
+   if (DefgenericBinaryData(theEnv)->MethodCount != 0L)
+     {
+      space = (sizeof(Defmethod) * DefgenericBinaryData(theEnv)->MethodCount);
+      DefgenericBinaryData(theEnv)->MethodArray = (Defmethod *) genalloc(theEnv,space);
+     }
+   else
+     return;
+   if (DefgenericBinaryData(theEnv)->RestrictionCount != 0L)
+     {
+      space = (sizeof(RESTRICTION) * DefgenericBinaryData(theEnv)->RestrictionCount);
+      DefgenericBinaryData(theEnv)->RestrictionArray = (RESTRICTION *) genalloc(theEnv,space);
+     }
+   else
+     return;
+   if (DefgenericBinaryData(theEnv)->TypeCount != 0L)
+     {
+      space = (sizeof(void *) * DefgenericBinaryData(theEnv)->TypeCount);
+      DefgenericBinaryData(theEnv)->TypeArray = (void * *) genalloc(theEnv,space);
+     }
+  }
+
+/*********************************************************************
+  NAME         : BloadGenerics
+  DESCRIPTION  : This routine reads generic function information from
+                 a binary file in four chunks:
+                 Generic-header array
+                 Method array
+                 Method restrictions array
+                 Restriction types array
+
+                 This routine moves through the generic function
+                   binary arrays updating pointers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pointers reset from array indices
+  NOTES        : Assumes all loading is finished
+ ********************************************************************/
+static void BloadGenerics(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   if (DefgenericBinaryData(theEnv)->ModuleCount == 0L)
+     return;
+   BloadandRefresh(theEnv,DefgenericBinaryData(theEnv)->ModuleCount,sizeof(BSAVE_DEFGENERIC_MODULE),UpdateGenericModule);
+   if (DefgenericBinaryData(theEnv)->GenericCount == 0L)
+     return;
+   BloadandRefresh(theEnv,DefgenericBinaryData(theEnv)->GenericCount,sizeof(BSAVE_GENERIC),UpdateGeneric);
+   BloadandRefresh(theEnv,DefgenericBinaryData(theEnv)->MethodCount,sizeof(BSAVE_METHOD),UpdateMethod);
+   BloadandRefresh(theEnv,DefgenericBinaryData(theEnv)->RestrictionCount,sizeof(BSAVE_RESTRICTION),UpdateRestriction);
+   BloadandRefresh(theEnv,DefgenericBinaryData(theEnv)->TypeCount,sizeof(long),UpdateType);
+  }
+
+/*********************************************
+  Bload update routines for generic structures
+ *********************************************/
+static void UpdateGenericModule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_DEFGENERIC_MODULE *bdptr;
+
+   bdptr = (BSAVE_DEFGENERIC_MODULE *) buf;
+   UpdateDefmoduleItemHeader(theEnv,&bdptr->header,&DefgenericBinaryData(theEnv)->ModuleArray[obji].header,
+                             sizeof(Defgeneric),DefgenericBinaryData(theEnv)->DefgenericArray);
+  }
+
+static void UpdateGeneric(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_GENERIC *bgp;
+   Defgeneric *gp;
+
+   bgp = (BSAVE_GENERIC *) buf;
+   gp = &DefgenericBinaryData(theEnv)->DefgenericArray[obji];
+
+   UpdateConstructHeader(theEnv,&bgp->header,&gp->header,DEFGENERIC,
+                         sizeof(DEFGENERIC_MODULE),DefgenericBinaryData(theEnv)->ModuleArray,
+                         sizeof(Defgeneric),DefgenericBinaryData(theEnv)->DefgenericArray);
+   DefgenericBinaryData(theEnv)->DefgenericArray[obji].busy = 0;
+#if DEBUGGING_FUNCTIONS
+   DefgenericBinaryData(theEnv)->DefgenericArray[obji].trace = DefgenericData(theEnv)->WatchGenerics;
+#endif
+   DefgenericBinaryData(theEnv)->DefgenericArray[obji].methods = MethodPointer(bgp->methods);
+   DefgenericBinaryData(theEnv)->DefgenericArray[obji].mcnt = bgp->mcnt;
+   DefgenericBinaryData(theEnv)->DefgenericArray[obji].new_index = 0;
+  }
+
+static void UpdateMethod(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_METHOD *bmth;
+
+   bmth = (BSAVE_METHOD *) buf;
+   DefgenericBinaryData(theEnv)->MethodArray[obji].index = bmth->index;
+   DefgenericBinaryData(theEnv)->MethodArray[obji].busy = 0;
+#if DEBUGGING_FUNCTIONS
+   DefgenericBinaryData(theEnv)->MethodArray[obji].trace = DefgenericData(theEnv)->WatchMethods;
+#endif
+   DefgenericBinaryData(theEnv)->MethodArray[obji].restrictionCount = bmth->restrictionCount;
+   DefgenericBinaryData(theEnv)->MethodArray[obji].minRestrictions = bmth->minRestrictions;
+   DefgenericBinaryData(theEnv)->MethodArray[obji].maxRestrictions = bmth->maxRestrictions;
+   DefgenericBinaryData(theEnv)->MethodArray[obji].localVarCount = bmth->localVarCount;
+   DefgenericBinaryData(theEnv)->MethodArray[obji].system = bmth->system;
+   DefgenericBinaryData(theEnv)->MethodArray[obji].restrictions = RestrictionPointer(bmth->restrictions);
+   DefgenericBinaryData(theEnv)->MethodArray[obji].actions = ExpressionPointer(bmth->actions);
+   
+   UpdateConstructHeader(theEnv,&bmth->header,&DefgenericBinaryData(theEnv)->MethodArray[obji].header,DEFMETHOD,
+                         sizeof(DEFGENERIC_MODULE),DefgenericBinaryData(theEnv)->ModuleArray,
+                         sizeof(Defmethod),DefgenericBinaryData(theEnv)->MethodArray);
+  }
+
+static void UpdateRestriction(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_RESTRICTION *brp;
+
+   brp = (BSAVE_RESTRICTION *) buf;
+   DefgenericBinaryData(theEnv)->RestrictionArray[obji].tcnt = brp->tcnt;
+   DefgenericBinaryData(theEnv)->RestrictionArray[obji].types = TypePointer(brp->types);
+   DefgenericBinaryData(theEnv)->RestrictionArray[obji].query = ExpressionPointer(brp->query);
+  }
+
+static void UpdateType(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+#if OBJECT_SYSTEM
+   DefgenericBinaryData(theEnv)->TypeArray[obji] = DefclassPointer(* (unsigned long *) buf);
+#else
+   if ((* (long *) buf) > INSTANCE_TYPE_CODE)
+     {
+      PrintWarningID(theEnv,"GENRCBIN",1,false);
+      WriteString(theEnv,STDWRN,"COOL not installed!  User-defined class\n");
+      WriteString(theEnv,STDWRN,"  in method restriction substituted with OBJECT.\n");
+      DefgenericBinaryData(theEnv)->TypeArray[obji] = CreateInteger(theEnv,OBJECT_TYPE_CODE);
+     }
+   else
+     DefgenericBinaryData(theEnv)->TypeArray[obji] = CreateInteger(theEnv,* (long *) buf);
+   IncrementIntegerCount((CLIPSInteger *) DefgenericBinaryData(theEnv)->TypeArray[obji]);
+#endif
+  }
+
+/***************************************************************
+  NAME         : ClearBloadGenerics
+  DESCRIPTION  : Release all binary-loaded generic function
+                   structure arrays
+                 Resets generic function list to NULL
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Memory cleared
+  NOTES        : Generic function name symbol counts decremented
+ ***************************************************************/
+static void ClearBloadGenerics(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   size_t space;
+
+   space = (sizeof(DEFGENERIC_MODULE) * DefgenericBinaryData(theEnv)->ModuleCount);
+   if (space == 0L)
+     return;
+   genfree(theEnv,DefgenericBinaryData(theEnv)->ModuleArray,space);
+   DefgenericBinaryData(theEnv)->ModuleArray = NULL;
+   DefgenericBinaryData(theEnv)->ModuleCount = 0L;
+
+   for (i = 0 ; i < DefgenericBinaryData(theEnv)->GenericCount ; i++)
+     UnmarkConstructHeader(theEnv,&DefgenericBinaryData(theEnv)->DefgenericArray[i].header);
+
+   space = (sizeof(Defgeneric) * DefgenericBinaryData(theEnv)->GenericCount);
+   if (space == 0L)
+     return;
+   genfree(theEnv,DefgenericBinaryData(theEnv)->DefgenericArray,space);
+   DefgenericBinaryData(theEnv)->DefgenericArray = NULL;
+   DefgenericBinaryData(theEnv)->GenericCount = 0L;
+
+   space = (sizeof(Defmethod) * DefgenericBinaryData(theEnv)->MethodCount);
+   if (space == 0L)
+     return;
+   genfree(theEnv,DefgenericBinaryData(theEnv)->MethodArray,space);
+   DefgenericBinaryData(theEnv)->MethodArray = NULL;
+   DefgenericBinaryData(theEnv)->MethodCount = 0L;
+
+   space = (sizeof(RESTRICTION) * DefgenericBinaryData(theEnv)->RestrictionCount);
+   if (space == 0L)
+     return;
+   genfree(theEnv,DefgenericBinaryData(theEnv)->RestrictionArray,space);
+   DefgenericBinaryData(theEnv)->RestrictionArray = NULL;
+   DefgenericBinaryData(theEnv)->RestrictionCount = 0L;
+
+#if ! OBJECT_SYSTEM
+   for (i = 0 ; i < DefgenericBinaryData(theEnv)->TypeCount ; i++)
+     DecrementIntegerCount(theEnv,(CLIPSInteger *) DefgenericBinaryData(theEnv)->TypeArray[i]);
+#endif
+   space = (sizeof(void *) * DefgenericBinaryData(theEnv)->TypeCount);
+   if (space == 0L)
+     return;
+   genfree(theEnv,DefgenericBinaryData(theEnv)->TypeArray,space);
+   DefgenericBinaryData(theEnv)->TypeArray = NULL;
+   DefgenericBinaryData(theEnv)->TypeCount = 0L;
+  }
+
+#endif
+
diff --git a/clips/genrcbin.h b/clips/genrcbin.h
new file mode 100755
index 000000000..e395b399a
--- /dev/null
+++ b/clips/genrcbin.h
@@ -0,0 +1,69 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_genrcbin
+
+#pragma once
+
+#define _H_genrcbin
+
+#include "genrcfun.h"
+
+#define GENRCBIN_DATA 28
+
+struct defgenericBinaryData
+  {
+   Defgeneric *DefgenericArray;
+   unsigned long ModuleCount;
+   unsigned long GenericCount;
+   unsigned long MethodCount;
+   unsigned long RestrictionCount;
+   unsigned long TypeCount;
+   DEFGENERIC_MODULE *ModuleArray;
+   Defmethod *MethodArray;
+   RESTRICTION *RestrictionArray;
+   void **TypeArray;
+  };
+
+#define DefgenericBinaryData(theEnv) ((struct defgenericBinaryData *) GetEnvironmentData(theEnv,GENRCBIN_DATA))
+
+#define GenericPointer(i) (((i) == ULONG_MAX) ? NULL : &DefgenericBinaryData(theEnv)->DefgenericArray[i])
+
+   void                           SetupGenericsBload(Environment *);
+   void                          *BloadDefgenericModuleReference(Environment *,unsigned long);
+
+#endif /* _H_genrcbin */
+
+
+
+
diff --git a/clips/genrccmp.c b/clips/genrccmp.c
new file mode 100755
index 000000000..eac16704d
--- /dev/null
+++ b/clips/genrccmp.c
@@ -0,0 +1,640 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Generic Function Construct Compiler Code         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added pragmas to remove unused parameter       */
+/*            warnings.                                      */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFGENERIC_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include "conscomp.h"
+#include "envrnmnt.h"
+#include "genrccom.h"
+#if DEFRULE_CONSTRUCT
+#include "network.h"
+#endif
+#if OBJECT_SYSTEM
+#include "objcmp.h"
+#endif
+
+#include "genrccmp.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define MODULEI      0
+#define GENERICI     1
+#define METHODI      2
+#define RESTRICTIONI 3
+#define TYPEI        4
+
+#define SAVE_ITEMS   5
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+#define MethodPrefix()      ArbitraryPrefix(DefgenericData(theEnv)->DefgenericCodeItem,2)
+#define RestrictionPrefix() ArbitraryPrefix(DefgenericData(theEnv)->DefgenericCodeItem,3)
+#define TypePrefix()        ArbitraryPrefix(DefgenericData(theEnv)->DefgenericCodeItem,4)
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ReadyDefgenericsForCode(Environment *);
+   static bool                    DefgenericsToCode(Environment *,const char *,const char *,char *,
+                                                    unsigned int,FILE *,unsigned int,unsigned int);
+   static void                    CloseDefgenericFiles(Environment *,FILE *[SAVE_ITEMS],bool [SAVE_ITEMS],
+                                                       struct CodeGeneratorFile [SAVE_ITEMS],unsigned int);
+   static void                    DefgenericModuleToCode(Environment *,FILE *,Defmodule *,unsigned int,unsigned int);
+   static void                    SingleDefgenericToCode(Environment *,FILE *,unsigned int,unsigned int,
+                                                         Defgeneric *,unsigned int,unsigned int,unsigned int);
+   static void                    MethodToCode(Environment *,FILE *,unsigned int,unsigned int,Defmethod *,
+                                               unsigned int,unsigned int,unsigned int);
+   static void                    RestrictionToCode(Environment *,FILE *,unsigned int,RESTRICTION *,
+                                                    unsigned int,unsigned int);
+   static void                    TypeToCode(Environment *,FILE *,unsigned int,void *,unsigned int);
+   static void                    InitDefgenericsCode(Environment *,FILE *,unsigned int,unsigned int);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupGenericsCompiler
+  DESCRIPTION  : Initializes the construct compiler
+                   item for generic functions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Code generator item initialized
+  NOTES        : None
+ ***************************************************/
+void SetupGenericsCompiler(
+  Environment *theEnv)
+  {
+   DefgenericData(theEnv)->DefgenericCodeItem = AddCodeGeneratorItem(theEnv,"generics",0,ReadyDefgenericsForCode,
+                                             InitDefgenericsCode,DefgenericsToCode,5);
+  }
+
+/***************************************************
+  NAME         : PrintGenericFunctionReference
+  DESCRIPTION  : Prints a reference to the run-time
+                 generic array for the construct
+                 compiler
+  INPUTS       : 1) The file output destination
+                 2) A pointer to the generic
+                 3) The id of the run-time image
+                 4) The maximum number of indices
+                    in any array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Reference printed
+  NOTES        : None
+ ***************************************************/
+void PrintGenericFunctionReference(
+  Environment *theEnv,
+  FILE *fp,
+  Defgeneric *gfunc,
+  unsigned imageID,
+  unsigned maxIndices)
+  {
+   if (gfunc == NULL)
+     fprintf(fp,"NULL");
+   else
+     fprintf(fp,"&%s%d_%lu[%lul]",ConstructPrefix(DefgenericData(theEnv)->DefgenericCodeItem),imageID,
+                                (gfunc->header.bsaveID / maxIndices) + 1,
+                                (gfunc->header.bsaveID % maxIndices));
+  }
+
+/****************************************************
+  NAME         : DefgenericCModuleReference
+  DESCRIPTION  : Prints out a reference to a
+                 defgeneric module
+  INPUTS       : 1) The output file
+                 2) The id of the module item
+                 3) The id of the image
+                 4) The maximum number of elements
+                    allowed in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defgeneric module reference printed
+  NOTES        : None
+ ****************************************************/
+void DefgenericCModuleReference(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned long count,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"MIHS &%s%u_%lu[%lu]",
+                      ModulePrefix(DefgenericData(theEnv)->DefgenericCodeItem),
+                      imageID,
+                      (count / maxIndices) + 1,
+                      (count % maxIndices));
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : ReadyDefgenericsForCode
+  DESCRIPTION  : Sets index of generic-functions
+                   for use in compiled expressions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : BsaveIndices set
+  NOTES        : None
+ ***************************************************/
+static void ReadyDefgenericsForCode(
+  Environment *theEnv)
+  {
+   MarkConstructBsaveIDs(theEnv,DefgenericData(theEnv)->DefgenericModuleIndex);
+  }
+
+/**************************************************/
+/* InitDefgenericsCode: Writes out initialization */
+/*   code for defgenerics for a run-time module.  */
+/**************************************************/
+static void InitDefgenericsCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+#if MAC_XCD
+#pragma unused(maxIndices)
+#pragma unused(imageID)
+#pragma unused(theEnv)
+#endif
+   fprintf(initFP,"   DefgenericRunTimeInitialize(theEnv);\n");
+  }
+
+/*******************************************************
+  NAME         : DefgenericsToCode
+  DESCRIPTION  : Writes out static array code for
+                   generic functions, methods, etc.
+  INPUTS       : 1) The base name of the construct set
+                 2) The base id for this construct
+                 3) The file pointer for the header file
+                 4) The base id for the construct set
+                 5) The max number of indices allowed
+                    in an array
+  RETURNS      : False on errors,
+                 true if generic functions written
+  SIDE EFFECTS : Code written to files
+  NOTES        : None
+ *******************************************************/
+static bool DefgenericsToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int fileCount = 1;
+   Defmodule *theModule;
+   Defgeneric *theDefgeneric;
+   Defmethod *theMethod;
+   RESTRICTION *theRestriction;
+   short i,j,k;
+   unsigned int moduleCount = 0;
+   unsigned int itemArrayCounts[SAVE_ITEMS];
+   unsigned int itemArrayVersions[SAVE_ITEMS];
+   FILE *itemFiles[SAVE_ITEMS];
+   bool itemReopenFlags[SAVE_ITEMS];
+   struct CodeGeneratorFile itemCodeFiles[SAVE_ITEMS];
+
+   for (i = 0 ; i < SAVE_ITEMS ; i++)
+     {
+      itemArrayCounts[i] = 0;
+      itemArrayVersions[i] = 1;
+      itemFiles[i] = NULL;
+      itemReopenFlags[i] = false;
+      itemCodeFiles[i].filePrefix = NULL;
+      itemCodeFiles[i].pathName = pathName;
+      itemCodeFiles[i].fileNameBuffer = fileNameBuffer;
+     }
+
+   /* ===========================================
+      Include the appropriate generic header file
+      =========================================== */
+   fprintf(headerFP,"#include \"genrcfun.h\"\n");
+
+   /* =============================================================
+      Loop through all the modules and all the defgenerics writing
+      their C code representation to the file as they are traversed
+      ============================================================= */
+   theModule = GetNextDefmodule(theEnv,NULL);
+
+   while (theModule != NULL)
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      itemFiles[MODULEI] =
+         OpenFileIfNeeded(theEnv,itemFiles[MODULEI],fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                          itemArrayVersions[MODULEI],headerFP,
+                          "DEFGENERIC_MODULE",ModulePrefix(DefgenericData(theEnv)->DefgenericCodeItem),
+                          itemReopenFlags[MODULEI],&itemCodeFiles[MODULEI]);
+      if (itemFiles[MODULEI] == NULL)
+        goto GenericCodeError;
+
+      DefgenericModuleToCode(theEnv,itemFiles[MODULEI],theModule,imageID,maxIndices);
+      itemFiles[MODULEI] =
+          CloseFileIfNeeded(theEnv,itemFiles[MODULEI],&itemArrayCounts[MODULEI],
+                            &itemArrayVersions[MODULEI],maxIndices,
+                            &itemReopenFlags[MODULEI],&itemCodeFiles[MODULEI]);
+
+      theDefgeneric = GetNextDefgeneric(theEnv,NULL);
+
+      while (theDefgeneric != NULL)
+        {
+         itemFiles[GENERICI] =
+            OpenFileIfNeeded(theEnv,itemFiles[GENERICI],fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                             itemArrayVersions[GENERICI],headerFP,
+                             "Defgeneric",ConstructPrefix(DefgenericData(theEnv)->DefgenericCodeItem),
+                             itemReopenFlags[GENERICI],&itemCodeFiles[GENERICI]);
+         if (itemFiles[GENERICI] == NULL)
+           goto GenericCodeError;
+
+         SingleDefgenericToCode(theEnv,itemFiles[GENERICI],imageID,maxIndices,theDefgeneric,
+                                moduleCount,itemArrayVersions[METHODI],
+                                itemArrayCounts[METHODI]);
+         itemArrayCounts[GENERICI]++;
+         itemFiles[GENERICI] =
+           CloseFileIfNeeded(theEnv,itemFiles[GENERICI],&itemArrayCounts[GENERICI],
+                             &itemArrayVersions[GENERICI],maxIndices,
+                             &itemReopenFlags[GENERICI],&itemCodeFiles[GENERICI]);
+         if (theDefgeneric->mcnt > 0)
+           {
+
+            /* ===========================================
+               Make sure that all methods for a particular
+               generic function go into the same array
+               =========================================== */
+            itemFiles[METHODI] =
+                OpenFileIfNeeded(theEnv,itemFiles[METHODI],fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                 itemArrayVersions[METHODI],headerFP,
+                                 "Defmethod",MethodPrefix(),
+                                 itemReopenFlags[METHODI],&itemCodeFiles[METHODI]);
+            if (itemFiles[METHODI] == NULL)
+              goto GenericCodeError;
+
+            for (i = 0 ; i < theDefgeneric->mcnt ; i++)
+              {
+               theMethod = &theDefgeneric->methods[i];
+               if (i > 0)
+                 fprintf(itemFiles[METHODI],",\n");
+               MethodToCode(theEnv,itemFiles[METHODI],imageID,maxIndices,theMethod,moduleCount,
+                            itemArrayVersions[RESTRICTIONI],itemArrayCounts[RESTRICTIONI]);
+               if (theMethod->restrictionCount > 0)
+                 {
+                  /* ========================================
+                     Make sure that all restrictions for a
+                     particular method go into the same array
+                     ======================================== */
+                  itemFiles[RESTRICTIONI] =
+                     OpenFileIfNeeded(theEnv,itemFiles[RESTRICTIONI],fileName,pathName,fileNameBuffer,fileID,
+                                      imageID,&fileCount,
+                                      itemArrayVersions[RESTRICTIONI],headerFP,
+                                      "RESTRICTION",RestrictionPrefix(),
+                                      itemReopenFlags[RESTRICTIONI],&itemCodeFiles[RESTRICTIONI]);
+                  if (itemFiles[RESTRICTIONI] == NULL)
+                    goto GenericCodeError;
+                  for (j = 0 ; j < theMethod->restrictionCount ; j++)
+                    {
+                     theRestriction = &theMethod->restrictions[j];
+                     if (j > 0)
+                       fprintf(itemFiles[RESTRICTIONI],",\n");
+                     RestrictionToCode(theEnv,itemFiles[RESTRICTIONI],imageID,theRestriction,
+                                       itemArrayVersions[TYPEI],itemArrayCounts[TYPEI]);
+
+                     if (theRestriction->tcnt > 0)
+                       {
+                        /* =========================================
+                           Make sure that all types for a particular
+                           restriction go into the same array
+                           ========================================= */
+                        itemFiles[TYPEI] =
+                           OpenFileIfNeeded(theEnv,itemFiles[TYPEI],fileName,pathName,fileNameBuffer,fileID,
+                                            imageID,&fileCount,
+                                            itemArrayVersions[TYPEI],headerFP,
+                                            "void *",TypePrefix(),
+                                            itemReopenFlags[TYPEI],&itemCodeFiles[TYPEI]);
+                        if (itemFiles[TYPEI] == NULL)
+                          goto GenericCodeError;
+                        for (k = 0 ; k < theRestriction->tcnt ; k++)
+                          {
+                           if (k > 0)
+                             fprintf(itemFiles[TYPEI],",\n");
+                           TypeToCode(theEnv,itemFiles[TYPEI],imageID,
+                                      theRestriction->types[k],maxIndices);
+                          }
+                        itemArrayCounts[TYPEI] += theRestriction->tcnt;
+                        itemFiles[TYPEI] =
+                           CloseFileIfNeeded(theEnv,itemFiles[TYPEI],&itemArrayCounts[TYPEI],
+                                             &itemArrayVersions[TYPEI],maxIndices,
+                                             &itemReopenFlags[TYPEI],&itemCodeFiles[TYPEI]);
+                       }
+                    }
+                  itemArrayCounts[RESTRICTIONI] += theMethod->restrictionCount;
+                  itemFiles[RESTRICTIONI] =
+                     CloseFileIfNeeded(theEnv,itemFiles[RESTRICTIONI],&itemArrayCounts[RESTRICTIONI],
+                                       &itemArrayVersions[RESTRICTIONI],maxIndices,
+                                       &itemReopenFlags[RESTRICTIONI],&itemCodeFiles[RESTRICTIONI]);
+                 }
+              }
+            itemArrayCounts[METHODI] += theDefgeneric->mcnt;
+            itemFiles[METHODI] =
+               CloseFileIfNeeded(theEnv,itemFiles[METHODI],&itemArrayCounts[METHODI],
+                                 &itemArrayVersions[METHODI],maxIndices,
+                                 &itemReopenFlags[METHODI],&itemCodeFiles[METHODI]);
+           }
+         theDefgeneric = GetNextDefgeneric(theEnv,theDefgeneric);
+        }
+
+      theModule = GetNextDefmodule(theEnv,theModule);
+      moduleCount++;
+      itemArrayCounts[MODULEI]++;
+     }
+   CloseDefgenericFiles(theEnv,itemFiles,itemReopenFlags,itemCodeFiles,maxIndices);
+   return true;
+
+GenericCodeError:
+   CloseDefgenericFiles(theEnv,itemFiles,itemReopenFlags,itemCodeFiles,maxIndices);
+   return false;
+  }
+
+/******************************************************
+  NAME         : CloseDefgenericFiles
+  DESCRIPTION  : Closes construct compiler files
+                  for defgeneric structures
+  INPUTS       : 1) An array containing all the
+                    pertinent file pointers
+                 2) An array containing all the
+                    pertinent file reopen flags
+                 3) An array containing all the
+                    pertinent file name/id/version info
+                 4) The maximum number of indices
+                    allowed in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Files closed
+  NOTES        : None
+ *****************************************************/
+static void CloseDefgenericFiles(
+  Environment *theEnv,
+  FILE *itemFiles[SAVE_ITEMS],
+  bool itemReopenFlags[SAVE_ITEMS],
+  struct CodeGeneratorFile itemCodeFiles[SAVE_ITEMS],
+  unsigned int maxIndices)
+  {
+   unsigned int count = maxIndices;
+   unsigned int arrayVersion = 0;
+   unsigned int i;
+
+   for (i = 0 ; i < SAVE_ITEMS ; i++)
+     {
+      count = maxIndices;
+      itemFiles[i] = CloseFileIfNeeded(theEnv,itemFiles[i],&count,&arrayVersion,
+                                       maxIndices,&itemReopenFlags[i],
+                                       &itemCodeFiles[i]);
+     }
+  }
+
+/***************************************************
+  NAME         : DefgenericModuleToCode
+  DESCRIPTION  : Writes out the C values for a
+                 defgeneric module item
+  INPUTS       : 1) The output file
+                 2) The module for the defgenerics
+                 3) The compile image id
+                 4) The maximum number of elements
+                    in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defgeneric module item written
+  NOTES        : None
+ ***************************************************/
+static void DefgenericModuleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"{");
+   ConstructModuleToCode(theEnv,theFile,theModule,imageID,maxIndices,
+                         DefgenericData(theEnv)->DefgenericModuleIndex,ConstructPrefix(DefgenericData(theEnv)->DefgenericCodeItem));
+   fprintf(theFile,"}");
+  }
+
+/****************************************************************
+  NAME         : SingleDefgenericToCode
+  DESCRIPTION  : Writes out a single defgeneric's
+                 data to the file
+  INPUTS       : 1)  The output file
+                 2)  The compile image id
+                 3)  The maximum number of
+                     elements in an array
+                 4)  The defgeneric
+                 5)  The module index
+                 6)  The partition holding the
+                     generic methods
+                 7) The relative index of the
+                    generics methods in the partition
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defgeneric data written
+  NOTES        : None
+ ***************************************************************/
+static void SingleDefgenericToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  Defgeneric *theDefgeneric,
+  unsigned int moduleCount,
+  unsigned int methodArrayVersion,
+  unsigned int methodArrayCount)
+  {
+   /* ==================
+      Defgeneric Header
+      ================== */
+   fprintf(theFile,"{");
+   ConstructHeaderToCode(theEnv,theFile,&theDefgeneric->header,imageID,maxIndices,moduleCount,
+                         ModulePrefix(DefgenericData(theEnv)->DefgenericCodeItem),
+                         ConstructPrefix(DefgenericData(theEnv)->DefgenericCodeItem));
+
+   /* =========================
+      Defgeneric specific data
+      ========================= */
+   fprintf(theFile,",0,0,");
+   if (theDefgeneric->methods == NULL)
+     fprintf(theFile,"NULL");
+   else
+     {
+      fprintf(theFile,"&%s%d_%d[%d]",MethodPrefix(),imageID,
+                      methodArrayVersion,methodArrayCount);
+     }
+   fprintf(theFile,",%hd,0}",theDefgeneric->mcnt);
+  }
+
+/****************************************************************
+  NAME         : MethodToCode
+  DESCRIPTION  : Writes out a single method's
+                 data to the file
+  INPUTS       : 1)  The output file
+                 2)  The compile image id
+                 3)  The method
+                 4)  The partition holding the
+                     method restrictions
+                 5) The relative index of the
+                    method restrictions in the partition
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Method data written
+  NOTES        : None
+ ***************************************************************/
+static void MethodToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  Defmethod *theMethod,
+  unsigned int moduleCount,
+  unsigned int restrictionArrayVersion,
+  unsigned int restrictionArrayCount)
+  {
+   fprintf(theFile,"{");
+   ConstructHeaderToCode(theEnv,theFile,&theMethod->header,imageID,maxIndices,moduleCount,
+                         ModulePrefix(DefgenericData(theEnv)->DefgenericCodeItem),
+                         "");
+
+   fprintf(theFile,",%u,0,%hd,%hu,%hu,%hd,%u,0,",
+                   theMethod->index,theMethod->restrictionCount,
+                   theMethod->minRestrictions,theMethod->maxRestrictions,
+                   theMethod->localVarCount,theMethod->system);
+   if (theMethod->restrictions == NULL)
+     fprintf(theFile,"NULL,");
+   else
+     fprintf(theFile,"&%s%d_%d[%d],",RestrictionPrefix(),imageID,
+                                     restrictionArrayVersion,restrictionArrayCount);
+   ExpressionToCode(theEnv,theFile,theMethod->actions);
+   fprintf(theFile,"}");
+  }
+
+/****************************************************************
+  NAME         : RestrictionToCode
+  DESCRIPTION  : Writes out a single restriction's
+                 data to the file
+  INPUTS       : 1)  The output file
+                 2)  The compile image id
+                 3)  The restriction
+                 4)  The partition holding the
+                     restriction types
+                 5) The relative index of the
+                    restriction types in the partition
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Restriction data written
+  NOTES        : None
+ ***************************************************************/
+static void RestrictionToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned int imageID,
+  RESTRICTION *theRestriction,
+  unsigned int typeArrayVersion,
+  unsigned int typeArrayCount)
+  {
+   fprintf(theFile,"{");
+   if (theRestriction->types == NULL)
+     fprintf(theFile,"NULL,");
+   else
+     fprintf(theFile,"&%s%d_%d[%d],",TypePrefix(),imageID,
+                                     typeArrayVersion,typeArrayCount);
+   ExpressionToCode(theEnv,theFile,theRestriction->query);
+   fprintf(theFile,",%hd}",theRestriction->tcnt);
+  }
+
+/****************************************************************
+  NAME         : TypeToCode
+  DESCRIPTION  : Writes out a single type's
+                 data to the file
+  INPUTS       : 1)  The output file
+                 2)  The compile image id
+                 3)  The type
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Type data written
+  NOTES        : None
+ ***************************************************************/
+static void TypeToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned int imageID,
+  void *theType,
+  unsigned int maxIndices)
+  {
+#if OBJECT_SYSTEM
+   fprintf(theFile,"VS ");
+   PrintClassReference(theEnv,theFile,(Defclass *) theType,imageID,maxIndices);
+#else
+
+#if MAC_XCD
+#pragma unused(imageID)
+#pragma unused(maxIndices)
+#endif
+
+   PrintIntegerReference(theEnv,theFile,(CLIPSInteger *) theType);
+#endif
+  }
+
+#endif
diff --git a/clips/genrccmp.h b/clips/genrccmp.h
new file mode 100755
index 000000000..a487a4684
--- /dev/null
+++ b/clips/genrccmp.h
@@ -0,0 +1,59 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Generic Function Construct Compiler Code         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added pragmas to remove unused parameter       */
+/*            warnings.                                      */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_genrccmp
+
+#pragma once
+
+#define _H_genrccmp
+
+#include <stdio.h>
+
+#include "genrcfun.h"
+
+   void                           SetupGenericsCompiler(Environment *);
+   void                           PrintGenericFunctionReference(Environment *,FILE *,Defgeneric *,
+                                                                unsigned int,unsigned int);
+   void                           DefgenericCModuleReference(Environment *,FILE *,unsigned long,unsigned int,unsigned int);
+
+#endif /* _H_genrccmp */
+
diff --git a/clips/genrccom.c b/clips/genrccom.c
new file mode 100755
index 000000000..25729621d
--- /dev/null
+++ b/clips/genrccom.c
@@ -0,0 +1,2017 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Generic Functions Interface Routines             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_METHODS compilation flag.   */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warning.                              */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when DEBUGGING_FUNCTIONS   */
+/*            is set to 0 and PROFILING_FUNCTIONS is set to  */
+/*            1.                                             */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFGENERIC_CONSTRUCT
+
+#include <string.h>
+
+#include "argacces.h"
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+#if OBJECT_SYSTEM
+#include "classcom.h"
+#include "inscom.h"
+#endif
+#include "constrct.h"
+#include "cstrccom.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "extnfunc.h"
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "genrcbin.h"
+#endif
+#if CONSTRUCT_COMPILER
+#include "genrccmp.h"
+#endif
+#include "genrcexe.h"
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+#include "genrcpsr.h"
+#endif
+#include "memalloc.h"
+#include "modulpsr.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "router.h"
+#include "strngrtr.h"
+#if DEBUGGING_FUNCTIONS
+#include "watch.h"
+#endif
+#include "prntutil.h"
+
+#include "genrccom.h"
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+   static void                    PrintGenericCall(Environment *,const char *,Defgeneric *);
+   static bool                    EvaluateGenericCall(Environment *,Defgeneric *,UDFValue *);
+   static void                    DecrementGenericBusyCount(Environment *,Defgeneric *);
+   static void                    IncrementGenericBusyCount(Environment *,Defgeneric *);
+   static void                    DeallocateDefgenericData(Environment *);
+
+#if ! RUN_TIME
+   static void                    DestroyDefgenericAction(Environment *,ConstructHeader *,void *);
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+   static void                    SaveDefgenerics(Environment *,Defmodule *,const char *,void *);
+   static void                    SaveDefmethods(Environment *,Defmodule *,const char *,void *);
+   static void                    SaveDefmethodsForDefgeneric(Environment *,ConstructHeader *,void *);
+   static void                    RemoveDefgenericMethod(Environment *,Defgeneric *,unsigned short);
+
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   static unsigned short          ListMethodsForGeneric(Environment *,const char *,Defgeneric *);
+   static bool                    DefgenericWatchAccess(Environment *,int,bool,Expression *);
+   static bool                    DefgenericWatchPrint(Environment *,const char *,int,Expression *);
+   static bool                    DefmethodWatchAccess(Environment *,int,bool,Expression *);
+   static bool                    DefmethodWatchPrint(Environment *,const char *,int,Expression *);
+   static bool                    DefmethodWatchSupport(Environment *,const char *,const char *,bool,
+                                                        void (*)(Environment *,const char *,Defgeneric *,unsigned short),
+                                                        void (*)(Defgeneric *,unsigned short,bool),
+                                                        Expression *);
+   static void                    PrintMethodWatchFlag(Environment *,const char *,Defgeneric *,unsigned short);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : SetupGenericFunctions
+  DESCRIPTION  : Initializes all generic function
+                   data structures, constructs and functions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Generic function H/L functions set up
+  NOTES        : None
+ ***********************************************************/
+void SetupGenericFunctions(
+  Environment *theEnv)
+  {
+   EntityRecord genericEntityRecord =
+                     { "GCALL", GCALL,0,0,1,
+                       (EntityPrintFunction *) PrintGenericCall,
+                       (EntityPrintFunction *) PrintGenericCall,
+                       NULL,
+                       (EntityEvaluationFunction *) EvaluateGenericCall,
+                       NULL,
+                       (EntityBusyCountFunction *) DecrementGenericBusyCount,
+                       (EntityBusyCountFunction *) IncrementGenericBusyCount,
+                       NULL,NULL,NULL,NULL,NULL };
+
+   AllocateEnvironmentData(theEnv,DEFGENERIC_DATA,sizeof(struct defgenericData),DeallocateDefgenericData);
+   memcpy(&DefgenericData(theEnv)->GenericEntityRecord,&genericEntityRecord,sizeof(struct entityRecord));
+
+   InstallPrimitive(theEnv,&DefgenericData(theEnv)->GenericEntityRecord,GCALL);
+
+   DefgenericData(theEnv)->DefgenericModuleIndex =
+                RegisterModuleItem(theEnv,"defgeneric",
+#if (! RUN_TIME)
+                                    AllocateDefgenericModule,
+                                    FreeDefgenericModule,
+#else
+                                    NULL,NULL,
+#endif
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+                                    BloadDefgenericModuleReference,
+#else
+                                    NULL,
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+                                    DefgenericCModuleReference,
+#else
+                                    NULL,
+#endif
+                                    (FindConstructFunction *) FindDefgenericInModule);
+
+   DefgenericData(theEnv)->DefgenericConstruct =  AddConstruct(theEnv,"defgeneric","defgenerics",
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+                                       ParseDefgeneric,
+#else
+                                       NULL,
+#endif
+                                       (FindConstructFunction *) FindDefgeneric,
+                                       GetConstructNamePointer,GetConstructPPForm,
+                                       GetConstructModuleItem,
+                                       (GetNextConstructFunction *) GetNextDefgeneric,
+                                       SetNextConstruct,
+                                       (IsConstructDeletableFunction *) DefgenericIsDeletable,
+                                       (DeleteConstructFunction *) Undefgeneric,
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+                                       (FreeConstructFunction *) RemoveDefgeneric
+#else
+                                       NULL
+#endif
+                                       );
+
+
+#if ! RUN_TIME
+   AddClearReadyFunction(theEnv,"defgeneric",ClearDefgenericsReady,0,NULL);
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+   SetupGenericsBload(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER
+   SetupGenericsCompiler(theEnv);
+#endif
+
+#if ! BLOAD_ONLY
+#if DEFMODULE_CONSTRUCT
+   AddPortConstructItem(theEnv,"defgeneric",SYMBOL_TOKEN);
+#endif
+   AddConstruct(theEnv,"defmethod","defmethods",ParseDefmethod,
+                NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+
+  /* ================================================================
+     Make sure defmethods are cleared last, for other constructs may
+       be using them and need to be cleared first
+
+     Need to be cleared in two stages so that mutually dependent
+       constructs (like classes) can be cleared
+     ================================================================ */
+   AddSaveFunction(theEnv,"defgeneric",SaveDefgenerics,1000,NULL);
+   AddSaveFunction(theEnv,"defmethod",SaveDefmethods,-1000,NULL);
+   AddUDF(theEnv,"undefgeneric","v",1,1,"y",UndefgenericCommand,"UndefgenericCommand",NULL);
+   AddUDF(theEnv,"undefmethod","v",2,2,"*;y;ly",UndefmethodCommand,"UndefmethodCommand",NULL);
+#endif
+
+   AddUDF(theEnv,"call-next-method","*",0,0,NULL,CallNextMethod,"CallNextMethod",NULL);
+   FuncSeqOvlFlags(theEnv,"call-next-method",true,false);
+   AddUDF(theEnv,"call-specific-method","*",2,UNBOUNDED,"*;y;l",CallSpecificMethod,"CallSpecificMethod",NULL);
+   FuncSeqOvlFlags(theEnv,"call-specific-method",true,false);
+   AddUDF(theEnv,"override-next-method","*",0,UNBOUNDED,NULL,OverrideNextMethod,"OverrideNextMethod",NULL);
+   FuncSeqOvlFlags(theEnv,"override-next-method",true,false);
+   AddUDF(theEnv,"next-methodp","b",0,0,NULL,NextMethodPCommand,"NextMethodP",NULL);
+   FuncSeqOvlFlags(theEnv,"next-methodp",true,false);
+
+   AddUDF(theEnv,"(gnrc-current-arg)","*",0,UNBOUNDED,NULL,GetGenericCurrentArgument,"GetGenericCurrentArgument",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"ppdefgeneric","vs",1,2,";y;ldsyn",PPDefgenericCommand,"PPDefgenericCommand",NULL);
+   AddUDF(theEnv,"list-defgenerics","v",0,1,"y",ListDefgenericsCommand,"ListDefgenericsCommand",NULL);
+   AddUDF(theEnv,"ppdefmethod","v",2,3,"*;y;l;ldsyn",PPDefmethodCommand,"PPDefmethodCommand",NULL);
+   AddUDF(theEnv,"list-defmethods","v",0,1,"y",ListDefmethodsCommand,"ListDefmethodsCommand",NULL);
+   AddUDF(theEnv,"preview-generic","v",1,UNBOUNDED,"*;y",PreviewGeneric,"PreviewGeneric",NULL);
+#endif
+
+   AddUDF(theEnv,"get-defgeneric-list","m",0,1,"y",GetDefgenericListFunction,"GetDefgenericListFunction",NULL);
+   AddUDF(theEnv,"get-defmethod-list","m",0,1,"y",GetDefmethodListCommand,"GetDefmethodListCommand",NULL);
+   AddUDF(theEnv,"get-method-restrictions","m",2,2,"l;y",GetMethodRestrictionsCommand,"GetMethodRestrictionsCommand",NULL);
+   AddUDF(theEnv,"defgeneric-module","y",1,1,"y",GetDefgenericModuleCommand,"GetDefgenericModuleCommand",NULL);
+
+#if OBJECT_SYSTEM
+   AddUDF(theEnv,"type","*",1,1,"*",ClassCommand,"ClassCommand",NULL);
+#else
+   AddUDF(theEnv,"type","*",1,1,"*",TypeCommand,"TypeCommand",NULL);
+#endif
+
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   AddWatchItem(theEnv,"generic-functions",0,&DefgenericData(theEnv)->WatchGenerics,34,
+                DefgenericWatchAccess,DefgenericWatchPrint);
+   AddWatchItem(theEnv,"methods",0,&DefgenericData(theEnv)->WatchMethods,33,
+                DefmethodWatchAccess,DefmethodWatchPrint);
+#endif
+  }
+
+/*****************************************************/
+/* DeallocateDefgenericData: Deallocates environment */
+/*    data for the defgeneric construct.             */
+/*****************************************************/
+static void DeallocateDefgenericData(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   struct defgenericModule *theModuleItem;
+   Defmodule *theModule;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv)) return;
+#endif
+
+   DoForAllConstructs(theEnv,
+                      DestroyDefgenericAction,
+                      DefgenericData(theEnv)->DefgenericModuleIndex,false,NULL);
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      theModuleItem = (struct defgenericModule *)
+                      GetModuleItem(theEnv,theModule,
+                                    DefgenericData(theEnv)->DefgenericModuleIndex);
+
+      rtn_struct(theEnv,defgenericModule,theModuleItem);
+     }
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+#if ! RUN_TIME
+/****************************************************/
+/* DestroyDefgenericAction: Action used to remove   */
+/*   defgenerics as a result of DestroyEnvironment. */
+/****************************************************/
+static void DestroyDefgenericAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   Defgeneric *theDefgeneric = (Defgeneric *) theConstruct;
+   long i;
+
+   if (theDefgeneric == NULL) return;
+
+   for (i = 0 ; i < theDefgeneric->mcnt ; i++)
+     { DestroyMethodInfo(theEnv,theDefgeneric,&theDefgeneric->methods[i]); }
+
+   if (theDefgeneric->mcnt != 0)
+     { rm(theEnv,theDefgeneric->methods,(sizeof(Defmethod) * theDefgeneric->mcnt)); }
+
+   DestroyConstructHeader(theEnv,&theDefgeneric->header);
+
+   rtn_struct(theEnv,defgeneric,theDefgeneric);
+#else
+#if MAC_XCD
+#pragma unused(theEnv,theConstruct)
+#endif
+#endif
+  }
+#endif
+
+/***************************************************
+  NAME         : FindDefgeneric
+  DESCRIPTION  : Searches for a generic
+  INPUTS       : The name of the generic
+                 (possibly including a module name)
+  RETURNS      : Pointer to the generic if
+                 found, otherwise NULL
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Defgeneric *FindDefgeneric(
+  Environment *theEnv,
+  const char *genericModuleAndName)
+  {
+   return (Defgeneric *) FindNamedConstructInModuleOrImports(theEnv,genericModuleAndName,DefgenericData(theEnv)->DefgenericConstruct);
+  }
+
+/***************************************************
+  NAME         : FindDefgenericInModule
+  DESCRIPTION  : Searches for a generic
+  INPUTS       : The name of the generic
+                 (possibly including a module name)
+  RETURNS      : Pointer to the generic if
+                 found, otherwise NULL
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Defgeneric *FindDefgenericInModule(
+  Environment *theEnv,
+  const char *genericModuleAndName)
+  {
+   return (Defgeneric *) FindNamedConstructInModule(theEnv,genericModuleAndName,DefgenericData(theEnv)->DefgenericConstruct);
+  }
+
+/***************************************************
+  NAME         : LookupDefgenericByMdlOrScope
+  DESCRIPTION  : Finds a defgeneric anywhere (if
+                 module is specified) or in current
+                 or imported modules
+  INPUTS       : The defgeneric name
+  RETURNS      : The defgeneric (NULL if not found)
+  SIDE EFFECTS : Error message printed on
+                  ambiguous references
+  NOTES        : None
+ ***************************************************/
+Defgeneric *LookupDefgenericByMdlOrScope(
+  Environment *theEnv,
+  const char *defgenericName)
+  {
+   return (Defgeneric *) LookupConstruct(theEnv,DefgenericData(theEnv)->DefgenericConstruct,defgenericName,true);
+  }
+
+/***************************************************
+  NAME         : LookupDefgenericInScope
+  DESCRIPTION  : Finds a defgeneric in current or
+                   imported modules (module
+                   specifier is not allowed)
+  INPUTS       : The defgeneric name
+  RETURNS      : The defgeneric (NULL if not found)
+  SIDE EFFECTS : Error message printed on
+                  ambiguous references
+  NOTES        : None
+ ***************************************************/
+Defgeneric *LookupDefgenericInScope(
+  Environment *theEnv,
+  const char *defgenericName)
+  {
+   return (Defgeneric *) LookupConstruct(theEnv,DefgenericData(theEnv)->DefgenericConstruct,defgenericName,false);
+  }
+
+/***********************************************************
+  NAME         : GetNextDefgeneric
+  DESCRIPTION  : Finds first or next generic function
+  INPUTS       : The address of the current generic function
+  RETURNS      : The address of the next generic function
+                   (NULL if none)
+  SIDE EFFECTS : None
+  NOTES        : If ptr == NULL, the first generic function
+                    is returned.
+ ***********************************************************/
+Defgeneric *GetNextDefgeneric(
+  Environment *theEnv,
+  Defgeneric *theDefgeneric)
+  {
+   return (Defgeneric *) GetNextConstructItem(theEnv,&theDefgeneric->header,DefgenericData(theEnv)->DefgenericModuleIndex);
+  }
+
+/***********************************************************
+  NAME         : GetNextDefmethod
+  DESCRIPTION  : Find the next method for a generic function
+  INPUTS       : 1) The generic function address
+                 2) The index of the current method
+  RETURNS      : The index of the next method
+                    (0 if none)
+  SIDE EFFECTS : None
+  NOTES        : If index == 0, the index of the first
+                   method is returned
+ ***********************************************************/
+unsigned short GetNextDefmethod(
+  Defgeneric *theDefgeneric,
+  unsigned short theIndex)
+  {
+   unsigned short mi;
+
+   if (theIndex == 0)
+     {
+      if (theDefgeneric->methods != NULL)
+        { return theDefgeneric->methods[0].index; }
+        
+      return 0;
+     }
+     
+   mi = FindMethodByIndex(theDefgeneric,theIndex);
+   
+   if ((mi+1) == theDefgeneric->mcnt)
+     { return 0; }
+     
+   return theDefgeneric->methods[mi+1].index;
+  }
+
+/*****************************************************
+  NAME         : GetDefmethodPointer
+  DESCRIPTION  : Returns a pointer to a method
+  INPUTS       : 1) Pointer to a defgeneric
+                 2) Array index of method in generic's
+                    method array (+1)
+  RETURNS      : Pointer to the method.
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+Defmethod *GetDefmethodPointer(
+  Defgeneric *theDefgeneric,
+  long theIndex)
+  {
+   return &theDefgeneric->methods[theIndex-1];
+  }
+
+/***************************************************
+  NAME         : IsDefgenericDeletable
+  DESCRIPTION  : Determines if a generic function
+                   can be deleted
+  INPUTS       : Address of the generic function
+  RETURNS      : True if deletable, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool DefgenericIsDeletable(
+  Defgeneric *theDefgeneric)
+  {
+   Environment *theEnv = theDefgeneric->header.env;
+   
+   if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   return (theDefgeneric->busy == 0) ? true : false;
+  }
+
+/***************************************************
+  NAME         : DefmethodIsDeletable
+  DESCRIPTION  : Determines if a generic function
+                   method can be deleted
+  INPUTS       : 1) Address of the generic function
+                 2) Index of the method
+  RETURNS      : True if deletable, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool DefmethodIsDeletable(
+  Defgeneric *theDefgeneric,
+  unsigned short theIndex)
+  {
+   Environment *theEnv = theDefgeneric->header.env;
+   unsigned short mi;
+   
+   if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   mi = FindMethodByIndex(theDefgeneric,theIndex);
+   if (mi == METHOD_NOT_FOUND) return false;
+   
+   if (theDefgeneric->methods[mi].system)
+     return false;
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   return (MethodsExecuting(theDefgeneric) == false) ? true : false;
+#else
+   return false;
+#endif
+  }
+
+/**********************************************************
+  NAME         : UndefgenericCommand
+  DESCRIPTION  : Deletes all methods for a generic function
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : methods deallocated
+  NOTES        : H/L Syntax: (undefgeneric <name> | *)
+ **********************************************************/
+void UndefgenericCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UndefconstructCommand(context,"undefgeneric",DefgenericData(theEnv)->DefgenericConstruct);
+  }
+
+/****************************************************************
+  NAME         : GetDefgenericModuleCommand
+  DESCRIPTION  : Determines to which module a defgeneric belongs
+  INPUTS       : None
+  RETURNS      : The symbolic name of the module
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (defgeneric-module <generic-name>)
+ ****************************************************************/
+void GetDefgenericModuleCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->value = GetConstructModuleCommand(context,"defgeneric-module",DefgenericData(theEnv)->DefgenericConstruct);
+  }
+
+/**************************************************************
+  NAME         : UndefmethodCommand
+  DESCRIPTION  : Deletes one method for a generic function
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : methods deallocated
+  NOTES        : H/L Syntax: (undefmethod <name> <index> | *)
+ **************************************************************/
+void UndefmethodCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Defgeneric *gfunc;
+   unsigned short mi;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg)) return;
+
+   gfunc = LookupDefgenericByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if ((gfunc == NULL) ? (strcmp(theArg.lexemeValue->contents,"*") != 0) : false)
+     {
+      PrintErrorID(theEnv,"GENRCCOM",1,false);
+      WriteString(theEnv,STDERR,"No such generic function '");
+      WriteString(theEnv,STDERR,theArg.lexemeValue->contents);
+      WriteString(theEnv,STDERR,"' in function undefmethod.\n");
+      return;
+     }
+
+   if (! UDFNextArgument(context,ANY_TYPE_BITS,&theArg)) return;
+
+   if (CVIsType(&theArg,SYMBOL_BIT))
+     {
+      if (strcmp(theArg.lexemeValue->contents,"*") != 0)
+        {
+         PrintErrorID(theEnv,"GENRCCOM",2,false);
+         WriteString(theEnv,STDERR,"Expected a valid method index in function undefmethod.\n");
+         return;
+        }
+      mi = 0;
+     }
+   else if (CVIsType(&theArg,INTEGER_BIT))
+     {
+      mi = (unsigned short) theArg.integerValue->contents;
+      if (mi == 0)
+        {
+         PrintErrorID(theEnv,"GENRCCOM",2,false);
+         WriteString(theEnv,STDERR,"Expected a valid method index in function undefmethod.\n");
+         return;
+        }
+     }
+   else
+     {
+      PrintErrorID(theEnv,"GENRCCOM",2,false);
+      WriteString(theEnv,STDERR,"Expected a valid method index in function undefmethod.\n");
+      return;
+     }
+   Undefmethod(gfunc,mi,theEnv);
+  }
+
+/**************************************************************
+  NAME         : EnvUndefgeneric
+  DESCRIPTION  : Deletes all methods for a generic function
+  INPUTS       : The generic-function address (NULL for all)
+  RETURNS      : True if generic successfully deleted,
+                 false otherwise
+  SIDE EFFECTS : methods deallocated
+  NOTES        : None
+ **************************************************************/
+bool Undefgeneric(
+  Defgeneric *theDefgeneric,
+  Environment *allEnv)
+  {
+#if RUN_TIME || BLOAD_ONLY
+   return false;
+#else
+   Environment *theEnv;
+   bool success = true;
+   GCBlock gcb;
+
+   if (theDefgeneric == NULL)
+     { theEnv = allEnv; }
+   else
+     { theEnv = theDefgeneric->header.env; }
+     
+   GCBlockStart(theEnv,&gcb);
+   if (theDefgeneric == NULL)
+     {
+      if (ClearDefmethods(theEnv) == false)
+        success = false;
+      if (ClearDefgenerics(theEnv) == false)
+        success = false;
+        
+      GCBlockEnd(theEnv,&gcb);
+        
+      return success ;
+     }
+     
+   if (DefgenericIsDeletable(theDefgeneric) == false)
+     {
+      GCBlockEnd(theEnv,&gcb);
+      return false;
+     }
+      
+   RemoveConstructFromModule(theEnv,&theDefgeneric->header);
+   RemoveDefgeneric(theEnv,theDefgeneric);
+   
+   GCBlockEnd(theEnv,&gcb);
+
+   return true;
+#endif
+  }
+
+/**************************************************************
+  NAME         : Undefmethod
+  DESCRIPTION  : Deletes one method for a generic function
+  INPUTS       : 1) Address of generic function (can be NULL)
+                 2) Method index (0 for all)
+  RETURNS      : True if method deleted successfully,
+                 false otherwise
+  SIDE EFFECTS : methods deallocated
+  NOTES        : None
+ **************************************************************/
+bool Undefmethod(
+  Defgeneric *theDefgeneric,
+  unsigned short mi,
+  Environment *allEnv)
+  {
+   Environment *theEnv;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   GCBlock gcb;
+#endif
+ 
+   if (theDefgeneric == NULL)
+     { theEnv = allEnv; }
+   else
+     { theEnv = theDefgeneric->header.env; }
+   
+#if RUN_TIME || BLOAD_ONLY
+   PrintErrorID(theEnv,"PRNTUTIL",4,false);
+   WriteString(theEnv,STDERR,"Unable to delete method ");
+   if (theDefgeneric != NULL)
+     {
+      WriteString(theEnv,STDERR,"'");
+      PrintGenericName(theEnv,STDERR,theDefgeneric);
+      WriteString(theEnv,STDERR,"'");
+      WriteString(theEnv,STDERR," #");
+      PrintUnsignedInteger(theEnv,STDERR,mi);
+     }
+   else
+     WriteString(theEnv,STDERR,"*");
+   WriteString(theEnv,STDERR,".\n");
+   return false;
+#else
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv) == true)
+     {
+      PrintErrorID(theEnv,"PRNTUTIL",4,false);
+      WriteString(theEnv,STDERR,"Unable to delete method ");
+      if (theDefgeneric != NULL)
+        {
+         WriteString(theEnv,STDERR,"'");
+         WriteString(theEnv,STDERR,DefgenericName(theDefgeneric));
+         WriteString(theEnv,STDERR,"'");
+         WriteString(theEnv,STDERR," #");
+         PrintUnsignedInteger(theEnv,STDERR,mi);
+        }
+      else
+        WriteString(theEnv,STDERR,"*");
+      WriteString(theEnv,STDERR,".\n");
+      return false;
+     }
+#endif
+
+   GCBlockStart(theEnv,&gcb);
+   if (theDefgeneric == NULL)
+     {
+      bool success;
+      
+      if (mi != 0)
+        {
+         PrintErrorID(theEnv,"GENRCCOM",3,false);
+         WriteString(theEnv,STDERR,"Incomplete method specification for deletion.\n");
+         GCBlockEnd(theEnv,&gcb);
+         return false;
+        }
+        
+      success = ClearDefmethods(theEnv);
+      GCBlockEnd(theEnv,&gcb);
+      return success;
+     }
+     
+   if (MethodsExecuting(theDefgeneric))
+     {
+      MethodAlterError(theEnv,theDefgeneric);
+      GCBlockEnd(theEnv,&gcb);
+      return false;
+     }
+     
+   if (mi == 0)
+     { RemoveAllExplicitMethods(theEnv,theDefgeneric); }
+   else
+     {
+      unsigned short nmi = CheckMethodExists(theEnv,"undefmethod",theDefgeneric,mi);
+      if (nmi == METHOD_NOT_FOUND)
+        {
+         GCBlockEnd(theEnv,&gcb);
+         return false;
+        }
+      RemoveDefgenericMethod(theEnv,theDefgeneric,nmi);
+     }
+     
+   GCBlockEnd(theEnv,&gcb);
+   return true;
+#endif
+  }
+
+#if DEBUGGING_FUNCTIONS || PROFILING_FUNCTIONS
+
+/*****************************************************
+  NAME         : DefmethodDescription
+  DESCRIPTION  : Prints a synopsis of method parameter
+                   restrictions into caller's buffer
+  INPUTS       : 1) Caller's buffer
+                 2) Buffer size (not including space
+                    for terminating '\0')
+                 3) Address of generic function
+                 4) Index of method
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Caller's buffer written
+  NOTES        : Terminating '\n' not written
+ *****************************************************/
+void DefmethodDescription(
+  Defgeneric *theDefgeneric,
+  unsigned short theIndex,
+  StringBuilder *theSB)
+  {
+   long mi;
+   Environment *theEnv = theDefgeneric->header.env;
+
+   mi = FindMethodByIndex(theDefgeneric,theIndex);
+
+   OpenStringBuilderDestination(theEnv,"MethodDescription",theSB);
+
+   if (mi != METHOD_NOT_FOUND)
+     { PrintMethod(theEnv,&theDefgeneric->methods[mi],theSB); }
+   
+   CloseStringBuilderDestination(theEnv,"MethodDescription");
+
+  }
+#endif /* DEBUGGING_FUNCTIONS || PROFILING_FUNCTIONS */
+
+#if DEBUGGING_FUNCTIONS
+
+/*********************************************************
+  NAME         : GetDefgenericWatch
+  DESCRIPTION  : Determines if trace messages are
+                 gnerated when executing generic function
+  INPUTS       : A pointer to the generic
+  RETURNS      : True if a trace is active,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************************/
+bool DefgenericGetWatch(
+  Defgeneric *theGeneric)
+  {
+   return theGeneric->trace;
+  }
+
+/*********************************************************
+  NAME         : SetDefgenericWatch
+  DESCRIPTION  : Sets the trace to ON/OFF for the
+                 generic function
+  INPUTS       : 1) True to set the trace on,
+                    False to set it off
+                 2) A pointer to the generic
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Watch flag for the generic set
+  NOTES        : None
+ *********************************************************/
+void DefgenericSetWatch(
+  Defgeneric *theGeneric,
+  bool newState)
+  {
+   theGeneric->trace = newState;
+  }
+
+/*********************************************************
+  NAME         : DefmethodGetWatch
+  DESCRIPTION  : Determines if trace messages for calls
+                 to this method will be generated or not
+  INPUTS       : 1) A pointer to the generic
+                 2) The index of the method
+  RETURNS      : True if a trace is active,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************************/
+bool DefmethodGetWatch(
+  Defgeneric *theGeneric,
+  unsigned short theIndex)
+  {
+   unsigned short mi;
+
+   mi = FindMethodByIndex(theGeneric,theIndex);
+   
+   if (mi != METHOD_NOT_FOUND)
+     { return theGeneric->methods[mi].trace; }
+     
+   return false;
+  }
+
+/*********************************************************
+  NAME         : DefmethodSetWatch
+  DESCRIPTION  : Sets the trace to ON/OFF for the
+                 calling of the method
+  INPUTS       : 1) True to set the trace on,
+                    false to set it off
+                 2) A pointer to the generic
+                 3) The index of the method
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Watch flag for the method set
+  NOTES        : None
+ *********************************************************/
+void DefmethodSetWatch(
+  Defgeneric *theGeneric,
+  unsigned short theIndex,
+  bool newState)
+  {
+   unsigned short mi;
+
+   mi = FindMethodByIndex(theGeneric,theIndex);
+   
+   if (mi != METHOD_NOT_FOUND)
+     { theGeneric->methods[mi].trace = newState; }
+  }
+
+
+/********************************************************
+  NAME         : PPDefgenericCommand
+  DESCRIPTION  : Displays the pretty-print form of
+                  a generic function header
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (ppdefgeneric <name>)
+ ********************************************************/
+void PPDefgenericCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PPConstructCommand(context,"ppdefgeneric",DefgenericData(theEnv)->DefgenericConstruct,returnValue);
+  }
+
+/**********************************************************
+  NAME         : PPDefmethodCommand
+  DESCRIPTION  : Displays the pretty-print form of
+                  a method
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (ppdefmethod <name> <index>)
+ **********************************************************/
+void PPDefmethodCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   const char *gname;
+   const char *logicalName;
+   Defgeneric *gfunc;
+   unsigned short gi;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg)) return;
+   gname = theArg.lexemeValue->contents;
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg)) return;
+
+   if (UDFHasNextArgument(context))
+     {
+      logicalName = GetLogicalName(context,STDOUT);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"ppdefmethod");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+     }
+   else
+     { logicalName = STDOUT; }
+
+   gfunc = CheckGenericExists(theEnv,"ppdefmethod",gname);
+   if (gfunc == NULL)
+     return;
+
+   gi = CheckMethodExists(theEnv,"ppdefmethod",gfunc,(unsigned short) theArg.integerValue->contents);
+   if (gi == METHOD_NOT_FOUND)
+     return;
+     
+   if (strcmp(logicalName,"nil") == 0)
+     {
+      if (gfunc->methods[gi].header.ppForm != NULL)
+        { returnValue->lexemeValue = CreateString(theEnv,gfunc->methods[gi].header.ppForm); }
+      else
+        { returnValue->lexemeValue = CreateString(theEnv,""); }
+     }
+   else
+     {
+      if (gfunc->methods[gi].header.ppForm != NULL)
+        WriteString(theEnv,logicalName,gfunc->methods[gi].header.ppForm);
+     }
+  }
+
+/******************************************************
+  NAME         : ListDefmethodsCommand
+  DESCRIPTION  : Lists a brief description of methods
+                   for a particular generic function
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (list-defmethods <name>)
+ ******************************************************/
+void ListDefmethodsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Defgeneric *gfunc;
+
+   if (! UDFHasNextArgument(context))
+     { ListDefmethods(theEnv,STDOUT,NULL); }
+   else
+     {
+      if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg)) return;
+
+      gfunc = CheckGenericExists(theEnv,"list-defmethods",theArg.lexemeValue->contents);
+      if (gfunc != NULL)
+        { ListDefmethods(theEnv,STDOUT,gfunc); }
+     }
+  }
+
+/***************************************************************
+  NAME         : DefmethodPPForm
+  DESCRIPTION  : Getsa generic function method pretty print form
+  INPUTS       : 1) Address of the generic function
+                 2) Index of the method
+  RETURNS      : Method ppform
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************************/
+const char *DefmethodPPForm(
+  Defgeneric *theDefgeneric,
+  unsigned short theIndex)
+  {
+   unsigned short mi;
+
+   mi = FindMethodByIndex(theDefgeneric,theIndex);
+   
+   if (mi != METHOD_NOT_FOUND)
+     { return theDefgeneric->methods[mi].header.ppForm; }
+     
+   return "";
+  }
+
+/***************************************************
+  NAME         : ListDefgenericsCommand
+  DESCRIPTION  : Displays all defgeneric names
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defgeneric names printed
+  NOTES        : H/L Interface
+ ***************************************************/
+void ListDefgenericsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListConstructCommand(context,DefgenericData(theEnv)->DefgenericConstruct);
+  }
+
+/***************************************************
+  NAME         : ListDefgenerics
+  DESCRIPTION  : Displays all defgeneric names
+  INPUTS       : 1) The logical name of the output
+                 2) The module
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defgeneric names printed
+  NOTES        : C Interface
+ ***************************************************/
+void ListDefgenerics(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListConstruct(theEnv,DefgenericData(theEnv)->DefgenericConstruct,logicalName,theModule);
+  }
+
+/******************************************************
+  NAME         : ListDefmethods
+  DESCRIPTION  : Lists a brief description of methods
+                   for a particular generic function
+  INPUTS       : 1) The logical name of the output
+                 2) Generic function to list methods for
+                    (NULL means list all methods)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ******************************************************/
+void ListDefmethods(
+  Environment *theEnv,
+  const char *logicalName,
+  Defgeneric *theDefgeneric)
+  {
+   Defgeneric *gfunc;
+   unsigned long count;
+   if (theDefgeneric != NULL)
+     count = ListMethodsForGeneric(theEnv,logicalName,theDefgeneric);
+   else
+     {
+      count = 0;
+      for (gfunc = GetNextDefgeneric(theEnv,NULL) ;
+           gfunc != NULL ;
+           gfunc = GetNextDefgeneric(theEnv,gfunc))
+        {
+         count += ListMethodsForGeneric(theEnv,logicalName,gfunc);
+         if (GetNextDefgeneric(theEnv,gfunc) != NULL)
+           WriteString(theEnv,logicalName,"\n");
+        }
+     }
+   PrintTally(theEnv,logicalName,count,"method","methods");
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/***************************************************************
+  NAME         : GetDefgenericListFunction
+  DESCRIPTION  : Groups all defgeneric names into
+                 a multifield list
+  INPUTS       : A data object buffer to hold
+                 the multifield result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield allocated and filled
+  NOTES        : H/L Syntax: (get-defgeneric-list [<module>])
+ ***************************************************************/
+void GetDefgenericListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   GetConstructListFunction(context,returnValue,DefgenericData(theEnv)->DefgenericConstruct);
+  }
+
+/***************************************************************
+  NAME         : GetDefgenericList
+  DESCRIPTION  : Groups all defgeneric names into
+                 a multifield list
+  INPUTS       : 1) A data object buffer to hold
+                    the multifield result
+                 2) The module from which to obtain defgenerics
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield allocated and filled
+  NOTES        : External C access
+ ***************************************************************/
+void GetDefgenericList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defmodule *theModule)
+  {
+   UDFValue result;
+   
+   GetConstructList(theEnv,&result,DefgenericData(theEnv)->DefgenericConstruct,theModule);
+   NormalizeMultifield(theEnv,&result);
+   returnValue->value = result.value;
+  }
+
+/***********************************************************
+  NAME         : GetDefmethodListCommand
+  DESCRIPTION  : Groups indices of all methdos for a generic
+                 function into a multifield variable
+                 (NULL means get methods for all generics)
+  INPUTS       : A data object buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield set to list of method indices
+  NOTES        : None
+ ***********************************************************/
+void GetDefmethodListCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Defgeneric *gfunc;
+   CLIPSValue result;
+
+   if (! UDFHasNextArgument(context))
+     {
+      GetDefmethodList(theEnv,&result,NULL);
+      CLIPSToUDFValue(&result,returnValue);
+     }
+   else
+     {
+      if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+        { return; }
+      gfunc = CheckGenericExists(theEnv,"get-defmethod-list",theArg.lexemeValue->contents);
+      if (gfunc != NULL)
+        {
+         GetDefmethodList(theEnv,&result,gfunc);
+         CLIPSToUDFValue(&result,returnValue);
+        }
+      else
+        { SetMultifieldErrorValue(theEnv,returnValue); }
+     }
+  }
+
+/***********************************************************
+  NAME         : GetDefmethodList
+  DESCRIPTION  : Groups indices of all methdos for a generic
+                 function into a multifield variable
+                 (NULL means get methods for all generics)
+  INPUTS       : 1) A pointer to a generic function
+                 2) A data object buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield set to list of method indices
+  NOTES        : None
+ ***********************************************************/
+void GetDefmethodList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defgeneric *theDefgeneric)
+  {
+   Defgeneric *gfunc, *svg, *svnxt;
+   long i,j;
+   unsigned long count;
+   Multifield *theList;
+
+   if (theDefgeneric != NULL)
+     {
+      gfunc = theDefgeneric;
+      svnxt = GetNextDefgeneric(theEnv,theDefgeneric);
+      SetNextDefgeneric(theDefgeneric,NULL);
+     }
+   else
+     {
+      gfunc = GetNextDefgeneric(theEnv,NULL);
+      svnxt = (gfunc != NULL) ? GetNextDefgeneric(theEnv,gfunc) : NULL;
+     }
+   count = 0;
+   for (svg = gfunc ;
+        gfunc != NULL ;
+        gfunc = GetNextDefgeneric(theEnv,gfunc))
+     count += gfunc->mcnt;
+   count *= 2;
+   theList = CreateMultifield(theEnv,count);
+   returnValue->value = theList;
+   for (gfunc = svg , i = 0 ;
+        gfunc != NULL ;
+        gfunc = GetNextDefgeneric(theEnv,gfunc))
+     {
+      for (j = 0 ; j < gfunc->mcnt ; j++)
+        {
+         theList->contents[i++].value = GetDefgenericNamePointer(gfunc);
+         theList->contents[i++].integerValue = CreateInteger(theEnv,(long long) gfunc->methods[j].index);
+        }
+     }
+   if (svg != NULL)
+     SetNextDefgeneric(svg,svnxt);
+  }
+
+/***********************************************************************************
+  NAME         : GetMethodRestrictionsCommand
+  DESCRIPTION  : Stores restrictions of a method in multifield
+  INPUTS       : A data object buffer to hold a multifield
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield created (length zero on errors)
+  NOTES        : Syntax: (get-method-restrictions <generic-function> <method-index>)
+ ***********************************************************************************/
+void GetMethodRestrictionsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Defgeneric *gfunc;
+   CLIPSValue result;
+   unsigned short mi;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+   gfunc = CheckGenericExists(theEnv,"get-method-restrictions",theArg.lexemeValue->contents);
+   if (gfunc == NULL)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+     { return; }
+
+   mi = (unsigned short) theArg.integerValue->contents;
+   
+   if (CheckMethodExists(theEnv,"get-method-restrictions",gfunc,mi) == METHOD_NOT_FOUND)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+     
+   GetMethodRestrictions(gfunc,mi,&result);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/***********************************************************************
+  NAME         : GetMethodRestrictions
+  DESCRIPTION  : Stores restrictions of a method in multifield
+  INPUTS       : 1) Pointer to the generic function
+                 2) The method index
+                 3) A data object buffer to hold a multifield
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multifield created (length zero on errors)
+  NOTES        : The restrictions are stored in the multifield
+                 in the following format:
+
+                 <min-number-of-arguments>
+                 <max-number-of-arguments> (-1 if wildcard allowed)
+                 <restriction-count>
+                 <index of 1st restriction>
+                       .
+                       .
+                 <index of nth restriction>
+                 <restriction 1>
+                     <query TRUE/FALSE>
+                     <number-of-classes>
+                     <class 1>
+                        .
+                        .
+                     <class n>
+                    .
+                    .
+                    .
+                  <restriction n>
+
+                  Thus, for the method
+                  (defmethod foo ((?a NUMBER SYMBOL_TYPE) (?b (= 1 1)) $?c))
+                  (get-method-restrictions foo 1) would yield
+
+                  (2 -1 3 7 11 13 FALSE 2 NUMBER SYMBOL_TYPE TRUE 0 FALSE 0)
+ ***********************************************************************/
+void GetMethodRestrictions(
+  Defgeneric *theDefgeneric,
+  unsigned short mi,
+  CLIPSValue *returnValue)
+  {
+   short i,j;
+   Defmethod *meth;
+   RESTRICTION *rptr;
+   size_t count;
+   int roffset,rstrctIndex;
+   Multifield *theList;
+   Environment *theEnv = theDefgeneric->header.env;
+
+   meth = theDefgeneric->methods + FindMethodByIndex(theDefgeneric,mi);
+   count = 3;
+   for (i = 0 ; i < meth->restrictionCount ; i++)
+     count += meth->restrictions[i].tcnt + 3;
+   theList = CreateMultifield(theEnv,count);
+
+   returnValue->value = theList;
+   if (meth->minRestrictions == RESTRICTIONS_UNBOUNDED)
+     { theList->contents[0].integerValue = CreateInteger(theEnv,-1); }
+   else
+     { theList->contents[0].integerValue = CreateInteger(theEnv,(long long) meth->minRestrictions); }
+   if (meth->maxRestrictions == RESTRICTIONS_UNBOUNDED)
+     { theList->contents[1].integerValue = CreateInteger(theEnv,-1); }
+   else
+     { theList->contents[1].integerValue = CreateInteger(theEnv,(long long) meth->maxRestrictions); }
+   theList->contents[2].integerValue = CreateInteger(theEnv,(long long) meth->restrictionCount);
+   roffset = 3 + meth->restrictionCount;
+   rstrctIndex = 3;
+   for (i = 0 ; i < meth->restrictionCount ; i++)
+     {
+      rptr = meth->restrictions + i;
+      theList->contents[rstrctIndex++].integerValue = CreateInteger(theEnv,(long long) roffset + 1);
+      theList->contents[roffset++].lexemeValue = (rptr->query != NULL) ? TrueSymbol(theEnv) : FalseSymbol(theEnv);
+      theList->contents[roffset++].integerValue = CreateInteger(theEnv,(long long) rptr->tcnt);
+      for (j = 0 ; j < rptr->tcnt ; j++)
+        {
+#if OBJECT_SYSTEM
+         theList->contents[roffset++].lexemeValue = CreateSymbol(theEnv,DefclassName((Defclass *) rptr->types[j]));
+#else
+         theList->contents[roffset++].lexemeValue = CreateSymbol(theEnv,TypeName(theEnv,((CLIPSInteger *) rptr->types[j])->contents));
+#endif
+        }
+     }
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : PrintGenericCall
+  DESCRIPTION  : PrintExpression() support function
+                 for generic function calls
+  INPUTS       : 1) The output logical name
+                 2) The generic function
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Call expression printed
+  NOTES        : None
+ ***************************************************/
+static void PrintGenericCall(
+  Environment *theEnv,
+  const char *logName,
+  Defgeneric *theDefgeneric)
+  {
+#if DEVELOPER
+
+   WriteString(theEnv,logName,"(");
+   WriteString(theEnv,logName,DefgenericName(theDefgeneric));
+   if (GetFirstArgument() != NULL)
+     {
+      WriteString(theEnv,logName," ");
+      PrintExpression(theEnv,logName,GetFirstArgument());
+     }
+   WriteString(theEnv,logName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logName)
+#pragma unused(theDefgeneric)
+#endif
+#endif
+  }
+
+/*******************************************************
+  NAME         : EvaluateGenericCall
+  DESCRIPTION  : Primitive support function for
+                 calling a generic function
+  INPUTS       : 1) The generic function
+                 2) A data object buffer to hold
+                    the evaluation result
+  RETURNS      : False if the generic function
+                 returns the symbol false,
+                 true otherwise
+  SIDE EFFECTS : Data obejct buffer set and any
+                 side-effects of calling the generic
+  NOTES        : None
+ *******************************************************/
+static bool EvaluateGenericCall(
+  Environment *theEnv,
+  Defgeneric *theDefgeneric,
+  UDFValue *returnValue)
+  {
+   GenericDispatch(theEnv,theDefgeneric,NULL,NULL,GetFirstArgument(),returnValue);
+   if ((returnValue->header->type == SYMBOL_TYPE) &&
+       (returnValue->value == FalseSymbol(theEnv)))
+     return false;
+   return true;
+  }
+
+/***************************************************
+  NAME         : DecrementGenericBusyCount
+  DESCRIPTION  : Lowers the busy count of a
+                 generic function construct
+  INPUTS       : The generic function
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Busy count decremented if a clear
+                 is not in progress (see comment)
+  NOTES        : None
+ ***************************************************/
+static void DecrementGenericBusyCount(
+  Environment *theEnv,
+  Defgeneric *theDefgeneric)
+  {
+   /* ==============================================
+      The generics to which expressions in other
+      constructs may refer may already have been
+      deleted - thus, it is important not to modify
+      the busy flag during a clear.
+      ============================================== */
+   if (! ConstructData(theEnv)->ClearInProgress)
+     { theDefgeneric->busy--; }
+  }
+
+/***************************************************
+  NAME         : IncrementGenericBusyCount
+  DESCRIPTION  : Raises the busy count of a
+                 generic function construct
+  INPUTS       : The generic function
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Busy count incremented
+  NOTES        : None
+ ***************************************************/
+static void IncrementGenericBusyCount(
+  Environment *theEnv,
+  Defgeneric *theDefgeneric)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   if (! ConstructData(theEnv)->ParsingConstruct)
+     { ConstructData(theEnv)->DanglingConstructs++; }
+#endif
+
+   theDefgeneric->busy++;
+  }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/**********************************************************************
+  NAME         : SaveDefgenerics
+  DESCRIPTION  : Outputs pretty-print forms of generic function headers
+  INPUTS       : The logical name of the output
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ **********************************************************************/
+static void SaveDefgenerics(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logName,
+  void *context)
+  {
+   SaveConstruct(theEnv,theModule,logName,DefgenericData(theEnv)->DefgenericConstruct);
+  }
+
+/**********************************************************************
+  NAME         : SaveDefmethods
+  DESCRIPTION  : Outputs pretty-print forms of generic function methods
+  INPUTS       : The logical name of the output
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ **********************************************************************/
+static void SaveDefmethods(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logName,
+  void *context)
+  {
+   DoForAllConstructsInModule(theEnv,theModule,
+                              SaveDefmethodsForDefgeneric,
+                              DefgenericData(theEnv)->DefgenericModuleIndex,
+                              false,(void *) logName);
+  }
+
+/***************************************************
+  NAME         : SaveDefmethodsForDefgeneric
+  DESCRIPTION  : Save the pretty-print forms of
+                 all methods for a generic function
+                 to a file
+  INPUTS       : 1) The defgeneric
+                 2) The logical name of the output
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Methods written
+  NOTES        : None
+ ***************************************************/
+static void SaveDefmethodsForDefgeneric(
+  Environment *theEnv,
+  ConstructHeader *theDefgeneric,
+  void *userBuffer)
+  {
+   Defgeneric *gfunc = (Defgeneric *) theDefgeneric;
+   const char *logName = (const char *) userBuffer;
+   long i;
+
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     {
+      if (gfunc->methods[i].header.ppForm != NULL)
+        {
+         WriteString(theEnv,logName,gfunc->methods[i].header.ppForm);
+         WriteString(theEnv,logName,"\n");
+        }
+     }
+  }
+
+/****************************************************
+  NAME         : RemoveDefgenericMethod
+  DESCRIPTION  : Removes a generic function method
+                   from the array and removes the
+                   generic too if its the last method
+  INPUTS       : 1) The generic function
+                 2) The array index of the method
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : List adjusted
+                 Nodes deallocated
+  NOTES        : Assumes deletion is safe
+ ****************************************************/
+static void RemoveDefgenericMethod(
+  Environment *theEnv,
+  Defgeneric *gfunc,
+  unsigned short gi)
+  {
+   Defmethod *narr;
+   unsigned short b,e;
+
+   if (gfunc->methods[gi].system)
+     {
+      SetEvaluationError(theEnv,true);
+      PrintErrorID(theEnv,"GENRCCOM",4,false);
+      WriteString(theEnv,STDERR,"Cannot remove implicit system function method for generic function '");
+      WriteString(theEnv,STDERR,DefgenericName(gfunc));
+      WriteString(theEnv,STDERR,"'.\n");
+      return;
+     }
+   DeleteMethodInfo(theEnv,gfunc,&gfunc->methods[gi]);
+   if (gfunc->mcnt == 1)
+     {
+      rm(theEnv,gfunc->methods,sizeof(Defmethod));
+      gfunc->mcnt = 0;
+      gfunc->methods = NULL;
+     }
+   else
+     {
+      gfunc->mcnt--;
+      narr = (Defmethod *) gm2(theEnv,(sizeof(Defmethod) * gfunc->mcnt));
+      for (b = e = 0 ; b < gfunc->mcnt ; b++ , e++)
+        {
+         if (b == gi)
+           e++;
+         GenCopyMemory(Defmethod,1,&narr[b],&gfunc->methods[e]);
+        }
+      rm(theEnv,gfunc->methods,(sizeof(Defmethod) * (gfunc->mcnt+1)));
+      gfunc->methods = narr;
+     }
+  }
+
+#endif
+
+#if DEBUGGING_FUNCTIONS
+
+/******************************************************
+  NAME         : ListMethodsForGeneric
+  DESCRIPTION  : Lists a brief description of methods
+                   for a particular generic function
+  INPUTS       : 1) The logical name of the output
+                 2) Generic function to list methods for
+  RETURNS      : The number of methods printed
+  SIDE EFFECTS : None
+  NOTES        : None
+ ******************************************************/
+static unsigned short ListMethodsForGeneric(
+  Environment *theEnv,
+  const char *logicalName,
+  Defgeneric *gfunc)
+  {
+   unsigned short gi;
+   StringBuilder *theSB;
+   
+   theSB = CreateStringBuilder(theEnv,256);
+
+   for (gi = 0 ; gi < gfunc->mcnt ; gi++)
+     {
+      WriteString(theEnv,logicalName,DefgenericName(gfunc));
+      WriteString(theEnv,logicalName," #");
+      PrintMethod(theEnv,&gfunc->methods[gi],theSB);
+      WriteString(theEnv,logicalName,theSB->contents);
+      WriteString(theEnv,logicalName,"\n");
+     }
+     
+   SBDispose(theSB);
+   
+   return gfunc->mcnt;
+  }
+
+/******************************************************************
+  NAME         : DefgenericWatchAccess
+  DESCRIPTION  : Parses a list of generic names passed by
+                 AddWatchItem() and sets the traces accordingly
+  INPUTS       : 1) A code indicating which trace flag is to be set
+                    Ignored
+                 2) The value to which to set the trace flags
+                 3) A list of expressions containing the names
+                    of the generics for which to set traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags set in specified generics
+  NOTES        : Accessory function for AddWatchItem()
+ ******************************************************************/
+static bool DefgenericWatchAccess(
+  Environment *theEnv,
+  int code,
+  bool newState,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+
+   return(ConstructSetWatchAccess(theEnv,DefgenericData(theEnv)->DefgenericConstruct,newState,argExprs,
+                                  (ConstructGetWatchFunction *) DefgenericGetWatch,
+                                  (ConstructSetWatchFunction *) DefgenericSetWatch));
+  }
+
+/***********************************************************************
+  NAME         : DefgenericWatchPrint
+  DESCRIPTION  : Parses a list of generic names passed by
+                 AddWatchItem() and displays the traces accordingly
+  INPUTS       : 1) The logical name of the output
+                 2) A code indicating which trace flag is to be examined
+                    Ignored
+                 3) A list of expressions containing the names
+                    of the generics for which to examine traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags displayed for specified generics
+  NOTES        : Accessory function for AddWatchItem()
+ ***********************************************************************/
+static bool DefgenericWatchPrint(
+  Environment *theEnv,
+  const char *logName,
+  int code,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+
+   return(ConstructPrintWatchAccess(theEnv,DefgenericData(theEnv)->DefgenericConstruct,logName,argExprs,
+                                    (ConstructGetWatchFunction *) DefgenericGetWatch,
+                                    (ConstructSetWatchFunction *) DefgenericSetWatch));
+  }
+
+/******************************************************************
+  NAME         : DefmethodWatchAccess
+  DESCRIPTION  : Parses a list of methods passed by
+                 AddWatchItem() and sets the traces accordingly
+  INPUTS       : 1) A code indicating which trace flag is to be set
+                    Ignored
+                 2) The value to which to set the trace flags
+                 3) A list of expressions containing the methods
+                   for which to set traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags set in specified methods
+  NOTES        : Accessory function for AddWatchItem()
+ ******************************************************************/
+static bool DefmethodWatchAccess(
+  Environment *theEnv,
+  int code,
+  bool newState,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+   if (newState)
+     return(DefmethodWatchSupport(theEnv,"watch",NULL,newState,NULL,DefmethodSetWatch,argExprs));
+   else
+     return(DefmethodWatchSupport(theEnv,"unwatch",NULL,newState,NULL,DefmethodSetWatch,argExprs));
+  }
+
+/***********************************************************************
+  NAME         : DefmethodWatchPrint
+  DESCRIPTION  : Parses a list of methods passed by
+                 AddWatchItem() and displays the traces accordingly
+  INPUTS       : 1) The logical name of the output
+                 2) A code indicating which trace flag is to be examined
+                    Ignored
+                 3) A list of expressions containing the methods for
+                    which to examine traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags displayed for specified methods
+  NOTES        : Accessory function for AddWatchItem()
+ ***********************************************************************/
+static bool DefmethodWatchPrint(
+  Environment *theEnv,
+  const char *logName,
+  int code,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+   return(DefmethodWatchSupport(theEnv,"list-watch-items",logName,0,
+                                PrintMethodWatchFlag,NULL,argExprs));
+  }
+
+/*******************************************************
+  NAME         : DefmethodWatchSupport
+  DESCRIPTION  : Sets or displays methods specified
+  INPUTS       : 1) The calling function name
+                 2) The logical output name for displays
+                    (can be NULL)
+                 3) The new set state
+                 4) The print function (can be NULL)
+                 5) The trace function (can be NULL)
+                 6) The methods expression list
+  RETURNS      : True if all OK,
+                 false otherwise
+  SIDE EFFECTS : Method trace flags set or displayed
+  NOTES        : None
+ *******************************************************/
+static bool DefmethodWatchSupport(
+  Environment *theEnv,
+  const char *funcName,
+  const char *logName,
+  bool newState,
+  void (*printFunc)(Environment *,const char *,Defgeneric *,unsigned short),
+  void (*traceFunc)(Defgeneric *,unsigned short,bool),
+  Expression *argExprs)
+  {
+   Defgeneric *theGeneric;
+   unsigned short theMethod = 0;
+   unsigned int argIndex = 2;
+   UDFValue genericName, methodIndex;
+   Defmodule *theModule;
+
+   /* ==============================
+      If no methods are specified,
+      show the trace for all methods
+      in all generics
+      ============================== */
+   if (argExprs == NULL)
+     {
+      SaveCurrentModule(theEnv);
+      theModule = GetNextDefmodule(theEnv,NULL);
+      while (theModule != NULL)
+        {
+         SetCurrentModule(theEnv,theModule);
+         if (traceFunc == NULL)
+           {
+            WriteString(theEnv,logName,DefmoduleName(theModule));
+            WriteString(theEnv,logName,":\n");
+           }
+         theGeneric = GetNextDefgeneric(theEnv,NULL);
+         while (theGeneric != NULL)
+            {
+             theMethod = GetNextDefmethod(theGeneric,0);
+             while (theMethod != 0)
+               {
+                if (traceFunc != NULL)
+                  (*traceFunc)(theGeneric,theMethod,newState);
+                else
+                  {
+                   WriteString(theEnv,logName,"   ");
+                   (*printFunc)(theEnv,logName,theGeneric,theMethod);
+                  }
+                theMethod = GetNextDefmethod(theGeneric,theMethod);
+               }
+             theGeneric = GetNextDefgeneric(theEnv,theGeneric);
+            }
+         theModule = GetNextDefmodule(theEnv,theModule);
+        }
+      RestoreCurrentModule(theEnv);
+      return true;
+     }
+
+   /* =========================================
+      Set the traces for every method specified
+      ========================================= */
+   while (argExprs != NULL)
+     {
+      if (EvaluateExpression(theEnv,argExprs,&genericName))
+        return false;
+      if ((genericName.header->type != SYMBOL_TYPE) ? true :
+          ((theGeneric =
+              LookupDefgenericByMdlOrScope(theEnv,genericName.lexemeValue->contents)) == NULL))
+        {
+         ExpectedTypeError1(theEnv,funcName,argIndex,"'generic function name'");
+         return false;
+        }
+      if (GetNextArgument(argExprs) == NULL)
+        theMethod = 0;
+      else
+        {
+         argExprs = GetNextArgument(argExprs);
+         argIndex++;
+         if (EvaluateExpression(theEnv,argExprs,&methodIndex))
+           return false;
+         if ((methodIndex.header->type != INTEGER_TYPE) ? false :
+             ((methodIndex.integerValue->contents <= 0) ? false :
+              (FindMethodByIndex(theGeneric,theMethod) != METHOD_NOT_FOUND)))
+           theMethod = (unsigned short) methodIndex.integerValue->contents;
+         else
+           {
+            ExpectedTypeError1(theEnv,funcName,argIndex,"'method index'");
+            return false;
+           }
+        }
+      if (theMethod == 0)
+        {
+         theMethod = GetNextDefmethod(theGeneric,0);
+         while (theMethod != 0)
+           {
+            if (traceFunc != NULL)
+              (*traceFunc)(theGeneric,theMethod,newState);
+            else
+              (*printFunc)(theEnv,logName,theGeneric,theMethod);
+            theMethod = GetNextDefmethod(theGeneric,theMethod);
+           }
+        }
+      else
+        {
+         if (traceFunc != NULL)
+           (*traceFunc)(theGeneric,theMethod,newState);
+         else
+           (*printFunc)(theEnv,logName,theGeneric,theMethod);
+        }
+      argExprs = GetNextArgument(argExprs);
+      argIndex++;
+     }
+   return true;
+  }
+
+/***************************************************
+  NAME         : PrintMethodWatchFlag
+  DESCRIPTION  : Displays trace value for method
+  INPUTS       : 1) The logical name of the output
+                 2) The generic function
+                 3) The method index
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static void PrintMethodWatchFlag(
+  Environment *theEnv,
+  const char *logName,
+  Defgeneric *theGeneric,
+  unsigned short theMethod)
+  {
+   StringBuilder *theSB = CreateStringBuilder(theEnv,60);
+
+   WriteString(theEnv,logName,DefgenericName(theGeneric));
+   WriteString(theEnv,logName," ");
+   DefmethodDescription(theGeneric,theMethod,theSB);
+   WriteString(theEnv,logName,theSB->contents);
+   if (DefmethodGetWatch(theGeneric,theMethod))
+     WriteString(theEnv,logName," = on\n");
+   else
+     WriteString(theEnv,logName," = off\n");
+     
+   SBDispose(theSB);
+  }
+
+#endif
+
+#if ! OBJECT_SYSTEM
+
+/***************************************************
+  NAME         : TypeCommand
+  DESCRIPTION  : Works like "class" in COOL
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (type <primitive>)
+ ***************************************************/
+void TypeCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue result;
+   
+   EvaluateExpression(theEnv,GetFirstArgument(),&result);
+
+   returnValue->lexemeValue = CreateSymbol(theEnv,TypeName(theEnv,result.header->type));
+  }
+
+#endif
+
+/*#############################*/
+/* Additional Access Functions */
+/*#############################*/
+
+void SetNextDefgeneric(
+  Defgeneric *theDefgeneric,
+  Defgeneric *targetDefgeneric)
+  {
+   SetNextConstruct(&theDefgeneric->header,
+                    &targetDefgeneric->header);
+  }
+
+/*##################################*/
+/* Additional Environment Functions */
+/*##################################*/
+
+const char *DefgenericModule(
+  Defgeneric *theDefgeneric)
+  {
+   return GetConstructModuleName(&theDefgeneric->header);
+  }
+
+const char *DefgenericName(
+  Defgeneric *theDefgeneric)
+  {
+   return GetConstructNameString(&theDefgeneric->header);
+  }
+
+const char *DefgenericPPForm(
+  Defgeneric *theDefgeneric)
+  {
+   return GetConstructPPForm(&theDefgeneric->header);
+  }
+
+CLIPSLexeme *GetDefgenericNamePointer(
+  Defgeneric *theDefgeneric)
+  {
+   return GetConstructNamePointer(&theDefgeneric->header);
+  }
+
+void SetDefgenericPPForm(
+  Environment *theEnv,
+  Defgeneric *theDefgeneric,
+  const char *thePPForm)
+  {
+   SetConstructPPForm(theEnv,&theDefgeneric->header,thePPForm);
+  }
+
+
+#endif /* DEFGENERIC_CONSTRUCT */
+
diff --git a/clips/genrccom.h b/clips/genrccom.h
new file mode 100755
index 000000000..afe294d53
--- /dev/null
+++ b/clips/genrccom.h
@@ -0,0 +1,119 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when DEBUGGING_FUNCTIONS   */
+/*            is set to 0 and PROFILING_FUNCTIONS is set to  */
+/*            1.                                             */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_genrccom
+
+#pragma once
+
+#define _H_genrccom
+
+#include "entities.h"
+#include "constrct.h"
+#include "genrcfun.h"
+
+   void                           SetupGenericFunctions(Environment *);
+   Defgeneric                    *FindDefgeneric(Environment *,const char *);
+   Defgeneric                    *FindDefgenericInModule(Environment *,const char *);
+   Defgeneric                    *LookupDefgenericByMdlOrScope(Environment *,const char *);
+   Defgeneric                    *LookupDefgenericInScope(Environment *,const char *);
+   Defgeneric                    *GetNextDefgeneric(Environment *,Defgeneric *);
+   unsigned short                 GetNextDefmethod(Defgeneric *,unsigned short);
+   bool                           DefgenericIsDeletable(Defgeneric *);
+   bool                           DefmethodIsDeletable(Defgeneric *,unsigned short);
+   void                           UndefgenericCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetDefgenericModuleCommand(Environment *,UDFContext *,UDFValue *);
+   void                           UndefmethodCommand(Environment *,UDFContext *,UDFValue *);
+   Defmethod                     *GetDefmethodPointer(Defgeneric *,long);
+   bool                           Undefgeneric(Defgeneric *,Environment *);
+   bool                           Undefmethod(Defgeneric *,unsigned short,Environment *);
+#if ! OBJECT_SYSTEM
+   void                           TypeCommand(Environment *,UDFContext *,UDFValue *);
+#endif
+#if DEBUGGING_FUNCTIONS || PROFILING_FUNCTIONS
+   void                           DefmethodDescription(Defgeneric *,unsigned short,StringBuilder *);
+#endif
+#if DEBUGGING_FUNCTIONS
+   bool                           DefgenericGetWatch(Defgeneric *);
+   void                           DefgenericSetWatch(Defgeneric *,bool);
+   bool                           DefmethodGetWatch(Defgeneric *,unsigned short);
+   void                           DefmethodSetWatch(Defgeneric *,unsigned short,bool);
+   void                           PPDefgenericCommand(Environment *,UDFContext *,UDFValue *);
+   void                           PPDefmethodCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ListDefmethodsCommand(Environment *,UDFContext *,UDFValue *);
+   const char                    *DefmethodPPForm(Defgeneric *,unsigned short);
+   void                           ListDefgenericsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ListDefgenerics(Environment *,const char *,Defmodule *);
+   void                           ListDefmethods(Environment *,const char *,Defgeneric *);
+#endif
+   void                           GetDefgenericListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetDefgenericList(Environment *,CLIPSValue *,Defmodule *);
+   void                           GetDefmethodListCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetDefmethodList(Environment *,CLIPSValue *,Defgeneric *);
+   void                           GetMethodRestrictionsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetMethodRestrictions(Defgeneric *,unsigned short,CLIPSValue *);
+   void                           SetNextDefgeneric(Defgeneric *,Defgeneric *);
+   const char                    *DefgenericModule(Defgeneric *);
+   const char                    *DefgenericName(Defgeneric *);
+   const char                    *DefgenericPPForm(Defgeneric *);
+   CLIPSLexeme                   *GetDefgenericNamePointer(Defgeneric *);
+   void                           SetDefgenericPPForm(Environment *,Defgeneric *,const char *);
+
+#endif /* _H_genrccom */
+
+
+
+
+
diff --git a/clips/genrcexe.c b/clips/genrcexe.c
new file mode 100755
index 000000000..2e924fbfc
--- /dev/null
+++ b/clips/genrcexe.c
@@ -0,0 +1,737 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/01/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Generic Function Execution Routines              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_METHODS compilation flag.   */
+/*                                                           */
+/*      6.30: Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFGENERIC_CONSTRUCT
+
+#include <string.h>
+
+#if OBJECT_SYSTEM
+#include "classcom.h"
+#include "classfun.h"
+#include "insfun.h"
+#endif
+
+#include "argacces.h"
+#include "constrct.h"
+#include "envrnmnt.h"
+#include "genrccom.h"
+#include "prcdrfun.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "proflfun.h"
+#include "router.h"
+#include "utility.h"
+
+#include "genrcexe.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+
+#define BEGIN_TRACE     ">>"
+#define END_TRACE       "<<"
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+   static Defmethod              *FindApplicableMethod(Environment *,Defgeneric *,Defmethod *);
+
+#if DEBUGGING_FUNCTIONS
+   static void                    WatchGeneric(Environment *,const char *);
+   static void                    WatchMethod(Environment *,const char *);
+#endif
+
+#if OBJECT_SYSTEM
+   static Defclass               *DetermineRestrictionClass(Environment *,UDFValue *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************************************
+  NAME         : GenericDispatch
+  DESCRIPTION  : Executes the most specific applicable method
+  INPUTS       : 1) The generic function
+                 2) The method to start after in the search for an applicable
+                    method (ignored if arg #3 is not NULL).
+                 3) A specific method to call (NULL if want highest precedence
+                    method to be called)
+                 4) The generic function argument expressions
+                 5) The caller's result value buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Any side-effects of evaluating the generic function arguments
+                 Any side-effects of evaluating query functions on method parameter
+                   restrictions when determining the core (see warning #1)
+                 Any side-effects of actual execution of methods (see warning #2)
+                 Caller's buffer set to the result of the generic function call
+
+                 In case of errors, the result is false, otherwise it is the
+                   result returned by the most specific method (which can choose
+                   to ignore or return the values of more general methods)
+  NOTES        : WARNING #1: Query functions on method parameter restrictions
+                    should not have side-effects, for they might be evaluated even
+                    for methods that aren't applicable to the generic function call.
+                 WARNING #2: Side-effects of method execution should not always rely
+                    on only being executed once per generic function call.  Every
+                    time a method calls (shadow-call) the same next-most-specific
+                    method is executed.  Thus, it is possible for a method to be
+                    executed multiple times per generic function call.
+ ***********************************************************************************/
+void GenericDispatch(
+  Environment *theEnv,
+  Defgeneric *gfunc,
+  Defmethod *prevmeth,
+  Defmethod *meth,
+  Expression *params,
+  UDFValue *returnValue)
+  {
+   Defgeneric *previousGeneric;
+   Defmethod *previousMethod;
+   bool oldce;
+#if PROFILING_FUNCTIONS
+   struct profileFrameInfo profileFrame;
+#endif
+   GCBlock gcb;
+
+   returnValue->value = FalseSymbol(theEnv);
+   EvaluationData(theEnv)->EvaluationError = false;
+   if (EvaluationData(theEnv)->HaltExecution)
+     return;
+
+   GCBlockStart(theEnv,&gcb);
+
+   oldce = ExecutingConstruct(theEnv);
+   SetExecutingConstruct(theEnv,true);
+   previousGeneric = DefgenericData(theEnv)->CurrentGeneric;
+   previousMethod = DefgenericData(theEnv)->CurrentMethod;
+   DefgenericData(theEnv)->CurrentGeneric = gfunc;
+   EvaluationData(theEnv)->CurrentEvaluationDepth++;
+   gfunc->busy++;
+   PushProcParameters(theEnv,params,CountArguments(params),
+                      DefgenericName(gfunc),
+                      "generic function",UnboundMethodErr);
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      gfunc->busy--;
+      DefgenericData(theEnv)->CurrentGeneric = previousGeneric;
+      DefgenericData(theEnv)->CurrentMethod = previousMethod;
+      EvaluationData(theEnv)->CurrentEvaluationDepth--;
+
+      GCBlockEndUDF(theEnv,&gcb,returnValue);
+      CallPeriodicTasks(theEnv);
+
+      SetExecutingConstruct(theEnv,oldce);
+      return;
+     }
+   if (meth != NULL)
+     {
+      if (IsMethodApplicable(theEnv,meth))
+        {
+         meth->busy++;
+         DefgenericData(theEnv)->CurrentMethod = meth;
+        }
+      else
+        {
+         PrintErrorID(theEnv,"GENRCEXE",4,false);
+         SetEvaluationError(theEnv,true);
+         DefgenericData(theEnv)->CurrentMethod = NULL;
+         WriteString(theEnv,STDERR,"Generic function '");
+         WriteString(theEnv,STDERR,DefgenericName(gfunc));
+         WriteString(theEnv,STDERR,"' method #");
+         PrintUnsignedInteger(theEnv,STDERR,meth->index);
+         WriteString(theEnv,STDERR," is not applicable to the given arguments.\n");
+        }
+     }
+   else
+     DefgenericData(theEnv)->CurrentMethod = FindApplicableMethod(theEnv,gfunc,prevmeth);
+   if (DefgenericData(theEnv)->CurrentMethod != NULL)
+     {
+#if DEBUGGING_FUNCTIONS
+      if (DefgenericData(theEnv)->CurrentGeneric->trace)
+        WatchGeneric(theEnv,BEGIN_TRACE);
+      if (DefgenericData(theEnv)->CurrentMethod->trace)
+        WatchMethod(theEnv,BEGIN_TRACE);
+#endif
+      if (DefgenericData(theEnv)->CurrentMethod->system)
+        {
+         Expression fcall;
+
+         fcall.type = FCALL;
+         fcall.value = DefgenericData(theEnv)->CurrentMethod->actions->value;
+         fcall.nextArg = NULL;
+         fcall.argList = GetProcParamExpressions(theEnv);
+         EvaluateExpression(theEnv,&fcall,returnValue);
+        }
+      else
+        {
+#if PROFILING_FUNCTIONS
+         StartProfile(theEnv,&profileFrame,
+                      &DefgenericData(theEnv)->CurrentMethod->header.usrData,
+                      ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+         EvaluateProcActions(theEnv,DefgenericData(theEnv)->CurrentGeneric->header.whichModule->theModule,
+                             DefgenericData(theEnv)->CurrentMethod->actions,DefgenericData(theEnv)->CurrentMethod->localVarCount,
+                             returnValue,UnboundMethodErr);
+
+#if PROFILING_FUNCTIONS
+         EndProfile(theEnv,&profileFrame);
+#endif
+        }
+      DefgenericData(theEnv)->CurrentMethod->busy--;
+#if DEBUGGING_FUNCTIONS
+      if (DefgenericData(theEnv)->CurrentMethod->trace)
+        WatchMethod(theEnv,END_TRACE);
+      if (DefgenericData(theEnv)->CurrentGeneric->trace)
+        WatchGeneric(theEnv,END_TRACE);
+#endif
+     }
+   else if (! EvaluationData(theEnv)->EvaluationError)
+     {
+      PrintErrorID(theEnv,"GENRCEXE",1,false);
+      WriteString(theEnv,STDERR,"No applicable methods for '");
+      WriteString(theEnv,STDERR,DefgenericName(gfunc));
+      WriteString(theEnv,STDERR,"'.\n");
+      SetEvaluationError(theEnv,true);
+     }
+   gfunc->busy--;
+   ProcedureFunctionData(theEnv)->ReturnFlag = false;
+   PopProcParameters(theEnv);
+   DefgenericData(theEnv)->CurrentGeneric = previousGeneric;
+   DefgenericData(theEnv)->CurrentMethod = previousMethod;
+   EvaluationData(theEnv)->CurrentEvaluationDepth--;
+
+   GCBlockEndUDF(theEnv,&gcb,returnValue);
+   CallPeriodicTasks(theEnv);
+
+   SetExecutingConstruct(theEnv,oldce);
+  }
+
+/*******************************************************
+  NAME         : UnboundMethodErr
+  DESCRIPTION  : Print out a synopis of the currently
+                   executing method for unbound variable
+                   errors
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error synopsis printed to STDERR
+  NOTES        : None
+ *******************************************************/
+void UnboundMethodErr(
+  Environment *theEnv,
+  const char *logName)
+  {
+   WriteString(theEnv,logName,"generic function '");
+   WriteString(theEnv,logName,DefgenericName(DefgenericData(theEnv)->CurrentGeneric));
+   WriteString(theEnv,logName,"' method #");
+   PrintUnsignedInteger(theEnv,logName,DefgenericData(theEnv)->CurrentMethod->index);
+   WriteString(theEnv,logName,".\n");
+  }
+
+/***********************************************************************
+  NAME         : IsMethodApplicable
+  DESCRIPTION  : Tests to see if a method satsifies the arguments of a
+                   generic function
+                 A method is applicable if all its restrictions are
+                   satisfied by the corresponding arguments
+  INPUTS       : The method address
+  RETURNS      : True if method is applicable, false otherwise
+  SIDE EFFECTS : Any query functions are evaluated
+  NOTES        : Uses globals ProcParamArraySize and ProcParamArray
+ ***********************************************************************/
+bool IsMethodApplicable(
+  Environment *theEnv,
+  Defmethod *meth)
+  {
+   UDFValue temp;
+   unsigned int i,j,k;
+   RESTRICTION *rp;
+#if OBJECT_SYSTEM
+   Defclass *type;
+#else
+   int type;
+#endif
+
+   if (((ProceduralPrimitiveData(theEnv)->ProcParamArraySize < meth->minRestrictions) && (meth->minRestrictions != RESTRICTIONS_UNBOUNDED)) ||
+       ((ProceduralPrimitiveData(theEnv)->ProcParamArraySize > meth->minRestrictions) && (meth->maxRestrictions != RESTRICTIONS_UNBOUNDED))) // TBD minRestrictions || maxRestrictions
+     return false;
+   for (i = 0 , k = 0 ; i < ProceduralPrimitiveData(theEnv)->ProcParamArraySize ; i++)
+     {
+      rp = &meth->restrictions[k];
+      if (rp->tcnt != 0)
+        {
+#if OBJECT_SYSTEM
+         type = DetermineRestrictionClass(theEnv,&ProceduralPrimitiveData(theEnv)->ProcParamArray[i]);
+         if (type == NULL)
+           return false;
+         for (j = 0 ; j < rp->tcnt ; j++)
+           {
+            if (type == rp->types[j])
+              break;
+            if (HasSuperclass(type,(Defclass *) rp->types[j]))
+              break;
+            if (rp->types[j] == (void *) DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_ADDRESS_TYPE])
+              {
+               if (ProceduralPrimitiveData(theEnv)->ProcParamArray[i].header->type == INSTANCE_ADDRESS_TYPE)
+                 break;
+              }
+            else if (rp->types[j] == (void *) DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_NAME_TYPE])
+              {
+               if (ProceduralPrimitiveData(theEnv)->ProcParamArray[i].header->type == INSTANCE_NAME_TYPE)
+                 break;
+              }
+            else if (rp->types[j] ==
+                DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_NAME_TYPE]->directSuperclasses.classArray[0])
+              {
+               if ((ProceduralPrimitiveData(theEnv)->ProcParamArray[i].header->type == INSTANCE_NAME_TYPE) ||
+                   (ProceduralPrimitiveData(theEnv)->ProcParamArray[i].header->type == INSTANCE_ADDRESS_TYPE))
+                 break;
+              }
+           }
+#else
+         type = ProceduralPrimitiveData(theEnv)->ProcParamArray[i].header->type;
+         for (j = 0 ; j < rp->tcnt ; j++)
+           {
+            if (type == ((CLIPSInteger *) (rp->types[j]))->contents)
+              break;
+            if (SubsumeType(type,((CLIPSInteger *) (rp->types[j]))->contents))
+              break;
+           }
+#endif
+         if (j == rp->tcnt)
+           return false;
+        }
+      if (rp->query != NULL)
+        {
+         DefgenericData(theEnv)->GenericCurrentArgument = &ProceduralPrimitiveData(theEnv)->ProcParamArray[i];
+         EvaluateExpression(theEnv,rp->query,&temp);
+         if (temp.value == FalseSymbol(theEnv))
+           return false;
+        }
+      if ((k + 1) != meth->restrictionCount)
+        k++;
+     }
+   return true;
+  }
+
+/***************************************************
+  NAME         : NextMethodP
+  DESCRIPTION  : Determines if a shadowed generic
+                   function method is available for
+                   execution
+  INPUTS       : None
+  RETURNS      : True if there is a method available,
+                   false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (next-methodp)
+ ***************************************************/
+bool NextMethodP(
+  Environment *theEnv)
+  {
+   Defmethod *meth;
+
+   if (DefgenericData(theEnv)->CurrentMethod == NULL)
+     { return false; }
+
+   meth = FindApplicableMethod(theEnv,DefgenericData(theEnv)->CurrentGeneric,DefgenericData(theEnv)->CurrentMethod);
+   if (meth != NULL)
+     {
+      meth->busy--;
+      return true;
+     }
+   else
+     { return false; }
+  }
+
+void NextMethodPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateBoolean(theEnv,NextMethodP(theEnv));
+  }
+
+/****************************************************
+  NAME         : CallNextMethod
+  DESCRIPTION  : Executes the next available method
+                   in the core for a generic function
+  INPUTS       : Caller's buffer for the result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Side effects of execution of shadow
+                 EvaluationError set if no method
+                   is available to execute.
+  NOTES        : H/L Syntax: (call-next-method)
+ ****************************************************/
+void CallNextMethod(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defmethod *oldMethod;
+#if PROFILING_FUNCTIONS
+   struct profileFrameInfo profileFrame;
+#endif
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   if (EvaluationData(theEnv)->HaltExecution)
+     return;
+   oldMethod = DefgenericData(theEnv)->CurrentMethod;
+   if (DefgenericData(theEnv)->CurrentMethod != NULL)
+     DefgenericData(theEnv)->CurrentMethod = FindApplicableMethod(theEnv,DefgenericData(theEnv)->CurrentGeneric,DefgenericData(theEnv)->CurrentMethod);
+   if (DefgenericData(theEnv)->CurrentMethod == NULL)
+     {
+      DefgenericData(theEnv)->CurrentMethod = oldMethod;
+      PrintErrorID(theEnv,"GENRCEXE",2,false);
+      WriteString(theEnv,STDERR,"Shadowed methods not applicable in current context.\n");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+#if DEBUGGING_FUNCTIONS
+   if (DefgenericData(theEnv)->CurrentMethod->trace)
+     WatchMethod(theEnv,BEGIN_TRACE);
+#endif
+   if (DefgenericData(theEnv)->CurrentMethod->system)
+     {
+      Expression fcall;
+
+      fcall.type = FCALL;
+      fcall.value = DefgenericData(theEnv)->CurrentMethod->actions->value;
+      fcall.nextArg = NULL;
+      fcall.argList = GetProcParamExpressions(theEnv);
+      EvaluateExpression(theEnv,&fcall,returnValue);
+     }
+   else
+     {
+#if PROFILING_FUNCTIONS
+      StartProfile(theEnv,&profileFrame,
+                   &DefgenericData(theEnv)->CurrentGeneric->header.usrData,
+                   ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+      EvaluateProcActions(theEnv,DefgenericData(theEnv)->CurrentGeneric->header.whichModule->theModule,
+                         DefgenericData(theEnv)->CurrentMethod->actions,DefgenericData(theEnv)->CurrentMethod->localVarCount,
+                         returnValue,UnboundMethodErr);
+
+#if PROFILING_FUNCTIONS
+      EndProfile(theEnv,&profileFrame);
+#endif
+     }
+
+   DefgenericData(theEnv)->CurrentMethod->busy--;
+#if DEBUGGING_FUNCTIONS
+   if (DefgenericData(theEnv)->CurrentMethod->trace)
+     WatchMethod(theEnv,END_TRACE);
+#endif
+   DefgenericData(theEnv)->CurrentMethod = oldMethod;
+   ProcedureFunctionData(theEnv)->ReturnFlag = false;
+  }
+
+/**************************************************************************
+  NAME         : CallSpecificMethod
+  DESCRIPTION  : Allows a specific method to be called without regards to
+                   higher precedence methods which might also be applicable
+                   However, shadowed methods can still be called.
+  INPUTS       : A data object buffer to hold the method evaluation result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Side-effects of method applicability tests and the
+                 evaluation of methods
+  NOTES        : H/L Syntax: (call-specific-method
+                                <generic-function> <method-index> <args>)
+ **************************************************************************/
+void CallSpecificMethod(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Defgeneric *gfunc;
+   int mi;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg)) return;
+
+   gfunc = CheckGenericExists(theEnv,"call-specific-method",theArg.lexemeValue->contents);
+   if (gfunc == NULL) return;
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg)) return;
+
+   mi = CheckMethodExists(theEnv,"call-specific-method",gfunc,(unsigned short) theArg.integerValue->contents);
+   if (mi == METHOD_NOT_FOUND)
+     return;
+   gfunc->methods[mi].busy++;
+   GenericDispatch(theEnv,gfunc,NULL,&gfunc->methods[mi],
+                   GetFirstArgument()->nextArg->nextArg,returnValue);
+   gfunc->methods[mi].busy--;
+  }
+
+/***********************************************************************
+  NAME         : OverrideNextMethod
+  DESCRIPTION  : Changes the arguments to shadowed methods, thus the set
+                 of applicable methods to this call may change
+  INPUTS       : A buffer to hold the result of the call
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Any of evaluating method restrictions and bodies
+  NOTES        : H/L Syntax: (override-next-method <args>)
+ ***********************************************************************/
+void OverrideNextMethod(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   if (EvaluationData(theEnv)->HaltExecution)
+     return;
+   if (DefgenericData(theEnv)->CurrentMethod == NULL)
+     {
+      PrintErrorID(theEnv,"GENRCEXE",2,false);
+      WriteString(theEnv,STDERR,"Shadowed methods not applicable in current context.\n");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   GenericDispatch(theEnv,DefgenericData(theEnv)->CurrentGeneric,DefgenericData(theEnv)->CurrentMethod,NULL,
+                   GetFirstArgument(),returnValue);
+  }
+
+/***********************************************************
+  NAME         : GetGenericCurrentArgument
+  DESCRIPTION  : Returns the value of the generic function
+                   argument being tested in the method
+                   applicability determination process
+  INPUTS       : A data-object buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Data-object set
+  NOTES        : Useful for queries in wildcard restrictions
+ ***********************************************************/
+void GetGenericCurrentArgument(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->value = DefgenericData(theEnv)->GenericCurrentArgument->value;
+   returnValue->begin = DefgenericData(theEnv)->GenericCurrentArgument->begin;
+   returnValue->range = DefgenericData(theEnv)->GenericCurrentArgument->range;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/************************************************************
+  NAME         : FindApplicableMethod
+  DESCRIPTION  : Finds the first/next applicable
+                   method for a generic function call
+  INPUTS       : 1) The generic function pointer
+                 2) The address of the current method
+                    (NULL to find the first)
+  RETURNS      : The address of the first/next
+                   applicable method (NULL on errors)
+  SIDE EFFECTS : Any from evaluating query restrictions
+                 Methoid busy count incremented if applicable
+  NOTES        : None
+ ************************************************************/
+static Defmethod *FindApplicableMethod(
+  Environment *theEnv,
+  Defgeneric *gfunc,
+  Defmethod *meth)
+  {
+   if (meth != NULL)
+     meth++;
+   else
+     meth = gfunc->methods;
+   for ( ; meth < &gfunc->methods[gfunc->mcnt] ; meth++)
+     {
+      meth->busy++;
+      if (IsMethodApplicable(theEnv,meth))
+        return(meth);
+      meth->busy--;
+     }
+   return NULL;
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/**********************************************************************
+  NAME         : WatchGeneric
+  DESCRIPTION  : Prints out a trace of the beginning or end
+                   of the execution of a generic function
+  INPUTS       : A string to indicate beginning or end of execution
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Uses the globals CurrentGeneric, ProcParamArraySize and
+                   ProcParamArray for other trace info
+ **********************************************************************/
+static void WatchGeneric(
+  Environment *theEnv,
+  const char *tstring)
+  {
+   if (ConstructData(theEnv)->ClearReadyInProgress ||
+       ConstructData(theEnv)->ClearInProgress)
+     { return; }
+
+   WriteString(theEnv,STDOUT,"GNC ");
+   WriteString(theEnv,STDOUT,tstring);
+   WriteString(theEnv,STDOUT," ");
+   if (DefgenericData(theEnv)->CurrentGeneric->header.whichModule->theModule != GetCurrentModule(theEnv))
+     {
+      WriteString(theEnv,STDOUT,DefgenericModule(DefgenericData(theEnv)->CurrentGeneric));
+      WriteString(theEnv,STDOUT,"::");
+     }
+   WriteString(theEnv,STDOUT,DefgenericData(theEnv)->CurrentGeneric->header.name->contents);
+   WriteString(theEnv,STDOUT," ");
+   WriteString(theEnv,STDOUT," ED:");
+   WriteInteger(theEnv,STDOUT,EvaluationData(theEnv)->CurrentEvaluationDepth);
+   PrintProcParamArray(theEnv,STDOUT);
+  }
+
+/**********************************************************************
+  NAME         : WatchMethod
+  DESCRIPTION  : Prints out a trace of the beginning or end
+                   of the execution of a generic function
+                   method
+  INPUTS       : A string to indicate beginning or end of execution
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Uses the globals CurrentGeneric, CurrentMethod,
+                   ProcParamArraySize and ProcParamArray for
+                   other trace info
+ **********************************************************************/
+static void WatchMethod(
+  Environment *theEnv,
+  const char *tstring)
+  {
+   if (ConstructData(theEnv)->ClearReadyInProgress ||
+       ConstructData(theEnv)->ClearInProgress)
+     { return; }
+
+   WriteString(theEnv,STDOUT,"MTH ");
+   WriteString(theEnv,STDOUT,tstring);
+   WriteString(theEnv,STDOUT," ");
+   if (DefgenericData(theEnv)->CurrentGeneric->header.whichModule->theModule != GetCurrentModule(theEnv))
+     {
+      WriteString(theEnv,STDOUT,DefgenericModule(DefgenericData(theEnv)->CurrentGeneric));
+      WriteString(theEnv,STDOUT,"::");
+     }
+   WriteString(theEnv,STDOUT,DefgenericData(theEnv)->CurrentGeneric->header.name->contents);
+   WriteString(theEnv,STDOUT,":#");
+   if (DefgenericData(theEnv)->CurrentMethod->system)
+     WriteString(theEnv,STDOUT,"SYS");
+   PrintUnsignedInteger(theEnv,STDOUT,DefgenericData(theEnv)->CurrentMethod->index);
+   WriteString(theEnv,STDOUT," ");
+   WriteString(theEnv,STDOUT," ED:");
+   WriteInteger(theEnv,STDOUT,EvaluationData(theEnv)->CurrentEvaluationDepth);
+   PrintProcParamArray(theEnv,STDOUT);
+  }
+
+#endif
+
+#if OBJECT_SYSTEM
+
+/***************************************************
+  NAME         : DetermineRestrictionClass
+  DESCRIPTION  : Finds the class of an argument in
+                   the ProcParamArray
+  INPUTS       : The argument data object
+  RETURNS      : The class address, NULL if error
+  SIDE EFFECTS : EvaluationError set on errors
+  NOTES        : None
+ ***************************************************/
+static Defclass *DetermineRestrictionClass(
+  Environment *theEnv,
+  UDFValue *dobj)
+  {
+   Instance *ins;
+   Defclass *cls;
+
+   if (dobj->header->type == INSTANCE_NAME_TYPE)
+     {
+      ins = FindInstanceBySymbol(theEnv,dobj->lexemeValue);
+      cls = (ins != NULL) ? ins->cls : NULL;
+     }
+   else if (dobj->header->type == INSTANCE_ADDRESS_TYPE)
+     {
+      ins = dobj->instanceValue;
+      cls = (ins->garbage == 0) ? ins->cls : NULL;
+     }
+   else
+     return(DefclassData(theEnv)->PrimitiveClassMap[dobj->header->type]);
+   if (cls == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      PrintErrorID(theEnv,"GENRCEXE",3,false);
+      WriteString(theEnv,STDERR,"Unable to determine class of ");
+      WriteUDFValue(theEnv,STDERR,dobj);
+      WriteString(theEnv,STDERR," in generic function '");
+      WriteString(theEnv,STDERR,DefgenericName(DefgenericData(theEnv)->CurrentGeneric));
+      WriteString(theEnv,STDERR,"'.\n");
+     }
+   return(cls);
+  }
+
+#endif
+
+#endif
+
diff --git a/clips/genrcexe.h b/clips/genrcexe.h
new file mode 100755
index 000000000..816bc63e3
--- /dev/null
+++ b/clips/genrcexe.h
@@ -0,0 +1,73 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_METHODS compilation flag.   */
+/*                                                           */
+/*      6.30: Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_genrcexe
+
+#pragma once
+
+#define _H_genrcexe
+
+#if DEFGENERIC_CONSTRUCT
+
+#include "evaluatn.h"
+#include "expressn.h"
+#include "genrcfun.h"
+
+   void                           GenericDispatch(Environment *,Defgeneric *,Defmethod *,Defmethod *,Expression *,UDFValue *);
+   void                           UnboundMethodErr(Environment *,const char *);
+   bool                           IsMethodApplicable(Environment *,Defmethod *);
+
+   bool                           NextMethodP(Environment *);
+   void                           NextMethodPCommand(Environment *,UDFContext *,UDFValue *);
+   void                           CallNextMethod(Environment *,UDFContext *,UDFValue *);
+   void                           CallSpecificMethod(Environment *,UDFContext *,UDFValue *);
+   void                           OverrideNextMethod(Environment *,UDFContext *,UDFValue *);
+
+   void                           GetGenericCurrentArgument(Environment *,UDFContext *,UDFValue *);
+
+#endif /* DEFGENERIC_CONSTRUCT */
+
+#endif /* _H_genrcexe */
+
+
+
+
diff --git a/clips/genrcfun.c b/clips/genrcfun.c
new file mode 100755
index 000000000..36b45d48f
--- /dev/null
+++ b/clips/genrcfun.c
@@ -0,0 +1,887 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Generic Functions Internal Routines              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_METHODS compilation flag.   */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when DEBUGGING_FUNCTIONS   */
+/*            is set to 0 and PROFILING_FUNCTIONS is set to  */
+/*            1.                                             */
+/*                                                           */
+/*            Fixed typing issue when OBJECT_SYSTEM          */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFGENERIC_CONSTRUCT
+
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#if OBJECT_SYSTEM
+#include "classcom.h"
+#include "classfun.h"
+#endif
+
+#include "argacces.h"
+#include "constrct.h"
+#include "cstrccom.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "genrccom.h"
+#include "genrcexe.h"
+#include "genrcfun.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+
+#include "genrcfun.h"
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+#if DEBUGGING_FUNCTIONS
+   static void                    DisplayGenericCore(Environment *,Defgeneric *);
+#endif
+
+#if RUN_TIME
+   static void                    RuntimeDefgenericAction(Environment *,ConstructHeader *,void *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if ! RUN_TIME
+
+/***************************************************
+  NAME         : ClearDefgenericsReady
+  DESCRIPTION  : Determines if it is safe to
+                 remove all defgenerics
+                 Assumes *all* constructs will be
+                 deleted - only checks to see if
+                 any methods are currently
+                 executing
+  INPUTS       : None
+  RETURNS      : True if no methods are
+                 executing, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : Used by (clear) and (bload)
+ ***************************************************/
+bool ClearDefgenericsReady(
+  Environment *theEnv,
+  void *context)
+  {
+   return((DefgenericData(theEnv)->CurrentGeneric != NULL) ? false : true);
+  }
+
+/*****************************************************
+  NAME         : AllocateDefgenericModule
+  DESCRIPTION  : Creates and initializes a
+                 list of defgenerics for a new module
+  INPUTS       : None
+  RETURNS      : The new deffunction module
+  SIDE EFFECTS : Deffunction module created
+  NOTES        : None
+ *****************************************************/
+void *AllocateDefgenericModule(
+  Environment *theEnv)
+  {
+   return (void *) get_struct(theEnv,defgenericModule);
+  }
+
+/***************************************************
+  NAME         : FreeDefgenericModule
+  DESCRIPTION  : Removes a deffunction module and
+                 all associated deffunctions
+  INPUTS       : The deffunction module
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Module and deffunctions deleted
+  NOTES        : None
+ ***************************************************/
+void FreeDefgenericModule(
+  Environment *theEnv,
+  void *theItem)
+  {
+#if (! BLOAD_ONLY)
+   FreeConstructHeaderModule(theEnv,(struct defmoduleItemHeader *) theItem,DefgenericData(theEnv)->DefgenericConstruct);
+#endif
+   rtn_struct(theEnv,defgenericModule,theItem);
+  }
+
+#endif
+
+#if RUN_TIME
+
+/*************************************************/
+/* RuntimeDefgenericAction: Action to be applied */
+/*   to each deffacts construct when a runtime   */
+/*   initialization occurs.                      */
+/*************************************************/
+static void RuntimeDefgenericAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Defgeneric *theDefgeneric = (Defgeneric *) theConstruct;
+   long gi;
+   
+   theDefgeneric->header.env = theEnv;
+
+   for (gi = 0 ; gi < theDefgeneric->mcnt ; gi++)
+     { theDefgeneric->methods[gi].header.env = theEnv; }
+  }
+
+/********************************/
+/* DefgenericRunTimeInitialize: */
+/********************************/
+void DefgenericRunTimeInitialize(
+  Environment *theEnv)
+  {
+   DoForAllConstructs(theEnv,RuntimeDefgenericAction,DefgenericData(theEnv)->DefgenericModuleIndex,true,NULL);
+  }
+
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/************************************************************
+  NAME         : ClearDefmethods
+  DESCRIPTION  : Deletes all defmethods - generic headers
+                   are left intact
+  INPUTS       : None
+  RETURNS      : True if all methods deleted, false otherwise
+  SIDE EFFECTS : Defmethods deleted
+  NOTES        : Clearing generic functions is done in
+                   two stages
+
+                 1) Delete all methods (to clear any
+                    references to other constructs)
+                 2) Delete all generic headers
+
+                 This allows other constructs which
+                   mutually refer to generic functions
+                   to be cleared
+ ************************************************************/
+bool ClearDefmethods(
+  Environment *theEnv)
+  {
+   Defgeneric *gfunc;
+   bool success = true;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv) == true) return false;
+#endif
+
+   gfunc = GetNextDefgeneric(theEnv,NULL);
+   while (gfunc != NULL)
+     {
+      if (RemoveAllExplicitMethods(theEnv,gfunc) == false)
+        success = false;
+      gfunc = GetNextDefgeneric(theEnv,gfunc);
+     }
+   return success;
+  }
+
+/*****************************************************************
+  NAME         : RemoveAllExplicitMethods
+  DESCRIPTION  : Deletes all explicit defmethods - generic headers
+                   are left intact (as well as a method for an
+                   overloaded system function)
+  INPUTS       : None
+  RETURNS      : True if all methods deleted, false otherwise
+  SIDE EFFECTS : Explicit defmethods deleted
+  NOTES        : None
+ *****************************************************************/
+bool RemoveAllExplicitMethods(
+  Environment *theEnv,
+  Defgeneric *gfunc)
+  {
+   unsigned short i, j;
+   unsigned short systemMethodCount = 0;
+   Defmethod *narr;
+
+   if (MethodsExecuting(gfunc) == false)
+     {
+      for (i = 0 ; i < gfunc->mcnt ; i++)
+        {
+         if (gfunc->methods[i].system)
+           systemMethodCount++;
+         else
+           DeleteMethodInfo(theEnv,gfunc,&gfunc->methods[i]);
+        }
+      if (systemMethodCount != 0)
+        {
+         narr = (Defmethod *) gm2(theEnv,(systemMethodCount * sizeof(Defmethod)));
+         i = 0;
+         j = 0;
+         while (i < gfunc->mcnt)
+           {
+            if (gfunc->methods[i].system)
+              GenCopyMemory(Defmethod,1,&narr[j++],&gfunc->methods[i]);
+            i++;
+           }
+         rm(theEnv,gfunc->methods,(sizeof(Defmethod) * gfunc->mcnt));
+         gfunc->mcnt = systemMethodCount;
+         gfunc->methods = narr;
+        }
+      else
+        {
+         if (gfunc->mcnt != 0)
+           rm(theEnv,gfunc->methods,(sizeof(Defmethod) * gfunc->mcnt));
+         gfunc->mcnt = 0;
+         gfunc->methods = NULL;
+        }
+      return true;
+     }
+   return false;
+  }
+
+/**************************************************
+  NAME         : RemoveDefgeneric
+  DESCRIPTION  : Removes a generic function node
+                   from the generic list along with
+                   all its methods
+  INPUTS       : The generic function
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : List adjusted
+                 Nodes deallocated
+  NOTES        : Assumes generic is not in use!!!
+ **************************************************/
+void RemoveDefgeneric(
+  Environment *theEnv,
+  Defgeneric *theDefgeneric)
+  {
+   long i;
+
+   for (i = 0 ; i < theDefgeneric->mcnt ; i++)
+     DeleteMethodInfo(theEnv,theDefgeneric,&theDefgeneric->methods[i]);
+
+   if (theDefgeneric->mcnt != 0)
+     { rm(theEnv,theDefgeneric->methods,(sizeof(Defmethod) * theDefgeneric->mcnt)); }
+   ReleaseLexeme(theEnv,GetDefgenericNamePointer(theDefgeneric));
+   SetDefgenericPPForm(theEnv,theDefgeneric,NULL);
+   ClearUserDataList(theEnv,theDefgeneric->header.usrData);
+   rtn_struct(theEnv,defgeneric,theDefgeneric);
+  }
+
+/****************************************************************
+  NAME         : ClearDefgenerics
+  DESCRIPTION  : Deletes all generic headers
+  INPUTS       : None
+  RETURNS      : True if all methods deleted, false otherwise
+  SIDE EFFECTS : Generic headers deleted (and any implicit system
+                  function methods)
+  NOTES        : None
+ ****************************************************************/
+bool ClearDefgenerics(
+  Environment *theEnv)
+  {
+   Defgeneric *gfunc, *gtmp;
+   bool success = true;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv) == true) return false;
+#endif
+
+   gfunc = GetNextDefgeneric(theEnv,NULL);
+   while (gfunc != NULL)
+     {
+      gtmp = gfunc;
+      gfunc = GetNextDefgeneric(theEnv,gfunc);
+      if (RemoveAllExplicitMethods(theEnv,gtmp) == false)
+        {
+         CantDeleteItemErrorMessage(theEnv,"generic function",DefgenericName(gtmp));
+         success = false;
+        }
+      else
+        {
+         RemoveConstructFromModule(theEnv,&gtmp->header);
+         RemoveDefgeneric(theEnv,gtmp);
+        }
+     }
+   return(success);
+  }
+
+/********************************************************
+  NAME         : MethodAlterError
+  DESCRIPTION  : Prints out an error message reflecting
+                   that a generic function's methods
+                   cannot be altered while any of them
+                   are executing
+  INPUTS       : The generic function
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************/
+void MethodAlterError(
+  Environment *theEnv,
+  Defgeneric *gfunc)
+  {
+   PrintErrorID(theEnv,"GENRCFUN",1,false);
+   WriteString(theEnv,STDERR,"Defgeneric '");
+   WriteString(theEnv,STDERR,DefgenericName(gfunc));
+   WriteString(theEnv,STDERR,"' cannot be modified while one of its methods is executing.\n");
+  }
+
+/***************************************************
+  NAME         : DeleteMethodInfo
+  DESCRIPTION  : Deallocates all the data associated
+                  w/ a method but does not release
+                  the method structure itself
+  INPUTS       : 1) The generic function address
+                 2) The method address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Nodes deallocated
+  NOTES        : None
+ ***************************************************/
+void DeleteMethodInfo(
+  Environment *theEnv,
+  Defgeneric *gfunc,
+  Defmethod *meth)
+  {
+   short j,k;
+   RESTRICTION *rptr;
+
+   SaveBusyCount(gfunc);
+   ExpressionDeinstall(theEnv,meth->actions);
+   ReturnPackedExpression(theEnv,meth->actions);
+   ClearUserDataList(theEnv,meth->header.usrData);
+   if (meth->header.ppForm != NULL)
+     rm(theEnv,(void *) meth->header.ppForm,(sizeof(char) * (strlen(meth->header.ppForm)+1)));
+   for (j = 0 ; j < meth->restrictionCount ; j++)
+     {
+      rptr = &meth->restrictions[j];
+
+      for (k = 0 ; k < rptr->tcnt ; k++)
+#if OBJECT_SYSTEM
+        DecrementDefclassBusyCount(theEnv,(Defclass *) rptr->types[k]);
+#else
+        DecrementIntegerCount(theEnv,(CLIPSInteger *) rptr->types[k]);
+#endif
+
+      if (rptr->types != NULL)
+        rm(theEnv,rptr->types,(sizeof(void *) * rptr->tcnt));
+      ExpressionDeinstall(theEnv,rptr->query);
+      ReturnPackedExpression(theEnv,rptr->query);
+     }
+   if (meth->restrictions != NULL)
+     rm(theEnv,meth->restrictions,
+        (sizeof(RESTRICTION) * meth->restrictionCount));
+   RestoreBusyCount(gfunc);
+  }
+
+/***************************************************
+  NAME         : DestroyMethodInfo
+  DESCRIPTION  : Deallocates all the data associated
+                  w/ a method but does not release
+                  the method structure itself
+  INPUTS       : 1) The generic function address
+                 2) The method address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Nodes deallocated
+  NOTES        : None
+ ***************************************************/
+void DestroyMethodInfo(
+  Environment *theEnv,
+  Defgeneric *gfunc,
+  Defmethod *meth)
+  {
+   int j;
+   RESTRICTION *rptr;
+#if MAC_XCD
+#pragma unused(gfunc)
+#endif
+
+   ReturnPackedExpression(theEnv,meth->actions);
+
+   ClearUserDataList(theEnv,meth->header.usrData);
+   if (meth->header.ppForm != NULL)
+     rm(theEnv,(void *) meth->header.ppForm,(sizeof(char) * (strlen(meth->header.ppForm)+1)));
+   for (j = 0 ; j < meth->restrictionCount ; j++)
+     {
+      rptr = &meth->restrictions[j];
+
+      if (rptr->types != NULL)
+        rm(theEnv,rptr->types,(sizeof(void *) * rptr->tcnt));
+      ReturnPackedExpression(theEnv,rptr->query);
+     }
+
+   if (meth->restrictions != NULL)
+     rm(theEnv,meth->restrictions,
+        (sizeof(RESTRICTION) * meth->restrictionCount));
+  }
+
+/***************************************************
+  NAME         : MethodsExecuting
+  DESCRIPTION  : Determines if any of the methods of
+                   a generic function are currently
+                   executing
+  INPUTS       : The generic function address
+  RETURNS      : True if any methods are executing,
+                   false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool MethodsExecuting(
+  Defgeneric *gfunc)
+  {
+   long i;
+
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     if (gfunc->methods[i].busy > 0)
+       return true;
+   return false;
+  }
+
+#endif
+
+#if ! OBJECT_SYSTEM
+
+/**************************************************************
+  NAME         : SubsumeType
+  DESCRIPTION  : Determines if the second type subsumes
+                 the first type
+                 (e.g. INTEGER_TYPE is subsumed by NUMBER_TYPE_CODE)
+  INPUTS       : Two type codes
+  RETURNS      : True if type 2 subsumes type 1, false
+                 otherwise
+  SIDE EFFECTS : None
+  NOTES        : Used only when COOL is not present
+ **************************************************************/
+bool SubsumeType(
+  int t1,
+  int t2)
+  {
+   if ((t2 == OBJECT_TYPE_CODE) || (t2 == PRIMITIVE_TYPE_CODE))
+     return true;
+   if ((t2 == NUMBER_TYPE_CODE) && ((t1 == INTEGER_TYPE) || (t1 == FLOAT_TYPE)))
+     return true;
+   if ((t2 == LEXEME_TYPE_CODE) && ((t1 == STRING_TYPE) || (t1 == SYMBOL_TYPE)))
+     return true;
+   if ((t2 == ADDRESS_TYPE_CODE) && ((t1 == EXTERNAL_ADDRESS_TYPE) ||
+       (t1 == FACT_ADDRESS_TYPE) || (t1 == INSTANCE_ADDRESS_TYPE)))
+     return true;
+   if ((t2 == LEXEME_TYPE_CODE) &&
+       ((t1 == INSTANCE_NAME_TYPE) || (t1 == INSTANCE_ADDRESS_TYPE)))
+     return true;
+   return false;
+  }
+
+#endif
+
+/*****************************************************
+  NAME         : FindMethodByIndex
+  DESCRIPTION  : Finds a generic function method of
+                   specified index
+  INPUTS       : 1) The generic function
+                 2) The index
+  RETURNS      : The position of the method in the
+                   generic function's method array,
+                   -1 if not found
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+unsigned short FindMethodByIndex(
+  Defgeneric *gfunc,
+  unsigned short theIndex)
+  {
+   unsigned short i;
+
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     {
+      if (gfunc->methods[i].index == theIndex)
+        { return i; }
+     }
+        
+   return METHOD_NOT_FOUND;
+  }
+
+#if DEBUGGING_FUNCTIONS || PROFILING_FUNCTIONS
+
+/******************************************************************
+  NAME         : PrintMethod
+  DESCRIPTION  : Lists a brief description of methods for a method
+  INPUTS       : 1) Buffer for method info
+                 2) Size of buffer (not including space for '\0')
+                 3) The method address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : A terminating newline is NOT included
+ ******************************************************************/
+void PrintMethod(
+  Environment *theEnv,
+  Defmethod *meth,
+  StringBuilder *theSB)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+   unsigned short j,k;
+   RESTRICTION *rptr;
+   char numbuf[15];
+
+   SBReset(theSB);
+   if (meth->system)
+     SBAppend(theSB,"SYS");
+   gensprintf(numbuf,"%-2hu ",meth->index);
+   SBAppend(theSB,numbuf);
+   for (j = 0 ; j < meth->restrictionCount ; j++)
+     {
+      rptr = &meth->restrictions[j];
+      if (((j + 1) == meth->restrictionCount) && (meth->maxRestrictions == RESTRICTIONS_UNBOUNDED))
+        {
+         if ((rptr->tcnt == 0) && (rptr->query == NULL))
+           {
+            SBAppend(theSB,"$?");
+            break;
+           }
+         SBAppend(theSB,"($? ");
+        }
+      else
+        SBAppend(theSB,"(");
+      for (k = 0 ; k < rptr->tcnt ; k++)
+        {
+#if OBJECT_SYSTEM
+         SBAppend(theSB,DefclassName((Defclass *) rptr->types[k]));
+#else
+         SBAppend(theSB,TypeName(theEnv,((CLIPSInteger *) rptr->types[k])->contents));
+#endif
+         if ((k + 1) < rptr->tcnt)
+           SBAppend(theSB," ");
+        }
+      if (rptr->query != NULL)
+        {
+         if (rptr->tcnt != 0)
+           SBAppend(theSB," ");
+         SBAppend(theSB,"<qry>");
+        }
+      SBAppend(theSB,")");
+      if ((j + 1) != meth->restrictionCount)
+        SBAppend(theSB," ");
+     }
+  }
+
+#endif /* DEBUGGING_FUNCTIONS || PROFILING_FUNCTIONS */
+
+#if DEBUGGING_FUNCTIONS
+
+/*************************************************************
+  NAME         : PreviewGeneric
+  DESCRIPTION  : Allows the user to see a printout of all the
+                   applicable methods for a particular generic
+                   function call
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Any side-effects of evaluating the generic
+                   function arguments
+                 and evaluating query-functions to determine
+                   the set of applicable methods
+  NOTES        : H/L Syntax: (preview-generic <func> <args>)
+ *************************************************************/
+void PreviewGeneric(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defgeneric *gfunc;
+   Defgeneric *previousGeneric;
+   bool oldce;
+   UDFValue theArg;
+
+   EvaluationData(theEnv)->EvaluationError = false;
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg)) return;
+
+   gfunc = LookupDefgenericByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if (gfunc == NULL)
+     {
+      PrintErrorID(theEnv,"GENRCFUN",3,false);
+      WriteString(theEnv,STDERR,"Unable to find generic function '");
+      WriteString(theEnv,STDERR,theArg.lexemeValue->contents);
+      WriteString(theEnv,STDERR,"' in function preview-generic.\n");
+      return;
+     }
+   oldce = ExecutingConstruct(theEnv);
+   SetExecutingConstruct(theEnv,true);
+   previousGeneric = DefgenericData(theEnv)->CurrentGeneric;
+   DefgenericData(theEnv)->CurrentGeneric = gfunc;
+   EvaluationData(theEnv)->CurrentEvaluationDepth++;
+   PushProcParameters(theEnv,GetFirstArgument()->nextArg,
+                          CountArguments(GetFirstArgument()->nextArg),
+                          DefgenericName(gfunc),"generic function",
+                          UnboundMethodErr);
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      PopProcParameters(theEnv);
+      DefgenericData(theEnv)->CurrentGeneric = previousGeneric;
+      EvaluationData(theEnv)->CurrentEvaluationDepth--;
+      SetExecutingConstruct(theEnv,oldce);
+      return;
+     }
+   gfunc->busy++;
+   DisplayGenericCore(theEnv,gfunc);
+   gfunc->busy--;
+   PopProcParameters(theEnv);
+   DefgenericData(theEnv)->CurrentGeneric = previousGeneric;
+   EvaluationData(theEnv)->CurrentEvaluationDepth--;
+   SetExecutingConstruct(theEnv,oldce);
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/***************************************************
+  NAME         : CheckGenericExists
+  DESCRIPTION  : Finds the address of named
+                  generic function and prints out
+                  error message if not found
+  INPUTS       : 1) Calling function
+                 2) Name of generic function
+  RETURNS      : Generic function address (NULL if
+                   not found)
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Defgeneric *CheckGenericExists(
+  Environment *theEnv,
+  const char *fname,
+  const char *gname)
+  {
+   Defgeneric *gfunc;
+
+   gfunc = LookupDefgenericByMdlOrScope(theEnv,gname);
+   if (gfunc == NULL)
+     {
+      PrintErrorID(theEnv,"GENRCFUN",3,false);
+      WriteString(theEnv,STDERR,"Unable to find generic function '");
+      WriteString(theEnv,STDERR,gname);
+      WriteString(theEnv,STDERR,"' in function '");
+      WriteString(theEnv,STDERR,fname);
+      WriteString(theEnv,STDERR,"'.\n");
+      SetEvaluationError(theEnv,true);
+     }
+   return(gfunc);
+  }
+
+/***************************************************
+  NAME         : CheckMethodExists
+  DESCRIPTION  : Finds the array index of the
+                  specified method and prints out
+                  error message if not found
+  INPUTS       : 1) Calling function
+                 2) Generic function address
+                 3) Index of method
+  RETURNS      : Method array index (METHOD_NOT_FOUND if not found)
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+unsigned short CheckMethodExists(
+  Environment *theEnv,
+  const char *fname,
+  Defgeneric *gfunc,
+  unsigned short mi)
+  {
+   unsigned short fi;
+
+   fi = FindMethodByIndex(gfunc,mi);
+   if (fi == METHOD_NOT_FOUND)
+     {
+      PrintErrorID(theEnv,"GENRCFUN",2,false);
+      WriteString(theEnv,STDERR,"Unable to find method '");
+      WriteString(theEnv,STDERR,DefgenericName(gfunc));
+      WriteString(theEnv,STDERR,"' #");
+      PrintUnsignedInteger(theEnv,STDERR,mi);
+      WriteString(theEnv,STDERR," in function '");
+      WriteString(theEnv,STDERR,fname);
+      WriteString(theEnv,STDERR,"'.\n");
+      SetEvaluationError(theEnv,true);
+     }
+   return fi;
+  }
+
+#if ! OBJECT_SYSTEM
+
+/*******************************************************
+  NAME         : TypeName
+  DESCRIPTION  : Given an integer type code, this
+                 function returns the string name of
+                 the type
+  INPUTS       : The type code
+  RETURNS      : The name-string of the type, or
+                 "<???UNKNOWN-TYPE???>" for unrecognized
+                 types
+  SIDE EFFECTS : EvaluationError set and error message
+                 printed for unrecognized types
+  NOTES        : Used only when COOL is not present
+ *******************************************************/
+const char *TypeName(
+  Environment *theEnv,
+  int tcode)
+  {
+   switch (tcode)
+     {
+      case INTEGER_TYPE             : return(INTEGER_TYPE_NAME);
+      case FLOAT_TYPE               : return(FLOAT_TYPE_NAME);
+      case SYMBOL_TYPE              : return(SYMBOL_TYPE_NAME);
+      case STRING_TYPE              : return(STRING_TYPE_NAME);
+      case MULTIFIELD_TYPE          : return(MULTIFIELD_TYPE_NAME);
+      case EXTERNAL_ADDRESS_TYPE    : return(EXTERNAL_ADDRESS_TYPE_NAME);
+      case FACT_ADDRESS_TYPE        : return(FACT_ADDRESS_TYPE_NAME);
+      case INSTANCE_ADDRESS_TYPE    : return(INSTANCE_ADDRESS_TYPE_NAME);
+      case INSTANCE_NAME_TYPE       : return(INSTANCE_NAME_TYPE_NAME);
+      case OBJECT_TYPE_CODE    : return(OBJECT_TYPE_NAME);
+      case PRIMITIVE_TYPE_CODE : return(PRIMITIVE_TYPE_NAME);
+      case NUMBER_TYPE_CODE    : return(NUMBER_TYPE_NAME);
+      case LEXEME_TYPE_CODE    : return(LEXEME_TYPE_NAME);
+      case ADDRESS_TYPE_CODE   : return(ADDRESS_TYPE_NAME);
+      case INSTANCE_TYPE_CODE  : return(INSTANCE_TYPE_NAME);
+      default                  : PrintErrorID(theEnv,"INSCOM",1,false);
+                                 WriteString(theEnv,STDERR,"Undefined type in function 'type'.\n");
+                                 SetEvaluationError(theEnv,true);
+                                 return("<UNKNOWN-TYPE>");
+     }
+  }
+
+#endif
+
+/******************************************************
+  NAME         : PrintGenericName
+  DESCRIPTION  : Prints the name of a gneric function
+                 (including the module name if the
+                  generic is not in the current module)
+  INPUTS       : 1) The logical name of the output
+                 2) The generic functions
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Generic name printed
+  NOTES        : None
+ ******************************************************/
+void PrintGenericName(
+  Environment *theEnv,
+  const char *logName,
+  Defgeneric *gfunc)
+  {
+   if (gfunc->header.whichModule->theModule != GetCurrentModule(theEnv))
+     {
+      WriteString(theEnv,logName,DefgenericModule(gfunc));
+      WriteString(theEnv,logName,"::");
+     }
+   WriteString(theEnv,logName,gfunc->header.name->contents);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if DEBUGGING_FUNCTIONS
+
+/*********************************************************
+  NAME         : DisplayGenericCore
+  DESCRIPTION  : Prints out a description of a core
+                   frame of applicable methods for
+                   a particular call of a generic function
+  INPUTS       : The generic function
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************************/
+static void DisplayGenericCore(
+  Environment *theEnv,
+  Defgeneric *gfunc)
+  {
+   long i;
+   bool rtn = false;
+   StringBuilder *theSB;
+   
+   theSB = CreateStringBuilder(theEnv,256);
+
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     {
+      gfunc->methods[i].busy++;
+      if (IsMethodApplicable(theEnv,&gfunc->methods[i]))
+        {
+         rtn = true;
+         WriteString(theEnv,STDOUT,DefgenericName(gfunc));
+         WriteString(theEnv,STDOUT," #");
+         PrintMethod(theEnv,&gfunc->methods[i],theSB);
+         WriteString(theEnv,STDOUT,theSB->contents);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+      gfunc->methods[i].busy--;
+     }
+   if (rtn == false)
+     {
+      WriteString(theEnv,STDOUT,"No applicable methods for ");
+      WriteString(theEnv,STDOUT,DefgenericName(gfunc));
+      WriteString(theEnv,STDOUT,".\n");
+     }
+     
+   SBDispose(theSB);
+  }
+
+#endif
+
+#endif
+
diff --git a/clips/genrcfun.h b/clips/genrcfun.h
new file mode 100755
index 000000000..53f2732e8
--- /dev/null
+++ b/clips/genrcfun.h
@@ -0,0 +1,185 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_METHODS compilation flag.   */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when DEBUGGING_FUNCTIONS   */
+/*            is set to 0 and PROFILING_FUNCTIONS is set to  */
+/*            1.                                             */
+/*                                                           */
+/*            Fixed typing issue when OBJECT_SYSTEM          */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_genrcfun
+
+#pragma once
+
+#define _H_genrcfun
+
+typedef struct defgenericModule DEFGENERIC_MODULE;
+typedef struct restriction RESTRICTION;
+typedef struct defmethod Defmethod;
+typedef struct defgeneric Defgeneric;
+
+#include <stdio.h>
+
+#include "entities.h"
+#include "conscomp.h"
+#include "constrct.h"
+#include "expressn.h"
+#include "evaluatn.h"
+#include "moduldef.h"
+#include "symbol.h"
+
+#define METHOD_NOT_FOUND USHRT_MAX
+#define RESTRICTIONS_UNBOUNDED USHRT_MAX
+
+struct defgenericModule
+  {
+   struct defmoduleItemHeader header;
+  };
+
+struct restriction
+  {
+   void **types;
+   Expression *query;
+   unsigned short tcnt;
+  };
+
+struct defmethod
+  {
+   ConstructHeader header;
+   unsigned short index;
+   unsigned busy;
+   unsigned short restrictionCount;
+   unsigned short minRestrictions;
+   unsigned short maxRestrictions;
+   unsigned short localVarCount;
+   unsigned system : 1;
+   unsigned trace : 1;
+   RESTRICTION *restrictions;
+   Expression *actions;
+  };
+
+struct defgeneric
+  {
+   ConstructHeader header;
+   unsigned busy; // TBD bool?
+   bool trace;
+   Defmethod *methods;
+   unsigned short mcnt;
+   unsigned short new_index;
+  };
+
+#define DEFGENERIC_DATA 27
+
+struct defgenericData
+  {
+   Construct *DefgenericConstruct;
+   unsigned int DefgenericModuleIndex;
+   EntityRecord GenericEntityRecord;
+#if DEBUGGING_FUNCTIONS
+   bool WatchGenerics;
+   bool WatchMethods;
+#endif
+   Defgeneric *CurrentGeneric;
+   Defmethod *CurrentMethod;
+   UDFValue *GenericCurrentArgument;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   unsigned OldGenericBusySave;
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   struct CodeGeneratorItem *DefgenericCodeItem;
+#endif
+  };
+
+#define DefgenericData(theEnv) ((struct defgenericData *) GetEnvironmentData(theEnv,DEFGENERIC_DATA))
+#define SaveBusyCount(gfunc)    (DefgenericData(theEnv)->OldGenericBusySave = gfunc->busy)
+#define RestoreBusyCount(gfunc) (gfunc->busy = DefgenericData(theEnv)->OldGenericBusySave)
+
+#if ! RUN_TIME
+   bool                           ClearDefgenericsReady(Environment *,void *);
+   void                          *AllocateDefgenericModule(Environment *);
+   void                           FreeDefgenericModule(Environment *,void *);
+#else
+   void                           DefgenericRunTimeInitialize(Environment *);
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+   bool                           ClearDefmethods(Environment *);
+   bool                           RemoveAllExplicitMethods(Environment *,Defgeneric *);
+   void                           RemoveDefgeneric(Environment *,Defgeneric *);
+   bool                           ClearDefgenerics(Environment *);
+   void                           MethodAlterError(Environment *,Defgeneric *);
+   void                           DeleteMethodInfo(Environment *,Defgeneric *,Defmethod *);
+   void                           DestroyMethodInfo(Environment *,Defgeneric *,Defmethod *);
+   bool                           MethodsExecuting(Defgeneric *);
+#endif
+#if ! OBJECT_SYSTEM
+   bool                           SubsumeType(int,int);
+#endif
+
+   unsigned short                 FindMethodByIndex(Defgeneric *,unsigned short);
+#if DEBUGGING_FUNCTIONS || PROFILING_FUNCTIONS
+   void                           PrintMethod(Environment *,Defmethod *,StringBuilder *);
+#endif
+#if DEBUGGING_FUNCTIONS
+   void                           PreviewGeneric(Environment *,UDFContext *,UDFValue *);
+#endif
+   Defgeneric                    *CheckGenericExists(Environment *,const char *,const char *);
+   unsigned short                 CheckMethodExists(Environment *,const char *,Defgeneric *,unsigned short);
+
+#if ! OBJECT_SYSTEM
+   const char                    *TypeName(Environment *,int);
+#endif
+
+   void                           PrintGenericName(Environment *,const char *,Defgeneric *);
+
+#endif /* _H_genrcfun */
+
diff --git a/clips/genrcpsr.c b/clips/genrcpsr.c
new file mode 100755
index 000000000..72c60f7b2
--- /dev/null
+++ b/clips/genrcpsr.c
@@ -0,0 +1,1618 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Generic Functions Parsing Routines               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            If the last construct in a loaded file is a    */
+/*            deffunction or defmethod with no closing right */
+/*            parenthesis, an error should be issued, but is */
+/*            not. DR0872                                    */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_AND_SAVE        */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*            Fixed typing issue when OBJECT_SYSTEM          */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+
+#include "setup.h"
+
+#if DEFGENERIC_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#if DEFFUNCTION_CONSTRUCT
+#include "dffnxfun.h"
+#endif
+
+#if OBJECT_SYSTEM
+#include "classfun.h"
+#include "classcom.h"
+#endif
+
+#include "cstrccom.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "genrccom.h"
+#include "immthpsr.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pprint.h"
+#include "prcdrpsr.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "sysdep.h"
+
+#include "genrcpsr.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define HIGHER_PRECEDENCE -1
+#define IDENTICAL          0
+#define LOWER_PRECEDENCE   1
+
+#define CURR_ARG_VAR "current-argument"
+
+#define PARAMETER_ERROR USHRT_MAX
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+   static bool                    ValidGenericName(Environment *,const char *);
+   static CLIPSLexeme            *ParseMethodNameAndIndex(Environment *,const char *,unsigned short *,struct token *);
+
+#if DEBUGGING_FUNCTIONS
+   static void                    CreateDefaultGenericPPForm(Environment *,Defgeneric *);
+#endif
+
+   static unsigned short          ParseMethodParameters(Environment *,const char *,Expression **,CLIPSLexeme **,struct token *);
+   static RESTRICTION            *ParseRestriction(Environment *,const char *);
+   static void                    ReplaceCurrentArgRefs(Environment *,Expression *);
+   static bool                    DuplicateParameters(Environment *,Expression *,Expression **,CLIPSLexeme *);
+   static Expression             *AddParameter(Environment *,Expression *,Expression *,CLIPSLexeme *,RESTRICTION *);
+   static Expression             *ValidType(Environment *,CLIPSLexeme *);
+   static bool                    RedundantClasses(Environment *,void *,void *);
+   static Defgeneric             *AddGeneric(Environment *,CLIPSLexeme *,bool *);
+   static Defmethod              *AddGenericMethod(Environment *,Defgeneric *,int,unsigned short);
+   static int                     RestrictionsCompare(Expression *,int,int,int,Defmethod *);
+   static int                     TypeListCompare(RESTRICTION *,RESTRICTION *);
+   static Defgeneric             *NewGeneric(Environment *,CLIPSLexeme *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************************************
+  NAME         : ParseDefgeneric
+  DESCRIPTION  : Parses the defgeneric construct
+  INPUTS       : The input logical name
+  RETURNS      : False if successful parse, true otherwise
+  SIDE EFFECTS : Inserts valid generic function defn into generic entry
+  NOTES        : H/L Syntax :
+                 (defgeneric <name> [<comment>])
+ ***************************************************************************/
+bool ParseDefgeneric(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   CLIPSLexeme *gname;
+   Defgeneric *gfunc;
+   bool newGeneric;
+   struct token genericInputToken;
+
+   SetPPBufferStatus(theEnv,true);
+   FlushPPBuffer(theEnv);
+   SavePPBuffer(theEnv,"(defgeneric ");
+   SetIndentDepth(theEnv,3);
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv) == true) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"defgeneric");
+      return true;
+     }
+#endif
+
+   gname = GetConstructNameAndComment(theEnv,readSource,&genericInputToken,"defgeneric",
+                                      (FindConstructFunction *) FindDefgenericInModule,
+                                      NULL,"^",true,true,true,false);
+   if (gname == NULL)
+     return true;
+
+   if (ValidGenericName(theEnv,gname->contents) == false)
+     return true;
+
+   if (genericInputToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      PrintErrorID(theEnv,"GENRCPSR",1,false);
+      WriteString(theEnv,STDERR,"Expected ')' to complete defgeneric.\n");
+      return true;
+     }
+   SavePPBuffer(theEnv,"\n");
+
+   /* ========================================================
+      If we're only checking syntax, don't add the
+      successfully parsed deffacts to the KB.
+      ======================================================== */
+
+   if (ConstructData(theEnv)->CheckSyntaxMode)
+     { return false; }
+
+   gfunc = AddGeneric(theEnv,gname,&newGeneric);
+
+#if DEBUGGING_FUNCTIONS
+   SetDefgenericPPForm(theEnv,gfunc,GetConserveMemory(theEnv) ? NULL : CopyPPBuffer(theEnv));
+#endif
+   return false;
+  }
+
+/***************************************************************************
+  NAME         : ParseDefmethod
+  DESCRIPTION  : Parses the defmethod construct
+  INPUTS       : The input logical name
+  RETURNS      : False if successful parse, true otherwise
+  SIDE EFFECTS : Inserts valid method definition into generic entry
+  NOTES        : H/L Syntax :
+                 (defmethod <name> [<index>] [<comment>]
+                    (<restriction>* [<wildcard>])
+                    <action>*)
+                 <restriction> :== ?<name> |
+                                   (?<name> <type>* [<restriction-query>])
+                 <wildcard>    :== $?<name> |
+                                   ($?<name> <type>* [<restriction-query>])
+ ***************************************************************************/
+bool ParseDefmethod(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   CLIPSLexeme *gname;
+   unsigned short rcnt;
+   int mposn;
+   unsigned short mi;
+   unsigned short lvars;
+   bool newMethod;
+   bool mnew = false;
+   bool error;
+   Expression *params,*actions,*tmp;
+   CLIPSLexeme *wildcard;
+   Defmethod *meth;
+   Defgeneric *gfunc;
+   unsigned short theIndex;
+   struct token genericInputToken;
+
+   SetPPBufferStatus(theEnv,true);
+   FlushPPBuffer(theEnv);
+   SetIndentDepth(theEnv,3);
+   SavePPBuffer(theEnv,"(defmethod ");
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv) == true) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"defmethod");
+      return true;
+     }
+#endif
+
+   gname = ParseMethodNameAndIndex(theEnv,readSource,&theIndex,&genericInputToken);
+   if (gname == NULL)
+     return true;
+
+   if (ValidGenericName(theEnv,gname->contents) == false)
+     return true;
+
+   /* ========================================================
+      Go ahead and add the header so that the generic function
+      can be called recursively
+      ======================================================== */
+   gfunc = AddGeneric(theEnv,gname,&newMethod);
+
+#if DEBUGGING_FUNCTIONS
+   if (newMethod && (! ConstructData(theEnv)->CheckSyntaxMode))
+      CreateDefaultGenericPPForm(theEnv,gfunc);
+#endif
+
+   IncrementIndentDepth(theEnv,1);
+   rcnt = ParseMethodParameters(theEnv,readSource,&params,&wildcard,&genericInputToken);
+   DecrementIndentDepth(theEnv,1);
+   if (rcnt == PARAMETER_ERROR)
+     goto DefmethodParseError;
+   PPCRAndIndent(theEnv);
+   for (tmp = params ; tmp != NULL ; tmp = tmp->nextArg)
+     {
+      ReplaceCurrentArgRefs(theEnv,((RESTRICTION *) tmp->argList)->query);
+      if (ReplaceProcVars(theEnv,"method",((RESTRICTION *) tmp->argList)->query,
+                                  params,wildcard,NULL,NULL))
+        {
+         DeleteTempRestricts(theEnv,params);
+         goto DefmethodParseError;
+        }
+     }
+   meth = FindMethodByRestrictions(gfunc,params,rcnt,wildcard,&mposn);
+   error = false;
+   if (meth != NULL)
+     {
+      if (meth->system)
+        {
+         PrintErrorID(theEnv,"GENRCPSR",17,false);
+         WriteString(theEnv,STDERR,"Cannot replace the implicit system method #");
+         PrintUnsignedInteger(theEnv,STDERR,meth->index);
+         WriteString(theEnv,STDERR,".\n");
+         error = true;
+        }
+      else if ((theIndex != 0) && (theIndex != meth->index))
+        {
+         PrintErrorID(theEnv,"GENRCPSR",2,false);
+         WriteString(theEnv,STDERR,"New method #");
+         PrintUnsignedInteger(theEnv,STDERR,theIndex);
+         WriteString(theEnv,STDERR," would be indistinguishable from method #");
+         PrintUnsignedInteger(theEnv,STDERR,meth->index);
+         WriteString(theEnv,STDERR,".\n");
+         error = true;
+        }
+     }
+   else if (theIndex != 0)
+     {
+      mi = FindMethodByIndex(gfunc,theIndex);
+      if (mi == METHOD_NOT_FOUND)
+        mnew = true;
+      else if (gfunc->methods[mi].system)
+        {
+         PrintErrorID(theEnv,"GENRCPSR",17,false);
+         WriteString(theEnv,STDERR,"Cannot replace the implicit system method #");
+         PrintUnsignedInteger(theEnv,STDERR,theIndex);
+         WriteString(theEnv,STDERR,".\n");
+         error = true;
+        }
+     }
+   else
+     mnew = true;
+   if (error)
+     {
+      DeleteTempRestricts(theEnv,params);
+      goto DefmethodParseError;
+     }
+   ExpressionData(theEnv)->ReturnContext = true;
+   actions = ParseProcActions(theEnv,"method",readSource,
+                              &genericInputToken,params,wildcard,
+                              NULL,NULL,&lvars,NULL);
+
+   /*===========================================================*/
+   /* Check for the closing right parenthesis of the defmethod. */
+   /*===========================================================*/
+
+   if ((genericInputToken.tknType != RIGHT_PARENTHESIS_TOKEN) &&  /* DR0872 */
+       (actions != NULL))
+     {
+      SyntaxErrorMessage(theEnv,"defmethod");
+      DeleteTempRestricts(theEnv,params);
+      ReturnPackedExpression(theEnv,actions);
+      goto DefmethodParseError;
+     }
+
+   if (actions == NULL)
+     {
+      DeleteTempRestricts(theEnv,params);
+      goto DefmethodParseError;
+     }
+
+   /*==============================================*/
+   /* If we're only checking syntax, don't add the */
+   /* successfully parsed deffunction to the KB.   */
+   /*==============================================*/
+
+   if (ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      DeleteTempRestricts(theEnv,params);
+      ReturnPackedExpression(theEnv,actions);
+      if (newMethod)
+        {
+         RemoveConstructFromModule(theEnv,&gfunc->header);
+         RemoveDefgeneric(theEnv,gfunc);
+        }
+      return false;
+     }
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,genericInputToken.printForm);
+   SavePPBuffer(theEnv,"\n");
+
+#if DEBUGGING_FUNCTIONS
+   meth = AddMethod(theEnv,gfunc,meth,mposn,theIndex,params,rcnt,lvars,wildcard,actions,
+             GetConserveMemory(theEnv) ? NULL : CopyPPBuffer(theEnv),false);
+#else
+   meth = AddMethod(theEnv,gfunc,meth,mposn,theIndex,params,rcnt,lvars,wildcard,actions,NULL,false);
+#endif
+   DeleteTempRestricts(theEnv,params);
+   if (GetPrintWhileLoading(theEnv) && GetCompilationsWatch(theEnv) &&
+       (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      const char *outRouter = STDOUT;
+
+      if (mnew)
+        {
+         WriteString(theEnv,outRouter,"   Method #");
+         PrintUnsignedInteger(theEnv,outRouter,meth->index);
+         WriteString(theEnv,outRouter," defined.\n");
+        }
+      else
+        {
+         outRouter = STDWRN;
+         PrintWarningID(theEnv,"CSTRCPSR",1,true);
+         WriteString(theEnv,outRouter,"Method #");
+         PrintUnsignedInteger(theEnv,outRouter,meth->index);
+         WriteString(theEnv,outRouter," redefined.\n");
+        }
+     }
+   return false;
+
+DefmethodParseError:
+   if (newMethod)
+     {
+      RemoveConstructFromModule(theEnv,&gfunc->header);
+      RemoveDefgeneric(theEnv,gfunc);
+     }
+   return true;
+  }
+
+/************************************************************************
+  NAME         : AddMethod
+  DESCRIPTION  : (Re)defines a new method for a generic
+                 If method already exists, deletes old information
+                    before proceeding.
+  INPUTS       : 1) The generic address
+                 2) The old method address (can be NULL)
+                 3) The old method array position (can be -1)
+                 4) The method index to assign (0 if don't care)
+                 5) The parameter expression-list
+                    (restrictions attached to argList pointers)
+                 6) The number of restrictions
+                 7) The number of locals vars reqd
+                 8) The wildcard symbol (NULL if none)
+                 9) Method actions
+                 10) Method pretty-print form
+                 11) A flag indicating whether to copy the
+                     restriction types or just use the pointers
+  RETURNS      : The new (old) method address
+  SIDE EFFECTS : Method added to (or changed in) method array for generic
+                 Restrictions repacked into new method
+                 Actions and pretty-print form attached
+  NOTES        : Assumes if a method is being redefined, its busy
+                   count is 0!!
+                 IMPORTANT: Expects that FindMethodByRestrictions() has
+                   previously been called to determine if this method
+                   is already present or not.  Arguments #1 and #2
+                   should be the values obtained from FindMethod...().
+ ************************************************************************/
+Defmethod *AddMethod(
+  Environment *theEnv,
+  Defgeneric *gfunc,
+  Defmethod *meth,
+  int mposn,
+  unsigned short mi,
+  Expression *params,
+  unsigned short rcnt,
+  unsigned short lvars,
+  CLIPSLexeme *wildcard,
+  Expression *actions,
+  char *ppForm,
+  bool copyRestricts)
+  {
+   RESTRICTION *rptr, *rtmp;
+   int i,j;
+   unsigned short mai;
+
+   SaveBusyCount(gfunc);
+   if (meth == NULL)
+     {
+      mai = (mi != 0) ? FindMethodByIndex(gfunc,mi) : METHOD_NOT_FOUND;
+      if (mai == METHOD_NOT_FOUND)
+        meth = AddGenericMethod(theEnv,gfunc,mposn,mi);
+      else
+        {
+         DeleteMethodInfo(theEnv,gfunc,&gfunc->methods[mai]);
+         if (mai < mposn)
+           {
+            mposn--;
+            for (i = mai+1 ; i <= mposn ; i++)
+              GenCopyMemory(Defmethod,1,&gfunc->methods[i-1],&gfunc->methods[i]);
+           }
+         else
+           {
+            for (i = mai-1 ; i >= mposn ; i--)
+              GenCopyMemory(Defmethod,1,&gfunc->methods[i+1],&gfunc->methods[i]);
+           }
+         meth = &gfunc->methods[mposn];
+         meth->index = mi;
+        }
+     }
+   else
+     {
+      /* ================================
+         The old trace state is preserved
+         ================================ */
+      ExpressionDeinstall(theEnv,meth->actions);
+      ReturnPackedExpression(theEnv,meth->actions);
+      if (meth->header.ppForm != NULL)
+        rm(theEnv,(void *) meth->header.ppForm,(sizeof(char) * (strlen(meth->header.ppForm)+1)));
+     }
+   meth->system = 0;
+   meth->actions = actions;
+   ExpressionInstall(theEnv,meth->actions);
+   meth->header.ppForm = ppForm;
+   if (mposn == -1)
+     {
+      RestoreBusyCount(gfunc);
+      return(meth);
+     }
+
+   meth->localVarCount = lvars;
+   meth->restrictionCount = rcnt;
+      
+   if (wildcard != NULL)
+     {
+      if (rcnt == 0)
+        { meth->minRestrictions = RESTRICTIONS_UNBOUNDED; }
+      else
+        { meth->minRestrictions = rcnt - 1; }
+      meth->maxRestrictions = RESTRICTIONS_UNBOUNDED;
+     }
+   else
+     meth->minRestrictions = meth->maxRestrictions = rcnt;
+   if (rcnt != 0)
+     meth->restrictions = (RESTRICTION *)
+                          gm2(theEnv,(sizeof(RESTRICTION) * rcnt));
+   else
+     meth->restrictions = NULL;
+   for (i = 0 ; i < rcnt ; i++)
+     {
+      rptr = &meth->restrictions[i];
+      rtmp = (RESTRICTION *) params->argList;
+      rptr->query = PackExpression(theEnv,rtmp->query);
+      rptr->tcnt = rtmp->tcnt;
+      if (copyRestricts)
+        {
+         if (rtmp->types != NULL)
+           {
+            rptr->types = (void **) gm2(theEnv,(rptr->tcnt * sizeof(void *)));
+            GenCopyMemory(void *,rptr->tcnt,rptr->types,rtmp->types);
+           }
+         else
+           rptr->types = NULL;
+        }
+      else
+        {
+         rptr->types = rtmp->types;
+
+         /* =====================================================
+            Make sure the types-array is not deallocated when the
+              temporary restriction nodes are
+            ===================================================== */
+         rtmp->tcnt = 0;
+         rtmp->types = NULL;
+        }
+      ExpressionInstall(theEnv,rptr->query);
+      for (j = 0 ; j < rptr->tcnt ; j++)
+#if OBJECT_SYSTEM
+        IncrementDefclassBusyCount(theEnv,(Defclass *) rptr->types[j]);
+#else
+        IncrementIntegerCount((CLIPSInteger *) rptr->types[j]);
+#endif
+      params = params->nextArg;
+     }
+   RestoreBusyCount(gfunc);
+   return(meth);
+  }
+
+/*****************************************************
+  NAME         : PackRestrictionTypes
+  DESCRIPTION  : Takes the restriction type list
+                   and packs it into a contiguous
+                   array of void *.
+  INPUTS       : 1) The restriction structure
+                 2) The types expression list
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Array allocated & expressions freed
+  NOTES        : None
+ *****************************************************/
+void PackRestrictionTypes(
+  Environment *theEnv,
+  RESTRICTION *rptr,
+  Expression *types)
+  {
+   Expression *tmp;
+   long i;
+
+   rptr->tcnt = 0;
+   for (tmp = types ; tmp != NULL ; tmp = tmp->nextArg)
+     rptr->tcnt++;
+   if (rptr->tcnt != 0)
+     rptr->types = (void **) gm2(theEnv,(sizeof(void *) * rptr->tcnt));
+   else
+     rptr->types = NULL;
+   for (i = 0 , tmp = types ; i < rptr->tcnt ; i++ , tmp = tmp->nextArg)
+     rptr->types[i] = tmp->value;
+   ReturnExpression(theEnv,types);
+  }
+
+/***************************************************
+  NAME         : DeleteTempRestricts
+  DESCRIPTION  : Deallocates the method
+                   temporary parameter list
+  INPUTS       : The head of the list
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : List deallocated
+  NOTES        : None
+ ***************************************************/
+void DeleteTempRestricts(
+  Environment *theEnv,
+  Expression *phead)
+  {
+   Expression *ptmp;
+   RESTRICTION *rtmp;
+
+   while (phead != NULL)
+     {
+      ptmp = phead;
+      phead = phead->nextArg;
+      rtmp = (RESTRICTION *) ptmp->argList;
+      rtn_struct(theEnv,expr,ptmp);
+      ReturnExpression(theEnv,rtmp->query);
+      if (rtmp->tcnt != 0)
+        rm(theEnv,rtmp->types,(sizeof(void *) * rtmp->tcnt));
+      rtn_struct(theEnv,restriction,rtmp);
+     }
+  }
+
+/**********************************************************
+  NAME         : FindMethodByRestrictions
+  DESCRIPTION  : See if a method for the specified
+                   generic satsifies the given restrictions
+  INPUTS       : 1) Generic function
+                 2) Parameter/restriction expression list
+                 3) Number of restrictions
+                 4) Wildcard symbol (can be NULL)
+                 5) Caller's buffer for holding array posn
+                      of where to add new generic method
+                      (-1 if method already present)
+  RETURNS      : The address of the found method, NULL if
+                    not found
+  SIDE EFFECTS : Sets the caller's buffer to the index of
+                   where to place the new method, -1 if
+                   already present
+  NOTES        : None
+ **********************************************************/
+Defmethod *FindMethodByRestrictions(
+  Defgeneric *gfunc,
+  Expression *params,
+  int rcnt,
+  CLIPSLexeme *wildcard,
+  int *posn)
+  {
+   int i,cmp;
+   int min,max;
+
+   if (wildcard != NULL)
+     {
+      min = rcnt-1;
+      max = -1;
+     }
+   else
+     min = max = rcnt;
+   for (i = 0 ; i < gfunc->mcnt ; i++)
+     {
+      cmp = RestrictionsCompare(params,rcnt,min,max,&gfunc->methods[i]);
+      if (cmp == IDENTICAL)
+        {
+         *posn = -1;
+         return(&gfunc->methods[i]);
+        }
+      else if (cmp == HIGHER_PRECEDENCE)
+        {
+         *posn = i;
+         return NULL;
+        }
+     }
+   *posn = i;
+   return NULL;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : ValidGenericName
+  DESCRIPTION  : Determines if a particular function name
+                    can be overloaded
+  INPUTS       : The name
+  RETURNS      : True if OK, false otherwise
+  SIDE EFFECTS : Error message printed
+  NOTES        : GetConstructNameAndComment() (called before
+                 this function) ensures that the defgeneric
+                 name does not conflict with one from
+                 another module
+ ***********************************************************/
+static bool ValidGenericName(
+  Environment *theEnv,
+  const char *theDefgenericName)
+  {
+   Defgeneric *theDefgeneric;
+#if DEFFUNCTION_CONSTRUCT
+   Defmodule *theModule;
+   Deffunction *theDeffunction;
+#endif
+   struct functionDefinition *systemFunction;
+
+   /*==============================================*/
+   /* A defgeneric cannot be named the same as a   */
+   /* construct type, e.g, defclass, defrule, etc. */
+   /*==============================================*/
+
+   if (FindConstruct(theEnv,theDefgenericName) != NULL)
+     {
+      PrintErrorID(theEnv,"GENRCPSR",3,false);
+      WriteString(theEnv,STDERR,"Defgenerics are not allowed to replace constructs.\n");
+      return false;
+     }
+
+#if DEFFUNCTION_CONSTRUCT
+   /* ========================================
+      A defgeneric cannot be named the same as
+      a defffunction (either in this module or
+      imported from another)
+      ======================================== */
+   theDeffunction = LookupDeffunctionInScope(theEnv,theDefgenericName);
+   if (theDeffunction != NULL)
+     {
+      theModule = GetConstructModuleItem(&theDeffunction->header)->theModule;
+      if (theModule != GetCurrentModule(theEnv))
+        {
+         PrintErrorID(theEnv,"GENRCPSR",4,false);
+         WriteString(theEnv,STDERR,"Deffunction '");
+         WriteString(theEnv,STDERR,DeffunctionName(theDeffunction));
+         WriteString(theEnv,STDERR,"' imported from module '");
+         WriteString(theEnv,STDERR,DefmoduleName(theModule));
+         WriteString(theEnv,STDERR,"' conflicts with this defgeneric.\n");
+         return false;
+        }
+      else
+        {
+         PrintErrorID(theEnv,"GENRCPSR",5,false);
+         WriteString(theEnv,STDERR,"Defgenerics are not allowed to replace deffunctions.\n");
+        }
+      return false;
+     }
+#endif
+
+   /*===========================================*/
+   /* See if the defgeneric already exists in   */
+   /* this module (or is imported from another) */
+   /*===========================================*/
+
+   theDefgeneric = FindDefgenericInModule(theEnv,theDefgenericName);
+   if (theDefgeneric != NULL)
+     {
+      /* ===========================================
+         And the redefinition of a defgeneric in
+         the current module is only valid if none
+         of its methods are executing
+         =========================================== */
+      if (MethodsExecuting(theDefgeneric))
+        {
+         MethodAlterError(theEnv,theDefgeneric);
+         return false;
+        }
+     }
+
+   /* =======================================
+      Only certain specific system functions
+      may be overloaded by generic functions
+      ======================================= */
+   systemFunction = FindFunction(theEnv,theDefgenericName);
+   if ((systemFunction != NULL) ?
+       (systemFunction->overloadable == false) : false)
+     {
+      PrintErrorID(theEnv,"GENRCPSR",16,false);
+      WriteString(theEnv,STDERR,"The system function '");
+      WriteString(theEnv,STDERR,theDefgenericName);
+      WriteString(theEnv,STDERR,"' cannot be overloaded.\n");
+      return false;
+     }
+   return true;
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/***************************************************
+  NAME         : CreateDefaultGenericPPForm
+  DESCRIPTION  : Adds a default pretty-print form
+                 for a gneric function when it is
+                 impliciylt created by the defn
+                 of its first method
+  INPUTS       : The generic function
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pretty-print form created and
+                 attached.
+  NOTES        : None
+ ***************************************************/
+static void CreateDefaultGenericPPForm(
+  Environment *theEnv,
+  Defgeneric *gfunc)
+  {
+   const char *moduleName, *genericName;
+   char *buf;
+
+   moduleName = DefmoduleName(GetCurrentModule(theEnv));
+   genericName = DefgenericName(gfunc);
+   buf = (char *) gm2(theEnv,(sizeof(char) * (strlen(moduleName) + strlen(genericName) + 17)));
+   gensprintf(buf,"(defgeneric %s::%s)\n",moduleName,genericName);
+   SetDefgenericPPForm(theEnv,gfunc,buf);
+  }
+
+#endif
+
+/*******************************************************
+  NAME         : ParseMethodNameAndIndex
+  DESCRIPTION  : Parses the name of the method and
+                   optional method index
+  INPUTS       : 1) The logical name of the input source
+                 2) Caller's buffer for method index
+                    (0 if not specified)
+  RETURNS      : The symbolic name of the method
+  SIDE EFFECTS : None
+  NOTES        : Assumes "(defmethod " already parsed
+ *******************************************************/
+static CLIPSLexeme *ParseMethodNameAndIndex(
+  Environment *theEnv,
+  const char *readSource,
+  unsigned short *theIndex,
+  struct token *genericInputToken)
+  {
+   CLIPSLexeme *gname;
+
+   *theIndex = 0;
+   gname = GetConstructNameAndComment(theEnv,readSource,genericInputToken,"defgeneric",
+                                      (FindConstructFunction *) FindDefgenericInModule,
+                                      NULL,"&",true,false,true,true);
+   if (gname == NULL)
+     return NULL;
+   if (genericInputToken->tknType == INTEGER_TOKEN)
+     {
+      unsigned short tmp;
+
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,genericInputToken->printForm);
+      tmp = (unsigned short) genericInputToken->integerValue->contents;
+      if (tmp < 1)
+        {
+         PrintErrorID(theEnv,"GENRCPSR",6,false);
+         WriteString(theEnv,STDERR,"Method index out of range.\n");
+         return NULL;
+        }
+      *theIndex = tmp;
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,genericInputToken);
+     }
+   if (genericInputToken->tknType == STRING_TOKEN)
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,genericInputToken->printForm);
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,genericInputToken);
+     }
+   return(gname);
+  }
+
+/************************************************************************
+  NAME         : ParseMethodParameters
+  DESCRIPTION  : Parses method restrictions
+                   (parameter names with class and expression specifiers)
+  INPUTS       : 1) The logical name of the input source
+                 2) Caller's buffer for the parameter name list
+                    (Restriction structures are attached to
+                     argList pointers of parameter nodes)
+                 3) Caller's buffer for wildcard symbol (if any)
+  RETURNS      : The number of parameters, or -1 on errors
+  SIDE EFFECTS : Memory allocated for parameters and restrictions
+                 Parameter names stored in expression list
+                 Parameter restrictions stored in contiguous array
+  NOTES        : Any memory allocated is freed on errors
+                 Assumes first opening parenthesis has been scanned
+ ************************************************************************/
+static unsigned short ParseMethodParameters(
+  Environment *theEnv,
+  const char *readSource,
+  Expression **params,
+  CLIPSLexeme **wildcard,
+  struct token *genericInputToken)
+  {
+   Expression *phead = NULL,*pprv;
+   CLIPSLexeme *pname;
+   RESTRICTION *rtmp;
+   unsigned short rcnt = 0;
+
+   *wildcard = NULL;
+   *params = NULL;
+   if (genericInputToken->tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      PrintErrorID(theEnv,"GENRCPSR",7,false);
+      WriteString(theEnv,STDERR,"Expected a '(' to begin method parameter restrictions.\n");
+      return PARAMETER_ERROR;
+     }
+   GetToken(theEnv,readSource,genericInputToken);
+   while (genericInputToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      if (*wildcard != NULL)
+        {
+         DeleteTempRestricts(theEnv,phead);
+         PrintErrorID(theEnv,"PRCCODE",8,false);
+         WriteString(theEnv,STDERR,"No parameters allowed after wildcard parameter.\n");
+         return PARAMETER_ERROR;
+        }
+      if ((genericInputToken->tknType == SF_VARIABLE_TOKEN) ||
+          (genericInputToken->tknType == MF_VARIABLE_TOKEN))
+        {
+         pname = genericInputToken->lexemeValue;
+         if (DuplicateParameters(theEnv,phead,&pprv,pname))
+           {
+            DeleteTempRestricts(theEnv,phead);
+            return PARAMETER_ERROR;
+           }
+         if (genericInputToken->tknType == MF_VARIABLE_TOKEN)
+           *wildcard = pname;
+         rtmp = get_struct(theEnv,restriction);
+         PackRestrictionTypes(theEnv,rtmp,NULL);
+         rtmp->query = NULL;
+         phead = AddParameter(theEnv,phead,pprv,pname,rtmp);
+         rcnt++;
+        }
+      else if (genericInputToken->tknType == LEFT_PARENTHESIS_TOKEN)
+        {
+         GetToken(theEnv,readSource,genericInputToken);
+         if ((genericInputToken->tknType != SF_VARIABLE_TOKEN) &&
+             (genericInputToken->tknType != MF_VARIABLE_TOKEN))
+           {
+            DeleteTempRestricts(theEnv,phead);
+            PrintErrorID(theEnv,"GENRCPSR",8,false);
+            WriteString(theEnv,STDERR,"Expected a variable for parameter specification.\n");
+            return PARAMETER_ERROR;
+           }
+         pname = genericInputToken->lexemeValue;
+         if (DuplicateParameters(theEnv,phead,&pprv,pname))
+           {
+            DeleteTempRestricts(theEnv,phead);
+            return PARAMETER_ERROR;
+           }
+         if (genericInputToken->tknType == MF_VARIABLE_TOKEN)
+           *wildcard = pname;
+         SavePPBuffer(theEnv," ");
+         rtmp = ParseRestriction(theEnv,readSource);
+         if (rtmp == NULL)
+           {
+            DeleteTempRestricts(theEnv,phead);
+            return PARAMETER_ERROR;
+           }
+         phead = AddParameter(theEnv,phead,pprv,pname,rtmp);
+         rcnt++;
+        }
+      else
+        {
+         DeleteTempRestricts(theEnv,phead);
+         PrintErrorID(theEnv,"GENRCPSR",9,false);
+         WriteString(theEnv,STDERR,"Expected a variable or '(' for parameter specification.\n");
+         return PARAMETER_ERROR;
+        }
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,genericInputToken);
+     }
+   if (rcnt != 0)
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+     }
+   *params = phead;
+   return(rcnt);
+  }
+
+/************************************************************
+  NAME         : ParseRestriction
+  DESCRIPTION  : Parses the restriction for a parameter of a
+                   method
+                 This restriction is comprised of:
+                   1) A list of classes (or types) that are
+                      allowed for the parameter (None
+                      if no type restriction)
+                   2) And an optional restriction-query
+                      expression
+  INPUTS       : The logical name of the input source
+  RETURNS      : The address of a RESTRICTION node, NULL on
+                   errors
+  SIDE EFFECTS : RESTRICTION node allocated
+                   Types are in a contiguous array of void *
+                   Query is an expression
+  NOTES        : Assumes "(?<var> " has already been parsed
+                 H/L Syntax: <type>* [<query>])
+ ************************************************************/
+static RESTRICTION *ParseRestriction(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   Expression *types = NULL,*new_types,
+              *typesbot,*tmp,*tmp2,
+              *query = NULL;
+   RESTRICTION *rptr;
+   struct token genericInputToken;
+
+   GetToken(theEnv,readSource,&genericInputToken);
+   while (genericInputToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      if (query != NULL)
+        {
+         PrintErrorID(theEnv,"GENRCPSR",10,false);
+         WriteString(theEnv,STDERR,"Query must be last in parameter restriction.\n");
+         ReturnExpression(theEnv,query);
+         ReturnExpression(theEnv,types);
+         return NULL;
+        }
+      if (genericInputToken.tknType == SYMBOL_TOKEN)
+        {
+         new_types = ValidType(theEnv,genericInputToken.lexemeValue);
+         if (new_types == NULL)
+           {
+            ReturnExpression(theEnv,types);
+            ReturnExpression(theEnv,query);
+            return NULL;
+           }
+         if (types == NULL)
+           types = new_types;
+         else
+           {
+            for (typesbot = tmp = types ; tmp != NULL ; tmp = tmp->nextArg)
+              {
+               for (tmp2 = new_types ; tmp2 != NULL ; tmp2 = tmp2->nextArg)
+                 {
+                  if (tmp->value == tmp2->value)
+                    {
+                     PrintErrorID(theEnv,"GENRCPSR",11,false);
+#if OBJECT_SYSTEM
+                     WriteString(theEnv,STDERR,"Duplicate classes not allowed in parameter restriction.\n");
+#else
+                     WriteString(theEnv,STDERR,"Duplicate types not allowed in parameter restriction.\n");
+#endif
+                     ReturnExpression(theEnv,query);
+                     ReturnExpression(theEnv,types);
+                     ReturnExpression(theEnv,new_types);
+                     return NULL;
+                    }
+                  if (RedundantClasses(theEnv,tmp->value,tmp2->value))
+                    {
+                     ReturnExpression(theEnv,query);
+                     ReturnExpression(theEnv,types);
+                     ReturnExpression(theEnv,new_types);
+                     return NULL;
+                    }
+                 }
+               typesbot = tmp;
+              }
+            typesbot->nextArg = new_types;
+           }
+        }
+      else if (genericInputToken.tknType == LEFT_PARENTHESIS_TOKEN)
+        {
+         query = Function1Parse(theEnv,readSource);
+         if (query == NULL)
+           {
+            ReturnExpression(theEnv,types);
+            return NULL;
+           }
+         if (GetParsedBindNames(theEnv) != NULL)
+           {
+            PrintErrorID(theEnv,"GENRCPSR",12,false);
+            WriteString(theEnv,STDERR,"Binds are not allowed in query expressions.\n");
+            ReturnExpression(theEnv,query);
+            ReturnExpression(theEnv,types);
+            return NULL;
+           }
+        }
+#if DEFGLOBAL_CONSTRUCT
+      else if (genericInputToken.tknType == GBL_VARIABLE_TOKEN)
+        query = GenConstant(theEnv,GBL_VARIABLE,genericInputToken.value);
+#endif
+      else
+        {
+         PrintErrorID(theEnv,"GENRCPSR",13,false);
+#if OBJECT_SYSTEM
+         WriteString(theEnv,STDERR,"Expected a valid class name or query.\n");
+#else
+         WriteString(theEnv,STDERR,"Expected a valid type name or query.\n");
+#endif
+         ReturnExpression(theEnv,query);
+         ReturnExpression(theEnv,types);
+         return NULL;
+        }
+      SavePPBuffer(theEnv," ");
+      GetToken(theEnv,readSource,&genericInputToken);
+     }
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+   if ((types == NULL) && (query == NULL))
+     {
+      PrintErrorID(theEnv,"GENRCPSR",13,false);
+#if OBJECT_SYSTEM
+      WriteString(theEnv,STDERR,"Expected a valid class name or query.\n");
+#else
+      WriteString(theEnv,STDERR,"Expected a valid type name or query.\n");
+#endif
+      return NULL;
+     }
+   rptr = get_struct(theEnv,restriction);
+   rptr->query = query;
+   PackRestrictionTypes(theEnv,rptr,types);
+   return(rptr);
+  }
+
+/*****************************************************************
+  NAME         : ReplaceCurrentArgRefs
+  DESCRIPTION  : Replaces all references to ?current-argument in
+                  method parameter queries with special calls
+                  to (gnrc-current-arg)
+  INPUTS       : The query expression
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Variable references to ?current-argument replaced
+  NOTES        : None
+ *****************************************************************/
+static void ReplaceCurrentArgRefs(
+  Environment *theEnv,
+  Expression *query)
+  {
+   while (query != NULL)
+     {
+      if ((query->type != SF_VARIABLE) ? false :
+          (strcmp(query->lexemeValue->contents,CURR_ARG_VAR) == 0))
+        {
+         query->type = FCALL;
+         query->value = FindFunction(theEnv,"(gnrc-current-arg)");
+        }
+      if (query->argList != NULL)
+        ReplaceCurrentArgRefs(theEnv,query->argList);
+      query = query->nextArg;
+     }
+  }
+
+/**********************************************************
+  NAME         : DuplicateParameters
+  DESCRIPTION  : Examines the parameter expression
+                   chain for a method looking duplicates.
+  INPUTS       : 1) The parameter chain (can be NULL)
+                 2) Caller's buffer for address of
+                    last node searched (can be used to
+                    later attach new parameter)
+                 3) The name of the parameter being checked
+  RETURNS      : True if duplicates found, false otherwise
+  SIDE EFFECTS : Caller's prv address set
+  NOTES        : Assumes all parameter list nodes are WORDS
+ **********************************************************/
+static bool DuplicateParameters(
+  Environment *theEnv,
+  Expression *head,
+  Expression **prv,
+  CLIPSLexeme *name)
+  {
+   *prv = NULL;
+   while (head != NULL)
+     {
+      if (head->value == (void *) name)
+        {
+         PrintErrorID(theEnv,"PRCCODE",7,false);
+         WriteString(theEnv,STDERR,"Duplicate parameter names not allowed.\n");
+         return true;
+        }
+      *prv = head;
+      head = head->nextArg;
+     }
+   return false;
+  }
+
+/*****************************************************************
+  NAME         : AddParameter
+  DESCRIPTION  : Shoves a new paramter with its restriction
+                   onto the list for a method
+                 The parameter list is a list of expressions
+                   linked by neext_arg pointers, and the
+                   argList pointers are used for the restrictions
+  INPUTS       : 1) The head of the list
+                 2) The bottom of the list
+                 3) The parameter name
+                 4) The parameter restriction
+  RETURNS      : The (new) head of the list
+  SIDE EFFECTS : New parameter expression node allocated, set,
+                   and attached
+  NOTES        : None
+ *****************************************************************/
+static Expression *AddParameter(
+  Environment *theEnv,
+  Expression *phead,
+  Expression *pprv,
+  CLIPSLexeme *pname,
+  RESTRICTION *rptr)
+  {
+   Expression *ptmp;
+
+   ptmp = GenConstant(theEnv,SYMBOL_TYPE,pname);
+   if (phead == NULL)
+     phead = ptmp;
+   else
+     pprv->nextArg = ptmp;
+   ptmp->argList = (Expression *) rptr;
+   return(phead);
+  }
+
+/**************************************************************
+  NAME         : ValidType
+  DESCRIPTION  : Examines the name of a restriction type and
+                   forms a list of integer-code expressions
+                   corresponding to the primitive types
+                 (or a Class address if COOL is installed)
+  INPUTS       : The type name
+  RETURNS      : The expression chain (NULL on errors)
+  SIDE EFFECTS : Expression type chain allocated
+                   one or more nodes holding codes for types
+                   (or class addresses)
+  NOTES        : None
+ *************************************************************/
+static Expression *ValidType(
+  Environment *theEnv,
+  CLIPSLexeme *tname)
+  {
+#if OBJECT_SYSTEM
+   Defclass *cls;
+
+   if (FindModuleSeparator(tname->contents))
+     IllegalModuleSpecifierMessage(theEnv);
+   else
+     {
+      cls = LookupDefclassInScope(theEnv,tname->contents);
+      if (cls == NULL)
+        {
+         PrintErrorID(theEnv,"GENRCPSR",14,false);
+         WriteString(theEnv,STDERR,"Unknown class in method.\n");
+         return NULL;
+        }
+      return(GenConstant(theEnv,DEFCLASS_PTR,cls));
+     }
+#else
+   if (strcmp(tname->contents,INTEGER_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,INTEGER_TYPE)));
+   if (strcmp(tname->contents,FLOAT_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,FLOAT_TYPE)));
+   if (strcmp(tname->contents,SYMBOL_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,SYMBOL_TYPE)));
+   if (strcmp(tname->contents,STRING_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,STRING_TYPE)));
+   if (strcmp(tname->contents,MULTIFIELD_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,MULTIFIELD_TYPE)));
+   if (strcmp(tname->contents,EXTERNAL_ADDRESS_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,EXTERNAL_ADDRESS_TYPE)));
+   if (strcmp(tname->contents,FACT_ADDRESS_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,FACT_ADDRESS_TYPE)));
+   if (strcmp(tname->contents,NUMBER_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,NUMBER_TYPE_CODE)));
+   if (strcmp(tname->contents,LEXEME_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,LEXEME_TYPE_CODE)));
+   if (strcmp(tname->contents,ADDRESS_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,ADDRESS_TYPE_CODE)));
+   if (strcmp(tname->contents,PRIMITIVE_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,PRIMITIVE_TYPE_CODE)));
+   if (strcmp(tname->contents,OBJECT_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,OBJECT_TYPE_CODE)));
+   if (strcmp(tname->contents,INSTANCE_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,INSTANCE_TYPE_CODE)));
+   if (strcmp(tname->contents,INSTANCE_NAME_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,INSTANCE_NAME_TYPE)));
+   if (strcmp(tname->contents,INSTANCE_ADDRESS_TYPE_NAME) == 0)
+     return(GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,INSTANCE_ADDRESS_TYPE)));
+
+   PrintErrorID(theEnv,"GENRCPSR",14,false);
+   WriteString(theEnv,STDERR,"Unknown type in method.\n");
+#endif
+   return NULL;
+  }
+
+/*************************************************************
+  NAME         : RedundantClasses
+  DESCRIPTION  : Determines if one class (type) is
+                 subsumes (or is subsumed by) another.
+  INPUTS       : Two void pointers which are class pointers
+                 if COOL is installed or integer hash nodes
+                 for type codes otherwise.
+  RETURNS      : True if there is subsumption, false otherwise
+  SIDE EFFECTS : An error message is printed, if appropriate.
+  NOTES        : None
+ *************************************************************/
+static bool RedundantClasses(
+  Environment *theEnv,
+  void *c1,
+  void *c2)
+  {
+   const char *tname;
+
+#if OBJECT_SYSTEM
+   if (HasSuperclass((Defclass *) c1,(Defclass *) c2))
+     tname = DefclassName((Defclass *) c1);
+   else if (HasSuperclass((Defclass *) c2,(Defclass *) c1))
+     tname = DefclassName((Defclass *) c2);
+#else
+   if (SubsumeType(((CLIPSInteger *) c1)->contents,((CLIPSInteger *) c2)->contents))
+     tname = TypeName(theEnv,((CLIPSInteger *) c1)->contents);
+   else if (SubsumeType(((CLIPSInteger *) c2)->contents,((CLIPSInteger *) c1)->contents))
+     tname = TypeName(theEnv,((CLIPSInteger *) c2)->contents);
+#endif
+   else
+     return false;
+   PrintErrorID(theEnv,"GENRCPSR",15,false);
+   WriteString(theEnv,STDERR,"Class '");
+   WriteString(theEnv,STDERR,tname);
+   WriteString(theEnv,STDERR,"' is redundant.\n");
+   return true;
+  }
+
+/*********************************************************
+  NAME         : AddGeneric
+  DESCRIPTION  : Inserts a new generic function
+                   header into the generic list
+  INPUTS       : 1) Symbolic name of the new generic
+                 2) Caller's input buffer for flag
+                      if added generic is new or not
+  RETURNS      : The address of the new node, or
+                   address of old node if already present
+  SIDE EFFECTS : Generic header inserted
+                 If the node is already present, it is
+                   moved to the end of the list, otherwise
+                   the new node is inserted at the end
+  NOTES        : None
+ *********************************************************/
+static Defgeneric *AddGeneric(
+  Environment *theEnv,
+  CLIPSLexeme *name,
+  bool *newGeneric)
+  {
+   Defgeneric *gfunc;
+
+   gfunc = FindDefgenericInModule(theEnv,name->contents);
+   if (gfunc != NULL)
+     {
+      *newGeneric = false;
+
+      if (ConstructData(theEnv)->CheckSyntaxMode)
+        { return(gfunc); }
+
+      /* ================================
+         The old trace state is preserved
+         ================================ */
+      RemoveConstructFromModule(theEnv,&gfunc->header);
+     }
+   else
+     {
+      *newGeneric = true;
+      gfunc = NewGeneric(theEnv,name);
+      IncrementLexemeCount(name);
+      AddImplicitMethods(theEnv,gfunc);
+     }
+   AddConstructToModule(&gfunc->header);
+   return(gfunc);
+  }
+
+/**********************************************************************
+  NAME         : AddGenericMethod
+  DESCRIPTION  : Inserts a blank method (with the method-index set)
+                   into the specified position of the generic
+                   method array
+  INPUTS       : 1) The generic function
+                 2) The index where to add the method in the array
+                 3) The method user-index (0 if don't care)
+  RETURNS      : The address of the new method
+  SIDE EFFECTS : Fields initialized (index set) and new method inserted
+                 Generic function new method-index set to specified
+                   by user-index if > current new method-index
+  NOTES        : None
+ **********************************************************************/
+static Defmethod *AddGenericMethod(
+  Environment *theEnv,
+  Defgeneric *gfunc,
+  int mposn,
+  unsigned short mi)
+  {
+   Defmethod *narr;
+   long b, e;
+
+   narr = (Defmethod *) gm2(theEnv,(sizeof(Defmethod) * (gfunc->mcnt+1)));
+   for (b = e = 0 ; b < gfunc->mcnt ; b++ , e++)
+     {
+      if (b == mposn)
+        e++;
+      GenCopyMemory(Defmethod,1,&narr[e],&gfunc->methods[b]);
+     }
+   if (mi == 0)
+     narr[mposn].index = gfunc->new_index++;
+   else
+     {
+      narr[mposn].index = mi;
+      if (mi >= gfunc->new_index)
+        gfunc->new_index = mi + 1;
+     }
+   narr[mposn].busy = 0;
+#if DEBUGGING_FUNCTIONS
+   narr[mposn].trace = DefgenericData(theEnv)->WatchMethods;
+#endif
+   narr[mposn].minRestrictions = 0;
+   narr[mposn].maxRestrictions = 0;
+   narr[mposn].restrictionCount = 0;
+   narr[mposn].localVarCount = 0;
+   narr[mposn].system = 0;
+   narr[mposn].restrictions = NULL;
+   narr[mposn].actions = NULL;
+   narr[mposn].header.name = NULL;
+   narr[mposn].header.next = NULL;
+   narr[mposn].header.constructType = DEFMETHOD;
+   narr[mposn].header.env = theEnv;
+   narr[mposn].header.whichModule = gfunc->header.whichModule;
+   narr[mposn].header.ppForm = NULL;
+   narr[mposn].header.usrData = NULL;
+
+   if (gfunc->mcnt != 0)
+     rm(theEnv,gfunc->methods,(sizeof(Defmethod) * gfunc->mcnt));
+   gfunc->mcnt++;
+   gfunc->methods = narr;
+   return(&narr[mposn]);
+  }
+
+/****************************************************************
+  NAME         : RestrictionsCompare
+  DESCRIPTION  : Compares the restriction-expression list
+                   with an existing methods restrictions to
+                   determine an ordering
+  INPUTS       : 1) The parameter/restriction expression list
+                 2) The total number of restrictions
+                 3) The number of minimum restrictions
+                 4) The number of maximum restrictions (-1
+                    if unlimited)
+                 5) The method with which to compare restrictions
+  RETURNS      : A code representing how the method restrictions
+                   -1 : New restrictions have higher precedence
+                    0 : New restrictions are identical
+                    1 : New restrictions have lower precedence
+  SIDE EFFECTS : None
+  NOTES        : The new restrictions are stored in the argList
+                   pointers of the parameter expressions
+ ****************************************************************/
+static int RestrictionsCompare(
+  Expression *params,
+  int rcnt,
+  int min,
+  int max,
+  Defmethod *meth)
+  {
+   int i;
+   RESTRICTION *r1,*r2;
+   bool diff = false;
+   int rtn;
+
+   for (i = 0 ; (i < rcnt) && (i < meth->restrictionCount) ; i++)
+     {
+      /* =============================================================
+         A wildcard parameter always has lower precedence than
+         a regular parameter, regardless of the class restriction list
+         ============================================================= */
+      if ((i == rcnt-1) && (max == -1) &&
+          (meth->maxRestrictions != RESTRICTIONS_UNBOUNDED))
+        return LOWER_PRECEDENCE;
+      if ((i == meth->restrictionCount-1) && (max != -1) &&
+          (meth->maxRestrictions == RESTRICTIONS_UNBOUNDED))
+        return HIGHER_PRECEDENCE;
+
+      /* =============================================================
+         The parameter with the most specific type list has precedence
+         ============================================================= */
+      r1 = (RESTRICTION *) params->argList;
+      r2 = &meth->restrictions[i];
+      rtn = TypeListCompare(r1,r2);
+      if (rtn != IDENTICAL)
+        return rtn;
+
+      /* =====================================================
+         The parameter with a query restriction has precedence
+         ===================================================== */
+      if ((r1->query == NULL) && (r2->query != NULL))
+        return LOWER_PRECEDENCE;
+      if ((r1->query != NULL) && (r2->query == NULL))
+        return HIGHER_PRECEDENCE;
+
+      /* ==========================================================
+         Remember if the method restrictions differ at all - query
+         expressions must be identical as well for the restrictions
+         to be the same
+         ========================================================== */
+      if (IdenticalExpression(r1->query,r2->query) == false)
+        diff = true;
+      params = params->nextArg;
+     }
+
+   /* =============================================================
+      If the methods have the same number of parameters here, they
+      are either the same restrictions, or they differ only in
+      the query restrictions
+      ============================================================= */
+   if (rcnt == meth->restrictionCount)
+     return(diff ? LOWER_PRECEDENCE : IDENTICAL);
+
+   /* =============================================
+      The method with the greater number of regular
+      parameters has precedence
+
+      If they require the smae # of reg params,
+      then one without a wildcard has precedence
+      ============================================= */
+   if (min > meth->minRestrictions)
+     return HIGHER_PRECEDENCE;
+   if (meth->minRestrictions < min)
+     return LOWER_PRECEDENCE;
+   return((max == - 1) ? LOWER_PRECEDENCE : HIGHER_PRECEDENCE);
+  }
+
+/*****************************************************
+  NAME         : TypeListCompare
+  DESCRIPTION  : Determines the precedence between
+                   the class lists on two restrictions
+  INPUTS       : 1) Restriction address #1
+                 2) Restriction address #2
+  RETURNS      : -1 : r1 precedes r2
+                  0 : Identical classes
+                  1 : r2 precedes r1
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+static int TypeListCompare(
+  RESTRICTION *r1,
+  RESTRICTION *r2)
+  {
+   long i;
+   bool diff = false;
+
+   if ((r1->tcnt == 0) && (r2->tcnt == 0))
+     return(IDENTICAL);
+   if (r1->tcnt == 0)
+     return(LOWER_PRECEDENCE);
+   if (r2->tcnt == 0)
+     return(HIGHER_PRECEDENCE);
+   for (i = 0 ; (i < r1->tcnt) && (i < r2->tcnt) ; i++)
+     {
+      if (r1->types[i] != r2->types[i])
+        {
+         diff = true;
+#if OBJECT_SYSTEM
+         if (HasSuperclass((Defclass *) r1->types[i],(Defclass *) r2->types[i]))
+           return(HIGHER_PRECEDENCE);
+         if (HasSuperclass((Defclass *) r2->types[i],(Defclass *) r1->types[i]))
+           return(LOWER_PRECEDENCE);
+#else
+         if (SubsumeType(((CLIPSInteger *) r1->types[i])->contents,((CLIPSInteger *) r2->types[i])->contents))
+           return(HIGHER_PRECEDENCE);
+         if (SubsumeType(((CLIPSInteger *) r2->types[i])->contents,((CLIPSInteger *) r1->types[i])->contents))
+           return(LOWER_PRECEDENCE);
+#endif
+        }
+     }
+   if (r1->tcnt < r2->tcnt)
+     return(HIGHER_PRECEDENCE);
+   if (r1->tcnt > r2->tcnt)
+     return(LOWER_PRECEDENCE);
+   if (diff)
+     return(LOWER_PRECEDENCE);
+   return(IDENTICAL);
+  }
+
+/***************************************************
+  NAME         : NewGeneric
+  DESCRIPTION  : Allocates and initializes a new
+                   generic function header
+  INPUTS       : The name of the new generic
+  RETURNS      : The address of the new generic
+  SIDE EFFECTS : Generic function  header created
+  NOTES        : None
+ ***************************************************/
+static Defgeneric *NewGeneric(
+  Environment *theEnv,
+  CLIPSLexeme *gname)
+  {
+   Defgeneric *ngen;
+
+   ngen = get_struct(theEnv,defgeneric);
+   InitializeConstructHeader(theEnv,"defgeneric",DEFGENERIC,&ngen->header,gname);
+   ngen->busy = 0;
+   ngen->new_index = 1;
+   ngen->methods = NULL;
+   ngen->mcnt = 0;
+#if DEBUGGING_FUNCTIONS
+   ngen->trace = DefgenericData(theEnv)->WatchGenerics;
+#endif
+   return(ngen);
+  }
+
+#endif /* DEFGENERIC_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME) */
+
+/***************************************************
+  NAME         :
+  DESCRIPTION  :
+  INPUTS       :
+  RETURNS      :
+  SIDE EFFECTS :
+  NOTES        :
+ ***************************************************/
diff --git a/clips/genrcpsr.h b/clips/genrcpsr.h
new file mode 100755
index 000000000..97a70f627
--- /dev/null
+++ b/clips/genrcpsr.h
@@ -0,0 +1,80 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            If the last construct in a loaded file is a    */
+/*            deffunction or defmethod with no closing right */
+/*            parenthesis, an error should be issued, but is */
+/*            not. DR0872                                    */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_AND_SAVE        */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*            Fixed typing issue when OBJECT_SYSTEM          */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_genrcpsr
+
+#pragma once
+
+#define _H_genrcpsr
+
+#if DEFGENERIC_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#include "genrcfun.h"
+
+   bool                           ParseDefgeneric(Environment *,const char *);
+   bool                           ParseDefmethod(Environment *,const char *);
+   Defmethod                     *AddMethod(Environment *,Defgeneric *,Defmethod *,int,unsigned short,Expression *,
+                                            unsigned short,unsigned short,CLIPSLexeme *,Expression *,char *,bool);
+   void                           PackRestrictionTypes(Environment *,RESTRICTION *,Expression *);
+   void                           DeleteTempRestricts(Environment *,Expression *);
+   Defmethod                     *FindMethodByRestrictions(Defgeneric *,Expression *,int,
+                                                           CLIPSLexeme *,int *);
+
+#endif /* DEFGENERIC_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME) */
+
+#endif /* _H_genrcpsr */
+
+
+
diff --git a/clips/globlbin.c b/clips/globlbin.c
new file mode 100755
index 000000000..359fbc399
--- /dev/null
+++ b/clips/globlbin.c
@@ -0,0 +1,458 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*            DEFGLOBAL BSAVE/BLOAD MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for the  */
+/*    defglobal construct.                                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Moved WatchGlobals global to defglobalData.    */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFGLOBAL_CONSTRUCT && (BLOAD || BLOAD_AND_BSAVE || BLOAD_ONLY) && (! RUN_TIME)
+
+#include <stdio.h>
+
+#include "bload.h"
+#include "bsave.h"
+#include "envrnmnt.h"
+#include "globlbsc.h"
+#include "globldef.h"
+#include "memalloc.h"
+#include "moduldef.h"
+#include "multifld.h"
+
+#include "globlbin.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                    BsaveFind(Environment *);
+   static void                    BsaveStorage(Environment *,FILE *);
+   static void                    BsaveBinaryItem(Environment *,FILE *);
+#endif
+   static void                    BloadStorageDefglobals(Environment *);
+   static void                    BloadBinaryItem(Environment *);
+   static void                    UpdateDefglobalModule(Environment *,void *,unsigned long);
+   static void                    UpdateDefglobal(Environment *,void *,unsigned long);
+   static void                    ClearBload(Environment *);
+   static void                    DeallocateDefglobalBloadData(Environment *);
+
+/*********************************************/
+/* DefglobalBinarySetup: Installs the binary */
+/*   save/load feature for the defglobals.   */
+/*********************************************/
+void DefglobalBinarySetup(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,GLOBLBIN_DATA,sizeof(struct defglobalBinaryData),DeallocateDefglobalBloadData);
+#if (BLOAD_AND_BSAVE || BLOAD)
+   AddAfterBloadFunction(theEnv,"defglobal",ResetDefglobals,50,NULL);
+#endif
+
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"defglobal",0,BsaveFind,NULL,
+                             BsaveStorage,BsaveBinaryItem,
+                             BloadStorageDefglobals,BloadBinaryItem,
+                             ClearBload);
+#endif
+
+#if (BLOAD || BLOAD_ONLY)
+   AddBinaryItem(theEnv,"defglobal",0,NULL,NULL,NULL,NULL,
+                             BloadStorageDefglobals,BloadBinaryItem,
+                             ClearBload);
+#endif
+  }
+
+/*********************************************************/
+/* DeallocateDefglobalBloadData: Deallocates environment */
+/*    data for the defglobal bsave functionality.        */
+/*********************************************************/
+static void DeallocateDefglobalBloadData(
+  Environment *theEnv)
+  {
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   size_t space;
+   unsigned long i;
+
+   for (i = 0; i < DefglobalBinaryData(theEnv)->NumberOfDefglobals; i++)
+     {
+      if (DefglobalBinaryData(theEnv)->DefglobalArray[i].current.header->type == MULTIFIELD_TYPE)
+        { ReturnMultifield(theEnv,DefglobalBinaryData(theEnv)->DefglobalArray[i].current.multifieldValue); }
+     }
+
+   space = DefglobalBinaryData(theEnv)->NumberOfDefglobals * sizeof(Defglobal);
+   if (space != 0)
+     { genfree(theEnv,DefglobalBinaryData(theEnv)->DefglobalArray,space); }
+
+   space =  DefglobalBinaryData(theEnv)->NumberOfDefglobalModules * sizeof(struct defglobalModule);
+   if (space != 0)
+     { genfree(theEnv,DefglobalBinaryData(theEnv)->ModuleArray,space); }
+#endif
+  }
+
+#if BLOAD_AND_BSAVE
+
+/****************************************************/
+/* BsaveFind:  Counts the number of data structures */
+/*   which must be saved in the binary image for    */
+/*   the defglobals in the current environment.     */
+/****************************************************/
+static void BsaveFind(
+  Environment *theEnv)
+  {
+   Defglobal *defglobalPtr;
+   Defmodule *theModule;
+
+   /*=======================================================*/
+   /* If a binary image is already loaded, then temporarily */
+   /* save the count values since these will be overwritten */
+   /* in the process of saving the binary image.            */
+   /*=======================================================*/
+
+   SaveBloadCount(theEnv,DefglobalBinaryData(theEnv)->NumberOfDefglobalModules);
+   SaveBloadCount(theEnv,DefglobalBinaryData(theEnv)->NumberOfDefglobals);
+
+   /*============================================*/
+   /* Set the count of defglobals and defglobals */
+   /* module data structures to zero.            */
+   /*============================================*/
+
+   DefglobalBinaryData(theEnv)->NumberOfDefglobals = 0;
+   DefglobalBinaryData(theEnv)->NumberOfDefglobalModules = 0;
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*================================================*/
+      /* Set the current module to the module being     */
+      /* examined and increment the number of defglobal */
+      /* modules encountered.                           */
+      /*================================================*/
+
+      SetCurrentModule(theEnv,theModule);
+      DefglobalBinaryData(theEnv)->NumberOfDefglobalModules++;
+
+      /*====================================================*/
+      /* Loop through each defglobal in the current module. */
+      /*====================================================*/
+
+      for (defglobalPtr = GetNextDefglobal(theEnv,NULL);
+           defglobalPtr != NULL;
+           defglobalPtr = GetNextDefglobal(theEnv,defglobalPtr))
+        {
+         /*======================================================*/
+         /* Initialize the construct header for the binary save. */
+         /*======================================================*/
+
+         MarkConstructHeaderNeededItems(&defglobalPtr->header,DefglobalBinaryData(theEnv)->NumberOfDefglobals++);
+        }
+     }
+  }
+
+/*****************************************************/
+/* BsaveStorage: Writes out storage requirements for */
+/*   all defglobal structures to the binary file     */
+/*****************************************************/
+static void BsaveStorage(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+
+   /*===========================================================*/
+   /* Only two data structures are saved as part of a defglobal */
+   /* binary image: the defglobal data structure and the        */
+   /* defglobalModule data structure.                           */
+   /*===========================================================*/
+
+   space = sizeof(long) * 2;
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&DefglobalBinaryData(theEnv)->NumberOfDefglobals,sizeof(long),fp);
+   GenWrite(&DefglobalBinaryData(theEnv)->NumberOfDefglobalModules,sizeof(long),fp);
+  }
+
+/*********************************************/
+/* BsaveBinaryItem: Writes out all defglobal */
+/*   structures to the binary file           */
+/*********************************************/
+static void BsaveBinaryItem(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   Defglobal *theDefglobal;
+   struct bsaveDefglobal newDefglobal;
+   Defmodule *theModule;
+   struct bsaveDefglobalModule tempDefglobalModule;
+   struct defglobalModule *theModuleItem;
+
+   /*==========================================================*/
+   /* Write out the amount of space taken up by the defglobal  */
+   /* and defglobalModule data structures in the binary image. */
+   /*==========================================================*/
+
+   space = DefglobalBinaryData(theEnv)->NumberOfDefglobals * sizeof(struct bsaveDefglobal) +
+           (DefglobalBinaryData(theEnv)->NumberOfDefglobalModules * sizeof(struct bsaveDefglobalModule));
+   GenWrite(&space,sizeof(size_t),fp);
+
+   /*=================================================*/
+   /* Write out each defglobal module data structure. */
+   /*=================================================*/
+
+   DefglobalBinaryData(theEnv)->NumberOfDefglobals = 0;
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      theModuleItem = (struct defglobalModule *)
+                      GetModuleItem(theEnv,NULL,FindModuleItem(theEnv,"defglobal")->moduleIndex);
+      AssignBsaveDefmdlItemHdrVals(&tempDefglobalModule.header,
+                                           &theModuleItem->header);
+      GenWrite(&tempDefglobalModule,sizeof(struct bsaveDefglobalModule),fp);
+     }
+
+   /*===========================*/
+   /* Write out each defglobal. */
+   /*===========================*/
+
+   DefglobalBinaryData(theEnv)->NumberOfDefglobals = 0;
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      for (theDefglobal = GetNextDefglobal(theEnv,NULL);
+           theDefglobal != NULL;
+           theDefglobal = GetNextDefglobal(theEnv,theDefglobal))
+        {
+         AssignBsaveConstructHeaderVals(&newDefglobal.header,
+                                          &theDefglobal->header);
+         newDefglobal.initial = HashedExpressionIndex(theEnv,theDefglobal->initial);
+
+         GenWrite(&newDefglobal,sizeof(struct bsaveDefglobal),fp);
+        }
+     }
+
+   /*=============================================================*/
+   /* If a binary image was already loaded when the bsave command */
+   /* was issued, then restore the counts indicating the number   */
+   /* of defglobals and defglobal modules in the binary image     */
+   /* (these were overwritten by the binary save).                */
+   /*=============================================================*/
+
+   RestoreBloadCount(theEnv,&DefglobalBinaryData(theEnv)->NumberOfDefglobalModules);
+   RestoreBloadCount(theEnv,&DefglobalBinaryData(theEnv)->NumberOfDefglobals);
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+/***********************************************/
+/* BloadStorageDefglobals: Allocates space for */
+/*   the defglobals used by this binary image. */
+/***********************************************/
+static void BloadStorageDefglobals(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*=======================================================*/
+   /* Determine the number of defglobal and defglobalModule */
+   /* data structures to be read.                           */
+   /*=======================================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   GenReadBinary(theEnv,&DefglobalBinaryData(theEnv)->NumberOfDefglobals,sizeof(long));
+   GenReadBinary(theEnv,&DefglobalBinaryData(theEnv)->NumberOfDefglobalModules,sizeof(long));
+
+   /*===================================*/
+   /* Allocate the space needed for the */
+   /* defglobalModule data structures.  */
+   /*===================================*/
+
+   if (DefglobalBinaryData(theEnv)->NumberOfDefglobalModules == 0)
+     {
+      DefglobalBinaryData(theEnv)->DefglobalArray = NULL;
+      DefglobalBinaryData(theEnv)->ModuleArray = NULL;
+     }
+
+   space = DefglobalBinaryData(theEnv)->NumberOfDefglobalModules * sizeof(struct defglobalModule);
+   DefglobalBinaryData(theEnv)->ModuleArray = (struct defglobalModule *) genalloc(theEnv,space);
+
+   /*===================================*/
+   /* Allocate the space needed for the */
+   /* defglobal data structures.        */
+   /*===================================*/
+
+   if (DefglobalBinaryData(theEnv)->NumberOfDefglobals == 0)
+     {
+      DefglobalBinaryData(theEnv)->DefglobalArray = NULL;
+      return;
+     }
+
+   space = (DefglobalBinaryData(theEnv)->NumberOfDefglobals * sizeof(Defglobal));
+   DefglobalBinaryData(theEnv)->DefglobalArray = (Defglobal *) genalloc(theEnv,space);
+  }
+
+/******************************************************/
+/* BloadBinaryItem: Loads and refreshes the defglobal */
+/*   constructs used by this binary image.            */
+/******************************************************/
+static void BloadBinaryItem(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*======================================================*/
+   /* Read in the amount of space used by the binary image */
+   /* (this is used to skip the construct in the event it  */
+   /* is not available in the version being run).          */
+   /*======================================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+
+   /*=============================================*/
+   /* Read in the defglobalModule data structures */
+   /* and refresh the pointers.                   */
+   /*=============================================*/
+
+   BloadandRefresh(theEnv,DefglobalBinaryData(theEnv)->NumberOfDefglobalModules,
+                   sizeof(struct bsaveDefglobalModule),
+                   UpdateDefglobalModule);
+
+   /*=======================================*/
+   /* Read in the defglobal data structures */
+   /* and refresh the pointers.             */
+   /*=======================================*/
+
+   BloadandRefresh(theEnv,DefglobalBinaryData(theEnv)->NumberOfDefglobals,
+                   sizeof(struct bsaveDefglobal),
+                   UpdateDefglobal);
+  }
+
+/************************************************/
+/* UpdateDefglobalModule: Bload refresh routine */
+/*   for defglobal module data structures.      */
+/************************************************/
+static void UpdateDefglobalModule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveDefglobalModule *bdmPtr;
+
+   bdmPtr = (struct bsaveDefglobalModule *) buf;
+
+   UpdateDefmoduleItemHeader(theEnv,&bdmPtr->header,&DefglobalBinaryData(theEnv)->ModuleArray[obji].header,
+                             sizeof(Defglobal),
+                             DefglobalBinaryData(theEnv)->DefglobalArray);
+  }
+
+/******************************************/
+/* UpdateDefglobal: Bload refresh routine */
+/*   for defglobal data structures.       */
+/******************************************/
+static void UpdateDefglobal(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveDefglobal *bdp;
+
+   bdp = (struct bsaveDefglobal *) buf;
+   UpdateConstructHeader(theEnv,&bdp->header,&DefglobalBinaryData(theEnv)->DefglobalArray[obji].header,DEFGLOBAL,
+                         sizeof(struct defglobalModule),DefglobalBinaryData(theEnv)->ModuleArray,
+                         sizeof(Defglobal),DefglobalBinaryData(theEnv)->DefglobalArray);
+
+#if DEBUGGING_FUNCTIONS
+   DefglobalBinaryData(theEnv)->DefglobalArray[obji].watch = DefglobalData(theEnv)->WatchGlobals;
+#endif
+   DefglobalBinaryData(theEnv)->DefglobalArray[obji].initial = HashedExpressionPointer(bdp->initial);
+   DefglobalBinaryData(theEnv)->DefglobalArray[obji].current.voidValue = VoidConstant(theEnv);
+  }
+
+/***************************************/
+/* ClearBload: Defglobal clear routine */
+/*   when a binary load is in effect.  */
+/***************************************/
+static void ClearBload(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   size_t space;
+
+   /*=======================================================*/
+   /* Decrement in use counters for atomic values contained */
+   /* in the construct headers. Also decrement data         */
+   /* structures used to store the defglobal's value.       */
+   /*=======================================================*/
+
+   for (i = 0; i < DefglobalBinaryData(theEnv)->NumberOfDefglobals; i++)
+     {
+      UnmarkConstructHeader(theEnv,&DefglobalBinaryData(theEnv)->DefglobalArray[i].header);
+
+      Release(theEnv,DefglobalBinaryData(theEnv)->DefglobalArray[i].current.header);
+      if (DefglobalBinaryData(theEnv)->DefglobalArray[i].current.header->type == MULTIFIELD_TYPE)
+        { ReturnMultifield(theEnv,DefglobalBinaryData(theEnv)->DefglobalArray[i].current.multifieldValue); }
+     }
+
+   /*==============================================================*/
+   /* Deallocate the space used for the defglobal data structures. */
+   /*==============================================================*/
+
+   space = DefglobalBinaryData(theEnv)->NumberOfDefglobals * sizeof(Defglobal);
+   if (space != 0) genfree(theEnv,DefglobalBinaryData(theEnv)->DefglobalArray,space);
+   DefglobalBinaryData(theEnv)->NumberOfDefglobals = 0;
+
+   /*=====================================================================*/
+   /* Deallocate the space used for the defglobal module data structures. */
+   /*=====================================================================*/
+
+   space = DefglobalBinaryData(theEnv)->NumberOfDefglobalModules * sizeof(struct defglobalModule);
+   if (space != 0) genfree(theEnv,DefglobalBinaryData(theEnv)->ModuleArray,space);
+   DefglobalBinaryData(theEnv)->NumberOfDefglobalModules = 0;
+  }
+
+/********************************************************/
+/* BloadDefglobalModuleReference: Returns the defglobal */
+/*   module pointer for using with the bload function.  */
+/********************************************************/
+void *BloadDefglobalModuleReference(
+  Environment *theEnv,
+  unsigned long theIndex)
+  {
+   return (void *) &DefglobalBinaryData(theEnv)->ModuleArray[theIndex];
+  }
+
+#endif /* DEFGLOBAL_CONSTRUCT && (BLOAD || BLOAD_AND_BSAVE || BLOAD_ONLY) && (! RUN_TIME) */
+
+
+
diff --git a/clips/globlbin.h b/clips/globlbin.h
new file mode 100755
index 000000000..0850554c6
--- /dev/null
+++ b/clips/globlbin.h
@@ -0,0 +1,71 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*             DEFGLOBAL BINARY HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Moved WatchGlobals global to defglobalData.    */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_globlbin
+
+#pragma once
+
+#define _H_globlbin
+
+#include "modulbin.h"
+#include "cstrcbin.h"
+#include "globldef.h"
+
+struct bsaveDefglobal
+  {
+   struct bsaveConstructHeader header;
+   unsigned long initial;
+  };
+
+struct bsaveDefglobalModule
+  {
+   struct bsaveDefmoduleItemHeader header;
+  };
+
+#define GLOBLBIN_DATA 60
+
+struct defglobalBinaryData
+  {
+   Defglobal *DefglobalArray;
+   unsigned long NumberOfDefglobals;
+   struct defglobalModule *ModuleArray;
+   unsigned long NumberOfDefglobalModules;
+  };
+
+#define DefglobalBinaryData(theEnv) ((struct defglobalBinaryData *) GetEnvironmentData(theEnv,GLOBLBIN_DATA))
+
+#define DefglobalPointer(i) (&DefglobalBinaryData(theEnv)->DefglobalArray[i])
+
+   void                           DefglobalBinarySetup(Environment *);
+   void                          *BloadDefglobalModuleReference(Environment *,unsigned long);
+
+#endif /* _H_globlbin */
+
+
+
diff --git a/clips/globlbsc.c b/clips/globlbsc.c
new file mode 100755
index 000000000..72b6255f7
--- /dev/null
+++ b/clips/globlbsc.c
@@ -0,0 +1,361 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*         DEFGLOBAL BASIC COMMANDS HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements core commands for the defglobal       */
+/*   construct such as clear, reset, save, undefglobal,      */
+/*   ppdefglobal, list-defglobals, and get-defglobals-list.  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Moved WatchGlobals global to defglobalData.    */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFGLOBAL_CONSTRUCT
+
+#include "constrct.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "globlbin.h"
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "globlcmp.h"
+#endif
+#include "globlcom.h"
+#include "globldef.h"
+#include "multifld.h"
+#include "watch.h"
+
+#include "globlbsc.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    SaveDefglobals(Environment *,Defmodule *,const char *,void *);
+   static void                    ResetDefglobalAction(Environment *,ConstructHeader *,void *);
+#if DEBUGGING_FUNCTIONS && (! RUN_TIME)
+   static bool                    DefglobalWatchAccess(Environment *,int,bool,struct expr *);
+   static bool                    DefglobalWatchPrint(Environment *,const char *,int,struct expr *);
+#endif
+
+/*****************************************************************/
+/* DefglobalBasicCommands: Initializes basic defglobal commands. */
+/*****************************************************************/
+void DefglobalBasicCommands(
+  Environment *theEnv)
+  {
+   AddSaveFunction(theEnv,"defglobal",SaveDefglobals,40,NULL);
+   AddResetFunction(theEnv,"defglobal",ResetDefglobals,50,NULL);
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"get-defglobal-list","m",0,1,"y",GetDefglobalListFunction,"GetDefglobalListFunction",NULL);
+   AddUDF(theEnv,"undefglobal","v",1,1,"y",UndefglobalCommand,"UndefglobalCommand",NULL);
+   AddUDF(theEnv,"defglobal-module","y",1,1,"y",DefglobalModuleFunction,"DefglobalModuleFunction",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"list-defglobals","v",0,1,"y",ListDefglobalsCommand,"ListDefglobalsCommand",NULL);
+   AddUDF(theEnv,"ppdefglobal","vs",1,2,";y;ldsyn",PPDefglobalCommand,"PPDefglobalCommand",NULL);
+   AddWatchItem(theEnv,"globals",0,&DefglobalData(theEnv)->WatchGlobals,0,DefglobalWatchAccess,DefglobalWatchPrint);
+#endif
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+   DefglobalBinarySetup(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   DefglobalCompilerSetup(theEnv);
+#endif
+
+#endif
+  }
+
+/*************************************************************/
+/* ResetDefglobals: Defglobal reset routine for use with the */
+/*   reset command. Restores the values of the defglobals.   */
+/*************************************************************/
+void ResetDefglobals(
+  Environment *theEnv,
+  void *context)
+  {
+   if (! GetResetGlobals(theEnv)) return;
+   DoForAllConstructs(theEnv,ResetDefglobalAction,
+                      DefglobalData(theEnv)->DefglobalModuleIndex,true,NULL);
+  }
+
+/******************************************************/
+/* ResetDefglobalAction: Action to be applied to each */
+/*   defglobal construct during a reset command.      */
+/******************************************************/
+static void ResetDefglobalAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Defglobal *theDefglobal = (Defglobal *) theConstruct;
+   UDFValue assignValue;
+
+   if (EvaluateExpression(theEnv,theDefglobal->initial,&assignValue))
+     {
+      assignValue.value = FalseSymbol(theEnv);
+     }
+
+   QSetDefglobalValue(theEnv,theDefglobal,&assignValue,false);
+  }
+
+/******************************************/
+/* SaveDefglobals: Defglobal save routine */
+/*   for use with the save command.       */
+/******************************************/
+static void SaveDefglobals(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logicalName,
+  void *context)
+  {
+   SaveConstruct(theEnv,theModule,logicalName,DefglobalData(theEnv)->DefglobalConstruct);
+  }
+
+/********************************************/
+/* UndefglobalCommand: H/L access routine   */
+/*   for the undefglobal command.           */
+/********************************************/
+void UndefglobalCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UndefconstructCommand(context,"undefglobal",DefglobalData(theEnv)->DefglobalConstruct);
+  }
+
+/**********************************/
+/* Undefglobal: C access routine  */
+/*   for the undefglobal command. */
+/**********************************/
+bool Undefglobal(
+  Defglobal *theDefglobal,
+  Environment *allEnv)
+  {
+   Environment *theEnv;
+   
+   if (theDefglobal == NULL)
+     {
+      theEnv = allEnv;
+      return(Undefconstruct(theEnv,NULL,DefglobalData(theEnv)->DefglobalConstruct));
+     }
+   else 
+     {
+      theEnv = theDefglobal->header.env;
+      return(Undefconstruct(theEnv,&theDefglobal->header,DefglobalData(theEnv)->DefglobalConstruct));
+     }
+  }
+
+/**************************************************/
+/* GetDefglobalListFunction: H/L access routine   */
+/*   for the get-defglobal-list function.         */
+/**************************************************/
+void GetDefglobalListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   GetConstructListFunction(context,returnValue,DefglobalData(theEnv)->DefglobalConstruct);
+  }
+
+/******************************************/
+/* GetDefglobalList: C access routine     */
+/*   for the get-defglobal-list function. */
+/******************************************/
+void GetDefglobalList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defmodule *theModule)
+  {
+   UDFValue result;
+   
+   GetConstructList(theEnv,&result,DefglobalData(theEnv)->DefglobalConstruct,theModule);
+   NormalizeMultifield(theEnv,&result);
+   returnValue->value = result.value;
+  }
+
+/*************************************************/
+/* DefglobalModuleFunction: H/L access routine   */
+/*   for the defglobal-module function.          */
+/*************************************************/
+void DefglobalModuleFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->value = GetConstructModuleCommand(context,"defglobal-module",DefglobalData(theEnv)->DefglobalConstruct);
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/********************************************/
+/* PPDefglobalCommand: H/L access routine   */
+/*   for the ppdefglobal command.           */
+/********************************************/
+void PPDefglobalCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PPConstructCommand(context,"ppdefglobal",DefglobalData(theEnv)->DefglobalConstruct,returnValue);
+  }
+
+/*************************************/
+/* PPDefglobal: C access routine for */
+/*   the ppdefglobal command.        */
+/*************************************/
+bool PPDefglobal(
+  Environment *theEnv,
+  const char *defglobalName,
+  const char *logicalName)
+  {
+   return(PPConstruct(theEnv,defglobalName,logicalName,DefglobalData(theEnv)->DefglobalConstruct));
+  }
+
+/***********************************************/
+/* ListDefglobalsCommand: H/L access routine   */
+/*   for the list-defglobals command.          */
+/***********************************************/
+void ListDefglobalsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListConstructCommand(context,DefglobalData(theEnv)->DefglobalConstruct);
+  }
+
+/**************************************/
+/* ListDefglobals: C access routine   */
+/*   for the list-defglobals command. */
+/**************************************/
+void ListDefglobals(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListConstruct(theEnv,DefglobalData(theEnv)->DefglobalConstruct,logicalName,theModule);
+  }
+
+/******************************************************/
+/* DefglobalGetWatch: C access routine for retrieving */
+/*   the current watch value of a defglobal.          */
+/******************************************************/
+bool DefglobalGetWatch(
+  Defglobal *theGlobal)
+  {
+   return theGlobal->watch;
+  }
+
+/******************************************************/
+/* EnvSetDefglobalWatch: C access routine for setting */
+/*   the current watch value of a defglobal.          */
+/******************************************************/
+void DefglobalSetWatch(
+  Defglobal *theGlobal,
+  bool newState)
+  {
+   theGlobal->watch = newState;
+  }
+
+#if ! RUN_TIME
+
+/********************************************************/
+/* DefglobalWatchAccess: Access routine for setting the */
+/*   watch flag of a defglobal via the watch command.   */
+/********************************************************/
+static bool DefglobalWatchAccess(
+  Environment *theEnv,
+  int code,
+  bool newState,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+
+   return(ConstructSetWatchAccess(theEnv,DefglobalData(theEnv)->DefglobalConstruct,newState,argExprs,
+                                  (ConstructGetWatchFunction *) DefglobalGetWatch,
+                                  (ConstructSetWatchFunction *) DefglobalSetWatch));
+  }
+
+/*********************************************************************/
+/* DefglobalWatchPrint: Access routine for printing which defglobals */
+/*   have their watch flag set via the list-watch-items command.     */
+/*********************************************************************/
+static bool DefglobalWatchPrint(
+  Environment *theEnv,
+  const char *logName,
+  int code,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+   return(ConstructPrintWatchAccess(theEnv,DefglobalData(theEnv)->DefglobalConstruct,logName,argExprs,
+                                    (ConstructGetWatchFunction *) DefglobalGetWatch,
+                                    (ConstructSetWatchFunction *) DefglobalSetWatch));
+  }
+
+#endif /* ! RUN_TIME */
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#endif /* DEFGLOBAL_CONSTRUCT */
+
+
diff --git a/clips/globlbsc.h b/clips/globlbsc.h
new file mode 100755
index 000000000..9801833f8
--- /dev/null
+++ b/clips/globlbsc.h
@@ -0,0 +1,83 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*         DEFGLOBAL BASIC COMMANDS HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Moved WatchGlobals global to defglobalData.    */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_globlbsc
+
+#pragma once
+
+#define _H_globlbsc
+
+#include "evaluatn.h"
+#include "globldef.h"
+
+   void                           DefglobalBasicCommands(Environment *);
+   void                           UndefglobalCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           Undefglobal(Defglobal *,Environment *);
+   void                           GetDefglobalListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetDefglobalList(Environment *,CLIPSValue *,Defmodule *);
+   void                           DefglobalModuleFunction(Environment *,UDFContext *,UDFValue *);
+   void                           PPDefglobalCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           PPDefglobal(Environment *,const char *,const char *);
+   void                           ListDefglobalsCommand(Environment *,UDFContext *,UDFValue *);
+#if DEBUGGING_FUNCTIONS
+   bool                           DefglobalGetWatch(Defglobal *);
+   void                           ListDefglobals(Environment *,const char *,Defmodule *);
+   void                           DefglobalSetWatch(Defglobal *,bool);
+#endif
+   void                           ResetDefglobals(Environment *,void *);
+
+#endif /* _H_globlbsc */
+
+
diff --git a/clips/globlcmp.c b/clips/globlcmp.c
new file mode 100755
index 000000000..c052069c4
--- /dev/null
+++ b/clips/globlcmp.c
@@ -0,0 +1,330 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*            DEFGLOBAL CONSTRUCTS-TO-C MODULE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for the   */
+/*    defglobal construct.                                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFGLOBAL_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include <stdio.h>
+
+#include "conscomp.h"
+#include "envrnmnt.h"
+#include "globldef.h"
+
+#include "globlcmp.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    ConstructToCode(Environment *,const char *,const char *,char *,unsigned int,
+                                                  FILE *,unsigned int,unsigned int);
+   static void                    DefglobalToCode(Environment *,FILE *,Defglobal *,
+                                                 unsigned int,unsigned int,unsigned int);
+   static void                    DefglobalModuleToCode(Environment *,FILE *,Defmodule *,unsigned int,unsigned int,unsigned int);
+   static void                    CloseDefglobalFiles(Environment *,FILE *,FILE *,unsigned int);
+   static void                    BeforeDefglobalsToCode(Environment *);
+   static void                    InitDefglobalsCode(Environment *,FILE *,unsigned,unsigned);
+
+/***************************************************************/
+/* DefglobalCompilerSetup: Initializes the defglobal construct */
+/*    for use with the constructs-to-c command.                */
+/***************************************************************/
+void DefglobalCompilerSetup(
+  Environment *theEnv)
+  {
+   DefglobalData(theEnv)->DefglobalCodeItem =
+      AddCodeGeneratorItem(theEnv,"defglobal",0,BeforeDefglobalsToCode,
+                           InitDefglobalsCode,ConstructToCode,2);
+  }
+
+/**************************************************************/
+/* BeforeDefglobalsToCode: Assigns each defglobal a unique ID */
+/*   which will be used for pointer references when the data  */
+/*   structures are written to a file as C code               */
+/**************************************************************/
+static void BeforeDefglobalsToCode(
+  Environment *theEnv)
+  {
+   MarkConstructBsaveIDs(theEnv,DefglobalData(theEnv)->DefglobalModuleIndex);
+  }
+
+/*************************************************/
+/* InitDefglobalsCode: Writes out initialization */
+/*   code for defglobals for a run-time module.  */
+/*************************************************/
+static void InitDefglobalsCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned imageID,
+  unsigned maxIndices)
+  {
+#if MAC_XCD
+#pragma unused(maxIndices)
+#pragma unused(imageID)
+#pragma unused(theEnv)
+#endif
+   fprintf(initFP,"   DefglobalRunTimeInitialize(theEnv);\n");
+   fprintf(initFP,"   ResetDefglobals(theEnv,NULL);\n");
+  }
+
+/***********************************************************/
+/* ConstructToCode: Produces defglobal code for a run-time */
+/*   module created using the constructs-to-c function.    */
+/***********************************************************/
+static bool ConstructToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int fileCount = 1;
+   Defmodule *theModule;
+   Defglobal *theDefglobal;
+   unsigned int moduleCount = 0, moduleArrayCount = 0, moduleArrayVersion = 1;
+   unsigned int defglobalArrayCount = 0, defglobalArrayVersion = 1;
+   FILE *moduleFile = NULL, *defglobalFile = NULL;
+
+   /*================================================*/
+   /* Include the appropriate defglobal header file. */
+   /*================================================*/
+
+   fprintf(headerFP,"#include \"globldef.h\"\n");
+
+   /*===================================================================*/
+   /* Loop through all the modules and all the defglobals writing their */
+   /*  C code representation to the file as they are traversed.         */
+   /*===================================================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      moduleFile = OpenFileIfNeeded(theEnv,moduleFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                    moduleArrayVersion,headerFP,
+                                    "struct defglobalModule",ModulePrefix(DefglobalData(theEnv)->DefglobalCodeItem),
+                                    false,NULL);
+
+      if (moduleFile == NULL)
+        {
+         CloseDefglobalFiles(theEnv,moduleFile,defglobalFile,maxIndices);
+         return false;
+        }
+
+      DefglobalModuleToCode(theEnv,moduleFile,theModule,imageID,maxIndices,moduleCount);
+      moduleFile = CloseFileIfNeeded(theEnv,moduleFile,&moduleArrayCount,&moduleArrayVersion,
+                                     maxIndices,NULL,NULL);
+
+      for (theDefglobal = GetNextDefglobal(theEnv,NULL);
+           theDefglobal != NULL;
+           theDefglobal = GetNextDefglobal(theEnv,theDefglobal))
+        {
+         defglobalFile = OpenFileIfNeeded(theEnv,defglobalFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                         defglobalArrayVersion,headerFP,
+                                         "Defglobal",ConstructPrefix(DefglobalData(theEnv)->DefglobalCodeItem),
+                                         false,NULL);
+         if (defglobalFile == NULL)
+           {
+            CloseDefglobalFiles(theEnv,moduleFile,defglobalFile,maxIndices);
+            return false;
+           }
+
+         DefglobalToCode(theEnv,defglobalFile,theDefglobal,imageID,maxIndices,moduleCount);
+         defglobalArrayCount++;
+         defglobalFile = CloseFileIfNeeded(theEnv,defglobalFile,&defglobalArrayCount,
+                                           &defglobalArrayVersion,maxIndices,NULL,NULL);
+        }
+
+      moduleCount++;
+      moduleArrayCount++;
+     }
+
+   CloseDefglobalFiles(theEnv,moduleFile,defglobalFile,maxIndices);
+
+   return true;
+  }
+
+/**********************************************************/
+/* CloseDefglobalFiles: Closes all of the C files created */
+/*   for defglobals. Called when an error occurs or when  */
+/*   the defglobals have all been written to the files.   */
+/**********************************************************/
+static void CloseDefglobalFiles(
+  Environment *theEnv,
+  FILE *moduleFile,
+  FILE *defglobalFile,
+  unsigned int maxIndices)
+  {
+   unsigned int count = maxIndices;
+   unsigned int arrayVersion = 0;
+
+   if (defglobalFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,defglobalFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+
+   if (moduleFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,moduleFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+  }
+
+/***********************************************************/
+/* DefglobalModuleToCode: Writes the C code representation */
+/*   of a single defglobal module to the specified file.   */
+/***********************************************************/
+static void DefglobalModuleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount)
+  {
+#if MAC_XCD
+#pragma unused(moduleCount)
+#endif
+
+   fprintf(theFile,"{");
+
+   ConstructModuleToCode(theEnv,theFile,theModule,imageID,maxIndices,
+                                  DefglobalData(theEnv)->DefglobalModuleIndex,ConstructPrefix(DefglobalData(theEnv)->DefglobalCodeItem));
+
+   fprintf(theFile,"}");
+  }
+
+/**********************************************************/
+/* DefglobalToCode: Writes the C code representation of a */
+/*   single defglobal construct to the specified file.    */
+/**********************************************************/
+static void DefglobalToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defglobal *theDefglobal,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount)
+  {
+   /*==================*/
+   /* Defglobal Header */
+   /*==================*/
+
+   fprintf(theFile,"{");
+
+   ConstructHeaderToCode(theEnv,theFile,&theDefglobal->header,imageID,maxIndices,
+                         moduleCount,ModulePrefix(DefglobalData(theEnv)->DefglobalCodeItem),
+                         ConstructPrefix(DefglobalData(theEnv)->DefglobalCodeItem));
+
+   fprintf(theFile,",");
+
+   /*============================================*/
+   /* Watch Flag, In Scope Flag, and Busy Count. */
+   /*============================================*/
+
+   fprintf(theFile,"0,0,%ld,",theDefglobal->busyCount);
+
+   /*================*/
+   /* Current Value. */
+   /*================*/
+
+   fprintf(theFile,"{ { NULL } }");
+
+   /*=====================*/
+   /* Initial Expression. */
+   /*=====================*/
+
+   fprintf(theFile,",");
+   PrintHashedExpressionReference(theEnv,theFile,theDefglobal->initial,imageID,maxIndices);
+
+   fprintf(theFile,"}");
+  }
+
+/***************************************************************/
+/* DefglobalCModuleReference: Writes the C code representation */
+/*   of a reference to a defglobal module data structure.      */
+/***************************************************************/
+void DefglobalCModuleReference(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned long count,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"MIHS &%s%u_%lu[%lu]",
+                      ModulePrefix(DefglobalData(theEnv)->DefglobalCodeItem),
+                      imageID,
+                      (count / maxIndices) + 1,
+                      (count % maxIndices));
+  }
+
+/******************************************************************/
+/* DefglobalCConstructReference: Writes the C code representation */
+/*   of a reference to a defglobal data structure.                */
+/******************************************************************/
+void DefglobalCConstructReference(
+  Environment *theEnv,
+  FILE *theFile,
+  Defglobal *theGlobal,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+
+   if (theGlobal == NULL)
+     { fprintf(theFile,"NULL"); }
+   else
+     {
+      fprintf(theFile,"&%s%u_%lu[%lu]",ConstructPrefix(DefglobalData(theEnv)->DefglobalCodeItem),
+                      imageID,
+                      (theGlobal->header.bsaveID / maxIndices) + 1,
+                      theGlobal->header.bsaveID % maxIndices);
+     }
+
+  }
+
+#endif /* DEFGLOBAL_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME) */
+
+
diff --git a/clips/globlcmp.h b/clips/globlcmp.h
new file mode 100755
index 000000000..a11b33b32
--- /dev/null
+++ b/clips/globlcmp.h
@@ -0,0 +1,52 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*       DEFGLOBAL CONSTRUCT COMPILER HEADER FILE      */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_globlcmp
+
+#pragma once
+
+#define _H_globlcmp
+
+#include "globldef.h"
+
+   void                           DefglobalCompilerSetup(Environment *);
+   void                           DefglobalCModuleReference(Environment *,FILE *,unsigned long,unsigned int,unsigned int);
+   void                           DefglobalCConstructReference(Environment *,FILE *,Defglobal *,
+                                                               unsigned int,unsigned int);
+
+#endif /* _H_globlcmp */
+
diff --git a/clips/globlcom.c b/clips/globlcom.c
new file mode 100755
index 000000000..6a30f440a
--- /dev/null
+++ b/clips/globlcom.c
@@ -0,0 +1,280 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*              DEFGLOBAL COMMANDS MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides the show-defglobals, set-reset-globals, */
+/*   and get-reset-globals commands.                         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFGLOBAL_CONSTRUCT
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "globldef.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "globlcom.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if DEBUGGING_FUNCTIONS
+   static void                       PrintDefglobalValueForm(Environment *,const char *,Defglobal *);
+#endif
+
+/************************************************************/
+/* DefglobalCommandDefinitions: Defines defglobal commands. */
+/************************************************************/
+void DefglobalCommandDefinitions(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"set-reset-globals","b",1,1,NULL,SetResetGlobalsCommand,"SetResetGlobalsCommand",NULL);
+   AddUDF(theEnv,"get-reset-globals","b",0,0,NULL,GetResetGlobalsCommand,"GetResetGlobalsCommand",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"show-defglobals","v",0,1,"y",ShowDefglobalsCommand,"ShowDefglobalsCommand",NULL);
+#endif
+
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+/************************************************/
+/* SetResetGlobalsCommand: H/L access routine   */
+/*   for the get-reset-globals command.         */
+/************************************************/
+void SetResetGlobalsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool oldValue;
+   UDFValue theArg;
+
+   /*===========================================*/
+   /* Remember the old value of this attribute. */
+   /*===========================================*/
+
+   oldValue = GetResetGlobals(theEnv);
+
+   /*===========================================*/
+   /* Determine the new value of the attribute. */
+   /*===========================================*/
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+
+   if (theArg.value == FalseSymbol(theEnv))
+     { SetResetGlobals(theEnv,false); }
+   else
+     { SetResetGlobals(theEnv,true); }
+
+   /*========================================*/
+   /* Return the old value of the attribute. */
+   /*========================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,oldValue);
+  }
+
+/****************************************/
+/* SetResetGlobals: C access routine */
+/*   for the set-reset-globals command. */
+/****************************************/
+bool SetResetGlobals(
+  Environment *theEnv,
+  bool value)
+  {
+   bool ov;
+
+   ov = DefglobalData(theEnv)->ResetGlobals;
+   DefglobalData(theEnv)->ResetGlobals = value;
+   return(ov);
+  }
+
+/************************************************/
+/* GetResetGlobalsCommand: H/L access routine   */
+/*   for the get-reset-globals command.         */
+/************************************************/
+void GetResetGlobalsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateBoolean(theEnv,GetResetGlobals(theEnv));
+  }
+
+/****************************************/
+/* GetResetGlobals: C access routine    */
+/*   for the get-reset-globals command. */
+/****************************************/
+bool GetResetGlobals(
+  Environment *theEnv)
+  {
+   return(DefglobalData(theEnv)->ResetGlobals);
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/***********************************************/
+/* ShowDefglobalsCommand: H/L access routine   */
+/*   for the show-defglobals command.          */
+/***********************************************/
+void ShowDefglobalsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defmodule *theModule;
+   unsigned int numArgs;
+   bool error;
+
+   numArgs = UDFArgumentCount(context);
+
+   if (numArgs == 1)
+     {
+      theModule = GetModuleName(context,1,&error);
+      if (error) return;
+     }
+   else
+     { theModule = GetCurrentModule(theEnv); }
+
+   ShowDefglobals(theEnv,STDOUT,theModule);
+  }
+
+/**************************************/
+/* ShowDefglobals: C access routine   */
+/*   for the show-defglobals command. */
+/**************************************/
+void ShowDefglobals(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ConstructHeader *constructPtr;
+   bool allModules = false;
+   struct defmoduleItemHeader *theModuleItem;
+
+   /*=======================================*/
+   /* If the module specified is NULL, then */
+   /* list all constructs in all modules.   */
+   /*=======================================*/
+
+   if (theModule == NULL)
+     {
+      theModule = GetNextDefmodule(theEnv,NULL);
+      allModules = true;
+     }
+
+   /*======================================================*/
+   /* Print out the constructs in the specified module(s). */
+   /*======================================================*/
+
+   for (;
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*===========================================*/
+      /* Print the module name before every group  */
+      /* of defglobals listed if we're listing the */
+      /* defglobals from every module.             */
+      /*===========================================*/
+
+      if (allModules)
+        {
+         WriteString(theEnv,logicalName,DefmoduleName(theModule));
+         WriteString(theEnv,logicalName,":\n");
+        }
+
+      /*=====================================*/
+      /* Print every defglobal in the module */
+      /* currently being examined.           */
+      /*=====================================*/
+
+      theModuleItem = (struct defmoduleItemHeader *) GetModuleItem(theEnv,theModule,DefglobalData(theEnv)->DefglobalModuleIndex);
+
+      for (constructPtr = theModuleItem->firstItem;
+           constructPtr != NULL;
+           constructPtr = constructPtr->next)
+        {
+         if (EvaluationData(theEnv)->HaltExecution == true) return;
+
+         if (allModules) WriteString(theEnv,logicalName,"   ");
+         PrintDefglobalValueForm(theEnv,logicalName,(Defglobal *) constructPtr);
+         WriteString(theEnv,logicalName,"\n");
+        }
+
+      /*===================================*/
+      /* If we're only listing the globals */
+      /* for one module, then return.      */
+      /*===================================*/
+
+      if (! allModules) return;
+     }
+  }
+
+/*****************************************************/
+/* PrintDefglobalValueForm: Prints the value form of */
+/*   a defglobal (the current value). For example,   */
+/*   ?*x* = 3                                        */
+/*****************************************************/
+static void PrintDefglobalValueForm(
+  Environment *theEnv,
+  const char *logicalName,
+  Defglobal *theGlobal)
+  {
+   WriteString(theEnv,logicalName,"?*");
+   WriteString(theEnv,logicalName,theGlobal->header.name->contents);
+   WriteString(theEnv,logicalName,"* = ");
+   WriteCLIPSValue(theEnv,logicalName,&theGlobal->current);
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#endif /* DEFGLOBAL_CONSTRUCT */
+
diff --git a/clips/globlcom.h b/clips/globlcom.h
new file mode 100755
index 000000000..3821c9f49
--- /dev/null
+++ b/clips/globlcom.h
@@ -0,0 +1,63 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*            DEFGLOBAL COMMANDS HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_globlcom
+
+#pragma once
+
+#define _H_globlcom
+
+   void                           DefglobalCommandDefinitions(Environment *);
+   void                           SetResetGlobalsCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           SetResetGlobals(Environment *,bool);
+   void                           GetResetGlobalsCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           GetResetGlobals(Environment *);
+   void                           ShowDefglobalsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ShowDefglobals(Environment *,const char *,Defmodule *);
+
+#endif /* _H_globlcom */
+
diff --git a/clips/globldef.c b/clips/globldef.c
new file mode 100755
index 000000000..a9c347f37
--- /dev/null
+++ b/clips/globldef.c
@@ -0,0 +1,1069 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/13/17             */
+   /*                                                     */
+   /*                  DEFGLOBAL MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides core routines for the creation and      */
+/*   maintenance of the defglobal construct.                 */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warning.                              */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Use of ?<var>, $?<var>, ?*<var>, and  $?*var*  */
+/*            by itself at the command prompt and within     */
+/*            the eval function now consistently returns the */
+/*            value of  the variable.                        */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFGLOBAL_CONSTRUCT
+
+#include <stdio.h>
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#include "globlbin.h"
+#endif
+#include "commline.h"
+#include "envrnmnt.h"
+#include "globlbsc.h"
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "globlcmp.h"
+#endif
+#include "globlcom.h"
+#include "globlpsr.h"
+#include "memalloc.h"
+#include "modulpsr.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "router.h"
+#include "strngrtr.h"
+#include "utility.h"
+
+#include "globldef.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                   *AllocateModule(Environment *);
+   static void                    ReturnModule(Environment *,void *);
+   static void                    ReturnDefglobal(Environment *,Defglobal *);
+   static void                    InitializeDefglobalModules(Environment *);
+   static bool                    EntityGetDefglobalValue(Environment *,void *,UDFValue *);
+   static void                    IncrementDefglobalBusyCount(Environment *,Defglobal *);
+   static void                    DecrementDefglobalBusyCount(Environment *,Defglobal *);
+   static void                    DeallocateDefglobalData(Environment *);
+   static void                    DestroyDefglobalAction(Environment *,ConstructHeader *,void *);
+#if (! BLOAD_ONLY)
+   static void                    DestroyDefglobal(Environment *,Defglobal *);
+#endif
+#if RUN_TIME
+   static void                    RuntimeDefglobalAction(Environment *,ConstructHeader *,void *);
+#endif
+
+/**************************************************************/
+/* InitializeDefglobals: Initializes the defglobal construct. */
+/**************************************************************/
+void InitializeDefglobals(
+  Environment *theEnv)
+  {
+   struct entityRecord globalInfo = { "GBL_VARIABLE", GBL_VARIABLE,0,0,0,
+                                                       NULL,
+                                                       NULL,
+                                                       NULL,
+                                                       (EntityEvaluationFunction *)  EntityGetDefglobalValue,
+                                                       NULL,NULL,
+                                                       NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord defglobalPtrRecord = { "DEFGLOBAL_PTR", DEFGLOBAL_PTR,0,0,0,
+                                                       NULL,NULL,NULL,
+                                                       (EntityEvaluationFunction *) QGetDefglobalUDFValue,
+                                                       NULL,
+                                                       (EntityBusyCountFunction *) DecrementDefglobalBusyCount,
+                                                       (EntityBusyCountFunction *) IncrementDefglobalBusyCount,
+                                                       NULL,NULL,NULL,NULL,NULL };
+
+   AllocateEnvironmentData(theEnv,DEFGLOBAL_DATA,sizeof(struct defglobalData),DeallocateDefglobalData);
+
+   memcpy(&DefglobalData(theEnv)->GlobalInfo,&globalInfo,sizeof(struct entityRecord));
+   memcpy(&DefglobalData(theEnv)->DefglobalPtrRecord,&defglobalPtrRecord,sizeof(struct entityRecord));
+
+   DefglobalData(theEnv)->ResetGlobals = true;
+   DefglobalData(theEnv)->LastModuleIndex = -1;
+
+   InstallPrimitive(theEnv,&DefglobalData(theEnv)->GlobalInfo,GBL_VARIABLE);
+   InstallPrimitive(theEnv,&DefglobalData(theEnv)->GlobalInfo,MF_GBL_VARIABLE);
+   InstallPrimitive(theEnv,&DefglobalData(theEnv)->DefglobalPtrRecord,DEFGLOBAL_PTR);
+
+   InitializeDefglobalModules(theEnv);
+
+   DefglobalBasicCommands(theEnv);
+   DefglobalCommandDefinitions(theEnv);
+
+   DefglobalData(theEnv)->DefglobalConstruct =
+      AddConstruct(theEnv,"defglobal","defglobals",ParseDefglobal,
+                   (FindConstructFunction *) FindDefglobal,
+                   GetConstructNamePointer,GetConstructPPForm,
+                   GetConstructModuleItem,
+                   (GetNextConstructFunction *) GetNextDefglobal,
+                   SetNextConstruct,
+                   (IsConstructDeletableFunction *) DefglobalIsDeletable,
+                   (DeleteConstructFunction *) Undefglobal,
+                   (FreeConstructFunction *) ReturnDefglobal);
+  }
+
+/****************************************************/
+/* DeallocateDefglobalData: Deallocates environment */
+/*    data for the defglobal construct.             */
+/****************************************************/
+static void DeallocateDefglobalData(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   struct defglobalModule *theModuleItem;
+   Defmodule *theModule;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv)) return;
+#endif
+
+   DoForAllConstructs(theEnv,DestroyDefglobalAction,
+                      DefglobalData(theEnv)->DefglobalModuleIndex,false,NULL);
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      theModuleItem = (struct defglobalModule *)
+                      GetModuleItem(theEnv,theModule,
+                                    DefglobalData(theEnv)->DefglobalModuleIndex);
+      rtn_struct(theEnv,defglobalModule,theModuleItem);
+     }
+#else
+   DoForAllConstructs(theEnv,DestroyDefglobalAction,DefglobalData(theEnv)->DefglobalModuleIndex,false,NULL);
+#endif
+  }
+
+/***************************************************/
+/* DestroyDefglobalAction: Action used to remove   */
+/*   defglobals as a result of DestroyEnvironment. */
+/***************************************************/
+static void DestroyDefglobalAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+#if (! BLOAD_ONLY)
+   Defglobal *theDefglobal = (Defglobal *) theConstruct;
+
+   if (theDefglobal == NULL) return;
+
+   DestroyDefglobal(theEnv,theDefglobal);
+#else
+#if MAC_XCD
+#pragma unused(theEnv,theConstruct)
+#endif
+#endif
+  }
+
+/*********************************************************/
+/* InitializeDefglobalModules: Initializes the defglobal */
+/*   construct for use with the defmodule construct.     */
+/*********************************************************/
+static void InitializeDefglobalModules(
+  Environment *theEnv)
+  {
+   DefglobalData(theEnv)->DefglobalModuleIndex = RegisterModuleItem(theEnv,"defglobal",
+                                    AllocateModule,
+                                    ReturnModule,
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+                                    BloadDefglobalModuleReference,
+#else
+                                    NULL,
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+                                    DefglobalCModuleReference,
+#else
+                                    NULL,
+#endif
+                                    (FindConstructFunction *) FindDefglobalInModule);
+
+#if (! BLOAD_ONLY) && (! RUN_TIME) && DEFMODULE_CONSTRUCT
+   AddPortConstructItem(theEnv,"defglobal",SYMBOL_TOKEN);
+#endif
+  }
+
+/*************************************************/
+/* AllocateModule: Allocates a defglobal module. */
+/*************************************************/
+static void *AllocateModule(
+  Environment *theEnv)
+  {
+   return (void *) get_struct(theEnv,defglobalModule);
+  }
+
+/*************************************************/
+/* ReturnModule: Deallocates a defglobal module. */
+/*************************************************/
+static void ReturnModule(
+  Environment *theEnv,
+  void *theItem)
+  {
+   FreeConstructHeaderModule(theEnv,(struct defmoduleItemHeader *) theItem,DefglobalData(theEnv)->DefglobalConstruct);
+   rtn_struct(theEnv,defglobalModule,theItem);
+  }
+
+/**************************************************************/
+/* GetDefglobalModuleItem: Returns a pointer to the defmodule */
+/*  item for the specified defglobal or defmodule.            */
+/**************************************************************/
+struct defglobalModule *GetDefglobalModuleItem(
+  Environment *theEnv,
+  Defmodule *theModule)
+  {
+   return((struct defglobalModule *) GetConstructModuleItemByIndex(theEnv,theModule,DefglobalData(theEnv)->DefglobalModuleIndex));
+  }
+
+/**************************************************/
+/* FindDefglobal: Searches for a defglobal in the */
+/*   list of defglobals. Returns a pointer to the */
+/*   defglobal if found, otherwise NULL.          */
+/**************************************************/
+Defglobal *FindDefglobal(
+  Environment *theEnv,
+  const char *defglobalName)
+  {
+   return (Defglobal *) FindNamedConstructInModuleOrImports(theEnv,defglobalName,DefglobalData(theEnv)->DefglobalConstruct);
+  }
+
+/******************************************************/
+/* FindDefglobalInModule: Searches for a defglobal in */
+/*   the list of defglobals. Returns a pointer to the */
+/*   defglobal if found, otherwise NULL.              */
+/******************************************************/
+Defglobal *FindDefglobalInModule(
+  Environment *theEnv,
+  const char *defglobalName)
+  {
+   return (Defglobal *) FindNamedConstructInModule(theEnv,defglobalName,DefglobalData(theEnv)->DefglobalConstruct);
+  }
+
+/*****************************************************************/
+/* GetNextDefglobal: If passed a NULL pointer, returns the first */
+/*   defglobal in the defglobal list. Otherwise returns the next */
+/*   defglobal following the defglobal passed as an argument.    */
+/*****************************************************************/
+Defglobal *GetNextDefglobal(
+  Environment *theEnv,
+  Defglobal *defglobalPtr)
+  {
+   return (Defglobal *) GetNextConstructItem(theEnv,&defglobalPtr->header,DefglobalData(theEnv)->DefglobalModuleIndex);
+  }
+
+/********************************************************/
+/* DefglobalIsDeletable: Returns true if a particular   */
+/*   defglobal can be deleted, otherwise returns false. */
+/********************************************************/
+bool DefglobalIsDeletable(
+  Defglobal *theDefglobal)
+  {
+   Environment *theEnv = theDefglobal->header.env;
+   
+   if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   if (theDefglobal->busyCount) return false;
+
+   return true;
+  }
+
+/************************************************************/
+/* ReturnDefglobal: Returns the data structures associated  */
+/*   with a defglobal construct to the pool of free memory. */
+/************************************************************/
+static void ReturnDefglobal(
+  Environment *theEnv,
+  Defglobal *theDefglobal)
+  {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   if (theDefglobal == NULL) return;
+
+   /*====================================*/
+   /* Return the global's current value. */
+   /*====================================*/
+
+   Release(theEnv,theDefglobal->current.header);
+   if (theDefglobal->current.header->type == MULTIFIELD_TYPE)
+     {
+      if (theDefglobal->current.multifieldValue->busyCount == 0)
+        { ReturnMultifield(theEnv,theDefglobal->current.multifieldValue); }
+      else
+        { AddToMultifieldList(theEnv,theDefglobal->current.multifieldValue); }
+     }
+
+   /*================================================*/
+   /* Return the expression representing the initial */
+   /* value of the defglobal when it was defined.    */
+   /*================================================*/
+
+   RemoveHashedExpression(theEnv,theDefglobal->initial);
+
+   /*===============================*/
+   /* Release items stored in the   */
+   /* defglobal's construct header. */
+   /*===============================*/
+
+   DeinstallConstructHeader(theEnv,&theDefglobal->header);
+
+   /*======================================*/
+   /* Return the defglobal data structure. */
+   /*======================================*/
+
+   rtn_struct(theEnv,defglobal,theDefglobal);
+
+   /*===========================================*/
+   /* Set the variable indicating that a change */
+   /* has been made to a global variable.       */
+   /*===========================================*/
+
+   DefglobalData(theEnv)->ChangeToGlobals = true;
+#endif
+  }
+
+/************************************************************/
+/* DestroyDefglobal: Returns the data structures associated  */
+/*   with a defglobal construct to the pool of free memory. */
+/************************************************************/
+#if (! BLOAD_ONLY)
+static void DestroyDefglobal(
+  Environment *theEnv,
+  Defglobal *theDefglobal)
+  {
+   if (theDefglobal == NULL) return;
+
+   /*====================================*/
+   /* Return the global's current value. */
+   /*====================================*/
+
+   if (theDefglobal->current.header->type == MULTIFIELD_TYPE)
+     {
+      if (theDefglobal->current.multifieldValue->busyCount == 0)
+        { ReturnMultifield(theEnv,theDefglobal->current.multifieldValue); }
+      else
+        { AddToMultifieldList(theEnv,theDefglobal->current.multifieldValue); }
+     }
+
+#if (! RUN_TIME)
+
+   /*===============================*/
+   /* Release items stored in the   */
+   /* defglobal's construct header. */
+   /*===============================*/
+
+   DeinstallConstructHeader(theEnv,&theDefglobal->header);
+
+   /*======================================*/
+   /* Return the defglobal data structure. */
+   /*======================================*/
+
+   rtn_struct(theEnv,defglobal,theDefglobal);
+#endif
+  }
+#endif
+
+/************************************************/
+/* QSetDefglobalValue: Lowest level routine for */
+/*   setting a defglobal's value.               */
+/************************************************/
+void QSetDefglobalValue(
+  Environment *theEnv,
+  Defglobal *theGlobal,
+  UDFValue *vPtr,
+  bool resetVar)
+  {
+   /*====================================================*/
+   /* If the new value passed for the defglobal is NULL, */
+   /* then reset the defglobal to the initial value it   */
+   /* had when it was defined.                           */
+   /*====================================================*/
+
+   if (resetVar)
+     {
+      EvaluateExpression(theEnv,theGlobal->initial,vPtr);
+      if (EvaluationData(theEnv)->EvaluationError)
+        { vPtr->value = FalseSymbol(theEnv); }
+     }
+
+   /*==========================================*/
+   /* If globals are being watch, then display */
+   /* the change to the global variable.       */
+   /*==========================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if (theGlobal->watch &&
+       (! ConstructData(theEnv)->ClearReadyInProgress) &&
+       (! ConstructData(theEnv)->ClearInProgress))
+     {
+      WriteString(theEnv,STDOUT,":== ?*");
+      WriteString(theEnv,STDOUT,theGlobal->header.name->contents);
+      WriteString(theEnv,STDOUT,"* ==> ");
+      WriteUDFValue(theEnv,STDOUT,vPtr);
+      WriteString(theEnv,STDOUT," <== ");
+      WriteCLIPSValue(theEnv,STDOUT,&theGlobal->current);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+#endif
+
+   /*==============================================*/
+   /* Remove the old value of the global variable. */
+   /*==============================================*/
+
+   Release(theEnv,theGlobal->current.header);
+   if (theGlobal->current.header->type == MULTIFIELD_TYPE)
+     {
+      if (theGlobal->current.multifieldValue->busyCount == 0)
+        { ReturnMultifield(theEnv,theGlobal->current.multifieldValue); }
+      else
+        { AddToMultifieldList(theEnv,theGlobal->current.multifieldValue); }
+     }
+
+   /*===========================================*/
+   /* Set the new value of the global variable. */
+   /*===========================================*/
+
+   if (vPtr->header->type != MULTIFIELD_TYPE)
+     { theGlobal->current.value = vPtr->value; }
+   else
+     { theGlobal->current.value = CopyMultifield(theEnv,vPtr->multifieldValue); }
+   Retain(theEnv,theGlobal->current.header);
+
+   /*===========================================*/
+   /* Set the variable indicating that a change */
+   /* has been made to a global variable.       */
+   /*===========================================*/
+
+   DefglobalData(theEnv)->ChangeToGlobals = true;
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     {
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+     }
+  }
+
+/**************************************************************/
+/* QFindDefglobal: Searches for a defglobal in the list of    */
+/*   defglobals. Returns a pointer to the defglobal if found, */
+/*   otherwise NULL.                                          */
+/**************************************************************/
+Defglobal *QFindDefglobal(
+  Environment *theEnv,
+  CLIPSLexeme *defglobalName)
+  {
+   Defglobal *theDefglobal;
+
+   for (theDefglobal = GetNextDefglobal(theEnv,NULL);
+        theDefglobal != NULL;
+        theDefglobal = GetNextDefglobal(theEnv,theDefglobal))
+     { if (defglobalName == theDefglobal->header.name) return theDefglobal; }
+
+   return NULL;
+  }
+
+/*******************************************************************/
+/* DefglobalValueForm: Returns the pretty print representation of  */
+/*   the current value of the specified defglobal. For example, if */
+/*   the current value of ?*x* is 5, the string "?*x* = 5" would   */
+/*   be returned.                                                  */
+/*******************************************************************/
+void DefglobalValueForm(
+  Defglobal *theGlobal,
+  StringBuilder *theSB)
+  {
+   Environment *theEnv = theGlobal->header.env;
+
+   OpenStringBuilderDestination(theEnv,"GlobalValueForm",theSB);
+   WriteString(theEnv,"GlobalValueForm","?*");
+   WriteString(theEnv,"GlobalValueForm",theGlobal->header.name->contents);
+   WriteString(theEnv,"GlobalValueForm","* = ");
+   WriteCLIPSValue(theEnv,"GlobalValueForm",&theGlobal->current);
+   CloseStringBuilderDestination(theEnv,"GlobalValueForm");
+  }
+
+/*********************************************************/
+/* GetGlobalsChanged: Returns the defglobal change flag. */
+/*********************************************************/
+bool GetGlobalsChanged(
+  Environment *theEnv)
+  {
+   return DefglobalData(theEnv)->ChangeToGlobals;
+  }
+
+/******************************************************/
+/* SetGlobalsChanged: Sets the defglobal change flag. */
+/******************************************************/
+void SetGlobalsChanged(
+  Environment *theEnv,
+  bool value)
+  {
+   DefglobalData(theEnv)->ChangeToGlobals = value;
+  }
+
+/*********************************************************/
+/* EntityGetDefglobalValue: Returns the value of the     */
+/*   specified global variable in the supplied UDFValue. */
+/*********************************************************/
+static bool EntityGetDefglobalValue(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *vPtr)
+  {
+   Defglobal *theGlobal;
+   unsigned int count;
+
+   /*===========================================*/
+   /* Search for the specified defglobal in the */
+   /* modules visible to the current module.    */
+   /*===========================================*/
+
+   theGlobal = (Defglobal *)
+               FindImportedConstruct(theEnv,"defglobal",NULL,((CLIPSLexeme *) theValue)->contents,
+               &count,true,NULL);
+
+   /*=============================================*/
+   /* If it wasn't found, print an error message. */
+   /*=============================================*/
+
+   if (theGlobal == NULL)
+     {
+      PrintErrorID(theEnv,"GLOBLDEF",1,false);
+      WriteString(theEnv,STDERR,"Global variable ?*");
+      WriteString(theEnv,STDERR,((CLIPSLexeme *) theValue)->contents);
+      WriteString(theEnv,STDERR,"* is unbound.\n");
+      vPtr->value = FalseSymbol(theEnv);
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+
+   /*========================================================*/
+   /* The current implementation of the defmodules shouldn't */
+   /* allow a construct to be defined which would cause an   */
+   /* ambiguous reference, but we'll check for it anyway.    */
+   /*========================================================*/
+
+   if (count > 1)
+     {
+      AmbiguousReferenceErrorMessage(theEnv,"defglobal",((CLIPSLexeme *) theValue)->contents);
+      vPtr->value = FalseSymbol(theEnv);
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+
+   /*=================================*/
+   /* Get the value of the defglobal. */
+   /*=================================*/
+
+   CLIPSToUDFValue(&theGlobal->current,vPtr);
+     
+   return true;
+  }
+
+/******************************************************************/
+/* QGetDefglobalUDFValue: Returns the value of a global variable. */
+/******************************************************************/
+bool QGetDefglobalUDFValue(
+  Environment *theEnv,
+  Defglobal *theGlobal,
+  UDFValue *vPtr)
+  {
+   vPtr->value = theGlobal->current.value;
+   
+   /*===========================================================*/
+   /* If the global contains a multifield value, return a copy  */
+   /* of the value so that routines which use this value are    */
+   /* not affected if the value of the global is later changed. */
+   /*===========================================================*/
+
+   if (theGlobal->current.header->type == MULTIFIELD_TYPE)
+     {
+      vPtr->begin = 0;
+      vPtr->range = theGlobal->current.multifieldValue->length;
+     }
+     
+   return true;
+  }
+
+/*********************************************************/
+/* DefglobalGetValue: Returns the value of the specified */
+/*   global variable in the supplied UDFValue.           */
+/*********************************************************/
+void DefglobalGetValue(
+  Defglobal *theDefglobal,
+  CLIPSValue *vPtr)
+  {
+   vPtr->value = theDefglobal->current.value;
+  }
+
+/*************************************************************/
+/* DefglobalSetValue: Sets the value of the specified global */
+/*   variable to the value stored in the supplied UDFValue.  */
+/*************************************************************/
+void DefglobalSetValue(
+  Defglobal *theDefglobal,
+  CLIPSValue *vPtr)
+  {
+   UDFValue temp;
+   GCBlock gcb;
+   Environment *theEnv = theDefglobal->header.env;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   GCBlockStart(theEnv,&gcb);
+   CLIPSToUDFValue(vPtr,&temp);
+   QSetDefglobalValue(theEnv,theDefglobal,&temp,false);
+   GCBlockEnd(theEnv,&gcb);
+  }
+
+/************************/
+/* DefglobalSetInteger: */
+/************************/
+void DefglobalSetInteger(
+  Defglobal *theDefglobal,
+  long long value)
+  {
+   CLIPSValue cv;
+   
+   cv.integerValue = CreateInteger(theDefglobal->header.env,value);
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/**********************/
+/* DefglobalSetFloat: */
+/**********************/
+void DefglobalSetFloat(
+  Defglobal *theDefglobal,
+  double value)
+  {
+   CLIPSValue cv;
+   
+   cv.floatValue = CreateFloat(theDefglobal->header.env,value);
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/***********************/
+/* DefglobalSetSymbol: */
+/***********************/
+void DefglobalSetSymbol(
+  Defglobal *theDefglobal,
+  const char *value)
+  {
+   CLIPSValue cv;
+   
+   cv.lexemeValue = CreateSymbol(theDefglobal->header.env,value);
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/***********************/
+/* DefglobalSetString: */
+/***********************/
+void DefglobalSetString(
+  Defglobal *theDefglobal,
+  const char *value)
+  {
+   CLIPSValue cv;
+   
+   cv.lexemeValue = CreateString(theDefglobal->header.env,value);
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/*****************************/
+/* DefglobalSetInstanceName: */
+/*****************************/
+void DefglobalSetInstanceName(
+  Defglobal *theDefglobal,
+  const char *value)
+  {
+   CLIPSValue cv;
+   
+   cv.lexemeValue = CreateInstanceName(theDefglobal->header.env,value);
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/*****************************/
+/* DefglobalSetCLIPSInteger: */
+/*****************************/
+void DefglobalSetCLIPSInteger(
+  Defglobal *theDefglobal,
+  CLIPSInteger *value)
+  {
+   CLIPSValue cv;
+   
+   cv.integerValue = value;
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/***************************/
+/* DefglobalSetCLIPSFloat: */
+/***************************/
+void DefglobalSetCLIPSFloat(
+  Defglobal *theDefglobal,
+  CLIPSFloat *value)
+  {
+   CLIPSValue cv;
+   
+   cv.floatValue = value;
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/****************************/
+/* DefglobalSetCLIPSLexeme: */
+/****************************/
+void DefglobalSetCLIPSLexeme(
+  Defglobal *theDefglobal,
+  CLIPSLexeme *value)
+  {
+   CLIPSValue cv;
+   
+   cv.lexemeValue = value;
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/*********************/
+/* DefglobalSetFact: */
+/*********************/
+void DefglobalSetFact(
+  Defglobal *theDefglobal,
+  Fact *value)
+  {
+   CLIPSValue cv;
+   
+   cv.factValue = value;
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/*************************/
+/* DefglobalSetInstance: */
+/*************************/
+void DefglobalSetInstance(
+  Defglobal *theDefglobal,
+  Instance *value)
+  {
+   CLIPSValue cv;
+   
+   cv.instanceValue = value;
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/***************************/
+/* DefglobalSetMultifield: */
+/***************************/
+void DefglobalSetMultifield(
+  Defglobal *theDefglobal,
+  Multifield *value)
+  {
+   CLIPSValue cv;
+   
+   cv.multifieldValue = value;
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/*************************************/
+/* DefglobalSetCLIPSExternalAddress: */
+/*************************************/
+void DefglobalSetCLIPSExternalAddress(
+  Defglobal *theDefglobal,
+  CLIPSExternalAddress *value)
+  {
+   CLIPSValue cv;
+   
+   cv.externalAddressValue = value;
+   
+   DefglobalSetValue(theDefglobal,&cv);
+  }
+
+/**********************************************************/
+/* DecrementDefglobalBusyCount: Decrements the busy count */
+/*   of a defglobal data structure.                       */
+/**********************************************************/
+static void DecrementDefglobalBusyCount(
+  Environment *theEnv,
+  Defglobal *theGlobal)
+  {
+   if (! ConstructData(theEnv)->ClearInProgress) theGlobal->busyCount--;
+  }
+
+/**********************************************************/
+/* IncrementDefglobalBusyCount: Increments the busy count */
+/*   of a defglobal data structure.                       */
+/**********************************************************/
+static void IncrementDefglobalBusyCount(
+  Environment *theEnv,
+  Defglobal *theGlobal)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   theGlobal->busyCount++;
+  }
+
+/***********************************************************************/
+/* UpdateDefglobalScope: Updates the scope flag of all the defglobals. */
+/***********************************************************************/
+void UpdateDefglobalScope(
+  Environment *theEnv)
+  {
+   Defglobal *theDefglobal;
+   unsigned int moduleCount;
+   Defmodule *theModule;
+   struct defmoduleItemHeader *theItem;
+
+   /*============================*/
+   /* Loop through every module. */
+   /*============================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*============================================================*/
+      /* Loop through every defglobal in the module being examined. */
+      /*============================================================*/
+
+      theItem = (struct defmoduleItemHeader *)
+                GetModuleItem(theEnv,theModule,DefglobalData(theEnv)->DefglobalModuleIndex);
+
+      for (theDefglobal = (Defglobal *) theItem->firstItem;
+           theDefglobal != NULL ;
+           theDefglobal = GetNextDefglobal(theEnv,theDefglobal))
+        {
+         /*====================================================*/
+         /* If the defglobal is visible to the current module, */
+         /* then mark it as being in scope, otherwise mark it  */
+         /* as being out of scope.                             */
+         /*====================================================*/
+
+         if (FindImportedConstruct(theEnv,"defglobal",theModule,
+                                   theDefglobal->header.name->contents,
+                                   &moduleCount,true,NULL) != NULL)
+           { theDefglobal->inScope = true; }
+         else
+           { theDefglobal->inScope = false; }
+        }
+     }
+  }
+
+/*******************************************************/
+/* GetNextDefglobalInScope: Returns the next defglobal */
+/*   that is scope of the current module. Works in a   */
+/*   similar fashion to GetNextDefglobal, but skips    */
+/*   defglobals that are out of scope.                 */
+/*******************************************************/
+Defglobal *GetNextDefglobalInScope(
+  Environment *theEnv,
+  Defglobal *theGlobal)
+  {
+   struct defmoduleItemHeader *theItem;
+
+   /*=======================================*/
+   /* If we're beginning the search for the */
+   /* first defglobal in scope, then ...    */
+   /*=======================================*/
+
+   if (theGlobal == NULL)
+     {
+      /*==============================================*/
+      /* If the current module has been changed since */
+      /* the last time the scopes were computed, then */
+      /* recompute the scopes.                        */
+      /*==============================================*/
+
+      if (DefglobalData(theEnv)->LastModuleIndex != DefmoduleData(theEnv)->ModuleChangeIndex)
+        {
+         UpdateDefglobalScope(theEnv);
+         DefglobalData(theEnv)->LastModuleIndex = DefmoduleData(theEnv)->ModuleChangeIndex;
+        }
+
+      /*==========================================*/
+      /* Get the first module and first defglobal */
+      /* to start the search with.                */
+      /*==========================================*/
+
+      DefglobalData(theEnv)->TheDefmodule = GetNextDefmodule(theEnv,NULL);
+      theItem = (struct defmoduleItemHeader *)
+                GetModuleItem(theEnv,DefglobalData(theEnv)->TheDefmodule,DefglobalData(theEnv)->DefglobalModuleIndex);
+      theGlobal = (Defglobal *) theItem->firstItem;
+     }
+
+   /*==================================================*/
+   /* Otherwise, see if the last defglobal returned by */
+   /* this function has a defglobal following it.      */
+   /*==================================================*/
+
+   else
+     { theGlobal = GetNextDefglobal(theEnv,theGlobal); }
+
+   /*======================================*/
+   /* Continue looping through the modules */
+   /* until a defglobal in scope is found. */
+   /*======================================*/
+
+   while (DefglobalData(theEnv)->TheDefmodule != NULL)
+     {
+      /*=====================================================*/
+      /* Loop through the defglobals in the module currently */
+      /* being examined to see if one is in scope.           */
+      /*=====================================================*/
+
+      for (;
+           theGlobal != NULL;
+           theGlobal = GetNextDefglobal(theEnv,theGlobal))
+        { if (theGlobal->inScope) return theGlobal; }
+
+      /*================================================*/
+      /* If a global in scope couldn't be found in this */
+      /* module, then move on to the next module.       */
+      /*================================================*/
+
+      DefglobalData(theEnv)->TheDefmodule = GetNextDefmodule(theEnv,DefglobalData(theEnv)->TheDefmodule);
+      theItem = (struct defmoduleItemHeader *)
+                GetModuleItem(theEnv,DefglobalData(theEnv)->TheDefmodule,DefglobalData(theEnv)->DefglobalModuleIndex);
+      theGlobal = (Defglobal *) theItem->firstItem;
+     }
+
+   /*====================================*/
+   /* All the globals in scope have been */
+   /* traversed and there are none left. */
+   /*====================================*/
+
+   return NULL;
+  }
+
+#if RUN_TIME
+
+/************************************************/
+/* RuntimeDefglobalAction: Action to be applied */
+/*   to each defglobal construct when a runtime */
+/*   initialization occurs.                     */
+/************************************************/
+static void RuntimeDefglobalAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Defglobal *theDefglobal = (Defglobal *) theConstruct;
+   
+   theDefglobal->header.env = theEnv;
+   theDefglobal->current.value = VoidConstant(theEnv);
+  }
+
+/*******************************/
+/* DefglobalRunTimeInitialize: */
+/*******************************/
+void DefglobalRunTimeInitialize(
+  Environment *theEnv)
+  {
+   DoForAllConstructs(theEnv,RuntimeDefglobalAction,DefglobalData(theEnv)->DefglobalModuleIndex,true,NULL);
+  }
+
+#endif
+
+/*##################################*/
+/* Additional Environment Functions */
+/*##################################*/
+
+const char *DefglobalModule(
+  Defglobal *theDefglobal)
+  {
+   return GetConstructModuleName(&theDefglobal->header);
+  }
+
+const char *DefglobalName(
+  Defglobal *theDefglobal)
+  {
+   return GetConstructNameString(&theDefglobal->header);
+  }
+
+const char *DefglobalPPForm(
+  Defglobal *theDefglobal)
+  {
+   return GetConstructPPForm(&theDefglobal->header);
+  }
+
+#endif /* DEFGLOBAL_CONSTRUCT */
+
+
diff --git a/clips/globldef.h b/clips/globldef.h
new file mode 100755
index 000000000..7eb20ff35
--- /dev/null
+++ b/clips/globldef.h
@@ -0,0 +1,151 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/13/17            */
+   /*                                                     */
+   /*                DEFGLOBAL HEADER FILE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warning.                              */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_globldef
+
+#pragma once
+
+#define _H_globldef
+
+typedef struct defglobal Defglobal;
+
+#include "conscomp.h"
+#include "constrct.h"
+#include "cstrccom.h"
+#include "evaluatn.h"
+#include "expressn.h"
+#include "moduldef.h"
+#include "symbol.h"
+
+#define DEFGLOBAL_DATA 1
+
+struct defglobalData
+  {
+   Construct *DefglobalConstruct;
+   unsigned DefglobalModuleIndex;
+   bool ChangeToGlobals;
+#if DEBUGGING_FUNCTIONS
+   bool WatchGlobals;
+#endif
+   bool ResetGlobals;
+   struct entityRecord GlobalInfo;
+   struct entityRecord DefglobalPtrRecord;
+   long LastModuleIndex;
+   Defmodule *TheDefmodule;
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   struct CodeGeneratorItem *DefglobalCodeItem;
+#endif
+  };
+
+struct defglobal
+  {
+   ConstructHeader header;
+   unsigned int watch   : 1;
+   unsigned int inScope : 1;
+   long busyCount;
+   CLIPSValue current;
+   struct expr *initial;
+  };
+
+struct defglobalModule
+  {
+   struct defmoduleItemHeader header;
+  };
+
+#define DefglobalData(theEnv) ((struct defglobalData *) GetEnvironmentData(theEnv,DEFGLOBAL_DATA))
+
+   void                           InitializeDefglobals(Environment *);
+   Defglobal                     *FindDefglobal(Environment *,const char *);
+   Defglobal                     *FindDefglobalInModule(Environment *,const char *);
+   Defglobal                     *GetNextDefglobal(Environment *,Defglobal *);
+   void                           CreateInitialFactDefglobal(void);
+   bool                           DefglobalIsDeletable(Defglobal *);
+   struct defglobalModule        *GetDefglobalModuleItem(Environment *,Defmodule *);
+   void                           QSetDefglobalValue(Environment *,Defglobal *,UDFValue *,bool);
+   Defglobal                     *QFindDefglobal(Environment *,CLIPSLexeme *);
+   void                           DefglobalValueForm(Defglobal *,StringBuilder *);
+   bool                           GetGlobalsChanged(Environment *);
+   void                           SetGlobalsChanged(Environment *,bool);
+   void                           DefglobalGetValue(Defglobal *,CLIPSValue *);
+   void                           DefglobalSetValue(Defglobal *,CLIPSValue *);
+   void                           DefglobalSetInteger(Defglobal *,long long);
+   void                           DefglobalSetFloat(Defglobal *,double);
+   void                           DefglobalSetSymbol(Defglobal *,const char *);
+   void                           DefglobalSetString(Defglobal *,const char *);
+   void                           DefglobalSetInstanceName(Defglobal *,const char *);
+   void                           DefglobalSetCLIPSInteger(Defglobal *,CLIPSInteger *);
+   void                           DefglobalSetCLIPSFloat(Defglobal *,CLIPSFloat *);
+   void                           DefglobalSetCLIPSLexeme(Defglobal *,CLIPSLexeme *);
+   void                           DefglobalSetFact(Defglobal *,Fact *);
+   void                           DefglobalSetInstance(Defglobal *,Instance *);
+   void                           DefglobalSetMultifield(Defglobal *,Multifield *);
+   void                           DefglobalSetCLIPSExternalAddress(Defglobal *,CLIPSExternalAddress *);
+   void                           UpdateDefglobalScope(Environment *);
+   Defglobal                     *GetNextDefglobalInScope(Environment *,Defglobal *);
+   bool                           QGetDefglobalUDFValue(Environment *,Defglobal *,UDFValue *);
+   const char                    *DefglobalModule(Defglobal *);
+   const char                    *DefglobalName(Defglobal *);
+   const char                    *DefglobalPPForm(Defglobal *);
+#if RUN_TIME
+   void                           DefglobalRunTimeInitialize(Environment *);
+#endif
+
+#endif /* _H_globldef */
+
+
diff --git a/clips/globlpsr.c b/clips/globlpsr.c
new file mode 100755
index 000000000..76dc3fa6c
--- /dev/null
+++ b/clips/globlpsr.c
@@ -0,0 +1,525 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*              DEFGLOBAL PARSER MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parses the defglobal construct.                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Made the construct redefinition message more   */
+/*            prominent.                                     */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Moved WatchGlobals global to defglobalData.    */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFGLOBAL_CONSTRUCT
+
+#include <string.h>
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+#include "constrct.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "exprnpsr.h"
+#include "globlbsc.h"
+#include "globldef.h"
+#include "memalloc.h"
+#include "modulpsr.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "watch.h"
+
+#include "globlpsr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static bool                    GetVariableDefinition(Environment *,const char *,bool *,bool,struct token *);
+   static void                    AddDefglobal(Environment *,CLIPSLexeme *,UDFValue *,struct expr *);
+#endif
+
+/*********************************************************************/
+/* ParseDefglobal: Coordinates all actions necessary for the parsing */
+/*   and creation of a defglobal into the current environment.       */
+/*********************************************************************/
+bool ParseDefglobal(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   bool defglobalError = false;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+   struct token theToken;
+   bool tokenRead = true;
+   Defmodule *theModule;
+
+   /*=====================================*/
+   /* Pretty print buffer initialization. */
+   /*=====================================*/
+
+   SetPPBufferStatus(theEnv,true);
+   FlushPPBuffer(theEnv);
+   SetIndentDepth(theEnv,3);
+   SavePPBuffer(theEnv,"(defglobal ");
+
+   /*=================================================*/
+   /* Individual defglobal constructs can't be parsed */
+   /* while a binary load is in effect.               */
+   /*=================================================*/
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv) == true) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"defglobal");
+      return true;
+     }
+#endif
+
+   /*===========================*/
+   /* Look for the module name. */
+   /*===========================*/
+
+   GetToken(theEnv,readSource,&theToken);
+   if (theToken.tknType == SYMBOL_TOKEN)
+     {
+      /*=================================================*/
+      /* The optional module name can't contain a module */
+      /* separator like other constructs. For example,   */
+      /* (defrule X::foo is OK for rules, but the right  */
+      /* syntax for defglobals is (defglobal X ?*foo*.   */
+      /*=================================================*/
+
+      tokenRead = false;
+      if (FindModuleSeparator(theToken.lexemeValue->contents))
+        {
+         SyntaxErrorMessage(theEnv,"defglobal");
+         return true;
+        }
+
+      /*=================================*/
+      /* Determine if the module exists. */
+      /*=================================*/
+
+      theModule = FindDefmodule(theEnv,theToken.lexemeValue->contents);
+      if (theModule == NULL)
+        {
+         CantFindItemErrorMessage(theEnv,"defmodule",theToken.lexemeValue->contents,true);
+         return true;
+        }
+
+      /*=========================================*/
+      /* If the module name was OK, then set the */
+      /* current module to the specified module. */
+      /*=========================================*/
+
+      SavePPBuffer(theEnv," ");
+      SetCurrentModule(theEnv,theModule);
+     }
+
+   /*===========================================*/
+   /* If the module name wasn't specified, then */
+   /* use the current module's name in the      */
+   /* defglobal's pretty print representation.  */
+   /*===========================================*/
+
+   else
+     {
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,DefmoduleName(GetCurrentModule(theEnv)));
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,theToken.printForm);
+     }
+
+   /*======================*/
+   /* Parse the variables. */
+   /*======================*/
+
+   while (GetVariableDefinition(theEnv,readSource,&defglobalError,tokenRead,&theToken))
+     {
+      tokenRead = false;
+
+      FlushPPBuffer(theEnv);
+      SavePPBuffer(theEnv,"(defglobal ");
+      SavePPBuffer(theEnv,DefmoduleName(GetCurrentModule(theEnv)));
+      SavePPBuffer(theEnv," ");
+     }
+
+#endif
+
+   /*==================================*/
+   /* Return the parsing error status. */
+   /*==================================*/
+
+   return(defglobalError);
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/***************************************************************/
+/* GetVariableDefinition: Parses and evaluates a single global */
+/*   variable in a defglobal construct. Returns true if the    */
+/*   variable was successfully parsed and false if a right     */
+/*   parenthesis is encountered (signifying the end of the     */
+/*   defglobal construct) or an error occurs. The error status */
+/*   flag is also set if an error occurs.                      */
+/***************************************************************/
+static bool GetVariableDefinition(
+  Environment *theEnv,
+  const char *readSource,
+  bool *defglobalError,
+  bool tokenRead,
+  struct token *theToken)
+  {
+   CLIPSLexeme *variableName;
+   struct expr *assignPtr;
+   UDFValue assignValue;
+
+   /*========================================*/
+   /* Get next token, which should either be */
+   /* a closing parenthesis or a variable.   */
+   /*========================================*/
+
+   if (! tokenRead) GetToken(theEnv,readSource,theToken);
+   if (theToken->tknType == RIGHT_PARENTHESIS_TOKEN) return false;
+
+   if (theToken->tknType == SF_VARIABLE_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"defglobal");
+      *defglobalError = true;
+      return false;
+     }
+   else if (theToken->tknType != GBL_VARIABLE_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"defglobal");
+      *defglobalError = true;
+      return false;
+     }
+
+   variableName = theToken->lexemeValue;
+
+   SavePPBuffer(theEnv," ");
+
+   /*================================*/
+   /* Print out compilation message. */
+   /*================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if ((GetWatchItem(theEnv,"compilations") == 1) && GetPrintWhileLoading(theEnv))
+     {
+      const char *outRouter = STDOUT;
+      if (QFindDefglobal(theEnv,variableName) != NULL)
+        {
+         outRouter = STDWRN;
+         PrintWarningID(theEnv,"CSTRCPSR",1,true);
+         WriteString(theEnv,outRouter,"Redefining defglobal: ");
+        }
+      else WriteString(theEnv,outRouter,"Defining defglobal: ");
+      WriteString(theEnv,outRouter,variableName->contents);
+      WriteString(theEnv,outRouter,"\n");
+     }
+   else
+#endif
+     { if (GetPrintWhileLoading(theEnv)) WriteString(theEnv,STDOUT,":"); }
+
+   /*==================================================================*/
+   /* Check for import/export conflicts from the construct definition. */
+   /*==================================================================*/
+
+#if DEFMODULE_CONSTRUCT
+   if (FindImportExportConflict(theEnv,"defglobal",GetCurrentModule(theEnv),variableName->contents))
+     {
+      ImportExportConflictMessage(theEnv,"defglobal",variableName->contents,NULL,NULL);
+      *defglobalError = true;
+      return false;
+     }
+#endif
+
+   /*==============================*/
+   /* The next token must be an =. */
+   /*==============================*/
+
+   GetToken(theEnv,readSource,theToken);
+   if (strcmp(theToken->printForm,"=") != 0)
+     {
+      SyntaxErrorMessage(theEnv,"defglobal");
+      *defglobalError = true;
+      return false;
+     }
+
+   SavePPBuffer(theEnv," ");
+
+   /*======================================================*/
+   /* Parse the expression to be assigned to the variable. */
+   /*======================================================*/
+
+   assignPtr = ParseAtomOrExpression(theEnv,readSource,NULL);
+   if (assignPtr == NULL)
+     {
+      *defglobalError = true;
+      return false;
+     }
+
+   /*==========================*/
+   /* Evaluate the expression. */
+   /*==========================*/
+
+   if (! ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      SetEvaluationError(theEnv,false);
+      if (EvaluateExpression(theEnv,assignPtr,&assignValue))
+        {
+         ReturnExpression(theEnv,assignPtr);
+         *defglobalError = true;
+         return false;
+        }
+     }
+   else
+     { ReturnExpression(theEnv,assignPtr); }
+
+   SavePPBuffer(theEnv,")");
+
+   /*======================================*/
+   /* Add the variable to the global list. */
+   /*======================================*/
+
+   if (! ConstructData(theEnv)->CheckSyntaxMode)
+     { AddDefglobal(theEnv,variableName,&assignValue,assignPtr); }
+
+   /*==================================================*/
+   /* Return true to indicate that the global variable */
+   /* definition was successfully parsed.              */
+   /*==================================================*/
+
+   return true;
+  }
+
+/*********************************************************/
+/* AddDefglobal: Adds a defglobal to the current module. */
+/*********************************************************/
+static void AddDefglobal(
+  Environment *theEnv,
+  CLIPSLexeme *name,
+  UDFValue *vPtr,
+  struct expr *ePtr)
+  {
+   Defglobal *defglobalPtr;
+   bool newGlobal = false;
+#if DEBUGGING_FUNCTIONS
+   bool globalHadWatch = false;
+#endif
+
+   /*========================================================*/
+   /* If the defglobal is already defined, then use the old  */
+   /* data structure and substitute new values. If it hasn't */
+   /* been defined, then create a new data structure.        */
+   /*========================================================*/
+
+   defglobalPtr = QFindDefglobal(theEnv,name);
+   if (defglobalPtr == NULL)
+     {
+      newGlobal = true;
+      defglobalPtr = get_struct(theEnv,defglobal);
+     }
+   else
+     {
+      DeinstallConstructHeader(theEnv,&defglobalPtr->header);
+#if DEBUGGING_FUNCTIONS
+      globalHadWatch = defglobalPtr->watch;
+#endif
+     }
+
+   /*===========================================*/
+   /* Remove the old values from the defglobal. */
+   /*===========================================*/
+
+   if (newGlobal == false)
+     {
+      Release(theEnv,defglobalPtr->current.header);
+      if (defglobalPtr->current.header->type == MULTIFIELD_TYPE)
+        { ReturnMultifield(theEnv,defglobalPtr->current.multifieldValue); }
+
+      RemoveHashedExpression(theEnv,defglobalPtr->initial);
+     }
+
+   /*=======================================*/
+   /* Copy the new values to the defglobal. */
+   /*=======================================*/
+
+   if (vPtr->header->type != MULTIFIELD_TYPE)
+     { defglobalPtr->current.value = vPtr->value; }
+   else
+     { defglobalPtr->current.value = CopyMultifield(theEnv,vPtr->multifieldValue); }
+   Retain(theEnv,defglobalPtr->current.header);
+
+   defglobalPtr->initial = AddHashedExpression(theEnv,ePtr);
+   ReturnExpression(theEnv,ePtr);
+   DefglobalData(theEnv)->ChangeToGlobals = true;
+
+   /*=================================*/
+   /* Restore the old watch value to  */
+   /* the defglobal if redefined.     */
+   /*=================================*/
+
+#if DEBUGGING_FUNCTIONS
+   defglobalPtr->watch = globalHadWatch ? true : DefglobalData(theEnv)->WatchGlobals;
+#endif
+
+   /*======================================*/
+   /* Save the name and pretty print form. */
+   /*======================================*/
+
+   defglobalPtr->header.name = name;
+   defglobalPtr->header.usrData = NULL;
+   defglobalPtr->header.constructType = DEFGLOBAL;
+   defglobalPtr->header.env = theEnv;
+   IncrementLexemeCount(name);
+
+   SavePPBuffer(theEnv,"\n");
+   if (GetConserveMemory(theEnv) == true)
+     { defglobalPtr->header.ppForm = NULL; }
+   else
+     { defglobalPtr->header.ppForm = CopyPPBuffer(theEnv); }
+
+   defglobalPtr->inScope = true;
+
+   /*=============================================*/
+   /* If the defglobal was redefined, we're done. */
+   /*=============================================*/
+
+   if (newGlobal == false) return;
+
+   /*===================================*/
+   /* Copy the defglobal variable name. */
+   /*===================================*/
+
+   defglobalPtr->busyCount = 0;
+   defglobalPtr->header.whichModule = (struct defmoduleItemHeader *)
+                               GetModuleItem(theEnv,NULL,FindModuleItem(theEnv,"defglobal")->moduleIndex);
+
+   /*=============================================*/
+   /* Add the defglobal to the list of defglobals */
+   /* for the current module.                     */
+   /*=============================================*/
+
+   AddConstructToModule(&defglobalPtr->header);
+  }
+
+/*****************************************************************/
+/* ReplaceGlobalVariable: Replaces a global variable found in an */
+/*   expression with the appropriate primitive data type which   */
+/*   can later be used to retrieve the global variable's value.  */
+/*****************************************************************/
+bool ReplaceGlobalVariable(
+  Environment *theEnv,
+  struct expr *ePtr)
+  {
+   Defglobal *theGlobal;
+   unsigned int count;
+
+   /*=================================*/
+   /* Search for the global variable. */
+   /*=================================*/
+
+   theGlobal = (Defglobal *)
+               FindImportedConstruct(theEnv,"defglobal",NULL,ePtr->lexemeValue->contents,
+                                     &count,true,NULL);
+
+   /*=============================================*/
+   /* If it wasn't found, print an error message. */
+   /*=============================================*/
+
+   if (theGlobal == NULL)
+     {
+      GlobalReferenceErrorMessage(theEnv,ePtr->lexemeValue->contents);
+      return false;
+     }
+
+   /*========================================================*/
+   /* The current implementation of the defmodules shouldn't */
+   /* allow a construct to be defined which would cause an   */
+   /* ambiguous reference, but we'll check for it anyway.    */
+   /*========================================================*/
+
+   if (count > 1)
+     {
+      AmbiguousReferenceErrorMessage(theEnv,"defglobal",ePtr->lexemeValue->contents);
+      return false;
+     }
+
+   /*==============================================*/
+   /* Replace the symbolic reference of the global */
+   /* variable with a direct pointer reference.    */
+   /*==============================================*/
+
+   ePtr->type = DEFGLOBAL_PTR;
+   ePtr->value = theGlobal;
+
+   return true;
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+/*****************************************************************/
+/* GlobalReferenceErrorMessage: Prints an error message when a   */
+/*   symbolic reference to a global variable cannot be resolved. */
+/*****************************************************************/
+void GlobalReferenceErrorMessage(
+  Environment *theEnv,
+  const char *variableName)
+  {
+   PrintErrorID(theEnv,"GLOBLPSR",1,true);
+   WriteString(theEnv,STDERR,"\nGlobal variable ?*");
+   WriteString(theEnv,STDERR,variableName);
+   WriteString(theEnv,STDERR,"* was referenced, but is not defined.\n");
+  }
+
+#endif /* DEFGLOBAL_CONSTRUCT */
+
+
+
diff --git a/clips/globlpsr.h b/clips/globlpsr.h
new file mode 100755
index 000000000..b9eef1af3
--- /dev/null
+++ b/clips/globlpsr.h
@@ -0,0 +1,59 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*             DEFGLOBAL PARSER HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Made the construct redefinition message more   */
+/*            prominent.                                     */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Moved WatchGlobals global to defglobalData.    */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_globlpsr
+
+#pragma once
+
+#define _H_globlpsr
+
+#include "expressn.h"
+
+   bool                    ParseDefglobal(Environment *,const char *);
+   bool                    ReplaceGlobalVariable(Environment *,struct expr *);
+   void                    GlobalReferenceErrorMessage(Environment *,const char *);
+
+#endif /* _H_globlpsr */
+
+
+
diff --git a/clips/immthpsr.c b/clips/immthpsr.c
new file mode 100755
index 000000000..d54ef349f
--- /dev/null
+++ b/clips/immthpsr.c
@@ -0,0 +1,431 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*         IMPLICIT SYSTEM METHODS PARSING MODULE      */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parsing routines for Implicit System Methods     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Added pragmas to remove unused parameter       */
+/*            warnings.                                      */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Changed restrictions from char * to            */
+/*            CLIPSLexeme * to support strings               */
+/*            originating from sources that are not          */
+/*            statically allocated.                          */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFGENERIC_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#include <stdlib.h>
+
+#if OBJECT_SYSTEM
+#include "classcom.h"
+#include "classfun.h"
+#endif
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "extnfunc.h"
+#include "genrcpsr.h"
+#include "memalloc.h"
+#include "prccode.h"
+
+#include "immthpsr.h"
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+   static void                    FormMethodsFromRestrictions(Environment *,Defgeneric *,struct functionDefinition *,Expression *);
+   static RESTRICTION            *ParseRestrictionType(Environment *,unsigned);
+   static Expression             *GenTypeExpression(Environment *,Expression *,int,int,const char *);
+   static Expression             *ParseRestrictionCreateTypes(Environment *,CONSTRAINT_RECORD *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/********************************************************
+  NAME         : AddImplicitMethods
+  DESCRIPTION  : Adds a method(s) for a generic function
+                   for an overloaded system function
+  INPUTS       : A pointer to a gneeric function
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Method added
+  NOTES        : Method marked as system
+                 Assumes no other methods already present
+ ********************************************************/
+void AddImplicitMethods(
+  Environment *theEnv,
+  Defgeneric *gfunc)
+  {
+   struct functionDefinition *sysfunc;
+   Expression action;
+
+   sysfunc = FindFunction(theEnv,gfunc->header.name->contents);
+   if (sysfunc == NULL)
+     return;
+   action.type = FCALL;
+   action.value = sysfunc;
+   action.nextArg = NULL;
+   action.argList = NULL;
+   FormMethodsFromRestrictions(theEnv,gfunc,sysfunc,&action);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/**********************************************************************
+  NAME         : FormMethodsFromRestrictions
+  DESCRIPTION  : Uses restriction string given in DefineFunction2()
+                   for system function to create an equivalent method
+  INPUTS       : 1) The generic function for the new methods
+                 2) System function restriction string
+                    (see DefineFunction2() last argument)
+                 3) The actions to attach to a new method(s)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Implicit method(s) created
+  NOTES        : None
+ **********************************************************************/
+static void FormMethodsFromRestrictions(
+  Environment *theEnv,
+  Defgeneric *gfunc,
+  struct functionDefinition *sysfunc,
+  Expression *actions)
+  {
+   Defmethod *meth;
+   Expression *plist,*tmp,*bot,*svBot;
+   RESTRICTION *rptr;
+   unsigned defaultc2, argRestriction2;
+   int mposn;
+   unsigned short min, max;
+   bool needMinimumMethod;
+   unsigned short i;
+   const char *rstring;
+
+   if (sysfunc->restrictions == NULL)
+     { rstring = NULL; }
+   else
+     { rstring = sysfunc->restrictions->contents; }
+
+   /*================================*/
+   /* Extract the range of arguments */
+   /* from the restriction string.   */
+   /*================================*/
+
+   min = sysfunc->minArgs;
+   max = sysfunc->maxArgs;
+   PopulateRestriction(theEnv,&defaultc2,ANY_TYPE_BITS,rstring,0);
+
+   /*==================================================*/
+   /* Form a list of method restrictions corresponding */
+   /* to the minimum number of arguments.              */
+   /*==================================================*/
+
+   plist = bot = NULL;
+   for (i = 0 ; i < min ; i++)
+     {
+      PopulateRestriction(theEnv,&argRestriction2,defaultc2,rstring,i+1);
+      rptr = ParseRestrictionType(theEnv,argRestriction2);
+      tmp = get_struct(theEnv,expr);
+      tmp->argList = (Expression *) rptr;
+      tmp->nextArg = NULL;
+      if (plist == NULL)
+        plist = tmp;
+      else
+        bot->nextArg = tmp;
+      bot = tmp;
+     }
+
+   /*==================================*/
+   /* Remember where restrictions end  */
+   /* for minimum number of arguments. */
+   /*==================================*/
+
+   svBot = bot;
+   needMinimumMethod = true;
+
+   /*=====================================================*/
+   /* Attach one or more new methods to correspond to the */
+   /* possible variations of the extra arguments. Add a   */
+   /* separate method for each specified extra argument.  */
+   /*=====================================================*/
+
+   i = 0;
+   while (RestrictionExists(rstring,min+i+1))
+     {
+      if ((min + i + 1) == max)
+        {
+         if (! RestrictionExists(rstring,min+i+2))
+           {
+            PopulateRestriction(theEnv,&defaultc2,ANY_TYPE_BITS,rstring,min+i+1);
+            break;
+           }
+        }
+
+      PopulateRestriction(theEnv,&argRestriction2,defaultc2,rstring,min+i+1);
+      rptr = ParseRestrictionType(theEnv,argRestriction2);
+
+      tmp = get_struct(theEnv,expr);
+      tmp->argList = (Expression *) rptr;
+      tmp->nextArg = NULL;
+      if (plist == NULL)
+        plist = tmp;
+      else
+        bot->nextArg = tmp;
+      bot = tmp;
+      i++;
+      if (RestrictionExists(rstring,min+i+1) ||
+          ((min + i) == max))
+        {
+         FindMethodByRestrictions(gfunc,plist,min + i,NULL,&mposn);
+         meth = AddMethod(theEnv,gfunc,NULL,mposn,0,plist,min + i,0,NULL,
+                          PackExpression(theEnv,actions),NULL,true);
+         meth->system = 1;
+        }
+     }
+
+   /*================================================*/
+   /* Add a method to account for wildcard arguments */
+   /* and attach a query in case there is a limit.   */
+   /*================================================*/
+
+   if ((min + i) != max)
+     {
+      /*==================================================*/
+      /* If a wildcard is present immediately after the   */
+      /* minimum number of args - then the minimum case   */
+      /* will already be handled by this method. We don't */
+      /* need to add an extra method for that case.       */
+      /*==================================================*/
+
+      if (i == 0)
+        { needMinimumMethod = false; }
+
+      rptr = ParseRestrictionType(theEnv,defaultc2);
+
+      if (max != UNBOUNDED)
+        {
+         rptr->query = GenConstant(theEnv,FCALL,FindFunction(theEnv,"<="));
+         rptr->query->argList = GenConstant(theEnv,FCALL,FindFunction(theEnv,"length$"));
+         rptr->query->argList->argList = GenProcWildcardReference(theEnv,min + i + 1);
+         rptr->query->argList->nextArg =
+               GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,(long long) (max - min - i)));
+        }
+      tmp = get_struct(theEnv,expr);
+      tmp->argList = (Expression *) rptr;
+      tmp->nextArg = NULL;
+      if (plist == NULL)
+        plist = tmp;
+      else
+        bot->nextArg = tmp;
+      FindMethodByRestrictions(gfunc,plist,min + i + 1,TrueSymbol(theEnv),&mposn);
+      meth = AddMethod(theEnv,gfunc,NULL,mposn,0,plist,min + i + 1,0,TrueSymbol(theEnv),
+                       PackExpression(theEnv,actions),NULL,false);
+      meth->system = 1;
+     }
+
+   /*=====================================================*/
+   /* When extra methods had to be added because of       */
+   /* different restrictions on the optional arguments OR */
+   /* the system function accepts a fixed number of args, */
+   /* we must add a specific method for the minimum case. */
+   /* Otherwise, the method with the wildcard covers it.  */
+   /*=====================================================*/
+
+   if (needMinimumMethod)
+     {
+      if (svBot != NULL)
+        {
+         bot = svBot->nextArg;
+         svBot->nextArg = NULL;
+         DeleteTempRestricts(theEnv,bot);
+        }
+      FindMethodByRestrictions(gfunc,plist,min,NULL,&mposn);
+      meth = AddMethod(theEnv,gfunc,NULL,mposn,0,plist,min,0,NULL,
+                       PackExpression(theEnv,actions),NULL,true);
+      meth->system = 1;
+     }
+   DeleteTempRestricts(theEnv,plist);
+  }
+
+/*******************************/
+/* ParseRestrictionCreateTypes */
+/*******************************/
+static Expression *ParseRestrictionCreateTypes(
+  Environment *theEnv,
+  CONSTRAINT_RECORD *rv)
+  {
+   Expression *types = NULL;
+
+   if (rv->anyAllowed == false)
+     {
+      if (rv->symbolsAllowed && rv->stringsAllowed)
+        types = GenTypeExpression(theEnv,types,LEXEME_TYPE_CODE,-1,LEXEME_TYPE_NAME);
+      else if (rv->symbolsAllowed)
+        types = GenTypeExpression(theEnv,types,SYMBOL_TYPE,SYMBOL_TYPE,NULL);
+      else if (rv->stringsAllowed)
+        types = GenTypeExpression(theEnv,types,STRING_TYPE,STRING_TYPE,NULL);
+
+      if (rv->floatsAllowed && rv->integersAllowed)
+        types = GenTypeExpression(theEnv,types,NUMBER_TYPE_CODE,-1,NUMBER_TYPE_NAME);
+      else if (rv->integersAllowed)
+        types = GenTypeExpression(theEnv,types,INTEGER_TYPE,INTEGER_TYPE,NULL);
+      else if (rv->floatsAllowed)
+        types = GenTypeExpression(theEnv,types,FLOAT_TYPE,FLOAT_TYPE,NULL);
+
+      if (rv->instanceNamesAllowed && rv->instanceAddressesAllowed)
+        types = GenTypeExpression(theEnv,types,INSTANCE_TYPE_CODE,-1,INSTANCE_TYPE_NAME);
+      else if (rv->instanceNamesAllowed)
+        types = GenTypeExpression(theEnv,types,INSTANCE_NAME_TYPE,INSTANCE_NAME_TYPE,NULL);
+      else if (rv->instanceAddressesAllowed)
+        types = GenTypeExpression(theEnv,types,INSTANCE_ADDRESS_TYPE,INSTANCE_ADDRESS_TYPE,NULL);
+
+      if (rv->externalAddressesAllowed && rv->instanceAddressesAllowed &&
+          rv->factAddressesAllowed)
+        types = GenTypeExpression(theEnv,types,ADDRESS_TYPE_CODE,-1,ADDRESS_TYPE_NAME);
+      else
+        {
+         if (rv->externalAddressesAllowed)
+           types = GenTypeExpression(theEnv,types,EXTERNAL_ADDRESS_TYPE,EXTERNAL_ADDRESS_TYPE,NULL);
+         if (rv->instanceAddressesAllowed && (rv->instanceNamesAllowed == 0))
+           types = GenTypeExpression(theEnv,types,INSTANCE_ADDRESS_TYPE,INSTANCE_ADDRESS_TYPE,NULL);
+         if (rv->factAddressesAllowed)
+           types = GenTypeExpression(theEnv,types,FACT_ADDRESS_TYPE,FACT_ADDRESS_TYPE,NULL);
+        }
+
+      if (rv->multifieldsAllowed)
+        types = GenTypeExpression(theEnv,types,MULTIFIELD_TYPE,MULTIFIELD_TYPE,NULL);
+     }
+
+   return(types);
+   }
+
+/*******************************************************************
+  NAME         : ParseRestrictionType
+  DESCRIPTION  : Takes a string of type character codes (as given in
+                 DefineFunction2()) and converts it into a method
+                 restriction structure
+  INPUTS       : The type character code
+  RETURNS      : The restriction
+  SIDE EFFECTS : Restriction allocated
+  NOTES        : None
+ *******************************************************************/
+static RESTRICTION *ParseRestrictionType(
+  Environment *theEnv,
+  unsigned code)
+  {
+   RESTRICTION *rptr;
+   CONSTRAINT_RECORD *rv;
+   Expression *types = NULL;
+
+   rptr = get_struct(theEnv,restriction);
+   rptr->query = NULL;
+   rv = ArgumentTypeToConstraintRecord(theEnv,code);
+
+   types = ParseRestrictionCreateTypes(theEnv,rv);
+   RemoveConstraint(theEnv,rv);
+   PackRestrictionTypes(theEnv,rptr,types);
+   return(rptr);
+  }
+
+/***************************************************
+  NAME         : GenTypeExpression
+  DESCRIPTION  : Creates an expression corresponding
+                 to the type specified and adds it
+                 to the front of a temporary type
+                 list for a method restriction
+  INPUTS       : 1) The top of the current type list
+                 2) The type code when COOL is
+                    not installed
+                 3) The primitive type (-1 if not
+                    a primitive type)
+                 4) The name of the COOL class if
+                    it is not a primitive type
+  RETURNS      : The new top of the types list
+  SIDE EFFECTS : Type node allocated and attached
+  NOTES        : Restriction types in a non-COOL
+                 environment are the type codes
+                 given in CONSTANT.H.  In a COOL
+                 environment, they are pointers
+                 to classes
+ ***************************************************/
+static Expression *GenTypeExpression(
+  Environment *theEnv,
+  Expression *top,
+  int nonCOOLCode,
+  int primitiveCode,
+  const char *COOLName)
+  {
+#if OBJECT_SYSTEM
+#if MAC_XCD
+#pragma unused(nonCOOLCode)
+#endif
+#else
+#if MAC_XCD
+#pragma unused(primitiveCode)
+#pragma unused(COOLName)
+#endif
+#endif
+   Expression *tmp;
+
+#if OBJECT_SYSTEM
+   if (primitiveCode != -1)
+     tmp = GenConstant(theEnv,0,DefclassData(theEnv)->PrimitiveClassMap[primitiveCode]);
+   else
+     tmp = GenConstant(theEnv,0,LookupDefclassByMdlOrScope(theEnv,COOLName));
+#else
+   tmp = GenConstant(theEnv,0,CreateInteger(theEnv,nonCOOLCode));
+#endif
+   tmp->nextArg = top;
+   return(tmp);
+  }
+
+#endif /* DEFGENERIC_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME) */
+
diff --git a/clips/immthpsr.h b/clips/immthpsr.h
new file mode 100755
index 000000000..38566e17f
--- /dev/null
+++ b/clips/immthpsr.h
@@ -0,0 +1,55 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_immthpsr
+
+#pragma once
+
+#define _H_immthpsr
+
+#if DEFGENERIC_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#include "genrcfun.h"
+
+   void                           AddImplicitMethods(Environment *,Defgeneric *);
+
+#endif /* DEFGENERIC_CONSTRUCT && (! BLOAD_ONLY) && (! RUN_TIME) */
+
+#endif /* _H_immthpsr */
+
+
+
+
diff --git a/clips/incrrset.c b/clips/incrrset.c
new file mode 100755
index 000000000..486f696a0
--- /dev/null
+++ b/clips/incrrset.c
@@ -0,0 +1,530 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/11/16             */
+   /*                                                     */
+   /*              INCREMENTAL RESET MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functionality for the incremental       */
+/*   reset of the pattern and join networks when a new       */
+/*   rule is added.                                          */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories and    */
+/*            other join network changes.                    */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Modified EnvSetIncrementalReset to check for   */
+/*            the existance of rules.                        */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.31: Fix for slow incremental reset of rule with    */
+/*            several dozen nand joins.                      */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Incremental reset is always enabled.           */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+
+#if DEFRULE_CONSTRUCT
+
+#include "agenda.h"
+#include "argacces.h"
+#include "constant.h"
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "pattern.h"
+#include "router.h"
+#include "reteutil.h"
+
+#include "incrrset.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static void                    MarkNetworkForIncrementalReset(Environment *,Defrule *,bool);
+   static void                    MarkJoinsForIncrementalReset(Environment *,struct joinNode *,bool);
+   static void                    CheckForPrimableJoins(Environment *,Defrule *,struct joinNode *);
+   static void                    PrimeJoinFromLeftMemory(Environment *,struct joinNode *);
+   static void                    PrimeJoinFromRightMemory(Environment *,struct joinNode *);
+   static void                    MarkPatternForIncrementalReset(Environment *,unsigned short,
+                                                                 struct patternNodeHeader *,bool);
+#endif
+
+/**************************************************************/
+/* IncrementalReset: Incrementally resets the specified rule. */
+/**************************************************************/
+void IncrementalReset(
+  Environment *theEnv,
+  Defrule *tempRule)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   Defrule *tempPtr;
+   struct patternParser *theParser;
+
+   /*=====================================================*/
+   /* Mark the pattern and join network data structures   */
+   /* associated with the rule being incrementally reset. */
+   /*=====================================================*/
+
+   MarkNetworkForIncrementalReset(theEnv,tempRule,true);
+
+   /*==========================*/
+   /* Begin incremental reset. */
+   /*==========================*/
+
+   EngineData(theEnv)->IncrementalResetInProgress = true;
+
+   /*============================================================*/
+   /* If the new rule shares patterns or joins with other rules, */
+   /* then it is necessary to update its join network based on   */
+   /* existing partial matches it shares with other rules.       */
+   /*============================================================*/
+
+   for (tempPtr = tempRule;
+        tempPtr != NULL;
+        tempPtr = tempPtr->disjunct)
+     { CheckForPrimableJoins(theEnv,tempPtr,tempPtr->lastJoin); }
+
+   /*===============================================*/
+   /* Filter existing data entities through the new */
+   /* portions of the pattern and join networks.    */
+   /*===============================================*/
+
+   for (theParser = PatternData(theEnv)->ListOfPatternParsers;
+        theParser != NULL;
+        theParser = theParser->next)
+     {
+      if (theParser->incrementalResetFunction != NULL)
+        { (*theParser->incrementalResetFunction)(theEnv); }
+     }
+
+   /*========================*/
+   /* End incremental reset. */
+   /*========================*/
+
+   EngineData(theEnv)->IncrementalResetInProgress = false;
+
+   /*====================================================*/
+   /* Remove the marks in the pattern and join networks. */
+   /*====================================================*/
+
+   MarkNetworkForIncrementalReset(theEnv,tempRule,false);
+#endif
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/**********************************************************************/
+/* MarkNetworkForIncrementalReset: Coordinates marking the initialize */
+/*   flags in the pattern and join networks both before and after an  */
+/*   incremental reset.                                               */
+/**********************************************************************/
+static void MarkNetworkForIncrementalReset(
+  Environment *theEnv,
+  Defrule *tempRule,
+  bool value)
+  {
+   /*============================================*/
+   /* Loop through each of the rule's disjuncts. */
+   /*============================================*/
+
+   for (;
+        tempRule != NULL;
+        tempRule = tempRule->disjunct)
+     { MarkJoinsForIncrementalReset(theEnv,tempRule->lastJoin,value); }
+  }
+
+/**********************************************************************/
+/* MarkJoinsForIncrementalReset: Coordinates marking the initialize */
+/*   flags in the pattern and join networks both before and after an  */
+/*   incremental reset.                                               */
+/**********************************************************************/
+static void MarkJoinsForIncrementalReset(
+  Environment *theEnv,
+  struct joinNode *joinPtr,
+  bool value)
+  {
+   struct patternNodeHeader *patternPtr;
+
+   for (;
+        joinPtr != NULL;
+        joinPtr = GetPreviousJoin(joinPtr))
+     {
+      if (joinPtr->ruleToActivate != NULL)
+        {
+         joinPtr->marked = false;
+         joinPtr->initialize = value;
+         continue;
+        }
+
+      //if (joinPtr->joinFromTheRight)
+      //  { MarkJoinsForIncrementalReset(theEnv,(struct joinNode *) joinPtr->rightSideEntryStructure,value); }
+
+      /*================*/
+      /* Mark the join. */
+      /*================*/
+
+      joinPtr->marked = false; /* GDR 6.05 */
+
+      if (joinPtr->initialize)
+        {
+         joinPtr->initialize = value;
+         if (joinPtr->joinFromTheRight == false)
+           {
+            patternPtr = (struct patternNodeHeader *) GetPatternForJoin(joinPtr);
+            if (patternPtr != NULL)
+              { MarkPatternForIncrementalReset(theEnv,joinPtr->rhsType,patternPtr,value); }
+           }
+        }
+     }
+  }
+
+/*******************************************************************************/
+/* CheckForPrimableJoins: Updates the joins of a rule for an incremental reset */
+/*   if portions of that rule are shared with other rules that have already    */
+/*   been incrementally reset. A join for a new rule will be updated if it is  */
+/*   marked for initialization and either its parent join or its associated    */
+/*   entry pattern node has not been marked for initialization. The function   */
+/*   PrimeJoin is used to update joins which meet these criteria.              */
+/*******************************************************************************/
+static void CheckForPrimableJoins(
+  Environment *theEnv,
+  Defrule *tempRule,
+  struct joinNode *joinPtr)
+  {
+   /*========================================*/
+   /* Loop through each of the rule's joins. */
+   /*========================================*/
+
+   for (;
+        joinPtr != NULL;
+        joinPtr = GetPreviousJoin(joinPtr))
+     {
+      /*===============================*/
+      /* Update the join if necessary. */
+      /*===============================*/
+
+      if ((joinPtr->initialize) && (! joinPtr->marked))
+        {
+         if (joinPtr->firstJoin == true)
+           {
+			if (joinPtr->joinFromTheRight == false)
+              {
+               if ((joinPtr->rightSideEntryStructure == NULL) ||
+                   (joinPtr->patternIsNegated) ||
+                   (((struct patternNodeHeader *) joinPtr->rightSideEntryStructure)->initialize == false))
+                 {
+                  PrimeJoinFromLeftMemory(theEnv,joinPtr);
+                  joinPtr->marked = true;
+                 }
+              }
+            else
+              {
+               PrimeJoinFromRightMemory(theEnv,joinPtr);
+               joinPtr->marked = true;
+              }
+           }
+         else if (joinPtr->lastLevel->initialize == false)
+           {
+            PrimeJoinFromLeftMemory(theEnv,joinPtr);
+            joinPtr->marked = true;
+           }
+         else if ((joinPtr->joinFromTheRight) &&
+                (((struct joinNode *) joinPtr->rightSideEntryStructure)->initialize == false))
+           {
+            PrimeJoinFromRightMemory(theEnv,joinPtr);
+            joinPtr->marked = true;
+           }
+        }
+
+      //if (joinPtr->joinFromTheRight)
+      //  { CheckForPrimableJoins(theEnv,tempRule,(struct joinNode *) joinPtr->rightSideEntryStructure); }
+     }
+  }
+
+/****************************************************************************/
+/* PrimeJoinFromLeftMemory: Updates a join in a rule for an incremental     */
+/*   reset. Joins are updated by "priming" them only if the join (or its    */
+/*   associated pattern) is shared with other rules that have already been  */
+/*   incrementally reset. A join for a new rule will be updated if it is    */
+/*   marked for initialization and either its parent join or its associated */
+/*   entry pattern node has not been marked for initialization.             */
+/****************************************************************************/
+static void PrimeJoinFromLeftMemory(
+  Environment *theEnv,
+  struct joinNode *joinPtr)
+  {
+   struct partialMatch *theList, *linker;
+   struct alphaMemoryHash *listOfHashNodes;
+   unsigned long b;
+   unsigned long hashValue;
+   struct betaMemory *theMemory;
+   struct partialMatch *notParent;
+   struct joinLink *tempLink;
+
+   /*===========================================================*/
+   /* If the join is the first join of a rule, then send all of */
+   /* the partial matches from the alpha memory of the pattern  */
+   /* associated with this join to the join for processing and  */
+   /* the priming process is then complete.                     */
+   /*===========================================================*/
+
+   if (joinPtr->firstJoin == true)
+     {
+      if (joinPtr->rightSideEntryStructure == NULL)
+        { NetworkAssert(theEnv,joinPtr->rightMemory->beta[0],joinPtr); }
+      else if (joinPtr->patternIsNegated)
+        {
+         notParent = joinPtr->leftMemory->beta[0];
+
+         if (joinPtr->secondaryNetworkTest != NULL)
+           {
+            if (EvaluateSecondaryNetworkTest(theEnv,notParent,joinPtr) == false)
+              { return; }
+           }
+
+         for (listOfHashNodes = ((struct patternNodeHeader *) joinPtr->rightSideEntryStructure)->firstHash;
+              listOfHashNodes != NULL;
+              listOfHashNodes = listOfHashNodes->nextHash)
+           {
+            if (listOfHashNodes->alphaMemory != NULL)
+              {
+               AddBlockedLink(notParent,listOfHashNodes->alphaMemory);
+               return;
+              }
+           }
+
+         EPMDrive(theEnv,notParent,joinPtr,NETWORK_ASSERT);
+        }
+      else
+        {
+         for (listOfHashNodes = ((struct patternNodeHeader *) joinPtr->rightSideEntryStructure)->firstHash;
+              listOfHashNodes != NULL;
+              listOfHashNodes = listOfHashNodes->nextHash)
+           {
+            for (theList = listOfHashNodes->alphaMemory;
+                 theList != NULL;
+                 theList = theList->nextInMemory)
+              { NetworkAssert(theEnv,theList,joinPtr); }
+           }
+        }
+      return;
+     }
+
+   /*========================================*/
+   /* Find another beta memory from which we */
+   /* can retrieve the partial matches.      */
+   /*========================================*/
+
+   tempLink = joinPtr->lastLevel->nextLinks;
+
+   while (tempLink != NULL)
+     {
+      if ((tempLink->join != joinPtr) &&
+          (tempLink->join->initialize == false))
+        { break; }
+
+      tempLink = tempLink->next;
+     }
+
+   if (tempLink == NULL) return;
+
+   if (tempLink->enterDirection == LHS)
+     { theMemory = tempLink->join->leftMemory; }
+   else
+     { theMemory = tempLink->join->rightMemory; }
+
+   /*============================================*/
+   /* Send all partial matches from the selected */
+   /* beta memory to the new join.               */
+   /*============================================*/
+
+   for (b = 0; b < theMemory->size; b++)
+     {
+      for (theList = theMemory->beta[b];
+           theList != NULL;
+           theList = theList->nextInMemory)
+        {
+         linker = CopyPartialMatch(theEnv,theList);
+
+         if (joinPtr->leftHash != NULL)
+           { hashValue = BetaMemoryHashValue(theEnv,joinPtr->leftHash,linker,NULL,joinPtr); }
+         else
+           { hashValue = 0; }
+
+         UpdateBetaPMLinks(theEnv,linker,theList->leftParent,theList->rightParent,joinPtr,hashValue,LHS);
+
+         NetworkAssertLeft(theEnv,linker,joinPtr,NETWORK_ASSERT);
+        }
+     }
+  }
+
+/****************************************************************************/
+/* PrimeJoinFromRightMemory: Updates a join in a rule for an incremental    */
+/*   reset. Joins are updated by "priming" them only if the join (or its    */
+/*   associated pattern) is shared with other rules that have already been  */
+/*   incrementally reset. A join for a new rule will be updated if it is    */
+/*   marked for initialization and either its parent join or its associated */
+/*   entry pattern node has not been marked for initialization.             */
+/****************************************************************************/
+static void PrimeJoinFromRightMemory(
+  Environment *theEnv,
+  struct joinNode *joinPtr)
+  {
+   struct partialMatch *theList, *linker;
+   unsigned long b;
+   struct betaMemory *theMemory;
+   unsigned long hashValue;
+   struct joinLink *tempLink;
+   struct partialMatch *notParent;
+
+   /*=======================================*/
+   /* This should be a join from the right. */
+   /*=======================================*/
+
+   if (joinPtr->joinFromTheRight == false)
+     { return; }
+
+   /*========================================*/
+   /* Find another beta memory from which we */
+   /* can retrieve the partial matches.      */
+   /*========================================*/
+
+   tempLink = ((struct joinNode *) joinPtr->rightSideEntryStructure)->nextLinks;
+   while (tempLink != NULL)
+     {
+      if ((tempLink->join != joinPtr) &&
+          (tempLink->join->initialize == false))
+        { break; }
+
+      tempLink = tempLink->next;
+     }
+
+   if (tempLink == NULL)
+     {
+      if (joinPtr->firstJoin &&
+          (joinPtr->rightMemory->beta[0] == NULL) &&
+          (! joinPtr->patternIsExists))
+        {
+         notParent = joinPtr->leftMemory->beta[0];
+
+         if (joinPtr->secondaryNetworkTest != NULL)
+           {
+            if (EvaluateSecondaryNetworkTest(theEnv,notParent,joinPtr) == false)
+              { return; }
+           }
+
+         EPMDrive(theEnv,notParent,joinPtr,NETWORK_ASSERT);
+        }
+
+      return;
+     }
+
+   if (tempLink->enterDirection == LHS)
+     { theMemory = tempLink->join->leftMemory; }
+   else
+     { theMemory = tempLink->join->rightMemory; }
+
+   /*============================================*/
+   /* Send all partial matches from the selected */
+   /* beta memory to the new join.               */
+   /*============================================*/
+
+   for (b = 0; b < theMemory->size; b++)
+     {
+      for (theList = theMemory->beta[b];
+           theList != NULL;
+           theList = theList->nextInMemory)
+        {
+         linker = CopyPartialMatch(theEnv,theList);
+
+         if (joinPtr->rightHash != NULL)
+           { hashValue = BetaMemoryHashValue(theEnv,joinPtr->rightHash,linker,NULL,joinPtr); }
+         else
+           { hashValue = 0; }
+
+         UpdateBetaPMLinks(theEnv,linker,theList->leftParent,theList->rightParent,joinPtr,hashValue,RHS);
+         NetworkAssert(theEnv,linker,joinPtr);
+        }
+     }
+
+   if (joinPtr->firstJoin &&
+       (joinPtr->rightMemory->beta[0] == NULL) &&
+       (! joinPtr->patternIsExists))
+     {
+      notParent = joinPtr->leftMemory->beta[0];
+
+      if (joinPtr->secondaryNetworkTest != NULL)
+        {
+         if (EvaluateSecondaryNetworkTest(theEnv,notParent,joinPtr) == false)
+           { return; }
+        }
+
+      EPMDrive(theEnv,notParent,joinPtr,NETWORK_ASSERT);
+     }
+  }
+
+/*********************************************************************/
+/* MarkPatternForIncrementalReset: Given a pattern node and its type */
+/*   (fact, instance, etc.), calls the appropriate function to mark  */
+/*   the pattern for an incremental reset. Used to mark the pattern  */
+/*   nodes both before and after an incremental reset.               */
+/*********************************************************************/
+static void MarkPatternForIncrementalReset(
+  Environment *theEnv,
+  unsigned short rhsType,
+  struct patternNodeHeader *theHeader,
+  bool value)
+  {
+   struct patternParser *tempParser;
+
+   tempParser = GetPatternParser(theEnv,rhsType);
+
+   if (tempParser != NULL)
+     {
+      if (tempParser->markIRPatternFunction != NULL)
+        { (*tempParser->markIRPatternFunction)(theEnv,theHeader,value); }
+     }
+  }
+
+#endif
+
+#endif /* DEFRULE_CONSTRUCT */
diff --git a/clips/incrrset.h b/clips/incrrset.h
new file mode 100755
index 000000000..4f027f92e
--- /dev/null
+++ b/clips/incrrset.h
@@ -0,0 +1,73 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/11/16            */
+   /*                                                     */
+   /*            INCREMENTAL RESET HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides functionality for the incremental       */
+/*   reset of the pattern and join networks when a new       */
+/*   rule is added.                                          */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories and    */
+/*            other join network changes.                    */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Modified EnvSetIncrementalReset to check for   */
+/*            the existance of rules.                        */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Incremental reset is always enabled.           */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_incrrset
+
+#pragma once
+
+#define _H_incrrset
+
+#include "ruledef.h"
+
+   void                           IncrementalReset(Environment *,Defrule *);
+
+#endif /* _H_incrrset */
+
+
+
+
+
+
+
+
+
diff --git a/clips/inherpsr.c b/clips/inherpsr.c
new file mode 100755
index 000000000..e585c2b5c
--- /dev/null
+++ b/clips/inherpsr.c
@@ -0,0 +1,850 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*             MULTIPLE INHERITANCE PARSER MODULE      */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parsing Routines for Multiple Inheritance        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#include "classcom.h"
+#include "classfun.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+
+#include "inherpsr.h"
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+typedef struct partialOrder PARTIAL_ORDER;
+typedef struct successor SUCCESSOR;
+
+struct partialOrder
+  {
+   Defclass *cls;
+   unsigned pre;
+   SUCCESSOR *suc;
+   struct partialOrder *nxt;
+  };
+
+struct successor
+  {
+   PARTIAL_ORDER *po;
+   struct successor *nxt;
+  };
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static PARTIAL_ORDER          *InitializePartialOrderTable(Environment *,PARTIAL_ORDER *,PACKED_CLASS_LINKS *);
+   static void                    RecordPartialOrders(Environment *,PARTIAL_ORDER *,Defclass *,
+                                                      PACKED_CLASS_LINKS *,unsigned long);
+   static PARTIAL_ORDER          *FindPartialOrder(PARTIAL_ORDER *,Defclass *);
+   static void                    PrintPartialOrderLoop(Environment *,PARTIAL_ORDER *);
+   static void                    PrintClassLinks(Environment *,const char *,const char *,CLASS_LINK *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/**************************************************************
+  NAME         : ParseSuperclasses
+  DESCRIPTION  : Parses the (is-a <superclass>+) portion of
+                 the (defclass ...) construct and returns
+                 a list of direct superclasses.  The
+                 class "standard-class" is the precedence list
+                 for classes with no direct superclasses.
+                 The final precedence list (not calculated here)
+                 will have the class in question first followed
+                 by the merged precedence lists of its direct
+                 superclasses.
+  INPUTS       : 1) The logical name of the input source
+                 2) The symbolic name of the new class
+  RETURNS      : The address of the superclass list
+                  or NULL if there was an error
+  SIDE EFFECTS : None
+  NOTES        : Assumes "(defclass <name> [<comment>] ("
+                 has already been scanned.
+
+                 All superclasses must be defined before
+                 their subclasses.  Duplicates in the (is-a
+                 ...) list are are not allowed (a class may only
+                 inherits from a superclass once).
+
+                 This routine also checks the class-precedence
+                 lists of each of the direct superclasses for
+                 an occurrence of the new class - i.e. cycles!
+                 This can only happen when a class is redefined
+                 (a new class cannot have an unspecified
+                 superclass).
+
+                 This routine allocates the space for the list
+ ***************************************************************/
+PACKED_CLASS_LINKS *ParseSuperclasses(
+  Environment *theEnv,
+  const char *readSource,
+  CLIPSLexeme *newClassName)
+  {
+   CLASS_LINK *clink = NULL,*cbot = NULL,*ctmp;
+   Defclass *sclass;
+   PACKED_CLASS_LINKS *plinks;
+
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"defclass inheritance");
+      return NULL;
+     }
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   if ((DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN) ? true :
+       (DefclassData(theEnv)->ObjectParseToken.value != (void *) DefclassData(theEnv)->ISA_SYMBOL))
+     {
+      SyntaxErrorMessage(theEnv,"defclass inheritance");
+      return NULL;
+     }
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   while (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"defclass");
+         goto SuperclassParseError;
+        }
+      if (FindModuleSeparator(newClassName->contents))
+        {
+         IllegalModuleSpecifierMessage(theEnv);
+         goto SuperclassParseError;
+        }
+      if (DefclassData(theEnv)->ObjectParseToken.value == (void *) newClassName)
+        {
+         PrintErrorID(theEnv,"INHERPSR",1,false);
+         WriteString(theEnv,STDERR,"A class may not have itself as a superclass.\n");
+         goto SuperclassParseError;
+        }
+      for (ctmp = clink ; ctmp != NULL ; ctmp = ctmp->nxt)
+        {
+         if (DefclassData(theEnv)->ObjectParseToken.value == (void *) ctmp->cls->header.name)
+           {
+            PrintErrorID(theEnv,"INHERPSR",2,false);
+            WriteString(theEnv,STDERR,"A class may inherit from a superclass only once.\n");
+            goto SuperclassParseError;
+           }
+        }
+      sclass = LookupDefclassInScope(theEnv,DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents);
+      if (sclass == NULL)
+        {
+         PrintErrorID(theEnv,"INHERPSR",3,false);
+         WriteString(theEnv,STDERR,"A class must be defined after all its superclasses.\n");
+         goto SuperclassParseError;
+        }
+      if ((sclass == DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_NAME_TYPE]) ||
+          (sclass == DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_ADDRESS_TYPE]) ||
+          (sclass == DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_NAME_TYPE]->directSuperclasses.classArray[0]))
+        {
+         PrintErrorID(theEnv,"INHERPSR",6,false);
+         WriteString(theEnv,STDERR,"A user-defined class cannot be a subclass of '");
+         WriteString(theEnv,STDERR,DefclassName(sclass));
+         WriteString(theEnv,STDERR,"'.\n");
+         goto SuperclassParseError;
+        }
+      ctmp = get_struct(theEnv,classLink);
+      ctmp->cls = sclass;
+      if (clink == NULL)
+        clink = ctmp;
+      else
+        cbot->nxt = ctmp;
+      ctmp->nxt = NULL;
+      cbot = ctmp;
+
+      SavePPBuffer(theEnv," ");
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+     }
+   if (clink == NULL)
+     {
+      PrintErrorID(theEnv,"INHERPSR",4,false);
+      WriteString(theEnv,STDERR,"A class must have at least one superclass.\n");
+      return NULL;
+     }
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+   plinks = get_struct(theEnv,packedClassLinks);
+   PackClassLinks(theEnv,plinks,clink);
+   return(plinks);
+
+SuperclassParseError:
+   DeleteClassLinks(theEnv,clink);
+   return NULL;
+  }
+
+/***************************************************************************
+  NAME         : FindPrecedenceList
+  DESCRIPTION  : A complete class precedence list is obtained from the
+                 list of direct superclasses as follows :
+
+                 Each class and its direct superclasses are recursively
+                 entered in order to a list called the partial order table.
+                 A class is only entered once.  The order reflects a pre-order
+                 depth-first traversal of the classes, and this order will be
+                 followed as closely as possible to preserve the "family"
+                 heuristic when constructing the class precedence list.
+
+                 Attached to each node is a count indicating the number of
+                 classes which must precede this class and a list of classes
+                 which must succeed this class (attached via the suc field and
+                 linked via nxt fields).  These predecessor counts
+                 and successor lists indicate the partial orderings given
+                 by the rules of multiple inheritance for the classes:
+                 1) a class must precede all its superclasses, and 2) a
+                 class determines the precedence of its immediate superclasses.
+
+                 For example, the following class definitions
+
+                 (defclass A (is-a USER))
+                 (defclass B (is-a USER))
+                 (defclass C (is-a A B))
+
+                 would give the following partial orders:
+
+                 C < A          by Rule 1
+                 C < B          by Rule 1
+                 A < B          by Rule 2
+                 B < USER       by Rule 1
+                 A < USER       by Rule 1
+                 USER < OBJECT  by Rule 1
+
+                 In turn, these partial orders would be recorded in a
+                 sequence table:
+
+                                     C     A      USER    OBJECT    B
+                 Predecessor Count   0     1       2        1       2
+                 Successor List     A,B  B,USER  OBJECT   <NIL>    USER
+
+                 To generate a precedence list for C, we pick the first
+                 class with a predecessor count of 0, append it to the
+                 precedence list, and decrement the counts of all its
+                 successors.  We continue scanning for a 0 from where
+                 we left off.  If we ever scan completely through the
+                 table without finding a 0, then we know there is an
+                 error.
+
+                 Shown below is the table above after each class is
+                 entered onto the precedence list:
+
+                 Precedence list: C
+                                     A      USER    OBJECT    B
+                 Predecessor Count   0       2        1       1
+                 Successor List     B,USER  OBJECT   <NIL>    USER
+
+                 Precedence list: C A
+                                    USER    OBJECT    B
+                 Predecessor Count   1        1       0
+                 Successor List     OBJECT   <NIL>   USER
+
+                 Precedence list: C A B
+                                    USER    OBJECT
+                 Predecessor Count   0        1
+                 Successor List     OBJECT   <NIL>
+
+                 Precedence list: C A B USER
+                                    OBJECT
+                 Predecessor Count   0
+                 Successor List     <NIL>
+
+                 Precedence List: C A B USER OBJECT
+
+                 And since the table is now empty we are done!
+  INPUTS       : 1) The old class definition (NULL if it is new)
+                 2) The list of direct superclasses
+  RETURNS      : The address of the precedence list if successful,
+                 NULL otherwise
+  SIDE EFFECTS : Precedence list allocated
+  NOTES        : WARNING!! - This routine assumes that there are no
+                 cyclic dependencies in the given superclass list, i.e.
+                 none of the superclasses inherit from the class for
+                 which the precedence list is being defined.  (This
+                 is verified in ParseDefclasses() in CLASSCOM.C)
+
+                 Every class-precedence list has the class itself on it
+                 (implicitly) and a built-in system class on it explicitly
+                 (except for the built-in classes).
+
+                 The precedence determination algorithm is a variation on
+                 the topological sorting algorithm given in The Art of
+                 Computer Programming - Vol. I (Fundamental Algorithms) by
+                 Donald Knuth.
+ ***************************************************************************/
+PACKED_CLASS_LINKS *FindPrecedenceList(
+  Environment *theEnv,
+  Defclass *cls,
+  PACKED_CLASS_LINKS *supers)
+  {
+   PARTIAL_ORDER *po_table = NULL,*start,*pop,*poprv,*potmp;
+   SUCCESSOR *stmp;
+   CLASS_LINK *ptop,*pbot,*ptmp;
+   PACKED_CLASS_LINKS *plinks;
+   unsigned long i;
+
+   /* =====================================================================
+      Recursively add all superclasses in a pre-order depth-first traversal
+      to the partial order table.  There should be only one node per class.
+      ===================================================================== */
+   po_table = InitializePartialOrderTable(theEnv,po_table,supers);
+
+   /* =============================================================
+      If the class already exists, record the rule 1 partial orders
+      with the new superclass lists.  This is so that cyclic
+      dependencies can be detected.
+      ============================================================= */
+   if (cls != NULL)
+     {
+      pop = get_struct(theEnv,partialOrder);
+      pop->cls = cls;
+      pop->pre = 0;
+      pop->suc = NULL;
+      pop->nxt = po_table;
+      po_table = pop;
+      pop = po_table->nxt;
+      RecordPartialOrders(theEnv,po_table,cls,supers,0);
+     }
+   else
+     pop = po_table;
+
+   /* ==================================================================
+      Record the rule 1 and rule 2 partial orders given by the direct
+      superclass lists of the classes in the table.  There is no need to
+      recurse since all possible classes have been entered already.
+
+      Be sure to skip the class itself if it was added to the front of
+      the table.
+      ================================================================== */
+   for ( ; pop != NULL ; pop = pop->nxt)
+     {
+      RecordPartialOrders(theEnv,po_table,pop->cls,&pop->cls->directSuperclasses,0);
+      for (i = 0 ; i < pop->cls->directSuperclasses.classCount ; i++)
+        RecordPartialOrders(theEnv,po_table,pop->cls->directSuperclasses.classArray[i],
+                            &pop->cls->directSuperclasses,i+1);
+     }
+
+   /* =============================================================
+      Record the rule 2 partial orders given by the superclass list
+      ============================================================= */
+   for (i = 0 ; i < supers->classCount ; i++)
+     RecordPartialOrders(theEnv,po_table,supers->classArray[i],supers,i+1);
+
+   start = NULL;
+   poprv = NULL;
+   pop = po_table;
+   ptop = pbot = NULL;
+   while (pop != start)
+     {
+      /* ==============================================================
+         Allow wraparound - happens when the search for a 0 node begins
+         somewhere in the middle of the sequence table
+         ============================================================== */
+      if (pop == NULL)
+        {
+         poprv = NULL;
+         pop = po_table;
+         start = start->nxt;
+        }
+
+      /* =========================================================
+         Search for the first class with no remaining predecessors
+         ========================================================= */
+      if (pop->pre == 0)
+        {
+         /* =================================================
+            Decrement the predecessor count for all the
+            successors of this class and delete the list.
+
+            This is the variation on Knuth's algorithm which
+            allows us to preserve the "family" heuristic.
+            Since we will pick up scanning for 0's from
+            this point, we will be able to keep "family"
+            trees together, if possible. BuildPartialOrders()
+            entered the classes into the sequence table
+            in a pre-order depth traversal order.
+            ================================================= */
+         while (pop->suc != NULL)
+           {
+            stmp = pop->suc;
+            pop->suc = stmp->nxt;
+            stmp->po->pre--;
+            rtn_struct(theEnv,successor,stmp);
+           }
+
+         /* =============================================
+            Append the class to the precedence list and
+            remove its entry from the partial order table
+            ============================================= */
+         potmp = pop;
+         if (poprv == NULL)
+           po_table = pop->nxt;
+         else
+           poprv->nxt = pop->nxt;
+         pop = pop->nxt;
+         start = poprv;
+         ptmp = get_struct(theEnv,classLink);
+         ptmp->cls = potmp->cls;
+         ptmp->nxt = NULL;
+         rtn_struct(theEnv,partialOrder,potmp);
+         if (ptop == NULL)
+           ptop = ptmp;
+         else
+           pbot->nxt = ptmp;
+         pbot = ptmp;
+        }
+      else
+        {
+         poprv = pop;
+         pop = pop->nxt;
+        }
+     }
+
+   /* ======================================================================
+      If the table of partial orders is not empty and we were unable to find
+      a class with no predecessors, then there is no solution! Print out the
+      precedence loop in the partial orders. Delete the remaining partial
+      order table and the partial precedence list.
+      ====================================================================== */
+   if (po_table != NULL)
+     {
+      PrintErrorID(theEnv,"INHERPSR",5,false);
+      PrintClassLinks(theEnv,STDERR,"Partial precedence list formed:",ptop);
+      PrintPartialOrderLoop(theEnv,po_table);
+      while (po_table != NULL)
+        {
+         while (po_table->suc != NULL)
+           {
+            stmp = po_table->suc;
+            po_table->suc = stmp->nxt;
+            rtn_struct(theEnv,successor,stmp);
+           }
+         potmp = po_table;
+         po_table = po_table->nxt;
+         rtn_struct(theEnv,partialOrder,potmp);
+        }
+      DeleteClassLinks(theEnv,ptop);
+      return NULL;
+     }
+
+   /* =============================================================================
+      If the class already existed, be sure and remove it from its own precedence
+      list.  Remember that we stuck it on the table artificially to catch cycles.
+      It was first in the table, and, since it started with a predecessor count
+      of zero (given that there were no loops), it is first in the precedence list.
+
+      We will leave the dummy node there so that functions which wish to iterate
+      over a class and its superclasses may easily do so.
+      ============================================================================= */
+   if (cls == NULL)
+     {
+      ptmp = get_struct(theEnv,classLink);
+      ptmp->nxt = ptop;
+      ptop = ptmp;
+     }
+
+   /* ============================================================
+      The class pointer will be filled in later by ParseDefclass()
+      ============================================================ */
+   ptop->cls = NULL;
+
+   plinks = get_struct(theEnv,packedClassLinks);
+   PackClassLinks(theEnv,plinks,ptop);
+   return(plinks);
+  }
+
+/***************************************************
+  NAME         : PackClassLinks
+  DESCRIPTION  : Writes a list of class links into
+                 a contiguous section of memory to
+                 reduce overhead (the original list
+                 is deleted)
+  INPUTS       : 1) The packed list structure to use
+                 2) The top of the original list
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Packed list allocated and old list
+                 deleted
+  NOTES        : None
+ ***************************************************/
+void PackClassLinks(
+  Environment *theEnv,
+  PACKED_CLASS_LINKS *plinks,
+  CLASS_LINK *lptop)
+  {
+   unsigned count;
+   CLASS_LINK *lp;
+
+   for (count = 0 , lp = lptop ; lp != NULL ; lp = lp->nxt)
+     count++;
+   if (count > 0)
+     plinks->classArray = (Defclass **) gm2(theEnv,(sizeof(Defclass *) * count));
+   else
+     plinks->classArray = NULL;
+   for (count = 0 , lp = lptop ; lp != NULL ; lp = lp->nxt , count++)
+     plinks->classArray[count] = lp->cls;
+   DeleteClassLinks(theEnv,lptop);
+   plinks->classCount = count;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/**************************************************************************
+  NAME         : InitializePartialOrderTable
+  DESCRIPTION  : This function recursively enters the classes
+                 that will be used in a precedence list
+                 determination in depth-first pre-order traversal.
+                 The predecessor counts and successor list are initialized.
+
+  INPUTS       : 1) The partial order table
+                 2) A list of direct superclasses
+                 3) The class for which a precedence class is being
+                    determined (NULL for new class)
+                 4) The class which superclass list is being processed
+  RETURNS      : The top of partial order table
+  SIDE EFFECTS : The partial order table is initialized.
+  NOTES        : None
+ **************************************************************************/
+static PARTIAL_ORDER *InitializePartialOrderTable(
+  Environment *theEnv,
+  PARTIAL_ORDER *po_table,
+  PACKED_CLASS_LINKS *supers)
+  {
+   PARTIAL_ORDER *pop,*poprv;
+   unsigned long i;
+
+   for (i = 0 ; i < supers->classCount ; i++)
+     {
+      /* =================================================
+         Append this class at the end of the partial order
+         table only if it is not already present
+         ================================================= */
+      poprv = NULL;
+      for (pop = po_table ; pop != NULL ; pop = pop->nxt)
+        {
+         if (pop->cls == supers->classArray[i])
+           break;
+         poprv = pop;
+        }
+      if (pop == NULL)
+        {
+         pop = get_struct(theEnv,partialOrder);
+         pop->cls = supers->classArray[i];
+         pop->nxt = NULL;
+         pop->suc = NULL;
+         pop->pre = 0;
+         if (poprv == NULL)
+           po_table = pop;
+         else
+           poprv->nxt = pop;
+
+         /* =============================================================
+            Recursively append all its superclasses immediately after it.
+            This order will allow us to preserve the "family" heuristic
+            in the precedence list.
+            ============================================================= */
+         po_table = InitializePartialOrderTable(theEnv,po_table,
+                     &supers->classArray[i]->directSuperclasses);
+        }
+     }
+   return(po_table);
+  }
+
+/***********************************************************************************
+  NAME         : RecordPartialOrders
+  DESCRIPTION  : Given a predecessor class and a list of successor classes, this
+                 function enters a number of partial orders into the table equaling
+                 the number of successor classes.
+  INPUTS       : 1) The partial order table
+                 2) The predecessor class
+                 3) An array of successor classes
+                 4) A starting index for the successor classes
+  RETURNS      : The top of sequence table
+  SIDE EFFECTS : The sequence table is built, e.g.:
+
+                 CLASS1 < CLASS2 , CLASS3
+
+                 would be recorded as:
+
+                 PO_TABLE -> NXT     -> NXT       -> NXT ->   <NIL>
+                             <CLASS1>   <CLASS2>     <CLASS3>
+                             SUC        SUC          SUC
+                              |          |            |
+                              V          V            V
+                             <CLASS2>   <NIL>        <NIL>
+                             NXT
+                              |
+                              V
+                             <CLASS3>
+                             NXT
+                              |
+                              V
+                             <NIL>
+
+                 The predecessor counts would be 0, 1 and 1 for CLASS1, CLASS2
+                 and CLASS3 respectively.
+  NOTES        : None
+ ***********************************************************************************/
+static void RecordPartialOrders(
+  Environment *theEnv,
+  PARTIAL_ORDER *po_table,
+  Defclass *cls,
+  PACKED_CLASS_LINKS *successors,
+  unsigned long starti)
+  {
+   PARTIAL_ORDER *clspo;
+   SUCCESSOR *stmp;
+
+   clspo = FindPartialOrder(po_table,cls);
+   while (starti < successors->classCount)
+     {
+      stmp = get_struct(theEnv,successor);
+      stmp->po = FindPartialOrder(po_table,successors->classArray[starti]);
+      stmp->nxt = clspo->suc;
+      clspo->suc = stmp;
+      stmp->po->pre++;
+      starti++;
+     }
+  }
+
+/***************************************************
+  NAME         : FindPartialOrder
+  DESCRIPTION  : Finds a partial order node
+  INPUTS       : 1) The partial order table
+                 2) The class to look up
+  RETURNS      : The partial order node address
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static PARTIAL_ORDER *FindPartialOrder(
+  PARTIAL_ORDER *po_table,
+  Defclass *cls)
+  {
+   while (po_table != NULL)
+     {
+      if (po_table->cls == cls)
+        break;
+      po_table = po_table->nxt;
+     }
+   return(po_table);
+  }
+
+/**************************************************************************
+  NAME         : PrintPartialOrderLoop
+  DESCRIPTION  : This routine prints a conflicting loop (there may be more
+                 than one) in the given sequence table of partial orders.
+
+                 The algorithm works as follows:
+
+                 Given the following class definitions,
+
+                 (defclass A (is-a USER))
+                 (defclass B (is-a USER))
+                 (defclass C (is-a A B))
+                 (defclass D (is-a B A))
+                 (defclass E (is-a C D))
+
+                 the partial order table will look as follows after as many
+                 classes as possible have been entered onto the precedence
+                 list:
+
+                                      A      USER    OBJECT   B
+                 Predecessor Count    1       2        1      1
+                 Successor List     B,USER  OBJECT   <NIL>   A,USER
+
+                 Construct a new table where each class is linked to one
+                 of its predecessors.  For the example above one would be:
+
+                 Class:            A    USER    OBJECT    B
+                 Predecessor:      B      A      USER     A
+
+                 This table is actually implemnted using the original
+                 partial order table (see the code below for specifics).
+                 Now using this table, start with the first node, and visit
+                 successive nodes by following the predecessor links.  Mark
+                 each node as "visited".  When a previously visited node is
+                 encountered, the loop has been found.
+
+                 In the case above, we start with A, goto B and then goto A
+                 again which we have already seen.  So starting from where
+                 we found the loop (A) we follow the links again, printing
+                 the nodes as we go, until we're back where we started:
+                 A B A.  Notice that this loop reflects the Rule 2 conflicts
+                 between Class C and Class D in Class E's precedence list.
+
+  INPUTS       : The remaining partial order table of conflicting partial
+                 orders
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The predecessor counts and successor lists are modified to
+                 implement the loop detection.
+  NOTES        : This algorithm is adopted from one  given in Donald
+                 Knuth's The Art of Computer Programming - Vol. I
+                 (Fundamental Algorithms).
+ **************************************************************************/
+static void PrintPartialOrderLoop(
+  Environment *theEnv,
+  PARTIAL_ORDER *po_table)
+  {
+   PARTIAL_ORDER *pop1,*pop2;
+   SUCCESSOR *prc,*stmp;
+
+   /* ====================================================
+      Set the predecessor count of every node to 0 so that
+      this field can be used as a marker
+      ==================================================== */
+   for (pop1 = po_table ; pop1 != NULL ; pop1 = pop1->nxt)
+     pop1->pre = 0;
+
+   /* =======================================================
+      Mark each node in the partial order table with one of
+      its predecessors.  If the class has already been marked
+      (predecessor count > 0), don't bother.  This is
+      accomplished by adding a node to the front of its
+      successors' successor lists.
+
+      When the process is finished, all nodes will have one
+      predecessor chained to them by their 'suc' field.
+      (If any nodes had had no predecessors, they would not
+       still be in the table.)
+      ======================================================= */
+   for (pop1 = po_table ; pop1 != NULL ; pop1 = pop1->nxt)
+     {
+      if (pop1->pre == 0)
+        {
+         prc = pop1->suc;
+         pop1->suc = NULL;
+        }
+      else
+        {
+         prc = pop1->suc->nxt;
+         pop1->suc->nxt = NULL;
+        }
+      while (prc != NULL)
+        {
+         pop2 = FindPartialOrder(po_table,prc->po->cls);
+         if (pop2->pre == 0)
+           {
+            stmp = get_struct(theEnv,successor);
+            stmp->po = pop1;
+            stmp->nxt = pop2->suc;
+            pop2->suc = stmp;
+            pop2->pre = 1;
+           }
+         stmp = prc;
+         prc = prc->nxt;
+         rtn_struct(theEnv,successor,stmp);
+        }
+     }
+
+   /* =================================================
+      Set the predecessor count of every node back to 0
+      so that this field can be used as a marker again
+      ================================================= */
+   for (pop1 = po_table ; pop1 != NULL ; pop1 = pop1->nxt)
+     pop1->pre = 0;
+
+   /* =========================================================
+      Now start with the first node in the partial order table,
+      and follow the predecessor links, marking the
+      nodes as they are visited.  When we reach a node
+      we have been before, we have found a loop!
+      Follow all the marked nodes again  starting from the
+      CURRENT position to print the loop.
+      ========================================================= */
+   pop1 = po_table;
+   while (pop1->pre == 0)
+     {
+      pop1->pre = 1;
+      pop1 = pop1->suc->po;
+     }
+
+   WriteString(theEnv,STDERR,"Precedence loop in superclasses:");
+   while (pop1->pre == 1)
+     {
+      WriteString(theEnv,STDERR," ");
+      PrintClassName(theEnv,STDERR,pop1->cls,false,false);
+      pop1->pre = 0;
+      pop1 = pop1->suc->po;
+     }
+   WriteString(theEnv,STDERR," ");
+   PrintClassName(theEnv,STDERR,pop1->cls,false,true);
+  }
+
+/***************************************************
+  NAME         : PrintClassLinks
+  DESCRIPTION  : Displays the names of classes in
+                 a list with a title
+  INPUTS       : 1) The logical name of the output
+                 2) Title string
+                 3) List of class links
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static void PrintClassLinks(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *title,
+  CLASS_LINK *clink)
+  {
+   if (title != NULL)
+     WriteString(theEnv,logicalName,title);
+   while (clink != NULL)
+     {
+      WriteString(theEnv,logicalName," ");
+      PrintClassName(theEnv,logicalName,clink->cls,false,false);
+      clink = clink->nxt;
+     }
+   WriteString(theEnv,logicalName,"\n");
+  }
+
+#endif
+
diff --git a/clips/inherpsr.h b/clips/inherpsr.h
new file mode 100755
index 000000000..d10d58a89
--- /dev/null
+++ b/clips/inherpsr.h
@@ -0,0 +1,52 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_inherpsr
+
+#pragma once
+
+#define _H_inherpsr
+
+#if OBJECT_SYSTEM && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#include "object.h"
+
+   PACKED_CLASS_LINKS            *ParseSuperclasses(Environment *,const char *,CLIPSLexeme *);
+   PACKED_CLASS_LINKS            *FindPrecedenceList(Environment *,Defclass *,PACKED_CLASS_LINKS *);
+   void                           PackClassLinks(Environment *,PACKED_CLASS_LINKS *,CLASS_LINK *);
+
+#endif /* OBJECT_SYSTEM && (! BLOAD_ONLY) && (! RUN_TIME) */
+
+#endif /* _H_inherpsr */
+
+
+
diff --git a/clips/inscom.c b/clips/inscom.c
new file mode 100755
index 000000000..7f6382091
--- /dev/null
+++ b/clips/inscom.c
@@ -0,0 +1,2053 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  01/15/18             */
+   /*                                                     */
+   /*               INSTANCE COMMAND MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  Kernel Interface Commands for Instances         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Loading a binary instance file from a run-time */
+/*            program caused a bus error. DR0866             */
+/*                                                           */
+/*            Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.31: Fast router used for MakeInstance.             */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include "argacces.h"
+#include "classcom.h"
+#include "classfun.h"
+#include "classinf.h"
+#include "commline.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "evaluatn.h"
+#include "insfile.h"
+#include "insfun.h"
+#include "insmngr.h"
+#include "insmoddp.h"
+#include "insmult.h"
+#include "inspsr.h"
+#include "lgcldpnd.h"
+#include "memalloc.h"
+#include "msgcom.h"
+#include "msgfun.h"
+#include "prntutil.h"
+#include "router.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "inscom.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define ALL_QUALIFIER      "inherit"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if DEBUGGING_FUNCTIONS
+   static unsigned long           ListInstancesInModule(Environment *,int,const char *,const char *,bool,bool);
+   static unsigned long           TabulateInstances(Environment *,int,const char *,Defclass *,bool,bool);
+#endif
+
+   static void                    PrintInstance(Environment *,const char *,Instance *,const char *);
+   static InstanceSlot           *FindISlotByName(Environment *,Instance *,const char *);
+   static void                    DeallocateInstanceData(Environment *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*********************************************************
+  NAME         : SetupInstances
+  DESCRIPTION  : Initializes instance Hash Table,
+                   Function Parsers, and Data Structures
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************************/
+void SetupInstances(
+  Environment *theEnv)
+  {
+   struct patternEntityRecord instanceInfo = { { "INSTANCE_ADDRESS_TYPE",
+                                                     INSTANCE_ADDRESS_TYPE,0,0,0,
+                                                     (EntityPrintFunction *) PrintInstanceName,
+                                                     (EntityPrintFunction *) PrintInstanceLongForm,
+                                                     (bool (*)(void *,Environment *)) UnmakeInstanceCallback,
+                                                     NULL,
+                                                     (void *(*)(void *,void *)) GetNextInstance,
+                                                     (EntityBusyCountFunction *) DecrementInstanceCallback,
+                                                     (EntityBusyCountFunction *) IncrementInstanceCallback,
+                                                     NULL,NULL,NULL,NULL,NULL
+                                                   },
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+                                                  (void (*)(Environment *,void *)) DecrementObjectBasisCount,
+                                                  (void (*)(Environment *,void *)) IncrementObjectBasisCount,
+                                                  (void (*)(Environment *,void *)) MatchObjectFunction,
+                                                  (bool (*)(Environment *,void *)) NetworkSynchronized,
+                                                  (bool (*)(Environment *,void *)) InstanceIsDeleted
+#else
+                                                  NULL,NULL,NULL,NULL,NULL
+#endif
+                                         };
+
+   Instance dummyInstance = { { { { INSTANCE_ADDRESS_TYPE } , NULL, NULL, 0, 0L } },
+                              NULL, NULL, 0, 1, 0, 0, 0,
+                              NULL,  0, 0, NULL, NULL, NULL, NULL,
+                              NULL, NULL, NULL, NULL, NULL };
+
+   AllocateEnvironmentData(theEnv,INSTANCE_DATA,sizeof(struct instanceData),DeallocateInstanceData);
+
+   InstanceData(theEnv)->MkInsMsgPass = true;
+   memcpy(&InstanceData(theEnv)->InstanceInfo,&instanceInfo,sizeof(struct patternEntityRecord));
+   dummyInstance.patternHeader.theInfo = &InstanceData(theEnv)->InstanceInfo;
+   memcpy(&InstanceData(theEnv)->DummyInstance,&dummyInstance,sizeof(Instance));
+
+   InitializeInstanceTable(theEnv);
+   InstallPrimitive(theEnv,(struct entityRecord *) &InstanceData(theEnv)->InstanceInfo,INSTANCE_ADDRESS_TYPE);
+
+#if ! RUN_TIME
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+   AddUDF(theEnv,"initialize-instance","bn",0,UNBOUNDED,NULL,InactiveInitializeInstance,"InactiveInitializeInstance",NULL);
+   AddUDF(theEnv,"active-initialize-instance","bn",0,UNBOUNDED,NULL,InitializeInstanceCommand,"InitializeInstanceCommand",NULL);
+
+   AddUDF(theEnv,"make-instance","bn",0,UNBOUNDED,NULL,InactiveMakeInstance,"InactiveMakeInstance",NULL);
+   AddUDF(theEnv,"active-make-instance","bn",0,UNBOUNDED,NULL,MakeInstanceCommand,"MakeInstanceCommand",NULL);
+
+#else
+   AddUDF(theEnv,"initialize-instance","bn",0,UNBOUNDED,NULL,InitializeInstanceCommand,"InitializeInstanceCommand",NULL);
+   AddUDF(theEnv,"make-instance","bn",0,UNBOUNDED,NULL,MakeInstanceCommand,"MakeInstanceCommand",NULL);
+#endif
+
+   AddUDF(theEnv,"init-slots","*",0,0,NULL,InitSlotsCommand,"InitSlotsCommand",NULL);
+
+   AddUDF(theEnv,"delete-instance","b",0,0,NULL,DeleteInstanceCommand,"DeleteInstanceCommand",NULL);
+   AddUDF(theEnv,"(create-instance)","b",0,0,NULL,CreateInstanceHandler,"CreateInstanceHandler",NULL);
+   AddUDF(theEnv,"unmake-instance","b",1,UNBOUNDED,"iny",UnmakeInstanceCommand,"UnmakeInstanceCommand",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"instances","v",0,3,"y",InstancesCommand,"InstancesCommand",NULL);
+   AddUDF(theEnv,"ppinstance","v",0,0,NULL,PPInstanceCommand,"PPInstanceCommand",NULL);
+#endif
+
+   AddUDF(theEnv,"symbol-to-instance-name","*",1,1,"y",SymbolToInstanceNameFunction,"SymbolToInstanceNameFunction",NULL);
+   AddUDF(theEnv,"instance-name-to-symbol","y",1,1,"ny",InstanceNameToSymbolFunction,"InstanceNameToSymbolFunction",NULL);
+   AddUDF(theEnv,"instance-address","bn",1,2,";iyn;yn",InstanceAddressCommand,"InstanceAddressCommand",NULL);
+   AddUDF(theEnv,"instance-addressp","b",1,1,NULL,InstanceAddressPCommand,"InstanceAddressPCommand",NULL);
+   AddUDF(theEnv,"instance-namep","b",1,1,NULL,InstanceNamePCommand,"InstanceNamePCommand",NULL);
+   AddUDF(theEnv,"instance-name","bn",1,1,"yin",InstanceNameCommand,"InstanceNameCommand",NULL);
+   AddUDF(theEnv,"instancep","b",1,1,NULL,InstancePCommand,"InstancePCommand",NULL);
+   AddUDF(theEnv,"instance-existp","b",1,1,"niy",InstanceExistPCommand,"InstanceExistPCommand",NULL);
+   AddUDF(theEnv,"class","*",1,1,NULL,ClassCommand,"ClassCommand",NULL);
+
+#endif
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+   AddFunctionParser(theEnv,"active-initialize-instance",ParseInitializeInstance);
+   AddFunctionParser(theEnv,"active-make-instance",ParseInitializeInstance);
+#endif
+   AddFunctionParser(theEnv,"initialize-instance",ParseInitializeInstance);
+   AddFunctionParser(theEnv,"make-instance",ParseInitializeInstance);
+
+   SetupInstanceModDupCommands(theEnv);
+   /* SetupInstanceFileCommands(theEnv); DR0866 */
+   SetupInstanceMultifieldCommands(theEnv);
+
+   SetupInstanceFileCommands(theEnv); /* DR0866 */
+
+   AddCleanupFunction(theEnv,"instances",CleanupInstances,0,NULL);
+   AddResetFunction(theEnv,"instances",DestroyAllInstances,60,NULL);
+  }
+
+/***************************************/
+/* DeallocateInstanceData: Deallocates */
+/*    environment data for instances.  */
+/***************************************/
+static void DeallocateInstanceData(
+  Environment *theEnv)
+  {
+   Instance *tmpIPtr, *nextIPtr;
+   long i;
+   InstanceSlot *sp;
+   IGARBAGE *tmpGPtr, *nextGPtr;
+   struct patternMatch *theMatch, *tmpMatch;
+
+   /*=================================*/
+   /* Remove the instance hash table. */
+   /*=================================*/
+
+   rm(theEnv,InstanceData(theEnv)->InstanceTable,
+      (sizeof(Instance *) * INSTANCE_TABLE_HASH_SIZE));
+
+   /*=======================*/
+   /* Return all instances. */
+   /*=======================*/
+
+   tmpIPtr = InstanceData(theEnv)->InstanceList;
+   while (tmpIPtr != NULL)
+     {
+      nextIPtr = tmpIPtr->nxtList;
+
+      theMatch = (struct patternMatch *) tmpIPtr->partialMatchList;
+      while (theMatch != NULL)
+        {
+         tmpMatch = theMatch->next;
+         rtn_struct(theEnv,patternMatch,theMatch);
+         theMatch = tmpMatch;
+        }
+
+#if DEFRULE_CONSTRUCT
+      ReturnEntityDependencies(theEnv,(struct patternEntity *) tmpIPtr);
+#endif
+
+      for (i = 0 ; i < tmpIPtr->cls->instanceSlotCount ; i++)
+        {
+         sp = tmpIPtr->slotAddresses[i];
+         if ((sp == &sp->desc->sharedValue) ?
+             (--sp->desc->sharedCount == 0) : true)
+           {
+            if (sp->desc->multiple)
+              { ReturnMultifield(theEnv,sp->multifieldValue); }
+           }
+        }
+
+      if (tmpIPtr->cls->instanceSlotCount != 0)
+        {
+         rm(theEnv,tmpIPtr->slotAddresses,
+            (tmpIPtr->cls->instanceSlotCount * sizeof(InstanceSlot *)));
+         if (tmpIPtr->cls->localInstanceSlotCount != 0)
+           {
+            rm(theEnv,tmpIPtr->slots,
+               (tmpIPtr->cls->localInstanceSlotCount * sizeof(InstanceSlot)));
+           }
+        }
+
+      rtn_struct(theEnv,instance,tmpIPtr);
+
+      tmpIPtr = nextIPtr;
+     }
+
+   /*===============================*/
+   /* Get rid of garbage instances. */
+   /*===============================*/
+
+   tmpGPtr = InstanceData(theEnv)->InstanceGarbageList;
+   while (tmpGPtr != NULL)
+     {
+      nextGPtr = tmpGPtr->nxt;
+      rtn_struct(theEnv,instance,tmpGPtr->ins);
+      rtn_struct(theEnv,igarbage,tmpGPtr);
+      tmpGPtr = nextGPtr;
+     }
+  }
+
+/*******************************************************************
+  NAME         : DeleteInstance
+  DESCRIPTION  : DIRECTLY removes a named instance from the
+                   hash table and its class's
+                   instance list
+  INPUTS       : The instance address
+  RETURNS      : True if successful, false otherwise
+  SIDE EFFECTS : Instance is deallocated
+  NOTES        : C interface for deleting instances
+ *******************************************************************/
+UnmakeInstanceError DeleteInstance(
+  Instance *theInstance)
+  {
+   GCBlock gcb;
+   UnmakeInstanceError success;
+
+   if (theInstance != NULL)
+     {
+      Environment *theEnv = theInstance->cls->header.env;
+      
+      /*=====================================*/
+      /* If embedded, clear the error flags. */
+      /*=====================================*/
+   
+      if (EvaluationData(theEnv)->CurrentExpression == NULL)
+        { ResetErrorFlags(theEnv); }
+
+      GCBlockStart(theEnv,&gcb);
+      success = QuashInstance(theEnv,theInstance);
+      GCBlockEnd(theEnv,&gcb);
+      
+      return success;
+     }
+     
+   return UIE_NULL_POINTER_ERROR;
+  }
+
+/*******************************************************************
+  NAME         : DeleteAllInstances
+  DESCRIPTION  : DIRECTLY removes all instances from the
+                 hash table and its class's instance list
+  INPUTS       : The environment
+  RETURNS      : True if successful, false otherwise
+  SIDE EFFECTS : Instance is deallocated
+  NOTES        : C interface for deleting instances
+ *******************************************************************/
+UnmakeInstanceError DeleteAllInstances(
+  Environment *theEnv)
+  {
+   Instance *ins, *itmp;
+   GCBlock gcb;
+   UnmakeInstanceError success = UIE_NO_ERROR, rv;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   GCBlockStart(theEnv,&gcb);
+
+   ins = InstanceData(theEnv)->InstanceList;
+   while (ins != NULL)
+     {
+      itmp = ins;
+      ins = ins->nxtList;
+      if ((rv = QuashInstance(theEnv,itmp)) != UIE_NO_ERROR)
+        { success = rv; }
+     }
+
+   GCBlockEnd(theEnv,&gcb);
+
+   InstanceData(theEnv)->unmakeInstanceError = success;
+   return success;
+  }
+
+/**************************/
+/* UnmakeInstanceCallback */
+/**************************/
+bool UnmakeInstanceCallback(
+  Instance *theInstance,
+  Environment *theEnv)
+  {
+   return (UnmakeInstance(theInstance) == UIE_NO_ERROR);
+  }
+
+/*******************************************************************
+  NAME         : UnmakeAllInstances
+  DESCRIPTION  : Removes all instances from the environment
+  INPUTS       : The environment
+  RETURNS      : 1 if successful, 0 otherwise
+  SIDE EFFECTS : Instance is deallocated
+  NOTES        : C interface for deleting instances
+ *******************************************************************/
+UnmakeInstanceError UnmakeAllInstances(
+  Environment *theEnv)
+  {
+   UnmakeInstanceError success = UIE_NO_ERROR;
+   bool svmaintain;
+   GCBlock gcb;
+   Instance *theInstance;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   GCBlockStart(theEnv,&gcb);
+   
+   svmaintain = InstanceData(theEnv)->MaintainGarbageInstances;
+   InstanceData(theEnv)->MaintainGarbageInstances = true;
+
+   theInstance = InstanceData(theEnv)->InstanceList;
+   while (theInstance != NULL)
+     {
+      DirectMessage(theEnv,MessageHandlerData(theEnv)->DELETE_SYMBOL,theInstance,NULL,NULL);
+
+      if (theInstance->garbage == 0)
+        { success = UIE_DELETED_ERROR; }
+
+      theInstance = theInstance->nxtList;
+      while ((theInstance != NULL) ? theInstance->garbage : false)
+        theInstance = theInstance->nxtList;
+     }
+
+   InstanceData(theEnv)->MaintainGarbageInstances = svmaintain;
+   CleanupInstances(theEnv,NULL);
+
+   GCBlockEnd(theEnv,&gcb);
+
+   InstanceData(theEnv)->unmakeInstanceError = success;
+   return success;
+  }
+
+/*******************************************************************
+  NAME         : UnmakeInstance
+  DESCRIPTION  : Removes a named instance via message-passing
+  INPUTS       : The instance address (NULL to delete all instances)
+  RETURNS      : Error code (UE_NO_ERROR if successful)
+  SIDE EFFECTS : Instance is deallocated
+  NOTES        : C interface for deleting instances
+ *******************************************************************/
+UnmakeInstanceError UnmakeInstance(
+  Instance *theInstance)
+  {
+   UnmakeInstanceError success = UIE_NO_ERROR;
+   bool svmaintain;
+   GCBlock gcb;
+   Environment *theEnv = theInstance->cls->header.env;
+   
+   if (theInstance == NULL)
+     {
+      InstanceData(theEnv)->unmakeInstanceError = UIE_NULL_POINTER_ERROR;
+      return UIE_NULL_POINTER_ERROR;
+     }
+     
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   GCBlockStart(theEnv,&gcb);
+  
+   svmaintain = InstanceData(theEnv)->MaintainGarbageInstances;
+   InstanceData(theEnv)->MaintainGarbageInstances = true;
+
+   if (theInstance->garbage)
+     { success = UIE_DELETED_ERROR; }
+   else
+     {
+      DirectMessage(theEnv,MessageHandlerData(theEnv)->DELETE_SYMBOL,theInstance,NULL,NULL);
+      if (theInstance->garbage == 0)
+        { success = UIE_COULD_NOT_DELETE_ERROR; }
+     }
+
+   InstanceData(theEnv)->MaintainGarbageInstances = svmaintain;
+   CleanupInstances(theEnv,NULL);
+
+   GCBlockEnd(theEnv,&gcb);
+
+   if (EvaluationData(theEnv)->EvaluationError)
+     { success = UIE_RULE_NETWORK_ERROR; }
+   
+   InstanceData(theEnv)->unmakeInstanceError = success;
+   return success;
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/*******************************************************************
+  NAME         : InstancesCommand
+  DESCRIPTION  : Lists all instances associated
+                   with a particular class
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (instances [<class-name> [inherit]])
+ *******************************************************************/
+void InstancesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool inheritFlag = false;
+   Defmodule *theDefmodule;
+   const char *className = NULL;
+   UDFValue theArg;
+
+   theDefmodule = GetCurrentModule(theEnv);
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg)) return;
+
+      theDefmodule = FindDefmodule(theEnv,theArg.lexemeValue->contents);
+      if ((theDefmodule != NULL) ? false :
+          (strcmp(theArg.lexemeValue->contents,"*") != 0))
+        {
+         SetEvaluationError(theEnv,true);
+         ExpectedTypeError1(theEnv,"instances",1,"'defmodule name'");
+         return;
+        }
+      if (UDFHasNextArgument(context))
+        {
+         if (! UDFNextArgument(context,SYMBOL_BIT,&theArg)) return;
+         className = theArg.lexemeValue->contents;
+         if (LookupDefclassAnywhere(theEnv,theDefmodule,className) == NULL)
+           {
+            if (strcmp(className,"*") == 0)
+              className = NULL;
+            else
+              {
+               ClassExistError(theEnv,"instances",className);
+                 return;
+              }
+           }
+         if (UDFHasNextArgument(context))
+           {
+            if (! UDFNextArgument(context,SYMBOL_BIT,&theArg)) return;
+
+            if (strcmp(theArg.lexemeValue->contents,ALL_QUALIFIER) != 0)
+              {
+               SetEvaluationError(theEnv,true);
+               ExpectedTypeError1(theEnv,"instances",3,"keyword \"inherit\"");
+               return;
+              }
+            inheritFlag = true;
+           }
+        }
+     }
+   Instances(theEnv,STDOUT,theDefmodule,className,inheritFlag);
+  }
+
+/********************************************************
+  NAME         : PPInstanceCommand
+  DESCRIPTION  : Displays the current slot-values
+                   of an instance
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (ppinstance <instance>)
+ ********************************************************/
+void PPInstanceCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+
+   if (CheckCurrentMessage(theEnv,"ppinstance",true) == false)
+     return;
+   ins = GetActiveInstance(theEnv);
+   if (ins->garbage == 1)
+     return;
+   PrintInstance(theEnv,STDOUT,ins,"\n");
+   WriteString(theEnv,STDOUT,"\n");
+  }
+
+/***************************************************************
+  NAME         : Instances
+  DESCRIPTION  : Lists instances of classes
+  INPUTS       : 1) The logical name for the output
+                 2) Address of the module (NULL for all classes)
+                 3) Name of the class
+                    (NULL for all classes in specified module)
+                 4) A flag indicating whether to print instances
+                    of subclasses or not
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ **************************************************************/
+void Instances(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule,
+  const char *className,
+  bool inheritFlag)
+  {
+   int id;
+   unsigned long count = 0L;
+
+   /*==============================================*/
+   /* Grab a traversal id to avoid printing out    */
+   /* instances twice due to multiple inheritance. */
+   /*==============================================*/
+
+   if ((id = GetTraversalID(theEnv)) == -1)
+     { return; }
+   SaveCurrentModule(theEnv);
+
+   /*======================================*/
+   /* For all modules, print out instances */
+   /* of specified class(es).              */
+   /*======================================*/
+
+   if (theModule == NULL)
+     {
+      theModule = GetNextDefmodule(theEnv,NULL);
+      while (theModule != NULL)
+        {
+         if (GetHaltExecution(theEnv) == true)
+           {
+            RestoreCurrentModule(theEnv);
+            ReleaseTraversalID(theEnv);
+            return;
+           }
+
+         WriteString(theEnv,logicalName,DefmoduleName(theModule));
+         WriteString(theEnv,logicalName,":\n");
+         SetCurrentModule(theEnv,theModule);
+         count += ListInstancesInModule(theEnv,id,logicalName,className,inheritFlag,true);
+         theModule = GetNextDefmodule(theEnv,theModule);
+        }
+     }
+
+   /*=======================================*/
+   /* For the specified module, print out   */
+   /* instances of the specified class(es). */
+   /*=======================================*/
+
+   else
+     {
+      SetCurrentModule(theEnv,theModule);
+      count = ListInstancesInModule(theEnv,id,logicalName,className,inheritFlag,false);
+     }
+
+   RestoreCurrentModule(theEnv);
+   ReleaseTraversalID(theEnv);
+   if (EvaluationData(theEnv)->HaltExecution == false)
+     { PrintTally(theEnv,logicalName,count,"instance","instances"); }
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/*********************************************************
+  NAME         : MakeInstance
+  DESCRIPTION  : C Interface for creating and
+                   initializing a class instance
+  INPUTS       : The make-instance call string,
+                    e.g. "([bill] of man (age 34))"
+  RETURNS      : The instance address if instance created,
+                    NULL otherwise
+  SIDE EFFECTS : Creates the instance and returns
+                    the result in caller's buffer
+  NOTES        : None
+ *********************************************************/
+Instance *MakeInstance(
+  Environment *theEnv,
+  const char *mkstr)
+  {
+   const char *router = "***MKINS***";
+   GCBlock gcb;
+   struct token tkn;
+   Expression *top;
+   UDFValue returnValue;
+   Instance *rv;
+   const char *oldRouter;
+   const char *oldString;
+   long oldIndex;
+   
+   InstanceData(theEnv)->makeInstanceError = MIE_NO_ERROR;
+   
+   if (mkstr == NULL)
+     {
+      InstanceData(theEnv)->makeInstanceError = MIE_NULL_POINTER_ERROR;
+      return NULL;
+     }
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   returnValue.value = FalseSymbol(theEnv);
+   
+   /*=============================*/
+   /* Use the fast router bypass. */
+   /*=============================*/
+
+   oldRouter = RouterData(theEnv)->FastCharGetRouter;
+   oldString = RouterData(theEnv)->FastCharGetString;
+   oldIndex  = RouterData(theEnv)->FastCharGetIndex;
+
+   RouterData(theEnv)->FastCharGetRouter = router;
+   RouterData(theEnv)->FastCharGetString = mkstr;
+   RouterData(theEnv)->FastCharGetIndex  = 0;
+     
+   GCBlockStart(theEnv,&gcb);
+   
+   GetToken(theEnv,router,&tkn);
+   if (tkn.tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      top = GenConstant(theEnv,FCALL,FindFunction(theEnv,"make-instance"));
+      if (ParseSimpleInstance(theEnv,top,router) != NULL)
+        {
+         GetToken(theEnv,router,&tkn);
+         if (tkn.tknType == STOP_TOKEN)
+           {
+            ExpressionInstall(theEnv,top);
+            EvaluateExpression(theEnv,top,&returnValue);
+            ExpressionDeinstall(theEnv,top);
+           }
+         else
+           {
+            InstanceData(theEnv)->makeInstanceError = MIE_PARSING_ERROR;
+            SyntaxErrorMessage(theEnv,"instance definition");
+           }
+         ReturnExpression(theEnv,top);
+        }
+      else
+        { InstanceData(theEnv)->makeInstanceError = MIE_PARSING_ERROR; }
+     }
+   else
+     {
+      InstanceData(theEnv)->makeInstanceError = MIE_PARSING_ERROR;
+      SyntaxErrorMessage(theEnv,"instance definition");
+     }
+     
+   /*===========================================*/
+   /* Restore the old state of the fast router. */
+   /*===========================================*/
+
+   RouterData(theEnv)->FastCharGetRouter = oldRouter;
+   RouterData(theEnv)->FastCharGetString = oldString;
+   RouterData(theEnv)->FastCharGetIndex  = oldIndex;
+
+   if (returnValue.value == FalseSymbol(theEnv))
+     { rv = NULL; }
+   else
+     { rv = FindInstanceBySymbol(theEnv,returnValue.lexemeValue); }
+
+   GCBlockEnd(theEnv,&gcb);
+   
+   return rv;
+  }
+
+/************************/
+/* GetMakeInstanceError */
+/************************/
+MakeInstanceError GetMakeInstanceError(
+  Environment *theEnv)
+  {
+   return InstanceData(theEnv)->makeInstanceError;
+  }
+
+/***************************************************************
+  NAME         : CreateRawInstance
+  DESCRIPTION  : Creates an empty of instance of the specified
+                   class.  No slot-overrides or class defaults
+                   are applied.
+  INPUTS       : 1) Address of class
+                 2) Name of the new instance
+  RETURNS      : The instance address if instance created,
+                    NULL otherwise
+  SIDE EFFECTS : Old instance of same name deleted (if possible)
+  NOTES        : None
+ ***************************************************************/
+Instance *CreateRawInstance(
+  Environment *theEnv,
+  Defclass *theDefclass,
+  const char *instanceName)
+  {
+   return BuildInstance(theEnv,CreateInstanceName(theEnv,instanceName),theDefclass,false);
+  }
+
+/***************************************************************************
+  NAME         : FindInstance
+  DESCRIPTION  : Looks up a specified instance in the instance hash table
+  INPUTS       : Name-string of the instance
+  RETURNS      : The address of the found instance, NULL otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************************************/
+Instance *FindInstance(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *iname,
+  bool searchImports)
+  {
+   CLIPSLexeme *isym;
+
+   isym = FindSymbolHN(theEnv,iname,LEXEME_BITS | INSTANCE_NAME_BIT);
+
+   if (isym == NULL)
+     { return NULL; }
+
+   if (theModule == NULL)
+     { theModule = GetCurrentModule(theEnv); }
+
+   return FindInstanceInModule(theEnv,isym,theModule,GetCurrentModule(theEnv),searchImports);
+  }
+
+/***************************************************************************
+  NAME         : ValidInstanceAddress
+  DESCRIPTION  : Determines if an instance address is still valid
+  INPUTS       : Instance address
+  RETURNS      : 1 if the address is still valid, 0 otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************************************/
+bool ValidInstanceAddress(
+  Instance *theInstance)
+  {
+   return (theInstance->garbage == 0) ? true : false;
+  }
+
+/***************************************************
+  NAME         : DirectGetSlot
+  DESCRIPTION  : Gets a slot value
+  INPUTS       : 1) Instance address
+                 2) Slot name
+                 3) Caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+GetSlotError DirectGetSlot(
+  Instance *theInstance,
+  const char *sname,
+  CLIPSValue *returnValue)
+  {
+   InstanceSlot *sp;
+   Environment *theEnv = theInstance->cls->header.env;
+   
+   if ((theInstance == NULL) || (sname == NULL) || (returnValue == NULL))
+     { return GSE_NULL_POINTER_ERROR; }
+     
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   if (theInstance->garbage == 1)
+     {
+      SetEvaluationError(theEnv,true);
+      returnValue->value = FalseSymbol(theEnv);
+      return GSE_INVALID_TARGET_ERROR;
+     }
+     
+   sp = FindISlotByName(theEnv,theInstance,sname);
+   if (sp == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      returnValue->value = FalseSymbol(theEnv);
+      return GSE_SLOT_NOT_FOUND_ERROR;
+     }
+
+   returnValue->value = sp->value;
+     
+   return GSE_NO_ERROR;
+  }
+
+/*********************************************************
+  NAME         : DirectPutSlot
+  DESCRIPTION  : Gets a slot value
+  INPUTS       : 1) Instance address
+                 2) Slot name
+                 3) Caller's new value buffer
+  RETURNS      : True if put successful, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************************/
+PutSlotError DirectPutSlot(
+  Instance *theInstance,
+  const char *sname,
+  CLIPSValue *val)
+  {
+   InstanceSlot *sp;
+   UDFValue junk, temp;
+   GCBlock gcb;
+   PutSlotError rv;
+   Environment *theEnv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theEnv = theInstance->cls->header.env;
+   
+   if ((sname == NULL) || (val == NULL))
+     {
+      SetEvaluationError(theEnv,true);
+      return PSE_NULL_POINTER_ERROR;
+     }
+     
+   if (theInstance->garbage == 1)
+     {
+      SetEvaluationError(theEnv,true);
+      return PSE_INVALID_TARGET_ERROR;
+     }
+     
+   sp = FindISlotByName(theEnv,theInstance,sname);
+   if (sp == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      return PSE_SLOT_NOT_FOUND_ERROR;
+     }
+
+   GCBlockStart(theEnv,&gcb);
+   CLIPSToUDFValue(val,&temp);
+   rv = PutSlotValue(theEnv,theInstance,sp,&temp,&junk,"external put");
+   GCBlockEnd(theEnv,&gcb);
+   
+   return rv;
+  }
+
+/*************************/
+/* DirectPutSlotInteger: */
+/*************************/
+PutSlotError DirectPutSlotInteger(
+  Instance *theInstance,
+  const char *sname,
+  long long val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.integerValue = CreateInteger(theInstance->cls->header.env,val);
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/***********************/
+/* DirectPutSlotFloat: */
+/***********************/
+PutSlotError DirectPutSlotFloat(
+  Instance *theInstance,
+  const char *sname,
+  double val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.floatValue = CreateFloat(theInstance->cls->header.env,val);
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/************************/
+/* DirectPutSlotSymbol: */
+/************************/
+PutSlotError DirectPutSlotSymbol(
+  Instance *theInstance,
+  const char *sname,
+  const char *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.lexemeValue = CreateSymbol(theInstance->cls->header.env,val);
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/************************/
+/* DirectPutSlotString: */
+/************************/
+PutSlotError DirectPutSlotString(
+  Instance *theInstance,
+  const char *sname,
+  const char *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.lexemeValue = CreateString(theInstance->cls->header.env,val);
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/******************************/
+/* DirectPutSlotInstanceName: */
+/******************************/
+PutSlotError DirectPutSlotInstanceName(
+  Instance *theInstance,
+  const char *sname,
+  const char *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.lexemeValue = CreateInstanceName(theInstance->cls->header.env,val);
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/******************************/
+/* DirectPutSlotCLIPSInteger: */
+/******************************/
+PutSlotError DirectPutSlotCLIPSInteger(
+  Instance *theInstance,
+  const char *sname,
+  CLIPSInteger *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.integerValue = val;
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/****************************/
+/* DirectPutSlotCLIPSFloat: */
+/****************************/
+PutSlotError DirectPutSlotCLIPSFloat(
+  Instance *theInstance,
+  const char *sname,
+  CLIPSFloat *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.floatValue = val;
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/*****************************/
+/* DirectPutSlotCLIPSLexeme: */
+/*****************************/
+PutSlotError DirectPutSlotCLIPSLexeme(
+  Instance *theInstance,
+  const char *sname,
+  CLIPSLexeme *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.lexemeValue = val;
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/**********************/
+/* DirectPutSlotFact: */
+/**********************/
+PutSlotError DirectPutSlotFact(
+  Instance *theInstance,
+  const char *sname,
+  Fact *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.factValue = val;
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/**************************/
+/* DirectPutSlotInstance: */
+/**************************/
+PutSlotError DirectPutSlotInstance(
+  Instance *theInstance,
+  const char *sname,
+  Instance *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.instanceValue = val;
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/****************************/
+/* DirectPutSlotMultifield: */
+/****************************/
+PutSlotError DirectPutSlotMultifield(
+  Instance *theInstance,
+  const char *sname,
+  Multifield *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.multifieldValue = val;
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/**************************************/
+/* DirectPutSlotCLIPSExternalAddress: */
+/**************************************/
+PutSlotError DirectPutSlotCLIPSExternalAddress(
+  Instance *theInstance,
+  const char *sname,
+  CLIPSExternalAddress *val)
+  {
+   CLIPSValue cv;
+   
+   if (theInstance == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   cv.externalAddressValue = val;
+   
+   return DirectPutSlot(theInstance,sname,&cv);
+  }
+
+/***************************************************
+  NAME         : InstanceName
+  DESCRIPTION  : Returns name of instance
+  INPUTS       : Pointer to instance
+  RETURNS      : Name of instance
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+const char *InstanceName(
+  Instance *theInstance)
+  {
+   if (theInstance->garbage == 1)
+     { return NULL; }
+
+   return theInstance->name->contents;
+  }
+
+/***************************************************
+  NAME         : InstanceClass
+  DESCRIPTION  : Returns class of instance
+  INPUTS       : Pointer to instance
+  RETURNS      : Pointer to class of instance
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Defclass *InstanceClass(
+  Instance *theInstance)
+  {
+   if (theInstance->garbage == 1)
+     { return NULL; }
+
+   return theInstance->cls;
+  }
+
+/***************************************************
+  NAME         : GetGlobalNumberOfInstances
+  DESCRIPTION  : Returns the total number of
+                   instances in all modules
+  INPUTS       : None
+  RETURNS      : The instance count
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+unsigned long GetGlobalNumberOfInstances(
+  Environment *theEnv)
+  {
+   return(InstanceData(theEnv)->GlobalNumberOfInstances);
+  }
+
+/***************************************************
+  NAME         : GetNextInstance
+  DESCRIPTION  : Returns next instance in list
+                 (or first instance in list)
+  INPUTS       : Pointer to previous instance
+                 (or NULL to get first instance)
+  RETURNS      : The next instance or first instance
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Instance *GetNextInstance(
+  Environment *theEnv,
+  Instance *theInstance)
+  {
+   if (theInstance == NULL)
+     { return InstanceData(theEnv)->InstanceList; }
+
+   if (theInstance->garbage == 1)
+     { return NULL; }
+
+   return theInstance->nxtList;
+  }
+
+/***************************************************
+  NAME         : GetNextInstanceInScope
+  DESCRIPTION  : Returns next instance in list
+                 (or first instance in list)
+                 which class is in scope
+  INPUTS       : Pointer to previous instance
+                 (or NULL to get first instance)
+  RETURNS      : The next instance or first instance
+                 which class is in scope of the
+                 current module
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Instance *GetNextInstanceInScope(
+  Environment *theEnv,
+  Instance *theInstance)
+  {
+   if (theInstance == NULL)
+     { theInstance = InstanceData(theEnv)->InstanceList; }
+   else if (theInstance->garbage)
+     { return NULL; }
+   else
+     { theInstance = theInstance->nxtList; }
+
+   while (theInstance != NULL)
+     {
+      if (DefclassInScope(theEnv,theInstance->cls,NULL))
+        { return theInstance; }
+
+      theInstance = theInstance->nxtList;
+     }
+
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : GetNextInstanceInClass
+  DESCRIPTION  : Finds next instance of class
+                 (or first instance of class)
+  INPUTS       : 1) Class address
+                 2) Instance address
+                    (NULL to get first instance)
+  RETURNS      : The next or first class instance
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Instance *GetNextInstanceInClass(
+  Defclass *theDefclass,
+  Instance *theInstance)
+  {
+   if (theInstance == NULL)
+     { return theDefclass->instanceList; }
+
+   if (theInstance->garbage == 1)
+     { return NULL; }
+
+   return theInstance->nxtClass;
+  }
+
+/***************************************************
+  NAME         : GetNextInstanceInClassAndSubclasses
+  DESCRIPTION  : Finds next instance of class
+                 (or first instance of class) and
+                 all of its subclasses
+  INPUTS       : 1) Class address
+                 2) Instance address
+                    (NULL to get first instance)
+  RETURNS      : The next or first class instance
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+Instance *GetNextInstanceInClassAndSubclasses(
+  Defclass **cptr,
+  Instance *theInstance,
+  UDFValue *iterationInfo)
+  {
+   Instance *nextInstance;
+   Defclass *theClass;
+   Environment *theEnv;
+
+   theClass = *cptr;
+   theEnv = theClass->header.env;
+
+   if (theInstance == NULL)
+     {
+      ClassSubclassAddresses(theEnv,theClass,iterationInfo,true);
+      nextInstance = theClass->instanceList;
+     }
+   else if (theInstance->garbage == 1)
+     { nextInstance = NULL; }
+   else
+     { nextInstance = theInstance->nxtClass; }
+
+   while ((nextInstance == NULL) &&
+          (iterationInfo->begin < iterationInfo->range))
+     {
+      theClass = (Defclass *) iterationInfo->multifieldValue->contents[iterationInfo->begin].value;
+      *cptr = theClass;
+      iterationInfo->begin = iterationInfo->begin + 1;
+      nextInstance = theClass->instanceList;
+     }
+
+   return nextInstance;
+  }
+
+/***************************************************
+  NAME         : InstancePPForm
+  DESCRIPTION  : Writes slot names and values to
+                  caller's buffer
+  INPUTS       : 1) Caller's buffer
+                 2) Size of buffer (not including
+                    space for terminating '\0')
+                 3) Instance address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Caller's buffer written
+  NOTES        : None
+ ***************************************************/
+void InstancePPForm(
+  Instance *theInstance,
+  StringBuilder *theSB)
+  {
+   const char *pbuf = "***InstancePPForm***";
+   Environment *theEnv;
+
+   if (theInstance->garbage == 1)
+     { return; }
+
+   theEnv = theInstance->cls->header.env;
+
+   if (OpenStringBuilderDestination(theEnv,pbuf,theSB) == 0)
+     { return; }
+   
+   PrintInstance(theEnv,pbuf,theInstance," ");
+
+   CloseStringBuilderDestination(theEnv,pbuf);
+
+  }
+
+/*********************************************************
+  NAME         : ClassCommand
+  DESCRIPTION  : Returns the class of an instance
+  INPUTS       : Caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (class <object>)
+                 Can also be called by (type <object>)
+                   if you have generic functions installed
+ *********************************************************/
+void ClassCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+   const char *func;
+   UDFValue temp;
+
+   func = EvaluationData(theEnv)->CurrentExpression->functionValue->callFunctionName->contents;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   EvaluateExpression(theEnv,GetFirstArgument(),&temp);
+   if (temp.header->type == INSTANCE_ADDRESS_TYPE)
+     {
+      ins = temp.instanceValue;
+      if (ins->garbage == 1)
+        {
+         StaleInstanceAddress(theEnv,func,0);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+      returnValue->value = GetDefclassNamePointer(ins->cls);
+     }
+   else if (temp.header->type == INSTANCE_NAME_TYPE)
+     {
+      ins = FindInstanceBySymbol(theEnv,temp.lexemeValue);
+      if (ins == NULL)
+        {
+         NoInstanceError(theEnv,temp.lexemeValue->contents,func);
+         return;
+        }
+      returnValue->value = GetDefclassNamePointer(ins->cls);
+     }
+   else
+     {
+      switch (temp.header->type)
+        {
+         case INTEGER_TYPE          :
+         case FLOAT_TYPE            :
+         case SYMBOL_TYPE           :
+         case STRING_TYPE           :
+         case MULTIFIELD_TYPE       :
+         case EXTERNAL_ADDRESS_TYPE :
+         case FACT_ADDRESS_TYPE     :
+                          returnValue->value = GetDefclassNamePointer(
+                                                 DefclassData(theEnv)->PrimitiveClassMap[temp.header->type]);
+                         return;
+
+         default       : PrintErrorID(theEnv,"INSCOM",1,false);
+                         WriteString(theEnv,STDERR,"Undefined type in function '");
+                         WriteString(theEnv,STDERR,func);
+                         WriteString(theEnv,STDERR,"'.\n");
+                         SetEvaluationError(theEnv,true);
+        }
+     }
+  }
+
+/******************************************************
+  NAME         : CreateInstanceHandler
+  DESCRIPTION  : Message handler called after instance creation
+  INPUTS       : None
+  RETURNS      : True if successful,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : Does nothing. Provided so it can be overridden.
+ ******************************************************/
+void CreateInstanceHandler(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if MAC_XCD
+#pragma unused(theEnv,context)
+#endif
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/******************************************************
+  NAME         : DeleteInstanceCommand
+  DESCRIPTION  : Removes a named instance from the
+                   hash table and its class's
+                   instance list
+  INPUTS       : None
+  RETURNS      : True if successful,
+                 false otherwise
+  SIDE EFFECTS : Instance is deallocated
+  NOTES        : This is an internal function that
+                   only be called by a handler
+ ******************************************************/
+void DeleteInstanceCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (CheckCurrentMessage(theEnv,"delete-instance",true))
+     {
+      UnmakeInstanceError rv = QuashInstance(theEnv,GetActiveInstance(theEnv));
+      returnValue->lexemeValue = CreateBoolean(theEnv,(rv == UIE_NO_ERROR));
+     }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/********************************************************************
+  NAME         : UnmakeInstanceCommand
+  DESCRIPTION  : Uses message-passing to delete the
+                   specified instance
+  INPUTS       : None
+  RETURNS      : True if successful, false otherwise
+  SIDE EFFECTS : Instance is deallocated
+  NOTES        : Syntax: (unmake-instance <instance-expression>+ | *)
+ ********************************************************************/
+void UnmakeInstanceCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Instance *ins;
+   unsigned int argNumber = 1;
+   bool rtn = true;
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,INSTANCE_BITS | SYMBOL_BIT,&theArg))
+        { return; }
+
+      if (CVIsType(&theArg,INSTANCE_NAME_BIT | SYMBOL_BIT))
+        {
+         ins = FindInstanceBySymbol(theEnv,theArg.lexemeValue);
+         if ((ins == NULL) ? (strcmp(theArg.lexemeValue->contents,"*") != 0) : false)
+           {
+            NoInstanceError(theEnv,theArg.lexemeValue->contents,"unmake-instance");
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+         }
+      else if (CVIsType(&theArg,INSTANCE_ADDRESS_BIT))
+        {
+         ins = theArg.instanceValue;
+         if (ins->garbage)
+           {
+            StaleInstanceAddress(theEnv,"unmake-instance",0);
+            SetEvaluationError(theEnv,true);
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+      else
+        {
+         ExpectedTypeError1(theEnv,"unmake-instance",argNumber,"instance-address, instance-name, or the symbol *");
+         SetEvaluationError(theEnv,true);
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+        
+      if (ins != NULL)
+        {
+         if (UnmakeInstance(ins) != UIE_NO_ERROR)
+           rtn = false;
+        }
+       else
+         {
+          if (UnmakeAllInstances(theEnv) != UIE_NO_ERROR)
+            rtn = false;
+          returnValue->lexemeValue = CreateBoolean(theEnv,rtn);
+          return;
+         }
+
+      argNumber++;
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,rtn);
+  }
+
+/*****************************************************************
+  NAME         : SymbolToInstanceNameFunction
+  DESCRIPTION  : Converts a symbol from type SYMBOL_TYPE
+                   to type INSTANCE_NAME_TYPE
+  INPUTS       : The address of the value buffer
+  RETURNS      : The new INSTANCE_NAME_TYPE symbol
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (symbol-to-instance-name <symbol>)
+ *****************************************************************/
+void SymbolToInstanceNameFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! UDFFirstArgument(context,SYMBOL_BIT,returnValue))
+     { return; }
+
+   returnValue->value = CreateInstanceName(theEnv,returnValue->lexemeValue->contents);
+  }
+
+/*****************************************************************
+  NAME         : InstanceNameToSymbolFunction
+  DESCRIPTION  : Converts a symbol from type INSTANCE_NAME_TYPE
+                   to type SYMBOL_TYPE
+  INPUTS       : None
+  RETURNS      : Symbol FALSE on errors - or converted instance name
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (instance-name-to-symbol <iname>)
+ *****************************************************************/
+void InstanceNameToSymbolFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! UDFFirstArgument(context,INSTANCE_NAME_BIT | SYMBOL_BIT,returnValue))
+     { return; }
+
+   returnValue->value = CreateSymbol(theEnv,returnValue->lexemeValue->contents);
+  }
+
+/*********************************************************************************
+  NAME         : InstanceAddressCommand
+  DESCRIPTION  : Returns the address of an instance
+  INPUTS       : The address of the value buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Stores instance address in caller's buffer
+  NOTES        : H/L Syntax : (instance-address [<module-name>] <instance-name>)
+ *********************************************************************************/
+void InstanceAddressCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+   UDFValue temp;
+   Defmodule *theModule;
+   bool searchImports;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   if (UDFArgumentCount(context) > 1)
+     {
+      if (! UDFFirstArgument(context,SYMBOL_BIT,&temp))
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+      theModule = FindDefmodule(theEnv,temp.lexemeValue->contents);
+      if ((theModule == NULL) ? (strcmp(temp.lexemeValue->contents,"*") != 0) : false)
+        {
+         ExpectedTypeError1(theEnv,"instance-address",1,"'module name'");
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+      if (theModule == NULL)
+        {
+         searchImports = true;
+         theModule = GetCurrentModule(theEnv);
+        }
+      else
+        searchImports = false;
+
+      if (! UDFNextArgument(context,INSTANCE_NAME_BIT | SYMBOL_BIT,&temp))
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+      ins = FindInstanceInModule(theEnv,temp.lexemeValue,theModule,
+                                 GetCurrentModule(theEnv),searchImports);
+      if (ins != NULL)
+        { returnValue->instanceValue = ins; }
+      else
+        NoInstanceError(theEnv,temp.lexemeValue->contents,"instance-address");
+     }
+   else if (UDFFirstArgument(context,INSTANCE_BITS | SYMBOL_BIT,&temp))
+     {
+      if (temp.header->type == INSTANCE_ADDRESS_TYPE)
+        {
+         ins = temp.instanceValue;
+         if (ins->garbage == 0)
+           { returnValue->instanceValue = temp.instanceValue; }
+         else
+           {
+            StaleInstanceAddress(theEnv,"instance-address",0);
+            SetEvaluationError(theEnv,true);
+           }
+        }
+      else
+        {
+         ins = FindInstanceBySymbol(theEnv,temp.lexemeValue);
+         if (ins != NULL)
+           { returnValue->instanceValue = ins; }
+         else
+           NoInstanceError(theEnv,temp.lexemeValue->contents,"instance-address");
+        }
+     }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/***************************************************************
+  NAME         : InstanceNameCommand
+  DESCRIPTION  : Gets the name of an INSTANCE
+  INPUTS       : The address of the value buffer
+  RETURNS      : The INSTANCE_NAME_TYPE symbol
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (instance-name <instance>)
+ ***************************************************************/
+void InstanceNameCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+   UDFValue theArg;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   if (! UDFFirstArgument(context,INSTANCE_BITS | SYMBOL_BIT,&theArg))
+     { return; }
+
+   if (CVIsType(&theArg,INSTANCE_ADDRESS_BIT))
+     {
+      ins = theArg.instanceValue;
+      if (ins->garbage == 1)
+        {
+         StaleInstanceAddress(theEnv,"instance-name",0);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+     }
+   else
+     {
+      ins = FindInstanceBySymbol(theEnv,theArg.lexemeValue);
+      if (ins == NULL)
+        {
+         NoInstanceError(theEnv,theArg.lexemeValue->contents,"instance-name");
+         return;
+        }
+     }
+
+   returnValue->value = ins->name;
+  }
+
+/**************************************************************
+  NAME         : InstanceAddressPCommand
+  DESCRIPTION  : Determines if a value is of type INSTANCE
+  INPUTS       : None
+  RETURNS      : True if type INSTANCE_ADDRESS_TYPE, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (instance-addressp <arg>)
+ **************************************************************/
+void InstanceAddressPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+
+   if (theArg.header->type == INSTANCE_ADDRESS_TYPE)
+     { returnValue->value = TrueSymbol(theEnv); }
+   else
+     { returnValue->value = FalseSymbol(theEnv); }
+  }
+
+/**************************************************************
+  NAME         : InstanceNamePCommand
+  DESCRIPTION  : Determines if a value is of type INSTANCE_NAME_TYPE
+  INPUTS       : None
+  RETURNS      : True if type INSTANCE_NAME_TYPE, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (instance-namep <arg>)
+ **************************************************************/
+void InstanceNamePCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,CVIsType(&theArg,INSTANCE_NAME_BIT));
+  }
+
+/*****************************************************************
+  NAME         : InstancePCommand
+  DESCRIPTION  : Determines if a value is of type INSTANCE_ADDRESS_TYPE
+                   or INSTANCE_NAME_TYPE
+  INPUTS       : None
+  RETURNS      : True if type INSTANCE_NAME_TYPE or INSTANCE_ADDRESS_TYPE,
+                     false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (instancep <arg>)
+ *****************************************************************/
+void InstancePCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,CVIsType(&theArg,INSTANCE_ADDRESS_BIT | INSTANCE_NAME_BIT));
+  }
+
+/********************************************************
+  NAME         : InstanceExistPCommand
+  DESCRIPTION  : Determines if an instance exists
+  INPUTS       : None
+  RETURNS      : True if instance exists, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : (instance-existp <arg>)
+ ********************************************************/
+void InstanceExistPCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+
+   if (CVIsType(&theArg,INSTANCE_ADDRESS_BIT))
+     {
+      returnValue->lexemeValue = CreateBoolean(theEnv,(theArg.instanceValue->garbage == 0) ? true : false);
+      return;
+     }
+
+   if (CVIsType(&theArg,INSTANCE_NAME_BIT | SYMBOL_BIT))
+     {
+      returnValue->lexemeValue = CreateBoolean(theEnv,((FindInstanceBySymbol(theEnv,theArg.lexemeValue) != NULL) ?
+              true : false));
+      return;
+     }
+   ExpectedTypeError1(theEnv,"instance-existp",1,"instance name, instance address or symbol");
+   SetEvaluationError(theEnv,true);
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if DEBUGGING_FUNCTIONS
+
+/***************************************************
+  NAME         : ListInstancesInModule
+  DESCRIPTION  : List instances of specified
+                 class(es) in a module
+  INPUTS       : 1) Traversal id to avoid multiple
+                    passes over same class
+                 2) Logical name of output
+                 3) The name of the class
+                    (NULL for all classes)
+                 4) Flag indicating whether to
+                    include instances of subclasses
+                 5) A flag indicating whether to
+                    indent because of module name
+  RETURNS      : The number of instances listed
+  SIDE EFFECTS : Instances listed to logical output
+  NOTES        : Assumes defclass scope flags
+                 are up to date
+ ***************************************************/
+static unsigned long ListInstancesInModule(
+  Environment *theEnv,
+  int id,
+  const char *logicalName,
+  const char *className,
+  bool inheritFlag,
+  bool allModulesFlag)
+  {
+   Defclass *theDefclass;
+   Instance *theInstance;
+   unsigned long count = 0L;
+
+   /* ===================================
+      For the specified module, print out
+      instances of all the classes
+      =================================== */
+   if (className == NULL)
+     {
+      /* ==============================================
+         If instances are being listed for all modules,
+         only list the instances of classes in this
+         module (to avoid listing instances twice)
+         ============================================== */
+      if (allModulesFlag)
+        {
+         for (theDefclass = GetNextDefclass(theEnv,NULL) ;
+              theDefclass != NULL ;
+              theDefclass = GetNextDefclass(theEnv,theDefclass))
+           count += TabulateInstances(theEnv,id,logicalName,
+                                      theDefclass,false,allModulesFlag);
+        }
+
+      /* ===================================================
+         If instances are only be listed for one module,
+         list all instances visible to the module (including
+         ones belonging to classes in other modules)
+         =================================================== */
+      else
+        {
+         theInstance = GetNextInstanceInScope(theEnv,NULL);
+         while (theInstance != NULL)
+           {
+            if (GetHaltExecution(theEnv) == true)
+              { return(count); }
+
+            count++;
+            PrintInstanceNameAndClass(theEnv,logicalName,theInstance,true);
+            theInstance = GetNextInstanceInScope(theEnv,theInstance);
+           }
+        }
+     }
+
+   /* ===================================
+      For the specified module, print out
+      instances of the specified class
+      =================================== */
+   else
+     {
+      theDefclass = LookupDefclassAnywhere(theEnv,GetCurrentModule(theEnv),className);
+      if (theDefclass != NULL)
+        {
+         count += TabulateInstances(theEnv,id,logicalName,
+                                    theDefclass,inheritFlag,allModulesFlag);
+        }
+      else if (! allModulesFlag)
+        ClassExistError(theEnv,"instances",className);
+     }
+   return(count);
+  }
+
+/******************************************************
+  NAME         : TabulateInstances
+  DESCRIPTION  : Displays all instances for a class
+  INPUTS       : 1) The traversal id for the classes
+                 2) The logical name of the output
+                 3) The class address
+                 4) A flag indicating whether to
+                    print out instances of subclasses
+                    or not.
+                 5) A flag indicating whether to
+                    indent because of module name
+  RETURNS      : The number of instances (including
+                    subclasses' instances)
+  SIDE EFFECTS : None
+  NOTES        : None
+ ******************************************************/
+static unsigned long TabulateInstances(
+  Environment *theEnv,
+  int id,
+  const char *logicalName,
+  Defclass *cls,
+  bool inheritFlag,
+  bool allModulesFlag)
+  {
+   Instance *ins;
+   unsigned long i;
+   unsigned long count = 0;
+
+   if (TestTraversalID(cls->traversalRecord,id))
+     return 0L;
+     
+   SetTraversalID(cls->traversalRecord,id);
+   for (ins = cls->instanceList ; ins != NULL ; ins = ins->nxtClass)
+     {
+      if (EvaluationData(theEnv)->HaltExecution)
+        return count;
+      if (allModulesFlag)
+        WriteString(theEnv,logicalName,"   ");
+      PrintInstanceNameAndClass(theEnv,logicalName,ins,true);
+      count++;
+     }
+     
+   if (inheritFlag)
+     {
+      for (i = 0 ; i < cls->directSubclasses.classCount ; i++)
+        {
+         if (EvaluationData(theEnv)->HaltExecution)
+           return count;
+         count += TabulateInstances(theEnv,id,logicalName,
+                     cls->directSubclasses.classArray[i],inheritFlag,allModulesFlag);
+        }
+     }
+    
+   return count;
+  }
+
+#endif
+
+/***************************************************
+  NAME         : PrintInstance
+  DESCRIPTION  : Displays an instance's slots
+  INPUTS       : 1) Logical name for output
+                 2) Instance address
+                 3) String used to separate
+                    slot printouts
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Assumes instance is valid
+ ***************************************************/
+static void PrintInstance(
+  Environment *theEnv,
+  const char *logicalName,
+  Instance *ins,
+  const char *separator)
+  {
+   long i;
+   InstanceSlot *sp;
+
+   PrintInstanceNameAndClass(theEnv,logicalName,ins,false);
+   for (i = 0 ; i < ins->cls->instanceSlotCount ; i++)
+     {
+      WriteString(theEnv,logicalName,separator);
+      sp = ins->slotAddresses[i];
+      WriteString(theEnv,logicalName,"(");
+      WriteString(theEnv,logicalName,sp->desc->slotName->name->contents);
+      if (sp->type != MULTIFIELD_TYPE)
+        {
+         WriteString(theEnv,logicalName," ");
+         PrintAtom(theEnv,logicalName,sp->type,sp->value);
+        }
+      else if (sp->multifieldValue->length != 0)
+        {
+         WriteString(theEnv,logicalName," ");
+         PrintMultifieldDriver(theEnv,logicalName,sp->multifieldValue,0,
+                               sp->multifieldValue->length,false);
+        }
+      WriteString(theEnv,logicalName,")");
+     }
+  }
+
+/***************************************************
+  NAME         : FindISlotByName
+  DESCRIPTION  : Looks up an instance slot by
+                   instance name and slot name
+  INPUTS       : 1) Instance address
+                 2) Instance name-string
+  RETURNS      : The instance slot address, NULL if
+                   does not exist
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static InstanceSlot *FindISlotByName(
+  Environment *theEnv,
+  Instance *theInstance,
+  const char *sname)
+  {
+   CLIPSLexeme *ssym;
+
+   ssym = FindSymbolHN(theEnv,sname,LEXEME_BITS | INSTANCE_NAME_BIT);
+   
+   if (ssym == NULL)
+     { return NULL; }
+
+   return FindInstanceSlot(theEnv,theInstance,ssym);
+  }
+
+#endif /* OBJECT_SYSTEM */
+
diff --git a/clips/inscom.h b/clips/inscom.h
new file mode 100755
index 000000000..3ffb8f866
--- /dev/null
+++ b/clips/inscom.h
@@ -0,0 +1,182 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/14/17            */
+   /*                                                     */
+   /*            INSTANCE COMMAND HEADER MODULE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Loading a binary instance file from a run-time */
+/*            program caused a bus error. DR0866             */
+/*                                                           */
+/*            Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_inscom
+
+#pragma once
+
+#define _H_inscom
+
+typedef enum
+  {
+   UIE_NO_ERROR = 0,
+   UIE_NULL_POINTER_ERROR,
+   UIE_COULD_NOT_DELETE_ERROR,
+   UIE_DELETED_ERROR,
+   UIE_RULE_NETWORK_ERROR
+  } UnmakeInstanceError;
+
+typedef enum
+  {
+   MIE_NO_ERROR = 0,
+   MIE_NULL_POINTER_ERROR,
+   MIE_PARSING_ERROR,
+   MIE_COULD_NOT_CREATE_ERROR,
+   MIE_RULE_NETWORK_ERROR
+  } MakeInstanceError;
+
+typedef enum
+  {
+   IBE_NO_ERROR = 0,
+   IBE_NULL_POINTER_ERROR,
+   IBE_DEFCLASS_NOT_FOUND_ERROR,
+   IBE_COULD_NOT_CREATE_ERROR,
+   IBE_RULE_NETWORK_ERROR
+  } InstanceBuilderError;
+
+typedef enum
+  {
+   IME_NO_ERROR = 0,
+   IME_NULL_POINTER_ERROR,
+   IME_DELETED_ERROR,
+   IME_COULD_NOT_MODIFY_ERROR,
+   IME_RULE_NETWORK_ERROR
+  } InstanceModifierError;
+
+#include "insfun.h"
+#include "object.h"
+
+#define INSTANCE_DATA 29
+
+struct instanceData
+  {
+   Instance DummyInstance;
+   Instance **InstanceTable;
+   bool MaintainGarbageInstances;
+   bool MkInsMsgPass;
+   bool ChangesToInstances;
+   IGARBAGE *InstanceGarbageList;
+   struct patternEntityRecord InstanceInfo;
+   Instance *InstanceList;
+   unsigned long GlobalNumberOfInstances;
+   Instance *CurrentInstance;
+   Instance *InstanceListBottom;
+   bool ObjectModDupMsgValid;
+   UnmakeInstanceError unmakeInstanceError;
+   MakeInstanceError makeInstanceError;
+   InstanceModifierError instanceModifierError;
+   InstanceBuilderError instanceBuilderError;
+  };
+
+#define InstanceData(theEnv) ((struct instanceData *) GetEnvironmentData(theEnv,INSTANCE_DATA))
+
+   void                           SetupInstances(Environment *);
+   UnmakeInstanceError            DeleteInstance(Instance *);
+   UnmakeInstanceError            DeleteAllInstances(Environment *);
+   UnmakeInstanceError            UnmakeInstance(Instance *);
+   bool                           UnmakeInstanceCallback(Instance *,Environment *);
+   UnmakeInstanceError            UnmakeAllInstances(Environment *);
+#if DEBUGGING_FUNCTIONS
+   void                           InstancesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           PPInstanceCommand(Environment *,UDFContext *,UDFValue *);
+   void                           Instances(Environment *,const char *,Defmodule *,const char *,bool);
+#endif
+   Instance                      *MakeInstance(Environment *,const char *);
+   MakeInstanceError              GetMakeInstanceError(Environment *);
+   Instance                      *CreateRawInstance(Environment *,Defclass *,const char *);
+   Instance                      *FindInstance(Environment *,Defmodule *,const char *,bool);
+   bool                           ValidInstanceAddress(Instance *);
+   GetSlotError                   DirectGetSlot(Instance *,const char *,CLIPSValue *);
+   PutSlotError                   DirectPutSlot(Instance *,const char *,CLIPSValue *);
+   PutSlotError                   DirectPutSlotInteger(Instance *,const char *,long long);
+   PutSlotError                   DirectPutSlotFloat(Instance *,const char *,double);
+   PutSlotError                   DirectPutSlotSymbol(Instance *,const char *,const char *);
+   PutSlotError                   DirectPutSlotString(Instance *,const char *,const char *);
+   PutSlotError                   DirectPutSlotInstanceName(Instance *,const char *,const char *);
+   PutSlotError                   DirectPutSlotCLIPSInteger(Instance *,const char *,CLIPSInteger *);
+   PutSlotError                   DirectPutSlotCLIPSFloat(Instance *,const char *,CLIPSFloat *);
+   PutSlotError                   DirectPutSlotCLIPSLexeme(Instance *,const char *,CLIPSLexeme *);
+   PutSlotError                   DirectPutSlotFact(Instance *,const char *,Fact *);
+   PutSlotError                   DirectPutSlotInstance(Instance *,const char *,Instance *);
+   PutSlotError                   DirectPutSlotMultifield(Instance *,const char *,Multifield *);
+   PutSlotError                   DirectPutSlotCLIPSExternalAddress(Instance *,const char *,CLIPSExternalAddress *);
+   const char                    *InstanceName(Instance *);
+   Defclass                      *InstanceClass(Instance *);
+   unsigned long                  GetGlobalNumberOfInstances(Environment *);
+   Instance                      *GetNextInstance(Environment *,Instance *);
+   Instance                      *GetNextInstanceInScope(Environment *,Instance *);
+   Instance                      *GetNextInstanceInClass(Defclass *,Instance *);
+   Instance                      *GetNextInstanceInClassAndSubclasses(Defclass **,Instance *,UDFValue *);
+   void                           InstancePPForm(Instance *,StringBuilder *);
+   void                           ClassCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DeleteInstanceCommand(Environment *,UDFContext *,UDFValue *);
+   void                           UnmakeInstanceCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SymbolToInstanceNameFunction(Environment *,UDFContext *,UDFValue *);
+   void                           InstanceNameToSymbolFunction(Environment *,UDFContext *,UDFValue *);
+   void                           InstanceAddressCommand(Environment *,UDFContext *,UDFValue *);
+   void                           InstanceNameCommand(Environment *,UDFContext *,UDFValue *);
+   void                           InstanceAddressPCommand(Environment *,UDFContext *,UDFValue *);
+   void                           InstanceNamePCommand(Environment *,UDFContext *,UDFValue *);
+   void                           InstancePCommand(Environment *,UDFContext *,UDFValue *);
+   void                           InstanceExistPCommand(Environment *,UDFContext *,UDFValue *);
+   void                           CreateInstanceHandler(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_inscom */
diff --git a/clips/insfile.c b/clips/insfile.c
new file mode 100755
index 000000000..9868b5ff4
--- /dev/null
+++ b/clips/insfile.c
@@ -0,0 +1,1791 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  06/22/18             */
+   /*                                                     */
+   /*         INSTANCE LOAD/SAVE (ASCII/BINARY) MODULE    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  File load/save routines for instances           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            For save-instances, bsave-instances, and       */
+/*            bload-instances, the class name does not       */
+/*            have to be in scope if the module name is      */
+/*            specified.                                     */
+/*                                                           */
+/*      6.31: Prior error flags are cleared before           */
+/*            EnvLoadInstances, EnvRestoreInstances,         */
+/*            EnvLoadInstancesFromString, and                */
+/*            EnvRestoreInstancesFromString are processed.   */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+
+#include <stdlib.h>
+
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include "argacces.h"
+#include "classcom.h"
+#include "classfun.h"
+#include "memalloc.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT
+#include "factmngr.h"
+#endif
+#include "inscom.h"
+#include "insfun.h"
+#include "insmngr.h"
+#include "inspsr.h"
+#include "object.h"
+#include "prntutil.h"
+#include "router.h"
+#include "strngrtr.h"
+#include "symblbin.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "insfile.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define MAX_BLOCK_SIZE 10240
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+struct bsaveSlotValue
+  {
+   unsigned long slotName;
+   unsigned long valueCount;
+  };
+
+struct bsaveSlotValueAtom
+  {
+   unsigned short type;
+   unsigned long value;
+  };
+
+struct classItem
+  {
+   Defclass *classPtr;
+   struct classItem *next;
+  };
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static long                    InstancesSaveCommandParser(UDFContext *,
+                                                             long (*)(Environment *,const char *,
+                                                                      SaveScope,Expression *,bool));
+   static struct classItem       *ProcessSaveClassList(Environment *,const char *,Expression *,SaveScope,bool);
+   static void                    ReturnSaveClassList(Environment *,struct classItem *);
+   static long                    SaveOrMarkInstances(Environment *,FILE *,int,struct classItem *,bool,bool,
+                                                      void (*)(Environment *,FILE *,Instance *));
+   static long                    SaveOrMarkInstancesOfClass(Environment *,FILE *,Defmodule *,int,Defclass *,
+                                                             bool,int,void (*)(Environment *,FILE *,Instance *));
+   static void                    SaveSingleInstanceText(Environment *,FILE *,Instance *);
+   static void                    ProcessFileErrorMessage(Environment *,const char *,const char *);
+#if BSAVE_INSTANCES
+   static void                    WriteBinaryHeader(Environment *,FILE *);
+   static void                    MarkSingleInstance(Environment *,FILE *,Instance *);
+   static void                    MarkNeededAtom(Environment *,unsigned short,void *);
+   static void                    SaveSingleInstanceBinary(Environment *,FILE *,Instance *);
+   static void                    SaveAtomBinary(Environment *,unsigned short,void *,FILE *);
+#endif
+
+   static long                    LoadOrRestoreInstances(Environment *,const char *,bool,bool);
+
+#if BLOAD_INSTANCES
+   static bool                    VerifyBinaryHeader(Environment *,const char *);
+   static bool                    LoadSingleBinaryInstance(Environment *);
+   static void                    BinaryLoadInstanceError(Environment *,CLIPSLexeme *,Defclass *);
+   static void                    CreateSlotValue(Environment *,UDFValue *,struct bsaveSlotValueAtom *,unsigned long);
+   static void                   *GetBinaryAtomValue(Environment *,struct bsaveSlotValueAtom *);
+   static void                    BufferedRead(Environment *,void *,size_t);
+   static void                    FreeReadBuffer(Environment *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupInstanceFileCommands
+  DESCRIPTION  : Defines function interfaces for
+                 saving instances to files
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Functions defined to KB
+  NOTES        : None
+ ***************************************************/
+void SetupInstanceFileCommands(
+  Environment *theEnv)
+  {
+#if BLOAD_INSTANCES || BSAVE_INSTANCES
+   AllocateEnvironmentData(theEnv,INSTANCE_FILE_DATA,sizeof(struct instanceFileData),NULL);
+
+   InstanceFileData(theEnv)->InstanceBinaryPrefixID = "\5\6\7CLIPS";
+   InstanceFileData(theEnv)->InstanceBinaryVersionID = "V6.00";
+#endif
+
+#if (! RUN_TIME)
+   AddUDF(theEnv,"save-instances","l",1,UNBOUNDED,"y;sy",SaveInstancesCommand,"SaveInstancesCommand",NULL);
+   AddUDF(theEnv,"load-instances","l",1,1,"sy",LoadInstancesCommand,"LoadInstancesCommand",NULL);
+   AddUDF(theEnv,"restore-instances","l",1,1,"sy",RestoreInstancesCommand,"RestoreInstancesCommand",NULL);
+
+#if BSAVE_INSTANCES
+   AddUDF(theEnv,"bsave-instances","l",1,UNBOUNDED,"y;sy",BinarySaveInstancesCommand,"BinarySaveInstancesCommand",NULL);
+#endif
+#if BLOAD_INSTANCES
+   AddUDF(theEnv,"bload-instances","l",1,1,"sy",BinaryLoadInstancesCommand,"BinaryLoadInstancesCommand",NULL);
+#endif
+
+#endif
+  }
+
+
+/****************************************************************************
+  NAME         : SaveInstancesCommand
+  DESCRIPTION  : H/L interface for saving
+                   current instances to a file
+  INPUTS       : None
+  RETURNS      : The number of instances saved
+  SIDE EFFECTS : Instances saved to named file
+  NOTES        : H/L Syntax :
+                 (save-instances <file> [local|visible [[inherit] <class>+]])
+ ****************************************************************************/
+void SaveInstancesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->integerValue = CreateInteger(theEnv,InstancesSaveCommandParser(context,SaveInstancesDriver));
+  }
+
+/******************************************************
+  NAME         : LoadInstancesCommand
+  DESCRIPTION  : H/L interface for loading
+                   instances from a file
+  INPUTS       : None
+  RETURNS      : The number of instances loaded
+  SIDE EFFECTS : Instances loaded from named file
+  NOTES        : H/L Syntax : (load-instances <file>)
+ ******************************************************/
+void LoadInstancesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileFound;
+   UDFValue theArg;
+   long instanceCount;
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&theArg))
+     { return; }
+
+   fileFound = theArg.lexemeValue->contents;
+
+   instanceCount = LoadInstances(theEnv,fileFound);
+   if (EvaluationData(theEnv)->EvaluationError)
+     { ProcessFileErrorMessage(theEnv,"load-instances",fileFound); }
+
+   returnValue->integerValue = CreateInteger(theEnv,instanceCount);
+  }
+
+/***************************************************
+  NAME         : LoadInstances
+  DESCRIPTION  : Loads instances from named file
+  INPUTS       : The name of the input file
+  RETURNS      : The number of instances loaded
+  SIDE EFFECTS : Instances loaded from file
+  NOTES        : None
+ ***************************************************/
+long LoadInstances(
+  Environment *theEnv,
+  const char *file)
+  {
+   return(LoadOrRestoreInstances(theEnv,file,true,true));
+  }
+
+/***************************************************
+  NAME         : LoadInstancesFromString
+  DESCRIPTION  : Loads instances from given string
+  INPUTS       : 1) The input string
+                 2) Index of char in string after
+                    last valid char (-1 for all chars)
+  RETURNS      : The number of instances loaded
+  SIDE EFFECTS : Instances loaded from string
+  NOTES        : Uses string routers
+ ***************************************************/
+long LoadInstancesFromString(
+  Environment *theEnv,
+  const char *theString,
+  size_t theMax)
+  {
+   long theCount;
+   const char * theStrRouter = "*** load-instances-from-string ***";
+
+   if ((theMax == SIZE_MAX) ? (! OpenStringSource(theEnv,theStrRouter,theString,0)) :
+                              (! OpenTextSource(theEnv,theStrRouter,theString,0,theMax)))
+     { return -1; }
+
+   theCount = LoadOrRestoreInstances(theEnv,theStrRouter,true,false);
+
+   CloseStringSource(theEnv,theStrRouter);
+
+   return theCount;
+  }
+
+/*********************************************************
+  NAME         : RestoreInstancesCommand
+  DESCRIPTION  : H/L interface for loading
+                   instances from a file w/o messages
+  INPUTS       : None
+  RETURNS      : The number of instances restored
+  SIDE EFFECTS : Instances loaded from named file
+  NOTES        : H/L Syntax : (restore-instances <file>)
+ *********************************************************/
+void RestoreInstancesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileFound;
+   UDFValue theArg;
+   long instanceCount;
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&theArg))
+     { return; }
+
+   fileFound = theArg.lexemeValue->contents;
+
+   instanceCount = RestoreInstances(theEnv,fileFound);
+   if (EvaluationData(theEnv)->EvaluationError)
+     { ProcessFileErrorMessage(theEnv,"restore-instances",fileFound); }
+
+   returnValue->integerValue = CreateInteger(theEnv,instanceCount);
+  }
+
+/***************************************************
+  NAME         : RestoreInstances
+  DESCRIPTION  : Restores instances from named file
+  INPUTS       : The name of the input file
+  RETURNS      : The number of instances restored
+  SIDE EFFECTS : Instances restored from file
+  NOTES        : None
+ ***************************************************/
+long RestoreInstances(
+  Environment *theEnv,
+  const char *file)
+  {
+   return(LoadOrRestoreInstances(theEnv,file,false,true));
+  }
+
+/***************************************************
+  NAME         : RestoreInstancesFromString
+  DESCRIPTION  : Restores instances from given string
+  INPUTS       : 1) The input string
+                 2) Index of char in string after
+                    last valid char (-1 for all chars)
+  RETURNS      : The number of instances loaded
+  SIDE EFFECTS : Instances loaded from string
+  NOTES        : Uses string routers
+ ***************************************************/
+long RestoreInstancesFromString(
+  Environment *theEnv,
+  const char *theString,
+  size_t theMax)
+  {
+   long theCount;
+   const char *theStrRouter = "*** load-instances-from-string ***";
+
+   if ((theMax == SIZE_MAX) ? (! OpenStringSource(theEnv,theStrRouter,theString,0)) :
+                              (! OpenTextSource(theEnv,theStrRouter,theString,0,theMax)))
+     { return(-1); }
+
+   theCount = LoadOrRestoreInstances(theEnv,theStrRouter,false,false);
+
+   CloseStringSource(theEnv,theStrRouter);
+
+   return(theCount);
+  }
+
+#if BLOAD_INSTANCES
+
+/*******************************************************
+  NAME         : BinaryLoadInstancesCommand
+  DESCRIPTION  : H/L interface for loading
+                   instances from a binary file
+  INPUTS       : None
+  RETURNS      : The number of instances loaded
+  SIDE EFFECTS : Instances loaded from named binary file
+  NOTES        : H/L Syntax : (bload-instances <file>)
+ *******************************************************/
+void BinaryLoadInstancesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileFound;
+   UDFValue theArg;
+   long instanceCount;
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&theArg))
+     { return; }
+
+   fileFound = theArg.lexemeValue->contents;
+
+   instanceCount = BinaryLoadInstances(theEnv,fileFound);
+   if (EvaluationData(theEnv)->EvaluationError)
+     { ProcessFileErrorMessage(theEnv,"bload-instances",fileFound); }
+   returnValue->integerValue = CreateInteger(theEnv,instanceCount);
+  }
+
+/****************************************************
+  NAME         : BinaryLoadInstances
+  DESCRIPTION  : Loads instances quickly from a
+                 binary file
+  INPUTS       : The file name
+  RETURNS      : The number of instances loaded
+  SIDE EFFECTS : Instances loaded w/o message-passing
+  NOTES        : None
+ ****************************************************/
+long BinaryLoadInstances(
+  Environment *theEnv,
+  const char *theFile)
+  {
+   long i,instanceCount;
+   GCBlock gcb;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   if (GenOpenReadBinary(theEnv,"bload-instances",theFile) == 0)
+     {
+      OpenErrorMessage(theEnv,"bload-instances",theFile);
+      SetEvaluationError(theEnv,true);
+      return -1L;
+     }
+   if (VerifyBinaryHeader(theEnv,theFile) == false)
+     {
+      GenCloseBinary(theEnv);
+      SetEvaluationError(theEnv,true);
+      return -1L;
+     }
+
+   GCBlockStart(theEnv,&gcb);
+   ReadNeededAtomicValues(theEnv);
+
+   InstanceFileData(theEnv)->BinaryInstanceFileOffset = 0L;
+
+   GenReadBinary(theEnv,&InstanceFileData(theEnv)->BinaryInstanceFileSize,sizeof(unsigned long));
+   GenReadBinary(theEnv,&instanceCount,sizeof(long));
+
+   for (i = 0L ; i < instanceCount ; i++)
+     {
+      if (LoadSingleBinaryInstance(theEnv) == false)
+        {
+         FreeReadBuffer(theEnv);
+         FreeAtomicValueStorage(theEnv);
+         GenCloseBinary(theEnv);
+         SetEvaluationError(theEnv,true);
+         GCBlockEnd(theEnv,&gcb);
+         return i;
+        }
+     }
+
+   FreeReadBuffer(theEnv);
+   FreeAtomicValueStorage(theEnv);
+   GenCloseBinary(theEnv);
+
+   GCBlockEnd(theEnv,&gcb);
+   return instanceCount;
+  }
+
+#endif
+
+/*******************************************************
+  NAME         : SaveInstances
+  DESCRIPTION  : Saves current instances to named file
+  INPUTS       : 1) The name of the output file
+                 2) A flag indicating whether to
+                    save local (current module only)
+                    or visible instances
+                    LOCAL_SAVE or VISIBLE_SAVE
+                 3) A list of expressions containing
+                    the names of classes for which
+                    instances are to be saved
+                 4) A flag indicating if the subclasses
+                    of specified classes shoudl also
+                    be processed
+  RETURNS      : The number of instances saved
+  SIDE EFFECTS : Instances saved to file
+  NOTES        : None
+ *******************************************************/
+long SaveInstances(
+  Environment *theEnv,
+  const char *file,
+  SaveScope saveCode)
+  {
+   return SaveInstancesDriver(theEnv,file,saveCode,NULL,true);
+  }
+
+/*******************************************************
+  NAME         : SaveInstancesDriver
+  DESCRIPTION  : Saves current instances to named file
+  INPUTS       : 1) The name of the output file
+                 2) A flag indicating whether to
+                    save local (current module only)
+                    or visible instances
+                    LOCAL_SAVE or VISIBLE_SAVE
+                 3) A list of expressions containing
+                    the names of classes for which
+                    instances are to be saved
+                 4) A flag indicating if the subclasses
+                    of specified classes shoudl also
+                    be processed
+  RETURNS      : The number of instances saved
+  SIDE EFFECTS : Instances saved to file
+  NOTES        : None
+ *******************************************************/
+long SaveInstancesDriver(
+  Environment *theEnv,
+  const char *file,
+  SaveScope saveCode,
+  Expression *classExpressionList,
+  bool inheritFlag)
+  {
+   FILE *sfile = NULL;
+   bool oldPEC, oldATS, oldIAN;
+   struct classItem *classList;
+   long instanceCount;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   classList = ProcessSaveClassList(theEnv,"save-instances",classExpressionList,
+                                    saveCode,inheritFlag);
+   if ((classList == NULL) && (classExpressionList != NULL))
+     return(0L);
+
+   SaveOrMarkInstances(theEnv,sfile,saveCode,classList,
+                             inheritFlag,true,NULL);
+
+   if ((sfile = GenOpen(theEnv,file,"w")) == NULL)
+     {
+      OpenErrorMessage(theEnv,"save-instances",file);
+      ReturnSaveClassList(theEnv,classList);
+      SetEvaluationError(theEnv,true);
+      return(0L);
+     }
+
+   oldPEC = PrintUtilityData(theEnv)->PreserveEscapedCharacters;
+   PrintUtilityData(theEnv)->PreserveEscapedCharacters = true;
+   oldATS = PrintUtilityData(theEnv)->AddressesToStrings;
+   PrintUtilityData(theEnv)->AddressesToStrings = true;
+   oldIAN = PrintUtilityData(theEnv)->InstanceAddressesToNames;
+   PrintUtilityData(theEnv)->InstanceAddressesToNames = true;
+
+   SetFastSave(theEnv,sfile);
+   instanceCount = SaveOrMarkInstances(theEnv,sfile,saveCode,classList,
+                                       inheritFlag,true,SaveSingleInstanceText);
+   GenClose(theEnv,sfile);
+   SetFastSave(theEnv,NULL);
+
+   PrintUtilityData(theEnv)->PreserveEscapedCharacters = oldPEC;
+   PrintUtilityData(theEnv)->AddressesToStrings = oldATS;
+   PrintUtilityData(theEnv)->InstanceAddressesToNames = oldIAN;
+   ReturnSaveClassList(theEnv,classList);
+   return(instanceCount);
+  }
+
+#if BSAVE_INSTANCES
+
+/****************************************************************************
+  NAME         : BinarySaveInstancesCommand
+  DESCRIPTION  : H/L interface for saving
+                   current instances to a binary file
+  INPUTS       : None
+  RETURNS      : The number of instances saved
+  SIDE EFFECTS : Instances saved (in binary format) to named file
+  NOTES        : H/L Syntax :
+                 (bsave-instances <file> [local|visible [[inherit] <class>+]])
+ *****************************************************************************/
+void BinarySaveInstancesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->integerValue = CreateInteger(theEnv,InstancesSaveCommandParser(context,BinarySaveInstancesDriver));
+  }
+
+/*******************************************************
+  NAME         : BinarySaveInstances
+  DESCRIPTION  : Saves current instances to binary file
+  INPUTS       : 1) The name of the output file
+                 2) A flag indicating whether to
+                    save local (current module only)
+                    or visible instances
+                    LOCAL_SAVE or VISIBLE_SAVE
+  RETURNS      : The number of instances saved
+  SIDE EFFECTS : Instances saved to file
+  NOTES        : None
+ *******************************************************/
+long BinarySaveInstances(
+  Environment *theEnv,
+  const char *file,
+  SaveScope saveCode)
+  {
+   return BinarySaveInstancesDriver(theEnv,file,saveCode,NULL,true);
+  }
+
+/*******************************************************
+  NAME         : BinarySaveInstancesDriver
+  DESCRIPTION  : Saves current instances to binary file
+  INPUTS       : 1) The name of the output file
+                 2) A flag indicating whether to
+                    save local (current module only)
+                    or visible instances
+                    LOCAL_SAVE or VISIBLE_SAVE
+                 3) A list of expressions containing
+                    the names of classes for which
+                    instances are to be saved
+                 4) A flag indicating if the subclasses
+                    of specified classes shoudl also
+                    be processed
+  RETURNS      : The number of instances saved
+  SIDE EFFECTS : Instances saved to file
+  NOTES        : None
+ *******************************************************/
+long BinarySaveInstancesDriver(
+  Environment *theEnv,
+  const char *file,
+  SaveScope saveCode,
+  Expression *classExpressionList,
+  bool inheritFlag)
+  {
+   struct classItem *classList;
+   FILE *bsaveFP;
+   long instanceCount;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   classList = ProcessSaveClassList(theEnv,"bsave-instances",classExpressionList,
+                                    saveCode,inheritFlag);
+   if ((classList == NULL) && (classExpressionList != NULL))
+     return(0L);
+
+   InstanceFileData(theEnv)->BinaryInstanceFileSize = 0L;
+   InitAtomicValueNeededFlags(theEnv);
+   instanceCount = SaveOrMarkInstances(theEnv,NULL,saveCode,classList,inheritFlag,
+                                       false,MarkSingleInstance);
+
+   if ((bsaveFP = GenOpen(theEnv,file,"wb")) == NULL)
+     {
+      OpenErrorMessage(theEnv,"bsave-instances",file);
+      ReturnSaveClassList(theEnv,classList);
+      SetEvaluationError(theEnv,true);
+      return(0L);
+     }
+   WriteBinaryHeader(theEnv,bsaveFP);
+   WriteNeededAtomicValues(theEnv,bsaveFP);
+
+   fwrite(&InstanceFileData(theEnv)->BinaryInstanceFileSize,sizeof(unsigned long),1,bsaveFP);
+   fwrite(&instanceCount,sizeof(long),1,bsaveFP);
+
+   SetAtomicValueIndices(theEnv,false);
+   SaveOrMarkInstances(theEnv,bsaveFP,saveCode,classList,
+                       inheritFlag,false,SaveSingleInstanceBinary);
+   RestoreAtomicValueBuckets(theEnv);
+   GenClose(theEnv,bsaveFP);
+   ReturnSaveClassList(theEnv,classList);
+   return(instanceCount);
+  }
+
+#endif
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/******************************************************
+  NAME         : InstancesSaveCommandParser
+  DESCRIPTION  : Argument parser for save-instances
+                 and bsave-instances
+  INPUTS       : 1) The name of the calling function
+                 2) A pointer to the support
+                    function to call for the save/bsave
+  RETURNS      : The number of instances saved
+  SIDE EFFECTS : Instances saved/bsaved
+  NOTES        : None
+ ******************************************************/
+static long InstancesSaveCommandParser(
+  UDFContext *context,
+  long (*saveFunction)(Environment *,const char *,SaveScope,Expression *,bool))
+  {
+   const char *fileFound;
+   UDFValue temp;
+   unsigned int argCount;
+   SaveScope saveCode = LOCAL_SAVE;
+   Expression *classList = NULL;
+   bool inheritFlag = false;
+   Environment *theEnv = context->environment;
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&temp))
+     { return 0L; }
+   fileFound = temp.lexemeValue->contents;
+
+   argCount = UDFArgumentCount(context);
+   if (argCount > 1)
+     {
+      if (! UDFNextArgument(context,SYMBOL_BIT,&temp))
+        { return 0L; }
+
+      if (strcmp(temp.lexemeValue->contents,"local") == 0)
+        saveCode = LOCAL_SAVE;
+      else if (strcmp(temp.lexemeValue->contents,"visible") == 0)
+        saveCode = VISIBLE_SAVE;
+      else
+        {
+         UDFInvalidArgumentMessage(context,"symbol \"local\" or \"visible\"");
+         SetEvaluationError(theEnv,true);
+         return(0L);
+        }
+      classList = GetFirstArgument()->nextArg->nextArg;
+
+      /* ===========================
+         Check for "inherit" keyword
+         Must be at least one class
+         name following
+         =========================== */
+      if ((classList != NULL) ? (classList->nextArg != NULL) : false)
+        {
+         if ((classList->type != SYMBOL_TYPE) ? false :
+             (strcmp(classList->lexemeValue->contents,"inherit") == 0))
+           {
+            inheritFlag = true;
+            classList = classList->nextArg;
+           }
+        }
+     }
+
+   return((*saveFunction)(theEnv,fileFound,saveCode,classList,inheritFlag));
+  }
+
+/****************************************************
+  NAME         : ProcessSaveClassList
+  DESCRIPTION  : Evaluates a list of class name
+                 expressions and stores them in a
+                 data object list
+  INPUTS       : 1) The name of the calling function
+                 2) The class expression list
+                 3) A flag indicating if only local
+                    or all visible instances are
+                    being saved
+                 4) A flag indicating if inheritance
+                    relationships should be checked
+                    between classes
+  RETURNS      : The evaluated class pointer data
+                 objects - NULL on errors
+  SIDE EFFECTS : Data objects allocated and
+                 classes validated
+  NOTES        : None
+ ****************************************************/
+static struct classItem *ProcessSaveClassList(
+  Environment *theEnv,
+  const char *functionName,
+  Expression *classExps,
+  SaveScope saveCode,
+  bool inheritFlag)
+  {
+   struct classItem *head = NULL, *prv, *newItem;
+   UDFValue tmp;
+   Defclass *theDefclass;
+   Defmodule *currentModule;
+   unsigned int argIndex = inheritFlag ? 4 : 3;
+
+   currentModule = GetCurrentModule(theEnv);
+   while (classExps != NULL)
+     {
+      if (EvaluateExpression(theEnv,classExps,&tmp))
+        goto ProcessClassListError;
+
+      if (tmp.header->type != SYMBOL_TYPE)
+        goto ProcessClassListError;
+        
+      if (saveCode == LOCAL_SAVE)
+        { theDefclass = LookupDefclassAnywhere(theEnv,currentModule,tmp.lexemeValue->contents); }
+      else
+        { theDefclass = LookupDefclassByMdlOrScope(theEnv,tmp.lexemeValue->contents); }
+
+      if (theDefclass == NULL)
+        goto ProcessClassListError;
+      else if (theDefclass->abstract && (inheritFlag == false))
+        goto ProcessClassListError;
+        
+      prv = newItem = head;
+      while (newItem != NULL)
+        {
+         if (newItem->classPtr == theDefclass)
+           goto ProcessClassListError;
+         else if (inheritFlag)
+           {
+            if (HasSuperclass(newItem->classPtr,theDefclass) ||
+                HasSuperclass(theDefclass,newItem->classPtr))
+             goto ProcessClassListError;
+           }
+         prv = newItem;
+         newItem = newItem->next;
+        }
+        
+      newItem = get_struct(theEnv,classItem);
+      newItem->classPtr = theDefclass;
+      newItem->next = NULL;
+      
+      if (prv == NULL)
+        head = newItem;
+      else
+        prv->next = newItem;
+        
+      argIndex++;
+      classExps = classExps->nextArg;
+     }
+   return head;
+
+ProcessClassListError:
+   if (inheritFlag)
+     ExpectedTypeError1(theEnv,functionName,argIndex,"'valid class name'");
+   else
+     ExpectedTypeError1(theEnv,functionName,argIndex,"'valid concrete class name'");
+   
+   ReturnSaveClassList(theEnv,head);
+   
+   SetEvaluationError(theEnv,true);
+   return NULL;
+  }
+
+/****************************************************
+  NAME         : ReturnSaveClassList
+  DESCRIPTION  : Deallocates the class data object
+                 list created by ProcessSaveClassList
+  INPUTS       : The class data object list
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Class data object returned
+  NOTES        : None
+ ****************************************************/
+static void ReturnSaveClassList(
+  Environment *theEnv,
+  struct classItem *classList)
+  {
+   struct classItem *tmp;
+
+   while (classList != NULL)
+     {
+      tmp = classList;
+      classList = classList->next;
+      rtn_struct(theEnv,classItem,tmp);
+     }
+  }
+
+/***************************************************
+  NAME         : SaveOrMarkInstances
+  DESCRIPTION  : Iterates through all specified
+                 instances either marking needed
+                 atoms or writing instances in
+                 binary/text format
+  INPUTS       : 1) NULL (for marking) or
+                    file pointer (for text/binary saves)
+                 2) A cope flag indicating LOCAL
+                    or VISIBLE saves only
+                 3) A list of data objects
+                    containing the names of classes
+                    of instances to be saved
+                 4) A flag indicating whether to
+                    include subclasses of arg #3
+                 5) A flag indicating if the
+                    iteration can be interrupted
+                    or not
+                 6) The access function to mark
+                    or save an instance (can be NULL
+                    if only counting instances)
+  RETURNS      : The number of instances saved
+  SIDE EFFECTS : Instances amrked or saved
+  NOTES        : None
+ ***************************************************/
+static long SaveOrMarkInstances(
+  Environment *theEnv,
+  FILE *theOutput,
+  int saveCode,
+  struct classItem *classList,
+  bool inheritFlag,
+  bool interruptOK,
+  void (*saveInstanceFunc)(Environment *,FILE *,Instance *))
+  {
+   Defmodule *currentModule;
+   int traversalID;
+   struct classItem *tmp;
+   Instance *ins;
+   long instanceCount = 0L;
+
+   currentModule = GetCurrentModule(theEnv);
+   if (classList != NULL)
+     {
+      traversalID = GetTraversalID(theEnv);
+      if (traversalID != -1)
+        {
+         for (tmp = classList ;
+              (! ((tmp == NULL) || (EvaluationData(theEnv)->HaltExecution && interruptOK))) ;
+              tmp = tmp->next)
+           instanceCount += SaveOrMarkInstancesOfClass(theEnv,theOutput,currentModule,saveCode,
+                                                       tmp->classPtr,inheritFlag,
+                                                       traversalID,saveInstanceFunc);
+         ReleaseTraversalID(theEnv);
+        }
+     }
+   else
+     {
+      for (ins = GetNextInstanceInScope(theEnv,NULL) ;
+           (ins != NULL) && (EvaluationData(theEnv)->HaltExecution != true) ;
+           ins = GetNextInstanceInScope(theEnv,ins))
+        {
+         if ((saveCode == VISIBLE_SAVE) ? true :
+             (ins->cls->header.whichModule->theModule == currentModule))
+           {
+            if (saveInstanceFunc != NULL)
+              (*saveInstanceFunc)(theEnv,theOutput,ins);
+            instanceCount++;
+           }
+        }
+     }
+   return(instanceCount);
+  }
+
+/***************************************************
+  NAME         : SaveOrMarkInstancesOfClass
+  DESCRIPTION  : Saves off the direct (and indirect)
+                 instance of the specified class
+  INPUTS       : 1) The logical name of the output
+                    (or file pointer for binary
+                     output)
+                 2) The current module
+                 3) A flag indicating local
+                    or visible saves
+                 4) The defclass
+                 5) A flag indicating whether to
+                    save subclass instances or not
+                 6) A traversal id for marking
+                    visited classes
+                 7) A pointer to the instance
+                    manipulation function to call
+                    (can be NULL for only counting
+                     instances)
+  RETURNS      : The number of instances saved
+  SIDE EFFECTS : Appropriate instances saved
+  NOTES        : None
+ ***************************************************/
+static long SaveOrMarkInstancesOfClass(
+  Environment *theEnv,
+  FILE *theOutput,
+  Defmodule *currentModule,
+  int saveCode,
+  Defclass *theDefclass,
+  bool inheritFlag,
+  int traversalID,
+  void (*saveInstanceFunc)(Environment *,FILE *,Instance *))
+  {
+   Instance *theInstance;
+   Defclass *subclass;
+   unsigned long i;
+   long instanceCount = 0L;
+
+   if (TestTraversalID(theDefclass->traversalRecord,traversalID))
+     return(instanceCount);
+   SetTraversalID(theDefclass->traversalRecord,traversalID);
+   if (((saveCode == LOCAL_SAVE) &&
+        (theDefclass->header.whichModule->theModule == currentModule)) ||
+       ((saveCode == VISIBLE_SAVE) &&
+        DefclassInScope(theEnv,theDefclass,currentModule)))
+     {
+      for (theInstance = GetNextInstanceInClass(theDefclass,NULL);
+           theInstance != NULL;
+           theInstance = GetNextInstanceInClass(theDefclass,theInstance))
+        {
+         if (saveInstanceFunc != NULL)
+           (*saveInstanceFunc)(theEnv,theOutput,theInstance);
+         instanceCount++;
+        }
+     }
+   if (inheritFlag)
+     {
+      for (i = 0 ; i < theDefclass->directSubclasses.classCount ; i++)
+        {
+         subclass = theDefclass->directSubclasses.classArray[i];
+           instanceCount += SaveOrMarkInstancesOfClass(theEnv,theOutput,currentModule,saveCode,
+                                                       subclass,true,traversalID,
+                                                       saveInstanceFunc);
+        }
+     }
+   return(instanceCount);
+  }
+
+/***************************************************
+  NAME         : SaveSingleInstanceText
+  DESCRIPTION  : Writes given instance to file
+  INPUTS       : 1) The logical name of the output
+                 2) The instance to save
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance written
+  NOTES        : None
+ ***************************************************/
+static void SaveSingleInstanceText(
+  Environment *theEnv,
+  FILE *fastSaveFile,
+  Instance *theInstance)
+  {
+   long i;
+   InstanceSlot *sp;
+   const char *logicalName = (const char *) fastSaveFile;
+
+   WriteString(theEnv,logicalName,"([");
+   WriteString(theEnv,logicalName,theInstance->name->contents);
+   WriteString(theEnv,logicalName,"] of ");
+   WriteString(theEnv,logicalName,theInstance->cls->header.name->contents);
+   for (i = 0 ; i < theInstance->cls->instanceSlotCount ; i++)
+     {
+      sp = theInstance->slotAddresses[i];
+      WriteString(theEnv,logicalName,"\n   (");
+      WriteString(theEnv,logicalName,sp->desc->slotName->name->contents);
+      if (sp->type != MULTIFIELD_TYPE)
+        {
+         WriteString(theEnv,logicalName," ");
+         PrintAtom(theEnv,logicalName,sp->type,sp->value);
+        }
+      else if (sp->multifieldValue->length != 0)
+        {
+         WriteString(theEnv,logicalName," ");
+         PrintMultifieldDriver(theEnv,logicalName,sp->multifieldValue,0,
+                               sp->multifieldValue->length,false);
+        }
+      WriteString(theEnv,logicalName,")");
+     }
+   WriteString(theEnv,logicalName,")\n\n");
+  }
+
+#if BSAVE_INSTANCES
+
+/***************************************************
+  NAME         : WriteBinaryHeader
+  DESCRIPTION  : Writes identifying string to
+                 instance binary file to assist in
+                 later verification
+  INPUTS       : The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary prefix headers written
+  NOTES        : None
+ ***************************************************/
+static void WriteBinaryHeader(
+  Environment *theEnv,
+  FILE *bsaveFP)
+  {
+   fwrite(InstanceFileData(theEnv)->InstanceBinaryPrefixID,
+          (STD_SIZE) (strlen(InstanceFileData(theEnv)->InstanceBinaryPrefixID) + 1),1,bsaveFP);
+   fwrite(InstanceFileData(theEnv)->InstanceBinaryVersionID,
+          (STD_SIZE) (strlen(InstanceFileData(theEnv)->InstanceBinaryVersionID) + 1),1,bsaveFP);
+  }
+
+/***************************************************
+  NAME         : MarkSingleInstance
+  DESCRIPTION  : Marks all the atoms needed in
+                 the slot values of an instance
+  INPUTS       : 1) The output (ignored)
+                 2) The instance
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance slot value atoms marked
+  NOTES        : None
+ ***************************************************/
+static void MarkSingleInstance(
+  Environment *theEnv,
+  FILE *theOutput,
+  Instance *theInstance)
+  {
+#if MAC_XCD
+#pragma unused(theOutput)
+#endif
+   InstanceSlot *sp;
+   unsigned int i;
+   size_t j;
+
+   InstanceFileData(theEnv)->BinaryInstanceFileSize += (sizeof(long) * 2);
+   theInstance->name->neededSymbol = true;
+   theInstance->cls->header.name->neededSymbol = true;
+   InstanceFileData(theEnv)->BinaryInstanceFileSize +=
+                       ((sizeof(long) * 2) +
+                        (sizeof(struct bsaveSlotValue) *
+                         theInstance->cls->instanceSlotCount) +
+                        sizeof(unsigned long) +
+                        sizeof(unsigned));
+   for (i = 0 ; i < theInstance->cls->instanceSlotCount ; i++)
+     {
+      sp = theInstance->slotAddresses[i];
+      sp->desc->slotName->name->neededSymbol = true;
+      if (sp->desc->multiple)
+        {
+         for (j = 0 ; j < sp->multifieldValue->length ; j++)
+           MarkNeededAtom(theEnv,sp->multifieldValue->contents[j].header->type,
+                                 sp->multifieldValue->contents[j].value);
+        }
+      else
+        MarkNeededAtom(theEnv,sp->type,sp->value);
+     }
+  }
+
+/***************************************************
+  NAME         : MarkNeededAtom
+  DESCRIPTION  : Marks an integer/float/symbol as
+                 being need by a set of instances
+  INPUTS       : 1) The type of atom
+                 2) The value of the atom
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Atom marked for saving
+  NOTES        : None
+ ***************************************************/
+static void MarkNeededAtom(
+  Environment *theEnv,
+  unsigned short type,
+  void *value)
+  {
+   InstanceFileData(theEnv)->BinaryInstanceFileSize += sizeof(struct bsaveSlotValueAtom);
+
+   /* =====================================
+      Assumes slot value atoms  can only be
+      floats, integers, symbols, strings,
+      instance-names, instance-addresses,
+      fact-addresses or external-addresses
+      ===================================== */
+   switch (type)
+     {
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+      case INSTANCE_NAME_TYPE:
+         ((CLIPSLexeme *) value)->neededSymbol = true;
+         break;
+      case FLOAT_TYPE:
+         ((CLIPSFloat *) value)->neededFloat = true;
+         break;
+      case INTEGER_TYPE:
+         ((CLIPSInteger *) value)->neededInteger = true;
+         break;
+      case INSTANCE_ADDRESS_TYPE:
+         GetFullInstanceName(theEnv,(Instance *) value)->neededSymbol = true;
+         break;
+     }
+  }
+
+/****************************************************
+  NAME         : SaveSingleInstanceBinary
+  DESCRIPTION  : Writes given instance to binary file
+  INPUTS       : 1) Binary file pointer
+                 2) The instance to save
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance written
+  NOTES        : None
+ ****************************************************/
+static void SaveSingleInstanceBinary(
+  Environment *theEnv,
+  FILE *bsaveFP,
+  Instance *theInstance)
+  {
+   unsigned long nameIndex;
+   unsigned long i;
+   size_t j;
+   InstanceSlot *sp;
+   struct bsaveSlotValue bs;
+   unsigned long totalValueCount = 0;
+   size_t slotLen;
+
+   /*==============================*/
+   /* Write out the instance name. */
+   /*==============================*/
+   
+   nameIndex = theInstance->name->bucket;
+   fwrite(&nameIndex,sizeof(unsigned long),1,bsaveFP);
+
+   /*===========================*/
+   /* Write out the class name. */
+   /*===========================*/
+   
+   nameIndex = theInstance->cls->header.name->bucket;
+   fwrite(&nameIndex,sizeof(unsigned long),1,bsaveFP);
+
+   /*=========================================*/
+   /* Write out the number of slot-overrides. */
+   /*=========================================*/
+   
+   fwrite(&theInstance->cls->instanceSlotCount,
+          sizeof(short),1,bsaveFP);
+
+   /*============================================*/
+   /* Write out the slot names and value counts. */
+   /*============================================*/
+   
+   for (i = 0 ; i < theInstance->cls->instanceSlotCount ; i++)
+     {
+      sp = theInstance->slotAddresses[i];
+
+      /* ===============================================
+         Write out the number of atoms in the slot value
+         =============================================== */
+      bs.slotName = sp->desc->slotName->name->bucket;
+      bs.valueCount = (unsigned long) (sp->desc->multiple ? sp->multifieldValue->length : 1);
+      fwrite(&bs,sizeof(struct bsaveSlotValue),1,bsaveFP);
+      totalValueCount += bs.valueCount;
+     }
+
+   /* ==================================
+      Write out the number of slot value
+      atoms for the whole instance
+      ================================== */
+   if (theInstance->cls->instanceSlotCount != 0) // (totalValueCount != 0L) : Bug fix if any slots, write out count
+     fwrite(&totalValueCount,sizeof(unsigned long),1,bsaveFP);
+
+   /* ==============================
+      Write out the slot value atoms
+      ============================== */
+   for (i = 0 ; i < theInstance->cls->instanceSlotCount ; i++)
+     {
+      sp = theInstance->slotAddresses[i];
+      slotLen = sp->desc->multiple ? sp->multifieldValue->length : 1;
+
+      /* =========================================
+         Write out the type and index of each atom
+         ========================================= */
+      if (sp->desc->multiple)
+        {
+         for (j = 0 ; j < slotLen ; j++)
+           SaveAtomBinary(theEnv,sp->multifieldValue->contents[j].header->type,
+                                 sp->multifieldValue->contents[j].value,bsaveFP);
+        }
+      else
+        SaveAtomBinary(theEnv,sp->type,sp->value,bsaveFP);
+     }
+  }
+
+/***************************************************
+  NAME         : SaveAtomBinary
+  DESCRIPTION  : Writes out an instance slot value
+                 atom to the binary file
+  INPUTS       : 1) The atom type
+                 2) The atom value
+                 3) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : atom written
+  NOTES        :
+ ***************************************************/
+static void SaveAtomBinary(
+  Environment *theEnv,
+  unsigned short type,
+  void *value,
+  FILE *bsaveFP)
+  {
+   struct bsaveSlotValueAtom bsa;
+
+   /* =====================================
+      Assumes slot value atoms  can only be
+      floats, integers, symbols, strings,
+      instance-names, instance-addresses,
+      fact-addresses or external-addresses
+      ===================================== */
+   bsa.type = type;
+   switch (type)
+     {
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+      case INSTANCE_NAME_TYPE:
+         bsa.value = ((CLIPSLexeme *) value)->bucket;
+         break;
+      case FLOAT_TYPE:
+         bsa.value = ((CLIPSFloat *) value)->bucket;
+         break;
+      case INTEGER_TYPE:
+         bsa.value = ((CLIPSInteger *) value)->bucket;
+         break;
+      case INSTANCE_ADDRESS_TYPE:
+         bsa.type = INSTANCE_NAME_TYPE;
+         bsa.value = GetFullInstanceName(theEnv,(Instance *) value)->bucket;
+         break;
+      default:
+         bsa.value = ULONG_MAX;
+     }
+     
+   fwrite(&bsa,sizeof(struct bsaveSlotValueAtom),1,bsaveFP);
+  }
+
+#endif
+
+/**********************************************************************
+  NAME         : LoadOrRestoreInstances
+  DESCRIPTION  : Loads instances from named file
+  INPUTS       : 1) The name of the input file
+                 2) An integer flag indicating whether or
+                    not to use message-passing to create
+                    the new instances and delete old versions
+                 3) An integer flag indicating if arg #1
+                    is a file name or the name of a string router
+  RETURNS      : The number of instances loaded/restored
+  SIDE EFFECTS : Instances loaded from file
+  NOTES        : None
+ **********************************************************************/
+static long LoadOrRestoreInstances(
+  Environment *theEnv,
+  const char *file,
+  bool usemsgs,
+  bool isFileName)
+  {
+   UDFValue temp;
+   FILE *sfile = NULL,*svload = NULL;
+   const char *ilog;
+   Expression *top;
+   bool svoverride;
+   long instanceCount = 0L;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   if (isFileName)
+     {
+      if ((sfile = GenOpen(theEnv,file,"r")) == NULL)
+        {
+         SetEvaluationError(theEnv,true);
+         return -1L;
+        }
+      svload = GetFastLoad(theEnv);
+      ilog = (char *) sfile;
+      SetFastLoad(theEnv,sfile);
+     }
+   else
+     { ilog = file; }
+     
+   top = GenConstant(theEnv,FCALL,FindFunction(theEnv,"make-instance"));
+   GetToken(theEnv,ilog,&DefclassData(theEnv)->ObjectParseToken);
+   svoverride = InstanceData(theEnv)->MkInsMsgPass;
+   InstanceData(theEnv)->MkInsMsgPass = usemsgs;
+
+   while ((DefclassData(theEnv)->ObjectParseToken.tknType != STOP_TOKEN) && (EvaluationData(theEnv)->HaltExecution != true))
+     {
+      if (DefclassData(theEnv)->ObjectParseToken.tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"instance definition");
+         rtn_struct(theEnv,expr,top);
+         if (isFileName)
+           {
+            GenClose(theEnv,sfile);
+            SetFastLoad(theEnv,svload);
+           }
+         SetEvaluationError(theEnv,true);
+         InstanceData(theEnv)->MkInsMsgPass = svoverride;
+         return instanceCount;
+        }
+        
+      if (ParseSimpleInstance(theEnv,top,ilog) == NULL)
+        {
+         if (isFileName)
+           {
+            GenClose(theEnv,sfile);
+            SetFastLoad(theEnv,svload);
+           }
+         InstanceData(theEnv)->MkInsMsgPass = svoverride;
+         SetEvaluationError(theEnv,true);
+         return instanceCount;
+        }
+      ExpressionInstall(theEnv,top);
+      EvaluateExpression(theEnv,top,&temp);
+      ExpressionDeinstall(theEnv,top);
+      if (! EvaluationData(theEnv)->EvaluationError)
+        { instanceCount++; }
+      ReturnExpression(theEnv,top->argList);
+      top->argList = NULL;
+      GetToken(theEnv,ilog,&DefclassData(theEnv)->ObjectParseToken);
+     }
+     
+   rtn_struct(theEnv,expr,top);
+   if (isFileName)
+     {
+      GenClose(theEnv,sfile);
+      SetFastLoad(theEnv,svload);
+     }
+   InstanceData(theEnv)->MkInsMsgPass = svoverride;
+   return instanceCount;
+  }
+
+/***************************************************
+  NAME         : ProcessFileErrorMessage
+  DESCRIPTION  : Prints an error message when a
+                 file containing text or binary
+                 instances cannot be processed.
+  INPUTS       : The name of the input file and the
+                 function which opened it.
+  RETURNS      : No value
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static void ProcessFileErrorMessage(
+  Environment *theEnv,
+  const char *functionName,
+  const char *fileName)
+  {
+   PrintErrorID(theEnv,"INSFILE",1,false);
+   WriteString(theEnv,STDERR,"Function '");
+   WriteString(theEnv,STDERR,functionName);
+   WriteString(theEnv,STDERR,"' could not completely process file '");
+   WriteString(theEnv,STDERR,fileName);
+   WriteString(theEnv,STDERR,"'.\n");
+  }
+
+#if BLOAD_INSTANCES
+
+/*******************************************************
+  NAME         : VerifyBinaryHeader
+  DESCRIPTION  : Reads the prefix and version headers
+                 from a file to verify that the
+                 input is a valid binary instances file
+  INPUTS       : The name of the file
+  RETURNS      : True if OK, false otherwise
+  SIDE EFFECTS : Input prefix and version read
+  NOTES        : Assumes file already open with
+                 GenOpenReadBinary
+ *******************************************************/
+static bool VerifyBinaryHeader(
+  Environment *theEnv,
+  const char *theFile)
+  {
+   char buf[20];
+
+   GenReadBinary(theEnv,buf,(strlen(InstanceFileData(theEnv)->InstanceBinaryPrefixID) + 1));
+   if (strcmp(buf,InstanceFileData(theEnv)->InstanceBinaryPrefixID) != 0)
+     {
+      PrintErrorID(theEnv,"INSFILE",2,false);
+      WriteString(theEnv,STDERR,"File '");
+      WriteString(theEnv,STDERR,theFile);
+      WriteString(theEnv,STDERR,"' is not a binary instances file.\n");
+      return false;
+     }
+   GenReadBinary(theEnv,buf,(strlen(InstanceFileData(theEnv)->InstanceBinaryVersionID) + 1));
+   if (strcmp(buf,InstanceFileData(theEnv)->InstanceBinaryVersionID) != 0)
+     {
+      PrintErrorID(theEnv,"INSFILE",3,false);
+      WriteString(theEnv,STDERR,"File '");
+      WriteString(theEnv,STDERR,theFile);
+      WriteString(theEnv,STDERR,"' is not a compatible binary instances file.\n");
+      return false;
+     }
+   return true;
+  }
+
+/***************************************************
+  NAME         : LoadSingleBinaryInstance
+  DESCRIPTION  : Reads the binary data for a new
+                 instance and its slot values and
+                 creates/initializes the instance
+  INPUTS       : None
+  RETURNS      : True if all OK,
+                 false otherwise
+  SIDE EFFECTS : Binary data read and instance
+                 created
+  NOTES        : Uses global GenReadBinary(theEnv,)
+ ***************************************************/
+static bool LoadSingleBinaryInstance(
+  Environment *theEnv)
+  {
+   CLIPSLexeme *instanceName,
+             *className;
+   unsigned short slotCount;
+   Defclass *theDefclass;
+   Instance *newInstance;
+   struct bsaveSlotValue *bsArray;
+   struct bsaveSlotValueAtom *bsaArray = NULL;
+   long nameIndex;
+   unsigned long totalValueCount;
+   long i, j;
+   InstanceSlot *sp;
+   UDFValue slotValue, junkValue;
+
+   /* =====================
+      Get the instance name
+      ===================== */
+   BufferedRead(theEnv,&nameIndex,sizeof(long));
+   instanceName = SymbolPointer(nameIndex);
+
+   /* ==================
+      Get the class name
+      ================== */
+   BufferedRead(theEnv,&nameIndex,sizeof(long));
+   className = SymbolPointer(nameIndex);
+
+   /* ==================
+      Get the slot count
+      ================== */
+   BufferedRead(theEnv,&slotCount,sizeof(unsigned short));
+
+   /* =============================
+      Make sure the defclass exists
+      and check the slot count
+      ============================= */
+   theDefclass = LookupDefclassByMdlOrScope(theEnv,className->contents);
+   if (theDefclass == NULL)
+     {
+      ClassExistError(theEnv,"bload-instances",className->contents);
+      return false;
+     }
+   if (theDefclass->instanceSlotCount != slotCount)
+     {
+      BinaryLoadInstanceError(theEnv,instanceName,theDefclass);
+      return false;
+     }
+
+   /* ===================================
+      Create the new unitialized instance
+      =================================== */
+   newInstance = BuildInstance(theEnv,instanceName,theDefclass,false);
+   if (newInstance == NULL)
+     {
+      BinaryLoadInstanceError(theEnv,instanceName,theDefclass);
+      return false;
+     }
+   if (slotCount == 0)
+     return true;
+
+   /* ====================================
+      Read all slot override info and slot
+      value atoms into big arrays
+      ==================================== */
+   bsArray = (struct bsaveSlotValue *) gm2(theEnv,(sizeof(struct bsaveSlotValue) * slotCount));
+   BufferedRead(theEnv,bsArray,(sizeof(struct bsaveSlotValue) * slotCount));
+
+   BufferedRead(theEnv,&totalValueCount,sizeof(unsigned long));
+
+   if (totalValueCount != 0L)
+     {
+      bsaArray = (struct bsaveSlotValueAtom *)
+                  gm2(theEnv,(totalValueCount * sizeof(struct bsaveSlotValueAtom)));
+      BufferedRead(theEnv,bsaArray,(totalValueCount * sizeof(struct bsaveSlotValueAtom)));
+     }
+
+   /* =========================
+      Insert the values for the
+      slot overrides
+      ========================= */
+   for (i = 0 , j = 0L ; i < slotCount ; i++)
+     {
+      /* ===========================================================
+         Here is another check for the validity of the binary file -
+         the order of the slots in the file should match the
+         order in the class definition
+         =========================================================== */
+      sp = newInstance->slotAddresses[i];
+      if (sp->desc->slotName->name != SymbolPointer(bsArray[i].slotName))
+        goto LoadError;
+      CreateSlotValue(theEnv,&slotValue,(struct bsaveSlotValueAtom *) &bsaArray[j],
+                      bsArray[i].valueCount);
+
+      if (PutSlotValue(theEnv,newInstance,sp,&slotValue,&junkValue,"bload-instances") != PSE_NO_ERROR)
+        goto LoadError;
+
+      j += (unsigned long) bsArray[i].valueCount;
+     }
+
+   rm(theEnv,bsArray,(sizeof(struct bsaveSlotValue) * slotCount));
+
+   if (totalValueCount != 0L)
+     rm(theEnv,bsaArray,(totalValueCount * sizeof(struct bsaveSlotValueAtom)));
+
+   return true;
+
+LoadError:
+   BinaryLoadInstanceError(theEnv,instanceName,theDefclass);
+   QuashInstance(theEnv,newInstance);
+   rm(theEnv,bsArray,(sizeof(struct bsaveSlotValue) * slotCount));
+   rm(theEnv,bsaArray,(totalValueCount * sizeof(struct bsaveSlotValueAtom)));
+   return false;
+  }
+
+/***************************************************
+  NAME         : BinaryLoadInstanceError
+  DESCRIPTION  : Prints out an error message when
+                 an instance could not be
+                 successfully loaded from a
+                 binary file
+  INPUTS       : 1) The instance name
+                 2) The defclass
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error message printed
+  NOTES        : None
+ ***************************************************/
+static void BinaryLoadInstanceError(
+  Environment *theEnv,
+  CLIPSLexeme *instanceName,
+  Defclass *theDefclass)
+  {
+   PrintErrorID(theEnv,"INSFILE",4,false);
+   WriteString(theEnv,STDERR,"Function 'bload-instances' is unable to load instance [");
+   WriteString(theEnv,STDERR,instanceName->contents);
+   WriteString(theEnv,STDERR,"] of class ");
+   PrintClassName(theEnv,STDERR,theDefclass,true,true);
+  }
+
+/***************************************************
+  NAME         : CreateSlotValue
+  DESCRIPTION  : Creates a data object value from
+                 the binary slot value atom data
+  INPUTS       : 1) A data object buffer
+                 2) The slot value atoms array
+                 3) The number of values to put
+                    in the data object
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Data object initialized
+                 (if more than one value, a
+                 multifield is created)
+  NOTES        : None
+ ***************************************************/
+static void CreateSlotValue(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  struct bsaveSlotValueAtom *bsaValues,
+  unsigned long valueCount)
+  {
+   unsigned i;
+
+   if (valueCount == 0)
+     {
+      returnValue->value = CreateMultifield(theEnv,0L);
+      returnValue->begin = 0;
+      returnValue->range = 0;
+     }
+   else if (valueCount == 1)
+     {
+      returnValue->value = GetBinaryAtomValue(theEnv,&bsaValues[0]);
+     }
+   else
+     {
+      returnValue->value = CreateMultifield(theEnv,valueCount);
+      returnValue->begin = 0;
+      returnValue->range = valueCount;
+      for (i = 0 ; i < valueCount ; i++)
+        {
+         returnValue->multifieldValue->contents[i].value = GetBinaryAtomValue(theEnv,&bsaValues[i-1]);
+        }
+     }
+  }
+
+/***************************************************
+  NAME         : GetBinaryAtomValue
+  DESCRIPTION  : Uses the binary index of an atom
+                 to find the ephemeris value
+  INPUTS       : The binary type and index
+  RETURNS      : The symbol/etc. pointer
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static void *GetBinaryAtomValue(
+  Environment *theEnv,
+  struct bsaveSlotValueAtom *ba)
+  {
+   switch (ba->type)
+     {
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+      case INSTANCE_NAME_TYPE:
+         return((void *) SymbolPointer(ba->value));
+         
+      case FLOAT_TYPE:
+         return((void *) FloatPointer(ba->value));
+         
+      case INTEGER_TYPE:
+         return((void *) IntegerPointer(ba->value));
+         
+      case FACT_ADDRESS_TYPE:
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT
+         return((void *) &FactData(theEnv)->DummyFact);
+#else
+         return NULL;
+#endif
+
+      case EXTERNAL_ADDRESS_TYPE:
+        return NULL;
+
+      default:
+        {
+         SystemError(theEnv,"INSFILE",1);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+     }
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : BufferedRead
+  DESCRIPTION  : Reads data from binary file
+                 (Larger blocks than requested size
+                  may be read and buffered)
+  INPUTS       : 1) The buffer
+                 2) The buffer size
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Data stored in buffer
+  NOTES        : None
+ ***************************************************/
+static void BufferedRead(
+  Environment *theEnv,
+  void *buf,
+  size_t bufsz)
+  {
+   size_t i, amountLeftToRead;
+
+   if (InstanceFileData(theEnv)->CurrentReadBuffer != NULL)
+     {
+      amountLeftToRead = InstanceFileData(theEnv)->CurrentReadBufferSize - InstanceFileData(theEnv)->CurrentReadBufferOffset;
+      if (bufsz <= amountLeftToRead)
+        {
+         for (i = 0L ; i < bufsz ; i++)
+           ((char *) buf)[i] = InstanceFileData(theEnv)->CurrentReadBuffer[i + InstanceFileData(theEnv)->CurrentReadBufferOffset];
+         InstanceFileData(theEnv)->CurrentReadBufferOffset += bufsz;
+         if (InstanceFileData(theEnv)->CurrentReadBufferOffset == InstanceFileData(theEnv)->CurrentReadBufferSize)
+           FreeReadBuffer(theEnv);
+        }
+      else
+        {
+         if (InstanceFileData(theEnv)->CurrentReadBufferOffset < InstanceFileData(theEnv)->CurrentReadBufferSize)
+           {
+            for (i = 0 ; i < amountLeftToRead ; i++)
+              ((char *) buf)[i] = InstanceFileData(theEnv)->CurrentReadBuffer[i + InstanceFileData(theEnv)->CurrentReadBufferOffset];
+            bufsz -= amountLeftToRead;
+            buf = (void *) (((char *) buf) + amountLeftToRead);
+           }
+         FreeReadBuffer(theEnv);
+         BufferedRead(theEnv,buf,bufsz);
+        }
+     }
+   else
+     {
+      if (bufsz > MAX_BLOCK_SIZE)
+        {
+         InstanceFileData(theEnv)->CurrentReadBufferSize = bufsz;
+         if (bufsz > (InstanceFileData(theEnv)->BinaryInstanceFileSize - InstanceFileData(theEnv)->BinaryInstanceFileOffset))
+           {
+            SystemError(theEnv,"INSFILE",2);
+            ExitRouter(theEnv,EXIT_FAILURE);
+           }
+        }
+      else if (MAX_BLOCK_SIZE >
+              (InstanceFileData(theEnv)->BinaryInstanceFileSize - InstanceFileData(theEnv)->BinaryInstanceFileOffset))
+        InstanceFileData(theEnv)->CurrentReadBufferSize = InstanceFileData(theEnv)->BinaryInstanceFileSize - InstanceFileData(theEnv)->BinaryInstanceFileOffset;
+      else
+        InstanceFileData(theEnv)->CurrentReadBufferSize = (unsigned long) MAX_BLOCK_SIZE;
+      InstanceFileData(theEnv)->CurrentReadBuffer = (char *) genalloc(theEnv,InstanceFileData(theEnv)->CurrentReadBufferSize);
+      GenReadBinary(theEnv,InstanceFileData(theEnv)->CurrentReadBuffer,InstanceFileData(theEnv)->CurrentReadBufferSize);
+      for (i = 0L ; i < bufsz ; i++)
+        ((char *) buf)[i] = InstanceFileData(theEnv)->CurrentReadBuffer[i];
+      InstanceFileData(theEnv)->CurrentReadBufferOffset = bufsz;
+      InstanceFileData(theEnv)->BinaryInstanceFileOffset += InstanceFileData(theEnv)->CurrentReadBufferSize;
+     }
+  }
+
+/*****************************************************
+  NAME         : FreeReadBuffer
+  DESCRIPTION  : Deallocates buffer for binary reads
+  INPUTS       : None
+  RETURNS      : Nothing usefu
+  SIDE EFFECTS : Binary global read buffer deallocated
+  NOTES        : None
+ *****************************************************/
+static void FreeReadBuffer(
+  Environment *theEnv)
+  {
+   if (InstanceFileData(theEnv)->CurrentReadBufferSize != 0L)
+     {
+      genfree(theEnv,InstanceFileData(theEnv)->CurrentReadBuffer,InstanceFileData(theEnv)->CurrentReadBufferSize);
+      InstanceFileData(theEnv)->CurrentReadBuffer = NULL;
+      InstanceFileData(theEnv)->CurrentReadBufferSize = 0L;
+     }
+  }
+
+#endif /* BLOAD_INSTANCES */
+
+#endif /* OBJECT_SYSTEM */
diff --git a/clips/insfile.h b/clips/insfile.h
new file mode 100755
index 000000000..42ff15f7b
--- /dev/null
+++ b/clips/insfile.h
@@ -0,0 +1,104 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_insfile
+
+#pragma once
+
+#define _H_insfile
+
+#include "expressn.h"
+
+#define INSTANCE_FILE_DATA 30
+
+#if BLOAD_INSTANCES || BSAVE_INSTANCES
+struct instanceFileData
+  {
+   const char *InstanceBinaryPrefixID;
+   const char *InstanceBinaryVersionID;
+   size_t BinaryInstanceFileSize;
+
+#if BLOAD_INSTANCES
+   size_t BinaryInstanceFileOffset;
+   char *CurrentReadBuffer;
+   size_t CurrentReadBufferSize;
+   size_t CurrentReadBufferOffset;
+#endif
+  };
+
+#define InstanceFileData(theEnv) ((struct instanceFileData *) GetEnvironmentData(theEnv,INSTANCE_FILE_DATA))
+
+#endif /* BLOAD_INSTANCES || BSAVE_INSTANCES */
+
+   void                           SetupInstanceFileCommands(Environment *);
+   void                           SaveInstancesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           LoadInstancesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           RestoreInstancesCommand(Environment *,UDFContext *,UDFValue *);
+   long                           SaveInstancesDriver(Environment *,const char *,SaveScope,Expression *,bool);
+   long                           SaveInstances(Environment *,const char *,SaveScope);
+#if BSAVE_INSTANCES
+   void                           BinarySaveInstancesCommand(Environment *,UDFContext *,UDFValue *);
+   long                           BinarySaveInstancesDriver(Environment *,const char *,SaveScope,Expression *,bool);
+   long                           BinarySaveInstances(Environment *,const char *,SaveScope);
+#endif
+#if BLOAD_INSTANCES
+   void                           BinaryLoadInstancesCommand(Environment *,UDFContext *,UDFValue *);
+   long                           BinaryLoadInstances(Environment *,const char *);
+#endif
+   long                           LoadInstances(Environment *,const char *);
+   long                           LoadInstancesFromString(Environment *,const char *,size_t);
+   long                           RestoreInstances(Environment *,const char *);
+   long                           RestoreInstancesFromString(Environment *,const char *,size_t);
+
+#endif /* _H_insfile */
+
+
+
diff --git a/clips/insfun.c b/clips/insfun.c
new file mode 100755
index 000000000..4d40f7d98
--- /dev/null
+++ b/clips/insfun.c
@@ -0,0 +1,1451 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/07/17             */
+   /*                                                     */
+   /*               INSTANCE FUNCTIONS MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  Internal instance manipulation routines         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Link error occurs for the SlotExistError       */
+/*            function when OBJECT_SYSTEM is set to 0 in     */
+/*            setup.h. DR0865                                */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Moved EvaluateAndStoreInDataObject to          */
+/*            evaluatn.c                                     */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed slot override default ?NONE bug.         */
+/*                                                           */
+/*            Instances of the form [<name>] are now         */
+/*            searched for in all modules.                   */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+
+#include <stdlib.h>
+
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include "argacces.h"
+#include "classcom.h"
+#include "classfun.h"
+#include "cstrnchk.h"
+#if DEFRULE_CONSTRUCT
+#include "drive.h"
+#include "objrtmch.h"
+#endif
+#include "engine.h"
+#include "envrnmnt.h"
+#include "inscom.h"
+#include "insmngr.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "msgcom.h"
+#include "msgfun.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+
+#include "insfun.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define BIG_PRIME    11329
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static Instance               *FindImportedInstance(Environment *,Defmodule *,Defmodule *,Instance *);
+
+#if DEFRULE_CONSTRUCT
+   static void                    NetworkModifyForSharedSlot(Environment *,int,Defclass *,SlotDescriptor *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************/
+/* IncrementInstanceCallback: Increments the       */
+/*   number of references to a specified instance. */
+/***************************************************/
+void IncrementInstanceCallback(
+  Environment *theEnv,
+  Instance *theInstance)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+   if (theInstance == NULL) return;
+
+   theInstance->busy++;
+  }
+
+/***************************************************/
+/* DecrementInstanceCallback: Decrements the       */
+/*   number of references to a specified instance. */
+/***************************************************/
+void DecrementInstanceCallback(
+  Environment *theEnv,
+  Instance *theInstance)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+   if (theInstance == NULL) return;
+
+   theInstance->busy--;
+  }
+
+/***************************************************
+  NAME         : RetainInstance
+  DESCRIPTION  : Increments instance busy count -
+                   prevents it from being deleted
+  INPUTS       : The address of the instance
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Count set
+  NOTES        : None
+ ***************************************************/
+void RetainInstance(
+  Instance *theInstance)
+  {
+   if (theInstance == NULL) return;
+   
+   theInstance->busy++;
+  }
+
+/***************************************************
+  NAME         : ReleaseInstance
+  DESCRIPTION  : Decrements instance busy count -
+                   might allow it to be deleted
+  INPUTS       : The address of the instance
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Count set
+  NOTES        : None
+ ***************************************************/
+void ReleaseInstance(
+  Instance *theInstance)
+  {
+   if (theInstance == NULL) return;
+
+   theInstance->busy--;
+  }
+
+/***************************************************
+  NAME         : InitializeInstanceTable
+  DESCRIPTION  : Initializes instance hash table
+                  to all NULL addresses
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Hash table initialized
+  NOTES        : None
+ ***************************************************/
+void InitializeInstanceTable(
+  Environment *theEnv)
+  {
+   int i;
+
+   InstanceData(theEnv)->InstanceTable = (Instance **)
+                    gm2(theEnv,sizeof(Instance *) * INSTANCE_TABLE_HASH_SIZE);
+   for (i = 0 ; i < INSTANCE_TABLE_HASH_SIZE ; i++)
+     InstanceData(theEnv)->InstanceTable[i] = NULL;
+  }
+
+/*******************************************************
+  NAME         : CleanupInstances
+  DESCRIPTION  : Iterates through instance garbage
+                   list looking for nodes that
+                   have become unused - and purges
+                   them
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Non-busy instance garbage nodes deleted
+  NOTES        : None
+ *******************************************************/
+void CleanupInstances(
+  Environment *theEnv,
+  void *context)
+  {
+   IGARBAGE *gprv,*gtmp,*dump;
+
+   if (InstanceData(theEnv)->MaintainGarbageInstances)
+     return;
+   gprv = NULL;
+   gtmp = InstanceData(theEnv)->InstanceGarbageList;
+   while (gtmp != NULL)
+     {
+#if DEFRULE_CONSTRUCT
+      if ((gtmp->ins->busy == 0)
+          && (gtmp->ins->patternHeader.busyCount == 0))
+#else
+      if (gtmp->ins->busy == 0)
+#endif
+        {
+         ReleaseLexeme(theEnv,gtmp->ins->name);
+         rtn_struct(theEnv,instance,gtmp->ins);
+         if (gprv == NULL)
+           InstanceData(theEnv)->InstanceGarbageList = gtmp->nxt;
+         else
+           gprv->nxt = gtmp->nxt;
+         dump = gtmp;
+         gtmp = gtmp->nxt;
+         rtn_struct(theEnv,igarbage,dump);
+        }
+      else
+        {
+         gprv = gtmp;
+         gtmp = gtmp->nxt;
+        }
+     }
+  }
+
+/*******************************************************
+  NAME         : HashInstance
+  DESCRIPTION  : Generates a hash index for a given
+                 instance name
+  INPUTS       : The address of the instance name SYMBOL_HN
+  RETURNS      : The hash index value
+  SIDE EFFECTS : None
+  NOTES        : Counts on the fact that the symbol
+                 has already been hashed into the
+                 symbol table - uses that hash value
+                 multiplied by a prime for a new hash
+ *******************************************************/
+unsigned HashInstance(
+  CLIPSLexeme *cname)
+  {
+   unsigned long tally;
+
+   tally = ((unsigned long) cname->bucket) * BIG_PRIME;
+   return (unsigned) (tally % INSTANCE_TABLE_HASH_SIZE);
+  }
+
+/***************************************************
+  NAME         : DestroyAllInstances
+  DESCRIPTION  : Deallocates all instances,
+                  reinitializes hash table and
+                  resets class instance pointers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : All instances deallocated
+  NOTES        : None
+ ***************************************************/
+void DestroyAllInstances(
+  Environment *theEnv,
+  void *context)
+  {
+   Instance *iptr;
+   bool svmaintain;
+
+   SaveCurrentModule(theEnv);
+   svmaintain = InstanceData(theEnv)->MaintainGarbageInstances;
+   InstanceData(theEnv)->MaintainGarbageInstances = true;
+   iptr = InstanceData(theEnv)->InstanceList;
+   while (iptr != NULL)
+     {
+      SetCurrentModule(theEnv,iptr->cls->header.whichModule->theModule);
+      DirectMessage(theEnv,MessageHandlerData(theEnv)->DELETE_SYMBOL,iptr,NULL,NULL);
+      iptr = iptr->nxtList;
+      while ((iptr != NULL) ? iptr->garbage : false)
+        iptr = iptr->nxtList;
+     }
+   InstanceData(theEnv)->MaintainGarbageInstances = svmaintain;
+   RestoreCurrentModule(theEnv);
+  }
+
+/******************************************************
+  NAME         : RemoveInstanceData
+  DESCRIPTION  : Deallocates all the data objects
+                 in instance slots and then dealloactes
+                 the slots themeselves
+  INPUTS       : The instance
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance slots removed
+  NOTES        : An instance made with CopyInstanceData
+                 will have shared values removed
+                 in all cases because they are not
+                 "real" instances.
+                 Instance class busy count decremented
+ ******************************************************/
+void RemoveInstanceData(
+  Environment *theEnv,
+  Instance *ins)
+  {
+   long i;
+   InstanceSlot *sp;
+
+   DecrementDefclassBusyCount(theEnv,ins->cls);
+   for (i = 0 ; i < ins->cls->instanceSlotCount ; i++)
+     {
+      sp = ins->slotAddresses[i];
+      if ((sp == &sp->desc->sharedValue) ?
+          (--sp->desc->sharedCount == 0) : true)
+        {
+         if (sp->desc->multiple)
+           {
+            ReleaseMultifield(theEnv,sp->multifieldValue);
+            AddToMultifieldList(theEnv,sp->multifieldValue);
+           }
+         else
+           AtomDeinstall(theEnv,sp->type,sp->value);
+         sp->value = NULL;
+        }
+     }
+   if (ins->cls->instanceSlotCount != 0)
+     {
+      rm(theEnv,ins->slotAddresses,
+         (ins->cls->instanceSlotCount * sizeof(InstanceSlot *)));
+      if (ins->cls->localInstanceSlotCount != 0)
+        rm(theEnv,ins->slots,
+           (ins->cls->localInstanceSlotCount * sizeof(InstanceSlot)));
+     }
+   ins->slots = NULL;
+   ins->slotAddresses = NULL;
+  }
+
+/***************************************************************************
+  NAME         : FindInstanceBySymbol
+  DESCRIPTION  : Looks up a specified instance in the instance hash table
+  INPUTS       : The symbol for the name of the instance
+  RETURNS      : The address of the found instance, NULL otherwise
+  SIDE EFFECTS : None
+  NOTES        : An instance is searched for by name first in the
+                 current module - then in imported modules according
+                 to the order given in the current module's definition.
+                 Instances of the form [<name>] are now searched for in
+                 all modules.
+ ***************************************************************************/
+Instance *FindInstanceBySymbol(
+  Environment *theEnv,
+  CLIPSLexeme *moduleAndInstanceName)
+  {
+   unsigned modulePosition;
+   bool searchImports;
+   CLIPSLexeme *moduleName, *instanceName;
+   Defmodule *currentModule,*theModule;
+
+   currentModule = GetCurrentModule(theEnv);
+
+   /* =======================================
+      Instance names of the form [<name>] are
+      searched for only in the current module
+      ======================================= */
+   modulePosition = FindModuleSeparator(moduleAndInstanceName->contents);
+   if (modulePosition == 0)
+     {
+      Instance *ins;
+      if (moduleAndInstanceName->header.type == SYMBOL_TYPE)
+        { moduleAndInstanceName = CreateInstanceName(theEnv,moduleAndInstanceName->contents); }
+
+      ins = InstanceData(theEnv)->InstanceTable[HashInstance(moduleAndInstanceName)];
+      while (ins != NULL)
+        {
+         if (ins->name == moduleAndInstanceName)
+           { return ins; }
+         ins = ins->nxtHash;
+        }
+      return NULL;
+     }
+
+   /* =========================================
+      Instance names of the form [::<name>] are
+      searched for in the current module and
+      imported modules in the definition order
+      ========================================= */
+   else if (modulePosition == 1)
+     {
+      theModule = currentModule;
+      instanceName = ExtractConstructName(theEnv,modulePosition,moduleAndInstanceName->contents,INSTANCE_NAME_TYPE);
+      searchImports = true;
+     }
+
+   /* =============================================
+      Instance names of the form [<module>::<name>]
+      are searched for in the specified module
+      ============================================= */
+   else
+     {
+      moduleName = ExtractModuleName(theEnv,modulePosition,moduleAndInstanceName->contents);
+      theModule = FindDefmodule(theEnv,moduleName->contents);
+      instanceName = ExtractConstructName(theEnv,modulePosition,moduleAndInstanceName->contents,INSTANCE_NAME_TYPE);
+      if (theModule == NULL)
+        return NULL;
+      searchImports = false;
+     }
+   return(FindInstanceInModule(theEnv,instanceName,theModule,currentModule,searchImports));
+  }
+
+/***************************************************
+  NAME         : FindInstanceInModule
+  DESCRIPTION  : Finds an instance of the given name
+                 in the given module in scope of
+                 the given current module
+                 (will also search imported modules
+                  if specified)
+  INPUTS       : 1) The instance name (no module)
+                 2) The module to search
+                 3) The currently active module
+                 4) A flag indicating whether
+                    to search imported modules of
+                    given module as well
+  RETURNS      : The instance (NULL if none found)
+  SIDE EFFECTS : None
+  NOTES        : The class no longer needs to be in
+                 scope of the current module if the
+                 instance's module name has been specified.
+ ***************************************************/
+Instance *FindInstanceInModule(
+  Environment *theEnv,
+  CLIPSLexeme *instanceName,
+  Defmodule *theModule,
+  Defmodule *currentModule,
+  bool searchImports)
+  {
+   Instance *startInstance,*ins;
+
+   /* ===============================
+      Find the first instance of the
+      correct name in the hash chain
+      =============================== */
+   startInstance = InstanceData(theEnv)->InstanceTable[HashInstance(instanceName)];
+   while (startInstance != NULL)
+     {
+      if (startInstance->name == instanceName)
+        break;
+      startInstance = startInstance->nxtHash;
+     }
+
+   if (startInstance == NULL)
+     return NULL;
+
+   /* ===========================================
+      Look for the instance in the specified
+      module - if the class of the found instance
+      is in scope of the current module, we have
+      found the instance
+      =========================================== */
+   for (ins = startInstance ;
+        (ins != NULL) ? (ins->name == startInstance->name) : false ;
+        ins = ins->nxtHash)
+     //if ((ins->cls->header.whichModule->theModule == theModule) &&
+     //     DefclassInScope(theEnv,ins->cls,currentModule))
+     if (ins->cls->header.whichModule->theModule == theModule)
+       return(ins);
+
+   /* ================================
+      For ::<name> formats, we need to
+      search imported modules too
+      ================================ */
+   if (searchImports == false)
+     return NULL;
+   MarkModulesAsUnvisited(theEnv);
+   return(FindImportedInstance(theEnv,theModule,currentModule,startInstance));
+  }
+
+/********************************************************************
+  NAME         : FindInstanceSlot
+  DESCRIPTION  : Finds an instance slot by name
+  INPUTS       : 1) The address of the instance
+                 2) The symbolic name of the slot
+  RETURNS      : The address of the slot, NULL if not found
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************************/
+InstanceSlot *FindInstanceSlot(
+  Environment *theEnv,
+  Instance *ins,
+  CLIPSLexeme *sname)
+  {
+   int i;
+
+   i = FindInstanceTemplateSlot(theEnv,ins->cls,sname);
+   return (i != -1) ? ins->slotAddresses[i] : NULL;
+  }
+
+/********************************************************************
+  NAME         : FindInstanceTemplateSlot
+  DESCRIPTION  : Performs a search on an class's instance
+                   template slot array to find a slot by name
+  INPUTS       : 1) The address of the class
+                 2) The symbolic name of the slot
+  RETURNS      : The index of the slot, -1 if not found
+  SIDE EFFECTS : None
+  NOTES        : The slot's unique id is used as index into
+                 the slot map array.
+ ********************************************************************/
+int FindInstanceTemplateSlot(
+  Environment *theEnv,
+  Defclass *cls,
+  CLIPSLexeme *sname)
+  {
+   unsigned short sid;
+
+   sid = FindSlotNameID(theEnv,sname);
+   if (sid == SLOT_NAME_NOT_FOUND)
+     return -1;
+     
+   if (sid > cls->maxSlotNameID)
+     return -1;
+     
+   return((int) cls->slotNameMap[sid] - 1);
+  }
+
+/*******************************************************
+  NAME         : PutSlotValue
+  DESCRIPTION  : Evaluates new slot-expression and
+                   stores it as a multifield
+                   variable for the slot.
+  INPUTS       : 1) The address of the instance
+                    (NULL if no trace-messages desired)
+                 2) The address of the slot
+                 3) The address of the value
+                 4) UDFValue pointer to store the
+                    set value
+                 5) The command doing the put-
+  RETURNS      : False on errors, or true
+  SIDE EFFECTS : Old value deleted and new one allocated
+                 Old value symbols deinstalled
+                 New value symbols installed
+  NOTES        : None
+ *******************************************************/
+PutSlotError PutSlotValue(
+  Environment *theEnv,
+  Instance *ins,
+  InstanceSlot *sp,
+  UDFValue *val,
+  UDFValue *setVal,
+  const char *theCommand)
+  {
+   PutSlotError rv;
+   if ((rv = ValidSlotValue(theEnv,val,sp->desc,ins,theCommand)) != PSE_NO_ERROR)
+     {
+      setVal->value = FalseSymbol(theEnv);
+      return rv;
+     }
+   return DirectPutSlotValue(theEnv,ins,sp,val,setVal);
+  }
+
+/*******************************************************
+  NAME         : DirectPutSlotValue
+  DESCRIPTION  : Evaluates new slot-expression and
+                   stores it as a multifield
+                   variable for the slot.
+  INPUTS       : 1) The address of the instance
+                    (NULL if no trace-messages desired)
+                 2) The address of the slot
+                 3) The address of the value
+                 4) UDFValue pointer to store the
+                    set value
+  RETURNS      : False on errors, or true
+  SIDE EFFECTS : Old value deleted and new one allocated
+                 Old value symbols deinstalled
+                 New value symbols installed
+  NOTES        : None
+ *******************************************************/
+PutSlotError DirectPutSlotValue(
+  Environment *theEnv,
+  Instance *ins,
+  InstanceSlot *sp,
+  UDFValue *val,
+  UDFValue *setVal)
+  {
+   size_t i,j; /* 6.04 Bug Fix */
+#if DEFRULE_CONSTRUCT
+   int sharedTraversalID;
+   InstanceSlot *bsp,**spaddr;
+#endif
+   UDFValue tmpVal;
+
+   setVal->value = FalseSymbol(theEnv);
+   if (val == NULL)
+     {
+      SystemError(theEnv,"INSFUN",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+   else if (val->value == ProceduralPrimitiveData(theEnv)->NoParamValue)
+     {
+      if (sp->desc->dynamicDefault)
+        {
+         val = &tmpVal;
+         if (!EvaluateAndStoreInDataObject(theEnv,sp->desc->multiple,
+                                           (Expression *) sp->desc->defaultValue,val,true))
+           return PSE_EVALUATION_ERROR;
+        }
+      else if (sp->desc->defaultValue != NULL)
+        { val = (UDFValue *) sp->desc->defaultValue; }
+      else
+        {
+         PrintErrorID(theEnv,"INSMNGR",14,false);
+         WriteString(theEnv,STDERR,"Override required for slot '");
+         WriteString(theEnv,STDERR,sp->desc->slotName->name->contents);
+         WriteString(theEnv,STDERR,"' in instance [");
+         WriteString(theEnv,STDERR,ins->name->contents);
+         WriteString(theEnv,STDERR,"].\n");
+         SetEvaluationError(theEnv,true);
+         return PSE_EVALUATION_ERROR;
+        }
+     }
+#if DEFRULE_CONSTRUCT
+   if (EngineData(theEnv)->JoinOperationInProgress && sp->desc->reactive &&
+       (ins->cls->reactive || sp->desc->shared))
+     {
+      PrintErrorID(theEnv,"INSFUN",5,false);
+      WriteString(theEnv,STDERR,"Cannot modify reactive instance slots while ");
+      WriteString(theEnv,STDERR,"pattern-matching is in process.\n");
+      SetEvaluationError(theEnv,true);
+      return PSE_RULE_NETWORK_ERROR;
+     }
+
+   /* =============================================
+      If we are about to change a slot of an object
+      which is a basis for a firing rule, we need
+      to make sure that slot is copied first
+      ============================================= */
+   if (ins->basisSlots != NULL)
+     {
+      spaddr = &ins->slotAddresses[ins->cls->slotNameMap[sp->desc->slotName->id] - 1];
+      bsp = ins->basisSlots + (spaddr - ins->slotAddresses);
+      if (bsp->value == NULL)
+        {
+         bsp->type = sp->type;
+         bsp->value = sp->value;
+         if (sp->desc->multiple)
+           RetainMultifield(theEnv,bsp->multifieldValue);
+         else
+           AtomInstall(theEnv,bsp->type,bsp->value);
+        }
+     }
+
+#endif
+   if (sp->desc->multiple == 0)
+     {
+      AtomDeinstall(theEnv,sp->type,sp->value);
+
+      /* ======================================
+         Assumed that multfield already checked
+         to be of cardinality 1
+         ====================================== */
+      if (val->header->type == MULTIFIELD_TYPE)
+        {
+         sp->type = val->multifieldValue->contents[val->begin].header->type;
+         sp->value = val->multifieldValue->contents[val->begin].value;
+        }
+      else
+        {
+         sp->type = val->header->type;
+         sp->value = val->value;
+        }
+      AtomInstall(theEnv,sp->type,sp->value);
+      setVal->value = sp->value;
+     }
+   else
+     {
+      ReleaseMultifield(theEnv,sp->multifieldValue);
+      AddToMultifieldList(theEnv,sp->multifieldValue);
+      sp->type = MULTIFIELD_TYPE;
+      if (val->header->type == MULTIFIELD_TYPE)
+        {
+         sp->value = CreateUnmanagedMultifield(theEnv,(unsigned long) val->range);
+         for (i = 0 , j = val->begin ; i < val->range ; i++ , j++)
+           {
+            sp->multifieldValue->contents[i].value = val->multifieldValue->contents[j].value;
+           }
+        }
+      else
+        {
+         sp->multifieldValue = CreateUnmanagedMultifield(theEnv,1L);
+         sp->multifieldValue->contents[0].value = val->value;
+        }
+      RetainMultifield(theEnv,sp->multifieldValue);
+      setVal->value = sp->value;
+      setVal->begin = 0;
+      setVal->range = sp->multifieldValue->length;
+     }
+   /* ==================================================
+      6.05 Bug fix - any slot set directly or indirectly
+      by a slot override or other side-effect during an
+      instance initialization should not have its
+      default value set
+      ================================================== */
+
+   sp->override = ins->initializeInProgress;
+
+#if DEBUGGING_FUNCTIONS
+   if (ins->cls->traceSlots &&
+       (! ConstructData(theEnv)->ClearReadyInProgress) &&
+       (! ConstructData(theEnv)->ClearInProgress))
+     {
+      if (sp->desc->shared)
+        WriteString(theEnv,STDOUT,"::= shared slot ");
+      else
+        WriteString(theEnv,STDOUT,"::= local slot ");
+      WriteString(theEnv,STDOUT,sp->desc->slotName->name->contents);
+      WriteString(theEnv,STDOUT," in instance ");
+      WriteString(theEnv,STDOUT,ins->name->contents);
+      WriteString(theEnv,STDOUT," <- ");
+      if (sp->type != MULTIFIELD_TYPE)
+        PrintAtom(theEnv,STDOUT,sp->type,sp->value);
+      else
+        PrintMultifieldDriver(theEnv,STDOUT,sp->multifieldValue,0,
+                              sp->multifieldValue->length,true);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+#endif
+   InstanceData(theEnv)->ChangesToInstances = true;
+
+#if DEFRULE_CONSTRUCT
+   if (ins->cls->reactive && sp->desc->reactive)
+     {
+      /* ============================================
+         If we have changed a shared slot, we need to
+         perform a Rete update for every instance
+         which contains this slot
+         ============================================ */
+      if (sp->desc->shared)
+        {
+         sharedTraversalID = GetTraversalID(theEnv);
+         if (sharedTraversalID != -1)
+           {
+            NetworkModifyForSharedSlot(theEnv,sharedTraversalID,sp->desc->cls,sp->desc);
+            ReleaseTraversalID(theEnv);
+           }
+         else
+           {
+            PrintErrorID(theEnv,"INSFUN",6,false);
+            WriteString(theEnv,STDERR,"Unable to pattern-match on shared slot '");
+            WriteString(theEnv,STDERR,sp->desc->slotName->name->contents);
+            WriteString(theEnv,STDERR,"' in class '");
+            WriteString(theEnv,STDERR,DefclassName(sp->desc->cls));
+            WriteString(theEnv,STDERR,"'.\n");
+            return PSE_RULE_NETWORK_ERROR;
+           }
+        }
+      else
+        ObjectNetworkAction(theEnv,OBJECT_MODIFY,ins,(int) sp->desc->slotName->id);
+     }
+#endif
+
+   return PSE_NO_ERROR;
+  }
+
+/*******************************************************************
+  NAME         : ValidSlotValue
+  DESCRIPTION  : Determines if a value is appropriate
+                   for a slot-value
+  INPUTS       : 1) The value buffer
+                 2) Slot descriptor
+                 3) Instance for which slot is being checked
+                    (can be NULL)
+                 4) Buffer holding printout of the offending command
+                    (if NULL assumes message-handler is executing
+                     and calls PrintHandler for CurrentCore instead)
+  RETURNS      : True if value is OK, false otherwise
+  SIDE EFFECTS : Sets EvaluationError if slot is not OK
+  NOTES        : Examines all fields of a multi-field
+ *******************************************************************/
+PutSlotError ValidSlotValue(
+  Environment *theEnv,
+  UDFValue *val,
+  SlotDescriptor *sd,
+  Instance *ins,
+  const char *theCommand)
+  {
+   ConstraintViolationType violationCode;
+
+   /* ===================================
+      Special NoParamValue means to reset
+      slot to default value
+      =================================== */
+   if (val->value == ProceduralPrimitiveData(theEnv)->NoParamValue)
+     return PSE_NO_ERROR;
+   if ((sd->multiple == 0) && (val->header->type == MULTIFIELD_TYPE) &&
+                              (val->range != 1))
+     {
+      PrintErrorID(theEnv,"INSFUN",7,false);
+      WriteString(theEnv,STDERR,"The value ");
+      WriteUDFValue(theEnv,STDERR,val);
+      WriteString(theEnv,STDERR," is illegal for single-field ");
+      PrintSlot(theEnv,STDERR,sd,ins,theCommand);
+      WriteString(theEnv,STDERR,".\n");
+      SetEvaluationError(theEnv,true);
+      return PSE_CARDINALITY_ERROR;
+     }
+   if (val->header->type == VOID_TYPE)
+     {
+      PrintErrorID(theEnv,"INSFUN",8,false);
+      WriteString(theEnv,STDERR,"Void function illegal value for ");
+      PrintSlot(theEnv,STDERR,sd,ins,theCommand);
+      WriteString(theEnv,STDERR,".\n");
+      SetEvaluationError(theEnv,true);
+      return PSE_CARDINALITY_ERROR;
+     }
+   if (GetDynamicConstraintChecking(theEnv))
+     {
+      violationCode = ConstraintCheckDataObject(theEnv,val,sd->constraint);
+      if (violationCode != NO_VIOLATION)
+        {
+         PrintErrorID(theEnv,"CSTRNCHK",1,false);
+         WriteString(theEnv,STDERR,"The value ");
+         if ((val->header->type == MULTIFIELD_TYPE) && (sd->multiple == 0))
+           PrintAtom(theEnv,STDERR,val->multifieldValue->contents[val->begin].header->type,
+                                   val->multifieldValue->contents[val->begin].value);
+         else
+           WriteUDFValue(theEnv,STDERR,val);
+         WriteString(theEnv,STDERR," for ");
+         PrintSlot(theEnv,STDERR,sd,ins,theCommand);
+         ConstraintViolationErrorMessage(theEnv,NULL,NULL,0,0,NULL,0,
+                                         violationCode,sd->constraint,false);
+         SetEvaluationError(theEnv,true);
+
+         switch(violationCode)
+           {
+            case NO_VIOLATION:
+              SystemError(theEnv,"FACTMNGR",2);
+              ExitRouter(theEnv,EXIT_FAILURE);
+              break;
+        
+            case FUNCTION_RETURN_TYPE_VIOLATION:
+            case TYPE_VIOLATION:
+              return PSE_TYPE_ERROR;
+              
+            case RANGE_VIOLATION:
+              return PSE_RANGE_ERROR;
+              
+            case ALLOWED_VALUES_VIOLATION:
+              return PSE_ALLOWED_VALUES_ERROR;
+              
+            case CARDINALITY_VIOLATION:
+              return PSE_CARDINALITY_ERROR;
+            
+            case ALLOWED_CLASSES_VIOLATION:
+              return PSE_ALLOWED_CLASSES_ERROR;
+           }
+        }
+     }
+   return PSE_NO_ERROR;
+  }
+
+/********************************************************
+  NAME         : CheckInstance
+  DESCRIPTION  : Checks to see if the first argument to
+                 a function is a valid instance
+  INPUTS       : Name of the calling function
+  RETURNS      : The address of the instance
+  SIDE EFFECTS : EvaluationError set and messages printed
+                 on errors
+  NOTES        : Used by Initialize and ModifyInstance
+ ********************************************************/
+Instance *CheckInstance(
+  UDFContext *context)
+  {
+   Instance *ins;
+   UDFValue temp;
+   Environment *theEnv = context->environment;
+
+   UDFFirstArgument(context,ANY_TYPE_BITS,&temp);
+   if (temp.header->type == INSTANCE_ADDRESS_TYPE)
+     {
+      ins = temp.instanceValue;
+      if (ins->garbage == 1)
+        {
+         StaleInstanceAddress(theEnv,UDFContextFunctionName(context),0);
+         SetEvaluationError(theEnv,true);
+         return NULL;
+        }
+     }
+   else if (temp.header->type == INSTANCE_NAME_TYPE)
+     {
+      ins = FindInstanceBySymbol(theEnv,temp.lexemeValue);
+      if (ins == NULL)
+        {
+         NoInstanceError(theEnv,temp.lexemeValue->contents,UDFContextFunctionName(context));
+         return NULL;
+        }
+     }
+   else if (temp.header->type == SYMBOL_TYPE)
+     {
+      temp.value = CreateInstanceName(theEnv,temp.lexemeValue->contents);
+      ins = FindInstanceBySymbol(theEnv,temp.lexemeValue);
+      if (ins == NULL)
+        {
+         NoInstanceError(theEnv,temp.lexemeValue->contents,UDFContextFunctionName(context));
+         return NULL;
+        }
+     }
+   else
+     {
+      PrintErrorID(theEnv,"INSFUN",1,false);
+      WriteString(theEnv,STDERR,"Expected a valid instance in function '");
+      WriteString(theEnv,STDERR,UDFContextFunctionName(context));
+      WriteString(theEnv,STDERR,"'.\n");
+      SetEvaluationError(theEnv,true);
+      return NULL;
+     }
+   return(ins);
+  }
+
+/***************************************************
+  NAME         : NoInstanceError
+  DESCRIPTION  : Prints out an appropriate error
+                  message when an instance cannot be
+                  found for a function
+  INPUTS       : 1) The instance name
+                 2) The function name
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void NoInstanceError(
+  Environment *theEnv,
+  const char *iname,
+  const char *func)
+  {
+   PrintErrorID(theEnv,"INSFUN",2,false);
+   WriteString(theEnv,STDERR,"No such instance [");
+   WriteString(theEnv,STDERR,iname);
+   WriteString(theEnv,STDERR,"] in function '");
+   WriteString(theEnv,STDERR,func);
+   WriteString(theEnv,STDERR,"'.\n");
+   SetEvaluationError(theEnv,true);
+  }
+
+/***************************************************
+  NAME         : StaleInstanceAddress
+  DESCRIPTION  : Prints out an appropriate error
+                  message when an instance address
+                  is no longer valid
+  INPUTS       : The function name
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void StaleInstanceAddress(
+  Environment *theEnv,
+  const char *func,
+  int whichArg)
+  {
+   PrintErrorID(theEnv,"INSFUN",4,false);
+   WriteString(theEnv,STDERR,"Invalid instance-address in function '");
+   WriteString(theEnv,STDERR,func);
+   WriteString(theEnv,STDERR,"'");
+   if (whichArg > 0)
+     {
+      WriteString(theEnv,STDERR,", argument #");
+      WriteInteger(theEnv,STDERR,whichArg);
+     }
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/**********************************************************************
+  NAME         : GetInstancesChanged
+  DESCRIPTION  : Returns whether instances have changed
+                   (any were added/deleted or slot values were changed)
+                   since last time flag was set to false
+  INPUTS       : None
+  RETURNS      : The instances-changed flag
+  SIDE EFFECTS : None
+  NOTES        : Used by interfaces to update instance windows
+ **********************************************************************/
+bool GetInstancesChanged(
+  Environment *theEnv)
+  {
+   return InstanceData(theEnv)->ChangesToInstances;
+  }
+
+/*******************************************************
+  NAME         : SetInstancesChanged
+  DESCRIPTION  : Sets instances-changed flag (see above)
+  INPUTS       : The value (true or false)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The flag is set
+  NOTES        : None
+ *******************************************************/
+void SetInstancesChanged(
+  Environment *theEnv,
+  bool changed)
+  {
+   InstanceData(theEnv)->ChangesToInstances = changed;
+  }
+
+/*******************************************************************
+  NAME         : PrintSlot
+  DESCRIPTION  : Displays the name and origin of a slot
+  INPUTS       : 1) The logical output name
+                 2) The slot descriptor
+                 3) The instance source (can be NULL)
+                 4) Buffer holding printout of the offending command
+                    (if NULL assumes message-handler is executing
+                     and calls PrintHandler for CurrentCore instead)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Message printed
+  NOTES        : None
+ *******************************************************************/
+void PrintSlot(
+  Environment *theEnv,
+  const char *logName,
+  SlotDescriptor *sd,
+  Instance *ins,
+  const char *theCommand)
+  {
+   WriteString(theEnv,logName,"slot '");
+   WriteString(theEnv,logName,sd->slotName->name->contents);
+   WriteString(theEnv,logName,"'");
+   if (ins != NULL)
+     {
+      WriteString(theEnv,logName," of instance [");
+      WriteString(theEnv,logName,ins->name->contents);
+      WriteString(theEnv,logName,"]");
+     }
+   else if (sd->cls != NULL)
+     {
+      WriteString(theEnv,logName," of class '");
+      WriteString(theEnv,logName,DefclassName(sd->cls));
+      WriteString(theEnv,logName," of class '");
+     }
+   WriteString(theEnv,logName," found in ");
+   if (theCommand != NULL)
+     WriteString(theEnv,logName,theCommand);
+   else
+     PrintHandler(theEnv,logName,MessageHandlerData(theEnv)->CurrentCore->hnd,true,false);
+  }
+
+/*****************************************************
+  NAME         : PrintInstanceNameAndClass
+  DESCRIPTION  : Displays an instance's name and class
+  INPUTS       : 1) Logical name of output
+                 2) The instance
+                 3) Flag indicating whether to
+                    print carriage-return at end
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instnace name and class printed
+  NOTES        : None
+ *****************************************************/
+void PrintInstanceNameAndClass(
+  Environment *theEnv,
+  const char *logicalName,
+  Instance *theInstance,
+  bool linefeedFlag)
+  {
+   WriteString(theEnv,logicalName,"[");
+   WriteString(theEnv,logicalName,InstanceName(theInstance));
+   WriteString(theEnv,logicalName,"] of ");
+   PrintClassName(theEnv,logicalName,theInstance->cls,false,linefeedFlag);
+  }
+
+/***************************************************
+  NAME         : PrintInstanceName
+  DESCRIPTION  : Used by the rule system commands
+                 such as (matches) and (agenda)
+                 to print out the name of an instance
+  INPUTS       : 1) The logical output name
+                 2) A pointer to the instance
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Name of instance printed
+  NOTES        : None
+ ***************************************************/
+void PrintInstanceName(
+  Environment *theEnv,
+  const char *logName,
+  Instance *theInstance)
+  {
+   if (theInstance->garbage)
+     {
+      WriteString(theEnv,logName,"<stale instance [");
+      WriteString(theEnv,logName,theInstance->name->contents);
+      WriteString(theEnv,logName,"]>");
+     }
+   else
+     {
+      WriteString(theEnv,logName,"[");
+      WriteString(theEnv,logName,GetFullInstanceName(theEnv,theInstance)->contents);
+      WriteString(theEnv,logName,"]");
+     }
+  }
+
+/***************************************************
+  NAME         : PrintInstanceLongForm
+  DESCRIPTION  : Used by kernel to print
+                 instance addresses
+  INPUTS       : 1) The logical output name
+                 2) A pointer to the instance
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Address of instance printed
+  NOTES        : None
+ ***************************************************/
+void PrintInstanceLongForm(
+  Environment *theEnv,
+  const char *logName,
+  Instance *theInstance)
+  {
+   if (PrintUtilityData(theEnv)->InstanceAddressesToNames)
+     {
+      if (theInstance == &InstanceData(theEnv)->DummyInstance)
+        WriteString(theEnv,logName,"\"<Dummy Instance>\"");
+      else
+        {
+         WriteString(theEnv,logName,"[");
+         WriteString(theEnv,logName,GetFullInstanceName(theEnv,theInstance)->contents);
+         WriteString(theEnv,logName,"]");
+        }
+     }
+   else
+     {
+      if (PrintUtilityData(theEnv)->AddressesToStrings)
+        WriteString(theEnv,logName,"\"");
+      if (theInstance == &InstanceData(theEnv)->DummyInstance)
+        WriteString(theEnv,logName,"<Dummy Instance>");
+      else if (theInstance->garbage)
+        {
+         WriteString(theEnv,logName,"<Stale Instance-");
+         WriteString(theEnv,logName,theInstance->name->contents);
+         WriteString(theEnv,logName,">");
+        }
+      else
+        {
+         WriteString(theEnv,logName,"<Instance-");
+         WriteString(theEnv,logName,GetFullInstanceName(theEnv,theInstance)->contents);
+         WriteString(theEnv,logName,">");
+        }
+      if (PrintUtilityData(theEnv)->AddressesToStrings)
+        WriteString(theEnv,logName,"\"");
+     }
+  }
+
+#if DEFRULE_CONSTRUCT
+
+/***************************************************
+  NAME         : DecrementObjectBasisCount
+  DESCRIPTION  : Decrements the basis count of an
+                 object indicating that it is in
+                 use by the partial match of the
+                 currently executing rule
+  INPUTS       : The instance address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Basis count decremented and
+                 basis copy (possibly) deleted
+  NOTES        : When the count goes to zero, the
+                 basis copy of the object (if any)
+                 is deleted.
+ ***************************************************/
+void DecrementObjectBasisCount(
+  Environment *theEnv,
+  Instance *theInstance)
+  {
+   long i;
+
+   theInstance->patternHeader.busyCount--;
+   if (theInstance->patternHeader.busyCount == 0)
+     {
+      if (theInstance->garbage)
+        RemoveInstanceData(theEnv,theInstance);
+      if (theInstance->cls->instanceSlotCount != 0)
+        {
+         for (i = 0 ; i < theInstance->cls->instanceSlotCount ; i++)
+           if (theInstance->basisSlots[i].value != NULL)
+             {
+              if (theInstance->basisSlots[i].desc->multiple)
+                ReleaseMultifield(theEnv,theInstance->basisSlots[i].multifieldValue);
+              else
+                AtomDeinstall(theEnv,theInstance->basisSlots[i].type,
+                              theInstance->basisSlots[i].value);
+             }
+         rm(theEnv,theInstance->basisSlots,
+            (theInstance->cls->instanceSlotCount * sizeof(InstanceSlot)));
+         theInstance->basisSlots = NULL;
+        }
+     }
+  }
+
+/***************************************************
+  NAME         : IncrementObjectBasisCount
+  DESCRIPTION  : Increments the basis count of an
+                 object indicating that it is in
+                 use by the partial match of the
+                 currently executing rule
+
+                 If this the count was zero,
+                 allocate an array of extra
+                 instance slots for use by
+                 slot variables
+  INPUTS       : The instance address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Basis count incremented
+  NOTES        : None
+ ***************************************************/
+void IncrementObjectBasisCount(
+  Environment *theEnv,
+  Instance *theInstance)
+  {
+   long i;
+
+   if (theInstance->patternHeader.busyCount == 0)
+     {
+      if (theInstance->cls->instanceSlotCount != 0)
+        {
+         theInstance->basisSlots = (InstanceSlot *)
+                            gm2(theEnv,(sizeof(InstanceSlot) * theInstance->cls->instanceSlotCount));
+         for (i = 0 ; i < theInstance->cls->instanceSlotCount ; i++)
+           {
+            theInstance->basisSlots[i].desc = theInstance->slotAddresses[i]->desc;
+            theInstance->basisSlots[i].value = NULL;
+           }
+        }
+     }
+   theInstance->patternHeader.busyCount++;
+  }
+
+/***************************************************
+  NAME         : MatchObjectFunction
+  DESCRIPTION  : Filters an instance through the
+                 object pattern network
+                 Used for incremental resets in
+                 binary loads and run-time modules
+  INPUTS       : The instance
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance pattern-matched
+  NOTES        : None
+ ***************************************************/
+void MatchObjectFunction(
+  Environment *theEnv,
+  Instance *theInstance)
+  {
+   ObjectNetworkAction(theEnv,OBJECT_ASSERT,theInstance,-1);
+  }
+
+/***************************************************
+  NAME         : NetworkSynchronized
+  DESCRIPTION  : Determines if state of instance is
+                 consistent with last push through
+                 pattern-matching network
+  INPUTS       : The instance
+  RETURNS      : True if instance has not
+                 changed since last push through the
+                 Rete network, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool NetworkSynchronized(
+  Environment *theEnv,
+  Instance *theInstance)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   return theInstance->reteSynchronized;
+  }
+
+/***************************************************
+  NAME         : InstanceIsDeleted
+  DESCRIPTION  : Determines if an instance has been
+                 deleted
+  INPUTS       : The instance
+  RETURNS      : True if instance has been deleted,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool InstanceIsDeleted(
+  Environment *theEnv,
+  Instance *theInstance)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   return theInstance->garbage;
+  }
+#endif
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*****************************************************
+  NAME         : FindImportedInstance
+  DESCRIPTION  : Searches imported modules for an
+                 instance of the correct name
+                 The imports are searched recursively
+                 in the order of the module definition
+  INPUTS       : 1) The module for which to
+                    search imported modules
+                 2) The currently active module
+                 3) The first instance of the
+                    correct name (cannot be NULL)
+  RETURNS      : An instance of the correct name
+                 imported from another module which
+                 is in scope of the current module
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+static Instance *FindImportedInstance(
+  Environment *theEnv,
+  Defmodule *theModule,
+  Defmodule *currentModule,
+  Instance *startInstance)
+  {
+   struct portItem *importList;
+   Instance *ins;
+
+   if (theModule->visitedFlag)
+     return NULL;
+   theModule->visitedFlag = true;
+   importList = theModule->importList;
+   while (importList != NULL)
+     {
+      theModule = FindDefmodule(theEnv,importList->moduleName->contents);
+      for (ins = startInstance ;
+           (ins != NULL) ? (ins->name == startInstance->name) : false ;
+           ins = ins->nxtHash)
+        if ((ins->cls->header.whichModule->theModule == theModule) &&
+             DefclassInScope(theEnv,ins->cls,currentModule))
+          return(ins);
+      ins = FindImportedInstance(theEnv,theModule,currentModule,startInstance);
+      if (ins != NULL)
+        return(ins);
+      importList = importList->next;
+     }
+
+   /* ========================================================
+      Make sure instances of system classes are always visible
+      ======================================================== */
+   for (ins = startInstance ;
+        (ins != NULL) ? (ins->name == startInstance->name) : false ;
+        ins = ins->nxtHash)
+     if (ins->cls->system)
+       return(ins);
+
+   return NULL;
+  }
+
+#if DEFRULE_CONSTRUCT
+
+/*****************************************************
+  NAME         : NetworkModifyForSharedSlot
+  DESCRIPTION  : Performs a Rete network modify for
+                 all instances which contain a
+                 specific shared slot
+  INPUTS       : 1) The traversal id to use when
+                    recursively entering subclasses
+                    to prevent duplicate examinations
+                    of a class
+                 2) The class
+                 3) The descriptor for the shared slot
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instances which contain the shared
+                 slot are filtered through the
+                 Rete network via a retract/assert
+  NOTES        : Assumes traversal id has been
+                 established
+ *****************************************************/
+static void NetworkModifyForSharedSlot(
+  Environment *theEnv,
+  int sharedTraversalID,
+  Defclass *cls,
+  SlotDescriptor *sd)
+  {
+   Instance *ins;
+   unsigned long i;
+
+   /* ================================================
+      Make sure we haven't already examined this class
+      ================================================ */
+   if (TestTraversalID(cls->traversalRecord,sharedTraversalID))
+     return;
+   SetTraversalID(cls->traversalRecord,sharedTraversalID);
+
+   /* ===========================================
+      If the instances of this class contain the
+      shared slot, send update events to the Rete
+      network for all of its instances
+      =========================================== */
+   if ((sd->slotName->id > cls->maxSlotNameID) ? false :
+       ((cls->slotNameMap[sd->slotName->id] == 0) ? false :
+        (cls->instanceTemplate[cls->slotNameMap[sd->slotName->id] - 1] == sd)))
+     {
+      for (ins = cls->instanceList ; ins != NULL ; ins = ins->nxtClass)
+        ObjectNetworkAction(theEnv,OBJECT_MODIFY,ins,(int) sd->slotName->id);
+     }
+
+   /* ==================================
+      Check the subclasses of this class
+      ================================== */
+   for (i = 0 ; i < cls->directSubclasses.classCount ; i++)
+     NetworkModifyForSharedSlot(theEnv,sharedTraversalID,cls->directSubclasses.classArray[i],sd);
+  }
+
+#endif /* DEFRULE_CONSTRUCT */
+
+#endif /* OBJECT_SYSTEM */
+
+
diff --git a/clips/insfun.h b/clips/insfun.h
new file mode 100755
index 000000000..284d9b4c0
--- /dev/null
+++ b/clips/insfun.h
@@ -0,0 +1,134 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/18/17            */
+   /*                                                     */
+   /*               INSTANCE FUNCTIONS MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Link error occurs for the SlotExistError       */
+/*            function when OBJECT_SYSTEM is set to 0 in     */
+/*            setup.h. DR0865                                */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Moved EvaluateAndStoreInDataObject to          */
+/*            evaluatn.c                                     */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed slot override default ?NONE bug.         */
+/*                                                           */
+/*      6.31: Fix for compilation with -std=c89.             */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_insfun
+
+#pragma once
+
+#define _H_insfun
+
+#include "entities.h"
+#include "object.h"
+
+typedef struct igarbage
+  {
+   Instance *ins;
+   struct igarbage *nxt;
+  } IGARBAGE;
+
+#define INSTANCE_TABLE_HASH_SIZE 8191
+#define InstanceSizeHeuristic(ins)      sizeof(Instance)
+
+   void                           RetainInstance(Instance *);
+   void                           ReleaseInstance(Instance *);
+   void                           IncrementInstanceCallback(Environment *,Instance *);
+   void                           DecrementInstanceCallback(Environment *,Instance *);
+   void                           InitializeInstanceTable(Environment *);
+   void                           CleanupInstances(Environment *,void *);
+   unsigned                       HashInstance(CLIPSLexeme *);
+   void                           DestroyAllInstances(Environment *,void *);
+   void                           RemoveInstanceData(Environment *,Instance *);
+   Instance                      *FindInstanceBySymbol(Environment *,CLIPSLexeme *);
+   Instance                      *FindInstanceInModule(Environment *,CLIPSLexeme *,Defmodule *,
+                                                       Defmodule *,bool);
+   InstanceSlot                  *FindInstanceSlot(Environment *,Instance *,CLIPSLexeme *);
+   int                            FindInstanceTemplateSlot(Environment *,Defclass *,CLIPSLexeme *);
+   PutSlotError                   PutSlotValue(Environment *,Instance *,InstanceSlot *,UDFValue *,UDFValue *,const char *);
+   PutSlotError                   DirectPutSlotValue(Environment *,Instance *,InstanceSlot *,UDFValue *,UDFValue *);
+   PutSlotError                   ValidSlotValue(Environment *,UDFValue *,SlotDescriptor *,Instance *,const char *);
+   Instance                      *CheckInstance(UDFContext *);
+   void                           NoInstanceError(Environment *,const char *,const char *);
+   void                           StaleInstanceAddress(Environment *,const char *,int);
+   bool                           GetInstancesChanged(Environment *);
+   void                           SetInstancesChanged(Environment *,bool);
+   void                           PrintSlot(Environment *,const char *,SlotDescriptor *,Instance *,const char *);
+   void                           PrintInstanceNameAndClass(Environment *,const char *,Instance *,bool);
+   void                           PrintInstanceName(Environment *,const char *,Instance *);
+   void                           PrintInstanceLongForm(Environment *,const char *,Instance *);
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+   void                           DecrementObjectBasisCount(Environment *,Instance *);
+   void                           IncrementObjectBasisCount(Environment *,Instance *);
+   void                           MatchObjectFunction(Environment *,Instance *);
+   bool                           NetworkSynchronized(Environment *,Instance *);
+   bool                           InstanceIsDeleted(Environment *,Instance *);
+#endif
+
+#endif /* _H_insfun */
+
+
+
+
+
+
+
diff --git a/clips/insmngr.c b/clips/insmngr.c
new file mode 100755
index 000000000..30745c2c9
--- /dev/null
+++ b/clips/insmngr.c
@@ -0,0 +1,2520 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/17/18             */
+   /*                                                     */
+   /*          INSTANCE PRIMITIVE SUPPORT MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  Creation and Deletion of Instances Routines     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Newly created instances can no longer use      */
+/*            a preexisting instance name of another class   */
+/*            [INSMNGR16].                                   */
+/*                                                           */
+/*      6.31: Marked deleted instances so that partial       */
+/*            matches will not be propagated when the match  */
+/*            is based on both the existence and             */
+/*            non-existence of an instance.                  */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#if DEFRULE_CONSTRUCT
+#include "network.h"
+#include "drive.h"
+#include "objrtmch.h"
+#include "lgcldpnd.h"
+#endif
+
+#include "classcom.h"
+#include "classfun.h"
+#include "cstrnchk.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "insfun.h"
+#include "memalloc.h"
+#include "miscfun.h"
+#include "modulutl.h"
+#include "msgcom.h"
+#include "msgfun.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "insmngr.h"
+
+#include "inscom.h"
+#include "watch.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define MAKE_TRACE   "==>"
+#define UNMAKE_TRACE "<=="
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static Instance               *NewInstance(Environment *);
+   static Instance               *InstanceLocationInfo(Environment *,Defclass *,CLIPSLexeme *,Instance **,
+                                                       unsigned *);
+   static void                    InstallInstance(Environment *,Instance *,bool);
+   static void                    BuildDefaultSlots(Environment *,bool);
+   static bool                    CoreInitializeInstance(Environment *,Instance *,Expression *);
+   static bool                    CoreInitializeInstanceCV(Environment *,Instance *,CLIPSValue *);
+   static bool                    InsertSlotOverrides(Environment *,Instance *,Expression *);
+   static bool                    InsertSlotOverridesCV(Environment *,Instance *,CLIPSValue *);
+   static void                    EvaluateClassDefaults(Environment *,Instance *);
+   static bool                    IMModifySlots(Environment *,Instance *,CLIPSValue *);
+
+#if DEBUGGING_FUNCTIONS
+   static void                    PrintInstanceWatch(Environment *,const char *,Instance *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : InitializeInstanceCommand
+  DESCRIPTION  : Initializes an instance of a class
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance intialized
+  NOTES        : H/L Syntax:
+                 (active-initialize-instance <instance-name>
+                    <slot-override>*)
+ ***********************************************************/
+void InitializeInstanceCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   ins = CheckInstance(context);
+   if (ins == NULL)
+     return;
+   if (CoreInitializeInstance(theEnv,ins,GetFirstArgument()->nextArg) == true)
+     { returnValue->value = ins->name; }
+  }
+
+/****************************************************************
+  NAME         : MakeInstanceCommand
+  DESCRIPTION  : Creates and initializes an instance of a class
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance intialized
+  NOTES        : H/L Syntax:
+                 (active-make-instance <instance-name> of <class>
+                    <slot-override>*)
+  CHANGES      : It's now possible to create an instance of a
+                 class that's not in scope if the module name
+                 is specified.
+ ****************************************************************/
+void MakeInstanceCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   CLIPSLexeme *iname;
+   Instance *ins;
+   UDFValue temp;
+   Defclass *cls;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   EvaluateExpression(theEnv,GetFirstArgument(),&temp);
+   
+   if (temp.header->type == INSTANCE_NAME_TYPE)
+     { iname = temp.lexemeValue; }
+   else if (temp.header->type == SYMBOL_TYPE)
+     { iname = CreateInstanceName(theEnv,temp.lexemeValue->contents); }
+   else
+     {
+      PrintErrorID(theEnv,"INSMNGR",1,false);
+      WriteString(theEnv,STDERR,"Expected a valid name for new instance.\n");
+      SetEvaluationError(theEnv,true);
+      InstanceData(theEnv)->makeInstanceError = MIE_COULD_NOT_CREATE_ERROR;
+      return;
+     }
+
+   if (GetFirstArgument()->nextArg->type == DEFCLASS_PTR)
+     cls = (Defclass *) GetFirstArgument()->nextArg->value;
+   else
+     {
+      EvaluateExpression(theEnv,GetFirstArgument()->nextArg,&temp);
+      if (temp.header->type != SYMBOL_TYPE)
+        {
+         PrintErrorID(theEnv,"INSMNGR",2,false);
+         WriteString(theEnv,STDERR,"Expected a valid class name for new instance.\n");
+         SetEvaluationError(theEnv,true);
+         InstanceData(theEnv)->makeInstanceError = MIE_COULD_NOT_CREATE_ERROR;
+         return;
+        }
+
+      cls = LookupDefclassByMdlOrScope(theEnv,temp.lexemeValue->contents); // Module or scope is now allowed
+
+      if (cls == NULL)
+        {
+         ClassExistError(theEnv,ExpressionFunctionCallName(EvaluationData(theEnv)->CurrentExpression)->contents,
+                         temp.lexemeValue->contents);
+         SetEvaluationError(theEnv,true);
+         InstanceData(theEnv)->makeInstanceError = MIE_COULD_NOT_CREATE_ERROR;
+         return;
+        }
+     }
+
+   ins = BuildInstance(theEnv,iname,cls,true);
+   if (ins == NULL) return;
+
+   if (CoreInitializeInstance(theEnv,ins,GetFirstArgument()->nextArg->nextArg) == true)
+     { returnValue->value = GetFullInstanceName(theEnv,ins); }
+   else
+     QuashInstance(theEnv,ins);
+  }
+
+/***************************************************
+  NAME         : GetFullInstanceName
+  DESCRIPTION  : If this function is called while
+                 the current module is other than
+                 the one in which the instance
+                 resides, then the module name is
+                 prepended to the instance name.
+                 Otherwise - the base name only is
+                 returned.
+  INPUTS       : The instance
+  RETURNS      : The instance name symbol (with
+                 module name and :: prepended)
+  SIDE EFFECTS : Temporary buffer allocated possibly
+                 and new symbol created
+  NOTES        : Used to differentiate between
+                 instances of the same name in
+                 different modules.
+                 Instances are now global in scope so
+                 each instance name must belong to a
+                 single instance. It's no longer
+                 necessary to return the full instance
+                 name.
+ ***************************************************/
+CLIPSLexeme *GetFullInstanceName(
+  Environment *theEnv,
+  Instance *ins)
+  {
+   if (ins == &InstanceData(theEnv)->DummyInstance)
+     { return CreateInstanceName(theEnv,"Dummy Instance"); }
+
+   return ins->name;
+  }
+
+/***************************************************
+  NAME         : BuildInstance
+  DESCRIPTION  : Creates an uninitialized instance
+  INPUTS       : 1) Name of the instance
+                 2) Class pointer
+                 3) Flag indicating whether init
+                    message will be called for
+                    this instance or not
+  RETURNS      : The address of the new instance,
+                   NULL on errors (or when a
+                   a logical basis in a rule was
+                   deleted int the same RHS in
+                   which the instance creation
+                   occurred)
+  SIDE EFFECTS : Old definition (if any) is deleted
+  NOTES        : None
+ ***************************************************/
+Instance *BuildInstance(
+  Environment *theEnv,
+  CLIPSLexeme *iname,
+  Defclass *cls,
+  bool initMessage)
+  {
+   Instance *ins,*iprv;
+   unsigned hashTableIndex;
+   unsigned modulePosition;
+   CLIPSLexeme *moduleName;
+   UDFValue temp;
+
+   if (iname->header.type == SYMBOL_TYPE)
+     { iname = CreateInstanceName(theEnv,iname->contents); }
+
+#if DEFRULE_CONSTRUCT
+   if (EngineData(theEnv)->JoinOperationInProgress && cls->reactive)
+     {
+      PrintErrorID(theEnv,"INSMNGR",10,false);
+      WriteString(theEnv,STDERR,"Cannot create instances of reactive classes while ");
+      WriteString(theEnv,STDERR,"pattern-matching is in process.\n");
+      SetEvaluationError(theEnv,true);
+      InstanceData(theEnv)->makeInstanceError = MIE_COULD_NOT_CREATE_ERROR;
+      return NULL;
+     }
+#endif
+   if (cls->abstract)
+     {
+      PrintErrorID(theEnv,"INSMNGR",3,false);
+      WriteString(theEnv,STDERR,"Cannot create instances of abstract class '");
+      WriteString(theEnv,STDERR,DefclassName(cls));
+      WriteString(theEnv,STDERR,"'.\n");
+      SetEvaluationError(theEnv,true);
+      InstanceData(theEnv)->makeInstanceError = MIE_COULD_NOT_CREATE_ERROR;
+      return NULL;
+     }
+   modulePosition = FindModuleSeparator(iname->contents);
+   if (modulePosition)
+     {
+      moduleName = ExtractModuleName(theEnv,modulePosition,iname->contents);
+      if ((moduleName == NULL) ||
+          (moduleName != cls->header.whichModule->theModule->header.name))
+        {
+         PrintErrorID(theEnv,"INSMNGR",11,true);
+         WriteString(theEnv,STDERR,"Invalid module specifier in new instance name.\n");
+         SetEvaluationError(theEnv,true);
+         InstanceData(theEnv)->makeInstanceError = MIE_COULD_NOT_CREATE_ERROR;
+         return NULL;
+        }
+      iname = ExtractConstructName(theEnv,modulePosition,iname->contents,INSTANCE_NAME_TYPE);
+     }
+   ins = InstanceLocationInfo(theEnv,cls,iname,&iprv,&hashTableIndex);
+
+   if (ins != NULL)
+     {
+      if (ins->cls != cls)
+        {
+         PrintErrorID(theEnv,"INSMNGR",16,false);
+         WriteString(theEnv,STDERR,"The instance name [");
+         WriteString(theEnv,STDERR,iname->contents);
+         WriteString(theEnv,STDERR,"] is in use by an instance of class '");
+         WriteString(theEnv,STDERR,ins->cls->header.name->contents);
+         WriteString(theEnv,STDERR,"'.\n");
+         SetEvaluationError(theEnv,true);
+         InstanceData(theEnv)->makeInstanceError = MIE_COULD_NOT_CREATE_ERROR;
+         return NULL;
+        }
+
+      if (ins->installed == 0)
+        {
+         PrintErrorID(theEnv,"INSMNGR",4,false);
+         WriteString(theEnv,STDERR,"The instance [");
+         WriteString(theEnv,STDERR,iname->contents);
+         WriteString(theEnv,STDERR,"] has a slot-value which depends on the instance definition.\n");
+         SetEvaluationError(theEnv,true);
+         InstanceData(theEnv)->makeInstanceError = MIE_COULD_NOT_CREATE_ERROR;
+         return NULL;
+        }
+      ins->busy++;
+      IncrementLexemeCount(iname);
+      if (ins->garbage == 0)
+        {
+         if (InstanceData(theEnv)->MkInsMsgPass)
+           DirectMessage(theEnv,MessageHandlerData(theEnv)->DELETE_SYMBOL,ins,NULL,NULL);
+         else
+           QuashInstance(theEnv,ins);
+        }
+      ins->busy--;
+      ReleaseLexeme(theEnv,iname);
+      if (ins->garbage == 0)
+        {
+         PrintErrorID(theEnv,"INSMNGR",5,false);
+         WriteString(theEnv,STDERR,"Unable to delete old instance [");
+         WriteString(theEnv,STDERR,iname->contents);
+         WriteString(theEnv,STDERR,"].\n");
+         SetEvaluationError(theEnv,true);
+         InstanceData(theEnv)->makeInstanceError = MIE_COULD_NOT_CREATE_ERROR;
+         return NULL;
+        }
+     }
+
+   /* =============================================================
+      Create the base instance from the defaults of the inheritance
+      precedence list
+      ============================================================= */
+   InstanceData(theEnv)->CurrentInstance = NewInstance(theEnv);
+
+#if DEFRULE_CONSTRUCT
+   /* ==============================================
+      Add this new instance as a dependent to
+      any currently active basis - if the partial
+      match was deleted, abort the instance creation
+      ============================================== */
+   if (AddLogicalDependencies(theEnv,(struct patternEntity *) InstanceData(theEnv)->CurrentInstance,false)
+        == false)
+     {
+      rtn_struct(theEnv,instance,InstanceData(theEnv)->CurrentInstance);
+      InstanceData(theEnv)->CurrentInstance = NULL;
+      return NULL;
+     }
+#endif
+
+   InstanceData(theEnv)->CurrentInstance->name = iname;
+   InstanceData(theEnv)->CurrentInstance->cls = cls;
+   BuildDefaultSlots(theEnv,initMessage);
+
+   /* ============================================================
+      Put the instance in the instance hash table and put it on its
+        class's instance list
+      ============================================================ */
+   InstanceData(theEnv)->CurrentInstance->hashTableIndex = hashTableIndex;
+   if (iprv == NULL)
+     {
+      InstanceData(theEnv)->CurrentInstance->nxtHash = InstanceData(theEnv)->InstanceTable[hashTableIndex];
+      if (InstanceData(theEnv)->InstanceTable[hashTableIndex] != NULL)
+        InstanceData(theEnv)->InstanceTable[hashTableIndex]->prvHash = InstanceData(theEnv)->CurrentInstance;
+      InstanceData(theEnv)->InstanceTable[hashTableIndex] = InstanceData(theEnv)->CurrentInstance;
+     }
+   else
+     {
+      InstanceData(theEnv)->CurrentInstance->nxtHash = iprv->nxtHash;
+      if (iprv->nxtHash != NULL)
+        iprv->nxtHash->prvHash = InstanceData(theEnv)->CurrentInstance;
+      iprv->nxtHash = InstanceData(theEnv)->CurrentInstance;
+      InstanceData(theEnv)->CurrentInstance->prvHash = iprv;
+     }
+
+   /* ======================================
+      Put instance in global and class lists
+      ====================================== */
+   if (InstanceData(theEnv)->CurrentInstance->cls->instanceList == NULL)
+     InstanceData(theEnv)->CurrentInstance->cls->instanceList = InstanceData(theEnv)->CurrentInstance;
+   else
+     InstanceData(theEnv)->CurrentInstance->cls->instanceListBottom->nxtClass = InstanceData(theEnv)->CurrentInstance;
+   InstanceData(theEnv)->CurrentInstance->prvClass = InstanceData(theEnv)->CurrentInstance->cls->instanceListBottom;
+   InstanceData(theEnv)->CurrentInstance->cls->instanceListBottom = InstanceData(theEnv)->CurrentInstance;
+
+   if (InstanceData(theEnv)->InstanceList == NULL)
+     InstanceData(theEnv)->InstanceList = InstanceData(theEnv)->CurrentInstance;
+   else
+     InstanceData(theEnv)->InstanceListBottom->nxtList = InstanceData(theEnv)->CurrentInstance;
+   InstanceData(theEnv)->CurrentInstance->prvList = InstanceData(theEnv)->InstanceListBottom;
+   InstanceData(theEnv)->InstanceListBottom = InstanceData(theEnv)->CurrentInstance;
+   InstanceData(theEnv)->ChangesToInstances = true;
+
+   /* ==============================================================================
+      Install the instance's name and slot-value symbols (prevent them from becoming
+      ephemeral) - the class name and slot names are accounted for by the class
+      ============================================================================== */
+   InstallInstance(theEnv,InstanceData(theEnv)->CurrentInstance,true);
+
+   ins = InstanceData(theEnv)->CurrentInstance;
+   InstanceData(theEnv)->CurrentInstance = NULL;
+
+   if (InstanceData(theEnv)->MkInsMsgPass)
+     { DirectMessage(theEnv,MessageHandlerData(theEnv)->CREATE_SYMBOL,ins,&temp,NULL); }
+
+#if DEFRULE_CONSTRUCT
+   if (ins->cls->reactive)
+     ObjectNetworkAction(theEnv,OBJECT_ASSERT,ins,-1);
+#endif
+
+   if (EvaluationData(theEnv)->EvaluationError)
+     { InstanceData(theEnv)->makeInstanceError = MIE_RULE_NETWORK_ERROR; }
+   else
+     { InstanceData(theEnv)->makeInstanceError = MIE_NO_ERROR; }
+
+   return ins;
+  }
+
+/*****************************************************************************
+  NAME         : InitSlotsCommand
+  DESCRIPTION  : Calls Kernel Expression Evaluator EvaluateExpression
+                   for each expression-value of an instance expression
+
+                 Evaluates default slots only - slots that were specified
+                 by overrides (sp->override == 1) are ignored)
+  INPUTS       : 1) Instance address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Each UDFValue slot in the instance's slot array is replaced
+                   by the evaluation (by EvaluateExpression) of the expression
+                   in the slot list.  The old expression-values
+                   are deleted.
+  NOTES        : H/L Syntax: (init-slots <instance>)
+ *****************************************************************************/
+void InitSlotsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   EvaluationData(theEnv)->EvaluationError = false;
+
+   if (CheckCurrentMessage(theEnv,"init-slots",true) == false)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   EvaluateClassDefaults(theEnv,GetActiveInstance(theEnv));
+
+   if (! EvaluationData(theEnv)->EvaluationError)
+     { returnValue->instanceValue = GetActiveInstance(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/******************************************************
+  NAME         : QuashInstance
+  DESCRIPTION  : Deletes an instance if it is not in
+                   use, otherwise sticks it on the
+                   garbage list
+  INPUTS       : The instance
+  RETURNS      : 1 if successful, 0 otherwise
+  SIDE EFFECTS : Instance deleted or added to garbage
+  NOTES        : Even though the instance is removed
+                   from the class list, hash table and
+                   instance list, its links remain
+                   unchanged so that outside loops
+                   can still determine where the next
+                   node in the list is (assuming the
+                   instance was garbage collected).
+ ******************************************************/
+UnmakeInstanceError QuashInstance(
+  Environment *theEnv,
+  Instance *ins)
+  {
+   int iflag;
+   IGARBAGE *gptr;
+
+#if DEFRULE_CONSTRUCT
+   if (EngineData(theEnv)->JoinOperationInProgress && ins->cls->reactive)
+     {
+      PrintErrorID(theEnv,"INSMNGR",12,false);
+      WriteString(theEnv,STDERR,"Cannot delete instances of reactive classes while ");
+      WriteString(theEnv,STDERR,"pattern-matching is in process.\n");
+      SetEvaluationError(theEnv,true);
+      InstanceData(theEnv)->unmakeInstanceError = UIE_COULD_NOT_DELETE_ERROR;
+      return UIE_COULD_NOT_DELETE_ERROR;
+     }
+#endif
+
+   if (ins->garbage == 1)
+     {
+      InstanceData(theEnv)->unmakeInstanceError = UIE_COULD_NOT_DELETE_ERROR;
+      return UIE_DELETED_ERROR;
+     }
+ 
+   if (ins->installed == 0)
+     {
+      PrintErrorID(theEnv,"INSMNGR",6,false);
+      WriteString(theEnv,STDERR,"Cannot delete instance [");
+      WriteString(theEnv,STDERR,ins->name->contents);
+      WriteString(theEnv,STDERR,"] during initialization.\n");
+      SetEvaluationError(theEnv,true);
+      InstanceData(theEnv)->unmakeInstanceError = UIE_COULD_NOT_DELETE_ERROR;
+      return UIE_COULD_NOT_DELETE_ERROR;
+     }
+     
+#if DEBUGGING_FUNCTIONS
+   if (ins->cls->traceInstances)
+     PrintInstanceWatch(theEnv,UNMAKE_TRACE,ins);
+#endif
+
+#if DEFRULE_CONSTRUCT
+   RemoveEntityDependencies(theEnv,(struct patternEntity *) ins);
+
+   if (ins->cls->reactive)
+     {
+      ins->garbage = 1;
+      ObjectNetworkAction(theEnv,OBJECT_RETRACT,ins,-1);
+      ins->garbage = 0;
+     }
+#endif
+
+   if (ins->prvHash != NULL)
+     ins->prvHash->nxtHash = ins->nxtHash;
+   else
+     InstanceData(theEnv)->InstanceTable[ins->hashTableIndex] = ins->nxtHash;
+   if (ins->nxtHash != NULL)
+     ins->nxtHash->prvHash = ins->prvHash;
+
+   if (ins->prvClass != NULL)
+     ins->prvClass->nxtClass = ins->nxtClass;
+   else
+     ins->cls->instanceList = ins->nxtClass;
+   if (ins->nxtClass != NULL)
+     ins->nxtClass->prvClass = ins->prvClass;
+   else
+     ins->cls->instanceListBottom = ins->prvClass;
+
+   if (ins->prvList != NULL)
+     ins->prvList->nxtList = ins->nxtList;
+   else
+     InstanceData(theEnv)->InstanceList = ins->nxtList;
+   if (ins->nxtList != NULL)
+     ins->nxtList->prvList = ins->prvList;
+   else
+     InstanceData(theEnv)->InstanceListBottom = ins->prvList;
+
+   iflag = ins->installed;
+   InstallInstance(theEnv,ins,false);
+
+   /* ==============================================
+      If the instance is the basis for an executing
+      rule, don't bother deleting its slots yet, for
+      they may still be needed by pattern variables
+      ============================================== */
+#if DEFRULE_CONSTRUCT
+   if ((iflag == 1)
+       && (ins->patternHeader.busyCount == 0))
+#else
+   if (iflag == 1)
+#endif
+     RemoveInstanceData(theEnv,ins);
+
+   if ((ins->busy == 0) &&
+       (InstanceData(theEnv)->MaintainGarbageInstances == false)
+#if DEFRULE_CONSTRUCT
+        && (ins->patternHeader.busyCount == 0)
+#endif
+       )
+     {
+      ReleaseLexeme(theEnv,ins->name);
+      rtn_struct(theEnv,instance,ins);
+     }
+   else
+     {
+      gptr = get_struct(theEnv,igarbage);
+      ins->garbage = 1;
+      gptr->ins = ins;
+      gptr->nxt = InstanceData(theEnv)->InstanceGarbageList;
+      InstanceData(theEnv)->InstanceGarbageList = gptr;
+      UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+     }
+     
+   InstanceData(theEnv)->ChangesToInstances = true;
+
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      InstanceData(theEnv)->unmakeInstanceError = UIE_RULE_NETWORK_ERROR;
+      return UIE_RULE_NETWORK_ERROR;
+     }
+     
+   InstanceData(theEnv)->unmakeInstanceError = UIE_NO_ERROR;
+   return UIE_NO_ERROR;
+  }
+
+
+#if DEFRULE_CONSTRUCT
+
+/****************************************************
+  NAME         : InactiveInitializeInstance
+  DESCRIPTION  : Initializes an instance of a class
+                 Pattern-matching is automatically
+                 delayed until the instance is
+                 completely initialized
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance intialized
+  NOTES        : H/L Syntax:
+                 (initialize-instance <instance-name>
+                    <slot-override>*)
+ ****************************************************/
+void InactiveInitializeInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool ov;
+
+   ov = SetDelayObjectPatternMatching(theEnv,true);
+   InitializeInstanceCommand(theEnv,context,returnValue);
+   SetDelayObjectPatternMatching(theEnv,ov);
+  }
+
+/**************************************************************
+  NAME         : InactiveMakeInstance
+  DESCRIPTION  : Creates and initializes an instance of a class
+                 Pattern-matching is automatically
+                 delayed until the instance is
+                 completely initialized
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance intialized
+  NOTES        : H/L Syntax:
+                 (make-instance <instance-name> of <class>
+                    <slot-override>*)
+ **************************************************************/
+void InactiveMakeInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool ov;
+
+   ov = SetDelayObjectPatternMatching(theEnv,true);
+   MakeInstanceCommand(theEnv,context,returnValue);
+   SetDelayObjectPatternMatching(theEnv,ov);
+  }
+
+#endif
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/********************************************************
+  NAME         : NewInstance
+  DESCRIPTION  : Allocates and initializes a new instance
+  INPUTS       : None
+  RETURNS      : The address of the new instance
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************/
+static Instance *NewInstance(
+  Environment *theEnv)
+  {
+   Instance *instance;
+
+   instance = get_struct(theEnv,instance);
+#if DEFRULE_CONSTRUCT
+   instance->patternHeader.theInfo = &InstanceData(theEnv)->InstanceInfo;
+
+   instance->patternHeader.dependents = NULL;
+   instance->patternHeader.busyCount = 0;
+   instance->patternHeader.timeTag = 0L;
+
+   instance->partialMatchList = NULL;
+   instance->basisSlots = NULL;
+   instance->reteSynchronized = false;
+#endif
+   instance->patternHeader.header.type = INSTANCE_ADDRESS_TYPE;
+   instance->busy = 0;
+   instance->installed = 0;
+   instance->garbage = 0;
+   instance->initSlotsCalled = 0;
+   instance->initializeInProgress = 0;
+   instance->name = NULL;
+   instance->hashTableIndex = 0;
+   instance->cls = NULL;
+   instance->slots = NULL;
+   instance->slotAddresses = NULL;
+   instance->prvClass = NULL;
+   instance->nxtClass = NULL;
+   instance->prvHash = NULL;
+   instance->nxtHash = NULL;
+   instance->prvList = NULL;
+   instance->nxtList = NULL;
+   return(instance);
+  }
+
+/*****************************************************************
+  NAME         : InstanceLocationInfo
+  DESCRIPTION  : Determines where a specified instance belongs
+                   in the instance hash table
+  INPUTS       : 1) The class of the new instance
+                 2) The symbol for the name of the instance
+                 3) Caller's buffer for previous node address
+                 4) Caller's buffer for hash value
+  RETURNS      : The address of the found instance, NULL otherwise
+  SIDE EFFECTS : None
+  NOTES        : Instance names only have to be unique within
+                 a module.
+                 Change: instance names must be unique regardless
+                 of module.
+ *****************************************************************/
+static Instance *InstanceLocationInfo(
+  Environment *theEnv,
+  Defclass *cls,
+  CLIPSLexeme *iname,
+  Instance **prv,
+  unsigned *hashTableIndex)
+  {
+   Instance *ins;
+
+   *hashTableIndex = HashInstance(iname);
+   ins = InstanceData(theEnv)->InstanceTable[*hashTableIndex];
+
+   /* ========================================
+      Make sure all instances of the same name
+      are grouped together regardless of what
+      module their classes are in
+      ======================================== */
+   *prv = NULL;
+   while (ins != NULL)
+     {
+      if (ins->name == iname)
+        { return(ins); }
+      *prv = ins;
+      ins = ins->nxtHash;
+     }
+
+   /*
+   while ((ins != NULL) ? (ins->name != iname) : false)
+     {
+      *prv = ins;
+      ins = ins->nxtHash;
+     }
+   while ((ins != NULL) ? (ins->name == iname) : false)
+     {
+      if (ins->cls->header.whichModule->theModule ==
+          cls->header.whichModule->theModule)
+        return(ins);
+      *prv = ins;
+      ins = ins->nxtHash;
+     }
+   */
+   return NULL;
+  }
+
+/********************************************************
+  NAME         : InstallInstance
+  DESCRIPTION  : Prevent name and slot value symbols
+                   from being ephemeral (all others
+                   taken care of by class defn)
+  INPUTS       : 1) The address of the instance
+                 2) A flag indicating whether to
+                    install or deinstall
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Symbol counts incremented or decremented
+  NOTES        : Slot symbol installations are handled
+                   by PutSlotValue
+ ********************************************************/
+static void InstallInstance(
+  Environment *theEnv,
+  Instance *ins,
+  bool set)
+  {
+   if (set == true)
+     {
+      if (ins->installed)
+        return;
+#if DEBUGGING_FUNCTIONS
+      if (ins->cls->traceInstances)
+        PrintInstanceWatch(theEnv,MAKE_TRACE,ins);
+#endif
+      ins->installed = 1;
+      IncrementLexemeCount(ins->name);
+      IncrementDefclassBusyCount(theEnv,ins->cls);
+      InstanceData(theEnv)->GlobalNumberOfInstances++;
+     }
+   else
+     {
+      if (! ins->installed)
+        return;
+      ins->installed = 0;
+      InstanceData(theEnv)->GlobalNumberOfInstances--;
+
+      /* =======================================
+         Class counts is decremented by
+         RemoveInstanceData() when slot data is
+         truly deleted - and name count is
+         deleted by CleanupInstances() or
+         QuashInstance() when instance is
+         truly deleted
+         ======================================= */
+     }
+  }
+
+/****************************************************************
+  NAME         : BuildDefaultSlots
+  DESCRIPTION  : The current instance's address is
+                   in the global variable CurrentInstance.
+                   This builds the slots and the default values
+                   from the direct class of the instance and its
+                   inheritances.
+  INPUTS       : Flag indicating whether init message will be
+                 called for this instance or not
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Allocates the slot array for
+                   the current instance
+  NOTES        : The current instance's address is
+                 stored in a global variable
+ ****************************************************************/
+static void BuildDefaultSlots(
+  Environment *theEnv,
+  bool initMessage)
+  {
+   unsigned i,j;
+   unsigned scnt;
+   unsigned lscnt;
+   InstanceSlot *dst = NULL,**adst;
+   SlotDescriptor **src;
+
+   scnt = InstanceData(theEnv)->CurrentInstance->cls->instanceSlotCount;
+   lscnt = InstanceData(theEnv)->CurrentInstance->cls->localInstanceSlotCount;
+   if (scnt > 0)
+     {
+      InstanceData(theEnv)->CurrentInstance->slotAddresses = adst =
+         (InstanceSlot **) gm2(theEnv,(sizeof(InstanceSlot *) * scnt));
+      if (lscnt != 0)
+        InstanceData(theEnv)->CurrentInstance->slots = dst =
+           (InstanceSlot *) gm2(theEnv,(sizeof(InstanceSlot) * lscnt));
+      src = InstanceData(theEnv)->CurrentInstance->cls->instanceTemplate;
+
+      /* ==================================================
+         A map of slot addresses is created - shared slots
+         point at values in the class, and local slots
+         point at values in the instance
+
+         Also - slots are always given an initial value
+         (since slots cannot be unbound). If there is
+         already an instance of a class with a shared slot,
+         that value is left alone
+         ================================================== */
+      for (i = 0 , j = 0 ; i < scnt ; i++)
+        {
+         if (src[i]->shared)
+           {
+            src[i]->sharedCount++;
+            adst[i] = &(src[i]->sharedValue);
+           }
+         else
+           {
+            dst[j].desc = src[i];
+            dst[j].value = NULL;
+            adst[i] = &dst[j++];
+           }
+         if (adst[i]->value == NULL)
+           {
+            adst[i]->valueRequired = initMessage;
+            if (adst[i]->desc->multiple)
+              {
+               adst[i]->type = MULTIFIELD_TYPE;
+               adst[i]->value = CreateUnmanagedMultifield(theEnv,0L);
+               RetainMultifield(theEnv,adst[i]->multifieldValue);
+              }
+            else
+              {
+               adst[i]->type = SYMBOL_TYPE;
+               adst[i]->value = CreateSymbol(theEnv,"nil");
+               AtomInstall(theEnv,adst[i]->type,adst[i]->value);
+              }
+           }
+         else
+           adst[i]->valueRequired = false;
+         adst[i]->override = false;
+        }
+     }
+  }
+
+/*******************************************************************
+  NAME         : CoreInitializeInstance
+  DESCRIPTION  : Performs the core work for initializing an instance
+  INPUTS       : 1) The instance address
+                 2) Slot override expressions
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : EvaluationError set on errors - slots evaluated
+  NOTES        : None
+ *******************************************************************/
+static bool CoreInitializeInstance(
+  Environment *theEnv,
+  Instance *ins,
+  Expression *ovrexp)
+  {
+   UDFValue temp;
+
+   if (ins->installed == 0)
+     {
+      PrintErrorID(theEnv,"INSMNGR",7,false);
+      WriteString(theEnv,STDERR,"Instance [");
+      WriteString(theEnv,STDERR,ins->name->contents);
+      WriteString(theEnv,STDERR,"] is already being initialized.\n");
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+
+   /* =======================================================
+      Replace all default-slot values with any slot-overrides
+      ======================================================= */
+   ins->busy++;
+   ins->installed = 0;
+
+   /* =================================================================
+      If the slots are initialized properly - the initializeInProgress
+      flag will be turned off.
+      ================================================================= */
+   ins->initializeInProgress = 1;
+   ins->initSlotsCalled = 0;
+
+   if (InsertSlotOverrides(theEnv,ins,ovrexp) == false)
+      {
+       ins->installed = 1;
+       ins->busy--;
+       return false;
+      }
+
+   /* =================================================================
+      Now that all the slot expressions are established - replace them
+      with their evaluation
+      ================================================================= */
+
+   if (InstanceData(theEnv)->MkInsMsgPass)
+     DirectMessage(theEnv,MessageHandlerData(theEnv)->INIT_SYMBOL,ins,&temp,NULL);
+   else
+     EvaluateClassDefaults(theEnv,ins);
+
+   ins->busy--;
+   ins->installed = 1;
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      PrintErrorID(theEnv,"INSMNGR",8,false);
+      WriteString(theEnv,STDERR,"An error occurred during the initialization of instance [");
+      WriteString(theEnv,STDERR,ins->name->contents);
+      WriteString(theEnv,STDERR,"].\n");
+      return false;
+     }
+
+   ins->initializeInProgress = 0;
+   return (ins->initSlotsCalled == 0) ? false : true;
+  }
+
+/*******************************************************************
+  NAME         : CoreInitializeInstanceCV
+  DESCRIPTION  : Performs the core work for initializing an instance
+  INPUTS       : 1) The instance address
+                 2) Slot override CLIPSValues
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : EvaluationError set on errors - slots evaluated
+  NOTES        : None
+ *******************************************************************/
+static bool CoreInitializeInstanceCV(
+  Environment *theEnv,
+  Instance *ins,
+  CLIPSValue *overrides)
+  {
+   UDFValue temp;
+
+   if (ins->installed == 0)
+     {
+      PrintErrorID(theEnv,"INSMNGR",7,false);
+      WriteString(theEnv,STDERR,"Instance ");
+      WriteString(theEnv,STDERR,ins->name->contents);
+      WriteString(theEnv,STDERR," is already being initialized.\n");
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+     
+   /*==========================================================*/
+   /* Replace all default-slot values with any slot-overrides. */
+   /*==========================================================*/
+   
+   ins->busy++;
+   ins->installed = 0;
+   
+   /*===============================================*/
+   /* If the slots are initialized properly - the   */
+   /* initializeInProgress flag will be turned off. */
+   /*===============================================*/
+   
+   ins->initializeInProgress = 1;
+   ins->initSlotsCalled = 0;
+
+   if (InsertSlotOverridesCV(theEnv,ins,overrides) == false)
+      {
+       ins->installed = 1;
+       ins->busy--;
+       return false;
+      }
+
+   /*====================================================*/
+   /* Now that all the slot expressions are established, */
+   /* replace them  with their evaluation.               */
+   /*====================================================*/
+
+   if (InstanceData(theEnv)->MkInsMsgPass)
+     { DirectMessage(theEnv,MessageHandlerData(theEnv)->INIT_SYMBOL,ins,&temp,NULL); }
+   else
+     { EvaluateClassDefaults(theEnv,ins); }
+
+   ins->busy--;
+   ins->installed = 1;
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      PrintErrorID(theEnv,"INSMNGR",8,false);
+      WriteString(theEnv,STDERR,"An error occurred during the initialization of instance [");
+      WriteString(theEnv,STDERR,ins->name->contents);
+      WriteString(theEnv,STDERR,"].\n");
+      return false;
+     }
+     
+   ins->initializeInProgress = 0;
+   return (ins->initSlotsCalled == 0) ? false : true;
+  }
+
+/**********************************************************
+  NAME         : InsertSlotOverrides
+  DESCRIPTION  : Replaces value-expression for a slot
+  INPUTS       : 1) The instance address
+                 2) The address of the beginning of the
+                    list of slot-expressions
+  RETURNS      : True if all okay, false otherwise
+  SIDE EFFECTS : Old slot expression deallocated
+  NOTES        : Assumes symbols not yet installed
+                 EVALUATES the slot-name expression but
+                    simply copies the slot value-expression
+ **********************************************************/
+static bool InsertSlotOverrides(
+  Environment *theEnv,
+  Instance *ins,
+  Expression *slot_exp)
+  {
+   InstanceSlot *slot;
+   UDFValue temp, junk;
+
+   EvaluationData(theEnv)->EvaluationError = false;
+   while (slot_exp != NULL)
+     {
+      if ((EvaluateExpression(theEnv,slot_exp,&temp) == true) ? true :
+          (temp.header->type != SYMBOL_TYPE))
+        {
+         PrintErrorID(theEnv,"INSMNGR",9,false);
+         WriteString(theEnv,STDERR,"Expected a valid slot name for slot-override.\n");
+         SetEvaluationError(theEnv,true);
+         return false;
+        }
+      slot = FindInstanceSlot(theEnv,ins,temp.lexemeValue);
+      if (slot == NULL)
+        {
+         PrintErrorID(theEnv,"INSMNGR",13,false);
+         WriteString(theEnv,STDERR,"Slot '");
+         WriteString(theEnv,STDERR,temp.lexemeValue->contents);
+         WriteString(theEnv,STDERR,"' does not exist in instance [");
+         WriteString(theEnv,STDERR,ins->name->contents);
+         WriteString(theEnv,STDERR,"].\n");
+         SetEvaluationError(theEnv,true);
+         return false;
+        }
+
+      if (InstanceData(theEnv)->MkInsMsgPass)
+        { DirectMessage(theEnv,slot->desc->overrideMessage,
+                       ins,NULL,slot_exp->nextArg->argList); }
+      else if (slot_exp->nextArg->argList)
+        {
+         if (EvaluateAndStoreInDataObject(theEnv,slot->desc->multiple,
+                               slot_exp->nextArg->argList,&temp,true))
+             PutSlotValue(theEnv,ins,slot,&temp,&junk,"function make-instance");
+        }
+      else
+        {
+         temp.begin = 0;
+         temp.range = 0;
+         temp.value = ProceduralPrimitiveData(theEnv)->NoParamValue;
+         PutSlotValue(theEnv,ins,slot,&temp,&junk,"function make-instance");
+        }
+
+      if (EvaluationData(theEnv)->EvaluationError)
+        return false;
+      slot->override = true;
+      slot_exp = slot_exp->nextArg->nextArg;
+     }
+   return true;
+  }
+
+/**********************************************************
+  NAME         : InsertSlotOverridesCV
+  DESCRIPTION  : Replaces value-expression for a slot
+  INPUTS       : 1) The instance address
+                 2) The address of the beginning of the
+                    list of slot-expressions
+  RETURNS      : True if all okay, false otherwise
+  SIDE EFFECTS : Old slot expression deallocated
+  NOTES        : Assumes symbols not yet installed
+                 EVALUATES the slot-name expression but
+                    simply copies the slot value-expression
+ **********************************************************/
+static bool InsertSlotOverridesCV(
+  Environment *theEnv,
+  Instance *ins,
+  CLIPSValue *overrides)
+  {
+   unsigned int i;
+   InstanceSlot *slot;
+   UDFValue temp, junk;
+
+   EvaluationData(theEnv)->EvaluationError = false;
+
+   for (i = 0; i < ins->cls->slotCount; i++)
+     {
+      if (overrides[i].value == VoidConstant(theEnv)) continue;
+      
+      slot = ins->slotAddresses[i];
+      CLIPSToUDFValue(&overrides[i],&temp);
+      PutSlotValue(theEnv,ins,slot,&temp,&junk,"InstanceBuilder call");
+      
+      if (EvaluationData(theEnv)->EvaluationError)
+        { return false; }
+        
+      slot->override = true;
+     }
+     
+   return true;
+  }
+
+/*****************************************************************************
+  NAME         : EvaluateClassDefaults
+  DESCRIPTION  : Evaluates default slots only - slots that were specified
+                 by overrides (sp->override == 1) are ignored)
+  INPUTS       : 1) Instance address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Each UDFValue slot in the instance's slot array is replaced
+                   by the evaluation (by EvaluateExpression) of the expression
+                   in the slot list.  The old expression-values
+                   are deleted.
+  NOTES        : None
+ *****************************************************************************/
+static void EvaluateClassDefaults(
+  Environment *theEnv,
+  Instance *ins)
+  {
+   InstanceSlot *slot;
+   UDFValue temp,junk;
+   unsigned long i;
+
+   if (ins->initializeInProgress == 0)
+     {
+      PrintErrorID(theEnv,"INSMNGR",15,false);
+      SetEvaluationError(theEnv,true);
+      WriteString(theEnv,STDERR,"init-slots not valid in this context.\n");
+      return;
+     }
+   for (i = 0 ; i < ins->cls->instanceSlotCount ; i++)
+     {
+      slot = ins->slotAddresses[i];
+
+      /* ===========================================================
+         Slot-overrides are just a short-hand for put-slots, so they
+         should be done with messages.  Defaults are from the class
+         definition and can be placed directly.
+         =========================================================== */
+      if (!slot->override)
+        {
+         if (slot->desc->dynamicDefault)
+           {
+            if (EvaluateAndStoreInDataObject(theEnv,slot->desc->multiple,
+                                             (Expression *) slot->desc->defaultValue,
+                                             &temp,true))
+              PutSlotValue(theEnv,ins,slot,&temp,&junk,"function init-slots");
+           }
+         else if (((slot->desc->shared == 0) || (slot->desc->sharedCount == 1)) &&
+                  (slot->desc->noDefault == 0))
+           DirectPutSlotValue(theEnv,ins,slot,(UDFValue *) slot->desc->defaultValue,&junk);
+         else if (slot->valueRequired)
+           {
+            PrintErrorID(theEnv,"INSMNGR",14,false);
+            WriteString(theEnv,STDERR,"Override required for slot '");
+            WriteString(theEnv,STDERR,slot->desc->slotName->name->contents);
+            WriteString(theEnv,STDERR,"' in instance [");
+            WriteString(theEnv,STDERR,ins->name->contents);
+            WriteString(theEnv,STDERR,"].\n");
+            SetEvaluationError(theEnv,true);
+           }
+         slot->valueRequired = false;
+         if (ins->garbage == 1)
+           {
+            WriteString(theEnv,STDERR,ins->name->contents);
+            WriteString(theEnv,STDERR," instance deleted by slot-override evaluation.\n");
+            SetEvaluationError(theEnv,true);
+           }
+         if (EvaluationData(theEnv)->EvaluationError)
+            return;
+        }
+      slot->override = false;
+     }
+   ins->initSlotsCalled = 1;
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/***************************************************
+  NAME         : PrintInstanceWatch
+  DESCRIPTION  : Prints out a trace message for the
+                 creation/deletion of an instance
+  INPUTS       : 1) The trace string indicating if
+                    this is a creation or deletion
+                 2) The instance
+  RETURNS      : Nothing usful
+  SIDE EFFECTS : Watch message printed
+  NOTES        : None
+ ***************************************************/
+static void PrintInstanceWatch(
+  Environment *theEnv,
+  const char *traceString,
+  Instance *theInstance)
+  {
+   if (ConstructData(theEnv)->ClearReadyInProgress ||
+       ConstructData(theEnv)->ClearInProgress)
+     { return; }
+
+   WriteString(theEnv,STDOUT,traceString);
+   WriteString(theEnv,STDOUT," instance ");
+   PrintInstanceNameAndClass(theEnv,STDOUT,theInstance,true);
+  }
+
+#endif
+
+/**************************/
+/* CreateInstanceBuilder: */
+/**************************/
+InstanceBuilder *CreateInstanceBuilder(
+  Environment *theEnv,
+  const char *defclassName)
+  {
+   InstanceBuilder *theIB;
+   Defclass *theDefclass;
+   unsigned int i;
+   
+   if (theEnv == NULL) return NULL;
+      
+   if (defclassName != NULL)
+     {
+      theDefclass = FindDefclass(theEnv,defclassName);
+      if (theDefclass == NULL)
+        {
+         InstanceData(theEnv)->instanceBuilderError = IBE_DEFCLASS_NOT_FOUND_ERROR;
+         return NULL;
+        }
+     }
+   else
+     { theDefclass = NULL; }
+     
+   theIB = get_struct(theEnv,instanceBuilder);
+   theIB->ibEnv = theEnv;
+   theIB->ibDefclass = theDefclass;
+      
+   if ((theDefclass == NULL) || (theDefclass->slotCount == 0))
+     { theIB->ibValueArray = NULL; }
+   else
+     {
+      theIB->ibValueArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * theDefclass->slotCount);
+      
+      for (i = 0; i < theDefclass->slotCount; i++)
+        { theIB->ibValueArray[i].voidValue = VoidConstant(theEnv); }
+     }
+
+   InstanceData(theEnv)->instanceBuilderError = IBE_NO_ERROR;
+
+   return theIB;
+  }
+
+/*************************/
+/* IBPutSlotCLIPSInteger */
+/*************************/
+PutSlotError IBPutSlotCLIPSInteger(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  CLIPSInteger *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.integerValue = slotValue;
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/********************/
+/* IBPutSlotInteger */
+/********************/
+PutSlotError IBPutSlotInteger(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  long long longLongValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theIB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.integerValue = CreateInteger(theIB->ibEnv,longLongValue);
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/************************/
+/* IBPutSlotCLIPSLexeme */
+/************************/
+PutSlotError IBPutSlotCLIPSLexeme(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  CLIPSLexeme *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.lexemeValue = slotValue;
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/*******************/
+/* IBPutSlotSymbol */
+/*******************/
+PutSlotError IBPutSlotSymbol(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theIB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.lexemeValue = CreateSymbol(theIB->ibEnv,stringValue);
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/*******************/
+/* IBPutSlotString */
+/*******************/
+PutSlotError IBPutSlotString(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theIB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.lexemeValue = CreateString(theIB->ibEnv,stringValue);
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/*************************/
+/* IBPutSlotInstanceName */
+/*************************/
+PutSlotError IBPutSlotInstanceName(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theIB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+   theValue.lexemeValue = CreateInstanceName(theIB->ibEnv,stringValue);
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/***********************/
+/* IBPutSlotCLIPSFloat */
+/***********************/
+PutSlotError IBPutSlotCLIPSFloat(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  CLIPSFloat *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.floatValue = slotValue;
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/******************/
+/* IBPutSlotFloat */
+/******************/
+PutSlotError IBPutSlotFloat(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  double doubleValue)
+  {
+   CLIPSValue theValue;
+   
+    if (theIB == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+
+  theValue.floatValue = CreateFloat(theIB->ibEnv,doubleValue);
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/*****************/
+/* IBPutSlotFact */
+/*****************/
+PutSlotError IBPutSlotFact(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  Fact *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.factValue = slotValue;
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/*********************/
+/* IBPutSlotInstance */
+/*********************/
+PutSlotError IBPutSlotInstance(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  Instance *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.instanceValue = slotValue;
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/****************************/
+/* IBPutSlotExternalAddress */
+/****************************/
+PutSlotError IBPutSlotExternalAddress(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  CLIPSExternalAddress *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.externalAddressValue = slotValue;
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/***********************/
+/* IBPutSlotMultifield */
+/***********************/
+PutSlotError IBPutSlotMultifield(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  Multifield *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.multifieldValue = slotValue;
+   return IBPutSlot(theIB,slotName,&theValue);
+  }
+
+/**************/
+/* IBPutSlot: */
+/**************/
+PutSlotError IBPutSlot(
+  InstanceBuilder *theIB,
+  const char *slotName,
+  CLIPSValue *slotValue)
+  {
+   Environment *theEnv;
+   int whichSlot;
+   CLIPSValue oldValue;
+   unsigned int i;
+   SlotDescriptor *theSlot;
+   ConstraintViolationType cvType;
+   
+   /*==========================*/
+   /* Check for NULL pointers. */
+   /*==========================*/
+   
+   if ((theIB == NULL) || (slotName == NULL) || (slotValue == NULL))
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   if ((theIB->ibDefclass == NULL) || (slotValue->value == NULL))
+     { return PSE_NULL_POINTER_ERROR; }
+   
+   theEnv = theIB->ibEnv;
+     
+   /*===================================*/
+   /* Make sure the slot name requested */
+   /* corresponds to a valid slot name. */
+   /*===================================*/
+
+   whichSlot = FindInstanceTemplateSlot(theEnv,theIB->ibDefclass,CreateSymbol(theIB->ibEnv,slotName));
+   if (whichSlot == -1)
+     { return PSE_SLOT_NOT_FOUND_ERROR; }
+   theSlot = theIB->ibDefclass->instanceTemplate[whichSlot];
+   
+   /*=============================================*/
+   /* Make sure a single field value is not being */
+   /* stored in a multifield slot or vice versa.  */
+   /*=============================================*/
+
+   if (((theSlot->multiple == 0) && (slotValue->header->type == MULTIFIELD_TYPE)) ||
+       ((theSlot->multiple == 1) && (slotValue->header->type != MULTIFIELD_TYPE)))
+     { return PSE_CARDINALITY_ERROR; }
+     
+   /*=================================*/
+   /* Check constraints for the slot. */
+   /*=================================*/
+
+   if (theSlot->constraint != NULL)
+     {
+      if ((cvType = ConstraintCheckValue(theEnv,slotValue->header->type,slotValue->value,theSlot->constraint)) != NO_VIOLATION)
+        {
+         switch(cvType)
+           {
+            case NO_VIOLATION:
+            case FUNCTION_RETURN_TYPE_VIOLATION:
+              SystemError(theEnv,"INSMNGR",1);
+              ExitRouter(theEnv,EXIT_FAILURE);
+              break;
+              
+            case TYPE_VIOLATION:
+              return PSE_TYPE_ERROR;
+              
+            case RANGE_VIOLATION:
+              return PSE_RANGE_ERROR;
+              
+            case ALLOWED_VALUES_VIOLATION:
+              return PSE_ALLOWED_VALUES_ERROR;
+              
+            case CARDINALITY_VIOLATION:
+              return PSE_CARDINALITY_ERROR;
+            
+            case ALLOWED_CLASSES_VIOLATION:
+              return PSE_ALLOWED_CLASSES_ERROR;
+           }
+        }
+     }
+
+   /*===================================*/
+   /* Create the value array if needed. */
+   /*===================================*/
+     
+   if (theIB->ibValueArray == NULL)
+     {
+      theIB->ibValueArray = (CLIPSValue *) gm2(theIB->ibEnv,sizeof(CLIPSValue) * theIB->ibDefclass->slotCount);
+      for (i = 0; i < theIB->ibDefclass->slotCount; i++)
+        { theIB->ibValueArray[i].voidValue = theIB->ibEnv->VoidConstant; }
+     }
+
+   /*=====================*/
+   /* Set the slot value. */
+   /*=====================*/
+   
+   oldValue.value = theIB->ibValueArray[whichSlot].value;
+   
+   if (oldValue.header->type == MULTIFIELD_TYPE)
+     {
+      if (MultifieldsEqual(oldValue.multifieldValue,slotValue->multifieldValue))
+        { return PSE_NO_ERROR; }
+     }
+   else
+     {
+      if (oldValue.value == slotValue->value)
+        { return PSE_NO_ERROR; }
+     }
+   
+   Release(theEnv,oldValue.header);
+   
+   if (oldValue.header->type == MULTIFIELD_TYPE)
+     { ReturnMultifield(theEnv,oldValue.multifieldValue); }
+
+   if (slotValue->header->type == MULTIFIELD_TYPE)
+     { theIB->ibValueArray[whichSlot].multifieldValue = CopyMultifield(theEnv,slotValue->multifieldValue); }
+   else
+     { theIB->ibValueArray[whichSlot].value = slotValue->value; }
+      
+   Retain(theEnv,theIB->ibValueArray[whichSlot].header);
+   
+   return PSE_NO_ERROR;
+  }
+
+/***********/
+/* IBMake: */
+/***********/
+Instance *IBMake(
+  InstanceBuilder *theIB,
+  const char *instanceName)
+  {
+   Environment *theEnv;
+   Instance *theInstance;
+   CLIPSLexeme *instanceLexeme;
+   UDFValue rv;
+   unsigned int i;
+   bool ov;
+   
+   if (theIB == NULL) return NULL;
+   theEnv = theIB->ibEnv;
+   
+   if (theIB->ibDefclass == NULL)
+     {
+      InstanceData(theEnv)->instanceBuilderError = IBE_NULL_POINTER_ERROR;
+      return NULL;
+     }
+     
+   if (instanceName == NULL)
+     {
+      GensymStar(theEnv,&rv);
+      instanceLexeme = CreateInstanceName(theEnv,rv.lexemeValue->contents);
+     }
+   else
+     { instanceLexeme = CreateInstanceName(theEnv,instanceName); }
+   
+#if DEFRULE_CONSTRUCT
+   ov = SetDelayObjectPatternMatching(theEnv,true);
+#endif
+
+   theInstance = BuildInstance(theEnv,instanceLexeme,theIB->ibDefclass,true);
+   
+   if (theInstance == NULL)
+     {
+      if (InstanceData(theEnv)->makeInstanceError == MIE_COULD_NOT_CREATE_ERROR)
+        { InstanceData(theEnv)->instanceBuilderError = IBE_COULD_NOT_CREATE_ERROR; }
+      else if (InstanceData(theEnv)->makeInstanceError == MIE_RULE_NETWORK_ERROR)
+        { InstanceData(theEnv)->instanceBuilderError = IBE_RULE_NETWORK_ERROR; }
+      else
+        {
+         SystemError(theEnv,"INSMNGR",3);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+        
+#if DEFRULE_CONSTRUCT
+      SetDelayObjectPatternMatching(theEnv,ov);
+#endif
+
+      return NULL;
+     }
+   
+   if (CoreInitializeInstanceCV(theIB->ibEnv,theInstance,theIB->ibValueArray) == false)
+     {
+      InstanceData(theEnv)->instanceBuilderError = IBE_COULD_NOT_CREATE_ERROR;
+      QuashInstance(theIB->ibEnv,theInstance);
+#if DEFRULE_CONSTRUCT
+      SetDelayObjectPatternMatching(theEnv,ov);
+#endif
+      return NULL;
+     }
+   
+#if DEFRULE_CONSTRUCT
+   SetDelayObjectPatternMatching(theEnv,ov);
+#endif
+
+   for (i = 0; i < theIB->ibDefclass->slotCount; i++)
+     {
+      if (theIB->ibValueArray[i].voidValue != VoidConstant(theEnv))
+        {
+         Release(theEnv,theIB->ibValueArray[i].header);
+
+         if (theIB->ibValueArray[i].header->type == MULTIFIELD_TYPE)
+           { ReturnMultifield(theEnv,theIB->ibValueArray[i].multifieldValue); }
+
+         theIB->ibValueArray[i].voidValue = VoidConstant(theEnv);
+        }
+     }
+     
+   InstanceData(theEnv)->instanceBuilderError = IBE_NO_ERROR;
+   
+   return theInstance;
+  }
+
+/**************/
+/* IBDispose: */
+/**************/
+void IBDispose(
+  InstanceBuilder *theIB)
+  {
+   Environment *theEnv;
+   
+   if (theIB == NULL) return;
+
+   theEnv = theIB->ibEnv;
+   
+   IBAbort(theIB);
+   
+   if (theIB->ibValueArray != NULL)
+     { rm(theEnv,theIB->ibValueArray,sizeof(CLIPSValue) * theIB->ibDefclass->slotCount); }
+   
+   rtn_struct(theEnv,instanceBuilder,theIB);
+  }
+
+/************/
+/* IBAbort: */
+/************/
+void IBAbort(
+  InstanceBuilder *theIB)
+  {
+   Environment *theEnv = theIB->ibEnv;
+   unsigned int i;
+   
+   if (theIB == NULL) return;
+   
+   if (theIB->ibDefclass == NULL) return;
+   
+   theEnv = theIB->ibEnv;
+
+   for (i = 0; i < theIB->ibDefclass->slotCount; i++)
+     {
+      Release(theEnv,theIB->ibValueArray[i].header);
+      
+      if (theIB->ibValueArray[i].header->type == MULTIFIELD_TYPE)
+        { ReturnMultifield(theEnv,theIB->ibValueArray[i].multifieldValue); }
+        
+      theIB->ibValueArray[i].voidValue = VoidConstant(theEnv);
+     }
+  }
+  
+/*****************/
+/* IBSetDefclass */
+/*****************/
+InstanceBuilderError IBSetDefclass(
+  InstanceBuilder *theIB,
+  const char *defclassName)
+  {
+   Defclass *theDefclass;
+   Environment *theEnv;
+   unsigned int i;
+   
+   if (theIB == NULL)
+     { return IBE_NULL_POINTER_ERROR; }
+      
+   theEnv = theIB->ibEnv;
+
+   IBAbort(theIB);
+   
+   if (defclassName != NULL)
+     {
+      theDefclass = FindDefclass(theIB->ibEnv,defclassName);
+   
+      if (theDefclass == NULL)
+        {
+         InstanceData(theEnv)->instanceBuilderError = IBE_DEFCLASS_NOT_FOUND_ERROR;
+         return IBE_DEFCLASS_NOT_FOUND_ERROR;
+        }
+     }
+   else
+     { theDefclass = NULL; }
+
+   if (theIB->ibValueArray != NULL)
+     { rm(theEnv,theIB->ibValueArray,sizeof(CLIPSValue) * theIB->ibDefclass->slotCount); }
+
+   theIB->ibDefclass = theDefclass;
+   
+   if ((theDefclass == NULL) || (theDefclass->slotCount == 0))
+     { theIB->ibValueArray = NULL; }
+   else
+     {
+      theIB->ibValueArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * theDefclass->slotCount);
+
+      for (i = 0; i < theDefclass->slotCount; i++)
+        { theIB->ibValueArray[i].voidValue = VoidConstant(theEnv); }
+     }
+
+   InstanceData(theEnv)->instanceBuilderError = IBE_NO_ERROR;
+   return IBE_NO_ERROR;
+  }
+
+/************/
+/* IBError: */
+/************/
+InstanceBuilderError IBError(
+  Environment *theEnv)
+  {
+   return InstanceData(theEnv)->instanceBuilderError;
+  }
+
+/***************************/
+/* CreateInstanceModifier: */
+/***************************/
+InstanceModifier *CreateInstanceModifier(
+  Environment *theEnv,
+  Instance *oldInstance)
+  {
+   InstanceModifier *theIM;
+   unsigned int i;
+   
+   if (theEnv == NULL) return NULL;
+   
+   if (oldInstance != NULL)
+     {
+      if (oldInstance->garbage)
+        {
+         InstanceData(theEnv)->instanceModifierError = IME_DELETED_ERROR;
+         return NULL;
+        }
+        
+      RetainInstance(oldInstance);
+     }
+
+   theIM = get_struct(theEnv,instanceModifier);
+   theIM->imEnv = theEnv;
+   theIM->imOldInstance = oldInstance;
+
+   if ((oldInstance == NULL) || (oldInstance->cls->slotCount == 0))
+     {
+      theIM->imValueArray = NULL;
+      theIM->changeMap = NULL;
+     }
+   else
+     {
+      theIM->imValueArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * oldInstance->cls->slotCount);
+      
+      for (i = 0; i < oldInstance->cls->slotCount; i++)
+        { theIM->imValueArray[i].voidValue = VoidConstant(theEnv); }
+
+      theIM->changeMap = (char *) gm2(theEnv,CountToBitMapSize(oldInstance->cls->slotCount));
+      ClearBitString((void *) theIM->changeMap,CountToBitMapSize(oldInstance->cls->slotCount));
+     }
+
+   InstanceData(theEnv)->instanceModifierError = IME_NO_ERROR;
+   return theIM;
+  }
+
+/*************************/
+/* IMPutSlotCLIPSInteger */
+/*************************/
+PutSlotError IMPutSlotCLIPSInteger(
+  InstanceModifier *theFM,
+  const char *slotName,
+  CLIPSInteger *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.integerValue = slotValue;
+   return IMPutSlot(theFM,slotName,&theValue);
+  }
+
+/********************/
+/* IMPutSlotInteger */
+/********************/
+PutSlotError IMPutSlotInteger(
+  InstanceModifier *theIM,
+  const char *slotName,
+  long long longLongValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theIM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   theValue.integerValue = CreateInteger(theIM->imEnv,longLongValue);
+   return IMPutSlot(theIM,slotName,&theValue);
+  }
+
+/************************/
+/* IMPutSlotCLIPSLexeme */
+/************************/
+PutSlotError IMPutSlotCLIPSLexeme(
+  InstanceModifier *theFM,
+  const char *slotName,
+  CLIPSLexeme *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.lexemeValue = slotValue;
+   return IMPutSlot(theFM,slotName,&theValue);
+  }
+
+/*******************/
+/* IMPutSlotSymbol */
+/*******************/
+PutSlotError IMPutSlotSymbol(
+  InstanceModifier *theIM,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theIM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   theValue.lexemeValue = CreateSymbol(theIM->imEnv,stringValue);
+   return IMPutSlot(theIM,slotName,&theValue);
+  }
+
+/*******************/
+/* IMPutSlotString */
+/*******************/
+PutSlotError IMPutSlotString(
+  InstanceModifier *theIM,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theIM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   theValue.lexemeValue = CreateString(theIM->imEnv,stringValue);
+   return IMPutSlot(theIM,slotName,&theValue);
+  }
+
+/*************************/
+/* IMPutSlotInstanceName */
+/*************************/
+PutSlotError IMPutSlotInstanceName(
+  InstanceModifier *theIM,
+  const char *slotName,
+  const char *stringValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theIM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   theValue.lexemeValue = CreateInstanceName(theIM->imEnv,stringValue);
+   return IMPutSlot(theIM,slotName,&theValue);
+  }
+
+/***********************/
+/* IMPutSlotCLIPSFloat */
+/***********************/
+PutSlotError IMPutSlotCLIPSFloat(
+  InstanceModifier *theFM,
+  const char *slotName,
+  CLIPSFloat *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.floatValue = slotValue;
+   return IMPutSlot(theFM,slotName,&theValue);
+  }
+
+/******************/
+/* IMPutSlotFloat */
+/******************/
+PutSlotError IMPutSlotFloat(
+  InstanceModifier *theIM,
+  const char *slotName,
+  double doubleValue)
+  {
+   CLIPSValue theValue;
+   
+   if (theIM == NULL)
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   theValue.floatValue = CreateFloat(theIM->imEnv,doubleValue);
+   return IMPutSlot(theIM,slotName,&theValue);
+  }
+
+/*****************/
+/* IMPutSlotFact */
+/*****************/
+PutSlotError IMPutSlotFact(
+  InstanceModifier *theFM,
+  const char *slotName,
+  Fact *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.factValue = slotValue;
+   return IMPutSlot(theFM,slotName,&theValue);
+  }
+
+/*********************/
+/* IMPutSlotInstance */
+/*********************/
+PutSlotError IMPutSlotInstance(
+  InstanceModifier *theFM,
+  const char *slotName,
+  Instance *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.instanceValue = slotValue;
+   return IMPutSlot(theFM,slotName,&theValue);
+  }
+
+/****************************/
+/* IMPutSlotExternalAddress */
+/****************************/
+PutSlotError IMPutSlotExternalAddress(
+  InstanceModifier *theFM,
+  const char *slotName,
+  CLIPSExternalAddress *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.externalAddressValue = slotValue;
+   return IMPutSlot(theFM,slotName,&theValue);
+  }
+
+/***********************/
+/* IMPutSlotMultifield */
+/***********************/
+PutSlotError IMPutSlotMultifield(
+  InstanceModifier *theFM,
+  const char *slotName,
+  Multifield *slotValue)
+  {
+   CLIPSValue theValue;
+   
+   theValue.multifieldValue = slotValue;
+   return IMPutSlot(theFM,slotName,&theValue);
+  }
+
+/**************/
+/* IMPutSlot: */
+/**************/
+PutSlotError IMPutSlot(
+  InstanceModifier *theIM,
+  const char *slotName,
+  CLIPSValue *slotValue)
+  {
+   Environment *theEnv;
+   int whichSlot;
+   CLIPSValue oldValue;
+   CLIPSValue oldInstanceValue;
+   unsigned int i;
+   SlotDescriptor *theSlot;
+   ConstraintViolationType cvType;
+   
+   /*==========================*/
+   /* Check for NULL pointers. */
+   /*==========================*/
+
+   if ((theIM == NULL) || (slotName == NULL) || (slotValue == NULL))
+     { return PSE_NULL_POINTER_ERROR; }
+     
+   if ((theIM->imOldInstance == NULL) || (slotValue->value == NULL))
+     { return PSE_NULL_POINTER_ERROR; }
+   
+   theEnv = theIM->imEnv;
+
+   /*======================================*/
+   /* Deleted instances can't be modified. */
+   /*======================================*/
+   
+   if (theIM->imOldInstance->garbage)
+     { return PSE_INVALID_TARGET_ERROR; }
+
+   /*===================================*/
+   /* Make sure the slot name requested */
+   /* corresponds to a valid slot name. */
+   /*===================================*/
+
+   whichSlot = FindInstanceTemplateSlot(theEnv,theIM->imOldInstance->cls,CreateSymbol(theIM->imEnv,slotName));
+   if (whichSlot == -1)
+     { return PSE_SLOT_NOT_FOUND_ERROR; }
+   theSlot = theIM->imOldInstance->cls->instanceTemplate[whichSlot];
+
+   /*=============================================*/
+   /* Make sure a single field value is not being */
+   /* stored in a multifield slot or vice versa.  */
+   /*=============================================*/
+
+   if (((theSlot->multiple == 0) && (slotValue->header->type == MULTIFIELD_TYPE)) ||
+       ((theSlot->multiple == 1) && (slotValue->header->type != MULTIFIELD_TYPE)))
+     { return PSE_CARDINALITY_ERROR; }
+     
+   /*=================================*/
+   /* Check constraints for the slot. */
+   /*=================================*/
+
+   if (theSlot->constraint != NULL)
+     {
+      if ((cvType = ConstraintCheckValue(theEnv,slotValue->header->type,slotValue->value,theSlot->constraint)) != NO_VIOLATION)
+        {
+         switch(cvType)
+           {
+            case NO_VIOLATION:
+            case FUNCTION_RETURN_TYPE_VIOLATION:
+              SystemError(theEnv,"INSMNGR",2);
+              ExitRouter(theEnv,EXIT_FAILURE);
+              break;
+              
+            case TYPE_VIOLATION:
+              return PSE_TYPE_ERROR;
+              
+            case RANGE_VIOLATION:
+              return PSE_RANGE_ERROR;
+              
+            case ALLOWED_VALUES_VIOLATION:
+              return PSE_ALLOWED_VALUES_ERROR;
+              
+            case CARDINALITY_VIOLATION:
+              return PSE_CARDINALITY_ERROR;
+            
+            case ALLOWED_CLASSES_VIOLATION:
+              return PSE_ALLOWED_CLASSES_ERROR;
+           }
+        }
+     }
+
+   /*===========================*/
+   /* Set up the change arrays. */
+   /*===========================*/
+
+   if (theIM->imValueArray == NULL)
+     {
+      theIM->imValueArray = (CLIPSValue *) gm2(theIM->imEnv,sizeof(CLIPSValue) * theIM->imOldInstance->cls->slotCount);
+      for (i = 0; i < theIM->imOldInstance->cls->slotCount; i++)
+        { theIM->imValueArray[i].voidValue = theIM->imEnv->VoidConstant; }
+     }
+
+   if (theIM->changeMap == NULL)
+     {
+      theIM->changeMap = (char *) gm2(theIM->imEnv,CountToBitMapSize(theIM->imOldInstance->cls->slotCount));
+      ClearBitString((void *) theIM->changeMap,CountToBitMapSize(theIM->imOldInstance->cls->slotCount));
+     }
+     
+   /*=====================*/
+   /* Set the slot value. */
+   /*=====================*/
+
+   oldValue.value = theIM->imValueArray[whichSlot].value;
+   oldInstanceValue.value = theIM->imOldInstance->slotAddresses[whichSlot]->value;
+
+   if (oldInstanceValue.header->type == MULTIFIELD_TYPE)
+     {
+      if (MultifieldsEqual(oldInstanceValue.multifieldValue,slotValue->multifieldValue))
+        {
+         Release(theIM->imEnv,oldValue.header);
+         if (oldValue.header->type == MULTIFIELD_TYPE)
+           { ReturnMultifield(theIM->imEnv,oldValue.multifieldValue); }
+         theIM->imValueArray[whichSlot].voidValue = theIM->imEnv->VoidConstant;
+         ClearBitMap(theIM->changeMap,whichSlot);
+         return PSE_NO_ERROR;
+        }
+
+      if (MultifieldsEqual(oldValue.multifieldValue,slotValue->multifieldValue))
+        { return PSE_NO_ERROR; }
+     }
+   else
+     {
+      if (slotValue->value == oldInstanceValue.value)
+        {
+         Release(theIM->imEnv,oldValue.header);
+         theIM->imValueArray[whichSlot].voidValue = theIM->imEnv->VoidConstant;
+         ClearBitMap(theIM->changeMap,whichSlot);
+         return PSE_NO_ERROR;
+        }
+        
+      if (oldValue.value == slotValue->value)
+        { return PSE_NO_ERROR; }
+     }
+
+   SetBitMap(theIM->changeMap,whichSlot);
+
+   Release(theIM->imEnv,oldValue.header);
+
+   if (oldValue.header->type == MULTIFIELD_TYPE)
+     { ReturnMultifield(theIM->imEnv,oldValue.multifieldValue); }
+      
+   if (slotValue->header->type == MULTIFIELD_TYPE)
+     { theIM->imValueArray[whichSlot].multifieldValue = CopyMultifield(theIM->imEnv,slotValue->multifieldValue); }
+   else
+     { theIM->imValueArray[whichSlot].value = slotValue->value; }
+
+   Retain(theIM->imEnv,theIM->imValueArray[whichSlot].header);
+
+   return PSE_NO_ERROR;
+  }
+
+/*************/
+/* IMModify: */
+/*************/
+Instance *IMModify(
+  InstanceModifier *theIM)
+  {
+   Environment *theEnv;
+#if DEFRULE_CONSTRUCT
+   bool ov;
+#endif
+
+   if (theIM == NULL)
+     { return NULL; }
+     
+   theEnv = theIM->imEnv;
+   
+   if (theIM->imOldInstance == NULL)
+     {
+      InstanceData(theEnv)->instanceModifierError = IME_NULL_POINTER_ERROR;
+      return NULL;
+     }
+
+   if (theIM->imOldInstance->garbage)
+     {
+      InstanceData(theEnv)->instanceModifierError = IME_DELETED_ERROR;
+      return NULL;
+     }
+
+   if (theIM->changeMap == NULL)
+     { return theIM->imOldInstance; }
+     
+   if (! BitStringHasBitsSet(theIM->changeMap,CountToBitMapSize(theIM->imOldInstance->cls->slotCount)))
+     { return theIM->imOldInstance; }
+
+#if DEFRULE_CONSTRUCT
+   ov = SetDelayObjectPatternMatching(theIM->imEnv,true);
+#endif
+
+   IMModifySlots(theIM->imEnv,theIM->imOldInstance,theIM->imValueArray);
+
+   if ((InstanceData(theEnv)->makeInstanceError == MIE_RULE_NETWORK_ERROR) ||
+       (InstanceData(theEnv)->unmakeInstanceError == UIE_RULE_NETWORK_ERROR))
+     { InstanceData(theEnv)->instanceModifierError = IME_RULE_NETWORK_ERROR; }
+   else if ((InstanceData(theEnv)->unmakeInstanceError == UIE_COULD_NOT_DELETE_ERROR) ||
+            (InstanceData(theEnv)->makeInstanceError == MIE_COULD_NOT_CREATE_ERROR))
+     { InstanceData(theEnv)->instanceModifierError = IME_COULD_NOT_MODIFY_ERROR; }
+   else
+     { InstanceData(theEnv)->instanceModifierError = IME_NO_ERROR; }
+
+#if DEFRULE_CONSTRUCT
+   SetDelayObjectPatternMatching(theIM->imEnv,ov);
+#endif
+
+   IMAbort(theIM);
+   
+   return theIM->imOldInstance;
+  }
+
+/*****************/
+/* IMModifySlots */
+/*****************/
+static bool IMModifySlots(
+  Environment *theEnv,
+  Instance *theInstance,
+  CLIPSValue *overrides)
+  {
+   UDFValue temp, junk;
+   InstanceSlot *insSlot;
+   unsigned int i;
+
+   for (i = 0; i < theInstance->cls->slotCount; i++)
+     {
+      if (overrides[i].value == VoidConstant(theEnv))
+        { continue; }
+        
+      insSlot = theInstance->slotAddresses[i];
+      
+      if (insSlot->desc->multiple && (overrides[i].header->type != MULTIFIELD_TYPE))
+        {
+         temp.value = CreateMultifield(theEnv,1L);
+         temp.begin = 0;
+         temp.range = 1;
+         temp.multifieldValue->contents[0].value = overrides[i].value;
+        }
+      else
+        { CLIPSToUDFValue(&overrides[i],&temp); }
+        
+      if (PutSlotValue(theEnv,theInstance,insSlot,&temp,&junk,"InstanceModifier call") != PSE_NO_ERROR)
+        { return false; }
+     }
+     
+   return true;
+  }
+
+/**************/
+/* IMDispose: */
+/**************/
+void IMDispose(
+  InstanceModifier *theIM)
+  {
+   Environment *theEnv = theIM->imEnv;
+   unsigned int i;
+
+   /*========================*/
+   /* Clear the value array. */
+   /*========================*/
+   
+   if (theIM->imOldInstance != NULL)
+     {
+      for (i = 0; i < theIM->imOldInstance->cls->slotCount; i++)
+        {
+         Release(theEnv,theIM->imValueArray[i].header);
+
+         if (theIM->imValueArray[i].header->type == MULTIFIELD_TYPE)
+           { ReturnMultifield(theEnv,theIM->imValueArray[i].multifieldValue); }
+        }
+     }
+
+   /*=====================================*/
+   /* Return the value and change arrays. */
+   /*=====================================*/
+   
+   if (theIM->imValueArray != NULL)
+     { rm(theEnv,theIM->imValueArray,sizeof(CLIPSValue) * theIM->imOldInstance->cls->slotCount); }
+      
+   if (theIM->changeMap != NULL)
+     { rm(theEnv,(void *) theIM->changeMap,CountToBitMapSize(theIM->imOldInstance->cls->slotCount)); }
+
+   /*========================================*/
+   /* Return the InstanceModifier structure. */
+   /*========================================*/
+   
+   ReleaseInstance(theIM->imOldInstance);
+   
+   rtn_struct(theEnv,instanceModifier,theIM);
+  }
+
+/************/
+/* IMAbort: */
+/************/
+void IMAbort(
+  InstanceModifier *theIM)
+  {
+   GCBlock gcb;
+   Environment *theEnv;
+   unsigned int i;
+   
+   if (theIM == NULL) return;
+   
+   if (theIM->imOldInstance == NULL) return;
+   
+   theEnv = theIM->imEnv;
+   
+   GCBlockStart(theEnv,&gcb);
+
+   for (i = 0; i < theIM->imOldInstance->cls->slotCount; i++)
+     {
+      Release(theEnv,theIM->imValueArray[i].header);
+
+      if (theIM->imValueArray[i].header->type == MULTIFIELD_TYPE)
+        { ReturnMultifield(theEnv,theIM->imValueArray[i].multifieldValue); }
+        
+      theIM->imValueArray[i].voidValue = theIM->imEnv->VoidConstant;
+     }
+        
+   if (theIM->changeMap != NULL)
+     { ClearBitString((void *) theIM->changeMap,CountToBitMapSize(theIM->imOldInstance->cls->slotCount)); }
+     
+   GCBlockEnd(theEnv,&gcb);
+  }
+
+/******************/
+/* IMSetInstance: */
+/******************/
+InstanceModifierError IMSetInstance(
+  InstanceModifier *theIM,
+  Instance *oldInstance)
+  {
+   Environment *theEnv;
+   unsigned int currentSlotCount, newSlotCount;
+   unsigned int i;
+      
+   if (theIM == NULL)
+     { return IME_NULL_POINTER_ERROR; }
+     
+   theEnv = theIM->imEnv;
+
+   /*=============================================*/
+   /* Modifiers can only be created for instances */
+   /* that have not been deleted.                 */
+   /*=============================================*/
+   
+   if (oldInstance != NULL)
+     {
+      if (oldInstance->garbage)
+        {
+         InstanceData(theEnv)->instanceModifierError = IME_DELETED_ERROR;
+         return IME_DELETED_ERROR;
+        }
+     }
+
+   /*========================*/
+   /* Clear the value array. */
+   /*========================*/
+   
+   if (theIM->imValueArray != NULL)
+     {
+      for (i = 0; i < theIM->imOldInstance->cls->slotCount; i++)
+        {
+         Release(theEnv,theIM->imValueArray[i].header);
+
+         if (theIM->imValueArray[i].header->type == MULTIFIELD_TYPE)
+           { ReturnMultifield(theEnv,theIM->imValueArray[i].multifieldValue); }
+        }
+     }
+
+   /*==================================================*/
+   /* Resize the value and change arrays if necessary. */
+   /*==================================================*/
+   
+   if (theIM->imOldInstance == NULL)
+     { currentSlotCount = 0; }
+   else
+     { currentSlotCount = theIM->imOldInstance->cls->slotCount; }
+
+   if (oldInstance == NULL)
+     { newSlotCount = 0; }
+   else
+     { newSlotCount = oldInstance->cls->slotCount; }
+
+   if (newSlotCount != currentSlotCount)
+     {
+      if (theIM->imValueArray != NULL)
+        { rm(theEnv,theIM->imValueArray,sizeof(CLIPSValue) * currentSlotCount); }
+      
+      if (theIM->changeMap != NULL)
+        { rm(theEnv,(void *) theIM->changeMap,currentSlotCount); }
+      
+      if (oldInstance->cls->slotCount == 0)
+        {
+         theIM->imValueArray = NULL;
+         theIM->changeMap = NULL;
+        }
+      else
+        {
+         theIM->imValueArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * newSlotCount);
+         theIM->changeMap = (char *) gm2(theEnv,CountToBitMapSize(newSlotCount));
+        }
+     }
+   
+   /*=================================*/
+   /* Update the fact being modified. */
+   /*=================================*/
+   
+   RetainInstance(oldInstance);
+   ReleaseInstance(theIM->imOldInstance);
+   theIM->imOldInstance = oldInstance;
+   
+   /*=========================================*/
+   /* Initialize the value and change arrays. */
+   /*=========================================*/
+   
+   for (i = 0; i < theIM->imOldInstance->cls->slotCount; i++)
+     { theIM->imValueArray[i].voidValue = theIM->imEnv->VoidConstant; }
+   
+   if (newSlotCount != 0)
+     { ClearBitString((void *) theIM->changeMap,CountToBitMapSize(theIM->imOldInstance->cls->slotCount)); }
+
+   /*================================================================*/
+   /* Return true to indicate the modifier was successfully created. */
+   /*================================================================*/
+   
+   InstanceData(theEnv)->instanceModifierError = IME_NO_ERROR;
+   return IME_NO_ERROR;
+  }
+
+/************/
+/* IMError: */
+/************/
+InstanceModifierError IMError(
+  Environment *theEnv)
+  {
+   return InstanceData(theEnv)->instanceModifierError;
+  }
+
+#endif
+
+
+
diff --git a/clips/insmngr.h b/clips/insmngr.h
new file mode 100755
index 000000000..97942aaee
--- /dev/null
+++ b/clips/insmngr.h
@@ -0,0 +1,125 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/13/17            */
+   /*                                                     */
+   /*          INSTANCE PRIMITIVE SUPPORT MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_insmngr
+
+#pragma once
+
+#define _H_insmngr
+
+#include "object.h"
+#include "inscom.h"
+
+   void                           InitializeInstanceCommand(Environment *,UDFContext *,UDFValue *);
+   void                           MakeInstanceCommand(Environment *,UDFContext *,UDFValue *);
+   CLIPSLexeme                   *GetFullInstanceName(Environment *,Instance *);
+   Instance                      *BuildInstance(Environment *,CLIPSLexeme *,Defclass *,bool);
+   void                           InitSlotsCommand(Environment *,UDFContext *,UDFValue *);
+   UnmakeInstanceError            QuashInstance(Environment *,Instance *);
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+   void                           InactiveInitializeInstance(Environment *,UDFContext *,UDFValue *);
+   void                           InactiveMakeInstance(Environment *,UDFContext *,UDFValue *);
+#endif
+
+   InstanceBuilder               *CreateInstanceBuilder(Environment *,const char *);
+   PutSlotError                   IBPutSlot(InstanceBuilder *,const char *,CLIPSValue *);
+
+   Instance                      *IBMake(InstanceBuilder *,const char *);
+
+   void                           IBDispose(InstanceBuilder *);
+   void                           IBAbort(InstanceBuilder *);
+   InstanceBuilderError           IBSetDefclass(InstanceBuilder *,const char *);
+
+   PutSlotError                   IBPutSlotCLIPSInteger(InstanceBuilder *,const char *,CLIPSInteger *);
+   PutSlotError                   IBPutSlotInteger(InstanceBuilder *,const char *,long long);
+
+   PutSlotError                   IBPutSlotCLIPSFloat(InstanceBuilder *,const char *,CLIPSFloat *);
+   PutSlotError                   IBPutSlotFloat(InstanceBuilder *,const char *,double);
+
+   PutSlotError                   IBPutSlotCLIPSLexeme(InstanceBuilder *,const char *,CLIPSLexeme *);
+   PutSlotError                   IBPutSlotSymbol(InstanceBuilder *,const char *,const char *);
+   PutSlotError                   IBPutSlotString(InstanceBuilder *,const char *,const char *);
+   PutSlotError                   IBPutSlotInstanceName(InstanceBuilder *,const char *,const char *);
+
+   PutSlotError                   IBPutSlotFact(InstanceBuilder *,const char *,Fact *);
+   PutSlotError                   IBPutSlotInstance(InstanceBuilder *,const char *,Instance *);
+   PutSlotError                   IBPutSlotExternalAddress(InstanceBuilder *,const char *,CLIPSExternalAddress *);
+   PutSlotError                   IBPutSlotMultifield(InstanceBuilder *,const char *,Multifield *);
+   InstanceBuilderError           IBError(Environment *);
+
+   InstanceModifier              *CreateInstanceModifier(Environment *,Instance *);
+   PutSlotError                   IMPutSlot(InstanceModifier *,const char *,CLIPSValue *);
+   void                           IMDispose(InstanceModifier *);
+   void                           IMAbort(InstanceModifier *);
+   InstanceModifierError          IMSetInstance(InstanceModifier *,Instance *);
+   Instance                      *IMModify(InstanceModifier *);
+
+   PutSlotError                   IMPutSlotCLIPSInteger(InstanceModifier *,const char *,CLIPSInteger *);
+   PutSlotError                   IMPutSlotInteger(InstanceModifier *,const char *,long long);
+
+   PutSlotError                   IMPutSlotCLIPSFloat(InstanceModifier *,const char *,CLIPSFloat *);
+   PutSlotError                   IMPutSlotFloat(InstanceModifier *,const char *,double);
+
+   PutSlotError                   IMPutSlotCLIPSLexeme(InstanceModifier *,const char *,CLIPSLexeme *);
+   PutSlotError                   IMPutSlotSymbol(InstanceModifier *,const char *,const char *);
+   PutSlotError                   IMPutSlotString(InstanceModifier *,const char *,const char *);
+   PutSlotError                   IMPutSlotInstanceName(InstanceModifier *,const char *,const char *);
+
+   PutSlotError                   IMPutSlotFact(InstanceModifier *,const char *,Fact *);
+   PutSlotError                   IMPutSlotInstance(InstanceModifier *,const char *,Instance *);
+   PutSlotError                   IMPutSlotExternalAddress(InstanceModifier *,const char *,CLIPSExternalAddress *);
+   PutSlotError                   IMPutSlotMultifield(InstanceModifier *,const char *,Multifield *);
+   InstanceModifierError          IMError(Environment *);
+
+#endif /* _H_insmngr */
+
+
+
+
+
+
+
diff --git a/clips/insmoddp.c b/clips/insmoddp.c
new file mode 100755
index 000000000..da27a2a01
--- /dev/null
+++ b/clips/insmoddp.c
@@ -0,0 +1,1041 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  06/22/18             */
+   /*                                                     */
+   /*        INSTANCE MODIFY AND DUPLICATE MODULE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  Instance modify and duplicate support routines  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*      6.30: Added DATA_OBJECT_ARRAY primitive type.        */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            The return value of DirectMessage indicates    */
+/*            whether an execution error has occurred.       */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed DATA_OBJECT_ARRAY primitive type.      */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "inscom.h"
+#include "insfun.h"
+#include "insmngr.h"
+#include "inspsr.h"
+#include "memalloc.h"
+#include "miscfun.h"
+#include "msgcom.h"
+#include "msgfun.h"
+#include "msgpass.h"
+#if DEFRULE_CONSTRUCT
+#include "network.h"
+#include "objrtmch.h"
+#endif
+#include "prccode.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "insmoddp.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static UDFValue               *EvaluateSlotOverrides(Environment *,Expression *,unsigned short *,bool *);
+   static void                    DeleteSlotOverrideEvaluations(Environment *,UDFValue *,unsigned short);
+   static void                    ModifyMsgHandlerSupport(Environment *,UDFValue *,bool);
+   static void                    DuplicateMsgHandlerSupport(Environment *,UDFValue *,bool);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupInstanceModDupCommands
+  DESCRIPTION  : Defines function interfaces for
+                 modify- and duplicate- instance
+                 functions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Functions defined to KB
+  NOTES        : None
+ ***************************************************/
+void SetupInstanceModDupCommands(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+
+#if DEFRULE_CONSTRUCT
+   AddUDF(theEnv,"modify-instance","*",0,UNBOUNDED,NULL,InactiveModifyInstance,"InactiveModifyInstance",NULL);
+   AddUDF(theEnv,"active-modify-instance","*",0,UNBOUNDED,NULL,ModifyInstance,"ModifyInstance",NULL);
+   AddFunctionParser(theEnv,"active-modify-instance",ParseInitializeInstance);
+   AddUDF(theEnv,"message-modify-instance","*",0,UNBOUNDED,NULL,InactiveMsgModifyInstance,"InactiveMsgModifyInstance",NULL);
+   AddUDF(theEnv,"active-message-modify-instance","*",0,UNBOUNDED,NULL,MsgModifyInstance,"MsgModifyInstance",NULL);
+   AddFunctionParser(theEnv,"active-message-modify-instance",ParseInitializeInstance);
+
+   AddUDF(theEnv,"duplicate-instance","*",0,UNBOUNDED,NULL,InactiveDuplicateInstance,"InactiveDuplicateInstance",NULL);
+   AddUDF(theEnv,"active-duplicate-instance","*",0,UNBOUNDED,NULL,DuplicateInstance,"DuplicateInstance",NULL);
+   AddFunctionParser(theEnv,"active-duplicate-instance",ParseInitializeInstance);
+   AddUDF(theEnv,"message-duplicate-instance","*",0,UNBOUNDED,NULL,InactiveMsgDuplicateInstance,"InactiveMsgDuplicateInstance",NULL);
+   AddUDF(theEnv,"active-message-duplicate-instance","*",0,UNBOUNDED,NULL,MsgDuplicateInstance,"MsgDuplicateInstance",NULL);
+   AddFunctionParser(theEnv,"active-message-duplicate-instance",ParseInitializeInstance);
+#else
+   AddUDF(theEnv,"modify-instance","*",0,UNBOUNDED,NULL,ModifyInstance,"ModifyInstance",NULL);
+   AddUDF(theEnv,"message-modify-instance","*",0,UNBOUNDED,NULL,MsgModifyInstance,"MsgModifyInstance",NULL);
+   AddUDF(theEnv,"duplicate-instance","*",0,UNBOUNDED,NULL,DuplicateInstance,"DuplicateInstance",NULL);
+   AddUDF(theEnv,"message-duplicate-instance","*",0,UNBOUNDED,NULL,MsgDuplicateInstance,"MsgDuplicateInstance",NULL);
+#endif
+
+   AddUDF(theEnv,"(direct-modify)","*",0,UNBOUNDED,NULL,DirectModifyMsgHandler,"DirectModifyMsgHandler",NULL);
+   AddUDF(theEnv,"(message-modify)","*",0,UNBOUNDED,NULL,MsgModifyMsgHandler,"MsgModifyMsgHandler",NULL);
+   AddUDF(theEnv,"(direct-duplicate)","*",0,UNBOUNDED,NULL,DirectDuplicateMsgHandler,"DirectDuplicateMsgHandler",NULL);
+   AddUDF(theEnv,"(message-duplicate)","*",0,UNBOUNDED,NULL,MsgDuplicateMsgHandler,"MsgDuplicateMsgHandler",NULL);
+
+#endif
+
+#if DEFRULE_CONSTRUCT
+   AddFunctionParser(theEnv,"active-modify-instance",ParseInitializeInstance);
+   AddFunctionParser(theEnv,"active-message-modify-instance",ParseInitializeInstance);
+
+   AddFunctionParser(theEnv,"active-duplicate-instance",ParseInitializeInstance);
+   AddFunctionParser(theEnv,"active-message-duplicate-instance",ParseInitializeInstance);
+#endif
+
+   AddFunctionParser(theEnv,"modify-instance",ParseInitializeInstance);
+   AddFunctionParser(theEnv,"message-modify-instance",ParseInitializeInstance);
+   AddFunctionParser(theEnv,"duplicate-instance",ParseInitializeInstance);
+   AddFunctionParser(theEnv,"message-duplicate-instance",ParseInitializeInstance);
+  }
+
+/*************************************************************
+  NAME         : ModifyInstance
+  DESCRIPTION  : Modifies slots of an instance via the
+                 direct-modify message
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot updates performed directly
+  NOTES        : H/L Syntax:
+                 (modify-instance <instance> <slot-override>*)
+ *************************************************************/
+void ModifyInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+   Expression theExp;
+   UDFValue *overrides;
+   bool oldOMDMV;
+   unsigned short overrideCount;
+   bool error;
+
+   /* ===========================================
+      The slot-overrides need to be evaluated now
+      to resolve any variable references before a
+      new frame is pushed for message-handler
+      execution
+      =========================================== */
+
+   overrides = EvaluateSlotOverrides(theEnv,GetFirstArgument()->nextArg,
+                                     &overrideCount,&error);
+   if (error)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /* ==================================
+      Find the instance and make sure it
+      wasn't deleted by the overrides
+      ================================== */
+   ins = CheckInstance(context);
+   if (ins == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+      return;
+     }
+
+   /* ======================================
+      We are passing the slot override
+      expression information along
+      to whatever message-handler implements
+      the modify
+      ====================================== */
+
+   theExp.type = EXTERNAL_ADDRESS_TYPE;
+   theExp.value = CreateExternalAddress(theEnv,overrides,0);
+   theExp.argList = NULL;
+   theExp.nextArg = NULL;
+
+   oldOMDMV = InstanceData(theEnv)->ObjectModDupMsgValid;
+   InstanceData(theEnv)->ObjectModDupMsgValid = true;
+   DirectMessage(theEnv,FindSymbolHN(theEnv,DIRECT_MODIFY_STRING,SYMBOL_BIT),ins,returnValue,&theExp);
+   InstanceData(theEnv)->ObjectModDupMsgValid = oldOMDMV;
+
+   DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+  }
+
+/*************************************************************
+  NAME         : MsgModifyInstance
+  DESCRIPTION  : Modifies slots of an instance via the
+                 direct-modify message
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot updates performed with put- messages
+  NOTES        : H/L Syntax:
+                 (message-modify-instance <instance>
+                    <slot-override>*)
+ *************************************************************/
+void MsgModifyInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+   Expression theExp;
+   UDFValue *overrides;
+   bool oldOMDMV;
+   unsigned short overrideCount;
+   bool error;
+
+   /* ===========================================
+      The slot-overrides need to be evaluated now
+      to resolve any variable references before a
+      new frame is pushed for message-handler
+      execution
+      =========================================== */
+   overrides = EvaluateSlotOverrides(theEnv,GetFirstArgument()->nextArg,
+                                     &overrideCount,&error);
+   if (error)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /* ==================================
+      Find the instance and make sure it
+      wasn't deleted by the overrides
+      ================================== */
+   ins = CheckInstance(context);
+   if (ins == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+      return;
+     }
+
+   /* ======================================
+      We are passing the slot override
+      expression information along
+      to whatever message-handler implements
+      the modify
+      ====================================== */
+
+   theExp.type = EXTERNAL_ADDRESS_TYPE;
+   theExp.value = CreateExternalAddress(theEnv,overrides,0);
+   theExp.argList = NULL;
+   theExp.nextArg = NULL;
+
+   oldOMDMV = InstanceData(theEnv)->ObjectModDupMsgValid;
+   InstanceData(theEnv)->ObjectModDupMsgValid = true;
+   DirectMessage(theEnv,FindSymbolHN(theEnv,MSG_MODIFY_STRING,SYMBOL_BIT),ins,returnValue,&theExp);
+   InstanceData(theEnv)->ObjectModDupMsgValid = oldOMDMV;
+
+   DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+  }
+
+/*************************************************************
+  NAME         : DuplicateInstance
+  DESCRIPTION  : Duplicates an instance via the
+                 direct-duplicate message
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot updates performed directly
+  NOTES        : H/L Syntax:
+                 (duplicate-instance <instance>
+                   [to <instance-name>] <slot-override>*)
+ *************************************************************/
+void DuplicateInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+   UDFValue newName;
+   Expression theExp[2];
+   UDFValue *overrides;
+   bool oldOMDMV;
+   unsigned short overrideCount;
+   bool error;
+
+   /* ===========================================
+      The slot-overrides need to be evaluated now
+      to resolve any variable references before a
+      new frame is pushed for message-handler
+      execution
+      =========================================== */
+   overrides = EvaluateSlotOverrides(theEnv,GetFirstArgument()->nextArg->nextArg,
+                                     &overrideCount,&error);
+   if (error)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /* ==================================
+      Find the instance and make sure it
+      wasn't deleted by the overrides
+      ================================== */
+   ins = CheckInstance(context);
+   if (ins == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+      return;
+     }
+
+   if (! UDFNextArgument(context,INSTANCE_NAME_BIT | SYMBOL_BIT,&newName))
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+      return;
+     }
+
+   /* ======================================
+      We are passing the slot override
+      expression information along
+      to whatever message-handler implements
+      the duplicate
+      ====================================== */
+   theExp[0].type = INSTANCE_NAME_TYPE;
+   theExp[0].value = newName.value;
+   theExp[0].argList = NULL;
+   theExp[0].nextArg = &theExp[1];
+   theExp[1].type = EXTERNAL_ADDRESS_TYPE;
+   theExp[1].value = CreateExternalAddress(theEnv,overrides,0);
+   theExp[1].argList = NULL;
+   theExp[1].nextArg = NULL;
+
+   oldOMDMV = InstanceData(theEnv)->ObjectModDupMsgValid;
+   InstanceData(theEnv)->ObjectModDupMsgValid = true;
+   DirectMessage(theEnv,FindSymbolHN(theEnv,DIRECT_DUPLICATE_STRING,SYMBOL_BIT),ins,returnValue,&theExp[0]);
+   InstanceData(theEnv)->ObjectModDupMsgValid = oldOMDMV;
+
+   DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+  }
+
+/*************************************************************
+  NAME         : MsgDuplicateInstance
+  DESCRIPTION  : Duplicates an instance via the
+                 message-duplicate message
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot updates performed w/ int & put- messages
+  NOTES        : H/L Syntax:
+                 (duplicate-instance <instance>
+                   [to <instance-name>] <slot-override>*)
+ *************************************************************/
+void MsgDuplicateInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+   UDFValue newName;
+   Expression theExp[2];
+   UDFValue *overrides;
+   bool oldOMDMV;
+   unsigned short overrideCount;
+   bool error;
+
+   /* ===========================================
+      The slot-overrides need to be evaluated now
+      to resolve any variable references before a
+      new frame is pushed for message-handler
+      execution
+      =========================================== */
+   overrides = EvaluateSlotOverrides(theEnv,GetFirstArgument()->nextArg->nextArg,
+                                     &overrideCount,&error);
+   if (error)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /* ==================================
+      Find the instance and make sure it
+      wasn't deleted by the overrides
+      ================================== */
+   ins = CheckInstance(context);
+   if (ins == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+      return;
+     }
+   if (! UDFNextArgument(context,INSTANCE_NAME_BIT | SYMBOL_BIT,&newName))
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+      return;
+     }
+
+   /* ======================================
+      We are passing the slot override
+      expression information along
+      to whatever message-handler implements
+      the duplicate
+      ====================================== */
+   theExp[0].type = INSTANCE_NAME_TYPE;
+   theExp[0].value = newName.value;
+   theExp[0].argList = NULL;
+   theExp[0].nextArg = &theExp[1];
+   theExp[1].type = EXTERNAL_ADDRESS_TYPE;
+   theExp[1].value = CreateExternalAddress(theEnv,overrides,0);
+   theExp[1].argList = NULL;
+   theExp[1].nextArg = NULL;
+
+   oldOMDMV = InstanceData(theEnv)->ObjectModDupMsgValid;
+   InstanceData(theEnv)->ObjectModDupMsgValid = true;
+   DirectMessage(theEnv,FindSymbolHN(theEnv,MSG_DUPLICATE_STRING,SYMBOL_BIT),ins,returnValue,&theExp[0]);
+   InstanceData(theEnv)->ObjectModDupMsgValid = oldOMDMV;
+
+   DeleteSlotOverrideEvaluations(theEnv,overrides,overrideCount);
+  }
+
+#if DEFRULE_CONSTRUCT
+
+/**************************************************************
+  NAME         : InactiveModifyInstance
+  DESCRIPTION  : Modifies slots of an instance of a class
+                 Pattern-matching is automatically
+                 delayed until the slot updates are done
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot updates performed directly
+  NOTES        : H/L Syntax:
+                 (modify-instance <instance-name>
+                   <slot-override>*)
+ **************************************************************/
+void InactiveModifyInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool ov;
+
+   ov = SetDelayObjectPatternMatching(theEnv,true);
+   ModifyInstance(theEnv,context,returnValue);
+   SetDelayObjectPatternMatching(theEnv,ov);
+  }
+
+/**************************************************************
+  NAME         : InactiveMsgModifyInstance
+  DESCRIPTION  : Modifies slots of an instance of a class
+                 Pattern-matching is automatically
+                 delayed until the slot updates are done
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot updates performed with put- messages
+  NOTES        : H/L Syntax:
+                 (message-modify-instance <instance-name>
+                   <slot-override>*)
+ **************************************************************/
+void InactiveMsgModifyInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool ov;
+
+   ov = SetDelayObjectPatternMatching(theEnv,true);
+   MsgModifyInstance(theEnv,context,returnValue);
+   SetDelayObjectPatternMatching(theEnv,ov);
+  }
+
+/*******************************************************************
+  NAME         : InactiveDuplicateInstance
+  DESCRIPTION  : Duplicates an instance of a class
+                 Pattern-matching is automatically
+                 delayed until the slot updates are done
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot updates performed directly
+  NOTES        : H/L Syntax:
+                 (duplicate-instance <instance> [to <instance-name>]
+                   <slot-override>*)
+ *******************************************************************/
+void InactiveDuplicateInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool ov;
+
+   ov = SetDelayObjectPatternMatching(theEnv,true);
+   DuplicateInstance(theEnv,context,returnValue);
+   SetDelayObjectPatternMatching(theEnv,ov);
+  }
+
+/**************************************************************
+  NAME         : InactiveMsgDuplicateInstance
+  DESCRIPTION  : Duplicates an instance of a class
+                 Pattern-matching is automatically
+                 delayed until the slot updates are done
+  INPUTS       : The address of the result value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot updates performed with put- messages
+  NOTES        : H/L Syntax:
+                 (message-duplicate-instance <instance>
+                   [to <instance-name>]
+                   <slot-override>*)
+ **************************************************************/
+void InactiveMsgDuplicateInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool ov;
+
+   ov = SetDelayObjectPatternMatching(theEnv,true);
+   MsgDuplicateInstance(theEnv,context,returnValue);
+   SetDelayObjectPatternMatching(theEnv,ov);
+  }
+
+#endif
+
+/*****************************************************
+  NAME         : DirectDuplicateMsgHandler
+  DESCRIPTION  : Implementation for the USER class
+                 handler direct-duplicate
+
+                 Implements duplicate-instance message
+                 with a series of direct slot
+                 placements
+  INPUTS       : A data object buffer to hold the
+                 result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot values updated
+  NOTES        : None
+ *****************************************************/
+void DirectDuplicateMsgHandler(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   DuplicateMsgHandlerSupport(theEnv,returnValue,false);
+  }
+
+/*****************************************************
+  NAME         : MsgDuplicateMsgHandler
+  DESCRIPTION  : Implementation for the USER class
+                 handler message-duplicate
+
+                 Implements duplicate-instance message
+                 with a series of put- messages
+  INPUTS       : A data object buffer to hold the
+                 result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot values updated
+  NOTES        : None
+ *****************************************************/
+void MsgDuplicateMsgHandler(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   DuplicateMsgHandlerSupport(theEnv,returnValue,true);
+  }
+
+/***************************************************
+  NAME         : DirectModifyMsgHandler
+  DESCRIPTION  : Implementation for the USER class
+                 handler direct-modify
+
+                 Implements modify-instance message
+                 with a series of direct slot
+                 placements
+  INPUTS       : A data object buffer to hold the
+                 result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot values updated
+  NOTES        : None
+ ***************************************************/
+void DirectModifyMsgHandler(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ModifyMsgHandlerSupport(theEnv,returnValue,false);
+  }
+
+/***************************************************
+  NAME         : MsgModifyMsgHandler
+  DESCRIPTION  : Implementation for the USER class
+                 handler message-modify
+
+                 Implements modify-instance message
+                 with a series of put- messages
+  INPUTS       : A data object buffer to hold the
+                 result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot values updated
+  NOTES        : None
+ ***************************************************/
+void MsgModifyMsgHandler(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ModifyMsgHandlerSupport(theEnv,returnValue,true);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : EvaluateSlotOverrides
+  DESCRIPTION  : Evaluates the slot-override expressions
+                 for modify-instance and duplicate-instance
+                 Evaluations are stored in an array of
+                 data objects, where the supplementalInfo
+                 field points at the name of the slot
+                 The data object next fields are used
+                 to link the array as well.
+  INPUTS       : 1) The slot override expressions
+                 2) A buffer to hold the number
+                    of slot overrides
+                 3) A buffer to hold an error flag
+  RETURNS      : The slot override data object array
+  SIDE EFFECTS : Data object array allocated and initialized
+                 override count and error buffers set
+  NOTES        : Slot overrides must be evaluated before
+                 calling supporting message-handlers for
+                 modify- and duplicate-instance in the
+                 event that the overrides contain variable
+                 references to an outer frame
+ ***********************************************************/
+static UDFValue *EvaluateSlotOverrides(
+  Environment *theEnv,
+  Expression *ovExprs,
+  unsigned short *ovCnt,
+  bool *error)
+  {
+   UDFValue *ovs;
+   unsigned ovi;
+   void *slotName;
+
+   *error = false;
+
+   /* ==========================================
+      There are two expressions chains for every
+      slot override: one for the slot name and
+      one for the slot value
+      ========================================== */
+   *ovCnt = CountArguments(ovExprs) / 2;
+   if (*ovCnt == 0)
+     return NULL;
+
+   /* ===============================================
+      Evaluate all the slot override names and values
+      and store them in a contiguous array
+      =============================================== */
+   ovs = (UDFValue *) gm2(theEnv,(sizeof(UDFValue) * (*ovCnt)));
+   ovi = 0;
+   while (ovExprs != NULL)
+     {
+      if (EvaluateExpression(theEnv,ovExprs,&ovs[ovi]))
+        goto EvaluateOverridesError;
+      if (ovs[ovi].header->type != SYMBOL_TYPE)
+        {
+         ExpectedTypeError1(theEnv,ExpressionFunctionCallName(EvaluationData(theEnv)->CurrentExpression)->contents,
+                            ovi+1,"slot name");
+         SetEvaluationError(theEnv,true);
+         goto EvaluateOverridesError;
+        }
+      slotName = ovs[ovi].value;
+      if (ovExprs->nextArg->argList)
+        {
+         if (EvaluateAndStoreInDataObject(theEnv,false,ovExprs->nextArg->argList,
+                                               &ovs[ovi],true) == false)
+           goto EvaluateOverridesError;
+        }
+      else
+        {
+         ovs[ovi].begin = 0;
+         ovs[ovi].range = 0;
+         ovs[ovi].value = ProceduralPrimitiveData(theEnv)->NoParamValue;
+        }
+      ovs[ovi].supplementalInfo = slotName;
+      ovExprs = ovExprs->nextArg->nextArg;
+      ovs[ovi].next = (ovExprs != NULL) ? &ovs[ovi+1] : NULL;
+      ovi++;
+     }
+   return(ovs);
+
+EvaluateOverridesError:
+   rm(theEnv,ovs,(sizeof(UDFValue) * (*ovCnt)));
+   *error = true;
+   return NULL;
+  }
+
+/**********************************************************
+  NAME         : DeleteSlotOverrideEvaluations
+  DESCRIPTION  : Deallocates slot override evaluation array
+  INPUTS       : 1) The data object array
+                 2) The number of elements
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deallocates slot override data object
+                 array for modify- and duplicate- instance
+  NOTES        : None
+ **********************************************************/
+static void DeleteSlotOverrideEvaluations(
+  Environment *theEnv,
+  UDFValue *ovEvals,
+  unsigned short ovCnt)
+  {
+   if (ovEvals != NULL)
+     rm(theEnv,ovEvals,(sizeof(UDFValue) * ovCnt));
+  }
+
+/**********************************************************
+  NAME         : ModifyMsgHandlerSupport
+  DESCRIPTION  : Support routine for DirectModifyMsgHandler
+                 and MsgModifyMsgHandler
+
+                 Performs a series of slot updates
+                 directly or with messages
+  INPUTS       : 1) A data object buffer to hold the result
+                 2) A flag indicating whether to use
+                    put- messages or direct placement
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slots updated (messages sent)
+  NOTES        : None
+ **********************************************************/
+static void ModifyMsgHandlerSupport(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  bool msgpass)
+  {
+   UDFValue *slotOverrides,*newval,temp,junk;
+   Expression msgExp;
+   Instance *ins;
+   InstanceSlot *insSlot;
+
+   returnValue->value = FalseSymbol(theEnv);
+   if (InstanceData(theEnv)->ObjectModDupMsgValid == false)
+     {
+      PrintErrorID(theEnv,"INSMODDP",1,false);
+      WriteString(theEnv,STDERR,"Direct/message-modify message valid only in modify-instance.\n");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   InstanceData(theEnv)->ObjectModDupMsgValid = false;
+
+   ins = GetActiveInstance(theEnv);
+   if (ins->garbage)
+     {
+      StaleInstanceAddress(theEnv,"modify-instance",0);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+   /* =======================================
+      Retrieve the slot override data objects
+      passed from ModifyInstance - the slot
+      name is stored in the supplementalInfo
+      field - and the next fields are links
+      ======================================= */
+
+   slotOverrides = (UDFValue *) ((CLIPSExternalAddress *) GetNthMessageArgument(theEnv,1)->value)->contents;
+
+   while (slotOverrides != NULL)
+     {
+      /* ===========================================================
+         No evaluation or error checking needs to be done
+         since this has already been done by EvaluateSlotOverrides()
+         =========================================================== */
+      insSlot = FindInstanceSlot(theEnv,ins,(CLIPSLexeme *) slotOverrides->supplementalInfo);
+      if (insSlot == NULL)
+        {
+         SlotExistError(theEnv,((CLIPSLexeme *) slotOverrides->supplementalInfo)->contents,"modify-instance");
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+      if (msgpass)
+        {
+         msgExp.type = slotOverrides->header->type;
+         if (msgExp.type != MULTIFIELD_TYPE)
+           msgExp.value = slotOverrides->value;
+         else
+           msgExp.value = slotOverrides;
+         msgExp.argList = NULL;
+         msgExp.nextArg = NULL;
+         if (! DirectMessage(theEnv,insSlot->desc->overrideMessage,ins,&temp,&msgExp))
+           return;
+        }
+      else
+        {
+         if (insSlot->desc->multiple && (slotOverrides->header->type != MULTIFIELD_TYPE))
+           {
+            temp.value = CreateMultifield(theEnv,1L);
+            temp.begin = 0;
+            temp.range = 1;
+            temp.multifieldValue->contents[0].value = slotOverrides->value;
+            newval = &temp;
+           }
+         else
+           newval = slotOverrides;
+         if (PutSlotValue(theEnv,ins,insSlot,newval,&junk,"modify-instance") != PSE_NO_ERROR)
+           return;
+        }
+
+      slotOverrides = slotOverrides->next;
+     }
+   returnValue->value = TrueSymbol(theEnv);
+  }
+
+/*************************************************************
+  NAME         : DuplicateMsgHandlerSupport
+  DESCRIPTION  : Support routine for DirectDuplicateMsgHandler
+                 and MsgDuplicateMsgHandler
+
+                 Performs a series of slot updates
+                 directly or with messages
+  INPUTS       : 1) A data object buffer to hold the result
+                 2) A flag indicating whether to use
+                    put- messages or direct placement
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slots updated (messages sent)
+  NOTES        : None
+ *************************************************************/
+static void DuplicateMsgHandlerSupport(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  bool msgpass)
+  {
+   Instance *srcins,*dstins;
+   CLIPSLexeme *newName;
+   UDFValue *slotOverrides;
+   Expression *valArg,msgExp;
+   long i;
+   bool oldMkInsMsgPass;
+   InstanceSlot *dstInsSlot;
+   UDFValue temp,junk,*newval;
+   bool success;
+
+   returnValue->value = FalseSymbol(theEnv);
+   if (InstanceData(theEnv)->ObjectModDupMsgValid == false)
+     {
+      PrintErrorID(theEnv,"INSMODDP",2,false);
+      WriteString(theEnv,STDERR,"Direct/message-duplicate message valid only in duplicate-instance.\n");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   InstanceData(theEnv)->ObjectModDupMsgValid = false;
+
+   /* ==================================
+      Grab the slot override expressions
+      and determine the source instance
+      and the name of the new instance
+      ================================== */
+   srcins = GetActiveInstance(theEnv);
+   newName = GetNthMessageArgument(theEnv,1)->lexemeValue;
+   slotOverrides = (UDFValue *) ((CLIPSExternalAddress *) GetNthMessageArgument(theEnv,2)->value)->contents;
+   if (srcins->garbage)
+     {
+      StaleInstanceAddress(theEnv,"duplicate-instance",0);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   if (((newName->header.type == srcins->name->header.type) &&
+        (newName == srcins->name)) ||
+       (strcmp(newName->contents,srcins->name->contents) == 0))
+     {
+      PrintErrorID(theEnv,"INSMODDP",3,false);
+      WriteString(theEnv,STDERR,"Instance copy must have a different name in duplicate-instance.\n");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+   /* ==========================================
+      Create an uninitialized new instance of
+      the new name (delete old version - if any)
+      ========================================== */
+   oldMkInsMsgPass = InstanceData(theEnv)->MkInsMsgPass;
+   InstanceData(theEnv)->MkInsMsgPass = msgpass;
+   dstins = BuildInstance(theEnv,newName,srcins->cls,true);
+   InstanceData(theEnv)->MkInsMsgPass = oldMkInsMsgPass;
+   if (dstins == NULL)
+     return;
+   dstins->busy++;
+
+   /* ================================
+      Place slot overrides directly or
+      with put- messages
+      ================================ */
+   while (slotOverrides != NULL)
+     {
+      /* ===========================================================
+         No evaluation or error checking needs to be done
+         since this has already been done by EvaluateSlotOverrides()
+         =========================================================== */
+      dstInsSlot = FindInstanceSlot(theEnv,dstins,(CLIPSLexeme *) slotOverrides->supplementalInfo);
+      if (dstInsSlot == NULL)
+        {
+         SlotExistError(theEnv,((CLIPSLexeme *) slotOverrides->supplementalInfo)->contents,
+                        "duplicate-instance");
+         goto DuplicateError;
+        }
+      if (msgpass)
+        {
+         msgExp.type = slotOverrides->header->type;
+         if (msgExp.type != MULTIFIELD_TYPE)
+           msgExp.value = slotOverrides->value;
+         else
+           msgExp.value = slotOverrides;
+
+         msgExp.argList = NULL;
+         msgExp.nextArg = NULL;
+         if (! DirectMessage(theEnv,dstInsSlot->desc->overrideMessage,dstins,&temp,&msgExp))
+           goto DuplicateError;
+        }
+      else
+        {
+         if (dstInsSlot->desc->multiple && (slotOverrides->header->type != MULTIFIELD_TYPE))
+           {
+            temp.value = CreateMultifield(theEnv,1L);
+            temp.begin = 0;
+            temp.range = 1;
+            temp.multifieldValue->contents[0].value = slotOverrides->value;
+            newval = &temp;
+           }
+         else
+           newval = slotOverrides;
+         if (PutSlotValue(theEnv,dstins,dstInsSlot,newval,&junk,"duplicate-instance") != PSE_NO_ERROR)
+           goto DuplicateError;
+        }
+      dstInsSlot->override = true;
+      slotOverrides = slotOverrides->next;
+     }
+
+   /* =======================================
+      Copy values from source instance to new
+      directly or with put- messages
+      ======================================= */
+   for (i = 0 ; i < dstins->cls->localInstanceSlotCount ; i++)
+     {
+      if (dstins->slots[i].override == false)
+        {
+         if (msgpass)
+           {
+            temp.value = srcins->slots[i].value;
+            if (temp.header->type == MULTIFIELD_TYPE)
+              {
+               temp.begin = 0;
+               temp.range = temp.multifieldValue->length;
+              }
+            valArg = ConvertValueToExpression(theEnv,&temp);
+            success = DirectMessage(theEnv,dstins->slots[i].desc->overrideMessage,
+                          dstins,&temp,valArg);
+            ReturnExpression(theEnv,valArg);
+            if (! success)
+              goto DuplicateError;
+           }
+         else
+           {
+            temp.value = srcins->slots[i].value;
+            if (srcins->slots[i].type == MULTIFIELD_TYPE)
+              {
+               temp.begin = 0;
+               temp.range = srcins->slots[i].multifieldValue->length;
+              }
+            if (PutSlotValue(theEnv,dstins,&dstins->slots[i],&temp,&junk,"duplicate-instance")
+                 != PSE_NO_ERROR)
+              goto DuplicateError;
+           }
+        }
+     }
+
+   /* =======================================
+      Send init message for message-duplicate
+      ======================================= */
+   if (msgpass)
+     {
+      for (i = 0 ; i < dstins->cls->instanceSlotCount ; i++)
+        dstins->slotAddresses[i]->override = true;
+      dstins->initializeInProgress = 1;
+      DirectMessage(theEnv,MessageHandlerData(theEnv)->INIT_SYMBOL,dstins,returnValue,NULL);
+     }
+   dstins->busy--;
+   if (dstins->garbage)
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      SetEvaluationError(theEnv,true);
+     }
+   else
+     {
+      returnValue->value = GetFullInstanceName(theEnv,dstins);
+     }
+   return;
+
+DuplicateError:
+   dstins->busy--;
+   QuashInstance(theEnv,dstins);
+   SetEvaluationError(theEnv,true);
+  }
+
+#endif
+
+
diff --git a/clips/insmoddp.h b/clips/insmoddp.h
new file mode 100755
index 000000000..61a3a4777
--- /dev/null
+++ b/clips/insmoddp.h
@@ -0,0 +1,91 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*           INSTANCE MODIFY AND DUPLICATE MODULE      */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*      6.30: Added DATA_OBJECT_ARRAY primitive type.        */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            The return value of DirectMessage indicates    */
+/*            whether an execution error has occurred.       */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed DATA_OBJECT_ARRAY primitive type.      */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_insmoddp
+
+#pragma once
+
+#define _H_insmoddp
+
+#define DIRECT_MODIFY_STRING    "direct-modify"
+#define MSG_MODIFY_STRING       "message-modify"
+#define DIRECT_DUPLICATE_STRING "direct-duplicate"
+#define MSG_DUPLICATE_STRING    "message-duplicate"
+
+#ifndef _H_evaluatn
+#include "evaluatn.h"
+#endif
+
+   void                           SetupInstanceModDupCommands(Environment *);
+
+   void                           ModifyInstance(Environment *,UDFContext *,UDFValue *);
+   void                           MsgModifyInstance(Environment *,UDFContext *,UDFValue *);
+   void                           DuplicateInstance(Environment *,UDFContext *,UDFValue *);
+   void                           MsgDuplicateInstance(Environment *,UDFContext *,UDFValue *);
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+   void                           InactiveModifyInstance(Environment *,UDFContext *,UDFValue *);
+   void                           InactiveMsgModifyInstance(Environment *,UDFContext *,UDFValue *);
+   void                           InactiveDuplicateInstance(Environment *,UDFContext *,UDFValue *);
+   void                           InactiveMsgDuplicateInstance(Environment *,UDFContext *,UDFValue *);
+#endif
+
+   void                           DirectModifyMsgHandler(Environment *,UDFContext *,UDFValue *);
+   void                           MsgModifyMsgHandler(Environment *,UDFContext *,UDFValue *);
+   void                           DirectDuplicateMsgHandler(Environment *,UDFContext *,UDFValue *);
+   void                           MsgDuplicateMsgHandler(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_insmoddp */
+
+
+
+
+
+
+
diff --git a/clips/insmult.c b/clips/insmult.c
new file mode 100755
index 000000000..9430f1e96
--- /dev/null
+++ b/clips/insmult.c
@@ -0,0 +1,804 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/07/17             */
+   /*                                                     */
+   /*           INSTANCE MULTIFIELD_TYPE SLOT MODULE      */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  Access routines for Instance Multifield Slots   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed direct-mv-replace, direct-mv-insert,   */
+/*            direct-mv-delete, mv-slot-replace,             */
+/*            mv-slot-insert, and mv-slot-delete functions.  */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "insfun.h"
+#include "msgfun.h"
+#include "msgpass.h"
+#include "multifun.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "insmult.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define INSERT         0
+#define REPLACE        1
+#define DELETE_OP      2
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static Instance               *CheckMultifieldSlotInstance(UDFContext *);
+   static InstanceSlot           *CheckMultifieldSlotModify(Environment *,int,const char *,Instance *,
+                                                            Expression *,long long *,long long *,UDFValue *);
+   static void                    AssignSlotToDataObject(UDFValue *,InstanceSlot *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupInstanceMultifieldCommands
+  DESCRIPTION  : Defines function interfaces for
+                 manipulating instance multislots
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Functions defined to KB
+  NOTES        : None
+ ***************************************************/
+void SetupInstanceMultifieldCommands(
+  Environment *theEnv)
+  {
+#if (! RUN_TIME)
+   AddUDF(theEnv,"slot-direct-replace$","b",4,UNBOUNDED,"*;y;l;l",DirectMVReplaceCommand,"DirectMVReplaceCommand",NULL);
+   AddUDF(theEnv,"slot-direct-insert$","b",3,UNBOUNDED,"*;y;l",DirectMVInsertCommand,"DirectMVInsertCommand",NULL);
+   AddUDF(theEnv,"slot-direct-delete$","b",3,3,"l;y",DirectMVDeleteCommand,"DirectMVDeleteCommand",NULL);
+   AddUDF(theEnv,"slot-replace$","*",5,UNBOUNDED,"*;iny;y;l;l",MVSlotReplaceCommand,"MVSlotReplaceCommand",NULL);
+   AddUDF(theEnv,"slot-insert$","*",4,UNBOUNDED,"*;iny;y;l",MVSlotInsertCommand,"MVSlotInsertCommand",NULL);
+   AddUDF(theEnv,"slot-delete$","*",4,4,"l;iny;y",MVSlotDeleteCommand,"MVSlotDeleteCommand",NULL);
+#endif
+  }
+
+/***********************************************************************************
+  NAME         : MVSlotReplaceCommand
+  DESCRIPTION  : Allows user to replace a specified field of a multi-value slot
+                 The slot is directly read (w/o a get- message) and the new
+                   slot-value is placed via a put- message.
+                 This function is not valid for single-value slots.
+  INPUTS       : Caller's result buffer
+  RETURNS      : True if multi-value slot successfully modified,
+                 false otherwise
+  SIDE EFFECTS : Put messsage sent for slot
+  NOTES        : H/L Syntax : (slot-replace$ <instance> <slot>
+                                 <range-begin> <range-end> <value>)
+ ***********************************************************************************/
+void MVSlotReplaceCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue newval,newseg,oldseg;
+   Instance *ins;
+   InstanceSlot *sp;
+   long long start, end;
+   size_t rs, re, srcLen, dstLen;
+   size_t i, j, k;
+   Expression arg;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   ins = CheckMultifieldSlotInstance(context);
+   if (ins == NULL)
+     return;
+   sp = CheckMultifieldSlotModify(theEnv,REPLACE,"slot-replace$",ins,
+                            GetFirstArgument()->nextArg,&start,&end,&newval);
+   if (sp == NULL)
+     return;
+   AssignSlotToDataObject(&oldseg,sp);
+   
+   /*===========================================*/
+   /* Verify the start and end index arguments. */
+   /*===========================================*/
+
+   if ((end < start) || (start < 1) || (end < 1) || // TBD Refactor
+       (((long long) ((size_t) start)) != start) ||
+       (((long long) ((size_t) end)) != end))
+     {
+      MVRangeError(theEnv,start,end,oldseg.range,"slot-replace$");
+      return;
+     }
+      
+   /*============================================*/
+   /* Convert the indices to unsigned zero-based */
+   /* values including the begin value.          */
+   /*============================================*/
+   
+   rs = (size_t) start;
+   re = (size_t) end;
+   srcLen = oldseg.range;
+   
+   if ((rs > srcLen) || (re > srcLen))
+     {
+      MVRangeError(theEnv,start,end,oldseg.range,"slot-replace$");
+      return;
+     }
+     
+   rs--;
+   re--;
+   rs += oldseg.begin;
+   re += oldseg.begin;
+
+   dstLen = srcLen - (re - rs + 1); // TBD Refactor
+   newseg.begin = 0;
+   newseg.range = dstLen;
+   newseg.multifieldValue = CreateMultifield(theEnv,dstLen);
+
+
+   /*===================================*/
+   /* Delete the members from the slot. */
+   /*===================================*/
+   
+   if (newval.header->type == MULTIFIELD_TYPE) // TBD Refactor
+     { dstLen = srcLen - (re - rs + 1) + newval.range; }
+   else
+     { dstLen = srcLen - (re - rs); }
+     
+   newseg.begin = 0;
+   newseg.range = dstLen;
+   newseg.multifieldValue = CreateMultifield(theEnv,dstLen);
+
+   for (i = oldseg.begin, j = 0; i < (oldseg.begin + oldseg.range); i++)
+     {
+      if (i == rs)
+        {
+         if (newval.header->type == MULTIFIELD_TYPE)
+           {
+            for (k = newval.begin; k < (newval.begin + newval.range); k++)
+              { newseg.multifieldValue->contents[j++].value = newval.multifieldValue->contents[k].value; }
+           }
+         else
+           { newseg.multifieldValue->contents[j++].value = newval.value; }
+           
+         continue;
+        }
+      else if ((i > rs) && (i <= re))
+        { continue; }
+      
+      newseg.multifieldValue->contents[j++].value = oldseg.multifieldValue->contents[i].value;
+     }
+     
+   arg.type = MULTIFIELD_TYPE;
+   arg.value = &newseg;
+   arg.nextArg = NULL;
+   arg.argList = NULL;
+   DirectMessage(theEnv,sp->desc->overrideMessage,ins,returnValue,&arg);
+  }
+
+/***********************************************************************************
+  NAME         : MVSlotInsertCommand
+  DESCRIPTION  : Allows user to insert a specified field of a multi-value slot
+                 The slot is directly read (w/o a get- message) and the new
+                   slot-value is placed via a put- message.
+                 This function is not valid for single-value slots.
+  INPUTS       : Caller's result buffer
+  RETURNS      : True if multi-value slot successfully modified, false otherwise
+  SIDE EFFECTS : Put messsage sent for slot
+  NOTES        : H/L Syntax : (slot-insert$ <instance> <slot> <index> <value>)
+ ***********************************************************************************/
+void MVSlotInsertCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue newval,newseg,oldseg;
+   Instance *ins;
+   InstanceSlot *sp;
+   long long theIndex;
+   Expression arg;
+   size_t uindex;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   ins = CheckMultifieldSlotInstance(context);
+   if (ins == NULL)
+     return;
+   sp = CheckMultifieldSlotModify(theEnv,INSERT,"slot-insert$",ins,
+                            GetFirstArgument()->nextArg,&theIndex,NULL,&newval);
+   if (sp == NULL)
+     return;
+     
+   AssignSlotToDataObject(&oldseg,sp);
+   
+   if ((((long long) ((size_t) theIndex)) != theIndex) ||
+       (theIndex < 1))
+ 	 {
+      MVRangeError(theEnv,theIndex,theIndex,oldseg.range,"slot-insert$");
+	  return;
+	 }
+
+   uindex = (size_t) theIndex;
+
+   if (InsertMultiValueField(theEnv,&newseg,&oldseg,uindex,&newval,"slot-insert$") == false)
+     return;
+     
+   arg.type = MULTIFIELD_TYPE;
+   arg.value = &newseg;
+   arg.nextArg = NULL;
+   arg.argList = NULL;
+   DirectMessage(theEnv,sp->desc->overrideMessage,ins,returnValue,&arg);
+  }
+
+/***********************************************************************************
+  NAME         : MVSlotDeleteCommand
+  DESCRIPTION  : Allows user to delete a specified field of a multi-value slot
+                 The slot is directly read (w/o a get- message) and the new
+                   slot-value is placed via a put- message.
+                 This function is not valid for single-value slots.
+  INPUTS       : Caller's result buffer
+  RETURNS      : True if multi-value slot successfully modified, false otherwise
+  SIDE EFFECTS : Put message sent for slot
+  NOTES        : H/L Syntax : (slot-delete$ <instance> <slot>
+                                 <range-begin> <range-end>)
+ ***********************************************************************************/
+void MVSlotDeleteCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue newseg,oldseg;
+   Instance *ins;
+   InstanceSlot *sp;
+   long long start, end;
+   Expression arg;
+   size_t rs, re, srcLen, dstLen, i, j;
+   
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   ins = CheckMultifieldSlotInstance(context);
+   if (ins == NULL)
+     return;
+   sp = CheckMultifieldSlotModify(theEnv,DELETE_OP,"slot-delete$",ins,
+                            GetFirstArgument()->nextArg,&start,&end,NULL);
+   if (sp == NULL)
+     return;
+   AssignSlotToDataObject(&oldseg,sp);
+      
+   /*===========================================*/
+   /* Verify the start and end index arguments. */
+   /*===========================================*/
+
+   if ((end < start) || (start < 1) || (end < 1) || // TBD Refactor
+       (((long long) ((size_t) start)) != start) ||
+       (((long long) ((size_t) end)) != end))
+     {
+      MVRangeError(theEnv,start,end,oldseg.range,"slot-delete$");
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+      
+   /*============================================*/
+   /* Convert the indices to unsigned zero-based */
+   /* values including the begin value.          */
+   /*============================================*/
+   
+   rs = (size_t) start;
+   re = (size_t) end;
+   srcLen = oldseg.range;
+   
+   if ((rs > srcLen) || (re > srcLen))
+     {
+      MVRangeError(theEnv,start,end,oldseg.range,"slot-delete$");
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+     
+   rs--;
+   re--;
+   rs += oldseg.begin;
+   re += oldseg.begin;
+
+   /*===================================*/
+   /* Delete the members from the slot. */
+   /*===================================*/
+   
+   dstLen = srcLen - (re - rs + 1); // TBD Refactor
+   newseg.begin = 0;
+   newseg.range = dstLen;
+   newseg.multifieldValue = CreateMultifield(theEnv,dstLen);
+
+   for (i = oldseg.begin, j = 0; i < (oldseg.begin + oldseg.range); i++)
+     {
+      if ((i >= rs) && (i <= re)) continue;
+      
+      newseg.multifieldValue->contents[j++].value = oldseg.multifieldValue->contents[i].value;
+     }
+   
+   arg.type = MULTIFIELD_TYPE;
+   arg.value = &newseg;
+   arg.nextArg = NULL;
+   arg.argList = NULL;
+   DirectMessage(theEnv,sp->desc->overrideMessage,ins,returnValue,&arg);
+  }
+
+/*****************************************************************
+  NAME         : DirectMVReplaceCommand
+  DESCRIPTION  : Directly replaces a slot's value
+  INPUTS       : None
+  RETURNS      : True if put OK, false otherwise
+  SIDE EFFECTS : Slot modified
+  NOTES        : H/L Syntax: (direct-slot-replace$ <slot>
+                                <range-begin> <range-end> <value>)
+ *****************************************************************/
+void DirectMVReplaceCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   InstanceSlot *sp;
+   Instance *ins;
+   long long start, end;
+   size_t rs, re, srcLen, dstLen;
+   size_t i, j, k;
+   UDFValue newval, newseg, oldseg;
+
+   if (CheckCurrentMessage(theEnv,"direct-slot-replace$",true) == false)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   ins = GetActiveInstance(theEnv);
+   sp = CheckMultifieldSlotModify(theEnv,REPLACE,"direct-slot-replace$",ins,
+                            GetFirstArgument(),&start,&end,&newval);
+   if (sp == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   AssignSlotToDataObject(&oldseg,sp);
+   
+   /*===========================================*/
+   /* Verify the start and end index arguments. */
+   /*===========================================*/
+
+   if ((end < start) || (start < 1) || (end < 1) || // TBD Refactor
+       (((long long) ((size_t) start)) != start) ||
+       (((long long) ((size_t) end)) != end))
+     {
+      MVRangeError(theEnv,start,end,oldseg.range,"direct-slot-replace$");
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+     
+   /*============================================*/
+   /* Convert the indices to unsigned zero-based */
+   /* values including the begin value.          */
+   /*============================================*/
+   
+   rs = (size_t) start;
+   re = (size_t) end;
+   srcLen = oldseg.range;
+   
+   if ((rs > srcLen) || (re > srcLen))
+     {
+      MVRangeError(theEnv,start,end,oldseg.range,"direct-slot-replace$");
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+     
+   rs--;
+   re--;
+   rs += oldseg.begin;
+   re += oldseg.begin;
+
+   dstLen = srcLen - (re - rs + 1); // TBD Refactor
+   newseg.begin = 0;
+   newseg.range = dstLen;
+   newseg.multifieldValue = CreateMultifield(theEnv,dstLen);
+
+   /*===================================*/
+   /* Delete the members from the slot. */
+   /*===================================*/
+   
+   if (newval.header->type == MULTIFIELD_TYPE) // TBD Refactor
+     { dstLen = srcLen - (re - rs + 1) + newval.range; }
+   else
+     { dstLen = srcLen - (re - rs); }
+     
+   newseg.begin = 0;
+   newseg.range = dstLen;
+   newseg.multifieldValue = CreateMultifield(theEnv,dstLen);
+
+   for (i = oldseg.begin, j = 0; i < (oldseg.begin + oldseg.range); i++)
+     {
+      if (i == rs)
+        {
+         if (newval.header->type == MULTIFIELD_TYPE)
+           {
+            for (k = newval.begin; k < (newval.begin + newval.range); k++)
+              { newseg.multifieldValue->contents[j++].value = newval.multifieldValue->contents[k].value; }
+           }
+         else
+           { newseg.multifieldValue->contents[j++].value = newval.value; }
+           
+         continue;
+        }
+      else if ((i > rs) && (i <= re))
+        { continue; }
+      
+      newseg.multifieldValue->contents[j++].value = oldseg.multifieldValue->contents[i].value;
+     }
+
+   if (PutSlotValue(theEnv,ins,sp,&newseg,&newval,"function direct-slot-replace$") == PSE_NO_ERROR)
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/************************************************************************
+  NAME         : DirectMVInsertCommand
+  DESCRIPTION  : Directly inserts a slot's value
+  INPUTS       : None
+  RETURNS      : True if put OK, false otherwise
+  SIDE EFFECTS : Slot modified
+  NOTES        : H/L Syntax: (direct-slot-insert$ <slot> <index> <value>)
+ ************************************************************************/
+void DirectMVInsertCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   InstanceSlot *sp;
+   Instance *ins;
+   long long theIndex;
+   UDFValue newval,newseg,oldseg;
+   size_t uindex;
+
+   if (CheckCurrentMessage(theEnv,"direct-slot-insert$",true) == false)
+     { 
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return; 
+     }
+
+   ins = GetActiveInstance(theEnv);
+   sp = CheckMultifieldSlotModify(theEnv,INSERT,"direct-slot-insert$",ins,
+                            GetFirstArgument(),&theIndex,NULL,&newval);
+   if (sp == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   AssignSlotToDataObject(&oldseg,sp);
+   
+   if ((((long long) ((size_t) theIndex)) != theIndex) ||
+       (theIndex < 1))
+ 	 {
+      MVRangeError(theEnv,theIndex,theIndex,oldseg.range,"direct-slot-insert$");
+	  return;
+	 }
+
+   uindex = (size_t) theIndex;
+   
+   if (! InsertMultiValueField(theEnv,&newseg,&oldseg,uindex,&newval,"direct-slot-insert$"))
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return; 
+     }
+
+   if (PutSlotValue(theEnv,ins,sp,&newseg,&newval,"function direct-slot-insert$") == PSE_NO_ERROR)
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/*****************************************************************
+  NAME         : DirectMVDeleteCommand
+  DESCRIPTION  : Directly deletes a slot's value
+  INPUTS       : None
+  RETURNS      : True if put OK, false otherwise
+  SIDE EFFECTS : Slot modified
+  NOTES        : H/L Syntax: (direct-slot-delete$ <slot>
+                                <range-begin> <range-end>)
+ *****************************************************************/
+void DirectMVDeleteCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   InstanceSlot *sp;
+   Instance *ins;
+   size_t rs, re, dstLen, srcLen, i, j;
+   UDFValue newseg, oldseg;
+   long long start, end;
+
+   if (CheckCurrentMessage(theEnv,"direct-slot-delete$",true) == false)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   ins = GetActiveInstance(theEnv);
+   sp = CheckMultifieldSlotModify(theEnv,DELETE_OP,"direct-slot-delete$",ins,
+                                  GetFirstArgument(),&start,&end,NULL);
+   if (sp == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   AssignSlotToDataObject(&oldseg,sp);
+   
+   /*===========================================*/
+   /* Verify the start and end index arguments. */
+   /*===========================================*/
+
+   if ((end < start) || (start < 1) || (end < 1) || // TBD Refactor
+       (((long long) ((size_t) start)) != start) ||
+       (((long long) ((size_t) end)) != end))
+     {
+      MVRangeError(theEnv,start,end,oldseg.range,"direct-slot-delete$");
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*============================================*/
+   /* Convert the indices to unsigned zero-based */
+   /* values including the begin value.          */
+   /*============================================*/
+   
+   rs = (size_t) start;
+   re = (size_t) end;
+   srcLen = oldseg.range;
+   
+   if ((rs > srcLen) || (re > srcLen))
+     {
+      MVRangeError(theEnv,start,end,oldseg.range,"direct-slot-delete$");
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+     
+   rs--;
+   re--;
+   rs += oldseg.begin;
+   re += oldseg.begin;
+
+   /*=================================================*/
+   /* Delete the section out of the multifield value. */
+   /*=================================================*/
+
+   dstLen = srcLen - (re - rs + 1); // TBD Refactor
+   newseg.begin = 0;
+   newseg.range = dstLen;
+   newseg.multifieldValue = CreateMultifield(theEnv,dstLen);
+
+   for (i = oldseg.begin, j = 0; i < (oldseg.begin + oldseg.range); i++)
+     {
+      if ((i >= rs) && (i <= re)) continue;
+      
+      newseg.multifieldValue->contents[j++].value = oldseg.multifieldValue->contents[i].value;
+     }
+ 
+   if (PutSlotValue(theEnv,ins,sp,&newseg,&oldseg,"function direct-slot-delete$") == PSE_NO_ERROR)
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/**********************************************************************
+  NAME         : CheckMultifieldSlotInstance
+  DESCRIPTION  : Gets the instance for the functions slot-replace$,
+                    insert and delete
+  INPUTS       : The function name
+  RETURNS      : The instance address, NULL on errors
+  SIDE EFFECTS : None
+  NOTES        : None
+ **********************************************************************/
+static Instance *CheckMultifieldSlotInstance(
+  UDFContext *context)
+  {
+   Instance *ins;
+   UDFValue temp;
+   Environment *theEnv = context->environment;
+
+   if (! UDFFirstArgument(context,INSTANCE_BITS | SYMBOL_BIT,&temp))
+     { return NULL; }
+
+   if (temp.header->type == INSTANCE_ADDRESS_TYPE)
+     {
+      ins = temp.instanceValue;
+      if (ins->garbage == 1)
+        {
+         StaleInstanceAddress(theEnv,UDFContextFunctionName(context),0);
+         SetEvaluationError(theEnv,true);
+         return NULL;
+        }
+     }
+   else
+     {
+      ins = FindInstanceBySymbol(theEnv,temp.lexemeValue);
+      if (ins == NULL)
+        NoInstanceError(theEnv,temp.lexemeValue->contents,UDFContextFunctionName(context));
+     }
+   return ins;
+  }
+
+/*********************************************************************
+  NAME         : CheckMultifieldSlotModify
+  DESCRIPTION  : For the functions slot-replace$, insert, & delete
+                    as well as direct-slot-replace$, insert, & delete
+                    this function gets the slot, index, and optional
+                    field-value for these functions
+  INPUTS       : 1) A code indicating the type of operation
+                      INSERT    (0) : Requires one index
+                      REPLACE   (1) : Requires two indices
+                      DELETE_OP (2) : Requires two indices
+                 2) Function name-string
+                 3) Instance address
+                 4) Argument expression chain
+                 5) Caller's buffer for index (or beginning of range)
+                 6) Caller's buffer for end of range
+                     (can be NULL for INSERT)
+                 7) Caller's new-field value buffer
+                     (can be NULL for DELETE_OP)
+  RETURNS      : The address of the instance-slot,
+                    NULL on errors
+  SIDE EFFECTS : Caller's index buffer set
+                 Caller's new-field value buffer set (if not NULL)
+                   Will allocate an ephemeral segment to store more
+                     than 1 new field value
+                 EvaluationError set on errors
+  NOTES        : Assume the argument chain is at least 2
+                   expressions deep - slot, index, and optional values
+ *********************************************************************/
+static InstanceSlot *CheckMultifieldSlotModify(
+  Environment *theEnv,
+  int code,
+  const char *func,
+  Instance *ins,
+  Expression *args,
+  long long *rb,
+  long long *re,
+  UDFValue *newval)
+  {
+   UDFValue temp;
+   InstanceSlot *sp;
+   unsigned int start;
+
+   start = (args == GetFirstArgument()) ? 1 : 2;
+   EvaluationData(theEnv)->EvaluationError = false;
+   EvaluateExpression(theEnv,args,&temp);
+   if (temp.header->type != SYMBOL_TYPE)
+     {
+      ExpectedTypeError1(theEnv,func,start,"symbol");
+      SetEvaluationError(theEnv,true);
+      return NULL;
+     }
+   sp = FindInstanceSlot(theEnv,ins,temp.lexemeValue);
+   if (sp == NULL)
+     {
+      SlotExistError(theEnv,temp.lexemeValue->contents,func);
+      return NULL;
+     }
+   if (sp->desc->multiple == 0)
+     {
+      PrintErrorID(theEnv,"INSMULT",1,false);
+      WriteString(theEnv,STDERR,"Function ");
+      WriteString(theEnv,STDERR,func);
+      WriteString(theEnv,STDERR," cannot be used on single-field slot '");
+      WriteString(theEnv,STDERR,sp->desc->slotName->name->contents);
+      WriteString(theEnv,STDERR,"' in instance [");
+      WriteString(theEnv,STDERR,ins->name->contents);
+      WriteString(theEnv,STDERR,"].\n");
+      SetEvaluationError(theEnv,true);
+      return NULL;
+     }
+   EvaluateExpression(theEnv,args->nextArg,&temp);
+   if (temp.header->type != INTEGER_TYPE)
+     {
+      ExpectedTypeError1(theEnv,func,start+1,"integer");
+      SetEvaluationError(theEnv,true);
+      return NULL;
+     }
+   args = args->nextArg->nextArg;
+   *rb = temp.integerValue->contents;
+   if ((code == REPLACE) || (code == DELETE_OP))
+     {
+      EvaluateExpression(theEnv,args,&temp);
+      if (temp.header->type != INTEGER_TYPE)
+        {
+         ExpectedTypeError1(theEnv,func,start+2,"integer");
+         SetEvaluationError(theEnv,true);
+         return NULL;
+        }
+      *re = temp.integerValue->contents;
+      args = args->nextArg;
+     }
+   if ((code == INSERT) || (code == REPLACE))
+     {
+      if (EvaluateAndStoreInDataObject(theEnv,1,args,newval,true) == false)
+        return NULL;
+     }
+   return(sp);
+  }
+
+/***************************************************
+  NAME         : AssignSlotToDataObject
+  DESCRIPTION  : Assigns the value of a multifield
+                 slot to a data object
+  INPUTS       : 1) The data object buffer
+                 2) The instance slot
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Data object fields set
+  NOTES        : Assumes slot is a multislot
+ ***************************************************/
+static void AssignSlotToDataObject(
+  UDFValue *theDataObject,
+  InstanceSlot *theSlot)
+  {
+   theDataObject->value = theSlot->value;
+   theDataObject->begin = 0;
+   theDataObject->range = theSlot->multifieldValue->length;
+  }
+
+#endif
diff --git a/clips/insmult.h b/clips/insmult.h
new file mode 100755
index 000000000..7eaa4950b
--- /dev/null
+++ b/clips/insmult.h
@@ -0,0 +1,62 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_insmult
+
+#pragma once
+
+#define _H_insmult
+
+#include "evaluatn.h"
+
+   void                           SetupInstanceMultifieldCommands(Environment *);
+   void                           MVSlotReplaceCommand(Environment *,UDFContext *,UDFValue *);
+   void                           MVSlotInsertCommand(Environment *,UDFContext *,UDFValue *);
+   void                           MVSlotDeleteCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DirectMVReplaceCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DirectMVInsertCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DirectMVDeleteCommand(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_insmult */
+
+
+
diff --git a/clips/inspsr.c b/clips/inspsr.c
new file mode 100755
index 000000000..b81acf7d7
--- /dev/null
+++ b/clips/inspsr.c
@@ -0,0 +1,590 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*               INSTANCE PARSER MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  Instance Function Parsing Routines              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed ParseSlotOverrides memory release issue. */
+/*                                                           */
+/*            It's now possible to create an instance of a   */
+/*            class that's not in scope if the module name   */
+/*            is specified.                                  */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include <stdio.h>
+#include <string.h>
+
+#include "classcom.h"
+#include "classfun.h"
+#include "classinf.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "exprnpsr.h"
+#include "moduldef.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "inspsr.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define MAKE_TYPE       0
+#define INITIALIZE_TYPE 1
+#define MODIFY_TYPE     2
+#define DUPLICATE_TYPE  3
+
+#define CLASS_RLN          "of"
+#define DUPLICATE_NAME_REF "to"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    ReplaceClassNameWithReference(Environment *,Expression *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*************************************************************************************
+  NAME         : ParseInitializeInstance
+  DESCRIPTION  : Parses initialize-instance and make-instance function
+                   calls into an Expression form that
+                   can later be evaluated with EvaluateExpression(theEnv,)
+  INPUTS       : 1) The address of the top node of the expression
+                    containing the initialize-instance function call
+                 2) The logical name of the input source
+  RETURNS      : The address of the modified expression, or NULL
+                    if there is an error
+  SIDE EFFECTS : The expression is enhanced to include all
+                    aspects of the initialize-instance call
+                    (slot-overrides etc.)
+                 The "top" expression is deleted on errors.
+  NOTES        : This function parses a initialize-instance call into
+                 an expression of the following form :
+
+                 (initialize-instance <instance-name> <slot-override>*)
+                  where <slot-override> ::= (<slot-name> <expression>+)
+
+                  goes to -->
+
+                  initialize-instance
+                      |
+                      V
+                  <instance or name>-><slot-name>-><dummy-node>...
+                                                      |
+                                                      V
+                                               <value-expression>...
+
+                  (make-instance <instance> of <class> <slot-override>*)
+                  goes to -->
+
+                  make-instance
+                      |
+                      V
+                  <instance-name>-><class-name>-><slot-name>-><dummy-node>...
+                                                                 |
+                                                                 V
+                                                          <value-expression>...
+
+                  (make-instance of <class> <slot-override>*)
+                  goes to -->
+
+                  make-instance
+                      |
+                      V
+                  (gensym*)-><class-name>-><slot-name>-><dummy-node>...
+                                                                 |
+                                                                 V
+                                                          <value-expression>...
+
+                  (modify-instance <instance> <slot-override>*)
+                  goes to -->
+
+                  modify-instance
+                      |
+                      V
+                  <instance or name>-><slot-name>-><dummy-node>...
+                                                      |
+                                                      V
+                                               <value-expression>...
+
+                  (duplicate-instance <instance> [to <new-name>] <slot-override>*)
+                  goes to -->
+
+                  duplicate-instance
+                      |
+                      V
+                  <instance or name>-><new-name>-><slot-name>-><dummy-node>...
+                                          OR                         |
+                                      (gensym*)                      V
+                                                           <value-expression>...
+
+ *************************************************************************************/
+Expression *ParseInitializeInstance(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource)
+  {
+   bool error;
+   int fcalltype;
+   bool readclass;
+
+   if ((top->value == FindFunction(theEnv,"make-instance")) ||
+       (top->value == FindFunction(theEnv,"active-make-instance")))
+     fcalltype = MAKE_TYPE;
+   else if ((top->value == FindFunction(theEnv,"initialize-instance")) ||
+            (top->value == FindFunction(theEnv,"active-initialize-instance")))
+     fcalltype = INITIALIZE_TYPE;
+   else if ((top->value == FindFunction(theEnv,"modify-instance")) ||
+            (top->value == FindFunction(theEnv,"active-modify-instance")) ||
+            (top->value == FindFunction(theEnv,"message-modify-instance")) ||
+            (top->value == FindFunction(theEnv,"active-message-modify-instance")))
+     fcalltype = MODIFY_TYPE;
+   else
+     fcalltype = DUPLICATE_TYPE;
+   IncrementIndentDepth(theEnv,3);
+   error = false;
+   if (top->type == UNKNOWN_VALUE)
+     top->type = FCALL;
+   else
+     SavePPBuffer(theEnv," ");
+   top->argList = ArgumentParse(theEnv,readSource,&error);
+   if (error)
+     goto ParseInitializeInstanceError;
+   else if (top->argList == NULL)
+     {
+      SyntaxErrorMessage(theEnv,"instance");
+      goto ParseInitializeInstanceError;
+     }
+   SavePPBuffer(theEnv," ");
+
+   if (fcalltype == MAKE_TYPE)
+     {
+      /* ======================================
+         Handle the case of anonymous instances
+         where the name was not specified
+         ====================================== */
+      if ((top->argList->type != SYMBOL_TYPE) ? false :
+          (strcmp(top->argList->lexemeValue->contents,CLASS_RLN) == 0))
+        {
+         top->argList->nextArg = ArgumentParse(theEnv,readSource,&error);
+         if (error == true)
+           goto ParseInitializeInstanceError;
+         if (top->argList->nextArg == NULL)
+           {
+            SyntaxErrorMessage(theEnv,"instance class");
+            goto ParseInitializeInstanceError;
+           }
+         if ((top->argList->nextArg->type != SYMBOL_TYPE) ? true :
+             (strcmp(top->argList->nextArg->lexemeValue->contents,CLASS_RLN) != 0))
+           {
+            top->argList->type = FCALL;
+            top->argList->value = FindFunction(theEnv,"gensym*");
+            readclass = false;
+           }
+         else
+           readclass = true;
+        }
+      else
+        {
+         GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+         if ((DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN) ? true :
+             (strcmp(CLASS_RLN,DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents) != 0))
+           {
+            SyntaxErrorMessage(theEnv,"make-instance");
+            goto ParseInitializeInstanceError;
+           }
+         SavePPBuffer(theEnv," ");
+         readclass = true;
+        }
+      if (readclass)
+        {
+         top->argList->nextArg = ArgumentParse(theEnv,readSource,&error);
+         if (error)
+           goto ParseInitializeInstanceError;
+         if (top->argList->nextArg == NULL)
+           {
+            SyntaxErrorMessage(theEnv,"instance class");
+            goto ParseInitializeInstanceError;
+           }
+        }
+
+      /* ==============================================
+         If the class name is a constant, go ahead and
+         look it up now and replace it with the pointer
+         ============================================== */
+      if (ReplaceClassNameWithReference(theEnv,top->argList->nextArg) == false)
+        goto ParseInitializeInstanceError;
+
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      top->argList->nextArg->nextArg =
+                  ParseSlotOverrides(theEnv,readSource,&error);
+     }
+   else
+     {
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      if (fcalltype == DUPLICATE_TYPE)
+        {
+         if ((DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN) ? false :
+             (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,DUPLICATE_NAME_REF) == 0))
+           {
+            PPBackup(theEnv);
+            PPBackup(theEnv);
+            SavePPBuffer(theEnv,DefclassData(theEnv)->ObjectParseToken.printForm);
+            SavePPBuffer(theEnv," ");
+            top->argList->nextArg = ArgumentParse(theEnv,readSource,&error);
+            if (error)
+              goto ParseInitializeInstanceError;
+            if (top->argList->nextArg == NULL)
+              {
+               SyntaxErrorMessage(theEnv,"instance name");
+               goto ParseInitializeInstanceError;
+              }
+            PPCRAndIndent(theEnv);
+            GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+           }
+         else
+           top->argList->nextArg = GenConstant(theEnv,FCALL,FindFunction(theEnv,"gensym*"));
+         top->argList->nextArg->nextArg = ParseSlotOverrides(theEnv,readSource,&error);
+        }
+      else
+        top->argList->nextArg = ParseSlotOverrides(theEnv,readSource,&error);
+     }
+   if (error)
+      goto ParseInitializeInstanceError;
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"slot-override");
+      goto ParseInitializeInstanceError;
+     }
+   DecrementIndentDepth(theEnv,3);
+   return(top);
+
+ParseInitializeInstanceError:
+   SetEvaluationError(theEnv,true);
+   ReturnExpression(theEnv,top);
+   DecrementIndentDepth(theEnv,3);
+   return NULL;
+  }
+
+/********************************************************************************
+  NAME         : ParseSlotOverrides
+  DESCRIPTION  : Forms expressions for slot-overrides
+  INPUTS       : 1) The logical name of the input
+                 2) Caller's buffer for error flkag
+  RETURNS      : Address override expressions, NULL
+                   if none or error.
+  SIDE EFFECTS : Slot-expression built
+                 Caller's error flag set
+  NOTES        : <slot-override> ::= (<slot-name> <value>*)*
+
+                 goes to
+
+                 <slot-name> --> <dummy-node> --> <slot-name> --> <dummy-node>...
+                                       |
+                                       V
+                               <value-expression> --> <value-expression> --> ...
+
+                 Assumes first token has already been scanned
+ ********************************************************************************/
+Expression *ParseSlotOverrides(
+  Environment *theEnv,
+  const char *readSource,
+  bool *error)
+  {
+   Expression *top = NULL,*bot = NULL,*theExp;
+   Expression *theExpNext;
+
+   while (DefclassData(theEnv)->ObjectParseToken.tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      *error = false;
+      theExp = ArgumentParse(theEnv,readSource,error);
+      if (*error == true)
+        {
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+      else if (theExp == NULL)
+        {
+         SyntaxErrorMessage(theEnv,"slot-override");
+         *error = true;
+         ReturnExpression(theEnv,top);
+         SetEvaluationError(theEnv,true);
+         return NULL;
+        }
+      theExpNext = GenConstant(theEnv,SYMBOL_TYPE,TrueSymbol(theEnv));
+      if (CollectArguments(theEnv,theExpNext,readSource) == NULL)
+        {
+         *error = true;
+         ReturnExpression(theEnv,top);
+         ReturnExpression(theEnv,theExp);
+         return NULL;
+        }
+      theExp->nextArg = theExpNext;
+      if (top == NULL)
+        top = theExp;
+      else
+        bot->nextArg = theExp;
+      bot = theExp->nextArg;
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+     }
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,DefclassData(theEnv)->ObjectParseToken.printForm);
+   return(top);
+  }
+
+/****************************************************************************
+  NAME         : ParseSimpleInstance
+  DESCRIPTION  : Parses instances from file for load-instances
+                   into an Expression forms that
+                   can later be evaluated with EvaluateExpression(theEnv,)
+  INPUTS       : 1) The address of the top node of the expression
+                    containing the make-instance function call
+                 2) The logical name of the input source
+  RETURNS      : The address of the modified expression, or NULL
+                    if there is an error
+  SIDE EFFECTS : The expression is enhanced to include all
+                    aspects of the make-instance call
+                    (slot-overrides etc.)
+                 The "top" expression is deleted on errors.
+  NOTES        : The name, class, values etc. must be constants.
+
+                 This function parses a make-instance call into
+                 an expression of the following form :
+
+                  (make-instance <instance> of <class> <slot-override>*)
+                  where <slot-override> ::= (<slot-name> <expression>+)
+
+                  goes to -->
+
+                  make-instance
+                      |
+                      V
+                  <instance-name>-><class-name>-><slot-name>-><dummy-node>...
+                                                                 |
+                                                                 V
+                                                          <value-expression>...
+
+ ****************************************************************************/
+Expression *ParseSimpleInstance(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource)
+  {
+   Expression *theExp,*vals = NULL,*vbot,*tval;
+   TokenType type;
+
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   if ((DefclassData(theEnv)->ObjectParseToken.tknType != INSTANCE_NAME_TOKEN) &&
+       (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN))
+     goto MakeInstanceError;
+
+   if ((DefclassData(theEnv)->ObjectParseToken.tknType == SYMBOL_TOKEN) &&
+       (strcmp(CLASS_RLN,DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents) == 0))
+     {
+      top->argList = GenConstant(theEnv,FCALL,
+                                 (void *) FindFunction(theEnv,"gensym*"));
+     }
+   else
+     {
+      top->argList = GenConstant(theEnv,INSTANCE_NAME_TYPE,
+                                 DefclassData(theEnv)->ObjectParseToken.value);
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      if ((DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN) ? true :
+          (strcmp(CLASS_RLN,DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents) != 0))
+        goto MakeInstanceError;
+     }
+
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+     goto MakeInstanceError;
+   top->argList->nextArg =
+        GenConstant(theEnv,SYMBOL_TYPE,DefclassData(theEnv)->ObjectParseToken.value);
+   theExp = top->argList->nextArg;
+   if (ReplaceClassNameWithReference(theEnv,theExp) == false)
+     goto MakeInstanceError;
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   while (DefclassData(theEnv)->ObjectParseToken.tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+        goto SlotOverrideError;
+      theExp->nextArg = GenConstant(theEnv,SYMBOL_TYPE,DefclassData(theEnv)->ObjectParseToken.value);
+      theExp->nextArg->nextArg = GenConstant(theEnv,SYMBOL_TYPE,TrueSymbol(theEnv));
+      theExp = theExp->nextArg->nextArg;
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      vbot = NULL;
+      while (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         type = DefclassData(theEnv)->ObjectParseToken.tknType;
+         if (type == LEFT_PARENTHESIS_TOKEN)
+           {
+            GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+            if ((DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN) ? true :
+                (strcmp(DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents,"create$") != 0))
+              goto SlotOverrideError;
+            GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+            if (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+              goto SlotOverrideError;
+            tval = GenConstant(theEnv,FCALL,FindFunction(theEnv,"create$"));
+           }
+         else
+           {
+            if ((type != SYMBOL_TOKEN) && (type != STRING_TOKEN) &&
+                (type != FLOAT_TOKEN) && (type != INTEGER_TOKEN) && (type != INSTANCE_NAME_TOKEN))
+              goto SlotOverrideError;
+            tval = GenConstant(theEnv,TokenTypeToType(type),DefclassData(theEnv)->ObjectParseToken.value);
+           }
+         if (vals == NULL)
+           vals = tval;
+         else
+           vbot->nextArg = tval;
+         vbot = tval;
+         GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+        }
+      theExp->argList = vals;
+      GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+      vals = NULL;
+     }
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     goto SlotOverrideError;
+   return(top);
+
+MakeInstanceError:
+   SyntaxErrorMessage(theEnv,"make-instance");
+   SetEvaluationError(theEnv,true);
+   ReturnExpression(theEnv,top);
+   return NULL;
+
+SlotOverrideError:
+   SyntaxErrorMessage(theEnv,"slot-override");
+   SetEvaluationError(theEnv,true);
+   ReturnExpression(theEnv,top);
+   ReturnExpression(theEnv,vals);
+   return NULL;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : ReplaceClassNameWithReference
+  DESCRIPTION  : In parsing a make instance call,
+                 this function replaces a constant
+                 class name with an actual pointer
+                 to the class
+  INPUTS       : The expression
+  RETURNS      : True if all OK, false
+                 if class cannot be found
+  SIDE EFFECTS : The expression type and value are
+                 modified if class is found
+  NOTES        : Searches current nd imported
+                 modules for reference
+  CHANGES      : It's now possible to create an instance of a
+                 class that's not in scope if the module name
+                 is specified.
+ ***************************************************/
+static bool ReplaceClassNameWithReference(
+  Environment *theEnv,
+  Expression *theExp)
+  {
+   const char *theClassName;
+   Defclass *theDefclass;
+
+   if (theExp->type == SYMBOL_TYPE)
+     {
+      theClassName = theExp->lexemeValue->contents;
+      //theDefclass = (void *) LookupDefclassInScope(theEnv,theClassName);
+      theDefclass = LookupDefclassByMdlOrScope(theEnv,theClassName); // Module or scope is now allowed
+      if (theDefclass == NULL)
+        {
+         CantFindItemErrorMessage(theEnv,"class",theClassName,true);
+         return false;
+        }
+      if (ClassAbstractP(theDefclass))
+        {
+         PrintErrorID(theEnv,"INSMNGR",3,false);
+         WriteString(theEnv,STDERR,"Cannot create instances of abstract class '");
+         WriteString(theEnv,STDERR,theClassName);
+         WriteString(theEnv,STDERR,"'.\n");
+         return false;
+        }
+      theExp->type = DEFCLASS_PTR;
+      theExp->value = theDefclass;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      if (! ConstructData(theEnv)->ParsingConstruct)
+        { ConstructData(theEnv)->DanglingConstructs++; }
+#endif
+     }
+   return true;
+  }
+
+#endif
+
+
+
diff --git a/clips/inspsr.h b/clips/inspsr.h
new file mode 100755
index 000000000..17a2902a5
--- /dev/null
+++ b/clips/inspsr.h
@@ -0,0 +1,60 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed ParseSlotOverrides memory release issue. */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_inspsr
+
+#pragma once
+
+#define _H_inspsr
+
+#include "expressn.h"
+
+   Expression                    *ParseInitializeInstance(Environment *,Expression *,const char *);
+   Expression                    *ParseSlotOverrides(Environment *,const char *,bool *);
+   Expression                    *ParseSimpleInstance(Environment *,Expression *,const char *);
+
+#endif /* _H_inspsr */
+
+
+
diff --git a/clips/insquery.c b/clips/insquery.c
new file mode 100755
index 000000000..39ed785eb
--- /dev/null
+++ b/clips/insquery.c
@@ -0,0 +1,1275 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  09/28/17             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Query Functions for Objects                      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Retrieval for instance query slot function     */
+/*            generates an error if the instance has been    */
+/*            deleted.                                       */
+/*                                                           */
+/*            Functions delayed-do-for-all-instances and     */
+/*            do-for-instance increment the busy count of    */
+/*            matching instance sets so that actions can     */
+/*            detect deleted instances.                      */
+/*                                                           */
+/*            Matching instance sets containing deleted      */
+/*            instances are pruned.                          */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if INSTANCE_SET_QUERIES
+
+#include "argacces.h"
+#include "classcom.h"
+#include "classfun.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "insfun.h"
+#include "insmngr.h"
+#include "insqypsr.h"
+#include "memalloc.h"
+#include "prcdrfun.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+
+#include "insquery.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    PushQueryCore(Environment *);
+   static void                    PopQueryCore(Environment *);
+   static QUERY_CORE             *FindQueryCore(Environment *,long long);
+   static QUERY_CLASS            *DetermineQueryClasses(Environment *,Expression *,const char *,unsigned *);
+   static QUERY_CLASS            *FormChain(Environment *,const char *,Defclass *,UDFValue *);
+   static void                    DeleteQueryClasses(Environment *,QUERY_CLASS *);
+   static bool                    TestForFirstInChain(Environment *,QUERY_CLASS *,unsigned);
+   static bool                    TestForFirstInstanceInClass(Environment *,Defmodule *,int,Defclass *,QUERY_CLASS *,unsigned);
+   static void                    TestEntireChain(Environment *,QUERY_CLASS *,unsigned);
+   static void                    TestEntireClass(Environment *,Defmodule *,int,Defclass *,QUERY_CLASS *,unsigned);
+   static void                    AddSolution(Environment *);
+   static void                    PopQuerySoln(Environment *);
+
+/****************************************************
+  NAME         : SetupQuery
+  DESCRIPTION  : Initializes instance query H/L
+                   functions and parsers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Sets up kernel functions and parsers
+  NOTES        : None
+ ****************************************************/
+void SetupQuery(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,INSTANCE_QUERY_DATA,sizeof(struct instanceQueryData),NULL);
+
+#if ! RUN_TIME
+   InstanceQueryData(theEnv)->QUERY_DELIMITER_SYMBOL = CreateSymbol(theEnv,QUERY_DELIMITER_STRING);
+   IncrementLexemeCount(InstanceQueryData(theEnv)->QUERY_DELIMITER_SYMBOL);
+
+   AddUDF(theEnv,"(query-instance)","n",0,UNBOUNDED,NULL,GetQueryInstance,"GetQueryInstance",NULL);
+
+   AddUDF(theEnv,"(query-instance-slot)","*",0,UNBOUNDED,NULL,GetQueryInstanceSlot,"GetQueryInstanceSlot",NULL);
+
+   AddUDF(theEnv,"any-instancep","b",0,UNBOUNDED,NULL,AnyInstances,"AnyInstances",NULL);
+
+   AddUDF(theEnv,"find-instance","m",0,UNBOUNDED,NULL,QueryFindInstance,"QueryFindInstance",NULL);
+
+   AddUDF(theEnv,"find-all-instances","m",0,UNBOUNDED,NULL,QueryFindAllInstances,"QueryFindAllInstances",NULL);
+
+   AddUDF(theEnv,"do-for-instance","*",0,UNBOUNDED,NULL,QueryDoForInstance,"QueryDoForInstance",NULL);
+
+   AddUDF(theEnv,"do-for-all-instances","*",0,UNBOUNDED,NULL,QueryDoForAllInstances,"QueryDoForAllInstances",NULL);
+
+   AddUDF(theEnv,"delayed-do-for-all-instances","*",0,UNBOUNDED,NULL,DelayedQueryDoForAllInstances,"DelayedQueryDoForAllInstances",NULL);
+#endif
+
+   AddFunctionParser(theEnv,"any-instancep",ParseQueryNoAction);
+   AddFunctionParser(theEnv,"find-instance",ParseQueryNoAction);
+   AddFunctionParser(theEnv,"find-all-instances",ParseQueryNoAction);
+   AddFunctionParser(theEnv,"do-for-instance",ParseQueryAction);
+   AddFunctionParser(theEnv,"do-for-all-instances",ParseQueryAction);
+   AddFunctionParser(theEnv,"delayed-do-for-all-instances",ParseQueryAction);
+  }
+
+/*************************************************************
+  NAME         : GetQueryInstance
+  DESCRIPTION  : Internal function for referring to instance
+                    array on instance-queries
+  INPUTS       : None
+  RETURNS      : The name of the specified instance-set member
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax : ((query-instance) <index>)
+ *************************************************************/
+void GetQueryInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_CORE *core;
+
+   core = FindQueryCore(theEnv,GetFirstArgument()->integerValue->contents);
+   returnValue->value = GetFullInstanceName(theEnv,core->solns[GetFirstArgument()->nextArg->integerValue->contents]);
+  }
+
+/***************************************************************************
+  NAME         : GetQueryInstanceSlot
+  DESCRIPTION  : Internal function for referring to slots of instances in
+                    instance array on instance-queries
+  INPUTS       : The caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Caller's result buffer set appropriately
+  NOTES        : H/L Syntax : ((query-instance-slot) <index> <slot-name>)
+ **************************************************************************/
+void GetQueryInstanceSlot(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Instance *ins;
+   InstanceSlot *sp;
+   UDFValue temp;
+   QUERY_CORE *core;
+   const char *varSlot;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   core = FindQueryCore(theEnv,GetFirstArgument()->integerValue->contents);
+   ins = core->solns[GetFirstArgument()->nextArg->integerValue->contents];
+   varSlot = GetFirstArgument()->nextArg->nextArg->nextArg->lexemeValue->contents;
+
+   /*=======================================*/
+   /* Accessing the slot value of a deleted */
+   /* instance generates an error.          */
+   /*=======================================*/
+
+   if (ins->garbage)
+     {
+      InstanceVarSlotErrorMessage1(theEnv,ins,varSlot);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   
+   EvaluateExpression(theEnv,GetFirstArgument()->nextArg->nextArg,&temp);
+   if (temp.header->type != SYMBOL_TYPE)
+     {
+      InvalidVarSlotErrorMessage(theEnv,varSlot);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   sp = FindInstanceSlot(theEnv,ins,temp.lexemeValue);
+   if (sp == NULL)
+     {
+      InstanceVarSlotErrorMessage2(theEnv,ins,varSlot);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   returnValue->value = sp->value;
+   if (sp->type == MULTIFIELD_TYPE)
+     {
+      returnValue->begin = 0;
+      returnValue->range = sp->multifieldValue->length;
+     }
+  }
+
+/* =============================================================================
+   =============================================================================
+   Following are the instance query functions :
+
+     any-instancep         : Determines if any instances satisfy the query
+     find-instance         : Finds first (set of) instance(s) which satisfies
+                               the query and stores it in a multi-field
+     find-all-instances    : Finds all (sets of) instances which satisfy the
+                               the query and stores them in a multi-field
+     do-for-instance       : Executes a given action for the first (set of)
+                               instance(s) which satisfy the query
+     do-for-all-instances  : Executes an action for all instances which satisfy
+                               the query as they are found
+     delayed-do-for-all-instances : Same as above - except that the list of instances
+                               which satisfy the query is formed before any
+                               actions are executed
+
+     Instance candidate search algorithm :
+
+     All permutations of first restriction class instances with other
+       restriction class instances (Rightmost are varied first)
+     All permutations of first restriction class's subclasses' instances with
+       other restriction class instances.
+     And  so on...
+
+     For any one class, instances are examined in the order they were defined
+
+     Example :
+     (defclass a (is-a standard-user))
+     (defclass b (is-a standard-user))
+     (defclass c (is-a standard-user))
+     (defclass d (is-a a b))
+     (make-instance a1 of a)
+     (make-instance a2 of a)
+     (make-instance b1 of b)
+     (make-instance b2 of b)
+     (make-instance c1 of c)
+     (make-instance c2 of c)
+     (make-instance d1 of d)
+     (make-instance d2 of d)
+
+     (any-instancep ((?a a b) (?b c)) <query>)
+
+     The permutations (?a ?b) would be examined in the following order :
+
+     (a1 c1),(a1 c2),(a2 c1),(a2 c2),(d1 c1),(d1 c2),(d2 c1),(d2 c2),
+     (b1 c1),(b1 c2),(b2 c1),(b2 c2),(d1 c1),(d1 c2),(d2 c1),(d2 c2)
+
+     Notice the duplication because d is a subclass of both and a and b.
+   =============================================================================
+   ============================================================================= */
+
+/******************************************************************************
+  NAME         : AnyInstances
+  DESCRIPTION  : Determines if there any existing instances which satisfy
+                   the query
+  INPUTS       : None
+  RETURNS      : True if the query is satisfied, false otherwise
+  SIDE EFFECTS : The query class-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   zero or more times (depending on instance restrictions
+                   and how early the expression evaulates to true - if at all).
+  NOTES        : H/L Syntax : See ParseQueryNoAction()
+ ******************************************************************************/
+void AnyInstances(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_CLASS *qclasses;
+   unsigned rcnt;
+   bool testResult;
+
+   qclasses = DetermineQueryClasses(theEnv,GetFirstArgument()->nextArg,
+                                      "any-instancep",&rcnt);
+   if (qclasses == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   PushQueryCore(theEnv);
+   InstanceQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   InstanceQueryData(theEnv)->QueryCore->solns = (Instance **) gm2(theEnv,(sizeof(Instance *) * rcnt));
+   InstanceQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   testResult = TestForFirstInChain(theEnv,qclasses,0);
+   InstanceQueryData(theEnv)->AbortQuery = false;
+   rm(theEnv,InstanceQueryData(theEnv)->QueryCore->solns,(sizeof(Instance *) * rcnt));
+   rtn_struct(theEnv,query_core,InstanceQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryClasses(theEnv,qclasses);
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,testResult);
+  }
+
+/******************************************************************************
+  NAME         : QueryFindInstance
+  DESCRIPTION  : Finds the first set of instances which satisfy the query and
+                   stores their names in the user's multi-field variable
+  INPUTS       : Caller's result buffer
+  RETURNS      : True if the query is satisfied, false otherwise
+  SIDE EFFECTS : The query class-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   zero or more times (depending on instance restrictions
+                   and how early the expression evaulates to true - if at all).
+  NOTES        : H/L Syntax : See ParseQueryNoAction()
+ ******************************************************************************/
+void QueryFindInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_CLASS *qclasses;
+   unsigned rcnt,i;
+
+   returnValue->begin = 0;
+   returnValue->range = 0;
+   qclasses = DetermineQueryClasses(theEnv,GetFirstArgument()->nextArg,
+                                      "find-instance",&rcnt);
+   if (qclasses == NULL)
+     {
+      returnValue->value = CreateMultifield(theEnv,0L);
+      return;
+     }
+   PushQueryCore(theEnv);
+   InstanceQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   InstanceQueryData(theEnv)->QueryCore->solns = (Instance **)
+                      gm2(theEnv,(sizeof(Instance *) * rcnt));
+   InstanceQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   if (TestForFirstInChain(theEnv,qclasses,0) == true)
+     {
+      returnValue->value = CreateMultifield(theEnv,rcnt);
+      returnValue->range = rcnt;
+      for (i = 0 ; i < rcnt ; i++)
+        {
+         returnValue->multifieldValue->contents[i].lexemeValue =
+            GetFullInstanceName(theEnv,InstanceQueryData(theEnv)->QueryCore->solns[i]);
+        }
+     }
+   else
+      returnValue->value = CreateMultifield(theEnv,0L);
+   InstanceQueryData(theEnv)->AbortQuery = false;
+   rm(theEnv,InstanceQueryData(theEnv)->QueryCore->solns,(sizeof(Instance *) * rcnt));
+   rtn_struct(theEnv,query_core,InstanceQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryClasses(theEnv,qclasses);
+  }
+
+/******************************************************************************
+  NAME         : QueryFindAllInstances
+  DESCRIPTION  : Finds all sets of instances which satisfy the query and
+                   stores their names in the user's multi-field variable
+
+                 The sets are stored sequentially :
+
+                   Number of sets = (Multi-field length) / (Set length)
+
+                 The first set is if the first (set length) atoms of the
+                   multi-field variable, and so on.
+  INPUTS       : Caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The query class-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   once for every instance set.
+  NOTES        : H/L Syntax : See ParseQueryNoAction()
+ ******************************************************************************/
+void QueryFindAllInstances(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_CLASS *qclasses;
+   unsigned rcnt;
+   size_t i, j;
+
+   returnValue->begin = 0;
+   returnValue->range = 0;
+   qclasses = DetermineQueryClasses(theEnv,GetFirstArgument()->nextArg,
+                                      "find-all-instances",&rcnt);
+   if (qclasses == NULL)
+     {
+      returnValue->value = CreateMultifield(theEnv,0L);
+      return;
+     }
+   PushQueryCore(theEnv);
+   InstanceQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   InstanceQueryData(theEnv)->QueryCore->solns = (Instance **) gm2(theEnv,(sizeof(Instance *) * rcnt));
+   InstanceQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   InstanceQueryData(theEnv)->QueryCore->action = NULL;
+   InstanceQueryData(theEnv)->QueryCore->soln_set = NULL;
+   InstanceQueryData(theEnv)->QueryCore->soln_size = rcnt;
+   InstanceQueryData(theEnv)->QueryCore->soln_cnt = 0;
+   TestEntireChain(theEnv,qclasses,0);
+   InstanceQueryData(theEnv)->AbortQuery = false;
+   returnValue->value = CreateMultifield(theEnv,InstanceQueryData(theEnv)->QueryCore->soln_cnt * rcnt);
+   while (InstanceQueryData(theEnv)->QueryCore->soln_set != NULL)
+     {
+      for (i = 0 , j = returnValue->range ; i < rcnt ; i++ , j++)
+        {
+         returnValue->multifieldValue->contents[j].lexemeValue =
+            GetFullInstanceName(theEnv,InstanceQueryData(theEnv)->QueryCore->soln_set->soln[i]);
+        }
+      returnValue->range = j;
+      PopQuerySoln(theEnv);
+     }
+   rm(theEnv,InstanceQueryData(theEnv)->QueryCore->solns,(sizeof(Instance *) * rcnt));
+   rtn_struct(theEnv,query_core,InstanceQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryClasses(theEnv,qclasses);
+  }
+
+/******************************************************************************
+  NAME         : QueryDoForInstance
+  DESCRIPTION  : Finds the first set of instances which satisfy the query and
+                   executes a user-action with that set
+  INPUTS       : None
+  RETURNS      : Caller's result buffer
+  SIDE EFFECTS : The query class-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   zero or more times (depending on instance restrictions
+                   and how early the expression evaulates to true - if at all).
+                   Also the action expression is executed zero or once.
+                 Caller's result buffer holds result of user-action
+  NOTES        : H/L Syntax : See ParseQueryAction()
+ ******************************************************************************/
+void QueryDoForInstance(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_CLASS *qclasses;
+   unsigned i, rcnt;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   qclasses = DetermineQueryClasses(theEnv,GetFirstArgument()->nextArg->nextArg,
+                                      "do-for-instance",&rcnt);
+   if (qclasses == NULL)
+     return;
+   PushQueryCore(theEnv);
+   InstanceQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   InstanceQueryData(theEnv)->QueryCore->solns = (Instance **) gm2(theEnv,(sizeof(Instance *) * rcnt));
+   InstanceQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   InstanceQueryData(theEnv)->QueryCore->action = GetFirstArgument()->nextArg;
+   
+   if (TestForFirstInChain(theEnv,qclasses,0) == true)
+     {
+      for (i = 0; i < rcnt; i++)
+        { InstanceQueryData(theEnv)->QueryCore->solns[i]->busy++; }
+
+      EvaluateExpression(theEnv,InstanceQueryData(theEnv)->QueryCore->action,returnValue);
+      
+      for (i = 0; i < rcnt; i++)
+        { InstanceQueryData(theEnv)->QueryCore->solns[i]->busy--; }
+     }
+     
+   InstanceQueryData(theEnv)->AbortQuery = false;
+   ProcedureFunctionData(theEnv)->BreakFlag = false;
+   rm(theEnv,InstanceQueryData(theEnv)->QueryCore->solns,(sizeof(Instance *) * rcnt));
+   rtn_struct(theEnv,query_core,InstanceQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryClasses(theEnv,qclasses);
+  }
+
+/******************************************************************************
+  NAME         : QueryDoForAllInstances
+  DESCRIPTION  : Finds all sets of instances which satisfy the query and
+                   executes a user-function for each set as it is found
+  INPUTS       : Caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The query class-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   once for every instance set.  Also, the action is
+                   executed for every instance set.
+                 Caller's result buffer holds result of last action executed.
+  NOTES        : H/L Syntax : See ParseQueryAction()
+ ******************************************************************************/
+void QueryDoForAllInstances(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_CLASS *qclasses;
+   unsigned rcnt;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   qclasses = DetermineQueryClasses(theEnv,GetFirstArgument()->nextArg->nextArg,
+                                      "do-for-all-instances",&rcnt);
+   if (qclasses == NULL)
+     return;
+
+   PushQueryCore(theEnv);
+   InstanceQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   InstanceQueryData(theEnv)->QueryCore->solns = (Instance **) gm2(theEnv,(sizeof(Instance *) * rcnt));
+   InstanceQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   InstanceQueryData(theEnv)->QueryCore->action = GetFirstArgument()->nextArg;
+   InstanceQueryData(theEnv)->QueryCore->result = returnValue;
+   RetainUDFV(theEnv,InstanceQueryData(theEnv)->QueryCore->result);
+   TestEntireChain(theEnv,qclasses,0);
+   ReleaseUDFV(theEnv,InstanceQueryData(theEnv)->QueryCore->result);
+
+   InstanceQueryData(theEnv)->AbortQuery = false;
+   ProcedureFunctionData(theEnv)->BreakFlag = false;
+   rm(theEnv,InstanceQueryData(theEnv)->QueryCore->solns,(sizeof(Instance *) * rcnt));
+   rtn_struct(theEnv,query_core,InstanceQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryClasses(theEnv,qclasses);
+  }
+
+/******************************************************************************
+  NAME         : DelayedQueryDoForAllInstances
+  DESCRIPTION  : Finds all sets of instances which satisfy the query and
+                   and exceutes a user-action for each set
+
+                 This function differs from QueryDoForAllInstances() in
+                   that it forms the complete list of query satisfactions
+                   BEFORE executing any actions.
+  INPUTS       : Caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The query class-expressions are evaluated once,
+                   and the query boolean-expression is evaluated
+                   once for every instance set.  The action is executed
+                   for evry query satisfaction.
+                 Caller's result buffer holds result of last action executed.
+  NOTES        : H/L Syntax : See ParseQueryNoAction()
+ ******************************************************************************/
+void DelayedQueryDoForAllInstances(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   QUERY_CLASS *qclasses;
+   unsigned rcnt;
+   unsigned i;
+   GCBlock gcb;
+   QUERY_SOLN *theSet;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   qclasses = DetermineQueryClasses(theEnv,GetFirstArgument()->nextArg->nextArg,
+                                      "delayed-do-for-all-instances",&rcnt);
+   if (qclasses == NULL)
+     return;
+
+   PushQueryCore(theEnv);
+   InstanceQueryData(theEnv)->QueryCore = get_struct(theEnv,query_core);
+   InstanceQueryData(theEnv)->QueryCore->solns = (Instance **) gm2(theEnv,(sizeof(Instance *) * rcnt));
+   InstanceQueryData(theEnv)->QueryCore->query = GetFirstArgument();
+   InstanceQueryData(theEnv)->QueryCore->action = NULL;
+   InstanceQueryData(theEnv)->QueryCore->soln_set = NULL;
+   InstanceQueryData(theEnv)->QueryCore->soln_size = rcnt;
+   InstanceQueryData(theEnv)->QueryCore->soln_cnt = 0;
+   TestEntireChain(theEnv,qclasses,0);
+   InstanceQueryData(theEnv)->AbortQuery = false;
+   InstanceQueryData(theEnv)->QueryCore->action = GetFirstArgument()->nextArg;
+
+   /*==================================================================*/
+   /* Increment the busy count for all instances in the solution sets. */
+   /*==================================================================*/
+
+   GCBlockStart(theEnv,&gcb);
+
+   for (theSet = InstanceQueryData(theEnv)->QueryCore->soln_set;
+        theSet != NULL;
+        theSet = theSet->nxt)
+     {
+      for (i = 0; i < rcnt; i++)
+        { theSet->soln[i]->busy++; }
+     }
+
+   /*=====================*/
+   /* Perform the action. */
+   /*=====================*/
+
+   for (theSet = InstanceQueryData(theEnv)->QueryCore->soln_set;
+        theSet != NULL; )
+     {
+      for (i = 0 ; i < rcnt ; i++)
+        {
+         if (theSet->soln[i]->garbage)
+           { goto nextSet; }
+         InstanceQueryData(theEnv)->QueryCore->solns[i] = theSet->soln[i];
+        }
+
+      EvaluateExpression(theEnv,InstanceQueryData(theEnv)->QueryCore->action,returnValue);
+
+      if (EvaluationData(theEnv)->HaltExecution || ProcedureFunctionData(theEnv)->BreakFlag || ProcedureFunctionData(theEnv)->ReturnFlag)
+        { break; }
+
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+      
+      nextSet: theSet = theSet->nxt;
+     }
+
+   /*==================================================================*/
+   /* Decrement the busy count for all instances in the solution sets. */
+   /*==================================================================*/
+
+   for (theSet = InstanceQueryData(theEnv)->QueryCore->soln_set;
+        theSet != NULL;
+        theSet = theSet->nxt)
+     {
+      for (i = 0; i < rcnt; i++)
+        { theSet->soln[i]->busy--; }
+     }
+
+   GCBlockEndUDF(theEnv,&gcb,returnValue);
+   CallPeriodicTasks(theEnv);
+
+   /*==================================*/
+   /* Deallocate the query structures. */
+   /*==================================*/
+   
+   while (InstanceQueryData(theEnv)->QueryCore->soln_set != NULL)
+     { PopQuerySoln(theEnv); }
+
+   ProcedureFunctionData(theEnv)->BreakFlag = false;
+   rm(theEnv,InstanceQueryData(theEnv)->QueryCore->solns,(sizeof(Instance *) * rcnt));
+   rtn_struct(theEnv,query_core,InstanceQueryData(theEnv)->QueryCore);
+   PopQueryCore(theEnv);
+   DeleteQueryClasses(theEnv,qclasses);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*******************************************************
+  NAME         : PushQueryCore
+  DESCRIPTION  : Pushes the current QueryCore onto stack
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Allocates new stack node and changes
+                   QueryCoreStack
+  NOTES        : None
+ *******************************************************/
+static void PushQueryCore(
+  Environment *theEnv)
+  {
+   QUERY_STACK *qptr;
+
+   qptr = get_struct(theEnv,query_stack);
+   qptr->core = InstanceQueryData(theEnv)->QueryCore;
+   qptr->nxt = InstanceQueryData(theEnv)->QueryCoreStack;
+   InstanceQueryData(theEnv)->QueryCoreStack = qptr;
+  }
+
+/******************************************************
+  NAME         : PopQueryCore
+  DESCRIPTION  : Pops top of QueryCore stack and
+                   restores QueryCore to this core
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Stack node deallocated, QueryCoreStack
+                   changed and QueryCore reset
+  NOTES        : Assumes stack is not empty
+ ******************************************************/
+static void PopQueryCore(
+  Environment *theEnv)
+  {
+   QUERY_STACK *qptr;
+
+   InstanceQueryData(theEnv)->QueryCore = InstanceQueryData(theEnv)->QueryCoreStack->core;
+   qptr = InstanceQueryData(theEnv)->QueryCoreStack;
+   InstanceQueryData(theEnv)->QueryCoreStack = InstanceQueryData(theEnv)->QueryCoreStack->nxt;
+   rtn_struct(theEnv,query_stack,qptr);
+  }
+
+/***************************************************
+  NAME         : FindQueryCore
+  DESCRIPTION  : Looks up a QueryCore Stack Frame
+                    Depth 0 is current frame
+                    1 is next deepest, etc.
+  INPUTS       : Depth
+  RETURNS      : Address of query core stack frame
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static QUERY_CORE *FindQueryCore(
+  Environment *theEnv,
+  long long depth)
+  {
+   QUERY_STACK *qptr;
+
+   if (depth == 0)
+     return InstanceQueryData(theEnv)->QueryCore;
+   qptr = InstanceQueryData(theEnv)->QueryCoreStack;
+   while (depth > 1)
+     {
+      qptr = qptr->nxt;
+      depth--;
+     }
+   return qptr->core;
+  }
+
+/**********************************************************
+  NAME         : DetermineQueryClasses
+  DESCRIPTION  : Builds a list of classes to be used in
+                   instance queries - uses parse form.
+  INPUTS       : 1) The parse class expression chain
+                 2) The name of the function being executed
+                 3) Caller's buffer for restriction count
+                    (# of separate lists)
+  RETURNS      : The query list, or NULL on errors
+  SIDE EFFECTS : Memory allocated for list
+                 Busy count incremented for all classes
+  NOTES        : Each restriction is linked by nxt pointer,
+                   multiple classes in a restriction are
+                   linked by the chain pointer.
+                 Rcnt caller's buffer is set to reflect the
+                   total number of chains
+                 Assumes classExp is not NULL and that each
+                   restriction chain is terminated with
+                   the QUERY_DELIMITER_SYMBOL "(QDS)"
+ **********************************************************/
+static QUERY_CLASS *DetermineQueryClasses(
+  Environment *theEnv,
+  Expression *classExp,
+  const char *func,
+  unsigned *rcnt)
+  {
+   QUERY_CLASS *clist = NULL,*cnxt = NULL,*cchain = NULL,*tmp;
+   bool new_list = false;
+   UDFValue temp;
+   Defclass *theClass;
+
+   *rcnt = 0;
+   while (classExp != NULL)
+     {
+      theClass = NULL;
+      
+      if (classExp->type == DEFCLASS_PTR)
+        {
+         theClass = (Defclass *) classExp->value;
+        }
+      else if (EvaluateExpression(theEnv,classExp,&temp))
+        {
+         DeleteQueryClasses(theEnv,clist);
+         return NULL;
+        }
+        
+      if ((theClass == NULL) &&
+          (temp.value == (void *) InstanceQueryData(theEnv)->QUERY_DELIMITER_SYMBOL))
+        {
+         new_list = true;
+         (*rcnt)++;
+        }
+      else if ((tmp = FormChain(theEnv,func,theClass,&temp)) != NULL)
+        {
+         if (clist == NULL)
+           clist = cnxt = cchain = tmp;
+         else if (new_list == true)
+           {
+            new_list = false;
+            cnxt->nxt = tmp;
+            cnxt = cchain = tmp;
+           }
+         else
+           cchain->chain = tmp;
+         while (cchain->chain != NULL)
+           cchain = cchain->chain;
+        }
+      else
+        {
+         SyntaxErrorMessage(theEnv,"instance-set query class restrictions");
+         DeleteQueryClasses(theEnv,clist);
+         SetEvaluationError(theEnv,true);
+         return NULL;
+        }
+      classExp = classExp->nextArg;
+     }
+   return(clist);
+  }
+
+/*************************************************************
+  NAME         : FormChain
+  DESCRIPTION  : Builds a list of classes to be used in
+                   instance queries - uses parse form.
+  INPUTS       : 1) Name of calling function for error msgs
+                 2) Data object - must be a symbol or a
+                      multifield value containing all symbols
+                 The symbols must be names of existing classes
+  RETURNS      : The query chain, or NULL on errors
+  SIDE EFFECTS : Memory allocated for chain
+                 Busy count incremented for all classes
+  NOTES        : None
+ *************************************************************/
+static QUERY_CLASS *FormChain(
+  Environment *theEnv,
+  const char *func,
+  Defclass *theClass,
+  UDFValue *val)
+  {
+   Defclass *cls;
+   QUERY_CLASS *head,*bot,*tmp;
+   size_t i;
+   const char *className;
+   Defmodule *currentModule;
+
+   currentModule = GetCurrentModule(theEnv);
+   if (theClass != NULL)
+     {
+      IncrementDefclassBusyCount(theEnv,theClass);
+      head = get_struct(theEnv,query_class);
+      head->cls = theClass;
+      if (DefclassInScope(theEnv,head->cls,currentModule))
+        head->theModule = currentModule;
+      else
+        head->theModule = head->cls->header.whichModule->theModule;
+      head->chain = NULL;
+      head->nxt = NULL;
+      return(head);
+     }
+
+   if (val->header->type == SYMBOL_TYPE)
+     {
+      /* ===============================================
+         Allow instance-set query restrictions to have a
+         module specifier as part of the class name,
+         but search imported defclasses too if a
+         module specifier is not given
+         =============================================== */
+      cls = LookupDefclassByMdlOrScope(theEnv,val->lexemeValue->contents);
+      if (cls == NULL)
+        {
+         ClassExistError(theEnv,func,val->lexemeValue->contents);
+         return NULL;
+        }
+      IncrementDefclassBusyCount(theEnv,(Defclass *) cls);
+      head = get_struct(theEnv,query_class);
+      head->cls = cls;
+      if (DefclassInScope(theEnv,head->cls,currentModule))
+        head->theModule = currentModule;
+      else
+        head->theModule = head->cls->header.whichModule->theModule;
+      head->chain = NULL;
+      head->nxt = NULL;
+      return(head);
+     }
+
+   if (val->header->type == MULTIFIELD_TYPE)
+     {
+      head = bot = NULL;
+      for (i = val->begin ; i < (val->begin + val->range) ; i++)
+        {
+         if (val->multifieldValue->contents[i].header->type == SYMBOL_TYPE)
+           {
+            className = val->multifieldValue->contents[i].lexemeValue->contents;
+            cls = LookupDefclassByMdlOrScope(theEnv,className);
+            if (cls == NULL)
+              {
+               ClassExistError(theEnv,func,className);
+               DeleteQueryClasses(theEnv,head);
+               return NULL;
+              }
+           }
+         else
+           {
+            DeleteQueryClasses(theEnv,head);
+            return NULL;
+           }
+         IncrementDefclassBusyCount(theEnv,(Defclass *) cls);
+         tmp = get_struct(theEnv,query_class);
+         tmp->cls = cls;
+         if (DefclassInScope(theEnv,tmp->cls,currentModule))
+           tmp->theModule = currentModule;
+         else
+           tmp->theModule = tmp->cls->header.whichModule->theModule;
+         tmp->chain = NULL;
+         tmp->nxt = NULL;
+         if (head == NULL)
+           head = tmp;
+         else
+           bot->chain = tmp;
+         bot = tmp;
+        }
+      return(head);
+     }
+   return NULL;
+  }
+
+/******************************************************
+  NAME         : DeleteQueryClasses
+  DESCRIPTION  : Deletes a query class-list
+  INPUTS       : The query list address
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Nodes deallocated
+                 Busy count decremented for all classes
+  NOTES        : None
+ ******************************************************/
+static void DeleteQueryClasses(
+  Environment *theEnv,
+  QUERY_CLASS *qlist)
+  {
+   QUERY_CLASS *tmp;
+
+   while (qlist != NULL)
+     {
+      while (qlist->chain != NULL)
+        {
+         tmp = qlist->chain;
+         qlist->chain = qlist->chain->chain;
+         DecrementDefclassBusyCount(theEnv,(Defclass *) tmp->cls);
+         rtn_struct(theEnv,query_class,tmp);
+        }
+      tmp = qlist;
+      qlist = qlist->nxt;
+      DecrementDefclassBusyCount(theEnv,(Defclass *) tmp->cls);
+      rtn_struct(theEnv,query_class,tmp);
+     }
+  }
+
+/************************************************************
+  NAME         : TestForFirstInChain
+  DESCRIPTION  : Processes all classes in a restriction chain
+                   until success or done
+  INPUTS       : 1) The current chain
+                 2) The index of the chain restriction
+                     (e.g. the 4th query-variable)
+  RETURNS      : True if query succeeds, false otherwise
+  SIDE EFFECTS : Sets current restriction class
+                 Instance variable values set
+  NOTES        : None
+ ************************************************************/
+static bool TestForFirstInChain(
+  Environment *theEnv,
+  QUERY_CLASS *qchain,
+  unsigned indx)
+  {
+   QUERY_CLASS *qptr;
+   int id;
+
+   InstanceQueryData(theEnv)->AbortQuery = true;
+   for (qptr = qchain ; qptr != NULL ; qptr = qptr->chain)
+     {
+      InstanceQueryData(theEnv)->AbortQuery = false;
+      if ((id = GetTraversalID(theEnv)) == -1)
+        return false;
+      if (TestForFirstInstanceInClass(theEnv,qptr->theModule,id,qptr->cls,qchain,indx))
+        {
+         ReleaseTraversalID(theEnv);
+         return true;
+        }
+      ReleaseTraversalID(theEnv);
+      if ((EvaluationData(theEnv)->HaltExecution == true) || (InstanceQueryData(theEnv)->AbortQuery == true))
+        return false;
+     }
+   return false;
+  }
+
+/*****************************************************************
+  NAME         : TestForFirstInstanceInClass
+  DESCRIPTION  : Processes all instances in a class and then
+                   all subclasses of a class until success or done
+  INPUTS       : 1) The module for which classes tested must be
+                    in scope
+                 2) Visitation traversal id
+                 3) The class
+                 4) The current class restriction chain
+                 5) The index of the current restriction
+  RETURNS      : True if query succeeds, false otherwise
+  SIDE EFFECTS : Instance variable values set
+  NOTES        : None
+ *****************************************************************/
+static bool TestForFirstInstanceInClass(
+  Environment *theEnv,
+  Defmodule *theModule,
+  int id,
+  Defclass *cls,
+  QUERY_CLASS *qchain,
+  unsigned indx)
+  {
+   unsigned long i;
+   Instance *ins;
+   UDFValue temp;
+   GCBlock gcb;
+   unsigned j;
+
+   if (TestTraversalID(cls->traversalRecord,id))
+     return false;
+   SetTraversalID(cls->traversalRecord,id);
+   if (DefclassInScope(theEnv,cls,theModule) == false)
+     return false;
+
+   GCBlockStart(theEnv,&gcb);
+
+   ins = cls->instanceList;
+   while (ins != NULL)
+     {
+      InstanceQueryData(theEnv)->QueryCore->solns[indx] = ins;
+      if (qchain->nxt != NULL)
+        {
+         ins->busy++;
+         if (TestForFirstInChain(theEnv,qchain->nxt,indx+1) == true)
+           {
+            ins->busy--;
+            break;
+           }
+         ins->busy--;
+         if ((EvaluationData(theEnv)->HaltExecution == true) || (InstanceQueryData(theEnv)->AbortQuery == true))
+           break;
+        }
+      else
+        {
+         for (j = 0; j < indx; j++)
+           {
+            if (InstanceQueryData(theEnv)->QueryCore->solns[j]->garbage)
+              {
+               ins = NULL;
+               goto endTest;
+              }
+           }
+           
+         ins->busy++;
+         EvaluateExpression(theEnv,InstanceQueryData(theEnv)->QueryCore->query,&temp);
+         ins->busy--;
+         if (EvaluationData(theEnv)->HaltExecution == true)
+           break;
+         if (temp.value != FalseSymbol(theEnv))
+           break;
+        }
+
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+
+      ins = ins->nxtClass;
+      while ((ins != NULL) ? (ins->garbage == 1) : false)
+        ins = ins->nxtClass;
+     }
+     
+   endTest:
+
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+
+   if (ins != NULL)
+     return(((EvaluationData(theEnv)->HaltExecution == true) || (InstanceQueryData(theEnv)->AbortQuery == true))
+             ? false : true);
+   for (i = 0 ; i < cls->directSubclasses.classCount ; i++)
+     {
+      if (TestForFirstInstanceInClass(theEnv,theModule,id,cls->directSubclasses.classArray[i],
+                                      qchain,indx))
+        return true;
+      if ((EvaluationData(theEnv)->HaltExecution == true) || (InstanceQueryData(theEnv)->AbortQuery == true))
+        return false;
+     }
+   return false;
+  }
+
+/************************************************************
+  NAME         : TestEntireChain
+  DESCRIPTION  : Processes all classes in a restriction chain
+                   until done
+  INPUTS       : 1) The current chain
+                 2) The index of the chain restriction
+                     (i.e. the 4th query-variable)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Sets current restriction class
+                 Query instance variables set
+                 Solution sets stored in global list
+  NOTES        : None
+ ************************************************************/
+static void TestEntireChain(
+  Environment *theEnv,
+  QUERY_CLASS *qchain,
+  unsigned indx)
+  {
+   QUERY_CLASS *qptr;
+   int id;
+
+   InstanceQueryData(theEnv)->AbortQuery = true;
+   for (qptr = qchain ; qptr != NULL ; qptr = qptr->chain)
+     {
+      InstanceQueryData(theEnv)->AbortQuery = false;
+      if ((id = GetTraversalID(theEnv)) == -1)
+        return;
+      TestEntireClass(theEnv,qptr->theModule,id,qptr->cls,qchain,indx);
+      ReleaseTraversalID(theEnv);
+      if ((EvaluationData(theEnv)->HaltExecution == true) || (InstanceQueryData(theEnv)->AbortQuery == true))
+        return;
+     }
+  }
+
+/*****************************************************************
+  NAME         : TestEntireClass
+  DESCRIPTION  : Processes all instances in a class and then
+                   all subclasses of a class until done
+  INPUTS       : 1) The module for which classes tested must be
+                    in scope
+                 2) Visitation traversal id
+                 3) The class
+                 4) The current class restriction chain
+                 5) The index of the current restriction
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance variable values set
+                 Solution sets stored in global list
+  NOTES        : None
+ *****************************************************************/
+static void TestEntireClass(
+  Environment *theEnv,
+  Defmodule *theModule,
+  int id,
+  Defclass *cls,
+  QUERY_CLASS *qchain,
+  unsigned indx)
+  {
+   unsigned long i;
+   Instance *ins;
+   UDFValue temp;
+   GCBlock gcb;
+   unsigned j;
+   
+   if (TestTraversalID(cls->traversalRecord,id))
+     return;
+   SetTraversalID(cls->traversalRecord,id);
+   if (DefclassInScope(theEnv,cls,theModule) == false)
+     return;
+
+   GCBlockStart(theEnv,&gcb);
+
+   ins = cls->instanceList;
+   while (ins != NULL)
+     {
+      InstanceQueryData(theEnv)->QueryCore->solns[indx] = ins;
+      if (qchain->nxt != NULL)
+        {
+         ins->busy++;
+         TestEntireChain(theEnv,qchain->nxt,indx+1);
+         ins->busy--;
+         if ((EvaluationData(theEnv)->HaltExecution == true) || (InstanceQueryData(theEnv)->AbortQuery == true))
+           break;
+        }
+      else
+        {
+         for (j = 0; j < indx; j++)
+           {
+            if (InstanceQueryData(theEnv)->QueryCore->solns[j]->garbage)
+              { goto endTest; }
+           }
+
+         ins->busy++;
+
+         EvaluateExpression(theEnv,InstanceQueryData(theEnv)->QueryCore->query,&temp);
+
+         ins->busy--;
+         if (EvaluationData(theEnv)->HaltExecution == true)
+           break;
+         if (temp.value != FalseSymbol(theEnv))
+           {
+            if (InstanceQueryData(theEnv)->QueryCore->action != NULL)
+              {
+               ins->busy++;
+
+               ReleaseUDFV(theEnv,InstanceQueryData(theEnv)->QueryCore->result);
+               EvaluateExpression(theEnv,InstanceQueryData(theEnv)->QueryCore->action,InstanceQueryData(theEnv)->QueryCore->result);
+               RetainUDFV(theEnv,InstanceQueryData(theEnv)->QueryCore->result);
+
+               ins->busy--;
+               if (ProcedureFunctionData(theEnv)->BreakFlag || ProcedureFunctionData(theEnv)->ReturnFlag)
+                 {
+                  InstanceQueryData(theEnv)->AbortQuery = true;
+                  break;
+                 }
+               if (EvaluationData(theEnv)->HaltExecution == true)
+                 break;
+              }
+            else
+              AddSolution(theEnv);
+           }
+        }
+
+      ins = ins->nxtClass;
+      while ((ins != NULL) ? (ins->garbage == 1) : false)
+        ins = ins->nxtClass;
+
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+     }
+     
+   endTest:
+   
+   GCBlockEnd(theEnv,&gcb);
+   CallPeriodicTasks(theEnv);
+
+   if (ins != NULL)
+     return;
+   for (i = 0 ; i < cls->directSubclasses.classCount ; i++)
+     {
+      TestEntireClass(theEnv,theModule,id,cls->directSubclasses.classArray[i],qchain,indx);
+      if ((EvaluationData(theEnv)->HaltExecution == true) || (InstanceQueryData(theEnv)->AbortQuery == true))
+        return;
+     }
+  }
+
+/***************************************************************************
+  NAME         : AddSolution
+  DESCRIPTION  : Adds the current instance set to a global list of
+                   solutions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Global list and count updated
+  NOTES        : Solutions are stored as sequential arrays of Instance *
+ ***************************************************************************/
+static void AddSolution(
+  Environment *theEnv)
+  {
+   QUERY_SOLN *new_soln;
+   unsigned i;
+
+   new_soln = (QUERY_SOLN *) gm2(theEnv,sizeof(QUERY_SOLN));
+   new_soln->soln = (Instance **)
+                    gm2(theEnv,(sizeof(Instance *) * (InstanceQueryData(theEnv)->QueryCore->soln_size)));
+   for (i = 0 ; i < InstanceQueryData(theEnv)->QueryCore->soln_size ; i++)
+     new_soln->soln[i] = InstanceQueryData(theEnv)->QueryCore->solns[i];
+   new_soln->nxt = NULL;
+   if (InstanceQueryData(theEnv)->QueryCore->soln_set == NULL)
+     InstanceQueryData(theEnv)->QueryCore->soln_set = new_soln;
+   else
+     InstanceQueryData(theEnv)->QueryCore->soln_bottom->nxt = new_soln;
+   InstanceQueryData(theEnv)->QueryCore->soln_bottom = new_soln;
+   InstanceQueryData(theEnv)->QueryCore->soln_cnt++;
+  }
+
+/***************************************************
+  NAME         : PopQuerySoln
+  DESCRIPTION  : Deallocates the topmost solution
+                   set for an instance-set query
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Solution set deallocated
+  NOTES        : Assumes QueryCore->soln_set != 0
+ ***************************************************/
+static void PopQuerySoln(
+  Environment *theEnv)
+  {
+   InstanceQueryData(theEnv)->QueryCore->soln_bottom = InstanceQueryData(theEnv)->QueryCore->soln_set;
+   InstanceQueryData(theEnv)->QueryCore->soln_set = InstanceQueryData(theEnv)->QueryCore->soln_set->nxt;
+   rm(theEnv,InstanceQueryData(theEnv)->QueryCore->soln_bottom->soln,
+      (sizeof(Instance *) * InstanceQueryData(theEnv)->QueryCore->soln_size));
+   rm(theEnv,InstanceQueryData(theEnv)->QueryCore->soln_bottom,sizeof(QUERY_SOLN));
+  }
+
+#endif
+
+
diff --git a/clips/insquery.h b/clips/insquery.h
new file mode 100755
index 000000000..3350593f1
--- /dev/null
+++ b/clips/insquery.h
@@ -0,0 +1,115 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_insquery
+
+#pragma once
+
+#define _H_insquery
+
+#if INSTANCE_SET_QUERIES
+
+#include "object.h"
+
+typedef struct query_class
+  {
+   Defclass *cls;
+   Defmodule *theModule;
+   struct query_class *chain,*nxt;
+  } QUERY_CLASS;
+
+typedef struct query_soln
+  {
+   Instance **soln;
+   struct query_soln *nxt;
+  } QUERY_SOLN;
+
+typedef struct query_core
+  {
+   Instance **solns;
+   Expression *query,*action;
+   QUERY_SOLN *soln_set,*soln_bottom;
+   unsigned soln_size,soln_cnt;
+   UDFValue *result;
+  } QUERY_CORE;
+
+typedef struct query_stack
+  {
+   QUERY_CORE *core;
+   struct query_stack *nxt;
+  } QUERY_STACK;
+
+#define INSTANCE_QUERY_DATA 31
+
+struct instanceQueryData
+  {
+   CLIPSLexeme *QUERY_DELIMITER_SYMBOL;
+   QUERY_CORE *QueryCore;
+   QUERY_STACK *QueryCoreStack;
+   bool AbortQuery;
+  };
+
+#define InstanceQueryData(theEnv) ((struct instanceQueryData *) GetEnvironmentData(theEnv,INSTANCE_QUERY_DATA))
+
+#define QUERY_DELIMITER_STRING     "(QDS)"
+
+   void                           SetupQuery(Environment *);
+   void                           GetQueryInstance(Environment *,UDFContext *,UDFValue *);
+   void                           GetQueryInstanceSlot(Environment *,UDFContext *,UDFValue *);
+   void                           AnyInstances(Environment *,UDFContext *,UDFValue *);
+   void                           QueryFindInstance(Environment *,UDFContext *,UDFValue *);
+   void                           QueryFindAllInstances(Environment *,UDFContext *,UDFValue *);
+   void                           QueryDoForInstance(Environment *,UDFContext *,UDFValue *);
+   void                           QueryDoForAllInstances(Environment *,UDFContext *,UDFValue *);
+   void                           DelayedQueryDoForAllInstances(Environment *,UDFContext *,UDFValue *);
+
+#endif /* INSTANCE_SET_QUERIES */
+
+#endif /* _H_insquery */
+
+
+
+
+
diff --git a/clips/insqypsr.c b/clips/insqypsr.c
new file mode 100755
index 000000000..d1fc25871
--- /dev/null
+++ b/clips/insqypsr.c
@@ -0,0 +1,729 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  09/22/17             */
+   /*                                                     */
+   /*         INSTANCE-SET QUERIES PARSER MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Instance_set Queries Parsing Routines            */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Fixed memory leaks when error occurred.        */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*      6.31: Error check for non-symbolic slot names.       */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if INSTANCE_SET_QUERIES
+
+#include <string.h>
+
+#include "classcom.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "insquery.h"
+#include "prcdrpsr.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "strngrtr.h"
+
+#include "insqypsr.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define INSTANCE_SLOT_REF ':'
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static Expression             *ParseQueryRestrictions(Environment *,Expression *,const char *,struct token *);
+   static bool                    ReplaceClassNameWithReference(Environment *,Expression *);
+   static bool                    ParseQueryTestExpression(Environment *,Expression *,const char *);
+   static bool                    ParseQueryActionExpression(Environment *,Expression *,const char *,Expression *,struct token *);
+   static bool                    ReplaceInstanceVariables(Environment *,Expression *,Expression *,bool,int);
+   static bool                    ReplaceSlotReference(Environment *,Expression *,Expression *,
+                                                       struct functionDefinition *,int);
+   static bool                    IsQueryFunction(Expression *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************************
+  NAME         : ParseQueryNoAction
+  DESCRIPTION  : Parses the following functions :
+                   (any-instancep)
+                   (find-first-instance)
+                   (find-all-instances)
+  INPUTS       : 1) The address of the top node of the query function
+                 2) The logical name of the input
+  RETURNS      : The completed expression chain, or NULL on errors
+  SIDE EFFECTS : The expression chain is extended, or the "top" node
+                 is deleted on errors
+  NOTES        : H/L Syntax :
+
+                 (<function> <query-block>)
+
+                 <query-block>  :== (<instance-var>+) <query-expression>
+                 <instance-var> :== (<var-name> <class-name>+)
+
+                 Parses into following form :
+
+                 <query-function>
+                      |
+                      V
+                 <query-expression>  ->
+
+                 <class-1a> -> <class-1b> -> (QDS) ->
+
+                 <class-2a> -> <class-2b> -> (QDS) -> ...
+ ***********************************************************************/
+Expression *ParseQueryNoAction(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource)
+  {
+   Expression *insQuerySetVars;
+   struct token queryInputToken;
+
+   insQuerySetVars = ParseQueryRestrictions(theEnv,top,readSource,&queryInputToken);
+   if (insQuerySetVars == NULL)
+     return NULL;
+   IncrementIndentDepth(theEnv,3);
+   PPCRAndIndent(theEnv);
+   if (ParseQueryTestExpression(theEnv,top,readSource) == false)
+     {
+      DecrementIndentDepth(theEnv,3);
+      ReturnExpression(theEnv,insQuerySetVars);
+      return NULL;
+     }
+   DecrementIndentDepth(theEnv,3);
+   GetToken(theEnv,readSource,&queryInputToken);
+   if (queryInputToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"instance-set query function");
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,insQuerySetVars);
+      return NULL;
+     }
+   
+   if (ReplaceInstanceVariables(theEnv,insQuerySetVars,top->argList,true,0))
+     {
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,insQuerySetVars);
+      return NULL;
+     }
+   
+   ReturnExpression(theEnv,insQuerySetVars);
+   return top;
+  }
+
+/***********************************************************************
+  NAME         : ParseQueryAction
+  DESCRIPTION  : Parses the following functions :
+                   (do-for-instance)
+                   (do-for-all-instances)
+                   (delayed-do-for-all-instances)
+  INPUTS       : 1) The address of the top node of the query function
+                 2) The logical name of the input
+  RETURNS      : The completed expression chain, or NULL on errors
+  SIDE EFFECTS : The expression chain is extended, or the "top" node
+                 is deleted on errors
+  NOTES        : H/L Syntax :
+
+                 (<function> <query-block> <query-action>)
+
+                 <query-block>  :== (<instance-var>+) <query-expression>
+                 <instance-var> :== (<var-name> <class-name>+)
+
+                 Parses into following form :
+
+                 <query-function>
+                      |
+                      V
+                 <query-expression> -> <query-action>  ->
+
+                 <class-1a> -> <class-1b> -> (QDS) ->
+
+                 <class-2a> -> <class-2b> -> (QDS) -> ...
+ ***********************************************************************/
+Expression *ParseQueryAction(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource)
+  {
+   Expression *insQuerySetVars;
+   struct token queryInputToken;
+
+   insQuerySetVars = ParseQueryRestrictions(theEnv,top,readSource,&queryInputToken);
+   if (insQuerySetVars == NULL)
+     return NULL;
+   IncrementIndentDepth(theEnv,3);
+   PPCRAndIndent(theEnv);
+   if (ParseQueryTestExpression(theEnv,top,readSource) == false)
+     {
+      DecrementIndentDepth(theEnv,3);
+      ReturnExpression(theEnv,insQuerySetVars);
+      return NULL;
+     }
+   PPCRAndIndent(theEnv);
+   if (ParseQueryActionExpression(theEnv,top,readSource,insQuerySetVars,&queryInputToken) == false)
+     {
+      DecrementIndentDepth(theEnv,3);
+      ReturnExpression(theEnv,insQuerySetVars);
+      return NULL;
+     }
+   DecrementIndentDepth(theEnv,3);
+
+   if (queryInputToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"instance-set query function");
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,insQuerySetVars);
+      return NULL;
+     }
+
+   if (ReplaceInstanceVariables(theEnv,insQuerySetVars,top->argList,true,0))
+     {
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,insQuerySetVars);
+      return NULL;
+     }
+
+   if (ReplaceInstanceVariables(theEnv,insQuerySetVars,top->argList->nextArg,false,0))
+     {
+      ReturnExpression(theEnv,top);
+      ReturnExpression(theEnv,insQuerySetVars);
+      return NULL;
+     }
+
+   ReturnExpression(theEnv,insQuerySetVars);
+
+   return top;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************************
+  NAME         : ParseQueryRestrictions
+  DESCRIPTION  : Parses the class restrictions for a query
+  INPUTS       : 1) The top node of the query expression
+                 2) The logical name of the input
+                 3) Caller's token buffer
+  RETURNS      : The instance-variable expressions
+  SIDE EFFECTS : Entire query expression deleted on errors
+                 Nodes allocated for restrictions and instance
+                   variable expressions
+                 Class restrictions attached to query-expression
+                   as arguments
+  NOTES        : Expects top != NULL
+ ***************************************************************/
+static Expression *ParseQueryRestrictions(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource,
+  struct token *queryInputToken)
+  {
+   Expression *insQuerySetVars = NULL,*lastInsQuerySetVars = NULL,
+              *classExp = NULL,*lastClassExp,
+              *tmp,*lastOne = NULL;
+   bool error = false;
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,queryInputToken);
+   if (queryInputToken->tknType != LEFT_PARENTHESIS_TOKEN)
+     goto ParseQueryRestrictionsError1;
+   GetToken(theEnv,readSource,queryInputToken);
+   if (queryInputToken->tknType != LEFT_PARENTHESIS_TOKEN)
+     goto ParseQueryRestrictionsError1;
+   while (queryInputToken->tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      GetToken(theEnv,readSource,queryInputToken);
+      if (queryInputToken->tknType != SF_VARIABLE_TOKEN)
+        goto ParseQueryRestrictionsError1;
+      tmp = insQuerySetVars;
+      while (tmp != NULL)
+        {
+         if (tmp->value == queryInputToken->value)
+           {
+            PrintErrorID(theEnv,"INSQYPSR",1,false);
+            WriteString(theEnv,STDERR,"Duplicate instance member variable name in function '");
+            WriteString(theEnv,STDERR,ExpressionFunctionCallName(top)->contents);
+            WriteString(theEnv,STDERR,"'.\n");
+            goto ParseQueryRestrictionsError2;
+           }
+         tmp = tmp->nextArg;
+        }
+      tmp = GenConstant(theEnv,SF_VARIABLE,queryInputToken->value);
+      if (insQuerySetVars == NULL)
+        insQuerySetVars = tmp;
+      else
+        lastInsQuerySetVars->nextArg = tmp;
+      lastInsQuerySetVars = tmp;
+      SavePPBuffer(theEnv," ");
+      classExp = ArgumentParse(theEnv,readSource,&error);
+      if (error)
+        goto ParseQueryRestrictionsError2;
+      if (classExp == NULL)
+        goto ParseQueryRestrictionsError1;
+      if (ReplaceClassNameWithReference(theEnv,classExp) == false)
+        goto ParseQueryRestrictionsError2;
+      lastClassExp = classExp;
+      SavePPBuffer(theEnv," ");
+      while ((tmp = ArgumentParse(theEnv,readSource,&error)) != NULL)
+        {
+         if (ReplaceClassNameWithReference(theEnv,tmp) == false)
+           goto ParseQueryRestrictionsError2;
+         lastClassExp->nextArg = tmp;
+         lastClassExp = tmp;
+         SavePPBuffer(theEnv," ");
+        }
+      if (error)
+        goto ParseQueryRestrictionsError2;
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+      tmp = GenConstant(theEnv,SYMBOL_TYPE,InstanceQueryData(theEnv)->QUERY_DELIMITER_SYMBOL);
+      lastClassExp->nextArg = tmp;
+      lastClassExp = tmp;
+      if (top->argList == NULL)
+        top->argList = classExp;
+      else
+        lastOne->nextArg = classExp;
+      lastOne = lastClassExp;
+      classExp = NULL;
+      SavePPBuffer(theEnv," ");
+      GetToken(theEnv,readSource,queryInputToken);
+     }
+   if (queryInputToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     goto ParseQueryRestrictionsError1;
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+   return(insQuerySetVars);
+
+ParseQueryRestrictionsError1:
+   SyntaxErrorMessage(theEnv,"instance-set query function");
+
+ParseQueryRestrictionsError2:
+   ReturnExpression(theEnv,classExp);
+   ReturnExpression(theEnv,top);
+   ReturnExpression(theEnv,insQuerySetVars);
+   return NULL;
+  }
+
+/***************************************************
+  NAME         : ReplaceClassNameWithReference
+  DESCRIPTION  : In parsing an instance-set query,
+                 this function replaces a constant
+                 class name with an actual pointer
+                 to the class
+  INPUTS       : The expression
+  RETURNS      : True if all OK, false
+                 if class cannot be found
+  SIDE EFFECTS : The expression type and value are
+                 modified if class is found
+  NOTES        : Searches current and imported
+                 modules for reference
+ ***************************************************/
+static bool ReplaceClassNameWithReference(
+  Environment *theEnv,
+  Expression *theExp)
+  {
+   const char *theClassName;
+   Defclass *theDefclass;
+
+   if (theExp->type == SYMBOL_TYPE)
+     {
+      theClassName = theExp->lexemeValue->contents;
+      theDefclass = LookupDefclassByMdlOrScope(theEnv,theClassName);
+      if (theDefclass == NULL)
+        {
+         CantFindItemErrorMessage(theEnv,"class",theClassName,true);
+         return false;
+        }
+      theExp->type = DEFCLASS_PTR;
+      theExp->value = theDefclass;
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      if (! ConstructData(theEnv)->ParsingConstruct)
+        { ConstructData(theEnv)->DanglingConstructs++; }
+#endif
+     }
+   return true;
+  }
+
+/*************************************************************
+  NAME         : ParseQueryTestExpression
+  DESCRIPTION  : Parses the test-expression for a query
+  INPUTS       : 1) The top node of the query expression
+                 2) The logical name of the input
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Entire query-expression deleted on errors
+                 Nodes allocated for new expression
+                 Test shoved in front of class-restrictions on
+                    query argument list
+  NOTES        : Expects top != NULL
+ *************************************************************/
+static bool ParseQueryTestExpression(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource)
+  {
+   Expression *qtest;
+   bool error;
+   struct BindInfo *oldBindList;
+
+   error = false;
+   oldBindList = GetParsedBindNames(theEnv);
+   SetParsedBindNames(theEnv,NULL);
+   qtest = ArgumentParse(theEnv,readSource,&error);
+   if (error == true)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      ReturnExpression(theEnv,top);
+      return false;
+     }
+   if (qtest == NULL)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      SyntaxErrorMessage(theEnv,"instance-set query function");
+      ReturnExpression(theEnv,top);
+      return false;
+     }
+   qtest->nextArg = top->argList;
+   top->argList = qtest;
+   if (ParsedBindNamesEmpty(theEnv) == false)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      PrintErrorID(theEnv,"INSQYPSR",2,false);
+      WriteString(theEnv,STDERR,"Binds are not allowed in instance-set query in function '");
+      WriteString(theEnv,STDERR,ExpressionFunctionCallName(top)->contents);
+      WriteString(theEnv,STDERR,"'.\n");
+      ReturnExpression(theEnv,top);
+      return false;
+     }
+   SetParsedBindNames(theEnv,oldBindList);
+   return true;
+  }
+
+/*************************************************************
+  NAME         : ParseQueryActionExpression
+  DESCRIPTION  : Parses the action-expression for a query
+  INPUTS       : 1) The top node of the query expression
+                 2) The logical name of the input
+                 3) List of query parameters
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Entire query-expression deleted on errors
+                 Nodes allocated for new expression
+                 Action shoved in front of class-restrictions
+                    and in back of test-expression on query
+                    argument list
+  NOTES        : Expects top != NULL && top->argList != NULL
+ *************************************************************/
+static bool ParseQueryActionExpression(
+  Environment *theEnv,
+  Expression *top,
+  const char *readSource,
+  Expression *insQuerySetVars,
+  struct token *queryInputToken)
+  {
+   Expression *qaction, *tmpInsSetVars;
+   struct BindInfo *oldBindList,*newBindList,*prev;
+
+   oldBindList = GetParsedBindNames(theEnv);
+   SetParsedBindNames(theEnv,NULL);
+   ExpressionData(theEnv)->BreakContext = true;
+   ExpressionData(theEnv)->ReturnContext = ExpressionData(theEnv)->svContexts->rtn;
+
+   qaction = GroupActions(theEnv,readSource,queryInputToken,true,NULL,false);
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,queryInputToken->printForm);
+
+   ExpressionData(theEnv)->BreakContext = false;
+   if (qaction == NULL)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      SyntaxErrorMessage(theEnv,"instance-set query function");
+      ReturnExpression(theEnv,top);
+      return false;
+     }
+   qaction->nextArg = top->argList->nextArg;
+   top->argList->nextArg = qaction;
+   newBindList = GetParsedBindNames(theEnv);
+   prev = NULL;
+   while (newBindList != NULL)
+     {
+      tmpInsSetVars = insQuerySetVars;
+      while (tmpInsSetVars != NULL)
+        {
+         if (tmpInsSetVars->value == (void *) newBindList->name)
+           {
+            ClearParsedBindNames(theEnv);
+            SetParsedBindNames(theEnv,oldBindList);
+            PrintErrorID(theEnv,"INSQYPSR",3,false);
+            WriteString(theEnv,STDERR,"Cannot rebind instance-set member variable ?");
+            WriteString(theEnv,STDERR,tmpInsSetVars->lexemeValue->contents);
+            WriteString(theEnv,STDERR," in function '");
+            WriteString(theEnv,STDERR,ExpressionFunctionCallName(top)->contents);
+            WriteString(theEnv,STDERR,"'.\n");
+            ReturnExpression(theEnv,top);
+            return false;
+           }
+         tmpInsSetVars = tmpInsSetVars->nextArg;
+        }
+      prev = newBindList;
+      newBindList = newBindList->next;
+     }
+   if (prev == NULL)
+     SetParsedBindNames(theEnv,oldBindList);
+   else
+     prev->next = oldBindList;
+   return true;
+  }
+
+/***********************************************************************************
+  NAME         : ReplaceInstanceVariables
+  DESCRIPTION  : Replaces all references to instance-variables within an
+                   instance query-function with function calls to query-instance
+                   (which references the instance array at run-time)
+  INPUTS       : 1) The instance-variable list
+                 2) A boolean expression containing variable references
+                 3) A flag indicating whether to allow slot references of the type
+                    <instance-query-variable>:<slot-name> for direct slot access
+                    or not
+                 4) Nesting depth of query functions
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : If a SF_VARIABLE node is found and is on the list of instance
+                   variables, it is replaced with a query-instance function call.
+  NOTES        : Other SF_VARIABLE(S) are left alone for replacement by other
+                   parsers.  This implies that a user may use defgeneric,
+                   defrule, and defmessage-handler variables within a query-function
+                   where they do not conflict with instance-variable names.
+ ***********************************************************************************/
+static bool ReplaceInstanceVariables(
+  Environment *theEnv,
+  Expression *vlist,
+  Expression *bexp,
+  bool sdirect,
+  int ndepth)
+  {
+   Expression *eptr;
+   struct functionDefinition *rindx_func,*rslot_func;
+   int posn;
+
+   rindx_func = FindFunction(theEnv,"(query-instance)");
+   rslot_func = FindFunction(theEnv,"(query-instance-slot)");
+   while (bexp != NULL)
+     {
+      if (bexp->type == SF_VARIABLE)
+        {
+         eptr = vlist;
+         posn = 0;
+         while ((eptr != NULL) ? (eptr->value != bexp->value) : false)
+           {
+            eptr = eptr->nextArg;
+            posn++;
+           }
+         if (eptr != NULL)
+           {
+            bexp->type = FCALL;
+            bexp->value = rindx_func;
+            eptr = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,ndepth));
+            eptr->nextArg = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,posn));
+            bexp->argList = eptr;
+           }
+         else if (sdirect == true)
+           {
+            if (ReplaceSlotReference(theEnv,vlist,bexp,rslot_func,ndepth))
+              { return true; }
+           }
+        }
+      if (bexp->argList != NULL)
+        {
+         if (IsQueryFunction(bexp))
+           {
+            if (ReplaceInstanceVariables(theEnv,vlist,bexp->argList,sdirect,ndepth+1))
+              { return true; }
+           }
+         else
+           {
+            if (ReplaceInstanceVariables(theEnv,vlist,bexp->argList,sdirect,ndepth))
+              { return true; }
+           }
+        }
+      bexp = bexp->nextArg;
+     }
+     
+   return false;
+  }
+
+/*************************************************************************
+  NAME         : ReplaceSlotReference
+  DESCRIPTION  : Replaces instance-set query function variable
+                   references of the form: <instance-variable>:<slot-name>
+                   with function calls to get these instance-slots at run
+                   time
+  INPUTS       : 1) The instance-set variable list
+                 2) The expression containing the variable
+                 3) The address of the instance slot access function
+                 4) Nesting depth of query functions
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : If the variable is a slot reference, then it is replaced
+                   with the appropriate function-call.
+  NOTES        : None
+ *************************************************************************/
+static bool ReplaceSlotReference(
+  Environment *theEnv,
+  Expression *vlist,
+  Expression *theExp,
+  struct functionDefinition *func,
+  int ndepth)
+  {
+   size_t len;
+   int posn;
+   bool oldpp;
+   size_t i;
+   const char *str;
+   Expression *eptr;
+   struct token itkn;
+
+   str = theExp->lexemeValue->contents;
+   len =  strlen(str);
+   if (len < 3)
+     { return false; }
+     
+   for (i = len-2 ; i >= 1 ; i--)
+     {
+      if ((str[i] == INSTANCE_SLOT_REF) ? (i >= 1) : false)
+        {
+         eptr = vlist;
+         posn = 0;
+         while (eptr && ((i != strlen(eptr->lexemeValue->contents)) ||
+                         strncmp(eptr->lexemeValue->contents,str,
+                                 (STD_SIZE) i)))
+           {
+            eptr = eptr->nextArg;
+            posn++;
+           }
+         if (eptr != NULL)
+           {
+            OpenStringSource(theEnv,"query-var",str+i+1,0);
+            oldpp = GetPPBufferStatus(theEnv);
+            SetPPBufferStatus(theEnv,false);
+            GetToken(theEnv,"query-var",&itkn);
+            SetPPBufferStatus(theEnv,oldpp);
+            CloseStringSource(theEnv,"query-var");
+            
+            if (itkn.tknType != SYMBOL_TOKEN)
+              {
+               InvalidVarSlotErrorMessage(theEnv,str);
+               SetEvaluationError(theEnv,true);
+               return true;
+              }
+              
+            theExp->type = FCALL;
+            theExp->value = func;
+            theExp->argList = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,ndepth));
+            theExp->argList->nextArg = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,posn));
+            theExp->argList->nextArg->nextArg = GenConstant(theEnv,TokenTypeToType(itkn.tknType),itkn.value);
+            theExp->argList->nextArg->nextArg->nextArg = GenConstant(theEnv,SYMBOL_TYPE,CreateSymbol(theEnv,str));
+            return false;
+           }
+        }
+     }
+     
+   return false;
+  }
+
+/********************************************************************
+  NAME         : IsQueryFunction
+  DESCRIPTION  : Determines if an expression is a query function call
+  INPUTS       : The expression
+  RETURNS      : True if query function call, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************************/
+static bool IsQueryFunction(
+  Expression *theExp)
+  {
+   int (*fptr)(void);
+
+   if (theExp->type != FCALL)
+     return false;
+   fptr = (int (*)(void)) ExpressionFunctionPointer(theExp);
+   if (fptr == (int (*)(void)) AnyInstances)
+     return true;
+   if (fptr == (int (*)(void)) QueryFindInstance)
+     return true;
+   if (fptr == (int (*)(void)) QueryFindAllInstances)
+     return true;
+   if (fptr == (int (*)(void)) QueryDoForInstance)
+     return true;
+   if (fptr == (int (*)(void)) QueryDoForAllInstances)
+     return true;
+   if (fptr == (int (*)(void)) DelayedQueryDoForAllInstances)
+     return true;
+   return false;
+  }
+
+#endif
diff --git a/clips/insqypsr.h b/clips/insqypsr.h
new file mode 100755
index 000000000..348ace2a1
--- /dev/null
+++ b/clips/insqypsr.h
@@ -0,0 +1,63 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Fixed memory leaks when error occurred.        */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_insqypsr
+
+#pragma once
+
+#define _H_insqypsr
+
+#if INSTANCE_SET_QUERIES
+
+#include "expressn.h"
+
+   Expression                    *ParseQueryNoAction(Environment *,Expression *,const char *);
+   Expression                    *ParseQueryAction(Environment *,Expression *,const char *);
+
+#endif /* INSTANCE_SET_QUERIES && (! RUN_TIME) */
+
+#endif /* _H_insqypsr */
+
+
+
diff --git a/clips/iofun.c b/clips/iofun.c
new file mode 100755
index 000000000..6dfd5d053
--- /dev/null
+++ b/clips/iofun.c
@@ -0,0 +1,2045 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/05/18             */
+   /*                                                     */
+   /*                I/O FUNCTIONS MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for several I/O functions      */
+/*   including printout, read, open, close, remove, rename,  */
+/*   format, and readline.                                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*      Gary D. Riley                                        */
+/*      Bebe Ly                                              */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added the get-char, set-locale, and            */
+/*            read-number functions.                         */
+/*                                                           */
+/*            Modified printing of floats in the format      */
+/*            function to use the locale from the set-locale */
+/*            function.                                      */
+/*                                                           */
+/*            Moved IllegalLogicalNameMessage function to    */
+/*            argacces.c.                                    */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Removed the undocumented use of t in the       */
+/*            printout command to perform the same function  */
+/*            as crlf.                                       */
+/*                                                           */
+/*            Replaced EXT_IO and BASIC_IO compiler flags    */
+/*            with IO_FUNCTIONS compiler flag.               */
+/*                                                           */
+/*            Added rb and ab and removed r+ modes for the   */
+/*            open function.                                 */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added put-char function.                       */
+/*                                                           */
+/*            Added SetFullCRLF which allows option to       */
+/*            specify crlf as \n or \r\n.                    */
+/*                                                           */
+/*            Added AwaitingInput flag.                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Added STDOUT and STDIN logical name            */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.40: Modified ReadTokenFromStdin to capture         */
+/*            carriage returns in the input buffer so that   */
+/*            input buffer count will accurately reflect     */
+/*            the number of characters typed for GUI         */
+/*            interfaces that support deleting carriage      */
+/*            returns.                                       */
+/*                                                           */
+/*            Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added print and println functions.             */
+/*                                                           */
+/*            Read function now returns symbols for tokens   */
+/*            that are not primitive values.                 */
+/*                                                           */
+/*            Added unget-char function.                     */
+/*                                                           */
+/*            Added r+, w+, a+, rb+, wb+, and ab+ file       */
+/*            access modes for the open function.            */
+/*                                                           */
+/*            Added flush, rewind, tell, seek, and chdir     */
+/*            functions.                                     */
+/*                                                           */
+/*            Changed error return value of read, readline,  */
+/*            and read-number functions to FALSE and added   */
+/*            an error code for read.                        */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if IO_FUNCTIONS
+#include <locale.h>
+#include <stdlib.h>
+#include <ctype.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "commline.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "filertr.h"
+#include "memalloc.h"
+#include "miscfun.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "iofun.h"
+
+/***************/
+/* DEFINITIONS */
+/***************/
+
+#define FORMAT_MAX 512
+#define FLAG_MAX    80
+
+/********************/
+/* ENVIRONMENT DATA */
+/********************/
+
+#define IO_FUNCTION_DATA 64
+
+struct IOFunctionData
+  {
+   CLIPSLexeme *locale;
+   bool useFullCRLF;
+  };
+
+#define IOFunctionData(theEnv) ((struct IOFunctionData *) GetEnvironmentData(theEnv,IO_FUNCTION_DATA))
+
+/****************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS  */
+/****************************************/
+
+#if IO_FUNCTIONS
+   static void             ReadTokenFromStdin(Environment *,struct token *);
+   static const char      *ControlStringCheck(UDFContext *,unsigned int);
+   static char             FindFormatFlag(const char *,size_t *,char *,size_t);
+   static const char      *PrintFormatFlag(UDFContext *,const char *,unsigned int,int);
+   static char            *FillBuffer(Environment *,const char *,size_t *,size_t *);
+   static void             ReadNumber(Environment *,const char *,struct token *,bool);
+   static void             PrintDriver(UDFContext *,const char *,bool);
+#endif
+
+/**************************************/
+/* IOFunctionDefinitions: Initializes */
+/*   the I/O functions.               */
+/**************************************/
+void IOFunctionDefinitions(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,IO_FUNCTION_DATA,sizeof(struct IOFunctionData),NULL);
+
+#if IO_FUNCTIONS
+   IOFunctionData(theEnv)->useFullCRLF = false;
+   IOFunctionData(theEnv)->locale = CreateSymbol(theEnv,setlocale(LC_ALL,NULL));
+   IncrementLexemeCount(IOFunctionData(theEnv)->locale);
+#endif
+
+#if ! RUN_TIME
+#if IO_FUNCTIONS
+   AddUDF(theEnv,"printout","v",1,UNBOUNDED,"*;ldsyn",PrintoutFunction,"PrintoutFunction",NULL);
+   AddUDF(theEnv,"print","v",0,UNBOUNDED,NULL,PrintFunction,"PrintFunction",NULL);
+   AddUDF(theEnv,"println","v",0,UNBOUNDED,NULL,PrintlnFunction,"PrintlnFunction",NULL);
+   AddUDF(theEnv,"read","synldfie",0,1,";ldsyn",ReadFunction,"ReadFunction",NULL);
+   AddUDF(theEnv,"open","b",2,3,"*;sy;ldsyn;s",OpenFunction,"OpenFunction",NULL);
+   AddUDF(theEnv,"close","b",0,1,"ldsyn",CloseFunction,"CloseFunction",NULL);
+   AddUDF(theEnv,"flush","b",0,1,"ldsyn",FlushFunction,"FlushFunction",NULL);
+   AddUDF(theEnv,"rewind","b",1,1,";ldsyn",RewindFunction,"RewindFunction",NULL);
+   AddUDF(theEnv,"tell","lb",1,1,";ldsyn",TellFunction,"TellFunction",NULL);
+   AddUDF(theEnv,"seek","b",3,3,";ldsyn;l;y",SeekFunction,"SeekFunction",NULL);
+   AddUDF(theEnv,"get-char","l",0,1,";ldsyn",GetCharFunction,"GetCharFunction",NULL);
+   AddUDF(theEnv,"unget-char","l",1,2,";ldsyn;l",UngetCharFunction,"UngetCharFunction",NULL);
+   AddUDF(theEnv,"put-char","v",1,2,";ldsyn;l",PutCharFunction,"PutCharFunction",NULL);
+   AddUDF(theEnv,"remove","b",1,1,"sy",RemoveFunction,"RemoveFunction",NULL);
+   AddUDF(theEnv,"rename","b",2,2,"sy",RenameFunction,"RenameFunction",NULL);
+   AddUDF(theEnv,"format","s",2,UNBOUNDED,"*;ldsyn;s",FormatFunction,"FormatFunction",NULL);
+   AddUDF(theEnv,"readline","sy",0,1,";ldsyn",ReadlineFunction,"ReadlineFunction",NULL);
+   AddUDF(theEnv,"set-locale","sy",0,1,";s",SetLocaleFunction,"SetLocaleFunction",NULL);
+   AddUDF(theEnv,"read-number","syld",0,1,";ldsyn",ReadNumberFunction,"ReadNumberFunction",NULL);
+   AddUDF(theEnv,"chdir","b",0,1,"sy",ChdirFunction,"ChdirFunction",NULL);
+#endif
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+#if IO_FUNCTIONS
+
+/******************************************/
+/* PrintoutFunction: H/L access routine   */
+/*   for the printout function.           */
+/******************************************/
+void PrintoutFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *logicalName;
+
+   /*=====================================================*/
+   /* Get the logical name to which output is to be sent. */
+   /*=====================================================*/
+
+   logicalName = GetLogicalName(context,STDOUT);
+   if (logicalName == NULL)
+     {
+      IllegalLogicalNameMessage(theEnv,"printout");
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+   /*============================================================*/
+   /* Determine if any router recognizes the output destination. */
+   /*============================================================*/
+
+   if (strcmp(logicalName,"nil") == 0)
+     { return; }
+   else if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      return;
+     }
+
+   /*========================*/
+   /* Call the print driver. */
+   /*========================*/
+
+   PrintDriver(context,logicalName,false);
+  }
+
+/*************************************/
+/* PrintFunction: H/L access routine */
+/*   for the print function.         */
+/*************************************/
+void PrintFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PrintDriver(context,STDOUT,false);
+  }
+
+/*************************************/
+/* PrintlnFunction: H/L access routine */
+/*   for the println function.         */
+/*************************************/
+void PrintlnFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PrintDriver(context,STDOUT,true);
+  }
+
+/*************************************************/
+/* PrintDriver: Driver routine for the printout, */
+/*   print, and println functions.               */
+/*************************************************/
+static void PrintDriver(
+  UDFContext *context,
+  const char *logicalName,
+  bool endCRLF)
+  {
+   UDFValue theArg;
+   Environment *theEnv = context->environment;
+
+   /*==============================*/
+   /* Print each of the arguments. */
+   /*==============================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,ANY_TYPE_BITS,&theArg))
+        { break; }
+
+      if (EvaluationData(theEnv)->HaltExecution) break;
+
+      switch(theArg.header->type)
+        {
+         case SYMBOL_TYPE:
+           if (strcmp(theArg.lexemeValue->contents,"crlf") == 0)
+             {
+              if (IOFunctionData(theEnv)->useFullCRLF)
+                { WriteString(theEnv,logicalName,"\r\n"); }
+              else
+                { WriteString(theEnv,logicalName,"\n"); }
+             }
+           else if (strcmp(theArg.lexemeValue->contents,"tab") == 0)
+             { WriteString(theEnv,logicalName,"\t"); }
+           else if (strcmp(theArg.lexemeValue->contents,"vtab") == 0)
+             { WriteString(theEnv,logicalName,"\v"); }
+           else if (strcmp(theArg.lexemeValue->contents,"ff") == 0)
+             { WriteString(theEnv,logicalName,"\f"); }
+           else
+             { WriteString(theEnv,logicalName,theArg.lexemeValue->contents); }
+           break;
+
+         case STRING_TYPE:
+           WriteString(theEnv,logicalName,theArg.lexemeValue->contents);
+           break;
+
+         default:
+           WriteUDFValue(theEnv,logicalName,&theArg);
+           break;
+        }
+     }
+
+   if (endCRLF)
+     {
+      if (IOFunctionData(theEnv)->useFullCRLF)
+        { WriteString(theEnv,logicalName,"\r\n"); }
+      else
+        { WriteString(theEnv,logicalName,"\n"); }
+     }
+  }
+
+/*****************************************************/
+/* SetFullCRLF: Set the flag which indicates whether */
+/*   crlf is treated just as '\n' or '\r\n'.         */
+/*****************************************************/
+bool SetFullCRLF(
+  Environment *theEnv,
+  bool value)
+  {
+   bool oldValue = IOFunctionData(theEnv)->useFullCRLF;
+
+   IOFunctionData(theEnv)->useFullCRLF = value;
+
+   return(oldValue);
+  }
+
+/*************************************************************/
+/* ReadFunction: H/L access routine for the read function.   */
+/*************************************************************/
+void ReadFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   struct token theToken;
+   const char *logicalName = NULL;
+
+   ClearErrorValue(theEnv);
+
+   /*======================================================*/
+   /* Determine the logical name from which input is read. */
+   /*======================================================*/
+
+   if (! UDFHasNextArgument(context))
+     { logicalName = STDIN; }
+   else
+     {
+      logicalName = GetLogicalName(context,STDIN);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"read");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         SetErrorValue(theEnv,&CreateSymbol(theEnv,"LOGICAL_NAME_ERROR")->header);
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+
+   /*============================================*/
+   /* Check to see that the logical name exists. */
+   /*============================================*/
+
+   if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      SetErrorValue(theEnv,&CreateSymbol(theEnv,"LOGICAL_NAME_ERROR")->header);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*=======================================*/
+   /* Collect input into string if the read */
+   /* source is stdin, else just get token. */
+   /*=======================================*/
+
+   if (strcmp(logicalName,STDIN) == 0)
+     { ReadTokenFromStdin(theEnv,&theToken); }
+   else
+     { GetToken(theEnv,logicalName,&theToken); }
+
+   /*====================================================*/
+   /* Copy the token to the return value data structure. */
+   /*====================================================*/
+
+   if ((theToken.tknType == FLOAT_TOKEN) || (theToken.tknType == STRING_TOKEN) ||
+#if OBJECT_SYSTEM
+       (theToken.tknType == INSTANCE_NAME_TOKEN) ||
+#endif
+       (theToken.tknType == SYMBOL_TOKEN) || (theToken.tknType == INTEGER_TOKEN))
+     { returnValue->value = theToken.value; }
+   else if (theToken.tknType == STOP_TOKEN)
+     {
+      SetErrorValue(theEnv,&CreateSymbol(theEnv,"EOF")->header);
+      returnValue->value = CreateSymbol(theEnv,"EOF");
+     }
+   else if (theToken.tknType == UNKNOWN_VALUE_TOKEN)
+     {
+      SetErrorValue(theEnv,&CreateSymbol(theEnv,"READ_ERROR")->header);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+     }
+   else
+     { returnValue->value = CreateSymbol(theEnv,theToken.printForm); }
+  }
+
+/********************************************************/
+/* ReadTokenFromStdin: Special routine used by the read */
+/*   function to read a token from standard input.      */
+/********************************************************/
+static void ReadTokenFromStdin(
+  Environment *theEnv,
+  struct token *theToken)
+  {
+   char *inputString;
+   size_t inputStringSize;
+   int inchar;
+
+   /*===========================================*/
+   /* Initialize the variables used for storing */
+   /* the characters retrieved from stdin.      */
+   /*===========================================*/
+
+   inputString = NULL;
+   RouterData(theEnv)->CommandBufferInputCount = 0;
+   RouterData(theEnv)->InputUngets = 0;
+   RouterData(theEnv)->AwaitingInput = true;
+   inputStringSize = 0;
+
+   /*=============================================*/
+   /* Continue processing until a token is found. */
+   /*=============================================*/
+
+   theToken->tknType = STOP_TOKEN;
+   while (theToken->tknType == STOP_TOKEN)
+     {
+      /*========================================================*/
+      /* Continue reading characters until a carriage return is */
+      /* entered or the user halts execution (usually with      */
+      /* control-c). Waiting for the carriage return prevents   */
+      /* the input from being prematurely parsed (such as when  */
+      /* a space is entered after a symbol has been typed).     */
+      /*========================================================*/
+
+      inchar = ReadRouter(theEnv,STDIN);
+
+      while ((inchar != '\n') && (inchar != '\r') && (inchar != EOF) &&
+             (! GetHaltExecution(theEnv)))
+        {
+         inputString = ExpandStringWithChar(theEnv,inchar,inputString,&RouterData(theEnv)->CommandBufferInputCount,
+                                            &inputStringSize,inputStringSize + 80);
+         inchar = ReadRouter(theEnv,STDIN);
+        }
+
+      /*====================================================*/
+      /* Add the final carriage return to the input buffer. */
+      /*====================================================*/
+
+      if  ((inchar == '\n') || (inchar == '\r'))
+        {
+         inputString = ExpandStringWithChar(theEnv,inchar,inputString,&RouterData(theEnv)->CommandBufferInputCount,
+                                            &inputStringSize,inputStringSize + 80);
+        }
+
+      /*==================================================*/
+      /* Open a string input source using the characters  */
+      /* retrieved from stdin and extract the first token */
+      /* contained in the string.                         */
+      /*==================================================*/
+
+      OpenStringSource(theEnv,"read",inputString,0);
+      GetToken(theEnv,"read",theToken);
+      CloseStringSource(theEnv,"read");
+
+      /*===========================================*/
+      /* Pressing control-c (or comparable action) */
+      /* aborts the read function.                 */
+      /*===========================================*/
+
+      if (GetHaltExecution(theEnv))
+        {
+         SetErrorValue(theEnv,&CreateSymbol(theEnv,"READ_ERROR")->header);
+         theToken->tknType = SYMBOL_TOKEN;
+         theToken->value = FalseSymbol(theEnv);
+        }
+
+      /*====================================================*/
+      /* Return the EOF symbol if the end of file for stdin */
+      /* has been encountered. This typically won't occur,  */
+      /* but is possible (for example by pressing control-d */
+      /* in the UNIX operating system).                     */
+      /*====================================================*/
+
+      if ((theToken->tknType == STOP_TOKEN) && (inchar == EOF))
+        {
+         theToken->tknType = SYMBOL_TOKEN;
+         theToken->value = CreateSymbol(theEnv,"EOF");
+        }
+     }
+
+   if (inputStringSize > 0) rm(theEnv,inputString,inputStringSize);
+   
+   RouterData(theEnv)->CommandBufferInputCount = 0;
+   RouterData(theEnv)->InputUngets = 0;
+   RouterData(theEnv)->AwaitingInput = false;
+  }
+
+/*************************************************************/
+/* OpenFunction: H/L access routine for the open function.   */
+/*************************************************************/
+void OpenFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *fileName, *logicalName, *accessMode = NULL;
+   UDFValue theArg;
+
+   /*====================*/
+   /* Get the file name. */
+   /*====================*/
+
+   if ((fileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*=======================================*/
+   /* Get the logical name to be associated */
+   /* with the opened file.                 */
+   /*=======================================*/
+
+   logicalName = GetLogicalName(context,NULL);
+   if (logicalName == NULL)
+     {
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      IllegalLogicalNameMessage(theEnv,"open");
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*==================================*/
+   /* Check to see if the logical name */
+   /* is already in use.               */
+   /*==================================*/
+
+   if (FindFile(theEnv,logicalName,NULL))
+     {
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      PrintErrorID(theEnv,"IOFUN",2,false);
+      WriteString(theEnv,STDERR,"Logical name '");
+      WriteString(theEnv,STDERR,logicalName);
+      WriteString(theEnv,STDERR,"' already in use.\n");
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*===========================*/
+   /* Get the file access mode. */
+   /*===========================*/
+
+   if (! UDFHasNextArgument(context))
+     { accessMode = "r"; }
+   else
+     {
+      if (! UDFNextArgument(context,STRING_BIT,&theArg))
+        { return; }
+      accessMode = theArg.lexemeValue->contents;
+     }
+
+   /*=====================================*/
+   /* Check for a valid file access mode. */
+   /*=====================================*/
+
+   if ((strcmp(accessMode,"r") != 0) &&
+       (strcmp(accessMode,"r+") != 0) &&
+       (strcmp(accessMode,"w") != 0) &&
+       (strcmp(accessMode,"w+") != 0) &&
+       (strcmp(accessMode,"a") != 0) &&
+       (strcmp(accessMode,"a+") != 0) &&
+       (strcmp(accessMode,"rb") != 0) &&
+       (strcmp(accessMode,"r+b") != 0) &&
+       (strcmp(accessMode,"rb+") != 0) &&
+       (strcmp(accessMode,"wb") != 0) &&
+       (strcmp(accessMode,"w+b") != 0) &&
+       (strcmp(accessMode,"wb+") != 0) &&
+       (strcmp(accessMode,"ab") != 0) &&
+       (strcmp(accessMode,"a+b") != 0) &&
+       (strcmp(accessMode,"ab+")))
+     {
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      ExpectedTypeError1(theEnv,"open",3,"'file access mode string'");
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*================================================*/
+   /* Open the named file and associate it with the  */
+   /* specified logical name. Return TRUE if the     */
+   /* file was opened successfully, otherwise FALSE. */
+   /*================================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,OpenAFile(theEnv,fileName,accessMode,logicalName));
+  }
+
+/*************************************************************/
+/* CloseFunction: H/L access routine for the close function. */
+/*************************************************************/
+void CloseFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *logicalName;
+
+   /*=====================================================*/
+   /* If no arguments are specified, then close all files */
+   /* opened with the open command. Return true if all    */
+   /* files were closed successfully, otherwise false.    */
+   /*=====================================================*/
+
+   if (! UDFHasNextArgument(context))
+     {
+      returnValue->lexemeValue = CreateBoolean(theEnv,CloseAllFiles(theEnv));
+      return;
+     }
+
+   /*================================*/
+   /* Get the logical name argument. */
+   /*================================*/
+
+   logicalName = GetLogicalName(context,NULL);
+   if (logicalName == NULL)
+     {
+      IllegalLogicalNameMessage(theEnv,"close");
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*========================================================*/
+   /* Close the file associated with the specified logical   */
+   /* name. Return true if the file was closed successfully, */
+   /* otherwise false.                                       */
+   /*========================================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,CloseFile(theEnv,logicalName));
+  }
+
+/*************************************************************/
+/* FlushFunction: H/L access routine for the flush function. */
+/*************************************************************/
+void FlushFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *logicalName;
+
+   /*=====================================================*/
+   /* If no arguments are specified, then flush all files */
+   /* opened with the open command. Return true if all    */
+   /* files were flushed successfully, otherwise false.   */
+   /*=====================================================*/
+
+   if (! UDFHasNextArgument(context))
+     {
+      returnValue->lexemeValue = CreateBoolean(theEnv,FlushAllFiles(theEnv));
+      return;
+     }
+
+   /*================================*/
+   /* Get the logical name argument. */
+   /*================================*/
+
+   logicalName = GetLogicalName(context,NULL);
+   if (logicalName == NULL)
+     {
+      IllegalLogicalNameMessage(theEnv,"flush");
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*=========================================================*/
+   /* Flush the file associated with the specified logical    */
+   /* name. Return true if the file was flushed successfully, */
+   /* otherwise false.                                        */
+   /*=========================================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,FlushFile(theEnv,logicalName));
+  }
+
+/***************************************************************/
+/* RewindFunction: H/L access routine for the rewind function. */
+/***************************************************************/
+void RewindFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *logicalName;
+
+   /*================================*/
+   /* Get the logical name argument. */
+   /*================================*/
+
+   logicalName = GetLogicalName(context,NULL);
+   if (logicalName == NULL)
+     {
+      IllegalLogicalNameMessage(theEnv,"flush");
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+     
+   /*============================================*/
+   /* Check to see that the logical name exists. */
+   /*============================================*/
+
+   if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*=========================================================*/
+   /* Rewind the file associated with the specified logical   */
+   /* name. Return true if the file was rewound successfully, */
+   /* otherwise false.                                        */
+   /*=========================================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,RewindFile(theEnv,logicalName));
+  }
+
+/***********************************************************/
+/* TellFunction: H/L access routine for the tell function. */
+/***********************************************************/
+void TellFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *logicalName;
+   long long rv;
+
+   /*================================*/
+   /* Get the logical name argument. */
+   /*================================*/
+
+   logicalName = GetLogicalName(context,NULL);
+   if (logicalName == NULL)
+     {
+      IllegalLogicalNameMessage(theEnv,"tell");
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+     
+   /*============================================*/
+   /* Check to see that the logical name exists. */
+   /*============================================*/
+
+   if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*===========================*/
+   /* Return the file position. */
+   /*===========================*/
+
+   rv = TellFile(theEnv,logicalName);
+
+   if (rv == LLONG_MIN)
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+   else
+     { returnValue->integerValue = CreateInteger(theEnv,rv); }
+  }
+
+/***********************************************************/
+/* SeekFunction: H/L access routine for the seek function. */
+/***********************************************************/
+void SeekFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *logicalName;
+   UDFValue theArg;
+   long offset;
+   const char *seekCode;
+
+   /*================================*/
+   /* Get the logical name argument. */
+   /*================================*/
+
+   logicalName = GetLogicalName(context,NULL);
+   if (logicalName == NULL)
+     {
+      IllegalLogicalNameMessage(theEnv,"seek");
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+     
+   /*============================================*/
+   /* Check to see that the logical name exists. */
+   /*============================================*/
+
+   if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+     
+   /*=================*/
+   /* Get the offset. */
+   /*=================*/
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+     
+   offset = (long) theArg.integerValue->contents;
+
+   /*====================*/
+   /* Get the seek code. */
+   /*====================*/
+
+   if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+     
+   seekCode = theArg.lexemeValue->contents;
+
+   if (strcmp(seekCode,"seek-set") == 0)
+     { returnValue->lexemeValue = CreateBoolean(theEnv,SeekFile(theEnv,logicalName,offset,SEEK_SET)); }
+   else if (strcmp(seekCode,"seek-cur") == 0)
+     { returnValue->lexemeValue = CreateBoolean(theEnv,SeekFile(theEnv,logicalName,offset,SEEK_CUR)); }
+   else if (strcmp(seekCode,"seek-end") == 0)
+     { returnValue->lexemeValue = CreateBoolean(theEnv,SeekFile(theEnv,logicalName,offset,SEEK_END)); }
+   else
+     {
+      UDFInvalidArgumentMessage(context,
+         "symbol with value seek-set, seek-cur, or seek-end");
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+  }
+
+/***************************************/
+/* GetCharFunction: H/L access routine */
+/*   for the get-char function.        */
+/***************************************/
+void GetCharFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *logicalName;
+   
+   /*================================*/
+   /* Get the logical name argument. */
+   /*================================*/
+
+   if (! UDFHasNextArgument(context))
+     { logicalName = STDIN; }
+   else
+     {
+      logicalName = GetLogicalName(context,STDIN);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"get-char");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         returnValue->integerValue = CreateInteger(theEnv,-1);
+         return;
+        }
+     }
+     
+   /*============================================*/
+   /* Check to see that the logical name exists. */
+   /*============================================*/
+
+   if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->integerValue = CreateInteger(theEnv,-1);
+      return;
+     }
+
+   if (strcmp(logicalName,STDIN) == 0)
+     {
+      if (RouterData(theEnv)->InputUngets > 0)
+        {
+         returnValue->integerValue = CreateInteger(theEnv,ReadRouter(theEnv,logicalName));
+         RouterData(theEnv)->InputUngets--;
+        }
+      else
+        {
+         int theChar;
+         
+         RouterData(theEnv)->AwaitingInput = true;
+         theChar = ReadRouter(theEnv,logicalName);
+         RouterData(theEnv)->AwaitingInput = false;
+
+         if (theChar == '\b')
+           {
+            if (RouterData(theEnv)->CommandBufferInputCount > 0)
+              { RouterData(theEnv)->CommandBufferInputCount--; }
+           }
+         else
+           { RouterData(theEnv)->CommandBufferInputCount++; }
+
+         returnValue->integerValue = CreateInteger(theEnv,theChar);
+        }
+      
+      return;
+     }
+      
+   returnValue->integerValue = CreateInteger(theEnv,ReadRouter(theEnv,logicalName));
+  }
+
+/*****************************************/
+/* UngetCharFunction: H/L access routine */
+/*   for the unget-char function.        */
+/*****************************************/
+void UngetCharFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int numberOfArguments;
+   const char *logicalName;
+   UDFValue theArg;
+   long long theChar;
+
+   numberOfArguments = UDFArgumentCount(context);
+
+   /*=======================*/
+   /* Get the logical name. */
+   /*=======================*/
+
+   if (numberOfArguments == 1)
+     { logicalName = STDIN; }
+   else
+     {
+      logicalName = GetLogicalName(context,STDIN);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"ungetc-char");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         returnValue->integerValue = CreateInteger(theEnv,-1);
+         return;
+        }
+     }
+
+   if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->integerValue = CreateInteger(theEnv,-1);
+      return;
+     }
+
+   /*=============================*/
+   /* Get the character to unget. */
+   /*=============================*/
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+     { return; }
+
+   theChar = theArg.integerValue->contents;
+   if (theChar == -1)
+     {
+      returnValue->integerValue = CreateInteger(theEnv,-1);
+      return;
+     }
+
+   /*=======================*/
+   /* Ungetc the character. */
+   /*=======================*/
+
+   if (strcmp(logicalName,STDIN) == 0)
+     { RouterData(theEnv)->InputUngets++; }
+   
+   returnValue->integerValue = CreateInteger(theEnv,UnreadRouter(theEnv,logicalName,(int) theChar));
+  }
+
+/***************************************/
+/* PutCharFunction: H/L access routine */
+/*   for the put-char function.        */
+/***************************************/
+void PutCharFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int numberOfArguments;
+   const char *logicalName;
+   UDFValue theArg;
+   long long theChar;
+   FILE *theFile;
+
+   numberOfArguments = UDFArgumentCount(context);
+
+   /*=======================*/
+   /* Get the logical name. */
+   /*=======================*/
+
+   if (numberOfArguments == 1)
+     { logicalName = STDOUT; }
+   else
+     {
+      logicalName = GetLogicalName(context,STDOUT);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"put-char");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+     }
+
+   if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+   /*===========================*/
+   /* Get the character to put. */
+   /*===========================*/
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+     { return; }
+
+   theChar = theArg.integerValue->contents;
+
+   /*===================================================*/
+   /* If the "fast load" option is being used, then the */
+   /* logical name is actually a pointer to a file and  */
+   /* we can bypass the router and directly output the  */
+   /* value.                                            */
+   /*===================================================*/
+
+   theFile = FindFptr(theEnv,logicalName);
+   if (theFile != NULL)
+     { putc((int) theChar,theFile); }
+  }
+
+/****************************************/
+/* RemoveFunction: H/L access routine   */
+/*   for the remove function.           */
+/****************************************/
+void RemoveFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *theFileName;
+
+   /*====================*/
+   /* Get the file name. */
+   /*====================*/
+
+   if ((theFileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*==============================================*/
+   /* Remove the file. Return true if the file was */
+   /* sucessfully removed, otherwise false.        */
+   /*==============================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,genremove(theEnv,theFileName));
+  }
+
+/****************************************/
+/* RenameFunction: H/L access routine   */
+/*   for the rename function.           */
+/****************************************/
+void RenameFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *oldFileName, *newFileName;
+
+   /*===========================*/
+   /* Check for the file names. */
+   /*===========================*/
+
+   if ((oldFileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if ((newFileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*==============================================*/
+   /* Rename the file. Return true if the file was */
+   /* sucessfully renamed, otherwise false.        */
+   /*==============================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,genrename(theEnv,oldFileName,newFileName));
+  }
+
+/*************************************/
+/* ChdirFunction: H/L access routine */
+/*   for the chdir function.         */
+/*************************************/
+void ChdirFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *theFileName;
+   int success;
+
+   /*===============================================*/
+   /* If called with no arguments, the return value */
+   /* indicates whether chdir is supported.         */
+   /*===============================================*/
+   
+   if (! UDFHasNextArgument(context))
+     {
+      if (genchdir(theEnv,NULL))
+        { returnValue->lexemeValue = TrueSymbol(theEnv); }
+      else
+        { returnValue->lexemeValue = FalseSymbol(theEnv); }
+        
+      return;
+     }
+
+   /*====================*/
+   /* Get the file name. */
+   /*====================*/
+
+   if ((theFileName = GetFileName(context)) == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*==================================================*/
+   /* Change the directory. Return TRUE if successful, */
+   /* FALSE if unsuccessful, and UNSUPPORTED if the    */
+   /* chdir functionality is not implemented.          */
+   /*==================================================*/
+
+   success = genchdir(theEnv,theFileName);
+   
+   switch (success)
+     {
+      case 1:
+        returnValue->lexemeValue = TrueSymbol(theEnv);
+        break;
+        
+      case 0:
+        returnValue->lexemeValue = FalseSymbol(theEnv);
+        break;
+
+      default:
+        WriteString(theEnv,STDERR,"The chdir function is not supported on this system.\n");
+        SetHaltExecution(theEnv,true);
+        SetEvaluationError(theEnv,true);
+        returnValue->lexemeValue = FalseSymbol(theEnv);
+        break;
+     }
+  }
+
+/****************************************/
+/* FormatFunction: H/L access routine   */
+/*   for the format function.           */
+/****************************************/
+void FormatFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int argCount;
+   size_t start_pos;
+   const char *formatString;
+   const char *logicalName;
+   char formatFlagType;
+   unsigned int f_cur_arg = 3;
+   size_t form_pos = 0;
+   char percentBuffer[FLAG_MAX];
+   char *fstr = NULL;
+   size_t fmaxm = 0;
+   size_t fpos = 0;
+   void *hptr;
+   const char *theString;
+
+   /*======================================*/
+   /* Set default return value for errors. */
+   /*======================================*/
+
+   hptr = CreateString(theEnv,"");
+
+   /*=========================================*/
+   /* Format requires at least two arguments: */
+   /* a logical name and a format string.     */
+   /*=========================================*/
+
+   argCount = UDFArgumentCount(context);
+
+   /*========================================*/
+   /* First argument must be a logical name. */
+   /*========================================*/
+
+   if ((logicalName = GetLogicalName(context,STDOUT)) == NULL)
+     {
+      IllegalLogicalNameMessage(theEnv,"format");
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->value = hptr;
+      return;
+     }
+
+   if (strcmp(logicalName,"nil") == 0)
+     { /* do nothing */ }
+   else if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      returnValue->value = hptr;
+      return;
+     }
+
+   /*=====================================================*/
+   /* Second argument must be a string.  The appropriate  */
+   /* number of arguments specified by the string must be */
+   /* present in the argument list.                       */
+   /*=====================================================*/
+
+   if ((formatString = ControlStringCheck(context,argCount)) == NULL)
+     {
+      returnValue->value = hptr;
+      return;
+     }
+
+   /*========================================*/
+   /* Search the format string, printing the */
+   /* format flags as they are encountered.  */
+   /*========================================*/
+
+   while (formatString[form_pos] != '\0')
+     {
+      if (formatString[form_pos] != '%')
+        {
+         start_pos = form_pos;
+         while ((formatString[form_pos] != '%') &&
+                (formatString[form_pos] != '\0'))
+           { form_pos++; }
+         fstr = AppendNToString(theEnv,&formatString[start_pos],fstr,form_pos-start_pos,&fpos,&fmaxm);
+        }
+      else
+        {
+		 form_pos++;
+         formatFlagType = FindFormatFlag(formatString,&form_pos,percentBuffer,FLAG_MAX);
+         if (formatFlagType != ' ')
+           {
+            if ((theString = PrintFormatFlag(context,percentBuffer,f_cur_arg,formatFlagType)) == NULL)
+              {
+               if (fstr != NULL) rm(theEnv,fstr,fmaxm);
+               returnValue->value = hptr;
+               return;
+              }
+            fstr = AppendToString(theEnv,theString,fstr,&fpos,&fmaxm);
+            if (fstr == NULL)
+              {
+               returnValue->value = hptr;
+               return;
+              }
+            f_cur_arg++;
+           }
+         else
+           {
+            fstr = AppendToString(theEnv,percentBuffer,fstr,&fpos,&fmaxm);
+            if (fstr == NULL)
+              {
+               returnValue->value = hptr;
+               return;
+              }
+           }
+        }
+     }
+
+   if (fstr != NULL)
+     {
+      hptr = CreateString(theEnv,fstr);
+      if (strcmp(logicalName,"nil") != 0) WriteString(theEnv,logicalName,fstr);
+      rm(theEnv,fstr,fmaxm);
+     }
+   else
+     { hptr = CreateString(theEnv,""); }
+
+   returnValue->value = hptr;
+  }
+
+/*********************************************************************/
+/* ControlStringCheck:  Checks the 2nd parameter which is the format */
+/*   control string to see if there are enough matching arguments.   */
+/*********************************************************************/
+static const char *ControlStringCheck(
+  UDFContext *context,
+  unsigned int argCount)
+  {
+   UDFValue t_ptr;
+   const char *str_array;
+   char print_buff[FLAG_MAX];
+   size_t i;
+   unsigned int per_count;
+   char formatFlag;
+   Environment *theEnv = context->environment;
+
+   if (! UDFNthArgument(context,2,STRING_BIT,&t_ptr))
+     { return NULL; }
+
+   per_count = 0;
+   str_array = t_ptr.lexemeValue->contents;
+   for (i = 0; str_array[i] != '\0' ; )
+     {
+      if (str_array[i] == '%')
+        {
+         i++;
+         formatFlag = FindFormatFlag(str_array,&i,print_buff,FLAG_MAX);
+         if (formatFlag == '-')
+           {
+            PrintErrorID(theEnv,"IOFUN",3,false);
+            WriteString(theEnv,STDERR,"Invalid format flag \"");
+            WriteString(theEnv,STDERR,print_buff);
+            WriteString(theEnv,STDERR,"\" specified in format function.\n");
+            SetEvaluationError(theEnv,true);
+            return (NULL);
+           }
+         else if (formatFlag != ' ')
+           { per_count++; }
+        }
+      else
+        { i++; }
+     }
+
+   if ((per_count + 2) != argCount)
+     {
+      ExpectedCountError(theEnv,"format",EXACTLY,per_count+2);
+      SetEvaluationError(theEnv,true);
+      return (NULL);
+     }
+
+   return(str_array);
+  }
+
+/***********************************************/
+/* FindFormatFlag:  This function searches for */
+/*   a format flag in the format string.       */
+/***********************************************/
+static char FindFormatFlag(
+  const char *formatString,
+  size_t *a,
+  char *formatBuffer,
+  size_t bufferMax)
+  {
+   char inchar, formatFlagType;
+   size_t copy_pos = 0;
+
+   /*====================================================*/
+   /* Set return values to the default value. A blank    */
+   /* character indicates that no format flag was found  */
+   /* which requires a parameter.                        */
+   /*====================================================*/
+
+   formatFlagType = ' ';
+
+   /*=====================================================*/
+   /* The format flags for carriage returns, line feeds,  */
+   /* horizontal and vertical tabs, and the percent sign, */
+   /* do not require a parameter.                         */
+   /*=====================================================*/
+
+   if (formatString[*a] == 'n')
+     {
+      gensprintf(formatBuffer,"\n");
+      (*a)++;
+      return(formatFlagType);
+     }
+   else if (formatString[*a] == 'r')
+     {
+      gensprintf(formatBuffer,"\r");
+      (*a)++;
+      return(formatFlagType);
+     }
+   else if (formatString[*a] == 't')
+     {
+      gensprintf(formatBuffer,"\t");
+      (*a)++;
+      return(formatFlagType);
+     }
+   else if (formatString[*a] == 'v')
+     {
+      gensprintf(formatBuffer,"\v");
+      (*a)++;
+      return(formatFlagType);
+     }
+   else if (formatString[*a] == '%')
+     {
+      gensprintf(formatBuffer,"%%");
+      (*a)++;
+      return(formatFlagType);
+     }
+
+   /*======================================================*/
+   /* Identify the format flag which requires a parameter. */
+   /*======================================================*/
+
+   formatBuffer[copy_pos++] = '%';
+   formatBuffer[copy_pos] = '\0';
+   while ((formatString[*a] != '%') &&
+          (formatString[*a] != '\0') &&
+          (copy_pos < (bufferMax - 5)))
+     {
+      inchar = formatString[*a];
+      (*a)++;
+
+      if ( (inchar == 'd') ||
+           (inchar == 'o') ||
+           (inchar == 'x') ||
+           (inchar == 'u'))
+        {
+         formatFlagType = inchar;
+         formatBuffer[copy_pos++] = 'l';
+         formatBuffer[copy_pos++] = 'l';
+         formatBuffer[copy_pos++] = inchar;
+         formatBuffer[copy_pos] = '\0';
+         return(formatFlagType);
+        }
+      else if ( (inchar == 'c') ||
+                (inchar == 's') ||
+                (inchar == 'e') ||
+                (inchar == 'f') ||
+                (inchar == 'g') )
+        {
+         formatBuffer[copy_pos++] = inchar;
+         formatBuffer[copy_pos] = '\0';
+         formatFlagType = inchar;
+         return(formatFlagType);
+        }
+
+      /*=======================================================*/
+      /* If the type hasn't been read, then this should be the */
+      /* -M.N part of the format specification (where M and N  */
+      /* are integers).                                        */
+      /*=======================================================*/
+
+      if ( (! isdigit(inchar)) &&
+           (inchar != '.') &&
+           (inchar != '-') )
+        {
+         formatBuffer[copy_pos++] = inchar;
+         formatBuffer[copy_pos] = '\0';
+         return('-');
+        }
+
+      formatBuffer[copy_pos++] = inchar;
+      formatBuffer[copy_pos] = '\0';
+     }
+
+   return(formatFlagType);
+  }
+
+/**********************************************************************/
+/* PrintFormatFlag:  Prints out part of the total format string along */
+/*   with the argument for that part of the format string.            */
+/**********************************************************************/
+static const char *PrintFormatFlag(
+  UDFContext *context,
+  const char *formatString,
+  unsigned int whichArg,
+  int formatType)
+  {
+   UDFValue theResult;
+   const char *theString;
+   char *printBuffer;
+   size_t theLength;
+   CLIPSLexeme *oldLocale;
+   Environment *theEnv = context->environment;
+
+   /*=================*/
+   /* String argument */
+   /*=================*/
+
+   switch (formatType)
+     {
+      case 's':
+        if (! UDFNthArgument(context,whichArg,LEXEME_BITS,&theResult))
+          { return(NULL); }
+        theLength = strlen(formatString) + strlen(theResult.lexemeValue->contents) + 200;
+        printBuffer = (char *) gm2(theEnv,(sizeof(char) * theLength));
+        gensprintf(printBuffer,formatString,theResult.lexemeValue->contents);
+        break;
+
+      case 'c':
+        UDFNthArgument(context,whichArg,ANY_TYPE_BITS,&theResult);
+        if ((theResult.header->type == STRING_TYPE) ||
+            (theResult.header->type == SYMBOL_TYPE))
+          {
+           theLength = strlen(formatString) + 200;
+           printBuffer = (char *) gm2(theEnv,(sizeof(char) * theLength));
+           gensprintf(printBuffer,formatString,theResult.lexemeValue->contents[0]);
+          }
+        else if (theResult.header->type == INTEGER_TYPE)
+          {
+           theLength = strlen(formatString) + 200;
+           printBuffer = (char *) gm2(theEnv,(sizeof(char) * theLength));
+           gensprintf(printBuffer,formatString,(char) theResult.integerValue->contents);
+          }
+        else
+          {
+           ExpectedTypeError1(theEnv,"format",whichArg,"symbol, string, or integer");
+           return NULL;
+          }
+        break;
+
+      case 'd':
+      case 'x':
+      case 'o':
+      case 'u':
+        if (! UDFNthArgument(context,whichArg,NUMBER_BITS,&theResult))
+          { return(NULL); }
+        theLength = strlen(formatString) + 200;
+        printBuffer = (char *) gm2(theEnv,(sizeof(char) * theLength));
+
+        oldLocale = CreateSymbol(theEnv,setlocale(LC_NUMERIC,NULL));
+        setlocale(LC_NUMERIC,IOFunctionData(theEnv)->locale->contents);
+
+        if (theResult.header->type == FLOAT_TYPE)
+          { gensprintf(printBuffer,formatString,(long long) theResult.floatValue->contents); }
+        else
+          { gensprintf(printBuffer,formatString,theResult.integerValue->contents); }
+
+        setlocale(LC_NUMERIC,oldLocale->contents);
+        break;
+
+      case 'f':
+      case 'g':
+      case 'e':
+        if (! UDFNthArgument(context,whichArg,NUMBER_BITS,&theResult))
+          { return(NULL); }
+        theLength = strlen(formatString) + 200;
+        printBuffer = (char *) gm2(theEnv,(sizeof(char) * theLength));
+
+        oldLocale = CreateSymbol(theEnv,setlocale(LC_NUMERIC,NULL));
+
+        setlocale(LC_NUMERIC,IOFunctionData(theEnv)->locale->contents);
+
+        if (theResult.header->type == FLOAT_TYPE)
+          { gensprintf(printBuffer,formatString,theResult.floatValue->contents); }
+        else
+          { gensprintf(printBuffer,formatString,(double) theResult.integerValue->contents); }
+
+        setlocale(LC_NUMERIC,oldLocale->contents);
+
+        break;
+
+      default:
+         WriteString(theEnv,STDERR," Error in format, the conversion character");
+         WriteString(theEnv,STDERR," for formatted output is not valid\n");
+         return NULL;
+     }
+
+   theString = CreateString(theEnv,printBuffer)->contents;
+   rm(theEnv,printBuffer,sizeof(char) * theLength);
+   return(theString);
+  }
+
+/******************************************/
+/* ReadlineFunction: H/L access routine   */
+/*   for the readline function.           */
+/******************************************/
+void ReadlineFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   char *buffer;
+   size_t line_max = 0;
+   const char *logicalName;
+
+   if (! UDFHasNextArgument(context))
+     { logicalName = STDIN; }
+   else
+     {
+      logicalName = GetLogicalName(context,STDIN);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"readline");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+
+   if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if (strcmp(logicalName,STDIN) == 0)
+     {
+      RouterData(theEnv)->CommandBufferInputCount = 0;
+      RouterData(theEnv)->InputUngets = 0;
+      RouterData(theEnv)->AwaitingInput = true;
+   
+      buffer = FillBuffer(theEnv,logicalName,&RouterData(theEnv)->CommandBufferInputCount,&line_max);
+   
+      RouterData(theEnv)->CommandBufferInputCount = 0;
+      RouterData(theEnv)->InputUngets = 0;
+      RouterData(theEnv)->AwaitingInput = false;
+     }
+   else
+     {
+      size_t currentPos = 0;
+      
+      buffer = FillBuffer(theEnv,logicalName,&currentPos,&line_max);
+     }
+
+   if (GetHaltExecution(theEnv))
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      if (buffer != NULL) rm(theEnv,buffer,sizeof (char) * line_max);
+      return;
+     }
+
+   if (buffer == NULL)
+     {
+      returnValue->lexemeValue = CreateSymbol(theEnv,"EOF");
+      return;
+     }
+
+   returnValue->lexemeValue = CreateString(theEnv,buffer);
+   rm(theEnv,buffer,sizeof (char) * line_max);
+   return;
+  }
+
+/*************************************************************/
+/* FillBuffer: Read characters from a specified logical name */
+/*   and places them into a buffer until a carriage return   */
+/*   or end-of-file character is read.                       */
+/*************************************************************/
+static char *FillBuffer(
+  Environment *theEnv,
+  const char *logicalName,
+  size_t *currentPosition,
+  size_t *maximumSize)
+  {
+   int c;
+   char *buf = NULL;
+
+   /*================================*/
+   /* Read until end of line or eof. */
+   /*================================*/
+
+   c = ReadRouter(theEnv,logicalName);
+
+   if (c == EOF)
+     { return NULL; }
+
+   /*==================================*/
+   /* Grab characters until cr or eof. */
+   /*==================================*/
+
+   while ((c != '\n') && (c != '\r') && (c != EOF) &&
+          (! GetHaltExecution(theEnv)))
+     {
+      buf = ExpandStringWithChar(theEnv,c,buf,currentPosition,maximumSize,*maximumSize+80);
+      c = ReadRouter(theEnv,logicalName);
+     }
+
+   /*==================*/
+   /* Add closing EOS. */
+   /*==================*/
+
+   buf = ExpandStringWithChar(theEnv,EOS,buf,currentPosition,maximumSize,*maximumSize+80);
+   return (buf);
+  }
+
+/*****************************************/
+/* SetLocaleFunction: H/L access routine */
+/*   for the set-locale function.        */
+/*****************************************/
+void SetLocaleFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   /*=================================*/
+   /* If there are no arguments, just */
+   /* return the current locale.      */
+   /*=================================*/
+
+   if (! UDFHasNextArgument(context))
+     {
+      returnValue->value = IOFunctionData(theEnv)->locale;
+      return;
+     }
+
+   /*=================*/
+   /* Get the locale. */
+   /*=================*/
+
+   if (! UDFFirstArgument(context,STRING_BIT,&theArg))
+     { return; }
+
+   /*=====================================*/
+   /* Return the old value of the locale. */
+   /*=====================================*/
+
+   returnValue->value = IOFunctionData(theEnv)->locale;
+
+   /*======================================================*/
+   /* Change the value of the locale to the one specified. */
+   /*======================================================*/
+
+   ReleaseLexeme(theEnv,IOFunctionData(theEnv)->locale);
+   IOFunctionData(theEnv)->locale = theArg.lexemeValue;
+   IncrementLexemeCount(IOFunctionData(theEnv)->locale);
+  }
+
+/******************************************/
+/* ReadNumberFunction: H/L access routine */
+/*   for the read-number function.        */
+/******************************************/
+void ReadNumberFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   struct token theToken;
+   const char *logicalName = NULL;
+
+   /*======================================================*/
+   /* Determine the logical name from which input is read. */
+   /*======================================================*/
+
+   if (! UDFHasNextArgument(context))
+     { logicalName = STDIN; }
+   else
+     {
+      logicalName = GetLogicalName(context,STDIN);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"read");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+
+   /*============================================*/
+   /* Check to see that the logical name exists. */
+   /*============================================*/
+
+   if (QueryRouters(theEnv,logicalName) == false)
+     {
+      UnrecognizedRouterMessage(theEnv,logicalName);
+      SetHaltExecution(theEnv,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*=======================================*/
+   /* Collect input into string if the read */
+   /* source is stdin, else just get token. */
+   /*=======================================*/
+
+   if (strcmp(logicalName,STDIN) == 0)
+     {
+      RouterData(theEnv)->CommandBufferInputCount = 0;
+      RouterData(theEnv)->InputUngets = 0;
+      RouterData(theEnv)->AwaitingInput = true;
+      
+      ReadNumber(theEnv,logicalName,&theToken,true);
+      
+      RouterData(theEnv)->CommandBufferInputCount = 0;
+      RouterData(theEnv)->InputUngets = 0;
+      RouterData(theEnv)->AwaitingInput = false;
+     }
+   else
+     { ReadNumber(theEnv,logicalName,&theToken,false); }
+
+   /*====================================================*/
+   /* Copy the token to the return value data structure. */
+   /*====================================================*/
+
+   if ((theToken.tknType == FLOAT_TOKEN) || (theToken.tknType == STRING_TOKEN) ||
+#if OBJECT_SYSTEM
+       (theToken.tknType == INSTANCE_NAME_TOKEN) ||
+#endif
+       (theToken.tknType == SYMBOL_TOKEN) || (theToken.tknType == INTEGER_TOKEN))
+     { returnValue->value = theToken.value; }
+   else if (theToken.tknType == STOP_TOKEN)
+     { returnValue->value = CreateSymbol(theEnv,"EOF"); }
+   else if (theToken.tknType == UNKNOWN_VALUE_TOKEN)
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+   else
+     { returnValue->value = CreateString(theEnv,theToken.printForm); }
+
+   return;
+  }
+
+/********************************************/
+/* ReadNumber: Special routine used by the  */
+/*   read-number function to read a number. */
+/********************************************/
+static void ReadNumber(
+  Environment *theEnv,
+  const char *logicalName,
+  struct token *theToken,
+  bool isStdin)
+  {
+   char *inputString;
+   char *charPtr = NULL;
+   size_t inputStringSize;
+   int inchar;
+   long long theLong;
+   double theDouble;
+   CLIPSLexeme *oldLocale;
+
+   theToken->tknType = STOP_TOKEN;
+
+   /*===========================================*/
+   /* Initialize the variables used for storing */
+   /* the characters retrieved from stdin.      */
+   /*===========================================*/
+
+   inputString = NULL;
+   inputStringSize = 0;
+   inchar = ReadRouter(theEnv,logicalName);
+
+   /*====================================*/
+   /* Skip whitespace before any number. */
+   /*====================================*/
+
+   while (isspace(inchar) && (inchar != EOF) &&
+          (! GetHaltExecution(theEnv)))
+     { inchar = ReadRouter(theEnv,logicalName); }
+
+   /*=============================================================*/
+   /* Continue reading characters until whitespace is found again */
+   /* (for anything other than stdin) or a CR/LF (for stdin).     */
+   /*=============================================================*/
+
+   while ((((! isStdin) && (! isspace(inchar))) ||
+          (isStdin && (inchar != '\n') && (inchar != '\r'))) &&
+          (inchar != EOF) &&
+          (! GetHaltExecution(theEnv)))
+     {
+      inputString = ExpandStringWithChar(theEnv,inchar,inputString,&RouterData(theEnv)->CommandBufferInputCount,
+                                         &inputStringSize,inputStringSize + 80);
+      inchar = ReadRouter(theEnv,logicalName);
+     }
+
+   /*===========================================*/
+   /* Pressing control-c (or comparable action) */
+   /* aborts the read-number function.          */
+   /*===========================================*/
+
+   if (GetHaltExecution(theEnv))
+     {
+      theToken->tknType = SYMBOL_TOKEN;
+      theToken->value = FalseSymbol(theEnv);
+      SetErrorValue(theEnv,&CreateSymbol(theEnv,"READ_ERROR")->header);
+      if (inputStringSize > 0) rm(theEnv,inputString,inputStringSize);
+      return;
+     }
+
+   /*====================================================*/
+   /* Return the EOF symbol if the end of file for stdin */
+   /* has been encountered. This typically won't occur,  */
+   /* but is possible (for example by pressing control-d */
+   /* in the UNIX operating system).                     */
+   /*====================================================*/
+
+   if (inchar == EOF)
+     {
+      theToken->tknType = SYMBOL_TOKEN;
+      theToken->value = CreateSymbol(theEnv,"EOF");
+      if (inputStringSize > 0) rm(theEnv,inputString,inputStringSize);
+      return;
+     }
+
+   /*==================================================*/
+   /* Open a string input source using the characters  */
+   /* retrieved from stdin and extract the first token */
+   /* contained in the string.                         */
+   /*==================================================*/
+
+   /*=======================================*/
+   /* Change the locale so that numbers are */
+   /* converted using the localized format. */
+   /*=======================================*/
+
+   oldLocale = CreateSymbol(theEnv,setlocale(LC_NUMERIC,NULL));
+   setlocale(LC_NUMERIC,IOFunctionData(theEnv)->locale->contents);
+
+   /*========================================*/
+   /* Try to parse the number as a long. The */
+   /* terminating character must either be   */
+   /* white space or the string terminator.  */
+   /*========================================*/
+
+#if WIN_MVC
+   theLong = _strtoi64(inputString,&charPtr,10);
+#else
+   theLong = strtoll(inputString,&charPtr,10);
+#endif
+
+   if ((charPtr != inputString) &&
+       (isspace(*charPtr) || (*charPtr == '\0')))
+     {
+      theToken->tknType = INTEGER_TOKEN;
+      theToken->value = CreateInteger(theEnv,theLong);
+      if (inputStringSize > 0) rm(theEnv,inputString,inputStringSize);
+      setlocale(LC_NUMERIC,oldLocale->contents);
+      return;
+     }
+
+   /*==========================================*/
+   /* Try to parse the number as a double. The */
+   /* terminating character must either be     */
+   /* white space or the string terminator.    */
+   /*==========================================*/
+
+   theDouble = strtod(inputString,&charPtr);
+   if ((charPtr != inputString) &&
+       (isspace(*charPtr) || (*charPtr == '\0')))
+     {
+      theToken->tknType = FLOAT_TOKEN;
+      theToken->value = CreateFloat(theEnv,theDouble);
+      if (inputStringSize > 0) rm(theEnv,inputString,inputStringSize);
+      setlocale(LC_NUMERIC,oldLocale->contents);
+      return;
+     }
+
+   /*============================================*/
+   /* Restore the "C" locale so that any parsing */
+   /* of numbers uses the C format.              */
+   /*============================================*/
+
+   setlocale(LC_NUMERIC,oldLocale->contents);
+
+   /*=========================================*/
+   /* Return "*** READ ERROR ***" to indicate */
+   /* a number was not successfully parsed.   */
+   /*=========================================*/
+
+   theToken->tknType = SYMBOL_TOKEN;
+   theToken->value = FalseSymbol(theEnv);
+   SetErrorValue(theEnv,&CreateSymbol(theEnv,"READ_ERROR")->header);
+  }
+
+#endif
+
diff --git a/clips/iofun.h b/clips/iofun.h
new file mode 100755
index 000000000..39fc4cef8
--- /dev/null
+++ b/clips/iofun.h
@@ -0,0 +1,116 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/05/18            */
+   /*                                                     */
+   /*               I/O FUNCTIONS HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added the get-char, set-locale, and            */
+/*            read-number functions.                         */
+/*                                                           */
+/*            Modified printing of floats in the format      */
+/*            function to use the locale from the set-locale */
+/*            function.                                      */
+/*                                                           */
+/*            Moved IllegalLogicalNameMessage function to    */
+/*            argacces.c.                                    */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Removed the undocumented use of t in the       */
+/*            printout command to perform the same function  */
+/*            as crlf.                                       */
+/*                                                           */
+/*            Replaced EXT_IO and BASIC_IO compiler flags    */
+/*            with IO_FUNCTIONS compiler flag.               */
+/*                                                           */
+/*            Added a+, w+, rb, ab, r+b, w+b, and a+b modes  */
+/*            for the open function.                         */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added put-char function.                       */
+/*                                                           */
+/*            Added SetFullCRLF which allows option to       */
+/*            specify crlf as \n or \r\n.                    */
+/*                                                           */
+/*            Added AwaitingInput flag.                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added print and println functions.             */
+/*                                                           */
+/*            Added unget-char function.                     */
+/*                                                           */
+/*            Added flush, rewind, tell, seek, and chdir     */
+/*            functions.                                     */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_iofun
+
+#pragma once
+
+#define _H_iofun
+
+   void                           IOFunctionDefinitions(Environment *);
+#if IO_FUNCTIONS
+   bool                           SetFullCRLF(Environment *,bool);
+   void                           PrintoutFunction(Environment *,UDFContext *,UDFValue *);
+   void                           PrintFunction(Environment *,UDFContext *,UDFValue *);
+   void                           PrintlnFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ReadFunction(Environment *,UDFContext *,UDFValue *);
+   void                           OpenFunction(Environment *,UDFContext *,UDFValue *);
+   void                           CloseFunction(Environment *,UDFContext *,UDFValue *);
+   void                           FlushFunction(Environment *,UDFContext *,UDFValue *);
+   void                           RewindFunction(Environment *,UDFContext *,UDFValue *);
+   void                           TellFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SeekFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetCharFunction(Environment *,UDFContext *,UDFValue *);
+   void                           UngetCharFunction(Environment *,UDFContext *,UDFValue *);
+   void                           PutCharFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ReadlineFunction(Environment *,UDFContext *,UDFValue *);
+   void                           FormatFunction(Environment *,UDFContext *,UDFValue *);
+   void                           RemoveFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ChdirFunction(Environment *,UDFContext *,UDFValue *);
+   void                           RenameFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SetLocaleFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ReadNumberFunction(Environment *,UDFContext *,UDFValue *);
+#endif
+
+#endif /* _H_iofun */
+
+
+
+
+
+
diff --git a/clips/lgcldpnd.c b/clips/lgcldpnd.c
new file mode 100755
index 000000000..f92f7b109
--- /dev/null
+++ b/clips/lgcldpnd.c
@@ -0,0 +1,644 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*             LOGICAL DEPENDENCIES MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provide support routines for managing truth      */
+/*   maintenance using the logical conditional element.      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Rule with exists CE has incorrect activation.  */
+/*            DR0867                                         */
+/*                                                           */
+/*      6.30: Added support for hashed memories.             */
+/*                                                           */
+/*      6.40: Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include "argacces.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "factmngr.h"
+#include "memalloc.h"
+#include "pattern.h"
+#include "reteutil.h"
+#include "router.h"
+
+#include "lgcldpnd.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static struct dependency      *DetachAssociatedDependencies(Environment *,struct dependency *,void *);
+
+/***********************************************************************/
+/* AddLogicalDependencies: Adds the logical dependency links between a */
+/*   data entity (such as a fact or instance) and the partial match    */
+/*   which logically supports that data entity. If a data entity is    */
+/*   unconditionally asserted (i.e. the global variable TheLogicalJoin */
+/*   is NULL), then existing logical support for the data entity is no */
+/*   longer needed and it is removed. If a data entity is already      */
+/*   unconditionally supported and that data entity is conditionally   */
+/*   asserted (i.e. the global variable TheLogicalJoin is not NULL),   */
+/*   then the logical support is ignored. Otherwise, the partial match */
+/*   is linked to the data entity and the data entity is linked to the */
+/*   partial match. Note that the word assert is used to refer to      */
+/*   creating a fact with the assert command and creating an instance  */
+/*   with the make-instance command.                                   */
+/***********************************************************************/
+bool AddLogicalDependencies(
+  Environment *theEnv,
+  struct patternEntity *theEntity,
+  bool existingEntity)
+  {
+   struct partialMatch *theBinds;
+   struct dependency *newDependency;
+
+   /*==============================================*/
+   /* If the rule has no logical patterns, then no */
+   /* dependencies have to be established.         */
+   /*==============================================*/
+
+   if (EngineData(theEnv)->TheLogicalJoin == NULL)
+     {
+      if (existingEntity) RemoveEntityDependencies(theEnv,theEntity);
+      return true;
+     }
+   else if (existingEntity && (theEntity->dependents == NULL))
+     { return true; }
+
+   /*===========================================================*/
+   /* Retrieve the partial match in the logical join associated */
+   /* with activation partial match (retrieved when the run     */
+   /* command was initiated). If the partial match's parent     */
+   /* links have been removed, then the partial match must have */
+   /* been deleted by a previous RHS action and the dependency  */
+   /* link should not be added.                                 */
+   /*===========================================================*/
+
+   theBinds = EngineData(theEnv)->TheLogicalBind;
+   if (theBinds == NULL) return false;
+   if ((theBinds->leftParent == NULL) && (theBinds->rightParent == NULL))
+     { return false; }
+
+   /*==============================================================*/
+   /* Add a dependency link between the partial match and the data */
+   /* entity. The dependency links are stored in the partial match */
+   /* behind the data entities stored in the partial match and the */
+   /* activation link, if any.                                     */
+   /*==============================================================*/
+
+   newDependency = get_struct(theEnv,dependency);
+   newDependency->dPtr = theEntity;
+   newDependency->next = (struct dependency *) theBinds->dependents;
+   theBinds->dependents = newDependency;
+
+   /*================================================================*/
+   /* Add a dependency link between the entity and the partialMatch. */
+   /*================================================================*/
+
+   newDependency = get_struct(theEnv,dependency);
+   newDependency->dPtr = theBinds;
+   newDependency->next = (struct dependency *) theEntity->dependents;
+   theEntity->dependents = newDependency;
+
+   /*==================================================================*/
+   /* Return true to indicate that the data entity should be asserted. */
+   /*==================================================================*/
+
+   return true;
+  }
+
+/************************************************************************/
+/* FindLogicalBind: Finds the partial match associated with the logical */
+/*   CE which will provide logical support for a data entity asserted   */
+/*   from the currently executing rule. The function is called when     */
+/*   creating logical support links between the data entity and         */
+/*   supporting partial matches.                                        */
+/************************************************************************/
+struct partialMatch *FindLogicalBind(
+  struct joinNode *theJoin,
+  struct partialMatch *theBinds)
+  {
+   struct partialMatch *compPtr;
+
+   /*========================================================*/
+   /* Follow the parent link of the activation back through  */
+   /* the join network until the join containing the logical */
+   /* partial match is found. The partial match at this      */
+   /* join will have the dependency link assigned to it.     */
+   /*========================================================*/
+
+   for (compPtr = theBinds;
+        compPtr != NULL;
+        compPtr = compPtr->leftParent)
+     {
+      if (compPtr->owner == theJoin)
+        { return(compPtr); }
+     }
+
+   return NULL;
+  }
+
+/*********************************************************************/
+/* RemoveEntityDependencies: Removes all logical support links from  */
+/*   a pattern entity that point to partial matches or other pattern */
+/*   entities. Also removes the associated links from the partial    */
+/*   matches or pattern entities which point back to the pattern     */
+/*   entities.                                                       */
+/*********************************************************************/
+void RemoveEntityDependencies(
+  Environment *theEnv,
+  struct patternEntity *theEntity)
+  {
+   struct dependency *fdPtr, *nextPtr, *theList;
+   struct partialMatch *theBinds;
+
+   /*===============================*/
+   /* Get the list of dependencies. */
+   /*===============================*/
+
+   fdPtr = (struct dependency *) theEntity->dependents;
+
+   /*========================================*/
+   /* Loop through each of the dependencies. */
+   /*========================================*/
+
+   while (fdPtr != NULL)
+     {
+      /*===============================*/
+      /* Remember the next dependency. */
+      /*===============================*/
+
+      nextPtr = fdPtr->next;
+
+      /*================================================================*/
+      /* Remove the link between the data entity and the partial match. */
+      /*================================================================*/
+
+      theBinds = (struct partialMatch *) fdPtr->dPtr;
+      theList = (struct dependency *) theBinds->dependents;
+      theList = DetachAssociatedDependencies(theEnv,theList,theEntity);
+      theBinds->dependents = theList;
+
+      /*========================*/
+      /* Return the dependency. */
+      /*========================*/
+
+      rtn_struct(theEnv,dependency,fdPtr);
+
+      /*=================================*/
+      /* Move on to the next dependency. */
+      /*=================================*/
+
+      fdPtr = nextPtr;
+     }
+
+   /*=====================================================*/
+   /* Set the dependency list of the data entity to NULL. */
+   /*=====================================================*/
+
+   theEntity->dependents = NULL;
+  }
+
+/********************************************************************/
+/* ReturnEntityDependencies: Removes all logical support links from */
+/*   a pattern entity. This is unidirectional. The links from the   */
+/*   the partial match to the entity are not removed.               */
+/********************************************************************/
+void ReturnEntityDependencies(
+  Environment *theEnv,
+  struct patternEntity *theEntity)
+  {
+   struct dependency *fdPtr, *nextPtr;
+
+   fdPtr = (struct dependency *) theEntity->dependents;
+
+   while (fdPtr != NULL)
+     {
+      nextPtr = fdPtr->next;
+      rtn_struct(theEnv,dependency,fdPtr);
+      fdPtr = nextPtr;
+     }
+
+   theEntity->dependents = NULL;
+  }
+
+/*******************************************************************/
+/* DetachAssociatedDependencies: Removes all logical support links */
+/*   which pointer to a pattern entity from a list of dependencies */
+/*   (which may be associated with either a partial match or       */
+/*   another pattern entity). Does not remove links which point in */
+/*   the other direction.                                          */
+/*******************************************************************/
+static struct dependency *DetachAssociatedDependencies(
+  Environment *theEnv,
+  struct dependency *theList,
+  void *theEntity)
+  {
+   struct dependency *fdPtr, *nextPtr, *lastPtr = NULL;
+
+   fdPtr = theList;
+
+   while (fdPtr != NULL)
+     {
+      if (fdPtr->dPtr == theEntity)
+        {
+         nextPtr = fdPtr->next;
+         if (lastPtr == NULL) theList = nextPtr;
+         else lastPtr->next = nextPtr;
+         rtn_struct(theEnv,dependency,fdPtr);
+         fdPtr = nextPtr;
+        }
+      else
+        {
+         lastPtr = fdPtr;
+         fdPtr = fdPtr->next;
+        }
+     }
+
+   return(theList);
+  }
+
+/**************************************************************************/
+/* RemovePMDependencies: Removes all logical support links from a partial */
+/*   match that point to any data entities. Also removes the associated   */
+/*   links from the data entities which point back to the partial match.  */
+/**************************************************************************/
+void RemovePMDependencies(
+  Environment *theEnv,
+  struct partialMatch *theBinds)
+  {
+   struct dependency *fdPtr, *nextPtr, *theList;
+   struct patternEntity *theEntity;
+
+   fdPtr = (struct dependency *) theBinds->dependents;
+
+   while (fdPtr != NULL)
+     {
+      nextPtr = fdPtr->next;
+
+      theEntity = (struct patternEntity *) fdPtr->dPtr;
+
+      theList = (struct dependency *) theEntity->dependents;
+      theList = DetachAssociatedDependencies(theEnv,theList,theBinds);
+      theEntity->dependents = theList;
+
+      rtn_struct(theEnv,dependency,fdPtr);
+      fdPtr = nextPtr;
+     }
+
+   theBinds->dependents = NULL;
+  }
+
+/************************************************************/
+/* DestroyPMDependencies: Removes all logical support links */
+/*   from a partial match that point to any data entities.  */
+/************************************************************/
+void DestroyPMDependencies(
+  Environment *theEnv,
+  struct partialMatch *theBinds)
+  {
+   struct dependency *fdPtr, *nextPtr;
+
+   fdPtr = (struct dependency *) theBinds->dependents;
+
+   while (fdPtr != NULL)
+     {
+      nextPtr = fdPtr->next;
+
+      rtn_struct(theEnv,dependency,fdPtr);
+      fdPtr = nextPtr;
+     }
+
+   theBinds->dependents = NULL;
+  }
+
+/************************************************************************/
+/* RemoveLogicalSupport: Removes the dependency links between a partial */
+/*   match and the data entities it logically supports. Also removes    */
+/*   the associated links from the data entities which point back to    */
+/*   the partial match by calling DetachAssociatedEntityDependencies.   */
+/*   If an entity has all of its logical support removed as a result of */
+/*   this procedure, the dependency link from the partial match is      */
+/*   added to the list of unsupported data entities so that the entity  */
+/*   will be deleted as a result of losing its logical support.         */
+/************************************************************************/
+void RemoveLogicalSupport(
+  Environment *theEnv,
+  struct partialMatch *theBinds)
+  {
+   struct dependency *dlPtr, *tempPtr, *theList;
+   struct patternEntity *theEntity;
+
+   /*========================================*/
+   /* If the partial match has no associated */
+   /* dependencies, then return.             */
+   /*========================================*/
+
+   if (theBinds->dependents == NULL) return;
+
+   /*=======================================*/
+   /* Loop through each of the dependencies */
+   /* attached to the partial match.        */
+   /*=======================================*/
+
+   dlPtr = (struct dependency *) theBinds->dependents;
+
+   while (dlPtr != NULL)
+     {
+      /*===============================*/
+      /* Remember the next dependency. */
+      /*===============================*/
+
+      tempPtr = dlPtr->next;
+
+      /*==========================================================*/
+      /* Determine the data entity associated with the dependency */
+      /* structure and delete its dependency references to this   */
+      /* partial match.                                           */
+      /*==========================================================*/
+
+      theEntity = (struct patternEntity *) dlPtr->dPtr;
+
+      theList = (struct dependency *) theEntity->dependents;
+      theList = DetachAssociatedDependencies(theEnv,theList,theBinds);
+      theEntity->dependents = theList;
+
+      /*==============================================================*/
+      /* If the data entity has lost all of its logical support, then */
+      /* add the dependency structure from the partial match to the   */
+      /* list of unsupported data entities to be deleted. Otherwise,  */
+      /* just delete the dependency structure.                        */
+      /*==============================================================*/
+
+      if (theEntity->dependents == NULL)
+        {
+         (*theEntity->theInfo->base.incrementBusyCount)(theEnv,theEntity);
+         dlPtr->next = EngineData(theEnv)->UnsupportedDataEntities;
+         EngineData(theEnv)->UnsupportedDataEntities = dlPtr;
+        }
+      else
+        { rtn_struct(theEnv,dependency,dlPtr); }
+
+      /*==================================*/
+      /* Move on to the next dependency.  */
+      /*==================================*/
+
+      dlPtr = tempPtr;
+     }
+
+   /*=====================================*/
+   /* The partial match no longer has any */
+   /* dependencies associated with it.    */
+   /*=====================================*/
+
+   theBinds->dependents = NULL;
+  }
+
+/********************************************************************/
+/* ForceLogicalRetractions: Deletes the data entities found on the  */
+/*   list of items that have lost their logical support. The delete */
+/*   function associated with each data entity is called to delete  */
+/*   that data entity. Calling the delete function may in turn      */
+/*   add more data entities to the list of data entities which have */
+/*   lost their logical support.                                    */
+/********************************************************************/
+void ForceLogicalRetractions(
+  Environment *theEnv)
+  {
+   struct dependency *tempPtr;
+   struct patternEntity *theEntity;
+
+   /*===================================================*/
+   /* Don't reenter this function once it's called. Any */
+   /* new additions to the list of items to be deleted  */
+   /* as a result of losing their logical support will  */
+   /* be handled properly.                              */
+   /*===================================================*/
+
+   if (EngineData(theEnv)->alreadyEntered) return;
+   EngineData(theEnv)->alreadyEntered = true;
+
+   /*=======================================================*/
+   /* Continue to delete the first item on the list as long */
+   /* as one exists. This is done because new items may be  */
+   /* placed at the beginning of the list as other data     */
+   /* entities are deleted.                                 */
+   /*=======================================================*/
+
+   while (EngineData(theEnv)->UnsupportedDataEntities != NULL)
+     {
+      /*==========================================*/
+      /* Determine the data entity to be deleted. */
+      /*==========================================*/
+
+      theEntity = (struct patternEntity *) EngineData(theEnv)->UnsupportedDataEntities->dPtr;
+
+      /*================================================*/
+      /* Remove the dependency structure from the list. */
+      /*================================================*/
+
+      tempPtr = EngineData(theEnv)->UnsupportedDataEntities;
+      EngineData(theEnv)->UnsupportedDataEntities = EngineData(theEnv)->UnsupportedDataEntities->next;
+      rtn_struct(theEnv,dependency,tempPtr);
+
+      /*=========================*/
+      /* Delete the data entity. */
+      /*=========================*/
+
+      (*theEntity->theInfo->base.decrementBusyCount)(theEnv,theEntity);
+      (*theEntity->theInfo->base.deleteFunction)(theEntity,theEnv);
+     }
+
+   /*============================================*/
+   /* Deletion of items on the list is complete. */
+   /*============================================*/
+
+   EngineData(theEnv)->alreadyEntered = false;
+  }
+
+/****************************************************************/
+/* Dependencies: C access routine for the dependencies command. */
+/****************************************************************/
+void Dependencies(
+  Environment *theEnv,
+  struct patternEntity *theEntity)
+  {
+   struct dependency *fdPtr;
+
+   /*=========================================*/
+   /* If the data entity has no dependencies, */
+   /* then print "None" and return.           */
+   /*=========================================*/
+
+   if (theEntity->dependents == NULL)
+     {
+      WriteString(theEnv,STDOUT,"None\n");
+      return;
+     }
+
+   /*============================================*/
+   /* Loop through the list of the data entities */
+   /* dependencies and print them.               */
+   /*============================================*/
+
+   for (fdPtr = (struct dependency *) theEntity->dependents;
+        fdPtr != NULL;
+        fdPtr = fdPtr->next)
+     {
+      if (GetHaltExecution(theEnv) == true) return;
+      PrintPartialMatch(theEnv,STDOUT,(struct partialMatch *) fdPtr->dPtr);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+  }
+
+/************************************************************/
+/* Dependents: C access routine for the dependents command. */
+/************************************************************/
+void Dependents(
+  Environment *theEnv,
+  struct patternEntity *theEntity)
+  {
+   struct patternEntity *entityPtr = NULL;
+   struct patternParser *theParser = NULL;
+   struct dependency *fdPtr;
+   struct partialMatch *theBinds;
+   bool found = false;
+
+   /*=================================*/
+   /* Loop through every data entity. */
+   /*=================================*/
+
+   for (GetNextPatternEntity(theEnv,&theParser,&entityPtr);
+        entityPtr != NULL;
+        GetNextPatternEntity(theEnv,&theParser,&entityPtr))
+     {
+      if (GetHaltExecution(theEnv) == true) return;
+
+      /*====================================*/
+      /* Loop through every dependency link */
+      /* associated with the data entity.   */
+      /*====================================*/
+
+      for (fdPtr = (struct dependency *) entityPtr->dependents;
+           fdPtr != NULL;
+           fdPtr = fdPtr->next)
+        {
+         if (GetHaltExecution(theEnv) == true) return;
+
+         /*=====================================================*/
+         /* If the data entity which was the argument passed to */
+         /* the dependents command is contained in one of the   */
+         /* partial matches of the data entity currently being  */
+         /* examined, then the data entity being examined is a  */
+         /* dependent. Print the data entity and then move on   */
+         /* to the next data entity.                            */
+         /*=====================================================*/
+
+         theBinds = (struct partialMatch *) fdPtr->dPtr;
+         if (FindEntityInPartialMatch(theEntity,theBinds) == true)
+           {
+            if (found) WriteString(theEnv,STDOUT,",");
+            (*entityPtr->theInfo->base.shortPrintFunction)(theEnv,STDOUT,entityPtr);
+            found = true;
+            break;
+           }
+        }
+     }
+
+   /*=================================================*/
+   /* If no dependents were found, then print "None." */
+   /* Otherwise print a carriage return after the     */
+   /* list of dependents.                             */
+   /*=================================================*/
+
+   if (! found) WriteString(theEnv,STDOUT,"None\n");
+   else WriteString(theEnv,STDOUT,"\n");
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/*********************************************/
+/* DependenciesCommand: H/L access routine   */
+/*   for the dependencies command.           */
+/*********************************************/
+void DependenciesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+   void *ptr;
+
+   ptr = GetFactOrInstanceArgument(context,1,&item);
+
+   if (ptr == NULL) return;
+
+#if DEFRULE_CONSTRUCT
+   Dependencies(theEnv,(struct patternEntity *) ptr);
+#else
+   WriteString(theEnv,STDOUT,"None\n");
+#endif
+  }
+
+/*******************************************/
+/* DependentsCommand: H/L access routine   */
+/*   for the dependents command.           */
+/*******************************************/
+void DependentsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+   void *ptr;
+
+   ptr = GetFactOrInstanceArgument(context,1,&item);
+
+   if (ptr == NULL) return;
+
+#if DEFRULE_CONSTRUCT
+   Dependents(theEnv,(struct patternEntity *) ptr);
+#else
+   WriteString(theEnv,STDOUT,"None\n");
+#endif
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#endif /* DEFRULE_CONSTRUCT */
+
diff --git a/clips/lgcldpnd.h b/clips/lgcldpnd.h
new file mode 100755
index 000000000..dcd3db165
--- /dev/null
+++ b/clips/lgcldpnd.h
@@ -0,0 +1,75 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*          LOGICAL DEPENDENCIES HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provide support routines for managing truth      */
+/*   maintenance using the logical conditional element.      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Rule with exists CE has incorrect activation.  */
+/*            DR0867                                         */
+/*                                                           */
+/*      6.30: Added support for hashed memories.             */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_lgcldpnd
+
+#pragma once
+
+#define _H_lgcldpnd
+
+struct dependency
+  {
+   void *dPtr;
+   struct dependency *next;
+  };
+
+#include "entities.h"
+#include "match.h"
+
+   bool                           AddLogicalDependencies(Environment *,PatternEntity *,bool);
+   void                           RemoveEntityDependencies(Environment *,PatternEntity *);
+   void                           RemovePMDependencies(Environment *,PartialMatch *);
+   void                           DestroyPMDependencies(Environment *,PartialMatch *);
+   void                           RemoveLogicalSupport(Environment *,PartialMatch *);
+   void                           ForceLogicalRetractions(Environment *);
+   void                           Dependencies(Environment *,PatternEntity *);
+   void                           Dependents(Environment *,PatternEntity *);
+   void                           DependenciesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DependentsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ReturnEntityDependencies(Environment *,PatternEntity *);
+   PartialMatch                  *FindLogicalBind(struct joinNode *,PartialMatch *);
+
+#endif /* _H_lgcldpnd */
+
+
+
+
+
diff --git a/clips/main.c b/clips/main.c
new file mode 100755
index 000000000..95212fadc
--- /dev/null
+++ b/clips/main.c
@@ -0,0 +1,112 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*               CLIPS Version 6.40  08/06/16          */
+   /*                                                     */
+   /*                     MAIN MODULE                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Moved UserFunctions and EnvUserFunctions to    */
+/*            the new userfunctions.c file.                  */
+/*                                                           */
+/*      6.40: Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Moved CatchCtrlC to main.c.                    */
+/*                                                           */
+/*************************************************************/
+
+/***************************************************************************/
+/*                                                                         */
+/* Permission is hereby granted, free of charge, to any person obtaining   */
+/* a copy of this software and associated documentation files (the         */
+/* "Software"), to deal in the Software without restriction, including     */
+/* without limitation the rights to use, copy, modify, merge, publish,     */
+/* distribute, and/or sell copies of the Software, and to permit persons   */
+/* to whom the Software is furnished to do so.                             */
+/*                                                                         */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS */
+/* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF              */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT   */
+/* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY  */
+/* CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES */
+/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN   */
+/* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF */
+/* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.          */
+/*                                                                         */
+/***************************************************************************/
+
+#include "clips.h"
+
+#if   UNIX_V || LINUX || DARWIN || UNIX_7 || WIN_GCC || WIN_MVC
+#include <signal.h>
+#endif
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if UNIX_V || LINUX || DARWIN || UNIX_7 || WIN_GCC || WIN_MVC
+   static void                    CatchCtrlC(int);
+#endif
+
+/***************************************/
+/* LOCAL INTERNAL VARIABLE DEFINITIONS */
+/***************************************/
+
+   static Environment            *mainEnv;
+
+/****************************************/
+/* main: Starts execution of the expert */
+/*   system development environment.    */
+/****************************************/
+int main(
+  int argc,
+  char *argv[])
+  {
+   mainEnv = CreateEnvironment();
+
+#if UNIX_V || LINUX || DARWIN || UNIX_7 || WIN_GCC || WIN_MVC
+   signal(SIGINT,CatchCtrlC);
+#endif
+
+   RerouteStdin(mainEnv,argc,argv);
+   CommandLoop(mainEnv);
+
+   /*==================================================================*/
+   /* Control does not normally return from the CommandLoop function.  */
+   /* However if you are embedding CLIPS, have replaced CommandLoop    */
+   /* with your own embedded calls that will return to this point, and */
+   /* are running software that helps detect memory leaks, you need to */
+   /* add function calls here to deallocate memory still being used by */
+   /* CLIPS. If you have a multi-threaded application, no environments */
+   /* can be currently executing.                                      */
+   /*==================================================================*/
+
+   DestroyEnvironment(mainEnv);
+
+   return -1;
+  }
+
+#if UNIX_V || LINUX || DARWIN || UNIX_7 || WIN_GCC || WIN_MVC || DARWIN
+/***************/
+/* CatchCtrlC: */
+/***************/
+static void CatchCtrlC(
+  int sgnl)
+  {
+   SetHaltExecution(mainEnv,true);
+   CloseAllBatchSources(mainEnv);
+   signal(SIGINT,CatchCtrlC);
+  }
+#endif
diff --git a/clips/makefile b/clips/makefile
new file mode 100644
index 000000000..5e34a3424
--- /dev/null
+++ b/clips/makefile
@@ -0,0 +1,1286 @@
+# CLIPS 6.4
+# Console and Library
+# macOS 10.12.6 with Darwin 16.7.0
+
+# The GNU Make Manual
+# http://www.gnu.org/software/make/manual/make.html
+
+# https://felixcrux.com/blog/creating-basic-makefile
+
+# platform detection
+PLATFORM = $(shell uname -s)
+
+ifeq ($(PLATFORM),Darwin) # macOS
+	CLIPS_OS = DARWIN
+	WARNINGS = -Wall -Wundef -Wpointer-arith -Wshadow -Wstrict-aliasing \
+	           -Winline -Wmissing-declarations -Wredundant-decls \
+	           -Wmissing-prototypes -Wnested-externs -Wstrict-prototypes \
+	           -Waggregate-return -Wno-implicit
+endif
+
+ifeq ($(PLATFORM),Linux) # linux
+	CLIPS_OS = LINUX
+	WARNINGS = -Wall -Wundef -Wpointer-arith -Wshadow -Wstrict-aliasing \
+               -Winline -Wredundant-decls -Waggregate-return
+endif
+	    
+OBJS = agenda.o analysis.o argacces.o bload.o bmathfun.o bsave.o \
+ 	classcom.o classexm.o classfun.o classinf.o classini.o \
+ 	classpsr.o clsltpsr.o commline.o conscomp.o constrct.o \
+ 	constrnt.o crstrtgy.o cstrcbin.o cstrccom.o cstrcpsr.o \
+ 	cstrnbin.o cstrnchk.o cstrncmp.o cstrnops.o cstrnpsr.o \
+ 	cstrnutl.o default.o defins.o developr.o dffctbin.o dffctbsc.o \
+ 	dffctcmp.o dffctdef.o dffctpsr.o dffnxbin.o dffnxcmp.o dffnxexe.o \
+ 	dffnxfun.o dffnxpsr.o dfinsbin.o dfinscmp.o drive.o emathfun.o \
+ 	engine.o envrnmnt.o envrnbld.o evaluatn.o expressn.o exprnbin.o \
+ 	exprnops.o exprnpsr.o extnfunc.o factbin.o factbld.o factcmp.o \
+ 	factcom.o factfun.o factgen.o facthsh.o factlhs.o factmch.o \
+ 	factmngr.o factprt.o factqpsr.o factqury.o factrete.o factrhs.o \
+ 	filecom.o filertr.o fileutil.o generate.o genrcbin.o genrccmp.o \
+ 	genrccom.o genrcexe.o genrcfun.o genrcpsr.o globlbin.o globlbsc.o \
+ 	globlcmp.o globlcom.o globldef.o globlpsr.o immthpsr.o incrrset.o \
+ 	inherpsr.o inscom.o insfile.o insfun.o insmngr.o insmoddp.o \
+ 	insmult.o inspsr.o insquery.o insqypsr.o iofun.o lgcldpnd.o \
+ 	memalloc.o miscfun.o modulbin.o modulbsc.o modulcmp.o moduldef.o \
+ 	modulpsr.o modulutl.o msgcom.o msgfun.o msgpass.o msgpsr.o \
+ 	multifld.o multifun.o objbin.o objcmp.o objrtbin.o objrtbld.o \
+ 	objrtcmp.o objrtfnx.o objrtgen.o objrtmch.o parsefun.o pattern.o \
+ 	pprint.o prccode.o prcdrfun.o prcdrpsr.o prdctfun.o prntutil.o \
+ 	proflfun.o reorder.o reteutil.o retract.o router.o rulebin.o \
+ 	rulebld.o rulebsc.o rulecmp.o rulecom.o rulecstr.o ruledef.o \
+ 	ruledlt.o rulelhs.o rulepsr.o scanner.o sortfun.o strngfun.o \
+ 	strngrtr.o symblbin.o symblcmp.o symbol.o sysdep.o textpro.o \
+ 	tmpltbin.o tmpltbsc.o tmpltcmp.o tmpltdef.o tmpltfun.o tmpltlhs.o \
+ 	tmpltpsr.o tmpltrhs.o tmpltutl.o userdata.o userfunctions.o \
+ 	utility.o watch.o
+
+all: release
+
+debug : CC = gcc
+debug : CFLAGS = -std=c99 -O0 -g
+debug : LDLIBS = -lm
+debug : clips
+
+release : CC = gcc
+release : CFLAGS = -std=c99 -O3 -fno-strict-aliasing
+release : LDLIBS = -lm
+release : clips
+
+debug_cpp : CC = g++
+debug_cpp : CFLAGS = -x c++ -std=c++11 -O0 -g
+ifeq ($(PLATFORM),Darwin) # macOS
+debug_cpp : WARNINGS += -Wcast-qual
+endif
+debug_cpp : LDLIBS = -lstdc++
+debug_cpp : clips
+
+release_cpp : CC = g++
+release_cpp : CFLAGS = -x c++ -std=c++11 -O3 -fno-strict-aliasing
+ifeq ($(PLATFORM),Darwin) # macOS
+release_cpp : WARNINGS += -Wcast-qual
+endif
+release_cpp : LDLIBS = -lstdc++
+release_cpp : clips
+
+.c.o :
+	$(CC) -c -D$(CLIPS_OS) $(CFLAGS) $(WARNINGS) $<
+
+clips : main.o libclips.a
+	$(CC) -o clips main.o -L. -lclips $(LDLIBS)
+	
+libclips.a : $(OBJS)
+	rm -f $@   
+	ar cq $@ $(OBJS)   
+
+clean : 
+	-rm -f main.o $(OBJS)
+	-rm -f clips libclips.a
+	
+.PHONY : all clips clean debug release debug_cpp release_cpp
+
+# Dependencies generated using "gcc -MM *.c"
+
+agenda.o: agenda.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h crstrtgy.h agenda.h ruledef.h network.h match.h \
+  conscomp.h extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h memalloc.h modulutl.h scanner.h \
+  multifld.h prntutil.h reteutil.h router.h rulebsc.h strngrtr.h \
+  sysdep.h watch.h
+
+analysis.o: analysis.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h cstrnchk.h constrnt.h evaluatn.h cstrnutl.h cstrnops.h \
+  exprnpsr.h extnfunc.h expressn.h exprnops.h constrct.h userdata.h \
+  moduldef.h utility.h symbol.h scanner.h generate.h analysis.h \
+  reorder.h pattern.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h symblcmp.h cstrccom.h memalloc.h modulutl.h prntutil.h \
+  router.h rulecstr.h rulepsr.h watch.h
+
+argacces.o: argacces.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrnchk.h constrnt.h evaluatn.h constant.h extnfunc.h expressn.h \
+  exprnops.h constrct.h userdata.h moduldef.h utility.h symbol.h \
+  factmngr.h conscomp.h symblcmp.h tmpltdef.h factbld.h network.h \
+  match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h insfun.h \
+  object.h multifld.h prntutil.h router.h sysdep.h argacces.h
+
+bload.o: bload.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h bsave.h cstrnbin.h constrnt.h exprnpsr.h \
+  extnfunc.h symbol.h scanner.h memalloc.h prntutil.h router.h bload.h \
+  exprnbin.h sysdep.h symblbin.h
+
+bmathfun.o: bmathfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h prntutil.h router.h bmathfun.h
+
+bsave.o: bsave.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrnbin.h constrnt.h exprnpsr.h scanner.h memalloc.h \
+  prntutil.h router.h bsave.h
+
+classcom.o: classcom.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h argacces.h classfun.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  cstrccom.h scanner.h classcom.h classini.h modulutl.h msgcom.h \
+  msgpass.h prntutil.h router.h
+
+classexm.o: classexm.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h classcom.h cstrccom.h object.h \
+  constrnt.h multifld.h symbol.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h \
+  classini.h insfun.h memalloc.h msgcom.h msgpass.h msgfun.h prntutil.h \
+  router.h strngrtr.h sysdep.h classexm.h
+
+classfun.o: classfun.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classini.h cstrcpsr.h inscom.h insfun.h insmngr.h memalloc.h \
+  modulutl.h scanner.h msgfun.h msgpass.h prntutil.h router.h classfun.h
+
+classinf.o: classinf.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h classcom.h cstrccom.h object.h \
+  constrnt.h multifld.h symbol.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h classexm.h classfun.h \
+  scanner.h classini.h memalloc.h insfun.h msgcom.h msgpass.h msgfun.h \
+  prntutil.h classinf.h
+
+classini.o: classini.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classexm.h classfun.h scanner.h \
+  classinf.h classpsr.h cstrcpsr.h inscom.h insfun.h memalloc.h \
+  modulpsr.h modulutl.h msgcom.h msgpass.h watch.h defins.h insquery.h \
+  bload.h exprnbin.h sysdep.h symblbin.h objbin.h objcmp.h objrtbld.h \
+  objrtfnx.h objrtmch.h classini.h
+
+classpsr.o: classpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classfun.h scanner.h clsltpsr.h cstrcpsr.h inherpsr.h memalloc.h \
+  modulpsr.h modulutl.h msgpsr.h pprint.h prntutil.h router.h classpsr.h
+
+clsltpsr.o: clsltpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h cstrnchk.h \
+  cstrnpsr.h cstrnutl.h default.h insfun.h memalloc.h pprint.h \
+  prntutil.h router.h clsltpsr.h
+
+commline.o: commline.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h argacces.h expressn.h exprnops.h constrct.h userdata.h \
+  moduldef.h utility.h evaluatn.h cstrcpsr.h exprnpsr.h extnfunc.h \
+  symbol.h scanner.h fileutil.h memalloc.h multifld.h pprint.h \
+  prcdrfun.h prcdrpsr.h constrnt.h prntutil.h router.h strngrtr.h \
+  sysdep.h commline.h
+
+conscomp.o: conscomp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrccom.h cstrncmp.h constrnt.h \
+  exprnpsr.h extnfunc.h symbol.h scanner.h memalloc.h modulcmp.h \
+  prntutil.h router.h sysdep.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h symblcmp.h dffnxcmp.h dffnxfun.h tmpltcmp.h \
+  tmpltdef.h factbld.h globlcmp.h globldef.h genrccmp.h genrcfun.h \
+  objcmp.h object.h multifld.h
+
+constrct.o: constrct.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h cstrcpsr.h exprnpsr.h \
+  extnfunc.h symbol.h scanner.h memalloc.h modulutl.h multifld.h \
+  prcdrfun.h prcdrpsr.h constrnt.h prntutil.h router.h ruledef.h \
+  network.h match.h agenda.h crstrtgy.h conscomp.h symblcmp.h cstrccom.h \
+  sysdep.h watch.h
+
+constrnt.o: constrnt.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h memalloc.h \
+  multifld.h router.h scanner.h constrnt.h
+
+crstrtgy.o: crstrtgy.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h memalloc.h pattern.h scanner.h reorder.h reteutil.h
+
+cstrcbin.o: cstrcbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h
+
+cstrccom.o: cstrccom.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h extnfunc.h evaluatn.h expressn.h exprnops.h constrct.h \
+  userdata.h moduldef.h utility.h symbol.h memalloc.h argacces.h \
+  multifld.h modulutl.h scanner.h prntutil.h router.h commline.h \
+  sysdep.h bload.h exprnbin.h symblbin.h cstrcpsr.h cstrccom.h
+
+cstrcpsr.o: cstrcpsr.c setup.h envrnmnt.h entities.h usrsetup.h router.h \
+  watch.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h prcdrpsr.h constrnt.h exprnpsr.h \
+  extnfunc.h symbol.h scanner.h memalloc.h modulutl.h modulpsr.h \
+  pprint.h prntutil.h sysdep.h cstrcpsr.h
+
+cstrnbin.o: cstrnbin.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h memalloc.h prntutil.h router.h bload.h utility.h evaluatn.h \
+  moduldef.h userdata.h extnfunc.h expressn.h exprnops.h constrct.h \
+  symbol.h exprnbin.h sysdep.h symblbin.h bsave.h cstrnbin.h constrnt.h
+
+cstrnchk.o: cstrnchk.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrnutl.h constrnt.h evaluatn.h constant.h extnfunc.h expressn.h \
+  exprnops.h constrct.h userdata.h moduldef.h utility.h symbol.h \
+  multifld.h prntutil.h router.h classcom.h cstrccom.h object.h match.h \
+  network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classexm.h inscom.h insfun.h cstrnchk.h
+
+cstrncmp.o: cstrncmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h conscomp.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  memalloc.h prntutil.h router.h sysdep.h cstrncmp.h constrnt.h
+
+cstrnops.o: cstrnops.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h constrnt.h evaluatn.h cstrnchk.h cstrnutl.h extnfunc.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  symbol.h memalloc.h multifld.h router.h scanner.h cstrnops.h
+
+cstrnpsr.o: cstrnpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h cstrnchk.h constrnt.h evaluatn.h cstrnutl.h expressn.h \
+  exprnops.h constrct.h userdata.h moduldef.h utility.h memalloc.h \
+  pprint.h prntutil.h router.h scanner.h sysdep.h cstrnpsr.h
+
+cstrnutl.o: cstrnutl.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h memalloc.h \
+  multifld.h router.h scanner.h cstrnutl.h constrnt.h
+
+default.o: default.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  constrnt.h evaluatn.h cstrnchk.h cstrnutl.h exprnpsr.h extnfunc.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  symbol.h scanner.h factmngr.h conscomp.h symblcmp.h tmpltdef.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h inscom.h insfun.h object.h multifld.h pprint.h prntutil.h \
+  router.h default.h
+
+defins.o: defins.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h dfinsbin.h defins.h conscomp.h symblcmp.h cstrccom.h \
+  object.h constrnt.h multifld.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h dfinscmp.h argacces.h classcom.h classfun.h scanner.h \
+  cstrcpsr.h insfun.h inspsr.h memalloc.h modulpsr.h modulutl.h pprint.h \
+  prntutil.h router.h
+
+developr.o: developr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h factmngr.h \
+  conscomp.h symblcmp.h tmpltdef.h constrnt.h factbld.h network.h \
+  match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h inscom.h \
+  insfun.h object.h multifld.h modulutl.h scanner.h prntutil.h router.h \
+  classcom.h classfun.h objrtmch.h developr.h
+
+dffctbin.o: dffctbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h dffctdef.h conscomp.h symblcmp.h cstrccom.h \
+  memalloc.h dffctbin.h cstrcbin.h modulbin.h
+
+dffctbsc.o: dffctbsc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrccom.h cstrcpsr.h dffctdef.h \
+  conscomp.h extnfunc.h symbol.h symblcmp.h dffctpsr.h factrhs.h \
+  factmngr.h tmpltdef.h constrnt.h factbld.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h facthsh.h scanner.h memalloc.h multifld.h router.h \
+  dffctbin.h cstrcbin.h modulbin.h dffctcmp.h dffctbsc.h
+
+dffctcmp.o: dffctcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  dffctdef.h cstrccom.h dffctcmp.h
+
+dffctdef.o: dffctdef.c setup.h envrnmnt.h entities.h usrsetup.h \
+  dffctbsc.h dffctdef.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h conscomp.h extnfunc.h expressn.h exprnops.h \
+  symbol.h symblcmp.h cstrccom.h dffctpsr.h memalloc.h bload.h \
+  exprnbin.h sysdep.h symblbin.h dffctbin.h cstrcbin.h modulbin.h \
+  dffctcmp.h
+
+dffctpsr.o: dffctpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrcpsr.h dffctbsc.h dffctdef.h conscomp.h symblcmp.h \
+  cstrccom.h factrhs.h factmngr.h tmpltdef.h constrnt.h factbld.h \
+  network.h match.h ruledef.h agenda.h crstrtgy.h facthsh.h scanner.h \
+  memalloc.h modulutl.h pprint.h prntutil.h router.h dffctpsr.h
+
+dffnxbin.o: dffnxbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h cstrccom.h memalloc.h modulbin.h \
+  dffnxbin.h dffnxfun.h
+
+dffnxcmp.o: dffnxcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  dffnxcmp.h dffnxfun.h
+
+dffnxexe.o: dffnxexe.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h constant.h \
+  prcdrfun.h prccode.h expressn.h exprnops.h scanner.h symbol.h \
+  prntutil.h proflfun.h router.h watch.h dffnxexe.h dffnxfun.h
+
+dffnxfun.o: dffnxfun.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h dffnxbin.h dffnxfun.h dffnxcmp.h cstrcpsr.h dffnxpsr.h \
+  modulpsr.h scanner.h dffnxexe.h watch.h argacces.h cstrccom.h \
+  memalloc.h modulutl.h multifld.h prntutil.h router.h
+
+dffnxpsr.o: dffnxpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h network.h match.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h constrnt.h cstrccom.h genrccom.h genrcfun.h cstrcpsr.h \
+  dffnxfun.h exprnpsr.h scanner.h memalloc.h modulutl.h pprint.h \
+  prccode.h prntutil.h router.h dffnxpsr.h
+
+dfinsbin.o: dfinsbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h defins.h conscomp.h symblcmp.h \
+  cstrccom.h object.h constrnt.h multifld.h match.h network.h ruledef.h \
+  agenda.h crstrtgy.h memalloc.h modulbin.h dfinsbin.h
+
+dfinscmp.o: dfinscmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  defins.h cstrccom.h object.h constrnt.h multifld.h match.h network.h \
+  ruledef.h agenda.h crstrtgy.h dfinscmp.h
+
+drive.o: drive.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  engine.h lgcldpnd.h retract.h incrrset.h memalloc.h prntutil.h \
+  reteutil.h router.h drive.h
+
+emathfun.o: emathfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h prntutil.h \
+  router.h emathfun.h
+
+engine.o: engine.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h commline.h factmngr.h tmpltdef.h factbld.h facthsh.h \
+  inscom.h insfun.h object.h multifld.h memalloc.h modulutl.h scanner.h \
+  prccode.h prcdrfun.h prntutil.h proflfun.h reteutil.h retract.h \
+  router.h ruledlt.h sysdep.h watch.h engine.h lgcldpnd.h
+
+envrnbld.o: envrnbld.c setup.h envrnmnt.h entities.h usrsetup.h \
+  bmathfun.h evaluatn.h constant.h commline.h emathfun.h engine.h \
+  lgcldpnd.h match.h network.h ruledef.h constrct.h userdata.h \
+  moduldef.h utility.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  retract.h filecom.h iofun.h memalloc.h miscfun.h multifun.h parsefun.h \
+  pprint.h prccode.h scanner.h prcdrfun.h prdctfun.h prntutil.h \
+  proflfun.h router.h sortfun.h strngfun.h sysdep.h textpro.h watch.h \
+  dffctdef.h genrccom.h genrcfun.h dffnxfun.h globldef.h tmpltdef.h \
+  factbld.h classini.h object.h multifld.h envrnbld.h
+
+envrnmnt.o: envrnmnt.c setup.h envrnmnt.h entities.h usrsetup.h \
+  bmathfun.h evaluatn.h constant.h commline.h emathfun.h engine.h \
+  lgcldpnd.h match.h network.h ruledef.h constrct.h userdata.h \
+  moduldef.h utility.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  retract.h filecom.h iofun.h memalloc.h miscfun.h multifun.h parsefun.h \
+  prccode.h scanner.h prcdrfun.h prdctfun.h prntutil.h proflfun.h \
+  router.h sortfun.h strngfun.h sysdep.h textpro.h watch.h dffctdef.h \
+  genrccom.h genrcfun.h dffnxfun.h globldef.h tmpltdef.h factbld.h \
+  classini.h object.h multifld.h
+
+evaluatn.o: evaluatn.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h factmngr.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h tmpltdef.h constrnt.h factbld.h \
+  network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h \
+  memalloc.h router.h prcdrfun.h multifld.h prntutil.h exprnpsr.h \
+  scanner.h proflfun.h sysdep.h dffnxfun.h genrccom.h genrcfun.h \
+  object.h inscom.h insfun.h
+
+expressn.o: expressn.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h memalloc.h prntutil.h router.h
+
+exprnbin.o: exprnbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h dffctdef.h conscomp.h symblcmp.h cstrccom.h \
+  memalloc.h network.h match.h ruledef.h agenda.h crstrtgy.h constrnt.h \
+  genrcbin.h genrcfun.h dffnxbin.h dffnxfun.h factmngr.h tmpltdef.h \
+  factbld.h facthsh.h tmpltbin.h cstrcbin.h modulbin.h globlbin.h \
+  globldef.h objbin.h object.h multifld.h insfun.h inscom.h
+
+exprnops.o: exprnops.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrnchk.h constrnt.h evaluatn.h constant.h cstrnops.h cstrnutl.h \
+  extnfunc.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h symbol.h memalloc.h prntutil.h router.h
+
+exprnpsr.o: exprnpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrnchk.h constrnt.h memalloc.h \
+  modulutl.h symbol.h scanner.h pprint.h prcdrfun.h prntutil.h router.h \
+  strngrtr.h network.h match.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h cstrccom.h genrccom.h genrcfun.h dffnxfun.h \
+  exprnpsr.h
+
+extnfunc.o: extnfunc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h factmngr.h conscomp.h symblcmp.h tmpltdef.h constrnt.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h memalloc.h router.h inscom.h insfun.h object.h multifld.h
+
+factbin.o: factbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h factmngr.h conscomp.h symblcmp.h tmpltdef.h \
+  constrnt.h factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h \
+  cstrccom.h facthsh.h memalloc.h pattern.h scanner.h reorder.h \
+  reteutil.h rulebin.h cstrcbin.h modulbin.h factbin.h
+
+factbld.o: factbld.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h factcmp.h network.h match.h ruledef.h agenda.h \
+  symbol.h crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h \
+  cstrccom.h pattern.h scanner.h reorder.h factgen.h factlhs.h factmch.h \
+  factbld.h factmngr.h tmpltdef.h facthsh.h memalloc.h modulutl.h \
+  reteutil.h router.h
+
+factcmp.o: factcmp.c setup.h envrnmnt.h entities.h usrsetup.h factbld.h \
+  network.h match.h ruledef.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  factmngr.h tmpltdef.h facthsh.h factcmp.h pattern.h scanner.h \
+  reorder.h
+
+factcom.o: factcom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h scanner.h \
+  facthsh.h factmch.h factbld.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h symblcmp.h constrnt.h cstrccom.h factmngr.h \
+  tmpltdef.h factrhs.h memalloc.h modulutl.h multifld.h pprint.h \
+  prntutil.h router.h strngrtr.h sysdep.h tmpltfun.h tmpltpsr.h \
+  tmpltutl.h bload.h exprnbin.h symblbin.h factcom.h
+
+factfun.o: factfun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h extnfunc.h symbol.h multifld.h prntutil.h \
+  router.h sysdep.h tmpltutl.h constrnt.h factmngr.h conscomp.h \
+  symblcmp.h tmpltdef.h factbld.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h cstrccom.h facthsh.h factfun.h
+
+factgen.o: factgen.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h exprnpsr.h \
+  extnfunc.h expressn.h exprnops.h symbol.h scanner.h factmch.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h constrnt.h cstrccom.h factmngr.h tmpltdef.h facthsh.h \
+  factprt.h factrete.h memalloc.h pattern.h reorder.h prcdrpsr.h \
+  reteutil.h router.h sysdep.h tmpltfun.h tmpltlhs.h tmpltutl.h \
+  factgen.h
+
+facthsh.o: facthsh.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  factmngr.h conscomp.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  tmpltdef.h constrnt.h factbld.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h cstrccom.h facthsh.h memalloc.h multifld.h router.h \
+  sysdep.h lgcldpnd.h
+
+factlhs.o: factlhs.c setup.h envrnmnt.h entities.h usrsetup.h cstrcpsr.h \
+  modulpsr.h evaluatn.h constant.h moduldef.h userdata.h utility.h \
+  symbol.h scanner.h modulutl.h pattern.h expressn.h exprnops.h \
+  constrct.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h constrnt.h cstrccom.h reorder.h pprint.h \
+  prntutil.h router.h tmpltdef.h factbld.h tmpltlhs.h tmpltpsr.h \
+  tmpltutl.h factmngr.h facthsh.h factlhs.h
+
+factmch.o: factmch.c setup.h envrnmnt.h entities.h usrsetup.h drive.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h match.h network.h ruledef.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h factgen.h reorder.h pattern.h scanner.h \
+  factrete.h incrrset.h memalloc.h prntutil.h reteutil.h router.h \
+  sysdep.h tmpltdef.h factbld.h factmch.h factmngr.h facthsh.h
+
+factmngr.o: factmngr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  commline.h default.h constrnt.h evaluatn.h constant.h engine.h \
+  lgcldpnd.h match.h network.h ruledef.h constrct.h userdata.h \
+  moduldef.h utility.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h cstrccom.h retract.h \
+  factbin.h factbld.h factcmp.h pattern.h scanner.h reorder.h factcom.h \
+  factfun.h factmngr.h tmpltdef.h facthsh.h factmch.h factqury.h \
+  factrhs.h memalloc.h multifld.h prntutil.h router.h strngrtr.h \
+  sysdep.h tmpltbsc.h tmpltfun.h tmpltutl.h watch.h
+
+factprt.o: factprt.c setup.h envrnmnt.h entities.h usrsetup.h factgen.h \
+  reorder.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h pattern.h symbol.h scanner.h match.h \
+  network.h ruledef.h agenda.h crstrtgy.h conscomp.h extnfunc.h \
+  symblcmp.h constrnt.h cstrccom.h prntutil.h router.h factprt.h
+
+factqpsr.o: factqpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  exprnpsr.h extnfunc.h evaluatn.h constant.h expressn.h exprnops.h \
+  constrct.h userdata.h moduldef.h utility.h symbol.h scanner.h \
+  factqury.h factmngr.h conscomp.h symblcmp.h tmpltdef.h constrnt.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h modulutl.h prcdrpsr.h pprint.h prntutil.h router.h \
+  strngrtr.h factqpsr.h
+
+factqury.o: factqury.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h memalloc.h exprnpsr.h extnfunc.h \
+  symbol.h scanner.h modulutl.h tmpltutl.h constrnt.h factmngr.h \
+  conscomp.h symblcmp.h tmpltdef.h factbld.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h cstrccom.h facthsh.h insfun.h object.h multifld.h \
+  factqpsr.h prcdrfun.h prntutil.h router.h factqury.h
+
+factrete.o: factrete.c setup.h envrnmnt.h entities.h usrsetup.h drive.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h match.h network.h ruledef.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h factgen.h reorder.h pattern.h scanner.h \
+  factmch.h factbld.h factmngr.h tmpltdef.h facthsh.h incrrset.h \
+  memalloc.h multifld.h reteutil.h router.h factrete.h
+
+factrhs.o: factrhs.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrcpsr.h exprnpsr.h scanner.h modulutl.h modulpsr.h \
+  pattern.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h constrnt.h cstrccom.h reorder.h pprint.h prntutil.h \
+  router.h strngrtr.h tmpltpsr.h tmpltdef.h factbld.h tmpltrhs.h \
+  tmpltutl.h factmngr.h facthsh.h factrhs.h
+
+filecom.o: filecom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h commline.h cstrcpsr.h fileutil.h memalloc.h \
+  router.h filecom.h
+
+filertr.o: filertr.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  memalloc.h router.h sysdep.h filertr.h
+
+fileutil.o: fileutil.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h cstrcpsr.h memalloc.h \
+  prcdrfun.h pprint.h prntutil.h router.h scanner.h strngrtr.h sysdep.h \
+  filecom.h fileutil.h
+
+generate.o: generate.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h globlpsr.h memalloc.h pattern.h match.h network.h ruledef.h \
+  agenda.h crstrtgy.h conscomp.h symblcmp.h constrnt.h cstrccom.h \
+  reorder.h prntutil.h router.h generate.h analysis.h
+
+genrcbin.o: genrcbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h cstrccom.h genrccom.h genrcfun.h \
+  conscomp.h symblcmp.h memalloc.h modulbin.h objbin.h object.h \
+  constrnt.h multifld.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  router.h genrcbin.h
+
+genrccmp.o: genrccmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  genrccom.h genrcfun.h network.h match.h ruledef.h agenda.h crstrtgy.h \
+  constrnt.h cstrccom.h objcmp.h object.h multifld.h genrccmp.h
+
+genrccom.o: genrccom.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h \
+  sysdep.h symblbin.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h inscom.h insfun.h cstrcpsr.h genrcbin.h genrcfun.h \
+  genrccmp.h genrcexe.h genrcpsr.h memalloc.h modulpsr.h scanner.h \
+  modulutl.h router.h strngrtr.h watch.h prntutil.h genrccom.h
+
+genrcexe.o: genrcexe.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h insfun.h \
+  argacces.h genrccom.h genrcfun.h prcdrfun.h prccode.h prntutil.h \
+  proflfun.h router.h genrcexe.h
+
+genrcfun.o: genrcfun.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classfun.h scanner.h argacces.h cstrcpsr.h genrccom.h genrcfun.h \
+  genrcexe.h memalloc.h modulutl.h prccode.h prntutil.h router.h
+
+genrcpsr.o: genrcpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h dffnxfun.h classfun.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  cstrccom.h scanner.h classcom.h cstrcpsr.h exprnpsr.h genrccom.h \
+  genrcfun.h immthpsr.h memalloc.h modulutl.h pprint.h prcdrpsr.h \
+  prccode.h prntutil.h router.h genrcpsr.h
+
+globlbin.o: globlbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h globlbsc.h globldef.h conscomp.h symblcmp.h \
+  cstrccom.h memalloc.h multifld.h globlbin.h modulbin.h cstrcbin.h
+
+globlbsc.o: globlbsc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h constant.h \
+  extnfunc.h expressn.h exprnops.h symbol.h globlbin.h modulbin.h \
+  cstrcbin.h globldef.h conscomp.h symblcmp.h cstrccom.h globlcmp.h \
+  globlcom.h multifld.h watch.h globlbsc.h
+
+globlcmp.o: globlcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  globldef.h cstrccom.h globlcmp.h
+
+globlcom.o: globlcom.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h globldef.h \
+  conscomp.h symblcmp.h cstrccom.h prntutil.h router.h globlcom.h
+
+globldef.o: globldef.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h globlbin.h modulbin.h cstrcbin.h globldef.h conscomp.h \
+  symblcmp.h cstrccom.h commline.h globlbsc.h globlcmp.h globlcom.h \
+  globlpsr.h memalloc.h modulpsr.h scanner.h modulutl.h multifld.h \
+  prntutil.h router.h strngrtr.h
+
+globlpsr.o: globlpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrcpsr.h exprnpsr.h scanner.h globlbsc.h globldef.h \
+  conscomp.h symblcmp.h cstrccom.h memalloc.h modulpsr.h modulutl.h \
+  multifld.h pprint.h prntutil.h router.h watch.h globlpsr.h
+
+immthpsr.o: immthpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h cstrnutl.h \
+  exprnpsr.h genrcpsr.h genrcfun.h memalloc.h prccode.h immthpsr.h
+
+incrrset.o: incrrset.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h drive.h engine.h lgcldpnd.h retract.h pattern.h scanner.h \
+  reorder.h router.h reteutil.h incrrset.h
+
+inherpsr.o: inherpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h memalloc.h \
+  modulutl.h pprint.h prntutil.h router.h inherpsr.h
+
+inscom.o: inscom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h classinf.h \
+  commline.h exprnpsr.h insfile.h insfun.h insmngr.h insmoddp.h \
+  insmult.h inspsr.h lgcldpnd.h memalloc.h msgcom.h msgpass.h msgfun.h \
+  prntutil.h router.h strngrtr.h sysdep.h inscom.h
+
+insfile.o: insfile.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h memalloc.h \
+  factmngr.h tmpltdef.h factbld.h facthsh.h inscom.h insfun.h insmngr.h \
+  inspsr.h prntutil.h router.h strngrtr.h symblbin.h sysdep.h insfile.h
+
+insfun.o: insfun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h cstrnchk.h \
+  drive.h objrtmch.h engine.h lgcldpnd.h retract.h inscom.h insfun.h \
+  insmngr.h memalloc.h modulutl.h msgcom.h msgpass.h msgfun.h prccode.h \
+  prntutil.h router.h
+
+insmngr.o: insmngr.c setup.h envrnmnt.h entities.h usrsetup.h network.h \
+  match.h ruledef.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  drive.h objrtmch.h object.h multifld.h lgcldpnd.h classcom.h \
+  classfun.h scanner.h engine.h retract.h insfun.h memalloc.h miscfun.h \
+  modulutl.h msgcom.h msgpass.h msgfun.h prccode.h prntutil.h router.h \
+  sysdep.h insmngr.h inscom.h watch.h
+
+insmoddp.o: insmoddp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h inscom.h insfun.h \
+  object.h constrnt.h multifld.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h symblcmp.h cstrccom.h insmngr.h inspsr.h \
+  memalloc.h miscfun.h msgcom.h msgpass.h msgfun.h objrtmch.h prccode.h \
+  scanner.h prntutil.h router.h insmoddp.h
+
+insmult.o: insmult.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h extnfunc.h symbol.h insfun.h object.h constrnt.h \
+  multifld.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h cstrccom.h msgfun.h msgpass.h multifun.h prntutil.h \
+  router.h insmult.h
+
+inspsr.o: inspsr.c setup.h envrnmnt.h entities.h usrsetup.h classcom.h \
+  cstrccom.h moduldef.h userdata.h utility.h evaluatn.h constant.h \
+  constrct.h object.h constrnt.h expressn.h exprnops.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h classfun.h scanner.h classinf.h exprnpsr.h \
+  pprint.h prntutil.h router.h inspsr.h
+
+insquery.o: insquery.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h classcom.h cstrccom.h object.h \
+  constrnt.h multifld.h symbol.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h \
+  exprnpsr.h insfun.h insmngr.h insqypsr.h memalloc.h prcdrfun.h \
+  prntutil.h router.h insquery.h
+
+insqypsr.o: insqypsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h exprnpsr.h scanner.h insquery.h \
+  prcdrpsr.h pprint.h prntutil.h router.h strngrtr.h insqypsr.h
+
+iofun.o: iofun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h commline.h extnfunc.h symbol.h filertr.h \
+  memalloc.h prntutil.h router.h scanner.h strngrtr.h sysdep.h iofun.h
+
+lgcldpnd.o: lgcldpnd.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h engine.h lgcldpnd.h match.h network.h \
+  ruledef.h agenda.h symbol.h crstrtgy.h conscomp.h extnfunc.h \
+  symblcmp.h constrnt.h cstrccom.h retract.h factmngr.h tmpltdef.h \
+  factbld.h facthsh.h memalloc.h pattern.h scanner.h reorder.h \
+  reteutil.h router.h
+
+main.o: main.c clips.h setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h memalloc.h cstrcpsr.h fileutil.h \
+  strngfun.h envrnbld.h extnfunc.h symbol.h commline.h prntutil.h \
+  router.h filertr.h strngrtr.h iofun.h sysdep.h bmathfun.h exprnpsr.h \
+  scanner.h watch.h modulbsc.h bload.h exprnbin.h symblbin.h bsave.h \
+  ruledef.h network.h match.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  constrnt.h cstrccom.h rulebsc.h engine.h lgcldpnd.h retract.h drive.h \
+  incrrset.h rulecom.h dffctdef.h dffctbsc.h tmpltdef.h factbld.h \
+  tmpltbsc.h tmpltfun.h factmngr.h facthsh.h factcom.h factfun.h \
+  globldef.h globlbsc.h globlcom.h dffnxfun.h genrccom.h genrcfun.h \
+  classcom.h object.h multifld.h classexm.h classfun.h classinf.h \
+  classini.h classpsr.h defins.h inscom.h insfun.h insfile.h insmngr.h \
+  msgcom.h msgpass.h objrtmch.h
+
+memalloc.o: memalloc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h memalloc.h prntutil.h router.h utility.h evaluatn.h \
+  moduldef.h userdata.h
+
+miscfun.o: miscfun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h scanner.h \
+  memalloc.h multifld.h prntutil.h router.h sysdep.h dffnxfun.h \
+  factfun.h factmngr.h conscomp.h symblcmp.h tmpltdef.h constrnt.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h tmpltutl.h miscfun.h
+
+modulbin.o: modulbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h memalloc.h modulbin.h
+
+modulbsc.o: modulbsc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h \
+  sysdep.h symblbin.h modulbin.h cstrcbin.h modulcmp.h multifld.h \
+  prntutil.h router.h modulbsc.h
+
+modulcmp.o: modulcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  sysdep.h modulcmp.h
+
+moduldef.o: moduldef.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h \
+  sysdep.h symblbin.h modulbin.h cstrcbin.h memalloc.h modulbsc.h \
+  modulcmp.h modulpsr.h scanner.h prntutil.h router.h
+
+modulpsr.o: modulpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrcpsr.h extnfunc.h symbol.h \
+  memalloc.h modulutl.h scanner.h pprint.h prntutil.h router.h bload.h \
+  exprnbin.h sysdep.h symblbin.h modulpsr.h
+
+modulutl.o: modulutl.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrcpsr.h memalloc.h modulpsr.h evaluatn.h constant.h moduldef.h \
+  userdata.h utility.h symbol.h scanner.h pprint.h prntutil.h router.h \
+  sysdep.h watch.h expressn.h exprnops.h constrct.h modulutl.h
+
+msgcom.o: msgcom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classfun.h scanner.h classinf.h msgpsr.h insfun.h insmoddp.h msgfun.h \
+  msgpass.h memalloc.h prccode.h prntutil.h router.h watch.h msgcom.h
+
+msgfun.o: msgfun.c setup.h envrnmnt.h entities.h usrsetup.h classcom.h \
+  cstrccom.h moduldef.h userdata.h utility.h evaluatn.h constant.h \
+  constrct.h object.h constrnt.h expressn.h exprnops.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h classfun.h scanner.h insfun.h memalloc.h \
+  msgcom.h msgpass.h prccode.h prntutil.h router.h msgfun.h
+
+msgpass.o: msgpass.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h commline.h \
+  exprnpsr.h inscom.h insfun.h memalloc.h msgcom.h msgpass.h msgfun.h \
+  prccode.h prcdrfun.h prntutil.h proflfun.h router.h strngfun.h
+
+msgpsr.o: msgpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classfun.h scanner.h cstrcpsr.h cstrnchk.h exprnpsr.h insfun.h \
+  memalloc.h modulutl.h msgcom.h msgpass.h msgfun.h pprint.h prccode.h \
+  prntutil.h router.h strngrtr.h msgpsr.h
+
+multifld.o: multifld.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h evaluatn.h exprnops.h expressn.h constrct.h userdata.h \
+  moduldef.h utility.h memalloc.h object.h constrnt.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h cstrccom.h scanner.h prntutil.h router.h \
+  strngrtr.h
+
+multifun.o: multifun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h memalloc.h multifld.h multifun.h object.h constrnt.h match.h \
+  network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  cstrccom.h pprint.h prcdrpsr.h prcdrfun.h prntutil.h router.h
+
+objbin.o: objbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h classfun.h scanner.h classini.h cstrcbin.h cstrnbin.h \
+  insfun.h memalloc.h modulbin.h msgcom.h msgpass.h msgfun.h prntutil.h \
+  router.h objbin.h
+
+objcmp.o: objcmp.c setup.h envrnmnt.h entities.h usrsetup.h conscomp.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h constant.h \
+  extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h classcom.h \
+  cstrccom.h object.h constrnt.h multifld.h match.h network.h ruledef.h \
+  agenda.h crstrtgy.h classfun.h scanner.h classini.h cstrncmp.h \
+  objrtfnx.h objrtmch.h sysdep.h objcmp.h
+
+objrtbin.o: objrtbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h memalloc.h insfun.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  cstrccom.h objrtmch.h pattern.h scanner.h reorder.h reteutil.h \
+  rulebin.h cstrcbin.h modulbin.h objrtbin.h
+
+objrtbld.o: objrtbld.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h cstrnutl.h \
+  cstrnchk.h cstrnops.h drive.h inscom.h insfun.h insmngr.h memalloc.h \
+  pattern.h reorder.h prntutil.h reteutil.h rulepsr.h exprnpsr.h \
+  objrtmch.h objrtgen.h objrtfnx.h pprint.h router.h objrtbin.h \
+  objrtcmp.h objrtbld.h
+
+objrtcmp.o: objrtcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  objrtfnx.h match.h network.h ruledef.h agenda.h crstrtgy.h constrnt.h \
+  cstrccom.h object.h multifld.h objrtmch.h pattern.h scanner.h \
+  reorder.h sysdep.h objrtcmp.h
+
+objrtfnx.o: objrtfnx.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h bload.h \
+  exprnbin.h sysdep.h symblbin.h drive.h engine.h lgcldpnd.h retract.h \
+  memalloc.h objrtmch.h prntutil.h reteutil.h router.h objrtfnx.h
+
+objrtgen.o: objrtgen.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classfun.h object.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h constrnt.h expressn.h exprnops.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h cstrccom.h scanner.h classcom.h objrtfnx.h \
+  objrtmch.h objrtgen.h reorder.h pattern.h
+
+objrtmch.o: objrtmch.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classfun.h object.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h constrnt.h expressn.h exprnops.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h cstrccom.h scanner.h classcom.h memalloc.h \
+  drive.h engine.h lgcldpnd.h retract.h incrrset.h objrtfnx.h objrtmch.h \
+  prntutil.h reteutil.h ruledlt.h reorder.h pattern.h router.h insmngr.h
+
+parsefun.o: parsefun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrcpsr.h exprnpsr.h extnfunc.h \
+  symbol.h scanner.h memalloc.h multifld.h pprint.h prcdrpsr.h \
+  constrnt.h prntutil.h router.h strngrtr.h parsefun.h
+
+pattern.o: pattern.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  constrnt.h evaluatn.h cstrnchk.h cstrnutl.h exprnpsr.h extnfunc.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  symbol.h scanner.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h symblcmp.h cstrccom.h memalloc.h pprint.h prntutil.h \
+  reteutil.h router.h rulecmp.h pattern.h reorder.h
+
+pprint.o: pprint.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  memalloc.h sysdep.h utility.h evaluatn.h moduldef.h userdata.h \
+  pprint.h
+
+prccode.o: prccode.c setup.h envrnmnt.h entities.h usrsetup.h memalloc.h \
+  constant.h globlpsr.h expressn.h exprnops.h constrct.h userdata.h \
+  moduldef.h utility.h evaluatn.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h multifld.h object.h constrnt.h match.h network.h ruledef.h \
+  agenda.h crstrtgy.h conscomp.h symblcmp.h cstrccom.h pprint.h \
+  prcdrpsr.h prntutil.h router.h prccode.h
+
+prcdrfun.o: prcdrfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h constrnt.h cstrnchk.h cstrnops.h \
+  exprnpsr.h extnfunc.h symbol.h scanner.h memalloc.h multifld.h \
+  prcdrpsr.h router.h prcdrfun.h globldef.h conscomp.h symblcmp.h \
+  cstrccom.h
+
+prcdrpsr.o: prcdrpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h constrnt.h cstrnchk.h cstrnops.h \
+  cstrnutl.h exprnpsr.h extnfunc.h symbol.h scanner.h memalloc.h \
+  modulutl.h multifld.h pprint.h prntutil.h router.h prcdrpsr.h \
+  globldef.h conscomp.h symblcmp.h cstrccom.h globlpsr.h
+
+prdctfun.o: prdctfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h multifld.h router.h prdctfun.h
+
+prntutil.o: prntutil.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrcpsr.h factmngr.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h tmpltdef.h constrnt.h factbld.h \
+  network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h \
+  inscom.h insfun.h object.h multifld.h insmngr.h memalloc.h multifun.h \
+  router.h scanner.h sysdep.h prntutil.h
+
+proflfun.o: proflfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h classcom.h cstrccom.h object.h \
+  constrnt.h multifld.h symbol.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h dffnxfun.h genrccom.h \
+  genrcfun.h memalloc.h msgcom.h msgpass.h router.h sysdep.h proflfun.h
+
+reorder.o: reorder.c setup.h envrnmnt.h entities.h usrsetup.h cstrnutl.h \
+  constrnt.h evaluatn.h constant.h extnfunc.h expressn.h exprnops.h \
+  constrct.h userdata.h moduldef.h utility.h symbol.h memalloc.h \
+  pattern.h scanner.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h symblcmp.h cstrccom.h reorder.h prntutil.h router.h \
+  rulelhs.h
+
+reteutil.o: reteutil.c setup.h envrnmnt.h entities.h usrsetup.h drive.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h match.h network.h ruledef.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h incrrset.h memalloc.h pattern.h \
+  scanner.h reorder.h prntutil.h router.h rulecom.h reteutil.h
+
+retract.o: retract.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h drive.h engine.h lgcldpnd.h retract.h memalloc.h prntutil.h \
+  reteutil.h router.h
+
+router.o: router.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h extnfunc.h symbol.h filertr.h memalloc.h \
+  prntutil.h scanner.h strngrtr.h sysdep.h router.h
+
+rulebin.o: rulebin.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  bload.h exprnbin.h sysdep.h symblbin.h bsave.h engine.h lgcldpnd.h \
+  retract.h memalloc.h pattern.h scanner.h reorder.h reteutil.h \
+  rulebsc.h rulebin.h cstrcbin.h modulbin.h
+
+rulebld.o: rulebld.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h drive.h \
+  expressn.h exprnops.h match.h network.h ruledef.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  incrrset.h memalloc.h pattern.h scanner.h reorder.h prntutil.h \
+  reteutil.h router.h rulebld.h rulepsr.h watch.h
+
+rulebsc.o: rulebsc.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h drive.h match.h network.h ruledef.h agenda.h \
+  symbol.h crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h \
+  cstrccom.h engine.h lgcldpnd.h retract.h multifld.h reteutil.h \
+  router.h watch.h rulebin.h cstrcbin.h modulbin.h rulecmp.h rulebsc.h
+
+rulecmp.o: rulecmp.c setup.h envrnmnt.h entities.h usrsetup.h factbld.h \
+  network.h match.h ruledef.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  pattern.h scanner.h reorder.h reteutil.h rulecmp.h
+
+rulecom.o: rulecom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h crstrtgy.h agenda.h ruledef.h network.h match.h \
+  conscomp.h extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h incrrset.h memalloc.h multifld.h \
+  pattern.h scanner.h reorder.h prntutil.h reteutil.h router.h ruledlt.h \
+  sysdep.h watch.h rulebin.h cstrcbin.h modulbin.h rulecom.h
+
+rulecstr.o: rulecstr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  analysis.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h reorder.h pattern.h symbol.h scanner.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h extnfunc.h \
+  symblcmp.h constrnt.h cstrccom.h cstrnchk.h cstrnops.h cstrnutl.h \
+  prcdrpsr.h prntutil.h router.h rulepsr.h rulecstr.h
+
+ruledef.o: ruledef.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  drive.h engine.h lgcldpnd.h retract.h memalloc.h pattern.h scanner.h \
+  reorder.h reteutil.h rulebsc.h rulecom.h rulepsr.h ruledlt.h bload.h \
+  exprnbin.h sysdep.h symblbin.h rulebin.h cstrcbin.h modulbin.h \
+  rulecmp.h
+
+ruledlt.o: ruledlt.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  bload.h exprnbin.h sysdep.h symblbin.h drive.h engine.h lgcldpnd.h \
+  retract.h memalloc.h pattern.h scanner.h reorder.h reteutil.h \
+  ruledlt.h
+
+rulelhs.o: rulelhs.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h cstrnchk.h exprnpsr.h scanner.h memalloc.h pattern.h \
+  reorder.h pprint.h prntutil.h router.h rulelhs.h
+
+rulepsr.o: rulepsr.c setup.h envrnmnt.h entities.h usrsetup.h analysis.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h reorder.h pattern.h symbol.h scanner.h match.h \
+  network.h ruledef.h agenda.h crstrtgy.h conscomp.h extnfunc.h \
+  symblcmp.h constrnt.h cstrccom.h cstrcpsr.h cstrnchk.h cstrnops.h \
+  engine.h lgcldpnd.h retract.h exprnpsr.h incrrset.h memalloc.h \
+  modulutl.h prccode.h prcdrpsr.h pprint.h prntutil.h router.h rulebld.h \
+  rulebsc.h rulecstr.h ruledlt.h rulelhs.h watch.h tmpltfun.h factmngr.h \
+  tmpltdef.h factbld.h facthsh.h bload.h exprnbin.h sysdep.h symblbin.h \
+  rulepsr.h
+
+scanner.o: scanner.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  memalloc.h pprint.h prntutil.h router.h symbol.h sysdep.h utility.h \
+  evaluatn.h moduldef.h userdata.h scanner.h
+
+sortfun.o: sortfun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h dffnxfun.h extnfunc.h symbol.h memalloc.h \
+  multifld.h sysdep.h sortfun.h
+
+strngfun.o: strngfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h cstrcpsr.h engine.h \
+  lgcldpnd.h match.h network.h ruledef.h agenda.h symbol.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h retract.h \
+  exprnpsr.h scanner.h memalloc.h multifld.h prcdrpsr.h pprint.h \
+  prntutil.h router.h strngrtr.h sysdep.h drive.h strngfun.h
+
+strngrtr.o: strngrtr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h memalloc.h prntutil.h router.h sysdep.h strngrtr.h \
+  utility.h evaluatn.h moduldef.h userdata.h
+
+symblbin.o: symblbin.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h \
+  sysdep.h symblbin.h bsave.h cstrnbin.h constrnt.h exprnpsr.h scanner.h \
+  memalloc.h router.h
+
+symblcmp.o: symblcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h conscomp.h extnfunc.h symbol.h \
+  symblcmp.h cstrncmp.h constrnt.h cstrccom.h exprnpsr.h scanner.h \
+  memalloc.h prntutil.h router.h sysdep.h
+
+symbol.o: symbol.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h memalloc.h multifld.h prntutil.h router.h \
+  sysdep.h symbol.h
+
+sysdep.o: sysdep.c setup.h envrnmnt.h entities.h usrsetup.h sysdep.h
+
+textpro.o: textpro.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h commline.h extnfunc.h symbol.h memalloc.h \
+  prntutil.h router.h sysdep.h textpro.h
+
+tmpltbin.o: tmpltbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrnbin.h constrnt.h factbin.h factbld.h network.h \
+  match.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h cstrccom.h \
+  factmngr.h tmpltdef.h facthsh.h memalloc.h tmpltpsr.h tmpltutl.h \
+  tmpltbin.h cstrcbin.h modulbin.h
+
+tmpltbsc.o: tmpltbsc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrccom.h cstrcpsr.h extnfunc.h \
+  symbol.h factrhs.h factmngr.h conscomp.h symblcmp.h tmpltdef.h \
+  constrnt.h factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h \
+  facthsh.h scanner.h memalloc.h multifld.h router.h tmpltbin.h \
+  cstrcbin.h modulbin.h tmpltcmp.h tmpltpsr.h tmpltutl.h tmpltbsc.h
+
+tmpltcmp.o: tmpltcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  cstrncmp.h constrnt.h factcmp.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h cstrccom.h pattern.h scanner.h reorder.h tmpltdef.h \
+  factbld.h tmpltcmp.h
+
+tmpltdef.o: tmpltdef.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrccom.h moduldef.h userdata.h utility.h evaluatn.h constant.h \
+  constrct.h cstrnchk.h constrnt.h exprnops.h expressn.h memalloc.h \
+  modulpsr.h symbol.h scanner.h modulutl.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h conscomp.h extnfunc.h symblcmp.h pattern.h \
+  reorder.h router.h tmpltbsc.h tmpltdef.h factbld.h tmpltfun.h \
+  factmngr.h facthsh.h tmpltpsr.h tmpltutl.h bload.h exprnbin.h sysdep.h \
+  symblbin.h tmpltbin.h cstrcbin.h modulbin.h tmpltcmp.h
+
+tmpltfun.o: tmpltfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h cstrnchk.h constrnt.h \
+  default.h exprnpsr.h extnfunc.h symbol.h scanner.h factmngr.h \
+  conscomp.h symblcmp.h tmpltdef.h factbld.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h cstrccom.h facthsh.h factrhs.h memalloc.h \
+  modulutl.h multifld.h pprint.h prcdrpsr.h prntutil.h reorder.h \
+  pattern.h router.h sysdep.h tmpltlhs.h tmpltrhs.h tmpltutl.h \
+  tmpltfun.h
+
+tmpltlhs.o: tmpltlhs.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constrnt.h exprnpsr.h extnfunc.h expressn.h exprnops.h symbol.h \
+  scanner.h factrhs.h factmngr.h conscomp.h symblcmp.h tmpltdef.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h memalloc.h modulutl.h pattern.h reorder.h pprint.h \
+  prntutil.h router.h tmpltutl.h tmpltlhs.h
+
+tmpltpsr.o: tmpltpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrcpsr.h cstrnchk.h constrnt.h cstrnpsr.h cstrnutl.h \
+  default.h exprnpsr.h scanner.h factmngr.h conscomp.h symblcmp.h \
+  tmpltdef.h factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h \
+  cstrccom.h facthsh.h memalloc.h modulutl.h pattern.h reorder.h \
+  pprint.h prntutil.h router.h tmpltbsc.h watch.h tmpltpsr.h
+
+tmpltrhs.o: tmpltrhs.c setup.h envrnmnt.h entities.h usrsetup.h default.h \
+  constrnt.h evaluatn.h constant.h extnfunc.h expressn.h exprnops.h \
+  constrct.h userdata.h moduldef.h utility.h symbol.h factrhs.h \
+  factmngr.h conscomp.h symblcmp.h tmpltdef.h factbld.h network.h \
+  match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h scanner.h \
+  memalloc.h modulutl.h pprint.h prntutil.h router.h tmpltfun.h \
+  tmpltlhs.h tmpltutl.h tmpltrhs.h
+
+tmpltutl.o: tmpltutl.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrnchk.h constrnt.h extnfunc.h \
+  symbol.h memalloc.h modulutl.h scanner.h multifld.h prntutil.h \
+  router.h sysdep.h tmpltbsc.h tmpltdef.h conscomp.h symblcmp.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  tmpltfun.h factmngr.h facthsh.h tmpltpsr.h watch.h tmpltutl.h
+
+userdata.o: userdata.c setup.h envrnmnt.h entities.h usrsetup.h \
+  userdata.h
+
+userfunctions.o: userfunctions.c clips.h setup.h envrnmnt.h entities.h \
+  usrsetup.h argacces.h expressn.h exprnops.h constrct.h userdata.h \
+  moduldef.h utility.h evaluatn.h constant.h memalloc.h cstrcpsr.h \
+  fileutil.h strngfun.h envrnbld.h extnfunc.h symbol.h commline.h \
+  prntutil.h router.h filertr.h strngrtr.h iofun.h sysdep.h bmathfun.h \
+  exprnpsr.h scanner.h watch.h modulbsc.h bload.h exprnbin.h symblbin.h \
+  bsave.h ruledef.h network.h match.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h constrnt.h cstrccom.h rulebsc.h engine.h lgcldpnd.h \
+  retract.h drive.h incrrset.h rulecom.h dffctdef.h dffctbsc.h \
+  tmpltdef.h factbld.h tmpltbsc.h tmpltfun.h factmngr.h facthsh.h \
+  factcom.h factfun.h globldef.h globlbsc.h globlcom.h dffnxfun.h \
+  genrccom.h genrcfun.h classcom.h object.h multifld.h classexm.h \
+  classfun.h classinf.h classini.h classpsr.h defins.h inscom.h insfun.h \
+  insfile.h insmngr.h msgcom.h msgpass.h objrtmch.h
+
+utility.o: utility.c setup.h envrnmnt.h entities.h usrsetup.h commline.h \
+  evaluatn.h constant.h factmngr.h conscomp.h constrct.h userdata.h \
+  moduldef.h utility.h extnfunc.h expressn.h exprnops.h symbol.h \
+  symblcmp.h tmpltdef.h constrnt.h factbld.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h cstrccom.h facthsh.h memalloc.h multifld.h \
+  prntutil.h sysdep.h
+
+watch.o: watch.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h extnfunc.h symbol.h memalloc.h router.h watch.h
diff --git a/clips/makefile.win b/clips/makefile.win
new file mode 100644
index 000000000..8952d754e
--- /dev/null
+++ b/clips/makefile.win
@@ -0,0 +1,1290 @@
+# Windows
+# Windows 7 or 10 with Visual Studio Community 2015
+
+# The GNU Make Manual
+# http://www.gnu.objrg/software/make/manual/make.html
+
+# https://felixcrux.com/blog/creating-basic-makefile
+
+# set BUILD to either RELEASE, DEBUG, RELEASE_CPP, or DEBUG_CPP
+BUILD = RELEASE
+
+!IF "$(BUILD)" == "RELEASE"
+COMPILE_AS = C
+CONFIGURATION = RELEASE
+!ENDIF
+
+!IF "$(BUILD)" == "DEBUG"
+COMPILE_AS = C
+CONFIGURATION = DEBUG
+!ENDIF
+
+!IF "$(BUILD)" == "RELEASE_CPP"
+COMPILE_AS = C++
+CONFIGURATION = RELEASE
+!ENDIF
+
+!IF "$(BUILD)" == "DEBUG_CPP"
+COMPILE_AS = C++
+CONFIGURATION = DEBUG
+!ENDIF
+
+CLIPS_OS = WIN_MVC
+
+WARNINGS = /D "_CRT_SECURE_NO_WARNINGS" /W3 /WX-
+
+!IF "$(COMPILE_AS)" == "C"
+CC = cl
+OTHER_FLAGS = /TC
+!ENDIF
+
+!IF "$(COMPILE_AS)" == "C++"
+CC = cl
+OTHER_FLAGS = /TP /EHsc
+!ENDIF
+
+CONFIG_FLAGS = /Zc:inline /fp:precise /GS /Gd
+
+!IF "$(CONFIGURATION)" == "RELEASE"
+CONFIG_FLAGS = $(CONFIG_FLAGS) /GL /Ox /D "NDEBUG" /Oi /MT
+LINK_FLAGS = /LTCG
+!ENDIF 
+
+!IF "$(CONFIGURATION)" == "DEBUG"
+CONFIG_FLAGS = $(CONFIG_FLAGS) /Od /D "_DEBUG" /RTC1 /MTd
+LINK_FLAGS = 
+!ENDIF
+	    
+OBJS = agenda.obj analysis.obj argacces.obj bload.obj bmathfun.obj bsave.obj \
+ 	classcom.obj classexm.obj classfun.obj classinf.obj classini.obj \
+ 	classpsr.obj clsltpsr.obj commline.obj conscomp.obj constrct.obj \
+ 	constrnt.obj crstrtgy.obj cstrcbin.obj cstrccom.obj cstrcpsr.obj \
+ 	cstrnbin.obj cstrnchk.obj cstrncmp.obj cstrnops.obj cstrnpsr.obj \
+ 	cstrnutl.obj default.obj defins.obj developr.obj dffctbin.obj dffctbsc.obj \
+ 	dffctcmp.obj dffctdef.obj dffctpsr.obj dffnxbin.obj dffnxcmp.obj dffnxexe.obj \
+ 	dffnxfun.obj dffnxpsr.obj dfinsbin.obj dfinscmp.obj drive.obj emathfun.obj \
+ 	engine.obj envrnmnt.obj envrnbld.obj evaluatn.obj expressn.obj exprnbin.obj \
+ 	exprnops.obj exprnpsr.obj extnfunc.obj factbin.obj factbld.obj factcmp.obj \
+ 	factcom.obj factfun.obj factgen.obj facthsh.obj factlhs.obj factmch.obj \
+ 	factmngr.obj factprt.obj factqpsr.obj factqury.obj factrete.obj factrhs.obj \
+ 	filecom.obj filertr.obj fileutil.obj generate.obj genrcbin.obj genrccmp.obj \
+ 	genrccom.obj genrcexe.obj genrcfun.obj genrcpsr.obj globlbin.obj globlbsc.obj \
+ 	globlcmp.obj globlcom.obj globldef.obj globlpsr.obj immthpsr.obj incrrset.obj \
+ 	inherpsr.obj inscom.obj insfile.obj insfun.obj insmngr.obj insmoddp.obj \
+ 	insmult.obj inspsr.obj insquery.obj insqypsr.obj iofun.obj lgcldpnd.obj \
+ 	memalloc.obj miscfun.obj modulbin.obj modulbsc.obj modulcmp.obj moduldef.obj \
+ 	modulpsr.obj modulutl.obj msgcom.obj msgfun.obj msgpass.obj msgpsr.obj \
+ 	multifld.obj multifun.obj objbin.obj objcmp.obj objrtbin.obj objrtbld.obj \
+ 	objrtcmp.obj objrtfnx.obj objrtgen.obj objrtmch.obj parsefun.obj pattern.obj \
+ 	pprint.obj prccode.obj prcdrfun.obj prcdrpsr.obj prdctfun.obj prntutil.obj \
+ 	proflfun.obj reorder.obj reteutil.obj retract.obj router.obj rulebin.obj \
+ 	rulebld.obj rulebsc.obj rulecmp.obj rulecom.obj rulecstr.obj ruledef.obj \
+ 	ruledlt.obj rulelhs.obj rulepsr.obj scanner.obj sortfun.obj strngfun.obj \
+ 	strngrtr.obj symblbin.obj symblcmp.obj symbol.obj sysdep.obj textpro.obj \
+ 	tmpltbin.obj tmpltbsc.obj tmpltcmp.obj tmpltdef.obj tmpltfun.obj tmpltlhs.obj \
+ 	tmpltpsr.obj tmpltrhs.obj tmpltutl.obj userdata.obj userfunctions.obj \
+ 	utility.obj watch.obj
+
+.c.obj :
+	$(CC) -c -D$(CLIPS_OS) $(CONFIG_FLAGS) $(OTHER_FLAGS) $(WARNINGS) $<
+	
+all: clips
+
+clips : main.obj clips.lib
+	$(CC) /Feclips.exe main.obj clips.lib /link $(LINK_FLAGS) 
+
+clips.lib : $(OBJS)
+	lib /OUT:clips.lib $(LINK_FLAGS) $(OBJS) 
+
+clean : 
+	erase /Q main.obj $(OBJS)
+	erase /Q clips.exe clips.lib
+	
+##.PHONY : all clips clean
+
+# Dependencies generated using "gcc -MM *.c"
+
+agenda.obj: agenda.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h crstrtgy.h agenda.h ruledef.h network.h match.h \
+  conscomp.h extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h memalloc.h modulutl.h scanner.h \
+  multifld.h prntutil.h reteutil.h router.h rulebsc.h strngrtr.h \
+  sysdep.h watch.h
+
+analysis.obj: analysis.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h cstrnchk.h constrnt.h evaluatn.h cstrnutl.h cstrnops.h \
+  exprnpsr.h extnfunc.h expressn.h exprnops.h constrct.h userdata.h \
+  moduldef.h utility.h symbol.h scanner.h generate.h analysis.h \
+  reorder.h pattern.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h symblcmp.h cstrccom.h memalloc.h modulutl.h prntutil.h \
+  router.h rulecstr.h rulepsr.h watch.h
+
+argacces.obj: argacces.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrnchk.h constrnt.h evaluatn.h constant.h extnfunc.h expressn.h \
+  exprnops.h constrct.h userdata.h moduldef.h utility.h symbol.h \
+  factmngr.h conscomp.h symblcmp.h tmpltdef.h factbld.h network.h \
+  match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h insfun.h \
+  object.h multifld.h prntutil.h router.h sysdep.h argacces.h
+
+bload.obj: bload.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h bsave.h cstrnbin.h constrnt.h exprnpsr.h \
+  extnfunc.h symbol.h scanner.h memalloc.h prntutil.h router.h bload.h \
+  exprnbin.h sysdep.h symblbin.h
+
+bmathfun.obj: bmathfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h prntutil.h router.h bmathfun.h
+
+bsave.obj: bsave.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrnbin.h constrnt.h exprnpsr.h scanner.h memalloc.h \
+  prntutil.h router.h bsave.h
+
+classcom.obj: classcom.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h argacces.h classfun.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  cstrccom.h scanner.h classcom.h classini.h modulutl.h msgcom.h \
+  msgpass.h prntutil.h router.h
+
+classexm.obj: classexm.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h classcom.h cstrccom.h object.h \
+  constrnt.h multifld.h symbol.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h \
+  classini.h insfun.h memalloc.h msgcom.h msgpass.h msgfun.h prntutil.h \
+  router.h strngrtr.h sysdep.h classexm.h
+
+classfun.obj: classfun.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classini.h cstrcpsr.h inscom.h insfun.h insmngr.h memalloc.h \
+  modulutl.h scanner.h msgfun.h msgpass.h prntutil.h router.h classfun.h
+
+classinf.obj: classinf.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h classcom.h cstrccom.h object.h \
+  constrnt.h multifld.h symbol.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h classexm.h classfun.h \
+  scanner.h classini.h memalloc.h insfun.h msgcom.h msgpass.h msgfun.h \
+  prntutil.h classinf.h
+
+classini.obj: classini.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classexm.h classfun.h scanner.h \
+  classinf.h classpsr.h cstrcpsr.h inscom.h insfun.h memalloc.h \
+  modulpsr.h modulutl.h msgcom.h msgpass.h watch.h defins.h insquery.h \
+  bload.h exprnbin.h sysdep.h symblbin.h objbin.h objcmp.h objrtbld.h \
+  objrtfnx.h objrtmch.h classini.h
+
+classpsr.obj: classpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classfun.h scanner.h clsltpsr.h cstrcpsr.h inherpsr.h memalloc.h \
+  modulpsr.h modulutl.h msgpsr.h pprint.h prntutil.h router.h classpsr.h
+
+clsltpsr.obj: clsltpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h cstrnchk.h \
+  cstrnpsr.h cstrnutl.h default.h insfun.h memalloc.h pprint.h \
+  prntutil.h router.h clsltpsr.h
+
+commline.obj: commline.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h argacces.h expressn.h exprnops.h constrct.h userdata.h \
+  moduldef.h utility.h evaluatn.h cstrcpsr.h exprnpsr.h extnfunc.h \
+  symbol.h scanner.h fileutil.h memalloc.h multifld.h pprint.h \
+  prcdrfun.h prcdrpsr.h constrnt.h prntutil.h router.h strngrtr.h \
+  sysdep.h commline.h
+
+conscomp.obj: conscomp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrccom.h cstrncmp.h constrnt.h \
+  exprnpsr.h extnfunc.h symbol.h scanner.h memalloc.h modulcmp.h \
+  prntutil.h router.h sysdep.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h symblcmp.h dffnxcmp.h dffnxfun.h tmpltcmp.h \
+  tmpltdef.h factbld.h globlcmp.h globldef.h genrccmp.h genrcfun.h \
+  objcmp.h object.h multifld.h
+
+constrct.obj: constrct.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h cstrcpsr.h exprnpsr.h \
+  extnfunc.h symbol.h scanner.h memalloc.h modulutl.h multifld.h \
+  prcdrfun.h prcdrpsr.h constrnt.h prntutil.h router.h ruledef.h \
+  network.h match.h agenda.h crstrtgy.h conscomp.h symblcmp.h cstrccom.h \
+  sysdep.h watch.h
+
+constrnt.obj: constrnt.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h memalloc.h \
+  multifld.h router.h scanner.h constrnt.h
+
+crstrtgy.obj: crstrtgy.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h memalloc.h pattern.h scanner.h reorder.h reteutil.h
+
+cstrcbin.obj: cstrcbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h
+
+cstrccom.obj: cstrccom.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h extnfunc.h evaluatn.h expressn.h exprnops.h constrct.h \
+  userdata.h moduldef.h utility.h symbol.h memalloc.h argacces.h \
+  multifld.h modulutl.h scanner.h prntutil.h router.h commline.h \
+  sysdep.h bload.h exprnbin.h symblbin.h cstrcpsr.h cstrccom.h
+
+cstrcpsr.obj: cstrcpsr.c setup.h envrnmnt.h entities.h usrsetup.h router.h \
+  watch.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h prcdrpsr.h constrnt.h exprnpsr.h \
+  extnfunc.h symbol.h scanner.h memalloc.h modulutl.h modulpsr.h \
+  pprint.h prntutil.h sysdep.h cstrcpsr.h
+
+cstrnbin.obj: cstrnbin.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h memalloc.h prntutil.h router.h bload.h utility.h evaluatn.h \
+  moduldef.h userdata.h extnfunc.h expressn.h exprnops.h constrct.h \
+  symbol.h exprnbin.h sysdep.h symblbin.h bsave.h cstrnbin.h constrnt.h
+
+cstrnchk.obj: cstrnchk.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrnutl.h constrnt.h evaluatn.h constant.h extnfunc.h expressn.h \
+  exprnops.h constrct.h userdata.h moduldef.h utility.h symbol.h \
+  multifld.h prntutil.h router.h classcom.h cstrccom.h object.h match.h \
+  network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classexm.h inscom.h insfun.h cstrnchk.h
+
+cstrncmp.obj: cstrncmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h conscomp.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  memalloc.h prntutil.h router.h sysdep.h cstrncmp.h constrnt.h
+
+cstrnops.obj: cstrnops.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h constrnt.h evaluatn.h cstrnchk.h cstrnutl.h extnfunc.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  symbol.h memalloc.h multifld.h router.h scanner.h cstrnops.h
+
+cstrnpsr.obj: cstrnpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h cstrnchk.h constrnt.h evaluatn.h cstrnutl.h expressn.h \
+  exprnops.h constrct.h userdata.h moduldef.h utility.h memalloc.h \
+  pprint.h prntutil.h router.h scanner.h sysdep.h cstrnpsr.h
+
+cstrnutl.obj: cstrnutl.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h memalloc.h \
+  multifld.h router.h scanner.h cstrnutl.h constrnt.h
+
+default.obj: default.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  constrnt.h evaluatn.h cstrnchk.h cstrnutl.h exprnpsr.h extnfunc.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  symbol.h scanner.h factmngr.h conscomp.h symblcmp.h tmpltdef.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h inscom.h insfun.h object.h multifld.h pprint.h prntutil.h \
+  router.h default.h
+
+defins.obj: defins.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h dfinsbin.h defins.h conscomp.h symblcmp.h cstrccom.h \
+  object.h constrnt.h multifld.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h dfinscmp.h argacces.h classcom.h classfun.h scanner.h \
+  cstrcpsr.h insfun.h inspsr.h memalloc.h modulpsr.h modulutl.h pprint.h \
+  prntutil.h router.h
+
+developr.obj: developr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h factmngr.h \
+  conscomp.h symblcmp.h tmpltdef.h constrnt.h factbld.h network.h \
+  match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h inscom.h \
+  insfun.h object.h multifld.h modulutl.h scanner.h prntutil.h router.h \
+  classcom.h classfun.h objrtmch.h developr.h
+
+dffctbin.obj: dffctbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h dffctdef.h conscomp.h symblcmp.h cstrccom.h \
+  memalloc.h dffctbin.h cstrcbin.h modulbin.h
+
+dffctbsc.obj: dffctbsc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrccom.h cstrcpsr.h dffctdef.h \
+  conscomp.h extnfunc.h symbol.h symblcmp.h dffctpsr.h factrhs.h \
+  factmngr.h tmpltdef.h constrnt.h factbld.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h facthsh.h scanner.h memalloc.h multifld.h router.h \
+  dffctbin.h cstrcbin.h modulbin.h dffctcmp.h dffctbsc.h
+
+dffctcmp.obj: dffctcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  dffctdef.h cstrccom.h dffctcmp.h
+
+dffctdef.obj: dffctdef.c setup.h envrnmnt.h entities.h usrsetup.h \
+  dffctbsc.h dffctdef.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h conscomp.h extnfunc.h expressn.h exprnops.h \
+  symbol.h symblcmp.h cstrccom.h dffctpsr.h memalloc.h bload.h \
+  exprnbin.h sysdep.h symblbin.h dffctbin.h cstrcbin.h modulbin.h \
+  dffctcmp.h
+
+dffctpsr.obj: dffctpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrcpsr.h dffctbsc.h dffctdef.h conscomp.h symblcmp.h \
+  cstrccom.h factrhs.h factmngr.h tmpltdef.h constrnt.h factbld.h \
+  network.h match.h ruledef.h agenda.h crstrtgy.h facthsh.h scanner.h \
+  memalloc.h modulutl.h pprint.h prntutil.h router.h dffctpsr.h
+
+dffnxbin.obj: dffnxbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h cstrccom.h memalloc.h modulbin.h \
+  dffnxbin.h dffnxfun.h
+
+dffnxcmp.obj: dffnxcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  dffnxcmp.h dffnxfun.h
+
+dffnxexe.obj: dffnxexe.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h constant.h \
+  prcdrfun.h prccode.h expressn.h exprnops.h scanner.h symbol.h \
+  prntutil.h proflfun.h router.h watch.h dffnxexe.h dffnxfun.h
+
+dffnxfun.obj: dffnxfun.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h dffnxbin.h dffnxfun.h dffnxcmp.h cstrcpsr.h dffnxpsr.h \
+  modulpsr.h scanner.h dffnxexe.h watch.h argacces.h cstrccom.h \
+  memalloc.h modulutl.h multifld.h prntutil.h router.h
+
+dffnxpsr.obj: dffnxpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h network.h match.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h constrnt.h cstrccom.h genrccom.h genrcfun.h cstrcpsr.h \
+  dffnxfun.h exprnpsr.h scanner.h memalloc.h modulutl.h pprint.h \
+  prccode.h prntutil.h router.h dffnxpsr.h
+
+dfinsbin.obj: dfinsbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h defins.h conscomp.h symblcmp.h \
+  cstrccom.h object.h constrnt.h multifld.h match.h network.h ruledef.h \
+  agenda.h crstrtgy.h memalloc.h modulbin.h dfinsbin.h
+
+dfinscmp.obj: dfinscmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  defins.h cstrccom.h object.h constrnt.h multifld.h match.h network.h \
+  ruledef.h agenda.h crstrtgy.h dfinscmp.h
+
+drive.obj: drive.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  engine.h lgcldpnd.h retract.h incrrset.h memalloc.h prntutil.h \
+  reteutil.h router.h drive.h
+
+emathfun.obj: emathfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h prntutil.h \
+  router.h emathfun.h
+
+engine.obj: engine.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h commline.h factmngr.h tmpltdef.h factbld.h facthsh.h \
+  inscom.h insfun.h object.h multifld.h memalloc.h modulutl.h scanner.h \
+  prccode.h prcdrfun.h prntutil.h proflfun.h reteutil.h retract.h \
+  router.h ruledlt.h sysdep.h watch.h engine.h lgcldpnd.h
+
+envrnbld.obj: envrnbld.c setup.h envrnmnt.h entities.h usrsetup.h \
+  bmathfun.h evaluatn.h constant.h commline.h emathfun.h engine.h \
+  lgcldpnd.h match.h network.h ruledef.h constrct.h userdata.h \
+  moduldef.h utility.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  retract.h filecom.h iofun.h memalloc.h miscfun.h multifun.h parsefun.h \
+  pprint.h prccode.h scanner.h prcdrfun.h prdctfun.h prntutil.h \
+  proflfun.h router.h sortfun.h strngfun.h sysdep.h textpro.h watch.h \
+  dffctdef.h genrccom.h genrcfun.h dffnxfun.h globldef.h tmpltdef.h \
+  factbld.h classini.h object.h multifld.h envrnbld.h
+
+envrnmnt.obj: envrnmnt.c setup.h envrnmnt.h entities.h usrsetup.h \
+  bmathfun.h evaluatn.h constant.h commline.h emathfun.h engine.h \
+  lgcldpnd.h match.h network.h ruledef.h constrct.h userdata.h \
+  moduldef.h utility.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  retract.h filecom.h iofun.h memalloc.h miscfun.h multifun.h parsefun.h \
+  prccode.h scanner.h prcdrfun.h prdctfun.h prntutil.h proflfun.h \
+  router.h sortfun.h strngfun.h sysdep.h textpro.h watch.h dffctdef.h \
+  genrccom.h genrcfun.h dffnxfun.h globldef.h tmpltdef.h factbld.h \
+  classini.h object.h multifld.h
+
+evaluatn.obj: evaluatn.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h factmngr.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h tmpltdef.h constrnt.h factbld.h \
+  network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h \
+  memalloc.h router.h prcdrfun.h multifld.h prntutil.h exprnpsr.h \
+  scanner.h proflfun.h sysdep.h dffnxfun.h genrccom.h genrcfun.h \
+  object.h inscom.h insfun.h
+
+expressn.obj: expressn.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h memalloc.h prntutil.h router.h
+
+exprnbin.obj: exprnbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h dffctdef.h conscomp.h symblcmp.h cstrccom.h \
+  memalloc.h network.h match.h ruledef.h agenda.h crstrtgy.h constrnt.h \
+  genrcbin.h genrcfun.h dffnxbin.h dffnxfun.h factmngr.h tmpltdef.h \
+  factbld.h facthsh.h tmpltbin.h cstrcbin.h modulbin.h globlbin.h \
+  globldef.h objbin.h object.h multifld.h insfun.h inscom.h
+
+exprnops.obj: exprnops.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrnchk.h constrnt.h evaluatn.h constant.h cstrnops.h cstrnutl.h \
+  extnfunc.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h symbol.h memalloc.h prntutil.h router.h
+
+exprnpsr.obj: exprnpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrnchk.h constrnt.h memalloc.h \
+  modulutl.h symbol.h scanner.h pprint.h prcdrfun.h prntutil.h router.h \
+  strngrtr.h network.h match.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h cstrccom.h genrccom.h genrcfun.h dffnxfun.h \
+  exprnpsr.h
+
+extnfunc.obj: extnfunc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h factmngr.h conscomp.h symblcmp.h tmpltdef.h constrnt.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h memalloc.h router.h inscom.h insfun.h object.h multifld.h
+
+factbin.obj: factbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h factmngr.h conscomp.h symblcmp.h tmpltdef.h \
+  constrnt.h factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h \
+  cstrccom.h facthsh.h memalloc.h pattern.h scanner.h reorder.h \
+  reteutil.h rulebin.h cstrcbin.h modulbin.h factbin.h
+
+factbld.obj: factbld.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h factcmp.h network.h match.h ruledef.h agenda.h \
+  symbol.h crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h \
+  cstrccom.h pattern.h scanner.h reorder.h factgen.h factlhs.h factmch.h \
+  factbld.h factmngr.h tmpltdef.h facthsh.h memalloc.h modulutl.h \
+  reteutil.h router.h
+
+factcmp.obj: factcmp.c setup.h envrnmnt.h entities.h usrsetup.h factbld.h \
+  network.h match.h ruledef.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  factmngr.h tmpltdef.h facthsh.h factcmp.h pattern.h scanner.h \
+  reorder.h
+
+factcom.obj: factcom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h scanner.h \
+  facthsh.h factmch.h factbld.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h symblcmp.h constrnt.h cstrccom.h factmngr.h \
+  tmpltdef.h factrhs.h memalloc.h modulutl.h multifld.h pprint.h \
+  prntutil.h router.h strngrtr.h sysdep.h tmpltfun.h tmpltpsr.h \
+  tmpltutl.h bload.h exprnbin.h symblbin.h factcom.h
+
+factfun.obj: factfun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h extnfunc.h symbol.h multifld.h prntutil.h \
+  router.h sysdep.h tmpltutl.h constrnt.h factmngr.h conscomp.h \
+  symblcmp.h tmpltdef.h factbld.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h cstrccom.h facthsh.h factfun.h
+
+factgen.obj: factgen.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h exprnpsr.h \
+  extnfunc.h expressn.h exprnops.h symbol.h scanner.h factmch.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h constrnt.h cstrccom.h factmngr.h tmpltdef.h facthsh.h \
+  factprt.h factrete.h memalloc.h pattern.h reorder.h prcdrpsr.h \
+  reteutil.h router.h sysdep.h tmpltfun.h tmpltlhs.h tmpltutl.h \
+  factgen.h
+
+facthsh.obj: facthsh.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  factmngr.h conscomp.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  tmpltdef.h constrnt.h factbld.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h cstrccom.h facthsh.h memalloc.h multifld.h router.h \
+  sysdep.h lgcldpnd.h
+
+factlhs.obj: factlhs.c setup.h envrnmnt.h entities.h usrsetup.h cstrcpsr.h \
+  modulpsr.h evaluatn.h constant.h moduldef.h userdata.h utility.h \
+  symbol.h scanner.h modulutl.h pattern.h expressn.h exprnops.h \
+  constrct.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h constrnt.h cstrccom.h reorder.h pprint.h \
+  prntutil.h router.h tmpltdef.h factbld.h tmpltlhs.h tmpltpsr.h \
+  tmpltutl.h factmngr.h facthsh.h factlhs.h
+
+factmch.obj: factmch.c setup.h envrnmnt.h entities.h usrsetup.h drive.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h match.h network.h ruledef.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h factgen.h reorder.h pattern.h scanner.h \
+  factrete.h incrrset.h memalloc.h prntutil.h reteutil.h router.h \
+  sysdep.h tmpltdef.h factbld.h factmch.h factmngr.h facthsh.h
+
+factmngr.obj: factmngr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  commline.h default.h constrnt.h evaluatn.h constant.h engine.h \
+  lgcldpnd.h match.h network.h ruledef.h constrct.h userdata.h \
+  moduldef.h utility.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h cstrccom.h retract.h \
+  factbin.h factbld.h factcmp.h pattern.h scanner.h reorder.h factcom.h \
+  factfun.h factmngr.h tmpltdef.h facthsh.h factmch.h factqury.h \
+  factrhs.h memalloc.h multifld.h prntutil.h router.h strngrtr.h \
+  sysdep.h tmpltbsc.h tmpltfun.h tmpltutl.h watch.h
+
+factprt.obj: factprt.c setup.h envrnmnt.h entities.h usrsetup.h factgen.h \
+  reorder.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h pattern.h symbol.h scanner.h match.h \
+  network.h ruledef.h agenda.h crstrtgy.h conscomp.h extnfunc.h \
+  symblcmp.h constrnt.h cstrccom.h prntutil.h router.h factprt.h
+
+factqpsr.obj: factqpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  exprnpsr.h extnfunc.h evaluatn.h constant.h expressn.h exprnops.h \
+  constrct.h userdata.h moduldef.h utility.h symbol.h scanner.h \
+  factqury.h factmngr.h conscomp.h symblcmp.h tmpltdef.h constrnt.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h modulutl.h prcdrpsr.h pprint.h prntutil.h router.h \
+  strngrtr.h factqpsr.h
+
+factqury.obj: factqury.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h memalloc.h exprnpsr.h extnfunc.h \
+  symbol.h scanner.h modulutl.h tmpltutl.h constrnt.h factmngr.h \
+  conscomp.h symblcmp.h tmpltdef.h factbld.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h cstrccom.h facthsh.h insfun.h object.h multifld.h \
+  factqpsr.h prcdrfun.h prntutil.h router.h factqury.h
+
+factrete.obj: factrete.c setup.h envrnmnt.h entities.h usrsetup.h drive.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h match.h network.h ruledef.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h factgen.h reorder.h pattern.h scanner.h \
+  factmch.h factbld.h factmngr.h tmpltdef.h facthsh.h incrrset.h \
+  memalloc.h multifld.h reteutil.h router.h factrete.h
+
+factrhs.obj: factrhs.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrcpsr.h exprnpsr.h scanner.h modulutl.h modulpsr.h \
+  pattern.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h constrnt.h cstrccom.h reorder.h pprint.h prntutil.h \
+  router.h strngrtr.h tmpltpsr.h tmpltdef.h factbld.h tmpltrhs.h \
+  tmpltutl.h factmngr.h facthsh.h factrhs.h
+
+filecom.obj: filecom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h commline.h cstrcpsr.h fileutil.h memalloc.h \
+  router.h filecom.h
+
+filertr.obj: filertr.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  memalloc.h router.h sysdep.h filertr.h
+
+fileutil.obj: fileutil.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h cstrcpsr.h memalloc.h \
+  prcdrfun.h pprint.h prntutil.h router.h scanner.h strngrtr.h sysdep.h \
+  filecom.h fileutil.h
+
+generate.obj: generate.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h globlpsr.h memalloc.h pattern.h match.h network.h ruledef.h \
+  agenda.h crstrtgy.h conscomp.h symblcmp.h constrnt.h cstrccom.h \
+  reorder.h prntutil.h router.h generate.h analysis.h
+
+genrcbin.obj: genrcbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h cstrccom.h genrccom.h genrcfun.h \
+  conscomp.h symblcmp.h memalloc.h modulbin.h objbin.h object.h \
+  constrnt.h multifld.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  router.h genrcbin.h
+
+genrccmp.obj: genrccmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  genrccom.h genrcfun.h network.h match.h ruledef.h agenda.h crstrtgy.h \
+  constrnt.h cstrccom.h objcmp.h object.h multifld.h genrccmp.h
+
+genrccom.obj: genrccom.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h \
+  sysdep.h symblbin.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h inscom.h insfun.h cstrcpsr.h genrcbin.h genrcfun.h \
+  genrccmp.h genrcexe.h genrcpsr.h memalloc.h modulpsr.h scanner.h \
+  modulutl.h router.h strngrtr.h watch.h prntutil.h genrccom.h
+
+genrcexe.obj: genrcexe.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h insfun.h \
+  argacces.h genrccom.h genrcfun.h prcdrfun.h prccode.h prntutil.h \
+  proflfun.h router.h genrcexe.h
+
+genrcfun.obj: genrcfun.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classfun.h scanner.h argacces.h cstrcpsr.h genrccom.h genrcfun.h \
+  genrcexe.h memalloc.h modulutl.h prccode.h prntutil.h router.h
+
+genrcpsr.obj: genrcpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h dffnxfun.h classfun.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  cstrccom.h scanner.h classcom.h cstrcpsr.h exprnpsr.h genrccom.h \
+  genrcfun.h immthpsr.h memalloc.h modulutl.h pprint.h prcdrpsr.h \
+  prccode.h prntutil.h router.h genrcpsr.h
+
+globlbin.obj: globlbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h globlbsc.h globldef.h conscomp.h symblcmp.h \
+  cstrccom.h memalloc.h multifld.h globlbin.h modulbin.h cstrcbin.h
+
+globlbsc.obj: globlbsc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h constant.h \
+  extnfunc.h expressn.h exprnops.h symbol.h globlbin.h modulbin.h \
+  cstrcbin.h globldef.h conscomp.h symblcmp.h cstrccom.h globlcmp.h \
+  globlcom.h multifld.h watch.h globlbsc.h
+
+globlcmp.obj: globlcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  globldef.h cstrccom.h globlcmp.h
+
+globlcom.obj: globlcom.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h globldef.h \
+  conscomp.h symblcmp.h cstrccom.h prntutil.h router.h globlcom.h
+
+globldef.obj: globldef.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h globlbin.h modulbin.h cstrcbin.h globldef.h conscomp.h \
+  symblcmp.h cstrccom.h commline.h globlbsc.h globlcmp.h globlcom.h \
+  globlpsr.h memalloc.h modulpsr.h scanner.h modulutl.h multifld.h \
+  prntutil.h router.h strngrtr.h
+
+globlpsr.obj: globlpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrcpsr.h exprnpsr.h scanner.h globlbsc.h globldef.h \
+  conscomp.h symblcmp.h cstrccom.h memalloc.h modulpsr.h modulutl.h \
+  multifld.h pprint.h prntutil.h router.h watch.h globlpsr.h
+
+immthpsr.obj: immthpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h cstrnutl.h \
+  exprnpsr.h genrcpsr.h genrcfun.h memalloc.h prccode.h immthpsr.h
+
+incrrset.obj: incrrset.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h drive.h engine.h lgcldpnd.h retract.h pattern.h scanner.h \
+  reorder.h router.h reteutil.h incrrset.h
+
+inherpsr.obj: inherpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h memalloc.h \
+  modulutl.h pprint.h prntutil.h router.h inherpsr.h
+
+inscom.obj: inscom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h classinf.h \
+  commline.h exprnpsr.h insfile.h insfun.h insmngr.h insmoddp.h \
+  insmult.h inspsr.h lgcldpnd.h memalloc.h msgcom.h msgpass.h msgfun.h \
+  prntutil.h router.h strngrtr.h sysdep.h inscom.h
+
+insfile.obj: insfile.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h memalloc.h \
+  factmngr.h tmpltdef.h factbld.h facthsh.h inscom.h insfun.h insmngr.h \
+  inspsr.h prntutil.h router.h strngrtr.h symblbin.h sysdep.h insfile.h
+
+insfun.obj: insfun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h cstrnchk.h \
+  drive.h objrtmch.h engine.h lgcldpnd.h retract.h inscom.h insfun.h \
+  insmngr.h memalloc.h modulutl.h msgcom.h msgpass.h msgfun.h prccode.h \
+  prntutil.h router.h
+
+insmngr.obj: insmngr.c setup.h envrnmnt.h entities.h usrsetup.h network.h \
+  match.h ruledef.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  drive.h objrtmch.h object.h multifld.h lgcldpnd.h classcom.h \
+  classfun.h scanner.h engine.h retract.h insfun.h memalloc.h miscfun.h \
+  modulutl.h msgcom.h msgpass.h msgfun.h prccode.h prntutil.h router.h \
+  sysdep.h insmngr.h inscom.h watch.h
+
+insmoddp.obj: insmoddp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h extnfunc.h symbol.h inscom.h insfun.h \
+  object.h constrnt.h multifld.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h symblcmp.h cstrccom.h insmngr.h inspsr.h \
+  memalloc.h miscfun.h msgcom.h msgpass.h msgfun.h objrtmch.h prccode.h \
+  scanner.h prntutil.h router.h insmoddp.h
+
+insmult.obj: insmult.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h extnfunc.h symbol.h insfun.h object.h constrnt.h \
+  multifld.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h cstrccom.h msgfun.h msgpass.h multifun.h prntutil.h \
+  router.h insmult.h
+
+inspsr.obj: inspsr.c setup.h envrnmnt.h entities.h usrsetup.h classcom.h \
+  cstrccom.h moduldef.h userdata.h utility.h evaluatn.h constant.h \
+  constrct.h object.h constrnt.h expressn.h exprnops.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h classfun.h scanner.h classinf.h exprnpsr.h \
+  pprint.h prntutil.h router.h inspsr.h
+
+insquery.obj: insquery.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h classcom.h cstrccom.h object.h \
+  constrnt.h multifld.h symbol.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h \
+  exprnpsr.h insfun.h insmngr.h insqypsr.h memalloc.h prcdrfun.h \
+  prntutil.h router.h insquery.h
+
+insqypsr.obj: insqypsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h exprnpsr.h scanner.h insquery.h \
+  prcdrpsr.h pprint.h prntutil.h router.h strngrtr.h insqypsr.h
+
+iofun.obj: iofun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h commline.h extnfunc.h symbol.h filertr.h \
+  memalloc.h prntutil.h router.h scanner.h strngrtr.h sysdep.h iofun.h
+
+lgcldpnd.obj: lgcldpnd.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h engine.h lgcldpnd.h match.h network.h \
+  ruledef.h agenda.h symbol.h crstrtgy.h conscomp.h extnfunc.h \
+  symblcmp.h constrnt.h cstrccom.h retract.h factmngr.h tmpltdef.h \
+  factbld.h facthsh.h memalloc.h pattern.h scanner.h reorder.h \
+  reteutil.h router.h
+
+main.obj: main.c clips.h setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h memalloc.h cstrcpsr.h fileutil.h \
+  strngfun.h envrnbld.h extnfunc.h symbol.h commline.h prntutil.h \
+  router.h filertr.h strngrtr.h iofun.h sysdep.h bmathfun.h exprnpsr.h \
+  scanner.h watch.h modulbsc.h bload.h exprnbin.h symblbin.h bsave.h \
+  ruledef.h network.h match.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  constrnt.h cstrccom.h rulebsc.h engine.h lgcldpnd.h retract.h drive.h \
+  incrrset.h rulecom.h dffctdef.h dffctbsc.h tmpltdef.h factbld.h \
+  tmpltbsc.h tmpltfun.h factmngr.h facthsh.h factcom.h factfun.h \
+  globldef.h globlbsc.h globlcom.h dffnxfun.h genrccom.h genrcfun.h \
+  classcom.h object.h multifld.h classexm.h classfun.h classinf.h \
+  classini.h classpsr.h defins.h inscom.h insfun.h insfile.h insmngr.h \
+  msgcom.h msgpass.h objrtmch.h
+
+memalloc.obj: memalloc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h memalloc.h prntutil.h router.h utility.h evaluatn.h \
+  moduldef.h userdata.h
+
+miscfun.obj: miscfun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h scanner.h \
+  memalloc.h multifld.h prntutil.h router.h sysdep.h dffnxfun.h \
+  factfun.h factmngr.h conscomp.h symblcmp.h tmpltdef.h constrnt.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h tmpltutl.h miscfun.h
+
+modulbin.obj: modulbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrcbin.h memalloc.h modulbin.h
+
+modulbsc.obj: modulbsc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h \
+  sysdep.h symblbin.h modulbin.h cstrcbin.h modulcmp.h multifld.h \
+  prntutil.h router.h modulbsc.h
+
+modulcmp.obj: modulcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  sysdep.h modulcmp.h
+
+moduldef.obj: moduldef.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h \
+  sysdep.h symblbin.h modulbin.h cstrcbin.h memalloc.h modulbsc.h \
+  modulcmp.h modulpsr.h scanner.h prntutil.h router.h
+
+modulpsr.obj: modulpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrcpsr.h extnfunc.h symbol.h \
+  memalloc.h modulutl.h scanner.h pprint.h prntutil.h router.h bload.h \
+  exprnbin.h sysdep.h symblbin.h modulpsr.h
+
+modulutl.obj: modulutl.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrcpsr.h memalloc.h modulpsr.h evaluatn.h constant.h moduldef.h \
+  userdata.h utility.h symbol.h scanner.h pprint.h prntutil.h router.h \
+  sysdep.h watch.h expressn.h exprnops.h constrct.h modulutl.h
+
+msgcom.obj: msgcom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classfun.h scanner.h classinf.h msgpsr.h insfun.h insmoddp.h msgfun.h \
+  msgpass.h memalloc.h prccode.h prntutil.h router.h watch.h msgcom.h
+
+msgfun.obj: msgfun.c setup.h envrnmnt.h entities.h usrsetup.h classcom.h \
+  cstrccom.h moduldef.h userdata.h utility.h evaluatn.h constant.h \
+  constrct.h object.h constrnt.h expressn.h exprnops.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h classfun.h scanner.h insfun.h memalloc.h \
+  msgcom.h msgpass.h prccode.h prntutil.h router.h msgfun.h
+
+msgpass.obj: msgpass.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h commline.h \
+  exprnpsr.h inscom.h insfun.h memalloc.h msgcom.h msgpass.h msgfun.h \
+  prccode.h prcdrfun.h prntutil.h proflfun.h router.h strngfun.h
+
+msgpsr.obj: msgpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h classcom.h cstrccom.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  classfun.h scanner.h cstrcpsr.h cstrnchk.h exprnpsr.h insfun.h \
+  memalloc.h modulutl.h msgcom.h msgpass.h msgfun.h pprint.h prccode.h \
+  prntutil.h router.h strngrtr.h msgpsr.h
+
+multifld.obj: multifld.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h evaluatn.h exprnops.h expressn.h constrct.h userdata.h \
+  moduldef.h utility.h memalloc.h object.h constrnt.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h cstrccom.h scanner.h prntutil.h router.h \
+  strngrtr.h
+
+multifun.obj: multifun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h memalloc.h multifld.h multifun.h object.h constrnt.h match.h \
+  network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  cstrccom.h pprint.h prcdrpsr.h prcdrfun.h prntutil.h router.h
+
+objbin.obj: objbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h classcom.h cstrccom.h object.h constrnt.h \
+  multifld.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h classfun.h scanner.h classini.h cstrcbin.h cstrnbin.h \
+  insfun.h memalloc.h modulbin.h msgcom.h msgpass.h msgfun.h prntutil.h \
+  router.h objbin.h
+
+objcmp.obj: objcmp.c setup.h envrnmnt.h entities.h usrsetup.h conscomp.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h constant.h \
+  extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h classcom.h \
+  cstrccom.h object.h constrnt.h multifld.h match.h network.h ruledef.h \
+  agenda.h crstrtgy.h classfun.h scanner.h classini.h cstrncmp.h \
+  objrtfnx.h objrtmch.h sysdep.h objcmp.h
+
+objrtbin.obj: objrtbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h memalloc.h insfun.h object.h constrnt.h multifld.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h \
+  cstrccom.h objrtmch.h pattern.h scanner.h reorder.h reteutil.h \
+  rulebin.h cstrcbin.h modulbin.h objrtbin.h
+
+objrtbld.obj: objrtbld.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h cstrnutl.h \
+  cstrnchk.h cstrnops.h drive.h inscom.h insfun.h insmngr.h memalloc.h \
+  pattern.h reorder.h prntutil.h reteutil.h rulepsr.h exprnpsr.h \
+  objrtmch.h objrtgen.h objrtfnx.h pprint.h router.h objrtbin.h \
+  objrtcmp.h objrtbld.h
+
+objrtcmp.obj: objrtcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  objrtfnx.h match.h network.h ruledef.h agenda.h crstrtgy.h constrnt.h \
+  cstrccom.h object.h multifld.h objrtmch.h pattern.h scanner.h \
+  reorder.h sysdep.h objrtcmp.h
+
+objrtfnx.obj: objrtfnx.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classcom.h cstrccom.h moduldef.h userdata.h utility.h evaluatn.h \
+  constant.h constrct.h object.h constrnt.h expressn.h exprnops.h \
+  multifld.h symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h classfun.h scanner.h bload.h \
+  exprnbin.h sysdep.h symblbin.h drive.h engine.h lgcldpnd.h retract.h \
+  memalloc.h objrtmch.h prntutil.h reteutil.h router.h objrtfnx.h
+
+objrtgen.obj: objrtgen.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classfun.h object.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h constrnt.h expressn.h exprnops.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h cstrccom.h scanner.h classcom.h objrtfnx.h \
+  objrtmch.h objrtgen.h reorder.h pattern.h
+
+objrtmch.obj: objrtmch.c setup.h envrnmnt.h entities.h usrsetup.h \
+  classfun.h object.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h constrnt.h expressn.h exprnops.h multifld.h \
+  symbol.h match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h \
+  extnfunc.h symblcmp.h cstrccom.h scanner.h classcom.h memalloc.h \
+  drive.h engine.h lgcldpnd.h retract.h incrrset.h objrtfnx.h objrtmch.h \
+  prntutil.h reteutil.h ruledlt.h reorder.h pattern.h router.h insmngr.h
+
+parsefun.obj: parsefun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrcpsr.h exprnpsr.h extnfunc.h \
+  symbol.h scanner.h memalloc.h multifld.h pprint.h prcdrpsr.h \
+  constrnt.h prntutil.h router.h strngrtr.h parsefun.h
+
+pattern.obj: pattern.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  constrnt.h evaluatn.h cstrnchk.h cstrnutl.h exprnpsr.h extnfunc.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  symbol.h scanner.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h symblcmp.h cstrccom.h memalloc.h pprint.h prntutil.h \
+  reteutil.h router.h rulecmp.h pattern.h reorder.h
+
+pprint.obj: pprint.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  memalloc.h sysdep.h utility.h evaluatn.h moduldef.h userdata.h \
+  pprint.h
+
+prccode.obj: prccode.c setup.h envrnmnt.h entities.h usrsetup.h memalloc.h \
+  constant.h globlpsr.h expressn.h exprnops.h constrct.h userdata.h \
+  moduldef.h utility.h evaluatn.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h multifld.h object.h constrnt.h match.h network.h ruledef.h \
+  agenda.h crstrtgy.h conscomp.h symblcmp.h cstrccom.h pprint.h \
+  prcdrpsr.h prntutil.h router.h prccode.h
+
+prcdrfun.obj: prcdrfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h constrnt.h cstrnchk.h cstrnops.h \
+  exprnpsr.h extnfunc.h symbol.h scanner.h memalloc.h multifld.h \
+  prcdrpsr.h router.h prcdrfun.h globldef.h conscomp.h symblcmp.h \
+  cstrccom.h
+
+prcdrpsr.obj: prcdrpsr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h constrnt.h cstrnchk.h cstrnops.h \
+  cstrnutl.h exprnpsr.h extnfunc.h symbol.h scanner.h memalloc.h \
+  modulutl.h multifld.h pprint.h prntutil.h router.h prcdrpsr.h \
+  globldef.h conscomp.h symblcmp.h cstrccom.h globlpsr.h
+
+prdctfun.obj: prdctfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h exprnpsr.h extnfunc.h symbol.h \
+  scanner.h multifld.h router.h prdctfun.h
+
+prntutil.obj: prntutil.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrcpsr.h factmngr.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h tmpltdef.h constrnt.h factbld.h \
+  network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h \
+  inscom.h insfun.h object.h multifld.h insmngr.h memalloc.h multifun.h \
+  router.h scanner.h sysdep.h prntutil.h
+
+proflfun.obj: proflfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h classcom.h cstrccom.h object.h \
+  constrnt.h multifld.h symbol.h match.h network.h ruledef.h agenda.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h dffnxfun.h genrccom.h \
+  genrcfun.h memalloc.h msgcom.h msgpass.h router.h sysdep.h proflfun.h
+
+reorder.obj: reorder.c setup.h envrnmnt.h entities.h usrsetup.h cstrnutl.h \
+  constrnt.h evaluatn.h constant.h extnfunc.h expressn.h exprnops.h \
+  constrct.h userdata.h moduldef.h utility.h symbol.h memalloc.h \
+  pattern.h scanner.h match.h network.h ruledef.h agenda.h crstrtgy.h \
+  conscomp.h symblcmp.h cstrccom.h reorder.h prntutil.h router.h \
+  rulelhs.h
+
+reteutil.obj: reteutil.c setup.h envrnmnt.h entities.h usrsetup.h drive.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h match.h network.h ruledef.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h incrrset.h memalloc.h pattern.h \
+  scanner.h reorder.h prntutil.h router.h rulecom.h reteutil.h
+
+retract.obj: retract.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h drive.h engine.h lgcldpnd.h retract.h memalloc.h prntutil.h \
+  reteutil.h router.h
+
+router.obj: router.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h extnfunc.h symbol.h filertr.h memalloc.h \
+  prntutil.h scanner.h strngrtr.h sysdep.h router.h
+
+rulebin.obj: rulebin.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  bload.h exprnbin.h sysdep.h symblbin.h bsave.h engine.h lgcldpnd.h \
+  retract.h memalloc.h pattern.h scanner.h reorder.h reteutil.h \
+  rulebsc.h rulebin.h cstrcbin.h modulbin.h
+
+rulebld.obj: rulebld.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  constrct.h userdata.h moduldef.h utility.h evaluatn.h drive.h \
+  expressn.h exprnops.h match.h network.h ruledef.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  incrrset.h memalloc.h pattern.h scanner.h reorder.h prntutil.h \
+  reteutil.h router.h rulebld.h rulepsr.h watch.h
+
+rulebsc.obj: rulebsc.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h drive.h match.h network.h ruledef.h agenda.h \
+  symbol.h crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h \
+  cstrccom.h engine.h lgcldpnd.h retract.h multifld.h reteutil.h \
+  router.h watch.h rulebin.h cstrcbin.h modulbin.h rulecmp.h rulebsc.h
+
+rulecmp.obj: rulecmp.c setup.h envrnmnt.h entities.h usrsetup.h factbld.h \
+  network.h match.h ruledef.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h expressn.h exprnops.h agenda.h symbol.h \
+  crstrtgy.h conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h \
+  pattern.h scanner.h reorder.h reteutil.h rulecmp.h
+
+rulecom.obj: rulecom.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h crstrtgy.h agenda.h ruledef.h network.h match.h \
+  conscomp.h extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h \
+  engine.h lgcldpnd.h retract.h incrrset.h memalloc.h multifld.h \
+  pattern.h scanner.h reorder.h prntutil.h reteutil.h router.h ruledlt.h \
+  sysdep.h watch.h rulebin.h cstrcbin.h modulbin.h rulecom.h
+
+rulecstr.obj: rulecstr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  analysis.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h reorder.h pattern.h symbol.h scanner.h \
+  match.h network.h ruledef.h agenda.h crstrtgy.h conscomp.h extnfunc.h \
+  symblcmp.h constrnt.h cstrccom.h cstrnchk.h cstrnops.h cstrnutl.h \
+  prcdrpsr.h prntutil.h router.h rulepsr.h rulecstr.h
+
+ruledef.obj: ruledef.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  drive.h engine.h lgcldpnd.h retract.h memalloc.h pattern.h scanner.h \
+  reorder.h reteutil.h rulebsc.h rulecom.h rulepsr.h ruledlt.h bload.h \
+  exprnbin.h sysdep.h symblbin.h rulebin.h cstrcbin.h modulbin.h \
+  rulecmp.h
+
+ruledlt.obj: ruledlt.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  bload.h exprnbin.h sysdep.h symblbin.h drive.h engine.h lgcldpnd.h \
+  retract.h memalloc.h pattern.h scanner.h reorder.h reteutil.h \
+  ruledlt.h
+
+rulelhs.obj: rulelhs.c setup.h envrnmnt.h entities.h usrsetup.h agenda.h \
+  ruledef.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h expressn.h exprnops.h network.h match.h conscomp.h \
+  extnfunc.h symbol.h symblcmp.h constrnt.h cstrccom.h crstrtgy.h \
+  argacces.h cstrnchk.h exprnpsr.h scanner.h memalloc.h pattern.h \
+  reorder.h pprint.h prntutil.h router.h rulelhs.h
+
+rulepsr.obj: rulepsr.c setup.h envrnmnt.h entities.h usrsetup.h analysis.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h reorder.h pattern.h symbol.h scanner.h match.h \
+  network.h ruledef.h agenda.h crstrtgy.h conscomp.h extnfunc.h \
+  symblcmp.h constrnt.h cstrccom.h cstrcpsr.h cstrnchk.h cstrnops.h \
+  engine.h lgcldpnd.h retract.h exprnpsr.h incrrset.h memalloc.h \
+  modulutl.h prccode.h prcdrpsr.h pprint.h prntutil.h router.h rulebld.h \
+  rulebsc.h rulecstr.h ruledlt.h rulelhs.h watch.h tmpltfun.h factmngr.h \
+  tmpltdef.h factbld.h facthsh.h bload.h exprnbin.h sysdep.h symblbin.h \
+  rulepsr.h
+
+scanner.obj: scanner.c setup.h envrnmnt.h entities.h usrsetup.h constant.h \
+  memalloc.h pprint.h prntutil.h router.h symbol.h sysdep.h utility.h \
+  evaluatn.h moduldef.h userdata.h scanner.h
+
+sortfun.obj: sortfun.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h dffnxfun.h extnfunc.h symbol.h memalloc.h \
+  multifld.h sysdep.h sortfun.h
+
+strngfun.obj: strngfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h cstrcpsr.h engine.h \
+  lgcldpnd.h match.h network.h ruledef.h agenda.h symbol.h crstrtgy.h \
+  conscomp.h extnfunc.h symblcmp.h constrnt.h cstrccom.h retract.h \
+  exprnpsr.h scanner.h memalloc.h multifld.h prcdrpsr.h pprint.h \
+  prntutil.h router.h strngrtr.h sysdep.h drive.h strngfun.h
+
+strngrtr.obj: strngrtr.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h memalloc.h prntutil.h router.h sysdep.h strngrtr.h \
+  utility.h evaluatn.h moduldef.h userdata.h
+
+symblbin.obj: symblbin.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h bload.h extnfunc.h symbol.h exprnbin.h \
+  sysdep.h symblbin.h bsave.h cstrnbin.h constrnt.h exprnpsr.h scanner.h \
+  memalloc.h router.h
+
+symblcmp.obj: symblcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h conscomp.h extnfunc.h symbol.h \
+  symblcmp.h cstrncmp.h constrnt.h cstrccom.h exprnpsr.h scanner.h \
+  memalloc.h prntutil.h router.h sysdep.h
+
+symbol.obj: symbol.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h memalloc.h multifld.h prntutil.h router.h \
+  sysdep.h symbol.h
+
+sysdep.obj: sysdep.c setup.h envrnmnt.h entities.h usrsetup.h sysdep.h
+
+textpro.obj: textpro.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h commline.h extnfunc.h symbol.h memalloc.h \
+  prntutil.h router.h sysdep.h textpro.h
+
+tmpltbin.obj: tmpltbin.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h bsave.h cstrnbin.h constrnt.h factbin.h factbld.h network.h \
+  match.h ruledef.h agenda.h crstrtgy.h conscomp.h symblcmp.h cstrccom.h \
+  factmngr.h tmpltdef.h facthsh.h memalloc.h tmpltpsr.h tmpltutl.h \
+  tmpltbin.h cstrcbin.h modulbin.h
+
+tmpltbsc.obj: tmpltbsc.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrccom.h cstrcpsr.h extnfunc.h \
+  symbol.h factrhs.h factmngr.h conscomp.h symblcmp.h tmpltdef.h \
+  constrnt.h factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h \
+  facthsh.h scanner.h memalloc.h multifld.h router.h tmpltbin.h \
+  cstrcbin.h modulbin.h tmpltcmp.h tmpltpsr.h tmpltutl.h tmpltbsc.h
+
+tmpltcmp.obj: tmpltcmp.c setup.h envrnmnt.h entities.h usrsetup.h \
+  conscomp.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constant.h extnfunc.h expressn.h exprnops.h symbol.h symblcmp.h \
+  cstrncmp.h constrnt.h factcmp.h network.h match.h ruledef.h agenda.h \
+  crstrtgy.h cstrccom.h pattern.h scanner.h reorder.h tmpltdef.h \
+  factbld.h tmpltcmp.h
+
+tmpltdef.obj: tmpltdef.c setup.h envrnmnt.h entities.h usrsetup.h \
+  cstrccom.h moduldef.h userdata.h utility.h evaluatn.h constant.h \
+  constrct.h cstrnchk.h constrnt.h exprnops.h expressn.h memalloc.h \
+  modulpsr.h symbol.h scanner.h modulutl.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h conscomp.h extnfunc.h symblcmp.h pattern.h \
+  reorder.h router.h tmpltbsc.h tmpltdef.h factbld.h tmpltfun.h \
+  factmngr.h facthsh.h tmpltpsr.h tmpltutl.h bload.h exprnbin.h sysdep.h \
+  symblbin.h tmpltbin.h cstrcbin.h modulbin.h tmpltcmp.h
+
+tmpltfun.obj: tmpltfun.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h commline.h cstrnchk.h constrnt.h \
+  default.h exprnpsr.h extnfunc.h symbol.h scanner.h factmngr.h \
+  conscomp.h symblcmp.h tmpltdef.h factbld.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h cstrccom.h facthsh.h factrhs.h memalloc.h \
+  modulutl.h multifld.h pprint.h prcdrpsr.h prntutil.h reorder.h \
+  pattern.h router.h sysdep.h tmpltlhs.h tmpltrhs.h tmpltutl.h \
+  tmpltfun.h
+
+tmpltlhs.obj: tmpltlhs.c setup.h envrnmnt.h entities.h usrsetup.h \
+  constant.h constrct.h userdata.h moduldef.h utility.h evaluatn.h \
+  constrnt.h exprnpsr.h extnfunc.h expressn.h exprnops.h symbol.h \
+  scanner.h factrhs.h factmngr.h conscomp.h symblcmp.h tmpltdef.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  facthsh.h memalloc.h modulutl.h pattern.h reorder.h pprint.h \
+  prntutil.h router.h tmpltutl.h tmpltlhs.h
+
+tmpltpsr.obj: tmpltpsr.c setup.h envrnmnt.h entities.h usrsetup.h bload.h \
+  utility.h evaluatn.h constant.h moduldef.h userdata.h extnfunc.h \
+  expressn.h exprnops.h constrct.h symbol.h exprnbin.h sysdep.h \
+  symblbin.h cstrcpsr.h cstrnchk.h constrnt.h cstrnpsr.h cstrnutl.h \
+  default.h exprnpsr.h scanner.h factmngr.h conscomp.h symblcmp.h \
+  tmpltdef.h factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h \
+  cstrccom.h facthsh.h memalloc.h modulutl.h pattern.h reorder.h \
+  pprint.h prntutil.h router.h tmpltbsc.h watch.h tmpltpsr.h
+
+tmpltrhs.obj: tmpltrhs.c setup.h envrnmnt.h entities.h usrsetup.h default.h \
+  constrnt.h evaluatn.h constant.h extnfunc.h expressn.h exprnops.h \
+  constrct.h userdata.h moduldef.h utility.h symbol.h factrhs.h \
+  factmngr.h conscomp.h symblcmp.h tmpltdef.h factbld.h network.h \
+  match.h ruledef.h agenda.h crstrtgy.h cstrccom.h facthsh.h scanner.h \
+  memalloc.h modulutl.h pprint.h prntutil.h router.h tmpltfun.h \
+  tmpltlhs.h tmpltutl.h tmpltrhs.h
+
+tmpltutl.obj: tmpltutl.c setup.h envrnmnt.h entities.h usrsetup.h \
+  argacces.h expressn.h exprnops.h constrct.h userdata.h moduldef.h \
+  utility.h evaluatn.h constant.h cstrnchk.h constrnt.h extnfunc.h \
+  symbol.h memalloc.h modulutl.h scanner.h multifld.h prntutil.h \
+  router.h sysdep.h tmpltbsc.h tmpltdef.h conscomp.h symblcmp.h \
+  factbld.h network.h match.h ruledef.h agenda.h crstrtgy.h cstrccom.h \
+  tmpltfun.h factmngr.h facthsh.h tmpltpsr.h watch.h tmpltutl.h
+
+userdata.obj: userdata.c setup.h envrnmnt.h entities.h usrsetup.h \
+  userdata.h
+
+userfunctions.obj: userfunctions.c clips.h setup.h envrnmnt.h entities.h \
+  usrsetup.h argacces.h expressn.h exprnops.h constrct.h userdata.h \
+  moduldef.h utility.h evaluatn.h constant.h memalloc.h cstrcpsr.h \
+  fileutil.h strngfun.h envrnbld.h extnfunc.h symbol.h commline.h \
+  prntutil.h router.h filertr.h strngrtr.h iofun.h sysdep.h bmathfun.h \
+  exprnpsr.h scanner.h watch.h modulbsc.h bload.h exprnbin.h symblbin.h \
+  bsave.h ruledef.h network.h match.h agenda.h crstrtgy.h conscomp.h \
+  symblcmp.h constrnt.h cstrccom.h rulebsc.h engine.h lgcldpnd.h \
+  retract.h drive.h incrrset.h rulecom.h dffctdef.h dffctbsc.h \
+  tmpltdef.h factbld.h tmpltbsc.h tmpltfun.h factmngr.h facthsh.h \
+  factcom.h factfun.h globldef.h globlbsc.h globlcom.h dffnxfun.h \
+  genrccom.h genrcfun.h classcom.h object.h multifld.h classexm.h \
+  classfun.h classinf.h classini.h classpsr.h defins.h inscom.h insfun.h \
+  insfile.h insmngr.h msgcom.h msgpass.h objrtmch.h
+
+utility.obj: utility.c setup.h envrnmnt.h entities.h usrsetup.h commline.h \
+  evaluatn.h constant.h factmngr.h conscomp.h constrct.h userdata.h \
+  moduldef.h utility.h extnfunc.h expressn.h exprnops.h symbol.h \
+  symblcmp.h tmpltdef.h constrnt.h factbld.h network.h match.h ruledef.h \
+  agenda.h crstrtgy.h cstrccom.h facthsh.h memalloc.h multifld.h \
+  prntutil.h sysdep.h
+
+watch.obj: watch.c setup.h envrnmnt.h entities.h usrsetup.h argacces.h \
+  expressn.h exprnops.h constrct.h userdata.h moduldef.h utility.h \
+  evaluatn.h constant.h extnfunc.h symbol.h memalloc.h router.h watch.h
diff --git a/clips/match.h b/clips/match.h
new file mode 100755
index 000000000..2eb061f38
--- /dev/null
+++ b/clips/match.h
@@ -0,0 +1,142 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/28/17             */
+   /*                                                     */
+   /*                  MATCH HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for hashed memories.             */
+/*                                                           */
+/*            Added additional members to partialMatch to    */
+/*            support changes to the matching algorithm.     */
+/*                                                           */
+/*      6.31: Bug fix to prevent rule activations for        */
+/*            partial matches being deleted.                 */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_match
+
+#pragma once
+
+#define _H_match
+
+typedef struct genericMatch GenericMatch;
+typedef struct patternMatch PatternMatch;
+typedef struct partialMatch PartialMatch;
+typedef struct alphaMatch AlphaMatch;
+typedef struct multifieldMarker MultifieldMarker;
+
+#include "entities.h"
+#include "network.h"
+
+/****************/
+/* patternMatch */
+/****************/
+struct patternMatch
+  {
+   PatternMatch *next;
+   PartialMatch *theMatch;
+   PatternNodeHeader *matchingPattern;
+  };
+
+/****************/
+/* genericMatch */
+/****************/
+struct genericMatch
+  {
+   union
+     {
+      void *theValue;
+      AlphaMatch *theMatch;
+     } gm;
+  };
+
+/****************/
+/* partialMatch */
+/****************/
+struct partialMatch
+  {
+   unsigned int betaMemory  :  1;
+   unsigned int busy        :  1;
+   unsigned int rhsMemory   :  1;
+   unsigned int deleting    :  1;
+   unsigned short bcount;
+   unsigned long hashValue;
+   void *owner;
+   void *marker;
+   void *dependents;
+   PartialMatch *nextInMemory;
+   PartialMatch *prevInMemory;
+   PartialMatch *children;
+   PartialMatch *rightParent;
+   PartialMatch *nextRightChild;
+   PartialMatch *prevRightChild;
+   PartialMatch *leftParent;
+   PartialMatch *nextLeftChild;
+   PartialMatch *prevLeftChild;
+   PartialMatch *blockList;
+   PartialMatch *nextBlocked;
+   PartialMatch *prevBlocked;
+   GenericMatch binds[1];
+  };
+
+/**************/
+/* alphaMatch */
+/**************/
+struct alphaMatch
+  {
+   PatternEntity *matchingItem;
+   MultifieldMarker *markers;
+   AlphaMatch *next;
+   unsigned long bucket;
+  };
+
+/******************************************************/
+/* multifieldMarker: Used in the pattern matching     */
+/*    process to mark the range of fields that the $? */
+/*    and $?variables match because a single pattern  */
+/*    restriction may span zero or more fields.       */
+/******************************************************/
+struct multifieldMarker
+  {
+   unsigned short whichField;
+   union
+     {
+      void *whichSlot;
+      unsigned short whichSlotNumber;
+     } where;
+    size_t startPosition;
+    size_t range;
+    MultifieldMarker *next;
+   };
+
+#define get_nth_pm_value(thePM,thePos) (thePM->binds[thePos].gm.theValue)
+#define get_nth_pm_match(thePM,thePos) (thePM->binds[thePos].gm.theMatch)
+
+#define set_nth_pm_value(thePM,thePos,theVal) (thePM->binds[thePos].gm.theValue = (void *) theVal)
+#define set_nth_pm_match(thePM,thePos,theVal) (thePM->binds[thePos].gm.theMatch = theVal)
+
+#endif /* _H_match */
+
+
+
+
+
+
diff --git a/clips/memalloc.c b/clips/memalloc.c
new file mode 100755
index 000000000..556eb6b88
--- /dev/null
+++ b/clips/memalloc.c
@@ -0,0 +1,477 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/11/17             */
+   /*                                                     */
+   /*                    MEMORY MODULE                    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Memory allocation routines.                      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed HaltExecution check from the           */
+/*            EnvReleaseMem function. DR0863                 */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems.                   */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Removed genlongalloc/genlongfree functions.    */
+/*                                                           */
+/*            Added get_mem and rtn_mem macros.              */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Removed deallocating message parameter from    */
+/*            EnvReleaseMem.                                 */
+/*                                                           */
+/*            Removed support for BLOCK_MEMORY.              */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+
+#include <stdlib.h>
+
+#if WIN_MVC
+#include <malloc.h>
+#endif
+
+#define STRICT_ALIGN_SIZE sizeof(double)
+
+#define SpecialMalloc(sz) malloc((STD_SIZE) sz)
+#define SpecialFree(ptr) free(ptr)
+
+/********************************************/
+/* InitializeMemory: Sets up memory tables. */
+/********************************************/
+void InitializeMemory(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,MEMORY_DATA,sizeof(struct memoryData),NULL);
+
+   MemoryData(theEnv)->OutOfMemoryCallback = DefaultOutOfMemoryFunction;
+
+#if (MEM_TABLE_SIZE > 0)
+   MemoryData(theEnv)->MemoryTable = (struct memoryPtr **)
+                 malloc((STD_SIZE) (sizeof(struct memoryPtr *) * MEM_TABLE_SIZE));
+
+   if (MemoryData(theEnv)->MemoryTable == NULL)
+     {
+      PrintErrorID(theEnv,"MEMORY",1,true);
+      WriteString(theEnv,STDERR,"Out of memory.\n");
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+   else
+     {
+      int i;
+
+      for (i = 0; i < MEM_TABLE_SIZE; i++) MemoryData(theEnv)->MemoryTable[i] = NULL;
+     }
+#else // MEM_TABLE_SIZE == 0
+      MemoryData(theEnv)->MemoryTable = NULL;
+#endif
+  }
+
+/***************************************************/
+/* genalloc: A generic memory allocation function. */
+/***************************************************/
+void *genalloc(
+  Environment *theEnv,
+  size_t size)
+  {
+   void *memPtr;
+
+   memPtr = malloc(size);
+
+   if (memPtr == NULL)
+     {
+      ReleaseMem(theEnv,(long long) ((size * 5 > 4096) ? size * 5 : 4096));
+      memPtr = malloc(size);
+      if (memPtr == NULL)
+        {
+         ReleaseMem(theEnv,-1);
+         memPtr = malloc(size);
+         while (memPtr == NULL)
+           {
+            if ((*MemoryData(theEnv)->OutOfMemoryCallback)(theEnv,size))
+              return NULL;
+            memPtr = malloc(size);
+           }
+        }
+     }
+
+   MemoryData(theEnv)->MemoryAmount += size;
+   MemoryData(theEnv)->MemoryCalls++;
+
+   return memPtr;
+  }
+
+/***********************************************/
+/* DefaultOutOfMemoryFunction: Function called */
+/*   when the KB runs out of memory.           */
+/***********************************************/
+bool DefaultOutOfMemoryFunction(
+  Environment *theEnv,
+  size_t size)
+  {
+#if MAC_XCD
+#pragma unused(size)
+#endif
+
+   PrintErrorID(theEnv,"MEMORY",1,true);
+   WriteString(theEnv,STDERR,"Out of memory.\n");
+   ExitRouter(theEnv,EXIT_FAILURE);
+   return true;
+  }
+
+/**********************************************************/
+/* SetOutOfMemoryFunction: Allows the function which is   */
+/*   called when the KB runs out of memory to be changed. */
+/**********************************************************/
+OutOfMemoryFunction *SetOutOfMemoryFunction(
+  Environment *theEnv,
+  OutOfMemoryFunction *functionPtr)
+  {
+   OutOfMemoryFunction *tmpPtr;
+
+   tmpPtr = MemoryData(theEnv)->OutOfMemoryCallback;
+   MemoryData(theEnv)->OutOfMemoryCallback = functionPtr;
+   return tmpPtr;
+  }
+
+/****************************************************/
+/* genfree: A generic memory deallocation function. */
+/****************************************************/
+void genfree(
+  Environment *theEnv,
+  void *waste,
+  size_t size)
+  {
+   free(waste);
+
+   MemoryData(theEnv)->MemoryAmount -= size;
+   MemoryData(theEnv)->MemoryCalls--;
+  }
+
+/******************************************************/
+/* genrealloc: Simple (i.e. dumb) version of realloc. */
+/******************************************************/
+void *genrealloc(
+  Environment *theEnv,
+  void *oldaddr,
+  size_t oldsz,
+  size_t newsz)
+  {
+   char *newaddr;
+   unsigned i;
+   size_t limit;
+
+   newaddr = ((newsz != 0) ? (char *) gm2(theEnv,newsz) : NULL);
+
+   if (oldaddr != NULL)
+     {
+      limit = (oldsz < newsz) ? oldsz : newsz;
+      for (i = 0 ; i < limit ; i++)
+        { newaddr[i] = ((char *) oldaddr)[i]; }
+      for ( ; i < newsz; i++)
+        { newaddr[i] = '\0'; }
+      rm(theEnv,oldaddr,oldsz);
+     }
+
+   return((void *) newaddr);
+  }
+
+/********************************/
+/* MemUsed: C access routine */
+/*   for the mem-used command.  */
+/********************************/
+long long MemUsed(
+  Environment *theEnv)
+  {
+   return MemoryData(theEnv)->MemoryAmount;
+  }
+
+/***********************************/
+/* MemRequests: C access routine   */
+/*   for the mem-requests command. */
+/***********************************/
+long long MemRequests(
+  Environment *theEnv)
+  {
+   return MemoryData(theEnv)->MemoryCalls;
+  }
+
+/***************************************/
+/* UpdateMemoryUsed: Allows the amount */
+/*   of memory used to be updated.     */
+/***************************************/
+long long UpdateMemoryUsed(
+  Environment *theEnv,
+  long long value)
+  {
+   MemoryData(theEnv)->MemoryAmount += value;
+   return MemoryData(theEnv)->MemoryAmount;
+  }
+
+/*******************************************/
+/* UpdateMemoryRequests: Allows the number */
+/*   of memory requests to be updated.     */
+/*******************************************/
+long long UpdateMemoryRequests(
+  Environment *theEnv,
+  long long value)
+  {
+   MemoryData(theEnv)->MemoryCalls += value;
+   return MemoryData(theEnv)->MemoryCalls;
+  }
+
+/**********************************/
+/* ReleaseMem: C access routine   */
+/*   for the release-mem command. */
+/**********************************/
+long long ReleaseMem(
+  Environment *theEnv,
+  long long maximum)
+  {
+   struct memoryPtr *tmpPtr, *memPtr;
+   unsigned int i;
+   long long returns = 0;
+   long long amount = 0;
+
+   for (i = (MEM_TABLE_SIZE - 1) ; i >= sizeof(char *) ; i--)
+     {
+      YieldTime(theEnv);
+      memPtr = MemoryData(theEnv)->MemoryTable[i];
+      while (memPtr != NULL)
+        {
+         tmpPtr = memPtr->next;
+         genfree(theEnv,memPtr,i);
+         memPtr = tmpPtr;
+         amount += i;
+         returns++;
+         if ((returns % 100) == 0)
+           { YieldTime(theEnv); }
+        }
+      MemoryData(theEnv)->MemoryTable[i] = NULL;
+      if ((amount > maximum) && (maximum > 0))
+        { return amount; }
+     }
+
+   return amount;
+  }
+
+/*****************************************************/
+/* gm1: Allocates memory and sets all bytes to zero. */
+/*****************************************************/
+void *gm1(
+  Environment *theEnv,
+  size_t size)
+  {
+   struct memoryPtr *memPtr;
+   char *tmpPtr;
+   size_t i;
+
+   if ((size < sizeof(char *)) ||
+       (size >= MEM_TABLE_SIZE))
+     {
+      tmpPtr = (char *) genalloc(theEnv,size);
+      for (i = 0 ; i < size ; i++)
+        { tmpPtr[i] = '\0'; }
+      return((void *) tmpPtr);
+     }
+
+   memPtr = (struct memoryPtr *) MemoryData(theEnv)->MemoryTable[size];
+   if (memPtr == NULL)
+     {
+      tmpPtr = (char *) genalloc(theEnv,size);
+      for (i = 0 ; i < size ; i++)
+        { tmpPtr[i] = '\0'; }
+      return((void *) tmpPtr);
+     }
+
+   MemoryData(theEnv)->MemoryTable[size] = memPtr->next;
+
+   tmpPtr = (char *) memPtr;
+   for (i = 0 ; i < size ; i++)
+     { tmpPtr[i] = '\0'; }
+
+   return ((void *) tmpPtr);
+  }
+
+/*****************************************************/
+/* gm2: Allocates memory and does not initialize it. */
+/*****************************************************/
+void *gm2(
+  Environment *theEnv,
+  size_t size)
+  {
+#if (MEM_TABLE_SIZE > 0)
+   struct memoryPtr *memPtr;
+#endif
+
+   if (size < sizeof(char *))
+     { return genalloc(theEnv,size); }
+
+#if (MEM_TABLE_SIZE > 0)
+   if (size >= MEM_TABLE_SIZE) return genalloc(theEnv,size);
+
+   memPtr = (struct memoryPtr *) MemoryData(theEnv)->MemoryTable[size];
+   if (memPtr == NULL)
+     { return genalloc(theEnv,size); }
+
+   MemoryData(theEnv)->MemoryTable[size] = memPtr->next;
+
+   return ((void *) memPtr);
+#else
+   return genalloc(theEnv,size);
+#endif
+  }
+
+/****************************************/
+/* rm: Returns a block of memory to the */
+/*   maintained pool of free memory.    */
+/****************************************/
+void rm(
+  Environment *theEnv,
+  void *str,
+  size_t size)
+  {
+#if (MEM_TABLE_SIZE > 0)
+   struct memoryPtr *memPtr;
+#endif
+
+   if (size == 0)
+     {
+      SystemError(theEnv,"MEMORY",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+      return;
+     }
+
+   if (size < sizeof(char *)) 
+     {
+      genfree(theEnv,str,size);
+      return;
+     }
+
+#if (MEM_TABLE_SIZE > 0)
+   if (size >= MEM_TABLE_SIZE)
+     {
+      genfree(theEnv,str,size);
+      return;
+     }
+
+   memPtr = (struct memoryPtr *) str;
+   memPtr->next = MemoryData(theEnv)->MemoryTable[size];
+   MemoryData(theEnv)->MemoryTable[size] = memPtr;
+#else
+   genfree(theEnv,str,size);
+#endif
+  }
+
+/***************************************************/
+/* PoolSize: Returns number of bytes in free pool. */
+/***************************************************/
+unsigned long PoolSize(
+  Environment *theEnv)
+  {
+   unsigned long cnt = 0;
+
+#if (MEM_TABLE_SIZE > 0)
+   int i;
+   struct memoryPtr *memPtr;
+
+   for (i = sizeof(char *) ; i < MEM_TABLE_SIZE ; i++)
+     {
+      memPtr = MemoryData(theEnv)->MemoryTable[i];
+      while (memPtr != NULL)
+        {
+         cnt += (unsigned long) i;
+         memPtr = memPtr->next;
+        }
+     }
+#endif
+
+   return(cnt);
+  }
+
+/***************************************************************/
+/* ActualPoolSize : Returns number of bytes DOS requires to    */
+/*   store the free pool.  This routine is functionally        */
+/*   equivalent to pool_size on anything other than the IBM-PC */
+/***************************************************************/
+unsigned long ActualPoolSize(
+  Environment *theEnv)
+  {
+   return(PoolSize(theEnv));
+  }
+
+/*****************************************/
+/* SetConserveMemory: Allows the setting */
+/*    of the memory conservation flag.   */
+/*****************************************/
+bool SetConserveMemory(
+  Environment *theEnv,
+  bool value)
+  {
+   bool ov;
+
+   ov = MemoryData(theEnv)->ConserveMemory;
+   MemoryData(theEnv)->ConserveMemory = value;
+   return ov;
+  }
+
+/****************************************/
+/* GetConserveMemory: Returns the value */
+/*    of the memory conservation flag.  */
+/****************************************/
+bool GetConserveMemory(
+  Environment *theEnv)
+  {
+   return MemoryData(theEnv)->ConserveMemory;
+  }
+
+/**************************/
+/* genmemcpy:             */
+/**************************/
+void genmemcpy(
+  char *dst,
+  char *src,
+  unsigned long size)
+  {
+   unsigned long i;
+
+   for (i = 0L ; i < size ; i++)
+     dst[i] = src[i];
+  }
diff --git a/clips/memalloc.h b/clips/memalloc.h
new file mode 100755
index 000000000..8a919b270
--- /dev/null
+++ b/clips/memalloc.h
@@ -0,0 +1,197 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/11/17            */
+   /*                                                     */
+   /*            MEMORY ALLOCATION HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Memory allocation routines.                      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed HaltExecution check from the           */
+/*            EnvReleaseMem function. DR0863                 */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems.                   */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Removed genlongalloc/genlongfree functions.    */
+/*                                                           */
+/*            Added get_mem and rtn_mem macros.              */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Removed deallocating message parameter from    */
+/*            EnvReleaseMem.                                 */
+/*                                                           */
+/*            Removed support for BLOCK_MEMORY.              */
+/*                                                           */
+/*      6.31: Fix for get_mem macro.                         */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_memalloc
+
+#pragma once
+
+#define _H_memalloc
+
+#include <string.h>
+
+struct memoryPtr;
+
+typedef bool OutOfMemoryFunction(Environment *,size_t);
+
+#ifndef MEM_TABLE_SIZE
+#define MEM_TABLE_SIZE 500
+#endif
+
+struct memoryPtr
+  {
+   struct memoryPtr *next;
+  };
+
+#if (MEM_TABLE_SIZE > 0)
+/*
+ * Normal memory management case
+ */
+
+#define get_struct(theEnv,type) \
+  ((MemoryData(theEnv)->MemoryTable[sizeof(struct type)] == NULL) ? \
+   ((struct type *) genalloc(theEnv,sizeof(struct type))) :\
+   ((MemoryData(theEnv)->TempMemoryPtr = MemoryData(theEnv)->MemoryTable[sizeof(struct type)]),\
+    MemoryData(theEnv)->MemoryTable[sizeof(struct type)] = MemoryData(theEnv)->TempMemoryPtr->next,\
+    ((struct type *) MemoryData(theEnv)->TempMemoryPtr)))
+
+#define rtn_struct(theEnv,type,struct_ptr) \
+  (MemoryData(theEnv)->TempMemoryPtr = (struct memoryPtr *) struct_ptr,\
+   MemoryData(theEnv)->TempMemoryPtr->next = MemoryData(theEnv)->MemoryTable[sizeof(struct type)], \
+   MemoryData(theEnv)->MemoryTable[sizeof(struct type)] = MemoryData(theEnv)->TempMemoryPtr)
+
+#define rtn_sized_struct(theEnv,size,struct_ptr) \
+  (MemoryData(theEnv)->TempMemoryPtr = (struct memoryPtr *) struct_ptr,\
+   MemoryData(theEnv)->TempMemoryPtr->next = MemoryData(theEnv)->MemoryTable[size], \
+   MemoryData(theEnv)->MemoryTable[size] = MemoryData(theEnv)->TempMemoryPtr)
+
+#define get_var_struct(theEnv,type,vsize) \
+  ((((sizeof(struct type) + vsize) <  MEM_TABLE_SIZE) ? \
+    (MemoryData(theEnv)->MemoryTable[sizeof(struct type) + vsize] == NULL) : 1) ? \
+   ((struct type *) genalloc(theEnv,(sizeof(struct type) + vsize))) :\
+   ((MemoryData(theEnv)->TempMemoryPtr = MemoryData(theEnv)->MemoryTable[sizeof(struct type) + vsize]),\
+    MemoryData(theEnv)->MemoryTable[sizeof(struct type) + vsize] = MemoryData(theEnv)->TempMemoryPtr->next,\
+    ((struct type *) MemoryData(theEnv)->TempMemoryPtr)))
+
+#define rtn_var_struct(theEnv,type,vsize,struct_ptr) \
+  (MemoryData(theEnv)->TempSize = sizeof(struct type) + vsize, \
+   ((MemoryData(theEnv)->TempSize < MEM_TABLE_SIZE) ? \
+    (MemoryData(theEnv)->TempMemoryPtr = (struct memoryPtr *) struct_ptr,\
+     MemoryData(theEnv)->TempMemoryPtr->next = MemoryData(theEnv)->MemoryTable[MemoryData(theEnv)->TempSize], \
+     MemoryData(theEnv)->MemoryTable[MemoryData(theEnv)->TempSize] =  MemoryData(theEnv)->TempMemoryPtr) : \
+    (genfree(theEnv,struct_ptr,MemoryData(theEnv)->TempSize),(struct memoryPtr *) struct_ptr)))
+
+#define get_mem(theEnv,size) \
+  (((size <  MEM_TABLE_SIZE) ? \
+    (MemoryData(theEnv)->MemoryTable[size] == NULL) : 1) ? \
+   ((void *) genalloc(theEnv,(size_t) (size))) :\
+   ((MemoryData(theEnv)->TempMemoryPtr = MemoryData(theEnv)->MemoryTable[size]),\
+    MemoryData(theEnv)->MemoryTable[size] = MemoryData(theEnv)->TempMemoryPtr->next,\
+    ((void *) MemoryData(theEnv)->TempMemoryPtr)))
+
+#define rtn_mem(theEnv,size,ptr) \
+  (MemoryData(theEnv)->TempSize = size, \
+   ((MemoryData(theEnv)->TempSize < MEM_TABLE_SIZE) ? \
+    (MemoryData(theEnv)->TempMemoryPtr = (struct memoryPtr *) ptr,\
+     MemoryData(theEnv)->TempMemoryPtr->next = MemoryData(theEnv)->MemoryTable[MemoryData(theEnv)->TempSize], \
+     MemoryData(theEnv)->MemoryTable[MemoryData(theEnv)->TempSize] =  MemoryData(theEnv)->TempMemoryPtr) : \
+    (genfree(theEnv,ptr,MemoryData(theEnv)->TempSize),(struct memoryPtr *) ptr)))
+
+#else // MEM_TABLE_SIZE == 0
+/*
+ * Debug case (routes all memory management through genalloc/genfree to take advantage of
+ * platform, memory debugging aids)
+ */
+#define get_struct(theEnv,type) ((struct type *) genalloc(theEnv,sizeof(struct type)))
+
+#define rtn_struct(theEnv,type,struct_ptr) (genfree(theEnv,struct_ptr,sizeof(struct type)))
+
+#define rtn_sized_struct(theEnv,size,struct_ptr) (genfree(theEnv,struct_ptr,size))
+
+#define get_var_struct(theEnv,type,vsize) ((struct type *) genalloc(theEnv,(sizeof(struct type) + vsize)))
+
+#define rtn_var_struct(theEnv,type,vsize,struct_ptr) (genfree(theEnv,struct_ptr,sizeof(struct type)+vsize))
+
+#define get_mem(theEnv,size) ((struct type *) genalloc(theEnv,(size_t) (size)))
+
+#define rtn_mem(theEnv,size,ptr) (genfree(theEnv,ptr,size))
+
+#endif
+
+#define GenCopyMemory(type,cnt,dst,src) \
+   memcpy((void *) (dst),(void *) (src),sizeof(type) * (size_t) (cnt))
+
+#define MEMORY_DATA 59
+
+struct memoryData
+  {
+   long long MemoryAmount;
+   long long MemoryCalls;
+   bool ConserveMemory;
+   OutOfMemoryFunction *OutOfMemoryCallback;
+   struct memoryPtr *TempMemoryPtr;
+   struct memoryPtr **MemoryTable;
+   size_t TempSize;
+  };
+
+#define MemoryData(theEnv) ((struct memoryData *) GetEnvironmentData(theEnv,MEMORY_DATA))
+
+   void                           InitializeMemory(Environment *);
+   void                          *genalloc(Environment *,size_t);
+   bool                           DefaultOutOfMemoryFunction(Environment *,size_t);
+   OutOfMemoryFunction           *SetOutOfMemoryFunction(Environment *,OutOfMemoryFunction *);
+   void                           genfree(Environment *,void *,size_t);
+   void                          *genrealloc(Environment *,void *,size_t,size_t);
+   long long                      MemUsed(Environment *);
+   long long                      MemRequests(Environment *);
+   long long                      UpdateMemoryUsed(Environment *,long long);
+   long long                      UpdateMemoryRequests(Environment *,long long);
+   long long                      ReleaseMem(Environment *,long long);
+   void                          *gm1(Environment *,size_t);
+   void                          *gm2(Environment *,size_t);
+   void                           rm(Environment *,void *,size_t);
+   unsigned long                  PoolSize(Environment *);
+   unsigned long                  ActualPoolSize(Environment *);
+   bool                           SetConserveMemory(Environment *,bool);
+   bool                           GetConserveMemory(Environment *);
+   void                           genmemcpy(char *,char *,unsigned long);
+
+#endif /* _H_memalloc */
+
+
+
+
+
+
diff --git a/clips/miscfun.c b/clips/miscfun.c
new file mode 100755
index 000000000..17a14f4fe
--- /dev/null
+++ b/clips/miscfun.c
@@ -0,0 +1,1799 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/10/18             */
+   /*                                                     */
+   /*            MISCELLANEOUS FUNCTIONS MODULE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES,        */
+/*            DYNAMIC_SALIENCE, INCREMENTAL_RESET,           */
+/*            LOGICAL_DEPENDENCIES, IMPERATIVE_METHODS       */
+/*            INSTANCE_PATTERN_MATCHING,                     */
+/*            IMPERATIVE_MESSAGE_HANDLERS, and               */
+/*            AUXILIARY_MESSAGE_HANDLERS compilation flags.  */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems.                   */
+/*                                                           */
+/*            Renamed EX_MATH compiler flag to               */
+/*            EXTENDED_MATH_FUNCTIONS.                       */
+/*                                                           */
+/*            Combined BASIC_IO and EXT_IO compilation       */
+/*            flags into the IO_FUNCTIONS compilation flag.  */
+/*                                                           */
+/*            Removed code associated with HELP_FUNCTIONS    */
+/*            and EMACS_EDITOR compiler flags.               */
+/*                                                           */
+/*            Added operating-system function.               */
+/*                                                           */
+/*            Added new function (for future use).           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Removed deallocating message parameter from    */
+/*            EnvReleaseMem.                                 */
+/*                                                           */
+/*            Removed support for BLOCK_MEMORY.              */
+/*                                                           */
+/*      6.31: Added local-time and gm-time functions.        */
+/*                                                           */
+/*      6.40: Changed restrictions from char * to            */
+/*            CLIPSLexeme * to support strings               */
+/*            originating from sources that are not          */
+/*            statically allocated.                          */
+/*                                                           */
+/*            Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed VAX_VMS support.                       */
+/*                                                           */
+/*            Removed mv-append and length functions.        */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            The system function now returns the completion */
+/*            status of the command. If no arguments are     */
+/*            passed, the return value indicates whether a   */
+/*            command processor is available.                */
+/*                                                           */
+/*            Added get-error, set-error, and clear-error    */
+/*            functions.                                     */
+/*                                                           */
+/*            Added void function.                           */
+/*                                                           */
+/*            Function operating system returns MAC-OS       */
+/*            instead of MAC-OS-X.                           */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#if DEFFUNCTION_CONSTRUCT
+#include "dffnxfun.h"
+#endif
+
+#if DEFTEMPLATE_CONSTRUCT
+#include "factfun.h"
+#include "tmpltutl.h"
+#endif
+
+#include "miscfun.h"
+
+#define MISCFUN_DATA 9
+
+struct miscFunctionData
+  {
+   long long GensymNumber;
+   CLIPSValue errorCode;
+  };
+
+#define MiscFunctionData(theEnv) ((struct miscFunctionData *) GetEnvironmentData(theEnv,MISCFUN_DATA))
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ExpandFuncMultifield(Environment *,UDFValue *,Expression *,
+                                                       Expression **,void *);
+   static int                     FindLanguageType(Environment *,const char *);
+   static void                    ConvertTime(Environment *,UDFValue *,struct tm *);
+
+/*****************************************************************/
+/* MiscFunctionDefinitions: Initializes miscellaneous functions. */
+/*****************************************************************/
+void MiscFunctionDefinitions(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,MISCFUN_DATA,sizeof(struct miscFunctionData),NULL);
+   MiscFunctionData(theEnv)->GensymNumber = 1;
+   MiscFunctionData(theEnv)->errorCode.lexemeValue = FalseSymbol(theEnv);
+   Retain(theEnv,MiscFunctionData(theEnv)->errorCode.header);
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"exit","v",0,1,"l",ExitCommand,"ExitCommand",NULL);
+
+   AddUDF(theEnv,"gensym","y",0,0,NULL,GensymFunction,"GensymFunction",NULL);
+   AddUDF(theEnv,"gensym*","y",0,0,NULL,GensymStarFunction,"GensymStarFunction",NULL);
+   AddUDF(theEnv,"setgen","l",1,1,"l",SetgenFunction,"SetgenFunction",NULL);
+
+   AddUDF(theEnv,"system","ly",0,UNBOUNDED,"sy",SystemCommand,"SystemCommand",NULL);
+   AddUDF(theEnv,"length$","l",1,1,"m",LengthFunction,"LengthFunction",NULL);
+   AddUDF(theEnv,"time","d",0,0,NULL,TimeFunction,"TimeFunction",NULL);
+   AddUDF(theEnv,"local-time","m",0,0,NULL,LocalTimeFunction,"LocalTimeFunction",NULL);
+   AddUDF(theEnv,"gm-time","m",0,0,NULL,GMTimeFunction,"GMTimeFunction",NULL);
+
+   AddUDF(theEnv,"random","l",0,2,"l",RandomFunction,"RandomFunction",NULL);
+   AddUDF(theEnv,"seed","v",1,1,"l",SeedFunction,"SeedFunction",NULL);
+   AddUDF(theEnv,"conserve-mem","v",1,1,"y",ConserveMemCommand,"ConserveMemCommand",NULL);
+   AddUDF(theEnv,"release-mem","l",0,0,NULL,ReleaseMemCommand,"ReleaseMemCommand",NULL);
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"mem-used","l",0,0,NULL,MemUsedCommand,"MemUsedCommand",NULL);
+   AddUDF(theEnv,"mem-requests","l",0,0,NULL,MemRequestsCommand,"MemRequestsCommand",NULL);
+#endif
+
+   AddUDF(theEnv,"options","v",0,0,NULL,OptionsCommand,"OptionsCommand",NULL);
+
+   AddUDF(theEnv,"operating-system","y",0,0,NULL,OperatingSystemFunction,"OperatingSystemFunction",NULL);
+   AddUDF(theEnv,"(expansion-call)","*",0,UNBOUNDED,NULL,ExpandFuncCall,"ExpandFuncCall",NULL);
+   AddUDF(theEnv,"expand$","*",1,1,"m",DummyExpandFuncMultifield,"DummyExpandFuncMultifield",NULL);
+   FuncSeqOvlFlags(theEnv,"expand$",false,false);
+   AddUDF(theEnv,"(set-evaluation-error)","y",0,0,NULL,CauseEvaluationError,"CauseEvaluationError",NULL);
+   AddUDF(theEnv,"set-sequence-operator-recognition","b",1,1,"y",SetSORCommand,"SetSORCommand",NULL);
+   AddUDF(theEnv,"get-sequence-operator-recognition","b",0,0,NULL,GetSORCommand,"GetSORCommand",NULL);
+   AddUDF(theEnv,"get-function-restrictions","s",1,1,"y",GetFunctionRestrictions,"GetFunctionRestrictions",NULL);
+   AddUDF(theEnv,"create$","m",0,UNBOUNDED,NULL,CreateFunction,"CreateFunction",NULL);
+   AddUDF(theEnv,"apropos","v",1,1,"y",AproposCommand,"AproposCommand",NULL);
+   AddUDF(theEnv,"get-function-list","m",0,0,NULL,GetFunctionListFunction,"GetFunctionListFunction",NULL);
+   AddUDF(theEnv,"funcall","*",1,UNBOUNDED,"*;sy",FuncallFunction,"FuncallFunction",NULL);
+   AddUDF(theEnv,"new","*",1,UNBOUNDED,"*;y",NewFunction,"NewFunction",NULL);
+   AddUDF(theEnv,"call","*",1,UNBOUNDED,"*",CallFunction,"CallFunction",NULL);
+   AddUDF(theEnv,"timer","d",0,UNBOUNDED,NULL,TimerFunction,"TimerFunction",NULL);
+
+   AddUDF(theEnv,"get-error","*",0,0,NULL,GetErrorFunction,"GetErrorFunction",NULL);
+   AddUDF(theEnv,"clear-error","*",0,0,NULL,ClearErrorFunction,"ClearErrorFunction",NULL);
+   AddUDF(theEnv,"set-error","v",1,1,NULL,SetErrorFunction,"SetErrorFunction",NULL);
+
+   AddUDF(theEnv,"void","v",0,0,NULL,VoidFunction,"VoidFunction",NULL);
+#endif
+  }
+
+/*****************************************************/
+/* ExitCommand: H/L command for exiting the program. */
+/*****************************************************/
+void ExitCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int argCnt;
+   int status;
+   UDFValue theArg;
+
+   argCnt = UDFArgumentCount(context);
+
+   if (argCnt == 0)
+     { ExitRouter(theEnv,EXIT_SUCCESS); }
+   else
+    {
+     if (! UDFFirstArgument(context,INTEGER_BIT,&theArg))
+       { ExitRouter(theEnv,EXIT_SUCCESS); }
+
+     status = (int) theArg.integerValue->contents;
+     if (GetEvaluationError(theEnv)) return;
+     ExitRouter(theEnv,status);
+    }
+
+   return;
+  }
+
+/******************************************************************/
+/* CreateFunction: H/L access routine for the create$ function.   */
+/******************************************************************/
+void CreateFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   StoreInMultifield(theEnv,returnValue,GetFirstArgument(),true);
+  }
+
+/*****************************************************************/
+/* SetgenFunction: H/L access routine for the setgen function.   */
+/*****************************************************************/
+void SetgenFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   long long theLong;
+
+   /*====================================================*/
+   /* Check to see that an integer argument is provided. */
+   /*====================================================*/
+
+   if (! UDFNthArgument(context,1,INTEGER_BIT,returnValue))
+     { return; }
+
+   /*========================================*/
+   /* The integer must be greater than zero. */
+   /*========================================*/
+
+   theLong = returnValue->integerValue->contents;
+
+   if (theLong < 1LL)
+     {
+      UDFInvalidArgumentMessage(context,"integer (greater than or equal to 1)");
+      returnValue->integerValue = CreateInteger(theEnv,MiscFunctionData(theEnv)->GensymNumber);
+      return;
+     }
+
+   /*==============================================*/
+   /* Set the gensym index to the number provided. */
+   /*==============================================*/
+
+   MiscFunctionData(theEnv)->GensymNumber = theLong;
+  }
+
+/****************************************/
+/* GensymFunction: H/L access routine   */
+/*   for the gensym function.           */
+/****************************************/
+void GensymFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   char genstring[128];
+
+   /*================================================*/
+   /* Create a symbol using the current gensym index */
+   /* as the postfix.                                */
+   /*================================================*/
+
+   gensprintf(genstring,"gen%lld",MiscFunctionData(theEnv)->GensymNumber);
+   MiscFunctionData(theEnv)->GensymNumber++;
+
+   /*====================*/
+   /* Return the symbol. */
+   /*====================*/
+
+   returnValue->lexemeValue = CreateSymbol(theEnv,genstring);
+  }
+
+/************************************************/
+/* GensymStarFunction: H/L access routine for   */
+/*   the gensym* function.                      */
+/************************************************/
+void GensymStarFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*====================*/
+   /* Return the symbol. */
+   /*====================*/
+
+   GensymStar(theEnv,returnValue);
+  }
+
+/************************************/
+/* GensymStar: C access routine for */
+/*   the gensym* function.          */
+/************************************/
+void GensymStar(
+  Environment *theEnv,
+  UDFValue *returnValue)
+  {
+   char genstring[128];
+
+   /*=======================================================*/
+   /* Create a symbol using the current gensym index as the */
+   /* postfix. If the symbol is already present in the      */
+   /* symbol table, then continue generating symbols until  */
+   /* a unique symbol is found.                             */
+   /*=======================================================*/
+
+   do
+     {
+      gensprintf(genstring,"gen%lld",MiscFunctionData(theEnv)->GensymNumber);
+      MiscFunctionData(theEnv)->GensymNumber++;
+     }
+   while (FindSymbolHN(theEnv,genstring,SYMBOL_BIT) != NULL);
+
+   /*====================*/
+   /* Return the symbol. */
+   /*====================*/
+
+   returnValue->lexemeValue = CreateSymbol(theEnv,genstring);
+  }
+
+/********************************************/
+/* RandomFunction: H/L access routine for   */
+/*   the random function.                   */
+/********************************************/
+void RandomFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int argCount;
+   long long rv;
+   UDFValue theArg;
+   long long begin, end;
+
+   /*====================================*/
+   /* The random function accepts either */
+   /* zero or two arguments.             */
+   /*====================================*/
+
+   argCount = UDFArgumentCount(context);
+
+   if ((argCount != 0) && (argCount != 2))
+     {
+      PrintErrorID(theEnv,"MISCFUN",2,false);
+      WriteString(theEnv,STDERR,"Function random expected either 0 or 2 arguments\n");
+     }
+
+   /*========================================*/
+   /* Return the randomly generated integer. */
+   /*========================================*/
+
+   rv = genrand();
+
+   if (argCount == 2)
+     {
+      if (! UDFFirstArgument(context,INTEGER_BIT,&theArg))
+        { return; }
+      begin = theArg.integerValue->contents;
+
+      if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+        { return; }
+
+      end = theArg.integerValue->contents;
+      if (end < begin)
+        {
+         PrintErrorID(theEnv,"MISCFUN",3,false);
+         WriteString(theEnv,STDERR,"Function random expected argument #1 to be less than argument #2\n");
+         returnValue->integerValue = CreateInteger(theEnv,rv);
+         return;
+        }
+
+      rv = begin + (rv % ((end - begin) + 1));
+     }
+
+   returnValue->integerValue = CreateInteger(theEnv,rv);
+  }
+
+/******************************************/
+/* SeedFunction: H/L access routine for   */
+/*   the seed function.                   */
+/******************************************/
+void SeedFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theValue;
+
+   /*==========================================================*/
+   /* Check to see that a single integer argument is provided. */
+   /*==========================================================*/
+
+   if (! UDFFirstArgument(context,INTEGER_BIT,&theValue))
+     { return; }
+
+   /*=============================================================*/
+   /* Seed the random number generator with the provided integer. */
+   /*=============================================================*/
+
+   genseed((unsigned int) theValue.integerValue->contents);
+  }
+
+/********************************************/
+/* LengthFunction: H/L access routine for   */
+/*   the length$ function.                  */
+/********************************************/
+void LengthFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   /*====================================================*/
+   /* The length$ function expects exactly one argument. */
+   /*====================================================*/
+
+   if (! UDFFirstArgument(context, MULTIFIELD_BIT, &theArg))
+     { return; }
+
+   /*==============================================*/
+   /* Return the number of fields in the argument. */
+   /*==============================================*/
+
+   returnValue->value = CreateInteger(theEnv,(long long) theArg.range);
+  }
+
+/*******************************************/
+/* ReleaseMemCommand: H/L access routine   */
+/*   for the release-mem function.         */
+/*******************************************/
+void ReleaseMemCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*========================================*/
+   /* Release memory to the operating system */
+   /* and return the amount of memory freed. */
+   /*========================================*/
+
+   returnValue->integerValue = CreateInteger(theEnv,ReleaseMem(theEnv,-1));
+  }
+
+/******************************************/
+/* ConserveMemCommand: H/L access routine */
+/*   for the conserve-mem command.        */
+/******************************************/
+void ConserveMemCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *argument;
+   UDFValue theValue;
+
+   /*===================================*/
+   /* The conserve-mem function expects */
+   /* a single symbol argument.         */
+   /*===================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theValue))
+     { return; }
+
+   argument = theValue.lexemeValue->contents;
+
+   /*====================================================*/
+   /* If the argument is the symbol "on", then store the */
+   /* pretty print representation of a construct when it */
+   /* is defined.                                        */
+   /*====================================================*/
+
+   if (strcmp(argument,"on") == 0)
+     { SetConserveMemory(theEnv,true); }
+
+   /*======================================================*/
+   /* Otherwise, if the argument is the symbol "off", then */
+   /* don't store the pretty print representation of a     */
+   /* construct when it is defined.                        */
+   /*======================================================*/
+
+   else if (strcmp(argument,"off") == 0)
+     { SetConserveMemory(theEnv,false); }
+
+   /*=====================================================*/
+   /* Otherwise, generate an error since the only allowed */
+   /* arguments are "on" or "off."                        */
+   /*=====================================================*/
+
+   else
+     {
+      UDFInvalidArgumentMessage(context,"symbol with value on or off");
+      return;
+     }
+
+   return;
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/****************************************/
+/* MemUsedCommand: H/L access routine   */
+/*   for the mem-used command.          */
+/****************************************/
+void MemUsedCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*============================================*/
+   /* Return the amount of memory currently held */
+   /* (both for current use and for later use).  */
+   /*============================================*/
+
+   returnValue->integerValue = CreateInteger(theEnv,MemUsed(theEnv));
+  }
+
+/********************************************/
+/* MemRequestsCommand: H/L access routine   */
+/*   for the mem-requests command.          */
+/********************************************/
+void MemRequestsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*==================================*/
+   /* Return the number of outstanding */
+   /* memory requests.                 */
+   /*==================================*/
+
+   returnValue->integerValue = CreateInteger(theEnv,MemRequests(theEnv));
+  }
+
+#endif
+
+/****************************************/
+/* AproposCommand: H/L access routine   */
+/*   for the apropos command.           */
+/****************************************/
+void AproposCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *argument;
+   UDFValue theArg;
+   CLIPSLexeme *hashPtr = NULL;
+   size_t theLength;
+
+   /*=======================================================*/
+   /* The apropos command expects a single symbol argument. */
+   /*=======================================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   /*=======================================*/
+   /* Determine the length of the argument. */
+   /*=======================================*/
+
+   argument = theArg.lexemeValue->contents;
+   theLength = strlen(argument);
+
+   /*====================================================================*/
+   /* Print each entry in the symbol table that contains the argument as */
+   /* a substring. When using a non-ANSI compiler, only those strings    */
+   /* that contain the substring starting at the beginning of the string */
+   /* are printed.                                                       */
+   /*====================================================================*/
+
+   while ((hashPtr = GetNextSymbolMatch(theEnv,argument,theLength,hashPtr,true,NULL)) != NULL)
+     {
+      WriteString(theEnv,STDOUT,hashPtr->contents);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+  }
+
+/****************************************/
+/* OptionsCommand: H/L access routine   */
+/*   for the options command.           */
+/****************************************/
+void OptionsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*=======================*/
+   /* Set the return value. */
+   /*=======================*/
+
+   returnValue->voidValue = VoidConstant(theEnv);
+
+   /*=================================*/
+   /* Print the state of the compiler */
+   /* flags for this executable.      */
+   /*=================================*/
+
+   WriteString(theEnv,STDOUT,"Machine type: ");
+
+#if GENERIC
+   WriteString(theEnv,STDOUT,"Generic ");
+#endif
+#if UNIX_V
+   WriteString(theEnv,STDOUT,"UNIX System V or 4.2BSD ");
+#endif
+#if DARWIN
+   WriteString(theEnv,STDOUT,"Darwin ");
+#endif
+#if LINUX
+   WriteString(theEnv,STDOUT,"Linux ");
+#endif
+#if UNIX_7
+   WriteString(theEnv,STDOUT,"UNIX System III Version 7 or Sun Unix ");
+#endif
+#if MAC_XCD
+   WriteString(theEnv,STDOUT,"Apple Macintosh with Xcode");
+#endif
+#if WIN_MVC
+   WriteString(theEnv,STDOUT,"Microsoft Windows with Microsoft Visual C++");
+#endif
+#if WIN_GCC
+   WriteString(theEnv,STDOUT,"Microsoft Windows with DJGPP");
+#endif
+WriteString(theEnv,STDOUT,"\n");
+
+WriteString(theEnv,STDOUT,"Defrule construct is ");
+#if DEFRULE_CONSTRUCT
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Defmodule construct is ");
+#if DEFMODULE_CONSTRUCT
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Deftemplate construct is ");
+#if DEFTEMPLATE_CONSTRUCT
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"  Fact-set queries are ");
+#if FACT_SET_QUERIES
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+#if DEFTEMPLATE_CONSTRUCT
+
+WriteString(theEnv,STDOUT,"  Deffacts construct is ");
+#if DEFFACTS_CONSTRUCT
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+#endif
+
+WriteString(theEnv,STDOUT,"Defglobal construct is ");
+#if DEFGLOBAL_CONSTRUCT
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Deffunction construct is ");
+#if DEFFUNCTION_CONSTRUCT
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Defgeneric/Defmethod constructs are ");
+#if DEFGENERIC_CONSTRUCT
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Object System is ");
+#if OBJECT_SYSTEM
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+#if OBJECT_SYSTEM
+
+WriteString(theEnv,STDOUT,"  Definstances construct is ");
+#if DEFINSTANCES_CONSTRUCT
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"  Instance-set queries are ");
+#if INSTANCE_SET_QUERIES
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"  Binary loading of instances is ");
+#if BLOAD_INSTANCES
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"  Binary saving of instances is ");
+#if BSAVE_INSTANCES
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+#endif
+
+WriteString(theEnv,STDOUT,"Extended math function package is ");
+#if EXTENDED_MATH_FUNCTIONS
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Text processing function package is ");
+#if TEXTPRO_FUNCTIONS
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Bload capability is ");
+#if BLOAD_ONLY
+  WriteString(theEnv,STDOUT,"BLOAD ONLY");
+#endif
+#if BLOAD
+  WriteString(theEnv,STDOUT,"BLOAD");
+#endif
+#if BLOAD_AND_BSAVE
+  WriteString(theEnv,STDOUT,"BLOAD AND BSAVE");
+#endif
+#if (! BLOAD_ONLY) && (! BLOAD) && (! BLOAD_AND_BSAVE)
+  WriteString(theEnv,STDOUT,"OFF ");
+#endif
+WriteString(theEnv,STDOUT,"\n");
+
+WriteString(theEnv,STDOUT,"Construct compiler is ");
+#if CONSTRUCT_COMPILER
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"I/O function package is ");
+#if IO_FUNCTIONS
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"String function package is ");
+#if STRING_FUNCTIONS
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Multifield function package is ");
+#if MULTIFIELD_FUNCTIONS
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Debugging function package is ");
+#if DEBUGGING_FUNCTIONS
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Window Interface flag is ");
+#if WINDOW_INTERFACE
+   WriteString(theEnv,STDOUT,"ON\n");
+#else
+   WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Developer flag is ");
+#if DEVELOPER
+   WriteString(theEnv,STDOUT,"ON\n");
+#else
+   WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+
+WriteString(theEnv,STDOUT,"Run time module is ");
+#if RUN_TIME
+  WriteString(theEnv,STDOUT,"ON\n");
+#else
+  WriteString(theEnv,STDOUT,"OFF\n");
+#endif
+  }
+
+/***********************************************/
+/* OperatingSystemFunction: H/L access routine */
+/*   for the operating system function.        */
+/***********************************************/
+void OperatingSystemFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if GENERIC
+   returnValue->lexemeValue = CreateSymbol(theEnv,"UNKNOWN");
+#elif UNIX_V
+   returnValue->lexemeValue = CreateSymbol(theEnv,"UNIX-V");
+#elif UNIX_7
+   returnValue->lexemeValue = CreateSymbol(theEnv,"UNIX-7");
+#elif LINUX
+   returnValue->lexemeValue = CreateSymbol(theEnv,"LINUX");
+#elif DARWIN
+   returnValue->lexemeValue = CreateSymbol(theEnv,"DARWIN");
+#elif MAC_XCD
+   returnValue->lexemeValue = CreateSymbol(theEnv,"MAC-OS");
+#elif IBM && (! WINDOW_INTERFACE)
+   returnValue->lexemeValue = CreateSymbol(theEnv,"DOS");
+#elif IBM && WINDOW_INTERFACE
+   returnValue->lexemeValue = CreateSymbol(theEnv,"WINDOWS");
+#else
+   returnValue->lexemeValue = CreateSymbol(theEnv,"UNKNOWN");
+#endif
+  }
+
+/********************************************************************
+  NAME         : ExpandFuncCall
+  DESCRIPTION  : This function is a wrap-around for a normal
+                   function call.  It preexamines the argument
+                   expression list and expands any references to the
+                   sequence operator.  It builds a copy of the
+                   function call expression with these new arguments
+                   inserted and evaluates the function call.
+  INPUTS       : A data object buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Expressions alloctaed/deallocated
+                 Function called and arguments evaluated
+                 EvaluationError set on errors
+  NOTES        : None
+ *******************************************************************/
+void ExpandFuncCall(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Expression *newargexp,*fcallexp;
+   struct functionDefinition *func;
+
+   /* ======================================================================
+      Copy the original function call's argument expression list.
+      Look for expand$ function callsexpressions and replace those
+        with the equivalent expressions of the expansions of evaluations
+        of the arguments.
+      ====================================================================== */
+   newargexp = CopyExpression(theEnv,GetFirstArgument()->argList);
+   ExpandFuncMultifield(theEnv,returnValue,newargexp,&newargexp,
+                        FindFunction(theEnv,"expand$"));
+
+   /* ===================================================================
+      Build the new function call expression with the expanded arguments.
+      Check the number of arguments, if necessary, and call the thing.
+      =================================================================== */
+   fcallexp = get_struct(theEnv,expr);
+   fcallexp->type = GetFirstArgument()->type;
+   fcallexp->value = GetFirstArgument()->value;
+   fcallexp->nextArg = NULL;
+   fcallexp->argList = newargexp;
+   if (fcallexp->type == FCALL)
+     {
+      func = fcallexp->functionValue;
+      if (CheckFunctionArgCount(theEnv,func,CountArguments(newargexp)) == false)
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         ReturnExpression(theEnv,fcallexp);
+         return;
+        }
+     }
+#if DEFFUNCTION_CONSTRUCT
+   else if (fcallexp->type == PCALL)
+     {
+      if (CheckDeffunctionCall(theEnv,(Deffunction *) fcallexp->value,
+              CountArguments(fcallexp->argList)) == false)
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         ReturnExpression(theEnv,fcallexp);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+     }
+#endif
+
+   EvaluateExpression(theEnv,fcallexp,returnValue);
+   ReturnExpression(theEnv,fcallexp);
+  }
+
+/***********************************************************************
+  NAME         : DummyExpandFuncMultifield
+  DESCRIPTION  : The expansion of multifield arguments is valid only
+                 when done for a function call.  All these expansions
+                 are handled by the H/L wrap-around function
+                 (expansion-call) - see ExpandFuncCall.  If the H/L
+                 function, epand-multifield is ever called directly,
+                 it is an error.
+  INPUTS       : Data object buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : EvaluationError set
+  NOTES        : None
+ **********************************************************************/
+void DummyExpandFuncMultifield(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   SetEvaluationError(theEnv,true);
+   PrintErrorID(theEnv,"MISCFUN",1,false);
+   WriteString(theEnv,STDERR,"The function 'expand$' must be used in the argument list of a function call.\n");
+  }
+
+/***********************************************************************
+  NAME         : ExpandFuncMultifield
+  DESCRIPTION  : Recursively examines an expression and replaces
+                   PROC_EXPAND_MULTIFIELD expressions with the expanded
+                   evaluation expression of its argument
+  INPUTS       : 1) A data object result buffer
+                 2) The expression to modify
+                 3) The address of the expression, in case it is
+                    deleted entirely
+                 4) The address of the H/L function expand$
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Expressions allocated/deallocated as necessary
+                 Evaluations performed
+                 On errors, argument expression set to call a function
+                   which causes an evaluation error when evaluated
+                   a second time by actual caller.
+  NOTES        : THIS ROUTINE MODIFIES EXPRESSIONS AT RUNTIME!!  MAKE
+                 SURE THAT THE Expression PASSED IS SAFE TO CHANGE!!
+ **********************************************************************/
+static void ExpandFuncMultifield(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  Expression *theExp,
+  Expression **sto,
+  void *expmult)
+  {
+   Expression *newexp,*top,*bot;
+   size_t i; /* 6.04 Bug Fix */
+
+   while (theExp != NULL)
+     {
+      if (theExp->value == expmult)
+        {
+         EvaluateExpression(theEnv,theExp->argList,returnValue);
+         ReturnExpression(theEnv,theExp->argList);
+         if ((EvaluationData(theEnv)->EvaluationError) ||
+             (returnValue->header->type != MULTIFIELD_TYPE))
+           {
+            theExp->argList = NULL;
+            if ((EvaluationData(theEnv)->EvaluationError == false) &&
+                (returnValue->header->type != MULTIFIELD_TYPE))
+              ExpectedTypeError2(theEnv,"expand$",1);
+            theExp->value = FindFunction(theEnv,"(set-evaluation-error)");
+            EvaluationData(theEnv)->EvaluationError = false;
+            EvaluationData(theEnv)->HaltExecution = false;
+            return;
+           }
+         top = bot = NULL;
+         for (i = returnValue->begin ; i < (returnValue->begin + returnValue->range) ; i++)
+           {
+            newexp = get_struct(theEnv,expr);
+            newexp->type = returnValue->multifieldValue->contents[i].header->type;
+            newexp->value = returnValue->multifieldValue->contents[i].value;
+            newexp->argList = NULL;
+            newexp->nextArg = NULL;
+            if (top == NULL)
+              top = newexp;
+            else
+              bot->nextArg = newexp;
+            bot = newexp;
+           }
+         if (top == NULL)
+           {
+            *sto = theExp->nextArg;
+            rtn_struct(theEnv,expr,theExp);
+            theExp = *sto;
+           }
+         else
+           {
+            bot->nextArg = theExp->nextArg;
+            *sto = top;
+            rtn_struct(theEnv,expr,theExp);
+            sto = &bot->nextArg;
+            theExp = bot->nextArg;
+           }
+        }
+      else
+        {
+         if (theExp->argList != NULL)
+           ExpandFuncMultifield(theEnv,returnValue,theExp->argList,&theExp->argList,expmult);
+         sto = &theExp->nextArg;
+         theExp = theExp->nextArg;
+        }
+     }
+  }
+
+/****************************************************************
+  NAME         : CauseEvaluationError
+  DESCRIPTION  : Dummy function use to cause evaluation errors on
+                   a function call to generate error messages
+  INPUTS       : None
+  RETURNS      : A pointer to the FalseSymbol
+  SIDE EFFECTS : EvaluationError set
+  NOTES        : None
+ ****************************************************************/
+void CauseEvaluationError(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   SetEvaluationError(theEnv,true);
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+  }
+
+/************************************************/
+/* GetSORCommand: H/L access routine for the    */
+/*   get-sequence-operator-recognition command. */
+/************************************************/
+void GetSORCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateBoolean(theEnv,GetSequenceOperatorRecognition(theEnv));
+  }
+
+/************************************************/
+/* SetSORCommand: H/L access routine for the    */
+/*   set-sequence-operator-recognition command. */
+/************************************************/
+void SetSORCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   UDFValue theArg;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,SetSequenceOperatorRecognition(theEnv,theArg.value != FalseSymbol(theEnv)));
+#else
+   returnValue->lexemeValue = CreateBoolean(theEnv,ExpressionData(theEnv)->SequenceOpMode);
+#endif
+  }
+
+/********************************************************************
+  NAME         : GetFunctionRestrictions
+  DESCRIPTION  : Gets DefineFunction2() restriction list for function
+  INPUTS       : None
+  RETURNS      : A string containing the function restriction codes
+  SIDE EFFECTS : EvaluationError set on errors
+  NOTES        : None
+ ********************************************************************/
+void GetFunctionRestrictions(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   struct functionDefinition *fptr;
+   char *stringBuffer = NULL;
+   size_t bufferPosition = 0;
+   size_t bufferMaximum = 0;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   fptr = FindFunction(theEnv,theArg.lexemeValue->contents);
+   if (fptr == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"function",theArg.lexemeValue->contents,true);
+      SetEvaluationError(theEnv,true);
+      returnValue->lexemeValue = CreateString(theEnv,"");
+      return;
+     }
+
+   if (fptr->minArgs == UNBOUNDED)
+     {
+      stringBuffer = AppendToString(theEnv,"0",
+                                    stringBuffer,&bufferPosition,&bufferMaximum);
+     }
+   else
+     {
+      stringBuffer = AppendToString(theEnv,LongIntegerToString(theEnv,fptr->minArgs),
+                                    stringBuffer,&bufferPosition,&bufferMaximum);
+     }
+
+   stringBuffer = AppendToString(theEnv,";",
+                                 stringBuffer,&bufferPosition,&bufferMaximum);
+
+   if (fptr->maxArgs == UNBOUNDED)
+     {
+      stringBuffer = AppendToString(theEnv,"*",
+                                    stringBuffer,&bufferPosition,&bufferMaximum);
+     }
+   else
+     {
+      stringBuffer = AppendToString(theEnv,LongIntegerToString(theEnv,fptr->maxArgs),
+                                    stringBuffer,&bufferPosition,&bufferMaximum);
+     }
+     
+   stringBuffer = AppendToString(theEnv,";",
+                                 stringBuffer,&bufferPosition,&bufferMaximum);
+
+   if (fptr->restrictions == NULL)
+     {
+      stringBuffer = AppendToString(theEnv,"*",
+                                    stringBuffer,&bufferPosition,&bufferMaximum);
+     }
+   else
+     {
+      stringBuffer = AppendToString(theEnv,fptr->restrictions->contents,
+                                    stringBuffer,&bufferPosition,&bufferMaximum);
+     }
+
+   returnValue->lexemeValue = CreateString(theEnv,stringBuffer);
+
+   rm(theEnv,stringBuffer,bufferMaximum);
+  }
+
+/*************************************************/
+/* GetFunctionListFunction: H/L access routine   */
+/*   for the get-function-list function.         */
+/*************************************************/
+void GetFunctionListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   struct functionDefinition *theFunction;
+   Multifield *theList;
+   unsigned long functionCount = 0;
+
+   for (theFunction = GetFunctionList(theEnv);
+        theFunction != NULL;
+        theFunction = theFunction->next)
+     { functionCount++; }
+
+   returnValue->begin = 0;
+   returnValue->range = functionCount;
+   theList = CreateMultifield(theEnv,functionCount);
+   returnValue->value = theList;
+
+   for (theFunction = GetFunctionList(theEnv), functionCount = 0;
+        theFunction != NULL;
+        theFunction = theFunction->next, functionCount++)
+     {
+      theList->contents[functionCount].lexemeValue = theFunction->callFunctionName;
+     }
+  }
+
+/***************************************/
+/* FuncallFunction: H/L access routine */
+/*   for the funcall function.         */
+/***************************************/
+void FuncallFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   size_t j;
+   UDFValue theArg;
+   Expression theReference;
+   const char *name;
+   Multifield *theMultifield;
+   struct expr *lastAdd = NULL, *nextAdd, *multiAdd;
+   struct functionDefinition *theFunction = NULL;
+
+   /*==================================*/
+   /* Set up the default return value. */
+   /*==================================*/
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   /*============================================*/
+   /* Get the name of the function to be called. */
+   /*============================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&theArg))
+     { return; }
+
+   /*====================*/
+   /* Find the function. */
+   /*====================*/
+
+   name = theArg.lexemeValue->contents;
+   if (! GetFunctionReference(theEnv,name,&theReference))
+     {
+      ExpectedTypeError1(theEnv,"funcall",1,"function, deffunction, or generic function name");
+      return;
+     }
+
+   /*====================================*/
+   /* Functions with specialized parsers */
+   /* cannot be used with funcall.       */
+   /*====================================*/
+
+   if (theReference.type == FCALL)
+     {
+      theFunction = FindFunction(theEnv,name);
+      if (theFunction->parser != NULL)
+        {
+         ExpectedTypeError1(theEnv,"funcall",1,"function without specialized parser");
+         return;
+        }
+     }
+
+   /*======================================*/
+   /* Add the arguments to the expression. */
+   /*======================================*/
+
+   ExpressionInstall(theEnv,&theReference);
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,ANY_TYPE_BITS,&theArg))
+        {
+         ExpressionDeinstall(theEnv,&theReference);
+         return;
+        }
+
+      switch(theArg.header->type)
+        {
+         case MULTIFIELD_TYPE:
+           nextAdd = GenConstant(theEnv,FCALL,FindFunction(theEnv,"create$"));
+
+           if (lastAdd == NULL)
+             { theReference.argList = nextAdd; }
+           else
+             { lastAdd->nextArg = nextAdd; }
+           lastAdd = nextAdd;
+
+           multiAdd = NULL;
+           theMultifield = theArg.multifieldValue;
+           for (j = theArg.begin; j < (theArg.begin + theArg.range); j++)
+             {
+              nextAdd = GenConstant(theEnv,theMultifield->contents[j].header->type,
+                                           theMultifield->contents[j].value);
+              if (multiAdd == NULL)
+                { lastAdd->argList = nextAdd; }
+              else
+                { multiAdd->nextArg = nextAdd; }
+              multiAdd = nextAdd;
+             }
+
+           ExpressionInstall(theEnv,lastAdd);
+           break;
+
+         default:
+           nextAdd = GenConstant(theEnv,theArg.header->type,theArg.value);
+           if (lastAdd == NULL)
+             { theReference.argList = nextAdd; }
+           else
+             { lastAdd->nextArg = nextAdd; }
+           lastAdd = nextAdd;
+           ExpressionInstall(theEnv,lastAdd);
+           break;
+        }
+     }
+
+   /*===========================================================*/
+   /* Verify a deffunction has the correct number of arguments. */
+   /*===========================================================*/
+
+#if DEFFUNCTION_CONSTRUCT
+   if (theReference.type == PCALL)
+     {
+      if (CheckDeffunctionCall(theEnv,(Deffunction *) theReference.value,CountArguments(theReference.argList)) == false)
+        {
+         PrintErrorID(theEnv,"MISCFUN",4,false);
+         WriteString(theEnv,STDERR,"Function 'funcall' called with the wrong number of arguments for deffunction '");
+         WriteString(theEnv,STDERR,DeffunctionName((Deffunction *) theReference.value));
+         WriteString(theEnv,STDERR,"'.\n");
+         ExpressionDeinstall(theEnv,&theReference);
+         ReturnExpression(theEnv,theReference.argList);
+         return;
+        }
+     }
+#endif
+
+   /*=========================================*/
+   /* Verify the correct number of arguments. */
+   /*=========================================*/
+
+// TBD Support run time check of arguments
+#if ! RUN_TIME
+   if (theReference.type == FCALL)
+     {
+      if (CheckExpressionAgainstRestrictions(theEnv,&theReference,theFunction,name))
+        {
+         ExpressionDeinstall(theEnv,&theReference);
+         ReturnExpression(theEnv,theReference.argList);
+         return;
+        }
+     }
+#endif
+
+   /*======================*/
+   /* Call the expression. */
+   /*======================*/
+
+   EvaluateExpression(theEnv,&theReference,returnValue);
+
+   /*========================================*/
+   /* Return the expression data structures. */
+   /*========================================*/
+
+   ExpressionDeinstall(theEnv,&theReference);
+   ReturnExpression(theEnv,theReference.argList);
+  }
+
+/***********************************/
+/* NewFunction: H/L access routine */
+/*   for the new function.         */
+/***********************************/
+void NewFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   int theType;
+   UDFValue theValue;
+   const char *name;
+
+   /*==================================*/
+   /* Set up the default return value. */
+   /*==================================*/
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   /*====================================*/
+   /* Get the name of the language type. */
+   /*====================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theValue))
+     { return; }
+
+   /*=========================*/
+   /* Find the language type. */
+   /*=========================*/
+
+   name = theValue.lexemeValue->contents;
+
+   theType = FindLanguageType(theEnv,name);
+
+   if (theType == -1)
+     {
+      ExpectedTypeError1(theEnv,"new",1,"external language");
+      return;
+     }
+
+   /*====================================================*/
+   /* Invoke the new function for the specific language. */
+   /*====================================================*/
+
+   if ((EvaluationData(theEnv)->ExternalAddressTypes[theType] != NULL) &&
+       (EvaluationData(theEnv)->ExternalAddressTypes[theType]->newFunction != NULL))
+     { (*EvaluationData(theEnv)->ExternalAddressTypes[theType]->newFunction)(context,returnValue); }
+  }
+
+/************************************/
+/* CallFunction: H/L access routine */
+/*   for the new function.          */
+/************************************/
+void CallFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   int theType;
+   UDFValue theValue;
+   const char *name;
+   CLIPSExternalAddress *theEA;
+
+   /*==================================*/
+   /* Set up the default return value. */
+   /*==================================*/
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   /*=========================*/
+   /* Get the first argument. */
+   /*=========================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT | EXTERNAL_ADDRESS_BIT,&theValue))
+     { return; }
+
+   /*============================================*/
+   /* If the first argument is a symbol, then it */
+   /* should be an external language type.       */
+   /*============================================*/
+
+   if (theValue.header->type == SYMBOL_TYPE)
+     {
+      name = theValue.lexemeValue->contents;
+
+      theType = FindLanguageType(theEnv,name);
+
+      if (theType == -1)
+        {
+         ExpectedTypeError1(theEnv,"call",1,"external language symbol or external address");
+         return;
+        }
+
+      /*====================================================================*/
+      /* Invoke the call function for the specific language. Typically this */
+      /* will invoke a static method of a class (specified with the third   */
+      /* and second arguments to the call function.                         */
+      /*====================================================================*/
+
+      if ((EvaluationData(theEnv)->ExternalAddressTypes[theType] != NULL) &&
+          (EvaluationData(theEnv)->ExternalAddressTypes[theType]->callFunction != NULL))
+        { (*EvaluationData(theEnv)->ExternalAddressTypes[theType]->callFunction)(context,&theValue,returnValue); }
+
+      return;
+     }
+
+   /*===============================================*/
+   /* If the first argument is an external address, */
+   /* then we can determine the external language   */
+   /* type be examining the pointer.                */
+   /*===============================================*/
+
+   if (theValue.header->type == EXTERNAL_ADDRESS_TYPE)
+     {
+      theEA = theValue.externalAddressValue;
+
+      theType = theEA->type;
+
+      if ((EvaluationData(theEnv)->ExternalAddressTypes[theType] != NULL) &&
+          (EvaluationData(theEnv)->ExternalAddressTypes[theType]->callFunction != NULL))
+        { (*EvaluationData(theEnv)->ExternalAddressTypes[theType]->callFunction)(context,&theValue,returnValue); }
+
+      return;
+     }
+  }
+
+/*********************/
+/* FindLanguageType: */
+/*********************/
+static int FindLanguageType(
+  Environment *theEnv,
+  const char *languageName)
+  {
+   int theType;
+
+   for (theType = 0; theType < EvaluationData(theEnv)->numberOfAddressTypes; theType++)
+     {
+      if (strcmp(EvaluationData(theEnv)->ExternalAddressTypes[theType]->name,languageName) == 0)
+        { return(theType); }
+     }
+
+   return -1;
+  }
+
+/************************************/
+/* TimeFunction: H/L access routine */
+/*   for the time function.         */
+/************************************/
+void TimeFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   /*==================*/
+   /* Return the time. */
+   /*==================*/
+
+   returnValue->floatValue = CreateFloat(theEnv,gentime());
+  }
+
+/****************************************/
+/* ConvertTime: Function for converting */
+/*   time for local-time and gm-time.   */
+/****************************************/
+static void ConvertTime(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  struct tm *info)
+  {
+   returnValue->begin = 0;
+   returnValue->range = 9;
+   returnValue->value = CreateMultifield(theEnv,9L);
+   
+   returnValue->multifieldValue->contents[0].integerValue = CreateInteger(theEnv,info->tm_year + 1900);
+   returnValue->multifieldValue->contents[1].integerValue = CreateInteger(theEnv,info->tm_mon + 1);
+   returnValue->multifieldValue->contents[2].integerValue = CreateInteger(theEnv,info->tm_mday);
+   returnValue->multifieldValue->contents[3].integerValue = CreateInteger(theEnv,info->tm_hour);
+   returnValue->multifieldValue->contents[4].integerValue = CreateInteger(theEnv,info->tm_min);
+   returnValue->multifieldValue->contents[5].integerValue = CreateInteger(theEnv,info->tm_sec);
+
+   switch (info->tm_wday)
+     {
+      case 0:
+        returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"Sunday");
+        break;
+
+      case 1:
+        returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"Monday");
+        break;
+
+      case 2:
+        returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"Tuesday");
+        break;
+
+      case 3:
+        returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"Wednesday");
+        break;
+
+      case 4:
+        returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"Thursday");
+        break;
+
+      case 5:
+        returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"Friday");
+        break;
+
+      case 6:
+        returnValue->multifieldValue->contents[6].lexemeValue = CreateSymbol(theEnv,"Saturday");
+        break;
+     }
+
+   returnValue->multifieldValue->contents[7].integerValue = CreateInteger(theEnv,info->tm_yday);
+
+   if (info->tm_isdst > 0)
+     { returnValue->multifieldValue->contents[8].lexemeValue = TrueSymbol(theEnv); }
+   else if (info->tm_isdst == 0)
+     { returnValue->multifieldValue->contents[8].lexemeValue = FalseSymbol(theEnv); }
+   else
+     { returnValue->multifieldValue->contents[8].lexemeValue = CreateSymbol(theEnv,"UNKNOWN"); }
+  }
+
+/*****************************************/
+/* LocalTimeFunction: H/L access routine */
+/*   for the local-time function.        */
+/*****************************************/
+void LocalTimeFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   time_t rawtime;
+   struct tm *info;
+
+   /*=====================*/
+   /* Get the local time. */
+   /*=====================*/
+
+   time(&rawtime);
+   info = localtime(&rawtime);
+
+   ConvertTime(theEnv,returnValue,info);
+  }
+
+/**************************************/
+/* GMTimeFunction: H/L access routine */
+/*   for the gm-time function.        */
+/**************************************/
+void GMTimeFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   time_t rawtime;
+   struct tm *info;
+
+   /*=====================*/
+   /* Get the local time. */
+   /*=====================*/
+
+   time(&rawtime);
+   info = gmtime(&rawtime);
+
+   ConvertTime(theEnv,returnValue,info);
+  }
+
+/***************************************/
+/* TimerFunction: H/L access routine   */
+/*   for the timer function.           */
+/***************************************/
+void TimerFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   double startTime;
+   UDFValue theArg;
+
+   startTime = gentime();
+
+   while (UDFHasNextArgument(context) &&
+          (! GetHaltExecution(theEnv)))
+     { UDFNextArgument(context,ANY_TYPE_BITS,&theArg); }
+
+   returnValue->floatValue = CreateFloat(theEnv,gentime() - startTime);
+  }
+
+/***************************************/
+/* SystemCommand: H/L access routine   */
+/*   for the system function.          */
+/***************************************/
+void SystemCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   char *commandBuffer = NULL;
+   size_t bufferPosition = 0;
+   size_t bufferMaximum = 0;
+   UDFValue tempValue;
+   const char *theString;
+
+   /*============================================================*/
+   /* Concatenate the arguments together to form a single string */
+   /* containing the command to be sent to the operating system. */
+   /*============================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,LEXEME_BITS,&tempValue))
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+
+     theString = tempValue.lexemeValue->contents;
+
+     commandBuffer = AppendToString(theEnv,theString,commandBuffer,&bufferPosition,&bufferMaximum);
+    }
+
+   /*=======================================*/
+   /* Execute the operating system command. */
+   /*=======================================*/
+
+   returnValue->integerValue = CreateInteger(theEnv,gensystem(theEnv,commandBuffer));
+
+   /*==================================================*/
+   /* Return the string buffer containing the command. */
+   /*==================================================*/
+
+   if (commandBuffer != NULL)
+     { rm(theEnv,commandBuffer,bufferMaximum); }
+  }
+
+/****************************************/
+/* GetErrorFunction: H/L access routine */
+/*   for the geterror function.         */
+/****************************************/
+void GetErrorFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   CLIPSToUDFValue(&MiscFunctionData(theEnv)->errorCode,returnValue);
+  }
+
+/*****************/
+/* SetErrorValue */
+/*****************/
+void SetErrorValue(
+  Environment *theEnv,
+  TypeHeader *theValue)
+  {
+   Release(theEnv,MiscFunctionData(theEnv)->errorCode.header);
+   
+   if (theValue == NULL)
+     { MiscFunctionData(theEnv)->errorCode.lexemeValue = FalseSymbol(theEnv); }
+   else
+     { MiscFunctionData(theEnv)->errorCode.header = theValue; }
+     
+   Retain(theEnv,MiscFunctionData(theEnv)->errorCode.header);
+  }
+
+/*******************/
+/* ClearErrorValue */
+/*******************/
+void ClearErrorValue(
+  Environment *theEnv)
+  {
+   Release(theEnv,MiscFunctionData(theEnv)->errorCode.header);
+   MiscFunctionData(theEnv)->errorCode.lexemeValue = FalseSymbol(theEnv);
+   Retain(theEnv,MiscFunctionData(theEnv)->errorCode.header);
+  }
+
+/******************************************/
+/* ClearErrorFunction: H/L access routine */
+/*   for the clear-error function.        */
+/******************************************/
+void ClearErrorFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   CLIPSToUDFValue(&MiscFunctionData(theEnv)->errorCode,returnValue);
+   ClearErrorValue(theEnv);
+  }
+
+/****************************************/
+/* SetErrorFunction: H/L access routine */
+/*   for the set-error function.        */
+/****************************************/
+void SetErrorFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   CLIPSValue cv;
+   UDFValue theArg;
+   
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+     
+   NormalizeMultifield(theEnv,&theArg);
+   cv.value = theArg.value;
+   SetErrorValue(theEnv,cv.header);
+  }
+
+/************************************/
+/* VoidFunction: H/L access routine */
+/*   for the void function.         */
+/************************************/
+void VoidFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->voidValue = VoidConstant(theEnv);
+  }
diff --git a/clips/miscfun.h b/clips/miscfun.h
new file mode 100755
index 000000000..ee67ee555
--- /dev/null
+++ b/clips/miscfun.h
@@ -0,0 +1,132 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/17/18            */
+   /*                                                     */
+   /*          MISCELLANEOUS FUNCTIONS HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES,        */
+/*            DYNAMIC_SALIENCE, INCREMENTAL_RESET,           */
+/*            LOGICAL_DEPENDENCIES, IMPERATIVE_METHODS       */
+/*            INSTANCE_PATTERN_MATCHING,                     */
+/*            IMPERATIVE_MESSAGE_HANDLERS, and               */
+/*            AUXILIARY_MESSAGE_HANDLERS compilation flags.  */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems.                   */
+/*                                                           */
+/*            Renamed EX_MATH compiler flag to               */
+/*            EXTENDED_MATH_FUNCTIONS.                       */
+/*                                                           */
+/*            Combined BASIC_IO and EXT_IO compilation       */
+/*            flags into the IO_FUNCTIONS compilation flag.  */
+/*                                                           */
+/*            Removed code associated with HELP_FUNCTIONS    */
+/*            and EMACS_EDITOR compiler flags.               */
+/*                                                           */
+/*            Added operating-system function.               */
+/*                                                           */
+/*            Added new function (for future use).           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Added local-time and gm-time functions.        */
+/*                                                           */
+/*      6.40: Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added get-error, set-error, and clear-error    */
+/*            functions.                                     */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_miscfun
+
+#pragma once
+
+#define _H_miscfun
+
+   void                           MiscFunctionDefinitions(Environment *);
+   void                           ExitCommand(Environment *,UDFContext *,UDFValue *);
+   void                           CreateFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SetgenFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GensymFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GensymStarFunction(Environment *,UDFContext *,UDFValue *);
+   void                           RandomFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SeedFunction(Environment *,UDFContext *,UDFValue *);
+   void                           LengthFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ConserveMemCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ReleaseMemCommand(Environment *,UDFContext *,UDFValue *);
+   void                           MemUsedCommand(Environment *,UDFContext *,UDFValue *);
+   void                           MemRequestsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           OptionsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           OperatingSystemFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ExpandFuncCall(Environment *,UDFContext *,UDFValue *);
+   void                           DummyExpandFuncMultifield(Environment *,UDFContext *,UDFValue *);
+   void                           CauseEvaluationError(Environment *,UDFContext *,UDFValue *);
+   void                           SetSORCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetSORCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetFunctionRestrictions(Environment *,UDFContext *,UDFValue *);
+   void                           AproposCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GensymStar(Environment *,UDFValue *);
+   void                           GetFunctionListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           FuncallFunction(Environment *,UDFContext *,UDFValue *);
+   void                           NewFunction(Environment *,UDFContext *,UDFValue *);
+   void                           CallFunction(Environment *,UDFContext *,UDFValue *);
+   void                           TimerFunction(Environment *,UDFContext *,UDFValue *);
+   void                           TimeFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SystemCommand(Environment *,UDFContext *,UDFValue *);
+   void                           LocalTimeFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GMTimeFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetErrorFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ClearErrorValue(Environment *);
+   void                           ClearErrorFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SetErrorFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SetErrorValue(Environment *,TypeHeader *);
+   void                           VoidFunction(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_miscfun */
+
+
+
+
+
+
diff --git a/clips/modulbin.c b/clips/modulbin.c
new file mode 100755
index 000000000..10aa490f0
--- /dev/null
+++ b/clips/modulbin.c
@@ -0,0 +1,607 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*             DEFMODULE BSAVE/BLOAD MODULE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for the  */
+/*    defmodule construct.                                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+
+#include <stdio.h>
+
+#include "bload.h"
+#include "bsave.h"
+#include "constrct.h"
+#include "cstrcbin.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "moduldef.h"
+
+#include "modulbin.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                    BsaveFind(Environment *);
+   static void                    BsaveStorage(Environment *,FILE *);
+   static void                    BsaveBinaryItem(Environment *,FILE *);
+#endif
+   static void                    BloadStorage(Environment *);
+   static void                    BloadBinaryItem(Environment *);
+   static void                    UpdateDefmodule(Environment *,void *,unsigned long);
+   static void                    UpdatePortItem(Environment *,void *,unsigned long);
+   static void                    ClearBload(Environment *);
+
+/*********************************************/
+/* DefmoduleBinarySetup: Installs the binary */
+/*   save/load feature for defmodules.       */
+/*********************************************/
+void DefmoduleBinarySetup(
+  Environment *theEnv)
+  {
+   AddBeforeBloadFunction(theEnv,"defmodule",RemoveAllDefmodules,2000,NULL);
+
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"defmodule",0,BsaveFind,NULL,
+                             BsaveStorage,BsaveBinaryItem,
+                             BloadStorage,BloadBinaryItem,
+                             ClearBload);
+#endif
+
+   AddAbortBloadFunction(theEnv,"defmodule",CreateMainModule,0,NULL);
+
+#if (BLOAD || BLOAD_ONLY)
+   AddBinaryItem(theEnv,"defmodule",0,NULL,NULL,NULL,NULL,
+                             BloadStorage,BloadBinaryItem,
+                             ClearBload);
+#endif
+  }
+
+/**************************************************************/
+/* UpdateDefmoduleItemHeader: Updates the values in defmodule */
+/*   item headers for the loaded binary image.                */
+/**************************************************************/
+void UpdateDefmoduleItemHeader(
+  Environment *theEnv,
+  struct bsaveDefmoduleItemHeader *theBsaveHeader,
+  struct defmoduleItemHeader *theHeader,
+  size_t itemSize,
+  void *itemArray)
+  {
+   size_t firstOffset, lastOffset;
+
+   theHeader->theModule = ModulePointer(theBsaveHeader->theModule);
+   if (theBsaveHeader->firstItem == ULONG_MAX)
+     {
+      theHeader->firstItem = NULL;
+      theHeader->lastItem = NULL;
+     }
+   else
+     {
+      firstOffset = itemSize * theBsaveHeader->firstItem;
+      lastOffset = itemSize * theBsaveHeader->lastItem;
+      theHeader->firstItem =
+        (ConstructHeader *) &((char *) itemArray)[firstOffset];
+      theHeader->lastItem =
+        (ConstructHeader *) &((char *) itemArray)[lastOffset];
+     }
+  }
+
+#if BLOAD_AND_BSAVE
+
+/*********************************************************/
+/* AssignBsaveDefmdlItemHdrVals: Assigns the appropriate */
+/*   values to a bsave defmodule item header record.     */
+/*********************************************************/
+void AssignBsaveDefmdlItemHdrVals(
+  struct bsaveDefmoduleItemHeader *theBsaveHeader,
+  struct defmoduleItemHeader *theHeader)
+  {
+   theBsaveHeader->theModule = theHeader->theModule->header.bsaveID;
+   if (theHeader->firstItem == NULL)
+     {
+      theBsaveHeader->firstItem = ULONG_MAX;
+      theBsaveHeader->lastItem = ULONG_MAX;
+     }
+   else
+     {
+      theBsaveHeader->firstItem = theHeader->firstItem->bsaveID;
+      theBsaveHeader->lastItem = theHeader->lastItem->bsaveID;
+     }
+  }
+
+/**********************************************************/
+/* BsaveFind: Counts the number of data structures which  */
+/*   must be saved in the binary image for the defmodules */
+/*   in the current environment.                          */
+/**********************************************************/
+static void BsaveFind(
+  Environment *theEnv)
+  {
+   Defmodule *defmodulePtr;
+   struct portItem *theList;
+
+   /*=======================================================*/
+   /* If a binary image is already loaded, then temporarily */
+   /* save the count values since these will be overwritten */
+   /* in the process of saving the binary image.            */
+   /*=======================================================*/
+
+   SaveBloadCount(theEnv,DefmoduleData(theEnv)->BNumberOfDefmodules);
+   SaveBloadCount(theEnv,DefmoduleData(theEnv)->NumberOfPortItems);
+
+   /*==========================================*/
+   /* Set the count of defmodule and defmodule */
+   /* port items data structures to zero.      */
+   /*==========================================*/
+
+   DefmoduleData(theEnv)->BNumberOfDefmodules = 0;
+   DefmoduleData(theEnv)->NumberOfPortItems = 0;
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (defmodulePtr = GetNextDefmodule(theEnv,NULL);
+        defmodulePtr != NULL;
+        defmodulePtr = GetNextDefmodule(theEnv,defmodulePtr))
+     {
+      /*==============================================*/
+      /* Increment the number of modules encountered. */
+      /*==============================================*/
+
+      DefmoduleData(theEnv)->BNumberOfDefmodules++;
+
+      /*===========================*/
+      /* Mark the defmodule's name */
+      /* as being a needed symbol. */
+      /*===========================*/
+
+      MarkConstructHeaderNeededItems(&defmodulePtr->header,defmodulePtr->header.bsaveID);
+         
+      /*==============================================*/
+      /* Loop through each of the port items in the   */
+      /* defmodule's import list incrementing the     */
+      /* number of port items encountered and marking */
+      /* needed symbols.                              */
+      /*==============================================*/
+
+      for (theList = defmodulePtr->importList;
+           theList != NULL;
+           theList = theList->next)
+        {
+         DefmoduleData(theEnv)->NumberOfPortItems++;
+         if (theList->moduleName != NULL)
+           { theList->moduleName->neededSymbol = true; }
+         if (theList->constructType != NULL)
+           { theList->constructType->neededSymbol = true; }
+         if (theList->constructName != NULL)
+           { theList->constructName->neededSymbol = true; }
+        }
+
+      /*==============================================*/
+      /* Loop through each of the port items in the   */
+      /* defmodule's export list incrementing the     */
+      /* number of port items encountered and marking */
+      /* needed symbols.                              */
+      /*==============================================*/
+
+      for (theList = defmodulePtr->exportList;
+           theList != NULL;
+           theList = theList->next)
+        {
+         DefmoduleData(theEnv)->NumberOfPortItems++;
+         if (theList->moduleName != NULL)
+           { theList->moduleName->neededSymbol = true; }
+         if (theList->constructType != NULL)
+           { theList->constructType->neededSymbol = true; }
+         if (theList->constructName != NULL)
+           { theList->constructName->neededSymbol = true; }
+        }
+     }
+  }
+
+/*********************************************************/
+/* BsaveStorage: Writes out the storage requirements for */
+/*    all defmodule structures to the binary file.       */
+/*********************************************************/
+static void BsaveStorage(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+
+   space = sizeof(long) * 2;
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&DefmoduleData(theEnv)->BNumberOfDefmodules,sizeof(long),fp);
+   GenWrite(&DefmoduleData(theEnv)->NumberOfPortItems,sizeof(long),fp);
+  }
+
+/*********************************************/
+/* BsaveBinaryItem: Writes out all defmodule */
+/*   structures to the binary file.          */
+/*********************************************/
+static void BsaveBinaryItem(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   Defmodule *defmodulePtr;
+   struct bsaveDefmodule newDefmodule;
+   struct bsavePortItem newPortItem;
+   struct portItem *theList;
+
+   /*=========================================================*/
+   /* Write out the amount of space taken up by the defmodule */
+   /* and port item data structures in the binary image.      */
+   /*=========================================================*/
+
+   space = DefmoduleData(theEnv)->BNumberOfDefmodules * sizeof(struct bsaveDefmodule);
+   space += DefmoduleData(theEnv)->NumberOfPortItems * sizeof(struct bsavePortItem);
+   GenWrite(&space,sizeof(size_t),fp);
+
+   /*==========================================*/
+   /* Write out each defmodule data structure. */
+   /*==========================================*/
+
+   DefmoduleData(theEnv)->BNumberOfDefmodules = 0;
+   DefmoduleData(theEnv)->NumberOfPortItems = 0;
+   for (defmodulePtr = GetNextDefmodule(theEnv,NULL);
+        defmodulePtr != NULL;
+        defmodulePtr = GetNextDefmodule(theEnv,defmodulePtr))
+     {
+      AssignBsaveConstructHeaderVals(&newDefmodule.header,&defmodulePtr->header);
+
+      DefmoduleData(theEnv)->BNumberOfDefmodules++;
+      
+      if (defmodulePtr->importList == NULL)
+        { newDefmodule.importList = ULONG_MAX; }
+      else
+        {
+         newDefmodule.importList = DefmoduleData(theEnv)->NumberOfPortItems;
+         for (theList = defmodulePtr->importList;
+              theList != NULL;
+              theList = theList->next)
+           { DefmoduleData(theEnv)->NumberOfPortItems++; }
+        }
+
+      if (defmodulePtr->exportList == NULL)
+        { newDefmodule.exportList = ULONG_MAX; }
+      else
+        {
+         newDefmodule.exportList = DefmoduleData(theEnv)->NumberOfPortItems;
+         for (theList = defmodulePtr->exportList;
+              theList != NULL;
+              theList = theList->next)
+           { DefmoduleData(theEnv)->NumberOfPortItems++; }
+        }
+
+      newDefmodule.bsaveID = defmodulePtr->header.bsaveID;
+      GenWrite(&newDefmodule,sizeof(struct bsaveDefmodule),fp);
+     }
+
+   /*==========================================*/
+   /* Write out each port item data structure. */
+   /*==========================================*/
+
+   DefmoduleData(theEnv)->NumberOfPortItems = 0;
+   defmodulePtr = GetNextDefmodule(theEnv,NULL);
+   while (defmodulePtr != NULL)
+     {
+      for (theList = defmodulePtr->importList;
+           theList != NULL;
+           theList = theList->next)
+        {
+         DefmoduleData(theEnv)->NumberOfPortItems++;
+         if (theList->moduleName == NULL) newPortItem.moduleName = ULONG_MAX;
+         else newPortItem.moduleName = theList->moduleName->bucket;
+
+         if (theList->constructType == NULL) newPortItem.constructType = ULONG_MAX;
+         else newPortItem.constructType = theList->constructType->bucket;
+
+         if (theList->constructName == NULL) newPortItem.constructName = ULONG_MAX;
+         else newPortItem.constructName = theList->constructName->bucket;
+
+         if (theList->next == NULL) newPortItem.next = ULONG_MAX;
+         else newPortItem.next = DefmoduleData(theEnv)->NumberOfPortItems;
+
+         GenWrite(&newPortItem,sizeof(struct bsavePortItem),fp);
+        }
+
+      for (theList = defmodulePtr->exportList;
+           theList != NULL;
+           theList = theList->next)
+        {
+         DefmoduleData(theEnv)->NumberOfPortItems++;
+         if (theList->moduleName == NULL) newPortItem.moduleName = ULONG_MAX;
+         else newPortItem.moduleName = theList->moduleName->bucket;
+
+         if (theList->constructType == NULL) newPortItem.constructType = ULONG_MAX;
+         else newPortItem.constructType = theList->constructType->bucket;
+
+         if (theList->constructName == NULL) newPortItem.constructName = ULONG_MAX;
+         else newPortItem.constructName = theList->constructName->bucket;
+
+         if (theList->next == NULL) newPortItem.next = ULONG_MAX;
+         else newPortItem.next = DefmoduleData(theEnv)->NumberOfPortItems;
+
+         GenWrite(&newPortItem,sizeof(struct bsavePortItem),fp);
+        }
+
+      defmodulePtr = GetNextDefmodule(theEnv,defmodulePtr);
+     }
+
+   /*=============================================================*/
+   /* If a binary image was already loaded when the bsave command */
+   /* was issued, then restore the counts indicating the number   */
+   /* of defmodule and port items in the binary image (these were */
+   /* overwritten by the binary save).                            */
+   /*=============================================================*/
+
+   RestoreBloadCount(theEnv,&DefmoduleData(theEnv)->BNumberOfDefmodules);
+   RestoreBloadCount(theEnv,&DefmoduleData(theEnv)->NumberOfPortItems);
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+/**********************************************************/
+/* BloadStorage: Allocates storage requirements for the   */
+/*   defmodules and port items used by this binary image. */
+/**********************************************************/
+static void BloadStorage(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*=======================================*/
+   /* Determine the number of defmodule and */
+   /* port item data structures to be read. */
+   /*=======================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   GenReadBinary(theEnv,&DefmoduleData(theEnv)->BNumberOfDefmodules,sizeof(unsigned long));
+   GenReadBinary(theEnv,&DefmoduleData(theEnv)->NumberOfPortItems,sizeof(unsigned long));
+
+   /*================================*/
+   /* Allocate the space needed for  */
+   /* the defmodule data structures. */
+   /*================================*/
+
+   if (DefmoduleData(theEnv)->BNumberOfDefmodules == 0)
+     {
+      DefmoduleData(theEnv)->DefmoduleArray = NULL;
+      return;
+     }
+
+   space = (DefmoduleData(theEnv)->BNumberOfDefmodules * sizeof(Defmodule));
+   DefmoduleData(theEnv)->DefmoduleArray = (Defmodule *) genalloc(theEnv,space);
+
+   /*================================*/
+   /* Allocate the space needed for  */
+   /* the port item data structures. */
+   /*================================*/
+
+   if (DefmoduleData(theEnv)->NumberOfPortItems == 0)
+     {
+      DefmoduleData(theEnv)->PortItemArray = NULL;
+      return;
+     }
+
+   space = (DefmoduleData(theEnv)->NumberOfPortItems * sizeof(struct portItem));
+   DefmoduleData(theEnv)->PortItemArray = (struct portItem *) genalloc(theEnv,space);
+  }
+
+/********************************************/
+/* BloadBinaryItem: Loads and refreshes the */
+/*   defmodules used by this binary image.  */
+/********************************************/
+static void BloadBinaryItem(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   if (DefmoduleData(theEnv)->BNumberOfDefmodules == 0) return;
+
+   BloadandRefresh(theEnv,DefmoduleData(theEnv)->BNumberOfDefmodules,sizeof(struct bsaveDefmodule),UpdateDefmodule);
+   BloadandRefresh(theEnv,DefmoduleData(theEnv)->NumberOfPortItems,sizeof(struct bsavePortItem),UpdatePortItem);
+
+   SetListOfDefmodules(theEnv,DefmoduleData(theEnv)->DefmoduleArray);
+   SetCurrentModule(theEnv,GetNextDefmodule(theEnv,NULL));
+  }
+
+/******************************************/
+/* UpdateDefmodule: Bload refresh routine */
+/*   for defmodule data structure.        */
+/******************************************/
+static void UpdateDefmodule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveDefmodule *bdp;
+   struct moduleItem *theItem;
+   unsigned int i;
+
+   bdp = (struct bsaveDefmodule *) buf;
+   
+   UpdateConstructHeader(theEnv,&bdp->header,&DefmoduleData(theEnv)->DefmoduleArray[obji].header,DEFMODULE,
+                         0,NULL,sizeof(Defmodule),DefmoduleData(theEnv)->DefmoduleArray);
+
+   if (GetNumberOfModuleItems(theEnv) == 0)
+     { DefmoduleData(theEnv)->DefmoduleArray[obji].itemsArray = NULL; }
+   else
+     {
+      DefmoduleData(theEnv)->DefmoduleArray[obji].itemsArray =
+         (struct defmoduleItemHeader **) gm2(theEnv,sizeof(void *) * GetNumberOfModuleItems(theEnv));
+     }
+
+   for (i = 0, theItem = GetListOfModuleItems(theEnv);
+        (i < GetNumberOfModuleItems(theEnv)) && (theItem != NULL) ;
+        i++, theItem = theItem->next)
+     {
+      if (theItem->bloadModuleReference == NULL)
+        { DefmoduleData(theEnv)->DefmoduleArray[obji].itemsArray[i] = NULL; }
+      else
+        {
+         DefmoduleData(theEnv)->DefmoduleArray[obji].itemsArray[i] =
+             (struct defmoduleItemHeader *)
+             (*theItem->bloadModuleReference)(theEnv,obji);
+        }
+     }
+
+   DefmoduleData(theEnv)->DefmoduleArray[obji].header.ppForm = NULL;
+
+   if (bdp->importList != ULONG_MAX)
+     { DefmoduleData(theEnv)->DefmoduleArray[obji].importList = (struct portItem *) &DefmoduleData(theEnv)->PortItemArray[bdp->importList]; }
+   else
+     { DefmoduleData(theEnv)->DefmoduleArray[obji].importList = NULL; }
+
+   if (bdp->exportList != ULONG_MAX)
+     { DefmoduleData(theEnv)->DefmoduleArray[obji].exportList = (struct portItem *) &DefmoduleData(theEnv)->PortItemArray[bdp->exportList]; }
+   else
+     { DefmoduleData(theEnv)->DefmoduleArray[obji].exportList = NULL; }
+   DefmoduleData(theEnv)->DefmoduleArray[obji].header.bsaveID = bdp->bsaveID;
+  }
+
+/*****************************************/
+/* UpdatePortItem: Bload refresh routine */
+/*   for port item data structure.       */
+/*****************************************/
+static void UpdatePortItem(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsavePortItem *bdp;
+
+   bdp = (struct bsavePortItem *) buf;
+
+   if (bdp->moduleName != ULONG_MAX)
+     {
+      DefmoduleData(theEnv)->PortItemArray[obji].moduleName = SymbolPointer(bdp->moduleName);
+      IncrementLexemeCount(DefmoduleData(theEnv)->PortItemArray[obji].moduleName);
+     }
+   else
+     { DefmoduleData(theEnv)->PortItemArray[obji].moduleName = NULL; }
+
+   if (bdp->constructType != ULONG_MAX)
+     {
+      DefmoduleData(theEnv)->PortItemArray[obji].constructType = SymbolPointer(bdp->constructType);
+      IncrementLexemeCount(DefmoduleData(theEnv)->PortItemArray[obji].constructType);
+     }
+   else
+     { DefmoduleData(theEnv)->PortItemArray[obji].constructType = NULL; }
+
+   if (bdp->constructName != ULONG_MAX)
+     {
+      DefmoduleData(theEnv)->PortItemArray[obji].constructName = SymbolPointer(bdp->constructName);
+      IncrementLexemeCount(DefmoduleData(theEnv)->PortItemArray[obji].constructName);
+     }
+   else
+     { DefmoduleData(theEnv)->PortItemArray[obji].constructName = NULL; }
+
+   if (bdp->next != ULONG_MAX)
+     { DefmoduleData(theEnv)->PortItemArray[obji].next = (struct portItem *) &DefmoduleData(theEnv)->PortItemArray[bdp->next]; }
+   else
+     { DefmoduleData(theEnv)->PortItemArray[obji].next = NULL; }
+  }
+
+/***************************************/
+/* ClearBload: Defmodule clear routine */
+/*   when a binary load is in effect.  */
+/***************************************/
+static void ClearBload(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   size_t space;
+   struct portItem *theList;
+
+   /*===========================*/
+   /* Decrement in use counters */
+   /* used by the binary image. */
+   /*===========================*/
+
+   for (i = 0; i < DefmoduleData(theEnv)->BNumberOfDefmodules; i++)
+     {
+      ReleaseLexeme(theEnv,DefmoduleData(theEnv)->DefmoduleArray[i].header.name);
+      for (theList = DefmoduleData(theEnv)->DefmoduleArray[i].importList;
+           theList != NULL;
+           theList = theList->next)
+        {
+         if (theList->moduleName != NULL) ReleaseLexeme(theEnv,theList->moduleName);
+         if (theList->constructType != NULL) ReleaseLexeme(theEnv,theList->constructType);
+         if (theList->constructName != NULL) ReleaseLexeme(theEnv,theList->constructName);
+        }
+
+      for (theList = DefmoduleData(theEnv)->DefmoduleArray[i].exportList;
+           theList != NULL;
+           theList = theList->next)
+        {
+         if (theList->moduleName != NULL) ReleaseLexeme(theEnv,theList->moduleName);
+         if (theList->constructType != NULL) ReleaseLexeme(theEnv,theList->constructType);
+         if (theList->constructName != NULL) ReleaseLexeme(theEnv,theList->constructName);
+        }
+
+      rm(theEnv,DefmoduleData(theEnv)->DefmoduleArray[i].itemsArray,sizeof(void *) * GetNumberOfModuleItems(theEnv));
+     }
+
+   /*================================*/
+   /* Deallocate the space used for  */
+   /* the defmodule data structures. */
+   /*================================*/
+
+   space = DefmoduleData(theEnv)->BNumberOfDefmodules * sizeof(Defmodule);
+   if (space != 0) genfree(theEnv,DefmoduleData(theEnv)->DefmoduleArray,space);
+   DefmoduleData(theEnv)->BNumberOfDefmodules = 0;
+
+   /*================================*/
+   /* Deallocate the space used for  */
+   /* the port item data structures. */
+   /*================================*/
+
+   space = DefmoduleData(theEnv)->NumberOfPortItems * sizeof(struct portItem);
+   if (space != 0) genfree(theEnv,DefmoduleData(theEnv)->PortItemArray,space);
+   DefmoduleData(theEnv)->NumberOfPortItems = 0;
+
+   /*===========================*/
+   /* Reset module information. */
+   /*===========================*/
+
+   SetListOfDefmodules(theEnv,NULL);
+   CreateMainModule(theEnv,NULL);
+   DefmoduleData(theEnv)->MainModuleRedefinable = true;
+  }
+
+#endif /*  (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME) */
+
+
diff --git a/clips/modulbin.h b/clips/modulbin.h
new file mode 100755
index 000000000..387f2367e
--- /dev/null
+++ b/clips/modulbin.h
@@ -0,0 +1,84 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*           DEFMODULE BSAVE/BLOAD HEADER FILE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_modulbin
+
+#pragma once
+
+#define _H_modulbin
+
+#include "moduldef.h"
+#include "modulbin.h"
+#include "cstrcbin.h"
+
+#if (! RUN_TIME)
+
+struct bsaveDefmodule
+  {
+   struct bsaveConstructHeader header;
+   unsigned long importList;
+   unsigned long exportList;
+   unsigned long bsaveID;
+  };
+
+struct bsaveDefmoduleItemHeader
+  {
+   unsigned long theModule;
+   unsigned long firstItem;
+   unsigned long lastItem;
+  };
+
+struct bsavePortItem
+  {
+   unsigned long moduleName;
+   unsigned long constructType;
+   unsigned long constructName;
+   unsigned long next;
+  };
+
+#define ModulePointer(i) ((Defmodule *) (&DefmoduleData(theEnv)->DefmoduleArray[i]))
+
+   void                           DefmoduleBinarySetup(Environment *);
+   void                           UpdateDefmoduleItemHeader
+                                                 (Environment *,struct bsaveDefmoduleItemHeader *,
+                                                  struct defmoduleItemHeader *,size_t,void *);
+
+#if BLOAD_AND_BSAVE
+   void                           AssignBsaveDefmdlItemHdrVals
+                                                 (struct bsaveDefmoduleItemHeader *,
+                                                  struct defmoduleItemHeader *);
+#endif
+
+#endif /* RUN_TIME */
+
+#endif /* _H_modulbin */
+
+
+
diff --git a/clips/modulbsc.c b/clips/modulbsc.c
new file mode 100755
index 000000000..d98758111
--- /dev/null
+++ b/clips/modulbsc.c
@@ -0,0 +1,345 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*         DEFMODULE BASIC COMMANDS HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements core commands for the defmodule       */
+/*   construct such as clear, reset, save, ppdefmodule       */
+/*   list-defmodules, and get-defmodule-list.                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "bload.h"
+#include "constrct.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "modulbin.h"
+#include "modulcmp.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "modulbsc.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ClearDefmodules(Environment *,void *);
+#if DEFMODULE_CONSTRUCT
+   static void                    SaveDefmodules(Environment *,Defmodule *,const char *,void *);
+#endif
+
+/*****************************************************************/
+/* DefmoduleBasicCommands: Initializes basic defmodule commands. */
+/*****************************************************************/
+void DefmoduleBasicCommands(
+  Environment *theEnv)
+  {
+   AddClearFunction(theEnv,"defmodule",ClearDefmodules,2000,NULL);
+
+#if DEFMODULE_CONSTRUCT
+   AddSaveFunction(theEnv,"defmodule",SaveDefmodules,1100,NULL);
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"get-defmodule-list","m",0,0,NULL,GetDefmoduleListFunction,"GetDefmoduleListFunction",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"list-defmodules","v",0,0,NULL,ListDefmodulesCommand,"ListDefmodulesCommand",NULL);
+   AddUDF(theEnv,"ppdefmodule","v",1,2,";y;ldsyn",PPDefmoduleCommand,"PPDefmoduleCommand",NULL);
+#endif
+#endif
+#endif
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+   DefmoduleBinarySetup(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   DefmoduleCompilerSetup(theEnv);
+#endif
+  }
+
+/*********************************************************/
+/* ClearDefmodules: Defmodule clear routine for use with */
+/*   the clear command. Creates the MAIN module.         */
+/*********************************************************/
+static void ClearDefmodules(
+  Environment *theEnv,
+  void *context)
+  {
+#if (BLOAD || BLOAD_AND_BSAVE || BLOAD_ONLY) && (! RUN_TIME)
+   if (Bloaded(theEnv) == true) return;
+#endif
+#if (! RUN_TIME)
+   RemoveAllDefmodules(theEnv,NULL);
+
+   CreateMainModule(theEnv,NULL);
+   DefmoduleData(theEnv)->MainModuleRedefinable = true;
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+#if DEFMODULE_CONSTRUCT
+
+/******************************************/
+/* SaveDefmodules: Defmodule save routine */
+/*   for use with the save command.       */
+/******************************************/
+static void SaveDefmodules(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logicalName,
+  void *context)
+  {
+   const char *ppform;
+
+   ppform = DefmodulePPForm(theModule);
+   if (ppform != NULL)
+     {
+      WriteString(theEnv,logicalName,ppform);
+      WriteString(theEnv,logicalName,"\n");
+     }
+  }
+
+/************************************************/
+/* GetDefmoduleListFunction: H/L access routine */
+/*   for the get-defmodule-list function.       */
+/************************************************/
+void GetDefmoduleListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   CLIPSValue result;
+   
+   GetDefmoduleList(theEnv,&result);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/******************************************/
+/* GetDefmoduleList: C access routine     */
+/*   for the get-defmodule-list function. */
+/******************************************/
+void GetDefmoduleList(
+  Environment *theEnv,
+  CLIPSValue *returnValue)
+  {
+   Defmodule *theConstruct;
+   unsigned long count = 0;
+   Multifield *theList;
+
+   /*====================================*/
+   /* Determine the number of constructs */
+   /* of the specified type.             */
+   /*====================================*/
+
+   for (theConstruct = GetNextDefmodule(theEnv,NULL);
+        theConstruct != NULL;
+        theConstruct = GetNextDefmodule(theEnv,theConstruct))
+     { count++; }
+
+   /*===========================*/
+   /* Create a multifield large */
+   /* enough to store the list. */
+   /*===========================*/
+
+   theList = CreateMultifield(theEnv,count);
+   returnValue->value = theList;
+
+   /*====================================*/
+   /* Store the names in the multifield. */
+   /*====================================*/
+
+   for (theConstruct = GetNextDefmodule(theEnv,NULL), count = 0;
+        theConstruct != NULL;
+        theConstruct = GetNextDefmodule(theEnv,theConstruct), count++)
+     {
+      if (EvaluationData(theEnv)->HaltExecution == true)
+        {
+         returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+         return;
+        }
+      theList->contents[count].lexemeValue = CreateSymbol(theEnv,DefmoduleName(theConstruct));
+     }
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/********************************************/
+/* PPDefmoduleCommand: H/L access routine   */
+/*   for the ppdefmodule command.           */
+/********************************************/
+void PPDefmoduleCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *defmoduleName;
+   const char *logicalName;
+   const char *ppForm;
+
+   defmoduleName = GetConstructName(context,"ppdefmodule","defmodule name");
+   if (defmoduleName == NULL) return;
+
+   if (UDFHasNextArgument(context))
+     {
+      logicalName = GetLogicalName(context,STDOUT);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"ppdefmodule");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+     }
+   else
+     { logicalName = STDOUT; }
+
+   if (strcmp(logicalName,"nil") == 0)
+     {
+      ppForm = PPDefmoduleNil(theEnv,defmoduleName);
+      
+      if (ppForm == NULL)
+        { CantFindItemErrorMessage(theEnv,"defmodule",defmoduleName,true); }
+
+      returnValue->lexemeValue = CreateString(theEnv,ppForm);
+      
+      return;
+     }
+
+   PPDefmodule(theEnv,defmoduleName,logicalName);
+
+   return;
+  }
+
+/****************************************/
+/* PPDefmoduleNil: C access routine for */
+/*   the ppdefmodule command.           */
+/****************************************/
+const char *PPDefmoduleNil(
+  Environment *theEnv,
+  const char *defmoduleName)
+  {
+   Defmodule *defmodulePtr;
+
+   defmodulePtr = FindDefmodule(theEnv,defmoduleName);
+   if (defmodulePtr == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defmodule",defmoduleName,true);
+      return NULL;
+     }
+
+   if (DefmodulePPForm(defmodulePtr) == NULL) return "";
+   
+   return DefmodulePPForm(defmodulePtr);
+  }
+
+/*************************************/
+/* PPDefmodule: C access routine for */
+/*   the ppdefmodule command.        */
+/*************************************/
+bool PPDefmodule(
+  Environment *theEnv,
+  const char *defmoduleName,
+  const char *logicalName)
+  {
+   Defmodule *defmodulePtr;
+
+   defmodulePtr = FindDefmodule(theEnv,defmoduleName);
+   if (defmodulePtr == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defmodule",defmoduleName,true);
+      return false;
+     }
+
+   if (DefmodulePPForm(defmodulePtr) == NULL) return true;
+   WriteString(theEnv,logicalName,DefmodulePPForm(defmodulePtr));
+
+   return true;
+  }
+
+/***********************************************/
+/* ListDefmodulesCommand: H/L access routine   */
+/*   for the list-defmodules command.          */
+/***********************************************/
+void ListDefmodulesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListDefmodules(theEnv,STDOUT);
+  }
+
+/**************************************/
+/* ListDefmodules: C access routine   */
+/*   for the list-defmodules command. */
+/**************************************/
+void ListDefmodules(
+  Environment *theEnv,
+  const char *logicalName)
+  {
+   Defmodule *theModule;
+   unsigned int count = 0;
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+    {
+     WriteString(theEnv,logicalName,DefmoduleName(theModule));
+     WriteString(theEnv,logicalName,"\n");
+     count++;
+    }
+
+   PrintTally(theEnv,logicalName,count,"defmodule","defmodules");
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#endif /* DEFMODULE_CONSTRUCT */
+
+
diff --git a/clips/modulbsc.h b/clips/modulbsc.h
new file mode 100755
index 000000000..804f286a0
--- /dev/null
+++ b/clips/modulbsc.h
@@ -0,0 +1,67 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/02/18            */
+   /*                                                     */
+   /*         DEFMODULE BASIC COMMANDS HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements core commands for the deffacts        */
+/*   construct such as clear, reset, save, undeffacts,       */
+/*   ppdeffacts, list-deffacts, and get-deffacts-list.       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_modulbsc
+
+#pragma once
+
+#define _H_modulbsc
+
+#include "evaluatn.h"
+
+   void                           DefmoduleBasicCommands(Environment *);
+   void                           GetDefmoduleListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetDefmoduleList(Environment *,CLIPSValue *);
+   void                           PPDefmoduleCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           PPDefmodule(Environment *,const char *,const char *);
+   const char                    *PPDefmoduleNil(Environment *,const char *);
+   void                           ListDefmodulesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ListDefmodules(Environment *,const char *);
+
+#endif /* _H_modulbsc */
+
diff --git a/clips/modulcmp.c b/clips/modulcmp.c
new file mode 100755
index 000000000..adbb68f5e
--- /dev/null
+++ b/clips/modulcmp.c
@@ -0,0 +1,499 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*           DEFMODULE CONSTRUCTS-TO-C MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for the   */
+/*    defmodule construct.                                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include <stdio.h>
+
+#include "conscomp.h"
+#include "envrnmnt.h"
+#include "moduldef.h"
+#include "sysdep.h"
+
+#include "modulcmp.h"
+
+/***************/
+/* DEFINITIONS */
+/***************/
+
+#define ItemPrefix()      ArbitraryPrefix(DefmoduleData(theEnv)->DefmoduleCodeItem,0)
+#define DefmodulePrefix() ArbitraryPrefix(DefmoduleData(theEnv)->DefmoduleCodeItem,1)
+#define PortPrefix()      ArbitraryPrefix(DefmoduleData(theEnv)->DefmoduleCodeItem,2)
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    ConstructToCode(Environment *,const char *,const char *,char *,unsigned int,
+                                                  FILE *,unsigned int,unsigned int);
+   static void                    InitDefmoduleCode(Environment *,FILE *,unsigned int,unsigned int);
+   static struct portItem        *GetNextPortItem(Environment *,Defmodule **,struct portItem **,
+                                                  bool *,bool *);
+   static bool                    PortItemsToCode(Environment *,const char *,const char *,char *,unsigned int,
+                                                  FILE *,unsigned int,unsigned int,unsigned int *);
+   static void                    BeforeDefmodulesToCode(Environment *);
+
+/***************************************************************/
+/* DefmoduleCompilerSetup: Initializes the defmodule construct */
+/*    for use with the constructs-to-c command.                */
+/***************************************************************/
+void DefmoduleCompilerSetup(
+  Environment *theEnv)
+  {
+   DefmoduleData(theEnv)->DefmoduleCodeItem =
+      AddCodeGeneratorItem(theEnv,"defmodule",200,BeforeDefmodulesToCode,
+                           InitDefmoduleCode,ConstructToCode,3);
+  }
+
+/***********************************************************/
+/* BeforeDefmodulesToCode: Assigns each defmodule a unique */
+/*   ID which will be used for pointer references when the */
+/*   data structures are written to a file as C code       */
+/***********************************************************/
+static void BeforeDefmodulesToCode(
+  Environment *theEnv)
+  {
+   unsigned int value = 0;
+   Defmodule *theModule;
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     { theModule->header.bsaveID = value++; }
+  }
+
+/*************************************************************/
+/* PrintDefmoduleReference: Writes the C code representation */
+/*   of a reference to a defmodule data structure.           */
+/*************************************************************/
+void PrintDefmoduleReference(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule)
+  {
+   if (theModule == NULL) fprintf(theFile,"NULL");
+   else fprintf(theFile,"&%s%u_%lu[%lu]",DefmodulePrefix(),ConstructCompilerData(theEnv)->ImageID,
+                                    ((theModule->header.bsaveID / ConstructCompilerData(theEnv)->MaxIndices) + 1),
+                                    (theModule->header.bsaveID % ConstructCompilerData(theEnv)->MaxIndices));
+  }
+
+/************************************************/
+/* InitDefmoduleCode: Writes out initialization */
+/*   code for defmodules for a run-time module. */
+/************************************************/
+static void InitDefmoduleCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+#if MAC_XCD
+#pragma unused(maxIndices)
+#endif
+
+   if (GetNextDefmodule(theEnv,NULL) != NULL)
+     { fprintf(initFP,"   SetListOfDefmodules(theEnv,%s%d_1);\n",DefmodulePrefix(),imageID); }
+   else
+     { fprintf(initFP,"   SetListOfDefmodules(theEnv,NULL);\n"); }
+   fprintf(initFP,"   SetCurrentModule(theEnv,GetNextDefmodule(theEnv,NULL));\n");
+  }
+
+/***********************************************************/
+/* ConstructToCode: Produces defmodule code for a run-time */
+/*   module created using the constructs-to-c function.    */
+/***********************************************************/
+static bool ConstructToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   Defmodule *theConstruct;
+   FILE *moduleFile = NULL, *itemsFile;
+   unsigned int portItemCount = 0;
+   struct portItem *portItemPtr;
+   unsigned int mihCount = 0, moduleCount = 0;
+   unsigned int j;
+   struct moduleItem *theItem;
+   unsigned int moduleArrayVersion = 1;
+   unsigned int fileCount = 2;
+
+   /*================================================*/
+   /* Include the appropriate defmodule header file. */
+   /*================================================*/
+
+   fprintf(headerFP,"#include \"moduldef.h\"\n");
+
+   /*============================================*/
+   /* Open up the items file for the defmodules. */
+   /* Only one file of this type is created so   */
+   /* the maximum number of indices is ignored.  */
+   /*============================================*/
+
+   if ((itemsFile = NewCFile(theEnv,fileName,pathName,fileNameBuffer,fileID,1,false)) == NULL)
+     { return false; }
+   fprintf(itemsFile,"struct defmoduleItemHeader *%s%d_%d[] = {\n",ItemPrefix(),imageID,1);
+   fprintf(headerFP,"extern struct defmoduleItemHeader *%s%d_%d[];\n",ItemPrefix(),imageID,1);
+
+   /*======================================================*/
+   /* Loop through all the defmodules writing their C code */
+   /* representation to the file as they are traversed.    */
+   /*======================================================*/
+
+   for (theConstruct = GetNextDefmodule(theEnv,NULL);
+        theConstruct != NULL;
+        theConstruct = GetNextDefmodule(theEnv,theConstruct))
+     {
+      /*===========================================*/
+      /* Open a new file to write to if necessary. */
+      /*===========================================*/
+
+      moduleFile = OpenFileIfNeeded(theEnv,moduleFile,fileName,pathName,fileNameBuffer,fileID,imageID,
+                                    &fileCount,moduleArrayVersion,headerFP,
+                                    "Defmodule",DefmodulePrefix(),
+                                    false,NULL);
+
+      if (moduleFile == NULL)
+        {
+         moduleCount = maxIndices;
+         CloseFileIfNeeded(theEnv,moduleFile,&moduleCount,
+                           &moduleArrayVersion,maxIndices,NULL,NULL);
+         GenClose(theEnv,itemsFile);
+         return false;
+        }
+
+      /*======================================*/
+      /* Write the construct name and ppform. */
+      /*======================================*/
+
+      fprintf(moduleFile,"{");
+      
+      ConstructHeaderToCode(theEnv,moduleFile,&theConstruct->header,imageID,maxIndices,
+                         moduleCount,ModulePrefix(DefmoduleData(theEnv)->DefmoduleCodeItem),
+                         ConstructPrefix(DefmoduleData(theEnv)->DefmoduleCodeItem));
+
+      fprintf(moduleFile,",");
+
+      /*=====================================================*/
+      /* Write the items array pointers to other constructs. */
+      /*=====================================================*/
+
+      fprintf(moduleFile,"&%s%d_1[%d],",ItemPrefix(),imageID,mihCount);
+
+      for (j = 0, theItem = GetListOfModuleItems(theEnv);
+           (j < GetNumberOfModuleItems(theEnv)) && (theItem != NULL) ;
+           j++, theItem = theItem->next)
+        {
+         mihCount++;
+         if (theItem->constructsToCModuleReference == NULL)
+           { fprintf(itemsFile,"NULL"); }
+         else
+           { (*theItem->constructsToCModuleReference)(theEnv,itemsFile,theConstruct->header.bsaveID,imageID,maxIndices); }
+
+         if ((j + 1) < GetNumberOfModuleItems(theEnv)) fprintf(itemsFile,",");
+         else if (theConstruct->header.next != NULL) fprintf(itemsFile,",\n");
+        }
+
+      /*=================================*/
+      /* Write the importList reference. */
+      /*=================================*/
+
+      if (theConstruct->importList == NULL)
+        { fprintf(moduleFile,"NULL,"); }
+      else
+        {
+         fprintf(moduleFile,"&%s%d_%d[%d],",PortPrefix(),imageID,
+                                     (portItemCount / maxIndices) + 1,
+                                     portItemCount % maxIndices);
+         for (portItemPtr = theConstruct->importList;
+              portItemPtr != NULL;
+              portItemPtr = portItemPtr->next)
+           { portItemCount++; }
+        }
+
+      /*=================================*/
+      /* Write the exportList reference. */
+      /*=================================*/
+
+      if (theConstruct->exportList == NULL)
+        { fprintf(moduleFile,"NULL,"); }
+      else
+        {
+         fprintf(moduleFile,"&%s%d_%d[%d],",PortPrefix(),imageID,
+                                     (portItemCount / maxIndices) + 1,
+                                     portItemCount % maxIndices);
+         for (portItemPtr = theConstruct->exportList;
+              portItemPtr != NULL;
+              portItemPtr = portItemPtr->next)
+           { portItemCount++; }
+        }
+
+      /*========================*/
+      /* Write the visitedFlag. */
+      /*========================*/
+
+      fprintf(moduleFile,"0}");
+
+      /*===================================================*/
+      /* Increment the number of defmodule data structures */
+      /* written and close the output file if necessary.   */
+      /*===================================================*/
+
+      moduleCount++;
+      moduleFile = CloseFileIfNeeded(theEnv,moduleFile,&moduleCount,&moduleArrayVersion,
+                                        maxIndices,NULL,NULL);
+
+     }
+
+   /*=========================*/
+   /* Close the output files. */
+   /*=========================*/
+
+   moduleCount = maxIndices;
+   CloseFileIfNeeded(theEnv,moduleFile,&moduleCount,
+                     &moduleArrayVersion,maxIndices,NULL,NULL);
+   fprintf(itemsFile,"};\n");
+   GenClose(theEnv,itemsFile);
+
+   /*=========================================*/
+   /* Write out the portItem data structures. */
+   /*=========================================*/
+
+   if (portItemCount == 0) return true;
+   return PortItemsToCode(theEnv,fileName,pathName,fileNameBuffer,fileID,headerFP,imageID,maxIndices,&fileCount);
+  }
+
+/************************************************************/
+/* PortItemsToCode: Writes the C code representation of all */
+/*   portItem data structure nodes the specified file.      */
+/************************************************************/
+static bool PortItemsToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int *fileCount)
+  {
+   Defmodule *theDefmodule = NULL;
+   struct portItem *thePortItem = NULL;
+   unsigned int portItemCount = 0;
+   bool importChecked = false;
+   bool exportChecked = false;
+   FILE *portItemsFile = NULL;
+   unsigned int portItemArrayVersion = 1;
+
+   /*=================================================================*/
+   /* Loop through each of the portItem data structures writing their */
+   /* C code representation to the file as they are traversed.        */
+   /*=================================================================*/
+
+   for (thePortItem = GetNextPortItem(theEnv,&theDefmodule,&thePortItem,&importChecked,&exportChecked);
+        thePortItem != NULL;
+        thePortItem = GetNextPortItem(theEnv,&theDefmodule,&thePortItem,&importChecked,&exportChecked))
+     {
+      /*===========================================*/
+      /* Open a new file to write to if necessary. */
+      /*===========================================*/
+
+      portItemsFile = OpenFileIfNeeded(theEnv,portItemsFile,fileName,pathName,fileNameBuffer,fileID,imageID,
+                                       fileCount,portItemArrayVersion,headerFP,
+                                       "struct portItem",PortPrefix(),
+                                       false,NULL);
+
+      if (portItemsFile == NULL)
+        {
+         portItemCount = maxIndices;
+         CloseFileIfNeeded(theEnv,portItemsFile,&portItemCount,
+                           &portItemArrayVersion,maxIndices,NULL,NULL);
+         return false;
+        }
+
+      /*================================================*/
+      /* Write the portItem data structure to the file. */
+      /*================================================*/
+
+      fprintf(portItemsFile,"{");
+      PrintSymbolReference(theEnv,portItemsFile,thePortItem->moduleName);
+      fprintf(portItemsFile,",");
+      PrintSymbolReference(theEnv,portItemsFile,thePortItem->constructType);
+      fprintf(portItemsFile,",");
+      PrintSymbolReference(theEnv,portItemsFile,thePortItem->constructName);
+      fprintf(portItemsFile,",");
+
+      if (thePortItem->next == NULL)
+        { fprintf(portItemsFile,"NULL}"); }
+      else
+        {
+         fprintf(portItemsFile,"&%s%d_%d[%d]}",PortPrefix(),imageID,
+                                  ((portItemCount+1) / maxIndices) + 1,
+                                   (portItemCount+1) % maxIndices);
+        }
+
+      /*==================================================*/
+      /* Increment the number of portItem data structures */
+      /* written and close the output file if necessary.  */
+      /*==================================================*/
+
+      portItemCount++;
+      CloseFileIfNeeded(theEnv,portItemsFile,&portItemCount,&portItemArrayVersion,
+                        maxIndices,NULL,NULL);
+     }
+
+   /*===================================================*/
+   /* Close the output file and return true to indicate */
+   /* the data structures were successfully written.    */
+   /*===================================================*/
+
+   portItemCount = maxIndices;
+   CloseFileIfNeeded(theEnv,portItemsFile,&portItemCount,
+                     &portItemArrayVersion,maxIndices,NULL,NULL);
+
+   return true;
+  }
+
+/*********************************************************************/
+/* GetNextPortItem: Given a pointer to a portItem data structure     */
+/*   and its defmodule, returns the "next" portItem data structure.  */
+/*   If passed a NULL value for both the defmodule and portItem      */
+/*   data structure, it returns the "first" portItem data structure. */
+/*********************************************************************/
+static struct portItem *GetNextPortItem(
+  Environment *theEnv,
+  Defmodule **theDefmodule,
+  struct portItem **thePortItem,
+  bool *importChecked,
+  bool *exportChecked)
+  {
+   /*====================================================*/
+   /* If the defmodule pointer is NULL, then the "first" */
+   /* portItem data structure should be returned. Start  */
+   /* the search in the "first" defmodule.               */
+   /*====================================================*/
+
+   if (*theDefmodule == NULL)
+     {
+      *theDefmodule = GetNextDefmodule(theEnv,NULL);
+      *thePortItem = NULL;
+      *importChecked = false;
+      *exportChecked = false;
+     }
+
+   /*==============================================*/
+   /* Loop through all of the defmodules until the */
+   /* "next" portItem data structure is found.     */
+   /*==============================================*/
+
+   while (*theDefmodule != NULL)
+     {
+      /*==========================================*/
+      /* Check to see if there's another portItem */
+      /* in the import/export list that's being   */
+      /* checked in the module being examined.    */
+      /*==========================================*/
+
+      if (*thePortItem != NULL) *thePortItem = (*thePortItem)->next;
+      if (*thePortItem != NULL) return(*thePortItem);
+
+      /*==================================================*/
+      /* If we haven't checked the import list yet, begin */
+      /* checking it. If there aren't any items in the    */
+      /* import list, then check the export list.         */
+      /*==================================================*/
+
+      if (! (*importChecked))
+        {
+         *thePortItem = (*theDefmodule)->importList;
+         *importChecked = true;
+         if (*thePortItem == NULL)
+           {
+            *thePortItem = (*theDefmodule)->exportList;
+            *exportChecked = true;
+           }
+        }
+
+      /*======================================*/
+      /* Otherwise, if we haven't checked the */
+      /* export list yet, begin checking it.  */
+      /*======================================*/
+
+      else if (! (*exportChecked))
+        {
+         *exportChecked = true;
+         *thePortItem = (*theDefmodule)->exportList;
+        }
+
+      /*==========================================*/
+      /* If the import or export list contained a */
+      /* portItem data structure, then return it. */
+      /*==========================================*/
+
+      if (*thePortItem != NULL) return(*thePortItem);
+
+      /*==================================*/
+      /* Otherwise, check the next module */
+      /* for a portItem data structure.   */
+      /*==================================*/
+
+      *theDefmodule = GetNextDefmodule(theEnv,*theDefmodule);
+      *importChecked = false;
+      *exportChecked = false;
+     }
+
+   /*=======================================================*/
+   /* All the portItem data structures have been traversed. */
+   /* Return NULL to indicate that none are left.           */
+   /*=======================================================*/
+
+   return NULL;
+  }
+
+#endif /* CONSTRUCT_COMPILER && (! RUN_TIME) */
+
+
diff --git a/clips/modulcmp.h b/clips/modulcmp.h
new file mode 100755
index 000000000..44f55c85d
--- /dev/null
+++ b/clips/modulcmp.h
@@ -0,0 +1,54 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*       DEFMODULE CONSTRUCT COMPILER HEADER FILE      */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for the   */
+/*    defmodule construct.                                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_modulcmp
+
+#pragma once
+
+#define _H_modulcmp
+
+#include <stdio.h>
+
+#include "moduldef.h"
+
+   void                           DefmoduleCompilerSetup(Environment *);
+   void                           PrintDefmoduleReference(Environment *,FILE *,Defmodule *);
+
+#endif /* _H_modulcmp */
diff --git a/clips/moduldef.c b/clips/moduldef.c
new file mode 100755
index 000000000..59ab88d74
--- /dev/null
+++ b/clips/moduldef.c
@@ -0,0 +1,817 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/01/16             */
+   /*                                                     */
+   /*                  DEFMODULE MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Defines basic defmodule primitive functions such */
+/*   as allocating and deallocating, traversing, and finding */
+/*   defmodule data structures.                              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#include "modulbin.h"
+#endif
+#include "constant.h"
+#include "constrct.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "modulbsc.h"
+#include "modulcmp.h"
+#include "modulpsr.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+
+#include "moduldef.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME)
+   static void                       ReturnDefmodule(Environment *,Defmodule *,bool);
+#endif
+   static void                       DeallocateDefmoduleData(Environment *);
+
+/************************************************/
+/* AllocateDefmoduleGlobals: Initializes global */
+/*   variables used by the defmodule construct. */
+/************************************************/
+void AllocateDefmoduleGlobals(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,DEFMODULE_DATA,sizeof(struct defmoduleData),NULL);
+   AddEnvironmentCleanupFunction(theEnv,"defmodules",DeallocateDefmoduleData,-1000);
+   DefmoduleData(theEnv)->CallModuleChangeFunctions = true;
+   DefmoduleData(theEnv)->MainModuleRedefinable = true;
+  }
+
+/****************************************************/
+/* DeallocateDefmoduleData: Deallocates environment */
+/*    data for the defmodule construct.             */
+/****************************************************/
+static void DeallocateDefmoduleData(
+  Environment *theEnv)
+  {
+   struct moduleStackItem *tmpMSPtr, *nextMSPtr;
+   struct moduleItem *tmpMIPtr, *nextMIPtr;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   Defmodule *tmpDMPtr, *nextDMPtr;
+   struct portConstructItem *tmpPCPtr, *nextPCPtr;
+#endif
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   unsigned int i;
+   size_t space;
+#endif
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   for (i = 0; i < DefmoduleData(theEnv)->BNumberOfDefmodules; i++)
+     {
+      if (DefmoduleData(theEnv)->DefmoduleArray[i].itemsArray != NULL)
+        {
+         rm(theEnv,DefmoduleData(theEnv)->DefmoduleArray[i].itemsArray,
+            sizeof(void *) * GetNumberOfModuleItems(theEnv));
+        }
+     }
+
+   space = DefmoduleData(theEnv)->BNumberOfDefmodules * sizeof(Defmodule);
+   if (space != 0)
+     {
+      genfree(theEnv,DefmoduleData(theEnv)->DefmoduleArray,space);
+      DefmoduleData(theEnv)->ListOfDefmodules = NULL;
+     }
+
+   space = DefmoduleData(theEnv)->NumberOfPortItems * sizeof(struct portItem);
+   if (space != 0) genfree(theEnv,DefmoduleData(theEnv)->PortItemArray,space);
+#endif
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   tmpDMPtr = DefmoduleData(theEnv)->ListOfDefmodules;
+   while (tmpDMPtr != NULL)
+     {
+      nextDMPtr = (Defmodule *) tmpDMPtr->header.next;
+      ReturnDefmodule(theEnv,tmpDMPtr,true);
+      tmpDMPtr = nextDMPtr;
+     }
+
+   tmpPCPtr = DefmoduleData(theEnv)->ListOfPortConstructItems;
+   while (tmpPCPtr != NULL)
+     {
+      nextPCPtr = tmpPCPtr->next;
+      rtn_struct(theEnv,portConstructItem,tmpPCPtr);
+      tmpPCPtr = nextPCPtr;
+     }
+#endif
+
+   tmpMSPtr = DefmoduleData(theEnv)->ModuleStack;
+   while (tmpMSPtr != NULL)
+     {
+      nextMSPtr = tmpMSPtr->next;
+      rtn_struct(theEnv,moduleStackItem,tmpMSPtr);
+      tmpMSPtr = nextMSPtr;
+     }
+
+   tmpMIPtr = DefmoduleData(theEnv)->ListOfModuleItems;
+   while (tmpMIPtr != NULL)
+     {
+      nextMIPtr = tmpMIPtr->next;
+      rtn_struct(theEnv,moduleItem,tmpMIPtr);
+      tmpMIPtr = nextMIPtr;
+     }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   DeallocateVoidCallList(theEnv,DefmoduleData(theEnv)->AfterModuleDefinedFunctions);
+#endif
+   DeallocateVoidCallList(theEnv,DefmoduleData(theEnv)->AfterModuleChangeFunctions);
+  }
+
+/**************************************************************/
+/* InitializeDefmodules: Initializes the defmodule construct. */
+/**************************************************************/
+void InitializeDefmodules(
+  Environment *theEnv)
+  {
+   DefmoduleBasicCommands(theEnv);
+
+#if (! RUN_TIME)
+   CreateMainModule(theEnv,NULL);
+#endif
+
+#if DEFMODULE_CONSTRUCT && (! RUN_TIME) && (! BLOAD_ONLY)
+   AddConstruct(theEnv,"defmodule","defmodules",ParseDefmodule,NULL,NULL,NULL,NULL,
+                                                        NULL,NULL,NULL,NULL,NULL);
+#endif
+
+#if (! RUN_TIME) && DEFMODULE_CONSTRUCT
+   AddUDF(theEnv,"get-current-module","y",0,0,NULL,GetCurrentModuleCommand,"GetCurrentModuleCommand",NULL);
+
+   AddUDF(theEnv,"set-current-module","y",1,1,"y",SetCurrentModuleCommand,"SetCurrentModuleCommand",NULL);
+#endif
+  }
+
+/******************************************************/
+/* RegisterModuleItem: Called to register a construct */
+/*   which can be placed within a module.             */
+/******************************************************/
+unsigned RegisterModuleItem(
+  Environment *theEnv,
+  const char *theItem,
+  AllocateModuleFunction *allocateFunction,
+  FreeModuleFunction *freeFunction,
+  void *(*bloadModuleReference)(Environment *,unsigned long),
+  void  (*constructsToCModuleReference)(Environment *,FILE *,unsigned long,unsigned int,unsigned int),
+  FindConstructFunction *findFunction)
+  {
+   struct moduleItem *newModuleItem;
+
+   newModuleItem = get_struct(theEnv,moduleItem);
+   newModuleItem->name = theItem;
+   newModuleItem->allocateFunction = allocateFunction;
+   newModuleItem->freeFunction = freeFunction;
+   newModuleItem->bloadModuleReference = bloadModuleReference;
+   newModuleItem->constructsToCModuleReference = constructsToCModuleReference;
+   newModuleItem->findFunction = findFunction;
+   newModuleItem->moduleIndex = DefmoduleData(theEnv)->NumberOfModuleItems++;
+   newModuleItem->next = NULL;
+
+   if (DefmoduleData(theEnv)->LastModuleItem == NULL)
+     {
+      DefmoduleData(theEnv)->ListOfModuleItems = newModuleItem;
+      DefmoduleData(theEnv)->LastModuleItem = newModuleItem;
+     }
+   else
+     {
+      DefmoduleData(theEnv)->LastModuleItem->next = newModuleItem;
+      DefmoduleData(theEnv)->LastModuleItem = newModuleItem;
+     }
+
+   return newModuleItem->moduleIndex;
+  }
+
+/***********************************************************/
+/* GetListOfModuleItems: Returns the list of module items. */
+/***********************************************************/
+struct moduleItem *GetListOfModuleItems(
+  Environment *theEnv)
+  {
+   return (DefmoduleData(theEnv)->ListOfModuleItems);
+  }
+
+/***************************************************************/
+/* GetNumberOfModuleItems: Returns the number of module items. */
+/***************************************************************/
+unsigned GetNumberOfModuleItems(
+  Environment *theEnv)
+  {
+   return DefmoduleData(theEnv)->NumberOfModuleItems;
+  }
+
+/********************************************************/
+/* FindModuleItem: Finds the module item data structure */
+/*   corresponding to the specified name.               */
+/********************************************************/
+struct moduleItem *FindModuleItem(
+  Environment *theEnv,
+  const char *theName)
+  {
+   struct moduleItem *theModuleItem;
+
+   for (theModuleItem = DefmoduleData(theEnv)->ListOfModuleItems;
+        theModuleItem != NULL;
+        theModuleItem = theModuleItem->next)
+     { if (strcmp(theModuleItem->name,theName) == 0) return(theModuleItem); }
+
+   return NULL;
+  }
+
+/***************************************/
+/* GetCurrentModule: Returns a pointer */
+/*   to the current module.            */
+/***************************************/
+Defmodule *GetCurrentModule(
+  Environment *theEnv)
+  {
+   return DefmoduleData(theEnv)->CurrentModule;
+  }
+
+/***********************************************************/
+/* SetCurrentModule: Sets the value of the current module. */
+/***********************************************************/
+Defmodule *SetCurrentModule(
+  Environment *theEnv,
+  Defmodule *newModule)
+  {
+   struct voidCallFunctionItem *changeFunctions;
+   Defmodule *oldModule;
+
+   /*=============================================*/
+   /* Change the current module to the specified  */
+   /* module and save the previous current module */
+   /* for the return value.                       */
+   /*=============================================*/
+
+   oldModule = DefmoduleData(theEnv)->CurrentModule;
+   DefmoduleData(theEnv)->CurrentModule = newModule;
+
+   /*==========================================================*/
+   /* Call the list of registered functions that need to know  */
+   /* when the module has changed. The module change functions */
+   /* should only be called if this is a "real" module change. */
+   /* Many routines temporarily change the module to look for  */
+   /* constructs, etc. The SaveCurrentModule function will     */
+   /* disable the change functions from being called.          */
+   /*==========================================================*/
+
+   if (DefmoduleData(theEnv)->CallModuleChangeFunctions)
+     {
+      DefmoduleData(theEnv)->ModuleChangeIndex++;
+      changeFunctions = DefmoduleData(theEnv)->AfterModuleChangeFunctions;
+      while (changeFunctions != NULL)
+        {
+         (*changeFunctions->func)(theEnv,changeFunctions->context);
+         changeFunctions = changeFunctions->next;
+        }
+     }
+
+   /*=====================================*/
+   /* Return the previous current module. */
+   /*=====================================*/
+
+   return oldModule;
+  }
+
+/********************************************************/
+/* SaveCurrentModule: Saves current module on stack and */
+/*   prevents SetCurrentModule() from calling change    */
+/*   functions                                          */
+/********************************************************/
+void SaveCurrentModule(
+  Environment *theEnv)
+  {
+   ModuleStackItem *tmp;
+
+   tmp = get_struct(theEnv,moduleStackItem);
+   tmp->changeFlag = DefmoduleData(theEnv)->CallModuleChangeFunctions;
+   DefmoduleData(theEnv)->CallModuleChangeFunctions = false;
+   tmp->theModule = DefmoduleData(theEnv)->CurrentModule;
+   tmp->next = DefmoduleData(theEnv)->ModuleStack;
+   DefmoduleData(theEnv)->ModuleStack = tmp;
+  }
+
+/**********************************************************/
+/* RestoreCurrentModule: Restores saved module and resets */
+/*   ability of SetCurrentModule() to call changed        */
+/*   functions to previous state                          */
+/**********************************************************/
+void RestoreCurrentModule(
+  Environment *theEnv)
+  {
+   ModuleStackItem *tmp;
+
+   tmp = DefmoduleData(theEnv)->ModuleStack;
+   DefmoduleData(theEnv)->ModuleStack = tmp->next;
+   DefmoduleData(theEnv)->CallModuleChangeFunctions = tmp->changeFlag;
+   DefmoduleData(theEnv)->CurrentModule = tmp->theModule;
+   rtn_struct(theEnv,moduleStackItem,tmp);
+  }
+
+/*************************************************************/
+/* GetModuleItem: Returns the data pointer for the specified */
+/*   module item in the specified module. If no module is    */
+/*   indicated, then the module item for the current module  */
+/*   is returned.                                            */
+/*************************************************************/
+void *GetModuleItem(
+  Environment *theEnv,
+  Defmodule *theModule,
+  unsigned moduleItemIndex)
+  {
+   if (theModule == NULL)
+     {
+      if (DefmoduleData(theEnv)->CurrentModule == NULL) return NULL;
+      theModule = DefmoduleData(theEnv)->CurrentModule;
+     }
+
+   if (theModule->itemsArray == NULL) return (NULL);
+
+   return ((void *) theModule->itemsArray[moduleItemIndex]);
+  }
+
+/************************************************************/
+/* SetModuleItem: Sets the data pointer for the specified   */
+/*   module item in the specified module. If no module is   */
+/*   indicated, then the module item for the current module */
+/*   is returned.                                           */
+/************************************************************/
+void SetModuleItem(
+  Environment *theEnv,
+  Defmodule *theModule,
+  unsigned moduleItemIndex,
+  void *newValue)
+  {
+   if (theModule == NULL)
+     {
+      if (DefmoduleData(theEnv)->CurrentModule == NULL) return;
+      theModule = DefmoduleData(theEnv)->CurrentModule;
+     }
+
+   if (theModule->itemsArray == NULL) return;
+   theModule->itemsArray[moduleItemIndex] = (struct defmoduleItemHeader *) newValue;
+  }
+
+/******************************************************/
+/* CreateMainModule: Creates the default MAIN module. */
+/******************************************************/
+void CreateMainModule(
+  Environment *theEnv,
+  void *context)
+  {
+   Defmodule *newDefmodule;
+   struct moduleItem *theItem;
+   unsigned int i;
+   struct defmoduleItemHeader *theHeader;
+
+   /*=======================================*/
+   /* Allocate the defmodule data structure */
+   /* and name it the MAIN module.          */
+   /*=======================================*/
+
+   newDefmodule = get_struct(theEnv,defmodule);
+   newDefmodule->header.name = CreateSymbol(theEnv,"MAIN");
+   IncrementLexemeCount(newDefmodule->header.name);
+   newDefmodule->header.whichModule = NULL;
+   newDefmodule->header.next = NULL;
+   newDefmodule->header.ppForm = NULL;
+   newDefmodule->importList = NULL;
+   newDefmodule->exportList = NULL;
+   newDefmodule->header.bsaveID = 0L;
+   newDefmodule->header.usrData = NULL;
+   newDefmodule->header.constructType = DEFMODULE;
+   newDefmodule->header.env = theEnv;
+
+   /*==================================*/
+   /* Initialize the array for storing */
+   /* the module's construct lists.    */
+   /*==================================*/
+
+   if (DefmoduleData(theEnv)->NumberOfModuleItems == 0) newDefmodule->itemsArray = NULL;
+   else
+     {
+      newDefmodule->itemsArray = (struct defmoduleItemHeader **)
+                                 gm2(theEnv,sizeof(void *) * DefmoduleData(theEnv)->NumberOfModuleItems);
+      for (i = 0, theItem = DefmoduleData(theEnv)->ListOfModuleItems;
+           (i < DefmoduleData(theEnv)->NumberOfModuleItems) && (theItem != NULL);
+           i++, theItem = theItem->next)
+        {
+         if (theItem->allocateFunction == NULL)
+           { newDefmodule->itemsArray[i] = NULL; }
+         else
+           {
+            newDefmodule->itemsArray[i] = (struct defmoduleItemHeader *)
+                                          (*theItem->allocateFunction)(theEnv);
+            theHeader = (struct defmoduleItemHeader *) newDefmodule->itemsArray[i];
+            theHeader->theModule = newDefmodule;
+            theHeader->firstItem = NULL;
+            theHeader->lastItem = NULL;
+           }
+        }
+     }
+
+   /*=======================================*/
+   /* Add the module to the list of modules */
+   /* and make it the current module.       */
+   /*=======================================*/
+
+#if (! BLOAD_ONLY) && (! RUN_TIME) && DEFMODULE_CONSTRUCT
+   SetNumberOfDefmodules(theEnv,1);
+#endif
+
+   DefmoduleData(theEnv)->LastDefmodule = newDefmodule;
+   DefmoduleData(theEnv)->ListOfDefmodules = newDefmodule;
+   SetCurrentModule(theEnv,newDefmodule);
+  }
+
+/*********************************************************************/
+/* SetListOfDefmodules: Sets the list of defmodules to the specified */
+/*   value. Normally used when initializing a run-time module or     */
+/*   when bloading a binary file to install the list of defmodules.  */
+/*********************************************************************/
+void SetListOfDefmodules(
+  Environment *theEnv,
+  Defmodule *defmodulePtr)
+  {
+   DefmoduleData(theEnv)->ListOfDefmodules = defmodulePtr;
+   DefmoduleData(theEnv)->LastDefmodule = DefmoduleData(theEnv)->ListOfDefmodules;
+
+   if (DefmoduleData(theEnv)->LastDefmodule == NULL) return;
+   DefmoduleData(theEnv)->LastDefmodule->header.env = theEnv;
+
+   while (DefmoduleData(theEnv)->LastDefmodule->header.next != NULL)
+     {
+      DefmoduleData(theEnv)->LastDefmodule = (Defmodule *) DefmoduleData(theEnv)->LastDefmodule->header.next;
+      DefmoduleData(theEnv)->LastDefmodule->header.env = theEnv;
+     }
+  }
+
+/*******************************************************************/
+/* GetNextDefmodule: If passed a NULL pointer, returns the first   */
+/*   defmodule in the ListOfDefmodules. Otherwise returns the next */
+/*   defmodule following the defmodule passed as an argument.      */
+/*******************************************************************/
+Defmodule *GetNextDefmodule(
+  Environment *theEnv,
+  Defmodule *defmodulePtr)
+  {
+   if (defmodulePtr == NULL)
+     { return DefmoduleData(theEnv)->ListOfDefmodules; }
+   else
+     { return (Defmodule *) defmodulePtr->header.next; }
+  }
+
+/***********************************/
+/* DefmoduleName: Returns the name */
+/*   of the specified defmodule.   */
+/***********************************/
+const char *DefmoduleName(
+  Defmodule *defmodulePtr)
+  {
+   return defmodulePtr->header.name->contents;
+  }
+
+/************************************************/
+/* DefmodulePPForm: Returns the pretty print    */
+/*   representation of the specified defmodule. */
+/************************************************/
+const char *DefmodulePPForm(
+  Defmodule *defmodulePtr)
+  {
+   return defmodulePtr->header.ppForm;
+  }
+
+#if (! RUN_TIME)
+
+/***********************************************/
+/* RemoveAllDefmodules: Removes all defmodules */
+/*   from the current environment.             */
+/***********************************************/
+void RemoveAllDefmodules(
+  Environment *theEnv,
+  void *context)
+  {
+   Defmodule *nextDefmodule;
+
+   while (DefmoduleData(theEnv)->ListOfDefmodules != NULL)
+     {
+      nextDefmodule = (Defmodule *) DefmoduleData(theEnv)->ListOfDefmodules->header.next;
+      ReturnDefmodule(theEnv,DefmoduleData(theEnv)->ListOfDefmodules,false);
+      DefmoduleData(theEnv)->ListOfDefmodules = nextDefmodule;
+     }
+
+   DefmoduleData(theEnv)->CurrentModule = NULL;
+   DefmoduleData(theEnv)->LastDefmodule = NULL;
+  }
+
+/************************************************************/
+/* ReturnDefmodule: Returns the data structures associated  */
+/*   with a defmodule construct to the pool of free memory. */
+/************************************************************/
+static void ReturnDefmodule(
+  Environment *theEnv,
+  Defmodule *theDefmodule,
+  bool environmentClear)
+  {
+   unsigned int i;
+   struct moduleItem *theItem;
+   struct portItem *theSpec, *nextSpec;
+
+   /*=====================================================*/
+   /* Set the current module to the module being deleted. */
+   /*=====================================================*/
+
+   if (theDefmodule == NULL) return;
+
+   if (! environmentClear)
+     { SetCurrentModule(theEnv,theDefmodule); }
+
+   /*============================================*/
+   /* Call the free functions for the constructs */
+   /* belonging to this module.                  */
+   /*============================================*/
+
+   if (theDefmodule->itemsArray != NULL)
+     {
+      if (! environmentClear)
+        {
+         for (i = 0, theItem = DefmoduleData(theEnv)->ListOfModuleItems;
+              (i < DefmoduleData(theEnv)->NumberOfModuleItems) && (theItem != NULL);
+              i++, theItem = theItem->next)
+           {
+            if (theItem->freeFunction != NULL)
+              { (*theItem->freeFunction)(theEnv,theDefmodule->itemsArray[i]); }
+           }
+        }
+
+      rm(theEnv,theDefmodule->itemsArray,sizeof(void *) * DefmoduleData(theEnv)->NumberOfModuleItems);
+    }
+
+   /*======================================================*/
+   /* Decrement the symbol count for the defmodule's name. */
+   /*======================================================*/
+
+   if (! environmentClear)
+     { ReleaseLexeme(theEnv,theDefmodule->header.name); }
+
+   /*====================================*/
+   /* Free the items in the import list. */
+   /*====================================*/
+
+   theSpec = theDefmodule->importList;
+   while (theSpec != NULL)
+     {
+      nextSpec = theSpec->next;
+      if (! environmentClear)
+        {
+         if (theSpec->moduleName != NULL) ReleaseLexeme(theEnv,theSpec->moduleName);
+         if (theSpec->constructType != NULL) ReleaseLexeme(theEnv,theSpec->constructType);
+         if (theSpec->constructName != NULL) ReleaseLexeme(theEnv,theSpec->constructName);
+        }
+      rtn_struct(theEnv,portItem,theSpec);
+      theSpec = nextSpec;
+     }
+
+   /*====================================*/
+   /* Free the items in the export list. */
+   /*====================================*/
+
+   theSpec = theDefmodule->exportList;
+   while (theSpec != NULL)
+     {
+      nextSpec = theSpec->next;
+      if (! environmentClear)
+        {
+         if (theSpec->moduleName != NULL) ReleaseLexeme(theEnv,theSpec->moduleName);
+         if (theSpec->constructType != NULL) ReleaseLexeme(theEnv,theSpec->constructType);
+         if (theSpec->constructName != NULL) ReleaseLexeme(theEnv,theSpec->constructName);
+        }
+      rtn_struct(theEnv,portItem,theSpec);
+      theSpec = nextSpec;
+     }
+
+   /*=========================================*/
+   /* Free the defmodule pretty print string. */
+   /*=========================================*/
+
+   if (theDefmodule->header.ppForm != NULL)
+     {
+      rm(theEnv,(void *) theDefmodule->header.ppForm,
+         sizeof(char) * (strlen(theDefmodule->header.ppForm) + 1));
+     }
+
+   /*=======================*/
+   /* Return the user data. */
+   /*=======================*/
+
+   ClearUserDataList(theEnv,theDefmodule->header.usrData);
+
+   /*======================================*/
+   /* Return the defmodule data structure. */
+   /*======================================*/
+
+   rtn_struct(theEnv,defmodule,theDefmodule);
+  }
+
+#endif /* (! RUN_TIME) */
+
+/************************************************/
+/* FindDefmodule: Searches for a defmodule in   */
+/*   the list of defmodules. Returns a pointer  */
+/*   to the defmodule if found, otherwise NULL. */
+/************************************************/
+Defmodule *FindDefmodule(
+  Environment *theEnv,
+  const char *defmoduleName)
+  {
+   Defmodule *defmodulePtr;
+   CLIPSLexeme *findValue;
+
+   if ((findValue = FindSymbolHN(theEnv,defmoduleName,SYMBOL_BIT)) == NULL) return NULL;
+
+   defmodulePtr = DefmoduleData(theEnv)->ListOfDefmodules;
+   while (defmodulePtr != NULL)
+     {
+      if (defmodulePtr->header.name == findValue)
+        { return defmodulePtr; }
+
+      defmodulePtr = (Defmodule *) defmodulePtr->header.next;
+     }
+
+   return NULL;
+  }
+
+/*************************************************/
+/* GetCurrentModuleCommand: H/L access routine   */
+/*   for the get-current-module command.         */
+/*************************************************/
+void GetCurrentModuleCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defmodule *theModule;
+
+   theModule = GetCurrentModule(theEnv);
+
+   if (theModule == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->value = theModule->header.name;
+  }
+
+/*************************************************/
+/* SetCurrentModuleCommand: H/L access routine   */
+/*   for the set-current-module command.         */
+/*************************************************/
+void SetCurrentModuleCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   const char *argument;
+   Defmodule *theModule;
+   CLIPSLexeme *oldModuleName;
+
+   /*=======================*/
+   /* Set the return value. */
+   /*=======================*/
+
+   theModule = GetCurrentModule(theEnv);
+   if (theModule == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   oldModuleName = theModule->header.name;
+   returnValue->value = oldModuleName;
+
+   /*=====================================================*/
+   /* Check for the correct number and type of arguments. */
+   /*=====================================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   argument = theArg.lexemeValue->contents;
+
+   /*================================================*/
+   /* Set the current module to the specified value. */
+   /*================================================*/
+
+   theModule = FindDefmodule(theEnv,argument);
+
+   if (theModule == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defmodule",argument,true);
+      return;
+     }
+
+   SetCurrentModule(theEnv,theModule);
+  }
+
+/*************************************************/
+/* AddAfterModuleChangeFunction: Adds a function */
+/*   to the list of functions to be called after */
+/*   a module change occurs.                     */
+/*************************************************/
+void AddAfterModuleChangeFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunction *func,
+  int priority,
+  void *context)
+  {
+   DefmoduleData(theEnv)->AfterModuleChangeFunctions =
+     AddVoidFunctionToCallList(theEnv,name,priority,func,DefmoduleData(theEnv)->AfterModuleChangeFunctions,context);
+  }
+
+/************************************************/
+/* IllegalModuleSpecifierMessage: Error message */
+/*   for the illegal use of a module specifier. */
+/************************************************/
+void IllegalModuleSpecifierMessage(
+  Environment *theEnv)
+  {
+   PrintErrorID(theEnv,"MODULDEF",1,true);
+   WriteString(theEnv,STDERR,"Illegal use of the module specifier.\n");
+  }
+
+/*********************************************/
+/* GetNumberOfDefmodules: Returns the number */
+/*   of defmodules currently defined.        */
+/*********************************************/
+unsigned short GetNumberOfDefmodules(
+  Environment *theEnv)
+  {
+#if DEFMODULE_CONSTRUCT && (! RUN_TIME) && (! BLOAD_ONLY)
+   return DefmoduleData(theEnv)->NumberOfDefmodules;
+#else
+   return 1;
+#endif
+  }
+
diff --git a/clips/moduldef.h b/clips/moduldef.h
new file mode 100755
index 000000000..7cfa3b242
--- /dev/null
+++ b/clips/moduldef.h
@@ -0,0 +1,271 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                DEFMODULE HEADER FILE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Defines basic defmodule primitive functions such */
+/*   as allocating and deallocating, traversing, and finding */
+/*   defmodule data structures.                              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_moduldef
+
+#pragma once
+
+#define _H_moduldef
+
+typedef struct defmodule Defmodule;
+typedef struct portItem PortItem;
+typedef struct defmoduleItemHeader DefmoduleItemHeader;
+typedef struct moduleItem ModuleItem;
+typedef struct constructHeader ConstructHeader;
+typedef struct moduleStackItem ModuleStackItem;
+
+typedef void *AllocateModuleFunction(Environment *);
+typedef void FreeModuleFunction(Environment *,void *);
+
+typedef enum
+  {
+   DEFMODULE,
+   DEFRULE,
+   DEFTEMPLATE,
+   DEFFACTS,
+   DEFGLOBAL,
+   DEFFUNCTION,
+   DEFGENERIC,
+   DEFMETHOD,
+   DEFCLASS,
+   DEFMESSAGE_HANDLER,
+   DEFINSTANCES
+  } ConstructType;
+
+#include <stdio.h>
+#include "entities.h"
+#include "userdata.h"
+#include "utility.h"
+
+struct constructHeader
+  {
+   ConstructType constructType;
+   CLIPSLexeme *name;
+   const char *ppForm;
+   DefmoduleItemHeader *whichModule;
+   unsigned long bsaveID;
+   ConstructHeader *next;
+   struct userData *usrData;
+   Environment *env;
+  };
+
+struct defmoduleItemHeader
+  {
+   Defmodule *theModule;
+   ConstructHeader *firstItem;
+   ConstructHeader *lastItem;
+  };
+
+typedef ConstructHeader *FindConstructFunction(Environment *,const char *);
+typedef ConstructHeader *GetNextConstructFunction(Environment *,ConstructHeader *);
+typedef bool IsConstructDeletableFunction(ConstructHeader *);
+typedef bool DeleteConstructFunction(ConstructHeader *,Environment *);
+typedef void FreeConstructFunction(Environment *,ConstructHeader *);
+
+/**********************************************************************/
+/* defmodule                                                          */
+/* ----------                                                         */
+/* name: The name of the defmodule (stored as a reference in the      */
+/*   table).                                                          */
+/*                                                                    */
+/* ppForm: The pretty print representation of the defmodule (used by  */
+/*   the save and ppdefmodule commands).                              */
+/*                                                                    */
+/* itemsArray: An array of pointers to the module specific data used  */
+/*   by each construct specified with the RegisterModuleItem          */
+/*   function. The data pointer stored in the array is allocated by   */
+/*   the allocateFunction in moduleItem data structure.               */
+/*                                                                    */
+/* importList: The list of items which are being imported by this     */
+/*   module from other modules.                                       */
+/*                                                                    */
+/* next: A pointer to the next defmodule data structure.              */
+/**********************************************************************/
+
+struct defmodule
+  {
+   ConstructHeader header;
+   DefmoduleItemHeader **itemsArray;
+   PortItem *importList;
+   PortItem *exportList;
+   bool visitedFlag;
+  };
+
+struct portItem
+  {
+   CLIPSLexeme *moduleName;
+   CLIPSLexeme *constructType;
+   CLIPSLexeme *constructName;
+   PortItem *next;
+  };
+
+#define MIHS (DefmoduleItemHeader *)
+
+/**********************************************************************/
+/* moduleItem                                                         */
+/* ----------                                                         */
+/* name: The name of the construct which can be placed in a module.   */
+/*   For example, "defrule".                                          */
+/*                                                                    */
+/* allocateFunction: Used to allocate a data structure containing all */
+/*   pertinent information related to a specific construct for a      */
+/*   given module. For example, the deffacts construct stores a       */
+/*   pointer to the first and last deffacts for each each module.     */
+/*                                                                    */
+/* freeFunction: Used to deallocate a data structure allocated by     */
+/*   the allocateFunction. In addition, the freeFunction deletes      */
+/*   all constructs of the specified type in the given module.        */
+/*                                                                    */
+/* bloadModuleReference: Used during a binary load to establish a     */
+/*   link between the defmodule data structure and the data structure */
+/*   containing all pertinent module information for a specific       */
+/*   construct.                                                       */
+/*                                                                    */
+/* findFunction: Used to determine if a specified construct is in a   */
+/*   specific module. The name is the specific construct is passed as */
+/*   a string and the function returns a pointer to the specified     */
+/*   construct if it exists.                                          */
+/*                                                                    */
+/* exportable: If true, then the specified construct type can be      */
+/*   exported (and hence imported). If false, it can't be exported.   */
+/*                                                                    */
+/* next: A pointer to the next moduleItem data structure.             */
+/**********************************************************************/
+
+struct moduleItem
+  {
+   const char *name;
+   unsigned moduleIndex;
+   void *(*allocateFunction)(Environment *);
+   void  (*freeFunction)(Environment *,void *);
+   void *(*bloadModuleReference)(Environment *,unsigned long);
+   void  (*constructsToCModuleReference)(Environment *,FILE *,unsigned long,unsigned int,unsigned int);
+   FindConstructFunction *findFunction;
+   ModuleItem *next;
+  };
+
+struct moduleStackItem
+  {
+   bool changeFlag;
+   Defmodule *theModule;
+   ModuleStackItem *next;
+  };
+
+#define DEFMODULE_DATA 4
+
+struct defmoduleData
+  {
+   struct moduleItem *LastModuleItem;
+   struct voidCallFunctionItem *AfterModuleChangeFunctions;
+   ModuleStackItem *ModuleStack;
+   bool CallModuleChangeFunctions;
+   Defmodule *ListOfDefmodules;
+   Defmodule *CurrentModule;
+   Defmodule *LastDefmodule;
+   unsigned NumberOfModuleItems;
+   struct moduleItem *ListOfModuleItems;
+   long ModuleChangeIndex;
+   bool MainModuleRedefinable;
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   struct portConstructItem *ListOfPortConstructItems;
+   unsigned short NumberOfDefmodules;
+   struct voidCallFunctionItem *AfterModuleDefinedFunctions;
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   struct CodeGeneratorItem *DefmoduleCodeItem;
+#endif
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   unsigned long BNumberOfDefmodules;
+   unsigned long NumberOfPortItems;
+   struct portItem *PortItemArray;
+   Defmodule *DefmoduleArray;
+#endif
+  };
+
+#define DefmoduleData(theEnv) ((struct defmoduleData *) GetEnvironmentData(theEnv,DEFMODULE_DATA))
+
+   void                           InitializeDefmodules(Environment *);
+   Defmodule                     *FindDefmodule(Environment *,const char *);
+   const char                    *DefmoduleName(Defmodule *);
+   const char                    *DefmodulePPForm(Defmodule *);
+   Defmodule                     *GetNextDefmodule(Environment *,Defmodule *);
+   void                           RemoveAllDefmodules(Environment *,void *);
+   int                            AllocateModuleStorage(void);
+   unsigned                       RegisterModuleItem(Environment *,const char *,
+                                                     AllocateModuleFunction *,
+                                                     FreeModuleFunction *,
+                                                     void *(*)(Environment *,unsigned long),
+                                                     void (*)(Environment *,FILE *,unsigned long,unsigned int,unsigned int),
+                                                     FindConstructFunction *);
+   void                          *GetModuleItem(Environment *,Defmodule *,unsigned);
+   void                           SetModuleItem(Environment *,Defmodule *,unsigned,void *);
+   Defmodule                     *GetCurrentModule(Environment *);
+   Defmodule                     *SetCurrentModule(Environment *,Defmodule *);
+   void                           GetCurrentModuleCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SetCurrentModuleCommand(Environment *,UDFContext *,UDFValue *);
+   unsigned                       GetNumberOfModuleItems(Environment *);
+   void                           CreateMainModule(Environment *,void *);
+   void                           SetListOfDefmodules(Environment *,Defmodule *);
+   struct moduleItem             *GetListOfModuleItems(Environment *);
+   struct moduleItem             *FindModuleItem(Environment *,const char *);
+   void                           SaveCurrentModule(Environment *);
+   void                           RestoreCurrentModule(Environment *);
+   void                           AddAfterModuleChangeFunction(Environment *,const char *,VoidCallFunction *,int,void *);
+   void                           IllegalModuleSpecifierMessage(Environment *);
+   void                           AllocateDefmoduleGlobals(Environment *);
+   unsigned short                 GetNumberOfDefmodules(Environment *);
+
+#endif /* _H_moduldef */
+
+
diff --git a/clips/modulpsr.c b/clips/modulpsr.c
new file mode 100755
index 000000000..73550fa71
--- /dev/null
+++ b/clips/modulpsr.c
@@ -0,0 +1,1150 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/01/16             */
+   /*                                                     */
+   /*              DEFMODULE PARSER MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parses a defmodule construct.                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when DEFMODULE_CONSTRUCT   */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFMODULE_CONSTRUCT && (! RUN_TIME) && (! BLOAD_ONLY)
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "constant.h"
+#include "constrct.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#include "modulpsr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                       ParsePortSpecifications(Environment *,
+                                                             const char *,struct token *,
+                                                             Defmodule *);
+   static bool                       ParseImportSpec(Environment *,const char *,struct token *,
+                                                     Defmodule *);
+   static bool                       ParseExportSpec(Environment *,const char *,struct token *,
+                                                     Defmodule *,
+                                                     Defmodule *);
+   static bool                       DeleteDefmodule(Defmodule *,Environment *);
+   static bool                       FindMultiImportConflict(Environment *,Defmodule *);
+   static void                       NotExportedErrorMessage(Environment *,const char *,const char *,const char *);
+
+/******************************************/
+/* SetNumberOfDefmodules: Sets the number */
+/*   of defmodules currently defined.     */
+/******************************************/
+void SetNumberOfDefmodules(
+  Environment *theEnv,
+  unsigned short value)
+  {
+   DefmoduleData(theEnv)->NumberOfDefmodules = value;
+  }
+
+/****************************************************/
+/* AddAfterModuleChangeFunction: Adds a function to */
+/*   the list of functions that are to be called    */
+/*   after a module change occurs.                  */
+/****************************************************/
+void AddAfterModuleDefinedFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunction *func,
+  int priority,
+  void *context)
+  {
+   DefmoduleData(theEnv)->AfterModuleDefinedFunctions =
+     AddVoidFunctionToCallList(theEnv,name,priority,func,DefmoduleData(theEnv)->AfterModuleDefinedFunctions,context);
+  }
+
+/******************************************************/
+/* AddPortConstructItem: Adds an item to the list of  */
+/*   items that can be imported/exported by a module. */
+/******************************************************/
+void AddPortConstructItem(
+  Environment *theEnv,
+  const char *theName,
+  TokenType theType)
+  {
+   struct portConstructItem *newItem;
+
+   newItem = get_struct(theEnv,portConstructItem);
+   newItem->constructName = theName;
+   newItem->typeExpected = theType;
+   newItem->next = DefmoduleData(theEnv)->ListOfPortConstructItems;
+   DefmoduleData(theEnv)->ListOfPortConstructItems = newItem;
+  }
+
+/******************************************************/
+/* ParseDefmodule: Coordinates all actions necessary  */
+/*   for the parsing and creation of a defmodule into */
+/*   the current environment.                         */
+/******************************************************/
+bool ParseDefmodule(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   CLIPSLexeme *defmoduleName;
+   Defmodule *newDefmodule;
+   struct token inputToken;
+   unsigned int i;
+   struct moduleItem *theItem;
+   struct portItem *portSpecs, *nextSpec;
+   struct defmoduleItemHeader *theHeader;
+   struct voidCallFunctionItem *defineFunctions;
+   Defmodule *redefiningMainModule = NULL;
+   bool parseError;
+   struct portItem *oldImportList = NULL, *oldExportList = NULL;
+   bool overwrite = false;
+
+   /*================================================*/
+   /* Flush the buffer which stores the pretty print */
+   /* representation for a module.  Add the already  */
+   /* parsed keyword defmodule to this buffer.       */
+   /*================================================*/
+
+   SetPPBufferStatus(theEnv,true);
+   FlushPPBuffer(theEnv);
+   SetIndentDepth(theEnv,3);
+   SavePPBuffer(theEnv,"(defmodule ");
+
+   /*===============================*/
+   /* Modules cannot be loaded when */
+   /* a binary load is in effect.   */
+   /*===============================*/
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv) == true) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"defmodule");
+      return true;
+     }
+#endif
+
+   /*=====================================================*/
+   /* Parse the name and comment fields of the defmodule. */
+   /* Remove the defmodule if it already exists.          */
+   /*=====================================================*/
+
+   defmoduleName = GetConstructNameAndComment(theEnv,readSource,&inputToken,"defmodule",
+                                              (FindConstructFunction *) FindDefmodule,
+                                              (DeleteConstructFunction *) DeleteDefmodule,"+",
+                                              true,true,false,false);
+   if (defmoduleName == NULL) { return true; }
+
+   if (strcmp(defmoduleName->contents,"MAIN") == 0)
+     { redefiningMainModule = FindDefmodule(theEnv,"MAIN"); }
+
+   /*==============================================*/
+   /* Create the defmodule structure if necessary. */
+   /*==============================================*/
+
+   if (redefiningMainModule == NULL)
+     {
+      newDefmodule = FindDefmodule(theEnv,defmoduleName->contents);
+      if (newDefmodule)
+        { overwrite = true; }
+      else
+        {
+         newDefmodule = get_struct(theEnv,defmodule);
+         newDefmodule->header.name = defmoduleName;
+         newDefmodule->header.whichModule = NULL;
+         newDefmodule->header.usrData = NULL;
+         newDefmodule->header.constructType = DEFMODULE;
+         newDefmodule->header.env = theEnv;
+         newDefmodule->header.next = NULL;
+        }
+     }
+   else
+     {
+      overwrite = true;
+      newDefmodule = redefiningMainModule;
+     }
+
+   if (overwrite)
+     {
+      oldImportList = newDefmodule->importList;
+      oldExportList = newDefmodule->exportList;
+     }
+
+   newDefmodule->importList = NULL;
+   newDefmodule->exportList = NULL;
+
+   /*===================================*/
+   /* Finish parsing the defmodule (its */
+   /* import/export specifications).    */
+   /*===================================*/
+
+   parseError = ParsePortSpecifications(theEnv,readSource,&inputToken,newDefmodule);
+
+   /*====================================*/
+   /* Check for import/export conflicts. */
+   /*====================================*/
+
+   if (! parseError) parseError = FindMultiImportConflict(theEnv,newDefmodule);
+
+   /*======================================================*/
+   /* If an error occured in parsing or an import conflict */
+   /* was detected, abort the definition of the defmodule. */
+   /* If we're only checking syntax, then we want to exit  */
+   /* at this point as well.                               */
+   /*======================================================*/
+
+   if (parseError || ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      while (newDefmodule->importList != NULL)
+        {
+         nextSpec = newDefmodule->importList->next;
+         rtn_struct(theEnv,portItem,newDefmodule->importList);
+         newDefmodule->importList = nextSpec;
+        }
+
+      while (newDefmodule->exportList != NULL)
+        {
+         nextSpec = newDefmodule->exportList->next;
+         rtn_struct(theEnv,portItem,newDefmodule->exportList);
+         newDefmodule->exportList = nextSpec;
+        }
+
+      if ((redefiningMainModule == NULL) && (! overwrite))
+        { rtn_struct(theEnv,defmodule,newDefmodule); }
+
+      if (overwrite)
+        {
+         newDefmodule->importList = oldImportList;
+         newDefmodule->exportList = oldExportList;
+        }
+
+      if (parseError) return true;
+      return false;
+     }
+
+   /*===============================================*/
+   /* Increment the symbol table counts for symbols */
+   /* used in the defmodule data structures.        */
+   /*===============================================*/
+
+   if (redefiningMainModule == NULL)
+     { IncrementLexemeCount(newDefmodule->header.name); }
+   else
+     {
+      if ((newDefmodule->importList != NULL) ||
+          (newDefmodule->exportList != NULL))
+        { DefmoduleData(theEnv)->MainModuleRedefinable = false; }
+     }
+
+   for (portSpecs = newDefmodule->importList; portSpecs != NULL; portSpecs = portSpecs->next)
+     {
+      if (portSpecs->moduleName != NULL) IncrementLexemeCount(portSpecs->moduleName);
+      if (portSpecs->constructType != NULL) IncrementLexemeCount(portSpecs->constructType);
+      if (portSpecs->constructName != NULL) IncrementLexemeCount(portSpecs->constructName);
+     }
+
+   for (portSpecs = newDefmodule->exportList; portSpecs != NULL; portSpecs = portSpecs->next)
+     {
+      if (portSpecs->moduleName != NULL) IncrementLexemeCount(portSpecs->moduleName);
+      if (portSpecs->constructType != NULL) IncrementLexemeCount(portSpecs->constructType);
+      if (portSpecs->constructName != NULL) IncrementLexemeCount(portSpecs->constructName);
+     }
+
+   /*====================================================*/
+   /* Allocate storage for the module's construct lists. */
+   /*====================================================*/
+
+   if (redefiningMainModule != NULL) { /* Do nothing */ }
+   else if (DefmoduleData(theEnv)->NumberOfModuleItems == 0) newDefmodule->itemsArray = NULL;
+   else
+     {
+      newDefmodule->itemsArray = (struct defmoduleItemHeader **) gm2(theEnv,sizeof(void *) * DefmoduleData(theEnv)->NumberOfModuleItems);
+      for (i = 0, theItem = DefmoduleData(theEnv)->ListOfModuleItems;
+           (i < DefmoduleData(theEnv)->NumberOfModuleItems) && (theItem != NULL);
+           i++, theItem = theItem->next)
+        {
+         if (theItem->allocateFunction == NULL)
+           { newDefmodule->itemsArray[i] = NULL; }
+         else
+           {
+            newDefmodule->itemsArray[i] = (struct defmoduleItemHeader *)
+                                          (*theItem->allocateFunction)(theEnv);
+            theHeader = (struct defmoduleItemHeader *) newDefmodule->itemsArray[i];
+            theHeader->theModule = newDefmodule;
+            theHeader->firstItem = NULL;
+            theHeader->lastItem = NULL;
+           }
+        }
+     }
+
+   /*=======================================*/
+   /* Save the pretty print representation. */
+   /*=======================================*/
+
+   SavePPBuffer(theEnv,"\n");
+
+   if (GetConserveMemory(theEnv) == true)
+     { newDefmodule->header.ppForm = NULL; }
+   else
+     { newDefmodule->header.ppForm = CopyPPBuffer(theEnv); }
+
+   /*==============================================*/
+   /* Add the defmodule to the list of defmodules. */
+   /*==============================================*/
+
+   if (redefiningMainModule == NULL)
+     {
+      if (DefmoduleData(theEnv)->LastDefmodule == NULL) DefmoduleData(theEnv)->ListOfDefmodules = newDefmodule;
+      else DefmoduleData(theEnv)->LastDefmodule->header.next = &newDefmodule->header;
+      DefmoduleData(theEnv)->LastDefmodule = newDefmodule;
+      newDefmodule->header.bsaveID = DefmoduleData(theEnv)->NumberOfDefmodules++;
+     }
+
+   SetCurrentModule(theEnv,newDefmodule);
+
+   /*=========================================*/
+   /* Call any functions required by other    */
+   /* constructs when a new module is defined */
+   /*=========================================*/
+
+   for (defineFunctions = DefmoduleData(theEnv)->AfterModuleDefinedFunctions;
+        defineFunctions != NULL;
+        defineFunctions = defineFunctions->next)
+     { (* (void (*)(void *)) defineFunctions->func)(theEnv); }
+
+   /*===============================================*/
+   /* Defmodule successfully parsed with no errors. */
+   /*===============================================*/
+
+   return false;
+  }
+
+/*************************************************************/
+/* DeleteDefmodule: Used by the parsing routine to determine */
+/*   if a module can be redefined. Only the MAIN module can  */
+/*   be redefined (and it can only be redefined once).       */
+/*************************************************************/
+static bool DeleteDefmodule(
+  Defmodule *theDefmodule,
+  Environment *allEnv)
+  {
+   Environment *theEnv;
+   
+   if (theDefmodule == NULL)
+     { theEnv = allEnv; }
+   else
+     { theEnv = theDefmodule->header.env; }
+   
+   if (strcmp(DefmoduleName(theDefmodule),"MAIN") == 0)
+     { return(DefmoduleData(theEnv)->MainModuleRedefinable); }
+
+   return false;
+  }
+
+/*********************************************************/
+/* ParsePortSpecifications: Parses the import and export */
+/*   specifications found in a defmodule construct.      */
+/*********************************************************/
+static bool ParsePortSpecifications(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  Defmodule *theDefmodule)
+  {
+   bool error;
+
+   /*=============================*/
+   /* The import and export lists */
+   /* are initially empty.        */
+   /*=============================*/
+
+   theDefmodule->importList = NULL;
+   theDefmodule->exportList = NULL;
+
+   /*==========================================*/
+   /* Parse import/export specifications until */
+   /* a right parenthesis is encountered.      */
+   /*==========================================*/
+
+   while (theToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      /*========================================*/
+      /* Look for the opening left parenthesis. */
+      /*========================================*/
+
+      if (theToken->tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"defmodule");
+         return true;
+        }
+
+      /*====================================*/
+      /* Look for the import/export keyword */
+      /* and call the appropriate functions */
+      /* for parsing the specification.     */
+      /*====================================*/
+
+      GetToken(theEnv,readSource,theToken);
+
+      if (theToken->tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"defmodule");
+         return true;
+        }
+
+      if (strcmp(theToken->lexemeValue->contents,"import") == 0)
+        {
+         error = ParseImportSpec(theEnv,readSource,theToken,theDefmodule);
+        }
+      else if (strcmp(theToken->lexemeValue->contents,"export") == 0)
+        {
+         error = ParseExportSpec(theEnv,readSource,theToken,theDefmodule,NULL);
+        }
+      else
+        {
+         SyntaxErrorMessage(theEnv,"defmodule");
+         return true;
+        }
+
+      if (error) return true;
+
+      /*============================================*/
+      /* Begin parsing the next port specification. */
+      /*============================================*/
+
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,theToken);
+
+      if (theToken->tknType == RIGHT_PARENTHESIS_TOKEN)
+        {
+         PPBackup(theEnv);
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv,")");
+        }
+     }
+
+   /*===================================*/
+   /* Return false to indicate no error */
+   /* occurred while parsing the        */
+   /* import/export specifications.     */
+   /*===================================*/
+
+   return false;
+  }
+
+/**********************************************************/
+/* ParseImportSpec: Parses import specifications found in */
+/*   a defmodule construct.                               */
+/*                                                        */
+/* <import-spec> ::= (import <module-name> <port-item>)   */
+/*                                                        */
+/* <port-item>   ::= ?ALL |                               */
+/*                   ?NONE |                              */
+/*                   <construct-name> ?ALL |              */
+/*                   <construct-name> ?NONE |             */
+/*                   <construct-name> <names>*            */
+/**********************************************************/
+static bool ParseImportSpec(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  Defmodule *newModule)
+  {
+   Defmodule *theModule;
+   struct portItem *thePort, *oldImportSpec;
+   bool found;
+   unsigned int count;
+
+   /*===========================*/
+   /* Look for the module name. */
+   /*===========================*/
+
+   SavePPBuffer(theEnv," ");
+
+   GetToken(theEnv,readSource,theToken);
+
+   if (theToken->tknType != SYMBOL_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"defmodule import specification");
+      return true;
+     }
+
+   /*=====================================*/
+   /* Verify the existence of the module. */
+   /*=====================================*/
+
+   if ((theModule = FindDefmodule(theEnv,theToken->lexemeValue->contents)) == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defmodule",theToken->lexemeValue->contents,true);
+      return true;
+     }
+
+   /*========================================*/
+   /* If the specified module doesn't export */
+   /* any constructs, then the import        */
+   /* specification is meaningless.          */
+   /*========================================*/
+
+   if (theModule->exportList == NULL)
+     {
+      NotExportedErrorMessage(theEnv,DefmoduleName(theModule),NULL,NULL);
+      return true;
+     }
+
+   /*==============================================*/
+   /* Parse the remaining portion of the import    */
+   /* specification and return if an error occurs. */
+   /*==============================================*/
+
+   oldImportSpec = newModule->importList;
+   if (ParseExportSpec(theEnv,readSource,theToken,newModule,theModule)) return true;
+
+   /*========================================================*/
+   /* If the ?NONE keyword was used with the import spec,    */
+   /* then no constructs were actually imported and the      */
+   /* import spec does not need to be checked for conflicts. */
+   /*========================================================*/
+
+   if (newModule->importList == oldImportSpec) return false;
+
+   /*======================================================*/
+   /* Check to see if the construct being imported can be  */
+   /* by the specified module. This check exported doesn't */
+   /* guarantee that a specific named construct actually   */
+   /* exists. It just checks that it could be exported if  */
+   /* it does exists.                                      */
+   /*======================================================*/
+
+   if (newModule->importList->constructType != NULL)
+     {
+      /*=============================*/
+      /* Look for the construct in   */
+      /* the module that exports it. */
+      /*=============================*/
+
+      found = false;
+      for (thePort = theModule->exportList;
+           (thePort != NULL) && (! found);
+           thePort = thePort->next)
+        {
+         if (thePort->constructType == NULL) found = true;
+         else if (thePort->constructType == newModule->importList->constructType)
+           {
+            if (newModule->importList->constructName == NULL) found = true;
+            else if (thePort->constructName == NULL) found = true;
+            else if (thePort->constructName == newModule->importList->constructName)
+              { found = true; }
+           }
+        }
+
+      /*=======================================*/
+      /* If it's not exported by the specified */
+      /* module, print an error message.       */
+      /*=======================================*/
+
+      if (! found)
+        {
+         if (newModule->importList->constructName == NULL)
+           {
+            NotExportedErrorMessage(theEnv,DefmoduleName(theModule),
+                                    newModule->importList->constructType->contents,
+                                    NULL);
+           }
+         else
+           {
+            NotExportedErrorMessage(theEnv,DefmoduleName(theModule),
+                                    newModule->importList->constructType->contents,
+                                    newModule->importList->constructName->contents);
+           }
+         return true;
+        }
+     }
+
+   /*======================================================*/
+   /* Verify that specific named constructs actually exist */
+   /* and can be seen from the module importing them.      */
+   /*======================================================*/
+
+   SaveCurrentModule(theEnv);
+   SetCurrentModule(theEnv,newModule);
+
+   for (thePort = newModule->importList;
+        thePort != NULL;
+        thePort = thePort->next)
+     {
+      if ((thePort->constructType == NULL) || (thePort->constructName == NULL))
+        { continue; }
+
+      theModule = FindDefmodule(theEnv,thePort->moduleName->contents);
+      SetCurrentModule(theEnv,theModule);
+      if (FindImportedConstruct(theEnv,thePort->constructType->contents,NULL,
+                                thePort->constructName->contents,&count,
+                                true,NULL) == NULL)
+        {
+         NotExportedErrorMessage(theEnv,DefmoduleName(theModule),
+                                 thePort->constructType->contents,
+                                 thePort->constructName->contents);
+         RestoreCurrentModule(theEnv);
+         return true;
+        }
+     }
+
+   RestoreCurrentModule(theEnv);
+
+   /*===============================================*/
+   /* The import list has been successfully parsed. */
+   /*===============================================*/
+
+   return false;
+  }
+
+/**********************************************************/
+/* ParseExportSpec: Parses export specifications found in */
+/*   a defmodule construct. This includes parsing the     */
+/*   remaining specification found in an import           */
+/*   specification after the module name.                 */
+/**********************************************************/
+static bool ParseExportSpec(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  Defmodule *newModule,
+  Defmodule *importModule)
+  {
+   struct portItem *newPort;
+   CLIPSLexeme *theConstruct, *moduleName;
+   struct portConstructItem *thePortConstruct;
+   const char *errorMessage;
+
+   /*===========================================*/
+   /* Set up some variables for error messages. */
+   /*===========================================*/
+
+   if (importModule != NULL)
+     {
+      errorMessage = "defmodule import specification";
+      moduleName = importModule->header.name;
+     }
+   else
+     {
+      errorMessage = "defmodule export specification";
+      moduleName = NULL;
+     }
+
+   /*=============================================*/
+   /* Handle the special variables ?ALL and ?NONE */
+   /* in the import/export specification.         */
+   /*=============================================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,theToken);
+
+   if (theToken->tknType == SF_VARIABLE_TOKEN)
+     {
+      /*==============================*/
+      /* Check to see if the variable */
+      /* is either ?ALL or ?NONE.     */
+      /*==============================*/
+
+      if (strcmp(theToken->lexemeValue->contents,"ALL") == 0)
+        {
+         newPort = (struct portItem *) get_struct(theEnv,portItem);
+         newPort->moduleName = moduleName;
+         newPort->constructType = NULL;
+         newPort->constructName = NULL;
+         newPort->next = NULL;
+        }
+      else if (strcmp(theToken->lexemeValue->contents,"NONE") == 0)
+        { newPort = NULL; }
+      else
+        {
+         SyntaxErrorMessage(theEnv,errorMessage);
+         return true;
+        }
+
+      /*=======================================================*/
+      /* The export/import specification must end with a right */
+      /* parenthesis after ?ALL or ?NONE at this point.        */
+      /*=======================================================*/
+
+      GetToken(theEnv,readSource,theToken);
+
+      if (theToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         if (newPort != NULL) rtn_struct(theEnv,portItem,newPort);
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv," ");
+         SavePPBuffer(theEnv,theToken->printForm);
+         SyntaxErrorMessage(theEnv,errorMessage);
+         return true;
+        }
+
+      /*=====================================*/
+      /* Add the new specification to either */
+      /* the import or export list.          */
+      /*=====================================*/
+
+      if (newPort != NULL)
+        {
+         if (importModule != NULL)
+           {
+            newPort->next = newModule->importList;
+            newModule->importList = newPort;
+           }
+         else
+           {
+            newPort->next = newModule->exportList;
+            newModule->exportList = newPort;
+           }
+        }
+
+      /*============================================*/
+      /* Return false to indicate the import/export */
+      /* specification was successfully parsed.     */
+      /*============================================*/
+
+      return false;
+     }
+
+   /*========================================================*/
+   /* If the ?ALL and ?NONE keywords were not used, then the */
+   /* token must be the name of an importable construct.     */
+   /*========================================================*/
+
+   if (theToken->tknType != SYMBOL_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,errorMessage);
+      return true;
+     }
+
+   theConstruct = theToken->lexemeValue;
+
+   if ((thePortConstruct = ValidPortConstructItem(theEnv,theConstruct->contents)) == NULL)
+     {
+      SyntaxErrorMessage(theEnv,errorMessage);
+      return true;
+     }
+
+   /*=============================================================*/
+   /* If the next token is the special variable ?ALL, then all    */
+   /* constructs of the specified type are imported/exported. If  */
+   /* the next token is the special variable ?NONE, then no       */
+   /* constructs of the specified type will be imported/exported. */
+   /*=============================================================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,theToken);
+
+   if (theToken->tknType == SF_VARIABLE_TOKEN)
+     {
+      /*==============================*/
+      /* Check to see if the variable */
+      /* is either ?ALL or ?NONE.     */
+      /*==============================*/
+
+      if (strcmp(theToken->lexemeValue->contents,"ALL") == 0)
+        {
+         newPort = (struct portItem *) get_struct(theEnv,portItem);
+         newPort->moduleName = moduleName;
+         newPort->constructType = theConstruct;
+         newPort->constructName = NULL;
+         newPort->next = NULL;
+        }
+      else if (strcmp(theToken->lexemeValue->contents,"NONE") == 0)
+        { newPort = NULL; }
+      else
+        {
+         SyntaxErrorMessage(theEnv,errorMessage);
+         return true;
+        }
+
+      /*=======================================================*/
+      /* The export/import specification must end with a right */
+      /* parenthesis after ?ALL or ?NONE at this point.        */
+      /*=======================================================*/
+
+      GetToken(theEnv,readSource,theToken);
+
+      if (theToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         if (newPort != NULL) rtn_struct(theEnv,portItem,newPort);
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv," ");
+         SavePPBuffer(theEnv,theToken->printForm);
+         SyntaxErrorMessage(theEnv,errorMessage);
+         return true;
+        }
+
+      /*=====================================*/
+      /* Add the new specification to either */
+      /* the import or export list.          */
+      /*=====================================*/
+
+      if (newPort != NULL)
+        {
+         if (importModule != NULL)
+           {
+            newPort->next = newModule->importList;
+            newModule->importList = newPort;
+           }
+         else
+           {
+            newPort->next = newModule->exportList;
+            newModule->exportList = newPort;
+           }
+        }
+
+      /*============================================*/
+      /* Return false to indicate the import/export */
+      /* specification was successfully parsed.     */
+      /*============================================*/
+
+      return false;
+     }
+
+   /*============================================*/
+   /* There must be at least one named construct */
+   /* in the import/export list at this point.   */
+   /*============================================*/
+
+   if (theToken->tknType == RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,errorMessage);
+      return true;
+     }
+
+   /*=====================================*/
+   /* Read in the list of imported items. */
+   /*=====================================*/
+
+   while (theToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      if (theToken->tknType != thePortConstruct->typeExpected)
+        {
+         SyntaxErrorMessage(theEnv,errorMessage);
+         return true;
+        }
+
+      /*========================================*/
+      /* Create the data structure to represent */
+      /* the import/export specification for    */
+      /* the named construct.                   */
+      /*========================================*/
+
+      newPort = (struct portItem *) get_struct(theEnv,portItem);
+      newPort->moduleName = moduleName;
+      newPort->constructType = theConstruct;
+      newPort->constructName = theToken->lexemeValue;
+
+      /*=====================================*/
+      /* Add the new specification to either */
+      /* the import or export list.          */
+      /*=====================================*/
+
+      if (importModule != NULL)
+        {
+         newPort->next = newModule->importList;
+         newModule->importList = newPort;
+        }
+      else
+        {
+         newPort->next = newModule->exportList;
+         newModule->exportList = newPort;
+        }
+
+      /*===================================*/
+      /* Move on to the next import/export */
+      /* specification.                    */
+      /*===================================*/
+
+      SavePPBuffer(theEnv," ");
+      GetToken(theEnv,readSource,theToken);
+     }
+
+   /*=============================*/
+   /* Fix up pretty print buffer. */
+   /*=============================*/
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+
+   /*============================================*/
+   /* Return false to indicate the import/export */
+   /* specification was successfully parsed.     */
+   /*============================================*/
+
+   return false;
+  }
+
+/*************************************************************/
+/* ValidPortConstructItem: Returns true if a given construct */
+/*   name is in the list of constructs which can be exported */
+/*   and imported, otherwise false is returned.              */
+/*************************************************************/
+struct portConstructItem *ValidPortConstructItem(
+  Environment *theEnv,
+  const char *theName)
+  {
+   struct portConstructItem *theItem;
+
+   for (theItem = DefmoduleData(theEnv)->ListOfPortConstructItems;
+        theItem != NULL;
+        theItem = theItem->next)
+     { if (strcmp(theName,theItem->constructName) == 0) return(theItem); }
+
+   return NULL;
+  }
+
+/***********************************************************/
+/* FindMultiImportConflict: Determines if a module imports */
+/*   the same named construct from more than one module    */
+/*   (i.e. an ambiguous reference which is not allowed).   */
+/***********************************************************/
+static bool FindMultiImportConflict(
+  Environment *theEnv,
+  Defmodule *theModule)
+  {
+   Defmodule *testModule;
+   unsigned int count;
+   struct portConstructItem *thePCItem;
+   Construct *theConstruct;
+   ConstructHeader *theCItem;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*============================*/
+   /* Loop through every module. */
+   /*============================*/
+
+   for (testModule = GetNextDefmodule(theEnv,NULL);
+        testModule != NULL;
+        testModule = GetNextDefmodule(theEnv,testModule))
+     {
+      /*========================================*/
+      /* Loop through every construct type that */
+      /* can be imported/exported by a module.  */
+      /*========================================*/
+
+      for (thePCItem = DefmoduleData(theEnv)->ListOfPortConstructItems;
+           thePCItem != NULL;
+           thePCItem = thePCItem->next)
+        {
+         SetCurrentModule(theEnv,testModule);
+
+         /*=====================================================*/
+         /* Loop through every construct of the specified type. */
+         /*=====================================================*/
+
+         theConstruct = FindConstruct(theEnv,thePCItem->constructName);
+
+         for (theCItem = (*theConstruct->getNextItemFunction)(theEnv,NULL);
+              theCItem != NULL;
+              theCItem = (*theConstruct->getNextItemFunction)(theEnv,theCItem))
+            {
+             /*===============================================*/
+             /* Check to see if the specific construct in the */
+             /* module can be imported with more than one     */
+             /* reference into the module we're examining for */
+             /* ambiguous import  specifications.             */
+             /*===============================================*/
+
+             SetCurrentModule(theEnv,theModule);
+             FindImportedConstruct(theEnv,thePCItem->constructName,NULL,
+                                   (*theConstruct->getConstructNameFunction)(theCItem)->contents,
+                                   &count,false,NULL);
+             if (count > 1)
+               {
+                ImportExportConflictMessage(theEnv,"defmodule",DefmoduleName(theModule),
+                                            thePCItem->constructName,
+                                            (*theConstruct->getConstructNameFunction)(theCItem)->contents);
+                RestoreCurrentModule(theEnv);
+                return true;
+               }
+
+             SetCurrentModule(theEnv,testModule);
+            }
+        }
+     }
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+
+   /*=======================================*/
+   /* Return false to indicate no ambiguous */
+   /* references were found.                */
+   /*=======================================*/
+
+   return false;
+  }
+
+/******************************************************/
+/* NotExportedErrorMessage: Generalized error message */
+/*  for indicating that a construct type or specific  */
+/*  named construct is not exported.                  */
+/******************************************************/
+static void NotExportedErrorMessage(
+  Environment *theEnv,
+  const char *theModule,
+  const char *theConstruct,
+  const char *theName)
+  {
+   PrintErrorID(theEnv,"MODULPSR",1,true);
+   WriteString(theEnv,STDERR,"Module '");
+   WriteString(theEnv,STDERR,theModule);
+   WriteString(theEnv,STDERR,"' does not export ");
+
+   if (theConstruct == NULL) WriteString(theEnv,STDERR,"any constructs");
+   else if (theName == NULL)
+     {
+      WriteString(theEnv,STDERR,"any ");
+      WriteString(theEnv,STDERR,theConstruct);
+      WriteString(theEnv,STDERR," constructs");
+     }
+   else
+     {
+      WriteString(theEnv,STDERR,"the ");
+      WriteString(theEnv,STDERR,theConstruct);
+      WriteString(theEnv,STDERR," '");
+      WriteString(theEnv,STDERR,theName);
+      WriteString(theEnv,STDERR,"'");
+     }
+
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/*************************************************************/
+/* FindImportExportConflict: Determines if the definition of */
+/*   a construct would cause an import/export conflict. The  */
+/*   construct is not yet defined when this function is      */
+/*   called. True is returned if an import/export conflicts  */
+/*   is found, otherwise false is returned.                  */
+/*************************************************************/
+bool FindImportExportConflict(
+  Environment *theEnv,
+  const char *constructName,
+  Defmodule *matchModule,
+  const char *findName)
+  {
+   Defmodule *theModule;
+   struct moduleItem *theModuleItem;
+   unsigned int count;
+
+   /*===========================================================*/
+   /* If the construct type can't be imported or exported, then */
+   /* it's not possible to have an import/export conflict.      */
+   /*===========================================================*/
+
+   if (ValidPortConstructItem(theEnv,constructName) == NULL) return false;
+
+   /*============================================*/
+   /* There module name should already have been */
+   /* separated fromthe construct's name.        */
+   /*============================================*/
+
+   if (FindModuleSeparator(findName)) return false;
+
+   /*===============================================================*/
+   /* The construct must be capable of being stored within a module */
+   /* (this test should never fail). The construct must also have   */
+   /* a find function associated with it so we can actually look    */
+   /* for import/export conflicts.                                  */
+   /*===============================================================*/
+
+   if ((theModuleItem = FindModuleItem(theEnv,constructName)) == NULL) return false;
+
+   if (theModuleItem->findFunction == NULL) return false;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*================================================================*/
+   /* Look at each module and count each definition of the specified */
+   /* construct which is visible to the module. If more than one     */
+   /* definition is visible, then an import/export conflict exists   */
+   /* and true is returned.                                          */
+   /*================================================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      FindImportedConstruct(theEnv,constructName,NULL,findName,&count,true,matchModule);
+      if (count > 1)
+        {
+         RestoreCurrentModule(theEnv);
+         return true;
+        }
+     }
+
+   /*==========================================*/
+   /* Restore the current module. No conflicts */
+   /* were detected so false is returned.      */
+   /*==========================================*/
+
+   RestoreCurrentModule(theEnv);
+   return false;
+  }
+
+#endif /* DEFMODULE_CONSTRUCT && (! RUN_TIME) && (! BLOAD_ONLY) */
+
+
diff --git a/clips/modulpsr.h b/clips/modulpsr.h
new file mode 100755
index 000000000..c5cfa192f
--- /dev/null
+++ b/clips/modulpsr.h
@@ -0,0 +1,69 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/01/16            */
+   /*                                                     */
+   /*             DEFMODULE PARSER HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when DEFMODULE_CONSTRUCT   */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_modulpsr
+
+#pragma once
+
+#define _H_modulpsr
+
+struct portConstructItem;
+
+#include "evaluatn.h"
+#include "moduldef.h"
+#include "symbol.h"
+#include "scanner.h"
+
+struct portConstructItem
+  {
+   const char *constructName;
+   TokenType typeExpected;
+   struct portConstructItem *next;
+  };
+
+   void                           SetNumberOfDefmodules(Environment *,unsigned short);
+   void                           AddAfterModuleDefinedFunction(Environment *,const char *,VoidCallFunction *,int,void *);
+   bool                           ParseDefmodule(Environment *,const char *);
+   void                           AddPortConstructItem(Environment *,const char *,TokenType);
+   struct portConstructItem      *ValidPortConstructItem(Environment *,const char *);
+   bool                           FindImportExportConflict(Environment *,const char *,Defmodule *,const char *);
+
+#endif /* _H_modulpsr */
+
+
diff --git a/clips/modulutl.c b/clips/modulutl.c
new file mode 100755
index 000000000..d2e9f64eb
--- /dev/null
+++ b/clips/modulutl.c
@@ -0,0 +1,1018 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  01/14/18             */
+   /*                                                     */
+   /*              DEFMODULE UTILITY MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for parsing module/construct   */
+/*   names and searching through modules for specific        */
+/*   constructs.                                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Used genstrncpy instead of strncpy.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Used strstr function to find module separator. */
+/*                                                           */
+/*      6.40: Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include "envrnmnt.h"
+#include "cstrcpsr.h"
+#include "memalloc.h"
+#include "modulpsr.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+#include "watch.h"
+
+#include "modulutl.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static ConstructHeader    *SearchImportedConstructModules(Environment *,CLIPSLexeme *,Defmodule *,
+                                                             struct moduleItem *,CLIPSLexeme *,
+                                                             unsigned int *,bool,Defmodule *);
+
+/********************************************************************/
+/* FindModuleSeparator: Finds the :: separator which delineates the */
+/*   boundary between a module name and a construct name. The value */
+/*   zero is returned if the separator is not found, otherwise the  */
+/*   position of the second colon within the string is returned.    */
+/********************************************************************/
+unsigned FindModuleSeparator(
+  const char *theString)
+  {
+   const char *sep;
+
+   sep = strstr(theString,"::");
+
+   if (sep == NULL)
+     { return 0; }
+   
+   return ((unsigned) (sep - theString) + 1);
+  }
+
+/*******************************************************************/
+/* ExtractModuleName: Given the position of the :: separator and a */
+/*   module/construct name joined using the separator, returns a   */
+/*   symbol reference to the module name (or NULL if a module name */
+/*   cannot be extracted).                                         */
+/*******************************************************************/
+CLIPSLexeme *ExtractModuleName(
+  Environment *theEnv,
+  unsigned thePosition,
+  const char *theString)
+  {
+   char *newString;
+   CLIPSLexeme *returnValue;
+
+   /*=============================================*/
+   /* Return NULL if the :: is in a position such */
+   /* that a module name can't be extracted.      */
+   /*=============================================*/
+
+   if (thePosition <= 1) return NULL;
+
+   /*==========================================*/
+   /* Allocate storage for a temporary string. */
+   /*==========================================*/
+
+   newString = (char *) gm2(theEnv,thePosition);
+
+   /*======================================================*/
+   /* Copy the entire module/construct name to the string. */
+   /*======================================================*/
+
+   genstrncpy(newString,theString,
+           (STD_SIZE) thePosition - 1);
+
+   /*========================================================*/
+   /* Place an end of string marker where the :: is located. */
+   /*========================================================*/
+
+   newString[thePosition-1] = EOS;
+
+   /*=====================================================*/
+   /* Add the module name (the truncated module/construct */
+   /* name) to the symbol table.                          */
+   /*=====================================================*/
+
+   returnValue = CreateSymbol(theEnv,newString);
+
+   /*=============================================*/
+   /* Return the storage of the temporary string. */
+   /*=============================================*/
+
+   rm(theEnv,newString,thePosition);
+
+   /*=============================================*/
+   /* Return a pointer to the module name symbol. */
+   /*=============================================*/
+
+   return returnValue;
+  }
+
+/********************************************************************/
+/* ExtractConstructName: Given the position of the :: separator and */
+/*   a module/construct name joined using the separator, returns a  */
+/*   symbol reference to the construct name (or NULL if a construct */
+/*   name cannot be extracted).                                     */
+/********************************************************************/
+CLIPSLexeme *ExtractConstructName(
+  Environment *theEnv,
+  unsigned thePosition,
+  const char *theString,
+  unsigned returnType)
+  {
+   size_t theLength;
+   char *newString;
+   CLIPSLexeme *returnValue;
+
+   /*======================================*/
+   /* Just return the string if it doesn't */
+   /* contain the :: symbol.               */
+   /*======================================*/
+
+   if (thePosition == 0) return CreateSymbol(theEnv,theString);
+
+   /*=====================================*/
+   /* Determine the length of the string. */
+   /*=====================================*/
+
+   theLength = strlen(theString);
+
+   /*=================================================*/
+   /* Return NULL if the :: is at the very end of the */
+   /* string (and thus there is no construct name).   */
+   /*=================================================*/
+
+   if (theLength <= (thePosition + 1)) return NULL;
+
+   /*====================================*/
+   /* Allocate a temporary string large  */
+   /* enough to hold the construct name. */
+   /*====================================*/
+
+   newString = (char *) gm2(theEnv,theLength - thePosition);
+
+   /*================================================*/
+   /* Copy the construct name portion of the         */
+   /* module/construct name to the temporary string. */
+   /*================================================*/
+
+   genstrncpy(newString,&theString[thePosition+1],
+           (STD_SIZE) theLength - thePosition);
+
+   /*=============================================*/
+   /* Add the construct name to the symbol table. */
+   /*=============================================*/
+
+   if (returnType == SYMBOL_TYPE)
+     { returnValue = CreateSymbol(theEnv,newString); }
+   else if (returnType == INSTANCE_NAME_TYPE)
+     { returnValue = CreateInstanceName(theEnv,newString); }
+   else
+     { returnValue = CreateString(theEnv,newString); }
+
+   /*=============================================*/
+   /* Return the storage of the temporary string. */
+   /*=============================================*/
+
+   rm(theEnv,newString,theLength - thePosition);
+
+   /*================================================*/
+   /* Return a pointer to the construct name symbol. */
+   /*================================================*/
+
+   return returnValue;
+  }
+
+/****************************************************/
+/* ExtractModuleAndConstructName: Extracts both the */
+/*   module and construct name from a string. Sets  */
+/*   the current module to the specified module.    */
+/****************************************************/
+const char *ExtractModuleAndConstructName(
+  Environment *theEnv,
+  const char *theName)
+  {
+   unsigned separatorPosition;
+   CLIPSLexeme *moduleName, *shortName;
+   Defmodule *theModule;
+
+   /*========================*/
+   /* Find the :: separator. */
+   /*========================*/
+
+   separatorPosition = FindModuleSeparator(theName);
+   if (! separatorPosition) return(theName);
+
+   /*==========================*/
+   /* Extract the module name. */
+   /*==========================*/
+
+   moduleName = ExtractModuleName(theEnv,separatorPosition,theName);
+   if (moduleName == NULL) return NULL;
+
+   /*====================================*/
+   /* Check to see if the module exists. */
+   /*====================================*/
+
+   theModule = FindDefmodule(theEnv,moduleName->contents);
+   if (theModule == NULL) return NULL;
+
+   /*============================*/
+   /* Change the current module. */
+   /*============================*/
+
+   SetCurrentModule(theEnv,theModule);
+
+   /*=============================*/
+   /* Extract the construct name. */
+   /*=============================*/
+
+   shortName = ExtractConstructName(theEnv,separatorPosition,theName,SYMBOL_TYPE);
+   if (shortName == NULL) return NULL;
+   return shortName->contents;
+  }
+
+/************************************************************/
+/* FindImportedConstruct: High level routine which searches */
+/*   a module and other modules from which it imports       */
+/*   constructs for a specified construct.                  */
+/************************************************************/
+ConstructHeader *FindImportedConstruct(
+  Environment *theEnv,
+  const char *constructName,
+  Defmodule *matchModule,
+  const char *findName,
+  unsigned int *count,
+  bool searchCurrent,
+  Defmodule *notYetDefinedInModule)
+  {
+   ConstructHeader *rv;
+   struct moduleItem *theModuleItem;
+
+   /*=============================================*/
+   /* Set the number of references found to zero. */
+   /*=============================================*/
+
+   *count = 0;
+
+   /*===============================*/
+   /* The :: should not be included */
+   /* in the construct's name.      */
+   /*===============================*/
+
+   if (FindModuleSeparator(findName)) return NULL;
+
+   /*=============================================*/
+   /* Remember the current module since we'll be  */
+   /* changing it during the search and will want */
+   /* to restore it once the search is completed. */
+   /*=============================================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*==========================================*/
+   /* Find the module related access functions */
+   /* for the construct type being sought.     */
+   /*==========================================*/
+
+   if ((theModuleItem = FindModuleItem(theEnv,constructName)) == NULL)
+     {
+      RestoreCurrentModule(theEnv);
+      return NULL;
+     }
+
+   /*===========================================*/
+   /* If the construct type doesn't have a find */
+   /* function, then we can't look for it.      */
+   /*===========================================*/
+
+   if (theModuleItem->findFunction == NULL)
+     {
+      RestoreCurrentModule(theEnv);
+      return NULL;
+     }
+
+   /*==================================*/
+   /* Initialize the search by marking */
+   /* all modules as unvisited.        */
+   /*==================================*/
+
+   MarkModulesAsUnvisited(theEnv);
+
+   /*===========================*/
+   /* Search for the construct. */
+   /*===========================*/
+
+   rv = SearchImportedConstructModules(theEnv,CreateSymbol(theEnv,constructName),
+                                       matchModule,theModuleItem,
+                                       CreateSymbol(theEnv,findName),count,
+                                       searchCurrent,notYetDefinedInModule);
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+
+   /*====================================*/
+   /* Return a pointer to the construct. */
+   /*====================================*/
+
+   return rv;
+  }
+
+/*********************************************************/
+/* AmbiguousReferenceErrorMessage: Error message printed */
+/*   when a reference to a specific construct can be     */
+/*   imported from more than one module.                 */
+/*********************************************************/
+void AmbiguousReferenceErrorMessage(
+  Environment *theEnv,
+  const char *constructName,
+  const char *findName)
+  {
+   WriteString(theEnv,STDERR,"Ambiguous reference to ");
+   WriteString(theEnv,STDERR,constructName);
+   WriteString(theEnv,STDERR," ");
+   WriteString(theEnv,STDERR,findName);
+   WriteString(theEnv,STDERR,".\nIt is imported from more than one module.\n");
+  }
+
+/****************************************************/
+/* MarkModulesAsUnvisited: Used for initializing a  */
+/*   search through the module heirarchies. Sets    */
+/*   the visited flag of each module to false.      */
+/****************************************************/
+void MarkModulesAsUnvisited(
+  Environment *theEnv)
+  {
+   Defmodule *theModule;
+
+   DefmoduleData(theEnv)->CurrentModule->visitedFlag = false;
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     { theModule->visitedFlag = false; }
+  }
+
+/***********************************************************/
+/* SearchImportedConstructModules: Low level routine which */
+/*   searches a module and other modules from which it     */
+/*   imports constructs for a specified construct.         */
+/***********************************************************/
+static ConstructHeader *SearchImportedConstructModules(
+  Environment *theEnv,
+  CLIPSLexeme *constructType,
+  Defmodule *matchModule,
+  struct moduleItem *theModuleItem,
+  CLIPSLexeme *findName,
+  unsigned int *count,
+  bool searchCurrent,
+  Defmodule *notYetDefinedInModule)
+  {
+   Defmodule *theModule;
+   struct portItem *theImportList, *theExportList;
+   ConstructHeader *rv, *arv = NULL;
+   bool searchModule, exported;
+   Defmodule *currentModule;
+
+   /*=========================================*/
+   /* Start the search in the current module. */
+   /* If the current module has already been  */
+   /* visited, then return.                   */
+   /*=========================================*/
+
+   currentModule = GetCurrentModule(theEnv);
+   if (currentModule->visitedFlag) return NULL;
+
+   /*=======================================================*/
+   /* The searchCurrent flag indicates whether the current  */
+   /* module should be included in the search. In addition, */
+   /* if matchModule is non-NULL, the current module will   */
+   /* only be searched if it is the specific module from    */
+   /* which we want the construct imported.                 */
+   /*=======================================================*/
+
+   if ((searchCurrent) &&
+       ((matchModule == NULL) || (currentModule == matchModule)))
+     {
+      /*===============================================*/
+      /* Look for the construct in the current module. */
+      /*===============================================*/
+
+      rv = (*theModuleItem->findFunction)(theEnv,findName->contents);
+
+      /*========================================================*/
+      /* If we're in the process of defining the construct in   */
+      /* the module we're searching then go ahead and increment */
+      /* the count indicating the number of modules in which    */
+      /* the construct was found.                               */
+      /*========================================================*/
+
+      if (notYetDefinedInModule == currentModule)
+        {
+         (*count)++;
+         arv = rv;
+        }
+
+      /*=========================================================*/
+      /* Otherwise, if the construct is in the specified module, */
+      /* increment the count only if the construct actually      */
+      /* belongs to the module. [Some constructs, like the COOL  */
+      /* system classes, can be found in any module, but they    */
+      /* actually belong to the MAIN module.]                    */
+      /*=========================================================*/
+
+      else if (rv != NULL)
+        {
+         if (rv->whichModule->theModule == currentModule)
+           { (*count)++; }
+         arv = rv;
+        }
+     }
+
+   /*=====================================*/
+   /* Mark the current module as visited. */
+   /*=====================================*/
+
+   currentModule->visitedFlag = true;
+
+   /*===================================*/
+   /* Search through all of the modules */
+   /* imported by the current module.   */
+   /*===================================*/
+
+   theModule = GetCurrentModule(theEnv);
+   theImportList = theModule->importList;
+
+   while (theImportList != NULL)
+     {
+      /*===================================================*/
+      /* Determine if the module should be searched (based */
+      /* upon whether the entire module, all constructs of */
+      /* a specific type, or specifically named constructs */
+      /* are imported).                                    */
+      /*===================================================*/
+
+      searchModule = false;
+      if ((theImportList->constructType == NULL) ||
+          (theImportList->constructType == constructType))
+        {
+         if ((theImportList->constructName == NULL) ||
+             (theImportList->constructName == findName))
+           { searchModule = true; }
+        }
+
+      /*=================================*/
+      /* Determine if the module exists. */
+      /*=================================*/
+
+      if (searchModule)
+        {
+         theModule = FindDefmodule(theEnv,theImportList->moduleName->contents);
+         if (theModule == NULL) searchModule = false;
+        }
+
+      /*=======================================================*/
+      /* Determine if the construct is exported by the module. */
+      /*=======================================================*/
+
+      if (searchModule)
+        {
+         exported = false;
+         theExportList = theModule->exportList;
+         while ((theExportList != NULL) && (! exported))
+           {
+            if ((theExportList->constructType == NULL) ||
+                (theExportList->constructType == constructType))
+              {
+               if ((theExportList->constructName == NULL) ||
+                   (theExportList->constructName == findName))
+                 { exported = true; }
+               }
+
+            theExportList = theExportList->next;
+           }
+
+         if (! exported) searchModule = false;
+        }
+
+      /*=================================*/
+      /* Search in the specified module. */
+      /*=================================*/
+
+      if (searchModule)
+        {
+         SetCurrentModule(theEnv,theModule);
+         if ((rv = SearchImportedConstructModules(theEnv,constructType,matchModule,
+                                                  theModuleItem,findName,
+                                                  count,true,
+                                                  notYetDefinedInModule)) != NULL)
+           { arv = rv; }
+        }
+
+      /*====================================*/
+      /* Move on to the next imported item. */
+      /*====================================*/
+
+      theImportList = theImportList->next;
+     }
+
+   /*=========================*/
+   /* Return a pointer to the */
+   /* last construct found.   */
+   /*=========================*/
+
+   return arv;
+  }
+
+/**************************************************************/
+/* ConstructExported: Returns true if the specified construct */
+/*   is exported from the specified module.                   */
+/**************************************************************/
+bool ConstructExported(
+  Environment *theEnv,
+  const char *constructTypeStr,
+  CLIPSLexeme *moduleName,
+  CLIPSLexeme *findName)
+  {
+   CLIPSLexeme *constructType;
+   Defmodule *theModule;
+   struct portItem *theExportList;
+
+   constructType = FindSymbolHN(theEnv,constructTypeStr,SYMBOL_BIT);
+   theModule = FindDefmodule(theEnv,moduleName->contents);
+
+   if ((constructType == NULL) || (theModule == NULL) || (findName == NULL))
+     { return false; }
+
+   theExportList = theModule->exportList;
+   while (theExportList != NULL)
+     {
+      if ((theExportList->constructType == NULL) ||
+          (theExportList->constructType == constructType))
+       {
+        if ((theExportList->constructName == NULL) ||
+            (theExportList->constructName == findName))
+          { return true; }
+       }
+
+      theExportList = theExportList->next;
+     }
+
+   return false;
+  }
+
+/*********************************************************/
+/* AllImportedModulesVisited: Returns true if all of the */
+/*   imported modules for a module have been visited.    */
+/*********************************************************/
+bool AllImportedModulesVisited(
+  Environment *theEnv,
+  Defmodule *theModule)
+  {
+   struct portItem *theImportList;
+   Defmodule *theImportModule;
+
+   theImportList = theModule->importList;
+   while (theImportList != NULL)
+     {
+      theImportModule = FindDefmodule(theEnv,theImportList->moduleName->contents);
+
+      if (! theImportModule->visitedFlag) return false;
+
+      theImportList = theImportList->next;
+     }
+
+   return true;
+  }
+
+/***************************************/
+/* ListItemsDriver: Driver routine for */
+/*   listing items in a module.        */
+/***************************************/
+void ListItemsDriver(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule,
+  const char *singleName,
+  const char *pluralName,
+  GetNextItemFunction *nextFunction,
+  const char *(*nameFunction)(void *),
+  PrintItemFunction *printFunction,
+  bool (*doItFunction)(void *))
+  {
+   void *constructPtr;
+   const char *constructName;
+   unsigned long count = 0;
+   bool allModules = false;
+   bool doIt;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*======================*/
+   /* Print out the items. */
+   /*======================*/
+
+   if (theModule == NULL)
+     {
+      theModule = GetNextDefmodule(theEnv,NULL);
+      allModules = true;
+     }
+
+   while (theModule != NULL)
+     {
+      if (allModules)
+        {
+         WriteString(theEnv,logicalName,DefmoduleName(theModule));
+         WriteString(theEnv,logicalName,":\n");
+        }
+
+      SetCurrentModule(theEnv,theModule);
+      constructPtr = (*nextFunction)(theEnv,NULL);
+      while (constructPtr != NULL)
+        {
+         if (EvaluationData(theEnv)->HaltExecution == true) return;
+
+         if (doItFunction == NULL) doIt = true;
+         else doIt = (*doItFunction)(constructPtr);
+
+         if (! doIt) {}
+         else if (nameFunction != NULL)
+           {
+            constructName = (*nameFunction)(constructPtr);
+            if (constructName != NULL)
+              {
+               if (allModules) WriteString(theEnv,logicalName,"   ");
+               WriteString(theEnv,logicalName,constructName);
+               WriteString(theEnv,logicalName,"\n");
+              }
+           }
+         else if (printFunction != NULL)
+           {
+            if (allModules) WriteString(theEnv,logicalName,"   ");
+            (*printFunction)(theEnv,logicalName,constructPtr);
+            WriteString(theEnv,logicalName,"\n");
+           }
+
+         constructPtr = (*nextFunction)(theEnv,constructPtr);
+         count++;
+        }
+
+      if (allModules) theModule = GetNextDefmodule(theEnv,theModule);
+      else theModule = NULL;
+     }
+
+   /*=================================================*/
+   /* Print the tally and restore the current module. */
+   /*=================================================*/
+
+   if (singleName != NULL) PrintTally(theEnv,logicalName,count,singleName,pluralName);
+
+   RestoreCurrentModule(theEnv);
+  }
+
+/********************************************************/
+/* DoForAllModules: Executes an action for all modules. */
+/********************************************************/
+long DoForAllModules(
+  Environment *theEnv,
+  void (*actionFunction)(Defmodule *,void *),
+  int interruptable,
+  void *userBuffer)
+  {
+   Defmodule *theModule;
+   long moduleCount = 0L;
+
+   /*==========================*/
+   /* Save the current module. */
+   /*==========================*/
+
+   SaveCurrentModule(theEnv);
+
+   /*==================================*/
+   /* Loop through all of the modules. */
+   /*==================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule), moduleCount++)
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      if ((interruptable) && GetHaltExecution(theEnv))
+        {
+         RestoreCurrentModule(theEnv);
+         return(-1L);
+        }
+
+      (*actionFunction)(theModule,userBuffer);
+     }
+
+   /*=============================*/
+   /* Restore the current module. */
+   /*=============================*/
+
+   RestoreCurrentModule(theEnv);
+
+   /*=========================================*/
+   /* Return the number of modules traversed. */
+   /*=========================================*/
+
+   return(moduleCount);
+  }
+  
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/****************************************/
+/* RemoveConstructFromModule: Removes a */
+/*   construct from its module's list   */
+/****************************************/
+void RemoveConstructFromModule(
+  Environment *theEnv,
+  ConstructHeader *theConstruct)
+  {
+   ConstructHeader *lastConstruct,*currentConstruct;
+
+   /*==============================*/
+   /* Find the specified construct */
+   /* in the module's list.        */
+   /*==============================*/
+
+   lastConstruct = NULL;
+   currentConstruct = theConstruct->whichModule->firstItem;
+   while (currentConstruct != theConstruct)
+     {
+      lastConstruct = currentConstruct;
+      currentConstruct = currentConstruct->next;
+     }
+
+   /*========================================*/
+   /* If it wasn't there, something's wrong. */
+   /*========================================*/
+
+   if (currentConstruct == NULL)
+     {
+      SystemError(theEnv,"CSTRCPSR",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   /*==========================*/
+   /* Remove it from the list. */
+   /*==========================*/
+
+   if (lastConstruct == NULL)
+     { theConstruct->whichModule->firstItem = theConstruct->next; }
+   else
+     { lastConstruct->next = theConstruct->next; }
+
+   /*=================================================*/
+   /* Update the pointer to the last item in the list */
+   /* if the construct just deleted was at the end.   */
+   /*=================================================*/
+
+   if (theConstruct == theConstruct->whichModule->lastItem)
+     { theConstruct->whichModule->lastItem = lastConstruct; }
+  }
+
+/*********************************************************/
+/* GetConstructNameAndComment: Get the name and comment  */
+/*   field of a construct. Returns name of the construct */
+/*   if no errors are detected, otherwise returns NULL.  */
+/*********************************************************/
+CLIPSLexeme *GetConstructNameAndComment(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *inputToken,
+  const char *constructName,
+  FindConstructFunction *findFunction,
+  DeleteConstructFunction *deleteFunction,
+  const char *constructSymbol,
+  bool fullMessageCR,
+  bool getComment,
+  bool moduleNameAllowed,
+  bool ignoreRedefinition)
+  {
+#if (MAC_XCD) && (! DEBUGGING_FUNCTIONS)
+#pragma unused(fullMessageCR)
+#endif
+   CLIPSLexeme *name, *moduleName;
+   bool redefining = false;
+   ConstructHeader *theConstruct;
+   unsigned separatorPosition;
+   Defmodule *theModule;
+
+   /*==========================*/
+   /* Next token should be the */
+   /* name of the construct.   */
+   /*==========================*/
+
+   GetToken(theEnv,readSource,inputToken);
+   if (inputToken->tknType != SYMBOL_TOKEN)
+     {
+      PrintErrorID(theEnv,"CSTRCPSR",2,true);
+      WriteString(theEnv,STDERR,"Missing name for ");
+      WriteString(theEnv,STDERR,constructName);
+      WriteString(theEnv,STDERR," construct.\n");
+      return NULL;
+     }
+
+   name = inputToken->lexemeValue;
+
+   /*===============================*/
+   /* Determine the current module. */
+   /*===============================*/
+
+   separatorPosition = FindModuleSeparator(name->contents);
+   if (separatorPosition)
+     {
+      if (moduleNameAllowed == false)
+        {
+         SyntaxErrorMessage(theEnv,"module specifier");
+         return NULL;
+        }
+
+      moduleName = ExtractModuleName(theEnv,separatorPosition,name->contents);
+      if (moduleName == NULL)
+        {
+         SyntaxErrorMessage(theEnv,"construct name");
+         return NULL;
+        }
+
+      theModule = FindDefmodule(theEnv,moduleName->contents);
+      if (theModule == NULL)
+        {
+         CantFindItemErrorMessage(theEnv,"defmodule",moduleName->contents,true);
+         return NULL;
+        }
+
+      SetCurrentModule(theEnv,theModule);
+      name = ExtractConstructName(theEnv,separatorPosition,name->contents,SYMBOL_TYPE);
+      if (name == NULL)
+        {
+         SyntaxErrorMessage(theEnv,"construct name");
+         return NULL;
+        }
+     }
+
+   /*=====================================================*/
+   /* If the module was not specified, record the current */
+   /* module name as part of the pretty-print form.       */
+   /*=====================================================*/
+
+   else
+     {
+      theModule = GetCurrentModule(theEnv);
+      if (moduleNameAllowed)
+        {
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv,DefmoduleName(theModule));
+         SavePPBuffer(theEnv,"::");
+         SavePPBuffer(theEnv,name->contents);
+        }
+     }
+
+   /*==================================================================*/
+   /* Check for import/export conflicts from the construct definition. */
+   /*==================================================================*/
+
+#if DEFMODULE_CONSTRUCT
+   if (FindImportExportConflict(theEnv,constructName,theModule,name->contents))
+     {
+      ImportExportConflictMessage(theEnv,constructName,name->contents,NULL,NULL);
+      return NULL;
+     }
+#endif
+
+   /*========================================================*/
+   /* Remove the construct if it is already in the knowledge */
+   /* base and we're not just checking syntax.               */
+   /*========================================================*/
+
+   if ((findFunction != NULL) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      theConstruct = (*findFunction)(theEnv,name->contents);
+      if (theConstruct != NULL)
+        {
+         redefining = true;
+         if (deleteFunction != NULL)
+           {
+            RetainLexeme(theEnv,name);
+            if ((*deleteFunction)(theConstruct,theEnv) == false)
+              {
+               PrintErrorID(theEnv,"CSTRCPSR",4,true);
+               WriteString(theEnv,STDERR,"Cannot redefine ");
+               WriteString(theEnv,STDERR,constructName);
+               WriteString(theEnv,STDERR," '");
+               WriteString(theEnv,STDERR,name->contents);
+               WriteString(theEnv,STDERR,"' while it is in use.\n");
+               ReleaseLexeme(theEnv,name);
+               return NULL;
+              }
+            ReleaseLexeme(theEnv,name);
+           }
+        }
+     }
+
+   /*=============================================*/
+   /* If compilations are being watched, indicate */
+   /* that a construct is being compiled.         */
+   /*=============================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if ((GetWatchItem(theEnv,"compilations") == 1) &&
+       GetPrintWhileLoading(theEnv) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      const char *outRouter = STDOUT;
+      if (redefining && (! ignoreRedefinition))
+        {
+         outRouter = STDWRN;
+         PrintWarningID(theEnv,"CSTRCPSR",1,true);
+         WriteString(theEnv,outRouter,"Redefining ");
+        }
+      else WriteString(theEnv,outRouter,"Defining ");
+
+      WriteString(theEnv,outRouter,constructName);
+      WriteString(theEnv,outRouter,": ");
+      WriteString(theEnv,outRouter,name->contents);
+
+      if (fullMessageCR) WriteString(theEnv,outRouter,"\n");
+      else WriteString(theEnv,outRouter," ");
+     }
+   else
+#endif
+     {
+      if (GetPrintWhileLoading(theEnv) && (! ConstructData(theEnv)->CheckSyntaxMode))
+        { WriteString(theEnv,STDOUT,constructSymbol); }
+     }
+
+   /*===============================*/
+   /* Get the comment if it exists. */
+   /*===============================*/
+
+   GetToken(theEnv,readSource,inputToken);
+   if ((inputToken->tknType == STRING_TOKEN) && getComment)
+     {
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,inputToken->printForm);
+      GetToken(theEnv,readSource,inputToken);
+      if (inputToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv,"\n   ");
+         SavePPBuffer(theEnv,inputToken->printForm);
+        }
+     }
+   else if (inputToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,"\n   ");
+      SavePPBuffer(theEnv,inputToken->printForm);
+     }
+
+   /*===================================*/
+   /* Return the name of the construct. */
+   /*===================================*/
+
+   return(name);
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+
diff --git a/clips/modulutl.h b/clips/modulutl.h
new file mode 100755
index 000000000..d6f9b846d
--- /dev/null
+++ b/clips/modulutl.h
@@ -0,0 +1,84 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*            DEFMODULE UTILITY HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for parsing module/construct   */
+/*   names and searching through modules for specific        */
+/*   constructs.                                             */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Used genstrncpy instead of strncpy.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_modulutl
+
+#pragma once
+
+#define _H_modulutl
+
+typedef void *GetNextItemFunction(Environment *,void *);
+typedef void PrintItemFunction(Environment *,const char *,void *);
+
+#include "moduldef.h"
+#include "symbol.h"
+#include "scanner.h"
+
+   unsigned                       FindModuleSeparator(const char *);
+   CLIPSLexeme                   *ExtractModuleName(Environment *,unsigned,const char *);
+   CLIPSLexeme                   *ExtractConstructName(Environment *,unsigned,const char *,unsigned);
+   const char                    *ExtractModuleAndConstructName(Environment *,const char *);
+   ConstructHeader               *FindImportedConstruct(Environment *,const char *,Defmodule *,
+                                                        const char *,unsigned int *,bool,Defmodule *);
+   void                           AmbiguousReferenceErrorMessage(Environment *,const char *,const char *);
+   void                           MarkModulesAsUnvisited(Environment *);
+   bool                           AllImportedModulesVisited(Environment *,Defmodule *);
+   void                           ListItemsDriver(Environment *,
+                                                  const char *,Defmodule *,
+                                                  const char *,const char *,
+                                                  GetNextItemFunction *,
+                                                  const char *(*)(void *),
+                                                  PrintItemFunction *,
+                                                  bool (*)(void *));
+   long                           DoForAllModules(Environment *,
+                                                  void (*)(Defmodule *,void *),
+                                                  int,void *);
+   bool                           ConstructExported(Environment *,const char *,CLIPSLexeme *,CLIPSLexeme *);
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   void                           RemoveConstructFromModule(Environment *,ConstructHeader *);
+   CLIPSLexeme                   *GetConstructNameAndComment(Environment *,const char *,
+                                                             struct token *,const char *,
+                                                             FindConstructFunction *,
+                                                             DeleteConstructFunction *,
+                                                             const char *,bool,bool,bool,bool);
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* _H_modulutl */
+
+
+
diff --git a/clips/msgcom.c b/clips/msgcom.c
new file mode 100755
index 000000000..8dce92cf3
--- /dev/null
+++ b/clips/msgcom.c
@@ -0,0 +1,1213 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*                OBJECT MESSAGE COMMANDS              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS            */
+/*                    compilation flag.                      */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added DeallocateMessageHandlerData to          */
+/*            deallocate message handler environment data.   */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include <string.h>
+
+#include "argacces.h"
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+#include "classcom.h"
+#include "classfun.h"
+#include "classinf.h"
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+#include "constrct.h"
+#include "msgpsr.h"
+#endif
+#include "envrnmnt.h"
+#if ! RUN_TIME
+#include "extnfunc.h"
+#endif
+#include "insfun.h"
+#include "insmoddp.h"
+#include "msgfun.h"
+#include "msgpass.h"
+#include "memalloc.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "router.h"
+#if DEBUGGING_FUNCTIONS
+#include "watch.h"
+#endif
+
+#include "msgcom.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if ! RUN_TIME
+   static void                    CreateSystemHandlers(Environment *,void *);
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   static bool                    WildDeleteHandler(Environment *,Defclass *,CLIPSLexeme *,const char *);
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   static bool                    DefmessageHandlerWatchAccess(Environment *,int,bool,Expression *);
+   static bool                    DefmessageHandlerWatchPrint(Environment *,const char *,int,Expression *);
+   static bool                    DefmessageHandlerWatchSupport(Environment *,const char *,const char *,bool,
+                                                                void (*)(Environment *,const char *,Defclass *,unsigned),
+                                                                void (*)(Defclass *,unsigned,bool),
+                                                                Expression *);
+   static bool                    WatchClassHandlers(Environment *,Defclass *,const char *,int,const char *,bool,bool,
+                                                     void (*)(Environment *,const char *,Defclass *,unsigned),
+                                                     void (*)(Defclass *,unsigned,bool));
+   static void                    PrintHandlerWatchFlag(Environment *,const char *,Defclass *,unsigned);
+#endif
+
+   static void                    DeallocateMessageHandlerData(Environment *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupMessageHandlers
+  DESCRIPTION  : Sets up internal symbols and
+                 fucntion definitions pertaining to
+                 message-handlers.  Also creates
+                 system handlers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Functions and data structures
+                 initialized
+  NOTES        : Should be called before
+                 SetupInstanceModDupCommands() in
+                 INSMODDP.C
+ ***************************************************/
+void SetupMessageHandlers(
+  Environment *theEnv)
+  {
+   EntityRecord handlerGetInfo = { "HANDLER_GET", HANDLER_GET,0,1,1,
+                                        PrintHandlerSlotGetFunction,
+                                        PrintHandlerSlotGetFunction,NULL,
+                                        HandlerSlotGetFunction,
+                                        NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL },
+
+                 handlerPutInfo = { "HANDLER_PUT", HANDLER_PUT,0,1,1,
+                                        PrintHandlerSlotPutFunction,
+                                        PrintHandlerSlotPutFunction,NULL,
+                                        HandlerSlotPutFunction,
+                                        NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   AllocateEnvironmentData(theEnv,MESSAGE_HANDLER_DATA,sizeof(struct messageHandlerData),DeallocateMessageHandlerData);
+   memcpy(&MessageHandlerData(theEnv)->HandlerGetInfo,&handlerGetInfo,sizeof(struct entityRecord));
+   memcpy(&MessageHandlerData(theEnv)->HandlerPutInfo,&handlerPutInfo,sizeof(struct entityRecord));
+
+   MessageHandlerData(theEnv)->hndquals[0] = "around";
+   MessageHandlerData(theEnv)->hndquals[1] = "before";
+   MessageHandlerData(theEnv)->hndquals[2] = "primary";
+   MessageHandlerData(theEnv)->hndquals[3] = "after";
+
+   InstallPrimitive(theEnv,&MessageHandlerData(theEnv)->HandlerGetInfo,HANDLER_GET);
+   InstallPrimitive(theEnv,&MessageHandlerData(theEnv)->HandlerPutInfo,HANDLER_PUT);
+
+#if ! RUN_TIME
+   MessageHandlerData(theEnv)->INIT_SYMBOL = CreateSymbol(theEnv,INIT_STRING);
+   IncrementLexemeCount(MessageHandlerData(theEnv)->INIT_SYMBOL);
+
+   MessageHandlerData(theEnv)->DELETE_SYMBOL = CreateSymbol(theEnv,DELETE_STRING);
+   IncrementLexemeCount(MessageHandlerData(theEnv)->DELETE_SYMBOL);
+
+   MessageHandlerData(theEnv)->CREATE_SYMBOL = CreateSymbol(theEnv,CREATE_STRING);
+   IncrementLexemeCount(MessageHandlerData(theEnv)->CREATE_SYMBOL);
+
+   AddClearFunction(theEnv,"defclass",CreateSystemHandlers,-100,NULL);
+
+#if ! BLOAD_ONLY
+   MessageHandlerData(theEnv)->SELF_SYMBOL = CreateSymbol(theEnv,SELF_STRING);
+   IncrementLexemeCount(MessageHandlerData(theEnv)->SELF_SYMBOL);
+
+   AddConstruct(theEnv,"defmessage-handler","defmessage-handlers",
+                ParseDefmessageHandler,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+   AddUDF(theEnv,"undefmessage-handler","v",2,3,"y",UndefmessageHandlerCommand,"UndefmessageHandlerCommand",NULL);
+
+#endif
+
+   AddUDF(theEnv,"send","*",2,UNBOUNDED,"*;*;y",SendCommand,"SendCommand",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"preview-send","v",2,2,"y",PreviewSendCommand,"PreviewSendCommand",NULL);
+
+   AddUDF(theEnv,"ppdefmessage-handler","v",2,4,"y",PPDefmessageHandlerCommand,"PPDefmessageHandlerCommand",NULL);
+   AddUDF(theEnv,"list-defmessage-handlers","v",0,2,"y",ListDefmessageHandlersCommand,"ListDefmessageHandlersCommand",NULL);
+#endif
+
+   AddUDF(theEnv,"next-handlerp","b",0,0,NULL,NextHandlerAvailableFunction,"NextHandlerAvailableFunction",NULL);
+   FuncSeqOvlFlags(theEnv,"next-handlerp",true,false);
+   AddUDF(theEnv,"call-next-handler","*",0,0,NULL,CallNextHandler,"CallNextHandler",NULL);
+   FuncSeqOvlFlags(theEnv,"call-next-handler",true,false);
+   AddUDF(theEnv,"override-next-handler","*",0,UNBOUNDED,NULL,CallNextHandler,"CallNextHandler",NULL);
+   FuncSeqOvlFlags(theEnv,"override-next-handler",true,false);
+
+   AddUDF(theEnv,"dynamic-get","*",1,1,"y",DynamicHandlerGetSlot,"DynamicHandlerGetSlot",NULL);
+   AddUDF(theEnv,"dynamic-put","*",1,UNBOUNDED,"*;y",DynamicHandlerPutSlot,"DynamicHandlerPutSlot",NULL);
+   AddUDF(theEnv,"get","*",1,1,"y",DynamicHandlerGetSlot,"DynamicHandlerGetSlot",NULL);
+   AddUDF(theEnv,"put","*",1,UNBOUNDED,"*;y",DynamicHandlerPutSlot,"DynamicHandlerPutSlot",NULL);
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   AddWatchItem(theEnv,"messages",0,&MessageHandlerData(theEnv)->WatchMessages,36,NULL,NULL);
+   AddWatchItem(theEnv,"message-handlers",0,&MessageHandlerData(theEnv)->WatchHandlers,35,
+                DefmessageHandlerWatchAccess,DefmessageHandlerWatchPrint);
+#endif
+  }
+
+/*******************************************************/
+/* DeallocateMessageHandlerData: Deallocates environment */
+/*    data for the message handler functionality.        */
+/******************************************************/
+static void DeallocateMessageHandlerData(
+  Environment *theEnv)
+  {
+   HANDLER_LINK *tmp, *mhead, *chead;
+
+   mhead = MessageHandlerData(theEnv)->TopOfCore;
+   while (mhead != NULL)
+     {
+      tmp = mhead;
+      mhead = mhead->nxt;
+      rtn_struct(theEnv,messageHandlerLink,tmp);
+     }
+
+   chead = MessageHandlerData(theEnv)->OldCore;
+   while (chead != NULL)
+     {
+      mhead = chead;
+      chead = chead->nxtInStack;
+
+      while (mhead != NULL)
+        {
+         tmp = mhead;
+         mhead = mhead->nxt;
+         rtn_struct(theEnv,messageHandlerLink,tmp);
+        }
+     }
+  }
+
+/*****************************************************
+  NAME         : DefmessageHandlerName
+  DESCRIPTION  : Gets the name of a message-handler
+  INPUTS       : 1) Pointer to a class
+                 2) Array index of handler in class's
+                    message-handler array (+1)
+  RETURNS      : Name-string of message-handler
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+const char *DefmessageHandlerName(
+  Defclass *theDefclass,
+  unsigned theIndex)
+  {
+   return theDefclass->handlers[theIndex-1].header.name->contents;
+  }
+
+/*****************************************************
+  NAME         : DefmessageHandlerType
+  DESCRIPTION  : Gets the type of a message-handler
+  INPUTS       : 1) Pointer to a class
+                 2) Array index of handler in class's
+                    message-handler array (+1)
+  RETURNS      : Type-string of message-handler
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+const char *DefmessageHandlerType(
+  Defclass *theDefclass,
+  unsigned theIndex)
+  {
+   Environment *theEnv = theDefclass->header.env;
+   
+   return MessageHandlerData(theEnv)->hndquals[theDefclass->handlers[theIndex-1].type];
+  }
+
+/**************************************************************
+  NAME         : GetNextDefmessageHandler
+  DESCRIPTION  : Finds first or next handler for a class
+  INPUTS       : 1) The address of the handler's class
+                 2) The array index of the current handler (+1)
+  RETURNS      : The array index (+1) of the next handler, or 0
+                   if there is none
+  SIDE EFFECTS : None
+  NOTES        : If index == 0, the first handler array index
+                 (i.e. 1) returned
+ **************************************************************/
+unsigned GetNextDefmessageHandler(
+  Defclass *theDefclass,
+  unsigned theIndex)
+  {
+   if (theIndex == 0)
+     { return (theDefclass->handlers != NULL) ? 1 : 0; }
+
+   if (theIndex == theDefclass->handlerCount)
+     { return 0; }
+
+   return theIndex+1;
+  }
+
+/*****************************************************
+  NAME         : GetDefmessageHandlerPointer
+  DESCRIPTION  : Returns a pointer to a handler
+  INPUTS       : 1) Pointer to a class
+                 2) Array index of handler in class's
+                    message-handler array (+1)
+  RETURNS      : Pointer to the handler.
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+DefmessageHandler *GetDefmessageHandlerPointer(
+  Defclass *theDefclass,
+  unsigned int theIndex)
+  {
+   return &theDefclass->handlers[theIndex-1];
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/*********************************************************
+  NAME         : DefmessageHandlerGetWatch
+  DESCRIPTION  : Determines if trace messages for calls
+                 to this handler will be generated or not
+  INPUTS       : 1) A pointer to the class
+                 2) The index of the handler
+  RETURNS      : True if a trace is active,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *********************************************************/
+bool DefmessageHandlerGetWatch(
+  Defclass *theDefclass,
+  unsigned theIndex)
+  {
+   return theDefclass->handlers[theIndex-1].trace;
+  }
+
+/*********************************************************
+  NAME         : DefmessageHandlerSetWatch
+  DESCRIPTION  : Sets the trace to ON/OFF for the
+                 calling of the handler
+  INPUTS       : 1) True to set the trace on,
+                    false to set it off
+                 2) A pointer to the class
+                 3) The index of the handler
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Watch flag for the handler set
+  NOTES        : None
+ *********************************************************/
+void DefmessageHandlerSetWatch(
+  Defclass *theClass,
+  unsigned theIndex,
+  bool newState)
+  {
+   theClass->handlers[theIndex-1].trace = newState;
+  }
+
+#endif
+
+/***************************************************
+  NAME         : FindDefmessageHandler
+  DESCRIPTION  : Determines the index of a specfied
+                  message-handler
+  INPUTS       : 1) A pointer to the class
+                 2) Name-string of the handler
+                 3) Handler-type: "around","before",
+                    "primary", or "after"
+  RETURNS      : The index of the handler
+                   (0 if not found)
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+unsigned FindDefmessageHandler(
+  Defclass *theDefclass,
+  const char *hname,
+  const char *htypestr)
+  {
+   unsigned htype;
+   CLIPSLexeme *hsym;
+   int theIndex;
+   Environment *theEnv = theDefclass->header.env;
+
+   htype = HandlerType(theEnv,"handler-lookup",false,htypestr);
+   if (htype == MERROR)
+     { return 0; }
+
+   hsym = FindSymbolHN(theEnv,hname,SYMBOL_BIT);
+   if (hsym == NULL)
+     { return 0; }
+
+   theIndex = FindHandlerByIndex(theDefclass,hsym,htype);
+   return (unsigned) (theIndex+1);
+  }
+
+/***************************************************
+  NAME         : DefmessageHandlerIsDeletable
+  DESCRIPTION  : Determines if a message-handler
+                   can be deleted
+  INPUTS       : 1) Address of the handler's class
+                 2) Index of the handler
+  RETURNS      : True if deletable, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool DefmessageHandlerIsDeletable(
+  Defclass *theDefclass,
+  unsigned theIndex)
+  {
+   Environment *theEnv = theDefclass->header.env;
+
+   if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   if (theDefclass->handlers[theIndex-1].system == 1)
+     { return false; }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   return (HandlersExecuting(theDefclass) == false) ? true : false;
+#else
+   return false;
+#endif
+  }
+
+/******************************************************************************
+  NAME         : UndefmessageHandlerCommand
+  DESCRIPTION  : Deletes a handler from a class
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Handler deleted if possible
+  NOTES        : H/L Syntax: (undefmessage-handler <class> <handler> [<type>])
+ ******************************************************************************/
+void UndefmessageHandlerCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+#if RUN_TIME || BLOAD_ONLY
+   PrintErrorID(theEnv,"MSGCOM",3,false);
+   WriteString(theEnv,STDERR,"Unable to delete message-handlers.\n");
+#else
+   CLIPSLexeme *mname;
+   const char *tname;
+   UDFValue theArg;
+   Defclass *cls;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv))
+     {
+      PrintErrorID(theEnv,"MSGCOM",3,false);
+      WriteString(theEnv,STDERR,"Unable to delete message-handlers.\n");
+      return;
+     }
+#endif
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg)) return;
+
+   cls = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+   if ((cls == NULL) ? (strcmp(theArg.lexemeValue->contents,"*") != 0) : false)
+     {
+      ClassExistError(theEnv,"undefmessage-handler",theArg.lexemeValue->contents);
+      return;
+     }
+   if (! UDFNextArgument(context,SYMBOL_BIT,&theArg)) return;
+
+   mname = theArg.lexemeValue;
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,SYMBOL_BIT,&theArg)) return;
+
+      tname = theArg.lexemeValue->contents;
+      if (strcmp(tname,"*") == 0)
+        tname = NULL;
+     }
+   else
+     tname = MessageHandlerData(theEnv)->hndquals[MPRIMARY];
+   WildDeleteHandler(theEnv,cls,mname,tname);
+#endif
+  }
+
+/***********************************************************
+  NAME         : UndefmessageHandler
+  DESCRIPTION  : Deletes a handler from a class
+  INPUTS       : 1) Class address    (Can be NULL)
+                 2) Handler index (can be 0)
+  RETURNS      : 1 if successful, 0 otherwise
+  SIDE EFFECTS : Handler deleted if possible
+  NOTES        : None
+ ***********************************************************/
+bool UndefmessageHandler(
+  Defclass *theDefclass,
+  unsigned mhi,
+  Environment *allEnv)
+  {
+   Environment *theEnv;
+#if (! RUN_TIME) &&  (! BLOAD_ONLY)
+   bool success;
+   GCBlock gcb;
+#endif
+
+   if (theDefclass == NULL)
+     { theEnv = allEnv; }
+   else
+     { theEnv = theDefclass->header.env; }
+
+#if RUN_TIME || BLOAD_ONLY
+   PrintErrorID(theEnv,"MSGCOM",3,false);
+   WriteString(theEnv,STDERR,"Unable to delete message-handlers.\n");
+   return false;
+#else
+     
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv))
+     {
+      PrintErrorID(theEnv,"MSGCOM",3,false);
+      WriteString(theEnv,STDERR,"Unable to delete message-handlers.\n");
+      return false;
+     }
+#endif
+   GCBlockStart(theEnv,&gcb);
+   if (theDefclass == NULL)
+     {
+      if (mhi != 0)
+        {
+         PrintErrorID(theEnv,"MSGCOM",1,false);
+         WriteString(theEnv,STDERR,"Incomplete message-handler specification for deletion.\n");
+         GCBlockEnd(theEnv,&gcb);
+         return false;
+        }
+      success = WildDeleteHandler(theEnv,NULL,NULL,NULL);
+      GCBlockEnd(theEnv,&gcb);
+      return success;
+     }
+
+   if (mhi == 0)
+     {
+      success = WildDeleteHandler(theEnv,theDefclass,NULL,NULL);
+      GCBlockEnd(theEnv,&gcb);
+      return success;
+     }
+
+   if (HandlersExecuting(theDefclass))
+     {
+      HandlerDeleteError(theEnv,DefclassName(theDefclass));
+      GCBlockEnd(theEnv,&gcb);
+      return false;
+     }
+
+   theDefclass->handlers[mhi-1].mark = 1;
+   DeallocateMarkedHandlers(theEnv,theDefclass);
+   GCBlockEnd(theEnv,&gcb);
+   return true;
+#endif
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/*******************************************************************************
+  NAME         : PPDefmessageHandlerCommand
+  DESCRIPTION  : Displays the pretty-print form (if any) for a handler
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (ppdefmessage-handler <class> <message> [<type>])
+ *******************************************************************************/
+void PPDefmessageHandlerCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   CLIPSLexeme *csym, *msym;
+   const char *tname;
+   const char *logicalName;
+   Defclass *cls = NULL;
+   unsigned mtype;
+   DefmessageHandler *hnd;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   csym = FindSymbolHN(theEnv,theArg.lexemeValue->contents,SYMBOL_BIT);
+
+   if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   msym = FindSymbolHN(theEnv,theArg.lexemeValue->contents,SYMBOL_BIT);
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+        { return; }
+      tname = theArg.lexemeValue->contents;
+     }
+   else
+     tname = MessageHandlerData(theEnv)->hndquals[MPRIMARY];
+     
+   mtype = HandlerType(theEnv,"ppdefmessage-handler",true,tname);
+   if (mtype == MERROR)
+     {
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+     
+   if (UDFHasNextArgument(context))
+     {
+      logicalName = GetLogicalName(context,STDOUT);
+      if (logicalName == NULL)
+        {
+         IllegalLogicalNameMessage(theEnv,"ppdefmessage-handler");
+         SetHaltExecution(theEnv,true);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+     }
+   else
+     { logicalName = STDOUT; }
+
+   if (csym != NULL)
+     cls = LookupDefclassByMdlOrScope(theEnv,csym->contents);
+   if (((cls == NULL) || (msym == NULL)) ? true :
+       ((hnd = FindHandlerByAddress(cls,msym,mtype)) == NULL))
+     {
+      PrintErrorID(theEnv,"MSGCOM",2,false);
+      WriteString(theEnv,STDERR,"Unable to find message-handler '");
+      WriteString(theEnv,STDERR,msym->contents);
+      WriteString(theEnv,STDERR,"' ");
+      WriteString(theEnv,STDERR,tname);
+      WriteString(theEnv,STDERR," for class '");
+      WriteString(theEnv,STDERR,csym->contents);
+      WriteString(theEnv,STDERR,"' in function 'ppdefmessage-handler'.\n");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+     
+   if (strcmp(logicalName,"nil") == 0)
+     {
+      if (hnd->header.ppForm != NULL)
+        { returnValue->lexemeValue = CreateString(theEnv,hnd->header.ppForm); }
+      else
+        { returnValue->lexemeValue = CreateString(theEnv,""); }
+     }
+   else
+     {
+      if (hnd->header.ppForm != NULL)
+        WriteString(theEnv,logicalName,hnd->header.ppForm);
+     }
+  }
+
+/*****************************************************************************
+  NAME         : ListDefmessageHandlersCommand
+  DESCRIPTION  : Depending on arguments, does lists handlers which
+                   match restrictions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (list-defmessage-handlers [<class> [inherit]]))
+ *****************************************************************************/
+void ListDefmessageHandlersCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool inhp;
+   Defclass *clsptr;
+
+   if (UDFArgumentCount(context) == 0)
+     ListDefmessageHandlers(theEnv,NULL,STDOUT,false);
+   else
+     {
+      clsptr = ClassInfoFnxArgs(context,"list-defmessage-handlers",&inhp);
+      if (clsptr == NULL)
+        return;
+      ListDefmessageHandlers(theEnv,clsptr,STDOUT,inhp);
+     }
+  }
+
+/********************************************************************
+  NAME         : PreviewSendCommand
+  DESCRIPTION  : Displays a list of the core for a message describing
+                   shadows,etc.
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Temporary core created and destroyed
+  NOTES        : H/L Syntax: (preview-send <class> <msg>)
+ ********************************************************************/
+void PreviewSendCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defclass *cls;
+   UDFValue theArg;
+
+   /* =============================
+      Get the class for the message
+      ============================= */
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   cls = LookupDefclassByMdlOrScope(theEnv,theArg.lexemeValue->contents);
+
+   if (cls == NULL)
+     {
+      ClassExistError(theEnv,"preview-send",theArg.lexemeValue->contents);
+      return;
+     }
+
+   if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   PreviewSend(cls,STDOUT,theArg.lexemeValue->contents);
+  }
+
+/********************************************************
+  NAME         : DefmessageHandlerPPForm
+  DESCRIPTION  : Gets a message-handler pretty print form
+  INPUTS       : 1) Address of the handler's class
+                 2) Index of the handler
+  RETURNS      : True if printable, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************/
+const char *DefmessageHandlerPPForm(
+  Defclass *theDefclass,
+  unsigned theIndex)
+  {
+   return theDefclass->handlers[theIndex-1].header.ppForm;
+  }
+
+/*******************************************************************
+  NAME         : ListDefmessageHandlers
+  DESCRIPTION  : Lists message-handlers for a class
+  INPUTS       : 1) The logical name of the output
+                 2) Class name (NULL to display all handlers)
+                 3) A flag indicating whether to list inherited
+                    handlers or not
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ *******************************************************************/
+void ListDefmessageHandlers(
+  Environment *theEnv,
+  Defclass *theDefclass,
+  const char *logName,
+  bool inhp)
+  {
+   unsigned long cnt;
+   PACKED_CLASS_LINKS plinks;
+
+   if (theDefclass != NULL)
+     {
+      if (inhp)
+        { cnt = DisplayHandlersInLinks(theEnv,logName,&theDefclass->allSuperclasses,0); }
+      else
+        {
+         plinks.classCount = 1;
+         plinks.classArray = &theDefclass;
+         cnt = DisplayHandlersInLinks(theEnv,logName,&plinks,0);
+        }
+     }
+   else
+     {
+      plinks.classCount = 1;
+      cnt = 0L;
+      for (theDefclass = GetNextDefclass(theEnv,NULL) ;
+           theDefclass != NULL ;
+           theDefclass = GetNextDefclass(theEnv,theDefclass))
+        {
+         plinks.classArray = &theDefclass;
+         cnt += DisplayHandlersInLinks(theEnv,logName,&plinks,0);
+        }
+     }
+   PrintTally(theEnv,logName,cnt,"message-handler","message-handlers");
+  }
+
+/********************************************************************
+  NAME         : PreviewSend
+  DESCRIPTION  : Displays a list of the core for a message describing
+                   shadows,etc.
+  INPUTS       : 1) Logical name of output
+                 2) Class pointer
+                 3) Message name-string
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Temporary core created and destroyed
+  NOTES        : None
+ ********************************************************************/
+void PreviewSend(
+  Defclass *theDefclass,
+  const char *logicalName,
+  const char *msgname)
+  {
+   HANDLER_LINK *core;
+   CLIPSLexeme *msym;
+   Environment *theEnv = theDefclass->header.env;
+
+   msym = FindSymbolHN(theEnv,msgname,SYMBOL_BIT);
+   if (msym == NULL)
+     { return; }
+
+   core = FindPreviewApplicableHandlers(theEnv,theDefclass,msym);
+   if (core != NULL)
+     {
+      DisplayCore(theEnv,logicalName,core,0);
+      DestroyHandlerLinks(theEnv,core);
+     }
+  }
+
+/****************************************************
+  NAME         : DisplayHandlersInLinks
+  DESCRIPTION  : Recursively displays all handlers
+                  for an array of classes
+  INPUTS       : 1) The logical name of the output
+                 2) The packed class links
+                 3) The index to print from the links
+  RETURNS      : The number of handlers printed
+  SIDE EFFECTS : None
+  NOTES        : Used by DescribeClass()
+ ****************************************************/
+unsigned long DisplayHandlersInLinks(
+  Environment *theEnv,
+  const char *logName,
+  PACKED_CLASS_LINKS *plinks,
+  unsigned int theIndex)
+  {
+   unsigned long i;
+   unsigned long cnt;
+
+   cnt = plinks->classArray[theIndex]->handlerCount;
+   if ((theIndex + 1) < plinks->classCount)
+     cnt += DisplayHandlersInLinks(theEnv,logName,plinks,theIndex + 1);
+   for (i = 0 ; i < plinks->classArray[theIndex]->handlerCount ; i++)
+     PrintHandler(theEnv,logName,&plinks->classArray[theIndex]->handlers[i],false,true);
+   return cnt;
+  }
+
+#endif
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if ! RUN_TIME
+
+/**********************************************************
+  NAME         : CreateSystemHandlers
+  DESCRIPTION  : Attachess the system message-handlers
+                 after a (clear)
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : System handlers created
+  NOTES        : Must be called after CreateSystemClasses()
+ **********************************************************/
+static void CreateSystemHandlers(
+  Environment *theEnv,
+  void *context)
+  {
+   NewSystemHandler(theEnv,USER_TYPE_NAME,INIT_STRING,"init-slots",0);
+   NewSystemHandler(theEnv,USER_TYPE_NAME,DELETE_STRING,"delete-instance",0);
+   NewSystemHandler(theEnv,USER_TYPE_NAME,CREATE_STRING,"(create-instance)",0);
+
+#if DEBUGGING_FUNCTIONS
+   NewSystemHandler(theEnv,USER_TYPE_NAME,PRINT_STRING,"ppinstance",0);
+#endif
+
+   NewSystemHandler(theEnv,USER_TYPE_NAME,DIRECT_MODIFY_STRING,"(direct-modify)",1);
+   NewSystemHandler(theEnv,USER_TYPE_NAME,MSG_MODIFY_STRING,"(message-modify)",1);
+   NewSystemHandler(theEnv,USER_TYPE_NAME,DIRECT_DUPLICATE_STRING,"(direct-duplicate)",2);
+   NewSystemHandler(theEnv,USER_TYPE_NAME,MSG_DUPLICATE_STRING,"(message-duplicate)",2);
+  }
+
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/************************************************************
+  NAME         : WildDeleteHandler
+  DESCRIPTION  : Deletes a handler from a class
+  INPUTS       : 1) Class address (Can be NULL)
+                 2) Message Handler Name (Can be NULL)
+                 3) Type name ("primary", etc.)
+  RETURNS      : 1 if successful, 0 otherwise
+  SIDE EFFECTS : Handler deleted if possible
+  NOTES        : None
+ ************************************************************/
+static bool WildDeleteHandler(
+  Environment *theEnv,
+  Defclass *cls,
+  CLIPSLexeme *msym,
+  const char *tname)
+  {
+   int mtype;
+
+   if (msym == NULL)
+     msym = CreateSymbol(theEnv,"*");
+   if (tname != NULL)
+     {
+      mtype = (int) HandlerType(theEnv,"undefmessage-handler",true,tname);
+      if (mtype == MERROR)
+        return false;
+     }
+   else
+     mtype = -1;
+   if (cls == NULL)
+     {
+      bool success = true;
+
+      for (cls = GetNextDefclass(theEnv,NULL) ;
+           cls != NULL ;
+           cls = GetNextDefclass(theEnv,cls))
+        if (DeleteHandler(theEnv,cls,msym,mtype,false) == false)
+          success = false;
+      return(success);
+     }
+   return(DeleteHandler(theEnv,cls,msym,mtype,true));
+  }
+
+#endif
+
+#if DEBUGGING_FUNCTIONS
+
+/******************************************************************
+  NAME         : DefmessageHandlerWatchAccess
+  DESCRIPTION  : Parses a list of class names passed by
+                 AddWatchItem() and sets the traces accordingly
+  INPUTS       : 1) A code indicating which trace flag is to be set
+                    0 - Watch instance creation/deletion
+                    1 - Watch slot changes to instances
+                 2) The value to which to set the trace flags
+                 3) A list of expressions containing the names
+                    of the classes for which to set traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags set in specified classes
+  NOTES        : Accessory function for AddWatchItem()
+ ******************************************************************/
+static bool DefmessageHandlerWatchAccess(
+  Environment *theEnv,
+  int code,
+  bool newState,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+   if (newState)
+     return(DefmessageHandlerWatchSupport(theEnv,"watch",NULL,newState,
+                                        NULL,DefmessageHandlerSetWatch,argExprs));
+   else
+     return(DefmessageHandlerWatchSupport(theEnv,"unwatch",NULL,newState,
+                                        NULL,DefmessageHandlerSetWatch,argExprs));
+  }
+
+/***********************************************************************
+  NAME         : DefmessageHandlerWatchPrint
+  DESCRIPTION  : Parses a list of class names passed by
+                 AddWatchItem() and displays the traces accordingly
+  INPUTS       : 1) The logical name of the output
+                 2) A code indicating which trace flag is to be examined
+                    0 - Watch instance creation/deletion
+                    1 - Watch slot changes to instances
+                 3) A list of expressions containing the names
+                    of the classes for which to examine traces
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Watch flags displayed for specified classes
+  NOTES        : Accessory function for AddWatchItem()
+ ***********************************************************************/
+static bool DefmessageHandlerWatchPrint(
+  Environment *theEnv,
+  const char *logName,
+  int code,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+   return DefmessageHandlerWatchSupport(theEnv,"list-watch-items",logName,false,
+                                        PrintHandlerWatchFlag,NULL,argExprs);
+  }
+
+/*******************************************************
+  NAME         : DefmessageHandlerWatchSupport
+  DESCRIPTION  : Sets or displays handlers specified
+  INPUTS       : 1) The calling function name
+                 2) The logical output name for displays
+                    (can be NULL)
+                 4) The new set state (can be -1)
+                 5) The print function (can be NULL)
+                 6) The trace function (can be NULL)
+                 7) The handlers expression list
+  RETURNS      : True if all OK,
+                 false otherwise
+  SIDE EFFECTS : Handler trace flags set or displayed
+  NOTES        : None
+ *******************************************************/
+static bool DefmessageHandlerWatchSupport(
+  Environment *theEnv,
+  const char *funcName,
+  const char *logName,
+  bool newState,
+  void (*printFunc)(Environment *,const char *,Defclass *,unsigned),
+  void (*traceFunc)(Defclass *,unsigned,bool),
+  Expression *argExprs)
+  {
+   Defmodule *theModule;
+   Defclass *theClass;
+   const char *theHandlerStr;
+   int theType;
+   unsigned int argIndex = 2;
+   UDFValue tmpData;
+
+   /* ===============================
+      If no handlers are specified,
+      show the trace for all handlers
+      in all handlers
+      =============================== */
+   if (argExprs == NULL)
+     {
+      SaveCurrentModule(theEnv);
+      theModule = GetNextDefmodule(theEnv,NULL);
+      while (theModule != NULL)
+        {
+         SetCurrentModule(theEnv,theModule);
+         if (traceFunc == NULL)
+           {
+            WriteString(theEnv,logName,DefmoduleName(theModule));
+            WriteString(theEnv,logName,":\n");
+           }
+         theClass = GetNextDefclass(theEnv,NULL);
+         while (theClass != NULL)
+            {
+             if (WatchClassHandlers(theEnv,theClass,NULL,-1,logName,newState,
+                                    true,printFunc,traceFunc) == false)
+                 return false;
+             theClass = GetNextDefclass(theEnv,theClass);
+            }
+          theModule = GetNextDefmodule(theEnv,theModule);
+         }
+      RestoreCurrentModule(theEnv);
+      return true;
+     }
+
+   /* ================================================
+      Set or show the traces for the specified handler
+      ================================================ */
+   while (argExprs != NULL)
+     {
+      if (EvaluateExpression(theEnv,argExprs,&tmpData))
+        return false;
+      if (tmpData.header->type != SYMBOL_TYPE)
+        {
+         ExpectedTypeError1(theEnv,funcName,argIndex,"'class name'");
+         return false;
+        }
+      theClass = LookupDefclassByMdlOrScope(theEnv,tmpData.lexemeValue->contents);
+      if (theClass == NULL)
+        {
+         ExpectedTypeError1(theEnv,funcName,argIndex,"'class name'");
+         return false;
+        }
+      if (GetNextArgument(argExprs) != NULL)
+        {
+         argExprs = GetNextArgument(argExprs);
+         argIndex++;
+         if (EvaluateExpression(theEnv,argExprs,&tmpData))
+           return false;
+         if (tmpData.header->type != SYMBOL_TYPE)
+           {
+            ExpectedTypeError1(theEnv,funcName,argIndex,"'handler name'");
+            return false;
+           }
+         theHandlerStr = tmpData.lexemeValue->contents;
+         if (GetNextArgument(argExprs) != NULL)
+           {
+            argExprs = GetNextArgument(argExprs);
+            argIndex++;
+            if (EvaluateExpression(theEnv,argExprs,&tmpData))
+              return false;
+            if (tmpData.header->type != SYMBOL_TYPE)
+              {
+               ExpectedTypeError1(theEnv,funcName,argIndex,"'handler type'");
+               return false;
+              }
+            if ((theType = (int) HandlerType(theEnv,funcName,true,tmpData.lexemeValue->contents)) == MERROR)
+              return false;
+           }
+         else
+           theType = -1;
+        }
+      else
+        {
+         theHandlerStr = NULL;
+         theType = -1;
+        }
+      if (WatchClassHandlers(theEnv,theClass,theHandlerStr,theType,logName,
+                             newState,false,printFunc,traceFunc) == false)
+        {
+         ExpectedTypeError1(theEnv,funcName,argIndex,"handler");
+         return false;
+        }
+      argIndex++;
+      argExprs = GetNextArgument(argExprs);
+     }
+   return true;
+  }
+
+/*******************************************************
+  NAME         : WatchClassHandlers
+  DESCRIPTION  : Sets or displays handlers specified
+  INPUTS       : 1) The class
+                 2) The handler name (or NULL wildcard)
+                 3) The handler type (or -1 wildcard)
+                 4) The logical output name for displays
+                    (can be NULL)
+                 5) The new set state (can be -1)
+                 6) The print function (can be NULL)
+                 7) The trace function (can be NULL)
+  RETURNS      : True if all OK,
+                 false otherwise
+  SIDE EFFECTS : Handler trace flags set or displayed
+  NOTES        : None
+ *******************************************************/
+static bool WatchClassHandlers(
+  Environment *theEnv,
+  Defclass *theClass,
+  const char *theHandlerStr,
+  int theType,
+  const char *logName,
+  bool newState,
+  bool indentp,
+  void (*printFunc)(Environment *,const char *,Defclass *,unsigned),
+  void (*traceFunc)(Defclass *,unsigned,bool))
+  {
+   unsigned theHandler;
+   bool found = false;
+
+   theHandler = GetNextDefmessageHandler(theClass,0);
+   while (theHandler != 0)
+     {
+      if ((theType == -1) ? true :
+          (theType == (int) theClass->handlers[theHandler-1].type))
+        {
+         if ((theHandlerStr == NULL) ? true :
+             (strcmp(theHandlerStr,DefmessageHandlerName(theClass,theHandler)) == 0))
+            {
+             if (traceFunc != NULL)
+               (*traceFunc)(theClass,theHandler,newState);
+             else
+               {
+                if (indentp)
+                  WriteString(theEnv,logName,"   ");
+                (*printFunc)(theEnv,logName,theClass,theHandler);
+               }
+             found = true;
+            }
+        }
+      theHandler = GetNextDefmessageHandler(theClass,theHandler);
+     }
+   if ((theHandlerStr != NULL) && (theType != -1) && (found == false))
+     return false;
+   return true;
+  }
+
+/***************************************************
+  NAME         : PrintHandlerWatchFlag
+  DESCRIPTION  : Displays trace value for handler
+  INPUTS       : 1) The logical name of the output
+                 2) The class
+                 3) The handler index
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static void PrintHandlerWatchFlag(
+  Environment *theEnv,
+  const char *logName,
+  Defclass *theClass,
+  unsigned theHandler)
+  {
+   WriteString(theEnv,logName,DefclassName(theClass));
+   WriteString(theEnv,logName," ");
+   WriteString(theEnv,logName,DefmessageHandlerName(theClass,theHandler));
+   WriteString(theEnv,logName," ");
+   WriteString(theEnv,logName,DefmessageHandlerType(theClass,theHandler));
+
+   if (DefmessageHandlerGetWatch(theClass,theHandler))
+     WriteString(theEnv,logName," = on\n");
+   else
+     WriteString(theEnv,logName," = off\n");
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#endif /* OBJECT_SYSTEM */
+
diff --git a/clips/msgcom.h b/clips/msgcom.h
new file mode 100755
index 000000000..c9f73af7d
--- /dev/null
+++ b/clips/msgcom.h
@@ -0,0 +1,125 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS            */
+/*                    compilation flag.                      */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added DeallocateMessageHandlerData to          */
+/*            deallocate message handler environment data.   */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_msgcom
+
+#pragma once
+
+#define _H_msgcom
+
+#include "msgpass.h"
+#include "object.h"
+
+#define MESSAGE_HANDLER_DATA 32
+
+struct messageHandlerData
+  {
+   EntityRecord HandlerGetInfo;
+   EntityRecord HandlerPutInfo;
+   CLIPSLexeme *INIT_SYMBOL;
+   CLIPSLexeme *DELETE_SYMBOL;
+   CLIPSLexeme *CREATE_SYMBOL;
+#if DEBUGGING_FUNCTIONS
+   bool WatchHandlers;
+   bool WatchMessages;
+#endif
+   const char *hndquals[4];
+   CLIPSLexeme *SELF_SYMBOL;
+   CLIPSLexeme *CurrentMessageName;
+   HANDLER_LINK *CurrentCore;
+   HANDLER_LINK *TopOfCore;
+   HANDLER_LINK *NextInCore;
+   HANDLER_LINK *OldCore;
+  };
+
+#define MessageHandlerData(theEnv) ((struct messageHandlerData *) GetEnvironmentData(theEnv,MESSAGE_HANDLER_DATA))
+
+#define INIT_STRING   "init"
+#define DELETE_STRING "delete"
+#define PRINT_STRING  "print"
+#define CREATE_STRING "create"
+
+   void             SetupMessageHandlers(Environment *);
+   const char      *DefmessageHandlerName(Defclass *,unsigned);
+   const char      *DefmessageHandlerType(Defclass *,unsigned);
+   unsigned         GetNextDefmessageHandler(Defclass *,unsigned);
+   DefmessageHandler
+                   *GetDefmessageHandlerPointer(Defclass *,unsigned int);
+#if DEBUGGING_FUNCTIONS
+   bool             DefmessageHandlerGetWatch(Defclass *,unsigned);
+   void             DefmessageHandlerSetWatch(Defclass *,unsigned,bool);
+#endif
+   unsigned         FindDefmessageHandler(Defclass *,const char *,const char *);
+   bool             DefmessageHandlerIsDeletable(Defclass *,unsigned);
+   void             UndefmessageHandlerCommand(Environment *,UDFContext *,UDFValue *);
+   bool             UndefmessageHandler(Defclass *,unsigned,Environment *);
+#if DEBUGGING_FUNCTIONS
+   void             PPDefmessageHandlerCommand(Environment *,UDFContext *,UDFValue *);
+   void             ListDefmessageHandlersCommand(Environment *,UDFContext *,UDFValue *);
+   void             PreviewSendCommand(Environment *,UDFContext *,UDFValue *);
+   const char      *DefmessageHandlerPPForm(Defclass *,unsigned);
+   void             ListDefmessageHandlers(Environment *,Defclass *,const char *,bool);
+   void             PreviewSend(Defclass *,const char *,const char *);
+   unsigned long    DisplayHandlersInLinks(Environment *,const char *,PACKED_CLASS_LINKS *,unsigned int);
+#endif
+
+#endif /* _H_msgcom */
+
+
+
+
+
diff --git a/clips/msgfun.c b/clips/msgfun.c
new file mode 100755
index 000000000..5ac90f251
--- /dev/null
+++ b/clips/msgfun.c
@@ -0,0 +1,1076 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  06/22/18             */
+   /*                                                     */
+   /*              OBJECT MESSAGE FUNCTIONS               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS and        */
+/*            AUXILIARY_MESSAGE_HANDLERS compilation flags.  */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include "classcom.h"
+#include "classfun.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "inscom.h"
+#include "insfun.h"
+#include "memalloc.h"
+#include "msgcom.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "router.h"
+
+#include "msgfun.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if DEBUGGING_FUNCTIONS
+   static HANDLER_LINK           *DisplayPrimaryCore(Environment *,const char *,HANDLER_LINK *,int);
+   static void                    PrintPreviewHandler(Environment *,const char *,HANDLER_LINK *,int,const char *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/********************************************************
+  NAME         : UnboundHandlerErr
+  DESCRIPTION  : Print out a synopis of the currently
+                   executing handler for unbound variable
+                   errors
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error synopsis printed to STDERR
+  NOTES        : None
+ ********************************************************/
+void UnboundHandlerErr(
+  Environment *theEnv,
+  const char *logName)
+  {
+   WriteString(theEnv,logName,"message-handler ");
+   PrintHandler(theEnv,logName,MessageHandlerData(theEnv)->CurrentCore->hnd,true,true);
+  }
+
+/*****************************************************************
+  NAME         : PrintNoHandlerError
+  DESCRIPTION  : Print "No primaries found" error message for send
+  INPUTS       : The name of the message
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************************/
+void PrintNoHandlerError(
+  Environment *theEnv,
+  const char *msg)
+  {
+   PrintErrorID(theEnv,"MSGFUN",1,false);
+   WriteString(theEnv,STDERR,"No applicable primary message-handlers found for '");
+   WriteString(theEnv,STDERR,msg);
+   WriteString(theEnv,STDERR,"'.\n");
+  }
+
+/***************************************************************
+  NAME         : CheckHandlerArgCount
+  DESCRIPTION  : Verifies that the current argument
+                   list satisfies the current
+                   handler's parameter count restriction
+  INPUTS       : None
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : EvaluationError set on errors
+  NOTES        : Uses ProcParamArraySize and CurrentCore globals
+ ***************************************************************/
+bool CheckHandlerArgCount(
+  Environment *theEnv)
+  {
+   DefmessageHandler *hnd;
+
+   hnd = MessageHandlerData(theEnv)->CurrentCore->hnd;
+   if ((hnd->maxParams == PARAMETERS_UNBOUNDED) ?
+          (ProceduralPrimitiveData(theEnv)->ProcParamArraySize < hnd->minParams) : // TBD
+          (ProceduralPrimitiveData(theEnv)->ProcParamArraySize != hnd->minParams))
+     {
+      SetEvaluationError(theEnv,true);
+      PrintErrorID(theEnv,"MSGFUN",2,false);
+      WriteString(theEnv,STDERR,"Message-handler '");
+      WriteString(theEnv,STDERR,hnd->header.name->contents);
+      WriteString(theEnv,STDERR,"' ");
+      WriteString(theEnv,STDERR,MessageHandlerData(theEnv)->hndquals[hnd->type]);
+      WriteString(theEnv,STDERR," in class '");
+      WriteString(theEnv,STDERR,DefclassName(hnd->cls));
+      WriteString(theEnv,STDERR,"' expected ");
+      
+      if (hnd->maxParams == PARAMETERS_UNBOUNDED)
+        WriteString(theEnv,STDERR,"at least ");
+      else
+        WriteString(theEnv,STDERR,"exactly ");
+        
+      PrintUnsignedInteger(theEnv,STDERR,hnd->minParams-1);
+      if (hnd->minParams-1 == 1)
+        { WriteString(theEnv,STDERR," argument.\n"); }
+      else
+        { WriteString(theEnv,STDERR," arguments.\n"); }
+        
+      return false;
+     }
+   return true;
+  }
+
+/***************************************************
+  NAME         : SlotAccessViolationError
+  DESCRIPTION  : Prints out an error message when
+                 attempt is made to set a read-only
+                 or initialize-only slot improperly
+  INPUTS       : 1) The slot name
+                 2) A flag indicating if the source
+                    is a class or an instance
+                 3) A pointer to the source
+                    instance/class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error message printed
+  NOTES        : None
+ ***************************************************/
+void SlotAccessViolationError(
+  Environment *theEnv,
+  const char *slotName,
+  Instance *theInstance,
+  Defclass *theDefclass)
+  {
+   PrintErrorID(theEnv,"MSGFUN",3,false);
+   WriteString(theEnv,STDERR,"Write access denied for slot '");
+   WriteString(theEnv,STDERR,slotName);
+   WriteString(theEnv,STDERR,"' in ");
+   if (theInstance != NULL)
+     {
+      WriteString(theEnv,STDERR,"instance ");
+      WriteString(theEnv,STDERR,"[");
+      WriteString(theEnv,STDERR,InstanceName(theInstance));
+      WriteString(theEnv,STDERR,"] of class ");
+      PrintClassName(theEnv,STDERR,theInstance->cls,true,false);
+     }
+   else
+     {
+      WriteString(theEnv,STDERR,"class ");
+      PrintClassName(theEnv,STDERR,theDefclass,true,false);
+     }
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/***************************************************
+  NAME         : SlotVisibilityViolationError
+  DESCRIPTION  : Prints out an error message when
+                 attempt is made to access a
+                 private slot improperly
+  INPUTS       : 1) The slot descriptor
+                 2) A pointer to the source class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error message printed
+  NOTES        : None
+ ***************************************************/
+void SlotVisibilityViolationError(
+  Environment *theEnv,
+  SlotDescriptor *sd,
+  Defclass *theDefclass,
+  bool printCR)
+  {
+   PrintErrorID(theEnv,"MSGFUN",6,printCR);
+   WriteString(theEnv,STDERR,"Private slot '");
+   WriteString(theEnv,STDERR,sd->slotName->name->contents);
+   WriteString(theEnv,STDERR,"' of class ");
+   PrintClassName(theEnv,STDERR,sd->cls,true,false);
+   WriteString(theEnv,STDERR," cannot be accessed directly by handlers attached to class ");
+   PrintClassName(theEnv,STDERR,theDefclass,true,false);
+   WriteString(theEnv,STDERR,"\n");
+  }
+
+#if ! RUN_TIME
+
+/******************************************************************************
+  NAME         : NewSystemHandler
+  DESCRIPTION  : Adds a new system handler for a system class
+
+                 The handler is assumed to be primary and of
+                 the form:
+
+                 (defmessage-handler <class> <handler> () (<func>))
+
+  INPUTS       : 1) Name-string of the system class
+                 2) Name-string of the system handler
+                 3) Name-string of the internal H/L function to implement
+                      this handler
+                 4) The number of extra arguments (past the instance itself)
+                    that the handler willl accept
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Creates the new handler and inserts it in the system class's
+                   handler array
+                 On errors, generate a system error and exits.
+  NOTES        : Does not check to see if handler already exists
+ *******************************************************************************/
+void NewSystemHandler(
+  Environment *theEnv,
+  const char *cname,
+  const char *mname,
+  const char *fname,
+  unsigned short extraargs)
+  {
+   Defclass *cls;
+   DefmessageHandler *hnd;
+
+   cls = LookupDefclassInScope(theEnv,cname);
+   hnd = InsertHandlerHeader(theEnv,cls,CreateSymbol(theEnv,mname),MPRIMARY);
+   IncrementLexemeCount(hnd->header.name);
+   hnd->system = 1;
+   hnd->minParams = hnd->maxParams = extraargs + 1;
+   hnd->localVarCount = 0;
+   hnd->actions = get_struct(theEnv,expr);
+   hnd->actions->argList = NULL;
+   hnd->actions->type = FCALL;
+   hnd->actions->value = FindFunction(theEnv,fname);
+   hnd->actions->nextArg = NULL;
+  }
+
+/***************************************************
+  NAME         : InsertHandlerHeader
+  DESCRIPTION  : Allocates a new handler header and
+                   inserts it in the proper (sorted)
+                   position in the class hnd array
+  INPUTS       : 1) The class
+                 2) The handler name
+                 3) The handler type
+  RETURNS      : The address of the new handler
+                   header, NULL on errors
+  SIDE EFFECTS : Class handler array reallocated
+                   and resorted
+  NOTES        : Assumes handler does not exist
+ ***************************************************/
+DefmessageHandler *InsertHandlerHeader(
+  Environment *theEnv,
+  Defclass *cls,
+  CLIPSLexeme *mname,
+  unsigned mtype)
+  {
+   DefmessageHandler *nhnd,*hnd;
+   unsigned *narr,*arr;
+   long i;
+   long j,ni = -1;
+
+   hnd = cls->handlers;
+   arr = cls->handlerOrderMap;
+   nhnd = (DefmessageHandler *) gm2(theEnv,(sizeof(DefmessageHandler) * (cls->handlerCount+1)));
+   narr = (unsigned *) gm2(theEnv,(sizeof(unsigned) * (cls->handlerCount+1)));
+   GenCopyMemory(DefmessageHandler,cls->handlerCount,nhnd,hnd);
+   for (i = 0 , j = 0 ; i < cls->handlerCount ; i++ , j++)
+     {
+      if (ni == -1)
+        {
+         if ((hnd[arr[i]].header.name->bucket > mname->bucket) ? true :
+             (hnd[arr[i]].header.name == mname))
+           {
+            ni = i;
+            j++;
+           }
+        }
+      narr[j] = arr[i];
+     }
+   if (ni == -1)
+     ni = (int) cls->handlerCount;
+   narr[ni] = cls->handlerCount;
+   nhnd[cls->handlerCount].system = 0;
+   nhnd[cls->handlerCount].type = mtype;
+   nhnd[cls->handlerCount].busy = 0;
+   nhnd[cls->handlerCount].mark = 0;
+#if DEBUGGING_FUNCTIONS
+   nhnd[cls->handlerCount].trace = MessageHandlerData(theEnv)->WatchHandlers;
+#endif
+   nhnd[cls->handlerCount].header.name = mname;
+   nhnd[cls->handlerCount].header.whichModule = cls->header.whichModule;
+   nhnd[cls->handlerCount].header.next = NULL;
+   nhnd[cls->handlerCount].cls = cls;
+   nhnd[cls->handlerCount].minParams = 0;
+   nhnd[cls->handlerCount].maxParams = 0;
+   nhnd[cls->handlerCount].localVarCount = 0;
+   nhnd[cls->handlerCount].actions = NULL;
+   nhnd[cls->handlerCount].header.ppForm = NULL;
+   nhnd[cls->handlerCount].header.usrData = NULL;
+   nhnd[cls->handlerCount].header.constructType = DEFMESSAGE_HANDLER;
+   nhnd[cls->handlerCount].header.env = theEnv;
+   if (cls->handlerCount != 0)
+     {
+      rm(theEnv,hnd,(sizeof(DefmessageHandler) * cls->handlerCount));
+      rm(theEnv,arr,(sizeof(unsigned) * cls->handlerCount));
+     }
+   cls->handlers = nhnd;
+   cls->handlerOrderMap = narr;
+   cls->handlerCount++;
+   return(&nhnd[cls->handlerCount-1]);
+  }
+
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/*****************************************************
+  NAME         : HandlersExecuting
+  DESCRIPTION  : Determines if any message-handlers
+                   for a class are currently executing
+  INPUTS       : The class address
+  RETURNS      : True if any handlers are executing,
+                   false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+bool HandlersExecuting(
+  Defclass *cls)
+  {
+   long i;
+
+   for (i = 0 ; i < cls->handlerCount ; i++)
+     if (cls->handlers[i].busy > 0)
+       return true;
+   return false;
+  }
+
+/*********************************************************************
+  NAME         : DeleteHandler
+  DESCRIPTION  : Deletes one or more message-handlers
+                   from a class definition
+  INPUTS       : 1) The class address
+                 2) The message-handler name
+                    (if this is * and there is no handler
+                     called *, then the delete operations
+                     will be applied to all handlers matching the type
+                 3) The message-handler type
+                    (if this is -1, then the delete operations will be
+                     applied to all handlers matching the name
+                 4) A flag saying whether to print error messages when
+                     handlers are not found meeting specs
+  RETURNS      : 1 if successful, 0 otherwise
+  SIDE EFFECTS : Handlers deleted
+  NOTES        : If any handlers for the class are
+                   currently executing, this routine
+                   will fail
+ **********************************************************************/
+bool DeleteHandler(
+   Environment *theEnv,
+   Defclass *cls,
+   CLIPSLexeme *mname,
+   int mtype,
+   bool indicate_missing)
+  {
+   long i;
+   DefmessageHandler *hnd;
+   bool found,success = true;
+
+   if (cls->handlerCount == 0)
+     {
+      if (indicate_missing)
+        {
+         HandlerDeleteError(theEnv,DefclassName(cls));
+         return false;
+        }
+      return true;
+     }
+   if (HandlersExecuting(cls))
+     {
+      HandlerDeleteError(theEnv,DefclassName(cls));
+      return false;
+     }
+   if (mtype == -1)
+     {
+      found = false;
+      for (i = MAROUND ; i <= MAFTER ; i++)
+        {
+         hnd = FindHandlerByAddress(cls,mname,(unsigned) i);
+         if (hnd != NULL)
+           {
+            found = true;
+            if (hnd->system == 0)
+              hnd->mark = 1;
+            else
+              {
+               PrintErrorID(theEnv,"MSGPSR",3,false);
+               WriteString(theEnv,STDERR,"System message-handlers may not be modified.\n");
+               success = false;
+              }
+           }
+        }
+      if ((found == false) ? (strcmp(mname->contents,"*") == 0) : false)
+        {
+         for (i = 0 ; i < cls->handlerCount ; i++)
+           if (cls->handlers[i].system == 0)
+             cls->handlers[i].mark = 1;
+        }
+     }
+   else
+     {
+      hnd = FindHandlerByAddress(cls,mname,(unsigned) mtype);
+      if (hnd == NULL)
+        {
+         if (strcmp(mname->contents,"*") == 0)
+           {
+            for (i = 0 ; i < cls->handlerCount ; i++)
+              if ((cls->handlers[i].type == (unsigned) mtype) &&
+                  (cls->handlers[i].system == 0))
+                cls->handlers[i].mark = 1;
+           }
+         else
+           {
+            if (indicate_missing)
+              HandlerDeleteError(theEnv,DefclassName(cls));
+            success = false;
+           }
+        }
+      else if (hnd->system == 0)
+        hnd->mark = 1;
+      else
+        {
+         if (indicate_missing)
+           {
+            PrintErrorID(theEnv,"MSGPSR",3,false);
+            WriteString(theEnv,STDERR,"System message-handlers may not be modified.\n");
+           }
+         success = false;
+        }
+     }
+   DeallocateMarkedHandlers(theEnv,cls);
+   return(success);
+  }
+
+/***************************************************
+  NAME         : DeallocateMarkedHandlers
+  DESCRIPTION  : Removes any handlers from a class
+                   that have been previously marked
+                   for deletion.
+  INPUTS       : The class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Marked handlers are deleted
+  NOTES        : Assumes none of the handlers are
+                   currently executing or have a
+                   busy count != 0 for any reason
+ ***************************************************/
+void DeallocateMarkedHandlers(
+  Environment *theEnv,
+  Defclass *cls)
+  {
+   unsigned short count;
+   DefmessageHandler *hnd,*nhnd;
+   unsigned *arr,*narr;
+   long i,j;
+
+   for (i = 0 , count = 0 ; i < cls->handlerCount ; i++)
+     {
+      hnd = &cls->handlers[i];
+      if (hnd->mark == 1)
+        {
+         count++;
+         ReleaseLexeme(theEnv,hnd->header.name);
+         ExpressionDeinstall(theEnv,hnd->actions);
+         ReturnPackedExpression(theEnv,hnd->actions);
+         ClearUserDataList(theEnv,hnd->header.usrData);
+         if (hnd->header.ppForm != NULL)
+           rm(theEnv,(void *) hnd->header.ppForm,
+              (sizeof(char) * (strlen(hnd->header.ppForm)+1)));
+        }
+      else
+         /* ============================================
+            Use the busy field to count how many
+            message-handlers are removed before this one
+            ============================================ */
+        hnd->busy = count;
+     }
+   if (count == 0)
+     return;
+   if (count == cls->handlerCount)
+     {
+      rm(theEnv,cls->handlers,(sizeof(DefmessageHandler) * cls->handlerCount));
+      rm(theEnv,cls->handlerOrderMap,(sizeof(unsigned) * cls->handlerCount));
+      cls->handlers = NULL;
+      cls->handlerOrderMap = NULL;
+      cls->handlerCount = 0;
+     }
+   else
+     {
+      count = (cls->handlerCount - count);
+      hnd = cls->handlers;
+      arr = cls->handlerOrderMap;
+      nhnd = (DefmessageHandler *) gm2(theEnv,(sizeof(DefmessageHandler) * count));
+      narr = (unsigned *) gm2(theEnv,(sizeof(unsigned) * count));
+      for (i = 0 , j = 0 ; j < count ; i++)
+        {
+         if (hnd[arr[i]].mark == 0)
+           {
+            /* ==============================================================
+               The offsets in the map need to be decremented by the number of
+               preceding nodes which were deleted.  Use the value of the busy
+               field set in the first loop.
+               ============================================================== */
+            narr[j] = arr[i] - hnd[arr[i]].busy;
+            j++;
+           }
+        }
+      for (i = 0 , j = 0 ; j < count ; i++)
+        {
+         if (hnd[i].mark == 0)
+           {
+            hnd[i].busy = 0;
+            GenCopyMemory(DefmessageHandler,1,&nhnd[j],&hnd[i]);
+            j++;
+           }
+        }
+      rm(theEnv,hnd,(sizeof(DefmessageHandler) * cls->handlerCount));
+      rm(theEnv,arr,(sizeof(unsigned) * cls->handlerCount));
+      cls->handlers = nhnd;
+      cls->handlerOrderMap = narr;
+      cls->handlerCount = count;
+     }
+  }
+
+#endif
+
+/*****************************************************
+  NAME         : HandlerType
+  DESCRIPTION  : Determines type of message-handler
+  INPUTS       : 1) Calling function string
+                 2) String representing type
+  RETURNS      : MAROUND  (0) for "around"
+                 MBEFORE  (1) for "before"
+                 MPRIMARY (2) for "primary"
+                 MAFTER   (3) for "after"
+                 MERROR   (4) on errors
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************/
+unsigned short HandlerType(
+  Environment *theEnv,
+  const char *where,
+  bool whereIsFunction,
+  const char *str)
+  {
+   unsigned short i;
+
+   for (i = MAROUND ; i <= MAFTER ; i++)
+     {
+      if (strcmp(str,MessageHandlerData(theEnv)->hndquals[i]) == 0)
+        { return i; }
+     }
+     
+   PrintErrorID(theEnv,"MSGFUN",7,false);
+   WriteString(theEnv,STDERR,"Unrecognized message-handler type in ");
+   if (whereIsFunction)
+     {
+      WriteString(theEnv,STDERR,"function '");
+      WriteString(theEnv,STDERR,where);
+      WriteString(theEnv,STDERR,"'.");
+     }
+   else
+     { WriteString(theEnv,STDERR,where); }
+   
+   WriteString(theEnv,STDERR,".\n");
+   
+   return(MERROR);
+  }
+
+/*****************************************************************
+  NAME         : CheckCurrentMessage
+  DESCRIPTION  : Makes sure that a message is available
+                   and active for an internal message function
+  INPUTS       : 1) The name of the function checking the message
+                 2) A flag indicating whether the object must be
+                      a class instance or not (it could be a
+                      primitive type)
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : EvaluationError set on errors
+  NOTES        : None
+ *****************************************************************/
+bool CheckCurrentMessage(
+  Environment *theEnv,
+  const char *func,
+  bool ins_reqd)
+  {
+   UDFValue *activeMsgArg;
+
+   if (!MessageHandlerData(theEnv)->CurrentCore || (MessageHandlerData(theEnv)->CurrentCore->hnd->actions != ProceduralPrimitiveData(theEnv)->CurrentProcActions))
+     {
+      PrintErrorID(theEnv,"MSGFUN",4,false);
+      WriteString(theEnv,STDERR,"The function '");
+      WriteString(theEnv,STDERR,func);
+      WriteString(theEnv,STDERR,"' may only be called from within message-handlers.\n");
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+   activeMsgArg = GetNthMessageArgument(theEnv,0);
+   if ((ins_reqd == true) ? (activeMsgArg->header->type != INSTANCE_ADDRESS_TYPE) : false)
+     {
+      PrintErrorID(theEnv,"MSGFUN",5,false);
+      WriteString(theEnv,STDERR,"The function '");
+      WriteString(theEnv,STDERR,func);
+      WriteString(theEnv,STDERR,"' operates only on instances.\n");
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+   if ((activeMsgArg->header->type == INSTANCE_ADDRESS_TYPE) ?
+       (activeMsgArg->instanceValue->garbage == 1) : false)
+     {
+      StaleInstanceAddress(theEnv,func,0);
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+   return true;
+  }
+
+/***************************************************
+  NAME         : PrintHandler
+  DESCRIPTION  : Displays a handler synopsis
+  INPUTS       : 1) Logical name of output
+                 2) The handler
+                 5) Flag indicating whether to
+                    printout a terminating newline
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void PrintHandler(
+  Environment *theEnv,
+  const char *logName,
+  DefmessageHandler *theHandler,
+  bool useQuotes,
+  bool crtn)
+  {
+   if (useQuotes) WriteString(theEnv,logName,"'");
+   WriteString(theEnv,logName,theHandler->header.name->contents);
+   if (useQuotes) WriteString(theEnv,logName,"'");
+   WriteString(theEnv,logName," ");
+   WriteString(theEnv,logName,MessageHandlerData(theEnv)->hndquals[theHandler->type]);
+   WriteString(theEnv,logName," in class ");
+   PrintClassName(theEnv,logName,theHandler->cls,useQuotes,crtn);
+  }
+
+/***********************************************************
+  NAME         : FindHandlerByAddress
+  DESCRIPTION  : Uses a binary search on a class's
+                   handler header array
+  INPUTS       : 1) The class address
+                 2) The handler symbolic name
+                 3) The handler type (MPRIMARY,etc.)
+  RETURNS      : The address of the found handler,
+                   NULL if not found
+  SIDE EFFECTS : None
+  NOTES        : Assumes array is in ascending order
+                   1st key: symbolic name of handler
+                   2nd key: type of handler
+ ***********************************************************/
+DefmessageHandler *FindHandlerByAddress(
+  Defclass *cls,
+  CLIPSLexeme *name,
+  unsigned type)
+  {
+   int b;
+   long i;
+   DefmessageHandler *hnd;
+   unsigned *arr;
+
+   if ((b = FindHandlerNameGroup(cls,name)) == -1)
+     return NULL;
+   arr = cls->handlerOrderMap;
+   hnd = cls->handlers;
+   for (i = (unsigned) b ; i < cls->handlerCount ; i++)
+     {
+      if (hnd[arr[i]].header.name != name)
+        return NULL;
+      if (hnd[arr[i]].type == type)
+        return(&hnd[arr[i]]);
+     }
+   return NULL;
+  }
+
+/***********************************************************
+  NAME         : FindHandlerByIndex
+  DESCRIPTION  : Uses a binary search on a class's
+                   handler header array
+  INPUTS       : 1) The class address
+                 2) The handler symbolic name
+                 3) The handler type (MPRIMARY,etc.)
+  RETURNS      : The index of the found handler,
+                   -1 if not found
+  SIDE EFFECTS : None
+  NOTES        : Assumes array is in ascending order
+                   1st key: symbolic name of handler
+                   2nd key: type of handler
+ ***********************************************************/
+int FindHandlerByIndex(
+  Defclass *cls,
+  CLIPSLexeme *name,
+  unsigned type)
+  {
+   int b;
+   long i;
+   DefmessageHandler *hnd;
+   unsigned *arr;
+
+   if ((b = FindHandlerNameGroup(cls,name)) == -1)
+     return -1;
+   arr = cls->handlerOrderMap;
+   hnd = cls->handlers;
+   for (i = (unsigned) b ; i < cls->handlerCount ; i++)
+     {
+      if (hnd[arr[i]].header.name != name)
+        return -1;
+      if (hnd[arr[i]].type == type)
+        return (int) arr[i];
+     }
+   return -1;
+  }
+
+/*****************************************************
+  NAME         : FindHandlerNameGroup
+  DESCRIPTION  : Uses a binary search on a class's
+                   handler header array
+  INPUTS       : 1) The class address
+                 2) The handler symbolic name
+  RETURNS      : The index of the found handler group
+                   -1 if not found
+  SIDE EFFECTS : None
+  NOTES        : Assumes array is in ascending order
+                   1st key: handler name symbol bucket
+ *****************************************************/
+int FindHandlerNameGroup(
+  Defclass *cls,
+  CLIPSLexeme *name)
+  {
+   int b,e,i,j;
+   DefmessageHandler *hnd;
+   unsigned *arr;
+   int start;
+
+   if (cls->handlerCount == 0)
+     return(-1);
+   hnd = cls->handlers;
+   arr = cls->handlerOrderMap;
+   b = 0;
+   e = (int) (cls->handlerCount-1);
+   start = -1;
+   do
+     {
+      i = (b+e)/2;
+      if (name->bucket == hnd[arr[i]].header.name->bucket)
+        {
+         for (j = i ; j >= b ; j--)
+           {
+            if (hnd[arr[j]].header.name == name)
+              start = j;
+            if (hnd[arr[j]].header.name->bucket != name->bucket)
+              break;
+           }
+         if (start != -1)
+           return(start);
+         for (j = i+1 ; j <= e ; j++)
+           {
+            if (hnd[arr[j]].header.name == name)
+              return(j);
+            if (hnd[arr[j]].header.name->bucket != name->bucket)
+              return(-1);
+           }
+         return(-1);
+        }
+      else if (name->bucket < hnd[arr[i]].header.name->bucket)
+        e = i-1;
+      else
+        b = i+1;
+     }
+   while (b <= e);
+   return(-1);
+  }
+
+/***************************************************
+  NAME         : HandlerDeleteError
+  DESCRIPTION  : Prints out an error message when
+                   handlers cannot be deleted
+  INPUTS       : Name-string of the class
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void HandlerDeleteError(
+  Environment *theEnv,
+  const char *cname)
+  {
+   PrintErrorID(theEnv,"MSGFUN",8,false);
+   WriteString(theEnv,STDERR,"Unable to delete message-handler(s) from class '");
+   WriteString(theEnv,STDERR,cname);
+   WriteString(theEnv,STDERR,"'.\n");
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/********************************************************************
+  NAME         : DisplayCore
+  DESCRIPTION  : Gives a schematic "printout" of the
+                   core framework for a message showing
+                   arounds, primaries, shadows etc.
+                 This routine uses recursion to print indentation
+                   to indicate shadowing and where handlers begin
+                   and end execution wrt one another.
+  INPUTS       : 1) Logical name of output
+                 2) The remaining core
+                 3) The number of handlers this (partial) core
+                    shadows
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Expects that the core was created in PREVIEW mode,
+                   i.e. implicit handlers are SlotDescriptor addresses
+                   (in PERFORM mode they are INSTANCE_SLOT addresses)
+                 Assumes (partial) core is not empty
+ ********************************************************************/
+void DisplayCore(
+  Environment *theEnv,
+  const char *logicalName,
+  HANDLER_LINK *core,
+  int sdepth)
+  {
+   if (core->hnd->type == MAROUND)
+     {
+      PrintPreviewHandler(theEnv,logicalName,core,sdepth,BEGIN_TRACE);
+      if (core->nxt != NULL)
+        DisplayCore(theEnv,logicalName,core->nxt,sdepth+1);
+      PrintPreviewHandler(theEnv,logicalName,core,sdepth,END_TRACE);
+     }
+   else
+     {
+      while ((core != NULL) ? (core->hnd->type == MBEFORE) : false)
+        {
+         PrintPreviewHandler(theEnv,logicalName,core,sdepth,BEGIN_TRACE);
+         PrintPreviewHandler(theEnv,logicalName,core,sdepth,END_TRACE);
+         core = core->nxt;
+        }
+      if ((core != NULL) ? (core->hnd->type == MPRIMARY) : false)
+
+        core = DisplayPrimaryCore(theEnv,logicalName,core,sdepth);
+
+      while ((core != NULL) ? (core->hnd->type == MAFTER) : false)
+        {
+         PrintPreviewHandler(theEnv,logicalName,core,sdepth,BEGIN_TRACE);
+         PrintPreviewHandler(theEnv,logicalName,core,sdepth,END_TRACE);
+         core = core->nxt;
+        }
+
+     }
+  }
+
+/*******************************************************************
+  NAME         : FindPreviewApplicableHandlers
+  DESCRIPTION  : See FindApplicableHandlers
+                 However, this function only examines classes rather
+                   than instances for implicit slot-accessors
+  INPUTS       : 1) The class address
+                 2) The message name symbol
+  RETURNS      : The links of applicable handlers, NULL on errors
+  SIDE EFFECTS : Links are allocated for the list
+  NOTES        : None
+ ******************************************************************/
+HANDLER_LINK *FindPreviewApplicableHandlers(
+  Environment *theEnv,
+  Defclass *cls,
+  CLIPSLexeme *mname)
+  {
+   unsigned int i;
+   HANDLER_LINK *tops[4],*bots[4];
+
+   for (i = MAROUND ; i <= MAFTER ; i++)
+     tops[i] = bots[i] = NULL;
+
+   for (i = 0 ; i < cls->allSuperclasses.classCount ; i++)
+     FindApplicableOfName(theEnv,cls->allSuperclasses.classArray[i],tops,bots,mname);
+   
+   return JoinHandlerLinks(theEnv,tops,bots,mname);
+  }
+
+/***********************************************************
+  NAME         : WatchMessage
+  DESCRIPTION  : Prints a condensed description of a
+                   message and its arguments
+  INPUTS       : 1) The output logical name
+                 2) BEGIN_TRACE or END_TRACE string
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Uses the global variables ProcParamArray
+                   and CurrentMessageName
+ ***********************************************************/
+void WatchMessage(
+  Environment *theEnv,
+  const char *logName,
+  const char *tstring)
+  {
+   if (ConstructData(theEnv)->ClearReadyInProgress ||
+       ConstructData(theEnv)->ClearInProgress)
+     { return; }
+
+   WriteString(theEnv,logName,"MSG ");
+   WriteString(theEnv,logName,tstring);
+   WriteString(theEnv,logName," ");
+   WriteString(theEnv,logName,MessageHandlerData(theEnv)->CurrentMessageName->contents);
+   WriteString(theEnv,logName," ED:");
+   WriteInteger(theEnv,logName,EvaluationData(theEnv)->CurrentEvaluationDepth);
+   PrintProcParamArray(theEnv,logName);
+  }
+
+/***********************************************************
+  NAME         : WatchHandler
+  DESCRIPTION  : Prints a condensed description of a
+                   message-handler and its arguments
+  INPUTS       : 1) The output logical name
+                 2) The handler address
+                 3) BEGIN_TRACE or END_TRACE string
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : Uses the global variables ProcParamArray
+                   and CurrentMessageName
+ ***********************************************************/
+void WatchHandler(
+  Environment *theEnv,
+  const char *logName,
+  HANDLER_LINK *hndl,
+  const char *tstring)
+  {
+   DefmessageHandler *hnd;
+   
+   if (ConstructData(theEnv)->ClearReadyInProgress ||
+       ConstructData(theEnv)->ClearInProgress)
+     { return; }
+
+   WriteString(theEnv,logName,"HND ");
+   WriteString(theEnv,logName,tstring);
+   WriteString(theEnv,logName," ");
+   hnd = hndl->hnd;
+   PrintHandler(theEnv,logName,hnd,false,true);
+   WriteString(theEnv,logName,"       ED:");
+   WriteInteger(theEnv,logName,EvaluationData(theEnv)->CurrentEvaluationDepth);
+   PrintProcParamArray(theEnv,logName);
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if DEBUGGING_FUNCTIONS
+
+/********************************************************************
+  NAME         : DisplayPrimaryCore
+  DESCRIPTION  : Gives a schematic "printout" of the primary
+                   message showing other shadowed primaries
+                 This routine uses recursion to print indentation
+                   to indicate shadowing and where handlers begin
+                   and end execution wrt one another.
+  INPUTS       : 1) The logical name of the output
+                 2) The remaining core
+                 3) The number of handlers this (partial) core
+                    shadows
+  RETURNS      : The address of the handler following the primary
+                   group of handlers in the core
+  SIDE EFFECTS : None
+  NOTES        : Expects that the core was created in PREVIEW mode,
+                   i.e. implicit handlers are SlotDescriptor addresses
+                   (in PERFORM mode they are INSTANCE_SLOT addresses)
+                 Assumes (partial) core is not empty
+ ********************************************************************/
+static HANDLER_LINK *DisplayPrimaryCore(
+  Environment *theEnv,
+  const char *logicalName,
+  HANDLER_LINK *core,
+  int pdepth)
+  {
+   HANDLER_LINK *rtn;
+
+   PrintPreviewHandler(theEnv,logicalName,core,pdepth,BEGIN_TRACE);
+   if ((core->nxt != NULL) ? (core->nxt->hnd->type == MPRIMARY) : false)
+     rtn = DisplayPrimaryCore(theEnv,logicalName,core->nxt,pdepth+1);
+   else
+     rtn = core->nxt;
+   PrintPreviewHandler(theEnv,logicalName,core,pdepth,END_TRACE);
+   return(rtn);
+  }
+
+/***************************************************
+  NAME         : PrintPreviewHandler
+  DESCRIPTION  : Displays a message preview
+  INPUTS       : 1) The logical name of the output
+                 2) Handler-link
+                 3) Number of handlers shadowed
+                 4) The trace-string
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static void PrintPreviewHandler(
+  Environment *theEnv,
+  const char *logicalName,
+  HANDLER_LINK *cptr,
+  int sdepth,
+  const char *tstr)
+  {
+   int i;
+
+   for (i = 0 ; i < sdepth ; i++)
+     WriteString(theEnv,logicalName,"| ");
+   WriteString(theEnv,logicalName,tstr);
+   WriteString(theEnv,logicalName," ");
+   PrintHandler(theEnv,logicalName,cptr->hnd,false,true);
+  }
+
+#endif
+
+#endif
+
diff --git a/clips/msgfun.h b/clips/msgfun.h
new file mode 100755
index 000000000..966f02bb4
--- /dev/null
+++ b/clips/msgfun.h
@@ -0,0 +1,118 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/01/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Message-passing support functions                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS and        */
+/*            AUXILIARY_MESSAGE_HANDLERS compilation flags.  */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_msgfun
+
+#pragma once
+
+#define _H_msgfun
+
+typedef struct handlerSlotReference
+  {
+   unsigned classID;
+   unsigned short slotID;
+  } HANDLER_SLOT_REFERENCE;
+
+#include "msgpass.h"
+#include "object.h"
+
+#define BEGIN_TRACE ">>"
+#define END_TRACE   "<<"
+
+/* =================================================================================
+   Message-handler types - don't change these values: a string array depends on them
+   ================================================================================= */
+#define MAROUND        0
+#define MBEFORE        1
+#define MPRIMARY       2
+#define MAFTER         3
+#define MERROR         4
+
+#define LOOKUP_HANDLER_INDEX   0
+#define LOOKUP_HANDLER_ADDRESS 1
+
+   void             UnboundHandlerErr(Environment *,const char *);
+   void             PrintNoHandlerError(Environment *,const char *);
+   bool             CheckHandlerArgCount(Environment *);
+   void             SlotAccessViolationError(Environment *,const char *,Instance *,Defclass *);
+   void             SlotVisibilityViolationError(Environment *,SlotDescriptor *,Defclass *,bool);
+
+#if ! RUN_TIME
+   void             NewSystemHandler(Environment *,const char *,const char *,const char *,unsigned short);
+   DefmessageHandler
+                   *InsertHandlerHeader(Environment *,Defclass *,CLIPSLexeme *,unsigned);
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   DefmessageHandler
+                   *NewHandler(void);
+   bool             HandlersExecuting(Defclass *);
+   bool             DeleteHandler(Environment *,Defclass *,CLIPSLexeme *,int,bool);
+   void             DeallocateMarkedHandlers(Environment *,Defclass *);
+#endif
+   unsigned short   HandlerType(Environment *,const char *,bool,const char *);
+   bool             CheckCurrentMessage(Environment *,const char *,bool);
+   void             PrintHandler(Environment *,const char *,DefmessageHandler *,bool,bool);
+   DefmessageHandler
+                   *FindHandlerByAddress(Defclass *,CLIPSLexeme *,unsigned);
+   int              FindHandlerByIndex(Defclass *,CLIPSLexeme *,unsigned);
+   int              FindHandlerNameGroup(Defclass *,CLIPSLexeme *);
+   void             HandlerDeleteError(Environment *,const char *);
+
+#if DEBUGGING_FUNCTIONS
+   void             DisplayCore(Environment *,const char *,HANDLER_LINK *,int);
+   HANDLER_LINK    *FindPreviewApplicableHandlers(Environment *,Defclass *,CLIPSLexeme *);
+   void             WatchMessage(Environment *,const char *,const char *);
+   void             WatchHandler(Environment *,const char *,HANDLER_LINK *,const char *);
+#endif
+
+#endif /* _H_msgfun */
+
+
+
+
+
+
+
diff --git a/clips/msgpass.c b/clips/msgpass.c
new file mode 100755
index 000000000..c42de1acd
--- /dev/null
+++ b/clips/msgpass.c
@@ -0,0 +1,1441 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/07/17             */
+   /*                                                     */
+   /*             OBJECT MESSAGE DISPATCH CODE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS and        */
+/*            AUXILIARY_MESSAGE_HANDLERS compilation flags.  */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: The return value of DirectMessage indicates    */
+/*            whether an execution error has occurred.       */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            It's no longer necessary for a defclass to be  */
+/*            in scope in order to sent a message to an      */
+/*            instance of that class.                        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "argacces.h"
+#include "classcom.h"
+#include "classfun.h"
+#include "commline.h"
+#include "constrct.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "inscom.h"
+#include "insfun.h"
+#include "memalloc.h"
+#include "msgcom.h"
+#include "msgfun.h"
+#include "multifld.h"
+#include "prccode.h"
+#include "prcdrfun.h"
+#include "prntutil.h"
+#include "proflfun.h"
+#include "router.h"
+#include "strngfun.h"
+#include "utility.h"
+
+#include "msgpass.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    PerformMessage(Environment *,UDFValue *,Expression *,CLIPSLexeme *);
+   static HANDLER_LINK           *FindApplicableHandlers(Environment *,Defclass *,CLIPSLexeme *);
+   static void                    CallHandlers(Environment *,UDFValue *);
+   static void                    EarlySlotBindError(Environment *,Instance *,Defclass *,unsigned);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*****************************************************
+  NAME         : DirectMessage
+  DESCRIPTION  : Plugs in given instance and
+                  performs specified message
+  INPUTS       : 1) Message symbolic name
+                 2) The instance address
+                 3) Address of UDFValue buffer
+                    (NULL if don't care)
+                 4) Message argument expressions
+  RETURNS      : Returns false is an execution error occurred
+                 or execution is halted, otherwise true
+  SIDE EFFECTS : Side effects of message execution
+  NOTES        : None
+ *****************************************************/
+bool DirectMessage(
+  Environment *theEnv,
+  CLIPSLexeme *msg,
+  Instance *ins,
+  UDFValue *resultbuf,
+  Expression *remargs)
+  {
+   Expression args;
+   UDFValue temp;
+
+   if (resultbuf == NULL)
+     resultbuf = &temp;
+
+   args.nextArg = remargs;
+   args.argList = NULL;
+   args.type = INSTANCE_ADDRESS_TYPE;
+   args.value = ins;
+
+   return PerformMessage(theEnv,resultbuf,&args,msg);
+  }
+
+/***************************************************
+  NAME         : Send
+  DESCRIPTION  : C Interface for sending messages to
+                  instances
+  INPUTS       : 1) The data object of the instance
+                 2) The message name-string
+                 3) The message arguments string
+                    (Constants only)
+                 4) Caller's buffer for result
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Executes message and stores result
+                   caller's buffer
+  NOTES        : None
+ ***************************************************/
+void Send(
+  Environment *theEnv,
+  CLIPSValue *idata,
+  const char *msg,
+  const char *args,
+  CLIPSValue *returnValue)
+  {
+   bool error;
+   Expression *iexp;
+   CLIPSLexeme *msym;
+   // TBD GCBlock gcb;
+   UDFValue result;
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     {
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+     }
+
+   if (returnValue != NULL)
+     { returnValue->value = FalseSymbol(theEnv); }
+     
+   msym = FindSymbolHN(theEnv,msg,SYMBOL_BIT);
+   if (msym == NULL)
+     {
+      PrintNoHandlerError(theEnv,msg);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+     
+   iexp = GenConstant(theEnv,idata->header->type,idata->value);
+   iexp->nextArg = ParseConstantArguments(theEnv,args,&error);
+   if (error == true)
+     {
+      ReturnExpression(theEnv,iexp);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+     
+   PerformMessage(theEnv,&result,iexp,msym);
+   ReturnExpression(theEnv,iexp);
+   
+   if (returnValue != NULL)
+     {
+      NormalizeMultifield(theEnv,&result);
+      returnValue->value = result.value;
+     }
+  }
+
+/*****************************************************
+  NAME         : DestroyHandlerLinks
+  DESCRIPTION  : Iteratively deallocates handler-links
+  INPUTS       : The handler-link list
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Deallocation of links
+  NOTES        : None
+ *****************************************************/
+void DestroyHandlerLinks(
+  Environment *theEnv,
+  HANDLER_LINK *mhead)
+  {
+   HANDLER_LINK *tmp;
+
+   while (mhead != NULL)
+     {
+      tmp = mhead;
+      mhead = mhead->nxt;
+      tmp->hnd->busy--;
+      DecrementDefclassBusyCount(theEnv,tmp->hnd->cls);
+      rtn_struct(theEnv,messageHandlerLink,tmp);
+     }
+  }
+
+/***********************************************************************
+  NAME         : SendCommand
+  DESCRIPTION  : Determines the applicable handler(s) and sets up the
+                   core calling frame.  Then calls the core frame.
+  INPUTS       : Caller's space for storing the result of the handler(s)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Any side-effects caused by the execution of handlers in
+                   the core framework
+  NOTES        : H/L Syntax : (send <instance> <hnd> <args>*)
+ ***********************************************************************/
+void SendCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Expression args;
+   CLIPSLexeme *msg;
+   UDFValue theArg;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   if (! UDFNthArgument(context,2,SYMBOL_BIT,&theArg)) return;
+   msg = theArg.lexemeValue;
+
+   /* =============================================
+      Get the instance or primitive for the message
+      ============================================= */
+   args.type = GetFirstArgument()->type;
+   args.value = GetFirstArgument()->value;
+   args.argList = GetFirstArgument()->argList;
+   args.nextArg = GetFirstArgument()->nextArg->nextArg;
+
+   PerformMessage(theEnv,returnValue,&args,msg);
+  }
+
+/***************************************************
+  NAME         : GetNthMessageArgument
+  DESCRIPTION  : Returns the address of the nth
+                 (starting at 1) which is an
+                 argument of the current message
+                 dispatch
+  INPUTS       : None
+  RETURNS      : The message argument
+  SIDE EFFECTS : None
+  NOTES        : The active instance is always
+                 stored as the first argument (0) in
+                 the call frame of the message
+ ***************************************************/
+UDFValue *GetNthMessageArgument(
+  Environment *theEnv,
+  int n)
+  {
+   return(&ProceduralPrimitiveData(theEnv)->ProcParamArray[n]);
+  }
+
+/********************************/
+/* NextHandlerAvailableFunction */
+/********************************/
+void NextHandlerAvailableFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateBoolean(theEnv,NextHandlerAvailable(theEnv));
+  }
+
+/*****************************************************
+  NAME         : NextHandlerAvailable
+  DESCRIPTION  : Determines if there the currently
+                   executing handler can call a
+                   shadowed handler
+                 Used before calling call-next-handler
+  INPUTS       : None
+  RETURNS      : True if shadow ready, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : H/L Syntax: (next-handlerp)
+ *****************************************************/
+bool NextHandlerAvailable(
+  Environment *theEnv)
+  {
+   if (MessageHandlerData(theEnv)->CurrentCore == NULL)
+     { return false; }
+
+   if (MessageHandlerData(theEnv)->CurrentCore->hnd->type == MAROUND)
+     { return (MessageHandlerData(theEnv)->NextInCore != NULL) ? true : false; }
+
+   if ((MessageHandlerData(theEnv)->CurrentCore->hnd->type == MPRIMARY) &&
+       (MessageHandlerData(theEnv)->NextInCore != NULL))
+     { return (MessageHandlerData(theEnv)->NextInCore->hnd->type == MPRIMARY) ? true : false; }
+
+   return false;
+  }
+
+/********************************************************
+  NAME         : CallNextHandler
+  DESCRIPTION  : This function allows around-handlers
+                   to execute the rest of the core frame.
+                 It also allows primary handlers
+                   to execute shadowed primaries.
+
+                 The original handler arguments are
+                   left intact.
+  INPUTS       : The caller's result-value buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The core frame is called and any
+                   appropriate changes are made when
+                   used in an around handler
+                   See CallHandlers()
+                 But when call-next-handler is called
+                   from a primary, the same shadowed
+                   primary is called over and over
+                   again for repeated calls to
+                   call-next-handler.
+  NOTES        : H/L Syntax: (call-next-handler) OR
+                    (override-next-handler <arg> ...)
+ ********************************************************/
+void CallNextHandler(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Expression args;
+   int overridep;
+   HANDLER_LINK *oldNext,*oldCurrent;
+#if PROFILING_FUNCTIONS
+   struct profileFrameInfo profileFrame;
+#endif
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   EvaluationData(theEnv)->EvaluationError = false;
+   if (EvaluationData(theEnv)->HaltExecution)
+     return;
+   if (NextHandlerAvailable(theEnv) == false)
+     {
+      PrintErrorID(theEnv,"MSGPASS",1,false);
+      WriteString(theEnv,STDERR,"Shadowed message-handlers not applicable in current context.\n");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   if (EvaluationData(theEnv)->CurrentExpression->value == (void *) FindFunction(theEnv,"override-next-handler"))
+     {
+      overridep = 1;
+      args.type = ProceduralPrimitiveData(theEnv)->ProcParamArray[0].header->type;
+      if (args.type != MULTIFIELD_TYPE)
+        args.value = ProceduralPrimitiveData(theEnv)->ProcParamArray[0].value;
+      else
+        args.value = &ProceduralPrimitiveData(theEnv)->ProcParamArray[0];
+      args.nextArg = GetFirstArgument();
+      args.argList = NULL;
+      PushProcParameters(theEnv,&args,CountArguments(&args),
+                          MessageHandlerData(theEnv)->CurrentMessageName->contents,"message",
+                          UnboundHandlerErr);
+      if (EvaluationData(theEnv)->EvaluationError)
+        {
+         ProcedureFunctionData(theEnv)->ReturnFlag = false;
+         return;
+        }
+     }
+   else
+     overridep = 0;
+   oldNext = MessageHandlerData(theEnv)->NextInCore;
+   oldCurrent = MessageHandlerData(theEnv)->CurrentCore;
+   if (MessageHandlerData(theEnv)->CurrentCore->hnd->type == MAROUND)
+     {
+      if (MessageHandlerData(theEnv)->NextInCore->hnd->type == MAROUND)
+        {
+         MessageHandlerData(theEnv)->CurrentCore = MessageHandlerData(theEnv)->NextInCore;
+         MessageHandlerData(theEnv)->NextInCore = MessageHandlerData(theEnv)->NextInCore->nxt;
+#if DEBUGGING_FUNCTIONS
+         if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+           WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,BEGIN_TRACE);
+#endif
+         if (CheckHandlerArgCount(theEnv))
+           {
+#if PROFILING_FUNCTIONS
+            StartProfile(theEnv,&profileFrame,
+                         &MessageHandlerData(theEnv)->CurrentCore->hnd->header.usrData,
+                         ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+            EvaluateProcActions(theEnv,MessageHandlerData(theEnv)->CurrentCore->hnd->cls->header.whichModule->theModule,
+                               MessageHandlerData(theEnv)->CurrentCore->hnd->actions,
+                               MessageHandlerData(theEnv)->CurrentCore->hnd->localVarCount,
+                               returnValue,UnboundHandlerErr);
+#if PROFILING_FUNCTIONS
+            EndProfile(theEnv,&profileFrame);
+#endif
+           }
+#if DEBUGGING_FUNCTIONS
+         if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+           WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,END_TRACE);
+#endif
+        }
+      else
+        CallHandlers(theEnv,returnValue);
+     }
+   else
+     {
+      MessageHandlerData(theEnv)->CurrentCore = MessageHandlerData(theEnv)->NextInCore;
+      MessageHandlerData(theEnv)->NextInCore = MessageHandlerData(theEnv)->NextInCore->nxt;
+#if DEBUGGING_FUNCTIONS
+      if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+        WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,BEGIN_TRACE);
+#endif
+      if (CheckHandlerArgCount(theEnv))
+        {
+#if PROFILING_FUNCTIONS
+        StartProfile(theEnv,&profileFrame,
+                     &MessageHandlerData(theEnv)->CurrentCore->hnd->header.usrData,
+                     ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+        EvaluateProcActions(theEnv,MessageHandlerData(theEnv)->CurrentCore->hnd->cls->header.whichModule->theModule,
+                            MessageHandlerData(theEnv)->CurrentCore->hnd->actions,
+                            MessageHandlerData(theEnv)->CurrentCore->hnd->localVarCount,
+                            returnValue,UnboundHandlerErr);
+#if PROFILING_FUNCTIONS
+         EndProfile(theEnv,&profileFrame);
+#endif
+        }
+
+#if DEBUGGING_FUNCTIONS
+      if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+        WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,END_TRACE);
+#endif
+     }
+   MessageHandlerData(theEnv)->NextInCore = oldNext;
+   MessageHandlerData(theEnv)->CurrentCore = oldCurrent;
+   if (overridep)
+     PopProcParameters(theEnv);
+   ProcedureFunctionData(theEnv)->ReturnFlag = false;
+  }
+
+/*************************************************************************
+  NAME         : FindApplicableOfName
+  DESCRIPTION  : Groups all handlers of all types of the specified
+                   class of the specified name into the applicable handler
+                   list
+  INPUTS       : 1) The class address
+                 2-3) The tops and bottoms of the four handler type lists:
+                      around, before, primary and after
+                 4) The message name symbol
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Modifies the handler lists to include applicable handlers
+  NOTES        : None
+ *************************************************************************/
+void FindApplicableOfName(
+  Environment *theEnv,
+  Defclass *cls,
+  HANDLER_LINK *tops[4],
+  HANDLER_LINK *bots[4],
+  CLIPSLexeme *mname)
+  {
+   int i;
+   int e;
+   DefmessageHandler *hnd;
+   unsigned *arr;
+   HANDLER_LINK *tmp;
+
+   i = FindHandlerNameGroup(cls,mname);
+   if (i == -1)
+     return;
+   e = ((int) cls->handlerCount) - 1;
+   hnd = cls->handlers;
+   arr = cls->handlerOrderMap;
+   for ( ; i <= e ; i++)
+     {
+      if (hnd[arr[i]].header.name != mname)
+        break;
+
+      tmp = get_struct(theEnv,messageHandlerLink);
+      hnd[arr[i]].busy++;
+      IncrementDefclassBusyCount(theEnv,hnd[arr[i]].cls);
+      tmp->hnd = &hnd[arr[i]];
+      if (tops[tmp->hnd->type] == NULL)
+        {
+         tmp->nxt = NULL;
+         tops[tmp->hnd->type] = bots[tmp->hnd->type] = tmp;
+        }
+
+      else if (tmp->hnd->type == MAFTER)
+        {
+         tmp->nxt = tops[tmp->hnd->type];
+         tops[tmp->hnd->type] = tmp;
+        }
+
+      else
+        {
+         bots[tmp->hnd->type]->nxt = tmp;
+         bots[tmp->hnd->type] = tmp;
+         tmp->nxt = NULL;
+        }
+     }
+  }
+
+/*************************************************************************
+  NAME         : JoinHandlerLinks
+  DESCRIPTION  : Joins the queues of different handlers together
+  INPUTS       : 1-2) The tops and bottoms of the four handler type lists:
+                      around, before, primary and after
+                 3) The message name symbol
+  RETURNS      : The top of the joined lists, NULL on errors
+  SIDE EFFECTS : Links all the handler type lists together, or all the
+                   lists are destroyed if there are no primary handlers
+  NOTES        : None
+ *************************************************************************/
+HANDLER_LINK *JoinHandlerLinks(
+  Environment *theEnv,
+  HANDLER_LINK *tops[4],
+  HANDLER_LINK *bots[4],
+  CLIPSLexeme *mname)
+  {
+   int i;
+   HANDLER_LINK *mlink;
+
+   if (tops[MPRIMARY] == NULL)
+    {
+     PrintNoHandlerError(theEnv,mname->contents);
+     for (i = MAROUND ; i <= MAFTER ; i++)
+       DestroyHandlerLinks(theEnv,tops[i]);
+     SetEvaluationError(theEnv,true);
+     return NULL;
+    }
+
+   mlink = tops[MPRIMARY];
+
+   if (tops[MBEFORE] != NULL)
+     {
+      bots[MBEFORE]->nxt = mlink;
+      mlink = tops[MBEFORE];
+     }
+
+   if (tops[MAROUND] != NULL)
+     {
+      bots[MAROUND]->nxt = mlink;
+      mlink = tops[MAROUND];
+     }
+
+   bots[MPRIMARY]->nxt = tops[MAFTER];
+
+   return(mlink);
+  }
+
+/***************************************************
+  NAME         : PrintHandlerSlotGetFunction
+  DESCRIPTION  : Developer access function for
+                 printing direct slot references
+                 in message-handlers
+  INPUTS       : 1) The logical name of the output
+                 2) The bitmap expression
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Expression printed
+  NOTES        : None
+ ***************************************************/
+void PrintHandlerSlotGetFunction(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   HANDLER_SLOT_REFERENCE *theReference;
+   Defclass *theDefclass;
+   SlotDescriptor *sd;
+
+   theReference = (HANDLER_SLOT_REFERENCE *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"?self:[");
+   theDefclass = DefclassData(theEnv)->ClassIDMap[theReference->classID];
+   WriteString(theEnv,logicalName,theDefclass->header.name->contents);
+   WriteString(theEnv,logicalName,"]");
+   sd = theDefclass->instanceTemplate[theDefclass->slotNameMap[theReference->slotID] - 1];
+   WriteString(theEnv,logicalName,sd->slotName->name->contents);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/***************************************************
+  NAME         : HandlerSlotGetFunction
+  DESCRIPTION  : Access function for handling the
+                 statically-bound direct slot
+                 references in message-handlers
+  INPUTS       : 1) The bitmap expression
+                 2) A data object buffer
+  RETURNS      : True if OK, false
+                 on errors
+  SIDE EFFECTS : Data object buffer gets value of
+                 slot. On errors, buffer gets
+                 symbol false, EvaluationError
+                 is set and error messages are
+                 printed
+  NOTES        : It is possible for a handler
+                 (attached to a superclass of
+                  the currently active instance)
+                 containing these static references
+                 to be called for an instance
+                 which does not contain the slots
+                 (e.g., an instance of a subclass
+                  where the original slot was
+                  no-inherit or the subclass
+                  overrode the original slot)
+ ***************************************************/
+bool HandlerSlotGetFunction(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   HANDLER_SLOT_REFERENCE *theReference;
+   Defclass *theDefclass;
+   Instance *theInstance;
+   InstanceSlot *sp;
+   unsigned instanceSlotIndex;
+
+   theReference = (HANDLER_SLOT_REFERENCE *) ((CLIPSBitMap *) theValue)->contents;
+   theInstance = ProceduralPrimitiveData(theEnv)->ProcParamArray[0].instanceValue;
+   theDefclass = DefclassData(theEnv)->ClassIDMap[theReference->classID];
+
+   if (theInstance->garbage)
+     {
+      PrintErrorID(theEnv,"INSFUN",4,false);
+      WriteString(theEnv,STDERR,"Invalid instance-address in ?self slot reference.\n");
+      theResult->value = FalseSymbol(theEnv);
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+
+   if (theInstance->cls == theDefclass)
+     {
+      instanceSlotIndex = theInstance->cls->slotNameMap[theReference->slotID];
+      sp = theInstance->slotAddresses[instanceSlotIndex - 1];
+     }
+   else
+     {
+      if (theReference->slotID > theInstance->cls->maxSlotNameID)
+        goto HandlerGetError;
+      instanceSlotIndex = theInstance->cls->slotNameMap[theReference->slotID];
+      if (instanceSlotIndex == 0)
+        goto HandlerGetError;
+      instanceSlotIndex--;
+      sp = theInstance->slotAddresses[instanceSlotIndex];
+      if (sp->desc->cls != theDefclass)
+        goto HandlerGetError;
+     }
+   theResult->value = sp->value;
+   if (sp->type == MULTIFIELD_TYPE)
+     {
+      theResult->begin = 0;
+      theResult->range = sp->multifieldValue->length;
+     }
+   return true;
+
+HandlerGetError:
+   EarlySlotBindError(theEnv,theInstance,theDefclass,theReference->slotID);
+   theResult->value = FalseSymbol(theEnv);
+   SetEvaluationError(theEnv,true);
+   return false;
+  }
+
+/***************************************************
+  NAME         : PrintHandlerSlotPutFunction
+  DESCRIPTION  : Developer access function for
+                 printing direct slot bindings
+                 in message-handlers
+  INPUTS       : 1) The logical name of the output
+                 2) The bitmap expression
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Expression printed
+  NOTES        : None
+ ***************************************************/
+void PrintHandlerSlotPutFunction(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   HANDLER_SLOT_REFERENCE *theReference;
+   Defclass *theDefclass;
+   SlotDescriptor *sd;
+
+   theReference = (HANDLER_SLOT_REFERENCE *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(bind ?self:[");
+   theDefclass = DefclassData(theEnv)->ClassIDMap[theReference->classID];
+   WriteString(theEnv,logicalName,theDefclass->header.name->contents);
+   WriteString(theEnv,logicalName,"]");
+   sd = theDefclass->instanceTemplate[theDefclass->slotNameMap[theReference->slotID] - 1];
+   WriteString(theEnv,logicalName,sd->slotName->name->contents);
+   if (GetFirstArgument() != NULL)
+     {
+      WriteString(theEnv,logicalName," ");
+      PrintExpression(theEnv,logicalName,GetFirstArgument());
+     }
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+/***************************************************
+  NAME         : HandlerSlotPutFunction
+  DESCRIPTION  : Access function for handling the
+                 statically-bound direct slot
+                 bindings in message-handlers
+  INPUTS       : 1) The bitmap expression
+                 2) A data object buffer
+  RETURNS      : True if OK, false
+                 on errors
+  SIDE EFFECTS : Data object buffer gets symbol
+                 TRUE and slot is set. On errors,
+                 buffer gets symbol FALSE,
+                 EvaluationError is set and error
+                 messages are printed
+  NOTES        : It is possible for a handler
+                 (attached to a superclass of
+                  the currently active instance)
+                 containing these static references
+                 to be called for an instance
+                 which does not contain the slots
+                 (e.g., an instance of a subclass
+                  where the original slot was
+                  no-inherit or the subclass
+                  overrode the original slot)
+ ***************************************************/
+bool HandlerSlotPutFunction(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   HANDLER_SLOT_REFERENCE *theReference;
+   Defclass *theDefclass;
+   Instance *theInstance;
+   InstanceSlot *sp;
+   unsigned instanceSlotIndex;
+   UDFValue theSetVal;
+
+   theReference = (HANDLER_SLOT_REFERENCE *) ((CLIPSBitMap *) theValue)->contents;
+   theInstance = ProceduralPrimitiveData(theEnv)->ProcParamArray[0].instanceValue;
+   theDefclass = DefclassData(theEnv)->ClassIDMap[theReference->classID];
+
+   if (theInstance->garbage)
+     {
+      StaleInstanceAddress(theEnv,"for slot put",0);
+      theResult->value = FalseSymbol(theEnv);
+      SetEvaluationError(theEnv,true);
+      return false;
+     }
+
+   if (theInstance->cls == theDefclass)
+     {
+      instanceSlotIndex = theInstance->cls->slotNameMap[theReference->slotID];
+      sp = theInstance->slotAddresses[instanceSlotIndex - 1];
+     }
+   else
+     {
+      if (theReference->slotID > theInstance->cls->maxSlotNameID)
+        goto HandlerPutError;
+      instanceSlotIndex = theInstance->cls->slotNameMap[theReference->slotID];
+      if (instanceSlotIndex == 0)
+        goto HandlerPutError;
+      instanceSlotIndex--;
+      sp = theInstance->slotAddresses[instanceSlotIndex];
+      if (sp->desc->cls != theDefclass)
+        goto HandlerPutError;
+     }
+
+   /* =======================================================
+      The slot has already been verified not to be read-only.
+      However, if it is initialize-only, we need to make sure
+      that we are initializing the instance (something we
+      could not verify at parse-time)
+      ======================================================= */
+   if (sp->desc->initializeOnly && (!theInstance->initializeInProgress))
+     {
+      SlotAccessViolationError(theEnv,sp->desc->slotName->name->contents,
+                               theInstance,NULL);
+      goto HandlerPutError2;
+     }
+
+   /* ======================================
+      No arguments means to use the
+      special NoParamValue to reset the slot
+      to its default value
+      ====================================== */
+   if (GetFirstArgument())
+     {
+      if (EvaluateAndStoreInDataObject(theEnv,sp->desc->multiple,
+                                       GetFirstArgument(),&theSetVal,true) == false)
+         goto HandlerPutError2;
+     }
+   else
+     {
+      theSetVal.begin = 0;
+      theSetVal.range = 0;
+      theSetVal.value = ProceduralPrimitiveData(theEnv)->NoParamValue;
+     }
+   if (PutSlotValue(theEnv,theInstance,sp,&theSetVal,theResult,NULL) != PSE_NO_ERROR)
+      goto HandlerPutError2;
+   return true;
+
+HandlerPutError:
+   EarlySlotBindError(theEnv,theInstance,theDefclass,theReference->slotID);
+
+HandlerPutError2:
+   theResult->value = FalseSymbol(theEnv);
+   SetEvaluationError(theEnv,true);
+
+   return false;
+  }
+
+/*****************************************************
+  NAME         : DynamicHandlerGetSlot
+  DESCRIPTION  : Directly references a slot's value
+                 (uses dynamic binding to lookup slot)
+  INPUTS       : The caller's result buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Caller's result buffer set
+  NOTES        : H/L Syntax: (get <slot>)
+ *****************************************************/
+void DynamicHandlerGetSlot(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   InstanceSlot *sp;
+   Instance *ins;
+   UDFValue temp;
+
+   returnValue->value = FalseSymbol(theEnv);
+   if (CheckCurrentMessage(theEnv,"dynamic-get",true) == false)
+     return;
+   EvaluateExpression(theEnv,GetFirstArgument(),&temp);
+   if (temp.header->type != SYMBOL_TYPE)
+     {
+      ExpectedTypeError1(theEnv,"dynamic-get",1,"symbol");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   ins = GetActiveInstance(theEnv);
+   sp = FindInstanceSlot(theEnv,ins,temp.lexemeValue);
+   if (sp == NULL)
+     {
+      SlotExistError(theEnv,temp.lexemeValue->contents,"dynamic-get");
+      return;
+     }
+   if ((sp->desc->publicVisibility == 0) &&
+       (MessageHandlerData(theEnv)->CurrentCore->hnd->cls != sp->desc->cls))
+     {
+      SlotVisibilityViolationError(theEnv,sp->desc,MessageHandlerData(theEnv)->CurrentCore->hnd->cls,false);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   returnValue->value = sp->value;
+   if (sp->type == MULTIFIELD_TYPE)
+     {
+      returnValue->begin = 0;
+      returnValue->range = sp->multifieldValue->length;
+     }
+  }
+
+/***********************************************************
+  NAME         : DynamicHandlerPutSlot
+  DESCRIPTION  : Directly puts a slot's value
+                 (uses dynamic binding to lookup slot)
+  INPUTS       : Data obejct buffer for holding slot value
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot modified - and caller's buffer set
+                 to value (or symbol FALSE on errors)
+  NOTES        : H/L Syntax: (put <slot> <value>*)
+ ***********************************************************/
+void DynamicHandlerPutSlot(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   InstanceSlot *sp;
+   Instance *ins;
+   UDFValue temp;
+
+   returnValue->value = FalseSymbol(theEnv);
+   if (CheckCurrentMessage(theEnv,"dynamic-put",true) == false)
+     return;
+   EvaluateExpression(theEnv,GetFirstArgument(),&temp);
+   if (temp.header->type != SYMBOL_TYPE)
+     {
+      ExpectedTypeError1(theEnv,"dynamic-put",1,"symbol");
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   ins = GetActiveInstance(theEnv);
+   sp = FindInstanceSlot(theEnv,ins,temp.lexemeValue);
+   if (sp == NULL)
+     {
+      SlotExistError(theEnv,temp.lexemeValue->contents,"dynamic-put");
+      return;
+     }
+   if ((sp->desc->noWrite == 0) ? false :
+       ((sp->desc->initializeOnly == 0) || (!ins->initializeInProgress)))
+     {
+      SlotAccessViolationError(theEnv,sp->desc->slotName->name->contents,
+                               ins,NULL);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   if ((sp->desc->publicVisibility == 0) &&
+       (MessageHandlerData(theEnv)->CurrentCore->hnd->cls != sp->desc->cls))
+     {
+      SlotVisibilityViolationError(theEnv,sp->desc,MessageHandlerData(theEnv)->CurrentCore->hnd->cls,false);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+   if (GetFirstArgument()->nextArg)
+     {
+      if (EvaluateAndStoreInDataObject(theEnv,sp->desc->multiple,
+                        GetFirstArgument()->nextArg,&temp,true) == false)
+        return;
+     }
+   else
+     {
+      temp.begin = 0;
+      temp.range = 0;
+      temp.value = ProceduralPrimitiveData(theEnv)->NoParamValue;
+     }
+   PutSlotValue(theEnv,ins,sp,&temp,returnValue,NULL);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*****************************************************
+  NAME         : PerformMessage
+  DESCRIPTION  : Calls core framework for a message
+  INPUTS       : 1) Caller's result buffer
+                 2) Message argument expressions
+                    (including implicit object)
+                 3) Message name
+  RETURNS      : Returns false is an execution error occurred
+                 or execution is halted, otherwise true
+  SIDE EFFECTS : Any side-effects of message execution
+                    and caller's result buffer set
+  NOTES        : It's no longer necessary for a defclass
+                 to be in scope in order to sent a message
+                 to an instance of that class.
+ *****************************************************/
+static bool PerformMessage(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  Expression *args,
+  CLIPSLexeme *mname)
+  {
+   bool oldce;
+   /* HANDLER_LINK *oldCore; */
+   Defclass *cls = NULL;
+   Instance *ins = NULL;
+   CLIPSLexeme *oldName;
+#if PROFILING_FUNCTIONS
+   struct profileFrameInfo profileFrame;
+#endif
+   GCBlock gcb;
+
+   returnValue->value = FalseSymbol(theEnv);
+   EvaluationData(theEnv)->EvaluationError = false;
+   if (EvaluationData(theEnv)->HaltExecution)
+     return false;
+
+   GCBlockStart(theEnv,&gcb);
+
+   oldce = ExecutingConstruct(theEnv);
+   SetExecutingConstruct(theEnv,true);
+   oldName = MessageHandlerData(theEnv)->CurrentMessageName;
+   MessageHandlerData(theEnv)->CurrentMessageName = mname;
+   EvaluationData(theEnv)->CurrentEvaluationDepth++;
+
+   PushProcParameters(theEnv,args,CountArguments(args),
+                        MessageHandlerData(theEnv)->CurrentMessageName->contents,"message",
+                        UnboundHandlerErr);
+
+
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      EvaluationData(theEnv)->CurrentEvaluationDepth--;
+      MessageHandlerData(theEnv)->CurrentMessageName = oldName;
+
+      GCBlockEndUDF(theEnv,&gcb,returnValue);
+      CallPeriodicTasks(theEnv);
+
+      SetExecutingConstruct(theEnv,oldce);
+      return false;
+     }
+
+   if (ProceduralPrimitiveData(theEnv)->ProcParamArray->header->type == INSTANCE_ADDRESS_TYPE)
+     {
+      ins = ProceduralPrimitiveData(theEnv)->ProcParamArray->instanceValue;
+      if (ins->garbage == 1)
+        {
+         StaleInstanceAddress(theEnv,"send",0);
+         SetEvaluationError(theEnv,true);
+        }
+      else
+        {
+         cls = ins->cls;
+         ins->busy++;
+        }
+     }
+   else if (ProceduralPrimitiveData(theEnv)->ProcParamArray->header->type == INSTANCE_NAME_TYPE)
+     {
+      ins = FindInstanceBySymbol(theEnv,ProceduralPrimitiveData(theEnv)->ProcParamArray->lexemeValue);
+      if (ins == NULL)
+        {
+         PrintErrorID(theEnv,"MSGPASS",2,false);
+         WriteString(theEnv,STDERR,"No such instance [");
+         WriteString(theEnv,STDERR,ProceduralPrimitiveData(theEnv)->ProcParamArray->lexemeValue->contents);
+         WriteString(theEnv,STDERR,"] in function 'send'.\n");
+         SetEvaluationError(theEnv,true);
+        }
+      else
+        {
+         ProceduralPrimitiveData(theEnv)->ProcParamArray->value = ins;
+         cls = ins->cls;
+         ins->busy++;
+        }
+     }
+   else if ((cls = DefclassData(theEnv)->PrimitiveClassMap[ProceduralPrimitiveData(theEnv)->ProcParamArray->header->type]) == NULL)
+     {
+      SystemError(theEnv,"MSGPASS",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      PopProcParameters(theEnv);
+      EvaluationData(theEnv)->CurrentEvaluationDepth--;
+      MessageHandlerData(theEnv)->CurrentMessageName = oldName;
+
+      GCBlockEndUDF(theEnv,&gcb,returnValue);
+      CallPeriodicTasks(theEnv);
+
+      SetExecutingConstruct(theEnv,oldce);
+      return false;
+     }
+
+   /* oldCore = MessageHandlerData(theEnv)->TopOfCore; */
+
+   if (MessageHandlerData(theEnv)->TopOfCore != NULL)
+     { MessageHandlerData(theEnv)->TopOfCore->nxtInStack = MessageHandlerData(theEnv)->OldCore; }
+   MessageHandlerData(theEnv)->OldCore = MessageHandlerData(theEnv)->TopOfCore;
+
+   MessageHandlerData(theEnv)->TopOfCore = FindApplicableHandlers(theEnv,cls,mname);
+
+   if (MessageHandlerData(theEnv)->TopOfCore != NULL)
+     {
+      HANDLER_LINK *oldCurrent,*oldNext;
+
+      oldCurrent = MessageHandlerData(theEnv)->CurrentCore;
+      oldNext = MessageHandlerData(theEnv)->NextInCore;
+
+      if (MessageHandlerData(theEnv)->TopOfCore->hnd->type == MAROUND)
+        {
+         MessageHandlerData(theEnv)->CurrentCore = MessageHandlerData(theEnv)->TopOfCore;
+         MessageHandlerData(theEnv)->NextInCore = MessageHandlerData(theEnv)->TopOfCore->nxt;
+#if DEBUGGING_FUNCTIONS
+         if (MessageHandlerData(theEnv)->WatchMessages)
+           WatchMessage(theEnv,STDOUT,BEGIN_TRACE);
+         if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+           WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,BEGIN_TRACE);
+#endif
+         if (CheckHandlerArgCount(theEnv))
+           {
+#if PROFILING_FUNCTIONS
+            StartProfile(theEnv,&profileFrame,
+                         &MessageHandlerData(theEnv)->CurrentCore->hnd->header.usrData,
+                         ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+
+           EvaluateProcActions(theEnv,MessageHandlerData(theEnv)->CurrentCore->hnd->cls->header.whichModule->theModule,
+                               MessageHandlerData(theEnv)->CurrentCore->hnd->actions,
+                               MessageHandlerData(theEnv)->CurrentCore->hnd->localVarCount,
+                               returnValue,UnboundHandlerErr);
+
+
+#if PROFILING_FUNCTIONS
+            EndProfile(theEnv,&profileFrame);
+#endif
+           }
+
+#if DEBUGGING_FUNCTIONS
+         if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+           WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,END_TRACE);
+         if (MessageHandlerData(theEnv)->WatchMessages)
+           WatchMessage(theEnv,STDOUT,END_TRACE);
+#endif
+        }
+      else
+        {
+         MessageHandlerData(theEnv)->CurrentCore = NULL;
+         MessageHandlerData(theEnv)->NextInCore = MessageHandlerData(theEnv)->TopOfCore;
+#if DEBUGGING_FUNCTIONS
+         if (MessageHandlerData(theEnv)->WatchMessages)
+           WatchMessage(theEnv,STDOUT,BEGIN_TRACE);
+#endif
+         CallHandlers(theEnv,returnValue);
+#if DEBUGGING_FUNCTIONS
+         if (MessageHandlerData(theEnv)->WatchMessages)
+           WatchMessage(theEnv,STDOUT,END_TRACE);
+#endif
+        }
+
+      DestroyHandlerLinks(theEnv,MessageHandlerData(theEnv)->TopOfCore);
+      MessageHandlerData(theEnv)->CurrentCore = oldCurrent;
+      MessageHandlerData(theEnv)->NextInCore = oldNext;
+     }
+
+   /* MessageHandlerData(theEnv)->TopOfCore = oldCore; */
+   MessageHandlerData(theEnv)->TopOfCore = MessageHandlerData(theEnv)->OldCore;
+   if (MessageHandlerData(theEnv)->OldCore != NULL)
+     { MessageHandlerData(theEnv)->OldCore = MessageHandlerData(theEnv)->OldCore->nxtInStack; }
+
+   ProcedureFunctionData(theEnv)->ReturnFlag = false;
+
+   if (ins != NULL)
+     ins->busy--;
+
+   /* ==================================
+      Restore the original calling frame
+      ================================== */
+   PopProcParameters(theEnv);
+   EvaluationData(theEnv)->CurrentEvaluationDepth--;
+   MessageHandlerData(theEnv)->CurrentMessageName = oldName;
+
+   GCBlockEndUDF(theEnv,&gcb,returnValue);
+   CallPeriodicTasks(theEnv);
+
+   SetExecutingConstruct(theEnv,oldce);
+
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      return false;
+     }
+
+   return true;
+  }
+
+/*****************************************************************************
+  NAME         : FindApplicableHandlers
+  DESCRIPTION  : Given a message name, this routine forms the "core frame"
+                   for the message : a list of all applicable class handlers.
+                   An applicable class handler is one whose name matches
+                     the message and whose class matches the instance.
+
+                   The list is in the following order :
+
+                   All around handlers (from most specific to most general)
+                   All before handlers (from most specific to most general)
+                   All primary handlers (from most specific to most general)
+                   All after handlers (from most general to most specific)
+
+  INPUTS       : 1) The class of the instance (or primitive) for the message
+                 2) The message name
+  RETURNS      : NULL if no applicable handlers or errors,
+                   the list of handlers otherwise
+  SIDE EFFECTS : Links are allocated for the list
+  NOTES        : The instance is the first thing on the ProcParamArray
+                 The number of arguments is in ProcParamArraySize
+ *****************************************************************************/
+static HANDLER_LINK *FindApplicableHandlers(
+  Environment *theEnv,
+  Defclass *cls,
+  CLIPSLexeme *mname)
+  {
+   unsigned int i;
+   HANDLER_LINK *tops[4],*bots[4];
+
+   for (i = MAROUND ; i <= MAFTER ; i++)
+     tops[i] = bots[i] = NULL;
+
+   for (i = 0 ; i < cls->allSuperclasses.classCount ; i++)
+     FindApplicableOfName(theEnv,cls->allSuperclasses.classArray[i],tops,bots,mname);
+   return(JoinHandlerLinks(theEnv,tops,bots,mname));
+  }
+
+/***************************************************************
+  NAME         : CallHandlers
+  DESCRIPTION  : Moves though the current message frame
+                   for a send-message as follows :
+
+                 Call all before handlers and ignore their
+                   return values.
+                 Call the first primary handler and
+                   ignore the rest.  The return value
+                   of the handler frame is this message's value.
+                 Call all after handlers and ignore their
+                   return values.
+  INPUTS       : Caller's buffer for the return value of
+                   the message
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The handlers are evaluated.
+  NOTES        : IMPORTANT : The global NextInCore should be
+                 pointing to the first handler to be executed.
+ ***************************************************************/
+static void CallHandlers(
+  Environment *theEnv,
+  UDFValue *returnValue)
+  {
+   HANDLER_LINK *oldCurrent = NULL,*oldNext = NULL;  /* prevents warning */
+   UDFValue temp;
+#if PROFILING_FUNCTIONS
+   struct profileFrameInfo profileFrame;
+#endif
+
+   if (EvaluationData(theEnv)->HaltExecution)
+     return;
+
+   oldCurrent = MessageHandlerData(theEnv)->CurrentCore;
+   oldNext = MessageHandlerData(theEnv)->NextInCore;
+
+   while (MessageHandlerData(theEnv)->NextInCore->hnd->type == MBEFORE)
+     {
+      MessageHandlerData(theEnv)->CurrentCore = MessageHandlerData(theEnv)->NextInCore;
+      MessageHandlerData(theEnv)->NextInCore = MessageHandlerData(theEnv)->NextInCore->nxt;
+#if DEBUGGING_FUNCTIONS
+      if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+        WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,BEGIN_TRACE);
+#endif
+      if (CheckHandlerArgCount(theEnv))
+        {
+#if PROFILING_FUNCTIONS
+         StartProfile(theEnv,&profileFrame,
+                      &MessageHandlerData(theEnv)->CurrentCore->hnd->header.usrData,
+                      ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+         EvaluateProcActions(theEnv,MessageHandlerData(theEnv)->CurrentCore->hnd->cls->header.whichModule->theModule,
+                            MessageHandlerData(theEnv)->CurrentCore->hnd->actions,
+                            MessageHandlerData(theEnv)->CurrentCore->hnd->localVarCount,
+                            &temp,UnboundHandlerErr);
+
+
+#if PROFILING_FUNCTIONS
+         EndProfile(theEnv,&profileFrame);
+#endif
+        }
+
+#if DEBUGGING_FUNCTIONS
+      if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+        WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,END_TRACE);
+#endif
+      ProcedureFunctionData(theEnv)->ReturnFlag = false;
+      if ((MessageHandlerData(theEnv)->NextInCore == NULL) || EvaluationData(theEnv)->HaltExecution)
+        {
+         MessageHandlerData(theEnv)->NextInCore = oldNext;
+         MessageHandlerData(theEnv)->CurrentCore = oldCurrent;
+         return;
+        }
+     }
+   if (MessageHandlerData(theEnv)->NextInCore->hnd->type == MPRIMARY)
+     {
+      MessageHandlerData(theEnv)->CurrentCore = MessageHandlerData(theEnv)->NextInCore;
+      MessageHandlerData(theEnv)->NextInCore = MessageHandlerData(theEnv)->NextInCore->nxt;
+#if DEBUGGING_FUNCTIONS
+      if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+        WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,BEGIN_TRACE);
+#endif
+      if (CheckHandlerArgCount(theEnv))
+        {
+#if PROFILING_FUNCTIONS
+         StartProfile(theEnv,&profileFrame,
+                      &MessageHandlerData(theEnv)->CurrentCore->hnd->header.usrData,
+                      ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+
+        EvaluateProcActions(theEnv,MessageHandlerData(theEnv)->CurrentCore->hnd->cls->header.whichModule->theModule,
+                            MessageHandlerData(theEnv)->CurrentCore->hnd->actions,
+                            MessageHandlerData(theEnv)->CurrentCore->hnd->localVarCount,
+                            returnValue,UnboundHandlerErr);
+
+#if PROFILING_FUNCTIONS
+         EndProfile(theEnv,&profileFrame);
+#endif
+        }
+
+
+#if DEBUGGING_FUNCTIONS
+      if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+        WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,END_TRACE);
+#endif
+      ProcedureFunctionData(theEnv)->ReturnFlag = false;
+
+      if ((MessageHandlerData(theEnv)->NextInCore == NULL) || EvaluationData(theEnv)->HaltExecution)
+        {
+         MessageHandlerData(theEnv)->NextInCore = oldNext;
+         MessageHandlerData(theEnv)->CurrentCore = oldCurrent;
+         return;
+        }
+      while (MessageHandlerData(theEnv)->NextInCore->hnd->type == MPRIMARY)
+        {
+         MessageHandlerData(theEnv)->NextInCore = MessageHandlerData(theEnv)->NextInCore->nxt;
+         if (MessageHandlerData(theEnv)->NextInCore == NULL)
+           {
+            MessageHandlerData(theEnv)->NextInCore = oldNext;
+            MessageHandlerData(theEnv)->CurrentCore = oldCurrent;
+            return;
+           }
+        }
+     }
+   while (MessageHandlerData(theEnv)->NextInCore->hnd->type == MAFTER)
+     {
+      MessageHandlerData(theEnv)->CurrentCore = MessageHandlerData(theEnv)->NextInCore;
+      MessageHandlerData(theEnv)->NextInCore = MessageHandlerData(theEnv)->NextInCore->nxt;
+#if DEBUGGING_FUNCTIONS
+      if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+        WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,BEGIN_TRACE);
+#endif
+      if (CheckHandlerArgCount(theEnv))
+        {
+#if PROFILING_FUNCTIONS
+         StartProfile(theEnv,&profileFrame,
+                      &MessageHandlerData(theEnv)->CurrentCore->hnd->header.usrData,
+                      ProfileFunctionData(theEnv)->ProfileConstructs);
+#endif
+
+
+         EvaluateProcActions(theEnv,MessageHandlerData(theEnv)->CurrentCore->hnd->cls->header.whichModule->theModule,
+                            MessageHandlerData(theEnv)->CurrentCore->hnd->actions,
+                            MessageHandlerData(theEnv)->CurrentCore->hnd->localVarCount,
+                            &temp,UnboundHandlerErr);
+
+#if PROFILING_FUNCTIONS
+         EndProfile(theEnv,&profileFrame);
+#endif
+        }
+
+
+#if DEBUGGING_FUNCTIONS
+      if (MessageHandlerData(theEnv)->CurrentCore->hnd->trace)
+        WatchHandler(theEnv,STDOUT,MessageHandlerData(theEnv)->CurrentCore,END_TRACE);
+#endif
+      ProcedureFunctionData(theEnv)->ReturnFlag = false;
+      if ((MessageHandlerData(theEnv)->NextInCore == NULL) || EvaluationData(theEnv)->HaltExecution)
+        {
+         MessageHandlerData(theEnv)->NextInCore = oldNext;
+         MessageHandlerData(theEnv)->CurrentCore = oldCurrent;
+         return;
+        }
+     }
+
+   MessageHandlerData(theEnv)->NextInCore = oldNext;
+   MessageHandlerData(theEnv)->CurrentCore = oldCurrent;
+  }
+
+
+/********************************************************
+  NAME         : EarlySlotBindError
+  DESCRIPTION  : Prints out an error message when
+                 a message-handler from a superclass
+                 which contains a static-bind
+                 slot access is not valid for the
+                 currently active instance (i.e.
+                 the instance is not using the
+                 superclass's slot)
+  INPUTS       : 1) The currently active instance
+                 2) The defclass holding the invalid slot
+                 3) The canonical id of the slot
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error message printed
+  NOTES        : None
+ ********************************************************/
+static void EarlySlotBindError(
+  Environment *theEnv,
+  Instance *theInstance,
+  Defclass *theDefclass,
+  unsigned slotID)
+  {
+   SlotDescriptor *sd;
+
+   sd = theDefclass->instanceTemplate[theDefclass->slotNameMap[slotID] - 1];
+   PrintErrorID(theEnv,"MSGPASS",3,false);
+   WriteString(theEnv,STDERR,"Static reference to slot '");
+   WriteString(theEnv,STDERR,sd->slotName->name->contents);
+   WriteString(theEnv,STDERR,"' of class ");
+   PrintClassName(theEnv,STDERR,theDefclass,true,false);
+   WriteString(theEnv,STDERR," does not apply to instance [");
+   WriteString(theEnv,STDERR,InstanceName(theInstance));
+   WriteString(theEnv,STDERR,"] of class ");
+   PrintClassName(theEnv,STDERR,theInstance->cls,true,false);
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+#endif /* OBJECT_SYSTEM */
+
diff --git a/clips/msgpass.h b/clips/msgpass.h
new file mode 100755
index 000000000..fe083341b
--- /dev/null
+++ b/clips/msgpass.h
@@ -0,0 +1,100 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Message-passing support functions                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS and        */
+/*            AUXILIARY_MESSAGE_HANDLERS compilation flags.  */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: The return value of DirectMessage indicates    */
+/*            whether an execution error has occurred.       */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_msgpass
+
+#pragma once
+
+#define _H_msgpass
+
+#define GetActiveInstance(theEnv) (GetNthMessageArgument(theEnv,0)->instanceValue)
+
+#include "object.h"
+
+typedef struct messageHandlerLink
+  {
+   DefmessageHandler *hnd;
+   struct messageHandlerLink *nxt;
+   struct messageHandlerLink *nxtInStack;
+  } HANDLER_LINK;
+
+   bool             DirectMessage(Environment *,CLIPSLexeme *,Instance *,
+                                  UDFValue *,Expression *);
+   void             Send(Environment *,CLIPSValue *,const char *,const char *,CLIPSValue *);
+   void             DestroyHandlerLinks(Environment *,HANDLER_LINK *);
+   void             SendCommand(Environment *,UDFContext *,UDFValue *);
+   UDFValue        *GetNthMessageArgument(Environment *,int);
+
+   bool             NextHandlerAvailable(Environment *);
+   void             NextHandlerAvailableFunction(Environment *,UDFContext *,UDFValue *);
+   void             CallNextHandler(Environment *,UDFContext *,UDFValue *);
+   void             FindApplicableOfName(Environment *,Defclass *,HANDLER_LINK *[],
+                                         HANDLER_LINK *[],CLIPSLexeme *);
+   HANDLER_LINK    *JoinHandlerLinks(Environment *,HANDLER_LINK *[],HANDLER_LINK *[],CLIPSLexeme *);
+
+   void             PrintHandlerSlotGetFunction(Environment *,const char *,void *);
+   bool             HandlerSlotGetFunction(Environment *,void *,UDFValue *);
+   void             PrintHandlerSlotPutFunction(Environment *,const char *,void *);
+   bool             HandlerSlotPutFunction(Environment *,void *,UDFValue *);
+   void             DynamicHandlerGetSlot(Environment *,UDFContext *,UDFValue *);
+   void             DynamicHandlerPutSlot(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_object */
+
+
+
+
+
+
+
diff --git a/clips/msgpsr.c b/clips/msgpsr.c
new file mode 100755
index 000000000..7485dd4e2
--- /dev/null
+++ b/clips/msgpsr.c
@@ -0,0 +1,696 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  01/15/18             */
+   /*                                                     */
+   /*           MESSAGE-HANDLER PARSER FUNCTIONS          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS            */
+/*                    compilation flag.                      */
+/*                                                           */
+/*      6.30: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_AND_SAVE        */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Static constraint checking is always enabled.  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#include <string.h>
+
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#include "classcom.h"
+#include "classfun.h"
+#include "constrct.h"
+#include "cstrcpsr.h"
+#include "cstrnchk.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "insfun.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "msgcom.h"
+#include "msgfun.h"
+#include "pprint.h"
+#include "prccode.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+
+#include "msgpsr.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define SELF_LEN         4
+#define SELF_SLOT_REF   ':'
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    IsParameterSlotReference(Environment *,const char *);
+   static int                     SlotReferenceVar(Environment *,Expression *,void *);
+   static int                     BindSlotReference(Environment *,Expression *,void *);
+   static SlotDescriptor         *CheckSlotReference(Environment *,Defclass *,int,void *,bool,Expression *);
+   static void                    GenHandlerSlotReference(Environment *,Expression *,unsigned short,SlotDescriptor *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************************
+  NAME         : ParseDefmessageHandler
+  DESCRIPTION  : Parses a message-handler for a class of objects
+  INPUTS       : The logical name of the input source
+  RETURNS      : False if successful parse, true otherwise
+  SIDE EFFECTS : Handler allocated and inserted into class
+  NOTES        : H/L Syntax:
+
+                 (defmessage-handler <class> <name> [<type>] [<comment>]
+                    (<params>)
+                    <action>*)
+
+                 <params> ::= <var>* | <var>* $?<name>
+ ***********************************************************************/
+bool ParseDefmessageHandler(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   Defclass *cls;
+   CLIPSLexeme *cname, *mname, *wildcard;
+   unsigned mtype = MPRIMARY;
+   unsigned short min, max;
+   unsigned short lvars;
+   bool error;
+   Expression *hndParams,*actions;
+   DefmessageHandler *hnd;
+
+   SetPPBufferStatus(theEnv,true);
+   FlushPPBuffer(theEnv);
+   SetIndentDepth(theEnv,3);
+   SavePPBuffer(theEnv,"(defmessage-handler ");
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv)) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"defmessage-handler");
+      return true;
+     }
+#endif
+   cname = GetConstructNameAndComment(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken,"defmessage-handler",
+                                      NULL,NULL,"~",true,false,true,false);
+   if (cname == NULL)
+     return true;
+   cls = LookupDefclassByMdlOrScope(theEnv,cname->contents);
+   if (cls == NULL)
+     {
+      PrintErrorID(theEnv,"MSGPSR",1,false);
+      WriteString(theEnv,STDERR,"A class must be defined before its message-handlers.\n");
+      return true;
+     }
+   if ((cls == DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_NAME_TYPE]) ||
+       (cls == DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_ADDRESS_TYPE]) ||
+       (cls == DefclassData(theEnv)->PrimitiveClassMap[INSTANCE_NAME_TYPE]->directSuperclasses.classArray[0]))
+     {
+      PrintErrorID(theEnv,"MSGPSR",8,false);
+      WriteString(theEnv,STDERR,"Message-handlers cannot be attached to the class '");
+      WriteString(theEnv,STDERR,DefclassName(cls));
+      WriteString(theEnv,STDERR,"'.\n");
+      return true;
+     }
+   if (HandlersExecuting(cls))
+     {
+      PrintErrorID(theEnv,"MSGPSR",2,false);
+      WriteString(theEnv,STDERR,"Cannot (re)define message-handlers during execution of ");
+      WriteString(theEnv,STDERR,"other message-handlers for the same class.\n");
+      return true;
+     }
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"defmessage-handler");
+      return true;
+     }
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv," ");
+   SavePPBuffer(theEnv,DefclassData(theEnv)->ObjectParseToken.printForm);
+   SavePPBuffer(theEnv," ");
+   mname = DefclassData(theEnv)->ObjectParseToken.lexemeValue;
+   GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      SavePPBuffer(theEnv," ");
+      if (DefclassData(theEnv)->ObjectParseToken.tknType != STRING_TOKEN)
+        {
+         if (DefclassData(theEnv)->ObjectParseToken.tknType != SYMBOL_TOKEN)
+           {
+            SyntaxErrorMessage(theEnv,"defmessage-handler");
+            return true;
+           }
+         mtype = HandlerType(theEnv,"defmessage-handler",false,DefclassData(theEnv)->ObjectParseToken.lexemeValue->contents);
+         if (mtype == MERROR)
+           return true;
+
+         GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+         if (DefclassData(theEnv)->ObjectParseToken.tknType == STRING_TOKEN)
+           {
+            SavePPBuffer(theEnv," ");
+            GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+           }
+        }
+      else
+        {
+         SavePPBuffer(theEnv," ");
+         GetToken(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken);
+        }
+     }
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   PPCRAndIndent(theEnv);
+   SavePPBuffer(theEnv,DefclassData(theEnv)->ObjectParseToken.printForm);
+
+   hnd = FindHandlerByAddress(cls,mname,mtype);
+   if (GetPrintWhileLoading(theEnv) && GetCompilationsWatch(theEnv))
+     {
+      WriteString(theEnv,STDOUT,"   Handler ");
+      WriteString(theEnv,STDOUT,mname->contents);
+      WriteString(theEnv,STDOUT," ");
+      WriteString(theEnv,STDOUT,MessageHandlerData(theEnv)->hndquals[mtype]);
+      if (hnd == NULL)
+        WriteString(theEnv,STDOUT," defined.\n");
+      else
+        WriteString(theEnv,STDOUT," redefined.\n");
+     }
+
+   if ((hnd != NULL) ? hnd->system : false)
+     {
+      PrintErrorID(theEnv,"MSGPSR",3,false);
+      WriteString(theEnv,STDERR,"System message-handlers may not be modified.\n");
+      return true;
+     }
+
+   hndParams = GenConstant(theEnv,SYMBOL_TYPE,MessageHandlerData(theEnv)->SELF_SYMBOL);
+   hndParams = ParseProcParameters(theEnv,readSource,&DefclassData(theEnv)->ObjectParseToken,hndParams,
+                                    &wildcard,&min,&max,&error,IsParameterSlotReference);
+   if (error)
+     return true;
+   PPCRAndIndent(theEnv);
+   ExpressionData(theEnv)->ReturnContext = true;
+   actions = ParseProcActions(theEnv,"message-handler",readSource,
+                              &DefclassData(theEnv)->ObjectParseToken,hndParams,wildcard,
+                              SlotReferenceVar,BindSlotReference,&lvars,
+                              cls);
+   if (actions == NULL)
+     {
+      ReturnExpression(theEnv,hndParams);
+      return true;
+     }
+   if (DefclassData(theEnv)->ObjectParseToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"defmessage-handler");
+      ReturnExpression(theEnv,hndParams);
+      ReturnPackedExpression(theEnv,actions);
+      return true;
+     }
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,DefclassData(theEnv)->ObjectParseToken.printForm);
+   SavePPBuffer(theEnv,"\n");
+
+   /* ===================================================
+      If we're only checking syntax, don't add the
+      successfully parsed defmessage-handler to the KB.
+      =================================================== */
+
+   if (ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      ReturnExpression(theEnv,hndParams);
+      ReturnPackedExpression(theEnv,actions);
+      return false;
+     }
+
+   if (hnd != NULL)
+     {
+      ExpressionDeinstall(theEnv,hnd->actions);
+      ReturnPackedExpression(theEnv,hnd->actions);
+      if (hnd->header.ppForm != NULL)
+        rm(theEnv,(void *) hnd->header.ppForm,
+           (sizeof(char) * (strlen(hnd->header.ppForm)+1)));
+     }
+   else
+     {
+      hnd = InsertHandlerHeader(theEnv,cls,mname,mtype);
+      IncrementLexemeCount(hnd->header.name);
+     }
+   ReturnExpression(theEnv,hndParams);
+
+   hnd->minParams = min;
+   hnd->maxParams = max;
+   hnd->localVarCount = lvars;
+   hnd->actions = actions;
+   ExpressionInstall(theEnv,hnd->actions);
+#if DEBUGGING_FUNCTIONS
+
+   /* ===================================================
+      Old handler trace status is automatically preserved
+      =================================================== */
+   if (GetConserveMemory(theEnv) == false)
+     hnd->header.ppForm = CopyPPBuffer(theEnv);
+   else
+#endif
+     hnd->header.ppForm = NULL;
+   return false;
+  }
+
+/*******************************************************************************
+  NAME         : CreateGetAndPutHandlers
+  DESCRIPTION  : Creates two message-handlers with
+                  the following syntax for the slot:
+
+                 (defmessage-handler <class> get-<slot-name> primary ()
+                    ?self:<slot-name>)
+
+                 For single-field slots:
+
+                 (defmessage-handler <class> put-<slot-name> primary (?value)
+                    (bind ?self:<slot-name> ?value))
+
+                 For multifield slots:
+
+                 (defmessage-handler <class> put-<slot-name> primary ($?value)
+                    (bind ?self:<slot-name> ?value))
+
+  INPUTS       : The class slot descriptor
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Message-handlers created
+  NOTES        : A put handler is not created for read-only slots
+ *******************************************************************************/
+void CreateGetAndPutHandlers(
+  Environment *theEnv,
+  SlotDescriptor *sd)
+  {
+   const char *className,*slotName;
+   size_t bufsz;
+   char *buf;
+   const char *handlerRouter = "*** Default Public Handlers ***";
+   bool oldPWL,oldCM;
+   const char *oldRouter;
+   const char *oldString;
+   long oldIndex;
+
+   if ((sd->createReadAccessor == 0) && (sd->createWriteAccessor == 0))
+     return;
+   className = sd->cls->header.name->contents;
+   slotName = sd->slotName->name->contents;
+
+   bufsz = (sizeof(char) * (strlen(className) + (strlen(slotName) * 2) + 80));
+   buf = (char *) gm2(theEnv,bufsz);
+
+   oldPWL = GetPrintWhileLoading(theEnv);
+   SetPrintWhileLoading(theEnv,false);
+   oldCM = SetConserveMemory(theEnv,true);
+
+   if (sd->createReadAccessor)
+     {
+      gensprintf(buf,"%s get-%s () ?self:%s)",className,slotName,slotName);
+
+      oldRouter = RouterData(theEnv)->FastCharGetRouter;
+      oldString = RouterData(theEnv)->FastCharGetString;
+      oldIndex = RouterData(theEnv)->FastCharGetIndex;
+
+      RouterData(theEnv)->FastCharGetRouter = handlerRouter;
+      RouterData(theEnv)->FastCharGetIndex = 0;
+      RouterData(theEnv)->FastCharGetString = buf;
+
+      ParseDefmessageHandler(theEnv,handlerRouter);
+      DestroyPPBuffer(theEnv);
+      /*
+      if (OpenStringSource(theEnv,handlerRouter,buf,0))
+        {
+         ParseDefmessageHandler(handlerRouter);
+         DestroyPPBuffer();
+         CloseStringSource(theEnv,handlerRouter);
+        }
+      */
+      RouterData(theEnv)->FastCharGetRouter = oldRouter;
+      RouterData(theEnv)->FastCharGetIndex = oldIndex;
+      RouterData(theEnv)->FastCharGetString = oldString;
+     }
+
+   if (sd->createWriteAccessor)
+     {
+      gensprintf(buf,"%s put-%s ($?value) (bind ?self:%s ?value))",
+                  className,slotName,slotName);
+
+      oldRouter = RouterData(theEnv)->FastCharGetRouter;
+      oldString = RouterData(theEnv)->FastCharGetString;
+      oldIndex = RouterData(theEnv)->FastCharGetIndex;
+
+      RouterData(theEnv)->FastCharGetRouter = handlerRouter;
+      RouterData(theEnv)->FastCharGetIndex = 0;
+      RouterData(theEnv)->FastCharGetString = buf;
+
+      ParseDefmessageHandler(theEnv,handlerRouter);
+      DestroyPPBuffer(theEnv);
+
+/*
+      if (OpenStringSource(theEnv,handlerRouter,buf,0))
+        {
+         ParseDefmessageHandler(handlerRouter);
+         DestroyPPBuffer();
+         CloseStringSource(theEnv,handlerRouter);
+        }
+*/
+      RouterData(theEnv)->FastCharGetRouter = oldRouter;
+      RouterData(theEnv)->FastCharGetIndex = oldIndex;
+      RouterData(theEnv)->FastCharGetString = oldString;
+     }
+
+   SetPrintWhileLoading(theEnv,oldPWL);
+   SetConserveMemory(theEnv,oldCM);
+
+   rm(theEnv,buf,bufsz);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*****************************************************************
+  NAME         : IsParameterSlotReference
+  DESCRIPTION  : Determines if a message-handler parameter is of
+                 the form ?self:<name>, which is not allowed since
+                 this is slot reference syntax
+  INPUTS       : The paramter name
+  RETURNS      : True if the parameter is a slot reference,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ *****************************************************************/
+static bool IsParameterSlotReference(
+  Environment *theEnv,
+  const char *pname)
+  {
+   if ((strncmp(pname,SELF_STRING,SELF_LEN) == 0) ?
+                  (pname[SELF_LEN] == SELF_SLOT_REF) : false)
+     {
+      PrintErrorID(theEnv,"MSGPSR",4,false);
+      WriteString(theEnv,STDERR,"Illegal slot reference in parameter list.\n");
+      return true;
+     }
+   return false;
+  }
+
+/****************************************************************************
+  NAME         : SlotReferenceVar
+  DESCRIPTION  : Replaces direct slot references in handler body
+                   with special function calls to reference active instance
+                   at run-time
+                 The slot in in the class bound at parse-time is always
+                   referenced (early binding).
+                 Slot references of the form ?self:<name> directly reference
+                   ProcParamArray[0] (the message object - ?self) to
+                   find the specified slot at run-time
+  INPUTS       : 1) Variable expression
+                 2) The class of the handler being parsed
+  RETURNS      : 0 if not recognized, 1 if so, -1 on errors
+  SIDE EFFECTS : Handler body SF_VARIABLE and MF_VARIABLE replaced with
+                   direct slot access function
+  NOTES        : Objects are allowed to directly access their own slots
+                 without sending a message to themselves.  Since the object
+                 is "within the boundary of its internals", this does not
+                 violate the encapsulation principle of OOP.
+ ****************************************************************************/
+static int SlotReferenceVar(
+  Environment *theEnv,
+  Expression *varexp,
+  void *userBuffer)
+  {
+   struct token itkn;
+   bool oldpp;
+   SlotDescriptor *sd;
+
+   if ((varexp->type != SF_VARIABLE) && (varexp->type != MF_VARIABLE))
+     { return 0; }
+   if ((strncmp(varexp->lexemeValue->contents,SELF_STRING,SELF_LEN) == 0) ?
+               (varexp->lexemeValue->contents[SELF_LEN] == SELF_SLOT_REF) : false)
+     {
+      OpenStringSource(theEnv,"hnd-var",varexp->lexemeValue->contents + SELF_LEN + 1,0);
+      oldpp = GetPPBufferStatus(theEnv);
+      SetPPBufferStatus(theEnv,false);
+      GetToken(theEnv,"hnd-var",&itkn);
+      SetPPBufferStatus(theEnv,oldpp);
+      CloseStringSource(theEnv,"hnd-var");
+      if (itkn.tknType != STOP_TOKEN)
+        {
+         sd = CheckSlotReference(theEnv,(Defclass *) userBuffer,TokenTypeToType(itkn.tknType),itkn.value,
+                                 false,NULL);
+         if (sd == NULL)
+           { return -1; }
+         GenHandlerSlotReference(theEnv,varexp,HANDLER_GET,sd);
+         return 1;
+        }
+     }
+
+   return 0;
+  }
+
+/****************************************************************************
+  NAME         : BindSlotReference
+  DESCRIPTION  : Replaces direct slot binds in handler body with special
+                 function calls to reference active instance at run-time
+                 The slot in in the class bound at parse-time is always
+                 referenced (early binding).
+                 Slot references of the form ?self:<name> directly reference
+                   ProcParamArray[0] (the message object - ?self) to
+                   find the specified slot at run-time
+  INPUTS       : 1) Variable expression
+                 2) The class for the message-handler being parsed
+  RETURNS      : 0 if not recognized, 1 if so, -1 on errors
+  SIDE EFFECTS : Handler body "bind" call replaced with  direct slot access
+                   function
+  NOTES        : Objects are allowed to directly access their own slots
+                 without sending a message to themselves.  Since the object
+                 is "within the boundary of its internals", this does not
+                 violate the encapsulation principle of OOP.
+ ****************************************************************************/
+static int BindSlotReference(
+  Environment *theEnv,
+  Expression *bindExp,
+  void *userBuffer)
+  {
+   const char *bindName;
+   struct token itkn;
+   bool oldpp;
+   SlotDescriptor *sd;
+   Expression *saveExp;
+
+   bindName = bindExp->argList->lexemeValue->contents;
+   if (strcmp(bindName,SELF_STRING) == 0)
+     {
+      PrintErrorID(theEnv,"MSGPSR",5,false);
+      WriteString(theEnv,STDERR,"Active instance parameter cannot be changed.\n");
+      return -1;
+     }
+   if ((strncmp(bindName,SELF_STRING,SELF_LEN) == 0) ?
+               (bindName[SELF_LEN] == SELF_SLOT_REF) : false)
+     {
+      OpenStringSource(theEnv,"hnd-var",bindName + SELF_LEN + 1,0);
+      oldpp = GetPPBufferStatus(theEnv);
+      SetPPBufferStatus(theEnv,false);
+      GetToken(theEnv,"hnd-var",&itkn);
+      SetPPBufferStatus(theEnv,oldpp);
+      CloseStringSource(theEnv,"hnd-var");
+      if (itkn.tknType != STOP_TOKEN)
+        {
+         saveExp = bindExp->argList->nextArg;
+         sd = CheckSlotReference(theEnv,(Defclass *) userBuffer,TokenTypeToType(itkn.tknType),itkn.value,
+                                 true,saveExp);
+         if (sd == NULL)
+           { return -1; }
+         GenHandlerSlotReference(theEnv,bindExp,HANDLER_PUT,sd);
+         bindExp->argList->nextArg = NULL;
+         ReturnExpression(theEnv,bindExp->argList);
+         bindExp->argList = saveExp;
+         return 1;
+        }
+     }
+   return 0;
+  }
+
+/*********************************************************
+  NAME         : CheckSlotReference
+  DESCRIPTION  : Examines a ?self:<slot-name> reference
+                 If the reference is a single-field or
+                 global variable, checking and evaluation
+                 is delayed until run-time.  If the
+                 reference is a symbol, this routine
+                 verifies that the slot is a legal
+                 slot for the reference (i.e., it exists
+                 in the class to which the message-handler
+                 is being attached, it is visible and it
+                 is writable for write reference)
+  INPUTS       : 1) A buffer holding the class
+                    of the handler being parsed
+                 2) The type of the slot reference
+                 3) The value of the slot reference
+                 4) A flag indicating if this is a read
+                    or write access
+                 5) Value expression for write
+  RETURNS      : Class slot on success, NULL on errors
+  SIDE EFFECTS : Messages printed on errors.
+  NOTES        : For static references, this function
+                 insures that the slot is either
+                 publicly visible or that the handler
+                 is being attached to the same class in
+                 which the private slot is defined.
+ *********************************************************/
+static SlotDescriptor *CheckSlotReference(
+  Environment *theEnv,
+  Defclass *theDefclass,
+  int theType,
+  void *theValue,
+  bool writeFlag,
+  Expression *writeExpression)
+  {
+   int slotIndex;
+   SlotDescriptor *sd;
+   ConstraintViolationType vCode;
+
+   if (theType != SYMBOL_TYPE)
+     {
+      PrintErrorID(theEnv,"MSGPSR",7,false);
+      WriteString(theEnv,STDERR,"Illegal value for ?self reference.\n");
+      return NULL;
+     }
+   slotIndex = FindInstanceTemplateSlot(theEnv,theDefclass,(CLIPSLexeme *) theValue);
+   if (slotIndex == -1)
+     {
+      PrintErrorID(theEnv,"MSGPSR",6,false);
+      WriteString(theEnv,STDERR,"No such slot '");
+      WriteString(theEnv,STDERR,((CLIPSLexeme *) theValue)->contents);
+      WriteString(theEnv,STDERR,"' in class '");
+      WriteString(theEnv,STDERR,DefclassName(theDefclass));
+      WriteString(theEnv,STDERR,"' for ?self reference.\n");
+      return NULL;
+     }
+   sd = theDefclass->instanceTemplate[slotIndex];
+   if ((sd->publicVisibility == 0) && (sd->cls != theDefclass))
+     {
+      SlotVisibilityViolationError(theEnv,sd,theDefclass,true);
+      return NULL;
+     }
+   if (! writeFlag)
+     return(sd);
+
+   /* =================================================
+      If a slot is initialize-only, the WithinInit flag
+      still needs to be checked at run-time, for the
+      handler could be called out of the context of
+      an init.
+      ================================================= */
+   if (sd->noWrite && (sd->initializeOnly == 0))
+     {
+      SlotAccessViolationError(theEnv,((CLIPSLexeme *) theValue)->contents,
+                               NULL,theDefclass);
+      return NULL;
+     }
+
+   vCode = ConstraintCheckExpressionChain(theEnv,writeExpression,sd->constraint);
+   if (vCode != NO_VIOLATION)
+     {
+      PrintErrorID(theEnv,"CSTRNCHK",1,false);
+      WriteString(theEnv,STDERR,"Expression for ");
+      PrintSlot(theEnv,STDERR,sd,NULL,"direct slot write");
+      ConstraintViolationErrorMessage(theEnv,NULL,NULL,0,0,NULL,0,
+                                      vCode,sd->constraint,false);
+      return NULL;
+     }
+   return(sd);
+  }
+
+/***************************************************
+  NAME         : GenHandlerSlotReference
+  DESCRIPTION  : Creates a bitmap of the class id
+                 and slot index for the get or put
+                 operation. The bitmap and operation
+                 type are stored in the given
+                 expression.
+  INPUTS       : 1) The expression
+                 2) The operation type
+                 3) The class slot
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Bitmap created and expression
+                 initialized
+  NOTES        : None
+ ***************************************************/
+static void GenHandlerSlotReference(
+  Environment *theEnv,
+  Expression *theExp,
+  unsigned short theType,
+  SlotDescriptor *sd)
+  {
+   HANDLER_SLOT_REFERENCE handlerReference;
+
+   ClearBitString(&handlerReference,sizeof(HANDLER_SLOT_REFERENCE));
+   handlerReference.classID = sd->cls->id;
+   handlerReference.slotID = sd->slotName->id;
+   theExp->type = theType;
+   theExp->value =  AddBitMap(theEnv,&handlerReference,
+                              sizeof(HANDLER_SLOT_REFERENCE));
+  }
+
+#endif
diff --git a/clips/msgpsr.h b/clips/msgpsr.h
new file mode 100755
index 000000000..ff3220725
--- /dev/null
+++ b/clips/msgpsr.h
@@ -0,0 +1,71 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS            */
+/*                    compilation flag.                      */
+/*                                                           */
+/*      6.30: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_AND_SAVE        */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_msgpsr
+
+#pragma once
+
+#define _H_msgpsr
+
+#if OBJECT_SYSTEM && (! BLOAD_ONLY) && (! RUN_TIME)
+
+#define SELF_STRING     "self"
+
+#include "object.h"
+
+   bool             ParseDefmessageHandler(Environment *,const char *);
+   void             CreateGetAndPutHandlers(Environment *,SlotDescriptor *);
+
+#endif /* OBJECT_SYSTEM && (! BLOAD_ONLY) && (! RUN_TIME) */
+
+#endif /* _H_msgpsr */
+
+
+
diff --git a/clips/multifld.c b/clips/multifld.c
new file mode 100755
index 000000000..c32e7b81b
--- /dev/null
+++ b/clips/multifld.c
@@ -0,0 +1,1404 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/09/18             */
+   /*                                                     */
+   /*                  MULTIFIELD MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*            Moved ImplodeMultifield from multifun.c.       */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Used DataObjectToString instead of             */
+/*            ValueToString in implode$ to handle            */
+/*            print representation of external addresses.    */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed issue with StoreInMultifield when        */
+/*            asserting void values in implied deftemplate   */
+/*            facts.                                         */
+/*                                                           */
+/*      6.40: Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            The explode$ function via StringToMultifield   */
+/*            now converts non-primitive value tokens        */
+/*            (such as parentheses) to symbols rather than   */
+/*            strings.                                       */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "exprnops.h"
+#include "memalloc.h"
+#if OBJECT_SYSTEM
+#include "object.h"
+#endif
+#include "scanner.h"
+#include "prntutil.h"
+#include "router.h"
+#include "strngrtr.h"
+#include "symbol.h"
+#include "utility.h"
+
+#include "multifld.h"
+
+/******************************/
+/* CreateUnmanagedMultifield: */
+/******************************/
+Multifield *CreateUnmanagedMultifield(
+  Environment *theEnv,
+  size_t size)
+  {
+   Multifield *theSegment;
+   size_t newSize = size;
+
+   if (size == 0) newSize = 1;
+
+   theSegment = get_var_struct(theEnv,multifield,sizeof(struct clipsValue) * (newSize - 1));
+
+   theSegment->header.type = MULTIFIELD_TYPE;
+   theSegment->length = size;
+   theSegment->busyCount = 0;
+   theSegment->next = NULL;
+
+   return theSegment;
+  }
+
+/*********************/
+/* ReturnMultifield: */
+/*********************/
+void ReturnMultifield(
+  Environment *theEnv,
+  Multifield *theSegment)
+  {
+   size_t newSize;
+
+   if (theSegment == NULL) return;
+
+   if (theSegment->length == 0) newSize = 1;
+   else newSize = theSegment->length;
+
+   rtn_var_struct(theEnv,multifield,sizeof(struct clipsValue) * (newSize - 1),theSegment);
+  }
+
+/*********************/
+/* RetainMultifield: */
+/*********************/
+void RetainMultifield(
+  Environment *theEnv,
+  Multifield *theSegment)
+  {
+   size_t length, i;
+   CLIPSValue *contents;
+
+   if (theSegment == NULL) return;
+
+   length = theSegment->length;
+
+   theSegment->busyCount++;
+   contents = theSegment->contents;
+
+   for (i = 0 ; i < length ; i++)
+     { AtomInstall(theEnv,contents[i].header->type,contents[i].value); }
+  }
+
+/**********************/
+/* ReleaseMultifield: */
+/**********************/
+void ReleaseMultifield(
+  Environment *theEnv,
+  Multifield *theSegment)
+  {
+   size_t length, i;
+   CLIPSValue *contents;
+
+   if (theSegment == NULL) return;
+
+   length = theSegment->length;
+   theSegment->busyCount--;
+   contents = theSegment->contents;
+
+   for (i = 0 ; i < length ; i++)
+     { AtomDeinstall(theEnv,contents[i].header->type,contents[i].value); }
+  }
+
+/************************************************/
+/* IncrementCLIPSValueMultifieldReferenceCount: */
+/************************************************/
+void IncrementCLIPSValueMultifieldReferenceCount(
+  Environment *theEnv,
+  Multifield *theSegment)
+  {
+   size_t length, i;
+   CLIPSValue *contents;
+
+   if (theSegment == NULL) return;
+
+   length = theSegment->length;
+
+   theSegment->busyCount++;
+   contents = theSegment->contents;
+
+   for (i = 0 ; i < length ; i++)
+     { Retain(theEnv,contents[i].header); }
+  }
+
+/************************************************/
+/* DecrementCLIPSValueMultifieldReferenceCount: */
+/************************************************/
+void DecrementCLIPSValueMultifieldReferenceCount(
+  Environment *theEnv,
+  Multifield *theSegment)
+  {
+   size_t length, i;
+   CLIPSValue *contents;
+
+   if (theSegment == NULL) return;
+
+   length = theSegment->length;
+   theSegment->busyCount--;
+   contents = theSegment->contents;
+
+   for (i = 0 ; i < length ; i++)
+     { Release(theEnv,contents[i].header); }
+  }
+
+/*******************************************************/
+/* StringToMultifield: Returns a multifield structure  */
+/*    that represents the string sent as the argument. */
+/*******************************************************/
+Multifield *StringToMultifield(
+  Environment *theEnv,
+  const char *theString)
+  {
+   struct token theToken;
+   Multifield *theSegment;
+   CLIPSValue *contents;
+   unsigned long numberOfFields = 0;
+   struct expr *topAtom = NULL, *lastAtom = NULL, *theAtom;
+
+   /*====================================================*/
+   /* Open the string as an input source and read in the */
+   /* list of values to be stored in the multifield.     */
+   /*====================================================*/
+
+   OpenStringSource(theEnv,"multifield-str",theString,0);
+
+   GetToken(theEnv,"multifield-str",&theToken);
+   while (theToken.tknType != STOP_TOKEN)
+     {
+      if ((theToken.tknType == SYMBOL_TOKEN) || (theToken.tknType == STRING_TOKEN) ||
+          (theToken.tknType == FLOAT_TOKEN) || (theToken.tknType == INTEGER_TOKEN) ||
+          (theToken.tknType == INSTANCE_NAME_TOKEN))
+        { theAtom = GenConstant(theEnv,TokenTypeToType(theToken.tknType),theToken.value); }
+      else
+        { theAtom = GenConstant(theEnv,SYMBOL_TYPE,CreateSymbol(theEnv,theToken.printForm)); }
+
+      numberOfFields++;
+      if (topAtom == NULL) topAtom = theAtom;
+      else lastAtom->nextArg = theAtom;
+
+      lastAtom = theAtom;
+      GetToken(theEnv,"multifield-str",&theToken);
+     }
+
+   CloseStringSource(theEnv,"multifield-str");
+
+   /*====================================================================*/
+   /* Create a multifield of the appropriate size for the values parsed. */
+   /*====================================================================*/
+
+   theSegment = CreateMultifield(theEnv,numberOfFields);
+   contents = theSegment->contents;
+
+   /*====================================*/
+   /* Copy the values to the multifield. */
+   /*====================================*/
+
+   theAtom = topAtom;
+   numberOfFields = 0;
+   while (theAtom != NULL)
+     {
+      contents[numberOfFields].value = theAtom->value;
+      numberOfFields++;
+      theAtom = theAtom->nextArg;
+     }
+
+   /*===========================*/
+   /* Return the parsed values. */
+   /*===========================*/
+
+   ReturnExpression(theEnv,topAtom);
+
+   /*============================*/
+   /* Return the new multifield. */
+   /*============================*/
+
+   return(theSegment);
+  }
+
+/**********************/
+/* ArrayToMultifield: */
+/**********************/
+Multifield *ArrayToMultifield(
+  Environment *theEnv,
+  CLIPSValue *theArray,
+  unsigned long size) // TBD size_t
+  {
+   Multifield *rv;
+   unsigned int i;
+   
+   rv = CreateMultifield(theEnv,size);
+   
+   for (i = 0; i < size; i++)
+     { rv->contents[i].value = theArray[i].value; }
+   
+   return rv;
+  }
+
+/***************************************************/
+/* EmptyMultifield: Creates a multifield of length */
+/*   0 and adds it to the list of segments.        */
+/***************************************************/
+Multifield *EmptyMultifield(
+  Environment *theEnv)
+  {
+   return CreateMultifield(theEnv,0);
+  }
+
+/***********************************************************/
+/* CreateMultifield: Creates a multifield of the specified */
+/*   size and adds it to the list of segments.             */
+/***********************************************************/
+Multifield *CreateMultifield(
+  Environment *theEnv,
+  size_t size)
+  {
+   Multifield *theSegment;
+   size_t newSize;
+
+   if (size == 0) newSize = 1;
+   else newSize = size;
+
+   theSegment = get_var_struct(theEnv,multifield,sizeof(struct clipsValue) * (newSize - 1));
+
+   theSegment->header.type = MULTIFIELD_TYPE;
+   theSegment->length = size;
+   theSegment->busyCount = 0;
+   theSegment->next = NULL;
+
+   theSegment->next = UtilityData(theEnv)->CurrentGarbageFrame->ListOfMultifields;
+   UtilityData(theEnv)->CurrentGarbageFrame->ListOfMultifields = theSegment;
+   UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+   if (UtilityData(theEnv)->CurrentGarbageFrame->LastMultifield == NULL)
+     { UtilityData(theEnv)->CurrentGarbageFrame->LastMultifield = theSegment; }
+
+   return theSegment;
+  }
+
+/*******************/
+/* DOToMultifield: */
+/*******************/
+Multifield *DOToMultifield(
+  Environment *theEnv,
+  UDFValue *theValue)
+  {
+   Multifield *dst, *src;
+
+   if (theValue->header->type != MULTIFIELD_TYPE) return NULL;
+
+   dst = CreateUnmanagedMultifield(theEnv,(unsigned long) theValue->range);
+
+   src = theValue->multifieldValue;
+   GenCopyMemory(struct clipsValue,dst->length,
+              &(dst->contents[0]),&(src->contents[theValue->begin]));
+
+   return dst;
+  }
+
+/************************/
+/* AddToMultifieldList: */
+/************************/
+void AddToMultifieldList(
+  Environment *theEnv,
+  Multifield *theSegment)
+  {
+   theSegment->next = UtilityData(theEnv)->CurrentGarbageFrame->ListOfMultifields;
+   UtilityData(theEnv)->CurrentGarbageFrame->ListOfMultifields = theSegment;
+   UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+   if (UtilityData(theEnv)->CurrentGarbageFrame->LastMultifield == NULL)
+     { UtilityData(theEnv)->CurrentGarbageFrame->LastMultifield = theSegment; }
+  }
+
+/*********************/
+/* FlushMultifields: */
+/*********************/
+void FlushMultifields(
+  Environment *theEnv)
+  {
+   Multifield *theSegment, *nextPtr, *lastPtr = NULL;
+   size_t newSize;
+
+   theSegment = UtilityData(theEnv)->CurrentGarbageFrame->ListOfMultifields;
+   while (theSegment != NULL)
+     {
+      nextPtr = theSegment->next;
+      if (theSegment->busyCount == 0)
+        {
+         if (theSegment->length == 0) newSize = 1;
+         else newSize = theSegment->length;
+         rtn_var_struct(theEnv,multifield,sizeof(struct clipsValue) * (newSize - 1),theSegment);
+         if (lastPtr == NULL) UtilityData(theEnv)->CurrentGarbageFrame->ListOfMultifields = nextPtr;
+         else lastPtr->next = nextPtr;
+
+         /*=================================================*/
+         /* If the multifield deleted was the last in the   */
+         /* list, update the pointer to the last multifield */
+         /* to the prior multifield.                        */
+         /*=================================================*/
+
+         if (nextPtr == NULL)
+           { UtilityData(theEnv)->CurrentGarbageFrame->LastMultifield = lastPtr; }
+        }
+      else
+        { lastPtr = theSegment; }
+
+      theSegment = nextPtr;
+     }
+  }
+
+/********************/
+/* CLIPSToUDFValue: */
+/********************/
+void CLIPSToUDFValue(
+  CLIPSValue *cv,
+  UDFValue *uv)
+  {
+   uv->value = cv->value;
+   if (cv->header->type == MULTIFIELD_TYPE)
+     {
+      uv->begin = 0;
+      uv->range = cv->multifieldValue->length;
+     }
+  }
+
+/********************/
+/* UDFToCLIPSValue: */
+/********************/
+void UDFToCLIPSValue(
+  Environment *theEnv,
+  UDFValue *uv,
+  CLIPSValue *cv)
+  {
+   Multifield *copy;
+   
+   if (uv->header->type != MULTIFIELD_TYPE)
+     {
+      cv->value = uv->value;
+      return;
+     }
+   
+   if ((uv->begin == 0) &&
+       (uv->range == uv->multifieldValue->length))
+     {
+      cv->multifieldValue = uv->multifieldValue;
+      return;
+     }
+     
+   copy = CreateMultifield(theEnv,uv->range);
+   GenCopyMemory(struct clipsValue,uv->range,&copy->contents[0],
+                 &uv->multifieldValue->contents[uv->begin]);
+      
+   cv->multifieldValue = copy;
+  }
+
+/************************************************/
+/* NormalizeMultifield: Allocates a new segment */
+/*   and copies results from old value to new.  */
+/************************************************/
+void NormalizeMultifield(
+  Environment *theEnv,
+  UDFValue *theMF)
+  {
+   Multifield *copy;
+   
+   if (theMF->header->type != MULTIFIELD_TYPE) return;
+   
+   if ((theMF->begin == 0) &&
+       (theMF->range == theMF->multifieldValue->length))
+     { return; }
+
+   copy = CreateMultifield(theEnv,theMF->range);
+   GenCopyMemory(struct clipsValue,theMF->range,&copy->contents[0],
+                 &theMF->multifieldValue->contents[theMF->begin]);
+   theMF->begin = 0;
+   theMF->value = copy;
+  }
+
+/************************************************************************/
+/* DuplicateMultifield: Allocates a new segment and copies results from */
+/*   old value to new. This value is not put on the ListOfMultifields.  */
+/************************************************************************/
+void DuplicateMultifield(
+  Environment *theEnv,
+  UDFValue *dst,
+  UDFValue *src)
+  {
+   dst->begin = 0;
+   dst->range = src->range;
+   dst->value = CreateUnmanagedMultifield(theEnv,(unsigned long) dst->range);
+   GenCopyMemory(struct clipsValue,dst->range,&dst->multifieldValue->contents[0],
+                                         &src->multifieldValue->contents[src->begin]);
+  }
+
+/*******************/
+/* CopyMultifield: */
+/*******************/
+Multifield *CopyMultifield(
+  Environment *theEnv,
+  Multifield *src)
+  {
+   Multifield *dst;
+
+   dst = CreateUnmanagedMultifield(theEnv,src->length);
+   GenCopyMemory(struct clipsValue,src->length,&(dst->contents[0]),&(src->contents[0]));
+   return dst;
+  }
+
+/**********************************************************/
+/* EphemerateMultifield: Marks the values of a multifield */
+/*   as ephemeral if they have not already been marker.   */
+/**********************************************************/
+void EphemerateMultifield(
+  Environment *theEnv,
+  Multifield *theSegment)
+  {
+   size_t length, i;
+   CLIPSValue *contents;
+
+   if (theSegment == NULL) return;
+
+   length = theSegment->length;
+
+   contents = theSegment->contents;
+
+   for (i = 0 ; i < length ; i++)
+     { EphemerateValue(theEnv,contents[i].value); }
+  }
+
+/*********************************************/
+/* WriteMultifield: Prints out a multifield. */
+/*********************************************/
+void WriteMultifield(
+  Environment *theEnv,
+  const char *fileid,
+  Multifield *segment)
+  {
+   PrintMultifieldDriver(theEnv,fileid,segment,0,segment->length,true);
+  }
+  
+/***************************************************/
+/* PrintMultifieldDriver: Prints out a multifield. */
+/***************************************************/
+void PrintMultifieldDriver(
+  Environment *theEnv,
+  const char *fileid,
+  Multifield *segment,
+  size_t begin,
+  size_t range,
+  bool printParens)
+  {
+   CLIPSValue *theMultifield;
+   size_t i;
+
+   theMultifield = segment->contents;
+   
+   if (printParens)
+     { WriteString(theEnv,fileid,"("); }
+
+   for (i = 0; i < range; i++)
+     {
+      PrintAtom(theEnv,fileid,theMultifield[begin+i].header->type,theMultifield[begin+i].value);
+     
+      if ((i + 1) < range)
+        { WriteString(theEnv,fileid," "); }
+     }
+
+   if (printParens)
+     { WriteString(theEnv,fileid,")"); }
+  }
+
+/****************************************************/
+/* StoreInMultifield: Append function for segments. */
+/****************************************************/
+void StoreInMultifield(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  Expression *expptr,
+  bool garbageSegment)
+  {
+   UDFValue val_ptr;
+   UDFValue *val_arr;
+   Multifield *theMultifield;
+   Multifield *orig_ptr;
+   size_t start, range;
+   size_t i, j, k;
+   unsigned int argCount;
+   unsigned long seg_size;
+
+   argCount = CountArguments(expptr);
+
+   /*=========================================*/
+   /* If no arguments are given return a NULL */
+   /* multifield of length zero.              */
+   /*=========================================*/
+
+   if (argCount == 0)
+     {
+      returnValue->begin = 0;
+      returnValue->range = 0;
+      if (garbageSegment) theMultifield = CreateMultifield(theEnv,0L);
+      else theMultifield = CreateUnmanagedMultifield(theEnv,0L);
+      returnValue->value = theMultifield;
+      return;
+     }
+   else
+     {
+      /*========================================*/
+      /* Get a new segment with length equal to */
+      /* the total length of all the arguments. */
+      /*========================================*/
+
+      val_arr = (UDFValue *) gm2(theEnv,sizeof(UDFValue) * argCount);
+      seg_size = 0;
+
+      for (i = 1; i <= argCount; i++, expptr = expptr->nextArg)
+        {
+         EvaluateExpression(theEnv,expptr,&val_ptr);
+         if (EvaluationData(theEnv)->EvaluationError)
+           {
+            returnValue->begin = 0;
+            returnValue->range = 0;
+            if (garbageSegment)
+              { theMultifield = CreateMultifield(theEnv,0L); }
+            else theMultifield = CreateUnmanagedMultifield(theEnv,0L);
+            returnValue->value = theMultifield;
+            rm(theEnv,val_arr,sizeof(UDFValue) * argCount);
+            return;
+           }
+         if (val_ptr.header->type == MULTIFIELD_TYPE)
+           {
+            (val_arr+i-1)->value = val_ptr.value;
+            start = val_ptr.begin;
+            range = val_ptr.range;
+           }
+         else if (val_ptr.header->type == VOID_TYPE)
+           {
+            (val_arr+i-1)->value = val_ptr.value;
+            start = 0;
+            range = 0;
+           }
+         else
+           {
+            (val_arr+i-1)->value = val_ptr.value;
+            start = 0;
+            range = 1;
+           }
+
+         seg_size += (unsigned long) range;
+         (val_arr+i-1)->begin = start;
+         (val_arr+i-1)->range = range;
+        }
+
+      if (garbageSegment)
+        { theMultifield = CreateMultifield(theEnv,seg_size); }
+      else theMultifield = CreateUnmanagedMultifield(theEnv,seg_size);
+
+      /*========================================*/
+      /* Copy each argument into new segment.  */
+      /*========================================*/
+
+      for (k = 0, j = 0; k < argCount; k++)
+        {
+         if ((val_arr+k)->header->type == MULTIFIELD_TYPE)
+           {
+            start = (val_arr+k)->begin;
+            range = (val_arr+k)->range;
+            orig_ptr = (val_arr+k)->multifieldValue;
+            for (i = start; i < (start + range); i++, j++)
+              {
+               theMultifield->contents[j].value = orig_ptr->contents[i].value;
+              }
+           }
+         else if ((val_arr+k)->header->type != VOID_TYPE)
+           {
+            theMultifield->contents[j].value = (val_arr+k)->value;
+            j++;
+           }
+        }
+
+      /*=========================*/
+      /* Return the new segment. */
+      /*=========================*/
+
+      returnValue->begin = 0;
+      returnValue->range = seg_size;
+      returnValue->value = theMultifield;
+      rm(theEnv,val_arr,sizeof(UDFValue) * argCount);
+      return;
+     }
+  }
+
+/*************************************************************/
+/* MultifieldDOsEqual: Determines if two segments are equal. */
+/*************************************************************/
+bool MultifieldDOsEqual(
+  UDFValue *dobj1,
+  UDFValue *dobj2)
+  {
+   size_t extent1, extent2;
+   CLIPSValue *e1, *e2;
+
+   extent1 = dobj1->range;
+   extent2 = dobj2->range;
+   
+   if (extent1 != extent2)
+     { return false; }
+
+   e1 = &dobj1->multifieldValue->contents[dobj1->begin];
+   e2 = &dobj2->multifieldValue->contents[dobj2->begin];
+
+   while (extent1 > 0)
+     {
+      if (e1->value != e2->value)
+        { return false; }
+
+      extent1--;
+
+      if (extent1 > 0)
+        {
+         e1++;
+         e2++;
+        }
+     }
+     
+   return true;
+  }
+
+/******************************************************************/
+/* MultifieldsEqual: Determines if two multifields are identical. */
+/******************************************************************/
+bool MultifieldsEqual(
+  Multifield *segment1,
+  Multifield *segment2)
+  {
+   CLIPSValue *elem1;
+   CLIPSValue *elem2;
+   size_t length, i = 0;
+
+   length = segment1->length;
+   if (length != segment2->length)
+     { return false; }
+
+   elem1 = segment1->contents;
+   elem2 = segment2->contents;
+
+   /*==================================================*/
+   /* Compare each field of both facts until the facts */
+   /* match completely or the facts mismatch.          */
+   /*==================================================*/
+
+   while (i < length)
+     {
+      if (elem1[i].header->type == MULTIFIELD_TYPE)
+        {
+         if (MultifieldsEqual(elem1[i].multifieldValue,
+                              elem2[i].multifieldValue) == false)
+          { return false; }
+        }
+      else if (elem1[i].value != elem2[i].value)
+        { return false; }
+
+      i++;
+     }
+   return true;
+  }
+
+/************************************************************/
+/* HashMultifield: Returns the hash value for a multifield. */
+/************************************************************/
+size_t HashMultifield(
+  Multifield *theSegment,
+  size_t theRange)
+  {
+   size_t length, i;
+   size_t tvalue;
+   size_t count;
+   CLIPSValue *fieldPtr;
+   union
+     {
+      double fv;
+      void *vv;
+      unsigned long liv;
+     } fis;
+
+   /*================================================*/
+   /* Initialize variables for computing hash value. */
+   /*================================================*/
+
+   count = 0;
+   length = theSegment->length;
+   fieldPtr = theSegment->contents;
+
+   /*====================================================*/
+   /* Loop through each value in the multifield, compute */
+   /* its hash value, and add it to the running total.   */
+   /*====================================================*/
+
+   for (i = 0;
+        i < length;
+        i++)
+     {
+      switch(fieldPtr[i].header->type)
+         {
+          case MULTIFIELD_TYPE:
+            count += HashMultifield(fieldPtr[i].multifieldValue,theRange);
+            break;
+
+          case FLOAT_TYPE:
+            fis.liv = 0;
+            fis.fv = fieldPtr[i].floatValue->contents;
+            count += (fis.liv * (i + 29))  +
+                     (unsigned long) fieldPtr[i].floatValue->contents;
+            break;
+
+          case INTEGER_TYPE:
+            count += (((unsigned long) fieldPtr[i].integerValue->contents) * (i + 29)) +
+                      ((unsigned long) fieldPtr[i].integerValue->contents);
+            break;
+
+          case FACT_ADDRESS_TYPE:
+#if OBJECT_SYSTEM
+          case INSTANCE_ADDRESS_TYPE:
+#endif
+            fis.liv = 0;
+            fis.vv = fieldPtr[i].value;
+            count += fis.liv * (i + 29);
+            break;
+
+          case EXTERNAL_ADDRESS_TYPE:
+            fis.liv = 0;
+            fis.vv = fieldPtr[i].externalAddressValue->contents;
+            count += fis.liv * (i + 29);
+            break;
+
+          case SYMBOL_TYPE:
+          case STRING_TYPE:
+#if OBJECT_SYSTEM
+          case INSTANCE_NAME_TYPE:
+#endif
+            tvalue = HashSymbol(fieldPtr[i].lexemeValue->contents,theRange);
+            count += tvalue * (i + 29);
+            break;
+         }
+     }
+
+   /*========================*/
+   /* Return the hash value. */
+   /*========================*/
+
+   return count;
+  }
+
+/**********************/
+/* GetMultifieldList: */
+/**********************/
+Multifield *GetMultifieldList(
+  Environment *theEnv)
+  {
+   return(UtilityData(theEnv)->CurrentGarbageFrame->ListOfMultifields);
+  }
+
+/***************************************/
+/* ImplodeMultifield: C access routine */
+/*   for the implode$ function.        */
+/***************************************/
+CLIPSLexeme *ImplodeMultifield(
+  Environment *theEnv,
+  UDFValue *value)
+  {
+   size_t strsize = 0;
+   size_t i, j;
+   const char *tmp_str;
+   char *ret_str;
+   CLIPSLexeme *rv;
+   Multifield *theMultifield;
+   UDFValue tempDO;
+
+   /*===================================================*/
+   /* Determine the size of the string to be allocated. */
+   /*===================================================*/
+
+   theMultifield = value->multifieldValue;
+   for (i = value->begin ; i < (value->begin + value->range) ; i++)
+     {
+      if (theMultifield->contents[i].header->type == FLOAT_TYPE)
+        {
+         tmp_str = FloatToString(theEnv,theMultifield->contents[i].floatValue->contents);
+         strsize += strlen(tmp_str) + 1;
+        }
+      else if (theMultifield->contents[i].header->type == INTEGER_TYPE)
+        {
+         tmp_str = LongIntegerToString(theEnv,theMultifield->contents[i].integerValue->contents);
+         strsize += strlen(tmp_str) + 1;
+        }
+      else if (theMultifield->contents[i].header->type == STRING_TYPE)
+        {
+         strsize += strlen(theMultifield->contents[i].lexemeValue->contents) + 3;
+         tmp_str = theMultifield->contents[i].lexemeValue->contents;
+         while(*tmp_str)
+           {
+            if (*tmp_str == '"')
+              { strsize++; }
+            else if (*tmp_str == '\\') /* GDR 111599 #835 */
+              { strsize++; }           /* GDR 111599 #835 */
+            tmp_str++;
+           }
+        }
+      else
+        {
+         tempDO.value = theMultifield->contents[i].value;
+         strsize += strlen(DataObjectToString(theEnv,&tempDO)) + 1;
+        }
+     }
+
+   /*=============================================*/
+   /* Allocate the string and copy all components */
+   /* of the MULTIFIELD_TYPE variable to it.      */
+   /*=============================================*/
+
+   if (strsize == 0) return(CreateString(theEnv,""));
+   ret_str = (char *) gm2(theEnv,strsize);
+   for(j = 0, i = value->begin ; i < (value->begin + value->range) ; i++)
+     {
+      /*============================*/
+      /* Convert numbers to strings */
+      /*============================*/
+
+      if (theMultifield->contents[i].header->type == FLOAT_TYPE)
+        {
+         tmp_str = FloatToString(theEnv,theMultifield->contents[i].floatValue->contents);
+         while(*tmp_str)
+           {
+            *(ret_str+j) = *tmp_str;
+            j++;
+            tmp_str++;
+           }
+        }
+      else if (theMultifield->contents[i].header->type == INTEGER_TYPE)
+        {
+         tmp_str = LongIntegerToString(theEnv,theMultifield->contents[i].integerValue->contents);
+         while(*tmp_str)
+           {
+            *(ret_str+j) = *tmp_str;
+            j++;
+            tmp_str++;
+           }
+        }
+
+      /*=======================================*/
+      /* Enclose strings in quotes and preceed */
+      /* imbedded quotes with a backslash      */
+      /*=======================================*/
+
+      else if (theMultifield->contents[i].header->type == STRING_TYPE)
+        {
+         tmp_str = theMultifield->contents[i].lexemeValue->contents;
+         *(ret_str+j) = '"';
+         j++;
+         while(*tmp_str)
+           {
+            if (*tmp_str == '"')
+              {
+               *(ret_str+j) = '\\';
+               j++;
+              }
+            else if (*tmp_str == '\\') /* GDR 111599 #835 */
+              {                        /* GDR 111599 #835 */
+               *(ret_str+j) = '\\';    /* GDR 111599 #835 */
+               j++;                    /* GDR 111599 #835 */
+              }                        /* GDR 111599 #835 */
+
+            *(ret_str+j) = *tmp_str;
+            j++;
+            tmp_str++;
+           }
+         *(ret_str+j) = '"';
+         j++;
+        }
+      else
+        {
+         tempDO.value = theMultifield->contents[i].value;
+         tmp_str = DataObjectToString(theEnv,&tempDO);
+         while(*tmp_str)
+           {
+            *(ret_str+j) = *tmp_str;
+            j++;
+            tmp_str++;
+           }
+         }
+      *(ret_str+j) = ' ';
+      j++;
+     }
+   *(ret_str+j-1) = '\0';
+
+   /*====================*/
+   /* Return the string. */
+   /*====================*/
+
+   rv = CreateString(theEnv,ret_str);
+   rm(theEnv,ret_str,strsize);
+   return rv;
+  }
+
+/****************************/
+/* CreateMultifieldBuilder: */
+/****************************/
+MultifieldBuilder *CreateMultifieldBuilder(
+  Environment *theEnv,
+  size_t theSize)
+  {
+   MultifieldBuilder *theMB;
+   
+   theMB = get_struct(theEnv,multifieldBuilder);
+   
+   theMB->mbEnv = theEnv;
+   theMB->bufferReset = theSize;
+   theMB->bufferMaximum = theSize;
+   theMB->length = 0;
+   
+   if (theSize == 0)
+     { theMB->contents = NULL; }
+   else
+     { theMB->contents = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * theSize); }
+   
+   return theMB;
+  }
+
+/*********************/
+/* MBAppendUDFValue: */
+/*********************/
+void MBAppendUDFValue(
+  MultifieldBuilder *theMB,
+  UDFValue *theValue)
+  {
+   Environment *theEnv = theMB->mbEnv;
+   size_t i, neededSize, newSize;
+   size_t j;
+   CLIPSValue *newArray;
+
+   /*==============================================*/
+   /* A void value can't be added to a multifield. */
+   /*==============================================*/
+   
+   if (theValue->header->type == VOID_TYPE)
+     { return; }
+
+   /*=======================================*/
+   /* Determine the amount of space needed. */
+   /*=======================================*/
+   
+   if (theValue->header->type == MULTIFIELD_TYPE)
+     {
+      if (theValue->range == 0)
+        { return; }
+        
+      neededSize = theMB->length + theValue->range;
+     }
+   else
+     { neededSize = theMB->length + 1; }
+
+   /*============================================*/
+   /* Increase the size of the buffer if needed. */
+   /*============================================*/
+   
+   if (neededSize > theMB->bufferMaximum)
+     {
+      newSize = neededSize * 2;
+      
+      newArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * newSize);
+      
+      for (i = 0; i < theMB->length; i++)
+        { newArray[i] = theMB->contents[i]; }
+        
+      if (theMB->bufferMaximum != 0)
+        { rm(theMB->mbEnv,theMB->contents,sizeof(CLIPSValue) * theMB->bufferMaximum); }
+        
+      theMB->bufferMaximum = newSize;
+      theMB->contents = newArray;
+     }
+     
+   /*===================================*/
+   /* Copy the new values to the array. */
+   /*===================================*/
+
+   if (theValue->header->type == MULTIFIELD_TYPE)
+     {
+      for (j = theValue->begin; j < (theValue->begin +theValue->range); j++)
+        {
+         theMB->contents[theMB->length].value = theValue->multifieldValue->contents[j].value;
+         Retain(theEnv,theMB->contents[theMB->length].header);
+         theMB->length++;
+        }
+     }
+   else
+     {
+      theMB->contents[theMB->length].value = theValue->value;
+      Retain(theEnv,theMB->contents[theMB->length].header);
+      theMB->length++;
+     }
+  }
+
+/*************/
+/* MBAppend: */
+/*************/
+void MBAppend(
+  MultifieldBuilder *theMB,
+  CLIPSValue *theValue)
+  {
+   Environment *theEnv = theMB->mbEnv;
+   size_t i, neededSize, newSize;
+   size_t j;
+   CLIPSValue *newArray;
+
+   /*==============================================*/
+   /* A void value can't be added to a multifield. */
+   /*==============================================*/
+   
+   if (theValue->header->type == VOID_TYPE)
+     { return; }
+
+   /*=======================================*/
+   /* Determine the amount of space needed. */
+   /*=======================================*/
+   
+   if (theValue->header->type == MULTIFIELD_TYPE)
+     {
+      if (theValue->multifieldValue->length == 0)
+        { return; }
+        
+      neededSize = theMB->length + theValue->multifieldValue->length;
+     }
+   else
+     { neededSize = theMB->length + 1; }
+
+   /*============================================*/
+   /* Increase the size of the buffer if needed. */
+   /*============================================*/
+   
+   if (neededSize > theMB->bufferMaximum)
+     {
+      newSize = neededSize * 2;
+      
+      newArray = (CLIPSValue *) gm2(theEnv,sizeof(CLIPSValue) * newSize);
+      
+      for (i = 0; i < theMB->length; i++)
+        { newArray[i] = theMB->contents[i]; }
+        
+      if (theMB->bufferMaximum != 0)
+        { rm(theMB->mbEnv,theMB->contents,sizeof(CLIPSValue) * theMB->bufferMaximum); }
+        
+      theMB->bufferMaximum = newSize;
+      theMB->contents = newArray;
+     }
+     
+   /*===================================*/
+   /* Copy the new values to the array. */
+   /*===================================*/
+
+   if (theValue->header->type == MULTIFIELD_TYPE)
+     {
+      for (j = 0; j < theValue->multifieldValue->length; j++)
+        {
+         theMB->contents[theMB->length].value = theValue->multifieldValue->contents[j].value;
+         Retain(theEnv,theMB->contents[theMB->length].header);
+         theMB->length++;
+        }
+     }
+   else
+     {
+      theMB->contents[theMB->length].value = theValue->value;
+      Retain(theEnv,theMB->contents[theMB->length].header);
+      theMB->length++;
+     }
+  }
+
+/*************************/
+/* MBAppendCLIPSInteger: */
+/*************************/
+void MBAppendCLIPSInteger(
+  MultifieldBuilder *theMB,
+  CLIPSInteger *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.integerValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/********************/
+/* MBAppendInteger: */
+/********************/
+void MBAppendInteger(
+  MultifieldBuilder *theMB,
+  long long intValue)
+  {
+   CLIPSValue theValue;
+   CLIPSInteger *pv = CreateInteger(theMB->mbEnv,intValue);
+   
+   theValue.integerValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/***********************/
+/* MBAppendCLIPSFloat: */
+/***********************/
+void MBAppendCLIPSFloat(
+  MultifieldBuilder *theMB,
+  CLIPSFloat *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.floatValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/******************/
+/* MBAppendFloat: */
+/******************/
+void MBAppendFloat(
+  MultifieldBuilder *theMB,
+  double floatValue)
+  {
+   CLIPSValue theValue;
+   CLIPSFloat *pv = CreateFloat(theMB->mbEnv,floatValue);
+   
+   theValue.floatValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/************************/
+/* MBAppendCLIPSLexeme: */
+/************************/
+void MBAppendCLIPSLexeme(
+  MultifieldBuilder *theMB,
+  CLIPSLexeme *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.lexemeValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/*******************/
+/* MBAppendSymbol: */
+/*******************/
+void MBAppendSymbol(
+  MultifieldBuilder *theMB,
+  const char *strValue)
+  {
+   CLIPSValue theValue;
+   CLIPSLexeme *pv = CreateSymbol(theMB->mbEnv,strValue);
+   
+   theValue.lexemeValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/*******************/
+/* MBAppendString: */
+/*******************/
+void MBAppendString(
+  MultifieldBuilder *theMB,
+  const char *strValue)
+  {
+   CLIPSValue theValue;
+   CLIPSLexeme *pv = CreateString(theMB->mbEnv,strValue);
+   
+   theValue.lexemeValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/*************************/
+/* MBAppendInstanceName: */
+/*************************/
+void MBAppendInstanceName(
+  MultifieldBuilder *theMB,
+  const char *strValue)
+  {
+   CLIPSValue theValue;
+   CLIPSLexeme *pv = CreateInstanceName(theMB->mbEnv,strValue);
+   
+   theValue.lexemeValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/*********************************/
+/* MBAppendCLIPSExternalAddress: */
+/*********************************/
+void MBAppendCLIPSExternalAddress(
+  MultifieldBuilder *theMB,
+  CLIPSExternalAddress *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.externalAddressValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/*****************/
+/* MBAppendFact: */
+/*****************/
+void MBAppendFact(
+  MultifieldBuilder *theMB,
+  Fact *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.factValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/*********************/
+/* MBAppendInstance: */
+/*********************/
+void MBAppendInstance(
+  MultifieldBuilder *theMB,
+  Instance *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.instanceValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/***********************/
+/* MBAppendMultifield: */
+/***********************/
+void MBAppendMultifield(
+  MultifieldBuilder *theMB,
+  Multifield *pv)
+  {
+   CLIPSValue theValue;
+   
+   theValue.multifieldValue = pv;
+   MBAppend(theMB,&theValue);
+  }
+
+/*************/
+/* MBCreate: */
+/*************/
+Multifield *MBCreate(
+  MultifieldBuilder *theMB)
+  {
+   size_t i;
+   Multifield *rv;
+   
+   rv = CreateMultifield(theMB->mbEnv,theMB->length);
+   
+   if (rv == NULL) return NULL;
+   
+   for (i = 0; i < theMB->length; i++)
+     {
+      rv->contents[i].value = theMB->contents[i].value;
+      Release(theMB->mbEnv,rv->contents[i].header);
+     }
+
+   theMB->length = 0;
+   
+   return rv;
+  }
+
+/************/
+/* MBReset: */
+/************/
+void MBReset(
+  MultifieldBuilder *theMB)
+  {
+   size_t i;
+   
+   for (i = 0; i < theMB->length; i++)
+     { Release(theMB->mbEnv,theMB->contents[i].header); }
+     
+   if (theMB->bufferReset != theMB->bufferMaximum)
+     {
+      if (theMB->bufferMaximum != 0)
+        { rm(theMB->mbEnv,theMB->contents,sizeof(CLIPSValue) * theMB->bufferMaximum); }
+      
+      if (theMB->bufferReset == 0)
+        { theMB->contents = NULL; }
+      else
+        { theMB->contents = (CLIPSValue *) gm2(theMB->mbEnv,sizeof(CLIPSValue) * theMB->bufferReset); }
+      
+      theMB->bufferMaximum = theMB->bufferReset;
+     }
+     
+   theMB->length = 0;
+  }
+
+/**************/
+/* MBDispose: */
+/**************/
+void MBDispose(
+  MultifieldBuilder *theMB)
+  {
+   Environment *theEnv = theMB->mbEnv;
+   size_t i;
+   
+   for (i = 0; i < theMB->length; i++)
+     { Release(theMB->mbEnv,theMB->contents[i].header); }
+   
+   if (theMB->bufferMaximum != 0)
+     { rm(theMB->mbEnv,theMB->contents,sizeof(CLIPSValue) * theMB->bufferMaximum); }
+     
+   rtn_struct(theEnv,multifieldBuilder,theMB);
+  }
diff --git a/clips/multifld.h b/clips/multifld.h
new file mode 100755
index 000000000..2998119c3
--- /dev/null
+++ b/clips/multifld.h
@@ -0,0 +1,130 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/17/17            */
+   /*                                                     */
+   /*                MULTIFIELD HEADER FILE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for creating and manipulating           */
+/*   multifield values.                                      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*            Moved ImplodeMultifield from multifun.c.       */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Used DataObjectToString instead of             */
+/*            ValueToString in implode$ to handle            */
+/*            print representation of external addresses.    */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Fixed issue with StoreInMultifield when        */
+/*            asserting void values in implied deftemplate   */
+/*            facts.                                         */
+/*                                                           */
+/*      6.40: Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_multifld
+
+#pragma once
+
+#define _H_multifld
+
+#include "entities.h"
+
+typedef struct multifieldBuilder MultifieldBuilder;
+
+struct multifieldBuilder
+  {
+   Environment *mbEnv;
+   CLIPSValue *contents;
+   size_t bufferReset;
+   size_t length;
+   size_t bufferMaximum;
+  };
+
+   Multifield                    *CreateUnmanagedMultifield(Environment *,size_t);
+   void                           ReturnMultifield(Environment *,Multifield *);
+   void                           RetainMultifield(Environment *,Multifield *);
+   void                           ReleaseMultifield(Environment *,Multifield *);
+   void                           IncrementCLIPSValueMultifieldReferenceCount(Environment *,Multifield *);
+   void                           DecrementCLIPSValueMultifieldReferenceCount(Environment *,Multifield *);
+   Multifield                    *StringToMultifield(Environment *,const char *);
+   Multifield                    *CreateMultifield(Environment *,size_t);
+   void                           AddToMultifieldList(Environment *,Multifield *);
+   void                           FlushMultifields(Environment *);
+   void                           DuplicateMultifield(Environment *,UDFValue *,UDFValue *);
+   void                           WriteMultifield(Environment *,const char *,Multifield *);
+   void                           PrintMultifieldDriver(Environment *,const char *,Multifield *,size_t,size_t,bool);
+   bool                           MultifieldDOsEqual(UDFValue *,UDFValue *);
+   void                           StoreInMultifield(Environment *,UDFValue *,Expression *,bool);
+   Multifield                    *CopyMultifield(Environment *,Multifield *);
+   bool                           MultifieldsEqual(Multifield *,Multifield *);
+   Multifield                    *DOToMultifield(Environment *,UDFValue *);
+   size_t                         HashMultifield(Multifield *,size_t);
+   Multifield                    *GetMultifieldList(Environment *);
+   CLIPSLexeme                   *ImplodeMultifield(Environment *,UDFValue *);
+   void                           EphemerateMultifield(Environment *,Multifield *);
+   Multifield                    *ArrayToMultifield(Environment *,CLIPSValue *,unsigned long);
+   void                           NormalizeMultifield(Environment *,UDFValue *);
+   void                           CLIPSToUDFValue(CLIPSValue *,UDFValue *);
+   void                           UDFToCLIPSValue(Environment *,UDFValue *,CLIPSValue *);
+   MultifieldBuilder             *CreateMultifieldBuilder(Environment *,size_t);
+   void                           MBReset(MultifieldBuilder *);
+   void                           MBDispose(MultifieldBuilder *);
+   void                           MBAppend(MultifieldBuilder *theMB,CLIPSValue *);
+   Multifield                    *MBCreate(MultifieldBuilder *);
+   Multifield                    *EmptyMultifield(Environment *);
+   void                           MBAppendCLIPSInteger(MultifieldBuilder *,CLIPSInteger *);
+   void                           MBAppendInteger(MultifieldBuilder *,long long);
+   void                           MBAppendCLIPSFloat(MultifieldBuilder *,CLIPSFloat *);
+   void                           MBAppendFloat(MultifieldBuilder *,double);
+   void                           MBAppendCLIPSLexeme(MultifieldBuilder *,CLIPSLexeme *);
+   void                           MBAppendSymbol(MultifieldBuilder *,const char *);
+   void                           MBAppendString(MultifieldBuilder *,const char *);
+   void                           MBAppendInstanceName(MultifieldBuilder *,const char *);
+   void                           MBAppendCLIPSExternalAddress(MultifieldBuilder *,CLIPSExternalAddress *);
+   void                           MBAppendFact(MultifieldBuilder *,Fact *);
+   void                           MBAppendInstance(MultifieldBuilder *,Instance *);
+   void                           MBAppendMultifield(MultifieldBuilder *,Multifield *);
+   void                           MBAppendUDFValue(MultifieldBuilder *theMB,UDFValue *);
+
+#endif /* _H_multifld */
+
+
+
+
diff --git a/clips/multifun.c b/clips/multifun.c
new file mode 100755
index 000000000..73f46722c
--- /dev/null
+++ b/clips/multifun.c
@@ -0,0 +1,1713 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/09/18             */
+   /*                                                     */
+   /*             MULTIFIELD FUNCTIONS MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for several multifield         */
+/*   functions including first$, rest$, subseq$, delete$,    */
+/*   delete-member$, replace-member$, replace$, insert$,     */
+/*   explode$, implode$, nth$, member$, subsetp and progn$.  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian Dantes                                         */
+/*      Barry Cameron                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Moved ImplodeMultifield to multifld.c.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Fixed memory leaks when error occurred.        */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when DEFMODULE_CONSTRUCT   */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed member, mv-replace, mv-subseq,         */
+/*            mv-delete, str-implode, str-explode, subset,   */
+/*            and nth functions.                             */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*            The explode$ function via StringToMultifield   */
+/*            now converts non-primitive value tokens        */
+/*            (such as parentheses) to symbols rather than   */
+/*            strings.                                       */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if MULTIFIELD_FUNCTIONS || OBJECT_SYSTEM
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "multifun.h"
+#if OBJECT_SYSTEM
+#include "object.h"
+#endif
+#include "pprint.h"
+#include "prcdrpsr.h"
+#include "prcdrfun.h"
+#include "prntutil.h"
+#include "router.h"
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+#include "scanner.h"
+#endif
+#include "utility.h"
+
+/**************/
+/* STRUCTURES */
+/**************/
+
+typedef struct fieldVarStack
+  {
+   unsigned short type;
+   void *value;
+   size_t index;
+   struct fieldVarStack *nxt;
+  } FIELD_VAR_STACK;
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if MULTIFIELD_FUNCTIONS
+   static bool                    MVRangeCheck(size_t,size_t,size_t *,unsigned int);
+   static void                    MultifieldPrognDriver(UDFContext *,UDFValue *,const char *);
+#if (! BLOAD_ONLY)
+   static struct expr            *MultifieldPrognParser(Environment *,struct expr *,const char *);
+   static struct expr            *ForeachParser(Environment *,struct expr *,const char *);
+   static void                    ReplaceMvPrognFieldVars(Environment *,CLIPSLexeme *,struct expr *,int);
+#endif /* (! BLOAD_ONLY) && (! RUN_TIME) */
+#endif /* MULTIFIELD_FUNCTIONS */
+   static void                    MVRangeErrorSizet(Environment *,size_t,size_t,size_t,const char *);
+#endif /* MULTIFIELD_FUNCTIONS || OBJECT_SYSTEM */
+
+/***************************************/
+/* LOCAL INTERNAL VARIABLE DEFINITIONS */
+/***************************************/
+
+#if MULTIFIELD_FUNCTIONS
+
+#define MULTIFUN_DATA 10
+
+struct multiFunctionData
+  {
+   FIELD_VAR_STACK *FieldVarStack;
+  };
+
+#define MultiFunctionData(theEnv) ((struct multiFunctionData *) GetEnvironmentData(theEnv,MULTIFUN_DATA))
+
+/**********************************************/
+/* MultifieldFunctionDefinitions: Initializes */
+/*   the multifield functions.                */
+/**********************************************/
+void MultifieldFunctionDefinitions(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,MULTIFUN_DATA,sizeof(struct multiFunctionData),NULL);
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"first$","m",1,1,"m",FirstFunction,"FirstFunction",NULL);
+   AddUDF(theEnv,"rest$","m",1,1,"m",RestFunction,"RestFunction",NULL);
+   AddUDF(theEnv,"subseq$","m",3,3,"l;m",SubseqFunction,"SubseqFunction",NULL);
+   AddUDF(theEnv,"delete-member$","m",2,UNBOUNDED,"*;m",DeleteMemberFunction,"DeleteMemberFunction",NULL);
+   AddUDF(theEnv,"replace-member$","m",3,UNBOUNDED,"*;m",ReplaceMemberFunction,"ReplaceMemberFunction",NULL);
+   AddUDF(theEnv,"delete$","m",3,3,"l;m",DeleteFunction,"DeleteFunction",NULL);
+   AddUDF(theEnv,"replace$","m",4,UNBOUNDED,"*;m;l;l",ReplaceFunction,"ReplaceFunction",NULL);
+   AddUDF(theEnv,"insert$","m",3,UNBOUNDED,"*;m;l",InsertFunction,"InsertFunction",NULL);
+   AddUDF(theEnv,"explode$","m",1,1,"s",ExplodeFunction,"ExplodeFunction",NULL);
+   AddUDF(theEnv,"implode$","s",1,1,"m",ImplodeFunction,"ImplodeFunction",NULL);
+   AddUDF(theEnv,"nth$","synldife",2,2,";l;m",NthFunction,"NthFunction",NULL);
+   AddUDF(theEnv,"member$","blm",2,2,";*;m",MemberFunction,"MemberFunction",NULL);
+   AddUDF(theEnv,"subsetp","b",2,2,";m;m",SubsetpFunction,"SubsetpFunction",NULL);
+   AddUDF(theEnv,"progn$","*",0,UNBOUNDED,NULL,MultifieldPrognFunction,"MultifieldPrognFunction",NULL);
+   AddUDF(theEnv,"foreach","*",0,UNBOUNDED,NULL,ForeachFunction,"ForeachFunction",NULL);
+   FuncSeqOvlFlags(theEnv,"progn$",false,false);
+   FuncSeqOvlFlags(theEnv,"foreach",false,false);
+   AddUDF(theEnv,"(get-progn$-field)","*",0,0,NULL,GetMvPrognField,"GetMvPrognField",NULL);
+   AddUDF(theEnv,"(get-progn$-index)","l",0,0,NULL,GetMvPrognIndex,"GetMvPrognIndex",NULL);
+#endif
+
+#if ! BLOAD_ONLY
+   AddFunctionParser(theEnv,"progn$",MultifieldPrognParser);
+   AddFunctionParser(theEnv,"foreach",ForeachParser);
+#endif
+  }
+
+/****************************************/
+/* DeleteFunction: H/L access routine   */
+/*   for the delete$ function.          */
+/****************************************/
+void DeleteFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue value1, value2, value3;
+   long long start, end;
+   size_t rs, re, srcLen, dstLen, i, j;
+
+   /*=======================================*/
+   /* Check for the correct argument types. */
+   /*=======================================*/
+
+   if ((! UDFFirstArgument(context,MULTIFIELD_BIT,&value1)) ||
+       (! UDFNextArgument(context,INTEGER_BIT,&value2)) ||
+       (! UDFNextArgument(context,INTEGER_BIT,&value3)))
+     { return; }
+
+   /*===========================================*/
+   /* Verify the start and end index arguments. */
+   /*===========================================*/
+
+   start = value2.integerValue->contents;
+   end = value3.integerValue->contents;
+
+   if ((end < start) || (start < 1) || (end < 1) ||
+       (((long long) ((size_t) start)) != start) ||
+       (((long long) ((size_t) end)) != end))
+     {
+      MVRangeError(theEnv,start,end,value1.range,"delete$");
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+      
+   /*============================================*/
+   /* Convert the indices to unsigned zero-based */
+   /* values including the begin value.          */
+   /*============================================*/
+   
+   rs = (size_t) start;
+   re = (size_t) end;
+   srcLen = value1.range;
+   
+   if ((rs > srcLen) || (re > srcLen))
+     {
+      MVRangeError(theEnv,start,end,value1.range,"delete$");
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+     
+   rs--;
+   re--;
+   rs += value1.begin;
+   re += value1.begin;
+   
+   /*=================================================*/
+   /* Delete the section out of the multifield value. */
+   /*=================================================*/
+
+   dstLen = srcLen - (re - rs + 1);
+   returnValue->begin = 0;
+   returnValue->range = dstLen;
+   returnValue->multifieldValue = CreateMultifield(theEnv,dstLen);
+
+   for (i = value1.begin, j = 0; i < (value1.begin + value1.range); i++)
+     {
+      if ((i >= rs) && (i <= re)) continue;
+      
+      returnValue->multifieldValue->contents[j++].value = value1.multifieldValue->contents[i].value;
+     }
+  }
+
+/*****************************************/
+/* ReplaceFunction: H/L access routine   */
+/*   for the replace$ function.          */
+/*****************************************/
+void ReplaceFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue value1, value2, value3, value4;
+   Expression *fieldarg;
+   long long start, end;
+   size_t rs, re, srcLen, dstLen;
+   size_t i, j, k;
+
+   /*=======================================*/
+   /* Check for the correct argument types. */
+   /*=======================================*/
+
+   if ((! UDFFirstArgument(context,MULTIFIELD_BIT,&value1)) ||
+       (! UDFNextArgument(context,INTEGER_BIT,&value2)) ||
+       (! UDFNextArgument(context,INTEGER_BIT,&value3)))
+     { return; }
+
+   /*===============================*/
+   /* Create the replacement value. */
+   /*===============================*/
+
+   fieldarg = GetFirstArgument()->nextArg->nextArg->nextArg;
+   if (fieldarg->nextArg != NULL)
+     { StoreInMultifield(theEnv,&value4,fieldarg,true); }
+   else
+     { EvaluateExpression(theEnv,fieldarg,&value4); }
+     
+   /*===========================================*/
+   /* Verify the start and end index arguments. */
+   /*===========================================*/
+
+   start = value2.integerValue->contents; // TBD Refactor
+   end = value3.integerValue->contents;
+
+   if ((end < start) || (start < 1) || (end < 1) ||
+       (((long long) ((size_t) start)) != start) ||
+       (((long long) ((size_t) end)) != end))
+     {
+      MVRangeError(theEnv,start,end,value1.range,"replace$");
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+  
+   /*============================================*/
+   /* Convert the indices to unsigned zero-based */
+   /* values including the begin value.          */
+   /*============================================*/
+   
+   rs = (size_t) start;
+   re = (size_t) end;
+   srcLen = value1.range;
+   
+   if ((rs > srcLen) || (re > srcLen))
+     {
+      MVRangeError(theEnv,start,end,value1.range,"replace$");
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+     
+   rs--;
+   re--;
+   rs += value1.begin;
+   re += value1.begin;
+  
+   /*=================================================*/
+   /* Delete the section out of the multifield value. */
+   /*=================================================*/
+
+   if (value4.header->type == MULTIFIELD_TYPE) // TBD Refactor
+     { dstLen = srcLen - (re - rs + 1) + value4.range; }
+   else
+     { dstLen = srcLen - (re - rs); }
+     
+   returnValue->begin = 0;
+   returnValue->range = dstLen;
+   returnValue->multifieldValue = CreateMultifield(theEnv,dstLen);
+
+   for (i = value1.begin, j = 0; i < (value1.begin + value1.range); i++)
+     {
+      if (i == rs)
+        {
+         if (value4.header->type == MULTIFIELD_TYPE)
+           {
+            for (k = value4.begin; k < (value4.begin + value4.range); k++)
+              { returnValue->multifieldValue->contents[j++].value = value4.multifieldValue->contents[k].value; }
+           }
+         else
+           { returnValue->multifieldValue->contents[j++].value = value4.value; }
+           
+         continue;
+        }
+      else if ((i > rs) && (i <= re))
+        { continue; }
+      
+      returnValue->multifieldValue->contents[j++].value = value1.multifieldValue->contents[i].value;
+     }
+  }
+
+/**********************************************/
+/* DeleteMemberFunction: H/L access routine   */
+/*   for the delete-member$ function.         */
+/**********************************************/
+void DeleteMemberFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue resultValue, valueSought;
+   unsigned int argCnt;
+   size_t i, j, k, valueSoughtLength;
+   size_t rs, re;
+   Multifield *update;
+
+   /*============================================*/
+   /* Check for the correct number of arguments. */
+   /*============================================*/
+
+   argCnt = UDFArgumentCount(context);
+
+   /*=======================================*/
+   /* Check for the correct argument types. */
+   /*=======================================*/
+
+   if (! UDFFirstArgument(context,MULTIFIELD_BIT,&resultValue))
+     { return; }
+
+   /*===================================================*/
+   /* For every value specified, delete all occurrences */
+   /* of those values from the multifield.              */
+   /*===================================================*/
+
+   for (i = 2 ; i <= argCnt ; i++)
+     {
+      if (! UDFNextArgument(context,ANY_TYPE_BITS,&valueSought))
+        {
+         SetEvaluationError(theEnv,true);
+         SetMultifieldErrorValue(theEnv,returnValue);
+         return;
+        }
+        
+      if (valueSought.header->type == MULTIFIELD_TYPE)
+        {
+         valueSoughtLength = valueSought.range;
+         if (valueSoughtLength == 0) continue;
+        }
+      else
+        { valueSoughtLength = 1; }
+        
+      while ((rs = FindValueInMultifield(&valueSought,&resultValue)) != VALUE_NOT_FOUND)  // TBD Refactor
+        {
+         update = CreateMultifield(theEnv,resultValue.range - valueSoughtLength);
+         re = rs + valueSoughtLength - 1;
+         
+         for (j = resultValue.begin, k = 0; j < (resultValue.begin + resultValue.range); j++)
+            {
+             if ((j >= rs) && (j <= re)) continue;
+      
+             update->contents[k++].value = resultValue.multifieldValue->contents[j].value;
+            }
+            
+         resultValue.multifieldValue = update;
+         resultValue.begin = 0;
+         resultValue.range = resultValue.range - valueSoughtLength;
+        }
+     }
+
+   returnValue->multifieldValue = resultValue.multifieldValue;
+   returnValue->begin = resultValue.begin;
+   returnValue->range = resultValue.range;
+  }
+
+/***********************************************/
+/* ReplaceMemberFunction: H/L access routine   */
+/*   for the replace-member$ function.         */
+/***********************************************/
+void ReplaceMemberFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue resultValue,replVal,*delVals,tmpVal;
+   unsigned int i, argCnt;
+   unsigned delSize;
+   size_t j, k;
+   size_t mink[2], *minkp;
+   size_t replLen = 1;
+
+   /*============================================*/
+   /* Check for the correct number of arguments. */
+   /*============================================*/
+
+   argCnt = UDFArgumentCount(context);
+
+   /*=======================================*/
+   /* Check for the correct argument types. */
+   /*=======================================*/
+
+   if (! UDFFirstArgument(context,MULTIFIELD_BIT,&resultValue))
+     { return; }
+
+   if (! UDFNextArgument(context,ANY_TYPE_BITS,&replVal))
+     { return; }
+     
+   if (replVal.header->type == MULTIFIELD_TYPE)
+     replLen = replVal.range;
+
+   /*======================================================*/
+   /* For the value (or values from multifield) specified, */
+   /* replace all occurrences of those values with all     */
+   /* values specified.                                    */
+   /*======================================================*/
+
+   delSize = (sizeof(UDFValue) * (argCnt-2));
+   delVals = (UDFValue *) gm2(theEnv,delSize);
+
+   for (i = 3 ; i <= argCnt ; i++)
+     {
+      if (! UDFNthArgument(context,i,ANY_TYPE_BITS,&delVals[i-3]))
+        {
+         rm(theEnv,delVals,delSize);
+         return;
+        }
+     }
+   minkp = NULL;
+   while (FindDOsInSegment(delVals,argCnt-2,&resultValue,&j,&k,minkp,minkp ? 1 : 0))
+     {
+      if (ReplaceMultiValueFieldSizet(theEnv,&tmpVal,&resultValue,j,k,
+                                 &replVal,"replace-member$") == false)
+        {
+         rm(theEnv,delVals,delSize);
+         SetEvaluationError(theEnv,true);
+         SetMultifieldErrorValue(theEnv,returnValue);
+         return;
+        }
+      GenCopyMemory(UDFValue,1,&resultValue,&tmpVal);
+      mink[0] = 1;
+      mink[1] = j + replLen - 1;
+      minkp = mink;
+     }
+   rm(theEnv,delVals,delSize);
+   GenCopyMemory(UDFValue,1,returnValue,&resultValue);
+  }
+
+/****************************************/
+/* InsertFunction: H/L access routine   */
+/*   for the insert$ function.          */
+/****************************************/
+void InsertFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue value1, value2, value3;
+   Expression *fieldarg;
+   long long theIndex;
+   size_t uindex;
+
+   /*=======================================*/
+   /* Check for the correct argument types. */
+   /*=======================================*/
+
+   if ((! UDFFirstArgument(context,MULTIFIELD_BIT,&value1)) ||
+       (! UDFNextArgument(context,INTEGER_BIT,&value2)))
+     { return; }
+
+   /*=============================*/
+   /* Create the insertion value. */
+   /*=============================*/
+
+   fieldarg = GetFirstArgument()->nextArg->nextArg;
+   if (fieldarg->nextArg != NULL)
+     StoreInMultifield(theEnv,&value3,fieldarg,true);
+   else
+     EvaluateExpression(theEnv,fieldarg,&value3);
+
+   /*============================*/
+   /* Coerce the index argument. */
+   /*============================*/
+   
+   theIndex = value2.integerValue->contents;
+   
+   if ((((long long) ((size_t) theIndex)) != theIndex) ||
+       (theIndex < 1))
+ 	 {
+      MVRangeError(theEnv,theIndex,theIndex,value1.range,"insert$");
+	  return;
+	 }
+     
+   uindex = (size_t) theIndex;
+
+   /*===========================================*/
+   /* Insert the value in the multifield value. */
+   /*===========================================*/
+
+   if (InsertMultiValueField(theEnv,returnValue,&value1,uindex,
+                             &value3,"insert$") == false)
+     {
+      SetEvaluationError(theEnv,true);
+      SetMultifieldErrorValue(theEnv,returnValue);
+     }
+  }
+
+/*****************************************/
+/* ExplodeFunction: H/L access routine   */
+/*   for the explode$ function.          */
+/*****************************************/
+void ExplodeFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue value;
+   Multifield *theMultifield;
+   size_t end;
+
+   /*==================================*/
+   /* The argument should be a string. */
+   /*==================================*/
+
+   if (! UDFFirstArgument(context,STRING_BIT,&value))
+     { return; }
+
+   /*=====================================*/
+   /* Convert the string to a multifield. */
+   /*=====================================*/
+
+   theMultifield = StringToMultifield(theEnv,value.lexemeValue->contents);
+   if (theMultifield == NULL)
+     {
+      theMultifield = CreateMultifield(theEnv,0L);
+      end = 0;
+     }
+   else
+     { end = theMultifield->length; }
+
+   /*========================*/
+   /* Return the multifield. */
+   /*========================*/
+
+   returnValue->begin = 0;
+   returnValue->range = end;
+   returnValue->value = theMultifield;
+  }
+
+/*****************************************/
+/* ImplodeFunction: H/L access routine   */
+/*   for the implode$ function.          */
+/*****************************************/
+void ImplodeFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   /*======================================*/
+   /* The argument should be a multifield. */
+   /*======================================*/
+
+   if (! UDFFirstArgument(context,MULTIFIELD_BIT,&theArg))
+     { return; }
+
+   /*====================*/
+   /* Return the string. */
+   /*====================*/
+
+   returnValue->value = ImplodeMultifield(theEnv,&theArg);
+  }
+
+/****************************************/
+/* SubseqFunction: H/L access routine   */
+/*   for the subseq$ function.          */
+/****************************************/
+void SubseqFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Multifield *theList;
+   long long start, end; /* 6.04 Bug Fix */
+   size_t offset, length;
+   size_t ustart, uend;
+
+   /*===================================*/
+   /* Get the segment to be subdivided. */
+   /*===================================*/
+
+   if (! UDFFirstArgument(context,MULTIFIELD_BIT,&theArg))
+     { return; }
+
+   theList = theArg.multifieldValue;
+   offset = theArg.begin;
+   length = theArg.range;
+
+   /*=============================================*/
+   /* Get range arguments. If they are not within */
+   /* appropriate ranges, return a null segment.  */
+   /*=============================================*/
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+     { return; }
+
+   start = theArg.integerValue->contents;
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+     { return; }
+     
+   end = theArg.integerValue->contents;
+
+   if ((end < 1) || (end < start))
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+
+   /*==================================================*/
+   /* Adjust lengths to conform to segment boundaries. */
+   /*==================================================*/
+     
+   if (start < 1) start = 1;
+   
+   if (((long long) ((size_t) start)) == start)
+     { ustart = (size_t) start; }
+   else
+     { ustart = SIZE_MAX; }
+   
+   if (ustart > length)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+
+   if (((long long) ((size_t) end)) == end)
+     { uend = (size_t) end; }
+   else
+     { uend = SIZE_MAX; }
+     
+   if (uend > length) uend = length;
+
+   /*=========================*/
+   /* Return the new segment. */
+   /*=========================*/
+
+   returnValue->value = theList;
+   returnValue->range = ((uend - ustart) + 1);
+   returnValue->begin = (offset + ustart - 1);
+  }
+
+/***************************************/
+/* FirstFunction: H/L access routine   */
+/*   for the first$ function.          */
+/***************************************/
+void FirstFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Multifield *theList;
+
+   /*===================================*/
+   /* Get the segment to be subdivided. */
+   /*===================================*/
+
+   if (! UDFFirstArgument(context,MULTIFIELD_BIT,&theArg)) return;
+
+   theList = theArg.multifieldValue;
+
+   /*=========================*/
+   /* Return the new segment. */
+   /*=========================*/
+
+   returnValue->value = theList;
+   if (theArg.range >= 1)
+     { returnValue->range = 1; }
+   else
+     { returnValue->range = 0; }
+   returnValue->begin = theArg.begin;
+  }
+
+/**************************************/
+/* RestFunction: H/L access routine   */
+/*   for the rest$ function.          */
+/**************************************/
+void RestFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   Multifield *theList;
+
+   /*===================================*/
+   /* Get the segment to be subdivided. */
+   /*===================================*/
+
+   if (! UDFFirstArgument(context,MULTIFIELD_BIT,&theArg)) return;
+
+   theList = theArg.multifieldValue;
+
+   /*=========================*/
+   /* Return the new segment. */
+   /*=========================*/
+
+   returnValue->value = theList;
+   
+   if (theArg.range > 0)
+     {
+      returnValue->begin = theArg.begin + 1;
+      returnValue->range = theArg.range - 1;
+     }
+   else
+     {
+      returnValue->begin = theArg.begin;
+      returnValue->range = theArg.range;
+     }
+  }
+
+/*************************************/
+/* NthFunction: H/L access routine   */
+/*   for the nth$ function.          */
+/*************************************/
+void NthFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue value1, value2;
+   Multifield *elm_ptr;
+   long long n; /* 6.04 Bug Fix */
+   size_t un;
+
+   if ((! UDFFirstArgument(context,INTEGER_BIT,&value1)) ||
+	   (! UDFNextArgument(context,MULTIFIELD_BIT,&value2)))
+     { return; }
+
+   n = value1.integerValue->contents; /* 6.04 Bug Fix */
+   
+   if (((long long) ((size_t) n)) != n)
+ 	 {
+      returnValue->lexemeValue = CreateSymbol(theEnv,"nil");
+	  return;
+	 }
+   un = (size_t) n;
+   
+   if ((un > value2.range) || (un < 1))
+	 {
+      returnValue->lexemeValue = CreateSymbol(theEnv,"nil");
+	  return;
+	 }
+
+   elm_ptr = value2.multifieldValue;
+   returnValue->value = elm_ptr->contents[value2.begin + un - 1].value;
+  }
+
+/* ------------------------------------------------------------------
+ *    SubsetFunction:
+ *               This function compares two multi-field variables
+ *               to see if the first is a subset of the second. It
+ *               does not consider order.
+ *
+ *    INPUTS:    Two arguments via argument stack. First is the sublist
+ *               multi-field variable, the second is the list to be
+ *               compared to. Both should be of type MULTIFIELD_TYPE.
+ *
+ *    OUTPUTS:   True if the first list is a subset of the
+ *               second, else false
+ *
+ *    NOTES:     This function is called from H/L with the subset
+ *               command. Repeated values in the sublist must also
+ *               be repeated in the main list.
+ * ------------------------------------------------------------------
+ */
+
+void SubsetpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item1, item2;
+   size_t i, j;
+   bool found;
+
+   if (! UDFFirstArgument(context,MULTIFIELD_BIT,&item1))
+     { return; }
+
+   if (! UDFNextArgument(context,MULTIFIELD_BIT,&item2))
+     { return; }
+
+   if (item1.range == 0)
+     {
+      returnValue->lexemeValue = TrueSymbol(theEnv);
+      return;
+     }
+
+   if (item2.range == 0)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   for (i = item1.begin; i < (item1.begin + item1.range); i++)
+     {
+      found = false;
+      
+      for (j = item2.begin; j < (item2.begin + item2.range); j++)
+        {
+         if (item1.multifieldValue->contents[i].value == item2.multifieldValue->contents[j].value)
+           {
+            found = true;
+            break;
+           }
+        }
+        
+      if (! found)
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/**************************************/
+/* MemberFunction: H/L access routine */
+/*   for the member$ function.        */
+/**************************************/
+void MemberFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item1, item2;
+   size_t i, pos;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&item1)) return;
+
+   if (! UDFNextArgument(context,MULTIFIELD_BIT,&item2)) return;
+
+   /*==========================================*/
+   /* Member sought is not a multifield value. */
+   /*==========================================*/
+   
+   if (item1.header->type != MULTIFIELD_TYPE)
+     {
+      for (i = item2.begin; i < (item2.begin + item2.range); i++)
+        {
+         if (item1.value == item2.multifieldValue->contents[i].value)
+           {
+            returnValue->integerValue = CreateInteger(theEnv,(long long) (i + 1));
+            return;
+           }
+        }
+      return;
+     }
+   
+   /*=====================================*/
+   /* Multifield sought can not be larger */
+   /* than the multifield being searched. */
+   /*=====================================*/
+   
+   if (item1.range > item2.range) return;
+   
+   /*================================================*/
+   /* Search for the first multifield in the second. */
+   /*================================================*/
+   
+   pos = FindValueInMultifield(&item1,&item2);
+   
+   if (pos == VALUE_NOT_FOUND) return;
+      
+   if (item1.range == 1)
+     { returnValue->integerValue = CreateInteger(theEnv,(long long) (pos + 1)); }
+   else
+     {
+      returnValue->value = CreateMultifield(theEnv,2);
+      returnValue->multifieldValue->contents[0].integerValue = CreateInteger(theEnv,(long long) (pos + 1));
+      returnValue->multifieldValue->contents[1].integerValue = CreateInteger(theEnv,(long long) (pos + item1.range));
+      returnValue->begin = 0;
+      returnValue->range = 2;
+     }
+  }
+
+/**************************/
+/* FindValueInMultifield: */
+/**************************/
+size_t FindValueInMultifield(
+  UDFValue *valueSought,
+  UDFValue *multifieldToSearch)
+  {
+   size_t i, j;
+   bool found;
+
+   /*==========================================*/
+   /* Member sought is not a multifield value. */
+   /*==========================================*/
+   
+   if (valueSought->header->type != MULTIFIELD_TYPE)
+     {
+      for (i = multifieldToSearch->begin; i < (multifieldToSearch->begin + multifieldToSearch->range); i++)
+        {
+         if (valueSought->value == multifieldToSearch->multifieldValue->contents[i].value)
+           { return i; }
+        }
+        
+      return VALUE_NOT_FOUND;
+     }
+   
+   /*=====================================*/
+   /* Multifield sought can not be larger */
+   /* than the multifield being searched. */
+   /*=====================================*/
+   
+   if (valueSought->range > multifieldToSearch->range) return VALUE_NOT_FOUND;
+   
+   /*================================================*/
+   /* Search for the first multifield in the second. */
+   /*================================================*/
+   
+   for (i = 0; i <= (multifieldToSearch->range - valueSought->range); i++)
+     {
+      found = true;
+      for (j = 0; j < valueSought->range; j++)
+        {
+         if (valueSought->multifieldValue->contents[valueSought->begin+j].value !=
+             multifieldToSearch->multifieldValue->contents[multifieldToSearch->begin+i+j].value)
+           {
+            found = false;
+            break;
+           }
+        }
+        
+      if (found)
+        { return i; }
+     }
+
+   return VALUE_NOT_FOUND;
+  }
+
+/*********************/
+/* FindDOsInSegment: */
+/*********************/
+/* 6.05 Bug Fix */
+bool FindDOsInSegment(
+  UDFValue *searchDOs,
+  unsigned int scnt,
+  UDFValue *value,
+  size_t *si,
+  size_t *ei,
+  size_t *excludes,
+  unsigned int epaircnt)
+  {
+   size_t slen;
+   unsigned int j;
+   size_t i, k, mul_length;
+
+   mul_length = value->range;
+   for (i = 0 ; i < mul_length ; i++)
+     {
+      for (j = 0 ; j < scnt ; j++)
+        {
+         if (searchDOs[j].header->type == MULTIFIELD_TYPE)
+           {
+            slen = searchDOs[j].range;
+            
+            if (MVRangeCheck(i+1,i+slen,excludes,epaircnt))
+              {
+               for (k = 0L ; (k < slen) && ((k + i) < mul_length) ; k++)
+                 if (searchDOs[j].multifieldValue->contents[k+searchDOs[j].begin].value !=
+                     value->multifieldValue->contents[k+i+value->begin].value)
+                   break;
+               if (k >= slen)
+                 {
+                  *si = i + 1;
+                  *ei = i + slen;
+                  return true;
+                 }
+              }
+           }
+         else if ((searchDOs[j].value == value->multifieldValue->contents[i + value->begin].value) &&
+                  MVRangeCheck(i+1L,i+1L,excludes,epaircnt))
+           {
+            *si = *ei = i + 1;
+            return true;
+           }
+        }
+     }
+
+   return false;
+  }
+
+/*****************/
+/* MVRangeCheck: */
+/*****************/
+static bool MVRangeCheck(
+  size_t si,
+  size_t ei,
+  size_t *elist,
+  unsigned int epaircnt)
+{
+  unsigned int i;
+
+  if (!elist || !epaircnt)
+    return true;
+  for (i = 0 ; i < epaircnt ; i++)
+    if (((si >= elist[i*2]) && (si <= elist[i*2+1])) ||
+        ((ei >= elist[i*2]) && (ei <= elist[i*2+1])))
+    return false;
+
+  return true;
+}
+
+#if (! BLOAD_ONLY)
+
+/******************************************************/
+/* MultifieldPrognParser: Parses the progn$ function. */
+/******************************************************/
+static struct expr *MultifieldPrognParser(
+  Environment *theEnv,
+  struct expr *top,
+  const char *infile)
+  {
+   struct BindInfo *oldBindList, *newBindList, *prev;
+   struct token tkn;
+   struct expr *tmp;
+   CLIPSLexeme *fieldVar = NULL;
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,infile,&tkn);
+
+   /* ================================
+      Simple form: progn$ <mf-exp> ...
+      ================================ */
+   if (tkn.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      top->argList = ParseAtomOrExpression(theEnv,infile,&tkn);
+      if (top->argList == NULL)
+        {
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+     }
+   else
+     {
+      GetToken(theEnv,infile,&tkn);
+      if (tkn.tknType != SF_VARIABLE_TOKEN)
+        {
+         if (tkn.tknType != SYMBOL_TOKEN)
+           goto MvPrognParseError;
+         top->argList = Function2Parse(theEnv,infile,tkn.lexemeValue->contents);
+         if (top->argList == NULL)
+           {
+            ReturnExpression(theEnv,top);
+            return NULL;
+           }
+        }
+
+      /* =========================================
+         Complex form: progn$ (<var> <mf-exp>) ...
+         ========================================= */
+      else
+        {
+         fieldVar = tkn.lexemeValue;
+         SavePPBuffer(theEnv," ");
+         top->argList = ParseAtomOrExpression(theEnv,infile,NULL);
+         if (top->argList == NULL)
+           {
+            ReturnExpression(theEnv,top);
+            return NULL;
+           }
+         GetToken(theEnv,infile,&tkn);
+         if (tkn.tknType != RIGHT_PARENTHESIS_TOKEN)
+           goto MvPrognParseError;
+         PPBackup(theEnv);
+         /* PPBackup(theEnv); */
+         SavePPBuffer(theEnv,tkn.printForm);
+         SavePPBuffer(theEnv," ");
+        }
+     }
+
+   if (CheckArgumentAgainstRestriction(theEnv,top->argList,MULTIFIELD_BIT))
+     goto MvPrognParseError;
+
+   oldBindList = GetParsedBindNames(theEnv);
+   SetParsedBindNames(theEnv,NULL);
+   IncrementIndentDepth(theEnv,3);
+   ExpressionData(theEnv)->BreakContext = true;
+   ExpressionData(theEnv)->ReturnContext = ExpressionData(theEnv)->svContexts->rtn;
+   PPCRAndIndent(theEnv);
+   top->argList->nextArg = GroupActions(theEnv,infile,&tkn,true,NULL,false);
+   DecrementIndentDepth(theEnv,3);
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,tkn.printForm);
+   if (top->argList->nextArg == NULL)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+   tmp = top->argList->nextArg;
+   top->argList->nextArg = tmp->argList;
+   tmp->argList = NULL;
+   ReturnExpression(theEnv,tmp);
+   newBindList = GetParsedBindNames(theEnv);
+   prev = NULL;
+   while (newBindList != NULL)
+     {
+      if ((fieldVar == NULL) ? false :
+          (strcmp(newBindList->name->contents,fieldVar->contents) == 0))
+        {
+         ClearParsedBindNames(theEnv);
+         SetParsedBindNames(theEnv,oldBindList);
+         PrintErrorID(theEnv,"MULTIFUN",2,false);
+         WriteString(theEnv,STDERR,"Cannot rebind field variable in function 'progn$'.\n");
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+      prev = newBindList;
+      newBindList = newBindList->next;
+     }
+   if (prev == NULL)
+     SetParsedBindNames(theEnv,oldBindList);
+   else
+     prev->next = oldBindList;
+   if (fieldVar != NULL)
+     ReplaceMvPrognFieldVars(theEnv,fieldVar,top->argList->nextArg,0);
+   return(top);
+
+MvPrognParseError:
+   SyntaxErrorMessage(theEnv,"progn$");
+   ReturnExpression(theEnv,top);
+   return NULL;
+  }
+
+/***********************************************/
+/* ForeachParser: Parses the foreach function. */
+/***********************************************/
+static struct expr *ForeachParser(
+  Environment *theEnv,
+  struct expr *top,
+  const char *infile)
+  {
+   struct BindInfo *oldBindList,*newBindList,*prev;
+   struct token tkn;
+   struct expr *tmp;
+   CLIPSLexeme *fieldVar;
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,infile,&tkn);
+
+   if (tkn.tknType != SF_VARIABLE_TOKEN)
+     { goto ForeachParseError; }
+
+   fieldVar = tkn.lexemeValue;
+   SavePPBuffer(theEnv," ");
+   top->argList = ParseAtomOrExpression(theEnv,infile,NULL);
+   if (top->argList == NULL)
+     {
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   if (CheckArgumentAgainstRestriction(theEnv,top->argList,MULTIFIELD_BIT))
+     goto ForeachParseError;
+
+   oldBindList = GetParsedBindNames(theEnv);
+   SetParsedBindNames(theEnv,NULL);
+   IncrementIndentDepth(theEnv,3);
+   ExpressionData(theEnv)->BreakContext = true;
+   ExpressionData(theEnv)->ReturnContext = ExpressionData(theEnv)->svContexts->rtn;
+   PPCRAndIndent(theEnv);
+   top->argList->nextArg = GroupActions(theEnv,infile,&tkn,true,NULL,false);
+   DecrementIndentDepth(theEnv,3);
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,tkn.printForm);
+   if (top->argList->nextArg == NULL)
+     {
+      ClearParsedBindNames(theEnv);
+      SetParsedBindNames(theEnv,oldBindList);
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+   tmp = top->argList->nextArg;
+   top->argList->nextArg = tmp->argList;
+   tmp->argList = NULL;
+   ReturnExpression(theEnv,tmp);
+   newBindList = GetParsedBindNames(theEnv);
+   prev = NULL;
+   while (newBindList != NULL)
+     {
+      if ((fieldVar == NULL) ? false :
+          (strcmp(newBindList->name->contents,fieldVar->contents) == 0))
+        {
+         ClearParsedBindNames(theEnv);
+         SetParsedBindNames(theEnv,oldBindList);
+         PrintErrorID(theEnv,"MULTIFUN",2,false);
+         WriteString(theEnv,STDERR,"Cannot rebind field variable in function 'foreach'.\n");
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+      prev = newBindList;
+      newBindList = newBindList->next;
+     }
+   if (prev == NULL)
+     SetParsedBindNames(theEnv,oldBindList);
+   else
+     prev->next = oldBindList;
+   if (fieldVar != NULL)
+     ReplaceMvPrognFieldVars(theEnv,fieldVar,top->argList->nextArg,0);
+   return(top);
+
+ForeachParseError:
+   SyntaxErrorMessage(theEnv,"foreach");
+   ReturnExpression(theEnv,top);
+   return NULL;
+  }
+
+/**********************************************/
+/* ReplaceMvPrognFieldVars: Replaces variable */
+/*   references found in the progn$ function. */
+/**********************************************/
+static void ReplaceMvPrognFieldVars(
+  Environment *theEnv,
+  CLIPSLexeme *fieldVar,
+  struct expr *theExp,
+  int depth)
+  {
+   size_t flen;
+
+   flen = strlen(fieldVar->contents);
+   while (theExp != NULL)
+     {
+      if ((theExp->type != SF_VARIABLE) ? false :
+          (strncmp(theExp->lexemeValue->contents,fieldVar->contents,
+                   (STD_SIZE) flen) == 0))
+        {
+         if (theExp->lexemeValue->contents[flen] == '\0')
+           {
+            theExp->type = FCALL;
+            theExp->value = FindFunction(theEnv,"(get-progn$-field)");
+            theExp->argList = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,depth));
+           }
+         else if (strcmp(theExp->lexemeValue->contents + flen,"-index") == 0)
+           {
+            theExp->type = FCALL;
+            theExp->value = FindFunction(theEnv,"(get-progn$-index)");
+            theExp->argList = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,depth));
+           }
+        }
+      else if (theExp->argList != NULL)
+        {
+         if ((theExp->type == FCALL) && ((theExp->value == (void *) FindFunction(theEnv,"progn$")) ||
+                                        (theExp->value == (void *) FindFunction(theEnv,"foreach")) ))
+           ReplaceMvPrognFieldVars(theEnv,fieldVar,theExp->argList,depth+1);
+         else
+           ReplaceMvPrognFieldVars(theEnv,fieldVar,theExp->argList,depth);
+        }
+      theExp = theExp->nextArg;
+     }
+  }
+
+#endif /* (! BLOAD_ONLY) */
+
+/*****************************************/
+/* MultifieldPrognFunction: H/L access   */
+/*   routine for the progn$ function.    */
+/*****************************************/
+void MultifieldPrognFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   MultifieldPrognDriver(context,returnValue,"progn$");
+  }
+
+/***************************************/
+/* ForeachFunction: H/L access routine */
+/*   for the foreach function.         */
+/***************************************/
+void ForeachFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   MultifieldPrognDriver(context,returnValue,"foreach");
+  }
+
+/*******************************************/
+/* MultifieldPrognDriver: Driver routine   */
+/*   for the progn$ and foreach functions. */
+/******************************************/
+static void MultifieldPrognDriver(
+  UDFContext *context,
+  UDFValue *returnValue,
+  const char *functionName)
+  {
+   Expression *theExp;
+   UDFValue argval;
+   size_t i, end;
+   FIELD_VAR_STACK *tmpField;
+   GCBlock gcb;
+   Environment *theEnv = context->environment;
+
+   tmpField = get_struct(theEnv,fieldVarStack);
+   tmpField->type = SYMBOL_TYPE;
+   tmpField->value = FalseSymbol(theEnv);
+   tmpField->nxt = MultiFunctionData(theEnv)->FieldVarStack;
+   MultiFunctionData(theEnv)->FieldVarStack = tmpField;
+   returnValue->value = FalseSymbol(theEnv);
+
+   if (! UDFFirstArgument(context,MULTIFIELD_BIT,&argval))
+     {
+      MultiFunctionData(theEnv)->FieldVarStack = tmpField->nxt;
+      rtn_struct(theEnv,fieldVarStack,tmpField);
+      returnValue->value = FalseSymbol(theEnv);
+      return;
+     }
+
+   GCBlockStart(theEnv,&gcb);
+
+   end = argval.begin + argval.range;
+   for (i = argval.begin; i < end; i++)
+     {
+      tmpField->type = argval.multifieldValue->contents[i].header->type;
+      tmpField->value = argval.multifieldValue->contents[i].value;
+      tmpField->index = 1 + i - argval.begin;
+      for (theExp = GetFirstArgument()->nextArg ; theExp != NULL ; theExp = theExp->nextArg)
+        {
+         EvaluateExpression(theEnv,theExp,returnValue);
+
+         if (EvaluationData(theEnv)->HaltExecution || ProcedureFunctionData(theEnv)->BreakFlag || ProcedureFunctionData(theEnv)->ReturnFlag)
+           {
+            ProcedureFunctionData(theEnv)->BreakFlag = false;
+            if (EvaluationData(theEnv)->HaltExecution)
+              {
+               returnValue->value = FalseSymbol(theEnv);
+              }
+            MultiFunctionData(theEnv)->FieldVarStack = tmpField->nxt;
+            rtn_struct(theEnv,fieldVarStack,tmpField);
+            GCBlockEndUDF(theEnv,&gcb,returnValue);
+            return;
+           }
+
+         /*===================================*/
+         /* Garbage collect if this isn't the */
+         /* last evaluation of the progn$.    */
+         /*===================================*/
+
+         if (((i + 1) < end) || (theExp->nextArg != NULL))
+           {
+            CleanCurrentGarbageFrame(theEnv,NULL);
+            CallPeriodicTasks(theEnv);
+           }
+        }
+     }
+
+   ProcedureFunctionData(theEnv)->BreakFlag = false;
+   MultiFunctionData(theEnv)->FieldVarStack = tmpField->nxt;
+   rtn_struct(theEnv,fieldVarStack,tmpField);
+
+   GCBlockEndUDF(theEnv,&gcb,returnValue);
+   CallPeriodicTasks(theEnv);
+  }
+
+/*******************/
+/* GetMvPrognField */
+/*******************/
+void GetMvPrognField(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   long long depth;
+   FIELD_VAR_STACK *tmpField;
+
+   depth = GetFirstArgument()->integerValue->contents;
+   tmpField = MultiFunctionData(theEnv)->FieldVarStack;
+   while (depth > 0)
+     {
+      tmpField = tmpField->nxt;
+      depth--;
+     }
+   returnValue->value = tmpField->value;
+  }
+
+/*******************/
+/* GetMvPrognIndex */
+/*******************/
+void GetMvPrognIndex(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   long long depth;
+   FIELD_VAR_STACK *tmpField;
+
+   depth = GetFirstArgument()->integerValue->contents;
+   tmpField = MultiFunctionData(theEnv)->FieldVarStack;
+   while (depth > 0)
+     {
+      tmpField = tmpField->nxt;
+      depth--;
+     }
+     
+   returnValue->integerValue = CreateInteger(theEnv,(long long) tmpField->index);
+  }
+
+#endif /* MULTIFIELD_FUNCTIONS */
+
+#if OBJECT_SYSTEM || MULTIFIELD_FUNCTIONS
+
+bool ReplaceMultiValueFieldSizet(
+  Environment *theEnv,
+  UDFValue *dst,
+  UDFValue *src,
+  size_t rb,
+  size_t re,
+  UDFValue *field,
+  const char *funcName)
+  {
+   size_t i, j, k;
+   CLIPSValue *deptr;
+   CLIPSValue *septr;
+   size_t srclen, dstlen;
+   size_t urb, ure;
+
+   srclen = ((src != NULL) ? src->range : 0);
+   if ((re < rb) ||
+	   (rb < 1) || (re < 1) ||
+	   (rb > srclen) || (re > srclen))
+	 {
+	  MVRangeErrorSizet(theEnv,rb,re,srclen,funcName);
+	  return false;
+	 }
+     
+   rb = src->begin + rb - 1;
+   re = src->begin + re - 1;
+   
+   if (field->header->type == MULTIFIELD_TYPE)
+	 dstlen = (size_t) (srclen + field->range - (re-rb+1));
+   else
+	 dstlen = (size_t) (srclen + 1 - (re-rb+1));
+   dst->begin = 0;
+   dst->value = CreateMultifield(theEnv,dstlen);
+   dst->range = dstlen;
+   
+   urb = (size_t) rb;
+   ure = (size_t) re;
+   
+   for (i = 0 , j = src->begin ; j < urb ; i++ , j++)
+	 {
+	  deptr = &dst->multifieldValue->contents[i];
+	  septr = &src->multifieldValue->contents[j];
+	  deptr->value = septr->value;
+	 }
+   if (field->header->type != MULTIFIELD_TYPE)
+	 {
+	  deptr = &dst->multifieldValue->contents[i++];
+	  deptr->value = field->value;
+	 }
+   else
+	 {
+	  for (k = field->begin ; k < (field->begin + field->range) ; k++ , i++)
+		{
+		 deptr = &dst->multifieldValue->contents[i];
+		 septr = &field->multifieldValue->contents[k];
+		 deptr->value = septr->value;
+		}
+	 }
+   while (j < ure)
+	 j++;
+   for (j++ ; i < dstlen ; i++ , j++)
+	 {
+	  deptr = &dst->multifieldValue->contents[i];
+	  septr = &src->multifieldValue->contents[j];
+	  deptr->value = septr->value;
+	 }
+   return true;
+  }
+
+/**************************************************************************
+  NAME         : InsertMultiValueField
+  DESCRIPTION  : Performs an insert on the src multi-field value
+                   storing the results in the dst multi-field value
+  INPUTS       : 1) The destination value buffer
+                 2) The source value (can be NULL)
+                 3) The index for the change
+                 4) The new field value
+  RETURNS      : True if successful, false otherwise
+  SIDE EFFECTS : Allocates and sets a ephemeral segment (even if new
+                   number of fields is 0)
+                 Src value segment is not changed
+  NOTES        : index is NOT guaranteed to be valid
+                 src is guaranteed to be a multi-field variable or NULL
+ **************************************************************************/
+bool InsertMultiValueField(
+  Environment *theEnv,
+  UDFValue *dst,
+  UDFValue *src,
+  size_t theIndex,
+  UDFValue *field,
+  const char *funcName)
+  {
+   size_t i, j, k;
+   CLIPSValue *deptr, *septr;
+   size_t srclen, dstlen;
+
+   srclen = ((src != NULL) ? src->range : 0);
+
+   if (theIndex > (srclen + 1))
+     { theIndex = (srclen + 1); }
+     
+   dst->begin = 0;
+   if (src == NULL)
+     {
+      if (field->header->type == MULTIFIELD_TYPE)
+        {
+         DuplicateMultifield(theEnv,dst,field);
+         AddToMultifieldList(theEnv,dst->multifieldValue);
+        }
+      else
+        {
+         dst->value = CreateMultifield(theEnv,0L);
+         dst->range = 1;
+         deptr = &dst->multifieldValue->contents[0];
+         deptr->value = field->value;
+        }
+      return true;
+     }
+   dstlen = (field->header->type == MULTIFIELD_TYPE) ? field->range + srclen : srclen + 1;
+   dst->value = CreateMultifield(theEnv,dstlen);
+   dst->range = dstlen;
+   theIndex--;
+   for (i = 0 , j = src->begin ; i < (size_t) theIndex ; i++ , j++)
+     {
+      deptr = &dst->multifieldValue->contents[i];
+      septr = &src->multifieldValue->contents[j];
+      deptr->value = septr->value;
+     }
+   if (field->header->type != MULTIFIELD_TYPE)
+     {
+      deptr = &dst->multifieldValue->contents[theIndex];
+      deptr->value = field->value;
+      i++;
+     }
+   else
+     {
+      for (k = field->begin ; k < (field->begin + field->range) ; k++ , i++)
+        {
+         deptr = &dst->multifieldValue->contents[i];
+         septr = &field->multifieldValue->contents[k];
+         deptr->value = septr->value;
+        }
+     }
+   for ( ; j < (src->begin + src->range) ; i++ , j++)
+     {
+      deptr = &dst->multifieldValue->contents[i];
+      septr = &src->multifieldValue->contents[j];
+      deptr->value = septr->value;
+     }
+   return true;
+  }
+
+/*******************************************************
+  NAME         : MVRangeError
+  DESCRIPTION  : Prints out an error messages for index
+                   out-of-range errors in multi-field
+                   access functions
+  INPUTS       : 1) The bad range start
+                 2) The bad range end
+                 3) The max end of the range (min is
+                     assumed to be 1)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ******************************************************/
+void MVRangeError(
+  Environment *theEnv,
+  long long brb,
+  long long bre,
+  size_t max,
+  const char *funcName)
+  {
+   PrintErrorID(theEnv,"MULTIFUN",1,false);
+   WriteString(theEnv,STDERR,"Multifield index ");
+   if (brb == bre)
+     WriteInteger(theEnv,STDERR,brb);
+   else
+     {
+      WriteString(theEnv,STDERR,"range ");
+      WriteInteger(theEnv,STDERR,brb);
+      WriteString(theEnv,STDERR,"..");
+      WriteInteger(theEnv,STDERR,bre);
+     }
+   WriteString(theEnv,STDERR," out of range 1..");
+   PrintUnsignedInteger(theEnv,STDERR,max);
+   if (funcName != NULL)
+     {
+      WriteString(theEnv,STDERR," in function '");
+      WriteString(theEnv,STDERR,funcName);
+      WriteString(theEnv,STDERR,"'");
+     }
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+static void MVRangeErrorSizet(
+  Environment *theEnv,
+  size_t brb,
+  size_t bre,
+  size_t max,
+  const char *funcName)
+  {
+   PrintErrorID(theEnv,"MULTIFUN",1,false);
+   WriteString(theEnv,STDERR,"Multifield index ");
+   if (brb == bre)
+     PrintUnsignedInteger(theEnv,STDERR,brb);
+   else
+     {
+      WriteString(theEnv,STDERR,"range ");
+      PrintUnsignedInteger(theEnv,STDERR,brb);
+      WriteString(theEnv,STDERR,"..");
+      PrintUnsignedInteger(theEnv,STDERR,bre);
+     }
+   WriteString(theEnv,STDERR," out of range 1..");
+   PrintUnsignedInteger(theEnv,STDERR,max);
+   if (funcName != NULL)
+     {
+      WriteString(theEnv,STDERR," in function '");
+      WriteString(theEnv,STDERR,funcName);
+      WriteString(theEnv,STDERR,"'");
+     }
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+#endif /* OBJECT_SYSTEM || MULTIFIELD_FUNCTIONS */
diff --git a/clips/multifun.h b/clips/multifun.h
new file mode 100755
index 000000000..a6650fa71
--- /dev/null
+++ b/clips/multifun.h
@@ -0,0 +1,96 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*           MULTIFIELD_TYPE FUNCTIONS HEADER FILE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary Riley and Brian Dantes                          */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Moved ImplodeMultifield to multifld.c.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Fixed memory leaks when error occurred.        */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when DEFMODULE_CONSTRUCT   */
+/*            compiler flag is set to 0.                     */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_multifun
+
+#pragma once
+
+#define _H_multifun
+
+#include "evaluatn.h"
+
+#define VALUE_NOT_FOUND SIZE_MAX
+
+   void                    MultifieldFunctionDefinitions(Environment *);
+#if MULTIFIELD_FUNCTIONS
+   void                    DeleteFunction(Environment *,UDFContext *,UDFValue *);
+   void                    ReplaceFunction(Environment *,UDFContext *,UDFValue *);
+   void                    DeleteMemberFunction(Environment *,UDFContext *,UDFValue *);
+   void                    ReplaceMemberFunction(Environment *,UDFContext *,UDFValue *);
+   void                    InsertFunction(Environment *,UDFContext *,UDFValue *);
+   void                    ExplodeFunction(Environment *,UDFContext *,UDFValue *);
+   void                    ImplodeFunction(Environment *,UDFContext *,UDFValue *);
+   void                    SubseqFunction(Environment *,UDFContext *,UDFValue *);
+   void                    FirstFunction(Environment *,UDFContext *,UDFValue *);
+   void                    RestFunction(Environment *,UDFContext *,UDFValue *);
+   void                    NthFunction(Environment *,UDFContext *,UDFValue *);
+   void                    SubsetpFunction(Environment *,UDFContext *,UDFValue *);
+   void                    MemberFunction(Environment *,UDFContext *,UDFValue *);
+   void                    MultifieldPrognFunction(Environment *,UDFContext *,UDFValue *);
+   void                    ForeachFunction(Environment *,UDFContext *,UDFValue *);
+   void                    GetMvPrognField(Environment *,UDFContext *,UDFValue *);
+   void                    GetMvPrognIndex(Environment *,UDFContext *,UDFValue *);
+   bool                    FindDOsInSegment(UDFValue *,unsigned int,UDFValue *,
+                                            size_t *,size_t *,size_t *,unsigned int);
+#endif
+   bool                    ReplaceMultiValueFieldSizet(Environment *,UDFValue *,UDFValue *,
+                                                  size_t,size_t,UDFValue *,const char *);
+   bool                    InsertMultiValueField(Environment *,UDFValue *,UDFValue *,
+                                                 size_t,UDFValue *,const char *);
+   void                    MVRangeError(Environment *,long long,long long,size_t,const char *);
+   size_t                  FindValueInMultifield(UDFValue *,UDFValue *);
+
+#endif /* _H_multifun */
+
diff --git a/clips/network.h b/clips/network.h
new file mode 100755
index 000000000..00c3adf96
--- /dev/null
+++ b/clips/network.h
@@ -0,0 +1,142 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                 NETWORK HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added support for hashed memories.             */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_network
+
+#pragma once
+
+#define _H_network
+
+struct alphaMemoryHash;
+struct betaMemory;
+struct joinLink;
+struct joinNode;
+struct patternNodeHashEntry;
+typedef struct patternNodeHeader PatternNodeHeader;
+
+#include "entities.h"
+
+struct patternNodeHeader
+  {
+   struct alphaMemoryHash *firstHash;
+   struct alphaMemoryHash *lastHash;
+   struct joinNode *entryJoin;
+   Expression *rightHash;
+   unsigned int singlefieldNode : 1;
+   unsigned int multifieldNode : 1;
+   unsigned int stopNode : 1;
+   unsigned int initialize : 1;
+   unsigned int marked : 1;
+   unsigned int beginSlot : 1;
+   unsigned int endSlot : 1;
+   unsigned int selector : 1;
+  };
+
+#include "match.h"
+
+struct patternNodeHashEntry
+  {
+   void *parent;
+   void *child;
+   int type;
+   void *value;
+   struct patternNodeHashEntry *next;
+  };
+
+#define SIZE_PATTERN_HASH 16231
+
+struct alphaMemoryHash
+  {
+   unsigned long bucket;
+   struct patternNodeHeader *owner;
+   PartialMatch *alphaMemory;
+   PartialMatch *endOfQueue;
+   struct alphaMemoryHash *nextHash;
+   struct alphaMemoryHash *prevHash;
+   struct alphaMemoryHash *next;
+   struct alphaMemoryHash *prev;
+  };
+
+typedef struct alphaMemoryHash ALPHA_MEMORY_HASH;
+
+#ifndef _H_ruledef
+#include "ruledef.h"
+#endif
+
+#define INITIAL_BETA_HASH_SIZE 17
+
+struct betaMemory
+  {
+   unsigned long size;
+   unsigned long count;
+   struct partialMatch **beta;
+   struct partialMatch **last;
+  };
+
+struct joinLink
+  {
+   char enterDirection;
+   struct joinNode *join;
+   struct joinLink *next;
+   unsigned long bsaveID;
+  };
+
+struct joinNode
+  {
+   unsigned int firstJoin : 1;
+   unsigned int logicalJoin : 1;
+   unsigned int joinFromTheRight : 1;
+   unsigned int patternIsNegated : 1;
+   unsigned int patternIsExists : 1;
+   unsigned int initialize : 1;
+   unsigned int marked : 1;
+   unsigned int rhsType : 3;
+   unsigned int depth : 16;
+   unsigned long bsaveID;
+   long long memoryLeftAdds;
+   long long memoryRightAdds;
+   long long memoryLeftDeletes;
+   long long memoryRightDeletes;
+   long long memoryCompares;
+   struct betaMemory *leftMemory;
+   struct betaMemory *rightMemory;
+   Expression *networkTest;
+   Expression *secondaryNetworkTest;
+   Expression *leftHash;
+   Expression *rightHash;
+   void *rightSideEntryStructure;
+   struct joinLink *nextLinks;
+   struct joinNode *lastLevel;
+   struct joinNode *rightMatchNode;
+   Defrule *ruleToActivate;
+  };
+
+#endif /* _H_network */
+
+
+
+
diff --git a/clips/objbin.c b/clips/objbin.c
new file mode 100755
index 000000000..fd9cda382
--- /dev/null
+++ b/clips/objbin.c
@@ -0,0 +1,1509 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  02/03/18             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Binary Load/Save Functions for Classes and their */
+/*             message-handlers                              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS and        */
+/*            AUXILIARY_MESSAGE_HANDLERS compilation flags.  */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*      6.31: Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+
+#include <stdlib.h>
+
+#include "setup.h"
+
+#if OBJECT_SYSTEM && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+
+#include "bload.h"
+#include "bsave.h"
+#include "classcom.h"
+#include "classfun.h"
+#include "classini.h"
+#include "cstrcbin.h"
+#include "cstrnbin.h"
+#include "envrnmnt.h"
+#include "insfun.h"
+#include "memalloc.h"
+#include "modulbin.h"
+#include "msgcom.h"
+#include "msgfun.h"
+#include "prntutil.h"
+#include "router.h"
+
+#if DEFRULE_CONSTRUCT
+#include "objrtbin.h"
+#endif
+
+#include "objbin.h"
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+
+#define SlotIndex(p)             (((p) != NULL) ? (p)->bsaveIndex : ULONG_MAX)
+#define SlotNameIndex(p)         (p)->bsaveIndex
+
+#define LinkPointer(i)           (((i) == ULONG_MAX) ? NULL : (Defclass **) &ObjectBinaryData(theEnv)->LinkArray[i])
+#define SlotPointer(i)           (((i) == UINT_MAX) ? NULL : (SlotDescriptor *) &ObjectBinaryData(theEnv)->SlotArray[i])
+#define TemplateSlotPointer(i)   (((i) == ULONG_MAX) ? NULL : (SlotDescriptor **) &ObjectBinaryData(theEnv)->TmpslotArray[i])
+#define OrderedSlotPointer(i)    (((i) == ULONG_MAX) ? NULL : (unsigned *) &ObjectBinaryData(theEnv)->MapslotArray[i])
+#define SlotNamePointer(i)       ((SLOT_NAME *) &ObjectBinaryData(theEnv)->SlotNameArray[i])
+#define HandlerPointer(i)        (((i) == ULONG_MAX) ? NULL : &ObjectBinaryData(theEnv)->HandlerArray[i])
+#define OrderedHandlerPointer(i) (((i) == ULONG_MAX) ? NULL : (unsigned *) &ObjectBinaryData(theEnv)->MaphandlerArray[i])
+
+typedef struct bsaveDefclassModule
+  {
+   struct bsaveDefmoduleItemHeader header;
+  } BSAVE_DEFCLASS_MODULE;
+
+typedef struct bsavePackedClassLinks
+  {
+   unsigned long classCount;
+   unsigned long classArray;
+  } BSAVE_PACKED_CLASS_LINKS;
+
+typedef struct bsaveDefclass
+  {
+   struct bsaveConstructHeader header;
+   unsigned abstract : 1;
+   unsigned reactive : 1;
+   unsigned system   : 1;
+   unsigned short id;
+   BSAVE_PACKED_CLASS_LINKS directSuperclasses;
+   BSAVE_PACKED_CLASS_LINKS directSubclasses;
+   BSAVE_PACKED_CLASS_LINKS allSuperclasses;
+   unsigned short slotCount;
+   unsigned short localInstanceSlotCount;
+   unsigned short instanceSlotCount;
+   unsigned short maxSlotNameID;
+   unsigned short handlerCount;
+   unsigned long slots;
+   unsigned long instanceTemplate;
+   unsigned long slotNameMap;
+   unsigned long handlers;
+   unsigned long scopeMap;
+#if DEFRULE_CONSTRUCT
+   unsigned long relevant_terminal_alpha_nodes;
+#endif
+  } BSAVE_DEFCLASS;
+
+typedef struct bsaveSlotName
+  {
+   unsigned short id;
+   unsigned hashTableIndex;
+   unsigned long name;
+   unsigned long putHandlerName;
+  } BSAVE_SLOT_NAME;
+
+typedef struct bsaveSlotDescriptor
+  {
+   unsigned shared              : 1;
+   unsigned multiple            : 1;
+   unsigned composite           : 1;
+   unsigned noInherit           : 1;
+   unsigned noWrite             : 1;
+   unsigned initializeOnly      : 1;
+   unsigned dynamicDefault      : 1;
+   unsigned noDefault           : 1;
+   unsigned reactive            : 1;
+   unsigned publicVisibility    : 1;
+   unsigned createReadAccessor  : 1;
+   unsigned createWriteAccessor : 1;
+   unsigned long cls;
+   unsigned long slotName,
+        defaultValue,
+        constraint,
+        overrideMessage;
+  } BSAVE_SLOT_DESC;
+
+typedef struct bsaveMessageHandler
+  {
+   struct bsaveConstructHeader header;
+   unsigned system : 1;
+   unsigned type   : 2;
+   unsigned short minParams;
+   unsigned short maxParams;
+   unsigned short localVarCount;
+   unsigned long cls;
+   unsigned long actions;
+  } BSAVE_HANDLER;
+
+typedef struct handlerBsaveInfo
+  {
+   DefmessageHandler *handlers;
+   unsigned *handlerOrderMap;
+   unsigned handlerCount;
+  } HANDLER_BSAVE_INFO;
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+
+   static void                    BsaveObjectsFind(Environment *);
+   static void                    MarkDefclassItems(Environment *,ConstructHeader *,void *);
+   static void                    BsaveObjectsExpressions(Environment *,FILE *);
+   static void                    BsaveDefaultSlotExpressions(Environment *,ConstructHeader *,void *);
+   static void                    BsaveHandlerActionExpressions(Environment *,ConstructHeader *,void *);
+   static void                    BsaveStorageObjects(Environment *,FILE *);
+   static void                    BsaveObjects(Environment *,FILE *);
+   static void                    BsaveDefclass(Environment *,ConstructHeader *,void *);
+   static void                    BsaveClassLinks(Environment *,ConstructHeader *,void *);
+   static void                    BsaveSlots(Environment *,ConstructHeader *,void *);
+   static void                    BsaveTemplateSlots(Environment *,ConstructHeader *,void *);
+   static void                    BsaveSlotMap(Environment *,ConstructHeader *,void *);
+   static void                    BsaveHandlers(Environment *,ConstructHeader *,void *);
+   static void                    BsaveHandlerMap(Environment *,ConstructHeader *,void *);
+
+#endif
+
+   static void                    BloadStorageObjects(Environment *);
+   static void                    BloadObjects(Environment *);
+   static void                    UpdatePrimitiveClassesMap(Environment *);
+   static void                    UpdateDefclassModule(Environment *,void *,unsigned long);
+   static void                    UpdateDefclass(Environment *,void *,unsigned long);
+   static void                    UpdateLink(Environment *,void *,unsigned long);
+   static void                    UpdateSlot(Environment *,void *,unsigned long);
+   static void                    UpdateSlotName(Environment *,void *,unsigned long);
+   static void                    UpdateTemplateSlot(Environment *,void *,unsigned long);
+   static void                    UpdateHandler(Environment *,void *,unsigned long);
+   static void                    ClearBloadObjects(Environment *);
+   static void                    DeallocateObjectBinaryData(Environment *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : SetupObjectsBload
+  DESCRIPTION  : Initializes data structures and
+                   routines for binary loads of
+                   generic function constructs
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Routines defined and structures initialized
+  NOTES        : None
+ ***********************************************************/
+void SetupObjectsBload(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,OBJECTBIN_DATA,sizeof(struct objectBinaryData),DeallocateObjectBinaryData);
+
+   AddAbortBloadFunction(theEnv,"defclass",CreateSystemClasses,0,NULL);
+
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"defclass",0,BsaveObjectsFind,BsaveObjectsExpressions,
+                             BsaveStorageObjects,BsaveObjects,
+                             BloadStorageObjects,BloadObjects,
+                             ClearBloadObjects);
+#endif
+#if BLOAD || BLOAD_ONLY
+   AddBinaryItem(theEnv,"defclass",0,NULL,NULL,NULL,NULL,
+                             BloadStorageObjects,BloadObjects,
+                             ClearBloadObjects);
+#endif
+
+  }
+
+/*******************************************************/
+/* DeallocateObjectBinaryData: Deallocates environment */
+/*    data for object binary functionality.            */
+/*******************************************************/
+static void DeallocateObjectBinaryData(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long i;
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+
+   space = (sizeof(DEFCLASS_MODULE) * ObjectBinaryData(theEnv)->ModuleCount);
+   if (space != 0) genfree(theEnv,ObjectBinaryData(theEnv)->ModuleArray,space);
+
+   if (ObjectBinaryData(theEnv)->ClassCount != 0)
+     {
+      if (DefclassData(theEnv)->ClassIDMap != NULL)
+        { rm(theEnv,DefclassData(theEnv)->ClassIDMap,(sizeof(Defclass *) * DefclassData(theEnv)->AvailClassID)); }
+
+      for (i = 0L ; i < ObjectBinaryData(theEnv)->SlotCount ; i++)
+        {
+         if ((ObjectBinaryData(theEnv)->SlotArray[i].defaultValue != NULL) && (ObjectBinaryData(theEnv)->SlotArray[i].dynamicDefault == 0))
+           { rtn_struct(theEnv,udfValue,ObjectBinaryData(theEnv)->SlotArray[i].defaultValue); }
+        }
+
+      space = (sizeof(Defclass) * ObjectBinaryData(theEnv)->ClassCount);
+      if (space != 0L)
+        { genfree(theEnv,ObjectBinaryData(theEnv)->DefclassArray,space); }
+
+      space = (sizeof(Defclass *) * ObjectBinaryData(theEnv)->LinkCount);
+      if (space != 0L)
+        { genfree(theEnv,ObjectBinaryData(theEnv)->LinkArray,space); }
+
+      space = (sizeof(SlotDescriptor) * ObjectBinaryData(theEnv)->SlotCount);
+      if (space != 0L)
+        { genfree(theEnv,ObjectBinaryData(theEnv)->SlotArray,space); }
+
+      space = (sizeof(SLOT_NAME) * ObjectBinaryData(theEnv)->SlotNameCount);
+      if (space != 0L)
+        { genfree(theEnv,ObjectBinaryData(theEnv)->SlotNameArray,space); }
+
+      space = (sizeof(SlotDescriptor *) * ObjectBinaryData(theEnv)->TemplateSlotCount);
+      if (space != 0L)
+        { genfree(theEnv,ObjectBinaryData(theEnv)->TmpslotArray,space); }
+
+      space = (sizeof(unsigned) * ObjectBinaryData(theEnv)->SlotNameMapCount);
+      if (space != 0L)
+        { genfree(theEnv,ObjectBinaryData(theEnv)->MapslotArray,space); }
+     }
+
+   if (ObjectBinaryData(theEnv)->HandlerCount != 0L)
+     {
+      space = (sizeof(DefmessageHandler) * ObjectBinaryData(theEnv)->HandlerCount);
+      if (space != 0L)
+        {
+         genfree(theEnv,ObjectBinaryData(theEnv)->HandlerArray,space);
+         space = (sizeof(unsigned) * ObjectBinaryData(theEnv)->HandlerCount);
+         genfree(theEnv,ObjectBinaryData(theEnv)->MaphandlerArray,space);
+        }
+     }
+#endif
+  }
+
+/***************************************************
+  NAME         : BloadDefclassModuleReference
+  DESCRIPTION  : Returns a pointer to the
+                 appropriate defclass module
+  INPUTS       : The index of the module
+  RETURNS      : A pointer to the module
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+void *BloadDefclassModuleReference(
+  Environment *theEnv,
+  unsigned long theIndex)
+  {
+   return ((void *) &ObjectBinaryData(theEnv)->ModuleArray[theIndex]);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if BLOAD_AND_BSAVE
+
+/***************************************************************************
+  NAME         : BsaveObjectsFind
+  DESCRIPTION  : For all classes and their message-handlers, this routine
+                   marks all the needed symbols and system functions.
+                 Also, it also counts the number of expression structures
+                   needed.
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : ExpressionCount (a global from BSAVE.C) is incremented
+                   for every expression needed
+                 Symbols are marked in their structures
+  NOTES        : Also sets bsaveIndex for each class (assumes classes
+                   will be bsaved in order of binary list)
+ ***************************************************************************/
+static void BsaveObjectsFind(
+  Environment *theEnv)
+  {
+   unsigned i;
+   SLOT_NAME *snp;
+
+   /* ========================================================
+      The counts need to be saved in case a bload is in effect
+      ======================================================== */
+      SaveBloadCount(theEnv,ObjectBinaryData(theEnv)->ModuleCount);
+      SaveBloadCount(theEnv,ObjectBinaryData(theEnv)->ClassCount);
+      SaveBloadCount(theEnv,ObjectBinaryData(theEnv)->LinkCount);
+      SaveBloadCount(theEnv,ObjectBinaryData(theEnv)->SlotNameCount);
+      SaveBloadCount(theEnv,ObjectBinaryData(theEnv)->SlotCount);
+      SaveBloadCount(theEnv,ObjectBinaryData(theEnv)->TemplateSlotCount);
+      SaveBloadCount(theEnv,ObjectBinaryData(theEnv)->SlotNameMapCount);
+      SaveBloadCount(theEnv,ObjectBinaryData(theEnv)->HandlerCount);
+
+   ObjectBinaryData(theEnv)->ModuleCount= 0L;
+   ObjectBinaryData(theEnv)->ClassCount = 0L;
+   ObjectBinaryData(theEnv)->SlotCount = 0L;
+   ObjectBinaryData(theEnv)->SlotNameCount = 0L;
+   ObjectBinaryData(theEnv)->LinkCount = 0L;
+   ObjectBinaryData(theEnv)->TemplateSlotCount = 0L;
+   ObjectBinaryData(theEnv)->SlotNameMapCount = 0L;
+   ObjectBinaryData(theEnv)->HandlerCount = 0L;
+
+   /* ==============================================
+      Mark items needed by defclasses in all modules
+      ============================================== */
+      
+   ObjectBinaryData(theEnv)->ModuleCount = GetNumberOfDefmodules(theEnv);
+   
+   DoForAllConstructs(theEnv,MarkDefclassItems,
+                      DefclassData(theEnv)->DefclassModuleIndex,
+                      false,NULL);
+
+   /* =============================================
+      Mark items needed by canonicalized slot names
+      ============================================= */
+   for (i = 0 ; i < SLOT_NAME_TABLE_HASH_SIZE ; i++)
+     for (snp = DefclassData(theEnv)->SlotNameTable[i] ; snp != NULL ; snp = snp->nxt)
+       {
+        if ((snp->id != ISA_ID) && (snp->id != NAME_ID))
+          {
+           snp->bsaveIndex = ObjectBinaryData(theEnv)->SlotNameCount++;
+           snp->name->neededSymbol = true;
+           snp->putHandlerName->neededSymbol = true;
+          }
+       }
+  }
+
+/***************************************************
+  NAME         : MarkDefclassItems
+  DESCRIPTION  : Marks needed items for a defclass
+  INPUTS       : 1) The defclass
+                 2) User buffer (ignored)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Bsave indices set and needed
+                 ephemerals marked
+  NOTES        : None
+ ***************************************************/
+static void MarkDefclassItems(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+#if MAC_XCD
+#pragma unused(buf)
+#endif
+   Defclass *cls = (Defclass *) theDefclass;
+   long i;
+   Expression *tmpexp;
+
+   MarkConstructHeaderNeededItems(&cls->header,ObjectBinaryData(theEnv)->ClassCount++);
+   ObjectBinaryData(theEnv)->LinkCount += cls->directSuperclasses.classCount +
+                cls->directSubclasses.classCount +
+                cls->allSuperclasses.classCount;
+
+#if DEFMODULE_CONSTRUCT
+   cls->scopeMap->neededBitMap = true;
+#endif
+
+   /* ===================================================
+      Mark items needed by slot default value expressions
+      =================================================== */
+   for (i = 0 ; i < cls->slotCount ; i++)
+     {
+      cls->slots[i].bsaveIndex = ObjectBinaryData(theEnv)->SlotCount++;
+      cls->slots[i].overrideMessage->neededSymbol = true;
+      if (cls->slots[i].defaultValue != NULL)
+        {
+         if (cls->slots[i].dynamicDefault)
+           {
+            ExpressionData(theEnv)->ExpressionCount +=
+              ExpressionSize((Expression *) cls->slots[i].defaultValue);
+            MarkNeededItems(theEnv,(Expression *) cls->slots[i].defaultValue);
+           }
+         else
+           {
+            /* =================================================
+               Static default values are stotred as data objects
+               and must be converted into expressions
+               ================================================= */
+            tmpexp =
+              ConvertValueToExpression(theEnv,(UDFValue *) cls->slots[i].defaultValue);
+            ExpressionData(theEnv)->ExpressionCount += ExpressionSize(tmpexp);
+            MarkNeededItems(theEnv,tmpexp);
+            ReturnExpression(theEnv,tmpexp);
+           }
+        }
+     }
+
+   /* ========================================
+      Count canonical slots needed by defclass
+      ======================================== */
+   ObjectBinaryData(theEnv)->TemplateSlotCount += cls->instanceSlotCount;
+   if (cls->instanceSlotCount != 0)
+     ObjectBinaryData(theEnv)->SlotNameMapCount += cls->maxSlotNameID + 1;
+
+   /* ===============================================
+      Mark items needed by defmessage-handler actions
+      =============================================== */
+   for (i = 0 ; i < cls->handlerCount ; i++)
+     {
+      cls->handlers[i].header.name->neededSymbol = true;
+      ExpressionData(theEnv)->ExpressionCount += ExpressionSize(cls->handlers[i].actions);
+      MarkNeededItems(theEnv,cls->handlers[i].actions);
+     }
+   ObjectBinaryData(theEnv)->HandlerCount += cls->handlerCount;
+  }
+
+/***************************************************
+  NAME         : BsaveObjectsExpressions
+  DESCRIPTION  : Writes out all expressions needed
+                   by classes and handlers
+  INPUTS       : The file pointer of the binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : File updated
+  NOTES        : None
+ ***************************************************/
+static void BsaveObjectsExpressions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   if ((ObjectBinaryData(theEnv)->ClassCount == 0L) && (ObjectBinaryData(theEnv)->HandlerCount == 0L))
+     return;
+
+   /* ================================================
+      Save the defclass slot default value expressions
+      ================================================ */
+   DoForAllConstructs(theEnv,BsaveDefaultSlotExpressions,DefclassData(theEnv)->DefclassModuleIndex,
+                      false,fp);
+
+   /* ==============================================
+      Save the defmessage-handler action expressions
+      ============================================== */
+   DoForAllConstructs(theEnv,BsaveHandlerActionExpressions,DefclassData(theEnv)->DefclassModuleIndex,
+                      false,fp);
+  }
+
+/***************************************************
+  NAME         : BsaveDefaultSlotExpressions
+  DESCRIPTION  : Writes expressions for default
+                  slot values to binary file
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Slot value expressions written
+  NOTES        : None
+ ***************************************************/
+static void BsaveDefaultSlotExpressions(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+   long i;
+   Expression *tmpexp;
+
+   for (i = 0 ; i < cls->slotCount ; i++)
+     {
+      if (cls->slots[i].defaultValue != NULL)
+        {
+         if (cls->slots[i].dynamicDefault)
+           BsaveExpression(theEnv,(Expression *) cls->slots[i].defaultValue,(FILE *) buf);
+         else
+           {
+            /* =================================================
+               Static default values are stotred as data objects
+               and must be converted into expressions
+               ================================================= */
+            tmpexp =
+              ConvertValueToExpression(theEnv,(UDFValue *) cls->slots[i].defaultValue);
+            BsaveExpression(theEnv,tmpexp,(FILE *) buf);
+            ReturnExpression(theEnv,tmpexp);
+           }
+        }
+     }
+  }
+
+/***************************************************
+  NAME         : BsaveHandlerActionExpressions
+  DESCRIPTION  : Writes expressions for handler
+                  actions to binary file
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Handler actions expressions written
+  NOTES        : None
+ ***************************************************/
+static void BsaveHandlerActionExpressions(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+   long i;
+
+   for (i = 0 ; i < cls->handlerCount ; i++)
+     BsaveExpression(theEnv,cls->handlers[i].actions,(FILE *) buf);
+  }
+
+/*************************************************************************************
+  NAME         : BsaveStorageObjects
+  DESCRIPTION  : Writes out number of each type of structure required for COOL
+                 Space required for counts (unsigned long)
+                 Number of class modules (long)
+                 Number of classes (long)
+                 Number of links to classes (long)
+                 Number of slots (long)
+                 Number of instance template slots (long)
+                 Number of handlers (long)
+                 Number of definstances (long)
+  INPUTS       : File pointer of binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary file adjusted
+  NOTES        : None
+ *************************************************************************************/
+static void BsaveStorageObjects(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   long maxClassID;// TBD unsigned short
+
+   if ((ObjectBinaryData(theEnv)->ClassCount == 0L) && (ObjectBinaryData(theEnv)->HandlerCount == 0L))
+     {
+      space = 0L;
+      GenWrite(&space,sizeof(size_t),fp);
+      return;
+     }
+   space = sizeof(long) * 9;
+   GenWrite(&space,sizeof(size_t),fp); // 64-bit issue changed long to size_t
+   GenWrite(&ObjectBinaryData(theEnv)->ModuleCount,sizeof(long),fp);
+   GenWrite(&ObjectBinaryData(theEnv)->ClassCount,sizeof(long),fp);
+   GenWrite(&ObjectBinaryData(theEnv)->LinkCount,sizeof(long),fp);
+   GenWrite(&ObjectBinaryData(theEnv)->SlotNameCount,sizeof(long),fp);
+   GenWrite(&ObjectBinaryData(theEnv)->SlotCount,sizeof(long),fp);
+   GenWrite(&ObjectBinaryData(theEnv)->TemplateSlotCount,sizeof(long),fp);
+   GenWrite(&ObjectBinaryData(theEnv)->SlotNameMapCount,sizeof(long),fp);
+   GenWrite(&ObjectBinaryData(theEnv)->HandlerCount,sizeof(long),fp);
+   maxClassID = DefclassData(theEnv)->MaxClassID;
+   GenWrite(&maxClassID,sizeof(long),fp);
+  }
+
+/*************************************************************************************
+  NAME         : BsaveObjects
+  DESCRIPTION  : Writes out classes and message-handlers in binary format
+                 Space required (unsigned long)
+                 Followed by the data structures in order
+  INPUTS       : File pointer of binary file
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary file adjusted
+  NOTES        : None
+ *************************************************************************************/
+static void BsaveObjects(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   Defmodule *theModule;
+   DEFCLASS_MODULE *theModuleItem;
+   BSAVE_DEFCLASS_MODULE dummy_mitem;
+   BSAVE_SLOT_NAME dummy_slot_name;
+   SLOT_NAME *snp;
+   unsigned i;
+
+   if ((ObjectBinaryData(theEnv)->ClassCount == 0L) && (ObjectBinaryData(theEnv)->HandlerCount == 0L))
+     {
+      space = 0L;
+      GenWrite(&space,sizeof(size_t),fp);
+      return;
+     }
+   space = (ObjectBinaryData(theEnv)->ModuleCount * sizeof(BSAVE_DEFCLASS_MODULE)) +
+           (ObjectBinaryData(theEnv)->ClassCount * sizeof(BSAVE_DEFCLASS)) +
+           (ObjectBinaryData(theEnv)->LinkCount * sizeof(long)) +
+           (ObjectBinaryData(theEnv)->SlotCount * sizeof(BSAVE_SLOT_DESC)) +
+           (ObjectBinaryData(theEnv)->SlotNameCount * sizeof(BSAVE_SLOT_NAME)) +
+           (ObjectBinaryData(theEnv)->TemplateSlotCount * sizeof(long)) +
+           (ObjectBinaryData(theEnv)->SlotNameMapCount * sizeof(unsigned)) +
+           (ObjectBinaryData(theEnv)->HandlerCount * sizeof(BSAVE_HANDLER)) +
+           (ObjectBinaryData(theEnv)->HandlerCount * sizeof(unsigned));
+   GenWrite(&space,sizeof(size_t),fp);
+
+   ObjectBinaryData(theEnv)->ClassCount = 0L;
+   ObjectBinaryData(theEnv)->LinkCount = 0L;
+   ObjectBinaryData(theEnv)->SlotCount = 0L;
+   ObjectBinaryData(theEnv)->SlotNameCount = 0L;
+   ObjectBinaryData(theEnv)->TemplateSlotCount = 0L;
+   ObjectBinaryData(theEnv)->SlotNameMapCount = 0L;
+   ObjectBinaryData(theEnv)->HandlerCount = 0L;
+
+   /* =================================
+      Write out each defclass module
+      ================================= */
+   theModule = GetNextDefmodule(theEnv,NULL);
+   while (theModule != NULL)
+     {
+      theModuleItem = (DEFCLASS_MODULE *)
+                      GetModuleItem(theEnv,theModule,FindModuleItem(theEnv,"defclass")->moduleIndex);
+      AssignBsaveDefmdlItemHdrVals(&dummy_mitem.header,&theModuleItem->header);
+      GenWrite(&dummy_mitem,sizeof(BSAVE_DEFCLASS_MODULE),fp);
+      theModule = GetNextDefmodule(theEnv,theModule);
+     }
+
+   /* =====================
+      Write out the classes
+      ===================== */
+   DoForAllConstructs(theEnv,BsaveDefclass,DefclassData(theEnv)->DefclassModuleIndex,false,fp);
+
+   /* =========================
+      Write out the class links
+      ========================= */
+   ObjectBinaryData(theEnv)->LinkCount = 0L;
+   DoForAllConstructs(theEnv,BsaveClassLinks,DefclassData(theEnv)->DefclassModuleIndex,false,fp);
+
+   /* ===============================
+      Write out the slot name entries
+      =============================== */
+   for (i = 0 ; i < SLOT_NAME_TABLE_HASH_SIZE ; i++)
+     for (snp = DefclassData(theEnv)->SlotNameTable[i] ; snp != NULL ; snp = snp->nxt)
+     {
+      if ((snp->id != ISA_ID) && (snp->id != NAME_ID))
+        {
+         dummy_slot_name.id = snp->id;
+         dummy_slot_name.hashTableIndex = snp->hashTableIndex;
+         dummy_slot_name.name = snp->name->bucket;
+         dummy_slot_name.putHandlerName = snp->putHandlerName->bucket;
+         GenWrite(&dummy_slot_name,sizeof(BSAVE_SLOT_NAME),fp);
+        }
+     }
+
+   /* ===================
+      Write out the slots
+      =================== */
+   DoForAllConstructs(theEnv,BsaveSlots,DefclassData(theEnv)->DefclassModuleIndex,false,fp);
+
+   /* =====================================
+      Write out the template instance slots
+      ===================================== */
+   DoForAllConstructs(theEnv,BsaveTemplateSlots,DefclassData(theEnv)->DefclassModuleIndex,false,fp);
+
+   /* =============================================
+      Write out the ordered instance slot name maps
+      ============================================= */
+   DoForAllConstructs(theEnv,BsaveSlotMap,DefclassData(theEnv)->DefclassModuleIndex,false,fp);
+
+   /* ==============================
+      Write out the message-handlers
+      ============================== */
+   DoForAllConstructs(theEnv,BsaveHandlers,DefclassData(theEnv)->DefclassModuleIndex,false,fp);
+
+   /* ==========================================
+      Write out the ordered message-handler maps
+      ========================================== */
+   DoForAllConstructs(theEnv,BsaveHandlerMap,DefclassData(theEnv)->DefclassModuleIndex,false,fp);
+
+      RestoreBloadCount(theEnv,&ObjectBinaryData(theEnv)->ModuleCount);
+      RestoreBloadCount(theEnv,&ObjectBinaryData(theEnv)->ClassCount);
+      RestoreBloadCount(theEnv,&ObjectBinaryData(theEnv)->LinkCount);
+      RestoreBloadCount(theEnv,&ObjectBinaryData(theEnv)->SlotCount);
+      RestoreBloadCount(theEnv,&ObjectBinaryData(theEnv)->SlotNameCount);
+      RestoreBloadCount(theEnv,&ObjectBinaryData(theEnv)->TemplateSlotCount);
+      RestoreBloadCount(theEnv,&ObjectBinaryData(theEnv)->SlotNameMapCount);
+      RestoreBloadCount(theEnv,&ObjectBinaryData(theEnv)->HandlerCount);
+  }
+
+/***************************************************
+  NAME         : BsaveDefclass
+  DESCRIPTION  : Writes defclass binary data
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass binary data written
+  NOTES        : None
+ ***************************************************/
+static void BsaveDefclass(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+   BSAVE_DEFCLASS dummy_class;
+
+   AssignBsaveConstructHeaderVals(&dummy_class.header,&cls->header);
+   dummy_class.abstract = cls->abstract;
+   dummy_class.reactive = cls->reactive;
+   dummy_class.system = cls->system;
+   dummy_class.id = cls->id;
+   dummy_class.slotCount = cls->slotCount;
+   dummy_class.instanceSlotCount = cls->instanceSlotCount;
+   dummy_class.localInstanceSlotCount = cls->localInstanceSlotCount;
+   dummy_class.maxSlotNameID = cls->maxSlotNameID;
+   dummy_class.handlerCount = cls->handlerCount;
+   dummy_class.directSuperclasses.classCount = cls->directSuperclasses.classCount;
+   dummy_class.directSubclasses.classCount = cls->directSubclasses.classCount;
+   dummy_class.allSuperclasses.classCount = cls->allSuperclasses.classCount;
+   if (cls->directSuperclasses.classCount != 0)
+     {
+      dummy_class.directSuperclasses.classArray = ObjectBinaryData(theEnv)->LinkCount;
+      ObjectBinaryData(theEnv)->LinkCount += cls->directSuperclasses.classCount;
+     }
+   else
+     dummy_class.directSuperclasses.classArray = ULONG_MAX;
+   if (cls->directSubclasses.classCount != 0)
+     {
+      dummy_class.directSubclasses.classArray = ObjectBinaryData(theEnv)->LinkCount;
+      ObjectBinaryData(theEnv)->LinkCount += cls->directSubclasses.classCount;
+     }
+   else
+     dummy_class.directSubclasses.classArray = ULONG_MAX;
+   if (cls->allSuperclasses.classCount != 0)
+     {
+      dummy_class.allSuperclasses.classArray = ObjectBinaryData(theEnv)->LinkCount;
+      ObjectBinaryData(theEnv)->LinkCount += cls->allSuperclasses.classCount;
+     }
+   else
+     dummy_class.allSuperclasses.classArray = ULONG_MAX;
+   if (cls->slots != NULL)
+     {
+      dummy_class.slots = ObjectBinaryData(theEnv)->SlotCount;
+      ObjectBinaryData(theEnv)->SlotCount += cls->slotCount;
+     }
+   else
+     dummy_class.slots = ULONG_MAX;
+   if (cls->instanceTemplate != NULL)
+     {
+      dummy_class.instanceTemplate = ObjectBinaryData(theEnv)->TemplateSlotCount;
+      ObjectBinaryData(theEnv)->TemplateSlotCount += cls->instanceSlotCount;
+      dummy_class.slotNameMap = ObjectBinaryData(theEnv)->SlotNameMapCount;
+      ObjectBinaryData(theEnv)->SlotNameMapCount += cls->maxSlotNameID + 1;
+     }
+   else
+     {
+      dummy_class.instanceTemplate = ULONG_MAX;
+      dummy_class.slotNameMap = ULONG_MAX;
+     }
+   if (cls->handlers != NULL)
+     {
+      dummy_class.handlers = ObjectBinaryData(theEnv)->HandlerCount;
+      ObjectBinaryData(theEnv)->HandlerCount += cls->handlerCount;
+     }
+   else
+     dummy_class.handlers = ULONG_MAX;
+
+#if DEFMODULE_CONSTRUCT
+   dummy_class.scopeMap = cls->scopeMap->bucket;
+#else
+   dummy_class.scopeMap = ULONG_MAX;
+#endif
+
+#if DEFRULE_CONSTRUCT
+   if (cls->relevant_terminal_alpha_nodes != NULL)
+     { dummy_class.relevant_terminal_alpha_nodes = cls->relevant_terminal_alpha_nodes->bsaveID; }
+   else
+     { dummy_class.relevant_terminal_alpha_nodes = ULONG_MAX; }
+#endif
+
+   GenWrite(&dummy_class,sizeof(BSAVE_DEFCLASS),(FILE *) buf);
+  }
+
+/***************************************************
+  NAME         : BsaveClassLinks
+  DESCRIPTION  : Writes class links binary data
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass links binary data written
+  NOTES        : None
+ ***************************************************/
+static void BsaveClassLinks(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+   unsigned long i;
+   unsigned long dummy_class_index;
+   for (i = 0 ;  i < cls->directSuperclasses.classCount ; i++)
+     {
+      dummy_class_index = DefclassIndex(cls->directSuperclasses.classArray[i]);
+      GenWrite(&dummy_class_index,sizeof(long),(FILE *) buf);
+     }
+   ObjectBinaryData(theEnv)->LinkCount += cls->directSuperclasses.classCount;
+   for (i = 0 ;  i < cls->directSubclasses.classCount ; i++)
+     {
+      dummy_class_index = DefclassIndex(cls->directSubclasses.classArray[i]);
+      GenWrite(&dummy_class_index,sizeof(long),(FILE *) buf);
+     }
+   ObjectBinaryData(theEnv)->LinkCount += cls->directSubclasses.classCount;
+   for (i = 0 ;  i < cls->allSuperclasses.classCount ; i++)
+     {
+      dummy_class_index = DefclassIndex(cls->allSuperclasses.classArray[i]);
+      GenWrite(&dummy_class_index,sizeof(long),(FILE *) buf);
+     }
+   ObjectBinaryData(theEnv)->LinkCount += cls->allSuperclasses.classCount;
+  }
+
+/***************************************************
+  NAME         : BsaveSlots
+  DESCRIPTION  : Writes class slots binary data
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass slots binary data written
+  NOTES        : None
+ ***************************************************/
+static void BsaveSlots(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+   long i;
+   BSAVE_SLOT_DESC dummy_slot;
+   SlotDescriptor *sp;
+   Expression *tmpexp;
+
+   for (i = 0 ; i < cls->slotCount ; i++)
+     {
+      sp = &cls->slots[i];
+      dummy_slot.dynamicDefault = sp->dynamicDefault;
+      dummy_slot.noDefault = sp->noDefault;
+      dummy_slot.shared = sp->shared;
+      dummy_slot.multiple = sp->multiple;
+      dummy_slot.composite = sp->composite;
+      dummy_slot.noInherit = sp->noInherit;
+      dummy_slot.noWrite = sp->noWrite;
+      dummy_slot.initializeOnly = sp->initializeOnly;
+      dummy_slot.reactive = sp->reactive;
+      dummy_slot.publicVisibility = sp->publicVisibility;
+      dummy_slot.createReadAccessor = sp->createReadAccessor;
+      dummy_slot.createWriteAccessor = sp->createWriteAccessor;
+      dummy_slot.cls = DefclassIndex(sp->cls);
+      dummy_slot.slotName = SlotNameIndex(sp->slotName);
+      dummy_slot.overrideMessage = sp->overrideMessage->bucket;
+      if (sp->defaultValue != NULL)
+        {
+         dummy_slot.defaultValue = ExpressionData(theEnv)->ExpressionCount;
+         if (sp->dynamicDefault)
+           ExpressionData(theEnv)->ExpressionCount += ExpressionSize((Expression *) sp->defaultValue);
+         else
+           {
+            tmpexp = ConvertValueToExpression(theEnv,(UDFValue *) sp->defaultValue);
+            ExpressionData(theEnv)->ExpressionCount += ExpressionSize(tmpexp);
+            ReturnExpression(theEnv,tmpexp);
+           }
+        }
+      else
+        dummy_slot.defaultValue = ULONG_MAX;
+      dummy_slot.constraint = ConstraintIndex(sp->constraint);
+      GenWrite(&dummy_slot,sizeof(BSAVE_SLOT_DESC),(FILE *) buf);
+     }
+  }
+
+/**************************************************************
+  NAME         : BsaveTemplateSlots
+  DESCRIPTION  : Writes class instance template binary data
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass instance template binary data written
+  NOTES        : None
+ **************************************************************/
+static void BsaveTemplateSlots(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+   unsigned long i;
+   unsigned long tsp;
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   for (i = 0 ; i < cls->instanceSlotCount ; i++)
+     {
+      tsp = SlotIndex(cls->instanceTemplate[i]);
+      GenWrite(&tsp,sizeof(unsigned long),(FILE *) buf);
+     }
+  }
+
+/***************************************************************
+  NAME         : BsaveSlotMap
+  DESCRIPTION  : Writes class canonical slot map binary data
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass canonical slot map binary data written
+  NOTES        : None
+ ***************************************************************/
+static void BsaveSlotMap(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   if (cls->instanceSlotCount != 0)
+     GenWrite(cls->slotNameMap,
+              (sizeof(unsigned) * (cls->maxSlotNameID + 1)),(FILE *) buf);
+  }
+
+/************************************************************
+  NAME         : BsaveHandlers
+  DESCRIPTION  : Writes class message-handlers binary data
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass message-handler binary data written
+  NOTES        : None
+ ************************************************************/
+static void BsaveHandlers(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+   unsigned long i;
+   BSAVE_HANDLER dummy_handler;
+   DefmessageHandler *hnd;
+
+   for (i = 0 ; i < cls->handlerCount ; i++)
+     {
+      hnd = &cls->handlers[i];
+      
+      AssignBsaveConstructHeaderVals(&dummy_handler.header,&hnd->header);
+
+      dummy_handler.system = hnd->system;
+      dummy_handler.type = hnd->type;
+      dummy_handler.minParams = hnd->minParams;
+      dummy_handler.maxParams = hnd->maxParams;
+      dummy_handler.localVarCount = hnd->localVarCount;
+      dummy_handler.cls = DefclassIndex(hnd->cls);
+      if (hnd->actions != NULL)
+        {
+         dummy_handler.actions = ExpressionData(theEnv)->ExpressionCount;
+         ExpressionData(theEnv)->ExpressionCount += ExpressionSize(hnd->actions);
+        }
+      else
+        dummy_handler.actions = ULONG_MAX;
+      GenWrite(&dummy_handler,sizeof(BSAVE_HANDLER),(FILE *) buf);
+     }
+  }
+
+/****************************************************************
+  NAME         : BsaveHandlerMap
+  DESCRIPTION  : Writes class message-handler map binary data
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass message-handler map binary data written
+  NOTES        : None
+ ****************************************************************/
+static void BsaveHandlerMap(
+  Environment *theEnv,
+  ConstructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   GenWrite(cls->handlerOrderMap,
+            (sizeof(unsigned) * cls->handlerCount),(FILE *) buf);
+  }
+
+#endif
+
+/***********************************************************************
+  NAME         : BloadStorageObjects
+  DESCRIPTION  : This routine reads class and handler information from
+                 a binary file in five chunks:
+                 Class count
+                 Handler count
+                 Class array
+                 Handler array
+  INPUTS       : Notthing
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Arrays allocated and set
+  NOTES        : This routine makes no attempt to reset any pointers
+                   within the structures
+                 Bload fails if there are still classes in the system!!
+ ***********************************************************************/
+static void BloadStorageObjects(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long counts[9];
+
+   if ((DefclassData(theEnv)->ClassIDMap != NULL) || (DefclassData(theEnv)->MaxClassID != 0))
+     {
+      SystemError(theEnv,"OBJBIN",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   if (space == 0L)
+     {
+      ObjectBinaryData(theEnv)->ClassCount = ObjectBinaryData(theEnv)->HandlerCount = 0L;
+      return;
+     }
+   GenReadBinary(theEnv,counts,space);
+   ObjectBinaryData(theEnv)->ModuleCount = counts[0];
+   ObjectBinaryData(theEnv)->ClassCount = counts[1];
+   ObjectBinaryData(theEnv)->LinkCount = counts[2];
+   ObjectBinaryData(theEnv)->SlotNameCount = counts[3];
+   ObjectBinaryData(theEnv)->SlotCount = counts[4];
+   ObjectBinaryData(theEnv)->TemplateSlotCount = counts[5];
+   ObjectBinaryData(theEnv)->SlotNameMapCount = counts[6];
+   ObjectBinaryData(theEnv)->HandlerCount = counts[7];
+   DefclassData(theEnv)->MaxClassID = (unsigned short) counts[8];
+   DefclassData(theEnv)->AvailClassID = (unsigned short) counts[8];
+   if (ObjectBinaryData(theEnv)->ModuleCount != 0L)
+     {
+      space = (sizeof(DEFCLASS_MODULE) * ObjectBinaryData(theEnv)->ModuleCount);
+      ObjectBinaryData(theEnv)->ModuleArray = (DEFCLASS_MODULE *) genalloc(theEnv,space);
+     }
+   if (ObjectBinaryData(theEnv)->ClassCount != 0L)
+     {
+      space = (sizeof(Defclass) * ObjectBinaryData(theEnv)->ClassCount);
+      ObjectBinaryData(theEnv)->DefclassArray = (Defclass *) genalloc(theEnv,space);
+      DefclassData(theEnv)->ClassIDMap = (Defclass **) gm2(theEnv,(sizeof(Defclass *) * DefclassData(theEnv)->MaxClassID));
+     }
+   if (ObjectBinaryData(theEnv)->LinkCount != 0L)
+     {
+      space = (sizeof(Defclass *) * ObjectBinaryData(theEnv)->LinkCount);
+      ObjectBinaryData(theEnv)->LinkArray = (Defclass **) genalloc(theEnv,space);
+     }
+   if (ObjectBinaryData(theEnv)->SlotCount != 0L)
+     {
+      space = (sizeof(SlotDescriptor) * ObjectBinaryData(theEnv)->SlotCount);
+      ObjectBinaryData(theEnv)->SlotArray = (SlotDescriptor *) genalloc(theEnv,space);
+     }
+   if (ObjectBinaryData(theEnv)->SlotNameCount != 0L)
+     {
+      space = (sizeof(SLOT_NAME) * ObjectBinaryData(theEnv)->SlotNameCount);
+      ObjectBinaryData(theEnv)->SlotNameArray = (SLOT_NAME *) genalloc(theEnv,space);
+     }
+   if (ObjectBinaryData(theEnv)->TemplateSlotCount != 0L)
+     {
+      space = (sizeof(SlotDescriptor *) * ObjectBinaryData(theEnv)->TemplateSlotCount);
+      ObjectBinaryData(theEnv)->TmpslotArray = (SlotDescriptor **) genalloc(theEnv,space);
+     }
+   if (ObjectBinaryData(theEnv)->SlotNameMapCount != 0L)
+     {
+      space = (sizeof(unsigned) * ObjectBinaryData(theEnv)->SlotNameMapCount);
+      ObjectBinaryData(theEnv)->MapslotArray = (unsigned *) genalloc(theEnv,space);
+     }
+   if (ObjectBinaryData(theEnv)->HandlerCount != 0L)
+     {
+      space = (sizeof(DefmessageHandler) * ObjectBinaryData(theEnv)->HandlerCount);
+      ObjectBinaryData(theEnv)->HandlerArray = (DefmessageHandler *) genalloc(theEnv,space);
+      space = (sizeof(unsigned) * ObjectBinaryData(theEnv)->HandlerCount);
+      ObjectBinaryData(theEnv)->MaphandlerArray = (unsigned *) genalloc(theEnv,space);
+     }
+  }
+
+/***************************************************************
+  NAME         : BloadObjects
+  DESCRIPTION  : This routine moves through the class and handler
+                   binary arrays updating pointers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pointers reset from array indices
+  NOTES        : Assumes all loading is finished
+ **************************************************************/
+static void BloadObjects(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   if (space == 0L)
+     return;
+   if (ObjectBinaryData(theEnv)->ModuleCount != 0L)
+     BloadandRefresh(theEnv,ObjectBinaryData(theEnv)->ModuleCount,sizeof(BSAVE_DEFCLASS_MODULE),UpdateDefclassModule);
+   if (ObjectBinaryData(theEnv)->ClassCount != 0L)
+     {
+      BloadandRefresh(theEnv,ObjectBinaryData(theEnv)->ClassCount,sizeof(BSAVE_DEFCLASS),UpdateDefclass);
+      BloadandRefresh(theEnv,ObjectBinaryData(theEnv)->LinkCount,sizeof(long),UpdateLink); // 64-bit bug fix: Defclass * replaced with long
+      BloadandRefresh(theEnv,ObjectBinaryData(theEnv)->SlotNameCount,sizeof(BSAVE_SLOT_NAME),UpdateSlotName);
+      BloadandRefresh(theEnv,ObjectBinaryData(theEnv)->SlotCount,sizeof(BSAVE_SLOT_DESC),UpdateSlot);
+      if (ObjectBinaryData(theEnv)->TemplateSlotCount != 0L)
+        BloadandRefresh(theEnv,ObjectBinaryData(theEnv)->TemplateSlotCount,sizeof(long),UpdateTemplateSlot);
+      if (ObjectBinaryData(theEnv)->SlotNameMapCount != 0L)
+        {
+         space = (sizeof(unsigned) * ObjectBinaryData(theEnv)->SlotNameMapCount);
+         GenReadBinary(theEnv,ObjectBinaryData(theEnv)->MapslotArray,space);
+        }
+      if (ObjectBinaryData(theEnv)->HandlerCount != 0L)
+        {
+         BloadandRefresh(theEnv,ObjectBinaryData(theEnv)->HandlerCount,sizeof(BSAVE_HANDLER),UpdateHandler);
+         space = (sizeof(unsigned) * ObjectBinaryData(theEnv)->HandlerCount);
+         GenReadBinary(theEnv,ObjectBinaryData(theEnv)->MaphandlerArray,space);
+        }
+      UpdatePrimitiveClassesMap(theEnv);
+     }
+  }
+
+/***************************************************
+  NAME         : UpdatePrimitiveClassesMap
+  DESCRIPTION  : Resets the pointers for the global
+                 primitive classes map
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : PrimitiveClassMap pointers set
+                 into bload array
+  NOTES        : Looks at first nine primitive type
+                 codes in the source file CONSTANT.H
+ ***************************************************/
+static void UpdatePrimitiveClassesMap(
+  Environment *theEnv)
+  {
+   unsigned i;
+
+   for (i = 0 ; i < OBJECT_TYPE_CODE ; i++)
+     DefclassData(theEnv)->PrimitiveClassMap[i] = (Defclass *) &ObjectBinaryData(theEnv)->DefclassArray[i];
+  }
+
+/*********************************************************
+  Refresh update routines for bsaved COOL structures
+ *********************************************************/
+static void UpdateDefclassModule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_DEFCLASS_MODULE *bdptr;
+
+   bdptr = (BSAVE_DEFCLASS_MODULE *) buf;
+   UpdateDefmoduleItemHeader(theEnv,&bdptr->header,&ObjectBinaryData(theEnv)->ModuleArray[obji].header,
+                             sizeof(Defclass),ObjectBinaryData(theEnv)->DefclassArray);
+  }
+
+static void UpdateDefclass(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_DEFCLASS *bcls;
+   Defclass *cls;
+
+   bcls = (BSAVE_DEFCLASS *) buf;
+   cls = &ObjectBinaryData(theEnv)->DefclassArray[obji];
+
+   UpdateConstructHeader(theEnv,&bcls->header,&cls->header,DEFCLASS,
+                         sizeof(DEFCLASS_MODULE),ObjectBinaryData(theEnv)->ModuleArray,
+                         sizeof(Defclass),ObjectBinaryData(theEnv)->DefclassArray);
+   cls->abstract = bcls->abstract;
+   cls->reactive = bcls->reactive;
+   cls->system = bcls->system;
+   cls->id = bcls->id;
+   DefclassData(theEnv)->ClassIDMap[cls->id] = cls;
+#if DEBUGGING_FUNCTIONS
+   cls->traceInstances = DefclassData(theEnv)->WatchInstances;
+   cls->traceSlots = DefclassData(theEnv)->WatchSlots;
+#endif
+   cls->slotCount = bcls->slotCount;
+   cls->instanceSlotCount = bcls->instanceSlotCount;
+   cls->localInstanceSlotCount = bcls->localInstanceSlotCount;
+   cls->maxSlotNameID = bcls->maxSlotNameID;
+   cls->handlerCount = bcls->handlerCount;
+   cls->directSuperclasses.classCount = bcls->directSuperclasses.classCount;
+   cls->directSuperclasses.classArray = LinkPointer(bcls->directSuperclasses.classArray);
+   cls->directSubclasses.classCount = bcls->directSubclasses.classCount;
+   cls->directSubclasses.classArray = LinkPointer(bcls->directSubclasses.classArray);
+   cls->allSuperclasses.classCount = bcls->allSuperclasses.classCount;
+   cls->allSuperclasses.classArray = LinkPointer(bcls->allSuperclasses.classArray);
+   cls->slots = SlotPointer(bcls->slots);
+   cls->instanceTemplate = TemplateSlotPointer(bcls->instanceTemplate);
+   cls->slotNameMap = OrderedSlotPointer(bcls->slotNameMap);
+   cls->instanceList = NULL;
+   cls->handlers = HandlerPointer(bcls->handlers);
+   cls->handlerOrderMap = OrderedHandlerPointer(bcls->handlers);
+   cls->installed = 1;
+   cls->busy = 0;
+   cls->instanceList = NULL;
+   cls->instanceListBottom = NULL;
+   cls->relevant_terminal_alpha_nodes = ClassAlphaPointer(bcls->relevant_terminal_alpha_nodes);
+#if DEFMODULE_CONSTRUCT
+   cls->scopeMap = BitMapPointer(bcls->scopeMap);
+   IncrementBitMapCount(cls->scopeMap);
+#else
+   cls->scopeMap = NULL;
+#endif
+   PutClassInTable(theEnv,cls);
+  }
+
+static void UpdateLink(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   unsigned long *blink;
+
+   blink = (unsigned long *) buf;
+   ObjectBinaryData(theEnv)->LinkArray[obji] = DefclassPointer(*blink);
+  }
+
+static void UpdateSlot(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   SlotDescriptor *sp;
+   BSAVE_SLOT_DESC *bsp;
+
+   sp = (SlotDescriptor *) &ObjectBinaryData(theEnv)->SlotArray[obji];
+   bsp = (BSAVE_SLOT_DESC *) buf;
+   sp->dynamicDefault = bsp->dynamicDefault;
+   sp->noDefault = bsp->noDefault;
+   sp->shared = bsp->shared;
+   sp->multiple = bsp->multiple;
+   sp->composite = bsp->composite;
+   sp->noInherit = bsp->noInherit;
+   sp->noWrite = bsp->noWrite;
+   sp->initializeOnly = bsp->initializeOnly;
+   sp->reactive = bsp->reactive;
+   sp->publicVisibility = bsp->publicVisibility;
+   sp->createReadAccessor = bsp->createReadAccessor;
+   sp->createWriteAccessor = bsp->createWriteAccessor;
+   sp->cls = DefclassPointer(bsp->cls);
+   sp->slotName = SlotNamePointer(bsp->slotName);
+   sp->overrideMessage = SymbolPointer(bsp->overrideMessage);
+   IncrementLexemeCount(sp->overrideMessage);
+   if (bsp->defaultValue != ULONG_MAX)
+     {
+      if (sp->dynamicDefault)
+        sp->defaultValue = ExpressionPointer(bsp->defaultValue);
+      else
+        {
+         sp->defaultValue = get_struct(theEnv,udfValue);
+         EvaluateAndStoreInDataObject(theEnv,sp->multiple,ExpressionPointer(bsp->defaultValue),
+                                      (UDFValue *) sp->defaultValue,true);
+         RetainUDFV(theEnv,(UDFValue *) sp->defaultValue);
+        }
+     }
+   else
+     sp->defaultValue = NULL;
+   sp->constraint = ConstraintPointer(bsp->constraint);
+   sp->sharedCount = 0;
+   sp->sharedValue.value = NULL;
+   sp->bsaveIndex = 0L;
+   if (sp->shared)
+     {
+      sp->sharedValue.desc = sp;
+      sp->sharedValue.value = NULL;
+     }
+  }
+
+static void UpdateSlotName(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   SLOT_NAME *snp;
+   BSAVE_SLOT_NAME *bsnp;
+
+   bsnp = (BSAVE_SLOT_NAME *) buf;
+   snp = (SLOT_NAME *) &ObjectBinaryData(theEnv)->SlotNameArray[obji];
+   snp->id = bsnp->id;
+   snp->name = SymbolPointer(bsnp->name);
+   IncrementLexemeCount(snp->name);
+   snp->putHandlerName = SymbolPointer(bsnp->putHandlerName);
+   IncrementLexemeCount(snp->putHandlerName);
+   snp->hashTableIndex = bsnp->hashTableIndex;
+   snp->nxt = DefclassData(theEnv)->SlotNameTable[snp->hashTableIndex];
+   DefclassData(theEnv)->SlotNameTable[snp->hashTableIndex] = snp;
+  }
+
+static void UpdateTemplateSlot(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   ObjectBinaryData(theEnv)->TmpslotArray[obji] = SlotPointer(* (long *) buf);
+  }
+
+static void UpdateHandler(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   DefmessageHandler *hnd;
+   BSAVE_HANDLER *bhnd;
+
+   hnd = &ObjectBinaryData(theEnv)->HandlerArray[obji];
+   bhnd = (BSAVE_HANDLER *) buf;
+   hnd->system = bhnd->system;
+   hnd->type = bhnd->type;
+
+   UpdateConstructHeader(theEnv,&bhnd->header,&hnd->header,DEFMESSAGE_HANDLER,
+                         sizeof(DEFCLASS_MODULE),ObjectBinaryData(theEnv)->ModuleArray,
+                         sizeof(DefmessageHandler),ObjectBinaryData(theEnv)->HandlerArray);
+
+   hnd->minParams = bhnd->minParams;
+   hnd->maxParams = bhnd->maxParams;
+   hnd->localVarCount = bhnd->localVarCount;
+   hnd->cls = DefclassPointer(bhnd->cls);
+   //IncrementLexemeCount(hnd->header.name);
+   hnd->actions = ExpressionPointer(bhnd->actions);
+   hnd->header.ppForm = NULL;
+   hnd->busy = 0;
+   hnd->mark = 0;
+   hnd->header.usrData = NULL;
+#if DEBUGGING_FUNCTIONS
+   hnd->trace = MessageHandlerData(theEnv)->WatchHandlers;
+#endif
+  }
+
+/***************************************************************
+  NAME         : ClearBloadObjects
+  DESCRIPTION  : Release all binary-loaded class and handler
+                   structure arrays (and others)
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Memory cleared
+  NOTES        : None
+ ***************************************************************/
+static void ClearBloadObjects(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   size_t space;
+
+   space = (sizeof(DEFCLASS_MODULE) * ObjectBinaryData(theEnv)->ModuleCount);
+   if (space == 0L)
+     return;
+   genfree(theEnv,ObjectBinaryData(theEnv)->ModuleArray,space);
+   ObjectBinaryData(theEnv)->ModuleArray = NULL;
+   ObjectBinaryData(theEnv)->ModuleCount = 0L;
+
+   if (ObjectBinaryData(theEnv)->ClassCount != 0L)
+     {
+      rm(theEnv,DefclassData(theEnv)->ClassIDMap,(sizeof(Defclass *) * DefclassData(theEnv)->AvailClassID));
+      DefclassData(theEnv)->ClassIDMap = NULL;
+      DefclassData(theEnv)->MaxClassID = 0;
+      DefclassData(theEnv)->AvailClassID = 0;
+      for (i = 0 ; i < ObjectBinaryData(theEnv)->ClassCount ; i++)
+        {
+         UnmarkConstructHeader(theEnv,&ObjectBinaryData(theEnv)->DefclassArray[i].header);
+#if DEFMODULE_CONSTRUCT
+         DecrementBitMapReferenceCount(theEnv,ObjectBinaryData(theEnv)->DefclassArray[i].scopeMap);
+#endif
+         RemoveClassFromTable(theEnv,&ObjectBinaryData(theEnv)->DefclassArray[i]);
+        }
+      for (i = 0 ; i < ObjectBinaryData(theEnv)->SlotCount ; i++)
+        {
+         ReleaseLexeme(theEnv,ObjectBinaryData(theEnv)->SlotArray[i].overrideMessage);
+         if ((ObjectBinaryData(theEnv)->SlotArray[i].defaultValue != NULL) && (ObjectBinaryData(theEnv)->SlotArray[i].dynamicDefault == 0))
+           {
+            ReleaseUDFV(theEnv,(UDFValue *) ObjectBinaryData(theEnv)->SlotArray[i].defaultValue);
+            rtn_struct(theEnv,udfValue,ObjectBinaryData(theEnv)->SlotArray[i].defaultValue);
+           }
+        }
+      for (i = 0 ; i < ObjectBinaryData(theEnv)->SlotNameCount ; i++)
+        {
+         DefclassData(theEnv)->SlotNameTable[ObjectBinaryData(theEnv)->SlotNameArray[i].hashTableIndex] = NULL;
+         ReleaseLexeme(theEnv,ObjectBinaryData(theEnv)->SlotNameArray[i].name);
+         ReleaseLexeme(theEnv,ObjectBinaryData(theEnv)->SlotNameArray[i].putHandlerName);
+        }
+
+      space = (sizeof(Defclass) * ObjectBinaryData(theEnv)->ClassCount);
+      if (space != 0L)
+        {
+         genfree(theEnv,ObjectBinaryData(theEnv)->DefclassArray,space);
+         ObjectBinaryData(theEnv)->DefclassArray = NULL;
+         ObjectBinaryData(theEnv)->ClassCount = 0L;
+        }
+
+      space = (sizeof(Defclass *) * ObjectBinaryData(theEnv)->LinkCount);
+      if (space != 0L)
+        {
+         genfree(theEnv,ObjectBinaryData(theEnv)->LinkArray,space);
+         ObjectBinaryData(theEnv)->LinkArray = NULL;
+         ObjectBinaryData(theEnv)->LinkCount = 0L;
+        }
+
+      space = (sizeof(SlotDescriptor) * ObjectBinaryData(theEnv)->SlotCount);
+      if (space != 0L)
+        {
+         genfree(theEnv,ObjectBinaryData(theEnv)->SlotArray,space);
+         ObjectBinaryData(theEnv)->SlotArray = NULL;
+         ObjectBinaryData(theEnv)->SlotCount = 0L;
+        }
+
+      space = (sizeof(SLOT_NAME) * ObjectBinaryData(theEnv)->SlotNameCount);
+      if (space != 0L)
+        {
+         genfree(theEnv,ObjectBinaryData(theEnv)->SlotNameArray,space);
+         ObjectBinaryData(theEnv)->SlotNameArray = NULL;
+         ObjectBinaryData(theEnv)->SlotNameCount = 0L;
+        }
+
+      space = (sizeof(SlotDescriptor *) * ObjectBinaryData(theEnv)->TemplateSlotCount);
+      if (space != 0L)
+        {
+         genfree(theEnv,ObjectBinaryData(theEnv)->TmpslotArray,space);
+         ObjectBinaryData(theEnv)->TmpslotArray = NULL;
+         ObjectBinaryData(theEnv)->TemplateSlotCount = 0L;
+        }
+
+      space = (sizeof(unsigned) * ObjectBinaryData(theEnv)->SlotNameMapCount);
+      if (space != 0L)
+        {
+         genfree(theEnv,ObjectBinaryData(theEnv)->MapslotArray,space);
+         ObjectBinaryData(theEnv)->MapslotArray = NULL;
+         ObjectBinaryData(theEnv)->SlotNameMapCount = 0L;
+        }
+     }
+
+   if (ObjectBinaryData(theEnv)->HandlerCount != 0L)
+     {
+      for (i = 0L ; i < ObjectBinaryData(theEnv)->HandlerCount ; i++)
+        ReleaseLexeme(theEnv,ObjectBinaryData(theEnv)->HandlerArray[i].header.name);
+
+      space = (sizeof(DefmessageHandler) * ObjectBinaryData(theEnv)->HandlerCount);
+      if (space != 0L)
+        {
+         genfree(theEnv,ObjectBinaryData(theEnv)->HandlerArray,space);
+         ObjectBinaryData(theEnv)->HandlerArray = NULL;
+         space = (sizeof(unsigned) * ObjectBinaryData(theEnv)->HandlerCount);
+         genfree(theEnv,ObjectBinaryData(theEnv)->MaphandlerArray,space);
+         ObjectBinaryData(theEnv)->MaphandlerArray = NULL;
+         ObjectBinaryData(theEnv)->HandlerCount = 0L;
+        }
+     }
+  }
+
+#endif
+
diff --git a/clips/objbin.h b/clips/objbin.h
new file mode 100755
index 000000000..fa96e5c67
--- /dev/null
+++ b/clips/objbin.h
@@ -0,0 +1,79 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed IMPERATIVE_MESSAGE_HANDLERS and        */
+/*            AUXILIARY_MESSAGE_HANDLERS compilation flags.  */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_objbin
+
+#pragma once
+
+#define _H_objbin
+
+#include "object.h"
+
+#define OBJECTBIN_DATA 33
+
+struct objectBinaryData
+  {
+   Defclass *DefclassArray;
+   unsigned long ModuleCount;
+   unsigned long ClassCount;
+   unsigned long LinkCount;
+   unsigned long SlotCount;
+   unsigned long SlotNameCount;
+   unsigned long TemplateSlotCount;
+   unsigned long SlotNameMapCount;
+   unsigned long HandlerCount;
+   DEFCLASS_MODULE *ModuleArray;
+   Defclass **LinkArray;
+   SlotDescriptor *SlotArray;
+   SlotDescriptor **TmpslotArray;
+   SLOT_NAME *SlotNameArray;
+   unsigned *MapslotArray;
+   DefmessageHandler *HandlerArray;
+   unsigned *MaphandlerArray;
+  };
+
+#define ObjectBinaryData(theEnv) ((struct objectBinaryData *) GetEnvironmentData(theEnv,OBJECTBIN_DATA))
+
+#define DefclassPointer(i) (((i) == ULONG_MAX) ? NULL : &ObjectBinaryData(theEnv)->DefclassArray[i])
+#define DefclassIndex(cls) (((cls) == NULL) ? ULONG_MAX : ((ConstructHeader *) cls)->bsaveID)
+
+   void                    SetupObjectsBload(Environment *);
+   void                   *BloadDefclassModuleReference(Environment *,unsigned long);
+
+#endif /* _H_objbin */
+
+
+
diff --git a/clips/objcmp.c b/clips/objcmp.c
new file mode 100755
index 000000000..362af5665
--- /dev/null
+++ b/clips/objcmp.c
@@ -0,0 +1,1507 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  02/03/18             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Object System Construct Compiler Code            */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if OBJECT_SYSTEM && CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include "conscomp.h"
+#include "classcom.h"
+#include "classfun.h"
+#include "classini.h"
+#include "cstrncmp.h"
+#include "envrnmnt.h"
+#include "objrtfnx.h"
+#include "sysdep.h"
+
+#if DEFRULE_CONSTRUCT
+#include "objrtcmp.h"
+#endif
+
+#include "objcmp.h"
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define MODULEI    0
+#define CLASSI     1
+#define LINKI      2
+#define SLOTI      3
+#define TSLOTI     4
+#define OSLOTI     5
+#define HANDLERI   6
+#define OHANDLERI  7
+
+#define SAVE_ITEMS 8
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+#define ClassPrefix()          ConstructPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem)
+#define ClassLinkPrefix()      ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,2)
+#define SlotPrefix()           ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,3)
+#define TemplateSlotPrefix()   ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,4)
+#define OrderedSlotPrefix()    ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,5)
+#define HandlerPrefix()        ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,6)
+#define OrderedHandlerPrefix() ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,7)
+#define SlotNamePrefix()       ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,8)
+#define SlotNameHashPrefix()   ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,9)
+#define ClassHashPrefix()      ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,10)
+#define ClassIDPrefix()        ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,11)
+#define MaxClassIDPrefix()     ArbitraryPrefix(ObjectCompilerData(theEnv)->ObjectCodeItem,12)
+
+typedef struct
+  {
+   unsigned long classCount;
+   unsigned short currentPartition;
+   unsigned short slotCount;
+   unsigned int maxIndices;
+  } MARK_INFO;
+
+typedef union
+  {
+   struct
+     {
+      unsigned thePartition : 16;
+      unsigned theOffset    : 16;
+     } theLocation;
+   unsigned long theLong;
+  } PACKED_LOCATION_INFO;
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ReadyObjectsForCode(Environment *);
+   static void                    MarkDefclassAndSlots(Environment *,ConstructHeader *,void *);
+   static void                    PrintSlotNameReference(Environment *,FILE *,SLOT_NAME *,unsigned int,unsigned int);
+   static void                    InitObjectsCode(Environment *,FILE *,unsigned int,unsigned int);
+   static bool                    ObjectsToCode(Environment *,const char *,const char *,char *,unsigned int,
+                                                FILE *,unsigned int,unsigned int);
+   static bool                    ClassIDMapToCode(Environment *,const char *,const char *,char *,unsigned int,
+                                                   FILE *,unsigned int,unsigned int,unsigned int *);
+   static bool                    ClassHashTableToCode(Environment *,const char *,const char *,char *,unsigned int,
+                                                       FILE *,unsigned int,unsigned int,unsigned int *);
+   static bool                    SlotNameHashTableToCode(Environment *,const char *,const char *,char *,unsigned int,
+                                                          FILE *,unsigned int,unsigned int,unsigned int *);
+   static bool                    SlotNameEntriesToCode(Environment *,const char *,const char *,char *,unsigned int,
+                                                        FILE *,unsigned int,unsigned int,unsigned int *);
+   static void                    CloseObjectFiles(Environment *,FILE *[SAVE_ITEMS],bool [SAVE_ITEMS],
+                                                   struct CodeGeneratorFile [SAVE_ITEMS],unsigned int);
+   static void                    DefclassModuleToCode(Environment *,FILE *,Defmodule *,unsigned int,unsigned int);
+   static void                    SingleDefclassToCode(Environment *,FILE *,unsigned int,unsigned int,Defclass *,unsigned int,
+                                                      unsigned int,unsigned int,unsigned int,unsigned int,unsigned int,unsigned int,
+                                                      unsigned int,unsigned int,unsigned int,unsigned int,unsigned int,unsigned int);
+   static bool                    InheritanceLinksToCode(Environment *,FILE **,const char *,const char *,char *,
+                                                         unsigned int,unsigned int,FILE *,
+                                                         unsigned int *,unsigned int,Defclass *,unsigned int *,
+                                                         unsigned int *,bool *,struct CodeGeneratorFile *);
+   static bool                    SlotsToCode(Environment *,FILE **,const char *,const char *,char *,unsigned int,unsigned int,FILE *,
+                                              unsigned int *,unsigned int,Defclass *,unsigned int *,
+                                              unsigned int *,bool *,struct CodeGeneratorFile *);
+   static bool                    TemplateSlotsToCode(Environment *,FILE **,const char *,const char *,char *,
+                                                      unsigned int,unsigned int,FILE *,
+                                                      unsigned int *,unsigned int,Defclass *,unsigned int *,
+                                                      unsigned int *,bool *,struct CodeGeneratorFile *);
+   static bool                    OrderedSlotsToCode(Environment *,FILE **,const char *,const char *,char *,
+                                                     unsigned int,unsigned int,FILE *,
+                                                     unsigned int *,unsigned int,Defclass *,unsigned int *,
+                                                     unsigned int *,bool *,struct CodeGeneratorFile *);
+   static bool                    HandlersToCode(Environment *,FILE **,const char *,const char *,char *,
+                                                 unsigned int,unsigned int,FILE *,
+                                                 unsigned int *,unsigned int,Defclass *,unsigned int,unsigned int *,
+                                                 unsigned int *,bool *,struct CodeGeneratorFile *);
+   static bool                    OrderedHandlersToCode(Environment *,FILE **,const char *,const char *,char *,
+                                                        unsigned int,unsigned int,FILE *,
+                                                        unsigned int *,unsigned int,Defclass *,unsigned int *,
+                                                        unsigned int *,bool *,struct CodeGeneratorFile *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : SetupObjectsCompiler
+  DESCRIPTION  : Initializes the construct compiler
+                   item for defclasses & handlers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Code generator item initialized
+  NOTES        : None
+ ***************************************************/
+void SetupObjectsCompiler(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,OBJECT_COMPILER_DATA,sizeof(struct objectCompilerData),NULL);
+
+   ObjectCompilerData(theEnv)->ObjectCodeItem = AddCodeGeneratorItem(theEnv,"objects",0,ReadyObjectsForCode,
+                                         InitObjectsCode,ObjectsToCode,13);
+  }
+
+
+/*********************************************************
+  NAME         : PrintClassReference
+  DESCRIPTION  : Writes out a reference to the class array
+  INPUTS       : 1) Output file pointer
+                 2) Class address
+                 3) Construct set image id
+                 4) The maximum number of indices allowed
+                    in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Writes out class array reference to file
+  NOTES        : None
+ *********************************************************/
+void PrintClassReference(
+  Environment *theEnv,
+  FILE *fp,
+  Defclass *cls,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   if (cls == NULL)
+     fprintf(fp,"NULL");
+   else
+     fprintf(fp,"&%s%u_%lu[%lu]",
+                 ClassPrefix(),
+                 imageID,
+                 ((cls->header.bsaveID / maxIndices) + 1),
+                 (cls->header.bsaveID % maxIndices));
+  }
+
+/****************************************************
+  NAME         : DefclassCModuleReference
+  DESCRIPTION  : Prints out a reference to a
+                 defclass module
+  INPUTS       : 1) The output file
+                 2) The id of the module item
+                 3) The id of the image
+                 4) The maximum number of elements
+                    allowed in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass module reference printed
+  NOTES        : None
+ ****************************************************/
+void DefclassCModuleReference(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned long count,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"MIHS &%s%u_%lu[%lu]",
+                   ModulePrefix(ObjectCompilerData(theEnv)->ObjectCodeItem),
+                   imageID,
+                   (count / maxIndices) + 1,
+                   (count % maxIndices));
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*******************************************************
+  NAME         : ReadyObjectsForCode
+  DESCRIPTION  : Sets index of classes and slot name
+                   entries for use in compiled
+                   expressions
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : BsaveIndices set
+  NOTES        : None
+ *******************************************************/
+static void ReadyObjectsForCode(
+  Environment *theEnv)
+  {
+   MARK_INFO markInfo;
+   unsigned long i;
+   int j;
+   SLOT_NAME *snp;
+
+   markInfo.classCount = 0L;
+   markInfo.currentPartition = 1;
+   markInfo.slotCount = 0;
+
+   /* =====================================
+      Gets the value of MaxIndices directly
+      from the global in CONSCOMP.C
+      ===================================== */
+   markInfo.maxIndices = ConstructCompilerData(theEnv)->MaxIndices;
+   DoForAllConstructs(theEnv,MarkDefclassAndSlots,DefclassData(theEnv)->DefclassModuleIndex,
+                      false,&markInfo);
+   i = 0L;
+   for (j = 0 ; j < SLOT_NAME_TABLE_HASH_SIZE ; j++)
+     for (snp = DefclassData(theEnv)->SlotNameTable[j] ; snp != NULL ; snp = snp->nxt)
+       snp->bsaveIndex = i++;
+  }
+
+/************************************************************
+  NAME         : MarkDefclassAndSlots
+  DESCRIPTION  : Sets the bsave indices of the classes
+                 for use in printing references to
+                 them later.
+
+                 Also, the partitions and offsets are
+                 predetermined for every slot and
+                 packed into a single long (the slot
+                 bsave index) for use in printing
+                 references to them later
+  INPUTS       : 1) The defclass
+                 2) A buffer containing the info:
+                    a) Total number of classes counted so far
+                    b) The current partition # for slots
+                    c) The current offset in that partition
+                    d) The max # of elements in any array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Bsave indices of classes and slots set
+  NOTES        : The template slots are written at the
+                 same time as the real slots - thus the
+                 references must be predetermined
+ ************************************************************/
+static void MarkDefclassAndSlots(
+  Environment *theEnv,
+  ConstructHeader *vTheDefclass,
+  void *vTheBuffer)
+  {
+   Defclass *theDefclass = (Defclass *) vTheDefclass;
+   MARK_INFO *markInfo = (MARK_INFO *) vTheBuffer;
+   long i;
+   PACKED_LOCATION_INFO theLocationInfo;
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   theDefclass->header.bsaveID = markInfo->classCount++;
+   for (i = 0 ; i < theDefclass->slotCount ; i++)
+     {
+      theLocationInfo.theLocation.thePartition = markInfo->currentPartition;
+      theLocationInfo.theLocation.theOffset = markInfo->slotCount;
+      theDefclass->slots[i].bsaveIndex = theLocationInfo.theLong;
+      markInfo->slotCount++;
+      if (markInfo->slotCount >= markInfo->maxIndices)
+        {
+         markInfo->currentPartition++;
+         markInfo->slotCount = 0;
+        }
+     }
+  }
+
+/*************************************************************
+  NAME         : PrintSlotNameReference
+  DESCRIPTION  : Writes out a reference to the slot name array
+  INPUTS       : 1) Output file pointer
+                 2) Slot name address
+                 3) Construct set image id
+                 4) The maximum number of indices allowed
+                    in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Writes out slot name array reference to file
+  NOTES        : None
+ *************************************************************/
+static void PrintSlotNameReference(
+  Environment *theEnv,
+  FILE *fp,
+  SLOT_NAME *snp,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   if (snp == NULL)
+     fprintf(fp,"NULL");
+   else
+     fprintf(fp,"&%s%u_%lu[%lu]",
+                 SlotNamePrefix(),
+                 imageID,
+                 ((snp->bsaveIndex / maxIndices) + 1),
+                 (snp->bsaveIndex % maxIndices));
+  }
+
+/*******************************************************
+  NAME         : InitObjectsCode
+  DESCRIPTION  : Writes out initialization code for
+                   generic functions
+  INPUTS       : 1) The initialization code file pointer
+                 2) The construct set image id
+                 3) The max number of indices allowed in
+                    an array for this construct set
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Writes out initialization code
+  NOTES        : None
+ *******************************************************/
+static void InitObjectsCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+#if MAC_XCD
+#pragma unused(maxIndices)
+#endif
+
+   fprintf(initFP,"   ObjectsRunTimeInitialize(theEnv,%s%u_1,%s%u_1,%s%u_1,%s%u);\n",
+                      ClassHashPrefix(),imageID,SlotNameHashPrefix(),imageID,
+                      ClassIDPrefix(),imageID,MaxClassIDPrefix(),imageID);
+  }
+
+/*************************************************************
+  NAME         : ObjectsToCode
+  DESCRIPTION  : Writes out static array code for
+                   classes, message-handlers, and associated
+                   structures
+  INPUTS       : 1) The base name of the construct set
+                 2) The base id for this construct
+                 3) The file pointer for the header file
+                 4) The base id for the construct set
+                 5) The max number of indices allowed
+                    in an array
+  RETURNS      : False on errors,
+                 True if object system structures written
+  SIDE EFFECTS : Code written to files
+  NOTES        : None
+ *************************************************************/
+static bool ObjectsToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int fileCount = 1;
+   Defmodule *theModule;
+   Defclass *theDefclass;
+   int i;
+   unsigned int moduleCount = 0;
+   unsigned int itemArrayCounts[SAVE_ITEMS];
+   unsigned int itemArrayVersions[SAVE_ITEMS];
+   FILE *itemFiles[SAVE_ITEMS];
+   bool itemReopenFlags[SAVE_ITEMS];
+   struct CodeGeneratorFile itemCodeFiles[SAVE_ITEMS];
+
+   for (i = 0 ; i < SAVE_ITEMS ; i++)
+     {
+      itemArrayCounts[i] = 0;
+      itemArrayVersions[i] = 1;
+      itemFiles[i] = NULL;
+      itemReopenFlags[i] = false;
+      itemCodeFiles[i].filePrefix = NULL;
+      itemCodeFiles[i].pathName = pathName;
+      itemCodeFiles[i].fileNameBuffer = fileNameBuffer;
+     }
+   fprintf(headerFP,"#include \"classcom.h\"\n");
+   fprintf(headerFP,"#include \"classini.h\"\n");
+   if (ClassIDMapToCode(theEnv,fileName,pathName,fileNameBuffer,fileID,headerFP,imageID,maxIndices,&fileCount)
+       == false)
+     return false;
+   if (ClassHashTableToCode(theEnv,fileName,pathName,fileNameBuffer,fileID,headerFP,imageID,maxIndices,&fileCount)
+       == false)
+     return false;
+   if (SlotNameHashTableToCode(theEnv,fileName,pathName,fileNameBuffer,fileID,headerFP,imageID,maxIndices,&fileCount)
+       == false)
+     return false;
+   if (SlotNameEntriesToCode(theEnv,fileName,pathName,fileNameBuffer,fileID,headerFP,imageID,maxIndices,&fileCount)
+       == false)
+     return false;
+
+   /* =============================================================
+      Loop through all the modules and all the defclasses writing
+      their C code representation to the file as they are traversed
+      ============================================================= */
+   theModule = GetNextDefmodule(theEnv,NULL);
+
+   while (theModule != NULL)
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      itemFiles[MODULEI] =
+            OpenFileIfNeeded(theEnv,itemFiles[MODULEI],fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                             itemArrayVersions[MODULEI],headerFP,
+                             "DEFCLASS_MODULE",ModulePrefix(ObjectCompilerData(theEnv)->ObjectCodeItem),
+                             itemReopenFlags[MODULEI],&itemCodeFiles[MODULEI]);
+      if (itemFiles[MODULEI] == NULL)
+        goto ObjectCodeError;
+
+      DefclassModuleToCode(theEnv,itemFiles[MODULEI],theModule,imageID,maxIndices);
+      itemFiles[MODULEI] =
+          CloseFileIfNeeded(theEnv,itemFiles[MODULEI],&itemArrayCounts[MODULEI],
+                            &itemArrayVersions[MODULEI],maxIndices,
+                            &itemReopenFlags[MODULEI],&itemCodeFiles[MODULEI]);
+
+      for (theDefclass = GetNextDefclass(theEnv,NULL) ;
+           theDefclass != NULL ;
+           theDefclass = GetNextDefclass(theEnv,theDefclass))
+        {
+         itemFiles[CLASSI] =
+            OpenFileIfNeeded(theEnv,itemFiles[CLASSI],fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                             itemArrayVersions[CLASSI],headerFP,
+                             "Defclass",ClassPrefix(),
+                             itemReopenFlags[CLASSI],&itemCodeFiles[CLASSI]);
+         if (itemFiles[CLASSI] == NULL)
+           goto ObjectCodeError;
+         SingleDefclassToCode(theEnv,itemFiles[CLASSI],imageID,maxIndices,
+                              theDefclass,moduleCount,
+                              itemArrayVersions[LINKI],itemArrayCounts[LINKI],
+                              itemArrayVersions[SLOTI],itemArrayCounts[SLOTI],
+                              itemArrayVersions[TSLOTI],itemArrayCounts[TSLOTI],
+                              itemArrayVersions[OSLOTI],itemArrayCounts[OSLOTI],
+                              itemArrayVersions[HANDLERI],itemArrayCounts[HANDLERI],
+                              itemArrayVersions[OHANDLERI],itemArrayCounts[OHANDLERI]);
+         itemArrayCounts[CLASSI]++;
+         itemFiles[CLASSI] =
+           CloseFileIfNeeded(theEnv,itemFiles[CLASSI],&itemArrayCounts[CLASSI],
+                             &itemArrayVersions[CLASSI],maxIndices,
+                             &itemReopenFlags[CLASSI],&itemCodeFiles[CLASSI]);
+
+         if (InheritanceLinksToCode(theEnv,&itemFiles[LINKI],fileName,pathName,fileNameBuffer,fileID,imageID,
+                                    headerFP,&fileCount,maxIndices,theDefclass,
+                                    &itemArrayVersions[LINKI],&itemArrayCounts[LINKI],
+                                    &itemReopenFlags[LINKI],&itemCodeFiles[LINKI])
+              == false)
+           goto ObjectCodeError;
+
+         if (SlotsToCode(theEnv,&itemFiles[SLOTI],fileName,pathName,fileNameBuffer,fileID,imageID,
+                         headerFP,&fileCount,maxIndices,theDefclass,
+                         &itemArrayVersions[SLOTI],&itemArrayCounts[SLOTI],
+                         &itemReopenFlags[SLOTI],&itemCodeFiles[SLOTI])
+              == false)
+           goto ObjectCodeError;
+
+         if (TemplateSlotsToCode(theEnv,&itemFiles[TSLOTI],fileName,pathName,fileNameBuffer,fileID,imageID,
+                                 headerFP,&fileCount,maxIndices,theDefclass,
+                                 &itemArrayVersions[TSLOTI],&itemArrayCounts[TSLOTI],
+                                 &itemReopenFlags[TSLOTI],&itemCodeFiles[TSLOTI])
+              == false)
+           goto ObjectCodeError;
+
+         if (OrderedSlotsToCode(theEnv,&itemFiles[OSLOTI],fileName,pathName,fileNameBuffer,fileID,imageID,
+                                headerFP,&fileCount,maxIndices,theDefclass,
+                                &itemArrayVersions[OSLOTI],&itemArrayCounts[OSLOTI],
+                                &itemReopenFlags[OSLOTI],&itemCodeFiles[OSLOTI])
+              == false)
+           goto ObjectCodeError;
+
+         if (HandlersToCode(theEnv,&itemFiles[HANDLERI],fileName,pathName,fileNameBuffer,fileID,imageID,
+                            headerFP,&fileCount,maxIndices,theDefclass,moduleCount,
+                            &itemArrayVersions[HANDLERI],&itemArrayCounts[HANDLERI],
+                            &itemReopenFlags[HANDLERI],&itemCodeFiles[HANDLERI])
+              == false)
+           goto ObjectCodeError;
+
+         if (OrderedHandlersToCode(theEnv,&itemFiles[OHANDLERI],fileName,pathName,fileNameBuffer,fileID,imageID,
+                                   headerFP,&fileCount,maxIndices,theDefclass,
+                                   &itemArrayVersions[OHANDLERI],&itemArrayCounts[OHANDLERI],
+                                   &itemReopenFlags[OHANDLERI],&itemCodeFiles[OHANDLERI])
+              == false)
+           goto ObjectCodeError;
+        }
+
+      theModule = GetNextDefmodule(theEnv,theModule);
+      moduleCount++;
+      itemArrayCounts[MODULEI]++;
+     }
+
+   CloseObjectFiles(theEnv,itemFiles,itemReopenFlags,itemCodeFiles,maxIndices);
+   return true;
+
+ObjectCodeError:
+   CloseObjectFiles(theEnv,itemFiles,itemReopenFlags,itemCodeFiles,maxIndices);
+   return false;
+  }
+
+/************************************************************
+  NAME         : ClassIDMapToCode
+  DESCRIPTION  : Writes out class id map
+  INPUTS       : 1) Header file pointer
+                 2) Output file pointer
+                 3) The construct set image id
+                 4) The max # of allowed indices
+                 5) Caller's file count buffer
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Class ID Map and Max Indices Written
+  NOTES        : None
+ ***********************************************************/
+static bool ClassIDMapToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int *fileCount)
+  {
+   FILE *classIDMapFile = NULL;
+   unsigned int classIDMapArrayCount;
+   unsigned int classIDMapArrayVersion = 1;
+
+   classIDMapFile = OpenFileIfNeeded(theEnv,classIDMapFile,fileName,pathName,fileNameBuffer,fileID,imageID,fileCount,
+                                     classIDMapArrayVersion,headerFP,
+                                     "Defclass *",ClassIDPrefix(),false,NULL);
+   if (classIDMapFile == NULL)
+     return false;
+   for (classIDMapArrayCount = 0 ;
+        classIDMapArrayCount < DefclassData(theEnv)->MaxClassID ;
+        classIDMapArrayCount++)
+     {
+      if (classIDMapArrayCount > 0)
+        fprintf(classIDMapFile,",\n");
+      PrintClassReference(theEnv,classIDMapFile,DefclassData(theEnv)->ClassIDMap[classIDMapArrayCount],
+                          imageID,maxIndices);
+     }
+   fprintf(classIDMapFile,"};\n\n");
+   fprintf(classIDMapFile,"unsigned %s%d = %u;\n",
+                          MaxClassIDPrefix(),imageID,(unsigned) DefclassData(theEnv)->MaxClassID);
+   fprintf(headerFP,"extern unsigned %s%d;\n",MaxClassIDPrefix(),imageID);
+   GenClose(theEnv,classIDMapFile);
+   return true;
+  }
+
+/************************************************************
+  NAME         : ClassHashTableToCode
+  DESCRIPTION  : Writes out class hash table
+  INPUTS       : 1) Header file pointer
+                 2) Output file pointer
+                 3) The construct set image id
+                 4) The max # of allowed indices
+                 5) Caller's file count buffer
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Class Hash Table Written
+  NOTES        : None
+ ***********************************************************/
+static bool ClassHashTableToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int *fileCount)
+  {
+   FILE *classHashFile = NULL;
+   unsigned int classHashArrayCount,
+       classHashArrayVersion = 1;
+
+   classHashFile = OpenFileIfNeeded(theEnv,classHashFile,fileName,pathName,fileNameBuffer,fileID,imageID,fileCount,
+                                    classHashArrayVersion,headerFP,
+                                    "Defclass *",ClassHashPrefix(),false,NULL);
+   if (classHashFile == NULL)
+     return false;
+   for (classHashArrayCount = 0 ;
+        classHashArrayCount < CLASS_TABLE_HASH_SIZE ;
+        classHashArrayCount++)
+     {
+      if (classHashArrayCount > 0)
+        fprintf(classHashFile,",\n");
+      PrintClassReference(theEnv,classHashFile,DefclassData(theEnv)->ClassTable[classHashArrayCount],
+                          imageID,maxIndices);
+     }
+
+   CloseFileIfNeeded(theEnv,classHashFile,&classHashArrayCount,
+                     &classHashArrayVersion,classHashArrayCount,NULL,NULL);
+   return true;
+  }
+
+/************************************************************
+  NAME         : SlotNameHashTableToCode
+  DESCRIPTION  : Writes out slot name entry hash table
+  INPUTS       : 1) Header file pointer
+                 2) Output file pointer
+                 3) The construct set image id
+                 4) The max # of allowed indices
+                 5) Caller's version number buffer
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Slot Name Hash Table Written
+  NOTES        : None
+ ***********************************************************/
+static bool SlotNameHashTableToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int *fileCount)
+  {
+   FILE *slotNameHashFile = NULL;
+   unsigned int slotNameHashArrayCount,
+       slotNameHashArrayVersion = 1;
+
+   slotNameHashFile = OpenFileIfNeeded(theEnv,slotNameHashFile,fileName,pathName,fileNameBuffer,fileID,
+                                       imageID,fileCount,
+                                       slotNameHashArrayVersion,headerFP,
+                                       "SLOT_NAME *",SlotNameHashPrefix(),false,NULL);
+   if (slotNameHashFile == NULL)
+     return false;
+   for (slotNameHashArrayCount = 0 ;
+        slotNameHashArrayCount < SLOT_NAME_TABLE_HASH_SIZE ;
+        slotNameHashArrayCount++)
+     {
+      if (slotNameHashArrayCount > 0)
+        fprintf(slotNameHashFile,",\n");
+      PrintSlotNameReference(theEnv,slotNameHashFile,DefclassData(theEnv)->SlotNameTable[slotNameHashArrayCount],
+                             imageID,maxIndices);
+     }
+   CloseFileIfNeeded(theEnv,slotNameHashFile,&slotNameHashArrayCount,
+                                        &slotNameHashArrayVersion,slotNameHashArrayCount,
+                                        NULL,NULL);
+   return true;
+  }
+
+/************************************************************
+  NAME         : SlotNameEntriesToCode
+  DESCRIPTION  : Writes out slot name entries
+  INPUTS       : 1) Header file pointer
+                 2) Output file pointer
+                 3) The construct set image id
+                 4) The max # of allowed indices
+                 5) Caller's version number buffer
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Slot name entries Written
+  NOTES        : None
+ ***********************************************************/
+static bool SlotNameEntriesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int *fileCount)
+  {
+   FILE *slotNameFile = NULL;
+   unsigned int slotNameArrayCount = 0,
+       slotNameArrayVersion = 1;
+   SLOT_NAME *snp;
+   unsigned i;
+
+   for (i = 0 ; i < SLOT_NAME_TABLE_HASH_SIZE ; i++)
+     {
+      for (snp = DefclassData(theEnv)->SlotNameTable[i] ; snp != NULL ; snp = snp->nxt)
+        {
+         slotNameFile = OpenFileIfNeeded(theEnv,slotNameFile,fileName,pathName,fileNameBuffer,fileID,
+                                       imageID,fileCount,
+                                       slotNameArrayVersion,headerFP,
+                                       "SLOT_NAME",SlotNamePrefix(),false,NULL);
+         if (slotNameFile == NULL)
+           return false;
+         fprintf(slotNameFile,"{ %u,1,%d,",snp->hashTableIndex,snp->id);
+         PrintSymbolReference(theEnv,slotNameFile,snp->name);
+         fprintf(slotNameFile,",");
+         PrintSymbolReference(theEnv,slotNameFile,snp->putHandlerName);
+         fprintf(slotNameFile,",");
+         PrintSlotNameReference(theEnv,slotNameFile,snp->nxt,imageID,maxIndices);
+         fprintf(slotNameFile,",0L }");
+         slotNameArrayCount++;
+         slotNameFile = CloseFileIfNeeded(theEnv,slotNameFile,&slotNameArrayCount,
+                                          &slotNameArrayVersion,maxIndices,NULL,NULL);
+        }
+     }
+   if (slotNameFile != NULL)
+     CloseFileIfNeeded(theEnv,slotNameFile,&slotNameArrayCount,
+                       &slotNameArrayVersion,slotNameArrayCount,NULL,NULL);
+   return true;
+  }
+
+/******************************************************
+  NAME         : CloseObjectFiles
+  DESCRIPTION  : Closes construct compiler files
+                  for defclass structures
+  INPUTS       : 1) An array containing all the
+                    pertinent file pointers
+                 2) An array containing all the
+                    pertinent file reopen flags
+                 3) An array containing all the
+                    pertinent file name/id/version info
+                 4) The maximum number of indices
+                    allowed in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Files closed
+  NOTES        : None
+ *****************************************************/
+static void CloseObjectFiles(
+  Environment *theEnv,
+  FILE *itemFiles[SAVE_ITEMS],
+  bool itemReopenFlags[SAVE_ITEMS],
+  struct CodeGeneratorFile itemCodeFiles[SAVE_ITEMS],
+  unsigned int maxIndices)
+  {
+   unsigned int count = maxIndices;
+   unsigned int arrayVersion = 0;
+   int i;
+
+   for (i = 0 ; i < SAVE_ITEMS ; i++)
+     {
+      count = maxIndices;
+      itemFiles[i] = CloseFileIfNeeded(theEnv,itemFiles[i],&count,&arrayVersion,
+                                       maxIndices,&itemReopenFlags[i],
+                                       &itemCodeFiles[i]);
+     }
+  }
+
+/***************************************************
+  NAME         : DefclassModuleToCode
+  DESCRIPTION  : Writes out the C values for a
+                 defclass module item
+  INPUTS       : 1) The output file
+                 2) The module for the defclasses
+                 3) The compile image id
+                 4) The maximum number of elements
+                    in an array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass module item written
+  NOTES        : None
+ ***************************************************/
+static void DefclassModuleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"{");
+   ConstructModuleToCode(theEnv,theFile,theModule,imageID,maxIndices,
+                         DefclassData(theEnv)->DefclassModuleIndex,ClassPrefix());
+   fprintf(theFile,"}");
+  }
+
+/****************************************************************
+  NAME         : SingleDefclassToCode
+  DESCRIPTION  : Writes out a single defclass's
+                 data to the file
+  INPUTS       : 1)  The output file
+                 2)  The compile image id
+                 3)  The maximum number of
+                     elements in an array
+                 4)  The defclass
+                 5)  The module index
+                 6)  The partition holding the
+                     defclass inheritance links
+                 7)  The relative index of the
+                     inheritance links in the partition
+                 8)  The partition holding the
+                     defclass slots
+                 9)  The relative index of the
+                     slots in the partition
+                 10) The partition holding the
+                     defclass template slots
+                 11) The relative index of the
+                     template slots in the partition
+                 12) The partition holding the
+                     defclass ordered slot map
+                 13) The relative index of the
+                     ordered slot map in the partition
+                 14) The partition holding the
+                     defclass message-handlers
+                 15) The relative index of the
+                     message-handlers in the partition
+                 16) The partition holding the
+                     defclass ordered handler map
+                 17) The relative index of the
+                     ordered handler map in the partition
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass data written
+  NOTES        : None
+ ***************************************************************/
+static void SingleDefclassToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  Defclass *theDefclass,
+  unsigned int moduleCount,
+  unsigned int classLinkArrayVersion,
+  unsigned int classLinkArrayCount,
+  unsigned int slotArrayVersion,
+  unsigned int slotArrayCount,
+  unsigned int templateSlotArrayVersion,
+  unsigned int templateSlotArrayCount,
+  unsigned int orderedSlotArrayVersion,
+  unsigned int orderedSlotArrayCount,
+  unsigned int handlerArrayVersion,
+  unsigned int handlerArrayCount,
+  unsigned int orderedHandlerArrayVersion,
+  unsigned int orderedHandlerArrayCount)
+  {
+   /* ==================
+      Defclass Header
+      ================== */
+   fprintf(theFile,"{");
+   ConstructHeaderToCode(theEnv,theFile,&theDefclass->header,imageID,maxIndices,moduleCount,
+                         ModulePrefix(ObjectCompilerData(theEnv)->ObjectCodeItem),ClassPrefix());
+
+   /* =========================
+      Defclass specific data
+      ========================= */
+   fprintf(theFile,",1,%u,%u,%u,0,0,%u,0,%u,\n   ",
+                   theDefclass->system,theDefclass->abstract,
+                   theDefclass->reactive,(unsigned) theDefclass->id,
+                   theDefclass->hashTableIndex);
+
+   if (theDefclass->directSuperclasses.classCount > 0)
+     fprintf(theFile,"{ %lu,&%s%d_%d[%d] },",
+                     theDefclass->directSuperclasses.classCount,
+                     ClassLinkPrefix(),
+                     imageID,classLinkArrayVersion,classLinkArrayCount);
+   else
+     fprintf(theFile,"{ 0,NULL },");
+   classLinkArrayCount += theDefclass->directSuperclasses.classCount;
+
+   if (theDefclass->directSubclasses.classCount > 0)
+     fprintf(theFile,"{ %lu,&%s%d_%d[%d] },",
+                     theDefclass->directSubclasses.classCount,
+                     ClassLinkPrefix(),
+                     imageID,classLinkArrayVersion,classLinkArrayCount);
+   else
+     fprintf(theFile,"{ 0,NULL },");
+   classLinkArrayCount += theDefclass->directSubclasses.classCount;
+
+   if (theDefclass->allSuperclasses.classCount > 0)
+     fprintf(theFile,"{ %lu,&%s%d_%d[%d] },",
+                     theDefclass->allSuperclasses.classCount,
+                     ClassLinkPrefix(),
+                     imageID,classLinkArrayVersion,classLinkArrayCount);
+   else
+     fprintf(theFile,"{ 0,NULL },\n   ");
+
+   if (theDefclass->slots != NULL)
+     fprintf(theFile,"&%s%d_%d[%d],",
+                     SlotPrefix(),imageID,
+                     slotArrayVersion,slotArrayCount);
+   else
+     fprintf(theFile,"NULL,");
+
+   if (theDefclass->instanceTemplate != NULL)
+     fprintf(theFile,"&%s%d_%d[%d],",
+                     TemplateSlotPrefix(),imageID,
+                     templateSlotArrayVersion,templateSlotArrayCount);
+   else
+     fprintf(theFile,"NULL,");
+
+   if (theDefclass->slotNameMap != NULL)
+     fprintf(theFile,"&%s%d_%d[%d],",
+                     OrderedSlotPrefix(),imageID,
+                     orderedSlotArrayVersion,orderedSlotArrayCount);
+   else
+     fprintf(theFile,"NULL,");
+
+   fprintf(theFile,"%u,%u,%u,%u,NULL,NULL,\n   ",
+                   theDefclass->slotCount,theDefclass->localInstanceSlotCount,
+                   theDefclass->instanceSlotCount,theDefclass->maxSlotNameID);
+
+   if (theDefclass->handlers != NULL)
+     fprintf(theFile,"&%s%d_%d[%d],",
+                     HandlerPrefix(),imageID,
+                     handlerArrayVersion,handlerArrayCount);
+   else
+     fprintf(theFile,"NULL,");
+
+   if (theDefclass->handlerOrderMap != NULL)
+     fprintf(theFile,"&%s%d_%d[%d],",
+                     OrderedHandlerPrefix(),imageID,
+                     orderedHandlerArrayVersion,orderedHandlerArrayCount);
+   else
+     fprintf(theFile,"NULL,");
+
+   fprintf(theFile,"%u,",theDefclass->handlerCount);
+   PrintClassReference(theEnv,theFile,theDefclass->nxtHash,imageID,maxIndices);
+   fprintf(theFile,",");
+   PrintBitMapReference(theEnv,theFile,theDefclass->scopeMap);
+   
+#if DEFRULE_CONSTRUCT
+   fprintf(theFile,",");
+   ClassAlphaLinkReference(theEnv,theDefclass->relevant_terminal_alpha_nodes,theFile,imageID,maxIndices);
+#endif
+
+   fprintf(theFile,",\"\"");
+   
+   fprintf(theFile,"}");
+  }
+
+/***********************************************************
+  NAME         : InheritanceLinksToCode
+  DESCRIPTION  : Prints out superclass/subclass
+                 inheritance links - all links
+                 for a particular class are
+                 guaranteed to be in the same
+                 array partition
+  INPUTS       : 1)  A buffer for the inheritance links file
+                 2)  The base image name
+                 3)  The id for this type of data
+                 4)  The base image id
+                 5)  The general header file
+                 6)  A buffer for the version number of
+                     the file for this type of data
+                 7)  The maximum # of elements in any array
+                 8)  A pointer to the class
+                 9)  A buffer holding the links partition #
+                 10) A buffer holding the links relative
+                     index in the partition
+                 11) A buffer for a flag indicating if the
+                     buffer file can be reopened later
+                 12) A pointer to the file info for
+                     this data if the last file needs
+                     to be reopened for termination
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Inheritance links written
+  NOTES        : None
+ ***********************************************************/
+static bool InheritanceLinksToCode(
+  Environment *theEnv,
+  FILE **classLinkFile,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  unsigned int imageID,
+  FILE *headerFP,
+  unsigned int *fileCount,
+  unsigned int maxIndices,
+  Defclass *theDefclass,
+  unsigned int *classLinkArrayVersion,
+  unsigned int *classLinkArrayCount,
+  bool *reopenClassLinkFile,
+  struct CodeGeneratorFile *classLinkCodeFile)
+  {
+   unsigned long i;
+   unsigned long inheritanceLinkCount;
+   bool linkPrinted = false;
+
+   inheritanceLinkCount = theDefclass->directSuperclasses.classCount +
+                          theDefclass->directSubclasses.classCount +
+                          theDefclass->allSuperclasses.classCount;
+
+   if (inheritanceLinkCount == 0)
+     return true;
+
+   *classLinkFile = OpenFileIfNeeded(theEnv,*classLinkFile,fileName,pathName,fileNameBuffer,fileID,
+                                      imageID,fileCount,
+                                      *classLinkArrayVersion,headerFP,
+                                      "Defclass *",ClassLinkPrefix(),
+                                      *reopenClassLinkFile,classLinkCodeFile);
+   if (*classLinkFile == NULL)
+     return false;
+
+   for (i = 0 ; i < theDefclass->directSuperclasses.classCount ; i++)
+     {
+      if (linkPrinted)
+        fprintf(*classLinkFile,",");
+      PrintClassReference(theEnv,*classLinkFile,
+                          theDefclass->directSuperclasses.classArray[i],
+                          imageID,maxIndices);
+      linkPrinted = true;
+     }
+   for (i = 0 ; i < theDefclass->directSubclasses.classCount ; i++)
+     {
+      if (linkPrinted)
+        fprintf(*classLinkFile,",");
+      PrintClassReference(theEnv,*classLinkFile,
+                          theDefclass->directSubclasses.classArray[i],
+                          imageID,maxIndices);
+      linkPrinted = true;
+     }
+   for (i = 0 ; i < theDefclass->allSuperclasses.classCount ; i++)
+     {
+      if (linkPrinted)
+        fprintf(*classLinkFile,",");
+      PrintClassReference(theEnv,*classLinkFile,
+                          theDefclass->allSuperclasses.classArray[i],
+                          imageID,maxIndices);
+      linkPrinted = true;
+     }
+   *classLinkArrayCount += inheritanceLinkCount;
+   *classLinkFile = CloseFileIfNeeded(theEnv,*classLinkFile,classLinkArrayCount,
+                                       classLinkArrayVersion,maxIndices,
+                                       reopenClassLinkFile,classLinkCodeFile);
+   return true;
+  }
+
+/***********************************************************
+  NAME         : SlotsToCode
+  DESCRIPTION  : Prints out slots - all slots
+                 for a particular class are
+                 guaranteed to be in the same
+                 array partition
+  INPUTS       : 1)  A buffer for the slots file
+                 2)  The base image name
+                 3)  The id for this type of data
+                 4)  The base image id
+                 5)  The general header file
+                 6)  A buffer for the version number of
+                     the file for this type of data
+                 7)  The maximum # of elements in any array
+                 8)  A pointer to the class
+                 9)  A buffer holding the slots partition #
+                 10) A buffer holding the slots relative
+                     index in the partition
+                 11) A buffer for a flag indicating if the
+                     buffer file can be reopened later
+                 12) A pointer to the file info for
+                     this data if the last file needs
+                     to be reopened for termination
+  RETURNS      : True if all OK, FALSE
+                 otherwise
+  SIDE EFFECTS : Slots written
+  NOTES        : None
+ ***********************************************************/
+static bool SlotsToCode(
+  Environment *theEnv,
+  FILE **slotFile,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  unsigned int imageID,
+  FILE *headerFP,
+  unsigned int *fileCount,
+  unsigned int maxIndices,
+  Defclass *theDefclass,
+  unsigned int *slotArrayVersion,
+  unsigned int *slotArrayCount,
+  bool *reopenSlotFile,
+  struct CodeGeneratorFile *slotCodeFile)
+  {
+   long i;
+   SlotDescriptor *sd;
+   Expression *tmpexp;
+   PACKED_LOCATION_INFO theLocationInfo;
+
+   if (theDefclass->slotCount == 0)
+     return true;
+
+   *slotFile = OpenFileIfNeeded(theEnv,*slotFile,fileName,pathName,fileNameBuffer,fileID,
+                                imageID,fileCount,
+                                *slotArrayVersion,headerFP,
+                                "SlotDescriptor",SlotPrefix(),
+                                *reopenSlotFile,slotCodeFile);
+   if (*slotFile == NULL)
+     return false;
+
+   for (i = 0 ; i < theDefclass->slotCount ; i++)
+     {
+      sd = &theDefclass->slots[i];
+      if (i > 0)
+        fprintf(*slotFile,",\n");
+      fprintf(*slotFile,"{ %u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,",
+                        sd->shared,sd->multiple,
+                        sd->composite,sd->noInherit,
+                        sd->noWrite,sd->initializeOnly,
+                        sd->dynamicDefault,sd->defaultSpecified,
+                        sd->noDefault,sd->reactive,
+                        sd->publicVisibility,sd->createReadAccessor,
+                        sd->createWriteAccessor,sd->overrideMessageSpecified);
+      PrintClassReference(theEnv,*slotFile,sd->cls,imageID,maxIndices);
+      fprintf(*slotFile,",");
+      PrintSlotNameReference(theEnv,*slotFile,sd->slotName,imageID,maxIndices);
+      fprintf(*slotFile,",\n   ");
+      PrintSymbolReference(theEnv,*slotFile,sd->overrideMessage);
+      if (sd->defaultValue != NULL)
+        {
+         fprintf(*slotFile,",(void *) ");
+         if (sd->dynamicDefault)
+           ExpressionToCode(theEnv,*slotFile,(Expression *) sd->defaultValue);
+         else
+           {
+            tmpexp = ConvertValueToExpression(theEnv,(UDFValue *) sd->defaultValue);
+            ExpressionToCode(theEnv,*slotFile,tmpexp);
+            ReturnExpression(theEnv,tmpexp);
+           }
+        }
+      else
+        fprintf(*slotFile,",NULL");
+      fprintf(*slotFile,",");
+      PrintConstraintReference(theEnv,*slotFile,sd->constraint,imageID,maxIndices);
+      fprintf(*slotFile,",0,0L,");
+      if (sd->shared)
+        {
+         theLocationInfo.theLong = sd->sharedValue.desc->bsaveIndex;
+         fprintf(*slotFile,"{ &%s%d_%u[%u],0,0,0,{ NULL } } }",
+                           SlotPrefix(),imageID,
+                           theLocationInfo.theLocation.thePartition,
+                           theLocationInfo.theLocation.theOffset);
+        }
+      else
+        fprintf(*slotFile,"{ NULL,0,0,0, { NULL } } }");
+     }
+   *slotArrayCount += theDefclass->slotCount;
+   *slotFile = CloseFileIfNeeded(theEnv,*slotFile,slotArrayCount,
+                                 slotArrayVersion,maxIndices,
+                                 reopenSlotFile,slotCodeFile);
+   return true;
+  }
+
+/*************************************************************
+  NAME         : TemplateSlotsToCode
+  DESCRIPTION  : Prints out instance template -
+                 the entire instance slot template
+                 for a particular class is
+                 guaranteed to be in the same
+                 array partition
+  INPUTS       : 1)  A buffer for the template file
+                 2)  The base image name
+                 3)  The id for this type of data
+                 4)  The base image id
+                 5)  The general header file
+                 6)  A buffer for the version number of
+                     the file for this type of data
+                 7)  The maximum # of elements in any array
+                 8)  A pointer to the class
+                 9)  A buffer holding the template partition #
+                 10) A buffer holding the template relative
+                     index in the partition
+                 11) A buffer for a flag indicating if the
+                     buffer file can be reopened later
+                 12) A pointer to the file info for
+                     this data if the last file needs
+                     to be reopened for termination
+  RETURNS      : True if all OK, false
+                 otherwise
+  SIDE EFFECTS : Templates written
+  NOTES        : None
+ *************************************************************/
+static bool TemplateSlotsToCode(
+  Environment *theEnv,
+  FILE **templateSlotFile,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  unsigned int imageID,
+  FILE *headerFP,
+  unsigned int *fileCount,
+  unsigned int maxIndices,
+  Defclass *theDefclass,
+  unsigned int *templateSlotArrayVersion,
+  unsigned int *templateSlotArrayCount,
+  bool *reopenTemplateSlotFile,
+  struct CodeGeneratorFile *templateSlotCodeFile)
+  {
+   unsigned long i;
+   SlotDescriptor *sd;
+   PACKED_LOCATION_INFO theLocationInfo;
+
+   if (theDefclass->instanceSlotCount == 0)
+     return true;
+
+   *templateSlotFile = OpenFileIfNeeded(theEnv,*templateSlotFile,fileName,pathName,fileNameBuffer,fileID,
+                                        imageID,fileCount,
+                                        *templateSlotArrayVersion,headerFP,
+                                        "SlotDescriptor *",TemplateSlotPrefix(),
+                                        *reopenTemplateSlotFile,templateSlotCodeFile);
+   if (*templateSlotFile == NULL)
+     return false;
+
+   for (i = 0 ; i < theDefclass->instanceSlotCount ; i++)
+     {
+      sd = theDefclass->instanceTemplate[i];
+      if (i > 0)
+        fprintf(*templateSlotFile,",");
+      theLocationInfo.theLong = sd->bsaveIndex;
+      fprintf(*templateSlotFile,"&%s%d_%u[%u]",
+                                SlotPrefix(),imageID,
+                                theLocationInfo.theLocation.thePartition,
+                                theLocationInfo.theLocation.theOffset);
+     }
+   *templateSlotArrayCount += theDefclass->instanceSlotCount;
+   *templateSlotFile = CloseFileIfNeeded(theEnv,*templateSlotFile,templateSlotArrayCount,
+                                         templateSlotArrayVersion,maxIndices,
+                                         reopenTemplateSlotFile,templateSlotCodeFile);
+   return true;
+  }
+
+/*************************************************************
+  NAME         : OrderedSlotsToCode
+  DESCRIPTION  : Prints out slot name map -
+                 the entire slot name map
+                 for a particular class is
+                 guaranteed to be in the same
+                 array partition
+  INPUTS       : 1)  A buffer for the slot map file
+                 2)  The base image name
+                 3)  The id for this type of data
+                 4)  The base image id
+                 5)  The general header file
+                 6)  A buffer for the version number of
+                     the file for this type of data
+                 7)  The maximum # of elements in any array
+                 8)  A pointer to the class
+                 9)  A buffer holding the slot map partition #
+                 10) A buffer holding the slot map relative
+                     index in the partition
+                 11) A buffer for a flag indicating if the
+                     buffer file can be reopened later
+                 12) A pointer to the file info for
+                     this data if the last file needs
+                     to be reopened for termination
+  RETURNS      : True if all OK, false
+                 otherwise
+  SIDE EFFECTS : Slot maps written
+  NOTES        : None
+ *************************************************************/
+static bool OrderedSlotsToCode(
+  Environment *theEnv,
+  FILE **orderedSlotFile,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  unsigned int imageID,
+  FILE *headerFP,
+  unsigned int *fileCount,
+  unsigned int maxIndices,
+  Defclass *theDefclass,
+  unsigned int *orderedSlotArrayVersion,
+  unsigned int *orderedSlotArrayCount,
+  bool *reopenOrderedSlotFile,
+  struct CodeGeneratorFile *orderedSlotCodeFile)
+  {
+   long i;
+
+   if (theDefclass->instanceSlotCount == 0)
+     return true;
+
+   *orderedSlotFile = OpenFileIfNeeded(theEnv,*orderedSlotFile,fileName,pathName,fileNameBuffer,fileID,
+                                        imageID,fileCount,
+                                        *orderedSlotArrayVersion,headerFP,
+                                        "unsigned",OrderedSlotPrefix(),
+                                        *reopenOrderedSlotFile,orderedSlotCodeFile);
+   if (*orderedSlotFile == NULL)
+     return false;
+
+   for (i = 0 ; i <= theDefclass->maxSlotNameID ; i++)
+     {
+      if (i > 0)
+        fprintf(*orderedSlotFile,",");
+      fprintf(*orderedSlotFile,"%u",theDefclass->slotNameMap[i]);
+     }
+   *orderedSlotArrayCount += theDefclass->maxSlotNameID + 1;
+   *orderedSlotFile = CloseFileIfNeeded(theEnv,*orderedSlotFile,orderedSlotArrayCount,
+                                        orderedSlotArrayVersion,maxIndices,
+                                        reopenOrderedSlotFile,orderedSlotCodeFile);
+   return true;
+  }
+
+/*************************************************************
+  NAME         : HandlersToCode
+  DESCRIPTION  : Prints out message-handlers -
+                 all message-handlers for a particular class
+                 are guaranteed to be in the same array
+                 partition
+  INPUTS       : 1)  A buffer for the handler file
+                 2)  The base image name
+                 3)  The id for this type of data
+                 4)  The base image id
+                 5)  The general header file
+                 6)  A buffer for the version number of
+                     the file for this type of data
+                 7)  The maximum # of elements in any array
+                 8)  A pointer to the class
+                 9)  A buffer holding the handler partition #
+                 10) A buffer holding the handler relative
+                     index in the partition
+                 11) A buffer for a flag indicating if the
+                     buffer file can be reopened later
+                 12) A pointer to the file info for
+                     this data if the last file needs
+                     to be reopened for termination
+  RETURNS      : True if all OK, false
+                 otherwise
+  SIDE EFFECTS : Handlers written
+  NOTES        : None
+ *************************************************************/
+static bool HandlersToCode(
+  Environment *theEnv,
+  FILE **handlerFile,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  unsigned int imageID,
+  FILE *headerFP,
+  unsigned int *fileCount,
+  unsigned int maxIndices,
+  Defclass *theDefclass,
+  unsigned int moduleCount,
+  unsigned int *handlerArrayVersion,
+  unsigned int *handlerArrayCount,
+  bool *reopenHandlerFile,
+  struct CodeGeneratorFile *handlerCodeFile)
+  {
+   unsigned int i;
+   DefmessageHandler *hnd;
+
+   if (theDefclass->handlerCount == 0)
+     return true;
+
+   *handlerFile = OpenFileIfNeeded(theEnv,*handlerFile,fileName,pathName,fileNameBuffer,fileID,
+                                        imageID,fileCount,
+                                        *handlerArrayVersion,headerFP,
+                                        "DefmessageHandler",HandlerPrefix(),*reopenHandlerFile,
+                                        handlerCodeFile);
+   if (*handlerFile == NULL)
+     return false;
+
+   for (i = 0 ; i < theDefclass->handlerCount ; i++)
+     {
+      if (i > 0)
+        fprintf(*handlerFile,",\n");
+      hnd = &theDefclass->handlers[i];
+         
+      fprintf(*handlerFile,"{");
+      ConstructHeaderToCode(theEnv,*handlerFile,&hnd->header,imageID,maxIndices,moduleCount,
+                            ModulePrefix(ObjectCompilerData(theEnv)->ObjectCodeItem),HandlerPrefix());
+
+      fprintf(*handlerFile,",%u,%u,0,0,0,",hnd->system,hnd->type);
+      PrintClassReference(theEnv,*handlerFile,hnd->cls,imageID,maxIndices);
+      fprintf(*handlerFile,",%hu,%hu,%hu,",hnd->minParams,hnd->maxParams,hnd->localVarCount);
+      ExpressionToCode(theEnv,*handlerFile,hnd->actions);
+      fprintf(*handlerFile,"}");
+     }
+   *handlerArrayCount += theDefclass->handlerCount;
+   *handlerFile = CloseFileIfNeeded(theEnv,*handlerFile,handlerArrayCount,
+                                    handlerArrayVersion,maxIndices,
+                                    reopenHandlerFile,handlerCodeFile);
+   return true;
+  }
+
+/****************************************************************
+  NAME         : OrderedHandlersToCode
+  DESCRIPTION  : Prints out handler map -
+                 the entire handler map
+                 for a particular class is
+                 guaranteed to be in the same
+                 array partition
+  INPUTS       : 1)  A buffer for the handler map file
+                 2)  The base image name
+                 3)  The id for this type of data
+                 4)  The base image id
+                 5)  The general header file
+                 6)  A buffer for the version number of
+                     the file for this type of data
+                 7)  The maximum # of elements in any array
+                 8)  A pointer to the class
+                 9)  A buffer holding the handler map partition #
+                 10) A buffer holding the handler map relative
+                     index in the partition
+                 11) A buffer for a flag indicating if the
+                     buffer file can be reopened later
+                 12) A pointer to the file info for
+                     this data if the last file needs
+                     to be reopened for termination
+  RETURNS      : True if all OK, false
+                 otherwise
+  SIDE EFFECTS : Handler maps written
+  NOTES        : None
+ ****************************************************************/
+static bool OrderedHandlersToCode(
+  Environment *theEnv,
+  FILE **orderedHandlerFile,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  unsigned int imageID,
+  FILE *headerFP,
+  unsigned int *fileCount,
+  unsigned int maxIndices,
+  Defclass *theDefclass,
+  unsigned int *orderedHandlerArrayVersion,
+  unsigned int *orderedHandlerArrayCount,
+  bool *reopenOrderedHandlerFile,
+  struct CodeGeneratorFile *orderedHandlerCodeFile)
+  {
+   long i;
+
+   if (theDefclass->handlerCount == 0)
+     return true;
+
+   *orderedHandlerFile = OpenFileIfNeeded(theEnv,*orderedHandlerFile,fileName,pathName,fileNameBuffer,fileID,
+                                          imageID,fileCount,
+                                          *orderedHandlerArrayVersion,headerFP,
+                                          "unsigned",OrderedHandlerPrefix(),
+                                          *reopenOrderedHandlerFile,
+                                          orderedHandlerCodeFile);
+   if (*orderedHandlerFile == NULL)
+     return false;
+
+   for (i = 0 ; i < theDefclass->handlerCount ; i++)
+     {
+      if (i > 0)
+        fprintf(*orderedHandlerFile,",");
+      fprintf(*orderedHandlerFile,"%u",theDefclass->handlerOrderMap[i]);
+     }
+   *orderedHandlerArrayCount += theDefclass->handlerCount;
+   *orderedHandlerFile = CloseFileIfNeeded(theEnv,*orderedHandlerFile,orderedHandlerArrayCount,
+                                           orderedHandlerArrayVersion,maxIndices,
+                                           reopenOrderedHandlerFile,
+                                           orderedHandlerCodeFile);
+   return true;
+  }
+
+#endif
+
+
diff --git a/clips/objcmp.h b/clips/objcmp.h
new file mode 100755
index 000000000..4ee20b0af
--- /dev/null
+++ b/clips/objcmp.h
@@ -0,0 +1,71 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Object System Construct Compiler Code            */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_objcmp
+
+#pragma once
+
+#define _H_objcmp
+
+#include <stdio.h>
+
+#include "conscomp.h"
+#include "object.h"
+
+#define OBJECT_COMPILER_DATA 36
+
+struct objectCompilerData
+  {
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   struct CodeGeneratorItem *ObjectCodeItem;
+#endif
+  };
+
+#define ObjectCompilerData(theEnv) ((struct objectCompilerData *) GetEnvironmentData(theEnv,OBJECT_COMPILER_DATA))
+
+   void                    SetupObjectsCompiler(Environment *);
+   void                    PrintClassReference(Environment *,FILE *,Defclass *,unsigned,unsigned);
+   void                    DefclassCModuleReference(Environment *,FILE *,unsigned long,unsigned int,unsigned int);
+
+#endif /* _H_objcmp */
+
diff --git a/clips/object.h b/clips/object.h
new file mode 100755
index 000000000..1b967d0e0
--- /dev/null
+++ b/clips/object.h
@@ -0,0 +1,255 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*               CLIPS Version 6.40  02/03/18          */
+   /*                                                     */
+   /*                OBJECT SYSTEM DEFINITIONS            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*      6.31: Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_object
+
+#pragma once
+
+#define _H_object
+
+typedef struct defclassModule DEFCLASS_MODULE;
+typedef struct defclass Defclass;
+typedef struct packedClassLinks PACKED_CLASS_LINKS;
+typedef struct classLink CLASS_LINK;
+typedef struct slotName SLOT_NAME;
+typedef struct slotDescriptor SlotDescriptor;
+typedef struct defmessageHandler DefmessageHandler;
+
+typedef struct instanceSlot InstanceSlot;
+
+typedef struct instanceBuilder InstanceBuilder;
+typedef struct instanceModifier InstanceModifier;
+
+/* Maximum # of simultaneous class hierarchy traversals
+   should be a multiple of BITS_PER_BYTE and less than MAX_INT      */
+
+#define MAX_TRAVERSALS  256
+#define TRAVERSAL_BYTES 32       /* (MAX_TRAVERSALS / BITS_PER_BYTE) */
+
+#define VALUE_REQUIRED     0
+#define VALUE_PROHIBITED   1
+#define VALUE_NOT_REQUIRED 2
+
+#include "entities.h"
+#include "constrct.h"
+#include "constrnt.h"
+#include "moduldef.h"
+#include "evaluatn.h"
+#include "expressn.h"
+#include "multifld.h"
+#include "symbol.h"
+#include "match.h"
+
+#if DEFRULE_CONSTRUCT
+#include "objrtmch.h"
+#endif
+
+struct packedClassLinks
+  {
+   unsigned long classCount;
+   Defclass **classArray;
+  };
+
+struct defclassModule
+  {
+   struct defmoduleItemHeader header;
+  };
+
+struct defclass
+  {
+   ConstructHeader header;
+   unsigned installed      : 1;
+   unsigned system         : 1;
+   unsigned abstract       : 1;
+   unsigned reactive       : 1;
+   unsigned traceInstances : 1;
+   unsigned traceSlots     : 1;
+   unsigned short id;
+   unsigned busy;
+   unsigned hashTableIndex;
+   PACKED_CLASS_LINKS directSuperclasses;
+   PACKED_CLASS_LINKS directSubclasses;
+   PACKED_CLASS_LINKS allSuperclasses;
+   SlotDescriptor *slots;
+   SlotDescriptor **instanceTemplate;
+   unsigned *slotNameMap;
+   unsigned short slotCount;
+   unsigned short localInstanceSlotCount;
+   unsigned short instanceSlotCount;
+   unsigned short maxSlotNameID;
+   Instance *instanceList;
+   Instance *instanceListBottom;
+   DefmessageHandler *handlers;
+   unsigned *handlerOrderMap;
+   unsigned short handlerCount;
+   Defclass *nxtHash;
+   CLIPSBitMap *scopeMap;
+
+   /*
+    * Links this defclass to each of the terminal alpha nodes which could be
+    * affected by a modification to an instance of it. This saves having to
+    * iterate through every single terminal alpha for every single modification
+    * to an instance of a defclass.
+    */
+#if DEFRULE_CONSTRUCT
+   CLASS_ALPHA_LINK *relevant_terminal_alpha_nodes;
+#endif
+
+   char traversalRecord[TRAVERSAL_BYTES];
+  };
+
+struct classLink
+  {
+   Defclass *cls;
+   struct classLink *nxt;
+  };
+
+struct slotName
+  {
+   unsigned hashTableIndex;
+   unsigned use;
+   unsigned short id;
+   CLIPSLexeme *name;
+   CLIPSLexeme *putHandlerName;
+   struct slotName *nxt;
+   unsigned long bsaveIndex;
+  };
+
+struct instanceSlot
+  {
+   SlotDescriptor *desc;
+   unsigned valueRequired : 1;
+   unsigned override      : 1;
+   unsigned short type;
+   union
+     {
+      void *value;
+      TypeHeader *header;
+      CLIPSLexeme *lexemeValue;
+      CLIPSFloat *floatValue;
+      CLIPSInteger *integerValue;
+      CLIPSVoid *voidValue;
+      Fact *factValue;
+      Instance *instanceValue;
+      Multifield *multifieldValue;
+      CLIPSExternalAddress *externalAddressValue;
+     };
+  };
+
+struct slotDescriptor
+  {
+   unsigned shared                   : 1;
+   unsigned multiple                 : 1;
+   unsigned composite                : 1;
+   unsigned noInherit                : 1;
+   unsigned noWrite                  : 1;
+   unsigned initializeOnly           : 1;
+   unsigned dynamicDefault           : 1;
+   unsigned defaultSpecified         : 1;
+   unsigned noDefault                : 1;
+   unsigned reactive                 : 1;
+   unsigned publicVisibility         : 1;
+   unsigned createReadAccessor       : 1;
+   unsigned createWriteAccessor      : 1;
+   unsigned overrideMessageSpecified : 1;
+   Defclass *cls;
+   SLOT_NAME *slotName;
+   CLIPSLexeme *overrideMessage;
+   void *defaultValue;
+   CONSTRAINT_RECORD *constraint;
+   unsigned sharedCount;
+   unsigned long bsaveIndex;
+   InstanceSlot sharedValue;
+  };
+
+struct instance
+  {
+   union
+     {
+      struct patternEntity patternHeader;
+      TypeHeader header;
+     };
+   void *partialMatchList;
+   InstanceSlot *basisSlots;
+   unsigned installed            : 1;
+   unsigned garbage              : 1;
+   unsigned initSlotsCalled      : 1;
+   unsigned initializeInProgress : 1;
+   unsigned reteSynchronized     : 1;
+   CLIPSLexeme *name;
+   unsigned hashTableIndex;
+   unsigned busy;
+   Defclass *cls;
+   Instance *prvClass,*nxtClass,
+                 *prvHash,*nxtHash,
+                 *prvList,*nxtList;
+   InstanceSlot **slotAddresses,
+                 *slots;
+  };
+
+struct defmessageHandler
+  {
+   ConstructHeader header;
+   unsigned system         : 1;
+   unsigned type           : 2;
+   unsigned mark           : 1;
+   unsigned trace          : 1;
+   unsigned busy;
+   Defclass *cls;
+   unsigned short minParams;
+   unsigned short maxParams;
+   unsigned short localVarCount;
+   Expression *actions;
+  };
+
+struct instanceBuilder
+  {
+   Environment *ibEnv;
+   Defclass *ibDefclass;
+   CLIPSValue *ibValueArray;
+  };
+
+struct instanceModifier
+  {
+   Environment *imEnv;
+   Instance *imOldInstance;
+   CLIPSValue *imValueArray;
+   char *changeMap;
+  };
+
+#endif /* _H_object */
+
+
+
+
+
diff --git a/clips/objrtbin.c b/clips/objrtbin.c
new file mode 100755
index 000000000..78fc3d1f9
--- /dev/null
+++ b/clips/objrtbin.c
@@ -0,0 +1,701 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  02/03/18             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Binary Load/Save Functions Defrule               */
+/*          Object Pattern Network                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            ResetObjectMatchTimeTags did not pass in the   */
+/*            environment argument when BLOAD_ONLY was set.  */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Added support for hashed alpha memories.       */
+/*                                                           */
+/*      6.31: Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+
+#include "bload.h"
+#include "bsave.h"
+#include "classfun.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "insfun.h"
+#include "objrtmch.h"
+#include "pattern.h"
+#include "reteutil.h"
+#include "rulebin.h"
+
+#include "objrtbin.h"
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+typedef unsigned long UNLN;
+
+typedef struct bsaveObjectPatternNode
+  {
+   unsigned multifieldNode : 1;
+   unsigned endSlot        : 1;
+   unsigned selector       : 1;
+   unsigned whichField     : 8;
+   unsigned short leaveFields;
+   unsigned short slotNameID;
+   unsigned long networkTest,
+        nextLevel,
+        lastLevel,
+        leftNode,
+        rightNode,
+        alphaNode;
+  } BSAVE_OBJECT_PATTERN_NODE;
+
+typedef struct bsaveObjectAlphaNode
+  {
+   struct bsavePatternNodeHeader header;
+   unsigned long classbmp,
+        slotbmp,
+        patternNode,
+        nxtInGroup,
+        nxtTerminal;
+  } BSAVE_OBJECT_ALPHA_NODE;
+
+typedef struct bsaveClassAlphaLink
+  {
+   unsigned long alphaNode;
+   unsigned long next;
+  } BSAVE_CLASS_ALPHA_LINK;
+
+#define BsaveObjectPatternIndex(op) ((op != NULL) ? op->bsaveID : ULONG_MAX)
+#define BsaveObjectAlphaIndex(ap)   ((ap != NULL) ? ap->bsaveID : ULONG_MAX)
+#define BsaveClassAlphaIndex(cp)   ((cp != NULL) ? cp->bsaveID : ULONG_MAX)
+
+#define ObjectPatternPointer(i) ((i == ULONG_MAX) ? NULL : (OBJECT_PATTERN_NODE *) &ObjectReteBinaryData(theEnv)->PatternArray[i])
+#define ObjectAlphaPointer(i)   ((i == ULONG_MAX) ? NULL : (OBJECT_ALPHA_NODE *) &ObjectReteBinaryData(theEnv)->AlphaArray[i])
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                    BsaveObjectPatternsFind(Environment *);
+   static void                    MarkDefclassItems(Environment *,struct constructHeader *,void *);
+   static void                    BsaveStorageObjectPatterns(Environment *,FILE *);
+   static void                    BsaveObjectPatterns(Environment *,FILE *);
+   static void                    BsaveAlphaLinks(Environment *,struct constructHeader *,void *);
+#endif
+   static void                    BloadStorageObjectPatterns(Environment *);
+   static void                    BloadObjectPatterns(Environment *);
+   static void                    UpdateAlpha(Environment *,void *,unsigned long);
+   static void                    UpdatePattern(Environment *,void *,unsigned long);
+   static void                    UpdateLink(Environment *,void *,unsigned long);
+   static void                    ClearBloadObjectPatterns(Environment *);
+   static void                    DeallocateObjectReteBinaryData(Environment *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***********************************************************
+  NAME         : SetupObjectPatternsBload
+  DESCRIPTION  : Initializes data structures and
+                   routines for binary loads of
+                   generic function constructs
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Routines defined and structures initialized
+  NOTES        : None
+ ***********************************************************/
+void SetupObjectPatternsBload(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,OBJECTRETEBIN_DATA,sizeof(struct objectReteBinaryData),DeallocateObjectReteBinaryData);
+
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"object patterns",0,BsaveObjectPatternsFind,NULL,
+                             BsaveStorageObjectPatterns,BsaveObjectPatterns,
+                             BloadStorageObjectPatterns,BloadObjectPatterns,
+                             ClearBloadObjectPatterns);
+#endif
+#if BLOAD || BLOAD_ONLY
+   AddBinaryItem(theEnv,"object patterns",0,NULL,NULL,NULL,NULL,
+                             BloadStorageObjectPatterns,BloadObjectPatterns,
+                             ClearBloadObjectPatterns);
+#endif
+  }
+
+/***********************************************************/
+/* DeallocateObjectReteBinaryData: Deallocates environment */
+/*    data for object rete binary functionality.           */
+/***********************************************************/
+static void DeallocateObjectReteBinaryData(
+  Environment *theEnv)
+  {
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   size_t space;
+   unsigned long i;
+
+   for (i = 0; i < ObjectReteBinaryData(theEnv)->AlphaNodeCount; i++)
+     { DestroyAlphaMemory(theEnv,&ObjectReteBinaryData(theEnv)->AlphaArray[i].header,false); }
+
+   space = ObjectReteBinaryData(theEnv)->AlphaNodeCount * sizeof(struct objectAlphaNode);
+   if (space != 0) genfree(theEnv,ObjectReteBinaryData(theEnv)->AlphaArray,space);
+
+   space = ObjectReteBinaryData(theEnv)->PatternNodeCount * sizeof(struct objectPatternNode);
+   if (space != 0) genfree(theEnv,ObjectReteBinaryData(theEnv)->PatternArray,space);
+   
+   space = ObjectReteBinaryData(theEnv)->AlphaLinkCount * sizeof(struct classAlphaLink);
+   if (space != 0) genfree(theEnv,ObjectReteBinaryData(theEnv)->AlphaLinkArray,space);
+#endif
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if BLOAD_AND_BSAVE
+
+/***************************************************
+  NAME         : BsaveObjectPatternsFind
+  DESCRIPTION  : Sets the Bsave IDs for the object
+                 pattern data structures and
+                 determines how much space
+                 (including padding) is necessary
+                 for the alpha node bitmPS
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Counts written
+  NOTES        : None
+ ***************************************************/
+static void BsaveObjectPatternsFind(
+  Environment *theEnv)
+  {
+   OBJECT_ALPHA_NODE *alphaPtr;
+   OBJECT_PATTERN_NODE *patternPtr;
+
+   SaveBloadCount(theEnv,ObjectReteBinaryData(theEnv)->AlphaNodeCount);
+   SaveBloadCount(theEnv,ObjectReteBinaryData(theEnv)->PatternNodeCount);
+   SaveBloadCount(theEnv,ObjectReteBinaryData(theEnv)->AlphaLinkCount);
+
+   ObjectReteBinaryData(theEnv)->AlphaLinkCount = 0L;
+   DoForAllConstructs(theEnv,MarkDefclassItems,DefclassData(theEnv)->DefclassModuleIndex,false,NULL);
+
+   ObjectReteBinaryData(theEnv)->AlphaNodeCount = 0L;
+   alphaPtr = ObjectNetworkTerminalPointer(theEnv);
+   while (alphaPtr != NULL)
+     {
+      alphaPtr->classbmp->neededBitMap = true;
+      if (alphaPtr->slotbmp != NULL)
+        alphaPtr->slotbmp->neededBitMap = true;
+      alphaPtr->bsaveID = ObjectReteBinaryData(theEnv)->AlphaNodeCount++;
+      alphaPtr = alphaPtr->nxtTerminal;
+     }
+
+   ObjectReteBinaryData(theEnv)->PatternNodeCount = 0L;
+   patternPtr = ObjectNetworkPointer(theEnv);
+   while (patternPtr != NULL)
+     {
+      patternPtr->bsaveID = ObjectReteBinaryData(theEnv)->PatternNodeCount++;
+      if (patternPtr->nextLevel == NULL)
+        {
+         while (patternPtr->rightNode == NULL)
+           {
+            patternPtr = patternPtr->lastLevel;
+            if (patternPtr == NULL)
+              return;
+           }
+         patternPtr = patternPtr->rightNode;
+        }
+      else
+        patternPtr = patternPtr->nextLevel;
+     }
+  }
+
+/***************************************************
+  NAME         : MarkDefclassItems
+  DESCRIPTION  : Marks needed items for a defclass
+                 using rules
+  INPUTS       : 1) The defclass
+                 2) User buffer (ignored)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Bsave indices set
+  NOTES        : None
+ ***************************************************/
+static void MarkDefclassItems(
+  Environment *theEnv,
+  struct constructHeader *theDefclass,
+  void *buf)
+  {
+#if MAC_XCD
+#pragma unused(buf)
+#endif
+   Defclass *cls = (Defclass *) theDefclass;
+   CLASS_ALPHA_LINK *alphaLink;
+
+   for (alphaLink = cls->relevant_terminal_alpha_nodes;
+        alphaLink != NULL;
+        alphaLink = alphaLink->next)
+     { alphaLink->bsaveID = ObjectReteBinaryData(theEnv)->AlphaLinkCount++; }
+  }
+
+/****************************************************
+  NAME         : BsaveStorageObjectPatterns
+  DESCRIPTION  : Writes out the number of bytes
+                 required for object pattern bitmaps,
+                 and the number of object pattern
+                 alpha an intermediate nodes
+  INPUTS       : Bsave file stream pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Counts written
+  NOTES        : None
+ ****************************************************/
+static void BsaveStorageObjectPatterns(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+
+   space = sizeof(long) * 3;
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&ObjectReteBinaryData(theEnv)->AlphaNodeCount,sizeof(long),fp);
+   GenWrite(&ObjectReteBinaryData(theEnv)->PatternNodeCount,sizeof(long),fp);
+   GenWrite(&ObjectReteBinaryData(theEnv)->AlphaLinkCount,sizeof(long),fp);
+  }
+
+/***************************************************
+  NAME         : BsaveObjectPatterns
+  DESCRIPTION  : Writes out object pattern data
+                 structures to binary save file
+  INPUTS       : Bsave file stream pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Data structures written
+  NOTES        : Extra padding written with alpha
+                 node bitmaps to ensure correct
+                 alignment of structues on bload
+ ***************************************************/
+static void BsaveObjectPatterns(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   OBJECT_ALPHA_NODE *alphaPtr;
+   OBJECT_PATTERN_NODE *patternPtr;
+   BSAVE_OBJECT_ALPHA_NODE dummyAlpha;
+   BSAVE_OBJECT_PATTERN_NODE dummyPattern;
+
+   space = (sizeof(BSAVE_OBJECT_ALPHA_NODE) * ObjectReteBinaryData(theEnv)->AlphaNodeCount) +
+           (sizeof(BSAVE_OBJECT_PATTERN_NODE) * ObjectReteBinaryData(theEnv)->PatternNodeCount) +
+           (sizeof(BSAVE_CLASS_ALPHA_LINK) * ObjectReteBinaryData(theEnv)->AlphaLinkCount);
+   GenWrite(&space,sizeof(size_t),fp);
+
+   DoForAllConstructs(theEnv,BsaveAlphaLinks,DefclassData(theEnv)->DefclassModuleIndex,false,fp);
+
+   /* ==========================================
+      Write out the alpha terminal pattern nodes
+      ========================================== */
+   alphaPtr = ObjectNetworkTerminalPointer(theEnv);
+   while (alphaPtr != NULL)
+     {
+      AssignBsavePatternHeaderValues(theEnv,&dummyAlpha.header,&alphaPtr->header);
+      dummyAlpha.classbmp = alphaPtr->classbmp->bucket;
+      if (alphaPtr->slotbmp != NULL)
+        dummyAlpha.slotbmp = alphaPtr->slotbmp->bucket;
+      else
+        dummyAlpha.slotbmp = ULONG_MAX;
+      dummyAlpha.patternNode = BsaveObjectPatternIndex(alphaPtr->patternNode);
+      dummyAlpha.nxtInGroup = BsaveObjectAlphaIndex(alphaPtr->nxtInGroup);
+      dummyAlpha.nxtTerminal = BsaveObjectAlphaIndex(alphaPtr->nxtTerminal);
+      GenWrite(&dummyAlpha,sizeof(BSAVE_OBJECT_ALPHA_NODE),fp);
+      alphaPtr = alphaPtr->nxtTerminal;
+     }
+
+   /* ========================================
+      Write out the intermediate pattern nodes
+      ======================================== */
+   patternPtr = ObjectNetworkPointer(theEnv);
+   while (patternPtr != NULL)
+     {
+      dummyPattern.multifieldNode = patternPtr->multifieldNode;
+      dummyPattern.whichField = patternPtr->whichField;
+      dummyPattern.leaveFields = patternPtr->leaveFields;
+      dummyPattern.endSlot = patternPtr->endSlot;
+      dummyPattern.selector = patternPtr->selector;
+      dummyPattern.slotNameID = patternPtr->slotNameID;
+      dummyPattern.networkTest = HashedExpressionIndex(theEnv,patternPtr->networkTest);
+      dummyPattern.nextLevel = BsaveObjectPatternIndex(patternPtr->nextLevel);
+      dummyPattern.lastLevel = BsaveObjectPatternIndex(patternPtr->lastLevel);
+      dummyPattern.leftNode = BsaveObjectPatternIndex(patternPtr->leftNode);
+      dummyPattern.rightNode = BsaveObjectPatternIndex(patternPtr->rightNode);
+      dummyPattern.alphaNode = BsaveObjectAlphaIndex(patternPtr->alphaNode);
+      GenWrite(&dummyPattern,sizeof(BSAVE_OBJECT_PATTERN_NODE),fp);
+
+      if (patternPtr->nextLevel == NULL)
+        {
+         while (patternPtr->rightNode == NULL)
+           {
+            patternPtr = patternPtr->lastLevel;
+            if (patternPtr == NULL)
+              {
+               RestoreBloadCount(theEnv,&ObjectReteBinaryData(theEnv)->AlphaNodeCount);
+               RestoreBloadCount(theEnv,&ObjectReteBinaryData(theEnv)->PatternNodeCount);
+               RestoreBloadCount(theEnv,&ObjectReteBinaryData(theEnv)->AlphaLinkCount);
+               return;
+              }
+           }
+         patternPtr = patternPtr->rightNode;
+        }
+      else
+        patternPtr = patternPtr->nextLevel;
+     }
+
+   RestoreBloadCount(theEnv,&ObjectReteBinaryData(theEnv)->AlphaNodeCount);
+   RestoreBloadCount(theEnv,&ObjectReteBinaryData(theEnv)->PatternNodeCount);
+   RestoreBloadCount(theEnv,&ObjectReteBinaryData(theEnv)->AlphaLinkCount);
+  }
+
+/***************************************************
+  NAME         : BsaveAlphaLinks
+  DESCRIPTION  : Writes class alpha links binary data
+  INPUTS       : 1) The defclass
+                 2) The binary file pointer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Defclass alpha links binary data written
+  NOTES        : None
+ ***************************************************/
+static void BsaveAlphaLinks(
+  Environment *theEnv,
+  struct constructHeader *theDefclass,
+  void *buf)
+  {
+   Defclass *cls = (Defclass *) theDefclass;
+   BSAVE_CLASS_ALPHA_LINK dummy_alpha_link;
+   CLASS_ALPHA_LINK *alphaLink;
+
+   for (alphaLink = cls->relevant_terminal_alpha_nodes;
+        alphaLink != NULL;
+        alphaLink = alphaLink->next)
+     {
+      dummy_alpha_link.alphaNode = alphaLink->alphaNode->bsaveID;
+      
+      if (alphaLink->next != NULL)
+       { dummy_alpha_link.next = alphaLink->next->bsaveID; }
+      else
+        { dummy_alpha_link.next = ULONG_MAX; }
+
+      GenWrite((void *) &dummy_alpha_link,sizeof(BSAVE_CLASS_ALPHA_LINK),(FILE *) buf);
+     }
+  }
+
+#endif
+
+/***************************************************
+  NAME         : BloadStorageObjectPatterns
+  DESCRIPTION  : Reads in the storage requirements
+                 for the object patterns in this
+                 bload image
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Counts read and arrays allocated
+  NOTES        : None
+ ***************************************************/
+static void BloadStorageObjectPatterns(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long counts[3];
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   GenReadBinary(theEnv,counts,space);
+   ObjectReteBinaryData(theEnv)->AlphaNodeCount = counts[0];
+   ObjectReteBinaryData(theEnv)->PatternNodeCount = counts[1];
+   ObjectReteBinaryData(theEnv)->AlphaLinkCount = counts[2];
+
+   if (ObjectReteBinaryData(theEnv)->AlphaNodeCount == 0L)
+     ObjectReteBinaryData(theEnv)->AlphaArray = NULL;
+   else
+     {
+      space = (ObjectReteBinaryData(theEnv)->AlphaNodeCount * sizeof(OBJECT_ALPHA_NODE));
+      ObjectReteBinaryData(theEnv)->AlphaArray = (OBJECT_ALPHA_NODE *) genalloc(theEnv,space);
+     }
+     
+   if (ObjectReteBinaryData(theEnv)->PatternNodeCount == 0L)
+     ObjectReteBinaryData(theEnv)->PatternArray = NULL;
+   else
+     {
+      space = (ObjectReteBinaryData(theEnv)->PatternNodeCount * sizeof(OBJECT_PATTERN_NODE));
+      ObjectReteBinaryData(theEnv)->PatternArray = (OBJECT_PATTERN_NODE *) genalloc(theEnv,space);
+     }
+
+   if (ObjectReteBinaryData(theEnv)->AlphaLinkCount == 0L)
+     ObjectReteBinaryData(theEnv)->AlphaLinkArray = NULL;
+   else
+     {
+      space = (ObjectReteBinaryData(theEnv)->AlphaLinkCount * sizeof(CLASS_ALPHA_LINK));
+      ObjectReteBinaryData(theEnv)->AlphaLinkArray = (CLASS_ALPHA_LINK *) genalloc(theEnv,space);
+     }
+  }
+
+/****************************************************
+  NAME         : BloadObjectPatterns
+  DESCRIPTION  : Reads in all object pattern
+                 data structures from binary
+                 image and updates pointers
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Binary data structures updated
+  NOTES        : Assumes storage allocated previously
+ ****************************************************/
+static void BloadObjectPatterns(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long i;
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   if (space == 0L)
+     return;
+
+   /* ================================================
+      Read in the alpha and intermediate pattern nodes
+      ================================================ */
+
+   BloadandRefresh(theEnv,ObjectReteBinaryData(theEnv)->AlphaLinkCount,sizeof(BSAVE_CLASS_ALPHA_LINK),UpdateLink);
+   BloadandRefresh(theEnv,ObjectReteBinaryData(theEnv)->AlphaNodeCount,sizeof(BSAVE_OBJECT_ALPHA_NODE),UpdateAlpha);
+   BloadandRefresh(theEnv,ObjectReteBinaryData(theEnv)->PatternNodeCount,sizeof(BSAVE_OBJECT_PATTERN_NODE),UpdatePattern);
+
+   for (i = 0; i < ObjectReteBinaryData(theEnv)->PatternNodeCount; i++)
+     {
+      if ((ObjectReteBinaryData(theEnv)->PatternArray[i].lastLevel != NULL) &&
+          (ObjectReteBinaryData(theEnv)->PatternArray[i].lastLevel->selector))
+        {
+         AddHashedPatternNode(theEnv,ObjectReteBinaryData(theEnv)->PatternArray[i].lastLevel,
+                                     &ObjectReteBinaryData(theEnv)->PatternArray[i],
+                                     ObjectReteBinaryData(theEnv)->PatternArray[i].networkTest->type,
+                                     ObjectReteBinaryData(theEnv)->PatternArray[i].networkTest->value);
+        }
+     }
+
+   /* =======================
+      Set the global pointers
+      ======================= */
+   SetObjectNetworkTerminalPointer(theEnv,(OBJECT_ALPHA_NODE *) &ObjectReteBinaryData(theEnv)->AlphaArray[0]);
+   SetObjectNetworkPointer(theEnv,(OBJECT_PATTERN_NODE *) &ObjectReteBinaryData(theEnv)->PatternArray[0]);
+  }
+
+/***************************************************
+  NAME         : UpdateAlpha
+  DESCRIPTION  : Updates all the pointers for an
+                 alpha node based on the binary
+                 image indices
+  INPUTS       : 1) A pointer to the binary
+                    image alpha node buffer
+                 2) The index of the actual
+                    alpha node in the array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Alpha node updated
+  NOTES        : None
+ ***************************************************/
+static void UpdateAlpha(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_OBJECT_ALPHA_NODE *bap;
+   OBJECT_ALPHA_NODE *ap;
+
+   bap = (BSAVE_OBJECT_ALPHA_NODE *) buf;
+   ap = (OBJECT_ALPHA_NODE *) &ObjectReteBinaryData(theEnv)->AlphaArray[obji];
+
+   UpdatePatternNodeHeader(theEnv,&ap->header,&bap->header);
+   ap->matchTimeTag = 0L;
+   ap->classbmp = BitMapPointer(bap->classbmp);
+   if (bap->slotbmp != ULONG_MAX)
+     {
+      ap->slotbmp = BitMapPointer(bap->slotbmp);
+      IncrementBitMapCount(ap->slotbmp);
+     }
+   else
+     ap->slotbmp = NULL;
+   IncrementBitMapCount(ap->classbmp);
+   ap->patternNode = ObjectPatternPointer(bap->patternNode);
+   ap->nxtInGroup = ObjectAlphaPointer(bap->nxtInGroup);
+   ap->nxtTerminal = ObjectAlphaPointer(bap->nxtTerminal);
+   ap->bsaveID = 0L;
+  }
+
+/***************************************************
+  NAME         : UpdatePattern
+  DESCRIPTION  : Updates all the pointers for a
+                 pattern node based on the binary
+                 image indices
+  INPUTS       : 1) A pointer to the binary
+                    image pattern node buffer
+                 2) The index of the actual
+                    pattern node in the array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pattern node updated
+  NOTES        : None
+ ***************************************************/
+static void UpdatePattern(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_OBJECT_PATTERN_NODE *bop;
+   OBJECT_PATTERN_NODE *op;
+
+   bop = (BSAVE_OBJECT_PATTERN_NODE *) buf;
+   op = (OBJECT_PATTERN_NODE *) &ObjectReteBinaryData(theEnv)->PatternArray[obji];
+
+   op->blocked = false;
+   op->multifieldNode = bop->multifieldNode;
+   op->whichField = bop->whichField;
+   op->leaveFields = bop->leaveFields;
+   op->endSlot = bop->endSlot;
+   op->selector = bop->selector;
+   op->matchTimeTag = 0L;
+   op->slotNameID = bop->slotNameID;
+   op->networkTest = HashedExpressionPointer(bop->networkTest);
+   op->nextLevel = ObjectPatternPointer(bop->nextLevel);
+   op->lastLevel = ObjectPatternPointer(bop->lastLevel);
+   op->leftNode = ObjectPatternPointer(bop->leftNode);
+   op->rightNode = ObjectPatternPointer(bop->rightNode);
+   op->alphaNode = ObjectAlphaPointer(bop->alphaNode);
+   op->bsaveID = 0L;
+  }
+
+/***************************************************
+  NAME         : UpdateLink
+  DESCRIPTION  : Updates all the pointers for a
+                 pattern node based on the binary
+                 image indices
+  INPUTS       : 1) A pointer to the binary
+                    image pattern node buffer
+                 2) The index of the actual
+                    pattern node in the array
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pattern node updated
+  NOTES        : None
+ ***************************************************/
+static void UpdateLink(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   BSAVE_CLASS_ALPHA_LINK *bal;
+   CLASS_ALPHA_LINK *al;
+
+   bal = (BSAVE_CLASS_ALPHA_LINK *) buf;
+   al = (CLASS_ALPHA_LINK *) &ObjectReteBinaryData(theEnv)->AlphaLinkArray[obji];
+
+   al->alphaNode = ObjectAlphaPointer(bal->alphaNode);
+   al->next = ClassAlphaPointer(bal->next);
+   al->bsaveID = 0L;
+  }
+
+/***************************************************
+  NAME         : ClearBloadObjectPatterns
+  DESCRIPTION  : Releases all emmory associated
+                 with binary image object patterns
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Memory released and global
+                 network pointers set to NULL
+  NOTES        : None
+ ***************************************************/
+static void ClearBloadObjectPatterns(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long i;
+
+   for (i = 0; i < ObjectReteBinaryData(theEnv)->PatternNodeCount; i++)
+     {
+      if ((ObjectReteBinaryData(theEnv)->PatternArray[i].lastLevel != NULL) &&
+          (ObjectReteBinaryData(theEnv)->PatternArray[i].lastLevel->selector))
+        {
+         RemoveHashedPatternNode(theEnv,ObjectReteBinaryData(theEnv)->PatternArray[i].lastLevel,
+                                        &ObjectReteBinaryData(theEnv)->PatternArray[i],
+                                        ObjectReteBinaryData(theEnv)->PatternArray[i].networkTest->type,
+                                        ObjectReteBinaryData(theEnv)->PatternArray[i].networkTest->value);
+        }
+     }
+
+   /* ================================================
+      All instances have been deleted by this point
+      so we don't need to worry about clearing partial
+      matches
+      ================================================ */
+   for (i = 0L ; i < ObjectReteBinaryData(theEnv)->AlphaNodeCount ; i++)
+     {
+      DecrementBitMapReferenceCount(theEnv,ObjectReteBinaryData(theEnv)->AlphaArray[i].classbmp);
+      if (ObjectReteBinaryData(theEnv)->AlphaArray[i].slotbmp != NULL)
+        DecrementBitMapReferenceCount(theEnv,ObjectReteBinaryData(theEnv)->AlphaArray[i].slotbmp);
+     }
+
+   if (ObjectReteBinaryData(theEnv)->AlphaNodeCount != 0L)
+     {
+      space = (ObjectReteBinaryData(theEnv)->AlphaNodeCount * sizeof(OBJECT_ALPHA_NODE));
+      genfree(theEnv,ObjectReteBinaryData(theEnv)->AlphaArray,space);
+      ObjectReteBinaryData(theEnv)->AlphaArray = NULL;
+      ObjectReteBinaryData(theEnv)->AlphaNodeCount = 0;
+      space = (ObjectReteBinaryData(theEnv)->PatternNodeCount * sizeof(OBJECT_PATTERN_NODE));
+      genfree(theEnv,ObjectReteBinaryData(theEnv)->PatternArray,space);
+      ObjectReteBinaryData(theEnv)->PatternArray = NULL;
+      ObjectReteBinaryData(theEnv)->PatternNodeCount = 0;
+      space = (ObjectReteBinaryData(theEnv)->AlphaLinkCount * sizeof(CLASS_ALPHA_LINK));
+      genfree(theEnv,(void *) ObjectReteBinaryData(theEnv)->AlphaLinkArray,space);
+      ObjectReteBinaryData(theEnv)->AlphaLinkArray = NULL;
+      ObjectReteBinaryData(theEnv)->AlphaLinkCount = 0;
+     }
+
+   SetObjectNetworkTerminalPointer(theEnv,NULL);
+   SetObjectNetworkPointer(theEnv,NULL);
+#if BLOAD_ONLY
+   ResetObjectMatchTimeTags(theEnv);
+#endif
+  }
+
+#endif
+
diff --git a/clips/objrtbin.h b/clips/objrtbin.h
new file mode 100755
index 000000000..dda1af160
--- /dev/null
+++ b/clips/objrtbin.h
@@ -0,0 +1,79 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  02/03/18            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            ResetObjectMatchTimeTags did not pass in the   */
+/*            environment argument when BLOAD_ONLY was set.  */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Added support for hashed alpha memories.       */
+/*                                                           */
+/*      6.31: Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_objrtbin
+
+#pragma once
+
+#define _H_objrtbin
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+
+#define OBJECTRETEBIN_DATA 34
+
+#ifndef _H_objrtmch
+#include "objrtmch.h"
+#endif
+
+struct objectReteBinaryData
+  {
+   unsigned long AlphaNodeCount;
+   unsigned long PatternNodeCount;
+   unsigned long AlphaLinkCount;
+   OBJECT_ALPHA_NODE *AlphaArray;
+   OBJECT_PATTERN_NODE *PatternArray;
+   CLASS_ALPHA_LINK *AlphaLinkArray;
+  };
+
+#define ObjectReteBinaryData(theEnv) ((struct objectReteBinaryData *) GetEnvironmentData(theEnv,OBJECTRETEBIN_DATA))
+
+#define ClassAlphaPointer(i)   ((i == ULONG_MAX) ? NULL : (CLASS_ALPHA_LINK *) &ObjectReteBinaryData(theEnv)->AlphaLinkArray[i])
+
+   void                    SetupObjectPatternsBload(Environment *);
+
+#endif /* DEFRULE_CONSTRUCT && OBJECT_SYSTEM */
+
+#endif /* _H_objrtbin */
+
+
+
diff --git a/clips/objrtbld.c b/clips/objrtbld.c
new file mode 100755
index 000000000..1e2004dd6
--- /dev/null
+++ b/clips/objrtbld.c
@@ -0,0 +1,2396 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  02/09/18             */
+   /*                                                     */
+   /*          OBJECT PATTERN MATCHER MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: RETE Network Parsing Interface for Objects       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Added class name to OBJRTBLD5 error message.   */
+/*                                                           */
+/*            Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Static constraint checking is always enabled.  */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed initial-object support.                */
+/*                                                           */
+/*************************************************************/
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "classcom.h"
+#include "classfun.h"
+#include "cstrnutl.h"
+#include "constrnt.h"
+#include "cstrnchk.h"
+#include "cstrnops.h"
+#include "drive.h"
+#include "envrnmnt.h"
+#include "inscom.h"
+#include "insfun.h"
+#include "insmngr.h"
+#include "memalloc.h"
+#include "network.h"
+#include "object.h"
+#include "pattern.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "ruledef.h"
+#include "rulepsr.h"
+#include "scanner.h"
+#include "symbol.h"
+#include "utility.h"
+
+#endif
+
+#include "constrct.h"
+#include "exprnpsr.h"
+#include "objrtmch.h"
+#include "objrtgen.h"
+#include "objrtfnx.h"
+#include "pprint.h"
+#include "reorder.h"
+#include "router.h"
+
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+#include "objrtbin.h"
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "objrtcmp.h"
+#endif
+
+#include "objrtbld.h"
+
+#if ! DEFINSTANCES_CONSTRUCT
+#include "classfun.h"
+#include "classcom.h"
+#include "extnfunc.h"
+#endif
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/* =========================================
+   *****************************************
+                   CONSTANTS
+   =========================================
+   ***************************************** */
+#define OBJECT_PATTERN_INDICATOR "object"
+
+/* =========================================
+   *****************************************
+      INTERNALLY VISIBLE FUNCTION HEADERS
+   =========================================
+   ***************************************** */
+
+   static bool                    PatternParserFind(CLIPSLexeme *);
+   static struct lhsParseNode    *ObjectLHSParse(Environment *,const char *,struct token *);
+   static bool                    ReorderAndAnalyzeObjectPattern(Environment *,struct lhsParseNode *);
+   static struct patternNodeHeader
+                                 *PlaceObjectPattern(Environment *,struct lhsParseNode *);
+   static OBJECT_PATTERN_NODE    *FindObjectPatternNode(OBJECT_PATTERN_NODE *,struct lhsParseNode *,
+                                                  OBJECT_PATTERN_NODE **,bool,bool);
+   static OBJECT_PATTERN_NODE    *CreateNewObjectPatternNode(Environment *,struct lhsParseNode *,OBJECT_PATTERN_NODE *,
+                                                       OBJECT_PATTERN_NODE *,bool,bool);
+   static void                    DetachObjectPattern(Environment *,struct patternNodeHeader *);
+   static void                    ClearObjectPatternMatches(Environment *,OBJECT_ALPHA_NODE *);
+   static void                    RemoveObjectPartialMatches(Environment *,Instance *,struct patternNodeHeader *);
+   static bool                    CheckDuplicateSlots(Environment *,struct lhsParseNode *,CLIPSLexeme *);
+   static struct lhsParseNode    *ParseClassRestriction(Environment *,const char *,struct token *);
+   static struct lhsParseNode    *ParseNameRestriction(Environment *,const char *,struct token *);
+   static struct lhsParseNode    *ParseSlotRestriction(Environment *,const char *,struct token *,CONSTRAINT_RECORD *,bool);
+   static CLASS_BITMAP           *NewClassBitMap(Environment *,unsigned short,bool);
+   static void                    InitializeClassBitMap(Environment *,CLASS_BITMAP *,bool);
+   static void                    DeleteIntermediateClassBitMap(Environment *,CLASS_BITMAP *);
+   static void                   *CopyClassBitMap(Environment *,void *);
+   static void                    DeleteClassBitMap(Environment *,void *);
+   static void                    MarkBitMapClassesBusy(Environment *,CLIPSBitMap *,int);
+   static bool                    EmptyClassBitMap(CLASS_BITMAP *);
+   static bool                    IdenticalClassBitMap(CLASS_BITMAP *,CLASS_BITMAP *);
+   static bool                    ProcessClassRestriction(Environment *,CLASS_BITMAP *,struct lhsParseNode **,bool);
+   static CONSTRAINT_RECORD      *ProcessSlotRestriction(Environment *,CLASS_BITMAP *,CLIPSLexeme *,bool *);
+   static void                    IntersectClassBitMaps(CLASS_BITMAP *,CLASS_BITMAP *);
+   static void                    UnionClassBitMaps(CLASS_BITMAP *,CLASS_BITMAP *);
+   static CLASS_BITMAP           *PackClassBitMap(Environment *,CLASS_BITMAP *);
+   static struct lhsParseNode    *FilterObjectPattern(Environment *,struct patternParser *,
+                                              struct lhsParseNode *,struct lhsParseNode **,
+                                              struct lhsParseNode **,struct lhsParseNode **);
+   static CLIPSBitMap            *FormSlotBitMap(Environment *,struct lhsParseNode *);
+   static struct lhsParseNode    *RemoveSlotExistenceTests(Environment *,struct lhsParseNode *,CLIPSBitMap **);
+   static void                    MarkObjectPtnIncrementalReset(Environment *,struct patternNodeHeader *,bool);
+   static void                    ObjectIncrementalReset(Environment *);
+
+#endif
+
+   static Expression             *ObjectMatchDelayParse(Environment *,Expression *,const char *);
+
+#if ! DEFINSTANCES_CONSTRUCT
+   static void                    ResetInitialObject(Environment *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/********************************************************
+  NAME         : SetupObjectPatternStuff
+  DESCRIPTION  : Installs the parsers and other items
+                 necessary for recognizing and processing
+                 object patterns in defrules
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Rete network interfaces for objects
+                 initialized
+  NOTES        : None
+ ********************************************************/
+void SetupObjectPatternStuff(
+  Environment *theEnv)
+  {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   struct patternParser *newPtr;
+
+   if (ReservedPatternSymbol(theEnv,"object",NULL) == true)
+     {
+      SystemError(theEnv,"OBJRTBLD",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+   AddReservedPatternSymbol(theEnv,"object",NULL);
+
+   /* ===========================================================================
+      The object pattern parser needs to have a higher priority than deftemplates
+      or regular facts so that the "object" keyword is always recognized first
+      =========================================================================== */
+
+   newPtr = get_struct(theEnv,patternParser);
+
+   newPtr->name = "objects";
+   newPtr->priority = 20;
+   newPtr->entityType = &InstanceData(theEnv)->InstanceInfo;
+
+   newPtr->recognizeFunction = PatternParserFind;
+   newPtr->parseFunction = ObjectLHSParse;
+   newPtr->postAnalysisFunction = ReorderAndAnalyzeObjectPattern;
+   newPtr->addPatternFunction = PlaceObjectPattern;
+   newPtr->removePatternFunction = DetachObjectPattern;
+   newPtr->genJNConstantFunction = NULL;
+   newPtr->replaceGetJNValueFunction = ReplaceGetJNObjectValue;
+   newPtr->genGetJNValueFunction = GenGetJNObjectValue;
+   newPtr->genCompareJNValuesFunction = ObjectJNVariableComparison;
+   newPtr->genPNConstantFunction = GenObjectPNConstantCompare;
+   newPtr->replaceGetPNValueFunction = ReplaceGetPNObjectValue;
+   newPtr->genGetPNValueFunction = GenGetPNObjectValue;
+   newPtr->genComparePNValuesFunction = ObjectPNVariableComparison;
+   newPtr->returnUserDataFunction = DeleteClassBitMap;
+   newPtr->copyUserDataFunction = CopyClassBitMap;
+
+   newPtr->markIRPatternFunction = MarkObjectPtnIncrementalReset;
+   newPtr->incrementalResetFunction = ObjectIncrementalReset;
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   newPtr->codeReferenceFunction = ObjectPatternNodeReference;
+#else
+   newPtr->codeReferenceFunction = NULL;
+#endif
+
+   AddPatternParser(theEnv,newPtr);
+
+#endif
+
+#if (! RUN_TIME)
+   AddUDF(theEnv,"object-pattern-match-delay","*",0,UNBOUNDED,NULL,ObjectMatchDelay,"ObjectMatchDelay",NULL);
+   FuncSeqOvlFlags(theEnv,"object-pattern-match-delay",false,false);
+#endif
+
+   AddFunctionParser(theEnv,"object-pattern-match-delay",ObjectMatchDelayParse);
+
+   InstallObjectPrimitives(theEnv);
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   ObjectPatternsCompilerSetup(theEnv);
+#endif
+
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+   SetupObjectPatternsBload(theEnv);
+#endif
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/*****************************************************
+  NAME         : PatternParserFind
+  DESCRIPTION  : Determines if a pattern CE is an
+                 object pattern (i.e. the first field
+                 is the constant symbol "object")
+  INPUTS       : 1) The type of the first field
+                 2) The value of the first field
+  RETURNS      : True if it is an object pattern,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : Used by AddPatternParser()
+ *****************************************************/
+static bool PatternParserFind(
+  CLIPSLexeme *value)
+  {
+   if (strcmp(value->contents,OBJECT_PATTERN_INDICATOR) == 0)
+     return true;
+
+   return false;
+  }
+
+/************************************************************************************
+  NAME         : ObjectLHSParse
+  DESCRIPTION  : Scans and parses an object pattern for a rule
+  INPUTS       : 1) The logical name of the input source
+                 2) A buffer holding the last token read
+  RETURNS      : The address of struct lhsParseNodes, NULL on errors
+  SIDE EFFECTS : A series of struct lhsParseNodes are created to represent
+                 the intermediate parse of the pattern
+                 Pretty-print form for the pattern is saved
+  NOTES        : Object Pattern Syntax:
+                 (object [<class-constraint>] [<name-constraint>] <slot-constraint>*)
+                 <class-constraint> ::= (is-a <constraint>)
+                 <name-constraint> ::= (name <constraint>)
+                 <slot-constraint> ::= (<slot-name> <constraint>*)
+ ************************************************************************************/
+static struct lhsParseNode *ObjectLHSParse(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *lastToken)
+  {
+#if MAC_XCD
+#pragma unused(lastToken)
+#endif
+   struct token theToken;
+   struct lhsParseNode *firstNode = NULL,*lastNode = NULL,*tmpNode;
+   CLASS_BITMAP *clsset,*tmpset;
+   CONSTRAINT_RECORD *slotConstraints;
+   bool ppbackupReqd = false,multip;
+
+   /* ========================================================
+      Get a bitmap big enough to mark the ids of all currently
+      existing classes - and set all bits, since the initial
+      set of applicable classes is everything.
+      ======================================================== */
+   clsset = NewClassBitMap(theEnv,DefclassData(theEnv)->MaxClassID - 1,true);
+   if (EmptyClassBitMap(clsset))
+     {
+      PrintErrorID(theEnv,"OBJRTBLD",1,false);
+      WriteString(theEnv,STDERR,"No objects of existing classes can satisfy pattern.\n");
+      DeleteIntermediateClassBitMap(theEnv,clsset);
+      return NULL;
+     }
+   tmpset = NewClassBitMap(theEnv,DefclassData(theEnv)->MaxClassID - 1,true);
+
+   IncrementIndentDepth(theEnv,7);
+
+   /* ===========================================
+      Parse the class, name and slot restrictions
+      =========================================== */
+   GetToken(theEnv,readSource,&theToken);
+   while (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      ppbackupReqd = true;
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,theToken.printForm);
+      if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"object pattern");
+         goto ObjectLHSParseERROR;
+        }
+      GetToken(theEnv,readSource,&theToken);
+      if (theToken.tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"object pattern");
+         goto ObjectLHSParseERROR;
+        }
+      if (CheckDuplicateSlots(theEnv,firstNode,theToken.lexemeValue))
+        goto ObjectLHSParseERROR;
+      if (theToken.value == (void *) DefclassData(theEnv)->ISA_SYMBOL)
+        {
+         tmpNode = ParseClassRestriction(theEnv,readSource,&theToken);
+         if (tmpNode == NULL)
+           goto ObjectLHSParseERROR;
+         InitializeClassBitMap(theEnv,tmpset,false);
+         if (ProcessClassRestriction(theEnv,tmpset,&tmpNode->bottom,true) == false)
+           {
+            ReturnLHSParseNodes(theEnv,tmpNode);
+            goto ObjectLHSParseERROR;
+           }
+         IntersectClassBitMaps(clsset,tmpset);
+        }
+      else if (theToken.value == (void *) DefclassData(theEnv)->NAME_SYMBOL)
+        {
+         tmpNode = ParseNameRestriction(theEnv,readSource,&theToken);
+         if (tmpNode == NULL)
+           goto ObjectLHSParseERROR;
+         InitializeClassBitMap(theEnv,tmpset,true);
+        }
+      else
+        {
+         slotConstraints = ProcessSlotRestriction(theEnv,clsset,theToken.lexemeValue,&multip);
+         if (slotConstraints != NULL)
+           {
+            InitializeClassBitMap(theEnv,tmpset,true);
+            tmpNode = ParseSlotRestriction(theEnv,readSource,&theToken,slotConstraints,multip);
+            if (tmpNode == NULL)
+              goto ObjectLHSParseERROR;
+           }
+         else
+           {
+            InitializeClassBitMap(theEnv,tmpset,false);
+            tmpNode = GetLHSParseNode(theEnv);
+            tmpNode->slot = theToken.lexemeValue;
+           }
+        }
+      if (EmptyClassBitMap(tmpset))
+        {
+         PrintErrorID(theEnv,"OBJRTBLD",2,false);
+         WriteString(theEnv,STDERR,"No objects of existing classes can satisfy '");
+         WriteString(theEnv,STDERR,tmpNode->slot->contents);
+         WriteString(theEnv,STDERR,"' restriction in object pattern.\n");
+         ReturnLHSParseNodes(theEnv,tmpNode);
+         goto ObjectLHSParseERROR;
+        }
+      if (EmptyClassBitMap(clsset))
+        {
+         PrintErrorID(theEnv,"OBJRTBLD",1,false);
+         WriteString(theEnv,STDERR,"No objects of existing classes can satisfy pattern.\n");
+         ReturnLHSParseNodes(theEnv,tmpNode);
+         goto ObjectLHSParseERROR;
+        }
+      if (tmpNode != NULL)
+        {
+         if (firstNode == NULL)
+           firstNode = tmpNode;
+         else
+           lastNode->right = tmpNode;
+         lastNode = tmpNode;
+        }
+      PPCRAndIndent(theEnv);
+      GetToken(theEnv,readSource,&theToken);
+     }
+   if (firstNode == NULL)
+     {
+      if (EmptyClassBitMap(clsset))
+        {
+         PrintErrorID(theEnv,"OBJRTBLD",1,false);
+         WriteString(theEnv,STDERR,"No objects of existing classes can satisfy pattern.\n");
+         goto ObjectLHSParseERROR;
+        }
+      firstNode = GetLHSParseNode(theEnv);
+      firstNode->pnType = SF_WILDCARD_NODE;
+      firstNode->slot = DefclassData(theEnv)->ISA_SYMBOL;
+      firstNode->slotNumber = ISA_ID;
+      firstNode->index = 1;
+     }
+   if (ppbackupReqd)
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,theToken.printForm);
+     }
+   DeleteIntermediateClassBitMap(theEnv,tmpset);
+   clsset = PackClassBitMap(theEnv,clsset);
+   firstNode->userData = AddBitMap(theEnv,clsset,ClassBitMapSize(clsset));
+   IncrementBitMapCount(firstNode->userData);
+   DeleteIntermediateClassBitMap(theEnv,clsset);
+   DecrementIndentDepth(theEnv,7);
+   return(firstNode);
+
+ObjectLHSParseERROR:
+   DeleteIntermediateClassBitMap(theEnv,clsset);
+   DeleteIntermediateClassBitMap(theEnv,tmpset);
+   ReturnLHSParseNodes(theEnv,firstNode);
+   DecrementIndentDepth(theEnv,7);
+   return NULL;
+  }
+
+/**************************************************************
+  NAME         : ReorderAndAnalyzeObjectPattern
+  DESCRIPTION  : This function reexamines the object pattern
+                 after constraint and variable analysis info
+                 has been propagated from other patterns.
+                   Any slots which are no longer applicable
+                 to the pattern are eliminated from the
+                 class set.
+                   Also, the slot names are ordered according
+                 to lexical value to aid in deteterming
+                 sharing between object patterns.  (The is-a
+                 and name restrictions are always placed
+                 first regardless of symbolic hash value.)
+  INPUTS       : The pattern CE lhsParseNode
+  RETURNS      : False if all OK, otherwise true
+                 (e.g. all classes are eliminated as potential
+                  matching candidates for the pattern)
+  SIDE EFFECTS : Slot restrictions are reordered (if necessary)
+  NOTES        : Adds a default is-a slot if one does not
+                 already exist
+ **************************************************************/
+static bool ReorderAndAnalyzeObjectPattern(
+  Environment *theEnv,
+  struct lhsParseNode *topNode)
+  {
+   CLASS_BITMAP *clsset,*tmpset;
+   Expression *rexp,*tmpmin,*tmpmax;
+   Defclass *cls;
+   struct lhsParseNode *tmpNode,*subNode,*bitmap_node,*isa_node,*name_node;
+   unsigned short i;
+   SlotDescriptor *sd;
+   CONSTRAINT_RECORD *crossConstraints, *theConstraint;
+   int incompatibleConstraint;
+   bool clssetChanged = false;
+
+   /* ==========================================================
+      Make sure that the bitmap marking which classes of object
+      can match the pattern is attached to the class restriction
+      (which will always be present and the last restriction
+      after the sort)
+      ========================================================== */
+   topNode->right = FilterObjectPattern(theEnv,topNode->patternType,topNode->right,
+                                        &bitmap_node,&isa_node,&name_node);
+
+   /* ============================================
+      Allocate a temporary set for marking classes
+      ============================================ */
+   clsset = (CLASS_BITMAP *) ((CLIPSBitMap *) bitmap_node->userData)->contents;
+   tmpset = NewClassBitMap(theEnv,clsset->maxid,false);
+
+   /* ==========================================================
+      Check the allowed-values for the constraint on the is-a
+      slot.  If there are any, make sure that only the classes
+      with those values as names are marked in the bitmap.
+
+      There will only be symbols in the list because the
+      original constraint on the is-a slot allowed only symbols.
+      ========================================================== */
+   if ((isa_node == NULL) ? false :
+       ((isa_node->constraints == NULL) ? false :
+        (isa_node->constraints->restrictionList != NULL)))
+     {
+      rexp = isa_node->constraints->restrictionList;
+      while (rexp != NULL)
+        {
+         cls = LookupDefclassInScope(theEnv,rexp->lexemeValue->contents);
+         if (cls != NULL)
+           {
+            if ((cls->id <= clsset->maxid) ? TestBitMap(clsset->map,cls->id) : false)
+              SetBitMap(tmpset->map,cls->id);
+           }
+         rexp = rexp->nextArg;
+        }
+      clssetChanged = IdenticalClassBitMap(tmpset,clsset) ? false : true;
+     }
+   else
+     GenCopyMemory(char,tmpset->maxid / BITS_PER_BYTE + 1,tmpset->map,clsset->map);
+
+   /* ================================================================
+      For each of the slots (excluding name and is-a), check the total
+      constraints for the slot against the individual constraints
+      for each occurrence of the slot in the classes marked in
+      the bitmap.  For any slot which is not compatible with
+      the overall constraint, clear its class's bit in the bitmap.
+      ================================================================ */
+   tmpNode = topNode->right;
+   while (tmpNode != bitmap_node)
+     {
+      if ((tmpNode == isa_node) || (tmpNode == name_node))
+        {
+         tmpNode = tmpNode->right;
+         continue;
+        }
+      for (i = 0 ; i <= tmpset->maxid ; i++)
+        if (TestBitMap(tmpset->map,i))
+          {
+           cls = DefclassData(theEnv)->ClassIDMap[i];
+           sd =  cls->instanceTemplate[FindInstanceTemplateSlot(theEnv,cls,tmpNode->slot)];
+
+           /* =========================================
+              Check the top-level lhsParseNode for type
+              and cardinality compatibility
+              ========================================= */
+           crossConstraints = IntersectConstraints(theEnv,tmpNode->constraints,sd->constraint);
+           incompatibleConstraint = UnmatchableConstraint(crossConstraints);
+           RemoveConstraint(theEnv,crossConstraints);
+           if (incompatibleConstraint)
+             {
+              ClearBitMap(tmpset->map,i);
+              clssetChanged = true;
+             }
+           else if (tmpNode->pnType == MF_WILDCARD_NODE)
+             {
+              /* ==========================================
+                 Check the sub-nodes for type compatibility
+                 ========================================== */
+              for (subNode = tmpNode->bottom ; subNode != NULL ; subNode = subNode->right)
+                {
+                 /* ========================================================
+                    Temporarily reset cardinality of variables to
+                    match slot so that no cardinality errors will be flagged
+                    ======================================================== */
+                 if ((subNode->pnType == MF_WILDCARD_NODE) || (subNode->pnType == MF_VARIABLE_NODE))
+                   { theConstraint = subNode->constraints->multifield; }
+                 else
+                   { theConstraint = subNode->constraints; }
+
+                 tmpmin = theConstraint->minFields;
+                 theConstraint->minFields = sd->constraint->minFields;
+                 tmpmax = theConstraint->maxFields;
+                 theConstraint->maxFields = sd->constraint->maxFields;
+                 crossConstraints = IntersectConstraints(theEnv,theConstraint,sd->constraint);
+                 theConstraint->minFields = tmpmin;
+                 theConstraint->maxFields = tmpmax;
+
+                 incompatibleConstraint = UnmatchableConstraint(crossConstraints);
+                 RemoveConstraint(theEnv,crossConstraints);
+                 if (incompatibleConstraint)
+                   {
+                    ClearBitMap(tmpset->map,i);
+                    clssetChanged = true;
+                    break;
+                   }
+                }
+             }
+          }
+      tmpNode = tmpNode->right;
+     }
+
+   if (clssetChanged)
+     {
+      /* =======================================================
+         Make sure that there are still classes of objects which
+         can satisfy this pattern.  Otherwise, signal an error.
+         ======================================================= */
+      if (EmptyClassBitMap(tmpset))
+        {
+         PrintErrorID(theEnv,"OBJRTBLD",3,true);
+         DeleteIntermediateClassBitMap(theEnv,tmpset);
+         WriteString(theEnv,STDERR,"No objects of existing classes can satisfy pattern #");
+         WriteInteger(theEnv,STDERR,topNode->pattern);
+         WriteString(theEnv,STDERR,".\n");
+         return true;
+        }
+      clsset = PackClassBitMap(theEnv,tmpset);
+      DeleteClassBitMap(theEnv,bitmap_node->userData);
+      bitmap_node->userData = AddBitMap(theEnv,clsset,ClassBitMapSize(clsset));
+      IncrementBitMapCount(bitmap_node->userData);
+      DeleteIntermediateClassBitMap(theEnv,clsset);
+     }
+   else
+     DeleteIntermediateClassBitMap(theEnv,tmpset);
+   return false;
+  }
+
+/*****************************************************
+  NAME         : PlaceObjectPattern
+  DESCRIPTION  : Integrates an object pattern into the
+                 object pattern network
+  INPUTS       : The intermediate parse representation
+                 of the pattern
+  RETURNS      : The address of the new pattern
+  SIDE EFFECTS : Object pattern network updated
+  NOTES        : None
+ *****************************************************/
+static struct patternNodeHeader *PlaceObjectPattern(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern)
+  {
+   OBJECT_PATTERN_NODE *currentLevel,*lastLevel;
+   struct lhsParseNode *tempPattern = NULL;
+   OBJECT_PATTERN_NODE *nodeSlotGroup, *newNode;
+   OBJECT_ALPHA_NODE *newAlphaNode;
+   bool endSlot;
+   CLIPSBitMap *newClassBitMap,*newSlotBitMap;
+   struct expr *rightHash;
+   unsigned int i;
+   CLASS_BITMAP *cbmp;
+   Defclass *relevantDefclass;
+   CLASS_ALPHA_LINK *newAlphaLink;
+
+   /*========================================================*/
+   /* Get the top of the object pattern network and prepare  */
+   /* for the traversal to look for shareable pattern nodes. */
+   /*========================================================*/
+
+   currentLevel = ObjectNetworkPointer(theEnv);
+   lastLevel = NULL;
+
+   /*====================================================*/
+   /* Remove slot existence tests from the pattern since */
+   /* these are accounted for by the class bitmap and    */
+   /* find the class and slot bitmaps.                   */
+   /*====================================================*/
+
+   rightHash = thePattern->rightHash;
+
+   newSlotBitMap = FormSlotBitMap(theEnv,thePattern->right);
+   thePattern->right = RemoveSlotExistenceTests(theEnv,thePattern->right,&newClassBitMap);
+   thePattern = thePattern->right;
+
+   /*=========================================================*/
+   /* Loop until all fields in the pattern have been added to */
+   /* the pattern network. Process the bitmap node ONLY if it */
+   /* is the only node in the pattern.                        */
+   /*=========================================================*/
+
+   do
+     {
+      if (thePattern->multifieldSlot)
+        {
+         tempPattern = thePattern;
+         thePattern = thePattern->bottom;
+        }
+
+      /*============================================*/
+      /* Determine if the last pattern field within */
+      /* a multifield slot is being processed.      */
+      /*============================================*/
+
+      if (((thePattern->pnType == MF_WILDCARD_NODE) ||
+           (thePattern->pnType == MF_VARIABLE_NODE)) &&
+          (thePattern->right == NULL) && (tempPattern != NULL))
+        { endSlot = true; }
+      else
+        { endSlot = false; }
+
+      /*========================================*/
+      /* Is there a node in the pattern network */
+      /* that can be reused (shared)?           */
+      /*========================================*/
+
+      newNode = FindObjectPatternNode(currentLevel,thePattern,&nodeSlotGroup,endSlot,false);
+
+      /*================================================*/
+      /* If the pattern node cannot be shared, then add */
+      /* a new pattern node to the pattern network.     */
+      /*================================================*/
+
+      if (newNode == NULL)
+        { newNode = CreateNewObjectPatternNode(theEnv,thePattern,nodeSlotGroup,lastLevel,endSlot,false); }
+
+      if (thePattern->constantSelector != NULL)
+        {
+         currentLevel = newNode->nextLevel;
+         lastLevel = newNode;
+         newNode = FindObjectPatternNode(currentLevel,thePattern,&nodeSlotGroup,endSlot,true);
+
+         if (newNode == NULL)
+           { newNode = CreateNewObjectPatternNode(theEnv,thePattern,nodeSlotGroup,lastLevel,endSlot,true); }
+        }
+
+      /*=======================================================*/
+      /* Move on to the next field in the pattern to be added. */
+      /*=======================================================*/
+
+      if ((thePattern->right == NULL) && (tempPattern != NULL))
+        {
+         thePattern = tempPattern;
+         tempPattern = NULL;
+        }
+
+      lastLevel = newNode;
+      currentLevel = newNode->nextLevel;
+      thePattern = thePattern->right;
+     }
+   while ((thePattern != NULL) ? (thePattern->userData == NULL) : false);
+
+   /*==================================================*/
+   /* Return the leaf node of the newly added pattern. */
+   /*==================================================*/
+
+   newAlphaNode = lastLevel->alphaNode;
+   while (newAlphaNode != NULL)
+     {
+      if ((newClassBitMap == newAlphaNode->classbmp) &&
+          (newSlotBitMap == newAlphaNode->slotbmp) &&
+          IdenticalExpression(newAlphaNode->header.rightHash,rightHash))
+        return((struct patternNodeHeader *) newAlphaNode);
+      newAlphaNode = newAlphaNode->nxtInGroup;
+     }
+
+   newAlphaNode = get_struct(theEnv,objectAlphaNode);
+   InitializePatternHeader(theEnv,&newAlphaNode->header);
+   newAlphaNode->header.rightHash = AddHashedExpression(theEnv,rightHash);
+   newAlphaNode->matchTimeTag = 0L;
+   newAlphaNode->patternNode = lastLevel;
+   newAlphaNode->classbmp = newClassBitMap;
+   IncrementBitMapCount(newClassBitMap);
+   MarkBitMapClassesBusy(theEnv,newClassBitMap,1);
+   newAlphaNode->slotbmp = newSlotBitMap;
+   if (newSlotBitMap != NULL)
+     IncrementBitMapCount(newSlotBitMap);
+   newAlphaNode->bsaveID = 0L;
+   newAlphaNode->nxtInGroup = lastLevel->alphaNode;
+   lastLevel->alphaNode = newAlphaNode;
+   newAlphaNode->nxtTerminal = ObjectNetworkTerminalPointer(theEnv);
+   SetObjectNetworkTerminalPointer(theEnv,newAlphaNode);
+   
+   /*
+    * A new terminal alpha node has just been created. For each defclass
+    * relevant to this alpha node, add it to that defclass'
+    * relevant_terminal_alpha_nodes list
+    */
+   cbmp = (CLASS_BITMAP *) newClassBitMap->contents;
+   for (i = 0; i <= cbmp->maxid; i++)
+     {
+      if (TestBitMap(cbmp->map,i))
+        {
+         relevantDefclass = DefclassData(theEnv)->ClassIDMap[i];
+         newAlphaLink = get_struct(theEnv, classAlphaLink);
+         newAlphaLink->alphaNode = newAlphaNode;
+         newAlphaLink->next = relevantDefclass->relevant_terminal_alpha_nodes;
+         relevantDefclass->relevant_terminal_alpha_nodes = newAlphaLink;
+        }
+     }
+
+   return((struct patternNodeHeader *) newAlphaNode);
+  }
+
+/************************************************************************
+  NAME         : FindObjectPatternNode
+  DESCRIPTION  : Looks for a pattern node at a specified
+                 level in the pattern network that can be reused (shared)
+                 with a pattern field being added to the pattern network.
+  INPUTS       : 1) The current layer of nodes being examined in the
+                    object pattern network
+                 2) The intermediate parse representation of the pattern
+                    being added
+                 3) A buffer for holding the first node of a group
+                    of slots with the same name as the new node
+                 4) An integer code indicating if this is the last
+                    fiedl in a slot pattern or not
+  RETURNS      : The old pattern network node matching the new node, or
+                 NULL if there is none (nodeSlotGroup will hold the
+                 place where to attach a new node)
+  SIDE EFFECTS : nodeSlotGroup set
+  NOTES        : None
+ ************************************************************************/
+static OBJECT_PATTERN_NODE *FindObjectPatternNode(
+  OBJECT_PATTERN_NODE *listOfNodes,
+  struct lhsParseNode *thePattern,
+  OBJECT_PATTERN_NODE **nodeSlotGroup,
+  bool endSlot,
+  bool constantSelector)
+  {
+   struct expr *compareTest;
+   *nodeSlotGroup = NULL;
+
+   if (constantSelector)
+     { compareTest = thePattern->constantValue; }
+   else if (thePattern->constantSelector != NULL)
+     { compareTest = thePattern->constantSelector; }
+   else
+     { compareTest = thePattern->networkTest; }
+
+   /*==========================================================*/
+   /* Loop through the nodes at the given level in the pattern */
+   /* network looking for a node that can be reused (shared).  */
+   /*==========================================================*/
+
+   while (listOfNodes != NULL)
+     {
+      /*=========================================================*/
+      /* A object pattern node can be shared if the slot name is */
+      /* the same, the test is on the same field in the pattern, */
+      /* and the network test expressions are the same.          */
+      /*=========================================================*/
+
+      if (((thePattern->pnType == MF_WILDCARD_NODE) || (thePattern->pnType == MF_VARIABLE_NODE)) ?
+          listOfNodes->multifieldNode : (listOfNodes->multifieldNode == 0))
+        {
+         if ((thePattern->slotNumber == listOfNodes->slotNameID) &&
+             (thePattern->index == listOfNodes->whichField) &&
+             (thePattern->singleFieldsAfter == listOfNodes->leaveFields) &&
+             (endSlot == listOfNodes->endSlot) &&
+             IdenticalExpression(listOfNodes->networkTest,compareTest))
+           return(listOfNodes);
+        }
+
+      /*===============================================*/
+      /* Find the beginning of a group of nodes with   */
+      /* the same slot name testing on the same field. */
+      /*===============================================*/
+
+      if ((*nodeSlotGroup == NULL) &&
+          (thePattern->index == listOfNodes->whichField) &&
+          (thePattern->slotNumber == listOfNodes->slotNameID))
+        *nodeSlotGroup = listOfNodes;
+      listOfNodes = listOfNodes->rightNode;
+     }
+
+   /*==============================================*/
+   /* A shareable pattern node could not be found. */
+   /*==============================================*/
+
+   return NULL;
+  }
+
+/*****************************************************************
+  NAME         : CreateNewObjectPatternNode
+  DESCRIPTION  : Creates a new pattern node and initializes
+                   all of its values.
+  INPUTS       : 1) The intermediate parse representation
+                    of the new pattern node
+                 2) A pointer to the network node after
+                    which to add the new node
+                 3) A pointer to the parent node on the
+                    level above to link the new node
+                 4) An integer code indicating if this is the last
+                    fiedl in a slot pattern or not
+  RETURNS      : A pointer to the new pattern node
+  SIDE EFFECTS : Pattern node allocated, initialized and
+                   attached
+  NOTES        : None
+ *****************************************************************/
+static OBJECT_PATTERN_NODE *CreateNewObjectPatternNode(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern,
+  OBJECT_PATTERN_NODE *nodeSlotGroup,
+  OBJECT_PATTERN_NODE *upperLevel,
+  bool endSlot,
+  bool constantSelector)
+  {
+   OBJECT_PATTERN_NODE *newNode,*prvNode,*curNode;
+
+   newNode = get_struct(theEnv,objectPatternNode);
+   newNode->blocked = false;
+   newNode->multifieldNode = false;
+   newNode->alphaNode = NULL;
+   newNode->matchTimeTag = 0L;
+   newNode->nextLevel = NULL;
+   newNode->rightNode = NULL;
+   newNode->leftNode = NULL;
+   newNode->bsaveID = 0L;
+
+   if ((thePattern->constantSelector != NULL) && (! constantSelector))
+     { newNode->selector = true; }
+   else
+     { newNode->selector = false; }
+
+   /*===========================================================*/
+   /* Install the expression associated with this pattern node. */
+   /*===========================================================*/
+
+   if (constantSelector)
+     { newNode->networkTest = AddHashedExpression(theEnv,thePattern->constantValue); }
+   else if (thePattern->constantSelector != NULL)
+     { newNode->networkTest = AddHashedExpression(theEnv,thePattern->constantSelector); }
+   else
+     { newNode->networkTest = AddHashedExpression(theEnv,thePattern->networkTest); }
+
+   newNode->whichField = thePattern->index;
+   newNode->leaveFields = thePattern->singleFieldsAfter;
+
+   /*=========================================*/
+   /* Install the slot name for the new node. */
+   /*=========================================*/
+
+   newNode->slotNameID = thePattern->slotNumber;
+   if ((thePattern->pnType == MF_WILDCARD_NODE) || (thePattern->pnType == MF_VARIABLE_NODE))
+     newNode->multifieldNode = true;
+   newNode->endSlot = endSlot;
+
+   /*===============================================*/
+   /* Set the upper level pointer for the new node. */
+   /*===============================================*/
+
+   newNode->lastLevel = upperLevel;
+
+   if ((upperLevel != NULL) && (upperLevel->selector))
+     { AddHashedPatternNode(theEnv,upperLevel,newNode,newNode->networkTest->type,newNode->networkTest->value); }
+
+   /*==============================================*/
+   /* If there are no nodes with this slot name on */
+   /* this level, simply prepend it to the front.  */
+   /*==============================================*/
+
+   if (nodeSlotGroup == NULL)
+     {
+      if (upperLevel == NULL)
+        {
+         newNode->rightNode = ObjectNetworkPointer(theEnv);
+         SetObjectNetworkPointer(theEnv,newNode);
+        }
+      else
+        {
+         newNode->rightNode = upperLevel->nextLevel;
+         upperLevel->nextLevel = newNode;
+        }
+      if (newNode->rightNode != NULL)
+        newNode->rightNode->leftNode = newNode;
+      return(newNode);
+     }
+
+   /* ===========================================================
+      Group this node with other nodes of the same name
+      testing on the same field in the pattern
+      on this level.  This allows us to do some optimization
+      with constant tests on a particular slots.  If we put
+      all constant tests for a particular slot/field group at the
+      end of that group, then when one of those test succeeds
+      during pattern-matching, we don't have to test any
+      more of the nodes with that slot/field name to the right.
+      =========================================================== */
+   prvNode = NULL;
+   curNode = nodeSlotGroup;
+   while ((curNode == NULL) ? false :
+          (curNode->slotNameID == nodeSlotGroup->slotNameID) &&
+          (curNode->whichField == nodeSlotGroup->whichField))
+     {
+      if ((curNode->networkTest == NULL) ? false :
+          ((curNode->networkTest->type != OBJ_PN_CONSTANT) ? false :
+           ((struct ObjectCmpPNConstant *) curNode->networkTest->bitMapValue->contents)->pass))
+        break;
+      prvNode = curNode;
+      curNode = curNode->rightNode;
+     }
+   if (curNode != NULL)
+     {
+      newNode->leftNode = curNode->leftNode;
+      newNode->rightNode = curNode;
+      if (curNode->leftNode != NULL)
+        curNode->leftNode->rightNode = newNode;
+      else if (curNode->lastLevel != NULL)
+        curNode->lastLevel->nextLevel = newNode;
+      else
+        SetObjectNetworkPointer(theEnv,newNode);
+      curNode->leftNode = newNode;
+     }
+   else
+     {
+      newNode->leftNode = prvNode;
+      prvNode->rightNode = newNode;
+     }
+
+   return(newNode);
+  }
+
+/********************************************************
+  NAME         : DetachObjectPattern
+  DESCRIPTION  : Removes a pattern node and all of its
+   parent nodes from the pattern network. Nodes are only
+   removed if they are no longer shared (i.e. a pattern
+   node that has more than one child node is shared). A
+   pattern from a rule is typically removed by removing
+   the bottom most pattern node used by the pattern and
+   then removing any parent nodes which are not shared by
+   other patterns.
+
+   Example:
+     Patterns (a b c d) and (a b e f) would be represented
+     by the pattern net shown on the left.  If (a b c d)
+     was detached, the resultant pattern net would be the
+     one shown on the right. The '=' represents an
+     end-of-pattern node.
+
+           a                  a
+           |                  |
+           b                  b
+           |                  |
+           c--e               e
+           |  |               |
+           d  f               f
+           |  |               |
+           =  =               =
+  INPUTS       : The pattern to be removed
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : All non-shared nodes associated with the
+                 pattern are removed
+  NOTES        : None
+ ********************************************************/
+static void DetachObjectPattern(
+  Environment *theEnv,
+  struct patternNodeHeader *thePattern)
+  {
+   OBJECT_ALPHA_NODE *alphaPtr,*prv,*terminalPtr;
+   OBJECT_PATTERN_NODE *patternPtr,*upperLevel;
+
+   /*====================================================*/
+   /* Get rid of any matches stored in the alpha memory. */
+   /*====================================================*/
+
+   alphaPtr = (OBJECT_ALPHA_NODE *) thePattern;
+   ClearObjectPatternMatches(theEnv,alphaPtr);
+
+   /*==================================*/
+   /* Remove alpha links from classes. */
+   /*==================================*/
+   
+   if (! ConstructData(theEnv)->ClearInProgress)
+     {
+      CLASS_BITMAP *cbmp;
+      unsigned int i;
+      Defclass *relevantDefclass;
+      CLASS_ALPHA_LINK *alphaLink, *lastAlpha;
+
+      cbmp = (CLASS_BITMAP *) alphaPtr->classbmp->contents;
+      for (i = 0; i <= cbmp->maxid; i++)
+        {
+         if (TestBitMap(cbmp->map,i))
+           {
+            relevantDefclass = DefclassData(theEnv)->ClassIDMap[i];
+         
+            for (lastAlpha = NULL, alphaLink = relevantDefclass->relevant_terminal_alpha_nodes;
+                 alphaLink != NULL;
+                 lastAlpha = alphaLink, alphaLink = alphaLink->next)
+              {
+               if (alphaLink->alphaNode == alphaPtr)
+                 {
+                  if (lastAlpha == NULL)
+                    { relevantDefclass->relevant_terminal_alpha_nodes = alphaLink->next; }
+                  else
+                    { lastAlpha->next = alphaLink->next; }
+                  rtn_struct(theEnv,classAlphaLink,alphaLink);
+                  break;
+                 }
+              }
+           }
+        }
+     }
+
+   /*========================================================*/
+   /* Unmark the classes to which the pattern is applicable  */
+   /* and unmark the class and slot id maps so that they can */
+   /* become ephemeral.                                      */
+   /*========================================================*/
+
+   MarkBitMapClassesBusy(theEnv,alphaPtr->classbmp,-1);
+   DeleteClassBitMap(theEnv,alphaPtr->classbmp);
+   if (alphaPtr->slotbmp != NULL)
+     { DecrementBitMapReferenceCount(theEnv,alphaPtr->slotbmp); }
+
+   /*=========================================*/
+   /* Only continue deleting this pattern if  */
+   /* this is the last alpha memory attached. */
+   /*=========================================*/
+
+   prv = NULL;
+   terminalPtr = ObjectNetworkTerminalPointer(theEnv);
+   while (terminalPtr != alphaPtr)
+     {
+      prv = terminalPtr;
+      terminalPtr = terminalPtr->nxtTerminal;
+     }
+
+   if (prv == NULL)
+     { SetObjectNetworkTerminalPointer(theEnv,terminalPtr->nxtTerminal); }
+   else
+     { prv->nxtTerminal = terminalPtr->nxtTerminal; }
+
+   prv = NULL;
+   terminalPtr = alphaPtr->patternNode->alphaNode;
+   while (terminalPtr != alphaPtr)
+     {
+      prv = terminalPtr;
+      terminalPtr = terminalPtr->nxtInGroup;
+     }
+
+   if (prv == NULL)
+     {
+      if (alphaPtr->nxtInGroup != NULL)
+        {
+         alphaPtr->patternNode->alphaNode = alphaPtr->nxtInGroup;
+         RemoveHashedExpression(theEnv,alphaPtr->header.rightHash);
+         rtn_struct(theEnv,objectAlphaNode,alphaPtr);
+         return;
+        }
+     }
+   else
+     {
+      prv->nxtInGroup = alphaPtr->nxtInGroup;
+      RemoveHashedExpression(theEnv,alphaPtr->header.rightHash);
+      rtn_struct(theEnv,objectAlphaNode,alphaPtr);
+      return;
+     }
+   alphaPtr->patternNode->alphaNode = NULL;
+   RemoveHashedExpression(theEnv,alphaPtr->header.rightHash);
+   upperLevel = alphaPtr->patternNode;
+   rtn_struct(theEnv,objectAlphaNode,alphaPtr);
+
+   if (upperLevel->nextLevel != NULL)
+     return;
+
+   /*==============================================================*/
+   /* Loop until all appropriate pattern nodes have been detached. */
+   /*==============================================================*/
+
+   while (upperLevel != NULL)
+     {
+      if ((upperLevel->leftNode == NULL) &&
+          (upperLevel->rightNode == NULL))
+        {
+         /*===============================================*/
+         /* Pattern node is the only node on this level.  */
+         /* Remove it and continue detaching other nodes  */
+         /* above this one, because no other patterns are */
+         /* dependent upon this node.                     */
+         /*===============================================*/
+
+         patternPtr = upperLevel;
+         upperLevel = patternPtr->lastLevel;
+
+         if (upperLevel == NULL)
+           SetObjectNetworkPointer(theEnv,NULL);
+         else
+           {
+           if (upperLevel->selector)
+              { RemoveHashedPatternNode(theEnv,upperLevel,patternPtr,patternPtr->networkTest->type,patternPtr->networkTest->value); }
+
+            upperLevel->nextLevel = NULL;
+            if (upperLevel->alphaNode != NULL)
+              upperLevel = NULL;
+           }
+
+         RemoveHashedExpression(theEnv,(Expression *) patternPtr->networkTest);
+         rtn_struct(theEnv,objectPatternNode,patternPtr);
+        }
+      else if (upperLevel->leftNode != NULL)
+        {
+         /*====================================================*/
+         /* Pattern node has another pattern node which must   */
+         /* be checked preceding it.  Remove the pattern node, */
+         /* but do not detach any nodes above this one.        */
+         /*====================================================*/
+
+         patternPtr = upperLevel;
+
+         if ((patternPtr->lastLevel != NULL) &&
+             (patternPtr->lastLevel->selector))
+           { RemoveHashedPatternNode(theEnv,patternPtr->lastLevel,patternPtr,patternPtr->networkTest->type,patternPtr->networkTest->value); }
+
+         upperLevel->leftNode->rightNode = upperLevel->rightNode;
+         if (upperLevel->rightNode != NULL)
+           { upperLevel->rightNode->leftNode = upperLevel->leftNode; }
+
+         RemoveHashedExpression(theEnv,(Expression *) patternPtr->networkTest);
+         rtn_struct(theEnv,objectPatternNode,patternPtr);
+         upperLevel = NULL;
+        }
+      else
+        {
+         /*====================================================*/
+         /* Pattern node has no pattern node preceding it, but */
+         /* does have one succeeding it. Remove the pattern    */
+         /* node, but do not detach any nodes above this one.  */
+         /*====================================================*/
+
+         patternPtr = upperLevel;
+         upperLevel = upperLevel->lastLevel;
+         if (upperLevel == NULL)
+           { SetObjectNetworkPointer(theEnv,patternPtr->rightNode); }
+         else
+           {
+            if (upperLevel->selector)
+              { RemoveHashedPatternNode(theEnv,upperLevel,patternPtr,patternPtr->networkTest->type,patternPtr->networkTest->value); }
+
+            upperLevel->nextLevel = patternPtr->rightNode;
+           }
+         patternPtr->rightNode->leftNode = NULL;
+
+         RemoveHashedExpression(theEnv,(Expression *) patternPtr->networkTest);
+         rtn_struct(theEnv,objectPatternNode,patternPtr);
+         upperLevel = NULL;
+        }
+     }
+  }
+
+/***************************************************
+  NAME         : ClearObjectPatternMatches
+  DESCRIPTION  : Removes a pattern node alpha memory
+                 from the list of partial matches
+                 on all instances (active or
+                 garbage collected)
+  INPUTS       : The pattern node to remove
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pattern alpha memory removed
+                 from all object partial match lists
+  NOTES        : Used when a pattern is removed
+ ***************************************************/
+static void ClearObjectPatternMatches(
+  Environment *theEnv,
+  OBJECT_ALPHA_NODE *alphaPtr)
+  {
+   Instance *ins;
+   IGARBAGE *igrb;
+
+   /* =============================================
+      Loop through every active and queued instance
+      ============================================= */
+   ins = InstanceData(theEnv)->InstanceList;
+   while (ins != NULL)
+     {
+      RemoveObjectPartialMatches(theEnv,ins,(struct patternNodeHeader *) alphaPtr);
+      ins = ins->nxtList;
+     }
+
+   /* ============================
+      Check for garbaged instances
+      ============================ */
+   igrb = InstanceData(theEnv)->InstanceGarbageList;
+   while (igrb != NULL)
+     {
+      RemoveObjectPartialMatches(theEnv,igrb->ins,(struct patternNodeHeader *) alphaPtr);
+      igrb = igrb->nxt;
+     }
+  }
+
+/***************************************************
+  NAME         : RemoveObjectPartialMatches
+  DESCRIPTION  : Removes a partial match from a
+                 list of partial matches for
+                 an instance
+  INPUTS       : 1) The instance
+                 2) The pattern node header
+                    corresponding to the match
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Match removed
+  NOTES        : None
+ ***************************************************/
+static void RemoveObjectPartialMatches(
+  Environment *theEnv,
+  Instance *ins,
+  struct patternNodeHeader *phead)
+  {
+   struct patternMatch *match_before, *match_ptr;
+
+   match_before = NULL;
+   match_ptr = (struct patternMatch *) ins->partialMatchList;
+
+   /* =======================================
+      Loop through every match for the object
+      ======================================= */
+   while (match_ptr != NULL)
+     {
+      if (match_ptr->matchingPattern == phead)
+        {
+         ins->busy--;
+         if (match_before == NULL)
+           {
+            ins->partialMatchList = (void *) match_ptr->next;
+            rtn_struct(theEnv,patternMatch,match_ptr);
+            match_ptr = (struct patternMatch *) ins->partialMatchList;
+           }
+         else
+          {
+           match_before->next = match_ptr->next;
+           rtn_struct(theEnv,patternMatch,match_ptr);
+           match_ptr = match_before->next;
+          }
+        }
+      else
+       {
+        match_before = match_ptr;
+        match_ptr = match_ptr->next;
+       }
+     }
+  }
+
+/******************************************************
+  NAME         : CheckDuplicateSlots
+  DESCRIPTION  : Determines if a restriction has
+                 already been defined in a pattern
+  INPUTS       : The list of already built restrictions
+  RETURNS      : True if a definition already
+                 exists, false otherwise
+  SIDE EFFECTS : An error message is printed if a
+                 duplicate is found
+  NOTES        : None
+ ******************************************************/
+static bool CheckDuplicateSlots(
+  Environment *theEnv,
+  struct lhsParseNode *nodeList,
+  CLIPSLexeme *slotName)
+  {
+   while (nodeList != NULL)
+     {
+      if (nodeList->slot == slotName)
+        {
+         PrintErrorID(theEnv,"OBJRTBLD",4,true);
+         WriteString(theEnv,STDERR,"Multiple restrictions on attribute '");
+         WriteString(theEnv,STDERR,slotName->contents);
+         WriteString(theEnv,STDERR,"' not allowed.\n");
+         return true;
+        }
+      nodeList = nodeList->right;
+     }
+   return false;
+  }
+
+/**********************************************************
+  NAME         : ParseClassRestriction
+  DESCRIPTION  : Parses the single-field constraint
+                  on the class an object pattern
+  INPUTS       : 1) The logical input source
+                 2) A buffer for tokens
+  RETURNS      : The intermediate pattern nodes
+                 representing the class constraint
+                 (NULL on errors)
+  SIDE EFFECTS : Intermediate pattern nodes allocated
+  NOTES        : None
+ **********************************************************/
+static struct lhsParseNode *ParseClassRestriction(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken)
+  {
+   struct lhsParseNode *tmpNode;
+   CLIPSLexeme *rln;
+   CONSTRAINT_RECORD *rv;
+
+   rv = GetConstraintRecord(theEnv);
+   rv->anyAllowed = 0;
+   rv->symbolsAllowed = 1;
+   rln = theToken->lexemeValue;
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,theToken);
+   tmpNode = RestrictionParse(theEnv,readSource,theToken,false,rln,ISA_ID,rv,0);
+   if (tmpNode == NULL)
+     {
+      RemoveConstraint(theEnv,rv);
+      return NULL;
+     }
+   if ((theToken->tknType != RIGHT_PARENTHESIS_TOKEN) ||
+       (tmpNode->pnType == MF_WILDCARD_NODE) ||
+       (tmpNode->pnType == MF_VARIABLE_NODE))
+     {
+      PPBackup(theEnv);
+      if (theToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         SavePPBuffer(theEnv," ");
+         SavePPBuffer(theEnv,theToken->printForm);
+        }
+      SyntaxErrorMessage(theEnv,"class restriction in object pattern");
+      ReturnLHSParseNodes(theEnv,tmpNode);
+      RemoveConstraint(theEnv,rv);
+      return NULL;
+     }
+   tmpNode->derivedConstraints = 1;
+   return(tmpNode);
+  }
+
+/**********************************************************
+  NAME         : ParseNameRestriction
+  DESCRIPTION  : Parses the single-field constraint
+                  on the name of an object pattern
+  INPUTS       : 1) The logical input source
+                 2) A buffer for tokens
+  RETURNS      : The intermediate pattern nodes
+                 representing the name constraint
+                 (NULL on errors)
+  SIDE EFFECTS : Intermediate pattern nodes allocated
+  NOTES        : None
+ **********************************************************/
+static struct lhsParseNode *ParseNameRestriction(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken)
+  {
+   struct lhsParseNode *tmpNode;
+   CLIPSLexeme *rln;
+   CONSTRAINT_RECORD *rv;
+
+   rv = GetConstraintRecord(theEnv);
+   rv->anyAllowed = 0;
+   rv->instanceNamesAllowed = 1;
+   rln = theToken->lexemeValue;
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,theToken);
+   tmpNode = RestrictionParse(theEnv,readSource,theToken,false,rln,NAME_ID,rv,0);
+   if (tmpNode == NULL)
+     {
+      RemoveConstraint(theEnv,rv);
+      return NULL;
+     }
+   if ((theToken->tknType != RIGHT_PARENTHESIS_TOKEN) ||
+       (tmpNode->pnType == MF_WILDCARD_NODE) ||
+       (tmpNode->pnType == MF_VARIABLE_NODE))
+     {
+      PPBackup(theEnv);
+      if (theToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         SavePPBuffer(theEnv," ");
+         SavePPBuffer(theEnv,theToken->printForm);
+        }
+      SyntaxErrorMessage(theEnv,"name restriction in object pattern");
+      ReturnLHSParseNodes(theEnv,tmpNode);
+      RemoveConstraint(theEnv,rv);
+      return NULL;
+     }
+
+   tmpNode->derivedConstraints = 1;
+   return(tmpNode);
+  }
+
+/***************************************************
+  NAME         : ParseSlotRestriction
+  DESCRIPTION  : Parses the field constraint(s)
+                  on a slot of an object pattern
+  INPUTS       : 1) The logical input source
+                 2) A buffer for tokens
+                 3) Constraint record holding the
+                    unioned constraints of all the
+                    slots which could match the
+                    slot pattern
+                 4) A flag indicating if any
+                    multifield slots match the name
+  RETURNS      : The intermediate pattern nodes
+                 representing the slot constraint(s)
+                 (NULL on errors)
+  SIDE EFFECTS : Intermediate pattern nodes
+                 allocated
+  NOTES        : None
+ ***************************************************/
+static struct lhsParseNode *ParseSlotRestriction(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  CONSTRAINT_RECORD *slotConstraints,
+  bool multip)
+  {
+   struct lhsParseNode *tmpNode;
+   CLIPSLexeme *slotName;
+
+   slotName = theToken->lexemeValue;
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,theToken);
+   tmpNode = RestrictionParse(theEnv,readSource,theToken,multip,slotName,FindSlotNameID(theEnv,slotName),
+                              slotConstraints,1);
+   if (tmpNode == NULL)
+     {
+      RemoveConstraint(theEnv,slotConstraints);
+      return NULL;
+     }
+   if (theToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,theToken->printForm);
+      SyntaxErrorMessage(theEnv,"object slot pattern");
+      ReturnLHSParseNodes(theEnv,tmpNode);
+      RemoveConstraint(theEnv,slotConstraints);
+      return NULL;
+     }
+   if ((tmpNode->bottom == NULL) && (tmpNode->multifieldSlot))
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+     }
+   tmpNode->derivedConstraints = 1;
+   return(tmpNode);
+  }
+
+/********************************************************
+  NAME         : NewClassBitMap
+  DESCRIPTION  : Creates a new bitmap large enough
+                 to hold all ids of classes in the
+                 system and initializes all the bits
+                 to zero or one.
+  INPUTS       : 1) The maximum id that will be set
+                    in the bitmap
+                 2) An integer code indicating if all
+                    the bits are to be set to zero or one
+  RETURNS      : The new bitmap
+  SIDE EFFECTS : BitMap allocated and initialized
+  NOTES        : None
+ ********************************************************/
+static CLASS_BITMAP *NewClassBitMap(
+  Environment *theEnv,
+  unsigned short maxid,
+  bool set)
+  {
+   CLASS_BITMAP *bmp;
+   size_t size;
+
+   size = sizeof(CLASS_BITMAP) + (sizeof(char) * (maxid / BITS_PER_BYTE));
+   bmp = (CLASS_BITMAP *) gm2(theEnv,size);
+   ClearBitString(bmp,size);
+   bmp->maxid = (unsigned short) maxid;
+   InitializeClassBitMap(theEnv,bmp,set);
+   
+   return bmp;
+  }
+
+/***********************************************************
+  NAME         : InitializeClassBitMap
+  DESCRIPTION  : Initializes a bitmap to all zeroes or ones.
+  INPUTS       : 1) The bitmap
+                 2) An integer code indicating if all
+                    the bits are to be set to zero or one
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The bitmap is initialized
+  NOTES        : None
+ ***********************************************************/
+static void InitializeClassBitMap(
+  Environment *theEnv,
+  CLASS_BITMAP *bmp,
+  bool set)
+  {
+   unsigned short i, bytes;
+   Defclass *cls;
+   Defmodule *currentModule;
+
+   bytes = bmp->maxid / BITS_PER_BYTE + 1;
+   while (bytes > 0)
+     {
+      bmp->map[bytes - 1] = (char) 0;
+      bytes--;
+     }
+     
+   if (set)
+     {
+      currentModule = GetCurrentModule(theEnv);
+      for (i = 0 ; i <= bmp->maxid ; i++)
+        {
+         cls = DefclassData(theEnv)->ClassIDMap[i];
+         if ((cls != NULL) ? DefclassInScope(theEnv,cls,currentModule) : false)
+           {
+            if (cls->reactive && (cls->abstract == 0))
+              SetBitMap(bmp->map,i);
+           }
+        }
+     }
+  }
+
+/********************************************
+  NAME         : DeleteIntermediateClassBitMap
+  DESCRIPTION  : Deallocates a bitmap
+  INPUTS       : The class set
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Class set deallocated
+  NOTES        : None
+ ********************************************/
+static void DeleteIntermediateClassBitMap(
+  Environment *theEnv,
+  CLASS_BITMAP *bmp)
+  {
+   rm(theEnv,bmp,ClassBitMapSize(bmp));
+  }
+
+/******************************************************
+  NAME         : CopyClassBitMap
+  DESCRIPTION  : Increments the in use count of a
+                 bitmap and returns the same pointer
+  INPUTS       : The bitmap
+  RETURNS      : The bitmap
+  SIDE EFFECTS : Increments the in use count
+  NOTES        : Class sets are shared by multiple
+                 copies of an object pattern within an
+                 OR CE.  The use count prevents having
+                 to make duplicate copies of the bitmap
+ ******************************************************/
+static void *CopyClassBitMap(
+  Environment *theEnv,
+  void *gset)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   if (gset != NULL)
+     IncrementBitMapCount(gset);
+   return(gset);
+  }
+
+/**********************************************************
+  NAME         : DeleteClassBitMap
+  DESCRIPTION  : Deallocates a bitmap,
+                 and decrements the busy flags of the
+                 classes marked in the bitmap
+  INPUTS       : The bitmap
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Class set deallocated and classes unmarked
+  NOTES        : None
+ **********************************************************/
+static void DeleteClassBitMap(
+  Environment *theEnv,
+  void *gset)
+  {
+   if (gset == NULL)
+     return;
+   DecrementBitMapReferenceCount(theEnv,(CLIPSBitMap *) gset);
+  }
+
+/***************************************************
+  NAME         : MarkBitMapClassesBusy
+  DESCRIPTION  : Increments/Decrements busy counts
+                 of all classes marked in a bitmap
+  INPUTS       : 1) The bitmap hash node
+                 2) 1 or -1 (to increment or
+                    decrement class busy counts)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Bitmap class busy counts updated
+  NOTES        : None
+ ***************************************************/
+static void MarkBitMapClassesBusy(
+  Environment *theEnv,
+  CLIPSBitMap *bmphn,
+  int offset)
+  {
+   CLASS_BITMAP *bmp;
+   unsigned short i;
+   Defclass *cls;
+
+   /* ====================================
+      If a clear is in progress, we do not
+      have to worry about busy counts
+      ==================================== */
+   if (ConstructData(theEnv)->ClearInProgress)
+     return;
+   bmp = (CLASS_BITMAP *) bmphn->contents;
+   for (i = 0 ; i <= bmp->maxid ; i++)
+     if (TestBitMap(bmp->map,i))
+       {
+        cls =  DefclassData(theEnv)->ClassIDMap[i];
+        cls->busy += (unsigned int) offset;
+       }
+  }
+
+/****************************************************
+  NAME         : EmptyClassBitMap
+  DESCRIPTION  : Determines if one or more bits
+                 are marked in a bitmap
+  INPUTS       : The bitmap
+  RETURNS      : True if the set has no bits
+                 marked, false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ****************************************************/
+static bool EmptyClassBitMap(
+  CLASS_BITMAP *bmp)
+  {
+   unsigned short bytes;
+
+   bytes = (unsigned short) (bmp->maxid / BITS_PER_BYTE + 1);
+   while (bytes > 0)
+     {
+      if (bmp->map[bytes - 1] != (char) 0)
+        return false;
+      bytes--;
+     }
+   return true;
+  }
+
+/***************************************************
+  NAME         : IdenticalClassBitMap
+  DESCRIPTION  : Determines if two bitmaps
+                 are identical
+  INPUTS       : 1) First bitmap
+                 2) Second bitmap
+  RETURNS      : True if bitmaps are the same,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static bool IdenticalClassBitMap(
+  CLASS_BITMAP *cs1,
+  CLASS_BITMAP *cs2)
+  {
+   unsigned short i;
+
+   if (cs1->maxid != cs2->maxid)
+     return false;
+   for (i = 0 ; i < (cs1->maxid / BITS_PER_BYTE + 1) ; i++)
+     if (cs1->map[i] != cs2->map[i])
+       return false;
+   return true;
+  }
+
+/*****************************************************************
+  NAME         : ProcessClassRestriction
+  DESCRIPTION  : Examines a class restriction and forms a bitmap
+                 corresponding to the maximal set of classes which
+                 can satisfy a static analysis of the restriction
+  INPUTS       : 1) The bitmap to mark classes in
+                 2) The lhsParseNodes of the restriction
+                 3) A flag indicating if this is the first
+                    non-recursive call or not
+  RETURNS      : True if all OK, false otherwise
+  SIDE EFFECTS : Class bitmap set and lhsParseNodes corressponding
+                 to constant restrictions are removed
+  NOTES        : None
+ *****************************************************************/
+static bool ProcessClassRestriction(
+  Environment *theEnv,
+  CLASS_BITMAP *clsset,
+  struct lhsParseNode **classRestrictions,
+  bool recursiveCall)
+  {
+   struct lhsParseNode *chk,**oraddr;
+   CLASS_BITMAP *tmpset1,*tmpset2;
+   bool constant_restriction = true;
+
+   if (*classRestrictions == NULL)
+     {
+      if (recursiveCall)
+        InitializeClassBitMap(theEnv,clsset,true);
+      return true;
+     }
+
+   /* ===============================================
+      Determine the corresponding class set and union
+      it with the current total class set.  If an AND
+      restriction is comprised entirely of symbols,
+      it can be removed
+      =============================================== */
+   tmpset1 = NewClassBitMap(theEnv,DefclassData(theEnv)->MaxClassID - 1,1);
+   tmpset2 = NewClassBitMap(theEnv,DefclassData(theEnv)->MaxClassID - 1,0);
+   for  (chk = *classRestrictions ; chk != NULL ; chk = chk->right)
+     {
+      if (chk->pnType == SYMBOL_NODE)
+        {
+         const char *className = chk->lexemeValue->contents;
+
+         chk->value = LookupDefclassByMdlOrScope(theEnv,className);
+         if (chk->value == NULL)
+           {
+            PrintErrorID(theEnv,"OBJRTBLD",5,false);
+            WriteString(theEnv,STDERR,"Undefined class '");
+            WriteString(theEnv,STDERR,className);
+            WriteString(theEnv,STDERR,"' in object pattern.\n");
+            DeleteIntermediateClassBitMap(theEnv,tmpset1);
+            DeleteIntermediateClassBitMap(theEnv,tmpset2);
+            return false;
+           }
+         if (chk->negated)
+           {
+            InitializeClassBitMap(theEnv,tmpset2,true);
+            MarkBitMapSubclasses(tmpset2->map,(Defclass *) chk->value,0);
+           }
+         else
+           {
+            InitializeClassBitMap(theEnv,tmpset2,false);
+            MarkBitMapSubclasses(tmpset2->map,(Defclass *) chk->value,1);
+           }
+         IntersectClassBitMaps(tmpset1,tmpset2);
+        }
+      else
+        constant_restriction = false;
+     }
+   if (EmptyClassBitMap(tmpset1))
+     {
+      PrintErrorID(theEnv,"OBJRTBLD",2,false);
+      WriteString(theEnv,STDERR,"No objects of existing classes can satisfy ");
+      WriteString(theEnv,STDERR,"'is-a' restriction in object pattern.\n");
+      DeleteIntermediateClassBitMap(theEnv,tmpset1);
+      DeleteIntermediateClassBitMap(theEnv,tmpset2);
+      return false;
+     }
+   if (constant_restriction)
+     {
+      chk = *classRestrictions;
+      *classRestrictions = chk->bottom;
+      chk->bottom = NULL;
+      ReturnLHSParseNodes(theEnv,chk);
+      oraddr = classRestrictions;
+     }
+   else
+     oraddr = &(*classRestrictions)->bottom;
+   UnionClassBitMaps(clsset,tmpset1);
+   DeleteIntermediateClassBitMap(theEnv,tmpset1);
+   DeleteIntermediateClassBitMap(theEnv,tmpset2);
+
+   /* =====================================
+      Process the next OR class restriction
+      ===================================== */
+   return(ProcessClassRestriction(theEnv,clsset,oraddr,false));
+  }
+
+/****************************************************************
+  NAME         : ProcessSlotRestriction
+  DESCRIPTION  : Determines which slots could match the slot
+                 pattern and determines the union of all
+                 constraints for the pattern
+  INPUTS       : 1) The class set
+                 2) The slot name
+                 3) A buffer to hold a flag indicating if
+                    any multifield slots are found w/ this name
+  RETURNS      : A union of the constraints on all the slots
+                 which could match the slots (NULL if no
+                 slots found)
+  SIDE EFFECTS : The class bitmap set is marked/cleared
+  NOTES        : None
+ ****************************************************************/
+static CONSTRAINT_RECORD *ProcessSlotRestriction(
+  Environment *theEnv,
+  CLASS_BITMAP *clsset,
+  CLIPSLexeme *slotName,
+  bool *multip)
+  {
+   Defclass *cls;
+   int si;
+   CONSTRAINT_RECORD *totalConstraints = NULL,*tmpConstraints;
+   unsigned i;
+
+   *multip = false;
+   for (i = 0 ; i < CLASS_TABLE_HASH_SIZE ; i++)
+     for (cls = DefclassData(theEnv)->ClassTable[i] ; cls != NULL ; cls = cls->nxtHash)
+       {
+        if (TestBitMap(clsset->map,cls->id))
+          {
+           si = FindInstanceTemplateSlot(theEnv,cls,slotName);
+           if ((si != -1) ? cls->instanceTemplate[si]->reactive : false)
+             {
+              if (cls->instanceTemplate[si]->multiple)
+                *multip = true;
+              tmpConstraints =
+                 UnionConstraints(theEnv,cls->instanceTemplate[si]->constraint,totalConstraints);
+              RemoveConstraint(theEnv,totalConstraints);
+              totalConstraints = tmpConstraints;
+             }
+           else
+             ClearBitMap(clsset->map,cls->id);
+          }
+       }
+   return(totalConstraints);
+  }
+
+/****************************************************
+  NAME         : IntersectClassBitMaps
+  DESCRIPTION  : Bitwise-ands two bitmaps and stores
+                 the result in the first
+  INPUTS       : The two bitmaps
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : ClassBitMaps anded
+  NOTES        : Assumes the first bitmap is at least
+                 as large as the second
+ ****************************************************/
+static void IntersectClassBitMaps(
+  CLASS_BITMAP *cs1,
+  CLASS_BITMAP *cs2)
+  {
+   unsigned short bytes;
+
+   bytes = (unsigned short) (cs2->maxid / BITS_PER_BYTE + 1);
+   while (bytes > 0)
+     {
+      cs1->map[bytes - 1] &= cs2->map[bytes - 1];
+      bytes--;
+     }
+  }
+
+/****************************************************
+  NAME         : UnionClassBitMaps
+  DESCRIPTION  : Bitwise-ors two bitmaps and stores
+                 the result in the first
+  INPUTS       : The two bitmaps
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : ClassBitMaps ored
+  NOTES        : Assumes the first bitmap is at least
+                 as large as the second
+ ****************************************************/
+static void UnionClassBitMaps(
+  CLASS_BITMAP *cs1,
+  CLASS_BITMAP *cs2)
+  {
+   unsigned short bytes;
+
+   bytes = (unsigned short) (cs2->maxid / BITS_PER_BYTE + 1);
+   while (bytes > 0)
+     {
+      cs1->map[bytes - 1] |= cs2->map[bytes - 1];
+      bytes--;
+     }
+  }
+
+/*****************************************************
+  NAME         : PackClassBitMap
+  DESCRIPTION  : This routine packs a bitmap
+                 bitmap such that at least one of
+                 the bits in the rightmost byte is
+                 set (i.e. the bitmap takes up
+                 the smallest space possible).
+  INPUTS       : The bitmap
+  RETURNS      : The new (packed) bitmap
+  SIDE EFFECTS : The oldset is deallocated
+  NOTES        : None
+ *****************************************************/
+static CLASS_BITMAP *PackClassBitMap(
+  Environment *theEnv,
+  CLASS_BITMAP *oldset)
+  {
+   unsigned short newmaxid;
+   CLASS_BITMAP *newset;
+
+   for (newmaxid = oldset->maxid ; newmaxid > 0 ; newmaxid--)
+     if (TestBitMap(oldset->map,newmaxid))
+       break;
+   if (newmaxid != oldset->maxid)
+     {
+      newset = NewClassBitMap(theEnv,newmaxid,0);
+      GenCopyMemory(char,newmaxid / BITS_PER_BYTE + 1,newset->map,oldset->map);
+      DeleteIntermediateClassBitMap(theEnv,oldset);
+     }
+   else
+     newset = oldset;
+   return(newset);
+  }
+
+/*****************************************************************
+  NAME         : FilterObjectPattern
+  DESCRIPTION  : Appends an extra node to hold the bitmap,
+                 and finds is-a and name nodes
+  INPUTS       : 1) The object pattern parser address
+                    to give to a default is-a slot
+                 2) The unfiltered slot list
+                 3) A buffer to hold the address of
+                    the class bitmap restriction node
+                 4) A buffer to hold the address of
+                    the is-a restriction node
+                 4) A buffer to hold the address of
+                    the name restriction node
+  RETURNS      : The filtered slot list
+  SIDE EFFECTS : clsset is attached to extra slot pattern
+                 Pointers to the is-a and name slots are also
+                 stored (if they exist) for easy reference
+  NOTES        : None
+ *****************************************************************/
+static struct lhsParseNode *FilterObjectPattern(
+  Environment *theEnv,
+  struct patternParser *selfPatternType,
+  struct lhsParseNode *unfilteredSlots,
+  struct lhsParseNode **bitmap_slot,
+  struct lhsParseNode **isa_slot,
+  struct lhsParseNode **name_slot)
+  {
+   struct lhsParseNode *prv,*cur;
+
+   *isa_slot = NULL;
+   *name_slot = NULL;
+
+   /* ============================================
+      Create a dummy node to attach to the end
+      of the pattern which holds the class bitmap.
+      ============================================ */
+   *bitmap_slot = GetLHSParseNode(theEnv);
+   (*bitmap_slot)->pnType = SF_WILDCARD_NODE;
+   (*bitmap_slot)->slot = DefclassData(theEnv)->ISA_SYMBOL;
+   (*bitmap_slot)->slotNumber = ISA_ID;
+   (*bitmap_slot)->index = 1;
+   (*bitmap_slot)->patternType = selfPatternType;
+   (*bitmap_slot)->userData = unfilteredSlots->userData;
+   unfilteredSlots->userData = NULL;
+
+   /* ========================
+      Find is-a and name nodes
+      ======================== */
+   prv = NULL;
+   cur = unfilteredSlots;
+   while (cur != NULL)
+     {
+      if (cur->slot == DefclassData(theEnv)->ISA_SYMBOL)
+        *isa_slot = cur;
+      else if (cur->slot == DefclassData(theEnv)->NAME_SYMBOL)
+        *name_slot = cur;
+      prv = cur;
+      cur = cur->right;
+     }
+
+   /* ================================
+      Add the class bitmap conditional
+      element to end of pattern
+      ================================ */
+   if (prv == NULL)
+     unfilteredSlots = *bitmap_slot;
+   else
+     prv->right = *bitmap_slot;
+   return(unfilteredSlots);
+  }
+
+/***************************************************
+  NAME         : FormSlotBitMap
+  DESCRIPTION  : Examines an object pattern and
+                 forms a minimal bitmap marking
+                 the ids of the slots used in
+                 the pattern
+  INPUTS       : The intermediate parsed pattern
+  RETURNS      : The new slot bitmap (can be NULL)
+  SIDE EFFECTS : Bitmap created and added to hash
+                 table - corresponding bits set
+                 for ids of slots used in pattern
+  NOTES        : None
+ ***************************************************/
+static CLIPSBitMap *FormSlotBitMap(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern)
+  {
+   struct lhsParseNode *node;
+   unsigned short maxSlotID = USHRT_MAX;
+   unsigned size;
+   SLOT_BITMAP *bmp;
+   CLIPSBitMap *hshBmp;
+
+   /*==========================================*/
+   /* Find the largest slot id in the pattern. */
+   /*==========================================*/
+   
+   for (node = thePattern ; node != NULL ; node = node->right)
+     {
+      if (((node->slotNumber > maxSlotID) ||
+           (maxSlotID == USHRT_MAX)) &&
+          (node->slotNumber != UNSPECIFIED_SLOT))
+        { maxSlotID = node->slotNumber; }
+     }
+      
+   /*==================================================*/
+   /* If the pattern contains no slot tests or only    */
+   /* tests on the class or name (which do not change) */
+   /* do not store a slot bitmap.                      */
+   /*==================================================*/
+   
+   if ((maxSlotID == ISA_ID) ||
+       (maxSlotID == NAME_ID) ||
+       (maxSlotID == USHRT_MAX))
+     { return NULL; }
+
+   /*======================================*/
+   /* Initialize the bitmap to all zeroes. */
+   /*======================================*/
+   
+   size = (sizeof(SLOT_BITMAP) + (sizeof(char) * (maxSlotID / BITS_PER_BYTE)));
+   bmp = (SLOT_BITMAP *) gm2(theEnv,size);
+   ClearBitString(bmp,size);
+   bmp->maxid = (unsigned short) maxSlotID;
+
+   /*===============================================*/
+   /* Add (retrieve) a bitmap to (from) the bitmap  */
+   /* hash table which has a corresponding bit set  */
+   /* for the id of every slot used in the pattern. */
+   /*===============================================*/
+      
+   for (node = thePattern ; node != NULL ; node = node->right)
+     { SetBitMap(bmp->map,node->slotNumber); }
+     
+   hshBmp = (CLIPSBitMap *) AddBitMap(theEnv,bmp,SlotBitMapSize(bmp));
+   rm(theEnv,bmp,size);
+   
+   return hshBmp;
+  }
+
+/****************************************************
+  NAME         : RemoveSlotExistenceTests
+  DESCRIPTION  : Removes slot existence test since
+                 these are accounted for by class
+                 bitmap or name slot.
+  INPUTS       : 1) The intermediate pattern nodes
+                 2) A buffer to hold the class bitmap
+  RETURNS      : The filtered list
+  SIDE EFFECTS : Slot existence tests removed
+  NOTES        : None
+ ****************************************************/
+static struct lhsParseNode *RemoveSlotExistenceTests(
+  Environment *theEnv,
+  struct lhsParseNode *thePattern,
+  CLIPSBitMap **bmp)
+  {
+   struct lhsParseNode *tempPattern = thePattern;
+   struct lhsParseNode *lastPattern = NULL, *head = thePattern;
+
+   while (tempPattern != NULL)
+     {
+      /* ==========================================
+         Remember the class bitmap for this pattern
+         ========================================== */
+      if (tempPattern->userData != NULL)
+        {
+         *bmp = (CLIPSBitMap *) tempPattern->userData;
+         lastPattern = tempPattern;
+         tempPattern = tempPattern->right;
+        }
+
+      /* ===========================================================
+         A single field slot that has no pattern network expression
+         associated with it can be removed (i.e. any value contained
+         in this slot will satisfy the pattern being matched).
+         =========================================================== */
+      else if (((tempPattern->pnType == SF_WILDCARD_NODE) ||
+                (tempPattern->pnType == SF_VARIABLE_NODE)) &&
+               (tempPattern->networkTest == NULL))
+        {
+         if (lastPattern != NULL) lastPattern->right = tempPattern->right;
+         else head = tempPattern->right;
+
+         tempPattern->right = NULL;
+         ReturnLHSParseNodes(theEnv,tempPattern);
+
+         if (lastPattern != NULL) tempPattern = lastPattern->right;
+         else tempPattern = head;
+        }
+
+      /* =====================================================
+         A multifield variable or wildcard within a multifield
+         slot can be removed if there are no other multifield
+         variables or wildcards contained in the same slot
+         (and the multifield has no expressions which must be
+         evaluated in the fact pattern network).
+         ===================================================== */
+      else if (((tempPattern->pnType == MF_WILDCARD_NODE) || (tempPattern->pnType == MF_VARIABLE_NODE)) &&
+               (tempPattern->multifieldSlot == false) &&
+               (tempPattern->networkTest == NULL) &&
+               (tempPattern->multiFieldsBefore == 0) &&
+               (tempPattern->multiFieldsAfter == 0))
+        {
+         if (lastPattern != NULL) lastPattern->right = tempPattern->right;
+         else head = tempPattern->right;
+
+         tempPattern->right = NULL;
+         ReturnLHSParseNodes(theEnv,tempPattern);
+
+         if (lastPattern != NULL) tempPattern = lastPattern->right;
+         else tempPattern = head;
+        }
+
+      /* ================================================================
+         A multifield wildcard or variable contained in a multifield slot
+         that contains no other multifield wildcards or variables, but
+         does have an expression that must be evaluated, can be changed
+         to a single field pattern node with the same expression.
+         ================================================================ */
+      else if (((tempPattern->pnType == MF_WILDCARD_NODE) || (tempPattern->pnType == MF_VARIABLE_NODE)) &&
+               (tempPattern->multifieldSlot == false) &&
+               (tempPattern->networkTest != NULL) &&
+               (tempPattern->multiFieldsBefore == 0) &&
+               (tempPattern->multiFieldsAfter == 0))
+        {
+         tempPattern->pnType = SF_WILDCARD_NODE;
+         lastPattern = tempPattern;
+         tempPattern = tempPattern->right;
+        }
+
+      /* =======================================================
+         If we're dealing with a multifield slot with no slot
+         restrictions, then treat the multfield slot as a single
+         field slot, but attach a test which verifies that the
+         slot contains a zero length multifield value.
+         ======================================================= */
+      else if ((tempPattern->pnType == MF_WILDCARD_NODE) &&
+               (tempPattern->multifieldSlot == true) &&
+               (tempPattern->bottom == NULL))
+        {
+         tempPattern->pnType = SF_WILDCARD_NODE;
+         GenObjectZeroLengthTest(theEnv,tempPattern);
+         tempPattern->multifieldSlot = false;
+         lastPattern = tempPattern;
+         tempPattern = tempPattern->right;
+        }
+
+      /* ======================================================
+         Recursively call RemoveSlotExistenceTests for the slot
+         restrictions contained within a multifield slot.
+         ====================================================== */
+      else if ((tempPattern->pnType == MF_WILDCARD_NODE) &&
+               (tempPattern->multifieldSlot == true))
+        {
+         /* =====================================================
+            Add an expression to the first pattern restriction in
+            the multifield slot that determines whether or not
+            the fact's slot value contains the minimum number of
+            required fields to satisfy the pattern restrictions
+            for this slot. The length check is place before any
+            other tests, so that preceeding checks do not have to
+            determine if there are enough fields in the slot to
+            safely retrieve a value.
+            ===================================================== */
+         GenObjectLengthTest(theEnv,tempPattern->bottom);
+
+         /* =======================================================
+            Remove any unneeded pattern restrictions from the slot.
+            ======================================================= */
+         tempPattern->bottom = RemoveSlotExistenceTests(theEnv,tempPattern->bottom,bmp);
+
+         /* =========================================================
+            If the slot no longer contains any restrictions, then the
+            multifield slot can be completely removed. In any case,
+            move on to the next slot to be examined for removal.
+            ========================================================= */
+         if (tempPattern->bottom == NULL)
+           {
+            if (lastPattern != NULL) lastPattern->right = tempPattern->right;
+            else head = tempPattern->right;
+
+            tempPattern->right = NULL;
+            ReturnLHSParseNodes(theEnv,tempPattern);
+
+            if (lastPattern != NULL) tempPattern = lastPattern->right;
+            else tempPattern = head;
+           }
+         else
+           {
+            lastPattern = tempPattern;
+            tempPattern = tempPattern->right;
+           }
+        }
+
+      /* =====================================================
+         If none of the other tests for removing slots or slot
+         restrictions apply, then move on to the next slot or
+         slot restriction to be tested.
+         ===================================================== */
+      else
+        {
+         lastPattern = tempPattern;
+         tempPattern = tempPattern->right;
+        }
+     }
+
+   /* ====================================
+      Return the pattern with unused slots
+      and slot restrictions removed.
+      ==================================== */
+   return(head);
+  }
+
+#endif
+
+/**************************************************************
+  NAME         : ObjectMatchDelayParse
+  DESCRIPTION  : Parses the object-pattern-match-delay function
+  INPUTS       : 1) The function call expression
+                 2) The logical name of the input source
+  RETURNS      : The top expression with the other
+                 action expressions attached
+  SIDE EFFECTS : Parses the function call and attaches
+                 the appropriate arguments to the
+                 top node
+  NOTES        : None
+ **************************************************************/
+static Expression *ObjectMatchDelayParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *infile)
+  {
+   struct token tkn;
+
+   IncrementIndentDepth(theEnv,3);
+   PPCRAndIndent(theEnv);
+   top->argList = GroupActions(theEnv,infile,&tkn,true,NULL,false);
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,tkn.printForm);
+   DecrementIndentDepth(theEnv,3);
+   if (top->argList == NULL)
+     {
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+   return(top);
+  }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/***************************************************
+  NAME         : MarkObjectPtnIncrementalReset
+  DESCRIPTION  : Marks/unmarks an object pattern for
+                 incremental reset
+  INPUTS       : 1) The object pattern alpha node
+                 2) The value to which to set the
+                    incremental reset flag
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The pattern node is set/unset
+  NOTES        : The pattern node can only be
+                 set if it is a new node and
+                 thus marked for initialization
+                 by PlaceObjectPattern
+ ***************************************************/
+static void MarkObjectPtnIncrementalReset(
+  Environment *theEnv,
+  struct patternNodeHeader *thePattern,
+  bool value)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   if (thePattern->initialize == false)
+     return;
+   thePattern->initialize = value;
+  }
+
+/***********************************************************
+  NAME         : ObjectIncrementalReset
+  DESCRIPTION  : Performs an assert for all instances in the
+                 system.  All new patterns in the pattern
+                 network from the new rule have been marked
+                 as needing processing.  Old patterns will
+                 be ignored.
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : All objects driven through new patterns
+  NOTES        : None
+ ***********************************************************/
+static void ObjectIncrementalReset(
+  Environment *theEnv)
+  {
+   Instance *ins;
+
+   for (ins = InstanceData(theEnv)->InstanceList ; ins != NULL ; ins = ins->nxtList)
+     ObjectNetworkAction(theEnv,OBJECT_ASSERT,ins,-1);
+  }
+
+#endif
+
+#endif
+
+
diff --git a/clips/objrtbld.h b/clips/objrtbld.h
new file mode 100755
index 000000000..4b510caf4
--- /dev/null
+++ b/clips/objrtbld.h
@@ -0,0 +1,66 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*          OBJECT PATTERN MATCHER MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_objrtbld
+
+#pragma once
+
+#define _H_objrtbld
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+
+   void                    SetupObjectPatternStuff(Environment *);
+
+#endif /* DEFRULE_CONSTRUCT && OBJECT_SYSTEM */
+
+#endif /* _H_objrtbld */
+
+
+
diff --git a/clips/objrtcmp.c b/clips/objrtcmp.c
new file mode 100755
index 000000000..ba81dd82a
--- /dev/null
+++ b/clips/objrtcmp.c
@@ -0,0 +1,734 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  02/03/18             */
+   /*                                                     */
+   /*    OBJECT PATTERN NETWORK CONSTRUCTS-TO-C MODULE    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Saves object pattern network for constructs-to-c */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM && (! RUN_TIME) && CONSTRUCT_COMPILER
+
+#include <stdio.h>
+
+#include "conscomp.h"
+#include "classcom.h"
+#include "envrnmnt.h"
+#include "objrtfnx.h"
+#include "objrtmch.h"
+#include "pattern.h"
+#include "sysdep.h"
+
+#include "objrtcmp.h"
+
+/* =========================================
+   *****************************************
+                 MACROS AND TYPES
+   =========================================
+   ***************************************** */
+#define ObjectPNPrefix() ArbitraryPrefix(ObjectReteData(theEnv)->ObjectPatternCodeItem,0)
+#define ObjectANPrefix() ArbitraryPrefix(ObjectReteData(theEnv)->ObjectPatternCodeItem,1)
+#define ObjectALPrefix() ArbitraryPrefix(ObjectReteData(theEnv)->ObjectPatternCodeItem,2)
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    BeforeObjectPatternsToCode(Environment *);
+   static OBJECT_PATTERN_NODE    *GetNextObjectPatternNode(OBJECT_PATTERN_NODE *);
+   static void                    InitObjectPatternsCode(Environment *,FILE *,unsigned int,unsigned int);
+   static bool                    ObjectPatternsToCode(Environment *,const char *,const char *,char *,
+                                                       unsigned int,FILE *,unsigned int,unsigned int);
+   static void                    IntermediatePatternNodeReference(Environment *,OBJECT_PATTERN_NODE *,FILE *,
+                                                                   unsigned int,unsigned int);
+   static unsigned                IntermediatePatternNodesToCode(Environment *,const char *,const char *,
+                                                                 char *,unsigned int,FILE *,unsigned int,
+                                                                 unsigned int,unsigned int);
+   static unsigned                AlphaPatternNodesToCode(Environment *,const char *,const char *,char *,
+                                                          unsigned int,FILE *,unsigned int,unsigned int,unsigned int);
+   static unsigned                ClassAlphaLinksToCode(Environment *,const char *,const char *,char *,
+                                                        unsigned int,FILE *,unsigned int,unsigned int,unsigned int);
+   static CLASS_ALPHA_LINK       *GetNextAlphaLink(Environment *,struct defmodule **,Defclass **theClass,CLASS_ALPHA_LINK *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : ObjectPatternsCompilerSetup
+  DESCRIPTION  : Sets up interface for object
+                 patterns to construct compiler
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Code generator item added
+  NOTES        : None
+ ***************************************************/
+void ObjectPatternsCompilerSetup(
+  Environment *theEnv)
+  {
+   ObjectReteData(theEnv)->ObjectPatternCodeItem =
+         AddCodeGeneratorItem(theEnv,"object-patterns",0,BeforeObjectPatternsToCode,
+                              InitObjectPatternsCode,ObjectPatternsToCode,3);
+  }
+
+/***************************************************
+  NAME         : ObjectPatternNodeReference
+  DESCRIPTION  : Prints out a reference to an
+                 object pattern alpha memory for
+                 the join network interface to the
+                 construct compiler
+  INPUTS       : 1) A pointer to the object pattern
+                    alpha memory
+                 2) A pointer to the output file
+                 3) The id of constructs-to-c image
+                 4) The maximum number of indices
+                    allowed in any single array
+                    in the image
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Reference to object pattern alpha
+                 memory printed
+  NOTES        : None
+ ***************************************************/
+void ObjectPatternNodeReference(
+  Environment *theEnv,
+  void *theVPattern,
+  FILE *theFile,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   OBJECT_ALPHA_NODE *thePattern;
+
+   if (theVPattern == NULL)
+     fprintf(theFile,"NULL");
+   else
+     {
+      thePattern = (OBJECT_ALPHA_NODE *) theVPattern;
+      fprintf(theFile,"&%s%u_%lu[%lu]",
+                      ObjectANPrefix(),imageID,
+                      ((thePattern->bsaveID) / maxIndices) + 1,
+                      (thePattern->bsaveID) % maxIndices);
+     }
+  }
+
+/***************************************************
+  NAME         : ClassAlphaLinkReference
+  DESCRIPTION  : Prints out a reference to a
+                 class alpha link for
+                 the pattern network interface to the
+                 construct compiler
+  INPUTS       : 1) A pointer to a class alpha link
+                 2) A pointer to the output file
+                 3) The id of constructs-to-c image
+                 4) The maximum number of indices
+                    allowed in any single array
+                    in the image
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Reference to the class alpha link printed
+  NOTES        : None
+ ***************************************************/
+void ClassAlphaLinkReference(
+  Environment *theEnv,
+  void *theVLink,
+  FILE *theFile,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   CLASS_ALPHA_LINK *theLink;
+
+   if (theVLink == NULL)
+     fprintf(theFile,"NULL");
+   else
+     {
+      theLink = (CLASS_ALPHA_LINK *) theVLink;
+      fprintf(theFile,"&%s%u_%lu[%lu]",
+                      ObjectALPrefix(),imageID,
+                      ((theLink->bsaveID) / maxIndices) + 1,
+                      (theLink->bsaveID) % maxIndices);
+     }
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*****************************************************
+  NAME         : BeforeObjectPatternsToCode
+  DESCRIPTION  : Marks all object pattern intermediate
+                 and alpha memory nodes with a
+                 unique integer id prior to the
+                 constructs-to-c execution
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : bsaveIDs of nodes set
+  NOTES        : None
+ *****************************************************/
+static void BeforeObjectPatternsToCode(
+  Environment *theEnv)
+  {
+   unsigned long whichPattern;
+   OBJECT_PATTERN_NODE *intermediateNode;
+   OBJECT_ALPHA_NODE *alphaNode;
+   Defmodule *theModule;
+   Defclass *theDefclass;
+   CLASS_ALPHA_LINK *theLink;
+
+   whichPattern = 0L;
+   intermediateNode = ObjectNetworkPointer(theEnv);
+   while (intermediateNode != NULL)
+     {
+      intermediateNode->bsaveID = whichPattern++;
+      intermediateNode = GetNextObjectPatternNode(intermediateNode);
+     }
+
+   whichPattern = 0L;
+   alphaNode = ObjectNetworkTerminalPointer(theEnv);
+   while (alphaNode != NULL)
+     {
+      alphaNode->bsaveID = whichPattern++;
+      alphaNode = alphaNode->nxtTerminal;
+     }
+     
+   whichPattern = 0L;
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+      for (theDefclass = GetNextDefclass(theEnv,NULL) ;
+           theDefclass != NULL ;
+           theDefclass = GetNextDefclass(theEnv,theDefclass))
+        {
+         for (theLink = theDefclass->relevant_terminal_alpha_nodes;
+              theLink != NULL;
+              theLink = theLink->next)
+           { theLink->bsaveID = whichPattern++; }
+        }
+     }
+  }
+
+/***************************************************
+  NAME         : GetNextObjectPatternNode
+  DESCRIPTION  : Grabs the next node in a depth
+                 first perusal of the object pattern
+                 intermediate nodes
+  INPUTS       : The previous node
+  RETURNS      : The next node (NULL if done)
+  SIDE EFFECTS : None
+  NOTES        : Alpha meory nodes are ignored
+ ***************************************************/
+static OBJECT_PATTERN_NODE *GetNextObjectPatternNode(
+  OBJECT_PATTERN_NODE *thePattern)
+  {
+   if (thePattern->nextLevel != NULL)
+     return thePattern->nextLevel;
+   while (thePattern->rightNode == NULL)
+     {
+      thePattern = thePattern->lastLevel;
+      if (thePattern == NULL)
+        return NULL;
+     }
+   return thePattern->rightNode;
+  }
+
+/***************************************************
+  NAME         : InitObjectPatternsCode
+  DESCRIPTION  : Prints out run-time initialization
+                 code for object patterns
+  INPUTS       : 1) A pointer to the output file
+                 2) The id of constructs-to-c image
+                 3) The maximum number of indices
+                    allowed in any single array
+                    in the image
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Initialization code written
+  NOTES        : None
+ ***************************************************/
+static void InitObjectPatternsCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned long firstIntermediateNode, firstAlphaNode;
+
+   if (ObjectNetworkPointer(theEnv) != NULL)
+     {
+      firstIntermediateNode = ObjectNetworkPointer(theEnv)->bsaveID;
+      firstAlphaNode = ObjectNetworkTerminalPointer(theEnv)->bsaveID;
+      fprintf(initFP,"   SetObjectNetworkPointer(theEnv,&%s%u_%lu[%lu]);\n",
+                       ObjectPNPrefix(),imageID,
+                       ((firstIntermediateNode / maxIndices) + 1),
+                       (firstIntermediateNode % maxIndices));
+      fprintf(initFP,"   SetObjectNetworkTerminalPointer(theEnv,&%s%u_%lu[%lu]);\n",
+                       ObjectANPrefix(),imageID,
+                       ((firstAlphaNode / maxIndices) + 1),
+                       (firstAlphaNode % maxIndices));
+     }
+   else
+     {
+      fprintf(initFP,"   SetObjectNetworkPointer(theEnv,NULL);\n");
+      fprintf(initFP,"   SetObjectNetworkTerminalPointer(theEnv,NULL);\n");
+     }
+  }
+
+/***********************************************************
+  NAME         : ObjectPatternsToCode
+  DESCRIPTION  : Writes out data structures for run-time
+                 creation of object patterns
+  INPUTS       : 1) The base image output file name
+                 2) The base image file id
+                 3) A pointer to the header output file
+                 4) The id of constructs-to-c image
+                 5) The maximum number of indices
+                    allowed in any single array
+                    in the image
+  RETURNS      : 1 if OK, 0 if could not open a file
+  SIDE EFFECTS : Object patterns code written to files
+  NOTES        : None
+ ***********************************************************/
+static bool ObjectPatternsToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int version;
+   
+   version = ClassAlphaLinksToCode(theEnv,fileName,pathName,fileNameBuffer,
+                                   fileID,headerFP,imageID,maxIndices,1);
+   if (version == 0)
+     return(0);
+
+   version = IntermediatePatternNodesToCode(theEnv,fileName,pathName,fileNameBuffer,
+                                            fileID,headerFP,imageID,maxIndices,version);
+   if (version == 0)
+     return false;
+   if (! AlphaPatternNodesToCode(theEnv,fileName,pathName,fileNameBuffer,
+                                 fileID,headerFP,imageID,maxIndices,version))
+     return false;
+   return true;
+  }
+
+/***************************************************
+  NAME         : IntermediatePatternNodeReference
+  DESCRIPTION  : Prints out a reference to an
+                 object pattern intermediate node
+  INPUTS       : 1) A pointer to the object pattern
+                    intermediate node
+                 2) A pointer to the output file
+                 3) The id of constructs-to-c image
+                 4) The maximum number of indices
+                    allowed in any single array
+                    in the image
+  RETURNS      : 1 if OK, 0 if could not open a file
+  SIDE EFFECTS : Reference to object pattern alpha
+                 memory printed
+  NOTES        : None
+ ***************************************************/
+static void IntermediatePatternNodeReference(
+  Environment *theEnv,
+  OBJECT_PATTERN_NODE *thePattern,
+  FILE *theFile,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   if (thePattern == NULL)
+     fprintf(theFile,"NULL");
+   else
+     {
+      fprintf(theFile,"&%s%u_%lu[%lu]",
+                    ObjectPNPrefix(),imageID,
+                    ((thePattern->bsaveID) / maxIndices) + 1,
+                    thePattern->bsaveID % maxIndices);
+     }
+  }
+
+/*************************************************************
+  NAME         : IntermediatePatternNodesToCode
+  DESCRIPTION  : Writes out data structures for run-time
+                 creation of object pattern intermediate nodes
+  INPUTS       : 1) The base image output file name
+                 2) The base image file id
+                 3) A pointer to the header output file
+                 4) The id of constructs-to-c image
+                 5) The maximum number of indices
+                    allowed in any single array
+                    in the image
+  RETURNS      : Next version file to open, 0 if error
+  SIDE EFFECTS : Object patterns code written to files
+  NOTES        : None
+ *************************************************************/
+static unsigned IntermediatePatternNodesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int version)
+  {
+   FILE *fp;
+   int arrayVersion;
+   bool newHeader;
+   unsigned int i;
+   OBJECT_PATTERN_NODE *thePattern;
+
+   /* ================
+      Create the file.
+      ================ */
+   if (ObjectNetworkPointer(theEnv) == NULL)
+     { return 1; }
+
+   fprintf(headerFP,"#include \"objrtmch.h\"\n");
+
+   /* =================================
+      Dump the pattern node structures.
+      ================================= */
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,fileID,version,false)) == NULL)
+     { return 0; }
+   newHeader = true;
+
+   arrayVersion = 1;
+   i = 1;
+
+   thePattern = ObjectNetworkPointer(theEnv);
+   while (thePattern != NULL)
+     {
+      if (newHeader)
+        {
+         fprintf(fp,"OBJECT_PATTERN_NODE %s%u_%u[] = {\n",
+                     ObjectPNPrefix(),imageID,arrayVersion);
+         fprintf(headerFP,"extern OBJECT_PATTERN_NODE %s%u_%u[];\n",
+                     ObjectPNPrefix(),imageID,arrayVersion);
+         newHeader = false;
+        }
+      fprintf(fp,"{0,%u,%u,%u,%u,%u,0L,%u,",thePattern->multifieldNode,
+                                        thePattern->endSlot,
+                                        thePattern->selector,
+                                        thePattern->whichField,
+                                        thePattern->leaveFields,
+                                        thePattern->slotNameID);
+
+      PrintHashedExpressionReference(theEnv,fp,thePattern->networkTest,imageID,maxIndices);
+      fprintf(fp,",");
+      IntermediatePatternNodeReference(theEnv,thePattern->nextLevel,fp,imageID,maxIndices);
+      fprintf(fp,",");
+      IntermediatePatternNodeReference(theEnv,thePattern->lastLevel,fp,imageID,maxIndices);
+      fprintf(fp,",");
+      IntermediatePatternNodeReference(theEnv,thePattern->leftNode,fp,imageID,maxIndices);
+      fprintf(fp,",");
+      IntermediatePatternNodeReference(theEnv,thePattern->rightNode,fp,imageID,maxIndices);
+      fprintf(fp,",");
+      ObjectPatternNodeReference(theEnv,thePattern->alphaNode,fp,imageID,maxIndices);
+      fprintf(fp,",0L}");
+
+      i++;
+      thePattern = GetNextObjectPatternNode(thePattern);
+
+      if ((i > maxIndices) || (thePattern == NULL))
+        {
+         fprintf(fp,"};\n");
+         GenClose(theEnv,fp);
+         i = 1;
+         version++;
+         arrayVersion++;
+         if (thePattern != NULL)
+           {
+            if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,fileID,version,false)) == NULL)
+              { return 0; }
+            newHeader = true;
+           }
+        }
+      else if (thePattern != NULL)
+        { fprintf(fp,",\n"); }
+     }
+
+   return version;
+  }
+
+/***********************************************************
+  NAME         : AlphaPatternNodesToCode
+  DESCRIPTION  : Writes out data structures for run-time
+                 creation of object pattern alpha memories
+  INPUTS       : 1) The base image output file name
+                 2) The base image file id
+                 3) A pointer to the header output file
+                 4) The id of constructs-to-c image
+                 5) The maximum number of indices
+                    allowed in any single array
+                    in the image
+  RETURNS      : Next version file to open, 0 if error
+  SIDE EFFECTS : Object patterns code written to files
+  NOTES        : None
+ ***********************************************************/
+static unsigned AlphaPatternNodesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int version)
+  {
+   FILE *fp;
+   unsigned int arrayVersion;
+   bool newHeader;
+   unsigned int i;
+   OBJECT_ALPHA_NODE *thePattern;
+
+   /* ================
+      Create the file.
+      ================ */
+   if (ObjectNetworkTerminalPointer(theEnv) == NULL)
+     { return version; }
+
+   /* =================================
+      Dump the pattern node structures.
+      ================================= */
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,fileID,version,false)) == NULL)
+     { return 0; }
+   newHeader = true;
+
+   arrayVersion = 1;
+   i = 1;
+
+   thePattern = ObjectNetworkTerminalPointer(theEnv);
+   while (thePattern != NULL)
+     {
+      if (newHeader)
+        {
+         fprintf(fp,"OBJECT_ALPHA_NODE %s%u_%u[] = {\n",
+                    ObjectANPrefix(),imageID,arrayVersion);
+         fprintf(headerFP,"extern OBJECT_ALPHA_NODE %s%u_%u[];\n",
+                          ObjectANPrefix(),imageID,arrayVersion);
+         newHeader = false;
+        }
+
+      fprintf(fp,"{");
+
+      PatternNodeHeaderToCode(theEnv,fp,&thePattern->header,imageID,maxIndices);
+
+      fprintf(fp,",0L,");
+      PrintBitMapReference(theEnv,fp,thePattern->classbmp);
+      fprintf(fp,",");
+      PrintBitMapReference(theEnv,fp,thePattern->slotbmp);
+      fprintf(fp,",");
+      IntermediatePatternNodeReference(theEnv,thePattern->patternNode,fp,imageID,maxIndices);
+      fprintf(fp,",");
+      ObjectPatternNodeReference(theEnv,thePattern->nxtInGroup,fp,imageID,maxIndices);
+      fprintf(fp,",");
+      ObjectPatternNodeReference(theEnv,thePattern->nxtTerminal,fp,imageID,maxIndices);
+      fprintf(fp,",0L}");
+
+      i++;
+      thePattern = thePattern->nxtTerminal;
+
+      if ((i > maxIndices) || (thePattern == NULL))
+        {
+         fprintf(fp,"};\n");
+         GenClose(theEnv,fp);
+         i = 1;
+         version++;
+         arrayVersion++;
+         if (thePattern != NULL)
+           {
+            if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,fileID,version,false)) == NULL)
+              { return 0; }
+            newHeader = true;
+           }
+        }
+      else if (thePattern != NULL)
+        { fprintf(fp,",\n"); }
+     }
+
+   return version;
+  }
+
+/***********************************************************
+  NAME         : ClassAlphaLinksToCode
+  DESCRIPTION  : Writes out data structures for run-time
+                 creation of class alpha link
+  INPUTS       : 1) The base image output file name
+                 2) The base image file id
+                 3) A pointer to the header output file
+                 4) The id of constructs-to-c image
+                 5) The maximum number of indices
+                    allowed in any single array
+                    in the image
+  RETURNS      : Next version file to open, 0 if error
+  SIDE EFFECTS : Class alpha links code written to files
+  NOTES        : None
+ ***********************************************************/
+static unsigned ClassAlphaLinksToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int version)
+  {
+   FILE *fp;
+   unsigned int arrayVersion;
+   bool newHeader;
+   unsigned int i;
+   Defmodule *theModule = NULL;
+   Defclass *theDefclass = NULL;
+   CLASS_ALPHA_LINK *theLink = NULL;
+
+   /* =================================
+      Dump the alpha link structures.
+      ================================= */
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,fileID,version,false)) == NULL)
+     return(0);
+   newHeader = true;
+
+   arrayVersion = 1;
+   i = 1;
+ 
+   theLink = GetNextAlphaLink(theEnv,&theModule,&theDefclass,theLink);
+   while (theLink != NULL)
+     {
+      if (newHeader)
+        {
+         fprintf(fp,"CLASS_ALPHA_LINK %s%u_%u[] = {\n",
+                    ObjectALPrefix(),imageID,arrayVersion);
+         fprintf(headerFP,"extern CLASS_ALPHA_LINK %s%u_%u[];\n",
+                          ObjectALPrefix(),imageID,arrayVersion);
+         newHeader = false;
+        }
+
+      fprintf(fp,"{");
+      
+      ObjectPatternNodeReference(theEnv,theLink->alphaNode,fp,imageID,maxIndices);
+
+      fprintf(fp,",");
+         
+      ClassAlphaLinkReference(theEnv,theLink->next,fp,imageID,maxIndices);
+
+      fprintf(fp,"}");
+      
+      theLink = GetNextAlphaLink(theEnv,&theModule,&theDefclass,theLink);
+      
+      if ((i > maxIndices) || (theLink == NULL))
+        {
+         fprintf(fp,"};\n");
+         GenClose(theEnv,fp);
+         i = 1;
+         version++;
+         arrayVersion++;
+         if (theLink != NULL)
+           {
+            if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,fileID,version,false)) == NULL)
+              return(0);
+            newHeader = true;
+           }
+        }
+      else if (theLink != NULL)
+        { fprintf(fp,",\n"); }
+     }
+
+   return(version);
+  }
+
+/********************/
+/* GetNextAlphaLink */
+/********************/
+static CLASS_ALPHA_LINK *GetNextAlphaLink(
+  Environment *theEnv,
+  Defmodule **theModule,
+  Defclass **theClass,
+  CLASS_ALPHA_LINK *theLink)
+  {
+   while (true)
+     {
+      if (theLink != NULL)
+        {
+         theLink = theLink->next;
+         
+         if (theLink != NULL)
+           { return theLink; }
+        }
+      else if (*theClass != NULL)
+        {
+         *theClass = GetNextDefclass(theEnv,*theClass);
+         if (*theClass != NULL)
+           { theLink = (*theClass)->relevant_terminal_alpha_nodes; }
+         if (theLink != NULL)
+           { return theLink; }
+        }
+      else
+        {
+         *theModule = GetNextDefmodule(theEnv,*theModule);
+         if (*theModule == NULL)
+           { return NULL; }
+         SetCurrentModule(theEnv,*theModule);
+         *theClass = GetNextDefclass(theEnv,*theClass);
+         if (*theClass != NULL)
+           {
+            theLink = (*theClass)->relevant_terminal_alpha_nodes;
+            if (theLink != NULL)
+              { return theLink; }
+           }
+        }
+     }
+     
+   return NULL;
+  }
+
+#endif
diff --git a/clips/objrtcmp.h b/clips/objrtcmp.h
new file mode 100755
index 000000000..323c30976
--- /dev/null
+++ b/clips/objrtcmp.h
@@ -0,0 +1,66 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  02/03/18            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_objrtcmp
+
+#pragma once
+
+#define _H_objrtcmp
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM && (! RUN_TIME) && CONSTRUCT_COMPILER
+
+#include <stdio.h>
+
+   void                    ObjectPatternsCompilerSetup(Environment *);
+   void                    ObjectPatternNodeReference(Environment *,void *,FILE *,
+                                                      unsigned int,unsigned int);
+   void                    ClassAlphaLinkReference(Environment *,void *,FILE *,
+                                                   unsigned int,unsigned int);
+
+#endif /* DEFRULE_CONSTRUCT && OBJECT_SYSTEM && (! RUN_TIME) && CONSTRUCT_COMPILER */
+
+#endif /* _H_objrtcmp */
+
+
+
diff --git a/clips/objrtfnx.c b/clips/objrtfnx.c
new file mode 100755
index 000000000..67ebb6e83
--- /dev/null
+++ b/clips/objrtfnx.c
@@ -0,0 +1,1312 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/01/16             */
+   /*                                                     */
+   /*    INFERENCE ENGINE OBJECT ACCESS ROUTINES MODULE   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: RETE Network Interface for Objects               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+
+#include <stdio.h>
+#include <string.h>
+
+#include "classcom.h"
+#include "classfun.h"
+
+#if DEVELOPER
+#include "exprnops.h"
+#endif
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+#include "constant.h"
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "objrtmch.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "router.h"
+
+#include "objrtfnx.h"
+
+/* =========================================
+   *****************************************
+                 MACROS AND TYPES
+   =========================================
+   ***************************************** */
+
+#define GetInsSlot(ins,si) ins->slotAddresses[ins->cls->slotNameMap[si]-1]
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    PrintObjectGetVarJN1(Environment *,const char *,void *);
+   static bool                    ObjectGetVarJNFunction1(Environment *,void *,UDFValue *);
+   static void                    PrintObjectGetVarJN2(Environment *,const char *,void *);
+   static bool                    ObjectGetVarJNFunction2(Environment *,void *,UDFValue *);
+   static void                    PrintObjectGetVarPN1(Environment *,const char *,void *);
+   static bool                    ObjectGetVarPNFunction1(Environment *,void *,UDFValue *);
+   static void                    PrintObjectGetVarPN2(Environment *,const char *,void *);
+   static bool                    ObjectGetVarPNFunction2(Environment *,void *,UDFValue *);
+   static void                    PrintObjectCmpConstant(Environment *,const char *,void *);
+   static void                    PrintSlotLengthTest(Environment *,const char *,void *);
+   static bool                    SlotLengthTestFunction(Environment *,void *,UDFValue *);
+   static void                    PrintPNSimpleCompareFunction1(Environment *,const char *,void *);
+   static bool                    PNSimpleCompareFunction1(Environment *,void *,UDFValue *);
+   static void                    PrintPNSimpleCompareFunction2(Environment *,const char *,void *);
+   static bool                    PNSimpleCompareFunction2(Environment *,void *,UDFValue *);
+   static void                    PrintPNSimpleCompareFunction3(Environment *,const char *,void *);
+   static bool                    PNSimpleCompareFunction3(Environment *,void *,UDFValue *);
+   static void                    PrintJNSimpleCompareFunction1(Environment *,const char *,void *);
+   static bool                    JNSimpleCompareFunction1(Environment *,void *,UDFValue *);
+   static void                    PrintJNSimpleCompareFunction2(Environment *,const char *,void *);
+   static bool                    JNSimpleCompareFunction2(Environment *,void *,UDFValue *);
+   static void                    PrintJNSimpleCompareFunction3(Environment *,const char *,void *);
+   static bool                    JNSimpleCompareFunction3(Environment *,void *,UDFValue *);
+   static void                    GetPatternObjectAndMarks(Environment *,unsigned short,bool,bool,Instance **,struct multifieldMarker **);
+   static void                    GetObjectValueGeneral(Environment *,UDFValue *,Instance *,
+                                                        struct multifieldMarker *,struct ObjectMatchVar1 *);
+   static void                    GetObjectValueSimple(Environment *,UDFValue *,Instance *,struct ObjectMatchVar2 *);
+   static size_t                  CalculateSlotField(struct multifieldMarker *,InstanceSlot *,size_t,size_t *);
+   static void                    GetInsMultiSlotField(CLIPSValue *,Instance *,unsigned,unsigned,unsigned);
+   static void                    DeallocateObjectReteData(Environment *);
+   static void                    DestroyObjectPatternNetwork(Environment *,OBJECT_PATTERN_NODE *);
+   static void                    DestroyObjectAlphaNodes(Environment *,OBJECT_ALPHA_NODE *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : InstallObjectPrimitives
+  DESCRIPTION  : Installs all the entity records
+                 associated with object pattern
+                 matching operations
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Primitive operations installed
+  NOTES        : None
+ ***************************************************/
+void InstallObjectPrimitives(
+  Environment *theEnv)
+  {
+   struct entityRecord objectGVInfo1 = { "OBJ_GET_SLOT_JNVAR1", OBJ_GET_SLOT_JNVAR1,0,1,0,
+                                             PrintObjectGetVarJN1,
+                                             PrintObjectGetVarJN1,NULL,
+                                             ObjectGetVarJNFunction1,
+                                             NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord objectGVInfo2 = { "OBJ_GET_SLOT_JNVAR2", OBJ_GET_SLOT_JNVAR2,0,1,0,
+                                             PrintObjectGetVarJN2,
+                                             PrintObjectGetVarJN2,NULL,
+                                             ObjectGetVarJNFunction2,
+                                             NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord objectGVPNInfo1 = { "OBJ_GET_SLOT_PNVAR1", OBJ_GET_SLOT_PNVAR1,0,1,0,
+                                               PrintObjectGetVarPN1,
+                                               PrintObjectGetVarPN1,NULL,
+                                               ObjectGetVarPNFunction1,
+                                               NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord objectGVPNInfo2 = { "OBJ_GET_SLOT_PNVAR2", OBJ_GET_SLOT_PNVAR2,0,1,0,
+                                               PrintObjectGetVarPN2,
+                                               PrintObjectGetVarPN2,NULL,
+                                               ObjectGetVarPNFunction2,
+                                               NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord objectCmpConstantInfo = { "OBJ_PN_CONSTANT", OBJ_PN_CONSTANT,0,1,1,
+                                                     PrintObjectCmpConstant,
+                                                     PrintObjectCmpConstant,NULL,
+                                                     ObjectCmpConstantFunction,
+                                                     NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord lengthTestInfo = { "OBJ_SLOT_LENGTH", OBJ_SLOT_LENGTH,0,1,0,
+                                              PrintSlotLengthTest,
+                                              PrintSlotLengthTest,NULL,
+                                              SlotLengthTestFunction,
+                                              NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord pNSimpleCompareInfo1 = { "OBJ_PN_CMP1", OBJ_PN_CMP1,0,1,1,
+                                                    PrintPNSimpleCompareFunction1,
+                                                    PrintPNSimpleCompareFunction1,NULL,
+                                                    PNSimpleCompareFunction1,
+                                                    NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord pNSimpleCompareInfo2 = { "OBJ_PN_CMP2", OBJ_PN_CMP2,0,1,1,
+                                                    PrintPNSimpleCompareFunction2,
+                                                    PrintPNSimpleCompareFunction2,NULL,
+                                                    PNSimpleCompareFunction2,
+                                                    NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord pNSimpleCompareInfo3 = { "OBJ_PN_CMP3", OBJ_PN_CMP3,0,1,1,
+                                                    PrintPNSimpleCompareFunction3,
+                                                    PrintPNSimpleCompareFunction3,NULL,
+                                                    PNSimpleCompareFunction3,
+                                                    NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord jNSimpleCompareInfo1 = { "OBJ_JN_CMP1", OBJ_JN_CMP1,0,1,1,
+                                                    PrintJNSimpleCompareFunction1,
+                                                    PrintJNSimpleCompareFunction1,NULL,
+                                                    JNSimpleCompareFunction1,
+                                                    NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord jNSimpleCompareInfo2 = { "OBJ_JN_CMP2", OBJ_JN_CMP2,0,1,1,
+                                                    PrintJNSimpleCompareFunction2,
+                                                    PrintJNSimpleCompareFunction2,NULL,
+                                                    JNSimpleCompareFunction2,
+                                                    NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   struct entityRecord jNSimpleCompareInfo3 = { "OBJ_JN_CMP3", OBJ_JN_CMP3,0,1,1,
+                                                    PrintJNSimpleCompareFunction3,
+                                                    PrintJNSimpleCompareFunction3,NULL,
+                                                    JNSimpleCompareFunction3,
+                                                    NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+   AllocateEnvironmentData(theEnv,OBJECT_RETE_DATA,sizeof(struct objectReteData),DeallocateObjectReteData);
+   ObjectReteData(theEnv)->CurrentObjectSlotLength = 1;
+
+   memcpy(&ObjectReteData(theEnv)->ObjectGVInfo1,&objectGVInfo1,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->ObjectGVInfo2,&objectGVInfo2,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->ObjectGVPNInfo1,&objectGVPNInfo1,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->ObjectGVPNInfo2,&objectGVPNInfo2,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->ObjectCmpConstantInfo,&objectCmpConstantInfo,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->LengthTestInfo,&lengthTestInfo,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->PNSimpleCompareInfo1,&pNSimpleCompareInfo1,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->PNSimpleCompareInfo2,&pNSimpleCompareInfo2,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->PNSimpleCompareInfo3,&pNSimpleCompareInfo3,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->JNSimpleCompareInfo1,&jNSimpleCompareInfo1,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->JNSimpleCompareInfo2,&jNSimpleCompareInfo2,sizeof(struct entityRecord));
+   memcpy(&ObjectReteData(theEnv)->JNSimpleCompareInfo3,&jNSimpleCompareInfo3,sizeof(struct entityRecord));
+
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->ObjectGVInfo1,OBJ_GET_SLOT_JNVAR1);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->ObjectGVInfo2,OBJ_GET_SLOT_JNVAR2);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->ObjectGVPNInfo1,OBJ_GET_SLOT_PNVAR1);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->ObjectGVPNInfo2,OBJ_GET_SLOT_PNVAR2);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->ObjectCmpConstantInfo,OBJ_PN_CONSTANT);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->LengthTestInfo,OBJ_SLOT_LENGTH);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->PNSimpleCompareInfo1,OBJ_PN_CMP1);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->PNSimpleCompareInfo2,OBJ_PN_CMP2);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->PNSimpleCompareInfo3,OBJ_PN_CMP3);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->JNSimpleCompareInfo1,OBJ_JN_CMP1);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->JNSimpleCompareInfo2,OBJ_JN_CMP2);
+   InstallPrimitive(theEnv,&ObjectReteData(theEnv)->JNSimpleCompareInfo3,OBJ_JN_CMP3);
+  }
+
+/*****************************************************/
+/* DeallocateObjectReteData: Deallocates environment */
+/*    data for the object rete network.              */
+/*****************************************************/
+static void DeallocateObjectReteData(
+  Environment *theEnv)
+  {
+   OBJECT_PATTERN_NODE *theNetwork;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv)) return;
+#endif
+
+   theNetwork = ObjectReteData(theEnv)->ObjectPatternNetworkPointer;
+   DestroyObjectPatternNetwork(theEnv,theNetwork);
+  }
+
+/****************************************************************/
+/* DestroyObjectPatternNetwork: Deallocates the data structures */
+/*   associated with the object pattern network.                */
+/****************************************************************/
+static void DestroyObjectPatternNetwork(
+  Environment *theEnv,
+  OBJECT_PATTERN_NODE *thePattern)
+  {
+   OBJECT_PATTERN_NODE *patternPtr;
+
+   if (thePattern == NULL) return;
+
+   while (thePattern != NULL)
+     {
+      patternPtr = thePattern->rightNode;
+
+      DestroyObjectPatternNetwork(theEnv,thePattern->nextLevel);
+      DestroyObjectAlphaNodes(theEnv,thePattern->alphaNode);
+#if ! RUN_TIME
+      rtn_struct(theEnv,objectPatternNode,thePattern);
+#endif
+      thePattern = patternPtr;
+     }
+  }
+
+/************************************************************/
+/* DestroyObjectAlphaNodes: Deallocates the data structures */
+/*   associated with the object alpha nodes.                */
+/************************************************************/
+static void DestroyObjectAlphaNodes(
+  Environment *theEnv,
+  OBJECT_ALPHA_NODE *theNode)
+  {
+   OBJECT_ALPHA_NODE *nodePtr;
+
+   if (theNode == NULL) return;
+
+   while (theNode != NULL)
+     {
+      nodePtr = theNode->nxtInGroup;
+
+      DestroyAlphaMemory(theEnv,&theNode->header,false);
+
+#if ! RUN_TIME
+      rtn_struct(theEnv,objectAlphaNode,theNode);
+#endif
+
+      theNode = nodePtr;
+     }
+  }
+
+/*****************************************************
+  NAME         : ObjectCmpConstantFunction
+  DESCRIPTION  : Used to compare object slot values
+                 against a constant
+  INPUTS       : 1) The constant test bitmap
+                 2) Data object buffer to hold result
+  RETURNS      : True if test successful,
+                 false otherwise
+  SIDE EFFECTS : Buffer set to symbol TRUE if test
+                 successful, false otherwise
+  NOTES        : Called directly by
+                   EvaluatePatternExpression()
+ *****************************************************/
+bool ObjectCmpConstantFunction(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   struct ObjectCmpPNConstant *hack;
+   UDFValue theVar;
+   Expression *constantExp;
+   bool rv;
+   Multifield *theSegment;
+
+   hack = (struct ObjectCmpPNConstant *) ((CLIPSBitMap *) theValue)->contents;
+   if (hack->general)
+     {
+      EvaluateExpression(theEnv,GetFirstArgument(),&theVar);
+      constantExp = GetFirstArgument()->nextArg;
+     }
+   else
+     {
+      constantExp = GetFirstArgument();
+      if (ObjectReteData(theEnv)->CurrentPatternObjectSlot->type == MULTIFIELD_TYPE)
+        {
+         theSegment = ObjectReteData(theEnv)->CurrentPatternObjectSlot->multifieldValue;
+         if (hack->fromBeginning)
+           {
+            theVar.value = theSegment->contents[hack->offset].value;
+           }
+         else
+           {
+            theVar.value = theSegment->contents[theSegment->length -
+                                      (hack->offset + 1)].value;
+           }
+        }
+      else
+        {
+         theVar.value = ObjectReteData(theEnv)->CurrentPatternObjectSlot->value;
+        }
+     }
+   if (theVar.header->type != constantExp->type)
+     rv = hack->fail ? true : false;
+   else if (theVar.value != constantExp->value)
+     rv = hack->fail ? true : false;
+   else
+     rv = hack->pass ? true : false;
+   theResult->value = rv ? TrueSymbol(theEnv) : FalseSymbol(theEnv);
+   return rv;
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+static void PrintObjectGetVarJN1(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectMatchVar1 *hack;
+
+   hack = (struct ObjectMatchVar1 *) ((CLIPSBitMap *) theValue)->contents;
+
+   if (hack->objectAddress)
+     {
+      WriteString(theEnv,logicalName,"(obj-ptr ");
+      PrintUnsignedInteger(theEnv,logicalName,hack->whichPattern);
+     }
+   else if (hack->allFields)
+     {
+      WriteString(theEnv,logicalName,"(obj-slot-contents ");
+      PrintUnsignedInteger(theEnv,logicalName,hack->whichPattern);
+      WriteString(theEnv,logicalName," ");
+      WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->whichSlot)->contents);
+     }
+   else
+     {
+      WriteString(theEnv,logicalName,"(obj-slot-var ");
+      PrintUnsignedInteger(theEnv,logicalName,hack->whichPattern);
+      WriteString(theEnv,logicalName," ");
+      WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->whichSlot)->contents);
+      WriteString(theEnv,logicalName," ");
+      PrintUnsignedInteger(theEnv,logicalName,hack->whichField);
+     }
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool ObjectGetVarJNFunction1(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   struct ObjectMatchVar1 *hack;
+   Instance *theInstance;
+   struct multifieldMarker *theMarks;
+
+   hack = (struct ObjectMatchVar1 *) ((CLIPSBitMap *) theValue)->contents;
+   GetPatternObjectAndMarks(theEnv,hack->whichPattern,hack->lhs,hack->rhs,&theInstance,&theMarks);
+   GetObjectValueGeneral(theEnv,theResult,theInstance,theMarks,hack);
+   return true;
+  }
+
+static void PrintObjectGetVarJN2(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectMatchVar2 *hack;
+
+   hack = (struct ObjectMatchVar2 *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(obj-slot-quick-var ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->whichPattern);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->whichSlot)->contents);
+   if (hack->fromBeginning)
+     {
+      WriteString(theEnv,logicalName," B");
+      PrintUnsignedInteger(theEnv,logicalName,hack->beginningOffset + 1);
+     }
+   if (hack->fromEnd)
+     {
+      WriteString(theEnv,logicalName," E");
+      PrintUnsignedInteger(theEnv,logicalName,hack->endOffset + 1);
+     }
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool ObjectGetVarJNFunction2(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   struct ObjectMatchVar2 *hack;
+   Instance *theInstance;
+   struct multifieldMarker *theMarks;
+
+   hack = (struct ObjectMatchVar2 *) ((CLIPSBitMap *) theValue)->contents;
+   GetPatternObjectAndMarks(theEnv,hack->whichPattern,hack->lhs,hack->rhs,&theInstance,&theMarks);
+   GetObjectValueSimple(theEnv,theResult,theInstance,hack);
+   return true;
+  }
+
+static void PrintObjectGetVarPN1(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectMatchVar1 *hack;
+
+   hack = (struct ObjectMatchVar1 *) ((CLIPSBitMap *) theValue)->contents;
+
+   if (hack->objectAddress)
+     WriteString(theEnv,logicalName,"(ptn-obj-ptr ");
+   else if (hack->allFields)
+     {
+      WriteString(theEnv,logicalName,"(ptn-obj-slot-contents ");
+      WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->whichSlot)->contents);
+     }
+   else
+     {
+      WriteString(theEnv,logicalName,"(ptn-obj-slot-var ");
+      WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->whichSlot)->contents);
+      WriteString(theEnv,logicalName," ");
+      PrintUnsignedInteger(theEnv,logicalName,hack->whichField);
+     }
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool ObjectGetVarPNFunction1(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   struct ObjectMatchVar1 *hack;
+
+   hack = (struct ObjectMatchVar1 *) ((CLIPSBitMap *) theValue)->contents;
+   GetObjectValueGeneral(theEnv,theResult,ObjectReteData(theEnv)->CurrentPatternObject,ObjectReteData(theEnv)->CurrentPatternObjectMarks,hack);
+   return true;
+  }
+
+static void PrintObjectGetVarPN2(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectMatchVar2 *hack;
+
+   hack = (struct ObjectMatchVar2 *) ((CLIPSBitMap *) theValue)->contents;
+   WriteString(theEnv,logicalName,"(ptn-obj-slot-quick-var ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->whichSlot)->contents);
+   if (hack->fromBeginning)
+     {
+      WriteString(theEnv,logicalName," B");
+      PrintUnsignedInteger(theEnv,logicalName,(hack->beginningOffset + 1));
+     }
+   if (hack->fromEnd)
+     {
+      WriteString(theEnv,logicalName," E");
+      PrintUnsignedInteger(theEnv,logicalName,(hack->endOffset + 1));
+     }
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool ObjectGetVarPNFunction2(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   struct ObjectMatchVar2 *hack;
+
+   hack = (struct ObjectMatchVar2 *) ((CLIPSBitMap *) theValue)->contents;
+   GetObjectValueSimple(theEnv,theResult,ObjectReteData(theEnv)->CurrentPatternObject,hack);
+   return true;
+  }
+
+static void PrintObjectCmpConstant(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectCmpPNConstant *hack;
+
+   hack = (struct ObjectCmpPNConstant *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(obj-const ");
+   WriteString(theEnv,logicalName,hack->pass ? "p " : "n ");
+   if (hack->general)
+     PrintExpression(theEnv,logicalName,GetFirstArgument());
+   else
+     {
+      WriteString(theEnv,logicalName,hack->fromBeginning ? "B" : "E");
+      PrintUnsignedInteger(theEnv,logicalName,hack->offset);
+      WriteString(theEnv,logicalName," ");
+      PrintExpression(theEnv,logicalName,GetFirstArgument());
+     }
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static void PrintSlotLengthTest(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectMatchLength *hack;
+
+   hack = (struct ObjectMatchLength *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(obj-slot-len ");
+   if (hack->exactly)
+     WriteString(theEnv,logicalName,"= ");
+   else
+     WriteString(theEnv,logicalName,">= ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->minLength);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool SlotLengthTestFunction(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   struct ObjectMatchLength *hack;
+
+   theResult->value = FalseSymbol(theEnv);
+   hack = (struct ObjectMatchLength *) ((CLIPSBitMap *) theValue)->contents;
+   if (ObjectReteData(theEnv)->CurrentObjectSlotLength < hack->minLength)
+     return false;
+   if (hack->exactly && (ObjectReteData(theEnv)->CurrentObjectSlotLength > hack->minLength))
+     return false;
+   theResult->value = TrueSymbol(theEnv);
+   return true;
+  }
+
+static void PrintPNSimpleCompareFunction1(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectCmpPNSingleSlotVars1 *hack;
+
+   hack = (struct ObjectCmpPNSingleSlotVars1 *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(pslot-cmp1 ");
+   WriteString(theEnv,logicalName,hack->pass ? "p " : "n ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->firstSlot)->contents);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->secondSlot)->contents);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool PNSimpleCompareFunction1(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   struct ObjectCmpPNSingleSlotVars1 *hack;
+   InstanceSlot *is1,*is2;
+   bool rv;
+
+   hack = (struct ObjectCmpPNSingleSlotVars1 *) ((CLIPSBitMap *) theValue)->contents;
+   is1 = GetInsSlot(ObjectReteData(theEnv)->CurrentPatternObject,hack->firstSlot);
+   is2 = GetInsSlot(ObjectReteData(theEnv)->CurrentPatternObject,hack->secondSlot);
+   if (is1->type != is2->type)
+     rv = hack->fail;
+   else if (is1->value != is2->value)
+     rv = hack->fail ? true : false;
+   else
+     rv = hack->pass ? true : false;
+   theResult->value = rv ? TrueSymbol(theEnv) : FalseSymbol(theEnv);
+   return rv;
+  }
+
+static void PrintPNSimpleCompareFunction2(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectCmpPNSingleSlotVars2 *hack;
+
+   hack = (struct ObjectCmpPNSingleSlotVars2 *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(pslot-cmp2 ");
+   WriteString(theEnv,logicalName,hack->pass ? "p " : "n ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->firstSlot)->contents);
+   WriteString(theEnv,logicalName,hack->fromBeginning ? " B" : " E");
+   PrintUnsignedInteger(theEnv,logicalName,hack->offset);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->secondSlot)->contents);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool PNSimpleCompareFunction2(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   struct ObjectCmpPNSingleSlotVars2 *hack;
+   bool rv;
+   CLIPSValue f1;
+   InstanceSlot *is2;
+
+   hack = (struct ObjectCmpPNSingleSlotVars2 *) ((CLIPSBitMap *) theValue)->contents;
+   GetInsMultiSlotField(&f1,ObjectReteData(theEnv)->CurrentPatternObject,hack->firstSlot,
+                        hack->fromBeginning,hack->offset);
+   is2 = GetInsSlot(ObjectReteData(theEnv)->CurrentPatternObject,hack->secondSlot);
+   if (f1.value != is2->value)
+     rv = hack->fail ? true : false;
+   else
+     rv = hack->pass ? true : false;
+   theResult->value = rv ? TrueSymbol(theEnv) : FalseSymbol(theEnv);
+   return rv;
+  }
+
+static void PrintPNSimpleCompareFunction3(
+  Environment*theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectCmpPNSingleSlotVars3 *hack;
+
+   hack = (struct ObjectCmpPNSingleSlotVars3 *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(pslot-cmp3 ");
+   WriteString(theEnv,logicalName,hack->pass ? "p " : "n ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->firstSlot)->contents);
+   WriteString(theEnv,logicalName,hack->firstFromBeginning ? " B" : " E");
+   PrintUnsignedInteger(theEnv,logicalName,hack->firstOffset);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->secondSlot)->contents);
+   WriteString(theEnv,logicalName,hack->secondFromBeginning ? " B" : " E");
+   PrintUnsignedInteger(theEnv,logicalName,hack->secondOffset);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool PNSimpleCompareFunction3(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   struct ObjectCmpPNSingleSlotVars3 *hack;
+   bool rv;
+   CLIPSValue f1, f2;
+
+   hack = (struct ObjectCmpPNSingleSlotVars3 *) ((CLIPSBitMap *) theValue)->contents;
+   GetInsMultiSlotField(&f1,ObjectReteData(theEnv)->CurrentPatternObject,hack->firstSlot,
+                        hack->firstFromBeginning,hack->firstOffset);
+   GetInsMultiSlotField(&f2,ObjectReteData(theEnv)->CurrentPatternObject,hack->secondSlot,
+                        hack->secondFromBeginning,hack->secondOffset);
+   if (f1.value != f2.value)
+     rv = hack->fail ? true : false;
+   else
+     rv = hack->pass ? true : false;
+   theResult->value = rv ? TrueSymbol(theEnv) : FalseSymbol(theEnv);
+   return rv;
+  }
+
+static void PrintJNSimpleCompareFunction1(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectCmpJoinSingleSlotVars1 *hack;
+
+   hack = (struct ObjectCmpJoinSingleSlotVars1 *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(jslot-cmp1 ");
+   WriteString(theEnv,logicalName,hack->pass ? "p " : "n ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->firstPattern);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->firstSlot)->contents);
+   WriteString(theEnv,logicalName," ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->secondPattern);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->secondSlot)->contents);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool JNSimpleCompareFunction1(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   Instance *ins1,*ins2;
+   struct multifieldMarker *theMarks;
+   struct ObjectCmpJoinSingleSlotVars1 *hack;
+   bool rv;
+   InstanceSlot *is1,*is2;
+
+   hack = (struct ObjectCmpJoinSingleSlotVars1 *) ((CLIPSBitMap *) theValue)->contents;
+   GetPatternObjectAndMarks(theEnv,hack->firstPattern,hack->firstPatternLHS,hack->firstPatternRHS,&ins1,&theMarks);
+   is1 = GetInsSlot(ins1,hack->firstSlot);
+   GetPatternObjectAndMarks(theEnv,hack->secondPattern,hack->secondPatternLHS,hack->secondPatternRHS,&ins2,&theMarks);
+   is2 = GetInsSlot(ins2,hack->secondSlot);
+   if (is1->type != is2->type)
+     rv = hack->fail;
+   else if (is1->value != is2->value)
+     rv = hack->fail ? true : false;
+   else
+     rv = hack->pass ? true : false;
+   theResult->value = rv ? TrueSymbol(theEnv) : FalseSymbol(theEnv);
+   return rv;
+  }
+
+static void PrintJNSimpleCompareFunction2(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectCmpJoinSingleSlotVars2 *hack;
+
+   hack = (struct ObjectCmpJoinSingleSlotVars2 *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(jslot-cmp2 ");
+   WriteString(theEnv,logicalName,hack->pass ? "p " : "n ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->firstPattern);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->firstSlot)->contents);
+   WriteString(theEnv,logicalName,hack->fromBeginning ? " B" : " E");
+   PrintUnsignedInteger(theEnv,logicalName,hack->offset);
+   WriteString(theEnv,logicalName," ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->secondPattern);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->secondSlot)->contents);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool JNSimpleCompareFunction2(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   Instance *ins1,*ins2;
+   struct multifieldMarker *theMarks;
+   struct ObjectCmpJoinSingleSlotVars2 *hack;
+   bool rv;
+   CLIPSValue f1;
+   InstanceSlot *is2;
+
+   hack = (struct ObjectCmpJoinSingleSlotVars2 *) ((CLIPSBitMap *) theValue)->contents;
+   GetPatternObjectAndMarks(theEnv,hack->firstPattern,hack->firstPatternLHS,hack->firstPatternRHS,&ins1,&theMarks);
+   GetInsMultiSlotField(&f1,ins1,hack->firstSlot,
+                        hack->fromBeginning,hack->offset);
+   GetPatternObjectAndMarks(theEnv,hack->secondPattern,hack->secondPatternLHS,hack->secondPatternRHS,&ins2,&theMarks);
+   is2 = GetInsSlot(ins2,hack->secondSlot);
+   if (f1.value != is2->value)
+     rv = hack->fail ? true : false;
+   else
+     rv = hack->pass ? true : false;
+   theResult->value = rv ? TrueSymbol(theEnv) : FalseSymbol(theEnv);
+   return rv;
+  }
+
+static void PrintJNSimpleCompareFunction3(
+  Environment *theEnv,
+  const char *logicalName,
+  void *theValue)
+  {
+#if DEVELOPER
+   struct ObjectCmpJoinSingleSlotVars3 *hack;
+
+   hack = (struct ObjectCmpJoinSingleSlotVars3 *) ((CLIPSBitMap *) theValue)->contents;
+
+   WriteString(theEnv,logicalName,"(jslot-cmp3 ");
+   WriteString(theEnv,logicalName,hack->pass ? "p " : "n ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->firstPattern);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->firstSlot)->contents);
+   WriteString(theEnv,logicalName,hack->firstFromBeginning ? " B" : " E");
+   PrintUnsignedInteger(theEnv,logicalName,hack->firstOffset);
+   WriteString(theEnv,logicalName," ");
+   PrintUnsignedInteger(theEnv,logicalName,hack->secondPattern);
+   WriteString(theEnv,logicalName," ");
+   WriteString(theEnv,logicalName,FindIDSlotName(theEnv,hack->secondSlot)->contents);
+   WriteString(theEnv,logicalName,hack->secondFromBeginning ? " B" : " E");
+   PrintUnsignedInteger(theEnv,logicalName,hack->secondOffset);
+   WriteString(theEnv,logicalName,")");
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(logicalName)
+#pragma unused(theValue)
+#endif
+#endif
+  }
+
+static bool JNSimpleCompareFunction3(
+  Environment *theEnv,
+  void *theValue,
+  UDFValue *theResult)
+  {
+   Instance *ins1,*ins2;
+   struct multifieldMarker *theMarks;
+   struct ObjectCmpJoinSingleSlotVars3 *hack;
+   bool rv;
+   CLIPSValue f1,f2;
+
+   hack = (struct ObjectCmpJoinSingleSlotVars3 *) ((CLIPSBitMap *) theValue)->contents;
+   GetPatternObjectAndMarks(theEnv,hack->firstPattern,hack->firstPatternLHS,hack->firstPatternRHS,&ins1,&theMarks);
+   GetInsMultiSlotField(&f1,ins1,hack->firstSlot,
+                        hack->firstFromBeginning,
+                        hack->firstOffset);
+   GetPatternObjectAndMarks(theEnv,hack->secondPattern,hack->secondPatternLHS,hack->secondPatternRHS,&ins2,&theMarks);
+   GetInsMultiSlotField(&f2,ins2,hack->secondSlot,
+                        hack->secondFromBeginning,
+                        hack->secondOffset);
+   if (f1.value != f2.value)
+     rv = hack->fail ? true : false;
+   else
+     rv = hack->pass ? true : false;
+   theResult->value = rv ? TrueSymbol(theEnv) : FalseSymbol(theEnv);
+   return rv;
+  }
+
+/****************************************************
+  NAME         : GetPatternObjectAndMarks
+  DESCRIPTION  : Finds the instance and multfiield
+                 markers corresponding to a specified
+                 pattern in the join network
+  INPUTS       : 1) The index of the desired pattern
+                 2) A buffer to hold the instance
+                    address
+                 3) A buffer to hold the list of
+                    multifield markers
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Buffers set
+  NOTES        : None
+ ****************************************************/
+static void GetPatternObjectAndMarks(
+  Environment *theEnv,
+  unsigned short pattern,
+  bool lhs,
+  bool rhs,
+  Instance **theInstance,
+  struct multifieldMarker **theMarkers)
+  {
+   if (lhs)
+     {
+      *theInstance = (Instance *)
+        get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,pattern)->matchingItem;
+      *theMarkers =
+        get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,pattern)->markers;
+     }
+   else if (rhs)
+     {
+      *theInstance = (Instance *)
+        get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,pattern)->matchingItem;
+      *theMarkers =
+        get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,pattern)->markers;
+     }
+   else if (EngineData(theEnv)->GlobalRHSBinds == NULL)
+     {
+      *theInstance = (Instance *)
+        get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,pattern)->matchingItem;
+      *theMarkers =
+        get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,pattern)->markers;
+     }
+   else if ((EngineData(theEnv)->GlobalJoin->depth - 1) == pattern)
+     {
+      *theInstance = (Instance *)
+        get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,0)->matchingItem;
+      *theMarkers = get_nth_pm_match(EngineData(theEnv)->GlobalRHSBinds,0)->markers;
+     }
+   else
+     {
+      *theInstance = (Instance *)
+        get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,pattern)->matchingItem;
+      *theMarkers =
+        get_nth_pm_match(EngineData(theEnv)->GlobalLHSBinds,pattern)->markers;
+     }
+  }
+
+/***************************************************
+  NAME         : GetObjectValueGeneral
+  DESCRIPTION  : Access function for getting
+                 pattern variable values within the
+                 object pattern and join networks
+  INPUTS       : 1) The result data object buffer
+                 2) The instance to access
+                 3) The list of multifield markers
+                    for the pattern
+                 4) Data for variable reference
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Data object is filled with the
+                 values of the pattern variable
+  NOTES        : None
+ ***************************************************/
+static void GetObjectValueGeneral(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  Instance *theInstance,
+  struct multifieldMarker *theMarks,
+  struct ObjectMatchVar1 *matchVar)
+  {
+   size_t field;
+   size_t extent;
+   InstanceSlot **insSlot,*basisSlot;
+
+   if (matchVar->objectAddress)
+     {
+      returnValue->value = theInstance;
+      return;
+     }
+   if (matchVar->whichSlot == ISA_ID)
+     {
+      returnValue->value = GetDefclassNamePointer(theInstance->cls);
+      return;
+     }
+   if (matchVar->whichSlot == NAME_ID)
+     {
+      returnValue->value = theInstance->name;
+      return;
+     }
+   insSlot =
+     &theInstance->slotAddresses
+     [theInstance->cls->slotNameMap[matchVar->whichSlot] - 1];
+
+   /* =========================================
+      We need to reference the basis slots if
+      the slot of this object has changed while
+      the RHS was executing
+
+      However, if the reference is being done
+      by the LHS of a rule (as a consequence of
+      an RHS action), give the pattern matcher
+      the real value of the slot
+      ========================================= */
+   if ((theInstance->basisSlots != NULL) &&
+       (! EngineData(theEnv)->JoinOperationInProgress))
+     {
+      basisSlot = theInstance->basisSlots + (insSlot - theInstance->slotAddresses);
+      if (basisSlot->value != NULL)
+        insSlot = &basisSlot;
+     }
+
+   /* ==================================================
+      If we know we are accessing the entire slot,
+      the don't bother with searching multifield markers
+      or calculating offsets
+      ================================================== */
+   if (matchVar->allFields)
+     {
+      returnValue->value = (*insSlot)->value;
+      if (returnValue->header->type == MULTIFIELD_TYPE)
+        {
+         returnValue->begin = 0;
+         returnValue->range = (*insSlot)->multifieldValue->length;
+        }
+      return;
+     }
+
+   /* =============================================
+      Access a general field in a slot pattern with
+      two or more multifield variables
+      ============================================= */
+      
+   extent = SIZE_MAX;
+   field = CalculateSlotField(theMarks,*insSlot,matchVar->whichField,&extent);
+   if (extent == SIZE_MAX)
+     {
+      if ((*insSlot)->desc->multiple)
+        { returnValue->value = (*insSlot)->multifieldValue->contents[field-1].value; }
+      else
+        { returnValue->value = (*insSlot)->value; }
+     }
+   else
+     {
+      returnValue->value = (*insSlot)->value;
+      returnValue->begin = field - 1;
+      returnValue->range = extent;
+     }
+  }
+
+/***************************************************
+  NAME         : GetObjectValueSimple
+  DESCRIPTION  : Access function for getting
+                 pattern variable values within the
+                 object pattern and join networks
+  INPUTS       : 1) The result data object buffer
+                 2) The instance to access
+                 3) Data for variable reference
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Data object is filled with the
+                 values of the pattern variable
+  NOTES        : None
+ ***************************************************/
+static void GetObjectValueSimple(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  Instance *theInstance,
+  struct ObjectMatchVar2 *matchVar)
+  {
+   InstanceSlot **insSlot,*basisSlot;
+   Multifield *segmentPtr;
+   CLIPSValue *fieldPtr;
+
+   insSlot =
+     &theInstance->slotAddresses
+     [theInstance->cls->slotNameMap[matchVar->whichSlot] - 1];
+
+   /* =========================================
+      We need to reference the basis slots if
+      the slot of this object has changed while
+      the RHS was executing
+
+      However, if the reference is being done
+      by the LHS of a rule (as a consequence of
+      an RHS action), give the pattern matcher
+      the real value of the slot
+      ========================================= */
+   if ((theInstance->basisSlots != NULL) &&
+       (! EngineData(theEnv)->JoinOperationInProgress))
+     {
+      basisSlot = theInstance->basisSlots + (insSlot - theInstance->slotAddresses);
+      if (basisSlot->value != NULL)
+        insSlot = &basisSlot;
+     }
+
+   if ((*insSlot)->desc->multiple)
+     {
+      segmentPtr = (*insSlot)->multifieldValue;
+      if (matchVar->fromBeginning)
+        {
+         if (matchVar->fromEnd)
+           {
+            returnValue->value = segmentPtr;
+            returnValue->begin = matchVar->beginningOffset;
+            returnValue->range = segmentPtr->length - (matchVar->endOffset + matchVar->beginningOffset);
+           }
+         else
+           {
+            fieldPtr = &segmentPtr->contents[matchVar->beginningOffset];
+            returnValue->value = fieldPtr->value;
+           }
+        }
+      else
+        {
+         fieldPtr = &segmentPtr->contents[segmentPtr->length -
+                                           (matchVar->endOffset + 1)];
+         returnValue->value = fieldPtr->value;
+        }
+     }
+   else
+     {
+      returnValue->value = (*insSlot)->value;
+     }
+  }
+
+/****************************************************
+  NAME         : CalculateSlotField
+  DESCRIPTION  : Determines the actual index into the
+                 an object slot for a given pattern
+                 variable
+  INPUTS       : 1) The list of markers to examine
+                 2) The instance slot (can be NULL)
+                 3) The pattern index of the variable
+                 4) A buffer in which to store the
+                    extent of the pattern variable
+                    (-1 for single-field vars)
+  RETURNS      : The actual index
+  SIDE EFFECTS : None
+  NOTES        : None
+ ****************************************************/
+static size_t CalculateSlotField(
+  struct multifieldMarker *theMarkers,
+  InstanceSlot *theSlot,
+  size_t theIndex,
+  size_t *extent)
+  {
+   size_t actualIndex;
+   void *theSlotName;
+
+   actualIndex = theIndex;
+   *extent = SIZE_MAX;
+      
+   if (theSlot == NULL)
+     { return actualIndex; }
+     
+   theSlotName = theSlot->desc->slotName->name;
+   while (theMarkers != NULL)
+     {
+      if (theMarkers->where.whichSlot == theSlotName)
+        break;
+      theMarkers = theMarkers->next;
+     }
+   
+   while ((theMarkers != NULL) ? (theMarkers->where.whichSlot == theSlotName) : false)
+     {
+      if (theMarkers->whichField == theIndex)
+        {
+         *extent = theMarkers->range;
+
+         return actualIndex;
+        }
+
+      if (theMarkers->whichField > theIndex)
+        { return actualIndex; }
+        
+      actualIndex = actualIndex + theMarkers->range - 1;
+      theMarkers = theMarkers->next;
+     }
+      
+   return actualIndex;
+  }
+
+/****************************************************
+  NAME         : GetInsMultiSlotField
+  DESCRIPTION  : Gets the values of simple single
+                 field references in multifield
+                 slots for Rete comparisons
+  INPUTS       : 1) A multifield field structure
+                    to store the type and value in
+                 2) The instance
+                 3) The id of the slot
+                 4) A flag indicating if offset is
+                    from beginning or end of
+                    multifield slot
+                 5) The offset
+  RETURNS      : The multifield field
+  SIDE EFFECTS : None
+  NOTES        : Should only be used to access
+                 single-field reference in multifield
+                 slots for pattern and join network
+                 comparisons
+ ****************************************************/
+static void GetInsMultiSlotField(
+  CLIPSValue *theField,
+  Instance *theInstance,
+  unsigned theSlotID,
+  unsigned fromBeginning,
+  unsigned offset)
+  {
+   InstanceSlot * insSlot;
+   Multifield *theSegment;
+   CLIPSValue *tmpField;
+
+   insSlot = theInstance->slotAddresses
+               [theInstance->cls->slotNameMap[theSlotID] - 1];
+
+   /* Bug fix for 6.05 */
+
+   if (insSlot->desc->multiple)
+     {
+      theSegment = insSlot->multifieldValue;
+      if (fromBeginning)
+        tmpField = &theSegment->contents[offset];
+      else
+        tmpField = &theSegment->contents[theSegment->length - offset - 1];
+      theField->value = tmpField->value;
+     }
+   else
+     {
+      theField->value = insSlot->value;
+     }
+  }
+
+#endif
+
diff --git a/clips/objrtfnx.h b/clips/objrtfnx.h
new file mode 100755
index 000000000..928d98c81
--- /dev/null
+++ b/clips/objrtfnx.h
@@ -0,0 +1,222 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_objrtfnx
+
+#pragma once
+
+#define _H_objrtfnx
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+
+#include "conscomp.h"
+#include "evaluatn.h"
+#include "match.h"
+#include "object.h"
+#include "objrtmch.h"
+
+struct ObjectMatchVar1
+  {
+   unsigned short whichSlot;
+   unsigned short whichPattern;
+   unsigned short whichField;
+   unsigned objectAddress : 1;
+   unsigned allFields     : 1;
+   unsigned lhs           : 1;
+   unsigned rhs           : 1;
+  };
+
+struct ObjectMatchVar2
+  {
+   unsigned short whichSlot;
+   unsigned short whichPattern;
+   unsigned short beginningOffset;
+   unsigned short endOffset;
+   unsigned fromBeginning   : 1;
+   unsigned fromEnd         : 1;
+   unsigned lhs           : 1;
+   unsigned rhs           : 1;
+  };
+
+struct ObjectMatchLength
+  {
+   unsigned minLength : 15;
+   unsigned exactly   : 1;
+  };
+
+struct ObjectCmpPNConstant
+  {
+   unsigned short offset;
+   unsigned pass          : 1;
+   unsigned fail          : 1;
+   unsigned general       : 1;
+   unsigned fromBeginning : 1;
+  };
+
+struct ObjectCmpPNSingleSlotVars1
+  {
+   unsigned short firstSlot;
+   unsigned short secondSlot;
+   unsigned pass       : 1;
+   unsigned fail       : 1;
+  };
+
+struct ObjectCmpPNSingleSlotVars2
+  {
+   unsigned short firstSlot;
+   unsigned short secondSlot;
+   unsigned short offset;
+   unsigned pass          : 1;
+   unsigned fail          : 1;
+   unsigned fromBeginning : 1;
+  };
+
+struct ObjectCmpPNSingleSlotVars3
+  {
+   unsigned short firstSlot;
+   unsigned short secondSlot;
+   unsigned short firstOffset;
+   unsigned short secondOffset;
+   unsigned pass                : 1;
+   unsigned fail                : 1;
+   unsigned firstFromBeginning  : 1;
+   unsigned secondFromBeginning : 1;
+  };
+
+struct ObjectCmpJoinSingleSlotVars1
+  {
+   unsigned short firstSlot;
+   unsigned short secondSlot;
+   unsigned short firstPattern;
+   unsigned short secondPattern;
+   unsigned pass          : 1;
+   unsigned fail          : 1;
+   unsigned int firstPatternLHS : 1;
+   unsigned int firstPatternRHS : 1;
+   unsigned int secondPatternLHS : 1;
+   unsigned int secondPatternRHS : 1;
+  };
+
+struct ObjectCmpJoinSingleSlotVars2
+  {
+   unsigned short firstSlot;
+   unsigned short secondSlot;
+   unsigned short firstPattern;
+   unsigned short secondPattern;
+   unsigned short offset;
+   unsigned pass          : 1;
+   unsigned fromBeginning : 1;
+   unsigned fail          : 1;
+   unsigned int firstPatternLHS : 1;
+   unsigned int firstPatternRHS : 1;
+   unsigned int secondPatternLHS : 1;
+   unsigned int secondPatternRHS : 1;
+  };
+
+struct ObjectCmpJoinSingleSlotVars3
+  {
+   unsigned short firstSlot;
+   unsigned short secondSlot;
+   unsigned short firstPattern;
+   unsigned short secondPattern;
+   unsigned short firstOffset;
+   unsigned short secondOffset;
+   unsigned pass                : 1;
+   unsigned fail                : 1;
+   unsigned firstFromBeginning  : 1;
+   unsigned secondFromBeginning : 1;
+   unsigned int firstPatternLHS : 1;
+   unsigned int firstPatternRHS : 1;
+   unsigned int secondPatternLHS : 1;
+   unsigned int secondPatternRHS : 1;
+  };
+
+#define OBJECT_RETE_DATA 35
+
+struct objectReteData
+  {
+   Instance *CurrentPatternObject;
+   InstanceSlot *CurrentPatternObjectSlot;
+   size_t CurrentObjectSlotLength;
+   struct multifieldMarker *CurrentPatternObjectMarks;
+   struct entityRecord ObjectGVInfo1;
+   struct entityRecord ObjectGVInfo2;
+   struct entityRecord ObjectGVPNInfo1;
+   struct entityRecord ObjectGVPNInfo2;
+   struct entityRecord ObjectCmpConstantInfo;
+   struct entityRecord LengthTestInfo;
+   struct entityRecord PNSimpleCompareInfo1;
+   struct entityRecord PNSimpleCompareInfo2;
+   struct entityRecord PNSimpleCompareInfo3;
+   struct entityRecord JNSimpleCompareInfo1;
+   struct entityRecord JNSimpleCompareInfo2;
+   struct entityRecord JNSimpleCompareInfo3;
+   OBJECT_MATCH_ACTION *ObjectMatchActionQueue;
+   OBJECT_PATTERN_NODE *ObjectPatternNetworkPointer;
+   OBJECT_ALPHA_NODE *ObjectPatternNetworkTerminalPointer;
+   bool DelayObjectPatternMatching;
+   unsigned long long CurrentObjectMatchTimeTag;
+   unsigned long long UseEntityTimeTag;
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM && CONSTRUCT_COMPILER && (! RUN_TIME)
+   struct CodeGeneratorItem *ObjectPatternCodeItem;
+#endif
+  };
+
+#define ObjectReteData(theEnv) ((struct objectReteData *) GetEnvironmentData(theEnv,OBJECT_RETE_DATA))
+
+   void                    InstallObjectPrimitives(Environment *);
+   bool                    ObjectCmpConstantFunction(Environment *,void *,UDFValue *);
+
+#endif /* DEFRULE_CONSTRUCT && OBJECT_SYSTEM */
+
+#endif /* _H_objrtfnx */
+
+
+
+
+
+
diff --git a/clips/objrtgen.c b/clips/objrtgen.c
new file mode 100755
index 000000000..9b19bb9e2
--- /dev/null
+++ b/clips/objrtgen.c
@@ -0,0 +1,695 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*    INFERENCE ENGINE OBJECT PARSING ROUTINES MODULE  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: RETE Network Parsing Interface for Objects       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added support for hashed memories and other    */
+/*            join network changes.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM && (! RUN_TIME) && (! BLOAD_ONLY)
+
+#include <stdio.h>
+
+#include "classfun.h"
+#include "envrnmnt.h"
+#include "objrtfnx.h"
+
+#include "objrtgen.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    GenObjectGetVar(Environment *,bool,Expression *,struct lhsParseNode *,int);
+   static bool                    IsSimpleSlotVariable(struct lhsParseNode *);
+   static Expression             *GenerateSlotComparisonTest(Environment *,bool,bool,struct lhsParseNode *,struct lhsParseNode *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/**********************************************
+  Build functions used by AddPatternParser() to
+  provide object access to the join nertwork
+ **********************************************/
+void ReplaceGetJNObjectValue(
+  Environment *theEnv,
+  Expression *theItem,
+  struct lhsParseNode *theNode,
+  int side)
+  {
+   GenObjectGetVar(theEnv,true,theItem,theNode,side);
+  }
+
+Expression *GenGetJNObjectValue(
+  Environment *theEnv,
+  struct lhsParseNode *theNode,
+  int side)
+  {
+   Expression *theItem;
+
+   theItem = GenConstant(theEnv,0,NULL);
+   GenObjectGetVar(theEnv,true,theItem,theNode,side);
+   return(theItem);
+  }
+
+Expression *ObjectJNVariableComparison(
+  Environment *theEnv,
+  struct lhsParseNode *selfNode,
+  struct lhsParseNode *referringNode,
+  bool isNand)
+  {
+   return(GenerateSlotComparisonTest(theEnv,true,isNand,selfNode,referringNode));
+  }
+
+/**********************************************
+  Build functions used by AddPatternParser() to
+  provide object access to the pattern network
+ **********************************************/
+Expression *GenObjectPNConstantCompare(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   struct ObjectCmpPNConstant hack;
+   Expression *theExp;
+   ParseNodeType tmpType;
+
+   /* ===============================================================
+      If the value of a single field slot (or relation name) is being
+      compared against a constant, then use specialized routines for
+      doing the comparison.
+
+      If a constant comparison is being done within a multifield slot
+      and the constant's position has no multifields to the left or
+      no multifields to the right, then use the same routine used for
+      the single field slot case, but include the offset from either
+      the beginning or end of the slot.
+
+      Otherwise, use a general eq/neq test.
+      =============================================================== */
+   ClearBitString(&hack,sizeof(struct ObjectCmpPNConstant));
+   if (theNode->negated)
+     hack.fail = 1;
+   else
+     hack.pass = 1;
+   if (((theNode->withinMultifieldSlot == false) ||
+        (theNode->multiFieldsAfter == 0) ||
+        (theNode->multiFieldsBefore == 0)) &&
+       (theNode->slotNumber != ISA_ID) && (theNode->slotNumber != NAME_ID))
+     {
+      if (theNode->withinMultifieldSlot == false)
+        hack.fromBeginning = true;
+      else if (theNode->multiFieldsBefore == 0)
+        {
+         hack.fromBeginning = true;
+         hack.offset = theNode->singleFieldsBefore;
+        }
+      else
+        hack.offset = theNode->singleFieldsAfter;
+      theExp = GenConstant(theEnv,OBJ_PN_CONSTANT,AddBitMap(theEnv,&hack,
+                                        sizeof(struct ObjectCmpPNConstant)));
+      theExp->argList = GenConstant(theEnv,NodeTypeToType(theNode),theNode->value);
+     }
+   else
+     {
+      hack.general = 1;
+      theExp = GenConstant(theEnv,OBJ_PN_CONSTANT,AddBitMap(theEnv,&hack,
+                                        sizeof(struct ObjectCmpPNConstant)));
+      theExp->argList = GenConstant(theEnv,0,NULL);
+      tmpType = theNode->pnType;
+      theNode->pnType = SF_VARIABLE_NODE;
+      GenObjectGetVar(theEnv,false,theExp->argList,theNode,-1);
+      theNode->pnType = tmpType;
+      theExp->argList->nextArg = GenConstant(theEnv,NodeTypeToType(theNode),theNode->value);
+     }
+   return(theExp);
+  }
+
+void ReplaceGetPNObjectValue(
+  Environment *theEnv,
+  Expression *theItem,
+  struct lhsParseNode *theNode)
+  {
+   GenObjectGetVar(theEnv,false,theItem,theNode,-1);
+  }
+
+Expression *GenGetPNObjectValue(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   Expression *theItem;
+
+   theItem = GenConstant(theEnv,0,NULL);
+   GenObjectGetVar(theEnv,false,theItem,theNode,-1);
+   return(theItem);
+  }
+
+Expression *ObjectPNVariableComparison(
+  Environment *theEnv,
+  struct lhsParseNode *selfNode,
+  struct lhsParseNode *referringNode)
+  {
+   return(GenerateSlotComparisonTest(theEnv,false,false,selfNode,referringNode));
+  }
+
+/****************************************************
+  NAME         : GenObjectLengthTest
+  DESCRIPTION  : Generates a test on the cardinality
+                 of a slot matching an object pattern
+  INPUTS       : The first lhsParseNode for a slot
+                 in an object pattern
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The lhsParseNode network test is
+                 modified to include the length test
+  NOTES        : None
+ ****************************************************/
+void GenObjectLengthTest(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   struct ObjectMatchLength hack;
+   Expression *theTest;
+
+   if ((theNode->singleFieldsAfter == 0) &&
+       (theNode->pnType != SF_VARIABLE_NODE) &&
+       (theNode->pnType != SF_WILDCARD_NODE))
+     return;
+
+   ClearBitString(&hack,sizeof(struct ObjectMatchLength));
+
+   if ((theNode->pnType != MF_VARIABLE_NODE) &&
+       (theNode->pnType != MF_WILDCARD_NODE) &&
+       (theNode->multiFieldsAfter == 0))
+     hack.exactly = 1;
+   else
+     hack.exactly = 0;
+
+   if ((theNode->pnType == SF_VARIABLE_NODE) || (theNode->pnType == SF_WILDCARD_NODE))
+     hack.minLength = 1 + theNode->singleFieldsAfter;
+   else
+     hack.minLength = theNode->singleFieldsAfter;
+
+   theTest = GenConstant(theEnv,OBJ_SLOT_LENGTH,AddBitMap(theEnv,&hack,
+                                         sizeof(struct ObjectMatchLength)));
+
+   if (theNode->constantSelector != NULL)
+     { theNode->constantSelector->nextArg = CopyExpression(theEnv,theTest); }
+
+   theNode->networkTest = CombineExpressions(theEnv,theTest,theNode->networkTest);
+  }
+
+/****************************************************
+  NAME         : GenObjectZeroLengthTest
+  DESCRIPTION  : Generates a test on the cardinality
+                 of a slot matching an object pattern
+  INPUTS       : The first lhsParseNode for a slot
+                 in an object pattern
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The lhsParseNode network test is
+                 modified to include the length test
+  NOTES        : None
+ ****************************************************/
+void GenObjectZeroLengthTest(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   struct ObjectMatchLength hack;
+   Expression *theTest;
+
+   ClearBitString(&hack,sizeof(struct ObjectMatchLength));
+   hack.exactly = 1;
+   hack.minLength = 0;
+   theTest = GenConstant(theEnv,OBJ_SLOT_LENGTH,
+                         AddBitMap(theEnv,&hack,sizeof(struct ObjectMatchLength)));
+   theNode->networkTest = CombineExpressions(theEnv,theTest,theNode->networkTest);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : GenObjectGetVar
+  DESCRIPTION  : Generates the expressions necessary
+                 to access object pattern variables
+  INPUTS       : 1) An integer code indicating if
+                    this is a join network reference
+                    or a pattern network reference
+                 2) The expression for which to set
+                    the type and value
+                 3) The lhsParseNode for the
+                    variable reference
+                 4) For a join reference, the side from
+                    which the variable must be retrieved.
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The value is a packed long holding
+                 pattern index, slot number,
+                 field index, etc.
+  NOTES        : None
+ ***************************************************/
+static void GenObjectGetVar(
+  Environment *theEnv,
+  bool joinReference,
+  Expression *theItem,
+  struct lhsParseNode *theNode,
+  int side)
+  {
+   struct ObjectMatchVar1 hack1;
+   struct ObjectMatchVar2 hack2;
+
+   ClearBitString(&hack1,sizeof(struct ObjectMatchVar1));
+   ClearBitString(&hack2,sizeof(struct ObjectMatchVar2));
+
+   if (joinReference)
+     {
+      if (side == LHS)
+        {
+         hack1.lhs = 1;
+         hack2.lhs = 1;
+         hack1.whichPattern = theNode->joinDepth;
+         hack2.whichPattern = theNode->joinDepth;
+        }
+      else if (side == RHS)
+        {
+         hack1.rhs = 1;
+         hack2.rhs = 1;
+         hack1.whichPattern = 0;
+         hack2.whichPattern = 0;
+        }
+      else if (side == NESTED_RHS)
+        {
+         hack1.rhs = 1;
+         hack2.rhs = 1;
+         hack1.whichPattern = theNode->joinDepth;
+         hack2.whichPattern = theNode->joinDepth;
+        }
+      else
+        {
+         hack1.whichPattern = theNode->joinDepth;
+         hack2.whichPattern = theNode->joinDepth;
+        }
+     }
+
+   /* ========================
+      Access an object address
+      ======================== */
+   if (theNode->slotNumber == UNSPECIFIED_SLOT)
+     {
+      hack1.objectAddress = 1;
+      if (joinReference)
+        { theItem->type = OBJ_GET_SLOT_JNVAR1; }
+      else
+        { theItem->type = OBJ_GET_SLOT_PNVAR1; }
+      theItem->value = AddBitMap(theEnv,&hack1,sizeof(struct ObjectMatchVar1));
+      return;
+     }
+
+   /* ======================================
+      Access the entire contents of the slot
+      ====================================== */
+   if ((theNode->singleFieldsBefore == 0) &&
+       (theNode->singleFieldsAfter == 0) &&
+       (theNode->multiFieldsBefore == 0) &&
+       (theNode->multiFieldsAfter == 0) &&
+       ((theNode->withinMultifieldSlot == false) ||
+        (theNode->pnType == MF_VARIABLE_NODE) ||
+        (theNode->pnType == MF_WILDCARD_NODE)))
+     {
+      hack1.allFields = 1;
+      hack1.whichSlot = theNode->slotNumber;
+      theItem->type = (joinReference ? OBJ_GET_SLOT_JNVAR1 : OBJ_GET_SLOT_PNVAR1);
+      theItem->value = AddBitMap(theEnv,&hack1,sizeof(struct ObjectMatchVar1));
+      return;
+     }
+
+   /* =============================================================
+      Access a particular field(s) in a multifield slot pattern
+      containing at most one multifield variable and at least
+      one (or two if no multifield variables) single-field variable
+      ============================================================= */
+   if (((theNode->pnType == SF_WILDCARD_NODE) || (theNode->pnType == SF_VARIABLE_NODE) || ConstantNode(theNode)) &&
+       ((theNode->multiFieldsBefore == 0) || (theNode->multiFieldsAfter == 0)))
+     {
+      hack2.whichSlot = theNode->slotNumber;
+      if (theNode->multiFieldsBefore == 0)
+        {
+         hack2.fromBeginning = 1;
+         hack2.beginningOffset = theNode->singleFieldsBefore;
+        }
+      else
+        {
+         hack2.fromEnd = 1;
+         hack2.endOffset = theNode->singleFieldsAfter;
+        }
+      theItem->type = (joinReference ? OBJ_GET_SLOT_JNVAR2 : OBJ_GET_SLOT_PNVAR2);
+      theItem->value = AddBitMap(theEnv,&hack2,sizeof(struct ObjectMatchVar2));
+      return;
+     }
+
+   if (((theNode->pnType == MF_WILDCARD_NODE) || (theNode->pnType == MF_VARIABLE_NODE) || ConstantNode(theNode)) &&
+       (theNode->multiFieldsBefore == 0) &&
+       (theNode->multiFieldsAfter == 0))
+     {
+      hack2.whichSlot = theNode->slotNumber;
+      hack2.fromBeginning = 1;
+      hack2.fromEnd = 1;
+      hack2.beginningOffset = theNode->singleFieldsBefore;
+      hack2.endOffset = theNode->singleFieldsAfter;
+      theItem->type = (joinReference ? OBJ_GET_SLOT_JNVAR2 : OBJ_GET_SLOT_PNVAR2);
+      theItem->value = AddBitMap(theEnv,&hack2,sizeof(struct ObjectMatchVar2));
+      return;
+     }
+
+   /* ==================================================
+      General slot field access using multifield markers
+      ================================================== */
+   hack1.whichSlot = theNode->slotNumber;
+   hack1.whichField = theNode->index;
+   theItem->type = (joinReference ? OBJ_GET_SLOT_JNVAR1 : OBJ_GET_SLOT_PNVAR1);
+   theItem->value = AddBitMap(theEnv,&hack1,sizeof(struct ObjectMatchVar1));
+  }
+
+/****************************************************************
+  NAME         : IsSimpleSlotVariable
+  DESCRIPTION  : Determines if a slot pattern variable
+                 references a single-field slot or a single-field
+                 in a multifield slot which does not require
+                 use of multifield markers
+                 (Object addresses are not simple variables)
+  INPUTS       : The intermediate parse node
+  RETURNS      : True if the variable is simple,
+                 false otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ****************************************************************/
+static bool IsSimpleSlotVariable(
+  struct lhsParseNode *node)
+  {
+   if ((node->pnType == MF_WILDCARD_NODE) || (node->pnType == MF_VARIABLE_NODE))
+     return false;
+   if ((node->slotNumber == UNSPECIFIED_SLOT) ||
+       (node->slotNumber == ISA_ID) ||
+       (node->slotNumber == NAME_ID))
+     return false;
+   if (node->withinMultifieldSlot == false)
+     return true;
+   if (node->multifieldSlot == true)
+     return false;
+   if ((node->multiFieldsBefore == 0) || (node->multiFieldsAfter == 0))
+     return true;
+   return false;
+  }
+
+/***************************************************************
+  NAME         : GenerateSlotComparisonTest
+  DESCRIPTION  : Generates pattern and join network
+                 expressions for comparing object
+                 pattern variables
+  INPUTS       : 1) A flag indicating if this is a
+                    pattern or join network test
+                 2) For a join test, a flag indicating
+                    if it is a nand join
+                 3) The intermediate parse node
+                    for the first variable
+                 4) The intermediate parse node
+                    for the second variable
+  RETURNS      : An expression for comparing the
+                 variables
+  SIDE EFFECTS : Expression and bitmaps generated
+  NOTES        : The following tests are generated
+                 for the following scenarios:
+
+                 SF slot w/ SF slot: PN_1 or JN_1
+                 Example: (foo ?x) with (bar ?xy)
+
+                 SF slot w/ SF reference in MF slot: PN_2 or JN_2
+                 Example: (foo ?x) (bar ? ?x ? ?)
+
+                 SF reference w/ SF reference: PN_3 or JN_3
+                 Example: (foo ? ?x ?) and (bar ? ? ? ?x)
+
+                 All other cases: EQ/NEQ general test
+                 Example: (foo $? ?x $?) and (bar ?x)
+ ***************************************************************/
+static Expression *GenerateSlotComparisonTest(
+  Environment *theEnv,
+  bool joinTest,
+  bool isNand,
+  struct lhsParseNode *selfNode,
+  struct lhsParseNode *referringNode)
+  {
+   Expression *theExp;
+   struct ObjectCmpPNSingleSlotVars1 phack1;
+   struct ObjectCmpPNSingleSlotVars2 phack2;
+   struct ObjectCmpPNSingleSlotVars3 phack3;
+   struct ObjectCmpJoinSingleSlotVars1 jhack1;
+   struct ObjectCmpJoinSingleSlotVars2 jhack2;
+   struct ObjectCmpJoinSingleSlotVars3 jhack3;
+   struct lhsParseNode *firstNode;
+
+   if (isNand)
+     { firstNode = referringNode; }
+   else
+     { firstNode = selfNode; }
+
+   /* =========================================================
+      If we are comparing two single-field slot variables that
+      don't require multifield markers for lookup, use
+      a quick comparison.  Otherwise, use a general eq/neq with
+      the pattern variable access routines
+      ========================================================= */
+   if (IsSimpleSlotVariable(firstNode) && IsSimpleSlotVariable(referringNode))
+     {
+      /* ==============================
+         Compare two single-field slots
+         ============================== */
+      if ((firstNode->withinMultifieldSlot == false) &&
+          (referringNode->withinMultifieldSlot == false))
+        {
+         ClearBitString(&phack1,sizeof(struct ObjectCmpPNSingleSlotVars1));
+         ClearBitString(&jhack1,sizeof(struct ObjectCmpJoinSingleSlotVars1));
+         if (selfNode->negated)
+           phack1.fail = jhack1.fail = 1;
+         else
+           phack1.pass = jhack1.pass = 1;
+
+         phack1.firstSlot = jhack1.firstSlot = firstNode->slotNumber;
+         phack1.secondSlot = jhack1.secondSlot = referringNode->slotNumber;
+         if (joinTest)
+           {
+            if (isNand)
+              { jhack1.firstPattern = referringNode->joinDepth; }
+            else
+              { jhack1.firstPattern = 0; }
+
+            jhack1.firstPatternRHS = true;
+            jhack1.secondPatternLHS = true;
+
+            jhack1.secondPattern = referringNode->joinDepth;
+
+            theExp = GenConstant(theEnv,OBJ_JN_CMP1,AddBitMap(theEnv,&jhack1,
+                                           sizeof(struct ObjectCmpJoinSingleSlotVars1)));
+           }
+         else
+           theExp = GenConstant(theEnv,OBJ_PN_CMP1,AddBitMap(theEnv,&phack1,
+                                           sizeof(struct ObjectCmpPNSingleSlotVars1)));
+        }
+      /* ============================================
+         Compare a single-field slot with a
+         single-field in a multifield slot (make sure
+         the multifield slot reference is first
+         ============================================ */
+      else if ((firstNode->withinMultifieldSlot == false) ||
+               (referringNode->withinMultifieldSlot == false))
+        {
+         ClearBitString(&phack2,sizeof(struct ObjectCmpPNSingleSlotVars2));
+         ClearBitString(&jhack2,sizeof(struct ObjectCmpJoinSingleSlotVars2));
+
+         if (selfNode->negated)
+           phack2.fail = jhack2.fail = 1;
+         else
+           phack2.pass = jhack2.pass = 1;
+
+         if (firstNode->withinMultifieldSlot == true)
+           {
+            phack2.firstSlot = jhack2.firstSlot = firstNode->slotNumber;
+            phack2.secondSlot = jhack2.secondSlot = referringNode->slotNumber;
+            if (joinTest)
+              {
+               if (isNand)
+                 { jhack2.firstPattern = referringNode->joinDepth; }
+               else
+                 { jhack2.firstPattern = 0; }
+
+               jhack2.firstPatternRHS = true;
+               jhack2.secondPatternLHS = true;
+               jhack2.secondPattern = referringNode->joinDepth;
+              }
+
+            if (firstNode->multiFieldsBefore == 0)
+              {
+               phack2.fromBeginning = jhack2.fromBeginning = 1;
+               phack2.offset = jhack2.offset = firstNode->singleFieldsBefore;
+              }
+            else
+              phack2.offset = jhack2.offset = firstNode->singleFieldsAfter;
+           }
+         else
+           {
+            phack2.firstSlot = jhack2.firstSlot = referringNode->slotNumber;
+            phack2.secondSlot = jhack2.secondSlot = firstNode->slotNumber;
+            if (joinTest)
+              {
+               if (isNand)
+                 { jhack2.secondPattern = firstNode->joinDepth; }
+               else
+                 { jhack2.secondPattern = 0; }
+
+               jhack2.secondPatternRHS = true;
+               jhack2.firstPatternLHS = true;
+
+               jhack2.firstPattern = referringNode->joinDepth;
+              }
+
+            if (referringNode->multiFieldsBefore == 0)
+              {
+               phack2.fromBeginning = jhack2.fromBeginning = 1;
+               phack2.offset = jhack2.offset = referringNode->singleFieldsBefore;
+              }
+            else
+              phack2.offset = jhack2.offset = referringNode->singleFieldsAfter;
+           }
+         if (joinTest)
+           theExp = GenConstant(theEnv,OBJ_JN_CMP2,AddBitMap(theEnv,&jhack2,
+                                           sizeof(struct ObjectCmpJoinSingleSlotVars2)));
+         else
+           theExp = GenConstant(theEnv,OBJ_PN_CMP2,AddBitMap(theEnv,&phack2,
+                                           sizeof(struct ObjectCmpPNSingleSlotVars2)));
+        }
+
+      /* ===================================
+         Compare two single-field references
+         within multifield slots
+         =================================== */
+      else
+        {
+         ClearBitString(&phack3,sizeof(struct ObjectCmpPNSingleSlotVars3));
+         ClearBitString(&jhack3,sizeof(struct ObjectCmpJoinSingleSlotVars3));
+
+         if (selfNode->negated)
+           phack3.fail = jhack3.fail = 1;
+         else
+           phack3.pass = jhack3.pass = 1;
+
+         phack3.firstSlot = jhack3.firstSlot = firstNode->slotNumber;
+         phack3.secondSlot = jhack3.secondSlot = referringNode->slotNumber;
+
+         if (firstNode->multiFieldsBefore == 0)
+           {
+            phack3.firstFromBeginning = jhack3.firstFromBeginning = 1;
+            phack3.firstOffset = jhack3.firstOffset = firstNode->singleFieldsBefore;
+           }
+         else
+           phack3.firstOffset = jhack3.firstOffset = firstNode->singleFieldsAfter;
+
+         if (referringNode->multiFieldsBefore == 0)
+           {
+            phack3.secondFromBeginning = jhack3.secondFromBeginning = 1;
+            phack3.secondOffset = jhack3.secondOffset = referringNode->singleFieldsBefore;
+           }
+         else
+           phack3.secondOffset = jhack3.secondOffset = referringNode->singleFieldsAfter;
+
+         if (joinTest)
+           {
+            if (isNand)
+              { jhack3.firstPattern = referringNode->joinDepth; }
+            else
+              { jhack3.firstPattern = 0; }
+
+            jhack3.firstPatternRHS = true;
+            jhack3.secondPatternLHS = true;
+            jhack3.secondPattern = referringNode->joinDepth;
+
+            theExp = GenConstant(theEnv,OBJ_JN_CMP3,AddBitMap(theEnv,&jhack3,
+                                         sizeof(struct ObjectCmpJoinSingleSlotVars3)));
+           }
+         else
+           theExp = GenConstant(theEnv,OBJ_PN_CMP3,AddBitMap(theEnv,&phack3,
+                                           sizeof(struct ObjectCmpPNSingleSlotVars3)));
+        }
+     }
+
+   /* ==================================================
+      General comparison for multifield slot references,
+      references which require multifield markers, and
+      object addresses
+      ================================================== */
+   else
+     {
+      theExp = GenConstant(theEnv,FCALL,selfNode->negated ? ExpressionData(theEnv)->PTR_NEQ : ExpressionData(theEnv)->PTR_EQ);
+      theExp->argList = GenConstant(theEnv,0,NULL);
+
+      if (isNand)
+        { GenObjectGetVar(theEnv,joinTest,theExp->argList,selfNode,NESTED_RHS); }
+      else
+        { GenObjectGetVar(theEnv,joinTest,theExp->argList,selfNode,RHS); }
+
+      theExp->argList->nextArg = GenConstant(theEnv,0,NULL);
+
+      GenObjectGetVar(theEnv,joinTest,theExp->argList->nextArg,referringNode,LHS);
+     }
+   return(theExp);
+  }
+
+#endif
+
+/***************************************************
+  NAME         :
+  DESCRIPTION  :
+  INPUTS       :
+  RETURNS      :
+  SIDE EFFECTS :
+  NOTES        :
+ ***************************************************/
diff --git a/clips/objrtgen.h b/clips/objrtgen.h
new file mode 100755
index 000000000..fd9e835ef
--- /dev/null
+++ b/clips/objrtgen.h
@@ -0,0 +1,63 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*      6.30: Added support for hashed memories and other    */
+/*            join network changes.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_objrtgen
+
+#pragma once
+
+#define _H_objrtgen
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM && (! RUN_TIME) && (! BLOAD_ONLY)
+
+#include "expressn.h"
+#include "reorder.h"
+
+   void             ReplaceGetJNObjectValue(Environment *,Expression *,struct lhsParseNode *,int);
+   Expression      *GenGetJNObjectValue(Environment *,struct lhsParseNode *,int);
+   Expression      *ObjectJNVariableComparison(Environment *,struct lhsParseNode *,struct lhsParseNode *,bool);
+   Expression      *GenObjectPNConstantCompare(Environment *,struct lhsParseNode *);
+   void             ReplaceGetPNObjectValue(Environment *,Expression *,struct lhsParseNode *);
+   Expression      *GenGetPNObjectValue(Environment *,struct lhsParseNode *);
+   Expression      *ObjectPNVariableComparison(Environment *,struct lhsParseNode *,struct lhsParseNode *);
+   void             GenObjectLengthTest(Environment *,struct lhsParseNode *);
+   void             GenObjectZeroLengthTest(Environment *,struct lhsParseNode *);
+
+#endif /* DEFRULE_CONSTRUCT && OBJECT_SYSTEM && (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* _H_objrtgen */
+
+
+
+
diff --git a/clips/objrtmch.c b/clips/objrtmch.c
new file mode 100755
index 000000000..307cc712d
--- /dev/null
+++ b/clips/objrtmch.c
@@ -0,0 +1,1505 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  02/03/18             */
+   /*                                                     */
+   /*          OBJECT PATTERN MATCHER MODULE              */
+   /*******************************************************/
+
+/**************************************************************/
+/* Purpose: RETE Network Interface for Objects                */
+/*                                                            */
+/* Principal Programmer(s):                                   */
+/*      Brian L. Dantes                                       */
+/*                                                            */
+/* Contributing Programmer(s):                                */
+/*                                                            */
+/* Revision History:                                          */
+/*                                                            */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859   */
+/*                                                            */
+/*      6.24: Removed INCREMENTAL_RESET and                   */
+/*            LOGICAL_DEPENDENCIES compilation flags.         */
+/*                                                            */
+/*            Converted INSTANCE_PATTERN_MATCHING to          */
+/*            DEFRULE_CONSTRUCT.                              */
+/*                                                            */
+/*            Renamed BOOLEAN macro type to intBool.          */
+/*                                                            */
+/*      6.30: Modified the QueueObjectMatchAction function    */
+/*            so that instance retract actions always occur   */
+/*            before instance assert and modify actions.      */
+/*            This prevents the pattern matching process      */
+/*            from attempting the evaluation of a join        */
+/*            expression that accesses the slots of a         */
+/*            retracted instance.                             */
+/*                                                            */
+/*            Added support for hashed alpha memories.        */
+/*                                                            */
+/*            Support for long long integers.                 */
+/*                                                            */
+/*            Added support for hashed comparisons to         */
+/*            constants.                                      */
+/*                                                            */
+/*      6.31: Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and      */
+/*            SetEvaluationError functions.                   */
+/*                                                            */
+/*            Added Env prefix to GetHaltExecution and        */
+/*            SetHaltExecution functions.                     */
+/*                                                            */
+/*            Pragma once and other inclusion changes.        */
+/*                                                            */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/**************************************************************/
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+
+#include "classfun.h"
+#include "memalloc.h"
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+#include "incrrset.h"
+#endif
+#include "lgcldpnd.h"
+#include "multifld.h"
+#include "objrtfnx.h"
+#include "objrtmch.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "ruledlt.h"
+#include "reorder.h"
+#include "retract.h"
+#include "router.h"
+
+#include "insmngr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    QueueObjectMatchAction(Environment *,int,Instance *,int);
+   static SLOT_BITMAP            *QueueModifySlotMap(Environment *,SLOT_BITMAP *,int);
+   static void                    ReturnObjectMatchAction(Environment *,OBJECT_MATCH_ACTION *);
+   static void                    ProcessObjectMatchQueue(Environment *);
+   static void                    MarkObjectPatternNetwork(Environment *,SLOT_BITMAP *);
+   static bool                    CompareSlotBitMaps(SLOT_BITMAP *,SLOT_BITMAP *);
+   static void                    ObjectPatternMatch(Environment *,size_t,size_t,OBJECT_PATTERN_NODE *,struct multifieldMarker *);
+   static void                    ProcessPatternNode(Environment *,size_t,size_t,OBJECT_PATTERN_NODE *,struct multifieldMarker *);
+   static void                    CreateObjectAlphaMatch(Environment *,OBJECT_ALPHA_NODE *);
+   static bool                    EvaluateObjectPatternTest(Environment *,size_t,struct multifieldMarker *,
+                                                            Expression *,OBJECT_PATTERN_NODE *);
+   static void                    ObjectAssertAction(Environment *,Instance *);
+   static void                    ObjectModifyAction(Environment *,Instance *,SLOT_BITMAP *);
+   static void                    ObjectRetractAction(Environment *,Instance *,SLOT_BITMAP *);
+   static void                    ObjectPatternNetErrorMessage(Environment *,OBJECT_PATTERN_NODE *);
+   static void                    TraceErrorToObjectPattern(Environment *,bool,OBJECT_PATTERN_NODE *);
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************************************
+  NAME         : ObjectMatchDelay
+  DESCRIPTION  : H/L interface for SetDelayObjectPatternMatching
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : DelayObjectPatternMatching set and Rete network updates
+                 delayed until pattern-matching is completed
+  NOTES        : H/L Syntax: (object-pattern-match-delay <action>*)
+ ***************************************************************************/
+void ObjectMatchDelay(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   bool ov;
+
+   ov = SetDelayObjectPatternMatching(theEnv,true);
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,returnValue))
+     { return; }
+
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      SetHaltExecution(theEnv,false);
+      SetEvaluationError(theEnv,false);
+      SetDelayObjectPatternMatching(theEnv,ov);
+      SetEvaluationError(theEnv,true);
+     }
+   else
+     SetDelayObjectPatternMatching(theEnv,ov);
+  }
+
+/***************************************************
+  NAME         : SetDelayObjectPatternMatching
+  DESCRIPTION  : Sets the flag determining if Rete
+                 network activity is to be delayed
+                 for objects or not
+  INPUTS       : The value of the flag
+  RETURNS      : The old value of the flag
+  SIDE EFFECTS : DelayObjectPatternMatching set
+  NOTES        : When the delay is set to false,
+                 all pending Rete network updates
+                 are performed
+ ***************************************************/
+bool SetDelayObjectPatternMatching(
+  Environment *theEnv,
+  bool value)
+  {
+   bool oldval;
+
+   oldval = ObjectReteData(theEnv)->DelayObjectPatternMatching;
+   if (value)
+     ObjectReteData(theEnv)->DelayObjectPatternMatching = true;
+   else
+     {
+      ObjectReteData(theEnv)->DelayObjectPatternMatching = false;
+      ObjectNetworkAction(theEnv,0,NULL,-1);
+     }
+   return(oldval);
+  }
+
+/***************************************************
+  NAME         : GetDelayObjectPatternMatching
+  DESCRIPTION  : Gets the flag determining if Rete
+                 network activity is to be delayed
+                 for objects or not
+  INPUTS       : None
+  RETURNS      : The flag
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+bool GetDelayObjectPatternMatching(
+  Environment *theEnv)
+  {
+   return(ObjectReteData(theEnv)->DelayObjectPatternMatching);
+  }
+
+/********************************************************
+  NAME         : ObjectNetworkPointer
+  DESCRIPTION  : Returns the first object network
+                 pattern node
+  INPUTS       : None
+  RETURNS      : The top of the object pattern network
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************/
+OBJECT_PATTERN_NODE *ObjectNetworkPointer(
+  Environment *theEnv)
+  {
+   return(ObjectReteData(theEnv)->ObjectPatternNetworkPointer);
+  }
+
+/********************************************************
+  NAME         : ObjectNetworkTerminalPointer
+  DESCRIPTION  : Returns the first terminal pattern node
+  INPUTS       : None
+  RETURNS      : The last node of a pattern
+  SIDE EFFECTS : None
+  NOTES        : None
+ ********************************************************/
+OBJECT_ALPHA_NODE *ObjectNetworkTerminalPointer(
+  Environment *theEnv)
+  {
+   return(ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer);
+  }
+
+/***************************************************
+  NAME         : SetObjectNetworkPointer
+  DESCRIPTION  : Sets the object pattern network to
+                  the given network
+  INPUTS       : Top of the new pattern network
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : ObjectPatternNetworkPointer set
+  NOTES        : None
+ ***************************************************/
+void SetObjectNetworkPointer(
+  Environment *theEnv,
+  OBJECT_PATTERN_NODE *value)
+  {
+   ObjectReteData(theEnv)->ObjectPatternNetworkPointer = value;
+  }
+
+/*******************************************************
+  NAME         : SetObjectNetworkTerminalPointer
+  DESCRIPTION  : Sets the global list of terminal
+                 pattern nodes (the ones containing
+                 the bitmaps) to the given node
+  INPUTS       : The last node of a pattern
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : ObjectPatternNetworkTerminalPointer set
+  NOTES        : None
+ *******************************************************/
+void SetObjectNetworkTerminalPointer(
+  Environment *theEnv,
+  OBJECT_ALPHA_NODE *value)
+  {
+   ObjectReteData(theEnv)->ObjectPatternNetworkTerminalPointer = value;
+  }
+
+/************************************************************************
+  NAME         : ObjectNetworkAction
+  DESCRIPTION  : Main driver for pattern-matching on objects
+                 If the pattern-matching is current delayed or another
+                 object is currently being pattern-matched, the requested
+                 match action is queued for later processing.
+                 Otherwise, the match action is performed and the
+                 Rete network is updated.
+  INPUTS       : 1) The match action type
+                    OBJECT_ASSERT  (1)
+                    OBJECT_RETRACT (2)
+                    OBJECT_MODIFY  (3)
+                 2) The instance to be matched (can be NULL if only
+                    want pending actions to be performed)
+                 3) The name id of the slot being updated (can be -1)
+                    If this argument is -1, it is assumed that any
+                    pattern which could match this instance must be
+                    checked.  Otherwise, only the patterns which
+                    explicitly match on the named slot will be checked.
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Action queued or Rete network updated
+  NOTES        : None
+ ************************************************************************/
+void ObjectNetworkAction(
+  Environment *theEnv,
+  int type,
+  Instance *ins,
+  int slotNameID)
+  {
+   SLOT_BITMAP *tmpMap;
+
+   if (EngineData(theEnv)->JoinOperationInProgress)
+     return;
+
+   EngineData(theEnv)->JoinOperationInProgress = true;
+
+
+   /* ================================================
+      For purposes of conflict resolution, all objects
+      which have had pattern-matching delayed will
+      have the same relative timestamp, i.e., the
+      inference engine thinks they all just appeared
+      simultaneously
+
+      When delay is off, however, each object gets the
+      new and current timestamp as expected.
+      ================================================ */
+   ObjectReteData(theEnv)->UseEntityTimeTag = DefruleData(theEnv)->CurrentEntityTimeTag++;
+
+   /* ==================================================
+      If pattern-matching is delayed (by use of the
+      set-object-pattern-match-delay function), then
+      the instance should be marked for later processing
+      (when the delay is turned off).
+      ================================================== */
+   if (ins != NULL)
+     {
+      /* 6.05 Bug Fix */
+      ins->reteSynchronized = false;
+
+      if (ObjectReteData(theEnv)->DelayObjectPatternMatching == false)
+        switch (type)
+        {
+         case OBJECT_ASSERT  :
+           ObjectAssertAction(theEnv,ins);
+           break;
+         case OBJECT_RETRACT :
+           ObjectRetractAction(theEnv,ins,NULL);
+           break;
+         default             :
+           tmpMap = QueueModifySlotMap(theEnv,NULL,slotNameID);
+           ObjectModifyAction(theEnv,ins,tmpMap);
+           rm(theEnv,tmpMap,SlotBitMapSize(tmpMap));
+        }
+      else
+        QueueObjectMatchAction(theEnv,type,ins,slotNameID);
+     }
+
+   /* ========================================
+      Process all pending actions in the queue
+      All updates will use the same timestamp
+      ======================================== */
+   ProcessObjectMatchQueue(theEnv);
+
+   EngineData(theEnv)->JoinOperationInProgress = false;
+
+   ForceLogicalRetractions(theEnv);
+
+   /*=========================================*/
+   /* Free partial matches that were released */
+   /* by the assertion of the fact.           */
+   /*=========================================*/
+
+   if (EngineData(theEnv)->ExecutingRule == NULL) FlushGarbagePartialMatches(theEnv);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/***************************************************
+  NAME         : ResetObjectMatchTimeTags
+  DESCRIPTION  : If CurrentObjectMatchTimeTag + 1
+                 would cause an overflow,
+                 CurrentObjectMatchTimeTag
+                 is reset to 0L and all time tags
+                 in object pattern nodes are reset.
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : CurrentObjectMatchTimeTag reset to
+                 0, and all match time tags reset
+                 These tags are used to recognize
+                 valid pattern nodes on a match
+  NOTES        : None
+ ***************************************************/
+void ResetObjectMatchTimeTags(
+  Environment *theEnv)
+  {
+   OBJECT_ALPHA_NODE *alphaPtr;
+   OBJECT_PATTERN_NODE *lastLevel;
+
+   /* ============================================
+      If the current tag incremented by one would
+      not cause an overflow, then we can leave
+      things alone.
+      ============================================ */
+   if ((ObjectReteData(theEnv)->CurrentObjectMatchTimeTag + 1L) > ObjectReteData(theEnv)->CurrentObjectMatchTimeTag)
+     return;
+   ObjectReteData(theEnv)->CurrentObjectMatchTimeTag = 0L;
+   alphaPtr = ObjectNetworkTerminalPointer(theEnv);
+   while (alphaPtr != NULL)
+     {
+      alphaPtr->matchTimeTag = 0L;
+      lastLevel = alphaPtr->patternNode;
+      while (lastLevel != NULL)
+        {
+         if (lastLevel->matchTimeTag == 0L)
+           break;
+         lastLevel->matchTimeTag = 0L;
+         lastLevel = lastLevel->lastLevel;
+        }
+      alphaPtr = alphaPtr->nxtTerminal;
+     }
+  }
+
+/***************************************************
+  NAME         : QueueObjectMatchAction
+  DESCRIPTION  : Posts a Rete network match event
+                 for later processing
+  INPUTS       : 1) The match action type
+                    OBJECT_ASSERT  (1)
+                    OBJECT_RETRACT (2)
+                    OBJECT_MODIFY  (3)
+                 2) The instance to be matched
+                 3) The name id of the slot being
+                    updated (can be -1)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Queue updated
+  NOTES        : None
+ ***************************************************/
+static void QueueObjectMatchAction(
+  Environment *theEnv,
+  int type,
+  Instance *ins,
+  int slotNameID)
+  {
+   OBJECT_MATCH_ACTION *prv,*cur,*newMatch;
+   OBJECT_MATCH_ACTION *prvRetract = NULL; /* DR0873 */
+
+   prv = NULL;
+   cur = ObjectReteData(theEnv)->ObjectMatchActionQueue;
+   while (cur != NULL)
+     {
+      /* ===========================================================
+         Here are the possibilities for the first Rete event already
+         on the queue as compared with the new event for an object:
+
+         Assert/Retract  -->  Delete assert event
+                              Ignore retract event
+         Assert/Modify   -->  Ignore modify event
+         Modify/Modify   -->  Merge new modify event
+         Modify/Retract  -->  Delete modify event
+                              Queue the retract event
+         =========================================================== */
+      if (cur->ins == ins)
+        {
+         /* ===================================================
+            An action for initially asserting the newly created
+            object to all applicable patterns
+            =================================================== */
+         if (cur->type == OBJECT_ASSERT)
+           {
+            if (type == OBJECT_RETRACT)
+              {
+               /* ===================================================
+                  If we are retracting the entire object, then we can
+                  remove the assert action (and all modifies as well)
+                  and ignore the retract action
+                  (basically the object came and went before the Rete
+                  network had a chance to see it)
+                  =================================================== */
+               if (prv == NULL)
+                 ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt;
+               else
+                 prv->nxt = cur->nxt;
+               cur->ins->busy--;
+               ReturnObjectMatchAction(theEnv,cur);
+              }
+
+            /* =================================================
+               If this is a modify action, then we can ignore it
+               since the assert action will encompass it
+               ================================================= */
+           }
+
+         /* ===================================================
+            If the object is being deleted after a slot modify,
+            drop the modify event and replace with the retract
+            =================================================== */
+         else if (type == OBJECT_RETRACT)
+           {
+            cur->type = OBJECT_RETRACT;
+            if (cur->slotNameIDs != NULL)
+              {
+               rm(theEnv,cur->slotNameIDs,SlotBitMapSize(cur->slotNameIDs));
+               cur->slotNameIDs = NULL;
+              }
+           }
+
+         /* ====================================================
+            If a modify event for this slot is already on the
+            queue, ignore this one. Otherwise, merge the slot id
+            ==================================================== */
+         else
+            cur->slotNameIDs = QueueModifySlotMap(theEnv,cur->slotNameIDs,slotNameID);
+
+         return;
+        }
+
+      if (cur->type == OBJECT_RETRACT) /* DR0873 */
+        { prvRetract = cur; }          /* DR0873 */
+      prv = cur;
+      cur = cur->nxt;
+     }
+
+   /* ================================================
+      If there are no actions for the instance already
+      on the queue, the new action is simply appended.
+      ================================================ */
+   newMatch = get_struct(theEnv,objectMatchAction);
+   newMatch->type = type;
+   newMatch->nxt = NULL; /* If we get here, cur should be NULL */
+   newMatch->slotNameIDs = (type != OBJECT_MODIFY) ? NULL :
+                       QueueModifySlotMap(theEnv,NULL,slotNameID);
+   newMatch->ins = ins;
+   newMatch->ins->busy++;
+
+   /* DR0873 Begin */
+   /* Retract operations must be processed before assert and   */
+   /* modify actions, otherwise the pattern matching process   */
+   /* might attempt to access the slots of a retract instance. */
+
+   if (type == OBJECT_RETRACT)
+     {
+      if (prvRetract == NULL)
+        {
+         newMatch->nxt = ObjectReteData(theEnv)->ObjectMatchActionQueue;
+         ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch;
+        }
+      else
+        {
+         newMatch->nxt = prvRetract->nxt;
+         prvRetract->nxt = newMatch;
+        }
+     }
+   else
+   /* DR0873 End */
+
+   if (prv == NULL)
+     ObjectReteData(theEnv)->ObjectMatchActionQueue = newMatch;
+   else
+     prv->nxt = newMatch;
+  }
+
+/****************************************************
+  NAME         : QueueModifySlotMap
+  DESCRIPTION  : Sets the bitmap for a queued
+                 object modify Rete network action
+  INPUTS       : 1) The old bitmap (can be NULL)
+                 2) The canonical slot id to set
+  RETURNS      : The (new) bitmap
+  SIDE EFFECTS : Bitmap allocated/reallocated if
+                 necessary, and slot id bit set
+  NOTES        : If the bitmap must be (re)allocated,
+                 this routine allocates twice the
+                 room necessary for the current id
+                 to allow for growth.
+ ****************************************************/
+static SLOT_BITMAP *QueueModifySlotMap(
+  Environment *theEnv,
+  SLOT_BITMAP *oldMap,
+  int slotNameID)
+  {
+   SLOT_BITMAP *newMap;
+   unsigned short newmaxid;
+   unsigned oldsz,newsz;
+
+   if ((oldMap == NULL) ? true : (slotNameID > oldMap->maxid))
+     {
+      newmaxid = (unsigned short) (slotNameID * 2);
+      newsz = sizeof(SLOT_BITMAP) +
+              (sizeof(char) * (newmaxid / BITS_PER_BYTE));
+      newMap = (SLOT_BITMAP *) gm2(theEnv,newsz);
+      ClearBitString(newMap,newsz);
+      if (oldMap != NULL)
+        {
+         oldsz = SlotBitMapSize(oldMap);
+         GenCopyMemory(char,oldsz,newMap,oldMap);
+         rm(theEnv,oldMap,oldsz);
+        }
+      newMap->maxid = newmaxid;
+     }
+   else
+     newMap = oldMap;
+   SetBitMap(newMap->map,slotNameID);
+   return(newMap);
+  }
+
+/***************************************************
+  NAME         : ReturnObjectMatchAction
+  DESCRIPTION  : Deallocates and object match action
+                 structure and associated slot
+                 bitmap (if any)
+  INPUTS       : The queued match action item
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Object match action item deleted
+  NOTES        : None
+ ***************************************************/
+static void ReturnObjectMatchAction(
+  Environment *theEnv,
+  OBJECT_MATCH_ACTION *omaPtr)
+  {
+   if (omaPtr->slotNameIDs != NULL)
+     rm(theEnv,omaPtr->slotNameIDs,SlotBitMapSize(omaPtr->slotNameIDs));
+   rtn_struct(theEnv,objectMatchAction,omaPtr);
+  }
+
+/***************************************************
+  NAME         : ProcessObjectMatchQueue
+  DESCRIPTION  : Processes all outstanding object
+                 Rete network update events
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Pattern-matching on objects
+  NOTES        : None
+ ***************************************************/
+static void ProcessObjectMatchQueue(
+  Environment *theEnv)
+  {
+   OBJECT_MATCH_ACTION *cur;
+
+   while ((ObjectReteData(theEnv)->ObjectMatchActionQueue != NULL) &&
+          (ObjectReteData(theEnv)->DelayObjectPatternMatching == false))
+     {
+      cur = ObjectReteData(theEnv)->ObjectMatchActionQueue;
+      ObjectReteData(theEnv)->ObjectMatchActionQueue = cur->nxt;
+
+      switch(cur->type)
+        {
+         case OBJECT_ASSERT  :
+           ObjectAssertAction(theEnv,cur->ins);
+           break;
+         case OBJECT_RETRACT :
+           ObjectRetractAction(theEnv,cur->ins,cur->slotNameIDs);
+           break;
+         default             :
+           ObjectModifyAction(theEnv,cur->ins,cur->slotNameIDs);
+        }
+      cur->ins->busy--;
+      ReturnObjectMatchAction(theEnv,cur);
+     }
+  }
+
+/******************************************************
+  NAME         : MarkObjectPatternNetwork
+  DESCRIPTION  : Iterates through all terminal
+                 pattern nodes checking class and
+                 slot bitmaps.  If a pattern is
+                 applicable to the object/slot change,
+                 then all the nodes belonging to
+                 the pattern are marked as needing
+                 to be examined by the pattern matcher.
+  INPUTS       : The bitmap of ids of the slots being
+                 changed (NULL if this is an assert for the
+                  for the entire object)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Applicable pattern nodes marked
+  NOTES        : Incremental reset status is also
+                 checked here
+ ******************************************************/
+static void MarkObjectPatternNetwork(
+  Environment *theEnv,
+  SLOT_BITMAP *slotNameIDs)
+  {
+   OBJECT_ALPHA_NODE *alphaPtr;
+   OBJECT_PATTERN_NODE *upper;
+   Defclass *cls;
+   CLASS_ALPHA_LINK *current_alpha_link;
+
+   cls = ObjectReteData(theEnv)->CurrentPatternObject->cls;
+   current_alpha_link = cls->relevant_terminal_alpha_nodes;
+
+   ResetObjectMatchTimeTags(theEnv);
+   ObjectReteData(theEnv)->CurrentObjectMatchTimeTag++;
+
+   while (current_alpha_link != NULL)
+     {
+      alphaPtr = current_alpha_link->alphaNode;
+      
+      /* =============================================================
+         If an incremental reset is in progress, make sure that the
+         pattern has been marked for initialization before proceeding.
+         ============================================================= */
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      if (EngineData(theEnv)->IncrementalResetInProgress &&
+          (alphaPtr->header.initialize == false))
+        {
+         current_alpha_link = current_alpha_link->next;
+         continue;
+        }
+#endif
+
+      /* ===================================================
+         If we are doing an assert, then we need to
+         check all patterns which satsify the class bitmap
+         (The retraction has already been done in this case)
+         =================================================== */
+      if (slotNameIDs == NULL)
+        {
+         alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag;
+
+         for (upper = alphaPtr->patternNode;
+              upper != NULL;
+              upper = upper->lastLevel)
+           {
+            if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag)
+              { break; }
+            else
+              { upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; }
+           }
+        }
+
+      /* ===================================================
+         If we are doing a slot modify, then we need to
+         check only the subset of patterns which satisfy the
+         class bitmap AND actually match on the slot in
+         question.
+         =================================================== */
+      else if (alphaPtr->slotbmp != NULL)
+        {
+         if (CompareSlotBitMaps(slotNameIDs,
+               (SLOT_BITMAP *) alphaPtr->slotbmp->contents))
+           {
+            alphaPtr->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag;
+            for (upper = alphaPtr->patternNode;
+                 upper != NULL;
+                 upper = upper->lastLevel)
+              {
+               if (upper->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag)
+                 { break; }
+               else
+                 { upper->matchTimeTag = ObjectReteData(theEnv)->CurrentObjectMatchTimeTag; }
+              }
+           }
+        }
+
+      current_alpha_link = current_alpha_link->next;
+     }
+  }
+
+/***************************************************
+  NAME         : CompareSlotBitMaps
+  DESCRIPTION  : Compares two slot bitmaps by
+                 bitwising and'ing byte per byte up
+                 to the length of the smaller map.
+  INPUTS       : The two slot bitmaps
+  RETURNS      : True if any common bits
+                 are set in both maps, false
+                 otherwise
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static bool CompareSlotBitMaps(
+  SLOT_BITMAP *smap1,
+  SLOT_BITMAP *smap2)
+  {
+   unsigned short i, maxByte;
+
+   maxByte = (unsigned short)
+             (((smap1->maxid < smap2->maxid) ?
+              smap1->maxid : smap2->maxid) / BITS_PER_BYTE);
+   for (i = 0 ; i <= maxByte ; i++)
+     if (smap1->map[i] & smap2->map[i])
+       return true;
+   return false;
+  }
+
+/**********************************************************************************
+  NAME         : ObjectPatternMatch
+  DESCRIPTION  : Iterates through all the pattern nodes on one level
+                 in the pattern network.  A node is only processed
+                 if it can lead to a terminating class bitmap node
+                 which applies to the object being matched.  This
+                 allows for a significant reduction in the number of
+                 patterns considered.
+  INPUTS       : 1) The offset of the slot position from the pattern index
+                 2) The pattern node being examined
+                 3) The end of the list of multifield markers for the pattern
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The pattern tests are evaluated and the child nodes may
+                 be processed (which may cause a whole series of Rete network
+                 updates).
+  NOTES        : Several globals are used to keep track of the current
+                 slot being examined:
+                 CurrentPatternMarks - the series of multifield markers
+                 CurrentPatternObject - the object being pattern-matched
+                 CurrentPatternObjectSlot - the current slot being examined
+                 CurrentObjectSlotLength - the cardinality of the slot value
+
+                 An optimization is performed when evaluating
+                 constant tests on a slot value field.  All
+                 pattern nodes on a level which restrict the same slot
+                 are grouped together.  Those which are constant
+                 tests are placed at the far right.  Thus, as soon
+                 as one of these constant tests succeeds, the remaining
+                 nodes for that slot on this level can be skipped
+ **********************************************************************************/
+static void ObjectPatternMatch(
+  Environment *theEnv,
+  size_t offset,
+  size_t multifieldsProcessed,
+  OBJECT_PATTERN_NODE *patternTop,
+  struct multifieldMarker *endMark)
+  {
+   size_t saveSlotLength;
+   InstanceSlot *saveSlot;
+   OBJECT_PATTERN_NODE *blockedNode;
+      
+   while (patternTop != NULL)
+     {
+      /*=============================================================*/
+      /* MarkObjectPatternNetwork() has already marked pattern nodes */
+      /* which need processing according to the class bitmaps, slot  */
+      /* updates and incremental reset status.                       */
+      /*=============================================================*/
+
+      if (patternTop->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag)
+        {
+         /*===========================================*/
+         /* Make sure we are examining the correct    */
+         /* slot of the object for this pattern node. */
+         /*===========================================*/
+
+         if ((patternTop->slotNameID == ISA_ID) ||
+             (patternTop->slotNameID == NAME_ID))
+           {
+            ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL;
+            ObjectReteData(theEnv)->CurrentObjectSlotLength = 1;
+            offset = 0;
+           }
+         else if ((ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL) ? true :
+                  (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->id != patternTop->slotNameID))
+           {
+            /*=======================================================*/
+            /* Need to reset the indices for the multifield          */
+            /* markers now that we have moved onto a different slot. */
+            /*=======================================================*/
+
+            ObjectReteData(theEnv)->CurrentPatternObjectSlot =
+            ObjectReteData(theEnv)->CurrentPatternObject->slotAddresses[ObjectReteData(theEnv)->CurrentPatternObject->cls->slotNameMap
+                                             [patternTop->slotNameID] - 1];
+            offset = 0;
+            if (ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->multiple)
+              ObjectReteData(theEnv)->CurrentObjectSlotLength =
+                ObjectReteData(theEnv)->CurrentPatternObjectSlot->multifieldValue->length;
+            else
+              ObjectReteData(theEnv)->CurrentObjectSlotLength = 1;
+           }
+
+         /*==========================================================*/
+         /* Process the pattern node.  If it is satisfied by the     */
+         /* the instance, ProcessPatternNode() will recursively pass */
+         /* all of its children nodes through ObjectPatternMatch().  */
+         /*==========================================================*/
+
+         saveSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength;
+         saveSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot;
+         ProcessPatternNode(theEnv,offset,multifieldsProcessed,patternTop,endMark);
+         ObjectReteData(theEnv)->CurrentObjectSlotLength = saveSlotLength;
+         ObjectReteData(theEnv)->CurrentPatternObjectSlot = saveSlot;
+        }
+
+      /*============================================================*/
+      /* Move on to the siblings of this node - if the current node */
+      /* was a constant test that succeeded, skip further sibling   */
+      /* nodes (which test on the same field in the pattern) which  */
+      /* match on the same slot since they are all constant tests   */
+      /* as well and will, of course fail.                          */
+      /*============================================================*/
+
+      if (patternTop->blocked == true)
+        {
+         patternTop->blocked = false;
+         blockedNode = patternTop;
+         patternTop = patternTop->rightNode;
+         while (patternTop != NULL)
+           {
+            if ((patternTop->slotNameID != blockedNode->slotNameID) ||
+                (patternTop->whichField != blockedNode->whichField))
+              break;
+            patternTop = patternTop->rightNode;
+           }
+        }
+      else
+        patternTop = patternTop->rightNode;
+     }
+  }
+
+/**********************************************************************************
+  NAME         : ProcessPatternNode
+  DESCRIPTION  : Determines if a pattern node satsifies the corresponding
+                 slot value field(s) in an object.  If it does,
+                 ObjectPatternMatch() is recursively called to process
+                 the child nodes of this node.  In this mutual recursion
+                 between ObjectPatternMatch() and ProcessPatternNode(),
+                 the nodes of all applicable patterns are processed
+                 to completion.  ObjectPatternMatch() enters an object
+                 into a pattern's aplha memory when the traversal reaches
+                 a terminal class bitmap node.
+  INPUTS       : 1) The offset of the slot index from the pattern index
+                 2) The pattern node being examined
+                 3) The end of the list of multifield markers for the pattern
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : The pattern tests are evaluated and the child nodes may
+                 be processed (which may cause a whole series of Rete network
+                 updates).
+  NOTES        : Several globals are used to keep track of the current
+                 slot being examined:
+                 CurrentPatternMarks - the series of multifield markers
+                 CurrentPatternObject - the object being pattern-matched
+                 CurrentPatternObjectSlot - the current slot being examined
+                 CurrentObjectSlotLength - the cardinality of the slot value
+ **********************************************************************************/
+static void ProcessPatternNode(
+  Environment *theEnv,
+  size_t offset,
+  size_t multifieldsProcessed,
+  OBJECT_PATTERN_NODE *patternNode,
+  struct multifieldMarker *endMark)
+  {
+   unsigned short patternSlotField;
+   size_t objectSlotField;
+   size_t objectSlotLength;
+   size_t repeatCount;
+   InstanceSlot *objectSlot;
+   struct multifieldMarker *newMark;
+   UDFValue theResult;
+   OBJECT_PATTERN_NODE *tempPtr;
+
+   patternSlotField = patternNode->whichField;
+   
+   objectSlotField = patternSlotField + offset - multifieldsProcessed;
+
+   /*============================================*/
+   /* If this is a test on the class or the name */
+   /* of the object, process it separately.      */
+   /*============================================*/
+
+   if (ObjectReteData(theEnv)->CurrentPatternObjectSlot == NULL)
+     {
+      if (patternNode->selector) /* TBD Necessary? */
+        {
+         if (EvaluateObjectPatternTest(theEnv,objectSlotField,NULL,patternNode->networkTest->nextArg,patternNode))
+           {
+            EvaluateExpression(theEnv,patternNode->networkTest,&theResult);
+
+            tempPtr = (OBJECT_PATTERN_NODE *) FindHashedPatternNode(theEnv,patternNode,theResult.header->type,theResult.value);
+
+            if (tempPtr != NULL)
+              {
+               if (tempPtr->alphaNode != NULL)
+                 { CreateObjectAlphaMatch(theEnv,tempPtr->alphaNode); }
+               ObjectPatternMatch(theEnv,offset,multifieldsProcessed,tempPtr->nextLevel,endMark);
+              }
+           }
+        }
+      else if ((patternNode->networkTest == NULL) ? true :
+          (EvaluateObjectPatternTest(theEnv,objectSlotField,NULL,
+                                     (Expression *) patternNode->networkTest,patternNode)))
+        {
+         if (patternNode->alphaNode != NULL)
+           CreateObjectAlphaMatch(theEnv,patternNode->alphaNode);
+         ObjectPatternMatch(theEnv,offset,multifieldsProcessed,patternNode->nextLevel,endMark);
+        }
+      return;
+     }
+
+   /*===================================*/
+   /* Check a single-field restriction. */
+   /*===================================*/
+
+   if (patternNode->multifieldNode == 0)
+     {
+      if (patternNode->selector)
+        {
+         if (EvaluateObjectPatternTest(theEnv,objectSlotField,NULL,patternNode->networkTest->nextArg,patternNode))
+           {
+            EvaluateExpression(theEnv,patternNode->networkTest,&theResult);
+
+            tempPtr = (OBJECT_PATTERN_NODE *) FindHashedPatternNode(theEnv,patternNode,theResult.header->type,theResult.value);
+
+            if (tempPtr != NULL)
+              {
+               if (tempPtr->alphaNode != NULL)
+                 { CreateObjectAlphaMatch(theEnv,tempPtr->alphaNode); }
+               ObjectPatternMatch(theEnv,offset,multifieldsProcessed,tempPtr->nextLevel,endMark);
+              }
+           }
+        }
+      else if ((patternNode->networkTest == NULL) ? true :
+          EvaluateObjectPatternTest(theEnv,objectSlotField,NULL,
+                                    (Expression *) patternNode->networkTest,patternNode))
+        {
+         if (patternNode->alphaNode != NULL)
+           CreateObjectAlphaMatch(theEnv,patternNode->alphaNode);
+         ObjectPatternMatch(theEnv,offset,multifieldsProcessed,patternNode->nextLevel,endMark);
+        }
+      return;
+     }
+
+   /*==============================================================*/
+   /* Check a multifield restriction.  Add a marker for this field */
+   /* which has indices indicating to which values in the object   */
+   /* slot the multifield pattern node is bound.                   */
+   /*==============================================================*/
+
+   newMark = get_struct(theEnv,multifieldMarker);
+   newMark->whichField = patternSlotField;
+   newMark->where.whichSlot = (void *) ObjectReteData(theEnv)->CurrentPatternObjectSlot->desc->slotName->name;
+   newMark->startPosition = objectSlotField;
+
+   newMark->next = NULL;
+   if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == NULL)
+     ObjectReteData(theEnv)->CurrentPatternObjectMarks = newMark;
+   else
+     endMark->next = newMark;
+
+   /*============================================================*/
+   /* If there are further pattern restrictions on this slot,    */
+   /* try pattern-matching for all possible bound values of the  */
+   /* multifield pattern node: from no values to all values from */
+   /* the starting position of the multifield to the end of the  */
+   /* object slot.  Otherwise, bind the multifield to all the    */
+   /* remaining fields in the slot value and continue with       */
+   /* pattern-matching.                                          */
+   /*============================================================*/
+
+   if (patternNode->endSlot == false)
+     {
+      objectSlotLength = ObjectReteData(theEnv)->CurrentObjectSlotLength;
+      objectSlot = ObjectReteData(theEnv)->CurrentPatternObjectSlot;
+      newMark->range = 0;
+      repeatCount = objectSlotLength + 2 - newMark->startPosition - patternNode->leaveFields;
+      while (repeatCount > 0)
+        {
+         if (patternNode->selector)
+           {
+            if (EvaluateObjectPatternTest(theEnv,objectSlotField,newMark,patternNode->networkTest->nextArg,patternNode))
+              {
+               EvaluateExpression(theEnv,patternNode->networkTest,&theResult);
+
+               tempPtr = (OBJECT_PATTERN_NODE *) FindHashedPatternNode(theEnv,patternNode,theResult.header->type,theResult.value);
+
+               if (tempPtr != NULL)
+                 {
+                  if (tempPtr->alphaNode != NULL)
+                    { CreateObjectAlphaMatch(theEnv,tempPtr->alphaNode); }
+                  ObjectPatternMatch(theEnv,offset + newMark->startPosition + newMark->range - objectSlotField,
+                                     multifieldsProcessed+1,tempPtr->nextLevel,newMark);
+                  ObjectReteData(theEnv)->CurrentObjectSlotLength = objectSlotLength;
+                  ObjectReteData(theEnv)->CurrentPatternObjectSlot = objectSlot;
+                 }
+              }
+           }
+         else if ((patternNode->networkTest == NULL) ? true :
+              EvaluateObjectPatternTest(theEnv,objectSlotField,newMark,
+                        (Expression *) patternNode->networkTest,patternNode))
+           {
+            if (patternNode->alphaNode != NULL)
+              CreateObjectAlphaMatch(theEnv,patternNode->alphaNode);
+            ObjectPatternMatch(theEnv,offset + newMark->startPosition + newMark->range - objectSlotField,
+                               multifieldsProcessed+1,patternNode->nextLevel,newMark);
+            ObjectReteData(theEnv)->CurrentObjectSlotLength = objectSlotLength;
+            ObjectReteData(theEnv)->CurrentPatternObjectSlot = objectSlot;
+           }
+         newMark->range++;
+         repeatCount--;
+        }
+     }
+   else
+     {
+      newMark->range = ObjectReteData(theEnv)->CurrentObjectSlotLength + 1 - newMark->startPosition - patternNode->leaveFields;
+      if (patternNode->selector)
+        {
+         if (EvaluateObjectPatternTest(theEnv,objectSlotField,newMark,patternNode->networkTest->nextArg,patternNode))
+           {
+            EvaluateExpression(theEnv,patternNode->networkTest,&theResult);
+
+            tempPtr = (OBJECT_PATTERN_NODE *) FindHashedPatternNode(theEnv,patternNode,theResult.header->type,theResult.value);
+
+            if (tempPtr != NULL)
+              {
+               if (tempPtr->alphaNode != NULL)
+                 CreateObjectAlphaMatch(theEnv,tempPtr->alphaNode);
+               ObjectPatternMatch(theEnv,0,0,tempPtr->nextLevel,newMark);
+              }
+           }
+        }
+      else if ((patternNode->networkTest == NULL) ? true :
+          EvaluateObjectPatternTest(theEnv,objectSlotField,newMark,
+                                    (Expression *) patternNode->networkTest,patternNode))
+        {
+         if (patternNode->alphaNode != NULL)
+           CreateObjectAlphaMatch(theEnv,patternNode->alphaNode);
+         ObjectPatternMatch(theEnv,0,0,patternNode->nextLevel,newMark);
+        }
+     }
+
+   /*=========================================*/
+   /* Delete the temporary multifield marker. */
+   /*=========================================*/
+
+   if (ObjectReteData(theEnv)->CurrentPatternObjectMarks == newMark)
+     ObjectReteData(theEnv)->CurrentPatternObjectMarks = NULL;
+   else
+     endMark->next = NULL;
+   rtn_struct(theEnv,multifieldMarker,newMark);
+  }
+
+/***************************************************
+  NAME         : CreateObjectAlphaMatch
+  DESCRIPTION  : Places an instance in the alpha
+                 memory of a pattern and drives the
+                 partial match through the join
+                 network
+  INPUTS       : The alpha memory node
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Join network updated
+  NOTES        : None
+ ***************************************************/
+static void CreateObjectAlphaMatch(
+  Environment *theEnv,
+  OBJECT_ALPHA_NODE *alphaPtr)
+  {
+   struct joinNode *listOfJoins;
+   struct partialMatch *theMatch;
+   struct patternMatch *newMatch;
+   unsigned long hashValue;
+
+   while (alphaPtr != NULL)
+     {
+      if (alphaPtr->matchTimeTag == ObjectReteData(theEnv)->CurrentObjectMatchTimeTag)
+        {
+         hashValue = ComputeRightHashValue(theEnv,&alphaPtr->header);
+
+         /* ===================================================
+            If we have reached the class bitmap of the pattern,
+            place the object in the alpha memory of each of
+            the terminal nodes underneath and drive
+            the partial matches through the join network.
+
+            Insert the instance into the alpha memory
+            of this pattern and mark it as busy
+            =================================================== */
+         ObjectReteData(theEnv)->CurrentPatternObject->busy++;
+         theMatch = CreateAlphaMatch(theEnv,ObjectReteData(theEnv)->CurrentPatternObject,
+                                     ObjectReteData(theEnv)->CurrentPatternObjectMarks,
+                                     (struct patternNodeHeader *) alphaPtr,hashValue);
+         theMatch->owner = alphaPtr;
+
+         /* ======================================
+            Attach the partial match to the object
+            to ease later retraction
+            ====================================== */
+         newMatch = get_struct(theEnv,patternMatch);
+         newMatch->next = (struct patternMatch *) ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList;
+         newMatch->matchingPattern = (struct patternNodeHeader *) alphaPtr;
+         newMatch->theMatch = theMatch;
+         ObjectReteData(theEnv)->CurrentPatternObject->partialMatchList = (void *) newMatch;
+
+         /* ================================================
+            Drive the partial match through the join network
+            ================================================ */
+         listOfJoins = alphaPtr->header.entryJoin;
+         while (listOfJoins != NULL)
+           {
+            NetworkAssert(theEnv,theMatch,listOfJoins);
+            listOfJoins = listOfJoins->rightMatchNode;
+           }
+        }
+      alphaPtr = alphaPtr->nxtInGroup;
+     }
+  }
+
+/******************************************************
+  NAME         : EvaluateObjectPatternTest
+  DESCRIPTION  : Evaluates the pattern network test
+                 expression for a node
+  INPUTS       : 1) The actual index of the slot value
+                    field currently being examined
+                 2) The multifield marker (if any)
+                    for the pattern node being exmained
+                 3) The pattern network test expression
+                 4) The pattern node being examined
+  RETURNS      : True if the node passes the
+                 test, false otherwise
+  SIDE EFFECTS : Evaluation of the test
+                 EvaluationError and HaltExecution
+                 are always set to false
+  NOTES        : Assumes networkTest != NULL
+ ******************************************************/
+static bool EvaluateObjectPatternTest(
+  Environment *theEnv,
+  size_t objectSlotField,
+  struct multifieldMarker *selfSlotMarker,
+  Expression *networkTest,
+  OBJECT_PATTERN_NODE *patternNode)
+  {
+   UDFValue vresult;
+   int rv;
+
+   if (networkTest == NULL) return true;
+
+   if (networkTest->type == OBJ_PN_CONSTANT)
+     {
+      struct expr *oldArgument;
+
+      oldArgument = EvaluationData(theEnv)->CurrentExpression;
+      EvaluationData(theEnv)->CurrentExpression = networkTest;
+      rv = ObjectCmpConstantFunction(theEnv,networkTest->value,&vresult);
+      EvaluationData(theEnv)->CurrentExpression = oldArgument;
+      if (rv)
+        {
+         if (((struct ObjectCmpPNConstant *)
+                 networkTest->bitMapValue->contents)->pass)
+           patternNode->blocked = true;
+         return true;
+        }
+      return false;
+     }
+
+   /* =========================================================
+      Evaluate or expressions expressed in the format:
+         (or <expression 1> <expression 2> ... <expression n>)
+       Returns true (1.0) if any of the expression are true,
+       otherwise returns false (0.0).
+      ========================================================= */
+   if (networkTest->value == ExpressionData(theEnv)->PTR_OR)
+     {
+      networkTest = networkTest->argList;
+      while (networkTest != NULL)
+        {
+         if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode))
+           {
+            /* ============================================
+               A node can be blocked ONLY if there were one
+               positive constant test on that node
+               ============================================ */
+            patternNode->blocked = false;
+            return true;
+           }
+         patternNode->blocked = false;
+         networkTest = networkTest->nextArg;
+        }
+      return false;
+     }
+
+   /* ==========================================================
+      Evaluate and expressions expressed in the format:
+       (and <expression 1> <expression 2> ... <expression n>)
+      Returns false if any of the expression are false,
+      otherwise returns true.
+      ========================================================== */
+   else if (networkTest->value == ExpressionData(theEnv)->PTR_AND)
+     {
+      networkTest = networkTest->argList;
+      while (networkTest != NULL)
+        {
+         if (EvaluateObjectPatternTest(theEnv,objectSlotField,selfSlotMarker,networkTest,patternNode)
+              == false)
+           {
+            patternNode->blocked = false;
+            return false;
+           }
+         patternNode->blocked = false;
+         networkTest = networkTest->nextArg;
+        }
+      return true;
+     }
+
+   /* =======================================================
+      Evaluate all other expressions using EvaluateExpression
+      ======================================================= */
+   else
+     {
+      EvaluationData(theEnv)->HaltExecution = false;
+      if (EvaluateExpression(theEnv,networkTest,&vresult))
+        {
+         ObjectPatternNetErrorMessage(theEnv,patternNode);
+         EvaluationData(theEnv)->EvaluationError = false;
+         EvaluationData(theEnv)->HaltExecution = false;
+         return false;
+        }
+      if (vresult.value != FalseSymbol(theEnv))
+        return true;
+     }
+   return false;
+  }
+
+/***************************************************
+  NAME         : ObjectAssertAction
+  DESCRIPTION  : Filters an instance through the
+                 object pattern network
+  INPUTS       : The instance
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance matched
+  NOTES        : None
+ ***************************************************/
+static void ObjectAssertAction(
+  Environment *theEnv,
+  Instance *ins)
+  {
+   ins->patternHeader.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag;
+   ObjectReteData(theEnv)->CurrentPatternObject = ins;
+   ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL;
+   MarkObjectPatternNetwork(theEnv,NULL);
+   ObjectPatternMatch(theEnv,0,0,ObjectNetworkPointer(theEnv),NULL);
+   ins->reteSynchronized = true;
+  }
+
+/**********************************************************************
+  NAME         : ObjectModifyAction
+  DESCRIPTION  : Removes an instance from patterns (and attached joins)
+                 applicable to specified slot(s), and then filters
+                 same instance through object pattern network
+                 (only against patterns which explicitly match on
+                 named slot(s))
+  INPUTS       : 1) The instance
+                 2) The bitmap of slot ids
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Instance retracted/asserted
+  NOTES        : None
+ **********************************************************************/
+static void ObjectModifyAction(
+  Environment *theEnv,
+  Instance *ins,
+  SLOT_BITMAP *slotNameIDs)
+  {
+   ins->patternHeader.timeTag = ObjectReteData(theEnv)->UseEntityTimeTag;
+   ObjectRetractAction(theEnv,ins,slotNameIDs);
+   ObjectReteData(theEnv)->CurrentPatternObject = ins;
+   ObjectReteData(theEnv)->CurrentPatternObjectSlot = NULL;
+   MarkObjectPatternNetwork(theEnv,slotNameIDs);
+   ObjectPatternMatch(theEnv,0,0,ObjectNetworkPointer(theEnv),NULL);
+   ins->reteSynchronized = true;
+  }
+
+/****************************************************
+  NAME         : ObjectRetractAction
+  DESCRIPTION  : Retracts the instance from the
+                 applicable patterns for the object
+                 (if the slotNameID != -1, then the
+                  instance is only retracted from
+                  the alpha memories of the patterns
+                  which actually match on that slot)
+  INPUTS       : 1) The instance
+                 2) The slot bitmap for a modify
+                    (NULL if the instance is actually
+                     being removed)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Retractions performed
+  NOTES        : None
+ ****************************************************/
+static void ObjectRetractAction(
+  Environment *theEnv,
+  Instance *ins,
+  SLOT_BITMAP *slotNameIDs)
+  {
+   struct patternMatch *prvMatch,*tmpMatch,
+                       *deleteMatch,*lastDeleteMatch;
+   OBJECT_ALPHA_NODE *alphaPtr;
+   void *saveDependents;
+
+   if (slotNameIDs == NULL)
+     {
+      if (ins->partialMatchList != NULL)
+        {
+         tmpMatch = (struct patternMatch *) ins->partialMatchList;
+         while (tmpMatch != NULL)
+           {
+            ins->busy--;
+            tmpMatch = tmpMatch->next;
+           }
+         NetworkRetract(theEnv,(struct patternMatch *) ins->partialMatchList);
+         ins->partialMatchList = NULL;
+        }
+     }
+   else
+     {
+      deleteMatch = NULL;
+      lastDeleteMatch = NULL;
+      prvMatch = NULL;
+      tmpMatch = (struct patternMatch *) ins->partialMatchList;
+      while (tmpMatch != NULL)
+        {
+         alphaPtr = (OBJECT_ALPHA_NODE *) tmpMatch->matchingPattern;
+         if (alphaPtr->slotbmp != NULL)
+           {
+           if (CompareSlotBitMaps(slotNameIDs,
+                  (SLOT_BITMAP *) alphaPtr->slotbmp->contents))
+              {
+               ins->busy--;
+               if (prvMatch == NULL)
+                 ins->partialMatchList = (void *) tmpMatch->next;
+               else
+                 prvMatch->next = tmpMatch->next;
+               if (!deleteMatch)
+                 deleteMatch = tmpMatch;
+               else
+                 lastDeleteMatch->next = tmpMatch;
+               lastDeleteMatch = tmpMatch;
+               tmpMatch = tmpMatch->next;
+               lastDeleteMatch->next = NULL;
+              }
+            else
+              {
+               prvMatch = tmpMatch;
+               tmpMatch = tmpMatch->next;
+              }
+           }
+         else
+           {
+            prvMatch = tmpMatch;
+            tmpMatch = tmpMatch->next;
+           }
+        }
+
+      /* =============================================
+         We need to preserve any logical dependencies
+         of this object and reattach them after doing
+         the retract.  Otherwise, the Rete network
+         will believe the object is gone and remove
+         the links from the partial matches upon which
+         this object is logically dependent.
+         ============================================= */
+      if (deleteMatch != NULL)
+        {
+         saveDependents = ins->patternHeader.dependents;
+         ins->patternHeader.dependents = NULL;
+         NetworkRetract(theEnv,deleteMatch);
+         ins->patternHeader.dependents = saveDependents;
+        }
+     }
+   ins->reteSynchronized = true;
+  }
+
+/*****************************************************
+  NAME         : ObjectPatternNetErrorMessage
+  DESCRIPTION  : Prints out a locational error message
+                 when an evaluation error occurs
+                 during object pattern-matching
+  INPUTS       : The pattern node
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error message displayed
+  NOTES        : None
+ *****************************************************/
+static void ObjectPatternNetErrorMessage(
+  Environment *theEnv,
+  OBJECT_PATTERN_NODE *patternPtr)
+  {
+   PrintErrorID(theEnv,"OBJRTMCH",1,true);
+   WriteString(theEnv,STDERR,"This error occurred in the object pattern network\n");
+   WriteString(theEnv,STDERR,"   Currently active instance: [");
+   WriteString(theEnv,STDERR,ObjectReteData(theEnv)->CurrentPatternObject->name->contents);
+   WriteString(theEnv,STDERR,"]\n");
+   WriteString(theEnv,STDERR,"   Problem resides in slot '");
+   WriteString(theEnv,STDERR,FindIDSlotName(theEnv,patternPtr->slotNameID)->contents);
+   WriteString(theEnv,STDERR,"' field #");
+   PrintUnsignedInteger(theEnv,STDERR,patternPtr->whichField);
+   WriteString(theEnv,STDERR,"\n");
+   TraceErrorToObjectPattern(theEnv,true,patternPtr);
+   WriteString(theEnv,STDERR,"\n");
+  }
+
+/*********************************************************
+  NAME         : TraceErrorToObjectPattern
+  DESCRIPTION  : Used by ObjectPatternNetErrorMessage() to
+                 print the rule(s) which contain an object
+                 pattern.
+  INPUTS       : 1) A flag indicating if this is the
+                    node in which the error actually
+                    occurred or not
+                 2) The pattern node
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Error message displayed
+  NOTES        : None
+ *********************************************************/
+static void TraceErrorToObjectPattern(
+  Environment *theEnv,
+  bool errorNode,
+  OBJECT_PATTERN_NODE *patternPtr)
+  {
+   struct joinNode *joinPtr;
+
+   while (patternPtr != NULL)
+     {
+      if (patternPtr->alphaNode != NULL)
+        {
+         joinPtr = patternPtr->alphaNode->header.entryJoin;
+         while (joinPtr != NULL)
+           {
+            TraceErrorToRule(theEnv,joinPtr,"      ");
+            joinPtr = joinPtr->rightMatchNode;
+           }
+        }
+      TraceErrorToObjectPattern(theEnv,false,patternPtr->nextLevel);
+      if (errorNode)
+        break;
+      patternPtr = patternPtr->rightNode;
+     }
+
+  }
+
+#endif
+
diff --git a/clips/objrtmch.h b/clips/objrtmch.h
new file mode 100755
index 000000000..a33f42ab1
--- /dev/null
+++ b/clips/objrtmch.h
@@ -0,0 +1,160 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  02/03/18            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET and                  */
+/*            LOGICAL_DEPENDENCIES compilation flags.        */
+/*                                                           */
+/*            Converted INSTANCE_PATTERN_MATCHING to         */
+/*            DEFRULE_CONSTRUCT.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Modified the QueueObjectMatchAction function   */
+/*            so that instance retract actions always occur  */
+/*            before instance assert and modify actions.     */
+/*            This prevents the pattern matching process     */
+/*            from attempting the evaluation of a join       */
+/*            expression that accesses the slots of a        */
+/*            retracted instance.                            */
+/*                                                           */
+/*            Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added support for hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*      6.31: Optimization for marking relevant alpha nodes  */
+/*            in the object pattern network.                 */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_objrtmch
+
+#pragma once
+
+#define _H_objrtmch
+
+#if DEFRULE_CONSTRUCT && OBJECT_SYSTEM
+
+typedef struct objectAlphaNode OBJECT_ALPHA_NODE;
+typedef struct classAlphaLink CLASS_ALPHA_LINK;
+
+#define OBJECT_ASSERT  1
+#define OBJECT_RETRACT 2
+#define OBJECT_MODIFY  3
+
+#include "evaluatn.h"
+#include "expressn.h"
+#include "match.h"
+#include "network.h"
+#include "object.h"
+#include "symbol.h"
+
+typedef struct classBitMap
+  {
+   unsigned short maxid;
+   char map[1];
+  } CLASS_BITMAP;
+
+#define ClassBitMapSize(bmp) ((sizeof(CLASS_BITMAP) + \
+                                     (sizeof(char) * (bmp->maxid / BITS_PER_BYTE))))
+
+typedef struct slotBitMap
+  {
+   unsigned short maxid;
+   char map[1];
+  } SLOT_BITMAP;
+
+#define SlotBitMapSize(bmp) ((sizeof(SLOT_BITMAP) + \
+                                     (sizeof(char) * (bmp->maxid / BITS_PER_BYTE))))
+
+typedef struct objectPatternNode
+  {
+   unsigned blocked        : 1;
+   unsigned multifieldNode : 1;
+   unsigned endSlot        : 1;
+   unsigned selector       : 1;
+   unsigned whichField     : 8;
+   unsigned short leaveFields;
+   unsigned long long matchTimeTag;
+   unsigned short slotNameID;
+   Expression *networkTest;
+   struct objectPatternNode *nextLevel;
+   struct objectPatternNode *lastLevel;
+   struct objectPatternNode *leftNode;
+   struct objectPatternNode *rightNode;
+   OBJECT_ALPHA_NODE *alphaNode;
+   unsigned long bsaveID;
+  } OBJECT_PATTERN_NODE;
+
+struct objectAlphaNode
+  {
+   struct patternNodeHeader header;
+   unsigned long long matchTimeTag;
+   CLIPSBitMap *classbmp,*slotbmp;
+   OBJECT_PATTERN_NODE *patternNode;
+   struct objectAlphaNode *nxtInGroup,
+                          *nxtTerminal;
+   unsigned long bsaveID;
+  };
+
+struct classAlphaLink
+  {
+   OBJECT_ALPHA_NODE *alphaNode;
+   struct classAlphaLink *next;
+   long bsaveID;
+  };
+
+typedef struct objectMatchAction
+  {
+   int type;
+   Instance *ins;
+   SLOT_BITMAP *slotNameIDs;
+   struct objectMatchAction *nxt;
+  } OBJECT_MATCH_ACTION;
+
+   void                  ObjectMatchDelay(Environment *,UDFContext *,UDFValue *);
+   bool                  SetDelayObjectPatternMatching(Environment *,bool);
+   bool                  GetDelayObjectPatternMatching(Environment *);
+   OBJECT_PATTERN_NODE  *ObjectNetworkPointer(Environment *);
+   OBJECT_ALPHA_NODE    *ObjectNetworkTerminalPointer(Environment *);
+   void                  SetObjectNetworkPointer(Environment *,OBJECT_PATTERN_NODE *);
+   void                  SetObjectNetworkTerminalPointer(Environment *,OBJECT_ALPHA_NODE *);
+   void                  ObjectNetworkAction(Environment *,int,Instance *,int);
+   void                  ResetObjectMatchTimeTags(Environment *);
+
+#endif /* DEFRULE_CONSTRUCT && OBJECT_SYSTEM */
+
+#endif /* _H_objrtmch */
+
+
+
diff --git a/clips/parsefun.c b/clips/parsefun.c
new file mode 100755
index 000000000..962021d1a
--- /dev/null
+++ b/clips/parsefun.c
@@ -0,0 +1,415 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/13/17             */
+   /*                                                     */
+   /*               PARSING FUNCTIONS MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for several parsing related    */
+/*   functions including...                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed function declaration issue when          */
+/*            BLOAD_ONLY compiler flag is set to 1.          */
+/*                                                           */
+/*      6.40: Changed check-syntax router name because of    */
+/*            a conflict with another error-capture router.  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Changed return values for router functions.    */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <string.h>
+
+#include "argacces.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "pprint.h"
+#include "prcdrpsr.h"
+#include "prntutil.h"
+#include "router.h"
+#include "strngrtr.h"
+#include "utility.h"
+
+#include "parsefun.h"
+
+#define PARSEFUN_DATA 11
+
+struct parseFunctionData
+  {
+   char *ErrorString;
+   size_t ErrorCurrentPosition;
+   size_t ErrorMaximumPosition;
+   char *WarningString;
+   size_t WarningCurrentPosition;
+   size_t WarningMaximumPosition;
+  };
+
+#define ParseFunctionData(theEnv) ((struct parseFunctionData *) GetEnvironmentData(theEnv,PARSEFUN_DATA))
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static bool                    QueryErrorCaptureCallback(Environment *,const char *,void *);
+   static void                    WriteErrorCaptureCallback(Environment *,const char *,const char *,void *);
+   static void                    DeactivateErrorCapture(Environment *);
+   static void                    SetErrorCaptureValues(Environment *,UDFValue *);
+#endif
+
+/*****************************************/
+/* ParseFunctionDefinitions: Initializes */
+/*   the parsing related functions.      */
+/*****************************************/
+void ParseFunctionDefinitions(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,PARSEFUN_DATA,sizeof(struct parseFunctionData),NULL);
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"check-syntax","ym",1,1,"s",CheckSyntaxFunction,"CheckSyntaxFunction",NULL);
+#endif
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+/*******************************************/
+/* CheckSyntaxFunction: H/L access routine */
+/*   for the check-syntax function.        */
+/*******************************************/
+void CheckSyntaxFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   /*========================================*/
+   /* The argument should be of type STRING_TYPE. */
+   /*========================================*/
+
+   if (! UDFFirstArgument(context,STRING_BIT,&theArg))
+     { return; }
+
+   /*===================*/
+   /* Check the syntax. */
+   /*===================*/
+
+   CheckSyntax(theEnv,theArg.lexemeValue->contents,returnValue);
+  }
+
+/*********************************/
+/* CheckSyntax: C access routine */
+/*   for the build function.     */
+/*********************************/
+bool CheckSyntax(
+  Environment *theEnv,
+  const char *theString,
+  UDFValue *returnValue)
+  {
+   const char *name;
+   struct token theToken;
+   struct expr *top;
+   bool rv;
+
+   /*==============================*/
+   /* Set the default return value */
+   /* (TRUE for problems found).   */
+   /*==============================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+
+   /*===========================================*/
+   /* Create a string source router so that the */
+   /* string can be used as an input source.    */
+   /*===========================================*/
+
+   if (OpenStringSource(theEnv,"check-syntax",theString,0) == 0)
+     { return true; }
+
+   /*=================================*/
+   /* Only expressions and constructs */
+   /* can have their syntax checked.  */
+   /*=================================*/
+
+   GetToken(theEnv,"check-syntax",&theToken);
+
+   if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      CloseStringSource(theEnv,"check-syntax");
+      returnValue->lexemeValue = CreateSymbol(theEnv,"MISSING-LEFT-PARENTHESIS");
+      return true;
+     }
+
+   /*========================================*/
+   /* The next token should be the construct */
+   /* type or function name.                 */
+   /*========================================*/
+
+   GetToken(theEnv,"check-syntax",&theToken);
+   if (theToken.tknType != SYMBOL_TOKEN)
+     {
+      CloseStringSource(theEnv,"check-syntax");
+      returnValue->lexemeValue = CreateSymbol(theEnv,"EXPECTED-SYMBOL_TYPE-AFTER-LEFT-PARENTHESIS");
+      return true;
+     }
+
+   name = theToken.lexemeValue->contents;
+
+   /*==============================================*/
+   /* Set up a router to capture the error output. */
+   /*==============================================*/
+
+   AddRouter(theEnv,"cs-error-capture",40,
+             QueryErrorCaptureCallback,WriteErrorCaptureCallback,
+             NULL,NULL,NULL,NULL);
+
+   /*================================*/
+   /* Determine if it's a construct. */
+   /*================================*/
+
+   if (FindConstruct(theEnv,name))
+     {
+      ConstructData(theEnv)->CheckSyntaxMode = true;
+      
+      if (ParseConstruct(theEnv,name,"check-syntax") == BE_PARSING_ERROR)
+        { rv = true; }
+       else
+        { rv = false; }
+         
+      GetToken(theEnv,"check-syntax",&theToken);
+      ConstructData(theEnv)->CheckSyntaxMode = false;
+
+      if (rv)
+        {
+         WriteString(theEnv,STDERR,"\nERROR:\n");
+         WriteString(theEnv,STDERR,GetPPBuffer(theEnv));
+         WriteString(theEnv,STDERR,"\n");
+        }
+
+      DestroyPPBuffer(theEnv);
+
+      CloseStringSource(theEnv,"check-syntax");
+
+      if ((rv != false) || (ParseFunctionData(theEnv)->WarningString != NULL))
+        {
+         SetErrorCaptureValues(theEnv,returnValue);
+         DeactivateErrorCapture(theEnv);
+         return true;
+        }
+
+      if (theToken.tknType != STOP_TOKEN)
+        {
+         returnValue->value = CreateSymbol(theEnv,"EXTRANEOUS-INPUT-AFTER-LAST-PARENTHESIS");
+         DeactivateErrorCapture(theEnv);
+         return true;
+        }
+
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      DeactivateErrorCapture(theEnv);
+      return false;
+     }
+
+   /*=======================*/
+   /* Parse the expression. */
+   /*=======================*/
+
+   top = Function2Parse(theEnv,"check-syntax",name);
+   GetToken(theEnv,"check-syntax",&theToken);
+   ClearParsedBindNames(theEnv);
+   CloseStringSource(theEnv,"check-syntax");
+
+   if (top == NULL)
+     {
+      SetErrorCaptureValues(theEnv,returnValue);
+      DeactivateErrorCapture(theEnv);
+      return true;
+     }
+
+   if (theToken.tknType != STOP_TOKEN)
+     {
+      returnValue->lexemeValue = CreateSymbol(theEnv,"EXTRANEOUS-INPUT-AFTER-LAST-PARENTHESIS");
+      DeactivateErrorCapture(theEnv);
+      ReturnExpression(theEnv,top);
+      return true;
+     }
+
+   DeactivateErrorCapture(theEnv);
+
+   ReturnExpression(theEnv,top);
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+   return false;
+  }
+
+/**************************************************/
+/* DeactivateErrorCapture: Deactivates the error  */
+/*   capture router and the strings used to store */
+/*   the captured information.                    */
+/**************************************************/
+static void DeactivateErrorCapture(
+  Environment *theEnv)
+  {
+   if (ParseFunctionData(theEnv)->ErrorString != NULL)
+     {
+      rm(theEnv,ParseFunctionData(theEnv)->ErrorString,ParseFunctionData(theEnv)->ErrorMaximumPosition);
+      ParseFunctionData(theEnv)->ErrorString = NULL;
+     }
+
+   if (ParseFunctionData(theEnv)->WarningString != NULL)
+     {
+      rm(theEnv,ParseFunctionData(theEnv)->WarningString,ParseFunctionData(theEnv)->WarningMaximumPosition);
+      ParseFunctionData(theEnv)->WarningString = NULL;
+     }
+
+   ParseFunctionData(theEnv)->ErrorCurrentPosition = 0;
+   ParseFunctionData(theEnv)->ErrorMaximumPosition = 0;
+   ParseFunctionData(theEnv)->WarningCurrentPosition = 0;
+   ParseFunctionData(theEnv)->WarningMaximumPosition = 0;
+
+   DeleteRouter(theEnv,"cs-error-capture");
+  }
+
+/*******************************************************************/
+/* SetErrorCaptureValues: Stores the error/warnings captured when  */
+/*   parsing an expression or construct into a multifield value.   */
+/*   The first field contains the output sent to the STDERR        */
+/*   logical name and the second field contains the output sent    */
+/*   to the STDWRN logical name. The symbol FALSE is stored in   */
+/*   either position if no output was sent to those logical names. */
+/*******************************************************************/
+static void SetErrorCaptureValues(
+  Environment *theEnv,
+  UDFValue *returnValue)
+  {
+   Multifield *theMultifield;
+
+   theMultifield = CreateMultifield(theEnv,2L);
+
+   if (ParseFunctionData(theEnv)->ErrorString != NULL)
+     { theMultifield->contents[0].lexemeValue = CreateString(theEnv,ParseFunctionData(theEnv)->ErrorString); }
+   else
+     { theMultifield->contents[0].lexemeValue = FalseSymbol(theEnv); }
+
+   if (ParseFunctionData(theEnv)->WarningString != NULL)
+     { theMultifield->contents[1].lexemeValue = CreateString(theEnv,ParseFunctionData(theEnv)->WarningString); }
+   else
+     { theMultifield->contents[1].lexemeValue = FalseSymbol(theEnv); }
+
+   returnValue->begin = 0;
+   returnValue->range = 2;
+   returnValue->value = theMultifield;
+  }
+
+/*********************************************/
+/* QueryErrorCaptureCallback: Query callback */
+/*   for the check-syntax router.            */
+/*********************************************/
+static bool QueryErrorCaptureCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+#if MAC_XCD
+#pragma unused(theEnv,context)
+#endif
+
+   if ((strcmp(logicalName,STDERR) == 0) ||
+       (strcmp(logicalName,STDWRN) == 0))
+     { return true; }
+
+   return false;
+  }
+
+/*********************************************/
+/* WriteErrorCaptureCallback: Write callback */
+/*   for the check-syntax router.            */
+/*********************************************/
+static void WriteErrorCaptureCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *str,
+  void *context)
+  {
+   if (strcmp(logicalName,STDERR) == 0)
+     {
+      ParseFunctionData(theEnv)->ErrorString = AppendToString(theEnv,str,ParseFunctionData(theEnv)->ErrorString,
+                                   &ParseFunctionData(theEnv)->ErrorCurrentPosition,
+                                   &ParseFunctionData(theEnv)->ErrorMaximumPosition);
+     }
+   else if (strcmp(logicalName,STDWRN) == 0)
+     {
+      ParseFunctionData(theEnv)->WarningString = AppendToString(theEnv,str,ParseFunctionData(theEnv)->WarningString,
+                                     &ParseFunctionData(theEnv)->WarningCurrentPosition,
+                                     &ParseFunctionData(theEnv)->WarningMaximumPosition);
+     }
+  }
+
+#else
+/****************************************************/
+/* CheckSyntaxFunction: This is the non-functional  */
+/*   stub provided for use with a run-time version. */
+/****************************************************/
+void CheckSyntaxFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PrintErrorID(theEnv,"PARSEFUN",1,false);
+   WriteString(theEnv,STDERR,"Function check-syntax does not work in run time modules.\n");
+   returnValue->value = TrueSymbol(theEnv);
+  }
+
+/************************************************/
+/* CheckSyntax: This is the non-functional stub */
+/*   provided for use with a run-time version.  */
+/************************************************/
+bool CheckSyntax(
+  Environment *theEnv,
+  const char *theString,
+  UDFValue *returnValue)
+  {
+   PrintErrorID(theEnv,"PARSEFUN",1,false);
+   WriteString(theEnv,STDERR,"Function check-syntax does not work in run time modules.\n");
+   returnValue->value = TrueSymbol(theEnv);
+   return true;
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+
diff --git a/clips/parsefun.h b/clips/parsefun.h
new file mode 100755
index 000000000..11666fb59
--- /dev/null
+++ b/clips/parsefun.h
@@ -0,0 +1,67 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*            PARSING FUNCTIONS HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for several parsing related    */
+/*   functions including...                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed function declaration issue when          */
+/*            BLOAD_ONLY compiler flag is set to 1.          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_parsefun
+
+#pragma once
+
+#define _H_parsefun
+
+#include "evaluatn.h"
+
+   void                           ParseFunctionDefinitions(Environment *);
+   void                           CheckSyntaxFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           CheckSyntax(Environment *,const char *,UDFValue *);
+
+#endif /* _H_parsefun */
+
+
+
+
+
diff --git a/clips/pattern.c b/clips/pattern.c
new file mode 100755
index 000000000..57d65a5e3
--- /dev/null
+++ b/clips/pattern.c
@@ -0,0 +1,1265 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                 RULE PATTERN MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides the mechanism for recognizing and       */
+/*   parsing the various types of patterns that can be used  */
+/*   in the LHS of a rule. In version 6.0, the only pattern  */
+/*   types provided are for deftemplate and instance         */
+/*   patterns.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#if DEFRULE_CONSTRUCT
+
+#include "constant.h"
+#include "constrnt.h"
+#include "cstrnchk.h"
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "match.h"
+#include "memalloc.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "router.h"
+#include "rulecmp.h"
+
+#include "pattern.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static struct lhsParseNode            *ConjuctiveRestrictionParse(Environment *,const char *,struct token *,bool *);
+   static struct lhsParseNode            *LiteralRestrictionParse(Environment *,const char *,struct token *,bool *);
+   static bool                            CheckForVariableMixing(Environment *,struct lhsParseNode *);
+   static void                            TallyFieldTypes(struct lhsParseNode *);
+#endif
+   static void                            DeallocatePatternData(Environment *);
+   static struct patternNodeHashEntry   **CreatePatternHashTable(Environment *,unsigned long);
+
+/*****************************************************************************/
+/* InitializePatterns: Initializes the global data associated with patterns. */
+/*****************************************************************************/
+void InitializePatterns(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,PATTERN_DATA,sizeof(struct patternData),DeallocatePatternData);
+   PatternData(theEnv)->NextPosition = 1;
+   PatternData(theEnv)->PatternHashTable = CreatePatternHashTable(theEnv,SIZE_PATTERN_HASH);
+   PatternData(theEnv)->PatternHashTableSize = SIZE_PATTERN_HASH;
+  }
+
+/*******************************************************************/
+/* CreatePatternHashTable: Creates and initializes a fact hash table. */
+/*******************************************************************/
+static struct patternNodeHashEntry **CreatePatternHashTable(
+   Environment *theEnv,
+   unsigned long tableSize)
+   {
+    unsigned long i;
+    struct patternNodeHashEntry **theTable;
+
+    theTable = (struct patternNodeHashEntry **)
+               gm2(theEnv,sizeof (struct patternNodeHashEntry *) * tableSize);
+
+    if (theTable == NULL) ExitRouter(theEnv,EXIT_FAILURE);
+
+    for (i = 0; i < tableSize; i++) theTable[i] = NULL;
+
+    return(theTable);
+   }
+
+/**************************************************/
+/* DeallocatePatternData: Deallocates environment */
+/*    data for rule pattern registration.         */
+/**************************************************/
+static void DeallocatePatternData(
+  Environment *theEnv)
+  {
+   struct reservedSymbol *tmpRSPtr, *nextRSPtr;
+   struct patternParser *tmpPPPtr, *nextPPPtr;
+   struct patternNodeHashEntry *tmpPNEPtr, *nextPNEPtr;
+   unsigned long i;
+
+   tmpRSPtr = PatternData(theEnv)->ListOfReservedPatternSymbols;
+   while (tmpRSPtr != NULL)
+     {
+      nextRSPtr = tmpRSPtr->next;
+      rtn_struct(theEnv,reservedSymbol,tmpRSPtr);
+      tmpRSPtr = nextRSPtr;
+     }
+
+   tmpPPPtr = PatternData(theEnv)->ListOfPatternParsers;
+   while (tmpPPPtr != NULL)
+     {
+      nextPPPtr = tmpPPPtr->next;
+      rtn_struct(theEnv,patternParser,tmpPPPtr);
+      tmpPPPtr = nextPPPtr;
+     }
+
+   for (i = 0; i < PatternData(theEnv)->PatternHashTableSize; i++)
+     {
+      tmpPNEPtr = PatternData(theEnv)->PatternHashTable[i];
+
+      while (tmpPNEPtr != NULL)
+        {
+         nextPNEPtr = tmpPNEPtr->next;
+         rtn_struct(theEnv,patternNodeHashEntry,tmpPNEPtr);
+         tmpPNEPtr = nextPNEPtr;
+        }
+     }
+
+   rm(theEnv,PatternData(theEnv)->PatternHashTable,
+       sizeof(struct patternNodeHashEntry *) * PatternData(theEnv)->PatternHashTableSize);
+  }
+
+/******************************************************************************/
+/* AddHashedPatternNode: Adds a pattern node entry to the pattern hash table. */
+/******************************************************************************/
+void AddHashedPatternNode(
+  Environment *theEnv,
+  void *parent,
+  void *child,
+  unsigned short keyType,
+  void *keyValue)
+  {
+   size_t hashValue;
+   struct patternNodeHashEntry *newhash, *temp;
+
+   hashValue = GetAtomicHashValue(keyType,keyValue,1) + HashExternalAddress(parent,0); /* TBD mult * 30 */
+
+   newhash = get_struct(theEnv,patternNodeHashEntry);
+   newhash->parent = parent;
+   newhash->child = child;
+   newhash->type = keyType;
+   newhash->value = keyValue;
+
+   hashValue = (hashValue % PatternData(theEnv)->PatternHashTableSize);
+
+   temp = PatternData(theEnv)->PatternHashTable[hashValue];
+   PatternData(theEnv)->PatternHashTable[hashValue] = newhash;
+   newhash->next = temp;
+  }
+
+/***************************************************/
+/* RemoveHashedPatternNode: Removes a pattern node */
+/*   entry from the pattern node hash table.       */
+/***************************************************/
+bool RemoveHashedPatternNode(
+  Environment *theEnv,
+  void *parent,
+  void *child,
+  unsigned short keyType,
+  void *keyValue)
+  {
+   size_t hashValue;
+   struct patternNodeHashEntry *hptr, *prev;
+
+   hashValue = GetAtomicHashValue(keyType,keyValue,1) + HashExternalAddress(parent,0); /* TBD mult * 30 */
+   hashValue = (hashValue % PatternData(theEnv)->PatternHashTableSize);
+
+   for (hptr = PatternData(theEnv)->PatternHashTable[hashValue], prev = NULL;
+        hptr != NULL;
+        hptr = hptr->next)
+     {
+      if (hptr->child == child)
+        {
+         if (prev == NULL)
+           {
+            PatternData(theEnv)->PatternHashTable[hashValue] = hptr->next;
+            rtn_struct(theEnv,patternNodeHashEntry,hptr);
+            return true;
+           }
+         else
+           {
+            prev->next = hptr->next;
+            rtn_struct(theEnv,patternNodeHashEntry,hptr);
+            return true;
+           }
+        }
+      prev = hptr;
+     }
+
+   return false;
+  }
+
+/***********************************************/
+/* FindHashedPatternNode: Finds a pattern node */
+/*   entry in the pattern node hash table.     */
+/***********************************************/
+void *FindHashedPatternNode(
+  Environment *theEnv,
+  void *parent,
+  unsigned short keyType,
+  void *keyValue)
+  {
+   size_t hashValue;
+   struct patternNodeHashEntry *hptr;
+
+   hashValue = GetAtomicHashValue(keyType,keyValue,1) + HashExternalAddress(parent,0); /* TBD mult * 30 */
+   hashValue = (hashValue % PatternData(theEnv)->PatternHashTableSize);
+
+   for (hptr = PatternData(theEnv)->PatternHashTable[hashValue];
+        hptr != NULL;
+        hptr = hptr->next)
+     {
+      if ((hptr->parent == parent) &&
+          (keyType == hptr->type) &&
+          (keyValue == hptr->value))
+        { return(hptr->child); }
+     }
+
+   return NULL;
+  }
+
+/******************************************************************/
+/* AddReservedPatternSymbol: Adds a symbol to the list of symbols */
+/*  that are restricted for use in patterns. For example, the     */
+/*  deftemplate construct cannot use the symbol "object", since   */
+/*  this needs to be reserved for object patterns. Some symbols,  */
+/*  such as "exists" are completely reserved and can not be used  */
+/*  to start any type of pattern CE.                              */
+/******************************************************************/
+void AddReservedPatternSymbol(
+  Environment *theEnv,
+  const char *theSymbol,
+  const char *reservedBy)
+  {
+   struct reservedSymbol *newSymbol;
+
+   newSymbol = get_struct(theEnv,reservedSymbol);
+   newSymbol->theSymbol = theSymbol;
+   newSymbol->reservedBy = reservedBy;
+   newSymbol->next = PatternData(theEnv)->ListOfReservedPatternSymbols;
+   PatternData(theEnv)->ListOfReservedPatternSymbols = newSymbol;
+  }
+
+/******************************************************************/
+/* ReservedPatternSymbol: Returns true if the specified symbol is */
+/*   a reserved pattern symbol, otherwise false is returned. If   */
+/*   the construct which is trying to use the symbol is the same  */
+/*   construct that reserved the symbol, then false is returned.  */
+/******************************************************************/
+bool ReservedPatternSymbol(
+  Environment *theEnv,
+  const char *theSymbol,
+  const char *checkedBy)
+  {
+   struct reservedSymbol *currentSymbol;
+
+   for (currentSymbol = PatternData(theEnv)->ListOfReservedPatternSymbols;
+        currentSymbol != NULL;
+        currentSymbol = currentSymbol->next)
+     {
+      if (strcmp(theSymbol,currentSymbol->theSymbol) == 0)
+        {
+         if ((currentSymbol->reservedBy == NULL) || (checkedBy ==  NULL))
+           { return true; }
+
+         if (strcmp(checkedBy,currentSymbol->reservedBy) == 0) return false;
+
+         return true;
+        }
+     }
+
+   return false;
+  }
+
+/********************************************************/
+/* ReservedPatternSymbolErrorMsg: Generic error message */
+/*   for attempting to use a reserved pattern symbol.   */
+/********************************************************/
+void ReservedPatternSymbolErrorMsg(
+  Environment *theEnv,
+  const char *theSymbol,
+  const char *usedFor)
+  {
+   PrintErrorID(theEnv,"PATTERN",1,true);
+   WriteString(theEnv,STDERR,"The symbol '");
+   WriteString(theEnv,STDERR,theSymbol);
+   WriteString(theEnv,STDERR,"' has special meaning ");
+   WriteString(theEnv,STDERR,"and may not be used as ");
+   WriteString(theEnv,STDERR,usedFor);
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/************************************************************/
+/* GetNextEntity: Utility routine for accessing all of the  */
+/*   data entities that can match patterns. Currently facts */
+/*   and instances are the only data entities available.    */
+/************************************************************/
+void GetNextPatternEntity(
+  Environment *theEnv,
+  struct patternParser **theParser,
+  struct patternEntity **theEntity)
+  {
+
+   /*=============================================================*/
+   /* If the current parser is NULL, then we want to retrieve the */
+   /* very first data entity. The traversal of entities is done   */
+   /* by entity type (e.g. all facts are traversed followed by    */
+   /* all instances). To get the first entity type to traverse,   */
+   /* the current parser is set to the first parser on the list   */
+   /* of pattern parsers.                                         */
+   /*=============================================================*/
+
+   if (*theParser == NULL)
+     {
+      *theParser = PatternData(theEnv)->ListOfPatternParsers;
+      *theEntity = NULL;
+     }
+
+   /*================================================================*/
+   /* Otherwise try to retrieve the next entity following the entity */
+   /* returned by the last call to GetNextEntity. If that entity was */
+   /* the last of its data type, then move on to the next pattern    */
+   /* parser, otherwise return that entity as the next one.          */
+   /*================================================================*/
+
+   else if (theEntity != NULL)
+     {
+      *theEntity = (struct patternEntity *)
+                   (*(*theParser)->entityType->base.getNextFunction)(theEnv,*theEntity);
+
+      if ((*theEntity) != NULL) return;
+
+      *theParser = (*theParser)->next;
+     }
+
+   /*===============================================================*/
+   /* Otherwise, we encountered a situation which should not occur. */
+   /* Once a NULL entity is returned from GetNextEntity, it should  */
+   /* not be passed back to GetNextEntity.                          */
+   /*===============================================================*/
+
+   else
+     {
+      SystemError(theEnv,"PATTERN",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   /*================================================*/
+   /* Keep looping through the lists of entities and */
+   /* pattern parsers until an entity is found.      */
+   /*================================================*/
+
+   while ((*theEntity == NULL) && (*theParser != NULL))
+     {
+      *theEntity = (struct patternEntity *)
+                   (*(*theParser)->entityType->base.getNextFunction)(theEnv,*theEntity);
+
+      if (*theEntity != NULL) return;
+
+      *theParser = (*theParser)->next;
+     }
+
+   return;
+  }
+
+/**************************************************************/
+/* DetachPattern: Detaches a pattern from the pattern network */
+/*   by calling the appropriate function for the data type    */
+/*   associated with the pattern.                             */
+/**************************************************************/
+void DetachPattern(
+  Environment *theEnv,
+  unsigned short rhsType,
+  struct patternNodeHeader *theHeader)
+  {
+   if (rhsType == 0) return;
+
+   if (PatternData(theEnv)->PatternParserArray[rhsType-1] != NULL)
+     {
+      FlushAlphaMemory(theEnv,theHeader);
+      (*PatternData(theEnv)->PatternParserArray[rhsType-1]->removePatternFunction)(theEnv,theHeader);
+     }
+  }
+
+/**************************************************/
+/* AddPatternParser: Adds a pattern type to the   */
+/*   list of pattern parsers used to detect valid */
+/*   patterns in the LHS of a rule.               */
+/**************************************************/
+bool AddPatternParser(
+  Environment *theEnv,
+  struct patternParser *newPtr)
+  {
+   struct patternParser *currentPtr, *lastPtr = NULL;
+
+   /*============================================*/
+   /* Check to see that the limit for the number */
+   /* of pattern parsers has not been exceeded.  */
+   /*============================================*/
+
+   if (PatternData(theEnv)->NextPosition >= MAX_POSITIONS) return false;
+
+   /*================================*/
+   /* Create the new pattern parser. */
+   /*================================*/
+
+   newPtr->positionInArray = PatternData(theEnv)->NextPosition;
+   PatternData(theEnv)->PatternParserArray[PatternData(theEnv)->NextPosition-1] = newPtr;
+   PatternData(theEnv)->NextPosition++;
+
+   /*================================*/
+   /* Add the parser to the list of  */
+   /* parsers based on its priority. */
+   /*================================*/
+
+   if (PatternData(theEnv)->ListOfPatternParsers == NULL)
+     {
+      newPtr->next = NULL;
+      PatternData(theEnv)->ListOfPatternParsers = newPtr;
+      return true;
+     }
+
+   currentPtr = PatternData(theEnv)->ListOfPatternParsers;
+   while ((currentPtr != NULL) ? (newPtr->priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = PatternData(theEnv)->ListOfPatternParsers;
+      PatternData(theEnv)->ListOfPatternParsers = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   return true;
+  }
+
+/****************************************************/
+/* FindPatternParser: Searches for a pattern parser */
+/*  that can parse a pattern beginning with the     */
+/*  specified keyword (e.g. "object").              */
+/****************************************************/
+struct patternParser *FindPatternParser(
+  Environment *theEnv,
+  const char *name)
+  {
+   struct patternParser *tempParser;
+
+   for (tempParser = PatternData(theEnv)->ListOfPatternParsers;
+        tempParser != NULL;
+        tempParser = tempParser->next)
+     { if (strcmp(tempParser->name,name) == 0) return(tempParser); }
+
+   return NULL;
+  }
+
+/******************************************************/
+/* GetPatternParser: Returns a pointer to the pattern */
+/*    parser for the specified data entity.           */
+/******************************************************/
+struct patternParser *GetPatternParser(
+  Environment *theEnv,
+  unsigned short rhsType)
+  {
+   if (rhsType == 0) return NULL;
+
+   return(PatternData(theEnv)->PatternParserArray[rhsType-1]);
+  }
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+
+/*************************************************************/
+/* PatternNodeHeaderToCode: Writes the C code representation */
+/*   of a patternNodeHeader data structure.                  */
+/*************************************************************/
+void PatternNodeHeaderToCode(
+  Environment *theEnv,
+  FILE *fp,
+  struct patternNodeHeader *theHeader,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(fp,"{NULL,NULL,");
+
+   if (theHeader->entryJoin == NULL)
+     { fprintf(fp,"NULL,"); }
+   else
+     {
+      fprintf(fp,"&%s%u_%lu[%lu],",
+                 JoinPrefix(),imageID,
+                 (theHeader->entryJoin->bsaveID / maxIndices) + 1,
+                 theHeader->entryJoin->bsaveID % maxIndices);
+     }
+
+   PrintHashedExpressionReference(theEnv,fp,theHeader->rightHash,imageID,maxIndices);
+
+   fprintf(fp,",%d,%d,%d,0,0,%d,%d,%d}",theHeader->singlefieldNode,
+                                     theHeader->multifieldNode,
+                                     theHeader->stopNode,
+                                     theHeader->beginSlot,
+                                     theHeader->endSlot,
+                                     theHeader->selector);
+  }
+
+#endif /* CONSTRUCT_COMPILER && (! RUN_TIME) */
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/****************************************************************/
+/* PostPatternAnalysis: Calls the post analysis routines for    */
+/*   each of the pattern parsers to allow additional processing */
+/*   by the pattern parser after the variable analysis routines */
+/*   have analyzed the LHS patterns.                            */
+/****************************************************************/
+bool PostPatternAnalysis(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS)
+  {
+   struct lhsParseNode *patternPtr;
+   struct patternParser *tempParser;
+
+   for (patternPtr = theLHS; patternPtr != NULL; patternPtr = patternPtr->bottom)
+     {
+      if ((patternPtr->pnType == PATTERN_CE_NODE) && (patternPtr->patternType != NULL))
+        {
+         tempParser = patternPtr->patternType;
+         if (tempParser->postAnalysisFunction != NULL)
+           { if ((*tempParser->postAnalysisFunction)(theEnv,patternPtr)) return true; }
+        }
+     }
+
+   return false;
+  }
+
+/******************************************************************/
+/* RestrictionParse: Parses a single field within a pattern. This */
+/*    field may either be a single field wildcard, a multifield   */
+/*    wildcard, a single field variable, a multifield variable,   */
+/*    or a series of connected constraints.                       */
+/*                                                                */
+/* <constraint> ::= ? |                                           */
+/*                  $? |                                          */
+/*                  <connected-constraint>                        */
+/******************************************************************/
+struct lhsParseNode *RestrictionParse(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  bool multifieldSlot,
+  CLIPSLexeme *theSlot,
+  unsigned short slotNumber,
+  CONSTRAINT_RECORD *theConstraints,
+  unsigned short position)
+  {
+   struct lhsParseNode *topNode = NULL, *lastNode = NULL, *nextNode;
+   int numberOfSingleFields = 0;
+   int numberOfMultifields = 0;
+   unsigned short startPosition = position;
+   bool error = false;
+   CONSTRAINT_RECORD *tempConstraints;
+
+   /*==================================================*/
+   /* Keep parsing fields until a right parenthesis is */
+   /* encountered. This will either indicate the end   */
+   /* of an instance or deftemplate slot or the end of */
+   /* an ordered fact.                                 */
+   /*==================================================*/
+
+   while (theToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      /*========================================*/
+      /* Look for either a single or multifield */
+      /* wildcard or a conjuctive restriction.  */
+      /*========================================*/
+
+      if ((theToken->tknType == SF_WILDCARD_TOKEN) ||
+          (theToken->tknType == MF_WILDCARD_TOKEN))
+        {
+         nextNode = GetLHSParseNode(theEnv);
+         if (theToken->tknType == SF_WILDCARD_TOKEN)
+           { nextNode->pnType = SF_WILDCARD_NODE; }
+         else
+           { nextNode->pnType = MF_WILDCARD_NODE; }
+         nextNode->negated = false;
+         nextNode->exists = false;
+         GetToken(theEnv,readSource,theToken);
+        }
+      else
+        {
+         nextNode = ConjuctiveRestrictionParse(theEnv,readSource,theToken,&error);
+         if (nextNode == NULL)
+           {
+            ReturnLHSParseNodes(theEnv,topNode);
+            return NULL;
+           }
+        }
+
+      /*========================================================*/
+      /* Fix up the pretty print representation of a multifield */
+      /* slot so that the fields don't run together.            */
+      /*========================================================*/
+
+      if ((theToken->tknType != RIGHT_PARENTHESIS_TOKEN) && (multifieldSlot == true))
+        {
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv," ");
+         SavePPBuffer(theEnv,theToken->printForm);
+        }
+
+      /*========================================*/
+      /* Keep track of the number of single and */
+      /* multifield restrictions encountered.   */
+      /*========================================*/
+
+      if ((nextNode->pnType == SF_WILDCARD_NODE) ||
+          (nextNode->pnType == SF_VARIABLE_NODE))
+        { numberOfSingleFields++; }
+      else
+        { numberOfMultifields++; }
+
+      /*===================================*/
+      /* Assign the slot name and indices. */
+      /*===================================*/
+
+      nextNode->slot = theSlot;
+      nextNode->slotNumber = slotNumber;
+      nextNode->index = position++;
+
+      /*==============================================*/
+      /* If we're not dealing with a multifield slot, */
+      /* attach the constraints directly to the node  */
+      /* and return.                                  */
+      /*==============================================*/
+
+      if (! multifieldSlot)
+        {
+         if (theConstraints == NULL)
+           {
+            if (nextNode->pnType == SF_VARIABLE_NODE)
+              { nextNode->constraints = GetConstraintRecord(theEnv); }
+            else nextNode->constraints = NULL;
+           }
+         else nextNode->constraints = theConstraints;
+         return(nextNode);
+        }
+
+      /*====================================================*/
+      /* Attach the restriction to the list of restrictions */
+      /* already parsed for this slot or ordered fact.      */
+      /*====================================================*/
+
+      if (lastNode == NULL) topNode = nextNode;
+      else lastNode->right = nextNode;
+
+      lastNode = nextNode;
+     }
+
+   /*=====================================================*/
+   /* Once we're through parsing, check to make sure that */
+   /* a single field slot was given a restriction. If the */
+   /* following test fails, then we know we're dealing    */
+   /* with a multifield slot.                             */
+   /*=====================================================*/
+
+   if ((topNode == NULL) && (! multifieldSlot))
+     {
+      SyntaxErrorMessage(theEnv,"defrule");
+      return NULL;
+     }
+
+   /*===============================================*/
+   /* Loop through each of the restrictions in the  */
+   /* list of restrictions for the multifield slot. */
+   /*===============================================*/
+
+   for (nextNode = topNode; nextNode != NULL; nextNode = nextNode->right)
+     {
+      /*===================================================*/
+      /* Assign a constraint record to each constraint. If */
+      /* the slot has an explicit constraint, then copy    */
+      /* this and store it with the constraint. Otherwise, */
+      /* create a constraint record for a single field     */
+      /* constraint and skip the constraint modifications  */
+      /* for a multifield constraint.                      */
+      /*===================================================*/
+
+      if (theConstraints == NULL)
+        {
+         if (nextNode->pnType == SF_VARIABLE_NODE)
+           { nextNode->constraints = GetConstraintRecord(theEnv); }
+         else
+           { continue; }
+        }
+      else
+        { nextNode->constraints = CopyConstraintRecord(theEnv,theConstraints); }
+
+      /*==========================================*/
+      /* Remove the min and max field constraints */
+      /* for the entire slot from the constraint  */
+      /* record for this single constraint.       */
+      /*==========================================*/
+
+      ReturnExpression(theEnv,nextNode->constraints->minFields);
+      ReturnExpression(theEnv,nextNode->constraints->maxFields);
+      nextNode->constraints->minFields = GenConstant(theEnv,SYMBOL_TYPE,SymbolData(theEnv)->NegativeInfinity);
+      nextNode->constraints->maxFields = GenConstant(theEnv,SYMBOL_TYPE,SymbolData(theEnv)->PositiveInfinity);
+      nextNode->derivedConstraints = true;
+
+      /*====================================================*/
+      /* If we're not dealing with a multifield constraint, */
+      /* then no further modifications are needed to the    */
+      /* min and max constraints for this constraint.       */
+      /*====================================================*/
+
+      if ((nextNode->pnType != MF_WILDCARD_NODE) && (nextNode->pnType != MF_VARIABLE_NODE))
+        { continue; }
+
+      /*==========================================================*/
+      /* Create a separate constraint record to keep track of the */
+      /* cardinality information for this multifield constraint.  */
+      /*==========================================================*/
+
+      tempConstraints = GetConstraintRecord(theEnv);
+      SetConstraintType(MULTIFIELD_TYPE,tempConstraints);
+      tempConstraints->singlefieldsAllowed = false;
+      tempConstraints->multifield = nextNode->constraints;
+      nextNode->constraints = tempConstraints;
+
+      /*=====================================================*/
+      /* Adjust the min and max field values for this single */
+      /* multifield constraint based on the min and max      */
+      /* fields for the entire slot and the number of single */
+      /* field values contained in the slot.                 */
+      /*=====================================================*/
+
+      if (theConstraints->maxFields->value != SymbolData(theEnv)->PositiveInfinity)
+        {
+         ReturnExpression(theEnv,tempConstraints->maxFields);
+         tempConstraints->maxFields = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,theConstraints->maxFields->integerValue->contents - numberOfSingleFields));
+        }
+
+      if ((numberOfMultifields == 1) && (theConstraints->minFields->value != SymbolData(theEnv)->NegativeInfinity))
+        {
+         ReturnExpression(theEnv,tempConstraints->minFields);
+         tempConstraints->minFields = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,theConstraints->minFields->integerValue->contents - numberOfSingleFields));
+        }
+     }
+
+   /*================================================*/
+   /* If a multifield slot is being parsed, place a  */
+   /* node on top of the list of constraints parsed. */
+   /*================================================*/
+
+   if (multifieldSlot)
+     {
+      nextNode = GetLHSParseNode(theEnv);
+      nextNode->pnType = MF_WILDCARD_NODE;
+      nextNode->multifieldSlot = true;
+      nextNode->bottom = topNode;
+      nextNode->slot = theSlot;
+      nextNode->slotNumber = slotNumber;
+      nextNode->index = startPosition;
+      nextNode->constraints = theConstraints;
+      topNode = nextNode;
+      TallyFieldTypes(topNode->bottom);
+     }
+
+   /*=================================*/
+   /* Return the list of constraints. */
+   /*=================================*/
+
+   return(topNode);
+  }
+
+/***************************************************************/
+/* TallyFieldTypes: Determines the number of single field and  */
+/*   multifield variables and wildcards that appear before and */
+/*   after each restriction found in a multifield slot.        */
+/***************************************************************/
+static void TallyFieldTypes(
+  struct lhsParseNode *theRestrictions)
+  {
+   struct lhsParseNode *tempNode1, *tempNode2, *tempNode3;
+   unsigned short totalSingleFields = 0, totalMultiFields = 0;
+   unsigned short runningSingleFields = 0, runningMultiFields = 0;
+
+   /*========================================*/
+   /* Compute the total number of single and */
+   /* multifield variables and wildcards.    */
+   /*========================================*/
+
+   for (tempNode1 = theRestrictions; tempNode1 != NULL; tempNode1 = tempNode1->right)
+     {
+      if ((tempNode1->pnType == SF_VARIABLE_NODE) || (tempNode1->pnType == SF_WILDCARD_NODE))
+        { totalSingleFields++; }
+      else
+        { totalMultiFields++; }
+     }
+
+   /*======================================================*/
+   /* Loop through each constraint tallying the numbers of */
+   /* the variable types before and after along the way.   */
+   /*======================================================*/
+
+   for (tempNode1 = theRestrictions; tempNode1 != NULL; tempNode1 = tempNode1->right)
+     {
+      /*===================================*/
+      /* Assign the values to the "binding */
+      /* variable" node of the constraint. */
+      /*===================================*/
+
+      tempNode1->singleFieldsBefore = runningSingleFields;
+      tempNode1->multiFieldsBefore = runningMultiFields;
+      tempNode1->withinMultifieldSlot = true;
+
+      if ((tempNode1->pnType == SF_VARIABLE_NODE) || (tempNode1->pnType == SF_WILDCARD_NODE))
+        {
+         tempNode1->singleFieldsAfter = totalSingleFields - (runningSingleFields + 1);
+         tempNode1->multiFieldsAfter = totalMultiFields - runningMultiFields;
+        }
+      else
+        {
+         tempNode1->singleFieldsAfter = totalSingleFields - runningSingleFields;
+         tempNode1->multiFieldsAfter = totalMultiFields - (runningMultiFields + 1);
+        }
+
+      /*=====================================================*/
+      /* Assign the values to each of the and (&) and or (|) */
+      /* connected constraints within the constraint.        */
+      /*=====================================================*/
+
+      for (tempNode2 = tempNode1->bottom; tempNode2 != NULL; tempNode2 = tempNode2->bottom)
+        {
+         for (tempNode3 = tempNode2; tempNode3 != NULL; tempNode3 = tempNode3->right)
+           {
+            tempNode3->singleFieldsBefore = tempNode1->singleFieldsBefore;
+            tempNode3->singleFieldsAfter = tempNode1->singleFieldsAfter;
+            tempNode3->multiFieldsBefore = tempNode1->multiFieldsBefore;
+            tempNode3->multiFieldsAfter = tempNode1->multiFieldsAfter;
+            tempNode3->withinMultifieldSlot = true;
+           }
+        }
+
+      /*=======================================*/
+      /* Calculate the running total of single */
+      /* and multifield constraints.           */
+      /*=======================================*/
+
+      if ((tempNode1->pnType == SF_VARIABLE_NODE) || (tempNode1->pnType == SF_WILDCARD_NODE))
+        { runningSingleFields++; }
+      else
+        { runningMultiFields++; }
+     }
+  }
+
+/*******************************************************************/
+/* ConjuctiveRestrictionParse: Parses a single constraint field in */
+/*   a pattern that is not a single field wildcard, multifield     */
+/*   wildcard, or multifield variable. The field may consist of a  */
+/*   number of subfields tied together using the & connective      */
+/*   constraint and/or the | connective constraint.                */
+/*                                                                 */
+/* <connected-constraint>                                          */
+/*            ::= <single-constraint> |                            */
+/*                <single-constraint> & <connected-constraint> |   */
+/*                <single-constraint> | <connected-constraint>     */
+/*******************************************************************/
+static struct lhsParseNode *ConjuctiveRestrictionParse(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  bool *error)
+  {
+   struct lhsParseNode *bindNode;
+   struct lhsParseNode *theNode, *nextOr, *nextAnd;
+   TokenType connectorType;
+
+   /*=====================================*/
+   /* Get the first node and determine if */
+   /* it is a binding variable.           */
+   /*=====================================*/
+
+   theNode = LiteralRestrictionParse(theEnv,readSource,theToken,error);
+
+   if (*error == true)
+     { return NULL; }
+
+   GetToken(theEnv,readSource,theToken);
+
+   if (((theNode->pnType == SF_VARIABLE_NODE) || (theNode->pnType == MF_VARIABLE_NODE)) &&
+       (theNode->negated == false) &&
+       (theToken->tknType != OR_CONSTRAINT_TOKEN))
+     {
+      theNode->bindingVariable = true;
+      bindNode = theNode;
+      nextOr = NULL;
+      nextAnd = NULL;
+     }
+   else
+     {
+      bindNode = GetLHSParseNode(theEnv);
+      if (theNode->pnType == MF_VARIABLE_NODE) bindNode->pnType = MF_WILDCARD_NODE;
+      else bindNode->pnType = SF_WILDCARD_NODE;
+      bindNode->negated = false;
+      bindNode->bottom = theNode;
+      nextOr = theNode;
+      nextAnd = theNode;
+     }
+
+   /*===================================*/
+   /* Process the connected constraints */
+   /* within the constraint             */
+   /*===================================*/
+
+   while ((theToken->tknType == OR_CONSTRAINT_TOKEN) ||
+          (theToken->tknType == AND_CONSTRAINT_TOKEN))
+     {
+      /*==========================*/
+      /* Get the next constraint. */
+      /*==========================*/
+
+      connectorType = theToken->tknType;
+
+      GetToken(theEnv,readSource,theToken);
+      theNode = LiteralRestrictionParse(theEnv,readSource,theToken,error);
+
+      if (*error == true)
+        {
+         ReturnLHSParseNodes(theEnv,bindNode);
+         return NULL;
+        }
+
+      /*=======================================*/
+      /* Attach the new constraint to the list */
+      /* of constraints for this field.        */
+      /*=======================================*/
+
+      if (connectorType == OR_CONSTRAINT_TOKEN)
+        {
+         if (nextOr == NULL)
+           { bindNode->bottom = theNode; }
+         else
+           { nextOr->bottom = theNode; }
+         nextOr = theNode;
+         nextAnd = theNode;
+        }
+      else if (connectorType == AND_CONSTRAINT_TOKEN)
+        {
+         if (nextAnd == NULL)
+           {
+            bindNode->bottom = theNode;
+            nextOr = theNode;
+           }
+         else
+           { nextAnd->right = theNode; }
+         nextAnd = theNode;
+        }
+      else
+        {
+         SystemError(theEnv,"RULEPSR",1);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+
+      /*==================================================*/
+      /* Determine if any more restrictions are connected */
+      /* to the current list of restrictions.             */
+      /*==================================================*/
+
+      GetToken(theEnv,readSource,theToken);
+     }
+
+   /*==========================================*/
+   /* Check for illegal mixing of single and   */
+   /* multifield values within the constraint. */
+   /*==========================================*/
+
+   if (CheckForVariableMixing(theEnv,bindNode))
+     {
+      *error = true;
+      ReturnLHSParseNodes(theEnv,bindNode);
+      return NULL;
+     }
+
+   /*========================*/
+   /* Return the constraint. */
+   /*========================*/
+
+   return(bindNode);
+  }
+
+/*****************************************************/
+/* CheckForVariableMixing: Checks a field constraint */
+/*   to determine if single and multifield variables */
+/*   are illegally mixed within it.                  */
+/*****************************************************/
+static bool CheckForVariableMixing(
+  Environment *theEnv,
+  struct lhsParseNode *theRestriction)
+  {
+   struct lhsParseNode *tempRestriction;
+   CONSTRAINT_RECORD *theConstraint;
+   bool multifield = false;
+   bool singlefield = false;
+   bool constant = false;
+   bool singleReturnValue = false;
+   bool multiReturnValue = false;
+
+   /*================================================*/
+   /* If the constraint contains a binding variable, */
+   /* determine whether it is a single field or      */
+   /* multifield variable.                           */
+   /*================================================*/
+
+   if (theRestriction->pnType == SF_VARIABLE_NODE) singlefield = true;
+   else if (theRestriction->pnType == MF_VARIABLE_NODE) multifield = true;
+
+   /*===========================================*/
+   /* Loop through each of the or (|) connected */
+   /* constraints within the constraint.        */
+   /*===========================================*/
+
+   for (theRestriction = theRestriction->bottom;
+        theRestriction != NULL;
+        theRestriction = theRestriction->bottom)
+     {
+      /*============================================*/
+      /* Loop through each of the and (&) connected */
+      /* constraints within the or (|) constraint.  */
+      /*============================================*/
+
+      for (tempRestriction = theRestriction;
+           tempRestriction != NULL;
+           tempRestriction = tempRestriction->right)
+        {
+         /*=====================================================*/
+         /* Determine if the constraint contains a single field */
+         /* variable, multifield variable, constant (a single   */
+         /* field), a return value constraint of a function     */
+         /* returning a single field value, or a return value   */
+         /* constraint of a function returning a multifield     */
+         /* value.                                              */
+         /*=====================================================*/
+
+         if (tempRestriction->pnType == SF_VARIABLE_NODE) singlefield = true;
+         else if (tempRestriction->pnType == MF_VARIABLE_NODE) multifield = true;
+         else if (ConstantNode(tempRestriction)) constant = true;
+         else if (tempRestriction->pnType == RETURN_VALUE_CONSTRAINT_NODE)
+           {
+            theConstraint = FunctionCallToConstraintRecord(theEnv,tempRestriction->expression->value);
+            if (theConstraint->anyAllowed) { /* Do nothing. */ }
+            else if (theConstraint->multifieldsAllowed) multiReturnValue = true;
+            else singleReturnValue = true;
+            RemoveConstraint(theEnv,theConstraint);
+           }
+        }
+     }
+
+   /*================================================================*/
+   /* Using a single field value (a single field variable, constant, */
+   /* or function returning a single field value) together with a    */
+   /* multifield value (a multifield variable or function returning  */
+   /* a multifield value) is illegal. Return true if this occurs.    */
+   /*================================================================*/
+
+   if ((singlefield || constant || singleReturnValue) &&
+       (multifield || multiReturnValue))
+
+     {
+      PrintErrorID(theEnv,"PATTERN",2,true);
+      WriteString(theEnv,STDERR,"Single and multifield constraints cannot be mixed in a field constraint.\n");
+      return true;
+     }
+
+   /*=======================================*/
+   /* Otherwise return false to indicate no */
+   /* illegal variable mixing was detected. */
+   /*=======================================*/
+
+   return false;
+  }
+
+/***********************************************************/
+/* LiteralRestrictionParse: Parses a single constraint.    */
+/*   The constraint may be a literal constraint, a         */
+/*   predicate constraint, a return value constraint, or a */
+/*   variable constraint. The constraints may also be      */
+/*   negated using the ~ connective constraint.            */
+/*                                                         */
+/* <single-constraint>     ::= <term> | ~<term>            */
+/*                                                         */
+/*  <term>                 ::= <constant> |                */
+/*                             <single-field-variable> |   */
+/*                             <multi-field-variable> |    */
+/*                             :<function-call> |          */
+/*                             =<function-call>            */
+/***********************************************************/
+static struct lhsParseNode *LiteralRestrictionParse(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  bool *error)
+  {
+   struct lhsParseNode *topNode;
+   struct expr *theExpression;
+
+   /*============================================*/
+   /* Create a node to represent the constraint. */
+   /*============================================*/
+
+   topNode = GetLHSParseNode(theEnv);
+
+   /*=================================================*/
+   /* Determine if the constraint has a '~' preceding */
+   /* it. If it  does, then the field is negated      */
+   /* (e.g. ~red means "not the constant red."        */
+   /*=================================================*/
+
+   if (theToken->tknType == NOT_CONSTRAINT_TOKEN)
+     {
+      GetToken(theEnv,readSource,theToken);
+      topNode->negated = true;
+     }
+   else
+     { topNode->negated = false; }
+
+   /*===========================================*/
+   /* Determine if the constraint is one of the */
+   /* recognized types. These are ?variables,   */
+   /* symbols, strings, numbers, :(expression), */
+   /* and =(expression).                        */
+   /*===========================================*/
+
+   /*============================================*/
+   /* Any symbol is valid, but an = signifies a  */
+   /* return value constraint and an : signifies */
+   /* a predicate constraint.                    */
+   /*============================================*/
+
+   if (theToken->tknType == SYMBOL_TOKEN)
+     {
+      /*==============================*/
+      /* If the symbol is an =, parse */
+      /* a return value constraint.   */
+      /*==============================*/
+
+      if (strcmp(theToken->lexemeValue->contents,"=") == 0)
+        {
+         theExpression = Function0Parse(theEnv,readSource);
+         if (theExpression == NULL)
+           {
+            *error = true;
+            ReturnLHSParseNodes(theEnv,topNode);
+            return NULL;
+           }
+         topNode->pnType = RETURN_VALUE_CONSTRAINT_NODE;
+         topNode->expression = ExpressionToLHSParseNodes(theEnv,theExpression);
+         ReturnExpression(theEnv,theExpression);
+        }
+
+      /*=============================*/
+      /* If the symbol is a :, parse */
+      /* a predicate constraint.     */
+      /*=============================*/
+
+      else if (strcmp(theToken->lexemeValue->contents,":") == 0)
+        {
+         theExpression = Function0Parse(theEnv,readSource);
+         if (theExpression == NULL)
+           {
+            *error = true;
+            ReturnLHSParseNodes(theEnv,topNode);
+            return NULL;
+           }
+         topNode->pnType = PREDICATE_CONSTRAINT_NODE;
+         topNode->expression = ExpressionToLHSParseNodes(theEnv,theExpression);
+         ReturnExpression(theEnv,theExpression);
+        }
+
+      /*==============================================*/
+      /* Otherwise, treat the constraint as a symbol. */
+      /*==============================================*/
+
+      else
+        {
+         topNode->pnType = SYMBOL_NODE;
+         topNode->value = theToken->value;
+        }
+     }
+
+   /*=====================================================*/
+   /* Single and multifield variables and float, integer, */
+   /* string, and instance name constants are also valid. */
+   /*=====================================================*/
+
+   else if ((theToken->tknType == SF_VARIABLE_TOKEN)  ||
+            (theToken->tknType == MF_VARIABLE_TOKEN)  ||
+            (theToken->tknType == FLOAT_TOKEN) ||
+            (theToken->tknType == INTEGER_TOKEN) ||
+            (theToken->tknType == STRING_TOKEN) ||
+            (theToken->tknType == INSTANCE_NAME_TOKEN))
+     {
+      topNode->pnType = TypeToNodeType(TokenTypeToType(theToken->tknType));
+      topNode->value = theToken->value;
+     }
+
+   /*===========================*/
+   /* Anything else is invalid. */
+   /*===========================*/
+
+   else
+     {
+      SyntaxErrorMessage(theEnv,"defrule");
+      *error = true;
+      ReturnLHSParseNodes(theEnv,topNode);
+      return NULL;
+     }
+
+   /*===============================*/
+   /* Return the parsed constraint. */
+   /*===============================*/
+
+   return topNode;
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* DEFRULE_CONSTRUCT */
+
+
+
+
diff --git a/clips/pattern.h b/clips/pattern.h
new file mode 100755
index 000000000..819186ed0
--- /dev/null
+++ b/clips/pattern.h
@@ -0,0 +1,163 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*                PATTERN HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides the mechanism for recognizing and       */
+/*   parsing the various types of patterns that can be used  */
+/*   in the LHS of a rule. In version 6.0, the only pattern  */
+/*   types provided are for deftemplate and instance         */
+/*   patterns.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Added support for hashed alpha memories.       */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed initial-fact and initial-object        */
+/*            support.                                       */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_pattern
+
+#pragma once
+
+#define _H_pattern
+
+#include <stdio.h>
+
+#include "evaluatn.h"
+#include "entities.h"
+
+
+#ifndef _H_symbol
+#include "symbol.h"
+#endif
+#ifndef _H_scanner
+#include "scanner.h"
+#endif
+#ifndef _H_expressn
+#include "expressn.h"
+#endif
+#ifndef _H_match
+#include "match.h"
+#endif
+#ifndef _H_reorder
+#include "reorder.h"
+#endif
+#ifndef _H_constrnt
+#include "constrnt.h"
+#endif
+
+#define MAXIMUM_NUMBER_OF_PATTERNS 128
+
+struct patternParser
+  {
+   const char *name;
+   struct patternEntityRecord *entityType;
+   unsigned short positionInArray;
+   bool (*recognizeFunction)(CLIPSLexeme *);
+   struct lhsParseNode *(*parseFunction)(Environment *,const char *,struct token *);
+   bool (*postAnalysisFunction)(Environment *,struct lhsParseNode *);
+   struct patternNodeHeader *(*addPatternFunction)(Environment *,struct lhsParseNode *);
+   void (*removePatternFunction)(Environment *,struct patternNodeHeader *);
+   struct expr *(*genJNConstantFunction)(void *,struct lhsParseNode *,int);
+   void (*replaceGetJNValueFunction)(Environment *,struct expr *,struct lhsParseNode *,int);
+   struct expr *(*genGetJNValueFunction)(Environment *,struct lhsParseNode *,int);
+   struct expr *(*genCompareJNValuesFunction)(Environment *,struct lhsParseNode *,struct lhsParseNode *,bool);
+   struct expr *(*genPNConstantFunction)(Environment *,struct lhsParseNode *);
+   void (*replaceGetPNValueFunction)(Environment *,struct expr *,struct lhsParseNode *);
+   struct expr *(*genGetPNValueFunction)(Environment *,struct lhsParseNode *);
+   struct expr *(*genComparePNValuesFunction)(Environment *,struct lhsParseNode *,struct lhsParseNode *);
+   void (*returnUserDataFunction)(Environment *,void *);
+   void *(*copyUserDataFunction)(Environment *,void *);
+   void (*markIRPatternFunction)(Environment *,struct patternNodeHeader *,bool);
+   void (*incrementalResetFunction)(Environment *);
+   void (*codeReferenceFunction)(Environment *,void *,FILE *,unsigned int,unsigned int);
+   int priority;
+   struct patternParser *next;
+  };
+
+struct reservedSymbol
+  {
+   const char *theSymbol;
+   const char *reservedBy;
+   struct reservedSymbol *next;
+  };
+
+#define MAX_POSITIONS 8
+
+#define PATTERN_DATA 19
+
+struct patternData
+  {
+   struct patternParser *ListOfPatternParsers;
+   struct patternParser *PatternParserArray[MAX_POSITIONS];
+   unsigned short NextPosition;
+   struct reservedSymbol *ListOfReservedPatternSymbols;
+   bool WithinNotCE;
+   int GlobalSalience;
+   bool GlobalAutoFocus;
+   struct expr *SalienceExpression;
+   struct patternNodeHashEntry **PatternHashTable;
+   unsigned long PatternHashTableSize;
+  };
+
+#define PatternData(theEnv) ((struct patternData *) GetEnvironmentData(theEnv,PATTERN_DATA))
+
+   void                           InitializePatterns(Environment *);
+   bool                           AddPatternParser(Environment *,struct patternParser *);
+   struct patternParser          *FindPatternParser(Environment *,const char *);
+   void                           DetachPattern(Environment *,unsigned short,struct patternNodeHeader *);
+   void                           GetNextPatternEntity(Environment *,
+                                                       struct patternParser **,
+                                                       struct patternEntity **);
+   struct patternParser          *GetPatternParser(Environment *,unsigned short);
+   struct lhsParseNode           *RestrictionParse(Environment *,const char *,struct token *,bool,
+                                                   CLIPSLexeme *,unsigned short,
+                                                   struct constraintRecord *,unsigned short);
+   bool                           PostPatternAnalysis(Environment *,struct lhsParseNode *);
+   void                           PatternNodeHeaderToCode(Environment *,FILE *,struct patternNodeHeader *,
+                                                          unsigned int,unsigned int);
+   void                           AddReservedPatternSymbol(Environment *,const char *,const char *);
+   bool                           ReservedPatternSymbol(Environment *,const char *,const char *);
+   void                           ReservedPatternSymbolErrorMsg(Environment *,const char *,const char *);
+   void                           AddHashedPatternNode(Environment *,void *,void *,unsigned short,void *);
+   bool                           RemoveHashedPatternNode(Environment *,void *,void *,unsigned short,void *);
+   void                          *FindHashedPatternNode(Environment *,void *,unsigned short,void *);
+
+#endif /* _H_pattern */
+
+
+
+
+
+
+
+
+
diff --git a/clips/pprint.c b/clips/pprint.c
new file mode 100755
index 000000000..bb39f62e5
--- /dev/null
+++ b/clips/pprint.c
@@ -0,0 +1,328 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/02/17             */
+   /*                                                     */
+   /*                 PRETTY PRINT MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for processing the pretty print         */
+/*   representation of constructs.                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Chris Culbert                                        */
+/*      Brian Dantes                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Corrected code generating compilation          */
+/*            warnings.                                      */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Used genstrcpy instead of strcpy.              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Fix for pretty print buffer overflow.          */
+/*                                                           */
+/*      6.40: Added NULL pointer check in CopyPPBuffer.      */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "setup.h"
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "pprint.h"
+
+#define PP_CR_FIXED_BUFFER_SIZE 120
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    DeallocatePrettyPrintData(Environment *);
+
+/****************************************************/
+/* InitializePrettyPrintData: Allocates environment */
+/*    data for pretty print routines.               */
+/****************************************************/
+void InitializePrettyPrintData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,PRETTY_PRINT_DATA,sizeof(struct prettyPrintData),DeallocatePrettyPrintData);
+
+   PrettyPrintData(theEnv)->PPBufferEnabled = true;
+  }
+
+/******************************************************/
+/* DeallocatePrettyPrintData: Deallocates environment */
+/*    data for the pretty print routines.             */
+/******************************************************/
+static void DeallocatePrettyPrintData(
+  Environment *theEnv)
+  {
+   if (PrettyPrintData(theEnv)->PrettyPrintBuffer != NULL)
+     { rm(theEnv,PrettyPrintData(theEnv)->PrettyPrintBuffer,PrettyPrintData(theEnv)->PPBufferMax); }
+  }
+
+/*******************************************************/
+/* FlushPPBuffer: Resets the pretty print save buffer. */
+/*******************************************************/
+void FlushPPBuffer(
+  Environment *theEnv)
+  {
+   if (PrettyPrintData(theEnv)->PrettyPrintBuffer == NULL) return;
+   PrettyPrintData(theEnv)->PPBackupOnce = 0;
+   PrettyPrintData(theEnv)->PPBackupTwice = 0;
+   PrettyPrintData(theEnv)->PPBufferPos = 0;
+   PrettyPrintData(theEnv)->PrettyPrintBuffer[0] = EOS;
+   return;
+  }
+
+/*********************************************************************/
+/* DestroyPPBuffer: Resets and removes the pretty print save buffer. */
+/*********************************************************************/
+void DestroyPPBuffer(
+  Environment *theEnv)
+  {
+   PrettyPrintData(theEnv)->PPBackupOnce = 0;
+   PrettyPrintData(theEnv)->PPBackupTwice = 0;
+   PrettyPrintData(theEnv)->PPBufferPos = 0;
+   if (PrettyPrintData(theEnv)->PrettyPrintBuffer != NULL) rm(theEnv,PrettyPrintData(theEnv)->PrettyPrintBuffer,PrettyPrintData(theEnv)->PPBufferMax);
+   PrettyPrintData(theEnv)->PrettyPrintBuffer = NULL;
+   PrettyPrintData(theEnv)->PPBufferMax = 0;
+  }
+
+/*********************************************/
+/* SavePPBuffer: Appends a string to the end */
+/*   of the pretty print save buffer.        */
+/*********************************************/
+void SavePPBuffer(
+  Environment *theEnv,
+  const char *str)
+  {
+   size_t increment;
+
+   /*==========================================*/
+   /* If the pretty print buffer isn't needed, */
+   /* then don't bother writing to it.         */
+   /*==========================================*/
+
+   if ((PrettyPrintData(theEnv)->PPBufferStatus == false) || (! PrettyPrintData(theEnv)->PPBufferEnabled))
+     { return; }
+
+   /*===============================*/
+   /* Determine the increment size. */
+   /*===============================*/
+
+   increment = 512;
+   if (PrettyPrintData(theEnv)->PPBufferPos > increment)
+     { increment = PrettyPrintData(theEnv)->PPBufferPos * 3; }
+
+   /*================================================*/
+   /* If the pretty print buffer isn't big enough to */
+   /* contain the string, then increase its size.    */
+   /*================================================*/
+
+   if (strlen(str) + PrettyPrintData(theEnv)->PPBufferPos + 1 >= PrettyPrintData(theEnv)->PPBufferMax)
+     {
+      PrettyPrintData(theEnv)->PrettyPrintBuffer =
+         (char *) genrealloc(theEnv,PrettyPrintData(theEnv)->PrettyPrintBuffer,
+                                    PrettyPrintData(theEnv)->PPBufferMax,
+                                    PrettyPrintData(theEnv)->PPBufferMax + increment);
+      PrettyPrintData(theEnv)->PPBufferMax += increment;
+     }
+
+   /*==================================================*/
+   /* Remember the previous tokens saved to the pretty */
+   /* print buffer in case it is necessary to back up. */
+   /*==================================================*/
+
+   PrettyPrintData(theEnv)->PPBackupTwice = PrettyPrintData(theEnv)->PPBackupOnce;
+   PrettyPrintData(theEnv)->PPBackupOnce = PrettyPrintData(theEnv)->PPBufferPos;
+
+   /*=============================================*/
+   /* Save the string to the pretty print buffer. */
+   /*=============================================*/
+
+   PrettyPrintData(theEnv)->PrettyPrintBuffer = AppendToString(theEnv,str,PrettyPrintData(theEnv)->PrettyPrintBuffer,&PrettyPrintData(theEnv)->PPBufferPos,&PrettyPrintData(theEnv)->PPBufferMax);
+  }
+
+/***************************************************/
+/* PPBackup:  Removes the last string added to the */
+/*   pretty print save buffer. Only capable of     */
+/*   backing up for the two most recent additions. */
+/***************************************************/
+void PPBackup(
+  Environment *theEnv)
+  {
+   if ((PrettyPrintData(theEnv)->PPBufferStatus == false) ||
+       (PrettyPrintData(theEnv)->PrettyPrintBuffer == NULL) ||
+       (! PrettyPrintData(theEnv)->PPBufferEnabled))
+     { return; }
+
+   PrettyPrintData(theEnv)->PPBufferPos = PrettyPrintData(theEnv)->PPBackupOnce;
+   PrettyPrintData(theEnv)->PPBackupOnce = PrettyPrintData(theEnv)->PPBackupTwice;
+   PrettyPrintData(theEnv)->PrettyPrintBuffer[PrettyPrintData(theEnv)->PPBufferPos] = EOS;
+  }
+
+/**************************************************/
+/* CopyPPBuffer: Makes a copy of the pretty print */
+/*   save buffer.                                 */
+/**************************************************/
+char *CopyPPBuffer(
+  Environment *theEnv)
+  {
+   size_t length;
+   char *newString;
+   char *theBuffer = PrettyPrintData(theEnv)->PrettyPrintBuffer;
+
+   if (theBuffer == NULL) return NULL;
+
+   length = (1 + strlen(theBuffer)) * sizeof(char);
+   newString = (char *) gm2(theEnv,length);
+
+   genstrcpy(newString,theBuffer);
+   return(newString);
+  }
+
+/************************************************************/
+/* GetPPBuffer: Returns a pointer to the PrettyPrintBuffer. */
+/************************************************************/
+char *GetPPBuffer(
+  Environment *theEnv)
+  {
+   return(PrettyPrintData(theEnv)->PrettyPrintBuffer);
+  }
+
+/*******************************************/
+/* PPCRAndIndent: Prints white spaces into */
+/*   the pretty print buffer.              */
+/*******************************************/
+void PPCRAndIndent(
+  Environment *theEnv)
+  {
+   size_t i;
+   char *buffer;
+   char fixedBuffer[PP_CR_FIXED_BUFFER_SIZE];
+   
+   if ((PrettyPrintData(theEnv)->PPBufferStatus == false) ||
+       (! PrettyPrintData(theEnv)->PPBufferEnabled))
+     { return; }
+
+   if ((PrettyPrintData(theEnv)->IndentationDepth + 2) > PP_CR_FIXED_BUFFER_SIZE)
+     { buffer = (char *) genalloc(theEnv,PrettyPrintData(theEnv)->IndentationDepth + 2);}
+   else
+     { buffer = fixedBuffer; }
+   
+   buffer[0] = '\n';
+
+   for (i = 1 ; i <= PrettyPrintData(theEnv)->IndentationDepth ; i++)
+     { buffer[i] = ' '; }
+   buffer[i] = EOS;
+
+   SavePPBuffer(theEnv,buffer);
+   
+   if ((PrettyPrintData(theEnv)->IndentationDepth + 2) > PP_CR_FIXED_BUFFER_SIZE)
+     { genfree(theEnv,buffer,PrettyPrintData(theEnv)->IndentationDepth + 2);}
+  }
+
+/************************************************/
+/* IncrementIndentDepth: Increments indentation */
+/*   depth for pretty printing.                 */
+/************************************************/
+void IncrementIndentDepth(
+  Environment *theEnv,
+  size_t value)
+  {
+   PrettyPrintData(theEnv)->IndentationDepth += value;
+  }
+
+/************************************************/
+/* DecrementIndentDepth: Decrements indentation */
+/*   depth for pretty printing.                 */
+/************************************************/
+void DecrementIndentDepth(
+  Environment *theEnv,
+  size_t value)
+  {
+   PrettyPrintData(theEnv)->IndentationDepth -= value;
+  }
+
+/************************************/
+/* SetIndentDepth: Sets indentation */
+/*   depth for pretty printing.     */
+/************************************/
+void SetIndentDepth(
+  Environment *theEnv,
+  size_t value)
+  {
+   PrettyPrintData(theEnv)->IndentationDepth = value;
+  }
+
+/******************************************/
+/* SetPPBufferStatus: Sets PPBufferStatus */
+/*   flag to boolean value of ON or OFF.  */
+/******************************************/
+void SetPPBufferStatus(
+  Environment *theEnv,
+  bool value)
+  {
+   PrettyPrintData(theEnv)->PPBufferStatus = value;
+  }
+
+/************************************/
+/* GetPPBufferStatus: Returns value */
+/*   of the PPBufferStatus flag.    */
+/************************************/
+bool GetPPBufferStatus(
+  Environment *theEnv)
+  {
+   return(PrettyPrintData(theEnv)->PPBufferStatus);
+  }
+
+/***********************/
+/* SetPPBufferEnabled: */
+/***********************/
+bool SetPPBufferEnabled(
+  Environment *theEnv,
+  bool value)
+  {
+   bool oldValue;
+
+   oldValue = PrettyPrintData(theEnv)->PPBufferEnabled;
+   PrettyPrintData(theEnv)->PPBufferEnabled = value;
+   return oldValue;
+  }
+
+/***********************/
+/* GetPPBufferEnabled: */
+/***********************/
+bool GetPPBufferEnabled(
+  Environment *theEnv)
+  {
+   return PrettyPrintData(theEnv)->PPBufferEnabled;
+  }
+
diff --git a/clips/pprint.h b/clips/pprint.h
new file mode 100755
index 000000000..f66552cce
--- /dev/null
+++ b/clips/pprint.h
@@ -0,0 +1,79 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/02/17            */
+   /*                                                     */
+   /*               PRETTY PRINT HEADER FILE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for processing the pretty print         */
+/*   representation of constructs.                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Used genstrcpy instead of strcpy.              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_pprint
+
+#pragma once
+
+#define _H_pprint
+
+#define PRETTY_PRINT_DATA 52
+
+struct prettyPrintData
+  {
+   bool PPBufferStatus;
+   bool PPBufferEnabled;
+   size_t IndentationDepth;
+   size_t PPBufferPos;
+   size_t PPBufferMax;
+   size_t PPBackupOnce;
+   size_t PPBackupTwice;
+   char *PrettyPrintBuffer;
+  };
+
+#define PrettyPrintData(theEnv) ((struct prettyPrintData *) GetEnvironmentData(theEnv,PRETTY_PRINT_DATA))
+
+   void                           InitializePrettyPrintData(Environment *);
+   void                           FlushPPBuffer(Environment *);
+   void                           DestroyPPBuffer(Environment *);
+   void                           SavePPBuffer(Environment *,const char *);
+   void                           PPBackup(Environment *);
+   char                          *CopyPPBuffer(Environment *);
+   char                          *GetPPBuffer(Environment *);
+   void                           PPCRAndIndent(Environment *);
+   void                           IncrementIndentDepth(Environment *,size_t);
+   void                           DecrementIndentDepth(Environment *,size_t);
+   void                           SetIndentDepth(Environment *,size_t);
+   void                           SetPPBufferStatus(Environment *,bool);
+   bool                           GetPPBufferStatus(Environment *);
+   bool                           SetPPBufferEnabled(Environment *,bool);
+   bool                           GetPPBufferEnabled(Environment *);
+
+#endif
+
+
+
diff --git a/clips/prccode.c b/clips/prccode.c
new file mode 100755
index 000000000..de34db08a
--- /dev/null
+++ b/clips/prccode.c
@@ -0,0 +1,1478 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/**************************************************************/
+/* Purpose: Procedural Code Support Routines for              */
+/*          Deffunctions, Generic Function Methods,           */
+/*          Message-Handlersand Rules                         */
+/*                                                            */
+/* Principal Programmer(s):                                   */
+/*      Brian L. Dantes                                       */
+/*                                                            */
+/* Contributing Programmer(s):                                */
+/*                                                            */
+/* Revision History:                                          */
+/*                                                            */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859   */
+/*                                                            */
+/*            Changed name of variable log to logName         */
+/*            because of Unix compiler warnings of shadowed   */
+/*            definitions.                                    */
+/*                                                            */
+/*      6.24: Renamed BOOLEAN macro type to intBool.          */
+/*                                                            */
+/*            Added pragmas to remove compilation warnings.   */
+/*                                                            */
+/*      6.30: Updated ENTITY_RECORD definitions to include    */
+/*            additional NULL initializers.                   */
+/*                                                            */
+/*            Added ReleaseProcParameters call.               */
+/*                                                            */
+/*            Added tracked memory calls.                     */
+/*                                                            */
+/*            Removed conditional code for unsupported        */
+/*            compilers/operating systems (IBM_MCW,           */
+/*            MAC_MCW, and IBM_TBC).                          */
+/*                                                            */
+/*            Added const qualifiers to remove C++            */
+/*            deprecation warnings.                           */
+/*                                                            */
+/*      6.40: Added Env prefix to GetEvaluationError and      */
+/*            SetEvaluationError functions.                   */
+/*                                                            */
+/*            Pragma once and other inclusion changes.        */
+/*                                                            */
+/*            Added support for booleans with <stdbool.h>.    */
+/*                                                            */
+/*            Removed use of void pointers for specific       */
+/*            data structures.                                */
+/*                                                            */
+/*            UDF redesign.                                   */
+/*                                                            */
+/*            Generic error message no longer printed when    */
+/*            an alternate variable handling function         */
+/*            generates an error.                             */
+/*                                                            */
+/**************************************************************/
+
+/* =========================================
+   *****************************************
+               EXTERNAL DEFINITIONS
+   =========================================
+   ***************************************** */
+#include "setup.h"
+
+#include <stdio.h>
+
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "memalloc.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#if DEFGLOBAL_CONSTRUCT
+#include "globlpsr.h"
+#endif
+#include "exprnpsr.h"
+#include "multifld.h"
+#if OBJECT_SYSTEM
+#include "object.h"
+#endif
+#include "pprint.h"
+#include "prcdrpsr.h"
+#include "prntutil.h"
+#include "router.h"
+#include "utility.h"
+
+#include "prccode.h"
+
+/* =========================================
+   *****************************************
+               MACROS AND TYPES
+   =========================================
+   ***************************************** */
+typedef struct
+  {
+   unsigned firstFlag  : 1;
+   unsigned first      : 15;
+   unsigned secondFlag : 1;
+   unsigned second     : 15;
+  } PACKED_PROC_VAR;
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    EvaluateProcParameters(Environment *,Expression *,unsigned int,const char *,const char *);
+   static bool                    RtnProcParam(Environment *,void *,UDFValue *);
+   static bool                    GetProcBind(Environment *,void *,UDFValue *);
+   static bool                    PutProcBind(Environment *,void *,UDFValue *);
+   static bool                    RtnProcWild(Environment *,void *,UDFValue *);
+   static void                    DeallocateProceduralPrimitiveData(Environment *);
+   static void                    ReleaseProcParameters(Environment *);
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   static unsigned int            FindProcParameter(CLIPSLexeme *,Expression *,CLIPSLexeme *);
+   static bool                    ReplaceProcBinds(Environment *,Expression *,
+                                                   int (*)(Environment *,Expression *,void *),void *);
+   static Expression             *CompactActions(Environment *,Expression *);
+#endif
+
+#if (! DEFFUNCTION_CONSTRUCT) || (! DEFGENERIC_CONSTRUCT)
+   static bool                    EvaluateBadCall(Environment *,void *,UDFValue *);
+#endif
+
+/* =========================================
+   *****************************************
+          EXTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/****************************************************
+  NAME         : InstallProcedurePrimitives
+  DESCRIPTION  : Installs primitive function handlers
+                 for accessing parameters and local
+                 variables within the bodies of
+                 message-handlers, methods, rules and
+                 deffunctions.
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Primitive entities installed
+  NOTES        : None
+ ****************************************************/
+void InstallProcedurePrimitives(
+  Environment *theEnv)
+  {
+   EntityRecord procParameterInfo = { "PROC_PARAM", PROC_PARAM,0,1,0,NULL,NULL,NULL,
+                                       (EntityEvaluationFunction *) RtnProcParam,
+                                       NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL },
+                     procWildInfo =  { "PROC_WILD_PARAM", PROC_WILD_PARAM,0,1,0,NULL,NULL,NULL,
+                                       (EntityEvaluationFunction *) RtnProcWild,
+                                       NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL },
+                     procGetInfo =   { "PROC_GET_BIND", PROC_GET_BIND,0,1,0,NULL,NULL,NULL,
+                                       (EntityEvaluationFunction *) GetProcBind,
+                                       NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL },
+                     procBindInfo =  { "PROC_BIND", PROC_BIND,0,1,0,NULL,NULL,NULL,
+                                       (EntityEvaluationFunction *) PutProcBind,
+                                       NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+
+#if ! DEFFUNCTION_CONSTRUCT
+   EntityRecord deffunctionEntityRecord =
+                     { "PCALL", PCALL,0,0,1,
+                       NULL,NULL,NULL,
+                       EvaluateBadCall,
+                       NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+#endif
+#if ! DEFGENERIC_CONSTRUCT
+   EntityRecord genericEntityRecord =
+                     { "GCALL", GCALL,0,0,1,
+                       NULL,NULL,NULL,
+                       EvaluateBadCall,
+                       NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL };
+#endif
+
+   AllocateEnvironmentData(theEnv,PROCEDURAL_PRIMITIVE_DATA,sizeof(struct proceduralPrimitiveData),DeallocateProceduralPrimitiveData);
+
+   memcpy(&ProceduralPrimitiveData(theEnv)->ProcParameterInfo,&procParameterInfo,sizeof(struct entityRecord));
+   memcpy(&ProceduralPrimitiveData(theEnv)->ProcWildInfo,&procWildInfo,sizeof(struct entityRecord));
+   memcpy(&ProceduralPrimitiveData(theEnv)->ProcGetInfo,&procGetInfo,sizeof(struct entityRecord));
+   memcpy(&ProceduralPrimitiveData(theEnv)->ProcBindInfo,&procBindInfo,sizeof(struct entityRecord));
+
+   InstallPrimitive(theEnv,&ProceduralPrimitiveData(theEnv)->ProcParameterInfo,PROC_PARAM);
+   InstallPrimitive(theEnv,&ProceduralPrimitiveData(theEnv)->ProcWildInfo,PROC_WILD_PARAM);
+   InstallPrimitive(theEnv,&ProceduralPrimitiveData(theEnv)->ProcGetInfo,PROC_GET_BIND);
+   InstallPrimitive(theEnv,&ProceduralPrimitiveData(theEnv)->ProcBindInfo,PROC_BIND);
+
+   ProceduralPrimitiveData(theEnv)->Oldindex = UINT_MAX;
+
+   /* ===============================================
+      Make sure a default evaluation function is
+      in place for deffunctions and generic functions
+      in the event that a binary image containing
+      these items is loaded into a configuration
+      that does not support them.
+      =============================================== */
+
+#if ! DEFFUNCTION_CONSTRUCT
+   memcpy(&ProceduralPrimitiveData(theEnv)->DeffunctionEntityRecord,&deffunctionEntityRecord,sizeof(struct entityRecord));
+   InstallPrimitive(theEnv,&ProceduralPrimitiveData(theEnv)->DeffunctionEntityRecord,PCALL);
+#endif
+
+#if ! DEFGENERIC_CONSTRUCT
+   memcpy(&ProceduralPrimitiveData(theEnv)->GenericEntityRecord,&genericEntityRecord,sizeof(struct entityRecord));
+   InstallPrimitive(theEnv,&ProceduralPrimitiveData(theEnv)->GenericEntityRecord,GCALL);
+#endif
+
+   /* =============================================
+      Install the special empty multifield to
+      let callers distinguish between no parameters
+      and zero-length multifield parameters
+      ============================================= */
+   ProceduralPrimitiveData(theEnv)->NoParamValue = CreateUnmanagedMultifield(theEnv,0L);
+   RetainMultifield(theEnv,ProceduralPrimitiveData(theEnv)->NoParamValue);
+  }
+
+/**************************************************************/
+/* DeallocateProceduralPrimitiveData: Deallocates environment */
+/*    data for the procedural primitives functionality.       */
+/**************************************************************/
+static void DeallocateProceduralPrimitiveData(
+  Environment *theEnv)
+  {
+   ReturnMultifield(theEnv,ProceduralPrimitiveData(theEnv)->NoParamValue);
+   ReleaseProcParameters(theEnv);
+  }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+#if DEFFUNCTION_CONSTRUCT || OBJECT_SYSTEM
+
+/************************************************************
+  NAME         : ParseProcParameters
+  DESCRIPTION  : Parses a parameter list for a
+                  procedural routine, such as a
+                  deffunction or message-handler
+  INPUTS       : 1) The logical name of the input
+                 2) A buffer for scanned tokens
+                 3) The partial list of parameters so far
+                    (can be NULL)
+                 3) A buffer for a wildcard symbol (if any)
+                 4) A buffer for a minimum of parameters
+                 5) A buffer for a maximum of parameters
+                    (will be set to -1 if there is a wilcard)
+                 6) A buffer for an error flag
+                 7) The address of a function to do specialized
+                    checking on a parameter (can be NULL)
+                    The function should accept a string and
+                    return false if the parameter is OK, true
+                    otherwise.
+  RETURNS      : A list of expressions containing the
+                   parameter names
+  SIDE EFFECTS : Parameters parsed and expressions formed
+  NOTES        : None
+ ************************************************************/
+Expression *ParseProcParameters(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *tkn,
+  Expression *parameterList,
+  CLIPSLexeme **wildcard,
+  unsigned short *min,
+  unsigned short *max,
+  bool *error,
+  bool (*checkfunc)(Environment *,const char *))
+  {
+   Expression *nextOne,*lastOne,*check;
+   int paramprintp = 0;
+
+   *wildcard = NULL;
+   *min = 0;
+   *error = true;
+   lastOne = nextOne = parameterList;
+   while (nextOne != NULL)
+     {
+      (*min)++;
+      lastOne = nextOne;
+      nextOne = nextOne->nextArg;
+     }
+   if (tkn->tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"parameter list");
+      ReturnExpression(theEnv,parameterList);
+      return NULL;
+     }
+   GetToken(theEnv,readSource,tkn);
+   while ((tkn->tknType == SF_VARIABLE_TOKEN) || (tkn->tknType == MF_VARIABLE_TOKEN))
+     {
+      for (check = parameterList ; check != NULL ; check = check->nextArg)
+        if (check->value == tkn->value)
+         {
+          PrintErrorID(theEnv,"PRCCODE",7,false);
+          WriteString(theEnv,STDERR,"Duplicate parameter names not allowed.\n");
+          ReturnExpression(theEnv,parameterList);
+          return NULL;
+         }
+      if (*wildcard != NULL)
+        {
+         PrintErrorID(theEnv,"PRCCODE",8,false);
+         WriteString(theEnv,STDERR,"No parameters allowed after wildcard parameter.\n");
+         ReturnExpression(theEnv,parameterList);
+         return NULL;
+        }
+      if ((checkfunc != NULL) ? (*checkfunc)(theEnv,tkn->lexemeValue->contents) : false)
+        {
+         ReturnExpression(theEnv,parameterList);
+         return NULL;
+        }
+      nextOne = GenConstant(theEnv,TokenTypeToType(tkn->tknType),tkn->value);
+      if (tkn->tknType == MF_VARIABLE_TOKEN)
+        *wildcard = tkn->lexemeValue;
+      else
+        (*min)++;
+      if (lastOne == NULL)
+        { parameterList = nextOne; }
+      else
+        { lastOne->nextArg = nextOne; }
+      lastOne = nextOne;
+      SavePPBuffer(theEnv," ");
+      paramprintp = 1;
+      GetToken(theEnv,readSource,tkn);
+     }
+   if (tkn->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"parameter list");
+      ReturnExpression(theEnv,parameterList);
+      return NULL;
+     }
+   if (paramprintp)
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+     }
+   *error = false;
+   *max = (*wildcard != NULL) ? PARAMETERS_UNBOUNDED : *min;
+   return(parameterList);
+  }
+
+#endif
+
+/*************************************************************************
+  NAME         : ParseProcActions
+  DESCRIPTION  : Parses the bodies of deffunctions, generic function
+                 methods and message-handlers.  Replaces parameter
+                 and local variable references with appropriate
+                 runtime access functions
+  INPUTS       : 1) The environment
+                 2) The type of procedure body being parsed
+                 3) The logical name of the input
+                 4) A buffer for scanned tokens
+                 5) A list of expressions containing the names
+                    of the parameters
+                 6) The wilcard parameter symbol (NULL if none)
+                 7) A pointer to a function to parse variables not
+                    recognized by the standard parser
+                    The function should accept the variable
+                    expression and a generic pointer for special
+                    data (can be NULL) as arguments.  If the variable
+                    is recognized, the function should modify the
+                    expression to access this variable.  Return 1
+                    if recognized, 0 if not, -1 on errors
+                    This argument can be NULL.
+                 8) A pointer to a function to handle binds in a
+                    special way. The function should accept the
+                    bind function call expression as an argument.
+                    If the variable is recognized and treated specially,
+                    the function should modify the expression
+                    appropriately (including attaching/removing
+                    any necessary argument expressions).  Return 1
+                    if recognized, 0 if not, -1 on errors.
+                    This argument can be NULL.
+                 9) A buffer for holding the number of local vars
+                    used by this procedure body.
+                10) Special user data buffer to pass to variable
+                    reference and bind replacement functions
+RETURNS      : A packed expression containing the body, NULL on
+                   errors.
+SIDE EFFECTS : Variable references replaced with runtime calls
+                  to access the paramter and local variable array
+NOTES        : None
+*************************************************************************/
+Expression *ParseProcActions(
+  Environment *theEnv,
+  const char *bodytype,
+  const char *readSource,
+  struct token *tkn,
+  Expression *params,
+  CLIPSLexeme *wildcard,
+  int (*altvarfunc)(Environment *,Expression *,void *),
+  int (*altbindfunc)(Environment *,Expression *,void *),
+  unsigned short *lvarcnt,
+  void *userBuffer)
+  {
+   Expression *actions,*pactions;
+
+   /* ====================================================================
+      Clear parsed bind list - so that only local vars from this body will
+      be on it.  The position of vars on thsi list are used to generate
+      indices into the LocalVarArray at runtime.  The parsing of the
+      "bind" function adds vars to this list.
+      ==================================================================== */
+   ClearParsedBindNames(theEnv);
+   actions = GroupActions(theEnv,readSource,tkn,true,NULL,false);
+   if (actions == NULL)
+     return NULL;
+
+   /* ====================================================================
+      Replace any bind functions with special functions before replacing
+      any variable references.  This allows those bind names to be removed
+      before they can be seen by variable replacement and thus generate
+      incorrect indices.
+      ==================================================================== */
+   if (altbindfunc != NULL)
+     {
+      if (ReplaceProcBinds(theEnv,actions,altbindfunc,userBuffer))
+        {
+         ClearParsedBindNames(theEnv);
+         ReturnExpression(theEnv,actions);
+         return NULL;
+        }
+     }
+
+   /* ======================================================================
+      The number of names left on the bind list is the number of local
+      vars for this procedure body.  Replace all variable reference with
+      runtime access functions for ProcParamArray, LocalVarArray or
+      other special items, such as direct slot references, global variables,
+      or fact field references.
+      ====================================================================== */
+   *lvarcnt = CountParsedBindNames(theEnv);
+   if (ReplaceProcVars(theEnv,bodytype,actions,params,wildcard,altvarfunc,userBuffer))
+     {
+      ClearParsedBindNames(theEnv);
+      ReturnExpression(theEnv,actions);
+      return NULL;
+     }
+
+   /* =======================================================================
+      Normally, actions are grouped in a progn.  If there is only one action,
+      the progn is unnecessary and can be removed.  Also, the actions are
+      packed into a contiguous array to save on memory overhead.  The
+      intermediate parsed bind names are freed to avoid tying up memory.
+      ======================================================================= */
+   actions = CompactActions(theEnv,actions);
+   pactions = PackExpression(theEnv,actions);
+   ReturnExpression(theEnv,actions);
+   ClearParsedBindNames(theEnv);
+   return(pactions);
+  }
+
+/*************************************************************************
+  NAME         : ReplaceProcVars
+  DESCRIPTION  : Examines an expression for variables
+                   and replaces any that correspond to
+                   procedure parameters or globals
+                   with function calls that get these
+                   variables' values at run-time.
+                   For example, procedure arguments
+                   are stored an array at run-time, so at
+                   parse-time, parameter-references are replaced
+                   with function calls referencing this array at
+                   the appropriate position.
+  INPUTS       : 1) The type of procedure being parsed
+                 2) The expression-actions to be examined
+                 3) The parameter list
+                 4) The wildcard parameter symbol (NULL if none)
+                 5) A pointer to a function to parse variables not
+                    recognized by the standard parser
+                    The function should accept the variable
+                    expression and a generic pointer for special
+                    data (can be NULL) as arguments.  If the variable
+                    is recognized, the function should modify the
+                    expression to access this variable.  Return 1
+                    if recognized, 0 if not, -1 on errors
+                    This argument can be NULL.
+                 6) Data buffer to be passed to alternate parsing
+                    function
+  RETURNS      : False if OK, true on errors
+  SIDE EFFECTS : Variable references replaced with function calls
+  NOTES        : This function works from the ParsedBindNames list in
+                    SPCLFORM.C to access local binds.  Make sure that
+                    the list accurately reflects the binds by calling
+                    ClearParsedBindNames(theEnv) before the parse of the body
+                    in which variables are being replaced.
+ *************************************************************************/
+int ReplaceProcVars(
+  Environment *theEnv,
+  const char *bodytype,
+  Expression *actions,
+  Expression *parameterList,
+  CLIPSLexeme *wildcard,
+  int (*altvarfunc)(Environment *,Expression *,void *),
+  void *specdata)
+  {
+   int altcode;
+   unsigned position, boundPosn;
+   Expression *arg_lvl,*altvarexp;
+   CLIPSLexeme *bindName;
+   PACKED_PROC_VAR pvar;
+   int errorCode;
+
+   while (actions != NULL)
+     {
+      if (actions->type == SF_VARIABLE)
+        {
+         /*===============================================*/
+         /* See if the variable is in the parameter list. */
+         /*===============================================*/
+
+         bindName = actions->lexemeValue;
+         position = FindProcParameter(bindName,parameterList,wildcard);
+
+         /*=============================================================*/
+         /* Check to see if the variable is bound within the procedure. */
+         /*=============================================================*/
+
+         boundPosn = SearchParsedBindNames(theEnv,bindName);
+
+         /*=============================================*/
+         /* If variable is not defined in the parameter */
+         /* list or as part of a bind action then...    */
+         /*=============================================*/
+
+         if ((position == 0) && (boundPosn == 0))
+           {
+            /*================================================================*/
+            /* Check to see if the variable has a special access function,    */
+            /* such as direct slot reference or a rule RHS pattern reference. */
+            /*================================================================*/
+
+            if (altvarfunc == NULL)
+              { errorCode = 0; }
+            else
+              { errorCode = (*altvarfunc)(theEnv,actions,specdata); }
+
+            if (errorCode != 1)
+              {
+               if (errorCode == 0)
+                 {
+                  PrintErrorID(theEnv,"PRCCODE",3,true);
+                  WriteString(theEnv,STDERR,"Undefined variable ?");
+                  WriteString(theEnv,STDERR,bindName->contents);
+                  WriteString(theEnv,STDERR," referenced in ");
+                  WriteString(theEnv,STDERR,bodytype);
+                  WriteString(theEnv,STDERR,".\n");
+                 }
+               return 1;
+              }
+           }
+
+         /*===================================================*/
+         /* Else if variable is defined in the parameter list */
+         /* and not rebound within the procedure then...      */
+         /*===================================================*/
+
+         else if ((position > 0) && (boundPosn == 0))
+           {
+            actions->type = ((bindName != wildcard) ? PROC_PARAM : PROC_WILD_PARAM);
+            actions->value = AddBitMap(theEnv,&position,sizeof(int));
+           }
+
+         /*=========================================================*/
+         /* Else the variable is rebound within the procedure so... */
+         /*=========================================================*/
+
+         else
+           {
+            if (altvarfunc != NULL)
+              {
+               altvarexp = GenConstant(theEnv,actions->type,actions->value);
+               altcode = (*altvarfunc)(theEnv,altvarexp,specdata);
+               if (altcode == 0)
+                 {
+                  rtn_struct(theEnv,expr,altvarexp);
+                  altvarexp = NULL;
+                 }
+               else if (altcode == -1)
+                 {
+                  rtn_struct(theEnv,expr,altvarexp);
+                  return true;
+                 }
+              }
+            else
+              altvarexp = NULL;
+            actions->type = PROC_GET_BIND;
+            ClearBitString(&pvar,sizeof(PACKED_PROC_VAR));
+            pvar.first = boundPosn;
+            pvar.second = position;
+            pvar.secondFlag = (bindName != wildcard) ? 0 : 1;
+            actions->value = AddBitMap(theEnv,&pvar,sizeof(PACKED_PROC_VAR));
+            actions->argList = GenConstant(theEnv,SYMBOL_TYPE,bindName);
+            actions->argList->nextArg = altvarexp;
+           }
+        }
+#if DEFGLOBAL_CONSTRUCT
+      else if (actions->type == GBL_VARIABLE)
+        {
+         if (ReplaceGlobalVariable(theEnv,actions) == false)
+           return(-1);
+        }
+#endif
+      if ((altvarfunc != NULL) ? ((*altvarfunc)(theEnv,actions,specdata) == -1) : false)
+        return 1;
+      if (actions->argList != NULL)
+        {
+         if (ReplaceProcVars(theEnv,bodytype,actions->argList,parameterList,
+                                        wildcard,altvarfunc,specdata))
+           return 1;
+
+         /* ====================================================================
+            Check to see if this is a call to the bind function.  If so (and the
+            second argument is a symbol) then it is a locally bound variable
+            (as opposed to a global).
+
+            Replace the call to "bind" with a call to PROC_BIND - the
+            special internal function for procedure local variables.
+            ==================================================================== */
+         if ((actions->value == (void *) FindFunction(theEnv,"bind")) &&
+             (actions->argList->type == SYMBOL_TYPE))
+           {
+            actions->type = PROC_BIND;
+            boundPosn = SearchParsedBindNames(theEnv,actions->argList->lexemeValue);
+            actions->value = AddBitMap(theEnv,&boundPosn,sizeof(int));
+            arg_lvl = actions->argList->nextArg;
+            rtn_struct(theEnv,expr,actions->argList);
+            actions->argList = arg_lvl;
+           }
+        }
+      actions = actions->nextArg;
+     }
+   return 0;
+  }
+
+#if DEFGENERIC_CONSTRUCT
+
+/*****************************************************
+  NAME         : GenProcWildcardReference
+  DESCRIPTION  : Returns an expression to access the
+                    wildcard parameter for a method
+  INPUTS       : The starting index of the wildcard
+  RETURNS      : An expression containing the wildcard
+                 reference
+  SIDE EFFECTS : Expression allocated
+  NOTES        : None
+ *****************************************************/
+Expression *GenProcWildcardReference(
+  Environment *theEnv,
+  int theIndex)
+  {
+   return(GenConstant(theEnv,PROC_WILD_PARAM,AddBitMap(theEnv,&theIndex,sizeof(int))));
+  }
+
+#endif
+
+#endif
+
+/*******************************************************************
+  NAME         : PushProcParameters
+  DESCRIPTION  : Given a list of parameter expressions,
+                   this function evaluates each expression
+                   and stores the results in a contiguous
+                   array of DATA_OBJECTS.  Used in creating a new
+                   ProcParamArray for the execution of a
+                   procedure
+                 The current arrays are saved on a stack.
+  INPUTS       : 1) The paramter expression list
+                 2) The number of parameters in the list
+                 3) The name of the procedure for which
+                    these parameters are being evaluated
+                 4) The type of procedure
+                 5) A pointer to a function to print out a trace
+                    message about the currently executing
+                    procedure when unbound variables are detected
+                    at runtime (The function should take no
+                    arguments and have no return value.  The
+                    function should print its synopsis to STDERR
+                    and include the final carriage-return.)
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Any side-effects of the evaluation of the
+                   parameter expressions
+                 UDFValue array allocated (deallocated on errors)
+                 ProcParamArray set
+  NOTES        : EvaluationError set on errors
+ *******************************************************************/
+void PushProcParameters(
+  Environment *theEnv,
+  Expression *parameterList,
+  unsigned int numberOfParameters,
+  const char *pname,
+  const char *bodytype,
+  void (*UnboundErrFunc)(Environment *,const char *))
+  {
+   PROC_PARAM_STACK *ptmp;
+
+   ptmp = get_struct(theEnv,ProcParamStack);
+   ptmp->ParamArray = ProceduralPrimitiveData(theEnv)->ProcParamArray;
+   ptmp->ParamArraySize = ProceduralPrimitiveData(theEnv)->ProcParamArraySize;
+   ptmp->UnboundErrFunc = ProceduralPrimitiveData(theEnv)->ProcUnboundErrFunc;
+   ptmp->nxt = ProceduralPrimitiveData(theEnv)->pstack;
+   ProceduralPrimitiveData(theEnv)->pstack = ptmp;
+   EvaluateProcParameters(theEnv,parameterList,numberOfParameters,pname,bodytype);
+   if (EvaluationData(theEnv)->EvaluationError)
+     {
+      ptmp = ProceduralPrimitiveData(theEnv)->pstack;
+      ProceduralPrimitiveData(theEnv)->pstack = ProceduralPrimitiveData(theEnv)->pstack->nxt;
+      rtn_struct(theEnv,ProcParamStack,ptmp);
+      return;
+     }
+
+   /* ================================================================
+      Record ProcParamExpressions and WildcardValue for previous frame
+      AFTER evaluating arguments for the new frame, because they could
+      have gone from NULL to non-NULL (if they were already non-NULL,
+      they would remain unchanged.)
+      ================================================================ */
+#if DEFGENERIC_CONSTRUCT
+   ptmp->ParamExpressions = ProceduralPrimitiveData(theEnv)->ProcParamExpressions;
+   ProceduralPrimitiveData(theEnv)->ProcParamExpressions = NULL;
+#endif
+   ptmp->WildcardValue = ProceduralPrimitiveData(theEnv)->WildcardValue;
+   ProceduralPrimitiveData(theEnv)->WildcardValue = NULL;
+   ProceduralPrimitiveData(theEnv)->ProcUnboundErrFunc = UnboundErrFunc;
+  }
+
+/******************************************************************
+  NAME         : PopProcParameters
+  DESCRIPTION  : Restores old procedure arrays
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Stack popped and globals restored
+  NOTES        : Assumes pstack != NULL
+ ******************************************************************/
+void PopProcParameters(
+  Environment *theEnv)
+  {
+   PROC_PARAM_STACK *ptmp;
+
+   if (ProceduralPrimitiveData(theEnv)->ProcParamArray != NULL)
+     rm(theEnv,ProceduralPrimitiveData(theEnv)->ProcParamArray,(sizeof(UDFValue) * ProceduralPrimitiveData(theEnv)->ProcParamArraySize));
+
+#if DEFGENERIC_CONSTRUCT
+   if (ProceduralPrimitiveData(theEnv)->ProcParamExpressions != NULL)
+     rm(theEnv,ProceduralPrimitiveData(theEnv)->ProcParamExpressions,(sizeof(Expression) * ProceduralPrimitiveData(theEnv)->ProcParamArraySize));
+#endif
+
+   ptmp = ProceduralPrimitiveData(theEnv)->pstack;
+   ProceduralPrimitiveData(theEnv)->pstack = ProceduralPrimitiveData(theEnv)->pstack->nxt;
+   ProceduralPrimitiveData(theEnv)->ProcParamArray = ptmp->ParamArray;
+   ProceduralPrimitiveData(theEnv)->ProcParamArraySize = ptmp->ParamArraySize;
+
+#if DEFGENERIC_CONSTRUCT
+   ProceduralPrimitiveData(theEnv)->ProcParamExpressions = ptmp->ParamExpressions;
+#endif
+
+   if (ProceduralPrimitiveData(theEnv)->WildcardValue != NULL)
+     {
+      ReleaseMultifield(theEnv,ProceduralPrimitiveData(theEnv)->WildcardValue->multifieldValue);
+      if (ProceduralPrimitiveData(theEnv)->WildcardValue->value != ProceduralPrimitiveData(theEnv)->NoParamValue)
+        AddToMultifieldList(theEnv,ProceduralPrimitiveData(theEnv)->WildcardValue->multifieldValue);
+      rtn_struct(theEnv,udfValue,ProceduralPrimitiveData(theEnv)->WildcardValue);
+     }
+   ProceduralPrimitiveData(theEnv)->WildcardValue = ptmp->WildcardValue;
+   ProceduralPrimitiveData(theEnv)->ProcUnboundErrFunc = ptmp->UnboundErrFunc;
+   rtn_struct(theEnv,ProcParamStack,ptmp);
+  }
+
+/******************************************************************
+  NAME         : ReleaseProcParameters
+  DESCRIPTION  : Restores old procedure arrays
+  INPUTS       : None
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Stack popped and globals restored
+  NOTES        : Assumes pstack != NULL
+ ******************************************************************/
+static void ReleaseProcParameters(
+  Environment *theEnv)
+  {
+   PROC_PARAM_STACK *ptmp, *next;
+
+   if (ProceduralPrimitiveData(theEnv)->ProcParamArray != NULL)
+     rm(theEnv,ProceduralPrimitiveData(theEnv)->ProcParamArray,(sizeof(UDFValue) * ProceduralPrimitiveData(theEnv)->ProcParamArraySize));
+
+
+   if (ProceduralPrimitiveData(theEnv)->WildcardValue != NULL)
+     {
+      if (ProceduralPrimitiveData(theEnv)->WildcardValue->value != ProceduralPrimitiveData(theEnv)->NoParamValue)
+        { ReturnMultifield(theEnv,ProceduralPrimitiveData(theEnv)->WildcardValue->multifieldValue); }
+
+      rtn_struct(theEnv,udfValue,ProceduralPrimitiveData(theEnv)->WildcardValue);
+     }
+
+#if DEFGENERIC_CONSTRUCT
+   if (ProceduralPrimitiveData(theEnv)->ProcParamExpressions != NULL)
+     rm(theEnv,ProceduralPrimitiveData(theEnv)->ProcParamExpressions,(sizeof(Expression) * ProceduralPrimitiveData(theEnv)->ProcParamArraySize));
+#endif
+
+   ptmp = ProceduralPrimitiveData(theEnv)->pstack;
+
+   while (ptmp != NULL)
+     {
+      next = ptmp->nxt;
+
+      if (ptmp->ParamArray != NULL)
+        { rm(theEnv,ptmp->ParamArray,(sizeof(UDFValue) * ptmp->ParamArraySize)); }
+
+#if DEFGENERIC_CONSTRUCT
+      if (ptmp->ParamExpressions != NULL)
+        { rm(theEnv,ptmp->ParamExpressions,(sizeof(Expression) * ptmp->ParamArraySize)); }
+#endif
+
+      if (ptmp->WildcardValue != NULL)
+        {
+         if (ptmp->WildcardValue->value != ProceduralPrimitiveData(theEnv)->NoParamValue)
+           { ReturnMultifield(theEnv,ptmp->WildcardValue->multifieldValue); }
+
+         rtn_struct(theEnv,udfValue,ptmp->WildcardValue);
+        }
+
+      rtn_struct(theEnv,ProcParamStack,ptmp);
+      ptmp = next;
+     }
+  }
+
+#if DEFGENERIC_CONSTRUCT
+
+/***********************************************************
+  NAME         : GetProcParamExpressions
+  DESCRIPTION  : Forms an array of expressions equivalent to
+                 the current procedure paramter array.  Used
+                 to conveniently attach these parameters as
+                 arguments to a H/L system function call
+                 (used by the generic dispatch).
+  INPUTS       : None
+  RETURNS      : A pointer to an array of expressions
+  SIDE EFFECTS : Expression array created
+  NOTES        : None
+ ***********************************************************/
+Expression *GetProcParamExpressions(
+  Environment *theEnv)
+  {
+   unsigned int i;
+
+   if ((ProceduralPrimitiveData(theEnv)->ProcParamArray == NULL) || (ProceduralPrimitiveData(theEnv)->ProcParamExpressions != NULL))
+     return(ProceduralPrimitiveData(theEnv)->ProcParamExpressions);
+   ProceduralPrimitiveData(theEnv)->ProcParamExpressions = (Expression *)
+               gm2(theEnv,(sizeof(Expression) * ProceduralPrimitiveData(theEnv)->ProcParamArraySize));
+   for (i = 0 ; i < ProceduralPrimitiveData(theEnv)->ProcParamArraySize ; i++)
+     {
+      ProceduralPrimitiveData(theEnv)->ProcParamExpressions[i].type = ProceduralPrimitiveData(theEnv)->ProcParamArray[i].header->type; // TBD Remove
+      if (ProceduralPrimitiveData(theEnv)->ProcParamArray[i].header->type != MULTIFIELD_TYPE)
+        ProceduralPrimitiveData(theEnv)->ProcParamExpressions[i].value = ProceduralPrimitiveData(theEnv)->ProcParamArray[i].value;
+      else
+        ProceduralPrimitiveData(theEnv)->ProcParamExpressions[i].value = &ProceduralPrimitiveData(theEnv)->ProcParamArray[i];
+      ProceduralPrimitiveData(theEnv)->ProcParamExpressions[i].argList = NULL;
+      ProceduralPrimitiveData(theEnv)->ProcParamExpressions[i].nextArg =
+        ((i + 1) != ProceduralPrimitiveData(theEnv)->ProcParamArraySize) ? &ProceduralPrimitiveData(theEnv)->ProcParamExpressions[i+1] : NULL;
+     }
+   return(ProceduralPrimitiveData(theEnv)->ProcParamExpressions);
+  }
+
+#endif
+
+/***********************************************************
+  NAME         : EvaluateProcActions
+  DESCRIPTION  : Evaluates the actions of a deffunction,
+                 generic function method or message-handler.
+  INPUTS       : 1) The module where the actions should be
+                    executed
+                 2) The actions (linked by nextArg fields)
+                 3) The number of local variables to reserve
+                    space for.
+                 4) A buffer to hold the result of evaluating
+                    the actions.
+                 5) A function which prints out the name of
+                    the currently executing body for error
+                    messages (can be NULL).
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Allocates and deallocates space for
+                 local variable array.
+  NOTES        : None
+ ***********************************************************/
+void EvaluateProcActions(
+  Environment *theEnv,
+  Defmodule *theModule,
+  Expression *actions,
+  unsigned short lvarcnt,
+  UDFValue *returnValue,
+  void (*crtproc)(Environment *,const char *))
+  {
+   UDFValue *oldLocalVarArray;
+   unsigned short i;
+   Defmodule *oldModule;
+   Expression *oldActions;
+   struct trackedMemory *theTM;
+
+   oldLocalVarArray = ProceduralPrimitiveData(theEnv)->LocalVarArray;
+   ProceduralPrimitiveData(theEnv)->LocalVarArray = (lvarcnt == 0) ? NULL :
+                   (UDFValue *) gm2(theEnv,(sizeof(UDFValue) * lvarcnt));
+
+   if (lvarcnt != 0)
+     { theTM = AddTrackedMemory(theEnv,ProceduralPrimitiveData(theEnv)->LocalVarArray,sizeof(UDFValue) * lvarcnt); }
+   else
+     { theTM = NULL; }
+
+   for (i = 0 ; i < lvarcnt ; i++)
+     ProceduralPrimitiveData(theEnv)->LocalVarArray[i].supplementalInfo = FalseSymbol(theEnv);
+
+   oldModule = GetCurrentModule(theEnv);
+   if (oldModule != theModule)
+     SetCurrentModule(theEnv,theModule);
+   oldActions = ProceduralPrimitiveData(theEnv)->CurrentProcActions;
+   ProceduralPrimitiveData(theEnv)->CurrentProcActions = actions;
+
+   if (EvaluateExpression(theEnv,actions,returnValue))
+     {
+      returnValue->value = FalseSymbol(theEnv);
+     }
+
+   ProceduralPrimitiveData(theEnv)->CurrentProcActions = oldActions;
+   if (oldModule != GetCurrentModule(theEnv))
+     SetCurrentModule(theEnv,oldModule);
+   if ((crtproc != NULL) ? EvaluationData(theEnv)->HaltExecution : false)
+     {
+      const char *logName;
+
+      if (GetEvaluationError(theEnv))
+        {
+         PrintErrorID(theEnv,"PRCCODE",4,false);
+         logName = STDERR;
+        }
+      else
+        {
+         PrintWarningID(theEnv,"PRCCODE",4,false);
+         logName = STDWRN;
+        }
+      WriteString(theEnv,logName,"Execution halted during the actions of ");
+      (*crtproc)(theEnv,logName);
+     }
+
+   if ((ProceduralPrimitiveData(theEnv)->WildcardValue != NULL) ? (returnValue->value == ProceduralPrimitiveData(theEnv)->WildcardValue->value) : false)
+     {
+      ReleaseMultifield(theEnv,ProceduralPrimitiveData(theEnv)->WildcardValue->multifieldValue);
+      if (ProceduralPrimitiveData(theEnv)->WildcardValue->value != ProceduralPrimitiveData(theEnv)->NoParamValue)
+        AddToMultifieldList(theEnv,ProceduralPrimitiveData(theEnv)->WildcardValue->multifieldValue);
+      rtn_struct(theEnv,udfValue,ProceduralPrimitiveData(theEnv)->WildcardValue);
+      ProceduralPrimitiveData(theEnv)->WildcardValue = NULL;
+     }
+
+   if (lvarcnt != 0)
+     {
+      RemoveTrackedMemory(theEnv,theTM);
+      for (i = 0 ; i < lvarcnt ; i++)
+        if (ProceduralPrimitiveData(theEnv)->LocalVarArray[i].supplementalInfo == TrueSymbol(theEnv))
+          ReleaseUDFV(theEnv,&ProceduralPrimitiveData(theEnv)->LocalVarArray[i]);
+      rm(theEnv,ProceduralPrimitiveData(theEnv)->LocalVarArray,(sizeof(UDFValue) * lvarcnt));
+     }
+
+   ProceduralPrimitiveData(theEnv)->LocalVarArray = oldLocalVarArray;
+  }
+
+/****************************************************
+  NAME         : PrintProcParamArray
+  DESCRIPTION  : Displays the contents of the
+                 current procedure parameter array
+  INPUTS       : The logical name of the output
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : None
+  NOTES        : None
+ ****************************************************/
+void PrintProcParamArray(
+  Environment *theEnv,
+  const char *logName)
+  {
+   unsigned int i;
+
+   WriteString(theEnv,logName," (");
+   for (i = 0 ; i < ProceduralPrimitiveData(theEnv)->ProcParamArraySize ; i++)
+     {
+      WriteUDFValue(theEnv,logName,&ProceduralPrimitiveData(theEnv)->ProcParamArray[i]);
+      if (i != ProceduralPrimitiveData(theEnv)->ProcParamArraySize-1)
+        WriteString(theEnv,logName," ");
+     }
+   WriteString(theEnv,logName,")\n");
+  }
+
+/****************************************************************
+  NAME         : GrabProcWildargs
+  DESCRIPTION  : Groups a portion of the ProcParamArray
+                   into a multi-field variable
+  INPUTS       : 1) Starting index in ProcParamArray
+                      for grouping of arguments into
+                      multi-field variable
+                 2) Caller's result value buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multi-field variable allocated and set
+                   with corresponding values of ProcParamArray
+  NOTES        : Multi-field is NOT on list of ephemeral segments
+ ****************************************************************/
+void GrabProcWildargs(
+  Environment *theEnv,
+  UDFValue *returnValue,
+  unsigned int theIndex)
+  {
+   unsigned int i, j;
+   size_t k; /* 6.04 Bug Fix */
+   size_t size;
+   UDFValue *val;
+
+   returnValue->begin = 0;
+   if (ProceduralPrimitiveData(theEnv)->WildcardValue == NULL)
+     {
+      ProceduralPrimitiveData(theEnv)->WildcardValue = get_struct(theEnv,udfValue);
+      ProceduralPrimitiveData(theEnv)->WildcardValue->begin = 0;
+     }
+   else if (theIndex == ProceduralPrimitiveData(theEnv)->Oldindex)
+     {
+      returnValue->range = ProceduralPrimitiveData(theEnv)->WildcardValue->range;
+      returnValue->value = ProceduralPrimitiveData(theEnv)->WildcardValue->value;
+      return;
+     }
+   else
+     {
+      ReleaseMultifield(theEnv,ProceduralPrimitiveData(theEnv)->WildcardValue->multifieldValue);
+      if (ProceduralPrimitiveData(theEnv)->WildcardValue->value != ProceduralPrimitiveData(theEnv)->NoParamValue)
+        AddToMultifieldList(theEnv,ProceduralPrimitiveData(theEnv)->WildcardValue->multifieldValue);
+     }
+   ProceduralPrimitiveData(theEnv)->Oldindex = theIndex;
+   size = ProceduralPrimitiveData(theEnv)->ProcParamArraySize + 1 - theIndex;
+     
+   if (size == 0)
+     {
+      returnValue->range = 0;
+      ProceduralPrimitiveData(theEnv)->WildcardValue->range = 0;
+      returnValue->value = ProceduralPrimitiveData(theEnv)->WildcardValue->value = ProceduralPrimitiveData(theEnv)->NoParamValue;
+      RetainMultifield(theEnv,ProceduralPrimitiveData(theEnv)->WildcardValue->multifieldValue);
+      return;
+     }
+   for (i = theIndex-1 ; i < ProceduralPrimitiveData(theEnv)->ProcParamArraySize ; i++)
+     {
+      if (ProceduralPrimitiveData(theEnv)->ProcParamArray[i].header->type == MULTIFIELD_TYPE)
+        size += ProceduralPrimitiveData(theEnv)->ProcParamArray[i].range - 1;
+     }
+   returnValue->range = size;
+   ProceduralPrimitiveData(theEnv)->WildcardValue->range = size;
+   returnValue->value = ProceduralPrimitiveData(theEnv)->WildcardValue->value = CreateUnmanagedMultifield(theEnv,size);
+   for (i = theIndex-1 , j = 0 ; i < ProceduralPrimitiveData(theEnv)->ProcParamArraySize ; i++)
+     {
+      if (ProceduralPrimitiveData(theEnv)->ProcParamArray[i].header->type != MULTIFIELD_TYPE)
+        {
+         returnValue->multifieldValue->contents[j].value = ProceduralPrimitiveData(theEnv)->ProcParamArray[i].value;
+         j++;
+        }
+      else
+        {
+         val = &ProceduralPrimitiveData(theEnv)->ProcParamArray[i];
+         for (k = val->begin ; k < (val->begin + val->range)  ; k++ , j++)
+           {
+            returnValue->multifieldValue->contents[j].value = val->multifieldValue->contents[k].value;
+           }
+        }
+     }
+   RetainMultifield(theEnv,ProceduralPrimitiveData(theEnv)->WildcardValue->multifieldValue);
+  }
+
+/* =========================================
+   *****************************************
+          INTERNALLY VISIBLE FUNCTIONS
+   =========================================
+   ***************************************** */
+
+/*******************************************************************
+  NAME         : EvaluateProcParameters
+  DESCRIPTION  : Given a list of parameter expressions,
+                   this function evaluates each expression
+                   and stores the results in a contiguous
+                   array of DATA_OBJECTS.  Used in creating a new
+                   ProcParamArray for the execution of a
+                   procedure
+  INPUTS       : 1) The paramter expression list
+                 2) The number of parameters in the list
+                 3) The name of the procedure for which
+                    these parameters are being evaluated
+                 4) The type of procedure
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Any side-effects of the evaluation of the
+                   parameter expressions
+                 UDFValue array allocated (deallocated on errors)
+                 ProcParamArray set
+  NOTES        : EvaluationError set on errors
+ *******************************************************************/
+static void EvaluateProcParameters(
+  Environment *theEnv,
+  Expression *parameterList,
+  unsigned int numberOfParameters,
+  const char *pname,
+  const char *bodytype)
+  {
+   UDFValue *rva,temp;
+   int i = 0;
+
+   if (numberOfParameters == 0)
+     {
+      ProceduralPrimitiveData(theEnv)->ProcParamArray = NULL;
+      ProceduralPrimitiveData(theEnv)->ProcParamArraySize = 0;
+      return;
+     }
+
+   rva = (UDFValue *) gm2(theEnv,(sizeof(UDFValue) * numberOfParameters));
+   while (parameterList != NULL)
+     {
+      if ((EvaluateExpression(theEnv,parameterList,&temp) == true) ? true :
+          (temp.header->type == VOID_TYPE))
+        {
+         if (temp.header->type == VOID_TYPE)
+           {
+            PrintErrorID(theEnv,"PRCCODE",2,false);
+            WriteString(theEnv,STDERR,"Functions without a return value are illegal as ");
+            WriteString(theEnv,STDERR,bodytype);
+            WriteString(theEnv,STDERR," arguments.\n");
+            SetEvaluationError(theEnv,true);
+           }
+         PrintErrorID(theEnv,"PRCCODE",6,false);
+         WriteString(theEnv,STDERR,"This error occurred while evaluating arguments ");
+         WriteString(theEnv,STDERR,"for the ");
+         WriteString(theEnv,STDERR,bodytype);
+         WriteString(theEnv,STDERR," '");
+         WriteString(theEnv,STDERR,pname);
+         WriteString(theEnv,STDERR,"'.\n");
+         rm(theEnv,rva,(sizeof(UDFValue) * numberOfParameters));
+         return;
+        }
+      rva[i].value = temp.value;
+      rva[i].begin = temp.begin;
+      rva[i].range = temp.range;
+      parameterList = parameterList->nextArg;
+      i++;
+     }
+   ProceduralPrimitiveData(theEnv)->ProcParamArraySize = numberOfParameters;
+   ProceduralPrimitiveData(theEnv)->ProcParamArray = rva;
+  }
+
+/***************************************************
+  NAME         : RtnProcParam
+  DESCRIPTION  : Internal function for getting the
+                   value of an argument passed to
+                   a procedure
+  INPUTS       : 1) Expression to evaluate
+                    (PROC_PARAM index)
+                 2) Caller's result value buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Caller's buffer set to specified
+                   node of ProcParamArray
+  NOTES        : None
+ ***************************************************/
+static bool RtnProcParam(
+  Environment *theEnv,
+  void *value,
+  UDFValue *returnValue)
+  {
+   UDFValue *src;
+
+   src = &ProceduralPrimitiveData(theEnv)->ProcParamArray[*((int *) ((CLIPSBitMap *) value)->contents) - 1];
+   returnValue->value = src->value;
+   returnValue->begin = src->begin;
+   returnValue->range = src->range;
+   return true;
+  }
+
+/**************************************************************
+  NAME         : GetProcBind
+  DESCRIPTION  : Internal function for looking up the
+                    values of parameters or bound variables
+                    within procedures
+  INPUTS       : 1) Expression to evaluate
+                    (PROC_GET_BIND index)
+                 2) Caller's result value buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Caller's buffer set to parameter value in
+                   ProcParamArray or the value in LocalVarArray
+  NOTES        : None
+ **************************************************************/
+static bool GetProcBind(
+  Environment *theEnv,
+  void *value,
+  UDFValue *returnValue)
+  {
+   UDFValue *src;
+   PACKED_PROC_VAR *pvar;
+
+   pvar = (PACKED_PROC_VAR *) ((CLIPSBitMap *) value)->contents;
+   src = &ProceduralPrimitiveData(theEnv)->LocalVarArray[pvar->first - 1];
+   if (src->supplementalInfo == TrueSymbol(theEnv))
+     {
+      returnValue->value = src->value;
+      returnValue->begin = src->begin;
+      returnValue->range = src->range;
+      return true;
+     }
+   if (GetFirstArgument()->nextArg != NULL)
+     {
+      EvaluateExpression(theEnv,GetFirstArgument()->nextArg,returnValue);
+      return true;
+     }
+   if (pvar->second == 0)
+     {
+      PrintErrorID(theEnv,"PRCCODE",5,false);
+      SetEvaluationError(theEnv,true);
+      WriteString(theEnv,STDERR,"Variable ?");
+      WriteString(theEnv,STDERR,GetFirstArgument()->lexemeValue->contents);
+      if (ProceduralPrimitiveData(theEnv)->ProcUnboundErrFunc != NULL)
+        {
+         WriteString(theEnv,STDERR," unbound in ");
+         (*ProceduralPrimitiveData(theEnv)->ProcUnboundErrFunc)(theEnv,STDERR);
+        }
+      else
+        WriteString(theEnv,STDERR," unbound.\n");
+      returnValue->value = FalseSymbol(theEnv);
+      return true;
+     }
+   if (pvar->secondFlag == 0)
+     {
+      src = &ProceduralPrimitiveData(theEnv)->ProcParamArray[pvar->second - 1];
+      returnValue->value = src->value;
+      returnValue->begin = src->begin;
+      returnValue->range = src->range;
+     }
+   else
+     GrabProcWildargs(theEnv,returnValue,pvar->second);
+   return true;
+  }
+
+/**************************************************************
+  NAME         : PutProcBind
+  DESCRIPTION  : Internal function for setting the values of
+                 of locally bound variables within procedures
+  INPUTS       : 1) Expression to evaluate
+                    (PROC_PARAM index)
+                 2) Caller's result value buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Bound variable in LocalVarArray set to
+                   value in caller's buffer.
+  NOTES        : None
+ **************************************************************/
+static bool PutProcBind(
+  Environment *theEnv,
+  void *value,
+  UDFValue *returnValue)
+  {
+   UDFValue *dst;
+
+   dst = &ProceduralPrimitiveData(theEnv)->LocalVarArray[*((int *) ((CLIPSBitMap *) value)->contents) - 1];
+   if (GetFirstArgument() == NULL)
+     {
+      if (dst->supplementalInfo == TrueSymbol(theEnv))
+        ReleaseUDFV(theEnv,dst);
+      dst->supplementalInfo = FalseSymbol(theEnv);
+      returnValue->value = FalseSymbol(theEnv);
+     }
+   else
+     {
+      if (GetFirstArgument()->nextArg != NULL)
+        StoreInMultifield(theEnv,returnValue,GetFirstArgument(),true);
+      else
+        EvaluateExpression(theEnv,GetFirstArgument(),returnValue);
+      if (dst->supplementalInfo == TrueSymbol(theEnv))
+        ReleaseUDFV(theEnv,dst);
+      dst->supplementalInfo = TrueSymbol(theEnv);
+      dst->value = returnValue->value;
+      dst->begin = returnValue->begin;
+      dst->range = returnValue->range;
+      RetainUDFV(theEnv,dst);
+     }
+   return true;
+  }
+
+/****************************************************************
+  NAME         : RtnProcWild
+  DESCRIPTION  : Groups a portion of the ProcParamArray
+                   into a multi-field variable
+  INPUTS       : 1) Starting index in ProcParamArray
+                      for grouping of arguments into
+                      multi-field variable (expression value)
+                 2) Caller's result value buffer
+  RETURNS      : Nothing useful
+  SIDE EFFECTS : Multi-field variable allocated and set
+                   with corresponding values of ProcParamArray
+  NOTES        : Multi-field is NOT on list of ephemeral segments
+ ****************************************************************/
+static bool RtnProcWild(
+  Environment *theEnv,
+  void *value,
+  UDFValue *returnValue)
+  {
+   GrabProcWildargs(theEnv,returnValue,*(unsigned *) ((CLIPSBitMap *) value)->contents);
+   return true;
+  }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+/***************************************************
+  NAME         : FindProcParameter
+  DESCRIPTION  : Determines the relative position in
+                   an n-element list of a certain
+                   parameter.  The index is 1..n.
+  INPUTS       : 1) Parameter name
+                 2) Parameter list
+                 3) Wildcard symbol (NULL if none)
+  RETURNS      : Index of parameter in list, 0 if
+                   not found
+  SIDE EFFECTS : None
+  NOTES        : None
+ ***************************************************/
+static unsigned int FindProcParameter(
+  CLIPSLexeme *name,
+  Expression *parameterList,
+  CLIPSLexeme *wildcard)
+  {
+   unsigned int i = 1;
+
+   while (parameterList != NULL)
+     {
+      if (parameterList->value == (void *) name)
+        { return i; }
+      i++;
+      parameterList = parameterList->nextArg;
+     }
+
+   /* ===================================================================
+      Wildcard may not be stored in actual list but know is always at end
+      =================================================================== */
+   if (name == wildcard)
+     { return i; }
+     
+   return 0;
+  }
+
+/*************************************************************************
+  NAME         : ReplaceProcBinds
+  DESCRIPTION  : Examines an expression and replaces calls to the
+                 "bind" function which are specially recognized
+
+                 For example, in a message-handler,
+
+                   (bind ?self <value>) would be illegal
+
+                   and
+
+                   (bind ?self:<slot-name> <value>) would be
+                   replaced with
+                   (put <slot-name> <value>)
+
+  INPUTS       : 1) The actions in which to replace special binds
+                 2) A pointer to a function to handle binds in a
+                    special way. The function should accept the
+                    bind function call expression and a specialized
+                    data buffer (can be NULL) as arguments.
+                    If the variable is recognized and treated specially,
+                    the function should modify the expression
+                    appropriately (including attaching/removing
+                    any necessary argument expressions).  Return 1
+                    if recognized, 0 if not, -1 on errors.
+                    This argument CANNOT be NULL.
+                 3) Specialized user data buffer
+  RETURNS      : False if OK, true on errors
+  SIDE EFFECTS : Some binds replaced with specialized calls
+  NOTES        : Local variable binds are replaced in ReplaceProcVars
+                 (after this routine has had a chance to replace all
+                  special binds and remove the names from the parsed
+                  bind list)
+ *************************************************************************/
+static bool ReplaceProcBinds(
+  Environment *theEnv,
+  Expression *actions,
+  int (*altbindfunc)(Environment *,Expression *,void *),
+  void *userBuffer)
+  {
+   int bcode;
+   CLIPSLexeme *bname;
+
+   while (actions != NULL)
+     {
+      if (actions->argList != NULL)
+        {
+         if (ReplaceProcBinds(theEnv,actions->argList,altbindfunc,userBuffer))
+           return true;
+         if ((actions->value == (void *) FindFunction(theEnv,"bind")) &&
+             (actions->argList->type == SYMBOL_TYPE))
+           {
+            bname = actions->argList->lexemeValue;
+            bcode = (*altbindfunc)(theEnv,actions,userBuffer);
+            if (bcode == -1)
+              return true;
+            if (bcode == 1)
+              RemoveParsedBindName(theEnv,bname);
+           }
+        }
+      actions = actions->nextArg;
+     }
+   return false;
+  }
+
+/*****************************************************
+  NAME         : CompactActions
+  DESCRIPTION  : Examines a progn expression chain,
+                 and if there is only one action,
+                 the progn header is deallocated and
+                 the action is returned.  If there are
+                 no actions, the progn expression is
+                 modified to be the FALSE symbol
+                 and returned.  Otherwise, the progn
+                 is simply returned.
+  INPUTS       : The action expression
+  RETURNS      : The compacted expression
+  SIDE EFFECTS : Some expressions possibly deallocated
+  NOTES        : Assumes actions is a progn expression
+                 and actions->nextArg == NULL
+ *****************************************************/
+static Expression *CompactActions(
+  Environment *theEnv,
+  Expression *actions)
+  {
+   struct expr *tmp;
+
+   if (actions->argList == NULL)
+     {
+      actions->type = SYMBOL_TYPE;
+      actions->value = FalseSymbol(theEnv);
+     }
+   else if (actions->argList->nextArg == NULL)
+     {
+      tmp = actions;
+      actions = actions->argList;
+      rtn_struct(theEnv,expr,tmp);
+     }
+   return(actions);
+  }
+
+#endif
+
+#if (! DEFFUNCTION_CONSTRUCT) || (! DEFGENERIC_CONSTRUCT)
+
+/******************************************************
+  NAME         : EvaluateBadCall
+  DESCRIPTION  : Default evaluation function for
+                 deffunctions and gneric functions
+                 in configurations where either
+                 capability is not present.
+  INPUTS       : 1) The function (ignored)
+                 2) A data object buffer for the result
+  RETURNS      : False
+  SIDE EFFECTS : Data object buffer set to the
+                 symbol FALSE and evaluation error set
+  NOTES        : Used for binary images which
+                 contain deffunctions and generic
+                 functions which cannot be used
+ ******************************************************/
+static bool EvaluateBadCall(
+  Environment *theEnv,
+  void *value,
+  UDFValue *returnValue)
+  {
+#if MAC_XCD
+#pragma unused(value)
+#endif
+   PrintErrorID(theEnv,"PRCCODE",1,false);
+   WriteString(theEnv,STDERR,"Attempted to call a deffunction/generic function ");
+   WriteString(theEnv,STDERR,"which does not exist.\n");
+   SetEvaluationError(theEnv,true);
+   returnValue->value = FalseSymbol(theEnv);
+   return false;
+  }
+
+#endif
+
diff --git a/clips/prccode.h b/clips/prccode.h
new file mode 100755
index 000000000..8b7573d69
--- /dev/null
+++ b/clips/prccode.h
@@ -0,0 +1,145 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*                                                     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                          */
+/*                                                            */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859   */
+/*                                                            */
+/*            Changed name of variable log to logName         */
+/*            because of Unix compiler warnings of shadowed   */
+/*            definitions.                                    */
+/*                                                            */
+/*      6.24: Renamed BOOLEAN macro type to intBool.          */
+/*                                                            */
+/*            Added pragmas to remove compilation warnings.   */
+/*                                                            */
+/*      6.30: Updated ENTITY_RECORD definitions to include    */
+/*            additional NULL initializers.                   */
+/*                                                            */
+/*            Added ReleaseProcParameters call.               */
+/*                                                            */
+/*            Added tracked memory calls.                     */
+/*                                                            */
+/*            Removed conditional code for unsupported        */
+/*            compilers/operating systems (IBM_MCW,           */
+/*            MAC_MCW, and IBM_TBC).                          */
+/*                                                            */
+/*            Added const qualifiers to remove C++            */
+/*            deprecation warnings.                           */
+/*                                                            */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_prccode
+
+#pragma once
+
+#define _H_prccode
+
+#include "expressn.h"
+#include "evaluatn.h"
+#include "moduldef.h"
+#include "scanner.h"
+#include "symbol.h"
+
+typedef struct ProcParamStack
+  {
+   UDFValue *ParamArray;
+
+#if DEFGENERIC_CONSTRUCT
+   Expression *ParamExpressions;
+#endif
+
+   unsigned int ParamArraySize;
+   UDFValue *WildcardValue;
+   void (*UnboundErrFunc)(Environment *,const char *);
+   struct ProcParamStack *nxt;
+  } PROC_PARAM_STACK;
+
+#define PROCEDURAL_PRIMITIVE_DATA 37
+
+struct proceduralPrimitiveData
+  {
+   Multifield *NoParamValue;
+   UDFValue *ProcParamArray;
+   unsigned int ProcParamArraySize;
+   Expression *CurrentProcActions;
+#if DEFGENERIC_CONSTRUCT
+   Expression *ProcParamExpressions;
+#endif
+   PROC_PARAM_STACK *pstack;
+   UDFValue *WildcardValue;
+   UDFValue *LocalVarArray;
+   void (*ProcUnboundErrFunc)(Environment *,const char *);
+   EntityRecord ProcParameterInfo;
+   EntityRecord ProcWildInfo;
+   EntityRecord ProcGetInfo;
+   EntityRecord ProcBindInfo;
+#if ! DEFFUNCTION_CONSTRUCT
+   EntityRecord DeffunctionEntityRecord;
+#endif
+#if ! DEFGENERIC_CONSTRUCT
+   EntityRecord GenericEntityRecord;
+#endif
+   unsigned int Oldindex;
+  };
+
+#define ProceduralPrimitiveData(theEnv) ((struct proceduralPrimitiveData *) GetEnvironmentData(theEnv,PROCEDURAL_PRIMITIVE_DATA))
+
+   void                           InstallProcedurePrimitives(Environment *);
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+
+#if DEFFUNCTION_CONSTRUCT || OBJECT_SYSTEM
+   Expression                    *ParseProcParameters(Environment *,const char *,struct token *,Expression *,
+                                                             CLIPSLexeme **,unsigned short *,unsigned short *,bool *,
+                                                             bool (*)(Environment *,const char *));
+#endif
+   Expression                    *ParseProcActions(Environment *,const char *,const char *,struct token *,Expression *,CLIPSLexeme *,
+                                                          int (*)(Environment *,Expression *,void *),
+                                                          int (*)(Environment *,Expression *,void *),
+                                                          unsigned short *,void *);
+   int                            ReplaceProcVars(Environment *,const char *,Expression *,Expression *,CLIPSLexeme *,
+                                                         int (*)(Environment *,Expression *,void *),void *);
+#if DEFGENERIC_CONSTRUCT
+   Expression                    *GenProcWildcardReference(Environment *,int);
+#endif
+#endif
+
+   void                           PushProcParameters(Environment *,Expression *,unsigned int,const char *,const char *,void (*)(Environment *,const char *));
+   void                           PopProcParameters(Environment *);
+
+#if DEFGENERIC_CONSTRUCT
+   Expression                    *GetProcParamExpressions(Environment *);
+#endif
+
+   void                           EvaluateProcActions(Environment *,Defmodule *,Expression *,unsigned short,
+                                                      UDFValue *,void (*)(Environment *,const char *));
+   void                           PrintProcParamArray(Environment *,const char *);
+   void                           GrabProcWildargs(Environment *,UDFValue *,unsigned int);
+
+#endif /* _H_prccode */
+
diff --git a/clips/prcdrfun.c b/clips/prcdrfun.c
new file mode 100755
index 000000000..940255e79
--- /dev/null
+++ b/clips/prcdrfun.c
@@ -0,0 +1,640 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/18/16             */
+   /*                                                     */
+   /*             PROCEDURAL FUNCTIONS MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for several procedural         */
+/*   functions including if, while, loop-for-count, bind,    */
+/*   progn, return, break, and switch                        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Local variables set with the bind function     */
+/*            persist until a reset/clear command is issued. */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*      6.40: Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "constrnt.h"
+#include "cstrnchk.h"
+#include "cstrnops.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "prcdrpsr.h"
+#include "router.h"
+#include "scanner.h"
+#include "utility.h"
+
+#include "prcdrfun.h"
+
+#if DEFGLOBAL_CONSTRUCT
+#include "globldef.h"
+#endif
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    DeallocateProceduralFunctionData(Environment *);
+
+/**********************************************/
+/* ProceduralFunctionDefinitions: Initializes */
+/*   the procedural functions.                */
+/**********************************************/
+void ProceduralFunctionDefinitions(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,PRCDRFUN_DATA,sizeof(struct procedureFunctionData),DeallocateProceduralFunctionData);
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"if","*",0,UNBOUNDED,NULL,IfFunction,"IfFunction",NULL);
+   AddUDF(theEnv,"while","*",0,UNBOUNDED,NULL,WhileFunction,"WhileFunction",NULL);
+   AddUDF(theEnv,"loop-for-count","*",0,UNBOUNDED,NULL,LoopForCountFunction,"LoopForCountFunction",NULL);
+   AddUDF(theEnv,"(get-loop-count)","l",1,1,NULL,GetLoopCount,"GetLoopCount",NULL);
+   AddUDF(theEnv,"bind","*",0,UNBOUNDED,NULL,BindFunction,"BindFunction",NULL);
+   AddUDF(theEnv,"progn","*",0,UNBOUNDED,NULL,PrognFunction,"PrognFunction",NULL);
+   AddUDF(theEnv,"return","*",0,UNBOUNDED,NULL,ReturnFunction,"ReturnFunction",NULL);
+   AddUDF(theEnv,"break","v",0,0,NULL,BreakFunction,"BreakFunction",NULL);
+   AddUDF(theEnv,"switch","*",0,UNBOUNDED,NULL,SwitchFunction,"SwitchFunction",NULL);
+#endif
+
+   ProceduralFunctionParsers(theEnv);
+
+#if ! RUN_TIME
+   FuncSeqOvlFlags(theEnv,"progn",false,false);
+   FuncSeqOvlFlags(theEnv,"if",false,false);
+   FuncSeqOvlFlags(theEnv,"while",false,false);
+   FuncSeqOvlFlags(theEnv,"loop-for-count",false,false);
+   FuncSeqOvlFlags(theEnv,"return",false,false);
+   FuncSeqOvlFlags(theEnv,"switch",false,false);
+#endif
+
+   AddResetFunction(theEnv,"bind",FlushBindList,0,NULL);
+   AddClearFunction(theEnv,"bind",FlushBindList,0,NULL);
+  }
+
+/*************************************************************/
+/* DeallocateProceduralFunctionData: Deallocates environment */
+/*    data for procedural functions.                         */
+/*************************************************************/
+static void DeallocateProceduralFunctionData(
+  Environment *theEnv)
+  {
+   UDFValue *nextPtr, *garbagePtr;
+
+   garbagePtr = ProcedureFunctionData(theEnv)->BindList;
+
+   while (garbagePtr != NULL)
+     {
+      nextPtr = garbagePtr->next;
+      rtn_struct(theEnv,udfValue,garbagePtr);
+      garbagePtr = nextPtr;
+     }
+  }
+
+/***************************************/
+/* WhileFunction: H/L access routine   */
+/*   for the while function.           */
+/***************************************/
+void WhileFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theResult;
+   GCBlock gcb;
+
+   /*====================================================*/
+   /* Evaluate the body of the while loop as long as the */
+   /* while condition evaluates to a non-FALSE value.    */
+   /*====================================================*/
+
+   GCBlockStart(theEnv,&gcb);
+
+   UDFNthArgument(context,1,ANY_TYPE_BITS,&theResult);
+   while ((theResult.value != FalseSymbol(theEnv)) &&
+          (EvaluationData(theEnv)->HaltExecution != true))
+     {
+      if ((ProcedureFunctionData(theEnv)->BreakFlag == true) || (ProcedureFunctionData(theEnv)->ReturnFlag == true))
+        break;
+
+      UDFNthArgument(context,2,ANY_TYPE_BITS,&theResult);
+
+      if ((ProcedureFunctionData(theEnv)->BreakFlag == true) || (ProcedureFunctionData(theEnv)->ReturnFlag == true))
+        break;
+
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+
+      UDFNthArgument(context,1,ANY_TYPE_BITS,&theResult);
+     }
+
+   /*=====================================================*/
+   /* Reset the break flag. The return flag is not reset  */
+   /* because the while loop is probably contained within */
+   /* a deffunction or RHS of a rule which needs to be    */
+   /* returned from as well.                              */
+   /*=====================================================*/
+
+   ProcedureFunctionData(theEnv)->BreakFlag = false;
+
+   /*====================================================*/
+   /* If the return command was issued, then return that */
+   /* value, otherwise return the symbol FALSE.          */
+   /*====================================================*/
+
+   if (ProcedureFunctionData(theEnv)->ReturnFlag == true)
+     {
+      returnValue->value = theResult.value;
+      returnValue->begin = theResult.begin;
+      returnValue->range = theResult.range;
+     }
+   else
+     {
+      returnValue->value = FalseSymbol(theEnv);
+     }
+
+   GCBlockEndUDF(theEnv,&gcb,returnValue);
+   CallPeriodicTasks(theEnv);
+  }
+
+/********************************************/
+/* LoopForCountFunction: H/L access routine */
+/*   for the loop-for-count function.       */
+/********************************************/
+void LoopForCountFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *loopResult)
+  {
+   UDFValue theArg;
+   long long iterationEnd;
+   LOOP_COUNTER_STACK *tmpCounter;
+   GCBlock gcb;
+
+   tmpCounter = get_struct(theEnv,loopCounterStack);
+   tmpCounter->loopCounter = 0L;
+   tmpCounter->nxt = ProcedureFunctionData(theEnv)->LoopCounterStack;
+   ProcedureFunctionData(theEnv)->LoopCounterStack = tmpCounter;
+
+   if (! UDFNthArgument(context,1,INTEGER_BIT,&theArg))
+     {
+      loopResult->value = FalseSymbol(theEnv);
+      ProcedureFunctionData(theEnv)->LoopCounterStack = tmpCounter->nxt;
+      rtn_struct(theEnv,loopCounterStack,tmpCounter);
+      return;
+     }
+   tmpCounter->loopCounter = theArg.integerValue->contents;
+   if (! UDFNthArgument(context,2,INTEGER_BIT,&theArg))
+     {
+      loopResult->value = FalseSymbol(theEnv);
+      ProcedureFunctionData(theEnv)->LoopCounterStack = tmpCounter->nxt;
+      rtn_struct(theEnv,loopCounterStack,tmpCounter);
+      return;
+     }
+
+   GCBlockStart(theEnv,&gcb);
+
+   iterationEnd = theArg.integerValue->contents;
+   while ((tmpCounter->loopCounter <= iterationEnd) &&
+          (EvaluationData(theEnv)->HaltExecution != true))
+     {
+      if ((ProcedureFunctionData(theEnv)->BreakFlag == true) || (ProcedureFunctionData(theEnv)->ReturnFlag == true))
+        break;
+
+      UDFNthArgument(context,3,ANY_TYPE_BITS,&theArg);
+
+      if ((ProcedureFunctionData(theEnv)->BreakFlag == true) || (ProcedureFunctionData(theEnv)->ReturnFlag == true))
+        break;
+
+      CleanCurrentGarbageFrame(theEnv,NULL);
+      CallPeriodicTasks(theEnv);
+
+      tmpCounter->loopCounter++;
+     }
+
+   ProcedureFunctionData(theEnv)->BreakFlag = false;
+   if (ProcedureFunctionData(theEnv)->ReturnFlag == true)
+     {
+      loopResult->value = theArg.value;
+      loopResult->begin = theArg.begin;
+      loopResult->range = theArg.range;
+     }
+   else
+     {
+      loopResult->value = FalseSymbol(theEnv);
+     }
+   ProcedureFunctionData(theEnv)->LoopCounterStack = tmpCounter->nxt;
+   rtn_struct(theEnv,loopCounterStack,tmpCounter);
+
+   GCBlockEndUDF(theEnv,&gcb,loopResult);
+   CallPeriodicTasks(theEnv);
+  }
+
+/*****************/
+/* GetLoopCount: */
+/*****************/
+void GetLoopCount(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   long long depth;
+   UDFValue theArg;
+   LOOP_COUNTER_STACK *tmpCounter;
+
+   if (! UDFFirstArgument(context,INTEGER_BIT,&theArg))
+     { return; }
+   depth = theArg.integerValue->contents;
+   tmpCounter = ProcedureFunctionData(theEnv)->LoopCounterStack;
+   while (depth > 0)
+     {
+      tmpCounter = tmpCounter->nxt;
+      depth--;
+     }
+
+   returnValue->integerValue = CreateInteger(theEnv,tmpCounter->loopCounter);
+  }
+
+/************************************/
+/* IfFunction: H/L access routine   */
+/*   for the if function.           */
+/************************************/
+void IfFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned int numArgs;
+
+   /*=========================*/
+   /* Evaluate the condition. */
+   /*=========================*/
+
+   if (! UDFNthArgument(context,1,ANY_TYPE_BITS,returnValue))
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      return;
+     }
+
+   if ((ProcedureFunctionData(theEnv)->BreakFlag == true) ||
+       (ProcedureFunctionData(theEnv)->ReturnFlag == true))
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*=========================================*/
+   /* If the condition evaluated to FALSE and */
+   /* an "else" portion exists, evaluate it   */
+   /* and return the value.                   */
+   /*=========================================*/
+
+   numArgs = UDFArgumentCount(context);
+   if ((returnValue->value == FalseSymbol(theEnv)) &&
+       (numArgs == 3))
+     {
+      UDFNthArgument(context,3,ANY_TYPE_BITS,returnValue);
+      return;
+     }
+
+   /*===================================================*/
+   /* Otherwise if the symbol evaluated to a non-FALSE  */
+   /* value, evaluate the "then" portion and return it. */
+   /*===================================================*/
+
+   else if (returnValue->value != FalseSymbol(theEnv))
+     {
+      UDFNthArgument(context,2,ANY_TYPE_BITS,returnValue);
+      return;
+     }
+
+   /*=========================================*/
+   /* Return FALSE if the condition evaluated */
+   /* to FALSE and there is no "else" portion */
+   /* of the if statement.                    */
+   /*=========================================*/
+
+   returnValue->value = FalseSymbol(theEnv);
+  }
+
+/**************************************/
+/* BindFunction: H/L access routine   */
+/*   for the bind function.           */
+/**************************************/
+void BindFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue *theBind, *lastBind;
+   bool found = false,
+       unbindVar = false;
+   CLIPSLexeme *variableName = NULL;
+#if DEFGLOBAL_CONSTRUCT
+   Defglobal *theGlobal = NULL;
+#endif
+
+   /*===============================================*/
+   /* Determine the name of the variable to be set. */
+   /*===============================================*/
+
+#if DEFGLOBAL_CONSTRUCT
+   if (GetFirstArgument()->type == DEFGLOBAL_PTR)
+     { theGlobal = (Defglobal *) GetFirstArgument()->value; }
+   else
+#endif
+     {
+      EvaluateExpression(theEnv,GetFirstArgument(),returnValue);
+      variableName = returnValue->lexemeValue;
+     }
+
+   /*===========================================*/
+   /* Determine the new value for the variable. */
+   /*===========================================*/
+
+   if (GetFirstArgument()->nextArg == NULL)
+     { unbindVar = true; }
+   else if (GetFirstArgument()->nextArg->nextArg == NULL)
+     { EvaluateExpression(theEnv,GetFirstArgument()->nextArg,returnValue); }
+   else
+     { StoreInMultifield(theEnv,returnValue,GetFirstArgument()->nextArg,true); }
+
+   /*==================================*/
+   /* Bind a defglobal if appropriate. */
+   /*==================================*/
+
+#if DEFGLOBAL_CONSTRUCT
+   if (theGlobal != NULL)
+     {
+      QSetDefglobalValue(theEnv,theGlobal,returnValue,unbindVar);
+      return;
+     }
+#endif
+
+   /*===============================================*/
+   /* Search for the variable in the list of binds. */
+   /*===============================================*/
+
+   theBind = ProcedureFunctionData(theEnv)->BindList;
+   lastBind = NULL;
+
+   while ((theBind != NULL) && (found == false))
+     {
+      if (theBind->supplementalInfo == (void *) variableName)
+        { found = true; }
+      else
+        {
+         lastBind = theBind;
+         theBind = theBind->next;
+        }
+     }
+
+   /*========================================================*/
+   /* If variable was not in the list of binds, then add it. */
+   /* Make sure that this operation preserves the bind list  */
+   /* as a stack.                                            */
+   /*========================================================*/
+
+   if (found == false)
+     {
+      if (unbindVar == false)
+        {
+         theBind = get_struct(theEnv,udfValue);
+         theBind->supplementalInfo = (void *) variableName;
+         IncrementLexemeCount(variableName);
+         theBind->next = NULL;
+         if (lastBind == NULL)
+           { ProcedureFunctionData(theEnv)->BindList = theBind; }
+         else
+           { lastBind->next = theBind; }
+        }
+      else
+        {
+         returnValue->value = FalseSymbol(theEnv);
+         return;
+        }
+     }
+   else
+     { ReleaseUDFV(theEnv,theBind); }
+
+   /*================================*/
+   /* Set the value of the variable. */
+   /*================================*/
+
+   if (unbindVar == false)
+     {
+      theBind->value = returnValue->value;
+      theBind->begin = returnValue->begin;
+      theBind->range = returnValue->range;
+      RetainUDFV(theEnv,returnValue);
+     }
+   else
+     {
+      if (lastBind == NULL) ProcedureFunctionData(theEnv)->BindList = theBind->next;
+      else lastBind->next = theBind->next;
+      ReleaseLexeme(theEnv,(CLIPSLexeme *) theBind->supplementalInfo);
+      rtn_struct(theEnv,udfValue,theBind);
+      returnValue->value = FalseSymbol(theEnv);
+     }
+  }
+
+/*******************************************/
+/* GetBoundVariable: Searches the BindList */
+/*   for a specified variable.             */
+/*******************************************/
+bool GetBoundVariable(
+  Environment *theEnv,
+  UDFValue *vPtr,
+  CLIPSLexeme *varName)
+  {
+   UDFValue *bindPtr;
+
+   for (bindPtr = ProcedureFunctionData(theEnv)->BindList; bindPtr != NULL; bindPtr = bindPtr->next)
+     {
+      if (bindPtr->supplementalInfo == (void *) varName)
+        {
+         vPtr->value = bindPtr->value;
+         vPtr->begin = bindPtr->begin;
+         vPtr->range = bindPtr->range;
+         return true;
+        }
+     }
+
+   return false;
+  }
+
+/*************************************************/
+/* FlushBindList: Removes all variables from the */
+/*   list of currently bound local variables.    */
+/*************************************************/
+void FlushBindList(
+  Environment *theEnv,
+  void *context)
+  {
+   ReturnValues(theEnv,ProcedureFunctionData(theEnv)->BindList,true);
+   ProcedureFunctionData(theEnv)->BindList = NULL;
+  }
+
+/***************************************/
+/* PrognFunction: H/L access routine   */
+/*   for the progn function.           */
+/***************************************/
+void PrognFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   struct expr *argPtr;
+
+   argPtr = EvaluationData(theEnv)->CurrentExpression->argList;
+
+   if (argPtr == NULL)
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      return;
+     }
+
+   while ((argPtr != NULL) && (GetHaltExecution(theEnv) != true))
+     {
+      EvaluateExpression(theEnv,argPtr,returnValue);
+
+      if ((ProcedureFunctionData(theEnv)->BreakFlag == true) || (ProcedureFunctionData(theEnv)->ReturnFlag == true))
+        break;
+      argPtr = argPtr->nextArg;
+     }
+
+   if (GetHaltExecution(theEnv) == true)
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      return;
+     }
+
+   return;
+  }
+
+/***************************************************************/
+/* ReturnFunction: H/L access routine for the return function. */
+/***************************************************************/
+void ReturnFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   if (! UDFHasNextArgument(context))
+     {
+      returnValue->voidValue = VoidConstant(theEnv);
+     }
+   else
+     { UDFNextArgument(context,ANY_TYPE_BITS,returnValue); }
+   ProcedureFunctionData(theEnv)->ReturnFlag = true;
+  }
+
+/***************************************************************/
+/* BreakFunction: H/L access routine for the break function.   */
+/***************************************************************/
+void BreakFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ProcedureFunctionData(theEnv)->BreakFlag = true;
+  }
+
+/*****************************************************************/
+/* SwitchFunction: H/L access routine for the switch function.   */
+/*****************************************************************/
+void SwitchFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue switch_val,case_val;
+   Expression *theExp;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   /* ==========================
+      Get the value to switch on
+      ========================== */
+   EvaluateExpression(theEnv,GetFirstArgument(),&switch_val);
+   if (EvaluationData(theEnv)->EvaluationError)
+     return;
+   for (theExp = GetFirstArgument()->nextArg ; theExp != NULL ; theExp = theExp->nextArg->nextArg)
+     {
+      /* =================================================
+         VOID_TYPE is the default case (if any) for the switch
+         ================================================= */
+      if (theExp->type == VOID_TYPE)
+        {
+         EvaluateExpression(theEnv,theExp->nextArg,returnValue);
+         return;
+        }
+
+      /* ====================================================
+         If the case matches, evaluate the actions and return
+         ==================================================== */
+      EvaluateExpression(theEnv,theExp,&case_val);
+      if (EvaluationData(theEnv)->EvaluationError)
+        return;
+      if (switch_val.header->type == case_val.header->type)
+        {
+         if ((case_val.header->type == MULTIFIELD_TYPE) ? MultifieldDOsEqual(&switch_val,&case_val) :
+             (switch_val.value == case_val.value))
+           {
+            EvaluateExpression(theEnv,theExp->nextArg,returnValue);
+            return;
+           }
+        }
+     }
+  }
+
+
+
+
+
diff --git a/clips/prcdrfun.h b/clips/prcdrfun.h
new file mode 100755
index 000000000..e86d794f9
--- /dev/null
+++ b/clips/prcdrfun.h
@@ -0,0 +1,93 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*          PROCEDURAL FUNCTIONS HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*            Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Local variables set with the bind function     */
+/*            persist until a reset/clear command is issued. */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_prcdrfun
+
+#pragma once
+
+#define _H_prcdrfun
+
+#include "evaluatn.h"
+
+typedef struct loopCounterStack
+  {
+   long long loopCounter;
+   struct loopCounterStack *nxt;
+  } LOOP_COUNTER_STACK;
+
+#define PRCDRFUN_DATA 13
+
+struct procedureFunctionData
+  {
+   bool ReturnFlag;
+   bool BreakFlag;
+   LOOP_COUNTER_STACK *LoopCounterStack;
+   UDFValue *BindList;
+  };
+
+#define ProcedureFunctionData(theEnv) ((struct procedureFunctionData *) GetEnvironmentData(theEnv,PRCDRFUN_DATA))
+
+   void                           ProceduralFunctionDefinitions(Environment *);
+   void                           WhileFunction(Environment *,UDFContext *,UDFValue *);
+   void                           LoopForCountFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetLoopCount(Environment *,UDFContext *,UDFValue *);
+   void                           IfFunction(Environment *,UDFContext *,UDFValue *);
+   void                           BindFunction(Environment *,UDFContext *,UDFValue *);
+   void                           PrognFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ReturnFunction(Environment *,UDFContext *,UDFValue *);
+   void                           BreakFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SwitchFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           GetBoundVariable(Environment *,UDFValue *,CLIPSLexeme *);
+   void                           FlushBindList(Environment *,void *);
+
+#endif /* _H_prcdrfun */
+
+
+
+
+
+
diff --git a/clips/prcdrpsr.c b/clips/prcdrpsr.c
new file mode 100755
index 000000000..4090381b3
--- /dev/null
+++ b/clips/prcdrpsr.c
@@ -0,0 +1,1057 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  09/16/17             */
+   /*                                                     */
+   /*          PROCEDURAL FUNCTIONS PARSER MODULE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Local variables set with the bind function     */
+/*            persist until a reset/clear command is issued. */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*      6.31: Fixed 'while' function bug with optional use   */
+/*            of 'do' keyword.                               */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "constrnt.h"
+#include "cstrnchk.h"
+#include "cstrnops.h"
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "utility.h"
+
+#include "prcdrpsr.h"
+
+#if DEFGLOBAL_CONSTRUCT
+#include "globldef.h"
+#include "globlpsr.h"
+#endif
+
+#define PRCDRPSR_DATA 12
+
+struct procedureParserData
+  {
+   struct BindInfo *ListOfParsedBindNames;
+  };
+
+#define ProcedureParserData(theEnv) ((struct procedureParserData *) GetEnvironmentData(theEnv,PRCDRPSR_DATA))
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    DeallocateProceduralFunctionData(Environment *);
+   static struct expr            *WhileParse(Environment *,struct expr *,const char *);
+   static struct expr            *LoopForCountParse(Environment *,struct expr *,const char *);
+   static void                    ReplaceLoopCountVars(Environment *,CLIPSLexeme *,Expression *,int);
+   static struct expr            *IfParse(Environment *,struct expr *,const char *);
+   static struct expr            *PrognParse(Environment *,struct expr *,const char *);
+   static struct expr            *BindParse(Environment *,struct expr *,const char *);
+   static int                     AddBindName(Environment *,CLIPSLexeme *,CONSTRAINT_RECORD *);
+   static struct expr            *ReturnParse(Environment *,struct expr *,const char *);
+   static struct expr            *BreakParse(Environment *,struct expr *,const char *);
+   static struct expr            *SwitchParse(Environment *,struct expr *,const char *);
+
+/*****************************/
+/* ProceduralFunctionParsers */
+/*****************************/
+void ProceduralFunctionParsers(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,PRCDRPSR_DATA,sizeof(struct procedureParserData),DeallocateProceduralFunctionData);
+
+   AddFunctionParser(theEnv,"bind",BindParse);
+   AddFunctionParser(theEnv,"progn",PrognParse);
+   AddFunctionParser(theEnv,"if",IfParse);
+   AddFunctionParser(theEnv,"while",WhileParse);
+   AddFunctionParser(theEnv,"loop-for-count",LoopForCountParse);
+   AddFunctionParser(theEnv,"return",ReturnParse);
+   AddFunctionParser(theEnv,"break",BreakParse);
+   AddFunctionParser(theEnv,"switch",SwitchParse);
+  }
+
+/*************************************************************/
+/* DeallocateProceduralFunctionData: Deallocates environment */
+/*    data for procedural functions.                         */
+/*************************************************************/
+static void DeallocateProceduralFunctionData(
+  Environment *theEnv)
+  {
+   struct BindInfo *temp_bind;
+
+   while (ProcedureParserData(theEnv)->ListOfParsedBindNames != NULL)
+     {
+      temp_bind = ProcedureParserData(theEnv)->ListOfParsedBindNames->next;
+      rtn_struct(theEnv,BindInfo,ProcedureParserData(theEnv)->ListOfParsedBindNames);
+      ProcedureParserData(theEnv)->ListOfParsedBindNames = temp_bind;
+     }
+  }
+
+/***********************/
+/* GetParsedBindNames: */
+/***********************/
+struct BindInfo *GetParsedBindNames(
+  Environment *theEnv)
+  {
+   return(ProcedureParserData(theEnv)->ListOfParsedBindNames);
+  }
+
+/***********************/
+/* SetParsedBindNames: */
+/***********************/
+void SetParsedBindNames(
+  Environment *theEnv,
+  struct BindInfo *newValue)
+  {
+   ProcedureParserData(theEnv)->ListOfParsedBindNames = newValue;
+  }
+
+/*************************/
+/* ClearParsedBindNames: */
+/*************************/
+void ClearParsedBindNames(
+  Environment *theEnv)
+  {
+   struct BindInfo *temp_bind;
+
+   while (ProcedureParserData(theEnv)->ListOfParsedBindNames != NULL)
+     {
+      temp_bind = ProcedureParserData(theEnv)->ListOfParsedBindNames->next;
+      RemoveConstraint(theEnv,ProcedureParserData(theEnv)->ListOfParsedBindNames->constraints);
+      rtn_struct(theEnv,BindInfo,ProcedureParserData(theEnv)->ListOfParsedBindNames);
+      ProcedureParserData(theEnv)->ListOfParsedBindNames = temp_bind;
+     }
+  }
+
+/*************************/
+/* ParsedBindNamesEmpty: */
+/*************************/
+bool ParsedBindNamesEmpty(
+  Environment *theEnv)
+  {
+   if (ProcedureParserData(theEnv)->ListOfParsedBindNames != NULL) return false;
+
+   return true;
+  }
+
+/*********************************************************/
+/* WhileParse: purpose is to parse the while statement.  */
+/*   The parse of the statement is the return value.     */
+/*   Syntax: (while <expression> do <action>+)           */
+/*********************************************************/
+static struct expr *WhileParse(
+  Environment *theEnv,
+  struct expr *parse,
+  const char *infile)
+  {
+   struct token theToken;
+   bool read_first_token;
+
+   /*===============================*/
+   /* Process the while expression. */
+   /*===============================*/
+
+   SavePPBuffer(theEnv," ");
+
+   parse->argList = ParseAtomOrExpression(theEnv,infile,NULL);
+   if (parse->argList == NULL)
+     {
+      ReturnExpression(theEnv,parse);
+      return NULL;
+     }
+
+   /*====================================*/
+   /* Process the do keyword if present. */
+   /*====================================*/
+
+   GetToken(theEnv,infile,&theToken);
+   if ((theToken.tknType == SYMBOL_TOKEN) && (strcmp(theToken.lexemeValue->contents,"do") == 0))
+     {
+      read_first_token = true;
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,theToken.printForm);
+      IncrementIndentDepth(theEnv,3);
+      PPCRAndIndent(theEnv);
+     }
+   else
+     {
+      read_first_token = false;
+      PPBackup(theEnv);
+      IncrementIndentDepth(theEnv,3);
+      PPCRAndIndent(theEnv);
+      SavePPBuffer(theEnv,theToken.printForm);
+     }
+
+   /*============================*/
+   /* Process the while actions. */
+   /*============================*/
+   
+   if (ExpressionData(theEnv)->svContexts->rtn == true)
+     { ExpressionData(theEnv)->ReturnContext = true; }
+   ExpressionData(theEnv)->BreakContext = true;
+   
+   parse->argList->nextArg = GroupActions(theEnv,infile,&theToken,read_first_token,NULL,false);
+
+   if (parse->argList->nextArg == NULL)
+     {
+      ReturnExpression(theEnv,parse);
+      return NULL;
+     }
+     
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,theToken.printForm);
+
+   /*=======================================================*/
+   /* Check for the closing right parenthesis of the while. */
+   /*=======================================================*/
+
+   if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"while function");
+      ReturnExpression(theEnv,parse);
+      return NULL;
+     }
+
+   DecrementIndentDepth(theEnv,3);
+
+   return parse;
+  }
+
+/******************************************************************************************/
+/* LoopForCountParse: purpose is to parse the loop-for-count statement.                   */
+/*   The parse of the statement is the return value.                                      */
+/*   Syntax: (loop-for-count <range> [do] <action>+)                                      */
+/*           <range> ::= (<sf-var> [<start-integer-expression>] <end-integer-expression>) */
+/******************************************************************************************/
+static struct expr *LoopForCountParse(
+  Environment *theEnv,
+  struct expr *parse,
+  const char *infile)
+  {
+   struct token theToken;
+   CLIPSLexeme *loopVar = NULL;
+   Expression *tmpexp;
+   bool read_first_paren;
+   struct BindInfo *oldBindList,*newBindList,*prev;
+
+   /*======================================*/
+   /* Process the loop counter expression. */
+   /*======================================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,infile,&theToken);
+
+   /* ==========================================
+      Simple form: loop-for-count <end> [do] ...
+      ========================================== */
+   if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      parse->argList = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,1LL));
+      parse->argList->nextArg = ParseAtomOrExpression(theEnv,infile,&theToken);
+      if (parse->argList->nextArg == NULL)
+        {
+         ReturnExpression(theEnv,parse);
+         return NULL;
+        }
+     }
+   else
+     {
+      GetToken(theEnv,infile,&theToken);
+      if (theToken.tknType != SF_VARIABLE_TOKEN)
+        {
+         if (theToken.tknType != SYMBOL_TOKEN)
+           goto LoopForCountParseError;
+         parse->argList = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,1LL));
+         parse->argList->nextArg = Function2Parse(theEnv,infile,theToken.lexemeValue->contents);
+         if (parse->argList->nextArg == NULL)
+           {
+            ReturnExpression(theEnv,parse);
+            return NULL;
+           }
+        }
+
+      /* =============================================================
+         Complex form: loop-for-count (<var> [<start>] <end>) [do] ...
+         ============================================================= */
+      else
+        {
+         loopVar = theToken.lexemeValue;
+         SavePPBuffer(theEnv," ");
+         parse->argList = ParseAtomOrExpression(theEnv,infile,NULL);
+         if (parse->argList == NULL)
+           {
+            ReturnExpression(theEnv,parse);
+            return NULL;
+           }
+
+         if (CheckArgumentAgainstRestriction(theEnv,parse->argList,INTEGER_BIT))
+           goto LoopForCountParseError;
+
+         SavePPBuffer(theEnv," ");
+         GetToken(theEnv,infile,&theToken);
+         if (theToken.tknType == RIGHT_PARENTHESIS_TOKEN)
+           {
+            PPBackup(theEnv);
+            PPBackup(theEnv);
+            SavePPBuffer(theEnv,theToken.printForm);
+            tmpexp = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,1LL));
+            tmpexp->nextArg = parse->argList;
+            parse->argList = tmpexp;
+           }
+         else
+          {
+            parse->argList->nextArg = ParseAtomOrExpression(theEnv,infile,&theToken);
+            if (parse->argList->nextArg == NULL)
+              {
+               ReturnExpression(theEnv,parse);
+               return NULL;
+              }
+            GetToken(theEnv,infile,&theToken);
+            if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+              goto LoopForCountParseError;
+           }
+         SavePPBuffer(theEnv," ");
+        }
+     }
+
+   if (CheckArgumentAgainstRestriction(theEnv,parse->argList->nextArg,INTEGER_BIT))
+     goto LoopForCountParseError;
+
+   /*====================================*/
+   /* Process the do keyword if present. */
+   /*====================================*/
+
+   GetToken(theEnv,infile,&theToken);
+   if ((theToken.tknType == SYMBOL_TOKEN) && (strcmp(theToken.lexemeValue->contents,"do") == 0))
+     {
+      read_first_paren = true;
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,theToken.printForm);
+      IncrementIndentDepth(theEnv,3);
+      PPCRAndIndent(theEnv);
+     }
+   else if (theToken.tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      read_first_paren = false;
+      PPBackup(theEnv);
+      IncrementIndentDepth(theEnv,3);
+      PPCRAndIndent(theEnv);
+      SavePPBuffer(theEnv,theToken.printForm);
+     }
+   else
+     goto LoopForCountParseError;
+
+   /*=====================================*/
+   /* Process the loop-for-count actions. */
+   /*=====================================*/
+   if (ExpressionData(theEnv)->svContexts->rtn == true)
+     ExpressionData(theEnv)->ReturnContext = true;
+   ExpressionData(theEnv)->BreakContext = true;
+   oldBindList = GetParsedBindNames(theEnv);
+   SetParsedBindNames(theEnv,NULL);
+   parse->argList->nextArg->nextArg =
+      GroupActions(theEnv,infile,&theToken,read_first_paren,NULL,false);
+
+   if (parse->argList->nextArg->nextArg == NULL)
+     {
+      SetParsedBindNames(theEnv,oldBindList);
+      ReturnExpression(theEnv,parse);
+      return NULL;
+     }
+   newBindList = GetParsedBindNames(theEnv);
+   prev = NULL;
+   while (newBindList != NULL)
+     {
+      if ((loopVar == NULL) ? false :
+          (strcmp(newBindList->name->contents,loopVar->contents) == 0))
+        {
+         ClearParsedBindNames(theEnv);
+         SetParsedBindNames(theEnv,oldBindList);
+         PrintErrorID(theEnv,"PRCDRPSR",1,true);
+         WriteString(theEnv,STDERR,"Cannot rebind loop variable in function loop-for-count.\n");
+         ReturnExpression(theEnv,parse);
+         return NULL;
+        }
+      prev = newBindList;
+      newBindList = newBindList->next;
+     }
+   if (prev == NULL)
+     SetParsedBindNames(theEnv,oldBindList);
+   else
+     prev->next = oldBindList;
+   if (loopVar != NULL)
+     ReplaceLoopCountVars(theEnv,loopVar,parse->argList->nextArg->nextArg,0);
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,theToken.printForm);
+
+   /*================================================================*/
+   /* Check for the closing right parenthesis of the loop-for-count. */
+   /*================================================================*/
+
+   if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"loop-for-count function");
+      ReturnExpression(theEnv,parse);
+      return NULL;
+     }
+
+   DecrementIndentDepth(theEnv,3);
+
+   return(parse);
+
+LoopForCountParseError:
+   SyntaxErrorMessage(theEnv,"loop-for-count function");
+   ReturnExpression(theEnv,parse);
+   return NULL;
+  }
+
+/*************************/
+/* ReplaceLoopCountVars: */
+/*************************/
+static void ReplaceLoopCountVars(
+  Environment *theEnv,
+  CLIPSLexeme *loopVar,
+  Expression *theExp,
+  int depth)
+  {
+   while (theExp != NULL)
+     {
+      if ((theExp->type != SF_VARIABLE) ? false :
+          (strcmp(theExp->lexemeValue->contents,loopVar->contents) == 0))
+        {
+         theExp->type = FCALL;
+         theExp->value = FindFunction(theEnv,"(get-loop-count)");
+         theExp->argList = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,depth));
+        }
+      else if (theExp->argList != NULL)
+        {
+         if ((theExp->type != FCALL) ? false :
+             (theExp->value == (void *) FindFunction(theEnv,"loop-for-count")))
+           ReplaceLoopCountVars(theEnv,loopVar,theExp->argList,depth+1);
+         else
+           ReplaceLoopCountVars(theEnv,loopVar,theExp->argList,depth);
+        }
+      theExp = theExp->nextArg;
+     }
+  }
+
+/*********************************************************/
+/* IfParse: purpose is to parse the if statement.  The  */
+/*   parse of the statement is the return value.         */
+/*   Syntax: (if <expression> then <action>+             */
+/*               [ else <action>+ ] )                    */
+/*********************************************************/
+static struct expr *IfParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *infile)
+  {
+   struct token theToken;
+
+   /*============================*/
+   /* Process the if expression. */
+   /*============================*/
+
+   SavePPBuffer(theEnv," ");
+
+   top->argList = ParseAtomOrExpression(theEnv,infile,NULL);
+
+   if (top->argList == NULL)
+     {
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   /*========================================*/
+   /* Keyword 'then' must follow expression. */
+   /*========================================*/
+
+   IncrementIndentDepth(theEnv,3);
+   PPCRAndIndent(theEnv);
+
+   GetToken(theEnv,infile,&theToken);
+   if ((theToken.tknType != SYMBOL_TOKEN) || (strcmp(theToken.lexemeValue->contents,"then") != 0))
+     {
+      SyntaxErrorMessage(theEnv,"if function");
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   /*==============================*/
+   /* Process the if then actions. */
+   /*==============================*/
+
+   PPCRAndIndent(theEnv);
+   if (ExpressionData(theEnv)->svContexts->rtn == true)
+     ExpressionData(theEnv)->ReturnContext = true;
+   if (ExpressionData(theEnv)->svContexts->brk == true)
+     ExpressionData(theEnv)->BreakContext = true;
+   top->argList->nextArg = GroupActions(theEnv,infile,&theToken,true,"else",false);
+
+   if (top->argList->nextArg == NULL)
+     {
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   top->argList->nextArg = RemoveUnneededProgn(theEnv,top->argList->nextArg);
+
+   /*===========================================*/
+   /* A ')' signals an if then without an else. */
+   /*===========================================*/
+
+   if (theToken.tknType == RIGHT_PARENTHESIS_TOKEN)
+     {
+      DecrementIndentDepth(theEnv,3);
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,theToken.printForm);
+      return(top);
+     }
+
+   /*=============================================*/
+   /* Keyword 'else' must follow if then actions. */
+   /*=============================================*/
+
+   if ((theToken.tknType != SYMBOL_TOKEN) || (strcmp(theToken.lexemeValue->contents,"else") != 0))
+     {
+      SyntaxErrorMessage(theEnv,"if function");
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   /*==============================*/
+   /* Process the if else actions. */
+   /*==============================*/
+
+   PPCRAndIndent(theEnv);
+   top->argList->nextArg->nextArg = GroupActions(theEnv,infile,&theToken,true,NULL,false);
+
+   if (top->argList->nextArg->nextArg == NULL)
+     {
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   top->argList->nextArg->nextArg = RemoveUnneededProgn(theEnv,top->argList->nextArg->nextArg);
+
+   /*======================================================*/
+   /* Check for the closing right parenthesis of the if. */
+   /*======================================================*/
+
+   if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"if function");
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   /*===========================================*/
+   /* A ')' signals an if then without an else. */
+   /*===========================================*/
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+   DecrementIndentDepth(theEnv,3);
+   return(top);
+  }
+
+/********************************************************/
+/* PrognParse: purpose is to parse the progn statement. */
+/*   The parse of the statement is the return value.    */
+/*   Syntax:  (progn <expression>*)                     */
+/********************************************************/
+static struct expr *PrognParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *infile)
+  {
+   struct token tkn;
+   struct expr *tmp;
+
+   ReturnExpression(theEnv,top);
+   ExpressionData(theEnv)->BreakContext = ExpressionData(theEnv)->svContexts->brk;
+   ExpressionData(theEnv)->ReturnContext = ExpressionData(theEnv)->svContexts->rtn;
+   IncrementIndentDepth(theEnv,3);
+   PPCRAndIndent(theEnv);
+   tmp = GroupActions(theEnv,infile,&tkn,true,NULL,false);
+   DecrementIndentDepth(theEnv,3);
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,tkn.printForm);
+   return(tmp);
+  }
+
+/***********************************************************/
+/* BindParse: purpose is to parse the bind statement. The */
+/*   parse of the statement is the return value.           */
+/*   Syntax:  (bind ?var <expression>)                     */
+/***********************************************************/
+static struct expr *BindParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *infile)
+  {
+   struct token theToken;
+   CLIPSLexeme *variableName;
+   struct expr *texp;
+   CONSTRAINT_RECORD *theConstraint = NULL;
+#if DEFGLOBAL_CONSTRUCT
+   Defglobal *theGlobal;
+   unsigned int count;
+#endif
+
+   SavePPBuffer(theEnv," ");
+
+   /*=============================================*/
+   /* Next token must be the name of the variable */
+   /* to be bound.                                */
+   /*=============================================*/
+
+   GetToken(theEnv,infile,&theToken);
+   if ((theToken.tknType != SF_VARIABLE_TOKEN) &&
+       (theToken.tknType != GBL_VARIABLE_TOKEN))
+     {
+      if ((theToken.tknType != MF_VARIABLE_TOKEN) || ExpressionData(theEnv)->SequenceOpMode)
+        {
+         SyntaxErrorMessage(theEnv,"bind function");
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+     }
+
+   /*==============================*/
+   /* Process the bind expression. */
+   /*==============================*/
+
+   top->argList = GenConstant(theEnv,SYMBOL_TYPE,theToken.value);
+   variableName = theToken.lexemeValue;
+
+#if DEFGLOBAL_CONSTRUCT
+   if ((theToken.tknType == GBL_VARIABLE_TOKEN) ?
+       ((theGlobal = (Defglobal *)
+                     FindImportedConstruct(theEnv,"defglobal",NULL,variableName->contents,
+                                           &count,true,NULL)) != NULL) :
+       false)
+     {
+      top->argList->type = DEFGLOBAL_PTR;
+      top->argList->value = theGlobal;
+     }
+   else if (theToken.tknType == GBL_VARIABLE_TOKEN)
+     {
+      GlobalReferenceErrorMessage(theEnv,variableName->contents);
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+#endif
+
+   texp = get_struct(theEnv,expr);
+   texp->argList = texp->nextArg = NULL;
+   if (CollectArguments(theEnv,texp,infile) == NULL)
+     {
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   top->argList->nextArg = texp->argList;
+   rtn_struct(theEnv,expr,texp);
+
+#if DEFGLOBAL_CONSTRUCT
+   if (top->argList->type == DEFGLOBAL_PTR) return(top);
+#endif
+
+   if (top->argList->nextArg != NULL)
+     { theConstraint = ExpressionToConstraintRecord(theEnv,top->argList->nextArg); }
+
+   AddBindName(theEnv,variableName,theConstraint);
+
+   return(top);
+  }
+
+/********************************************/
+/* ReturnParse: Parses the return function. */
+/********************************************/
+static struct expr *ReturnParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *infile)
+  {
+   bool error_flag = false;
+   struct token theToken;
+
+   if (ExpressionData(theEnv)->svContexts->rtn == true)
+     ExpressionData(theEnv)->ReturnContext = true;
+   if (ExpressionData(theEnv)->ReturnContext == false)
+     {
+      PrintErrorID(theEnv,"PRCDRPSR",2,true);
+      WriteString(theEnv,STDERR,"The return function is not valid in this context.\n");
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+   ExpressionData(theEnv)->ReturnContext = false;
+
+   SavePPBuffer(theEnv," ");
+
+   top->argList = ArgumentParse(theEnv,infile,&error_flag);
+   if (error_flag)
+     {
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+   else if (top->argList == NULL)
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+     }
+   else
+     {
+      SavePPBuffer(theEnv," ");
+      GetToken(theEnv,infile,&theToken);
+      if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"return function");
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+     }
+   return(top);
+  }
+
+/***************/
+/* BreakParse: */
+/***************/
+static struct expr *BreakParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *infile)
+  {
+   struct token theToken;
+
+   if (ExpressionData(theEnv)->svContexts->brk == false)
+     {
+      PrintErrorID(theEnv,"PRCDRPSR",2,true);
+      WriteString(theEnv,STDERR,"The break function not valid in this context.\n");
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,infile,&theToken);
+   if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"break function");
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+   return(top);
+  }
+
+/****************/
+/* SwitchParse: */
+/****************/
+static struct expr *SwitchParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *infile)
+  {
+   struct token theToken;
+   Expression *theExp,*chk;
+   int default_count = 0;
+
+   /*============================*/
+   /* Process the switch value   */
+   /*============================*/
+   IncrementIndentDepth(theEnv,3);
+   SavePPBuffer(theEnv," ");
+   top->argList = theExp = ParseAtomOrExpression(theEnv,infile,NULL);
+   if (theExp == NULL)
+     goto SwitchParseError;
+
+   /*========================*/
+   /* Parse case statements. */
+   /*========================*/
+   GetToken(theEnv,infile,&theToken);
+   while (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      PPCRAndIndent(theEnv);
+      SavePPBuffer(theEnv,theToken.printForm);
+      if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+        goto SwitchParseErrorAndMessage;
+      GetToken(theEnv,infile,&theToken);
+      SavePPBuffer(theEnv," ");
+      if ((theToken.tknType == SYMBOL_TOKEN) &&
+          (strcmp(theToken.lexemeValue->contents,"case") == 0))
+        {
+         if (default_count != 0)
+           goto SwitchParseErrorAndMessage;
+         theExp->nextArg = ParseAtomOrExpression(theEnv,infile,NULL);
+         SavePPBuffer(theEnv," ");
+         if (theExp->nextArg == NULL)
+           goto SwitchParseError;
+         for (chk = top->argList->nextArg ; chk != theExp->nextArg ; chk = chk->nextArg)
+           {
+            if ((chk->type == theExp->nextArg->type) &&
+                (chk->value == theExp->nextArg->value) &&
+                IdenticalExpression(chk->argList,theExp->nextArg->argList))
+              {
+               PrintErrorID(theEnv,"PRCDRPSR",3,true);
+               WriteString(theEnv,STDERR,"Duplicate case found in switch function.\n");
+               goto SwitchParseError;
+              }
+           }
+         GetToken(theEnv,infile,&theToken);
+         if ((theToken.tknType != SYMBOL_TOKEN) ? true :
+             (strcmp(theToken.lexemeValue->contents,"then") != 0))
+           goto SwitchParseErrorAndMessage;
+        }
+      else if ((theToken.tknType == SYMBOL_TOKEN) &&
+               (strcmp(theToken.lexemeValue->contents,"default") == 0))
+        {
+         if (default_count)
+           goto SwitchParseErrorAndMessage;
+         theExp->nextArg = GenConstant(theEnv,VOID_TYPE,NULL);
+         default_count = 1;
+        }
+      else
+        goto SwitchParseErrorAndMessage;
+      theExp = theExp->nextArg;
+      if (ExpressionData(theEnv)->svContexts->rtn == true)
+        ExpressionData(theEnv)->ReturnContext = true;
+      if (ExpressionData(theEnv)->svContexts->brk == true)
+        ExpressionData(theEnv)->BreakContext = true;
+      IncrementIndentDepth(theEnv,3);
+      PPCRAndIndent(theEnv);
+      theExp->nextArg = GroupActions(theEnv,infile,&theToken,true,NULL,false);
+      DecrementIndentDepth(theEnv,3);
+      ExpressionData(theEnv)->ReturnContext = false;
+      ExpressionData(theEnv)->BreakContext = false;
+      if (theExp->nextArg == NULL)
+        goto SwitchParseError;
+      theExp = theExp->nextArg;
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,theToken.printForm);
+      GetToken(theEnv,infile,&theToken);
+     }
+   DecrementIndentDepth(theEnv,3);
+   return(top);
+
+SwitchParseErrorAndMessage:
+   SyntaxErrorMessage(theEnv,"switch function");
+SwitchParseError:
+   ReturnExpression(theEnv,top);
+   DecrementIndentDepth(theEnv,3);
+   return NULL;
+  }
+
+/**************************/
+/* SearchParsedBindNames: */
+/**************************/
+unsigned short SearchParsedBindNames(
+  Environment *theEnv,
+  CLIPSLexeme *name_sought)
+  {
+   struct BindInfo *var_ptr;
+   unsigned short theIndex = 1;
+
+   var_ptr = ProcedureParserData(theEnv)->ListOfParsedBindNames;
+   while (var_ptr != NULL)
+     {
+      if (var_ptr->name == name_sought)
+        { return theIndex; }
+      var_ptr = var_ptr->next;
+      theIndex++;
+     }
+
+   return 0;
+  }
+
+/************************/
+/* FindBindConstraints: */
+/************************/
+struct constraintRecord *FindBindConstraints(
+  Environment *theEnv,
+  CLIPSLexeme *nameSought)
+  {
+   struct BindInfo *theVariable;
+
+   theVariable = ProcedureParserData(theEnv)->ListOfParsedBindNames;
+   while (theVariable != NULL)
+     {
+      if (theVariable->name == nameSought)
+        { return(theVariable->constraints); }
+      theVariable = theVariable->next;
+     }
+
+   return NULL;
+  }
+
+/********************************************************/
+/* CountParsedBindNames: Counts the number of variables */
+/*   names that have been bound using the bind function */
+/*   in the current context (e.g. the RHS of a rule).   */
+/********************************************************/
+unsigned short CountParsedBindNames(
+  Environment *theEnv)
+  {
+   struct BindInfo *theVariable;
+   unsigned short theIndex = 0;
+
+   theVariable = ProcedureParserData(theEnv)->ListOfParsedBindNames;
+   while (theVariable != NULL)
+     {
+      theVariable = theVariable->next;
+      theIndex++;
+     }
+
+   return theIndex;
+  }
+
+/****************************************************************/
+/* AddBindName: Adds a variable name used as the first argument */
+/*   of the bind function to the list of variable names parsed  */
+/*   within the current semantic context (e.g. RHS of a rule).  */
+/****************************************************************/
+static int AddBindName(
+  Environment *theEnv,
+  CLIPSLexeme *variableName,
+  CONSTRAINT_RECORD *theConstraint)
+  {
+   CONSTRAINT_RECORD *tmpConstraint;
+   struct BindInfo *currentBind, *lastBind;
+   int theIndex = 1;
+
+   /*=========================================================*/
+   /* Look for the variable name in the list of bind variable */
+   /* names already parsed. If it is found, then return the   */
+   /* index to the variable and union the new constraint      */
+   /* information with the old constraint information.        */
+   /*=========================================================*/
+
+   lastBind = NULL;
+   currentBind = ProcedureParserData(theEnv)->ListOfParsedBindNames;
+   while (currentBind != NULL)
+     {
+      if (currentBind->name == variableName)
+        {
+         if (theConstraint != NULL)
+           {
+            tmpConstraint = currentBind->constraints;
+            currentBind->constraints = UnionConstraints(theEnv,theConstraint,currentBind->constraints);
+            RemoveConstraint(theEnv,tmpConstraint);
+            RemoveConstraint(theEnv,theConstraint);
+           }
+
+         return(theIndex);
+        }
+      lastBind = currentBind;
+      currentBind = currentBind->next;
+      theIndex++;
+     }
+
+   /*===============================================================*/
+   /* If the variable name wasn't found, then add it to the list of */
+   /* variable names and store the constraint information with it.  */
+   /*===============================================================*/
+
+   currentBind = get_struct(theEnv,BindInfo);
+   currentBind->name = variableName;
+   currentBind->constraints = theConstraint;
+   currentBind->next = NULL;
+
+   if (lastBind == NULL) ProcedureParserData(theEnv)->ListOfParsedBindNames = currentBind;
+   else lastBind->next = currentBind;
+
+   return(theIndex);
+  }
+
+/*************************/
+/* RemoveParsedBindName: */
+/*************************/
+void RemoveParsedBindName(
+  Environment *theEnv,
+  CLIPSLexeme *bname)
+  {
+   struct BindInfo *prv,*tmp;
+
+   prv = NULL;
+   tmp = ProcedureParserData(theEnv)->ListOfParsedBindNames;
+   while ((tmp != NULL) ? (tmp->name != bname) : false)
+     {
+      prv = tmp;
+      tmp = tmp->next;
+     }
+   if (tmp != NULL)
+     {
+      if (prv == NULL)
+        ProcedureParserData(theEnv)->ListOfParsedBindNames = tmp->next;
+      else
+        prv->next = tmp->next;
+
+      RemoveConstraint(theEnv,tmp->constraints);
+      rtn_struct(theEnv,BindInfo,tmp);
+     }
+  }
diff --git a/clips/prcdrpsr.h b/clips/prcdrpsr.h
new file mode 100755
index 000000000..6ed9406ad
--- /dev/null
+++ b/clips/prcdrpsr.h
@@ -0,0 +1,79 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/18/16            */
+   /*                                                     */
+   /*       PROCEDURAL FUNCTIONS PARSER HEADER FILE       */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable exp to theExp         */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Local variables set with the bind function     */
+/*            persist until a reset/clear command is issued. */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_prcdrpsr
+
+#pragma once
+
+#define _H_prcdrpsr
+
+#include "constrnt.h"
+
+struct BindInfo
+  {
+   CLIPSLexeme *name;
+   CONSTRAINT_RECORD *constraints;
+   struct BindInfo *next;
+  };
+
+   void                           ProceduralFunctionParsers(Environment *);
+   struct BindInfo               *GetParsedBindNames(Environment *);
+   void                           SetParsedBindNames(Environment *,struct BindInfo *);
+   void                           ClearParsedBindNames(Environment *);
+   bool                           ParsedBindNamesEmpty(Environment *);
+   unsigned short                 SearchParsedBindNames(Environment *,CLIPSLexeme *);
+   unsigned short                 CountParsedBindNames(Environment *);
+   void                           RemoveParsedBindName(Environment *,CLIPSLexeme *);
+   struct constraintRecord       *FindBindConstraints(Environment *,CLIPSLexeme *);
+
+#endif /* _H_prcdrpsr */
+
+
+
+
diff --git a/clips/prdctfun.c b/clips/prdctfun.c
new file mode 100755
index 000000000..4b4d6cf1f
--- /dev/null
+++ b/clips/prdctfun.c
@@ -0,0 +1,869 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/19/18             */
+   /*                                                     */
+   /*              PREDICATE FUNCTIONS MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for several predicate          */
+/*   functions including not, and, or, eq, neq, <=, >=, <,   */
+/*   >, =, <>, symbolp, stringp, lexemep, numberp, integerp, */
+/*   floatp, oddp, evenp, multifieldp, sequencep, and        */
+/*   pointerp.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed the wordp and sequencep functions.     */
+/*                                                           */
+/*            Deprecated the pointerp function and added     */
+/*            the external-addressp function.                */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "multifld.h"
+#include "router.h"
+
+#include "prdctfun.h"
+
+/**************************************************/
+/* PredicateFunctionDefinitions: Defines standard */
+/*   math and predicate functions.                */
+/**************************************************/
+void PredicateFunctionDefinitions(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"not","b",1,1,NULL,NotFunction,"NotFunction",NULL);
+   AddUDF(theEnv,"and","b",2,UNBOUNDED ,NULL,AndFunction,"AndFunction",NULL);
+   AddUDF(theEnv,"or","b",2,UNBOUNDED ,NULL,OrFunction,"OrFunction",NULL);
+
+   AddUDF(theEnv,"eq","b",2,UNBOUNDED,NULL,EqFunction,"EqFunction",NULL);
+   AddUDF(theEnv,"neq","b",2,UNBOUNDED,NULL,NeqFunction,"NeqFunction",NULL);
+
+   AddUDF(theEnv,"<=","b",2,UNBOUNDED ,"ld",LessThanOrEqualFunction,"LessThanOrEqualFunction",NULL);
+   AddUDF(theEnv,">=","b",2,UNBOUNDED ,"ld",GreaterThanOrEqualFunction,"GreaterThanOrEqualFunction",NULL);
+   AddUDF(theEnv,"<","b",2,UNBOUNDED ,"ld",LessThanFunction,"LessThanFunction",NULL);
+   AddUDF(theEnv,">","b",2,UNBOUNDED ,"ld",GreaterThanFunction,"GreaterThanFunction",NULL);
+   AddUDF(theEnv,"=","b",2,UNBOUNDED ,"ld",NumericEqualFunction,"NumericEqualFunction",NULL);
+   AddUDF(theEnv,"<>","b",2,UNBOUNDED ,"ld",NumericNotEqualFunction,"NumericNotEqualFunction",NULL);
+   AddUDF(theEnv,"!=","b",2,UNBOUNDED ,"ld",NumericNotEqualFunction,"NumericNotEqualFunction",NULL);
+
+   AddUDF(theEnv,"symbolp","b",1,1,NULL,SymbolpFunction,"SymbolpFunction",NULL);
+   AddUDF(theEnv,"stringp","b",1,1,NULL,StringpFunction,"StringpFunction",NULL);
+   AddUDF(theEnv,"lexemep","b",1,1,NULL,LexemepFunction,"LexemepFunction",NULL);
+   AddUDF(theEnv,"numberp","b",1,1,NULL,NumberpFunction,"NumberpFunction",NULL);
+   AddUDF(theEnv,"integerp","b",1,1,NULL,IntegerpFunction,"IntegerpFunction",NULL);
+   AddUDF(theEnv,"floatp","b",1,1,NULL,FloatpFunction,"FloatpFunction",NULL);
+   AddUDF(theEnv,"oddp","b",1,1,"l",OddpFunction,"OddpFunction",NULL);
+   AddUDF(theEnv,"evenp","b",1,1,"l",EvenpFunction,"EvenpFunction",NULL);
+   AddUDF(theEnv,"multifieldp","b",1,1,NULL,MultifieldpFunction,"MultifieldpFunction",NULL);
+   AddUDF(theEnv,"pointerp","b",1,1,NULL,ExternalAddresspFunction,"ExternalAddresspFunction",NULL);
+   AddUDF(theEnv,"external-addressp","b",1,1,NULL,ExternalAddresspFunction,"ExternalAddresspFunction",NULL);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+/************************************/
+/* EqFunction: H/L access routine   */
+/*   for the eq function.           */
+/************************************/
+void EqFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item, nextItem;
+   unsigned int numArgs, i;
+   struct expr *theExpression;
+
+   /*====================================*/
+   /* Determine the number of arguments. */
+   /*====================================*/
+
+   numArgs = UDFArgumentCount(context);
+   if (numArgs == 0)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*==============================================*/
+   /* Get the value of the first argument against  */
+   /* which subsequent arguments will be compared. */
+   /*==============================================*/
+
+   theExpression = GetFirstArgument();
+   EvaluateExpression(theEnv,theExpression,&item);
+
+   /*=====================================*/
+   /* Compare all arguments to the first. */
+   /* If any are the same, return FALSE.  */
+   /*=====================================*/
+
+   theExpression = GetNextArgument(theExpression);
+   for (i = 2 ; i <= numArgs ; i++)
+     {
+      EvaluateExpression(theEnv,theExpression,&nextItem);
+
+      if (nextItem.header->type != item.header->type)
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+
+      if (nextItem.header->type == MULTIFIELD_TYPE)
+        {
+         if (MultifieldDOsEqual(&nextItem,&item) == false)
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+      else if (nextItem.value != item.value)
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+
+      theExpression = GetNextArgument(theExpression);
+     }
+
+   /*=====================================*/
+   /* All of the arguments were different */
+   /* from the first. Return TRUE.        */
+   /*=====================================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/*************************************/
+/* NeqFunction: H/L access routine   */
+/*   for the neq function.           */
+/*************************************/
+void NeqFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item, nextItem;
+   unsigned int numArgs, i;
+   struct expr *theExpression;
+
+   /*====================================*/
+   /* Determine the number of arguments. */
+   /*====================================*/
+
+   numArgs = UDFArgumentCount(context);
+   if (numArgs == 0)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*==============================================*/
+   /* Get the value of the first argument against  */
+   /* which subsequent arguments will be compared. */
+   /*==============================================*/
+
+   theExpression = GetFirstArgument();
+   EvaluateExpression(theEnv,theExpression,&item);
+
+   /*=====================================*/
+   /* Compare all arguments to the first. */
+   /* If any are different, return FALSE. */
+   /*=====================================*/
+
+   for (i = 2, theExpression = GetNextArgument(theExpression);
+        i <= numArgs;
+        i++, theExpression = GetNextArgument(theExpression))
+     {
+      EvaluateExpression(theEnv,theExpression,&nextItem);
+      if (nextItem.header->type != item.header->type)
+        { continue; }
+      else if (nextItem.header->type == MULTIFIELD_TYPE)
+        {
+         if (MultifieldDOsEqual(&nextItem,&item) == true)
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+      else if (nextItem.value == item.value)
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+
+   /*=====================================*/
+   /* All of the arguments were identical */
+   /* to the first. Return TRUE.          */
+   /*=====================================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/*****************************************/
+/* StringpFunction: H/L access routine   */
+/*   for the stringp function.           */
+/*****************************************/
+void StringpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&item))
+     { return; }
+
+   if (CVIsType(&item,STRING_BIT))
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/*****************************************/
+/* SymbolpFunction: H/L access routine   */
+/*   for the symbolp function.           */
+/*****************************************/
+void SymbolpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&item))
+     { return; }
+
+   if (CVIsType(&item,SYMBOL_BIT))
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/*****************************************/
+/* LexemepFunction: H/L access routine   */
+/*   for the lexemep function.           */
+/*****************************************/
+void LexemepFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&item))
+     { return; }
+
+   if (CVIsType(&item,LEXEME_BITS))
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/*****************************************/
+/* NumberpFunction: H/L access routine   */
+/*   for the numberp function.           */
+/*****************************************/
+void NumberpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&item))
+     { return; }
+
+   if (CVIsType(&item,NUMBER_BITS))
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/****************************************/
+/* FloatpFunction: H/L access routine   */
+/*   for the floatp function.           */
+/****************************************/
+void FloatpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&item))
+     { return; }
+
+   if (CVIsType(&item,FLOAT_BIT))
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/******************************************/
+/* IntegerpFunction: H/L access routine   */
+/*   for the integerp function.           */
+/******************************************/
+void IntegerpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&item))
+     { return; }
+
+   if (CVIsType(&item,INTEGER_BIT))
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/*********************************************/
+/* MultifieldpFunction: H/L access routine   */
+/*   for the multifieldp function.           */
+/*********************************************/
+void MultifieldpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&item))
+     { return; }
+
+   if (CVIsType(&item,MULTIFIELD_BIT))
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/************************************************/
+/* ExternalAddresspFunction: H/L access routine */
+/*   for the external-addressp function.        */
+/************************************************/
+void ExternalAddresspFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&item))
+     { return; }
+
+   if (CVIsType(&item,EXTERNAL_ADDRESS_BIT))
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/***********************************/
+/* NotFunction: H/L access routine */
+/*   for the not function.         */
+/***********************************/
+void NotFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+
+   if (theArg.value == FalseSymbol(theEnv))
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/*************************************/
+/* AndFunction: H/L access routine   */
+/*   for the and function.           */
+/*************************************/
+void AndFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,ANY_TYPE_BITS,&theArg))
+        { return; }
+
+      if (theArg.value == FalseSymbol(theEnv))
+        {
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/************************************/
+/* OrFunction: H/L access routine   */
+/*   for the or function.           */
+/************************************/
+void OrFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,ANY_TYPE_BITS,&theArg))
+        { return; }
+
+      if (theArg.value != FalseSymbol(theEnv))
+        {
+         returnValue->lexemeValue = TrueSymbol(theEnv);
+         return;
+        }
+     }
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+  }
+
+/*****************************************/
+/* LessThanOrEqualFunction: H/L access   */
+/*   routine for the <= function.        */
+/*****************************************/
+void LessThanOrEqualFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue rv1, rv2;
+
+   /*=========================*/
+   /* Get the first argument. */
+   /*=========================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&rv1))
+     { return; }
+
+   /*====================================================*/
+   /* Compare each of the subsequent arguments to its    */
+   /* predecessor. If any is greater, then return FALSE. */
+   /*====================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&rv2))
+        { return; }
+
+      if (CVIsType(&rv1,INTEGER_BIT) && CVIsType(&rv2,INTEGER_BIT))
+        {
+         if (rv1.integerValue->contents > rv2.integerValue->contents)
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+      else
+        {
+         if (CVCoerceToFloat(&rv1) > CVCoerceToFloat(&rv2))
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+
+      rv1.value = rv2.value;
+     }
+
+   /*======================================*/
+   /* Each argument was less than or equal */
+   /* to its predecessor. Return TRUE.     */
+   /*======================================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/********************************************/
+/* GreaterThanOrEqualFunction: H/L access   */
+/*   routine for the >= function.           */
+/********************************************/
+void GreaterThanOrEqualFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue rv1, rv2;
+
+   /*=========================*/
+   /* Get the first argument. */
+   /*=========================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&rv1))
+     { return; }
+
+   /*===================================================*/
+   /* Compare each of the subsequent arguments to its   */
+   /* predecessor. If any is lesser, then return false. */
+   /*===================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&rv2))
+        { return; }
+
+      if (CVIsType(&rv1,INTEGER_BIT) && CVIsType(&rv2,INTEGER_BIT))
+        {
+         if (rv1.integerValue->contents < rv2.integerValue->contents)
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+      else
+        {
+         if (CVCoerceToFloat(&rv1) < CVCoerceToFloat(&rv2))
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+
+      rv1.value = rv2.value;
+     }
+
+   /*=========================================*/
+   /* Each argument was greater than or equal */
+   /* to its predecessor. Return TRUE.        */
+   /*=========================================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/**********************************/
+/* LessThanFunction: H/L access   */
+/*   routine for the < function.  */
+/**********************************/
+void LessThanFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue rv1, rv2;
+
+   /*=========================*/
+   /* Get the first argument. */
+   /*=========================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&rv1))
+     { return; }
+
+   /*==========================================*/
+   /* Compare each of the subsequent arguments */
+   /* to its predecessor. If any is greater or */
+   /* equal, then return FALSE.                */
+   /*==========================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&rv2))
+        { return; }
+
+      if (CVIsType(&rv1,INTEGER_BIT) && CVIsType(&rv2,INTEGER_BIT))
+        {
+         if (rv1.integerValue->contents >= rv2.integerValue->contents)
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+      else
+        {
+         if (CVCoerceToFloat(&rv1) >= CVCoerceToFloat(&rv2))
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+
+      rv1.value = rv2.value;
+     }
+
+   /*=================================*/
+   /* Each argument was less than its */
+   /* predecessor. Return TRUE.       */
+   /*=================================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/*************************************/
+/* GreaterThanFunction: H/L access   */
+/*   routine for the > function.     */
+/*************************************/
+void GreaterThanFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue rv1, rv2;
+
+   /*=========================*/
+   /* Get the first argument. */
+   /*=========================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&rv1))
+     { return; }
+
+   /*==========================================*/
+   /* Compare each of the subsequent arguments */
+   /* to its predecessor. If any is lesser or  */
+   /* equal, then return FALSE.                */
+   /*==========================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&rv2))
+        { return; }
+
+      if (CVIsType(&rv1,INTEGER_BIT) && CVIsType(&rv2,INTEGER_BIT))
+        {
+         if (rv1.integerValue->contents <= rv2.integerValue->contents)
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+      else
+        {
+         if (CVCoerceToFloat(&rv1) <= CVCoerceToFloat(&rv2))
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+
+      rv1.value = rv2.value;
+     }
+
+   /*================================*/
+   /* Each argument was greater than */
+   /* its predecessor. Return TRUE.  */
+   /*================================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/**************************************/
+/* NumericEqualFunction: H/L access   */
+/*   routine for the = function.      */
+/**************************************/
+void NumericEqualFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue rv1, rv2;
+
+   /*=========================*/
+   /* Get the first argument. */
+   /*=========================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&rv1))
+     { return; }
+
+   /*=================================================*/
+   /* Compare each of the subsequent arguments to the */
+   /* first. If any is unequal, then return FALSE.    */
+   /*=================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&rv2))
+        { return; }
+
+      if (CVIsType(&rv1,INTEGER_BIT) && CVIsType(&rv2,INTEGER_BIT))
+        {
+         if (rv1.integerValue->contents != rv2.integerValue->contents)
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+      else
+        {
+         if (CVCoerceToFloat(&rv1) != CVCoerceToFloat(&rv2))
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+     }
+
+   /*=================================*/
+   /* All arguments were equal to the */
+   /* first argument. Return TRUE.    */
+   /*=================================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/*****************************************/
+/* NumericNotEqualFunction: H/L access   */
+/*   routine for the <> function.        */
+/*****************************************/
+void NumericNotEqualFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue rv1, rv2;
+
+   /*=========================*/
+   /* Get the first argument. */
+   /*=========================*/
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&rv1))
+     { return; }
+
+   /*=================================================*/
+   /* Compare each of the subsequent arguments to the */
+   /* first. If any is equal, then return FALSE.      */
+   /*=================================================*/
+
+   while (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,NUMBER_BITS,&rv2))
+        { return; }
+
+      if (CVIsType(&rv1,INTEGER_BIT) && CVIsType(&rv2,INTEGER_BIT))
+        {
+         if (rv1.integerValue->contents == rv2.integerValue->contents)
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+      else
+        {
+         if (CVCoerceToFloat(&rv1) == CVCoerceToFloat(&rv2))
+           {
+            returnValue->lexemeValue = FalseSymbol(theEnv);
+            return;
+           }
+        }
+     }
+
+   /*===================================*/
+   /* All arguments were unequal to the */
+   /* first argument. Return TRUE.      */
+   /*===================================*/
+
+   returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/**************************************/
+/* OddpFunction: H/L access routine   */
+/*   for the oddp function.           */
+/**************************************/
+void OddpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+   long long num, halfnum;
+
+   /*===========================================*/
+   /* Check for the correct types of arguments. */
+   /*===========================================*/
+
+   if (! UDFFirstArgument(context,INTEGER_BIT,&item))
+     { return; }
+
+   /*===========================*/
+   /* Compute the return value. */
+   /*===========================*/
+
+   num = item.integerValue->contents;
+   halfnum = (num / 2) * 2;
+
+   if (num == halfnum) returnValue->lexemeValue = FalseSymbol(theEnv);
+   else returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+/***************************************/
+/* EvenpFunction: H/L access routine   */
+/*   for the evenp function.           */
+/***************************************/
+void EvenpFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue item;
+   long long num, halfnum;
+
+   /*===========================================*/
+   /* Check for the correct types of arguments. */
+   /*===========================================*/
+
+   if (! UDFFirstArgument(context,INTEGER_BIT,&item))
+     { return; }
+
+   /*===========================*/
+   /* Compute the return value. */
+   /*===========================*/
+
+   num = item.integerValue->contents;;
+   halfnum = (num / 2) * 2;
+
+   if (num != halfnum) returnValue->lexemeValue = FalseSymbol(theEnv);
+   else returnValue->lexemeValue = TrueSymbol(theEnv);
+  }
+
+
+
diff --git a/clips/prdctfun.h b/clips/prdctfun.h
new file mode 100755
index 000000000..7032339d4
--- /dev/null
+++ b/clips/prdctfun.h
@@ -0,0 +1,77 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/08/18            */
+   /*                                                     */
+   /*            PREDICATE FUNCTIONS HEADER FILE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Deprecated the pointerp function and added     */
+/*            the external-addressp function.                */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_prdctfun
+
+#pragma once
+
+#define _H_prdctfun
+
+   void                           PredicateFunctionDefinitions(Environment *);
+   void                           EqFunction(Environment *,UDFContext *,UDFValue *);
+   void                           NeqFunction(Environment *,UDFContext *,UDFValue *);
+   void                           StringpFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SymbolpFunction(Environment *,UDFContext *,UDFValue *);
+   void                           LexemepFunction(Environment *,UDFContext *,UDFValue *);
+   void                           NumberpFunction(Environment *,UDFContext *,UDFValue *);
+   void                           FloatpFunction(Environment *,UDFContext *,UDFValue *);
+   void                           IntegerpFunction(Environment *,UDFContext *,UDFValue *);
+   void                           MultifieldpFunction(Environment *,UDFContext *,UDFValue *);
+   void                           ExternalAddresspFunction(Environment *,UDFContext *,UDFValue *);
+   void                           NotFunction(Environment *,UDFContext *,UDFValue *);
+   void                           AndFunction(Environment *,UDFContext *,UDFValue *);
+   void                           OrFunction(Environment *,UDFContext *,UDFValue *);
+   void                           LessThanOrEqualFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GreaterThanOrEqualFunction(Environment *,UDFContext *,UDFValue *);
+   void                           LessThanFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GreaterThanFunction(Environment *,UDFContext *,UDFValue *);
+   void                           NumericEqualFunction(Environment *,UDFContext *,UDFValue *);
+   void                           NumericNotEqualFunction(Environment *,UDFContext *,UDFValue *);
+   void                           OddpFunction(Environment *,UDFContext *,UDFValue *);
+   void                           EvenpFunction(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_prdctfun */
+
+
+
diff --git a/clips/prntutil.c b/clips/prntutil.c
new file mode 100755
index 000000000..ca8ce3141
--- /dev/null
+++ b/clips/prntutil.c
@@ -0,0 +1,875 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  01/29/18             */
+   /*                                                     */
+   /*                PRINT UTILITY MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Utility routines for printing various items      */
+/*   and messages.                                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Link error occurs for the SlotExistError       */
+/*            function when OBJECT_SYSTEM is set to 0 in     */
+/*            setup.h. DR0865                                */
+/*                                                           */
+/*            Added DataObjectToString function.             */
+/*                                                           */
+/*            Added SlotExistError function.                 */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Support for DATA_OBJECT_ARRAY primitive.       */
+/*                                                           */
+/*            Support for typed EXTERNAL_ADDRESS_TYPE.       */
+/*                                                           */
+/*            Used gensprintf and genstrcat instead of       */
+/*            sprintf and strcat.                            */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added code for capturing errors/warnings.      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*      6.31: Added additional error messages for retracted  */
+/*            facts, deleted instances, and invalid slots.   */
+/*                                                           */
+/*            Added under/overflow error message.            */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed DATA_OBJECT_ARRAY primitive type.      */
+/*                                                           */
+/*            File name/line count displayed for errors      */
+/*            and warnings during load command.              */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "constant.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "factmngr.h"
+#include "inscom.h"
+#include "insmngr.h"
+#include "memalloc.h"
+#include "multifun.h"
+#include "router.h"
+#include "scanner.h"
+#include "strngrtr.h"
+#include "symbol.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "prntutil.h"
+
+/*****************************************************/
+/* InitializePrintUtilityData: Allocates environment */
+/*    data for print utility routines.               */
+/*****************************************************/
+void InitializePrintUtilityData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,PRINT_UTILITY_DATA,sizeof(struct printUtilityData),NULL);
+  }
+
+/************************************************************/
+/* WriteFloat: Controls printout of floating point numbers. */
+/************************************************************/
+void WriteFloat(
+  Environment *theEnv,
+  const char *fileid,
+  double number)
+  {
+   const char *theString;
+
+   theString = FloatToString(theEnv,number);
+   WriteString(theEnv,fileid,theString);
+  }
+
+/************************************************/
+/* WriteInteger: Controls printout of integers. */
+/************************************************/
+void WriteInteger(
+  Environment *theEnv,
+  const char *logicalName,
+  long long number)
+  {
+   char printBuffer[32];
+
+   gensprintf(printBuffer,"%lld",number);
+   WriteString(theEnv,logicalName,printBuffer);
+  }
+
+/*******************************************/
+/* PrintUnsignedInteger: Controls printout */
+/*   of unsigned integers.                 */
+/*******************************************/
+void PrintUnsignedInteger(
+  Environment *theEnv,
+  const char *logicalName,
+  unsigned long long number)
+  {
+   char printBuffer[32];
+
+   gensprintf(printBuffer,"%llu",number);
+   WriteString(theEnv,logicalName,printBuffer);
+  }
+
+/**************************************/
+/* PrintAtom: Prints an atomic value. */
+/**************************************/
+void PrintAtom(
+  Environment *theEnv,
+  const char *logicalName,
+  unsigned short type,
+  void *value)
+  {
+   CLIPSExternalAddress *theAddress;
+   char buffer[20];
+
+   switch (type)
+     {
+      case FLOAT_TYPE:
+        WriteFloat(theEnv,logicalName,((CLIPSFloat *) value)->contents);
+        break;
+      case INTEGER_TYPE:
+        WriteInteger(theEnv,logicalName,((CLIPSInteger *) value)->contents);
+        break;
+      case SYMBOL_TYPE:
+        WriteString(theEnv,logicalName,((CLIPSLexeme *) value)->contents);
+        break;
+      case STRING_TYPE:
+        if (PrintUtilityData(theEnv)->PreserveEscapedCharacters)
+          { WriteString(theEnv,logicalName,StringPrintForm(theEnv,((CLIPSLexeme *) value)->contents)); }
+        else
+          {
+           WriteString(theEnv,logicalName,"\"");
+           WriteString(theEnv,logicalName,((CLIPSLexeme *) value)->contents);
+           WriteString(theEnv,logicalName,"\"");
+          }
+        break;
+
+      case EXTERNAL_ADDRESS_TYPE:
+        theAddress = (CLIPSExternalAddress *) value;
+
+        if (PrintUtilityData(theEnv)->AddressesToStrings) WriteString(theEnv,logicalName,"\"");
+
+        if ((EvaluationData(theEnv)->ExternalAddressTypes[theAddress->type] != NULL) &&
+            (EvaluationData(theEnv)->ExternalAddressTypes[theAddress->type]->longPrintFunction != NULL))
+          { (*EvaluationData(theEnv)->ExternalAddressTypes[theAddress->type]->longPrintFunction)(theEnv,logicalName,value); }
+        else
+          {
+           WriteString(theEnv,logicalName,"<Pointer-");
+
+           gensprintf(buffer,"%d-",theAddress->type);
+           WriteString(theEnv,logicalName,buffer);
+
+           gensprintf(buffer,"%p",((CLIPSExternalAddress *) value)->contents);
+           WriteString(theEnv,logicalName,buffer);
+           WriteString(theEnv,logicalName,">");
+          }
+
+        if (PrintUtilityData(theEnv)->AddressesToStrings) WriteString(theEnv,logicalName,"\"");
+        break;
+
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+        WriteString(theEnv,logicalName,"[");
+        WriteString(theEnv,logicalName,((CLIPSLexeme *) value)->contents);
+        WriteString(theEnv,logicalName,"]");
+        break;
+#endif
+
+      case VOID_TYPE:
+        break;
+
+      default:
+        if (EvaluationData(theEnv)->PrimitivesArray[type] == NULL) break;
+        if (EvaluationData(theEnv)->PrimitivesArray[type]->longPrintFunction == NULL)
+          {
+           WriteString(theEnv,logicalName,"<unknown atom type>");
+           break;
+          }
+        (*EvaluationData(theEnv)->PrimitivesArray[type]->longPrintFunction)(theEnv,logicalName,value);
+        break;
+     }
+  }
+
+/**********************************************************/
+/* PrintTally: Prints a tally count indicating the number */
+/*   of items that have been displayed. Used by functions */
+/*   such as list-defrules.                               */
+/**********************************************************/
+void PrintTally(
+  Environment *theEnv,
+  const char *logicalName,
+  unsigned long long count,
+  const char *singular,
+  const char *plural)
+  {
+   if (count == 0) return;
+
+   WriteString(theEnv,logicalName,"For a total of ");
+   PrintUnsignedInteger(theEnv,logicalName,count);
+   WriteString(theEnv,logicalName," ");
+
+   if (count == 1) WriteString(theEnv,logicalName,singular);
+   else WriteString(theEnv,logicalName,plural);
+
+   WriteString(theEnv,logicalName,".\n");
+  }
+
+/********************************************/
+/* PrintErrorID: Prints the module name and */
+/*   error ID for an error message.         */
+/********************************************/
+void PrintErrorID(
+  Environment *theEnv,
+  const char *module,
+  int errorID,
+  bool printCR)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   FlushParsingMessages(theEnv);
+   SetErrorFileName(theEnv,GetParsingFileName(theEnv));
+   ConstructData(theEnv)->ErrLineNumber = GetLineCount(theEnv);
+#endif
+   if (printCR) WriteString(theEnv,STDERR,"\n");
+   WriteString(theEnv,STDERR,"[");
+   WriteString(theEnv,STDERR,module);
+   WriteInteger(theEnv,STDERR,errorID);
+   WriteString(theEnv,STDERR,"] ");
+
+   /*==================================================*/
+   /* Print the file name and line number if available */
+   /* and there is no callback for errors/warnings.    */
+   /*==================================================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   if ((ConstructData(theEnv)->ParserErrorCallback == NULL) &&
+       (GetLoadInProgress(theEnv) == true))
+     {
+      const char *fileName;
+
+      fileName = GetParsingFileName(theEnv);
+      if (fileName != NULL)
+        {
+         WriteString(theEnv,STDERR,fileName);
+         WriteString(theEnv,STDERR,", Line ");
+         WriteInteger(theEnv,STDERR,GetLineCount(theEnv));
+         WriteString(theEnv,STDERR,": ");
+        }
+     }
+#endif
+  }
+
+/**********************************************/
+/* PrintWarningID: Prints the module name and */
+/*   warning ID for a warning message.        */
+/**********************************************/
+void PrintWarningID(
+  Environment *theEnv,
+  const char *module,
+  int warningID,
+  bool printCR)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   FlushParsingMessages(theEnv);
+   SetWarningFileName(theEnv,GetParsingFileName(theEnv));
+   ConstructData(theEnv)->WrnLineNumber = GetLineCount(theEnv);
+#endif
+   if (printCR) WriteString(theEnv,STDWRN,"\n");
+   WriteString(theEnv,STDWRN,"[");
+   WriteString(theEnv,STDWRN,module);
+   WriteInteger(theEnv,STDWRN,warningID);
+   WriteString(theEnv,STDWRN,"] ");
+
+   /*==================================================*/
+   /* Print the file name and line number if available */
+   /* and there is no callback for errors/warnings.    */
+   /*==================================================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   if ((ConstructData(theEnv)->ParserErrorCallback == NULL) &&
+       (GetLoadInProgress(theEnv) == true))
+     {
+      const char *fileName;
+
+      fileName = GetParsingFileName(theEnv);
+      if (fileName != NULL)
+        {
+         WriteString(theEnv,STDERR,fileName);
+         WriteString(theEnv,STDERR,", Line ");
+         WriteInteger(theEnv,STDERR,GetLineCount(theEnv));
+         WriteString(theEnv,STDERR,", ");
+        }
+     }
+#endif
+
+   WriteString(theEnv,STDWRN,"WARNING: ");
+  }
+
+/***************************************************/
+/* CantFindItemErrorMessage: Generic error message */
+/*  when an "item" can not be found.               */
+/***************************************************/
+void CantFindItemErrorMessage(
+  Environment *theEnv,
+  const char *itemType,
+  const char *itemName,
+  bool useQuotes)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",1,false);
+   WriteString(theEnv,STDERR,"Unable to find ");
+   WriteString(theEnv,STDERR,itemType);
+   WriteString(theEnv,STDERR," ");
+   if (useQuotes) WriteString(theEnv,STDERR,"'");
+   WriteString(theEnv,STDERR,itemName);
+   if (useQuotes) WriteString(theEnv,STDERR,"'");
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/*****************************************************/
+/* CantFindItemInFunctionErrorMessage: Generic error */
+/*  message when an "item" can not be found.         */
+/*****************************************************/
+void CantFindItemInFunctionErrorMessage(
+  Environment *theEnv,
+  const char *itemType,
+  const char *itemName,
+  const char *func,
+  bool useQuotes)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",1,false);
+   WriteString(theEnv,STDERR,"Unable to find ");
+   WriteString(theEnv,STDERR,itemType);
+   WriteString(theEnv,STDERR," ");
+   if (useQuotes) WriteString(theEnv,STDERR,"'");
+   WriteString(theEnv,STDERR,itemName);
+   if (useQuotes) WriteString(theEnv,STDERR,"'");
+   WriteString(theEnv,STDERR," in function '");
+   WriteString(theEnv,STDERR,func);
+   WriteString(theEnv,STDERR,"'.\n");
+  }
+
+/*****************************************************/
+/* CantDeleteItemErrorMessage: Generic error message */
+/*  when an "item" can not be deleted.               */
+/*****************************************************/
+void CantDeleteItemErrorMessage(
+  Environment *theEnv,
+  const char *itemType,
+  const char *itemName)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",4,false);
+   WriteString(theEnv,STDERR,"Unable to delete ");
+   WriteString(theEnv,STDERR,itemType);
+   WriteString(theEnv,STDERR," '");
+   WriteString(theEnv,STDERR,itemName);
+   WriteString(theEnv,STDERR,"'.\n");
+  }
+
+/****************************************************/
+/* AlreadyParsedErrorMessage: Generic error message */
+/*  when an "item" has already been parsed.         */
+/****************************************************/
+void AlreadyParsedErrorMessage(
+  Environment *theEnv,
+  const char *itemType,
+  const char *itemName)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",5,true);
+   WriteString(theEnv,STDERR,"The ");
+   if (itemType != NULL) WriteString(theEnv,STDERR,itemType);
+   if (itemName != NULL)
+     {
+      WriteString(theEnv,STDERR,"'");
+      WriteString(theEnv,STDERR,itemName);
+      WriteString(theEnv,STDERR,"'");
+     }
+   WriteString(theEnv,STDERR," has already been parsed.\n");
+  }
+
+/*********************************************************/
+/* SyntaxErrorMessage: Generalized syntax error message. */
+/*********************************************************/
+void SyntaxErrorMessage(
+  Environment *theEnv,
+  const char *location)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",2,true);
+   WriteString(theEnv,STDERR,"Syntax Error");
+   if (location != NULL)
+     {
+      WriteString(theEnv,STDERR,":  Check appropriate syntax for ");
+      WriteString(theEnv,STDERR,location);
+     }
+
+   WriteString(theEnv,STDERR,".\n");
+   SetEvaluationError(theEnv,true);
+  }
+
+/****************************************************/
+/* LocalVariableErrorMessage: Generic error message */
+/*  when a local variable is accessed by an "item"  */
+/*  which can not access local variables.           */
+/****************************************************/
+void LocalVariableErrorMessage(
+  Environment *theEnv,
+  const char *byWhat)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",6,true);
+   WriteString(theEnv,STDERR,"Local variables can not be accessed by ");
+   WriteString(theEnv,STDERR,byWhat);
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/******************************************/
+/* SystemError: Generalized error message */
+/*   for major internal errors.           */
+/******************************************/
+void SystemError(
+  Environment *theEnv,
+  const char *module,
+  int errorID)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",3,true);
+
+   WriteString(theEnv,STDERR,"\n*** ");
+   WriteString(theEnv,STDERR,APPLICATION_NAME);
+   WriteString(theEnv,STDERR," SYSTEM ERROR ***\n");
+
+   WriteString(theEnv,STDERR,"ID = ");
+   WriteString(theEnv,STDERR,module);
+   WriteInteger(theEnv,STDERR,errorID);
+   WriteString(theEnv,STDERR,"\n");
+
+   WriteString(theEnv,STDERR,APPLICATION_NAME);
+   WriteString(theEnv,STDERR," data structures are in an inconsistent or corrupted state.\n");
+   WriteString(theEnv,STDERR,"This error may have occurred from errors in user defined code.\n");
+   WriteString(theEnv,STDERR,"**************************\n");
+  }
+
+/*******************************************************/
+/* DivideByZeroErrorMessage: Generalized error message */
+/*   for when a function attempts to divide by zero.   */
+/*******************************************************/
+void DivideByZeroErrorMessage(
+  Environment *theEnv,
+  const char *functionName)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",7,false);
+   WriteString(theEnv,STDERR,"Attempt to divide by zero in '");
+   WriteString(theEnv,STDERR,functionName);
+   WriteString(theEnv,STDERR,"' function.\n");
+  }
+
+/********************************************************/
+/* ArgumentOverUnderflowErrorMessage: Generalized error */
+/*   message for an integer under or overflow.          */
+/********************************************************/
+void ArgumentOverUnderflowErrorMessage(
+  Environment *theEnv,
+  const char *functionName,
+  bool error)
+  {
+   if (error)
+     {
+      PrintErrorID(theEnv,"PRNTUTIL",17,false);
+      WriteString(theEnv,STDERR,"Over or underflow of long long integer in '");
+      WriteString(theEnv,STDERR,functionName);
+      WriteString(theEnv,STDERR,"' function.\n");
+     }
+   else
+     {
+      PrintWarningID(theEnv,"PRNTUTIL",17,false);
+      WriteString(theEnv,STDWRN,"Over or underflow of long long integer in '");
+      WriteString(theEnv,STDWRN,functionName);
+      WriteString(theEnv,STDWRN,"' function.\n");
+     }
+  }
+
+/*******************************************************/
+/* FloatToString: Converts number to KB string format. */
+/*******************************************************/
+const char *FloatToString(
+  Environment *theEnv,
+  double number)
+  {
+   char floatString[40];
+   int i;
+   char x;
+   CLIPSLexeme *thePtr;
+
+   gensprintf(floatString,"%.15g",number);
+
+   for (i = 0; (x = floatString[i]) != '\0'; i++)
+     {
+      if ((x == '.') || (x == 'e'))
+        {
+         thePtr = CreateString(theEnv,floatString);
+         return thePtr->contents;
+        }
+     }
+
+   genstrcat(floatString,".0");
+
+   thePtr = CreateString(theEnv,floatString);
+   return thePtr->contents;
+  }
+
+/*******************************************************************/
+/* LongIntegerToString: Converts long integer to KB string format. */
+/*******************************************************************/
+const char *LongIntegerToString(
+  Environment *theEnv,
+  long long number)
+  {
+   char buffer[50];
+   CLIPSLexeme *thePtr;
+
+   gensprintf(buffer,"%lld",number);
+
+   thePtr = CreateString(theEnv,buffer);
+   return thePtr->contents;
+  }
+
+/******************************************************************/
+/* DataObjectToString: Converts a UDFValue to KB string format. */
+/******************************************************************/
+const char *DataObjectToString(
+  Environment *theEnv,
+  UDFValue *theDO)
+  {
+   CLIPSLexeme *thePtr;
+   const char *theString;
+   char *newString;
+   const char *prefix, *postfix;
+   size_t length;
+   CLIPSExternalAddress *theAddress;
+   StringBuilder *theSB;
+   
+   char buffer[30];
+
+   switch (theDO->header->type)
+     {
+      case MULTIFIELD_TYPE:
+         prefix = "(";
+         theString = ImplodeMultifield(theEnv,theDO)->contents;
+         postfix = ")";
+         break;
+
+      case STRING_TYPE:
+         prefix = "\"";
+         theString = theDO->lexemeValue->contents;
+         postfix = "\"";
+         break;
+
+      case INSTANCE_NAME_TYPE:
+         prefix = "[";
+         theString = theDO->lexemeValue->contents;
+         postfix = "]";
+         break;
+
+      case SYMBOL_TYPE:
+         return theDO->lexemeValue->contents;
+
+      case FLOAT_TYPE:
+         return(FloatToString(theEnv,theDO->floatValue->contents));
+
+      case INTEGER_TYPE:
+         return(LongIntegerToString(theEnv,theDO->integerValue->contents));
+
+      case VOID_TYPE:
+         return("");
+
+#if OBJECT_SYSTEM
+      case INSTANCE_ADDRESS_TYPE:
+         if (theDO->instanceValue == &InstanceData(theEnv)->DummyInstance)
+           { return("<Dummy Instance>"); }
+
+         if (theDO->instanceValue->garbage)
+           {
+            prefix = "<Stale Instance-";
+            theString = theDO->instanceValue->name->contents;
+            postfix = ">";
+           }
+         else
+           {
+            prefix = "<Instance-";
+            theString = GetFullInstanceName(theEnv,theDO->instanceValue)->contents;
+            postfix = ">";
+           }
+
+        break;
+#endif
+
+      case EXTERNAL_ADDRESS_TYPE:
+        theAddress = theDO->externalAddressValue;
+        
+        theSB = CreateStringBuilder(theEnv,30);
+
+        OpenStringBuilderDestination(theEnv,"DOTS",theSB);
+
+        if ((EvaluationData(theEnv)->ExternalAddressTypes[theAddress->type] != NULL) &&
+            (EvaluationData(theEnv)->ExternalAddressTypes[theAddress->type]->longPrintFunction != NULL))
+          { (*EvaluationData(theEnv)->ExternalAddressTypes[theAddress->type]->longPrintFunction)(theEnv,"DOTS",theAddress); }
+        else
+          {
+           WriteString(theEnv,"DOTS","<Pointer-");
+
+           gensprintf(buffer,"%d-",theAddress->type);
+           WriteString(theEnv,"DOTS",buffer);
+
+           gensprintf(buffer,"%p",theAddress->contents);
+           WriteString(theEnv,"DOTS",buffer);
+           WriteString(theEnv,"DOTS",">");
+          }
+
+        thePtr = CreateString(theEnv,theSB->contents);
+        SBDispose(theSB);
+
+        CloseStringBuilderDestination(theEnv,"DOTS");
+        return thePtr->contents;
+
+#if DEFTEMPLATE_CONSTRUCT
+      case FACT_ADDRESS_TYPE:
+         if (theDO->factValue == &FactData(theEnv)->DummyFact)
+           { return("<Dummy Fact>"); }
+
+         gensprintf(buffer,"<Fact-%lld>",theDO->factValue->factIndex);
+         thePtr = CreateString(theEnv,buffer);
+         return thePtr->contents;
+#endif
+
+      default:
+         return("UNK");
+     }
+
+   length = strlen(prefix) + strlen(theString) + strlen(postfix) + 1;
+   newString = (char *) genalloc(theEnv,length);
+   newString[0] = '\0';
+   genstrcat(newString,prefix);
+   genstrcat(newString,theString);
+   genstrcat(newString,postfix);
+   thePtr = CreateString(theEnv,newString);
+   genfree(theEnv,newString,length);
+   return thePtr->contents;
+  }
+
+/************************************************************/
+/* SalienceInformationError: Error message for errors which */
+/*   occur during the evaluation of a salience value.       */
+/************************************************************/
+void SalienceInformationError(
+  Environment *theEnv,
+  const char *constructType,
+  const char *constructName)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",8,true);
+   WriteString(theEnv,STDERR,"This error occurred while evaluating the salience");
+   if (constructName != NULL)
+     {
+      WriteString(theEnv,STDERR," for ");
+      WriteString(theEnv,STDERR,constructType);
+      WriteString(theEnv,STDERR," '");
+      WriteString(theEnv,STDERR,constructName);
+      WriteString(theEnv,STDERR,"'");
+     }
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/**********************************************************/
+/* SalienceRangeError: Error message that is printed when */
+/*   a salience value does not fall between the minimum   */
+/*   and maximum salience values.                         */
+/**********************************************************/
+void SalienceRangeError(
+  Environment *theEnv,
+  int min,
+  int max)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",9,true);
+   WriteString(theEnv,STDERR,"Salience value out of range ");
+   WriteInteger(theEnv,STDERR,min);
+   WriteString(theEnv,STDERR," to ");
+   WriteInteger(theEnv,STDERR,max);
+   WriteString(theEnv,STDERR,".\n");
+  }
+
+/***************************************************************/
+/* SalienceNonIntegerError: Error message that is printed when */
+/*   a rule's salience does not evaluate to an integer.        */
+/***************************************************************/
+void SalienceNonIntegerError(
+  Environment *theEnv)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",10,true);
+   WriteString(theEnv,STDERR,"Salience value must be an integer value.\n");
+  }
+
+/****************************************************/
+/* FactRetractedErrorMessage: Generic error message */
+/*  when a fact has been retracted.                 */
+/****************************************************/
+void FactRetractedErrorMessage(
+  Environment *theEnv,
+  Fact *theFact)
+  {
+   char tempBuffer[20];
+   
+   PrintErrorID(theEnv,"PRNTUTIL",11,false);
+   WriteString(theEnv,STDERR,"The fact ");
+   gensprintf(tempBuffer,"f-%lld",theFact->factIndex);
+   WriteString(theEnv,STDERR,tempBuffer);
+   WriteString(theEnv,STDERR," has been retracted.\n");
+  }
+
+/****************************************************/
+/* FactVarSlotErrorMessage1: Generic error message  */
+/*   when a var/slot reference accesses a fact that */
+/*   has been retracted.                            */
+/****************************************************/
+void FactVarSlotErrorMessage1(
+  Environment *theEnv,
+  Fact *theFact,
+  const char *varSlot)
+  {
+   char tempBuffer[20];
+   
+   PrintErrorID(theEnv,"PRNTUTIL",12,false);
+   
+   WriteString(theEnv,STDERR,"The variable/slot reference ?");
+   WriteString(theEnv,STDERR,varSlot);
+   WriteString(theEnv,STDERR," cannot be resolved because the referenced fact ");
+   gensprintf(tempBuffer,"f-%lld",theFact->factIndex);
+   WriteString(theEnv,STDERR,tempBuffer);
+   WriteString(theEnv,STDERR," has been retracted.\n");
+  }
+
+/****************************************************/
+/* FactVarSlotErrorMessage2: Generic error message  */
+/*   when a var/slot reference accesses an invalid  */
+/*   slot.                                          */
+/****************************************************/
+void FactVarSlotErrorMessage2(
+  Environment *theEnv,
+  Fact *theFact,
+  const char *varSlot)
+  {
+   char tempBuffer[20];
+   
+   PrintErrorID(theEnv,"PRNTUTIL",13,false);
+   
+   WriteString(theEnv,STDERR,"The variable/slot reference ?");
+   WriteString(theEnv,STDERR,varSlot);
+   WriteString(theEnv,STDERR," is invalid because the referenced fact ");
+   gensprintf(tempBuffer,"f-%lld",theFact->factIndex);
+   WriteString(theEnv,STDERR,tempBuffer);
+   WriteString(theEnv,STDERR," does not contain the specified slot.\n");
+  }
+
+/******************************************************/
+/* InvalidVarSlotErrorMessage: Generic error message  */
+/*   when a var/slot reference accesses an invalid    */
+/*   slot.                                            */
+/******************************************************/
+void InvalidVarSlotErrorMessage(
+  Environment *theEnv,
+  const char *varSlot)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",14,false);
+   
+   WriteString(theEnv,STDERR,"The variable/slot reference ?");
+   WriteString(theEnv,STDERR,varSlot);
+   WriteString(theEnv,STDERR," is invalid because slot names must be symbols.\n");
+  }
+
+/*******************************************************/
+/* InstanceVarSlotErrorMessage1: Generic error message */
+/*   when a var/slot reference accesses an instance    */
+/*   that has been deleted.                            */
+/*******************************************************/
+void InstanceVarSlotErrorMessage1(
+  Environment *theEnv,
+  Instance *theInstance,
+  const char *varSlot)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",15,false);
+   
+   WriteString(theEnv,STDERR,"The variable/slot reference ?");
+   WriteString(theEnv,STDERR,varSlot);
+   WriteString(theEnv,STDERR," cannot be resolved because the referenced instance [");
+   WriteString(theEnv,STDERR,theInstance->name->contents);
+   WriteString(theEnv,STDERR,"] has been deleted.\n");
+  }
+  
+/************************************************/
+/* InstanceVarSlotErrorMessage2: Generic error  */
+/*   message when a var/slot reference accesses */
+/*   an invalid slot.                           */
+/************************************************/
+void InstanceVarSlotErrorMessage2(
+  Environment *theEnv,
+  Instance *theInstance,
+  const char *varSlot)
+  {
+   PrintErrorID(theEnv,"PRNTUTIL",16,false);
+   
+   WriteString(theEnv,STDERR,"The variable/slot reference ?");
+   WriteString(theEnv,STDERR,varSlot);
+   WriteString(theEnv,STDERR," is invalid because the referenced instance [");
+   WriteString(theEnv,STDERR,theInstance->name->contents);
+   WriteString(theEnv,STDERR,"] does not contain the specified slot.\n");
+  }
+
+/***************************************************/
+/* SlotExistError: Prints out an appropriate error */
+/*   message when a slot cannot be found for a     */
+/*   function. Input to the function is the slot   */
+/*   name and the function name.                   */
+/***************************************************/
+void SlotExistError(
+  Environment *theEnv,
+  const char *sname,
+  const char *func)
+  {
+   PrintErrorID(theEnv,"INSFUN",3,false);
+   WriteString(theEnv,STDERR,"No such slot '");
+   WriteString(theEnv,STDERR,sname);
+   WriteString(theEnv,STDERR,"' in function '");
+   WriteString(theEnv,STDERR,func);
+   WriteString(theEnv,STDERR,"'.\n");
+   SetEvaluationError(theEnv,true);
+  }
diff --git a/clips/prntutil.h b/clips/prntutil.h
new file mode 100755
index 000000000..b152de674
--- /dev/null
+++ b/clips/prntutil.h
@@ -0,0 +1,125 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  01/29/18            */
+   /*                                                     */
+   /*              PRINT UTILITY HEADER FILE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Utility routines for printing various items      */
+/*   and messages.                                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Link error occurs for the SlotExistError       */
+/*            function when OBJECT_SYSTEM is set to 0 in     */
+/*            setup.h. DR0865                                */
+/*                                                           */
+/*            Added DataObjectToString function.             */
+/*                                                           */
+/*            Added SlotExistError function.                 */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Support for DATA_OBJECT_ARRAY primitive.       */
+/*                                                           */
+/*            Support for typed EXTERNAL_ADDRESS_TYPE.       */
+/*                                                           */
+/*            Used gensprintf and genstrcat instead of       */
+/*            sprintf and strcat.                            */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added code for capturing errors/warnings.      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*      6.31: Added additional error messages for retracted  */
+/*            facts, deleted instances, and invalid slots.   */
+/*                                                           */
+/*            Added under/overflow error message.            */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed DATA_OBJECT_ARRAY primitive type.      */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_prntutil
+
+#pragma once
+
+#define _H_prntutil
+
+#include <stdio.h>
+
+#include "entities.h"
+
+#define PRINT_UTILITY_DATA 53
+
+struct printUtilityData
+  {
+   bool PreserveEscapedCharacters;
+   bool AddressesToStrings;
+   bool InstanceAddressesToNames;
+  };
+
+#define PrintUtilityData(theEnv) ((struct printUtilityData *) GetEnvironmentData(theEnv,PRINT_UTILITY_DATA))
+
+   void                           InitializePrintUtilityData(Environment *);
+   void                           WriteFloat(Environment *,const char *,double);
+   void                           WriteInteger(Environment *,const char *,long long);
+   void                           PrintUnsignedInteger(Environment *,const char *,unsigned long long);
+   void                           PrintAtom(Environment *,const char *,unsigned short,void *);
+   void                           PrintTally(Environment *,const char *,unsigned long long,const char *,const char *);
+   const char                    *FloatToString(Environment *,double);
+   const char                    *LongIntegerToString(Environment *,long long);
+   const char                    *DataObjectToString(Environment *,UDFValue *);
+   void                           SyntaxErrorMessage(Environment *,const char *);
+   void                           SystemError(Environment *,const char *,int);
+   void                           PrintErrorID(Environment *,const char *,int,bool);
+   void                           PrintWarningID(Environment *,const char *,int,bool);
+   void                           CantFindItemErrorMessage(Environment *,const char *,const char *,bool);
+   void                           CantDeleteItemErrorMessage(Environment *,const char *,const char *);
+   void                           AlreadyParsedErrorMessage(Environment *,const char *,const char *);
+   void                           LocalVariableErrorMessage(Environment *,const char *);
+   void                           DivideByZeroErrorMessage(Environment *,const char *);
+   void                           SalienceInformationError(Environment *,const char *,const char *);
+   void                           SalienceRangeError(Environment *,int,int);
+   void                           SalienceNonIntegerError(Environment *);
+   void                           CantFindItemInFunctionErrorMessage(Environment *,const char *,const char *,const char *,bool);
+   void                           SlotExistError(Environment *,const char *,const char *);
+   void                           FactRetractedErrorMessage(Environment *,Fact *);
+   void                           FactVarSlotErrorMessage1(Environment *,Fact *,const char *);
+   void                           FactVarSlotErrorMessage2(Environment *,Fact *,const char *);
+   void                           InvalidVarSlotErrorMessage(Environment *,const char *);
+   void                           InstanceVarSlotErrorMessage1(Environment *,Instance *,const char *);
+   void                           InstanceVarSlotErrorMessage2(Environment *,Instance *,const char *);
+   void                           ArgumentOverUnderflowErrorMessage(Environment *,const char *,bool);
+
+#endif /* _H_prntutil */
+
+
+
+
+
+
diff --git a/clips/proflfun.c b/clips/proflfun.c
new file mode 100755
index 000000000..8b132496e
--- /dev/null
+++ b/clips/proflfun.c
@@ -0,0 +1,824 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*         CONSTRUCT PROFILING FUNCTIONS MODULE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for profiling the amount of    */
+/*   time spent in constructs and user defined functions.    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Modified OutputProfileInfo to allow a before   */
+/*            and after prefix so that a string buffer does  */
+/*            not need to be created to contain the entire   */
+/*            prefix. This allows a buffer overflow problem  */
+/*            to be corrected. DR0857.                       */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added pragmas to remove compilation warnings.  */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_TBC).         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if PROFILING_FUNCTIONS
+
+#include "argacces.h"
+#include "classcom.h"
+#include "dffnxfun.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "genrccom.h"
+#include "genrcfun.h"
+#include "memalloc.h"
+#include "msgcom.h"
+#include "router.h"
+#include "sysdep.h"
+
+#include "proflfun.h"
+
+#include <string.h>
+
+#define NO_PROFILE      0
+#define USER_FUNCTIONS  1
+#define CONSTRUCTS_CODE 2
+
+#define OUTPUT_STRING "%-40s %7ld %15.6f  %8.2f%%  %15.6f  %8.2f%%\n"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                        OutputProfileInfo(Environment *,const char *,struct constructProfileInfo *,
+                                                        const char *,const char *,const char *,const char **);
+   static void                        OutputUserFunctionsInfo(Environment *);
+   static void                        OutputConstructsCodeInfo(Environment *);
+#if (! RUN_TIME)
+   static void                        ProfileClearFunction(Environment *,void *);
+#endif
+
+/******************************************************/
+/* ConstructProfilingFunctionDefinitions: Initializes */
+/*   the construct profiling functions.               */
+/******************************************************/
+void ConstructProfilingFunctionDefinitions(
+  Environment *theEnv)
+  {
+   struct userDataRecord profileDataInfo = { 0, CreateProfileData, DeleteProfileData };
+
+   AllocateEnvironmentData(theEnv,PROFLFUN_DATA,sizeof(struct profileFunctionData),NULL);
+
+   memcpy(&ProfileFunctionData(theEnv)->ProfileDataInfo,&profileDataInfo,sizeof(struct userDataRecord));
+
+   ProfileFunctionData(theEnv)->LastProfileInfo = NO_PROFILE;
+   ProfileFunctionData(theEnv)->PercentThreshold = 0.0;
+   ProfileFunctionData(theEnv)->OutputString = OUTPUT_STRING;
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"profile","v",1,1,"y",ProfileCommand,"ProfileCommand",NULL);
+   AddUDF(theEnv,"profile-info","v",0,0,NULL, ProfileInfoCommand,"ProfileInfoCommand",NULL);
+   AddUDF(theEnv,"profile-reset","v",0,0,NULL,ProfileResetCommand,"ProfileResetCommand",NULL);
+
+   AddUDF(theEnv,"set-profile-percent-threshold","d",1,1,"ld",SetProfilePercentThresholdCommand,"SetProfilePercentThresholdCommand",NULL);
+   AddUDF(theEnv,"get-profile-percent-threshold","d",0,0,NULL,GetProfilePercentThresholdCommand,"GetProfilePercentThresholdCommand",NULL);
+
+   ProfileFunctionData(theEnv)->ProfileDataID = InstallUserDataRecord(theEnv,&ProfileFunctionData(theEnv)->ProfileDataInfo);
+
+   AddClearFunction(theEnv,"profile",ProfileClearFunction,0,NULL);
+#endif
+  }
+
+/**********************************/
+/* CreateProfileData: Allocates a */
+/*   profile user data structure. */
+/**********************************/
+void *CreateProfileData(
+  Environment *theEnv)
+  {
+   struct constructProfileInfo *theInfo;
+
+   theInfo = (struct constructProfileInfo *)
+             genalloc(theEnv,sizeof(struct constructProfileInfo));
+
+   theInfo->numberOfEntries = 0;
+   theInfo->childCall = false;
+   theInfo->startTime = 0.0;
+   theInfo->totalSelfTime = 0.0;
+   theInfo->totalWithChildrenTime = 0.0;
+
+   return(theInfo);
+  }
+
+/**************************************/
+/* DeleteProfileData:          */
+/**************************************/
+void DeleteProfileData(
+  Environment *theEnv,
+  void *theData)
+  {
+   genfree(theEnv,theData,sizeof(struct constructProfileInfo));
+  }
+
+/**************************************/
+/* ProfileCommand: H/L access routine */
+/*   for the profile command.         */
+/**************************************/
+void ProfileCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *argument;
+   UDFValue theValue;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theValue)) return;
+   argument = theValue.lexemeValue->contents;
+
+   if (! Profile(theEnv,argument))
+     {
+      UDFInvalidArgumentMessage(context,"symbol with value constructs, user-functions, or off");
+      return;
+     }
+
+   return;
+  }
+
+/******************************/
+/* Profile: C access routine  */
+/*   for the profile command. */
+/******************************/
+bool Profile(
+  Environment *theEnv,
+  const char *argument)
+  {
+   /*======================================================*/
+   /* If the argument is the symbol "user-functions", then */
+   /* user-defined functions should be profiled. If the    */
+   /* argument is the symbol "constructs", then            */
+   /* deffunctions, generic functions, message-handlers,   */
+   /* and rule RHS actions are profiled.                   */
+   /*======================================================*/
+
+   if (strcmp(argument,"user-functions") == 0)
+     {
+      ProfileFunctionData(theEnv)->ProfileStartTime = gentime();
+      ProfileFunctionData(theEnv)->ProfileUserFunctions = true;
+      ProfileFunctionData(theEnv)->ProfileConstructs = false;
+      ProfileFunctionData(theEnv)->LastProfileInfo = USER_FUNCTIONS;
+     }
+
+   else if (strcmp(argument,"constructs") == 0)
+     {
+      ProfileFunctionData(theEnv)->ProfileStartTime = gentime();
+      ProfileFunctionData(theEnv)->ProfileUserFunctions = false;
+      ProfileFunctionData(theEnv)->ProfileConstructs = true;
+      ProfileFunctionData(theEnv)->LastProfileInfo = CONSTRUCTS_CODE;
+     }
+
+   /*======================================================*/
+   /* Otherwise, if the argument is the symbol "off", then */
+   /* don't profile constructs and user-defined functions. */
+   /*======================================================*/
+
+   else if (strcmp(argument,"off") == 0)
+     {
+      ProfileFunctionData(theEnv)->ProfileEndTime = gentime();
+      ProfileFunctionData(theEnv)->ProfileTotalTime += (ProfileFunctionData(theEnv)->ProfileEndTime - ProfileFunctionData(theEnv)->ProfileStartTime);
+      ProfileFunctionData(theEnv)->ProfileUserFunctions = false;
+      ProfileFunctionData(theEnv)->ProfileConstructs = false;
+     }
+
+   /*=====================================================*/
+   /* Otherwise, generate an error since the only allowed */
+   /* arguments are "on" or "off."                        */
+   /*=====================================================*/
+
+   else
+     { return false; }
+
+   return true;
+  }
+
+/******************************************/
+/* ProfileInfoCommand: H/L access routine */
+/*   for the profile-info command.        */
+/******************************************/
+void ProfileInfoCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   char buffer[512];
+
+   /*==================================*/
+   /* If code is still being profiled, */
+   /* update the profile end time.     */
+   /*==================================*/
+
+   if (ProfileFunctionData(theEnv)->ProfileUserFunctions || ProfileFunctionData(theEnv)->ProfileConstructs)
+     {
+      ProfileFunctionData(theEnv)->ProfileEndTime = gentime();
+      ProfileFunctionData(theEnv)->ProfileTotalTime += (ProfileFunctionData(theEnv)->ProfileEndTime - ProfileFunctionData(theEnv)->ProfileStartTime);
+     }
+
+   /*==================================*/
+   /* Print the profiling information. */
+   /*==================================*/
+
+   if (ProfileFunctionData(theEnv)->LastProfileInfo != NO_PROFILE)
+     {
+      gensprintf(buffer,"Profile elapsed time = %g seconds\n",
+                      ProfileFunctionData(theEnv)->ProfileTotalTime);
+      WriteString(theEnv,STDOUT,buffer);
+
+      if (ProfileFunctionData(theEnv)->LastProfileInfo == USER_FUNCTIONS)
+        { WriteString(theEnv,STDOUT,"Function Name                            "); }
+      else if (ProfileFunctionData(theEnv)->LastProfileInfo == CONSTRUCTS_CODE)
+        { WriteString(theEnv,STDOUT,"Construct Name                           "); }
+
+      WriteString(theEnv,STDOUT,"Entries         Time           %          Time+Kids     %+Kids\n");
+
+      if (ProfileFunctionData(theEnv)->LastProfileInfo == USER_FUNCTIONS)
+        { WriteString(theEnv,STDOUT,"-------------                            "); }
+      else if (ProfileFunctionData(theEnv)->LastProfileInfo == CONSTRUCTS_CODE)
+        { WriteString(theEnv,STDOUT,"--------------                           "); }
+
+      WriteString(theEnv,STDOUT,"-------        ------        -----        ---------     ------\n");
+     }
+
+   if (ProfileFunctionData(theEnv)->LastProfileInfo == USER_FUNCTIONS) OutputUserFunctionsInfo(theEnv);
+   if (ProfileFunctionData(theEnv)->LastProfileInfo == CONSTRUCTS_CODE) OutputConstructsCodeInfo(theEnv);
+  }
+
+/**********************************************/
+/* StartProfile: Initiates bookkeeping needed */
+/*   to profile a construct or function.      */
+/**********************************************/
+void StartProfile(
+  Environment *theEnv,
+  struct profileFrameInfo *theFrame,
+  struct userData **theList,
+  bool checkFlag)
+  {
+   double startTime, addTime;
+   struct constructProfileInfo *profileInfo;
+
+   if (! checkFlag)
+     {
+      theFrame->profileOnExit = false;
+      return;
+     }
+
+   profileInfo = (struct constructProfileInfo *) FetchUserData(theEnv,ProfileFunctionData(theEnv)->ProfileDataID,theList);
+
+   theFrame->profileOnExit = true;
+   theFrame->parentCall = false;
+
+   startTime = gentime();
+   theFrame->oldProfileFrame = ProfileFunctionData(theEnv)->ActiveProfileFrame;
+
+   if (ProfileFunctionData(theEnv)->ActiveProfileFrame != NULL)
+     {
+      addTime = startTime - ProfileFunctionData(theEnv)->ActiveProfileFrame->startTime;
+      ProfileFunctionData(theEnv)->ActiveProfileFrame->totalSelfTime += addTime;
+     }
+
+   ProfileFunctionData(theEnv)->ActiveProfileFrame = profileInfo;
+
+   ProfileFunctionData(theEnv)->ActiveProfileFrame->numberOfEntries++;
+   ProfileFunctionData(theEnv)->ActiveProfileFrame->startTime = startTime;
+
+   if (! ProfileFunctionData(theEnv)->ActiveProfileFrame->childCall)
+     {
+      theFrame->parentCall = true;
+      theFrame->parentStartTime = startTime;
+      ProfileFunctionData(theEnv)->ActiveProfileFrame->childCall = true;
+     }
+  }
+
+/*******************************************/
+/* EndProfile: Finishes bookkeeping needed */
+/*   to profile a construct or function.   */
+/*******************************************/
+void EndProfile(
+  Environment *theEnv,
+  struct profileFrameInfo *theFrame)
+  {
+   double endTime, addTime;
+
+   if (! theFrame->profileOnExit) return;
+
+   endTime = gentime();
+
+   if (theFrame->parentCall)
+     {
+      addTime = endTime - theFrame->parentStartTime;
+      ProfileFunctionData(theEnv)->ActiveProfileFrame->totalWithChildrenTime += addTime;
+      ProfileFunctionData(theEnv)->ActiveProfileFrame->childCall = false;
+     }
+
+   ProfileFunctionData(theEnv)->ActiveProfileFrame->totalSelfTime += (endTime - ProfileFunctionData(theEnv)->ActiveProfileFrame->startTime);
+
+   if (theFrame->oldProfileFrame != NULL)
+     { theFrame->oldProfileFrame->startTime = endTime; }
+
+   ProfileFunctionData(theEnv)->ActiveProfileFrame = theFrame->oldProfileFrame;
+  }
+
+/******************************************/
+/* OutputProfileInfo: Prints out a single */
+/*   line of profile information.         */
+/******************************************/
+static bool OutputProfileInfo(
+  Environment *theEnv,
+  const char *itemName,
+  struct constructProfileInfo *profileInfo,
+  const char *printPrefixBefore,
+  const char *printPrefix,
+  const char *printPrefixAfter,
+  const char **banner)
+  {
+   double percent = 0.0, percentWithKids = 0.0;
+   char buffer[512];
+
+   if (profileInfo == NULL) return false;
+
+   if (profileInfo->numberOfEntries == 0) return false;
+
+   if (ProfileFunctionData(theEnv)->ProfileTotalTime != 0.0)
+     {
+      percent = (profileInfo->totalSelfTime * 100.0) / ProfileFunctionData(theEnv)->ProfileTotalTime;
+      if (percent < 0.005) percent = 0.0;
+      percentWithKids = (profileInfo->totalWithChildrenTime * 100.0) / ProfileFunctionData(theEnv)->ProfileTotalTime;
+      if (percentWithKids < 0.005) percentWithKids = 0.0;
+     }
+
+   if (percent < ProfileFunctionData(theEnv)->PercentThreshold) return false;
+
+   if ((banner != NULL) && (*banner != NULL))
+     {
+      WriteString(theEnv,STDOUT,*banner);
+      *banner = NULL;
+     }
+
+   if (printPrefixBefore != NULL)
+     { WriteString(theEnv,STDOUT,printPrefixBefore); }
+
+   if (printPrefix != NULL)
+     { WriteString(theEnv,STDOUT,printPrefix); }
+
+   if (printPrefixAfter != NULL)
+     { WriteString(theEnv,STDOUT,printPrefixAfter); }
+
+   if (strlen(itemName) >= 40)
+     {
+      WriteString(theEnv,STDOUT,itemName);
+      WriteString(theEnv,STDOUT,"\n");
+      itemName = "";
+     }
+
+   gensprintf(buffer,ProfileFunctionData(theEnv)->OutputString,
+                        itemName,
+                        (long) profileInfo->numberOfEntries,
+
+                        (double) profileInfo->totalSelfTime,
+                        (double) percent,
+
+                        (double) profileInfo->totalWithChildrenTime,
+                        (double) percentWithKids);
+   WriteString(theEnv,STDOUT,buffer);
+
+   return true;
+  }
+
+/*******************************************/
+/* ProfileResetCommand: H/L access routine */
+/*   for the profile-reset command.        */
+/*******************************************/
+void ProfileResetCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   struct functionDefinition *theFunction;
+   int i;
+#if DEFFUNCTION_CONSTRUCT
+   Deffunction *theDeffunction;
+#endif
+#if DEFRULE_CONSTRUCT
+   Defrule *theDefrule;
+#endif
+#if DEFGENERIC_CONSTRUCT
+   Defgeneric *theDefgeneric;
+   unsigned short methodIndex;
+   Defmethod *theMethod;
+#endif
+#if OBJECT_SYSTEM
+   Defclass *theDefclass;
+   DefmessageHandler *theHandler;
+   unsigned handlerIndex;
+#endif
+
+   ProfileFunctionData(theEnv)->ProfileStartTime = 0.0;
+   ProfileFunctionData(theEnv)->ProfileEndTime = 0.0;
+   ProfileFunctionData(theEnv)->ProfileTotalTime = 0.0;
+   ProfileFunctionData(theEnv)->LastProfileInfo = NO_PROFILE;
+
+   for (theFunction = GetFunctionList(theEnv);
+        theFunction != NULL;
+        theFunction = theFunction->next)
+     {
+      ResetProfileInfo((struct constructProfileInfo *)
+                       TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theFunction->usrData));
+     }
+
+   for (i = 0; i < MAXIMUM_PRIMITIVES; i++)
+     {
+      if (EvaluationData(theEnv)->PrimitivesArray[i] != NULL)
+        {
+         ResetProfileInfo((struct constructProfileInfo *)
+                          TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,EvaluationData(theEnv)->PrimitivesArray[i]->usrData));
+        }
+     }
+
+#if DEFFUNCTION_CONSTRUCT
+   for (theDeffunction = GetNextDeffunction(theEnv,NULL);
+        theDeffunction != NULL;
+        theDeffunction = GetNextDeffunction(theEnv,theDeffunction))
+     {
+      ResetProfileInfo((struct constructProfileInfo *)
+                       TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theDeffunction->header.usrData));
+     }
+#endif
+
+#if DEFRULE_CONSTRUCT
+   for (theDefrule = GetNextDefrule(theEnv,NULL);
+        theDefrule != NULL;
+        theDefrule = GetNextDefrule(theEnv,theDefrule))
+     {
+      ResetProfileInfo((struct constructProfileInfo *)
+                       TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theDefrule->header.usrData));
+     }
+#endif
+
+#if DEFGENERIC_CONSTRUCT
+   for (theDefgeneric = GetNextDefgeneric(theEnv,NULL);
+        theDefgeneric != NULL;
+        theDefgeneric = GetNextDefgeneric(theEnv,theDefgeneric))
+     {
+      ResetProfileInfo((struct constructProfileInfo *)
+                       TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theDefgeneric->header.usrData));
+
+      for (methodIndex = GetNextDefmethod(theDefgeneric,0);
+           methodIndex != 0;
+           methodIndex = GetNextDefmethod(theDefgeneric,methodIndex))
+        {
+         theMethod = GetDefmethodPointer(theDefgeneric,methodIndex);
+         ResetProfileInfo((struct constructProfileInfo *)
+                          TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theMethod->header.usrData));
+        }
+     }
+#endif
+
+#if OBJECT_SYSTEM
+   for (theDefclass = GetNextDefclass(theEnv,NULL);
+        theDefclass != NULL;
+        theDefclass = GetNextDefclass(theEnv,theDefclass))
+     {
+      ResetProfileInfo((struct constructProfileInfo *)
+                       TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theDefclass->header.usrData));
+      for (handlerIndex = GetNextDefmessageHandler(theDefclass,0);
+           handlerIndex != 0;
+           handlerIndex = GetNextDefmessageHandler(theDefclass,handlerIndex))
+        {
+         theHandler = GetDefmessageHandlerPointer(theDefclass,handlerIndex);
+         ResetProfileInfo((struct constructProfileInfo *)
+                          TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theHandler->header.usrData));
+        }
+     }
+#endif
+
+  }
+
+/*************************************************/
+/* ResetProfileInfo: Sets the initial values for */
+/*   a constructProfileInfo data structure.      */
+/*************************************************/
+void ResetProfileInfo(
+  struct constructProfileInfo *profileInfo)
+  {
+   if (profileInfo == NULL) return;
+
+   profileInfo->numberOfEntries = 0;
+   profileInfo->childCall = false;
+   profileInfo->startTime = 0.0;
+   profileInfo->totalSelfTime = 0.0;
+   profileInfo->totalWithChildrenTime = 0.0;
+  }
+
+/****************************/
+/* OutputUserFunctionsInfo: */
+/****************************/
+static void OutputUserFunctionsInfo(
+  Environment *theEnv)
+  {
+   struct functionDefinition *theFunction;
+   int i;
+
+   for (theFunction = GetFunctionList(theEnv);
+        theFunction != NULL;
+        theFunction = theFunction->next)
+     {
+      OutputProfileInfo(theEnv,theFunction->callFunctionName->contents,
+                        (struct constructProfileInfo *)
+                           TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,
+                        theFunction->usrData),
+                        NULL,NULL,NULL,NULL);
+     }
+
+   for (i = 0; i < MAXIMUM_PRIMITIVES; i++)
+     {
+      if (EvaluationData(theEnv)->PrimitivesArray[i] != NULL)
+        {
+         OutputProfileInfo(theEnv,EvaluationData(theEnv)->PrimitivesArray[i]->name,
+                           (struct constructProfileInfo *)
+                              TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,
+                           EvaluationData(theEnv)->PrimitivesArray[i]->usrData),
+                           NULL,NULL,NULL,NULL);
+        }
+     }
+  }
+
+/*****************************/
+/* OutputConstructsCodeInfo: */
+/*****************************/
+static void OutputConstructsCodeInfo(
+  Environment *theEnv)
+  {
+#if (! DEFFUNCTION_CONSTRUCT) && (! DEFGENERIC_CONSTRUCT) && (! OBJECT_SYSTEM) && (! DEFRULE_CONSTRUCT)
+#pragma unused(theEnv)
+#endif
+#if DEFFUNCTION_CONSTRUCT
+   Deffunction *theDeffunction;
+#endif
+#if DEFRULE_CONSTRUCT
+   Defrule *theDefrule;
+#endif
+#if DEFGENERIC_CONSTRUCT
+   Defgeneric *theDefgeneric;
+   Defmethod *theMethod;
+   unsigned short methodIndex;
+   StringBuilder *theSB;
+#endif
+#if OBJECT_SYSTEM
+   Defclass *theDefclass;
+   DefmessageHandler *theHandler;
+   unsigned handlerIndex;
+#endif
+#if DEFGENERIC_CONSTRUCT || OBJECT_SYSTEM
+   const char *prefix, *prefixBefore, *prefixAfter;
+#endif
+   const char *banner;
+
+   banner = "\n*** Deffunctions ***\n\n";
+
+#if DEFFUNCTION_CONSTRUCT
+   for (theDeffunction = GetNextDeffunction(theEnv,NULL);
+        theDeffunction != NULL;
+        theDeffunction = GetNextDeffunction(theEnv,theDeffunction))
+     {
+      OutputProfileInfo(theEnv,DeffunctionName(theDeffunction),
+                        (struct constructProfileInfo *)
+                          TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theDeffunction->header.usrData),
+                        NULL,NULL,NULL,&banner);
+     }
+#endif
+
+   banner = "\n*** Defgenerics ***\n";
+#if DEFGENERIC_CONSTRUCT
+   theSB = CreateStringBuilder(theEnv,512);
+   for (theDefgeneric = GetNextDefgeneric(theEnv,NULL);
+        theDefgeneric != NULL;
+        theDefgeneric = GetNextDefgeneric(theEnv,theDefgeneric))
+     {
+      prefixBefore = "\n";
+      prefix = DefgenericName(theDefgeneric);
+      prefixAfter = "\n";
+
+      for (methodIndex = GetNextDefmethod(theDefgeneric,0);
+           methodIndex != 0;
+           methodIndex = GetNextDefmethod(theDefgeneric,methodIndex))
+        {
+         theMethod = GetDefmethodPointer(theDefgeneric,methodIndex);
+
+         DefmethodDescription(theDefgeneric,methodIndex,theSB);
+         if (OutputProfileInfo(theEnv,theSB->contents,
+                               (struct constructProfileInfo *)
+                                  TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theMethod->header.usrData),
+                               prefixBefore,prefix,prefixAfter,&banner))
+           {
+            prefixBefore = NULL;
+            prefix = NULL;
+            prefixAfter = NULL;
+           }
+        }
+     }
+   SBDispose(theSB);
+#endif
+
+   banner = "\n*** Defclasses ***\n";
+#if OBJECT_SYSTEM
+   for (theDefclass = GetNextDefclass(theEnv,NULL);
+        theDefclass != NULL;
+        theDefclass = GetNextDefclass(theEnv,theDefclass))
+     {
+      prefixAfter = "\n";
+      prefix = DefclassName(theDefclass);
+      prefixBefore = "\n";
+
+      for (handlerIndex = GetNextDefmessageHandler(theDefclass,0);
+           handlerIndex != 0;
+           handlerIndex = GetNextDefmessageHandler(theDefclass,handlerIndex))
+        {
+         theHandler = GetDefmessageHandlerPointer(theDefclass,handlerIndex);
+         if (OutputProfileInfo(theEnv,DefmessageHandlerName(theDefclass,handlerIndex),
+                               (struct constructProfileInfo *)
+                                  TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,
+                               theHandler->header.usrData),
+                               prefixBefore,prefix,prefixAfter,&banner))
+           {
+            prefixBefore = NULL;
+            prefix = NULL;
+            prefixAfter = NULL;
+           }
+        }
+
+     }
+#endif
+
+   banner = "\n*** Defrules ***\n\n";
+
+#if DEFRULE_CONSTRUCT
+   for (theDefrule = GetNextDefrule(theEnv,NULL);
+        theDefrule != NULL;
+        theDefrule = GetNextDefrule(theEnv,theDefrule))
+     {
+      OutputProfileInfo(theEnv,DefruleName(theDefrule),
+                        (struct constructProfileInfo *)
+                          TestUserData(ProfileFunctionData(theEnv)->ProfileDataID,theDefrule->header.usrData),
+                        NULL,NULL,NULL,&banner);
+     }
+#endif
+
+  }
+
+/*********************************************************/
+/* SetProfilePercentThresholdCommand: H/L access routine */
+/*   for the set-profile-percent-threshold command.      */
+/*********************************************************/
+void SetProfilePercentThresholdCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theValue;
+   double newThreshold;
+
+   if (! UDFFirstArgument(context,NUMBER_BITS,&theValue))
+     { return; }
+
+   newThreshold = CVCoerceToFloat(&theValue);
+
+   if ((newThreshold < 0.0) || (newThreshold > 100.0))
+     {
+      UDFInvalidArgumentMessage(context,"number in the range 0 to 100");
+      returnValue->floatValue = CreateFloat(theEnv,-1.0);
+     }
+   else
+     { returnValue->floatValue = CreateFloat(theEnv,SetProfilePercentThreshold(theEnv,newThreshold)); }
+  }
+
+/****************************************************/
+/* SetProfilePercentThreshold: C access routine for */
+/*   the set-profile-percent-threshold command.     */
+/****************************************************/
+double SetProfilePercentThreshold(
+  Environment *theEnv,
+  double value)
+  {
+   double oldPercentThreshhold;
+
+   if ((value < 0.0) || (value > 100.0))
+     { return(-1.0); }
+
+   oldPercentThreshhold = ProfileFunctionData(theEnv)->PercentThreshold;
+
+   ProfileFunctionData(theEnv)->PercentThreshold = value;
+
+   return(oldPercentThreshhold);
+  }
+
+/*********************************************************/
+/* GetProfilePercentThresholdCommand: H/L access routine */
+/*   for the get-profile-percent-threshold command.      */
+/*********************************************************/
+void GetProfilePercentThresholdCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->floatValue = CreateFloat(theEnv,ProfileFunctionData(theEnv)->PercentThreshold);
+  }
+
+/****************************************************/
+/* GetProfilePercentThreshold: C access routine for */
+/*   the get-profile-percent-threshold command.     */
+/****************************************************/
+double GetProfilePercentThreshold(
+  Environment *theEnv)
+  {
+   return(ProfileFunctionData(theEnv)->PercentThreshold);
+  }
+
+/**********************************************************/
+/* SetProfileOutputString: Sets the output string global. */
+/**********************************************************/
+const char *SetProfileOutputString(
+  Environment *theEnv,
+  const char *value)
+  {
+   const char *oldOutputString;
+
+   if (value == NULL)
+     { return(ProfileFunctionData(theEnv)->OutputString); }
+
+   oldOutputString = ProfileFunctionData(theEnv)->OutputString;
+
+   ProfileFunctionData(theEnv)->OutputString = value;
+
+   return(oldOutputString);
+  }
+
+#if (! RUN_TIME)
+/******************************************************************/
+/* ProfileClearFunction: Profiling clear routine for use with the */
+/*   clear command. Removes user data attached to user functions. */
+/******************************************************************/
+static void ProfileClearFunction(
+  Environment *theEnv,
+  void *context)
+  {
+   struct functionDefinition *theFunction;
+   int i;
+
+   for (theFunction = GetFunctionList(theEnv);
+        theFunction != NULL;
+        theFunction = theFunction->next)
+     {
+      theFunction->usrData =
+        DeleteUserData(theEnv,ProfileFunctionData(theEnv)->ProfileDataID,theFunction->usrData);
+     }
+
+   for (i = 0; i < MAXIMUM_PRIMITIVES; i++)
+     {
+      if (EvaluationData(theEnv)->PrimitivesArray[i] != NULL)
+        {
+         EvaluationData(theEnv)->PrimitivesArray[i]->usrData =
+           DeleteUserData(theEnv,ProfileFunctionData(theEnv)->ProfileDataID,EvaluationData(theEnv)->PrimitivesArray[i]->usrData);
+        }
+     }
+  }
+#endif
+
+#endif /* PROFILING_FUNCTIONS */
+
diff --git a/clips/proflfun.h b/clips/proflfun.h
new file mode 100755
index 000000000..6579fc76b
--- /dev/null
+++ b/clips/proflfun.h
@@ -0,0 +1,118 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*      CONSTRUCT PROFILING FUNCTIONS HEADER FILE      */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Modified OutputProfileInfo to allow a before   */
+/*            and after prefix so that a string buffer does  */
+/*            not need to be created to contain the entire   */
+/*            prefix. This allows a buffer overflow problem  */
+/*            to be corrected. DR0857.                       */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added pragmas to remove compilation warnings.  */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_TBC).         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_proflfun
+
+#pragma once
+
+#define _H_proflfun
+
+#include "userdata.h"
+
+struct constructProfileInfo
+  {
+   struct userData usrData;
+   long numberOfEntries;
+   unsigned int childCall : 1;
+   double startTime;
+   double totalSelfTime;
+   double totalWithChildrenTime;
+  };
+
+struct profileFrameInfo
+  {
+   unsigned int parentCall : 1;
+   unsigned int profileOnExit : 1;
+   double parentStartTime;
+   struct constructProfileInfo *oldProfileFrame;
+  };
+
+#define PROFLFUN_DATA 15
+
+struct profileFunctionData
+  {
+   double ProfileStartTime;
+   double ProfileEndTime;
+   double ProfileTotalTime;
+   int LastProfileInfo;
+   double PercentThreshold;
+   struct userDataRecord ProfileDataInfo;
+   unsigned char ProfileDataID;
+   bool ProfileUserFunctions;
+   bool ProfileConstructs;
+   struct constructProfileInfo *ActiveProfileFrame;
+   const char *OutputString;
+  };
+
+#define ProfileFunctionData(theEnv) ((struct profileFunctionData *) GetEnvironmentData(theEnv,PROFLFUN_DATA))
+
+   void                           ConstructProfilingFunctionDefinitions(Environment *);
+   void                           ProfileCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ProfileInfoCommand(Environment *,UDFContext *,UDFValue *);
+   void                           StartProfile(Environment *,struct profileFrameInfo *,
+                                               struct userData **,bool);
+   void                           EndProfile(Environment *,struct profileFrameInfo *);
+   void                           ProfileResetCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ResetProfileInfo(struct constructProfileInfo *);
+
+   void                           SetProfilePercentThresholdCommand(Environment *,UDFContext *,UDFValue *);
+   double                         SetProfilePercentThreshold(Environment *,double);
+   void                           GetProfilePercentThresholdCommand(Environment *,UDFContext *,UDFValue *);
+   double                         GetProfilePercentThreshold(Environment *);
+   bool                           Profile(Environment *,const char *);
+   void                           DeleteProfileData(Environment *,void *);
+   void                          *CreateProfileData(Environment *);
+   const char                    *SetProfileOutputString(Environment *,const char *);
+
+#endif /* _H_proflfun */
+
+
diff --git a/clips/reorder.c b/clips/reorder.c
new file mode 100755
index 000000000..d6f70f7a6
--- /dev/null
+++ b/clips/reorder.c
@@ -0,0 +1,2082 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  06/22/18             */
+   /*                                                     */
+   /*                    REORDER MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines necessary for converting the   */
+/*   the LHS of a rule into an appropriate form suitable for */
+/*   the KB Rete topology. This includes transforming the    */
+/*   LHS so there is at most one "or" CE (and this is the    */
+/*   first CE of the LHS if it is used), adding initial      */
+/*   patterns to the LHS (if no LHS is specified or a "test" */
+/*   or "not" CE is the first pattern within an "and" CE),   */
+/*   removing redundant CEs, and determining appropriate     */
+/*   information on nesting for implementing joins from the  */
+/*   right.                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Support for join network changes.              */
+/*                                                           */
+/*            Changes to the algorithm for processing        */
+/*            not/and CE groups.                             */
+/*                                                           */
+/*            Additional optimizations for combining         */
+/*            conditional elements.                          */
+/*                                                           */
+/*            Added support for hashed alpha memories.       */
+/*                                                           */
+/*      6.31: Fixed crash bug that occurred from             */
+/*            AssignPatternIndices incorrectly               */
+/*            assigning the wrong join depth to              */
+/*            multiply nested nand  groups.                  */
+/*                                                           */
+/*            Removed the marked flag used for not/and       */
+/*            unification.                                   */
+/*                                                           */
+/*            Fix for incorrect join depth computed by       */
+/*            AssignPatternIndices for not/and groups.       */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed initial-fact support.                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if (! RUN_TIME) && (! BLOAD_ONLY) && DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "pattern.h"
+#include "prntutil.h"
+#include "router.h"
+#include "rulelhs.h"
+
+#if DEVELOPER && DEBUGGING_FUNCTIONS
+#include "watch.h"
+#include "rulepsr.h"
+#endif
+
+#include "reorder.h"
+
+struct variableReference
+   {
+    CLIPSLexeme *name;
+    int depth;
+    struct variableReference *next;
+   };
+
+struct groupReference
+   {
+    struct lhsParseNode *theGroup;
+    int depth;
+    struct groupReference *next;
+   };
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static struct lhsParseNode    *ReverseAndOr(Environment *,struct lhsParseNode *,struct lhsParseNode *,int);
+   static struct lhsParseNode    *PerformReorder1(Environment *,struct lhsParseNode *,bool *,int);
+   static struct lhsParseNode    *PerformReorder2(Environment *,struct lhsParseNode *,bool *,int);
+   static struct lhsParseNode    *CompressCEs(Environment *,struct lhsParseNode *,bool *,int);
+   static void                    IncrementNandDepth(Environment *,struct lhsParseNode *,bool);
+   static struct lhsParseNode    *CreateInitialPattern(Environment *);
+   static struct lhsParseNode    *ReorderDriver(Environment *,struct lhsParseNode *,bool *,int,int);
+   static struct lhsParseNode    *AddRemainingInitialPatterns(Environment *,struct lhsParseNode *);
+   static struct lhsParseNode    *AssignPatternIndices(struct lhsParseNode *,short,int,unsigned short);
+   static void                    PropagateIndexSlotPatternValues(struct lhsParseNode *,short,unsigned short,
+                                                                  CLIPSLexeme *,unsigned short);
+   static void                    PropagateJoinDepth(struct lhsParseNode *,unsigned short);
+   static void                    PropagateNandDepth(struct lhsParseNode *,int,int);
+   static void                    MarkExistsNands(struct lhsParseNode *);
+   static unsigned short          PropagateWhichCE(struct lhsParseNode *,unsigned short);
+   /*
+   static void                    PrintNodes(void *,const char *,struct lhsParseNode *);
+   */
+
+/********************************************/
+/* ReorderPatterns: Reorders a group of CEs */
+/*   to accommodate KB Rete topology.       */
+/********************************************/
+struct lhsParseNode *ReorderPatterns(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS,
+  bool *anyChange)
+  {
+   struct lhsParseNode *newLHS, *tempLHS, *lastLHS;
+
+   /*=============================================*/
+   /* If the LHS of the rule was left unspecified */
+   /* (e.g., (defrule x => ...)), then nothing    */
+   /* more needs to be done.                      */
+   /*=============================================*/
+
+   if (theLHS == NULL) return(theLHS);
+
+   /*===========================================================*/
+   /* The LHS of a rule is enclosed within an implied "and" CE. */
+   /*===========================================================*/
+
+   newLHS = GetLHSParseNode(theEnv);
+   newLHS->pnType = AND_CE_NODE;
+   newLHS->right = theLHS;
+
+   /*==============================================================*/
+   /* Mark the nodes to indicate which CE they're associated with. */
+   /*==============================================================*/
+
+   PropagateWhichCE(newLHS,0);
+
+   /*=======================================================*/
+   /* Reorder the patterns to support the KB Rete topology. */
+   /*=======================================================*/
+
+   newLHS = ReorderDriver(theEnv,newLHS,anyChange,1,1);
+   newLHS = ReorderDriver(theEnv,newLHS,anyChange,2,1);
+
+   /*===========================================*/
+   /* The top level and CE may have disappeared */
+   /* as a result of pattern compression.       */
+   /*===========================================*/
+
+   if (newLHS->pnType == OR_CE_NODE)
+     {
+      for (tempLHS = newLHS->right, lastLHS = NULL;
+           tempLHS != NULL;
+           lastLHS = tempLHS, tempLHS = tempLHS->bottom)
+        {
+         if (tempLHS->pnType != AND_CE_NODE)
+           {
+            theLHS = GetLHSParseNode(theEnv);
+            theLHS->pnType = AND_CE_NODE;
+            theLHS->right = tempLHS;
+            theLHS->bottom = tempLHS->bottom;
+            tempLHS->bottom = NULL;
+            if (lastLHS == NULL)
+              { newLHS->right = theLHS; }
+            else
+              { lastLHS->bottom = theLHS; }
+            tempLHS = theLHS;
+           }
+        }
+     }
+   else if (newLHS->pnType != AND_CE_NODE)
+     {
+      theLHS = newLHS;
+      newLHS = GetLHSParseNode(theEnv);
+      newLHS->pnType = AND_CE_NODE;
+      newLHS->right = theLHS;
+     }
+
+   /*================================================*/
+   /* Mark exist not/and groups within the patterns. */
+   /*================================================*/
+
+   if (newLHS->pnType == OR_CE_NODE)
+     {
+      for (theLHS = newLHS->right;
+           theLHS != NULL;
+           theLHS = theLHS->bottom)
+        { MarkExistsNands(theLHS->right); }
+     }
+   else
+     { MarkExistsNands(newLHS->right); }
+
+   /*=====================================================*/
+   /* Add initial patterns where needed (such as before a */
+   /* "test" CE or "not" CE which is the first CE within  */
+   /* an "and" CE).                                       */
+   /*=====================================================*/
+
+   AddInitialPatterns(theEnv,newLHS);
+
+   /*===========================================================*/
+   /* Number the user specified patterns. Patterns added while  */
+   /* analyzing the rule are not numbered so that there is no   */
+   /* confusion when an error message refers to a CE. Also      */
+   /* propagate field and slot values throughout each pattern.  */
+   /*===========================================================*/
+
+   if (newLHS->pnType == OR_CE_NODE) theLHS = newLHS->right;
+   else theLHS = newLHS;
+
+   for (;
+        theLHS != NULL;
+        theLHS = theLHS->bottom)
+     { AssignPatternIndices(theLHS->right,1,1,0); }
+
+   /*===========================*/
+   /* Return the processed LHS. */
+   /*===========================*/
+
+   return(newLHS);
+  }
+
+/******************************************/
+/* ReorderDriver: Reorders a group of CEs */
+/*   to accommodate KB Rete topology.     */
+/******************************************/
+static struct lhsParseNode *ReorderDriver(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS,
+  bool *anyChange,
+  int pass,
+  int depth)
+  {
+   struct lhsParseNode *argPtr;
+   struct lhsParseNode *before, *save;
+   bool change, newChange;
+   *anyChange = false;
+
+   /*===================================*/
+   /* Continue processing the LHS until */
+   /* no more changes have been made.   */
+   /*===================================*/
+
+   change = true;
+   while (change)
+     {
+      /*==================================*/
+      /* No change yet on this iteration. */
+      /*==================================*/
+
+      change = false;
+
+      /*=======================================*/
+      /* Reorder the current level of the LHS. */
+      /*=======================================*/
+
+      if ((theLHS->pnType == AND_CE_NODE) ||
+          (theLHS->pnType == NOT_CE_NODE) ||
+          (theLHS->pnType == OR_CE_NODE))
+        {
+         if (pass == 1) theLHS = PerformReorder1(theEnv,theLHS,&newChange,depth);
+         else theLHS = PerformReorder2(theEnv,theLHS,&newChange,depth);
+
+         if (newChange)
+           {
+            *anyChange = true;
+            change = true;
+           }
+
+         theLHS = CompressCEs(theEnv,theLHS,&newChange,depth);
+
+         if (newChange)
+           {
+            *anyChange = true;
+            change = true;
+           }
+        }
+
+      /*=====================================================*/
+      /* Recursively reorder CEs at lower levels in the LHS. */
+      /*=====================================================*/
+
+      before = NULL;
+      argPtr = theLHS->right;
+
+      while (argPtr != NULL)
+        {
+         /*==================================*/
+         /* Remember the next CE to reorder. */
+         /*==================================*/
+
+         save = argPtr->bottom;
+
+         /*============================================*/
+         /* Reorder the current CE at the lower level. */
+         /*============================================*/
+
+         if ((argPtr->pnType == AND_CE_NODE) ||
+             (argPtr->pnType == NOT_CE_NODE) ||
+             (argPtr->pnType == OR_CE_NODE))
+           {
+            if (before == NULL)
+              {
+               argPtr->bottom = NULL;
+               theLHS->right = ReorderDriver(theEnv,argPtr,&newChange,pass,depth+1);
+               theLHS->right->bottom = save;
+               before = theLHS->right;
+              }
+            else
+              {
+               argPtr->bottom = NULL;
+               before->bottom = ReorderDriver(theEnv,argPtr,&newChange,pass,depth+1);
+               before->bottom->bottom = save;
+               before = before->bottom;
+              }
+
+            if (newChange)
+              {
+               *anyChange = true;
+               change = true;
+              }
+           }
+         else
+           { before = argPtr; }
+
+         /*====================================*/
+         /* Move on to the next CE to reorder. */
+         /*====================================*/
+
+         argPtr = save;
+        }
+     }
+
+   /*===========================*/
+   /* Return the reordered LHS. */
+   /*===========================*/
+
+   return(theLHS);
+  }
+
+/********************/
+/* MarkExistsNands: */
+/********************/
+static void MarkExistsNands(
+  struct lhsParseNode *theLHS)
+  {
+   int currentDepth = 1;
+   struct lhsParseNode *tmpLHS;
+
+   while (theLHS != NULL)
+     {
+      if (IsExistsSubjoin(theLHS,currentDepth))
+        {
+         theLHS->existsNand = true;
+
+         for (tmpLHS = theLHS;
+              tmpLHS != NULL;
+              tmpLHS = tmpLHS->bottom)
+           {
+            tmpLHS->beginNandDepth--;
+            if (tmpLHS->endNandDepth <= currentDepth)
+              { break; }
+            else
+              { tmpLHS->endNandDepth--; }
+           }
+        }
+
+      currentDepth = theLHS->endNandDepth;
+      theLHS = theLHS->bottom;
+     }
+  }
+
+/****************************************************************/
+/* AddInitialPatterns: Add initial patterns to CEs where needed */
+/*   (such as before a "test" CE or "not" CE which is the first */
+/*   CE within an "and" CE).                                    */
+/****************************************************************/
+void AddInitialPatterns(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS)
+  {
+   struct lhsParseNode *thePattern;
+
+   /*====================================================*/
+   /* If there are multiple disjuncts for the rule, then */
+   /* add initial patterns to each disjunct separately.  */
+   /*====================================================*/
+
+   if (theLHS->pnType == OR_CE_NODE)
+     {
+      for (thePattern = theLHS->right;
+           thePattern != NULL;
+           thePattern = thePattern->bottom)
+        { AddInitialPatterns(theEnv,thePattern); }
+
+      return;
+     }
+
+   /*================================*/
+   /* Handle the remaining patterns. */
+   /*================================*/
+
+   theLHS->right = AddRemainingInitialPatterns(theEnv,theLHS->right);
+  }
+
+/***********************************************************/
+/* PerformReorder1: Reorders a group of CEs to accommodate */
+/*   KB Rete topology. The first pass of this function     */
+/*   transforms or CEs into equivalent forms.              */
+/***********************************************************/
+static struct lhsParseNode *PerformReorder1(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS,
+  bool *newChange,
+  int depth)
+  {
+   struct lhsParseNode *argPtr, *lastArg, *nextArg;
+   struct lhsParseNode *tempArg, *newNode;
+   int count;
+   bool change;
+
+   /*======================================================*/
+   /* Loop through the CEs as long as changes can be made. */
+   /*======================================================*/
+
+   change = true;
+   *newChange = false;
+
+   while (change)
+     {
+      change = false;
+      count = 1;
+      lastArg = NULL;
+
+      for (argPtr = theLHS->right;
+           argPtr != NULL;)
+        {
+         /*=============================================================*/
+         /* Convert and/or CE combinations into or/and CE combinations. */
+         /*=============================================================*/
+
+         if ((theLHS->pnType == AND_CE_NODE) && (argPtr->pnType == OR_CE_NODE))
+           {
+            theLHS = ReverseAndOr(theEnv,theLHS,argPtr->right,count);
+
+            change = true;
+            *newChange = true;
+            break;
+           }
+
+         /*==============================================================*/
+         /* Convert not/or CE combinations into and/not CE combinations. */
+         /*==============================================================*/
+
+         else if ((theLHS->pnType == NOT_CE_NODE) && (argPtr->pnType == OR_CE_NODE))
+           {
+            change = true;
+            *newChange = true;
+
+            tempArg = argPtr->right;
+
+            argPtr->right = NULL;
+            argPtr->bottom = NULL;
+            ReturnLHSParseNodes(theEnv,argPtr);
+            theLHS->pnType = AND_CE_NODE;
+            theLHS->right = tempArg;
+
+            while (tempArg != NULL)
+              {
+               newNode = GetLHSParseNode(theEnv);
+               CopyLHSParseNode(theEnv,newNode,tempArg,false);
+               newNode->right = tempArg->right;
+               newNode->bottom = NULL;
+
+               tempArg->pnType = NOT_CE_NODE;
+               tempArg->negated = false;
+               tempArg->exists = false;
+               tempArg->existsNand = false;
+               tempArg->logical = false;
+               tempArg->value = NULL;
+               tempArg->expression = NULL;
+               tempArg->secondaryExpression = NULL;
+               tempArg->right = newNode;
+
+               tempArg = tempArg->bottom;
+              }
+
+            break;
+           }
+
+         /*=====================================*/
+         /* Remove duplication of or CEs within */
+         /* or CEs and and CEs within and CEs.  */
+         /*=====================================*/
+
+         else if (((theLHS->pnType == OR_CE_NODE) && (argPtr->pnType == OR_CE_NODE)) ||
+                  ((theLHS->pnType == AND_CE_NODE) && (argPtr->pnType == AND_CE_NODE)))
+           {
+            if (argPtr->logical) theLHS->logical = true;
+
+            change = true;
+            *newChange = true;
+            tempArg = argPtr->right;
+            nextArg = argPtr->bottom;
+            argPtr->right = NULL;
+            argPtr->bottom = NULL;
+            ReturnLHSParseNodes(theEnv,argPtr);
+
+            if (lastArg == NULL)
+              { theLHS->right = tempArg; }
+            else
+              { lastArg->bottom = tempArg; }
+
+            argPtr = tempArg;
+            while (tempArg->bottom != NULL) tempArg = tempArg->bottom;
+            tempArg->bottom = nextArg;
+           }
+
+         /*===================================================*/
+         /* If no changes are needed, move on to the next CE. */
+         /*===================================================*/
+
+         else
+           {
+            count++;
+            lastArg = argPtr;
+            argPtr = argPtr->bottom;
+           }
+        }
+     }
+
+   /*===========================*/
+   /* Return the reordered LHS. */
+   /*===========================*/
+
+   return(theLHS);
+  }
+
+/***********************************************************/
+/* PerformReorder2: Reorders a group of CEs to accommodate */
+/*   KB Rete topology. The second pass performs all other  */
+/*   transformations not associated with the or CE.        */
+/***********************************************************/
+static struct lhsParseNode *PerformReorder2(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS,
+  bool *newChange,
+  int depth)
+  {
+   struct lhsParseNode *argPtr;
+   bool change;
+
+   /*======================================================*/
+   /* Loop through the CEs as long as changes can be made. */
+   /*======================================================*/
+
+   change = true;
+   *newChange = false;
+
+   while (change)
+     {
+      change = false;
+
+      for (argPtr = theLHS->right;
+           argPtr != NULL;)
+        {
+         /*=======================================================*/
+         /* A sequence of three not CEs grouped within each other */
+         /* can be replaced with a single not CE. For example,    */
+         /* (not (not (not (a)))) can be replaced with (not (a)). */
+         /*=======================================================*/
+
+         if ((theLHS->pnType == NOT_CE_NODE) &&
+             (argPtr->pnType == NOT_CE_NODE) &&
+             (argPtr->right != NULL) &&
+             (argPtr->right->pnType == NOT_CE_NODE))
+           {
+            change = true;
+            *newChange = true;
+
+            theLHS->right = argPtr->right->right;
+
+            argPtr->right->right = NULL;
+            ReturnLHSParseNodes(theEnv,argPtr);
+
+            break;
+           }
+
+         /*==========================================*/
+         /* Replace two not CEs containing a pattern */
+         /* CE with an exists pattern CE.            */
+         /*==========================================*/
+
+         else if ((theLHS->pnType == NOT_CE_NODE) &&
+                  (argPtr->pnType == NOT_CE_NODE) &&
+                  (argPtr->right != NULL) &&
+                  (argPtr->right->pnType == PATTERN_CE_NODE))
+           {
+            change = true;
+            *newChange = true;
+
+            CopyLHSParseNode(theEnv,theLHS,argPtr->right,false);
+
+            theLHS->negated = true;
+            theLHS->exists = true;
+            theLHS->existsNand = false;
+            theLHS->right = argPtr->right->right;
+
+            argPtr->right->networkTest = NULL;
+            argPtr->right->externalNetworkTest = NULL;
+            argPtr->right->secondaryNetworkTest = NULL;
+            argPtr->right->externalRightHash = NULL;
+            argPtr->right->externalLeftHash = NULL;
+            argPtr->right->leftHash = NULL;
+            argPtr->right->rightHash = NULL;
+            argPtr->right->betaHash = NULL;
+            argPtr->right->expression = NULL;
+            argPtr->right->secondaryExpression = NULL;
+            argPtr->right->userData = NULL;
+            argPtr->right->right = NULL;
+            argPtr->right->bottom = NULL;
+            ReturnLHSParseNodes(theEnv,argPtr);
+            break;
+           }
+
+         /*======================================*/
+         /* Replace not CEs containing a pattern */
+         /* CE with a negated pattern CE.        */
+         /*======================================*/
+
+         else if ((theLHS->pnType == NOT_CE_NODE) && (argPtr->pnType == PATTERN_CE_NODE))
+           {
+            change = true;
+            *newChange = true;
+
+            CopyLHSParseNode(theEnv,theLHS,argPtr,false);
+
+            theLHS->negated = true;
+            theLHS->exists = false;
+            theLHS->existsNand = false;
+            theLHS->right = argPtr->right;
+
+            argPtr->networkTest = NULL;
+            argPtr->externalNetworkTest = NULL;
+            argPtr->secondaryNetworkTest = NULL;
+            argPtr->externalRightHash = NULL;
+            argPtr->externalLeftHash = NULL;
+            argPtr->constantSelector = NULL;
+            argPtr->constantValue = NULL;
+            argPtr->leftHash = NULL;
+            argPtr->rightHash = NULL;
+            argPtr->betaHash = NULL;
+            argPtr->expression = NULL;
+            argPtr->secondaryExpression = NULL;
+            argPtr->userData = NULL;
+            argPtr->right = NULL;
+            argPtr->bottom = NULL;
+            ReturnLHSParseNodes(theEnv,argPtr);
+            break;
+           }
+
+         /*============================================================*/
+         /* Replace "and" and "not" CEs contained within a not CE with */
+         /* just the and CE, but increment the nand depths of the      */
+         /* pattern contained within.                                  */
+         /*============================================================*/
+
+         else if ((theLHS->pnType == NOT_CE_NODE) &&
+                  ((argPtr->pnType == AND_CE_NODE) ||  (argPtr->pnType == NOT_CE_NODE)))
+           {
+            change = true;
+            *newChange = true;
+
+            theLHS->pnType = argPtr->pnType;
+
+            theLHS->negated = argPtr->negated;
+            theLHS->exists = argPtr->exists;
+            theLHS->existsNand = argPtr->existsNand;
+            theLHS->value = argPtr->value;
+            theLHS->logical = argPtr->logical;
+            theLHS->right = argPtr->right;
+            argPtr->right = NULL;
+            argPtr->bottom = NULL;
+            ReturnLHSParseNodes(theEnv,argPtr);
+
+            IncrementNandDepth(theEnv,theLHS->right,true);
+            break;
+           }
+
+         /*===================================================*/
+         /* If no changes are needed, move on to the next CE. */
+         /*===================================================*/
+
+         else
+           {
+            argPtr = argPtr->bottom;
+           }
+        }
+     }
+
+   /*===========================*/
+   /* Return the reordered LHS. */
+   /*===========================*/
+
+   return(theLHS);
+  }
+
+/**************************************************/
+/* ReverseAndOr: Switches and/or CEs into         */
+/*   equivalent or/and CEs. For example:          */
+/*                                                */
+/*     (and (or a b) (or c d))                    */
+/*                                                */
+/*   would be converted to                        */
+/*                                                */
+/*     (or (and a (or c d)) (and b (or c d))),    */
+/*                                                */
+/*   if the "or" CE being expanded was (or a b).  */
+/**************************************************/
+static struct lhsParseNode *ReverseAndOr(
+  Environment *theEnv,
+  struct lhsParseNode *listOfCEs,
+  struct lhsParseNode *orCE,
+  int orPosition)
+  {
+   int count;
+   struct lhsParseNode *listOfExpandedOrCEs = NULL;
+   struct lhsParseNode *lastExpandedOrCE = NULL;
+   struct lhsParseNode *copyOfCEs, *replaceCE;
+
+   /*========================================================*/
+   /* Loop through each of the CEs contained within the "or" */
+   /* CE that is being expanded into the enclosing "and" CE. */
+   /*========================================================*/
+
+   while (orCE != NULL)
+     {
+      /*===============================*/
+      /* Make a copy of the and/or CE. */
+      /*===============================*/
+
+      copyOfCEs = CopyLHSParseNodes(theEnv,listOfCEs);
+
+      /*====================================================*/
+      /* Get a pointer to the "or" CE being expanded in the */
+      /* copy just made based on the position of the "or"   */
+      /* CE in the original and/or CE (e.g., 1st, 2nd).     */
+      /*====================================================*/
+
+      for (count = 1, replaceCE = copyOfCEs->right;
+           count != orPosition;
+           count++, replaceCE = replaceCE->bottom)
+        { /* Do Nothing*/ }
+
+      /*===================================================*/
+      /* Delete the contents of the "or" CE being expanded */
+      /* in the copy of the and/or CE. From the example    */
+      /* above, (and (or a b) (or c d)) would be replaced  */
+      /* with (and (or) (or c d)). Note that the "or" CE   */
+      /* is still left as a placeholder.                   */
+      /*===================================================*/
+
+      ReturnLHSParseNodes(theEnv,replaceCE->right);
+
+      /*======================================================*/
+      /* Copy the current CE being examined in the "or" CE to */
+      /* the placeholder left in the and/or CE. From the      */
+      /* example above, (and (or) (or c d)) would be replaced */
+      /* with (and a (or c d)) if the "a" pattern from the    */
+      /* "or" CE was being examined or (and b (or c d)) if    */
+      /* the "b" pattern from the "or" CE was being examined. */
+      /*======================================================*/
+
+      CopyLHSParseNode(theEnv,replaceCE,orCE,true);
+      replaceCE->right = CopyLHSParseNodes(theEnv,orCE->right);
+
+      /*====================================*/
+      /* Add the newly expanded "and" CE to */
+      /* the list of CEs already expanded.  */
+      /*====================================*/
+
+      if (lastExpandedOrCE == NULL)
+        {
+         listOfExpandedOrCEs = copyOfCEs;
+         copyOfCEs->bottom = NULL;
+         lastExpandedOrCE = copyOfCEs;
+        }
+      else
+        {
+         lastExpandedOrCE->bottom = copyOfCEs;
+         copyOfCEs->bottom = NULL;
+         lastExpandedOrCE = copyOfCEs;
+        }
+
+      /*=======================================================*/
+      /* Move on to the next CE in the "or" CE being expanded. */
+      /*=======================================================*/
+
+      orCE = orCE->bottom;
+     }
+
+   /*=====================================================*/
+   /* Release the original and/or CE list to free memory. */
+   /*=====================================================*/
+
+   ReturnLHSParseNodes(theEnv,listOfCEs);
+
+   /*================================================*/
+   /* Wrap an or CE around the list of expanded CEs. */
+   /*================================================*/
+
+   copyOfCEs = GetLHSParseNode(theEnv);
+   copyOfCEs->pnType = OR_CE_NODE;
+   copyOfCEs->right = listOfExpandedOrCEs;
+
+   /*================================*/
+   /* Return the newly expanded CEs. */
+   /*================================*/
+
+   return(copyOfCEs);
+  }
+
+/****************/
+/* CompressCEs: */
+/****************/
+static struct lhsParseNode *CompressCEs(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS,
+  bool *newChange,
+  int depth)
+  {
+   struct lhsParseNode *argPtr, *lastArg, *nextArg;
+   struct lhsParseNode *tempArg;
+   bool change;
+   struct expr *e1, *e2;
+
+   /*======================================================*/
+   /* Loop through the CEs as long as changes can be made. */
+   /*======================================================*/
+
+   change = true;
+   *newChange = false;
+
+   while (change)
+     {
+      change = false;
+      lastArg = NULL;
+
+      for (argPtr = theLHS->right;
+           argPtr != NULL;)
+        {
+         /*=====================================*/
+         /* Remove duplication of or CEs within */
+         /* or CEs and and CEs within and CEs.  */
+         /*=====================================*/
+
+         if (((theLHS->pnType == OR_CE_NODE) && (argPtr->pnType == OR_CE_NODE)) ||
+             ((theLHS->pnType == AND_CE_NODE) && (argPtr->pnType == AND_CE_NODE)))
+           {
+            if (argPtr->logical) theLHS->logical = true;
+
+            change = true;
+            *newChange = true;
+            tempArg = argPtr->right;
+            nextArg = argPtr->bottom;
+            argPtr->right = NULL;
+            argPtr->bottom = NULL;
+            ReturnLHSParseNodes(theEnv,argPtr);
+
+            if (lastArg == NULL)
+              { theLHS->right = tempArg; }
+            else
+              { lastArg->bottom = tempArg; }
+
+            argPtr = tempArg;
+            while (tempArg->bottom != NULL) tempArg = tempArg->bottom;
+            tempArg->bottom = nextArg;
+           }
+
+         /*=======================================================*/
+         /* Replace not CEs containing a test CE with just a test */
+         /* CE with the original test CE condition negated.       */
+         /*=======================================================*/
+
+         else if ((theLHS->pnType == NOT_CE_NODE) && (argPtr->pnType == TEST_CE_NODE))
+           {
+            change = true;
+            *newChange = true;
+
+            tempArg = GetLHSParseNode(theEnv);
+            tempArg->pnType = FCALL_NODE;
+            tempArg->value = ExpressionData(theEnv)->PTR_NOT;
+            tempArg->bottom = argPtr->expression;
+            argPtr->expression = tempArg;
+
+            CopyLHSParseNode(theEnv,theLHS,argPtr,true);
+            ReturnLHSParseNodes(theEnv,argPtr);
+            theLHS->right = NULL;
+            break;
+           }
+
+         /*==============================*/
+         /* Two adjacent test CEs within */
+         /* an and CE can be combined.   */
+         /*==============================*/
+
+         else if ((theLHS->pnType == AND_CE_NODE) && (argPtr->pnType == TEST_CE_NODE) &&
+                  ((argPtr->bottom != NULL) ? argPtr->bottom->pnType == TEST_CE_NODE :
+                                              false) &&
+                   (argPtr->beginNandDepth == argPtr->endNandDepth) &&
+                   (argPtr->endNandDepth == argPtr->bottom->beginNandDepth))
+           {
+            change = true;
+            *newChange = true;
+
+            argPtr->expression = CombineLHSParseNodes(theEnv,argPtr->expression,argPtr->bottom->expression);
+            argPtr->bottom->expression = NULL;
+
+            tempArg = argPtr->bottom;
+            argPtr->bottom = tempArg->bottom;
+            tempArg->bottom = NULL;
+
+            ReturnLHSParseNodes(theEnv,tempArg);
+           }
+
+         /*========================================================*/
+         /* A test CE can be attached to the preceding pattern CE. */
+         /*========================================================*/
+
+         else if ((theLHS->pnType == AND_CE_NODE) && (argPtr->pnType == PATTERN_CE_NODE) &&
+                  ((argPtr->bottom != NULL) ? argPtr->bottom->pnType == TEST_CE_NODE :
+                                              false) &&
+                   (argPtr->negated == false) &&
+                   (argPtr->exists == false) &&
+                   (argPtr->beginNandDepth == argPtr->endNandDepth) &&
+                   (argPtr->endNandDepth == argPtr->bottom->beginNandDepth))
+           {
+            int endNandDepth;
+            change = true;
+            *newChange = true;
+
+            endNandDepth = argPtr->bottom->endNandDepth;
+
+            if (argPtr->negated || argPtr->exists)
+              {
+               e1 = LHSParseNodesToExpression(theEnv,argPtr->secondaryExpression);
+               e2 = LHSParseNodesToExpression(theEnv,argPtr->bottom->expression);
+               e1 = CombineExpressions(theEnv,e1,e2);
+               ReturnLHSParseNodes(theEnv,argPtr->secondaryExpression);
+               argPtr->secondaryExpression = ExpressionToLHSParseNodes(theEnv,e1);
+               ReturnExpression(theEnv,e1);
+              }
+            else
+              {
+               argPtr->expression = CombineLHSParseNodes(theEnv,argPtr->expression,argPtr->bottom->expression);
+               argPtr->bottom->expression = NULL;
+              }
+
+            if ((theLHS->right == argPtr) && ((argPtr->beginNandDepth - 1) == endNandDepth))
+              {
+               if (argPtr->negated)
+                 {
+                  argPtr->negated = false;
+                  argPtr->exists = true;
+                  e1 = LHSParseNodesToExpression(theEnv,argPtr->secondaryExpression);
+                  e1 = NegateExpression(theEnv,e1);
+                  ReturnLHSParseNodes(theEnv,argPtr->secondaryExpression);
+                  argPtr->secondaryExpression = ExpressionToLHSParseNodes(theEnv,e1);
+                  ReturnExpression(theEnv,e1);
+                 }
+               else if (argPtr->exists)
+                 {
+                  argPtr->negated = true;
+                  argPtr->exists = false;
+                  e1 = LHSParseNodesToExpression(theEnv,argPtr->secondaryExpression);
+                  e1 = NegateExpression(theEnv,e1);
+                  ReturnLHSParseNodes(theEnv,argPtr->secondaryExpression);
+                  argPtr->secondaryExpression = ExpressionToLHSParseNodes(theEnv,e1);
+                  ReturnExpression(theEnv,e1);
+                 }
+               else
+                 {
+                  argPtr->negated = true;
+                 }
+               PropagateNandDepth(argPtr,endNandDepth,endNandDepth);
+              }
+
+            /*========================================*/
+            /* Detach the test CE from its parent and */
+            /* dispose of the data structures.        */
+            /*========================================*/
+
+            tempArg = argPtr->bottom;
+            argPtr->bottom = tempArg->bottom;
+            tempArg->bottom = NULL;
+
+            ReturnLHSParseNodes(theEnv,tempArg);
+           }
+
+         /*=====================================*/
+         /* Replace and CEs containing a single */
+         /* test CE with just a test CE.        */
+         /*=====================================*/
+
+         else if ((theLHS->pnType == AND_CE_NODE) && (argPtr->pnType == TEST_CE_NODE) &&
+                  (theLHS->right == argPtr) && (argPtr->bottom == NULL))
+           {
+            change = true;
+            *newChange = true;
+
+            CopyLHSParseNode(theEnv,theLHS,argPtr,true);
+            theLHS->right = NULL;
+            ReturnLHSParseNodes(theEnv,argPtr);
+            break;
+           }
+
+         /*=======================================================*/
+         /* Replace and CEs containing a single pattern CE with   */
+         /* just a pattern CE if this is not the top most and CE. */
+         /*=======================================================*/
+
+         else if ((theLHS->pnType == AND_CE_NODE) && (argPtr->pnType == PATTERN_CE_NODE) &&
+                  (theLHS->right == argPtr) && (argPtr->bottom == NULL) && (depth > 1))
+           {
+            change = true;
+            *newChange = true;
+
+            CopyLHSParseNode(theEnv,theLHS,argPtr,false);
+
+            theLHS->right = argPtr->right;
+
+            argPtr->networkTest = NULL;
+            argPtr->externalNetworkTest = NULL;
+            argPtr->secondaryNetworkTest = NULL;
+            argPtr->externalRightHash = NULL;
+            argPtr->externalLeftHash = NULL;
+            argPtr->constantSelector = NULL;
+            argPtr->constantValue = NULL;
+            argPtr->leftHash = NULL;
+            argPtr->rightHash = NULL;
+            argPtr->betaHash = NULL;
+            argPtr->expression = NULL;
+            argPtr->secondaryExpression = NULL;
+            argPtr->userData = NULL;
+            argPtr->right = NULL;
+            argPtr->bottom = NULL;
+            ReturnLHSParseNodes(theEnv,argPtr);
+            break;
+           }
+
+         /*===================================================*/
+         /* If no changes are needed, move on to the next CE. */
+         /*===================================================*/
+
+         else
+           {
+            lastArg = argPtr;
+            argPtr = argPtr->bottom;
+           }
+        }
+     }
+
+   /*===========================*/
+   /* Return the reordered LHS. */
+   /*===========================*/
+
+   return(theLHS);
+  }
+
+/*********************************************************************/
+/* CopyLHSParseNodes: Copies a linked group of conditional elements. */
+/*********************************************************************/
+struct lhsParseNode *CopyLHSParseNodes(
+  Environment *theEnv,
+  struct lhsParseNode *listOfCEs)
+  {
+   struct lhsParseNode *newList;
+
+   if (listOfCEs == NULL)
+     { return NULL; }
+
+   newList = get_struct(theEnv,lhsParseNode);
+   CopyLHSParseNode(theEnv,newList,listOfCEs,true);
+
+   newList->right = CopyLHSParseNodes(theEnv,listOfCEs->right);
+   newList->bottom = CopyLHSParseNodes(theEnv,listOfCEs->bottom);
+
+   return(newList);
+  }
+
+/**********************************************************/
+/* CopyLHSParseNode: Copies a single conditional element. */
+/**********************************************************/
+void CopyLHSParseNode(
+  Environment *theEnv,
+  struct lhsParseNode *dest,
+  struct lhsParseNode *src,
+  bool duplicate)
+  {
+   dest->pnType = src->pnType;
+   dest->value = src->value;
+   dest->negated = src->negated;
+   dest->exists = src->exists;
+   dest->existsNand = src->existsNand;
+   dest->bindingVariable = src->bindingVariable;
+   dest->withinMultifieldSlot = src->withinMultifieldSlot;
+   dest->multifieldSlot = src->multifieldSlot;
+   dest->multiFieldsBefore = src->multiFieldsBefore;
+   dest->multiFieldsAfter = src->multiFieldsAfter;
+   dest->singleFieldsBefore = src->singleFieldsBefore;
+   dest->singleFieldsAfter = src->singleFieldsAfter;
+   dest->logical = src->logical;
+   dest->userCE = src->userCE;
+   //dest->marked = src->marked;
+   dest->whichCE = src->whichCE;
+   dest->referringNode = src->referringNode;
+   dest->patternType = src->patternType;
+   dest->pattern = src->pattern;
+   dest->index = src->index;
+   dest->slot = src->slot;
+   dest->slotNumber = src->slotNumber;
+   dest->beginNandDepth = src->beginNandDepth;
+   dest->endNandDepth = src->endNandDepth;
+   dest->joinDepth = src->joinDepth;
+
+   /*==========================================================*/
+   /* The duplicate flag controls whether pointers to existing */
+   /* data structures are used when copying some slots or if   */
+   /* new copies of the data structures are made.              */
+   /*==========================================================*/
+
+   if (duplicate)
+     {
+      dest->networkTest = CopyExpression(theEnv,src->networkTest);
+      dest->externalNetworkTest = CopyExpression(theEnv,src->externalNetworkTest);
+      dest->secondaryNetworkTest = CopyExpression(theEnv,src->secondaryNetworkTest);
+      dest->externalRightHash = CopyExpression(theEnv,src->externalRightHash);
+      dest->externalLeftHash = CopyExpression(theEnv,src->externalLeftHash);
+      dest->constantSelector = CopyExpression(theEnv,src->constantSelector);
+      dest->constantValue = CopyExpression(theEnv,src->constantValue);
+      dest->leftHash = CopyExpression(theEnv,src->leftHash);
+      dest->betaHash = CopyExpression(theEnv,src->betaHash);
+      dest->rightHash = CopyExpression(theEnv,src->rightHash);
+      if (src->userData == NULL)
+        { dest->userData = NULL; }
+      else if (src->patternType->copyUserDataFunction == NULL)
+        { dest->userData = src->userData; }
+      else
+        { dest->userData = (*src->patternType->copyUserDataFunction)(theEnv,src->userData); }
+      dest->expression = CopyLHSParseNodes(theEnv,src->expression);
+      dest->secondaryExpression = CopyLHSParseNodes(theEnv,src->secondaryExpression);
+      dest->constraints = CopyConstraintRecord(theEnv,src->constraints);
+      if (dest->constraints != NULL) dest->derivedConstraints = true;
+      else dest->derivedConstraints = false;
+     }
+   else
+     {
+      dest->networkTest = src->networkTest;
+      dest->externalNetworkTest = src->externalNetworkTest;
+      dest->secondaryNetworkTest = src->secondaryNetworkTest;
+      dest->externalRightHash = src->externalRightHash;
+      dest->externalLeftHash = src->externalLeftHash;
+      dest->constantSelector = src->constantSelector;
+      dest->constantValue = src->constantValue;
+      dest->leftHash = src->leftHash;
+      dest->betaHash = src->betaHash;
+      dest->rightHash = src->rightHash;
+      dest->userData = src->userData;
+      dest->expression = src->expression;
+      dest->secondaryExpression = src->secondaryExpression;
+      dest->derivedConstraints = false;
+      dest->constraints = src->constraints;
+     }
+  }
+
+/****************************************************/
+/* GetLHSParseNode: Creates an empty node structure */
+/*   used for building conditional elements.        */
+/****************************************************/
+struct lhsParseNode *GetLHSParseNode(
+  Environment *theEnv)
+  {
+   struct lhsParseNode *newNode;
+
+   newNode = get_struct(theEnv,lhsParseNode);
+   newNode->pnType = UNKNOWN_NODE;
+   newNode->value = NULL;
+   newNode->negated = false;
+   newNode->exists = false;
+   newNode->existsNand = false;
+   newNode->bindingVariable = false;
+   newNode->withinMultifieldSlot = false;
+   newNode->multifieldSlot = false;
+   newNode->multiFieldsBefore = 0;
+   newNode->multiFieldsAfter = 0;
+   newNode->singleFieldsBefore = 0;
+   newNode->singleFieldsAfter = 0;
+   newNode->logical = false;
+   newNode->derivedConstraints = false;
+   newNode->userCE = true;
+   //newNode->marked = false;
+   newNode->whichCE = 0;
+   newNode->constraints = NULL;
+   newNode->referringNode = NULL;
+   newNode->patternType = NULL;
+   newNode->pattern = -1;
+   newNode->index = NO_INDEX;
+   newNode->slot = NULL;
+   newNode->slotNumber = UNSPECIFIED_SLOT;
+   newNode->beginNandDepth = 1;
+   newNode->endNandDepth = 1;
+   newNode->joinDepth = 0;
+   newNode->userData = NULL;
+   newNode->networkTest = NULL;
+   newNode->externalNetworkTest = NULL;
+   newNode->secondaryNetworkTest = NULL;
+   newNode->externalRightHash = NULL;
+   newNode->externalLeftHash = NULL;
+   newNode->constantSelector = NULL;
+   newNode->constantValue = NULL;
+   newNode->leftHash = NULL;
+   newNode->betaHash = NULL;
+   newNode->rightHash = NULL;
+   newNode->expression = NULL;
+   newNode->secondaryExpression = NULL;
+   newNode->right = NULL;
+   newNode->bottom = NULL;
+
+   return(newNode);
+  }
+
+/********************************************************/
+/* ReturnLHSParseNodes:  Returns a multiply linked list */
+/*   of lhsParseNode structures to the memory manager.  */
+/********************************************************/
+void ReturnLHSParseNodes(
+  Environment *theEnv,
+  struct lhsParseNode *waste)
+  {
+   if (waste != NULL)
+     {
+      ReturnExpression(theEnv,waste->networkTest);
+      ReturnExpression(theEnv,waste->externalNetworkTest);
+      ReturnExpression(theEnv,waste->secondaryNetworkTest);
+      ReturnExpression(theEnv,waste->externalRightHash);
+      ReturnExpression(theEnv,waste->externalLeftHash);
+      ReturnExpression(theEnv,waste->constantSelector);
+      ReturnExpression(theEnv,waste->constantValue);
+      ReturnExpression(theEnv,waste->leftHash);
+      ReturnExpression(theEnv,waste->betaHash);
+      ReturnExpression(theEnv,waste->rightHash);
+      ReturnLHSParseNodes(theEnv,waste->right);
+      ReturnLHSParseNodes(theEnv,waste->bottom);
+      ReturnLHSParseNodes(theEnv,waste->expression);
+      ReturnLHSParseNodes(theEnv,waste->secondaryExpression);
+      if (waste->derivedConstraints) RemoveConstraint(theEnv,waste->constraints);
+      if ((waste->userData != NULL) &&
+          (waste->patternType->returnUserDataFunction != NULL))
+        { (*waste->patternType->returnUserDataFunction)(theEnv,waste->userData); }
+      rtn_struct(theEnv,lhsParseNode,waste);
+     }
+  }
+
+/********************************************************/
+/* ExpressionToLHSParseNodes: Copies an expression into */
+/*   the equivalent lhsParseNode data structures.       */
+/********************************************************/
+struct lhsParseNode *ExpressionToLHSParseNodes(
+  Environment *theEnv,
+  struct expr *expressionList)
+  {
+   struct lhsParseNode *newList, *theList;
+   struct functionDefinition *theFunction;
+   unsigned int i;
+   unsigned theRestriction2;
+
+   /*===========================================*/
+   /* A NULL expression requires no conversion. */
+   /*===========================================*/
+
+   if (expressionList == NULL) return NULL;
+
+   /*====================================*/
+   /* Recursively convert the expression */
+   /* to lhsParseNode data structures.   */
+   /*====================================*/
+
+   newList = GetLHSParseNode(theEnv);
+   newList->pnType = TypeToNodeType(expressionList->type);
+   newList->value = expressionList->value;
+   newList->right = ExpressionToLHSParseNodes(theEnv,expressionList->nextArg);
+   newList->bottom = ExpressionToLHSParseNodes(theEnv,expressionList->argList);
+
+   /*==================================================*/
+   /* If the expression is a function call, then store */
+   /* the constraint information for the functions     */
+   /* arguments in the lshParseNode data structures.   */
+   /*==================================================*/
+
+   if (newList->pnType != FCALL_NODE) return(newList);
+
+   theFunction = newList->functionValue;
+   for (theList = newList->bottom, i = 1;
+        theList != NULL;
+        theList = theList->right, i++)
+     {
+      if (theList->pnType == SF_VARIABLE_NODE)
+        {
+         theRestriction2 = GetNthRestriction(theEnv,theFunction,i);
+         theList->constraints = ArgumentTypeToConstraintRecord(theEnv,theRestriction2);
+         theList->derivedConstraints = true;
+        }
+     }
+
+   /*==================================*/
+   /* Return the converted expression. */
+   /*==================================*/
+
+   return(newList);
+  }
+
+/******************************************************************/
+/* LHSParseNodesToExpression: Copies lhsParseNode data structures */
+/*   into the equivalent expression data structures.              */
+/******************************************************************/
+struct expr *LHSParseNodesToExpression(
+  Environment *theEnv,
+  struct lhsParseNode *nodeList)
+  {
+   struct expr *newList;
+
+   if (nodeList == NULL)
+     { return NULL; }
+
+   newList = get_struct(theEnv,expr);
+   newList->type = NodeTypeToType(nodeList);
+   newList->value = nodeList->value;
+   newList->nextArg = LHSParseNodesToExpression(theEnv,nodeList->right);
+   newList->argList = LHSParseNodesToExpression(theEnv,nodeList->bottom);
+
+   return(newList);
+  }
+
+/******************************************/
+/* ConstantNode: Returns true if the node */
+/*   is a constant, otherwise false.      */
+/******************************************/
+bool ConstantNode(
+  struct lhsParseNode *theNode)
+  {
+   switch (theNode->pnType)
+     {
+      case SYMBOL_NODE:
+      case STRING_NODE:
+      case INTEGER_NODE:
+      case FLOAT_NODE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_NODE:
+#endif
+        return true;
+        
+      default:
+        return false;
+     }
+
+   return false;
+  }
+
+/*******************/
+/* NodeTypeToType: */
+/*******************/
+unsigned short NodeTypeToType(
+  struct lhsParseNode *theNode)
+  {
+   switch (theNode->pnType)
+     {
+      case FLOAT_NODE:
+        return FLOAT_TYPE;
+      case INTEGER_NODE:
+        return INTEGER_TYPE;
+      case SYMBOL_NODE:
+        return SYMBOL_TYPE;
+      case STRING_NODE:
+        return STRING_TYPE;
+      case INSTANCE_NAME_NODE:
+        return INSTANCE_NAME_TYPE;
+      case SF_VARIABLE_NODE:
+        return SF_VARIABLE;
+      case MF_VARIABLE_NODE:
+        return MF_VARIABLE;
+      case GBL_VARIABLE_NODE:
+        return GBL_VARIABLE;
+      case FCALL_NODE:
+        return FCALL;
+      case PCALL_NODE:
+        return PCALL;
+      case GCALL_NODE:
+        return GCALL;
+      case FACT_STORE_MULTIFIELD_NODE:
+        return FACT_STORE_MULTIFIELD;
+      case DEFTEMPLATE_PTR_NODE:
+        return DEFTEMPLATE_PTR;
+      case DEFCLASS_PTR_NODE:
+        return DEFCLASS_PTR;
+
+      default:
+        return VOID_TYPE;
+     }
+  }
+
+/*******************/
+/* TypeToNodeType: */
+/*******************/
+ParseNodeType TypeToNodeType(
+  unsigned short theType)
+  {
+   switch (theType)
+     {
+      case FLOAT_TYPE:
+        return FLOAT_NODE;
+      case INTEGER_TYPE:
+        return INTEGER_NODE;
+      case SYMBOL_TYPE:
+        return SYMBOL_NODE;
+      case STRING_TYPE:
+        return STRING_NODE;
+      case INSTANCE_NAME_TYPE:
+        return INSTANCE_NAME_NODE;
+      case SF_VARIABLE:
+        return SF_VARIABLE_NODE;
+      case MF_VARIABLE:
+        return MF_VARIABLE_NODE;
+      case GBL_VARIABLE:
+        return GBL_VARIABLE_NODE;
+      case FCALL:
+        return FCALL_NODE;
+      case PCALL:
+        return PCALL_NODE;
+      case GCALL:
+        return GCALL_NODE;
+      case FACT_STORE_MULTIFIELD:
+        return FACT_STORE_MULTIFIELD_NODE;
+      case DEFTEMPLATE_PTR:
+        return DEFTEMPLATE_PTR_NODE;
+      case DEFCLASS_PTR:
+        return DEFCLASS_PTR_NODE;
+
+      default:
+        return UNKNOWN_NODE;
+     }
+  }
+
+/************************************************************/
+/* IncrementNandDepth: Increments the nand depth of a group */
+/*   of CEs. The nand depth is used to indicate the nesting */
+/*   of not/and or not/not CEs which are implemented using  */
+/*   joins from the right. A single pattern within a "not"  */
+/*   CE does not require a join from the right and its nand */
+/*   depth is normally not increased (except when it's      */
+/*   within a not/and or not/not CE. The begin nand depth   */
+/*   indicates the current nesting for a CE. The end nand   */
+/*   depth indicates the nand depth in the following CE     */
+/*   (assuming that the next CE is not the beginning of a   */
+/*   new group of nand CEs). All but the last CE in a nand  */
+/*   group should have the same begin and end nand depths.  */
+/*   Since a single CE can be the last CE of several nand   */
+/*   groups, it is possible to have an end nand depth that  */
+/*   is more than 1 less than the begin nand depth of the   */
+/*   CE.                                                    */
+/************************************************************/
+static void IncrementNandDepth(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS,
+  bool lastCE)
+  {
+   /*======================================*/
+   /* Loop through each CE in the group of */
+   /* CEs having its nand depth increased. */
+   /*======================================*/
+
+   for (;
+        theLHS != NULL;
+        theLHS = theLHS->bottom)
+     {
+      /*=========================================================*/
+      /* Increment the begin nand depth of pattern and test CEs. */
+      /* The last CE in the original list doesn't have its end   */
+      /* nand depth incremented. All other last CEs in other CEs */
+      /* entered recursively do have their end depth incremented */
+      /* (unless the last CE in the recursively entered CE is    */
+      /* the same last CE as contained in the original group     */
+      /* when this function was first entered).                  */
+      /*=========================================================*/
+
+      if ((theLHS->pnType == PATTERN_CE_NODE) || (theLHS->pnType == TEST_CE_NODE))
+        {
+         theLHS->beginNandDepth++;
+
+         if (lastCE == false) theLHS->endNandDepth++;
+         else if (theLHS->bottom != NULL) theLHS->endNandDepth++;
+        }
+
+      /*==============================================*/
+      /* Recursively increase the nand depth of other */
+      /* CEs contained within the CE having its nand  */
+      /* depth increased.                             */
+      /*==============================================*/
+
+      else if ((theLHS->pnType == AND_CE_NODE) || (theLHS->pnType == NOT_CE_NODE))
+        {
+         IncrementNandDepth(theEnv,theLHS->right,
+                            (lastCE ? (theLHS->bottom == NULL) : false));
+        }
+
+      /*=====================================*/
+      /* All or CEs should have been removed */
+      /* from the LHS at this point.         */
+      /*=====================================*/
+
+      else if (theLHS->pnType == OR_CE_NODE)
+        { SystemError(theEnv,"REORDER",1); }
+     }
+  }
+
+/***********************************************************/
+/* CreateInitialPattern: Creates a default pattern used in */
+/*  the LHS of a rule under certain cirmustances (such as  */
+/*  when a "not" or "test" CE is the first CE in an "and"  */
+/*  CE or when no CEs are specified in the LHS of a rule.  */
+/***********************************************************/
+static struct lhsParseNode *CreateInitialPattern(
+  Environment *theEnv)
+  {
+   struct lhsParseNode *topNode;
+
+   /*==========================================*/
+   /* Create the top most node of the pattern. */
+   /*==========================================*/
+
+   topNode = GetLHSParseNode(theEnv);
+   topNode->pnType = PATTERN_CE_NODE;
+   topNode->userCE = false;
+   topNode->bottom = NULL;
+
+   return(topNode);
+  }
+
+/*****************************************************************/
+/* AddRemainingInitialPatterns: Finishes adding initial patterns */
+/*   where needed on the LHS of a rule. Assumes that an initial  */
+/*   pattern has been added to the beginning of the rule if one  */
+/*   was needed.                                                 */
+/*****************************************************************/
+static struct lhsParseNode *AddRemainingInitialPatterns(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS)
+  {
+   struct lhsParseNode *lastNode = NULL, *thePattern, *rv = theLHS;
+   int currentDepth = 1;
+
+   while (theLHS != NULL)
+     {
+      if ((theLHS->pnType == TEST_CE_NODE) &&
+          (theLHS->beginNandDepth  > currentDepth))
+        {
+         thePattern = CreateInitialPattern(theEnv);
+         thePattern->beginNandDepth = theLHS->beginNandDepth;
+         thePattern->endNandDepth = theLHS->beginNandDepth;
+         thePattern->logical = theLHS->logical;
+         thePattern->existsNand = theLHS->existsNand;
+         theLHS->existsNand = false;
+
+         thePattern->bottom = theLHS;
+
+         if (lastNode == NULL)
+           { rv = thePattern; }
+         else
+           { lastNode->bottom = thePattern; }
+        }
+
+      lastNode = theLHS;
+      currentDepth = theLHS->endNandDepth;
+      theLHS = theLHS->bottom;
+     }
+
+   return(rv);
+  }
+
+/*************************************************************/
+/* AssignPatternIndices: For each pattern CE in the LHS of a */
+/*   rule, determines the pattern index for the CE. A simple */
+/*   1 to N numbering can't be used since a join from the    */
+/*   right only counts as a single CE to other CEs outside   */
+/*   the lexical scope of the join from the right. For       */
+/*   example, the patterns in the following LHS              */
+/*                                                           */
+/*     (a) (not (b) (c) (d)) (e)                             */
+/*                                                           */
+/*   would be assigned the following numbers: a-1, b-2, c-3, */
+/*   d-4, and e-3.                                           */
+/*************************************************************/
+static struct lhsParseNode *AssignPatternIndices(
+  struct lhsParseNode *theLHS,
+  short startIndex,
+  int nandDepth,
+  unsigned short joinDepth)
+  {
+   struct lhsParseNode *theField;
+
+   /*====================================*/
+   /* Loop through the CEs at this level */
+   /* assigning each CE a pattern index. */
+   /*====================================*/
+
+   while (theLHS != NULL)
+     {
+      /*============================================================*/
+      /* If we're entering a group of CEs requiring a join from the */
+      /* right, compute the pattern indices for that group and then */
+      /* proceed with the next CE in this group. A join from the    */
+      /* right only counts as one CE on this level regardless of    */
+      /* the number of CEs it contains. If the end of this level is */
+      /* encountered while processing the join from right, then     */
+      /* return to the previous level.                              */
+      /*============================================================*/
+
+      if (theLHS->beginNandDepth > nandDepth)
+        {
+         theLHS = AssignPatternIndices(theLHS,startIndex,nandDepth+1,joinDepth);
+
+         if (theLHS->endNandDepth < nandDepth) return(theLHS);
+         startIndex++;
+         joinDepth++;
+        }
+
+      /*=====================================================*/
+      /* A test CE is not assigned a pattern index, however, */
+      /* if it is the last CE at the end of this level, then */
+      /* return to the previous level. If this is the first  */
+      /* CE in a group, it will have a join created so the   */
+      /* depth should be incremented.                        */
+      /*=====================================================*/
+
+      else if (theLHS->pnType == TEST_CE_NODE)
+        {
+         if (joinDepth == 0)
+           { joinDepth++; }
+         theLHS->joinDepth = joinDepth - 1;
+         PropagateJoinDepth(theLHS->expression,joinDepth - 1);
+         PropagateNandDepth(theLHS->expression,theLHS->beginNandDepth,theLHS->endNandDepth);
+         if (theLHS->endNandDepth < nandDepth) return(theLHS);
+        }
+
+      /*==========================================================*/
+      /* The fields of a pattern CE need to be assigned a pattern */
+      /* index, field index, and/or slot names. If this CE is the */
+      /* last CE at the end of this level, then return to the     */
+      /* previous level.                                          */
+      /*==========================================================*/
+
+      else if (theLHS->pnType == PATTERN_CE_NODE)
+        {
+         if (theLHS->expression != NULL)
+           {
+            PropagateJoinDepth(theLHS->expression,joinDepth);
+            PropagateNandDepth(theLHS->expression,theLHS->beginNandDepth,theLHS->endNandDepth);
+           }
+
+         theLHS->pattern = startIndex;
+         theLHS->joinDepth = joinDepth;
+         PropagateJoinDepth(theLHS->right,joinDepth);
+         PropagateNandDepth(theLHS->right,theLHS->beginNandDepth,theLHS->endNandDepth);
+         for (theField = theLHS->right; theField != NULL; theField = theField->right)
+           {
+            theField->pattern = startIndex;
+            PropagateIndexSlotPatternValues(theField,theField->pattern,
+                                            theField->index,theField->slot,
+                                            theField->slotNumber);
+           }
+
+         if (theLHS->endNandDepth < nandDepth) return(theLHS);
+         startIndex++;
+         joinDepth++;
+        }
+
+      /*=========================*/
+      /* Move on to the next CE. */
+      /*=========================*/
+
+      theLHS = theLHS->bottom;
+     }
+
+   /*========================================*/
+   /* There are no more CEs left to process. */
+   /* Return to the previous level.          */
+   /*========================================*/
+
+   return NULL;
+  }
+
+/***********************************************************/
+/* PropagateIndexSlotPatternValues: Assigns pattern, field */
+/*   and slot identifiers to a field in a pattern.         */
+/***********************************************************/
+static void PropagateIndexSlotPatternValues(
+  struct lhsParseNode *theField,
+  short thePattern,
+  unsigned short theIndex,
+  CLIPSLexeme *theSlot,
+  unsigned short theSlotNumber)
+  {
+   struct lhsParseNode *tmpNode, *andField;
+
+   /*=============================================*/
+   /* A NULL field does not have to be processed. */
+   /*=============================================*/
+
+   if (theField == NULL) return;
+
+   /*=====================================================*/
+   /* Assign the appropriate identifiers for a multifield */
+   /* slot by calling this routine recursively.           */
+   /*=====================================================*/
+
+   if (theField->multifieldSlot)
+     {
+      theField->pattern = thePattern;
+      if ((theIndex > 0) && (theIndex != NO_INDEX))
+         { theField->index = theIndex; }
+      theField->slot = theSlot;
+      theField->slotNumber = theSlotNumber;
+
+      for (tmpNode = theField->bottom;
+           tmpNode != NULL;
+           tmpNode = tmpNode->right)
+        {
+         tmpNode->pattern = thePattern;
+         tmpNode->slot = theSlot;
+         PropagateIndexSlotPatternValues(tmpNode,thePattern,tmpNode->index,
+                                         theSlot,theSlotNumber);
+        }
+
+      return;
+     }
+
+   /*=======================================================*/
+   /* Loop through each of the or'ed constraints (connected */
+   /* by a |) in this field of the pattern.                 */
+   /*=======================================================*/
+
+   for (theField = theField->bottom;
+        theField != NULL;
+        theField = theField->bottom)
+     {
+      /*===========================================================*/
+      /* Loop through each of the and'ed constraints (connected by */
+      /* a &) in this field of the pattern. Assign the pattern,    */
+      /* field, and slot identifiers.                              */
+      /*===========================================================*/
+
+      for (andField = theField; andField != NULL; andField = andField->right)
+        {
+         andField->pattern = thePattern;
+         if ((theIndex > 0) && (theIndex != NO_INDEX))
+           { andField->index = theIndex; }
+         andField->slot = theSlot;
+         andField->slotNumber = theSlotNumber;
+        }
+     }
+   }
+
+/***************************************************/
+/* AssignPatternMarkedFlag: Recursively assigns    */
+/*   value to the marked field of a LHSParseNode.  */
+/***************************************************/
+/*
+void AssignPatternMarkedFlag(
+  struct lhsParseNode *theField,
+  short markedValue)
+  {
+   while (theField != NULL)
+     {
+      theField->marked = markedValue;
+      if (theField->bottom != NULL)
+        { AssignPatternMarkedFlag(theField->bottom,markedValue); }
+      if (theField->expression != NULL)
+        { AssignPatternMarkedFlag(theField->expression,markedValue); }
+      if (theField->secondaryExpression != NULL)
+        { AssignPatternMarkedFlag(theField->secondaryExpression,markedValue); }
+      theField = theField->right;
+     }
+  }
+*/
+/*****************************************************************/
+/* PropagateJoinDepth: Recursively assigns a joinDepth to each   */
+/*   node in a LHS node by following the right and bottom links. */
+/*****************************************************************/
+static void PropagateJoinDepth(
+  struct lhsParseNode *theField,
+  unsigned short joinDepth)
+  {
+   while (theField != NULL)
+     {
+      theField->joinDepth = joinDepth;
+      if (theField->bottom != NULL)
+        { PropagateJoinDepth(theField->bottom,joinDepth); }
+      if (theField->expression != NULL)
+        { PropagateJoinDepth(theField->expression,joinDepth); }
+      if (theField->secondaryExpression != NULL)
+        { PropagateJoinDepth(theField->secondaryExpression,joinDepth); }
+      theField = theField->right;
+     }
+  }
+
+/**************************************************************/
+/* PropagateNandDepth: Recursively assigns the not/and (nand) */
+/*   depth to each node in a LHS node by following the right, */
+/*   bottom, and expression links.                            */
+/**************************************************************/
+static void PropagateNandDepth(
+  struct lhsParseNode *theField,
+  int beginDepth,
+  int endDepth)
+  {
+   if (theField == NULL) return;
+
+   for (; theField != NULL; theField = theField->right)
+      {
+       theField->beginNandDepth = beginDepth;
+       theField->endNandDepth = endDepth;
+       PropagateNandDepth(theField->expression,beginDepth,endDepth);
+       PropagateNandDepth(theField->secondaryExpression,beginDepth,endDepth);
+       PropagateNandDepth(theField->bottom,beginDepth,endDepth);
+      }
+  }
+
+/*****************************************/
+/* PropagateWhichCE: Recursively assigns */
+/*   an index indicating the user CE.    */
+/*****************************************/
+static unsigned short PropagateWhichCE(
+  struct lhsParseNode *theField,
+  unsigned short whichCE)
+  {
+   while (theField != NULL)
+     {
+      if ((theField->pnType == PATTERN_CE_NODE) || (theField->pnType == TEST_CE_NODE))
+        { whichCE++; }
+
+      theField->whichCE = whichCE;
+
+      whichCE = PropagateWhichCE(theField->right,whichCE);
+      PropagateWhichCE(theField->expression,whichCE);
+
+      theField = theField->bottom;
+     }
+
+   return whichCE;
+  }
+
+/********************/
+/* IsExistsSubjoin: */
+/********************/
+bool IsExistsSubjoin(
+  struct lhsParseNode *theLHS,
+  int parentDepth)
+  {
+   int startDepth = theLHS->beginNandDepth;
+
+   if ((startDepth - parentDepth) != 2)
+     { return false; }
+
+   while (theLHS->endNandDepth >= startDepth)
+     { theLHS = theLHS->bottom; }
+
+   if (theLHS->endNandDepth <= parentDepth)
+     { return true; }
+
+   return false;
+  }
+
+/***************************************************************************/
+/* CombineLHSParseNodes: Combines two expressions into a single equivalent */
+/*   expression. Mainly serves to merge expressions containing "and"       */
+/*   and "or" expressions without unnecessary duplication of the "and"     */
+/*   and "or" expressions (i.e., two "and" expressions can be merged by    */
+/*   placing them as arguments within another "and" expression, but it     */
+/*   is more efficient to add the arguments of one of the "and"            */
+/*   expressions to the list of arguments for the other and expression).   */
+/***************************************************************************/
+struct lhsParseNode *CombineLHSParseNodes(
+  Environment *theEnv,
+  struct lhsParseNode *expr1,
+  struct lhsParseNode *expr2)
+  {
+   struct lhsParseNode *tempPtr;
+
+   /*===========================================================*/
+   /* If the 1st expression is NULL, return the 2nd expression. */
+   /*===========================================================*/
+
+   if (expr1 == NULL) return(expr2);
+
+   /*===========================================================*/
+   /* If the 2nd expression is NULL, return the 1st expression. */
+   /*===========================================================*/
+
+   if (expr2 == NULL) return(expr1);
+
+   /*============================================================*/
+   /* If the 1st expression is an "and" expression, and the 2nd  */
+   /* expression is not an "and" expression, then include the    */
+   /* 2nd expression in the argument list of the 1st expression. */
+   /*============================================================*/
+
+   if ((expr1->value == ExpressionData(theEnv)->PTR_AND) &&
+       (expr2->value != ExpressionData(theEnv)->PTR_AND))
+     {
+      tempPtr = expr1->bottom;
+      if (tempPtr == NULL)
+        {
+         rtn_struct(theEnv,lhsParseNode,expr1);
+         return(expr2);
+        }
+
+      while (tempPtr->right != NULL)
+        { tempPtr = tempPtr->right; }
+
+      tempPtr->right = expr2;
+      return(expr1);
+     }
+
+   /*============================================================*/
+   /* If the 2nd expression is an "and" expression, and the 1st  */
+   /* expression is not an "and" expression, then include the    */
+   /* 1st expression in the argument list of the 2nd expression. */
+   /*============================================================*/
+
+   if ((expr1->value != ExpressionData(theEnv)->PTR_AND) &&
+       (expr2->value == ExpressionData(theEnv)->PTR_AND))
+     {
+      tempPtr = expr2->bottom;
+      if (tempPtr == NULL)
+        {
+         rtn_struct(theEnv,lhsParseNode,expr2);
+         return(expr1);
+        }
+
+      expr2->bottom = expr1;
+      expr1->right = tempPtr;
+
+      return(expr2);
+     }
+
+   /*===========================================================*/
+   /* If both expressions are "and" expressions, then add the   */
+   /* 2nd expression to the argument list of the 1st expression */
+   /* and throw away the extraneous "and" expression.           */
+   /*===========================================================*/
+
+   if ((expr1->value == ExpressionData(theEnv)->PTR_AND) &&
+       (expr2->value == ExpressionData(theEnv)->PTR_AND))
+     {
+      tempPtr = expr1->bottom;
+      if (tempPtr == NULL)
+        {
+         rtn_struct(theEnv,lhsParseNode,expr1);
+         return(expr2);
+        }
+
+      while (tempPtr->right != NULL)
+        { tempPtr = tempPtr->right; }
+
+      tempPtr->right = expr2->bottom;
+      rtn_struct(theEnv,lhsParseNode,expr2);
+
+      return(expr1);
+     }
+
+   /*=====================================================*/
+   /* If neither expression is an "and" expression, then  */
+   /* create an "and" expression and add both expressions */
+   /* to the argument list of that "and" expression.      */
+   /*=====================================================*/
+
+   tempPtr = GetLHSParseNode(theEnv);
+   tempPtr->pnType = FCALL_NODE;
+   tempPtr->value = ExpressionData(theEnv)->PTR_AND;
+
+   tempPtr->bottom = expr1;
+   expr1->right = expr2;
+   return(tempPtr);
+  }
+
+/**********************************************/
+/* PrintNodes: Debugging routine which prints */
+/*   the representation of a CE.              */
+/**********************************************/
+/*
+static void PrintNodes(
+  Environment *theEnv,
+  const char *fileid,
+  struct lhsParseNode *theNode)
+  {
+   if (theNode == NULL) return;
+
+   while (theNode != NULL)
+     {
+      switch (theNode->type)
+        {
+         case PATTERN_CE:
+           WriteString(theEnv,fileid,"(");
+           if (theNode->negated) WriteString(theEnv,fileid,"n");
+           if (theNode->exists) WriteString(theEnv,fileid,"x");
+           if (theNode->logical) WriteString(theEnv,fileid,"l");
+           PrintUnsignedInteger(theEnv,fileid,theNode->beginNandDepth);
+           WriteString(theEnv,fileid,"-");
+           PrintUnsignedInteger(theEnv,fileid,theNode->endNandDepth);
+           WriteString(theEnv,fileid," ");
+           WriteString(theEnv,fileid,ValueToString(theNode->right->bottom->value));
+           WriteString(theEnv,fileid,")");
+           break;
+
+         case TEST_CE:
+           WriteString(theEnv,fileid,"(test ");
+           PrintUnsignedInteger(theEnv,fileid,theNode->beginNandDepth);
+           WriteString(theEnv,fileid,"-");
+           PrintUnsignedInteger(theEnv,fileid,theNode->endNandDepth);
+           WriteString(theEnv,fileid,")");
+           break;
+
+         case NOT_CE:
+           if (theNode->logical) WriteString(theEnv,fileid,"(lnot ");
+           else WriteString(theEnv,fileid,"(not ");;
+           PrintNodes(theEnv,fileid,theNode->right);
+           WriteString(theEnv,fileid,")");
+           break;
+
+         case OR_CE:
+           if (theNode->logical) WriteString(theEnv,fileid,"(lor ");
+           else WriteString(theEnv,fileid,"(or ");
+           PrintNodes(theEnv,fileid,theNode->right);
+           WriteString(theEnv,fileid,")");
+           break;
+
+         case AND_CE:
+           if (theNode->logical) WriteString(theEnv,fileid,"(land ");
+           else WriteString(theEnv,fileid,"(and ");
+           PrintNodes(theEnv,fileid,theNode->right);
+           WriteString(theEnv,fileid,")");
+           break;
+
+         default:
+           WriteString(theEnv,fileid,"(unknown)");
+           break;
+
+        }
+
+      theNode = theNode->bottom;
+      if (theNode != NULL) WriteString(theEnv,fileid," ");
+     }
+
+   return;
+  }
+*/
+
+#endif
+
diff --git a/clips/reorder.h b/clips/reorder.h
new file mode 100755
index 000000000..181f20a7c
--- /dev/null
+++ b/clips/reorder.h
@@ -0,0 +1,172 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  06/22/18            */
+   /*                                                     */
+   /*                 REORDER HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines necessary for converting the   */
+/*   the LHS of a rule into an appropriate form suitable for */
+/*   the KB Rete topology. This includes transforming the    */
+/*   LHS so there is at most one "or" CE (and this is the    */
+/*   first CE of the LHS if it is used), adding initial      */
+/*   patterns to the LHS (if no LHS is specified or a "test" */
+/*   or "not" CE is the first pattern within an "and" CE),   */
+/*   removing redundant CEs, and determining appropriate     */
+/*   information on nesting for implementing joins from the  */
+/*   right.                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Support for join network changes.              */
+/*                                                           */
+/*            Changes to the algorithm for processing        */
+/*            not/and CE groups.                             */
+/*                                                           */
+/*            Additional optimizations for combining         */
+/*            conditional elements.                          */
+/*                                                           */
+/*            Added support for hashed alpha memories.       */
+/*                                                           */
+/*      6.31: Removed the marked flag used for not/and       */
+/*            unification.                                   */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_reorder
+
+#pragma once
+
+#define _H_reorder
+
+struct lhsParseNode;
+
+#include "expressn.h"
+#include "pattern.h"
+#include "ruledef.h"
+
+typedef enum
+  {
+   PATTERN_CE_NODE = 2049,
+   AND_CE_NODE,
+   OR_CE_NODE,
+   NOT_CE_NODE,
+   TEST_CE_NODE,
+   NAND_CE_NODE,
+   EXISTS_CE_NODE,
+   FORALL_CE_NODE,
+   SF_WILDCARD_NODE,
+   MF_WILDCARD_NODE,
+   SF_VARIABLE_NODE,
+   MF_VARIABLE_NODE,
+   GBL_VARIABLE_NODE,
+   PREDICATE_CONSTRAINT_NODE,
+   RETURN_VALUE_CONSTRAINT_NODE,
+   FCALL_NODE,
+   GCALL_NODE,
+   PCALL_NODE,
+   INTEGER_NODE,
+   FLOAT_NODE,
+   SYMBOL_NODE,
+   STRING_NODE,
+   INSTANCE_NAME_NODE,
+   FACT_STORE_MULTIFIELD_NODE,
+   DEFTEMPLATE_PTR_NODE,
+   DEFCLASS_PTR_NODE,
+   UNKNOWN_NODE
+  } ParseNodeType;
+
+#define UNSPECIFIED_SLOT USHRT_MAX
+#define NO_INDEX USHRT_MAX
+
+/***********************************************************************/
+/* lhsParseNode structure: Stores information about the intermediate   */
+/*   parsed representation of the lhs of a rule.                       */
+/***********************************************************************/
+struct lhsParseNode
+  {
+   ParseNodeType pnType;
+   union
+     {
+      void *value;
+      CLIPSLexeme *lexemeValue;
+      struct functionDefinition *functionValue;
+     };
+   unsigned int negated : 1;
+   unsigned int exists : 1;
+   unsigned int existsNand : 1;
+   unsigned int logical : 1;
+   unsigned int multifieldSlot : 1;
+   unsigned int bindingVariable : 1;
+   unsigned int derivedConstraints : 1;
+   unsigned int userCE : 1;
+   unsigned int whichCE : 7;
+   //unsigned int marked : 1;
+   unsigned int withinMultifieldSlot : 1;
+   unsigned short multiFieldsBefore;
+   unsigned short multiFieldsAfter;
+   unsigned short singleFieldsBefore;
+   unsigned short singleFieldsAfter;
+   struct constraintRecord *constraints;
+   struct lhsParseNode *referringNode;
+   struct patternParser *patternType;
+   short pattern;
+   unsigned short index; // TBD is this 1 or 0 based?
+   CLIPSLexeme *slot;
+   unsigned short slotNumber; // TBD 1 or 0 based?
+   int beginNandDepth;
+   int endNandDepth;
+   unsigned short joinDepth;
+   struct expr *networkTest;
+   struct expr *externalNetworkTest;
+   struct expr *secondaryNetworkTest;
+   struct expr *externalLeftHash;
+   struct expr *externalRightHash;
+   struct expr *constantSelector;
+   struct expr *constantValue;
+   struct expr *leftHash;
+   struct expr *rightHash;
+   struct expr *betaHash;
+   struct lhsParseNode *expression;
+   struct lhsParseNode *secondaryExpression;
+   void *userData;
+   struct lhsParseNode *right;
+   struct lhsParseNode *bottom;
+  };
+
+   struct lhsParseNode           *ReorderPatterns(Environment *,struct lhsParseNode *,bool *);
+   struct lhsParseNode           *CopyLHSParseNodes(Environment *,struct lhsParseNode *);
+   void                           CopyLHSParseNode(Environment *,struct lhsParseNode *,struct lhsParseNode *,bool);
+   struct lhsParseNode           *GetLHSParseNode(Environment *);
+   void                           ReturnLHSParseNodes(Environment *,struct lhsParseNode *);
+   struct lhsParseNode           *ExpressionToLHSParseNodes(Environment *,struct expr *);
+   struct expr                   *LHSParseNodesToExpression(Environment *,struct lhsParseNode *);
+   void                           AddInitialPatterns(Environment *,struct lhsParseNode *);
+   bool                           IsExistsSubjoin(struct lhsParseNode *,int);
+   struct lhsParseNode           *CombineLHSParseNodes(Environment *,struct lhsParseNode *,struct lhsParseNode *);
+   bool                           ConstantNode(struct lhsParseNode *);
+   unsigned short                 NodeTypeToType(struct lhsParseNode *);
+   ParseNodeType                  TypeToNodeType(unsigned short);
+
+#endif /* _H_reorder */
+
+
+
+
+
diff --git a/clips/reteutil.c b/clips/reteutil.c
new file mode 100755
index 000000000..2075d5883
--- /dev/null
+++ b/clips/reteutil.c
@@ -0,0 +1,1732 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/28/17             */
+   /*                                                     */
+   /*                 RETE UTILITY MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides a set of utility functions useful to    */
+/*   other modules.                                          */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Rule with exists CE has incorrect activation.  */
+/*            DR0867                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for join network changes.              */
+/*                                                           */
+/*            Support for using an asterick (*) to indicate  */
+/*            that existential patterns are matched.         */
+/*                                                           */
+/*            Support for partial match changes.             */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Removed pseudo-facts used in not CEs.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Bug fix to prevent rule activations for        */
+/*            partial matches being deleted.                 */
+/*                                                           */
+/*      6.40: Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Incremental reset is always enabled.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "incrrset.h"
+#include "match.h"
+#include "memalloc.h"
+#include "moduldef.h"
+#include "pattern.h"
+#include "prntutil.h"
+#include "retract.h"
+#include "router.h"
+#include "rulecom.h"
+
+#include "reteutil.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                        TraceErrorToRuleDriver(Environment *,struct joinNode *,const char *,int,bool);
+   static struct alphaMemoryHash     *FindAlphaMemory(Environment *,struct patternNodeHeader *,unsigned long);
+   static unsigned long               AlphaMemoryHashValue(struct patternNodeHeader *,unsigned long);
+   static void                        UnlinkAlphaMemory(Environment *,struct patternNodeHeader *,struct alphaMemoryHash *);
+   static void                        UnlinkAlphaMemoryBucketSiblings(Environment *,struct alphaMemoryHash *);
+   static void                        InitializePMLinks(struct partialMatch *);
+   static void                        UnlinkBetaPartialMatchfromAlphaAndBetaLineage(struct partialMatch *);
+   static int                         CountPriorPatterns(struct joinNode *);
+   static void                        ResizeBetaMemory(Environment *,struct betaMemory *);
+   static void                        ResetBetaMemory(Environment *,struct betaMemory *);
+#if (CONSTRUCT_COMPILER || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   static void                        TagNetworkTraverseJoins(Environment *,unsigned long *,unsigned long *,struct joinNode *);
+#endif
+
+/***********************************************************/
+/* PrintPartialMatch: Prints out the list of fact indices  */
+/*   and/or instance names associated with a partial match */
+/*   or rule instantiation.                                */
+/***********************************************************/
+void PrintPartialMatch(
+  Environment *theEnv,
+  const char *logicalName,
+  struct partialMatch *list)
+  {
+   struct patternEntity *matchingItem;
+   unsigned short i;
+
+   for (i = 0; i < list->bcount;)
+     {
+      if ((get_nth_pm_match(list,i) != NULL) &&
+          (get_nth_pm_match(list,i)->matchingItem != NULL))
+        {
+         matchingItem = get_nth_pm_match(list,i)->matchingItem;
+         (*matchingItem->theInfo->base.shortPrintFunction)(theEnv,logicalName,matchingItem);
+        }
+      else
+        { WriteString(theEnv,logicalName,"*"); }
+      i++;
+      if (i < list->bcount) WriteString(theEnv,logicalName,",");
+     }
+  }
+
+/**********************************************/
+/* CopyPartialMatch:  Copies a partial match. */
+/**********************************************/
+struct partialMatch *CopyPartialMatch(
+  Environment *theEnv,
+  struct partialMatch *list)
+  {
+   struct partialMatch *linker;
+   unsigned short i;
+
+   linker = get_var_struct(theEnv,partialMatch,sizeof(struct genericMatch) *
+                                        (list->bcount - 1));
+
+   InitializePMLinks(linker);
+   linker->betaMemory = true;
+   linker->busy = false;
+   linker->rhsMemory = false;
+   linker->deleting = false;
+   linker->bcount = list->bcount;
+   linker->hashValue = 0;
+
+   for (i = 0; i < linker->bcount; i++) linker->binds[i] = list->binds[i];
+
+   return(linker);
+  }
+
+/****************************/
+/* CreateEmptyPartialMatch: */
+/****************************/
+struct partialMatch *CreateEmptyPartialMatch(
+  Environment *theEnv)
+  {
+   struct partialMatch *linker;
+
+   linker = get_struct(theEnv,partialMatch);
+
+   InitializePMLinks(linker);
+   linker->betaMemory = true;
+   linker->busy = false;
+   linker->rhsMemory = false;
+   linker->deleting = false;
+   linker->bcount = 1;
+   linker->hashValue = 0;
+   linker->binds[0].gm.theValue = NULL;
+
+   return(linker);
+  }
+
+/**********************/
+/* InitializePMLinks: */
+/**********************/
+static void InitializePMLinks(
+  struct partialMatch *theMatch)
+  {
+   theMatch->nextInMemory = NULL;
+   theMatch->prevInMemory = NULL;
+   theMatch->nextRightChild = NULL;
+   theMatch->prevRightChild = NULL;
+   theMatch->nextLeftChild = NULL;
+   theMatch->prevLeftChild = NULL;
+   theMatch->children = NULL;
+   theMatch->rightParent = NULL;
+   theMatch->leftParent = NULL;
+   theMatch->blockList = NULL;
+   theMatch->nextBlocked = NULL;
+   theMatch->prevBlocked = NULL;
+   theMatch->marker = NULL;
+   theMatch->dependents = NULL;
+  }
+
+/**********************/
+/* UpdateBetaPMLinks: */
+/**********************/
+void UpdateBetaPMLinks(
+  Environment *theEnv,
+  struct partialMatch *thePM,
+  struct partialMatch *lhsBinds,
+  struct partialMatch *rhsBinds,
+  struct joinNode *join,
+  unsigned long hashValue,
+  int side)
+  {
+   unsigned long betaLocation;
+   struct betaMemory *theMemory;
+
+   if (side == LHS)
+     {
+      theMemory = join->leftMemory;
+      thePM->rhsMemory = false;
+     }
+   else
+     {
+      theMemory = join->rightMemory;
+      thePM->rhsMemory = true;
+     }
+
+   thePM->hashValue = hashValue;
+
+   /*================================*/
+   /* Update the node's linked list. */
+   /*================================*/
+
+   betaLocation = hashValue % theMemory->size;
+
+   if (side == LHS)
+     {
+      thePM->nextInMemory = theMemory->beta[betaLocation];
+      if (theMemory->beta[betaLocation] != NULL)
+        { theMemory->beta[betaLocation]->prevInMemory = thePM; }
+      theMemory->beta[betaLocation] = thePM;
+     }
+   else
+     {
+      if (theMemory->last[betaLocation] != NULL)
+        {
+         theMemory->last[betaLocation]->nextInMemory = thePM;
+         thePM->prevInMemory = theMemory->last[betaLocation];
+        }
+      else
+        { theMemory->beta[betaLocation] = thePM; }
+
+      theMemory->last[betaLocation] = thePM;
+     }
+
+   theMemory->count++;
+   if (side == LHS)
+    { join->memoryLeftAdds++; }
+   else
+    { join->memoryRightAdds++; }
+
+   thePM->owner = join;
+
+   /*======================================*/
+   /* Update the alpha memory linked list. */
+   /*======================================*/
+
+   if (rhsBinds != NULL)
+     {
+      thePM->nextRightChild = rhsBinds->children;
+      if (rhsBinds->children != NULL)
+        { rhsBinds->children->prevRightChild = thePM; }
+      rhsBinds->children = thePM;
+      thePM->rightParent = rhsBinds;
+    }
+
+   /*=====================================*/
+   /* Update the beta memory linked list. */
+   /*=====================================*/
+
+   if (lhsBinds != NULL)
+     {
+      thePM->nextLeftChild = lhsBinds->children;
+      if (lhsBinds->children != NULL)
+        { lhsBinds->children->prevLeftChild = thePM; }
+      lhsBinds->children = thePM;
+      thePM->leftParent = lhsBinds;
+     }
+
+   if (! DefruleData(theEnv)->BetaMemoryResizingFlag)
+     { return; }
+
+   if ((theMemory->size > 1) &&
+       (theMemory->count > (theMemory->size * 11)))
+     { ResizeBetaMemory(theEnv,theMemory); }
+  }
+
+/**********************************************************/
+/* AddBlockedLink: Adds a link between a partial match in */
+/*   the beta memory of a join (with a negated RHS) and a */
+/*   partial match in its right memory that prevents the  */
+/*   partial match from being satisfied and propagated to */
+/*   the next join in the rule.                           */
+/**********************************************************/
+void AddBlockedLink(
+  struct partialMatch *thePM,
+  struct partialMatch *rhsBinds)
+  {
+   thePM->marker = rhsBinds;
+   thePM->nextBlocked = rhsBinds->blockList;
+   if (rhsBinds->blockList != NULL)
+     { rhsBinds->blockList->prevBlocked = thePM; }
+   rhsBinds->blockList = thePM;
+  }
+
+/*************************************************************/
+/* RemoveBlockedLink: Removes a link between a partial match */
+/*   in the beta memory of a join (with a negated RHS) and a */
+/*   partial match in its right memory that prevents the     */
+/*   partial match from being satisfied and propagated to    */
+/*   the next join in the rule.                              */
+/*************************************************************/
+void RemoveBlockedLink(
+  struct partialMatch *thePM)
+  {
+   struct partialMatch *blocker;
+
+   if (thePM->prevBlocked == NULL)
+     {
+      blocker = (struct partialMatch *) thePM->marker;
+      blocker->blockList = thePM->nextBlocked;
+     }
+   else
+     { thePM->prevBlocked->nextBlocked = thePM->nextBlocked; }
+
+   if (thePM->nextBlocked != NULL)
+     { thePM->nextBlocked->prevBlocked = thePM->prevBlocked; }
+
+   thePM->nextBlocked = NULL;
+   thePM->prevBlocked = NULL;
+   thePM->marker = NULL;
+  }
+
+/***********************************/
+/* UnlinkBetaPMFromNodeAndLineage: */
+/***********************************/
+void UnlinkBetaPMFromNodeAndLineage(
+  Environment *theEnv,
+  struct joinNode *join,
+  struct partialMatch *thePM,
+  int side)
+  {
+   unsigned long betaLocation;
+   struct betaMemory *theMemory;
+
+   if (side == LHS)
+     { theMemory = join->leftMemory; }
+   else
+     { theMemory = join->rightMemory; }
+
+   /*=============================================*/
+   /* Update the nextInMemory/prevInMemory links. */
+   /*=============================================*/
+
+   theMemory->count--;
+
+   if (side == LHS)
+    { join->memoryLeftDeletes++; }
+   else
+    { join->memoryRightDeletes++; }
+
+   betaLocation = thePM->hashValue % theMemory->size;
+
+   if ((side == RHS) &&
+       (theMemory->last[betaLocation] == thePM))
+     { theMemory->last[betaLocation] = thePM->prevInMemory; }
+
+   if (thePM->prevInMemory == NULL)
+     {
+      betaLocation = thePM->hashValue % theMemory->size;
+      theMemory->beta[betaLocation] = thePM->nextInMemory;
+     }
+   else
+     { thePM->prevInMemory->nextInMemory = thePM->nextInMemory; }
+
+   if (thePM->nextInMemory != NULL)
+     { thePM->nextInMemory->prevInMemory = thePM->prevInMemory; }
+
+   thePM->nextInMemory = NULL;
+   thePM->prevInMemory = NULL;
+
+   UnlinkBetaPartialMatchfromAlphaAndBetaLineage(thePM);
+
+   if (! DefruleData(theEnv)->BetaMemoryResizingFlag)
+     { return; }
+
+   if ((theMemory->count == 0) && (theMemory->size > 1))
+     { ResetBetaMemory(theEnv,theMemory); }
+  }
+
+/*************************/
+/* UnlinkNonLeftLineage: */
+/*************************/
+void UnlinkNonLeftLineage(
+  Environment *theEnv,
+  struct joinNode *join,
+  struct partialMatch *thePM,
+  int side)
+  {
+   unsigned long betaLocation;
+   struct betaMemory *theMemory;
+   struct partialMatch *tempPM;
+
+   if (side == LHS)
+     { theMemory = join->leftMemory; }
+   else
+     { theMemory = join->rightMemory; }
+
+   /*=============================================*/
+   /* Update the nextInMemory/prevInMemory links. */
+   /*=============================================*/
+
+   theMemory->count--;
+
+   if (side == LHS)
+    { join->memoryLeftDeletes++; }
+   else
+    { join->memoryRightDeletes++; }
+
+   betaLocation = thePM->hashValue % theMemory->size;
+
+   if ((side == RHS) &&
+       (theMemory->last[betaLocation] == thePM))
+     { theMemory->last[betaLocation] = thePM->prevInMemory; }
+
+   if (thePM->prevInMemory == NULL)
+     {
+      betaLocation = thePM->hashValue % theMemory->size;
+      theMemory->beta[betaLocation] = thePM->nextInMemory;
+     }
+   else
+     { thePM->prevInMemory->nextInMemory = thePM->nextInMemory; }
+
+   if (thePM->nextInMemory != NULL)
+     { thePM->nextInMemory->prevInMemory = thePM->prevInMemory; }
+
+   /*=========================*/
+   /* Update the alpha lists. */
+   /*=========================*/
+
+   if (thePM->prevRightChild == NULL)
+     {
+      if (thePM->rightParent != NULL)
+        {
+         thePM->rightParent->children = thePM->nextRightChild;
+         if (thePM->nextRightChild != NULL)
+           {
+            thePM->rightParent->children = thePM->nextRightChild;
+            thePM->nextRightChild->rightParent = thePM->rightParent;
+           }
+        }
+     }
+   else
+     { thePM->prevRightChild->nextRightChild = thePM->nextRightChild; }
+
+   if (thePM->nextRightChild != NULL)
+     { thePM->nextRightChild->prevRightChild = thePM->prevRightChild; }
+
+   /*===========================*/
+   /* Update the blocked lists. */
+   /*===========================*/
+
+   if (thePM->prevBlocked == NULL)
+     {
+      tempPM = (struct partialMatch *) thePM->marker;
+
+      if (tempPM != NULL)
+        { tempPM->blockList = thePM->nextBlocked; }
+     }
+   else
+     { thePM->prevBlocked->nextBlocked = thePM->nextBlocked; }
+
+   if (thePM->nextBlocked != NULL)
+     { thePM->nextBlocked->prevBlocked = thePM->prevBlocked; }
+
+   if (! DefruleData(theEnv)->BetaMemoryResizingFlag)
+     { return; }
+
+   if ((theMemory->count == 0) && (theMemory->size > 1))
+     { ResetBetaMemory(theEnv,theMemory); }
+  }
+
+/*******************************************************************/
+/* UnlinkBetaPartialMatchfromAlphaAndBetaLineage: Removes the      */
+/*   lineage links from a beta memory partial match. This removes  */
+/*   the links between this partial match and its left and right   */
+/*   memory parents. It also removes the links between this        */
+/*   partial match and any of its children in other beta memories. */
+/*******************************************************************/
+static void UnlinkBetaPartialMatchfromAlphaAndBetaLineage(
+  struct partialMatch *thePM)
+  {
+   struct partialMatch *tempPM;
+
+   /*=========================*/
+   /* Update the alpha lists. */
+   /*=========================*/
+
+   if (thePM->prevRightChild == NULL)
+     {
+      if (thePM->rightParent != NULL)
+        { thePM->rightParent->children = thePM->nextRightChild; }
+     }
+   else
+     { thePM->prevRightChild->nextRightChild = thePM->nextRightChild; }
+
+   if (thePM->nextRightChild != NULL)
+     { thePM->nextRightChild->prevRightChild = thePM->prevRightChild; }
+
+   thePM->rightParent = NULL;
+   thePM->nextRightChild = NULL;
+   thePM->prevRightChild = NULL;
+
+   /*========================*/
+   /* Update the beta lists. */
+   /*========================*/
+
+   if (thePM->prevLeftChild == NULL)
+     {
+      if (thePM->leftParent != NULL)
+        { thePM->leftParent->children = thePM->nextLeftChild; }
+     }
+   else
+     { thePM->prevLeftChild->nextLeftChild = thePM->nextLeftChild; }
+
+   if (thePM->nextLeftChild != NULL)
+     { thePM->nextLeftChild->prevLeftChild = thePM->prevLeftChild; }
+
+   thePM->leftParent = NULL;
+   thePM->nextLeftChild = NULL;
+   thePM->prevLeftChild = NULL;
+
+   /*===========================*/
+   /* Update the blocked lists. */
+   /*===========================*/
+
+   if (thePM->prevBlocked == NULL)
+     {
+      tempPM = (struct partialMatch *) thePM->marker;
+
+      if (tempPM != NULL)
+        { tempPM->blockList = thePM->nextBlocked; }
+     }
+   else
+     { thePM->prevBlocked->nextBlocked = thePM->nextBlocked; }
+
+   if (thePM->nextBlocked != NULL)
+     { thePM->nextBlocked->prevBlocked = thePM->prevBlocked; }
+
+   thePM->marker = NULL;
+   thePM->nextBlocked = NULL;
+   thePM->prevBlocked = NULL;
+
+   /*===============================================*/
+   /* Remove parent reference from the child links. */
+   /*===============================================*/
+
+   if (thePM->children != NULL)
+     {
+      if (thePM->rhsMemory)
+        {
+         for (tempPM = thePM->children; tempPM != NULL; tempPM = tempPM->nextRightChild)
+           { tempPM->rightParent = NULL; }
+        }
+      else
+        {
+         for (tempPM = thePM->children; tempPM != NULL; tempPM = tempPM->nextLeftChild)
+           { tempPM->leftParent = NULL; }
+        }
+
+      thePM->children = NULL;
+     }
+  }
+
+/********************************************************/
+/* MergePartialMatches: Merges two partial matches. The */
+/*   second match should either be NULL (indicating a   */
+/*   negated CE) or contain a single match.             */
+/********************************************************/
+struct partialMatch *MergePartialMatches(
+  Environment *theEnv,
+  struct partialMatch *lhsBind,
+  struct partialMatch *rhsBind)
+  {
+   struct partialMatch *linker;
+   static struct partialMatch mergeTemplate = { 1 }; /* betaMemory is true, remainder are 0 or NULL */
+
+   /*=================================*/
+   /* Allocate the new partial match. */
+   /*=================================*/
+
+   linker = get_var_struct(theEnv,partialMatch,sizeof(struct genericMatch) * lhsBind->bcount);
+
+   /*============================================*/
+   /* Set the flags to their appropriate values. */
+   /*============================================*/
+
+   memcpy(linker,&mergeTemplate,sizeof(struct partialMatch) - sizeof(struct genericMatch));
+
+   linker->deleting = false;
+   linker->bcount = lhsBind->bcount + 1;
+
+   /*========================================================*/
+   /* Copy the bindings of the partial match being extended. */
+   /*========================================================*/
+
+   memcpy(linker->binds,lhsBind->binds,sizeof(struct genericMatch) * lhsBind->bcount);
+
+   /*===================================*/
+   /* Add the binding of the rhs match. */
+   /*===================================*/
+
+   if (rhsBind == NULL)
+     { linker->binds[lhsBind->bcount].gm.theValue = NULL; }
+   else
+     { linker->binds[lhsBind->bcount].gm.theValue = rhsBind->binds[0].gm.theValue; }
+
+   return linker;
+  }
+
+/*******************************************************************/
+/* InitializePatternHeader: Initializes a pattern header structure */
+/*   (used by the fact and instance pattern matchers).             */
+/*******************************************************************/
+void InitializePatternHeader(
+  Environment *theEnv,
+  struct patternNodeHeader *theHeader)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+   theHeader->firstHash = NULL;
+   theHeader->lastHash = NULL;
+   theHeader->entryJoin = NULL;
+   theHeader->rightHash = NULL;
+   theHeader->singlefieldNode = false;
+   theHeader->multifieldNode = false;
+   theHeader->stopNode = false;
+#if (! RUN_TIME)
+   theHeader->initialize = true;
+#else
+   theHeader->initialize = false;
+#endif
+   theHeader->marked = false;
+   theHeader->beginSlot = false;
+   theHeader->endSlot = false;
+   theHeader->selector = false;
+  }
+
+/******************************************************************/
+/* CreateAlphaMatch: Given a pointer to an entity (such as a fact */
+/*   or instance) which matched a pattern, this function creates  */
+/*   a partial match suitable for storing in the alpha memory of  */
+/*   the pattern network. Note that the multifield markers which  */
+/*   are passed as a calling argument are copied (thus the caller */
+/*   is still responsible for freeing these data structures).     */
+/******************************************************************/
+struct partialMatch *CreateAlphaMatch(
+  Environment *theEnv,
+  void *theEntity,
+  struct multifieldMarker *markers,
+  struct patternNodeHeader *theHeader,
+  unsigned long hashOffset)
+  {
+   struct partialMatch *theMatch;
+   struct alphaMatch *afbtemp;
+   unsigned long hashValue;
+   struct alphaMemoryHash *theAlphaMemory;
+
+   /*==================================================*/
+   /* Create the alpha match and intialize its values. */
+   /*==================================================*/
+
+   theMatch = get_struct(theEnv,partialMatch);
+   InitializePMLinks(theMatch);
+   theMatch->betaMemory = false;
+   theMatch->busy = false;
+   theMatch->deleting = false;
+   theMatch->bcount = 1;
+   theMatch->hashValue = hashOffset;
+
+   afbtemp = get_struct(theEnv,alphaMatch);
+   afbtemp->next = NULL;
+   afbtemp->matchingItem = (struct patternEntity *) theEntity;
+
+   if (markers != NULL)
+     { afbtemp->markers = CopyMultifieldMarkers(theEnv,markers); }
+   else
+     { afbtemp->markers = NULL; }
+
+   theMatch->binds[0].gm.theMatch = afbtemp;
+
+   /*============================================*/
+   /* Find the alpha memory of the pattern node. */
+   /*============================================*/
+
+   hashValue = AlphaMemoryHashValue(theHeader,hashOffset);
+   theAlphaMemory = FindAlphaMemory(theEnv,theHeader,hashValue);
+   afbtemp->bucket = hashValue;
+
+   /*============================================*/
+   /* Create an alpha memory if it wasn't found. */
+   /*============================================*/
+
+   if (theAlphaMemory == NULL)
+     {
+      theAlphaMemory = get_struct(theEnv,alphaMemoryHash);
+      theAlphaMemory->bucket = hashValue;
+      theAlphaMemory->owner = theHeader;
+      theAlphaMemory->alphaMemory = NULL;
+      theAlphaMemory->endOfQueue = NULL;
+      theAlphaMemory->nextHash = NULL;
+
+      theAlphaMemory->next = DefruleData(theEnv)->AlphaMemoryTable[hashValue];
+      if (theAlphaMemory->next != NULL)
+        { theAlphaMemory->next->prev = theAlphaMemory; }
+
+      theAlphaMemory->prev = NULL;
+      DefruleData(theEnv)->AlphaMemoryTable[hashValue] = theAlphaMemory;
+
+      if (theHeader->firstHash == NULL)
+        {
+         theHeader->firstHash = theAlphaMemory;
+         theHeader->lastHash = theAlphaMemory;
+         theAlphaMemory->prevHash = NULL;
+        }
+      else
+        {
+         theHeader->lastHash->nextHash = theAlphaMemory;
+         theAlphaMemory->prevHash = theHeader->lastHash;
+         theHeader->lastHash = theAlphaMemory;
+        }
+     }
+
+   /*====================================*/
+   /* Store the alpha match in the alpha */
+   /* memory of the pattern node.        */
+   /*====================================*/
+
+    theMatch->prevInMemory = theAlphaMemory->endOfQueue;
+    if (theAlphaMemory->endOfQueue == NULL)
+     {
+      theAlphaMemory->alphaMemory = theMatch;
+      theAlphaMemory->endOfQueue = theMatch;
+     }
+   else
+     {
+      theAlphaMemory->endOfQueue->nextInMemory = theMatch;
+      theAlphaMemory->endOfQueue = theMatch;
+     }
+
+   /*===================================================*/
+   /* Return a pointer to the newly create alpha match. */
+   /*===================================================*/
+
+   return(theMatch);
+  }
+
+/*******************************************/
+/* CopyMultifieldMarkers: Copies a list of */
+/*   multifieldMarker data structures.     */
+/*******************************************/
+struct multifieldMarker *CopyMultifieldMarkers(
+  Environment *theEnv,
+  struct multifieldMarker *theMarkers)
+  {
+   struct multifieldMarker *head = NULL, *lastMark = NULL, *newMark;
+
+   while (theMarkers != NULL)
+     {
+      newMark = get_struct(theEnv,multifieldMarker);
+      newMark->next = NULL;
+      newMark->whichField = theMarkers->whichField;
+      newMark->where = theMarkers->where;
+      newMark->startPosition = theMarkers->startPosition;
+      newMark->range = theMarkers->range;
+
+      if (lastMark == NULL)
+        { head = newMark; }
+      else
+        { lastMark->next = newMark; }
+      lastMark = newMark;
+
+      theMarkers = theMarkers->next;
+     }
+
+   return(head);
+  }
+
+/***************************************************************/
+/* FlushAlphaBetaMemory: Returns all partial matches in a list */
+/*   of partial matches either directly to the pool of free    */
+/*   memory or to the list of GarbagePartialMatches. Partial   */
+/*   matches stored in alpha memories must be placed on the    */
+/*   list of GarbagePartialMatches.                            */
+/***************************************************************/
+void FlushAlphaBetaMemory(
+  Environment *theEnv,
+  struct partialMatch *pfl)
+  {
+   struct partialMatch *pfltemp;
+
+   while (pfl != NULL)
+     {
+      pfltemp = pfl->nextInMemory;
+
+      UnlinkBetaPartialMatchfromAlphaAndBetaLineage(pfl);
+      ReturnPartialMatch(theEnv,pfl);
+
+      pfl = pfltemp;
+     }
+  }
+
+/*****************************************************************/
+/* DestroyAlphaBetaMemory: Returns all partial matches in a list */
+/*   of partial matches directly to the pool of free memory.     */
+/*****************************************************************/
+void DestroyAlphaBetaMemory(
+  Environment *theEnv,
+  struct partialMatch *pfl)
+  {
+   struct partialMatch *pfltemp;
+
+   while (pfl != NULL)
+     {
+      pfltemp = pfl->nextInMemory;
+      DestroyPartialMatch(theEnv,pfl);
+      pfl = pfltemp;
+     }
+  }
+
+/******************************************************/
+/* FindEntityInPartialMatch: Searches for a specified */
+/*   data entity in a partial match.                  */
+/******************************************************/
+bool FindEntityInPartialMatch(
+  struct patternEntity *theEntity,
+  struct partialMatch *thePartialMatch)
+  {
+   unsigned short i;
+
+   for (i = 0 ; i < thePartialMatch->bcount; i++)
+     {
+      if (thePartialMatch->binds[i].gm.theMatch == NULL) continue;
+      if (thePartialMatch->binds[i].gm.theMatch->matchingItem == theEntity)
+        { return true; }
+     }
+
+   return false;
+  }
+
+/***********************************************************************/
+/* GetPatternNumberFromJoin: Given a pointer to a join associated with */
+/*   a pattern CE, returns an integer representing the position of the */
+/*   pattern CE in the rule (e.g. first, second, third).               */
+/***********************************************************************/
+int GetPatternNumberFromJoin(
+  struct joinNode *joinPtr)
+  {
+   int whichOne = 0;
+
+   while (joinPtr != NULL)
+     {
+      if (joinPtr->joinFromTheRight)
+        { joinPtr = (struct joinNode *) joinPtr->rightSideEntryStructure; }
+      else
+        {
+         whichOne++;
+         joinPtr = joinPtr->lastLevel;
+        }
+     }
+
+   return(whichOne);
+  }
+
+/************************************************************************/
+/* TraceErrorToRule: Prints an error message when a error occurs as the */
+/*   result of evaluating an expression in the pattern network. Used to */
+/*   indicate which rule caused the problem.                            */
+/************************************************************************/
+void TraceErrorToRule(
+  Environment *theEnv,
+  struct joinNode *joinPtr,
+  const char *indentSpaces)
+  {
+   int patternCount;
+
+   MarkRuleNetwork(theEnv,0);
+
+   patternCount = CountPriorPatterns(joinPtr->lastLevel) + 1;
+
+   TraceErrorToRuleDriver(theEnv,joinPtr,indentSpaces,patternCount,false);
+
+   MarkRuleNetwork(theEnv,0);
+  }
+
+/**************************************************************/
+/* TraceErrorToRuleDriver: Driver code for printing out which */
+/*   rule caused a pattern or join network error.             */
+/**************************************************************/
+static void TraceErrorToRuleDriver(
+  Environment *theEnv,
+  struct joinNode *joinPtr,
+  const char *indentSpaces,
+  int priorRightJoinPatterns,
+  bool enteredJoinFromRight)
+  {
+   const char *name;
+   int priorPatternCount;
+   struct joinLink *theLinks;
+
+   if ((joinPtr->joinFromTheRight) && enteredJoinFromRight)
+     { priorPatternCount = CountPriorPatterns(joinPtr->lastLevel); }
+   else
+     { priorPatternCount = 0; }
+
+   if (joinPtr->marked)
+     { /* Do Nothing */ }
+   else if (joinPtr->ruleToActivate != NULL)
+     {
+      joinPtr->marked = 1;
+      name = DefruleName(joinPtr->ruleToActivate);
+      WriteString(theEnv,STDERR,indentSpaces);
+
+      WriteString(theEnv,STDERR,"Of pattern #");
+      WriteInteger(theEnv,STDERR,priorRightJoinPatterns+priorPatternCount);
+      WriteString(theEnv,STDERR," in rule ");
+      WriteString(theEnv,STDERR,name);
+      WriteString(theEnv,STDERR,"\n");
+     }
+   else
+     {
+      joinPtr->marked = 1;
+
+      theLinks = joinPtr->nextLinks;
+      while (theLinks != NULL)
+        {
+         TraceErrorToRuleDriver(theEnv,theLinks->join,indentSpaces,
+                                priorRightJoinPatterns+priorPatternCount,
+                                (theLinks->enterDirection == RHS));
+         theLinks = theLinks->next;
+        }
+     }
+  }
+
+/***********************/
+/* CountPriorPatterns: */
+/***********************/
+static int CountPriorPatterns(
+  struct joinNode *joinPtr)
+  {
+   int count = 0;
+
+   while (joinPtr != NULL)
+     {
+      if (joinPtr->joinFromTheRight)
+        { count += CountPriorPatterns((struct joinNode *) joinPtr->rightSideEntryStructure); }
+      else
+        { count++; }
+
+      joinPtr = joinPtr->lastLevel;
+     }
+
+   return(count);
+  }
+
+/********************************************************/
+/* MarkRuleNetwork: Sets the marked flag in each of the */
+/*   joins in the join network to the specified value.  */
+/********************************************************/
+void MarkRuleNetwork(
+  Environment *theEnv,
+  bool value)
+  {
+   Defrule *rulePtr, *disjunctPtr;
+   struct joinNode *joinPtr;
+   Defmodule *modulePtr;
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   SaveCurrentModule(theEnv);
+   for (modulePtr = GetNextDefmodule(theEnv,NULL);
+        modulePtr != NULL;
+        modulePtr = GetNextDefmodule(theEnv,modulePtr))
+     {
+      SetCurrentModule(theEnv,modulePtr);
+
+      /*=========================*/
+      /* Loop through each rule. */
+      /*=========================*/
+
+      rulePtr = GetNextDefrule(theEnv,NULL);
+      while (rulePtr != NULL)
+        {
+         /*=============================*/
+         /* Mark each join for the rule */
+         /* with the specified value.   */
+         /*=============================*/
+
+         for (disjunctPtr = rulePtr; disjunctPtr != NULL; disjunctPtr = disjunctPtr->disjunct)
+           {
+            joinPtr = disjunctPtr->lastJoin;
+            MarkRuleJoins(joinPtr,value);
+           }
+
+         /*===========================*/
+         /* Move on to the next rule. */
+         /*===========================*/
+
+         rulePtr = GetNextDefrule(theEnv,rulePtr);
+        }
+
+     }
+
+   RestoreCurrentModule(theEnv);
+  }
+
+/******************/
+/* MarkRuleJoins: */
+/******************/
+void MarkRuleJoins(
+  struct joinNode *joinPtr,
+  bool value)
+  {
+   while (joinPtr != NULL)
+     {
+      if (joinPtr->joinFromTheRight)
+        { MarkRuleJoins((struct joinNode *) joinPtr->rightSideEntryStructure,value); }
+
+      joinPtr->marked = value;
+      joinPtr = joinPtr->lastLevel;
+     }
+  }
+
+/*****************************************/
+/* GetAlphaMemory: Retrieves the list of */
+/*   matches from an alpha memory.       */
+/*****************************************/
+struct partialMatch *GetAlphaMemory(
+  Environment *theEnv,
+  struct patternNodeHeader *theHeader,
+  unsigned long hashOffset)
+  {
+   struct alphaMemoryHash *theAlphaMemory;
+   unsigned long hashValue;
+
+   hashValue = AlphaMemoryHashValue(theHeader,hashOffset);
+   theAlphaMemory = FindAlphaMemory(theEnv,theHeader,hashValue);
+
+   if (theAlphaMemory == NULL)
+     { return NULL; }
+
+   return theAlphaMemory->alphaMemory;
+  }
+
+/*****************************************/
+/* GetLeftBetaMemory: Retrieves the list */
+/*   of matches from a beta memory.      */
+/*****************************************/
+struct partialMatch *GetLeftBetaMemory(
+  struct joinNode *theJoin,
+  unsigned long hashValue)
+  {
+   unsigned long betaLocation;
+
+   betaLocation = hashValue % theJoin->leftMemory->size;
+
+   return theJoin->leftMemory->beta[betaLocation];
+  }
+
+/******************************************/
+/* GetRightBetaMemory: Retrieves the list */
+/*   of matches from a beta memory.       */
+/******************************************/
+struct partialMatch *GetRightBetaMemory(
+  struct joinNode *theJoin,
+  unsigned long hashValue)
+  {
+   unsigned long betaLocation;
+
+   betaLocation = hashValue % theJoin->rightMemory->size;
+
+   return theJoin->rightMemory->beta[betaLocation];
+  }
+
+/***************************************/
+/* ReturnLeftMemory: Sets the contents */
+/*   of a beta memory to NULL.         */
+/***************************************/
+void ReturnLeftMemory(
+  Environment *theEnv,
+  struct joinNode *theJoin)
+  {
+   if (theJoin->leftMemory == NULL) return;
+   genfree(theEnv,theJoin->leftMemory->beta,sizeof(struct partialMatch *) * theJoin->leftMemory->size);
+   rtn_struct(theEnv,betaMemory,theJoin->leftMemory);
+   theJoin->leftMemory = NULL;
+  }
+
+/***************************************/
+/* ReturnRightMemory: Sets the contents */
+/*   of a beta memory to NULL.         */
+/***************************************/
+void ReturnRightMemory(
+  Environment *theEnv,
+  struct joinNode *theJoin)
+  {
+   if (theJoin->rightMemory == NULL) return;
+   genfree(theEnv,theJoin->rightMemory->beta,sizeof(struct partialMatch *) * theJoin->rightMemory->size);
+   genfree(theEnv,theJoin->rightMemory->last,sizeof(struct partialMatch *) * theJoin->rightMemory->size);
+   rtn_struct(theEnv,betaMemory,theJoin->rightMemory);
+   theJoin->rightMemory = NULL;
+  }
+
+/****************************************************************/
+/* DestroyBetaMemory: Destroys the contents of a beta memory in */
+/*   preperation for the deallocation of a join. Destroying is  */
+/*   performed when the environment is being deallocated and it */
+/*   is not necessary to leave the environment in a consistent  */
+/*   state (as it would be if just a single rule were being     */
+/*   deleted).                                                  */
+/****************************************************************/
+void DestroyBetaMemory(
+  Environment *theEnv,
+  struct joinNode *theJoin,
+  int side)
+  {
+   unsigned long i;
+
+   if (side == LHS)
+     {
+      if (theJoin->leftMemory == NULL) return;
+
+      for (i = 0; i < theJoin->leftMemory->size; i++)
+        { DestroyAlphaBetaMemory(theEnv,theJoin->leftMemory->beta[i]); }
+     }
+   else
+     {
+      if (theJoin->rightMemory == NULL) return;
+
+      for (i = 0; i < theJoin->rightMemory->size; i++)
+        { DestroyAlphaBetaMemory(theEnv,theJoin->rightMemory->beta[i]); }
+     }
+  }
+
+/*************************************************************/
+/* FlushBetaMemory: Flushes the contents of a beta memory in */
+/*   preperation for the deallocation of a join. Flushing    */
+/*   is performed when the partial matches in the beta       */
+/*   memory may still be in use because the environment will */
+/*   remain active.                                          */
+/*************************************************************/
+void FlushBetaMemory(
+  Environment *theEnv,
+  struct joinNode *theJoin,
+  int side)
+  {
+   unsigned long i;
+
+   if (side == LHS)
+     {
+      if (theJoin->leftMemory == NULL) return;
+
+      for (i = 0; i < theJoin->leftMemory->size; i++)
+        { FlushAlphaBetaMemory(theEnv,theJoin->leftMemory->beta[i]); }
+     }
+   else
+     {
+      if (theJoin->rightMemory == NULL) return;
+
+      for (i = 0; i < theJoin->rightMemory->size; i++)
+        { FlushAlphaBetaMemory(theEnv,theJoin->rightMemory->beta[i]); }
+     }
+ }
+
+/***********************/
+/* BetaMemoryNotEmpty: */
+/***********************/
+bool BetaMemoryNotEmpty(
+  struct joinNode *theJoin)
+  {
+   if (theJoin->leftMemory != NULL)
+     {
+      if (theJoin->leftMemory->count > 0)
+        { return true; }
+     }
+
+   if (theJoin->rightMemory != NULL)
+     {
+      if (theJoin->rightMemory->count > 0)
+        { return true; }
+     }
+
+   return false;
+  }
+
+/*********************************************/
+/* RemoveAlphaMemoryMatches: Removes matches */
+/*   from an alpha memory.                   */
+/*********************************************/
+void RemoveAlphaMemoryMatches(
+  Environment *theEnv,
+  struct patternNodeHeader *theHeader,
+  struct partialMatch *theMatch,
+  struct alphaMatch *theAlphaMatch)
+  {
+   struct alphaMemoryHash *theAlphaMemory = NULL;
+   unsigned long hashValue;
+
+   if ((theMatch->prevInMemory == NULL) || (theMatch->nextInMemory == NULL))
+     {
+      hashValue = theAlphaMatch->bucket;
+      theAlphaMemory = FindAlphaMemory(theEnv,theHeader,hashValue);
+     }
+
+   if (theMatch->prevInMemory != NULL)
+     { theMatch->prevInMemory->nextInMemory = theMatch->nextInMemory; }
+   else
+     { theAlphaMemory->alphaMemory = theMatch->nextInMemory; }
+
+   if (theMatch->nextInMemory != NULL)
+     { theMatch->nextInMemory->prevInMemory = theMatch->prevInMemory; }
+   else
+     { theAlphaMemory->endOfQueue = theMatch->prevInMemory; }
+
+   /*====================================*/
+   /* Add the match to the garbage list. */
+   /*====================================*/
+
+   theMatch->nextInMemory = EngineData(theEnv)->GarbagePartialMatches;
+   EngineData(theEnv)->GarbagePartialMatches = theMatch;
+
+   if ((theAlphaMemory != NULL) && (theAlphaMemory->alphaMemory == NULL))
+     { UnlinkAlphaMemory(theEnv,theHeader,theAlphaMemory); }
+  }
+
+/***********************/
+/* DestroyAlphaMemory: */
+/***********************/
+void DestroyAlphaMemory(
+  Environment *theEnv,
+  struct patternNodeHeader *theHeader,
+  bool unlink)
+  {
+   struct alphaMemoryHash *theAlphaMemory, *tempMemory;
+
+   theAlphaMemory = theHeader->firstHash;
+
+   while (theAlphaMemory != NULL)
+     {
+      tempMemory = theAlphaMemory->nextHash;
+      DestroyAlphaBetaMemory(theEnv,theAlphaMemory->alphaMemory);
+      if (unlink)
+        { UnlinkAlphaMemoryBucketSiblings(theEnv,theAlphaMemory); }
+      rtn_struct(theEnv,alphaMemoryHash,theAlphaMemory);
+      theAlphaMemory = tempMemory;
+     }
+
+   theHeader->firstHash = NULL;
+   theHeader->lastHash = NULL;
+  }
+
+/*********************/
+/* FlushAlphaMemory: */
+/*********************/
+void FlushAlphaMemory(
+  Environment *theEnv,
+  struct patternNodeHeader *theHeader)
+  {
+   struct alphaMemoryHash *theAlphaMemory, *tempMemory;
+
+   theAlphaMemory = theHeader->firstHash;
+
+   while (theAlphaMemory != NULL)
+     {
+      tempMemory = theAlphaMemory->nextHash;
+      FlushAlphaBetaMemory(theEnv,theAlphaMemory->alphaMemory);
+      UnlinkAlphaMemoryBucketSiblings(theEnv,theAlphaMemory);
+      rtn_struct(theEnv,alphaMemoryHash,theAlphaMemory);
+      theAlphaMemory = tempMemory;
+     }
+
+   theHeader->firstHash = NULL;
+   theHeader->lastHash = NULL;
+  }
+
+/********************/
+/* FindAlphaMemory: */
+/********************/
+static struct alphaMemoryHash *FindAlphaMemory(
+  Environment *theEnv,
+  struct patternNodeHeader *theHeader,
+  unsigned long hashValue)
+  {
+   struct alphaMemoryHash *theAlphaMemory;
+
+   theAlphaMemory = DefruleData(theEnv)->AlphaMemoryTable[hashValue];
+
+   if (theAlphaMemory != NULL)
+     {
+      while ((theAlphaMemory != NULL) && (theAlphaMemory->owner != theHeader))
+        { theAlphaMemory = theAlphaMemory->next; }
+     }
+
+   return theAlphaMemory;
+  }
+
+/*************************/
+/* AlphaMemoryHashValue: */
+/*************************/
+static unsigned long AlphaMemoryHashValue(
+  struct patternNodeHeader *theHeader,
+  unsigned long hashOffset)
+  {
+   unsigned long hashValue;
+   union
+     {
+      void *vv;
+      unsigned uv;
+     } fis;
+
+   fis.uv = 0;
+   fis.vv = theHeader;
+
+   hashValue = fis.uv + hashOffset;
+   hashValue = hashValue % ALPHA_MEMORY_HASH_SIZE;
+
+   return hashValue;
+  }
+
+/**********************/
+/* UnlinkAlphaMemory: */
+/**********************/
+static void UnlinkAlphaMemory(
+  Environment *theEnv,
+  struct patternNodeHeader *theHeader,
+  struct alphaMemoryHash *theAlphaMemory)
+  {
+   /*======================*/
+   /* Unlink the siblings. */
+   /*======================*/
+
+   UnlinkAlphaMemoryBucketSiblings(theEnv,theAlphaMemory);
+
+   /*================================*/
+   /* Update firstHash and lastHash. */
+   /*================================*/
+
+   if (theAlphaMemory == theHeader->firstHash)
+     { theHeader->firstHash = theAlphaMemory->nextHash; }
+
+   if (theAlphaMemory == theHeader->lastHash)
+     { theHeader->lastHash = theAlphaMemory->prevHash; }
+
+   /*===============================*/
+   /* Update nextHash and prevHash. */
+   /*===============================*/
+
+   if (theAlphaMemory->prevHash != NULL)
+     { theAlphaMemory->prevHash->nextHash = theAlphaMemory->nextHash; }
+
+   if (theAlphaMemory->nextHash != NULL)
+     { theAlphaMemory->nextHash->prevHash = theAlphaMemory->prevHash; }
+
+   rtn_struct(theEnv,alphaMemoryHash,theAlphaMemory);
+  }
+
+/************************************/
+/* UnlinkAlphaMemoryBucketSiblings: */
+/************************************/
+static void UnlinkAlphaMemoryBucketSiblings(
+  Environment *theEnv,
+  struct alphaMemoryHash *theAlphaMemory)
+  {
+   if (theAlphaMemory->prev == NULL)
+     { DefruleData(theEnv)->AlphaMemoryTable[theAlphaMemory->bucket] = theAlphaMemory->next; }
+   else
+     { theAlphaMemory->prev->next = theAlphaMemory->next; }
+
+   if (theAlphaMemory->next != NULL)
+     { theAlphaMemory->next->prev = theAlphaMemory->prev; }
+  }
+
+/**************************/
+/* ComputeRightHashValue: */
+/**************************/
+unsigned long ComputeRightHashValue(
+  Environment *theEnv,
+  struct patternNodeHeader *theHeader)
+  {
+   struct expr *tempExpr;
+   unsigned long hashValue = 0;
+   unsigned long multiplier = 1;
+   union
+     {
+      void *vv;
+      unsigned long liv;
+     } fis;
+
+   if (theHeader->rightHash == NULL)
+     { return hashValue; }
+
+   for (tempExpr = theHeader->rightHash;
+        tempExpr != NULL;
+        tempExpr = tempExpr->nextArg, multiplier = multiplier * 509)
+      {
+       UDFValue theResult;
+       struct expr *oldArgument;
+
+       oldArgument = EvaluationData(theEnv)->CurrentExpression;
+       EvaluationData(theEnv)->CurrentExpression = tempExpr;
+       (*EvaluationData(theEnv)->PrimitivesArray[tempExpr->type]->evaluateFunction)(theEnv,tempExpr->value,&theResult);
+       EvaluationData(theEnv)->CurrentExpression = oldArgument;
+
+       switch (theResult.header->type)
+         {
+          case STRING_TYPE:
+          case SYMBOL_TYPE:
+          case INSTANCE_NAME_TYPE:
+            hashValue += (theResult.lexemeValue->bucket * multiplier);
+            break;
+
+          case INTEGER_TYPE:
+            hashValue += (theResult.integerValue->bucket * multiplier);
+            break;
+
+          case FLOAT_TYPE:
+            hashValue += (theResult.floatValue->bucket * multiplier);
+            break;
+
+          case FACT_ADDRESS_TYPE:
+#if OBJECT_SYSTEM
+          case INSTANCE_ADDRESS_TYPE:
+#endif
+            fis.liv = 0;
+            fis.vv = theResult.value;
+            hashValue += fis.liv * multiplier;
+            break;
+
+          case EXTERNAL_ADDRESS_TYPE:
+            fis.liv = 0;
+            fis.vv = theResult.externalAddressValue->contents;
+            hashValue += fis.liv * multiplier;
+            break;
+          }
+       }
+
+     return hashValue;
+    }
+
+/*********************/
+/* ResizeBetaMemory: */
+/*********************/
+void ResizeBetaMemory(
+  Environment *theEnv,
+  struct betaMemory *theMemory)
+  {
+   struct partialMatch **oldArray, **lastAdd, *thePM, *nextPM;
+   unsigned long i, oldSize, betaLocation;
+
+   oldSize = theMemory->size;
+   oldArray = theMemory->beta;
+
+   theMemory->size = oldSize * 11;
+   theMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * theMemory->size);
+
+   lastAdd = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * theMemory->size);
+   memset(theMemory->beta,0,sizeof(struct partialMatch *) * theMemory->size);
+   memset(lastAdd,0,sizeof(struct partialMatch *) * theMemory->size);
+
+   for (i = 0; i < oldSize; i++)
+     {
+      thePM = oldArray[i];
+      while (thePM != NULL)
+        {
+         nextPM = thePM->nextInMemory;
+
+         thePM->nextInMemory = NULL;
+
+         betaLocation = thePM->hashValue % theMemory->size;
+         thePM->prevInMemory = lastAdd[betaLocation];
+
+         if (lastAdd[betaLocation] != NULL)
+           { lastAdd[betaLocation]->nextInMemory = thePM; }
+         else
+           { theMemory->beta[betaLocation] = thePM; }
+
+         lastAdd[betaLocation] = thePM;
+
+         thePM = nextPM;
+        }
+     }
+
+   if (theMemory->last != NULL)
+     {
+      genfree(theEnv,theMemory->last,sizeof(struct partialMatch *) * oldSize);
+      theMemory->last = lastAdd;
+     }
+   else
+     { genfree(theEnv,lastAdd,sizeof(struct partialMatch *) * theMemory->size); }
+
+   genfree(theEnv,oldArray,sizeof(struct partialMatch *) * oldSize);
+  }
+
+/********************/
+/* ResetBetaMemory: */
+/********************/
+static void ResetBetaMemory(
+  Environment *theEnv,
+  struct betaMemory *theMemory)
+  {
+   struct partialMatch **oldArray, **lastAdd;
+   unsigned long oldSize;
+
+   if ((theMemory->size == 1) ||
+       (theMemory->size == INITIAL_BETA_HASH_SIZE))
+     { return; }
+
+   oldSize = theMemory->size;
+   oldArray = theMemory->beta;
+
+   theMemory->size = INITIAL_BETA_HASH_SIZE;
+   theMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * theMemory->size);
+   memset(theMemory->beta,0,sizeof(struct partialMatch *) * theMemory->size);
+   genfree(theEnv,oldArray,sizeof(struct partialMatch *) * oldSize);
+
+   if (theMemory->last != NULL)
+     {
+      lastAdd = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * theMemory->size);
+      memset(lastAdd,0,sizeof(struct partialMatch *) * theMemory->size);
+      genfree(theEnv,theMemory->last,sizeof(struct partialMatch *) * oldSize);
+      theMemory->last = lastAdd;
+     }
+  }
+
+/********************/
+/* PrintBetaMemory: */
+/********************/
+unsigned long PrintBetaMemory(
+  Environment *theEnv,
+  const char *logName,
+  struct betaMemory *theMemory,
+  bool indentFirst,
+  const char *indentString,
+  int output)
+  {
+   struct partialMatch *listOfMatches;
+   unsigned long b, count = 0;
+
+   if (GetHaltExecution(theEnv) == true)
+     { return count; }
+
+   for (b = 0; b < theMemory->size; b++)
+     {
+      listOfMatches = theMemory->beta[b];
+
+      while (listOfMatches != NULL)
+        {
+         /*=========================================*/
+         /* Check to see if the user is attempting  */
+         /* to stop the display of partial matches. */
+         /*=========================================*/
+
+         if (GetHaltExecution(theEnv) == true)
+           { return count; }
+
+         /*=========================================================*/
+         /* The first partial match may have already been indented. */
+         /* Subsequent partial matches will always be indented with */
+         /* the indentation string.                                 */
+         /*=========================================================*/
+
+         if (output == VERBOSE)
+           {
+            if (indentFirst)
+              { WriteString(theEnv,logName,indentString); }
+            else
+              { indentFirst = true; }
+           }
+
+         /*==========================*/
+         /* Print the partial match. */
+         /*==========================*/
+
+         if (output == VERBOSE)
+           {
+            PrintPartialMatch(theEnv,logName,listOfMatches);
+            WriteString(theEnv,logName,"\n");
+           }
+
+         count++;
+
+         /*============================*/
+         /* Move on to the next match. */
+         /*============================*/
+
+         listOfMatches = listOfMatches->nextInMemory;
+        }
+     }
+
+   return count;
+  }
+
+#if (CONSTRUCT_COMPILER || BLOAD_AND_BSAVE) && (! RUN_TIME)
+
+/*************************************************************/
+/* TagRuleNetwork: Assigns each join in the join network and */
+/*   each defrule data structure with a unique integer ID.   */
+/*   Also counts the number of defrule and joinNode data     */
+/*   structures currently in use.                            */
+/*************************************************************/
+void TagRuleNetwork(
+  Environment *theEnv,
+  unsigned long *moduleCount,
+  unsigned long *ruleCount,
+  unsigned long *joinCount,
+  unsigned long *linkCount)
+  {
+   Defmodule *modulePtr;
+   Defrule *rulePtr, *disjunctPtr;
+   struct joinLink *theLink;
+
+   *moduleCount = 0;
+   *ruleCount = 0;
+   *joinCount = 0;
+   *linkCount = 0;
+
+   MarkRuleNetwork(theEnv,0);
+
+   for (theLink = DefruleData(theEnv)->LeftPrimeJoins;
+        theLink != NULL;
+        theLink = theLink->next)
+     {
+      theLink->bsaveID = *linkCount;
+      (*linkCount)++;
+     }
+
+   for (theLink = DefruleData(theEnv)->RightPrimeJoins;
+        theLink != NULL;
+        theLink = theLink->next)
+     {
+      theLink->bsaveID = *linkCount;
+      (*linkCount)++;
+     }
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (modulePtr = GetNextDefmodule(theEnv,NULL);
+        modulePtr != NULL;
+        modulePtr = GetNextDefmodule(theEnv,modulePtr))
+     {
+      (*moduleCount)++;
+      SetCurrentModule(theEnv,modulePtr);
+
+      /*=========================*/
+      /* Loop through each rule. */
+      /*=========================*/
+
+      rulePtr = GetNextDefrule(theEnv,NULL);
+
+      while (rulePtr != NULL)
+        {
+         /*=============================*/
+         /* Loop through each disjunct. */
+         /*=============================*/
+
+         for (disjunctPtr = rulePtr; disjunctPtr != NULL; disjunctPtr = disjunctPtr->disjunct)
+           {
+            disjunctPtr->header.bsaveID = *ruleCount;
+            (*ruleCount)++;
+            TagNetworkTraverseJoins(theEnv,joinCount,linkCount,disjunctPtr->lastJoin);
+           }
+
+         rulePtr = GetNextDefrule(theEnv,rulePtr);
+        }
+     }
+  }
+
+/*******************************************************************/
+/* TagNetworkTraverseJoins: Traverses the join network for a rule. */
+/*******************************************************************/
+static void TagNetworkTraverseJoins(
+  Environment *theEnv,
+  unsigned long *joinCount,
+  unsigned long *linkCount,
+  struct joinNode *joinPtr)
+  {
+   struct joinLink *theLink;
+   for (;
+        joinPtr != NULL;
+        joinPtr = joinPtr->lastLevel)
+     {
+      if (joinPtr->marked == 0)
+        {
+         joinPtr->marked = 1;
+         joinPtr->bsaveID = *joinCount;
+         (*joinCount)++;
+         for (theLink = joinPtr->nextLinks;
+              theLink != NULL;
+              theLink = theLink->next)
+           {
+            theLink->bsaveID = *linkCount;
+            (*linkCount)++;
+           }
+        }
+
+      if (joinPtr->joinFromTheRight)
+        { TagNetworkTraverseJoins(theEnv,joinCount,linkCount,(struct joinNode *) joinPtr->rightSideEntryStructure); }
+     }
+  }
+
+#endif /* (CONSTRUCT_COMPILER || BLOAD_AND_BSAVE) && (! RUN_TIME) */
+
+#endif /* DEFRULE_CONSTRUCT */
+
+
+
+
+
diff --git a/clips/reteutil.h b/clips/reteutil.h
new file mode 100755
index 000000000..d6f96457d
--- /dev/null
+++ b/clips/reteutil.h
@@ -0,0 +1,110 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*              RETE UTILITY HEADER FILE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides a set of utility functions useful to    */
+/*   other modules.                                          */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Rule with exists CE has incorrect activation.  */
+/*            DR0867                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for join network changes.              */
+/*                                                           */
+/*            Support for using an asterick (*) to indicate  */
+/*            that existential patterns are matched.         */
+/*                                                           */
+/*            Support for partial match changes.             */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Removed pseudo-facts used in not CEs.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_reteutil
+
+#pragma once
+
+#define _H_reteutil
+
+#include "evaluatn.h"
+#include "match.h"
+#include "network.h"
+
+#define NETWORK_ASSERT  0
+#define NETWORK_RETRACT 1
+
+   void                           PrintPartialMatch(Environment *,const char *,struct partialMatch *);
+   struct partialMatch           *CopyPartialMatch(Environment *,struct partialMatch *);
+   struct partialMatch           *MergePartialMatches(Environment *,struct partialMatch *,struct partialMatch *);
+   long                           IncrementPseudoFactIndex(void);
+   struct partialMatch           *GetAlphaMemory(Environment *,struct patternNodeHeader *,unsigned long);
+   struct partialMatch           *GetLeftBetaMemory(struct joinNode *,unsigned long);
+   struct partialMatch           *GetRightBetaMemory(struct joinNode *,unsigned long);
+   void                           ReturnLeftMemory(Environment *,struct joinNode *);
+   void                           ReturnRightMemory(Environment *,struct joinNode *);
+   void                           DestroyBetaMemory(Environment *,struct joinNode *,int);
+   void                           FlushBetaMemory(Environment *,struct joinNode *,int);
+   bool                           BetaMemoryNotEmpty(struct joinNode *);
+   void                           RemoveAlphaMemoryMatches(Environment *,struct patternNodeHeader *,struct partialMatch *,
+                                                                  struct alphaMatch *);
+   void                           DestroyAlphaMemory(Environment *,struct patternNodeHeader *,bool);
+   void                           FlushAlphaMemory(Environment *,struct patternNodeHeader *);
+   void                           FlushAlphaBetaMemory(Environment *,struct partialMatch *);
+   void                           DestroyAlphaBetaMemory(Environment *,struct partialMatch *);
+   int                            GetPatternNumberFromJoin(struct joinNode *);
+   struct multifieldMarker       *CopyMultifieldMarkers(Environment *,struct multifieldMarker *);
+   struct partialMatch           *CreateAlphaMatch(Environment *,void *,struct multifieldMarker *,
+                                                          struct patternNodeHeader *,unsigned long);
+   void                           TraceErrorToRule(Environment *,struct joinNode *,const char *);
+   void                           InitializePatternHeader(Environment *,struct patternNodeHeader *);
+   void                           MarkRuleNetwork(Environment *,bool);
+   void                           TagRuleNetwork(Environment *,unsigned long *,unsigned long *,unsigned long *,unsigned long *);
+   bool                           FindEntityInPartialMatch(struct patternEntity *,struct partialMatch *);
+   unsigned long                  ComputeRightHashValue(Environment *,struct patternNodeHeader *);
+   void                           UpdateBetaPMLinks(Environment *,struct partialMatch *,struct partialMatch *,struct partialMatch *,
+                                                       struct joinNode *,unsigned long,int);
+   void                           UnlinkBetaPMFromNodeAndLineage(Environment *,struct joinNode *,struct partialMatch *,int);
+   void                           UnlinkNonLeftLineage(Environment *,struct joinNode *,struct partialMatch *,int);
+   struct partialMatch           *CreateEmptyPartialMatch(Environment *);
+   void                           MarkRuleJoins(struct joinNode *,bool);
+   void                           AddBlockedLink(struct partialMatch *,struct partialMatch *);
+   void                           RemoveBlockedLink(struct partialMatch *);
+   unsigned long                  PrintBetaMemory(Environment *,const char *,struct betaMemory *,bool,const char *,int);
+
+#endif /* _H_reteutil */
+
+
+
diff --git a/clips/retract.c b/clips/retract.c
new file mode 100755
index 000000000..d44ca31e2
--- /dev/null
+++ b/clips/retract.c
@@ -0,0 +1,710 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/28/17             */
+   /*                                                     */
+   /*                   RETRACT MODULE                    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  Handles join network activity associated with   */
+/*   with the removal of a data entity such as a fact or     */
+/*   instance.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Rule with exists CE has incorrect activation.  */
+/*            DR0867                                         */
+/*                                                           */
+/*      6.30: Added support for hashed memories.             */
+/*                                                           */
+/*            Added additional developer statistics to help  */
+/*            analyze join network performance.              */
+/*                                                           */
+/*            Removed pseudo-facts used in not CEs.          */
+/*                                                           */
+/*      6.31: Bug fix to prevent rule activations for        */
+/*            partial matches being deleted.                 */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include "agenda.h"
+#include "argacces.h"
+#include "constant.h"
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "lgcldpnd.h"
+#include "match.h"
+#include "memalloc.h"
+#include "network.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "router.h"
+#include "symbol.h"
+
+#include "retract.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ReturnMarkers(Environment *,struct multifieldMarker *);
+   static bool                    FindNextConflictingMatch(Environment *,struct partialMatch *,
+                                                           struct partialMatch *,
+                                                           struct joinNode *,struct partialMatch *,int);
+   static bool                    PartialMatchDefunct(Environment *,struct partialMatch *);
+   static void                    NegEntryRetractAlpha(Environment *,struct partialMatch *,int);
+   static void                    NegEntryRetractBeta(Environment *,struct joinNode *,struct partialMatch *,
+                                                      struct partialMatch *,int);
+
+/************************************************************/
+/* NetworkRetract:  Retracts a data entity (such as a fact  */
+/*   or instance) from the pattern and join networks given  */
+/*   a pointer to the list of patterns which the data       */
+/*   entity matched.                                        */
+/************************************************************/
+void NetworkRetract(
+  Environment *theEnv,
+  struct patternMatch *listOfMatchedPatterns)
+  {
+   struct patternMatch *tempMatch, *nextMatch;
+
+   tempMatch = listOfMatchedPatterns;
+   while (tempMatch != NULL)
+     {
+      nextMatch = tempMatch->next;
+
+      tempMatch->theMatch->deleting = true;
+      
+      if (tempMatch->theMatch->children != NULL)
+        { PosEntryRetractAlpha(theEnv,tempMatch->theMatch,NETWORK_RETRACT); }
+
+      if (tempMatch->theMatch->blockList != NULL)
+        { NegEntryRetractAlpha(theEnv,tempMatch->theMatch,NETWORK_RETRACT); }
+
+      /*===================================================*/
+      /* Remove from the alpha memory of the pattern node. */
+      /*===================================================*/
+
+      RemoveAlphaMemoryMatches(theEnv,tempMatch->matchingPattern,
+                               tempMatch->theMatch,
+                               tempMatch->theMatch->binds[0].gm.theMatch);
+
+      rtn_struct(theEnv,patternMatch,tempMatch);
+
+      tempMatch = nextMatch;
+     }
+  }
+
+/*************************/
+/* PosEntryRetractAlpha: */
+/*************************/
+void PosEntryRetractAlpha(
+  Environment *theEnv,
+  struct partialMatch *alphaMatch,
+  int operation)
+  {
+   struct partialMatch *betaMatch, *tempMatch;
+   struct joinNode *joinPtr;
+
+   betaMatch = alphaMatch->children;
+   while (betaMatch != NULL)
+     {
+      joinPtr = (struct joinNode *) betaMatch->owner;
+
+      if (betaMatch->children != NULL)
+        { PosEntryRetractBeta(theEnv,betaMatch,betaMatch->children,operation); }
+
+      if (betaMatch->rhsMemory)
+        { NegEntryRetractAlpha(theEnv,betaMatch,operation); }
+
+      /* Remove the beta match. */
+
+	  if ((joinPtr->ruleToActivate != NULL) ?
+		  (betaMatch->marker != NULL) : false)
+		{ RemoveActivation(theEnv,(struct activation *) betaMatch->marker,true,true); }
+
+	  tempMatch = betaMatch->nextRightChild;
+
+	  if (betaMatch->rhsMemory)
+		{ UnlinkBetaPMFromNodeAndLineage(theEnv,joinPtr,betaMatch,RHS); }
+	  else
+		{ UnlinkBetaPMFromNodeAndLineage(theEnv,joinPtr,betaMatch,LHS); }
+
+      DeletePartialMatches(theEnv,betaMatch);
+
+      betaMatch = tempMatch;
+     }
+  }
+
+/*************************/
+/* NegEntryRetractAlpha: */
+/*************************/
+static void NegEntryRetractAlpha(
+  Environment *theEnv,
+  struct partialMatch *alphaMatch,
+  int operation)
+  {
+   struct partialMatch *betaMatch;
+   struct joinNode *joinPtr;
+
+   betaMatch = alphaMatch->blockList;
+   while (betaMatch != NULL)
+     {
+      joinPtr = (struct joinNode *) betaMatch->owner;
+
+      if ((! joinPtr->patternIsNegated) &&
+          (! joinPtr->patternIsExists) &&
+          (! joinPtr->joinFromTheRight))
+        {
+         SystemError(theEnv,"RETRACT",117);
+         betaMatch = betaMatch->nextBlocked;
+         continue;
+        }
+
+      NegEntryRetractBeta(theEnv,joinPtr,alphaMatch,betaMatch,operation);
+      betaMatch = alphaMatch->blockList;
+     }
+  }
+
+/************************/
+/* NegEntryRetractBeta: */
+/************************/
+static void NegEntryRetractBeta(
+  Environment *theEnv,
+  struct joinNode *joinPtr,
+  struct partialMatch *alphaMatch,
+  struct partialMatch *betaMatch,
+  int operation)
+  {
+   /*======================================================*/
+   /* Try to find another RHS partial match which prevents */
+   /* the LHS partial match from being satisifed.          */
+   /*======================================================*/
+
+   RemoveBlockedLink(betaMatch);
+
+   if (FindNextConflictingMatch(theEnv,betaMatch,alphaMatch->nextInMemory,joinPtr,alphaMatch,operation))
+     { return; }
+   else if (joinPtr->patternIsExists)
+     {
+      if (betaMatch->children != NULL)
+        { PosEntryRetractBeta(theEnv,betaMatch,betaMatch->children,operation); }
+      return;
+     }
+   else if (joinPtr->firstJoin && (joinPtr->patternIsNegated || joinPtr->joinFromTheRight) && (! joinPtr->patternIsExists))
+     {
+      if (joinPtr->secondaryNetworkTest != NULL)
+        {
+         if (EvaluateSecondaryNetworkTest(theEnv,betaMatch,joinPtr) == false)
+           { return; }
+        }
+
+      EPMDrive(theEnv,betaMatch,joinPtr,operation);
+
+      return;
+     }
+
+   if (joinPtr->secondaryNetworkTest != NULL)
+     {
+      if (EvaluateSecondaryNetworkTest(theEnv,betaMatch,joinPtr) == false)
+        { return; }
+     }
+
+   /*=========================================================*/
+   /* If the LHS partial match now has no RHS partial matches */
+   /* that conflict with it, then it satisfies the conditions */
+   /* of the RHS not CE. Create a partial match and send it   */
+   /* to the joins below.                                     */
+   /*=========================================================*/
+
+   /*===============================*/
+   /* Create the new partial match. */
+   /*===============================*/
+
+   if ((operation == NETWORK_RETRACT) && PartialMatchWillBeDeleted(theEnv,betaMatch))
+     { return; }
+
+   PPDrive(theEnv,betaMatch,NULL,joinPtr,operation);
+  }
+
+/************************/
+/* PosEntryRetractBeta: */
+/************************/
+void PosEntryRetractBeta(
+  Environment *theEnv,
+  struct partialMatch *parentMatch,
+  struct partialMatch *betaMatch,
+  int operation)
+  {
+   struct partialMatch *tempMatch;
+
+   while (betaMatch != NULL)
+     {
+      if (betaMatch->children != NULL)
+        {
+         betaMatch = betaMatch->children;
+         continue;
+        }
+
+      if (betaMatch->nextLeftChild != NULL)
+        { tempMatch = betaMatch->nextLeftChild; }
+      else
+        {
+         tempMatch = betaMatch->leftParent;
+         betaMatch->leftParent->children = NULL;
+        }
+
+      if (betaMatch->blockList != NULL)
+        { NegEntryRetractAlpha(theEnv,betaMatch,operation); }
+      else if ((((struct joinNode *) betaMatch->owner)->ruleToActivate != NULL) ?
+               (betaMatch->marker != NULL) : false)
+        { RemoveActivation(theEnv,(struct activation *) betaMatch->marker,true,true); }
+
+      if (betaMatch->rhsMemory)
+        { UnlinkNonLeftLineage(theEnv,(struct joinNode *) betaMatch->owner,betaMatch,RHS); }
+      else
+        { UnlinkNonLeftLineage(theEnv,(struct joinNode *) betaMatch->owner,betaMatch,LHS); }
+
+      if (betaMatch->dependents != NULL) RemoveLogicalSupport(theEnv,betaMatch);
+      ReturnPartialMatch(theEnv,betaMatch);
+
+      if (tempMatch == parentMatch) return;
+      betaMatch = tempMatch;
+     }
+  }
+
+/******************************************************************/
+/* FindNextConflictingMatch: Finds the next conflicting partial   */
+/*    match in the right memory of a join that prevents a partial */
+/*    match in the beta memory of the join from being satisfied.  */
+/******************************************************************/
+static bool FindNextConflictingMatch(
+  Environment *theEnv,
+  struct partialMatch *theBind,
+  struct partialMatch *possibleConflicts,
+  struct joinNode *theJoin,
+  struct partialMatch *skipMatch,
+  int operation)
+  {
+   bool result, restore = false;
+   struct partialMatch *oldLHSBinds = NULL;
+   struct partialMatch *oldRHSBinds = NULL;
+   struct joinNode *oldJoin = NULL;
+
+   /*====================================*/
+   /* Check each of the possible partial */
+   /* matches which could conflict.      */
+   /*====================================*/
+
+#if DEVELOPER
+   if (possibleConflicts != NULL)
+     { EngineData(theEnv)->leftToRightLoops++; }
+#endif
+   /*====================================*/
+   /* Set up the evaluation environment. */
+   /*====================================*/
+
+   if (possibleConflicts != NULL)
+     {
+      oldLHSBinds = EngineData(theEnv)->GlobalLHSBinds;
+      oldRHSBinds = EngineData(theEnv)->GlobalRHSBinds;
+      oldJoin = EngineData(theEnv)->GlobalJoin;
+      EngineData(theEnv)->GlobalLHSBinds = theBind;
+      EngineData(theEnv)->GlobalJoin = theJoin;
+      restore = true;
+     }
+
+   for (;
+        possibleConflicts != NULL;
+        possibleConflicts = possibleConflicts->nextInMemory)
+     {
+      theJoin->memoryCompares++;
+
+      /*=====================================*/
+      /* Initially indicate that the partial */
+      /* match doesn't conflict.             */
+      /*=====================================*/
+
+      result = false;
+
+      if (skipMatch == possibleConflicts)
+        { /* Do Nothing */ }
+
+       /*======================================================*/
+       /* 6.05 Bug Fix. It is possible that a pattern entity   */
+       /* (e.g. instance) in a partial match is 'out of date'  */
+       /* with respect to the lazy evaluation scheme use by    */
+       /* negated patterns. In other words, the object may     */
+       /* have changed since it was last pushed through the    */
+       /* network, and thus the partial match may be invalid.  */
+       /* If so, the partial match must be ignored here.       */
+       /*======================================================*/
+
+      else if (PartialMatchDefunct(theEnv,possibleConflicts))
+        { /* Do Nothing */ }
+
+      else if ((operation == NETWORK_RETRACT) && PartialMatchWillBeDeleted(theEnv,possibleConflicts))
+        { /* Do Nothing */ }
+
+      /*================================================*/
+      /* If the join doesn't have a network expression  */
+      /* to be evaluated, then partial match conflicts. */
+      /*================================================*/
+
+      else if (theJoin->networkTest == NULL)
+        { result = true; }
+
+      /*=================================================*/
+      /* Otherwise, if the join has a network expression */
+      /* to evaluate, then evaluate it.                  */
+      /*=================================================*/
+
+      else
+        {
+#if DEVELOPER
+         if (theJoin->networkTest)
+           {
+            EngineData(theEnv)->leftToRightComparisons++;
+            EngineData(theEnv)->findNextConflictingComparisons++;
+           }
+#endif
+         EngineData(theEnv)->GlobalRHSBinds = possibleConflicts;
+
+         result = EvaluateJoinExpression(theEnv,theJoin->networkTest,theJoin);
+         if (EvaluationData(theEnv)->EvaluationError)
+           {
+            result = true;
+            EvaluationData(theEnv)->EvaluationError = false;
+           }
+
+#if DEVELOPER
+         if (result != false)
+          { EngineData(theEnv)->leftToRightSucceeds++; }
+#endif
+        }
+
+      /*==============================================*/
+      /* If the network expression evaluated to true, */
+      /* then partial match being examined conflicts. */
+      /* Point the beta memory partial match to the   */
+      /* conflicting partial match and return true to */
+      /* indicate a conflict was found.               */
+      /*==============================================*/
+
+      if (result != false)
+        {
+         AddBlockedLink(theBind,possibleConflicts);
+         EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+         EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+         EngineData(theEnv)->GlobalJoin = oldJoin;
+         return true;
+        }
+     }
+
+   if (restore)
+     {
+      EngineData(theEnv)->GlobalLHSBinds = oldLHSBinds;
+      EngineData(theEnv)->GlobalRHSBinds = oldRHSBinds;
+      EngineData(theEnv)->GlobalJoin = oldJoin;
+     }
+
+   /*========================*/
+   /* No conflict was found. */
+   /*========================*/
+
+   return false;
+  }
+
+/***********************************************************/
+/* PartialMatchDefunct: Determines if any pattern entities */
+/*   contained within the partial match have changed since */
+/*   this partial match was generated. Assumes counterf is */
+/*   false.                                                */
+/***********************************************************/
+static bool PartialMatchDefunct(
+  Environment *theEnv,
+  struct partialMatch *thePM)
+  {
+   unsigned short i;
+   struct patternEntity * thePE;
+   
+   if (thePM->deleting) return true;
+
+   for (i = 0 ; i < thePM->bcount ; i++)
+     {
+      if (thePM->binds[i].gm.theMatch == NULL) continue;
+      thePE = thePM->binds[i].gm.theMatch->matchingItem;
+      if (thePE && thePE->theInfo->synchronized &&
+          !(*thePE->theInfo->synchronized)(theEnv,thePE))
+        return true;
+     }
+   return false;
+  }
+
+/*****************************************************************/
+/* PartialMatchWillBeDeleted: Determines if any pattern entities */
+/*   contained within the partial match were deleted as part of  */
+/*   a retraction/deletion. When rules have multiple patterns    */
+/*   that can be matched by the same fact it's possible that a   */
+/*   partial match encountered in the join network has not yet   */
+/*   deleted and so should not be considered as valid.           */
+/*****************************************************************/
+bool PartialMatchWillBeDeleted(
+  Environment *theEnv,
+  struct partialMatch *thePM)
+  {
+   unsigned short i;
+   struct patternEntity * thePE;
+
+   if (thePM == NULL) return false;
+   
+   if (thePM->deleting) return true;
+
+   for (i = 0 ; i < thePM->bcount ; i++)
+     {
+      if (thePM->binds[i].gm.theMatch == NULL) continue;
+      thePE = thePM->binds[i].gm.theMatch->matchingItem;
+      if (thePE && thePE->theInfo->isDeleted &&
+          (*thePE->theInfo->isDeleted)(theEnv,thePE))
+        return true;
+     }
+
+   return false;
+  }
+
+/***************************************************/
+/* DeletePartialMatches: Returns a list of partial */
+/*   matches to the pool of free memory.           */
+/***************************************************/
+void DeletePartialMatches(
+  Environment *theEnv,
+  struct partialMatch *listOfPMs)
+  {
+   struct partialMatch *nextPM;
+
+   while (listOfPMs != NULL)
+     {
+      /*============================================*/
+      /* Remember the next partial match to delete. */
+      /*============================================*/
+
+      nextPM = listOfPMs->nextInMemory;
+
+      /*================================================*/
+      /* Remove the links between the partial match and */
+      /* any data entities that it is attached to as a  */
+      /* result of a logical CE.                        */
+      /*================================================*/
+
+      if (listOfPMs->dependents != NULL) RemoveLogicalSupport(theEnv,listOfPMs);
+
+      /*==========================================================*/
+      /* If the partial match is being deleted from a beta memory */
+      /* and the partial match isn't associated with a satisfied  */
+      /* not CE, then it can be immediately returned to the pool  */
+      /* of free memory. Otherwise, it's could be in use (either  */
+      /* to retrieve variables from the LHS or by the activation  */
+      /* of the rule). Since a not CE creates a "pseudo" data     */
+      /* entity, the beta partial match which stores this pseudo  */
+      /* data entity can not be deleted immediately (for the same */
+      /* reason an alpha memory partial match can't be deleted    */
+      /* immediately).                                            */
+      /*==========================================================*/
+
+      ReturnPartialMatch(theEnv,listOfPMs);
+
+      /*====================================*/
+      /* Move on to the next partial match. */
+      /*====================================*/
+
+      listOfPMs = nextPM;
+     }
+  }
+
+/**************************************************************/
+/* ReturnPartialMatch: Returns the data structures associated */
+/*   with a partial match to the pool of free memory.         */
+/**************************************************************/
+void ReturnPartialMatch(
+  Environment *theEnv,
+  struct partialMatch *waste)
+  {
+   /*==============================================*/
+   /* If the partial match is in use, then put it  */
+   /* on a garbage list to be processed later when */
+   /* the partial match is not in use.             */
+   /*==============================================*/
+
+   if (waste->busy)
+     {
+      waste->nextInMemory = EngineData(theEnv)->GarbagePartialMatches;
+      EngineData(theEnv)->GarbagePartialMatches = waste;
+      return;
+     }
+
+   /*======================================================*/
+   /* If we're dealing with an alpha memory partial match, */
+   /* then return the multifield markers associated with   */
+   /* the partial match (if any) along with the alphaMatch */
+   /* data structure.                                      */
+   /*======================================================*/
+
+   if (waste->betaMemory == false)
+     {
+      if (waste->binds[0].gm.theMatch->markers != NULL)
+        { ReturnMarkers(theEnv,waste->binds[0].gm.theMatch->markers); }
+      rm(theEnv,waste->binds[0].gm.theMatch,sizeof(struct alphaMatch));
+     }
+
+   /*=================================================*/
+   /* Remove any links between the partial match and  */
+   /* a data entity that were created with the use of */
+   /* the logical CE.                                 */
+   /*=================================================*/
+
+   if (waste->dependents != NULL) RemovePMDependencies(theEnv,waste);
+
+   /*======================================================*/
+   /* Return the partial match to the pool of free memory. */
+   /*======================================================*/
+
+   rtn_var_struct(theEnv,partialMatch,sizeof(struct genericMatch *) *
+                  (waste->bcount - 1),
+                  waste);
+  }
+
+/***************************************************************/
+/* DestroyPartialMatch: Returns the data structures associated */
+/*   with a partial match to the pool of free memory.          */
+/***************************************************************/
+void DestroyPartialMatch(
+  Environment *theEnv,
+  struct partialMatch *waste)
+  {
+   /*======================================================*/
+   /* If we're dealing with an alpha memory partial match, */
+   /* then return the multifield markers associated with   */
+   /* the partial match (if any) along with the alphaMatch */
+   /* data structure.                                      */
+   /*======================================================*/
+
+   if (waste->betaMemory == false)
+     {
+      if (waste->binds[0].gm.theMatch->markers != NULL)
+        { ReturnMarkers(theEnv,waste->binds[0].gm.theMatch->markers); }
+      rm(theEnv,waste->binds[0].gm.theMatch,sizeof(struct alphaMatch));
+     }
+
+   /*=================================================*/
+   /* Remove any links between the partial match and  */
+   /* a data entity that were created with the use of */
+   /* the logical CE.                                 */
+   /*=================================================*/
+
+   if (waste->dependents != NULL) DestroyPMDependencies(theEnv,waste);
+
+   /*======================================================*/
+   /* Return the partial match to the pool of free memory. */
+   /*======================================================*/
+
+   rtn_var_struct(theEnv,partialMatch,sizeof(struct genericMatch *) *
+                  (waste->bcount - 1),
+                  waste);
+  }
+
+/******************************************************/
+/* ReturnMarkers: Returns a linked list of multifield */
+/*   markers associated with a data entity matching a */
+/*   pattern to the pool of free memory.              */
+/******************************************************/
+static void ReturnMarkers(
+  Environment *theEnv,
+  struct multifieldMarker *waste)
+  {
+   struct multifieldMarker *temp;
+
+   while (waste != NULL)
+     {
+      temp = waste->next;
+      rtn_struct(theEnv,multifieldMarker,waste);
+      waste = temp;
+     }
+  }
+
+/*************************************************************/
+/* FlushGarbagePartialMatches:  Returns partial matches and  */
+/*   associated structures that were removed as part of a    */
+/*   retraction. It is necessary to postpone returning these */
+/*   structures to memory because RHS actions retrieve their */
+/*   variable bindings directly from the fact and instance   */
+/*   data structures through the alpha memory bindings.      */
+/*************************************************************/
+void FlushGarbagePartialMatches(
+  Environment *theEnv)
+  {
+   struct partialMatch *pmPtr;
+   struct alphaMatch *amPtr;
+
+   /*===================================================*/
+   /* Return the garbage partial matches collected from */
+   /* the alpha memories of the pattern networks.       */
+   /*===================================================*/
+
+   while (EngineData(theEnv)->GarbageAlphaMatches != NULL)
+     {
+      amPtr = EngineData(theEnv)->GarbageAlphaMatches->next;
+      rtn_struct(theEnv,alphaMatch,EngineData(theEnv)->GarbageAlphaMatches);
+      EngineData(theEnv)->GarbageAlphaMatches = amPtr;
+     }
+
+   /*==============================================*/
+   /* Return the garbage partial matches collected */
+   /* from the beta memories of the join networks. */
+   /*==============================================*/
+
+   while (EngineData(theEnv)->GarbagePartialMatches != NULL)
+     {
+      /*=====================================================*/
+      /* Remember the next garbage partial match to process. */
+      /*=====================================================*/
+
+      pmPtr = EngineData(theEnv)->GarbagePartialMatches->nextInMemory;
+
+      /*============================================*/
+      /* Dispose of the garbage partial match being */
+      /* examined and move on to the next one.      */
+      /*============================================*/
+
+      EngineData(theEnv)->GarbagePartialMatches->busy = false;
+      ReturnPartialMatch(theEnv,EngineData(theEnv)->GarbagePartialMatches);
+      EngineData(theEnv)->GarbagePartialMatches = pmPtr;
+     }
+  }
+
+#endif /* DEFRULE_CONSTRUCT */
+
diff --git a/clips/retract.h b/clips/retract.h
new file mode 100755
index 000000000..ae24b6ea6
--- /dev/null
+++ b/clips/retract.h
@@ -0,0 +1,74 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                RETRACT HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  Handles join network activity associated with   */
+/*   with the removal of a data entity such as a fact or     */
+/*   instance.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed LOGICAL_DEPENDENCIES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Rule with exists CE has incorrect activation.  */
+/*            DR0867                                         */
+/*                                                           */
+/*      6.30: Added support for hashed memories.             */
+/*                                                           */
+/*            Added additional developer statistics to help  */
+/*            analyze join network performance.              */
+/*                                                           */
+/*            Removed pseudo-facts used in not CEs.          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_retract
+
+#pragma once
+
+#define _H_retract
+
+#include "match.h"
+#include "network.h"
+
+struct rdriveinfo
+  {
+   struct partialMatch *link;
+   struct joinNode *jlist;
+   struct rdriveinfo *next;
+  };
+
+void                           NetworkRetract(Environment *,struct patternMatch *);
+void                           ReturnPartialMatch(Environment *,struct partialMatch *);
+void                           DestroyPartialMatch(Environment *,struct partialMatch *);
+void                           FlushGarbagePartialMatches(Environment *);
+void                           DeletePartialMatches(Environment *,struct partialMatch *);
+void                           PosEntryRetractBeta(Environment *,struct partialMatch *,struct partialMatch *,int);
+void                           PosEntryRetractAlpha(Environment *,struct partialMatch *,int);
+bool                           PartialMatchWillBeDeleted(Environment *,struct partialMatch *);
+
+#endif /* _H_retract */
+
+
+
diff --git a/clips/router.c b/clips/router.c
new file mode 100755
index 000000000..89143e24f
--- /dev/null
+++ b/clips/router.c
@@ -0,0 +1,734 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                  I/O ROUTER MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides a centralized mechanism for handling    */
+/*   input and output requests.                              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed conversion of '\r' to '\n' from the    */
+/*            EnvGetcRouter function.                        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added support for passing context information  */
+/*            to the router functions.                       */
+/*                                                           */
+/*      6.30: Fixed issues with passing context to routers.  */
+/*                                                           */
+/*            Added AwaitingInput flag.                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Added InputBufferCount function.               */
+/*                                                           */
+/*            Added check for reuse of existing router name. */
+/*                                                           */
+/*            Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Changed return values for router functions.    */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "filertr.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "scanner.h"
+#include "strngrtr.h"
+#include "sysdep.h"
+
+#include "router.h"
+
+/**********************/
+/* STRING DEFINITIONS */
+/**********************/
+
+   const char                    *STDIN = "stdin";
+   const char                    *STDOUT = "stdout";
+   const char                    *STDERR = "stderr";
+   const char                    *STDWRN = "stdwrn";
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    QueryRouter(Environment *,const char *,struct router *);
+   static void                    DeallocateRouterData(Environment *);
+
+/*********************************************************/
+/* InitializeDefaultRouters: Initializes output streams. */
+/*********************************************************/
+void InitializeDefaultRouters(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,ROUTER_DATA,sizeof(struct routerData),DeallocateRouterData);
+
+   RouterData(theEnv)->CommandBufferInputCount = 0;
+   RouterData(theEnv)->InputUngets = 0;
+   RouterData(theEnv)->AwaitingInput = true;
+
+   InitializeFileRouter(theEnv);
+   InitializeStringRouter(theEnv);
+  }
+
+/*************************************************/
+/* DeallocateRouterData: Deallocates environment */
+/*    data for I/O routers.                      */
+/*************************************************/
+static void DeallocateRouterData(
+  Environment *theEnv)
+  {
+   struct router *tmpPtr, *nextPtr;
+
+   tmpPtr = RouterData(theEnv)->ListOfRouters;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      genfree(theEnv,(void *) tmpPtr->name,strlen(tmpPtr->name) + 1);
+      rtn_struct(theEnv,router,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/*********************/
+/* PrintRouterExists */
+/*********************/
+bool PrintRouterExists(
+  Environment *theEnv,
+  const char *logicalName)
+  {
+   struct router *currentPtr;
+   
+   if (((char *) RouterData(theEnv)->FastSaveFilePtr) == logicalName)
+     { return true; }
+     
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+   while (currentPtr != NULL)
+     {
+      if ((currentPtr->writeCallback != NULL) ? QueryRouter(theEnv,logicalName,currentPtr) : false)
+        { return true; }
+      currentPtr = currentPtr->next;
+     }
+     
+   return false;
+  }
+
+/**********************************/
+/* Write: Generic print function. */
+/**********************************/
+void Write(
+  Environment *theEnv,
+  const char *str)
+  {
+   WriteString(theEnv,STDOUT,str);
+  }
+
+/************************************/
+/* Writeln: Generic print function. */
+/************************************/
+void Writeln(
+  Environment *theEnv,
+  const char *str)
+  {
+   WriteString(theEnv,STDOUT,str);
+   WriteString(theEnv,STDOUT,"\n");
+  }
+
+/****************************************/
+/* WriteString: Generic print function. */
+/****************************************/
+void WriteString(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *str)
+  {
+   struct router *currentPtr;
+
+   if (str == NULL) return;
+   
+   /*===================================================*/
+   /* If the "fast save" option is being used, then the */
+   /* logical name is actually a pointer to a file and  */
+   /* fprintf can be called directly to bypass querying */
+   /* all of the routers.                               */
+   /*===================================================*/
+
+   if (((char *) RouterData(theEnv)->FastSaveFilePtr) == logicalName)
+     {
+      fprintf(RouterData(theEnv)->FastSaveFilePtr,"%s",str);
+      return;
+     }
+
+   /*==============================================*/
+   /* Search through the list of routers until one */
+   /* is found that will handle the print request. */
+   /*==============================================*/
+
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+   while (currentPtr != NULL)
+     {
+      if ((currentPtr->writeCallback != NULL) ? QueryRouter(theEnv,logicalName,currentPtr) : false)
+        {
+         (*currentPtr->writeCallback)(theEnv,logicalName,str,currentPtr->context);
+         return;
+        }
+      currentPtr = currentPtr->next;
+     }
+
+   /*=====================================================*/
+   /* The logical name was not recognized by any routers. */
+   /*=====================================================*/
+
+   if (strcmp(STDERR,logicalName) != 0)
+     { UnrecognizedRouterMessage(theEnv,logicalName); }
+  }
+
+/***********************************************/
+/* ReadRouter: Generic get character function. */
+/***********************************************/
+int ReadRouter(
+  Environment *theEnv,
+  const char *logicalName)
+  {
+   struct router *currentPtr;
+   int inchar;
+
+   /*===================================================*/
+   /* If the "fast load" option is being used, then the */
+   /* logical name is actually a pointer to a file and  */
+   /* getc can be called directly to bypass querying    */
+   /* all of the routers.                               */
+   /*===================================================*/
+
+   if (((char *) RouterData(theEnv)->FastLoadFilePtr) == logicalName)
+     {
+      inchar = getc(RouterData(theEnv)->FastLoadFilePtr);
+
+      if ((inchar == '\r') || (inchar == '\n'))
+        {
+         if (((char *) RouterData(theEnv)->FastLoadFilePtr) == RouterData(theEnv)->LineCountRouter)
+           { IncrementLineCount(theEnv); }
+        }
+
+      /* if (inchar == '\r') return('\n'); */
+
+      return(inchar);
+     }
+
+   /*===============================================*/
+   /* If the "fast string get" option is being used */
+   /* for the specified logical name, then bypass   */
+   /* the router system and extract the character   */
+   /* directly from the fast get string.            */
+   /*===============================================*/
+
+   if (RouterData(theEnv)->FastCharGetRouter == logicalName)
+     {
+      inchar = (unsigned char) RouterData(theEnv)->FastCharGetString[RouterData(theEnv)->FastCharGetIndex];
+
+      RouterData(theEnv)->FastCharGetIndex++;
+
+      if (inchar == '\0') return(EOF);
+
+      if ((inchar == '\r') || (inchar == '\n'))
+        {
+         if (RouterData(theEnv)->FastCharGetRouter == RouterData(theEnv)->LineCountRouter)
+           { IncrementLineCount(theEnv); }
+        }
+
+      return(inchar);
+     }
+
+   /*==============================================*/
+   /* Search through the list of routers until one */
+   /* is found that will handle the getc request.  */
+   /*==============================================*/
+
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+   while (currentPtr != NULL)
+     {
+      if ((currentPtr->readCallback != NULL) ? QueryRouter(theEnv,logicalName,currentPtr) : false)
+        {
+         inchar = (*currentPtr->readCallback)(theEnv,logicalName,currentPtr->context);
+
+         if ((inchar == '\r') || (inchar == '\n'))
+           {
+            if ((RouterData(theEnv)->LineCountRouter != NULL) &&
+                (strcmp(logicalName,RouterData(theEnv)->LineCountRouter) == 0))
+              { IncrementLineCount(theEnv); }
+           }
+
+         return(inchar);
+        }
+      currentPtr = currentPtr->next;
+     }
+
+   /*=====================================================*/
+   /* The logical name was not recognized by any routers. */
+   /*=====================================================*/
+
+   UnrecognizedRouterMessage(theEnv,logicalName);
+   return(-1);
+  }
+
+/***************************************************/
+/* UnreadRouter: Generic unget character function. */
+/***************************************************/
+int UnreadRouter(
+  Environment *theEnv,
+  const char *logicalName,
+  int ch)
+  {
+   struct router *currentPtr;
+
+   /*===================================================*/
+   /* If the "fast load" option is being used, then the */
+   /* logical name is actually a pointer to a file and  */
+   /* ungetc can be called directly to bypass querying  */
+   /* all of the routers.                               */
+   /*===================================================*/
+
+   if (((char *) RouterData(theEnv)->FastLoadFilePtr) == logicalName)
+     {
+      if ((ch == '\r') || (ch == '\n'))
+        {
+         if (((char *) RouterData(theEnv)->FastLoadFilePtr) == RouterData(theEnv)->LineCountRouter)
+           { DecrementLineCount(theEnv); }
+        }
+
+      return ungetc(ch,RouterData(theEnv)->FastLoadFilePtr);
+     }
+
+   /*===============================================*/
+   /* If the "fast string get" option is being used */
+   /* for the specified logical name, then bypass   */
+   /* the router system and unget the character     */
+   /* directly from the fast get string.            */
+   /*===============================================*/
+
+   if (RouterData(theEnv)->FastCharGetRouter == logicalName)
+     {
+      if ((ch == '\r') || (ch == '\n'))
+        {
+         if (RouterData(theEnv)->FastCharGetRouter == RouterData(theEnv)->LineCountRouter)
+           { DecrementLineCount(theEnv); }
+        }
+
+      if (RouterData(theEnv)->FastCharGetIndex > 0) RouterData(theEnv)->FastCharGetIndex--;
+      return ch;
+     }
+
+   /*===============================================*/
+   /* Search through the list of routers until one  */
+   /* is found that will handle the ungetc request. */
+   /*===============================================*/
+
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+   while (currentPtr != NULL)
+     {
+      if ((currentPtr->unreadCallback != NULL) ? QueryRouter(theEnv,logicalName,currentPtr) : false)
+        {
+         if ((ch == '\r') || (ch == '\n'))
+           {
+            if ((RouterData(theEnv)->LineCountRouter != NULL) &&
+                (strcmp(logicalName,RouterData(theEnv)->LineCountRouter) == 0))
+              { DecrementLineCount(theEnv); }
+           }
+
+         return (*currentPtr->unreadCallback)(theEnv,logicalName,ch,currentPtr->context);
+        }
+
+      currentPtr = currentPtr->next;
+     }
+
+   /*=====================================================*/
+   /* The logical name was not recognized by any routers. */
+   /*=====================================================*/
+
+   UnrecognizedRouterMessage(theEnv,logicalName);
+   return -1;
+  }
+
+/********************************************/
+/* ExitRouter: Generic exit function. Calls */
+/*   all of the router exit functions.      */
+/********************************************/
+void ExitRouter(
+  Environment *theEnv,
+  int num)
+  {
+   struct router *currentPtr, *nextPtr;
+
+   RouterData(theEnv)->Abort = false;
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+   while (currentPtr != NULL)
+     {
+      nextPtr = currentPtr->next;
+      if (currentPtr->active == true)
+        {
+         if (currentPtr->exitCallback != NULL)
+           {
+            (*currentPtr->exitCallback)(theEnv,num,currentPtr->context);
+           }
+        }
+      currentPtr = nextPtr;
+     }
+
+   if (RouterData(theEnv)->Abort) return;
+   genexit(theEnv,num);
+  }
+
+/********************************************/
+/* AbortExit: Forces ExitRouter to terminate */
+/*   after calling all closing routers.     */
+/********************************************/
+void AbortExit(
+  Environment *theEnv)
+  {
+   RouterData(theEnv)->Abort = true;
+  }
+
+/*********************************************************/
+/* AddRouter: Adds an I/O router to the list of routers. */
+/*********************************************************/
+bool AddRouter(
+  Environment *theEnv,
+  const char *routerName,
+  int priority,
+  RouterQueryFunction *queryFunction,
+  RouterWriteFunction *writeFunction,
+  RouterReadFunction *readFunction,
+  RouterUnreadFunction *unreadFunction,
+  RouterExitFunction *exitFunction,
+  void *context)
+  {
+   struct router *newPtr, *lastPtr, *currentPtr;
+   char  *nameCopy;
+
+   /*==================================================*/
+   /* Reject the router if the name is already in use. */
+   /*==================================================*/
+
+   for (currentPtr = RouterData(theEnv)->ListOfRouters;
+        currentPtr != NULL;
+        currentPtr = currentPtr->next)
+     {
+      if (strcmp(currentPtr->name,routerName) == 0)
+        { return false; }
+     }
+
+   newPtr = get_struct(theEnv,router);
+
+   nameCopy = (char *) genalloc(theEnv,strlen(routerName) + 1);
+   genstrcpy(nameCopy,routerName);
+   newPtr->name = nameCopy;
+
+   newPtr->active = true;
+   newPtr->context = context;
+   newPtr->priority = priority;
+   newPtr->queryCallback = queryFunction;
+   newPtr->writeCallback = writeFunction;
+   newPtr->exitCallback = exitFunction;
+   newPtr->readCallback = readFunction;
+   newPtr->unreadCallback = unreadFunction;
+   newPtr->next = NULL;
+
+   if (RouterData(theEnv)->ListOfRouters == NULL)
+     {
+      RouterData(theEnv)->ListOfRouters = newPtr;
+      return true;
+     }
+
+   lastPtr = NULL;
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = RouterData(theEnv)->ListOfRouters;
+      RouterData(theEnv)->ListOfRouters = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   return true;
+  }
+
+/*****************************************************************/
+/* DeleteRouter: Removes an I/O router from the list of routers. */
+/*****************************************************************/
+bool DeleteRouter(
+  Environment *theEnv,
+  const char *routerName)
+  {
+   struct router *currentPtr, *lastPtr;
+
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+   lastPtr = NULL;
+
+   while (currentPtr != NULL)
+     {
+      if (strcmp(currentPtr->name,routerName) == 0)
+        {
+         genfree(theEnv,(void *) currentPtr->name,strlen(currentPtr->name) + 1);
+         if (lastPtr == NULL)
+           {
+            RouterData(theEnv)->ListOfRouters = currentPtr->next;
+            rm(theEnv,currentPtr,sizeof(struct router));
+            return true;
+           }
+         lastPtr->next = currentPtr->next;
+         rm(theEnv,currentPtr,sizeof(struct router));
+         return true;
+        }
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   return false;
+  }
+
+/*********************************************************************/
+/* QueryRouters: Determines if any router recognizes a logical name. */
+/*********************************************************************/
+bool QueryRouters(
+  Environment *theEnv,
+  const char *logicalName)
+  {
+   struct router *currentPtr;
+
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+   while (currentPtr != NULL)
+     {
+      if (QueryRouter(theEnv,logicalName,currentPtr) == true) return true;
+      currentPtr = currentPtr->next;
+     }
+
+   return false;
+  }
+
+/************************************************/
+/* QueryRouter: Determines if a specific router */
+/*    recognizes a logical name.                */
+/************************************************/
+static bool QueryRouter(
+  Environment *theEnv,
+  const char *logicalName,
+  struct router *currentPtr)
+  {
+   /*===================================================*/
+   /* If the router is inactive, then it can't respond. */
+   /*===================================================*/
+
+   if (currentPtr->active == false)
+     { return false; }
+
+   /*=============================================================*/
+   /* If the router has no query function, then it can't respond. */
+   /*=============================================================*/
+
+   if (currentPtr->queryCallback == NULL) return false;
+
+   /*=========================================*/
+   /* Call the router's query function to see */
+   /* if it recognizes the logical name.      */
+   /*=========================================*/
+
+   if ((*currentPtr->queryCallback)(theEnv,logicalName,currentPtr->context) == true)
+     { return true; }
+
+   return false;
+  }
+
+/*******************************************************/
+/* DeactivateRouter: Deactivates a specific router. */
+/*******************************************************/
+bool DeactivateRouter(
+  Environment *theEnv,
+  const char *routerName)
+  {
+   struct router *currentPtr;
+
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+
+   while (currentPtr != NULL)
+     {
+      if (strcmp(currentPtr->name,routerName) == 0)
+        {
+         currentPtr->active = false;
+         return true;
+        }
+      currentPtr = currentPtr->next;
+     }
+
+   return false;
+  }
+
+/************************************************/
+/* ActivateRouter: Activates a specific router. */
+/************************************************/
+bool ActivateRouter(
+  Environment *theEnv,
+  const char *routerName)
+  {
+   struct router *currentPtr;
+
+   currentPtr = RouterData(theEnv)->ListOfRouters;
+
+   while (currentPtr != NULL)
+     {
+      if (strcmp(currentPtr->name,routerName) == 0)
+        {
+         currentPtr->active = true;
+         return true;
+        }
+      currentPtr = currentPtr->next;
+     }
+
+   return false;
+  }
+
+/*****************************************/
+/* FindRouter: Locates the named router. */
+/*****************************************/
+Router *FindRouter(
+  Environment *theEnv,
+  const char *routerName)
+  {
+   Router *currentPtr;
+
+   for (currentPtr = RouterData(theEnv)->ListOfRouters;
+        currentPtr != NULL;
+        currentPtr = currentPtr->next)
+     {
+      if (strcmp(currentPtr->name,routerName) == 0)
+        { return currentPtr; }
+     }
+
+   return NULL;
+  }
+
+/********************************************************/
+/* SetFastLoad: Used to bypass router system for loads. */
+/********************************************************/
+void SetFastLoad(
+  Environment *theEnv,
+  FILE *filePtr)
+  {
+   RouterData(theEnv)->FastLoadFilePtr = filePtr;
+  }
+
+/********************************************************/
+/* SetFastSave: Used to bypass router system for saves. */
+/********************************************************/
+void SetFastSave(
+  Environment *theEnv,
+  FILE *filePtr)
+  {
+   RouterData(theEnv)->FastSaveFilePtr = filePtr;
+  }
+
+/******************************************************/
+/* GetFastLoad: Returns the "fast load" file pointer. */
+/******************************************************/
+FILE *GetFastLoad(
+  Environment *theEnv)
+  {
+   return(RouterData(theEnv)->FastLoadFilePtr);
+  }
+
+/******************************************************/
+/* GetFastSave: Returns the "fast save" file pointer. */
+/******************************************************/
+FILE *GetFastSave(
+  Environment *theEnv)
+  {
+   return(RouterData(theEnv)->FastSaveFilePtr);
+  }
+
+/*****************************************************/
+/* UnrecognizedRouterMessage: Standard error message */
+/*   for an unrecognized router name.                */
+/*****************************************************/
+void UnrecognizedRouterMessage(
+  Environment *theEnv,
+  const char *logicalName)
+  {
+   PrintErrorID(theEnv,"ROUTER",1,false);
+   WriteString(theEnv,STDERR,"Logical name '");
+   WriteString(theEnv,STDERR,logicalName);
+   WriteString(theEnv,STDERR,"' was not recognized by any routers.\n");
+  }
+
+/*****************************************/
+/* PrintNRouter: Generic print function. */
+/*****************************************/
+void PrintNRouter(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *str,
+  unsigned long length)
+  {
+   char *tempStr;
+
+   tempStr = (char *) genalloc(theEnv,length+1);
+   genstrncpy(tempStr,str,length);
+   tempStr[length] = 0;
+   WriteString(theEnv,logicalName,tempStr);
+   genfree(theEnv,tempStr,length+1);
+  }
+
+/*********************/
+/* InputBufferCount: */
+/*********************/
+size_t InputBufferCount(
+   Environment *theEnv)
+   {
+    return RouterData(theEnv)->CommandBufferInputCount;
+   }
diff --git a/clips/router.h b/clips/router.h
new file mode 100755
index 000000000..f16cc0615
--- /dev/null
+++ b/clips/router.h
@@ -0,0 +1,145 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  01/15/18            */
+   /*                                                     */
+   /*                 ROUTER HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides a centralized mechanism for handling    */
+/*   input and output requests.                              */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed conversion of '\r' to '\n' from the    */
+/*            EnvGetcRouter function.                        */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added support for passing context information  */
+/*            to the router functions.                       */
+/*                                                           */
+/*      6.30: Fixed issues with passing context to routers.  */
+/*                                                           */
+/*            Added AwaitingInput flag.                      */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Added STDOUT and STDIN logical name            */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.40: Added InputBufferCount function.               */
+/*                                                           */
+/*            Added check for reuse of existing router name. */
+/*                                                           */
+/*            Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Changed return values for router functions.    */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed WPROMPT, WDISPLAY, WTRACE, and WDIALOG */
+/*            logical names.                                 */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_router
+
+#pragma once
+
+#define _H_router
+
+#include <stdio.h>
+
+typedef struct router Router;
+typedef bool RouterQueryFunction(Environment *,const char *,void *);
+typedef void RouterWriteFunction(Environment *,const char *,const char *,void *);
+typedef void RouterExitFunction(Environment *,int,void *);
+typedef int RouterReadFunction(Environment *,const char *,void *);
+typedef int RouterUnreadFunction(Environment *,const char *,int,void *);
+
+extern const char *STDOUT;
+extern const char *STDIN;
+extern const char *STDERR;
+extern const char *STDWRN;
+
+#define ROUTER_DATA 46
+
+struct router
+  {
+   const char *name;
+   bool active;
+   int priority;
+   void *context;
+   RouterQueryFunction *queryCallback;
+   RouterWriteFunction *writeCallback;
+   RouterExitFunction *exitCallback;
+   RouterReadFunction *readCallback;
+   RouterUnreadFunction *unreadCallback;
+   Router *next;
+  };
+
+struct routerData
+  {
+   size_t CommandBufferInputCount;
+   size_t InputUngets;
+   bool AwaitingInput;
+   const char *LineCountRouter;
+   const char *FastCharGetRouter;
+   const char *FastCharGetString;
+   long FastCharGetIndex;
+   struct router *ListOfRouters;
+   FILE *FastLoadFilePtr;
+   FILE *FastSaveFilePtr;
+   bool Abort;
+  };
+
+#define RouterData(theEnv) ((struct routerData *) GetEnvironmentData(theEnv,ROUTER_DATA))
+
+   void                           InitializeDefaultRouters(Environment *);
+   void                           WriteString(Environment *,const char *,const char *);
+   void                           Write(Environment *,const char *);
+   void                           Writeln(Environment *,const char *);
+   int                            ReadRouter(Environment *,const char *);
+   int                            UnreadRouter(Environment *,const char *,int);
+   void                           ExitRouter(Environment *,int);
+   void                           AbortExit(Environment *);
+   bool                           AddRouter(Environment *,const char *,int,
+                                            RouterQueryFunction *,RouterWriteFunction *,
+                                            RouterReadFunction *,RouterUnreadFunction *,
+                                            RouterExitFunction *,void *);
+   bool                           DeleteRouter(Environment *,const char *);
+   bool                           QueryRouters(Environment *,const char *);
+   bool                           DeactivateRouter(Environment *,const char *);
+   bool                           ActivateRouter(Environment *,const char *);
+   void                           SetFastLoad(Environment *,FILE *);
+   void                           SetFastSave(Environment *,FILE *);
+   FILE                          *GetFastLoad(Environment *);
+   FILE                          *GetFastSave(Environment *);
+   void                           UnrecognizedRouterMessage(Environment *,const char *);
+   void                           PrintNRouter(Environment *,const char *,const char *,unsigned long);
+   size_t                         InputBufferCount(Environment *);
+   Router                        *FindRouter(Environment *,const char *);
+   bool                           PrintRouterExists(Environment *,const char *);
+
+#endif /* _H_router */
diff --git a/clips/rulebin.c b/clips/rulebin.c
new file mode 100755
index 000000000..bf284c105
--- /dev/null
+++ b/clips/rulebin.c
@@ -0,0 +1,1136 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*              DEFRULE BSAVE/BLOAD MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for the  */
+/*    defrule construct.                                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*      Barry Cameron                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES,        */
+/*            DYNAMIC_SALIENCE, and LOGICAL_DEPENDENCIES     */
+/*            compilation flags.                             */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Added support for alpha memories.              */
+/*                                                           */
+/*            Added salience groups to improve performance   */
+/*            with large numbers of activations of different */
+/*            saliences.                                     */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+
+#include <stdio.h>
+#include <string.h>
+
+#include "agenda.h"
+#include "bload.h"
+#include "bsave.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "moduldef.h"
+#include "pattern.h"
+#include "reteutil.h"
+#include "retract.h"
+#include "rulebsc.h"
+
+#include "rulebin.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                    BsaveFind(Environment *);
+   static void                    BsaveExpressions(Environment *,FILE *);
+   static void                    BsaveStorage(Environment *,FILE *);
+   static void                    BsaveBinaryItem(Environment *,FILE *);
+   static void                    BsaveJoins(Environment *,FILE *);
+   static void                    BsaveJoin(Environment *,FILE *,struct joinNode *);
+   static void                    BsaveDisjuncts(Environment *,FILE *,Defrule *);
+   static void                    BsaveTraverseJoins(Environment *,FILE *,struct joinNode *);
+   static void                    BsaveLinks(Environment *,FILE *);
+   static void                    BsaveTraverseLinks(Environment *,FILE *,struct joinNode *);
+   static void                    BsaveLink(FILE *,struct joinLink *);
+#endif
+   static void                    BloadStorage(Environment *);
+   static void                    BloadBinaryItem(Environment *);
+   static void                    UpdateDefruleModule(Environment *,void *,unsigned long);
+   static void                    UpdateDefrule(Environment *,void *,unsigned long);
+   static void                    UpdateJoin(Environment *,void *,unsigned long);
+   static void                    UpdateLink(Environment *,void *,unsigned long);
+   static void                    ClearBload(Environment *);
+   static void                    DeallocateDefruleBloadData(Environment *);
+
+/*****************************************************/
+/* DefruleBinarySetup: Installs the binary save/load */
+/*   feature for the defrule construct.              */
+/*****************************************************/
+void DefruleBinarySetup(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,RULEBIN_DATA,sizeof(struct defruleBinaryData),DeallocateDefruleBloadData);
+
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"defrule",20,BsaveFind,BsaveExpressions,
+                             BsaveStorage,BsaveBinaryItem,
+                             BloadStorage,BloadBinaryItem,
+                             ClearBload);
+#endif
+#if BLOAD || BLOAD_ONLY
+   AddBinaryItem(theEnv,"defrule",20,NULL,NULL,NULL,NULL,
+                             BloadStorage,BloadBinaryItem,
+                             ClearBload);
+#endif
+  }
+
+/*******************************************************/
+/* DeallocateDefruleBloadData: Deallocates environment */
+/*    data for the defrule bsave functionality.        */
+/*******************************************************/
+static void DeallocateDefruleBloadData(
+  Environment *theEnv)
+  {
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+   size_t space;
+   unsigned long i;
+   struct defruleModule *theModuleItem;
+   struct activation *theActivation, *tmpActivation;
+   struct salienceGroup *theGroup, *tmpGroup;
+
+   for (i = 0; i < DefruleBinaryData(theEnv)->NumberOfJoins; i++)
+     {
+      DestroyBetaMemory(theEnv,&DefruleBinaryData(theEnv)->JoinArray[i],LHS);
+      DestroyBetaMemory(theEnv,&DefruleBinaryData(theEnv)->JoinArray[i],RHS);
+      ReturnLeftMemory(theEnv,&DefruleBinaryData(theEnv)->JoinArray[i]);
+      ReturnRightMemory(theEnv,&DefruleBinaryData(theEnv)->JoinArray[i]);
+     }
+
+   for (i = 0; i < DefruleBinaryData(theEnv)->NumberOfDefruleModules; i++)
+     {
+      theModuleItem = &DefruleBinaryData(theEnv)->ModuleArray[i];
+
+      theActivation = theModuleItem->agenda;
+      while (theActivation != NULL)
+        {
+         tmpActivation = theActivation->next;
+
+         rtn_struct(theEnv,activation,theActivation);
+
+         theActivation = tmpActivation;
+        }
+
+      theGroup = theModuleItem->groupings;
+      while (theGroup != NULL)
+        {
+         tmpGroup = theGroup->next;
+
+         rtn_struct(theEnv,salienceGroup,theGroup);
+
+         theGroup = tmpGroup;
+        }
+     }
+
+   space = DefruleBinaryData(theEnv)->NumberOfDefruleModules * sizeof(struct defruleModule);
+   if (space != 0) genfree(theEnv,DefruleBinaryData(theEnv)->ModuleArray,space);
+
+   space = DefruleBinaryData(theEnv)->NumberOfDefrules * sizeof(Defrule);
+   if (space != 0) genfree(theEnv,DefruleBinaryData(theEnv)->DefruleArray,space);
+
+   space = DefruleBinaryData(theEnv)->NumberOfJoins * sizeof(struct joinNode);
+   if (space != 0) genfree(theEnv,DefruleBinaryData(theEnv)->JoinArray,space);
+
+   space = DefruleBinaryData(theEnv)->NumberOfLinks * sizeof(struct joinLink);
+   if (space != 0) genfree(theEnv,DefruleBinaryData(theEnv)->LinkArray,space);
+
+   if (Bloaded(theEnv))
+     { rm(theEnv,DefruleData(theEnv)->AlphaMemoryTable,sizeof(ALPHA_MEMORY_HASH *) * ALPHA_MEMORY_HASH_SIZE); }
+#endif
+  }
+
+#if BLOAD_AND_BSAVE
+
+/*************************************************************/
+/* BsaveFind: Determines the amount of memory needed to save */
+/*   the defrule and joinNode data structures in addition to */
+/*   the memory needed for their associated expressions.     */
+/*************************************************************/
+static void BsaveFind(
+  Environment *theEnv)
+  {
+   Defrule *theDefrule, *theDisjunct;
+   Defmodule *theModule;
+
+   /*=======================================================*/
+   /* If a binary image is already loaded, then temporarily */
+   /* save the count values since these will be overwritten */
+   /* in the process of saving the binary image.            */
+   /*=======================================================*/
+
+   SaveBloadCount(theEnv,DefruleBinaryData(theEnv)->NumberOfDefruleModules);
+   SaveBloadCount(theEnv,DefruleBinaryData(theEnv)->NumberOfDefrules);
+   SaveBloadCount(theEnv,DefruleBinaryData(theEnv)->NumberOfJoins);
+   SaveBloadCount(theEnv,DefruleBinaryData(theEnv)->NumberOfLinks);
+
+   /*====================================================*/
+   /* Set the binary save ID for defrule data structures */
+   /* and count the number of each type.                 */
+   /*====================================================*/
+
+   TagRuleNetwork(theEnv,&DefruleBinaryData(theEnv)->NumberOfDefruleModules,
+                         &DefruleBinaryData(theEnv)->NumberOfDefrules,
+                         &DefruleBinaryData(theEnv)->NumberOfJoins,
+                         &DefruleBinaryData(theEnv)->NumberOfLinks);
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*============================*/
+      /* Set the current module to  */
+      /* the module being examined. */
+      /*============================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*==================================================*/
+      /* Loop through each defrule in the current module. */
+      /*==================================================*/
+
+      for (theDefrule = GetNextDefrule(theEnv,NULL);
+           theDefrule != NULL;
+           theDefrule = GetNextDefrule(theEnv,theDefrule))
+        {
+         /*================================================*/
+         /* Initialize the construct header for the binary */
+         /* save. The binary save ID has already been set. */
+         /*================================================*/
+
+         MarkConstructHeaderNeededItems(&theDefrule->header,theDefrule->header.bsaveID);
+
+         /*===========================================*/
+         /* Count and mark data structures associated */
+         /* with dynamic salience.                    */
+         /*===========================================*/
+
+         ExpressionData(theEnv)->ExpressionCount += ExpressionSize(theDefrule->dynamicSalience);
+         MarkNeededItems(theEnv,theDefrule->dynamicSalience);
+
+         /*==========================================*/
+         /* Loop through each disjunct of the rule   */
+         /* counting and marking the data structures */
+         /* associated with RHS actions.             */
+         /*==========================================*/
+
+         for (theDisjunct = theDefrule;
+              theDisjunct != NULL;
+              theDisjunct = theDisjunct->disjunct)
+           {
+            ExpressionData(theEnv)->ExpressionCount += ExpressionSize(theDisjunct->actions);
+            MarkNeededItems(theEnv,theDisjunct->actions);
+           }
+        }
+     }
+
+   /*===============================*/
+   /* Reset the bsave tags assigned */
+   /* to defrule data structures.   */
+   /*===============================*/
+
+   MarkRuleNetwork(theEnv,1);
+  }
+
+/************************************************/
+/* BsaveExpressions: Saves the expressions used */
+/*   by defrules to the binary save file.       */
+/************************************************/
+static void BsaveExpressions(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   Defrule *theDefrule, *theDisjunct;
+   Defmodule *theModule;
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*======================================================*/
+      /* Set the current module to the module being examined. */
+      /*======================================================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*==================================================*/
+      /* Loop through each defrule in the current module. */
+      /*==================================================*/
+
+      for (theDefrule = GetNextDefrule(theEnv,NULL);
+           theDefrule != NULL;
+           theDefrule = GetNextDefrule(theEnv,theDefrule))
+        {
+         /*===========================================*/
+         /* Save the dynamic salience of the defrule. */
+         /*===========================================*/
+
+         BsaveExpression(theEnv,theDefrule->dynamicSalience,fp);
+
+         /*===================================*/
+         /* Loop through each disjunct of the */
+         /* defrule and save its RHS actions. */
+         /*===================================*/
+
+         for (theDisjunct = theDefrule;
+              theDisjunct != NULL;
+              theDisjunct = theDisjunct->disjunct)
+           { BsaveExpression(theEnv,theDisjunct->actions,fp); }
+        }
+     }
+
+   /*==============================*/
+   /* Set the marked flag for each */
+   /* join in the join network.    */
+   /*==============================*/
+
+   MarkRuleNetwork(theEnv,1);
+  }
+
+/*****************************************************/
+/* BsaveStorage: Writes out storage requirements for */
+/*   all defrule structures to the binary file       */
+/*****************************************************/
+static void BsaveStorage(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   unsigned long value;
+
+   space = sizeof(long) * 5;
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&DefruleBinaryData(theEnv)->NumberOfDefruleModules,sizeof(long),fp);
+   GenWrite(&DefruleBinaryData(theEnv)->NumberOfDefrules,sizeof(long),fp);
+   GenWrite(&DefruleBinaryData(theEnv)->NumberOfJoins,sizeof(long),fp);
+   GenWrite(&DefruleBinaryData(theEnv)->NumberOfLinks,sizeof(long),fp);
+
+   if (DefruleData(theEnv)->RightPrimeJoins == NULL)
+     { value = ULONG_MAX; }
+   else
+     { value = DefruleData(theEnv)->RightPrimeJoins->bsaveID; }
+
+   GenWrite(&value,sizeof(unsigned long),fp);
+
+   if (DefruleData(theEnv)->LeftPrimeJoins == NULL)
+     { value = ULONG_MAX; }
+   else
+     { value = DefruleData(theEnv)->LeftPrimeJoins->bsaveID; }
+
+   GenWrite(&value,sizeof(unsigned long),fp);
+  }
+
+/*******************************************/
+/* BsaveBinaryItem: Writes out all defrule */
+/*   structures to the binary file.        */
+/*******************************************/
+static void BsaveBinaryItem(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   Defrule *theDefrule;
+   Defmodule *theModule;
+   struct defruleModule *theModuleItem;
+   struct bsaveDefruleModule tempDefruleModule;
+
+   /*===============================================*/
+   /* Write out the space required by the defrules. */
+   /*===============================================*/
+
+   space = (DefruleBinaryData(theEnv)->NumberOfDefrules * sizeof(struct bsaveDefrule)) +
+           (DefruleBinaryData(theEnv)->NumberOfJoins * sizeof(struct bsaveJoinNode)) +
+           (DefruleBinaryData(theEnv)->NumberOfLinks * sizeof(struct bsaveJoinLink)) +
+           (DefruleBinaryData(theEnv)->NumberOfDefruleModules * sizeof(struct bsaveDefruleModule));
+   GenWrite(&space,sizeof(size_t),fp);
+
+   /*===============================================*/
+   /* Write out each defrule module data structure. */
+   /*===============================================*/
+
+   DefruleBinaryData(theEnv)->NumberOfDefrules = 0;
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      theModuleItem = (struct defruleModule *)
+                      GetModuleItem(theEnv,NULL,FindModuleItem(theEnv,"defrule")->moduleIndex);
+      AssignBsaveDefmdlItemHdrVals(&tempDefruleModule.header,
+                                           &theModuleItem->header);
+      GenWrite(&tempDefruleModule,sizeof(struct bsaveDefruleModule),fp);
+     }
+
+   /*========================================*/
+   /* Write out each defrule data structure. */
+   /*========================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      for (theDefrule = GetNextDefrule(theEnv,NULL);
+           theDefrule != NULL;
+           theDefrule = GetNextDefrule(theEnv,theDefrule))
+        { BsaveDisjuncts(theEnv,fp,theDefrule); }
+     }
+
+   /*=============================*/
+   /* Write out the Rete Network. */
+   /*=============================*/
+
+   MarkRuleNetwork(theEnv,1);
+   BsaveJoins(theEnv,fp);
+
+   /*===========================*/
+   /* Write out the join links. */
+   /*===========================*/
+
+   MarkRuleNetwork(theEnv,1);
+   BsaveLinks(theEnv,fp);
+
+   /*=============================================================*/
+   /* If a binary image was already loaded when the bsave command */
+   /* was issued, then restore the counts indicating the number   */
+   /* of defrules, defrule modules, and joins in the binary image */
+   /* (these were overwritten by the binary save).                */
+   /*=============================================================*/
+
+   RestoreBloadCount(theEnv,&DefruleBinaryData(theEnv)->NumberOfDefruleModules);
+   RestoreBloadCount(theEnv,&DefruleBinaryData(theEnv)->NumberOfDefrules);
+   RestoreBloadCount(theEnv,&DefruleBinaryData(theEnv)->NumberOfJoins);
+   RestoreBloadCount(theEnv,&DefruleBinaryData(theEnv)->NumberOfLinks);
+  }
+
+/************************************************************/
+/* BsaveDisjuncts: Writes out all the disjunct defrule data */
+/*   structures for a specific rule to the binary file.     */
+/************************************************************/
+static void BsaveDisjuncts(
+  Environment *theEnv,
+  FILE *fp,
+  Defrule *theDefrule)
+  {
+   Defrule *theDisjunct;
+   struct bsaveDefrule tempDefrule;
+   unsigned long disjunctExpressionCount = 0;
+   bool first;
+
+   /*=========================================*/
+   /* Loop through each disjunct of the rule. */
+   /*=========================================*/
+
+   for (theDisjunct = theDefrule, first = true;
+        theDisjunct != NULL;
+        theDisjunct = theDisjunct->disjunct, first = false)
+     {
+      DefruleBinaryData(theEnv)->NumberOfDefrules++;
+
+      /*======================================*/
+      /* Set header and miscellaneous values. */
+      /*======================================*/
+
+      AssignBsaveConstructHeaderVals(&tempDefrule.header,
+                                     &theDisjunct->header);
+      tempDefrule.salience = theDisjunct->salience;
+      tempDefrule.localVarCnt = theDisjunct->localVarCnt;
+      tempDefrule.complexity = theDisjunct->complexity;
+      tempDefrule.autoFocus = theDisjunct->autoFocus;
+
+      /*=======================================*/
+      /* Set dynamic salience data structures. */
+      /*=======================================*/
+
+      if (theDisjunct->dynamicSalience != NULL)
+        {
+         if (first)
+           {
+            tempDefrule.dynamicSalience = ExpressionData(theEnv)->ExpressionCount;
+            disjunctExpressionCount = ExpressionData(theEnv)->ExpressionCount;
+            ExpressionData(theEnv)->ExpressionCount += ExpressionSize(theDisjunct->dynamicSalience);
+           }
+         else
+           { tempDefrule.dynamicSalience = disjunctExpressionCount; }
+        }
+      else
+        { tempDefrule.dynamicSalience = ULONG_MAX; }
+
+      /*==============================================*/
+      /* Set the index to the disjunct's RHS actions. */
+      /*==============================================*/
+
+      if (theDisjunct->actions != NULL)
+        {
+         tempDefrule.actions = ExpressionData(theEnv)->ExpressionCount;
+         ExpressionData(theEnv)->ExpressionCount += ExpressionSize(theDisjunct->actions);
+        }
+      else
+        { tempDefrule.actions = ULONG_MAX; }
+
+      /*=================================*/
+      /* Set the index to the disjunct's */
+      /* logical join and last join.     */
+      /*=================================*/
+
+      tempDefrule.logicalJoin = BsaveJoinIndex(theDisjunct->logicalJoin);
+      tempDefrule.lastJoin = BsaveJoinIndex(theDisjunct->lastJoin);
+
+      /*=====================================*/
+      /* Set the index to the next disjunct. */
+      /*=====================================*/
+
+      if (theDisjunct->disjunct != NULL)
+        { tempDefrule.disjunct = DefruleBinaryData(theEnv)->NumberOfDefrules; }
+      else
+        { tempDefrule.disjunct = ULONG_MAX; }
+
+      /*=================================*/
+      /* Write the disjunct to the file. */
+      /*=================================*/
+
+      GenWrite(&tempDefrule,sizeof(struct bsaveDefrule),fp);
+     }
+  }
+
+/********************************************/
+/* BsaveJoins: Writes out all the join node */
+/*   data structures to the binary file.    */
+/********************************************/
+static void BsaveJoins(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   Defrule *rulePtr, *disjunctPtr;
+   Defmodule *theModule;
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      /*===========================================*/
+      /* Loop through each rule and its disjuncts. */
+      /*===========================================*/
+
+      rulePtr = GetNextDefrule(theEnv,NULL);
+      while (rulePtr != NULL)
+        {
+         /*=========================================*/
+         /* Loop through each join of the disjunct. */
+         /*=========================================*/
+
+         for (disjunctPtr = rulePtr; disjunctPtr != NULL; disjunctPtr = disjunctPtr->disjunct)
+           { BsaveTraverseJoins(theEnv,fp,disjunctPtr->lastJoin); }
+
+         /*===========================*/
+         /* Move on to the next rule. */
+         /*===========================*/
+
+         rulePtr = GetNextDefrule(theEnv,rulePtr);
+        }
+     }
+  }
+
+/**************************************************************/
+/* BsaveTraverseJoins: Traverses the join network for a rule. */
+/**************************************************************/
+static void BsaveTraverseJoins(
+  Environment *theEnv,
+  FILE *fp,
+  struct joinNode *joinPtr)
+  {
+   for (;
+        joinPtr != NULL;
+        joinPtr = joinPtr->lastLevel)
+     {
+      if (joinPtr->marked) BsaveJoin(theEnv,fp,joinPtr);
+
+      if (joinPtr->joinFromTheRight)
+        { BsaveTraverseJoins(theEnv,fp,(struct joinNode *) joinPtr->rightSideEntryStructure); }
+     }
+  }
+
+/********************************************/
+/* BsaveJoin: Writes out a single join node */
+/*   data structure to the binary file.     */
+/********************************************/
+static void BsaveJoin(
+  Environment *theEnv,
+  FILE *fp,
+  struct joinNode *joinPtr)
+  {
+   struct bsaveJoinNode tempJoin;
+
+   joinPtr->marked = 0;
+   tempJoin.depth = joinPtr->depth;
+   tempJoin.rhsType = joinPtr->rhsType;
+   tempJoin.firstJoin = joinPtr->firstJoin;
+   tempJoin.logicalJoin = joinPtr->logicalJoin;
+   tempJoin.joinFromTheRight = joinPtr->joinFromTheRight;
+   tempJoin.patternIsNegated = joinPtr->patternIsNegated;
+   tempJoin.patternIsExists = joinPtr->patternIsExists;
+
+   if (joinPtr->joinFromTheRight)
+     { tempJoin.rightSideEntryStructure = BsaveJoinIndex(joinPtr->rightSideEntryStructure); }
+   else
+     { tempJoin.rightSideEntryStructure = ULONG_MAX; }
+
+   tempJoin.lastLevel =  BsaveJoinIndex(joinPtr->lastLevel);
+   tempJoin.nextLinks =  BsaveJoinLinkIndex(joinPtr->nextLinks);
+   tempJoin.rightMatchNode =  BsaveJoinIndex(joinPtr->rightMatchNode);
+   tempJoin.networkTest = HashedExpressionIndex(theEnv,joinPtr->networkTest);
+   tempJoin.secondaryNetworkTest = HashedExpressionIndex(theEnv,joinPtr->secondaryNetworkTest);
+   tempJoin.leftHash = HashedExpressionIndex(theEnv,joinPtr->leftHash);
+   tempJoin.rightHash = HashedExpressionIndex(theEnv,joinPtr->rightHash);
+
+   if (joinPtr->ruleToActivate != NULL)
+     {
+      tempJoin.ruleToActivate =
+         GetDisjunctIndex(joinPtr->ruleToActivate);
+     }
+   else
+     { tempJoin.ruleToActivate = ULONG_MAX; }
+
+   GenWrite(&tempJoin,sizeof(struct bsaveJoinNode),fp);
+  }
+
+/********************************************/
+/* BsaveLinks: Writes out all the join link */
+/*   data structures to the binary file.    */
+/********************************************/
+static void BsaveLinks(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   Defrule *rulePtr, *disjunctPtr;
+   Defmodule *theModule;
+   struct joinLink *theLink;
+
+   for (theLink = DefruleData(theEnv)->LeftPrimeJoins;
+        theLink != NULL;
+        theLink = theLink->next)
+     { BsaveLink(fp,theLink);  }
+
+   for (theLink = DefruleData(theEnv)->RightPrimeJoins;
+        theLink != NULL;
+        theLink = theLink->next)
+     { BsaveLink(fp,theLink);  }
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      /*===========================================*/
+      /* Loop through each rule and its disjuncts. */
+      /*===========================================*/
+
+      rulePtr = GetNextDefrule(theEnv,NULL);
+      while (rulePtr != NULL)
+        {
+         /*=========================================*/
+         /* Loop through each join of the disjunct. */
+         /*=========================================*/
+
+         for (disjunctPtr = rulePtr; disjunctPtr != NULL; disjunctPtr = disjunctPtr->disjunct)
+           { BsaveTraverseLinks(theEnv,fp,disjunctPtr->lastJoin); }
+
+         /*=======================================*/
+         /* Move on to the next rule or disjunct. */
+         /*=======================================*/
+
+         rulePtr = GetNextDefrule(theEnv,rulePtr);
+        }
+     }
+  }
+
+/***************************************************/
+/* BsaveTraverseLinks: Traverses the join network */
+/*   for a rule saving the join links.            */
+/**************************************************/
+static void BsaveTraverseLinks(
+  Environment *theEnv,
+  FILE *fp,
+  struct joinNode *joinPtr)
+  {
+   struct joinLink *theLink;
+
+   for (;
+        joinPtr != NULL;
+        joinPtr = joinPtr->lastLevel)
+     {
+      if (joinPtr->marked)
+        {
+         for (theLink = joinPtr->nextLinks;
+              theLink != NULL;
+              theLink = theLink->next)
+           { BsaveLink(fp,theLink); }
+
+         joinPtr->marked = 0;
+        }
+
+      if (joinPtr->joinFromTheRight)
+        { BsaveTraverseLinks(theEnv,fp,(struct joinNode *) joinPtr->rightSideEntryStructure); }
+     }
+  }
+
+/********************************************/
+/* BsaveLink: Writes out a single join link */
+/*   data structure to the binary file.     */
+/********************************************/
+static void BsaveLink(
+  FILE *fp,
+  struct joinLink *linkPtr)
+  {
+   struct bsaveJoinLink tempLink;
+
+   tempLink.enterDirection = linkPtr->enterDirection;
+   tempLink.join =  BsaveJoinIndex(linkPtr->join);
+   tempLink.next =  BsaveJoinLinkIndex(linkPtr->next);
+
+   GenWrite(&tempLink,sizeof(struct bsaveJoinLink),fp);
+  }
+
+/***********************************************************/
+/* AssignBsavePatternHeaderValues: Assigns the appropriate */
+/*   values to a bsave pattern header record.              */
+/***********************************************************/
+void AssignBsavePatternHeaderValues(
+  Environment *theEnv,
+  struct bsavePatternNodeHeader *theBsaveHeader,
+  struct patternNodeHeader *theHeader)
+  {
+   theBsaveHeader->multifieldNode = theHeader->multifieldNode;
+   theBsaveHeader->entryJoin = BsaveJoinIndex(theHeader->entryJoin);
+   theBsaveHeader->rightHash = HashedExpressionIndex(theEnv,theHeader->rightHash);
+   theBsaveHeader->singlefieldNode = theHeader->singlefieldNode;
+   theBsaveHeader->stopNode = theHeader->stopNode;
+   theBsaveHeader->beginSlot = theHeader->beginSlot;
+   theBsaveHeader->endSlot = theHeader->endSlot;
+   theBsaveHeader->selector = theHeader->selector;
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+/************************************************/
+/* BloadStorage: Loads storage requirements for */
+/*   the defrules used by this binary image.    */
+/************************************************/
+static void BloadStorage(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*=================================================*/
+   /* Determine the number of defrule, defruleModule, */
+   /* and joinNode data structures to be read.        */
+   /*=================================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   GenReadBinary(theEnv,&DefruleBinaryData(theEnv)->NumberOfDefruleModules,sizeof(long));
+   GenReadBinary(theEnv,&DefruleBinaryData(theEnv)->NumberOfDefrules,sizeof(long));
+   GenReadBinary(theEnv,&DefruleBinaryData(theEnv)->NumberOfJoins,sizeof(long));
+   GenReadBinary(theEnv,&DefruleBinaryData(theEnv)->NumberOfLinks,sizeof(long));
+   GenReadBinary(theEnv,&DefruleBinaryData(theEnv)->RightPrimeIndex,sizeof(long));
+   GenReadBinary(theEnv,&DefruleBinaryData(theEnv)->LeftPrimeIndex,sizeof(long));
+
+   /*===================================*/
+   /* Allocate the space needed for the */
+   /* defruleModule data structures.    */
+   /*===================================*/
+
+   if (DefruleBinaryData(theEnv)->NumberOfDefruleModules == 0)
+     {
+      DefruleBinaryData(theEnv)->ModuleArray = NULL;
+      DefruleBinaryData(theEnv)->DefruleArray = NULL;
+      DefruleBinaryData(theEnv)->JoinArray = NULL;
+     }
+
+   space = DefruleBinaryData(theEnv)->NumberOfDefruleModules * sizeof(struct defruleModule);
+   DefruleBinaryData(theEnv)->ModuleArray = (struct defruleModule *) genalloc(theEnv,space);
+
+   /*===============================*/
+   /* Allocate the space needed for */
+   /* the defrule data structures.  */
+   /*===============================*/
+
+   if (DefruleBinaryData(theEnv)->NumberOfDefrules == 0)
+     {
+      DefruleBinaryData(theEnv)->DefruleArray = NULL;
+      DefruleBinaryData(theEnv)->JoinArray = NULL;
+      return;
+     }
+
+   space = DefruleBinaryData(theEnv)->NumberOfDefrules * sizeof(Defrule);
+   DefruleBinaryData(theEnv)->DefruleArray = (Defrule *) genalloc(theEnv,space);
+
+   /*===============================*/
+   /* Allocate the space needed for */
+   /* the joinNode data structures. */
+   /*===============================*/
+
+   space = DefruleBinaryData(theEnv)->NumberOfJoins * sizeof(struct joinNode);
+   DefruleBinaryData(theEnv)->JoinArray = (struct joinNode *) genalloc(theEnv,space);
+
+   /*===============================*/
+   /* Allocate the space needed for */
+   /* the joinNode data structures. */
+   /*===============================*/
+
+   space = DefruleBinaryData(theEnv)->NumberOfLinks * sizeof(struct joinLink);
+   DefruleBinaryData(theEnv)->LinkArray = (struct joinLink *) genalloc(theEnv,space);
+  }
+
+/****************************************************/
+/* BloadBinaryItem: Loads and refreshes the defrule */
+/*   constructs used by this binary image.          */
+/****************************************************/
+static void BloadBinaryItem(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*======================================================*/
+   /* Read in the amount of space used by the binary image */
+   /* (this is used to skip the construct in the event it  */
+   /* is not available in the version being run).          */
+   /*======================================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+
+   /*===========================================*/
+   /* Read in the defruleModule data structures */
+   /* and refresh the pointers.                 */
+   /*===========================================*/
+
+   BloadandRefresh(theEnv,DefruleBinaryData(theEnv)->NumberOfDefruleModules,
+                   sizeof(struct bsaveDefruleModule),UpdateDefruleModule);
+
+   /*=====================================*/
+   /* Read in the defrule data structures */
+   /* and refresh the pointers.           */
+   /*=====================================*/
+
+   BloadandRefresh(theEnv,DefruleBinaryData(theEnv)->NumberOfDefrules,
+                   sizeof(struct bsaveDefrule),UpdateDefrule);
+
+   /*======================================*/
+   /* Read in the joinNode data structures */
+   /* and refresh the pointers.            */
+   /*======================================*/
+
+   BloadandRefresh(theEnv,DefruleBinaryData(theEnv)->NumberOfJoins,
+                   sizeof(struct bsaveJoinNode),UpdateJoin);
+
+   /*======================================*/
+   /* Read in the joinLink data structures */
+   /* and refresh the pointers.            */
+   /*======================================*/
+
+   BloadandRefresh(theEnv,DefruleBinaryData(theEnv)->NumberOfLinks,
+                   sizeof(struct bsaveJoinLink),UpdateLink);
+
+   DefruleData(theEnv)->RightPrimeJoins = BloadJoinLinkPointer(DefruleBinaryData(theEnv)->RightPrimeIndex);
+   DefruleData(theEnv)->LeftPrimeJoins = BloadJoinLinkPointer(DefruleBinaryData(theEnv)->LeftPrimeIndex);
+  }
+
+/**********************************************/
+/* UpdateDefruleModule: Bload refresh routine */
+/*   for defrule module data structures.      */
+/**********************************************/
+static void UpdateDefruleModule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveDefruleModule *bdmPtr;
+
+   bdmPtr = (struct bsaveDefruleModule *) buf;
+   UpdateDefmoduleItemHeader(theEnv,&bdmPtr->header,&DefruleBinaryData(theEnv)->ModuleArray[obji].header,
+                             sizeof(Defrule),
+                             (void *) DefruleBinaryData(theEnv)->DefruleArray);
+   DefruleBinaryData(theEnv)->ModuleArray[obji].agenda = NULL;
+   DefruleBinaryData(theEnv)->ModuleArray[obji].groupings = NULL;
+
+  }
+
+/****************************************/
+/* UpdateDefrule: Bload refresh routine */
+/*   for defrule data structures.       */
+/****************************************/
+static void UpdateDefrule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveDefrule *br;
+
+   br = (struct bsaveDefrule *) buf;
+   UpdateConstructHeader(theEnv,&br->header,&DefruleBinaryData(theEnv)->DefruleArray[obji].header,DEFRULE,
+                         sizeof(struct defruleModule),(void *) DefruleBinaryData(theEnv)->ModuleArray,
+                         sizeof(Defrule),(void *) DefruleBinaryData(theEnv)->DefruleArray);
+
+   DefruleBinaryData(theEnv)->DefruleArray[obji].dynamicSalience = ExpressionPointer(br->dynamicSalience);
+
+   DefruleBinaryData(theEnv)->DefruleArray[obji].actions = ExpressionPointer(br->actions);
+   DefruleBinaryData(theEnv)->DefruleArray[obji].logicalJoin = BloadJoinPointer(br->logicalJoin);
+   DefruleBinaryData(theEnv)->DefruleArray[obji].lastJoin = BloadJoinPointer(br->lastJoin);
+   DefruleBinaryData(theEnv)->DefruleArray[obji].disjunct = BloadDefrulePointer(DefruleBinaryData(theEnv)->DefruleArray,br->disjunct);
+   DefruleBinaryData(theEnv)->DefruleArray[obji].salience = br->salience;
+   DefruleBinaryData(theEnv)->DefruleArray[obji].localVarCnt = br->localVarCnt;
+   DefruleBinaryData(theEnv)->DefruleArray[obji].complexity = br->complexity;
+   DefruleBinaryData(theEnv)->DefruleArray[obji].autoFocus = br->autoFocus;
+   DefruleBinaryData(theEnv)->DefruleArray[obji].executing = 0;
+   DefruleBinaryData(theEnv)->DefruleArray[obji].afterBreakpoint = 0;
+#if DEBUGGING_FUNCTIONS
+   DefruleBinaryData(theEnv)->DefruleArray[obji].watchActivation = AgendaData(theEnv)->WatchActivations;
+   DefruleBinaryData(theEnv)->DefruleArray[obji].watchFiring = DefruleData(theEnv)->WatchRules;
+#endif
+  }
+
+/*************************************/
+/* UpdateJoin: Bload refresh routine */
+/*   for joinNode data structures.   */
+/*************************************/
+static void UpdateJoin(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveJoinNode *bj;
+
+   bj = (struct bsaveJoinNode *) buf;
+   DefruleBinaryData(theEnv)->JoinArray[obji].firstJoin = bj->firstJoin;
+   DefruleBinaryData(theEnv)->JoinArray[obji].logicalJoin = bj->logicalJoin;
+   DefruleBinaryData(theEnv)->JoinArray[obji].joinFromTheRight = bj->joinFromTheRight;
+   DefruleBinaryData(theEnv)->JoinArray[obji].patternIsNegated = bj->patternIsNegated;
+   DefruleBinaryData(theEnv)->JoinArray[obji].patternIsExists = bj->patternIsExists;
+   DefruleBinaryData(theEnv)->JoinArray[obji].depth = bj->depth;
+   DefruleBinaryData(theEnv)->JoinArray[obji].rhsType = bj->rhsType;
+   DefruleBinaryData(theEnv)->JoinArray[obji].networkTest = HashedExpressionPointer(bj->networkTest);
+   DefruleBinaryData(theEnv)->JoinArray[obji].secondaryNetworkTest = HashedExpressionPointer(bj->secondaryNetworkTest);
+   DefruleBinaryData(theEnv)->JoinArray[obji].leftHash = HashedExpressionPointer(bj->leftHash);
+   DefruleBinaryData(theEnv)->JoinArray[obji].rightHash = HashedExpressionPointer(bj->rightHash);
+   DefruleBinaryData(theEnv)->JoinArray[obji].nextLinks = BloadJoinLinkPointer(bj->nextLinks);
+   DefruleBinaryData(theEnv)->JoinArray[obji].lastLevel = BloadJoinPointer(bj->lastLevel);
+
+   if (bj->joinFromTheRight == true)
+     { DefruleBinaryData(theEnv)->JoinArray[obji].rightSideEntryStructure =  (void *) BloadJoinPointer(bj->rightSideEntryStructure); }
+   else
+     { DefruleBinaryData(theEnv)->JoinArray[obji].rightSideEntryStructure = NULL; }
+
+   DefruleBinaryData(theEnv)->JoinArray[obji].rightMatchNode = BloadJoinPointer(bj->rightMatchNode);
+   DefruleBinaryData(theEnv)->JoinArray[obji].ruleToActivate = BloadDefrulePointer(DefruleBinaryData(theEnv)->DefruleArray,bj->ruleToActivate);
+   DefruleBinaryData(theEnv)->JoinArray[obji].initialize = 0;
+   DefruleBinaryData(theEnv)->JoinArray[obji].marked = 0;
+   DefruleBinaryData(theEnv)->JoinArray[obji].bsaveID = 0L;
+   DefruleBinaryData(theEnv)->JoinArray[obji].leftMemory = NULL;
+   DefruleBinaryData(theEnv)->JoinArray[obji].rightMemory = NULL;
+
+   AddBetaMemoriesToJoin(theEnv,&DefruleBinaryData(theEnv)->JoinArray[obji]);
+  }
+
+/*************************************/
+/* UpdateLink: Bload refresh routine */
+/*   for joinLink data structures.   */
+/*************************************/
+static void UpdateLink(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveJoinLink *bj;
+
+   bj = (struct bsaveJoinLink *) buf;
+   DefruleBinaryData(theEnv)->LinkArray[obji].enterDirection = bj->enterDirection;
+   DefruleBinaryData(theEnv)->LinkArray[obji].next = BloadJoinLinkPointer(bj->next);
+   DefruleBinaryData(theEnv)->LinkArray[obji].join = BloadJoinPointer(bj->join);
+  }
+
+/************************************************************/
+/* UpdatePatternNodeHeader: Refreshes the values in pattern */
+/*   node headers from the loaded binary image.             */
+/************************************************************/
+void UpdatePatternNodeHeader(
+  Environment *theEnv,
+  struct patternNodeHeader *theHeader,
+  struct bsavePatternNodeHeader *theBsaveHeader)
+  {
+   struct joinNode *theJoin;
+
+   theHeader->singlefieldNode = theBsaveHeader->singlefieldNode;
+   theHeader->multifieldNode = theBsaveHeader->multifieldNode;
+   theHeader->stopNode = theBsaveHeader->stopNode;
+   theHeader->beginSlot = theBsaveHeader->beginSlot;
+   theHeader->endSlot = theBsaveHeader->endSlot;
+   theHeader->selector = theBsaveHeader->selector;
+   theHeader->initialize = 0;
+   theHeader->marked = 0;
+   theHeader->firstHash = NULL;
+   theHeader->lastHash = NULL;
+   theHeader->rightHash = HashedExpressionPointer(theBsaveHeader->rightHash);
+
+   theJoin = BloadJoinPointer(theBsaveHeader->entryJoin);
+   theHeader->entryJoin = theJoin;
+
+   while (theJoin != NULL)
+     {
+      theJoin->rightSideEntryStructure = (void *) theHeader;
+      theJoin = theJoin->rightMatchNode;
+     }
+  }
+
+/**************************************/
+/* ClearBload: Defrule clear routine  */
+/*   when a binary load is in effect. */
+/**************************************/
+static void ClearBload(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long i;
+   struct patternParser *theParser = NULL;
+   struct patternEntity *theEntity = NULL;
+   Defmodule *theModule;
+
+   /*===========================================*/
+   /* Delete all known entities before removing */
+   /* the defrule data structures.              */
+   /*===========================================*/
+
+   GetNextPatternEntity(theEnv,&theParser,&theEntity);
+   while (theEntity != NULL)
+     {
+      (*theEntity->theInfo->base.deleteFunction)(theEntity,theEnv);
+      theEntity = NULL;
+      GetNextPatternEntity(theEnv,&theParser,&theEntity);
+     }
+
+   /*=========================================*/
+   /* Remove all activations from the agenda. */
+   /*=========================================*/
+
+   SaveCurrentModule(theEnv);
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+      RemoveAllActivations(theEnv);
+     }
+   RestoreCurrentModule(theEnv);
+   ClearFocusStack(theEnv);
+
+   /*==========================================================*/
+   /* Remove all partial matches from the beta memories in the */
+   /* join network. Alpha memories do not need to be examined  */
+   /* since all pattern entities have been deleted by now.     */
+   /*==========================================================*/
+
+   for (i = 0; i < DefruleBinaryData(theEnv)->NumberOfJoins; i++)
+     {
+      FlushBetaMemory(theEnv,&DefruleBinaryData(theEnv)->JoinArray[i],LHS);
+      ReturnLeftMemory(theEnv,&DefruleBinaryData(theEnv)->JoinArray[i]);
+      FlushBetaMemory(theEnv,&DefruleBinaryData(theEnv)->JoinArray[i],RHS);
+      ReturnRightMemory(theEnv,&DefruleBinaryData(theEnv)->JoinArray[i]);
+     }
+
+   /*================================================*/
+   /* Decrement the symbol count for each rule name. */
+   /*================================================*/
+
+   for (i = 0; i < DefruleBinaryData(theEnv)->NumberOfDefrules; i++)
+     { UnmarkConstructHeader(theEnv,&DefruleBinaryData(theEnv)->DefruleArray[i].header); }
+
+   /*==================================================*/
+   /* Return the space allocated for the bload arrays. */
+   /*==================================================*/
+
+   space = DefruleBinaryData(theEnv)->NumberOfDefruleModules * sizeof(struct defruleModule);
+   if (space != 0) genfree(theEnv,DefruleBinaryData(theEnv)->ModuleArray,space);
+   DefruleBinaryData(theEnv)->NumberOfDefruleModules = 0;
+
+   space = DefruleBinaryData(theEnv)->NumberOfDefrules * sizeof(Defrule);
+   if (space != 0) genfree(theEnv,DefruleBinaryData(theEnv)->DefruleArray,space);
+   DefruleBinaryData(theEnv)->NumberOfDefrules = 0;
+
+   space = DefruleBinaryData(theEnv)->NumberOfJoins * sizeof(struct joinNode);
+   if (space != 0) genfree(theEnv,DefruleBinaryData(theEnv)->JoinArray,space);
+   DefruleBinaryData(theEnv)->NumberOfJoins = 0;
+
+   space = DefruleBinaryData(theEnv)->NumberOfLinks * sizeof(struct joinLink);
+   if (space != 0) genfree(theEnv,DefruleBinaryData(theEnv)->LinkArray,space);
+   DefruleBinaryData(theEnv)->NumberOfLinks = 0;
+
+   DefruleData(theEnv)->RightPrimeJoins = NULL;
+   DefruleData(theEnv)->LeftPrimeJoins = NULL;
+  }
+
+/*******************************************************/
+/* BloadDefruleModuleReference: Returns the defrule    */
+/*   module pointer for using with the bload function. */
+/*******************************************************/
+void *BloadDefruleModuleReference(
+  Environment *theEnv,
+  unsigned long theIndex)
+  {
+   return ((void *) &DefruleBinaryData(theEnv)->ModuleArray[theIndex]);
+  }
+
+#endif /* DEFRULE_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME) */
+
+
diff --git a/clips/rulebin.h b/clips/rulebin.h
new file mode 100755
index 000000000..fba82413e
--- /dev/null
+++ b/clips/rulebin.h
@@ -0,0 +1,153 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*           DEFRULE BSAVE/BLOAD HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for the  */
+/*    defrule construct.                                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES,        */
+/*            DYNAMIC_SALIENCE, and LOGICAL_DEPENDENCIES     */
+/*            compilation flags.                             */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Added support for alpha memories.              */
+/*                                                           */
+/*            Added salience groups to improve performance   */
+/*            with large numbers of activations of different */
+/*            saliences.                                     */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_rulebin
+
+#pragma once
+
+#define _H_rulebin
+
+#if (! RUN_TIME)
+
+#include "cstrcbin.h"
+#include "modulbin.h"
+#include "network.h"
+
+struct bsaveDefrule
+  {
+   struct bsaveConstructHeader header;
+   int salience;
+   unsigned short localVarCnt;
+   unsigned int complexity      : 12;
+   unsigned int autoFocus       :  1;
+   unsigned long dynamicSalience;
+   unsigned long actions;
+   unsigned long logicalJoin;
+   unsigned long lastJoin;
+   unsigned long disjunct;
+  };
+
+struct bsavePatternNodeHeader
+  {
+   unsigned long entryJoin;
+   unsigned long rightHash;
+   unsigned int singlefieldNode : 1;
+   unsigned int multifieldNode : 1;
+   unsigned int stopNode : 1;
+   unsigned int blocked : 1;
+   unsigned int initialize : 1;
+   unsigned int marked : 1;
+   unsigned int beginSlot : 1;
+   unsigned int endSlot : 1;
+   unsigned int selector : 1;
+  };
+
+struct bsaveDefruleModule
+  {
+   struct bsaveDefmoduleItemHeader header;
+  };
+
+struct bsaveJoinLink
+  {
+   char enterDirection;
+   unsigned long join;
+   unsigned long next;
+  };
+
+struct bsaveJoinNode
+  {
+   unsigned int firstJoin : 1;
+   unsigned int logicalJoin : 1;
+   unsigned int joinFromTheRight : 1;
+   unsigned int patternIsNegated : 1;
+   unsigned int patternIsExists : 1;
+   unsigned int rhsType : 3;
+   unsigned int depth : 7;
+   unsigned long networkTest;
+   unsigned long secondaryNetworkTest;
+   unsigned long leftHash;
+   unsigned long rightHash;
+   unsigned long rightSideEntryStructure;
+   unsigned long nextLinks;
+   unsigned long lastLevel;
+   unsigned long rightMatchNode;
+   unsigned long ruleToActivate;
+  };
+
+#define RULEBIN_DATA 20
+
+struct defruleBinaryData
+  {
+   unsigned long NumberOfDefruleModules;
+   unsigned long NumberOfDefrules;
+   unsigned long NumberOfJoins;
+   unsigned long NumberOfLinks;
+   unsigned long RightPrimeIndex;
+   unsigned long LeftPrimeIndex;
+   struct defruleModule *ModuleArray;
+   Defrule *DefruleArray;
+   struct joinNode *JoinArray;
+   struct joinLink *LinkArray;
+  };
+
+#define DefruleBinaryData(theEnv) ((struct defruleBinaryData *) GetEnvironmentData(theEnv,RULEBIN_DATA))
+
+#define BloadDefrulePointer(x,i) ((Defrule *) ((i == ULONG_MAX) ? NULL : &x[i]))
+#define BsaveJoinIndex(joinPtr) ((joinPtr == NULL) ? ULONG_MAX :  ((struct joinNode *) joinPtr)->bsaveID)
+#define BloadJoinPointer(i) ((struct joinNode *) ((i == ULONG_MAX) ? NULL : &DefruleBinaryData(theEnv)->JoinArray[i]))
+#define BsaveJoinLinkIndex(linkPtr) ((linkPtr == NULL) ? ULONG_MAX :  ((struct joinLink *) linkPtr)->bsaveID)
+#define BloadJoinLinkPointer(i) ((struct joinLink *) ((i == ULONG_MAX) ? NULL : &DefruleBinaryData(theEnv)->LinkArray[i]))
+
+   void                           DefruleBinarySetup(Environment *);
+   void                           UpdatePatternNodeHeader(Environment *,struct patternNodeHeader *,
+                                                                 struct bsavePatternNodeHeader *);
+   void                           AssignBsavePatternHeaderValues(Environment *,struct bsavePatternNodeHeader *,
+                                                                        struct patternNodeHeader *);
+   void                          *BloadDefruleModuleReference(Environment *,unsigned long);
+
+#endif /* (! RUN_TIME) */
+
+#endif /* _H_rulebin */
+
+
+
+
+
diff --git a/clips/rulebld.c b/clips/rulebld.c
new file mode 100755
index 000000000..8e7de6b32
--- /dev/null
+++ b/clips/rulebld.c
@@ -0,0 +1,1328 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  06/28/17             */
+   /*                                                     */
+   /*                  RULE BUILD MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines to ntegrates a set of pattern  */
+/*   and join tests associated with a rule into the pattern  */
+/*   and join networks. The joins are integrated into the    */
+/*   join network by routines in this module. The pattern    */
+/*   is integrated by calling the external routine           */
+/*   associated with the pattern parser that originally      */
+/*   parsed the pattern.                                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*      6.30: Changes to constructing join network.          */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*      6.31: Fix for nand crash                             */
+/*                                                           */
+/*            DR#882 Logical retraction not working if       */
+/*            logical CE starts with test CE.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Incremental reset is always enabled.           */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && (! RUN_TIME) && (! BLOAD_ONLY)
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "constrct.h"
+#include "drive.h"
+#include "incrrset.h"
+#include "memalloc.h"
+#include "pattern.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "router.h"
+#include "rulebld.h"
+#include "rulepsr.h"
+#include "watch.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static struct joinNode        *FindShareableJoin(struct joinLink *,struct joinNode *,bool,void *,bool,bool,
+                                                    bool,bool,struct expr *,struct expr *,
+                                                    struct expr *,struct expr *);
+   static bool                    TestJoinForReuse(struct joinNode *,bool,bool,
+                                                   bool,bool,struct expr *,struct expr *,
+                                                   struct expr *,struct expr *);
+   static struct joinNode        *CreateNewJoin(Environment *,struct expr *,struct expr *,struct joinNode *,void *,
+                                                bool,bool,bool,struct expr *,struct expr *);
+
+/****************************************************************/
+/* ConstructJoins: Integrates a set of pattern and join tests   */
+/*   associated with a rule into the pattern and join networks. */
+/****************************************************************/
+struct joinNode *ConstructJoins(
+  Environment *theEnv,
+  int logicalJoin,
+  struct lhsParseNode *theLHS,
+  int startDepth,
+  struct joinNode *lastJoin,
+  bool tryToReuse,
+  bool firstJoin)
+  {
+   struct patternNodeHeader *lastPattern;
+   struct joinNode *listOfJoins = NULL;
+   struct joinNode *oldJoin;
+   int joinNumber = 1;
+   bool isLogical, isExists;
+   struct joinNode *lastRightJoin;
+   bool lastIteration = false;
+   unsigned short rhsType;
+   struct expr *leftHash, *rightHash;
+   void *rhsStruct;
+   struct lhsParseNode *nextLHS;
+   struct expr *networkTest, *secondaryNetworkTest, *secondaryExternalTest;
+   bool joinFromTheRight;
+   struct joinLink *theLinks;
+   bool useLinks;
+
+   if (theLHS == NULL)
+     {
+      lastJoin = FindShareableJoin(DefruleData(theEnv)->RightPrimeJoins,NULL,true,NULL,true,
+                                   false,false,false,NULL,NULL,NULL,NULL);
+
+      if (lastJoin == NULL)
+        { lastJoin = CreateNewJoin(theEnv,NULL,NULL,NULL,NULL,false,false,false,NULL,NULL); }
+     }
+
+   /*=====================================================*/
+   /* Process each pattern CE in the rule. At this point, */
+   /* there should be no and/or/not CEs in the LHS.       */
+   /*=====================================================*/
+
+   while (theLHS != NULL)
+     {
+      /*======================================================*/
+      /* Find the beginning of the next group of patterns. If */
+      /* the current pattern is not the beginning of a "join  */
+      /* from the right" group of patterns, then the next     */
+      /* pattern is the next pattern. Otherwise skip over all */
+      /* the patterns that belong to the group of subjoins.   */
+      /*======================================================*/
+
+      nextLHS = theLHS->bottom;
+      secondaryExternalTest = NULL;
+
+      if (theLHS->endNandDepth > startDepth)
+        {
+         while ((nextLHS != NULL) &&
+                (nextLHS->endNandDepth > startDepth))
+           { nextLHS = nextLHS->bottom; }
+
+         /*====================================================*/
+         /* Variable nextLHS is now pointing to the end of the */
+         /* not/and group beginning with variable theLHS. If   */
+         /* the end depth of the group is less than the depth  */
+         /* of the current enclosing not/and group, then this  */
+         /* is the last iteration for the enclosing group.     */
+         /*====================================================*/
+
+         if (nextLHS != NULL)
+           {
+            if (nextLHS->endNandDepth < startDepth)
+              { lastIteration = true; }
+           }
+
+         if (! lastIteration)
+           {
+            if (nextLHS != NULL)
+              { nextLHS = nextLHS->bottom; }
+
+            if ((nextLHS != NULL) &&
+                (nextLHS->pnType == TEST_CE_NODE) &&
+                (nextLHS->beginNandDepth >= startDepth))
+              {
+               if (nextLHS->endNandDepth < startDepth)
+                 { lastIteration = true; }
+
+               secondaryExternalTest = nextLHS->networkTest;
+               nextLHS = nextLHS->bottom;
+              }
+           }
+        }
+      else if (theLHS->endNandDepth == startDepth)
+        {
+         if (nextLHS == NULL)
+           { lastIteration = true; }
+         else if ((nextLHS->pnType == TEST_CE_NODE) &&
+                  (nextLHS->endNandDepth < startDepth))
+           { lastIteration = true; }
+        }
+      else // theLHS->endNandDepth < startDepth
+        {
+         lastIteration = true;
+        }
+
+      /*===============================================*/
+      /* If the pattern is a join from the right, then */
+      /* construct the subgroup of patterns and use    */
+      /* that as the RHS of the join to be added.      */
+      /*===============================================*/
+
+      if (theLHS->beginNandDepth > startDepth)
+        {
+         joinFromTheRight = true;
+         isExists = theLHS->existsNand;
+
+         lastRightJoin = ConstructJoins(theEnv,logicalJoin,theLHS,startDepth+1,lastJoin,tryToReuse,firstJoin);
+
+         rhsStruct = lastRightJoin;
+         rhsType = 0;
+         lastPattern = NULL;
+         networkTest = theLHS->externalNetworkTest;
+         secondaryNetworkTest = secondaryExternalTest;
+         leftHash = theLHS->externalLeftHash;
+         rightHash = theLHS->externalRightHash;
+        }
+
+      /*=======================================================*/
+      /* Otherwise, add the pattern to the appropriate pattern */
+      /* network and use the pattern node containing the alpha */
+      /* memory as the RHS of the join to be added.            */
+      /*=======================================================*/
+
+      else if (theLHS->right == NULL)
+        {
+         joinFromTheRight = false;
+         rhsType = 0;
+         lastPattern = NULL;
+         rhsStruct = NULL;
+         lastRightJoin = NULL;
+         isExists = theLHS->exists;
+         networkTest = theLHS->networkTest;
+         secondaryNetworkTest = theLHS->secondaryNetworkTest;
+         leftHash = NULL;
+         rightHash = NULL;
+        }
+      else
+        {
+         joinFromTheRight = false;
+         rhsType = theLHS->patternType->positionInArray;
+         lastPattern = (*theLHS->patternType->addPatternFunction)(theEnv,theLHS);
+         rhsStruct = lastPattern;
+         lastRightJoin = NULL;
+         isExists = theLHS->exists;
+         networkTest = theLHS->networkTest;
+         secondaryNetworkTest = theLHS->secondaryNetworkTest;
+         leftHash = theLHS->leftHash;
+         rightHash = theLHS->rightHash;
+        }
+
+      /*======================================================*/
+      /* Determine if the join being added is a logical join. */
+      /*======================================================*/
+
+      if ((startDepth == 1) && (joinNumber == logicalJoin)) isLogical = true;
+      else isLogical = false;
+
+      /*===============================================*/
+      /* Get the list of joins which could potentially */
+      /* be reused in place of the join being added.   */
+      /*===============================================*/
+
+      useLinks = true;
+      if (lastJoin != NULL)
+        { theLinks = lastJoin->nextLinks; }
+      else if (theLHS->right == NULL)
+        { theLinks = DefruleData(theEnv)->RightPrimeJoins; }
+      else if (lastPattern != NULL)
+        {
+         listOfJoins = lastPattern->entryJoin;
+         theLinks = NULL;
+         useLinks = false;
+        }
+      else
+        { theLinks = lastRightJoin->nextLinks; }
+
+      /*=======================================================*/
+      /* Determine if the next join to be added can be shared. */
+      /*=======================================================*/
+
+      if ((tryToReuse == true) &&
+          ((oldJoin = FindShareableJoin(theLinks,listOfJoins,useLinks,rhsStruct,firstJoin,
+                                        theLHS->negated,isExists,isLogical,
+                                        networkTest,secondaryNetworkTest,
+                                        leftHash,rightHash)) != NULL) )
+        {
+#if DEBUGGING_FUNCTIONS
+         if ((GetWatchItem(theEnv,"compilations") == 1) && GetPrintWhileLoading(theEnv))
+           { WriteString(theEnv,STDOUT,"=j"); }
+#endif
+         lastJoin = oldJoin;
+        }
+      else
+        {
+         tryToReuse = false;
+         if (! joinFromTheRight)
+           {
+            lastJoin = CreateNewJoin(theEnv,networkTest,secondaryNetworkTest,lastJoin,
+                                     lastPattern,false,theLHS->negated, isExists,
+                                     leftHash,rightHash);
+            lastJoin->rhsType = rhsType;
+           }
+         else
+           {
+            lastJoin = CreateNewJoin(theEnv,networkTest,secondaryNetworkTest,lastJoin,
+                                     lastRightJoin,true,theLHS->negated, isExists,
+                                     leftHash,rightHash);
+            lastJoin->rhsType = rhsType;
+           }
+        }
+
+      /*============================================*/
+      /* If we've reached the end of the subgroup,  */
+      /* then return the last join of the subgroup. */
+      /*============================================*/
+
+      if (lastIteration)
+        { break; }
+
+      /*=======================================*/
+      /* Move on to the next join to be added. */
+      /*=======================================*/
+
+      theLHS = nextLHS;
+      joinNumber++;
+      firstJoin = false;
+     }
+
+   /*=================================================*/
+   /* Add the final join which stores the activations */
+   /* of the rule. This join is never shared.         */
+   /*=================================================*/
+
+   if (startDepth == 1)
+     {
+      lastJoin = CreateNewJoin(theEnv,NULL,NULL,lastJoin,NULL,
+                               false,false,false,NULL,NULL);
+     }
+
+   /*===================================================*/
+   /* If compilations are being watched, put a carriage */
+   /* return after all of the =j's and +j's             */
+   /*===================================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if ((startDepth == 1) &&
+       (GetWatchItem(theEnv,"compilations") == 1) &&
+       GetPrintWhileLoading(theEnv))
+     { WriteString(theEnv,STDOUT,"\n"); }
+#endif
+
+   /*=============================*/
+   /* Return the last join added. */
+   /*=============================*/
+
+   return(lastJoin);
+  }
+
+/****************************************************************/
+/* AttachTestCEsToPatternCEs: Attaches the expressions found in */
+/*   test CEs to the closest preceeding pattern CE that is not  */
+/*   negated and is at the same not/and depth.                  */
+/****************************************************************/
+void AttachTestCEsToPatternCEs(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS)
+  {
+   struct lhsParseNode *lastNode, *tempNode, *lastLastNode;
+
+   if (theLHS == NULL) return;
+
+   /*=============================================================*/
+   /* Attach test CEs that can be attached directly to a pattern. */
+   /*=============================================================*/
+
+   lastLastNode = NULL;
+   lastNode = theLHS;
+   theLHS = lastNode->bottom;
+
+   while (theLHS != NULL)
+     {
+      /*================================================================*/
+      /* Skip over any CE that's not a TEST CE as we're only interested */
+      /* in attaching a TEST CE to a preceding pattern CE. Update the   */
+      /* variables that track the preceding pattern.                    */
+      /*================================================================*/
+
+      if (theLHS->pnType != TEST_CE_NODE)
+        {
+         lastLastNode = lastNode;
+         lastNode = theLHS;
+         theLHS = theLHS->bottom;
+         continue;
+        }
+
+      /*=====================================================*/
+      /* If this is the beginning of a new NOT/AND CE group, */
+      /* then we can't attach this TEST CE to a preceding    */
+      /* pattern CE and should skip over it.                 */
+      /*=====================================================*/
+
+      /*================================================*/
+      /* Case #2                                        */
+      /*    Pattern CE                                  */
+      /*       Depth Begin: N                           */
+      /*       Depth End:   N                           */
+      /*    Test CE                                     */
+      /*       Depth Begin: M where M > N               */
+      /*       Depth End:   -                           */
+      /*                                                */
+      /*    (defrule example                            */
+      /*       (a)                                      */
+      /*       (not (and (test (> 1 0))                 */
+      /*                 (b)))                          */
+      /*       =>)                                      */
+      /*                                                */
+      /* Case #8                                        */
+      /*    Pattern CE                                  */
+      /*       Depth Begin: N                           */
+      /*       Depth End:   M where M < N               */
+      /*    Test CE                                     */
+      /*       Depth Begin: R where R > M               */
+      /*       Depth End:   -                           */
+      /*                                                */
+      /*    (defrule example                            */
+      /*       (not (and (a)                            */
+      /*                 (c)))                          */
+      /*       (not (and (test (> 1 0))                 */
+      /*                 (b)))                          */
+      /*       =>)                                      */
+      /*                                                */
+      /* This situation will not occur with the current */
+      /* implementation. The initial pattern will be    */
+      /* added before the test CE so that there is a    */
+      /* pattern CE beginning the not/and or exists/and */
+      /* pattern group.                                 */
+      /*================================================*/
+
+      if (theLHS->beginNandDepth > lastNode->endNandDepth)
+        {
+         lastLastNode = lastNode;
+         lastNode = theLHS;
+         theLHS = theLHS->bottom;
+         continue;
+        }
+
+      /*==============================================================*/
+      /* If the preceding pattern was the end of a NOT/AND CE group,  */
+      /* then we can't attach this TEST CE to a preceding pattern and */
+      /* should skip over it. The logic for handling the test CE will */
+      /* be triggered when the joins are constructed. Note that the   */
+      /* endNandDepth will never be greater than the beginNandDepth.  */
+      /*==============================================================*/
+
+      if (lastNode->beginNandDepth > lastNode->endNandDepth)
+        {
+         lastLastNode = lastNode;
+         lastNode = theLHS;
+         theLHS = theLHS->bottom;
+         continue;
+        }
+
+      /*===================================================*/
+      /* If the TEST CE does not close the preceding CE... */
+      /*===================================================*/
+
+      /*===================================================*/
+      /* Case #1                                           */
+      /*    Pattern CE                                     */
+      /*       Depth Begin: N                              */
+      /*       Depth End:   N                              */
+      /*    Test CE                                        */
+      /*       Depth Begin: N                              */
+      /*       Depth End:   N                              */
+      /*                                                   */
+      /*    (defrule example                               */
+      /*       (a ?x)                                      */
+      /*       (test (> ?x 0))                             */
+      /*       =>)                                         */
+      /*                                                   */
+      /* The test expression can be directly attached to   */
+      /* the network expression for the preceding pattern. */
+      /*===================================================*/
+
+      if (theLHS->beginNandDepth == theLHS->endNandDepth)
+        {
+         /*==============================================================*/
+         /* If the preceding pattern was a NOT or EXISTS CE containing   */
+         /* a single pattern, then attached the TEST CE to the secondary */
+         /* test, otherwise combine it with the primary network test.    */
+         /*==============================================================*/
+
+         if (lastNode->negated)
+           {
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+           }
+         else
+           {
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,theLHS->networkTest);
+           }
+        }
+
+      /*=================================================================*/
+      /* Otherwise the TEST CE closes a prior NOT/AND  or EXISTS/AND CE. */
+      /*=================================================================*/
+
+      /*==================================================*/
+      /* If these are the first two patterns in the rule. */
+      /*==================================================*/
+
+      /*=========*/
+      /* Case #3 */
+      /*=========*/
+
+      else if (lastLastNode == NULL)
+        {
+         /*=========================================================*/
+         /* The prior pattern is a single pattern within a not/and. */
+         /*                                                         */
+         /*    (defrule example                                     */
+         /*       (not (and (b)                                     */
+         /*                 (test (= 1 1))))                        */
+         /*       =>)                                               */
+         /*                                                         */
+         /* Collapse the nand pattern.                              */
+         /*=========================================================*/
+
+         if ((lastNode->negated == false) &&
+             (lastNode->existsNand == false))
+           {
+            lastNode->beginNandDepth = theLHS->endNandDepth;
+
+            lastNode->negated = true;
+
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,lastNode->externalNetworkTest);
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,theLHS->networkTest);
+            lastNode->externalNetworkTest = NULL;
+           }
+
+         /*=================================================================*/
+         /* The prior pattern is a single negated pattern within a not/and. */
+         /*                                                                 */
+         /*    (defrule example                                             */
+         /*       (not (and (not (b))                                       */
+         /*                 (test (= 1 1))))                                */
+         /*       =>)                                                       */
+         /*                                                                 */
+         /*=================================================================*/
+
+         else if ((lastNode->negated == true) &&
+                  (lastNode->exists == false) &&
+                  (lastNode->existsNand == false))
+           {
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+           }
+
+         /*================================================================*/
+         /* The prior pattern is a single exists pattern within a not/and. */
+         /*                                                                */
+         /*    (defrule example                                            */
+         /*       (not (and (exists (b))                                   */
+         /*                 (test (= 1 1))))                               */
+         /*       =>)                                                      */
+         /*                                                                */
+         /*================================================================*/
+
+         else if ((lastNode->negated == true) &&
+                  (lastNode->exists == true) &&
+                  (lastNode->existsNand == false))
+           {
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+           }
+
+         /*=============================================================*/
+         /* The prior pattern is a single pattern within an exists/and. */
+         /*                                                             */
+         /*    (defrule example                                         */
+         /*       (exists (and (b)                                      */
+         /*                    (test (= 1 1))))                         */
+         /*       =>)                                                   */
+         /*                                                             */
+         /* Collapse the exists pattern.                                */
+         /*=============================================================*/
+
+         else if ((lastNode->negated == false) &&
+                  (lastNode->exists == false) &&
+                  (lastNode->existsNand == true))
+           {
+            lastNode->beginNandDepth = theLHS->endNandDepth;
+
+            lastNode->existsNand = false;
+            lastNode->exists = true;
+            lastNode->negated = true;
+
+            /*===================================================*/
+            /* For the first two patterns, there shouldn't be an */
+            /* externalNetwork test, but this code is included   */
+            /* to match the other cases where patterns are       */
+            /* collapsed.                                        */
+            /*===================================================*/
+
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,lastNode->externalNetworkTest);
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,theLHS->networkTest);
+            lastNode->externalNetworkTest = NULL;
+           }
+
+         /*=======================================*/
+         /* The prior pattern is a single negated */
+         /* pattern within an exists/and.         */
+         /*                                       */
+         /*    (defrule example                   */
+         /*       (exists (and (not (b))          */
+         /*                    (test (= 1 1))))   */
+         /*       =>)                             */
+         /*                                       */
+         /*=======================================*/
+
+         else if ((lastNode->negated == true) &&
+                  (lastNode->exists == false) &&
+                  (lastNode->existsNand == true))
+           {
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+           }
+
+         /*======================================*/
+         /* The prior pattern is a single exists */
+         /* pattern within an exists/and.        */
+         /*                                      */
+         /*    (defrule example                  */
+         /*       (exists (and (exists (b))      */
+         /*                    (test (= 1 1))))  */
+         /*       =>)                            */
+         /*                                      */
+         /* Collapse the exists pattern.         */
+         /*======================================*/
+
+         else if ((lastNode->negated == true) &&
+                  (lastNode->exists == true) &&
+                  (lastNode->existsNand == true))
+           {
+            lastNode->beginNandDepth = theLHS->endNandDepth;
+
+            lastNode->existsNand = false;
+
+            /*===================================================*/
+            /* For the first two patterns, there shouldn't be an */
+            /* externalNetwork test, but this code is included   */
+            /* to match the other cases where patterns are       */
+            /* collapsed.                                        */
+            /*===================================================*/
+
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,lastNode->externalNetworkTest);
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+            lastNode->externalNetworkTest = NULL;
+           }
+
+         /*==============================================*/
+         /* Unhandled case which should not be possible. */
+         /*==============================================*/
+
+         else
+           {
+            SystemError(theEnv,"RULEBLD",1);
+            ExitRouter(theEnv,EXIT_FAILURE);
+           }
+        }
+
+      /*==============================================*/
+      /* Otherwise, there are two preceding patterns. */
+      /*==============================================*/
+
+      /*====================================*/
+      /* Case #4                            */
+      /*    Pattern CE                      */
+      /*       Depth Begin: -               */
+      /*       Depth End:   N               */
+      /*    Pattern CE                      */
+      /*       Depth Begin: N               */
+      /*       Depth End:   N               */
+      /*    Test CE                         */
+      /*       Depth Begin: N               */
+      /*       Depth End:   M where M < N   */
+      /*====================================*/
+
+      else if (lastLastNode->endNandDepth == theLHS->beginNandDepth)
+        {
+         /*==============================================================*/
+         /* If the preceding pattern was a NOT or EXISTS CE containing   */
+         /* a single pattern, then attached the TEST CE to the secondary */
+         /* test, otherwise combine it with the primary network test.    */
+         /*==============================================================*/
+
+         if (lastNode->negated)
+           {
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+           }
+         else
+           {
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,theLHS->networkTest);
+           }
+        }
+
+      /*====================================*/
+      /* Case #5                            */
+      /*    Pattern CE                      */
+      /*       Depth Begin: -               */
+      /*       Depth End:   R where R < N   */
+      /*    Pattern CE                      */
+      /*       Depth Begin: N               */
+      /*       Depth End:   N               */
+      /*    Test CE                         */
+      /*       Depth Begin: N               */
+      /*       Depth End:   M where M < N   */
+      /*====================================*/
+
+      else if (lastLastNode->endNandDepth < theLHS->beginNandDepth)
+        {
+         /*=========================================================*/
+         /* The prior pattern is a single pattern within a not/and: */
+         /*                                                         */
+         /*    (defrule example                                     */
+         /*       (a)                                               */
+         /*       (not (and (b)                                     */
+         /*                 (test (= 1 1))))                        */
+         /*       =>)                                               */
+         /*                                                         */
+         /* The test expression can be directly attached to the     */
+         /* network expression for the pattern and the pattern      */
+         /* group can be collapsed into a single negated pattern.   */
+         /*=========================================================*/
+
+         if ((lastNode->negated == false) &&
+             (lastNode->existsNand == false))
+           {
+            /*====================*/
+            /* Use max of R and M */
+            /*====================*/
+
+            if (lastLastNode->endNandDepth > theLHS->endNandDepth)
+              { lastNode->beginNandDepth =  lastLastNode->endNandDepth; }
+             else
+              { lastNode->beginNandDepth =  theLHS->endNandDepth; }
+
+            lastNode->negated = true;
+
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,lastNode->externalNetworkTest);
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,theLHS->networkTest);
+            lastNode->externalNetworkTest = NULL;
+           }
+
+         /*=================================================================*/
+         /* The prior pattern is a single negated pattern within a not/and. */
+         /*                                                                 */
+         /*    (defrule example                                             */
+         /*       (a)                                                       */
+         /*       (not (and (not (b))                                       */
+         /*                 (test (= 1 1))))                                */
+         /*       =>)                                                       */
+         /*=================================================================*/
+
+         else if ((lastNode->negated == true) &&
+                  (lastNode->exists == false) &&
+                  (lastNode->existsNand == false))
+           {
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+           }
+
+         /*================================================================*/
+         /* The prior pattern is a single exists pattern within a not/and. */
+         /*                                                                */
+         /*    (defrule example                                            */
+         /*       (a)                                                      */
+         /*       (not (and (exists (b))                                   */
+         /*                 (test (= 1 1))))                               */
+         /*       =>)                                                      */
+         /*================================================================*/
+
+         else if ((lastNode->negated == true) &&
+                  (lastNode->exists == true) &&
+                  (lastNode->existsNand == false))
+           {
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+           }
+
+         /*=============================================================*/
+         /* The prior pattern is a single pattern within an exists/and. */
+         /*                                                             */
+         /*    (defrule example                                         */
+         /*       (a)                                                   */
+         /*       (exists (and (b)                                      */
+         /*                    (test (= 1 1))))                         */
+         /*       =>)                                                   */
+         /*                                                             */
+         /* The test expression can be directly attached to the         */
+         /* network expression for the pattern and the pattern          */
+         /* group can be collapsed into a single exists pattern.        */
+         /*=============================================================*/
+
+         else if ((lastNode->negated == false) &&
+                  (lastNode->exists == false) &&
+                  (lastNode->existsNand == true))
+           {
+            if (lastLastNode->endNandDepth > theLHS->endNandDepth)
+              { lastNode->beginNandDepth =  lastLastNode->endNandDepth; }
+             else
+              { lastNode->beginNandDepth =  theLHS->endNandDepth; }
+
+            lastNode->existsNand = false;
+            lastNode->exists = true;
+            lastNode->negated = true;
+
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,lastNode->externalNetworkTest);
+            lastNode->networkTest =
+               CombineExpressions(theEnv,lastNode->networkTest,theLHS->networkTest);
+            lastNode->externalNetworkTest = NULL;
+           }
+
+         /*=======================================*/
+         /* The prior pattern is a single negated */
+         /* pattern within an exists/and.         */
+         /*                                       */
+         /*    (defrule example                   */
+         /*       (a)                             */
+         /*       (exists (and (not (b))          */
+         /*                    (test (= 1 1))))   */
+         /*       =>)                             */
+         /*                                       */
+         /*=======================================*/
+
+         else if ((lastNode->negated == true) &&
+                  (lastNode->exists == false) &&
+                  (lastNode->existsNand == true))
+           {
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+           }
+
+         /*======================================*/
+         /* The prior pattern is a single exists */
+         /* pattern within an exists/and.        */
+         /*                                      */
+         /*    (defrule example                  */
+         /*       (a)                            */
+         /*       (exists (and (exists (b))      */
+         /*                    (test (= 1 1))))  */
+         /*       =>)                            */
+         /*                                      */
+         /*======================================*/
+
+         else if ((lastNode->negated == true) &&
+                  (lastNode->exists == true) &&
+                  (lastNode->existsNand == true))
+           {
+            lastNode->secondaryNetworkTest =
+               CombineExpressions(theEnv,lastNode->secondaryNetworkTest,theLHS->networkTest);
+           }
+
+         /*==============================================*/
+         /* Unhandled case which should not be possible. */
+         /*==============================================*/
+
+         else
+           {
+            SystemError(theEnv,"RULEBLD",2);
+            ExitRouter(theEnv,EXIT_FAILURE);
+           }
+        }
+
+      /*==============================================*/
+      /* Unhandled case which should not be possible. */
+      /*==============================================*/
+
+      else
+        {
+         SystemError(theEnv,"RULEBLD",3);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+
+      /*=================================================*/
+      /* Remove the TEST CE and continue to the next CE. */
+      /*=================================================*/
+
+      theLHS->networkTest = NULL;
+      tempNode = theLHS->bottom;
+      theLHS->bottom = NULL;
+      lastNode->bottom = tempNode;
+      lastNode->endNandDepth = theLHS->endNandDepth;
+      ReturnLHSParseNodes(theEnv,theLHS);
+      theLHS = tempNode;
+     }
+  }
+
+/********************************************************************/
+/* FindShareableJoin: Determines whether a join exists that can be  */
+/*   reused for the join currently being added to the join network. */
+/*   Returns a pointer to the join to be shared if one if found,    */
+/*   otherwise returns a NULL pointer.                              */
+/********************************************************************/
+static struct joinNode *FindShareableJoin(
+  struct joinLink *theLinks,
+  struct joinNode *listOfJoins,
+  bool useLinks,
+  void *rhsStruct,
+  bool firstJoin,
+  bool negatedRHS,
+  bool existsRHS,
+  bool isLogical,
+  struct expr *joinTest,
+  struct expr *secondaryJoinTest,
+  struct expr *leftHash,
+  struct expr *rightHash)
+  {
+   /*========================================*/
+   /* Loop through all of the joins in the   */
+   /* list of potential candiates for reuse. */
+   /*========================================*/
+
+   if (useLinks)
+     {
+      if (theLinks != NULL)
+        { listOfJoins = theLinks->join; }
+      else
+        { listOfJoins = NULL; }
+     }
+
+   while (listOfJoins != NULL)
+     {
+      /*=========================================================*/
+      /* If the join being tested for reuse is connected on the  */
+      /* RHS to the end node of the pattern node associated with */
+      /* the join to be added, then determine if the join can    */
+      /* be reused. If so, return the join.                      */
+      /*=========================================================*/
+
+      if (listOfJoins->rightSideEntryStructure == rhsStruct)
+        {
+         if (TestJoinForReuse(listOfJoins,firstJoin,negatedRHS,existsRHS,
+                              isLogical,joinTest,secondaryJoinTest,
+                              leftHash,rightHash))
+           { return(listOfJoins); }
+        }
+
+      /*====================================================*/
+      /* Move on to the next potential candidate. Note that */
+      /* the rightMatchNode link is used for traversing     */
+      /* through the candidates for the first join of a     */
+      /* rule and that rightDriveNode link is used for      */
+      /* traversing through the candidates for subsequent   */
+      /* joins of a rule.                                   */
+      /*====================================================*/
+
+      if (useLinks)
+        {
+         theLinks = theLinks->next;
+         if (theLinks != NULL)
+           { listOfJoins = theLinks->join; }
+         else
+           { listOfJoins = NULL; }
+        }
+      else
+        { listOfJoins = listOfJoins->rightMatchNode; }
+     }
+
+   /*================================*/
+   /* Return a NULL pointer, since a */
+   /* reusable join was not found.   */
+   /*================================*/
+
+   return NULL;
+  }
+
+/**************************************************************/
+/* TestJoinForReuse: Determines if the specified join can be  */
+/*   shared with a join being added for a rule being defined. */
+/*   Returns true if the join can be shared, otherwise false. */
+/**************************************************************/
+static bool TestJoinForReuse(
+  struct joinNode *testJoin,
+  bool firstJoin,
+  bool negatedRHS,
+  bool existsRHS,
+  bool isLogical,
+  struct expr *joinTest,
+  struct expr *secondaryJoinTest,
+  struct expr *leftHash,
+  struct expr *rightHash)
+  {
+   /*==================================================*/
+   /* The first join of a rule may only be shared with */
+   /* a join that has its firstJoin field set to true. */
+   /*==================================================*/
+
+   if (testJoin->firstJoin != firstJoin) return false;
+
+   /*========================================================*/
+   /* A join connected to a not CE may only be shared with a */
+   /* join that has its patternIsNegated field set to true.  */
+   /*========================================================*/
+
+   if ((testJoin->patternIsNegated != negatedRHS) && (! existsRHS)) return false;
+
+   /*==========================================================*/
+   /* A join connected to an exists CE may only be shared with */
+   /* a join that has its patternIsExists field set to true.   */
+   /*==========================================================*/
+
+   if (testJoin->patternIsExists != existsRHS) return false;
+
+   /*==========================================================*/
+   /* If the join added is associated with a logical CE, then  */
+   /* either the join to be shared must be associated with a   */
+   /* logical CE or the beta memory must be empty (since       */
+   /* joins associate an extra field with each partial match). */
+   /*==========================================================*/
+
+   if ((isLogical == true) &&
+       (testJoin->logicalJoin == false) &&
+       BetaMemoryNotEmpty(testJoin))
+     { return false; }
+
+   /*===============================================================*/
+   /* The expression associated with the join must be identical to  */
+   /* the networkTest expression stored with the join to be shared. */
+   /*===============================================================*/
+
+   if (IdenticalExpression(testJoin->networkTest,joinTest) != true)
+     { return false; }
+
+   if (IdenticalExpression(testJoin->secondaryNetworkTest,secondaryJoinTest) != true)
+     { return false; }
+
+   /*====================================================================*/
+   /* The alpha memory hashing values associated with the join must be   */
+   /* identical to the hashing values stored with the join to be shared. */
+   /*====================================================================*/
+
+   if (IdenticalExpression(testJoin->leftHash,leftHash) != true)
+     { return false; }
+
+   if (IdenticalExpression(testJoin->rightHash,rightHash) != true)
+     { return false; }
+
+   /*=============================================*/
+   /* The join can be shared since all conditions */
+   /* for sharing have been satisfied.            */
+   /*=============================================*/
+
+   return true;
+  }
+
+/*************************************************************************/
+/* CreateNewJoin: Creates a new join and links it into the join network. */
+/*************************************************************************/
+static struct joinNode *CreateNewJoin(
+  Environment *theEnv,
+  struct expr *joinTest,
+  struct expr *secondaryJoinTest,
+  struct joinNode *lhsEntryStruct,
+  void *rhsEntryStruct,
+  bool joinFromTheRight,
+  bool negatedRHSPattern,
+  bool existsRHSPattern,
+  struct expr *leftHash,
+  struct expr *rightHash)
+  {
+   struct joinNode *newJoin;
+   struct joinLink *theLink;
+
+   /*===============================================*/
+   /* If compilations are being watch, print +j to  */
+   /* indicate that a new join has been created for */
+   /* this pattern of the rule (i.e. a join could   */
+   /* not be shared with another rule.              */
+   /*===============================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if ((GetWatchItem(theEnv,"compilations") == 1) && GetPrintWhileLoading(theEnv))
+     { WriteString(theEnv,STDOUT,"+j"); }
+#endif
+
+   /*======================*/
+   /* Create the new join. */
+   /*======================*/
+
+   newJoin = get_struct(theEnv,joinNode);
+
+   /*======================================================*/
+   /* The first join of a rule does not have a beta memory */
+   /* unless the RHS pattern is an exists or not CE.       */
+   /*======================================================*/
+
+   if ((lhsEntryStruct != NULL) || existsRHSPattern || negatedRHSPattern || joinFromTheRight)
+     {
+      if (leftHash == NULL)
+        {
+         newJoin->leftMemory = get_struct(theEnv,betaMemory);
+         newJoin->leftMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+         newJoin->leftMemory->beta[0] = NULL;
+         newJoin->leftMemory->last = NULL;
+         newJoin->leftMemory->size = 1;
+         newJoin->leftMemory->count = 0;
+         }
+      else
+        {
+         newJoin->leftMemory = get_struct(theEnv,betaMemory);
+         newJoin->leftMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         memset(newJoin->leftMemory->beta,0,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         newJoin->leftMemory->last = NULL;
+         newJoin->leftMemory->size = INITIAL_BETA_HASH_SIZE;
+         newJoin->leftMemory->count = 0;
+        }
+
+      /*===========================================================*/
+      /* If the first join of a rule connects to an exists or not  */
+      /* CE, then we create an empty partial match for the usually */
+      /* empty left beta memory so that we can track the current   */
+      /* current right memory partial match satisfying the CE.     */
+      /*===========================================================*/
+
+      if ((lhsEntryStruct == NULL) && (existsRHSPattern || negatedRHSPattern || joinFromTheRight))
+        {
+         newJoin->leftMemory->beta[0] = CreateEmptyPartialMatch(theEnv);
+         newJoin->leftMemory->beta[0]->owner = newJoin;
+         newJoin->leftMemory->count = 1;
+        }
+     }
+   else
+     { newJoin->leftMemory = NULL; }
+
+   if (joinFromTheRight)
+     {
+      if (leftHash == NULL)
+        {
+         newJoin->rightMemory = get_struct(theEnv,betaMemory);
+         newJoin->rightMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+         newJoin->rightMemory->last = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+         newJoin->rightMemory->beta[0] = NULL;
+         newJoin->rightMemory->last[0] = NULL;
+         newJoin->rightMemory->size = 1;
+         newJoin->rightMemory->count = 0;
+         }
+      else
+        {
+         newJoin->rightMemory = get_struct(theEnv,betaMemory);
+         newJoin->rightMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         newJoin->rightMemory->last = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         memset(newJoin->rightMemory->beta,0,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         memset(newJoin->rightMemory->last,0,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         newJoin->rightMemory->size = INITIAL_BETA_HASH_SIZE;
+         newJoin->rightMemory->count = 0;
+        }
+     }
+   else if (rhsEntryStruct == NULL)
+     {
+      newJoin->rightMemory = get_struct(theEnv,betaMemory);
+      newJoin->rightMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+      newJoin->rightMemory->last = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+      newJoin->rightMemory->beta[0] = CreateEmptyPartialMatch(theEnv);
+      newJoin->rightMemory->beta[0]->owner = newJoin;
+      newJoin->rightMemory->beta[0]->rhsMemory = true;
+      newJoin->rightMemory->last[0] = newJoin->rightMemory->beta[0];
+      newJoin->rightMemory->size = 1;
+      newJoin->rightMemory->count = 1;
+     }
+   else
+     { newJoin->rightMemory = NULL; }
+
+   newJoin->nextLinks = NULL;
+   newJoin->joinFromTheRight = joinFromTheRight;
+
+   if (existsRHSPattern)
+     { newJoin->patternIsNegated = false; }
+   else
+     { newJoin->patternIsNegated = negatedRHSPattern; }
+   newJoin->patternIsExists = existsRHSPattern;
+
+   newJoin->marked = false;
+   newJoin->initialize = true;
+   newJoin->logicalJoin = false;
+   newJoin->ruleToActivate = NULL;
+   newJoin->memoryLeftAdds = 0;
+   newJoin->memoryRightAdds = 0;
+   newJoin->memoryLeftDeletes = 0;
+   newJoin->memoryRightDeletes = 0;
+   newJoin->memoryCompares = 0;
+
+   /*==============================================*/
+   /* Install the expressions used to determine    */
+   /* if a partial match satisfies the constraints */
+   /* associated with this join.                   */
+   /*==============================================*/
+
+   newJoin->networkTest = AddHashedExpression(theEnv,joinTest);
+   newJoin->secondaryNetworkTest = AddHashedExpression(theEnv,secondaryJoinTest);
+
+   /*=====================================================*/
+   /* Install the expression used to hash the beta memory */
+   /* partial match to determine the location to search   */
+   /* in the alpha memory.                                */
+   /*=====================================================*/
+
+   newJoin->leftHash = AddHashedExpression(theEnv,leftHash);
+   newJoin->rightHash = AddHashedExpression(theEnv,rightHash);
+
+   /*============================================================*/
+   /* Initialize the values associated with the LHS of the join. */
+   /*============================================================*/
+
+   newJoin->lastLevel = lhsEntryStruct;
+
+   if (lhsEntryStruct == NULL)
+     {
+      newJoin->firstJoin = true;
+      newJoin->depth = 1;
+     }
+   else
+     {
+      newJoin->firstJoin = false;
+      newJoin->depth = lhsEntryStruct->depth;
+      newJoin->depth++; /* To work around Sparcworks C compiler bug */
+
+      theLink = get_struct(theEnv,joinLink);
+      theLink->join = newJoin;
+      theLink->enterDirection = LHS;
+
+      /*==============================================================*/
+      /* If this is a join from the right, then there should already  */
+      /* be a link from the previous join to the other join in the    */
+      /* the bifurcated path through the join network. If so, we want */
+      /* add the next link to the join from the right so that it is   */
+      /* visited after the other path. Doing this will reduce the     */
+      /* number of activations added and then removed if the other    */
+      /* path were followed first. The other path generates the       */
+      /* partial matches which are negated by this path, so if that   */
+      /* path is processed first, the partial matches from that path  */
+      /* will prevent partial matches on this path.                   */
+      /*==============================================================*/
+
+      if ((joinFromTheRight) && (lhsEntryStruct->nextLinks != NULL))
+        {
+         theLink->next = lhsEntryStruct->nextLinks->next;
+         lhsEntryStruct->nextLinks->next = theLink;
+        }
+      else
+        {
+         theLink->next = lhsEntryStruct->nextLinks;
+         lhsEntryStruct->nextLinks = theLink;
+        }
+     }
+
+   /*=======================================================*/
+   /* Initialize the pointer values associated with the RHS */
+   /* of the join (both for the new join and the join or    */
+   /* pattern which enters this join from the right.        */
+   /*=======================================================*/
+
+   newJoin->rightSideEntryStructure = rhsEntryStruct;
+
+   if (rhsEntryStruct == NULL)
+     {
+      if (newJoin->firstJoin)
+        {
+         theLink = get_struct(theEnv,joinLink);
+         theLink->join = newJoin;
+         theLink->enterDirection = RHS;
+         theLink->next = DefruleData(theEnv)->RightPrimeJoins;
+         DefruleData(theEnv)->RightPrimeJoins = theLink;
+        }
+
+      newJoin->rightMatchNode = NULL;
+
+      return(newJoin);
+     }
+
+   /*===========================================================*/
+   /* If the first join of a rule is a not CE, then it needs to */
+   /* be "primed" under certain circumstances. This used to be  */
+   /* handled by adding the (initial-fact) pattern to a rule    */
+   /* with the not CE as its first pattern, but this alternate  */
+   /* mechanism is now used so patterns don't have to be added. */
+   /*===========================================================*/
+
+   if (newJoin->firstJoin && (newJoin->patternIsNegated || newJoin->joinFromTheRight) && (! newJoin->patternIsExists))
+     {
+      theLink = get_struct(theEnv,joinLink);
+      theLink->join = newJoin;
+      theLink->enterDirection = LHS;
+      theLink->next = DefruleData(theEnv)->LeftPrimeJoins;
+      DefruleData(theEnv)->LeftPrimeJoins = theLink;
+     }
+
+   if (joinFromTheRight)
+     {
+      theLink = get_struct(theEnv,joinLink);
+      theLink->join = newJoin;
+      theLink->enterDirection = RHS;
+      theLink->next = ((struct joinNode *) rhsEntryStruct)->nextLinks;
+      ((struct joinNode *) rhsEntryStruct)->nextLinks = theLink;
+      newJoin->rightMatchNode = NULL;
+     }
+   else
+     {
+      newJoin->rightMatchNode = ((struct patternNodeHeader *) rhsEntryStruct)->entryJoin;
+      ((struct patternNodeHeader *) rhsEntryStruct)->entryJoin = newJoin;
+     }
+
+   /*================================*/
+   /* Return the newly created join. */
+   /*================================*/
+
+   return(newJoin);
+  }
+
+#endif
+
+
+
diff --git a/clips/rulebld.h b/clips/rulebld.h
new file mode 100755
index 000000000..d77156f0a
--- /dev/null
+++ b/clips/rulebld.h
@@ -0,0 +1,62 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  06/28/17            */
+   /*                                                     */
+   /*               RULE BUILD HEADER FILE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines to ntegrates a set of pattern  */
+/*   and join tests associated with a rule into the pattern  */
+/*   and join networks. The joins are integrated into the    */
+/*   join network by routines in this module. The pattern    */
+/*   is integrated by calling the external routine           */
+/*   associated with the pattern parser that originally      */
+/*   parsed the pattern.                                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed INCREMENTAL_RESET compilation flag.    */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*      6.30: Changes to constructing join network.          */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*      6.31: DR#882 Logical retraction not working if       */
+/*            logical CE starts with test CE.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_rulebld
+
+#pragma once
+
+#define _H_rulebld
+
+#include "network.h"
+#include "reorder.h"
+
+   struct joinNode               *ConstructJoins(Environment *,int,struct lhsParseNode *,int,struct joinNode *,bool,bool);
+   void                           AttachTestCEsToPatternCEs(Environment *,struct lhsParseNode *);
+
+#endif /* _H_rulebld */
+
+
+
diff --git a/clips/rulebsc.c b/clips/rulebsc.c
new file mode 100755
index 000000000..05ca344d3
--- /dev/null
+++ b/clips/rulebsc.c
@@ -0,0 +1,517 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*          DEFRULE BASIC COMMANDS HEADER FILE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements core commands for the defrule         */
+/*   construct such as clear, reset, save, undefrule,        */
+/*   ppdefrule, list-defrules, and                           */
+/*   get-defrule-list.                                       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for join network changes.              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            JoinOperationInProgress mechanism.             */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+
+#include "argacces.h"
+#include "constrct.h"
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "multifld.h"
+#include "reteutil.h"
+#include "router.h"
+#include "ruledef.h"
+#include "watch.h"
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "rulebin.h"
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "rulecmp.h"
+#endif
+
+#include "rulebsc.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    ResetDefrules(Environment *,void *);
+   static void                    ResetDefrulesPrime(Environment *,void *);
+   static void                    SaveDefrules(Environment *,Defmodule *,const char *,void *);
+#if (! RUN_TIME)
+   static bool                    ClearDefrulesReady(Environment *,void *);
+   static void                    ClearDefrules(Environment *,void *);
+#endif
+
+/*************************************************************/
+/* DefruleBasicCommands: Initializes basic defrule commands. */
+/*************************************************************/
+void DefruleBasicCommands(
+  Environment *theEnv)
+  {
+   AddResetFunction(theEnv,"defrule",ResetDefrules,70,NULL);
+   AddResetFunction(theEnv,"defrule",ResetDefrulesPrime,10,NULL);
+   AddSaveFunction(theEnv,"defrule",SaveDefrules,0,NULL);
+#if (! RUN_TIME)
+   AddClearReadyFunction(theEnv,"defrule",ClearDefrulesReady,0,NULL);
+   AddClearFunction(theEnv,"defrule",ClearDefrules,0,NULL);
+#endif
+
+#if DEBUGGING_FUNCTIONS
+   AddWatchItem(theEnv,"rules",0,&DefruleData(theEnv)->WatchRules,70,DefruleWatchAccess,DefruleWatchPrint);
+#endif
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"get-defrule-list","m",0,1,"y",GetDefruleListFunction,"GetDefruleListFunction",NULL);
+   AddUDF(theEnv,"undefrule","v",1,1,"y",UndefruleCommand,"UndefruleCommand",NULL);
+   AddUDF(theEnv,"defrule-module","y",1,1,"y",DefruleModuleFunction,"DefruleModuleFunction",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"rules","v",0,1,"y",ListDefrulesCommand,"ListDefrulesCommand",NULL);
+   AddUDF(theEnv,"list-defrules","v",0,1,"y",ListDefrulesCommand,"ListDefrulesCommand",NULL);
+   AddUDF(theEnv,"ppdefrule","vs",1,2,";y;ldsyn",PPDefruleCommand,"PPDefruleCommand",NULL);
+#endif
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+   DefruleBinarySetup(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   DefruleCompilerSetup(theEnv);
+#endif
+
+#endif
+  }
+
+/*****************************************************/
+/* ResetDefrules: Defrule reset routine for use with */
+/*   the reset command. Sets the current entity time */
+/*   tag (used by the conflict resolution strategies */
+/*   for recency) to zero. The focus stack is also   */
+/*   cleared.                                        */
+/*****************************************************/
+static void ResetDefrules(
+  Environment *theEnv,
+  void *context)
+  {
+   Defmodule *theModule;
+   struct joinLink *theLink;
+   struct partialMatch *notParent;
+
+   DefruleData(theEnv)->CurrentEntityTimeTag = 1L;
+   ClearFocusStack(theEnv);
+   theModule = FindDefmodule(theEnv,"MAIN");
+   Focus(theModule);
+
+   for (theLink = DefruleData(theEnv)->RightPrimeJoins;
+        theLink != NULL;
+        theLink = theLink->next)
+     { PosEntryRetractAlpha(theEnv,theLink->join->rightMemory->beta[0],NETWORK_ASSERT); }
+
+   for (theLink = DefruleData(theEnv)->LeftPrimeJoins;
+        theLink != NULL;
+        theLink = theLink->next)
+     {
+      if ((theLink->join->patternIsNegated || theLink->join->joinFromTheRight) &&
+          (! theLink->join->patternIsExists))
+        {
+         notParent = theLink->join->leftMemory->beta[0];
+
+         if (notParent->marker)
+           { RemoveBlockedLink(notParent); }
+
+         /*==========================================================*/
+         /* Prevent any retractions from generating partial matches. */
+         /*==========================================================*/
+
+         notParent->marker = notParent;
+
+         if (notParent->children != NULL)
+           { PosEntryRetractBeta(theEnv,notParent,notParent->children,NETWORK_ASSERT); }
+           /*
+         if (notParent->dependents != NULL)
+           { RemoveLogicalSupport(theEnv,notParent); } */
+        }
+     }
+  }
+
+/***********************/
+/* ResetDefrulesPrime: */
+/***********************/
+static void ResetDefrulesPrime(
+  Environment *theEnv,
+  void *context)
+  {
+   struct joinLink *theLink;
+   struct partialMatch *notParent;
+
+   for (theLink = DefruleData(theEnv)->RightPrimeJoins;
+        theLink != NULL;
+        theLink = theLink->next)
+     { NetworkAssert(theEnv,theLink->join->rightMemory->beta[0],theLink->join); }
+
+   for (theLink = DefruleData(theEnv)->LeftPrimeJoins;
+        theLink != NULL;
+        theLink = theLink->next)
+     {
+      if ((theLink->join->patternIsNegated || theLink->join->joinFromTheRight) &&
+          (! theLink->join->patternIsExists))
+        {
+         notParent = theLink->join->leftMemory->beta[0];
+
+         if (theLink->join->secondaryNetworkTest != NULL)
+           {
+            if (EvaluateSecondaryNetworkTest(theEnv,notParent,theLink->join) == false)
+              { continue; }
+           }
+
+         notParent->marker = NULL;
+
+         EPMDrive(theEnv,notParent,theLink->join,NETWORK_ASSERT);
+        }
+     }
+
+  }
+
+#if (! RUN_TIME)
+
+/******************************************************************/
+/* ClearDefrulesReady: Indicates whether defrules can be cleared. */
+/******************************************************************/
+static bool ClearDefrulesReady(
+  Environment *theEnv,
+  void *context)
+  {
+   if (EngineData(theEnv)->ExecutingRule != NULL) return false;
+
+   if (EngineData(theEnv)->JoinOperationInProgress) return false;
+
+   ClearFocusStack(theEnv);
+   if (GetCurrentModule(theEnv) == NULL) return false;
+
+   DefruleData(theEnv)->CurrentEntityTimeTag = 1L;
+
+   return true;
+  }
+
+/***************************************************************/
+/* ClearDefrules: Pushes the MAIN module as the current focus. */
+/***************************************************************/
+static void ClearDefrules(
+  Environment *theEnv,
+  void *context)
+  {
+   Defmodule *theModule;
+
+   theModule = FindDefmodule(theEnv,"MAIN");
+   Focus(theModule);
+  }
+
+#endif
+
+/**************************************/
+/* SaveDefrules: Defrule save routine */
+/*   for use with the save command.   */
+/**************************************/
+static void SaveDefrules(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logicalName,
+  void *context)
+  {
+   SaveConstruct(theEnv,theModule,logicalName,DefruleData(theEnv)->DefruleConstruct);
+  }
+
+/******************************************/
+/* UndefruleCommand: H/L access routine   */
+/*   for the undefrule command.           */
+/******************************************/
+void UndefruleCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UndefconstructCommand(context,"undefrule",DefruleData(theEnv)->DefruleConstruct);
+  }
+
+/********************************/
+/* Undefrule: C access routine  */
+/*   for the undefrule command. */
+/********************************/
+bool Undefrule(
+  Defrule *theDefrule,
+  Environment *allEnv)
+  {
+   Environment *theEnv;
+   
+   if (theDefrule == NULL)
+     {
+      theEnv = allEnv;
+      return Undefconstruct(theEnv,NULL,DefruleData(theEnv)->DefruleConstruct);
+     }
+   else
+     {
+      theEnv = theDefrule->header.env;
+      return Undefconstruct(theEnv,&theDefrule->header,DefruleData(theEnv)->DefruleConstruct);
+     }
+  }
+
+/************************************************/
+/* GetDefruleListFunction: H/L access routine   */
+/*   for the get-defrule-list function.         */
+/************************************************/
+void GetDefruleListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   GetConstructListFunction(context,returnValue,DefruleData(theEnv)->DefruleConstruct);
+  }
+
+/****************************************/
+/* GetDefruleList: C access routine     */
+/*   for the get-defrule-list function. */
+/****************************************/
+void GetDefruleList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defmodule *theModule)
+  {
+   UDFValue result;
+   
+   GetConstructList(theEnv,&result,DefruleData(theEnv)->DefruleConstruct,theModule);
+   NormalizeMultifield(theEnv,&result);
+   returnValue->value = result.value;
+  }
+
+/*********************************************/
+/* DefruleModuleFunction: H/L access routine */
+/*   for the defrule-module function.        */
+/*********************************************/
+void DefruleModuleFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->value = GetConstructModuleCommand(context,"defrule-module",DefruleData(theEnv)->DefruleConstruct);
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/******************************************/
+/* PPDefruleCommand: H/L access routine   */
+/*   for the ppdefrule command.           */
+/******************************************/
+void PPDefruleCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PPConstructCommand(context,"ppdefrule",DefruleData(theEnv)->DefruleConstruct,returnValue);
+  }
+
+/***********************************/
+/* PPDefrule: C access routine for */
+/*   the ppdefrule command.        */
+/***********************************/
+bool PPDefrule(
+  Environment *theEnv,
+  const char *defruleName,
+  const char *logicalName)
+  {
+   return(PPConstruct(theEnv,defruleName,logicalName,DefruleData(theEnv)->DefruleConstruct));
+  }
+
+/*********************************************/
+/* ListDefrulesCommand: H/L access routine   */
+/*   for the list-defrules command.          */
+/*********************************************/
+void ListDefrulesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListConstructCommand(context,DefruleData(theEnv)->DefruleConstruct);
+  }
+
+/************************************/
+/* ListDefrules: C access routine   */
+/*   for the list-defrules command. */
+/************************************/
+void ListDefrules(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListConstruct(theEnv,DefruleData(theEnv)->DefruleConstruct,logicalName,theModule);
+  }
+
+/*******************************************************/
+/* DefruleGetWatchActivations: C access routine for    */
+/*   retrieving the current watch value of a defrule's */
+/*   activations.                                      */
+/*******************************************************/
+bool DefruleGetWatchActivations(
+  Defrule *rulePtr)
+  {
+   Defrule *thePtr;
+
+   for (thePtr = rulePtr;
+        thePtr != NULL;
+        thePtr = thePtr->disjunct)
+     { if (thePtr->watchActivation) return true; }
+
+   return false;
+  }
+
+/********************************************/
+/* DefruleGetWatchFirings: C access routine */
+/*   for retrieving the current watch value */
+/*   of a defrule's firings.                */
+/********************************************/
+bool DefruleGetWatchFirings(
+  Defrule *rulePtr)
+  {
+   Defrule *thePtr;
+
+   for (thePtr = rulePtr;
+        thePtr != NULL;
+        thePtr = thePtr->disjunct)
+     { if (thePtr->watchFiring) return true; }
+
+   return false;
+  }
+
+/************************************************/
+/* DefruleSetWatchActivations: C access routine */
+/*   for setting the current watch value of a   */
+/*   defrule's activations.                     */
+/************************************************/
+void DefruleSetWatchActivations(
+  Defrule *rulePtr,
+  bool newState)
+  {
+   Defrule *thePtr;
+
+   for (thePtr = rulePtr;
+        thePtr != NULL;
+        thePtr = thePtr->disjunct)
+     { thePtr->watchActivation = newState; }
+  }
+
+/********************************************/
+/* DefruleSetWatchFirings: C access routine */
+/*   for setting the current watch value of */
+/*   a defrule's firings.                   */
+/********************************************/
+void DefruleSetWatchFirings(
+  Defrule *rulePtr,
+  bool newState)
+  {
+   Defrule *thePtr;
+
+   for (thePtr = rulePtr;
+        thePtr != NULL;
+        thePtr = thePtr->disjunct)
+     { thePtr->watchFiring = newState; }
+  }
+
+/*******************************************************************/
+/* DefruleWatchAccess: Access function for setting the watch flags */
+/*   associated with rules (activations and rule firings).         */
+/*******************************************************************/
+bool DefruleWatchAccess(
+  Environment *theEnv,
+  int code,
+  bool newState,
+  struct expr *argExprs)
+  {
+   if (code)
+     return(ConstructSetWatchAccess(theEnv,DefruleData(theEnv)->DefruleConstruct,newState,argExprs,
+                                    (ConstructGetWatchFunction *) DefruleGetWatchActivations,
+                                    (ConstructSetWatchFunction *) DefruleSetWatchActivations));
+   else
+     return(ConstructSetWatchAccess(theEnv,DefruleData(theEnv)->DefruleConstruct,newState,argExprs,
+                                    (ConstructGetWatchFunction *) DefruleGetWatchFirings,
+                                    (ConstructSetWatchFunction *) DefruleSetWatchFirings));
+  }
+
+/*****************************************************************/
+/* DefruleWatchPrint: Access routine for printing which defrules */
+/*   have their watch flag set via the list-watch-items command. */
+/*****************************************************************/
+bool DefruleWatchPrint(
+  Environment *theEnv,
+  const char *logName,
+  int code,
+  struct expr *argExprs)
+  {
+   if (code)
+     return(ConstructPrintWatchAccess(theEnv,DefruleData(theEnv)->DefruleConstruct,logName,argExprs,
+                                      (ConstructGetWatchFunction *) DefruleGetWatchActivations,
+                                      (ConstructSetWatchFunction *) DefruleSetWatchActivations));
+   else
+     return(ConstructPrintWatchAccess(theEnv,DefruleData(theEnv)->DefruleConstruct,logName,argExprs,
+                                      (ConstructGetWatchFunction *) DefruleGetWatchActivations,
+                                      (ConstructSetWatchFunction *) DefruleGetWatchActivations));
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
diff --git a/clips/rulebsc.h b/clips/rulebsc.h
new file mode 100755
index 000000000..e6f1e0357
--- /dev/null
+++ b/clips/rulebsc.h
@@ -0,0 +1,91 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*         DEFRULE BASIC COMMANDS HEADER FILE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements core commands for the defrule         */
+/*   construct such as clear, reset, save, undefrule,        */
+/*   ppdefrule, list-defrules, and                           */
+/*   get-defrule-list.                                       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for join network changes.              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            JoinOperationInProgress mechanism.             */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_rulebsc
+
+#pragma once
+
+#define _H_rulebsc
+
+#include "evaluatn.h"
+
+   void                           DefruleBasicCommands(Environment *);
+   void                           UndefruleCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           Undefrule(Defrule *,Environment *);
+   void                           GetDefruleListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetDefruleList(Environment *,CLIPSValue *,Defmodule *);
+   void                           DefruleModuleFunction(Environment *,UDFContext *,UDFValue *);
+#if DEBUGGING_FUNCTIONS
+   void                           PPDefruleCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           PPDefrule(Environment *,const char *,const char *);
+   void                           ListDefrulesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ListDefrules(Environment *,const char *,Defmodule *);
+   bool                           DefruleGetWatchFirings(Defrule *);
+   bool                           DefruleGetWatchActivations(Defrule *);
+   void                           DefruleSetWatchFirings(Defrule *,bool);
+   void                           DefruleSetWatchActivations(Defrule *,bool);
+   bool                           DefruleWatchAccess(Environment *,int,bool,struct expr *);
+   bool                           DefruleWatchPrint(Environment *,const char *,int,struct expr *);
+#endif
+
+#endif /* _H_rulebsc */
+
+
diff --git a/clips/rulecmp.c b/clips/rulecmp.c
new file mode 100755
index 000000000..520bd1765
--- /dev/null
+++ b/clips/rulecmp.c
@@ -0,0 +1,733 @@
+
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*            DEFRULE CONSTRUCTS-TO-C MODULE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for the   */
+/*    defrule construct.                                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE and                   */
+/*            LOGICAL_DEPENDENCIES compilation flags.        */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for join network changes.              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.31: Fixed disjunct bug in defrule iteration.       */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT && (! RUN_TIME) && CONSTRUCT_COMPILER
+
+#include <stdio.h>
+#include <string.h>
+
+#include "envrnmnt.h"
+#include "factbld.h"
+#include "pattern.h"
+#include "reteutil.h"
+
+#include "rulecmp.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    ConstructToCode(Environment *,const char *,const char *,char *,
+                                                  unsigned int,FILE *,unsigned int,unsigned int);
+   static void                    JoinToCode(Environment *,FILE *,struct joinNode *,unsigned int,unsigned int);
+   static void                    LinkToCode(Environment *,FILE *,struct joinLink *,unsigned int,unsigned int);
+   static void                    DefruleModuleToCode(Environment *,FILE *,Defmodule *,unsigned int,unsigned int,unsigned int);
+   static void                    DefruleToCode(Environment *,FILE *,Defrule *,unsigned int,unsigned int,unsigned int);
+   static void                    CloseDefruleFiles(Environment *,FILE *,FILE *,FILE *,FILE*,unsigned int);
+   static void                    BeforeDefrulesCode(Environment *);
+   static void                    InitDefruleCode(Environment *,FILE *,unsigned int,unsigned int);
+   static bool                    RuleCompilerTraverseJoins(Environment *,struct joinNode *,const char *,
+                                                            const char *,char *,unsigned int,FILE *,
+                                                            unsigned int,unsigned int,FILE **,FILE **,
+                                                            unsigned int *,unsigned int *,unsigned int *,unsigned int *,unsigned int *);
+   static bool                    TraverseJoinLinks(Environment *,struct joinLink *,const char *,const char *,
+                                                    char *,unsigned int,FILE *,unsigned int,unsigned int,
+                                                    FILE **,unsigned int *,unsigned int *,unsigned int *);
+
+/***********************************************************/
+/* DefruleCompilerSetup: Initializes the defrule construct */
+/*   for use with the constructs-to-c command.             */
+/***********************************************************/
+void DefruleCompilerSetup(
+  Environment *theEnv)
+  {
+   DefruleData(theEnv)->DefruleCodeItem = AddCodeGeneratorItem(theEnv,"defrules",0,BeforeDefrulesCode,
+                                          InitDefruleCode,ConstructToCode,4);
+  }
+
+/**************************************************************/
+/* BeforeDefrulesCode: Assigns each defrule and join with a   */
+/*   unique ID which will be used for pointer references when */
+/*   the data structures are written to a file as C code      */
+/**************************************************************/
+static void BeforeDefrulesCode(
+  Environment *theEnv)
+  {
+   unsigned long moduleCount, ruleCount, joinCount, linkCount;
+
+   TagRuleNetwork(theEnv,&moduleCount,&ruleCount,&joinCount,&linkCount);
+  }
+
+/*********************************************************/
+/* ConstructToCode: Produces defrule code for a run-time */
+/*   module created using the constructs-to-c function.  */
+/*********************************************************/
+static bool ConstructToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int fileCount = 1;
+   Defmodule *theModule;
+   Defrule *theDefrule, *theDisjunct;
+   unsigned int joinArrayCount = 0, joinArrayVersion = 1;
+   unsigned int linkArrayCount = 0, linkArrayVersion = 1;
+   unsigned int moduleCount = 0, moduleArrayCount = 0, moduleArrayVersion = 1;
+   unsigned int defruleArrayCount = 0, defruleArrayVersion = 1;
+   FILE *joinFile = NULL, *moduleFile = NULL, *defruleFile = NULL, *linkFile = NULL;
+
+   /*==============================================*/
+   /* Include the appropriate defrule header file. */
+   /*==============================================*/
+
+   fprintf(headerFP,"#include \"ruledef.h\"\n");
+
+   /*======================================*/
+   /* Save the left and right prime links. */
+   /*======================================*/
+
+   if (! TraverseJoinLinks(theEnv,DefruleData(theEnv)->LeftPrimeJoins,fileName,pathName,fileNameBuffer,fileID,headerFP,imageID,
+                           maxIndices,&linkFile,&fileCount,&linkArrayVersion,&linkArrayCount))
+     {
+      CloseDefruleFiles(theEnv,moduleFile,defruleFile,joinFile,linkFile,maxIndices);
+      return false;
+     }
+
+   if (! TraverseJoinLinks(theEnv,DefruleData(theEnv)->RightPrimeJoins,fileName,pathName,fileNameBuffer,fileID,headerFP,imageID,
+                           maxIndices,&linkFile,&fileCount,&linkArrayVersion,&linkArrayCount))
+     {
+      CloseDefruleFiles(theEnv,moduleFile,defruleFile,joinFile,linkFile,maxIndices);
+      return false;
+     }
+
+   /*=========================================================*/
+   /* Loop through all the modules, all the defrules, and all */
+   /* the join nodes writing their C code representation to   */
+   /* the file as they are traversed.                         */
+   /*=========================================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*=========================*/
+      /* Set the current module. */
+      /*=========================*/
+
+      SetCurrentModule(theEnv,theModule);
+
+      /*==========================*/
+      /* Save the defrule module. */
+      /*==========================*/
+
+      moduleFile = OpenFileIfNeeded(theEnv,moduleFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                    moduleArrayVersion,headerFP,
+                                    "struct defruleModule",ModulePrefix(DefruleData(theEnv)->DefruleCodeItem),
+                                    false,NULL);
+
+      if (moduleFile == NULL)
+        {
+         CloseDefruleFiles(theEnv,moduleFile,defruleFile,joinFile,linkFile,maxIndices);
+         return false;
+        }
+
+      DefruleModuleToCode(theEnv,moduleFile,theModule,imageID,maxIndices,moduleCount);
+      moduleFile = CloseFileIfNeeded(theEnv,moduleFile,&moduleArrayCount,&moduleArrayVersion,
+                                     maxIndices,NULL,NULL);
+
+      /*=========================================*/
+      /* Loop through all of the defrules (and   */
+      /* their disjuncts) in the current module. */
+      /*=========================================*/
+
+      for (theDefrule = GetNextDefrule(theEnv,NULL);
+           theDefrule != NULL;
+           theDefrule = GetNextDefrule(theEnv,theDefrule))
+        {
+         for (theDisjunct = theDefrule;
+              theDisjunct != NULL;
+              theDisjunct = theDisjunct->disjunct)
+           {
+            /*===================================*/
+            /* Save the defrule data structures. */
+            /*===================================*/
+
+            defruleFile = OpenFileIfNeeded(theEnv,defruleFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                           defruleArrayVersion,headerFP,
+                                           "Defrule",ConstructPrefix(DefruleData(theEnv)->DefruleCodeItem),
+                                           false,NULL);
+            if (defruleFile == NULL)
+              {
+               CloseDefruleFiles(theEnv,moduleFile,defruleFile,joinFile,linkFile,maxIndices);
+               return false;
+              }
+
+            DefruleToCode(theEnv,defruleFile,theDisjunct,imageID,maxIndices,
+                           moduleCount);
+            defruleArrayCount++;
+            defruleFile = CloseFileIfNeeded(theEnv,defruleFile,&defruleArrayCount,&defruleArrayVersion,
+                                            maxIndices,NULL,NULL);
+
+            /*================================*/
+            /* Save the join data structures. */
+            /*================================*/
+
+            if (! RuleCompilerTraverseJoins(theEnv,theDisjunct->lastJoin,fileName,pathName,fileNameBuffer,fileID,headerFP,imageID,
+                                            maxIndices,&joinFile,&linkFile,&fileCount,&joinArrayVersion,&joinArrayCount,
+                                            &linkArrayVersion,&linkArrayCount))
+              {
+               CloseDefruleFiles(theEnv,moduleFile,defruleFile,joinFile,linkFile,maxIndices);
+               return false;
+              }
+           }
+        }
+
+      moduleCount++;
+      moduleArrayCount++;
+     }
+
+   CloseDefruleFiles(theEnv,moduleFile,defruleFile,joinFile,linkFile,maxIndices);
+
+   return true;
+  }
+
+/*********************************************************************/
+/* RuleCompilerTraverseJoins: Traverses the join network for a rule. */
+/*********************************************************************/
+static bool RuleCompilerTraverseJoins(
+  Environment *theEnv,
+  struct joinNode *joinPtr,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  FILE **joinFile,
+  FILE **linkFile,
+  unsigned int *fileCount,
+  unsigned int *joinArrayVersion,
+  unsigned int *joinArrayCount,
+  unsigned int *linkArrayVersion,
+  unsigned int *linkArrayCount)
+  {
+   for (;
+        joinPtr != NULL;
+        joinPtr = joinPtr->lastLevel)
+     {
+      if (joinPtr->marked)
+        {
+         *joinFile = OpenFileIfNeeded(theEnv,*joinFile,fileName,pathName,fileNameBuffer,fileID,imageID,fileCount,
+                                      *joinArrayVersion,headerFP,
+                                      "struct joinNode",JoinPrefix(),false,NULL);
+         if (*joinFile == NULL)
+           { return false; }
+
+         JoinToCode(theEnv,*joinFile,joinPtr,imageID,maxIndices);
+         (*joinArrayCount)++;
+         *joinFile = CloseFileIfNeeded(theEnv,*joinFile,joinArrayCount,joinArrayVersion,
+                                       maxIndices,NULL,NULL);
+
+
+         if (! TraverseJoinLinks(theEnv,joinPtr->nextLinks,fileName,pathName,fileNameBuffer,fileID,headerFP,imageID,
+                                 maxIndices,linkFile,fileCount,linkArrayVersion,linkArrayCount))
+           { return false; }
+        }
+
+      if (joinPtr->joinFromTheRight)
+        {
+         if (RuleCompilerTraverseJoins(theEnv,(struct joinNode *) joinPtr->rightSideEntryStructure,fileName,pathName,
+                                       fileNameBuffer,fileID,headerFP,imageID,maxIndices,joinFile,linkFile,fileCount,
+                                       joinArrayVersion,joinArrayCount,
+                                       linkArrayVersion,linkArrayCount) == false)
+           { return false; }
+        }
+     }
+
+   return true;
+  }
+
+/*******************************************************/
+/* TraverseJoinLinks: Writes out a list of join links. */
+/*******************************************************/
+static bool TraverseJoinLinks(
+  Environment *theEnv,
+  struct joinLink *linkPtr,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  FILE **linkFile,
+  unsigned int *fileCount,
+  unsigned int *linkArrayVersion,
+  unsigned int *linkArrayCount)
+  {
+   for (;
+        linkPtr != NULL;
+        linkPtr = linkPtr->next)
+     {
+      *linkFile = OpenFileIfNeeded(theEnv,*linkFile,fileName,pathName,fileNameBuffer,fileID,imageID,fileCount,
+                                   *linkArrayVersion,headerFP,
+                                   "struct joinLink",LinkPrefix(),false,NULL);
+
+      if (*linkFile == NULL)
+        { return false; }
+
+      LinkToCode(theEnv,*linkFile,linkPtr,imageID,maxIndices);
+      (*linkArrayCount)++;
+      *linkFile = CloseFileIfNeeded(theEnv,*linkFile,linkArrayCount,linkArrayVersion,
+                                    maxIndices,NULL,NULL);
+     }
+
+   return true;
+  }
+
+/********************************************************/
+/* CloseDefruleFiles: Closes all of the C files created */
+/*   for defrule. Called when an error occurs or when   */
+/*   the defrules have all been written to the files.   */
+/********************************************************/
+static void CloseDefruleFiles(
+  Environment *theEnv,
+  FILE *moduleFile,
+  FILE *defruleFile,
+  FILE *joinFile,
+  FILE *linkFile,
+  unsigned int maxIndices)
+  {
+   unsigned int count = maxIndices;
+   unsigned int arrayVersion = 0;
+
+   if (linkFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,linkFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+
+   if (joinFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,joinFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+
+   if (defruleFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,defruleFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+
+   if (moduleFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,moduleFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+  }
+
+/*********************************************************/
+/* DefruleModuleToCode: Writes the C code representation */
+/*   of a single defrule module to the specified file.   */
+/*********************************************************/
+static void DefruleModuleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount)
+  {
+#if MAC_XCD
+#pragma unused(moduleCount)
+#endif
+
+   fprintf(theFile,"{");
+
+   ConstructModuleToCode(theEnv,theFile,theModule,imageID,maxIndices,
+                         DefruleData(theEnv)->DefruleModuleIndex,
+                         ConstructPrefix(DefruleData(theEnv)->DefruleCodeItem));
+
+   fprintf(theFile,",NULL}");
+  }
+
+/**********************************************************/
+/* DefruleToCode: Writes the C code representation of a   */
+/*   single defrule data structure to the specified file. */
+/**********************************************************/
+static void DefruleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defrule *theDefrule,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount)
+  {
+   /*==================*/
+   /* Construct Header */
+   /*==================*/
+
+   fprintf(theFile,"{");
+
+   ConstructHeaderToCode(theEnv,theFile,&theDefrule->header,imageID,maxIndices,
+                                  moduleCount,ModulePrefix(DefruleData(theEnv)->DefruleCodeItem),
+                                  ConstructPrefix(DefruleData(theEnv)->DefruleCodeItem));
+
+   /*==========================*/
+   /* Flags and Integer Values */
+   /*==========================*/
+
+   fprintf(theFile,",%d,%d,%d,%d,%d,%d,%d,%d,",
+                   theDefrule->salience,theDefrule->localVarCnt,
+                   theDefrule->complexity,theDefrule->afterBreakpoint,
+                   theDefrule->watchActivation,theDefrule->watchFiring,
+                   theDefrule->autoFocus,theDefrule->executing);
+
+   /*==================*/
+   /* Dynamic Salience */
+   /*==================*/
+
+   ExpressionToCode(theEnv,theFile,theDefrule->dynamicSalience);
+   fprintf(theFile,",");
+
+   /*=============*/
+   /* RHS Actions */
+   /*=============*/
+
+   ExpressionToCode(theEnv,theFile,theDefrule->actions);
+   fprintf(theFile,",");
+
+   /*=========================*/
+   /* Logical Dependency Join */
+   /*=========================*/
+
+   if (theDefrule->logicalJoin != NULL)
+     {
+      fprintf(theFile,"&%s%d_%ld[%ld],",JoinPrefix(),
+                     imageID,(theDefrule->logicalJoin->bsaveID / maxIndices) + 1,
+                             theDefrule->logicalJoin->bsaveID % maxIndices);
+     }
+   else
+     { fprintf(theFile,"NULL,"); }
+
+   /*===========*/
+   /* Last Join */
+   /*===========*/
+
+   if (theDefrule->lastJoin != NULL)
+     {
+      fprintf(theFile,"&%s%d_%ld[%ld],",JoinPrefix(),
+                     imageID,(theDefrule->lastJoin->bsaveID / maxIndices) + 1,
+                             theDefrule->lastJoin->bsaveID % maxIndices);
+     }
+   else
+     { fprintf(theFile,"NULL,"); }
+
+   /*===============*/
+   /* Next Disjunct */
+   /*===============*/
+
+   if (theDefrule->disjunct != NULL)
+     {
+      fprintf(theFile,"&%s%d_%ld[%ld]}",ConstructPrefix(DefruleData(theEnv)->DefruleCodeItem),
+                     imageID,(theDefrule->disjunct->header.bsaveID / maxIndices) + 1,
+                             theDefrule->disjunct->header.bsaveID % maxIndices);
+     }
+   else
+     { fprintf(theFile,"NULL}"); }
+  }
+
+/***************************************************/
+/* JoinToCode: Writes the C code representation of */
+/*   a single join node to the specified file.     */
+/***************************************************/
+static void JoinToCode(
+  Environment *theEnv,
+  FILE *joinFile,
+  struct joinNode *theJoin,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   struct patternParser *theParser;
+
+   /*===========================*/
+   /* Mark the join as visited. */
+   /*===========================*/
+
+   theJoin->marked = 0;
+
+   /*===========================*/
+   /* Flags and Integer Values. */
+   /*===========================*/
+
+   fprintf(joinFile,"{%d,%d,%d,%d,%d,0,0,%d,%d,0,0,0,0,0,0,",
+                   theJoin->firstJoin,theJoin->logicalJoin,
+                   theJoin->joinFromTheRight,theJoin->patternIsNegated,
+                   theJoin->patternIsExists,
+                   // initialize,
+                   // marked
+                   theJoin->rhsType,theJoin->depth);
+                   // bsaveID
+                   // memoryLeftAdds
+                   // memoryRightAdds
+                   // memoryLeftDeletes
+                   // memoryRightDeletes
+                   // memoryCompares
+
+   /*==========================*/
+   /* Left and right Memories. */
+   /*==========================*/
+
+   fprintf(joinFile,"NULL,NULL,");
+
+   /*====================*/
+   /* Network Expression */
+   /*====================*/
+
+   PrintHashedExpressionReference(theEnv,joinFile,theJoin->networkTest,imageID,maxIndices);
+   fprintf(joinFile,",");
+
+   PrintHashedExpressionReference(theEnv,joinFile,theJoin->secondaryNetworkTest,imageID,maxIndices);
+   fprintf(joinFile,",");
+
+   PrintHashedExpressionReference(theEnv,joinFile,theJoin->leftHash,imageID,maxIndices);
+   fprintf(joinFile,",");
+
+   PrintHashedExpressionReference(theEnv,joinFile,theJoin->rightHash,imageID,maxIndices);
+   fprintf(joinFile,",");
+
+   /*============================*/
+   /* Right Side Entry Structure */
+   /*============================*/
+
+   if (theJoin->rightSideEntryStructure == NULL)
+     { fprintf(joinFile,"NULL,"); }
+   else if (theJoin->joinFromTheRight == false)
+     {
+      theParser = GetPatternParser(theEnv,theJoin->rhsType);
+      if (theParser->codeReferenceFunction == NULL) fprintf(joinFile,"NULL,");
+      else
+        {
+         fprintf(joinFile,"VS ");
+         (*theParser->codeReferenceFunction)(theEnv,theJoin->rightSideEntryStructure,
+                                             joinFile,imageID,maxIndices);
+         fprintf(joinFile,",");
+        }
+     }
+   else
+     {
+      fprintf(joinFile,"&%s%u_%lu[%lu],",JoinPrefix(),
+              imageID,(((struct joinNode *) theJoin->rightSideEntryStructure)->bsaveID / maxIndices) + 1,
+                      ((struct joinNode *) theJoin->rightSideEntryStructure)->bsaveID % maxIndices);
+     }
+
+   /*=================*/
+   /* Next Join Level */
+   /*=================*/
+
+   if (theJoin->nextLinks == NULL)
+     { fprintf(joinFile,"NULL,"); }
+   else
+     {
+      fprintf(joinFile,"&%s%d_%ld[%ld],",LinkPrefix(),
+                    imageID,(theJoin->nextLinks->bsaveID / maxIndices) + 1,
+                            theJoin->nextLinks->bsaveID % maxIndices);
+     }
+
+   /*=================*/
+   /* Last Join Level */
+   /*=================*/
+
+   if (theJoin->lastLevel == NULL)
+     { fprintf(joinFile,"NULL,"); }
+   else
+     {
+      fprintf(joinFile,"&%s%d_%ld[%ld],",JoinPrefix(),
+                    imageID,(theJoin->lastLevel->bsaveID / maxIndices) + 1,
+                            theJoin->lastLevel->bsaveID % maxIndices);
+     }
+
+   /*==================*/
+   /* Right Match Node */
+   /*==================*/
+
+   if (theJoin->rightMatchNode == NULL)
+     { fprintf(joinFile,"NULL,"); }
+   else
+     {
+      fprintf(joinFile,"&%s%d_%ld[%ld],",JoinPrefix(),
+                    imageID,(theJoin->rightMatchNode->bsaveID / maxIndices) + 1,
+                            theJoin->rightMatchNode->bsaveID % maxIndices);
+     }
+
+   /*==================*/
+   /* Rule to Activate */
+   /*==================*/
+
+   if (theJoin->ruleToActivate == NULL)
+     { fprintf(joinFile,"NULL}"); }
+   else
+     {
+      fprintf(joinFile,"&%s%d_%ld[%ld]}",ConstructPrefix(DefruleData(theEnv)->DefruleCodeItem),imageID,
+                                    (theJoin->ruleToActivate->header.bsaveID / maxIndices) + 1,
+                                    theJoin->ruleToActivate->header.bsaveID % maxIndices);
+     }
+  }
+
+/***************************************************/
+/* LinkToCode: Writes the C code representation of */
+/*   a single join node to the specified file.     */
+/***************************************************/
+static void LinkToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  struct joinLink *theLink,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   /*==================*/
+   /* Enter Direction. */
+   /*==================*/
+
+   fprintf(theFile,"{%d,",theLink->enterDirection);
+
+   /*======*/
+   /* Join */
+   /*======*/
+
+   if (theLink->join == NULL)
+     { fprintf(theFile,"NULL,"); }
+   else
+     {
+      fprintf(theFile,"&%s%d_%ld[%ld],",JoinPrefix(),
+                    imageID,(theLink->join->bsaveID / maxIndices) + 1,
+                            theLink->join->bsaveID % maxIndices);
+     }
+
+   /*======*/
+   /* Next */
+   /*======*/
+
+   if (theLink->next == NULL)
+     { fprintf(theFile,"NULL,"); }
+   else
+     {
+      fprintf(theFile,"&%s%d_%ld[%ld],",LinkPrefix(),
+                    imageID,(theLink->next->bsaveID / maxIndices) + 1,
+                            theLink->next->bsaveID % maxIndices);
+     }
+
+   /*===========*/
+   /* Bsave ID. */
+   /*===========*/
+
+   fprintf(theFile,"0}");
+  }
+
+/*************************************************************/
+/* DefruleCModuleReference: Writes the C code representation */
+/*   of a reference to a defrule module data structure.      */
+/*************************************************************/
+void DefruleCModuleReference(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned long count,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"MIHS &%s%u_%lu[%lu]",ModulePrefix(DefruleData(theEnv)->DefruleCodeItem),
+                      imageID,
+                      (count / maxIndices) + 1,
+                      (count % maxIndices));
+  }
+
+
+/*****************************************************************/
+/* InitDefruleCode: Writes out initialization code for defrules. */
+/*****************************************************************/
+static void InitDefruleCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+#if MAC_XCD
+#pragma unused(maxIndices)
+#pragma unused(theEnv)
+#pragma unused(imageID)
+#endif
+
+   fprintf(initFP,"   DefruleRunTimeInitialize(theEnv,");
+
+   if (DefruleData(theEnv)->RightPrimeJoins == NULL)
+     { fprintf(initFP,"NULL,"); }
+   else
+     {
+      fprintf(initFP,"&%s%u_%lu[%lu],",LinkPrefix(),
+                    imageID,(DefruleData(theEnv)->RightPrimeJoins->bsaveID / maxIndices) + 1,
+                             DefruleData(theEnv)->RightPrimeJoins->bsaveID % maxIndices);
+     }
+
+   if (DefruleData(theEnv)->LeftPrimeJoins == NULL)
+     { fprintf(initFP,"NULL);\n"); }
+   else
+     {
+      fprintf(initFP,"&%s%u_%lu[%lu]);\n",LinkPrefix(),
+                    imageID,(DefruleData(theEnv)->LeftPrimeJoins->bsaveID / maxIndices) + 1,
+                             DefruleData(theEnv)->LeftPrimeJoins->bsaveID % maxIndices);
+     }
+  }
+
+#endif /* DEFRULE_CONSTRUCT && (! RUN_TIME) && CONSTRUCT_COMPILER */
diff --git a/clips/rulecmp.h b/clips/rulecmp.h
new file mode 100755
index 000000000..1a201b459
--- /dev/null
+++ b/clips/rulecmp.h
@@ -0,0 +1,63 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*        DEFRULE CONSTRUCT COMPILER HEADER FILE       */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for the   */
+/*    defrule construct.                                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE and                   */
+/*            LOGICAL_DEPENDENCIES compilation flags.        */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for join network changes.              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_rulecmp
+
+#pragma once
+
+#define _H_rulecmp
+
+#include "conscomp.h"
+#include "extnfunc.h"
+
+#define JoinPrefix() ArbitraryPrefix(DefruleData(theEnv)->DefruleCodeItem,2)
+#define LinkPrefix() ArbitraryPrefix(DefruleData(theEnv)->DefruleCodeItem,3)
+
+   void                     DefruleCompilerSetup(Environment *);
+   void                     DefruleCModuleReference(Environment *,FILE *,unsigned long,unsigned int,unsigned int);
+
+#endif /* _H_rulecmp */
+
+
+
+
diff --git a/clips/rulecom.c b/clips/rulecom.c
new file mode 100755
index 000000000..04955b8fc
--- /dev/null
+++ b/clips/rulecom.c
@@ -0,0 +1,1571 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/10/18             */
+   /*                                                     */
+   /*                RULE COMMANDS MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides the matches command. Also provides the  */
+/*   the developer commands show-joins and rule-complexity.  */
+/*   Also provides the initialization routine which          */
+/*   registers rule commands found in other modules.         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES         */
+/*            INCREMENTAL_RESET, and LOGICAL_DEPENDENCIES    */
+/*            compilation flags.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Improvements to matches command.               */
+/*                                                           */
+/*            Add join-activity and join-activity-reset      */
+/*            commands.                                      */
+/*                                                           */
+/*            Added get-beta-memory-resizing and             */
+/*            set-beta-memory-resizing functions.            */
+/*                                                           */
+/*            Added timetag function.                        */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.31: Fixes for show-joins command.                  */
+/*                                                           */
+/*            Fixes for matches command where the            */
+/*            activations listed were not correct if the     */
+/*            current module was different than the module   */
+/*            for the specified rule.                        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Incremental reset is always enabled.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include "argacces.h"
+#include "constant.h"
+#include "constrct.h"
+#include "crstrtgy.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "extnfunc.h"
+#include "incrrset.h"
+#include "lgcldpnd.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "pattern.h"
+#include "prntutil.h"
+#include "reteutil.h"
+#include "router.h"
+#include "ruledlt.h"
+#include "sysdep.h"
+#include "utility.h"
+#include "watch.h"
+
+#if BLOAD || BLOAD_AND_BSAVE || BLOAD_ONLY
+#include "rulebin.h"
+#endif
+
+#include "rulecom.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if DEVELOPER
+   static void                    ShowJoins(Environment *,Defrule *);
+#endif
+#if DEBUGGING_FUNCTIONS
+   static long long               ListAlphaMatches(Environment *,struct joinInformation *,int);
+   static long long               ListBetaMatches(Environment *,struct joinInformation *,long,unsigned short,int);
+   static void                    ListBetaJoinActivity(Environment *,struct joinInformation *,long,long,int,UDFValue *);
+   static unsigned short          AlphaJoinCountDriver(Environment *,struct joinNode *);
+   static unsigned short          BetaJoinCountDriver(Environment *,struct joinNode *);
+   static void                    AlphaJoinsDriver(Environment *,struct joinNode *,unsigned short,struct joinInformation *);
+   static void                    BetaJoinsDriver(Environment *,struct joinNode *,unsigned short,struct joinInformation *,struct betaMemory *,struct joinNode *);
+   static int                     CountPatterns(Environment *,struct joinNode *,bool);
+   static const char             *BetaHeaderString(Environment *,struct joinInformation *,long,long);
+   static const char             *ActivityHeaderString(Environment *,struct joinInformation *,long,long);
+   static void                    JoinActivityReset(Environment *,ConstructHeader *,void *);
+#endif
+
+/****************************************************************/
+/* DefruleCommands: Initializes defrule commands and functions. */
+/****************************************************************/
+void DefruleCommands(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"run","v",0,1,"l",RunCommand,"RunCommand",NULL);
+   AddUDF(theEnv,"halt","v",0,0,NULL,HaltCommand,"HaltCommand",NULL);
+   AddUDF(theEnv,"focus","b",1,UNBOUNDED,"y",FocusCommand,"FocusCommand",NULL);
+   AddUDF(theEnv,"clear-focus-stack","v",0,0,NULL,ClearFocusStackCommand,"ClearFocusStackCommand",NULL);
+   AddUDF(theEnv,"get-focus-stack","m",0,0,NULL,GetFocusStackFunction,"GetFocusStackFunction",NULL);
+   AddUDF(theEnv,"pop-focus","y",0,0,NULL,PopFocusFunction,"PopFocusFunction",NULL);
+   AddUDF(theEnv,"get-focus","y",0,0,NULL,GetFocusFunction,"GetFocusFunction",NULL);
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"set-break","v",1,1,"y",SetBreakCommand,"SetBreakCommand",NULL);
+   AddUDF(theEnv,"remove-break","v",0,1,"y",RemoveBreakCommand,"RemoveBreakCommand",NULL);
+   AddUDF(theEnv,"show-breaks","v",0,1,"y",ShowBreaksCommand,"ShowBreaksCommand",NULL);
+   AddUDF(theEnv,"matches","bm",1,2,"y",MatchesCommand,"MatchesCommand",NULL);
+   AddUDF(theEnv,"join-activity","bm",1,2,"y",JoinActivityCommand,"JoinActivityCommand",NULL);
+   AddUDF(theEnv,"join-activity-reset","v",0,0,NULL,JoinActivityResetCommand,"JoinActivityResetCommand",NULL);
+   AddUDF(theEnv,"list-focus-stack","v",0,0,NULL,ListFocusStackCommand,"ListFocusStackCommand",NULL);
+   AddUDF(theEnv,"dependencies","v",1,1,"infly",DependenciesCommand,"DependenciesCommand",NULL);
+   AddUDF(theEnv,"dependents","v",1,1,"infly",DependentsCommand,"DependentsCommand",NULL);
+
+   AddUDF(theEnv,"timetag","l",1,1,"infly" ,TimetagFunction,"TimetagFunction",NULL);
+#endif /* DEBUGGING_FUNCTIONS */
+
+   AddUDF(theEnv,"get-beta-memory-resizing","b",0,0,NULL,GetBetaMemoryResizingCommand,"GetBetaMemoryResizingCommand",NULL);
+   AddUDF(theEnv,"set-beta-memory-resizing","b",1,1,NULL,SetBetaMemoryResizingCommand,"SetBetaMemoryResizingCommand",NULL);
+
+   AddUDF(theEnv,"get-strategy","y",0,0,NULL,GetStrategyCommand,"GetStrategyCommand",NULL);
+   AddUDF(theEnv,"set-strategy","y",1,1,"y",SetStrategyCommand,"SetStrategyCommand",NULL);
+
+#if DEVELOPER && (! BLOAD_ONLY)
+   AddUDF(theEnv,"rule-complexity","l",1,1,"y",RuleComplexityCommand,"RuleComplexityCommand",NULL);
+   AddUDF(theEnv,"show-joins","v",1,1,"y",ShowJoinsCommand,"ShowJoinsCommand",NULL);
+   AddUDF(theEnv,"show-aht","v",0,0,NULL,ShowAlphaHashTable,"ShowAlphaHashTable",NULL);
+#if DEBUGGING_FUNCTIONS
+   AddWatchItem(theEnv,"rule-analysis",0,&DefruleData(theEnv)->WatchRuleAnalysis,0,NULL,NULL);
+#endif
+#endif /* DEVELOPER && (! BLOAD_ONLY) */
+
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif /* ! RUN_TIME */
+  }
+
+/***********************************************/
+/* GetBetaMemoryResizing: C access routine     */
+/*   for the get-beta-memory-resizing command. */
+/***********************************************/
+bool GetBetaMemoryResizing(
+  Environment *theEnv)
+  {
+   return DefruleData(theEnv)->BetaMemoryResizingFlag;
+  }
+
+/***********************************************/
+/* SetBetaMemoryResizing: C access routine     */
+/*   for the set-beta-memory-resizing command. */
+/***********************************************/
+bool SetBetaMemoryResizing(
+  Environment *theEnv,
+  bool value)
+  {
+   bool ov;
+
+   ov = DefruleData(theEnv)->BetaMemoryResizingFlag;
+
+   DefruleData(theEnv)->BetaMemoryResizingFlag = value;
+
+   return(ov);
+  }
+
+/****************************************************/
+/* SetBetaMemoryResizingCommand: H/L access routine */
+/*   for the set-beta-memory-resizing command.      */
+/****************************************************/
+void SetBetaMemoryResizingCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,GetBetaMemoryResizing(theEnv));
+
+   /*=================================================*/
+   /* The symbol FALSE disables beta memory resizing. */
+   /* Any other value enables beta memory resizing.   */
+   /*=================================================*/
+
+   if (! UDFFirstArgument(context,ANY_TYPE_BITS,&theArg))
+     { return; }
+
+   if (theArg.value == FalseSymbol(theEnv))
+     { SetBetaMemoryResizing(theEnv,false); }
+   else
+     { SetBetaMemoryResizing(theEnv,true); }
+  }
+
+/****************************************************/
+/* GetBetaMemoryResizingCommand: H/L access routine */
+/*   for the get-beta-memory-resizing command.      */
+/****************************************************/
+void GetBetaMemoryResizingCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->lexemeValue = CreateBoolean(theEnv,GetBetaMemoryResizing(theEnv));
+  }
+
+/******************************************/
+/* GetFocusFunction: H/L access routine   */
+/*   for the get-focus function.          */
+/******************************************/
+void GetFocusFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Defmodule *rv;
+
+   rv = GetFocus(theEnv);
+
+   if (rv == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   returnValue->value = rv->header.name;
+  }
+
+/*********************************/
+/* GetFocus: C access routine    */
+/*   for the get-focus function. */
+/*********************************/
+Defmodule *GetFocus(
+  Environment *theEnv)
+  {
+   if (EngineData(theEnv)->CurrentFocus == NULL) return NULL;
+
+   return EngineData(theEnv)->CurrentFocus->theModule;
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/****************************************/
+/* MatchesCommand: H/L access routine   */
+/*   for the matches command.           */
+/****************************************/
+void MatchesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *ruleName, *argument;
+   Defrule *rulePtr;
+   UDFValue theArg;
+   Verbosity output;
+   CLIPSValue result;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   ruleName = theArg.lexemeValue->contents;
+
+   rulePtr = FindDefrule(theEnv,ruleName);
+   if (rulePtr == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defrule",ruleName,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+        { return; }
+
+      argument = theArg.lexemeValue->contents;
+      if (strcmp(argument,"verbose") == 0)
+        { output = VERBOSE; }
+      else if (strcmp(argument,"succinct") == 0)
+        { output = SUCCINCT; }
+      else if (strcmp(argument,"terse") == 0)
+        { output = TERSE; }
+      else
+        {
+         UDFInvalidArgumentMessage(context,"symbol with value verbose, succinct, or terse");
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+   else
+     { output = VERBOSE; }
+
+   Matches(rulePtr,output,&result);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/******************************/
+/* Matches: C access routine  */
+/*   for the matches command. */
+/******************************/
+void Matches(
+  Defrule *theDefrule,
+  Verbosity output,
+  CLIPSValue *returnValue)
+  {
+   Defrule *rulePtr;
+   Defrule *topDisjunct = theDefrule;
+   long joinIndex;
+   unsigned short arraySize;
+   struct joinInformation *theInfo;
+   long long alphaMatchCount = 0;
+   long long betaMatchCount = 0;
+   long long activations = 0;
+   Activation *agendaPtr;
+   Environment *theEnv = theDefrule->header.env;
+
+   /*==========================*/
+   /* Set up the return value. */
+   /*==========================*/
+
+   returnValue->value = CreateMultifield(theEnv,3L);
+
+   returnValue->multifieldValue->contents[0].integerValue = SymbolData(theEnv)->Zero;
+   returnValue->multifieldValue->contents[1].integerValue = SymbolData(theEnv)->Zero;
+   returnValue->multifieldValue->contents[2].integerValue = SymbolData(theEnv)->Zero;
+
+   /*=================================================*/
+   /* Loop through each of the disjuncts for the rule */
+   /*=================================================*/
+
+   for (rulePtr = topDisjunct; rulePtr != NULL; rulePtr = rulePtr->disjunct)
+     {
+      /*===============================================*/
+      /* Create the array containing the list of alpha */
+      /* join nodes (those connected to a pattern CE). */
+      /*===============================================*/
+
+      arraySize = AlphaJoinCount(theEnv,rulePtr);
+
+      theInfo = CreateJoinArray(theEnv,arraySize);
+
+      AlphaJoins(theEnv,rulePtr,arraySize,theInfo);
+
+      /*=========================*/
+      /* List the alpha matches. */
+      /*=========================*/
+
+      for (joinIndex = 0; joinIndex < arraySize; joinIndex++)
+        {
+         alphaMatchCount += ListAlphaMatches(theEnv,&theInfo[joinIndex],output);
+         returnValue->multifieldValue->contents[0].integerValue = CreateInteger(theEnv,alphaMatchCount);
+        }
+
+      /*================================*/
+      /* Free the array of alpha joins. */
+      /*================================*/
+
+      FreeJoinArray(theEnv,theInfo,arraySize);
+
+      /*==============================================*/
+      /* Create the array containing the list of beta */
+      /* join nodes (joins from the right plus joins  */
+      /* connected to a pattern CE).                  */
+      /*==============================================*/
+
+      arraySize = BetaJoinCount(theEnv,rulePtr);
+
+      theInfo = CreateJoinArray(theEnv,arraySize);
+
+      BetaJoins(theEnv,rulePtr,arraySize,theInfo);
+
+      /*======================================*/
+      /* List the beta matches (for all joins */
+      /* except the first pattern CE).        */
+      /*======================================*/
+
+      for (joinIndex = 1; joinIndex < arraySize; joinIndex++)
+        {
+         betaMatchCount += ListBetaMatches(theEnv,theInfo,joinIndex,arraySize,output);
+         returnValue->multifieldValue->contents[1].integerValue = CreateInteger(theEnv,betaMatchCount);
+        }
+
+      /*================================*/
+      /* Free the array of alpha joins. */
+      /*================================*/
+
+      FreeJoinArray(theEnv,theInfo,arraySize);
+     }
+
+   /*===================*/
+   /* List activations. */
+   /*===================*/
+
+   if (output == VERBOSE)
+     { WriteString(theEnv,STDOUT,"Activations\n"); }
+
+   for (agendaPtr = ((struct defruleModule *) topDisjunct->header.whichModule)->agenda;
+        agendaPtr != NULL;
+        agendaPtr = (struct activation *) GetNextActivation(theEnv,agendaPtr))
+     {
+      if (GetHaltExecution(theEnv) == true) return;
+
+      if (((struct activation *) agendaPtr)->theRule->header.name == topDisjunct->header.name)
+        {
+         activations++;
+
+         if (output == VERBOSE)
+           {
+            PrintPartialMatch(theEnv,STDOUT,GetActivationBasis(theEnv,agendaPtr));
+            WriteString(theEnv,STDOUT,"\n");
+           }
+        }
+     }
+
+   if (output == SUCCINCT)
+     {
+      WriteString(theEnv,STDOUT,"Activations: ");
+      WriteInteger(theEnv,STDOUT,activations);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+
+   if ((activations == 0) && (output == VERBOSE)) WriteString(theEnv,STDOUT," None\n");
+
+   returnValue->multifieldValue->contents[2].integerValue = CreateInteger(theEnv,activations);
+  }
+
+/****************************************************/
+/* AlphaJoinCountDriver: Driver routine to iterate  */
+/*   over a rule's joins to determine the number of */
+/*   alpha joins.                                   */
+/****************************************************/
+static unsigned short AlphaJoinCountDriver(
+  Environment *theEnv,
+  struct joinNode *theJoin)
+  {
+   unsigned short alphaCount = 0;
+
+   if (theJoin == NULL)
+     { return alphaCount; }
+
+   if (theJoin->joinFromTheRight)
+     { return AlphaJoinCountDriver(theEnv,(struct joinNode *) theJoin->rightSideEntryStructure); }
+   else if (theJoin->lastLevel != NULL)
+     { alphaCount += AlphaJoinCountDriver(theEnv,theJoin->lastLevel); }
+
+   alphaCount++;
+
+   return alphaCount;
+  }
+
+/***********************************************/
+/* AlphaJoinCount: Returns the number of alpha */
+/*   joins associated with the specified rule. */
+/***********************************************/
+unsigned short AlphaJoinCount(
+  Environment *theEnv,
+  Defrule *theDefrule)
+  {
+   return AlphaJoinCountDriver(theEnv,theDefrule->lastJoin->lastLevel);
+  }
+
+/***************************************/
+/* AlphaJoinsDriver: Driver routine to */
+/*   retrieve a rule's alpha joins.    */
+/***************************************/
+static void AlphaJoinsDriver(
+  Environment *theEnv,
+  struct joinNode *theJoin,
+  unsigned short alphaIndex,
+  struct joinInformation *theInfo)
+  {
+   if (theJoin == NULL)
+     { return; }
+
+   if (theJoin->joinFromTheRight)
+     {
+      AlphaJoinsDriver(theEnv,(struct joinNode *) theJoin->rightSideEntryStructure,alphaIndex,theInfo);
+      return;
+     }
+   else if (theJoin->lastLevel != NULL)
+     { AlphaJoinsDriver(theEnv,theJoin->lastLevel,alphaIndex-1,theInfo); }
+
+   theInfo[alphaIndex-1].whichCE = alphaIndex;
+   theInfo[alphaIndex-1].theJoin = theJoin;
+
+   return;
+  }
+
+/*****************************************/
+/* AlphaJoins: Retrieves the alpha joins */
+/*   associated with the specified rule. */
+/*****************************************/
+void AlphaJoins(
+  Environment *theEnv,
+  Defrule *theDefrule,
+  unsigned short alphaCount,
+  struct joinInformation *theInfo)
+  {
+   AlphaJoinsDriver(theEnv,theDefrule->lastJoin->lastLevel,alphaCount,theInfo);
+  }
+
+/****************************************************/
+/* BetaJoinCountDriver: Driver routine to iterate  */
+/*   over a rule's joins to determine the number of */
+/*   beta joins.                                   */
+/****************************************************/
+static unsigned short BetaJoinCountDriver(
+  Environment *theEnv,
+  struct joinNode *theJoin)
+  {
+   unsigned short betaCount = 0;
+
+   if (theJoin == NULL)
+     { return betaCount; }
+
+   betaCount++;
+
+   if (theJoin->joinFromTheRight)
+     { betaCount += BetaJoinCountDriver(theEnv,(struct joinNode *) theJoin->rightSideEntryStructure); }
+   else if (theJoin->lastLevel != NULL)
+     { betaCount += BetaJoinCountDriver(theEnv,theJoin->lastLevel); }
+
+   return betaCount;
+  }
+
+/***********************************************/
+/* BetaJoinCount: Returns the number of beta   */
+/*   joins associated with the specified rule. */
+/***********************************************/
+unsigned short BetaJoinCount(
+  Environment *theEnv,
+  Defrule *theDefrule)
+  {
+   return BetaJoinCountDriver(theEnv,theDefrule->lastJoin->lastLevel);
+  }
+
+/**************************************/
+/* BetaJoinsDriver: Driver routine to */
+/*   retrieve a rule's beta joins.    */
+/**************************************/
+static void BetaJoinsDriver(
+  Environment *theEnv,
+  struct joinNode *theJoin,
+  unsigned short betaIndex,
+  struct joinInformation *theJoinInfoArray,
+  struct betaMemory *lastMemory,
+  struct joinNode *nextJoin)
+  {
+   unsigned short theCE = 0;
+   int theCount;
+   struct joinNode *tmpPtr;
+
+   if (theJoin == NULL)
+     { return; }
+
+   theJoinInfoArray[betaIndex-1].theJoin = theJoin;
+   theJoinInfoArray[betaIndex-1].theMemory = lastMemory;
+   theJoinInfoArray[betaIndex-1].nextJoin = nextJoin;
+
+   /*===================================*/
+   /* Determine the conditional element */
+   /* index for this join.              */
+   /*===================================*/
+
+   for (tmpPtr = theJoin; tmpPtr != NULL; tmpPtr = tmpPtr->lastLevel)
+      { theCE++; }
+
+   theJoinInfoArray[betaIndex-1].whichCE = theCE;
+
+   /*==============================================*/
+   /* The end pattern in the range of patterns for */
+   /* this join is always the number of patterns   */
+   /* remaining to be encountered.                 */
+   /*==============================================*/
+
+   theCount = CountPatterns(theEnv,theJoin,true);
+   theJoinInfoArray[betaIndex-1].patternEnd = theCount;
+
+   /*========================================================*/
+   /* Determine where the block of patterns for a CE begins. */
+   /*========================================================*/
+
+
+   theCount = CountPatterns(theEnv,theJoin,false);
+   theJoinInfoArray[betaIndex-1].patternBegin = theCount;
+
+   /*==========================*/
+   /* Find the next beta join. */
+   /*==========================*/
+
+   if (theJoin->joinFromTheRight)
+     { BetaJoinsDriver(theEnv,(struct joinNode *) theJoin->rightSideEntryStructure,betaIndex-1,theJoinInfoArray,theJoin->rightMemory,theJoin); }
+   else if (theJoin->lastLevel != NULL)
+     { BetaJoinsDriver(theEnv,theJoin->lastLevel,betaIndex-1,theJoinInfoArray,theJoin->leftMemory,theJoin); }
+
+   return;
+  }
+
+/*****************************************/
+/* BetaJoins: Retrieves the beta joins   */
+/*   associated with the specified rule. */
+/*****************************************/
+void BetaJoins(
+  Environment *theEnv,
+  Defrule *theDefrule,
+  unsigned short betaArraySize,
+  struct joinInformation *theInfo)
+  {
+   BetaJoinsDriver(theEnv,theDefrule->lastJoin->lastLevel,betaArraySize,theInfo,theDefrule->lastJoin->leftMemory,theDefrule->lastJoin);
+  }
+
+/***********************************************/
+/* CreateJoinArray: Creates a join information */
+/*    array of the specified size.             */
+/***********************************************/
+struct joinInformation *CreateJoinArray(
+   Environment *theEnv,
+   unsigned short size)
+   {
+    if (size == 0) return NULL;
+
+    return (struct joinInformation *) genalloc(theEnv,sizeof(struct joinInformation) * size);
+   }
+
+/*******************************************/
+/* FreeJoinArray: Frees a join information */
+/*    array of the specified size.         */
+/*******************************************/
+void FreeJoinArray(
+   Environment *theEnv,
+   struct joinInformation *theArray,
+   unsigned short size)
+   {
+    if (size == 0) return;
+
+    genfree(theEnv,theArray,sizeof(struct joinInformation) * size);
+   }
+
+/*********************/
+/* ListAlphaMatches: */
+/*********************/
+static long long ListAlphaMatches(
+  Environment *theEnv,
+  struct joinInformation *theInfo,
+  int output)
+  {
+   struct alphaMemoryHash *listOfHashNodes;
+   struct partialMatch *listOfMatches;
+   long long count;
+   struct joinNode *theJoin;
+   long long alphaCount = 0;
+
+   if (GetHaltExecution(theEnv) == true)
+     { return(alphaCount); }
+
+   theJoin = theInfo->theJoin;
+
+   if (output == VERBOSE)
+     {
+      WriteString(theEnv,STDOUT,"Matches for Pattern ");
+      WriteInteger(theEnv,STDOUT,theInfo->whichCE);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+
+   if (theJoin->rightSideEntryStructure == NULL)
+     {
+      if (theJoin->rightMemory->beta[0]->children != NULL)
+        { alphaCount += 1; }
+
+      if (output == VERBOSE)
+        {
+         if (theJoin->rightMemory->beta[0]->children != NULL)
+           { WriteString(theEnv,STDOUT,"*\n"); }
+         else
+           { WriteString(theEnv,STDOUT," None\n"); }
+        }
+      else if (output == SUCCINCT)
+        {
+         WriteString(theEnv,STDOUT,"Pattern ");
+         WriteInteger(theEnv,STDOUT,theInfo->whichCE);
+         WriteString(theEnv,STDOUT,": ");
+
+         if (theJoin->rightMemory->beta[0]->children != NULL)
+           { WriteString(theEnv,STDOUT,"1"); }
+         else
+           { WriteString(theEnv,STDOUT,"0"); }
+         WriteString(theEnv,STDOUT,"\n");
+        }
+
+      return(alphaCount);
+     }
+
+   listOfHashNodes =  ((struct patternNodeHeader *) theJoin->rightSideEntryStructure)->firstHash;
+
+   for (count = 0;
+        listOfHashNodes != NULL;
+        listOfHashNodes = listOfHashNodes->nextHash)
+     {
+      listOfMatches = listOfHashNodes->alphaMemory;
+
+      while (listOfMatches != NULL)
+        {
+         if (GetHaltExecution(theEnv) == true)
+           { return(alphaCount); }
+
+         count++;
+         if (output == VERBOSE)
+           {
+            PrintPartialMatch(theEnv,STDOUT,listOfMatches);
+            WriteString(theEnv,STDOUT,"\n");
+           }
+         listOfMatches = listOfMatches->nextInMemory;
+        }
+     }
+
+   alphaCount += count;
+
+   if ((count == 0) && (output == VERBOSE)) WriteString(theEnv,STDOUT," None\n");
+
+   if (output == SUCCINCT)
+     {
+      WriteString(theEnv,STDOUT,"Pattern ");
+      WriteInteger(theEnv,STDOUT,theInfo->whichCE);
+      WriteString(theEnv,STDOUT,": ");
+      WriteInteger(theEnv,STDOUT,count);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+
+   return(alphaCount);
+  }
+
+/********************/
+/* BetaHeaderString */
+/********************/
+static const char *BetaHeaderString(
+  Environment *theEnv,
+  struct joinInformation *infoArray,
+  long joinIndex,
+  long arraySize)
+  {
+   struct joinNode *theJoin;
+   struct joinInformation *theInfo;
+   long i, j, startPosition, endPosition, positionsToPrint = 0;
+   bool nestedCEs = false;
+   const char *returnString = "";
+   long lastIndex;
+   char buffer[32];
+
+   /*=============================================*/
+   /* Determine which joins need to be traversed. */
+   /*=============================================*/
+
+   for (i = 0; i < arraySize; i++)
+     { infoArray[i].marked = false; }
+
+   theInfo = &infoArray[joinIndex];
+   theJoin = theInfo->theJoin;
+   lastIndex = joinIndex;
+
+   while (theJoin != NULL)
+     {
+      for (i = lastIndex; i >= 0; i--)
+        {
+         if (infoArray[i].theJoin == theJoin)
+           {
+            positionsToPrint++;
+            infoArray[i].marked = true;
+            if (infoArray[i].patternBegin != infoArray[i].patternEnd)
+              { nestedCEs = true; }
+            lastIndex = i - 1;
+            break;
+           }
+        }
+      theJoin = theJoin->lastLevel;
+     }
+
+   for (i = 0; i <= joinIndex; i++)
+     {
+      if (infoArray[i].marked == false) continue;
+
+      positionsToPrint--;
+      startPosition = i;
+      endPosition = i;
+
+      if (infoArray[i].patternBegin == infoArray[i].patternEnd)
+        {
+         for (j = i + 1; j <= joinIndex; j++)
+           {
+            if (infoArray[j].marked == false) continue;
+
+            if (infoArray[j].patternBegin != infoArray[j].patternEnd) break;
+
+            positionsToPrint--;
+            i = j;
+            endPosition = j;
+           }
+        }
+
+      theInfo = &infoArray[startPosition];
+
+      gensprintf(buffer,"%d",theInfo->whichCE);
+      returnString = AppendStrings(theEnv,returnString,buffer);
+
+      if (nestedCEs)
+        {
+         if (theInfo->patternBegin == theInfo->patternEnd)
+           {
+            returnString = AppendStrings(theEnv,returnString," (P");
+            gensprintf(buffer,"%d",theInfo->patternBegin);
+            returnString = AppendStrings(theEnv,returnString,buffer);
+            returnString = AppendStrings(theEnv,returnString,")");
+           }
+         else
+           {
+            returnString = AppendStrings(theEnv,returnString," (P");
+            gensprintf(buffer,"%d",theInfo->patternBegin);
+            returnString = AppendStrings(theEnv,returnString,buffer);
+            returnString = AppendStrings(theEnv,returnString," - P");
+            gensprintf(buffer,"%d",theInfo->patternEnd);
+            returnString = AppendStrings(theEnv,returnString,buffer);
+            returnString = AppendStrings(theEnv,returnString,")");
+           }
+        }
+
+      if (startPosition != endPosition)
+        {
+         theInfo = &infoArray[endPosition];
+
+         returnString = AppendStrings(theEnv,returnString," - ");
+         gensprintf(buffer,"%d",theInfo->whichCE);
+         returnString = AppendStrings(theEnv,returnString,buffer);
+
+         if (nestedCEs)
+           {
+            if (theInfo->patternBegin == theInfo->patternEnd)
+              {
+               returnString = AppendStrings(theEnv,returnString," (P");
+               gensprintf(buffer,"%d",theInfo->patternBegin);
+               returnString = AppendStrings(theEnv,returnString,buffer);
+               returnString = AppendStrings(theEnv,returnString,")");
+              }
+            else
+              {
+               returnString = AppendStrings(theEnv,returnString," (P");
+               gensprintf(buffer,"%d",theInfo->patternBegin);
+               returnString = AppendStrings(theEnv,returnString,buffer);
+               returnString = AppendStrings(theEnv,returnString," - P");
+               gensprintf(buffer,"%d",theInfo->patternEnd);
+               returnString = AppendStrings(theEnv,returnString,buffer);
+               returnString = AppendStrings(theEnv,returnString,")");
+              }
+           }
+        }
+
+      if (positionsToPrint > 0)
+        { returnString = AppendStrings(theEnv,returnString," , "); }
+     }
+
+   return returnString;
+  }
+
+/********************/
+/* ListBetaMatches: */
+/********************/
+static long long ListBetaMatches(
+  Environment *theEnv,
+  struct joinInformation *infoArray,
+  long joinIndex,
+  unsigned short arraySize,
+  int output)
+  {
+   long betaCount = 0;
+   struct joinInformation *theInfo;
+   unsigned long count;
+
+   if (GetHaltExecution(theEnv) == true)
+     { return(betaCount); }
+
+   theInfo = &infoArray[joinIndex];
+
+   if (output == VERBOSE)
+     {
+      WriteString(theEnv,STDOUT,"Partial matches for CEs ");
+      WriteString(theEnv,STDOUT,
+                     BetaHeaderString(theEnv,infoArray,joinIndex,arraySize));
+      WriteString(theEnv,STDOUT,"\n");
+     }
+
+   count = PrintBetaMemory(theEnv,STDOUT,theInfo->theMemory,true,"",output);
+
+   betaCount += count;
+
+   if ((output == VERBOSE) && (count == 0))
+     { WriteString(theEnv,STDOUT," None\n"); }
+   else if (output == SUCCINCT)
+     {
+      WriteString(theEnv,STDOUT,"CEs ");
+      WriteString(theEnv,STDOUT,
+                     BetaHeaderString(theEnv,infoArray,joinIndex,arraySize));
+      WriteString(theEnv,STDOUT,": ");
+      WriteInteger(theEnv,STDOUT,betaCount);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+
+   return betaCount;
+  }
+
+/******************/
+/* CountPatterns: */
+/******************/
+static int CountPatterns(
+  Environment *theEnv,
+  struct joinNode *theJoin,
+  bool followRight)
+  {
+   int theCount = 0;
+
+   if (theJoin == NULL) return theCount;
+
+   if (theJoin->joinFromTheRight && (followRight == false))
+     { theCount++; }
+
+   while (theJoin != NULL)
+     {
+      if (theJoin->joinFromTheRight)
+        {
+         if (followRight)
+           { theJoin = (struct joinNode *) theJoin->rightSideEntryStructure; }
+         else
+           { theJoin = theJoin->lastLevel; }
+        }
+      else
+        {
+         theCount++;
+         theJoin = theJoin->lastLevel;
+        }
+
+      followRight = true;
+     }
+
+   return theCount;
+  }
+
+/*******************************************/
+/* JoinActivityCommand: H/L access routine */
+/*   for the join-activity command.        */
+/*******************************************/
+void JoinActivityCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *ruleName, *argument;
+   Defrule *rulePtr;
+   UDFValue theArg;
+   int output;
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return; }
+
+   ruleName = theArg.lexemeValue->contents;
+
+   rulePtr = FindDefrule(theEnv,ruleName);
+   if (rulePtr == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defrule",ruleName,true);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+        { return; }
+
+      argument = theArg.lexemeValue->contents;
+      if (strcmp(argument,"verbose") == 0)
+        { output = VERBOSE; }
+      else if (strcmp(argument,"succinct") == 0)
+        { output = SUCCINCT; }
+      else if (strcmp(argument,"terse") == 0)
+        { output = TERSE; }
+      else
+        {
+         UDFInvalidArgumentMessage(context,"symbol with value verbose, succinct, or terse");
+         returnValue->lexemeValue = FalseSymbol(theEnv);
+         return;
+        }
+     }
+   else
+     { output = VERBOSE; }
+
+   JoinActivity(theEnv,rulePtr,output,returnValue);
+  }
+
+/************************************/
+/* JoinActivity: C access routine   */
+/*   for the join-activity command. */
+/************************************/
+void JoinActivity(
+  Environment *theEnv,
+  Defrule *theRule,
+  int output,
+  UDFValue *returnValue)
+  {
+   Defrule *rulePtr;
+   long disjunctCount, disjunctIndex, joinIndex;
+   unsigned short arraySize;
+   struct joinInformation *theInfo;
+
+   /*==========================*/
+   /* Set up the return value. */
+   /*==========================*/
+
+   returnValue->begin = 0;
+   returnValue->range = 3;
+   returnValue->value = CreateMultifield(theEnv,3L);
+
+   returnValue->multifieldValue->contents[0].integerValue = SymbolData(theEnv)->Zero;
+   returnValue->multifieldValue->contents[1].integerValue = SymbolData(theEnv)->Zero;
+   returnValue->multifieldValue->contents[2].integerValue = SymbolData(theEnv)->Zero;
+
+   /*=================================================*/
+   /* Loop through each of the disjuncts for the rule */
+   /*=================================================*/
+
+   disjunctCount = GetDisjunctCount(theEnv,theRule);
+
+   for (disjunctIndex = 1; disjunctIndex <= disjunctCount; disjunctIndex++)
+     {
+      rulePtr = GetNthDisjunct(theEnv,theRule,disjunctIndex);
+
+      /*==============================================*/
+      /* Create the array containing the list of beta */
+      /* join nodes (joins from the right plus joins  */
+      /* connected to a pattern CE).                  */
+      /*==============================================*/
+
+      arraySize = BetaJoinCount(theEnv,rulePtr);
+
+      theInfo = CreateJoinArray(theEnv,arraySize);
+
+      BetaJoins(theEnv,rulePtr,arraySize,theInfo);
+
+      /*======================================*/
+      /* List the beta matches (for all joins */
+      /* except the first pattern CE).        */
+      /*======================================*/
+
+      for (joinIndex = 0; joinIndex < arraySize; joinIndex++)
+        { ListBetaJoinActivity(theEnv,theInfo,joinIndex,arraySize,output,returnValue); }
+
+      /*================================*/
+      /* Free the array of alpha joins. */
+      /*================================*/
+
+      FreeJoinArray(theEnv,theInfo,arraySize);
+     }
+  }
+
+/************************/
+/* ActivityHeaderString */
+/************************/
+static const char *ActivityHeaderString(
+  Environment *theEnv,
+  struct joinInformation *infoArray,
+  long joinIndex,
+  long arraySize)
+  {
+   struct joinNode *theJoin;
+   struct joinInformation *theInfo;
+   long i;
+   bool nestedCEs = false;
+   const char *returnString = "";
+   long lastIndex;
+   char buffer[32];
+
+   /*=============================================*/
+   /* Determine which joins need to be traversed. */
+   /*=============================================*/
+
+   for (i = 0; i < arraySize; i++)
+     { infoArray[i].marked = false; }
+
+   theInfo = &infoArray[joinIndex];
+   theJoin = theInfo->theJoin;
+   lastIndex = joinIndex;
+
+   while (theJoin != NULL)
+     {
+      for (i = lastIndex; i >= 0; i--)
+        {
+         if (infoArray[i].theJoin == theJoin)
+           {
+            if (infoArray[i].patternBegin != infoArray[i].patternEnd)
+              { nestedCEs = true; }
+            lastIndex = i - 1;
+            break;
+           }
+        }
+      theJoin = theJoin->lastLevel;
+     }
+
+   gensprintf(buffer,"%d",theInfo->whichCE);
+   returnString = AppendStrings(theEnv,returnString,buffer);
+   if (nestedCEs == false)
+     { return returnString; }
+
+   if (theInfo->patternBegin == theInfo->patternEnd)
+     {
+      returnString = AppendStrings(theEnv,returnString," (P");
+      gensprintf(buffer,"%d",theInfo->patternBegin);
+      returnString = AppendStrings(theEnv,returnString,buffer);
+
+      returnString = AppendStrings(theEnv,returnString,")");
+     }
+   else
+     {
+      returnString = AppendStrings(theEnv,returnString," (P");
+
+      gensprintf(buffer,"%d",theInfo->patternBegin);
+      returnString = AppendStrings(theEnv,returnString,buffer);
+
+      returnString = AppendStrings(theEnv,returnString," - P");
+
+      gensprintf(buffer,"%d",theInfo->patternEnd);
+      returnString = AppendStrings(theEnv,returnString,buffer);
+
+      returnString = AppendStrings(theEnv,returnString,")");
+     }
+
+   return returnString;
+  }
+
+/*************************/
+/* ListBetaJoinActivity: */
+/*************************/
+static void ListBetaJoinActivity(
+  Environment *theEnv,
+  struct joinInformation *infoArray,
+  long joinIndex,
+  long arraySize,
+  int output,
+  UDFValue *returnValue)
+  {
+   long long activity = 0;
+   long long compares, adds, deletes;
+   struct joinNode *theJoin, *nextJoin;
+   struct joinInformation *theInfo;
+
+   if (GetHaltExecution(theEnv) == true)
+     { return; }
+
+   theInfo = &infoArray[joinIndex];
+
+   theJoin = theInfo->theJoin;
+   nextJoin = theInfo->nextJoin;
+
+   compares = theJoin->memoryCompares;
+   if (theInfo->nextJoin->joinFromTheRight)
+     {
+      adds = nextJoin->memoryRightAdds;
+      deletes = nextJoin->memoryRightDeletes;
+     }
+   else
+     {
+      adds = nextJoin->memoryLeftAdds;
+      deletes = nextJoin->memoryLeftDeletes;
+     }
+
+   activity = compares + adds + deletes;
+
+   if (output == VERBOSE)
+     {
+      char buffer[100];
+
+      WriteString(theEnv,STDOUT,"Activity for CE ");
+      WriteString(theEnv,STDOUT,
+                     ActivityHeaderString(theEnv,infoArray,joinIndex,arraySize));
+      WriteString(theEnv,STDOUT,"\n");
+
+      sprintf(buffer,"   Compares: %10lld\n",compares);
+      WriteString(theEnv,STDOUT,buffer);
+      sprintf(buffer,"   Adds:     %10lld\n",adds);
+      WriteString(theEnv,STDOUT,buffer);
+      sprintf(buffer,"   Deletes:  %10lld\n",deletes);
+      WriteString(theEnv,STDOUT,buffer);
+     }
+   else if (output == SUCCINCT)
+     {
+      WriteString(theEnv,STDOUT,"CE ");
+      WriteString(theEnv,STDOUT,
+                     ActivityHeaderString(theEnv,infoArray,joinIndex,arraySize));
+      WriteString(theEnv,STDOUT,": ");
+      WriteInteger(theEnv,STDOUT,activity);
+      WriteString(theEnv,STDOUT,"\n");
+     }
+
+   compares += returnValue->multifieldValue->contents[0].integerValue->contents;
+   adds += returnValue->multifieldValue->contents[1].integerValue->contents;
+   deletes += returnValue->multifieldValue->contents[2].integerValue->contents;
+
+   returnValue->multifieldValue->contents[0].integerValue = CreateInteger(theEnv,compares);
+   returnValue->multifieldValue->contents[1].integerValue = CreateInteger(theEnv,adds);
+   returnValue->multifieldValue->contents[2].integerValue = CreateInteger(theEnv,deletes);
+  }
+
+/*********************************************/
+/* JoinActivityReset: Sets the join activity */
+/*   counts for each rule back to 0.         */
+/*********************************************/
+static void JoinActivityReset(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Defrule *theDefrule = (Defrule *) theConstruct;
+   struct joinNode *theJoin = theDefrule->lastJoin;
+
+   while (theJoin != NULL)
+     {
+      theJoin->memoryCompares = 0;
+      theJoin->memoryLeftAdds = 0;
+      theJoin->memoryRightAdds = 0;
+      theJoin->memoryLeftDeletes = 0;
+      theJoin->memoryRightDeletes = 0;
+
+      if (theJoin->joinFromTheRight)
+        { theJoin = (struct joinNode *) theJoin->rightSideEntryStructure; }
+      else
+        { theJoin = theJoin->lastLevel; }
+     }
+  }
+
+/************************************************/
+/* JoinActivityResetCommand: H/L access routine */
+/*   for the reset-join-activity command.       */
+/************************************************/
+void JoinActivityResetCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   DoForAllConstructs(theEnv,
+                      JoinActivityReset,
+                      DefruleData(theEnv)->DefruleModuleIndex,true,NULL);
+  }
+
+/***************************************/
+/* TimetagFunction: H/L access routine */
+/*   for the timetag function.         */
+/***************************************/
+void TimetagFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   void *ptr;
+
+   ptr = GetFactOrInstanceArgument(context,1,&theArg);
+
+   if (ptr == NULL)
+     {
+      returnValue->integerValue = CreateInteger(theEnv,-1LL);
+      return;
+     }
+
+   returnValue->integerValue = CreateInteger(theEnv,(long long) ((struct patternEntity *) ptr)->timeTag);
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#if DEVELOPER
+/***********************************************/
+/* RuleComplexityCommand: H/L access routine   */
+/*   for the rule-complexity function.         */
+/***********************************************/
+void RuleComplexityCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *ruleName;
+   Defrule *rulePtr;
+
+   ruleName = GetConstructName(context,"rule-complexity","rule name");
+   if (ruleName == NULL)
+     {
+      returnValue->integerValue = CreateInteger(theEnv,-1);
+      return;
+     }
+
+   rulePtr = FindDefrule(theEnv,ruleName);
+   if (rulePtr == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defrule",ruleName,true);
+      returnValue->integerValue = CreateInteger(theEnv,-1);
+      return;
+     }
+
+   returnValue->integerValue = CreateInteger(theEnv,rulePtr->complexity);
+  }
+
+/******************************************/
+/* ShowJoinsCommand: H/L access routine   */
+/*   for the show-joins command.          */
+/******************************************/
+void ShowJoinsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *ruleName;
+   Defrule *rulePtr;
+
+   ruleName = GetConstructName(context,"show-joins","rule name");
+   if (ruleName == NULL) return;
+
+   rulePtr = FindDefrule(theEnv,ruleName);
+   if (rulePtr == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"defrule",ruleName,true);
+      return;
+     }
+
+   ShowJoins(theEnv,rulePtr);
+
+   return;
+  }
+
+/*********************************/
+/* ShowJoins: C access routine   */
+/*   for the show-joins command. */
+/*********************************/
+static void ShowJoins(
+  Environment *theEnv,
+  Defrule *theRule)
+  {
+   Defrule *rulePtr;
+   struct joinNode *theJoin;
+   struct joinNode *joinList[MAXIMUM_NUMBER_OF_PATTERNS];
+   int numberOfJoins;
+   char rhsType;
+   unsigned int disjunct = 0;
+   unsigned long count = 0;
+
+   rulePtr = theRule;
+
+   if ((rulePtr != NULL) && (rulePtr->disjunct != NULL))
+     { disjunct = 1; }
+
+   /*=================================================*/
+   /* Loop through each of the disjuncts for the rule */
+   /*=================================================*/
+
+   while (rulePtr != NULL)
+     {
+      if (disjunct > 0)
+        {
+         WriteString(theEnv,STDOUT,"Disjunct #");
+         PrintUnsignedInteger(theEnv,STDOUT,disjunct++);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+
+      /*=====================================*/
+      /* Determine the number of join nodes. */
+      /*=====================================*/
+
+      numberOfJoins = -1;
+      theJoin = rulePtr->lastJoin;
+      while (theJoin != NULL)
+        {
+         if (theJoin->joinFromTheRight)
+           {
+            numberOfJoins++;
+            joinList[numberOfJoins] = theJoin;
+            theJoin = (struct joinNode *) theJoin->rightSideEntryStructure;
+           }
+         else
+           {
+            numberOfJoins++;
+            joinList[numberOfJoins] = theJoin;
+            theJoin = theJoin->lastLevel;
+           }
+        }
+
+      /*====================*/
+      /* Display the joins. */
+      /*====================*/
+
+      while (numberOfJoins >= 0)
+        {
+         char buffer[20];
+
+         if (joinList[numberOfJoins]->patternIsNegated)
+           { rhsType = 'n'; }
+         else if (joinList[numberOfJoins]->patternIsExists)
+           { rhsType = 'x'; }
+         else
+           { rhsType = ' '; }
+
+         gensprintf(buffer,"%2hu%c%c%c%c : ",joinList[numberOfJoins]->depth,
+                                     (joinList[numberOfJoins]->firstJoin) ? 'f' : ' ',
+                                     rhsType,
+                                     (joinList[numberOfJoins]->joinFromTheRight) ? 'j' : ' ',
+                                     (joinList[numberOfJoins]->logicalJoin) ? 'l' : ' ');
+         WriteString(theEnv,STDOUT,buffer);
+         PrintExpression(theEnv,STDOUT,joinList[numberOfJoins]->networkTest);
+         WriteString(theEnv,STDOUT,"\n");
+
+         if (joinList[numberOfJoins]->ruleToActivate != NULL)
+           {
+            WriteString(theEnv,STDOUT,"    RA : ");
+            WriteString(theEnv,STDOUT,DefruleName(joinList[numberOfJoins]->ruleToActivate));
+            WriteString(theEnv,STDOUT,"\n");
+           }
+
+         if (joinList[numberOfJoins]->secondaryNetworkTest != NULL)
+           {
+            WriteString(theEnv,STDOUT,"    SNT : ");
+            PrintExpression(theEnv,STDOUT,joinList[numberOfJoins]->secondaryNetworkTest);
+            WriteString(theEnv,STDOUT,"\n");
+           }
+
+         if (joinList[numberOfJoins]->leftHash != NULL)
+           {
+            WriteString(theEnv,STDOUT,"    LH : ");
+            PrintExpression(theEnv,STDOUT,joinList[numberOfJoins]->leftHash);
+            WriteString(theEnv,STDOUT,"\n");
+           }
+
+         if (joinList[numberOfJoins]->rightHash != NULL)
+           {
+            WriteString(theEnv,STDOUT,"    RH : ");
+            PrintExpression(theEnv,STDOUT,joinList[numberOfJoins]->rightHash);
+            WriteString(theEnv,STDOUT,"\n");
+           }
+
+         if (! joinList[numberOfJoins]->firstJoin)
+           {
+            WriteString(theEnv,STDOUT,"    LM : ");
+            count = PrintBetaMemory(theEnv,STDOUT,joinList[numberOfJoins]->leftMemory,false,"",SUCCINCT);
+            if (count == 0)
+              { WriteString(theEnv,STDOUT,"None\n"); }
+            else
+              {
+               sprintf(buffer,"%lu\n",count);
+               WriteString(theEnv,STDOUT,buffer);
+              }
+           }
+
+         if (joinList[numberOfJoins]->joinFromTheRight)
+           {
+            WriteString(theEnv,STDOUT,"    RM : ");
+            count = PrintBetaMemory(theEnv,STDOUT,joinList[numberOfJoins]->rightMemory,false,"",SUCCINCT);
+            if (count == 0)
+              { WriteString(theEnv,STDOUT,"None\n"); }
+            else
+              {
+               sprintf(buffer,"%lu\n",count);
+               WriteString(theEnv,STDOUT,buffer);
+              }
+           }
+
+         numberOfJoins--;
+        };
+
+      /*===============================*/
+      /* Proceed to the next disjunct. */
+      /*===============================*/
+
+      rulePtr = rulePtr->disjunct;
+      if (rulePtr != NULL) WriteString(theEnv,STDOUT,"\n");
+     }
+  }
+
+/******************************************************/
+/* ShowAlphaHashTable: Displays the number of entries */
+/*   in each slot of the alpha hash table.            */
+/******************************************************/
+void ShowAlphaHashTable(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+   {
+    int i, count;
+    long totalCount = 0;
+    struct alphaMemoryHash *theEntry;
+    struct partialMatch *theMatch;
+    char buffer[40];
+
+    for (i = 0; i < ALPHA_MEMORY_HASH_SIZE; i++)
+      {
+       for (theEntry =  DefruleData(theEnv)->AlphaMemoryTable[i], count = 0;
+            theEntry != NULL;
+            theEntry = theEntry->next)
+         { count++; }
+
+       if (count != 0)
+         {
+          totalCount += count;
+          gensprintf(buffer,"%4d: %4d ->",i,count);
+          WriteString(theEnv,STDOUT,buffer);
+
+          for (theEntry =  DefruleData(theEnv)->AlphaMemoryTable[i], count = 0;
+               theEntry != NULL;
+               theEntry = theEntry->next)
+            {
+             for (theMatch = theEntry->alphaMemory;
+                  theMatch != NULL;
+                  theMatch = theMatch->nextInMemory)
+               { count++; }
+
+             gensprintf(buffer," %4d",count);
+             WriteString(theEnv,STDOUT,buffer);
+             if (theEntry->owner->rightHash == NULL)
+               { WriteString(theEnv,STDOUT,"*"); }
+            }
+
+          WriteString(theEnv,STDOUT,"\n");
+         }
+      }
+    gensprintf(buffer,"Total Count: %ld\n",totalCount);
+    WriteString(theEnv,STDOUT,buffer);
+   }
+
+#endif /* DEVELOPER */
+
+#endif /* DEFRULE_CONSTRUCT */
diff --git a/clips/rulecom.h b/clips/rulecom.h
new file mode 100755
index 000000000..ad328ed9e
--- /dev/null
+++ b/clips/rulecom.h
@@ -0,0 +1,116 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*             DEFRULE COMMANDS HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides the matches command. Also provides the  */
+/*   the developer commands show-joins and rule-complexity.  */
+/*   Also provides the initialization routine which          */
+/*   registers rule commands found in other modules.         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed CONFLICT_RESOLUTION_STRATEGIES         */
+/*            INCREMENTAL_RESET, and LOGICAL_DEPENDENCIES    */
+/*            compilation flags.                             */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Improvements to matches command.               */
+/*                                                           */
+/*            Add join-activity and join-activity-reset      */
+/*            commands.                                      */
+/*                                                           */
+/*            Added get-beta-memory-resizing and             */
+/*            set-beta-memory-resizing functions.            */
+/*                                                           */
+/*            Added timetag function.                        */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_rulecom
+
+#pragma once
+
+#define _H_rulecom
+
+#include "evaluatn.h"
+
+struct joinInformation
+  {
+   unsigned short whichCE;
+   struct joinNode *theJoin;
+   int patternBegin;
+   int patternEnd;
+   int marked;
+   struct betaMemory *theMemory;
+   struct joinNode *nextJoin;
+  };
+
+typedef enum
+  {
+   VERBOSE,
+   SUCCINCT,
+   TERSE
+  } Verbosity;
+
+   bool                           GetBetaMemoryResizing(Environment *);
+   bool                           SetBetaMemoryResizing(Environment *,bool);
+   void                           GetBetaMemoryResizingCommand(Environment *,UDFContext *,UDFValue *);
+   void                           SetBetaMemoryResizingCommand(Environment *,UDFContext *,UDFValue *);
+   void                           Matches(Defrule *,Verbosity,CLIPSValue *);
+   void                           JoinActivity(Environment *,Defrule *,int,UDFValue *);
+   void                           DefruleCommands(Environment *);
+   void                           MatchesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           JoinActivityCommand(Environment *,UDFContext *,UDFValue *);
+   void                           TimetagFunction(Environment *,UDFContext *,UDFValue *);
+   unsigned short                 AlphaJoinCount(Environment *,Defrule *);
+   unsigned short                 BetaJoinCount(Environment *,Defrule *);
+   struct joinInformation        *CreateJoinArray(Environment *,unsigned short);
+   void                           FreeJoinArray(Environment *,struct joinInformation *,unsigned short);
+   void                           AlphaJoins(Environment *,Defrule *,unsigned short,struct joinInformation *);
+   void                           BetaJoins(Environment *,Defrule *,unsigned short,struct joinInformation *);
+   void                           JoinActivityResetCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetFocusFunction(Environment *,UDFContext *,UDFValue *);
+   Defmodule                     *GetFocus(Environment *);
+#if DEVELOPER
+   void                           ShowJoinsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           RuleComplexityCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ShowAlphaHashTable(Environment *,UDFContext *,UDFValue *);
+#endif
+
+#endif /* _H_rulecom */
diff --git a/clips/rulecstr.c b/clips/rulecstr.c
new file mode 100755
index 000000000..31bd23963
--- /dev/null
+++ b/clips/rulecstr.c
@@ -0,0 +1,877 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*              RULE CONSTRAINTS MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for detecting constraint       */
+/*   conflicts in the LHS and RHS of rules.                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Static constraint checking is always enabled.  */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if (! RUN_TIME) && (! BLOAD_ONLY) && DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+
+#include "analysis.h"
+#include "cstrnchk.h"
+#include "cstrnops.h"
+#include "cstrnutl.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "prcdrpsr.h"
+#include "prntutil.h"
+#include "reorder.h"
+#include "router.h"
+#include "rulepsr.h"
+
+#include "rulecstr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    CheckForUnmatchableConstraints(Environment *,struct lhsParseNode *,unsigned short);
+   static bool                    MultifieldCardinalityViolation(Environment *,struct lhsParseNode *);
+   static struct lhsParseNode    *UnionVariableConstraints(Environment *,struct lhsParseNode *,
+                                                           struct lhsParseNode *);
+   static struct lhsParseNode    *AddToVariableConstraints(Environment *,struct lhsParseNode *,
+                                                           struct lhsParseNode *);
+   static void                    ConstraintConflictMessage(Environment *,CLIPSLexeme *,
+                                                            unsigned short,unsigned short,CLIPSLexeme *);
+   static bool                    CheckArgumentForConstraintError(Environment *,struct expr *,struct expr*,
+                                                                  unsigned int,struct functionDefinition *,
+                                                                  struct lhsParseNode *);
+
+/***********************************************************/
+/* CheckForUnmatchableConstraints: Determines if a LHS CE  */
+/*   node contains unmatchable constraints. Return true if */
+/*   there are unmatchable constraints, otherwise false.   */
+/***********************************************************/
+static bool CheckForUnmatchableConstraints(
+  Environment *theEnv,
+  struct lhsParseNode *theNode,
+  unsigned short whichCE)
+  {
+   if (UnmatchableConstraint(theNode->constraints))
+     {
+      ConstraintConflictMessage(theEnv,theNode->lexemeValue,whichCE,
+                                theNode->index,theNode->slot);
+      return true;
+     }
+
+   return false;
+  }
+
+/******************************************************/
+/* ConstraintConflictMessage: Error message used when */
+/*   a constraint restriction for a slot prevents any */
+/*   value from matching the pattern constraint.      */
+/******************************************************/
+static void ConstraintConflictMessage(
+  Environment *theEnv,
+  CLIPSLexeme *variableName,
+  unsigned short thePattern,
+  unsigned short theField,
+  CLIPSLexeme *theSlot)
+  {
+   /*=========================*/
+   /* Print the error header. */
+   /*=========================*/
+
+   PrintErrorID(theEnv,"RULECSTR",1,true);
+
+   /*======================================================*/
+   /* Print the variable name (if available) and CE number */
+   /* for which the constraint violation occurred.         */
+   /*======================================================*/
+
+   if (variableName != NULL)
+     {
+      WriteString(theEnv,STDERR,"Variable ?");
+      WriteString(theEnv,STDERR,variableName->contents);
+      WriteString(theEnv,STDERR," in CE #");
+      WriteInteger(theEnv,STDERR,thePattern);
+     }
+   else
+     {
+      WriteString(theEnv,STDERR,"Pattern #");
+      WriteInteger(theEnv,STDERR,thePattern);
+     }
+
+   /*=======================================*/
+   /* Print the slot name or field position */
+   /* in which the violation occurred.      */
+   /*=======================================*/
+
+   if (theSlot == NULL)
+     {
+      WriteString(theEnv,STDERR," field #");
+      WriteInteger(theEnv,STDERR,theField);
+     }
+   else
+     {
+      WriteString(theEnv,STDERR," slot '");
+      WriteString(theEnv,STDERR,theSlot->contents);
+      WriteString(theEnv,STDERR,"'");
+     }
+
+   /*======================================*/
+   /* Print the rest of the error message. */
+   /*======================================*/
+
+   WriteString(theEnv,STDERR," has constraint conflicts which make the pattern unmatchable.\n");
+  }
+
+/***************************************************************/
+/* MultifieldCardinalityViolation: Determines if a cardinality */
+/*   violation has occurred for a LHS CE node.                 */
+/***************************************************************/
+static bool MultifieldCardinalityViolation(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   struct lhsParseNode *tmpNode;
+   struct expr *tmpMax;
+   long long minFields = 0;
+   long long maxFields = 0;
+   bool posInfinity = false;
+   CONSTRAINT_RECORD *newConstraint, *tempConstraint;
+
+   /*================================*/
+   /* A single field slot can't have */
+   /* a cardinality violation.       */
+   /*================================*/
+
+   if (theNode->multifieldSlot == false) return false;
+
+   /*=============================================*/
+   /* Determine the minimum and maximum number of */
+   /* fields the slot could contain based on the  */
+   /* slot constraints found in the pattern.      */
+   /*=============================================*/
+
+   for (tmpNode = theNode->bottom;
+        tmpNode != NULL;
+        tmpNode = tmpNode->right)
+     {
+      /*====================================================*/
+      /* A single field variable increases both the minimum */
+      /* and maximum number of fields by one.               */
+      /*====================================================*/
+
+      if ((tmpNode->pnType == SF_VARIABLE_NODE) ||
+          (tmpNode->pnType == SF_WILDCARD_NODE))
+        {
+         minFields++;
+         maxFields++;
+        }
+
+      /*=================================================*/
+      /* Otherwise a multifield wildcard or variable has */
+      /* been encountered. If it is constrained then use */
+      /* minimum and maximum number of fields constraint */
+      /* associated with this LHS node.                  */
+      /*=================================================*/
+
+      else if (tmpNode->constraints != NULL)
+        {
+         /*=======================================*/
+         /* The lowest minimum of all the min/max */
+         /* pairs will be the first in the list.  */
+         /*=======================================*/
+
+         if (tmpNode->constraints->minFields->value != SymbolData(theEnv)->NegativeInfinity)
+           { minFields += tmpNode->constraints->minFields->integerValue->contents; }
+
+         /*=========================================*/
+         /* The greatest maximum of all the min/max */
+         /* pairs will be the last in the list.     */
+         /*=========================================*/
+
+         tmpMax = tmpNode->constraints->maxFields;
+         while (tmpMax->nextArg != NULL) tmpMax = tmpMax->nextArg;
+         if (tmpMax->value == SymbolData(theEnv)->PositiveInfinity)
+           { posInfinity = true; }
+         else
+           { maxFields += tmpMax->integerValue->contents; }
+        }
+
+      /*================================================*/
+      /* Otherwise an unconstrained multifield wildcard */
+      /* or variable increases the maximum number of    */
+      /* fields to positive infinity.                   */
+      /*================================================*/
+
+      else
+        { posInfinity = true; }
+     }
+
+   /*==================================================================*/
+   /* Create a constraint record for the cardinality of the sum of the */
+   /* cardinalities of the restrictions inside the multifield slot.    */
+   /*==================================================================*/
+
+   if (theNode->constraints == NULL) tempConstraint = GetConstraintRecord(theEnv);
+   else tempConstraint = CopyConstraintRecord(theEnv,theNode->constraints);
+   ReturnExpression(theEnv,tempConstraint->minFields);
+   ReturnExpression(theEnv,tempConstraint->maxFields);
+   tempConstraint->minFields = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,minFields));
+   if (posInfinity) tempConstraint->maxFields = GenConstant(theEnv,SYMBOL_TYPE,SymbolData(theEnv)->PositiveInfinity);
+   else tempConstraint->maxFields = GenConstant(theEnv,INTEGER_TYPE,CreateInteger(theEnv,maxFields));
+
+   /*================================================================*/
+   /* Determine the final cardinality for the multifield slot by     */
+   /* intersecting the cardinality sum of the restrictions within    */
+   /* the multifield slot with the original cardinality of the slot. */
+   /*================================================================*/
+
+   newConstraint = IntersectConstraints(theEnv,theNode->constraints,tempConstraint);
+   if (theNode->derivedConstraints) RemoveConstraint(theEnv,theNode->constraints);
+   RemoveConstraint(theEnv,tempConstraint);
+   theNode->constraints = newConstraint;
+   theNode->derivedConstraints = true;
+
+   /*===================================================================*/
+   /* Determine if the final cardinality for the slot can be satisfied. */
+   /*===================================================================*/
+
+   if (UnmatchableConstraint(newConstraint)) return true;
+
+   return false;
+  }
+
+/***************************************************/
+/* ProcessConnectedConstraints: Examines a single  */
+/*   connected constraint searching for constraint */
+/*   violations.                                   */
+/***************************************************/
+bool ProcessConnectedConstraints(
+  Environment *theEnv,
+  struct lhsParseNode *theNode,
+  struct lhsParseNode *multifieldHeader,
+  struct lhsParseNode *patternHead)
+  {
+   struct constraintRecord *orConstraints = NULL, *andConstraints;
+   struct constraintRecord *tmpConstraints, *rvConstraints;
+   struct lhsParseNode *orNode, *andNode;
+   struct expr *tmpExpr;
+
+   /*============================================*/
+   /* Loop through all of the or (|) constraints */
+   /* found in the connected constraint.         */
+   /*============================================*/
+
+   for (orNode = theNode->bottom; orNode != NULL; orNode = orNode->bottom)
+     {
+      /*=================================================*/
+      /* Intersect all of the &'ed constraints together. */
+      /*=================================================*/
+
+      andConstraints = NULL;
+      for (andNode = orNode; andNode != NULL; andNode = andNode->right)
+        {
+         if (! andNode->negated)
+           {
+            if (andNode->pnType == RETURN_VALUE_CONSTRAINT_NODE)
+              {
+               if (andNode->expression->pnType == FCALL_NODE)
+                 {
+                  rvConstraints = FunctionCallToConstraintRecord(theEnv,andNode->expression->value);
+                  tmpConstraints = andConstraints;
+                  andConstraints = IntersectConstraints(theEnv,andConstraints,rvConstraints);
+                  RemoveConstraint(theEnv,tmpConstraints);
+                  RemoveConstraint(theEnv,rvConstraints);
+                 }
+              }
+            else if (ConstantNode(andNode))
+              {
+               tmpExpr = GenConstant(theEnv,NodeTypeToType(andNode),andNode->value);
+               rvConstraints = ExpressionToConstraintRecord(theEnv,tmpExpr);
+               tmpConstraints = andConstraints;
+               andConstraints = IntersectConstraints(theEnv,andConstraints,rvConstraints);
+               RemoveConstraint(theEnv,tmpConstraints);
+               RemoveConstraint(theEnv,rvConstraints);
+               ReturnExpression(theEnv,tmpExpr);
+              }
+            else if (andNode->constraints != NULL)
+              {
+               tmpConstraints = andConstraints;
+               andConstraints = IntersectConstraints(theEnv,andConstraints,andNode->constraints);
+               RemoveConstraint(theEnv,tmpConstraints);
+              }
+           }
+        }
+
+      /*===========================================================*/
+      /* Intersect the &'ed constraints with the slot constraints. */
+      /*===========================================================*/
+
+      tmpConstraints = andConstraints;
+      andConstraints = IntersectConstraints(theEnv,andConstraints,theNode->constraints);
+      RemoveConstraint(theEnv,tmpConstraints);
+
+      /*===============================================================*/
+      /* Remove any negated constants from the list of allowed values. */
+      /*===============================================================*/
+
+      for (andNode = orNode; andNode != NULL; andNode = andNode->right)
+        {
+         if ((andNode->negated) && ConstantNode(andNode))
+           { RemoveConstantFromConstraint(theEnv,NodeTypeToType(andNode),andNode->value,andConstraints); }
+        }
+
+      /*=======================================================*/
+      /* Union the &'ed constraints with the |'ed constraints. */
+      /*=======================================================*/
+
+      tmpConstraints = orConstraints;
+      orConstraints = UnionConstraints(theEnv,orConstraints,andConstraints);
+      RemoveConstraint(theEnv,tmpConstraints);
+      RemoveConstraint(theEnv,andConstraints);
+     }
+
+   /*===============================================*/
+   /* Replace the constraints for the slot with the */
+   /* constraints derived from the connected        */
+   /* constraints (which should be a subset.        */
+   /*===============================================*/
+
+   if (orConstraints != NULL)
+     {
+      if (theNode->derivedConstraints) RemoveConstraint(theEnv,theNode->constraints);
+      theNode->constraints = orConstraints;
+      theNode->derivedConstraints = true;
+     }
+
+   /*==================================*/
+   /* Check for constraint violations. */
+   /*==================================*/
+
+   if (CheckForUnmatchableConstraints(theEnv,theNode,patternHead->whichCE))
+     { return true; }
+
+   /*=========================================*/
+   /* If the constraints are for a multifield */
+   /* slot, check for cardinality violations. */
+   /*=========================================*/
+
+   if ((multifieldHeader != NULL) && (theNode->right == NULL))
+     {
+      if (MultifieldCardinalityViolation(theEnv,multifieldHeader))
+        {
+         ConstraintViolationErrorMessage(theEnv,"The group of restrictions",
+                                                  NULL,false,
+                                                  patternHead->whichCE,
+                                                  multifieldHeader->slot,
+                                                  multifieldHeader->index,
+                                                  CARDINALITY_VIOLATION,
+                                                  multifieldHeader->constraints,true);
+          return true;
+         }
+      }
+
+   /*=======================================*/
+   /* Return false indicating no constraint */
+   /* violations were detected.             */
+   /*=======================================*/
+
+   return false;
+  }
+
+/**************************************************/
+/* ConstraintReferenceErrorMessage: Generic error */
+/*   message for LHS constraint violation errors  */
+/*   that occur within an expression.             */
+/**************************************************/
+void ConstraintReferenceErrorMessage(
+  Environment *theEnv,
+  CLIPSLexeme *theVariable,
+  struct lhsParseNode *theExpression,
+  int whichArgument,
+  int whichCE,
+  CLIPSLexeme *slotName,
+  int theField)
+  {
+   struct expr *temprv;
+
+   PrintErrorID(theEnv,"RULECSTR",2,true);
+
+   /*==========================*/
+   /* Print the variable name. */
+   /*==========================*/
+
+   WriteString(theEnv,STDERR,"Previous variable bindings of ?");
+   WriteString(theEnv,STDERR,theVariable->contents);
+   WriteString(theEnv,STDERR," caused the type restrictions");
+
+   /*============================*/
+   /* Print the argument number. */
+   /*============================*/
+
+   WriteString(theEnv,STDERR,"\nfor argument #");
+   WriteInteger(theEnv,STDERR,whichArgument);
+
+   /*=======================*/
+   /* Print the expression. */
+   /*=======================*/
+
+   WriteString(theEnv,STDERR," of the expression ");
+   temprv = LHSParseNodesToExpression(theEnv,theExpression);
+   ReturnExpression(theEnv,temprv->nextArg);
+   temprv->nextArg = NULL;
+   PrintExpression(theEnv,STDERR,temprv);
+   WriteString(theEnv,STDERR,"\n");
+   ReturnExpression(theEnv,temprv);
+
+   /*========================================*/
+   /* Print out the index of the conditional */
+   /* element and the slot name or field     */
+   /* index where the violation occured.     */
+   /*========================================*/
+
+   WriteString(theEnv,STDERR,"found in CE #");
+   WriteInteger(theEnv,STDERR,theExpression->whichCE);
+   if (slotName == NULL)
+     {
+      if (theField > 0)
+        {
+         WriteString(theEnv,STDERR," field #");
+         WriteInteger(theEnv,STDERR,theField);
+        }
+     }
+   else
+     {
+      WriteString(theEnv,STDERR," slot '");
+      WriteString(theEnv,STDERR,slotName->contents);
+      WriteString(theEnv,STDERR,"'");
+     }
+
+   WriteString(theEnv,STDERR," to be violated.\n");
+  }
+
+/********************************************************/
+/* AddToVariableConstraints: Adds the constraints for a */
+/*   variable to a list of constraints. If the variable */
+/*   is already in the list, the constraints for the    */
+/*   variable are intersected with the new constraints. */
+/********************************************************/
+static struct lhsParseNode *AddToVariableConstraints(
+  Environment *theEnv,
+  struct lhsParseNode *oldList,
+  struct lhsParseNode *newItems)
+  {
+   CONSTRAINT_RECORD *newConstraints;
+   struct lhsParseNode *temp, *trace;
+
+   /*=================================================*/
+   /* Loop through each of the new constraints adding */
+   /* it to the list if it's not already present or   */
+   /* modifying the constraint if it is.              */
+   /*=================================================*/
+
+   while (newItems != NULL)
+     {
+      /*==========================================*/
+      /* Get the next item since the next pointer */
+      /* value (right) needs to be set to NULL.   */
+      /*==========================================*/
+
+      temp = newItems->right;
+      newItems->right = NULL;
+
+      /*===================================*/
+      /* Search the list for the variable. */
+      /*===================================*/
+
+      for (trace = oldList; trace != NULL; trace = trace->right)
+        {
+         /*=========================================*/
+         /* If the variable is already in the list, */
+         /* modify the constraint already there to  */
+         /* include the new constraint.             */
+         /*=========================================*/
+
+         if (trace->value == newItems->value)
+           {
+            newConstraints = IntersectConstraints(theEnv,trace->constraints,
+                                                  newItems->constraints);
+            RemoveConstraint(theEnv,trace->constraints);
+            trace->constraints = newConstraints;
+            ReturnLHSParseNodes(theEnv,newItems);
+            break;
+           }
+        }
+
+      /*=================================*/
+      /* Add the variable constraints to */
+      /* the list if it wasn't found.    */
+      /*=================================*/
+
+      if (trace == NULL)
+        {
+         newItems->right = oldList;
+         oldList = newItems;
+        }
+
+      /*===========================*/
+      /* Move on to the next item. */
+      /*===========================*/
+
+      newItems = temp;
+     }
+
+   return(oldList);
+  }
+
+/***********************************************************/
+/* UnionVariableConstraints: Unions two lists of variable  */
+/*   constraints. If a variable appears in one list  but   */
+/*   not the other, then the variable is unconstrained and */
+/*   thus not included in the unioned list.                */
+/***********************************************************/
+static struct lhsParseNode *UnionVariableConstraints(
+  Environment *theEnv,
+  struct lhsParseNode *list1,
+  struct lhsParseNode *list2)
+  {
+   struct lhsParseNode *list3 = NULL, *trace, *temp;
+
+   /*===================================*/
+   /* Loop through all of the variables */
+   /* in the first list.                */
+   /*===================================*/
+
+   while (list1 != NULL)
+     {
+      /*=============================================*/
+      /* Search for the variable in the second list. */
+      /*=============================================*/
+
+      for (trace = list2; trace != NULL; trace = trace->right)
+        {
+         /*============================================*/
+         /* If the variable is found in both lists,    */
+         /* union the constraints and add the variable */
+         /* to the new list being constructed.         */
+         /*============================================*/
+
+         if (list1->value == trace->value)
+           {
+            temp = GetLHSParseNode(theEnv);
+            temp->derivedConstraints = true;
+            temp->value = list1->value;
+            temp->constraints = UnionConstraints(theEnv,list1->constraints,trace->constraints);
+            temp->right = list3;
+            list3 = temp;
+            break;
+           }
+        }
+
+      /*==============================*/
+      /* Move on to the next variable */
+      /* in the first list.           */
+      /*==============================*/
+
+      temp = list1->right;
+      list1->right = NULL;
+      ReturnLHSParseNodes(theEnv,list1);
+      list1 = temp;
+     }
+
+   /*====================================*/
+   /* Free the items in the second list. */
+   /*====================================*/
+
+   ReturnLHSParseNodes(theEnv,list2);
+
+   /*======================*/
+   /* Return the new list. */
+   /*======================*/
+
+   return(list3);
+  }
+
+/*****************************************************************/
+/* GetExpressionVarConstraints: Given an expression stored using */
+/*   the LHS parse node data structures, determines and returns  */
+/*   the constraints on variables caused by that expression. For */
+/*   example, the expression (+ ?x 1) would imply a numeric type */
+/*   constraint for the variable ?x since the addition function  */
+/*   expects numeric arguments.                                  */
+/*****************************************************************/
+struct lhsParseNode *GetExpressionVarConstraints(
+  Environment *theEnv,
+  struct lhsParseNode *theExpression)
+  {
+   struct lhsParseNode *list1 = NULL, *list2;
+
+   for (; theExpression != NULL; theExpression = theExpression->bottom)
+     {
+      if (theExpression->right != NULL)
+        {
+         list2 = GetExpressionVarConstraints(theEnv,theExpression->right);
+         list1 = AddToVariableConstraints(theEnv,list2,list1);
+        }
+
+      if (theExpression->pnType == SF_VARIABLE_NODE)
+        {
+         list2 = GetLHSParseNode(theEnv);
+         if (theExpression->referringNode != NULL)
+           { list2->pnType = theExpression->referringNode->pnType; }
+         else
+           { list2->pnType = SF_VARIABLE_NODE; }
+         list2->value = theExpression->value;
+         list2->derivedConstraints = true;
+         list2->constraints = CopyConstraintRecord(theEnv,theExpression->constraints);
+         list1 = AddToVariableConstraints(theEnv,list2,list1);
+        }
+     }
+
+   return(list1);
+  }
+
+/***********************************************/
+/* DeriveVariableConstraints: Derives the list */
+/*   of variable constraints associated with a */
+/*   single connected constraint.              */
+/***********************************************/
+struct lhsParseNode *DeriveVariableConstraints(
+  Environment *theEnv,
+  struct lhsParseNode *theNode)
+  {
+   struct lhsParseNode *orNode, *andNode;
+   struct lhsParseNode *list1, *list2, *list3 = NULL;
+   bool first = true;
+
+   /*===============================*/
+   /* Process the constraints for a */
+   /* single connected constraint.  */
+   /*===============================*/
+
+   for (orNode = theNode->bottom; orNode != NULL; orNode = orNode->bottom)
+     {
+      /*=================================================*/
+      /* Intersect all of the &'ed constraints together. */
+      /*=================================================*/
+
+      list2 = NULL;
+      for (andNode = orNode; andNode != NULL; andNode = andNode->right)
+        {
+         if ((andNode->pnType == RETURN_VALUE_CONSTRAINT_NODE) ||
+             (andNode->pnType == PREDICATE_CONSTRAINT_NODE))
+           {
+            list1 = GetExpressionVarConstraints(theEnv,andNode->expression);
+            list2 = AddToVariableConstraints(theEnv,list2,list1);
+           }
+        }
+
+      if (first)
+        {
+         list3 = list2;
+         first = false;
+        }
+      else
+        { list3 = UnionVariableConstraints(theEnv,list3,list2); }
+     }
+
+   return(list3);
+  }
+
+/*******************************************/
+/* CheckRHSForConstraintErrors: Checks the */
+/*   RHS of a rule for constraint errors.  */
+/*******************************************/
+bool CheckRHSForConstraintErrors(
+  Environment *theEnv,
+  struct expr *expressionList,
+  struct lhsParseNode *theLHS)
+  {
+   struct functionDefinition *theFunction;
+   unsigned int i;
+   struct expr *lastOne = NULL, *checkList, *tmpPtr;
+
+   if (expressionList == NULL) return false;
+
+   for (checkList = expressionList;
+        checkList != NULL;
+        checkList = checkList->nextArg)
+      {
+       expressionList = checkList->argList;
+       i = 1;
+       if (checkList->type == FCALL)
+         {
+          lastOne = checkList;
+          theFunction = checkList->functionValue;
+         }
+       else
+         { theFunction = NULL; }
+
+       while (expressionList != NULL)
+         {
+          if (CheckArgumentForConstraintError(theEnv,expressionList,lastOne,i,
+                                              theFunction,theLHS))
+            { return true; }
+
+          i++;
+          tmpPtr = expressionList->nextArg;
+          expressionList->nextArg = NULL;
+          if (CheckRHSForConstraintErrors(theEnv,expressionList,theLHS))
+            {
+             expressionList->nextArg = tmpPtr;
+             return true;
+            }
+          expressionList->nextArg = tmpPtr;
+          expressionList = expressionList->nextArg;
+         }
+      }
+
+   return false;
+  }
+
+/*************************************************************/
+/* CheckArgumentForConstraintError: Checks a single argument */
+/*   found in the RHS of a rule for constraint errors.       */
+/*   Returns true if an error is detected, otherwise false.  */
+/*************************************************************/
+static bool CheckArgumentForConstraintError(
+  Environment *theEnv,
+  struct expr *expressionList,
+  struct expr *lastOne,
+  unsigned int i,
+  struct functionDefinition *theFunction,
+  struct lhsParseNode *theLHS)
+  {
+   unsigned theRestriction2;
+   CONSTRAINT_RECORD *constraint1, *constraint2, *constraint3, *constraint4;
+   struct lhsParseNode *theVariable;
+   struct expr *tmpPtr;
+   bool rv = false;
+
+   /*=============================================================*/
+   /* Skip anything that isn't a variable or isn't an argument to */
+   /* a user defined function (i.e. deffunctions and generic have */
+   /* no constraint information so they aren't checked).          */
+   /*=============================================================*/
+
+   if ((expressionList->type != SF_VARIABLE) || (theFunction == NULL))
+     { return (rv); }
+
+   /*===========================================*/
+   /* Get the restrictions for the argument and */
+   /* convert them to a constraint record.      */
+   /*===========================================*/
+
+   theRestriction2 = GetNthRestriction(theEnv,theFunction,i);
+   constraint1 = ArgumentTypeToConstraintRecord(theEnv,theRestriction2);
+
+   /*================================================*/
+   /* Look for the constraint record associated with */
+   /* binding the variable in the LHS of the rule.   */
+   /*================================================*/
+
+   theVariable = FindVariable(expressionList->lexemeValue,theLHS);
+   if (theVariable != NULL)
+     {
+      if (theVariable->pnType == MF_VARIABLE_NODE)
+        {
+         constraint2 = GetConstraintRecord(theEnv);
+         SetConstraintType(MULTIFIELD_TYPE,constraint2);
+        }
+      else if (theVariable->constraints == NULL)
+        { constraint2 = GetConstraintRecord(theEnv); }
+      else
+        { constraint2 = CopyConstraintRecord(theEnv,theVariable->constraints); }
+     }
+   else
+     { constraint2 = NULL; }
+
+   /*================================================*/
+   /* Look for the constraint record associated with */
+   /* binding the variable on the RHS of the rule.   */
+   /*================================================*/
+
+   constraint3 = FindBindConstraints(theEnv,expressionList->lexemeValue);
+
+   /*====================================================*/
+   /* Union the LHS and RHS variable binding constraints */
+   /* (the variable must satisfy one or the other).      */
+   /*====================================================*/
+
+   constraint3 = UnionConstraints(theEnv,constraint3,constraint2);
+
+   /*====================================================*/
+   /* Intersect the LHS/RHS variable binding constraints */
+   /* with the function argument restriction constraints */
+   /* (the variable must satisfy both).                  */
+   /*====================================================*/
+
+   constraint4 = IntersectConstraints(theEnv,constraint3,constraint1);
+
+   /*====================================*/
+   /* Check for unmatchable constraints. */
+   /*====================================*/
+
+   if (UnmatchableConstraint(constraint4))
+     {
+      PrintErrorID(theEnv,"RULECSTR",3,true);
+      WriteString(theEnv,STDERR,"Previous variable bindings of ?");
+      WriteString(theEnv,STDERR,expressionList->lexemeValue->contents);
+      WriteString(theEnv,STDERR," caused the type restrictions");
+      WriteString(theEnv,STDERR,"\nfor argument #");
+      WriteInteger(theEnv,STDERR,i);
+      WriteString(theEnv,STDERR," of the expression ");
+      tmpPtr = lastOne->nextArg;
+      lastOne->nextArg = NULL;
+      PrintExpression(theEnv,STDERR,lastOne);
+      lastOne->nextArg = tmpPtr;
+      WriteString(theEnv,STDERR," found in the rule's RHS to be violated.\n");
+
+      rv = true;
+     }
+
+   /*===========================================*/
+   /* Free the temporarily created constraints. */
+   /*===========================================*/
+
+   RemoveConstraint(theEnv,constraint1);
+   RemoveConstraint(theEnv,constraint2);
+   RemoveConstraint(theEnv,constraint3);
+   RemoveConstraint(theEnv,constraint4);
+
+   /*========================================*/
+   /* Return true if unmatchable constraints */
+   /* were detected, otherwise false.        */
+   /*========================================*/
+
+   return(rv);
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) && DEFRULE_CONSTRUCT */
diff --git a/clips/rulecstr.h b/clips/rulecstr.h
new file mode 100755
index 000000000..996d477c8
--- /dev/null
+++ b/clips/rulecstr.h
@@ -0,0 +1,53 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*             RULE CONSTRAINTS HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for detecting constraint       */
+/*   conflicts in the LHS and RHS of rules.                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_rulecstr
+
+#pragma once
+
+#define _H_rulecstr
+
+   struct lhsParseNode           *GetExpressionVarConstraints(Environment *,struct lhsParseNode *);
+   struct lhsParseNode           *DeriveVariableConstraints(Environment *,struct lhsParseNode *);
+   bool                           ProcessConnectedConstraints(Environment *,struct lhsParseNode *,struct lhsParseNode *,struct lhsParseNode *);
+   void                           ConstraintReferenceErrorMessage(Environment *,
+                                                                  CLIPSLexeme *,
+                                                                  struct lhsParseNode *,
+                                                                  int,int,
+                                                                  CLIPSLexeme *,
+                                                                  int);
+   bool                           CheckRHSForConstraintErrors(Environment *,struct expr *,struct lhsParseNode *);
+
+#endif /* _H_rulecstr */
+
diff --git a/clips/ruledef.c b/clips/ruledef.c
new file mode 100755
index 000000000..d52821d6c
--- /dev/null
+++ b/clips/ruledef.c
@@ -0,0 +1,559 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/06/16             */
+   /*                                                     */
+   /*                   DEFRULE MODULE                    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Defines basic defrule primitive functions such   */
+/*   as allocating and deallocating, traversing, and finding */
+/*   defrule data structures.                                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE and                   */
+/*            LOGICAL_DEPENDENCIES compilation flags.        */
+/*                                                           */
+/*            Removed CONFLICT_RESOLUTION_STRATEGIES         */
+/*            compilation flag.                              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Added additional developer statistics to help  */
+/*            analyze join network performance.              */
+/*                                                           */
+/*            Added salience groups to improve performance   */
+/*            with large numbers of activations of different */
+/*            saliences.                                     */
+/*                                                           */
+/*            Added EnvGetDisjunctCount and                  */
+/*            EnvGetNthDisjunct functions.                   */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that    */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+
+#include "agenda.h"
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "pattern.h"
+#include "retract.h"
+#include "reteutil.h"
+#include "rulebsc.h"
+#include "rulecom.h"
+#include "rulepsr.h"
+#include "ruledlt.h"
+
+#if BLOAD || BLOAD_AND_BSAVE || BLOAD_ONLY
+#include "bload.h"
+#include "rulebin.h"
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "rulecmp.h"
+#endif
+
+#include "ruledef.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                   *AllocateModule(Environment *);
+   static void                    ReturnModule(Environment *,void *);
+   static void                    InitializeDefruleModules(Environment *);
+   static void                    DeallocateDefruleData(Environment *);
+   static void                    DestroyDefruleAction(Environment *,ConstructHeader *,void *);
+#if RUN_TIME
+   static void                    AddBetaMemoriesToRule(Environment *,struct joinNode *);
+#endif
+
+/**********************************************************/
+/* InitializeDefrules: Initializes the defrule construct. */
+/**********************************************************/
+void InitializeDefrules(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   AllocateEnvironmentData(theEnv,DEFRULE_DATA,sizeof(struct defruleData),DeallocateDefruleData);
+
+   InitializeEngine(theEnv);
+   InitializeAgenda(theEnv);
+   InitializePatterns(theEnv);
+   InitializeDefruleModules(theEnv);
+
+   AddReservedPatternSymbol(theEnv,"and",NULL);
+   AddReservedPatternSymbol(theEnv,"not",NULL);
+   AddReservedPatternSymbol(theEnv,"or",NULL);
+   AddReservedPatternSymbol(theEnv,"test",NULL);
+   AddReservedPatternSymbol(theEnv,"logical",NULL);
+   AddReservedPatternSymbol(theEnv,"exists",NULL);
+   AddReservedPatternSymbol(theEnv,"forall",NULL);
+
+   DefruleBasicCommands(theEnv);
+
+   DefruleCommands(theEnv);
+
+   DefruleData(theEnv)->DefruleConstruct =
+      AddConstruct(theEnv,"defrule","defrules",
+                   ParseDefrule,
+                   (FindConstructFunction *) FindDefrule,
+                   GetConstructNamePointer,GetConstructPPForm,
+                   GetConstructModuleItem,
+                   (GetNextConstructFunction *) GetNextDefrule,
+                   SetNextConstruct,
+                   (IsConstructDeletableFunction *) DefruleIsDeletable,
+                   (DeleteConstructFunction *) Undefrule,
+                   (FreeConstructFunction *) ReturnDefrule);
+
+   DefruleData(theEnv)->AlphaMemoryTable = (ALPHA_MEMORY_HASH **)
+                  gm2(theEnv,sizeof (ALPHA_MEMORY_HASH *) * ALPHA_MEMORY_HASH_SIZE);
+
+   for (i = 0; i < ALPHA_MEMORY_HASH_SIZE; i++) DefruleData(theEnv)->AlphaMemoryTable[i] = NULL;
+
+   DefruleData(theEnv)->BetaMemoryResizingFlag = true;
+
+   DefruleData(theEnv)->RightPrimeJoins = NULL;
+   DefruleData(theEnv)->LeftPrimeJoins = NULL;
+  }
+
+/**************************************************/
+/* DeallocateDefruleData: Deallocates environment */
+/*    data for the defrule construct.             */
+/**************************************************/
+static void DeallocateDefruleData(
+  Environment *theEnv)
+  {
+   struct defruleModule *theModuleItem;
+   Defmodule *theModule;
+   Activation *theActivation, *tmpActivation;
+   struct salienceGroup *theGroup, *tmpGroup;
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv))
+     { return; }
+#endif
+
+   DoForAllConstructs(theEnv,DestroyDefruleAction,
+                      DefruleData(theEnv)->DefruleModuleIndex,false,NULL);
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      theModuleItem = (struct defruleModule *)
+                      GetModuleItem(theEnv,theModule,
+                                    DefruleData(theEnv)->DefruleModuleIndex);
+
+      theActivation = theModuleItem->agenda;
+      while (theActivation != NULL)
+        {
+         tmpActivation = theActivation->next;
+
+         rtn_struct(theEnv,activation,theActivation);
+
+         theActivation = tmpActivation;
+        }
+
+      theGroup = theModuleItem->groupings;
+      while (theGroup != NULL)
+        {
+         tmpGroup = theGroup->next;
+
+         rtn_struct(theEnv,salienceGroup,theGroup);
+
+         theGroup = tmpGroup;
+        }
+
+#if ! RUN_TIME
+      rtn_struct(theEnv,defruleModule,theModuleItem);
+#endif
+     }
+
+   rm(theEnv,DefruleData(theEnv)->AlphaMemoryTable,sizeof (ALPHA_MEMORY_HASH *) * ALPHA_MEMORY_HASH_SIZE);
+  }
+
+/********************************************************/
+/* DestroyDefruleAction: Action used to remove defrules */
+/*   as a result of DestroyEnvironment.                 */
+/********************************************************/
+static void DestroyDefruleAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Defrule *theDefrule = (Defrule *) theConstruct;
+
+   DestroyDefrule(theEnv,theDefrule);
+  }
+
+/*****************************************************/
+/* InitializeDefruleModules: Initializes the defrule */
+/*   construct for use with the defmodule construct. */
+/*****************************************************/
+static void InitializeDefruleModules(
+  Environment *theEnv)
+  {
+   DefruleData(theEnv)->DefruleModuleIndex = RegisterModuleItem(theEnv,"defrule",
+                                    AllocateModule,
+                                    ReturnModule,
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+                                    BloadDefruleModuleReference,
+#else
+                                    NULL,
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+                                    DefruleCModuleReference,
+#else
+                                    NULL,
+#endif
+                                    (FindConstructFunction *) FindDefruleInModule);
+  }
+
+/***********************************************/
+/* AllocateModule: Allocates a defrule module. */
+/***********************************************/
+static void *AllocateModule(
+  Environment *theEnv)
+  {
+   struct defruleModule *theItem;
+
+   theItem = get_struct(theEnv,defruleModule);
+   theItem->agenda = NULL;
+   theItem->groupings = NULL;
+   return((void *) theItem);
+  }
+
+/***********************************************/
+/* ReturnModule: Deallocates a defrule module. */
+/***********************************************/
+static void ReturnModule(
+  Environment *theEnv,
+  void *theItem)
+  {
+   FreeConstructHeaderModule(theEnv,(struct defmoduleItemHeader *) theItem,DefruleData(theEnv)->DefruleConstruct);
+   rtn_struct(theEnv,defruleModule,theItem);
+  }
+
+/************************************************************/
+/* GetDefruleModuleItem: Returns a pointer to the defmodule */
+/*  item for the specified defrule or defmodule.            */
+/************************************************************/
+struct defruleModule *GetDefruleModuleItem(
+  Environment *theEnv,
+  Defmodule *theModule)
+  {
+   return((struct defruleModule *) GetConstructModuleItemByIndex(theEnv,theModule,DefruleData(theEnv)->DefruleModuleIndex));
+  }
+
+/****************************************************************/
+/* FindDefrule: Searches for a defrule in the list of defrules. */
+/*   Returns a pointer to the defrule if found, otherwise NULL. */
+/****************************************************************/
+Defrule *FindDefrule(
+  Environment *theEnv,
+  const char *defruleName)
+  {
+   return (Defrule *) FindNamedConstructInModuleOrImports(theEnv,defruleName,DefruleData(theEnv)->DefruleConstruct);
+  }
+
+/************************************************************************/
+/* FindDefruleInModule: Searches for a defrule in the list of defrules. */
+/*   Returns a pointer to the defrule if found, otherwise NULL.         */
+/************************************************************************/
+Defrule *FindDefruleInModule(
+  Environment *theEnv,
+  const char *defruleName)
+  {
+   return (Defrule *) FindNamedConstructInModule(theEnv,defruleName,DefruleData(theEnv)->DefruleConstruct);
+  }
+
+/************************************************************/
+/* GetNextDefrule: If passed a NULL pointer, returns the    */
+/*   first defrule in the ListOfDefrules. Otherwise returns */
+/*   the next defrule following the defrule passed as an    */
+/*   argument.                                              */
+/************************************************************/
+Defrule *GetNextDefrule(
+  Environment *theEnv,
+  Defrule *defrulePtr)
+  {
+   return (Defrule *) GetNextConstructItem(theEnv,&defrulePtr->header,DefruleData(theEnv)->DefruleModuleIndex);
+  }
+
+/******************************************************/
+/* DefruleIsDeletable: Returns true if a particular   */
+/*   defrule can be deleted, otherwise returns false. */
+/******************************************************/
+bool DefruleIsDeletable(
+  Defrule *theDefrule)
+  {
+   Environment *theEnv = theDefrule->header.env;
+
+   if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   for ( ;
+        theDefrule != NULL;
+        theDefrule = theDefrule->disjunct)
+     { if (theDefrule->executing) return false; }
+
+   if (EngineData(theEnv)->JoinOperationInProgress) return false;
+
+   return true;
+  }
+
+/********************************************************/
+/* GetDisjunctCount: Returns the number of disjuncts of */
+/*   a rule (permutations caused by the use of or CEs). */
+/********************************************************/
+long GetDisjunctCount(
+  Environment *theEnv,
+  Defrule *theDefrule)
+  {
+   long count = 0;
+
+   for ( ;
+        theDefrule != NULL;
+        theDefrule = theDefrule->disjunct)
+     { count++; }
+
+   return(count);
+  }
+
+/*******************************************************/
+/* GetNthDisjunct: Returns the nth disjunct of a rule. */
+/*   The disjunct indices run from 1 to N rather than  */
+/*   0 to N - 1.                                       */
+/*******************************************************/
+Defrule *GetNthDisjunct(
+  Environment *theEnv,
+  Defrule *theDefrule,
+  long index)
+  {
+   long count = 0;
+
+   for ( ;
+        theDefrule != NULL;
+        theDefrule = theDefrule->disjunct)
+     {
+      count++;
+      if (count == index)
+        { return theDefrule; }
+     }
+
+   return NULL;
+  }
+
+#if RUN_TIME
+
+/******************************************/
+/* DefruleRunTimeInitialize:  Initializes */
+/*   defrule in a run-time module.        */
+/******************************************/
+void DefruleRunTimeInitialize(
+  Environment *theEnv,
+  struct joinLink *rightPrime,
+  struct joinLink *leftPrime)
+  {
+   Defmodule *theModule;
+   Defrule *theRule, *theDisjunct;
+
+   DefruleData(theEnv)->RightPrimeJoins = rightPrime;
+   DefruleData(theEnv)->LeftPrimeJoins = leftPrime;
+
+   SaveCurrentModule(theEnv);
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+      for (theRule = GetNextDefrule(theEnv,NULL);
+           theRule != NULL;
+           theRule = GetNextDefrule(theEnv,theRule))
+        {
+         for (theDisjunct = theRule;
+              theDisjunct != NULL;
+              theDisjunct = theDisjunct->disjunct)
+           {
+            theDisjunct->header.env = theEnv;
+            AddBetaMemoriesToRule(theEnv,theDisjunct->lastJoin);
+           }
+        }
+     }
+
+   RestoreCurrentModule(theEnv);
+  }
+
+
+/**************************/
+/* AddBetaMemoriesToRule: */
+/**************************/
+static void AddBetaMemoriesToRule(
+  Environment *theEnv,
+  struct joinNode *theNode)
+  {
+   AddBetaMemoriesToJoin(theEnv,theNode);
+
+   if (theNode->lastLevel != NULL)
+     { AddBetaMemoriesToRule(theEnv,theNode->lastLevel); }
+
+   if (theNode->joinFromTheRight)
+     { AddBetaMemoriesToRule(theEnv,(struct joinNode *) theNode->rightSideEntryStructure); }
+  }
+
+#endif /* RUN_TIME */
+
+#if RUN_TIME || BLOAD_ONLY || BLOAD || BLOAD_AND_BSAVE
+
+/**************************/
+/* AddBetaMemoriesToJoin: */
+/**************************/
+void AddBetaMemoriesToJoin(
+  Environment *theEnv,
+  struct joinNode *theNode)
+  {
+   if ((theNode->leftMemory != NULL) || (theNode->rightMemory != NULL))
+     { return; }
+
+   if ((! theNode->firstJoin) || theNode->patternIsExists || theNode-> patternIsNegated || theNode->joinFromTheRight)
+     {
+      if (theNode->leftHash == NULL)
+        {
+         theNode->leftMemory = get_struct(theEnv,betaMemory);
+         theNode->leftMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+         theNode->leftMemory->beta[0] = NULL;
+         theNode->leftMemory->size = 1;
+         theNode->leftMemory->count = 0;
+         theNode->leftMemory->last = NULL;
+        }
+      else
+        {
+         theNode->leftMemory = get_struct(theEnv,betaMemory);
+         theNode->leftMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         memset(theNode->leftMemory->beta,0,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         theNode->leftMemory->size = INITIAL_BETA_HASH_SIZE;
+         theNode->leftMemory->count = 0;
+         theNode->leftMemory->last = NULL;
+        }
+
+      if (theNode->firstJoin && (theNode->patternIsExists || theNode-> patternIsNegated || theNode->joinFromTheRight))
+        {
+         theNode->leftMemory->beta[0] = CreateEmptyPartialMatch(theEnv);
+         theNode->leftMemory->beta[0]->owner = theNode;
+        }
+     }
+   else
+     { theNode->leftMemory = NULL; }
+
+   if (theNode->joinFromTheRight)
+     {
+      if (theNode->leftHash == NULL)
+        {
+         theNode->rightMemory = get_struct(theEnv,betaMemory);
+         theNode->rightMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+         theNode->rightMemory->last = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+         theNode->rightMemory->beta[0] = NULL;
+         theNode->rightMemory->last[0] = NULL;
+         theNode->rightMemory->size = 1;
+         theNode->rightMemory->count = 0;
+        }
+      else
+        {
+         theNode->rightMemory = get_struct(theEnv,betaMemory);
+         theNode->rightMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         theNode->rightMemory->last = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *) * INITIAL_BETA_HASH_SIZE);
+         memset(theNode->rightMemory->beta,0,sizeof(struct partialMatch **) * INITIAL_BETA_HASH_SIZE);
+         memset(theNode->rightMemory->last,0,sizeof(struct partialMatch **) * INITIAL_BETA_HASH_SIZE);
+         theNode->rightMemory->size = INITIAL_BETA_HASH_SIZE;
+         theNode->rightMemory->count = 0;
+        }
+     }
+   else if (theNode->rightSideEntryStructure == NULL)
+     {
+      theNode->rightMemory = get_struct(theEnv,betaMemory);
+      theNode->rightMemory->beta = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+      theNode->rightMemory->last = (struct partialMatch **) genalloc(theEnv,sizeof(struct partialMatch *));
+      theNode->rightMemory->beta[0] = CreateEmptyPartialMatch(theEnv);
+      theNode->rightMemory->beta[0]->owner = theNode;
+      theNode->rightMemory->beta[0]->rhsMemory = true;
+      theNode->rightMemory->last[0] = theNode->rightMemory->beta[0];
+      theNode->rightMemory->size = 1;
+      theNode->rightMemory->count = 1;
+     }
+   else
+     { theNode->rightMemory = NULL; }
+  }
+
+#endif /* RUN_TIME || BLOAD_ONLY || BLOAD || BLOAD_AND_BSAVE */
+
+/*##################################*/
+/* Additional Environment Functions */
+/*##################################*/
+
+const char *DefruleModule(
+  Defrule *theDefrule)
+  {
+   return GetConstructModuleName(&theDefrule->header);
+  }
+
+const char *DefruleName(
+  Defrule *theDefrule)
+  {
+   return GetConstructNameString(&theDefrule->header);
+  }
+
+const char *DefrulePPForm(
+  Defrule *theDefrule)
+  {
+   return GetConstructPPForm(&theDefrule->header);
+  }
+
+#endif /* DEFRULE_CONSTRUCT */
+
+
diff --git a/clips/ruledef.h b/clips/ruledef.h
new file mode 100755
index 000000000..3b274637d
--- /dev/null
+++ b/clips/ruledef.h
@@ -0,0 +1,179 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/06/16            */
+   /*                                                     */
+   /*                 DEFRULE HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Defines basic defrule primitive functions such   */
+/*   as allocating and deallocating, traversing, and finding */
+/*   defrule data structures.                                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE and                   */
+/*            LOGICAL_DEPENDENCIES compilation flags.        */
+/*                                                           */
+/*            Removed CONFLICT_RESOLUTION_STRATEGIES         */
+/*            compilation flag.                              */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Added additional developer statistics to help  */
+/*            analyze join network performance.              */
+/*                                                           */
+/*            Added salience groups to improve performance   */
+/*            with large numbers of activations of different */
+/*            saliences.                                     */
+/*                                                           */
+/*            Added EnvGetDisjunctCount and                  */
+/*            EnvGetNthDisjunct functions.                   */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_ruledef
+
+#pragma once
+
+#define _H_ruledef
+
+#define GetDisjunctIndex(r) (r->header.bsaveID)
+
+typedef struct defrule Defrule;
+struct defruleModule;
+
+#include "constrct.h"
+#include "expressn.h"
+#include "network.h"
+#include "ruledef.h"
+
+struct defrule
+  {
+   ConstructHeader header;
+   int salience;
+   unsigned short localVarCnt;
+   unsigned int complexity      : 11;
+   unsigned int afterBreakpoint :  1;
+   unsigned int watchActivation :  1;
+   unsigned int watchFiring     :  1;
+   unsigned int autoFocus       :  1;
+   unsigned int executing       :  1;
+   struct expr *dynamicSalience;
+   struct expr *actions;
+   struct joinNode *logicalJoin;
+   struct joinNode *lastJoin;
+   Defrule *disjunct;
+  };
+
+#include "agenda.h"
+#include "conscomp.h"
+#include "constrnt.h"
+#include "cstrccom.h"
+#include "evaluatn.h"
+#include "moduldef.h"
+#include "symbol.h"
+
+struct defruleModule
+  {
+   struct defmoduleItemHeader header;
+   struct salienceGroup *groupings;
+   struct activation *agenda;
+  };
+
+#ifndef ALPHA_MEMORY_HASH_SIZE
+#define ALPHA_MEMORY_HASH_SIZE       63559L
+#endif
+
+#define DEFRULE_DATA 16
+
+struct defruleData
+  {
+   Construct *DefruleConstruct;
+   unsigned DefruleModuleIndex;
+   unsigned long long CurrentEntityTimeTag;
+   struct alphaMemoryHash **AlphaMemoryTable;
+   bool BetaMemoryResizingFlag;
+   struct joinLink *RightPrimeJoins;
+   struct joinLink *LeftPrimeJoins;
+
+#if DEBUGGING_FUNCTIONS
+    bool WatchRules;
+    int DeletedRuleDebugFlags;
+#endif
+#if DEVELOPER && (! RUN_TIME) && (! BLOAD_ONLY)
+    bool WatchRuleAnalysis;
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   struct CodeGeneratorItem *DefruleCodeItem;
+#endif
+  };
+
+#define DefruleData(theEnv) ((struct defruleData *) GetEnvironmentData(theEnv,DEFRULE_DATA))
+
+#define GetPreviousJoin(theJoin) \
+   (((theJoin)->joinFromTheRight) ? \
+    ((struct joinNode *) (theJoin)->rightSideEntryStructure) : \
+    ((theJoin)->lastLevel))
+#define GetPatternForJoin(theJoin) \
+   (((theJoin)->joinFromTheRight) ? \
+    NULL : \
+    ((theJoin)->rightSideEntryStructure))
+
+   void                           InitializeDefrules(Environment *);
+   Defrule                       *FindDefrule(Environment *,const char *);
+   Defrule                       *FindDefruleInModule(Environment *,const char *);
+   Defrule                       *GetNextDefrule(Environment *,Defrule *);
+   struct defruleModule          *GetDefruleModuleItem(Environment *,Defmodule *);
+   bool                           DefruleIsDeletable(Defrule *);
+#if RUN_TIME
+   void                           DefruleRunTimeInitialize(Environment *,struct joinLink *,struct joinLink *);
+#endif
+#if RUN_TIME || BLOAD_ONLY || BLOAD || BLOAD_AND_BSAVE
+   void                           AddBetaMemoriesToJoin(Environment *,struct joinNode *);
+#endif
+   long                           GetDisjunctCount(Environment *,Defrule *);
+   Defrule                       *GetNthDisjunct(Environment *,Defrule *,long);
+   const char                    *DefruleModule(Defrule *);
+   const char                    *DefruleName(Defrule *);
+   const char                    *DefrulePPForm(Defrule *);
+
+#endif /* _H_ruledef */
+
+
diff --git a/clips/ruledlt.c b/clips/ruledlt.c
new file mode 100755
index 000000000..5886d91cf
--- /dev/null
+++ b/clips/ruledlt.c
@@ -0,0 +1,599 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                 RULE DELETION MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for deleting a rule including  */
+/*   freeing the defrule data structures and removing the    */
+/*   appropriate joins from the join network.                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE compilation flag.     */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+#include <string.h>
+
+#include "agenda.h"
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+#include "constrct.h"
+#include "drive.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "pattern.h"
+#include "reteutil.h"
+#include "retract.h"
+
+#include "ruledlt.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static void                    RemoveIntranetworkLink(Environment *,struct joinNode *);
+#endif
+   static void                    DetachJoins(Environment *,struct joinNode *,bool);
+   static void                    DetachJoinsDriver(Environment *,Defrule *,bool);
+
+/**********************************************************************/
+/* ReturnDefrule: Returns a defrule data structure and its associated */
+/*   data structures to the memory manager. Note that the first       */
+/*   disjunct of a rule is the only disjunct which allocates storage  */
+/*   for the rule's dynamic salience and pretty print form (so these  */
+/*   are only deallocated for the first disjunct).                    */
+/**********************************************************************/
+void ReturnDefrule(
+  Environment *theEnv,
+  Defrule *theDefrule)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   bool first = true;
+   Defrule *nextPtr, *tmpPtr;
+
+   if (theDefrule == NULL) return;
+
+   /*======================================*/
+   /* If a rule is redefined, then we want */
+   /* to save its breakpoint status.       */
+   /*======================================*/
+
+#if DEBUGGING_FUNCTIONS
+   DefruleData(theEnv)->DeletedRuleDebugFlags = 0;
+   if (theDefrule->afterBreakpoint) BitwiseSet(DefruleData(theEnv)->DeletedRuleDebugFlags,0);
+   if (theDefrule->watchActivation) BitwiseSet(DefruleData(theEnv)->DeletedRuleDebugFlags,1);
+   if (theDefrule->watchFiring) BitwiseSet(DefruleData(theEnv)->DeletedRuleDebugFlags,2);
+#endif
+
+   /*================================*/
+   /* Clear the agenda of all the    */
+   /* activations added by the rule. */
+   /*================================*/
+
+   ClearRuleFromAgenda(theEnv,theDefrule);
+
+   /*======================*/
+   /* Get rid of the rule. */
+   /*======================*/
+
+   while (theDefrule != NULL)
+     {
+      /*================================================*/
+      /* Remove the rule's joins from the join network. */
+      /*================================================*/
+
+      DetachJoinsDriver(theEnv,theDefrule,false);
+
+      /*=============================================*/
+      /* If this is the first disjunct, get rid of   */
+      /* the dynamic salience and pretty print form. */
+      /*=============================================*/
+
+      if (first)
+        {
+         if (theDefrule->dynamicSalience != NULL)
+          {
+           ExpressionDeinstall(theEnv,theDefrule->dynamicSalience);
+           ReturnPackedExpression(theEnv,theDefrule->dynamicSalience);
+           theDefrule->dynamicSalience = NULL;
+          }
+         if (theDefrule->header.ppForm != NULL)
+           {
+            rm(theEnv,(void *) theDefrule->header.ppForm,strlen(theDefrule->header.ppForm) + 1);
+            theDefrule->header.ppForm = NULL;
+
+            /*=======================================================*/
+            /* All of the rule disjuncts share the same pretty print */
+            /* form, so we want to avoid deleting it again.          */
+            /*=======================================================*/
+
+            for (tmpPtr = theDefrule->disjunct; tmpPtr != NULL; tmpPtr = tmpPtr->disjunct)
+              { tmpPtr->header.ppForm = NULL; }
+           }
+
+         first = false;
+        }
+
+      /*===========================*/
+      /* Get rid of any user data. */
+      /*===========================*/
+
+      if (theDefrule->header.usrData != NULL)
+        { ClearUserDataList(theEnv,theDefrule->header.usrData); }
+
+      /*===========================================*/
+      /* Decrement the count for the defrule name. */
+      /*===========================================*/
+
+      ReleaseLexeme(theEnv,theDefrule->header.name);
+
+      /*========================================*/
+      /* Get rid of the the rule's RHS actions. */
+      /*========================================*/
+
+      if (theDefrule->actions != NULL)
+        {
+         ExpressionDeinstall(theEnv,theDefrule->actions);
+         ReturnPackedExpression(theEnv,theDefrule->actions);
+        }
+
+      /*===============================*/
+      /* Move on to the next disjunct. */
+      /*===============================*/
+
+      nextPtr = theDefrule->disjunct;
+      rtn_struct(theEnv,defrule,theDefrule);
+      theDefrule = nextPtr;
+     }
+
+   /*==========================*/
+   /* Free up partial matches. */
+   /*==========================*/
+
+   if (EngineData(theEnv)->ExecutingRule == NULL) FlushGarbagePartialMatches(theEnv);
+#endif
+  }
+
+/********************************************************/
+/* DestroyDefrule: Action used to remove defrules       */
+/*   as a result of DestroyEnvironment.                 */
+/********************************************************/
+void DestroyDefrule(
+  Environment *theEnv,
+  Defrule *theDefrule)
+  {
+   Defrule *nextDisjunct;
+   bool first = true;
+
+   if (theDefrule == NULL) return;
+
+   while (theDefrule != NULL)
+     {
+      DetachJoinsDriver(theEnv,theDefrule,true);
+
+      if (first)
+        {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+         if (theDefrule->dynamicSalience != NULL)
+           { ReturnPackedExpression(theEnv,theDefrule->dynamicSalience); }
+
+         if (theDefrule->header.ppForm != NULL)
+           {
+            Defrule *tmpPtr;
+
+            rm(theEnv,(void *) theDefrule->header.ppForm,strlen(theDefrule->header.ppForm) + 1);
+
+            /*=======================================================*/
+            /* All of the rule disjuncts share the same pretty print */
+            /* form, so we want to avoid deleting it again.          */
+            /*=======================================================*/
+
+            for (tmpPtr = theDefrule->disjunct; tmpPtr != NULL; tmpPtr = tmpPtr->disjunct)
+              { tmpPtr->header.ppForm = NULL; }
+           }
+#endif
+
+         first = false;
+        }
+
+      if (theDefrule->header.usrData != NULL)
+        { ClearUserDataList(theEnv,theDefrule->header.usrData); }
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+      if (theDefrule->actions != NULL)
+        { ReturnPackedExpression(theEnv,theDefrule->actions); }
+#endif
+
+      nextDisjunct = theDefrule->disjunct;
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+      rtn_struct(theEnv,defrule,theDefrule);
+#endif
+
+      theDefrule = nextDisjunct;
+     }
+  }
+
+/**********************/
+/* DetachJoinsDriver: */
+/**********************/
+static void DetachJoinsDriver(
+  Environment *theEnv,
+  Defrule *theRule,
+  bool destroy)
+  {
+   struct joinNode *join;
+
+   /*==================================*/
+   /* Find the last join for the rule. */
+   /*==================================*/
+
+   join = theRule->lastJoin;
+   theRule->lastJoin = NULL;
+   if (join == NULL) return;
+
+   /*===================================================*/
+   /* Remove the activation link from the last join. If */
+   /* there are joins below this join, then all of the  */
+   /* joins for this rule were shared with another rule */
+   /* and thus no joins can be deleted.                 */
+   /*===================================================*/
+
+   join->ruleToActivate = NULL;
+   if (join->nextLinks != NULL) return;
+
+   DetachJoins(theEnv,join,destroy);
+  }
+
+/**********************************************************************/
+/* DetachJoins: Removes a join node and all of its parent nodes from  */
+/*   the join network. Nodes are only removed if they are no required */
+/*   by other rules (the same join can be shared by multiple rules).  */
+/*   Any partial matches associated with the join are also removed.   */
+/*   A rule's joins are typically removed by removing the bottom most */
+/*   join used by the rule and then removing any parent joins which   */
+/*   are not shared by other rules.                                   */
+/**********************************************************************/
+static void DetachJoins(
+  Environment *theEnv,
+  struct joinNode *join,
+  bool destroy)
+  {
+   struct joinNode *prevJoin, *rightJoin;
+   struct joinLink *lastLink, *theLink;
+   unsigned lastMark;
+
+   /*===========================*/
+   /* Begin removing the joins. */
+   /*===========================*/
+
+   while (join != NULL)
+     {
+      if (join->marked) return;
+
+      /*==========================================================*/
+      /* Remember the join "above" this join (the one that enters */
+      /* from the left). If the join is entered from the right by */
+      /* another join, remember the right entering join as well.  */
+      /*==========================================================*/
+
+      prevJoin = join->lastLevel;
+      if (join->joinFromTheRight)
+        { rightJoin = (struct joinNode *) join->rightSideEntryStructure; }
+      else
+        { rightJoin = NULL; }
+
+      /*=================================================*/
+      /* If the join was attached to a pattern, remove   */
+      /* any structures associated with the pattern that */
+      /* are no longer needed.                           */
+      /*=================================================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      if (! destroy)
+        {
+         if ((join->rightSideEntryStructure != NULL) && (join->joinFromTheRight == false))
+           { RemoveIntranetworkLink(theEnv,join); }
+        }
+#endif
+
+      /*======================================*/
+      /* Remove any partial matches contained */
+      /* in the beta memory of the join.      */
+      /*======================================*/
+
+      if (destroy)
+        {
+         DestroyBetaMemory(theEnv,join,LHS);
+         DestroyBetaMemory(theEnv,join,RHS);
+        }
+      else
+        {
+         FlushBetaMemory(theEnv,join,LHS);
+         FlushBetaMemory(theEnv,join,RHS);
+        }
+
+      ReturnLeftMemory(theEnv,join);
+      ReturnRightMemory(theEnv,join);
+
+      /*===================================*/
+      /* Remove the expressions associated */
+      /* with the join.                    */
+      /*===================================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      if (! destroy)
+        {
+         RemoveHashedExpression(theEnv,join->networkTest);
+         RemoveHashedExpression(theEnv,join->secondaryNetworkTest);
+         RemoveHashedExpression(theEnv,join->leftHash);
+         RemoveHashedExpression(theEnv,join->rightHash);
+        }
+#endif
+
+      /*============================*/
+      /* Fix the right prime links. */
+      /*============================*/
+
+      if (join->firstJoin && (join->rightSideEntryStructure == NULL))
+        {
+         lastLink = NULL;
+
+         theLink = DefruleData(theEnv)->RightPrimeJoins;
+         while (theLink != NULL)
+           {
+            if (theLink->join == join)
+              {
+               if (lastLink == NULL)
+                 { DefruleData(theEnv)->RightPrimeJoins = theLink->next; }
+               else
+                 { lastLink->next = theLink->next; }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+               rtn_struct(theEnv,joinLink,theLink);
+#endif
+
+               theLink = NULL;
+              }
+            else
+              {
+               lastLink = theLink;
+               theLink = lastLink->next;
+              }
+           }
+        }
+
+      /*===========================*/
+      /* Fix the left prime links. */
+      /*===========================*/
+
+      if (join->firstJoin && (join->patternIsNegated || join->joinFromTheRight) && (! join->patternIsExists))
+        {
+         lastLink = NULL;
+         theLink = DefruleData(theEnv)->LeftPrimeJoins;
+         while (theLink != NULL)
+           {
+            if (theLink->join == join)
+              {
+               if (lastLink == NULL)
+                 { DefruleData(theEnv)->LeftPrimeJoins = theLink->next; }
+               else
+                 { lastLink->next = theLink->next; }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+               rtn_struct(theEnv,joinLink,theLink);
+#endif
+
+               theLink = NULL;
+              }
+            else
+              {
+               lastLink = theLink;
+               theLink = theLink->next;
+              }
+           }
+        }
+
+      /*==================================================*/
+      /* Remove the link to the join from the join above. */
+      /*==================================================*/
+
+      if (prevJoin != NULL)
+        {
+         lastLink = NULL;
+         theLink = prevJoin->nextLinks;
+         while (theLink != NULL)
+           {
+            if (theLink->join == join)
+              {
+               if (lastLink == NULL)
+                 { prevJoin->nextLinks = theLink->next; }
+               else
+                 { lastLink->next = theLink->next; }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+               rtn_struct(theEnv,joinLink,theLink);
+#endif
+
+               theLink = NULL;
+              }
+            else
+              {
+               lastLink = theLink;
+               theLink = theLink->next;
+              }
+            }
+        }
+
+      /*==========================================*/
+      /* Remove the right join link if it exists. */
+      /*==========================================*/
+
+      if (rightJoin != NULL)
+        {
+         lastLink = NULL;
+         theLink = rightJoin->nextLinks;
+         while (theLink != NULL)
+           {
+            if (theLink->join == join)
+              {
+               if (lastLink == NULL)
+                 { rightJoin->nextLinks = theLink->next; }
+               else
+                 { lastLink->next = theLink->next; }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+               rtn_struct(theEnv,joinLink,theLink);
+#endif
+               theLink = NULL;
+              }
+            else
+              {
+               lastLink = theLink;
+               theLink = theLink->next;
+              }
+            }
+
+         if ((rightJoin->nextLinks == NULL) &&
+             (rightJoin->ruleToActivate == NULL))
+           {
+            if (prevJoin != NULL)
+              {
+               lastMark = prevJoin->marked;
+               prevJoin->marked = true;
+               DetachJoins(theEnv,rightJoin,destroy);
+               prevJoin->marked = lastMark;
+              }
+            else
+              { DetachJoins(theEnv,rightJoin,destroy); }
+           }
+        }
+
+      /*==================*/
+      /* Delete the join. */
+      /*==================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+      rtn_struct(theEnv,joinNode,join);
+#endif
+
+      /*===========================================================*/
+      /* Move on to the next join to be removed. All the joins of  */
+      /* a rule can be deleted by following the right joins links  */
+      /* (when these links exist) and then following the left join */
+      /* links. This works because if join A enters join B from    */
+      /* the right, the right/left links of join A eventually lead */
+      /* to the join which enters join B from the left.            */
+      /*===========================================================*/
+
+      if (prevJoin == NULL)
+        { return; }
+      else if (prevJoin->ruleToActivate != NULL)
+        { return; }
+      else if (prevJoin->nextLinks == NULL)
+        { join = prevJoin; }
+      else
+        { return; }
+     }
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/***********************************************************************/
+/* RemoveIntranetworkLink: Removes the link between a join node in the */
+/*   join network and its corresponding pattern node in the pattern    */
+/*   network. If the pattern node is then no longer associated with    */
+/*   any other joins, it is removed using the function DetachPattern.  */
+/***********************************************************************/
+static void RemoveIntranetworkLink(
+  Environment *theEnv,
+  struct joinNode *join)
+  {
+   struct patternNodeHeader *patternPtr;
+   struct joinNode *joinPtr, *lastJoin;
+
+   /*================================================*/
+   /* Determine the pattern that enters this join.   */
+   /* Determine the list of joins which this pattern */
+   /* enters from the right.                         */
+   /*================================================*/
+
+   patternPtr = (struct patternNodeHeader *) join->rightSideEntryStructure;
+   joinPtr = patternPtr->entryJoin;
+   lastJoin = NULL;
+
+   /*=================================================*/
+   /* Loop through the list of joins that the pattern */
+   /* enters until the join being removed is found.   */
+   /* Remove this join from the list.                 */
+   /*=================================================*/
+
+   while (joinPtr != NULL)
+     {
+      if (joinPtr == join)
+        {
+         if (lastJoin == NULL)
+           { patternPtr->entryJoin = joinPtr->rightMatchNode; }
+         else
+           { lastJoin->rightMatchNode = joinPtr->rightMatchNode; }
+
+         joinPtr = NULL;
+        }
+      else
+        {
+         lastJoin = joinPtr;
+         joinPtr = joinPtr->rightMatchNode;
+        }
+     }
+
+   /*===================================================*/
+   /* If the terminal node of the pattern doesn't point */
+   /* to any joins, then start removing the pattern.    */
+   /*===================================================*/
+
+   if (patternPtr->entryJoin == NULL)
+     { DetachPattern(theEnv,join->rhsType,patternPtr); }
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* DEFRULE_CONSTRUCT */
+
+
+
diff --git a/clips/ruledlt.h b/clips/ruledlt.h
new file mode 100755
index 000000000..0fbf92b94
--- /dev/null
+++ b/clips/ruledlt.h
@@ -0,0 +1,58 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*          RULE DELETION MODULE HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides routines for deleting a rule including  */
+/*   freeing the defrule data structures and removing the    */
+/*   appropriate joins from the join network.                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE compilation flag.     */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Fixed linkage issue when BLOAD_ONLY compiler   */
+/*            flag is set to 1.                              */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_ruledlt
+
+#pragma once
+
+#define _H_ruledlt
+
+   void                           ReturnDefrule(Environment *,Defrule *);
+   void                           DestroyDefrule(Environment *,Defrule *);
+
+#endif /* _H_ruledlt */
+
+
+
+
+
+
diff --git a/clips/rulelhs.c b/clips/rulelhs.c
new file mode 100755
index 000000000..cb4625be0
--- /dev/null
+++ b/clips/rulelhs.c
@@ -0,0 +1,1216 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*             DEFRULE LHS PARSING MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Coordinates parsing of the LHS conditional       */
+/*   elements of a rule.                                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if (! RUN_TIME) && (! BLOAD_ONLY) &&  DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+#include <string.h>
+
+#include "agenda.h"
+#include "argacces.h"
+#include "constant.h"
+#include "constrct.h"
+#include "constrnt.h"
+#include "cstrnchk.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "pattern.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "reorder.h"
+#include "router.h"
+#include "ruledef.h"
+#include "scanner.h"
+#include "symbol.h"
+
+#include "rulelhs.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static struct lhsParseNode    *RuleBodyParse(Environment *,const char *,struct token *,const char *,bool *);
+   static void                    DeclarationParse(Environment *,const char *,const char *,bool *);
+   static struct lhsParseNode    *LHSPattern(Environment *,const char *,TokenType,const char *,bool *,bool,
+                                             struct token *,const char *);
+   static struct lhsParseNode    *ConnectedPatternParse(Environment *,const char *,struct token *,bool *);
+   static struct lhsParseNode    *GroupPatterns(Environment *,const char *,TokenType,const char *,bool *);
+   static struct lhsParseNode    *TestPattern(Environment *,const char *,bool *);
+   static struct lhsParseNode    *AssignmentParse(Environment *,const char *,CLIPSLexeme *,bool *);
+   static void                    TagLHSLogicalNodes(struct lhsParseNode *);
+   static struct lhsParseNode    *SimplePatternParse(Environment *,const char *,struct token *,bool *);
+   static void                    ParseSalience(Environment *,const char *,const char *,bool *);
+   static void                    ParseAutoFocus(Environment *,const char *,bool *);
+
+/*******************************************************************/
+/* ParseRuleLHS: Coordinates all the actions necessary for parsing */
+/*   the LHS of a rule including the reordering of pattern         */
+/*   conditional elements to conform with the KB Rete topology.    */
+/*******************************************************************/
+struct lhsParseNode *ParseRuleLHS(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  const char *ruleName,
+  bool *error)
+  {
+   struct lhsParseNode *theLHS;
+   bool result;
+
+   *error = false;
+
+   /*========================================*/
+   /* Initialize salience parsing variables. */
+   /*========================================*/
+
+   PatternData(theEnv)->GlobalSalience = 0;
+   PatternData(theEnv)->GlobalAutoFocus = false;
+   PatternData(theEnv)->SalienceExpression = NULL;
+
+   /*============================*/
+   /* Set the indentation depth. */
+   /*============================*/
+
+   SetIndentDepth(theEnv,3);
+
+   /*=====================================================*/
+   /* Get the raw representation for the LHS of the rule. */
+   /*=====================================================*/
+
+   theLHS = RuleBodyParse(theEnv,readSource,theToken,ruleName,error);
+
+   if (*error) return NULL;
+
+   /*====================================================*/
+   /* Reorder the raw representation so that it consists */
+   /* of at most a single top level OR CE containing one */
+   /* or more AND CEs.                                   */
+   /*====================================================*/
+
+   theLHS = ReorderPatterns(theEnv,theLHS,&result);
+
+   /*================================*/
+   /* Return the LHS representation. */
+   /*================================*/
+
+   return(theLHS);
+  }
+
+/*********************************************************/
+/* RuleBodyParse: Parses the LHS of a rule, but does not */
+/*   reorder any of the LHS patterns to conform with the */
+/*   KB Rete Topology.                                   */
+/*                                                       */
+/* <rule-body> ::= [<declaration>]                       */
+/*                 <conditional-element>*                */
+/*                 =>                                    */
+/*********************************************************/
+static struct lhsParseNode *RuleBodyParse(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  const char *ruleName,
+  bool *error)
+  {
+   struct lhsParseNode *theNode, *otherNodes;
+
+   /*=============================*/
+   /* Set the error return value. */
+   /*=============================*/
+
+   *error = false;
+
+   /*==================================================*/
+   /* If we're already at the separator, "=>", between */
+   /* the LHS and RHS, then the LHS is empty.          */
+   /*==================================================*/
+
+   if ((theToken->tknType == SYMBOL_TOKEN) ?
+       (strcmp(theToken->lexemeValue->contents,"=>") == 0) : false)
+     { return NULL; }
+
+   /*===========================================*/
+   /* Parse the first pattern as a special case */
+   /* (the declare statement is allowed).       */
+   /*===========================================*/
+
+   theNode = LHSPattern(theEnv,readSource,SYMBOL_TOKEN,"=>",error,true,theToken,ruleName);
+
+   if (*error == true)
+     {
+      ReturnLHSParseNodes(theEnv,theNode);
+      return NULL;
+     }
+
+   PPCRAndIndent(theEnv);
+
+   /*======================================*/
+   /* Parse the other patterns in the LHS. */
+   /*======================================*/
+
+   otherNodes = GroupPatterns(theEnv,readSource,SYMBOL_TOKEN,"=>",error);
+
+   if (*error == true)
+     {
+      ReturnLHSParseNodes(theEnv,theNode);
+      return NULL;
+     }
+
+   /*================================================*/
+   /* Construct the final LHS by combining the first */
+   /* pattern with the remaining patterns.           */
+   /*================================================*/
+
+   if (theNode == NULL)
+     { theNode = otherNodes; }
+   else
+     { theNode->bottom = otherNodes; }
+
+   /*=======================*/
+   /* Return the final LHS. */
+   /*=======================*/
+
+   return(theNode);
+  }
+
+/********************************************************/
+/* DeclarationParse: Parses a defrule declaration.      */
+/*                                                      */
+/* <declaration> ::= (declare <rule-property>+)         */
+/*                                                      */
+/* <rule-property> ::= (salience <integer-expression>)  */
+/* <rule-property> ::= (auto-focus TRUE | FALSE)        */
+/********************************************************/
+static void DeclarationParse(
+  Environment *theEnv,
+  const char *readSource,
+  const char *ruleName,
+  bool *error)
+  {
+   struct token theToken;
+   struct expr *packPtr;
+   bool notDone = true;
+   bool salienceParsed = false, autoFocusParsed = false;
+
+   /*===========================*/
+   /* Next token must be a '('. */
+   /*===========================*/
+
+   SavePPBuffer(theEnv," ");
+
+   GetToken(theEnv,readSource,&theToken);
+   if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"declare statement");
+      *error = true;
+      return;
+     }
+
+   /*==========================================*/
+   /* Continue parsing until there are no more */
+   /* valid rule property declarations.        */
+   /*==========================================*/
+
+   while (notDone)
+     {
+      /*=============================================*/
+      /* The name of a rule property must be symbol. */
+      /*=============================================*/
+
+      GetToken(theEnv,readSource,&theToken);
+      if (theToken.tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"declare statement");
+         *error = true;
+        }
+
+      /*==============================================*/
+      /* Parse a salience declaration if encountered. */
+      /*==============================================*/
+
+      else if (strcmp(theToken.lexemeValue->contents,"salience") == 0)
+        {
+         if (salienceParsed)
+           {
+            AlreadyParsedErrorMessage(theEnv,"salience declaration",NULL);
+            *error = true;
+           }
+         else
+           {
+            ParseSalience(theEnv,readSource,ruleName,error);
+            salienceParsed = true;
+           }
+        }
+
+      /*=================================================*/
+      /* Parse an auto-focus declaration if encountered. */
+      /* A global flag is used to indicate if the        */
+      /* auto-focus feature for a rule was parsed.       */
+      /*=================================================*/
+
+      else if (strcmp(theToken.lexemeValue->contents,"auto-focus") == 0)
+        {
+         if (autoFocusParsed)
+           {
+            AlreadyParsedErrorMessage(theEnv,"auto-focus declaration",NULL);
+            *error = true;
+           }
+         else
+           {
+            ParseAutoFocus(theEnv,readSource,error);
+            autoFocusParsed = true;
+           }
+        }
+
+      /*==========================================*/
+      /* Otherwise the symbol does not correspond */
+      /* to a valid rule property.                */
+      /*==========================================*/
+
+      else
+        {
+         SyntaxErrorMessage(theEnv,"declare statement");
+         *error = true;
+        }
+
+      /*=====================================*/
+      /* Return if an error was encountered. */
+      /*=====================================*/
+
+      if (*error)
+        {
+         ReturnExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+         PatternData(theEnv)->SalienceExpression = NULL;
+         return;
+        }
+
+      /*=======================================*/
+      /* Both the salience and auto-focus rule */
+      /* properties are closed with a ')'.     */
+      /*=======================================*/
+
+      GetToken(theEnv,readSource,&theToken);
+      if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv," ");
+         SavePPBuffer(theEnv,theToken.printForm);
+         ReturnExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+         PatternData(theEnv)->SalienceExpression = NULL;
+         SyntaxErrorMessage(theEnv,"declare statement");
+         *error = true;
+         return;
+        }
+
+      /*=============================================*/
+      /* The declare statement is closed with a ')'. */
+      /*=============================================*/
+
+      GetToken(theEnv,readSource,&theToken);
+      if (theToken.tknType == RIGHT_PARENTHESIS_TOKEN) notDone = false;
+      else if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         ReturnExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+         PatternData(theEnv)->SalienceExpression = NULL;
+         SyntaxErrorMessage(theEnv,"declare statement");
+         *error = true;
+         return;
+        }
+      else
+        {
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv," (");
+        }
+     }
+
+   /*==========================================*/
+   /* Return the value of the salience through */
+   /* the global variable SalienceExpression.  */
+   /*==========================================*/
+
+   packPtr = PackExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+   ReturnExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+   PatternData(theEnv)->SalienceExpression = packPtr;
+   return;
+  }
+
+/************************************************************/
+/* ParseSalience: Parses the rest of a defrule salience     */
+/*   declaration once the salience keyword has been parsed. */
+/************************************************************/
+static void ParseSalience(
+  Environment *theEnv,
+  const char *readSource,
+  const char *ruleName,
+  bool *error)
+  {
+   int salience;
+   UDFValue salienceValue;
+
+   /*==============================*/
+   /* Get the salience expression. */
+   /*==============================*/
+
+   SavePPBuffer(theEnv," ");
+
+   PatternData(theEnv)->SalienceExpression = ParseAtomOrExpression(theEnv,readSource,NULL);
+   if (PatternData(theEnv)->SalienceExpression == NULL)
+     {
+      *error = true;
+      return;
+     }
+
+   /*============================================================*/
+   /* Evaluate the expression and determine if it is an integer. */
+   /*============================================================*/
+
+   SetEvaluationError(theEnv,false);
+   if (EvaluateExpression(theEnv,PatternData(theEnv)->SalienceExpression,&salienceValue))
+     {
+      SalienceInformationError(theEnv,"defrule",ruleName);
+      *error = true;
+      return;
+     }
+
+   if (salienceValue.header->type != INTEGER_TYPE)
+     {
+      SalienceNonIntegerError(theEnv);
+      *error = true;
+      return;
+     }
+
+   /*=======================================================*/
+   /* Salience number must be in the range -10000 to 10000. */
+   /*=======================================================*/
+
+   salience = (int) salienceValue.integerValue->contents;
+
+   if ((salience > MAX_DEFRULE_SALIENCE) || (salience < MIN_DEFRULE_SALIENCE))
+     {
+      SalienceRangeError(theEnv,MIN_DEFRULE_SALIENCE,MAX_DEFRULE_SALIENCE);
+      *error = true;
+      return;
+     }
+
+   /*==========================================*/
+   /* If the expression is a constant integer, */
+   /* don't bother storing the expression.     */
+   /*==========================================*/
+
+   if (PatternData(theEnv)->SalienceExpression->type == INTEGER_TYPE)
+     {
+      ReturnExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+      PatternData(theEnv)->SalienceExpression = NULL;
+     }
+
+   PatternData(theEnv)->GlobalSalience = salience;
+  }
+
+/**************************************************************/
+/* ParseAutoFocus: Parses the rest of a defrule auto-focus    */
+/*   declaration once the auto-focus keyword has been parsed. */
+/**************************************************************/
+static void ParseAutoFocus(
+  Environment *theEnv,
+  const char *readSource,
+  bool *error)
+  {
+   struct token theToken;
+
+   /*========================================*/
+   /* The auto-focus value must be a symbol. */
+   /*========================================*/
+
+   SavePPBuffer(theEnv," ");
+
+   GetToken(theEnv,readSource,&theToken);
+   if (theToken.tknType != SYMBOL_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"auto-focus statement");
+      *error = true;
+      return;
+     }
+
+   /*====================================================*/
+   /* The auto-focus value must be either TRUE or FALSE. */
+   /* If a valid value is parsed, then set the value of  */
+   /* the global variable GlobalAutoFocus.               */
+   /*====================================================*/
+
+   if (strcmp(theToken.lexemeValue->contents,"TRUE") == 0)
+     { PatternData(theEnv)->GlobalAutoFocus = true; }
+   else if (strcmp(theToken.lexemeValue->contents,"FALSE") == 0)
+     { PatternData(theEnv)->GlobalAutoFocus = false; }
+   else
+     {
+      SyntaxErrorMessage(theEnv,"auto-focus statement");
+      *error = true;
+     }
+  }
+
+/*****************************************************************/
+/* LHSPattern: Parses a single conditional element found on the  */
+/*   LHS of a rule. Conditonal element types include pattern CEs */
+/*   (which may be assigned to a variable), test CEs, not CEs,   */
+/*   logical CEs, and CEs, and or CEs.                           */
+/*                                                               */
+/* <conditional-element> ::= <pattern-CE> |                      */
+/*                           <assigned-pattern-CE> |             */
+/*                           <not-CE> | <and-CE> | <or-CE> |     */
+/*                           <logical-CE> | <test-CE> |          */
+/*                           <forall-CE> | <exists-CE>           */
+/*****************************************************************/
+static struct lhsParseNode *LHSPattern(
+  Environment *theEnv,
+  const char *readSource,
+  TokenType terminator,
+  const char *terminatorString,
+  bool *error,
+  bool allowDeclaration,
+  struct token *firstToken,
+  const char *ruleName)
+  {
+   struct token theToken;
+   struct lhsParseNode *theNode;
+
+   /*=========================================================*/
+   /* Check to see if the first token has already been read.  */
+   /* This should only occur for the first pattern in a rule. */
+   /*=========================================================*/
+
+   if (firstToken == NULL) GetToken(theEnv,readSource,&theToken);
+   else CopyToken(&theToken,firstToken);
+
+   /*=====================================================*/
+   /* A left parenthesis begins all CEs and declarations. */
+   /*=====================================================*/
+
+   if (theToken.tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      /*================================================*/
+      /* The first field of a pattern must be a symbol. */
+      /*================================================*/
+
+      GetToken(theEnv,readSource,&theToken);
+      if (theToken.tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"the first field of a pattern");
+         *error = true;
+         return NULL;
+        }
+
+      /*====================================*/
+      /* If this is the first CE of a rule, */
+      /* then a declare statement is valid. */
+      /*====================================*/
+
+      if (allowDeclaration &&
+          (strcmp(theToken.lexemeValue->contents,"declare") == 0))
+        {
+         if (ruleName == NULL) SystemError(theEnv,"RULELHS",1);
+         DeclarationParse(theEnv,readSource,ruleName,error);
+         theNode = NULL;
+        }
+
+      /*==================================*/
+      /* Otherwise check for a *test* CE. */
+      /*==================================*/
+
+      else if (strcmp(theToken.lexemeValue->contents,"test") == 0)
+        { theNode = TestPattern(theEnv,readSource,error); }
+
+      /*============================================*/
+      /* Otherwise check for an *and*, *or*, *not*, */
+      /* *logical*, *exists*, or *forall* CE.       */
+      /*============================================*/
+
+      else if ((strcmp(theToken.lexemeValue->contents,"and") == 0) ||
+               (strcmp(theToken.lexemeValue->contents,"logical") == 0) ||
+               (strcmp(theToken.lexemeValue->contents,"not") == 0) ||
+               (strcmp(theToken.lexemeValue->contents,"exists") == 0) ||
+               (strcmp(theToken.lexemeValue->contents,"forall") == 0) ||
+               (strcmp(theToken.lexemeValue->contents,"or") == 0))
+        { theNode = ConnectedPatternParse(theEnv,readSource,&theToken,error); }
+
+      /*=================================*/
+      /* Otherwise parse a *pattern* CE. */
+      /*=================================*/
+
+      else
+        { theNode = SimplePatternParse(theEnv,readSource,&theToken,error); }
+     }
+
+   /*=======================================*/
+   /* Check for a pattern address variable. */
+   /*=======================================*/
+
+   else if (theToken.tknType == SF_VARIABLE_TOKEN)
+     { theNode = AssignmentParse(theEnv,readSource,theToken.lexemeValue,error); }
+
+   /*=================================================*/
+   /* Check for the group terminator (either a "=>"   */
+   /* separating the LHS from the RHS or a ")" ending */
+   /* a CE containing other CEs such as an *and* CE). */
+   /*=================================================*/
+
+   else if ((theToken.tknType == terminator) ?
+            (strcmp(theToken.printForm,terminatorString) == 0) : false)
+     { return NULL;  }
+
+   /*====================================*/
+   /* Otherwise invalid syntax was used. */
+   /*====================================*/
+
+   else
+     {
+      SyntaxErrorMessage(theEnv,"defrule");
+      *error = true;
+      return NULL;
+     }
+
+   /*================================*/
+   /* If an error occurred, free any */
+   /* allocated data structures.     */
+   /*================================*/
+
+   if (*error == true)
+     {
+      ReturnLHSParseNodes(theEnv,theNode);
+      return NULL;
+     }
+
+   /*=========================*/
+   /* Return the LHS pattern. */
+   /*=========================*/
+
+   return(theNode);
+  }
+
+/*********************************************************************/
+/* ConnectedPatternParse:  Handles parsing of the connected          */
+/*   conditional elements (i.e. those conditional elements that may  */
+/*   contain one or more other conditional elements).  The connected */
+/*   conditional elements include the *and*, *or*, *not*, *logical*, */
+/*   *exists*, and *forall* CEs. This routine is entered with the    */
+/*   parsing pointing to the name of the connected CE. It is exited  */
+/*   with the parser pointing to the closing right parenthesis of    */
+/*   the connected CE.                                               */
+/*                                                                   */
+/* <and-CE>      ::= (and <conditional-element>+)                    */
+/*                                                                   */
+/* <or-CE>       ::= (or <conditional-element>+)                     */
+/*                                                                   */
+/* <logical-CE>  ::= (logical <conditional-element>+)                */
+/*                                                                   */
+/* <not-CE>      ::= (not <conditional-element>)                     */
+/*                                                                   */
+/* <exists-CE>   ::= (exists <conditional-element>+)                 */
+/*                                                                   */
+/* <forall-CE>   ::= (forall <conditional-element>                   */
+/*                           <conditional-element>+)                 */
+/*********************************************************************/
+static struct lhsParseNode *ConnectedPatternParse(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  bool *error)
+  {
+   ParseNodeType connectorValue = AND_CE_NODE;
+   struct lhsParseNode *theNode, *tempNode, *theGroup;
+   const char *errorCE = NULL;
+   bool logical = false;
+   bool tempValue;
+
+   /*==========================================================*/
+   /* Use appropriate spacing for pretty printing of the rule. */
+   /*==========================================================*/
+
+   IncrementIndentDepth(theEnv,5);
+   if (strcmp(theToken->lexemeValue->contents,"or") == 0)
+     {
+      connectorValue = OR_CE_NODE;
+      errorCE = "the or conditional element";
+      SavePPBuffer(theEnv,"  ");
+     }
+   else if (strcmp(theToken->lexemeValue->contents,"and") == 0)
+     {
+      connectorValue = AND_CE_NODE;
+      errorCE = "the and conditional element";
+      SavePPBuffer(theEnv," ");
+     }
+   else if (strcmp(theToken->lexemeValue->contents,"not") == 0)
+     {
+      connectorValue = NOT_CE_NODE;
+      errorCE = "the not conditional element";
+      SavePPBuffer(theEnv," ");
+     }
+   else if (strcmp(theToken->lexemeValue->contents,"exists") == 0)
+     {
+      connectorValue = EXISTS_CE_NODE;
+      errorCE = "the exists conditional element";
+      PPCRAndIndent(theEnv);
+     }
+   else if (strcmp(theToken->lexemeValue->contents,"forall") == 0)
+     {
+      connectorValue = FORALL_CE_NODE;
+      errorCE = "the forall conditional element";
+      PPCRAndIndent(theEnv);
+     }
+   else if (strcmp(theToken->lexemeValue->contents,"logical") == 0)
+     {
+      connectorValue = AND_CE_NODE;
+      errorCE = "the logical conditional element";
+      logical = true;
+      PPCRAndIndent(theEnv);
+     }
+
+   /*=====================================================*/
+   /* The logical CE cannot be contained within a not CE. */
+   /*=====================================================*/
+
+   if (PatternData(theEnv)->WithinNotCE && logical)
+     {
+      PrintErrorID(theEnv,"RULELHS",1,true);
+      WriteString(theEnv,STDERR,"The logical CE cannot be used within a not/exists/forall CE.\n");
+      *error = true;
+      return NULL;
+     }
+
+   /*=====================================================*/
+   /* Remember if we're currently within a *not* CE and   */
+   /* then check to see if we're entering a new *not* CE. */
+   /*=====================================================*/
+
+   tempValue = PatternData(theEnv)->WithinNotCE;
+   if ((connectorValue == NOT_CE_NODE) ||
+       (connectorValue == EXISTS_CE_NODE) ||
+       (connectorValue == FORALL_CE_NODE))
+     { PatternData(theEnv)->WithinNotCE = true; }
+
+   /*===========================================*/
+   /* Parse all of the CEs contained with the   */
+   /* CE. A ) will terminate the end of the CE. */
+   /*===========================================*/
+
+   theGroup = GroupPatterns(theEnv,readSource,RIGHT_PARENTHESIS_TOKEN,")",error);
+
+   /*====================================*/
+   /* Restore the "with a *not* CE" flag */
+   /* and reset the indentation depth.   */
+   /*====================================*/
+
+   PatternData(theEnv)->WithinNotCE = tempValue;
+   DecrementIndentDepth(theEnv,5);
+
+   /*============================================*/
+   /* If an error occured while parsing, return. */
+   /*============================================*/
+
+   if (*error == true)
+     {
+      ReturnLHSParseNodes(theEnv,theGroup);
+      return NULL;
+     }
+
+   /*=========================================================*/
+   /* If we parsed a *logical* CE, then mark the logical flag */
+   /* for all of the CEs contained within the logical CE.     */
+   /*=========================================================*/
+
+   if (logical) TagLHSLogicalNodes(theGroup);
+
+   /*=====================================================*/
+   /* All the connected CEs must contain at least one CE. */
+   /*=====================================================*/
+
+   if (theGroup == NULL)
+     {
+      SyntaxErrorMessage(theEnv,errorCE);
+      *error = true;
+      return NULL;
+     }
+
+   /*============================================*/
+   /* A not CE may not contain more than one CE. */
+   /*============================================*/
+
+   if ((connectorValue == NOT_CE_NODE) && (theGroup->bottom != NULL))
+     {
+      SyntaxErrorMessage(theEnv,errorCE);
+      ReturnLHSParseNodes(theEnv,theGroup);
+      *error = true;
+      return NULL;
+     }
+
+   /*============================================*/
+   /* A forall CE must contain at least two CEs. */
+   /*============================================*/
+
+   if ((connectorValue == FORALL_CE_NODE) && (theGroup->bottom == NULL))
+     {
+      SyntaxErrorMessage(theEnv,errorCE);
+      ReturnLHSParseNodes(theEnv,theGroup);
+      *error = true;
+      return NULL;
+     }
+
+   /*========================================================*/
+   /* Remove an "and" and "or" CE that only contains one CE. */
+   /*========================================================*/
+
+   if (((connectorValue == AND_CE_NODE) || (connectorValue == OR_CE_NODE)) &&
+       (theGroup->bottom == NULL))
+     {
+      theGroup->logical = logical;
+      return(theGroup);
+     }
+
+   /*===========================================================*/
+   /* Create the top most node which connects the CEs together. */
+   /*===========================================================*/
+
+   theNode = GetLHSParseNode(theEnv);
+   theNode->logical = logical;
+
+   /*======================================================*/
+   /* Attach and/or/not CEs directly to the top most node. */
+   /*======================================================*/
+
+   if ((connectorValue == AND_CE_NODE) ||
+       (connectorValue == OR_CE_NODE) ||
+       (connectorValue == NOT_CE_NODE))
+     {
+      theNode->pnType = connectorValue;
+      theNode->right = theGroup;
+     }
+
+   /*=================================================================*/
+   /* Wrap two not CEs around the patterns contained in an exists CE. */
+   /*=================================================================*/
+
+   else if (connectorValue == EXISTS_CE_NODE)
+     {
+      theNode->pnType = NOT_CE_NODE;
+
+      theNode->right = GetLHSParseNode(theEnv);
+      theNode->right->pnType = NOT_CE_NODE;
+      theNode->right->logical = logical;
+
+      if (theGroup->bottom != NULL)
+        {
+         theNode->right->right = GetLHSParseNode(theEnv);
+         theNode->right->right->pnType = AND_CE_NODE;
+         theNode->right->right->logical = logical;
+         theNode->right->right->right = theGroup;
+        }
+      else
+        { theNode->right->right = theGroup; }
+     }
+
+   /*==================================================*/
+   /* For a forall CE, wrap a not CE around all of the */
+   /* CEs and a not CE around the 2nd through nth CEs. */
+   /*==================================================*/
+
+   else if (connectorValue == FORALL_CE_NODE)
+     {
+      theNode->pnType = NOT_CE_NODE;
+
+      tempNode = theGroup->bottom;
+      theGroup->bottom = NULL;
+
+      theNode->right = GetLHSParseNode(theEnv);
+      theNode->right->pnType = AND_CE_NODE;
+      theNode->right->logical = logical;
+      theNode->right->right = theGroup;
+
+      theGroup = tempNode;
+
+      theNode->right->right->bottom = GetLHSParseNode(theEnv);
+      theNode->right->right->bottom->pnType = NOT_CE_NODE;
+      theNode->right->right->bottom->logical = logical;
+
+      tempNode = theNode->right->right->bottom;
+
+      if (theGroup->bottom == NULL)
+        { tempNode->right = theGroup; }
+      else
+        {
+         tempNode->right = GetLHSParseNode(theEnv);
+         tempNode->right->pnType = AND_CE_NODE;
+         tempNode->right->logical = logical;
+         tempNode->right->right = theGroup;
+        }
+     }
+
+   /*================*/
+   /* Return the CE. */
+   /*================*/
+
+   return(theNode);
+  }
+
+/***********************************************/
+/* GroupPatterns: Groups a series of connected */
+/*   conditional elements together.            */
+/***********************************************/
+static struct lhsParseNode *GroupPatterns(
+  Environment *theEnv,
+  const char *readSource,
+  TokenType terminator,
+  const char *terminatorString,
+  bool *error)
+  {
+   struct lhsParseNode *lastNode, *newNode, *theNode;
+
+   lastNode = theNode = NULL;
+
+   while (true)
+     {
+      /*==================*/
+      /* Get the next CE. */
+      /*==================*/
+
+      newNode = LHSPattern(theEnv,readSource,terminator,terminatorString,
+                           error,false,NULL,NULL);
+
+      /*=======================================================*/
+      /* If an error occurred, release any LHS data structures */
+      /* previously allocated by this routine.                 */
+      /*=======================================================*/
+
+      if (*error)
+        {
+         ReturnLHSParseNodes(theEnv,theNode);
+         return NULL;
+        }
+
+      /*===============================================*/
+      /* A NULL value for the CE just parsed indicates */
+      /* that the terminator for the group of patterns */
+      /* was encountered (either a "=>" or a ")".      */
+      /*===============================================*/
+
+      if (newNode == NULL)
+        {
+         PPBackup(theEnv);
+         PPBackup(theEnv);
+         if (terminator == RIGHT_PARENTHESIS_TOKEN)
+           { SavePPBuffer(theEnv,terminatorString); }
+         else
+           {
+            PPCRAndIndent(theEnv);
+            SavePPBuffer(theEnv,terminatorString);
+           }
+
+         return(theNode);
+        }
+
+      /*============================*/
+      /* Add the new CE to the list */
+      /* of CEs being grouped.      */
+      /*============================*/
+
+      if (lastNode == NULL)
+        { theNode = newNode; }
+      else
+        { lastNode->bottom = newNode; }
+
+      lastNode = newNode;
+
+      /*======================================*/
+      /* Fix the pretty print representation. */
+      /*======================================*/
+
+      PPCRAndIndent(theEnv);
+     }
+  }
+
+/**************************************************************/
+/* TestPattern: Handles parsing of test conditional elements. */
+/*                                                            */
+/* <test-CE> ::= (test <function-call>)                       */
+/**************************************************************/
+static struct lhsParseNode *TestPattern(
+  Environment *theEnv,
+  const char *readSource,
+  bool *error)
+  {
+   struct lhsParseNode *theNode;
+   struct token theToken;
+   struct expr *theExpression;
+
+   /*================================================*/
+   /* Create the data specification for the test CE. */
+   /*================================================*/
+
+   SavePPBuffer(theEnv," ");
+   theNode = GetLHSParseNode(theEnv);
+   theNode->pnType = TEST_CE_NODE;
+   theExpression = Function0Parse(theEnv,readSource);
+   theNode->expression = ExpressionToLHSParseNodes(theEnv,theExpression);
+   ReturnExpression(theEnv,theExpression);
+
+   if (theNode->expression == NULL)
+     {
+      *error = true;
+      ReturnLHSParseNodes(theEnv,theNode);
+      return NULL;
+     }
+
+   /*=========================================================*/
+   /* Check for the closing right parenthesis of the test CE. */
+   /*=========================================================*/
+
+   GetToken(theEnv,readSource,&theToken);
+   if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"test conditional element");
+      *error = true;
+      ReturnLHSParseNodes(theEnv,theNode);
+      return NULL;
+     }
+
+   /*=====================*/
+   /* Return the test CE. */
+   /*=====================*/
+
+   return(theNode);
+  }
+
+/****************************************************************/
+/* AssignmentParse: Finishes the parsing of pattern conditional */
+/*   elements that have been bound to a  variable.              */
+/*                                                              */
+/* <assigned-pattern-CE> ::= ?<variable-symbol> <- <pattern-CE> */
+/****************************************************************/
+static struct lhsParseNode *AssignmentParse(
+  Environment *theEnv,
+  const char *readSource,
+  CLIPSLexeme *factAddress,
+  bool *error)
+  {
+   struct lhsParseNode *theNode;
+   struct token theToken;
+
+   /*=====================================================*/
+   /* Patterns cannot be bound if they are with a not CE. */
+   /*=====================================================*/
+
+   if (PatternData(theEnv)->WithinNotCE)
+     {
+      PrintErrorID(theEnv,"RULELHS",2,true);
+      WriteString(theEnv,STDERR,"A pattern CE cannot be bound to a pattern-address within a not CE\n");
+      *error = true;
+      return NULL;
+     }
+
+   /*===============================================*/
+   /* Check for binder token, "<-", after variable. */
+   /*===============================================*/
+
+   SavePPBuffer(theEnv," ");
+
+   GetToken(theEnv,readSource,&theToken);
+
+   if ((theToken.tknType == SYMBOL_TOKEN) ? (strcmp(theToken.lexemeValue->contents,"<-") != 0) :
+                                   true)
+     {
+      SyntaxErrorMessage(theEnv,"binding patterns");
+      *error = true;
+      return NULL;
+     }
+
+   SavePPBuffer(theEnv," ");
+
+   /*================================================*/
+   /* Check for opening left parenthesis of pattern. */
+   /*================================================*/
+
+   GetToken(theEnv,readSource,&theToken);
+   if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"binding patterns");
+      *error = true;
+      return NULL;
+     }
+
+   /*======================================================*/
+   /* Parse the pattern and return the data specification. */
+   /*======================================================*/
+
+   GetToken(theEnv,readSource,&theToken);
+
+   theNode = SimplePatternParse(theEnv,readSource,&theToken,error);
+
+   if (*error == true)
+     {
+      ReturnLHSParseNodes(theEnv,theNode);
+      return NULL;
+     }
+
+   /*=============================================*/
+   /* Store the name of the variable to which the */
+   /* pattern is bound and return the pattern.    */
+   /*=============================================*/
+
+   theNode->value = factAddress;
+   return(theNode);
+  }
+
+/************************************************************/
+/* TagLHSLogicalNodes: Marks all *and*, *or*, and *not* CEs */
+/*   contained within a logical CE as having the properties */
+/*   associated with a logical CE.                          */
+/************************************************************/
+static void TagLHSLogicalNodes(
+  struct lhsParseNode *nodePtr)
+  {
+   while (nodePtr != NULL)
+     {
+      nodePtr->logical = true;
+      if ((nodePtr->pnType == AND_CE_NODE) ||
+          (nodePtr->pnType == OR_CE_NODE) ||
+          (nodePtr->pnType == NOT_CE_NODE))
+        { TagLHSLogicalNodes(nodePtr->right); }
+      nodePtr = nodePtr->bottom;
+     }
+  }
+
+/***********************************************************/
+/* SimplePatternParse: Parses a simple pattern (an opening */
+/*   parenthesis followed by one or more fields followed   */
+/*   by a closing parenthesis).                            */
+/*                                                         */
+/* <pattern-CE> ::= <ordered-pattern-CE> |                 */
+/*                  <template-pattern-CE>                  */
+/***********************************************************/
+static struct lhsParseNode *SimplePatternParse(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  bool *error)
+  {
+   struct lhsParseNode *theNode;
+   struct patternParser *tempParser;
+
+   /*=================================================*/
+   /* The first field of a pattern must be a symbol.  */
+   /* In addition, the symbols ":" and "=" can not    */
+   /* be used because they have special significance. */
+   /*=================================================*/
+
+   if (theToken->tknType != SYMBOL_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"the first field of a pattern");
+      *error = true;
+      return NULL;
+     }
+   else if ((strcmp(theToken->lexemeValue->contents,"=") == 0) ||
+            (strcmp(theToken->lexemeValue->contents,":") == 0))
+     {
+      SyntaxErrorMessage(theEnv,"the field field of a pattern");
+      *error = true;
+      return NULL;
+     }
+
+   /*===============================================*/
+   /* Construct the topmost node of the pattern CE. */
+   /*===============================================*/
+
+   theNode = GetLHSParseNode(theEnv);
+   theNode->pnType = PATTERN_CE_NODE;
+   theNode->negated = false;
+   theNode->exists = false;
+
+   /*======================================================*/
+   /* Search for a pattern parser that claims the pattern. */
+   /*======================================================*/
+
+   for (tempParser = PatternData(theEnv)->ListOfPatternParsers;
+        tempParser != NULL;
+        tempParser = tempParser->next)
+     {
+      if ((*tempParser->recognizeFunction)(theToken->lexemeValue))
+        {
+         theNode->patternType = tempParser;
+         theNode->right = (*tempParser->parseFunction)(theEnv,readSource,theToken);
+         if (theNode->right == NULL)
+           {
+            *error = true;
+            ReturnLHSParseNodes(theEnv,theNode);
+            return NULL;
+           }
+
+         PropagatePatternType(theNode,tempParser);
+         return(theNode);
+        }
+     }
+
+   /*=================================*/
+   /* If a pattern parser couldn't be */
+   /* found, then signal an error.    */
+   /*=================================*/
+
+   *error = true;
+   SyntaxErrorMessage(theEnv,"the field field of a pattern");
+   ReturnLHSParseNodes(theEnv,theNode);
+   return NULL;
+  }
+
+/**************************************************************/
+/* PropagatePatternType: Sets the selfPattern field for all   */
+/*   lhsParseNodes in a linked list of those data structures. */
+/**************************************************************/
+void PropagatePatternType(
+  struct lhsParseNode *theLHS,
+  struct patternParser *theParser)
+  {
+   while (theLHS != NULL)
+     {
+      theLHS->patternType = theParser;
+      if (theLHS->right != NULL) PropagatePatternType(theLHS->right,theParser);
+      if (theLHS->expression != NULL) PropagatePatternType(theLHS->expression,theParser);
+      theLHS = theLHS->bottom;
+     }
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) &&  DEFRULE_CONSTRUCT */
+
+
diff --git a/clips/rulelhs.h b/clips/rulelhs.h
new file mode 100755
index 000000000..959cbc0c4
--- /dev/null
+++ b/clips/rulelhs.h
@@ -0,0 +1,52 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*           DEFRULE LHS PARSING HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Coordinates parsing of the LHS conditional       */
+/*   elements of a rule.                                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_rulelhs
+
+#pragma once
+
+#define _H_rulelhs
+
+#include "expressn.h"
+#include "pattern.h"
+#include "reorder.h"
+#include "scanner.h"
+
+struct lhsParseNode           *ParseRuleLHS(Environment *,const char *,struct token *,const char *,bool *);
+void                           PropagatePatternType(struct lhsParseNode *,struct patternParser *);
+
+#endif
+
+
+
+
diff --git a/clips/rulepsr.c b/clips/rulepsr.c
new file mode 100755
index 000000000..b7617e4dc
--- /dev/null
+++ b/clips/rulepsr.c
@@ -0,0 +1,1070 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  06/28/17             */
+   /*                                                     */
+   /*                 RULE PARSING MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:  Parses a defrule construct.                     */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE, INCREMENTAL_RESET,   */
+/*            and LOGICAL_DEPENDENCIES compilation flags.    */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.31: DR#882 Logical retraction not working if       */
+/*            logical CE starts with test CE.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFRULE_CONSTRUCT
+
+#include <stdio.h>
+#include <string.h>
+
+#include "analysis.h"
+#include "constant.h"
+#include "constrct.h"
+#include "cstrcpsr.h"
+#include "cstrnchk.h"
+#include "cstrnops.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "incrrset.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pattern.h"
+#include "prccode.h"
+#include "prcdrpsr.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "rulebld.h"
+#include "rulebsc.h"
+#include "rulecstr.h"
+#include "ruledef.h"
+#include "ruledlt.h"
+#include "rulelhs.h"
+#include "scanner.h"
+#include "symbol.h"
+#include "watch.h"
+
+#include "lgcldpnd.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+#include "tmpltfun.h"
+#endif
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+
+#include "rulepsr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static struct expr            *ParseRuleRHS(Environment *,const char *);
+   static int                     ReplaceRHSVariable(Environment *,struct expr *,void *);
+   static Defrule                *ProcessRuleLHS(Environment *,struct lhsParseNode *,struct expr *,CLIPSLexeme *,bool *);
+   static Defrule                *CreateNewDisjunct(Environment *,CLIPSLexeme *,unsigned short,struct expr *,
+                                                    unsigned int,unsigned,struct joinNode *);
+   static unsigned short          RuleComplexity(Environment *,struct lhsParseNode *);
+   static unsigned short          ExpressionComplexity(Environment *,struct expr *);
+   static int                     LogicalAnalysis(Environment *,struct lhsParseNode *);
+   static void                    AddToDefruleList(Defrule *);
+#endif
+
+/****************************************************/
+/* ParseDefrule: Coordinates all actions necessary  */
+/*   for the parsing and creation of a defrule into */
+/*   the current environment.                       */
+/****************************************************/
+bool ParseDefrule(
+  Environment *theEnv,
+  const char *readSource)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   CLIPSLexeme *ruleName;
+   struct lhsParseNode *theLHS;
+   struct expr *actions;
+   struct token theToken;
+   Defrule *topDisjunct, *tempPtr;
+   struct defruleModule *theModuleItem;
+   bool error;
+
+   /*================================================*/
+   /* Flush the buffer which stores the pretty print */
+   /* representation for a rule.  Add the already    */
+   /* parsed keyword defrule to this buffer.         */
+   /*================================================*/
+
+   SetPPBufferStatus(theEnv,true);
+   FlushPPBuffer(theEnv);
+   SavePPBuffer(theEnv,"(defrule ");
+
+   /*=========================================================*/
+   /* Rules cannot be loaded when a binary load is in effect. */
+   /*=========================================================*/
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv) == true) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"defrule");
+      return true;
+     }
+#endif
+
+   /*================================================*/
+   /* Parse the name and comment fields of the rule, */
+   /* deleting the rule if it already exists.        */
+   /*================================================*/
+
+#if DEBUGGING_FUNCTIONS
+   DefruleData(theEnv)->DeletedRuleDebugFlags = 0;
+#endif
+
+   ruleName = GetConstructNameAndComment(theEnv,readSource,&theToken,"defrule",
+                                         (FindConstructFunction *) FindDefruleInModule,
+                                         (DeleteConstructFunction *) Undefrule,
+                                         "*",false,
+                                         true,true,false);
+
+   if (ruleName == NULL) return true;
+
+   /*============================*/
+   /* Parse the LHS of the rule. */
+   /*============================*/
+
+   theLHS = ParseRuleLHS(theEnv,readSource,&theToken,ruleName->contents,&error);
+   if (error)
+     {
+      ReturnPackedExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+      PatternData(theEnv)->SalienceExpression = NULL;
+      return true;
+     }
+
+   /*============================*/
+   /* Parse the RHS of the rule. */
+   /*============================*/
+
+   ClearParsedBindNames(theEnv);
+   ExpressionData(theEnv)->ReturnContext = true;
+   actions = ParseRuleRHS(theEnv,readSource);
+
+   if (actions == NULL)
+     {
+      ReturnPackedExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+      PatternData(theEnv)->SalienceExpression = NULL;
+      ReturnLHSParseNodes(theEnv,theLHS);
+      return true;
+     }
+
+   /*=======================*/
+   /* Process the rule LHS. */
+   /*=======================*/
+
+   topDisjunct = ProcessRuleLHS(theEnv,theLHS,actions,ruleName,&error);
+
+   ReturnExpression(theEnv,actions);
+   ClearParsedBindNames(theEnv);
+   ReturnLHSParseNodes(theEnv,theLHS);
+
+   if (error)
+     {
+      ReturnPackedExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+      PatternData(theEnv)->SalienceExpression = NULL;
+      return true;
+     }
+
+   /*==============================================*/
+   /* If we're only checking syntax, don't add the */
+   /* successfully parsed defrule to the KB.       */
+   /*==============================================*/
+
+   if (ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      ReturnPackedExpression(theEnv,PatternData(theEnv)->SalienceExpression);
+      PatternData(theEnv)->SalienceExpression = NULL;
+      return false;
+     }
+
+   PatternData(theEnv)->SalienceExpression = NULL;
+
+   /*======================================*/
+   /* Save the nice printout of the rules. */
+   /*======================================*/
+
+   SavePPBuffer(theEnv,"\n");
+   if (GetConserveMemory(theEnv) == true)
+     { topDisjunct->header.ppForm = NULL; }
+   else
+     { topDisjunct->header.ppForm = CopyPPBuffer(theEnv); }
+
+   /*=======================================*/
+   /* Store a pointer to the rule's module. */
+   /*=======================================*/
+
+   theModuleItem = (struct defruleModule *)
+                   GetModuleItem(theEnv,NULL,FindModuleItem(theEnv,"defrule")->moduleIndex);
+
+   for (tempPtr = topDisjunct; tempPtr != NULL; tempPtr = tempPtr->disjunct)
+     {
+      tempPtr->header.whichModule = (struct defmoduleItemHeader *) theModuleItem;
+      tempPtr->header.ppForm = topDisjunct->header.ppForm;
+     }
+
+   /*===============================================*/
+   /* Rule completely parsed. Add to list of rules. */
+   /*===============================================*/
+
+   AddToDefruleList(topDisjunct);
+
+   /*========================================================================*/
+   /* If a rule is redefined, then we want to restore its breakpoint status. */
+   /*========================================================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if (BitwiseTest(DefruleData(theEnv)->DeletedRuleDebugFlags,0))
+     { SetBreak(topDisjunct); }
+   if (BitwiseTest(DefruleData(theEnv)->DeletedRuleDebugFlags,1) ||
+       (GetWatchItem(theEnv,"activations") == 1))
+     { DefruleSetWatchActivations(topDisjunct,true); }
+   if (BitwiseTest(DefruleData(theEnv)->DeletedRuleDebugFlags,2) ||
+       (GetWatchItem(theEnv,"rules") == 1))
+     { DefruleSetWatchFirings(topDisjunct,true); }
+#endif
+
+   /*================================*/
+   /* Perform the incremental reset. */
+   /*================================*/
+
+   IncrementalReset(theEnv,topDisjunct);
+
+   /*=============================================*/
+   /* Return false to indicate no errors occured. */
+   /*=============================================*/
+
+#endif
+   return false;
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/**************************************************************/
+/* ProcessRuleLHS: Processes each of the disjuncts of a rule. */
+/**************************************************************/
+static Defrule *ProcessRuleLHS(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS,
+  struct expr *actions,
+  CLIPSLexeme *ruleName,
+  bool *error)
+  {
+   struct lhsParseNode *tempNode = NULL;
+   Defrule *topDisjunct = NULL, *currentDisjunct, *lastDisjunct = NULL;
+   struct expr *newActions, *packPtr;
+   int logicalJoin;
+   unsigned short localVarCnt;
+   unsigned short complexity;
+   struct joinNode *lastJoin;
+   bool emptyLHS;
+
+   /*================================================*/
+   /* Initially set the parsing error flag to false. */
+   /*================================================*/
+
+   *error = false;
+
+   /*===========================================================*/
+   /* The top level of the construct representing the LHS of a  */
+   /* rule is assumed to be an OR.  If the implied OR is at the */
+   /* top level of the pattern construct, then remove it.       */
+   /*===========================================================*/
+
+   if (theLHS == NULL)
+     { emptyLHS = true; }
+   else
+     {
+      emptyLHS = false;
+      if (theLHS->pnType == OR_CE_NODE) theLHS = theLHS->right;
+     }
+
+   /*=========================================*/
+   /* Loop through each disjunct of the rule. */
+   /*=========================================*/
+
+   localVarCnt = CountParsedBindNames(theEnv);
+
+   while ((theLHS != NULL) || (emptyLHS == true))
+     {
+      /*===================================*/
+      /* Analyze the LHS of this disjunct. */
+      /*===================================*/
+
+      if (emptyLHS)
+        { tempNode = NULL; }
+      else
+        {
+         if (theLHS->pnType == AND_CE_NODE) tempNode = theLHS->right;
+         else if (theLHS->pnType == PATTERN_CE_NODE) tempNode = theLHS;
+        }
+
+      if (VariableAnalysis(theEnv,tempNode))
+        {
+         *error = true;
+         ReturnDefrule(theEnv,topDisjunct);
+         return NULL;
+        }
+
+      /*=========================================*/
+      /* Perform entity dependent post analysis. */
+      /*=========================================*/
+
+      if (PostPatternAnalysis(theEnv,tempNode))
+        {
+         *error = true;
+         ReturnDefrule(theEnv,topDisjunct);
+         return NULL;
+        }
+
+      /*========================================================*/
+      /* Print out developer information if it's being watched. */
+      /*========================================================*/
+
+#if DEVELOPER && DEBUGGING_FUNCTIONS
+      if (GetWatchItem(theEnv,"rule-analysis") == 1)
+        { DumpRuleAnalysis(theEnv,tempNode); }
+#endif
+
+      /*======================================================*/
+      /* Check to see if there are any RHS constraint errors. */
+      /*======================================================*/
+
+      if (CheckRHSForConstraintErrors(theEnv,actions,tempNode))
+        {
+         *error = true;
+         ReturnDefrule(theEnv,topDisjunct);
+         return NULL;
+        }
+        
+      /*=================================================*/
+      /* Replace variable references in the RHS with the */
+      /* appropriate variable retrieval functions.       */
+      /*=================================================*/
+
+      newActions = CopyExpression(theEnv,actions);
+      if (ReplaceProcVars(theEnv,"RHS of defrule",newActions,NULL,NULL,
+                          ReplaceRHSVariable,tempNode))
+        {
+         *error = true;
+         ReturnDefrule(theEnv,topDisjunct);
+         ReturnExpression(theEnv,newActions);
+         return NULL;
+        }
+
+      /*===================================================*/
+      /* Remove any test CEs from the LHS and attach their */
+      /* expression to the closest preceeding non-negated  */
+      /* join at the same not/and depth.                   */
+      /*===================================================*/
+
+      AttachTestCEsToPatternCEs(theEnv,tempNode);
+
+      /*========================================*/
+      /* Check to see that logical CEs are used */
+      /* appropriately in the LHS of the rule.  */
+      /*========================================*/
+
+      if ((logicalJoin = LogicalAnalysis(theEnv,tempNode)) < 0)
+        {
+         *error = true;
+         ReturnDefrule(theEnv,topDisjunct);
+         ReturnExpression(theEnv,newActions);
+         return NULL;
+        }
+
+      /*==================================*/
+      /* We're finished for this disjunct */
+      /* if we're only checking syntax.   */
+      /*==================================*/
+
+      if (ConstructData(theEnv)->CheckSyntaxMode)
+        {
+         ReturnExpression(theEnv,newActions);
+         if (emptyLHS)
+           { emptyLHS = false; }
+         else
+           { theLHS = theLHS->bottom; }
+         continue;
+        }
+
+      /*=================================*/
+      /* Install the disjunct's actions. */
+      /*=================================*/
+
+      ExpressionInstall(theEnv,newActions);
+      packPtr = PackExpression(theEnv,newActions);
+      ReturnExpression(theEnv,newActions);
+
+      /*===============================================================*/
+      /* Create the pattern and join data structures for the new rule. */
+      /*===============================================================*/
+
+      lastJoin = ConstructJoins(theEnv,logicalJoin,tempNode,1,NULL,true,true);
+
+      /*===================================================================*/
+      /* Determine the rule's complexity for use with conflict resolution. */
+      /*===================================================================*/
+
+      complexity = RuleComplexity(theEnv,tempNode);
+
+      /*=====================================================*/
+      /* Create the defrule data structure for this disjunct */
+      /* and put it in the list of disjuncts for this rule.  */
+      /*=====================================================*/
+
+      currentDisjunct = CreateNewDisjunct(theEnv,ruleName,localVarCnt,packPtr,complexity,
+                                          (unsigned) logicalJoin,lastJoin);
+
+      /*============================================================*/
+      /* Place the disjunct in the list of disjuncts for this rule. */
+      /* If the disjunct is the first disjunct, then increment the  */
+      /* reference counts for the dynamic salience (the expression  */
+      /* for the dynamic salience is only stored with the first     */
+      /* disjuncts and the other disjuncts refer back to the first  */
+      /* disjunct for their dynamic salience value.                 */
+      /*============================================================*/
+
+      if (topDisjunct == NULL)
+        {
+         topDisjunct = currentDisjunct;
+         ExpressionInstall(theEnv,topDisjunct->dynamicSalience);
+        }
+      else lastDisjunct->disjunct = currentDisjunct;
+
+      /*===========================================*/
+      /* Move on to the next disjunct of the rule. */
+      /*===========================================*/
+
+      lastDisjunct = currentDisjunct;
+
+      if (emptyLHS)
+        { emptyLHS = false; }
+      else
+        { theLHS = theLHS->bottom; }
+     }
+
+   return(topDisjunct);
+  }
+
+/************************************************************************/
+/* CreateNewDisjunct: Creates and initializes a defrule data structure. */
+/************************************************************************/
+static Defrule *CreateNewDisjunct(
+  Environment *theEnv,
+  CLIPSLexeme *ruleName,
+  unsigned short localVarCnt,
+  struct expr *theActions,
+  unsigned int complexity,
+  unsigned logicalJoin,
+  struct joinNode *lastJoin)
+  {
+   struct joinNode *tempJoin;
+   Defrule *newDisjunct;
+
+   /*===================================================*/
+   /* Create and initialize the defrule data structure. */
+   /*===================================================*/
+
+   newDisjunct = get_struct(theEnv,defrule);
+   newDisjunct->header.ppForm = NULL;
+   newDisjunct->header.next = NULL;
+   newDisjunct->header.usrData = NULL;
+   newDisjunct->logicalJoin = NULL;
+   newDisjunct->disjunct = NULL;
+   newDisjunct->header.constructType = DEFRULE;
+   newDisjunct->header.env = theEnv;
+   newDisjunct->header.name = ruleName;
+   IncrementLexemeCount(newDisjunct->header.name);
+   newDisjunct->actions = theActions;
+   newDisjunct->salience = PatternData(theEnv)->GlobalSalience;
+   newDisjunct->afterBreakpoint = 0;
+   newDisjunct->watchActivation = 0;
+   newDisjunct->watchFiring = 0;
+   newDisjunct->executing = 0;
+   newDisjunct->complexity = complexity;
+   newDisjunct->autoFocus = PatternData(theEnv)->GlobalAutoFocus;
+   newDisjunct->dynamicSalience = PatternData(theEnv)->SalienceExpression;
+   newDisjunct->localVarCnt = localVarCnt;
+
+   /*=====================================*/
+   /* Add a pointer to the rule's module. */
+   /*=====================================*/
+
+   newDisjunct->header.whichModule =
+      (struct defmoduleItemHeader *)
+      GetModuleItem(theEnv,NULL,FindModuleItem(theEnv,"defrule")->moduleIndex);
+
+   /*============================================================*/
+   /* Attach the rule's last join to the defrule data structure. */
+   /*============================================================*/
+
+   lastJoin->ruleToActivate = newDisjunct;
+   newDisjunct->lastJoin = lastJoin;
+
+   /*=================================================*/
+   /* Determine the rule's logical join if it exists. */
+   /*=================================================*/
+
+   tempJoin = lastJoin;
+   while (tempJoin != NULL)
+     {
+      if (tempJoin->depth == logicalJoin)
+        {
+         newDisjunct->logicalJoin = tempJoin;
+         tempJoin->logicalJoin = true;
+        }
+      tempJoin = tempJoin->lastLevel;
+     }
+
+   /*==================================================*/
+   /* Return the newly created defrule data structure. */
+   /*==================================================*/
+
+   return(newDisjunct);
+  }
+
+/****************************************************************/
+/* ReplaceExpressionVariables: Replaces all symbolic references */
+/*   to variables (local and global) found in an expression on  */
+/*   the RHS of a rule with expressions containing function     */
+/*   calls to retrieve the variable's value. Makes the final    */
+/*   modifications necessary for handling the modify and        */
+/*   duplicate commands.                                        */
+/****************************************************************/
+static int ReplaceRHSVariable(
+  Environment *theEnv,
+  struct expr *list,
+  void *VtheLHS)
+  {
+   struct lhsParseNode *theVariable;
+
+   /*=======================================*/
+   /* Handle modify and duplicate commands. */
+   /*=======================================*/
+
+#if DEFTEMPLATE_CONSTRUCT
+   if (list->type == FCALL)
+     {
+      if (list->value == (void *) FindFunction(theEnv,"modify"))
+        {
+         if (UpdateModifyDuplicate(theEnv,list,"modify",VtheLHS) == false)
+           { return -1; }
+        }
+      else if (list->value == (void *) FindFunction(theEnv,"duplicate"))
+        {
+         if (UpdateModifyDuplicate(theEnv,list,"duplicate",VtheLHS) == false)
+           { return -1; }
+        }
+
+      return 0;
+     }
+
+#endif
+
+   if ((list->type != SF_VARIABLE) && (list->type != MF_VARIABLE))
+     { return 0; }
+
+   /*===============================================================*/
+   /* Check to see if the variable is bound on the LHS of the rule. */
+   /*===============================================================*/
+
+   theVariable = FindVariable(list->lexemeValue,(struct lhsParseNode *) VtheLHS);
+   if (theVariable == NULL) return 0;
+
+   /*================================================*/
+   /* Replace the variable reference with a function */
+   /* call to retrieve the variable.                 */
+   /*================================================*/
+
+   if (theVariable->patternType != NULL)
+     { (*theVariable->patternType->replaceGetJNValueFunction)(theEnv,list,theVariable,LHS); }
+   else
+     { return 0; }
+
+   /*==============================================================*/
+   /* Return 1 to indicate the variable was successfully replaced. */
+   /*==============================================================*/
+
+   return 1;
+  }
+
+/*******************************************************/
+/* ParseRuleRHS: Coordinates all the actions necessary */
+/*   for parsing the RHS of a rule.                    */
+/*******************************************************/
+static struct expr *ParseRuleRHS(
+  Environment *theEnv,
+  const char *readSource)
+  {
+   struct expr *actions;
+   struct token theToken;
+
+   /*=========================================================*/
+   /* Process the actions on the right hand side of the rule. */
+   /*=========================================================*/
+
+   SavePPBuffer(theEnv,"\n   ");
+   SetIndentDepth(theEnv,3);
+
+   actions = GroupActions(theEnv,readSource,&theToken,true,NULL,false);
+
+   if (actions == NULL) return NULL;
+
+   /*=============================*/
+   /* Reformat the closing token. */
+   /*=============================*/
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,theToken.printForm);
+
+   /*======================================================*/
+   /* Check for the closing right parenthesis of the rule. */
+   /*======================================================*/
+
+   if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"defrule");
+      ReturnExpression(theEnv,actions);
+      return NULL;
+     }
+
+   /*========================*/
+   /* Return the rule's RHS. */
+   /*========================*/
+
+   return(actions);
+  }
+
+/************************************************************/
+/* RuleComplexity: Returns the complexity of a rule for use */
+/*   by the LEX and MEA conflict resolution strategies.     */
+/************************************************************/
+static unsigned short RuleComplexity(
+  Environment *theEnv,
+  struct lhsParseNode *theLHS)
+  {
+   struct lhsParseNode *thePattern, *tempPattern;
+   unsigned short complexity = 0;
+
+   while (theLHS != NULL)
+     {
+      complexity += 1; /* Add 1 for each pattern. */
+      complexity += ExpressionComplexity(theEnv,theLHS->networkTest);
+      thePattern = theLHS->right;
+      while (thePattern != NULL)
+        {
+         if (thePattern->multifieldSlot)
+           {
+            tempPattern = thePattern->bottom;
+            while (tempPattern != NULL)
+              {
+               complexity += ExpressionComplexity(theEnv,tempPattern->networkTest);
+               tempPattern = tempPattern->right;
+              }
+           }
+         else
+           { complexity += ExpressionComplexity(theEnv,thePattern->networkTest); }
+         thePattern = thePattern->right;
+        }
+      theLHS = theLHS->bottom;
+     }
+
+   return complexity;
+  }
+
+/********************************************************************/
+/* ExpressionComplexity: Determines the complexity of a expression. */
+/********************************************************************/
+static unsigned short ExpressionComplexity(
+  Environment *theEnv,
+  struct expr *exprPtr)
+  {
+   unsigned short complexity = 0;
+
+   while (exprPtr != NULL)
+     {
+      if (exprPtr->type == FCALL)
+        {
+         /*=========================================*/
+         /* Logical combinations do not add to the  */
+         /* complexity, but their arguments do.     */
+         /*=========================================*/
+
+         if ((exprPtr->value == ExpressionData(theEnv)->PTR_AND) ||
+                  (exprPtr->value == ExpressionData(theEnv)->PTR_NOT) ||
+                  (exprPtr->value == ExpressionData(theEnv)->PTR_OR))
+           { complexity += ExpressionComplexity(theEnv,exprPtr->argList); }
+
+         /*=========================================*/
+         /* else other function calls increase the  */
+         /* complexity, but their arguments do not. */
+         /*=========================================*/
+
+         else
+           { complexity++; }
+        }
+      else if ((EvaluationData(theEnv)->PrimitivesArray[exprPtr->type] != NULL) ?
+               EvaluationData(theEnv)->PrimitivesArray[exprPtr->type]->addsToRuleComplexity : false)
+        { complexity++; }
+
+      exprPtr = exprPtr->nextArg;
+     }
+
+   return complexity;
+  }
+
+/********************************************/
+/* LogicalAnalysis: Analyzes the use of the */
+/*   logical CE within the LHS of a rule.   */
+/********************************************/
+static int LogicalAnalysis(
+  Environment *theEnv,
+  struct lhsParseNode *patternList)
+  {
+   bool firstLogical, logicalsFound = false;
+   int logicalJoin = 1;
+   bool gap = false;
+
+   if (patternList == NULL) return 0;
+
+   firstLogical = patternList->logical;
+
+   /*===================================================*/
+   /* Loop through each pattern in the LHS of the rule. */
+   /*===================================================*/
+
+   for (;
+        patternList != NULL;
+        patternList = patternList->bottom)
+     {
+      /*=======================================*/
+      /* Skip anything that isn't a pattern CE */
+      /* or is embedded within a not/and CE.   */
+      /*=======================================*/
+
+      if (((patternList->pnType != PATTERN_CE_NODE) &&
+           (patternList->pnType != TEST_CE_NODE)) ||
+          (patternList->endNandDepth != 1))
+        { continue; }
+
+      /*=====================================================*/
+      /* If the pattern CE is not contained within a logical */
+      /* CE, then set the gap flag to true indicating that   */
+      /* any subsequent pattern CE found within a logical CE */
+      /* represents a gap between logical CEs which is an    */
+      /* error.                                              */
+      /*=====================================================*/
+
+      if (patternList->logical == false)
+        {
+         gap = true;
+         continue;
+        }
+
+      /*=================================================*/
+      /* If a logical CE is encountered and the first CE */
+      /* of the rule isn't a logical CE, then indicate   */
+      /* that the first CE must be a logical CE.         */
+      /*=================================================*/
+
+      if (! firstLogical)
+        {
+         PrintErrorID(theEnv,"RULEPSR",1,true);
+         WriteString(theEnv,STDERR,"Logical CEs must be placed first in a rule\n");
+         return -1;
+        }
+
+      /*===================================================*/
+      /* If a break within the logical CEs was found and a */
+      /* new logical CE is encountered, then indicate that */
+      /* there can't be any gaps between logical CEs.      */
+      /*===================================================*/
+
+      if (gap)
+        {
+         PrintErrorID(theEnv,"RULEPSR",2,true);
+         WriteString(theEnv,STDERR,"Gaps may not exist between logical CEs\n");
+         return -1;
+        }
+
+      /*===========================================*/
+      /* Increment the count of logical CEs found. */
+      /*===========================================*/
+
+      if (patternList->pnType == PATTERN_CE_NODE)
+        { logicalJoin++; }
+      else if (logicalJoin == 1)
+        { logicalJoin++; }
+
+      logicalsFound = true;
+     }
+
+   /*============================================*/
+   /* If logical CEs were found, then return the */
+   /* join number where the logical information  */
+   /* will be stored in the join network.        */
+   /*============================================*/
+
+   if (logicalsFound)
+     { return logicalJoin; }
+
+   /*=============================*/
+   /* Return zero indicating that */
+   /* no logical CE was found.    */
+   /*=============================*/
+
+   return 0;
+  }
+
+/*****************************************************************/
+/* FindVariable: Searches for the last occurence of a variable   */
+/*  in the LHS of a rule that is visible from the RHS of a rule. */
+/*  The last occurence of the variable on the LHS side of the    */
+/*  rule will have the strictest constraints (because it will    */
+/*  have been intersected with all of the other constraints for  */
+/*  the variable on the LHS of the rule). The strictest          */
+/*  constraints are useful for performing type checking on the   */
+/*  RHS of the rule.                                             */
+/*****************************************************************/
+struct lhsParseNode *FindVariable(
+  CLIPSLexeme *name,
+  struct lhsParseNode *theLHS)
+  {
+   struct lhsParseNode *theFields, *tmpFields = NULL;
+   struct lhsParseNode *theReturnValue = NULL;
+
+   /*==============================================*/
+   /* Loop through each CE in the LHS of the rule. */
+   /*==============================================*/
+
+   for (;
+        theLHS != NULL;
+        theLHS = theLHS->bottom)
+     {
+      /*==========================================*/
+      /* Don't bother searching for the variable  */
+      /* in anything other than a pattern CE that */
+      /* is not contained within a not CE.        */
+      /*==========================================*/
+
+      if ((theLHS->pnType != PATTERN_CE_NODE) ||
+          (theLHS->negated == true) ||
+          (theLHS->exists == true) ||
+          (theLHS->beginNandDepth > 1))
+        { continue; }
+
+      /*=====================================*/
+      /* Check the pattern address variable. */
+      /*=====================================*/
+
+      if (theLHS->value == (void *) name)
+        { theReturnValue = theLHS; }
+
+      /*============================================*/
+      /* Check for the variable inside the pattern. */
+      /*============================================*/
+
+      theFields = theLHS->right;
+      while (theFields != NULL)
+        {
+         /*=================================================*/
+         /* Go one level deeper to check a multifield slot. */
+         /*=================================================*/
+
+         if (theFields->multifieldSlot)
+           {
+            tmpFields = theFields;
+            theFields = theFields->bottom;
+           }
+
+         /*=================================*/
+         /* See if the field being examined */
+         /* is the variable being sought.   */
+         /*=================================*/
+
+         if (theFields == NULL)
+           { /* Do Nothing */ }
+         else if (((theFields->pnType == SF_VARIABLE_NODE) ||
+                   (theFields->pnType == MF_VARIABLE_NODE)) &&
+             (theFields->value == (void *) name))
+           { theReturnValue = theFields; }
+
+         /*============================*/
+         /* Move on to the next field. */
+         /*============================*/
+
+         if (theFields == NULL)
+           {
+            theFields = tmpFields;
+            tmpFields = NULL;
+           }
+         else if ((theFields->right == NULL) && (tmpFields != NULL))
+           {
+            theFields = tmpFields;
+            tmpFields = NULL;
+           }
+         theFields = theFields->right;
+        }
+     }
+
+   /*=========================================================*/
+   /* Return a pointer to the LHS location where the variable */
+   /* was found (or a NULL pointer if it wasn't).             */
+   /*=========================================================*/
+
+   return(theReturnValue);
+  }
+
+/**********************************************************/
+/* AddToDefruleList: Adds a defrule to the list of rules. */
+/**********************************************************/
+static void AddToDefruleList(
+  Defrule *rulePtr)
+  {
+   Defrule *tempRule;
+   struct defruleModule *theModuleItem;
+
+   theModuleItem = (struct defruleModule *) rulePtr->header.whichModule;
+
+   if (theModuleItem->header.lastItem == NULL)
+     { theModuleItem->header.firstItem = &rulePtr->header; }
+   else
+     {
+      tempRule = (Defrule *) theModuleItem->header.lastItem; // Note: Only the first disjunct
+      tempRule->header.next = &rulePtr->header;   // points to the next rule
+     }
+
+   theModuleItem->header.lastItem = &rulePtr->header;
+  }
+
+#if DEVELOPER && DEBUGGING_FUNCTIONS
+
+/************************************************************/
+/* DumpRuleAnalysis: Displays the information about network */
+/*   expressions generated from the analysis of the rule.   */
+/************************************************************/
+void DumpRuleAnalysis(
+  Environment *theEnv,
+  struct lhsParseNode *tempNode)
+  {
+   struct lhsParseNode *traceNode;
+   char buffer[20];
+
+   WriteString(theEnv,STDOUT,"\n");
+   for (traceNode = tempNode; traceNode != NULL; traceNode = traceNode->bottom)
+     {
+      if (traceNode->userCE)
+        { gensprintf(buffer,"UCE %2d (%2d %2d): ",traceNode->whichCE,traceNode->beginNandDepth,traceNode->endNandDepth); }
+      else
+        { gensprintf(buffer,"SCE %2d (%2d %2d): ",traceNode->whichCE,traceNode->beginNandDepth,traceNode->endNandDepth); }
+
+      WriteString(theEnv,STDOUT,buffer);
+
+      PrintExpression(theEnv,STDOUT,traceNode->networkTest);
+      WriteString(theEnv,STDOUT,"\n");
+
+      if (traceNode->externalNetworkTest != NULL)
+        {
+         WriteString(theEnv,STDOUT,"      ENT: ");
+         PrintExpression(theEnv,STDOUT,traceNode->externalNetworkTest);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+
+      if (traceNode->secondaryNetworkTest != NULL)
+        {
+         WriteString(theEnv,STDOUT,"      SNT: ");
+         PrintExpression(theEnv,STDOUT,traceNode->secondaryNetworkTest);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+
+      if (traceNode->externalRightHash != NULL)
+        {
+         WriteString(theEnv,STDOUT,"      ERH: ");
+         PrintExpression(theEnv,STDOUT,traceNode->externalRightHash);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+
+      if (traceNode->externalLeftHash != NULL)
+        {
+         WriteString(theEnv,STDOUT,"      ELH: ");
+         PrintExpression(theEnv,STDOUT,traceNode->externalLeftHash);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+
+      if (traceNode->leftHash != NULL)
+        {
+         WriteString(theEnv,STDOUT,"       LH: ");
+         PrintExpression(theEnv,STDOUT,traceNode->leftHash);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+
+      if (traceNode->rightHash != NULL)
+        {
+         WriteString(theEnv,STDOUT,"       RH: ");
+         PrintExpression(theEnv,STDOUT,traceNode->rightHash);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+
+      if (traceNode->betaHash != NULL)
+        {
+         WriteString(theEnv,STDOUT,"       BH: ");
+         PrintExpression(theEnv,STDOUT,traceNode->betaHash);
+         WriteString(theEnv,STDOUT,"\n");
+        }
+     }
+  }
+#endif
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* DEFRULE_CONSTRUCT */
+
diff --git a/clips/rulepsr.h b/clips/rulepsr.h
new file mode 100755
index 000000000..a0bce40e8
--- /dev/null
+++ b/clips/rulepsr.h
@@ -0,0 +1,61 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*               RULE PARSING HEADER FILE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Coordinates parsing of a rule.                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Removed DYNAMIC_SALIENCE, INCREMENTAL_RESET,   */
+/*            and LOGICAL_DEPENDENCIES compilation flags.    */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Added support for hashed memories.             */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_rulepsr
+
+#pragma once
+
+#define _H_rulepsr
+
+   bool                           ParseDefrule(Environment *,const char *);
+   struct lhsParseNode           *FindVariable(CLIPSLexeme *,
+                                               struct lhsParseNode *);
+#if DEVELOPER && DEBUGGING_FUNCTIONS
+   void                           DumpRuleAnalysis(Environment *,struct lhsParseNode *);
+#endif
+
+#endif /* _H_rulepsr */
+
+
diff --git a/clips/scanner.c b/clips/scanner.c
new file mode 100755
index 000000000..14d36e7dd
--- /dev/null
+++ b/clips/scanner.c
@@ -0,0 +1,859 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                    SCANNER MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for scanning lexical tokens from an     */
+/*   input source.                                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Chris Culbert                                        */
+/*      Brian Dantes                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added SetLineCount function.                   */
+/*                                                           */
+/*            Added UTF-8 support.                           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include "setup.h"
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "symbol.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "scanner.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static CLIPSLexeme            *ScanSymbol(Environment *,const char *,int,TokenType *);
+   static CLIPSLexeme            *ScanString(Environment *,const char *,int delimiterChar);
+   static void                    ScanNumber(Environment *,const char *,struct token *);
+   static void                    DeallocateScannerData(Environment *);
+
+/************************************************/
+/* InitializeScannerData: Allocates environment */
+/*    data for scanner routines.                */
+/************************************************/
+void InitializeScannerData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,SCANNER_DATA,sizeof(struct scannerData),DeallocateScannerData);
+  }
+
+/**************************************************/
+/* DeallocateScannerData: Deallocates environment */
+/*    data for scanner routines.                  */
+/**************************************************/
+static void DeallocateScannerData(
+  Environment *theEnv)
+  {
+   if (ScannerData(theEnv)->GlobalMax !=  0)
+     { genfree(theEnv,ScannerData(theEnv)->GlobalString,ScannerData(theEnv)->GlobalMax); }
+  }
+
+/***********************************************************************/
+/* GetToken: Reads next token from the input stream. The pointer to    */
+/*   the token data structure passed as an argument is set to contain  */
+/*   the type of token (e.g., symbol, string, integer, etc.), the data */
+/*   value for the token (i.e., a symbol table location if it is a     */
+/*   symbol or string, an integer table location if it is an integer), */
+/*   and the pretty print representation.                              */
+/***********************************************************************/
+void GetToken(
+ Environment *theEnv,
+ const char *logicalName,
+ struct token *theToken)
+ {
+   int inchar;
+   TokenType type;
+
+   /*=======================================*/
+   /* Set Unknown default values for token. */
+   /*=======================================*/
+
+   theToken->tknType = UNKNOWN_VALUE_TOKEN;
+   theToken->value = NULL;
+   theToken->printForm = "unknown";
+   ScannerData(theEnv)->GlobalPos = 0;
+   ScannerData(theEnv)->GlobalMax = 0;
+
+   /*==============================================*/
+   /* Remove all white space before processing the */
+   /* GetToken() request.                          */
+   /*==============================================*/
+
+   inchar = ReadRouter(theEnv,logicalName);
+   while ((inchar == ' ') || (inchar == '\n') || (inchar == '\f') ||
+          (inchar == '\r') || (inchar == ';') || (inchar == '\t'))
+     {
+      /*=======================*/
+      /* Remove comment lines. */
+      /*=======================*/
+
+      if (inchar == ';')
+        {
+         inchar = ReadRouter(theEnv,logicalName);
+         while ((inchar != '\n') && (inchar != '\r') && (inchar != EOF) )
+           { inchar = ReadRouter(theEnv,logicalName); }
+        }
+      inchar = ReadRouter(theEnv,logicalName);
+     }
+
+   /*==========================*/
+   /* Process Symbolic Tokens. */
+   /*==========================*/
+
+   if (isalpha(inchar) || IsUTF8MultiByteStart(inchar))
+     {
+      theToken->tknType = SYMBOL_TOKEN;
+      UnreadRouter(theEnv,logicalName,inchar);
+      theToken->lexemeValue = ScanSymbol(theEnv,logicalName,0,&type);
+      theToken->printForm = theToken->lexemeValue->contents;
+     }
+
+   /*===============================================*/
+   /* Process Number Tokens beginning with a digit. */
+   /*===============================================*/
+
+   else if (isdigit(inchar))
+     {
+      UnreadRouter(theEnv,logicalName,inchar);
+      ScanNumber(theEnv,logicalName,theToken);
+     }
+
+   else switch (inchar)
+     {
+      /*========================*/
+      /* Process String Tokens. */
+      /*========================*/
+         
+      case '"':
+      case '\'':
+      case '`':
+         theToken->lexemeValue = ScanString(theEnv,logicalName, inchar);
+         theToken->tknType = STRING_TOKEN;
+         theToken->printForm = StringPrintForm(theEnv,theToken->lexemeValue->contents);
+         break;
+
+      /*=======================================*/
+      /* Process Tokens that might be numbers. */
+      /*=======================================*/
+
+      case '-':
+      case '.':
+      case '+':
+         UnreadRouter(theEnv,logicalName,inchar);
+         ScanNumber(theEnv,logicalName,theToken);
+         break;
+
+      /*===================================*/
+      /* Process ? and ?<variable> Tokens. */
+      /*===================================*/
+
+       case '?':
+          inchar = ReadRouter(theEnv,logicalName);
+          if (isalpha(inchar) || IsUTF8MultiByteStart(inchar)
+#if DEFGLOBAL_CONSTRUCT
+              || (inchar == '*'))
+#else
+              )
+#endif
+            {
+             UnreadRouter(theEnv,logicalName,inchar);
+             theToken->lexemeValue = ScanSymbol(theEnv,logicalName,0,&type);
+             theToken->tknType = SF_VARIABLE_TOKEN;
+#if DEFGLOBAL_CONSTRUCT
+             if ((theToken->lexemeValue->contents[0] == '*') &&
+                 ((strlen(theToken->lexemeValue->contents)) > 1) &&
+                 (theToken->lexemeValue->contents[strlen(theToken->lexemeValue->contents) - 1] == '*'))
+               {
+                size_t count;
+
+                theToken->tknType = GBL_VARIABLE_TOKEN;
+                theToken->printForm = AppendStrings(theEnv,"?",theToken->lexemeValue->contents);
+                count = strlen(ScannerData(theEnv)->GlobalString);
+                ScannerData(theEnv)->GlobalString[count-1] = EOS;
+                theToken->lexemeValue = CreateSymbol(theEnv,ScannerData(theEnv)->GlobalString+1);
+                ScannerData(theEnv)->GlobalString[count-1] = (char) inchar;
+
+               }
+             else
+#endif
+             theToken->printForm = AppendStrings(theEnv,"?",theToken->lexemeValue->contents);
+            }
+          else
+            {
+             theToken->tknType = SF_WILDCARD_TOKEN;
+             theToken->lexemeValue = CreateSymbol(theEnv,"?");
+             UnreadRouter(theEnv,logicalName,inchar);
+             theToken->printForm = "?";
+            }
+          break;
+
+      /*=====================================*/
+      /* Process $? and $?<variable> Tokens. */
+      /*=====================================*/
+
+      case '$':
+         if ((inchar = ReadRouter(theEnv,logicalName)) == '?')
+           {
+            inchar = ReadRouter(theEnv,logicalName);
+            if (isalpha(inchar) || IsUTF8MultiByteStart(inchar)
+#if DEFGLOBAL_CONSTRUCT
+                 || (inchar == '*'))
+#else
+                 )
+#endif
+              {
+               UnreadRouter(theEnv,logicalName,inchar);
+               theToken->lexemeValue = ScanSymbol(theEnv,logicalName,0,&type);
+               theToken->tknType = MF_VARIABLE_TOKEN;
+#if DEFGLOBAL_CONSTRUCT
+             if ((theToken->lexemeValue->contents[0] == '*') &&
+                 (strlen(theToken->lexemeValue->contents) > 1) &&
+                 (theToken->lexemeValue->contents[strlen(theToken->lexemeValue->contents) - 1] == '*'))
+               {
+                size_t count;
+
+                theToken->tknType = MF_GBL_VARIABLE_TOKEN;
+                theToken->printForm = AppendStrings(theEnv,"$?",theToken->lexemeValue->contents);
+                count = strlen(ScannerData(theEnv)->GlobalString);
+                ScannerData(theEnv)->GlobalString[count-1] = EOS;
+                theToken->lexemeValue = CreateSymbol(theEnv,ScannerData(theEnv)->GlobalString+1);
+                ScannerData(theEnv)->GlobalString[count-1] = (char) inchar;
+               }
+             else
+#endif
+               theToken->printForm = AppendStrings(theEnv,"$?",theToken->lexemeValue->contents);
+              }
+            else
+              {
+               theToken->tknType = MF_WILDCARD_TOKEN;
+               theToken->lexemeValue = CreateSymbol(theEnv,"$?");
+               theToken->printForm = "$?";
+               UnreadRouter(theEnv,logicalName,inchar);
+              }
+           }
+         else
+           {
+            theToken->tknType = SYMBOL_TOKEN;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,'$',ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            UnreadRouter(theEnv,logicalName,inchar);
+            theToken->lexemeValue = ScanSymbol(theEnv,logicalName,1,&type);
+            theToken->printForm = theToken->lexemeValue->contents;
+           }
+         break;
+
+      /*============================*/
+      /* Symbols beginning with '<' */
+      /*============================*/
+
+      case '<':
+         theToken->tknType = SYMBOL_TOKEN;
+         ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,'<',ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+         theToken->lexemeValue = ScanSymbol(theEnv,logicalName,1,&type);
+         theToken->printForm = theToken->lexemeValue->contents;
+         break;
+
+      /*=============================================*/
+      /* Process "(", ")", "~", "|", and "&" Tokens. */
+      /*=============================================*/
+
+      case '(':
+         theToken->tknType = LEFT_PARENTHESIS_TOKEN;
+         theToken->lexemeValue = CreateString(theEnv,"(");
+         theToken->printForm = "(";
+         break;
+
+      case ')':
+         theToken->tknType= RIGHT_PARENTHESIS_TOKEN;
+         theToken->lexemeValue = CreateString(theEnv,")");
+         theToken->printForm = ")";
+         break;
+
+      case '~':
+         theToken->tknType = NOT_CONSTRAINT_TOKEN;
+         theToken->lexemeValue = CreateString(theEnv,"~");
+         theToken->printForm = "~";
+         break;
+
+      case '|':
+         theToken->tknType = OR_CONSTRAINT_TOKEN;
+         theToken->lexemeValue = CreateString(theEnv,"|");
+         theToken->printForm = "|";
+         break;
+
+      case '&':
+         theToken->tknType =  AND_CONSTRAINT_TOKEN;
+         theToken->lexemeValue = CreateString(theEnv,"&");
+         theToken->printForm = "&";
+         break;
+
+      /*============================*/
+      /* Process End-of-File Token. */
+      /*============================*/
+
+      case EOF:
+      case 0:
+      case 3:
+         theToken->tknType = STOP_TOKEN;
+         theToken->lexemeValue = CreateSymbol(theEnv,"stop");
+         theToken->printForm = "";
+         break;
+
+      /*=======================*/
+      /* Process Other Tokens. */
+      /*=======================*/
+
+      default:
+         if (isprint(inchar))
+           {
+            UnreadRouter(theEnv,logicalName,inchar);
+            theToken->lexemeValue = ScanSymbol(theEnv,logicalName,0,&type);
+            theToken->tknType = type;
+            theToken->printForm = theToken->lexemeValue->contents;
+           }
+         else
+           { theToken->printForm = "<<<unprintable character>>>"; }
+         break;
+     }
+
+   /*===============================================*/
+   /* Put the new token in the pretty print buffer. */
+   /*===============================================*/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   if (theToken->tknType == INSTANCE_NAME_TOKEN)
+     {
+      SavePPBuffer(theEnv,"[");
+      SavePPBuffer(theEnv,theToken->printForm);
+      SavePPBuffer(theEnv,"]");
+     }
+   else
+     { SavePPBuffer(theEnv,theToken->printForm); }
+#endif
+
+   /*=========================================================*/
+   /* Return the temporary memory used in scanning the token. */
+   /*=========================================================*/
+
+   if (ScannerData(theEnv)->GlobalString != NULL)
+     {
+      rm(theEnv,ScannerData(theEnv)->GlobalString,ScannerData(theEnv)->GlobalMax);
+      ScannerData(theEnv)->GlobalString = NULL;
+      ScannerData(theEnv)->GlobalMax = 0;
+      ScannerData(theEnv)->GlobalPos = 0;
+     }
+
+   return;
+  }
+
+/*************************************/
+/* ScanSymbol: Scans a symbol token. */
+/*************************************/
+static CLIPSLexeme *ScanSymbol(
+  Environment *theEnv,
+  const char *logicalName,
+  int count,
+  TokenType *type)
+  {
+   int inchar;
+#if OBJECT_SYSTEM
+   CLIPSLexeme *symbol;
+#endif
+
+   /*=====================================*/
+   /* Scan characters and add them to the */
+   /* symbol until a delimiter is found.  */
+   /*=====================================*/
+
+   inchar = ReadRouter(theEnv,logicalName);
+   while ( (inchar != '<') && (inchar != '"') &&
+           (inchar != '(') && (inchar != ')') &&
+           (inchar != '&') && (inchar != '|') && (inchar != '~') &&
+           (inchar != ' ') && (inchar != ';') &&
+           (IsUTF8MultiByteStart(inchar) ||
+            IsUTF8MultiByteContinuation(inchar) ||
+            isprint(inchar)))
+     {
+      ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+
+      count++;
+      inchar = ReadRouter(theEnv,logicalName);
+     }
+
+   /*===================================================*/
+   /* Return the last character scanned (the delimiter) */
+   /* to the input stream so it will be scanned as part */
+   /* of the next token.                                */
+   /*===================================================*/
+
+   UnreadRouter(theEnv,logicalName,inchar);
+
+   /*====================================================*/
+   /* Add the symbol to the symbol table and return the  */
+   /* symbol table address of the symbol. Symbols of the */
+   /* form [<symbol>] are instance names, so the type    */
+   /* returned is INSTANCE_NAME_TYPE rather than SYMBOL_TYPE.      */
+   /*====================================================*/
+
+#if OBJECT_SYSTEM
+   if (count > 2)
+     {
+      if ((ScannerData(theEnv)->GlobalString[0] == '[') ? (ScannerData(theEnv)->GlobalString[count-1] == ']') : false)
+        {
+         *type = INSTANCE_NAME_TOKEN;
+         inchar = ']';
+        }
+      else
+        {
+         *type = SYMBOL_TOKEN;
+         return CreateSymbol(theEnv,ScannerData(theEnv)->GlobalString);
+        }
+      ScannerData(theEnv)->GlobalString[count-1] = EOS;
+      symbol = CreateInstanceName(theEnv,ScannerData(theEnv)->GlobalString+1);
+      ScannerData(theEnv)->GlobalString[count-1] = (char) inchar;
+      return symbol;
+     }
+   else
+     {
+      *type = SYMBOL_TOKEN;
+      return CreateSymbol(theEnv,ScannerData(theEnv)->GlobalString);
+     }
+#else
+   *type = SYMBOL_TOKEN;
+   return CreateSymbol(theEnv,ScannerData(theEnv)->GlobalString);
+#endif
+  }
+
+/*************************************/
+/* ScanString: Scans a string token. */
+/*************************************/
+static CLIPSLexeme *ScanString(
+  Environment *theEnv,
+  const char *logicalName,
+  int delimiterChar)
+  {
+   int inchar;
+   size_t pos = 0;
+   size_t max = 0;
+   char *theString = NULL;
+   CLIPSLexeme *thePtr;
+
+   /*============================================*/
+   /* Scan characters and add them to the string */
+   /* until the " delimiter is found.            */
+   /*============================================*/
+
+   inchar = ReadRouter(theEnv,logicalName);
+   while ((inchar != delimiterChar) && (inchar != EOF))
+     {
+      if (inchar == '\\')
+        { inchar = ReadRouter(theEnv,logicalName); }
+
+      theString = ExpandStringWithChar(theEnv,inchar,theString,&pos,&max,max+80);
+      inchar = ReadRouter(theEnv,logicalName);
+     }
+
+   if ((inchar == EOF) && (ScannerData(theEnv)->IgnoreCompletionErrors == false))
+     {
+      PrintErrorID(theEnv,"SCANNER",1,true);
+      WriteString(theEnv,STDERR,"Encountered End-Of-File while scanning a string\n");
+     }
+
+   /*===============================================*/
+   /* Add the string to the symbol table and return */
+   /* the symbol table address of the string.       */
+   /*===============================================*/
+
+   if (theString == NULL)
+     { thePtr = CreateString(theEnv,""); }
+   else
+     {
+      thePtr = CreateString(theEnv,theString);
+      rm(theEnv,theString,max);
+     }
+
+   return thePtr;
+  }
+
+/**************************************/
+/* ScanNumber: Scans a numeric token. */
+/**************************************/
+static void ScanNumber(
+  Environment *theEnv,
+  const char *logicalName,
+  struct token *theToken)
+  {
+   int count = 0;
+   int inchar, phase;
+   bool digitFound = false;
+   bool processFloat = false;
+   double fvalue;
+   long long lvalue;
+   TokenType type;
+
+   /* Phases:              */
+   /*  -1 = sign           */
+   /*   0 = integral       */
+   /*   1 = decimal        */
+   /*   2 = exponent-begin */
+   /*   3 = exponent-value */
+   /*   5 = done           */
+   /*   9 = error          */
+
+   inchar = ReadRouter(theEnv,logicalName);
+   phase = -1;
+
+   while ((phase != 5) && (phase != 9))
+     {
+      if (phase == -1)
+        {
+         if (isdigit(inchar))
+           {
+            phase = 0;
+            digitFound = true;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+         else if ((inchar == '+') || (inchar == '-'))
+           {
+            phase = 0;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+         else if (inchar == '.')
+           {
+            processFloat = true;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+            phase = 1;
+           }
+         else if ((inchar == 'E') || (inchar == 'e'))
+           {
+            processFloat = true;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+            phase = 2;
+           }
+         else if ( (inchar == '<') || (inchar == '"') ||
+                   (inchar == '(') || (inchar == ')') ||
+                   (inchar == '&') || (inchar == '|') || (inchar == '~') ||
+                   (inchar == ' ') || (inchar == ';') ||
+                   (isprint(inchar) == 0) )
+           { phase = 5; }
+         else
+           {
+            phase = 9;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+        }
+      else if (phase == 0)
+        {
+         if (isdigit(inchar))
+           {
+            digitFound = true;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+         else if (inchar == '.')
+           {
+            processFloat = true;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+            phase = 1;
+           }
+         else if ((inchar == 'E') || (inchar == 'e'))
+           {
+            processFloat = true;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+            phase = 2;
+           }
+         else if ( (inchar == '<') || (inchar == '"') ||
+                   (inchar == '(') || (inchar == ')') ||
+                   (inchar == '&') || (inchar == '|') || (inchar == '~') ||
+                   (inchar == ' ') || (inchar == ';') ||
+                   ((! IsUTF8MultiByteStart(inchar) &&  (isprint(inchar) == 0))))
+           { phase = 5; }
+         else
+           {
+            phase = 9;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+        }
+      else if (phase == 1)
+        {
+         if (isdigit(inchar))
+           {
+            digitFound = true;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+         else if ((inchar == 'E') || (inchar == 'e'))
+           {
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+            phase = 2;
+           }
+         else if ( (inchar == '<') || (inchar == '"') ||
+                   (inchar == '(') || (inchar == ')') ||
+                   (inchar == '&') || (inchar == '|') || (inchar == '~') ||
+                   (inchar == ' ') || (inchar == ';') ||
+                   ((! IsUTF8MultiByteStart(inchar)) && (isprint(inchar) == 0)) )
+           { phase = 5; }
+         else
+           {
+            phase = 9;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+        }
+      else if (phase == 2)
+        {
+         if (isdigit(inchar))
+           {
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+            phase = 3;
+           }
+         else if ((inchar == '+') || (inchar == '-'))
+           {
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+            phase = 3;
+           }
+         else if ( (inchar == '<') || (inchar == '"') ||
+                   (inchar == '(') || (inchar == ')') ||
+                   (inchar == '&') || (inchar == '|') || (inchar == '~') ||
+                   (inchar == ' ') || (inchar == ';') ||
+                   ((! IsUTF8MultiByteStart(inchar)) && (isprint(inchar) == 0)) )
+           {
+            digitFound = false;
+            phase = 5;
+           }
+         else
+           {
+            phase = 9;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+        }
+      else if (phase == 3)
+        {
+         if (isdigit(inchar))
+           {
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+         else if ( (inchar == '<') || (inchar == '"') ||
+                   (inchar == '(') || (inchar == ')') ||
+                   (inchar == '&') || (inchar == '|') || (inchar == '~') ||
+                   (inchar == ' ') || (inchar == ';') ||
+                   ((! IsUTF8MultiByteStart(inchar)) && (isprint(inchar) == 0)) )
+           {
+            if ((ScannerData(theEnv)->GlobalString[count-1] == '+') || (ScannerData(theEnv)->GlobalString[count-1] == '-'))
+              { digitFound = false; }
+            phase = 5;
+           }
+         else
+           {
+            phase = 9;
+            ScannerData(theEnv)->GlobalString = ExpandStringWithChar(theEnv,inchar,ScannerData(theEnv)->GlobalString,&ScannerData(theEnv)->GlobalPos,&ScannerData(theEnv)->GlobalMax,ScannerData(theEnv)->GlobalMax+80);
+            count++;
+           }
+        }
+
+      if ((phase != 5) && (phase != 9))
+        { inchar = ReadRouter(theEnv,logicalName); }
+     }
+
+   if (phase == 9)
+     {
+      theToken->lexemeValue = ScanSymbol(theEnv,logicalName,count,&type);
+      theToken->tknType = type;
+      theToken->printForm = theToken->lexemeValue->contents;
+      return;
+     }
+
+   /*=======================================*/
+   /* Stuff last character back into buffer */
+   /* and return the number.                */
+   /*=======================================*/
+
+   UnreadRouter(theEnv,logicalName,inchar);
+
+   if (! digitFound)
+     {
+      theToken->tknType = SYMBOL_TOKEN;
+      theToken->lexemeValue = CreateSymbol(theEnv,ScannerData(theEnv)->GlobalString);
+      theToken->printForm = theToken->lexemeValue->contents;
+      return;
+     }
+
+   if (processFloat)
+     {
+      fvalue = atof(ScannerData(theEnv)->GlobalString);
+      theToken->tknType = FLOAT_TOKEN;
+      theToken->floatValue = CreateFloat(theEnv,fvalue);
+      theToken->printForm = FloatToString(theEnv,theToken->floatValue->contents);
+     }
+   else
+     {
+      errno = 0;
+#if WIN_MVC
+      lvalue = _strtoi64(ScannerData(theEnv)->GlobalString,NULL,10);
+#else
+      lvalue = strtoll(ScannerData(theEnv)->GlobalString,NULL,10);
+#endif
+      if (errno)
+        {
+         PrintWarningID(theEnv,"SCANNER",1,false);
+         WriteString(theEnv,STDWRN,"Over or underflow of long long integer.\n");
+        }
+      theToken->tknType = INTEGER_TOKEN;
+      theToken->integerValue = CreateInteger(theEnv,lvalue);
+      theToken->printForm = LongIntegerToString(theEnv,theToken->integerValue->contents);
+     }
+
+   return;
+  }
+
+/***********************************************************/
+/* CopyToken: Copies values of one token to another token. */
+/***********************************************************/
+void CopyToken(
+  struct token *destination,
+  struct token *source)
+  {
+   destination->tknType = source->tknType;
+   destination->value = source->value;
+   destination->printForm = source->printForm;
+  }
+
+/****************************************/
+/* ResetLineCount: Resets the scanner's */
+/*   line count to zero.                */
+/****************************************/
+void ResetLineCount(
+  Environment *theEnv)
+  {
+   ScannerData(theEnv)->LineCount = 0;
+  }
+
+/***************************************************/
+/* GetLineCount: Returns the scanner's line count. */
+/***************************************************/
+long GetLineCount(
+  Environment *theEnv)
+  {
+   return(ScannerData(theEnv)->LineCount);
+  }
+
+/***********************************************/
+/* SetLineCount: Sets the scanner's line count */
+/*   and returns the previous value.           */
+/***********************************************/
+long SetLineCount(
+  Environment *theEnv,
+  long value)
+  {
+   long oldValue;
+
+   oldValue = ScannerData(theEnv)->LineCount;
+
+   ScannerData(theEnv)->LineCount = value;
+
+   return(oldValue);
+  }
+
+/**********************************/
+/* IncrementLineCount: Increments */
+/*   the scanner's line count.    */
+/**********************************/
+void IncrementLineCount(
+  Environment *theEnv)
+  {
+   ScannerData(theEnv)->LineCount++;
+  }
+
+/**********************************/
+/* DecrementLineCount: Decrements */
+/*   the scanner's line count.    */
+/**********************************/
+void DecrementLineCount(
+  Environment *theEnv)
+  {
+   ScannerData(theEnv)->LineCount--;
+  }
+
+/********************/
+/* TokenTypeToType: */
+/********************/
+unsigned short TokenTypeToType(
+  TokenType theType)
+  {
+   switch (theType)
+     {
+      case FLOAT_TOKEN:
+        return FLOAT_TYPE;
+      case INTEGER_TOKEN:
+        return INTEGER_TYPE;
+      case SYMBOL_TOKEN:
+        return SYMBOL_TYPE;
+      case STRING_TOKEN:
+        return STRING_TYPE;
+      case INSTANCE_NAME_TOKEN:
+        return INSTANCE_NAME_TYPE;
+      case SF_VARIABLE_TOKEN:
+        return SF_VARIABLE;
+      case MF_VARIABLE_TOKEN:
+        return MF_VARIABLE;
+      case GBL_VARIABLE_TOKEN:
+        return GBL_VARIABLE;
+      case MF_GBL_VARIABLE_TOKEN:
+        return MF_GBL_VARIABLE;
+      default:
+        return VOID_TYPE;
+     }
+  }
diff --git a/clips/scanner.h b/clips/scanner.h
new file mode 100755
index 000000000..463cd9408
--- /dev/null
+++ b/clips/scanner.h
@@ -0,0 +1,112 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                 SCANNER HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for scanning lexical tokens from an     */
+/*   input source.                                           */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added SetLineCount function.                   */
+/*                                                           */
+/*            Added UTF-8 support.                           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_scanner
+
+#pragma once
+
+#define _H_scanner
+
+typedef struct token Token;
+
+typedef enum
+  {
+   SYMBOL_TOKEN = 1025,
+   STRING_TOKEN,
+   INSTANCE_NAME_TOKEN,
+   FLOAT_TOKEN,
+   INTEGER_TOKEN,
+   LEFT_PARENTHESIS_TOKEN,
+   RIGHT_PARENTHESIS_TOKEN,
+   SF_VARIABLE_TOKEN,
+   MF_VARIABLE_TOKEN,
+   GBL_VARIABLE_TOKEN,
+   SF_WILDCARD_TOKEN,
+   MF_WILDCARD_TOKEN,
+   MF_GBL_VARIABLE_TOKEN,
+   NOT_CONSTRAINT_TOKEN,
+   AND_CONSTRAINT_TOKEN,
+   OR_CONSTRAINT_TOKEN,
+   STOP_TOKEN,
+   UNKNOWN_VALUE_TOKEN,
+  } TokenType;
+
+struct token
+  {
+   TokenType tknType;
+   union
+     {
+      void *value;
+      CLIPSLexeme *lexemeValue;
+      CLIPSFloat *floatValue;
+      CLIPSInteger *integerValue;
+     };
+   const char *printForm;
+  };
+
+#define SCANNER_DATA 57
+
+struct scannerData
+  {
+   char *GlobalString;
+   size_t GlobalMax;
+   size_t GlobalPos;
+   long LineCount;
+   bool IgnoreCompletionErrors;
+  };
+
+#define ScannerData(theEnv) ((struct scannerData *) GetEnvironmentData(theEnv,SCANNER_DATA))
+
+   void                           InitializeScannerData(Environment *);
+   void                           GetToken(Environment *,const char *,struct token *);
+   void                           CopyToken(struct token *,struct token *);
+   void                           ResetLineCount(Environment *);
+   long                           GetLineCount(Environment *);
+   long                           SetLineCount(Environment *,long);
+   void                           IncrementLineCount(Environment *);
+   void                           DecrementLineCount(Environment *);
+   unsigned short                 TokenTypeToType(TokenType);
+
+#endif /* _H_scanner */
+
+
+
+
diff --git a/clips/setup.h b/clips/setup.h
new file mode 100755
index 000000000..802999035
--- /dev/null
+++ b/clips/setup.h
@@ -0,0 +1,486 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/23/17            */
+   /*                                                     */
+   /*                  SETUP HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: This file is the general header file included by */
+/*   all of the .c source files. It contains global          */
+/*   definitions and the compiler flags which must be edited */
+/*   to create a version for a specific machine, operating   */
+/*   system, or feature set.                                 */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Default locale modification.                   */
+/*                                                           */
+/*            Removed CONFLICT_RESOLUTION_STRATEGIES,        */
+/*            DYNAMIC_SALIENCE, INCREMENTAL_RESET,           */
+/*            LOGICAL_DEPENDENCIES, IMPERATIVE_METHODS,      */
+/*            INSTANCE_PATTERN_MATCHING, and                 */
+/*            IMPERATIVE_MESSAGE_HANDLERS, and               */
+/*            AUXILIARY_MESSAGE_HANDLERS compilation flags.  */
+/*                                                           */
+/*            Removed the SHORT_LINK_NAMES compilation flag. */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, IBM_ICB, IBM_TBC, IBM_ZTC, and        */
+/*            IBM_SC).                                       */
+/*                                                           */
+/*            Renamed IBM_MSC and WIN_MVC compiler flags     */
+/*            and IBM_GCC to WIN_GCC.                        */
+/*                                                           */
+/*            Added LINUX and DARWIN compiler flags.         */
+/*                                                           */
+/*            Removed HELP_FUNCTIONS compilation flag and    */
+/*            associated functionality.                      */
+/*                                                           */
+/*            Removed EMACS_EDITOR compilation flag and      */
+/*            associated functionality.                      */
+/*                                                           */
+/*            Combined BASIC_IO and EXT_IO compilation       */
+/*            flags into the single IO_FUNCTIONS flag.       */
+/*                                                           */
+/*            Used #ifndef for preprocessor definitions so   */
+/*            they can be set at the project or makefile     */
+/*            level.                                         */
+/*                                                           */
+/*            Removed ENVIRONMENT_API_ONLY compilation flag. */
+/*                                                           */
+/*            Combined BASIC_IO and EXT_IO compilation       */
+/*            flags into the IO_FUNCTIONS compilation flag.  */
+/*                                                           */
+/*            Changed the EX_MATH compilation flag to        */
+/*            EXTENDED_MATH_FUNCTIONS.                       */
+/*                                                           */
+/*            Removed VOID definition because of conflict    */
+/*            with Windows.h header file.                    */
+/*                                                           */
+/*            Removed deprecated definitions.                */
+/*                                                           */
+/*            The ALLOW_ENVIRONMENT_GLOBALS flag now         */
+/*            defaults to 0. The use of functions enabled    */
+/*            by this flag is deprecated.                    */
+/*                                                           */
+/*            Removed support for BLOCK_MEMORY.              */
+/*                                                           */
+/*      6.40: Removed globle definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Removed VAX_VMS support.                       */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_setup
+
+#pragma once
+
+#define _H_setup
+
+/****************************************************************/
+/* -------------------- COMPILER FLAGS ------------------------ */
+/****************************************************************/
+
+/*********************************************************************/
+/* Flag denoting the environment in which the executable is to run.  */
+/* Only one of these flags should be turned on (set to 1) at a time. */
+/*********************************************************************/
+
+#ifndef LINUX
+#define LINUX   0   /* Tested with Ubuntu 16.04, Debian 9.1, */
+#endif              /* Fedora 26, Mint 18, and CentOS 7.     */
+
+#ifndef DARWIN
+#define DARWIN  0   /* Darwin Mac OS 10.13 with Console */
+#endif
+
+#ifndef MAC_XCD
+#define MAC_XCD 0   /* MacOS 10.13 with Xcode 9.4 */
+#endif
+
+#ifndef WIN_MVC
+#define WIN_MVC 0   /* Windows 7 or 10, with Visual Studio 2017 */
+#endif
+
+/* The following are untested: */
+
+#ifndef UNIX_V
+#define UNIX_V  0   /* UNIX System V, 4.2bsd, or HP Unix, presumably with gcc */
+#endif
+
+#ifndef UNIX_7
+#define UNIX_7  0   /* UNIX System III Version 7 or Sun Unix, presumably with gcc */
+#endif
+
+#ifndef WIN_GCC
+#define WIN_GCC 0   /* Windows XP, with DJGPP 3.21 */
+#endif
+
+/* Use GENERIC if nothing else is used. */
+
+#ifndef GENERIC
+#if (! UNIX_V) && (! LINUX) && (! UNIX_7) && \
+    (! MAC_XCD) && (! DARWIN) && \
+    (! WIN_MVC) && (! WIN_GCC)
+#define GENERIC 1   /* Generic (any machine)                   */
+#else
+#define GENERIC 0   /* Generic (any machine)                   */
+#endif
+#endif
+
+#if WIN_MVC || WIN_GCC
+#define IBM 1
+#else
+#define IBM 0
+#endif
+
+/***********************************************/
+/* Some definitions for use with declarations. */
+/***********************************************/
+
+#define STD_SIZE size_t
+
+/*******************************************/
+/* RUN_TIME:  Specifies whether a run-time */
+/*   module is being created.              */
+/*******************************************/
+
+#ifndef RUN_TIME
+#define RUN_TIME 0
+#endif
+
+/*************************************************/
+/* DEFRULE_CONSTRUCT: Determines whether defrule */
+/*   construct is included.                      */
+/*************************************************/
+
+#ifndef DEFRULE_CONSTRUCT
+#define DEFRULE_CONSTRUCT 1
+#endif
+
+/************************************************/
+/* DEFMODULE_CONSTRUCT:  Determines whether the */
+/*   defmodule construct is included.           */
+/************************************************/
+
+#ifndef DEFMODULE_CONSTRUCT
+#define DEFMODULE_CONSTRUCT 1
+#endif
+
+/****************************************************/
+/* DEFTEMPLATE_CONSTRUCT:  Determines whether facts */
+/*   and the deftemplate construct are included.    */
+/****************************************************/
+
+#ifndef DEFTEMPLATE_CONSTRUCT
+#define DEFTEMPLATE_CONSTRUCT 1
+#endif
+
+#if ! DEFRULE_CONSTRUCT
+#undef DEFTEMPLATE_CONSTRUCT
+#define DEFTEMPLATE_CONSTRUCT 0
+#endif
+
+/************************************************************/
+/* FACT_SET_QUERIES: Determines if fact-set query functions */
+/*  such as any-factp and do-for-all-facts are included.    */
+/************************************************************/
+
+#ifndef FACT_SET_QUERIES
+#define FACT_SET_QUERIES 1
+#endif
+
+#if ! DEFTEMPLATE_CONSTRUCT
+#undef FACT_SET_QUERIES
+#define FACT_SET_QUERIES        0
+#endif
+
+/****************************************************/
+/* DEFFACTS_CONSTRUCT:  Determines whether deffacts */
+/*   construct is included.                         */
+/****************************************************/
+
+#ifndef DEFFACTS_CONSTRUCT
+#define DEFFACTS_CONSTRUCT 1
+#endif
+
+#if ! DEFTEMPLATE_CONSTRUCT
+#undef DEFFACTS_CONSTRUCT
+#define DEFFACTS_CONSTRUCT 0
+#endif
+
+/************************************************/
+/* DEFGLOBAL_CONSTRUCT:  Determines whether the */
+/*   defglobal construct is included.           */
+/************************************************/
+
+#ifndef DEFGLOBAL_CONSTRUCT
+#define DEFGLOBAL_CONSTRUCT 1
+#endif
+
+/**********************************************/
+/* DEFFUNCTION_CONSTRUCT:  Determines whether */
+/*   deffunction construct is included.       */
+/**********************************************/
+
+#ifndef DEFFUNCTION_CONSTRUCT
+#define DEFFUNCTION_CONSTRUCT 1
+#endif
+
+/*********************************************/
+/* DEFGENERIC_CONSTRUCT:  Determines whether */
+/*   generic functions  are included.        */
+/*********************************************/
+
+#ifndef DEFGENERIC_CONSTRUCT
+#define DEFGENERIC_CONSTRUCT 1
+#endif
+
+/*****************************************************************/
+/* OBJECT_SYSTEM:  Determines whether object system is included. */
+/*   The MULTIFIELD_FUNCTIONS flag should also be on if you want */
+/*   to be able to manipulate multi-field slots.                 */
+/*****************************************************************/
+
+#ifndef OBJECT_SYSTEM
+#define OBJECT_SYSTEM 1
+#endif
+
+/*****************************************************************/
+/* DEFINSTANCES_CONSTRUCT: Determines whether the definstances   */
+/*   construct is enabled.                                       */
+/*****************************************************************/
+
+#ifndef DEFINSTANCES_CONSTRUCT
+#define DEFINSTANCES_CONSTRUCT      1
+#endif
+
+#if ! OBJECT_SYSTEM
+#undef DEFINSTANCES_CONSTRUCT
+#define DEFINSTANCES_CONSTRUCT      0
+#endif
+
+/********************************************************************/
+/* INSTANCE_SET_QUERIES: Determines if instance-set query functions */
+/*  such as any-instancep and do-for-all-instances are included.    */
+/********************************************************************/
+
+#ifndef INSTANCE_SET_QUERIES
+#define INSTANCE_SET_QUERIES 1
+#endif
+
+#if ! OBJECT_SYSTEM
+#undef INSTANCE_SET_QUERIES
+#define INSTANCE_SET_QUERIES        0
+#endif
+
+/******************************************************************/
+/* Check for consistencies associated with the defrule construct. */
+/******************************************************************/
+
+#if (! DEFTEMPLATE_CONSTRUCT) && (! OBJECT_SYSTEM)
+#undef DEFRULE_CONSTRUCT
+#define DEFRULE_CONSTRUCT 0
+#endif
+
+/*******************************************************************/
+/* BLOAD/BSAVE_INSTANCES: Determines if the save/restore-instances */
+/*  functions can be enhanced to perform more quickly by using     */
+/*  binary files                                                   */
+/*******************************************************************/
+
+#ifndef BLOAD_INSTANCES
+#define BLOAD_INSTANCES 1
+#endif
+#ifndef BSAVE_INSTANCES
+#define BSAVE_INSTANCES 1
+#endif
+
+#if ! OBJECT_SYSTEM
+#undef BLOAD_INSTANCES
+#undef BSAVE_INSTANCES
+#define BLOAD_INSTANCES             0
+#define BSAVE_INSTANCES             0
+#endif
+
+/****************************************************************/
+/* EXTENDED MATH PACKAGE FLAG: If this is on, then the extended */
+/* math package functions will be available for use, (normal    */
+/* default). If this flag is off, then the extended math        */
+/* functions will not be available, and the 30K or so of space  */
+/* they require will be free. Usually a concern only on PC type */
+/* machines.                                                    */
+/****************************************************************/
+
+#ifndef EXTENDED_MATH_FUNCTIONS
+#define EXTENDED_MATH_FUNCTIONS 1
+#endif
+
+/****************************************************************/
+/* TEXT PROCESSING : Turn on this flag for support of the       */
+/* hierarchical lookup system.                                  */
+/****************************************************************/
+
+#ifndef TEXTPRO_FUNCTIONS
+#define TEXTPRO_FUNCTIONS 1
+#endif
+
+/*************************************************************************/
+/* BLOAD_ONLY:      Enables bload command and disables the load command. */
+/* BLOAD:           Enables bload command.                               */
+/* BLOAD_AND_BSAVE: Enables bload, and bsave commands.                   */
+/*************************************************************************/
+
+#ifndef BLOAD_ONLY
+#define BLOAD_ONLY 0
+#endif
+#ifndef BLOAD
+#define BLOAD 0
+#endif
+#ifndef BLOAD_AND_BSAVE
+#define BLOAD_AND_BSAVE 1
+#endif
+
+#if RUN_TIME
+#undef BLOAD_ONLY
+#define BLOAD_ONLY      0
+#undef BLOAD
+#define BLOAD           0
+#undef BLOAD_AND_BSAVE
+#define BLOAD_AND_BSAVE 0
+#endif
+
+/********************************************************************/
+/* CONSTRUCT COMPILER: If this flag is turned on, you can generate  */
+/*   C code representing the constructs in the current environment. */
+/*   With the RUN_TIME flag set, this code can be compiled and      */
+/*   linked to create a stand-alone run-time executable.            */
+/********************************************************************/
+
+#ifndef CONSTRUCT_COMPILER
+#define  CONSTRUCT_COMPILER 1
+#endif
+
+#if CONSTRUCT_COMPILER
+#define API_HEADER "clips.h"
+#endif
+
+/************************************************/
+/* IO_FUNCTIONS: Includes printout, read, open, */
+/*   close, format, and readline functions.     */
+/************************************************/
+
+#ifndef IO_FUNCTIONS
+#define IO_FUNCTIONS 1
+#endif
+
+/************************************************/
+/* STRING_FUNCTIONS: Includes string functions: */
+/*   str-length, str-compare, upcase, lowcase,  */
+/*   sub-string, str-index, and eval.           */
+/************************************************/
+
+#ifndef STRING_FUNCTIONS
+#define STRING_FUNCTIONS 1
+#endif
+
+/*********************************************/
+/* MULTIFIELD_FUNCTIONS: Includes multifield */
+/*   functions:  mv-subseq, mv-delete,       */
+/*   mv-append, str-explode, str-implode.    */
+/*********************************************/
+
+#ifndef MULTIFIELD_FUNCTIONS
+#define MULTIFIELD_FUNCTIONS 1
+#endif
+
+/****************************************************/
+/* DEBUGGING_FUNCTIONS: Includes functions such as  */
+/*   rules, facts, matches, ppdefrule, etc.         */
+/****************************************************/
+
+#ifndef DEBUGGING_FUNCTIONS
+#define DEBUGGING_FUNCTIONS 1
+#endif
+
+/***************************************************/
+/* PROFILING_FUNCTIONS: Enables code for profiling */
+/*   constructs and user functions.                */
+/***************************************************/
+
+#ifndef PROFILING_FUNCTIONS
+#define PROFILING_FUNCTIONS 1
+#endif
+
+/*******************************************************************/
+/* WINDOW_INTERFACE : Set this flag if you are recompiling any of  */
+/*   the machine specific GUI interfaces. Currently, when enabled, */
+/*   this flag disables the more processing used by the help       */
+/*   system. This flag also prevents any input or output being     */
+/*   directly sent to stdin or stdout.                             */
+/*******************************************************************/
+
+#ifndef WINDOW_INTERFACE
+#define WINDOW_INTERFACE 0
+#endif
+
+/********************************************/
+/* DEVELOPER: Enables code for debugging a  */
+/*   development version of the executable. */
+/********************************************/
+
+#ifndef DEVELOPER
+#define DEVELOPER 0
+#endif
+
+#if DEVELOPER
+#include <assert.h>
+#define Bogus(x) assert(! (x))
+#else
+#define Bogus(x)
+#endif
+
+/***************************/
+/* Environment Definitions */
+/***************************/
+
+#include "envrnmnt.h"
+
+/*************************************************/
+/* Any user defined global setup information can */
+/* be included in the file usrsetup.h which is   */
+/* an empty file in the baseline version.        */
+/*************************************************/
+
+#include "usrsetup.h"
+
+#endif	/* _H_setup */
+
+
+
+
+
+
+
+
+
+
diff --git a/clips/sortfun.c b/clips/sortfun.c
new file mode 100755
index 000000000..cd90f5fec
--- /dev/null
+++ b/clips/sortfun.c
@@ -0,0 +1,433 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*                SORT FUNCTIONS MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for sorting functions.         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: The sort function leaks memory when called     */
+/*            with a multifield value of length zero.        */
+/*            DR0864                                         */
+/*                                                           */
+/*      6.30: Added environment cleanup call function        */
+/*            DeallocateSortFunctionData.                    */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "dffnxfun.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "sysdep.h"
+
+#include "sortfun.h"
+
+#define SORTFUN_DATA 7
+
+struct sortFunctionData
+  {
+   struct expr *SortComparisonFunction;
+  };
+
+#define SortFunctionData(theEnv) ((struct sortFunctionData *) GetEnvironmentData(theEnv,SORTFUN_DATA))
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    DoMergeSort(Environment *,UDFValue *,UDFValue *,size_t,
+                                              size_t,size_t,size_t,
+                                              bool (*)(Environment *,UDFValue *,UDFValue *));
+   static bool                    DefaultCompareSwapFunction(Environment *,UDFValue *,UDFValue *);
+   static void                    DeallocateSortFunctionData(Environment *);
+
+/****************************************/
+/* SortFunctionDefinitions: Initializes */
+/*   the sorting functions.             */
+/****************************************/
+void SortFunctionDefinitions(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,SORTFUN_DATA,sizeof(struct sortFunctionData),DeallocateSortFunctionData);
+#if ! RUN_TIME
+   AddUDF(theEnv,"sort","bm",1,UNBOUNDED,"*;y",SortFunction,"SortFunction",NULL);
+#endif
+  }
+
+/*******************************************************/
+/* DeallocateSortFunctionData: Deallocates environment */
+/*    data for the sort function.                      */
+/*******************************************************/
+static void DeallocateSortFunctionData(
+  Environment *theEnv)
+  {
+   ReturnExpression(theEnv,SortFunctionData(theEnv)->SortComparisonFunction);
+  }
+
+/********************************/
+/* DefaultCompareSwapFunction:  */
+/********************************/
+static bool DefaultCompareSwapFunction(
+  Environment *theEnv,
+  UDFValue *item1,
+  UDFValue *item2)
+  {
+   UDFValue returnValue;
+
+   SortFunctionData(theEnv)->SortComparisonFunction->argList = GenConstant(theEnv,item1->header->type,item1->value);
+   SortFunctionData(theEnv)->SortComparisonFunction->argList->nextArg = GenConstant(theEnv,item2->header->type,item2->value);
+   ExpressionInstall(theEnv,SortFunctionData(theEnv)->SortComparisonFunction);
+   EvaluateExpression(theEnv,SortFunctionData(theEnv)->SortComparisonFunction,&returnValue);
+   ExpressionDeinstall(theEnv,SortFunctionData(theEnv)->SortComparisonFunction);
+   ReturnExpression(theEnv,SortFunctionData(theEnv)->SortComparisonFunction->argList);
+   SortFunctionData(theEnv)->SortComparisonFunction->argList = NULL;
+
+   if (returnValue.value == FalseSymbol(theEnv))
+     { return false; }
+
+   return true;
+  }
+
+/************************************/
+/* SortFunction: H/L access routine */
+/*   for the rest$ function.        */
+/************************************/
+void SortFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   unsigned argumentCount, i;
+   unsigned long k = 0;
+   size_t j;
+   UDFValue *theArguments, *theArguments2;
+   UDFValue theArg;
+   Multifield *theMultifield, *tempMultifield;
+   const char *functionName;
+   struct expr *functionReference;
+   size_t argumentSize = 0;
+   struct functionDefinition *fptr;
+#if DEFFUNCTION_CONSTRUCT
+   Deffunction *dptr;
+#endif
+
+   /*==================================*/
+   /* Set up the default return value. */
+   /*==================================*/
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   /*=============================================*/
+   /* Verify that the comparison function exists. */
+   /*=============================================*/
+
+   if (! UDFNthArgument(context,1,SYMBOL_BIT,&theArg))
+     { return; }
+
+   functionName = theArg.lexemeValue->contents;
+   functionReference = FunctionReferenceExpression(theEnv,functionName);
+   if (functionReference == NULL)
+     {
+      ExpectedTypeError1(theEnv,"sort",1,"function name, deffunction name, or defgeneric name");
+      return;
+     }
+
+   /*======================================*/
+   /* For an external function, verify the */
+   /* correct number of arguments.         */
+   /*======================================*/
+
+   if (functionReference->type == FCALL)
+     {
+      fptr = functionReference->functionValue;
+      if ((GetMinimumArgs(fptr) > 2) ||
+          (GetMaximumArgs(fptr) == 0) ||
+          (GetMaximumArgs(fptr) == 1))
+        {
+         ExpectedTypeError1(theEnv,"sort",1,"function name expecting two arguments");
+         ReturnExpression(theEnv,functionReference);
+         return;
+        }
+     }
+
+   /*=======================================*/
+   /* For a deffunction, verify the correct */
+   /* number of arguments.                  */
+   /*=======================================*/
+
+#if DEFFUNCTION_CONSTRUCT
+   if (functionReference->type == PCALL)
+     {
+      dptr = (Deffunction *) functionReference->value;
+      if ((dptr->minNumberOfParameters > 2) ||
+          (dptr->maxNumberOfParameters == 0) ||
+          (dptr->maxNumberOfParameters == 1))
+        {
+         ExpectedTypeError1(theEnv,"sort",1,"deffunction name expecting two arguments");
+         ReturnExpression(theEnv,functionReference);
+         return;
+        }
+     }
+#endif
+
+   /*=====================================*/
+   /* If there are no items to be sorted, */
+   /* then return an empty multifield.    */
+   /*=====================================*/
+
+   argumentCount = UDFArgumentCount(context);
+
+   if (argumentCount == 1)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      ReturnExpression(theEnv,functionReference);
+      return;
+     }
+
+   /*=====================================*/
+   /* Retrieve the arguments to be sorted */
+   /* and determine how many there are.   */
+   /*=====================================*/
+
+   theArguments = (UDFValue *) genalloc(theEnv,(argumentCount - 1) * sizeof(UDFValue));
+
+   for (i = 2; i <= argumentCount; i++)
+     {
+      UDFNthArgument(context,i,ANY_TYPE_BITS,&theArguments[i-2]);
+
+      if (theArguments[i-2].header->type == MULTIFIELD_TYPE)
+        { argumentSize += theArguments[i-2].range; }
+      else
+        { argumentSize++; }
+     }
+
+   if (argumentSize == 0)
+     {
+      genfree(theEnv,theArguments,(argumentCount - 1) * sizeof(UDFValue)); /* Bug Fix */
+      SetMultifieldErrorValue(theEnv,returnValue);
+      ReturnExpression(theEnv,functionReference);
+      return;
+     }
+
+   /*====================================*/
+   /* Pack all of the items to be sorted */
+   /* into a data object array.          */
+   /*====================================*/
+
+   theArguments2 = (UDFValue *) genalloc(theEnv,argumentSize * sizeof(UDFValue));
+
+   for (i = 2; i <= argumentCount; i++)
+     {
+      if (theArguments[i-2].header->type == MULTIFIELD_TYPE)
+        {
+         tempMultifield = theArguments[i-2].multifieldValue;
+         for (j = theArguments[i-2].begin; j < (theArguments[i-2].begin + theArguments[i-2].range); j++, k++)
+           {
+            theArguments2[k].value = tempMultifield->contents[j].value;
+           }
+        }
+      else
+        {
+         theArguments2[k].value = theArguments[i-2].value;
+         k++;
+        }
+     }
+
+   genfree(theEnv,theArguments,(argumentCount - 1) * sizeof(UDFValue));
+
+   functionReference->nextArg = SortFunctionData(theEnv)->SortComparisonFunction;
+   SortFunctionData(theEnv)->SortComparisonFunction = functionReference;
+
+   for (i = 0; i < argumentSize; i++)
+     { RetainUDFV(theEnv,&theArguments2[i]); }
+
+   MergeSort(theEnv,argumentSize,theArguments2,DefaultCompareSwapFunction);
+
+   for (i = 0; i < argumentSize; i++)
+     { ReleaseUDFV(theEnv,&theArguments2[i]); }
+
+   SortFunctionData(theEnv)->SortComparisonFunction = SortFunctionData(theEnv)->SortComparisonFunction->nextArg;
+   functionReference->nextArg = NULL;
+   ReturnExpression(theEnv,functionReference);
+
+   theMultifield = CreateMultifield(theEnv,argumentSize);
+
+   for (i = 0; i < argumentSize; i++)
+     {
+      theMultifield->contents[i].value = theArguments2[i].value;
+     }
+
+   genfree(theEnv,theArguments2,argumentSize * sizeof(UDFValue));
+
+   returnValue->begin = 0;
+   returnValue->range = argumentSize;
+   returnValue->value = theMultifield;
+  }
+
+/*******************************************/
+/* MergeSort: Sorts a list of fields       */
+/*   according to user specified criteria. */
+/*******************************************/
+void MergeSort(
+  Environment *theEnv,
+  size_t listSize,
+  UDFValue *theList,
+  bool (*swapFunction)(Environment *,UDFValue *,UDFValue *))
+  {
+   UDFValue *tempList;
+   size_t middle;
+
+   if (listSize <= 1) return;
+
+   /*==============================*/
+   /* Create the temporary storage */
+   /* needed for the merge sort.   */
+   /*==============================*/
+
+   tempList = (UDFValue *) genalloc(theEnv,listSize * sizeof(UDFValue));
+
+   /*=====================================*/
+   /* Call the merge sort driver routine. */
+   /*=====================================*/
+
+   middle = (listSize + 1) / 2;
+   DoMergeSort(theEnv,theList,tempList,0,middle-1,middle,listSize - 1,swapFunction);
+
+   /*==================================*/
+   /* Deallocate the temporary storage */
+   /* needed by the merge sort.        */
+   /*==================================*/
+
+   genfree(theEnv,tempList,listSize * sizeof(UDFValue));
+  }
+
+
+/******************************************************/
+/* DoMergeSort: Driver routine for performing a merge */
+/*   sort on an array of UDFValue structures.       */
+/******************************************************/
+static void DoMergeSort(
+  Environment *theEnv,
+  UDFValue *theList,
+  UDFValue *tempList,
+  size_t s1,
+  size_t e1,
+  size_t s2,
+  size_t e2,
+  bool (*swapFunction)(Environment *,UDFValue *,UDFValue *))
+  {
+   UDFValue temp;
+   size_t middle, size;
+   size_t c1, c2, mergePoint;
+
+   /* Sort the two subareas before merging them. */
+
+   if (s1 == e1)
+     { /* List doesn't need to be merged. */ }
+   else if ((s1 + 1) == e1)
+     {
+      if ((*swapFunction)(theEnv,&theList[s1],&theList[e1]))
+        {
+         TransferDataObjectValues(&temp,&theList[s1]);
+         TransferDataObjectValues(&theList[s1],&theList[e1]);
+         TransferDataObjectValues(&theList[e1],&temp);
+        }
+     }
+   else
+     {
+      size = ((e1 - s1) + 1);
+      middle = s1 + ((size + 1) / 2);
+      DoMergeSort(theEnv,theList,tempList,s1,middle-1,middle,e1,swapFunction);
+     }
+
+   if (s2 == e2)
+     { /* List doesn't need to be merged. */ }
+   else if ((s2 + 1) == e2)
+     {
+      if ((*swapFunction)(theEnv,&theList[s2],&theList[e2]))
+        {
+         TransferDataObjectValues(&temp,&theList[s2]);
+         TransferDataObjectValues(&theList[s2],&theList[e2]);
+         TransferDataObjectValues(&theList[e2],&temp);
+        }
+     }
+   else
+     {
+      size = ((e2 - s2) + 1);
+      middle = s2 + ((size + 1) / 2);
+      DoMergeSort(theEnv,theList,tempList,s2,middle-1,middle,e2,swapFunction);
+     }
+
+   /*======================*/
+   /* Merge the two areas. */
+   /*======================*/
+
+   mergePoint = s1;
+   c1 = s1;
+   c2 = s2;
+
+   while (mergePoint <= e2)
+     {
+      if (c1 > e1)
+        {
+         TransferDataObjectValues(&tempList[mergePoint],&theList[c2]);
+         c2++;
+         mergePoint++;
+        }
+      else if (c2 > e2)
+        {
+         TransferDataObjectValues(&tempList[mergePoint],&theList[c1]);
+         c1++;
+         mergePoint++;
+        }
+      else if ((*swapFunction)(theEnv,&theList[c1],&theList[c2]))
+        {
+         TransferDataObjectValues(&tempList[mergePoint],&theList[c2]);
+         c2++;
+         mergePoint++;
+        }
+      else
+        {
+         TransferDataObjectValues(&tempList[mergePoint],&theList[c1]);
+         c1++;
+         mergePoint++;
+        }
+     }
+
+   /*=======================================*/
+   /* Copy them back to the original array. */
+   /*=======================================*/
+
+   for (c1 = s1; c1 <= e2; c1++)
+     { TransferDataObjectValues(&theList[c1],&tempList[c1]); }
+  }
+
+
+
diff --git a/clips/sortfun.h b/clips/sortfun.h
new file mode 100755
index 000000000..5c76d24c7
--- /dev/null
+++ b/clips/sortfun.h
@@ -0,0 +1,55 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*            SORT FUNCTIONS HEADER MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for sorting functions.         */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: The sort function leaks memory when called     */
+/*            with a multifield value of length zero.        */
+/*            DR0864                                         */
+/*                                                           */
+/*      6.30: Added environment cleanup call function        */
+/*            DeallocateSortFunctionData.                    */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_sortfun
+
+#pragma once
+
+#define _H_sortfun
+
+   void                           SortFunctionDefinitions(Environment *);
+   void                           MergeSort(Environment *,size_t,UDFValue *,
+                                            bool (*)(Environment *,UDFValue *,UDFValue *));
+   void                           SortFunction(Environment *,UDFContext *,UDFValue *);
+
+#endif /* _H_sortfun */
+
+
+
diff --git a/clips/strngfun.c b/clips/strngfun.c
new file mode 100755
index 000000000..4f8b128c0
--- /dev/null
+++ b/clips/strngfun.c
@@ -0,0 +1,1066 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/05/18             */
+   /*                                                     */
+   /*            STRING_TYPE FUNCTIONS MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Contains the code for several string functions   */
+/*   including str-cat, sym-cat, str-length, str-compare,    */
+/*   upcase, lowcase, sub-string, str-index, eval, and       */
+/*   build.                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Barry Cameron                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added support for UTF-8 strings to str-length, */
+/*            str-index, and sub-string functions.           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Added code to keep track of pointers to        */
+/*            constructs that are contained externally to    */
+/*            to constructs, DanglingConstructs.             */
+/*                                                           */
+/*            Fixed str-cat bug that could be invoked by     */
+/*            (funcall str-cat).                             */
+/*                                                           */
+/*      6.31: Prior error flags are cleared before Eval      */
+/*            and Build are processed.                       */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*            The eval function can now access any local     */
+/*            variables that have been defined.              */
+/*                                                           */
+/*            The str-index function now returns 1 if the    */
+/*            search string is "".                           */
+/*                                                           */
+/*            The eval and build functions generate an       */
+/*            error if extraneous input is encountered.      */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if STRING_FUNCTIONS
+
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "commline.h"
+#include "constrct.h"
+#include "cstrcpsr.h"
+#include "engine.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "miscfun.h"
+#include "multifld.h"
+#include "prcdrpsr.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "strngrtr.h"
+#include "scanner.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#if DEFRULE_CONSTRUCT
+#include "drive.h"
+#endif
+
+#include "strngfun.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    StrOrSymCatFunction(UDFContext *,UDFValue *,unsigned short);
+
+/******************************************/
+/* StringFunctionDefinitions: Initializes */
+/*   the string manipulation functions.   */
+/******************************************/
+void StringFunctionDefinitions(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"str-cat","sy",1,UNBOUNDED,"synld" ,StrCatFunction,"StrCatFunction",NULL);
+   AddUDF(theEnv,"sym-cat","sy",1,UNBOUNDED,"synld" ,SymCatFunction,"SymCatFunction",NULL);
+   AddUDF(theEnv,"str-length","l",1,1,"syn",StrLengthFunction,"StrLengthFunction",NULL);
+   AddUDF(theEnv,"str-compare","l",2,3,"*;syn;syn;l" ,StrCompareFunction,"StrCompareFunction",NULL);
+   AddUDF(theEnv,"upcase","syn",1,1,"syn",UpcaseFunction,"UpcaseFunction",NULL);
+   AddUDF(theEnv,"lowcase","syn",1,1,"syn",LowcaseFunction,"LowcaseFunction",NULL);
+   AddUDF(theEnv,"sub-string","s",3,3,"*;l;l;syn",SubStringFunction,"SubStringFunction",NULL);
+   AddUDF(theEnv,"str-index","bl",2,2,"syn",StrIndexFunction,"StrIndexFunction",NULL);
+   AddUDF(theEnv,"eval","*",1,1,"sy",EvalFunction,"EvalFunction",NULL);
+   AddUDF(theEnv,"build","b",1,1,"sy",BuildFunction,"BuildFunction",NULL);
+   AddUDF(theEnv,"string-to-field","*",1,1,"syn",StringToFieldFunction,"StringToFieldFunction",NULL);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+  }
+
+/****************************************/
+/* StrCatFunction: H/L access routine   */
+/*   for the str-cat function.          */
+/****************************************/
+void StrCatFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   StrOrSymCatFunction(context,returnValue,STRING_TYPE);
+  }
+
+/****************************************/
+/* SymCatFunction: H/L access routine   */
+/*   for the sym-cat function.          */
+/****************************************/
+void SymCatFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   StrOrSymCatFunction(context,returnValue,SYMBOL_TYPE);
+  }
+
+/********************************************************/
+/* StrOrSymCatFunction: Driver routine for implementing */
+/*   the str-cat and sym-cat functions.                 */
+/********************************************************/
+static void StrOrSymCatFunction(
+  UDFContext *context,
+  UDFValue *returnValue,
+  unsigned short returnType)
+  {
+   UDFValue theArg;
+   unsigned int numArgs;
+   unsigned int i;
+   size_t total;
+   size_t j;
+   char *theString;
+   CLIPSLexeme **arrayOfStrings;
+   CLIPSLexeme *hashPtr;
+   Environment *theEnv = context->environment;
+
+   /*===============================================*/
+   /* Determine the number of arguments as create a */
+   /* string array which is large enough to store   */
+   /* the string representation of each argument.   */
+   /*===============================================*/
+
+   numArgs = UDFArgumentCount(context);
+   if (numArgs == 0) return;
+
+   arrayOfStrings = (CLIPSLexeme **) gm1(theEnv,sizeof(CLIPSLexeme *) * numArgs);
+   for (i = 0; i < numArgs; i++)
+     { arrayOfStrings[i] = NULL; }
+
+   /*=============================================*/
+   /* Evaluate each argument and store its string */
+   /* representation in the string array.         */
+   /*=============================================*/
+
+   total = 1;
+   for (i = 1 ; i <= numArgs ; i++)
+     {
+      UDFNthArgument(context,i,ANY_TYPE_BITS,&theArg);
+
+      switch(theArg.header->type)
+        {
+         case STRING_TYPE:
+#if OBJECT_SYSTEM
+         case INSTANCE_NAME_TYPE:
+#endif
+         case SYMBOL_TYPE:
+           hashPtr = theArg.lexemeValue;
+           arrayOfStrings[i-1] = hashPtr;
+           IncrementLexemeCount(hashPtr);
+           break;
+
+         case FLOAT_TYPE:
+           hashPtr = CreateString(theEnv,FloatToString(theEnv,theArg.floatValue->contents));
+           arrayOfStrings[i-1] = hashPtr;
+           IncrementLexemeCount(hashPtr);
+           break;
+
+         case INTEGER_TYPE:
+           hashPtr = CreateString(theEnv,LongIntegerToString(theEnv,theArg.integerValue->contents));
+           arrayOfStrings[i-1] = hashPtr;
+           IncrementLexemeCount(hashPtr);
+           break;
+
+         default:
+           UDFInvalidArgumentMessage(context,"string, instance name, symbol, float, or integer");
+           SetEvaluationError(theEnv,true);
+           break;
+        }
+
+      if (EvaluationData(theEnv)->EvaluationError)
+        {
+         for (i = 0; i < numArgs; i++)
+           {
+            if (arrayOfStrings[i] != NULL)
+              { ReleaseLexeme(theEnv,arrayOfStrings[i]); }
+           }
+
+         rm(theEnv,arrayOfStrings,sizeof(CLIPSLexeme *) * numArgs);
+
+         if (returnType == STRING_TYPE)
+           { returnValue->value = CreateString(theEnv,""); }
+         else
+           { returnValue->value = CreateSymbol(theEnv,"nil"); }
+         return;
+        }
+
+      total += strlen(arrayOfStrings[i - 1]->contents);
+     }
+
+   /*=========================================================*/
+   /* Allocate the memory to store the concatenated string or */
+   /* symbol, then copy the values in the string array to the */
+   /* memory just allocated.                                  */
+   /*=========================================================*/
+
+   theString = (char *) gm2(theEnv,(sizeof(char) * total));
+
+   j = 0;
+   for (i = 0 ; i < numArgs ; i++)
+     {
+      gensprintf(&theString[j],"%s",arrayOfStrings[i]->contents);
+      j += strlen(arrayOfStrings[i]->contents);
+     }
+
+   /*=========================================*/
+   /* Return the concatenated value and clean */
+   /* up the temporary memory used.           */
+   /*=========================================*/
+
+   if (returnType == STRING_TYPE)
+     { returnValue->value = CreateString(theEnv,theString); }
+   else
+     { returnValue->value = CreateSymbol(theEnv,theString); }
+   rm(theEnv,theString,sizeof(char) * total);
+
+   for (i = 0; i < numArgs; i++)
+     {
+      if (arrayOfStrings[i] != NULL)
+        { ReleaseLexeme(theEnv,arrayOfStrings[i]); }
+     }
+
+   rm(theEnv,arrayOfStrings,sizeof(CLIPSLexeme *) * numArgs);
+  }
+
+/*******************************************/
+/* StrLengthFunction: H/L access routine   */
+/*   for the str-length function.          */
+/*******************************************/
+void StrLengthFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+
+   /*==================================================================*/
+   /* The argument should be of type symbol, string, or instance name. */
+   /*==================================================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS | INSTANCE_NAME_BIT,&theArg))
+     { return; }
+
+   /*============================================*/
+   /* Return the length of the string or symbol. */
+   /*============================================*/
+
+   returnValue->integerValue = CreateInteger(theEnv,(long long) UTF8Length(theArg.lexemeValue->contents));
+  }
+
+/****************************************/
+/* UpcaseFunction: H/L access routine   */
+/*   for the upcase function.           */
+/****************************************/
+void UpcaseFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   unsigned i;
+   size_t slen;
+   const char *osptr;
+   char *nsptr;
+
+   /*==================================================*/
+   /* The argument should be of type symbol or string. */
+   /*==================================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS | INSTANCE_NAME_BIT,&theArg))
+     { return; }
+
+   /*======================================================*/
+   /* Allocate temporary memory and then copy the original */
+   /* string or symbol to that memory, while uppercasing   */
+   /* lower case alphabetic characters.                    */
+   /*======================================================*/
+
+   osptr = theArg.lexemeValue->contents;
+   slen = strlen(osptr) + 1;
+   nsptr = (char *) gm2(theEnv,slen);
+
+   for (i = 0  ; i < slen ; i++)
+     {
+      if (islower(osptr[i]))
+        { nsptr[i] = (char) toupper(osptr[i]); }
+      else
+        { nsptr[i] = osptr[i]; }
+     }
+
+   /*========================================*/
+   /* Return the uppercased string and clean */
+   /* up the temporary memory used.          */
+   /*========================================*/
+
+   if (CVIsType(&theArg,SYMBOL_BIT))
+     { returnValue->value = CreateSymbol(theEnv,nsptr); }
+   else if (CVIsType(&theArg,INSTANCE_NAME_BIT))
+     { returnValue->value = CreateInstanceName(theEnv,nsptr); }
+   else
+     { returnValue->value = CreateString(theEnv,nsptr); }
+   rm(theEnv,nsptr,slen);
+  }
+
+/*****************************************/
+/* LowcaseFunction: H/L access routine   */
+/*   for the lowcase function.           */
+/*****************************************/
+void LowcaseFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   unsigned i;
+   size_t slen;
+   const char *osptr;
+   char *nsptr;
+
+   /*==================================================*/
+   /* The argument should be of type symbol or string. */
+   /*==================================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS | INSTANCE_NAME_BIT,&theArg))
+     { return; }
+
+   /*======================================================*/
+   /* Allocate temporary memory and then copy the original */
+   /* string or symbol to that memory, while lowercasing   */
+   /* upper case alphabetic characters.                    */
+   /*======================================================*/
+
+   osptr = theArg.lexemeValue->contents;
+   slen = strlen(osptr) + 1;
+   nsptr = (char *) gm2(theEnv,slen);
+
+   for (i = 0  ; i < slen ; i++)
+     {
+      if (isupper(osptr[i]))
+        { nsptr[i] = (char) tolower(osptr[i]); }
+      else
+        { nsptr[i] = osptr[i]; }
+     }
+
+   /*========================================*/
+   /* Return the lowercased string and clean */
+   /* up the temporary memory used.          */
+   /*========================================*/
+
+   if (CVIsType(&theArg,SYMBOL_BIT))
+     { returnValue->value = CreateSymbol(theEnv,nsptr); }
+   else if (CVIsType(&theArg,INSTANCE_NAME_BIT))
+     { returnValue->value = CreateInstanceName(theEnv,nsptr); }
+   else
+     { returnValue->value = CreateString(theEnv,nsptr); }
+   rm(theEnv,nsptr,slen);
+  }
+
+/********************************************/
+/* StrCompareFunction: H/L access routine   */
+/*   for the str-compare function.          */
+/********************************************/
+void StrCompareFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue arg1, arg2, arg3;
+   int compareResult;
+
+   /*=============================================================*/
+   /* The first two arguments should be of type symbol or string. */
+   /*=============================================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS | INSTANCE_NAME_BIT,&arg1))
+     { return; }
+
+   if (! UDFNextArgument(context,LEXEME_BITS | INSTANCE_NAME_BIT,&arg2))
+     { return; }
+
+   /*===================================================*/
+   /* Compare the strings. Use the 3rd argument for the */
+   /* maximum length of comparison, if it is provided.  */
+   /*===================================================*/
+
+   if (UDFHasNextArgument(context))
+     {
+      if (! UDFNextArgument(context,INTEGER_BIT,&arg3))
+        { return; }
+
+      compareResult = strncmp(arg1.lexemeValue->contents,arg2.lexemeValue->contents,
+                            (STD_SIZE) arg3.integerValue->contents);
+     }
+   else
+     { compareResult = strcmp(arg1.lexemeValue->contents,arg2.lexemeValue->contents); }
+
+   /*========================================================*/
+   /* Return Values are as follows:                          */
+   /* -1 is returned if <string-1> is less than <string-2>.  */
+   /*  1 is return if <string-1> is greater than <string-2>. */
+   /*  0 is returned if <string-1> is equal to <string-2>.   */
+   /*========================================================*/
+
+   if (compareResult < 0)
+     { returnValue->integerValue = CreateInteger(theEnv,-1L); }
+   else if (compareResult > 0)
+     { returnValue->integerValue = CreateInteger(theEnv,1L); }
+   else
+     { returnValue->integerValue = CreateInteger(theEnv,0L); }
+  }
+
+/*******************************************/
+/* SubStringFunction: H/L access routine   */
+/*   for the sub-string function.          */
+/*******************************************/
+void SubStringFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   const char *tempString;
+   char *returnString;
+   size_t start, end, i, j, length;
+
+   /*===================================*/
+   /* Check and retrieve the arguments. */
+   /*===================================*/
+
+   if (! UDFFirstArgument(context,INTEGER_BIT,&theArg))
+     { return; }
+
+   if (theArg.integerValue->contents < 1)
+     { start = 0; }
+   else
+     { start = (size_t) theArg.integerValue->contents - 1; }
+
+   if (! UDFNextArgument(context,INTEGER_BIT,&theArg))
+     { return; }
+
+   if (theArg.integerValue->contents < 1)
+     {
+      returnValue->lexemeValue = CreateString(theEnv,"");
+      return;
+     }
+   else
+     { end = (size_t) theArg.integerValue->contents - 1; }
+
+   if (! UDFNextArgument(context,LEXEME_BITS | INSTANCE_NAME_BIT,&theArg))
+     { return; }
+
+   tempString = theArg.lexemeValue->contents;
+
+   /*================================================*/
+   /* If parameters are out of range return an error */
+   /*================================================*/
+
+   length = UTF8Length(tempString);
+
+   if (end > length)
+     { end = length; }
+
+   /*==================================*/
+   /* If the start is greater than the */
+   /* end, return a null string.       */
+   /*==================================*/
+
+   if ((start > end) || (length == 0))
+     {
+      returnValue->lexemeValue = CreateString(theEnv,"");
+      return;
+     }
+
+   /*=============================================*/
+   /* Otherwise, allocate the string and copy the */
+   /* designated portion of the old string to the */
+   /* new string.                                 */
+   /*=============================================*/
+
+   else
+     {
+      start = UTF8Offset(tempString,start);
+      end = UTF8Offset(tempString,end + 1) - 1;
+
+      returnString = (char *) gm2(theEnv,(end - start + 2));  /* (end - start) inclusive + EOS */
+      for(j=0, i=start;i <= end; i++, j++)
+        { *(returnString+j) = *(tempString+i); }
+      *(returnString+j) = '\0';
+     }
+
+   /*========================*/
+   /* Return the new string. */
+   /*========================*/
+
+   returnValue->lexemeValue = CreateString(theEnv,returnString);
+   rm(theEnv,returnString,(end - start + 2));
+  }
+
+/******************************************/
+/* StrIndexFunction: H/L access routine   */
+/*   for the sub-index function.          */
+/******************************************/
+void StrIndexFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg1, theArg2;
+   const char *strg1, *strg2, *strg3;
+   size_t i;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   /*===================================*/
+   /* Check and retrieve the arguments. */
+   /*===================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS | INSTANCE_NAME_BIT,&theArg1))
+     { return; }
+
+   if (! UDFNextArgument(context,LEXEME_BITS | INSTANCE_NAME_BIT,&theArg2))
+     { return; }
+
+   strg1 = theArg1.lexemeValue->contents;
+   strg2 = theArg2.lexemeValue->contents;
+
+   /*=================================*/
+   /* Find the position in string2 of */
+   /* string1 (counting from 1).      */
+   /*=================================*/
+
+   if (strlen(strg1) == 0)
+     {
+      returnValue->integerValue = CreateInteger(theEnv,1LL);
+      return;
+     }
+
+   strg3 = strstr(strg2,strg1);
+   
+   if (strg3 != NULL)
+     {
+      i = (size_t) (strg3 - strg2) + 1;
+      returnValue->integerValue = CreateInteger(theEnv,(long long) UTF8CharNum(strg2,i));
+     }
+  }
+
+/********************************************/
+/* StringToFieldFunction: H/L access routine */
+/*   for the string-to-field function.       */
+/********************************************/
+void StringToFieldFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   
+   ClearErrorValue(theEnv);
+
+   /*==================================================*/
+   /* The argument should be of type symbol or string. */
+   /*==================================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS | INSTANCE_NAME_BIT,&theArg))
+     {
+      SetErrorValue(theEnv,&CreateSymbol(theEnv,"INVALID_ARGUMENT")->header);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*================================*/
+   /* Convert the string to an atom. */
+   /*================================*/
+
+   StringToField(theEnv,theArg.lexemeValue->contents,returnValue);
+  }
+
+/*************************************************************/
+/* StringToField: Converts a string to an atomic data value. */
+/*************************************************************/
+void StringToField(
+  Environment *theEnv,
+  const char *theString,
+  UDFValue *returnValue)
+  {
+   struct token theToken;
+
+   /*====================================*/
+   /* Open the string as an input source */
+   /* and retrieve the first value.      */
+   /*====================================*/
+
+   OpenStringSource(theEnv,"string-to-field-str",theString,0);
+   GetToken(theEnv,"string-to-field-str",&theToken);
+   CloseStringSource(theEnv,"string-to-field-str");
+
+   /*====================================================*/
+   /* Copy the token to the return value data structure. */
+   /*====================================================*/
+
+   if ((theToken.tknType == FLOAT_TOKEN) || (theToken.tknType == STRING_TOKEN) ||
+#if OBJECT_SYSTEM
+       (theToken.tknType == INSTANCE_NAME_TOKEN) ||
+#endif
+       (theToken.tknType == SYMBOL_TOKEN) || (theToken.tknType == INTEGER_TOKEN))
+     { returnValue->value = theToken.value; }
+   else if (theToken.tknType == STOP_TOKEN)
+     {
+      SetErrorValue(theEnv,&CreateSymbol(theEnv,"EOF")->header);
+      returnValue->value = CreateSymbol(theEnv,"EOF");
+     }
+   else if (theToken.tknType == UNKNOWN_VALUE_TOKEN)
+     {
+      SetErrorValue(theEnv,&CreateSymbol(theEnv,"INVALID_ARGUMENT")->header);
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+     }
+   else
+     { returnValue->value = CreateSymbol(theEnv,theToken.printForm); }
+  }
+
+/**************************************/
+/* EvalFunction: H/L access routine   */
+/*   for the eval function.           */
+/**************************************/
+void EvalFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   CLIPSValue cv;
+
+   /*==================================================*/
+   /* The argument should be of type SYMBOL or STRING. */
+   /*==================================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&theArg))
+     { return; }
+
+   /*======================*/
+   /* Evaluate the string. */
+   /*======================*/
+
+   Eval(theEnv,theArg.lexemeValue->contents,&cv);
+   CLIPSToUDFValue(&cv,returnValue);
+  }
+
+/****************************/
+/* Eval: C access routine   */
+/*   for the eval function. */
+/****************************/
+EvalError Eval(
+  Environment *theEnv,
+  const char *theString,
+  CLIPSValue *returnValue)
+  {
+   struct expr *top;
+   bool ov;
+   static int depth = 0;
+   char logicalNameBuffer[20];
+   struct BindInfo *oldBinds;
+   int danglingConstructs;
+   UDFValue evalResult;
+   GCBlock gcb;
+   struct token theToken;
+
+   /*========================================*/
+   /* Set up the frame for tracking garbage. */
+   /*========================================*/
+   
+   GCBlockStart(theEnv,&gcb);
+
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*======================================================*/
+   /* Evaluate the string. Create a different logical name */
+   /* for use each time the eval function is called.       */
+   /*======================================================*/
+
+   depth++;
+   gensprintf(logicalNameBuffer,"Eval-%d",depth);
+   if (OpenStringSource(theEnv,logicalNameBuffer,theString,0) == 0)
+     {
+      SystemError(theEnv,"STRNGFUN",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   /*================================================*/
+   /* Save the current parsing state before routines */
+   /* are called to parse the eval string.           */
+   /*================================================*/
+
+   ov = GetPPBufferStatus(theEnv);
+   SetPPBufferStatus(theEnv,false);
+   oldBinds = GetParsedBindNames(theEnv);
+   SetParsedBindNames(theEnv,NULL);
+   danglingConstructs = ConstructData(theEnv)->DanglingConstructs;
+
+   /*========================================================*/
+   /* Parse the string argument passed to the eval function. */
+   /*========================================================*/
+
+   top = ParseAtomOrExpression(theEnv,logicalNameBuffer,NULL);
+
+   /*============================*/
+   /* Restore the parsing state. */
+   /*============================*/
+
+   SetPPBufferStatus(theEnv,ov);
+   ClearParsedBindNames(theEnv);
+   SetParsedBindNames(theEnv,oldBinds);
+
+   /*===========================================*/
+   /* Return if an error occured while parsing. */
+   /*===========================================*/
+
+   if (top == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      CloseStringSource(theEnv,logicalNameBuffer);
+      GCBlockEnd(theEnv,&gcb);
+      if (returnValue != NULL)
+        { returnValue->lexemeValue = FalseSymbol(theEnv); }
+      depth--;
+      ConstructData(theEnv)->DanglingConstructs = danglingConstructs;
+      return EE_PARSING_ERROR;
+     }
+     
+   /*======================================*/
+   /* Return if there is extraneous input. */
+   /*======================================*/
+
+   GetToken(theEnv,logicalNameBuffer,&theToken);
+   if (theToken.tknType != STOP_TOKEN)
+     {
+      PrintErrorID(theEnv,"STRNGFUN",2,false);
+      WriteString(theEnv,STDERR,"Function 'eval' encountered extraneous input.\n");
+      SetEvaluationError(theEnv,true);
+      ReturnExpression(theEnv,top);
+      CloseStringSource(theEnv,logicalNameBuffer);
+      GCBlockEnd(theEnv,&gcb);
+      if (returnValue != NULL)
+        { returnValue->lexemeValue = FalseSymbol(theEnv); }
+      depth--;
+      ConstructData(theEnv)->DanglingConstructs = danglingConstructs;
+      return EE_PARSING_ERROR;
+     }
+
+   /*====================================*/
+   /* Evaluate the expression and return */
+   /* the memory used to parse it.       */
+   /*====================================*/
+
+   ExpressionInstall(theEnv,top);
+   EvaluateExpression(theEnv,top,&evalResult);
+   ExpressionDeinstall(theEnv,top);
+
+   depth--;
+   ReturnExpression(theEnv,top);
+   CloseStringSource(theEnv,logicalNameBuffer);
+
+   /*====================================================*/
+   /* Convert a partial multifield to a full multifield. */
+   /*====================================================*/
+   
+   NormalizeMultifield(theEnv,&evalResult);
+    
+   /*==============================================*/
+   /* If embedded, reset dangling construct count. */
+   /*==============================================*/
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ConstructData(theEnv)->DanglingConstructs = danglingConstructs; }
+
+   /*================================*/
+   /* Restore the old garbage frame. */
+   /*================================*/
+   
+   if (returnValue != NULL)
+     { GCBlockEndUDF(theEnv,&gcb,&evalResult); }
+   else
+     { GCBlockEnd(theEnv,&gcb); }
+
+   /*==========================================*/
+   /* Perform periodic cleanup if the eval was */
+   /* issued from an embedded controller.      */
+   /*==========================================*/
+
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     {
+      if (returnValue != NULL)
+        { CleanCurrentGarbageFrame(theEnv,&evalResult); }
+      else
+        { CleanCurrentGarbageFrame(theEnv,NULL); }
+      CallPeriodicTasks(theEnv);
+     }
+     
+   if (returnValue != NULL)
+     { returnValue->value = evalResult.value; }
+   
+   if (GetEvaluationError(theEnv)) return EE_PROCESSING_ERROR;
+   
+   return EE_NO_ERROR;
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+/***************************************/
+/* BuildFunction: H/L access routine   */
+/*   for the build function.           */
+/***************************************/
+void BuildFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theArg;
+   BuildError rv;
+
+   /*==================================================*/
+   /* The argument should be of type SYMBOL or STRING. */
+   /*==================================================*/
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&theArg))
+     { return; }
+
+   /*======================*/
+   /* Build the construct. */
+   /*======================*/
+
+   rv = Build(theEnv,theArg.lexemeValue->contents);
+   returnValue->lexemeValue = CreateBoolean(theEnv,(rv == BE_NO_ERROR));
+  }
+
+/*****************************/
+/* Build: C access routine   */
+/*   for the build function. */
+/*****************************/
+BuildError Build(
+  Environment *theEnv,
+  const char *theString)
+  {
+   const char *constructType;
+   struct token theToken;
+   BuildError errorFlag;
+   GCBlock gcb;
+   
+   /*=====================================*/
+   /* If embedded, clear the error flags. */
+   /*=====================================*/
+   
+   if (EvaluationData(theEnv)->CurrentExpression == NULL)
+     { ResetErrorFlags(theEnv); }
+
+   /*====================================================*/
+   /* No additions during defrule join network activity. */
+   /*====================================================*/
+
+#if DEFRULE_CONSTRUCT
+   if (EngineData(theEnv)->JoinOperationInProgress) return BE_COULD_NOT_BUILD_ERROR;
+#endif
+
+   /*===========================================*/
+   /* Create a string source router so that the */
+   /* string can be used as an input source.    */
+   /*===========================================*/
+
+   if (OpenStringSource(theEnv,"build",theString,0) == 0)
+     { return BE_COULD_NOT_BUILD_ERROR; }
+
+   /*===================================*/
+   /* Start a garbage collection block. */
+   /*===================================*/
+
+   GCBlockStart(theEnv,&gcb);
+   
+   /*================================*/
+   /* The first token of a construct */
+   /* must be a left parenthesis.    */
+   /*================================*/
+
+   GetToken(theEnv,"build",&theToken);
+
+   if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      CloseStringSource(theEnv,"build");
+      GCBlockEnd(theEnv,&gcb);
+      return BE_PARSING_ERROR;
+     }
+
+   /*==============================================*/
+   /* The next token should be the construct type. */
+   /*==============================================*/
+
+   GetToken(theEnv,"build",&theToken);
+   if (theToken.tknType != SYMBOL_TOKEN)
+     {
+      CloseStringSource(theEnv,"build");
+      GCBlockEnd(theEnv,&gcb);
+      return BE_PARSING_ERROR;
+     }
+
+   constructType = theToken.lexemeValue->contents;
+
+   /*======================*/
+   /* Parse the construct. */
+   /*======================*/
+
+   errorFlag = ParseConstruct(theEnv,constructType,"build");
+
+   /*=============================*/
+   /* Grab any extraneous token. */
+   /*============================*/
+   
+   GetToken(theEnv,"build",&theToken);
+
+   /*=================================*/
+   /* Close the string source router. */
+   /*=================================*/
+
+   CloseStringSource(theEnv,"build");
+
+   /*=========================================*/
+   /* If an error occured while parsing the   */
+   /* construct, then print an error message. */
+   /*=========================================*/
+
+   if (errorFlag == BE_PARSING_ERROR)
+     {
+      WriteString(theEnv,STDERR,"\nERROR:\n");
+      WriteString(theEnv,STDERR,GetPPBuffer(theEnv));
+      WriteString(theEnv,STDERR,"\n");
+     }
+
+   DestroyPPBuffer(theEnv);
+
+   /*===================================*/
+   /* End the garbage collection block. */
+   /*===================================*/
+   
+   GCBlockEnd(theEnv,&gcb);
+
+   /*===================================*/
+   /* Throw error for extraneous input. */
+   /*===================================*/
+   
+   if ((errorFlag == BE_NO_ERROR) && (theToken.tknType != STOP_TOKEN))
+     {
+      PrintErrorID(theEnv,"STRNGFUN",2,false);
+      WriteString(theEnv,STDERR,"Function 'build' encountered extraneous input.\n");
+      SetEvaluationError(theEnv,true);
+      errorFlag = BE_PARSING_ERROR;
+     }
+
+   /*===================================================*/
+   /* Return the error code from parsing the construct. */
+   /*===================================================*/
+
+   return errorFlag;
+  }
+#else
+/**************************************************/
+/* BuildFunction: This is the non-functional stub */
+/*   provided for use with a run-time version.    */
+/**************************************************/
+void BuildFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PrintErrorID(theEnv,"STRNGFUN",1,false);
+   WriteString(theEnv,STDERR,"Function 'build' does not work in run time modules.\n");
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+  }
+
+/***************************************************/
+/* Build: This is the non-functional stub provided */
+/*   for use with a run-time version.              */
+/***************************************************/
+BuildError Build(
+  Environment *theEnv,
+  const char *theString)
+  {
+   PrintErrorID(theEnv,"STRNGFUN",1,false);
+   WriteString(theEnv,STDERR,"Function 'build' does not work in run time modules.\n");
+   return BE_COULD_NOT_BUILD_ERROR;
+  }
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* STRING_FUNCTIONS */
diff --git a/clips/strngfun.h b/clips/strngfun.h
new file mode 100755
index 000000000..e25c3944c
--- /dev/null
+++ b/clips/strngfun.h
@@ -0,0 +1,99 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/26/17            */
+   /*                                                     */
+   /*          STRING_TYPE FUNCTIONS HEADER FILE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added support for UTF-8 strings to str-length, */
+/*            str-index, and sub-string functions.           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_strngfun
+
+#pragma once
+
+#define _H_strngfun
+
+#include "entities.h"
+
+typedef enum
+  {
+   EE_NO_ERROR = 0,
+   EE_PARSING_ERROR,
+   EE_PROCESSING_ERROR
+  } EvalError;
+
+typedef enum
+  {
+   BE_NO_ERROR = 0,
+   BE_COULD_NOT_BUILD_ERROR,
+   BE_CONSTRUCT_NOT_FOUND_ERROR,
+   BE_PARSING_ERROR,
+  } BuildError;
+
+   BuildError                     Build(Environment *,const char *);
+   EvalError                      Eval(Environment *,const char *,CLIPSValue *);
+   void                           StringFunctionDefinitions(Environment *);
+   void                           StrCatFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SymCatFunction(Environment *,UDFContext *,UDFValue *);
+   void                           StrLengthFunction(Environment *,UDFContext *,UDFValue *);
+   void                           UpcaseFunction(Environment *,UDFContext *,UDFValue *);
+   void                           LowcaseFunction(Environment *,UDFContext *,UDFValue *);
+   void                           StrCompareFunction(Environment *,UDFContext *,UDFValue *);
+   void                           SubStringFunction(Environment *,UDFContext *,UDFValue *);
+   void                           StrIndexFunction(Environment *,UDFContext *,UDFValue *);
+   void                           EvalFunction(Environment *,UDFContext *,UDFValue *);
+   void                           BuildFunction(Environment *,UDFContext *,UDFValue *);
+   void                           StringToFieldFunction(Environment *,UDFContext *,UDFValue *);
+   void                           StringToField(Environment *,const char *,UDFValue *);
+
+#endif /* _H_strngfun */
+
+
+
+
+
+
diff --git a/clips/strngrtr.c b/clips/strngrtr.c
new file mode 100755
index 000000000..c4bb986d6
--- /dev/null
+++ b/clips/strngrtr.c
@@ -0,0 +1,523 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*              STRING_TYPE I/O ROUTER MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: I/O Router routines which allow strings to be    */
+/*   used as input and output sources.                       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Used genstrcpy instead of strcpy.              */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Changed return values for router functions.    */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "constant.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+
+#include "strngrtr.h"
+
+#define READ_STRING 0
+#define WRITE_STRING 1
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    QueryStringCallback(Environment *,const char *,void *);
+   static void                    WriteStringCallback(Environment *,const char *,const char *,void *);
+   static int                     ReadStringCallback(Environment *,const char *,void *);
+   static int                     UnreadStringCallback(Environment *,const char *,int,void *);
+   static StringRouter           *FindStringRouter(Environment *,const char *);
+   static bool                    CreateReadStringSource(Environment *,const char *,const char *,size_t,size_t);
+   static void                    DeallocateStringRouterData(Environment *);
+   static StringBuilderRouter    *FindStringBuilderRouter(Environment *,const char *);
+   static bool                    QueryStringBuilderCallback(Environment *,const char *,void *);
+   static void                    WriteStringBuilderCallback(Environment *,const char *,const char *,void *);
+
+/**********************************************************/
+/* InitializeStringRouter: Initializes string I/O router. */
+/**********************************************************/
+void InitializeStringRouter(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,STRING_ROUTER_DATA,sizeof(struct stringRouterData),DeallocateStringRouterData);
+
+   AddRouter(theEnv,"string",0,QueryStringCallback,WriteStringCallback,ReadStringCallback,UnreadStringCallback,NULL,NULL);
+   AddRouter(theEnv,"stringBuilder",0,QueryStringBuilderCallback,WriteStringBuilderCallback,NULL,NULL,NULL,NULL);
+  }
+
+/*******************************************/
+/* DeallocateStringRouterData: Deallocates */
+/*    environment data for string routers. */
+/*******************************************/
+static void DeallocateStringRouterData(
+  Environment *theEnv)
+  {
+   StringRouter *tmpPtr, *nextPtr;
+   StringBuilderRouter *tmpSBPtr, *nextSBPtr;
+
+   tmpPtr = StringRouterData(theEnv)->ListOfStringRouters;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      rm(theEnv,(void *) tmpPtr->name,strlen(tmpPtr->name) + 1);
+      rtn_struct(theEnv,stringRouter,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+
+   tmpSBPtr = StringRouterData(theEnv)->ListOfStringBuilderRouters;
+   while (tmpSBPtr != NULL)
+     {
+      nextSBPtr = tmpSBPtr->next;
+      rm(theEnv,(void *) tmpSBPtr->name,strlen(tmpSBPtr->name) + 1);
+      rtn_struct(theEnv,stringBuilderRouter,tmpSBPtr);
+      tmpSBPtr = nextSBPtr;
+     }
+  }
+
+/*********************************************************************/
+/* QueryStringCallback: Find routine for string router logical names. */
+/*********************************************************************/
+static bool QueryStringCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+   struct stringRouter *head;
+
+   head = StringRouterData(theEnv)->ListOfStringRouters;
+   while (head != NULL)
+     {
+      if (strcmp(head->name,logicalName) == 0)
+        { return true; }
+      head = head->next;
+     }
+
+   return false;
+  }
+
+/**********************************************************/
+/* WriteStringCallback: Print routine for string routers. */
+/**********************************************************/
+static void WriteStringCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *str,
+  void *context)
+  {
+   struct stringRouter *head;
+
+   head = FindStringRouter(theEnv,logicalName);
+   if (head == NULL)
+     {
+      SystemError(theEnv,"ROUTER",3);
+      ExitRouter(theEnv,EXIT_FAILURE);
+      return;
+     }
+
+   if (head->readWriteType != WRITE_STRING) return;
+
+   if (head->maximumPosition == 0) return;
+
+   if ((head->currentPosition + 1) >= head->maximumPosition) return;
+
+   genstrncpy(&head->writeString[head->currentPosition],
+              str,(STD_SIZE) (head->maximumPosition - head->currentPosition) - 1);
+
+   head->currentPosition += strlen(str);
+  }
+
+/********************************************************/
+/* ReadStringCallback: Getc routine for string routers. */
+/********************************************************/
+static int ReadStringCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+   struct stringRouter *head;
+   int rc;
+
+   head = FindStringRouter(theEnv,logicalName);
+   if (head == NULL)
+     {
+      SystemError(theEnv,"ROUTER",1);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   if (head->readWriteType != READ_STRING) return(EOF);
+   if (head->currentPosition >= head->maximumPosition)
+     {
+      head->currentPosition++;
+      return(EOF);
+     }
+
+   rc = (unsigned char) head->readString[head->currentPosition];
+   head->currentPosition++;
+
+   return(rc);
+  }
+
+/************************************************************/
+/* UnreadStringCallback: Ungetc routine for string routers. */
+/************************************************************/
+static int UnreadStringCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  int ch,
+  void *context)
+  {
+   struct stringRouter *head;
+#if MAC_XCD
+#pragma unused(ch)
+#endif
+
+   head = FindStringRouter(theEnv,logicalName);
+
+   if (head == NULL)
+     {
+      SystemError(theEnv,"ROUTER",2);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   if (head->readWriteType != READ_STRING) return 0;
+   if (head->currentPosition > 0)
+     { head->currentPosition--; }
+
+   return 1;
+  }
+
+/************************************************/
+/* OpenStringSource: Opens a new string router. */
+/************************************************/
+bool OpenStringSource(
+  Environment *theEnv,
+  const char *name,
+  const char *str,
+  size_t currentPosition)
+  {
+   size_t maximumPosition;
+
+   if (str == NULL)
+     {
+      currentPosition = 0;
+      maximumPosition = 0;
+     }
+   else
+     { maximumPosition = strlen(str); }
+
+   return(CreateReadStringSource(theEnv,name,str,currentPosition,maximumPosition));
+  }
+
+/******************************************************/
+/* OpenTextSource: Opens a new string router for text */
+/*   (which is not NULL terminated).                  */
+/******************************************************/
+bool OpenTextSource(
+  Environment *theEnv,
+  const char *name,
+  const char *str,
+  size_t currentPosition,
+  size_t maximumPosition)
+  {
+   if (str == NULL)
+     {
+      currentPosition = 0;
+      maximumPosition = 0;
+     }
+
+   return CreateReadStringSource(theEnv,name,str,currentPosition,maximumPosition);
+  }
+
+/******************************************************************/
+/* CreateReadStringSource: Creates a new string router for input. */
+/******************************************************************/
+static bool CreateReadStringSource(
+  Environment *theEnv,
+  const char *name,
+  const char *str,
+  size_t currentPosition,
+  size_t maximumPosition)
+  {
+   struct stringRouter *newStringRouter;
+   char *theName;
+
+   if (FindStringRouter(theEnv,name) != NULL) return false;
+
+   newStringRouter = get_struct(theEnv,stringRouter);
+   theName = (char *) gm1(theEnv,strlen(name) + 1);
+   genstrcpy(theName,name);
+   newStringRouter->name = theName;
+   newStringRouter->writeString = NULL;
+   newStringRouter->readString = str;
+   newStringRouter->currentPosition = currentPosition;
+   newStringRouter->readWriteType = READ_STRING;
+   newStringRouter->maximumPosition = maximumPosition;
+   newStringRouter->next = StringRouterData(theEnv)->ListOfStringRouters;
+   StringRouterData(theEnv)->ListOfStringRouters = newStringRouter;
+
+   return true;
+  }
+
+/**********************************************/
+/* CloseStringSource: Closes a string router. */
+/**********************************************/
+bool CloseStringSource(
+  Environment *theEnv,
+  const char *name)
+  {
+   struct stringRouter *head, *last;
+
+   last = NULL;
+   head = StringRouterData(theEnv)->ListOfStringRouters;
+   while (head != NULL)
+     {
+      if (strcmp(head->name,name) == 0)
+        {
+         if (last == NULL)
+           {
+            StringRouterData(theEnv)->ListOfStringRouters = head->next;
+            rm(theEnv,(void *) head->name,strlen(head->name) + 1);
+            rtn_struct(theEnv,stringRouter,head);
+            return true;
+           }
+         else
+           {
+            last->next = head->next;
+            rm(theEnv,(void *) head->name,strlen(head->name) + 1);
+            rtn_struct(theEnv,stringRouter,head);
+            return true;
+           }
+        }
+      last = head;
+      head = head->next;
+     }
+
+   return false;
+  }
+
+/******************************************************************/
+/* OpenStringDestination: Opens a new string router for printing. */
+/******************************************************************/
+bool OpenStringDestination(
+  Environment *theEnv,
+  const char *name,
+  char *str,
+  size_t maximumPosition)
+  {
+   struct stringRouter *newStringRouter;
+   char *theName;
+
+   if (FindStringRouter(theEnv,name) != NULL) return false;
+
+   newStringRouter = get_struct(theEnv,stringRouter);
+   theName = (char *) gm1(theEnv,strlen(name) + 1);
+   genstrcpy(theName,name);
+   newStringRouter->name = theName;
+   newStringRouter->readString = NULL;
+   newStringRouter->writeString = str;
+   newStringRouter->currentPosition = 0;
+   newStringRouter->readWriteType = WRITE_STRING;
+   newStringRouter->maximumPosition = maximumPosition;
+   newStringRouter->next = StringRouterData(theEnv)->ListOfStringRouters;
+   StringRouterData(theEnv)->ListOfStringRouters = newStringRouter;
+
+   return true;
+  }
+
+/***************************************************/
+/* CloseStringDestination: Closes a string router. */
+/***************************************************/
+bool CloseStringDestination(
+  Environment *theEnv,
+  const char *name)
+  {
+   return CloseStringSource(theEnv,name);
+  }
+
+/*******************************************************************/
+/* FindStringRouter: Returns a pointer to the named string router. */
+/*******************************************************************/
+static struct stringRouter *FindStringRouter(
+  Environment *theEnv,
+  const char *name)
+  {
+   struct stringRouter *head;
+
+   head = StringRouterData(theEnv)->ListOfStringRouters;
+   while (head != NULL)
+     {
+      if (strcmp(head->name,name) == 0)
+        { return(head); }
+      head = head->next;
+     }
+
+   return NULL;
+  }
+
+/*********************************************/
+/* OpenStringBuilderDestination: Opens a new */
+/*   StringBuilder router for printing.      */
+/*********************************************/
+bool OpenStringBuilderDestination(
+  Environment *theEnv,
+  const char *name,
+  StringBuilder *theSB)
+  {
+   StringBuilderRouter *newStringRouter;
+   char *theName;
+
+   if (FindStringBuilderRouter(theEnv,name) != NULL) return false;
+
+   newStringRouter = get_struct(theEnv,stringBuilderRouter);
+   theName = (char *) gm1(theEnv,strlen(name) + 1);
+   genstrcpy(theName,name);
+   newStringRouter->name = theName;
+   newStringRouter->SBR = theSB;
+   newStringRouter->next = StringRouterData(theEnv)->ListOfStringBuilderRouters;
+   StringRouterData(theEnv)->ListOfStringBuilderRouters = newStringRouter;
+
+   return true;
+  }
+
+/*****************************************/
+/* CloseStringBuilderDestination: Closes */
+/*   a StringBuilder router.             */
+/*****************************************/
+bool CloseStringBuilderDestination(
+  Environment *theEnv,
+  const char *name)
+  {
+   StringBuilderRouter *head, *last;
+
+   last = NULL;
+   head = StringRouterData(theEnv)->ListOfStringBuilderRouters;
+   while (head != NULL)
+     {
+      if (strcmp(head->name,name) == 0)
+        {
+         if (last == NULL)
+           {
+            StringRouterData(theEnv)->ListOfStringBuilderRouters = head->next;
+            rm(theEnv,(void *) head->name,strlen(head->name) + 1);
+            rtn_struct(theEnv,stringBuilderRouter,head);
+            return true;
+           }
+         else
+           {
+            last->next = head->next;
+            rm(theEnv,(void *) head->name,strlen(head->name) + 1);
+            rtn_struct(theEnv,stringBuilderRouter,head);
+            return true;
+           }
+        }
+      last = head;
+      head = head->next;
+     }
+
+   return false;
+  }
+
+/**********************************************/
+/* FindStringBuilderRouter: Returns a pointer */
+/*   to the named StringBuilder router.       */
+/**********************************************/
+static struct stringBuilderRouter *FindStringBuilderRouter(
+  Environment *theEnv,
+  const char *name)
+  {
+   StringBuilderRouter *head;
+
+   head = StringRouterData(theEnv)->ListOfStringBuilderRouters;
+   while (head != NULL)
+     {
+      if (strcmp(head->name,name) == 0)
+        { return head; }
+      head = head->next;
+     }
+
+   return NULL;
+  }
+
+/*********************************************/
+/* QueryStringBuilderCallback: Query routine */
+/*   for stringBuilder router logical names. */
+/*********************************************/
+static bool QueryStringBuilderCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  void *context)
+  {
+   StringBuilderRouter *head;
+
+   head = StringRouterData(theEnv)->ListOfStringBuilderRouters;
+   while (head != NULL)
+     {
+      if (strcmp(head->name,logicalName) == 0)
+        { return true; }
+      head = head->next;
+     }
+
+   return false;
+  }
+
+/*********************************************/
+/* WriteStringBuilderCallback: Print routine */
+/*    for stringBuilder routers.             */
+/*********************************************/
+static void WriteStringBuilderCallback(
+  Environment *theEnv,
+  const char *logicalName,
+  const char *str,
+  void *context)
+  {
+   StringBuilderRouter *head;
+
+   head = FindStringBuilderRouter(theEnv,logicalName);
+   if (head == NULL)
+     {
+      SystemError(theEnv,"ROUTER",3);
+      ExitRouter(theEnv,EXIT_FAILURE);
+      return;
+     }
+     
+   SBAppend(head->SBR,str);
+  }
+
+
diff --git a/clips/strngrtr.h b/clips/strngrtr.h
new file mode 100755
index 000000000..e716896be
--- /dev/null
+++ b/clips/strngrtr.h
@@ -0,0 +1,97 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*            STRING_TYPE I/O ROUTER HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: I/O Router routines which allow strings to be    */
+/*   used as input and output sources.                       */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Used genstrcpy instead of strcpy.              */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_strngrtr
+
+#pragma once
+
+#define _H_strngrtr
+
+typedef struct stringRouter StringRouter;
+typedef struct stringBuilderRouter StringBuilderRouter;
+
+#include <stdio.h>
+#include "utility.h"
+
+#define STRING_ROUTER_DATA 48
+
+struct stringRouter
+  {
+   const char *name;
+   const char *readString;
+   char *writeString;
+   size_t currentPosition;
+   size_t maximumPosition;
+   int readWriteType;
+   StringRouter *next;
+  };
+
+struct stringBuilderRouter
+  {
+   const char *name;
+   StringBuilder *SBR;
+   StringBuilderRouter *next;
+  };
+
+struct stringRouterData
+  {
+   StringRouter *ListOfStringRouters;
+   StringBuilderRouter *ListOfStringBuilderRouters;
+  };
+
+#define StringRouterData(theEnv) ((struct stringRouterData *) GetEnvironmentData(theEnv,STRING_ROUTER_DATA))
+
+/**************************/
+/* I/O ROUTER DEFINITIONS */
+/**************************/
+
+   void                           InitializeStringRouter(Environment *);
+   bool                           OpenStringSource(Environment *,const char *,const char *,size_t);
+   bool                           OpenTextSource(Environment *,const char *,const char *,size_t,size_t);
+   bool                           CloseStringSource(Environment *,const char *);
+   bool                           OpenStringDestination(Environment *,const char *,char *,size_t);
+   bool                           CloseStringDestination(Environment *,const char *);
+   bool                           OpenStringBuilderDestination(Environment *,const char *,StringBuilder *);
+   bool                           CloseStringBuilderDestination(Environment *,const char *);
+
+#endif /* _H_strngrtr */
+
+
diff --git a/clips/symblbin.c b/clips/symblbin.c
new file mode 100755
index 000000000..d6df418f9
--- /dev/null
+++ b/clips/symblbin.c
@@ -0,0 +1,646 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  10/01/16             */
+   /*                                                     */
+   /*                 SYMBOL_TYPE BSAVE MODULE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for      */
+/*    atomic data values.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE || BLOAD_INSTANCES || BSAVE_INSTANCES
+
+#include "argacces.h"
+#include "bload.h"
+#include "bsave.h"
+#include "cstrnbin.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "moduldef.h"
+#include "router.h"
+
+#include "symblbin.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                        ReadNeededBitMaps(Environment *);
+#if BLOAD_AND_BSAVE || BSAVE_INSTANCES
+   static void                        WriteNeededBitMaps(Environment *,FILE *);
+#endif
+
+#if BLOAD_AND_BSAVE || BSAVE_INSTANCES
+
+/**********************************************/
+/* WriteNeededAtomicValues: Save all symbols, */
+/*   floats, integers, and bitmaps needed by  */
+/*   this binary image to the binary file.    */
+/**********************************************/
+void WriteNeededAtomicValues(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   WriteNeededSymbols(theEnv,fp);
+   WriteNeededFloats(theEnv,fp);
+   WriteNeededIntegers(theEnv,fp);
+   WriteNeededBitMaps(theEnv,fp);
+  }
+
+/********************************************************/
+/* InitAtomicValueNeededFlags: Initializes all symbols, */
+/*   floats, integers, and bitmaps as being unneeded by */
+/*   the binary image being saved.                      */
+/********************************************************/
+void InitAtomicValueNeededFlags(
+  Environment *theEnv)
+  {
+   unsigned long i;
+   CLIPSLexeme *symbolPtr, **symbolArray;
+   CLIPSFloat *floatPtr, **floatArray;
+   CLIPSInteger *integerPtr, **integerArray;
+   CLIPSBitMap *bitMapPtr, **bitMapArray;
+
+   /*===============*/
+   /* Mark symbols. */
+   /*===============*/
+
+   symbolArray = GetSymbolTable(theEnv);
+
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      symbolPtr = symbolArray[i];
+      while (symbolPtr != NULL)
+        {
+         symbolPtr->neededSymbol = false;
+         symbolPtr = symbolPtr->next;
+        }
+     }
+
+   /*==============*/
+   /* Mark floats. */
+   /*==============*/
+
+   floatArray = GetFloatTable(theEnv);
+
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+     {
+      floatPtr = floatArray[i];
+      while (floatPtr != NULL)
+        {
+         floatPtr->neededFloat = false;
+         floatPtr = floatPtr->next;
+        }
+     }
+
+   /*================*/
+   /* Mark integers. */
+   /*================*/
+
+   integerArray = GetIntegerTable(theEnv);
+
+   for (i = 0; i < INTEGER_HASH_SIZE; i++)
+     {
+      integerPtr = integerArray[i];
+      while (integerPtr != NULL)
+        {
+         integerPtr->neededInteger = false;
+         integerPtr = integerPtr->next;
+        }
+     }
+
+   /*===============*/
+   /* Mark bitmaps. */
+   /*===============*/
+
+   bitMapArray = GetBitMapTable(theEnv);
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      bitMapPtr = bitMapArray[i];
+      while (bitMapPtr != NULL)
+        {
+         bitMapPtr->neededBitMap = false;
+         bitMapPtr = bitMapPtr->next;
+        }
+     }
+  }
+
+/*****************************************************************/
+/* WriteNeededSymbols: Stores all of the symbols in the symbol   */
+/*   table needed for this binary image in the binary save file. */
+/*****************************************************************/
+void WriteNeededSymbols(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   unsigned long i;
+   size_t length;
+   CLIPSLexeme **symbolArray;
+   CLIPSLexeme *symbolPtr;
+   unsigned long numberOfUsedSymbols = 0;
+   size_t size = 0;
+
+   /*=================================*/
+   /* Get a copy of the symbol table. */
+   /*=================================*/
+
+   symbolArray = GetSymbolTable(theEnv);
+
+   /*======================================================*/
+   /* Get the number of symbols and the total string size. */
+   /*======================================================*/
+
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      for (symbolPtr = symbolArray[i];
+           symbolPtr != NULL;
+           symbolPtr = symbolPtr->next)
+        {
+         if (symbolPtr->neededSymbol)
+           {
+            numberOfUsedSymbols++;
+            size += strlen(symbolPtr->contents) + 1;
+           }
+        }
+     }
+
+   /*=============================================*/
+   /* Write out the symbols and the string sizes. */
+   /*=============================================*/
+
+   GenWrite(&numberOfUsedSymbols,sizeof(unsigned long),fp);
+   GenWrite(&size,sizeof(unsigned long),fp);
+
+   /*=============================*/
+   /* Write out the symbol types. */
+   /*=============================*/
+   
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      for (symbolPtr = symbolArray[i];
+           symbolPtr != NULL;
+           symbolPtr = symbolPtr->next)
+        {
+         if (symbolPtr->neededSymbol)
+           { GenWrite(&symbolPtr->header.type,sizeof(unsigned short),fp); }
+        }
+     }
+     
+   /*========================*/
+   /* Write out the symbols. */
+   /*========================*/
+   
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      for (symbolPtr = symbolArray[i];
+           symbolPtr != NULL;
+           symbolPtr = symbolPtr->next)
+        {
+         if (symbolPtr->neededSymbol)
+           {
+            length = strlen(symbolPtr->contents) + 1;
+            GenWrite((void *) symbolPtr->contents,length,fp);
+           }
+        }
+     }
+  }
+
+/*****************************************************************/
+/* WriteNeededFloats: Stores all of the floats in the float      */
+/*   table needed for this binary image in the binary save file. */
+/*****************************************************************/
+void WriteNeededFloats(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   int i;
+   CLIPSFloat **floatArray;
+   CLIPSFloat *floatPtr;
+   unsigned long numberOfUsedFloats = 0;
+
+   /*================================*/
+   /* Get a copy of the float table. */
+   /*================================*/
+
+   floatArray = GetFloatTable(theEnv);
+
+   /*===========================*/
+   /* Get the number of floats. */
+   /*===========================*/
+
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+     {
+      for (floatPtr = floatArray[i];
+           floatPtr != NULL;
+           floatPtr = floatPtr->next)
+        { if (floatPtr->neededFloat) numberOfUsedFloats++; }
+     }
+
+   /*======================================================*/
+   /* Write out the number of floats and the float values. */
+   /*======================================================*/
+
+   GenWrite(&numberOfUsedFloats,sizeof(unsigned long),fp);
+
+   for (i = 0 ; i < FLOAT_HASH_SIZE; i++)
+     {
+      for (floatPtr = floatArray[i];
+           floatPtr != NULL;
+           floatPtr = floatPtr->next)
+        {
+         if (floatPtr->neededFloat)
+           { GenWrite(&floatPtr->contents,
+                      sizeof(floatPtr->contents),fp); }
+        }
+     }
+  }
+
+/******************************************************************/
+/* WriteNeededIntegers: Stores all of the integers in the integer */
+/*   table needed for this binary image in the binary save file.  */
+/******************************************************************/
+void WriteNeededIntegers(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   int i;
+   CLIPSInteger **integerArray;
+   CLIPSInteger *integerPtr;
+   unsigned long numberOfUsedIntegers = 0;
+
+   /*==================================*/
+   /* Get a copy of the integer table. */
+   /*==================================*/
+
+   integerArray = GetIntegerTable(theEnv);
+
+   /*=============================*/
+   /* Get the number of integers. */
+   /*=============================*/
+
+   for (i = 0 ; i < INTEGER_HASH_SIZE; i++)
+     {
+      for (integerPtr = integerArray[i];
+           integerPtr != NULL;
+           integerPtr = integerPtr->next)
+        {
+         if (integerPtr->neededInteger) numberOfUsedIntegers++;
+        }
+     }
+
+   /*==========================================================*/
+   /* Write out the number of integers and the integer values. */
+   /*==========================================================*/
+
+   GenWrite(&numberOfUsedIntegers,sizeof(unsigned long),fp);
+
+   for (i = 0 ; i < INTEGER_HASH_SIZE; i++)
+     {
+      for (integerPtr = integerArray[i];
+           integerPtr != NULL;
+           integerPtr = integerPtr->next)
+        {
+         if (integerPtr->neededInteger)
+           {
+            GenWrite(&integerPtr->contents,
+                     sizeof(integerPtr->contents),fp);
+           }
+        }
+     }
+  }
+
+/*****************************************************************/
+/* WriteNeededBitMaps: Stores all of the bitmaps in the bitmap   */
+/*   table needed for this binary image in the binary save file. */
+/*****************************************************************/
+static void WriteNeededBitMaps(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   int i;
+   CLIPSBitMap **bitMapArray;
+   CLIPSBitMap *bitMapPtr;
+   unsigned long numberOfUsedBitMaps = 0, size = 0;
+   unsigned short tempSize;
+
+   /*=================================*/
+   /* Get a copy of the bitmap table. */
+   /*=================================*/
+
+   bitMapArray = GetBitMapTable(theEnv);
+
+   /*======================================================*/
+   /* Get the number of bitmaps and the total bitmap size. */
+   /*======================================================*/
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      for (bitMapPtr = bitMapArray[i];
+           bitMapPtr != NULL;
+           bitMapPtr = bitMapPtr->next)
+        {
+         if (bitMapPtr->neededBitMap)
+           {
+            numberOfUsedBitMaps++;
+            size += (unsigned long) (bitMapPtr->size + sizeof(unsigned short));
+           }
+        }
+     }
+
+   /*========================================*/
+   /* Write out the bitmaps and their sizes. */
+   /*========================================*/
+
+   GenWrite(&numberOfUsedBitMaps,sizeof(unsigned long),fp);
+   GenWrite(&size,sizeof(unsigned long),fp);
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      for (bitMapPtr = bitMapArray[i];
+           bitMapPtr != NULL;
+           bitMapPtr = bitMapPtr->next)
+        {
+         if (bitMapPtr->neededBitMap)
+           {
+            tempSize = bitMapPtr->size;
+            GenWrite(&tempSize,sizeof(unsigned short),fp);
+            GenWrite((void *) bitMapPtr->contents,bitMapPtr->size,fp);
+           }
+        }
+     }
+  }
+
+#endif /* BLOAD_AND_BSAVE || BSAVE_INSTANCES */
+
+/*********************************************/
+/* ReadNeededAtomicValues: Read all symbols, */
+/*   floats, integers, and bitmaps needed by */
+/*   this binary image from the binary file. */
+/*********************************************/
+void ReadNeededAtomicValues(
+  Environment *theEnv)
+  {
+   ReadNeededSymbols(theEnv);
+   ReadNeededFloats(theEnv);
+   ReadNeededIntegers(theEnv);
+   ReadNeededBitMaps(theEnv);
+  }
+
+/*******************************************/
+/* ReadNeededSymbols: Reads in the symbols */
+/*   used by the binary image.             */
+/*******************************************/
+void ReadNeededSymbols(
+  Environment *theEnv)
+  {
+   char *symbolNames, *namePtr;
+   unsigned long space;
+   unsigned short *types;
+   unsigned long i;
+
+   /*=================================================*/
+   /* Determine the number of symbol names to be read */
+   /* and space required for them.                    */
+   /*=================================================*/
+
+   GenReadBinary(theEnv,&SymbolData(theEnv)->NumberOfSymbols,sizeof(long));
+   GenReadBinary(theEnv,&space,sizeof(unsigned long));
+   if (SymbolData(theEnv)->NumberOfSymbols == 0)
+     {
+      SymbolData(theEnv)->SymbolArray = NULL;
+      return;
+     }
+
+   /*=======================================*/
+   /* Allocate area for strings to be read. */
+   /*=======================================*/
+   
+   types = (unsigned short *) gm2(theEnv,sizeof(unsigned short) * SymbolData(theEnv)->NumberOfSymbols);
+   GenReadBinary(theEnv,types,sizeof(unsigned short) * SymbolData(theEnv)->NumberOfSymbols);
+
+   symbolNames = (char *) gm2(theEnv,space);
+   GenReadBinary(theEnv,symbolNames,space);
+
+   /*================================================*/
+   /* Store the symbol pointers in the symbol array. */
+   /*================================================*/
+
+   SymbolData(theEnv)->SymbolArray = (CLIPSLexeme **)
+                 gm2(theEnv,sizeof(CLIPSLexeme *) * SymbolData(theEnv)->NumberOfSymbols);
+   namePtr = symbolNames;
+   for (i = 0; i < SymbolData(theEnv)->NumberOfSymbols; i++)
+     {
+      if (types[i] == SYMBOL_TYPE)
+        { SymbolData(theEnv)->SymbolArray[i] = CreateSymbol(theEnv,namePtr); }
+      else if (types[i] == STRING_TYPE)
+        { SymbolData(theEnv)->SymbolArray[i] = CreateString(theEnv,namePtr); }
+      else
+        { SymbolData(theEnv)->SymbolArray[i] = CreateInstanceName(theEnv,namePtr); }
+
+      namePtr += strlen(namePtr) + 1;
+     }
+
+   /*=======================*/
+   /* Free the name buffer. */
+   /*=======================*/
+
+   rm(theEnv,types,sizeof(unsigned short) * SymbolData(theEnv)->NumberOfSymbols);
+   rm(theEnv,symbolNames,space);
+  }
+
+/*****************************************/
+/* ReadNeededFloats: Reads in the floats */
+/*   used by the binary image.           */
+/*****************************************/
+void ReadNeededFloats(
+  Environment *theEnv)
+  {
+   double *floatValues;
+   unsigned long i;
+
+   /*============================================*/
+   /* Determine the number of floats to be read. */
+   /*============================================*/
+
+   GenReadBinary(theEnv,&SymbolData(theEnv)->NumberOfFloats,sizeof(long));
+   if (SymbolData(theEnv)->NumberOfFloats == 0)
+     {
+      SymbolData(theEnv)->FloatArray = NULL;
+      return;
+     }
+
+   /*===============================*/
+   /* Allocate area for the floats. */
+   /*===============================*/
+
+   floatValues = (double *) gm2(theEnv,sizeof(double) * SymbolData(theEnv)->NumberOfFloats);
+   GenReadBinary(theEnv,floatValues,(sizeof(double) * SymbolData(theEnv)->NumberOfFloats));
+
+   /*======================================*/
+   /* Store the floats in the float array. */
+   /*======================================*/
+
+   SymbolData(theEnv)->FloatArray = (CLIPSFloat **)
+               gm2(theEnv,sizeof(CLIPSFloat *) * SymbolData(theEnv)->NumberOfFloats);
+   for (i = 0; i < SymbolData(theEnv)->NumberOfFloats; i++)
+     { SymbolData(theEnv)->FloatArray[i] = CreateFloat(theEnv,floatValues[i]); }
+
+   /*========================*/
+   /* Free the float buffer. */
+   /*========================*/
+
+   rm(theEnv,floatValues,(sizeof(double) * SymbolData(theEnv)->NumberOfFloats));
+  }
+
+/*********************************************/
+/* ReadNeededIntegers: Reads in the integers */
+/*   used by the binary image.               */
+/*********************************************/
+void ReadNeededIntegers(
+  Environment *theEnv)
+  {
+   long long *integerValues;
+   unsigned long i;
+
+   /*==============================================*/
+   /* Determine the number of integers to be read. */
+   /*==============================================*/
+
+   GenReadBinary(theEnv,&SymbolData(theEnv)->NumberOfIntegers,sizeof(unsigned long));
+   if (SymbolData(theEnv)->NumberOfIntegers == 0)
+     {
+      SymbolData(theEnv)->IntegerArray = NULL;
+      return;
+     }
+
+   /*=================================*/
+   /* Allocate area for the integers. */
+   /*=================================*/
+
+   integerValues = (long long *) gm2(theEnv,(sizeof(long long) * SymbolData(theEnv)->NumberOfIntegers));
+   GenReadBinary(theEnv,integerValues,(sizeof(long long) * SymbolData(theEnv)->NumberOfIntegers));
+
+   /*==========================================*/
+   /* Store the integers in the integer array. */
+   /*==========================================*/
+
+   SymbolData(theEnv)->IntegerArray = (CLIPSInteger **)
+           gm2(theEnv,(sizeof(CLIPSInteger *) * SymbolData(theEnv)->NumberOfIntegers));
+   for (i = 0; i < SymbolData(theEnv)->NumberOfIntegers; i++)
+     { SymbolData(theEnv)->IntegerArray[i] = CreateInteger(theEnv,integerValues[i]); }
+
+   /*==========================*/
+   /* Free the integer buffer. */
+   /*==========================*/
+
+   rm(theEnv,integerValues,(sizeof(long long) * SymbolData(theEnv)->NumberOfIntegers));
+  }
+
+/*******************************************/
+/* ReadNeededBitMaps: Reads in the bitmaps */
+/*   used by the binary image.             */
+/*******************************************/
+static void ReadNeededBitMaps(
+  Environment *theEnv)
+  {
+   char *bitMapStorage, *bitMapPtr;
+   unsigned long space;
+   unsigned long i;
+   unsigned short *tempSize;
+
+   /*=======================================*/
+   /* Determine the number of bitmaps to be */
+   /* read and space required for them.     */
+   /*=======================================*/
+
+   GenReadBinary(theEnv,&SymbolData(theEnv)->NumberOfBitMaps,sizeof(long));
+   GenReadBinary(theEnv,&space,sizeof(unsigned long));
+   if (SymbolData(theEnv)->NumberOfBitMaps == 0)
+     {
+      SymbolData(theEnv)->BitMapArray = NULL;
+      return;
+     }
+
+   /*=======================================*/
+   /* Allocate area for bitmaps to be read. */
+   /*=======================================*/
+
+   bitMapStorage = (char *) gm2(theEnv,space);
+   GenReadBinary(theEnv,bitMapStorage,space);
+
+   /*================================================*/
+   /* Store the bitMap pointers in the bitmap array. */
+   /*================================================*/
+
+   SymbolData(theEnv)->BitMapArray = (CLIPSBitMap **)
+                 gm2(theEnv,sizeof(CLIPSBitMap *) * SymbolData(theEnv)->NumberOfBitMaps);
+   bitMapPtr = bitMapStorage;
+   for (i = 0; i < SymbolData(theEnv)->NumberOfBitMaps; i++)
+     {
+      tempSize = (unsigned short *) bitMapPtr;
+      SymbolData(theEnv)->BitMapArray[i] = (CLIPSBitMap *) AddBitMap(theEnv,bitMapPtr+sizeof(unsigned short),*tempSize);
+      bitMapPtr += *tempSize + sizeof(unsigned short);
+     }
+
+   /*=========================*/
+   /* Free the bitmap buffer. */
+   /*=========================*/
+
+   rm(theEnv,bitMapStorage,space);
+  }
+
+/**********************************************************/
+/* FreeAtomicValueStorage: Returns the memory allocated   */
+/*   for storing the pointers to atomic data values used  */
+/*   in refreshing expressions and other data structures. */
+/**********************************************************/
+void FreeAtomicValueStorage(
+  Environment *theEnv)
+  {
+   if (SymbolData(theEnv)->SymbolArray != NULL)
+     rm(theEnv,SymbolData(theEnv)->SymbolArray,sizeof(CLIPSLexeme *) * SymbolData(theEnv)->NumberOfSymbols);
+   if (SymbolData(theEnv)->FloatArray != NULL)
+     rm(theEnv,SymbolData(theEnv)->FloatArray,sizeof(CLIPSFloat *) * SymbolData(theEnv)->NumberOfFloats);
+   if (SymbolData(theEnv)->IntegerArray != NULL)
+     rm(theEnv,SymbolData(theEnv)->IntegerArray,sizeof(CLIPSInteger *) * SymbolData(theEnv)->NumberOfIntegers);
+   if (SymbolData(theEnv)->BitMapArray != NULL)
+     rm(theEnv,SymbolData(theEnv)->BitMapArray,sizeof(CLIPSBitMap *) * SymbolData(theEnv)->NumberOfBitMaps);
+
+   SymbolData(theEnv)->SymbolArray = NULL;
+   SymbolData(theEnv)->FloatArray = NULL;
+   SymbolData(theEnv)->IntegerArray = NULL;
+   SymbolData(theEnv)->BitMapArray = NULL;
+   SymbolData(theEnv)->NumberOfSymbols = 0;
+   SymbolData(theEnv)->NumberOfFloats = 0;
+   SymbolData(theEnv)->NumberOfIntegers = 0;
+   SymbolData(theEnv)->NumberOfBitMaps = 0;
+  }
+
+#endif /* BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE || BLOAD_INSTANCES || BSAVE_INSTANCES */
diff --git a/clips/symblbin.h b/clips/symblbin.h
new file mode 100755
index 000000000..6954f6319
--- /dev/null
+++ b/clips/symblbin.h
@@ -0,0 +1,64 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/01/16            */
+   /*                                                     */
+   /*           SYMBOL_TYPE BINARY SAVE HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for      */
+/*    atomic data values.                                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_symblbin
+
+#pragma once
+
+#define _H_symblbin
+
+#include <stdio.h>
+
+#include "symbol.h"
+
+#define BitMapPointer(i) ((CLIPSBitMap *) (SymbolData(theEnv)->BitMapArray[i]))
+#define SymbolPointer(i) ((CLIPSLexeme *) (SymbolData(theEnv)->SymbolArray[i]))
+#define FloatPointer(i) ((CLIPSFloat *) (SymbolData(theEnv)->FloatArray[i]))
+#define IntegerPointer(i) ((CLIPSInteger *) (SymbolData(theEnv)->IntegerArray[i]))
+
+   void                    MarkNeededAtomicValues(Environment);
+   void                    WriteNeededAtomicValues(Environment *,FILE *);
+   void                    ReadNeededAtomicValues(Environment *);
+   void                    InitAtomicValueNeededFlags(Environment *);
+   void                    FreeAtomicValueStorage(Environment *);
+   void                    WriteNeededSymbols(Environment *,FILE *);
+   void                    WriteNeededFloats(Environment *,FILE *);
+   void                    WriteNeededIntegers(Environment *,FILE *);
+   void                    ReadNeededSymbols(Environment *);
+   void                    ReadNeededFloats(Environment *);
+   void                    ReadNeededIntegers(Environment *);
+
+#endif /* _H_symblbin */
+
+
+
diff --git a/clips/symblcmp.c b/clips/symblcmp.c
new file mode 100755
index 000000000..97f7dc6a3
--- /dev/null
+++ b/clips/symblcmp.c
@@ -0,0 +1,893 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*           SYMBOL_TYPE CONSTRUCT COMPILER MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for       */
+/*   atomic data values: symbols, integers, floats, and      */
+/*   bit maps.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Barry Cameron                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "constant.h"
+#include "conscomp.h"
+#include "constrct.h"
+#include "cstrncmp.h"
+#include "cstrccom.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "router.h"
+#include "symbol.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "symblcmp.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static unsigned int                SymbolHashNodesToCode(Environment *,const char *,const char *,char *,unsigned int);
+   static unsigned int                BitMapHashNodesToCode(Environment *,const char *,const char *,char *,unsigned int);
+   static unsigned int                BitMapValuesToCode(Environment *,const char *,const char *, char *,unsigned int);
+   static unsigned int                FloatHashNodesToCode(Environment *,const char *,const char *,char *,unsigned int);
+   static unsigned int                IntegerHashNodesToCode(Environment *,const char *,const char *,char *,unsigned int);
+   static int                         HashTablesToCode(Environment *,const char *,const char *,char *);
+   static void                        PrintCString(FILE *,const char *);
+
+/**************************************************************/
+/* AtomicValuesToCode: Driver routine for generating the code */
+/*  used by the symbol, integer, float, and bit map tables.   */
+/**************************************************************/
+void AtomicValuesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer)
+  {
+   unsigned int version; // TBD Necessary?
+
+   SetAtomicValueIndices(theEnv,true);
+
+   HashTablesToCode(theEnv,fileName,pathName,fileNameBuffer);
+
+   version = SymbolHashNodesToCode(theEnv,fileName,pathName,fileNameBuffer,5);
+   version = FloatHashNodesToCode(theEnv,fileName,pathName,fileNameBuffer,version);
+   version = IntegerHashNodesToCode(theEnv,fileName,pathName,fileNameBuffer,version);
+   version = BitMapHashNodesToCode(theEnv,fileName,pathName,fileNameBuffer,version);
+   BitMapValuesToCode(theEnv,fileName,pathName,fileNameBuffer,version);
+  }
+
+/*****************************************************/
+/* SymbolHashNodesToCode: Produces the code for the  */
+/*   symbol hash table entries for a run-time module */
+/*   created using the constructs-to-c function.     */
+/*****************************************************/
+static unsigned int SymbolHashNodesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int version)
+  {
+   unsigned long i, j;
+   CLIPSLexeme *hashPtr;
+   unsigned int count;
+   unsigned int numberOfEntries;
+   CLIPSLexeme **symbolTable;
+   bool newHeader = true;
+   int arrayVersion = 1;
+   FILE *fp;
+
+   /*====================================*/
+   /* Count the total number of entries. */
+   /*====================================*/
+
+   symbolTable = GetSymbolTable(theEnv);
+   count = numberOfEntries = 0;
+
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      for (hashPtr = symbolTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        { numberOfEntries++; }
+     }
+
+   if (numberOfEntries == 0) return version;
+
+   for (i = 1; i <= (numberOfEntries / ConstructCompilerData(theEnv)->MaxIndices) + 1 ; i++)
+     { fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern CLIPSLexeme S%d_%ld[];\n",ConstructCompilerData(theEnv)->ImageID,i); }
+
+   /*==================*/
+   /* Create the file. */
+   /*==================*/
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL) return version;
+
+   /*===================*/
+   /* List the entries. */
+   /*===================*/
+
+   j = 0;
+
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      for (hashPtr = symbolTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        {
+         if (newHeader)
+           {
+            fprintf(fp,"CLIPSLexeme S%d_%d[] = {\n",ConstructCompilerData(theEnv)->ImageID,arrayVersion);
+            newHeader = false;
+           }
+
+         if (hashPtr->header.type == SYMBOL_TYPE)
+           { fprintf(fp,"{{SYMBOL_TYPE},"); }
+         else if (hashPtr->header.type == STRING_TYPE)
+           { fprintf(fp,"{{STRING_TYPE},"); }
+         else
+           { fprintf(fp,"{{INSTANCE_NAME_TYPE},"); }
+           
+         if (hashPtr->next == NULL)
+           { fprintf(fp,"NULL,"); }
+         else
+           {
+            if ((j + 1) >= (unsigned long) ConstructCompilerData(theEnv)->MaxIndices)
+              { fprintf(fp,"&S%d_%d[%d],",ConstructCompilerData(theEnv)->ImageID,arrayVersion + 1,0); }
+            else
+              { fprintf(fp,"&S%d_%d[%ld],",ConstructCompilerData(theEnv)->ImageID,arrayVersion,j + 1); }
+           }
+
+         fprintf(fp,"%ld,1,0,0,%ld,",hashPtr->count + 1,i);
+         PrintCString(fp,hashPtr->contents);
+
+         count++;
+         j++;
+
+         if ((count == numberOfEntries) || (j >= ConstructCompilerData(theEnv)->MaxIndices))
+           {
+            fprintf(fp,"}};\n");
+            GenClose(theEnv,fp);
+            j = 0;
+            arrayVersion++;
+            version++;
+            if (count < numberOfEntries)
+              {
+               if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL)
+                 { return 0; }
+               newHeader = true;
+              }
+           }
+         else
+           { fprintf(fp,"},\n"); }
+        }
+     }
+
+   return version;
+  }
+
+/******************************************************/
+/* BitMapHashNodesToCode: Produces the code for the   */
+/*   bit map hash table entries for a run-time module */
+/*   created using the constructs-to-c function.      */
+/******************************************************/
+static unsigned int BitMapHashNodesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int version)
+  {
+   unsigned int i, j;
+   CLIPSBitMap *hashPtr;
+   unsigned int count;
+   unsigned int numberOfEntries;
+   CLIPSBitMap **bitMapTable;
+   bool newHeader = true;
+   unsigned int arrayVersion = 1;
+   FILE *fp;
+   unsigned int longsReqdPartition = 1, longsReqdPartitionCount = 0;
+
+   /*====================================*/
+   /* Count the total number of entries. */
+   /*====================================*/
+
+   bitMapTable = GetBitMapTable(theEnv);
+   count = numberOfEntries = 0;
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      for (hashPtr = bitMapTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        { numberOfEntries++; }
+     }
+
+   if (numberOfEntries == 0) return version;
+
+   for (i = 1; i <= (numberOfEntries / ConstructCompilerData(theEnv)->MaxIndices) + 1 ; i++)
+     { fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern struct clipsBitMap B%d_%d[];\n",ConstructCompilerData(theEnv)->ImageID,i); }
+
+   /*==================*/
+   /* Create the file. */
+   /*==================*/
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL) return version;
+
+   /*===================*/
+   /* List the entries. */
+   /*===================*/
+
+   j = 0;
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      for (hashPtr = bitMapTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        {
+         if (newHeader)
+           {
+            fprintf(fp,"struct clipsBitMap B%d_%d[] = {\n",ConstructCompilerData(theEnv)->ImageID,arrayVersion);
+            newHeader = false;
+           }
+           
+         fprintf(fp,"{{BITMAP_TYPE},");
+         
+         if (hashPtr->next == NULL)
+           { fprintf(fp,"NULL,"); }
+         else
+           {
+            if ((j + 1) >= ConstructCompilerData(theEnv)->MaxIndices)
+              { fprintf(fp,"&B%d_%d[%d],",ConstructCompilerData(theEnv)->ImageID,arrayVersion + 1,0); }
+            else
+              { fprintf(fp,"&B%d_%d[%d],",ConstructCompilerData(theEnv)->ImageID,arrayVersion,j + 1); }
+           }
+
+         fprintf(fp,"%ld,1,0,0,%d,(char *) &L%d_%d[%d],%d",
+                     hashPtr->count + 1,i,
+                     ConstructCompilerData(theEnv)->ImageID,longsReqdPartition,longsReqdPartitionCount,
+                     hashPtr->size);
+
+         longsReqdPartitionCount += (hashPtr->size / sizeof(unsigned long));
+         if ((hashPtr->size % sizeof(unsigned long)) != 0)
+           longsReqdPartitionCount++;
+         if (longsReqdPartitionCount >= ConstructCompilerData(theEnv)->MaxIndices)
+           {
+            longsReqdPartitionCount = 0;
+            longsReqdPartition++;
+           }
+
+         count++;
+         j++;
+
+         if ((count == numberOfEntries) || (j >= ConstructCompilerData(theEnv)->MaxIndices))
+           {
+            fprintf(fp,"}};\n");
+            GenClose(theEnv,fp);
+            j = 0;
+            arrayVersion++;
+            version++;
+            if (count < numberOfEntries)
+              {
+               if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL)
+                 { return 0; }
+               newHeader = true;
+              }
+           }
+         else
+           { fprintf(fp,"},\n"); }
+        }
+     }
+
+   return version;
+  }
+
+/*****************************************************/
+/* BitMapValuesToCode: Produces the code for the bit */
+/*   map strings for a run-time module created using */
+/*   the constructs-to-c function.                   */
+/*****************************************************/
+static unsigned int BitMapValuesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int version)
+  {
+   unsigned int i, j, k;
+   unsigned l;
+   CLIPSBitMap *hashPtr;
+   unsigned int count;
+   unsigned int numberOfEntries;
+   CLIPSBitMap **bitMapTable;
+   bool newHeader = true;
+   unsigned int arrayVersion = 1;
+   FILE *fp;
+   unsigned long tmpLong;
+   unsigned int longsReqd;
+
+   /*====================================*/
+   /* Count the total number of entries. */
+   /*====================================*/
+
+   bitMapTable = GetBitMapTable(theEnv);
+   count = numberOfEntries = 0;
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      for (hashPtr = bitMapTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        {
+         numberOfEntries += (hashPtr->size / sizeof(unsigned long));
+         if ((hashPtr->size % sizeof(unsigned long)) != 0)
+           { numberOfEntries++; }
+        }
+     }
+
+   if (numberOfEntries == 0) return version;
+
+   for (i = 1; i <= (numberOfEntries / ConstructCompilerData(theEnv)->MaxIndices) + 1 ; i++)
+     { fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern unsigned long L%d_%d[];\n",ConstructCompilerData(theEnv)->ImageID,i); }
+
+   /*==================*/
+   /* Create the file. */
+   /*==================*/
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL) return version;
+
+   /*===================*/
+   /* List the entries. */
+   /*===================*/
+
+   j = 0;
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      for (hashPtr = bitMapTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        {
+         if (newHeader)
+           {
+            fprintf(fp,"unsigned long L%d_%d[] = {\n",ConstructCompilerData(theEnv)->ImageID,arrayVersion);
+            newHeader = false;
+           }
+
+         longsReqd = (hashPtr->size / sizeof(unsigned long));
+         if ((hashPtr->size % sizeof(unsigned long)) != 0)
+           longsReqd++;
+
+         for (k = 0 ; k < longsReqd ; k++)
+           {
+            if (k > 0)
+              fprintf(fp,",");
+            tmpLong = 0L;
+            for (l = 0 ;
+                 ((l < sizeof(unsigned long)) &&
+                 (((k * sizeof(unsigned long)) + l) < (size_t) hashPtr->size)) ;
+                 l++)
+              ((char *) &tmpLong)[l] = hashPtr->contents[(k * sizeof(unsigned long)) + l];
+            fprintf(fp,"0x%lxL",tmpLong);
+           }
+
+         count += longsReqd;
+         j += longsReqd;
+
+         if ((count == numberOfEntries) || (j >= ConstructCompilerData(theEnv)->MaxIndices))
+           {
+            fprintf(fp,"};\n");
+            GenClose(theEnv,fp);
+            j = 0;
+            arrayVersion++;
+            version++;
+            if (count < numberOfEntries)
+              {
+               if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL)
+                 { return 0; }
+               newHeader = true;
+              }
+           }
+         else
+           { fprintf(fp,",\n"); }
+        }
+     }
+
+   return version;
+  }
+
+/****************************************************/
+/* FloatHashNodesToCode: Produces the code for the  */
+/*   float hash table entries for a run-time module */
+/*   created using the constructs-to-c function.    */
+/****************************************************/
+static unsigned int FloatHashNodesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int version)
+  {
+   unsigned int i, j;
+   CLIPSFloat *hashPtr;
+   unsigned int count;
+   unsigned int numberOfEntries;
+   CLIPSFloat **floatTable;
+   bool newHeader = true;
+   FILE *fp;
+   unsigned int arrayVersion = 1;
+
+   /*====================================*/
+   /* Count the total number of entries. */
+   /*====================================*/
+
+   floatTable = GetFloatTable(theEnv);
+   count = numberOfEntries = 0;
+
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+     {
+      for (hashPtr = floatTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        { numberOfEntries++; }
+     }
+
+   if (numberOfEntries == 0) return version;
+
+   for (i = 1; i <= (numberOfEntries / ConstructCompilerData(theEnv)->MaxIndices) + 1 ; i++)
+     { fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern CLIPSFloat F%d_%d[];\n",ConstructCompilerData(theEnv)->ImageID,i); }
+
+   /*==================*/
+   /* Create the file. */
+   /*==================*/
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL) return version;
+
+   /*===================*/
+   /* List the entries. */
+   /*===================*/
+
+   j = 0;
+
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+     {
+      for (hashPtr = floatTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        {
+         if (newHeader)
+           {
+            fprintf(fp,"CLIPSFloat F%d_%d[] = {\n",ConstructCompilerData(theEnv)->ImageID,arrayVersion);
+            newHeader = false;
+           }
+           
+         fprintf(fp,"{{FLOAT_TYPE},");
+         
+         if (hashPtr->next == NULL)
+           { fprintf(fp,"NULL,"); }
+         else
+           {
+            if ((j + 1) >= ConstructCompilerData(theEnv)->MaxIndices)
+              { fprintf(fp,"&F%d_%d[%d],",ConstructCompilerData(theEnv)->ImageID,arrayVersion + 1,0); }
+            else
+              { fprintf(fp,"&F%d_%d[%d],",ConstructCompilerData(theEnv)->ImageID,arrayVersion,j + 1); }
+           }
+
+         fprintf(fp,"%ld,1,0,0,%d,",hashPtr->count + 1,i);
+         fprintf(fp,"%s",FloatToString(theEnv,hashPtr->contents));
+
+         count++;
+         j++;
+
+         if ((count == numberOfEntries) || (j >= ConstructCompilerData(theEnv)->MaxIndices))
+           {
+            fprintf(fp,"}};\n");
+            GenClose(theEnv,fp);
+            j = 0;
+            version++;
+            arrayVersion++;
+            if (count < numberOfEntries)
+              {
+               if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL)
+                 { return 0; }
+               newHeader = true;
+              }
+           }
+         else
+           { fprintf(fp,"},\n"); }
+        }
+     }
+
+   return version;
+  }
+
+/******************************************************/
+/* IntegerHashNodesToCode: Produces the code for the  */
+/*   integer hash table entries for a run-time module */
+/*   created using the constructs-to-c function.      */
+/******************************************************/
+static unsigned int IntegerHashNodesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int version)
+  {
+   unsigned int i, j;
+   CLIPSInteger *hashPtr;
+   unsigned int count;
+   unsigned int numberOfEntries;
+   CLIPSInteger **integerTable;
+   bool newHeader = true;
+   FILE *fp;
+   unsigned int arrayVersion = 1;
+
+   /*====================================*/
+   /* Count the total number of entries. */
+   /*====================================*/
+
+   integerTable = GetIntegerTable(theEnv);
+   count = numberOfEntries = 0;
+
+   for (i = 0; i < INTEGER_HASH_SIZE; i++)
+     {
+      for (hashPtr = integerTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        { numberOfEntries++; }
+     }
+
+   if (numberOfEntries == 0) return(version);
+
+   for (i = 1; i <= (numberOfEntries / ConstructCompilerData(theEnv)->MaxIndices) + 1 ; i++)
+     { fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern CLIPSInteger I%d_%d[];\n",ConstructCompilerData(theEnv)->ImageID,i); }
+
+   /*==================*/
+   /* Create the file. */
+   /*==================*/
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL) return version;
+
+   /*===================*/
+   /* List the entries. */
+   /*===================*/
+
+   j = 0;
+
+   for (i = 0; i < INTEGER_HASH_SIZE; i++)
+     {
+      for (hashPtr = integerTable[i];
+           hashPtr != NULL;
+           hashPtr = hashPtr->next)
+        {
+         if (newHeader)
+           {
+            fprintf(fp,"CLIPSInteger I%d_%d[] = {\n",ConstructCompilerData(theEnv)->ImageID,arrayVersion);
+            newHeader = false;
+           }
+           
+         fprintf(fp,"{{INTEGER_TYPE},");
+
+         if (hashPtr->next == NULL)
+           { fprintf(fp,"NULL,"); }
+         else
+           {
+            if ((j + 1) >= ConstructCompilerData(theEnv)->MaxIndices)
+              { fprintf(fp,"&I%d_%d[%d],",ConstructCompilerData(theEnv)->ImageID,arrayVersion + 1,0); }
+            else
+              { fprintf(fp,"&I%d_%d[%d],",ConstructCompilerData(theEnv)->ImageID,arrayVersion,j + 1); }
+           }
+
+         fprintf(fp,"%ld,1,0,0,%d,",hashPtr->count + 1,i);
+         fprintf(fp,"%lldLL",hashPtr->contents);
+
+         count++;
+         j++;
+
+         if ((count == numberOfEntries) || (j >= ConstructCompilerData(theEnv)->MaxIndices))
+           {
+            fprintf(fp,"}};\n");
+            GenClose(theEnv,fp);
+            j = 0;
+            version++;
+            arrayVersion++;
+            if (count < numberOfEntries)
+              {
+               if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,version,false)) == NULL)
+                 { return 0; }
+               newHeader = true;
+              }
+           }
+         else
+           { fprintf(fp,"},\n"); }
+        }
+     }
+
+   return version;
+  }
+
+/****************************************************************/
+/* HashTablesToCode: Produces the code for the symbol, integer, */
+/*   float, and bitmap hash tables for a run-time module        */
+/*   created using the constructs-to-c function.                */
+/****************************************************************/
+static int HashTablesToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer)
+  {
+   unsigned long i;
+   FILE *fp;
+   CLIPSLexeme **symbolTable;
+   CLIPSFloat **floatTable;
+   CLIPSInteger **integerTable;
+   CLIPSBitMap **bitMapTable;
+
+   /*======================================*/
+   /* Write the code for the symbol table. */
+   /*======================================*/
+
+   symbolTable = GetSymbolTable(theEnv);
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,1,false)) == NULL)
+     { return 0; }
+
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern CLIPSLexeme *sht%d[];\n",ConstructCompilerData(theEnv)->ImageID);
+   fprintf(fp,"CLIPSLexeme *sht%d[%ld] = {\n",ConstructCompilerData(theEnv)->ImageID,SYMBOL_HASH_SIZE);
+
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+      {
+       PrintSymbolReference(theEnv,fp,symbolTable[i]);
+
+       if (i + 1 != SYMBOL_HASH_SIZE) fprintf(fp,",\n");
+      }
+
+    fprintf(fp,"};\n");
+
+    GenClose(theEnv,fp);
+
+   /*=====================================*/
+   /* Write the code for the float table. */
+   /*=====================================*/
+
+   floatTable = GetFloatTable(theEnv);
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,2,false)) == NULL)
+     { return 0; }
+
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern CLIPSFloat *fht%d[];\n",ConstructCompilerData(theEnv)->ImageID);
+   fprintf(fp,"CLIPSFloat *fht%d[%d] = {\n",ConstructCompilerData(theEnv)->ImageID,FLOAT_HASH_SIZE);
+
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+      {
+       if (floatTable[i] == NULL) { fprintf(fp,"NULL"); }
+       else PrintFloatReference(theEnv,fp,floatTable[i]);
+
+       if (i + 1 != FLOAT_HASH_SIZE) fprintf(fp,",\n");
+      }
+
+    fprintf(fp,"};\n");
+
+    GenClose(theEnv,fp);
+
+   /*=======================================*/
+   /* Write the code for the integer table. */
+   /*=======================================*/
+
+   integerTable = GetIntegerTable(theEnv);
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,3,false)) == NULL)
+     { return 0; }
+
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern CLIPSInteger *iht%d[];\n",ConstructCompilerData(theEnv)->ImageID);
+   fprintf(fp,"CLIPSInteger *iht%d[%d] = {\n",ConstructCompilerData(theEnv)->ImageID,INTEGER_HASH_SIZE);
+
+   for (i = 0; i < INTEGER_HASH_SIZE; i++)
+      {
+       if (integerTable[i] == NULL) { fprintf(fp,"NULL"); }
+       else PrintIntegerReference(theEnv,fp,integerTable[i]);
+
+       if (i + 1 != INTEGER_HASH_SIZE) fprintf(fp,",\n");
+      }
+
+    fprintf(fp,"};\n");
+
+    GenClose(theEnv,fp);
+
+   /*======================================*/
+   /* Write the code for the bitmap table. */
+   /*======================================*/
+
+   bitMapTable = GetBitMapTable(theEnv);
+
+   if ((fp = NewCFile(theEnv,fileName,pathName,fileNameBuffer,1,4,false)) == NULL)
+     { return 0; }
+
+   fprintf(ConstructCompilerData(theEnv)->HeaderFP,"extern struct clipsBitMap *bmht%d[];\n",ConstructCompilerData(theEnv)->ImageID);
+   fprintf(fp,"struct clipsBitMap *bmht%d[%d] = {\n",ConstructCompilerData(theEnv)->ImageID,BITMAP_HASH_SIZE);
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+      {
+       PrintBitMapReference(theEnv,fp,bitMapTable[i]);
+
+       if (i + 1 != BITMAP_HASH_SIZE) fprintf(fp,",\n");
+      }
+
+    fprintf(fp,"};\n");
+
+    GenClose(theEnv,fp);
+
+    return 1;
+   }
+
+/*****************************************************/
+/* PrintSymbolReference: Prints the C code reference */
+/*   address to the specified symbol (also used for  */
+/*   strings and instance names).                    */
+/*****************************************************/
+void PrintSymbolReference(
+  Environment *theEnv,
+  FILE *theFile,
+  CLIPSLexeme *theSymbol)
+  {
+   if (theSymbol == NULL) fprintf(theFile,"NULL");
+   else fprintf(theFile,"&S%u_%u[%u]",
+                        ConstructCompilerData(theEnv)->ImageID,
+                        (theSymbol->bucket / ConstructCompilerData(theEnv)->MaxIndices) + 1,
+                        theSymbol->bucket % ConstructCompilerData(theEnv)->MaxIndices);
+  }
+
+/****************************************************/
+/* PrintFloatReference: Prints the C code reference */
+/*   address to the specified float.                */
+/****************************************************/
+void PrintFloatReference(
+  Environment *theEnv,
+  FILE *theFile,
+  CLIPSFloat *theFloat)
+  {
+   fprintf(theFile,"&F%u_%u[%u]",
+                   ConstructCompilerData(theEnv)->ImageID,
+                   (theFloat->bucket / ConstructCompilerData(theEnv)->MaxIndices) + 1,
+                   theFloat->bucket % ConstructCompilerData(theEnv)->MaxIndices);
+  }
+
+/******************************************************/
+/* PrintIntegerReference: Prints the C code reference */
+/*   address to the specified integer.                */
+/******************************************************/
+void PrintIntegerReference(
+  Environment *theEnv,
+  FILE *theFile,
+  CLIPSInteger *theInteger)
+  {
+   fprintf(theFile,"&I%u_%u[%u]",
+                   ConstructCompilerData(theEnv)->ImageID,
+                   (theInteger->bucket / ConstructCompilerData(theEnv)->MaxIndices) + 1,
+                   theInteger->bucket % ConstructCompilerData(theEnv)->MaxIndices);
+  }
+
+/*****************************************************/
+/* PrintBitMapReference: Prints the C code reference */
+/*   address to the specified bit map.               */
+/*****************************************************/
+void PrintBitMapReference(
+  Environment *theEnv,
+  FILE *theFile,
+  CLIPSBitMap *theBitMap)
+  {
+   if (theBitMap == NULL) fprintf(theFile,"NULL");
+   else fprintf(theFile,"&B%u_%u[%u]",
+                        ConstructCompilerData(theEnv)->ImageID,
+                        (theBitMap->bucket / ConstructCompilerData(theEnv)->MaxIndices) + 1,
+                        theBitMap->bucket % ConstructCompilerData(theEnv)->MaxIndices);
+  }
+
+/*********************************************************/
+/* PrintCString: Prints KB strings in the appropriate    */
+/*   format for C (the " and \ characters are preceeded  */
+/*   by a \ and carriage returns are replaced with \n).  */
+/*********************************************************/
+static void PrintCString(
+  FILE *theFile,
+  const char *str)
+  {
+   unsigned i;
+   size_t slen;
+
+   /*============================================*/
+   /* Print the string's opening quotation mark. */
+   /*============================================*/
+
+   fprintf(theFile,"\"");
+
+   /*===============================================*/
+   /* Convert and write each character to the file. */
+   /*===============================================*/
+
+   slen = strlen(str);
+   for (i = 0 ; i < slen ; i++)
+     {
+      /*====================================*/
+      /* Preceed " and \ with the \ escape. */
+      /*====================================*/
+
+      if ((str[i] == '"') || (str[i] == '\\'))
+        {
+         fputc('\\',theFile);
+         fputc(str[i],theFile);
+        }
+
+      /*====================================*/
+      /* Replace a carriage return with \n. */
+      /*====================================*/
+
+      else if (str[i] == '\n')
+        {
+         fputc('\\',theFile);
+         fputc('n',theFile);
+        }
+
+      /*===============================*/
+      /* All other characters can be   */
+      /* printed without modification. */
+      /*===============================*/
+
+      else
+        { fputc(str[i],theFile); }
+     }
+
+   /*============================================*/
+   /* Print the string's closing quotation mark. */
+   /*============================================*/
+
+   fprintf(theFile,"\"");
+  }
+
+#endif /* CONSTRUCT_COMPILER && (! RUN_TIME) */
diff --git a/clips/symblcmp.h b/clips/symblcmp.h
new file mode 100755
index 000000000..39cb93151
--- /dev/null
+++ b/clips/symblcmp.h
@@ -0,0 +1,61 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/01/16            */
+   /*                                                     */
+   /*        SYMBOL_TYPE CONSTRUCT COMPILER HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for       */
+/*   atomic data values: symbols, integers, floats, and      */
+/*   bit maps.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added environment parameter to GenClose.       */
+/*                                                           */
+/*            Corrected code to remove compiler warnings.    */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_symblcmp
+
+#pragma once
+
+#define _H_symblcmp
+
+#include <stdio.h>
+
+#include "symbol.h"
+
+   void                     PrintSymbolReference(Environment *,FILE *,CLIPSLexeme *);
+   void                     PrintFloatReference(Environment *,FILE *,CLIPSFloat *);
+   void                     PrintIntegerReference(Environment *,FILE *,CLIPSInteger *);
+   void                     PrintBitMapReference(Environment *,FILE *,CLIPSBitMap *);
+   void                     AtomicValuesToCode(Environment *,const char *,const char *,char *);
+
+#endif /* _H_symblcmp */
+
+
diff --git a/clips/symbol.c b/clips/symbol.c
new file mode 100755
index 000000000..76e418d9c
--- /dev/null
+++ b/clips/symbol.c
@@ -0,0 +1,1961 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/20/17             */
+   /*                                                     */
+   /*                    SYMBOL MODULE                    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Manages the atomic data value hash tables for    */
+/*   storing symbols, integers, floats, and bit maps.        */
+/*   Contains routines for adding entries, examining the     */
+/*   hash tables, and performing garbage collection to       */
+/*   remove entries no longer in use.                        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: CLIPS crashing on AMD64 processor in the       */
+/*            function used to generate a hash value for     */
+/*            integers. DR0871                               */
+/*                                                           */
+/*            Support for run-time programs directly passing */
+/*            the hash tables for initialization.            */
+/*                                                           */
+/*            Corrected code generating compilation          */
+/*            warnings.                                      */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for hashing EXTERNAL_ADDRESS_TYPE      */
+/*            data type.                                     */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Used genstrcpy instead of strcpy.              */
+/*                                                           */
+/*            Added support for external address hash table  */
+/*            and subtyping.                                 */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "setup.h"
+
+#include "argacces.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "symbol.h"
+
+/***************/
+/* DEFINITIONS */
+/***************/
+
+#define FALSE_STRING "FALSE"
+#define TRUE_STRING  "TRUE"
+#define POSITIVE_INFINITY_STRING "+oo"
+#define NEGATIVE_INFINITY_STRING "-oo"
+
+#define AVERAGE_STRING_SIZE 10
+#define AVERAGE_BITMAP_SIZE sizeof(long)
+#define NUMBER_OF_LONGS_FOR_HASH 25
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    RemoveHashNode(Environment *,GENERIC_HN *,GENERIC_HN **,int,int);
+   static void                    AddEphemeralHashNode(Environment *,GENERIC_HN *,struct ephemeron **,
+                                                       int,int,bool);
+   static void                    RemoveEphemeralHashNodes(Environment *,struct ephemeron **,
+                                                           GENERIC_HN **,
+                                                           int,int,int);
+   static const char             *StringWithinString(const char *,const char *);
+   static size_t                  CommonPrefixLength(const char *,const char *);
+   static void                    DeallocateSymbolData(Environment *);
+
+/*******************************************************/
+/* InitializeAtomTables: Initializes the SymbolTable,  */
+/*   IntegerTable, and FloatTable. It also initializes */
+/*   the TrueSymbol and FalseSymbol.                   */
+/*******************************************************/
+void InitializeAtomTables(
+  Environment *theEnv,
+  CLIPSLexeme **symbolTable,
+  CLIPSFloat **floatTable,
+  CLIPSInteger **integerTable,
+  CLIPSBitMap **bitmapTable,
+  CLIPSExternalAddress **externalAddressTable)
+  {
+#if MAC_XCD
+#pragma unused(symbolTable)
+#pragma unused(floatTable)
+#pragma unused(integerTable)
+#pragma unused(bitmapTable)
+#pragma unused(externalAddressTable)
+#endif
+   unsigned long i;
+
+   AllocateEnvironmentData(theEnv,SYMBOL_DATA,sizeof(struct symbolData),DeallocateSymbolData);
+
+#if ! RUN_TIME
+   /*=========================*/
+   /* Create the hash tables. */
+   /*=========================*/
+
+   SymbolData(theEnv)->SymbolTable = (CLIPSLexeme **)
+                  gm2(theEnv,sizeof (CLIPSLexeme *) * SYMBOL_HASH_SIZE);
+
+   SymbolData(theEnv)->FloatTable = (CLIPSFloat **)
+                  gm2(theEnv,sizeof (CLIPSFloat *) * FLOAT_HASH_SIZE);
+
+   SymbolData(theEnv)->IntegerTable = (CLIPSInteger **)
+                   gm2(theEnv,sizeof (CLIPSInteger *) * INTEGER_HASH_SIZE);
+
+   SymbolData(theEnv)->BitMapTable = (CLIPSBitMap **)
+                   gm2(theEnv,sizeof (CLIPSBitMap *) * BITMAP_HASH_SIZE);
+
+   SymbolData(theEnv)->ExternalAddressTable = (CLIPSExternalAddress **)
+                   gm2(theEnv,sizeof (CLIPSExternalAddress *) * EXTERNAL_ADDRESS_HASH_SIZE);
+
+   /*===================================================*/
+   /* Initialize all of the hash table entries to NULL. */
+   /*===================================================*/
+
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++) SymbolData(theEnv)->SymbolTable[i] = NULL;
+   for (i = 0; i < FLOAT_HASH_SIZE; i++) SymbolData(theEnv)->FloatTable[i] = NULL;
+   for (i = 0; i < INTEGER_HASH_SIZE; i++) SymbolData(theEnv)->IntegerTable[i] = NULL;
+   for (i = 0; i < BITMAP_HASH_SIZE; i++) SymbolData(theEnv)->BitMapTable[i] = NULL;
+   for (i = 0; i < EXTERNAL_ADDRESS_HASH_SIZE; i++) SymbolData(theEnv)->ExternalAddressTable[i] = NULL;
+
+   /*========================*/
+   /* Predefine some values. */
+   /*========================*/
+
+   theEnv->TrueSymbol = AddSymbol(theEnv,TRUE_STRING,SYMBOL_TYPE);
+   IncrementLexemeCount(TrueSymbol(theEnv));
+   theEnv->FalseSymbol = AddSymbol(theEnv,FALSE_STRING,SYMBOL_TYPE);
+   IncrementLexemeCount(FalseSymbol(theEnv));
+   SymbolData(theEnv)->PositiveInfinity = AddSymbol(theEnv,POSITIVE_INFINITY_STRING,SYMBOL_TYPE);
+   IncrementLexemeCount(SymbolData(theEnv)->PositiveInfinity);
+   SymbolData(theEnv)->NegativeInfinity = AddSymbol(theEnv,NEGATIVE_INFINITY_STRING,SYMBOL_TYPE);
+   IncrementLexemeCount(SymbolData(theEnv)->NegativeInfinity);
+   SymbolData(theEnv)->Zero = CreateInteger(theEnv,0LL);
+   IncrementIntegerCount(SymbolData(theEnv)->Zero);
+#else
+   SetSymbolTable(theEnv,symbolTable);
+   SetFloatTable(theEnv,floatTable);
+   SetIntegerTable(theEnv,integerTable);
+   SetBitMapTable(theEnv,bitmapTable);
+
+   SymbolData(theEnv)->ExternalAddressTable = (CLIPSExternalAddress **)
+                gm2(theEnv,sizeof (CLIPSExternalAddress *) * EXTERNAL_ADDRESS_HASH_SIZE);
+
+   for (i = 0; i < EXTERNAL_ADDRESS_HASH_SIZE; i++) SymbolData(theEnv)->ExternalAddressTable[i] = NULL;
+   
+   theEnv->TrueSymbol = FindSymbolHN(theEnv,TRUE_STRING,SYMBOL_BIT);
+   theEnv->FalseSymbol = FindSymbolHN(theEnv,FALSE_STRING,SYMBOL_BIT);
+#endif
+
+   theEnv->VoidConstant = get_struct(theEnv,clipsVoid);
+   theEnv->VoidConstant->header.type = VOID_TYPE;
+  }
+
+/*************************************************/
+/* DeallocateSymbolData: Deallocates environment */
+/*    data for symbols.                          */
+/*************************************************/
+static void DeallocateSymbolData(
+  Environment *theEnv)
+  {
+   int i;
+   CLIPSLexeme *shPtr, *nextSHPtr;
+   CLIPSInteger *ihPtr, *nextIHPtr;
+   CLIPSFloat *fhPtr, *nextFHPtr;
+   CLIPSBitMap *bmhPtr, *nextBMHPtr;
+   CLIPSExternalAddress *eahPtr, *nextEAHPtr;
+
+   if ((SymbolData(theEnv)->SymbolTable == NULL) ||
+       (SymbolData(theEnv)->FloatTable == NULL) ||
+       (SymbolData(theEnv)->IntegerTable == NULL) ||
+       (SymbolData(theEnv)->BitMapTable == NULL) ||
+       (SymbolData(theEnv)->ExternalAddressTable == NULL))
+     { return; }
+     
+   genfree(theEnv,theEnv->VoidConstant,sizeof(TypeHeader));
+   
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      shPtr = SymbolData(theEnv)->SymbolTable[i];
+
+      while (shPtr != NULL)
+        {
+         nextSHPtr = shPtr->next;
+         if (! shPtr->permanent)
+           {
+            rm(theEnv,(void *) shPtr->contents,strlen(shPtr->contents)+1);
+            rtn_struct(theEnv,clipsLexeme,shPtr);
+           }
+         shPtr = nextSHPtr;
+        }
+     }
+
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+     {
+      fhPtr = SymbolData(theEnv)->FloatTable[i];
+
+      while (fhPtr != NULL)
+        {
+         nextFHPtr = fhPtr->next;
+         if (! fhPtr->permanent)
+           { rtn_struct(theEnv,clipsFloat,fhPtr); }
+         fhPtr = nextFHPtr;
+        }
+     }
+
+   for (i = 0; i < INTEGER_HASH_SIZE; i++)
+     {
+      ihPtr = SymbolData(theEnv)->IntegerTable[i];
+
+      while (ihPtr != NULL)
+        {
+         nextIHPtr = ihPtr->next;
+         if (! ihPtr->permanent)
+           { rtn_struct(theEnv,clipsInteger,ihPtr); }
+         ihPtr = nextIHPtr;
+        }
+     }
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      bmhPtr = SymbolData(theEnv)->BitMapTable[i];
+
+      while (bmhPtr != NULL)
+        {
+         nextBMHPtr = bmhPtr->next;
+         if (! bmhPtr->permanent)
+           {
+            rm(theEnv,(void *) bmhPtr->contents,bmhPtr->size);
+            rtn_struct(theEnv,clipsBitMap,bmhPtr);
+           }
+         bmhPtr = nextBMHPtr;
+        }
+     }
+
+   for (i = 0; i < EXTERNAL_ADDRESS_HASH_SIZE; i++)
+     {
+      eahPtr = SymbolData(theEnv)->ExternalAddressTable[i];
+
+      while (eahPtr != NULL)
+        {
+         nextEAHPtr = eahPtr->next;
+         if (! eahPtr->permanent)
+           {
+            rtn_struct(theEnv,clipsExternalAddress,eahPtr);
+           }
+         eahPtr = nextEAHPtr;
+        }
+     }
+
+   /*================================*/
+   /* Remove the symbol hash tables. */
+   /*================================*/
+
+ #if ! RUN_TIME
+   rm(theEnv,SymbolData(theEnv)->SymbolTable,sizeof (CLIPSLexeme *) * SYMBOL_HASH_SIZE);
+
+   genfree(theEnv,SymbolData(theEnv)->FloatTable,sizeof (CLIPSFloat *) * FLOAT_HASH_SIZE);
+
+   genfree(theEnv,SymbolData(theEnv)->IntegerTable,sizeof (CLIPSInteger *) * INTEGER_HASH_SIZE);
+
+   genfree(theEnv,SymbolData(theEnv)->BitMapTable,sizeof (CLIPSBitMap *) * BITMAP_HASH_SIZE);
+#endif
+
+   genfree(theEnv,SymbolData(theEnv)->ExternalAddressTable,sizeof (CLIPSExternalAddress *) * EXTERNAL_ADDRESS_HASH_SIZE);
+
+   /*==============================*/
+   /* Remove binary symbol tables. */
+   /*==============================*/
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE || BLOAD_INSTANCES || BSAVE_INSTANCES
+   if (SymbolData(theEnv)->SymbolArray != NULL)
+     rm(theEnv,SymbolData(theEnv)->SymbolArray,sizeof(CLIPSLexeme *) * SymbolData(theEnv)->NumberOfSymbols);
+   if (SymbolData(theEnv)->FloatArray != NULL)
+     rm(theEnv,SymbolData(theEnv)->FloatArray,sizeof(CLIPSFloat *) * SymbolData(theEnv)->NumberOfFloats);
+   if (SymbolData(theEnv)->IntegerArray != NULL)
+     rm(theEnv,SymbolData(theEnv)->IntegerArray,sizeof(CLIPSInteger *) * SymbolData(theEnv)->NumberOfIntegers);
+   if (SymbolData(theEnv)->BitMapArray != NULL)
+     rm(theEnv,SymbolData(theEnv)->BitMapArray,sizeof(CLIPSBitMap *) * SymbolData(theEnv)->NumberOfBitMaps);
+#endif
+  }
+
+/*****************/
+/* CreateBoolean */
+/*****************/
+CLIPSLexeme *CreateBoolean(
+  Environment *theEnv,
+  bool theValue)
+  {
+   if (theValue)
+     { return TrueSymbol(theEnv); }
+   else
+     { return FalseSymbol(theEnv); }
+  }
+
+/****************/
+/* CreateSymbol */
+/****************/
+CLIPSLexeme *CreateSymbol(
+  Environment *theEnv,
+  const char *str)
+  {
+   return AddSymbol(theEnv,str,SYMBOL_TYPE);
+  }
+
+/****************/
+/* CreateString */
+/****************/
+CLIPSLexeme *CreateString(
+  Environment *theEnv,
+  const char *str)
+  {
+   return AddSymbol(theEnv,str,STRING_TYPE);
+  }
+
+/**********************/
+/* CreateInstanceName */
+/**********************/
+CLIPSLexeme *CreateInstanceName(
+  Environment *theEnv,
+  const char *str)
+  {
+   return AddSymbol(theEnv,str,INSTANCE_NAME_TYPE);
+  }
+
+/********************************************************************/
+/* AddSymbol: Searches for the string in the symbol table. If the   */
+/*   string is already in the symbol table, then the address of the */
+/*   string's location in the symbol table is returned. Otherwise,  */
+/*   the string is added to the symbol table and then the address   */
+/*   of the string's location in the symbol table is returned.      */
+/********************************************************************/
+CLIPSLexeme *AddSymbol(
+  Environment *theEnv,
+  const char *str,
+  unsigned short theType)
+  {
+   size_t tally;
+   size_t length;
+   CLIPSLexeme *past = NULL, *peek;
+   char *buffer;
+
+    /*====================================*/
+    /* Get the hash value for the string. */
+    /*====================================*/
+
+    if (str == NULL)
+      {
+       SystemError(theEnv,"SYMBOL",1);
+       ExitRouter(theEnv,EXIT_FAILURE);
+      }
+
+    tally = HashSymbol(str,SYMBOL_HASH_SIZE);
+    peek = SymbolData(theEnv)->SymbolTable[tally];
+
+    /*==================================================*/
+    /* Search for the string in the list of entries for */
+    /* this symbol table location.  If the string is    */
+    /* found, then return the address of the string.    */
+    /*==================================================*/
+
+    while (peek != NULL)
+      {
+       if ((peek->header.type == theType) &&
+           (strcmp(str,peek->contents) == 0))
+         { return peek; }
+       past = peek;
+       peek = peek->next;
+      }
+
+    /*==================================================*/
+    /* Add the string at the end of the list of entries */
+    /* for this symbol table location.                  */
+    /*==================================================*/
+
+    peek = get_struct(theEnv,clipsLexeme);
+
+    if (past == NULL) SymbolData(theEnv)->SymbolTable[tally] = peek;
+    else past->next = peek;
+
+    length = strlen(str) + 1;
+    buffer = (char *) gm2(theEnv,length);
+    genstrcpy(buffer,str);
+    peek->contents = buffer;
+    peek->next = NULL;
+    peek->bucket = (unsigned int) tally;
+    peek->count = 0;
+    peek->permanent = false;
+    peek->header.type = theType;
+
+    /*================================================*/
+    /* Add the string to the list of ephemeral items. */
+    /*================================================*/
+
+    AddEphemeralHashNode(theEnv,(GENERIC_HN *) peek,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralSymbolList,
+                         sizeof(CLIPSLexeme),AVERAGE_STRING_SIZE,true);
+    UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+
+    /*===================================*/
+    /* Return the address of the symbol. */
+    /*===================================*/
+
+    return peek;
+   }
+
+/*****************************************************************/
+/* FindSymbolHN: Searches for the string in the symbol table and */
+/*   returns a pointer to it if found, otherwise returns NULL.   */
+/*****************************************************************/
+CLIPSLexeme *FindSymbolHN(
+  Environment *theEnv,
+  const char *str,
+  unsigned short expectedType)
+  {
+   size_t tally;
+   CLIPSLexeme *peek;
+
+    tally = HashSymbol(str,SYMBOL_HASH_SIZE);
+
+    for (peek = SymbolData(theEnv)->SymbolTable[tally];
+         peek != NULL;
+         peek = peek->next)
+      {
+       if (((1 << peek->header.type) & expectedType) &&
+           (strcmp(str,peek->contents) == 0))
+         { return peek; }
+      }
+
+    return NULL;
+   }
+
+/******************************************************************/
+/* CreateFloat: Searches for the double in the hash table. If the */
+/*   double is already in the hash table, then the address of the */
+/*   double is returned. Otherwise, the double is hashed into the */
+/*   table and the address of the double is also returned.        */
+/******************************************************************/
+CLIPSFloat *CreateFloat(
+  Environment *theEnv,
+  double number)
+  {
+   size_t tally;
+   CLIPSFloat *past = NULL, *peek;
+
+    /*====================================*/
+    /* Get the hash value for the double. */
+    /*====================================*/
+
+    tally = HashFloat(number,FLOAT_HASH_SIZE);
+    peek = SymbolData(theEnv)->FloatTable[tally];
+
+    /*==================================================*/
+    /* Search for the double in the list of entries for */
+    /* this hash location.  If the double is found,     */
+    /* then return the address of the double.           */
+    /*==================================================*/
+
+    while (peek != NULL)
+      {
+       if (number == peek->contents)
+         { return peek; }
+       past = peek;
+       peek = peek->next;
+      }
+
+    /*=================================================*/
+    /* Add the float at the end of the list of entries */
+    /* for this hash location.                         */
+    /*=================================================*/
+
+    peek = get_struct(theEnv,clipsFloat);
+
+    if (past == NULL) SymbolData(theEnv)->FloatTable[tally] = peek;
+    else past->next = peek;
+
+    peek->contents = number;
+    peek->next = NULL;
+    peek->bucket = (unsigned int) tally;
+    peek->count = 0;
+    peek->permanent = false;
+    peek->header.type = FLOAT_TYPE;
+
+    /*===============================================*/
+    /* Add the float to the list of ephemeral items. */
+    /*===============================================*/
+
+    AddEphemeralHashNode(theEnv,(GENERIC_HN *) peek,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralFloatList,
+                         sizeof(CLIPSFloat),0,true);
+    UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+
+    /*==================================*/
+    /* Return the address of the float. */
+    /*==================================*/
+
+    return peek;
+   }
+
+/****************************************************************/
+/* CreateInteger: Searches for the long in the hash table. If   */
+/*   the long is already in the hash table, then the address of */
+/*   the long is returned. Otherwise, the long is hashed into   */
+/*   the table and the address of the long is also returned.    */
+/****************************************************************/
+CLIPSInteger *CreateInteger(
+  Environment *theEnv,
+  long long number)
+  {
+   size_t tally;
+   CLIPSInteger *past = NULL, *peek;
+
+    /*==================================*/
+    /* Get the hash value for the long. */
+    /*==================================*/
+
+    tally = HashInteger(number,INTEGER_HASH_SIZE);
+    peek = SymbolData(theEnv)->IntegerTable[tally];
+
+    /*================================================*/
+    /* Search for the long in the list of entries for */
+    /* this hash location. If the long is found, then */
+    /* return the address of the long.                */
+    /*================================================*/
+
+    while (peek != NULL)
+      {
+       if (number == peek->contents)
+         { return peek; }
+       past = peek;
+       peek = peek->next;
+      }
+
+    /*================================================*/
+    /* Add the long at the end of the list of entries */
+    /* for this hash location.                        */
+    /*================================================*/
+
+    peek = get_struct(theEnv,clipsInteger);
+    if (past == NULL) SymbolData(theEnv)->IntegerTable[tally] = peek;
+    else past->next = peek;
+
+    peek->contents = number;
+    peek->next = NULL;
+    peek->bucket = (unsigned int) tally;
+    peek->count = 0;
+    peek->permanent = false;
+    peek->header.type = INTEGER_TYPE;
+
+    /*=================================================*/
+    /* Add the integer to the list of ephemeral items. */
+    /*=================================================*/
+
+    AddEphemeralHashNode(theEnv,(GENERIC_HN *) peek,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralIntegerList,
+                         sizeof(CLIPSInteger),0,true);
+    UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+
+    /*====================================*/
+    /* Return the address of the integer. */
+    /*====================================*/
+
+    return peek;
+   }
+
+/*****************************************************************/
+/* FindLongHN: Searches for the integer in the integer table and */
+/*   returns a pointer to it if found, otherwise returns NULL.   */
+/*****************************************************************/
+CLIPSInteger *FindLongHN(
+  Environment *theEnv,
+  long long theLong)
+  {
+   size_t tally;
+   CLIPSInteger *peek;
+
+   tally = HashInteger(theLong,INTEGER_HASH_SIZE);
+
+   for (peek = SymbolData(theEnv)->IntegerTable[tally];
+        peek != NULL;
+        peek = peek->next)
+     { if (peek->contents == theLong) return(peek); }
+
+   return NULL;
+  }
+
+/******************************************************************/
+/* AddBitMap: Searches for the bitmap in the hash table. If the   */
+/*   bitmap is already in the hash table, then the address of the */
+/*   bitmap is returned. Otherwise, the bitmap is hashed into the */
+/*   table and the address of the bitmap is also returned.        */
+/******************************************************************/
+void *AddBitMap(
+  Environment *theEnv,
+  void *vTheBitMap,
+  unsigned short size)
+  {
+   char *theBitMap = (char *) vTheBitMap;
+   size_t tally;
+   unsigned short i;
+   CLIPSBitMap *past = NULL, *peek;
+   char *buffer;
+
+    /*====================================*/
+    /* Get the hash value for the bitmap. */
+    /*====================================*/
+
+    if (theBitMap == NULL)
+      {
+       SystemError(theEnv,"SYMBOL",2);
+       ExitRouter(theEnv,EXIT_FAILURE);
+      }
+
+    tally = HashBitMap(theBitMap,BITMAP_HASH_SIZE,size);
+    peek = SymbolData(theEnv)->BitMapTable[tally];
+
+    /*==================================================*/
+    /* Search for the bitmap in the list of entries for */
+    /* this hash table location.  If the bitmap is      */
+    /* found, then return the address of the bitmap.    */
+    /*==================================================*/
+
+    while (peek != NULL)
+      {
+	   if (peek->size == size)
+         {
+          for (i = 0; i < size ; i++)
+            { if (peek->contents[i] != theBitMap[i]) break; }
+
+          if (i == size) return((void *) peek);
+         }
+
+       past = peek;
+       peek = peek->next;
+      }
+
+    /*==================================================*/
+    /* Add the bitmap at the end of the list of entries */
+    /* for this hash table location.  Return the        */
+    /*==================================================*/
+
+    peek = get_struct(theEnv,clipsBitMap);
+    if (past == NULL) SymbolData(theEnv)->BitMapTable[tally] = peek;
+    else past->next = peek;
+
+    buffer = (char *) gm2(theEnv,size);
+    for (i = 0; i < size ; i++) buffer[i] = theBitMap[i];
+    peek->contents = buffer;
+    peek->next = NULL;
+    peek->bucket = (unsigned int) tally;
+    peek->count = 0;
+    peek->permanent = false;
+    peek->size = size;
+    peek->header.type = BITMAP_TYPE;
+
+    /*================================================*/
+    /* Add the bitmap to the list of ephemeral items. */
+    /*================================================*/
+
+    AddEphemeralHashNode(theEnv,(GENERIC_HN *) peek,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralBitMapList,
+                         sizeof(CLIPSBitMap),sizeof(long),true);
+    UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+
+    /*===================================*/
+    /* Return the address of the bitmap. */
+    /*===================================*/
+
+    return((void *) peek);
+   }
+
+/***********************************************/
+/* CreateCExternalAddress: Creates an external */
+/*    address for a C pointer.                 */
+/***********************************************/
+CLIPSExternalAddress *CreateCExternalAddress(
+  Environment *theEnv,
+  void *theExternalAddress)
+  {
+   return CreateExternalAddress(theEnv,theExternalAddress,C_POINTER_EXTERNAL_ADDRESS);
+  }
+
+/*******************************************************************/
+/* CreateExternalAddress: Searches for the external address in the */
+/*   hash table. If the external address is already in the hash    */
+/*   table, then the address of the external address is returned.  */
+/*   Otherwise, the external address is hashed into the table and  */
+/*   the address of the external address is also returned.         */
+/*******************************************************************/
+CLIPSExternalAddress *CreateExternalAddress(
+  Environment *theEnv,
+  void *theExternalAddress,
+  unsigned short theType)
+  {
+   size_t tally;
+   CLIPSExternalAddress *past = NULL, *peek;
+
+    /*====================================*/
+    /* Get the hash value for the bitmap. */
+    /*====================================*/
+
+    tally = HashExternalAddress(theExternalAddress,EXTERNAL_ADDRESS_HASH_SIZE);
+
+    peek = SymbolData(theEnv)->ExternalAddressTable[tally];
+
+    /*=============================================================*/
+    /* Search for the external address in the list of entries for  */
+    /* this hash table location.  If the external addressis found, */
+    /* then return the address of the external address.            */
+    /*=============================================================*/
+
+    while (peek != NULL)
+      {
+       if ((peek->type == theType) &&
+           (peek->contents == theExternalAddress))
+         { return peek; }
+
+       past = peek;
+       peek = peek->next;
+      }
+
+    /*=================================================*/
+    /* Add the external address at the end of the list */
+    /* of entries for this hash table location.        */
+    /*=================================================*/
+
+    peek = get_struct(theEnv,clipsExternalAddress);
+    if (past == NULL) SymbolData(theEnv)->ExternalAddressTable[tally] = peek;
+    else past->next = peek;
+
+    peek->contents = theExternalAddress;
+    peek->type = theType;
+    peek->next = NULL;
+    peek->bucket = (unsigned int) tally;
+    peek->count = 0;
+    peek->permanent = false;
+    peek->header.type = EXTERNAL_ADDRESS_TYPE;
+
+    /*================================================*/
+    /* Add the bitmap to the list of ephemeral items. */
+    /*================================================*/
+
+    AddEphemeralHashNode(theEnv,(GENERIC_HN *) peek,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralExternalAddressList,
+                         sizeof(CLIPSExternalAddress),sizeof(long),true);
+    UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+
+    /*=============================================*/
+    /* Return the address of the external address. */
+    /*=============================================*/
+
+    return peek;
+   }
+
+/***************************************************/
+/* HashSymbol: Computes a hash value for a symbol. */
+/***************************************************/
+size_t HashSymbol(
+  const char *word,
+  size_t range)
+  {
+   size_t i;
+   size_t tally = 0;
+
+   for (i = 0; word[i]; i++)
+     { tally = tally * 127 + (size_t) word[i]; }
+
+   if (range == 0)
+     { return tally; }
+
+   return tally % range;
+  }
+
+/*************************************************/
+/* HashFloat: Computes a hash value for a float. */
+/*************************************************/
+size_t HashFloat(
+  double number,
+  size_t range)
+  {
+   size_t tally = 0;
+   char *word;
+   size_t i;
+
+   word = (char *) &number;
+
+   for (i = 0; i < sizeof(double); i++)
+     { tally = tally * 127 + (size_t) word[i]; }
+
+   if (range == 0)
+     { return tally; }
+
+   return tally % range;
+  }
+
+/******************************************************/
+/* HashInteger: Computes a hash value for an integer. */
+/******************************************************/
+size_t HashInteger(
+  long long number,
+  size_t range)
+  {
+   size_t tally;
+
+#if WIN_MVC
+   if (number < 0)
+     { number = - number; }
+   tally = (((size_t) number) % range);
+#else
+   tally = (((size_t) llabs(number)) % range);
+#endif
+
+   if (range == 0)
+     { return tally; }
+
+   return tally;
+  }
+
+/****************************************/
+/* HashExternalAddress: Computes a hash */
+/*   value for an external address.     */
+/****************************************/
+size_t HashExternalAddress(
+  void *theExternalAddress,
+  size_t range)
+  {
+   size_t tally;
+   union
+     {
+      void *vv;
+      unsigned uv;
+     } fis;
+
+   fis.uv = 0;
+   fis.vv = theExternalAddress;
+   tally = (fis.uv / 256);
+
+   if (range == 0)
+     { return tally; }
+
+   return(tally % range);
+  }
+
+/***************************************************/
+/* HashBitMap: Computes a hash value for a bitmap. */
+/***************************************************/
+size_t HashBitMap(
+  const char *word,
+  size_t range,
+  unsigned length)
+  {
+   unsigned k,j,i;
+   size_t tally;
+   unsigned longLength;
+   unsigned long count = 0L,tmpLong;
+   char *tmpPtr;
+
+   tmpPtr = (char *) &tmpLong;
+
+   /*============================================================*/
+   /* Add up the first part of the word as unsigned long values. */
+   /*============================================================*/
+
+   longLength = length / sizeof(unsigned long);
+   for (i = 0 , j = 0 ; i < longLength; i++)
+     {
+      for (k = 0 ; k < sizeof(unsigned long) ; k++ , j++)
+        tmpPtr[k] = word[j];
+      count += tmpLong;
+     }
+
+   /*============================================*/
+   /* Add the remaining characters to the count. */
+   /*============================================*/
+
+   for (; j < length; j++) count += (size_t) word[j];
+
+   /*========================*/
+   /* Return the hash value. */
+   /*========================*/
+
+   if (range == 0)
+     { return count; }
+
+   tally = (count % range);
+
+   return tally;
+  }
+
+/****************************************************/
+/* RetainLexeme: Increments the count value for a   */
+/*   SymbolTable entry. Adds the symbol to the      */
+/*   EphemeralSymbolList if the count becomes zero. */
+/****************************************************/
+void RetainLexeme(
+  Environment *theEnv,
+  CLIPSLexeme *theValue)
+  {
+   theValue->count++;
+  }
+
+/****************************************************/
+/* ReleaseLexeme: Decrements the count value for a  */
+/*   SymbolTable entry. Adds the symbol to the      */
+/*   EphemeralSymbolList if the count becomes zero. */
+/****************************************************/
+void ReleaseLexeme(
+  Environment *theEnv,
+  CLIPSLexeme *theValue)
+  {
+   if (theValue->count < 0)
+     {
+      SystemError(theEnv,"SYMBOL",3);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   if (theValue->count == 0)
+     {
+      SystemError(theEnv,"SYMBOL",4);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   theValue->count--;
+
+   if (theValue->count != 0) return;
+
+   if (theValue->markedEphemeral == false)
+     {
+      AddEphemeralHashNode(theEnv,(GENERIC_HN *) theValue,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralSymbolList,
+                           sizeof(CLIPSLexeme),AVERAGE_STRING_SIZE,true);
+      UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+     }
+
+   return;
+  }
+
+/***************************************************/
+/* RetainFloat: Increments the count value for a   */
+/*   FloatTable entry. Adds the float to the       */
+/*   EphemeralFloatList if the count becomes zero. */
+/***************************************************/
+void RetainFloat(
+  Environment *theEnv,
+  CLIPSFloat *theValue)
+  {
+   theValue->count++;
+  }
+
+/***************************************************/
+/* ReleaseFloat: Decrements the count value for a  */
+/*   FloatTable entry. Adds the float to the       */
+/*   EphemeralFloatList if the count becomes zero. */
+/***************************************************/
+void ReleaseFloat(
+  Environment *theEnv,
+  CLIPSFloat *theValue)
+  {
+   if (theValue->count <= 0)
+     {
+      SystemError(theEnv,"SYMBOL",5);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   theValue->count--;
+
+   if (theValue->count != 0) return;
+
+   if (theValue->markedEphemeral == false)
+     {
+      AddEphemeralHashNode(theEnv,(GENERIC_HN *) theValue,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralFloatList,
+                           sizeof(CLIPSFloat),0,true);
+      UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+     }
+
+   return;
+  }
+
+/*****************************************************/
+/* RetainInteger: Increments the count value for an  */
+/*   IntegerTable entry. Adds the integer to the     */
+/*   EphemeralIntegerList if the count becomes zero. */
+/*****************************************************/
+void RetainInteger(
+  Environment *theEnv,
+  CLIPSInteger *theValue)
+  {
+   theValue->count++;
+  }
+
+/*****************************************************/
+/* ReleaseInteger: Decrements the count value for    */
+/*   an IntegerTable entry. Adds the integer to the  */
+/*   EphemeralIntegerList if the count becomes zero. */
+/*****************************************************/
+void ReleaseInteger(
+  Environment *theEnv,
+  CLIPSInteger *theValue)
+  {
+   if (theValue->count <= 0)
+     {
+      SystemError(theEnv,"SYMBOL",6);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   theValue->count--;
+
+   if (theValue->count != 0) return;
+
+   if (theValue->markedEphemeral == false)
+     {
+      AddEphemeralHashNode(theEnv,(GENERIC_HN *) theValue,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralIntegerList,
+                           sizeof(CLIPSInteger),0,true);
+      UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+     }
+
+   return;
+  }
+
+/**************************************************************/
+/* IncrementBitMapReferenceCount: Increments the count value  */
+/*   for a BitmapTable entry. Adds the bitmap to the          */
+/*   EphemeralBitMapList if the count becomes zero.           */
+/**************************************************************/
+void IncrementBitMapReferenceCount(
+  Environment *theEnv,
+  CLIPSBitMap *theValue)
+  {
+   theValue->count++;
+  }
+
+/**************************************************************/
+/* DecrementBitMapReferenceCount: Decrements the count value  */
+/*   for a BitmapTable entry. Adds the bitmap to the          */
+/*   EphemeralBitMapList if the count becomes zero.           */
+/**************************************************************/
+void DecrementBitMapReferenceCount(
+  Environment *theEnv,
+  CLIPSBitMap *theValue)
+  {
+   if (theValue->count < 0)
+     {
+      SystemError(theEnv,"SYMBOL",7);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   if (theValue->count == 0)
+     {
+      SystemError(theEnv,"SYMBOL",8);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   theValue->count--;
+
+   if (theValue->count != 0) return;
+
+   if (theValue->markedEphemeral == false)
+     {
+      AddEphemeralHashNode(theEnv,(GENERIC_HN *) theValue,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralBitMapList,
+                           sizeof(CLIPSBitMap),sizeof(long),true);
+      UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+     }
+
+   return;
+  }
+
+/*************************************************************/
+/* RetainExternalAddress: Decrements the count value for an  */
+/*   ExternAddressTable entry. Adds the bitmap to the        */
+/*   EphemeralExternalAddressList if the count becomes zero. */
+/*************************************************************/
+void RetainExternalAddress(
+  Environment *theEnv,
+  CLIPSExternalAddress *theValue)
+  {
+   theValue->count++;
+  }
+
+/*************************************************************/
+/* ReleaseExternalAddress: Decrements the count value for    */
+/*   an ExternAddressTable entry. Adds the bitmap to the     */
+/*   EphemeralExternalAddressList if the count becomes zero. */
+/*************************************************************/
+void ReleaseExternalAddress(
+  Environment *theEnv,
+  CLIPSExternalAddress *theValue)
+  {
+   if (theValue->count < 0)
+     {
+      SystemError(theEnv,"SYMBOL",9);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   if (theValue->count == 0)
+     {
+      SystemError(theEnv,"SYMBOL",10);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   theValue->count--;
+
+   if (theValue->count != 0) return;
+
+   if (theValue->markedEphemeral == false)
+     {
+      AddEphemeralHashNode(theEnv,(GENERIC_HN *) theValue,&UtilityData(theEnv)->CurrentGarbageFrame->ephemeralExternalAddressList,
+                           sizeof(CLIPSExternalAddress),sizeof(long),true);
+      UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+     }
+
+   return;
+  }
+
+/************************************************/
+/* RemoveHashNode: Removes a hash node from the */
+/*   SymbolTable, FloatTable, IntegerTable,     */
+/*   BitMapTable, or ExternalAddressTable.      */
+/************************************************/
+static void RemoveHashNode(
+  Environment *theEnv,
+  GENERIC_HN *theValue,
+  GENERIC_HN **theTable,
+  int size,
+  int type)
+  {
+   GENERIC_HN *previousNode, *currentNode;
+   CLIPSExternalAddress *theAddress;
+
+   /*=============================================*/
+   /* Find the entry in the specified hash table. */
+   /*=============================================*/
+
+   previousNode = NULL;
+   currentNode = theTable[theValue->bucket];
+
+   while (currentNode != theValue)
+     {
+      previousNode = currentNode;
+      currentNode = currentNode->next;
+
+      if (currentNode == NULL)
+        {
+         SystemError(theEnv,"SYMBOL",11);
+         ExitRouter(theEnv,EXIT_FAILURE);
+        }
+     }
+
+   /*===========================================*/
+   /* Remove the entry from the list of entries */
+   /* stored in the hash table bucket.          */
+   /*===========================================*/
+
+   if (previousNode == NULL)
+     { theTable[theValue->bucket] = theValue->next; }
+   else
+     { previousNode->next = currentNode->next; }
+
+   /*=================================================*/
+   /* Symbol and bit map nodes have additional memory */
+   /* use to store the character or bitmap string.    */
+   /*=================================================*/
+
+   if (type == SYMBOL_TYPE)
+     {
+      rm(theEnv,(void *) ((CLIPSLexeme *) theValue)->contents,
+         strlen(((CLIPSLexeme *) theValue)->contents) + 1);
+     }
+   else if (type == BITMAPARRAY)
+     {
+      rm(theEnv,(void *) ((CLIPSBitMap *) theValue)->contents,
+         ((CLIPSBitMap *) theValue)->size);
+     }
+   else if (type == EXTERNAL_ADDRESS_TYPE)
+     {
+      theAddress = (CLIPSExternalAddress *) theValue;
+
+      if ((EvaluationData(theEnv)->ExternalAddressTypes[theAddress->type] != NULL) &&
+          (EvaluationData(theEnv)->ExternalAddressTypes[theAddress->type]->discardFunction != NULL))
+        { (*EvaluationData(theEnv)->ExternalAddressTypes[theAddress->type]->discardFunction)(theEnv,theAddress->contents); }
+     }
+
+   /*===========================*/
+   /* Return the table entry to */
+   /* the pool of free memory.  */
+   /*===========================*/
+
+   rtn_sized_struct(theEnv,size,theValue);
+  }
+
+/***********************************************************/
+/* AddEphemeralHashNode: Adds a symbol, integer, float, or */
+/*   bit map table entry to the list of ephemeral atomic   */
+/*   values. These entries have a zero count indicating    */
+/*   that no structure is using the data value.            */
+/***********************************************************/
+static void AddEphemeralHashNode(
+  Environment *theEnv,
+  GENERIC_HN *theHashNode,
+  struct ephemeron **theEphemeralList,
+  int hashNodeSize,
+  int averageContentsSize,
+  bool checkCount)
+  {
+   struct ephemeron *temp;
+
+   /*===========================================*/
+   /* If the count isn't zero then this routine */
+   /* should never have been called.            */
+   /*===========================================*/
+
+   if (checkCount && (theHashNode->count != 0))
+     {
+      SystemError(theEnv,"SYMBOL",12);
+      ExitRouter(theEnv,EXIT_FAILURE);
+     }
+
+   /*=====================================*/
+   /* Mark the atomic value as ephemeral. */
+   /*=====================================*/
+
+   theHashNode->markedEphemeral = true;
+
+   /*=============================*/
+   /* Add the atomic value to the */
+   /* list of ephemeral values.   */
+   /*=============================*/
+
+   temp = get_struct(theEnv,ephemeron);
+   temp->associatedValue = theHashNode;
+   temp->next = *theEphemeralList;
+   *theEphemeralList = temp;
+  }
+
+/***************************************************/
+/* RemoveEphemeralAtoms: Causes the removal of all */
+/*   ephemeral symbols, integers, floats, and bit  */
+/*   maps that still have a count value of zero,   */
+/*   from their respective storage tables.         */
+/***************************************************/
+void RemoveEphemeralAtoms(
+  Environment *theEnv)
+  {
+   struct garbageFrame *theGarbageFrame;
+
+   theGarbageFrame = UtilityData(theEnv)->CurrentGarbageFrame;
+   if (! theGarbageFrame->dirty) return;
+
+   RemoveEphemeralHashNodes(theEnv,&theGarbageFrame->ephemeralSymbolList,(GENERIC_HN **) SymbolData(theEnv)->SymbolTable,
+                            sizeof(CLIPSLexeme),SYMBOL_TYPE,AVERAGE_STRING_SIZE);
+   RemoveEphemeralHashNodes(theEnv,&theGarbageFrame->ephemeralFloatList,(GENERIC_HN **) SymbolData(theEnv)->FloatTable,
+                            sizeof(CLIPSFloat),FLOAT_TYPE,0);
+   RemoveEphemeralHashNodes(theEnv,&theGarbageFrame->ephemeralIntegerList,(GENERIC_HN **) SymbolData(theEnv)->IntegerTable,
+                            sizeof(CLIPSInteger),INTEGER_TYPE,0);
+   RemoveEphemeralHashNodes(theEnv,&theGarbageFrame->ephemeralBitMapList,(GENERIC_HN **) SymbolData(theEnv)->BitMapTable,
+                            sizeof(CLIPSBitMap),BITMAPARRAY,AVERAGE_BITMAP_SIZE);
+   RemoveEphemeralHashNodes(theEnv,&theGarbageFrame->ephemeralExternalAddressList,(GENERIC_HN **) SymbolData(theEnv)->ExternalAddressTable,
+                            sizeof(CLIPSExternalAddress),EXTERNAL_ADDRESS_TYPE,0);
+  }
+
+/***********************************************/
+/* EphemerateValue: Marks a value as ephemeral */
+/*   if it is not already marked.              */
+/***********************************************/
+void EphemerateValue(
+   Environment *theEnv,
+   void *theValue)
+   {
+    CLIPSLexeme *theSymbol;
+    CLIPSFloat *theFloat;
+    CLIPSInteger *theInteger;
+    CLIPSExternalAddress *theExternalAddress;
+
+    switch (((TypeHeader *) theValue)->type)
+      {
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+#endif
+        theSymbol = (CLIPSLexeme *) theValue;
+        if (theSymbol->markedEphemeral) return;
+        AddEphemeralHashNode(theEnv,(GENERIC_HN *) theValue,
+                             &UtilityData(theEnv)->CurrentGarbageFrame->ephemeralSymbolList,
+                             sizeof(CLIPSLexeme),AVERAGE_STRING_SIZE,false);
+        UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+        break;
+
+      case FLOAT_TYPE:
+        theFloat = (CLIPSFloat *) theValue;
+        if (theFloat->markedEphemeral) return;
+        AddEphemeralHashNode(theEnv,(GENERIC_HN *) theValue,
+                             &UtilityData(theEnv)->CurrentGarbageFrame->ephemeralFloatList,
+                             sizeof(CLIPSFloat),0,false);
+        UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+        break;
+
+      case INTEGER_TYPE:
+        theInteger = (CLIPSInteger *) theValue;
+        if (theInteger->markedEphemeral) return;
+        AddEphemeralHashNode(theEnv,(GENERIC_HN *) theValue,
+                             &UtilityData(theEnv)->CurrentGarbageFrame->ephemeralIntegerList,
+                             sizeof(CLIPSInteger),0,false);
+        UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+        break;
+
+      case EXTERNAL_ADDRESS_TYPE:
+        theExternalAddress = (CLIPSExternalAddress *) theValue;
+        if (theExternalAddress->markedEphemeral) return;
+        AddEphemeralHashNode(theEnv,(GENERIC_HN *) theValue,
+                             &UtilityData(theEnv)->CurrentGarbageFrame->ephemeralExternalAddressList,
+                             sizeof(CLIPSExternalAddress),sizeof(long),false);
+        UtilityData(theEnv)->CurrentGarbageFrame->dirty = true;
+        break;
+
+      case MULTIFIELD_TYPE:
+        EphemerateMultifield(theEnv,(Multifield *) theValue);
+        break;
+
+      }
+   }
+
+/****************************************************************/
+/* RemoveEphemeralHashNodes: Removes symbols from the ephemeral */
+/*   symbol list that have a count of zero and were placed on   */
+/*   the list at a higher level than the current evaluation     */
+/*   depth. Since symbols are ordered in the list in descending */
+/*   order, the removal process can end when a depth is reached */
+/*   less than the current evaluation depth. Because ephemeral  */
+/*   symbols can be "pulled" up through an evaluation depth,    */
+/*   this routine needs to check through both the previous and  */
+/*   current evaluation depth.                                  */
+/****************************************************************/
+static void RemoveEphemeralHashNodes(
+  Environment *theEnv,
+  struct ephemeron **theEphemeralList,
+  GENERIC_HN **theTable,
+  int hashNodeSize,
+  int hashNodeType,
+  int averageContentsSize)
+  {
+   struct ephemeron *edPtr, *lastPtr = NULL, *nextPtr;
+
+   edPtr = *theEphemeralList;
+
+   while (edPtr != NULL)
+     {
+      /*======================================================*/
+      /* Check through previous and current evaluation depth  */
+      /* because these symbols can be interspersed, otherwise */
+      /* symbols are stored in descending evaluation depth.   */
+      /*======================================================*/
+
+      nextPtr = edPtr->next;
+
+      /*==================================================*/
+      /* Remove any symbols that have a count of zero and */
+      /* were added to the ephemeral list at a higher     */
+      /* evaluation depth.                                */
+      /*==================================================*/
+
+      if (edPtr->associatedValue->count == 0)
+        {
+         RemoveHashNode(theEnv,edPtr->associatedValue,theTable,hashNodeSize,hashNodeType);
+         rtn_struct(theEnv,ephemeron,edPtr);
+         if (lastPtr == NULL) *theEphemeralList = nextPtr;
+         else lastPtr->next = nextPtr;
+        }
+
+      /*=======================================*/
+      /* Remove ephemeral status of any symbol */
+      /* with a count greater than zero.       */
+      /*=======================================*/
+
+      else if (edPtr->associatedValue->count > 0)
+        {
+         edPtr->associatedValue->markedEphemeral = false;
+
+         rtn_struct(theEnv,ephemeron,edPtr);
+
+         if (lastPtr == NULL) *theEphemeralList = nextPtr;
+         else lastPtr->next = nextPtr;
+        }
+
+      /*==================================================*/
+      /* Otherwise keep the symbol in the ephemeral list. */
+      /*==================================================*/
+
+      else
+        { lastPtr = edPtr; }
+
+      edPtr = nextPtr;
+     }
+  }
+
+/*********************************************************/
+/* GetSymbolTable: Returns a pointer to the SymbolTable. */
+/*********************************************************/
+CLIPSLexeme **GetSymbolTable(
+  Environment *theEnv)
+  {
+   return(SymbolData(theEnv)->SymbolTable);
+  }
+
+/******************************************************/
+/* SetSymbolTable: Sets the value of the SymbolTable. */
+/******************************************************/
+void SetSymbolTable(
+  Environment *theEnv,
+  CLIPSLexeme **value)
+  {
+   SymbolData(theEnv)->SymbolTable = value;
+  }
+
+/*******************************************************/
+/* GetFloatTable: Returns a pointer to the FloatTable. */
+/*******************************************************/
+CLIPSFloat **GetFloatTable(
+  Environment *theEnv)
+  {
+   return(SymbolData(theEnv)->FloatTable);
+  }
+
+/****************************************************/
+/* SetFloatTable: Sets the value of the FloatTable. */
+/****************************************************/
+void SetFloatTable(
+  Environment *theEnv,
+  CLIPSFloat **value)
+  {
+   SymbolData(theEnv)->FloatTable = value;
+  }
+
+/***********************************************************/
+/* GetIntegerTable: Returns a pointer to the IntegerTable. */
+/***********************************************************/
+CLIPSInteger **GetIntegerTable(
+  Environment *theEnv)
+  {
+   return(SymbolData(theEnv)->IntegerTable);
+  }
+
+/********************************************************/
+/* SetIntegerTable: Sets the value of the IntegerTable. */
+/********************************************************/
+void SetIntegerTable(
+  Environment *theEnv,
+  CLIPSInteger **value)
+  {
+   SymbolData(theEnv)->IntegerTable = value;
+  }
+
+/*********************************************************/
+/* GetBitMapTable: Returns a pointer to the BitMapTable. */
+/*********************************************************/
+CLIPSBitMap **GetBitMapTable(
+  Environment *theEnv)
+  {
+   return(SymbolData(theEnv)->BitMapTable);
+  }
+
+/******************************************************/
+/* SetBitMapTable: Sets the value of the BitMapTable. */
+/******************************************************/
+void SetBitMapTable(
+  Environment *theEnv,
+  CLIPSBitMap **value)
+  {
+   SymbolData(theEnv)->BitMapTable = value;
+  }
+
+/***************************************************************************/
+/* GetExternalAddressTable: Returns a pointer to the ExternalAddressTable. */
+/***************************************************************************/
+CLIPSExternalAddress **GetExternalAddressTable(
+  Environment *theEnv)
+  {
+   return(SymbolData(theEnv)->ExternalAddressTable);
+  }
+
+/************************************************************************/
+/* SetExternalAddressTable: Sets the value of the ExternalAddressTable. */
+/************************************************************************/
+void SetExternalAddressTable(
+  Environment *theEnv,
+  CLIPSExternalAddress **value)
+  {
+   SymbolData(theEnv)->ExternalAddressTable = value;
+  }
+
+/******************************************************/
+/* RefreshSpecialSymbols: Resets the values of the    */
+/*   TrueSymbol, FalseSymbol, Zero, PositiveInfinity, */
+/*   and NegativeInfinity symbols.                    */
+/******************************************************/
+void RefreshSpecialSymbols(
+  Environment *theEnv)
+  {
+   SymbolData(theEnv)->PositiveInfinity = FindSymbolHN(theEnv,POSITIVE_INFINITY_STRING,SYMBOL_BIT);
+   SymbolData(theEnv)->NegativeInfinity = FindSymbolHN(theEnv,NEGATIVE_INFINITY_STRING,SYMBOL_BIT);
+   SymbolData(theEnv)->Zero = FindLongHN(theEnv,0L);
+  }
+
+/***********************************************************/
+/* FindSymbolMatches: Finds all symbols in the SymbolTable */
+/*   which begin with a specified symbol. This function is */
+/*   used to implement the command completion feature      */
+/*   found in some of the machine specific interfaces.     */
+/***********************************************************/
+struct symbolMatch *FindSymbolMatches(
+  Environment *theEnv,
+  const char *searchString,
+  unsigned *numberOfMatches,
+  size_t *commonPrefixLength)
+  {
+   struct symbolMatch *reply = NULL, *temp;
+   CLIPSLexeme *hashPtr = NULL;
+   size_t searchLength;
+
+   searchLength = strlen(searchString);
+   *numberOfMatches = 0;
+
+   while ((hashPtr = GetNextSymbolMatch(theEnv,searchString,searchLength,hashPtr,
+                                        false,commonPrefixLength)) != NULL)
+     {
+      *numberOfMatches = *numberOfMatches + 1;
+      temp = get_struct(theEnv,symbolMatch);
+      temp->match = hashPtr;
+      temp->next = reply;
+      reply = temp;
+     }
+
+   return(reply);
+  }
+
+/*********************************************************/
+/* ReturnSymbolMatches: Returns a set of symbol matches. */
+/*********************************************************/
+void ReturnSymbolMatches(
+  Environment *theEnv,
+  struct symbolMatch *listOfMatches)
+  {
+   struct symbolMatch *temp;
+
+   while (listOfMatches != NULL)
+     {
+      temp = listOfMatches->next;
+      rtn_struct(theEnv,symbolMatch,listOfMatches);
+      listOfMatches = temp;
+     }
+  }
+
+/***************************************************************/
+/* ClearBitString: Initializes the values of a bitmap to zero. */
+/***************************************************************/
+void ClearBitString(
+  void *vTheBitMap,
+  size_t length)
+  {
+   char *theBitMap = (char *) vTheBitMap;
+   size_t i;
+
+   for (i = 0; i < length; i++) theBitMap[i] = '\0';
+  }
+  
+/****************************************/
+/* BitStringHasBitsSet: Returns true if */
+/*   the bit string has any bits set.   */
+/****************************************/
+bool BitStringHasBitsSet(
+  void *vTheBitMap,
+  unsigned length)
+  {
+   char *theBitMap = (char *) vTheBitMap;
+   unsigned i;
+
+   for (i = 0; i < length; i++)
+     { if (theBitMap[i] != '\0') return true; }
+   
+   return false;
+  }
+
+/*****************************************************************/
+/* GetNextSymbolMatch: Finds the next symbol in the SymbolTable  */
+/*   which begins with a specified symbol. This function is used */
+/*   to implement the command completion feature found in some   */
+/*   of the machine specific interfaces.                         */
+/*****************************************************************/
+CLIPSLexeme *GetNextSymbolMatch(
+  Environment *theEnv,
+  const char *searchString,
+  size_t searchLength,
+  CLIPSLexeme *prevSymbol,
+  bool anywhere,
+  size_t *commonPrefixLength)
+  {
+   unsigned long i;
+   CLIPSLexeme *hashPtr;
+   bool flag = true;
+   size_t prefixLength;
+
+   /*==========================================*/
+   /* If we're looking anywhere in the string, */
+   /* then there's no common prefix length.    */
+   /*==========================================*/
+
+   if (anywhere && (commonPrefixLength != NULL))
+     *commonPrefixLength = 0;
+
+   /*========================================================*/
+   /* If we're starting the search from the beginning of the */
+   /* symbol table, the previous symbol argument is NULL.    */
+   /*========================================================*/
+
+   if (prevSymbol == NULL)
+     {
+      i = 0;
+      hashPtr = SymbolData(theEnv)->SymbolTable[0];
+     }
+
+   /*==========================================*/
+   /* Otherwise start the search at the symbol */
+   /* after the last symbol found.             */
+   /*==========================================*/
+
+   else
+     {
+      i = prevSymbol->bucket;
+      hashPtr = prevSymbol->next;
+     }
+
+   /*==============================================*/
+   /* Search through all the symbol table buckets. */
+   /*==============================================*/
+
+   while (flag)
+     {
+      /*===================================*/
+      /* Search through all of the entries */
+      /* in the bucket being examined.     */
+      /*===================================*/
+
+      for (; hashPtr != NULL; hashPtr = hashPtr->next)
+        {
+         /*================================================*/
+         /* Skip symbols that being with ( since these are */
+         /* typically symbols for internal use. Also skip  */
+         /* any symbols that are marked ephemeral since    */
+         /* these aren't in use.                           */
+         /*================================================*/
+
+         if ((hashPtr->contents[0] == '(') ||
+             (hashPtr->markedEphemeral))
+           { continue; }
+
+         /*==================================================*/
+         /* Two types of matching can be performed: the type */
+         /* comparing just to the beginning of the string    */
+         /* and the type which looks for the substring       */
+         /* anywhere within the string being examined.       */
+         /*==================================================*/
+
+         if (! anywhere)
+           {
+            /*=============================================*/
+            /* Determine the common prefix length between  */
+            /* the previously found match (if available or */
+            /* the search string if not) and the symbol    */
+            /* table entry.                                */
+            /*=============================================*/
+
+            if (prevSymbol != NULL)
+              prefixLength = CommonPrefixLength(prevSymbol->contents,hashPtr->contents);
+            else
+              prefixLength = CommonPrefixLength(searchString,hashPtr->contents);
+
+            /*===================================================*/
+            /* If the prefix length is greater than or equal to  */
+            /* the length of the search string, then we've found */
+            /* a match. If this is the first match, the common   */
+            /* prefix length is set to the length of the first   */
+            /* match, otherwise the common prefix length is the  */
+            /* smallest prefix length found among all matches.   */
+            /*===================================================*/
+
+            if (prefixLength >= searchLength)
+              {
+               if (commonPrefixLength != NULL)
+                 {
+                  if (prevSymbol == NULL)
+                    *commonPrefixLength = strlen(hashPtr->contents);
+                  else if (prefixLength < *commonPrefixLength)
+                    *commonPrefixLength = prefixLength;
+                 }
+               return(hashPtr);
+              }
+           }
+         else
+           {
+            if (StringWithinString(hashPtr->contents,searchString) != NULL)
+              { return(hashPtr); }
+           }
+        }
+
+      /*=================================================*/
+      /* Move on to the next bucket in the symbol table. */
+      /*=================================================*/
+
+      if (++i >= SYMBOL_HASH_SIZE) flag = false;
+      else hashPtr = SymbolData(theEnv)->SymbolTable[i];
+     }
+
+   /*=====================================*/
+   /* There are no more matching symbols. */
+   /*=====================================*/
+
+   return NULL;
+  }
+
+/**********************************************/
+/* StringWithinString: Determines if a string */
+/*   is contained within another string.      */
+/**********************************************/
+static const char *StringWithinString(
+  const char *cs,
+  const char *ct)
+  {
+   unsigned i,j,k;
+
+   for (i = 0 ; cs[i] != '\0' ; i++)
+     {
+      for (j = i , k = 0 ; ct[k] != '\0' && cs[j] == ct[k] ; j++, k++) ;
+      if ((ct[k] == '\0') && (k != 0))
+        return(cs + i);
+     }
+   return NULL;
+  }
+
+/************************************************/
+/* CommonPrefixLength: Determines the length of */
+/*    the maximumcommon prefix of two strings   */
+/************************************************/
+static size_t CommonPrefixLength(
+  const char *cs,
+  const char *ct)
+  {
+   unsigned i;
+
+   for (i = 0 ; (cs[i] != '\0') && (ct[i] != '\0') ; i++)
+     if (cs[i] != ct[i])
+       break;
+   return(i);
+  }
+
+#if BLOAD_AND_BSAVE || CONSTRUCT_COMPILER || BSAVE_INSTANCES
+
+/****************************************************************/
+/* SetAtomicValueIndices: Sets the bucket values for hash table */
+/*   entries with an index value that indicates the position of */
+/*   the hash table in a hash table traversal (e.g. this is the */
+/*   fifth entry in the  hash table.                            */
+/****************************************************************/
+void SetAtomicValueIndices(
+  Environment *theEnv,
+  bool setAll)
+  {
+   unsigned int count;
+   unsigned int i;
+   CLIPSLexeme *symbolPtr, **symbolArray;
+   CLIPSFloat *floatPtr, **floatArray;
+   CLIPSInteger *integerPtr, **integerArray;
+   CLIPSBitMap *bitMapPtr, **bitMapArray;
+
+   /*===================================*/
+   /* Set indices for the symbol table. */
+   /*===================================*/
+
+   count = 0;
+   symbolArray = GetSymbolTable(theEnv);
+
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      for (symbolPtr = symbolArray[i];
+           symbolPtr != NULL;
+           symbolPtr = symbolPtr->next)
+        {
+         if ((symbolPtr->neededSymbol == true) || setAll)
+           { symbolPtr->bucket = count++; }
+        }
+     }
+
+   /*==================================*/
+   /* Set indices for the float table. */
+   /*==================================*/
+
+   count = 0;
+   floatArray = GetFloatTable(theEnv);
+
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+     {
+      for (floatPtr = floatArray[i];
+           floatPtr != NULL;
+           floatPtr = floatPtr->next)
+        {
+         if ((floatPtr->neededFloat == true) || setAll)
+           { floatPtr->bucket = count++; }
+        }
+     }
+
+   /*====================================*/
+   /* Set indices for the integer table. */
+   /*====================================*/
+
+   count = 0;
+   integerArray = GetIntegerTable(theEnv);
+
+   for (i = 0; i < INTEGER_HASH_SIZE; i++)
+     {
+      for (integerPtr = integerArray[i];
+           integerPtr != NULL;
+           integerPtr = integerPtr->next)
+        {
+         if ((integerPtr->neededInteger == true) || setAll)
+           { integerPtr->bucket = count++; }
+        }
+     }
+
+   /*===================================*/
+   /* Set indices for the bitmap table. */
+   /*===================================*/
+
+   count = 0;
+   bitMapArray = GetBitMapTable(theEnv);
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      for (bitMapPtr = bitMapArray[i];
+           bitMapPtr != NULL;
+           bitMapPtr = bitMapPtr->next)
+        {
+         if ((bitMapPtr->neededBitMap == true) || setAll)
+           { bitMapPtr->bucket = count++; }
+        }
+     }
+  }
+
+/***********************************************************************/
+/* RestoreAtomicValueBuckets: Restores the bucket values of hash table */
+/*   entries to the appropriate values. Normally called to undo the    */
+/*   effects of a call to the SetAtomicValueIndices function.          */
+/***********************************************************************/
+void RestoreAtomicValueBuckets(
+  Environment *theEnv)
+  {
+   unsigned int i;
+   CLIPSLexeme *symbolPtr, **symbolArray;
+   CLIPSFloat *floatPtr, **floatArray;
+   CLIPSInteger *integerPtr, **integerArray;
+   CLIPSBitMap *bitMapPtr, **bitMapArray;
+
+   /*================================================*/
+   /* Restore the bucket values in the symbol table. */
+   /*================================================*/
+
+   symbolArray = GetSymbolTable(theEnv);
+
+   for (i = 0; i < SYMBOL_HASH_SIZE; i++)
+     {
+      for (symbolPtr = symbolArray[i];
+           symbolPtr != NULL;
+           symbolPtr = symbolPtr->next)
+        { symbolPtr->bucket = i; }
+     }
+
+   /*===============================================*/
+   /* Restore the bucket values in the float table. */
+   /*===============================================*/
+
+   floatArray = GetFloatTable(theEnv);
+
+   for (i = 0; i < FLOAT_HASH_SIZE; i++)
+     {
+      for (floatPtr = floatArray[i];
+           floatPtr != NULL;
+           floatPtr = floatPtr->next)
+        { floatPtr->bucket = i; }
+     }
+
+   /*=================================================*/
+   /* Restore the bucket values in the integer table. */
+   /*=================================================*/
+
+   integerArray = GetIntegerTable(theEnv);
+
+   for (i = 0; i < INTEGER_HASH_SIZE; i++)
+     {
+      for (integerPtr = integerArray[i];
+           integerPtr != NULL;
+           integerPtr = integerPtr->next)
+        { integerPtr->bucket = i; }
+     }
+
+   /*================================================*/
+   /* Restore the bucket values in the bitmap table. */
+   /*================================================*/
+
+   bitMapArray = GetBitMapTable(theEnv);
+
+   for (i = 0; i < BITMAP_HASH_SIZE; i++)
+     {
+      for (bitMapPtr = bitMapArray[i];
+           bitMapPtr != NULL;
+           bitMapPtr = bitMapPtr->next)
+        { bitMapPtr->bucket = i; }
+     }
+  }
+
+#endif /* BLOAD_AND_BSAVE || CONSTRUCT_COMPILER || BSAVE_INSTANCES */
diff --git a/clips/symbol.h b/clips/symbol.h
new file mode 100755
index 000000000..88bab73f3
--- /dev/null
+++ b/clips/symbol.h
@@ -0,0 +1,243 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  10/01/16            */
+   /*                                                     */
+   /*                 SYMBOL HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Manages the atomic data value hash tables for    */
+/*   storing symbols, integers, floats, and bit maps.        */
+/*   Contains routines for adding entries, examining the     */
+/*   hash tables, and performing garbage collection to       */
+/*   remove entries no longer in use.                        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: CLIPS crashing on AMD64 processor in the       */
+/*            function used to generate a hash value for     */
+/*            integers. DR0871                               */
+/*                                                           */
+/*            Support for run-time programs directly passing */
+/*            the hash tables for initialization.            */
+/*                                                           */
+/*            Corrected code generating compilation          */
+/*            warnings.                                      */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for hashing EXTERNAL_ADDRESS_TYPE      */
+/*            data type.                                     */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Used genstrcpy instead of strcpy.              */
+/*                                                           */
+/*            Added support for external address hash table  */
+/*            and subtyping.                                 */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Added ValueToPointer and EnvValueToPointer     */
+/*            macros.                                        */
+/*                                                           */
+/*      6.40: Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_symbol
+
+#pragma once
+
+#define _H_symbol
+
+#include <stdlib.h>
+
+#include "entities.h"
+
+typedef struct genericHashNode GENERIC_HN;
+
+#ifndef SYMBOL_HASH_SIZE
+#define SYMBOL_HASH_SIZE       63559L
+#endif
+
+#ifndef FLOAT_HASH_SIZE
+#define FLOAT_HASH_SIZE         8191
+#endif
+
+#ifndef INTEGER_HASH_SIZE
+#define INTEGER_HASH_SIZE       8191
+#endif
+
+#ifndef BITMAP_HASH_SIZE
+#define BITMAP_HASH_SIZE        8191
+#endif
+
+#ifndef EXTERNAL_ADDRESS_HASH_SIZE
+#define EXTERNAL_ADDRESS_HASH_SIZE        8191
+#endif
+
+/******************************/
+/* genericHashNode STRUCTURE: */
+/******************************/
+struct genericHashNode
+  {
+   TypeHeader header;
+   struct genericHashNode *next;
+   long count;
+   unsigned int permanent : 1;
+   unsigned int markedEphemeral : 1;
+   unsigned int needed : 1;
+   unsigned int bucket : 29;
+  };
+
+/**********************************************************/
+/* EPHEMERON STRUCTURE: Data structure used to keep track */
+/*   of ephemeral symbols, floats, and integers.          */
+/*                                                        */
+/*   associatedValue: Contains a pointer to the storage   */
+/*   structure for the symbol, float, or integer which is */
+/*   ephemeral.                                           */
+/*                                                        */
+/*   next: Contains a pointer to the next ephemeral item  */
+/*   in a list of ephemeral items.                        */
+/**********************************************************/
+struct ephemeron
+  {
+   GENERIC_HN *associatedValue;
+   struct ephemeron *next;
+  };
+
+/***************/
+/* symbolMatch */
+/***************/
+struct symbolMatch
+  {
+   CLIPSLexeme *match;
+   struct symbolMatch *next;
+  };
+
+#define IncrementLexemeCount(theValue) (((CLIPSLexeme *) theValue)->count++)
+#define IncrementFloatCount(theValue) (((CLIPSFloat *) theValue)->count++)
+#define IncrementIntegerCount(theValue) (((CLIPSInteger *) theValue)->count++)
+#define IncrementBitMapCount(theValue) (((CLIPSBitMap *) theValue)->count++)
+#define IncrementExternalAddressCount(theValue) (((CLIPSExternalAddress *) theValue)->count++)
+
+/*==================*/
+/* ENVIRONMENT DATA */
+/*==================*/
+
+#define SYMBOL_DATA 49
+
+struct symbolData
+  {
+   CLIPSLexeme *PositiveInfinity;
+   CLIPSLexeme *NegativeInfinity;
+   CLIPSInteger *Zero;
+   CLIPSLexeme **SymbolTable;
+   CLIPSFloat **FloatTable;
+   CLIPSInteger **IntegerTable;
+   CLIPSBitMap **BitMapTable;
+   CLIPSExternalAddress **ExternalAddressTable;
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE || BLOAD_INSTANCES || BSAVE_INSTANCES
+   unsigned long NumberOfSymbols;
+   unsigned long NumberOfFloats;
+   unsigned long NumberOfIntegers;
+   unsigned long NumberOfBitMaps;
+   unsigned long NumberOfExternalAddresses;
+   CLIPSLexeme **SymbolArray;
+   CLIPSFloat **FloatArray;
+   CLIPSInteger **IntegerArray;
+   CLIPSBitMap **BitMapArray;
+   CLIPSExternalAddress **ExternalAddressArray;
+#endif
+  };
+
+#define SymbolData(theEnv) ((struct symbolData *) GetEnvironmentData(theEnv,SYMBOL_DATA))
+
+   void                           InitializeAtomTables(Environment *,CLIPSLexeme **,CLIPSFloat **,
+                                                              CLIPSInteger **,CLIPSBitMap **,
+                                                              CLIPSExternalAddress **);
+   CLIPSLexeme                   *AddSymbol(Environment *,const char *,unsigned short);
+   CLIPSLexeme                   *FindSymbolHN(Environment *,const char *,unsigned short);
+   CLIPSFloat                    *CreateFloat(Environment *,double);
+   CLIPSInteger                  *CreateInteger(Environment *,long long);
+   void                          *AddBitMap(Environment *,void *,unsigned short);
+   CLIPSExternalAddress          *CreateExternalAddress(Environment *,void *,unsigned short);
+   CLIPSExternalAddress          *CreateCExternalAddress(Environment *,void *);
+   CLIPSInteger                  *FindLongHN(Environment *,long long);
+   size_t                         HashSymbol(const char *,size_t);
+   size_t                         HashFloat(double,size_t);
+   size_t                         HashInteger(long long,size_t);
+   size_t                         HashBitMap(const char *,size_t,unsigned);
+   size_t                         HashExternalAddress(void *,size_t);
+   void                           RetainLexeme(Environment *,CLIPSLexeme *);
+   void                           RetainFloat(Environment *,CLIPSFloat *);
+   void                           RetainInteger(Environment *,CLIPSInteger *);
+   void                           IncrementBitMapReferenceCount(Environment *,CLIPSBitMap *);
+   void                           RetainExternalAddress(Environment *,CLIPSExternalAddress *);
+   void                           ReleaseLexeme(Environment *,CLIPSLexeme *);
+   void                           ReleaseFloat(Environment *,CLIPSFloat *);
+   void                           ReleaseInteger(Environment *,CLIPSInteger *);
+   void                           DecrementBitMapReferenceCount(Environment *,CLIPSBitMap *);
+   void                           ReleaseExternalAddress(Environment *,CLIPSExternalAddress *);
+   void                           RemoveEphemeralAtoms(Environment *);
+   CLIPSLexeme                  **GetSymbolTable(Environment *);
+   void                           SetSymbolTable(Environment *,CLIPSLexeme **);
+   CLIPSFloat                   **GetFloatTable(Environment *);
+   void                           SetFloatTable(Environment *,CLIPSFloat **);
+   CLIPSInteger                 **GetIntegerTable(Environment *);
+   void                           SetIntegerTable(Environment *,CLIPSInteger **);
+   CLIPSBitMap                  **GetBitMapTable(Environment *);
+   void                           SetBitMapTable(Environment *,CLIPSBitMap **);
+   CLIPSExternalAddress         **GetExternalAddressTable(Environment *);
+   void                           SetExternalAddressTable(Environment *,CLIPSExternalAddress **);
+   void                           RefreshSpecialSymbols(Environment *);
+   struct symbolMatch            *FindSymbolMatches(Environment *,const char *,unsigned *,size_t *);
+   void                           ReturnSymbolMatches(Environment *,struct symbolMatch *);
+   CLIPSLexeme                   *GetNextSymbolMatch(Environment *,const char *,size_t,CLIPSLexeme *,bool,size_t *);
+   void                           ClearBitString(void *,size_t);
+   void                           SetAtomicValueIndices(Environment *,bool);
+   void                           RestoreAtomicValueBuckets(Environment *);
+   void                           EphemerateValue(Environment *,void *);
+   CLIPSLexeme                   *CreateSymbol(Environment *,const char *);
+   CLIPSLexeme                   *CreateString(Environment *,const char *);
+   CLIPSLexeme                   *CreateInstanceName(Environment *,const char *);
+   CLIPSLexeme                   *CreateBoolean(Environment *,bool);
+   bool                           BitStringHasBitsSet(void *,unsigned);
+
+#endif /* _H_symbol */
+
+
+
diff --git a/clips/sysdep.c b/clips/sysdep.c
new file mode 100755
index 000000000..0cb28fb6c
--- /dev/null
+++ b/clips/sysdep.c
@@ -0,0 +1,851 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/05/18             */
+   /*                                                     */
+   /*               SYSTEM DEPENDENT MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Isolation of system dependent routines.          */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Modified GenOpen to check the file length      */
+/*            against the system constant FILENAME_MAX.      */
+/*                                                           */
+/*      6.24: Support for run-time programs directly passing */
+/*            the hash tables for initialization.            */
+/*                                                           */
+/*            Made gensystem functional for Xcode.           */
+/*                                                           */
+/*            Added BeforeOpenFunction and AfterOpenFunction */
+/*            hooks.                                         */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Updated UNIX_V gentime functionality.          */
+/*                                                           */
+/*            Removed GenOpen check against FILENAME_MAX.    */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, IBM_ICB, IBM_TBC, IBM_ZTC, and        */
+/*            IBM_SC).                                       */
+/*                                                           */
+/*            Renamed IBM_MSC and WIN_MVC compiler flags     */
+/*            and IBM_GCC to WIN_GCC.                        */
+/*                                                           */
+/*            Added LINUX and DARWIN compiler flags.         */
+/*                                                           */
+/*            Removed HELP_FUNCTIONS compilation flag and    */
+/*            associated functionality.                      */
+/*                                                           */
+/*            Removed EMACS_EDITOR compilation flag and      */
+/*            associated functionality.                      */
+/*                                                           */
+/*            Combined BASIC_IO and EXT_IO compilation       */
+/*            flags into the single IO_FUNCTIONS flag.       */
+/*                                                           */
+/*            Changed the EX_MATH compilation flag to        */
+/*            EXTENDED_MATH_FUNCTIONS.                       */
+/*                                                           */
+/*            Support for typed EXTERNAL_ADDRESS_TYPE.       */
+/*                                                           */
+/*            GenOpen function checks for UTF-8 Byte Order   */
+/*            Marker.                                        */
+/*                                                           */
+/*            Added gengetchar, genungetchar, genprintfile,  */
+/*            genstrcpy, genstrncpy, genstrcat, genstrncat,  */
+/*            and gensprintf functions.                      */
+/*                                                           */
+/*            Added SetJmpBuffer function.                   */
+/*                                                           */
+/*            Added environment argument to genexit.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Added genchdir function for changing the       */
+/*            current directory.                             */
+/*                                                           */
+/*            Modified gentime to return "comparable" epoch  */
+/*            based values across platforms.                 */
+/*                                                           */
+/*            Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Moved CatchCtrlC to main.c.                    */
+/*                                                           */
+/*            Removed VAX_VMS support.                       */
+/*                                                           */
+/*            Removed ContinueEnvFunction, PauseEnvFunction, */
+/*            and RedrawScreenFunction callbacks.            */
+/*                                                           */
+/*            Completion code now returned by gensystem.     */
+/*                                                           */
+/*            Added flush, rewind, tell, and seek functions. */
+/*                                                           */
+/*            Removed fflush calls after printing.           */
+/*                                                           */
+/*            GenOpen, genchdir, genremove, and genrename    */
+/*            use wide character functions on Windows to     */
+/*            work properly with file and directory names    */
+/*            containing unicode characters.                 */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include <stdlib.h>
+#include <time.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <limits.h>
+
+#if MAC_XCD
+#include <sys/time.h>
+#include <unistd.h>
+#endif
+
+#if WIN_MVC
+#include <windows.h>
+#include <direct.h>
+#include <io.h>
+#include <fcntl.h>
+#include <signal.h>
+#endif
+
+#if   UNIX_7 || WIN_GCC
+#include <sys/types.h>
+#include <sys/timeb.h>
+#include <signal.h>
+#endif
+
+#if   UNIX_V || LINUX || DARWIN
+#include <sys/time.h>
+#include <signal.h>
+#include <unistd.h>
+#endif
+
+#include "envrnmnt.h"
+#include "memalloc.h"
+#include "sysdep.h"
+
+/********************/
+/* ENVIRONMENT DATA */
+/********************/
+
+#define SYSTEM_DEPENDENT_DATA 58
+
+struct systemDependentData
+  {
+#if WIN_MVC
+   int BinaryFileHandle;
+   unsigned char getcBuffer[7];
+   int getcLength;
+   int getcPosition;
+#endif
+#if (! WIN_MVC)
+   FILE *BinaryFP;
+#endif
+   int (*BeforeOpenFunction)(Environment *);
+   int (*AfterOpenFunction)(Environment *);
+   jmp_buf *jmpBuffer;
+  };
+
+#define SystemDependentData(theEnv) ((struct systemDependentData *) GetEnvironmentData(theEnv,SYSTEM_DEPENDENT_DATA))
+
+/********************************************************/
+/* InitializeSystemDependentData: Allocates environment */
+/*    data for system dependent routines.               */
+/********************************************************/
+void InitializeSystemDependentData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,SYSTEM_DEPENDENT_DATA,sizeof(struct systemDependentData),NULL);
+  }
+
+/*********************************************************/
+/* gentime: A function to return a floating point number */
+/*   which indicates the present time. Used internally   */
+/*   for timing rule firings and debugging.              */
+/*********************************************************/
+double gentime()
+  {
+#if MAC_XCD || UNIX_V || DARWIN || LINUX || UNIX_7
+   struct timeval now;
+   gettimeofday(&now, 0);
+   return (now.tv_usec / 1000000.0) + now.tv_sec;
+#elif WIN_MVC
+    FILETIME ft;
+	unsigned long long tt;
+
+    GetSystemTimeAsFileTime(&ft);
+	tt = ft.dwHighDateTime;
+    tt <<=32;
+    tt |= ft.dwLowDateTime;
+    tt /=10;
+    tt -= 11644473600000000ULL;
+	return (double) tt / 1000000.0;
+#else
+   return((double) time(NULL));
+#endif
+  }
+
+/*****************************************************/
+/* gensystem: Generic routine for passing a string   */
+/*   representing a command to the operating system. */
+/*****************************************************/
+int gensystem(
+  Environment *theEnv,
+  const char *commandBuffer)
+  {
+   return system(commandBuffer);
+  }
+
+/*******************************************/
+/* gengetchar: Generic routine for getting */
+/*    a character from stdin.              */
+/*******************************************/
+int gengetchar(
+  Environment *theEnv)
+  {
+   return(getc(stdin));
+  }
+
+/***********************************************/
+/* genungetchar: Generic routine for ungetting */
+/*    a character from stdin.                  */
+/***********************************************/
+int genungetchar(
+  Environment *theEnv,
+  int theChar)
+  {
+   return(ungetc(theChar,stdin));
+  }
+
+/****************************************************/
+/* genprintfile: Generic routine for print a single */
+/*   character string to a file (including stdout). */
+/****************************************************/
+void genprintfile(
+  Environment *theEnv,
+  FILE *fptr,
+  const char *str)
+  {
+   fprintf(fptr,"%s",str);
+  }
+
+/***********************************************************/
+/* InitializeNonportableFeatures: Initializes non-portable */
+/*   features. Currently, the only non-portable feature    */
+/*   requiring initialization is the interrupt handler     */
+/*   which allows execution to be halted.                  */
+/***********************************************************/
+void InitializeNonportableFeatures(
+  Environment *theEnv)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+  }
+
+/**************************************/
+/* genexit:  A generic exit function. */
+/**************************************/
+void genexit(
+  Environment *theEnv,
+  int num)
+  {
+   if (SystemDependentData(theEnv)->jmpBuffer != NULL)
+     { longjmp(*SystemDependentData(theEnv)->jmpBuffer,1); }
+
+   exit(num);
+  }
+
+/**************************************/
+/* SetJmpBuffer: */
+/**************************************/
+void SetJmpBuffer(
+  Environment *theEnv,
+  jmp_buf *theJmpBuffer)
+  {
+   SystemDependentData(theEnv)->jmpBuffer = theJmpBuffer;
+  }
+
+/******************************************/
+/* genstrcpy: Generic genstrcpy function. */
+/******************************************/
+char *genstrcpy(
+  char *dest,
+  const char *src)
+  {
+   return strcpy(dest,src);
+  }
+
+/********************************************/
+/* genstrncpy: Generic genstrncpy function. */
+/********************************************/
+char *genstrncpy(
+  char *dest,
+  const char *src,
+  size_t n)
+  {
+   return strncpy(dest,src,n);
+  }
+
+/******************************************/
+/* genstrcat: Generic genstrcat function. */
+/******************************************/
+char *genstrcat(
+  char *dest,
+  const char *src)
+  {
+   return strcat(dest,src);
+  }
+
+/********************************************/
+/* genstrncat: Generic genstrncat function. */
+/********************************************/
+char *genstrncat(
+  char *dest,
+  const char *src,
+  size_t n)
+  {
+   return strncat(dest,src,n);
+  }
+
+/*****************************************/
+/* gensprintf: Generic sprintf function. */
+/*****************************************/
+int gensprintf(
+  char *buffer,
+  const char *restrictStr,
+  ...)
+  {
+   va_list args;
+   int rv;
+
+   va_start(args,restrictStr);
+
+   rv = vsprintf(buffer,restrictStr,args);
+
+   va_end(args);
+
+   return rv;
+  }
+
+/******************************************************/
+/* genrand: Generic random number generator function. */
+/******************************************************/
+int genrand()
+  {
+   return(rand());
+  }
+
+/**********************************************************************/
+/* genseed: Generic function for seeding the random number generator. */
+/**********************************************************************/
+void genseed(
+  unsigned int seed)
+  {
+   srand(seed);
+  }
+
+/*********************************************/
+/* gengetcwd: Generic function for returning */
+/*   the current directory.                  */
+/*********************************************/
+char *gengetcwd(
+  char *buffer,
+  int buflength)
+  {
+#if MAC_XCD
+   return(getcwd(buffer,buflength));
+#else
+   if (buffer != NULL)
+     { buffer[0] = 0; }
+   return(buffer);
+#endif
+  }
+
+/*************************************************/
+/* genchdir: Generic function for setting the    */
+/*   current directory. Returns 1 if successful, */
+/*   0 if unsuccessful, and -1 if unavailable.   */
+/*************************************************/
+int genchdir(
+  Environment *theEnv,
+  const char *directory)
+  {
+   int rv = -1;
+   
+   /*==========================================================*/
+   /* If the directory argument is NULL, then the return value */
+   /* indicates whether the chdir functionality is supported.  */
+   /*==========================================================*/
+   
+   if (directory == NULL)
+     {
+#if MAC_XCD || DARWIN || LINUX || WIN_MVC
+      return 1;
+#else
+      return 0;
+#endif
+     }
+     
+   /*========================================*/
+   /* Otherwise, try changing the directory. */
+   /*========================================*/
+   
+#if MAC_XCD || DARWIN || LINUX
+   rv = chdir(directory) + 1;
+#endif
+#if WIN_MVC 
+   wchar_t *wdirectory;
+   int wlength;
+
+   wlength = MultiByteToWideChar(CP_UTF8,0,directory,-1,NULL,0);
+
+   wdirectory = (wchar_t *) genalloc(theEnv,wlength * sizeof(wchar_t)); 
+
+   MultiByteToWideChar(CP_UTF8,0,directory,-1,wdirectory,wlength);
+
+   rv = _wchdir(wdirectory) + 1;
+
+   genfree(theEnv,wdirectory,wlength * sizeof(wchar_t));
+#endif
+
+   return rv;
+  }
+
+/****************************************************/
+/* genremove: Generic function for removing a file. */
+/****************************************************/
+bool genremove(
+  Environment *theEnv,
+  const char *fileName)
+  {
+#if WIN_MVC
+   wchar_t *wfileName;
+   int wfnlength;
+#endif
+
+#if WIN_MVC
+   wfnlength = MultiByteToWideChar(CP_UTF8,0,fileName,-1,NULL,0);
+
+   wfileName = (wchar_t *) genalloc(theEnv,wfnlength * sizeof(wchar_t)); 
+
+   MultiByteToWideChar(CP_UTF8,0,fileName,-1,wfileName,wfnlength);
+
+   if (_wremove(wfileName))
+     { 
+      genfree(theEnv,wfileName,wfnlength * sizeof(wchar_t));
+      return false;
+     }
+
+   genfree(theEnv,wfileName,wfnlength * sizeof(wchar_t));
+#else
+   if (remove(fileName)) return false;
+#endif
+
+   return true;
+  }
+
+/****************************************************/
+/* genrename: Generic function for renaming a file. */
+/****************************************************/
+bool genrename(
+  Environment *theEnv,
+  const char *oldFileName,
+  const char *newFileName)
+  {
+#if WIN_MVC
+   wchar_t *woldFileName, *wnewFileName;
+   int wofnlength, wnfnlength;
+#endif
+
+#if WIN_MVC
+   wofnlength = MultiByteToWideChar(CP_UTF8,0,oldFileName,-1,NULL,0);
+   wnfnlength = MultiByteToWideChar(CP_UTF8,0,newFileName,-1,NULL,0);
+
+   woldFileName = (wchar_t *) genalloc(theEnv,wofnlength * sizeof(wchar_t)); 
+   wnewFileName = (wchar_t *) genalloc(theEnv,wnfnlength * sizeof(wchar_t)); 
+
+   MultiByteToWideChar(CP_UTF8,0,oldFileName,-1,woldFileName,wofnlength);
+   MultiByteToWideChar(CP_UTF8,0,newFileName,-1,wnewFileName,wnfnlength);
+
+   if (_wrename(woldFileName,wnewFileName))
+     { 
+      genfree(theEnv,woldFileName,wofnlength * sizeof(wchar_t));
+      genfree(theEnv,wnewFileName,wnfnlength * sizeof(wchar_t));
+      return false;
+     }
+
+   genfree(theEnv,woldFileName,wofnlength * sizeof(wchar_t));
+   genfree(theEnv,wnewFileName,wnfnlength * sizeof(wchar_t));
+#else
+   if (rename(oldFileName,newFileName)) return false;
+#endif
+
+   return true;
+  }
+
+/***********************************/
+/* SetBeforeOpenFunction: Sets the */
+/*  value of BeforeOpenFunction.   */
+/***********************************/
+int (*SetBeforeOpenFunction(Environment *theEnv,
+                               int (*theFunction)(Environment *)))(Environment *)
+  {
+   int (*tempFunction)(Environment *);
+
+   tempFunction = SystemDependentData(theEnv)->BeforeOpenFunction;
+   SystemDependentData(theEnv)->BeforeOpenFunction = theFunction;
+   return(tempFunction);
+  }
+
+/**********************************/
+/* SetAfterOpenFunction: Sets the */
+/*  value of AfterOpenFunction.   */
+/**********************************/
+int (*SetAfterOpenFunction(Environment *theEnv,
+                              int (*theFunction)(Environment *)))(Environment *)
+  {
+   int (*tempFunction)(Environment *);
+
+   tempFunction = SystemDependentData(theEnv)->AfterOpenFunction;
+   SystemDependentData(theEnv)->AfterOpenFunction = theFunction;
+   return(tempFunction);
+  }
+
+/*********************************************/
+/* GenOpen: Trap routine for opening a file. */
+/*********************************************/
+FILE *GenOpen(
+  Environment *theEnv,
+  const char *fileName,
+  const char *accessType)
+  {
+   FILE *theFile;
+#if WIN_MVC
+   wchar_t *wfileName;
+   wchar_t *waccessType;
+   int wfnlength, watlength;
+#endif
+   /*==================================*/
+   /* Invoke the before open function. */
+   /*==================================*/
+
+   if (SystemDependentData(theEnv)->BeforeOpenFunction != NULL)
+     { (*SystemDependentData(theEnv)->BeforeOpenFunction)(theEnv); }
+
+   /*================*/
+   /* Open the file. */
+   /*================*/
+
+#if WIN_MVC
+   wfnlength = MultiByteToWideChar(CP_UTF8,0,fileName,-1,NULL,0);
+   watlength = MultiByteToWideChar(CP_UTF8,0,accessType,-1,NULL,0);
+
+   wfileName = (wchar_t *) genalloc(theEnv,wfnlength * sizeof(wchar_t)); 
+   waccessType = (wchar_t *) genalloc(theEnv,watlength * sizeof(wchar_t)); 
+
+   MultiByteToWideChar(CP_UTF8,0,fileName,-1,wfileName,wfnlength);
+   MultiByteToWideChar(CP_UTF8,0,accessType,-1,waccessType,watlength);
+
+   _wfopen_s(&theFile,wfileName,waccessType);
+
+   genfree(theEnv,wfileName,wfnlength * sizeof(wchar_t));
+   genfree(theEnv,waccessType,watlength * sizeof(wchar_t));
+#else
+   theFile = fopen(fileName,accessType);
+#endif
+
+   /*=====================================*/
+   /* Check for a UTF-8 Byte Order Marker */
+   /* (BOM): 0xEF,0xBB,0xBF.              */
+   /*=====================================*/
+
+   if ((theFile != NULL) & (strcmp(accessType,"r") == 0))
+     {
+      int theChar;
+
+      theChar = getc(theFile);
+      if (theChar == 0xEF)
+       {
+        theChar = getc(theFile);
+        if (theChar == 0xBB)
+          {
+           theChar = getc(theFile);
+           if (theChar != 0xBF)
+             { ungetc(theChar,theFile);}
+          }
+        else
+          { ungetc(theChar,theFile);}
+       }
+      else
+       { ungetc(theChar,theFile); }
+     }
+
+   /*=================================*/
+   /* Invoke the after open function. */
+   /*=================================*/
+
+   if (SystemDependentData(theEnv)->AfterOpenFunction != NULL)
+     { (*SystemDependentData(theEnv)->AfterOpenFunction)(theEnv); }
+
+   /*===============================*/
+   /* Return a pointer to the file. */
+   /*===============================*/
+
+   return theFile;
+  }
+
+/**********************************************/
+/* GenClose: Trap routine for closing a file. */
+/**********************************************/
+int GenClose(
+  Environment *theEnv,
+  FILE *theFile)
+  {
+   int rv;
+
+   rv = fclose(theFile);
+
+   return rv;
+  }
+
+/***********************************************/
+/* GenFlush: Trap routine for flushing a file. */
+/***********************************************/
+int GenFlush(
+  Environment *theEnv,
+  FILE *theFile)
+  {
+   int rv;
+
+   rv = fflush(theFile);
+
+   return rv;
+  }
+
+/*************************************************/
+/* GenRewind: Trap routine for rewinding a file. */
+/*************************************************/
+void GenRewind(
+  Environment *theEnv,
+  FILE *theFile)
+  {
+   rewind(theFile);
+  }
+
+/*************************************************/
+/* GenTell: Trap routine for the ftell function. */
+/*************************************************/
+long long GenTell(
+  Environment *theEnv,
+  FILE *theFile)
+  {
+   long long rv;
+   
+   rv = ftell(theFile);
+   
+   if (rv == -1)
+     {
+      if (errno > 0)
+        { return LLONG_MIN; }
+     }
+   
+   return rv;
+  }
+
+/*************************************************/
+/* GenSeek: Trap routine for the fseek function. */
+/*************************************************/
+int GenSeek(
+  Environment *theEnv,
+  FILE *theFile,
+  long offset,
+  int whereFrom)
+  {
+   return fseek(theFile,offset,whereFrom);
+  }
+
+/************************************************************/
+/* GenOpenReadBinary: Generic and machine specific code for */
+/*   opening a file for binary access. Only one file may be */
+/*   open at a time when using this function since the file */
+/*   pointer is stored in a global variable.                */
+/************************************************************/
+int GenOpenReadBinary(
+  Environment *theEnv,
+  const char *funcName,
+  const char *fileName)
+  {
+   if (SystemDependentData(theEnv)->BeforeOpenFunction != NULL)
+     { (*SystemDependentData(theEnv)->BeforeOpenFunction)(theEnv); }
+
+#if WIN_MVC
+   SystemDependentData(theEnv)->BinaryFileHandle = _open(fileName,O_RDONLY | O_BINARY);
+   if (SystemDependentData(theEnv)->BinaryFileHandle == -1)
+     {
+      if (SystemDependentData(theEnv)->AfterOpenFunction != NULL)
+        { (*SystemDependentData(theEnv)->AfterOpenFunction)(theEnv); }
+      return 0;
+     }
+#endif
+
+#if (! WIN_MVC)
+   if ((SystemDependentData(theEnv)->BinaryFP = fopen(fileName,"rb")) == NULL)
+     {
+      if (SystemDependentData(theEnv)->AfterOpenFunction != NULL)
+        { (*SystemDependentData(theEnv)->AfterOpenFunction)(theEnv); }
+      return 0;
+     }
+#endif
+
+   if (SystemDependentData(theEnv)->AfterOpenFunction != NULL)
+     { (*SystemDependentData(theEnv)->AfterOpenFunction)(theEnv); }
+
+   return 1;
+  }
+
+/***********************************************/
+/* GenReadBinary: Generic and machine specific */
+/*   code for reading from a file.             */
+/***********************************************/
+void GenReadBinary(
+  Environment *theEnv,
+  void *dataPtr,
+  size_t size)
+  {
+#if WIN_MVC
+   char *tempPtr;
+
+   tempPtr = (char *) dataPtr;
+   while (size > INT_MAX)
+     {
+      _read(SystemDependentData(theEnv)->BinaryFileHandle,tempPtr,INT_MAX);
+      size -= INT_MAX;
+      tempPtr = tempPtr + INT_MAX;
+     }
+
+   if (size > 0)
+     { _read(SystemDependentData(theEnv)->BinaryFileHandle,tempPtr,(unsigned int) size); }
+#endif
+
+#if (! WIN_MVC)
+   fread(dataPtr,size,1,SystemDependentData(theEnv)->BinaryFP);
+#endif
+  }
+
+/***************************************************/
+/* GetSeekCurBinary:  Generic and machine specific */
+/*   code for seeking a position in a file.        */
+/***************************************************/
+void GetSeekCurBinary(
+  Environment *theEnv,
+  long offset)
+  {
+#if WIN_MVC
+   _lseek(SystemDependentData(theEnv)->BinaryFileHandle,offset,SEEK_CUR);
+#endif
+
+#if (! WIN_MVC)
+   fseek(SystemDependentData(theEnv)->BinaryFP,offset,SEEK_CUR);
+#endif
+  }
+
+/***************************************************/
+/* GetSeekSetBinary:  Generic and machine specific */
+/*   code for seeking a position in a file.        */
+/***************************************************/
+void GetSeekSetBinary(
+  Environment *theEnv,
+  long offset)
+  {
+#if WIN_MVC
+   _lseek(SystemDependentData(theEnv)->BinaryFileHandle,offset,SEEK_SET);
+#endif
+
+#if (! WIN_MVC)
+   fseek(SystemDependentData(theEnv)->BinaryFP,offset,SEEK_SET);
+#endif
+  }
+
+/************************************************/
+/* GenTellBinary:  Generic and machine specific */
+/*   code for telling a position in a file.     */
+/************************************************/
+void GenTellBinary(
+  Environment *theEnv,
+  long *offset)
+  {
+#if WIN_MVC
+   *offset = _lseek(SystemDependentData(theEnv)->BinaryFileHandle,0,SEEK_CUR);
+#endif
+
+#if (! WIN_MVC)
+   *offset = ftell(SystemDependentData(theEnv)->BinaryFP);
+#endif
+  }
+
+/****************************************/
+/* GenCloseBinary:  Generic and machine */
+/*   specific code for closing a file.  */
+/****************************************/
+void GenCloseBinary(
+  Environment *theEnv)
+  {
+   if (SystemDependentData(theEnv)->BeforeOpenFunction != NULL)
+     { (*SystemDependentData(theEnv)->BeforeOpenFunction)(theEnv); }
+
+#if WIN_MVC
+   _close(SystemDependentData(theEnv)->BinaryFileHandle);
+#endif
+
+#if (! WIN_MVC)
+   fclose(SystemDependentData(theEnv)->BinaryFP);
+#endif
+
+   if (SystemDependentData(theEnv)->AfterOpenFunction != NULL)
+     { (*SystemDependentData(theEnv)->AfterOpenFunction)(theEnv); }
+  }
+
+/***********************************************/
+/* GenWrite: Generic routine for writing to a  */
+/*   file. No machine specific code as of yet. */
+/***********************************************/
+void GenWrite(
+  void *dataPtr,
+  size_t size,
+  FILE *fp)
+  {
+   if (size == 0) return;
+#if UNIX_7
+   fwrite(dataPtr,size,1,fp);
+#else
+   fwrite(dataPtr,size,1,fp);
+#endif
+  }
diff --git a/clips/sysdep.h b/clips/sysdep.h
new file mode 100755
index 000000000..e9e3039e5
--- /dev/null
+++ b/clips/sysdep.h
@@ -0,0 +1,149 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  01/25/18             */
+   /*                                                     */
+   /*            SYSTEM DEPENDENT HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Isolation of system dependent routines.          */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Modified GenOpen to check the file length      */
+/*            against the system constant FILENAME_MAX.      */
+/*                                                           */
+/*      6.24: Support for run-time programs directly passing */
+/*            the hash tables for initialization.            */
+/*                                                           */
+/*            Made gensystem functional for Xcode.           */
+/*                                                           */
+/*            Added BeforeOpenFunction and AfterOpenFunction */
+/*            hooks.                                         */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*            Updated UNIX_V gentime functionality.          */
+/*                                                           */
+/*            Removed GenOpen check against FILENAME_MAX.    */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, IBM_ICB, IBM_TBC, IBM_ZTC, and        */
+/*            IBM_SC).                                       */
+/*                                                           */
+/*            Renamed IBM_MSC and WIN_MVC compiler flags     */
+/*            and IBM_GCC to WIN_GCC.                        */
+/*                                                           */
+/*            Added LINUX and DARWIN compiler flags.         */
+/*                                                           */
+/*            Removed HELP_FUNCTIONS compilation flag and    */
+/*            associated functionality.                      */
+/*                                                           */
+/*            Removed EMACS_EDITOR compilation flag and      */
+/*            associated functionality.                      */
+/*                                                           */
+/*            Combined BASIC_IO and EXT_IO compilation       */
+/*            flags into the single IO_FUNCTIONS flag.       */
+/*                                                           */
+/*            Changed the EX_MATH compilation flag to        */
+/*            EXTENDED_MATH_FUNCTIONS.                       */
+/*                                                           */
+/*            Support for typed EXTERNAL_ADDRESS_TYPE.       */
+/*                                                           */
+/*            GenOpen function checks for UTF-8 Byte Order   */
+/*            Marker.                                        */
+/*                                                           */
+/*            Added gengetchar, genungetchar, genprintfile,  */
+/*            genstrcpy, genstrncpy, genstrcat, genstrncat,  */
+/*            and gensprintf functions.                      */
+/*                                                           */
+/*            Added SetJmpBuffer function.                   */
+/*                                                           */
+/*            Added environment argument to genexit.         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Added genchdir function for changing the       */
+/*            current directory.                             */
+/*                                                           */
+/*            Refactored code to reduce header dependencies  */
+/*            in sysdep.c.                                   */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed ContinueEnvFunction, PauseEnvFunction, */
+/*            and RedrawScreenFunction callbacks.            */
+/*                                                           */
+/*            Completion code now returned by gensystem.     */
+/*                                                           */
+/*            Added flush, rewind, tell, and seek functions. */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_sysdep
+
+#pragma once
+
+#define _H_sysdep
+
+#include <stdio.h>
+#include <setjmp.h>
+
+   double                      gentime(void);
+   int                         gensystem(Environment *,const char *);
+   int                         GenOpenReadBinary(Environment *,const char *,const char *);
+   void                        GetSeekCurBinary(Environment *,long);
+   void                        GetSeekSetBinary(Environment *,long);
+   void                        GenTellBinary(Environment *,long *);
+   void                        GenCloseBinary(Environment *);
+   void                        GenReadBinary(Environment *,void *,size_t);
+   FILE                       *GenOpen(Environment *,const char *,const char *);
+   int                         GenClose(Environment *,FILE *);
+   int                         GenFlush(Environment *,FILE *);
+   void                        GenRewind(Environment *,FILE *);
+   long long                   GenTell(Environment *,FILE *);
+   int                         GenSeek(Environment *,FILE *,long,int);
+   void                        genexit(Environment *,int);
+   int                         genrand(void);
+   void                        genseed(unsigned int);
+   bool                        genremove(Environment *,const char *);
+   bool                        genrename(Environment *,const char *,const char *);
+   char                       *gengetcwd(char *,int);
+   void                        GenWrite(void *,size_t,FILE *);
+   int                       (*SetBeforeOpenFunction(Environment *,int (*)(Environment *)))(Environment *);
+   int                       (*SetAfterOpenFunction(Environment *,int (*)(Environment *)))(Environment *);
+   int                         gensprintf(char *,const char *,...);
+   char                       *genstrcpy(char *,const char *);
+   char                       *genstrncpy(char *,const char *,size_t);
+   char                       *genstrcat(char *,const char *);
+   char                       *genstrncat(char *,const char *,size_t);
+   int                         genchdir(Environment *,const char *);
+   void                        SetJmpBuffer(Environment *,jmp_buf *);
+   void                        genprintfile(Environment *,FILE *,const char *);
+   int                         gengetchar(Environment *);
+   int                         genungetchar(Environment *,int);
+   void                        InitializeSystemDependentData(Environment *);
+   void                        InitializeNonportableFeatures(Environment *);
+
+#endif /* _H_sysdep */
+
+
+
+
+
diff --git a/clips/textpro.c b/clips/textpro.c
new file mode 100755
index 000000000..4684b1a8a
--- /dev/null
+++ b/clips/textpro.c
@@ -0,0 +1,1388 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*               TEXT PROCESSING MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Modified error messages so that they were      */
+/*            directly printed rather than storing them in   */
+/*            a string buffer which might not be large       */
+/*            enough to contain the entire message. DR0855   */
+/*            Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Added get-region function.                     */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*      6.30: Removed HELP_FUNCTIONS compilation flag and    */
+/*            associated functionality.                      */
+/*                                                           */
+/*            Used genstrcpy and genstrncpy instead of       */
+/*            strcpy and strncpy.                            */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_TBC).         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Added STDOUT and STDIN logical name            */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.31: Fixed crash issue when using textpro functions */
+/*            on Windows with files having unix eol.         */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+
+/**************************************************************************/
+/**************************************************************************/
+/*                        LOOKUP TABLE FUNCTIONS                          */
+/*                                                                        */
+/* The functions contained in this file set up and access a hierarchical  */
+/* lookup system for multiple files.                                      */
+/*                                                                        */
+/* For usage see external documentation.                                  */
+/**************************************************************************/
+/**************************************************************************/
+
+#include "setup.h"
+
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "commline.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+#include "utility.h"
+
+#include "textpro.h"
+
+#if TEXTPRO_FUNCTIONS
+
+#define NAMESIZE 80
+#define NULLCHAR '\0'
+#define BLANK (' ')
+#define TAB ('\t')
+#define LNFEED ('\n')
+
+/*=========================================================*/
+/*Status returns for the file loading and lookup functions */
+/*=========================================================*/
+#define NORMAL 0          /*Entry information found in file       */
+#define NO_FILE -10       /*File not found for reference          */
+#define NEW_FILE -15      /*File loaded onto internal lookup table*/
+#define OLD_FILE -20      /*File was already on the lookup table  */
+
+#define NO_TOPIC -25      /*No entry information was found in file*/
+#define EXIT -30          /*Branch-up from root; exit lookup table*/
+#define BRANCH_UP -35     /*Move up from subtopic entry to parent */
+#define BRANCH_DOWN -40   /*Move down from main topic to subtopic */
+
+/*=================*/
+/*Entry data types */
+/*=================*/
+#define MENU -45    /*Entry has subtopics*/
+#define INFO -50    /*Entry is a leaf; contains only information*/
+
+/*==========================================*/
+/*Entry node type for internal lookup table */
+/*==========================================*/
+struct entries
+  {
+   int level;              /*Level of entry node in the lookup tree  */
+   int type;               /*Entry node data type : menu or info     */
+   char name[NAMESIZE];    /*Entry node name                         */
+   long offset;            /*Location of entry info in the file      */
+   struct entries *child;  /*Address of list of subtopic entries     */
+   struct entries *parent; /*Address of parent topic entry           */
+   struct entries *next;   /*Address of next entry at the same level */
+  };
+
+/*=========================================*/
+/*File node type for internal lookup table */
+/*=========================================*/
+struct lists
+  {
+   char file[NAMESIZE];       /*File name                                */
+   struct entries *topics;    /*Address of list of entry topics for file */
+   struct entries *curr_menu; /*Address of current main topic in file    */
+   struct lists *next;        /*Address of next file in the table        */
+  };
+
+/*==================================================*/
+/*Delimeter strings for marking entries in the file */
+/*==================================================*/
+#define BDELIM "BEGIN-ENTRY-"
+#define BDLEN 12
+#define EDELIM "END-ENTRY"
+#define EDLEN 9
+#define BFORMAT "%d%1s%12s%s"   /*Format string for sscanf*/
+#define LIT_DELIM ('$')
+
+#define OPEN_READ "r"
+#define OPEN_READ_BINARY "rb"
+
+#define TEXTPRO_DATA 8
+
+struct textProcessingData
+  {
+   struct lists *headings;
+   struct entries *parent;
+  };
+
+#define TextProcessingData(theEnv) ((struct textProcessingData *) GetEnvironmentData(theEnv,TEXTPRO_DATA))
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static int                     TextLookupFetch(Environment *,const char *);
+   static bool                    TextLookupToss(Environment *,const char *);
+   static FILE                   *GetEntries(Environment *,const char *,char **,char *,int *);
+   static FILE                   *GetCurrentMenu(Environment *,const char *,int *);
+   static char                   *GrabString(Environment *,FILE *,char *,int);
+
+   static int                     findstr(const char *,const char *);
+   static void                    upper(char *);
+   static struct lists           *NewFetchFile(Environment *,const char *);
+   static struct entries         *AllocateEntryNode(Environment *,FILE *,const char *,const char *,int);
+   static bool                    AttachLeaf(Environment *,struct lists *,struct entries *,FILE *,const char *,int);
+   static long                    LookupEntry(Environment *,const char *,char **,char *,int *);
+   static void                    TossFunction(Environment *,struct entries *);
+   static void                    DeallocateTextProcessingData(Environment *);
+
+/******************************************************************************/
+/*============================================================================*/
+/*                             INTERNAL ROUTINES                              */
+/*============================================================================*/
+/******************************************************************************/
+
+/****************************************************************************/
+/*LOAD FUNCTION :                                                           */
+/* Input : 1) name of file to be loaded into the lookup table               */
+/*         2) caller-allocated buffer to contain an error message (if any)  */
+/*         3) size of error message buffer                                  */
+/* Output :                                                                 */
+/* This function attempts to load the file's topic information into the     */
+/* lookup table according to the format below :                             */
+/*                                                                          */
+/* <level-num><entry-type-code>BEGIN-ENTRY-<topic-name>                     */
+/*                .                                                         */
+/*                .                                                         */
+/*    Entry information in the form in which                                */
+/*    it is to be displayed when referenced.                                */
+/*                .                                                         */
+/*                .                                                         */
+/* END-ENTRY                                                                */
+/*                                                                          */
+/* The function returns the number of entries loaded if the entire file was */
+/*   was correctly formatted, else it returns -1.                           */
+/****************************************************************************/
+static int TextLookupFetch(
+  Environment *theEnv,
+  const char *file)
+  {
+   FILE *fp;                     /*Pointer into stream of input file      */
+   char str[256];                /*Buffer for storing input file lines    */
+   bool INFO_BEGIN, INFO_END;    /*Flags used to check proper syntax      */
+   struct lists *lnode;          /*Used to store file node in list        */
+   struct entries *enode;        /*Used to store entry node in topic list */
+   int line_ct;                  /*Line count - used for error messages   */
+   int entries_ct;               /*Number of entries successfully loaded. */
+
+   fp = GenOpen(theEnv,file,OPEN_READ_BINARY);
+
+   if (fp == NULL)
+     {
+      PrintErrorID(theEnv,"TEXTPRO",1,false);
+      WriteString(theEnv,STDERR,"Could not open file '");
+      WriteString(theEnv,STDERR,file);
+      WriteString(theEnv,STDERR,"'.\n");
+      return -1;
+     }
+
+   if ((lnode = NewFetchFile(theEnv,file)) == NULL)
+     {
+      GenClose(theEnv,fp);
+
+      PrintErrorID(theEnv,"TEXTPRO",2,false);
+      WriteString(theEnv,STDERR,"File '");
+      WriteString(theEnv,STDERR,file);
+      WriteString(theEnv,STDERR,"' already loaded.\n");
+      return -1;
+     }
+
+   /*===========================*/
+   /*Store the file entry topics*/
+   /*===========================*/
+   line_ct = 0;
+   entries_ct = 0;
+
+   INFO_BEGIN = false;
+   INFO_END = true;
+   while (fgets(str,256,fp) != NULL)
+     {
+      line_ct++;
+
+      /*=============================================================*/
+      /*Forces the load function to ignore lines beginning with `$$' */
+      /*=============================================================*/
+
+      if ((str[0] != LIT_DELIM) || (str[1] != LIT_DELIM))
+        {
+        if (findstr(str,EDELIM) >= 0)
+          {
+           if (INFO_BEGIN == true)
+             {
+              INFO_BEGIN = false;
+              INFO_END = true;
+              entries_ct++;
+             }
+           else
+             {
+              GenClose(theEnv,fp);
+              TextLookupToss(theEnv,file);
+              PrintErrorID(theEnv,"TEXTPRO",8,false);
+              WriteString(theEnv,STDERR,"Line ");
+              WriteInteger(theEnv,STDERR,line_ct);
+              WriteString(theEnv,STDERR," : Unmatched end marker.\n");
+              return(-1);
+             }
+          }
+        else if (findstr(str,BDELIM) >= 0)
+          {
+           if (INFO_END == true)
+              {
+               INFO_END = false;
+               INFO_BEGIN = true;
+              }
+            else
+              {
+               GenClose(theEnv,fp);
+               TextLookupToss(theEnv,file);
+
+               PrintErrorID(theEnv,"TEXTPRO",4,false);
+               WriteString(theEnv,STDERR,"Line ");
+               WriteInteger(theEnv,STDERR,line_ct);
+               WriteString(theEnv,STDERR," : Previous entry not closed.\n");
+
+               return(-1);
+              }
+
+           if ((enode=AllocateEntryNode(theEnv,fp,file,str,line_ct))==NULL)
+             return(-1);
+
+           /*=================================*/
+           /*Store new entry node in the tree */
+           /*=================================*/
+           if (AttachLeaf(theEnv,lnode,enode,fp,file,line_ct) == false)
+             return(-1);
+          }
+        }
+     }
+   GenClose(theEnv,fp);
+   if (INFO_END == false)
+     {
+      TextLookupToss(theEnv,file);
+
+      PrintErrorID(theEnv,"TEXTPRO",4,false);
+      WriteString(theEnv,STDERR,"Line ");
+      WriteInteger(theEnv,STDERR,line_ct);
+      WriteString(theEnv,STDERR," : Previous entry not closed.\n");
+
+      return(-1);
+     }
+   if (entries_ct == 0)
+     TextLookupToss(theEnv,file);
+   return(entries_ct);
+  }
+
+/******************************************************************************/
+/*FUNCTION UNLOAD :                                                           */
+/* Input : 1) name of file to be taken off the lookup table                   */
+/* Output : This functions deletes a file and all entry-topics associated with*/
+/*          it from the lookup table and returns a boolean flag indicating    */
+/*          failure or success.                                               */
+/******************************************************************************/
+static bool TextLookupToss(
+  Environment *theEnv,
+  const char *file)
+  {
+   struct lists *plptr, *clptr;
+   int l_flag;
+
+   clptr = TextProcessingData(theEnv)->headings;
+   plptr = clptr;
+   if (clptr != NULL)
+     if (strcmp(clptr->file,file) != 0)
+       l_flag = 1;
+     else
+       l_flag = 0;
+   else
+     l_flag = 0;
+   while (l_flag > 0)
+     {
+      plptr = clptr;
+      clptr = clptr->next;
+      if (clptr != NULL)
+        if (strcmp(clptr->file,file) != 0)
+          l_flag = 1;
+        else
+          l_flag = 0;
+      else
+        l_flag = 0;
+     }
+   if (clptr == NULL)
+     return false;
+
+   TossFunction(theEnv,clptr->topics);
+
+   if (plptr == clptr)
+     TextProcessingData(theEnv)->headings = clptr->next;
+   else
+     plptr->next = clptr->next;
+   rm(theEnv,clptr,sizeof(struct lists));
+   return true;
+  }
+
+/******************************************************************************/
+/*FUNCTION GET_ENTRIES :                                                      */
+/* Input : 1) name of file to be accessed for lookup of entry                 */
+/*         2) caller allocated buffer for main topic name                     */
+/*         3) name of the entry to be accessed in the file                    */
+/*         4) caller allocated buffer for a status code (see LOOKUP).         */
+/* Output : 1) returns a pointer into the stream of the lookup file which     */
+/*             indicates the starting position of the lookup information      */
+/*             (NULL if the topic was not found)                              */
+/* This function passes its input directly to LOOKUP.  See its description    */
+/* for further detail.                                                        */
+/*                                                                            */
+/******************************************************************************/
+static FILE *GetEntries(
+  Environment *theEnv,
+  const char *file,
+  char **menu,
+  char *name,
+  int *code)
+  {
+   FILE *fp;          /*Lookup file stream*/
+   long offset;       /*Offset from beginning of file to beginning of topic*/
+
+   offset = LookupEntry(theEnv,file,menu,name,code);
+   if (offset < 0)
+     return NULL;
+   fp = GenOpen(theEnv,file,OPEN_READ_BINARY);
+   if (fp == NULL)
+     {
+      *code = NO_FILE;
+      return NULL;
+     }
+   if (fseek(fp,offset,0) < 0)
+     {
+      GenClose(theEnv,fp);
+      *code = NO_FILE;
+      return NULL;
+     }
+   return(fp);
+  }
+
+/******************************************************************************/
+/*FUNCTION GET_CURR_MENU :                                                    */
+/* Input : 1) name of file to be accessed                                     */
+/*         2) caller allocated buffer for the current menu name               */
+/*         3) caller allocated buffer for status code : NO_FILE, NO_TOPIC, or */
+/*            NORMAL.                                                         */
+/* Output : 1) returns a pointer into the file stream indicating the beginning*/
+/*             of the description of the current menu for the named file      */
+/*             (returns NULL if there is no current menu)                     */
+/******************************************************************************/
+static FILE *GetCurrentMenu(
+  Environment *theEnv,
+  const char *file,
+  int *status)
+  {
+   struct lists *lptr;   /*Used in searching the file list*/
+   FILE *fp;             /*File stream*/
+   int l_flag;           /*Used in looping through the file list*/
+
+   /*=====================================*/
+   /*Find the named file in the file list */
+   /*=====================================*/
+   lptr = TextProcessingData(theEnv)->headings;
+   if (lptr != NULL)
+     if (strcmp(lptr->file,file) != 0)
+       l_flag = 1;
+     else
+       l_flag = 0;
+   else
+     l_flag = 0;
+   while (l_flag > 0)
+     {
+      lptr = lptr->next;
+      if (lptr != NULL)
+        if (strcmp(lptr->file,file) != 0)
+          l_flag = 1;
+        else
+          l_flag = 0;
+      else
+        l_flag = 0;
+     }
+   if (lptr == NULL)
+     {
+      *status = NO_FILE;
+      return NULL;
+     }
+
+   /*============================================================*/
+   /*Position the pointer in the file stream to the current menu */
+   /*============================================================*/
+   if (lptr->curr_menu == NULL)
+     {
+      *status = NO_TOPIC;
+      return NULL;
+     }
+   if ((fp = GenOpen(theEnv,file,OPEN_READ_BINARY)) == NULL)
+     {
+      *status = NO_FILE;
+      return NULL;
+     }
+   if (fseek(fp,lptr->curr_menu->offset,0) < 0)
+     {
+      GenClose(theEnv,fp);
+      *status = NO_FILE;
+      return NULL;
+     }
+   *status = NORMAL;
+   return(fp);
+  }
+
+/******************************************************************************/
+/*FUNCTION GrabString :                                                       */
+/* Input : 1) file stream pointer                                             */
+/*         2) caller allocated buffer for storage of read string              */
+/*         3) size of caller's buffer                                         */
+/* Output : This function grabs a line of text from the currently opened      */
+/*          lookup file at the given file position in the stream.  If it      */
+/*          encounters EOF or the closing topic delimeter, it closes the file */
+/*          and returns NULL.  Otherwise, the return value is simply the      */
+/*          address of the caller's buffer.                                   */
+/*                                                                            */
+/* Notes : 1) This function expects a file pointer into a stream of a file    */
+/*            already opened!!                                                */
+/*         2) The caller must close the file himself if he wishes to          */
+/*            prematurely abort the complete reading of an entry.             */
+/******************************************************************************/
+static char *GrabString(
+  Environment *theEnv,
+  FILE *fp,
+  char *buf,
+  int bufsize)
+  {
+   if (fgets(buf,bufsize,fp) == NULL)
+     {
+      GenClose(theEnv,fp);
+      return NULL;
+     }
+   if ((buf[0] == LIT_DELIM) && (buf[1] == LIT_DELIM))
+     {
+      buf[0] = BLANK;
+      buf[1] = BLANK;
+     }
+   else if (findstr(buf,EDELIM) >= 0)
+     {
+      buf = NULL;
+      GenClose(theEnv,fp);
+     }
+   return(buf);
+  }
+
+/**************************************************************************/
+/*FINDSTR FUNCTION :                                                      */
+/* Input : 1) string to be searched                                       */
+/*         2) string to be found                                          */
+/* Output : 1) returns index of string-1 where string-2 started, if found */
+/*          2) returns -1, if not found                                   */
+/**************************************************************************/
+static int findstr(
+  const char *s,
+  const char *t)
+  {
+   int i,j,k;
+
+   for (i = 0; s[i] != '\0'; i++)
+     {
+      for (j = i, k = 0; t[k] != '\0' && s[j] == t[k]; j++, k++) ;
+      if ((t[k] == '\0') && (k != 0))
+        return(i);
+     }
+   return(-1);
+  }
+
+/**********************************************************************/
+/*UPPER FUNCTION :                                                    */
+/* Input : 1) alphanumeric string                                     */
+/* Output : 1) all alphabetic characters of string are capitalized    */
+/**********************************************************************/
+static void upper(
+  char *str)
+  {
+   int theIndex;
+
+   for (theIndex = 0 ; str[theIndex] != NULLCHAR; theIndex++)
+     if (islower(str[theIndex])) str[theIndex] = (char) toupper(str[theIndex]);
+  }
+
+/******************************************************************************/
+/*FILE_NODE FUNCTION :                                                        */
+/* Input : 1) name of a file                                                  */
+/* Output : 1) returns address of an initalized NewFetchFile, if the file was    */
+/*             not already on the lookup table                                */
+/*          2) returns the null address, if the file was already present      */
+/******************************************************************************/
+static struct lists *NewFetchFile(
+  Environment *theEnv,
+  const char *file)
+  {
+   struct lists *lptr = NULL, *lnode;
+
+   if (TextProcessingData(theEnv)->headings != NULL)
+     {
+      lptr = TextProcessingData(theEnv)->headings;
+      while (lptr->next != NULL)
+        {
+         if (strcmp(lptr->file,file) == 0)
+           return NULL;
+         lptr = lptr->next;
+        }
+      if (strcmp(lptr->file,file) == 0)
+        return NULL;
+     }
+   lnode = (struct lists *) gm2(theEnv,sizeof(struct lists));
+   genstrcpy(lnode->file,file);
+   lnode->topics = NULL;
+   lnode->curr_menu = NULL;
+   lnode->next = NULL;
+   if (TextProcessingData(theEnv)->headings == NULL)
+     TextProcessingData(theEnv)->headings = lnode;
+   else
+     lptr->next = lnode;
+   return(lnode);
+  }
+
+/******************************************************************************/
+/*ENTRIES_NODE FUNCTION :                                                     */
+/* Input : 1) file pointer                                                    */
+/*         2) file name                                                       */
+/*         3) input string from the file                                      */
+/*         4) buffer for error messages                                       */
+/*         5) size of the error message buffer                                */
+/*         6) line count in the file                                          */
+/* Output :                                                                   */
+/*This function scans the input string for the appropriate topic entry        */
+/*delimeter and, if it finds this to be correct, allocates a new entry node,  */
+/*and initializes it, and returns the address to the calling routine.  If an  */
+/*error is detected, the function writes an appropriate message to the        */
+/*caller's buffer, deallocates the node, deletes all previous nodes from the  */
+/*current file from the lookup table, closes the file, and returns the null   */
+/*address.                                                                    */
+/******************************************************************************/
+static struct entries *AllocateEntryNode(
+  Environment *theEnv,
+  FILE *fp,
+  const char *file,
+  const char *str,
+  int line_ct)
+  {
+   struct entries *enode;
+   char bmarker[BDLEN+1],  /*Entry topic delimiting strings         */
+        t_code[2];         /*Type of entry flag : menu or info      */
+
+
+   /*================================================================*/
+   /*Allocate a new node and scan the delimeter string for tree info */
+   /*================================================================*/
+
+   enode = (struct entries *) gm2(theEnv,sizeof(struct entries));
+   if (sscanf(str,BFORMAT,
+              &enode->level,t_code,bmarker,enode->name) != 4)
+     {
+      rm(theEnv,enode,sizeof(struct entries));
+      GenClose(theEnv,fp);
+      TextLookupToss(theEnv,file);
+
+      PrintErrorID(theEnv,"TEXTPRO",5,false);
+      WriteString(theEnv,STDERR,"Line ");
+      WriteInteger(theEnv,STDERR,line_ct);
+      WriteString(theEnv,STDERR," : Invalid delimeter string.\n");
+
+      return NULL;
+     }
+   if (t_code[0] == 'M')
+     enode->type = MENU;
+   else if (t_code[0] == 'I')
+     enode->type = INFO;
+   else
+     {
+      rm(theEnv,enode,sizeof(struct entries));
+      GenClose(theEnv,fp);
+      TextLookupToss(theEnv,file);
+
+      PrintErrorID(theEnv,"TEXTPRO",6,false);
+      WriteString(theEnv,STDERR,"Line ");
+      WriteInteger(theEnv,STDERR,line_ct);
+      WriteString(theEnv,STDERR," : Invalid entry type.\n");
+
+      return NULL;
+     }
+   if (strcmp(bmarker,BDELIM) != 0)
+     {
+      rm(theEnv,enode,sizeof(struct entries));
+      GenClose(theEnv,fp);
+      TextLookupToss(theEnv,file);
+
+      PrintErrorID(theEnv,"TEXTPRO",5,false);
+      WriteString(theEnv,STDERR,"Line ");
+      WriteInteger(theEnv,STDERR,line_ct);
+      WriteString(theEnv,STDERR," : Invalid delimeter string.\n");
+
+      return NULL;
+     }
+
+   /*===============================================================*/
+   /* For systems which have record file systems (such as VMS),     */
+   /* the following statement is necessary to move the file pointer */
+   /* to the beginning of the next record.                          */
+   /*===============================================================*/
+
+   ungetc(getc(fp),fp);
+
+   enode->offset = ftell(fp);
+   enode->parent = NULL;
+   enode->child  = NULL;
+   enode->next = NULL;
+   upper(enode->name);
+
+   return(enode);
+  }
+
+/******************************************************************************/
+/*FUNCTION ATTACH_LEAF :                                                      */
+/* Input : 1) address of current NewFetchFile                                 */
+/*         2) address of current topic entry-node                             */
+/*         3) file pointer                                                    */
+/*         4) name of file                                                    */
+/*         5) error message buffer                                            */
+/*         6) size of error message buffer                                    */
+/*         7) line count in the file                                          */
+/* Output :                                                                   */
+/*This function attaches the entry-node to its proper place in the tree of the*/
+/*current file.  The function returns a boolean flag indicating the success   */
+/*(or lack thereof) of this connection.  In the case of an error, an error    */
+/*message is written to the caller's buffer, the file is closed, and the      */
+/*previous file entries are deleted from the lookup table.                    */
+/******************************************************************************/
+static bool AttachLeaf(
+  Environment *theEnv,
+  struct lists *lnode,
+  struct entries *enode,
+  FILE *fp,
+  const char *file,
+  int line_ct)
+  {
+   int p_flag;   /*Used in searching the tree for a parent*/
+
+
+   /*====================*/
+   /*First topic for file*/
+   /*====================*/
+   if (lnode->topics == NULL)
+     lnode->topics = enode;
+
+   /*================================*/
+   /*Subtopic - branch down the tree */
+   /*================================*/
+   else if (enode->level > TextProcessingData(theEnv)->parent->level)
+     if (TextProcessingData(theEnv)->parent->type == MENU)
+       {
+        enode->parent = TextProcessingData(theEnv)->parent;
+        TextProcessingData(theEnv)->parent->child = enode;
+       }
+     else
+       {
+        rm(theEnv,enode,sizeof(struct entries));
+        GenClose(theEnv,fp);
+        TextLookupToss(theEnv,file);
+
+        PrintErrorID(theEnv,"TEXTPRO",7,false);
+        WriteString(theEnv,STDERR,"Line ");
+        WriteInteger(theEnv,STDERR,line_ct);
+        WriteString(theEnv,STDERR," : Non-menu entries cannot have subtopics.\n");
+
+        return false;
+       }
+   /*====================================*/
+   /*Brother-topic -- same level in tree */
+   /*====================================*/
+   else if (enode->level == TextProcessingData(theEnv)->parent->level)
+     {
+      enode->parent = TextProcessingData(theEnv)->parent->parent;
+      enode->next = TextProcessingData(theEnv)->parent->next;
+      TextProcessingData(theEnv)->parent->next = enode;
+     }
+
+   /*==========================================================*/
+   /*Topic is unrelated to previous topic - branch up the tree */
+   /*==========================================================*/
+   else
+     {
+      if (TextProcessingData(theEnv)->parent != NULL)
+        p_flag = 1;
+      else
+        p_flag = 0;
+      while (p_flag > 0)
+        {
+         TextProcessingData(theEnv)->parent = TextProcessingData(theEnv)->parent->parent;
+         if (TextProcessingData(theEnv)->parent != NULL)
+           if (enode->level < TextProcessingData(theEnv)->parent->level)
+             p_flag = 1;
+           else
+             p_flag = 0;
+         else
+           p_flag = 0;
+        }
+      if (TextProcessingData(theEnv)->parent != NULL)
+
+        /*========*/
+        /*Subtopic*/
+        /*========*/
+        if (TextProcessingData(theEnv)->parent->level < enode->level)
+          {
+           enode->parent = TextProcessingData(theEnv)->parent;
+           enode->next = TextProcessingData(theEnv)->parent->child;
+           TextProcessingData(theEnv)->parent->child = enode;
+          }
+
+        /*=============*/
+        /*Brother-topic*/
+        /*=============*/
+        else
+          {
+           enode->parent = TextProcessingData(theEnv)->parent->parent;
+           enode->next = TextProcessingData(theEnv)->parent->next;
+           TextProcessingData(theEnv)->parent->next = enode;
+          }
+
+      /*=========*/
+      /*Root Node*/
+      /*=========*/
+      else
+        {
+         enode->parent = NULL;
+         enode->next = lnode->topics;
+         lnode->topics = enode;
+        }
+     }
+   TextProcessingData(theEnv)->parent = enode;
+   return true;
+  }
+
+/******************************************************************************/
+/*FUNCTION LOOKUP :                                                           */
+/* Input : 1) name of entry-topic file to be used for reference               */
+/*         2) caller allocated buffer to contain the main topic name          */
+/*         3) name of the entry-topic to be found                             */
+/*         4) caller allocated buffer to store the return status              */
+/* Output : 1) offset from the beginning of the entry-topic file stream to the*/
+/*             beginning of the requested topic (-1 if the topic not found)   */
+/*          2) status code stored in caller's buffer indicating the result of */
+/*             the lookup : NO_FILE, NO_TOPIC, BRANCH_UP, BRANCH_DOWN, EXIT,  */
+/*             or NORMAL.                                                     */
+/*                                                                            */
+/* Notes : 1) If NULL is given as an entry-topic, the lookup routine branches */
+/*            up one level in the tree (status BRANCH_UP).  If the current    */
+/*            level of the tree is already the root, all paths are set to NULL*/
+/*            (status EXIT).                                                  */
+/*         2) If an entry-topic is not found, the file position of the current*/
+/*            main topic (or menu) is returned (status NO_TOPIC).             */
+/******************************************************************************/
+static long LookupEntry(
+  Environment *theEnv,
+  const char *file,
+  char **menu,
+  char *name,
+  int *code)
+  {
+   struct lists *lptr;    /*Local pointers used to move through the tree*/
+   struct entries *eptr;
+   int l_flag, e_flag;    /*Flags used in looping to find entry-topics*/
+
+   /*===============================*/
+   /*Find named file in lookup list */
+   /*===============================*/
+   lptr = TextProcessingData(theEnv)->headings;
+   if (lptr != NULL)
+     if (strcmp(lptr->file,file) != 0)
+       l_flag = 1;
+     else
+       l_flag = 0;
+   else
+     l_flag = 0;
+   while (l_flag > 0)
+     {
+      lptr = lptr->next;
+      if (lptr != NULL)
+        if (strcmp(lptr->file,file) != 0)
+          l_flag = 1;
+        else
+          l_flag = 0;
+      else
+        l_flag = 0;
+     }
+   if (lptr == NULL)
+     {
+      *code = NO_FILE;
+      return(-1);
+     }
+
+   /*==================================================================*/
+   /*If entry-topic was NULL, branch up one-level in the tree, or exit */
+   /*the tree if already at the root.                                  */
+   /*==================================================================*/
+   if (name == NULL)
+     {
+      if (lptr->curr_menu == NULL)
+        {
+         *code = EXIT;
+         return(-1);
+        }
+      else
+        {
+         if (lptr->curr_menu->parent == NULL)
+           {
+            *code = EXIT;
+            lptr->curr_menu = NULL;
+            *menu = NULL;
+            return(-1);
+           }
+         lptr->curr_menu = lptr->curr_menu->parent;
+         *code = BRANCH_UP;
+         *menu = lptr->curr_menu->name;
+         return(lptr->curr_menu->offset);
+        }
+     }
+
+   /*========================================*/
+   /*Find the topic in the file's topic tree */
+   /*========================================*/
+   upper(name);
+   if (lptr->curr_menu != NULL)
+     eptr = lptr->curr_menu->child;
+   else
+     eptr = lptr->topics;
+   if (eptr != NULL)
+     if (findstr(eptr->name,name) == 0)
+       e_flag = 0;
+     else
+       e_flag = 1;
+   else
+     e_flag = 0;
+   while (e_flag > 0)
+     {
+      eptr = eptr->next;
+      if (eptr != NULL)
+        if (findstr(eptr->name,name) == 0)
+          e_flag = 0;
+        else
+          e_flag = 1;
+      else
+        e_flag = 0;
+     }
+
+   /*===================================================================*/
+   /*If the topic was not found, return the position of the current menu*/
+   /*===================================================================*/
+   if (eptr == NULL)
+     {
+      *code = NO_TOPIC;
+      if (lptr->curr_menu != NULL)
+        {
+         *menu = lptr->curr_menu->name;
+         return(lptr->curr_menu->offset);
+        }
+      return(-1);
+     }
+
+   /*===============================================================*/
+   /*If the requested topic has children, branch down to its level. */
+   /*===============================================================*/
+   if (eptr->type == MENU)
+     {
+      *code = BRANCH_DOWN;
+      lptr->curr_menu = eptr;
+     }
+   else
+     *code = NORMAL;
+
+   if (lptr->curr_menu != NULL)
+      *menu = lptr->curr_menu->name;
+   return(eptr->offset);
+  }
+
+/******************************************************************************/
+/*FUNCTION TOSS :                                                             */
+/* Input : 1) entry-topic address                                             */
+/* Output : This function recursively deletes a node and all child nodes      */
+/******************************************************************************/
+static void TossFunction(
+  Environment *theEnv,
+  struct entries *eptr)
+  {
+   struct entries *prev;
+
+   while (eptr != NULL)
+     {
+      if (eptr->child != NULL)
+        TossFunction(theEnv,eptr->child);
+      prev = eptr;
+      eptr = eptr->next;
+      rm(theEnv,prev,sizeof(struct entries));
+     }
+  }
+
+
+/****************************************************************************/
+/****************************************************************************/
+/*                          TEXT PROCESSING FUNCTIONS                       */
+/*                                                                          */
+/* The functions contained in this file can be called to handle             */
+/* external file referencing and accessing.  FetchCommand() loads a file    */
+/* onto an internal run-time lookup table, TossCommand() removes the file,  */
+/* PrintRegionCommand accesses the loaded file to display a requested       */
+/* entry, and HelpFunction() provides an on-line help facility              */
+/* using the external help data file specified in the header file setup.h.  */
+/* For information on the format of the data file(s) required, see the      */
+/* internal documentation in LOOKUP.C and the external documentation.       */
+/*                                                                          */
+/* For usage of these functions, see the external documentation.            */
+/****************************************************************************/
+/****************************************************************************/
+
+#define SCREEN_LN 22   /*Typical terminal screen length -- 22 lines*/
+                       /*Used for scrolling in the help facility   */
+
+/*==========================================*/
+/*Topic node for help facility's query list */
+/*==========================================*/
+struct topics
+  {
+   char name[NAMESIZE];      /*Name of the node                 */
+   struct topics *end_list;  /*Pointer to end of query list     */
+   struct topics *next;      /*Pointer to next topic in the list*/
+  };
+
+/******************************************************************************/
+/*============================================================================*/
+/*                        FUNCTION DECLARATIONS                               */
+/*============================================================================*/
+/******************************************************************************/
+
+   static struct topics          *GetCommandLineTopics(UDFContext *);
+   static FILE                   *FindTopicInEntries(Environment *,const char *,struct topics *,char **,int *);
+
+/******************************************************************************/
+/*============================================================================*/
+/*                       EXTERNAL ACCESS FUNCTIONS                            */
+/*============================================================================*/
+/******************************************************************************/
+
+#if TEXTPRO_FUNCTIONS
+
+/***************************************************************************/
+/*FUNCTION FetchCommand : (H/L function fetch)                             */
+/* Input : Name of the file to be stored in the lookup table - passed via  */
+/*         the argument "stack" and result buffer                          */
+/* Output : This function loads a file into the internal lookup table and  */
+/*          returns a (float) boolean flag indicating failure or success.  */
+/***************************************************************************/
+void FetchCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   int load_ct;          /*Number of entries loaded */
+   UDFValue theArg;
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&theArg))
+     { return; }
+
+   load_ct = TextLookupFetch(theEnv,theArg.lexemeValue->contents);
+   if (load_ct <= 0)
+     {
+      if (load_ct == 0)
+        {
+         PrintErrorID(theEnv,"TEXTPRO",3,false);
+         WriteString(theEnv,STDERR,"No entries found.\n");
+        }
+
+      return;
+     }
+
+   returnValue->integerValue = CreateInteger(theEnv,load_ct);
+  }
+
+/******************************************************************************/
+/*FUNCTION PrintRegionCommand : (H/L function print-region)                 */
+/* Input : Via the argument "stack", logical name for the output, the name of the */
+/*         file to be accessed, and the name of the topic(s) to be looked up. */
+/* Output : This function accesses a previously loaded file and prints the    */
+/*          information of the topic entry requested to the screen.  The tree */
+/*          structure must currently be at the correct level in order for the */
+/*          topic to be accessed.  To branch down the tree, each topic in the */
+/*          path to the one desired must be named.  Multiple arguments are    */
+/*          allowed as in the help facility (see the external documentation.) */
+/*          To branch up the tree, the special topic character `^' must be    */
+/*          specified for each upwards branch.  Giving no topic name will     */
+/*          cause a single branch-up in the tree.  The `?' character given at */
+/*          the end of a path will return the current main topic menu.        */
+/*                                                                            */
+/* For usage, see the external documentation.                                 */
+/******************************************************************************/
+void PrintRegionCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   struct topics *params,    /*Lookup file and list of topic requests  */
+                 *tptr;      /*Used in deallocating the parameter list */
+   char buf[256];            /*Buffer for the topic entry strings      */
+   FILE *fp;                 /*Stream for the input file               */
+   char *menu[1];            /*Buffer for the current menu name        */
+   int status;               /*Lookup status return code               */
+   bool com_code;            /*Completion flag                         */
+
+   params = GetCommandLineTopics(context);
+   fp = FindTopicInEntries(theEnv,params->next->name,params->next->next,menu,&status);
+   if ((status != NO_FILE) && (status != NO_TOPIC) && (status != EXIT))
+     {
+      if (strcmp(params->name,"t") == 0)
+        genstrcpy(params->name,STDOUT);
+      WriteString(theEnv,params->name,"\n");
+      while (GrabString(theEnv,fp,buf,256) != NULL)
+        WriteString(theEnv,params->name,buf);
+      com_code = true;
+     }
+   else
+     {
+      /* ==================================================================
+         On NO_TOPIC results, the file is left open to point to the current
+         menu.  This used as a check by the Help System.  In the case of
+         print-region, however, we need to always make sure the file is
+         closed.
+         ================================================================== */
+      if (fp != NULL)
+        GenClose(theEnv,fp);
+      com_code = false;
+     }
+
+   /* =======================================================
+      Release any space used by the user's topic request list
+      ======================================================= */
+   while (params != NULL)
+     {
+      tptr = params;
+      params = params->next;
+      rm(theEnv,tptr,sizeof(struct topics));
+     }
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,com_code);
+  }
+
+/***********************************************/
+/* GetRegionCommand : (H/L functionget-region) */
+/***********************************************/
+void GetRegionCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   struct topics *params,    /*Lookup file and list of topic requests  */
+                 *tptr;      /*Used in deallocating the parameter list */
+   char buf[256];            /*Buffer for the topic entry strings      */
+   FILE *fp;                 /*Stream for the input file               */
+   char *menu[1];            /*Buffer for the current menu name        */
+   int status;               /*Lookup status return code               */
+   char *theString = NULL;
+   size_t oldPos = 0;
+   size_t oldMax = 0;
+   size_t sLength;
+
+   params = GetCommandLineTopics(context);
+   fp = FindTopicInEntries(theEnv,params->name,params->next,menu,&status);
+   if ((status != NO_FILE) && (status != NO_TOPIC) && (status != EXIT))
+     {
+      while (GrabString(theEnv,fp,buf,256) != NULL)
+        theString = AppendToString(theEnv,buf,theString,&oldPos,&oldMax);
+     }
+   else
+     {
+      /* ==================================================================
+         On NO_TOPIC results, the file is left open to point to the current
+         menu.  This used as a check by the Help System.  In the case of
+         print-region, however, we need to always make sure the file is
+         closed.
+         ================================================================== */
+      if (fp != NULL)
+        GenClose(theEnv,fp);
+     }
+
+   /* =======================================================
+      Release any space used by the user's topic request list
+      ======================================================= */
+   while (params != NULL)
+     {
+      tptr = params;
+      params = params->next;
+      rm(theEnv,tptr,sizeof(struct topics));
+     }
+
+   if (theString == NULL)
+     { returnValue->lexemeValue = CreateString(theEnv,""); }
+   else
+     {
+      sLength = strlen(theString);
+      if ((sLength > 0) &&
+          (((theString[sLength-1] == '\r') && (theString[sLength-2] == '\n'))
+		   ||
+           ((theString[sLength-1] == '\n') && (theString[sLength-2] == '\r'))))
+        { theString[sLength-2] = 0; }
+      returnValue->lexemeValue = CreateString(theEnv,theString);
+     }
+
+   if (theString != NULL)
+     { genfree(theEnv,theString,oldMax); }
+  }
+
+/***************************************************************************/
+/*FUNCTION TossCommand : (H/L function toss)                             */
+/* Input : Name of the file to be deleted from the lookup table (passed via*/
+/*         the argument "stack")                                           */
+/* Output : This function deletes the named file from the lookup table and */
+/*          returns a (float) boolean flag indicating failure or success.  */
+/***************************************************************************/
+void TossCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *file;   /*Name of the file */
+   UDFValue theArg;
+
+   if (! UDFFirstArgument(context,LEXEME_BITS,&theArg))
+     { return; }
+
+   file = theArg.lexemeValue->contents;
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,TextLookupToss(theEnv,file));
+  }
+
+#endif
+
+/******************************************************************************/
+/*============================================================================*/
+/*                            INTERNAL ROUTINES                               */
+/*============================================================================*/
+/******************************************************************************/
+
+/******************************************************************************/
+/*FUNCTION CMD_LINE_TOPICS :                                                  */
+/* Input : None                                                               */
+/* Output : This function builds a linked list of topics requested by the     */
+/*          user at the H/L level using the argument "stack" routines,        */
+/*          num_args() and rstring().  It returns the address of the top of   */
+/*          the list or NULL if there were no command line topics.            */
+/******************************************************************************/
+static struct topics *GetCommandLineTopics(
+  UDFContext *context)
+  {
+   struct topics *head,   /* Address of the top of the topic list */
+                 *tnode,  /* Address of new topic node            */
+                 *tptr;   /* Used to attach new node to the list  */
+   UDFValue val;        /* Unknown-type H/L data structure      */
+   Environment *theEnv = context->environment;
+
+   head = NULL;
+
+   while (UDFHasNextArgument(context))
+     {
+      tnode = (struct topics *) gm2(theEnv,sizeof(struct topics));
+
+      UDFNextArgument(context,ANY_TYPE_BITS,&val);
+
+      if ((val.header->type == SYMBOL_TYPE) || (val.header->type == STRING_TYPE))
+        genstrncpy(tnode->name,val.lexemeValue->contents,NAMESIZE-1);
+      else if (val.header->type == FLOAT_TYPE)
+        genstrncpy(tnode->name,FloatToString(theEnv,val.floatValue->contents),NAMESIZE-1);
+      else if (val.header->type == INTEGER_TYPE)
+        genstrncpy(tnode->name,LongIntegerToString(theEnv,val.integerValue->contents),NAMESIZE-1);
+      else
+        genstrncpy(tnode->name,"***ERROR***",NAMESIZE-1);
+
+      tnode->next = NULL;
+      tnode->end_list = NULL;
+      if (head == NULL)
+        head = tnode;
+      else
+        {
+         tptr = head;
+         while (tptr->next != NULL)
+           tptr = tptr->next;
+         tptr->next = tnode;
+        }
+     }
+    return(head);
+  }
+
+/******************************************************************************/
+/*FUNCTION FIND_TOPIC :                                                       */
+/* Input : 1) File to be searched for topic request                           */
+/*         2) Address of topic request list                                   */
+/*         3) Buffer for current menu name                                    */
+/*         4) Lookup status return code                                       */
+/* Output : This function flows through the user topic request path by        */
+/*          calling the lookup routines.  When it reaches the last element,   */
+/*          it returns a pointer into the stream of the lookup file           */
+/*          indicating the beginning of the topic entry.  If any topic in the */
+/*          path is not found, the function aborts and returns the address of */
+/*          of the current menu in the lookup tree for the file.  The exact   */
+/*          nature of the final lookup is indicated in the status buffer.     */
+/******************************************************************************/
+static FILE *FindTopicInEntries(
+  Environment *theEnv,
+  const char *file,
+  struct topics *main_topic,
+  char **menu,
+  int *status)
+  {
+   FILE *fp = NULL;                 /*Input file stream                    */
+   struct topics *tptr,             /*Used to loop through the topic list  */
+                 *end_list;         /*Address of the end of the topic list */
+
+   if (main_topic != NULL)
+     end_list = main_topic->end_list;
+   else
+     end_list = NULL;
+   tptr = main_topic;
+   if (tptr != end_list)
+     do
+       {
+        if (fp != NULL)
+          GenClose(theEnv,fp);
+
+        /*======================*/
+        /*Branch up in the tree */
+        /*======================*/
+        if (strcmp(tptr->name,"^") == 0)
+          fp = GetEntries(theEnv,file,menu,NULL,status);
+
+        /*=======================================================*/
+        /*Return the current main topic menu of the lookup table */
+        /*=======================================================*/
+        else if ((strcmp(tptr->name,"?") == 0) && (tptr->next == end_list))
+          fp = GetCurrentMenu(theEnv,file,status);
+
+        /*=====================*/
+        /*Lookup topic request */
+        /*=====================*/
+        else
+          fp = GetEntries(theEnv,file,menu,tptr->name,status);
+
+        if ((*status == NO_FILE) || (*status == NO_TOPIC))
+          break;
+        tptr = tptr->next;
+       } while (tptr != end_list);
+   else
+     /*==================================================================*/
+     /*An empty topic request list causes a single branch-up in the tree */
+     /*==================================================================*/
+     fp = GetEntries(theEnv,file,menu,NULL,status);
+
+   return(fp);
+  }
+
+/*******************************************/
+/* HelpFunctionDefinitions:                */
+/*******************************************/
+void HelpFunctionDefinitions(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,TEXTPRO_DATA,sizeof(struct textProcessingData),DeallocateTextProcessingData);
+#if ! RUN_TIME
+#if TEXTPRO_FUNCTIONS
+   AddUDF(theEnv,"fetch","bl",1,1,"sy",FetchCommand,"FetchCommand",NULL);
+   AddUDF(theEnv,"toss","b",1,1,"sy",TossCommand,"TossCommand",NULL);
+   AddUDF(theEnv,"print-region","b",2,UNBOUNDED,"*;y;sy",PrintRegionCommand,"PrintRegionCommand",NULL);
+   AddUDF(theEnv,"get-region","s",1,UNBOUNDED,"*;sy",GetRegionCommand,"GetRegionCommand", NULL);
+#endif
+#endif
+  }
+
+/*********************************************************/
+/* DeallocateTextProcessingData: Deallocates environment */
+/*    data for text processing routines.                 */
+/*********************************************************/
+static void DeallocateTextProcessingData(
+  Environment *theEnv)
+  {
+   struct lists *nextptr, *clptr;
+
+   clptr = TextProcessingData(theEnv)->headings;
+   while (clptr != NULL)
+     {
+      nextptr = clptr->next;
+
+      TossFunction(theEnv,clptr->topics);
+      rm(theEnv,clptr,sizeof(struct lists));
+
+      clptr = nextptr;
+     }
+  }
+
+
+#endif
+
diff --git a/clips/textpro.h b/clips/textpro.h
new file mode 100755
index 000000000..7e1a8e3ef
--- /dev/null
+++ b/clips/textpro.h
@@ -0,0 +1,77 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*             TEXT PROCESSING HEADER FILE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Modified error messages so that they were      */
+/*            directly printed rather than storing them in   */
+/*            a string buffer which might not be large       */
+/*            enough to contain the entire message. DR0855   */
+/*            Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Added get-region function.                     */
+/*                                                           */
+/*            Added environment parameter to GenClose.       */
+/*            Added environment parameter to GenOpen.        */
+/*                                                           */
+/*      6.30: Removed HELP_FUNCTIONS compilation flag and    */
+/*            associated functionality.                      */
+/*                                                           */
+/*            Used genstrcpy and genstrncpy instead of       */
+/*            strcpy and strncpy.                            */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Changed integer type/precision.                */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_TBC).         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_textpro
+
+#pragma once
+
+#define _H_textpro
+
+#if TEXTPRO_FUNCTIONS
+   void                           FetchCommand(Environment *,UDFContext *,UDFValue *);
+   void                           PrintRegionCommand(Environment *,UDFContext *,UDFValue *);
+   void                           GetRegionCommand(Environment *,UDFContext *,UDFValue *);
+   void                           TossCommand(Environment *,UDFContext *,UDFValue *);
+#endif
+
+   void                           HelpFunctionDefinitions(Environment *);
+
+#endif /* _H_textpro */
+
+
+
+
+
diff --git a/clips/tmpltbin.c b/clips/tmpltbin.c
new file mode 100755
index 000000000..a27662e6b
--- /dev/null
+++ b/clips/tmpltbin.c
@@ -0,0 +1,609 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*           DEFTEMPLATE BSAVE/BLOAD MODULE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the binary save/load feature for the  */
+/*    deftemplate construct.                                 */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for deftemplate slot facets.           */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Removed initial-fact support.                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME)
+
+#include <stdio.h>
+
+#include "bload.h"
+#include "bsave.h"
+#include "cstrnbin.h"
+#include "envrnmnt.h"
+#include "factbin.h"
+#include "factmngr.h"
+#include "memalloc.h"
+#include "tmpltdef.h"
+#include "tmpltpsr.h"
+#include "tmpltutl.h"
+
+#include "tmpltbin.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if BLOAD_AND_BSAVE
+   static void                    BsaveFind(Environment *);
+   static void                    BsaveStorage(Environment *,FILE *);
+   static void                    BsaveBinaryItem(Environment *,FILE *);
+#endif
+   static void                    BloadStorage(Environment *);
+   static void                    BloadBinaryItem(Environment *);
+   static void                    UpdateDeftemplateModule(Environment *,void *,unsigned long);
+   static void                    UpdateDeftemplate(Environment *,void *,unsigned long);
+   static void                    UpdateDeftemplateSlot(Environment *,void *,unsigned long);
+   static void                    ClearBload(Environment *);
+   static void                    DeallocateDeftemplateBloadData(Environment *);
+
+/***********************************************/
+/* DeftemplateBinarySetup: Installs the binary */
+/*   save/load feature for deftemplates.       */
+/***********************************************/
+void DeftemplateBinarySetup(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,TMPLTBIN_DATA,sizeof(struct deftemplateBinaryData),DeallocateDeftemplateBloadData);
+#if BLOAD_AND_BSAVE
+   AddBinaryItem(theEnv,"deftemplate",0,BsaveFind,NULL,
+                             BsaveStorage,BsaveBinaryItem,
+                             BloadStorage,BloadBinaryItem,
+                             ClearBload);
+#endif
+#if (BLOAD || BLOAD_ONLY)
+   AddBinaryItem(theEnv,"deftemplate",0,NULL,NULL,NULL,NULL,
+                             BloadStorage,BloadBinaryItem,
+                             ClearBload);
+#endif
+  }
+
+/***********************************************************/
+/* DeallocateDeftemplateBloadData: Deallocates environment */
+/*    data for the deftemplate bsave functionality.        */
+/***********************************************************/
+static void DeallocateDeftemplateBloadData(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   space =  DeftemplateBinaryData(theEnv)->NumberOfTemplateModules * sizeof(struct deftemplateModule);
+   if (space != 0) genfree(theEnv,DeftemplateBinaryData(theEnv)->ModuleArray,space);
+
+   space = DeftemplateBinaryData(theEnv)->NumberOfDeftemplates * sizeof(Deftemplate);
+   if (space != 0) genfree(theEnv,DeftemplateBinaryData(theEnv)->DeftemplateArray,space);
+
+   space =  DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots * sizeof(struct templateSlot);
+   if (space != 0) genfree(theEnv,DeftemplateBinaryData(theEnv)->SlotArray,space);
+  }
+
+#if BLOAD_AND_BSAVE
+
+/**************************************************************/
+/* BsaveFind: Counts the number of data structures which must */
+/*   be saved in the binary image for the deftemplates in the */
+/*   current environment.                                     */
+/**************************************************************/
+static void BsaveFind(
+  Environment *theEnv)
+  {
+   Deftemplate *theDeftemplate;
+   struct templateSlot *theSlot;
+   Defmodule *theModule;
+
+   /*=======================================================*/
+   /* If a binary image is already loaded, then temporarily */
+   /* save the count values since these will be overwritten */
+   /* in the process of saving the binary image.            */
+   /*=======================================================*/
+
+   SaveBloadCount(theEnv,DeftemplateBinaryData(theEnv)->NumberOfDeftemplates);
+   SaveBloadCount(theEnv,DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots);
+   SaveBloadCount(theEnv,DeftemplateBinaryData(theEnv)->NumberOfTemplateModules);
+
+   /*==================================================*/
+   /* Set the count of deftemplates, deftemplate slots */
+   /* and deftemplate module data structures to zero.  */
+   /*==================================================*/
+
+   DeftemplateBinaryData(theEnv)->NumberOfDeftemplates = 0;
+   DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots = 0;
+   DeftemplateBinaryData(theEnv)->NumberOfTemplateModules = 0;
+
+   /*===========================*/
+   /* Loop through each module. */
+   /*===========================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*============================================*/
+      /* Set the current module to the module being */
+      /* examined and increment the number of       */
+      /* deftemplate modules encountered.           */
+      /*============================================*/
+
+      SetCurrentModule(theEnv,theModule);
+      DeftemplateBinaryData(theEnv)->NumberOfTemplateModules++;
+
+      /*======================================================*/
+      /* Loop through each deftemplate in the current module. */
+      /*======================================================*/
+
+      for (theDeftemplate = GetNextDeftemplate(theEnv,NULL);
+           theDeftemplate != NULL;
+           theDeftemplate = GetNextDeftemplate(theEnv,theDeftemplate))
+        {
+         /*======================================================*/
+         /* Initialize the construct header for the binary save. */
+         /*======================================================*/
+
+         MarkConstructHeaderNeededItems(&theDeftemplate->header,
+                                        DeftemplateBinaryData(theEnv)->NumberOfDeftemplates++);
+
+         /*=============================================================*/
+         /* Loop through each slot in the deftemplate, incrementing the */
+         /* slot count and marking the slot names as needed symbols.    */
+         /*=============================================================*/
+
+         for (theSlot = theDeftemplate->slotList;
+              theSlot != NULL;
+              theSlot = theSlot->next)
+           {
+            DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots++;
+            theSlot->slotName->neededSymbol = true;
+           }
+        }
+
+     }
+  }
+
+/*********************************************************/
+/* BsaveStorage: Writes out the storage requirements for */
+/*    all deftemplate structures to the binary file.     */
+/*********************************************************/
+static void BsaveStorage(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+
+   /*========================================================================*/
+   /* Three data structures are saved as part of a deftemplate binary image: */
+   /* the deftemplate data structure, the deftemplateModule data structure,  */
+   /* and the templateSlot data structure. The data structures associated    */
+   /* with default values and constraints are not save with the deftemplate  */
+   /* portion of the binary image.                                           */
+   /*========================================================================*/
+
+   space = sizeof(long) * 3;
+   GenWrite(&space,sizeof(size_t),fp);
+   GenWrite(&DeftemplateBinaryData(theEnv)->NumberOfDeftemplates,sizeof(long),fp);
+   GenWrite(&DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots,sizeof(long),fp);
+   GenWrite(&DeftemplateBinaryData(theEnv)->NumberOfTemplateModules,sizeof(long),fp);
+  }
+
+/***********************************************/
+/* BsaveBinaryItem: Writes out all deftemplate */
+/*   structures to the binary file.            */
+/***********************************************/
+static void BsaveBinaryItem(
+  Environment *theEnv,
+  FILE *fp)
+  {
+   size_t space;
+   Deftemplate *theDeftemplate;
+   struct bsaveDeftemplate tempDeftemplate;
+   struct templateSlot *theSlot;
+   struct bsaveTemplateSlot tempTemplateSlot;
+   struct bsaveDeftemplateModule tempTemplateModule;
+   Defmodule *theModule;
+   struct deftemplateModule *theModuleItem;
+
+   /*============================================================*/
+   /* Write out the amount of space taken up by the deftemplate, */
+   /* deftemplateModule, and templateSlot data structures in the */
+   /* binary image.                                              */
+   /*============================================================*/
+
+   space = (DeftemplateBinaryData(theEnv)->NumberOfDeftemplates * sizeof(struct bsaveDeftemplate)) +
+           (DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots * sizeof(struct bsaveTemplateSlot)) +
+           (DeftemplateBinaryData(theEnv)->NumberOfTemplateModules * sizeof(struct bsaveDeftemplateModule));
+   GenWrite(&space,sizeof(size_t),fp);
+
+   /*===================================================*/
+   /* Write out each deftemplate module data structure. */
+   /*===================================================*/
+
+   DeftemplateBinaryData(theEnv)->NumberOfDeftemplates = 0;
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      theModuleItem = (struct deftemplateModule *)
+                      GetModuleItem(theEnv,NULL,FindModuleItem(theEnv,"deftemplate")->moduleIndex);
+      AssignBsaveDefmdlItemHdrVals(&tempTemplateModule.header,
+                                           &theModuleItem->header);
+      GenWrite(&tempTemplateModule,sizeof(struct bsaveDeftemplateModule),fp);
+     }
+
+   /*============================================*/
+   /* Write out each deftemplate data structure. */
+   /*============================================*/
+
+   DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots = 0;
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      for (theDeftemplate = GetNextDeftemplate(theEnv,NULL);
+           theDeftemplate != NULL;
+           theDeftemplate = GetNextDeftemplate(theEnv,theDeftemplate))
+        {
+         AssignBsaveConstructHeaderVals(&tempDeftemplate.header,
+                                          &theDeftemplate->header);
+         tempDeftemplate.implied = theDeftemplate->implied;
+         tempDeftemplate.numberOfSlots = theDeftemplate->numberOfSlots;
+         tempDeftemplate.patternNetwork = BsaveFactPatternIndex(theDeftemplate->patternNetwork);
+
+         if (theDeftemplate->slotList != NULL)
+           { tempDeftemplate.slotList = DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots; }
+         else
+           { tempDeftemplate.slotList = ULONG_MAX; }
+
+         GenWrite(&tempDeftemplate,sizeof(struct bsaveDeftemplate),fp);
+
+         DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots += theDeftemplate->numberOfSlots;
+        }
+     }
+
+   /*=============================================*/
+   /* Write out each templateSlot data structure. */
+   /*=============================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      for (theDeftemplate = GetNextDeftemplate(theEnv,NULL);
+           theDeftemplate != NULL;
+           theDeftemplate = GetNextDeftemplate(theEnv,theDeftemplate))
+        {
+         for (theSlot = theDeftemplate->slotList;
+              theSlot != NULL;
+              theSlot = theSlot->next)
+           {
+            tempTemplateSlot.constraints = ConstraintIndex(theSlot->constraints);
+            tempTemplateSlot.slotName = theSlot->slotName->bucket;
+            tempTemplateSlot.multislot = theSlot->multislot;
+            tempTemplateSlot.noDefault = theSlot->noDefault;
+            tempTemplateSlot.defaultPresent = theSlot->defaultPresent;
+            tempTemplateSlot.defaultDynamic = theSlot->defaultDynamic;
+            tempTemplateSlot.defaultList = HashedExpressionIndex(theEnv,theSlot->defaultList);
+            tempTemplateSlot.facetList = HashedExpressionIndex(theEnv,theSlot->facetList);
+
+            if (theSlot->next != NULL) tempTemplateSlot.next = 0L;
+            else tempTemplateSlot.next = ULONG_MAX;
+
+            GenWrite(&tempTemplateSlot,sizeof(struct bsaveTemplateSlot),fp);
+           }
+        }
+     }
+
+   /*=============================================================*/
+   /* If a binary image was already loaded when the bsave command */
+   /* was issued, then restore the counts indicating the number   */
+   /* of deftemplates, deftemplate modules, and deftemplate slots */
+   /* in the binary image (these were overwritten by the binary   */
+   /* save).                                                      */
+   /*=============================================================*/
+
+   RestoreBloadCount(theEnv,&DeftemplateBinaryData(theEnv)->NumberOfDeftemplates);
+   RestoreBloadCount(theEnv,&DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots);
+   RestoreBloadCount(theEnv,&DeftemplateBinaryData(theEnv)->NumberOfTemplateModules);
+  }
+
+#endif /* BLOAD_AND_BSAVE */
+
+/****************************************************/
+/* BloadStorage: Allocates storage requirements for */
+/*   the deftemplates used by this binary image.    */
+/****************************************************/
+static void BloadStorage(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*=========================================================*/
+   /* Determine the number of deftemplate, deftemplateModule, */
+   /* and templateSlot data structures to be read.            */
+   /*=========================================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+   GenReadBinary(theEnv,&DeftemplateBinaryData(theEnv)->NumberOfDeftemplates,sizeof(long));
+   GenReadBinary(theEnv,&DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots,sizeof(long));
+   GenReadBinary(theEnv,&DeftemplateBinaryData(theEnv)->NumberOfTemplateModules,sizeof(long));
+
+   /*====================================*/
+   /* Allocate the space needed for the  */
+   /* deftemplateModule data structures. */
+   /*====================================*/
+
+   if (DeftemplateBinaryData(theEnv)->NumberOfTemplateModules == 0)
+     {
+      DeftemplateBinaryData(theEnv)->DeftemplateArray = NULL;
+      DeftemplateBinaryData(theEnv)->SlotArray = NULL;
+      DeftemplateBinaryData(theEnv)->ModuleArray = NULL;
+      return;
+     }
+
+   space = DeftemplateBinaryData(theEnv)->NumberOfTemplateModules * sizeof(struct deftemplateModule);
+   DeftemplateBinaryData(theEnv)->ModuleArray = (struct deftemplateModule *) genalloc(theEnv,space);
+
+   /*===================================*/
+   /* Allocate the space needed for the */
+   /* deftemplate data structures.      */
+   /*===================================*/
+
+   if (DeftemplateBinaryData(theEnv)->NumberOfDeftemplates == 0)
+     {
+      DeftemplateBinaryData(theEnv)->DeftemplateArray = NULL;
+      DeftemplateBinaryData(theEnv)->SlotArray = NULL;
+      return;
+     }
+
+   space = DeftemplateBinaryData(theEnv)->NumberOfDeftemplates * sizeof(Deftemplate);
+   DeftemplateBinaryData(theEnv)->DeftemplateArray = (Deftemplate *) genalloc(theEnv,space);
+
+   /*===================================*/
+   /* Allocate the space needed for the */
+   /* templateSlot data structures.     */
+   /*===================================*/
+
+   if (DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots == 0)
+     {
+      DeftemplateBinaryData(theEnv)->SlotArray = NULL;
+      return;
+     }
+
+   space =  DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots * sizeof(struct templateSlot);
+   DeftemplateBinaryData(theEnv)->SlotArray = (struct templateSlot *) genalloc(theEnv,space);
+  }
+
+/********************************************************/
+/* BloadBinaryItem: Loads and refreshes the deftemplate */
+/*   constructs used by this binary image.              */
+/********************************************************/
+static void BloadBinaryItem(
+  Environment *theEnv)
+  {
+   size_t space;
+
+   /*======================================================*/
+   /* Read in the amount of space used by the binary image */
+   /* (this is used to skip the construct in the event it  */
+   /* is not available in the version being run).          */
+   /*======================================================*/
+
+   GenReadBinary(theEnv,&space,sizeof(size_t));
+
+   /*===============================================*/
+   /* Read in the deftemplateModule data structures */
+   /* and refresh the pointers.                     */
+   /*===============================================*/
+
+   BloadandRefresh(theEnv,DeftemplateBinaryData(theEnv)->NumberOfTemplateModules,sizeof(struct bsaveDeftemplateModule),
+                   UpdateDeftemplateModule);
+
+   /*===============================================*/
+   /* Read in the deftemplateModule data structures */
+   /* and refresh the pointers.                     */
+   /*===============================================*/
+
+   BloadandRefresh(theEnv,DeftemplateBinaryData(theEnv)->NumberOfDeftemplates,sizeof(struct bsaveDeftemplate),
+                   UpdateDeftemplate);
+
+   /*==========================================*/
+   /* Read in the templateSlot data structures */
+   /* and refresh the pointers.                */
+   /*==========================================*/
+
+   BloadandRefresh(theEnv,DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots,sizeof(struct bsaveTemplateSlot),
+                   UpdateDeftemplateSlot);
+  }
+
+/**************************************************/
+/* UpdateDeftemplateModule: Bload refresh routine */
+/*   for deftemplateModule data structures.       */
+/**************************************************/
+static void UpdateDeftemplateModule(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct bsaveDeftemplateModule *bdmPtr;
+
+   bdmPtr = (struct bsaveDeftemplateModule *) buf;
+   UpdateDefmoduleItemHeader(theEnv,&bdmPtr->header,&DeftemplateBinaryData(theEnv)->ModuleArray[obji].header,
+                             sizeof(Deftemplate),
+                             (void *) DeftemplateBinaryData(theEnv)->DeftemplateArray);
+  }
+
+/********************************************/
+/* UpdateDeftemplate: Bload refresh routine */
+/*   for deftemplate data structures.       */
+/********************************************/
+static void UpdateDeftemplate(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   Deftemplate *theDeftemplate;
+   struct bsaveDeftemplate *bdtPtr;
+
+   bdtPtr = (struct bsaveDeftemplate *) buf;
+   theDeftemplate = &DeftemplateBinaryData(theEnv)->DeftemplateArray[obji];
+
+   UpdateConstructHeader(theEnv,&bdtPtr->header,&theDeftemplate->header,DEFTEMPLATE,
+                         sizeof(struct deftemplateModule),DeftemplateBinaryData(theEnv)->ModuleArray,
+                         sizeof(Deftemplate),DeftemplateBinaryData(theEnv)->DeftemplateArray);
+
+   if (bdtPtr->slotList != ULONG_MAX)
+     { theDeftemplate->slotList = (struct templateSlot *) &DeftemplateBinaryData(theEnv)->SlotArray[bdtPtr->slotList]; }
+   else
+     { theDeftemplate->slotList = NULL; }
+
+   if (bdtPtr->patternNetwork != ULONG_MAX)
+     { theDeftemplate->patternNetwork = (struct factPatternNode *) BloadFactPatternPointer(bdtPtr->patternNetwork); }
+   else
+     { theDeftemplate->patternNetwork = NULL; }
+
+   theDeftemplate->implied = bdtPtr->implied;
+#if DEBUGGING_FUNCTIONS
+   theDeftemplate->watch = FactData(theEnv)->WatchFacts;
+#endif
+   theDeftemplate->inScope = false;
+   theDeftemplate->numberOfSlots = bdtPtr->numberOfSlots;
+   theDeftemplate->factList = NULL;
+   theDeftemplate->lastFact = NULL;
+  }
+
+/************************************************/
+/* UpdateDeftemplateSlot: Bload refresh routine */
+/*   for templateSlot data structures.          */
+/************************************************/
+static void UpdateDeftemplateSlot(
+  Environment *theEnv,
+  void *buf,
+  unsigned long obji)
+  {
+   struct templateSlot *theSlot;
+   struct bsaveTemplateSlot *btsPtr;
+
+   btsPtr = (struct bsaveTemplateSlot *) buf;
+   theSlot = (struct templateSlot *) &DeftemplateBinaryData(theEnv)->SlotArray[obji];
+
+   theSlot->slotName = SymbolPointer(btsPtr->slotName);
+   IncrementLexemeCount(theSlot->slotName);
+   theSlot->defaultList = HashedExpressionPointer(btsPtr->defaultList);
+   theSlot->facetList = HashedExpressionPointer(btsPtr->facetList);
+   theSlot->constraints = ConstraintPointer(btsPtr->constraints);
+
+   theSlot->multislot = btsPtr->multislot;
+   theSlot->noDefault = btsPtr->noDefault;
+   theSlot->defaultPresent = btsPtr->defaultPresent;
+   theSlot->defaultDynamic = btsPtr->defaultDynamic;
+
+   if (btsPtr->next != ULONG_MAX)
+     { theSlot->next = (struct templateSlot *) &DeftemplateBinaryData(theEnv)->SlotArray[obji + 1]; }
+   else
+     { theSlot->next = NULL; }
+  }
+
+/*****************************************/
+/* ClearBload: Deftemplate clear routine */
+/*   when a binary load is in effect.    */
+/*****************************************/
+static void ClearBload(
+  Environment *theEnv)
+  {
+   size_t space;
+   unsigned long i;
+
+   /*=============================================*/
+   /* Decrement in use counters for atomic values */
+   /* contained in the construct headers.         */
+   /*=============================================*/
+
+   for (i = 0; i < DeftemplateBinaryData(theEnv)->NumberOfDeftemplates; i++)
+     { UnmarkConstructHeader(theEnv,&DeftemplateBinaryData(theEnv)->DeftemplateArray[i].header); }
+
+   /*=======================================*/
+   /* Decrement in use counters for symbols */
+   /* used as slot names.                   */
+   /*=======================================*/
+
+   for (i = 0; i < DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots; i++)
+     { ReleaseLexeme(theEnv,DeftemplateBinaryData(theEnv)->SlotArray[i].slotName); }
+
+   /*======================================================================*/
+   /* Deallocate the space used for the deftemplateModule data structures. */
+   /*======================================================================*/
+
+   space =  DeftemplateBinaryData(theEnv)->NumberOfTemplateModules * sizeof(struct deftemplateModule);
+   if (space != 0) genfree(theEnv,DeftemplateBinaryData(theEnv)->ModuleArray,space);
+   DeftemplateBinaryData(theEnv)->NumberOfTemplateModules = 0;
+
+   /*================================================================*/
+   /* Deallocate the space used for the deftemplate data structures. */
+   /*================================================================*/
+
+   space = DeftemplateBinaryData(theEnv)->NumberOfDeftemplates * sizeof(Deftemplate);
+   if (space != 0) genfree(theEnv,DeftemplateBinaryData(theEnv)->DeftemplateArray,space);
+   DeftemplateBinaryData(theEnv)->NumberOfDeftemplates = 0;
+
+   /*=================================================================*/
+   /* Deallocate the space used for the templateSlot data structures. */
+   /*=================================================================*/
+
+   space =  DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots * sizeof(struct templateSlot);
+   if (space != 0) genfree(theEnv,DeftemplateBinaryData(theEnv)->SlotArray,space);
+   DeftemplateBinaryData(theEnv)->NumberOfTemplateSlots = 0;
+  }
+
+/************************************************************/
+/* BloadDeftemplateModuleReference: Returns the deftemplate */
+/*   module pointer for use with the bload function.        */
+/************************************************************/
+void *BloadDeftemplateModuleReference(
+  Environment *theEnv,
+  unsigned long theIndex)
+  {
+   return ((void *) &DeftemplateBinaryData(theEnv)->ModuleArray[theIndex]);
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT && (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE) && (! RUN_TIME) */
+
+
diff --git a/clips/tmpltbin.h b/clips/tmpltbin.h
new file mode 100755
index 000000000..ebfb3183e
--- /dev/null
+++ b/clips/tmpltbin.h
@@ -0,0 +1,108 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*         DEFTEMPLATE BSAVE/BLOAD HEADER FILE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Support for deftemplate slot facets.           */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_tmpltbin
+
+#pragma once
+
+#define _H_tmpltbin
+
+#if (! RUN_TIME)
+
+struct bsaveTemplateSlot
+  {
+   unsigned long slotName;
+   unsigned int multislot : 1;
+   unsigned int noDefault : 1;
+   unsigned int defaultPresent : 1;
+   unsigned int defaultDynamic : 1;
+   unsigned long constraints;
+   unsigned long defaultList;
+   unsigned long facetList;
+   unsigned long next;
+  };
+
+struct bsaveDeftemplate;
+struct bsaveDeftemplateModule;
+
+#include "cstrcbin.h"
+
+struct bsaveDeftemplate
+  {
+   struct bsaveConstructHeader header;
+   unsigned long slotList;
+   unsigned int implied : 1;
+   unsigned int numberOfSlots : 15;
+   unsigned long patternNetwork;
+  };
+
+#include "modulbin.h"
+
+struct bsaveDeftemplateModule
+  {
+   struct bsaveDefmoduleItemHeader header;
+  };
+
+#define TMPLTBIN_DATA 61
+
+#include "tmpltdef.h"
+
+struct deftemplateBinaryData
+  {
+   Deftemplate *DeftemplateArray;
+   unsigned long NumberOfDeftemplates;
+   unsigned long NumberOfTemplateSlots;
+   unsigned long NumberOfTemplateModules;
+   struct templateSlot *SlotArray;
+   struct deftemplateModule *ModuleArray;
+  };
+
+#define DeftemplateBinaryData(theEnv) ((struct deftemplateBinaryData *) GetEnvironmentData(theEnv,TMPLTBIN_DATA))
+
+#define DeftemplatePointer(i) ((Deftemplate *) (&DeftemplateBinaryData(theEnv)->DeftemplateArray[i]))
+
+#ifndef _H_tmpltdef
+#include "tmpltdef.h"
+#endif
+
+   void                           DeftemplateBinarySetup(Environment *);
+   void                          *BloadDeftemplateModuleReference(Environment *,unsigned long);
+
+#endif /* (! RUN_TIME) */
+
+#endif /* _H_tmpltbin */
+
+
+
diff --git a/clips/tmpltbsc.c b/clips/tmpltbsc.c
new file mode 100755
index 000000000..b9ba4ac0b
--- /dev/null
+++ b/clips/tmpltbsc.c
@@ -0,0 +1,327 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/02/18             */
+   /*                                                     */
+   /*          DEFTEMPLATE BASIC COMMANDS MODULE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements core commands for the deftemplate     */
+/*   construct such as clear, reset, save, undeftemplate,    */
+/*   ppdeftemplate, list-deftemplates, and                   */
+/*   get-deftemplate-list.                                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove compiler warnings     */
+/*            when ENVIRONMENT_API_ONLY flag is set.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Removed initial-fact support.                  */
+/*                                                           */
+/*            Pretty print functions accept optional logical */
+/*            name argument.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "constrct.h"
+#include "cstrccom.h"
+#include "cstrcpsr.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "factrhs.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "router.h"
+#include "scanner.h"
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "tmpltbin.h"
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "tmpltcmp.h"
+#endif
+#include "tmpltdef.h"
+#include "tmpltpsr.h"
+#include "tmpltutl.h"
+
+#include "tmpltbsc.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    SaveDeftemplates(Environment *,Defmodule *,const char *,void *);
+
+/*********************************************************************/
+/* DeftemplateBasicCommands: Initializes basic deftemplate commands. */
+/*********************************************************************/
+void DeftemplateBasicCommands(
+  Environment *theEnv)
+  {
+   AddSaveFunction(theEnv,"deftemplate",SaveDeftemplates,10,NULL);
+
+#if ! RUN_TIME
+   AddUDF(theEnv,"get-deftemplate-list","m",0,1,"y",GetDeftemplateListFunction,"GetDeftemplateListFunction",NULL);
+   AddUDF(theEnv,"undeftemplate","v",1,1,"y",UndeftemplateCommand,"UndeftemplateCommand",NULL);
+   AddUDF(theEnv,"deftemplate-module","y",1,1,"y",DeftemplateModuleFunction,"DeftemplateModuleFunction",NULL);
+
+#if DEBUGGING_FUNCTIONS
+   AddUDF(theEnv,"list-deftemplates","v",0,1,"y",ListDeftemplatesCommand,"ListDeftemplatesCommand",NULL);
+   AddUDF(theEnv,"ppdeftemplate","vs",1,2,";y;ldsyn",PPDeftemplateCommand,"PPDeftemplateCommand",NULL);
+#endif
+
+#if (BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE)
+   DeftemplateBinarySetup(theEnv);
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   DeftemplateCompilerSetup(theEnv);
+#endif
+
+#endif
+  }
+
+/**********************************************/
+/* SaveDeftemplates: Deftemplate save routine */
+/*   for use with the save command.           */
+/**********************************************/
+static void SaveDeftemplates(
+  Environment *theEnv,
+  Defmodule *theModule,
+  const char *logicalName,
+  void *context)
+  {
+   SaveConstruct(theEnv,theModule,logicalName,DeftemplateData(theEnv)->DeftemplateConstruct);
+  }
+
+/**********************************************/
+/* UndeftemplateCommand: H/L access routine   */
+/*   for the undeftemplate command.           */
+/**********************************************/
+void UndeftemplateCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UndefconstructCommand(context,"undeftemplate",DeftemplateData(theEnv)->DeftemplateConstruct);
+  }
+
+/************************************/
+/* Undeftemplate: C access routine  */
+/*   for the undeftemplate command. */
+/************************************/
+bool Undeftemplate(
+  Deftemplate *theDeftemplate,
+  Environment *allEnv)
+  {
+   Environment *theEnv;
+   
+   if (theDeftemplate == NULL)
+     {
+      theEnv = allEnv;
+      return Undefconstruct(theEnv,NULL,DeftemplateData(theEnv)->DeftemplateConstruct);
+     }
+   else
+     {
+      theEnv = theDeftemplate->header.env;
+      return Undefconstruct(theEnv,&theDeftemplate->header,DeftemplateData(theEnv)->DeftemplateConstruct);
+     }
+  }
+
+/****************************************************/
+/* GetDeftemplateListFunction: H/L access routine   */
+/*   for the get-deftemplate-list function.         */
+/****************************************************/
+void GetDeftemplateListFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   GetConstructListFunction(context,returnValue,DeftemplateData(theEnv)->DeftemplateConstruct);
+  }
+
+/********************************************/
+/* GetDeftemplateList: C access routine for */
+/*   the get-deftemplate-list function.     */
+/********************************************/
+void GetDeftemplateList(
+  Environment *theEnv,
+  CLIPSValue *returnValue,
+  Defmodule *theModule)
+  {
+   UDFValue result;
+   
+   GetConstructList(theEnv,&result,DeftemplateData(theEnv)->DeftemplateConstruct,theModule);
+   NormalizeMultifield(theEnv,&result);
+   returnValue->value = result.value;
+  }
+
+/***************************************************/
+/* DeftemplateModuleFunction: H/L access routine   */
+/*   for the deftemplate-module function.          */
+/***************************************************/
+void DeftemplateModuleFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   returnValue->value = GetConstructModuleCommand(context,"deftemplate-module",DeftemplateData(theEnv)->DeftemplateConstruct);
+  }
+
+#if DEBUGGING_FUNCTIONS
+
+/**********************************************/
+/* PPDeftemplateCommand: H/L access routine   */
+/*   for the ppdeftemplate command.           */
+/**********************************************/
+void PPDeftemplateCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   PPConstructCommand(context,"ppdeftemplate",DeftemplateData(theEnv)->DeftemplateConstruct,returnValue);
+  }
+
+/***************************************/
+/* PPDeftemplate: C access routine for */
+/*   the ppdeftemplate command.        */
+/***************************************/
+bool PPDeftemplate(
+  Environment *theEnv,
+  const char *deftemplateName,
+  const char *logicalName)
+  {
+   return(PPConstruct(theEnv,deftemplateName,logicalName,DeftemplateData(theEnv)->DeftemplateConstruct));
+  }
+
+/*************************************************/
+/* ListDeftemplatesCommand: H/L access routine   */
+/*   for the list-deftemplates command.          */
+/*************************************************/
+void ListDeftemplatesCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   ListConstructCommand(context,DeftemplateData(theEnv)->DeftemplateConstruct);
+  }
+
+/****************************************/
+/* ListDeftemplates: C access routine   */
+/*   for the list-deftemplates command. */
+/****************************************/
+void ListDeftemplates(
+  Environment *theEnv,
+  const char *logicalName,
+  Defmodule *theModule)
+  {
+   ListConstruct(theEnv,DeftemplateData(theEnv)->DeftemplateConstruct,logicalName,theModule);
+  }
+
+/********************************************************/
+/* DeftemplateGetWatch: C access routine for retrieving */
+/*   the current watch value of a deftemplate.          */
+/********************************************************/
+bool DeftemplateGetWatch(
+  Deftemplate *theTemplate)
+  {
+   return theTemplate->watch;
+  }
+
+/******************************************************/
+/* DeftemplateSetWatch:  C access routine for setting */
+/*   the current watch value of a deftemplate.        */
+/******************************************************/
+void DeftemplateSetWatch(
+  Deftemplate *theTemplate,
+  bool newState)
+  {
+   theTemplate->watch = newState;
+  }
+
+/**********************************************************/
+/* DeftemplateWatchAccess: Access routine for setting the */
+/*   watch flag of a deftemplate via the watch command.   */
+/**********************************************************/
+bool DeftemplateWatchAccess(
+  Environment *theEnv,
+  int code,
+  bool newState,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+
+   return ConstructSetWatchAccess(theEnv,DeftemplateData(theEnv)->DeftemplateConstruct,newState,argExprs,
+                                  (ConstructGetWatchFunction *) DeftemplateGetWatch,
+                                  (ConstructSetWatchFunction *) DeftemplateSetWatch);
+  }
+
+/*************************************************************************/
+/* DeftemplateWatchPrint: Access routine for printing which deftemplates */
+/*   have their watch flag set via the list-watch-items command.         */
+/*************************************************************************/
+bool DeftemplateWatchPrint(
+  Environment *theEnv,
+  const char *logName,
+  int code,
+  Expression *argExprs)
+  {
+#if MAC_XCD
+#pragma unused(code)
+#endif
+
+   return ConstructPrintWatchAccess(theEnv,DeftemplateData(theEnv)->DeftemplateConstruct,logName,argExprs,
+                                    (ConstructGetWatchFunction *) DeftemplateGetWatch,
+                                    (ConstructSetWatchFunction *) DeftemplateSetWatch);
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
+
diff --git a/clips/tmpltbsc.h b/clips/tmpltbsc.h
new file mode 100755
index 000000000..b942c1e2c
--- /dev/null
+++ b/clips/tmpltbsc.h
@@ -0,0 +1,87 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*       DEFTEMPLATE BASIC COMMANDS HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements core commands for the deftemplate     */
+/*   construct such as clear, reset, save, undeftemplate,    */
+/*   ppdeftemplate, list-deftemplates, and                   */
+/*   get-deftemplate-list.                                   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Corrected compilation errors for files         */
+/*            generated by constructs-to-c. DR0861           */
+/*                                                           */
+/*            Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove compiler warnings     */
+/*            when ENVIRONMENT_API_ONLY flag is set.         */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_tmpltbsc
+
+#pragma once
+
+#define _H_tmpltbsc
+
+#include "evaluatn.h"
+#include "tmpltdef.h"
+
+   void                           DeftemplateBasicCommands(Environment *);
+   void                           UndeftemplateCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           Undeftemplate(Deftemplate *,Environment *);
+   void                           GetDeftemplateListFunction(Environment *,UDFContext *,UDFValue *);
+   void                           GetDeftemplateList(Environment *,CLIPSValue *,Defmodule *);
+   void                           DeftemplateModuleFunction(Environment *,UDFContext *,UDFValue *);
+#if DEBUGGING_FUNCTIONS
+   void                           PPDeftemplateCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           PPDeftemplate(Environment *,const char *,const char *);
+   void                           ListDeftemplatesCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ListDeftemplates(Environment *,const char *,Defmodule *);
+   bool                           DeftemplateGetWatch(Deftemplate *);
+   void                           DeftemplateSetWatch(Deftemplate *,bool);
+   bool                           DeftemplateWatchAccess(Environment *,int,bool,struct expr *);
+   bool                           DeftemplateWatchPrint(Environment *,const char *,int,struct expr *);
+#endif
+
+#endif /* _H_tmpltbsc */
+
+
diff --git a/clips/tmpltcmp.c b/clips/tmpltcmp.c
new file mode 100755
index 000000000..e870971e7
--- /dev/null
+++ b/clips/tmpltcmp.c
@@ -0,0 +1,450 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*          DEFTEMPLATE CONSTRUCTS-TO-C MODULE         */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the constructs-to-c feature for the   */
+/*    deftemplate construct.                                 */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for deftemplate slot facets.           */
+/*                                                           */
+/*            Added code for deftemplate run time            */
+/*            initialization of hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME)
+
+#define SlotPrefix() ArbitraryPrefix(DeftemplateData(theEnv)->DeftemplateCodeItem,2)
+
+#include <stdio.h>
+
+#include "conscomp.h"
+#include "cstrncmp.h"
+#include "envrnmnt.h"
+#include "factcmp.h"
+#include "tmpltdef.h"
+
+#include "tmpltcmp.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static bool                    ConstructToCode(Environment *,const char *,const char *,char *,
+                                                  unsigned int,FILE *,unsigned int,unsigned int);
+   static void                    SlotToCode(Environment *,FILE *,struct templateSlot *,
+                                             unsigned int,unsigned int,unsigned int);
+   static void                    DeftemplateModuleToCode(Environment *,FILE *,Defmodule *,unsigned int,
+                                                          unsigned int,unsigned int);
+   static void                    DeftemplateToCode(Environment *,FILE *,Deftemplate *,
+                                                    unsigned int,unsigned int,unsigned int,unsigned int);
+   static void                    CloseDeftemplateFiles(Environment *,FILE *,FILE *,FILE *,unsigned int);
+   static void                    InitDeftemplateCode(Environment *,FILE *,unsigned int,unsigned int);
+
+/*********************************************************/
+/* DeftemplateCompilerSetup: Initializes the deftemplate */
+/*   construct for use with the constructs-to-c command. */
+/*********************************************************/
+void DeftemplateCompilerSetup(
+  Environment *theEnv)
+  {
+   DeftemplateData(theEnv)->DeftemplateCodeItem =
+      AddCodeGeneratorItem(theEnv,"deftemplate",0,NULL,InitDeftemplateCode,ConstructToCode,3);
+  }
+
+/*************************************************************/
+/* ConstructToCode: Produces deftemplate code for a run-time */
+/*   module created using the constructs-to-c function.      */
+/*************************************************************/
+static bool ConstructToCode(
+  Environment *theEnv,
+  const char *fileName,
+  const char *pathName,
+  char *fileNameBuffer,
+  unsigned int fileID,
+  FILE *headerFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   unsigned int fileCount = 1;
+   Defmodule *theModule;
+   Deftemplate *theTemplate;
+   struct templateSlot *slotPtr;
+   unsigned int slotCount = 0, slotArrayCount = 0, slotArrayVersion = 1;
+   unsigned int moduleCount = 0, moduleArrayCount = 0, moduleArrayVersion = 1;
+   unsigned int templateArrayCount = 0, templateArrayVersion = 1;
+   FILE *slotFile = NULL, *moduleFile = NULL, *templateFile = NULL;
+
+   /*==================================================*/
+   /* Include the appropriate deftemplate header file. */
+   /*==================================================*/
+
+   fprintf(headerFP,"#include \"tmpltdef.h\"\n");
+
+   /*=============================================================*/
+   /* Loop through all the modules, all the deftemplates, and all */
+   /* the deftemplate slots writing their C code representation   */
+   /* to the file as they are traversed.                          */
+   /*=============================================================*/
+
+   theModule = GetNextDefmodule(theEnv,NULL);
+
+   while (theModule != NULL)
+     {
+      SetCurrentModule(theEnv,theModule);
+
+      moduleFile = OpenFileIfNeeded(theEnv,moduleFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                    moduleArrayVersion,headerFP,
+                                    "struct deftemplateModule",ModulePrefix(DeftemplateData(theEnv)->DeftemplateCodeItem),
+                                    false,NULL);
+
+      if (moduleFile == NULL)
+        {
+         CloseDeftemplateFiles(theEnv,moduleFile,templateFile,slotFile,maxIndices);
+         return false;
+        }
+
+      DeftemplateModuleToCode(theEnv,moduleFile,theModule,imageID,maxIndices,moduleCount);
+      moduleFile = CloseFileIfNeeded(theEnv,moduleFile,&moduleArrayCount,&moduleArrayVersion,
+                                     maxIndices,NULL,NULL);
+
+      /*=======================================================*/
+      /* Loop through each of the deftemplates in this module. */
+      /*=======================================================*/
+
+      theTemplate = GetNextDeftemplate(theEnv,NULL);
+
+      while (theTemplate != NULL)
+        {
+         templateFile = OpenFileIfNeeded(theEnv,templateFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                         templateArrayVersion,headerFP,
+                                         "Deftemplate",ConstructPrefix(DeftemplateData(theEnv)->DeftemplateCodeItem),
+                                         false,NULL);
+         if (templateFile == NULL)
+           {
+            CloseDeftemplateFiles(theEnv,moduleFile,templateFile,slotFile,maxIndices);
+            return false;
+           }
+
+         DeftemplateToCode(theEnv,templateFile,theTemplate,imageID,maxIndices,
+                        moduleCount,slotCount);
+         templateArrayCount++;
+         templateFile = CloseFileIfNeeded(theEnv,templateFile,&templateArrayCount,&templateArrayVersion,
+                                          maxIndices,NULL,NULL);
+
+         /*======================================================*/
+         /* Loop through each of the slots for this deftemplate. */
+         /*======================================================*/
+
+         slotPtr = theTemplate->slotList;
+         while (slotPtr != NULL)
+           {
+            slotFile = OpenFileIfNeeded(theEnv,slotFile,fileName,pathName,fileNameBuffer,fileID,imageID,&fileCount,
+                                        slotArrayVersion,headerFP,
+                                       "struct templateSlot",SlotPrefix(),false,NULL);
+            if (slotFile == NULL)
+              {
+               CloseDeftemplateFiles(theEnv,moduleFile,templateFile,slotFile,maxIndices);
+               return false;
+              }
+
+            SlotToCode(theEnv,slotFile,slotPtr,imageID,maxIndices,slotCount);
+            slotCount++;
+            slotArrayCount++;
+            slotFile = CloseFileIfNeeded(theEnv,slotFile,&slotArrayCount,&slotArrayVersion,
+                                         maxIndices,NULL,NULL);
+            slotPtr = slotPtr->next;
+           }
+
+         theTemplate = GetNextDeftemplate(theEnv,theTemplate);
+        }
+
+      theModule = GetNextDefmodule(theEnv,theModule);
+      moduleCount++;
+      moduleArrayCount++;
+
+     }
+
+   CloseDeftemplateFiles(theEnv,moduleFile,templateFile,slotFile,maxIndices);
+
+   return true;
+  }
+
+/************************************************************/
+/* CloseDeftemplateFiles: Closes all of the C files created */
+/*   for deftemplates. Called when an error occurs or when  */
+/*   the deftemplates have all been written to the files.   */
+/************************************************************/
+static void CloseDeftemplateFiles(
+  Environment *theEnv,
+  FILE *moduleFile,
+  FILE *templateFile,
+  FILE *slotFile,
+  unsigned int maxIndices)
+  {
+   unsigned int count = maxIndices;
+   unsigned int arrayVersion = 0;
+
+   if (slotFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,slotFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+
+   if (templateFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,templateFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+
+   if (moduleFile != NULL)
+     {
+      count = maxIndices;
+      CloseFileIfNeeded(theEnv,moduleFile,&count,&arrayVersion,maxIndices,NULL,NULL);
+     }
+  }
+
+/*************************************************************/
+/* DeftemplateModuleToCode: Writes the C code representation */
+/*   of a single deftemplate module to the specified file.   */
+/*************************************************************/
+static void DeftemplateModuleToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Defmodule *theModule,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount)
+  {
+#if MAC_XCD
+#pragma unused(moduleCount)
+#endif
+
+   fprintf(theFile,"{");
+
+   ConstructModuleToCode(theEnv,theFile,theModule,imageID,maxIndices,
+                         DeftemplateData(theEnv)->DeftemplateModuleIndex,ConstructPrefix(DeftemplateData(theEnv)->DeftemplateCodeItem));
+
+   fprintf(theFile,"}");
+  }
+
+/************************************************************/
+/* DeftemplateToCode: Writes the C code representation of a */
+/*   single deftemplate construct to the specified file.    */
+/************************************************************/
+static void DeftemplateToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  Deftemplate *theTemplate,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int moduleCount,
+  unsigned int slotCount)
+  {
+   /*====================*/
+   /* Deftemplate Header */
+   /*====================*/
+
+   fprintf(theFile,"{");
+
+   ConstructHeaderToCode(theEnv,theFile,&theTemplate->header,imageID,maxIndices,
+                                  moduleCount,ModulePrefix(DeftemplateData(theEnv)->DeftemplateCodeItem),
+                                  ConstructPrefix(DeftemplateData(theEnv)->DeftemplateCodeItem));
+   fprintf(theFile,",");
+
+   /*===========*/
+   /* Slot List */
+   /*===========*/
+
+   if (theTemplate->slotList == NULL)
+     { fprintf(theFile,"NULL,"); }
+   else
+     {
+      fprintf(theFile,"&%s%d_%d[%d],",SlotPrefix(),
+                 imageID,
+                 (slotCount / maxIndices) + 1,
+                 slotCount % maxIndices);
+     }
+
+   /*==========================================*/
+   /* Implied Flag, Watch Flag, In Scope Flag, */
+   /* Number of Slots, and Busy Count.         */
+   /*==========================================*/
+
+   fprintf(theFile,"%d,0,0,%d,%ld,",theTemplate->implied,theTemplate->numberOfSlots,theTemplate->busyCount);
+
+   /*=================*/
+   /* Pattern Network */
+   /*=================*/
+
+   if (theTemplate->patternNetwork == NULL)
+     { fprintf(theFile,"NULL"); }
+   else
+     { FactPatternNodeReference(theEnv,theTemplate->patternNetwork,theFile,imageID,maxIndices); }
+
+   /*============================================*/
+   /* Print the factList and lastFact references */
+   /* and close the structure.                   */
+   /*============================================*/
+
+   fprintf(theFile,",NULL,NULL}");
+  }
+
+/*****************************************************/
+/* SlotToCode: Writes the C code representation of a */
+/*   single deftemplate slot to the specified file.  */
+/*****************************************************/
+static void SlotToCode(
+  Environment *theEnv,
+  FILE *theFile,
+  struct templateSlot *theSlot,
+  unsigned int imageID,
+  unsigned int maxIndices,
+  unsigned int slotCount)
+  {
+   /*===========*/
+   /* Slot Name */
+   /*===========*/
+
+   fprintf(theFile,"{");
+   PrintSymbolReference(theEnv,theFile,theSlot->slotName);
+
+   /*=============================*/
+   /* Multislot and Default Flags */
+   /*=============================*/
+
+   fprintf(theFile,",%d,%d,%d,%d,",theSlot->multislot,theSlot->noDefault,
+                                   theSlot->defaultPresent,theSlot->defaultDynamic);
+
+   /*=============*/
+   /* Constraints */
+   /*=============*/
+
+   PrintConstraintReference(theEnv,theFile,theSlot->constraints,imageID,maxIndices);
+
+   /*===============*/
+   /* Default Value */
+   /*===============*/
+
+   fprintf(theFile,",");
+   PrintHashedExpressionReference(theEnv,theFile,theSlot->defaultList,imageID,maxIndices);
+
+   /*============*/
+   /* Facet List */
+   /*============*/
+
+   fprintf(theFile,",");
+   PrintHashedExpressionReference(theEnv,theFile,theSlot->facetList,imageID,maxIndices);
+   fprintf(theFile,",");
+
+   /*===========*/
+   /* Next Slot */
+   /*===========*/
+
+   if (theSlot->next == NULL)
+     { fprintf(theFile,"NULL}"); }
+   else
+     {
+      fprintf(theFile,"&%s%d_%d[%d]}",SlotPrefix(),imageID,
+                               ((slotCount+1) / maxIndices) + 1,
+                                (slotCount+1) % maxIndices);
+     }
+  }
+
+/*****************************************************************/
+/* DeftemplateCModuleReference: Writes the C code representation */
+/*   of a reference to a deftemplate module data structure.      */
+/*****************************************************************/
+void DeftemplateCModuleReference(
+  Environment *theEnv,
+  FILE *theFile,
+  unsigned long count,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   fprintf(theFile,"MIHS &%s%u_%lu[%lu]",ModulePrefix(DeftemplateData(theEnv)->DeftemplateCodeItem),
+                      imageID,
+                      (count / maxIndices) + 1,
+                      (count % maxIndices));
+  }
+
+/********************************************************************/
+/* DeftemplateCConstructReference: Writes the C code representation */
+/*   of a reference to a deftemplate data structure.                */
+/********************************************************************/
+void DeftemplateCConstructReference(
+  Environment *theEnv,
+  FILE *theFile,
+  Deftemplate *theDeftemplate,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+   if (theDeftemplate == NULL)
+     { fprintf(theFile,"NULL"); }
+   else
+     {
+      fprintf(theFile,"&%s%u_%lu[%lu]",ConstructPrefix(DeftemplateData(theEnv)->DeftemplateCodeItem),
+                      imageID,
+                      (theDeftemplate->header.bsaveID / maxIndices) + 1,
+                      theDeftemplate->header.bsaveID % maxIndices);
+     }
+
+  }
+
+/*******************************************/
+/* InitDeftemplateCode: Writes out runtime */
+/*   initialization code for deftemplates. */
+/*******************************************/
+static void InitDeftemplateCode(
+  Environment *theEnv,
+  FILE *initFP,
+  unsigned int imageID,
+  unsigned int maxIndices)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#pragma unused(imageID)
+#pragma unused(maxIndices)
+#endif
+
+   fprintf(initFP,"   DeftemplateRunTimeInitialize(theEnv);\n");
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT && CONSTRUCT_COMPILER && (! RUN_TIME) */
+
diff --git a/clips/tmpltcmp.h b/clips/tmpltcmp.h
new file mode 100755
index 000000000..284c3fd47
--- /dev/null
+++ b/clips/tmpltcmp.h
@@ -0,0 +1,57 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*      DEFTEMPLATE CONSTRUCT COMPILER HEADER FILE     */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.30: Added support for path name argument to        */
+/*            constructs-to-c.                               */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for deftemplate slot facets.           */
+/*                                                           */
+/*            Added code for deftemplate run time            */
+/*            initialization of hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_tmpltcmp
+
+#pragma once
+
+#define _H_tmpltcmp
+
+#include "tmpltdef.h"
+
+   void                           DeftemplateCompilerSetup(Environment *);
+   void                           DeftemplateCModuleReference(Environment *,FILE *,unsigned long,unsigned int,unsigned int);
+   void                           DeftemplateCConstructReference(Environment *,FILE *,Deftemplate *,
+                                                                 unsigned int,unsigned int);
+
+#endif /* _H_tmpltcmp */
diff --git a/clips/tmpltdef.c b/clips/tmpltdef.c
new file mode 100755
index 000000000..69d64150b
--- /dev/null
+++ b/clips/tmpltdef.c
@@ -0,0 +1,584 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*                 DEFTEMPLATE MODULE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Defines basic deftemplate primitive functions    */
+/*   such as allocating and deallocating, traversing, and    */
+/*   finding deftemplate data structures.                    */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Added code for deftemplate run time            */
+/*            initialization of hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for deftemplate slot facets.           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#include <stdio.h>
+
+#include "cstrccom.h"
+#include "cstrnchk.h"
+#include "envrnmnt.h"
+#include "exprnops.h"
+#include "memalloc.h"
+#include "modulpsr.h"
+#include "modulutl.h"
+#include "network.h"
+#include "pattern.h"
+#include "router.h"
+#include "tmpltbsc.h"
+#include "tmpltfun.h"
+#include "tmpltpsr.h"
+#include "tmpltutl.h"
+
+#if BLOAD || BLOAD_ONLY || BLOAD_AND_BSAVE
+#include "bload.h"
+#include "tmpltbin.h"
+#endif
+
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+#include "tmpltcmp.h"
+#endif
+
+#include "tmpltdef.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                   *AllocateModule(Environment *);
+   static void                    ReturnModule(Environment *,void *);
+   static void                    ReturnDeftemplate(Environment *,Deftemplate *);
+   static void                    InitializeDeftemplateModules(Environment *);
+   static void                    DeallocateDeftemplateData(Environment *);
+   static void                    DestroyDeftemplateAction(Environment *,ConstructHeader *,void *);
+   static void                    DestroyDeftemplate(Environment *,Deftemplate *);
+#if RUN_TIME
+   static void                    RuntimeDeftemplateAction(Environment *,ConstructHeader *,void *);
+   static void                    SearchForHashedPatternNodes(Environment *,struct factPatternNode *);
+#endif
+
+/******************************************************************/
+/* InitializeDeftemplates: Initializes the deftemplate construct. */
+/******************************************************************/
+void InitializeDeftemplates(
+  Environment *theEnv)
+  {
+   struct entityRecord deftemplatePtrRecord =
+      { "DEFTEMPLATE_PTR",
+        DEFTEMPLATE_PTR,1,0,0,
+        NULL,
+        NULL,NULL,
+        NULL,
+        NULL,
+        (EntityBusyCountFunction *) DecrementDeftemplateBusyCount,
+        (EntityBusyCountFunction *) IncrementDeftemplateBusyCount,
+        NULL,NULL,NULL,NULL,NULL };
+   AllocateEnvironmentData(theEnv,DEFTEMPLATE_DATA,sizeof(struct deftemplateData),DeallocateDeftemplateData);
+
+   memcpy(&DeftemplateData(theEnv)->DeftemplatePtrRecord,&deftemplatePtrRecord,sizeof(struct entityRecord));
+
+   InitializeFacts(theEnv);
+
+   InitializeDeftemplateModules(theEnv);
+
+   DeftemplateBasicCommands(theEnv);
+
+   DeftemplateFunctions(theEnv);
+
+   DeftemplateData(theEnv)->DeftemplateConstruct =
+      AddConstruct(theEnv,"deftemplate","deftemplates",ParseDeftemplate,
+                   (FindConstructFunction *) FindDeftemplate,
+                   GetConstructNamePointer,GetConstructPPForm,
+                   GetConstructModuleItem,
+                   (GetNextConstructFunction *) GetNextDeftemplate,
+                   SetNextConstruct,
+                   (IsConstructDeletableFunction *) DeftemplateIsDeletable,
+                   (DeleteConstructFunction *) Undeftemplate,
+                   (FreeConstructFunction *) ReturnDeftemplate);
+
+   InstallPrimitive(theEnv,(EntityRecord *) &DeftemplateData(theEnv)->DeftemplatePtrRecord,DEFTEMPLATE_PTR);
+  }
+
+/******************************************************/
+/* DeallocateDeftemplateData: Deallocates environment */
+/*    data for the deftemplate construct.             */
+/******************************************************/
+static void DeallocateDeftemplateData(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   struct deftemplateModule *theModuleItem;
+   Defmodule *theModule;
+#endif
+#if BLOAD || BLOAD_AND_BSAVE
+   if (Bloaded(theEnv)) return;
+#endif
+
+   DoForAllConstructs(theEnv,DestroyDeftemplateAction,DeftemplateData(theEnv)->DeftemplateModuleIndex,false,NULL);
+
+#if ! RUN_TIME
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      theModuleItem = (struct deftemplateModule *)
+                      GetModuleItem(theEnv,theModule,
+                                    DeftemplateData(theEnv)->DeftemplateModuleIndex);
+      rtn_struct(theEnv,deftemplateModule,theModuleItem);
+     }
+#endif
+  }
+
+/*****************************************************/
+/* DestroyDeftemplateAction: Action used to remove   */
+/*   deftemplates as a result of DestroyEnvironment. */
+/*****************************************************/
+static void DestroyDeftemplateAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Deftemplate *theDeftemplate = (Deftemplate *) theConstruct;
+
+   if (theDeftemplate == NULL) return;
+
+   DestroyDeftemplate(theEnv,theDeftemplate);
+  }
+
+
+/*************************************************************/
+/* InitializeDeftemplateModules: Initializes the deftemplate */
+/*   construct for use with the defmodule construct.         */
+/*************************************************************/
+static void InitializeDeftemplateModules(
+  Environment *theEnv)
+  {
+   DeftemplateData(theEnv)->DeftemplateModuleIndex = RegisterModuleItem(theEnv,"deftemplate",
+                                    AllocateModule,
+                                    ReturnModule,
+#if BLOAD_AND_BSAVE || BLOAD || BLOAD_ONLY
+                                    BloadDeftemplateModuleReference,
+#else
+                                    NULL,
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+                                    DeftemplateCModuleReference,
+#else
+                                    NULL,
+#endif
+                                    (FindConstructFunction *) FindDeftemplateInModule);
+
+#if (! BLOAD_ONLY) && (! RUN_TIME) && DEFMODULE_CONSTRUCT
+   AddPortConstructItem(theEnv,"deftemplate",SYMBOL_TOKEN);
+#endif
+  }
+
+/***************************************************/
+/* AllocateModule: Allocates a deftemplate module. */
+/***************************************************/
+static void *AllocateModule(
+  Environment *theEnv)
+  {
+   return((void *) get_struct(theEnv,deftemplateModule));
+  }
+
+/*************************************************/
+/* ReturnModule: Deallocates a deftemplate module. */
+/*************************************************/
+static void ReturnModule(
+  Environment *theEnv,
+  void *theItem)
+  {
+   FreeConstructHeaderModule(theEnv,(struct defmoduleItemHeader *) theItem,DeftemplateData(theEnv)->DeftemplateConstruct);
+   rtn_struct(theEnv,deftemplateModule,theItem);
+  }
+
+/****************************************************************/
+/* GetDeftemplateModuleItem: Returns a pointer to the defmodule */
+/*  item for the specified deftemplate or defmodule.            */
+/****************************************************************/
+struct deftemplateModule *GetDeftemplateModuleItem(
+  Environment *theEnv,
+  Defmodule *theModule)
+  {
+   return((struct deftemplateModule *) GetConstructModuleItemByIndex(theEnv,theModule,DeftemplateData(theEnv)->DeftemplateModuleIndex));
+  }
+
+/***************************************************/
+/* FindDeftemplate: Searches for a deftemplate in  */
+/*   the list of deftemplates. Returns a pointer   */
+/*   to the deftemplate if  found, otherwise NULL. */
+/***************************************************/
+Deftemplate *FindDeftemplate(
+  Environment *theEnv,
+  const char *deftemplateName)
+  {
+   return (Deftemplate *) FindNamedConstructInModuleOrImports(theEnv,deftemplateName,DeftemplateData(theEnv)->DeftemplateConstruct);
+  }
+
+/*******************************************************/
+/* FindDeftemplateInModule: Searches for a deftemplate */
+/*   in the list of deftemplates. Returns a pointer    */
+/*   to the deftemplate if  found, otherwise NULL.     */
+/*******************************************************/
+Deftemplate *FindDeftemplateInModule(
+  Environment *theEnv,
+  const char *deftemplateName)
+  {
+   return (Deftemplate *) FindNamedConstructInModule(theEnv,deftemplateName,DeftemplateData(theEnv)->DeftemplateConstruct);
+  }
+
+/***********************************************************************/
+/* GetNextDeftemplate: If passed a NULL pointer, returns the first     */
+/*   deftemplate in the ListOfDeftemplates. Otherwise returns the next */
+/*   deftemplate following the deftemplate passed as an argument.      */
+/***********************************************************************/
+Deftemplate *GetNextDeftemplate(
+  Environment *theEnv,
+  Deftemplate *deftemplatePtr)
+  {
+   return (Deftemplate *) GetNextConstructItem(theEnv,&deftemplatePtr->header,DeftemplateData(theEnv)->DeftemplateModuleIndex);
+  }
+
+/**********************************************************/
+/* DeftemplateIsDeletable: Returns true if a particular   */
+/*   deftemplate can be deleted, otherwise returns false. */
+/**********************************************************/
+bool DeftemplateIsDeletable(
+  Deftemplate *theDeftemplate)
+  {
+   Environment *theEnv = theDeftemplate->header.env;
+
+   if (! ConstructsDeletable(theEnv))
+     { return false; }
+
+   if (theDeftemplate->busyCount > 0) return false;
+   if (theDeftemplate->patternNetwork != NULL) return false;
+
+   return true;
+  }
+
+/**************************************************************/
+/* ReturnDeftemplate: Returns the data structures associated  */
+/*   with a deftemplate construct to the pool of free memory. */
+/**************************************************************/
+static void ReturnDeftemplate(
+  Environment *theEnv,
+  Deftemplate *theDeftemplate)
+  {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   struct templateSlot *slotPtr;
+
+   if (theDeftemplate == NULL) return;
+
+   /*====================================================================*/
+   /* If a template is redefined, then we want to save its debug status. */
+   /*====================================================================*/
+
+#if DEBUGGING_FUNCTIONS
+   DeftemplateData(theEnv)->DeletedTemplateDebugFlags = 0;
+   if (theDeftemplate->watch) BitwiseSet(DeftemplateData(theEnv)->DeletedTemplateDebugFlags,0);
+#endif
+
+   /*===========================================*/
+   /* Free storage used by the templates slots. */
+   /*===========================================*/
+
+   slotPtr = theDeftemplate->slotList;
+   while (slotPtr != NULL)
+     {
+      ReleaseLexeme(theEnv,slotPtr->slotName);
+      RemoveHashedExpression(theEnv,slotPtr->defaultList);
+      slotPtr->defaultList = NULL;
+      RemoveHashedExpression(theEnv,slotPtr->facetList);
+      slotPtr->facetList = NULL;
+      RemoveConstraint(theEnv,slotPtr->constraints);
+      slotPtr->constraints = NULL;
+      slotPtr = slotPtr->next;
+     }
+
+   ReturnSlots(theEnv,theDeftemplate->slotList);
+
+   /*==================================*/
+   /* Free storage used by the header. */
+   /*==================================*/
+
+   DeinstallConstructHeader(theEnv,&theDeftemplate->header);
+
+   rtn_struct(theEnv,deftemplate,theDeftemplate);
+#endif
+  }
+
+/**************************************************************/
+/* DestroyDeftemplate: Returns the data structures associated */
+/*   with a deftemplate construct to the pool of free memory. */
+/**************************************************************/
+static void DestroyDeftemplate(
+  Environment *theEnv,
+  Deftemplate *theDeftemplate)
+  {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   struct templateSlot *slotPtr, *nextSlot;
+#endif
+   if (theDeftemplate == NULL) return;
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   slotPtr = theDeftemplate->slotList;
+
+   while (slotPtr != NULL)
+     {
+      nextSlot = slotPtr->next;
+      rtn_struct(theEnv,templateSlot,slotPtr);
+      slotPtr = nextSlot;
+     }
+#endif
+
+   DestroyFactPatternNetwork(theEnv,theDeftemplate->patternNetwork);
+
+   /*==================================*/
+   /* Free storage used by the header. */
+   /*==================================*/
+
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   DeinstallConstructHeader(theEnv,&theDeftemplate->header);
+
+   rtn_struct(theEnv,deftemplate,theDeftemplate);
+#endif
+  }
+
+/***********************************************/
+/* ReturnSlots: Returns the slot structures of */
+/*   a deftemplate to free memory.             */
+/***********************************************/
+void ReturnSlots(
+  Environment *theEnv,
+  struct templateSlot *slotPtr)
+  {
+#if (! BLOAD_ONLY) && (! RUN_TIME)
+   struct templateSlot *nextSlot;
+
+   while (slotPtr != NULL)
+     {
+      nextSlot = slotPtr->next;
+      ReturnExpression(theEnv,slotPtr->defaultList);
+      ReturnExpression(theEnv,slotPtr->facetList);
+      RemoveConstraint(theEnv,slotPtr->constraints);
+      rtn_struct(theEnv,templateSlot,slotPtr);
+      slotPtr = nextSlot;
+     }
+#endif
+  }
+
+/*************************************************/
+/* DecrementDeftemplateBusyCount: Decrements the */
+/*   busy count of a deftemplate data structure. */
+/*************************************************/
+void DecrementDeftemplateBusyCount(
+  Environment *theEnv,
+  Deftemplate *theTemplate)
+  {
+   if (! ConstructData(theEnv)->ClearInProgress) theTemplate->busyCount--;
+  }
+
+/*************************************************/
+/* IncrementDeftemplateBusyCount: Increments the */
+/*   busy count of a deftemplate data structure. */
+/*************************************************/
+void IncrementDeftemplateBusyCount(
+  Environment *theEnv,
+  Deftemplate *theTemplate)
+  {
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+
+   theTemplate->busyCount++;
+  }
+
+/*******************************************************************/
+/* GetNextFactInTemplate: If passed a NULL pointer, returns the    */
+/*   first fact in the template's fact-list. Otherwise returns the */
+/*   next template fact following the fact passed as an argument.  */
+/*******************************************************************/
+Fact *GetNextFactInTemplate(
+  Deftemplate *theTemplate,
+  Fact *factPtr)
+  {
+   if (factPtr == NULL)
+     { return(theTemplate->factList); }
+
+   if (factPtr->garbage) return NULL;
+
+   return(factPtr->nextTemplateFact);
+  }
+
+#if ! RUN_TIME
+
+/******************************/
+/* CreateDeftemplateScopeMap: */
+/******************************/
+void *CreateDeftemplateScopeMap(
+  Environment *theEnv,
+  Deftemplate *theDeftemplate)
+  {
+   unsigned short scopeMapSize;
+   char *scopeMap;
+   const char *templateName;
+   Defmodule *matchModule, *theModule;
+   unsigned long moduleID;
+   unsigned int count;
+   void *theBitMap;
+
+   templateName = theDeftemplate->header.name->contents;
+   matchModule = theDeftemplate->header.whichModule->theModule;
+
+   scopeMapSize = (sizeof(char) * ((GetNumberOfDefmodules(theEnv) / BITS_PER_BYTE) + 1));
+   scopeMap = (char *) gm2(theEnv,scopeMapSize);
+
+   ClearBitString((void *) scopeMap,scopeMapSize);
+   SaveCurrentModule(theEnv);
+   for (theModule = GetNextDefmodule(theEnv,NULL) ;
+        theModule != NULL ;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      SetCurrentModule(theEnv,theModule);
+      moduleID = theModule->header.bsaveID;
+      if (FindImportedConstruct(theEnv,"deftemplate",matchModule,
+                                templateName,&count,true,NULL) != NULL)
+        SetBitMap(scopeMap,moduleID);
+     }
+   RestoreCurrentModule(theEnv);
+   theBitMap = AddBitMap(theEnv,scopeMap,scopeMapSize);
+   IncrementBitMapCount(theBitMap);
+   rm(theEnv,scopeMap,scopeMapSize);
+   return(theBitMap);
+  }
+
+#endif
+
+#if RUN_TIME
+
+/**************************************************/
+/* RuntimeDeftemplateAction: Action to be applied */
+/*   to each deftemplate construct when a runtime */
+/*   initialization occurs.                       */
+/**************************************************/
+static void RuntimeDeftemplateAction(
+  Environment *theEnv,
+  ConstructHeader *theConstruct,
+  void *buffer)
+  {
+#if MAC_XCD
+#pragma unused(buffer)
+#endif
+   Deftemplate *theDeftemplate = (Deftemplate *) theConstruct;
+   
+   theDeftemplate->header.env = theEnv;
+   SearchForHashedPatternNodes(theEnv,theDeftemplate->patternNetwork);
+  }
+
+/********************************/
+/* SearchForHashedPatternNodes: */
+/********************************/
+static void SearchForHashedPatternNodes(
+   Environment *theEnv,
+   struct factPatternNode *theNode)
+   {
+    while (theNode != NULL)
+      {
+       if ((theNode->lastLevel != NULL) && (theNode->lastLevel->header.selector))
+        { AddHashedPatternNode(theEnv,theNode->lastLevel,theNode,theNode->networkTest->type,theNode->networkTest->value); }
+
+       SearchForHashedPatternNodes(theEnv,theNode->nextLevel);
+
+       theNode = theNode->rightNode;
+      }
+   }
+
+/*********************************/
+/* DeftemplateRunTimeInitialize: */
+/*********************************/
+void DeftemplateRunTimeInitialize(
+  Environment *theEnv)
+  {
+   DoForAllConstructs(theEnv,RuntimeDeftemplateAction,DeftemplateData(theEnv)->DeftemplateModuleIndex,true,NULL);
+  }
+
+#endif /* RUN_TIME */
+
+/*##################################*/
+/* Additional Environment Functions */
+/*##################################*/
+
+const char *DeftemplateModule(
+  Deftemplate *theDeftemplate)
+  {
+   return GetConstructModuleName(&theDeftemplate->header);
+  }
+
+const char *DeftemplateName(
+  Deftemplate *theDeftemplate)
+  {
+   return GetConstructNameString(&theDeftemplate->header);
+  }
+
+const char *DeftemplatePPForm(
+  Deftemplate *theDeftemplate)
+  {
+   return GetConstructPPForm(&theDeftemplate->header);
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
+
diff --git a/clips/tmpltdef.h b/clips/tmpltdef.h
new file mode 100755
index 000000000..e4e2becdc
--- /dev/null
+++ b/clips/tmpltdef.h
@@ -0,0 +1,154 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*               DEFTEMPLATE HEADER FILE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Corrected code to remove run-time program      */
+/*            compiler warnings.                             */
+/*                                                           */
+/*      6.30: Added code for deftemplate run time            */
+/*            initialization of hashed comparisons to        */
+/*            constants.                                     */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Support for deftemplate slot facets.           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_tmpltdef
+
+#pragma once
+
+#define _H_tmpltdef
+
+typedef struct deftemplate Deftemplate;
+
+struct templateSlot;
+struct deftemplateModule;
+
+#include "entities.h"
+
+#include "constrct.h"
+#include "conscomp.h"
+#include "evaluatn.h"
+#include "moduldef.h"
+
+struct deftemplateModule
+  {
+   struct defmoduleItemHeader header;
+  };
+
+#include "constrnt.h"
+#include "factbld.h"
+
+struct deftemplate
+  {
+   ConstructHeader header;
+   struct templateSlot *slotList;
+   unsigned int implied       : 1;
+   unsigned int watch         : 1;
+   unsigned int inScope       : 1;
+   unsigned short numberOfSlots;
+   long busyCount;
+   struct factPatternNode *patternNetwork;
+   Fact *factList;
+   Fact *lastFact;
+  };
+
+struct templateSlot
+  {
+   CLIPSLexeme *slotName;
+   unsigned int multislot : 1;
+   unsigned int noDefault : 1;
+   unsigned int defaultPresent : 1;
+   unsigned int defaultDynamic : 1;
+   CONSTRAINT_RECORD *constraints;
+   Expression *defaultList;
+   Expression *facetList;
+   struct templateSlot *next;
+  };
+
+
+#define DEFTEMPLATE_DATA 5
+
+struct deftemplateData
+  {
+   Construct *DeftemplateConstruct;
+   unsigned int DeftemplateModuleIndex;
+   struct entityRecord DeftemplatePtrRecord;
+#if DEBUGGING_FUNCTIONS
+   int DeletedTemplateDebugFlags;
+#endif
+#if CONSTRUCT_COMPILER && (! RUN_TIME)
+   struct CodeGeneratorItem *DeftemplateCodeItem;
+#endif
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   bool DeftemplateError;
+#endif
+  };
+
+#define DeftemplateData(theEnv) ((struct deftemplateData *) GetEnvironmentData(theEnv,DEFTEMPLATE_DATA))
+
+   void                           InitializeDeftemplates(Environment *);
+   Deftemplate                   *FindDeftemplate(Environment *,const char *);
+   Deftemplate                   *FindDeftemplateInModule(Environment *,const char *);
+   Deftemplate                   *GetNextDeftemplate(Environment *,Deftemplate *);
+   bool                           DeftemplateIsDeletable(Deftemplate *);
+   Fact                          *GetNextFactInTemplate(Deftemplate *,Fact *);
+   struct deftemplateModule      *GetDeftemplateModuleItem(Environment *,Defmodule *);
+   void                           ReturnSlots(Environment *,struct templateSlot *);
+   void                           IncrementDeftemplateBusyCount(Environment *,Deftemplate *);
+   void                           DecrementDeftemplateBusyCount(Environment *,Deftemplate *);
+   void                          *CreateDeftemplateScopeMap(Environment *,Deftemplate *);
+#if RUN_TIME
+   void                           DeftemplateRunTimeInitialize(Environment *);
+#endif
+   const char                    *DeftemplateModule(Deftemplate *);
+   const char                    *DeftemplateName(Deftemplate *);
+   const char                    *DeftemplatePPForm(Deftemplate *);
+
+#endif /* _H_tmpltdef */
+
+
diff --git a/clips/tmpltfun.c b/clips/tmpltfun.c
new file mode 100755
index 000000000..2f5742634
--- /dev/null
+++ b/clips/tmpltfun.c
@@ -0,0 +1,2461 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  09/20/17             */
+   /*                                                     */
+   /*             DEFTEMPLATE FUNCTIONS MODULE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Implements the modify and duplicate functions.   */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Added deftemplate-slot-names,                  */
+/*            deftemplate-slot-default-value,                */
+/*            deftemplate-slot-cardinality,                  */
+/*            deftemplate-slot-allowed-values,               */
+/*            deftemplate-slot-range,                        */
+/*            deftemplate-slot-types,                        */
+/*            deftemplate-slot-multip,                       */
+/*            deftemplate-slot-singlep,                      */
+/*            deftemplate-slot-existp, and                   */
+/*            deftemplate-slot-defaultp functions.           */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for deftemplate slot facets.           */
+/*                                                           */
+/*            Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            Added deftemplate-slot-facet-existp and        */
+/*            deftemplate-slot-facet-value functions.        */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Support for modify callback function.          */
+/*                                                           */
+/*            Added additional argument to function          */
+/*            CheckDeftemplateAndSlotArguments to specify    */
+/*            the expected number of arguments.              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            Increment/DecrementClearReadyLocks API.        */
+/*                                                           */
+/*      6.31: Error messages are now generated when modify   */
+/*            and duplicate functions are given a retracted  */
+/*            fact.                                          */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Eval support for run time and bload only.      */
+/*                                                           */
+/*            Watch facts for modify command only prints     */
+/*            changed slots.                                 */
+/*                                                           */
+/*            Modify command preserves fact id and address.  */
+/*                                                           */
+/*            Assert returns duplicate fact. FALSE is now    */
+/*            returned only if an error occurs.              */
+/*                                                           */
+/*            For the modify command, specifying the fact    */
+/*            using a fact-index is no longer limited to     */
+/*            top-level commands.                            */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "commline.h"
+#include "constant.h"
+#include "cstrnchk.h"
+#include "default.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "factmngr.h"
+#include "factrhs.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "pprint.h"
+#include "prcdrpsr.h"
+#include "prntutil.h"
+#include "reorder.h"
+#include "router.h"
+#include "scanner.h"
+#include "symbol.h"
+#include "sysdep.h"
+#include "tmpltdef.h"
+#include "tmpltlhs.h"
+#include "tmpltrhs.h"
+#include "tmpltutl.h"
+#include "utility.h"
+
+#include "tmpltfun.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static CLIPSLexeme            *CheckDeftemplateAndSlotArguments(UDFContext *,Deftemplate **);
+   static void                    FreeTemplateValueArray(Environment *,CLIPSValue *,Deftemplate *);
+   static struct expr            *ModAndDupParse(Environment *,struct expr *,const char *,const char *);
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static CLIPSLexeme            *FindTemplateForFactAddress(CLIPSLexeme *,struct lhsParseNode *);
+#endif
+
+/****************************************************************/
+/* DeftemplateFunctions: Initializes the deftemplate functions. */
+/****************************************************************/
+void DeftemplateFunctions(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"modify","bf",0,UNBOUNDED,"*;lf",ModifyCommand,"ModifyCommand",NULL);
+   AddUDF(theEnv,"duplicate","bf",0,UNBOUNDED,"*;lf",DuplicateCommand,"DuplicateCommand",NULL);
+
+   AddUDF(theEnv,"deftemplate-slot-names","bm",1,1,"y",DeftemplateSlotNamesFunction,"DeftemplateSlotNamesFunction",NULL);
+   AddUDF(theEnv,"deftemplate-slot-default-value","*",2,2,"y",DeftemplateSlotDefaultValueFunction,"DeftemplateSlotDefaultValueFunction",NULL);
+   AddUDF(theEnv,"deftemplate-slot-cardinality","*",2,2,"y",DeftemplateSlotCardinalityFunction,"DeftemplateSlotCardinalityFunction",NULL);
+   AddUDF(theEnv,"deftemplate-slot-allowed-values","*",2,2,"y",DeftemplateSlotAllowedValuesFunction,"DeftemplateSlotAllowedValuesFunction",NULL);
+   AddUDF(theEnv,"deftemplate-slot-range","*",2,2,"y",DeftemplateSlotRangeFunction,"DeftemplateSlotRangeFunction",NULL);
+   AddUDF(theEnv,"deftemplate-slot-types","*",2,2,"y",DeftemplateSlotTypesFunction,"DeftemplateSlotTypesFunction",NULL);
+
+   AddUDF(theEnv,"deftemplate-slot-multip","b",2,2,"y",DeftemplateSlotMultiPFunction,"DeftemplateSlotMultiPFunction",NULL);
+   AddUDF(theEnv,"deftemplate-slot-singlep","b",2,2,"y",DeftemplateSlotSinglePFunction,"DeftemplateSlotSinglePFunction",NULL);
+   AddUDF(theEnv,"deftemplate-slot-existp","b",2,2,"y",DeftemplateSlotExistPFunction,"DeftemplateSlotExistPFunction",NULL);
+   AddUDF(theEnv,"deftemplate-slot-defaultp","y",2,2,"y",DeftemplateSlotDefaultPFunction,"DeftemplateSlotDefaultPFunction",NULL);
+
+   AddUDF(theEnv,"deftemplate-slot-facet-existp","b",3,3,"y",DeftemplateSlotFacetExistPFunction,"DeftemplateSlotFacetExistPFunction",NULL);
+
+   AddUDF(theEnv,"deftemplate-slot-facet-value","*",3,3,"y",DeftemplateSlotFacetValueFunction,"DeftemplateSlotFacetValueFunction",NULL);
+
+   FuncSeqOvlFlags(theEnv,"modify",false,false);
+   FuncSeqOvlFlags(theEnv,"duplicate",false,false);
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+
+   AddFunctionParser(theEnv,"modify",ModifyParse);
+   AddFunctionParser(theEnv,"duplicate",DuplicateParse);
+  }
+
+/***************************/
+/* FreeTemplateValueArray: */
+/***************************/
+static void FreeTemplateValueArray(
+  Environment *theEnv,
+  CLIPSValue *theValueArray,
+  Deftemplate *templatePtr)
+  {
+   unsigned short i;
+
+   if (theValueArray == NULL) return;
+
+   for (i = 0; i < templatePtr->numberOfSlots; i++)
+     {
+      if (theValueArray[i].header->type == MULTIFIELD_TYPE)
+        { ReturnMultifield(theEnv,theValueArray[i].multifieldValue); }
+     }
+
+   rm(theEnv,theValueArray,sizeof(CLIPSValue) * templatePtr->numberOfSlots);
+  }
+
+/*************************************************************/
+/* ModifyCommand: H/L access routine for the modify command. */
+/*************************************************************/
+void ModifyCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   long long factNum;
+   Fact *oldFact;
+   struct expr *testPtr;
+   UDFValue computeResult;
+   Deftemplate *templatePtr;
+   struct templateSlot *slotPtr;
+   size_t i;
+   long long position;
+   int replacementCount = 0;
+   bool found;
+   CLIPSValue *theValueArray;
+   char *changeMap;
+
+   /*===================================================*/
+   /* Set the default return value to the symbol FALSE. */
+   /*===================================================*/
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   /*==================================================*/
+   /* Evaluate the first argument which is used to get */
+   /* a pointer to the fact to be modified/duplicated. */
+   /*==================================================*/
+
+   testPtr = GetFirstArgument();
+   IncrementClearReadyLocks(theEnv);
+   EvaluateExpression(theEnv,testPtr,&computeResult);
+   DecrementClearReadyLocks(theEnv);
+
+   /*==============================================================*/
+   /* If an integer is supplied, then treat it as a fact-index and */
+   /* search the fact-list for the fact with that fact-index.      */
+   /*==============================================================*/
+
+   if (computeResult.header->type == INTEGER_TYPE)
+     {
+      factNum = computeResult.integerValue->contents;
+      if (factNum < 0)
+        {
+         ExpectedTypeError2(theEnv,"modify",1);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+
+      oldFact = GetNextFact(theEnv,NULL);
+      while (oldFact != NULL)
+        {
+         if (oldFact->factIndex == factNum)
+           { break; }
+         else
+           { oldFact = oldFact->nextFact; }
+        }
+
+      if (oldFact == NULL)
+        {
+         char tempBuffer[20];
+         gensprintf(tempBuffer,"f-%lld",factNum);
+         CantFindItemErrorMessage(theEnv,"fact",tempBuffer,false);
+         return;
+        }
+     }
+
+   /*==========================================*/
+   /* Otherwise, if a pointer is supplied then */
+   /* no lookup is required.                   */
+   /*==========================================*/
+
+   else if (computeResult.header->type == FACT_ADDRESS_TYPE)
+     { oldFact = computeResult.factValue; }
+
+   /*===========================================*/
+   /* Otherwise, the first argument is invalid. */
+   /*===========================================*/
+
+   else
+     {
+      ExpectedTypeError2(theEnv,"modify",1);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+   /*=====================================*/
+   /* Retracted facts cannot be modified. */
+   /*=====================================*/
+   
+   if (oldFact->garbage)
+     {
+      FactRetractedErrorMessage(theEnv,oldFact);
+      return;
+     }
+     
+   /*==================================*/
+   /* See if it is a deftemplate fact. */
+   /*==================================*/
+
+   templatePtr = oldFact->whichDeftemplate;
+
+   if (templatePtr->implied) return;
+
+   /*========================================================*/
+   /* Create a data object array to hold the updated values. */
+   /*========================================================*/
+   
+   if (templatePtr->numberOfSlots == 0)
+     {
+      theValueArray = NULL;
+      changeMap = NULL;
+     }
+   else
+     {
+      theValueArray = (CLIPSValue *) gm2(theEnv,sizeof(void *) * templatePtr->numberOfSlots);
+      changeMap = (char *) gm2(theEnv,CountToBitMapSize(templatePtr->numberOfSlots));
+      ClearBitString((void *) changeMap,CountToBitMapSize(templatePtr->numberOfSlots));
+     }
+
+   /*================================================================*/
+   /* Duplicate the values from the old fact (skipping multifields). */
+   /*================================================================*/
+
+   for (i = 0; i < oldFact->theProposition.length; i++)
+     { theValueArray[i].voidValue = VoidConstant(theEnv); }
+
+   /*========================*/
+   /* Start replacing slots. */
+   /*========================*/
+
+   testPtr = testPtr->nextArg;
+   while (testPtr != NULL)
+     {
+      /*============================================================*/
+      /* If the slot identifier is an integer, then the slot was    */
+      /* previously identified and its position within the template */
+      /* was stored. Otherwise, the position of the slot within the */
+      /* deftemplate has to be determined by comparing the name of  */
+      /* the slot against the list of slots for the deftemplate.    */
+      /*============================================================*/
+
+      if (testPtr->type == INTEGER_TYPE)
+        { position = testPtr->integerValue->contents; }
+      else
+        {
+         found = false;
+         position = 0;
+         slotPtr = templatePtr->slotList;
+         while (slotPtr != NULL)
+           {
+            if (slotPtr->slotName == testPtr->lexemeValue)
+              {
+               found = true;
+               slotPtr = NULL;
+              }
+            else
+              {
+               slotPtr = slotPtr->next;
+               position++;
+              }
+           }
+
+         if (! found)
+           {
+            InvalidDeftemplateSlotMessage(theEnv,testPtr->lexemeValue->contents,
+                                          templatePtr->header.name->contents,true);
+            SetEvaluationError(theEnv,true);
+            FreeTemplateValueArray(theEnv,theValueArray,templatePtr);
+            if (changeMap != NULL)
+              { rm(theEnv,(void *) changeMap,CountToBitMapSize(templatePtr->numberOfSlots)); }
+            return;
+           }
+        }
+
+      /*===================================================*/
+      /* If a single field slot is being replaced, then... */
+      /*===================================================*/
+
+      if (oldFact->theProposition.contents[position].header->type != MULTIFIELD_TYPE)
+        {
+         /*======================================================*/
+         /* If the list of values to store in the slot is empty  */
+         /* or contains more than one member than an error has   */
+         /* occured because a single field slot can only contain */
+         /* a single value.                                      */
+         /*======================================================*/
+
+         if ((testPtr->argList == NULL) ? true : (testPtr->argList->nextArg != NULL))
+           {
+            MultiIntoSingleFieldSlotError(theEnv,GetNthSlot(templatePtr,position),templatePtr);
+            FreeTemplateValueArray(theEnv,theValueArray,templatePtr);
+            if (changeMap != NULL)
+              { rm(theEnv,(void *) changeMap,CountToBitMapSize(templatePtr->numberOfSlots)); }
+            return;
+           }
+
+         /*===================================================*/
+         /* Evaluate the expression to be stored in the slot. */
+         /*===================================================*/
+
+         IncrementClearReadyLocks(theEnv);
+         EvaluateExpression(theEnv,testPtr->argList,&computeResult);
+         SetEvaluationError(theEnv,false);
+         DecrementClearReadyLocks(theEnv);
+
+         /*====================================================*/
+         /* If the expression evaluated to a multifield value, */
+         /* then an error occured since a multifield value can */
+         /* not be stored in a single field slot.              */
+         /*====================================================*/
+
+         if (computeResult.header->type == MULTIFIELD_TYPE)
+           {
+            MultiIntoSingleFieldSlotError(theEnv,GetNthSlot(templatePtr,position),templatePtr);
+            FreeTemplateValueArray(theEnv,theValueArray,templatePtr);
+            if (changeMap != NULL)
+              { rm(theEnv,(void *) changeMap,CountToBitMapSize(templatePtr->numberOfSlots)); }
+            return;
+           }
+
+         /*=============================*/
+         /* Store the value in the slot */
+         /*=============================*/
+
+         if (oldFact->theProposition.contents[position].value != computeResult.value)
+           {
+            replacementCount++;
+            theValueArray[position].value = computeResult.value;
+            if (changeMap != NULL)
+              { SetBitMap(changeMap,position); }
+           }
+        }
+
+      /*=================================*/
+      /* Else replace a multifield slot. */
+      /*=================================*/
+
+      else
+        {
+         /*======================================*/
+         /* Determine the new value of the slot. */
+         /*======================================*/
+
+         IncrementClearReadyLocks(theEnv);
+         StoreInMultifield(theEnv,&computeResult,testPtr->argList,false);
+         SetEvaluationError(theEnv,false);
+         DecrementClearReadyLocks(theEnv);
+
+         /*=============================*/
+         /* Store the value in the slot */
+         /*=============================*/
+
+         if ((oldFact->theProposition.contents[position].header->type != computeResult.header->type) ||
+             (! MultifieldsEqual((Multifield *) oldFact->theProposition.contents[position].value,(Multifield *) computeResult.value)))
+           {
+            theValueArray[position].value = computeResult.value;
+            replacementCount++;
+            if (changeMap != NULL)
+              { SetBitMap(changeMap,position); }
+           }
+         else
+           { ReturnMultifield(theEnv,computeResult.multifieldValue); }
+        }
+
+      testPtr = testPtr->nextArg;
+     }
+
+   /*==================================*/
+   /* If no slots have changed, then a */
+   /* retract/assert is not performed. */
+   /*==================================*/
+
+   if (replacementCount == 0)
+     {
+      if (theValueArray != NULL)
+        { rm(theEnv,theValueArray,sizeof(void *) * templatePtr->numberOfSlots); }
+      if (changeMap != NULL)
+        { rm(theEnv,(void *) changeMap,CountToBitMapSize(templatePtr->numberOfSlots)); }
+      
+      returnValue->value = oldFact;
+      return;
+     }
+    
+   /*=========================================*/
+   /* Replace the old values with the values. */
+   /*=========================================*/
+   
+   if ((oldFact = ReplaceFact(theEnv,oldFact,theValueArray,changeMap)) != NULL)
+     { returnValue->factValue = oldFact; }
+
+   /*=============================*/
+   /* Free the data object array. */
+   /*=============================*/
+
+   if (theValueArray != NULL)
+     { rm(theEnv,theValueArray,sizeof(void *) * templatePtr->numberOfSlots); }
+
+   if (changeMap != NULL)
+     { rm(theEnv,(void *) changeMap,CountToBitMapSize(templatePtr->numberOfSlots)); }
+
+   return;
+  }
+
+/****************/
+/* ReplaceFact: */
+/****************/
+Fact *ReplaceFact(
+  Environment *theEnv,
+  Fact *oldFact,
+  CLIPSValue *theValueArray,
+  char *changeMap)
+  {
+   size_t i;
+   Fact *theFact;
+   Fact *factListPosition, *templatePosition;
+   
+   /*===============================================*/
+   /* Call registered modify notification functions */
+   /* for the existing version of the fact.         */
+   /*===============================================*/
+
+   if (FactData(theEnv)->ListOfModifyFunctions != NULL)
+     {
+      ModifyCallFunctionItem *theModifyFunction;
+      
+      for (theModifyFunction = FactData(theEnv)->ListOfModifyFunctions;
+           theModifyFunction != NULL;
+           theModifyFunction = theModifyFunction->next)
+        {
+         (*theModifyFunction->func)(theEnv,oldFact,NULL,theModifyFunction->context);
+        }
+     }
+
+   /*==========================================*/
+   /* Remember the position of the fact before */
+   /* it is retracted so this can be restored  */
+   /* when the modified fact is asserted.      */
+   /*==========================================*/
+
+   factListPosition = oldFact->previousFact;
+   templatePosition = oldFact->previousTemplateFact;
+   
+   /*===================*/
+   /* Retract the fact. */
+   /*===================*/
+
+   RetractDriver(theEnv,oldFact,true,changeMap);
+   oldFact->garbage = false;
+
+   /*======================================*/
+   /* Copy the new values to the old fact. */
+   /*======================================*/
+
+   for (i = 0; i < oldFact->theProposition.length; i++)
+     {
+      if (theValueArray[i].voidValue != VoidConstant(theEnv))
+        {
+         AtomDeinstall(theEnv,oldFact->theProposition.contents[i].header->type,oldFact->theProposition.contents[i].value);
+         
+         if (oldFact->theProposition.contents[i].header->type == MULTIFIELD_TYPE)
+           {
+            Multifield *theSegment = oldFact->theProposition.contents[i].multifieldValue;
+            if (theSegment->busyCount == 0)
+              { ReturnMultifield(theEnv,theSegment); }
+            else
+              { AddToMultifieldList(theEnv,theSegment); }
+           }
+
+         oldFact->theProposition.contents[i].value = theValueArray[i].value;
+         
+         AtomInstall(theEnv,oldFact->theProposition.contents[i].header->type,oldFact->theProposition.contents[i].value);
+        }
+     }
+
+   /*======================*/
+   /* Assert the new fact. */
+   /*======================*/
+
+   theFact = AssertDriver(oldFact,oldFact->factIndex,factListPosition,templatePosition,changeMap);
+
+   /*===============================================*/
+   /* Call registered modify notification functions */
+   /* for the new version of the fact.              */
+   /*===============================================*/
+
+   if (FactData(theEnv)->ListOfModifyFunctions != NULL)
+     {
+      ModifyCallFunctionItem *theModifyFunction;
+
+      for (theModifyFunction = FactData(theEnv)->ListOfModifyFunctions;
+           theModifyFunction != NULL;
+           theModifyFunction = theModifyFunction->next)
+        {
+         (*theModifyFunction->func)(theEnv,NULL,theFact,theModifyFunction->context);
+        }
+     }
+     
+   return theFact;
+  }
+
+/*******************************************************************/
+/* DuplicateCommand: H/L access routine for the duplicate command. */
+/*******************************************************************/
+void DuplicateCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   long long factNum;
+   Fact *oldFact, *newFact, *theFact;
+   struct expr *testPtr;
+   UDFValue computeResult;
+   Deftemplate *templatePtr;
+   struct templateSlot *slotPtr;
+   size_t i;
+   long long position;
+   bool found;
+
+   /*===================================================*/
+   /* Set the default return value to the symbol FALSE. */
+   /*===================================================*/
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   /*==================================================*/
+   /* Evaluate the first argument which is used to get */
+   /* a pointer to the fact to be modified/duplicated. */
+   /*==================================================*/
+
+   testPtr = GetFirstArgument();
+   IncrementClearReadyLocks(theEnv);
+   EvaluateExpression(theEnv,testPtr,&computeResult);
+   DecrementClearReadyLocks(theEnv);
+
+   /*==============================================================*/
+   /* If an integer is supplied, then treat it as a fact-index and */
+   /* search the fact-list for the fact with that fact-index.      */
+   /*==============================================================*/
+
+   if (computeResult.header->type == INTEGER_TYPE)
+     {
+      factNum = computeResult.integerValue->contents;
+      if (factNum < 0)
+        {
+         ExpectedTypeError2(theEnv,"duplicate",1);
+         SetEvaluationError(theEnv,true);
+         return;
+        }
+
+      oldFact = GetNextFact(theEnv,NULL);
+      while (oldFact != NULL)
+        {
+         if (oldFact->factIndex == factNum)
+           { break; }
+         else
+           { oldFact = oldFact->nextFact; }
+        }
+
+      if (oldFact == NULL)
+        {
+         char tempBuffer[20];
+         gensprintf(tempBuffer,"f-%lld",factNum);
+         CantFindItemErrorMessage(theEnv,"fact",tempBuffer,false);
+         return;
+        }
+     }
+
+   /*==========================================*/
+   /* Otherwise, if a pointer is supplied then */
+   /* no lookup is required.                   */
+   /*==========================================*/
+
+   else if (computeResult.header->type == FACT_ADDRESS_TYPE)
+     { oldFact = computeResult.factValue; }
+
+   /*===========================================*/
+   /* Otherwise, the first argument is invalid. */
+   /*===========================================*/
+
+   else
+     {
+      ExpectedTypeError2(theEnv,"duplicate",1);
+      SetEvaluationError(theEnv,true);
+      return;
+     }
+
+   /*=======================================*/
+   /* Retracted facts cannot be duplicated. */
+   /*=======================================*/
+   
+   if (oldFact->garbage)
+     {
+      FactRetractedErrorMessage(theEnv,oldFact);
+      return;
+     }
+
+   /*==================================*/
+   /* See if it is a deftemplate fact. */
+   /*==================================*/
+
+   templatePtr = oldFact->whichDeftemplate;
+
+   if (templatePtr->implied) return;
+
+   /*================================================================*/
+   /* Duplicate the values from the old fact (skipping multifields). */
+   /*================================================================*/
+
+   newFact = CreateFactBySize(theEnv,oldFact->theProposition.length);
+   newFact->whichDeftemplate = templatePtr;
+   for (i = 0; i < oldFact->theProposition.length; i++)
+     {
+      if (oldFact->theProposition.contents[i].header->type != MULTIFIELD_TYPE)
+        { newFact->theProposition.contents[i].value = oldFact->theProposition.contents[i].value; }
+      else
+        { newFact->theProposition.contents[i].value = NULL; }
+     }
+
+   /*========================*/
+   /* Start replacing slots. */
+   /*========================*/
+
+   testPtr = testPtr->nextArg;
+   while (testPtr != NULL)
+     {
+      /*============================================================*/
+      /* If the slot identifier is an integer, then the slot was    */
+      /* previously identified and its position within the template */
+      /* was stored. Otherwise, the position of the slot within the */
+      /* deftemplate has to be determined by comparing the name of  */
+      /* the slot against the list of slots for the deftemplate.    */
+      /*============================================================*/
+
+      if (testPtr->type == INTEGER_TYPE)
+        { position = testPtr->integerValue->contents; }
+      else
+        {
+         found = false;
+         position = 0;
+         slotPtr = templatePtr->slotList;
+         while (slotPtr != NULL)
+           {
+            if (slotPtr->slotName == testPtr->lexemeValue)
+              {
+               found = true;
+               slotPtr = NULL;
+              }
+            else
+              {
+               slotPtr = slotPtr->next;
+               position++;
+              }
+           }
+
+         if (! found)
+           {
+            InvalidDeftemplateSlotMessage(theEnv,testPtr->lexemeValue->contents,
+                                          templatePtr->header.name->contents,true);
+            SetEvaluationError(theEnv,true);
+            ReturnFact(theEnv,newFact);
+            return;
+           }
+        }
+
+      /*===================================================*/
+      /* If a single field slot is being replaced, then... */
+      /*===================================================*/
+
+      if (newFact->theProposition.contents[position].value != NULL)
+        {
+         /*======================================================*/
+         /* If the list of values to store in the slot is empty  */
+         /* or contains more than one member than an error has   */
+         /* occured because a single field slot can only contain */
+         /* a single value.                                      */
+         /*======================================================*/
+
+         if ((testPtr->argList == NULL) ? true : (testPtr->argList->nextArg != NULL))
+           {
+            MultiIntoSingleFieldSlotError(theEnv,GetNthSlot(templatePtr,position),templatePtr);
+            ReturnFact(theEnv,newFact);
+            return;
+           }
+
+         /*===================================================*/
+         /* Evaluate the expression to be stored in the slot. */
+         /*===================================================*/
+
+         IncrementClearReadyLocks(theEnv);
+         EvaluateExpression(theEnv,testPtr->argList,&computeResult);
+         SetEvaluationError(theEnv,false);
+         DecrementClearReadyLocks(theEnv);
+
+         /*====================================================*/
+         /* If the expression evaluated to a multifield value, */
+         /* then an error occured since a multifield value can */
+         /* not be stored in a single field slot.              */
+         /*====================================================*/
+
+         if (computeResult.header->type == MULTIFIELD_TYPE)
+           {
+            ReturnFact(theEnv,newFact);
+            MultiIntoSingleFieldSlotError(theEnv,GetNthSlot(templatePtr,position),templatePtr);
+            return;
+           }
+
+         /*=============================*/
+         /* Store the value in the slot */
+         /*=============================*/
+
+         newFact->theProposition.contents[position].value = computeResult.value;
+        }
+
+      /*=================================*/
+      /* Else replace a multifield slot. */
+      /*=================================*/
+
+      else
+        {
+         /*======================================*/
+         /* Determine the new value of the slot. */
+         /*======================================*/
+
+         IncrementClearReadyLocks(theEnv);
+         StoreInMultifield(theEnv,&computeResult,testPtr->argList,false);
+         SetEvaluationError(theEnv,false);
+         DecrementClearReadyLocks(theEnv);
+
+         /*=============================*/
+         /* Store the value in the slot */
+         /*=============================*/
+
+         newFact->theProposition.contents[position].value = computeResult.value;
+        }
+
+      testPtr = testPtr->nextArg;
+     }
+
+   /*=====================================*/
+   /* Copy the multifield values from the */
+   /* old fact that were not replaced.    */
+   /*=====================================*/
+
+   for (i = 0; i < oldFact->theProposition.length; i++)
+     {
+      if ((oldFact->theProposition.contents[i].header->type == MULTIFIELD_TYPE) &&
+          (newFact->theProposition.contents[i].value == NULL))
+
+        {
+         newFact->theProposition.contents[i].value =
+            CopyMultifield(theEnv,oldFact->theProposition.contents[i].multifieldValue);
+        }
+     }
+
+   /*===============================*/
+   /* Perform the duplicate action. */
+   /*===============================*/
+
+   theFact = AssertDriver(newFact,0,NULL,NULL,NULL);
+
+   /*========================================*/
+   /* The asserted fact is the return value. */
+   /*========================================*/
+
+   if (theFact != NULL)
+     {
+      returnValue->begin = 0;
+      returnValue->range = theFact->theProposition.length;
+      returnValue->value = theFact;
+     }
+
+   return;
+  }
+
+/****************************************************/
+/* DeftemplateSlotNamesFunction: H/L access routine */
+/*   for the deftemplate-slot-names function.       */
+/****************************************************/
+void DeftemplateSlotNamesFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   const char *deftemplateName;
+   Deftemplate *theDeftemplate;
+   CLIPSValue cv;
+
+   /*=============================================*/
+   /* Set up the default return value for errors. */
+   /*=============================================*/
+
+   returnValue->value = FalseSymbol(theEnv);
+
+   /*=======================================*/
+   /* Get the reference to the deftemplate. */
+   /*=======================================*/
+
+   deftemplateName = GetConstructName(context,"deftemplate-slot-names","deftemplate name");
+   if (deftemplateName == NULL) return;
+
+   theDeftemplate = FindDeftemplate(theEnv,deftemplateName);
+   if (theDeftemplate == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"deftemplate",deftemplateName,true);
+      return;
+     }
+
+   /*=====================*/
+   /* Get the slot names. */
+   /*=====================*/
+
+   DeftemplateSlotNames(theDeftemplate,&cv);
+   CLIPSToUDFValue(&cv,returnValue);
+  }
+
+/**********************************************/
+/* DeftemplateSlotNames: C access routine for */
+/*   the deftemplate-slot-names function.     */
+/**********************************************/
+void DeftemplateSlotNames(
+  Deftemplate *theDeftemplate,
+  CLIPSValue *returnValue)
+  {
+   Multifield *theList;
+   struct templateSlot *theSlot;
+   unsigned long count;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*===============================================*/
+   /* If we're dealing with an implied deftemplate, */
+   /* then the only slot names is "implied."        */
+   /*===============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      theList = CreateMultifield(theEnv,1);
+      theList->contents[0].lexemeValue = CreateSymbol(theEnv,"implied");
+      returnValue->value = theList;
+      return;
+     }
+
+   /*=================================*/
+   /* Count the number of slot names. */
+   /*=================================*/
+
+   for (count = 0, theSlot = theDeftemplate->slotList;
+        theSlot != NULL;
+        count++, theSlot = theSlot->next)
+     { /* Do Nothing */ }
+
+   /*=============================================================*/
+   /* Create a multifield value in which to store the slot names. */
+   /*=============================================================*/
+
+   theList = CreateMultifield(theEnv,count);
+   returnValue->value = theList;
+
+   /*===============================================*/
+   /* Store the slot names in the multifield value. */
+   /*===============================================*/
+
+   for (count = 0, theSlot = theDeftemplate->slotList;
+        theSlot != NULL;
+        count++, theSlot = theSlot->next)
+     {
+      theList->contents[count].lexemeValue = theSlot->slotName;
+     }
+  }
+
+/*******************************************************/
+/* DeftemplateSlotDefaultPFunction: H/L access routine */
+/*   for the deftemplate-slot-defaultp function.       */
+/*******************************************************/
+void DeftemplateSlotDefaultPFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+   int defaultType;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*===============================*/
+   /* Does the slot have a default? */
+   /*===============================*/
+
+   defaultType = DeftemplateSlotDefaultP(theDeftemplate,slotName->contents);
+
+   if (defaultType == STATIC_DEFAULT)
+     { returnValue->lexemeValue = CreateSymbol(theEnv,"static"); }
+   else if (defaultType == DYNAMIC_DEFAULT)
+     { returnValue->lexemeValue = CreateSymbol(theEnv,"dynamic"); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/*************************************************/
+/* DeftemplateSlotDefaultP: C access routine for */
+/*   the deftemplate-slot-defaultp function.     */
+/*************************************************/
+DefaultType DeftemplateSlotDefaultP(
+  Deftemplate *theDeftemplate,
+  const char *slotName)
+  {
+   struct templateSlot *theSlot;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*==================================================*/
+   /* Make sure the slot exists (the symbol implied is */
+   /* used for the implied slot of an ordered fact).   */
+   /*==================================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (strcmp(slotName,"implied") == 0)
+        {
+         return STATIC_DEFAULT;
+        }
+      else
+        {
+         SetEvaluationError(theEnv,true);
+         InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                       theDeftemplate->header.name->contents,false);
+         return NO_DEFAULT;
+        }
+     }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                    theDeftemplate->header.name->contents,false);
+      return NO_DEFAULT;
+     }
+
+   /*======================================*/
+   /* Return the default type of the slot. */
+   /*======================================*/
+
+   if (theSlot->noDefault)
+     { return NO_DEFAULT; }
+   else if (theSlot->defaultDynamic)
+     { return DYNAMIC_DEFAULT; }
+
+   return STATIC_DEFAULT;
+  }
+
+/*************************************************************/
+/* DeftemplateSlotDefaultValueFunction: H/L access routine   */
+/*   for the deftemplate-slot-default-value function.        */
+/*************************************************************/
+void DeftemplateSlotDefaultValueFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+   CLIPSValue cv;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*=========================================*/
+   /* Get the deftemplate slot default value. */
+   /*=========================================*/
+
+   DeftemplateSlotDefaultValue(theDeftemplate,slotName->contents,&cv);
+   CLIPSToUDFValue(&cv,returnValue);
+  }
+
+/******************************************************/
+/* DeftemplateSlotDefaultValue: C access routine for  */
+/*   the deftemplate-slot-default-value function.     */
+/******************************************************/
+bool DeftemplateSlotDefaultValue(
+  Deftemplate *theDeftemplate,
+  const char *slotName,
+  CLIPSValue *theValue)
+  {
+   struct templateSlot *theSlot;
+   UDFValue tempDO;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*=============================================*/
+   /* Set up the default return value for errors. */
+   /*=============================================*/
+
+   theValue->value = FalseSymbol(theEnv);
+
+   /*==================================================*/
+   /* Make sure the slot exists (the symbol implied is */
+   /* used for the implied slot of an ordered fact).   */
+   /*==================================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (strcmp(slotName,"implied") == 0)
+        {
+         theValue->value = CreateMultifield(theEnv,0L);
+         return true;
+        }
+      else
+        {
+         SetEvaluationError(theEnv,true);
+         InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                       theDeftemplate->header.name->contents,false);
+         return false;
+        }
+     }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                    theDeftemplate->header.name->contents,false);
+      return false;
+     }
+
+   /*=======================================*/
+   /* Return the default value of the slot. */
+   /*=======================================*/
+
+   if (theSlot->noDefault)
+     { theValue->value = CreateSymbol(theEnv,"?NONE"); }
+   else if (DeftemplateSlotDefault(theEnv,theDeftemplate,theSlot,&tempDO,true))
+     {
+      NormalizeMultifield(theEnv,&tempDO);
+      theValue->value = tempDO.value;
+     }
+   else
+     { return false; }
+
+   return true;
+  }
+
+/**********************************************************/
+/* DeftemplateSlotCardinalityFunction: H/L access routine */
+/*   for the deftemplate-slot-cardinality function.       */
+/**********************************************************/
+void DeftemplateSlotCardinalityFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+   CLIPSValue cv;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+
+   /*=======================================*/
+   /* Get the deftemplate slot cardinality. */
+   /*=======================================*/
+
+   DeftemplateSlotCardinality(theDeftemplate,slotName->contents,&cv);
+   CLIPSToUDFValue(&cv,returnValue);
+  }
+
+/****************************************************/
+/* DeftemplateSlotCardinality: C access routine for */
+/*   the deftemplate-slot-cardinality function.     */
+/****************************************************/
+bool DeftemplateSlotCardinality(
+  Deftemplate *theDeftemplate,
+  const char *slotName,
+  CLIPSValue *returnValue)
+  {
+   struct templateSlot *theSlot;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*===============================================*/
+   /* If we're dealing with an implied deftemplate, */
+   /* then the only slot names is "implied."        */
+   /*===============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (strcmp(slotName,"implied") == 0)
+        {
+         returnValue->value = CreateMultifield(theEnv,2L);
+         returnValue->multifieldValue->contents[0].integerValue = SymbolData(theEnv)->Zero;
+         returnValue->multifieldValue->contents[1].lexemeValue = SymbolData(theEnv)->PositiveInfinity;
+         return true;
+        }
+      else
+        {
+         returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+         SetEvaluationError(theEnv,true);
+         InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                       theDeftemplate->header.name->contents,false);
+         return false;
+        }
+     }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     {
+      returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+      SetEvaluationError(theEnv,true);
+      InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                    theDeftemplate->header.name->contents,false);
+      return false;
+     }
+
+   /*=====================================*/
+   /* Return the cardinality of the slot. */
+   /*=====================================*/
+
+   if (theSlot->multislot == 0)
+     {
+      returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+      return true;
+     }
+
+   returnValue->value = CreateMultifield(theEnv,2L);
+
+   if (theSlot->constraints != NULL)
+     {
+      returnValue->multifieldValue->contents[0].value = theSlot->constraints->minFields->value;
+      returnValue->multifieldValue->contents[1].value = theSlot->constraints->maxFields->value;
+     }
+   else
+     {
+      returnValue->multifieldValue->contents[0].integerValue = SymbolData(theEnv)->Zero;
+      returnValue->multifieldValue->contents[1].lexemeValue = SymbolData(theEnv)->PositiveInfinity;
+     }
+     
+   return true;
+  }
+
+/************************************************************/
+/* DeftemplateSlotAllowedValuesFunction: H/L access routine */
+/*   for the deftemplate-slot-allowed-values function.      */
+/************************************************************/
+void DeftemplateSlotAllowedValuesFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+   CLIPSValue result;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+
+   /*==========================================*/
+   /* Get the deftemplate slot allowed values. */
+   /*==========================================*/
+
+   DeftemplateSlotAllowedValues(theDeftemplate,slotName->contents,&result);
+   CLIPSToUDFValue(&result,returnValue);
+  }
+
+/*******************************************************/
+/* DeftemplateSlotAllowedValues: C access routine      */
+/*   for the deftemplate-slot-allowed-values function. */
+/*******************************************************/
+bool DeftemplateSlotAllowedValues(
+  Deftemplate *theDeftemplate,
+  const char *slotName,
+  CLIPSValue *returnValue)
+  {
+   struct templateSlot *theSlot;
+   int i;
+   Expression *theExp;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*===============================================*/
+   /* If we're dealing with an implied deftemplate, */
+   /* then the only slot names is "implied."        */
+   /*===============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (strcmp(slotName,"implied") == 0)
+        {
+         returnValue->value = FalseSymbol(theEnv);
+         return true;
+        }
+      else
+        {
+         returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+         SetEvaluationError(theEnv,true);
+         InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                       theDeftemplate->header.name->contents,false);
+         return false;
+        }
+     }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     {
+      returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+      SetEvaluationError(theEnv,true);
+      InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                    theDeftemplate->header.name->contents,false);
+      return false;
+     }
+
+   /*========================================*/
+   /* Return the allowed values of the slot. */
+   /*========================================*/
+
+   if ((theSlot->constraints != NULL) ? (theSlot->constraints->restrictionList == NULL) : true)
+     {
+      returnValue->value = FalseSymbol(theEnv);
+      return true;
+     }
+
+   returnValue->value = CreateMultifield(theEnv,ExpressionSize(theSlot->constraints->restrictionList));
+   i = 0;
+
+   theExp = theSlot->constraints->restrictionList;
+   while (theExp != NULL)
+     {
+      returnValue->multifieldValue->contents[i].value = theExp->value;
+      theExp = theExp->nextArg;
+      i++;
+     }
+     
+   return true;
+  }
+
+/****************************************************/
+/* DeftemplateSlotRangeFunction: H/L access routine */
+/*   for the deftemplate-slot-range function.       */
+/****************************************************/
+void DeftemplateSlotRangeFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+   CLIPSValue cv;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+
+   /*=================================*/
+   /* Get the deftemplate slot range. */
+   /*=================================*/
+
+   DeftemplateSlotRange(theDeftemplate,slotName->contents,&cv);
+   CLIPSToUDFValue(&cv,returnValue);
+  }
+
+/**********************************************/
+/* DeftemplateSlotRange: C access routine for */
+/*   the deftemplate-slot-range function.     */
+/**********************************************/
+bool DeftemplateSlotRange(
+  Deftemplate *theDeftemplate,
+  const char *slotName,
+  CLIPSValue *returnValue)
+  {
+   struct templateSlot *theSlot;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*===============================================*/
+   /* If we're dealing with an implied deftemplate, */
+   /* then the only slot names is "implied."        */
+   /*===============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (strcmp(slotName,"implied") == 0)
+        {
+         returnValue->value = CreateMultifield(theEnv,2L);
+         returnValue->multifieldValue->contents[0].lexemeValue =
+            SymbolData(theEnv)->NegativeInfinity;
+         returnValue->multifieldValue->contents[1].lexemeValue =
+            SymbolData(theEnv)->PositiveInfinity;
+         return true;
+        }
+      else
+        {
+         returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+         SetEvaluationError(theEnv,true);
+         InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                       theDeftemplate->header.name->contents,false);
+         return false;
+        }
+     }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     {
+      returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+      SetEvaluationError(theEnv,true);
+      InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                    theDeftemplate->header.name->contents,false);
+      return false;
+     }
+
+   /*===============================*/
+   /* Return the range of the slot. */
+   /*===============================*/
+
+   if ((theSlot->constraints == NULL) ? false :
+       (theSlot->constraints->anyAllowed || theSlot->constraints->floatsAllowed ||
+        theSlot->constraints->integersAllowed))
+     {
+      returnValue->value = CreateMultifield(theEnv,2L);
+      returnValue->multifieldValue->contents[0].value = theSlot->constraints->minValue->value;
+      returnValue->multifieldValue->contents[1].value = theSlot->constraints->maxValue->value;
+     }
+   else
+     { returnValue->value = FalseSymbol(theEnv); }
+     
+   return true;
+  }
+
+/****************************************************/
+/* DeftemplateSlotTypesFunction: H/L access routine */
+/*   for the deftemplate-slot-types function.       */
+/****************************************************/
+void DeftemplateSlotTypesFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+   CLIPSValue cv;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      SetMultifieldErrorValue(theEnv,returnValue);
+      return;
+     }
+
+   /*=================================*/
+   /* Get the deftemplate slot types. */
+   /*=================================*/
+
+   DeftemplateSlotTypes(theDeftemplate,slotName->contents,&cv);
+   CLIPSToUDFValue(&cv,returnValue);
+  }
+
+/**********************************************/
+/* DeftemplateSlotTypes: C access routine for */
+/*   the deftemplate-slot-types function.     */
+/**********************************************/
+bool DeftemplateSlotTypes(
+  Deftemplate *theDeftemplate,
+  const char *slotName,
+  CLIPSValue *returnValue)
+  {
+   struct templateSlot *theSlot = NULL;
+   unsigned int numTypes, i;
+   bool allTypes = false;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*===============================================*/
+   /* If we're dealing with an implied deftemplate, */
+   /* then the only slot name is "implied."         */
+   /*===============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (strcmp(slotName,"implied") != 0)
+        {
+         returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+         SetEvaluationError(theEnv,true);
+         InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                       theDeftemplate->header.name->contents,false);
+         return false;
+        }
+     }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     {
+      returnValue->multifieldValue = CreateMultifield(theEnv,0L);
+      SetEvaluationError(theEnv,true);
+      InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                    theDeftemplate->header.name->contents,false);
+      return false;
+     }
+
+   /*==============================================*/
+   /* If the slot has no constraint information or */
+   /* there is no type restriction, then all types */
+   /* are allowed for the slot.                    */
+   /*==============================================*/
+
+   if ((theDeftemplate->implied) ||
+       ((theSlot->constraints != NULL) ? theSlot->constraints->anyAllowed : true))
+     {
+#if OBJECT_SYSTEM
+      numTypes = 8;
+#else
+      numTypes = 6;
+#endif
+      allTypes = true;
+     }
+
+   /*==============================================*/
+   /* Otherwise count the number of types allowed. */
+   /*==============================================*/
+
+   else
+     {
+      numTypes = theSlot->constraints->symbolsAllowed +
+                 theSlot->constraints->stringsAllowed +
+                 theSlot->constraints->floatsAllowed +
+                 theSlot->constraints->integersAllowed +
+                 theSlot->constraints->instanceNamesAllowed +
+                 theSlot->constraints->instanceAddressesAllowed +
+                 theSlot->constraints->externalAddressesAllowed +
+                 theSlot->constraints->factAddressesAllowed;
+     }
+
+   /*========================================*/
+   /* Return the allowed types for the slot. */
+   /*========================================*/
+
+   returnValue->value = CreateMultifield(theEnv,numTypes);
+
+   i = 0;
+
+   if (allTypes || theSlot->constraints->floatsAllowed)
+     {
+      returnValue->multifieldValue->contents[i++].lexemeValue = CreateSymbol(theEnv,"FLOAT");
+     }
+
+   if (allTypes || theSlot->constraints->integersAllowed)
+     {
+      returnValue->multifieldValue->contents[i++].lexemeValue = CreateSymbol(theEnv,"INTEGER");
+     }
+
+   if (allTypes || theSlot->constraints->symbolsAllowed)
+     {
+      returnValue->multifieldValue->contents[i++].lexemeValue = CreateSymbol(theEnv,"SYMBOL");
+     }
+
+   if (allTypes || theSlot->constraints->stringsAllowed)
+     {
+      returnValue->multifieldValue->contents[i++].lexemeValue = CreateSymbol(theEnv,"STRING");
+     }
+
+   if (allTypes || theSlot->constraints->externalAddressesAllowed)
+     {
+      returnValue->multifieldValue->contents[i++].lexemeValue = CreateSymbol(theEnv,"EXTERNAL-ADDRESS");
+     }
+
+   if (allTypes || theSlot->constraints->factAddressesAllowed)
+     {
+      returnValue->multifieldValue->contents[i++].lexemeValue = CreateSymbol(theEnv,"FACT-ADDRESS");
+     }
+
+#if OBJECT_SYSTEM
+   if (allTypes || theSlot->constraints->instanceAddressesAllowed)
+     {
+      returnValue->multifieldValue->contents[i++].lexemeValue = CreateSymbol(theEnv,"INSTANCE-ADDRESS");
+     }
+
+   if (allTypes || theSlot->constraints->instanceNamesAllowed)
+     {
+      returnValue->multifieldValue->contents[i++].lexemeValue = CreateSymbol(theEnv,"INSTANCE-NAME");
+     }
+#endif
+
+   return true;
+  }
+
+/*****************************************************/
+/* DeftemplateSlotMultiPFunction: H/L access routine */
+/*   for the deftemplate-slot-multip function.       */
+/*****************************************************/
+void DeftemplateSlotMultiPFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*================================*/
+   /* Is the slot a multifield slot? */
+   /*================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,DeftemplateSlotMultiP(theDeftemplate,slotName->contents));
+  }
+
+/***********************************************/
+/* DeftemplateSlotMultiP: C access routine for */
+/*   the deftemplate-slot-multip function.     */
+/***********************************************/
+bool DeftemplateSlotMultiP(
+  Deftemplate *theDeftemplate,
+  const char *slotName)
+  {
+   struct templateSlot *theSlot;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*===============================================*/
+   /* If we're dealing with an implied deftemplate, */
+   /* then the only slot names is "implied."        */
+   /*===============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (strcmp(slotName,"implied") == 0)
+        { return true; }
+      else
+        {
+         SetEvaluationError(theEnv,true);
+         InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                       theDeftemplate->header.name->contents,false);
+         return false;
+        }
+     }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                    theDeftemplate->header.name->contents,false);
+      return false;
+     }
+
+   /*================================*/
+   /* Is the slot a multifield slot? */
+   /*================================*/
+
+   return(theSlot->multislot);
+  }
+
+/******************************************************/
+/* DeftemplateSlotSinglePFunction: H/L access routine */
+/*   for the deftemplate-slot-singlep function.       */
+/******************************************************/
+void DeftemplateSlotSinglePFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*==================================*/
+   /* Is the slot a single field slot? */
+   /*==================================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,DeftemplateSlotSingleP(theDeftemplate,slotName->contents));
+  }
+
+/************************************************/
+/* DeftemplateSlotSingleP: C access routine for */
+/*   the deftemplate-slot-singlep function.     */
+/************************************************/
+bool DeftemplateSlotSingleP(
+  Deftemplate *theDeftemplate,
+  const char *slotName)
+  {
+   struct templateSlot *theSlot;
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*===============================================*/
+   /* If we're dealing with an implied deftemplate, */
+   /* then the only slot names is "implied."        */
+   /*===============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (strcmp(slotName,"implied") == 0)
+        { return false; }
+      else
+        {
+         SetEvaluationError(theEnv,true);
+         InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                       theDeftemplate->header.name->contents,false);
+         return false;
+        }
+     }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     {
+      SetEvaluationError(theEnv,true);
+      InvalidDeftemplateSlotMessage(theEnv,slotName,
+                                    theDeftemplate->header.name->contents,false);
+      return false;
+     }
+
+   /*==================================*/
+   /* Is the slot a single field slot? */
+   /*==================================*/
+
+   return(! theSlot->multislot);
+  }
+
+/*****************************************************/
+/* DeftemplateSlotExistPFunction: H/L access routine */
+/*   for the deftemplate-slot-existp function.       */
+/*****************************************************/
+void DeftemplateSlotExistPFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*======================*/
+   /* Does the slot exist? */
+   /*======================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,DeftemplateSlotExistP(theDeftemplate,slotName->contents));
+  }
+
+/***********************************************/
+/* DeftemplateSlotExistP: C access routine for */
+/*   the deftemplate-slot-existp function.     */
+/***********************************************/
+bool DeftemplateSlotExistP(
+  Deftemplate *theDeftemplate,
+  const char *slotName)
+  {
+   Environment *theEnv = theDeftemplate->header.env;
+
+   /*===============================================*/
+   /* If we're dealing with an implied deftemplate, */
+   /* then the only slot names is "implied."        */
+   /*===============================================*/
+
+   if (theDeftemplate->implied)
+     {
+      if (strcmp(slotName,"implied") == 0)
+        { return true; }
+      else
+        { return false; }
+     }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if (FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL) == NULL)
+     { return false; }
+
+   /*==================*/
+   /* The slot exists. */
+   /*==================*/
+
+   return true;
+  }
+
+/**********************************************************/
+/* DeftemplateSlotFacetExistPFunction: H/L access routine */
+/*   for the deftemplate-slot-facet-existp function.      */
+/**********************************************************/
+void DeftemplateSlotFacetExistPFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+   UDFValue facetName;
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*============================*/
+   /* Get the name of the facet. */
+   /*============================*/
+
+   if (! UDFNextArgument(context,SYMBOL_BIT,&facetName))
+     {
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*======================*/
+   /* Does the slot exist? */
+   /*======================*/
+
+   returnValue->lexemeValue = CreateBoolean(theEnv,DeftemplateSlotFacetExistP(theEnv,theDeftemplate,slotName->contents,facetName.lexemeValue->contents));
+  }
+
+/****************************************************/
+/* DeftemplateSlotFacetExistP: C access routine for */
+/*   the deftemplate-slot-facet-existp function.    */
+/****************************************************/
+bool DeftemplateSlotFacetExistP(
+  Environment *theEnv,
+  Deftemplate *theDeftemplate,
+  const char *slotName,
+  const char *facetName)
+  {
+   struct templateSlot *theSlot;
+   CLIPSLexeme *facetHN;
+   struct expr *tempFacet;
+
+   /*=================================================*/
+   /* An implied deftemplate doesn't have any facets. */
+   /*=================================================*/
+
+   if (theDeftemplate->implied)
+     { return false; }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     { return false; }
+
+   /*=======================*/
+   /* Search for the facet. */
+   /*=======================*/
+
+   facetHN = FindSymbolHN(theEnv,facetName,SYMBOL_BIT);
+   for (tempFacet = theSlot->facetList;
+        tempFacet != NULL;
+        tempFacet = tempFacet->nextArg)
+     {
+      if (tempFacet->value == facetHN)
+        { return true; }
+     }
+
+   /*===========================*/
+   /* The facet does not exist. */
+   /*===========================*/
+
+   return false;
+  }
+
+/*********************************************************/
+/* DeftemplateSlotFacetValueFunction: H/L access routine */
+/*   for the deftemplate-slot-facet-value function.      */
+/*********************************************************/
+void DeftemplateSlotFacetValueFunction(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   Deftemplate *theDeftemplate;
+   CLIPSLexeme *slotName;
+   UDFValue facetName;
+
+   /*=============================================*/
+   /* Set up the default return value for errors. */
+   /*=============================================*/
+
+   returnValue->lexemeValue = FalseSymbol(theEnv);
+
+   /*===================================================*/
+   /* Retrieve the deftemplate and slot name arguments. */
+   /*===================================================*/
+
+   slotName = CheckDeftemplateAndSlotArguments(context,&theDeftemplate);
+   if (slotName == NULL)
+     { return; }
+
+   /*============================*/
+   /* Get the name of the facet. */
+   /*============================*/
+
+   if (! UDFNthArgument(context,3,SYMBOL_BIT,&facetName))
+     { return; }
+
+   /*===========================*/
+   /* Retrieve the facet value. */
+   /*===========================*/
+
+   DeftemplateSlotFacetValue(theEnv,theDeftemplate,slotName->contents,facetName.lexemeValue->contents,returnValue);
+  }
+
+/****************************************************/
+/* DeftemplateSlotFacetValue: C access routine      */
+/*   for the deftemplate-slot-facet-value function. */
+/****************************************************/
+bool DeftemplateSlotFacetValue(
+  Environment *theEnv,
+  Deftemplate *theDeftemplate,
+  const char *slotName,
+  const char *facetName,
+  UDFValue *rv)
+  {
+   struct templateSlot *theSlot;
+   CLIPSLexeme *facetHN;
+   struct expr *tempFacet;
+
+   /*=================================================*/
+   /* An implied deftemplate doesn't have any facets. */
+   /*=================================================*/
+
+   if (theDeftemplate->implied)
+     { return false; }
+
+   /*============================================*/
+   /* Otherwise search for the slot name in the  */
+   /* list of slots defined for the deftemplate. */
+   /*============================================*/
+
+   else if ((theSlot = FindSlot(theDeftemplate,CreateSymbol(theEnv,slotName),NULL)) == NULL)
+     { return false; }
+
+   /*=======================*/
+   /* Search for the facet. */
+   /*=======================*/
+
+   facetHN = FindSymbolHN(theEnv,facetName,SYMBOL_BIT);
+   for (tempFacet = theSlot->facetList;
+        tempFacet != NULL;
+        tempFacet = tempFacet->nextArg)
+     {
+      if (tempFacet->value == facetHN)
+        {
+         EvaluateExpression(theEnv,tempFacet->argList,rv);
+         return true;
+        }
+     }
+
+   /*===========================*/
+   /* The facet does not exist. */
+   /*===========================*/
+
+   return false;
+  }
+
+/************************************************************/
+/* CheckDeftemplateAndSlotArguments: Checks the deftemplate */
+/*   and slot arguments for various functions.              */
+/************************************************************/
+static CLIPSLexeme *CheckDeftemplateAndSlotArguments(
+  UDFContext *context,
+  Deftemplate **theDeftemplate)
+  {
+   UDFValue theArg;
+   const char *deftemplateName;
+   Environment *theEnv = context->environment;
+
+   /*=======================================*/
+   /* Get the reference to the deftemplate. */
+   /*=======================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theArg))
+     { return NULL; }
+
+   deftemplateName = theArg.lexemeValue->contents;
+
+   *theDeftemplate = FindDeftemplate(theEnv,deftemplateName);
+   if (*theDeftemplate == NULL)
+     {
+      CantFindItemErrorMessage(theEnv,"deftemplate",deftemplateName,true);
+      return NULL;
+     }
+
+   /*===========================*/
+   /* Get the name of the slot. */
+   /*===========================*/
+
+   if (! UDFNextArgument(context,SYMBOL_BIT,&theArg))
+     { return NULL; }
+
+   return theArg.lexemeValue;
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/***************************************************************/
+/* UpdateModifyDuplicate: Changes the modify/duplicate command */
+/*   found on the RHS of a rule such that the positions of the */
+/*   slots for replacement are stored rather than the slot     */
+/*   name which allows quicker replacement of slots. This      */
+/*   substitution can only take place when the deftemplate     */
+/*   type is known (i.e. if a fact-index is used you don't     */
+/*   know which type of deftemplate is going to be replaced    */
+/*   until you actually do the replacement of slots).          */
+/***************************************************************/
+bool UpdateModifyDuplicate(
+  Environment *theEnv,
+  struct expr *top,
+  const char *name,
+  void *vTheLHS)
+  {
+   struct expr *functionArgs, *tempArg;
+   CLIPSLexeme *templateName;
+   Deftemplate *theDeftemplate;
+   struct templateSlot *slotPtr;
+
+   /*========================================*/
+   /* Determine the fact-address or index to */
+   /* be retracted by the modify command.    */
+   /*========================================*/
+
+   functionArgs = top->argList;
+   if (functionArgs->type == SF_VARIABLE)
+     {
+      if (SearchParsedBindNames(theEnv,functionArgs->lexemeValue) != 0)
+        { return true; }
+      templateName = FindTemplateForFactAddress(functionArgs->lexemeValue,
+                                                (struct lhsParseNode *) vTheLHS);
+      if (templateName == NULL) return true;
+     }
+   else
+     { return true; }
+
+   /*========================================*/
+   /* Make sure that the fact being modified */
+   /* has a corresponding deftemplate.       */
+   /*========================================*/
+
+   theDeftemplate = (Deftemplate *)
+                    LookupConstruct(theEnv,DeftemplateData(theEnv)->DeftemplateConstruct,
+                                    templateName->contents,
+                                    false);
+
+   if (theDeftemplate == NULL) return true;
+
+   if (theDeftemplate->implied) return true;
+
+   /*=============================================================*/
+   /* Make sure all the slot names are valid for the deftemplate. */
+   /*=============================================================*/
+
+   tempArg = functionArgs->nextArg;
+   while (tempArg != NULL)
+     {
+      /*======================*/
+      /* Does the slot exist? */
+      /*======================*/
+
+      if ((slotPtr = FindSlot(theDeftemplate,tempArg->lexemeValue,NULL)) == NULL)
+        {
+         InvalidDeftemplateSlotMessage(theEnv,tempArg->lexemeValue->contents,
+                                       theDeftemplate->header.name->contents,true);
+         return false;
+        }
+
+      /*=========================================================*/
+      /* Is a multifield value being put in a single field slot? */
+      /*=========================================================*/
+
+      if (slotPtr->multislot == false)
+        {
+         if (tempArg->argList == NULL)
+           {
+            SingleFieldSlotCardinalityError(theEnv,slotPtr->slotName->contents);
+            return false;
+           }
+         else if (tempArg->argList->nextArg != NULL)
+           {
+            SingleFieldSlotCardinalityError(theEnv,slotPtr->slotName->contents);
+            return false;
+           }
+         else if (tempArg->argList->type == FCALL)
+           {
+            if ((ExpressionUnknownFunctionType(tempArg->argList) & SINGLEFIELD_BITS) == 0)
+              {
+               SingleFieldSlotCardinalityError(theEnv,slotPtr->slotName->contents);
+               return false;
+              }
+           }
+         else if (tempArg->argList->type == MF_VARIABLE)
+           {
+            SingleFieldSlotCardinalityError(theEnv,slotPtr->slotName->contents);
+            return false;
+           }
+        }
+
+      /*======================================*/
+      /* Are the slot restrictions satisfied? */
+      /*======================================*/
+
+      if (CheckRHSSlotTypes(theEnv,tempArg->argList,slotPtr,name) == 0)
+        return false;
+
+      /*=============================================*/
+      /* Replace the slot with the integer position. */
+      /*=============================================*/
+
+      tempArg->type = INTEGER_TYPE;
+      tempArg->value = CreateInteger(theEnv,(long long) (FindSlotPosition(theDeftemplate,tempArg->lexemeValue) - 1));
+
+      tempArg = tempArg->nextArg;
+     }
+
+   return true;
+  }
+
+/**************************************************/
+/* FindTemplateForFactAddress: Searches for the   */
+/*   deftemplate name associated with the pattern */
+/*   to which a fact address has been bound.      */
+/**************************************************/
+static CLIPSLexeme *FindTemplateForFactAddress(
+  CLIPSLexeme *factAddress,
+  struct lhsParseNode *theLHS)
+  {
+   struct lhsParseNode *thePattern = NULL;
+
+   /*===============================================*/
+   /* Look through the LHS patterns for the pattern */
+   /* which is bound to the fact address used by    */
+   /* the modify/duplicate function.                */
+   /*===============================================*/
+
+   while (theLHS != NULL)
+     {
+      if (theLHS->value == (void *) factAddress)
+        {
+         thePattern = theLHS;
+         theLHS = NULL;
+        }
+      else
+        { theLHS = theLHS->bottom; }
+     }
+
+   if (thePattern == NULL) return NULL;
+
+   /*=====================================*/
+   /* Verify that just a symbol is stored */
+   /* as the first field of the pattern.  */
+   /*=====================================*/
+
+   thePattern = thePattern->right;
+   if ((thePattern->pnType != SF_WILDCARD_NODE) || (thePattern->bottom == NULL))
+     { return NULL; }
+
+   thePattern = thePattern->bottom;
+   if ((thePattern->pnType != SYMBOL_NODE) ||
+            (thePattern->right != NULL) ||
+            (thePattern->bottom != NULL))
+    { return NULL; }
+
+   /*==============================*/
+   /* Return the deftemplate name. */
+   /*==============================*/
+
+   return thePattern->lexemeValue;
+  }
+#endif
+
+/*******************************************/
+/* ModifyParse: Parses the modify command. */
+/*******************************************/
+struct expr *ModifyParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *logicalName)
+  {
+   return ModAndDupParse(theEnv,top,logicalName,"modify");
+  }
+
+/*************************************************/
+/* DuplicateParse: Parses the duplicate command. */
+/*************************************************/
+struct expr *DuplicateParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *logicalName)
+  {
+   return ModAndDupParse(theEnv,top,logicalName,"duplicate");
+  }
+
+/*************************************************************/
+/* ModAndDupParse: Parses the modify and duplicate commands. */
+/*************************************************************/
+static struct expr *ModAndDupParse(
+  Environment *theEnv,
+  struct expr *top,
+  const char *logicalName,
+  const char *name)
+  {
+   bool error = false;
+   struct token theToken;
+   struct expr *nextOne, *tempSlot;
+   struct expr *newField, *firstField, *lastField;
+   bool printError;
+   bool done;
+
+   /*==================================================================*/
+   /* Parse the fact-address or index to the modify/duplicate command. */
+   /*==================================================================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,logicalName,&theToken);
+
+   if ((theToken.tknType == SF_VARIABLE_TOKEN) || (theToken.tknType == GBL_VARIABLE_TOKEN))
+     { nextOne = GenConstant(theEnv,TokenTypeToType(theToken.tknType),theToken.value); }
+   else if (theToken.tknType == INTEGER_TOKEN)
+     { nextOne = GenConstant(theEnv,INTEGER_TYPE,theToken.value); }
+   else if (theToken.tknType == LEFT_PARENTHESIS_TOKEN)
+     {
+      nextOne = Function1Parse(theEnv,logicalName);
+      if (nextOne == NULL)
+        {
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+     }
+   else
+     {
+      ExpectedTypeError2(theEnv,name,1);
+      ReturnExpression(theEnv,top);
+      return NULL;
+     }
+
+   top->argList = nextOne;
+   nextOne = top->argList;
+
+   /*=======================================================*/
+   /* Parse the remaining modify/duplicate slot specifiers. */
+   /*=======================================================*/
+
+   GetToken(theEnv,logicalName,&theToken);
+   while (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,theToken.printForm);
+
+      /*=================================================*/
+      /* Slot definition begins with a left parenthesis. */
+      /*=================================================*/
+
+      if (theToken.tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"duplicate/modify function");
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+
+      /*=================================*/
+      /* The slot name must be a symbol. */
+      /*=================================*/
+
+      GetToken(theEnv,logicalName,&theToken);
+      if (theToken.tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"duplicate/modify function");
+         ReturnExpression(theEnv,top);
+         return NULL;
+        }
+
+      /*=================================*/
+      /* Check for duplicate slot names. */
+      /*=================================*/
+
+      for (tempSlot = top->argList->nextArg;
+           tempSlot != NULL;
+           tempSlot = tempSlot->nextArg)
+        {
+         if (tempSlot->value == theToken.value)
+           {
+            AlreadyParsedErrorMessage(theEnv,"slot ",theToken.lexemeValue->contents);
+            ReturnExpression(theEnv,top);
+            return NULL;
+           }
+        }
+
+      /*=========================================*/
+      /* Add the slot name to the list of slots. */
+      /*=========================================*/
+
+      nextOne->nextArg = GenConstant(theEnv,SYMBOL_TYPE,theToken.value);
+      nextOne = nextOne->nextArg;
+
+      /*====================================================*/
+      /* Get the values to be stored in the specified slot. */
+      /*====================================================*/
+
+      firstField = NULL;
+      lastField = NULL;
+      done = false;
+      while (! done)
+        {
+         SavePPBuffer(theEnv," ");
+         newField = GetAssertArgument(theEnv,logicalName,&theToken,&error,
+                                      RIGHT_PARENTHESIS_TOKEN,false,&printError);
+
+         if (error)
+           {
+            if (printError) SyntaxErrorMessage(theEnv,"deftemplate pattern");
+            ReturnExpression(theEnv,top);
+            return NULL;
+           }
+
+         if (newField == NULL)
+           { done = true; }
+
+         if (lastField == NULL)
+           { firstField = newField; }
+         else
+           { lastField->nextArg = newField; }
+         lastField = newField;
+        }
+
+      /*================================================*/
+      /* Slot definition ends with a right parenthesis. */
+      /*================================================*/
+
+      if (theToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"duplicate/modify function");
+         ReturnExpression(theEnv,top);
+         ReturnExpression(theEnv,firstField);
+         return NULL;
+        }
+      else
+        {
+         PPBackup(theEnv);
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv,")");
+        }
+
+      nextOne->argList = firstField;
+
+      GetToken(theEnv,logicalName,&theToken);
+     }
+
+   /*================================================*/
+   /* Return the parsed modify/duplicate expression. */
+   /*================================================*/
+
+   return top;
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
diff --git a/clips/tmpltfun.h b/clips/tmpltfun.h
new file mode 100755
index 000000000..7b5d819c5
--- /dev/null
+++ b/clips/tmpltfun.h
@@ -0,0 +1,122 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/01/16            */
+   /*                                                     */
+   /*          DEFTEMPLATE FUNCTION HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Correction for FalseSymbol/TrueSymbol. DR0859  */
+/*                                                           */
+/*      6.24: Added deftemplate-slot-names,                  */
+/*            deftemplate-slot-default-value,                */
+/*            deftemplate-slot-cardinality,                  */
+/*            deftemplate-slot-allowed-values,               */
+/*            deftemplate-slot-range,                        */
+/*            deftemplate-slot-types,                        */
+/*            deftemplate-slot-multip,                       */
+/*            deftemplate-slot-singlep,                      */
+/*            deftemplate-slot-existp, and                   */
+/*            deftemplate-slot-defaultp functions.           */
+/*                                                           */
+/*            Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for deftemplate slot facets.           */
+/*                                                           */
+/*            Added deftemplate-slot-facet-existp and        */
+/*            deftemplate-slot-facet-value functions.        */
+/*                                                           */
+/*            Support for long long integers.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Support for modify callback function.          */
+/*                                                           */
+/*            Added additional argument to function          */
+/*            CheckDeftemplateAndSlotArguments to specify    */
+/*            the expected number of arguments.              */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*            Added code to prevent a clear command from     */
+/*            being executed during fact assertions via      */
+/*            Increment/DecrementClearReadyLocks API.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Modify command preserves fact id and address.  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_tmpltfun
+
+#pragma once
+
+#define _H_tmpltfun
+
+#include "expressn.h"
+#include "factmngr.h"
+#include "symbol.h"
+#include "tmpltdef.h"
+
+   bool                           UpdateModifyDuplicate(Environment *,struct expr *,const char *,void *);
+   struct expr                   *ModifyParse(Environment *,struct expr *,const char *);
+   struct expr                   *DuplicateParse(Environment *,struct expr *,const char *);
+   void                           DeftemplateFunctions(Environment *);
+   void                           ModifyCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DuplicateCommand(Environment *,UDFContext *,UDFValue *);
+   void                           DeftemplateSlotNamesFunction(Environment *,UDFContext *,UDFValue *);
+   void                           DeftemplateSlotNames(Deftemplate *,CLIPSValue *);
+   void                           DeftemplateSlotDefaultValueFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotDefaultValue(Deftemplate *,const char *,CLIPSValue *);
+   void                           DeftemplateSlotCardinalityFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotCardinality(Deftemplate *,const char *,CLIPSValue *);
+   void                           DeftemplateSlotAllowedValuesFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotAllowedValues(Deftemplate *,const char *,CLIPSValue *);
+   void                           DeftemplateSlotRangeFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotRange(Deftemplate *,const char *,CLIPSValue *);
+   void                           DeftemplateSlotTypesFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotTypes(Deftemplate *,const char *,CLIPSValue *);
+   void                           DeftemplateSlotMultiPFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotMultiP(Deftemplate *,const char *);
+   void                           DeftemplateSlotSinglePFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotSingleP(Deftemplate *,const char *);
+   void                           DeftemplateSlotExistPFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotExistP(Deftemplate *,const char *);
+   void                           DeftemplateSlotDefaultPFunction(Environment *,UDFContext *,UDFValue *);
+   DefaultType                    DeftemplateSlotDefaultP(Deftemplate *,const char *);
+   void                           DeftemplateSlotFacetExistPFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotFacetExistP(Environment *,Deftemplate *,const char *,const char *);
+   void                           DeftemplateSlotFacetValueFunction(Environment *,UDFContext *,UDFValue *);
+   bool                           DeftemplateSlotFacetValue(Environment *,Deftemplate *,const char *,const char *,UDFValue *);
+   Fact                          *ReplaceFact(Environment *,Fact *,CLIPSValue *,char *);
+
+#endif /* _H_tmpltfun */
+
+
+
+
diff --git a/clips/tmpltlhs.c b/clips/tmpltlhs.c
new file mode 100755
index 000000000..29babef38
--- /dev/null
+++ b/clips/tmpltlhs.c
@@ -0,0 +1,379 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                DEFTEMPLATE LHS MODULE               */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parses LHS deftemplate patterns.                 */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for rete network exists node.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT && (! RUN_TIME) && (! BLOAD_ONLY)
+
+#include <stdio.h>
+#include <string.h>
+
+#include "constant.h"
+#include "constrct.h"
+#include "constrnt.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "factrhs.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pattern.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "reorder.h"
+#include "router.h"
+#include "scanner.h"
+#include "symbol.h"
+#include "tmpltdef.h"
+#include "tmpltutl.h"
+
+#include "tmpltlhs.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static struct lhsParseNode    *GetLHSSlots(Environment *,const char *,struct token *,Deftemplate *,bool *);
+   static struct lhsParseNode    *GetSingleLHSSlot(Environment *,const char *,struct token *,
+                                                   struct templateSlot *,bool *,unsigned short);
+   static bool                    MultiplyDefinedLHSSlots(Environment *,struct lhsParseNode *,CLIPSLexeme *);
+
+/*********************************************/
+/* DeftemplateLHSParse: Parses a LHS pattern */
+/*   that uses the deftemplate format.       */
+/*********************************************/
+struct lhsParseNode *DeftemplateLHSParse(
+  Environment *theEnv,
+  const char *readSource,
+  Deftemplate *theDeftemplate)
+  {
+   struct lhsParseNode *head, *firstSlot;
+   struct token theToken;
+   bool error;
+
+   /*===============================================================*/
+   /* Make sure the deftemplate name is not connected to subfields. */
+   /*===============================================================*/
+
+   GetToken(theEnv,readSource,&theToken);
+   if ((theToken.tknType == OR_CONSTRAINT_TOKEN) ||
+       (theToken.tknType == AND_CONSTRAINT_TOKEN))
+     {
+      SyntaxErrorMessage(theEnv,"deftemplate patterns");
+      return NULL;
+     }
+
+   /*===================================================*/
+   /* Create the pattern node for the deftemplate name. */
+   /*===================================================*/
+
+   head = GetLHSParseNode(theEnv);
+   head->pnType = SF_WILDCARD_NODE;
+   head->negated = false;
+   head->exists = false;
+   head->index = 0;
+   head->slotNumber = 1;
+   head->bottom = GetLHSParseNode(theEnv);
+   head->bottom->pnType = SYMBOL_NODE;
+   head->bottom->negated = false;
+   head->bottom->exists = false;
+   head->bottom->value = theDeftemplate->header.name;
+
+   /*==========================================*/
+   /* Get the other fields in the deftemplate. */
+   /*==========================================*/
+
+   error = false;
+   firstSlot = GetLHSSlots(theEnv,readSource,&theToken,theDeftemplate,&error);
+   if (error)
+     {
+      ReturnLHSParseNodes(theEnv,firstSlot);
+      ReturnLHSParseNodes(theEnv,head);
+      return NULL;
+     }
+
+   /*=========================*/
+   /* Return the LHS pattern. */
+   /*=========================*/
+
+   head->right = firstSlot;
+   return(head);
+  }
+
+/******************************************/
+/* GetLHSSlots: Retrieves all of the slot */
+/*   values used in a LHS pattern.        */
+/******************************************/
+static struct lhsParseNode *GetLHSSlots(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *tempToken,
+  Deftemplate *theDeftemplate,
+  bool *error)
+  {
+   struct lhsParseNode *firstSlot = NULL, *nextSlot, *lastSlot = NULL;
+   struct templateSlot *slotPtr;
+   unsigned short position;
+
+   /*=======================================================*/
+   /* Continue parsing slot definitions until the pattern's */
+   /* closing right parenthesis is encountered.             */
+   /*=======================================================*/
+
+   while (tempToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,tempToken->printForm);
+
+      /*=================================================*/
+      /* Slot definitions begin with a left parenthesis. */
+      /*=================================================*/
+
+      if (tempToken->tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         *error = true;
+         SyntaxErrorMessage(theEnv,"deftemplate patterns");
+         ReturnLHSParseNodes(theEnv,firstSlot);
+         return NULL;
+        }
+
+      /*====================*/
+      /* Get the slot name. */
+      /*====================*/
+
+      GetToken(theEnv,readSource,tempToken);
+      if (tempToken->tknType != SYMBOL_TOKEN)
+        {
+         *error = true;
+         SyntaxErrorMessage(theEnv,"deftemplate patterns");
+         ReturnLHSParseNodes(theEnv,firstSlot);
+         return NULL;
+        }
+
+      /*==========================================================*/
+      /* Determine if the slot name is valid for the deftemplate. */
+      /*==========================================================*/
+
+      if ((slotPtr = FindSlot(theDeftemplate,tempToken->lexemeValue,&position)) == NULL)
+        {
+         *error = true;
+         InvalidDeftemplateSlotMessage(theEnv,tempToken->lexemeValue->contents,
+                                       theDeftemplate->header.name->contents,true);
+         ReturnLHSParseNodes(theEnv,firstSlot);
+         return NULL;
+        }
+
+      /*============================================*/
+      /* Determine if the slot is multiply defined. */
+      /*============================================*/
+
+      if (MultiplyDefinedLHSSlots(theEnv,firstSlot,tempToken->lexemeValue) == true)
+        {
+         *error = true;
+         ReturnLHSParseNodes(theEnv,firstSlot);
+         return NULL;
+        }
+
+      /*==============================================================*/
+      /* Get the pattern matching values used in the slot definition. */
+      /*==============================================================*/
+
+      nextSlot = GetSingleLHSSlot(theEnv,readSource,tempToken,slotPtr,error,position+1);
+      if (*error)
+        {
+         ReturnLHSParseNodes(theEnv,firstSlot);
+         ReturnLHSParseNodes(theEnv,nextSlot);
+         return NULL;
+        }
+
+      /*=====================================*/
+      /* Add the slot definition to the list */
+      /* of slot definitions already parsed. */
+      /*=====================================*/
+
+      if (lastSlot == NULL)
+        { firstSlot = nextSlot; }
+      else
+        { lastSlot->right = nextSlot; }
+
+      while (nextSlot->right != NULL) nextSlot = nextSlot->right;
+      lastSlot = nextSlot;
+
+      /*==============================*/
+      /* Begin parsing the next slot. */
+      /*==============================*/
+
+      GetToken(theEnv,readSource,tempToken);
+     }
+
+   /*===========================================================*/
+   /* Return all the slot definitions found in the lhs pattern. */
+   /*===========================================================*/
+
+   return(firstSlot);
+  }
+
+/*****************************************************/
+/* GetSingleLHSSlot: Get the pattern matching values */
+/*   to be associated with a slot name.              */
+/*****************************************************/
+static struct lhsParseNode *GetSingleLHSSlot(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *tempToken,
+  struct templateSlot *slotPtr,
+  bool *error,
+  unsigned short position)
+  {
+   struct lhsParseNode *nextSlot;
+   CLIPSLexeme *slotName;
+
+   /*================================================*/
+   /* Get the slot name and read in the first token. */
+   /*================================================*/
+
+   slotName = tempToken->lexemeValue;
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,tempToken);
+
+   /*====================================*/
+   /* Get value for a single field slot. */
+   /*====================================*/
+
+   if (slotPtr->multislot == false)
+     {
+      /*=======================*/
+      /* Get the single value. */
+      /*=======================*/
+
+      nextSlot = RestrictionParse(theEnv,readSource,tempToken,false,
+                                  slotPtr->slotName,position,
+                                  slotPtr->constraints,0);
+      if (nextSlot == NULL)
+        {
+         *error = true;
+         return NULL;
+        }
+
+      /*======================================*/
+      /* Multi field wildcards and variables  */
+      /* not allowed in a single field slot.  */
+      /*======================================*/
+
+      if ((nextSlot->pnType == MF_VARIABLE_NODE) ||
+          (nextSlot->pnType == MF_WILDCARD_NODE))
+        {
+         SingleFieldSlotCardinalityError(theEnv,slotPtr->slotName->contents);
+         *error = true;
+         ReturnLHSParseNodes(theEnv,nextSlot);
+         return NULL;
+        }
+     }
+
+   /*===================================*/
+   /* Get values for a multifield slot. */
+   /*===================================*/
+
+   else
+     {
+      nextSlot = RestrictionParse(theEnv,readSource,tempToken,true,slotName,position,
+                                  slotPtr->constraints,1);
+      if (nextSlot == NULL)
+        {
+         *error = true;
+         return NULL;
+        }
+     }
+
+   /*========================================================*/
+   /* The slot definition must end with a right parenthesis. */
+   /*========================================================*/
+
+   if (tempToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,tempToken->printForm);
+      SyntaxErrorMessage(theEnv,"deftemplate patterns");
+      *error = true;
+      ReturnLHSParseNodes(theEnv,nextSlot);
+      return NULL;
+     }
+
+   /*===============================================*/
+   /* Fix the pretty print output if the multifield */
+   /* slot contained no restrictions.               */
+   /*===============================================*/
+
+   if ((nextSlot->bottom == NULL) && slotPtr->multislot)
+     {
+      PPBackup(theEnv);
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv,")");
+     }
+
+   /*=================================*/
+   /* Add the slot values to the slot */
+   /* structure and return it.        */
+   /*=================================*/
+
+   return(nextSlot);
+  }
+
+/******************************************************/
+/* MultiplyDefinedLHSSlots: Determines if a slot name */
+/*   was used more than once in a LHS pattern.        */
+/******************************************************/
+static bool MultiplyDefinedLHSSlots(
+  Environment *theEnv,
+  struct lhsParseNode *theSlots,
+  CLIPSLexeme *slotName)
+  {
+   for (;
+        theSlots != NULL;
+        theSlots = theSlots->right)
+     {
+      if (theSlots->slot == slotName)
+        {
+         AlreadyParsedErrorMessage(theEnv,"slot ",slotName->contents);
+         return true;
+        }
+     }
+
+   return false;
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT && DEFRULE_CONSTRUCT && (! RUN_TIME) && (! BLOAD_ONLY) */
+
+
diff --git a/clips/tmpltlhs.h b/clips/tmpltlhs.h
new file mode 100755
index 000000000..6f106c390
--- /dev/null
+++ b/clips/tmpltlhs.h
@@ -0,0 +1,50 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*              DEFTEMPLATE LHS HEADER FILE            */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Support for rete network exists node.          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_tmpltlhs
+
+#pragma once
+
+#define _H_tmpltlhs
+
+#include "symbol.h"
+#include "tmpltdef.h"
+
+   struct lhsParseNode           *DeftemplateLHSParse(Environment *,const char *,Deftemplate *);
+
+#endif /* _H_tmpltlhs */
+
+
+
+
diff --git a/clips/tmpltpsr.c b/clips/tmpltpsr.c
new file mode 100755
index 000000000..026183801
--- /dev/null
+++ b/clips/tmpltpsr.c
@@ -0,0 +1,819 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/11/16             */
+   /*                                                     */
+   /*              DEFTEMPLATE PARSER MODULE              */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parses the deftemplate construct.                */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Support for deftemplate slot facets.           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Changed find construct functionality so that   */
+/*            imported modules are search when locating a    */
+/*            named construct.                               */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Static constraint checking is always enabled.  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#include <stdio.h>
+#include <string.h>
+
+#if BLOAD || BLOAD_AND_BSAVE
+#include "bload.h"
+#endif
+#include "constant.h"
+#include "constrct.h"
+#include "cstrcpsr.h"
+#include "cstrnchk.h"
+#include "cstrnpsr.h"
+#include "cstrnutl.h"
+#include "default.h"
+#include "envrnmnt.h"
+#include "exprnpsr.h"
+#include "factmngr.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pattern.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "scanner.h"
+#include "symbol.h"
+#include "tmpltbsc.h"
+#include "tmpltdef.h"
+#include "watch.h"
+
+#include "tmpltpsr.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   static struct templateSlot    *SlotDeclarations(Environment *,const char *,struct token *);
+   static struct templateSlot    *ParseSlot(Environment *,const char *,struct token *,struct templateSlot *);
+   static struct templateSlot    *DefinedSlots(Environment *,const char *,CLIPSLexeme *,bool,struct token *);
+   static bool                    ParseFacetAttribute(Environment *,const char *,struct templateSlot *,bool);
+#endif
+
+/*******************************************************/
+/* ParseDeftemplate: Parses the deftemplate construct. */
+/*******************************************************/
+bool ParseDeftemplate(
+  Environment *theEnv,
+  const char *readSource)
+  {
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+   CLIPSLexeme *deftemplateName;
+   Deftemplate *newDeftemplate;
+   struct templateSlot *slots;
+   struct token inputToken;
+
+   /*================================================*/
+   /* Initialize pretty print and error information. */
+   /*================================================*/
+
+   DeftemplateData(theEnv)->DeftemplateError = false;
+   SetPPBufferStatus(theEnv,true);
+   FlushPPBuffer(theEnv);
+   SavePPBuffer(theEnv,"(deftemplate ");
+
+   /*==============================================================*/
+   /* Deftemplates can not be added when a binary image is loaded. */
+   /*==============================================================*/
+
+#if BLOAD || BLOAD_AND_BSAVE
+   if ((Bloaded(theEnv) == true) && (! ConstructData(theEnv)->CheckSyntaxMode))
+     {
+      CannotLoadWithBloadMessage(theEnv,"deftemplate");
+      return true;
+     }
+#endif
+
+   /*=======================================================*/
+   /* Parse the name and comment fields of the deftemplate. */
+   /*=======================================================*/
+
+#if DEBUGGING_FUNCTIONS
+   DeftemplateData(theEnv)->DeletedTemplateDebugFlags = 0;
+#endif
+
+   deftemplateName = GetConstructNameAndComment(theEnv,readSource,&inputToken,"deftemplate",
+                                                (FindConstructFunction *) FindDeftemplateInModule,
+                                                (DeleteConstructFunction *) Undeftemplate,"%",
+                                                true,true,true,false);
+
+   if (deftemplateName == NULL) return true;
+
+   if (ReservedPatternSymbol(theEnv,deftemplateName->contents,"deftemplate"))
+     {
+      ReservedPatternSymbolErrorMsg(theEnv,deftemplateName->contents,"a deftemplate name");
+      return true;
+     }
+
+   /*===========================================*/
+   /* Parse the slot fields of the deftemplate. */
+   /*===========================================*/
+
+   slots = SlotDeclarations(theEnv,readSource,&inputToken);
+   if (DeftemplateData(theEnv)->DeftemplateError == true) return true;
+
+   /*==============================================*/
+   /* If we're only checking syntax, don't add the */
+   /* successfully parsed deftemplate to the KB.   */
+   /*==============================================*/
+
+   if (ConstructData(theEnv)->CheckSyntaxMode)
+     {
+      ReturnSlots(theEnv,slots);
+      return false;
+     }
+
+   /*=====================================*/
+   /* Create a new deftemplate structure. */
+   /*=====================================*/
+
+   newDeftemplate = get_struct(theEnv,deftemplate);
+   newDeftemplate->header.name =  deftemplateName;
+   newDeftemplate->header.next = NULL;
+   newDeftemplate->header.usrData = NULL;
+   newDeftemplate->header.constructType = DEFTEMPLATE;
+   newDeftemplate->header.env = theEnv;
+   newDeftemplate->slotList = slots;
+   newDeftemplate->implied = false;
+   newDeftemplate->numberOfSlots = 0;
+   newDeftemplate->busyCount = 0;
+   newDeftemplate->watch = 0;
+   newDeftemplate->inScope = true;
+   newDeftemplate->patternNetwork = NULL;
+   newDeftemplate->factList = NULL;
+   newDeftemplate->lastFact = NULL;
+   newDeftemplate->header.whichModule = (struct defmoduleItemHeader *)
+                                        GetModuleItem(theEnv,NULL,DeftemplateData(theEnv)->DeftemplateModuleIndex);
+
+   /*================================*/
+   /* Determine the number of slots. */
+   /*================================*/
+
+   while (slots != NULL)
+     {
+      newDeftemplate->numberOfSlots++;
+      slots = slots->next;
+     }
+
+   /*====================================*/
+   /* Store pretty print representation. */
+   /*====================================*/
+
+   if (GetConserveMemory(theEnv) == true)
+     { newDeftemplate->header.ppForm = NULL; }
+   else
+     { newDeftemplate->header.ppForm = CopyPPBuffer(theEnv); }
+
+   /*=======================================================================*/
+   /* If a template is redefined, then we want to restore its watch status. */
+   /*=======================================================================*/
+
+#if DEBUGGING_FUNCTIONS
+   if ((BitwiseTest(DeftemplateData(theEnv)->DeletedTemplateDebugFlags,0)) ||
+       (GetWatchItem(theEnv,"facts") == 1))
+     { DeftemplateSetWatch(newDeftemplate,true); }
+#endif
+
+   /*==============================================*/
+   /* Add deftemplate to the list of deftemplates. */
+   /*==============================================*/
+
+   AddConstructToModule(&newDeftemplate->header);
+
+   InstallDeftemplate(theEnv,newDeftemplate);
+
+#else
+#if MAC_XCD
+#pragma unused(theEnv)
+#endif
+#endif
+
+   return false;
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/**************************************************************/
+/* InstallDeftemplate: Increments all occurrences in the hash */
+/*   table of symbols found in an deftemplate and adds it to  */
+/*   the hash table.                                          */
+/**************************************************************/
+void InstallDeftemplate(
+  Environment *theEnv,
+  Deftemplate *theDeftemplate)
+  {
+   struct templateSlot *slotPtr;
+   struct expr *tempExpr;
+
+   IncrementLexemeCount(theDeftemplate->header.name);
+
+   for (slotPtr = theDeftemplate->slotList;
+        slotPtr != NULL;
+        slotPtr = slotPtr->next)
+     {
+      IncrementLexemeCount(slotPtr->slotName);
+      tempExpr = AddHashedExpression(theEnv,slotPtr->defaultList);
+      ReturnExpression(theEnv,slotPtr->defaultList);
+      slotPtr->defaultList = tempExpr;
+      tempExpr = AddHashedExpression(theEnv,slotPtr->facetList);
+      ReturnExpression(theEnv,slotPtr->facetList);
+      slotPtr->facetList = tempExpr;
+      slotPtr->constraints = AddConstraint(theEnv,slotPtr->constraints);
+     }
+  }
+
+/********************************************************************/
+/* SlotDeclarations: Parses the slot declarations of a deftemplate. */
+/********************************************************************/
+static struct templateSlot *SlotDeclarations(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *inputToken)
+  {
+   struct templateSlot *newSlot, *slotList = NULL, *lastSlot = NULL;
+   struct templateSlot *multiSlot = NULL;
+
+   while (inputToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      /*====================================================*/
+      /* Slots begin with a '(' followed by a slot keyword. */
+      /*====================================================*/
+
+      if (inputToken->tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"deftemplate");
+         ReturnSlots(theEnv,slotList);
+         ReturnSlots(theEnv,multiSlot);
+         DeftemplateData(theEnv)->DeftemplateError = true;
+         return NULL;
+        }
+
+      GetToken(theEnv,readSource,inputToken);
+      if (inputToken->tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"deftemplate");
+         ReturnSlots(theEnv,slotList);
+         ReturnSlots(theEnv,multiSlot);
+         DeftemplateData(theEnv)->DeftemplateError = true;
+         return NULL;
+        }
+
+      /*=================*/
+      /* Parse the slot. */
+      /*=================*/
+
+      newSlot = ParseSlot(theEnv,readSource,inputToken,slotList);
+      if (DeftemplateData(theEnv)->DeftemplateError == true)
+        {
+         ReturnSlots(theEnv,newSlot);
+         ReturnSlots(theEnv,slotList);
+         ReturnSlots(theEnv,multiSlot);
+         return NULL;
+        }
+
+      /*===========================================*/
+      /* Attach the new slot to the list of slots. */
+      /*===========================================*/
+
+      if (newSlot != NULL)
+        {
+         if (lastSlot == NULL)
+           { slotList = newSlot; }
+         else
+           { lastSlot->next = newSlot; }
+         lastSlot = newSlot;
+        }
+
+      /*================================*/
+      /* Check for closing parenthesis. */
+      /*================================*/
+
+      GetToken(theEnv,readSource,inputToken);
+      if (inputToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+        {
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv,"\n   ");
+         SavePPBuffer(theEnv,inputToken->printForm);
+        }
+     }
+
+  SavePPBuffer(theEnv,"\n");
+
+  /*=======================*/
+  /* Return the slot list. */
+  /*=======================*/
+
+  return(slotList);
+ }
+
+/*****************************************************/
+/* ParseSlot: Parses a single slot of a deftemplate. */
+/*****************************************************/
+static struct templateSlot *ParseSlot(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *inputToken,
+  struct templateSlot *slotList)
+  {
+   bool parsingMultislot;
+   CLIPSLexeme *slotName;
+   struct templateSlot *newSlot;
+   ConstraintViolationType rv;
+
+   /*=====================================================*/
+   /* Slots must  begin with keyword field or multifield. */
+   /*=====================================================*/
+
+   if ((strcmp(inputToken->lexemeValue->contents,"field") != 0) &&
+       (strcmp(inputToken->lexemeValue->contents,"multifield") != 0) &&
+       (strcmp(inputToken->lexemeValue->contents,"slot") != 0) &&
+       (strcmp(inputToken->lexemeValue->contents,"multislot") != 0))
+     {
+      SyntaxErrorMessage(theEnv,"deftemplate");
+      DeftemplateData(theEnv)->DeftemplateError = true;
+      return NULL;
+     }
+
+   /*===============================================*/
+   /* Determine if multifield slot is being parsed. */
+   /*===============================================*/
+
+   if ((strcmp(inputToken->lexemeValue->contents,"multifield") == 0) ||
+       (strcmp(inputToken->lexemeValue->contents,"multislot") == 0))
+     { parsingMultislot = true; }
+   else
+     { parsingMultislot = false; }
+
+   /*========================================*/
+   /* The name of the slot must be a symbol. */
+   /*========================================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,inputToken);
+   if (inputToken->tknType != SYMBOL_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"deftemplate");
+      DeftemplateData(theEnv)->DeftemplateError = true;
+      return NULL;
+     }
+
+   slotName = inputToken->lexemeValue;
+
+   /*================================================*/
+   /* Determine if the slot has already been parsed. */
+   /*================================================*/
+
+   while (slotList != NULL)
+     {
+      if (slotList->slotName == slotName)
+        {
+         AlreadyParsedErrorMessage(theEnv,"slot ",slotList->slotName->contents);
+         DeftemplateData(theEnv)->DeftemplateError = true;
+         return NULL;
+        }
+
+      slotList = slotList->next;
+     }
+
+   /*===================================*/
+   /* Parse the attributes of the slot. */
+   /*===================================*/
+
+   newSlot = DefinedSlots(theEnv,readSource,slotName,parsingMultislot,inputToken);
+   if (newSlot == NULL)
+     {
+      DeftemplateData(theEnv)->DeftemplateError = true;
+      return NULL;
+     }
+
+   /*=================================*/
+   /* Check for slot conflict errors. */
+   /*=================================*/
+
+   if (CheckConstraintParseConflicts(theEnv,newSlot->constraints) == false)
+     {
+      ReturnSlots(theEnv,newSlot);
+      DeftemplateData(theEnv)->DeftemplateError = true;
+      return NULL;
+     }
+
+   if ((newSlot->defaultPresent) || (newSlot->defaultDynamic))
+     { rv = ConstraintCheckExpressionChain(theEnv,newSlot->defaultList,newSlot->constraints); }
+   else
+     { rv = NO_VIOLATION; }
+
+   if (rv != NO_VIOLATION)
+     {
+      const char *temp;
+      if (newSlot->defaultDynamic) temp = "the default-dynamic attribute";
+      else temp = "the default attribute";
+      ConstraintViolationErrorMessage(theEnv,"An expression",temp,false,0,
+                                      newSlot->slotName,0,rv,newSlot->constraints,true);
+      ReturnSlots(theEnv,newSlot);
+      DeftemplateData(theEnv)->DeftemplateError = true;
+      return NULL;
+     }
+
+   /*==================*/
+   /* Return the slot. */
+   /*==================*/
+
+   return(newSlot);
+  }
+
+/**************************************************************/
+/* DefinedSlots: Parses a field or multifield slot attribute. */
+/**************************************************************/
+static struct templateSlot *DefinedSlots(
+  Environment *theEnv,
+  const char *readSource,
+  CLIPSLexeme *slotName,
+  bool multifieldSlot,
+  struct token *inputToken)
+  {
+   struct templateSlot *newSlot;
+   struct expr *defaultList;
+   bool defaultFound = false;
+   bool noneSpecified, deriveSpecified;
+   CONSTRAINT_PARSE_RECORD parsedConstraints;
+
+   /*===========================*/
+   /* Build the slot container. */
+   /*===========================*/
+
+   newSlot = get_struct(theEnv,templateSlot);
+   newSlot->slotName = slotName;
+   newSlot->defaultList = NULL;
+   newSlot->facetList = NULL;
+   newSlot->constraints = GetConstraintRecord(theEnv);
+   if (multifieldSlot)
+     { newSlot->constraints->multifieldsAllowed = true; }
+   newSlot->multislot = multifieldSlot;
+   newSlot->noDefault = false;
+   newSlot->defaultPresent = false;
+   newSlot->defaultDynamic = false;
+   newSlot->next = NULL;
+
+   /*========================================*/
+   /* Parse the primitive slot if it exists. */
+   /*========================================*/
+
+   InitializeConstraintParseRecord(&parsedConstraints);
+   GetToken(theEnv,readSource,inputToken);
+
+   while (inputToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      PPBackup(theEnv);
+      SavePPBuffer(theEnv," ");
+      SavePPBuffer(theEnv,inputToken->printForm);
+
+      /*================================================*/
+      /* Slot attributes begin with a left parenthesis. */
+      /*================================================*/
+
+      if (inputToken->tknType != LEFT_PARENTHESIS_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"deftemplate");
+         ReturnSlots(theEnv,newSlot);
+         DeftemplateData(theEnv)->DeftemplateError = true;
+         return NULL;
+        }
+
+      /*=============================================*/
+      /* The name of the attribute must be a symbol. */
+      /*=============================================*/
+
+      GetToken(theEnv,readSource,inputToken);
+      if (inputToken->tknType != SYMBOL_TOKEN)
+        {
+         SyntaxErrorMessage(theEnv,"deftemplate");
+         ReturnSlots(theEnv,newSlot);
+         DeftemplateData(theEnv)->DeftemplateError = true;
+         return NULL;
+        }
+
+      /*================================================================*/
+      /* Determine if the attribute is one of the standard constraints. */
+      /*================================================================*/
+
+      if (StandardConstraint(inputToken->lexemeValue->contents))
+        {
+         if (ParseStandardConstraint(theEnv,readSource,(inputToken->lexemeValue->contents),
+                                     newSlot->constraints,&parsedConstraints,
+                                     multifieldSlot) == false)
+           {
+            DeftemplateData(theEnv)->DeftemplateError = true;
+            ReturnSlots(theEnv,newSlot);
+            return NULL;
+           }
+        }
+
+      /*=================================================*/
+      /* else if the attribute is the default attribute, */
+      /* then get the default list for this slot.        */
+      /*=================================================*/
+
+      else if ((strcmp(inputToken->lexemeValue->contents,"default") == 0) ||
+               (strcmp(inputToken->lexemeValue->contents,"default-dynamic") == 0))
+        {
+         /*======================================================*/
+         /* Check to see if the default has already been parsed. */
+         /*======================================================*/
+
+         if (defaultFound)
+           {
+            AlreadyParsedErrorMessage(theEnv,"default attribute",NULL);
+            DeftemplateData(theEnv)->DeftemplateError = true;
+            ReturnSlots(theEnv,newSlot);
+            return NULL;
+           }
+
+         newSlot->noDefault = false;
+
+         /*=====================================================*/
+         /* Determine whether the default is dynamic or static. */
+         /*=====================================================*/
+
+         if (strcmp(inputToken->lexemeValue->contents,"default") == 0)
+           {
+            newSlot->defaultPresent = true;
+            newSlot->defaultDynamic = false;
+           }
+         else
+           {
+            newSlot->defaultPresent = false;
+            newSlot->defaultDynamic = true;
+           }
+
+         /*===================================*/
+         /* Parse the list of default values. */
+         /*===================================*/
+
+         defaultList = ParseDefault(theEnv,readSource,multifieldSlot,newSlot->defaultDynamic,
+                                  true,&noneSpecified,&deriveSpecified,&DeftemplateData(theEnv)->DeftemplateError);
+         if (DeftemplateData(theEnv)->DeftemplateError == true)
+           {
+            ReturnSlots(theEnv,newSlot);
+            return NULL;
+           }
+
+         /*==================================*/
+         /* Store the default with the slot. */
+         /*==================================*/
+
+         defaultFound = true;
+         if (deriveSpecified) newSlot->defaultPresent = false;
+         else if (noneSpecified)
+           {
+            newSlot->noDefault = true;
+            newSlot->defaultPresent = false;
+           }
+         newSlot->defaultList = defaultList;
+        }
+
+      /*===============================================*/
+      /* else if the attribute is the facet attribute. */
+      /*===============================================*/
+
+      else if (strcmp(inputToken->lexemeValue->contents,"facet") == 0)
+        {
+         if (! ParseFacetAttribute(theEnv,readSource,newSlot,false))
+           {
+            ReturnSlots(theEnv,newSlot);
+            DeftemplateData(theEnv)->DeftemplateError = true;
+            return NULL;
+           }
+        }
+
+      else if (strcmp(inputToken->lexemeValue->contents,"multifacet") == 0)
+        {
+         if (! ParseFacetAttribute(theEnv,readSource,newSlot,true))
+           {
+            ReturnSlots(theEnv,newSlot);
+            DeftemplateData(theEnv)->DeftemplateError = true;
+            return NULL;
+           }
+        }
+
+      /*============================================*/
+      /* Otherwise the attribute is an invalid one. */
+      /*============================================*/
+
+      else
+        {
+         SyntaxErrorMessage(theEnv,"slot attributes");
+         ReturnSlots(theEnv,newSlot);
+         DeftemplateData(theEnv)->DeftemplateError = true;
+         return NULL;
+        }
+
+      /*===================================*/
+      /* Begin parsing the next attribute. */
+      /*===================================*/
+
+      GetToken(theEnv,readSource,inputToken);
+     }
+
+   /*============================*/
+   /* Return the attribute list. */
+   /*============================*/
+
+   return(newSlot);
+  }
+
+/***************************************************/
+/* ParseFacetAttribute: Parses the type attribute. */
+/***************************************************/
+static bool ParseFacetAttribute(
+  Environment *theEnv,
+  const char *readSource,
+  struct templateSlot *theSlot,
+  bool multifacet)
+  {
+   struct token inputToken;
+   CLIPSLexeme *facetName;
+   struct expr *facetPair, *tempFacet, *facetValue = NULL, *lastValue = NULL;
+
+   /*==============================*/
+   /* Parse the name of the facet. */
+   /*==============================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,&inputToken);
+
+   /*==================================*/
+   /* The facet name must be a symbol. */
+   /*==================================*/
+
+   if (inputToken.tknType != SYMBOL_TOKEN)
+     {
+      if (multifacet) SyntaxErrorMessage(theEnv,"multifacet attribute");
+      else SyntaxErrorMessage(theEnv,"facet attribute");
+      return false;
+     }
+
+   facetName = inputToken.lexemeValue;
+
+   /*===================================*/
+   /* Don't allow facets with the same  */
+   /* name as a predefined CLIPS facet. */
+   /*===================================*/
+
+   /*====================================*/
+   /* Has the facet already been parsed? */
+   /*====================================*/
+
+   for (tempFacet = theSlot->facetList;
+        tempFacet != NULL;
+        tempFacet = tempFacet->nextArg)
+     {
+      if (tempFacet->value == facetName)
+        {
+         if (multifacet) AlreadyParsedErrorMessage(theEnv,"multifacet ",facetName->contents);
+         else AlreadyParsedErrorMessage(theEnv,"facet ",facetName->contents);
+         return false;
+        }
+     }
+
+   /*===============================*/
+   /* Parse the value of the facet. */
+   /*===============================*/
+
+   SavePPBuffer(theEnv," ");
+   GetToken(theEnv,readSource,&inputToken);
+
+   while (inputToken.tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      /*=====================================*/
+      /* The facet value must be a constant. */
+      /*=====================================*/
+
+      if (! ConstantType(TokenTypeToType(inputToken.tknType)))
+        {
+         if (multifacet) SyntaxErrorMessage(theEnv,"multifacet attribute");
+         else SyntaxErrorMessage(theEnv,"facet attribute");
+         ReturnExpression(theEnv,facetValue);
+         return false;
+        }
+
+      /*======================================*/
+      /* Add the value to the list of values. */
+      /*======================================*/
+
+      if (lastValue == NULL)
+        {
+         facetValue = GenConstant(theEnv,TokenTypeToType(inputToken.tknType),inputToken.value);
+         lastValue = facetValue;
+        }
+      else
+        {
+         lastValue->nextArg = GenConstant(theEnv,TokenTypeToType(inputToken.tknType),inputToken.value);
+         lastValue = lastValue->nextArg;
+        }
+
+      /*=====================*/
+      /* Get the next token. */
+      /*=====================*/
+
+      SavePPBuffer(theEnv," ");
+      GetToken(theEnv,readSource,&inputToken);
+
+      /*===============================================*/
+      /* A facet can't contain more than one constant. */
+      /*===============================================*/
+
+      if ((! multifacet) && (inputToken.tknType != RIGHT_PARENTHESIS_TOKEN))
+        {
+         SyntaxErrorMessage(theEnv,"facet attribute");
+         ReturnExpression(theEnv,facetValue);
+         return false;
+        }
+     }
+
+   /*========================================================*/
+   /* Remove the space before the closing right parenthesis. */
+   /*========================================================*/
+
+   PPBackup(theEnv);
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv,")");
+
+   /*====================================*/
+   /* A facet must contain one constant. */
+   /*====================================*/
+
+   if ((! multifacet) && (facetValue == NULL))
+     {
+      SyntaxErrorMessage(theEnv,"facet attribute");
+      return false;
+     }
+
+   /*=================================================*/
+   /* Add the facet to the list of the slot's facets. */
+   /*=================================================*/
+
+   facetPair = GenConstant(theEnv,SYMBOL_TYPE,facetName);
+
+   if (multifacet)
+     {
+      facetPair->argList = GenConstant(theEnv,FCALL,FindFunction(theEnv,"create$"));
+      facetPair->argList->argList = facetValue;
+     }
+   else
+     { facetPair->argList = facetValue; }
+
+   facetPair->nextArg = theSlot->facetList;
+   theSlot->facetList = facetPair;
+
+   /*===============================================*/
+   /* The facet/multifacet was successfully parsed. */
+   /*===============================================*/
+
+   return true;
+  }
+
+#endif /* (! RUN_TIME) && (! BLOAD_ONLY) */
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
+
diff --git a/clips/tmpltpsr.h b/clips/tmpltpsr.h
new file mode 100755
index 000000000..ee0c0f828
--- /dev/null
+++ b/clips/tmpltpsr.h
@@ -0,0 +1,59 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*            DEFTEMPLATE PARSER HEADER FILE           */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW and       */
+/*            MAC_MCW).                                      */
+/*                                                           */
+/*            GetConstructNameAndComment API change.         */
+/*                                                           */
+/*            Support for deftemplate slot facets.           */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_tmpltpsr
+
+#pragma once
+
+#define _H_tmpltpsr
+
+#include "symbol.h"
+#include "tmpltdef.h"
+
+   bool                           ParseDeftemplate(Environment *,const char *);
+   void                           InstallDeftemplate(Environment *,Deftemplate *);
+
+#endif /* _H_tmpltpsr */
+
+
+
diff --git a/clips/tmpltrhs.c b/clips/tmpltrhs.c
new file mode 100755
index 000000000..a7323e610
--- /dev/null
+++ b/clips/tmpltrhs.c
@@ -0,0 +1,588 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*          DEFTEMPLATE RHS PARSING HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Parses deftemplate fact patterns used with the   */
+/*   assert function.                                        */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added additional argument required for         */
+/*            DeriveDefaultFromConstraints.                  */
+/*                                                           */
+/*            Added additional argument required for         */
+/*            InvalidDeftemplateSlotMessage.                 */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#include <stdio.h>
+
+#include "default.h"
+#include "extnfunc.h"
+#include "factrhs.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "pprint.h"
+#include "prntutil.h"
+#include "router.h"
+#include "tmpltdef.h"
+#include "tmpltfun.h"
+#include "tmpltlhs.h"
+#include "tmpltutl.h"
+
+#include "tmpltrhs.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static struct expr            *ParseAssertSlotValues(Environment *,const char *,struct token *,struct templateSlot *,bool *,bool);
+   static struct expr            *ReorderAssertSlotValues(Environment *,struct templateSlot *,struct expr *,bool *);
+   static struct expr            *GetSlotAssertValues(Environment *,struct templateSlot *,struct expr *,bool *);
+   static struct expr            *FindAssertSlotItem(struct templateSlot *,struct expr *);
+   static struct templateSlot    *ParseSlotLabel(Environment *,const char *,struct token *,Deftemplate *,bool *,TokenType);
+
+/******************************************************************/
+/* ParseAssertTemplate: Parses and builds the list of values that */
+/*   are used for an assert of a fact with a deftemplate.         */
+/******************************************************************/
+struct expr *ParseAssertTemplate(
+  Environment *theEnv,
+  const char *readSource,
+  struct token *theToken,
+  bool *error,
+  TokenType endType,
+  bool constantsOnly,
+  Deftemplate *theDeftemplate)
+  {
+   struct expr *firstSlot, *lastSlot, *nextSlot;
+   struct expr *firstArg, *tempSlot;
+   struct templateSlot *slotPtr;
+
+   firstSlot = NULL;
+   lastSlot = NULL;
+
+   /*==============================================*/
+   /* Parse each of the slot fields in the assert. */
+   /*==============================================*/
+
+   while ((slotPtr = ParseSlotLabel(theEnv,readSource,theToken,theDeftemplate,error,endType)) != NULL)
+     {
+      /*========================================================*/
+      /* Check to see that the slot hasn't already been parsed. */
+      /*========================================================*/
+
+      for (tempSlot = firstSlot;
+           tempSlot != NULL;
+           tempSlot = tempSlot->nextArg)
+        {
+         if (tempSlot->value == (void *) slotPtr->slotName)
+           {
+            AlreadyParsedErrorMessage(theEnv,"slot ",slotPtr->slotName->contents);
+            *error = true;
+            ReturnExpression(theEnv,firstSlot);
+            return NULL;
+           }
+        }
+
+      /*============================================*/
+      /* Parse the values to be stored in the slot. */
+      /*============================================*/
+
+      nextSlot = ParseAssertSlotValues(theEnv,readSource,theToken,
+                                       slotPtr,error,constantsOnly);
+
+      if (*error)
+        {
+         ReturnExpression(theEnv,firstSlot);
+         return NULL;
+        }
+
+      /*============================================*/
+      /* Check to see if the values to be stored in */
+      /* the slot violate the slot's constraints.   */
+      /*============================================*/
+
+      if (CheckRHSSlotTypes(theEnv,nextSlot->argList,slotPtr,"assert") == 0)
+        {
+         *error = true;
+         ReturnExpression(theEnv,firstSlot);
+         ReturnExpression(theEnv,nextSlot);
+         return NULL;
+        }
+
+      /*===================================================*/
+      /* Add the slot to the list of slots already parsed. */
+      /*===================================================*/
+
+      if (lastSlot == NULL)
+        { firstSlot = nextSlot; }
+      else
+        { lastSlot->nextArg = nextSlot; }
+
+      lastSlot = nextSlot;
+     }
+
+   /*=================================================*/
+   /* Return if an error occured parsing a slot name. */
+   /*=================================================*/
+
+   if (*error)
+     {
+      ReturnExpression(theEnv,firstSlot);
+      return NULL;
+     }
+
+   /*=============================================================*/
+   /* Reorder the arguments to the order used by the deftemplate. */
+   /*=============================================================*/
+
+   firstArg = ReorderAssertSlotValues(theEnv,theDeftemplate->slotList,firstSlot,error);
+   ReturnExpression(theEnv,firstSlot);
+
+   /*==============================*/
+   /* Return the assert arguments. */
+   /*==============================*/
+
+   return(firstArg);
+  }
+
+/****************************************************************/
+/* ParseSlotLabel: Parses the beginning of a slot definition.   */
+/*   Checks for opening left parenthesis and a valid slot name. */
+/****************************************************************/
+static struct templateSlot *ParseSlotLabel(
+  Environment *theEnv,
+  const char *inputSource,
+  struct token *tempToken,
+  Deftemplate *theDeftemplate,
+  bool *error,
+  TokenType endType)
+  {
+   struct templateSlot *slotPtr;
+
+   /*========================*/
+   /* Initialize error flag. */
+   /*========================*/
+
+   *error = false;
+
+   /*============================================*/
+   /* If token is a right parenthesis, then fact */
+   /* template definition is complete.           */
+   /*============================================*/
+
+   GetToken(theEnv,inputSource,tempToken);
+   if (tempToken->tknType == endType)
+     { return NULL; }
+
+   /*=======================================*/
+   /* Put a space between the template name */
+   /* and the first slot definition.        */
+   /*=======================================*/
+
+   PPBackup(theEnv);
+   SavePPBuffer(theEnv," ");
+   SavePPBuffer(theEnv,tempToken->printForm);
+
+   /*=======================================================*/
+   /* Slot definition begins with opening left parenthesis. */
+   /*=======================================================*/
+
+   if (tempToken->tknType != LEFT_PARENTHESIS_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"deftemplate pattern");
+      *error = true;
+      return NULL;
+     }
+
+   /*=============================*/
+   /* Slot name must be a symbol. */
+   /*=============================*/
+
+   GetToken(theEnv,inputSource,tempToken);
+   if (tempToken->tknType != SYMBOL_TOKEN)
+     {
+      SyntaxErrorMessage(theEnv,"deftemplate pattern");
+      *error = true;
+      return NULL;
+     }
+
+   /*======================================================*/
+   /* Check that the slot name is valid for this template. */
+   /*======================================================*/
+
+   if ((slotPtr = FindSlot(theDeftemplate,tempToken->lexemeValue,NULL)) == NULL)
+     {
+      InvalidDeftemplateSlotMessage(theEnv,tempToken->lexemeValue->contents,
+                                    theDeftemplate->header.name->contents,true);
+      *error = true;
+      return NULL;
+     }
+
+   /*====================================*/
+   /* Return a pointer to the slot name. */
+   /*====================================*/
+
+   return slotPtr;
+  }
+
+/**************************************************************************/
+/* ParseAssertSlotValues: Gets a single assert slot value for a template. */
+/**************************************************************************/
+static struct expr *ParseAssertSlotValues(
+  Environment *theEnv,
+  const char *inputSource,
+  struct token *tempToken,
+  struct templateSlot *slotPtr,
+  bool *error,
+  bool constantsOnly)
+  {
+   struct expr *nextSlot;
+   struct expr *newField, *valueList, *lastValue;
+   bool printError;
+
+   /*=============================*/
+   /* Handle a single field slot. */
+   /*=============================*/
+
+   if (slotPtr->multislot == false)
+     {
+      /*=====================*/
+      /* Get the slot value. */
+      /*=====================*/
+
+      SavePPBuffer(theEnv," ");
+
+      newField = GetAssertArgument(theEnv,inputSource,tempToken,error,
+                                   RIGHT_PARENTHESIS_TOKEN,constantsOnly,&printError);
+      if (*error)
+        {
+         if (printError) SyntaxErrorMessage(theEnv,"deftemplate pattern");
+         return NULL;
+        }
+
+      /*=================================================*/
+      /* A single field slot value must contain a value. */
+      /* Only a multifield slot can be empty.            */
+      /*=================================================*/
+
+      if (newField == NULL)
+       {
+        *error = true;
+        SingleFieldSlotCardinalityError(theEnv,slotPtr->slotName->contents);
+        return NULL;
+       }
+
+      /*==============================================*/
+      /* A function returning a multifield value can  */
+      /* not be called to get the value for the slot. */
+      /*==============================================*/
+
+      if (newField->type == MF_VARIABLE)
+        {
+         *error = true;
+         SingleFieldSlotCardinalityError(theEnv,slotPtr->slotName->contents);
+         ReturnExpression(theEnv,newField);
+         return NULL;
+        }
+      else if (newField->type == FCALL)
+       {
+        if ((ExpressionUnknownFunctionType(newField) & SINGLEFIELD_BITS) == 0)
+          {
+           *error = true;
+           SingleFieldSlotCardinalityError(theEnv,slotPtr->slotName->contents);
+           ReturnExpression(theEnv,newField);
+           return NULL;
+          }
+       }
+
+      /*============================*/
+      /* Move on to the next token. */
+      /*============================*/
+
+      GetToken(theEnv,inputSource,tempToken);
+     }
+
+   /*========================================*/
+   /* Handle a multifield slot. Build a list */
+   /* of the values stored in the slot.      */
+   /*========================================*/
+
+   else
+     {
+      SavePPBuffer(theEnv," ");
+      valueList = GetAssertArgument(theEnv,inputSource,tempToken,error,
+                                    RIGHT_PARENTHESIS_TOKEN,constantsOnly,&printError);
+      if (*error)
+        {
+         if (printError) SyntaxErrorMessage(theEnv,"deftemplate pattern");
+         return NULL;
+        }
+
+      if (valueList == NULL)
+        {
+         PPBackup(theEnv);
+         PPBackup(theEnv);
+         SavePPBuffer(theEnv,")");
+        }
+
+      lastValue = valueList;
+
+      while (lastValue != NULL) /* (tempToken->tknType != RIGHT_PARENTHESIS_TOKEN) */
+        {
+         if (tempToken->tknType == RIGHT_PARENTHESIS_TOKEN)
+           { SavePPBuffer(theEnv," "); }
+         else
+           {
+            /* PPBackup(theEnv); */
+            SavePPBuffer(theEnv," ");
+            /* SavePPBuffer(theEnv,tempToken->printForm); */
+           }
+
+         newField = GetAssertArgument(theEnv,inputSource,tempToken,error,
+                                      RIGHT_PARENTHESIS_TOKEN,constantsOnly,&printError);
+         if (*error)
+           {
+            if (printError) SyntaxErrorMessage(theEnv,"deftemplate pattern");
+            ReturnExpression(theEnv,valueList);
+            return NULL;
+           }
+
+         if (newField == NULL)
+           {
+            PPBackup(theEnv);
+            PPBackup(theEnv);
+            SavePPBuffer(theEnv,")");
+           }
+
+         lastValue->nextArg = newField;
+         lastValue = newField;
+        }
+
+      newField = valueList;
+     }
+
+   /*==========================================================*/
+   /* Slot definition must be closed with a right parenthesis. */
+   /*==========================================================*/
+
+   if (tempToken->tknType != RIGHT_PARENTHESIS_TOKEN)
+     {
+      SingleFieldSlotCardinalityError(theEnv,slotPtr->slotName->contents);
+      *error = true;
+      ReturnExpression(theEnv,newField);
+      return NULL;
+     }
+
+   /*=========================================================*/
+   /* Build and return a structure describing the slot value. */
+   /*=========================================================*/
+
+   nextSlot = GenConstant(theEnv,SYMBOL_TYPE,slotPtr->slotName);
+   nextSlot->argList = newField;
+
+   return(nextSlot);
+  }
+
+/*************************************************************************/
+/* ReorderAssertSlotValues: Rearranges the asserted values to correspond */
+/*   to the order of the values described by the deftemplate.            */
+/*************************************************************************/
+static struct expr *ReorderAssertSlotValues(
+  Environment *theEnv,
+  struct templateSlot *slotPtr,
+  struct expr *firstSlot,
+  bool *error)
+  {
+   struct expr *firstArg = NULL;
+   struct expr *lastArg = NULL, *newArg;
+
+   /*=============================================*/
+   /* Loop through each of the slots in the order */
+   /* they're found in the deftemplate.           */
+   /*=============================================*/
+
+   for (;
+        slotPtr != NULL;
+        slotPtr = slotPtr->next)
+     {
+      /*==============================================*/
+      /* Get either the value specified in the assert */
+      /* command or the default value for the slot.   */
+      /*==============================================*/
+
+      newArg = GetSlotAssertValues(theEnv,slotPtr,firstSlot,error);
+
+      if (*error)
+        {
+         ReturnExpression(theEnv,firstArg);
+         return NULL;
+        }
+
+      /*=====================================*/
+      /* Add the value to the list of values */
+      /* for the assert command.             */
+      /*=====================================*/
+
+      if (newArg != NULL)
+        {
+         if (lastArg == NULL)
+           { firstArg = newArg; }
+         else
+           { lastArg->nextArg = newArg; }
+
+         lastArg = newArg;
+        }
+     }
+
+   /*==============================*/
+   /* Return the list of arguments */
+   /* for the assert command.      */
+   /*==============================*/
+
+   return(firstArg);
+  }
+
+/***************************************************************/
+/* GetSlotAssertValues: Gets the assert value for a given slot */
+/*   of a deftemplate. If the value was supplied by the user,  */
+/*   it will be used. If not the default value or default      */
+/*   default value will be used.                               */
+/***************************************************************/
+static struct expr *GetSlotAssertValues(
+  Environment *theEnv,
+  struct templateSlot *slotPtr,
+  struct expr *firstSlot,
+  bool *error)
+  {
+   struct expr *slotItem;
+   struct expr *newArg, *tempArg;
+   UDFValue theDefault;
+   const char *nullBitMap = "\0";
+
+   /*==================================================*/
+   /* Determine if the slot is assigned in the assert. */
+   /*==================================================*/
+
+   slotItem = FindAssertSlotItem(slotPtr,firstSlot);
+
+   /*==========================================*/
+   /* If the slot is assigned, use that value. */
+   /*==========================================*/
+
+   if (slotItem != NULL)
+     {
+      newArg = slotItem->argList;
+      slotItem->argList = NULL;
+     }
+
+   /*=================================*/
+   /* Otherwise, use a default value. */
+   /*=================================*/
+
+   else
+     {
+      /*================================================*/
+      /* If the (default ?NONE) attribute was specified */
+      /* for the slot, then a value must be supplied.   */
+      /*================================================*/
+
+      if (slotPtr->noDefault)
+        {
+         PrintErrorID(theEnv,"TMPLTRHS",1,true);
+         WriteString(theEnv,STDERR,"Slot '");
+         WriteString(theEnv,STDERR,slotPtr->slotName->contents);
+         WriteString(theEnv,STDERR,"' requires a value because of its (default ?NONE) attribute.\n");
+         *error = true;
+         return NULL;
+        }
+
+      /*===================================================*/
+      /* If the (default ?DERIVE) attribute was specified  */
+      /* (the default), then derive the default value from */
+      /* the slot's constraints.                           */
+      /*===================================================*/
+
+      else if ((slotPtr->defaultPresent == false) &&
+               (slotPtr->defaultDynamic == false))
+        {
+         DeriveDefaultFromConstraints(theEnv,slotPtr->constraints,&theDefault,
+                                      slotPtr->multislot,true);
+         newArg = ConvertValueToExpression(theEnv,&theDefault);
+        }
+
+      /*=========================================*/
+      /* Otherwise, use the expression contained */
+      /* in the default attribute.               */
+      /*=========================================*/
+
+      else
+        { newArg = CopyExpression(theEnv,slotPtr->defaultList); }
+     }
+
+   /*=======================================================*/
+   /* Since a multifield slot default can contain a list of */
+   /* values, the values need to have a store-multifield    */
+   /* function called wrapped around it to group all of the */
+   /* values into a single multifield value.                */
+   /*=======================================================*/
+
+   if (slotPtr->multislot)
+     {
+      tempArg = GenConstant(theEnv,FACT_STORE_MULTIFIELD,AddBitMap(theEnv,(void *) nullBitMap,1));
+      tempArg->argList = newArg;
+      newArg = tempArg;
+     }
+
+   /*==============================================*/
+   /* Return the value to be asserted in the slot. */
+   /*==============================================*/
+
+   return(newArg);
+  }
+
+/*******************************************************************/
+/* FindAssertSlotItem: Finds a particular slot in a list of slots. */
+/*******************************************************************/
+static struct expr *FindAssertSlotItem(
+  struct templateSlot *slotPtr,
+  struct expr *listOfSlots)
+  {
+   while (listOfSlots != NULL)
+     {
+      if (listOfSlots->value == (void *) slotPtr->slotName) return (listOfSlots);
+      listOfSlots = listOfSlots->nextArg;
+     }
+
+   return NULL;
+  }
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
diff --git a/clips/tmpltrhs.h b/clips/tmpltrhs.h
new file mode 100755
index 000000000..7b59ff09f
--- /dev/null
+++ b/clips/tmpltrhs.h
@@ -0,0 +1,55 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*          DEFTEMPLATE RHS PARSING HEADER FILE        */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Added additional argument required for         */
+/*            DeriveDefaultFromConstraints.                  */
+/*                                                           */
+/*            Added additional argument required for         */
+/*            InvalidDeftemplateSlotMessage.                 */
+/*                                                           */
+/*      6.30: Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_tmpltrhs
+
+#pragma once
+
+#define _H_tmpltrhs
+
+#include "expressn.h"
+#include "scanner.h"
+#include "tmpltdef.h"
+
+   struct expr                   *ParseAssertTemplate(Environment *,const char *,struct token *,bool *,
+                                                      TokenType,bool,Deftemplate *);
+
+#endif /* _H_tmpltrhs */
+
+
+
diff --git a/clips/tmpltutl.c b/clips/tmpltutl.c
new file mode 100755
index 000000000..5bc0615a8
--- /dev/null
+++ b/clips/tmpltutl.c
@@ -0,0 +1,616 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/01/16             */
+   /*                                                     */
+   /*            DEFTEMPLATE UTILITIES MODULE             */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides utility routines for deftemplates.      */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian L. Dantes                                      */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added additional arguments to                  */
+/*            InvalidDeftemplateSlotMessage function.        */
+/*                                                           */
+/*            Added additional arguments to                  */
+/*            PrintTemplateFact function.                    */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Added Env prefix to GetHaltExecution and       */
+/*            SetHaltExecution functions.                    */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Static constraint checking is always enabled.  */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Watch facts for modify command only prints     */
+/*            changed slots.                                 */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEFTEMPLATE_CONSTRUCT
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "constrct.h"
+#include "cstrnchk.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "modulutl.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "router.h"
+#include "sysdep.h"
+#include "tmpltbsc.h"
+#include "tmpltdef.h"
+#include "tmpltfun.h"
+#include "tmpltpsr.h"
+#include "watch.h"
+
+#include "tmpltutl.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                     PrintTemplateSlot(Environment *,const char *,struct templateSlot *,CLIPSValue *);
+   static struct templateSlot     *GetNextTemplateSlotToPrint(Environment *,struct fact *,struct templateSlot *,int *,int,const char *);
+
+/********************************************************/
+/* InvalidDeftemplateSlotMessage: Generic error message */
+/*   for use when a specified slot name isn't defined   */
+/*   in its corresponding deftemplate.                  */
+/********************************************************/
+void InvalidDeftemplateSlotMessage(
+  Environment *theEnv,
+  const char *slotName,
+  const char *deftemplateName,
+  bool printCR)
+  {
+   PrintErrorID(theEnv,"TMPLTDEF",1,printCR);
+   WriteString(theEnv,STDERR,"Invalid slot '");
+   WriteString(theEnv,STDERR,slotName);
+   WriteString(theEnv,STDERR,"' not defined in corresponding deftemplate '");
+   WriteString(theEnv,STDERR,deftemplateName);
+   WriteString(theEnv,STDERR,"'.\n");
+  }
+
+/**********************************************************/
+/* SingleFieldSlotCardinalityError: Generic error message */
+/*   used when an attempt is made to placed a multifield  */
+/*   value into a single field slot.                      */
+/**********************************************************/
+void SingleFieldSlotCardinalityError(
+  Environment *theEnv,
+  const char *slotName)
+  {
+   PrintErrorID(theEnv,"TMPLTDEF",2,true);
+   WriteString(theEnv,STDERR,"The single field slot '");
+   WriteString(theEnv,STDERR,slotName);
+   WriteString(theEnv,STDERR,"' can only contain a single field value.\n");
+  }
+
+/**********************************************************************/
+/* MultiIntoSingleFieldSlotError: Determines if a multifield value is */
+/*   being placed into a single field slot of a deftemplate fact.     */
+/**********************************************************************/
+void MultiIntoSingleFieldSlotError(
+  Environment *theEnv,
+  struct templateSlot *theSlot,
+  Deftemplate *theDeftemplate)
+  {
+   PrintErrorID(theEnv,"TMPLTFUN",1,true);
+   WriteString(theEnv,STDERR,"Attempted to assert a multifield value ");
+   WriteString(theEnv,STDERR,"into the single field slot ");
+   if (theSlot != NULL)
+     {
+      WriteString(theEnv,STDERR,"'");
+      WriteString(theEnv,STDERR,theSlot->slotName->contents);
+      WriteString(theEnv,STDERR,"'");
+     }
+   else
+     { WriteString(theEnv,STDERR,"<<unknown>>"); }
+   WriteString(theEnv,STDERR," of deftemplate ");
+   if (theDeftemplate != NULL)
+     {
+      WriteString(theEnv,STDERR,"'");
+      WriteString(theEnv,STDERR,theDeftemplate->header.name->contents);
+      WriteString(theEnv,STDERR,"'");
+     }
+   else
+     { WriteString(theEnv,STDERR,"<<unknown>>"); }
+   WriteString(theEnv,STDERR,".\n");
+
+   SetEvaluationError(theEnv,true);
+  }
+
+/**************************************************************/
+/* CheckTemplateFact: Checks a fact to see if it violates any */
+/*   deftemplate type, allowed-..., or range specifications.  */
+/**************************************************************/
+void CheckTemplateFact(
+  Environment *theEnv,
+  Fact *theFact)
+  {
+   CLIPSValue *sublist;
+   int i;
+   Deftemplate *theDeftemplate;
+   struct templateSlot *slotPtr;
+   UDFValue theData;
+   char thePlace[20];
+   ConstraintViolationType rv;
+
+   if (! GetDynamicConstraintChecking(theEnv)) return;
+
+   sublist = theFact->theProposition.contents;
+
+   /*========================================================*/
+   /* If the deftemplate corresponding to the first field of */
+   /* of the fact cannot be found, then the fact cannot be   */
+   /* checked against the deftemplate format.                */
+   /*========================================================*/
+
+   theDeftemplate = theFact->whichDeftemplate;
+   if (theDeftemplate == NULL) return;
+   if (theDeftemplate->implied) return;
+
+   /*=============================================*/
+   /* Check each of the slots of the deftemplate. */
+   /*=============================================*/
+
+   i = 0;
+   for (slotPtr = theDeftemplate->slotList;
+        slotPtr != NULL;
+        slotPtr = slotPtr->next)
+     {
+      /*================================================*/
+      /* Store the slot value in the appropriate format */
+      /* for a call to the constraint checking routine. */
+      /*================================================*/
+
+      if (slotPtr->multislot == false)
+        {
+         theData.value = sublist[i].value;
+         i++;
+        }
+      else
+        {
+         theData.value = (void *) sublist[i].value;
+         theData.begin = 0;
+         theData.range = sublist[i].multifieldValue->length;
+         i++;
+        }
+
+      /*=============================================*/
+      /* Call the constraint checking routine to see */
+      /* if a constraint violation occurred.         */
+      /*=============================================*/
+
+      rv = ConstraintCheckDataObject(theEnv,&theData,slotPtr->constraints);
+      if (rv != NO_VIOLATION)
+        {
+         gensprintf(thePlace,"fact f-%lld",theFact->factIndex);
+
+         PrintErrorID(theEnv,"CSTRNCHK",1,true);
+         WriteString(theEnv,STDERR,"Slot value ");
+         WriteUDFValue(theEnv,STDERR,&theData);
+         ConstraintViolationErrorMessage(theEnv,NULL,thePlace,false,0,slotPtr->slotName,
+                                         0,rv,slotPtr->constraints,true);
+         SetHaltExecution(theEnv,true);
+         return;
+        }
+     }
+
+   return;
+  }
+
+/***********************************************************************/
+/* CheckRHSSlotTypes: Checks the validity of a change to a slot as the */
+/*   result of an assert, modify, or duplicate command. This checking  */
+/*   is performed statically (i.e. when the command is being parsed).  */
+/***********************************************************************/
+bool CheckRHSSlotTypes(
+  Environment *theEnv,
+  struct expr *rhsSlots,
+  struct templateSlot *slotPtr,
+  const char *thePlace)
+  {
+   ConstraintViolationType rv;
+   const char *theName;
+
+   rv = ConstraintCheckExpressionChain(theEnv,rhsSlots,slotPtr->constraints);
+   if (rv != NO_VIOLATION)
+     {
+      if (rv != CARDINALITY_VIOLATION) theName = "A literal slot value";
+      else theName = "Literal slot values";
+      ConstraintViolationErrorMessage(theEnv,theName,thePlace,true,0,
+                                      slotPtr->slotName,0,rv,slotPtr->constraints,true);
+      return false;
+     }
+
+   return true;
+  }
+
+/*********************************************************/
+/* GetNthSlot: Given a deftemplate and an integer index, */
+/*   returns the nth slot of a deftemplate.              */
+/*********************************************************/
+struct templateSlot *GetNthSlot(
+  Deftemplate *theDeftemplate,
+  long long position)
+  {
+   struct templateSlot *slotPtr;
+   long long i = 0;
+
+   slotPtr = theDeftemplate->slotList;
+   while (slotPtr != NULL)
+     {
+      if (i == position) return slotPtr;
+      slotPtr = slotPtr->next;
+      i++;
+     }
+
+   return NULL;
+  }
+
+/*******************************************************/
+/* FindSlotPosition: Finds the position of a specified */
+/*   slot in a deftemplate structure.                  */
+/*******************************************************/
+int FindSlotPosition(
+  Deftemplate *theDeftemplate,
+  CLIPSLexeme *name)
+  {
+   struct templateSlot *slotPtr;
+   int position;
+
+   for (slotPtr = theDeftemplate->slotList, position = 1;
+        slotPtr != NULL;
+        slotPtr = slotPtr->next, position++)
+     {
+      if (slotPtr->slotName == name)
+        { return(position); }
+     }
+
+   return 0;
+  }
+
+/**********************/
+/* PrintTemplateSlot: */
+/**********************/
+static void PrintTemplateSlot(
+  Environment *theEnv,
+  const char *logicalName,
+  struct templateSlot *slotPtr,
+  CLIPSValue *slotValue)
+  {
+   WriteString(theEnv,logicalName,"(");
+   WriteString(theEnv,logicalName,slotPtr->slotName->contents);
+
+   /*======================================================*/
+   /* Print the value of the slot for a single field slot. */
+   /*======================================================*/
+
+   if (slotPtr->multislot == false)
+     {
+      WriteString(theEnv,logicalName," ");
+      PrintAtom(theEnv,logicalName,((TypeHeader *) slotValue->value)->type,slotValue->value);
+     }
+
+   /*==========================================================*/
+   /* Else print the value of the slot for a multi field slot. */
+   /*==========================================================*/
+
+   else
+     {
+      struct multifield *theSegment;
+
+      theSegment = (Multifield *) slotValue->value;
+      if (theSegment->length > 0)
+        {
+         WriteString(theEnv,logicalName," ");
+         PrintMultifieldDriver(theEnv,logicalName,theSegment,0,theSegment->length,false);
+        }
+     }
+
+   /*============================================*/
+   /* Print the closing parenthesis of the slot. */
+   /*============================================*/
+
+   WriteString(theEnv,logicalName,")");
+  }
+
+/********************************/
+/* GetNextTemplateSloteToPrint: */
+/********************************/
+static struct templateSlot *GetNextTemplateSlotToPrint(
+  Environment *theEnv,
+  struct fact *theFact,
+  struct templateSlot *slotPtr,
+  int *position,
+  int ignoreDefaults,
+  const char *changeMap)
+  {
+   UDFValue tempDO;
+   CLIPSValue *sublist;
+
+   sublist = theFact->theProposition.contents;
+   if (slotPtr == NULL)
+     { slotPtr = theFact->whichDeftemplate->slotList; }
+   else
+     {
+      slotPtr = slotPtr->next;
+      (*position)++;
+     }
+
+   while (slotPtr != NULL)
+     {
+      if ((changeMap != NULL) && (TestBitMap(changeMap,*position) == 0))
+        {
+         (*position)++;
+         slotPtr = slotPtr->next;
+         continue;
+        }
+
+      if (ignoreDefaults && (slotPtr->defaultDynamic == false))
+        {
+         DeftemplateSlotDefault(theEnv,theFact->whichDeftemplate,slotPtr,&tempDO,true);
+
+         if (slotPtr->multislot == false)
+           {
+            if (tempDO.value == sublist[*position].value)
+              {
+               (*position)++;
+               slotPtr = slotPtr->next;
+               continue;
+              }
+           }
+         else if (MultifieldsEqual((Multifield *) tempDO.value,
+                                   (Multifield *) sublist[*position].value))
+           {
+            (*position)++;
+            slotPtr = slotPtr->next;
+            continue;
+           }
+        }
+
+      return slotPtr;
+     }
+
+   return NULL;
+  }
+
+/**********************************************************/
+/* PrintTemplateFact: Prints a fact using the deftemplate */
+/*   format. Returns true if the fact was printed using   */
+/*   this format, otherwise false.                        */
+/**********************************************************/
+void PrintTemplateFact(
+  Environment *theEnv,
+  const char *logicalName,
+  Fact *theFact,
+  bool separateLines,
+  bool ignoreDefaults,
+  const char *changeMap)
+  {
+   CLIPSValue *sublist;
+   int i;
+   Deftemplate *theDeftemplate;
+   struct templateSlot *slotPtr, *lastPtr = NULL;
+   bool slotPrinted = false;
+
+   /*==============================*/
+   /* Initialize some information. */
+   /*==============================*/
+
+   theDeftemplate = theFact->whichDeftemplate;
+   sublist = theFact->theProposition.contents;
+
+   /*=============================================*/
+   /* Print the relation name of the deftemplate. */
+   /*=============================================*/
+
+   WriteString(theEnv,logicalName,"(");
+   WriteString(theEnv,logicalName,theDeftemplate->header.name->contents);
+
+   /*===================================================*/
+   /* Print each of the field slots of the deftemplate. */
+   /*===================================================*/
+
+   i = 0;
+   slotPtr = GetNextTemplateSlotToPrint(theEnv,theFact,lastPtr,&i,
+                                        ignoreDefaults,changeMap);
+
+   if ((changeMap != NULL) &&
+       (theFact->whichDeftemplate->slotList != slotPtr))
+     { WriteString(theEnv,logicalName," ..."); }
+
+   while (slotPtr != NULL)
+     {
+      /*===========================================*/
+      /* Print the opening parenthesis of the slot */
+      /* and the slot name.                        */
+      /*===========================================*/
+
+      if (! slotPrinted)
+        {
+         slotPrinted = true;
+         WriteString(theEnv,logicalName," ");
+        }
+
+      if (separateLines)
+        { WriteString(theEnv,logicalName,"\n   "); }
+
+      /*====================================*/
+      /* Print the slot name and its value. */
+      /*====================================*/
+
+      PrintTemplateSlot(theEnv,logicalName,slotPtr,&sublist[i]);
+
+      /*===========================*/
+      /* Move on to the next slot. */
+      /*===========================*/
+
+      lastPtr = slotPtr;
+      slotPtr = GetNextTemplateSlotToPrint(theEnv,theFact,lastPtr,&i,
+                                           ignoreDefaults,changeMap);
+
+      if ((changeMap != NULL) && (lastPtr->next != slotPtr))
+        { WriteString(theEnv,logicalName," ..."); }
+
+      if (slotPtr != NULL) WriteString(theEnv,logicalName," ");
+     }
+
+   WriteString(theEnv,logicalName,")");
+  }
+
+/***************************************************************************/
+/* UpdateDeftemplateScope: Updates the scope flag of all the deftemplates. */
+/***************************************************************************/
+void UpdateDeftemplateScope(
+  Environment *theEnv)
+  {
+   Deftemplate *theDeftemplate;
+   unsigned int moduleCount;
+   Defmodule *theModule;
+   struct defmoduleItemHeader *theItem;
+
+   /*==================================*/
+   /* Loop through all of the modules. */
+   /*==================================*/
+
+   for (theModule = GetNextDefmodule(theEnv,NULL);
+        theModule != NULL;
+        theModule = GetNextDefmodule(theEnv,theModule))
+     {
+      /*======================================================*/
+      /* Loop through each of the deftemplates in the module. */
+      /*======================================================*/
+
+      theItem = (struct defmoduleItemHeader *)
+                GetModuleItem(theEnv,theModule,DeftemplateData(theEnv)->DeftemplateModuleIndex);
+
+      for (theDeftemplate = (Deftemplate *) theItem->firstItem;
+           theDeftemplate != NULL ;
+           theDeftemplate = GetNextDeftemplate(theEnv,theDeftemplate))
+        {
+         /*=======================================*/
+         /* If the deftemplate can be seen by the */
+         /* current module, then it is in scope.  */
+         /*=======================================*/
+
+         if (FindImportedConstruct(theEnv,"deftemplate",theModule,
+                                   theDeftemplate->header.name->contents,
+                                   &moduleCount,true,NULL) != NULL)
+           { theDeftemplate->inScope = true; }
+         else
+           { theDeftemplate->inScope = false; }
+        }
+     }
+  }
+
+/****************************************************************/
+/* FindSlot: Finds a specified slot in a deftemplate structure. */
+/****************************************************************/
+struct templateSlot *FindSlot(
+  Deftemplate *theDeftemplate,
+  CLIPSLexeme *name,
+  unsigned short *whichOne)
+  {
+   struct templateSlot *slotPtr;
+
+   if (whichOne != NULL) *whichOne = 0;
+   slotPtr = theDeftemplate->slotList;
+   while (slotPtr != NULL)
+     {
+      if (slotPtr->slotName == name)
+        { return(slotPtr); }
+      if (whichOne != NULL) (*whichOne)++;
+      slotPtr = slotPtr->next;
+     }
+
+   return NULL;
+  }
+
+#if (! RUN_TIME) && (! BLOAD_ONLY)
+
+/************************************************************/
+/* CreateImpliedDeftemplate: Creates an implied deftemplate */
+/*   and adds it to the list of deftemplates.               */
+/************************************************************/
+Deftemplate *CreateImpliedDeftemplate(
+  Environment *theEnv,
+  CLIPSLexeme *deftemplateName,
+  bool setFlag)
+  {
+   Deftemplate *newDeftemplate;
+
+   newDeftemplate = get_struct(theEnv,deftemplate);
+   newDeftemplate->header.name = deftemplateName;
+   newDeftemplate->header.ppForm = NULL;
+   newDeftemplate->header.usrData = NULL;
+   newDeftemplate->header.constructType = DEFTEMPLATE;
+   newDeftemplate->header.env = theEnv;
+   newDeftemplate->slotList = NULL;
+   newDeftemplate->implied = setFlag;
+   newDeftemplate->numberOfSlots = 0;
+   newDeftemplate->inScope = 1;
+   newDeftemplate->patternNetwork = NULL;
+   newDeftemplate->factList = NULL;
+   newDeftemplate->lastFact = NULL;
+   newDeftemplate->busyCount = 0;
+   newDeftemplate->watch = false;
+   newDeftemplate->header.next = NULL;
+
+#if DEBUGGING_FUNCTIONS
+   if (GetWatchItem(theEnv,"facts") == 1)
+     { DeftemplateSetWatch(newDeftemplate,true); }
+#endif
+
+   newDeftemplate->header.whichModule = (struct defmoduleItemHeader *)
+                                        GetModuleItem(theEnv,NULL,DeftemplateData(theEnv)->DeftemplateModuleIndex);
+
+   AddConstructToModule(&newDeftemplate->header);
+   InstallDeftemplate(theEnv,newDeftemplate);
+
+   return(newDeftemplate);
+  }
+
+#endif
+
+#endif /* DEFTEMPLATE_CONSTRUCT */
+
diff --git a/clips/tmpltutl.h b/clips/tmpltutl.h
new file mode 100755
index 000000000..80b31359f
--- /dev/null
+++ b/clips/tmpltutl.h
@@ -0,0 +1,78 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*          DEFTEMPLATE UTILITIES HEADER FILE          */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Added support for templates maintaining their  */
+/*            own list of facts.                             */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added additional arguments to                  */
+/*            InvalidDeftemplateSlotMessage function.        */
+/*                                                           */
+/*            Added additional arguments to                  */
+/*            PrintTemplateFact function.                    */
+/*                                                           */
+/*      6.30: Support for long long integers.                */
+/*                                                           */
+/*            Used gensprintf instead of sprintf.            */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            Watch facts for modify command only prints     */
+/*            changed slots.                                 */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_tmpltutl
+
+#pragma once
+
+#define _H_tmpltutl
+
+#include "constrnt.h"
+#include "evaluatn.h"
+#include "expressn.h"
+#include "factmngr.h"
+#include "symbol.h"
+
+   void                           InvalidDeftemplateSlotMessage(Environment *,const char *,const char *,bool);
+   void                           SingleFieldSlotCardinalityError(Environment *,const char *);
+   void                           MultiIntoSingleFieldSlotError(Environment *,struct templateSlot *,Deftemplate *);
+   void                           CheckTemplateFact(Environment *,Fact *);
+   bool                           CheckRHSSlotTypes(Environment *,struct expr *,struct templateSlot *,const char *);
+   struct templateSlot           *GetNthSlot(Deftemplate *,long long);
+   int                            FindSlotPosition(Deftemplate *,CLIPSLexeme *);
+   void                           PrintTemplateFact(Environment *,const char *,Fact *,bool,bool,const char *);
+   void                           UpdateDeftemplateScope(Environment *);
+   struct templateSlot           *FindSlot(Deftemplate *,CLIPSLexeme *,unsigned short *);
+   Deftemplate                   *CreateImpliedDeftemplate(Environment *,CLIPSLexeme *,bool);
+
+#endif /* _H_tmpltutl */
+
+
+
diff --git a/clips/userdata.c b/clips/userdata.c
new file mode 100755
index 000000000..a40e92e03
--- /dev/null
+++ b/clips/userdata.c
@@ -0,0 +1,156 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                  USER DATA MODULE                   */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for attaching user data to constructs,  */
+/*   facts, instances, user functions, etc.                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#include <stdlib.h>
+
+#include "setup.h"
+
+#include "envrnmnt.h"
+
+#include "userdata.h"
+
+/*************************************************/
+/* InitializeUserDataData: Allocates environment */
+/*    data for user data routines.               */
+/*************************************************/
+void InitializeUserDataData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,USER_DATA_DATA,sizeof(struct userDataData),NULL);
+  }
+
+/******************************************************/
+/* InstallUserDataRecord: Installs a user data record */
+/*   in the user data record array and returns the    */
+/*   integer data ID associated with the record.      */
+/******************************************************/
+unsigned char InstallUserDataRecord(
+  Environment *theEnv,
+  struct userDataRecord *theRecord)
+  {
+   theRecord->dataID = UserDataData(theEnv)->UserDataRecordCount;
+   UserDataData(theEnv)->UserDataRecordArray[UserDataData(theEnv)->UserDataRecordCount] = theRecord;
+   return(UserDataData(theEnv)->UserDataRecordCount++);
+  }
+
+/*****************************************************/
+/* FetchUserData: Searches for user data information */
+/*   from a list of user data structures. A new user */
+/*   data structure is created if one is not found.  */
+/*****************************************************/
+struct userData *FetchUserData(
+  Environment *theEnv,
+  unsigned char userDataID,
+  struct userData **theList)
+  {
+   struct userData *theData;
+
+   for (theData = *theList;
+        theData != NULL;
+        theData = theData->next)
+     {
+      if (theData->dataID == userDataID)
+        { return(theData); }
+     }
+
+   theData = (struct userData *) (*UserDataData(theEnv)->UserDataRecordArray[userDataID]->createUserData)(theEnv);
+   theData->dataID = userDataID;
+   theData->next = *theList;
+   *theList = theData;
+
+   return(theData);
+  }
+
+/*****************************************************/
+/* TestUserData: Searches for user data information  */
+/*   from a list of user data structures. NULL is    */
+/*   returned if the appropriate user data structure */
+/*   is not found.                                   */
+/*****************************************************/
+struct userData *TestUserData(
+  unsigned char userDataID,
+  struct userData *theList)
+  {
+   struct userData *theData;
+
+   for (theData = theList;
+        theData != NULL;
+        theData = theData->next)
+     {
+      if (theData->dataID == userDataID)
+        { return(theData); }
+     }
+
+   return NULL;
+  }
+
+/***************************************************************/
+/* ClearUserDataList: Deallocates a linked list of user data.  */
+/***************************************************************/
+void ClearUserDataList(
+  Environment *theEnv,
+  struct userData *theList)
+  {
+   struct userData *nextData;
+
+   while (theList != NULL)
+     {
+      nextData = theList->next;
+      (*UserDataData(theEnv)->UserDataRecordArray[theList->dataID]->deleteUserData)(theEnv,theList);
+      theList = nextData;
+     }
+  }
+
+/*************************************************/
+/* DeleteUserData: Removes user data information */
+/*   from a list of user data structures.        */
+/*************************************************/
+struct userData *DeleteUserData(
+  Environment *theEnv,
+  unsigned char userDataID,
+  struct userData *theList)
+  {
+   struct userData *theData, *lastData = NULL;
+
+   for (theData = theList;
+        theData != NULL;
+        theData = theData->next)
+     {
+      if (theData->dataID == userDataID)
+        {
+         if (lastData == NULL)
+           { theList = theData->next; }
+         else
+           { lastData->next = theData->next; }
+
+         (*UserDataData(theEnv)->UserDataRecordArray[userDataID]->deleteUserData)(theEnv,theData);
+         return(theList);
+        }
+
+      lastData = theData;
+     }
+
+   return(theList);
+  }
+
diff --git a/clips/userdata.h b/clips/userdata.h
new file mode 100755
index 000000000..f38e40987
--- /dev/null
+++ b/clips/userdata.h
@@ -0,0 +1,72 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  07/30/16            */
+   /*                                                     */
+   /*                USER DATA HEADER FILE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Routines for attaching user data to constructs,  */
+/*   facts, instances, user functions, etc.                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_userdata
+
+#pragma once
+
+#define _H_userdata
+
+struct userData
+  {
+   unsigned char dataID;
+   struct userData *next;
+  };
+
+typedef struct userData USER_DATA;
+typedef struct userData * USER_DATA_PTR;
+
+struct userDataRecord
+  {
+   unsigned char dataID;
+   void *(*createUserData)(Environment *);
+   void (*deleteUserData)(Environment *,void *);
+  };
+
+typedef struct userDataRecord USER_DATA_RECORD;
+typedef struct userDataRecord * USER_DATA_RECORD_PTR;
+
+#define MAXIMUM_USER_DATA_RECORDS 100
+
+#define USER_DATA_DATA 56
+
+struct userDataData
+  {
+   struct userDataRecord *UserDataRecordArray[MAXIMUM_USER_DATA_RECORDS];
+   unsigned char UserDataRecordCount;
+  };
+
+#define UserDataData(theEnv) ((struct userDataData *) GetEnvironmentData(theEnv,USER_DATA_DATA))
+
+   void                           InitializeUserDataData(Environment *);
+   unsigned char                  InstallUserDataRecord(Environment *,struct userDataRecord *);
+   struct userData               *FetchUserData(Environment *,unsigned char,struct userData **);
+   struct userData               *TestUserData(unsigned char,struct userData *);
+   void                           ClearUserDataList(Environment *,struct userData *);
+   struct userData               *DeleteUserData(Environment *,unsigned char,struct userData *);
+
+#endif
+
diff --git a/clips/userfunctions.c b/clips/userfunctions.c
new file mode 100644
index 000000000..a63dfae0a
--- /dev/null
+++ b/clips/userfunctions.c
@@ -0,0 +1,70 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  07/30/16             */
+   /*                                                     */
+   /*                USER FUNCTIONS MODULE                */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose:                                                  */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Created file to seperate UserFunctions and     */
+/*            EnvUserFunctions from main.c.                  */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*************************************************************/
+
+/***************************************************************************/
+/*                                                                         */
+/* Permission is hereby granted, free of charge, to any person obtaining   */
+/* a copy of this software and associated documentation files (the         */
+/* "Software"), to deal in the Software without restriction, including     */
+/* without limitation the rights to use, copy, modify, merge, publish,     */
+/* distribute, and/or sell copies of the Software, and to permit persons   */
+/* to whom the Software is furnished to do so.                             */
+/*                                                                         */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS */
+/* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF              */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT   */
+/* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY  */
+/* CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES */
+/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN   */
+/* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF */
+/* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.          */
+/*                                                                         */
+/***************************************************************************/
+
+#include "clips.h"
+
+void UserFunctions(Environment *);
+
+/*********************************************************/
+/* UserFunctions: Informs the expert system environment  */
+/*   of any user defined functions. In the default case, */
+/*   there are no user defined functions. To define      */
+/*   functions, either this function must be replaced by */
+/*   a function with the same name within this file, or  */
+/*   this function can be deleted from this file and     */
+/*   included in another file.                           */
+/*********************************************************/
+void UserFunctions(
+  Environment *env)
+  {
+#if MAC_XCD
+#pragma unused(env)
+#endif
+  }
diff --git a/clips/usrsetup.h b/clips/usrsetup.h
new file mode 100755
index 000000000..68b147bf3
--- /dev/null
+++ b/clips/usrsetup.h
@@ -0,0 +1,12 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  06/28/16             */
+   /*                                                     */
+   /*               USER SETUP HEADER FILE                */
+   /*******************************************************/
+#include <boost/predef.h>
+
+#if BOOST_OS_IOS
+#   define system(x) EXIT_FAILURE
+#endif// BOOST_OS_IOS
diff --git a/clips/utility.c b/clips/utility.c
new file mode 100755
index 000000000..a7a77d65d
--- /dev/null
+++ b/clips/utility.c
@@ -0,0 +1,1480 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  11/15/17             */
+   /*                                                     */
+   /*                   UTILITY MODULE                    */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides a set of utility functions useful to    */
+/*   other modules. Primarily these are the functions for    */
+/*   handling periodic garbage collection and appending      */
+/*   string data.                                            */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian Dantes                                         */
+/*      Jeff Bezanson                                        */
+/*         www.cprogramming.com/tutorial/unicode.html        */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added CopyString, DeleteString,                */
+/*            InsertInString,and EnlargeString functions.    */
+/*                                                           */
+/*            Used genstrncpy function instead of strncpy    */
+/*            function.                                      */
+/*                                                           */
+/*            Support for typed EXTERNAL_ADDRESS.            */
+/*                                                           */
+/*            Support for tracked memory (allows memory to   */
+/*            be freed if CLIPS is exited while executing).  */
+/*                                                           */
+/*            Added UTF-8 routines.                          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Fix for memory used discrepancy.               */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*            Added StringBuilder functions.                 */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "commline.h"
+#include "envrnmnt.h"
+#include "evaluatn.h"
+#include "factmngr.h"
+#include "facthsh.h"
+#include "memalloc.h"
+#include "multifld.h"
+#include "prntutil.h"
+#include "symbol.h"
+#include "sysdep.h"
+
+#include "utility.h"
+
+#define MAX_EPHEMERAL_COUNT 1000L
+#define MAX_EPHEMERAL_SIZE 10240L
+#define COUNT_INCREMENT 1000L
+#define SIZE_INCREMENT 10240L
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static void                    DeallocateUtilityData(Environment *);
+
+/************************************************/
+/* InitializeUtilityData: Allocates environment */
+/*    data for utility routines.                */
+/************************************************/
+void InitializeUtilityData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,UTILITY_DATA,sizeof(struct utilityData),DeallocateUtilityData);
+
+   UtilityData(theEnv)->CurrentGarbageFrame = &UtilityData(theEnv)->MasterGarbageFrame;
+
+   UtilityData(theEnv)->PeriodicFunctionsEnabled = true;
+   UtilityData(theEnv)->YieldFunctionEnabled = true;
+  }
+
+/**************************************************/
+/* DeallocateUtilityData: Deallocates environment */
+/*    data for utility routines.                  */
+/**************************************************/
+static void DeallocateUtilityData(
+  Environment *theEnv)
+  {
+   struct trackedMemory *tmpTM, *nextTM;
+   struct garbageFrame *theGarbageFrame;
+   struct ephemeron *edPtr, *nextEDPtr;
+   Multifield *tmpMFPtr, *nextMFPtr;
+
+   /*======================*/
+   /* Free tracked memory. */
+   /*======================*/
+
+   tmpTM = UtilityData(theEnv)->trackList;
+   while (tmpTM != NULL)
+     {
+      nextTM = tmpTM->next;
+      genfree(theEnv,tmpTM->theMemory,tmpTM->memSize);
+      rtn_struct(theEnv,trackedMemory,tmpTM);
+      tmpTM = nextTM;
+     }
+
+   /*==========================*/
+   /* Free callback functions. */
+   /*==========================*/
+
+   DeallocateVoidCallList(theEnv,UtilityData(theEnv)->ListOfPeriodicFunctions);
+   DeallocateVoidCallList(theEnv,UtilityData(theEnv)->ListOfCleanupFunctions);
+
+   /*=========================================*/
+   /* Free the ephemerons tracking data which */
+   /* needs to be garbage collected.          */
+   /*=========================================*/
+
+   while (UtilityData(theEnv)->CurrentGarbageFrame != NULL)
+     {
+      theGarbageFrame = UtilityData(theEnv)->CurrentGarbageFrame;
+
+      edPtr = theGarbageFrame->ephemeralSymbolList;
+
+      while (edPtr != NULL)
+        {
+         nextEDPtr = edPtr->next;
+         rtn_struct(theEnv,ephemeron,edPtr);
+         edPtr = nextEDPtr;
+        }
+
+      edPtr = theGarbageFrame->ephemeralFloatList;
+
+      while (edPtr != NULL)
+        {
+         nextEDPtr = edPtr->next;
+         rtn_struct(theEnv,ephemeron,edPtr);
+         edPtr = nextEDPtr;
+        }
+
+      edPtr = theGarbageFrame->ephemeralIntegerList;
+
+      while (edPtr != NULL)
+        {
+         nextEDPtr = edPtr->next;
+         rtn_struct(theEnv,ephemeron,edPtr);
+         edPtr = nextEDPtr;
+        }
+
+      edPtr = theGarbageFrame->ephemeralBitMapList;
+
+      while (edPtr != NULL)
+        {
+         nextEDPtr = edPtr->next;
+         rtn_struct(theEnv,ephemeron,edPtr);
+         edPtr = nextEDPtr;
+        }
+
+      edPtr = theGarbageFrame->ephemeralExternalAddressList;
+
+      while (edPtr != NULL)
+        {
+         nextEDPtr = edPtr->next;
+         rtn_struct(theEnv,ephemeron,edPtr);
+         edPtr = nextEDPtr;
+        }
+
+      /*==========================*/
+      /* Free up multifield data. */
+      /*==========================*/
+
+      tmpMFPtr = theGarbageFrame->ListOfMultifields;
+      while (tmpMFPtr != NULL)
+        {
+         nextMFPtr = tmpMFPtr->next;
+         ReturnMultifield(theEnv,tmpMFPtr);
+         tmpMFPtr = nextMFPtr;
+        }
+
+      UtilityData(theEnv)->CurrentGarbageFrame = UtilityData(theEnv)->CurrentGarbageFrame->priorFrame;
+     }
+  }
+
+/*****************************/
+/* CleanCurrentGarbageFrame: */
+/*****************************/
+void CleanCurrentGarbageFrame(
+  Environment *theEnv,
+  UDFValue *returnValue)
+  {
+   struct garbageFrame *currentGarbageFrame;
+
+   currentGarbageFrame = UtilityData(theEnv)->CurrentGarbageFrame;
+
+   if (! currentGarbageFrame->dirty) return;
+
+   if (returnValue != NULL)
+     { RetainUDFV(theEnv,returnValue); }
+
+   CallCleanupFunctions(theEnv);
+   RemoveEphemeralAtoms(theEnv);
+   FlushMultifields(theEnv);
+
+   if (returnValue != NULL)
+     { ReleaseUDFV(theEnv,returnValue); }
+
+   if ((currentGarbageFrame->ephemeralFloatList == NULL) &&
+       (currentGarbageFrame->ephemeralIntegerList == NULL) &&
+       (currentGarbageFrame->ephemeralSymbolList == NULL) &&
+       (currentGarbageFrame->ephemeralBitMapList == NULL) &&
+       (currentGarbageFrame->ephemeralExternalAddressList == NULL) &&
+       (currentGarbageFrame->LastMultifield == NULL))
+     { currentGarbageFrame->dirty = false; }
+  }
+
+/*****************************/
+/* RestorePriorGarbageFrame: */
+/*****************************/
+void RestorePriorGarbageFrame(
+  Environment *theEnv,
+  struct garbageFrame *newGarbageFrame,
+  struct garbageFrame *oldGarbageFrame,
+  UDFValue *returnValue)
+  {
+   if (newGarbageFrame->dirty)
+     {
+      if (returnValue != NULL) RetainUDFV(theEnv,returnValue);
+      CallCleanupFunctions(theEnv);
+      RemoveEphemeralAtoms(theEnv);
+      FlushMultifields(theEnv);
+     }
+
+   UtilityData(theEnv)->CurrentGarbageFrame = oldGarbageFrame;
+
+   if (newGarbageFrame->dirty)
+     {
+      if (newGarbageFrame->ListOfMultifields != NULL)
+        {
+         if (oldGarbageFrame->ListOfMultifields == NULL)
+           { oldGarbageFrame->ListOfMultifields = newGarbageFrame->ListOfMultifields; }
+         else
+           { oldGarbageFrame->LastMultifield->next = newGarbageFrame->ListOfMultifields; }
+
+         oldGarbageFrame->LastMultifield = newGarbageFrame->LastMultifield;
+         oldGarbageFrame->dirty = true;
+        }
+
+      if (returnValue != NULL) ReleaseUDFV(theEnv,returnValue);
+     }
+
+   if (returnValue != NULL)
+     { EphemerateValue(theEnv,returnValue->value); }
+  }
+
+/*****************/
+/* GCBlockStart: */
+/*****************/
+void GCBlockStart(
+  Environment *theEnv,
+  GCBlock *theBlock)
+  {
+   theBlock->oldGarbageFrame = UtilityData(theEnv)->CurrentGarbageFrame;
+   memset(&theBlock->newGarbageFrame,0,sizeof(struct garbageFrame));
+   theBlock->newGarbageFrame.priorFrame = theBlock->oldGarbageFrame;
+   UtilityData(theEnv)->CurrentGarbageFrame = &theBlock->newGarbageFrame;
+  }
+
+/***************/
+/* GCBlockEnd: */
+/***************/
+void GCBlockEnd(
+  Environment *theEnv,
+  GCBlock *theBlock)
+  {
+   RestorePriorGarbageFrame(theEnv,&theBlock->newGarbageFrame,theBlock->oldGarbageFrame,NULL);
+  }
+
+/******************/
+/* GCBlockEndUDF: */
+/******************/
+void GCBlockEndUDF(
+  Environment *theEnv,
+  GCBlock *theBlock,
+  UDFValue *rv)
+  {
+   RestorePriorGarbageFrame(theEnv,&theBlock->newGarbageFrame,theBlock->oldGarbageFrame,rv);
+  }
+
+/*************************/
+/* CallCleanupFunctions: */
+/*************************/
+void CallCleanupFunctions(
+  Environment *theEnv)
+  {
+   struct voidCallFunctionItem *cleanupPtr;
+
+   for (cleanupPtr = UtilityData(theEnv)->ListOfCleanupFunctions;
+        cleanupPtr != NULL;
+        cleanupPtr = cleanupPtr->next)
+     { (*cleanupPtr->func)(theEnv,cleanupPtr->context); }
+  }
+
+/**************************************************/
+/* CallPeriodicTasks: Calls the list of functions */
+/*   for handling periodic tasks.                 */
+/**************************************************/
+void CallPeriodicTasks(
+  Environment *theEnv)
+  {
+   struct voidCallFunctionItem *periodPtr;
+
+   if (UtilityData(theEnv)->PeriodicFunctionsEnabled)
+     {
+      for (periodPtr = UtilityData(theEnv)->ListOfPeriodicFunctions;
+           periodPtr != NULL;
+           periodPtr = periodPtr->next)
+        { (*periodPtr->func)(theEnv,periodPtr->context); }
+     }
+  }
+
+/***************************************************/
+/* AddCleanupFunction: Adds a function to the list */
+/*   of functions called to perform cleanup such   */
+/*   as returning free memory to the memory pool.  */
+/***************************************************/
+bool AddCleanupFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunction *theFunction,
+  int priority,
+  void *context)
+  {
+   UtilityData(theEnv)->ListOfCleanupFunctions =
+     AddVoidFunctionToCallList(theEnv,name,priority,theFunction,
+                           UtilityData(theEnv)->ListOfCleanupFunctions,context);
+   return true;
+  }
+
+/****************************************************/
+/* AddPeriodicFunction: Adds a function to the list */
+/*   of functions called to handle periodic tasks.  */
+/****************************************************/
+bool AddPeriodicFunction(
+  Environment *theEnv,
+  const char *name,
+  VoidCallFunction *theFunction,
+  int priority,
+  void *context)
+  {
+   UtilityData(theEnv)->ListOfPeriodicFunctions =
+     AddVoidFunctionToCallList(theEnv,name,priority,theFunction,
+                           UtilityData(theEnv)->ListOfPeriodicFunctions,context);
+   return true;
+  }
+
+/***************************************************/
+/* GetPeriodicFunctionContext: Returns the context */
+/*   associated with a periodic function.          */
+/***************************************************/
+void *GetPeriodicFunctionContext(
+  Environment *theEnv,
+  const char *name)
+  {
+   struct voidCallFunctionItem *theItem;
+
+   theItem = GetVoidFunctionFromCallList(theEnv,name,
+                                         UtilityData(theEnv)->ListOfPeriodicFunctions);
+
+   if (theItem == NULL) return NULL;
+
+   return theItem->context;
+  }
+
+/*******************************************************/
+/* RemoveCleanupFunction: Removes a function from the  */
+/*   list of functions called to perform cleanup such  */
+/*   as returning free memory to the memory pool.      */
+/*******************************************************/
+bool RemoveCleanupFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   UtilityData(theEnv)->ListOfCleanupFunctions =
+      RemoveVoidFunctionFromCallList(theEnv,name,UtilityData(theEnv)->ListOfCleanupFunctions,&found);
+
+   return found;
+  }
+
+/********************************************************/
+/* RemovePeriodicFunction: Removes a function from the  */
+/*   list of functions called to handle periodic tasks. */
+/********************************************************/
+bool RemovePeriodicFunction(
+  Environment *theEnv,
+  const char *name)
+  {
+   bool found;
+
+   UtilityData(theEnv)->ListOfPeriodicFunctions =
+      RemoveVoidFunctionFromCallList(theEnv,name,UtilityData(theEnv)->ListOfPeriodicFunctions,&found);
+
+   return found;
+  }
+
+/*****************************************************/
+/* StringPrintForm: Generates printed representation */
+/*   of a string. Replaces / with // and " with /".  */
+/*****************************************************/
+const char *StringPrintForm(
+  Environment *theEnv,
+  const char *str)
+  {
+   int i = 0;
+   size_t pos = 0;
+   size_t max = 0;
+   char *theString = NULL;
+   CLIPSLexeme *thePtr;
+
+   theString = ExpandStringWithChar(theEnv,'"',theString,&pos,&max,max+80);
+   while (str[i] != EOS)
+     {
+      if ((str[i] == '"') || (str[i] == '\\'))
+        {
+         theString = ExpandStringWithChar(theEnv,'\\',theString,&pos,&max,max+80);
+         theString = ExpandStringWithChar(theEnv,str[i],theString,&pos,&max,max+80);
+        }
+      else
+        { theString = ExpandStringWithChar(theEnv,str[i],theString,&pos,&max,max+80); }
+      i++;
+     }
+
+   theString = ExpandStringWithChar(theEnv,'"',theString,&pos,&max,max+80);
+
+   thePtr = CreateString(theEnv,theString);
+   rm(theEnv,theString,max);
+   
+   return thePtr->contents;
+  }
+
+/**************************************************************/
+/* CopyString: Copies a string using CLIPS memory management. */
+/**************************************************************/
+char *CopyString(
+  Environment *theEnv,
+  const char *theString)
+  {
+   char *stringCopy = NULL;
+
+   if (theString != NULL)
+     {
+      stringCopy = (char *) genalloc(theEnv,strlen(theString) + 1);
+      genstrcpy(stringCopy,theString);
+     }
+
+   return stringCopy;
+  }
+
+/*****************************************************************/
+/* DeleteString: Deletes a string using CLIPS memory management. */
+/*****************************************************************/
+void DeleteString(
+  Environment *theEnv,
+  char *theString)
+  {
+   if (theString != NULL)
+     { genfree(theEnv,theString,strlen(theString) + 1); }
+  }
+
+/***********************************************************/
+/* AppendStrings: Appends two strings together. The string */
+/*   created is added to the SymbolTable, so it is not     */
+/*   necessary to deallocate the string returned.          */
+/***********************************************************/
+const char *AppendStrings(
+  Environment *theEnv,
+  const char *str1,
+  const char *str2)
+  {
+   size_t pos = 0;
+   size_t max = 0;
+   char *theString = NULL;
+   CLIPSLexeme *thePtr;
+
+   theString = AppendToString(theEnv,str1,theString,&pos,&max);
+   theString = AppendToString(theEnv,str2,theString,&pos,&max);
+
+   thePtr = CreateString(theEnv,theString);
+   rm(theEnv,theString,max);
+   return thePtr->contents;
+  }
+
+/******************************************************/
+/* AppendToString: Appends a string to another string */
+/*   (expanding the other string if necessary).       */
+/******************************************************/
+char *AppendToString(
+  Environment *theEnv,
+  const char *appendStr,
+  char *oldStr,
+  size_t *oldPos,
+  size_t *oldMax)
+  {
+   size_t length;
+
+   /*=========================================*/
+   /* Expand the old string so it can contain */
+   /* the new string (if necessary).          */
+   /*=========================================*/
+
+   length = strlen(appendStr);
+
+   /*==============================================================*/
+   /* Return NULL if the old string was not successfully expanded. */
+   /*==============================================================*/
+
+   if ((oldStr = EnlargeString(theEnv,length,oldStr,oldPos,oldMax)) == NULL) { return NULL; }
+
+   /*===============================================*/
+   /* Append the new string to the expanded string. */
+   /*===============================================*/
+
+   genstrcpy(&oldStr[*oldPos],appendStr);
+   *oldPos += length;
+
+   /*============================================================*/
+   /* Return the expanded string containing the appended string. */
+   /*============================================================*/
+
+   return oldStr;
+  }
+
+/**********************************************************/
+/* InsertInString: Inserts a string within another string */
+/*   (expanding the other string if necessary).           */
+/**********************************************************/
+char *InsertInString(
+  Environment *theEnv,
+  const char *insertStr,
+  size_t position,
+  char *oldStr,
+  size_t *oldPos,
+  size_t *oldMax)
+  {
+   size_t length;
+
+   /*=========================================*/
+   /* Expand the old string so it can contain */
+   /* the new string (if necessary).          */
+   /*=========================================*/
+
+   length = strlen(insertStr);
+
+   /*==============================================================*/
+   /* Return NULL if the old string was not successfully expanded. */
+   /*==============================================================*/
+
+   if ((oldStr = EnlargeString(theEnv,length,oldStr,oldPos,oldMax)) == NULL) { return NULL; }
+
+   /*================================================================*/
+   /* Shift the contents to the right of insertion point so that the */
+   /* new text does not overwrite what is currently in the string.   */
+   /*================================================================*/
+
+   memmove(&oldStr[position],&oldStr[position+length],*oldPos - position);
+
+   /*===============================================*/
+   /* Insert the new string in the expanded string. */
+   /*===============================================*/
+
+   genstrncpy(&oldStr[*oldPos],insertStr,length);
+   *oldPos += length;
+
+   /*============================================================*/
+   /* Return the expanded string containing the appended string. */
+   /*============================================================*/
+
+   return(oldStr);
+  }
+
+/*******************************************************************/
+/* EnlargeString: Enlarges a string by the specified amount.       */
+/*******************************************************************/
+char *EnlargeString(
+  Environment *theEnv,
+  size_t length,
+  char *oldStr,
+  size_t *oldPos,
+  size_t *oldMax)
+  {
+   size_t newMax;
+   
+   /*=========================================*/
+   /* Expand the old string so it can contain */
+   /* the new string (if necessary).          */
+   /*=========================================*/
+
+   if (length + *oldPos + 1 > *oldMax)
+     {
+      newMax = length + *oldPos + 1;
+      if (newMax < sizeof(char *))
+        { newMax = sizeof(char *); }
+
+      oldStr = (char *) genrealloc(theEnv,oldStr,*oldMax,newMax);
+      
+      *oldMax = newMax;
+     }
+
+   /*==============================================================*/
+   /* Return NULL if the old string was not successfully expanded. */
+   /*==============================================================*/
+
+   if (oldStr == NULL) { return NULL; }
+
+   return(oldStr);
+  }
+
+/*******************************************************/
+/* AppendNToString: Appends a string to another string */
+/*   (expanding the other string if necessary). Only a */
+/*   specified number of characters are appended from  */
+/*   the string.                                       */
+/*******************************************************/
+char *AppendNToString(
+  Environment *theEnv,
+  const char *appendStr,
+  char *oldStr,
+  size_t length,
+  size_t *oldPos,
+  size_t *oldMax)
+  {
+   size_t lengthWithEOS;
+   size_t newSize;
+
+   /*====================================*/
+   /* Determine the number of characters */
+   /* to be appended from the string.    */
+   /*====================================*/
+
+   if (appendStr[length-1] != '\0') lengthWithEOS = length + 1;
+   else lengthWithEOS = length;
+
+   /*=========================================*/
+   /* Expand the old string so it can contain */
+   /* the new string (if necessary).          */
+   /*=========================================*/
+
+   if (lengthWithEOS + *oldPos > *oldMax)
+     {
+      newSize = *oldPos + lengthWithEOS;
+      if (newSize < sizeof(char *))
+        { newSize = sizeof(char *); }
+
+      oldStr = (char *) genrealloc(theEnv,oldStr,*oldMax,newSize);
+      *oldMax = newSize;
+     }
+
+   /*==============================================================*/
+   /* Return NULL if the old string was not successfully expanded. */
+   /*==============================================================*/
+
+   if (oldStr == NULL) { return NULL; }
+
+   /*==================================*/
+   /* Append N characters from the new */
+   /* string to the expanded string.   */
+   /*==================================*/
+
+   genstrncpy(&oldStr[*oldPos],appendStr,length);
+   *oldPos += (lengthWithEOS - 1);
+   oldStr[*oldPos] = '\0';
+
+   /*============================================================*/
+   /* Return the expanded string containing the appended string. */
+   /*============================================================*/
+
+   return(oldStr);
+  }
+
+/*******************************************************/
+/* ExpandStringWithChar: Adds a character to a string, */
+/*   reallocating space for the string if it needs to  */
+/*   be enlarged. The backspace character causes the   */
+/*   size of the string to reduced if it is "added" to */
+/*   the string.                                       */
+/*******************************************************/
+char *ExpandStringWithChar(
+  Environment *theEnv,
+  int inchar,
+  char *str,
+  size_t *pos,
+  size_t *max,
+  size_t newSize)
+  {
+   if ((*pos + 1) >= *max)
+     {
+      if (newSize < sizeof(char *))
+        { newSize = sizeof(char *); }
+      str = (char *) genrealloc(theEnv,str,*max,newSize);
+      *max = newSize;
+     }
+
+  if (inchar != '\b')
+    {
+     str[*pos] = (char) inchar;
+     (*pos)++;
+     str[*pos] = '\0';
+    }
+  else
+    {
+     /*===========================================================*/
+     /* First delete any UTF-8 multibyte continuation characters. */
+     /*===========================================================*/
+
+     while ((*pos > 1) && IsUTF8MultiByteContinuation(str[*pos - 1]))
+       { (*pos)--; }
+
+     /*===================================================*/
+     /* Now delete the first byte of the UTF-8 character. */
+     /*===================================================*/
+
+     if (*pos > 0) (*pos)--;
+     str[*pos] = '\0';
+    }
+
+   return(str);
+  }
+
+/**********************************************************/
+/* AddVoidFunctionToCallList: Adds a function to a list   */
+/*   of functions which are called to perform certain     */
+/*   operations (e.g. clear, reset, and bload functions). */
+/**********************************************************/
+struct voidCallFunctionItem *AddVoidFunctionToCallList(
+  Environment *theEnv,
+  const char *name,
+  int priority,
+  VoidCallFunction *func,
+  struct voidCallFunctionItem *head,
+  void *context)
+  {
+   struct voidCallFunctionItem *newPtr, *currentPtr, *lastPtr = NULL;
+   char  *nameCopy;
+
+   newPtr = get_struct(theEnv,voidCallFunctionItem);
+
+   nameCopy = (char *) genalloc(theEnv,strlen(name) + 1);
+   genstrcpy(nameCopy,name);
+   newPtr->name = nameCopy;
+
+   newPtr->func = func;
+   newPtr->priority = priority;
+   newPtr->context = context;
+
+   if (head == NULL)
+     {
+      newPtr->next = NULL;
+      return(newPtr);
+     }
+
+   currentPtr = head;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = head;
+      head = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   return(head);
+  }
+
+/**********************************************************/
+/* AddBoolFunctionToCallList: Adds a function to a list   */
+/*   of functions which are called to perform certain     */
+/*   operations (e.g. clear, reset, and bload functions). */
+/**********************************************************/
+BoolCallFunctionItem *AddBoolFunctionToCallList(
+  Environment *theEnv,
+  const char *name,
+  int priority,
+  BoolCallFunction *func,
+  BoolCallFunctionItem *head,
+  void *context)
+  {
+   struct boolCallFunctionItem *newPtr, *currentPtr, *lastPtr = NULL;
+   char  *nameCopy;
+
+   newPtr = get_struct(theEnv,boolCallFunctionItem);
+
+   nameCopy = (char *) genalloc(theEnv,strlen(name) + 1);
+   genstrcpy(nameCopy,name);
+   newPtr->name = nameCopy;
+
+   newPtr->func = func;
+   newPtr->priority = priority;
+   newPtr->context = context;
+
+   if (head == NULL)
+     {
+      newPtr->next = NULL;
+      return(newPtr);
+     }
+
+   currentPtr = head;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = head;
+      head = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   return(head);
+  }
+
+/****************************************************************/
+/* GetVoidFunctionFromCallList: Retrieves a function from a list of */
+/*   functions which are called to perform certain operations   */
+/*   (e.g. clear, reset, and bload functions).                  */
+/****************************************************************/
+struct voidCallFunctionItem *GetVoidFunctionFromCallList(
+  Environment *theEnv,
+  const char *name,
+  struct voidCallFunctionItem *head)
+  {
+   struct voidCallFunctionItem *currentPtr;
+
+   for (currentPtr = head; currentPtr != NULL; currentPtr = currentPtr->next)
+     {
+      if (strcmp(name,currentPtr->name) == 0)
+        { return currentPtr; }
+     }
+
+   return NULL;
+  }
+
+/****************************************************************/
+/* GetBoolFunctionFromCallList: Retrieves a function from a list of */
+/*   functions which are called to perform certain operations   */
+/*   (e.g. clear, reset, and bload functions).                  */
+/****************************************************************/
+struct boolCallFunctionItem *GetBoolFunctionFromCallList(
+  Environment *theEnv,
+  const char *name,
+  struct boolCallFunctionItem *head)
+  {
+   struct boolCallFunctionItem *currentPtr;
+
+   for (currentPtr = head; currentPtr != NULL; currentPtr = currentPtr->next)
+     {
+      if (strcmp(name,currentPtr->name) == 0)
+        { return currentPtr; }
+     }
+
+   return NULL;
+  }
+
+/******************************************************************/
+/* RemoveVoidFunctionFromCallList: Removes a function from a list */
+/*   of functions which are called to perform certain operations  */
+/*   (e.g. clear, reset, and bload functions).                    */
+/******************************************************************/
+struct voidCallFunctionItem *RemoveVoidFunctionFromCallList(
+  Environment *theEnv,
+  const char *name,
+  struct voidCallFunctionItem *head,
+  bool *found)
+  {
+   struct voidCallFunctionItem *currentPtr, *lastPtr;
+
+   *found = false;
+   lastPtr = NULL;
+   currentPtr = head;
+
+   while (currentPtr != NULL)
+     {
+      if (strcmp(name,currentPtr->name) == 0)
+        {
+         *found = true;
+         if (lastPtr == NULL)
+           { head = currentPtr->next; }
+         else
+           { lastPtr->next = currentPtr->next; }
+
+         genfree(theEnv,(void *) currentPtr->name,strlen(currentPtr->name) + 1);
+         rtn_struct(theEnv,voidCallFunctionItem,currentPtr);
+         return head;
+        }
+
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   return head;
+  }
+
+/******************************************************************/
+/* RemoveBoolFunctionFromCallList: Removes a function from a list */
+/*   of functions which are called to perform certain operations  */
+/*   (e.g. clear, reset, and bload functions).                    */
+/******************************************************************/
+struct boolCallFunctionItem *RemoveBoolFunctionFromCallList(
+  Environment *theEnv,
+  const char *name,
+  struct boolCallFunctionItem *head,
+  bool *found)
+  {
+   struct boolCallFunctionItem *currentPtr, *lastPtr;
+
+   *found = false;
+   lastPtr = NULL;
+   currentPtr = head;
+
+   while (currentPtr != NULL)
+     {
+      if (strcmp(name,currentPtr->name) == 0)
+        {
+         *found = true;
+         if (lastPtr == NULL)
+           { head = currentPtr->next; }
+         else
+           { lastPtr->next = currentPtr->next; }
+
+         genfree(theEnv,(void *) currentPtr->name,strlen(currentPtr->name) + 1);
+         rtn_struct(theEnv,boolCallFunctionItem,currentPtr);
+         return head;
+        }
+
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   return head;
+  }
+
+/*************************************************************/
+/* DeallocateVoidCallList: Removes all functions from a list */
+/*   of functions which are called to perform certain        */
+/*   operations (e.g. clear, reset, and bload functions).    */
+/*************************************************************/
+void DeallocateVoidCallList(
+  Environment *theEnv,
+  struct voidCallFunctionItem *theList)
+  {
+   struct voidCallFunctionItem *tmpPtr, *nextPtr;
+
+   tmpPtr = theList;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      genfree(theEnv,(void *) tmpPtr->name,strlen(tmpPtr->name) + 1);
+      rtn_struct(theEnv,voidCallFunctionItem,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/*************************************************************/
+/* DeallocateBoolCallList: Removes all functions from a list */
+/*   of functions which are called to perform certain        */
+/*   operations (e.g. clear, reset, and bload functions).    */
+/*************************************************************/
+void DeallocateBoolCallList(
+  Environment *theEnv,
+  struct boolCallFunctionItem *theList)
+  {
+   struct boolCallFunctionItem *tmpPtr, *nextPtr;
+
+   tmpPtr = theList;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      genfree(theEnv,(void *) tmpPtr->name,strlen(tmpPtr->name) + 1);
+      rtn_struct(theEnv,boolCallFunctionItem,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/***********************************************************/
+/* AddFunctionToCallListWithArg: Adds a function to a list */
+/*   of functions which are called to perform certain      */
+/*   operations (e.g. clear, reset, and bload functions).  */
+/***********************************************************/
+struct callFunctionItemWithArg *AddFunctionToCallListWithArg(
+  Environment *theEnv,
+  const char *name,
+  int priority,
+  VoidCallFunctionWithArg *func,
+  struct callFunctionItemWithArg *head,
+  void *context)
+  {
+   struct callFunctionItemWithArg *newPtr, *currentPtr, *lastPtr = NULL;
+
+   newPtr = get_struct(theEnv,callFunctionItemWithArg);
+
+   newPtr->name = name;
+   newPtr->func = func;
+   newPtr->priority = priority;
+   newPtr->context = context;
+
+   if (head == NULL)
+     {
+      newPtr->next = NULL;
+      return(newPtr);
+     }
+
+   currentPtr = head;
+   while ((currentPtr != NULL) ? (priority < currentPtr->priority) : false)
+     {
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = head;
+      head = newPtr;
+     }
+   else
+     {
+      newPtr->next = currentPtr;
+      lastPtr->next = newPtr;
+     }
+
+   return(head);
+  }
+
+/**************************************************************/
+/* RemoveFunctionFromCallListWithArg: Removes a function from */
+/*   a list of functions which are called to perform certain  */
+/*   operations (e.g. clear, reset, and bload functions).     */
+/**************************************************************/
+struct callFunctionItemWithArg *RemoveFunctionFromCallListWithArg(
+  Environment *theEnv,
+  const char *name,
+  struct callFunctionItemWithArg *head,
+  bool *found)
+  {
+   struct callFunctionItemWithArg *currentPtr, *lastPtr;
+
+   *found = false;
+   lastPtr = NULL;
+   currentPtr = head;
+
+   while (currentPtr != NULL)
+     {
+      if (strcmp(name,currentPtr->name) == 0)
+        {
+         *found = true;
+         if (lastPtr == NULL)
+           { head = currentPtr->next; }
+         else
+           { lastPtr->next = currentPtr->next; }
+
+         rtn_struct(theEnv,callFunctionItemWithArg,currentPtr);
+         return(head);
+        }
+
+      lastPtr = currentPtr;
+      currentPtr = currentPtr->next;
+     }
+
+   return(head);
+  }
+
+/****************************************************************/
+/* DeallocateCallListWithArg: Removes all functions from a list */
+/*   of functions which are called to perform certain           */
+/*   operations (e.g. clear, reset, and bload functions).       */
+/****************************************************************/
+void DeallocateCallListWithArg(
+  Environment *theEnv,
+  struct callFunctionItemWithArg *theList)
+  {
+   struct callFunctionItemWithArg *tmpPtr, *nextPtr;
+
+   tmpPtr = theList;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      rtn_struct(theEnv,callFunctionItemWithArg,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/*****************************************/
+/* ItemHashValue: Returns the hash value */
+/*   for the specified value.            */
+/*****************************************/
+size_t ItemHashValue(
+  Environment *theEnv,
+  unsigned short theType,
+  void *theValue,
+  size_t theRange)
+  {
+#if OBJECT_SYSTEM
+   union
+     {
+      void *vv;
+      unsigned uv;
+     } fis;
+#endif
+
+   switch(theType)
+     {
+      case FLOAT_TYPE:
+        return HashFloat(((CLIPSFloat *) theValue)->contents,theRange);
+
+      case INTEGER_TYPE:
+        return HashInteger(((CLIPSInteger *) theValue)->contents,theRange);
+
+      case SYMBOL_TYPE:
+      case STRING_TYPE:
+#if OBJECT_SYSTEM
+      case INSTANCE_NAME_TYPE:
+#endif
+        return HashSymbol(((CLIPSLexeme *) theValue)->contents,theRange);
+
+      case MULTIFIELD_TYPE:
+        return HashMultifield((Multifield *) theValue,theRange);
+
+#if DEFTEMPLATE_CONSTRUCT
+      case FACT_ADDRESS_TYPE:
+        return (((Fact *) theValue)->hashValue % theRange);
+#endif
+
+      case EXTERNAL_ADDRESS_TYPE:
+        return HashExternalAddress(((CLIPSExternalAddress *) theValue)->contents,theRange);
+
+#if OBJECT_SYSTEM
+      case INSTANCE_ADDRESS_TYPE:
+        fis.uv = 0;
+        fis.vv = theValue;
+        return (fis.uv % theRange);
+#endif
+     }
+
+   SystemError(theEnv,"UTILITY",1);
+   return 0;
+  }
+
+/********************************************/
+/* YieldTime: Yields time to a user-defined */
+/*   function. Intended to allow foreground */
+/*   application responsiveness when CLIPS  */
+/*   is running in the background.          */
+/********************************************/
+void YieldTime(
+  Environment *theEnv)
+  {
+   if ((UtilityData(theEnv)->YieldTimeFunction != NULL) && UtilityData(theEnv)->YieldFunctionEnabled)
+     { (*UtilityData(theEnv)->YieldTimeFunction)(); }
+  }
+
+/****************************/
+/* EnablePeriodicFunctions: */
+/****************************/
+bool EnablePeriodicFunctions(
+  Environment *theEnv,
+  bool value)
+  {
+   bool oldValue;
+
+   oldValue = UtilityData(theEnv)->PeriodicFunctionsEnabled;
+
+   UtilityData(theEnv)->PeriodicFunctionsEnabled = value;
+
+   return oldValue;
+  }
+
+/************************/
+/* EnableYieldFunction: */
+/************************/
+bool EnableYieldFunction(
+  Environment *theEnv,
+  bool value)
+  {
+   bool oldValue;
+
+   oldValue = UtilityData(theEnv)->YieldFunctionEnabled;
+
+   UtilityData(theEnv)->YieldFunctionEnabled = value;
+
+   return oldValue;
+  }
+
+/*************************************************************************/
+/* AddTrackedMemory: Tracked memory is memory allocated by CLIPS that's  */
+/*   referenced by a variable on the stack, but not by any environment   */
+/*   data structure. An example would be the storage for local variables */
+/*   allocated when a deffunction is executed. Tracking this memory      */
+/*   allows it to be removed later when using longjmp as the code that   */
+/*   would normally deallocate the memory would be bypassed.             */
+/*************************************************************************/
+struct trackedMemory *AddTrackedMemory(
+  Environment *theEnv,
+  void *theMemory,
+  size_t theSize)
+  {
+   struct trackedMemory *newPtr;
+
+   newPtr = get_struct(theEnv,trackedMemory);
+
+   newPtr->prev = NULL;
+   newPtr->theMemory = theMemory;
+   newPtr->memSize = theSize;
+   newPtr->next = UtilityData(theEnv)->trackList;
+   UtilityData(theEnv)->trackList = newPtr;
+
+   return newPtr;
+  }
+
+/************************/
+/* RemoveTrackedMemory: */
+/************************/
+void RemoveTrackedMemory(
+  Environment *theEnv,
+  struct trackedMemory *theTracker)
+  {
+   if (theTracker->prev == NULL)
+     { UtilityData(theEnv)->trackList = theTracker->next; }
+   else
+     { theTracker->prev->next = theTracker->next; }
+
+   if (theTracker->next != NULL)
+     { theTracker->next->prev = theTracker->prev; }
+
+   rtn_struct(theEnv,trackedMemory,theTracker);
+  }
+
+/******************************************/
+/* UTF8Length: Returns the logical number */
+/*   of characters in a UTF8 string.      */
+/******************************************/
+size_t UTF8Length(
+  const char *s)
+  {
+   size_t i = 0, length = 0;
+
+   while (s[i] != '\0')
+     {
+      UTF8Increment(s,&i);
+      length++;
+     }
+
+   return(length);
+  }
+
+/*********************************************/
+/* UTF8Increment: Finds the beginning of the */
+/*   next character in a UTF8 string.        */
+/*********************************************/
+void UTF8Increment(
+  const char *s,
+  size_t *i)
+  {
+   (void) (IsUTF8Start(s[++(*i)]) ||
+           IsUTF8Start(s[++(*i)]) ||
+           IsUTF8Start(s[++(*i)]) ||
+           ++(*i));
+  }
+
+/****************************************************/
+/* UTF8Offset: Converts the logical character index */
+/*   in a UTF8 string to the actual byte offset.    */
+/****************************************************/
+size_t UTF8Offset(
+  const char *str,
+  size_t charnum)
+  {
+   size_t offs = 0;
+
+   while ((charnum > 0) && (str[offs]))
+     {
+      (void) (IsUTF8Start(str[++offs]) ||
+              IsUTF8Start(str[++offs]) ||
+              IsUTF8Start(str[++offs]) ||
+              ++offs);
+
+      charnum--;
+     }
+
+   return offs;
+  }
+
+/*************************************************/
+/* UTF8CharNum: Converts the UTF8 character byte */
+/*   offset to the logical character index.      */
+/*************************************************/
+size_t UTF8CharNum(
+  const char *s,
+  size_t offset)
+  {
+   size_t charnum = 0, offs=0;
+
+   while ((offs < offset) && (s[offs]))
+     {
+      (void) (IsUTF8Start(s[++offs]) ||
+              IsUTF8Start(s[++offs]) ||
+              IsUTF8Start(s[++offs]) ||
+              ++offs);
+
+      charnum++;
+     }
+
+   return charnum;
+  }
+
+/************************/
+/* CreateStringBuilder: */
+/************************/
+StringBuilder *CreateStringBuilder(
+  Environment *theEnv,
+  size_t theSize)
+  {
+   StringBuilder *theSB;
+   
+   theSB = get_struct(theEnv,stringBuilder);
+   if (theSB == NULL) return NULL;
+   
+   theSize++;
+   theSB->sbEnv = theEnv;
+   theSB->bufferReset = theSize;
+   theSB->bufferMaximum = theSize;
+   theSB->length = 0;
+   theSB->contents = (char *) gm2(theEnv,theSize);
+   theSB->contents[0] = EOS;
+   
+   return theSB;
+  }
+
+/*************/
+/* SBAppend: */
+/*************/
+void SBAppend(
+  StringBuilder *theSB,
+  const char *appendString)
+  {
+   theSB->contents = AppendToString(theSB->sbEnv,appendString,
+                                    theSB->contents,&theSB->length,&theSB->bufferMaximum);
+  }
+
+/********************/
+/* SBAppendInteger: */
+/********************/
+void SBAppendInteger(
+  StringBuilder *theSB,
+  long long value)
+  {
+   const char *appendString;
+
+   appendString = LongIntegerToString(theSB->sbEnv,value);
+
+   theSB->contents = AppendToString(theSB->sbEnv,appendString,
+                                    theSB->contents,&theSB->length,&theSB->bufferMaximum);
+  }
+
+/******************/
+/* SBAppendFloat: */
+/******************/
+void SBAppendFloat(
+  StringBuilder *theSB,
+  double value)
+  {
+   const char *appendString;
+
+   appendString = FloatToString(theSB->sbEnv,value);
+
+   theSB->contents = AppendToString(theSB->sbEnv,appendString,
+                                    theSB->contents,&theSB->length,&theSB->bufferMaximum);
+  }
+
+/**************/
+/* SBAddChar: */
+/**************/
+void SBAddChar(
+  StringBuilder *theSB,
+  int theChar)
+  {
+   theSB->contents = ExpandStringWithChar(theSB->sbEnv,theChar,theSB->contents,
+                                          &theSB->length,&theSB->bufferMaximum,
+                                          theSB->bufferMaximum+80);
+  }
+
+/***********/
+/* SBReset */
+/***********/
+void SBReset(
+  StringBuilder *theSB)
+  {
+   if (theSB->bufferReset != theSB->bufferMaximum)
+     {
+      rm(theSB->sbEnv,theSB->contents,theSB->bufferMaximum);
+      theSB->contents = (char *) gm2(theSB->sbEnv,theSB->bufferReset);
+      theSB->bufferMaximum = theSB->bufferReset;
+     }
+     
+   theSB->length = 0;
+   theSB->contents[0] = EOS;
+  }
+
+/**********/
+/* SBCopy */
+/**********/
+char *SBCopy(
+  StringBuilder *theSB)
+  {
+   char *stringCopy;
+
+   stringCopy = (char *) malloc(strlen(theSB->contents) + 1);
+   strcpy(stringCopy,theSB->contents);
+
+   return stringCopy;
+  }
+
+/**************/
+/* SBDispose: */
+/**************/
+void SBDispose(
+  StringBuilder *theSB)
+  {
+   Environment *theEnv = theSB->sbEnv;
+   rm(theEnv,theSB->contents,theSB->bufferMaximum);
+   rtn_struct(theEnv,stringBuilder,theSB);
+  }
+
diff --git a/clips/utility.h b/clips/utility.h
new file mode 100755
index 000000000..b771e1814
--- /dev/null
+++ b/clips/utility.h
@@ -0,0 +1,236 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  11/15/17            */
+   /*                                                     */
+   /*                 UTILITY HEADER FILE                 */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Provides a set of utility functions useful to    */
+/*   other modules. Primarily these are the functions for    */
+/*   handling periodic garbage collection and appending      */
+/*   string data.                                            */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*      6.30: Changed integer type/precision.                */
+/*                                                           */
+/*            Changed garbage collection algorithm.          */
+/*                                                           */
+/*            Added CopyString, DeleteString,                */
+/*            InsertInString,and EnlargeString functions.    */
+/*                                                           */
+/*            Used genstrncpy function instead of strncpy    */
+/*            function.                                      */
+/*                                                           */
+/*            Support for typed EXTERNAL_ADDRESS_TYPE.       */
+/*                                                           */
+/*            Support for tracked memory (allows memory to   */
+/*            be freed if CLIPS is exited while executing).  */
+/*                                                           */
+/*            Added UTF-8 routines.                          */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            Callbacks must be environment aware.           */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*            Added GCBlockStart and GCBlockEnd functions    */
+/*            for garbage collection blocks.                 */
+/*                                                           */
+/*            Added StringBuilder functions.                 */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_utility
+
+#pragma once
+
+#define _H_utility
+
+#include <stdlib.h>
+
+typedef struct callFunctionItem CallFunctionItem;
+typedef struct callFunctionItemWithArg CallFunctionItemWithArg;
+typedef struct boolCallFunctionItem BoolCallFunctionItem;
+typedef struct voidCallFunctionItem VoidCallFunctionItem;
+
+#include "evaluatn.h"
+#include "moduldef.h"
+
+typedef struct gcBlock GCBlock;
+typedef struct stringBuilder StringBuilder;
+
+struct voidCallFunctionItem
+  {
+   const char *name;
+   VoidCallFunction *func;
+   int priority;
+   struct voidCallFunctionItem *next;
+   void *context;
+  };
+
+struct boolCallFunctionItem
+  {
+   const char *name;
+   BoolCallFunction *func;
+   int priority;
+   struct boolCallFunctionItem *next;
+   void *context;
+  };
+
+struct callFunctionItemWithArg
+  {
+   const char *name;
+   VoidCallFunctionWithArg *func;
+   int priority;
+   struct callFunctionItemWithArg *next;
+   void *context;
+  };
+
+struct trackedMemory
+  {
+   void *theMemory;
+   struct trackedMemory *next;
+   struct trackedMemory *prev;
+   size_t memSize;
+  };
+
+struct garbageFrame
+  {
+   bool dirty;
+   struct garbageFrame *priorFrame;
+   struct ephemeron *ephemeralSymbolList;
+   struct ephemeron *ephemeralFloatList;
+   struct ephemeron *ephemeralIntegerList;
+   struct ephemeron *ephemeralBitMapList;
+   struct ephemeron *ephemeralExternalAddressList;
+   Multifield *ListOfMultifields;
+   Multifield *LastMultifield;
+  };
+
+struct gcBlock
+  {
+   struct garbageFrame newGarbageFrame;
+   struct garbageFrame *oldGarbageFrame;
+   UDFValue *result;
+  };
+
+struct stringBuilder
+  {
+   Environment *sbEnv;
+   char *contents;
+   size_t bufferReset;
+   size_t length;
+   size_t bufferMaximum;
+  };
+
+#define UTILITY_DATA 55
+
+struct utilityData
+  {
+   struct voidCallFunctionItem *ListOfCleanupFunctions;
+   struct voidCallFunctionItem *ListOfPeriodicFunctions;
+   bool PeriodicFunctionsEnabled;
+   bool YieldFunctionEnabled;
+   void (*YieldTimeFunction)(void);
+   struct trackedMemory *trackList;
+   struct garbageFrame MasterGarbageFrame;
+   struct garbageFrame *CurrentGarbageFrame;
+  };
+
+#define UtilityData(theEnv) ((struct utilityData *) GetEnvironmentData(theEnv,UTILITY_DATA))
+
+  /* Is c the start of a utf8 sequence? */
+#define IsUTF8Start(ch) (((ch) & 0xC0) != 0x80)
+#define IsUTF8MultiByteStart(ch) ((((unsigned char) ch) >= 0xC0) && (((unsigned char) ch) <= 0xF7))
+#define IsUTF8MultiByteContinuation(ch) ((((unsigned char) ch) >= 0x80) && (((unsigned char) ch) <= 0xBF))
+
+   void                           InitializeUtilityData(Environment *);
+   bool                           AddCleanupFunction(Environment *,const char *,VoidCallFunction *,int,void *);
+   bool                           AddPeriodicFunction(Environment *,const char *,VoidCallFunction *,int,void *);
+   bool                           RemoveCleanupFunction(Environment *,const char *);
+   bool                           RemovePeriodicFunction(Environment *,const char *);
+   char                          *CopyString(Environment *,const char *);
+   void                           DeleteString(Environment *,char *);
+   const char                    *AppendStrings(Environment *,const char *,const char *);
+   const char                    *StringPrintForm(Environment *,const char *);
+   char                          *AppendToString(Environment *,const char *,char *,size_t *,size_t *);
+   char                          *InsertInString(Environment *,const char *,size_t,char *,size_t *,size_t *);
+   char                          *AppendNToString(Environment *,const char *,char *,size_t,size_t *,size_t *);
+   char                          *EnlargeString(Environment *,size_t,char *,size_t *,size_t *);
+   char                          *ExpandStringWithChar(Environment *,int,char *,size_t *,size_t *,size_t);
+   VoidCallFunctionItem          *AddVoidFunctionToCallList(Environment *,const char *,int,VoidCallFunction *,
+                                                            VoidCallFunctionItem *,void *);
+   BoolCallFunctionItem          *AddBoolFunctionToCallList(Environment *,const char *,int,BoolCallFunction *,
+                                                            BoolCallFunctionItem *,void *);
+   VoidCallFunctionItem          *RemoveVoidFunctionFromCallList(Environment *,const char *,
+                                                                 VoidCallFunctionItem *,bool *);
+   BoolCallFunctionItem          *RemoveBoolFunctionFromCallList(Environment *,const char *,
+                                                                 BoolCallFunctionItem *,bool *);
+   void                           DeallocateVoidCallList(Environment *,VoidCallFunctionItem *);
+   void                           DeallocateBoolCallList(Environment *,BoolCallFunctionItem *);
+   CallFunctionItemWithArg       *AddFunctionToCallListWithArg(Environment *,const char *,int,
+                                                               VoidCallFunctionWithArg *,
+                                                               CallFunctionItemWithArg *,void *);
+   CallFunctionItemWithArg       *RemoveFunctionFromCallListWithArg(Environment *,const char *,
+                                                                            struct callFunctionItemWithArg *,
+                                                                            bool *);
+   void                           DeallocateCallListWithArg(Environment *,struct callFunctionItemWithArg *);
+   VoidCallFunctionItem          *GetVoidFunctionFromCallList(Environment *,const char *,VoidCallFunctionItem *);
+   BoolCallFunctionItem          *GetBoolFunctionFromCallList(Environment *,const char *,BoolCallFunctionItem *);
+   size_t                         ItemHashValue(Environment *,unsigned short,void *,size_t);
+   void                           YieldTime(Environment *);
+   bool                           EnablePeriodicFunctions(Environment *,bool);
+   bool                           EnableYieldFunction(Environment *,bool);
+   struct trackedMemory          *AddTrackedMemory(Environment *,void *,size_t);
+   void                           RemoveTrackedMemory(Environment *,struct trackedMemory *);
+   void                           UTF8Increment(const char *,size_t *);
+   size_t                         UTF8Offset(const char *,size_t);
+   size_t                         UTF8Length(const char *);
+   size_t                         UTF8CharNum(const char *,size_t);
+   void                           RestorePriorGarbageFrame(Environment *,struct garbageFrame *,struct garbageFrame *,UDFValue *);
+   void                           CallCleanupFunctions(Environment *);
+   void                           CallPeriodicTasks(Environment *);
+   void                           CleanCurrentGarbageFrame(Environment *,UDFValue *);
+   void                           GCBlockStart(Environment *,GCBlock *);
+   void                           GCBlockEnd(Environment *,GCBlock *);
+   void                           GCBlockEndUDF(Environment *,GCBlock *,UDFValue *);
+   StringBuilder                 *CreateStringBuilder(Environment *,size_t);
+   void                           SBDispose(StringBuilder *);
+   void                           SBAppend(StringBuilder *,const char *);
+   void                           SBAppendInteger(StringBuilder *,long long);
+   void                           SBAppendFloat(StringBuilder *,double);
+   void                           SBAddChar(StringBuilder *,int);
+   void                           SBReset(StringBuilder *);
+   char                          *SBCopy(StringBuilder *);
+   void                          *GetPeriodicFunctionContext(Environment *,const char *);
+
+#endif /* _H_utility */
+
+
+
+
diff --git a/clips/watch.c b/clips/watch.c
new file mode 100755
index 000000000..5a3f38d4e
--- /dev/null
+++ b/clips/watch.c
@@ -0,0 +1,865 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*            CLIPS Version 6.40  08/25/16             */
+   /*                                                     */
+   /*                    WATCH MODULE                     */
+   /*******************************************************/
+
+
+/*************************************************************/
+/* Purpose: Support functions for the watch and unwatch      */
+/*   commands.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*      Brian Dantes                                         */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added EnvSetWatchItem function.                */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Added Env prefix to GetEvaluationError and     */
+/*            SetEvaluationError functions.                  */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Changed return values for router functions.    */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#include "setup.h"
+
+#if DEBUGGING_FUNCTIONS
+
+#include <stdio.h>
+#include <string.h>
+
+#include "argacces.h"
+#include "constant.h"
+#include "envrnmnt.h"
+#include "extnfunc.h"
+#include "memalloc.h"
+#include "router.h"
+
+#include "watch.h"
+
+/***************************************/
+/* LOCAL INTERNAL FUNCTION DEFINITIONS */
+/***************************************/
+
+   static WatchItemRecord        *ValidWatchItem(Environment *,const char *,bool *);
+   static void                    DeallocateWatchData(Environment *);
+
+/**********************************************/
+/* InitializeWatchData: Allocates environment */
+/*    data for watch items.                   */
+/**********************************************/
+void InitializeWatchData(
+  Environment *theEnv)
+  {
+   AllocateEnvironmentData(theEnv,WATCH_DATA,sizeof(struct watchData),DeallocateWatchData);
+  }
+
+/************************************************/
+/* DeallocateWatchData: Deallocates environment */
+/*    data for watch items.                     */
+/************************************************/
+static void DeallocateWatchData(
+  Environment *theEnv)
+  {
+   WatchItemRecord *tmpPtr, *nextPtr;
+
+   tmpPtr = WatchData(theEnv)->ListOfWatchItems;
+   while (tmpPtr != NULL)
+     {
+      nextPtr = tmpPtr->next;
+      rtn_struct(theEnv,watchItemRecord,tmpPtr);
+      tmpPtr = nextPtr;
+     }
+  }
+
+/*************************************************************/
+/* AddWatchItem: Adds an item to the list of watchable items */
+/*   that can be set using the watch and unwatch commands.   */
+/*   Returns false if the item is already in the list,       */
+/*   otherwise returns true.                                 */
+/*************************************************************/
+bool AddWatchItem(
+  Environment *theEnv,
+  const char *name,
+  int code,
+  bool *flag,
+  int priority,
+  bool (*accessFunc)(Environment *,int,bool,struct expr *),
+  bool (*printFunc)(Environment *,const char *,int,struct expr *))
+  {
+   WatchItemRecord *newPtr, *currentPtr, *lastPtr;
+
+   /*================================================================*/
+   /* Find the insertion point in the watchable items list to place  */
+   /* the new item. If the item is already in the list return false. */
+   /*================================================================*/
+
+   for (currentPtr = WatchData(theEnv)->ListOfWatchItems, lastPtr = NULL;
+        currentPtr != NULL;
+        currentPtr = currentPtr->next)
+     {
+      if (strcmp(currentPtr->name,name) == 0) return false;
+      if (priority < currentPtr->priority) lastPtr = currentPtr;
+     }
+
+   /*============================*/
+   /* Create the new watch item. */
+   /*============================*/
+
+   newPtr = get_struct(theEnv,watchItemRecord);
+   newPtr->name = name;
+   newPtr->flag = flag;
+   newPtr->code = code;
+   newPtr->priority = priority;
+   newPtr->accessFunc = accessFunc;
+   newPtr->printFunc = printFunc;
+
+   /*=================================================*/
+   /* Insert the new item in the list of watch items. */
+   /*=================================================*/
+
+   if (lastPtr == NULL)
+     {
+      newPtr->next = WatchData(theEnv)->ListOfWatchItems;
+      WatchData(theEnv)->ListOfWatchItems = newPtr;
+     }
+   else
+     {
+      newPtr->next = lastPtr->next;
+      lastPtr->next = newPtr;
+     }
+
+   /*==================================================*/
+   /* Return true to indicate the item has been added. */
+   /*==================================================*/
+
+   return true;
+  }
+
+/**************************************************/
+/* Watch: C access routine for the watch command. */
+/**************************************************/
+void Watch(
+  Environment *theEnv,
+  WatchItem item)
+  {
+   switch (item)
+     {
+      case ALL:
+        SetWatchItem(theEnv,"all",true,NULL);
+        break;
+
+      case FACTS:
+        SetWatchItem(theEnv,"facts",true,NULL);
+        break;
+        
+      case INSTANCES:
+        SetWatchItem(theEnv,"instances",true,NULL);
+        break;
+        
+      case SLOTS:
+        SetWatchItem(theEnv,"slots",true,NULL);
+        break;
+        
+      case RULES:
+        SetWatchItem(theEnv,"rules",true,NULL);
+        break;
+        
+      case ACTIVATIONS:
+        SetWatchItem(theEnv,"activations",true,NULL);
+        break;
+        
+      case MESSAGES:
+        SetWatchItem(theEnv,"messages",true,NULL);
+        break;
+        
+      case MESSAGE_HANDLERS:
+        SetWatchItem(theEnv,"message-handlers",true,NULL);
+        break;
+        
+      case GENERIC_FUNCTIONS:
+        SetWatchItem(theEnv,"generic-functions",true,NULL);
+        break;
+        
+      case METHODS:
+        SetWatchItem(theEnv,"methods",true,NULL);
+        break;
+        
+      case DEFFUNCTIONS:
+        SetWatchItem(theEnv,"deffunctions",true,NULL);
+        break;
+        
+      case COMPILATIONS:
+        SetWatchItem(theEnv,"compilations",true,NULL);
+        break;
+        
+      case STATISTICS:
+        SetWatchItem(theEnv,"statistics",true,NULL);
+        break;
+        
+      case GLOBALS:
+        SetWatchItem(theEnv,"globals",true,NULL);
+        break;
+        
+      case FOCUS:
+        SetWatchItem(theEnv,"focus",true,NULL);
+        break;
+     }
+  }
+
+/****************************************************/
+/* Unwatch: C access routine for the watch command. */
+/****************************************************/
+void Unwatch(
+  Environment *theEnv,
+  WatchItem item)
+  {
+   switch (item)
+     {
+      case ALL:
+        SetWatchItem(theEnv,"all",false,NULL);
+        break;
+
+      case FACTS:
+        SetWatchItem(theEnv,"facts",false,NULL);
+        break;
+        
+      case INSTANCES:
+        SetWatchItem(theEnv,"instances",false,NULL);
+        break;
+        
+      case SLOTS:
+        SetWatchItem(theEnv,"slots",false,NULL);
+        break;
+        
+      case RULES:
+        SetWatchItem(theEnv,"rules",false,NULL);
+        break;
+        
+      case ACTIVATIONS:
+        SetWatchItem(theEnv,"activations",false,NULL);
+        break;
+        
+      case MESSAGES:
+        SetWatchItem(theEnv,"messages",false,NULL);
+        break;
+        
+      case MESSAGE_HANDLERS:
+        SetWatchItem(theEnv,"message-handlers",false,NULL);
+        break;
+        
+      case GENERIC_FUNCTIONS:
+        SetWatchItem(theEnv,"generic-functions",false,NULL);
+        break;
+        
+      case METHODS:
+        SetWatchItem(theEnv,"methods",false,NULL);
+        break;
+        
+      case DEFFUNCTIONS:
+        SetWatchItem(theEnv,"deffunctions",false,NULL);
+        break;
+        
+      case COMPILATIONS:
+        SetWatchItem(theEnv,"compilations",false,NULL);
+        break;
+        
+      case STATISTICS:
+        SetWatchItem(theEnv,"statistics",false,NULL);
+        break;
+        
+      case GLOBALS:
+        SetWatchItem(theEnv,"globals",false,NULL);
+        break;
+        
+      case FOCUS:
+        SetWatchItem(theEnv,"focus",false,NULL);
+        break;
+     }
+  }
+
+/******************************************/
+/* GetWatchState: Returns the watch state */
+/*   for the specified watch item.        */
+/******************************************/
+bool GetWatchState(
+  Environment *theEnv,
+  WatchItem item)
+  {
+   switch (item)
+     {
+      case ALL:
+        return false;
+
+      case FACTS:
+        return (GetWatchItem(theEnv,"facts") == 1);
+        
+      case INSTANCES:
+        return (GetWatchItem(theEnv,"instances") == 1);
+        
+      case SLOTS:
+        return (GetWatchItem(theEnv,"slots") == 1);
+        
+      case RULES:
+        return (GetWatchItem(theEnv,"rules") == 1);
+        
+      case ACTIVATIONS:
+        return (GetWatchItem(theEnv,"activations") == 1);
+        
+      case MESSAGES:
+        return (GetWatchItem(theEnv,"messages") == 1);
+        
+      case MESSAGE_HANDLERS:
+        return (GetWatchItem(theEnv,"message-handlers") == 1);
+        
+      case GENERIC_FUNCTIONS:
+        return (GetWatchItem(theEnv,"generic-functions") == 1);
+        
+      case METHODS:
+        return (GetWatchItem(theEnv,"methods") == 1);
+        
+      case DEFFUNCTIONS:
+        return (GetWatchItem(theEnv,"deffunctions") == 1);
+        
+      case COMPILATIONS:
+        return (GetWatchItem(theEnv,"compilations") == 1);
+        
+      case STATISTICS:
+        return (GetWatchItem(theEnv,"statistics") == 1);
+        
+      case GLOBALS:
+        return (GetWatchItem(theEnv,"globals") == 1);
+        
+      case FOCUS:
+        return (GetWatchItem(theEnv,"focus") == 1);
+     }
+     
+   return false;
+  }
+
+/******************************************/
+/* SetWatchState: Returns the watch state */
+/*   for the specified watch item.        */
+/******************************************/
+void SetWatchState(
+  Environment *theEnv,
+  WatchItem item,
+  bool newState)
+  {
+   switch (item)
+     {
+      case ALL:
+        SetWatchItem(theEnv,"all",newState,NULL);
+        return;
+
+      case FACTS:
+        SetWatchItem(theEnv,"facts",newState,NULL);
+        return;
+        
+      case INSTANCES:
+        SetWatchItem(theEnv,"instances",newState,NULL);
+        return;
+        
+      case SLOTS:
+        SetWatchItem(theEnv,"slots",newState,NULL);
+        return;
+        
+      case RULES:
+        SetWatchItem(theEnv,"rules",newState,NULL);
+        return;
+        
+      case ACTIVATIONS:
+        SetWatchItem(theEnv,"activations",newState,NULL);
+        return;
+        
+      case MESSAGES:
+        SetWatchItem(theEnv,"messages",newState,NULL);
+        return;
+        
+      case MESSAGE_HANDLERS:
+        SetWatchItem(theEnv,"message-handlers",newState,NULL);
+        return;
+        
+      case GENERIC_FUNCTIONS:
+        SetWatchItem(theEnv,"generic-functions",newState,NULL);
+        return;
+        
+      case METHODS:
+        SetWatchItem(theEnv,"methods",newState,NULL);
+        return;
+        
+      case DEFFUNCTIONS:
+        SetWatchItem(theEnv,"deffunctions",newState,NULL);
+        return;
+        
+      case COMPILATIONS:
+        SetWatchItem(theEnv,"compilations",newState,NULL);
+        return;
+        
+      case STATISTICS:
+        SetWatchItem(theEnv,"statistics",newState,NULL);
+        return;
+        
+      case GLOBALS:
+        SetWatchItem(theEnv,"globals",newState,NULL);
+        return;
+        
+      case FOCUS:
+        SetWatchItem(theEnv,"focus",newState,NULL);
+        return;
+     }
+  }
+
+/********************************************************/
+/* WatchString: C access routine for the watch command. */
+/********************************************************/
+bool WatchString(
+  Environment *theEnv,
+  const char *itemName)
+  {
+   return SetWatchItem(theEnv,itemName,true,NULL);
+  }
+
+/************************************************************/
+/* UnwatchString: C access routine for the unwatch command. */
+/************************************************************/
+bool UnwatchString(
+  Environment *theEnv,
+  const char *itemName)
+  {
+   return SetWatchItem(theEnv,itemName,false,NULL);
+  }
+
+/********************************************************************/
+/* SetWatchItem: Sets the state of a specified watch item to either */
+/*   on or off. Returns true if the item was set, otherwise false.  */
+/********************************************************************/
+bool SetWatchItem(
+  Environment *theEnv,
+  const char *itemName,
+  bool newState,
+  struct expr *argExprs)
+  {
+   WatchItemRecord *wPtr;
+
+   /*===================================================*/
+   /* If the name of the watch item to set is all, then */
+   /* all watch items are set to the new state and true */
+   /* is returned.                                      */
+   /*===================================================*/
+
+   if (strcmp(itemName,"all") == 0)
+     {
+      for (wPtr = WatchData(theEnv)->ListOfWatchItems; wPtr != NULL; wPtr = wPtr->next)
+        {
+         /*==============================================*/
+         /* If no specific arguments are specified, then */
+         /* set the global flag for the watch item.      */
+         /*==============================================*/
+
+         if (argExprs == NULL) *(wPtr->flag) = newState;
+
+         /*=======================================*/
+         /* Set flags for individual watch items. */
+         /*=======================================*/
+
+         if ((wPtr->accessFunc == NULL) ? false :
+             ((*wPtr->accessFunc)(theEnv,wPtr->code,newState,argExprs) == false))
+           {
+            SetEvaluationError(theEnv,true);
+            return false;
+           }
+        }
+      return true;
+     }
+
+   /*=================================================*/
+   /* Search for the watch item to be set in the list */
+   /* of watch items. If found, set the watch item to */
+   /* its new state and return true.                  */
+   /*=================================================*/
+
+   for (wPtr = WatchData(theEnv)->ListOfWatchItems; wPtr != NULL; wPtr = wPtr->next)
+     {
+      if (strcmp(itemName,wPtr->name) == 0)
+        {
+         /*==============================================*/
+         /* If no specific arguments are specified, then */
+         /* set the global flag for the watch item.      */
+         /*==============================================*/
+
+         if (argExprs == NULL) *(wPtr->flag) = newState;
+
+         /*=======================================*/
+         /* Set flags for individual watch items. */
+         /*=======================================*/
+
+         if ((wPtr->accessFunc == NULL) ? false :
+             ((*wPtr->accessFunc)(theEnv,wPtr->code,newState,argExprs) == false))
+           {
+            SetEvaluationError(theEnv,true);
+            return false;
+           }
+
+         return true;
+        }
+     }
+
+   /*=================================================*/
+   /* If the specified item was not found in the list */
+   /* of watchable items then return false.           */
+   /*=================================================*/
+
+   return false;
+  }
+
+/****************************************************************/
+/* GetWatchItem: Gets the current state of the specified watch  */
+/*   item. Returns the state of the watch item (0 for off and 1 */
+/*   for on) if the watch item is found in the list of watch    */
+/*   items, otherwise -1 is returned.                           */
+/****************************************************************/
+int GetWatchItem(
+  Environment *theEnv,
+  const char *itemName)
+  {
+   WatchItemRecord *wPtr;
+
+   for (wPtr = WatchData(theEnv)->ListOfWatchItems; wPtr != NULL; wPtr = wPtr->next)
+     {
+      if (strcmp(itemName,wPtr->name) == 0)
+        {
+         if (*(wPtr->flag))
+           { return 1; }
+         else
+           { return 0; }
+        }
+     }
+
+   return -1;
+  }
+
+/***************************************************************/
+/* ValidWatchItem: Returns true if the specified name is found */
+/*   in the list of watch items, otherwise returns false.      */
+/***************************************************************/
+static WatchItemRecord *ValidWatchItem(
+  Environment *theEnv,
+  const char *itemName,
+  bool *recognized)
+  {
+   WatchItemRecord *wPtr;
+
+   *recognized = true;
+   if (strcmp(itemName,"all") == 0)
+     return NULL;
+
+   for (wPtr = WatchData(theEnv)->ListOfWatchItems; wPtr != NULL; wPtr = wPtr->next)
+     { if (strcmp(itemName,wPtr->name) == 0) return(wPtr); }
+
+   *recognized = false;
+   return NULL;
+  }
+
+/*************************************************************/
+/* GetNthWatchName: Returns the name associated with the nth */
+/*   item in the list of watchable items. If the nth item    */
+/*   does not exist, then NULL is returned.                  */
+/*************************************************************/
+const char *GetNthWatchName(
+  Environment *theEnv,
+  int whichItem)
+  {
+   int i;
+   WatchItemRecord *wPtr;
+
+   for (wPtr = WatchData(theEnv)->ListOfWatchItems, i = 1;
+        wPtr != NULL;
+        wPtr = wPtr->next, i++)
+     { if (i == whichItem) return(wPtr->name); }
+
+   return NULL;
+  }
+
+/***************************************************************/
+/* GetNthWatchValue: Returns the current state associated with */
+/*   the nth item in the list of watchable items. If the nth   */
+/*   item does not exist, then -1 is returned.                 */
+/***************************************************************/
+int GetNthWatchValue(
+  Environment *theEnv,
+  int whichItem)
+  {
+   int i;
+   WatchItemRecord *wPtr;
+
+   for (wPtr = WatchData(theEnv)->ListOfWatchItems, i = 1;
+        wPtr != NULL;
+        wPtr = wPtr->next, i++)
+     { if (i == whichItem) return((int) *(wPtr->flag)); }
+
+   return(-1);
+  }
+
+/**************************************/
+/* WatchCommand: H/L access routine   */
+/*   for the watch command.           */
+/**************************************/
+void WatchCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theValue;
+   const char *argument;
+   bool recognized;
+   WatchItemRecord *wPtr;
+
+   /*========================================*/
+   /* Determine which item is to be watched. */
+   /*========================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theValue)) return;
+
+   argument = theValue.lexemeValue->contents;
+   wPtr = ValidWatchItem(theEnv,argument,&recognized);
+   if (recognized == false)
+     {
+      SetEvaluationError(theEnv,true);
+      UDFInvalidArgumentMessage(context,"watchable symbol");
+      return;
+     }
+
+   /*=================================================*/
+   /* Check to make sure extra arguments are allowed. */
+   /*=================================================*/
+
+   if (GetNextArgument(GetFirstArgument()) != NULL)
+     {
+      if ((wPtr == NULL) ? true : (wPtr->accessFunc == NULL))
+        {
+         SetEvaluationError(theEnv,true);
+         ExpectedCountError(theEnv,"watch",EXACTLY,1);
+         return;
+        }
+     }
+
+   /*=====================*/
+   /* Set the watch item. */
+   /*=====================*/
+
+   SetWatchItem(theEnv,argument,true,GetNextArgument(GetFirstArgument()));
+  }
+
+/****************************************/
+/* UnwatchCommand: H/L access routine   */
+/*   for the unwatch command.           */
+/****************************************/
+void UnwatchCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theValue;
+   const char *argument;
+   bool recognized;
+   WatchItemRecord *wPtr;
+
+   /*==========================================*/
+   /* Determine which item is to be unwatched. */
+   /*==========================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theValue)) return;
+
+   argument = theValue.lexemeValue->contents;
+   wPtr = ValidWatchItem(theEnv,argument,&recognized);
+   if (recognized == false)
+     {
+      SetEvaluationError(theEnv,true);
+      UDFInvalidArgumentMessage(context,"watchable symbol");
+      return;
+     }
+
+   /*=================================================*/
+   /* Check to make sure extra arguments are allowed. */
+   /*=================================================*/
+
+   if (GetNextArgument(GetFirstArgument()) != NULL)
+     {
+      if ((wPtr == NULL) ? true : (wPtr->accessFunc == NULL))
+        {
+         SetEvaluationError(theEnv,true);
+         ExpectedCountError(theEnv,"unwatch",EXACTLY,1);
+         return;
+        }
+     }
+
+   /*=====================*/
+   /* Set the watch item. */
+   /*=====================*/
+
+   SetWatchItem(theEnv,argument,false,GetNextArgument(GetFirstArgument()));
+  }
+
+/************************************************/
+/* ListWatchItemsCommand: H/L access routines   */
+/*   for the list-watch-items command.          */
+/************************************************/
+void ListWatchItemsCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   WatchItemRecord *wPtr;
+   UDFValue theValue;
+   bool recognized;
+
+   /*=======================*/
+   /* List the watch items. */
+   /*=======================*/
+
+   if (GetFirstArgument() == NULL)
+     {
+      for (wPtr = WatchData(theEnv)->ListOfWatchItems; wPtr != NULL; wPtr = wPtr->next)
+        {
+         WriteString(theEnv,STDOUT,wPtr->name);
+         if (*(wPtr->flag)) WriteString(theEnv,STDOUT," = on\n");
+         else WriteString(theEnv,STDOUT," = off\n");
+        }
+      return;
+     }
+
+   /*=======================================*/
+   /* Determine which item is to be listed. */
+   /*=======================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theValue)) return;
+   wPtr = ValidWatchItem(theEnv,theValue.lexemeValue->contents,&recognized);
+   if ((recognized == false) || (wPtr == NULL))
+     {
+      SetEvaluationError(theEnv,true);
+      ExpectedTypeError1(theEnv,"list-watch-items",1,"'watchable symbol'");
+      return;
+     }
+
+   /*=================================================*/
+   /* Check to make sure extra arguments are allowed. */
+   /*=================================================*/
+
+   if ((wPtr->printFunc == NULL) &&
+       (GetNextArgument(GetFirstArgument()) != NULL))
+     {
+      SetEvaluationError(theEnv,true);
+      ExpectedCountError(theEnv,"list-watch-items",EXACTLY,1);
+      return;
+     }
+
+   /*====================================*/
+   /* List the status of the watch item. */
+   /*====================================*/
+
+   WriteString(theEnv,STDOUT,wPtr->name);
+   if (*(wPtr->flag)) WriteString(theEnv,STDOUT," = on\n");
+   else WriteString(theEnv,STDOUT," = off\n");
+
+   /*============================================*/
+   /* List the status of individual watch items. */
+   /*============================================*/
+
+   if (wPtr->printFunc != NULL)
+     {
+      if ((*wPtr->printFunc)(theEnv,STDOUT,wPtr->code,
+                             GetNextArgument(GetFirstArgument())) == false)
+        { SetEvaluationError(theEnv,true); }
+     }
+  }
+
+/*******************************************/
+/* GetWatchItemCommand: H/L access routine */
+/*   for the get-watch-item command.       */
+/*******************************************/
+void GetWatchItemCommand(
+  Environment *theEnv,
+  UDFContext *context,
+  UDFValue *returnValue)
+  {
+   UDFValue theValue;
+   const char *argument;
+   bool recognized;
+
+   /*========================================*/
+   /* Determine which item is to be watched. */
+   /*========================================*/
+
+   if (! UDFFirstArgument(context,SYMBOL_BIT,&theValue))
+     { return; }
+
+   argument = theValue.lexemeValue->contents;
+   ValidWatchItem(theEnv,argument,&recognized);
+   if (recognized == false)
+     {
+      SetEvaluationError(theEnv,true);
+      ExpectedTypeError1(theEnv,"get-watch-item",1,"'watchable symbol'");
+      returnValue->lexemeValue = FalseSymbol(theEnv);
+      return;
+     }
+
+   /*===========================*/
+   /* Get the watch item value. */
+   /*===========================*/
+
+   if (GetWatchItem(theEnv,argument) == 1)
+     { returnValue->lexemeValue = TrueSymbol(theEnv); }
+   else
+     { returnValue->lexemeValue = FalseSymbol(theEnv); }
+  }
+
+/*************************************************************/
+/* WatchFunctionDefinitions: Initializes the watch commands. */
+/*************************************************************/
+void WatchFunctionDefinitions(
+  Environment *theEnv)
+  {
+#if ! RUN_TIME
+   AddUDF(theEnv,"watch","v",1,UNBOUNDED,"*;y",WatchCommand,"WatchCommand",NULL);
+   AddUDF(theEnv,"unwatch","v",1,UNBOUNDED,"*;y",UnwatchCommand,"UnwatchCommand",NULL);
+   AddUDF(theEnv,"get-watch-item","b",1,1,"y",GetWatchItemCommand,"GetWatchItemCommand",NULL);
+   AddUDF(theEnv,"list-watch-items","v",0,UNBOUNDED,"*;y",ListWatchItemsCommand,"ListWatchItemsCommand",NULL);
+#endif
+  }
+
+#endif /* DEBUGGING_FUNCTIONS */
+
diff --git a/clips/watch.h b/clips/watch.h
new file mode 100755
index 000000000..41b85f54c
--- /dev/null
+++ b/clips/watch.h
@@ -0,0 +1,124 @@
+   /*******************************************************/
+   /*      "C" Language Integrated Production System      */
+   /*                                                     */
+   /*             CLIPS Version 6.40  08/25/16            */
+   /*                                                     */
+   /*                  WATCH HEADER FILE                  */
+   /*******************************************************/
+
+/*************************************************************/
+/* Purpose: Support functions for the watch and unwatch      */
+/*   commands.                                               */
+/*                                                           */
+/* Principal Programmer(s):                                  */
+/*      Gary D. Riley                                        */
+/*                                                           */
+/* Contributing Programmer(s):                               */
+/*                                                           */
+/* Revision History:                                         */
+/*                                                           */
+/*      6.23: Changed name of variable log to logName        */
+/*            because of Unix compiler warnings of shadowed  */
+/*            definitions.                                   */
+/*                                                           */
+/*      6.24: Renamed BOOLEAN macro type to intBool.         */
+/*                                                           */
+/*            Added EnvSetWatchItem function.                */
+/*                                                           */
+/*      6.30: Removed conditional code for unsupported       */
+/*            compilers/operating systems (IBM_MCW,          */
+/*            MAC_MCW, and IBM_TBC).                         */
+/*                                                           */
+/*            Added const qualifiers to remove C++           */
+/*            deprecation warnings.                          */
+/*                                                           */
+/*            Converted API macros to function calls.        */
+/*                                                           */
+/*      6.40: Removed LOCALE definition.                     */
+/*                                                           */
+/*            Pragma once and other inclusion changes.       */
+/*                                                           */
+/*            Added support for booleans with <stdbool.h>.   */
+/*                                                           */
+/*            Removed use of void pointers for specific      */
+/*            data structures.                               */
+/*                                                           */
+/*            ALLOW_ENVIRONMENT_GLOBALS no longer supported. */
+/*                                                           */
+/*            UDF redesign.                                  */
+/*                                                           */
+/*************************************************************/
+
+#ifndef _H_watch
+
+#pragma once
+
+#define _H_watch
+
+#include "expressn.h"
+
+#define WATCH_DATA 54
+
+typedef struct watchItemRecord WatchItemRecord;
+
+typedef enum
+  {
+   ALL,
+   FACTS,
+   INSTANCES,
+   SLOTS,
+   RULES,
+   ACTIVATIONS,
+   MESSAGES,
+   MESSAGE_HANDLERS,
+   GENERIC_FUNCTIONS,
+   METHODS,
+   DEFFUNCTIONS,
+   COMPILATIONS,
+   STATISTICS,
+   GLOBALS,
+   FOCUS
+  } WatchItem;
+
+struct watchItemRecord
+  {
+   const char *name;
+   bool *flag;
+   int code,priority;
+   bool (*accessFunc)(Environment *,int,bool,struct expr *);
+   bool (*printFunc)(Environment *,const char *,int,struct expr *);
+   WatchItemRecord *next;
+  };
+
+struct watchData
+  {
+   WatchItemRecord *ListOfWatchItems;
+  };
+
+#define WatchData(theEnv) ((struct watchData *) GetEnvironmentData(theEnv,WATCH_DATA))
+
+   void                           Watch(Environment *,WatchItem);
+   void                           Unwatch(Environment *,WatchItem);
+
+   bool                           WatchString(Environment *,const char *);
+   bool                           UnwatchString(Environment *,const char *);
+   void                           InitializeWatchData(Environment *);
+   bool                           SetWatchItem(Environment *,const char *,bool,struct expr *);
+   int                            GetWatchItem(Environment *,const char *);
+   bool                           AddWatchItem(Environment *,const char *,int,bool *,int,
+                                                      bool (*)(Environment *,int,bool,struct expr *),
+                                                      bool (*)(Environment *,const char *,int,struct expr *));
+   const char                    *GetNthWatchName(Environment *,int);
+   int                            GetNthWatchValue(Environment *,int);
+   void                           WatchCommand(Environment *,UDFContext *,UDFValue *);
+   void                           UnwatchCommand(Environment *,UDFContext *,UDFValue *);
+   void                           ListWatchItemsCommand(Environment *,UDFContext *,UDFValue *);
+   void                           WatchFunctionDefinitions(Environment *);
+   void                           GetWatchItemCommand(Environment *,UDFContext *,UDFValue *);
+   bool                           GetWatchState(Environment *,WatchItem);
+   void                           SetWatchState(Environment *,WatchItem,bool);
+
+#endif /* _H_watch */
+
+
+
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 800171f33..000000000
--- a/configure.ac
+++ /dev/null
@@ -1,1106 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
-#
-# The 0MQ version number is extracted from include/zmq.h using
-# the version.sh script. Hence, it should be updated there.
-# The version in git should reflect the *next* version planned.
-#
-AC_INIT([zeromq],[m4_esyscmd([./version.sh])],[zeromq-dev@lists.zeromq.org])
-
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_MACRO_DIR(config)
-AC_CONFIG_HEADERS([src/platform.hpp])
-AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar dist-zip)
-# Allow "configure --disable-maintainer-mode" to disable timestamp checking 
-AM_MAINTAINER_MODE([enable])
-
-m4_pattern_allow([AC_PROG_CC_C99])
-m4_include([m4/ax_check_compile_flag.m4])
-m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
-m4_include([m4/ax_code_coverage.m4])
-m4_include([m4/ax_valgrind_check.m4])
-m4_include([m4/ax_check_vscript.m4])
-m4_include([m4/ax_func_posix_memalign.m4])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-# This lets us use PACKAGE_VERSION in Makefiles
-AC_SUBST(PACKAGE_VERSION)
-
-# Libtool -version-info (ABI version)
-#
-# Don't change this unless you know exactly what you're doing and have read and
-# understand:
-# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-#
-# Changes:
-#
-# ZeroMQ versions prior to 2.1.0 use 0:0:0 (undefined)
-# ZeroMQ versions 2.1.x: 1:0:0 (ABI version 1)
-# ZeroMQ version 3.0: 2:0:0 (ABI version 2)
-# ZeroMQ version 3.1: 3:0:0 (ABI version 3)
-# ZeroMQ version 4.0: 4:0:0 (ABI version 4)
-# ZeroMQ version 4.1: 5:0:0 (ABI version 5)
-# ZeroMQ version 4.2.0: 6:0:1 (ABI version 5)
-# ZeroMQ version 4.2.1: 6:1:1 (ABI version 5)
-# ZeroMQ version 4.2.2: 6:2:1 (ABI version 5)
-# ZeroMQ version 4.2.3: 6:3:1 (ABI version 5)
-# ZeroMQ version 4.2.4: 6:4:1 (ABI version 5)
-# ZeroMQ version 4.2.5: 6:5:1 (ABI version 5)
-# ZeroMQ version 4.3.0: 7:0:2 (ABI version 5)
-# ZeroMQ version 4.3.1: 7:1:2 (ABI version 5)
-# ZeroMQ version 4.3.2: 7:2:2 (ABI version 5)
-# ZeroMQ version 4.3.3: 7:3:2 (ABI version 5)
-#
-# libzmq -version-info current:revision:age
-LTVER="7:3:2"
-AC_SUBST(LTVER)
-
-# Take a copy of original flags
-ZMQ_ORIG_CFLAGS="${CFLAGS:-none}"
-ZMQ_ORIG_CPPFLAGS="${CPPFLAGS:-none}"
-ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}"
-
-# Checks for programs.
-AC_PROG_CC
-AX_CHECK_COMPILE_FLAG([-std=gnu11], [CFLAGS+=" -std=gnu11"], [AC_PROG_CC_C99])
-AC_PROG_CXX
-AX_CODE_COVERAGE
-AM_PROG_CC_C_O
-AC_PROG_SED
-AC_PROG_AWK
-PKG_PROG_PKG_CONFIG
-m4_pattern_forbid([^PKG_[A-Z_]+$], [missing some pkg-config macros (pkg-config package)])
-
-# Libtool configuration for different targets. See acinclude.m4
-AC_ARG_VAR([XMLTO], [path to xmlto command])
-AC_PATH_PROG([XMLTO], [xmlto])
-AC_ARG_VAR([ASCIIDOC], [path to asciidoc command])
-AC_PATH_PROG([ASCIIDOC], [asciidoc])
-LIBZMQ_CONFIG_LIBTOOL
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AX_VALGRIND_CHECK
-AX_CHECK_VSCRIPT
-AX_FUNC_POSIX_MEMALIGN
-
-AC_ARG_ENABLE([force-CXX98-compat],
-    [AS_HELP_STRING([--enable-force-CXX98-compat], [force C++98 build [default=disabled]])])
-if test "x$enable_force_CXX98_compat" = "xyes"; then
-    AC_LANG_PUSH([C++])
-    AX_CHECK_COMPILE_FLAG([-std=gnu++98], [CXXFLAGS+=" -std=gnu++98"], [])
-    AX_CHECK_COMPILE_FLAG([-Wc++98-compat -Wc++98-compat-pedantic], [CXXFLAGS+=" -Wc++98-compat"], [])
-    AC_LANG_POP([C++])
-else
-    AX_CXX_COMPILE_STDCXX_11([ext], [optional])
-fi
-
-# Check whether to build a with debug symbols
-LIBZMQ_CHECK_ENABLE_DEBUG
-
-# Check whether to enable code coverage
-LIBZMQ_WITH_GCOV
-
-AC_MSG_CHECKING([if TIPC is available and supports nonblocking connect])
-
-AC_RUN_IFELSE(
-    [AC_LANG_PROGRAM([[
-            #include <stdlib.h>
-            #include <string.h>
-            #include <fcntl.h>
-            #include <errno.h>
-            #include <sys/socket.h>
-            #include <linux/tipc.h>
-        ]],[[
-            struct sockaddr_tipc topsrv;
-            int sd = socket(AF_TIPC, SOCK_SEQPACKET, 0);
-            memset(&topsrv, 0, sizeof(topsrv));
-            topsrv.family = AF_TIPC;
-            topsrv.addrtype = TIPC_ADDR_NAME;
-            topsrv.addr.name.domain = tipc_addr (10, 10, 10);
-            topsrv.addr.name.name.type = TIPC_TOP_SRV;
-            topsrv.addr.name.name.instance = TIPC_TOP_SRV;
-            fcntl(sd, F_SETFL, O_NONBLOCK);
-        ]])
-    ],
-    [libzmq_tipc_support=yes],
-    [libzmq_tipc_support=no],
-    [libzmq_tipc_support=no])
-
-AC_MSG_RESULT([$libzmq_tipc_support])
-
-AC_ARG_ENABLE([pedantic],
-    [AS_HELP_STRING([--disable-pedantic], [disable pedantic compiler checks [default=enabled]])],
-    [libzmq_pedantic=$enableval], [libzmq_pedantic=yes])
-
-AC_ARG_WITH([militant],
-    [AS_HELP_STRING([--with-militant],
-        [enable militant API assertions])],
-    [zmq_militant="yes"],
-    [])
-
-if test "x$zmq_militant" = "xyes"; then
-    AC_DEFINE(ZMQ_ACT_MILITANT, 1, [Enable militant API assertions])
-fi
-
-# IPC is available on all platforms supported by autotools build at the moment except OpenVMS and VxWorks.
-case "${host_os}" in
-    *vxworks*|*openvms*)
-        ;;
-    *)
-        AC_DEFINE(ZMQ_HAVE_IPC, 1, [Have AF_UNIX sockets for ipc transport])
-        ;;
-esac
-
-# Data race/deadlock detection
-# NOTE: Running libzmq under TSAN doesn't make much sense -- synchronization in libzmq is to some extent
-# handled by the code "knowing" what threads are allowed to do, rather than by enforcing those
-# restrictions, so TSAN generates a lot of (presumably) false positives from libzmq.
-# The settings below are intended to enable libzmq to be built with minimal support for TSAN
-# such that it can be used along with other code that is also built with TSAN.
-AC_MSG_CHECKING([whether to enable TSan])
-AC_ARG_ENABLE(thread-sanitizer, [AS_HELP_STRING([--enable-thread-sanitizer=yes/no],
-                  [Build with clang Thread Sanitizer instrumentation])],
-                  [ZMQ_TSAN="$enableval"])
-
-if test "x${ZMQ_TSAN}" = "xyes"; then
-    TSAN_FLAGS="-fno-omit-frame-pointer -fsanitize=thread"
-    TSAN_CCFLAGS="${TSAN_CCFLAGS} -mllvm -tsan-instrument-memory-accesses=0"
-    TSAN_CCFLAGS="${TSAN_CCFLAGS} -mllvm -tsan-instrument-atomics=0"
-    TSAN_CCFLAGS="${TSAN_CCFLAGS} -mllvm -tsan-instrument-func-entry-exit=1"
-    CFLAGS="${CFLAGS} ${TSAN_FLAGS} ${TSAN_CCFLAGS}"
-    CXXFLAGS="${CXXFLAGS} ${TSAN_FLAGS} ${TSAN_CCFLAGS}"
-    LDFLAGS="${LDFLAGS} ${TSAN_FLAGS} -pie"
-
-    AM_CONDITIONAL(ENABLE_TSAN, true)
-    AC_MSG_RESULT([yes])
-else
-    AM_CONDITIONAL(ENABLE_TSAN, false)
-    AC_MSG_RESULT([no])
-fi
-
-# Memory mis-use detection
-AC_MSG_CHECKING([whether to enable ASan])
-AC_ARG_ENABLE(address-sanitizer, [AS_HELP_STRING([--enable-address-sanitizer=yes/no],
-                  [Build with GCC Address Sanitizer instrumentation])],
-                  [ZMQ_ASAN="$enableval"])
-
-if test "x${ZMQ_ASAN}" = "xyes"; then
-    CFLAGS="${CFLAGS} -fsanitize=address -fsanitize=undefined -fsanitize=leak -fno-sanitize-recover=all"
-    CXXFLAGS="${CXXFLAGS} -fsanitize=address -fsanitize=undefined -fsanitize=leak -fno-sanitize-recover=all"
-
-    AM_CONDITIONAL(ENABLE_ASAN, true)
-    AC_MSG_RESULT([yes])
-else
-    AM_CONDITIONAL(ENABLE_ASAN, false)
-    AC_MSG_RESULT([no])
-fi
-
-# By default compiling with -Werror except OSX and on Solaris when building
-# with libsodium.
-AC_ARG_ENABLE([Werror],
-    [AS_HELP_STRING([--disable-Werror], [disable Werror compiler flag [default=enabled]])],
-    [libzmq_werror=$enableval], [libzmq_werror=yes])
-
-# By default use DSO visibility
-libzmq_dso_visibility="yes"
-
-# Platform specific checks
-libzmq_on_mingw="no"
-libzmq_on_cygwin="no"
-libzmq_on_android="no"
-libzmq_on_linux="no"
-libzmq_on_gnu="no"
-
-# Set some default features required by ZeroMQ code
-CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS"
-CXXFLAGS="-Wno-long-long $CXXFLAGS"
-
-# Will be used to add flags to pkg-config useful when apps want to statically link
-PKGCFG_LIBS_PRIVATE=""
-PKGCFG_NAMES_PRIVATE=""
-
-# For host type checks
-AC_CANONICAL_HOST
-
-# OS-specific tests
-case "${host_os}" in
-    *linux*)
-        # Define on Linux to enable all library features. Define if using a gnu compiler
-        if test "x$GXX" = "xyes"; then
-            CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS"
-        fi
-        AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS])
-        libzmq_on_linux="yes"
-
-        if test "x$libzmq_tipc_support" = "xyes"; then
-            AC_DEFINE(ZMQ_HAVE_TIPC, 1, [Have TIPC support])
-        fi
-        case "${host_os}" in
-            *android*)
-                AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS])
-                libzmq_on_android="yes"
-            ;;
-        esac
-        ;;
-    *solaris*)
-        # Define on Solaris to enable all library features
-        CPPFLAGS="-D_PTHREADS $CPPFLAGS"
-        CXXFLAGS="-Wno-sign-compare $CXXFLAGS"
-        AC_DEFINE(ZMQ_HAVE_SOLARIS, 1, [Have Solaris OS])
-        AC_CHECK_LIB(socket, socket)
-        AC_CHECK_LIB(nsl, gethostbyname)
-        AC_MSG_CHECKING([whether atomic operations can be used])
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-            [[#include <atomic.h>]],
-            [[uint32_t value;
-              atomic_cas_32 (&value, 0, 0);
-              return 0;]])],
-            [solaris_has_atomic=yes],
-            [solaris_has_atomic=no])
-        AC_MSG_RESULT([$solaris_has_atomic])
-        # Solaris 8 does not have atomic operations exported to user space.
-        if test "x$solaris_has_atomic" = "xno"; then
-            AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes])
-        fi
-        ;;
-    *freebsd*)
-        # Define on FreeBSD to enable all library features
-        CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have FreeBSD OS])
-        ;;
-    *dragonfly*)
-        CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have DragonFly OS])
-        AC_DEFINE(ZMQ_HAVE_DRAGONFLY, 1, [Have DragonFly OS])
-        ;;
-    *darwin*)
-        # Define on Darwin to enable all library features
-        CPPFLAGS="-D_DARWIN_C_SOURCE $CPPFLAGS"
-        libzmq_pedantic="no"
-        libzmq_werror="no"
-        AC_DEFINE(ZMQ_HAVE_OSX, 1, [Have DarwinOSX OS])
-        AC_LANG_PUSH([C++])
-        LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Wno-uninitialized])
-        AC_LANG_POP([C++])
-        ;;
-    *haiku*)
-        AC_DEFINE(ZMQ_HAVE_HAIKU, 1, [Have Haiku OS])
-        AC_CHECK_LIB(network, socket)
-        ;;
-    *netbsd*)
-        # Define on NetBSD to enable all library features
-        CPPFLAGS="-D_NETBSD_SOURCE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_NETBSD, 1, [Have NetBSD OS])
-        # NetBSD 5.0 and newer provides atomic operations but we can
-        # only use these on systems where PR #42842 has been fixed so
-        # we must try and link a test program using C++.
-        libzmq_netbsd_has_atomic=no
-        AC_MSG_CHECKING([whether atomic operations can be used])
-        AC_LANG_PUSH([C++])
-        AC_LINK_IFELSE([AC_LANG_PROGRAM(
-            [[#include <atomic.h>]],
-            [[uint32_t value;
-              atomic_cas_32 (&value, 0, 0);
-              return 0;]])],
-            [libzmq_netbsd_has_atomic=yes],
-            [libzmq_netbsd_has_atomic=no])
-        AC_LANG_POP([C++])
-        AC_MSG_RESULT([$libzmq_netbsd_has_atomic])
-        if test "x$libzmq_netbsd_has_atomic" = "xno"; then
-            AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes])
-        fi
-        ;;
-    *openbsd*|*bitrig*)
-        # Define on OpenBSD to enable all library features
-        CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_OPENBSD, 1, [Have OpenBSD OS])
-        ;;
-    *nto-qnx*)
-        libzmq_pedantic="no"
-        AC_DEFINE(ZMQ_HAVE_QNXNTO, 1, [Have QNX Neutrino OS])
-        AC_CHECK_LIB(socket, socket)
-        ;;
-    *aix*|*os400*)
-        AC_DEFINE(ZMQ_HAVE_AIX, 1, [Have AIX OS])
-        ;;
-    *hpux*)
-        # Define on HP-UX to enable all library features
-        CPPFLAGS="-D_POSIX_C_SOURCE=200112L $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_HPUX, 1, [Have HPUX OS])
-        LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Ae])
-        AC_CHECK_FUNCS(gethrtime)
-        ;;
-    *mingw*|*msys*)
-        AC_DEFINE(ZMQ_HAVE_WINDOWS, 1, [Have Windows OS])
-        AC_DEFINE(ZMQ_HAVE_MINGW, 1, [Have MinGW])
-        AC_CHECK_HEADERS(windows.h)
-        AC_CHECK_LIB(ws2_32, main, ,
-            [AC_MSG_ERROR([cannot link with ws2_32.dll.])])
-        AC_CHECK_LIB(rpcrt4, main, ,
-            [AC_MSG_ERROR([cannot link with rpcrt4.dll.])])
-        AC_CHECK_LIB(iphlpapi, main, ,
-            [AC_MSG_ERROR([cannot link with iphlpapi.dll.])])
-        libzmq_on_mingw="yes"
-        libzmq_dso_visibility="no"
-
-        if test "x$enable_static" = "xyes"; then
-            CPPFLAGS="-DZMQ_STATIC $CPPFLAGS"
-            PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -liphlpapi"
-        fi
-	# Set FD_SETSIZE to 16384
-	CPPFLAGS=" -DFD_SETSIZE=16384 $CPPFLAGS"
-        ;;
-    *cygwin*)
-        # Define on Cygwin to enable all library features
-        CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_CYGWIN, 1, [Have Cygwin])
-        libzmq_on_cygwin="yes"
-        libzmq_dso_visibility="no"
-        if test "x$enable_static" = "xyes"; then
-            AC_MSG_ERROR([Building static libraries is not supported under Cygwin])
-        fi
-        ;;
-    gnu*)
-        # Define on GNU/Hurd to enable all library features. Define if using a gnu compiler
-        if test "x$GXX" = "xyes"; then
-            CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS"
-        fi
-        AC_DEFINE(ZMQ_HAVE_GNU, 1, [Have GNU/Hurd OS])
-        libzmq_on_gnu="yes"
-	AC_CHECK_LIB(rt, sem_init)
-        ;;
-    *)
-        AC_MSG_ERROR([unsupported system: ${host_os}.])
-        ;;
-esac
-
-# Sun Studio does not like anonymous structures in unions and does not have weak attribute
-if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-    CXXFLAGS="${CXXFLAGS} -features=extensions"
-    CFLAGS="${CFLAGS} -features=extensions"
-    CPPFLAGS="${CPPFLAGS} -DUNITY_WEAK_PRAGMA"
-fi
-
-# Checks for libraries
-AC_CHECK_LIB([pthread], [pthread_create])
-if test "x$ac_cv_lib_pthread_pthread_create" = "xyes"; then
-    PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -lpthread"
-fi
-AC_CHECK_LIB([rt], [clock_gettime])
-if test "x$ac_cv_lib_rt_clock_gettime" = "xyes"; then
-    PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -lrt"
-fi
-
-#
-# Check if the compiler supports -fvisibility=hidden flag. MinGW uses __declspec
-#
-if test "x$libzmq_dso_visibility" = "xyes"; then
-    AC_LANG_PUSH([C++])
-    LIBZMQ_CHECK_LANG_VISIBILITY([LIBZMQ_EXTRA_CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag ${LIBZMQ_EXTRA_CXXFLAGS}"])
-    AC_LANG_POP([C++])
-fi
-
-# CPU-specific optimizations
-case "${host_cpu}" in
-    *sparc64*)
-        AC_LANG_PUSH([C++])
-        LIBZMQ_CHECK_LANG_FLAG_PREPEND([-mcpu=v9])
-        AC_LANG_POP([C++])
-    ;;
-    *)
-    ;;
-esac
-
-# Check whether to build docs / install man pages
-LIBZMQ_CHECK_DOC_BUILD
-
-# Check polling system, set appropriate macro in src/platform.hpp
-LIBZMQ_CHECK_POLLER
-
-# Check cacheline size, set appropriate macro in src/platform.hpp
-LIBZMQ_CHECK_CACHELINE
-
-# Check condition variable implementation, set appropriate macro in src/platform.hpp
-LIBZMQ_CHECK_CV_IMPL
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(\
-    errno.h \
-    time.h \
-    unistd.h \
-    limits.h \
-    stddef.h \
-    stdlib.h \
-    string.h \
-    arpa/inet.h \
-    netinet/tcp.h \
-    netinet/in.h \
-    sys/socket.h \
-    sys/time.h)
-
-# Check if we have ifaddrs.h header file.
-AC_CHECK_HEADERS(ifaddrs.h, [AC_DEFINE(ZMQ_HAVE_IFADDRS, 1, [Have ifaddrs.h header.])])
-
-# Check if we have sys/uio.h header file.
-AC_CHECK_HEADERS(sys/uio.h, [AC_DEFINE(ZMQ_HAVE_UIO, 1, [Have uio.h header.])])
-
-# Force not to use eventfd
-AC_ARG_ENABLE([eventfd],
-    [AS_HELP_STRING([--disable-eventfd], [disable eventfd [default=enabled]])],
-    [zmq_enable_eventfd=$enableval],
-    [zmq_enable_eventfd=yes])
-
-if test "x$zmq_enable_eventfd" = "xyes"; then
-    # Check if we have eventfd.h header file.
-    AC_CHECK_HEADERS(sys/eventfd.h, [
-        AC_DEFINE(ZMQ_HAVE_EVENTFD, 1, [Have eventfd extension])
-        LIBZMQ_CHECK_EVENTFD_CLOEXEC([
-            AC_DEFINE([ZMQ_HAVE_EVENTFD_CLOEXEC],
-               [1],
-               [Whether EFD_CLOEXEC is defined and functioning.])
-            ])
-    ])
-fi
-
-# Conditionally build performance measurement tools
-AC_ARG_ENABLE([perf],
-    [AS_HELP_STRING([--disable-perf], [don't build performance measurement tools [default=build]])],
-    [zmq_enable_perf=$enableval],
-    [zmq_enable_perf=yes])
-
-AM_CONDITIONAL(ENABLE_PERF, test "x$zmq_enable_perf" = "xyes")
-
-# Conditionally build curve key generation tool
-AC_ARG_ENABLE([curve-keygen],
-    [AS_HELP_STRING([--disable-curve-keygen], [don't build curve-keygen tool [default=build]])],
-    [zmq_enable_curve_keygen=$enableval],
-    [zmq_enable_curve_keygen=yes])
-
-# Use c++ in subsequent tests
-AC_LANG_PUSH(C++)
-
-AC_CHECK_DECLS([SO_PEERCRED],
-    [AC_DEFINE(ZMQ_HAVE_SO_PEERCRED, 1, [Have SO_PEERCRED socket option])],
-    [],
-    [#include <sys/socket.h>])
-
-AC_CHECK_DECLS([LOCAL_PEERCRED],
-    [AC_DEFINE(ZMQ_HAVE_LOCAL_PEERCRED, 1, [Have LOCAL_PEERCRED socket option])],
-    [],
-    [#include <sys/socket.h>])
-
-AM_CONDITIONAL(HAVE_IPC_PEERCRED, test "x$ac_cv_have_decl_SO_PEERCRED" = "xyes" || test "x$ac_cv_have_decl_LOCAL_PEERCRED" = "xyes")
-
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-
-# Checks for typedefs, structures, and compiler characteristics.
-if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-    dnl 279: controlling expression is constant
-    dnl Fixes build with ICC 12.x
-    LIBZMQ_CHECK_WITH_FLAG([-wd279], [AC_TYPE_SIZE_T])
-    LIBZMQ_CHECK_WITH_FLAG([-wd279], [AC_TYPE_SSIZE_T])
-else
-    AC_TYPE_SIZE_T
-    AC_TYPE_SSIZE_T
-fi
-
-AC_HEADER_TIME
-AC_TYPE_UINT32_T
-AC_C_VOLATILE
-
-# build using libgssapi_krb5
-AC_ARG_WITH([libgssapi_krb5], [AS_HELP_STRING([--with-libgssapi_krb5],
-    [require libzmq build with libgssapi_krb5 [default=no]])],
-    [require_libgssapi_krb5_ext=$withval],
-    [require_libgssapi_krb5_ext=no])
-
-# conditionally require libgssapi_krb5
-if test "x$require_libgssapi_krb5_ext" != "xno"; then
-    PKG_CHECK_MODULES([gssapi_krb5], [krb5-gssapi], [
-        have_gssapi_library="yes"
-        PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE krb5-gssapi"
-    ], [
-        AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
-        AC_SEARCH_LIBS([gss_init_sec_context], [gssapi_krb5 gssapi],
-            have_gssapi_library="yes",
-            AC_MSG_ERROR(libgssapi_krb5 is needed for GSSAPI security))
-        PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -lgssapi_krb5"
-    ])
-fi
-if test "x$have_gssapi_library" = "xyes"; then
-    AC_DEFINE(HAVE_LIBGSSAPI_KRB5, [1], [Enabled GSSAPI security])
-fi
-AM_CONDITIONAL(BUILD_GSSAPI, test "x$have_gssapi_library" = "xyes")
-
-# Select curve encryption library, defaults to tweetnacl
-# To use libsodium instead, use --with-libsodium (must be installed)
-# To disable curve, use --disable-curve
-
-AC_ARG_WITH([libsodium],
-    [AS_HELP_STRING([--with-libsodium], [use libsodium instead of built-in tweetnacl [default=no]])])
-
-AS_IF([test "x$with_libsodium" = "xyes"], [
-    PKG_CHECK_MODULES([sodium], [libsodium], [libsodium_found=yes], [
-        AC_MSG_ERROR(libsodium is not installed. Install it, then run configure again)
-    ])
-])
-
-AC_ARG_ENABLE([curve],
-    [AS_HELP_STRING([--disable-curve], [disable CURVE security [default=no]])])
-
-if test "x$enable_curve" = "xno"; then
-    curve_library=""
-    AC_MSG_NOTICE([CURVE security is disabled])
-
-elif test "x$with_libsodium" = "xyes"; then
-    AC_MSG_NOTICE([Using libsodium for CURVE security])
-    AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption])
-    AC_DEFINE(ZMQ_USE_LIBSODIUM, [1], [Using libsodium for curve encryption])
-    curve_library="libsodium"
-    enable_curve="yes"
-
-    # On Solaris, libsodium depends on libssp
-    case "${host_os}" in
-        *solaris*)
-            LDFLAGS="-lssp $LDFLAGS"
-            libzmq_pedantic="no"
-            libzmq_werror="no"
-        ;;
-    esac
-
-    PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE libsodium"
-else
-    AC_MSG_NOTICE([Using tweetnacl for CURVE security])
-    AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption])
-    AC_DEFINE(ZMQ_USE_TWEETNACL, [1], [Using tweetnacl for curve encryption])
-    curve_library="tweetnacl"
-    enable_curve="yes"
-fi
-
-AM_CONDITIONAL(ENABLE_CURVE_KEYGEN, test "x$enable_curve" = "xyes" -a "x$zmq_enable_curve_keygen" = "xyes")
-
-AM_CONDITIONAL(USE_LIBSODIUM, test "$curve_library" = "libsodium")
-AM_CONDITIONAL(USE_TWEETNACL, test "$curve_library" = "tweetnacl")
-AM_CONDITIONAL(HAVE_CURVE, test "x$curve_library" != "x")
-AM_CONDITIONAL(USE_WEPOLL, test "$poller" = "wepoll")
-
-# Check requiring packages for WebSocket
-ws_crypto_library=""
-
-AC_ARG_ENABLE([ws],
-    [AS_HELP_STRING([--enable-ws], [Enable WebSocket transport [default=state of DRAFT]])],
-    [enable_ws=$enableval],
-    [enable_ws=$enable_drafts])
-
-AC_ARG_WITH([nss],
-    [AS_HELP_STRING([--with-nss], [use nss instead of built-in sha1 [default=no]])])
-
-AC_ARG_WITH([tls],
-    [AS_HELP_STRING([--with-tls], [Enable TLS (WSS transport) [default=no]])])
-
-if test "x$enable_ws" != "xno"; then
-    if test "x$with_tls" = "xyes"; then
-        PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.1.4], [
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE gnutls >= 3.1.4"
-            ws_crypto_library="gnutls"
-            AC_DEFINE(ZMQ_USE_GNUTLS, [1], [Use GNUTLS for TLS])
-            AC_DEFINE(ZMQ_HAVE_WS, [1], [Using websocket])
-            AC_DEFINE(ZMQ_HAVE_WSS, [1], [WSS enabled])
-            AC_MSG_NOTICE(Using gnutls)
-        ],[
-          AC_MSG_ERROR([GnuTLS is not installed. Install it, then run configure again])
-        ])
-    elif test "x$with_nss" = "xyes"; then
-        PKG_CHECK_MODULES([NSS3], [nss], [
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE nss"
-            AC_DEFINE(ZMQ_USE_NSS, [1], [Using NSS])
-            AC_DEFINE(ZMQ_HAVE_WS, [1], [Using websocket])
-            ws_crypto_library="nss"
-            AC_MSG_NOTICE(Using NSS)
-        ], [
-            AC_MSG_ERROR([nss is not installed. Install it, then run configure again])
-        ])
-    else
-        AC_DEFINE(ZMQ_HAVE_WS, [1], [Using websocket])
-        AC_DEFINE(ZMQ_USE_BUILTIN_SHA1, [1], [Using built-in sha1])
-        AC_MSG_NOTICE(Using builting SHA1)
-        ws_crypto_library="builtin"
-    fi
-fi
-
-AM_CONDITIONAL(HAVE_WS, test "x$ws_crypto_library" != "x")
-AM_CONDITIONAL(USE_NSS, test "x$ws_crypto_library" = "xnss")
-AM_CONDITIONAL(USE_BUILTIN_SHA1, test "x$ws_crypto_library" = "xbuiltin")
-AM_CONDITIONAL(USE_GNUTLS, test "x$ws_crypto_library" = "xgnutls")
-AM_CONDITIONAL(HAVE_WSS, test "x$ws_crypto_library" = "xgnutls")
-
-# build using pgm
-have_pgm_library="no"
-
-AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm],
-    [build libzmq with PGM extension. Requires pkg-config [default=no]])],
-    [with_pgm_ext=$withval],
-    [with_pgm_ext=no])
-
-# conditionally require pgm package
-if test "x$with_pgm_ext" != "xno"; then
-    PKG_CHECK_MODULES([pgm], [openpgm-5.2 >= 5.2], [
-        have_pgm_library="yes"
-        PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.2 >= 5.2"
-    ], [
-        PKG_CHECK_MODULES([pgm], [openpgm-5.1 >= 5.1], [
-            have_pgm_library="yes"
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.1 >= 5.1"
-        ])
-    ])
-fi
-
-if test "x$have_pgm_library" = "xyes"; then
-    AC_DEFINE(ZMQ_HAVE_OPENPGM, [1], [Have OpenPGM extension])
-fi
-
-AM_CONDITIONAL(HAVE_PGM, test "x$have_pgm_library" = "xyes")
-
-
-# This uses "--with-norm" to point to the "norm" directory
-# for "norm/include" and "norm/lib"
-#(if "--with-norm=yes" is given, then assume installed on system)
-AC_ARG_WITH([norm],
-    [AS_HELP_STRING([--with-norm],
-        [build libzmq with NORM protocol extension, optionally specifying norm path [default=no]])],
-    [with_norm_ext=$withval],
-    [with_norm_ext=no])
-
-AC_MSG_CHECKING("with_norm_ext = ${with_norm_ext}")
-
-if test "x$with_norm_ext" != "xno"; then
-    PKG_CHECK_MODULES([norm], [norm], [
-        have_norm_library="yes"
-        PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE norm"
-    ], [
-        AC_MSG_RESULT([yes])
-
-        norm_LIBS=""
-        norm_CFLAGS=""
-        if test "x$with_norm_ext" != "xyes"; then
-            norm_path="${with_norm_ext}"
-            norm_CFLAGS="${norm_CFLAGS} -I${norm_path}/include"
-            norm_LIBS="${norm_LIBS} -L${norm_path}/lib"
-        fi
-        norm_LIBS="${norm_LIBS} -lnorm"
-        have_norm_library="yes"
-        PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE $norm_LIBS"
-        AC_SUBST(norm_LIBS)
-        AC_SUBST(norm_CFLAGS)
-    ])
-else
-    AC_MSG_RESULT([no])
-fi
-if test "x$have_norm_library" = "xyes"; then
-    AC_DEFINE(ZMQ_HAVE_NORM, [1], [Have NORM protocol extension])
-fi
-AM_CONDITIONAL(HAVE_NORM, test "x$have_norm_library" = "xyes")
-
-# build using vmci
-have_vmci_library="no"
-
-AC_ARG_WITH([vmci], [AS_HELP_STRING([--with-vmci],
-    [build libzmq with VMCI transport [default=no]])],
-    [have_vmci_ext=$withval],
-    [have_vmci_ext=no])
-
-if test "x$have_vmci_ext" != "xno"; then
-    AC_DEFINE(ZMQ_HAVE_VMCI, 1, [Have VMCI transport])
-
-    if test "x$have_vmci_ext" != "xyes"; then
-        vmci_path="${have_vmci_ext}"
-        LIBZMQ_VMCI_CXXFLAGS="-I${vmci_path}"
-        LIBZMQ_VMCI_LDFLAGS="-I${vmci_path}"
-        LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_VMCI_CXXFLAGS} ${LIBZMQ_EXTRA_CXXFLAGS}"
-        LIBZMQ_EXTRA_LDFLAGS="${LIBZMQ_VMCI_LDFLAGS} ${LIBZMQ_EXTRA_LDFLAGS}"
-    fi
-fi
-
-AM_CONDITIONAL(HAVE_VMCI, test "x$have_vmci_ext" != "xno")
-
-# Set -Wall, -Werror and -pedantic
-AC_LANG_PUSH([C++])
-
-# Check how to enable -Wall
-LIBZMQ_LANG_WALL([CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag $CXXFLAGS"])
-
-if test "x$libzmq_werror" = "xyes" -a "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" != "xyes"; then
-    LIBZMQ_LANG_WERROR([CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag $CXXFLAGS"])
-fi
-
-if test "x$libzmq_pedantic" = "xyes"; then
-    LIBZMQ_LANG_STRICT([CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag $CXXFLAGS"])
-fi
-AC_LANG_POP([C++])
-
-AM_CONDITIONAL(BUILD_TIPC, test "x$libzmq_tipc_support" = "xyes")
-AM_CONDITIONAL(ON_MINGW, test "x$libzmq_on_mingw" = "xyes")
-AM_CONDITIONAL(ON_CYGWIN, test "x$libzmq_on_cygwin" = "xyes")
-AM_CONDITIONAL(ON_ANDROID, test "x$libzmq_on_android" = "xyes")
-AM_CONDITIONAL(ON_LINUX, test "x$libzmq_on_linux" = "xyes")
-AM_CONDITIONAL(ON_GNU, test "x$libzmq_on_gnu" = "xyes")
-
-# Check for __atomic_Xxx compiler intrinsics
-AC_LANG_PUSH([C++])
-AX_CHECK_COMPILE_FLAG([-Wno-atomic-alignment],
-    [CXXFLAGS+=" -Wno-atomic-alignment"],
-    [],
-    [-Werror])
-LIBZMQ_CHECK_ATOMIC_INTRINSICS([
-    AC_DEFINE([ZMQ_HAVE_ATOMIC_INTRINSICS],
-              [1],
-              [Whether compiler has __atomic_Xxx intrinsics.])
-    ])
-AC_LANG_POP([C++])
-
-# Checks for library functions.
-AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(perror gettimeofday clock_gettime memset socket getifaddrs freeifaddrs fork mkdtemp accept4)
-AC_CHECK_HEADERS([alloca.h])
-
-# string.h doesn't seem to be included by default in Fedora 30
-AC_MSG_CHECKING([whether strnlen is available])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <string.h>]],
-		[[size_t bar = strnlen ("foo", 1); (void)bar; return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_STRNLEN, [1],
-		    [strnlen is available])
-	],[
-		AC_MSG_RESULT([no])
-])
-
-AC_ARG_ENABLE([libbsd],
-    [AS_HELP_STRING([--enable-libbsd],
-        [enable libbsd [default=auto]])],
-    [enable_libbsd=$enableval],
-    [enable_libbsd="auto"])
-
-if test "x$enable_libbsd" != "xno"; then
-    PKG_CHECK_MODULES(LIBBSD, [libbsd],
-        [
-            AC_DEFINE(ZMQ_HAVE_LIBBSD, 1, [The libbsd library is to be used])
-            AC_SUBST([LIBBSD_CFLAGS])
-            AC_SUBST([LIBBSD_LIBS])
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE libbsd"
-            found_libbsd="yes"
-        ],
-        [
-            found_libbsd="no"
-            if test "x$enable_libbsd" = "xyes"; then
-                AC_MSG_ERROR([Cannot find libbsd])
-            else
-                AC_MSG_WARN([Cannot find libbsd])
-            fi
-        ])
-fi
-if test "x$found_libbsd" != "xyes"; then
-    AC_MSG_CHECKING([whether strlcpy is available])
-    AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-            [[#include <string.h>]],
-            [[char buf [100]; size_t bar = strlcpy (buf, "foo", 100); (void)bar; return 0;]])
-        ],[
-            AC_MSG_RESULT([yes])
-            AC_DEFINE(ZMQ_HAVE_STRLCPY, [1],
-                [strlcpy is available])
-        ],[
-            AC_MSG_RESULT([no])
-    ])
-fi
-
-# pthread_setname is non-posix, and there are at least 4 different implementations
-AC_MSG_CHECKING([whether signature of pthread_setname_np() has 1 argument])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[pthread_setname_np ("foo"); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_1, [1],
-		    [Whether pthread_setname_np() has 1 argument])
-	],[
-		AC_MSG_RESULT([no])
-])
-AC_MSG_CHECKING([whether signature of pthread_setname_np() has 2 arguments])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[pthread_setname_np (pthread_self (), "foo"); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_2, [1],
-		    [Whether pthread_setname_np() has 2 arguments])
-	],[
-		AC_MSG_RESULT([no])
-])
-AC_MSG_CHECKING([whether signature of pthread_setname_np() has 3 arguments])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[pthread_setname_np (pthread_self(), "foo", (void *)0); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_3, [1],
-		    [Whether pthread_setname_np() has 3 arguments])
-	],[
-		AC_MSG_RESULT([no])
-])
-AC_MSG_CHECKING([whether pthread_set_name_np() exists])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[pthread_set_name_np (pthread_self(), "foo"); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SET_NAME, [1],
-		    [Whether pthread_set_name_np() exists])
-	],[
-		AC_MSG_RESULT([no])
-])
-
-
-# pthread_setaffinity_np is non-posix:
-AC_MSG_CHECKING([whether pthread_setaffinity_np() exists])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[cpu_set_t test; pthread_setaffinity_np (pthread_self(), sizeof(cpu_set_t), &test); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SET_AFFINITY, [1],
-		    [Whether pthread_setaffinity_np() exists])
-	],[
-		AC_MSG_RESULT([no])
-])
-
-
-LIBZMQ_CHECK_SOCK_CLOEXEC([
-    AC_DEFINE([ZMQ_HAVE_SOCK_CLOEXEC],
-        [1],
-        [Whether SOCK_CLOEXEC is defined and functioning.])
-    ])
-
-LIBZMQ_CHECK_O_CLOEXEC([
-    AC_DEFINE([ZMQ_HAVE_O_CLOEXEC],
-        [1],
-        [Whether O_CLOEXEC is defined and functioning.])
-    ])
-
-LIBZMQ_CHECK_SO_BINDTODEVICE([
-    AC_DEFINE([ZMQ_HAVE_SO_BINDTODEVICE],
-        [1],
-        [Whether SO_BINDTODEVICE is supported.])
-    ])
-
-# TCP keep-alives Checks.
-LIBZMQ_CHECK_SO_KEEPALIVE([
-    AC_DEFINE([ZMQ_HAVE_SO_KEEPALIVE],
-        [1],
-        [Whether SO_KEEPALIVE is supported.])
-    ])
-
-LIBZMQ_CHECK_TCP_KEEPCNT([
-    AC_DEFINE([ZMQ_HAVE_TCP_KEEPCNT],
-        [1],
-        [Whether TCP_KEEPCNT is supported.])
-    ])
-
-LIBZMQ_CHECK_TCP_KEEPIDLE([
-    AC_DEFINE([ZMQ_HAVE_TCP_KEEPIDLE],
-        [1],
-        [Whether TCP_KEEPIDLE is supported.])
-    ])
-
-LIBZMQ_CHECK_TCP_KEEPINTVL([
-    AC_DEFINE([ZMQ_HAVE_TCP_KEEPINTVL],
-        [1],
-        [Whether TCP_KEEPINTVL is supported.])
-    ])
-
-LIBZMQ_CHECK_TCP_KEEPALIVE([
-    AC_DEFINE([ZMQ_HAVE_TCP_KEEPALIVE],
-        [1],
-        [Whether TCP_KEEPALIVE is supported.])
-    ])
-
-LIBZMQ_CHECK_GETRANDOM([
-    AC_DEFINE([ZMQ_HAVE_GETRANDOM],
-        [1],
-        [Whether getrandom is supported.])
-    ])
-
-AM_CONDITIONAL(HAVE_FORK, test "x$ac_cv_func_fork" = "xyes")
-
-if test "x$cross_compiling" = "xyes"; then
-    #   Enable draft by default when cross-compiling
-    defaultval=yes
-else
-    # enable draft API by default if we're in a git repository
-    # else disable it by default; then allow --enable-drafts=yes/no override
-    AC_CHECK_FILE($srcdir/.git, [defaultval=yes], [defaultval=no])
-fi
-
-AC_ARG_ENABLE([drafts],
-    AS_HELP_STRING([--enable-drafts],
-        [Build and install draft classes and methods [default=yes]]),
-    [enable_drafts=$enableval],
-    [enable_drafts=$defaultval])
-
-AM_CONDITIONAL([ENABLE_DRAFTS], [test x$enable_drafts != xno])
-
-if test "x$enable_drafts" = "xyes"; then
-    AC_MSG_NOTICE([Building stable and legacy API + draft API])
-    AC_DEFINE(ZMQ_BUILD_DRAFT_API, 1, [Provide draft classes and methods])
-    AC_SUBST(pkg_config_defines, "-DZMQ_BUILD_DRAFT_API=1")
-else
-    AC_MSG_NOTICE([Building stable and legacy API (no draft API)])
-    AC_SUBST(pkg_config_defines, "")
-fi
-
-AC_ARG_ENABLE([libunwind],
-    [AS_HELP_STRING([--enable-libunwind],
-        [enable libunwind [default=auto]])],
-    [enable_libunwind=$enableval],
-    [enable_libunwind="auto"])
-
-if test "x$enable_libunwind" != "xno"; then
-    PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
-        [
-            AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
-            AC_SUBST([LIBUNWIND_CFLAGS])
-            AC_SUBST([LIBUNWIND_LIBS])
-            AC_CHECK_LIB([dl], [dladdr], [
-                PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -ldl"
-                LIBS="-ldl $LIBS"
-            ], [
-                AC_CHECK_LIB([dld], [dladdr], [
-                    PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -ldld"
-                    LIBS="-ldld $LIBS"
-                ])
-            ])
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE libunwind"
-        ],
-        [
-            if test "x$enable_libunwind" = "xyes"; then
-                AC_MSG_ERROR([Cannot find libunwind])
-            else
-                AC_MSG_WARN([Cannot find libunwind])
-            fi
-        ])
-fi
-
-AC_ARG_ENABLE([radix-tree],
-    AS_HELP_STRING([--enable-radix-tree],
-        [Use radix tree implementation to manage subscriptions [default=DRAFT]]),
-    [radix_tree=$enableval],
-    [radix_tree=$enable_drafts])
-
-AM_CONDITIONAL([ENABLE_RADIX_TREE], [test x$radix_tree != xno])
-
-if test "x$radix_tree" = "xyes"; then
-    AC_MSG_NOTICE([Using radix tree implementation to manage subscriptions])
-    AC_DEFINE(ZMQ_USE_RADIX_TREE, 1, [Use radix tree implementation to manage subscriptions])
-else
-    AC_MSG_NOTICE([Using mtree implementation to manage subscriptions])
-fi
-
-# See if clang-format is in PATH; the result unblocks the relevant recipes
-WITH_CLANG_FORMAT=""
-AS_IF([test x"$CLANG_FORMAT" = x],
-    [AC_PATH_PROG([CLANG_FORMAT], [clang-format], [])],
-    [AC_CHECK_PROG([WITH_CLANG_FORMAT], [$CLANG_FORMAT], [true], [fail])])
-AS_IF([test x"$CLANG_FORMAT" != x && test x"$WITH_CLANG_FORMAT" = x],
-    [AS_IF([test -x "$CLANG_FORMAT"],
-        [WITH_CLANG_FORMAT=true],
-        [AC_CHECK_PROG([WITH_CLANG_FORMAT], [$CLANG_FORMAT], [true], [false])])])
-AS_IF([test "$WITH_CLANG_FORMAT" = fail],
-    [AC_MSG_ERROR([Caller explicitly referenced CLANG_FORMAT=$CLANG_FORMAT which was not found])])
-AM_CONDITIONAL([WITH_CLANG_FORMAT], [$WITH_CLANG_FORMAT])
-
-# unittests will not build without the static libzmq.a
-AM_CONDITIONAL(ENABLE_STATIC, test "x$enable_static" = "xyes")
-
-# build using a fuzzing engine - fuzzers will be built separately and statically
-AC_ARG_WITH([fuzzing-engine], [AS_HELP_STRING([--with-fuzzing-engine],
-    [build libzmq with an exernal fuzzing engine [default=no]])],
-    [have_fuzzing_engine_ext=$withval],
-    [have_fuzzing_engine_ext=no])
-AC_ARG_WITH([fuzzing-installdir],
-    AS_HELP_STRING([--with-fuzzing-installdir=PATH],
-        [Path where to install fuzzer binaries]),
-    [fuzzing_installdir="$withval"])
-
-if test "x$have_fuzzing_engine_ext" != "xno" && test "x$fuzzing_installdir" != "x" && test "x$enable_static" = "xyes"; then
-    FUZZING_ENGINE_LIB="${have_fuzzing_engine_ext}"
-    FUZZING_INSTALLDIR="${fuzzing_installdir}"
-    AC_SUBST(FUZZING_ENGINE_LIB)
-    AC_SUBST(FUZZING_INSTALLDIR)
-    AC_DEFINE(ZMQ_USE_FUZZING_ENGINE, 1, [fuzz tests will be built with fuzzing engine])
-fi
-AM_CONDITIONAL(FUZZING_ENGINE_LIB, test "x$FUZZING_ENGINE_LIB" != "x")
-
-# clang 6 has a warning that does not make sense on multi-platform code
-AC_LANG_PUSH([C])
-AX_CHECK_COMPILE_FLAG([-Wno-tautological-constant-compare],
-    [CFLAGS+=" -Wno-tautological-constant-compare"],
-    [],
-    [-Werror])
-AC_LANG_POP([C])
-AX_CHECK_COMPILE_FLAG([-Wno-tautological-constant-compare],
-    [CXXFLAGS+=" -Wno-tautological-constant-compare"],
-    [],
-    [-Werror])
-
-# LTO is enabled by default on SUSE Tumbleweed and RPM lint generates an error if
-# the flag is not used to compile archives:
-# E: lto-no-text-in-archive
-AC_LANG_PUSH([C])
-AX_CHECK_COMPILE_FLAG([-ffat-lto-objects],
-    [CFLAGS+=" -ffat-lto-objects"],
-    [],
-    [-Werror])
-AC_LANG_POP([C])
-AX_CHECK_COMPILE_FLAG([-ffat-lto-objects],
-    [CXXFLAGS+=" -ffat-lto-objects"],
-    [],
-    [-Werror])
-
-# Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
-AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
-AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS)
-AC_SUBST(LIBZMQ_EXTRA_LDFLAGS)
-
-AC_SUBST(LIBZMQ_VMCI_CXXFLAGS)
-AC_SUBST(LIBZMQ_VMCI_LDFLAGS)
-
-AC_SUBST(pkg_config_libs_private, $PKGCFG_LIBS_PRIVATE)
-AC_SUBST(pkg_config_names_private, $PKGCFG_NAMES_PRIVATE)
-
-# set pkgconfigdir, allow override
-AC_ARG_WITH([pkgconfigdir],
-    AS_HELP_STRING([--with-pkgconfigdir=PATH],
-        [Path to the pkgconfig directory [[LIBDIR/pkgconfig]]]),
-    [pkgconfigdir="$withval"],
-    [pkgconfigdir='${libdir}/pkgconfig'])
-AC_SUBST([pkgconfigdir])
-
-AC_CONFIG_FILES([ \
-    Makefile \
-    src/libzmq.pc \
-    doc/Makefile \
-    builds/Makefile \
-    builds/deprecated-msvc/Makefile])
-
-AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 4fa538183..000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# documentation
-#
-MAN3 = zmq_bind.3 zmq_unbind.3 zmq_connect.3 zmq_connect_peer.3 zmq_disconnect.3 zmq_close.3 \
-    zmq_ctx_new.3 zmq_ctx_term.3 zmq_ctx_get.3 zmq_ctx_set.3 zmq_ctx_shutdown.3 \
-    zmq_msg_init.3 zmq_msg_init_data.3 zmq_msg_init_size.3 zmq_msg_init_buffer.3 \
-    zmq_msg_move.3 zmq_msg_copy.3 zmq_msg_size.3 zmq_msg_data.3 zmq_msg_close.3 \
-    zmq_msg_send.3 zmq_msg_recv.3 \
-    zmq_msg_routing_id.3 zmq_msg_set_routing_id.3 \
-    zmq_send.3 zmq_recv.3 zmq_send_const.3 \
-    zmq_msg_get.3 zmq_msg_set.3 zmq_msg_more.3 zmq_msg_gets.3 \
-    zmq_getsockopt.3 zmq_setsockopt.3 \
-    zmq_socket.3 zmq_socket_monitor.3 zmq_poll.3 \
-    zmq_socket_monitor_versioned.3 \
-    zmq_errno.3 zmq_strerror.3 zmq_version.3 \
-    zmq_sendmsg.3 zmq_recvmsg.3 \
-    zmq_proxy.3 zmq_proxy_steerable.3 \
-    zmq_z85_encode.3 zmq_z85_decode.3 zmq_curve_keypair.3 zmq_curve_public.3 \
-    zmq_has.3 \
-    zmq_timers.3 zmq_poller.3 \
-    zmq_atomic_counter_new.3 zmq_atomic_counter_set.3 \
-    zmq_atomic_counter_inc.3 zmq_atomic_counter_dec.3 \
-    zmq_atomic_counter_value.3 zmq_atomic_counter_destroy.3
-
-MAN7 = zmq.7 zmq_tcp.7 zmq_pgm.7 zmq_inproc.7 zmq_ipc.7 \
-    zmq_null.7 zmq_plain.7 zmq_curve.7 zmq_tipc.7 zmq_vmci.7 zmq_udp.7 \
-    zmq_gssapi.7
-
-MAN_DOC =
-
-MAN_TXT = $(MAN3:%.3=%.txt)
-MAN_TXT += $(MAN7:%.7=%.txt)
-MAN_HTML =
-
-MAINTAINERCLEANFILES =
-
-EXTRA_DIST = asciidoc.conf $(MAN_TXT)
-
-if INSTALL_MAN
-MAN_DOC += $(MAN1) $(MAN3) $(MAN7)
-dist_man_MANS = $(MAN_DOC)
-MAINTAINERCLEANFILES += $(MAN_DOC)
-endif
-
-if BUILD_DOC
-MAN_HTML += $(MAN_TXT:%.txt=%.html)
-EXTRA_DIST += $(MAN_HTML)
-MAINTAINERCLEANFILES += $(MAN_HTML)
-
-SUFFIXES=.html .txt .xml .3 .7
-
-.txt.html:
-	asciidoc -d manpage -b xhtml11 -f $(srcdir)/asciidoc.conf \
-		-azmq_version=@PACKAGE_VERSION@ -o$@ $<
-.txt.xml:
-	asciidoc -d manpage -b docbook -f $(srcdir)/asciidoc.conf \
-		-azmq_version=@PACKAGE_VERSION@ -o$@ $<
-.xml.1:
-	xmlto man $<
-.xml.3:
-	xmlto man $<
-.xml.7:
-	xmlto man $<
-endif
-
-dist-hook : $(MAN_DOC) $(MAN_HTML)
diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf
deleted file mode 100644
index d73d7119f..000000000
--- a/doc/asciidoc.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-[paradef-default]
-literal-style=template="literalparagraph"
-
-[macros]
-(?su)[\\]?(?P<name>linkzmq):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
-
-ifdef::backend-docbook[]
-[linkzmq-inlinemacro]
-{0%{target}}
-{0#<citerefentry>}
-{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
-{0#</citerefentry>}
-endif::backend-docbook[]
-
-ifdef::backend-xhtml11[]
-[linkzmq-inlinemacro]
-<a href="{target}.html">{target}{0?({0})}</a>
-endif::backend-xhtml11[]
-
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[header]
-template::[header-declarations]
-<refentry>
-<refmeta>
-<refentrytitle>{mantitle}</refentrytitle>
-<manvolnum>{manvolnum}</manvolnum>
-<refmiscinfo class="source">0MQ</refmiscinfo>
-<refmiscinfo class="version">{zmq_version}</refmiscinfo>
-<refmiscinfo class="manual">0MQ Manual</refmiscinfo>
-</refmeta>
-<refnamediv>
-  <refname>{manname}</refname>
-  <refpurpose>{manpurpose}</refpurpose>
-</refnamediv>
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-ifdef::backend-xhtml11[]
-[footer]
-</div>
-{disable-javascript%<div id="footnotes"><hr /></div>}
-<div id="footer">
-<div id="footer-text">
-ØMQ {zmq_version}<br />
-Last updated {docdate} {doctime}
-</div>
-</div>
-</body>
-</html>
-endif::backend-xhtml11[]
-
-[replacements]
-ifdef::backend-xhtml11[]
-0MQ=ØMQ
-endif::backend-xhtml11[]
diff --git a/doc/zmq.txt b/doc/zmq.txt
deleted file mode 100644
index 07f5fcb12..000000000
--- a/doc/zmq.txt
+++ /dev/null
@@ -1,280 +0,0 @@
-zmq(7)
-======
-
-
-NAME
-----
-zmq - 0MQ lightweight messaging kernel
-
-
-SYNOPSIS
---------
-*#include <zmq.h>*
-
-*cc* ['flags'] 'files' *-lzmq* ['libraries']
-
-
-DESCRIPTION
------------
-The 0MQ lightweight messaging kernel is a library which extends the standard
-socket interfaces with features traditionally provided by specialised
-_messaging middleware_ products. 0MQ sockets provide an abstraction of
-asynchronous _message queues_, multiple _messaging patterns_, message
-filtering (_subscriptions_), seamless access to multiple _transport protocols_
-and more.
-
-This documentation presents an overview of 0MQ concepts, describes how 0MQ
-abstracts standard sockets and provides a reference manual for the functions
-provided by the 0MQ library.
-
-
-Context
-~~~~~~~
-The 0MQ 'context' keeps the list of sockets and manages the async I/O thread
-and internal queries.
-
-Before using any 0MQ library functions you must create a 0MQ 'context'. When
-you exit your application you must destroy the 'context'. These functions let
-you work with 'contexts':
-
-Create a new 0MQ context::
-    linkzmq:zmq_ctx_new[3]
-
-Work with context properties::
-    linkzmq:zmq_ctx_set[3]
-    linkzmq:zmq_ctx_get[3]
-
-Destroy a 0MQ context::
-    linkzmq:zmq_ctx_shutdown[3]
-    linkzmq:zmq_ctx_term[3]
-
-Thread safety
-^^^^^^^^^^^^^
-A 0MQ 'context' is thread safe and may be shared among as many application
-threads as necessary, without any additional locking required on the part of
-the caller.
-
-Individual 0MQ 'sockets' are _not_ thread safe except in the case where full
-memory barriers are issued when migrating a socket from one thread to another.
-In practice this means applications can create a socket in one thread with
-_zmq_socket()_ and then pass it to a _newly created_ thread as part of thread
-initialisation, for example via a structure passed as an argument to
-_pthread_create()_.
-
-
-Multiple contexts
-^^^^^^^^^^^^^^^^^
-Multiple 'contexts' may coexist within a single application. Thus, an
-application can use 0MQ directly and at the same time make use of any number of
-additional libraries or components which themselves make use of 0MQ as long as
-the above guidelines regarding thread safety are adhered to.
-
-
-Messages
-~~~~~~~~
-A 0MQ message is a discrete unit of data passed between applications or
-components of the same application. 0MQ messages have no internal structure and
-from the point of view of 0MQ itself they are considered to be opaque binary
-data.
-
-The following functions are provided to work with messages:
-
-Initialise a message::
-    linkzmq:zmq_msg_init[3]
-    linkzmq:zmq_msg_init_size[3]
-    linkzmq:zmq_msg_init_buffer[3]
-    linkzmq:zmq_msg_init_data[3]
-
-Sending and receiving a message::
-    linkzmq:zmq_msg_send[3]
-    linkzmq:zmq_msg_recv[3]
-
-Release a message::
-    linkzmq:zmq_msg_close[3]
-
-Access message content::
-    linkzmq:zmq_msg_data[3]
-    linkzmq:zmq_msg_size[3]
-    linkzmq:zmq_msg_more[3]
-
-Work with message properties::
-    linkzmq:zmq_msg_gets[3]
-    linkzmq:zmq_msg_get[3]
-    linkzmq:zmq_msg_set[3]
-
-Message manipulation::
-    linkzmq:zmq_msg_copy[3]
-    linkzmq:zmq_msg_move[3]
-
-
-Sockets
-~~~~~~~
-0MQ sockets present an abstraction of an asynchronous _message queue_, with the
-exact queueing semantics depending on the socket type in use. See
-linkzmq:zmq_socket[3] for the socket types provided.
-
-The following functions are provided to work with sockets:
-
-Creating a socket::
-    linkzmq:zmq_socket[3]
-
-Closing a socket::
-    linkzmq:zmq_close[3]
-
-Manipulating socket options::
-    linkzmq:zmq_getsockopt[3]
-    linkzmq:zmq_setsockopt[3]
-
-Establishing a message flow::
-    linkzmq:zmq_bind[3]
-    linkzmq:zmq_connect[3]
-
-Sending and receiving messages::
-    linkzmq:zmq_msg_send[3]
-    linkzmq:zmq_msg_recv[3]
-    linkzmq:zmq_send[3]
-    linkzmq:zmq_recv[3]
-    linkzmq:zmq_send_const[3]
-
-Monitoring socket events::
-    linkzmq:zmq_socket_monitor[3]
-
-.Input/output multiplexing
-0MQ provides a mechanism for applications to multiplex input/output events over
-a set containing both 0MQ sockets and standard sockets. This mechanism mirrors
-the standard _poll()_ system call, and is described in detail in
-linkzmq:zmq_poll[3]. This API is deprecated, however.
-
-There is a new DRAFT API with multiple zmq_poller_* function, which is described
-in linkzmq:zmq_poller[3].
-
-
-Transports
-~~~~~~~~~~
-A 0MQ socket can use multiple different underlying transport mechanisms.
-Each transport mechanism is suited to a particular purpose and has its own
-advantages and drawbacks.
-
-The following transport mechanisms are provided:
-
-Unicast transport using TCP::
-    linkzmq:zmq_tcp[7]
-
-Reliable multicast transport using PGM::
-    linkzmq:zmq_pgm[7]
-
-Local inter-process communication transport::
-    linkzmq:zmq_ipc[7]
-
-Local in-process (inter-thread) communication transport::
-    linkzmq:zmq_inproc[7]
-
-Virtual Machine Communications Interface (VMC) transport::
-    linkzmq:zmq_vmci[7]
-
-Unreliable unicast and multicast using UDP::
-    linkzmq:zmq_udp[7]
-
-
-Proxies
-~~~~~~~
-0MQ provides 'proxies' to create fanout and fan-in topologies. A proxy connects
-a 'frontend' socket to a 'backend' socket and switches all messages between the
-two sockets, opaquely. A proxy may optionally capture all traffic to a third
-socket. To start a proxy in an application thread, use linkzmq:zmq_proxy[3].
-
-
-Security
-~~~~~~~~
-A 0MQ socket can select a security mechanism. Both peers must use the same
-security mechanism.
-
-The following security mechanisms are provided for IPC and TCP connections:
-
-Null security::
-    linkzmq:zmq_null[7]
-
-Plain-text authentication using username and password::
-    linkzmq:zmq_plain[7]
-
-Elliptic curve authentication and encryption::
-    linkzmq:zmq_curve[7]
-
-Generate a CURVE keypair in armored text format::
-    linkzmq:zmq_curve_keypair[3]
-
-Derive a CURVE public key from a secret key:
-    linkzmq:zmq_curve_public[3]
-
-Converting keys to/from armoured text strings::
-    linkzmq:zmq_z85_decode[3]
-    linkzmq:zmq_z85_encode[3]
-
-
-ERROR HANDLING
---------------
-The 0MQ library functions handle errors using the standard conventions found on
-POSIX systems. Generally, this means that upon failure a 0MQ library function
-shall return either a NULL value (if returning a pointer) or a negative value
-(if returning an integer), and the actual error code shall be stored in the
-'errno' variable.
-
-On non-POSIX systems some users may experience issues with retrieving the
-correct value of the 'errno' variable. The _zmq_errno()_ function is provided
-to assist in these cases; for details refer to linkzmq:zmq_errno[3].
-
-The _zmq_strerror()_ function is provided to translate 0MQ-specific error codes
-into error message strings; for details refer to linkzmq:zmq_strerror[3].
-
-
-UTILITY
--------
-The following utility functions are provided:
-
-Working with atomic counters::
-    linkzmq:zmq_atomic_counter_new[3]
-    linkzmq:zmq_atomic_counter_set[3]
-    linkzmq:zmq_atomic_counter_inc[3]
-    linkzmq:zmq_atomic_counter_dec[3]
-    linkzmq:zmq_atomic_counter_value[3]
-    linkzmq:zmq_atomic_counter_destroy[3]
-
-
-MISCELLANEOUS
--------------
-The following miscellaneous functions are provided:
-
-Report 0MQ library version::
-    linkzmq:zmq_version[3]
-
-
-LANGUAGE BINDINGS
------------------
-The 0MQ library provides interfaces suitable for calling from programs in any
-language; this documentation documents those interfaces as they would be used
-by C programmers. The intent is that programmers using 0MQ from other languages
-shall refer to this documentation alongside any documentation provided by the
-vendor of their language binding.
-
-Language bindings ($$C++$$, Python, PHP, Ruby, Java and more) are provided by
-members of the 0MQ community and pointers can be found on the 0MQ website.
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
-
-
-RESOURCES
----------
-Main web site: <http://www.zeromq.org/>
-
-Report bugs to the 0MQ development mailing list: <zeromq-dev@lists.zeromq.org>
-
-
-COPYING
--------
-Free use of this software is granted under the terms of the GNU Lesser General
-Public License (LGPL). For details see the files `COPYING` and `COPYING.LESSER`
-included with the 0MQ distribution.
diff --git a/doc/zmq_atomic_counter_dec.txt b/doc/zmq_atomic_counter_dec.txt
deleted file mode 100644
index 53a088c40..000000000
--- a/doc/zmq_atomic_counter_dec.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_atomic_counter_dec(3)
-=========================
-
-
-NAME
-----
-zmq_atomic_counter_dec - decrement an atomic counter
-
-
-SYNOPSIS
---------
-*int zmq_atomic_counter_dec (void *counter);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_dec_ function decrements an atomic counter in
-a threadsafe fashion. This function uses platform specific atomic
-operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_dec()_ function returns 1 if the counter is
-greater than zero after decrementing, or zero if the counter reached
-zero.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_value[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_atomic_counter_destroy.txt b/doc/zmq_atomic_counter_destroy.txt
deleted file mode 100644
index ee7c863fd..000000000
--- a/doc/zmq_atomic_counter_destroy.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_atomic_counter_destroy(3)
-=============================
-
-
-NAME
-----
-zmq_atomic_counter_destroy - destroy an atomic counter
-
-
-SYNOPSIS
---------
-*void zmq_atomic_counter_destroy (void **counter_p);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_destroy_ function destroys an atomic counter and
-nullifies its reference. Pass the address of an atomic counter (void **)
-rather than the counter itself. You must destroy all counters that you
-create, to avoid memory leakage. This function uses platform specific
-atomic operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_destroy()_ function has no return value.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_value[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_atomic_counter_inc.txt b/doc/zmq_atomic_counter_inc.txt
deleted file mode 100644
index 6346ea13a..000000000
--- a/doc/zmq_atomic_counter_inc.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-zmq_atomic_counter_inc(3)
-=========================
-
-
-NAME
-----
-zmq_atomic_counter_inc - increment an atomic counter
-
-
-SYNOPSIS
---------
-*int zmq_atomic_counter_inc (void *counter);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_inc_ function increments an atomic counter in a
-threadsafe fashion. This function uses platform specific atomic
-operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_inc()_ function returns the old value of the
-counter, before incrementing.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_value[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_atomic_counter_new.txt b/doc/zmq_atomic_counter_new.txt
deleted file mode 100644
index 7278f2b7a..000000000
--- a/doc/zmq_atomic_counter_new.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_atomic_counter_new(3)
-=========================
-
-
-NAME
-----
-zmq_atomic_counter_new - create a new atomic counter
-
-
-SYNOPSIS
---------
-*void *zmq_atomic_counter_new (void);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_new_ function creates a new atomic counter. You
-can use this in multithreaded applications to do, for example, reference
-counting of shared objects. The atomic counter is at least 32 bits large.
-This function uses platform specific atomic operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_new()_ function returns the new atomic counter
-if successful. Otherwise it returns NULL.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_value[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_atomic_counter_set.txt b/doc/zmq_atomic_counter_set.txt
deleted file mode 100644
index 3b0812f6f..000000000
--- a/doc/zmq_atomic_counter_set.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-zmq_atomic_counter_set(3)
-=========================
-
-
-NAME
-----
-zmq_atomic_counter_set - set atomic counter to new value
-
-
-SYNOPSIS
---------
-*void zmq_atomic_counter_set (void *counter, int value);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_set_ function sets the counter to a new value,
-in a threadsafe fashion. The largest value that is guaranteed to work
-across all platforms is 2^31-1. This function uses platform specific
-atomic operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_set()_ function has no return value.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_value[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_atomic_counter_value.txt b/doc/zmq_atomic_counter_value.txt
deleted file mode 100644
index f2e344751..000000000
--- a/doc/zmq_atomic_counter_value.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_atomic_counter_value(3)
-===========================
-
-
-NAME
-----
-zmq_atomic_counter_value - return value of atomic counter
-
-
-SYNOPSIS
---------
-*int zmq_atomic_counter_value (void *counter);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_value_ function returns the value of an atomic
-counter created by _zmq_atomic_counter_new()_. This function uses platform 
-specific atomic operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_value()_ function returns the value of the 
-atomic counter. If _counter_ does not point to an atomic counter created by
-_zmq_atomic_counter_new()_, the behaviour is undefined.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_bind.txt b/doc/zmq_bind.txt
deleted file mode 100644
index 6305cfc60..000000000
--- a/doc/zmq_bind.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-zmq_bind(3)
-===========
-
-
-NAME
-----
-zmq_bind - accept incoming connections on a socket
-
-
-SYNOPSIS
---------
-*int zmq_bind (void '*socket', const char '*endpoint');*
-
-
-DESCRIPTION
------------
-The _zmq_bind()_ function binds the 'socket' to a local 'endpoint' and then
-accepts incoming connections on that endpoint.
-
-The 'endpoint' is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to bind to.
-
-0MQ provides the the following transports:
-
-'tcp':: unicast transport using TCP, see linkzmq:zmq_tcp[7]
-'ipc':: local inter-process communication transport, see linkzmq:zmq_ipc[7]
-'inproc':: local in-process (inter-thread) communication transport, see linkzmq:zmq_inproc[7]
-'pgm', 'epgm':: reliable multicast transport using PGM, see linkzmq:zmq_pgm[7]
-'vmci':: virtual machine communications interface (VMCI), see linkzmq:zmq_vmci[7]
-'udp':: unreliable unicast and multicast using UDP, see linkzmq:zmq_udp[7]
-
-Every 0MQ socket type except 'ZMQ_PAIR' and 'ZMQ_CHANNEL' supports one-to-many and many-to-one
-semantics. The precise semantics depend on the socket type and are defined in
-linkzmq:zmq_socket[3].
-
-The 'ipc', 'tcp', 'vmci' and 'udp' transports accept wildcard addresses: see
-linkzmq:zmq_ipc[7], linkzmq:zmq_tcp[7], linkzmq:zmq_vmci[7] and
-linkzmq:zmq_udp[7] for details.
-
-NOTE: the address syntax may be different for _zmq_bind()_ and _zmq_connect()_
-especially for the 'tcp', 'pgm' and 'epgm' transports.
-
-NOTE: following a _zmq_bind()_, the socket enters a 'mute' state unless or
-until at least one incoming or outgoing connection is made, at which point
-the socket enters a 'ready' state. In the mute state, the socket blocks or
-drops messages according to the socket type, as defined in linkzmq:zmq_socket[3].
-By contrast, following a libzmq:zmq_connect[3], the socket enters the 'ready' state.
-
-
-RETURN VALUE
-------------
-The _zmq_bind()_ function returns zero if successful. Otherwise it returns
-`-1` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*EPROTONOSUPPORT*::
-The requested 'transport' protocol is not supported.
-*ENOCOMPATPROTO*::
-The requested 'transport' protocol is not compatible with the socket type.
-*EADDRINUSE*::
-The requested 'address' is already in use.
-*EADDRNOTAVAIL*::
-The requested 'address' was not local.
-*ENODEV*::
-The requested 'address' specifies a nonexistent interface.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EMTHREAD*::
-No I/O thread is available to accomplish the task.
-
-
-EXAMPLE
--------
-.Binding a publisher socket to an in-process and a TCP transport
-----
-/* Create a ZMQ_PUB socket */
-void *socket = zmq_socket (context, ZMQ_PUB);
-assert (socket);
-/* Bind it to a in-process transport with the address 'my_publisher' */
-int rc = zmq_bind (socket, "inproc://my_publisher");
-assert (rc == 0);
-/* Bind it to a TCP transport on port 5555 of the 'eth0' interface */
-rc = zmq_bind (socket, "tcp://eth0:5555");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_close.txt b/doc/zmq_close.txt
deleted file mode 100644
index 961d7b9ed..000000000
--- a/doc/zmq_close.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-zmq_close(3)
-============
-
-
-NAME
-----
-zmq_close - close 0MQ socket
-
-
-SYNOPSIS
---------
-*int zmq_close (void '*socket');*
-
-
-DESCRIPTION
------------
-The _zmq_close()_ function shall destroy the socket referenced by the 'socket'
-argument. Any outstanding messages physically received from the network but not
-yet received by the application with _zmq_recv()_ shall be discarded. The
-behaviour for discarding messages sent by the application with _zmq_send()_ but
-not yet physically transferred to the network depends on the value of the
-_ZMQ_LINGER_ socket option for the specified 'socket'.
-
-_zmq_close()_ must be called exactly once for each socket. If it is never called,
-_zmq_ctx_term()_ will block forever. If it is called multiple times for the same 
-socket or if 'socket' does not point to a socket, the behaviour is undefined.
-
-NOTE: The default setting of _ZMQ_LINGER_ does not discard unsent messages;
-this behaviour may cause the application to block when calling _zmq_ctx_term()_.
-For details refer to linkzmq:zmq_setsockopt[3] and linkzmq:zmq_ctx_term[3].
-
-NOTE: This API will complete asynchronously, so not everything will be deallocated
-after it returns. See above for details about linger.
-
-
-RETURN VALUE
-------------
-The _zmq_close()_ function shall return zero if successful. Otherwise it shall
-return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOTSOCK*::
-The provided 'socket' was NULL.
-
-
-SEE ALSO
---------
-linkzmq:zmq_socket[3]
-linkzmq:zmq_ctx_term[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_connect.txt b/doc/zmq_connect.txt
deleted file mode 100644
index b06e8261c..000000000
--- a/doc/zmq_connect.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-zmq_connect(3)
-==============
-
-
-NAME
-----
-zmq_connect - create outgoing connection from socket
-
-
-SYNOPSIS
---------
-*int zmq_connect (void '*socket', const char '*endpoint');*
-
-
-DESCRIPTION
------------
-The _zmq_connect()_ function connects the 'socket' to an 'endpoint' and then
-accepts incoming connections on that endpoint.
-
-The 'endpoint' is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-0MQ provides the the following transports:
-
-'tcp':: unicast transport using TCP, see linkzmq:zmq_tcp[7]
-'ipc':: local inter-process communication transport, see linkzmq:zmq_ipc[7]
-'inproc':: local in-process (inter-thread) communication transport, see linkzmq:zmq_inproc[7]
-'pgm', 'epgm':: reliable multicast transport using PGM, see linkzmq:zmq_pgm[7]
-'vmci':: virtual machine communications interface (VMCI), see linkzmq:zmq_vmci[7]
-'udp':: unreliable unicast and multicast using UDP, see linkzmq:zmq_udp[7]
-
-Every 0MQ socket type except 'ZMQ_PAIR' and 'ZMQ_CHANNEL' supports one-to-many and many-to-one
-semantics. The precise semantics depend on the socket type and are defined in
-linkzmq:zmq_socket[3].
-
-NOTE: for most transports and socket types the connection is not performed
-immediately but as needed by 0MQ. Thus a successful call to _zmq_connect()_
-does not mean that the connection was or could actually be established.
-Because of this, for most transports and socket types the order in which
-a 'server' socket is bound and a 'client' socket is connected to it does not
-matter. The _ZMQ_PAIR_ and _ZMQ_CHANNEL_ sockets are an exception, as they do not automatically
-reconnect to endpoints.
-
-NOTE: following a _zmq_connect()_, for socket types except for ZMQ_ROUTER,
-the socket enters its normal 'ready' state. By contrast, following a
-_zmq_bind()_ alone, the socket enters a 'mute' state in which the socket
-blocks or drops messages according to the socket type, as defined in
-linkzmq:zmq_socket[3]. A ZMQ_ROUTER socket enters its normal 'ready' state
-for a specific peer only when handshaking is complete for that peer, which
-may take an arbitrary time.
-
-NOTE: for some socket types, multiple connections to the same endpoint
-don't really make sense
-(see https://github.com/zeromq/libzmq/issues/788).
-For those socket types, any attempt to connect to an already connected endpoint
-is silently ignored (i.e., returns zero).  This behavior applies to ZMQ_DEALER,
-ZMQ_SUB, ZMQ_PUB, and ZMQ_REQ socket types.
-
-
-RETURN VALUE
-------------
-The _zmq_connect()_ function returns zero if successful. Otherwise it returns
-`-1` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*EPROTONOSUPPORT*::
-The requested 'transport' protocol is not supported.
-*ENOCOMPATPROTO*::
-The requested 'transport' protocol is not compatible with the socket type.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EMTHREAD*::
-No I/O thread is available to accomplish the task.
-
-
-EXAMPLE
--------
-.Connecting a subscriber socket to an in-process and a TCP transport
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_SUB);
-assert (socket);
-/* Connect it to an in-process transport with the address 'my_publisher' */
-int rc = zmq_connect (socket, "inproc://my_publisher");
-assert (rc == 0);
-/* Connect it to the host server001, port 5555 using a TCP transport */
-rc = zmq_connect (socket, "tcp://server001:5555");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_connect_peer.txt b/doc/zmq_connect_peer.txt
deleted file mode 100644
index 5375d1ba9..000000000
--- a/doc/zmq_connect_peer.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-zmq_connect_peer(3)
-===================
-
-
-NAME
-----
-zmq_connect_peer - create outgoing connection from socket and return the connection routing id in thread-safe and atomic way.
-
-
-SYNOPSIS
---------
-*uint32_t zmq_connect_peer (void '*socket', const char '*endpoint');*
-
-
-DESCRIPTION
------------
-The _zmq_connect_peer()_ function connects a 'ZMQ_PEER' socket to an 'endpoint' and then returns the endpoint 'routing_id'.
-
-The 'endpoint' is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-The function is supported only on the 'ZMQ_PEER' socket type and would return `0` with 'errno' set to 'ENOTSUP' otherwise.
-
-The _zmq_connect_peer()_ support the following transports:
-
-'tcp':: unicast transport using TCP, see linkzmq:zmq_tcp[7]
-'ipc':: local inter-process communication transport, see linkzmq:zmq_ipc[7]
-'inproc':: local in-process (inter-thread) communication transport, see linkzmq:zmq_inproc[7]
-'ws':: unicast transport using WebSockets, see linkzmq:zmq_ws[7]
-'wss':: unicast transport using WebSockets over TLS, see linkzmq:zmq_wss[7]
-
-RETURN VALUE
-------------
-The _zmq_connect_peer()_ function returns the peer 'routing_id' if successful. Otherwise it returns
-`0` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*EPROTONOSUPPORT*::
-The requested 'transport' protocol is not supported with 'ZMQ_PEER'.
-*ENOCOMPATPROTO*::
-The requested 'transport' protocol is not compatible with the socket type.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EMTHREAD*::
-No I/O thread is available to accomplish the task.
-*ENOTSUP*::
-The socket is not of type 'ZMQ_PEER'.
-*EFAULT*::
-The 'ZMQ_IMMEDIATE' option is set on the socket.
-
-EXAMPLE
--------
-.Connecting a peer socket to a TCP transport and sending a message
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_PEER);
-assert (socket);
-/* Connect it to the host server001, port 5555 using a TCP transport */
-uint32_t routing_id = zmq_connect (socket, "tcp://server001:5555");
-assert (routing_id == 0);
-/* Sending a message to the peer  */
-zmq_msg_t msg;
-int rc = zmq_msg_init_data (&msg, "HELLO", 5, NULL, NULL);
-assert (rc == 0);
-rc = zmq_msg_set_routing_id (&msg, routing_id);
-assert (rc == 0);
-rc = zmq_msg_send (&msg, socket, 0);
-assert (rc == 5);
-rc = zmq_msg_close (&msg);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_bind[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_ctx_destroy.txt b/doc/zmq_ctx_destroy.txt
deleted file mode 100644
index c11f86da7..000000000
--- a/doc/zmq_ctx_destroy.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-zmq_ctx_destroy(3)
-==================
-
-
-NAME
-----
-zmq_ctx_destroy - terminate a 0MQ context
-
-
-SYNOPSIS
---------
-*int zmq_ctx_destroy (void '*context');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_destroy()_ function shall destroy the 0MQ context 'context'.
-
-Context termination is performed in the following steps:
-
-1. Any blocking operations currently in progress on sockets open within
-   'context' shall return immediately with an error code of ETERM.  With the
-   exception of _zmq_close()_, any further operations on sockets open within
-   'context' shall fail with an error code of ETERM.
-
-2. After interrupting all blocking calls, _zmq_ctx_destroy()_ shall _block_ until the
-   following conditions are satisfied:
-
-   * All sockets open within 'context' have been closed with _zmq_close()_.
-
-   * For each socket within 'context', all messages sent by the application
-     with _zmq_send()_ have either been physically transferred to a network
-     peer, or the socket's linger period set with the _ZMQ_LINGER_ socket
-     option has expired.
-
-For further details regarding socket linger behaviour refer to the _ZMQ_LINGER_
-option in linkzmq:zmq_setsockopt[3].
-
-This function is deprecated by linkzmq:zmq_ctx_term[3].
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_destroy()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-The provided 'context' was invalid.
-*EINTR*::
-Termination was interrupted by a signal. It can be restarted if needed.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_init[3]
-linkzmq:zmq_close[3]
-linkzmq:zmq_setsockopt[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_ctx_get.txt b/doc/zmq_ctx_get.txt
deleted file mode 100644
index 6558946f9..000000000
--- a/doc/zmq_ctx_get.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-zmq_ctx_get(3)
-==============
-
-
-NAME
-----
-
-zmq_ctx_get - get context options
-
-
-SYNOPSIS
---------
-*int zmq_ctx_get (void '*context', int 'option_name');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_get()_ function shall return the option specified by the
-'option_name' argument.
-
-The _zmq_ctx_get()_ function accepts the following option names:
-
-
-ZMQ_IO_THREADS: Get number of I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IO_THREADS' argument returns the size of the 0MQ thread pool
-for this context.
-
-
-ZMQ_MAX_SOCKETS: Get maximum number of sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MAX_SOCKETS' argument returns the maximum number of sockets
-allowed for this context.
-
-
-ZMQ_MAX_MSGSZ: Get maximum message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MAX_MSGSZ' argument returns the maximum size of a message
-allowed for this context. Default value is INT_MAX.
-
-
-ZMQ_ZERO_COPY_RECV: Get message decoding strategy
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ZERO_COPY_RECV' argument return whether message decoder uses a zero copy
-strategy when receiving messages. Default value is 1.
-NOTE: in DRAFT state, not yet available in stable releases.
-
-
-ZMQ_SOCKET_LIMIT: Get largest configurable number of sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SOCKET_LIMIT' argument returns the largest number of sockets that
-linkzmq:zmq_ctx_set[3] will accept.
-
-
-ZMQ_IPV6: Set IPv6 option
-~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IPV6' argument returns the IPv6 option for the context.
-
-
-ZMQ_BLOCKY: Get blocky setting
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BLOCKY' argument returns 1 if the context will block on terminate,
-zero if the "block forever on context termination" gambit was disabled by
-setting ZMQ_BLOCKY to false on all new contexts.
-
-
-ZMQ_THREAD_SCHED_POLICY: Get scheduling policy for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_SCHED_POLICY' argument returns the scheduling policy for
-internal context's thread pool.
-
-
-ZMQ_THREAD_NAME_PREFIX: Get name prefix for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_NAME_PREFIX' argument gets the numeric prefix of each thread
-created for the internal context's thread pool.
-
-
-ZMQ_MSG_T_SIZE: Get the zmq_msg_t size at runtime
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MSG_T_SIZE' argument returns the size of the zmq_msg_t structure at
-runtime, as defined in the include/zmq.h public header.
-This is useful for example for FFI bindings that can't simply do a sizeof().
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_get()_ function returns a value of 0 or greater if successful.
-Otherwise it returns `-1` and sets 'errno' to one of the values defined
-below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown.
-
-
-EXAMPLE
--------
-.Setting a limit on the number of sockets
-----
-void *context = zmq_ctx_new ();
-zmq_ctx_set (context, ZMQ_MAX_SOCKETS, 256);
-int max_sockets = zmq_ctx_get (context, ZMQ_MAX_SOCKETS);
-assert (max_sockets == 256);
-----
-.Switching off the context deadlock gambit
-----
-zmq_ctx_set (ctx, ZMQ_BLOCKY, false);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_ctx_set[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_ctx_get_ext.txt b/doc/zmq_ctx_get_ext.txt
deleted file mode 100644
index 9fc0ed7be..000000000
--- a/doc/zmq_ctx_get_ext.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-zmq_ctx_get_ext(3)
-==================
-
-
-NAME
-----
-
-zmq_ctx_get_ext - get extended context options
-
-
-SYNOPSIS
---------
-*int zmq_ctx_get_ext (void '*context', int 'option_name', void '*option_value', size_t '*option_len');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_get()_ function shall retrieve the value for the option
-specified by the 'option_name' argument and store it in the buffer pointed to
-by the 'option_value' argument. 
-The 'option_len' argument is the size in bytes of the buffer pointed
-to by 'option_value'; upon successful completion _zmq_ctx_get_ext()_ shall
-modify the 'option_len' argument to indicate the actual size of the option
-value stored in the buffer.
-
-The _zmq_ctx_get_ext()_ function accepts all the option names accepted by
-_zmq_ctx_get()_.
-Options that make most sense to retrieve using _zmq_ctx_get_ext()_ instead of
-_zmq_ctx_get()_ are:
-
-ZMQ_THREAD_NAME_PREFIX: Get name prefix for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_NAME_PREFIX' argument gets the string prefix of each thread
-created for the internal context's thread pool.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: empty string
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_get_ext()_ function returns a value of 0 or greater if successful.
-Otherwise it returns `-1` and sets 'errno' to one of the values defined
-below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown.
-
-
-EXAMPLE
--------
-.Setting a prefix on internal ZMQ threda names:
-----
-void *context = zmq_ctx_new ();
-const char prefix[] = "MyApp";
-size_t prefixLen = sizeof(prefix);
-zmq_ctx_set (context, ZMQ_THREAD_NAME_PREFIX, &prefix, &prefixLen);
-
-char buff[256];
-size_t buffLen = sizeof(buff);
-int rc = zmq_ctx_get (context, ZMQ_THREAD_NAME_PREFIX, &buff, &buffLen);
-assert (rc == 0);
-assert (buffLen == prefixLen);
-
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_ctx_get[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_ctx_new.txt b/doc/zmq_ctx_new.txt
deleted file mode 100644
index a04ab8c51..000000000
--- a/doc/zmq_ctx_new.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-zmq_ctx_new(3)
-==============
-
-
-NAME
-----
-zmq_ctx_new - create new 0MQ context
-
-
-SYNOPSIS
---------
-*void *zmq_ctx_new ();*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_new()_ function creates a new 0MQ 'context'.
-
-This function replaces the deprecated function linkzmq:zmq_init[3].
-
-.Thread safety
-A 0MQ 'context' is thread safe and may be shared among as many application
-threads as necessary, without any additional locking required on the part of
-the caller.
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_new()_ function shall return an opaque handle to the newly created
-'context' if successful. Otherwise it shall return NULL and set 'errno' to one
-of the values defined below.
-
-
-ERRORS
-------
-No error values are defined for this function.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_ctx_set[3]
-linkzmq:zmq_ctx_get[3]
-linkzmq:zmq_ctx_term[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_ctx_set.txt b/doc/zmq_ctx_set.txt
deleted file mode 100644
index 11feb1593..000000000
--- a/doc/zmq_ctx_set.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-zmq_ctx_set(3)
-==============
-
-
-NAME
-----
-
-zmq_ctx_set - set context options
-
-
-SYNOPSIS
---------
-*int zmq_ctx_set (void '*context', int 'option_name', int 'option_value');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_set()_ function shall set the option specified by the
-'option_name' argument to the value of the 'option_value' argument.
-
-The _zmq_ctx_set()_ function accepts the following options:
-
-
-ZMQ_BLOCKY: Fix blocky behavior
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-By default the context will block, forever, on a zmq_ctx_term call. The
-assumption behind this behavior is that abrupt termination will cause
-message loss. Most real applications use some form of handshaking to ensure
-applications receive termination messages, and then terminate the context
-with 'ZMQ_LINGER' set to zero on all sockets. This setting is an easier way
-to get the same result. When 'ZMQ_BLOCKY' is set to false, all new sockets
-are given a linger timeout of zero. You must still close all sockets before
-calling zmq_ctx_term.
-
-[horizontal]
-Default value:: true (old behavior)
-
-
-ZMQ_IO_THREADS: Set number of I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IO_THREADS' argument specifies the size of the 0MQ thread pool to
-handle I/O operations. If your application is using only the 'inproc'
-transport for messaging you may set this to zero, otherwise set it to at
-least one. This option only applies before creating any sockets on the
-context.
-
-[horizontal]
-Default value:: 1
-
-
-ZMQ_THREAD_SCHED_POLICY: Set scheduling policy for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_SCHED_POLICY' argument sets the scheduling policy for
-internal context's thread pool. This option is not available on windows.
-Supported values for this option can be found in sched.h file,
-or at http://man7.org/linux/man-pages/man2/sched_setscheduler.2.html.
-This option only applies before creating any sockets on the context.
-
-[horizontal]
-Default value:: -1
-
-
-ZMQ_THREAD_PRIORITY: Set scheduling priority for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_PRIORITY' argument sets scheduling priority for
-internal context's thread pool. This option is not available on windows.
-Supported values for this option depend on chosen scheduling policy.
-On Linux, when the scheduler policy is SCHED_OTHER, SCHED_IDLE or SCHED_BATCH, the OS scheduler
-will not use the thread priority but rather the thread "nice value"; in such cases
-the system call "nice" will be used to set the nice value to -20 (max priority) instead of
-adjusting the thread priority (which must be zero for those scheduling policies).
-Details can be found in sched.h file, or at http://man7.org/linux/man-pages/man2/sched_setscheduler.2.html.
-This option only applies before creating any sockets on the context.
-
-[horizontal]
-Default value:: -1
-
-
-ZMQ_THREAD_AFFINITY_CPU_ADD: Add a CPU to list of affinity for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_AFFINITY_CPU_ADD' argument adds a specific CPU to the affinity list for the internal
-context's thread pool. This option is only supported on Linux.
-This option only applies before creating any sockets on the context.
-The default affinity list is empty and means that no explicit CPU-affinity will be set on
-internal context's threads.
-
-[horizontal]
-Default value:: -1
-
-
-ZMQ_THREAD_AFFINITY_CPU_REMOVE: Remove a CPU to list of affinity for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_AFFINITY_CPU_REMOVE' argument removes a specific CPU to the affinity list for the internal
-context's thread pool. This option is only supported on Linux.
-This option only applies before creating any sockets on the context.
-The default affinity list is empty and means that no explicit CPU-affinity will be set on
-internal context's threads.
-
-[horizontal]
-Default value:: -1
-
-
-ZMQ_THREAD_NAME_PREFIX: Set name prefix for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_NAME_PREFIX' argument sets a numeric prefix to each thread
-created for the internal context's thread pool. This option is only supported on Linux.
-This option is useful to help  debugging done via "top -H" or "gdb"; in case
-multiple processes on the system are using ZeroMQ it is useful to provide through
-this context option an application-specific prefix to distinguish ZeroMQ background
-threads that belong to different processes.
-This option only applies before creating any sockets on the context.
-
-[horizontal]
-Default value:: -1
-
-
-
-ZMQ_MAX_MSGSZ: Set maximum message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MAX_MSGSZ' argument sets the maximum allowed size
-of a message sent in the context. You can query the maximal
-allowed value with linkzmq:zmq_ctx_get[3] using the
-'ZMQ_MAX_MSGSZ' option.
-
-[horizontal]
-Default value:: INT_MAX
-Maximum value:: INT_MAX
-
-
-ZMQ_ZERO_COPY_RECV: Specify message decoding strategy
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ZERO_COPY_RECV' argument specifies whether the message decoder should
-use a zero copy strategy when receiving messages. The zero copy strategy can
-lead to increased memory usage in some cases. This option allows you to use the
-older copying strategy. You can query the value of this option with
-linkzmq:zmq_ctx_get[3] using the 'ZMQ_ZERO_COPY_RECV' option.
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Default value:: 1
-
-
-ZMQ_MAX_SOCKETS: Set maximum number of sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MAX_SOCKETS' argument sets the maximum number of sockets allowed
-on the context. You can query the maximal allowed value with
-linkzmq:zmq_ctx_get[3] using the 'ZMQ_SOCKET_LIMIT' option.
-
-[horizontal]
-Default value:: 1023
-
-
-ZMQ_IPV6: Set IPv6 option
-~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IPV6' argument sets the IPv6 value for all sockets created in
-the context from this point onwards. A value of `1` means IPv6 is
-enabled, while `0` means the socket will use only IPv4. When IPv6 is
-enabled, a socket will connect to, or accept connections from, both
-IPv4 and IPv6 hosts.
-
-[horizontal]
-Default value:: 0
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_set()_ function returns zero if successful. Otherwise it
-returns `-1` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown.
-
-
-EXAMPLE
--------
-.Setting a limit on the number of sockets
-----
-void *context = zmq_ctx_new ();
-zmq_ctx_set (context, ZMQ_MAX_SOCKETS, 256);
-int max_sockets = zmq_ctx_get (context, ZMQ_MAX_SOCKETS);
-assert (max_sockets == 256);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_ctx_get[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_ctx_set_ext.txt b/doc/zmq_ctx_set_ext.txt
deleted file mode 100644
index 25773b218..000000000
--- a/doc/zmq_ctx_set_ext.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-zmq_ctx_set_ext(3)
-==================
-
-
-NAME
-----
-
-zmq_ctx_set_ext - set extended context options
-
-
-SYNOPSIS
---------
-*int zmq_ctx_set_ext (void '*context', int 'option_name', const void '*option_value', size_t 'option_len');*
-
-
-DESCRIPTION
------------
-
-The _zmq_ctx_set_ext()_ function shall set the option specified by the
-'option_name' argument to the value pointed to by the 'option_value' argument
-for the 0MQ context pointed to by the 'context' argument. The 'option_len'
-argument is the size of the option value in bytes. For options taking a value of
-type "character string", the provided byte data should either contain no zero
-bytes, or end in a single zero byte (terminating ASCII NUL character).
-
-The _zmq_ctx_set_ext()_ function accepts all the option names accepted by
-_zmq_ctx_set()_.
-Options that make most sense to set using _zmq_ctx_set_ext()_ instead of
-_zmq_ctx_set()_ are the following options:
-
-ZMQ_THREAD_NAME_PREFIX: Set name prefix for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_NAME_PREFIX' argument sets a string prefix to each thread
-created for the internal context's thread pool. This option is only supported on Linux.
-This option is useful to help  debugging done via "top -H" or "gdb"; in case
-multiple processes on the system are using ZeroMQ it is useful to provide through
-this context option an application-specific prefix to distinguish ZeroMQ background
-threads that belong to different processes.
-This option only applies before creating any sockets on the context.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: empty string
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_set_ext()_ function returns zero if successful. Otherwise it
-returns `-1` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown.
-
-
-EXAMPLE
--------
-.Setting a prefix on internal ZMQ threda names:
-----
-void *context = zmq_ctx_new ();
-const char prefix[] = "MyApp";
-size_t prefixLen = sizeof(prefix);
-zmq_ctx_set (context, ZMQ_THREAD_NAME_PREFIX, &prefix, &prefixLen);
-
-char buff[256];
-size_t buffLen = sizeof(buff);
-int rc = zmq_ctx_get (context, ZMQ_THREAD_NAME_PREFIX, &buff, &buffLen);
-assert (rc == 0);
-assert (buffLen == prefixLen);
-
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_ctx_set[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_ctx_shutdown.txt b/doc/zmq_ctx_shutdown.txt
deleted file mode 100644
index 8194dc0ed..000000000
--- a/doc/zmq_ctx_shutdown.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-zmq_ctx_shutdown(3)
-==================
-
-
-NAME
-----
-zmq_ctx_shutdown - shutdown a 0MQ context
-
-
-SYNOPSIS
---------
-*int zmq_ctx_shutdown (void '*context');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_shutdown()_ function shall shutdown the 0MQ context 'context'.
-
-Context shutdown will cause any blocking operations currently in progress on 
-sockets open within 'context' to return immediately with an error code of ETERM.
-With the exception of _zmq_close()_, any further operations on sockets open within
-'context' shall fail with an error code of ETERM. No further sockets can be created
-using _zmq_socket()_ on a context for which _zmq_ctx_shutdown()_ has been called,
-it will return and set errno to ETERM.
-
-This function is optional, client code is still required to call the linkzmq:zmq_ctx_term[3]
-function to free all resources allocated by zeromq.
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_shutdown()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-The provided 'context' was invalid.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_init[3]
-linkzmq:zmq_ctx_term[3]
-linkzmq:zmq_close[3]
-linkzmq:zmq_setsockopt[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_ctx_term.txt b/doc/zmq_ctx_term.txt
deleted file mode 100644
index 79aad1c5c..000000000
--- a/doc/zmq_ctx_term.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-zmq_ctx_term(3)
-===============
-
-
-NAME
-----
-zmq_ctx_term - terminate a 0MQ context
-
-
-SYNOPSIS
---------
-*int zmq_ctx_term (void '*context');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_term()_ function shall destroy the 0MQ context 'context'.
-
-Context termination is performed in the following steps:
-
-1. Any blocking operations currently in progress on sockets open within
-   'context' shall return immediately with an error code of ETERM.  With the
-   exception of _zmq_close()_, any further operations on sockets open within
-   'context' shall fail with an error code of ETERM.
-
-2. After interrupting all blocking calls, _zmq_ctx_term()_ shall _block_ until
-   the following conditions are satisfied:
-
-   * All sockets open within 'context' have been closed with _zmq_close()_.
-
-   * For each socket within 'context', all messages sent by the application
-     with _zmq_send()_ have either been physically transferred to a network
-     peer, or the socket's linger period set with the _ZMQ_LINGER_ socket
-     option has expired.
-
-For further details regarding socket linger behaviour refer to the _ZMQ_LINGER_
-option in linkzmq:zmq_setsockopt[3].
-
-This function replaces the deprecated functions linkzmq:zmq_term[3] and
-linkzmq:zmq_ctx_destroy[3].
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_term()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-The provided 'context' was invalid.
-*EINTR*::
-Termination was interrupted by a signal. It can be restarted if needed.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_init[3]
-linkzmq:zmq_close[3]
-linkzmq:zmq_setsockopt[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_curve.txt b/doc/zmq_curve.txt
deleted file mode 100644
index e1fe69718..000000000
--- a/doc/zmq_curve.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-zmq_curve(7)
-============
-
-
-NAME
-----
-zmq_curve - secure authentication and confidentiality
-
-
-SYNOPSIS
---------
-The CURVE mechanism defines a mechanism for secure authentication and 
-confidentiality for communications between a client and a server. CURVE 
-is intended for use on public networks. The CURVE mechanism is defined 
-by this document: <http://rfc.zeromq.org/spec:25>.
-
-
-CLIENT AND SERVER ROLES
------------------------
-A socket using CURVE can be either client or server, at any moment, but 
-not both. The role is independent of bind/connect direction.
-
-A socket can change roles at any point by setting new options. The role
-affects all zmq_connect and zmq_bind calls that follow it.
-
-To become a CURVE server, the application sets the ZMQ_CURVE_SERVER option
-on the socket, and then sets the ZMQ_CURVE_SECRETKEY option to provide the
-socket with its long-term secret key. The application does not provide the
-socket with its long-term public key, which is used only by clients.
-
-To become a CURVE client, the application sets the ZMQ_CURVE_SERVERKEY 
-option with the long-term public key of the server it intends to connect
-to, or accept connections from, next. The application then sets the 
-ZMQ_CURVE_PUBLICKEY and ZMQ_CURVE_SECRETKEY options with its client 
-long-term key pair.
-
-If the server does authentication it will be based on the client's long
-term public key.
-
-KEY ENCODING
-------------
-The standard representation for keys in source code is either 32 bytes of
-base 256 (binary) data, or 40 characters of base 85 data encoded using the
-Z85 algorithm defined by http://rfc.zeromq.org/spec:32.
-
-The Z85 algorithm is designed to produce printable key strings for use in
-configuration files, the command line, and code. There is a reference
-implementation in C at https://github.com/zeromq/rfc/tree/master/src.
-
-    
-TEST KEY VALUES
----------------
-For test cases, the client shall use this long-term key pair (specified
-as hexadecimal and in Z85):
-
-----
-public: 
-    BB88471D65E2659B30C55A5321CEBB5AAB2B70A398645C26DCA2B2FCB43FC518
-    Yne@$w-vo<fVvi]a<NY6T1ed:M$fCG*[IaLV{hID
-
-secret: 
-    7BB864B489AFA3671FBE69101F94B38972F24816DFB01B51656B3FEC8DFD0888
-    D:)Q[IlAW!ahhC2ac:9*A}h:p?([4%wOTJ%JR%cs
-----
-
-And the server shall use this long-term key pair (specified as hexadecimal 
-and in Z85):
-
-----
-public: 
-    54FCBA24E93249969316FB617C872BB0C1D1FF14800427C594CBFACF1BC2D652
-    rq:rM>}U?@Lns47E1%kR.o@n%FcmmsL/@{H8]yf7
-
-secret: 
-    8E0BDD697628B91D8F245587EE95C5B04D48963F79259877B49CD9063AEAD3B7
-    JTKVSB%%)wK0E.X)V>+}o?pNmC{O&4W4b!Ni{Lh6
-----
-
-SEE ALSO
---------
-linkzmq:zmq_z85_encode[3]
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_null[7]
-linkzmq:zmq_plain[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_curve_keypair.txt b/doc/zmq_curve_keypair.txt
deleted file mode 100644
index 82c13d6cc..000000000
--- a/doc/zmq_curve_keypair.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-zmq_curve_keypair(3)
-====================
-
-
-NAME
-----
-zmq_curve_keypair - generate a new CURVE keypair
-
-
-SYNOPSIS
---------
-*int zmq_curve_keypair (char *z85_public_key, char *z85_secret_key);*
-
-
-DESCRIPTION
------------
-The _zmq_curve_keypair()_ function shall return a newly generated random
-keypair consisting of a public key and a secret key. The caller provides
-two buffers, each at least 41 octets large, in which this method will
-store the keys. The keys are encoded using linkzmq:zmq_z85_encode[3].
-
-
-RETURN VALUE
-------------
-The _zmq_curve_keypair()_ function shall return 0 if successful, else it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOTSUP*::
-The libzmq library was not built with cryptographic support (libsodium).
-
-
-EXAMPLE
--------
-.Generating a new CURVE keypair
-----
-char public_key [41];
-char secret_key [41];
-int rc = zmq_curve_keypair (public_key, secret_key);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_z85_encode[3]
-linkzmq:zmq_curve[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_curve_public.txt b/doc/zmq_curve_public.txt
deleted file mode 100644
index fd8adf168..000000000
--- a/doc/zmq_curve_public.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_curve_public(3)
-===================
-
-
-NAME
-----
-zmq_curve_public - derive the public key from a private key
-
-
-SYNOPSIS
---------
-*int zmq_curve_public (char *z85_public_key, char *z85_secret_key);*
-
-
-DESCRIPTION
------------
-The _zmq_curve_public()_ function shall derive the public key from a
-private key. The caller provides two buffers, each at least 41 octets
-large. In z85_secret_key the caller shall provide the private key, and
-the function will store the public key in z85_public_key. The keys are
-encoded using linkzmq:zmq_z85_encode[3].
-
-
-RETURN VALUE
-------------
-The _zmq_curve_public()_ function shall return 0 if successful, else it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOTSUP*::
-The libzmq library was not built with cryptographic support (libsodium).
-
-
-EXAMPLE
--------
-.Deriving the public key from a CURVE private key
-----
-char public_key [41];
-char secret_key [41];
-int rc = zmq_curve_keypair (public_key, secret_key);
-assert (rc == 0);
-char derived_public[41];
-rc = zmq_curve_public (derived_public, secret_key);
-assert (rc == 0);
-assert (!strcmp (derived_public, public_key));
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_z85_encode[3]
-linkzmq:zmq_curve_keypair[3]
-linkzmq:zmq_curve[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_disconnect.txt b/doc/zmq_disconnect.txt
deleted file mode 100644
index faa77f579..000000000
--- a/doc/zmq_disconnect.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-zmq_disconnect(3)
-=================
-
-
-NAME
-----
-zmq_disconnect - Disconnect a socket from an endpoint
-
-
-SYNOPSIS
---------
-*int zmq_disconnect (void '*socket', const char '*endpoint');*
-
-
-DESCRIPTION
------------
-The _zmq_disconnect()_ function shall disconnect a socket specified
-by the 'socket' argument from the endpoint specified by the 'endpoint'
-argument. Note the actual disconnect system call might occur at a later time.
-
-Upon disconnection the will also stop receiving messages originating from
-this endpoint. Moreover, the socket will no longuer be able
-to queue outgoing messages to this endpoint. The outgoing message queue
-associated with the endpoint will be discarded. However, if the socket's linger
-period is non-zero, libzmq will still attempt to transmit these discarded messages,
-until the linger period expires.
-
-The 'endpoint' argument is as described in linkzmq:zmq_connect[3]
-
-NOTE: The default setting of _ZMQ_LINGER_ does not discard unsent messages;
-this behaviour may cause the application to block when calling _zmq_ctx_term()_.
-For details refer to linkzmq:zmq_setsockopt[3] and linkzmq:zmq_ctx_term[3].
-
-RETURN VALUE
-------------
-The _zmq_disconnect()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*ENOENT*::
-The provided endpoint is not in use by the socket.
-
-
-EXAMPLE
--------
-.Connecting a subscriber socket to an in-process and a TCP transport
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_SUB);
-assert (socket);
-/* Connect it to the host server001, port 5555 using a TCP transport */
-rc = zmq_connect (socket, "tcp://server001:5555");
-assert (rc == 0);
-/* Disconnect from the previously connected endpoint */
-rc = zmq_disconnect (socket, "tcp://server001:5555");
-assert (rc == 0);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_errno.txt b/doc/zmq_errno.txt
deleted file mode 100644
index 3a0e0b298..000000000
--- a/doc/zmq_errno.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-zmq_errno(3)
-============
-
-
-NAME
-----
-zmq_errno - retrieve value of errno for the calling thread
-
-
-SYNOPSIS
---------
-*int zmq_errno (void);*
-
-
-DESCRIPTION
------------
-The _zmq_errno()_ function shall retrieve the value of the 'errno' variable for
-the calling thread.
-
-The _zmq_errno()_ function is provided to assist users on non-POSIX systems who
-are experiencing issues with retrieving the correct value of 'errno' directly.
-Specifically, users on Win32 systems whose application is using a different C
-run-time library from the C run-time library in use by 0MQ will need to use
-_zmq_errno()_ for correct operation.
-
-IMPORTANT: Users not experiencing issues with retrieving the correct value of
-'errno' should not use this function and should instead access the 'errno'
-variable directly.
-
-
-RETURN VALUE
-------------
-The _zmq_errno()_ function shall return the value of the 'errno' variable for
-the calling thread.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt
deleted file mode 100755
index 4220a4aaf..000000000
--- a/doc/zmq_getsockopt.txt
+++ /dev/null
@@ -1,1018 +0,0 @@
-zmq_getsockopt(3)
-=================
-
-
-NAME
-----
-
-zmq_getsockopt - get 0MQ socket options
-
-
-SYNOPSIS
---------
-*int zmq_getsockopt (void '*socket', int 'option_name', void '*option_value', size_t '*option_len');*
-
-
-DESCRIPTION
------------
-The _zmq_getsockopt()_ function shall retrieve the value for the option
-specified by the 'option_name' argument for the 0MQ socket pointed to by the
-'socket' argument, and store it in the buffer pointed to by the 'option_value'
-argument. The 'option_len' argument is the size in bytes of the buffer pointed
-to by 'option_value'; upon successful completion _zmq_getsockopt()_ shall
-modify the 'option_len' argument to indicate the actual size of the option
-value stored in the buffer.
-
-The following options can be retrieved with the _zmq_getsockopt()_ function:
-
-
-ZMQ_AFFINITY: Retrieve I/O thread affinity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_AFFINITY' option shall retrieve the I/O thread affinity for newly
-created connections on the specified 'socket'.
-
-Affinity determines which threads from the 0MQ I/O thread pool associated with
-the socket's _context_ shall handle newly created connections.  A value of zero
-specifies no affinity, meaning that work shall be distributed fairly among all
-0MQ I/O threads in the thread pool. For non-zero values, the lowest bit
-corresponds to thread 1, second lowest bit to thread 2 and so on.  For example,
-a value of 3 specifies that subsequent connections on 'socket' shall be handled
-exclusively by I/O threads 1 and 2.
-
-See also linkzmq:zmq_init[3] for details on allocating the number of I/O
-threads for a specific _context_.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: N/A (bitmap)
-Default value:: 0
-Applicable socket types:: N/A
-
-
-ZMQ_BACKLOG: Retrieve maximum length of the queue of outstanding connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BACKLOG' option shall retrieve the maximum length of the queue of
-outstanding peer connections for the specified 'socket'; this only applies to
-connection-oriented transports. For details refer to your operating system
-documentation for the 'listen' function.
-
-[horizontal]
-Option value type:: int
-Option value unit:: connections
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_BINDTODEVICE: Retrieve name of device the socket is bound to
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BINDTODEVICE' option retrieves the name of the device this socket is
-bound to, eg. an interface or VRF. If a socket is bound to an interface, only
-packets received from that interface are processed by the socket. If device
-is a VRF device, then subsequent binds/connects to that socket use addresses
-in the VRF routing table.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP or UDP transports.
-
-
-ZMQ_CONNECT_TIMEOUT: Retrieve connect() timeout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieves how long to wait before timing-out a connect() system call.
-The connect() system call normally takes a long time before it returns a
-time out error. Setting this option allows the library to time out the call
-at an earlier interval.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (disabled)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_CURVE_PUBLICKEY: Retrieve current CURVE public key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Retrieves the current long term public key for the socket. You can
-provide either a 32 byte buffer, to retrieve the binary key value, or
-a 41 byte buffer, to retrieve the key in a printable Z85 format.
-NOTE: to fetch a printable key, the buffer must be 41 bytes large
-to hold the 40-char key value and one null byte.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: null
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SECRETKEY: Retrieve current CURVE secret key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Retrieves the current long term secret key for the socket. You can
-provide either a 32 byte buffer, to retrieve the binary key value, or
-a 41 byte buffer, to retrieve the key in a printable Z85 format.
-NOTE: to fetch a printable key, the buffer must be 41 bytes large
-to hold the 40-char key value and one null byte.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: null
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SERVERKEY: Retrieve current CURVE server key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Retrieves the current server key for the client socket. You can
-provide either a 32 byte buffer, to retrieve the binary key value, or
-a 41-byte buffer, to retrieve the key in a printable Z85 format.
-NOTE: to fetch a printable key, the buffer must be 41 bytes large
-to hold the 40-char key value and one null byte.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: null
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_EVENTS: Retrieve socket event state
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_EVENTS' option shall retrieve the event state for the specified
-'socket'.  The returned value is a bit mask constructed by OR'ing a combination
-of the following event flags:
-
-*ZMQ_POLLIN*::
-Indicates that at least one message may be received from the specified socket
-without blocking.
-
-*ZMQ_POLLOUT*::
-Indicates that at least one message may be sent to the specified socket without
-blocking.
-
-The combination of a file descriptor returned by the 'ZMQ_FD' option being
-ready for reading but no actual events returned by a subsequent retrieval of
-the 'ZMQ_EVENTS' option is valid; applications should simply ignore this case
-and restart their polling operation/event loop.
-
-[horizontal]
-Option value type:: int
-Option value unit:: N/A (flags)
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_FD: Retrieve file descriptor associated with the socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_FD' option shall retrieve the file descriptor associated with the
-specified 'socket'. The returned file descriptor can be used to integrate the
-socket into an existing event loop; the 0MQ library shall signal any pending
-events on the socket in an _edge-triggered_ fashion by making the file
-descriptor become ready for reading.
-
-NOTE: The ability to read from the returned file descriptor does not
-necessarily indicate that messages are available to be read from, or can be
-written to, the underlying socket; applications must retrieve the actual event
-state with a subsequent retrieval of the 'ZMQ_EVENTS' option.
-
-NOTE: The returned file descriptor is also used internally by the 'zmq_send'
-and 'zmq_recv' functions. As the descriptor is edge triggered, applications
-must update the state of 'ZMQ_EVENTS' after each invocation of 'zmq_send'
-or 'zmq_recv'.To be more explicit: after calling 'zmq_send' the socket may
-become readable (and vice versa) without triggering a read event on the
-file descriptor.
-
-CAUTION: The returned file descriptor is intended for use with a 'poll' or
-similar system call only. Applications must never attempt to read or write data
-to it directly, neither should they try to close it.
-
-[horizontal]
-Option value type:: int on POSIX systems, SOCKET on Windows
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_GSSAPI_PLAINTEXT: Retrieve GSSAPI plaintext or encrypted status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_GSSAPI_PLAINTEXT' option, if any, previously set on the
-socket.  A value of '1' means  that communications will be plaintext.  A value
-of '0' means communications will be encrypted.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_GSSAPI_PRINCIPAL: Retrieve the name of the GSSAPI principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_GSSAPI_PRINCIPAL' option shall retrieve the principal name set for the
-GSSAPI security mechanism. The returned value shall be a NULL-terminated string
-and MAY be empty. The returned size SHALL include the terminating null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_GSSAPI_SERVER: Retrieve current GSSAPI server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_GSSAPI_SERVER' option, if any, previously set on the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_GSSAPI_SERVICE_PRINCIPAL: Retrieve the name of the GSSAPI service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_GSSAPI_SERVICE_PRINCIPAL' option shall retrieve the principal name of
-the GSSAPI server to which a GSSAPI client socket intends to connect.  The
-returned value shall be a NULL-terminated string and MAY be empty. The returned
-size SHALL include the terminating null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE: Retrieve nametype for service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE' option, if any, previously
-set on the socket.  A value of 'ZMQ_GSSAPI_NT_HOSTBASED' (0) means the name
-specified with 'ZMQ_GSSAPI_SERVICE_PRINCIPAL' is interpreted as a host based
-name.  A value of 'ZMQ_GSSAPI_NT_USER_NAME' (1) means it is interpreted as
-a local user name.  A value of 'ZMQ_GSSAPI_NT_KRB5_PRINCIPAL' (2) means it
-is interpreted as an unparsed principal name string (valid only with the
-krb5 GSSAPI mechanism).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1, 2
-Default value:: 0 (ZMQ_GSSAPI_NT_HOSTBASED)
-Applicable socket types:: all, when using TCP or IPC transports
-
-ZMQ_GSSAPI_PRINCIPAL_NAMETYPE: Retrieve nametype for service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_GSSAPI_PRINCIPAL_NAMETYPE' option, if any, previously
-set on the socket.  A value of 'ZMQ_GSSAPI_NT_HOSTBASED' (0) means the name
-specified with 'ZMQ_GSSAPI_PRINCIPAL' is interpreted as a host based
-name.  A value of 'ZMQ_GSSAPI_NT_USER_NAME' (1) means it is interpreted as
-a local user name.  A value of 'ZMQ_GSSAPI_NT_KRB5_PRINCIPAL' (2) means it
-is interpreted as an unparsed principal name string (valid only with the
-krb5 GSSAPI mechanism).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1, 2
-Default value:: 0 (ZMQ_GSSAPI_NT_HOSTBASED)
-Applicable socket types:: all, when using TCP or IPC transports
-
-ZMQ_HANDSHAKE_IVL: Retrieve maximum handshake interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HANDSHAKE_IVL' option shall retrieve the maximum handshake interval
-for the specified 'socket'. Handshaking is the exchange of socket configuration
-information (socket type, routing id, security) that occurs when a connection
-is first opened, only for connection-oriented transports. If handshaking does
-not complete within the configured time, the connection shall be closed.
-The value 0 means no handshake time limit.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 30000
-Applicable socket types:: all but ZMQ_STREAM, only for connection-oriented transports
-
-
-ZMQ_IDENTITY: Retrieve socket identity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This option name is now deprecated. Use ZMQ_ROUTING_ID instead.
-ZMQ_IDENTITY remains as an alias for now.
-
-
-ZMQ_IMMEDIATE: Retrieve attach-on-connect value
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the state of the attach on connect value. If set to `1`, will delay the
-attachment of a pipe on connect until the underlying connection has completed.
-This will cause the socket to block if there are no other connections, but will
-prevent queues from filling on pipes awaiting connection.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, primarily when using TCP/IPC transports.
-
-
-ZMQ_INVERT_MATCHING: Retrieve inverted filtering status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the value of the 'ZMQ_INVERT_MATCHING' option. A value of `1`
-means the socket uses inverted prefix matching.
-
-On 'PUB' and 'XPUB' sockets, this causes messages to be sent to all
-connected sockets 'except' those subscribed to a prefix that matches
-the message. On 'SUB' sockets, this causes only incoming messages that
-do 'not' match any of the socket's subscriptions to be received by the user.
-
-Whenever 'ZMQ_INVERT_MATCHING' is set to 1 on a 'PUB' socket, all 'SUB'
-sockets connecting to it must also have the option set to 1. Failure to
-do so will have the 'SUB' sockets reject everything the 'PUB' socket sends
-them. 'XSUB' sockets do not need to do this because they do not filter
-incoming messages.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0,1
-Default value:: 0
-Applicable socket types:: ZMQ_PUB, ZMQ_XPUB, ZMQ_SUB
-
-
-ZMQ_IPV4ONLY: Retrieve IPv4-only socket override status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the IPv4-only option for the socket. This option is deprecated.
-Please use the ZMQ_IPV6 option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 1 (true)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_IPV6: Retrieve IPv6 socket status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the IPv6 option for the socket. A value of `1` means IPv6 is
-enabled on the socket, while `0` means the socket will use only IPv4.
-When IPv6 is enabled the socket will connect to, or accept connections
-from, both IPv4 and IPv6 hosts.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_LAST_ENDPOINT: Retrieve the last endpoint set
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_LAST_ENDPOINT' option shall retrieve the last endpoint bound for
-TCP and IPC transports. The returned value will be a string in the form of
-a ZMQ DSN. Note that if the TCP host is INADDR_ANY, indicated by a *, then
-the returned address will be 0.0.0.0 (for IPv4).
-Note: not supported on GNU/Hurd with IPC due to non-working getsockname().
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: all, when binding TCP or IPC transports
-
-
-ZMQ_LINGER: Retrieve linger period for socket shutdown
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_LINGER' option shall retrieve the linger period for the specified
-'socket'.  The linger period determines how long pending messages which have
-yet to be sent to a peer shall linger in memory after a socket is closed with
-linkzmq:zmq_close[3], and further affects the termination of the socket's
-context with linkzmq:zmq_ctx_term[3]. The following outlines the different
-behaviours:
-
-* The default value of '-1' specifies an infinite linger period. Pending
-  messages shall not be discarded after a call to _zmq_close()_; attempting to
-  terminate the socket's context with _zmq_ctx_term()_ shall block until all
-  pending messages have been sent to a peer.
-
-* The value of '0' specifies no linger period. Pending messages shall be
-  discarded immediately when the socket is closed with _zmq_close()_.
-
-* Positive values specify an upper bound for the linger period in milliseconds.
-  Pending messages shall not be discarded after a call to _zmq_close()_;
-  attempting to terminate the socket's context with _zmq_ctx_term()_ shall block
-  until either all pending messages have been sent to a peer, or the linger
-  period expires, after which any pending messages shall be discarded.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_MAXMSGSIZE: Maximum acceptable inbound message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The option shall retrieve limit for the inbound messages. If a peer sends
-a message larger than ZMQ_MAXMSGSIZE it is disconnected. Value of -1 means
-'no limit'.
-
-[horizontal]
-Option value type:: int64_t
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_MECHANISM: Retrieve current security mechanism
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MECHANISM' option shall retrieve the current security mechanism
-for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: ZMQ_NULL, ZMQ_PLAIN, ZMQ_CURVE, or ZMQ_GSSAPI
-Default value:: ZMQ_NULL
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_MULTICAST_HOPS: Maximum network hops for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The option shall retrieve time-to-live used for outbound multicast packets.
-The default of 1 means that the multicast packets don't leave the local network.
-
-[horizontal]
-Option value type:: int
-Option value unit:: network hops
-Default value:: 1
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_MULTICAST_MAXTPDU: Maximum transport data unit size for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MULTICAST_MAXTPDU' option shall retrieve the maximum transport
-data unit size used for outbound multicast packets.
-
-This must be set at or below the minimum Maximum Transmission Unit (MTU) for
-all network paths over which multicast reception is required.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 1500
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_PLAIN_PASSWORD: Retrieve current password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_PLAIN_PASSWORD' option shall retrieve the last password set for
-the PLAIN security mechanism. The returned value shall be a NULL-terminated
-string and MAY be empty. The returned size SHALL include the terminating
-null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_PLAIN_SERVER: Retrieve current PLAIN server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_PLAIN_SERVER' option, if any, previously set on the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: int
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_PLAIN_USERNAME: Retrieve current PLAIN username
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_PLAIN_USERNAME' option shall retrieve the last username set for
-the PLAIN security mechanism. The returned value shall be a NULL-terminated
-string and MAY be empty. The returned size SHALL include the terminating
-null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_USE_FD: Retrieve the pre-allocated socket file descriptor
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_USE_FD' option shall retrieve the pre-allocated file
-descriptor that has been assigned to a ZMQ socket, if any. -1 shall be
-returned if a pre-allocated file descriptor was not set for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: file descriptor
-Default value:: -1
-Applicable socket types:: all bound sockets, when using IPC or TCP transport
-
-
-ZMQ_RATE: Retrieve multicast data rate
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RATE' option shall retrieve the maximum send or receive data rate for
-multicast transports using the specified 'socket'.
-
-[horizontal]
-Option value type:: int
-Option value unit:: kilobits per second
-Default value:: 100
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_RCVBUF: Retrieve kernel receive buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVBUF' option shall retrieve the underlying kernel receive buffer
-size for the specified 'socket'. For details refer to your operating system
-documentation for the 'SO_RCVBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 8192
-Applicable socket types:: all
-
-
-ZMQ_RCVHWM: Retrieve high water mark for inbound messages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVHWM' option shall return the high water mark for inbound messages on
-the specified 'socket'. The high water mark is a hard limit on the maximum
-number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with. A value of zero means no
-limit.
-
-If this limit has been reached the socket shall enter an exceptional state and
-depending on the socket type, 0MQ shall take appropriate action such as
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-ZMQ_RCVMORE: More message data parts to follow
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVMORE' option shall return True (1) if the message part last
-received from the 'socket' was a data part with more parts to follow. If there
-are no data parts to follow, this option shall return False (0).
-
-Refer to linkzmq:zmq_send[3] and linkzmq:zmq_recv[3] for a detailed description
-of multi-part messages.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_RCVTIMEO: Maximum time before a socket operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the timeout for recv operation on the socket.  If the value is `0`,
-_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
-message to receive. If the value is `-1`, it will block until a message is
-available. For all other values, it will wait for a message for that amount
-of time before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_RECONNECT_IVL: Retrieve reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL' option shall retrieve the initial reconnection interval
-for the specified 'socket'.  The reconnection interval is the period 0MQ shall
-wait between attempts to reconnect disconnected peers when using
-connection-oriented transports. The value -1 means no reconnection.
-
-NOTE: The reconnection interval may be randomized by 0MQ to prevent
-reconnection storms in topologies with a large number of peers per socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECONNECT_IVL_MAX: Retrieve maximum reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL_MAX' option shall retrieve the maximum reconnection
-interval for the specified 'socket'.  This is the maximum period 0MQ shall wait
-between attempts to reconnect. On each reconnect attempt, the previous interval
-shall be doubled untill ZMQ_RECONNECT_IVL_MAX is reached. This allows for
-exponential backoff strategy. Default value means no exponential backoff is
-performed and reconnect interval calculations are only based on
-ZMQ_RECONNECT_IVL.
-
-NOTE:  Values less than ZMQ_RECONNECT_IVL will be ignored.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (only use ZMQ_RECONNECT_IVL)
-Applicable socket types:: all, only for connection-oriented transport
-
-
-ZMQ_RECONNECT_STOP: Retrieve condition where reconnection will stop
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_STOP' option shall retrieve the conditions under which
-automatic reconnection will stop.
-
-The 'ZMQ_RECONNECT_STOP_CONN_REFUSED' option will stop reconnection when 0MQ
-receives the ECONNREFUSED return code from the connect.  This indicates that
-there is no code bound to the specified endpoint.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 'ZMQ_RECONNECT_STOP_CONN_REFUSED'
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECOVERY_IVL: Get multicast recovery interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECOVERY_IVL' option shall retrieve the recovery interval for
-multicast transports using the specified 'socket'.  The recovery interval
-determines the maximum time in milliseconds that a receiver can be absent from a
-multicast group before unrecoverable data loss will occur.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 10000
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_ROUTING_ID: Retrieve socket routing id
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ROUTING_ID' option shall retrieve the routing id of the specified 'socket'.
-Routing ids are used only by the request/reply pattern. Specifically, it can be used
-in tandem with ROUTER socket to route messages to the peer with a specific
-routing id.
-
-A routing id must be at least one byte and at most 255 bytes long. Identities
-starting with a zero byte are reserved for use by the 0MQ infrastructure.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_REP, ZMQ_REQ, ZMQ_ROUTER, ZMQ_DEALER.
-
-
-ZMQ_SNDBUF: Retrieve kernel transmit buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDBUF' option shall retrieve the underlying kernel transmit buffer
-size for the specified 'socket'. For details refer to your operating system
-documentation for the 'SO_SNDBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 8192
-Applicable socket types:: all
-
-
-ZMQ_SNDHWM: Retrieves high water mark for outbound messages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDHWM' option shall return the high water mark for outbound messages
-on the specified 'socket'. The high water mark is a hard limit on the maximum
-number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with. A value of zero means no
-limit.
-
-If this limit has been reached the socket shall enter an exceptional state and
-depending on the socket type, 0MQ shall take appropriate action such as
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-ZMQ_SNDTIMEO: Maximum time before a socket operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the timeout for send operation on the socket. If the value is `0`,
-_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
-cannot be sent. If the value is `-1`, it will block until the message is sent.
-For all other values, it will try to send the message for that amount of time
-before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_SOCKS_PROXY: Retrieve SOCKS5 proxy address
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SOCKS_PROXY' option shall retrieve the SOCKS5 proxy address in string
-format. The returned value shall be a NULL-terminated string and MAY be empty.
-The returned size SHALL include the terminating null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP transports
-
-
-ZMQ_TCP_KEEPALIVE: Override SO_KEEPALIVE socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'SO_KEEPALIVE' socket option(where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,0,1
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_CNT: Override TCP_KEEPCNT socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPCNT' socket option(where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_IDLE: Override TCP_KEEPIDLE (or TCP_KEEPALIVE on some OS)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPIDLE'(or 'TCP_KEEPALIVE' on some OS) socket option (where
-supported by OS). The default value of `-1` means to skip any overrides and
-leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_INTVL: Override TCP_KEEPINTVL socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPINTVL' socket option(where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_MAXRT: Retrieve Max TCP Retransmit Timeout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-On OSes where it is supported, retrieves how long before an unacknowledged TCP
-retransmit times out. The system normally attempts many TCP retransmits
-following an exponential backoff strategy. This means that after a network
-outage, it may take a long time before the session can be re-established.
-Setting this option allows the timeout to happen at a shorter interval.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_THREAD_SAFE: Retrieve socket thread safety
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_SAFE' option shall retrieve a boolean value indicating whether
-or not the socket is threadsafe. See linkzmq:zmq_socket[3] for which sockets are
-thread-safe.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Applicable socket types:: all
-
-
-ZMQ_TOS: Retrieve the Type-of-Service socket override status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the IP_TOS option for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: >0
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_TYPE: Retrieve socket type
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_TYPE' option shall retrieve the socket type for the specified
-'socket'.  The socket type is specified at socket creation time and
-cannot be modified afterwards.
-
-[horizontal]
-Option value type:: int
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_ZAP_DOMAIN: Retrieve RFC 27 authentication domain
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The 'ZMQ_ZAP_DOMAIN' option shall retrieve the last ZAP domain set for
-the socket. The returned value shall be a NULL-terminated string and MAY
-be empty. An empty string means that ZAP authentication is disabled.
-The returned size SHALL include the terminating null byte.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_ZAP_ENFORCE_DOMAIN: Retrieve ZAP domain handling mode
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ZAP_ENFORCE_DOMAIN' option shall retrieve the flag that determines
-whether a ZAP domain is strictly required or not.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: all, when using ZAP
-
-
-ZMQ_VMCI_BUFFER_SIZE: Retrieve buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_SIZE` option shall retrieve the size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 65546
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_BUFFER_MIN_SIZE: Retrieve min buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_MIN_SIZE` option shall retrieve the min size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 128
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_BUFFER_MAX_SIZE: Retrieve max buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_MAX_SIZE` option shall retrieve the max size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 262144
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_CONNECT_TIMEOUT: Retrieve connection timeout of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_CONNECT_TIMEOUT` option shall retrieve connection timeout
-for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_MULTICAST_LOOP: Retrieve multicast local loopback configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the current multicast loopback configuration. A value of `1`
-means that the multicast packets sent on this socket will be looped
-back to local listening interface.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 1
-Applicable socket types:: ZMQ_RADIO, when using UDP multicast transport
-
-
-ZMQ_ROUTER_NOTIFY: Retrieve router socket notification settings
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the current notification settings of a router socket. The returned
-value is a bitmask composed of ZMQ_NOTIFY_CONNECT and ZMQ_NOTIFY_DISCONNECT
-flags, meaning connect and disconnect notifications are enabled, respectively.
-A value of '0' means the notifications are off.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, ZMQ_NOTIFY_CONNECT, ZMQ_NOTIFY_DISCONNECT, ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_IN_BATCH_SIZE: Maximal receive batch size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Gets the maximal amount of messages that can be received in a single
-'recv' system call.
-
-Cannot be zero.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 8192
-Applicable socket types:: All, when using TCP, IPC, PGM or NORM transport.
-
-
-ZMQ_OUT_BATCH_SIZE: Maximal send batch size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Gets the maximal amount of messages that can be sent in a single
-'send' system call.
-
-Cannot be zero.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 8192
-Applicable socket types:: All, when using TCP, IPC, PGM or NORM transport.
-
-
-
-RETURN VALUE
-------------
-The _zmq_getsockopt()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown, or the requested _option_len_ or
-_option_value_ is invalid, or the size of the buffer pointed to by
-_option_value_, as specified by _option_len_, is insufficient for storing the
-option value.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal.
-
-
-EXAMPLE
--------
-.Retrieving the high water mark for outgoing messages
-----
-/* Retrieve high water mark into sndhwm */
-int sndhwm;
-size_t sndhwm_size = sizeof (sndhwm);
-rc = zmq_getsockopt (socket, ZMQ_SNDHWM, &sndhwm, &sndhwm_size);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_gssapi.txt b/doc/zmq_gssapi.txt
deleted file mode 100644
index 6834599bd..000000000
--- a/doc/zmq_gssapi.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-zmq_gssapi(7)
-============
-
-
-NAME
-----
-zmq_gssapi - secure authentication and confidentiality
-
-
-SYNOPSIS
---------
-
-The GSSAPI mechanism defines a mechanism for secure authentication and
-confidentiality for communications between a client and a server using the
-Generic Security Service Application Program Interface (GSSAPI).  The GSSAPI
-mechanism can be used on both public and private networks.  GSSAPI itself is
-defined in IETF RFC-2743: <http://tools.ietf.org/html/rfc2743>. The ZeroMQ
-GSSAPI mechanism is defined by this document: <http://rfc.zeromq.org/spec:38>.
-
-
-CLIENT AND SERVER ROLES
------------------------
-A socket using GSSAPI can be either client or server, but not both.
-
-To become a GSSAPI server, the application sets the ZMQ_GSSAPI_SERVER
-option on the socket.
-
-To become a GSSAPI client, the application sets the ZMQ_GSSAPI_SERVICE_PRINCIPAL
-option to the name of the principal on the server to which it intends to
-connect.
-
-On client or server, the application may additionally set the
-ZMQ_GSSAPI_PRINCIPAL option to provide the socket with the name of the
-principal for whom GSSAPI credentials should be acquired.  If this option
-is not set, default credentials are used.
-
-
-OPTIONAL ENCRYPTION
--------------------
-By default, the GSSAPI mechanism will encrypt all communications between client
-and server.  If encryption is not desired (e.g. on private networks), the
-client and server applications can disable it by setting the
-ZMQ_GSSAPI_PLAINTEXT option.  Both the client and server must set this option
-to the same value.
-
-
-PRINCIPAL NAMES
----------------
-Principal names specified with the ZMQ_GSSAPI_SERVICE_PRINCIPAL or
-ZMQ_GSSAPI_PRINCIPAL options are interpreted as "host based" name types
-by default.  The ZMQ_GSSAPI_PRINCIPAL_NAMETYPE and
-ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE options may be used to change the
-name type to one of:
-
-*ZMQ_GSSAPI_NT_HOSTBASED*::
-The name should be of the form "service" or "service@hostname",
-which will parse into a principal of "service/hostname"
-in the local realm.  This is the default name type.
-*ZMQ_GSSAPI_NT_USER_NAME*::
-The name should be a local username, which will parse into a single-component
-principal in the local realm.
-*ZMQ_GSSAPI_NT_KRB5_PRINCIPAL*::
-The name is a principal name string.  This name type only works with
-the krb5 GSSAPI mechanism.
-
-
-SEE ALSO
---------
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_null[7]
-linkzmq:zmq_curve[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_has.txt b/doc/zmq_has.txt
deleted file mode 100644
index 847711b41..000000000
--- a/doc/zmq_has.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-zmq_has(3)
-==========
-
-
-NAME
-----
-zmq_has - check a ZMQ capability
-
-
-SYNOPSIS
---------
-*int zmq_has (const char *capability);*
-
-
-DESCRIPTION
------------
-The _zmq_has()_ function shall report whether a specified capability is
-available in the library. This allows bindings and applications to probe
-a library directly, for transport and security options.
-
-Capabilities shall be lowercase strings. The following capabilities are
-defined:
-
-* ipc - the library supports the ipc:// protocol
-* pgm - the library supports the pgm:// protocol
-* tipc - the library supports the tipc:// protocol
-* norm - the library supports the norm:// protocol
-* curve - the library supports the CURVE security mechanism
-* gssapi - the library supports the GSSAPI security mechanism
-* draft - the library is built with the draft api
-
-When this method is provided, the zmq.h header file will define
-ZMQ_HAS_CAPABILITIES.
-
-RETURN VALUE
-------------
-The _zmq_has()_ function shall return 1 if the specified capability is
-provided. Otherwise it shall return 0.
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_init.txt b/doc/zmq_init.txt
deleted file mode 100644
index aab86ab19..000000000
--- a/doc/zmq_init.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-zmq_init(3)
-===========
-
-
-NAME
-----
-zmq_init - initialise 0MQ context
-
-
-SYNOPSIS
---------
-*void *zmq_init (int 'io_threads');*
-
-
-DESCRIPTION
------------
-The _zmq_init()_ function initialises a 0MQ 'context'.
-
-The 'io_threads' argument specifies the size of the 0MQ thread pool to handle
-I/O operations. If your application is using only the 'inproc' transport for
-messaging you may set this to zero, otherwise set it to at least one.
-
-.Thread safety
-A 0MQ 'context' is thread safe and may be shared among as many application
-threads as necessary, without any additional locking required on the part of
-the caller.
-
-This function is deprecated by linkzmq:zmq_ctx_new[3].
-
-RETURN VALUE
-------------
-The _zmq_init()_ function shall return an opaque handle to the initialised
-'context' if successful. Otherwise it shall return NULL and set 'errno' to one
-of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-An invalid number of 'io_threads' was requested.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_ctx_term[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_inproc.txt b/doc/zmq_inproc.txt
deleted file mode 100644
index 94621016d..000000000
--- a/doc/zmq_inproc.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-zmq_inproc(7)
-=============
-
-
-NAME
-----
-zmq_inproc - 0MQ local in-process (inter-thread) communication transport
-
-
-SYNOPSIS
---------
-The in-process transport passes messages via memory directly between threads
-sharing a single 0MQ 'context'.
-
-NOTE: No I/O threads are involved in passing messages using the 'inproc'
-transport. Therefore, if you are using a 0MQ 'context' for in-process messaging
-only you can initialise the 'context' with zero I/O threads. See
-linkzmq:zmq_init[3] for details.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the in-process transport, the transport is `inproc`, and the meaning of
-the 'address' part is defined below.
-
-
-Assigning a local address to a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When assigning a local address to a 'socket' using _zmq_bind()_ with the
-'inproc' transport, the 'endpoint' shall be interpreted as an arbitrary string
-identifying the 'name' to create. The 'name' must be unique within the 0MQ
-'context' associated with the 'socket' and may be up to 256 characters in
-length.  No other restrictions are placed on the format of the 'name'.
-
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a 'socket' to a peer address using _zmq_connect()_ with the
-'inproc' transport, the 'endpoint' shall be interpreted as an arbitrary string
-identifying the 'name' to connect to.  Before version 4.0 he 'name' must have
-been previously created by assigning it to at least one 'socket' within the
-same 0MQ 'context' as the 'socket' being connected.  Since version 4.0 the
-order of _zmq_bind()_ and _zmq_connect()_ does not matter just like for the tcp
-transport type.
-
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  Assign the in-process name "#1"
-rc = zmq_bind(socket, "inproc://#1");
-assert (rc == 0);
-//  Assign the in-process name "my-endpoint"
-rc = zmq_bind(socket, "inproc://my-endpoint");
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connect to the in-process name "#1"
-rc = zmq_connect(socket, "inproc://#1");
-assert (rc == 0);
-//  Connect to the in-process name "my-endpoint"
-rc = zmq_connect(socket, "inproc://my-endpoint");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_ipc.txt b/doc/zmq_ipc.txt
deleted file mode 100644
index 9ec6e69ae..000000000
--- a/doc/zmq_ipc.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-zmq_ipc(7)
-==========
-
-
-NAME
-----
-zmq_ipc - 0MQ local inter-process communication transport
-
-
-SYNOPSIS
---------
-The inter-process transport passes messages between local processes using a
-system-dependent IPC mechanism.
-
-NOTE: The inter-process transport is currently only implemented on operating
-systems that provide UNIX domain sockets.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the inter-process transport, the transport is `ipc`, and the meaning of
-the 'address' part is defined below.
-
-
-Binding a socket
-~~~~~~~~~~~~~~~~
-When binding a 'socket' to a local address using _zmq_bind()_ with the 'ipc'
-transport, the 'endpoint' shall be interpreted as an arbitrary string
-identifying the 'pathname' to create. The 'pathname' must be unique within the
-operating system namespace used by the 'ipc' implementation, and must fulfill
-any restrictions placed by the operating system on the format and length of a
-'pathname'.
-
-When the address is wild-card `*`, _zmq_bind()_ shall generate a unique temporary
-pathname. The caller should retrieve this pathname using the ZMQ_LAST_ENDPOINT
-socket option. See linkzmq:zmq_getsockopt[3] for details.
-
-NOTE: any existing binding to the same endpoint shall be overridden. That is,
-if a second process binds to an endpoint already bound by a process, this
-will succeed and the first process will lose its binding. In this behaviour,
-the 'ipc' transport is not consistent with the 'tcp' or 'inproc' transports.
-
-NOTE: the endpoint pathname must be writable by the process. When the endpoint
-starts with '/', e.g., `ipc:///pathname`, this will be an _absolute_ pathname.
-If the endpoint specifies a directory that does not exist, the bind shall fail.
-
-NOTE: on Linux only, when the endpoint pathname starts with `@`, the abstract
-namespace shall be used.  The abstract namespace is independent of the
-filesystem and if a process attempts to bind an endpoint already bound by a
-process, it will fail.  See unix(7) for details.
-
-NOTE: IPC pathnames have a maximum size that depends on the operating system.
-On Linux, the maximum is 113 characters including the "ipc://" prefix (107
-characters for the real path name).
-
-Unbinding wild-card address from a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When wild-card `*` 'endpoint' was used in _zmq_bind()_, the caller should use
-real 'endpoint' obtained from the ZMQ_LAST_ENDPOINT socket option to unbind
-this 'endpoint' from a socket using _zmq_unbind()_.
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a 'socket' to a peer address using _zmq_connect()_ with the
-'ipc' transport, the 'endpoint' shall be interpreted as an arbitrary string
-identifying the 'pathname' to connect to.  The 'pathname' must have been
-previously created within the operating system namespace by assigning it to a
-'socket' with _zmq_bind()_.
-
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  Assign the pathname "/tmp/feeds/0"
-rc = zmq_bind(socket, "ipc:///tmp/feeds/0");
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connect to the pathname "/tmp/feeds/0"
-rc = zmq_connect(socket, "ipc:///tmp/feeds/0");
-assert (rc == 0);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_close.txt b/doc/zmq_msg_close.txt
deleted file mode 100644
index 649c70ee4..000000000
--- a/doc/zmq_msg_close.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-zmq_msg_close(3)
-================
-
-
-NAME
-----
-zmq_msg_close - release 0MQ message
-
-
-SYNOPSIS
---------
-*int zmq_msg_close (zmq_msg_t '*msg');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_close()_ function shall inform the 0MQ infrastructure that any
-resources associated with the message object referenced by 'msg' are no longer
-required and may be released. Actual release of resources associated with the
-message object shall be postponed by 0MQ until all users of the message or
-underlying data buffer have indicated it is no longer required.
-
-Applications should ensure that _zmq_msg_close()_ is called once a message is
-no longer required, otherwise memory leaks may occur. Note that this is NOT
-necessary after a successful _zmq_msg_send()_.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_close()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-Invalid message.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_copy.txt b/doc/zmq_msg_copy.txt
deleted file mode 100644
index 2cc0a3d7d..000000000
--- a/doc/zmq_msg_copy.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-zmq_msg_copy(3)
-===============
-
-
-NAME
-----
-zmq_msg_copy - copy content of a message to another message
-
-
-SYNOPSIS
---------
-*int zmq_msg_copy (zmq_msg_t '*dest', zmq_msg_t '*src');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_copy()_ function shall copy the message object referenced by 'src'
-to the message object referenced by 'dest'. The original content of 'dest', if
-any, shall be released. You must initialise 'dest' before copying to it.
-
-CAUTION: The implementation may choose not to physically copy the message
-content, rather to share the underlying buffer between 'src' and 'dest'. Avoid
-modifying message content after a message has been copied with
-_zmq_msg_copy()_, doing so can result in undefined behaviour. If what you need
-is an actual hard copy, initialize a new message using _zmq_msg_init_buffer()_
-with the message content.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_copy()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-Invalid message.
-
-
-EXAMPLE
--------
-.Copying a message
-----
-zmq_msg_t msg;
-zmq_msg_init_buffer (&msg, "Hello, World", 12);
-zmq_msg_t copy;
-zmq_msg_init (&copy);
-zmq_msg_copy (&copy, &msg);
-...
-zmq_msg_close (&copy);
-zmq_msg_close (&msg);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_msg_move[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_data.txt b/doc/zmq_msg_data.txt
deleted file mode 100644
index b69298297..000000000
--- a/doc/zmq_msg_data.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-zmq_msg_data(3)
-===============
-
-
-NAME
-----
-zmq_msg_data - retrieve pointer to message content
-
-
-SYNOPSIS
---------
-*void *zmq_msg_data (zmq_msg_t '*msg');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_data()_ function shall return a pointer to the message content of
-the message object referenced by 'msg'.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-Upon successful completion, _zmq_msg_data()_ shall return a pointer to the
-message content.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_get.txt b/doc/zmq_msg_get.txt
deleted file mode 100644
index 11c934ec0..000000000
--- a/doc/zmq_msg_get.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-zmq_msg_get(3)
-==============
-
-
-NAME
-----
-zmq_msg_get - get message property
-
-
-SYNOPSIS
---------
-*int zmq_msg_get (zmq_msg_t '*message', int 'property');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_get()_ function shall return the value for the property
-specified by the 'property' argument for the message pointed to by the
-'message' argument.
-
-The following properties can be retrieved with the _zmq_msg_get()_ function:
-
-*ZMQ_MORE*::
-Indicates that there are more message frames to follow after the 'message'.
-
-*ZMQ_SRCFD*::
-Returns the file descriptor of the socket the 'message' was read from. This
-allows application to retrieve the remote endpoint via 'getpeername(2)'. Be
-aware that the respective socket might be closed already, reused even.
-Currently only implemented for TCP sockets.
-
-*ZMQ_SHARED*::
-Indicates that a message MAY share underlying storage with another copy of
-this message.
-
-RETURN VALUE
-------------
-The _zmq_msg_get()_ function shall return the value for the property if
-successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested _property_ is unknown.
-
-
-EXAMPLE
--------
-.Receiving a multi-frame message
-----
-zmq_msg_t frame;
-while (true) {
-    //  Create an empty 0MQ message to hold the message frame
-    int rc = zmq_msg_init (&frame);
-    assert (rc == 0);
-    //  Block until a message is available to be received from socket
-    rc = zmq_msg_recv (socket, &frame, 0);
-    assert (rc != -1);
-    if (zmq_msg_get (&frame, ZMQ_MORE))
-        fprintf (stderr, "more\n");
-    else {
-        fprintf (stderr, "end\n");
-        break;
-    }
-    zmq_msg_close (&frame);
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_set[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_gets.txt b/doc/zmq_msg_gets.txt
deleted file mode 100644
index f887b4071..000000000
--- a/doc/zmq_msg_gets.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-zmq_msg_gets(3)
-===============
-
-
-NAME
-----
-zmq_msg_gets - get message metadata property
-
-
-SYNOPSIS
---------
-*const char *zmq_msg_gets (zmq_msg_t '*message', const char *'property');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_gets()_ function shall return the string value for the metadata
-property specified by the 'property' argument for the message pointed to by
-the 'message' argument. Both the 'property' argument and the 'value'
-shall be NULL-terminated UTF8-encoded strings.
-
-Metadata is defined on a per-connection basis during the ZeroMQ connection
-handshake as specified in <rfc.zeromq.org/spec:37>. Applications can set
-metadata properties using linkzmq:zmq_setsockopt[3] option ZMQ_METADATA.
-Application metadata properties must be prefixed with 'X-'.
-
-In addition to application metadata, the following ZMTP properties can be
-retrieved with the _zmq_msg_gets()_ function:
-
-    Socket-Type
-    Routing-Id
-
-Note: 'Identity' is a deprecated alias for 'Routing-Id'.
-
-Additionally, when available for the underlying transport, the *Peer-Address*
-property will return the IP address of the remote endpoint as returned by
-getnameinfo(2).
-
-The names of these properties are also defined in _zmq.h_ as
-_ZMQ_MSG_PROPERTY_SOCKET_TYPE_ _ZMQ_MSG_PROPERTY_ROUTING_ID_, and 
-_ZMQ_MSG_PROPERTY_PEER_ADDRESS_.
-Currently, these definitions are only available as a DRAFT API.
-
-Other properties may be defined based on the underlying security mechanism,
-see ZAP authenticated connection sample below.
-
-RETURN VALUE
-------------
-The _zmq_msg_gets()_ function shall return the string value for the property
-if successful. Otherwise it shall return NULL and set 'errno' to one of the
-values defined below. The caller shall not modify or free the returned value,
-which shall be owned by the message. The encoding of the property and value
-shall be UTF8.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested _property_ is unknown.
-
-
-EXAMPLE
--------
-.Getting the ZAP authenticated user id for a message:
-----
-zmq_msg_t msg;
-zmq_msg_init (&msg);
-rc = zmq_msg_recv (&msg, dealer, 0);
-assert (rc != -1);
-const char *user_id = zmq_msg_gets (&msg, ZMQ_MSG_PROPERTY_USER_ID);
-zmq_msg_close (&msg);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_setsockopt[3]
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_init.txt b/doc/zmq_msg_init.txt
deleted file mode 100644
index b329bf71a..000000000
--- a/doc/zmq_msg_init.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-zmq_msg_init(3)
-===============
-
-
-NAME
-----
-zmq_msg_init - initialise empty 0MQ message
-
-
-SYNOPSIS
---------
-*int zmq_msg_init (zmq_msg_t '*msg');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_init()_ function shall initialise the message object referenced by
-'msg' to represent an empty message.  This function is most useful when called
-before receiving a message with _zmq_msg_recv()_.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-CAUTION: The functions _zmq_msg_init()_, _zmq_msg_init_data()_,
-_zmq_msg_init_size()_ and _zmq_msg_init_buffer()_ are mutually exclusive.
-Never initialise the same 'zmq_msg_t' twice.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_init()_ function always returns zero.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-EXAMPLE
--------
-.Receiving a message from a socket
-----
-zmq_msg_t msg;
-rc = zmq_msg_init (&msg);
-assert (rc == 0);
-int nbytes = zmq_msg_recv (socket, &msg, 0);
-assert (nbytes != -1);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_init_buffer.txt b/doc/zmq_msg_init_buffer.txt
deleted file mode 100644
index 23bf83f49..000000000
--- a/doc/zmq_msg_init_buffer.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-zmq_msg_init_buffer(3)
-======================
-
-
-NAME
-----
-zmq_msg_init_buffer - initialise 0MQ message with buffer copy
-
-
-SYNOPSIS
---------
-*int zmq_msg_init_buffer (zmq_msg_t '*msg', const void '*buf', size_t 'size');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_init_buffer()_ function shall allocate any resources required to
-store a message 'size' bytes long and initialise the message object referenced
-by 'msg' to represent a copy of the buffer referenced by the 'buf' and
-'size' arguments.
-
-The implementation shall choose whether to store message content on the stack
-(small messages) or on the heap (large messages).
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-CAUTION: The functions _zmq_msg_init()_, _zmq_msg_init_data()_,
-_zmq_msg_init_buffer()_ and _zmq_msg_init_buffer()_ are mutually exclusive.
-Never initialise the same 'zmq_msg_t' twice.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_init_buffer()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOMEM*::
-Insufficient storage space is available.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_init_data.txt b/doc/zmq_msg_init_data.txt
deleted file mode 100644
index 1adcc6be0..000000000
--- a/doc/zmq_msg_init_data.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-zmq_msg_init_data(3)
-====================
-
-
-NAME
-----
-zmq_msg_init_data - initialise 0MQ message from a supplied buffer
-
-
-SYNOPSIS
---------
-*typedef void (zmq_free_fn) (void '*data', void '*hint');*
-
-*int zmq_msg_init_data (zmq_msg_t '*msg', void '*data', size_t 'size', zmq_free_fn '*ffn', void '*hint');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_init_data()_ function shall initialise the message object
-referenced by 'msg' to represent the content referenced by the buffer located
-at address 'data', 'size' bytes long. No copy of 'data' shall be performed and
-0MQ shall take ownership of the supplied buffer.
-
-If provided, the deallocation function 'ffn' shall be called once the data
-buffer is no longer required by 0MQ, with the 'data' and 'hint' arguments
-supplied to _zmq_msg_init_data()_.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-CAUTION: The deallocation function 'ffn' needs to be thread-safe, since it
-will be called from an arbitrary thread.
-
-CAUTION: If the deallocation function is not provided, the allocated memory
-will not be freed, and this may cause a memory leak.
-
-
-CAUTION: The functions _zmq_msg_init()_, _zmq_msg_init_data()_,
-_zmq_msg_init_size()_ and _zmq_msg_init_buffer()_ are mutually exclusive.
-Never initialise the same 'zmq_msg_t' twice.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_init_data()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOMEM*::
-Insufficient storage space is available.
-
-
-
-EXAMPLE
--------
-.Initialising a message from a supplied buffer
-----
-void my_free (void *data, void *hint) 
-{
-    free (data);
-}
-
-    /*  ...  */
-
-void *data = malloc (6);
-assert (data);
-memcpy (data, "ABCDEF", 6);
-zmq_msg_t msg;
-rc = zmq_msg_init_data (&msg, data, 6, my_free, NULL);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_init_size.txt b/doc/zmq_msg_init_size.txt
deleted file mode 100644
index 231d1a221..000000000
--- a/doc/zmq_msg_init_size.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-zmq_msg_init_size(3)
-====================
-
-
-NAME
-----
-zmq_msg_init_size - initialise 0MQ message of a specified size
-
-
-SYNOPSIS
---------
-*int zmq_msg_init_size (zmq_msg_t '*msg', size_t 'size');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_init_size()_ function shall allocate any resources required to
-store a message 'size' bytes long and initialise the message object referenced
-by 'msg' to represent the newly allocated message.
-
-The implementation shall choose whether to store message content on the stack
-(small messages) or on the heap (large messages). For performance reasons
-_zmq_msg_init_size()_ shall not clear the message data.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-CAUTION: The functions _zmq_msg_init()_, _zmq_msg_init_data()_,
-_zmq_msg_init_size()_ and _zmq_msg_init_buffer()_ are mutually exclusive.
-Never initialise the same 'zmq_msg_t' twice.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_init_size()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOMEM*::
-Insufficient storage space is available.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_more.txt b/doc/zmq_msg_more.txt
deleted file mode 100644
index 179f4d34a..000000000
--- a/doc/zmq_msg_more.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-zmq_msg_more(3)
-===============
-
-
-NAME
-----
-zmq_msg_more - indicate if there are more message parts to receive
-
-
-SYNOPSIS
---------
-*int zmq_msg_more (zmq_msg_t '*message');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_more()_ function indicates whether this is part of a multi-part
-message, and there are further parts to receive. This method can safely be
-called after _zmq_msg_close()_. This method is identical to _zmq_msg_get()_
-with an argument of ZMQ_MORE.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_more()_ function shall return zero if this is the final part of
-a multi-part message, or the only part of a single-part message. It shall
-return 1 if there are further parts to receive.
-
-
-EXAMPLE
--------
-.Receiving a multi-part message
-----
-zmq_msg_t part;
-while (true) {
-    //  Create an empty 0MQ message to hold the message part
-    int rc = zmq_msg_init (&part);
-    assert (rc == 0);
-    //  Block until a message is available to be received from socket
-    rc = zmq_msg_recv (socket, &part, 0);
-    assert (rc != -1);
-    if (zmq_msg_more (&part))
-        fprintf (stderr, "more\n");
-    else {
-        fprintf (stderr, "end\n");
-        break;
-    }
-    zmq_msg_close (&part);
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_get[3]
-linkzmq:zmq_msg_set[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_move.txt b/doc/zmq_msg_move.txt
deleted file mode 100644
index ed28c168e..000000000
--- a/doc/zmq_msg_move.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-zmq_msg_move(3)
-===============
-
-
-NAME
-----
-zmq_msg_move - move content of a message to another message
-
-
-SYNOPSIS
---------
-*int zmq_msg_move (zmq_msg_t '*dest', zmq_msg_t '*src');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_move()_ function shall move the content of the message object
-referenced by 'src' to the message object referenced by 'dest'. No actual
-copying of message content is performed, 'dest' is simply updated to reference
-the new content. 'src' becomes an empty message after calling _zmq_msg_move()_.
-The original content of 'dest', if any, shall be released.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_move()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-Invalid message.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_copy[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_recv.txt b/doc/zmq_msg_recv.txt
deleted file mode 100644
index 436011f80..000000000
--- a/doc/zmq_msg_recv.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-zmq_msg_recv(3)
-===============
-
-
-NAME
-----
-zmq_msg_recv - receive a message part from a socket
-
-
-SYNOPSIS
---------
-*int zmq_msg_recv (zmq_msg_t '*msg', void '*socket', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_recv()_ function is identical to linkzmq:zmq_recvmsg[3], which
-shall be deprecated in future versions. _zmq_msg_recv()_ is more consistent
-with other message manipulation functions.
-
-The _zmq_msg_recv()_ function shall receive a message part from the socket
-referenced by the 'socket' argument and store it in the message referenced by
-the 'msg' argument. Any content previously stored in 'msg' shall be properly
-deallocated. If there are no message parts available on the specified 'socket'
-the _zmq_msg_recv()_ function shall block until the request can be satisfied.
-The 'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-Specifies that the operation should be performed in non-blocking mode. If there
-are no messages available on the specified 'socket', the _zmq_msg_recv()_
-function shall fail with 'errno' set to EAGAIN.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. Each message
-part is an independent 'zmq_msg_t' in its own right. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that processes multi-part messages must use the _ZMQ_RCVMORE_
-linkzmq:zmq_getsockopt[3] option after calling _zmq_msg_recv()_ to determine if
-there are further parts to receive.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_recv()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Either the timeout set via the socket-option ZMQ_RCVTIMEO (see linkzmq:zmq_setsockopt[3])
-has been reached (flag ZMQ_DONTWAIT not set) without being able to read a message
-from the socket or there are no messages available at the moment (flag ZMQ_DONTWAIT set)
-and the operation would block.
-*ENOTSUP*::
-The _zmq_msg_recv()_ operation is not supported by this socket type.
-*EFSM*::
-The _zmq_msg_recv()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before a message was
-available.
-*EFAULT*::
-The message passed to the function was invalid.
-
-
-EXAMPLE
--------
-.Receiving a message from a socket
-----
-/* Create an empty 0MQ message */
-zmq_msg_t msg;
-int rc = zmq_msg_init (&msg);
-assert (rc == 0);
-/* Block until a message is available to be received from socket */
-rc = zmq_msg_recv (&msg, socket, 0);
-assert (rc != -1);
-/* Release message */
-zmq_msg_close (&msg);
-----
-
-.Receiving a multi-part message
-----
-int more;
-size_t more_size = sizeof (more);
-do {
-    /* Create an empty 0MQ message to hold the message part */
-    zmq_msg_t part;
-    int rc = zmq_msg_init (&part);
-    assert (rc == 0);
-    /* Block until a message is available to be received from socket */
-    rc = zmq_msg_recv (&part, socket, 0);
-    assert (rc != -1);
-    /* Determine if more message parts are to follow */
-    rc = zmq_getsockopt (socket, ZMQ_RCVMORE, &more, &more_size);
-    assert (rc == 0);
-    zmq_msg_close (&part);
-} while (more);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_recv[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_msg_send[3]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_routing_id.txt b/doc/zmq_msg_routing_id.txt
deleted file mode 100644
index 47f05a29f..000000000
--- a/doc/zmq_msg_routing_id.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-zmq_msg_routing_id(3)
-=====================
-
-
-NAME
-----
-zmq_msg_routing_id - return routing ID for message, if any
-
-
-SYNOPSIS
---------
-*uint32_t zmq_msg_routing_id (zmq_msg_t '*message');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_routing_id()_ function returns the routing ID for the message,
-if any. The routing ID is set on all messages received from a 'ZMQ_SERVER'
-socket. To send a message to a 'ZMQ_SERVER' socket you must set the routing
-ID of a connected 'ZMQ_CLIENT' peer. Routing IDs are transient.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_routing_id()_ function shall return zero if there is no routing
-ID, otherwise it shall return an unsigned 32-bit integer greater than zero.
-
-
-EXAMPLE
--------
-.Receiving a client message and routing ID
-----
-void *ctx = zmq_ctx_new ();
-assert (ctx);
-
-void *server = zmq_socket (ctx, ZMQ_SERVER);
-assert (server);
-int rc = zmq_bind (server, "tcp://127.0.0.1:8080");
-assert (rc == 0);
-
-zmq_msg_t message;
-rc = zmq_msg_init (&message);
-assert (rc == 0);
-
-//  Receive a message from socket
-rc = zmq_msg_recv (server, &message, 0);
-assert (rc != -1);
-uint32_t routing_id = zmq_msg_routing_id (&message);
-assert (routing_id);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_set_routing_id[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_send.txt b/doc/zmq_msg_send.txt
deleted file mode 100644
index 672a16879..000000000
--- a/doc/zmq_msg_send.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-zmq_msg_send(3)
-===============
-
-
-NAME
-----
-zmq_msg_send - send a message part on a socket
-
-
-SYNOPSIS
---------
-*int zmq_msg_send (zmq_msg_t '*msg', void '*socket', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_send()_ function is identical to linkzmq:zmq_sendmsg[3], which
-shall be deprecated in future versions. _zmq_msg_send()_ is more consistent
-with other message manipulation functions.
-
-The _zmq_msg_send()_ function shall queue the message referenced by the 'msg'
-argument to be sent to the socket referenced by the 'socket' argument.  The
-'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-For socket types (DEALER, PUSH) that block (either with ZMQ_IMMEDIATE option set
-and no peer available, or all peers having full high-water mark), specifies that
-the operation should be performed in non-blocking mode. If the message cannot be
-queued on the 'socket', the _zmq_msg_send()_ function shall fail with 'errno' set
-to EAGAIN.
-
-*ZMQ_SNDMORE*::
-Specifies that the message being sent is a multi-part message, and that further
-message parts are to follow. Refer to the section regarding multi-part messages
-below for a detailed description.
-
-The _zmq_msg_t_ structure passed to _zmq_msg_send()_ is nullified on a
-successful call. If you want to send the same message to multiple sockets you
-have to copy it (e.g. using _zmq_msg_copy()_). If the call fails, the
-_zmq_msg_t_ structure stays intact, and must be consumed by another call to
-_zmq_msg_send()_ on the same or another socket, or released using
-_zmq_msg_close()_ to avoid a memory leak.
-
-NOTE: A successful invocation of _zmq_msg_send()_ does not indicate that the
-message has been transmitted to the network, only that it has been queued on
-the 'socket' and 0MQ has assumed responsibility for the message. You do not need
-to call _zmq_msg_close()_ after a successful _zmq_msg_send()_.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. Each message
-part is an independent 'zmq_msg_t' in its own right. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that sends multi-part messages must use the _ZMQ_SNDMORE_ flag
-when sending each message part except the final one.
-
-RETURN VALUE
-------------
-The _zmq_msg_send()_ function shall return number of bytes in the message
-if successful (if number of bytes is higher than 'MAX_INT', the function will
-return 'MAX_INT'). Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Non-blocking mode was requested and the message cannot be sent at the moment.
-*ENOTSUP*::
-The _zmq_msg_send()_ operation is not supported by this socket type.
-*EINVAL*::
-The sender tried to send multipart data, which the socket type does not allow.
-*EFSM*::
-The _zmq_msg_send()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before the message was
-sent.
-*EFAULT*::
-Invalid message.
-*EHOSTUNREACH*::
-The message cannot be routed.
-
-
-EXAMPLE
--------
-.Filling in a message and sending it to a socket
-----
-/* Create a new message, allocating 6 bytes for message content */
-zmq_msg_t msg;
-int rc = zmq_msg_init_size (&msg, 6);
-assert (rc == 0);
-/* Fill in message content with 'AAAAAA' */
-memset (zmq_msg_data (&msg), 'A', 6);
-/* Send the message to the socket */
-rc = zmq_msg_send (&msg, socket, 0);
-assert (rc == 6);
-----
-
-.Sending a multi-part message
-----
-/* Send a multi-part message consisting of three parts to socket */
-rc = zmq_msg_send (&part1, socket, ZMQ_SNDMORE);
-rc = zmq_msg_send (&part2, socket, ZMQ_SNDMORE);
-/* Final part; no more parts to follow */
-rc = zmq_msg_send (&part3, socket, 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_recv[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_msg_recv[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_set.txt b/doc/zmq_msg_set.txt
deleted file mode 100644
index 6784478e8..000000000
--- a/doc/zmq_msg_set.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-zmq_msg_set(3)
-==============
-
-
-NAME
-----
-
-zmq_msg_set - set message property
-
-
-SYNOPSIS
---------
-*int zmq_msg_set (zmq_msg_t '*message', int 'property', int 'value');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_set()_ function shall set the property specified by the
-'property' argument to the value of the 'value' argument for the 0MQ
-message fragment pointed to by the 'message' argument.
-
-Currently the _zmq_msg_set()_ function does not support any property names.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_set()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested property _property_ is unknown.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_get[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_set_routing_id.txt b/doc/zmq_msg_set_routing_id.txt
deleted file mode 100644
index b0f2c3a78..000000000
--- a/doc/zmq_msg_set_routing_id.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-zmq_msg_set_routing_id(3)
-=========================
-
-
-NAME
-----
-
-zmq_msg_set_routing_id - set routing ID property on message
-
-
-SYNOPSIS
---------
-*int zmq_msg_set_routing_id (zmq_msg_t '*message', uint32_t 'routing_id');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_set_routing_id()_ function sets the 'routing_id' specified, on the
-the message pointed to by the 'message' argument. The 'routing_id' must be
-greater than zero. To get a valid routing ID, you must receive a message
-from a 'ZMQ_SERVER' socket, and use the libzmq:zmq_msg_routing_id method.
-Routing IDs are transient.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_set_routing_id()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The provided 'routing_id' is zero.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_routing_id[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_msg_size.txt b/doc/zmq_msg_size.txt
deleted file mode 100644
index bcf898e32..000000000
--- a/doc/zmq_msg_size.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-zmq_msg_size(3)
-===============
-
-
-NAME
-----
-zmq_msg_size - retrieve message content size in bytes
-
-
-SYNOPSIS
---------
-*size_t zmq_msg_size (zmq_msg_t '*msg');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_size()_ function shall return the size in bytes of the content of
-the message object referenced by 'msg'.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-Upon successful completion, _zmq_msg_size()_ shall return the size of the
-message content in bytes.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_null.txt b/doc/zmq_null.txt
deleted file mode 100644
index abb9fff8d..000000000
--- a/doc/zmq_null.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-zmq_null(7)
-===========
-
-
-NAME
-----
-zmq_null - no security or confidentiality
-
-
-SYNOPSIS
---------
-The NULL mechanism is defined by the ZMTP 3.0 specification: 
-<http://rfc.zeromq.org/spec:23>. This is the default security mechanism
-for ZeroMQ sockets.
-
-
-SEE ALSO
---------
-linkzmq:zmq_plain[7]
-linkzmq:zmq_curve[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_pgm.txt b/doc/zmq_pgm.txt
deleted file mode 100644
index 3b23f9364..000000000
--- a/doc/zmq_pgm.txt
+++ /dev/null
@@ -1,188 +0,0 @@
-zmq_pgm(7)
-==========
-
-
-NAME
-----
-zmq_pgm - 0MQ reliable multicast transport using PGM
-
-
-SYNOPSIS
---------
-PGM (Pragmatic General Multicast) is a protocol for reliable multicast
-transport of data over IP networks.
-
-
-DESCRIPTION
------------
-0MQ implements two variants of PGM, the standard protocol where PGM datagrams
-are layered directly on top of IP datagrams as defined by RFC 3208 (the 'pgm'
-transport) and "Encapsulated PGM" or EPGM where PGM datagrams are encapsulated
-inside UDP datagrams (the 'epgm' transport).
-
-The 'pgm' and 'epgm' transports can only be used with the 'ZMQ_PUB' and
-'ZMQ_SUB' socket types.
-
-Further, PGM sockets are rate limited by default. For details, refer to the
-'ZMQ_RATE', and 'ZMQ_RECOVERY_IVL' options documented in
-linkzmq:zmq_setsockopt[3].
-
-CAUTION: The 'pgm' transport implementation requires access to raw IP sockets.
-Additional privileges may be required on some operating systems for this
-operation. Applications not requiring direct interoperability with other PGM
-implementations are encouraged to use the 'epgm' transport instead which does
-not require any special privileges.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the PGM transport, the transport is `pgm`, and for the EPGM protocol the
-transport is `epgm`. The meaning of the 'address' part is defined below.
-
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a socket to a peer address using _zmq_connect()_ with the 'pgm'
-or 'epgm' transport, the 'endpoint' shall be interpreted as an 'interface'
-followed by a semicolon, followed by a 'multicast address', followed by a colon
-and a port number.
-
-An 'interface' may be specified by either of the following:
-
-* The interface name as defined by the operating system.
-* The primary IPv4 address assigned to the interface, in its numeric
-  representation.
-
-NOTE: Interface names are not standardised in any way and should be assumed to
-be arbitrary and platform dependent. On Win32 platforms no short interface
-names exist, thus only the primary IPv4 address may be used to specify an
-'interface'. The 'interface' part can be omitted, in that case the default one
-will be selected.
-
-A 'multicast address' is specified by an IPv4 multicast address in its numeric
-representation.
-
-
-WIRE FORMAT
------------
-Consecutive PGM datagrams are interpreted by 0MQ as a single continuous stream
-of data where 0MQ messages are not necessarily aligned with PGM datagram
-boundaries and a single 0MQ message may span several PGM datagrams. This stream
-of data consists of 0MQ messages encapsulated in 'frames' as described in
-linkzmq:zmq_tcp[7].
-
-
-PGM datagram payload
-~~~~~~~~~~~~~~~~~~~~
-The following ABNF grammar represents the payload of a single PGM datagram as
-used by 0MQ:
-
-....
-datagram               = (offset data)
-offset                 = 2OCTET
-data                   = *OCTET
-....
-
-In order for late joining consumers to be able to identify message boundaries,
-each PGM datagram payload starts with a 16-bit unsigned integer in network byte
-order specifying either the offset of the first message 'frame' in the datagram
-or containing the value `0xFFFF` if the datagram contains solely an
-intermediate part of a larger message.
-
-Note that offset specifies where the first message begins rather than the first
-message part. Thus, if there are trailing message parts at the beginning of
-the packet the offset ignores them and points to first initial message part
-in the packet.
-
-The following diagram illustrates the layout of a single PGM datagram payload:
-
-....
-+------------------+----------------------+
-| offset (16 bits) |         data         |
-+------------------+----------------------+
-....
-
-The following diagram further illustrates how three example 0MQ frames are laid
-out in consecutive PGM datagram payloads:
-
-....
-First datagram payload
-+--------------+-------------+---------------------+
-| Frame offset |   Frame 1   |   Frame 2, part 1   |
-|    0x0000    | (Message 1) | (Message 2, part 1) |
-+--------------+-------------+---------------------+
-
-Second datagram payload
-+--------------+---------------------+
-| Frame offset |   Frame 2, part 2   |
-| 0xFFFF       | (Message 2, part 2) |
-+--------------+---------------------+
-
-Third datagram payload
-+--------------+----------------------------+-------------+
-| Frame offset |   Frame 2, final 8 bytes   |   Frame 3   |
-| 0x0008       | (Message 2, final 8 bytes) | (Message 3) |
-+--------------+----------------------------+-------------+
-....
-
-
-CONFIGURATION
--------------
-
-The PGM is protocol is capable of multicasting data at high rates (500Mbps+)
-with large messages (1MB+), however it requires setting the relevent ZMQ socket
-options that are documented in linkzmq:zmq_setsockopt[3]:
-
-* The 'ZMQ_RATE' should be set sufficiently high, e.g. 1Gbps
-* The 'ZMQ_RCVBUF' should be increased on the subscriber, e.g. 4MB
-* The 'ZMQ_SNDBUF' should be increased on the publisher, e.g. 4MB
-
-It's important to note that the 'ZMQ_RCVBUF' and 'ZMQ_SNDBUF' options are
-limited by the underlying host OS tx/rx buffer size limit. On linux, these can
-be increased for the current session with the following commands:
-
-....
-# set tx/rx buffers to 4MB (default can also be read as the initial buffer size)
-sudo sysctl -w net.core.rmem_max=4194304
-sudo sysctl -w net.core.wmem_max=4194304
-sudo sysctl -w net.core.rmem_default=4194304
-sudo sysctl -w net.core.wmem_default=4194304
-....
-
-
-EXAMPLE
--------
-.Connecting a socket
-----
-//  Connecting to the multicast address 239.192.1.1, port 5555,
-//  using the first Ethernet network interface on Linux
-//  and the Encapsulated PGM protocol
-rc = zmq_connect(socket, "epgm://eth0;239.192.1.1:5555");
-assert (rc == 0);
-//  Connecting to the multicast address 239.192.1.1, port 5555,
-//  using the network interface with the address 192.168.1.1
-//  and the standard PGM protocol
-rc = zmq_connect(socket, "pgm://192.168.1.1;239.192.1.1:5555");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_plain.txt b/doc/zmq_plain.txt
deleted file mode 100644
index 7dd40dc84..000000000
--- a/doc/zmq_plain.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-zmq_plain(7)
-============
-
-
-NAME
-----
-zmq_plain - clear-text authentication
-
-
-SYNOPSIS
---------
-The PLAIN mechanism defines a simple username/password mechanism that 
-lets a server authenticate a client. PLAIN makes no attempt at security 
-or confidentiality. It is intended for use on internal networks where 
-security requirements are low. The PLAIN mechanism is defined by this 
-document: <http://rfc.zeromq.org/spec:24>.
-
-
-USAGE
------
-To use PLAIN, the server shall set the ZMQ_PLAIN_SERVER option, and the 
-client shall set the ZMQ_PLAIN_USERNAME and ZMQ_PLAIN_PASSWORD socket 
-options. Which peer binds, and which connects, is not relevant.
-
-
-SEE ALSO
---------
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_null[7]
-linkzmq:zmq_curve[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_poll.txt b/doc/zmq_poll.txt
deleted file mode 100644
index 726064e19..000000000
--- a/doc/zmq_poll.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-zmq_poll(3)
-===========
-
-
-NAME
-----
-zmq_poll - input/output multiplexing
-
-
-SYNOPSIS
---------
-
-*int zmq_poll (zmq_pollitem_t '*items', int 'nitems', long 'timeout');*
-
-
-DESCRIPTION
------------
-The _zmq_poll()_ function provides a mechanism for applications to multiplex
-input/output events in a level-triggered fashion over a set of sockets. Each
-member of the array pointed to by the 'items' argument is a *zmq_pollitem_t*
-structure. The 'nitems' argument specifies the number of items in the 'items'
-array. The *zmq_pollitem_t* structure is defined as follows:
-
-["literal", subs="quotes"]
-typedef struct
-{
-    void '*socket';
-    int 'fd';
-    short 'events';
-    short 'revents';
-} zmq_pollitem_t;
-
-For each *zmq_pollitem_t* item, _zmq_poll()_ shall examine either the 0MQ
-socket referenced by 'socket' *or* the standard socket specified by the file
-descriptor 'fd', for the event(s) specified in 'events'. If both 'socket' and
-'fd' are set in a single *zmq_pollitem_t*, the 0MQ socket referenced by
-'socket' shall take precedence and the value of 'fd' shall be ignored.
-
-For each *zmq_pollitem_t* item, _zmq_poll()_ shall first clear the 'revents'
-member, and then indicate any requested events that have occurred by setting the
-bit corresponding to the event condition in the 'revents' member.
-
-If none of the requested events have occurred on any *zmq_pollitem_t* item,
-_zmq_poll()_ shall wait 'timeout' milliseconds for an event to occur on
-any of the requested items. If the value of 'timeout' is `0`, _zmq_poll()_
-shall return immediately. If the value of 'timeout' is `-1`, _zmq_poll()_ shall
-block indefinitely until a requested event has occurred on at least one
-*zmq_pollitem_t*.
-
-The 'events' and 'revents' members of *zmq_pollitem_t* are bit masks constructed
-by OR'ing a combination of the following event flags:
-
-*ZMQ_POLLIN*::
-For 0MQ sockets, at least one message may be received from the 'socket' without
-blocking. For standard sockets this is equivalent to the 'POLLIN' flag of the
-_poll()_ system call and generally means that at least one byte of data may be
-read from 'fd' without blocking.
-
-*ZMQ_POLLOUT*::
-For 0MQ sockets, at least one message may be sent to the 'socket' without
-blocking. For standard sockets this is equivalent to the 'POLLOUT' flag of the
-_poll()_ system call and generally means that at least one byte of data may be
-written to 'fd' without blocking.
-
-*ZMQ_POLLERR*::
-For standard sockets, this flag is passed through _zmq_poll()_ to the
-underlying _poll()_ system call and generally means that some sort of error
-condition is present on the socket specified by 'fd'. For 0MQ sockets this flag
-has no effect if set in 'events', and shall never be returned in 'revents' by
-_zmq_poll()_.
-
-*ZMQ_POLLPRI*::
-For 0MQ sockets this flags is of no use. For standard sockets this means there
-is urgent data to read. Refer to the POLLPRI flag for more informations.
-For file descriptor, refer to your use case: as an example, GPIO interrupts
-are signaled through a POLLPRI event.
-This flag has no effect on Windows.
-
-NOTE: The _zmq_poll()_ function may be implemented or emulated using operating
-system interfaces other than _poll()_, and as such may be subject to the limits
-of those interfaces in ways not defined in this documentation.
-
-THREAD SAFETY
--------------
-The *zmq_pollitem_t* array must only be used by the thread which 
-will/is calling _zmq_poll_.
-
-If a socket is contained in multiple *zmq_pollitem_t* arrays, each owned by a
-different thread, the socket itself needs to be thead-safe (Server, Client, ...).
-Otherwise, behaviour is undefined.
-
-
-RETURN VALUE
-------------
-Upon successful completion, the _zmq_poll()_ function shall return the number
-of *zmq_pollitem_t* structures with events signaled in 'revents' or `0` if no
-events have been signaled. Upon failure, _zmq_poll()_ shall return `-1` and set
-'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ETERM*::
-At least one of the members of the 'items' array refers to a 'socket' whose
-associated 0MQ 'context' was terminated.
-*EFAULT*::
-The provided 'items' was not valid (NULL).
-*EINTR*::
-The operation was interrupted by delivery of a signal before any events were
-available.
-
-
-EXAMPLE
--------
-.Polling indefinitely for input events on both a 0MQ socket and a standard socket.
-----
-zmq_pollitem_t items [2];
-/* First item refers to 0MQ socket 'socket' */
-items[0].socket = socket;
-items[0].events = ZMQ_POLLIN;
-/* Second item refers to standard socket 'fd' */
-items[1].socket = NULL;
-items[1].fd = fd;
-items[1].events = ZMQ_POLLIN;
-/* Poll for events indefinitely */
-int rc = zmq_poll (items, 2, -1);
-assert (rc >= 0);
-/* Returned events will be stored in items[].revents */
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_socket[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq[7]
-
-Your operating system documentation for the _poll()_ system call.
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_poller.txt b/doc/zmq_poller.txt
deleted file mode 100644
index cf475d5f1..000000000
--- a/doc/zmq_poller.txt
+++ /dev/null
@@ -1,316 +0,0 @@
-zmq_poller(3)
-===========
-
-
-NAME
-----
-zmq_poller - input/output multiplexing
-
-
-SYNOPSIS
---------
-
-*void *zmq_poller_new (void);*
-
-*int zmq_poller_destroy (void ****'poller_p');*
-
-*int zmq_poller_size (void *'poller');*
-
-*int zmq_poller_add (void *'poller', void *'socket', void *'user_data', short 'events');*
-
-*int zmq_poller_modify (void *'poller', void *'socket', short 'events');*
-
-*int zmq_poller_remove (void *'poller', void *'socket');*
-
-*int zmq_poller_add_fd (void *'poller', int 'fd', void *'user_data', short 'events');*
-
-*int zmq_poller_modify_fd (void *'poller', int 'fd', short 'events');*
-
-*int zmq_poller_remove_fd (void *'poller', int 'fd');*
-
-*int zmq_poller_wait (void *'poller',
-                          zmq_poller_event_t *'event',
-                          long 'timeout');*
-
-*int zmq_poller_wait_all (void *'poller',
-                          zmq_poller_event_t *'events',
-                          int 'n_events',
-                          long 'timeout');*
-
-*int zmq_poller_fd (void *'poller', zmq_fd_t *'fd');*
-
-DESCRIPTION
------------
-The _zmq_poller_*_ functions provide a mechanism for applications to multiplex
-input/output events in a level-triggered fashion over a set of sockets.
-
-_zmq_poller_new_ and _zmq_poller_destroy_ manage the lifetime of a poller
-instance. _zmq_poller_new_ creates and returns a new poller instance, while
-_zmq_poller_destroy_ destroys it. A pointer to a valid poller must be passed
-as the _poller_p_ argument of _zmq_poller_destroy_. In particular,
-_zmq_poller_destroy_ may not be called multiple times for the same poller
-instance. _zmq_poller_destroy_ sets the passed pointer to NULL in case of a
-successful execution. _zmq_poller_destroy_ implicitly unregisters all
-registered sockets and file descriptors.
-
-_zmq_poller_size_ queries the number of sockets or file descriptors registered
-with a poller. The initial size of a poller is 0, a successful add operation
-increases the size by 1 and a successful remove operation decreases the size
-by 1. The size is unaffected by the events specified.
-
-_zmq_poller_add_, _zmq_poller_modify_ and _zmq_poller_remove_ manage the 0MQ
-sockets registered with a poller.
-
-_zmq_poller_add_ registers a new _socket_ with a given _poller_. Both _poller_
-and _socket_ must point to valid 0MQ objects. The _events_ parameter specifies
-which event types the client wants to subscribe to. It is legal to specify no
-events (i.e. 0), and activate them later with _zmq_poller_modify_.
-In addition, _user_data_ may be specified, which is not used by the poller, but
-passed back to the caller when an event was signalled in a call to
-_zmq_poller_wait_ or _zmq_poller_wait_all_. _user_data_ may be NULL. If it is
-not NULL, it must be a valid pointer. Otherwise, behaviour is undefined.
-You must only add a socket to a single poller instance once (unless 
-_zmq_poller_remove_ has been called for that socket before). You may
-add a socket to multiple poller instances, if the socket itself
-is explicitly thread-safe (Server, Client, ...). If the socket is not,
-you may invoke undefined behavior.
-
-_zmq_poller_modify_ modifies the subscribed events for a socket. It is
-legal to specify no events (i.e. 0) to disable events temporarily, and
-reactivate them later with another call to _zmq_poller_modify_.
-
-_zmq_poller_remove_ removes a socket registration completely.
-_zmq_poller_remove_ must be called before a socket is closed with _zmq_close_.
-
-Note that it is not necessary to call _zmq_poller_remove_ for any socket
-before calling _zmq_poller_destroy_.
-
-Also note that calling _zmq_poller_remove_ is not equivalent to calling
-_zmq_poller_modify_ with no events. _zmq_poller_modify_ does not free resources
-associated with the socket registration, and requires that the _socket_
-remains valid.
-
-_zmq_poller_add_fd_, _zmq_poller_modify_fd_ and _zmq_poller_remove_fd_ are
-analogous to the previous functions but manage regular file descriptiors
-registered with a poller. On Windows, these functions can only be used with
-WinSock sockets.
-
-In the following, 0MQ sockets added with _zmq_poller_add_ and file descriptors
-added with _zmq_poller_add_fd_ are referred to as 'registered objects'.
-
-The *zmq_poller_event_t* structure is defined as follows:
-
-["literal", subs="quotes"]
-typedef struct
-{
-    void *socket;
-    zmq_fd_t fd;
-    void *user_data;
-    short events;
-} zmq_poller_event_t;
-
-For each registered object, _zmq_poller_wait_all()_ shall examine the
-registered objects for the event(s) currently registered.
-
-If none of the registered events have occurred, _zmq_poller_wait_all_ shall 
-wait 'timeout' milliseconds for an event to occur on any of the registered 
-objects. If the value of 'timeout' is `0`, _zmq_poller_wait_all_ shall 
-return immediately. If the value of 'timeout' is `-1`, _zmq_poller_wait_all_ 
-shall block indefinitely until one event has occurred on any of the 
-registered objects.
-
-The 'events' argument _zmq_poller_wait_all_ must be a pointer to an array of
-at least 'n_events' elements. Behaviour is undefined if 'events' does not point
-to an array of at least 'n_events' elements.
-
-_zmq_poller_wait_all_ returns at most 'n_events' events. If more than
-'n_events' events were signalled, only an unspecified subset of the signalled 
-events is returned through 'events'. 
-
-A caller is advised to ensure that 'n_events' is equal to the number of 
-registered objects. Otherwise, a livelock situation may result: If more than 
-'n_events' registered objects have an active event on each call to 
-_zmq_poller_wait_all_, it might happen that the same subset of registered 
-objects is always returned, and the caller never notices the events on the 
-others. The number of objects registered can be queried with
-_zmq_poller_size_.
-
-_zmq_poller_wait_all_ returns the number of valid elements. The valid elements
-are placed in positions '0' to 'n_events - 1' in the 'events' array. All
-members of a valid element are set to valid values by _zmq_poller_wait_all_.
-For socket events 'socket' is non-null and 'fd' is an operating system
-specific value for an invalid socket (-1 or INVALID_SOCKET). For fd events
-'socket' is NULL and 'fd' is a valid file descriptor.
-The client does therefore not need to initialize the contents of the events
-array before a call to _zmq_poller_wait_all_. It is unspecified whether the
-the remaining elements of 'events' are written to by _zmq_poller_wait_all_.
-
-_zmq_poller_fd_ queries the file descriptor associated with the zmq_poller,
-and stores it in the address pointer to by 'fd'.
-The zmq_poller is only guaranteed to have a file descriptor if
-at least one thread-safe socket is currently registered.
-
-Note that closing a socket that is registered in a poller leads to undefined
-behavior. The socket must be unregistered first.
-
-EVENT TYPES
------------
-
-The 'events' parameter of _zmq_poller_add_ and _zmq_poller_modify_, and the
-'events' member of the zmq_poller_event_t structure are bit masks constructed
-by OR'ing a combination of the following event flags:
-
-*ZMQ_POLLIN*::
-For 0MQ sockets, at least one message may be received from the 'socket' without
-blocking. For standard sockets this is equivalent to the 'POLLIN' flag of the
-_poll()_ system call and generally means that at least one byte of data may be
-read from 'fd' without blocking.
-
-*ZMQ_POLLOUT*::
-For 0MQ sockets, at least one message may be sent to the 'socket' without
-blocking. For standard sockets this is equivalent to the 'POLLOUT' flag of the
-_poll()_ system call and generally means that at least one byte of data may be
-written to 'fd' without blocking.
-
-*ZMQ_POLLERR*::
-For 0MQ sockets this flag has no effect on the _zmq_poller_add_ and
-_zmq_poller_modify_ functions, and is never set in the
-'events' member of the zmq_poller_event_t structure.
-For standard sockets, this flag is passed through _zmq_poller_wait_all_ to the
-underlying _poll()_ system call and generally means that some sort of error
-condition is present on the socket specified by 'fd'.
-
-*ZMQ_POLLPRI*::
-For 0MQ sockets this flag has no effect on the _zmq_poller_add_ and
-_zmq_poller_modify_ functions, and is never set in the
-'events' member of the zmq_poller_event_t structure.
-For standard sockets this means there
-is urgent data to read. Refer to the POLLPRI flag for more informations.
-For a file descriptor, refer to your OS documentation: as an example, GPIO
-interrupts are signaled through a POLLPRI event.
-This flag has no effect on Windows.
-
-NOTE: The _zmq_poller_*_ functions may be implemented or emulated using operating
-system interfaces other than _poll()_, and as such may be subject to the limits
-of those interfaces in ways not defined in this documentation.
-
-THREAD SAFETY
--------------
-Like most other 0MQ objects, a poller is not thread-safe. All operations must
-be called from the same thread. Otherwise, behaviour is undefined.
-
-In addition to that, if you want to add a socket to multiple existing poller
-instances, the socket itself needs to be thread-safe (Server, Client, ...).
-Otherwise, behaviour is undefined. 
-
-RETURN VALUE
-------------
-_zmq_poller_new_ returns a valid pointer to a poller, or NULL in case of a failure.
-
-All functions that return an int, return -1 in case of a failure. In that case,
-zmq_errno() can be used to query the type of the error as described below.
-
-_zmq_poller_wait_all_ returns the number of events signalled and returned in 
-the events array. It never returns 0.
-
-All other functions return 0 in case of a successful execution.
-
-ERRORS
-------
-On _zmq_poller_new_:
-*ENOMEM*::
-A new poller could not be allocated successfully.
-
-On _zmq_poller_destroy_:
-*EFAULT*::
-_poller_p_ did not point to a valid poller. Note that passing an invalid pointer (e.g.
-pointer to deallocated memory) may cause undefined behaviour (e.g. an access violation).
-
-On _zmq_poller_size_:
-*EFAULT*::
-_poller_ did not point to a valid poller. Note that passing an
-invalid pointer (e.g. pointer to deallocated memory) may cause undefined
-behaviour (e.g. an access violation).
-
-On _zmq_poller_add_, _zmq_poller_modify_ and _zmq_poller_remove_:
-*EFAULT*::
-_poller_ did not point to a valid poller. Note that passing an
-invalid pointer (e.g. pointer to deallocated memory) may cause undefined
-behaviour (e.g. an access violation).
-*ENOTSOCK*::
-_socket_ did not point to a valid socket. Note that passing an
-invalid pointer (e.g. pointer to deallocated memory) may cause undefined
-behaviour (e.g. an access violation).
-
-On _zmq_poller_add_:
-*EMFILE*::
-TODO
-
-On _zmq_poller_add_ or _zmq_poller_add_fd_:
-*ENOMEM*::
-Necessary resources could not be allocated.
-*EINVAL*::
-_socket_ resp. _fd_ was already registered with the poller.
-
-On _zmq_poller_modify_, _zmq_poller_modify_fd_, _zmq_poller_remove_ or
-_zmq_poller_remove_fd_:
-*EINVAL*::
-_socket_ resp. _fd_ was not registered with the poller.
-
-On _zmq_poller_add_fd_, _zmq_poller_modify_fd_ and _zmq_poller_remove_fd_:
-*EBADF**:
-The _fd_ specified was the retired fd.
-
-On _zmq_poller_wait_ and _zmq_poller_wait_all_:
-*ENOMEM*::
-Necessary resources could not be allocated.
-*ETERM*::
-At least one of the registered objects is a 'socket' whose associated 0MQ 
-'context' was terminated.
-*EFAULT*::
-The provided 'events' was NULL, or 'poller' did not point to a valid poller,
-or there are no registered objects or all event subscriptions are disabled
-and 'timeout' was negative.
-*EINTR*::
-The operation was interrupted by delivery of a signal before any events were
-available.
-*EAGAIN*::
-No registered event was signalled before the timeout was reached.
-
-On _zmq_poller_fd_:
-*EINVAL*::
-The poller has no associated file descriptor.
-*EFAULT*::
-The provided 'poller' did not point to a valid poller.
-
-EXAMPLE
--------
-.Polling indefinitely for input events on both a 0MQ socket and a standard socket.
-----
-void *poller = zmq_poller_new ();
-
-zmq_poller_event_t events [2];
-/* First item refers to 0MQ socket 'socket' */
-zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN);
-/* Second item refers to standard socket 'fd' */
-zmq_poller_add_fd (poller, fd, NULL, ZMQ_POLLIN);
-/* Poll for events indefinitely */
-int rc = zmq_poller_wait_all (items, events, 2, -1);
-assert (rc >= 0);
-/* Returned events will be stored in 'events' */
-zmq_poller_destroy (&poller);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_socket[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_proxy.txt b/doc/zmq_proxy.txt
deleted file mode 100644
index 37b654812..000000000
--- a/doc/zmq_proxy.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-zmq_proxy(3)
-============
-
-NAME
-----
-zmq_proxy - start built-in 0MQ proxy
-
-
-SYNOPSIS
---------
-*int zmq_proxy (void '*frontend', void '*backend', void '*capture');*
-
-
-DESCRIPTION
------------
-The _zmq_proxy()_ function starts the built-in 0MQ proxy in the current
-application thread.
-
-The proxy connects a frontend socket to a backend socket. Conceptually, data
-flows from frontend to backend. Depending on the socket types, replies may flow
-in the opposite direction. The direction is conceptual only; the proxy is fully
-symmetric and there is no technical difference between frontend and backend.
-
-Before calling _zmq_proxy()_ you must set any socket options, and connect or
-bind both frontend and backend sockets. The two conventional proxy models are:
-
-_zmq_proxy()_ runs in the current thread and returns only if/when the current
-context is closed.
-
-If the capture socket is not NULL, the proxy shall send all messages, received
-on both frontend and backend, to the capture socket. The capture socket should
-be a 'ZMQ_PUB', 'ZMQ_DEALER', 'ZMQ_PUSH', or 'ZMQ_PAIR' socket.
-
-Refer to linkzmq:zmq_socket[3] for a description of the available socket types.
-
-EXAMPLE USAGE
--------------
-
-Shared Queue
-~~~~~~~~~~~~
-
-When the frontend is a ZMQ_ROUTER socket, and the backend is a ZMQ_DEALER
-socket, the proxy shall act as a shared queue that collects requests from a
-set of clients, and distributes these fairly among a set of services.
-Requests shall be fair-queued from frontend connections and distributed evenly
-across backend connections. Replies shall automatically return to the client
-that made the original request.
-
-Forwarder
-~~~~~~~~~
-
-When the frontend is a ZMQ_XSUB socket, and the backend is a ZMQ_XPUB socket,
-the proxy shall act as a message forwarder that collects messages from a set
-of publishers and forwards these to a set of subscribers. This may be used to
-bridge networks transports, e.g. read on tcp:// and forward on pgm://.
-
-Streamer
-~~~~~~~~
-
-When the frontend is a ZMQ_PULL socket, and the backend is a ZMQ_PUSH socket,
-the proxy shall collect tasks from a set of clients and forwards these to a set
-of workers using the pipeline pattern.
-
-RETURN VALUE
-------------
-The _zmq_proxy()_ function always returns `-1` and 'errno' set to *ETERM* or
-*EINTR* (the 0MQ 'context' associated with either of the specified sockets was
-terminated).
-
-
-EXAMPLE
--------
-.Creating a shared queue proxy
-----
-//  Create frontend and backend sockets
-void *frontend = zmq_socket (context, ZMQ_ROUTER);
-assert (backend);
-void *backend = zmq_socket (context, ZMQ_DEALER);
-assert (frontend);
-//  Bind both sockets to TCP ports
-assert (zmq_bind (frontend, "tcp://*:5555") == 0);
-assert (zmq_bind (backend, "tcp://*:5556") == 0);
-//  Start the queue proxy, which runs until ETERM
-zmq_proxy (frontend, backend, NULL);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_proxy_steerable.txt b/doc/zmq_proxy_steerable.txt
deleted file mode 100644
index 85c87fc6f..000000000
--- a/doc/zmq_proxy_steerable.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-zmq_proxy_steerable(3)
-======================
-
-NAME
-----
-zmq_proxy_steerable - built-in 0MQ proxy with control flow
-
-
-SYNOPSIS
---------
-*int zmq_proxy_steerable (const void '*frontend', const void '*backend', 
-     const void '*capture', const void '*control');*
-
-
-DESCRIPTION
------------
-The _zmq_proxy_steerable()_ function starts the built-in 0MQ proxy in the 
-current application thread, as _zmq_proxy()_ do. Please, refer to this function
-for the general description and usage. We describe here only the additional 
-control flow provided by the socket passed as the fourth argument "control".
-
-If the control socket is not NULL, the proxy supports control flow. If 
-'PAUSE' is received on this socket, the proxy suspends its activities. If 
-'RESUME' is received, it goes on. If 'TERMINATE' is received, it terminates
-smoothly. If 'STATISTICS' is received, the proxy will reply on the control socket
-sending a multipart message with 8 frames, each with an unsigned integer 64-bit
-wide that provide in the following order:
- - number of messages received by the frontend socket
- - number of bytes received by the frontend socket
- - number of messages sent out the frontend socket
- - number of bytes sent out the frontend socket
- - number of messages received by the backend socket
- - number of bytes received by the backend socket
- - number of messages sent out the backend socket
- - number of bytes sent out the backend socket
-
-At start, the proxy runs normally as if zmq_proxy was used.
-
-If the control socket is NULL, the function behave exactly as if linkzmq:zmq_proxy[3]
-had been called.
-
-
-Refer to linkzmq:zmq_socket[3] for a description of the available socket types.
-Refer to linkzmq:zmq_proxy[3] for a description of the zmq_proxy.
-
-EXAMPLE USAGE
--------------
-cf zmq_proxy
-
-RETURN VALUE
-------------
-The _zmq_proxy_steerable()_ function returns 0 if TERMINATE is sent to its
-control socket. Otherwise, it returns `-1` and 'errno' set to *ETERM* or
-*EINTR* (the 0MQ 'context' associated with either of the specified sockets was
-terminated).
-
-
-EXAMPLE
--------
-.Creating a shared queue proxy
-----
-//  Create frontend, backend and control sockets
-void *frontend = zmq_socket (context, ZMQ_ROUTER);
-assert (backend);
-void *backend = zmq_socket (context, ZMQ_DEALER);
-assert (frontend);
-void *control = zmq_socket (context, ZMQ_SUB);
-assert (control);
-
-//  Bind sockets to TCP ports
-assert (zmq_bind (frontend, "tcp://*:5555") == 0);
-assert (zmq_bind (backend, "tcp://*:5556") == 0);
-assert (zmq_connect (control, "tcp://*:5557") == 0);
-
-// Subscribe to the control socket since we have chosen SUB here
-assert (zmq_setsockopt (control, ZMQ_SUBSCRIBE, "", 0));
-
-//  Start the queue proxy, which runs until ETERM or "TERMINATE" 
-//  received on the control socket
-zmq_proxy_steerable (frontend, backend, NULL, control);
-----
-.Set up a controller in another node, process or whatever
-----
-void *control = zmq_socket (context, ZMQ_PUB);
-assert (control);
-assert (zmq_bind (control, "tcp://*:5557") == 0);
-
-// pause the proxy
-assert (zmq_send (control, "PAUSE", 5, 0) == 0);
-
-// resume the proxy
-assert (zmq_send (control, "RESUME", 6, 0) == 0);
-
-// terminate the proxy
-assert (zmq_send (control, "TERMINATE", 9, 0) == 0);
-
-// check statistics
-assert (zmq_send (control, "STATISTICS", 10, 0) == 0);
-zmq_msg_t stats_msg;
-
-while (1) {
-    assert (zmq_msg_init (&stats_msg) == 0);
-    assert (zmq_recvmsg (control, &stats_msg, 0) == sizeof (uint64_t));
-    assert (rc == sizeof (uint64_t));
-    printf ("Stat: %lu\n", *(unsigned long int *)zmq_msg_data (&stats_msg));
-    if (!zmq_msg_get (&stats_msg, ZMQ_MORE))
-        break;
-    assert (zmq_msg_close (&stats_msg) == 0);
-}
-assert (zmq_msg_close (&stats_msg) == 0);
----
-
-
-SEE ALSO
---------
-linkzmq:zmq_proxy[3]
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_recv.txt b/doc/zmq_recv.txt
deleted file mode 100644
index 03468c1c8..000000000
--- a/doc/zmq_recv.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-zmq_recv(3)
-===========
-
-
-NAME
-----
-zmq_recv - receive a message part from a socket
-
-
-SYNOPSIS
---------
-*int zmq_recv (void '*socket', void '*buf', size_t 'len', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_recv()_ function shall receive a message from the socket referenced
-by the 'socket' argument and store it in the buffer referenced by the 'buf'
-argument. Any bytes exceeding the length specified by the 'len' argument shall
-be truncated. If there are no messages available on the specified 'socket'
-the _zmq_recv()_ function shall block until the request can be satisfied.
-The 'flags' argument is a combination of the flags defined below: The 'buf'
-argument may be null if len is zero.
-
-*ZMQ_DONTWAIT*::
-Specifies that the operation should be performed in non-blocking mode. If there
-are no messages available on the specified 'socket', the _zmq_recv()_
-function shall fail with 'errno' set to EAGAIN.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that processes multi-part messages must use the _ZMQ_RCVMORE_
-linkzmq:zmq_getsockopt[3] option after calling _zmq_recv()_ to determine if
-there are further parts to receive.
-
-RETURN VALUE
-------------
-The _zmq_recv()_ function shall return number of bytes in the message
-if successful. Note that the value can exceed the value of the 'len' parameter
-in case the message was truncated. If not successful the function shall return
-`-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Either the timeout set via the socket-option ZMQ_RCVTIMEO (see linkzmq:zmq_setsockopt[3])
-has been reached (flag ZMQ_DONTWAIT not set) without being able to read a message
-from the socket or there are no messages available at the moment (flag ZMQ_DONTWAIT set)
-and the operation would block.
-*ENOTSUP*::
-The _zmq_recv()_ operation is not supported by this socket type.
-*EFSM*::
-The _zmq_recv()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before a message was
-available.
-
-
-EXAMPLE
--------
-.Receiving a message from a socket
-----
-char buf [256];
-nbytes = zmq_recv (socket, buf, 256, 0);
-assert (nbytes != -1);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_send[3]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_recvmsg.txt b/doc/zmq_recvmsg.txt
deleted file mode 100644
index adf2d4a9e..000000000
--- a/doc/zmq_recvmsg.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-zmq_recvmsg(3)
-==============
-
-
-NAME
-----
-zmq_recvmsg - receive a message part from a socket
-
-
-SYNOPSIS
---------
-*int zmq_recvmsg (void '*socket', zmq_msg_t '*msg', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_recvmsg()_ function shall receive a message part from the socket
-referenced by the 'socket' argument and store it in the message referenced by
-the 'msg' argument. Any content previously stored in 'msg' shall be properly
-deallocated. If there are no message parts available on the specified 'socket'
-the _zmq_recvmsg()_ function shall block until the request can be satisfied.
-The 'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-Specifies that the operation should be performed in non-blocking mode. If there
-are no messages available on the specified 'socket', the _zmq_recvmsg()_
-function shall fail with 'errno' set to EAGAIN.
-
-NOTE: this API method is deprecated in favor of zmq_msg_recv(3).
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. Each message
-part is an independent 'zmq_msg_t' in its own right. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that processes multi-part messages must use the _ZMQ_RCVMORE_
-linkzmq:zmq_getsockopt[3] option after calling _zmq_recvmsg()_ to determine if
-there are further parts to receive.
-
-
-RETURN VALUE
-------------
-The _zmq_recvmsg()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Either the timeout set via the socket-option ZMQ_RCVTIMEO (see linkzmq:zmq_setsockopt[3])
-has been reached (flag ZMQ_DONTWAIT not set) without being able to read a message
-from the socket or there are no messages available at the moment (flag ZMQ_DONTWAIT set)
-and the operation would block.
-*ENOTSUP*::
-The _zmq_recvmsg()_ operation is not supported by this socket type.
-*EFSM*::
-The _zmq_recvmsg()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before a message was
-available.
-*EFAULT*::
-The message passed to the function was invalid.
-
-
-EXAMPLE
--------
-.Receiving a message from a socket
-----
-/* Create an empty 0MQ message */
-zmq_msg_t msg;
-int rc = zmq_msg_init (&msg);
-assert (rc == 0);
-/* Block until a message is available to be received from socket */
-rc = zmq_recvmsg (socket, &msg, 0);
-assert (rc != -1);
-/* Release message */
-zmq_msg_close (&msg);
-----
-
-.Receiving a multi-part message
-----
-int more;
-size_t more_size = sizeof (more);
-do {
-    /* Create an empty 0MQ message to hold the message part */
-    zmq_msg_t part;
-    int rc = zmq_msg_init (&part);
-    assert (rc == 0);
-    /* Block until a message is available to be received from socket */
-    rc = zmq_recvmsg (socket, &part, 0);
-    assert (rc != -1);
-    /* Determine if more message parts are to follow */
-    rc = zmq_getsockopt (socket, ZMQ_RCVMORE, &more, &more_size);
-    assert (rc == 0);
-    zmq_msg_close (&part);
-} while (more);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_recv[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_send.txt b/doc/zmq_send.txt
deleted file mode 100644
index 1d84063ff..000000000
--- a/doc/zmq_send.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-zmq_send(3)
-===========
-
-
-NAME
-----
-zmq_send - send a message part on a socket
-
-
-SYNOPSIS
---------
-*int zmq_send (void '*socket', const void '*buf', size_t 'len', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_send()_ function shall queue a message created from the buffer
-referenced by the 'buf' and 'len' arguments. The 'flags' argument is
-a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-For socket types (DEALER, PUSH) that block (either with ZMQ_IMMEDIATE option set
-and no peer available, or all peers having full high-water mark), specifies that
-the operation should be performed in non-blocking mode. If the message cannot be
-queued on the 'socket', the _zmq_send()_ function shall fail with 'errno' set
-to EAGAIN.
-
-*ZMQ_SNDMORE*::
-Specifies that the message being sent is a multi-part message, and that further
-message parts are to follow. Refer to the section regarding multi-part messages
-below for a detailed description.
-
-NOTE: A successful invocation of _zmq_send()_ does not indicate that the
-message has been transmitted to the network, only that it has been queued on
-the 'socket' and 0MQ has assumed responsibility for the message.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that sends multi-part messages must use the _ZMQ_SNDMORE_ flag
-when sending each message part except the final one.
-
-
-RETURN VALUE
-------------
-The _zmq_send()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Non-blocking mode was requested and the message cannot be sent at the moment.
-*ENOTSUP*::
-The _zmq_send()_ operation is not supported by this socket type.
-*EINVAL*::
-The sender tried to send multipart data, which the socket type does not allow.
-*EFSM*::
-The _zmq_send()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before the message was
-sent.
-*EHOSTUNREACH*::
-The message cannot be routed.
-
-
-EXAMPLE
--------
-.Sending a multi-part message
-----
-/* Send a multi-part message consisting of three parts to socket */
-rc = zmq_send (socket, "ABC", 3, ZMQ_SNDMORE);
-assert (rc == 3);
-rc = zmq_send (socket, "DEFGH", 5, ZMQ_SNDMORE);
-assert (rc == 5);
-/* Final part; no more parts to follow */
-rc = zmq_send (socket, "JK", 2, 0);
-assert (rc == 2);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_send_const[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_send_const.txt b/doc/zmq_send_const.txt
deleted file mode 100644
index 2a6efa2ea..000000000
--- a/doc/zmq_send_const.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-zmq_send_const(3)
-=================
-
-
-NAME
-----
-zmq_send_const - send a constant-memory message part on a socket
-
-
-SYNOPSIS
---------
-*int zmq_send_const (void '*socket', const void '*buf', size_t 'len', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_send_const()_ function shall queue a message created from the buffer
-referenced by the 'buf' and 'len' arguments. The message buffer is assumed
-to be constant-memory and will therefore not be copied or deallocated
-in any way. The 'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-For socket types (DEALER, PUSH) that block (either with ZMQ_IMMEDIATE option set
-and no peer available, or all peers having full high-water mark), specifies that
-the operation should be performed in non-blocking mode. If the message cannot be
-queued on the 'socket', the _zmq_send_const()_ function shall fail with 'errno' set
-to EAGAIN.
-
-*ZMQ_SNDMORE*::
-Specifies that the message being sent is a multi-part message, and that further
-message parts are to follow. Refer to the section regarding multi-part messages
-below for a detailed description.
-
-NOTE: A successful invocation of _zmq_send_const()_ does not indicate that the
-message has been transmitted to the network, only that it has been queued on
-the 'socket' and 0MQ has assumed responsibility for the message.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that sends multi-part messages must use the _ZMQ_SNDMORE_ flag
-when sending each message part except the final one.
-
-
-RETURN VALUE
-------------
-The _zmq_send_const()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Non-blocking mode was requested and the message cannot be sent at the moment.
-*ENOTSUP*::
-The _zmq_send_const()_ operation is not supported by this socket type.
-*EFSM*::
-The _zmq_send_const()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before the message was
-sent.
-*EHOSTUNREACH*::
-The message cannot be routed.
-
-
-EXAMPLE
--------
-.Sending a multi-part message
-----
-/* Send a multi-part message consisting of three parts to socket */
-rc = zmq_send_const (socket, "ABC", 3, ZMQ_SNDMORE);
-assert (rc == 3);
-rc = zmq_send_const (socket, "DEFGH", 5, ZMQ_SNDMORE);
-assert (rc == 5);
-/* Final part; no more parts to follow */
-rc = zmq_send_const (socket, "JK", 2, 0);
-assert (rc == 2);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_send[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_sendmsg.txt b/doc/zmq_sendmsg.txt
deleted file mode 100644
index 526524644..000000000
--- a/doc/zmq_sendmsg.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-zmq_sendmsg(3)
-==============
-
-
-NAME
-----
-zmq_sendmsg - send a message part on a socket
-
-
-SYNOPSIS
---------
-*int zmq_sendmsg (void '*socket', zmq_msg_t '*msg', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_sendmsg()_ function shall queue the message referenced by the 'msg'
-argument to be sent to the socket referenced by the 'socket' argument.  The
-'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-For socket types (DEALER, PUSH) that block (either with ZMQ_IMMEDIATE option set
-and no peer available, or all peers having full high-water mark), specifies that
-the operation should be performed in non-blocking mode. If the message cannot be
-queued on the 'socket', the _zmq_sendmsg()_ function shall fail with 'errno' set
-to EAGAIN.
-
-*ZMQ_SNDMORE*::
-Specifies that the message being sent is a multi-part message, and that further
-message parts are to follow. Refer to the section regarding multi-part messages
-below for a detailed description.
-
-The _zmq_msg_t_ structure passed to _zmq_sendmsg()_ is nullified during the
-call. If you want to send the same message to multiple sockets you have to copy
-it (e.g. using _zmq_msg_copy()_).
-
-NOTE: A successful invocation of _zmq_sendmsg()_ does not indicate that the
-message has been transmitted to the network, only that it has been queued on
-the 'socket' and 0MQ has assumed responsibility for the message.
-
-NOTE: this API method is deprecated in favor of zmq_msg_send(3).
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. Each message
-part is an independent 'zmq_msg_t' in its own right. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that sends multi-part messages must use the _ZMQ_SNDMORE_ flag
-when sending each message part except the final one.
-
-RETURN VALUE
-------------
-The _zmq_sendmsg()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Non-blocking mode was requested and the message cannot be sent at the moment.
-*ENOTSUP*::
-The _zmq_sendmsg()_ operation is not supported by this socket type.
-*EINVAL*::
-The sender tried to send multipart data, which the socket type does not allow.
-*EFSM*::
-The _zmq_sendmsg()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before the message was
-sent.
-*EFAULT*::
-Invalid message.
-*EHOSTUNREACH*::
-The message cannot be routed.
-
-
-EXAMPLE
--------
-.Filling in a message and sending it to a socket
-----
-/* Create a new message, allocating 6 bytes for message content */
-zmq_msg_t msg;
-int rc = zmq_msg_init_size (&msg, 6);
-assert (rc == 0);
-/* Fill in message content with 'AAAAAA' */
-memset (zmq_msg_data (&msg), 'A', 6);
-/* Send the message to the socket */
-rc = zmq_sendmsg (socket, &msg, 0);
-assert (rc == 6);
-----
-
-.Sending a multi-part message
-----
-/* Send a multi-part message consisting of three parts to socket */
-rc = zmq_sendmsg (socket, &part1, ZMQ_SNDMORE);
-rc = zmq_sendmsg (socket, &part2, ZMQ_SNDMORE);
-/* Final part; no more parts to follow */
-rc = zmq_sendmsg (socket, &part3, 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_recv[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt
deleted file mode 100755
index c7414a5a9..000000000
--- a/doc/zmq_setsockopt.txt
+++ /dev/null
@@ -1,1519 +0,0 @@
-zmq_setsockopt(3)
-=================
-
-
-NAME
-----
-
-zmq_setsockopt - set 0MQ socket options
-
-
-SYNOPSIS
---------
-*int zmq_setsockopt (void '*socket', int 'option_name', const void '*option_value', size_t 'option_len');*
-
-Caution: All options, with the exception of ZMQ_SUBSCRIBE, ZMQ_UNSUBSCRIBE,
-ZMQ_LINGER, ZMQ_ROUTER_HANDOVER, ZMQ_ROUTER_MANDATORY, ZMQ_PROBE_ROUTER,
-ZMQ_XPUB_VERBOSE, ZMQ_XPUB_VERBOSER, ZMQ_REQ_CORRELATE,
-ZMQ_REQ_RELAXED, ZMQ_SNDHWM and ZMQ_RCVHWM, only take effect for
-subsequent socket bind/connects.
-
-Specifically, security options take effect for subsequent bind/connect calls,
-and can be changed at any time to affect subsequent binds and/or connects.
-
-DESCRIPTION
------------
-The _zmq_setsockopt()_ function shall set the option specified by the
-'option_name' argument to the value pointed to by the 'option_value' argument
-for the 0MQ socket pointed to by the 'socket' argument. The 'option_len'
-argument is the size of the option value in bytes. For options taking a value of
-type "character string", the provided byte data should either contain no zero
-bytes, or end in a single zero byte (terminating ASCII NUL character).
-
-The following socket options can be set with the _zmq_setsockopt()_ function:
-
-
-ZMQ_AFFINITY: Set I/O thread affinity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_AFFINITY' option shall set the I/O thread affinity for newly created
-connections on the specified 'socket'.
-
-Affinity determines which threads from the 0MQ I/O thread pool associated with
-the socket's _context_ shall handle newly created connections.  A value of zero
-specifies no affinity, meaning that work shall be distributed fairly among all
-0MQ I/O threads in the thread pool. For non-zero values, the lowest bit
-corresponds to thread 1, second lowest bit to thread 2 and so on.  For example,
-a value of 3 specifies that subsequent connections on 'socket' shall be handled
-exclusively by I/O threads 1 and 2.
-
-See also linkzmq:zmq_init[3] for details on allocating the number of I/O
-threads for a specific _context_.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: N/A (bitmap)
-Default value:: 0
-Applicable socket types:: N/A
-
-
-ZMQ_BACKLOG: Set maximum length of the queue of outstanding connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BACKLOG' option shall set the maximum length of the queue of
-outstanding peer connections for the specified 'socket'; this only applies to
-connection-oriented transports. For details refer to your operating system
-documentation for the 'listen' function.
-
-[horizontal]
-Option value type:: int
-Option value unit:: connections
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports.
-
-
-ZMQ_BINDTODEVICE: Set name of device to bind the socket to
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BINDTODEVICE' option binds this socket to a particular device, eg.
-an interface or VRF. If a socket is bound to an interface, only packets
-received from that particular interface are processed by the socket. If device
-is a VRF device, then subsequent binds/connects to that socket use addresses
-in the VRF routing table.
-
-NOTE: requires setting CAP_NET_RAW on the compiled program.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP or UDP transports.
-
-
-ZMQ_CONNECT_RID: Assign the next outbound connection id
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This option name is now deprecated. Use ZMQ_CONNECT_ROUTING_ID instead.
-ZMQ_CONNECT_RID remains as an alias for now.
-
-
-ZMQ_CONNECT_ROUTING_ID: Assign the next outbound routing id
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_CONNECT_ROUTING_ID' option sets the peer id of the peer connected
-via the next zmq_connect() call, such that that connection is immediately ready for
-data transfer with the given routing id.  This option applies only to the first
-subsequent call to zmq_connect(), zmq_connect() calls thereafter use the default
-connection behaviour.
-
-Typical use is to set this socket option ahead of each zmq_connect() call.
-Each connection MUST be assigned a unique routing id. Assigning a
-routing id that is already in use is not allowed.
-
-Useful when connecting ROUTER to ROUTER, or STREAM to STREAM, as it
-allows for immediate sending to peers. Outbound routing id framing requirements
-for ROUTER and STREAM sockets apply.
-
-The routing id must be from 1 to 255 bytes long and MAY NOT start with
-a zero byte (such routing ids are reserved for internal use by the 0MQ
-infrastructure).
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_ROUTER, ZMQ_STREAM
-
-
-ZMQ_CONFLATE: Keep only last message
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If set, a socket shall keep only one message in its inbound/outbound
-queue, this message being the last message received/the last message
-to be sent. Ignores 'ZMQ_RCVHWM' and 'ZMQ_SNDHWM' options. Does not
-support multi-part messages, in particular, only one part of it is kept
-in the socket internal queue.
-
-NOTE: If recv is not called on the inbound socket, the queue and memory will
-grow with each message received. Use linkzmq:zmq_getsockopt[3] with ZMQ_EVENTS
-to trigger the conflation of the messages.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: ZMQ_PULL, ZMQ_PUSH, ZMQ_SUB, ZMQ_PUB, ZMQ_DEALER
-
-
-ZMQ_CONNECT_TIMEOUT: Set connect() timeout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets how long to wait before timing-out a connect() system call.
-The connect() system call normally takes a long time before it returns a
-time out error. Setting this option allows the library to time out the call
-at an earlier interval.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (disabled)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_CURVE_PUBLICKEY: Set CURVE public key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the socket's long term public key. You must set this on CURVE client
-sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
-bytes, or as a 40-character string encoded in the Z85 encoding format and
-terminated in a null byte. The public key must always be used with the
-matching secret key. To generate a public/secret key pair, use
-linkzmq:zmq_curve_keypair[3]. To derive the public key from a secret key,
-use linkzmq:zmq_curve_public[3].
-
-NOTE: an option value size of 40 is supported for backwards compatibility,
-though is deprecated.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: NULL
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SECRETKEY: Set CURVE secret key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the socket's long term secret key. You must set this on both CURVE
-client and server sockets, see linkzmq:zmq_curve[7]. You can provide the
-key as 32 binary bytes, or as a 40-character string encoded in the Z85
-encoding format and terminated in a null byte. To generate a public/secret
-key pair, use linkzmq:zmq_curve_keypair[3]. To derive the public key from
-a secret key, use linkzmq:zmq_curve_public[3].
-
-NOTE: an option value size of 40 is supported for backwards compatibility,
-though is deprecated.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: NULL
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SERVER: Set CURVE server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Defines whether the socket will act as server for CURVE security, see
-linkzmq:zmq_curve[7]. A value of '1' means the socket will act as
-CURVE server. A value of '0' means the socket will not act as CURVE
-server, and its security role then depends on other option settings.
-Setting this to '0' shall reset the socket security to NULL. When you
-set this you must also set the server's secret key using the
-ZMQ_CURVE_SECRETKEY option. A server socket does not need to know
-its own public key.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SERVERKEY: Set CURVE server key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the socket's long term server key. You must set this on CURVE client
-sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
-bytes, or as a 40-character string encoded in the Z85 encoding format and
-terminated in a null byte. This key must have been generated together with
-the server's secret key. To generate a public/secret key pair, use
-linkzmq:zmq_curve_keypair[3].
-
-NOTE: an option value size of 40 is supported for backwards compatibility,
-though is deprecated.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: NULL
-Applicable socket types:: all, when using TCP transport
-
-ZMQ_DISCONNECT_MSG: set a disconnect message that the socket will generate when accepted peer disconnect
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When set, the socket will generate a disconnect message when accepted peer has been disconnected.
-You may set this on ROUTER, SERVER and PEER sockets.
-The combination with ZMQ_HEARTBEAT_IVL is powerful and simplify protocols, when heartbeat recognize a connection drop it
-will generate a disconnect message that can match the protocol of the application.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_ROUTER, ZMQ_SERVER and ZMQ_PEER
-
-ZMQ_GSSAPI_PLAINTEXT: Disable GSSAPI encryption
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Defines whether communications on the socket will be encrypted, see
-linkzmq:zmq_gssapi[7]. A value of '1' means  that communications will be
-plaintext.  A value of '0' means communications will be encrypted.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_GSSAPI_PRINCIPAL: Set name of GSSAPI principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the name of the principal for whom GSSAPI credentials should be acquired.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_GSSAPI_SERVER: Set GSSAPI server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Defines whether the socket will act as server for GSSAPI security, see
-linkzmq:zmq_gssapi[7]. A value of '1' means the socket will act as GSSAPI
-server. A value of '0' means the socket will act as GSSAPI client.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_GSSAPI_SERVICE_PRINCIPAL: Set name of GSSAPI service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the name of the principal of the GSSAPI server to which a GSSAPI client
-intends to connect.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE: Set name type of service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the name type of the GSSAPI service principal.  A value of
-'ZMQ_GSSAPI_NT_HOSTBASED' (0) means the name specified with
-'ZMQ_GSSAPI_SERVICE_PRINCIPAL' is interpreted as a host based name.  A value
-of 'ZMQ_GSSAPI_NT_USER_NAME' (1) means it is interpreted as a local user name.
-A value of 'ZMQ_GSSAPI_NT_KRB5_PRINCIPAL' (2) means it is interpreted as an
-unparsed principal name string (valid only with the krb5 GSSAPI mechanism).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1, 2
-Default value:: 0 (ZMQ_GSSAPI_NT_HOSTBASED)
-Applicable socket types:: all, when using TCP or IPC transport
-
-ZMQ_GSSAPI_PRINCIPAL_NAMETYPE: Set name type of principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the name type of the GSSAPI principal.  A value of
-'ZMQ_GSSAPI_NT_HOSTBASED' (0) means the name specified with
-'ZMQ_GSSAPI_PRINCIPAL' is interpreted as a host based name.  A value of
-'ZMQ_GSSAPI_NT_USER_NAME' (1) means it is interpreted as a local user name.
-A value of 'ZMQ_GSSAPI_NT_KRB5_PRINCIPAL' (2) means it is interpreted as an
-unparsed principal name string (valid only with the krb5 GSSAPI mechanism).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1, 2
-Default value:: 0 (ZMQ_GSSAPI_NT_HOSTBASED)
-Applicable socket types:: all, when using TCP or IPC transport
-
-ZMQ_HANDSHAKE_IVL: Set maximum handshake interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HANDSHAKE_IVL' option shall set the maximum handshake interval for
-the specified 'socket'. Handshaking is the exchange of socket configuration
-information (socket type, routing id, security) that occurs when a connection
-is first opened, only for connection-oriented transports. If handshaking does
-not complete within the configured time, the connection shall be closed.
-The value 0 means no handshake time limit.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 30000
-Applicable socket types:: all but ZMQ_STREAM, only for connection-oriented transports
-
-ZMQ_HELLO_MSG: set an hello message that will be sent when a new peer connect
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When set, the socket will automatically send an hello message when a new connection is made or accepted.
-You may set this on DEALER, ROUTER, CLIENT, SERVER and PEER sockets.
-The combination with ZMQ_HEARTBEAT_IVL is powerful and simplify protocols,
-as now heartbeat and sending the hello message can be left out of protocols and be handled by zeromq.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_ROUTER, ZMQ_DEALER, ZMQ_CLIENT, ZMQ_SERVER and ZMQ_PEER
-
-ZMQ_HEARTBEAT_IVL: Set interval between sending ZMTP heartbeats
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HEARTBEAT_IVL' option shall set the interval between sending ZMTP heartbeats
-for the specified 'socket'. If this option is set and is greater than 0, then a 'PING'
-ZMTP command will be sent every 'ZMQ_HEARTBEAT_IVL' milliseconds.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0
-Applicable socket types:: all, when using connection-oriented transports
-
-
-ZMQ_HEARTBEAT_TIMEOUT: Set timeout for ZMTP heartbeats
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HEARTBEAT_TIMEOUT' option shall set how long to wait before timing-out a
-connection after sending a 'PING' ZMTP command and not receiving any traffic. This
-option is only valid if 'ZMQ_HEARTBEAT_IVL' is also set, and is greater than 0. The
-connection will time out if there is no traffic received after sending the 'PING'
-command, but the received traffic does not have to be a 'PONG' command - any received
-traffic will cancel the timeout.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 normally, ZMQ_HEARTBEAT_IVL if it is set
-Applicable socket types:: all, when using connection-oriented transports
-
-
-ZMQ_HEARTBEAT_TTL: Set the TTL value for ZMTP heartbeats
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HEARTBEAT_TTL' option shall set the timeout on the remote peer for ZMTP
-heartbeats. If this option is greater than 0, the remote side shall time out the
-connection if it does not receive any more traffic within the TTL period. This option
-does not have any effect if 'ZMQ_HEARTBEAT_IVL' is not set or is 0. Internally, this
-value is rounded down to the nearest decisecond, any value less than 100 will have
-no effect.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0
-Maximum value:: 6553599 (which is 2^16-1 deciseconds)
-Applicable socket types:: all, when using connection-oriented transports
-
-
-ZMQ_IDENTITY: Set socket identity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This option name is now deprecated. Use ZMQ_ROUTING_ID instead.
-ZMQ_IDENTITY remains as an alias for now.
-
-
-ZMQ_IMMEDIATE: Queue messages only to completed connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-By default queues will fill on outgoing connections even if the connection has
-not completed. This can lead to "lost" messages on sockets with round-robin
-routing (REQ, PUSH, DEALER). If this option is set to `1`, messages shall be
-queued only to completed connections. This will cause the socket to block if
-there are no other connections, but will prevent queues from filling on pipes
-awaiting connection.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, only for connection-oriented transports.
-
-
-ZMQ_INVERT_MATCHING: Invert message filtering
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Reverses the filtering behavior of PUB-SUB sockets, when set to 1.
-
-On 'PUB' and 'XPUB' sockets, this causes messages to be sent to all
-connected sockets 'except' those subscribed to a prefix that matches
-the message. On 'SUB' sockets, this causes only incoming messages that
-do 'not' match any of the socket's subscriptions to be received by the user.
-
-Whenever 'ZMQ_INVERT_MATCHING' is set to 1 on a 'PUB' socket, all 'SUB'
-sockets connecting to it must also have the option set to 1. Failure to
-do so will have the 'SUB' sockets reject everything the 'PUB' socket sends
-them. 'XSUB' sockets do not need to do this because they do not filter
-incoming messages.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0,1
-Default value:: 0
-Applicable socket types:: ZMQ_PUB, ZMQ_XPUB, ZMQ_SUB
-
-
-ZMQ_IPV6: Enable IPv6 on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Set the IPv6 option for the socket. A value of `1` means IPv6 is
-enabled on the socket, while `0` means the socket will use only IPv4.
-When IPv6 is enabled the socket will connect to, or accept connections
-from, both IPv4 and IPv6 hosts.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_LINGER: Set linger period for socket shutdown
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_LINGER' option shall set the linger period for the specified 'socket'.
-The linger period determines how long pending messages which have yet to be
-sent to a peer shall linger in memory after a socket is disconnected with
-linkzmq:zmq_disconnect[3] or closed with linkzmq:zmq_close[3], and further
-affects the termination of the socket's context with linkzmq:zmq_ctx_term[3].
-The following outlines the different behaviours:
-
-* A value of '-1' specifies an infinite linger period. Pending
-  messages shall not be discarded after a call to _zmq_disconnect()_ or
-  _zmq_close()_; attempting to terminate the socket's context with _zmq_ctx_term()_
-  shall block until all pending messages have been sent to a peer.
-
-* The value of '0' specifies no linger period. Pending messages shall be
-  discarded immediately after a call to _zmq_disconnect()_ or _zmq_close()_.
-
-* Positive values specify an upper bound for the linger period in milliseconds.
-  Pending messages shall not be discarded after a call to _zmq_disconnect()_ or
-  _zmq_close()_; attempting to terminate the socket's context with _zmq_ctx_term()_
-  shall block until either all pending messages have been sent to a peer, or the
-  linger period expires, after which any pending messages shall be discarded.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_MAXMSGSIZE: Maximum acceptable inbound message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Limits the size of the inbound message. If a peer sends a message larger than
-ZMQ_MAXMSGSIZE it is disconnected. Value of -1 means 'no limit'.
-
-[horizontal]
-Option value type:: int64_t
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_METADATA: Add application metadata properties to a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The _ZMQ_METADATA_ option shall add application metadata to the specified _socket_,
-the metadata is exchanged with peers during connection setup. A metadata property is
-specfied as a string, delimited by a colon, starting with the metadata _property_
-followed by the metadata value, for example "X-key:value".
-_Property_ names are restrited to maximum 255 characters and must be prefixed by "X-".
-Multiple application metadata properties can be added to a socket by executing zmq_setsockopt()
-multiple times. As the argument is a null-terminated string, binary data must be encoded
-before it is added e.g. using Z85 (linkzmq:zmq_z85_encode[3]).
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all
-
-
-ZMQ_MULTICAST_HOPS: Maximum network hops for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the time-to-live field in every multicast packet sent from this socket.
-The default is 1 which means that the multicast packets don't leave the local
-network.
-
-[horizontal]
-Option value type:: int
-Option value unit:: network hops
-Default value:: 1
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_MULTICAST_MAXTPDU: Maximum transport data unit size for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the maximum transport data unit size used for outbound multicast
-packets.
-
-This must be set at or below the minimum Maximum Transmission Unit (MTU) for
-all network paths over which multicast reception is required.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 1500
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_PLAIN_PASSWORD: Set PLAIN security password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the password for outgoing connections over TCP or IPC. If you set this
-to a non-null value, the security mechanism used for connections shall be
-PLAIN, see linkzmq:zmq_plain[7]. If you set this to a null value, the security
-mechanism used for connections shall be NULL, see linkzmq:zmq_null[3].
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_PLAIN_SERVER: Set PLAIN server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Defines whether the socket will act as server for PLAIN security, see
-linkzmq:zmq_plain[7]. A value of '1' means the socket will act as
-PLAIN server. A value of '0' means the socket will not act as PLAIN
-server, and its security role then depends on other option settings.
-Setting this to '0' shall reset the socket security to NULL.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_PLAIN_USERNAME: Set PLAIN security username
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the username for outgoing connections over TCP or IPC. If you set this
-to a non-null value, the security mechanism used for connections shall be
-PLAIN, see linkzmq:zmq_plain[7]. If you set this to a null value, the security
-mechanism used for connections shall be NULL, see linkzmq:zmq_null[3].
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_USE_FD: Set the pre-allocated socket file descriptor
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When set to a positive integer value before zmq_bind is called on the socket,
-the socket shall use the corresponding file descriptor for connections over
-TCP or IPC instead of allocating a new file descriptor.
-Useful for writing systemd socket activated services. If set to -1 (default),
-a new file descriptor will be allocated instead (default behaviour).
-
-NOTE: if set after calling zmq_bind, this option shall have no effect.
-NOTE: the file descriptor passed through MUST have been ran through the "bind"
-      and "listen" system calls beforehand. Also, socket option that would
-      normally be passed through zmq_setsockopt like TCP buffers length,
-      IP_TOS or SO_REUSEADDR MUST be set beforehand by the caller, as they
-      must be set before the socket is bound.
-
-[horizontal]
-Option value type:: int
-Option value unit:: file descriptor
-Default value:: -1
-Applicable socket types:: all bound sockets, when using IPC or TCP transport
-
-
-ZMQ_PROBE_ROUTER: bootstrap connections to ROUTER sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When set to 1, the socket will automatically send an empty message when a
-new connection is made or accepted. You may set this on REQ, DEALER, or
-ROUTER sockets connected to a ROUTER socket. The application must filter
-such empty messages. The ZMQ_PROBE_ROUTER option in effect provides the
-ROUTER application with an event signaling the arrival of a new peer.
-
-NOTE: do not set this option on a socket that talks to any other socket
-types: the results are undefined.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER, ZMQ_DEALER, ZMQ_REQ
-
-
-ZMQ_RATE: Set multicast data rate
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RATE' option shall set the maximum send or receive data rate for
-multicast transports such as linkzmq:zmq_pgm[7] using the specified 'socket'.
-
-[horizontal]
-Option value type:: int
-Option value unit:: kilobits per second
-Default value:: 100
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_RCVBUF: Set kernel receive buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVBUF' option shall set the underlying kernel receive buffer size for
-the 'socket' to the specified size in bytes.  A value of -1 means leave the
-OS default unchanged. For details refer to your operating system documentation
-for the 'SO_RCVBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_RCVHWM: Set high water mark for inbound messages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVHWM' option shall set the high water mark for inbound messages on
-the specified 'socket'. The high water mark is a hard limit on the maximum
-number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with. A value of zero means no
-limit.
-
-If this limit has been reached the socket shall enter an exceptional state and
-depending on the socket type, 0MQ shall take appropriate action such as
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-NOTE: 0MQ does not guarantee that the socket will be able to queue as many as ZMQ_RCVHWM
-messages, and the actual limit may be lower or higher, depending on socket transport.
-A notable example is for sockets using TCP transport; see linkzmq:zmq_tcp[7].
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-ZMQ_RCVTIMEO: Maximum time before a recv operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the timeout for receive operation on the socket. If the value is `0`,
-_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
-message to receive. If the value is `-1`, it will block until a message is
-available. For all other values, it will wait for a message for that amount
-of time before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_RECONNECT_IVL: Set reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL' option shall set the initial reconnection interval for
-the specified 'socket'.  The reconnection interval is the period 0MQ
-shall wait between attempts to reconnect disconnected peers when using
-connection-oriented transports. The value -1 means no reconnection.
-
-NOTE: The reconnection interval may be randomized by 0MQ to prevent
-reconnection storms in topologies with a large number of peers per socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECONNECT_IVL_MAX: Set maximum reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL_MAX' option shall set the maximum reconnection interval
-for the specified 'socket'.  This is the maximum period 0MQ shall wait between
-attempts to reconnect. On each reconnect attempt, the previous interval shall be
-doubled untill ZMQ_RECONNECT_IVL_MAX is reached. This allows for exponential
-backoff strategy. Default value means no exponential backoff is performed and
-reconnect interval calculations are only based on ZMQ_RECONNECT_IVL.
-
-NOTE:  Values less than ZMQ_RECONNECT_IVL will be ignored.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (only use ZMQ_RECONNECT_IVL)
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECONNECT_STOP: Set condition where reconnection will stop
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_STOP' option shall set the conditions under which automatic
-reconnection will stop.  This can be useful when a process binds to a
-wild-card port, where the OS supplies an ephemeral port.
-
-The 'ZMQ_RECONNECT_STOP_CONN_REFUSED' option will stop reconnection when 0MQ
-receives the ECONNREFUSED return code from the connect.  This indicates that
-there is no code bound to the specified endpoint.
-
-[horizontal]
-Option value type:: int
-Option value unit:: ZMQ_RECONNECT_STOP_CONN_REFUSED
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECOVERY_IVL: Set multicast recovery interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECOVERY_IVL' option shall set the recovery interval for multicast
-transports using the specified 'socket'. The recovery interval determines the
-maximum time in milliseconds that a receiver can be absent from a multicast
-group before unrecoverable data loss will occur.
-
-CAUTION: Exercise care when setting large recovery intervals as the data
-needed for recovery will be held in memory. For example, a 1 minute recovery
-interval at a data rate of 1Gbps requires a 7GB in-memory buffer.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 10000
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_REQ_CORRELATE: match replies with requests
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The default behaviour of REQ sockets is to rely on the ordering of messages to
-match requests and responses and that is usually sufficient. When this option
-is set to 1, the REQ socket will prefix outgoing messages with an extra frame
-containing a request id. That means the full message is (request id, 0,
-user frames...). The REQ socket will discard all incoming messages that don't
-begin with these two frames.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_REQ
-
-
-ZMQ_REQ_RELAXED: relax strict alternation between request and reply
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-By default, a REQ socket does not allow initiating a new request with
-_zmq_send(3)_ until the reply to the previous one has been received.
-When set to 1, sending another message is allowed and previous replies will
-be discarded if any. The request-reply state machine is reset and a new
-request is sent to the next available peer.
-
-If set to 1, also enable ZMQ_REQ_CORRELATE to ensure correct matching of
-requests and replies. Otherwise a late reply to an aborted request can be
-reported as the reply to the superseding request.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_REQ
-
-
-ZMQ_ROUTER_HANDOVER: handle duplicate client routing ids on ROUTER sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If two clients use the same routing id when connecting to a ROUTER, the
-results shall depend on the ZMQ_ROUTER_HANDOVER option setting. If that
-is not set (or set to the default of zero), the ROUTER socket shall reject
-clients trying to connect with an already-used routing id. If that option
-is set to 1, the ROUTER socket shall hand-over the connection to the new
-client and disconnect the existing one.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_ROUTER_MANDATORY: accept only routable messages on ROUTER sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the ROUTER socket behaviour when an unroutable message is encountered. A
-value of `0` is the default and discards the message silently when it cannot be
-routed or the peers SNDHWM is reached.  A value of `1` returns an
-'EHOSTUNREACH' error code if the message cannot be routed or 'EAGAIN' error
-code if the SNDHWM is reached and ZMQ_DONTWAIT was used. Without ZMQ_DONTWAIT
-it will block until the SNDTIMEO is reached or a spot in the send queue opens
-up.
-
-When ZMQ_ROUTER_MANDATORY is set to `1`, 'ZMQ_POLLOUT' events will be generated
-if one or more messages can be sent to at least one of the peers. If
-ZMQ_ROUTER_MANDATORY is set to `0`, the socket will generate a 'ZMQ_POLLOUT'
-event on every call to 'zmq_poll' resp. 'zmq_poller_wait_all'.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_ROUTER_RAW: switch ROUTER socket to raw mode
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the raw mode on the ROUTER, when set to 1. When the ROUTER socket is in
-raw mode, and when using the tcp:// transport, it will read and write TCP data
-without 0MQ framing. This lets 0MQ applications talk to non-0MQ applications.
-When using raw mode, you cannot set explicit identities, and the ZMQ_SNDMORE
-flag is ignored when sending data messages. In raw mode you can close a specific
-connection by sending it a zero-length message (following the routing id frame).
-
-NOTE: This option is deprecated, please use ZMQ_STREAM sockets instead.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_ROUTING_ID: Set socket routing id
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ROUTING_ID' option shall set the routing id of the specified 'socket'
-when connecting to a ROUTER socket.
-
-A routing id must be at least one byte and at most 255 bytes long. Identities
-starting with a zero byte are reserved for use by the 0MQ infrastructure.
-
-If two clients use the same routing id when connecting to a ROUTER, the
-results shall depend on the ZMQ_ROUTER_HANDOVER option setting. If that
-is not set (or set to the default of zero), the ROUTER socket shall reject
-clients trying to connect with an already-used routing id. If that option
-is set to 1, the ROUTER socket shall hand-over the connection to the new
-client and disconnect the existing one.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_REQ, ZMQ_REP, ZMQ_ROUTER, ZMQ_DEALER.
-
-
-ZMQ_SNDBUF: Set kernel transmit buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDBUF' option shall set the underlying kernel transmit buffer size
-for the 'socket' to the specified size in bytes.  A value of -1 means leave
-the OS default unchanged. For details please refer to your operating system
-documentation for the 'SO_SNDBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_SNDHWM: Set high water mark for outbound messages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDHWM' option shall set the high water mark for outbound messages on
-the specified 'socket'. The high water mark is a hard limit on the maximum
-number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with. A value of zero means no
-limit.
-
-If this limit has been reached the socket shall enter an exceptional state and
-depending on the socket type, 0MQ shall take appropriate action such as
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-NOTE: 0MQ does not guarantee that the socket will accept as many as ZMQ_SNDHWM
-messages, and the actual limit may be as much as 90% lower depending on the
-flow of messages on the socket. The socket may even be able to accept more messages
-than the ZMQ_SNDHWM threshold; a notable example is for sockets using TCP transport;
-see linkzmq:zmq_tcp[7].
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-ZMQ_SNDTIMEO: Maximum time before a send operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the timeout for send operation on the socket. If the value is `0`,
-_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
-cannot be sent. If the value is `-1`, it will block until the message is sent.
-For all other values, it will try to send the message for that amount of time
-before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_SOCKS_PROXY: Set SOCKS5 proxy address
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the SOCKS5 proxy address that shall be used by the socket for the TCP
-connection(s). Supported authentication methods are: no authentication
-or basic authentication when setup with ZMQ_SOCKS_USERNAME. If the endpoints
-are domain names instead of addresses they shall not be resolved and they
-shall be forwarded unchanged to the SOCKS proxy service in the client
-connection request message (address type 0x03 domain name).
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_SOCKS_USERNAME: Set SOCKS username and select basic authentication
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the username for authenticated connection to the SOCKS5 proxy.
-If you set this to a non-null and non-empty value, the authentication
-method used for the SOCKS5 connection shall be basic authentication.
-In this case, use ZMQ_SOCKS_PASSWORD option in order to set the password.
-If you set this to a null value or empty value, the authentication method
-shall be no authentication, the default.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_SOCKS_PASSWORD: Set SOCKS basic authentication password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the password for authenticating to the SOCKS5 proxy server.
-This is used only when the SOCKS5 authentication method has been
-set to basic authentication through the ZMQ_SOCKS_USERNAME option.
-Setting this to a null value (the default) is equivalent to an
-empty password string.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_STREAM_NOTIFY: send connect and disconnect notifications
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Enables connect and disconnect notifications on a STREAM socket, when set
-to 1. When notifications are enabled, the socket delivers a zero-length
-message when a peer connects or disconnects.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 1
-Applicable socket types:: ZMQ_STREAM
-
-
-ZMQ_SUBSCRIBE: Establish message filter
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SUBSCRIBE' option shall establish a new message filter on a 'ZMQ_SUB'
-socket. Newly created 'ZMQ_SUB' sockets shall filter out all incoming messages,
-therefore you should call this option to establish an initial message filter.
-
-An empty 'option_value' of length zero shall subscribe to all incoming
-messages. A non-empty 'option_value' shall subscribe to all messages beginning
-with the specified prefix. Multiple filters may be attached to a single
-'ZMQ_SUB' socket, in which case a message shall be accepted if it matches at
-least one filter.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: ZMQ_SUB
-
-
-ZMQ_TCP_KEEPALIVE: Override SO_KEEPALIVE socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'SO_KEEPALIVE' socket option (where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,0,1
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_CNT: Override TCP_KEEPCNT socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPCNT' socket option (where supported by OS). The default
-value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_IDLE: Override TCP_KEEPIDLE (or TCP_KEEPALIVE on some OS)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPIDLE' (or 'TCP_KEEPALIVE' on some OS) socket option (where
-supported by OS). The default value of `-1` means to skip any overrides and
-leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_INTVL: Override TCP_KEEPINTVL socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPINTVL' socket option(where supported by OS). The default
-value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_MAXRT: Set TCP Maximum Retransmit Timeout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-On OSes where it is supported, sets how long before an unacknowledged TCP
-retransmit times out. The system normally attempts many TCP retransmits
-following an exponential backoff strategy. This means that after a network
-outage, it may take a long time before the session can be re-established.
-Setting this option allows the timeout to happen at a shorter interval.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TOS: Set the Type-of-Service on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the ToS fields (Differentiated services (DS) and Explicit Congestion
-Notification (ECN) field of the IP header. The ToS field is typically used
-to specify a packets priority. The availability of this option is dependent
-on intermediate network equipment that inspect the ToS field and provide a
-path for low-delay, high-throughput, highly-reliable service, etc.
-
-[horizontal]
-Option value type:: int
-Option value unit:: >0
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_UNSUBSCRIBE: Remove message filter
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_UNSUBSCRIBE' option shall remove an existing message filter on a
-'ZMQ_SUB' socket. The filter specified must match an existing filter previously
-established with the 'ZMQ_SUBSCRIBE' option. If the socket has several
-instances of the same filter attached the 'ZMQ_UNSUBSCRIBE' option shall remove
-only one instance, leaving the rest in place and functional.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: ZMQ_SUB
-
-
-ZMQ_XPUB_VERBOSE: pass duplicate subscribe messages on XPUB socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XPUB' socket behaviour on new duplicated subscriptions. If enabled,
-the socket passes all subscribe messages to the caller. If disabled,
-only the first subscription to each filter will be passed. The default is 0
-(disabled).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_XPUB_VERBOSER: pass duplicate subscribe and unsubscribe messages on XPUB socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XPUB' socket behaviour on new duplicated subscriptions and
-unsubscriptions. If enabled, the socket passes all subscribe and unsubscribe
-messages to the caller. If disabled, only the first subscription to each filter and
-the last unsubscription from each filter will be passed. The default is 0
-(disabled).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_XPUB_MANUAL: change the subscription handling to manual
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XPUB' socket subscription handling mode manual/automatic.
-A value of '0' is the default and subscription requests will be handled automatically.
-A value of '1' will change the subscription requests handling to manual,
-with manual mode subscription requests are not added to the subscription list.
-To add subscription the user need to call setsockopt with ZMQ_SUBSCRIBE on XPUB socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_XPUB_MANUAL_LAST_VALUE: change the subscription handling to manual
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This option is similar to ZMQ_XPUB_MANUAL.
-The difference is that ZMQ_XPUB_MANUAL_LAST_VALUE changes the 'XPUB' socket
-behaviour to send the first message to the last subscriber after the socket
-receives a subscription and call setsockopt with ZMQ_SUBSCRIBE on 'XPUB' socket.
-This prevents duplicated messages when using last value caching(LVC).
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_XPUB_NODROP: do not silently drop messages if SENDHWM is reached
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XPUB' socket behaviour to return error EAGAIN if SENDHWM is
-reached and the message could not be send.
-
-A value of `0` is the default and drops the message silently when the peers
-SNDHWM is reached.  A value of `1` returns an 'EAGAIN' error code if the
-SNDHWM is reached and ZMQ_DONTWAIT was used.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB, ZMQ_PUB
-
-
-ZMQ_XPUB_WELCOME_MSG: set welcome message that will be received by subscriber when connecting
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets a welcome message the will be recieved by subscriber when connecting.
-Subscriber must subscribe to the Welcome message before connecting.
-Welcome message will also be sent on reconnecting.
-For welcome message to work well user must poll on incoming subscription messages on the XPUB socket and handle them.
-
-Use NULL and length of zero to disable welcome message.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_ONLY_FIRST_SUBSCRIBE: Process only first subscribe/unsubscribe in a multipart message
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If set, only the first part of the multipart message is processed as
-a subscribe/unsubscribe message. The rest are forwarded as user data
-regardless of message contents.
-
-It not set (default), subscribe/unsubscribe messages in a multipart message
-are processed as such regardless of their number and order.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: ZMQ_XSUB, ZMQ_XPUB
-
-
-ZMQ_ZAP_DOMAIN: Set RFC 27 authentication domain
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the domain for ZAP (ZMQ RFC 27) authentication. A ZAP domain must be
-specified to enable authentication. When the ZAP domain is empty, which is
-the default, ZAP authentication is disabled. This is not compatible with
-previous versions of libzmq, so it can be controlled by ZMQ_ZAP_ENFORCE_DOMAIN
-which for now is disabled by default.
-See http://rfc.zeromq.org/spec:27 for more details.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: empty
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_ZAP_ENFORCE_DOMAIN: Set ZAP domain handling to strictly adhere the RFC
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZAP (ZMQ RFC 27) authentication protocol specifies that a domain must
-always be set. Older versions of libzmq did not follow the spec and allowed
-an empty domain to be set.
-This option can be used to enabled or disable the stricter, backward
-incompatible behaviour. For now it is disabled by default, but in a future
-version it will be enabled by default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: all, when using ZAP
-
-
-ZMQ_TCP_ACCEPT_FILTER: Assign filters to allow new TCP connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Assign an arbitrary number of filters that will be applied for each new TCP
-transport connection on a listening socket. If no filters are applied, then
-the TCP transport allows connections from any IP address. If at least one
-filter is applied then new connection source ip should be matched. To clear
-all filters call zmq_setsockopt(socket, ZMQ_TCP_ACCEPT_FILTER, NULL, 0).
-Filter is a null-terminated string with ipv6 or ipv4 CIDR.
-
-NOTE: This option is deprecated, please use authentication via the ZAP API
-and IP address whitelisting / blacklisting.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using TCP transports.
-
-
-ZMQ_IPC_FILTER_GID: Assign group ID filters to allow new IPC connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Assign an arbitrary number of filters that will be applied for each new IPC
-transport connection on a listening socket. If no IPC filters are applied, then
-the IPC transport allows connections from any process. If at least one UID,
-GID, or PID filter is applied then new connection credentials should be
-matched. To clear all GID filters call zmq_setsockopt(socket,
-ZMQ_IPC_FILTER_GID, NULL, 0).
-
-NOTE: GID filters are only available on platforms supporting SO_PEERCRED or
-LOCAL_PEERCRED socket options (currently only Linux and later versions of
-OS X).
-
-NOTE: This option is deprecated, please use authentication via the ZAP API
-and IPC whitelisting / blacklisting.
-
-[horizontal]
-Option value type:: gid_t
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using IPC transports.
-
-
-ZMQ_IPC_FILTER_PID: Assign process ID filters to allow new IPC connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Assign an arbitrary number of filters that will be applied for each new IPC
-transport connection on a listening socket. If no IPC filters are applied, then
-the IPC transport allows connections from any process. If at least one UID,
-GID, or PID filter is applied then new connection credentials should be
-matched. To clear all PID filters call zmq_setsockopt(socket,
-ZMQ_IPC_FILTER_PID, NULL, 0).
-
-NOTE: PID filters are only available on platforms supporting the SO_PEERCRED
-socket option (currently only Linux).
-
-NOTE: This option is deprecated, please use authentication via the ZAP API
-and IPC whitelisting / blacklisting.
-
-[horizontal]
-Option value type:: pid_t
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using IPC transports.
-
-
-ZMQ_IPC_FILTER_UID: Assign user ID filters to allow new IPC connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Assign an arbitrary number of filters that will be applied for each new IPC
-transport connection on a listening socket. If no IPC filters are applied, then
-the IPC transport allows connections from any process. If at least one UID,
-GID, or PID filter is applied then new connection credentials should be
-matched. To clear all UID filters call zmq_setsockopt(socket,
-ZMQ_IPC_FILTER_UID, NULL, 0).
-
-NOTE: UID filters are only available on platforms supporting SO_PEERCRED or
-LOCAL_PEERCRED socket options (currently only Linux and later versions of
-OS X).
-
-NOTE: This option is deprecated, please use authentication via the ZAP API
-and IPC whitelisting / blacklisting.
-
-[horizontal]
-Option value type:: uid_t
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using IPC transports.
-
-
-ZMQ_IPV4ONLY: Use IPv4-only on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Set the IPv4-only option for the socket. This option is deprecated.
-Please use the ZMQ_IPV6 option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 1 (true)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_VMCI_BUFFER_SIZE: Set buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_SIZE` option shall set the size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 65546
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_BUFFER_MIN_SIZE: Set min buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_MIN_SIZE` option shall set the min size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 128
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_BUFFER_MAX_SIZE: Set max buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_MAX_SIZE` option shall set the max size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 262144
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_CONNECT_TIMEOUT: Set connection timeout of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_CONNECT_TIMEOUT` option shall set connection timeout
-for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_MULTICAST_LOOP: Control multicast local loopback
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-For multicast UDP sender sockets this option sets whether the data
-sent should be looped back on local listening sockets.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 1
-Applicable socket types:: ZMQ_RADIO, when using UDP multicast transport
-
-
-ZMQ_ROUTER_NOTIFY: Send connect and disconnect notifications
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Enable connect and disconnect notifications on a ROUTER socket.
-When enabled, the socket delivers a zero-length message (with routing-id
-as first frame) when a peer connects or disconnects. It's possible
-to notify both events for a peer by OR-ing the flag values. This option
-only applies to stream oriented (tcp, ipc) transports.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, ZMQ_NOTIFY_CONNECT, ZMQ_NOTIFY_DISCONNECT, ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_IN_BATCH_SIZE: Maximal receive batch size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the maximal amount of messages that can be received in a single
-'recv' system call. WARNING: this option should almost never be changed.
-The default has been chosen to offer the best compromise between latency and
-throughtput. In the vast majority of cases, changing this option will result in
-worst result if not outright breakages.
-
-Cannot be zero.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 8192
-Applicable socket types:: All, when using TCP, IPC, PGM or NORM transport.
-
-
-ZMQ_OUT_BATCH_SIZE: Maximal send batch size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the maximal amount of messages that can be sent in a single
-'send' system call. WARNING: this option should almost never be changed.
-The default has been chosen to offer the best compromise between latency and
-throughtput. In the vast majority of cases, changing this option will result in
-worst result if not outright breakages.
-
-Cannot be zero.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 8192
-Applicable socket types:: All, when using TCP, IPC, PGM or NORM transport.
-
-
-RETURN VALUE
-------------
-The _zmq_setsockopt()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown, or the requested _option_len_ or
-_option_value_ is invalid.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal.
-
-
-EXAMPLE
--------
-.Subscribing to messages on a 'ZMQ_SUB' socket
-----
-/* Subscribe to all messages */
-rc = zmq_setsockopt (socket, ZMQ_SUBSCRIBE, "", 0);
-assert (rc == 0);
-/* Subscribe to messages prefixed with "ANIMALS.CATS" */
-rc = zmq_setsockopt (socket, ZMQ_SUBSCRIBE, "ANIMALS.CATS", 12);
-----
-
-.Setting I/O thread affinity
-----
-int64_t affinity;
-/* Incoming connections on TCP port 5555 shall be handled by I/O thread 1 */
-affinity = 1;
-rc = zmq_setsockopt (socket, ZMQ_AFFINITY, &affinity, sizeof (affinity));
-assert (rc);
-rc = zmq_bind (socket, "tcp://lo:5555");
-assert (rc);
-/* Incoming connections on TCP port 5556 shall be handled by I/O thread 2 */
-affinity = 2;
-rc = zmq_setsockopt (socket, ZMQ_AFFINITY, &affinity, sizeof (affinity));
-assert (rc);
-rc = zmq_bind (socket, "tcp://lo:5556");
-assert (rc);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq_plain[7]
-linkzmq:zmq_curve[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_socket.txt b/doc/zmq_socket.txt
deleted file mode 100644
index 6f53186cc..000000000
--- a/doc/zmq_socket.txt
+++ /dev/null
@@ -1,758 +0,0 @@
-zmq_socket(3)
-=============
-
-
-NAME
-----
-zmq_socket - create 0MQ socket
-
-
-SYNOPSIS
---------
-*void *zmq_socket (void '*context', int 'type');*
-
-
-DESCRIPTION
------------
-The 'zmq_socket()' function shall create a 0MQ socket within the specified
-'context' and return an opaque handle to the newly created socket. The 'type'
-argument specifies the socket type, which determines the semantics of
-communication over the socket.
-
-The newly created socket is initially unbound, and not associated with any
-endpoints. In order to establish a message flow a socket must first be
-connected to at least one endpoint with linkzmq:zmq_connect[3], or at least one
-endpoint must be created for accepting incoming connections with
-linkzmq:zmq_bind[3].
-
-.Key differences to conventional sockets
-Generally speaking, conventional sockets present a _synchronous_ interface to
-either connection-oriented reliable byte streams (SOCK_STREAM), or
-connection-less unreliable datagrams (SOCK_DGRAM). In comparison, 0MQ sockets
-present an abstraction of an asynchronous _message queue_, with the exact
-queueing semantics depending on the socket type in use. Where conventional
-sockets transfer streams of bytes or discrete datagrams, 0MQ sockets transfer
-discrete _messages_.
-
-0MQ sockets being _asynchronous_ means that the timings of the physical
-connection setup and tear down, reconnect and effective delivery are transparent
-to the user and organized by 0MQ itself. Further, messages may be _queued_ in
-the event that a peer is unavailable to receive them.
-
-Conventional sockets allow only strict one-to-one (two peers), many-to-one
-(many clients, one server), or in some cases one-to-many (multicast)
-relationships. With the exception of 'ZMQ_PAIR' and 'ZMQ_CHANNEL', 0MQ sockets may be connected
-*to multiple endpoints* using _zmq_connect()_, while simultaneously accepting
-incoming connections *from multiple endpoints* bound to the socket using
-_zmq_bind()_, thus allowing many-to-many relationships.
-
-.Thread safety
-0MQ has both thread safe socket type and _not_ thread safe socket types.
-Applications MUST NOT use a _not_ thread safe socket
-from multiple threads except after migrating a socket from one thread to
-another with a "full fence" memory barrier.
-
-Following are the thread safe sockets:
-* ZMQ_CLIENT
-* ZMQ_SERVER
-* ZMQ_DISH
-* ZMQ_RADIO
-* ZMQ_SCATTER
-* ZMQ_GATHER
-* ZMQ_PEER
-* ZMQ_CHANNEL
-
-.Socket types
-The following sections present the socket types defined by 0MQ, grouped by the
-general _messaging pattern_ which is built from related socket types.
-
-
-Client-server pattern
-~~~~~~~~~~~~~~~~~~~~~
-
-The client-server pattern is used to allow a single 'ZMQ_SERVER' _server_ talk
-to one or more 'ZMQ_CLIENT' _clients_. The client always starts the conversation,
-after which either peer can send messages asynchronously, to the other.
-
-The client-server pattern is formally defined by http://rfc.zeromq.org/spec:41.
-
-NOTE: Server-client is still in draft phase.
-
-ZMQ_CLIENT
-^^^^^^^^^^
-A 'ZMQ_CLIENT' socket talks to a 'ZMQ_SERVER' socket. Either peer can connect,
-though the usual and recommended model is to bind the 'ZMQ_SERVER' and connect
-the 'ZMQ_CLIENT'.
-
-If the 'ZMQ_CLIENT' socket has established a connection, linkzmq:zmq_send[3]
-will accept messages, queue them, and send them as rapidly as the network
-allows. The outgoing buffer limit is defined by the high water mark for the
-socket. If the outgoing buffer is full, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there is no connected peer,
-linkzmq:zmq_send[3] will block.
-The 'ZMQ_CLIENT' socket will not drop messages.
-
-When a 'ZMQ_CLIENT' socket is connected to multiple 'ZMQ_SERVER' sockets,
-outgoing messages are distributed between connected peers on a round-robin
-basis. Likewise, the 'ZMQ_CLIENT' socket receives messages fairly from each
-connected peer. This usage is sensible only for stateless protocols.
-
-'ZMQ_CLIENT' sockets are threadsafe and can be used from multiple threads
-at the same time. Note that replies from a 'ZMQ_SERVER' socket will go to
-the first client thread that calls linkzmq:zmq_msg_recv[3]. If you need to get
-replies back to the originating thread, use one 'ZMQ_CLIENT' socket per
-thread.
-
-NOTE: 'ZMQ_CLIENT' sockets are threadsafe. They do not accept the ZMQ_SNDMORE
-option on sends not ZMQ_RCVMORE on receives. This limits them to single part
-data. The intention is to extend the API to allow scatter/gather of multi-part
-data.
-
-[horizontal]
-.Summary of ZMQ_CLIENT characteristics
-Compatible peer sockets:: 'ZMQ_SERVER'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: Round-robin
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Block
-
-
-ZMQ_SERVER
-^^^^^^^^^^
-A 'ZMQ_SERVER' socket talks to a set of 'ZMQ_CLIENT' sockets. A 'ZMQ_SERVER'
-socket can only reply to an incoming message: the 'ZMQ_CLIENT' peer must
-always initiate a conversation.
-
-Each received message has a 'routing_id' that is a 32-bit unsigned integer.
-The application can fetch this with linkzmq:zmq_msg_routing_id[3]. To send
-a message to a given 'ZMQ_CLIENT' peer the application must set the peer's
-'routing_id' on the message, using linkzmq:zmq_msg_set_routing_id[3].
-
-If the 'routing_id' is not specified, or does not refer to a connected client
-peer, the send call will fail with EHOSTUNREACH. If the outgoing buffer for
-the client peer is full, the send call shall block, unless ZMQ_DONTWAIT is
-used in the send, in which case it shall fail with EAGAIN. The 'ZMQ_SERVER'
-socket shall not drop messages in any case.
-
-NOTE: 'ZMQ_SERVER' sockets are threadsafe. They do not accept the ZMQ_SNDMORE
-option on sends not ZMQ_RCVMORE on receives. This limits them to single part
-data. The intention is to extend the API to allow scatter/gather of multi-part
-data.
-
-[horizontal]
-.Summary of ZMQ_SERVER characteristics
-Compatible peer sockets:: 'ZMQ_CLIENT'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: See text
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Return EAGAIN
-
-
-Radio-dish pattern
-~~~~~~~~~~~~~~~~~~
-
-The radio-dish pattern is used for one-to-many distribution of data from
-a single _publisher_ to multiple _subscribers_ in a fan out fashion.
-
-Radio-dish is using groups (vs Pub-sub topics), Dish sockets can join a group
-and each message sent by Radio sockets belong to a group.
-
-Groups are null terminated strings limited to 16 chars length (including null).
-The intention is to increase the length to 40 chars (including null).
-The encoding of groups shall be UTF8.
-
-Groups are matched using exact matching (vs prefix matching of PubSub).
-
-NOTE: Radio-dish is still in draft phase.
-
-ZMQ_RADIO
-^^^^^^^
-A socket of type 'ZMQ_RADIO' is used by a _publisher_ to distribute data.
-Each message belong to a group, a group is specified with linkzmq:zmq_msg_set_group[3].
-Messages are distributed to all members of a group.
-The linkzmq:zmq_recv[3] function is not implemented for this socket type.
-
-When a 'ZMQ_RADIO' socket enters the 'mute' state due to having reached the
-high water mark for a _subscriber_, then any messages that would be sent to the
-_subscriber_ in question shall instead be dropped until the mute state
-ends. The _zmq_send()_ function shall never block for this socket type.
-
-NOTE: 'ZMQ_RADIO' sockets are threadsafe. They do not accept the ZMQ_SNDMORE
-option on sends. This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_RADIO characteristics
-Compatible peer sockets:: 'ZMQ_DISH'
-Direction:: Unidirectional
-Send/receive pattern:: Send only
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Fan out
-Action in mute state:: Drop
-
-
-ZMQ_DISH
-^^^^^^^^
-A socket of type 'ZMQ_DISH' is used by a _subscriber_ to subscribe to groups
-distributed by a _radio_. Initially a 'ZMQ_DISH' socket is not subscribed to
-any groups, use linkzmq:zmq_join[3] to
-join a group.
-To get the group the message belong to call linkzmq:zmq_msg_group[3].
-The _zmq_send()_ function is not implemented for this socket type.
-
-NOTE: 'ZMQ_DISH' sockets are threadsafe. They do not accept ZMQ_RCVMORE on receives.
-This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_DISH characteristics
-Compatible peer sockets:: 'ZMQ_RADIO'
-Direction:: Unidirectional
-Send/receive pattern:: Receive only
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-
-
-Publish-subscribe pattern
-~~~~~~~~~~~~~~~~~~~~~~~~~
-The publish-subscribe pattern is used for one-to-many distribution of data from
-a single _publisher_ to multiple _subscribers_ in a fan out fashion.
-
-The publish-subscribe pattern is formally defined by http://rfc.zeromq.org/spec:29.
-
-ZMQ_PUB
-^^^^^^^
-A socket of type 'ZMQ_PUB' is used by a _publisher_ to distribute data.
-Messages sent are distributed in a fan out fashion to all connected peers.
-The linkzmq:zmq_recv[3] function is not implemented for this socket type.
-
-When a 'ZMQ_PUB' socket enters the 'mute' state due to having reached the
-high water mark for a _subscriber_, then any messages that would be sent to the
-_subscriber_ in question shall instead be dropped until the mute state
-ends. The _zmq_send()_ function shall never block for this socket type.
-
-[horizontal]
-.Summary of ZMQ_PUB characteristics
-Compatible peer sockets:: 'ZMQ_SUB', 'ZMQ_XSUB'
-Direction:: Unidirectional
-Send/receive pattern:: Send only
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Fan out
-Action in mute state:: Drop
-
-
-ZMQ_SUB
-^^^^^^^
-A socket of type 'ZMQ_SUB' is used by a _subscriber_ to subscribe to data
-distributed by a _publisher_. Initially a 'ZMQ_SUB' socket is not subscribed to
-any messages, use the 'ZMQ_SUBSCRIBE' option of linkzmq:zmq_setsockopt[3] to
-specify which messages to subscribe to. The _zmq_send()_ function is not
-implemented for this socket type.
-
-[horizontal]
-.Summary of ZMQ_SUB characteristics
-Compatible peer sockets:: 'ZMQ_PUB', 'ZMQ_XPUB'
-Direction:: Unidirectional
-Send/receive pattern:: Receive only
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-
-
-ZMQ_XPUB
-^^^^^^^^
-Same as ZMQ_PUB except that you can receive subscriptions from the peers
-in form of incoming messages. Subscription message is a byte 1 (for
-subscriptions) or byte 0 (for unsubscriptions) followed by the subscription
-body. Messages without a sub/unsub prefix are also received, but have no
-effect on subscription status.
-
-[horizontal]
-.Summary of ZMQ_XPUB characteristics
-Compatible peer sockets:: 'ZMQ_SUB', 'ZMQ_XSUB'
-Direction:: Unidirectional
-Send/receive pattern:: Send messages, receive subscriptions
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Fan out
-Action in mute state:: Drop
-
-
-ZMQ_XSUB
-^^^^^^^^
-Same as ZMQ_SUB except that you subscribe by sending subscription messages to
-the socket. Subscription message is a byte 1 (for subscriptions) or byte 0
-(for unsubscriptions) followed by the subscription body. Messages without a
-sub/unsub prefix may also be sent, but have no effect on subscription status.
-
-[horizontal]
-.Summary of ZMQ_XSUB characteristics
-Compatible peer sockets:: 'ZMQ_PUB', 'ZMQ_XPUB'
-Direction:: Unidirectional
-Send/receive pattern:: Receive messages, send subscriptions
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-Action in mute state:: Drop
-
-
-Pipeline pattern
-~~~~~~~~~~~~~~~~
-The pipeline pattern is used for distributing data to _nodes_ arranged in
-a pipeline. Data always flows down the pipeline, and each stage of the pipeline
-is connected to at least one _node_. When a pipeline stage is connected to
-multiple _nodes_ data is round-robined among all connected _nodes_.
-
-The pipeline pattern is formally defined by http://rfc.zeromq.org/spec:30.
-
-ZMQ_PUSH
-^^^^^^^^
-A socket of type 'ZMQ_PUSH' is used by a pipeline _node_ to send messages
-to downstream pipeline _nodes_. Messages are round-robined to all connected
-downstream _nodes_. The _zmq_recv()_ function is not implemented for this
-socket type.
-
-When a 'ZMQ_PUSH' socket enters the 'mute' state due to having reached the
-high water mark for all downstream _nodes_, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there are no downstream _nodes_ at all,
-then any linkzmq:zmq_send[3] operations on the socket shall block until the mute
-state ends or at least one downstream _node_ becomes available for sending;
-messages are not discarded.
-
-[horizontal]
-.Summary of ZMQ_PUSH characteristics
-Compatible peer sockets:: 'ZMQ_PULL'
-Direction:: Unidirectional
-Send/receive pattern:: Send only
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Round-robin
-Action in mute state:: Block
-
-
-ZMQ_PULL
-^^^^^^^^
-A socket of type 'ZMQ_PULL' is used by a pipeline _node_ to receive messages
-from upstream pipeline _nodes_. Messages are fair-queued from among all
-connected upstream _nodes_. The _zmq_send()_ function is not implemented for
-this socket type.
-
-[horizontal]
-.Summary of ZMQ_PULL characteristics
-Compatible peer sockets:: 'ZMQ_PUSH'
-Direction:: Unidirectional
-Send/receive pattern:: Receive only
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-Action in mute state:: Block
-
-Scatter-gather pattern
-~~~~~~~~~~~~~~~~
-The scatter-gather pattern is the thread-safe version of the pipeline pattern.
-The scatter-gather pattern is used for distributing data to _nodes_ arranged in
-a pipeline. Data always flows down the pipeline, and each stage of the pipeline
-is connected to at least one _node_. When a pipeline stage is connected to
-multiple _nodes_ data is round-robined among all connected _nodes_.
-
-ZMQ_SCATTER
-^^^^^^^^
-A socket of type 'ZMQ_SCATTER' is used by a scatter-gather _node_ to send messages
-to downstream scatter-gather _nodes_. Messages are round-robined to all connected
-downstream _nodes_. The _zmq_recv()_ function is not implemented for this
-socket type.
-
-When a 'ZMQ_SCATTER' socket enters the 'mute' state due to having reached the
-high water mark for all downstream _nodes_, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there are no downstream _nodes_ at all,
-then any linkzmq:zmq_send[3] operations on the socket shall block until the mute
-state ends or at least one downstream _node_ becomes available for sending;
-messages are not discarded.
-
-NOTE: 'ZMQ_SCATTER' sockets are threadsafe. They do not accept ZMQ_RCVMORE on receives.
-This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_SCATTER characteristics
-Compatible peer sockets:: 'ZMQ_SCATTER'
-Direction:: Unidirectional
-Send/receive pattern:: Send only
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Round-robin
-Action in mute state:: Block
-
-
-ZMQ_GATHER
-^^^^^^^^
-A socket of type 'ZMQ_GATHER' is used by a scatter-gather _node_ to receive messages
-from upstream scatter-gather _nodes_. Messages are fair-queued from among all
-connected upstream _nodes_. The _zmq_send()_ function is not implemented for
-this socket type.
-
-NOTE: 'ZMQ_GATHER' sockets are threadsafe. They do not accept ZMQ_RCVMORE on receives.
-This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_GATHER characteristics
-Compatible peer sockets:: 'ZMQ_GATHER'
-Direction:: Unidirectional
-Send/receive pattern:: Receive only
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-Action in mute state:: Block
-
-
-Exclusive pair pattern
-~~~~~~~~~~~~~~~~~~~~~~
-The exclusive pair pattern is used to connect a peer to precisely one other
-peer. This pattern is used for inter-thread communication across the inproc
-transport.
-
-The exclusive pair pattern is formally defined by http://rfc.zeromq.org/spec:31.
-
-ZMQ_PAIR
-^^^^^^^^
-A socket of type 'ZMQ_PAIR' can only be connected to a single peer at any one
-time.  No message routing or filtering is performed on messages sent over a
-'ZMQ_PAIR' socket.
-
-When a 'ZMQ_PAIR' socket enters the 'mute' state due to having reached the
-high water mark for the connected peer, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there is no connected peer, then
-any linkzmq:zmq_send[3] operations on the socket shall block until the peer
-becomes available for sending; messages are not discarded.
-
-While 'ZMQ_PAIR' sockets can be used over transports other than linkzmq:zmq_inproc[7],
-their inability to auto-reconnect coupled with the fact new incoming connections will
-be terminated while any previous connections (including ones in a closing state)
-exist makes them unsuitable for TCP in most cases.
-
-NOTE: 'ZMQ_PAIR' sockets are designed for inter-thread communication across
-the linkzmq:zmq_inproc[7] transport and do not implement functionality such
-as auto-reconnection.
-
-[horizontal]
-.Summary of ZMQ_PAIR characteristics
-Compatible peer sockets:: 'ZMQ_PAIR'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: N/A
-Action in mute state:: Block
-
-
-Peer-to-peer pattern
-~~~~~~~~~~~~~~~~~~~~~~
-
-The peer-to-peer pattern is used to connect a peer to multiple peers.
-Peer can both connect and bind and mix both of them with the same socket.
-The peer-to-peer pattern is useful to build peer-to-peer networks (e.g zyre, bitcoin, torrent)
-where a peer can both accept connections from other peers or connect to them.
-
-NOTE: Peer-to-peer is still in draft phase.
-
-ZMQ_PEER
-^^^^^^^^
-A 'ZMQ_PEER' socket talks to a set of 'ZMQ_PEER' sockets.
-
-To connect and fetch the 'routing_id' of the peer use linkzmq:zmq_connect_peer[3].
-
-Each received message has a 'routing_id' that is a 32-bit unsigned integer.
-The application can fetch this with linkzmq:zmq_msg_routing_id[3].
-
-To send a message to a given 'ZMQ_PEER' peer the application must set the peer's
-'routing_id' on the message, using linkzmq:zmq_msg_set_routing_id[3].
-
-If the 'routing_id' is not specified, or does not refer to a connected client
-peer, the send call will fail with EHOSTUNREACH. If the outgoing buffer for
-the peer is full, the send call shall block, unless ZMQ_DONTWAIT is
-used in the send, in which case it shall fail with EAGAIN. The 'ZMQ_PEER'
-socket shall not drop messages in any case.
-
-NOTE: 'ZMQ_PEER' sockets are threadsafe. They do not accept the ZMQ_SNDMORE
-option on sends not ZMQ_RCVMORE on receives. This limits them to single part
-data.
-
-[horizontal]
-.Summary of ZMQ_PEER characteristics
-Compatible peer sockets:: 'ZMQ_PEER'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: See text
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Return EAGAIN
-
-Channel pattern
-~~~~~~~~~~~~~~~~~~~~~~
-The channel pattern is the thread-safe version of the exclusive pair pattern.
-The channel pattern is used to connect a peer to precisely one other
-peer. This pattern is used for inter-thread communication across the inproc
-transport.
-
-NOTE: Channel is still in draft phase.
-
-ZMQ_CHANNEL
-^^^^^^^^
-A socket of type 'ZMQ_CHANNEL' can only be connected to a single peer at any one
-time.  No message routing or filtering is performed on messages sent over a
-'ZMQ_CHANNEL' socket.
-
-When a 'ZMQ_CHANNEL' socket enters the 'mute' state due to having reached the
-high water mark for the connected peer, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there is no connected peer, then
-any linkzmq:zmq_send[3] operations on the socket shall block until the peer
-becomes available for sending; messages are not discarded.
-
-While 'ZMQ_CHANNEL' sockets can be used over transports other than linkzmq:zmq_inproc[7],
-their inability to auto-reconnect coupled with the fact new incoming connections will
-be terminated while any previous connections (including ones in a closing state)
-exist makes them unsuitable for TCP in most cases.
-
-NOTE: 'ZMQ_CHANNEL' sockets are designed for inter-thread communication across
-the linkzmq:zmq_inproc[7] transport and do not implement functionality such
-as auto-reconnection.
-
-NOTE: 'ZMQ_CHANNEL' sockets are threadsafe. They do not accept ZMQ_RCVMORE on receives.
-This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_CHANNEL characteristics
-Compatible peer sockets:: 'ZMQ_CHANNEL'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: N/A
-Action in mute state:: Block
-
-Native Pattern
-~~~~~~~~~~~~~~
-The native pattern is used for communicating with TCP peers and allows
-asynchronous requests and replies in either direction.
-
-
-ZMQ_STREAM
-^^^^^^^^^^
-A socket of type 'ZMQ_STREAM' is used to send and receive TCP data from a
-non-0MQ peer, when using the tcp:// transport. A 'ZMQ_STREAM' socket can
-act as client and/or server, sending and/or receiving TCP data asynchronously.
-
-When receiving TCP data, a 'ZMQ_STREAM' socket shall prepend a message part
-containing the _routing id_ of the originating peer to the message before passing
-it to the application. Messages received are fair-queued from among all
-connected peers.
-
-When sending TCP data, a 'ZMQ_STREAM' socket shall remove the first part of the
-message and use it to determine the _routing id_ of the peer the message shall be
-routed to, and unroutable messages shall cause an EHOSTUNREACH or EAGAIN error.
-
-To open a connection to a server, use the zmq_connect call, and then fetch the
-socket routing id using the zmq_getsockopt call with the ZMQ_ROUTING_ID option.
-
-To close a specific connection, send the routing id frame followed by a
-zero-length message (see EXAMPLE section).
-
-When a connection is made, a zero-length message will be received by the
-application.  Similarly, when the peer disconnects (or the connection is lost),
-a zero-length message will be received by the application.
-
-You must send one routing id frame followed by one data frame. The ZMQ_SNDMORE
-flag is required for routing id frames but is ignored on data frames.
-
-[horizontal]
-.Summary of ZMQ_STREAM characteristics
-Compatible peer sockets:: none.
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: See text
-Incoming routing strategy:: Fair-queued
-Action in mute state:: EAGAIN
-
-
-Request-reply pattern
-~~~~~~~~~~~~~~~~~~~~~
-The request-reply pattern is used for sending requests from a ZMQ_REQ _client_
-to one or more ZMQ_REP _services_, and receiving subsequent replies to each
-request sent.
-
-The request-reply pattern is formally defined by http://rfc.zeromq.org/spec:28.
-
-ZMQ_REQ
-^^^^^^^
-A socket of type 'ZMQ_REQ' is used by a _client_ to send requests to and
-receive replies from a _service_. This socket type allows only an alternating
-sequence of _zmq_send(request)_ and subsequent _zmq_recv(reply)_ calls. Each
-request sent is round-robined among all _services_, and each reply received is
-matched with the last issued request.
-
-For connection-oriented transports, If the ZMQ_IMMEDIATE option is set and there
-is no service available, then any send operation on the socket shall block until
-at least one _service_ becomes available. The REQ socket shall not discard messages.
-
-[horizontal]
-.Summary of ZMQ_REQ characteristics
-Compatible peer sockets:: 'ZMQ_REP', 'ZMQ_ROUTER'
-Direction:: Bidirectional
-Send/receive pattern:: Send, Receive, Send, Receive, ...
-Outgoing routing strategy:: Round-robin
-Incoming routing strategy:: Last peer
-Action in mute state:: Block
-
-
-ZMQ_REP
-^^^^^^^
-A socket of type 'ZMQ_REP' is used by a _service_ to receive requests from and
-send replies to a _client_. This socket type allows only an alternating
-sequence of _zmq_recv(request)_ and subsequent _zmq_send(reply)_ calls. Each
-request received is fair-queued from among all _clients_, and each reply sent
-is routed to the _client_ that issued the last request. If the original
-requester does not exist any more the reply is silently discarded.
-
-[horizontal]
-.Summary of ZMQ_REP characteristics
-Compatible peer sockets:: 'ZMQ_REQ', 'ZMQ_DEALER'
-Direction:: Bidirectional
-Send/receive pattern:: Receive, Send, Receive, Send, ...
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: Last peer
-
-
-ZMQ_DEALER
-^^^^^^^^^^
-A socket of type 'ZMQ_DEALER' is an advanced pattern used for extending
-request/reply sockets. Each message sent is round-robined among all connected
-peers, and each message received is fair-queued from all connected peers.
-
-When a 'ZMQ_DEALER' socket enters the 'mute' state due to having reached the
-high water mark for all peers, or, for connection-oriented transports, if the
-ZMQ_IMMEDIATE option is set and there are no peers at all, then any
-linkzmq:zmq_send[3] operations on the socket shall block until the mute state
-ends or at least one peer becomes available for sending; messages are not discarded.
-
-When a 'ZMQ_DEALER' socket is connected to a 'ZMQ_REP' socket each message sent
-must consist of an empty message part, the _delimiter_, followed by one or more
-_body parts_.
-
-[horizontal]
-.Summary of ZMQ_DEALER characteristics
-Compatible peer sockets:: 'ZMQ_ROUTER', 'ZMQ_REP', 'ZMQ_DEALER'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: Round-robin
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Block
-
-
-ZMQ_ROUTER
-^^^^^^^^^^
-A socket of type 'ZMQ_ROUTER' is an advanced socket type used for extending
-request/reply sockets. When receiving messages a 'ZMQ_ROUTER' socket shall
-prepend a message part containing the _routing id_ of the originating peer to the
-message before passing it to the application. Messages received are fair-queued
-from among all connected peers. When sending messages a 'ZMQ_ROUTER' socket shall
-remove the first part of the message and use it to determine the _routing id _ of
-the peer the message shall be routed to. If the peer does not exist anymore, or
-has never existed, the message shall be silently discarded. However, if
-'ZMQ_ROUTER_MANDATORY' socket option is set to '1', the socket shall fail
-with EHOSTUNREACH in both cases.
-
-When a 'ZMQ_ROUTER' socket enters the 'mute' state due to having reached the
-high water mark for all peers, then any messages sent to the socket shall be dropped
-until the mute state ends. Likewise, any messages routed to a peer for which
-the individual high water mark has been reached shall also be dropped. If,
-'ZMQ_ROUTER_MANDATORY' is set to '1', the socket shall block or return EAGAIN in
-both cases.
-
-When a 'ZMQ_ROUTER' socket has 'ZMQ_ROUTER_MANDATORY' flag set to '1', the
-socket shall generate 'ZMQ_POLLIN' events upon reception of messages from one
-or more peers. Likewise, the socket shall generate 'ZMQ_POLLOUT' events when
-at least one message can be sent to one or more peers.
-
-When a 'ZMQ_REQ' socket is connected to a 'ZMQ_ROUTER' socket, in addition to the
-_routing id_ of the originating peer each message received shall contain an empty
-_delimiter_ message part. Hence, the entire structure of each received message
-as seen by the application becomes: one or more _routing id_ parts, _delimiter_
-part, one or more _body parts_. When sending replies to a 'ZMQ_REQ' socket the
-application must include the _delimiter_ part.
-
-[horizontal]
-.Summary of ZMQ_ROUTER characteristics
-Compatible peer sockets:: 'ZMQ_DEALER', 'ZMQ_REQ', 'ZMQ_ROUTER'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: See text
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Drop (see text)
-
-
-RETURN VALUE
-------------
-The _zmq_socket()_ function shall return an opaque handle to the newly created
-socket if successful. Otherwise, it shall return NULL and set 'errno' to one of
-the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested socket 'type' is invalid.
-*EFAULT*::
-The provided 'context' is invalid.
-*EMFILE*::
-The limit on the total number of open 0MQ sockets has been reached.
-*ETERM*::
-The context specified was shutdown or terminated.
-
-EXAMPLE
--------
-.Creating a simple HTTP server using ZMQ_STREAM
-----
-void *ctx = zmq_ctx_new ();
-assert (ctx);
-/* Create ZMQ_STREAM socket */
-void *socket = zmq_socket (ctx, ZMQ_STREAM);
-assert (socket);
-int rc = zmq_bind (socket, "tcp://*:8080");
-assert (rc == 0);
-/* Data structure to hold the ZMQ_STREAM routing id */
-uint8_t routing_id [256];
-size_t routing_id_size = 256;
-/* Data structure to hold the ZMQ_STREAM received data */
-uint8_t raw [256];
-size_t raw_size = 256;
-while (1) {
-	/*  Get HTTP request; routing id frame and then request */
-	routing_id_size = zmq_recv (socket, routing_id, 256, 0);
-	assert (routing_id_size > 0);
-	do {
-		raw_size = zmq_recv (socket, raw, 256, 0);
-		assert (raw_size >= 0);
-	} while (raw_size == 256);
-	/* Prepares the response */
-	char http_response [] =
-		"HTTP/1.0 200 OK\r\n"
-		"Content-Type: text/plain\r\n"
-		"\r\n"
-		"Hello, World!";
-	/* Sends the routing id frame followed by the response */
-	zmq_send (socket, routing_id, routing_id_size, ZMQ_SNDMORE);
-	zmq_send (socket, http_response, strlen (http_response), 0);
-	/* Closes the connection by sending the routing id frame followed by a zero response */
-	zmq_send (socket, routing_id, routing_id_size, ZMQ_SNDMORE);
-	zmq_send (socket, 0, 0, 0);
-}
-zmq_close (socket);
-zmq_ctx_destroy (ctx);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_init[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_socket_monitor.txt b/doc/zmq_socket_monitor.txt
deleted file mode 100644
index 46a97cc10..000000000
--- a/doc/zmq_socket_monitor.txt
+++ /dev/null
@@ -1,296 +0,0 @@
-zmq_socket_monitor(3)
-=====================
-
-
-NAME
-----
-
-zmq_socket_monitor - monitor socket events
-
-
-SYNOPSIS
---------
-*int zmq_socket_monitor (void '*socket', char '*endpoint', int 'events');*
-
-
-DESCRIPTION
------------
-The _zmq_socket_monitor()_ method lets an application thread track
-socket events (like connects) on a ZeroMQ socket. Each call to this
-method creates a 'ZMQ_PAIR' socket and binds that to the specified
-inproc:// 'endpoint'. To collect the socket events, you must create
-your own 'ZMQ_PAIR' socket, and connect that to the endpoint.
-
-Note that there is also a DRAFT function linkzmq:zmq_socket_monitor_versioned[3],
-which allows to subscribe to events that provide more information.
-Calling zmq_socket_monitor is equivalent to calling 'zmq_socket_monitor_versioned'
-with the 'event_version' parameter set to 1, with the exception of error cases.
-
-The 'events' argument is a bitmask of the socket events you wish to
-monitor, see 'Supported events' below. To monitor all events, use the
-event value ZMQ_EVENT_ALL. NOTE: as new events are added, the catch-all
-value will start returning them. An application that relies on a strict
-and fixed sequence of events must not use ZMQ_EVENT_ALL in order to
-guarantee compatibility with future versions.
-
-Each event is sent as two frames. The first frame contains an event
-number (16 bits), and an event value (32 bits) that provides additional
-data according to the event number. The second frame contains a string
-that specifies the affected endpoint.
-
-----
-The _zmq_socket_monitor()_ method supports only connection-oriented
-transports, that is, TCP, IPC, and TIPC.
-----
-
-Supported events
-----------------
-
-ZMQ_EVENT_CONNECTED
-~~~~~~~~~~~~~~~~~~~
-The socket has successfully connected to a remote peer. The event value
-is the file descriptor (FD) of the underlying network socket. Warning:
-there is no guarantee that the FD is still valid by the time your code
-receives this event.
-
-ZMQ_EVENT_CONNECT_DELAYED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-A connect request on the socket is pending. The event value is unspecified.
-
-ZMQ_EVENT_CONNECT_RETRIED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-A connect request failed, and is now being retried. The event value is the
-reconnect interval in milliseconds. Note that the reconnect interval is
-recalculated at each retry.
-
-ZMQ_EVENT_LISTENING
-~~~~~~~~~~~~~~~~~~~
-The socket was successfully bound to a network interface. The event value
-is the FD of the underlying network socket. Warning: there is no guarantee
-that the FD is still valid by the time your code receives this event.
-
-ZMQ_EVENT_BIND_FAILED
-~~~~~~~~~~~~~~~~~~~~~
-The socket could not bind to a given interface. The event value is the
-errno generated by the system bind call.
-
-ZMQ_EVENT_ACCEPTED
-~~~~~~~~~~~~~~~~~~
-The socket has accepted a connection from a remote peer. The event value is
-the FD of the underlying network socket. Warning: there is no guarantee that
-the FD is still valid by the time your code receives this event.
-
-ZMQ_EVENT_ACCEPT_FAILED
-~~~~~~~~~~~~~~~~~~~~~~~
-The socket has rejected a connection from a remote peer. The event value is
-the errno generated by the accept call.
-
-ZMQ_EVENT_CLOSED
-~~~~~~~~~~~~~~~~
-The socket was closed. The event value is the FD of the (now closed) network
-socket.
-
-ZMQ_EVENT_CLOSE_FAILED
-~~~~~~~~~~~~~~~~~~~~~~
-The socket close failed. The event value is the errno returned by the system
-call. Note that this event occurs only on IPC transports.
-
-ZMQ_EVENT_DISCONNECTED
-~~~~~~~~~~~~~~~~~~~~~~
-The socket was disconnected unexpectedly. The event value is the FD of the
-underlying network socket. Warning: this socket will be closed.
-
-ZMQ_EVENT_MONITOR_STOPPED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-Monitoring on this socket ended.
-
-ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Unspecified error during handshake.
-The event value is an errno.
-
-ZMQ_EVENT_HANDSHAKE_SUCCEEDED
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake succeeded.
-The event value is unspecified.
-
-ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake failed due to some mechanism protocol
-error, either between the ZMTP mechanism peers, or between the mechanism
-server and the ZAP handler. This indicates a configuration or implementation
-error in either peer resp. the ZAP handler.
-The event value is one of the ZMQ_PROTOCOL_ERROR_* values:
-ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND
-ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE
-ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME
-ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA
-ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC
-ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH
-ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY
-ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID
-ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION
-ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE
-ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA
-
-ZMQ_EVENT_HANDSHAKE_FAILED_AUTH
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake failed due to an authentication failure.
-The event value is the status code returned by the ZAP handler (i.e. 300,
-400 or 500).
-
-
-
-RETURN VALUE
-------------
-The _zmq_socket_monitor()_ function returns a value of 0 or greater if
-successful. Otherwise it returns `-1` and sets 'errno' to one of the values
-defined below.
-
-
-ERRORS
-------
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-
-*EPROTONOSUPPORT*::
-The requested 'transport' protocol is not supported. Monitor sockets are
-required to use the inproc:// transport.
-
-*EINVAL*::
-The endpoint supplied is invalid.
-
-EXAMPLE
--------
-.Monitoring client and server sockets
-----
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-
-static int
-get_monitor_event (void *monitor, int *value, char **address)
-{
-    //  First frame in message contains event number and value
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (zmq_msg_more (&msg));
-
-    uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-    uint16_t event = *(uint16_t *) (data);
-    if (value)
-        *value = *(uint32_t *) (data + 2);
-
-    //  Second frame in message contains event address
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (!zmq_msg_more (&msg));
-
-    if (address) {
-        uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-        size_t size = zmq_msg_size (&msg);
-        *address = (char *) malloc (size + 1);
-        memcpy (*address, data, size);
-        (*address)[size] = 0;
-    }
-    return event;
-}
-
-int main (void)
-{
-    void *ctx = zmq_ctx_new ();
-    assert (ctx);
-
-    //  We'll monitor these two sockets
-    void *client = zmq_socket (ctx, ZMQ_DEALER);
-    assert (client);
-    void *server = zmq_socket (ctx, ZMQ_DEALER);
-    assert (server);
-
-    //  Socket monitoring only works over inproc://
-    int rc = zmq_socket_monitor (client, "tcp://127.0.0.1:9999", 0);
-    assert (rc == -1);
-    assert (zmq_errno () == EPROTONOSUPPORT);
-
-    //  Monitor all events on client and server sockets
-    rc = zmq_socket_monitor (client, "inproc://monitor-client", ZMQ_EVENT_ALL);
-    assert (rc == 0);
-    rc = zmq_socket_monitor (server, "inproc://monitor-server", ZMQ_EVENT_ALL);
-    assert (rc == 0);
-
-    //  Create two sockets for collecting monitor events
-    void *client_mon = zmq_socket (ctx, ZMQ_PAIR);
-    assert (client_mon);
-    void *server_mon = zmq_socket (ctx, ZMQ_PAIR);
-    assert (server_mon);
-
-    //  Connect these to the inproc endpoints so they'll get events
-    rc = zmq_connect (client_mon, "inproc://monitor-client");
-    assert (rc == 0);
-    rc = zmq_connect (server_mon, "inproc://monitor-server");
-    assert (rc == 0);
-
-    //  Now do a basic ping test
-    rc = zmq_bind (server, "tcp://127.0.0.1:9998");
-    assert (rc == 0);
-    rc = zmq_connect (client, "tcp://127.0.0.1:9998");
-    assert (rc == 0);
-    bounce (client, server);
-
-    //  Close client and server
-    close_zero_linger (client);
-    close_zero_linger (server);
-
-    //  Now collect and check events from both sockets
-    int event = get_monitor_event (client_mon, NULL, NULL);
-    if (event == ZMQ_EVENT_CONNECT_DELAYED)
-        event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_CONNECTED);
-    event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-    event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_MONITOR_STOPPED);
-
-    //  This is the flow of server events
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_LISTENING);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_ACCEPTED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_CLOSED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_MONITOR_STOPPED);
-
-    //  Close down the sockets
-    close_zero_linger (client_mon);
-    close_zero_linger (server_mon);
-    zmq_ctx_term (ctx);
-
-    return 0 ;
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_socket_monitor_versioned.txt b/doc/zmq_socket_monitor_versioned.txt
deleted file mode 100644
index 5339f404a..000000000
--- a/doc/zmq_socket_monitor_versioned.txt
+++ /dev/null
@@ -1,396 +0,0 @@
-zmq_socket_monitor_versioned(3)
-===============================
-
-
-NAME
-----
-
-zmq_socket_monitor_versioned - monitor socket events
-
-
-SYNOPSIS
---------
-*int zmq_socket_monitor_versioned (void '*socket', char '*endpoint', uint64_t 'events', int 'event_version', int 'type');*
-
-*int zmq_socket_monitor_pipes_stats (void '*socket');*
-
-
-DESCRIPTION
------------
-The _zmq_socket_monitor_versioned()_ method lets an application thread track
-socket events (like connects) on a ZeroMQ socket. Each call to this
-method creates a 'ZMQ_PAIR' socket and binds that to the specified
-inproc:// 'endpoint'. To collect the socket events, you must create
-your own 'ZMQ_PAIR' socket, and connect that to the endpoint.
-
-The 'events' argument is a bitmask of the socket events you wish to
-monitor, see 'Supported events' below. To monitor all events for a version, use
-the event value ZMQ_EVENT_ALL_V<version>, e.g. ZMQ_EVENT_ALL_V1. For non-DRAFT event
-versions, this value will not change in the future, so new event types will only be
-added in new versions (note that this is a change over zmq_socket_monitor and the
-unversioned ZMQ_EVENT_ALL).
-
-Note that event_version 2 is currently in DRAFT mode. The protocol may be
-changed at any time for event_versions in DRAFT.
-
-ZMQ_CURRENT_EVENT_VERSION and ZMQ_CURRENT_EVENT_VERSION_DRAFT are always defined
-to the most recent stable or DRAFT event version, which are currently 1 resp. 2
-
-This page describes the protocol for 'event_version' 2 only. For the protocol
-used with 'event_version' 1, please refer to linkzmq:zmq_socket_monitor[3].
-
-Each event is sent in multiple frames. The first frame contains an event
-number (64 bits). The number and content of further frames depend on this
-event number.
-
-Unless it is specified differently, the second frame contains the number of
-value frames that will follow it as a 64 bits integer. The third frame to N-th
-frames contain an event value (64 bits) that provides additional data according
-to the event number. Each event type might have a different number of values.
-The second-to-last and last frames contain strings that specifies the affected
-connection or endpoint. The former frame contains a string denoting the local
-endpoint, while the latter frame contains a string denoting the remote endpoint.
-Either of these may be empty, depending on the event type and whether the
-connection uses a bound or connected local endpoint.
-
-Note that the format of the second and further frames, and also the number of
-frames, may be different for events added in the future.
-
-The 'type' argument is used to specify the type of the monitoring socket.
-Supported types are 'ZMQ_PAIR', 'ZMQ_PUB' and 'ZMQ_PUSH'. Note that consumers
-of the events will have to be compatible with the socket type, for instance a
-monitoring socket of type 'ZMQ_PUB' will require consumers of type 'ZMQ_SUB'.
-In the case that the monitoring socket type is of 'ZMQ_PUB', the multipart
-message topic is the event number, thus consumers should subscribe to the
-events they want to receive.
-
-The _zmq_socket_monitor_pipes_stats()_ method triggers an event of type
-ZMQ_EVENT_PIPES_STATS for each connected peer of the monitored socket.
-NOTE: _zmq_socket_monitor_pipes_stats()_ is in DRAFT state.
-
-----
-Monitoring events are only generated by some transports: At the moment these
-are SOCKS, TCP, IPC, and TIPC. Note that it is not an error to call
-'zmq_socket_monitor_versioned' on a socket that is connected or bound to some
-other transport, as this may not be known at the time
-'zmq_socket_monitor_versioned' is called. Also, a socket can be connected/bound
-to multiple endpoints using different transports.
-
-----
-
-Supported events (v1)
-----------------
-
-ZMQ_EVENT_CONNECTED
-~~~~~~~~~~~~~~~~~~~
-The socket has successfully connected to a remote peer. The event value
-is the file descriptor (FD) of the underlying network socket. Warning:
-there is no guarantee that the FD is still valid by the time your code
-receives this event.
-
-ZMQ_EVENT_CONNECT_DELAYED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-A connect request on the socket is pending. The event value is unspecified.
-
-ZMQ_EVENT_CONNECT_RETRIED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-A connect request failed, and is now being retried. The event value is the
-reconnect interval in milliseconds. Note that the reconnect interval is
-recalculated for each retry.
-
-ZMQ_EVENT_LISTENING
-~~~~~~~~~~~~~~~~~~~
-The socket was successfully bound to a network interface. The event value
-is the FD of the underlying network socket. Warning: there is no guarantee
-that the FD is still valid by the time your code receives this event.
-
-ZMQ_EVENT_BIND_FAILED
-~~~~~~~~~~~~~~~~~~~~~
-The socket could not bind to a given interface. The event value is the
-errno generated by the system bind call.
-
-ZMQ_EVENT_ACCEPTED
-~~~~~~~~~~~~~~~~~~
-The socket has accepted a connection from a remote peer. The event value is
-the FD of the underlying network socket. Warning: there is no guarantee that
-the FD is still valid by the time your code receives this event.
-
-ZMQ_EVENT_ACCEPT_FAILED
-~~~~~~~~~~~~~~~~~~~~~~~
-The socket has rejected a connection from a remote peer. The event value is
-the errno generated by the accept call.
-
-ZMQ_EVENT_CLOSED
-~~~~~~~~~~~~~~~~
-The socket was closed. The event value is the FD of the (now closed) network
-socket.
-
-ZMQ_EVENT_CLOSE_FAILED
-~~~~~~~~~~~~~~~~~~~~~~
-The socket close failed. The event value is the errno returned by the system
-call. Note that this event occurs only on IPC transports.
-
-ZMQ_EVENT_DISCONNECTED
-~~~~~~~~~~~~~~~~~~~~~~
-The socket was disconnected unexpectedly. The event value is the FD of the
-underlying network socket. Warning: this socket will be closed.
-
-ZMQ_EVENT_MONITOR_STOPPED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-Monitoring on this socket ended.
-
-ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Unspecified error during handshake.
-The event value is an errno.
-
-ZMQ_EVENT_HANDSHAKE_SUCCEEDED
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake succeeded.
-The event value is unspecified.
-
-ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake failed due to some mechanism protocol 
-error, either between the ZMTP mechanism peers, or between the mechanism 
-server and the ZAP handler. This indicates a configuration or implementation 
-error in either peer resp. the ZAP handler.
-The event value is one of the ZMQ_PROTOCOL_ERROR_* values:
-ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND
-ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE
-ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME
-ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA
-ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC
-ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH
-ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY
-ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID
-ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION
-ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE
-ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA
-
-ZMQ_EVENT_HANDSHAKE_FAILED_AUTH
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake failed due to an authentication failure.
-The event value is the status code returned by the ZAP handler (i.e. 300, 
-400 or 500).
-
-----
-
-Supported events (v2)
-----------------
-
-ZMQ_EVENT_PIPE_STATS
-~~~~~~~~~~~~~~~~~~~~
-This event provides two values, the number of messages in each of the two
-queues associated with the returned endpoint (respectively egress and ingress).
-This event only triggers after calling the function
-_zmq_socket_monitor_pipes_stats()_.
-NOTE: this measurement is asynchronous, so by the time the message is received
-the internal state might have already changed.
-NOTE: when the monitored socket and the monitor are not used in a poll, the
-event might not be delivered until an API has been called on the monitored
-socket, like zmq_getsockopt for example (the option is irrelevant).
-NOTE: in DRAFT state, not yet available in stable releases.
-
-
-
-RETURN VALUE
-------------
-The _zmq_socket_monitor()_ and _zmq_socket_monitor_pipes_stats()_ functions
-return a value of 0 or greater if successful. Otherwise they return `-1` and
-set 'errno' to one of the values defined below.
-
-
-ERRORS - _zmq_socket_monitor()_
--------------------------------
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-
-*EPROTONOSUPPORT*::
-The transport protocol of the monitor 'endpoint' is not supported. Monitor
-sockets are required to use the inproc:// transport.
-
-*EINVAL*::
-The monitor 'endpoint' supplied does not exist or the specified socket 'type'
-is not supported.
-
-
-ERRORS - _zmq_socket_monitor_pipes_stats()_
--------------------------------------------
-*ENOTSOCK*::
-The 'socket' parameter was not a valid 0MQ socket.
-
-*EINVAL*::
-The socket did not have monitoring enabled.
-
-*EAGAIN*::
-The monitored socket did not have any connections to monitor yet.
-
-EXAMPLE
--------
-.Monitoring client and server sockets
-----
-//  Read one event off the monitor socket; return values and addresses
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-
-static uint64_t
-get_monitor_event (void *monitor, uint64_t *value, char **local_address, char **remote_address)
-{
-    //  First frame in message contains event number
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (zmq_msg_more (&msg));
-
-    uint64_t event;
-    memcpy (&event, zmq_msg_data (&msg), sizeof (event));
-    zmq_msg_close (&msg);
-
-    //  Second frame in message contains the number of values
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (zmq_msg_more (&msg));
-
-    uint64_t value_count;
-    memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count));
-    zmq_msg_close (&msg);
-
-    for (uint64_t i = 0; i < value_count; ++i) {
-        //  Subsequent frames in message contain event values
-        zmq_msg_init (&msg);
-        if (zmq_msg_recv (&msg, monitor, 0) == -1)
-            return -1;              //  Interrupted, presumably
-        assert (zmq_msg_more (&msg));
-
-        if (value_ && value_ + i)
-            memcpy (value_ + i, zmq_msg_data (&msg), sizeof (*value_));
-        zmq_msg_close (&msg);
-    }
-
-    //  Second-to-last frame in message contains local address
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (zmq_msg_more (&msg));
-
-    if (local_address_) {
-        uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-        size_t size = zmq_msg_size (&msg);
-        *local_address_ = (char *) malloc (size + 1);
-        memcpy (*local_address_, data, size);
-        (*local_address_)[size] = 0;
-    }
-    zmq_msg_close (&msg);
-
-    //  Last frame in message contains remote address
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (!zmq_msg_more (&msg));
-
-    if (remote_address_) {
-        uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-        size_t size = zmq_msg_size (&msg);
-        *remote_address_ = (char *) malloc (size + 1);
-        memcpy (*remote_address_, data, size);
-        (*remote_address_)[size] = 0;
-    }
-    zmq_msg_close (&msg);
-
-    return event;
-}
-
-int main (void)
-{
-    void *ctx = zmq_ctx_new ();
-    assert (ctx);
-
-    //  We'll monitor these two sockets
-    void *client = zmq_socket (ctx, ZMQ_DEALER);
-    assert (client);
-    void *server = zmq_socket (ctx, ZMQ_DEALER);
-    assert (server);
-
-    //  Socket monitoring only works over inproc://
-    int rc = zmq_socket_monitor_versioned (client, "tcp://127.0.0.1:9999", 0, 2);
-    assert (rc == -1);
-    assert (zmq_errno () == EPROTONOSUPPORT);
-
-    //  Monitor all events on client and server sockets
-    rc = zmq_socket_monitor_versioned (client, "inproc://monitor-client", ZMQ_EVENT_ALL, 2);
-    assert (rc == 0);
-    rc = zmq_socket_monitor_versioned (server, "inproc://monitor-server", ZMQ_EVENT_ALL, 2);
-    assert (rc == 0);
-
-    //  Create two sockets for collecting monitor events
-    void *client_mon = zmq_socket (ctx, ZMQ_PAIR);
-    assert (client_mon);
-    void *server_mon = zmq_socket (ctx, ZMQ_PAIR);
-    assert (server_mon);
-
-    //  Connect these to the inproc endpoints so they'll get events
-    rc = zmq_connect (client_mon, "inproc://monitor-client");
-    assert (rc == 0);
-    rc = zmq_connect (server_mon, "inproc://monitor-server");
-    assert (rc == 0);
-
-    //  Now do a basic ping test
-    rc = zmq_bind (server, "tcp://127.0.0.1:9998");
-    assert (rc == 0);
-    rc = zmq_connect (client, "tcp://127.0.0.1:9998");
-    assert (rc == 0);
-    bounce (client, server);
-
-    //  Close client and server
-    close_zero_linger (client);
-    close_zero_linger (server);
-
-    //  Now collect and check events from both sockets
-    int event = get_monitor_event (client_mon, NULL, NULL);
-    if (event == ZMQ_EVENT_CONNECT_DELAYED)
-        event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_CONNECTED);
-    event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_MONITOR_STOPPED);
-
-    //  This is the flow of server events
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_LISTENING);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_ACCEPTED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_CLOSED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_MONITOR_STOPPED);
-
-    //  Close down the sockets
-    close_zero_linger (client_mon);
-    close_zero_linger (server_mon);
-    zmq_ctx_term (ctx);
-
-    return 0 ;
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_strerror.txt b/doc/zmq_strerror.txt
deleted file mode 100644
index a038a9af4..000000000
--- a/doc/zmq_strerror.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-zmq_strerror(3)
-===============
-
-
-NAME
-----
-zmq_strerror - get 0MQ error message string
-
-
-SYNOPSIS
---------
-*const char *zmq_strerror (int 'errnum');*
-
-
-DESCRIPTION
------------
-The _zmq_strerror()_ function shall return a pointer to an error message string
-corresponding to the error number specified by the 'errnum' argument. As 0MQ
-defines additional error numbers over and above those defined by the operating
-system, applications should use _zmq_strerror()_ in preference to the standard
-_strerror()_ function.
-
-
-RETURN VALUE
-------------
-The _zmq_strerror()_ function shall return a pointer to an error message
-string.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-EXAMPLE
--------
-.Displaying an error message when a 0MQ context cannot be initialised
-----
-void *ctx = zmq_init (1, 1, 0);
-if (!ctx) {
-    printf ("Error occurred during zmq_init(): %s\n", zmq_strerror (errno));
-    abort ();
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
-
diff --git a/doc/zmq_tcp.txt b/doc/zmq_tcp.txt
deleted file mode 100644
index 11088a72c..000000000
--- a/doc/zmq_tcp.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-zmq_tcp(7)
-==========
-
-
-NAME
-----
-zmq_tcp - 0MQ unicast transport using TCP
-
-
-SYNOPSIS
---------
-TCP is an ubiquitous, reliable, unicast transport. When connecting distributed
-applications over a network with 0MQ, using the TCP transport will likely be
-your first choice.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the TCP transport, the transport is `tcp`, and the meaning of the
-'address' part is defined below.
-
-
-Assigning a local address to a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When assigning a local address to a socket using _zmq_bind()_ with the 'tcp'
-transport, the 'endpoint' shall be interpreted as an 'interface' followed by a
-colon and the TCP port number to use.
-
-An 'interface' may be specified by either of the following:
-
-* The wild-card `*`, meaning all available interfaces.
-* The primary IPv4 or IPv6 address assigned to the interface, in its numeric
-  representation.
-* The non-portable interface name as defined by the operating system.
-
-The TCP port number may be specified by:
-
-* A numeric value, usually above 1024 on POSIX systems.
-* The wild-card `*`, meaning a system-assigned ephemeral port.
-
-When using ephemeral ports, the caller should retrieve the actual assigned
-port using the ZMQ_LAST_ENDPOINT socket option. See linkzmq:zmq_getsockopt[3]
-for details.
-
-Unbinding wild-card address from a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When wild-card `*` 'endpoint' was used in _zmq_bind()_, the caller should use
-real 'endpoint' obtained from the ZMQ_LAST_ENDPOINT socket option to unbind 
-this 'endpoint' from a socket using _zmq_unbind()_.
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a socket to a peer address using _zmq_connect()_ with the 'tcp'
-transport, the 'endpoint' shall be interpreted as a 'peer address' followed by
-a colon and the TCP port number to use.
-You can optionally specify a 'source_endpoint' which will be used as the source
-address for your connection; tcp://'source_endpoint';'endpoint', see the
-'interface' description above for details.
-
-A 'peer address' may be specified by either of the following:
-
-* The DNS name of the peer.
-* The IPv4 or IPv6 address of the peer, in its numeric representation.
-
-Note: A description of the ZeroMQ Message Transport Protocol (ZMTP) which is 
-used by the TCP transport can be found at <http://rfc.zeromq.org/spec:15>
-
-
-HWM
----
-
-For the TCP transport, the high water mark (HWM) mechanism works in conjunction
-with the TCP socket buffers handled at OS level.
-Depending on the OS and several other factors the size of such TCP buffers will
-be different. Moreover TCP buffers provided by the OS will accomodate a varying
-number of messages depending on the size of messages (unlike ZMQ HWM settings
-the TCP socket buffers are measured in bytes and not messages).
-
-This may result in apparently inexplicable behaviors: e.g., you may expect that
-setting ZMQ_SNDHWM to 100 on a socket using TCP transport will have the effect
-of blocking the transmission of the 101-th message if the receiver is slow.
-This is very unlikely when using TCP transport since OS TCP buffers will typically
-provide enough buffering to allow you sending much more than 100 messages.
-
-Of course if the receiver is slow, transmitting on a TCP ZMQ socket will eventually trigger
-the "mute state" of the socket; simply don't rely on the exact HWM value.
-
-Obviously the same considerations apply for the receive HWM (see ZMQ_RCVHWM).
-
-
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  TCP port 5555 on all available interfaces
-rc = zmq_bind(socket, "tcp://*:5555");
-assert (rc == 0);
-//  TCP port 5555 on the local loop-back interface on all platforms
-rc = zmq_bind(socket, "tcp://127.0.0.1:5555");
-assert (rc == 0);
-//  TCP port 5555 on the first Ethernet network interface on Linux
-rc = zmq_bind(socket, "tcp://eth0:5555");
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connecting using an IP address
-rc = zmq_connect(socket, "tcp://192.168.1.1:5555");
-assert (rc == 0);
-//  Connecting using a DNS name
-rc = zmq_connect(socket, "tcp://server1:5555");
-assert (rc == 0);
-//  Connecting using a DNS name and bind to eth1
-rc = zmq_connect(socket, "tcp://eth1:0;server1:5555");
-assert (rc == 0);
-//  Connecting using a IP address and bind to an IP address
-rc = zmq_connect(socket, "tcp://192.168.1.17:5555;192.168.1.1:5555");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_term.txt b/doc/zmq_term.txt
deleted file mode 100644
index 61527322e..000000000
--- a/doc/zmq_term.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-zmq_term(3)
-===========
-
-
-NAME
-----
-zmq_term - terminate 0MQ context
-
-
-SYNOPSIS
---------
-*int zmq_term (void '*context');*
-
-
-DESCRIPTION
------------
-The _zmq_term()_ function shall terminate the 0MQ context 'context'.
-
-Context termination is performed in the following steps:
-
-1. Any blocking operations currently in progress on sockets open within
-   'context' shall return immediately with an error code of ETERM.  With the
-   exception of _zmq_close()_, any further operations on sockets open within
-   'context' shall fail with an error code of ETERM.
-
-2. After interrupting all blocking calls, _zmq_term()_ shall _block_ until the
-   following conditions are satisfied:
-
-   * All sockets open within 'context' have been closed with _zmq_close()_.
-
-   * For each socket within 'context', all messages sent by the application
-     with _zmq_send()_ have either been physically transferred to a network
-     peer, or the socket's linger period set with the _ZMQ_LINGER_ socket
-     option has expired.
-
-For further details regarding socket linger behaviour refer to the _ZMQ_LINGER_
-option in linkzmq:zmq_setsockopt[3].
-
-This function is deprecated by linkzmq:zmq_ctx_term[3].
-
-RETURN VALUE
-------------
-The _zmq_term()_ function shall return zero if successful. Otherwise it shall
-return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-The provided 'context' was invalid.
-*EINTR*::
-Termination was interrupted by a signal. It can be restarted if needed.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_init[3]
-linkzmq:zmq_close[3]
-linkzmq:zmq_setsockopt[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_timers.txt b/doc/zmq_timers.txt
deleted file mode 100644
index b7541b190..000000000
--- a/doc/zmq_timers.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-zmq_timers(3)
-============
-
-
-NAME
-----
-zmq_timers - helper functions for cross-platform timers callbacks
-
-
-SYNOPSIS
---------
-
-*typedef void(zmq_timer_fn) (int 'timer_id', void *'arg');*
-
-*void *zmq_timers_new (void);*
-
-*int zmq_timers_destroy (void **'timers_p');*
-
-*int zmq_timers_add (void *'timers', size_t 'interval', zmq_timer_fn 'handler', void *'arg');*
-
-*int zmq_timers_cancel (void *'timers', int 'timer_id');*
-
-*int zmq_timers_set_interval (void *'timers', int 'timer_id', size_t 'interval');*
-
-*int zmq_timers_reset (void *'timers', int 'timer_id');*
-
-*long zmq_timers_timeout (void *'timers');*
-
-*int zmq_timers_execute (void *'timers');*
-
-
-DESCRIPTION
------------
-The _zmq_timers_*_ functions provide cross-platform access to timers callbacks.
-Once a timer has been registered, it will repeat at the specified interval until
-it gets manually cancelled. To run the callbacks, _zmq_timers_execute_ must be
-ran.
-
-_zmq_timers_new_ and _zmq_timers_destroy_ manage the lifetime of a timer
-instance. _zmq_timers_new_ creates and returns a new timer instance, while
-_zmq_timers_destroy_ destroys it. A pointer to a valid timer must be passed
-as the _timers_p_ argument of _zmq_timers_destroy_. In particular,
-_zmq_timers_destroy_ may not be called multiple times for the same timer
-instance. _zmq_timers_destroy_ sets the passed pointer to NULL in case of a
-successful execution.
-
-_zmq_timers_add_ and _zmq_timers_cancel_ manage the timers registered.
-
-_zmq_timers_add_ registers a new _timer_ with a given instance. _timers_ must
-point to a valid _timers_ object. The _interval_ parameter specifies the
-expiration of the timer in milliseconds. _handler_ and _arg_ specify the callback
-that will be invoked on expiration and the optional parameter that will be passed
-through. The callback must be a valid function implementing the _zmq_timer_fn_
-prototype. An ID will be returned that can be used to modify or cancel the timer.
-
-_zmq_timers_cancel_ will cancel the timer associated with _timer_id_ from the
-instance _timers_.
-
-_zmq_timers_set_interval_ will set the expiration of the timer associated with
-_timer_id_ from the instance _timers_ to _interval_ milliseconds into the future.
-
-_zmq_timers_reset_ will restart the timer associated with _timer_id_ from the
-instance _timers_.
-
-_zmq_timers_timeout_ will return the time left in milliseconds until the next
-timer registered with _timers_ expires.
-
-_zmq_timers_execute_ will run callbacks of all expired timers from the instance
-_timers_.
-
-
-THREAD SAFETY
--------------
-Like most other 0MQ objects, timers are not thread-safe. All operations must
-be called from the same thread. Otherwise, behaviour is undefined.
-
-
-RETURN VALUE
-------------
-_zmq_timers_new_ always returns a valid pointer to a poller.
-
-All functions that return an int, return -1 in case of a failure. In that case,
-zmq_errno() can be used to query the type of the error as described below.
-
-_zmq_timers_timeout_ returns the time left in milliseconds until the next
-timer registered with _timers_ expires, or -1 if there are no timers left.
-
-All other functions return 0 in case of a successful execution.
-
-
-ERRORS
-------
-On _zmq_timers_destroy_, _zmq_poller_cancel_, _zmq_timers_set_interval_,
-_zmq_timers_reset_, zmq_timers_timeout_, and _zmq_timers_execute_:
-*EFAULT*::
-_timers_ did not point to a valid timer. Note that passing an
-invalid pointer (e.g. pointer to deallocated memory) may cause undefined
-behaviour (e.g. an access violation).
-
-On _zmq_timers_add_:
-*EFAULT*::
-_timers_ did not point to a valid timer or _handler_ did not point to a valid
-function.
-
-On _zmq_poller_cancel_, _zmq_timers_set_interval_ and zmq_timers_timeout_:
-*EINVAL*::
-_timer_id_ did not exist or was already cancelled.
-
-
-EXAMPLE
--------
-.Add one timer with a simple callback that changes a boolean.
-----
-    void handler (int timer_id_, void *arg_)
-    {
-        (void) timer_id_; //  Stop 'unused' compiler warnings
-        *((bool *) arg_) = true;
-    }
-
-    ...
-
-    void *timers = zmq_timers_new ();
-    assert (timers);
-
-    bool timer_invoked = false;
-
-    const unsigned long full_timeout = 100;
-
-    int timer_id =
-      zmq_timers_add (timers, full_timeout, handler, &timer_invoked);
-    assert (timer_id);
-
-    //  Timer should not have been invoked yet
-    int rc = zmq_timers_execute (timers);
-    assert (rc == 0);
-
-    //  Wait half the time and check again
-    long timeout = zmq_timers_timeout (timers);
-    assert (rc != -1);
-    msleep (timeout / 2);
-    rc = zmq_timers_execute (timers);
-    assert (rc == 0);
-
-    // Wait until the end
-    rc = msleep (zmq_timers_timeout (timers));
-    assert (rc == 0);
-    assert (timer_invoked);
-
-    rc = zmq_timers_destroy (&timers);
-    assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_tipc.txt b/doc/zmq_tipc.txt
deleted file mode 100644
index 004c95a5f..000000000
--- a/doc/zmq_tipc.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-zmq_tipc(7)
-==========
-
-
-NAME
-----
-zmq_tipc - 0MQ unicast transport using TIPC
-
-
-SYNOPSIS
---------
-TIPC is a cluster IPC protocol with a location transparent addressing scheme.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the TIPC transport, the transport is `tipc`, and the meaning of the
-'address' part is defined below.
-
-
-Assigning a port name to a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When assigning a port name to a socket using _zmq_bind()_ with the 'tipc'
-transport, the 'endpoint' is defined in the form:
-{type, lower, upper}
-
-* Type is the numerical (u32) ID of your service.
-* Lower and Upper specify a range for your service.
-
-Publishing the same service with overlapping lower/upper ID's will
-cause connection requests to be distributed over these in a round-robin
-manner.
-
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a socket to a peer address using _zmq_connect()_ with the 'tipc'
-transport, the 'endpoint' shall be interpreted as a service ID, followed by a 
-comma and the instance ID.
-
-The instance ID must be within the lower/upper range of a published port name
-for the endpoint to be valid.
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  Publish TIPC service ID 5555
-rc = zmq_bind(socket, "tipc://{5555,0,0}");
-assert (rc == 0);
-//  Publish TIPC service ID 5555 with a service range of 0-100
-rc = zmq_bind(socket, "tipc://{5555,0,100}");
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connect to service 5555 instance id 50
-rc = zmq_connect(socket, "tipc://{5555,50}");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_udp.txt b/doc/zmq_udp.txt
deleted file mode 100644
index 6f740ce44..000000000
--- a/doc/zmq_udp.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-zmq_udp(7)
-==========
-
-
-NAME
-----
-zmq_udp - 0MQ UDP multicast and unicast transport
-
-
-SYNOPSIS
---------
-UDP is unreliable protocol transport of data over IP networks.
-UDP support both unicast and multicast communication.
-
-
-DESCRIPTION
------------
-UDP transport can only be used with the 'ZMQ_RADIO' and
-'ZMQ_DISH' socket types.
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the UDP transport, the transport is `udp`.
-The meaning of the 'address' part is defined below.
-
-Binding a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-With 'udp' we can only bind the 'ZMQ_DISH' socket type.
-When binding a socket using _zmq_bind()_ with the 'udp'
-transport the 'endpoint' shall be interpreted as an 'interface' followed by a
-colon and the UDP port number to use.
-
-An 'interface' may be specified by either of the following:
-
-* The wild-card `*`, meaning all available interfaces.
-* The name of the network interface (i.e. eth0, lo, wlan0 etc...)
-* The primary address assigned to the interface, in its numeric representation.
-* Multicast address in its numeric representation the socket should join.
-
-The UDP port number may be specified a numeric value, usually above
-1024 on POSIX systems.
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-With 'udp' we can only connect the 'ZMQ_RADIO' socket type.
-When connecting a socket to a peer address using _zmq_connect()_ with the 'udp'
-transport, the 'endpoint' shall be interpreted as a 'peer address' followed by
-a colon and the UDP port number to use.
-
-A 'peer address' may be specified by either of the following:
-
-* The IPv4 or IPv6 address of the peer, in its numeric representation
-  or using its hostname.
-* Multicast address in its numeric representation.
-
-EXAMPLES
---------
-.Binding a socket
-----
-//  Unicast - UDP port 5555 on all available interfaces
-rc = zmq_bind(dish, "udp://*:5555");
-assert (rc == 0);
-//  Unicast - UDP port 5555 on the local loop-back interface
-rc = zmq_bind(dish, "udp://127.0.0.1:5555");
-assert (rc == 0);
-//  Unicast - UDP port 5555 on interface eth1
-rc = zmq_bind(dish, "udp://eth1:5555");
-assert (rc == 0);
-//  Multicast - UDP port 5555 on a Multicast address
-rc = zmq_bind(dish, "udp://239.0.0.1:5555");
-assert (rc == 0);
-//  Same as above but joining only on interface eth0
-rc = zmq_bind(dish, "udp://eth0;239.0.0.1:5555");
-assert (rc == 0);
-//  Same as above using IPv6 multicast
-rc = zmq_bind(dish, "udp://eth0;[ff02::1]:5555");
-assert (rc == 0);
-----
-
-
-.Connecting a socket
-----
-//  Connecting using an Unicast IP address
-rc = zmq_connect(radio, "udp://192.168.1.1:5555");
-assert (rc == 0);
-//  Connecting using a Multicast address
-rc = zmq_connect(socket, "udp://239.0.0.1:5555);
-assert (rc == 0);
-//  Connecting using a Multicast address using local interface wlan0
-rc = zmq_connect(socket, "udp://wlan0;239.0.0.1:5555);
-assert (rc == 0);
-//  Connecting to IPv6 multicast
-rc = zmq_connect(socket, "udp://[ff02::1]:5555);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_unbind.txt b/doc/zmq_unbind.txt
deleted file mode 100644
index 1ae33b188..000000000
--- a/doc/zmq_unbind.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-zmq_unbind(3)
-==============
-
-
-NAME
-----
-zmq_unbind - Stop accepting connections on a socket
-
-
-SYNOPSIS
---------
-int zmq_unbind (void '*socket', const char '*endpoint');
-
-
-DESCRIPTION
------------
-The _zmq_unbind()_ function shall unbind a socket specified
-by the 'socket' argument from the endpoint specified by the 'endpoint'
-argument. 
-
-Addionally the incoming message queue associated with the endpoint will be
-discarded. This means that after unbinding an endpoint it is possible to
-received messages originating from that same endpoint if they were already
-present in the incoming message queue before unbinding.
-
-The 'endpoint' argument is as described in linkzmq:zmq_bind[3]
-
-Unbinding wild-card address from a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When wild-card `*` 'endpoint' (described in linkzmq:zmq_tcp[7],
-linkzmq:zmq_ipc[7], linkzmq:zmq_udp[7] and linkzmq:zmq_vmci[7]) was used in
-_zmq_bind()_, the caller should use real 'endpoint' obtained from the 
-ZMQ_LAST_ENDPOINT socket option to unbind this 'endpoint' from a socket.
-
-RETURN VALUE
-------------
-The _zmq_unbind()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*ENOENT*::
-The endpoint supplied was not previously bound.
-
-
-EXAMPLES
---------
-.Unbind a subscriber socket from a TCP transport
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_SUB);
-assert (socket);
-/* Connect it to the host server001, port 5555 using a TCP transport */
-rc = zmq_bind (socket, "tcp://127.0.0.1:5555");
-assert (rc == 0);
-/* Disconnect from the previously connected endpoint */
-rc = zmq_unbind (socket, "tcp://127.0.0.1:5555");
-assert (rc == 0);
-----
-
-.Unbind wild-card `*` binded socket
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_SUB);
-assert (socket);
-/* Bind it to the system-assigned ephemeral port using a TCP transport */
-rc = zmq_bind (socket, "tcp://127.0.0.1:*");
-assert (rc == 0);
-/* Obtain real endpoint */
-const size_t buf_size = 32;
-char buf[buf_size];
-rc = zmq_getsockopt (socket, ZMQ_LAST_ENDPOINT, buf, (size_t *)&buf_size);
-assert (rc == 0);
-/* Unbind socket by real endpoint */
-rc = zmq_unbind (socket, buf);
-assert (rc == 0);
-----
-
-NOTE
-----
-
-Note that while the implementation is similar to _zmq_disconnect()_, the
-semantics are different and the two functions should not be used
-interchangeably. Bound sockets should be unbound, and connected sockets should
-be disconnected.
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_version.txt b/doc/zmq_version.txt
deleted file mode 100644
index d96a106b9..000000000
--- a/doc/zmq_version.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-zmq_version(3)
-==============
-
-
-NAME
-----
-zmq_version - report 0MQ library version
-
-
-SYNOPSIS
---------
-*void zmq_version (int '*major', int '*minor', int '*patch');*
-
-
-DESCRIPTION
------------
-The _zmq_version()_ function shall fill in the integer variables pointed to by
-the 'major', 'minor' and 'patch' arguments with the major, minor and patch level
-components of the 0MQ library version.
-
-This functionality is intended for applications or language bindings
-dynamically linking to the 0MQ library that wish to determine the actual
-version of the 0MQ library they are using.
-
-
-RETURN VALUE
-------------
-There is no return value.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-EXAMPLE
--------
-.Printing out the version of the 0MQ library
-----
-int major, minor, patch;
-zmq_version (&major, &minor, &patch);
-printf ("Current 0MQ version is %d.%d.%d\n", major, minor, patch);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_vmci.txt b/doc/zmq_vmci.txt
deleted file mode 100644
index 1a25a0079..000000000
--- a/doc/zmq_vmci.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-zmq_vmci(7)
-===========
-
-
-NAME
-----
-zmq_vmci - 0MQ transport over virtual machine communicatios interface (VMCI) sockets
-
-
-SYNOPSIS
---------
-The VMCI transport passes messages between VMware virtual machines running on the same host,
-between virtual machine and the host and within virtual machines (inter-process transport like ipc).
-
-NOTE: Communication between a virtual machine and the host is not supported on Mac OS X 10.9 and above.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the VMCI transport, the transport is `vmci`, and the meaning of
-the 'address' part is defined below.
-
-
-Binding a socket
-~~~~~~~~~~~~~~~~
-When binding a 'socket' to a local address using _zmq_bind()_ with the 'vmci'
-transport, the 'endpoint' shall be interpreted as an 'interface' followed by a
-colon and the TCP port number to use.
-
-An 'interface' may be specified by either of the following:
-
-* The wild-card `*`, meaning all available interfaces.
-* An integer returned by `VMCISock_GetLocalCID` or `@` (ZeroMQ will call VMCISock_GetLocalCID internally).
-
-The port may be specified by:
-
-* A numeric value, usually above 1024 on POSIX systems.
-* The wild-card `*`, meaning a system-assigned ephemeral port.
-
-Unbinding wild-card address from a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When wild-card `*` 'endpoint' was used in _zmq_bind()_, the caller should use
-real 'endpoint' obtained from the ZMQ_LAST_ENDPOINT socket option to unbind
-this 'endpoint' from a socket using _zmq_unbind()_.
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a socket to a peer address using _zmq_connect()_ with the 'vmci'
-transport, the 'endpoint' shall be interpreted as a 'peer address' followed by
-a colon and the port number to use.
-
-A 'peer address' must be a CID of the peer.
-
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  VMCI port 5555 on all available interfaces
-rc = zmq_bind(socket, "vmci://*:5555");
-assert (rc == 0);
-//  VMCI port 5555 on the local loop-back interface on all platforms
-cid = VMCISock_GetLocalCID();
-sprintf(endpoint, "vmci://%d:5555", cid);
-rc = zmq_bind(socket, endpoint);
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connecting using a CID
-sprintf(endpoint, "vmci://%d:5555", cid);
-rc = zmq_connect(socket, endpoint);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_z85_decode.txt b/doc/zmq_z85_decode.txt
deleted file mode 100644
index 2649547f2..000000000
--- a/doc/zmq_z85_decode.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-zmq_z85_decode(3)
-=================
-
-
-NAME
-----
-zmq_z85_decode - decode a binary key from Z85 printable text
-
-
-SYNOPSIS
---------
-*uint8_t *zmq_z85_decode (uint8_t *dest, const char *string);*
-
-
-DESCRIPTION
------------
-The _zmq_z85_decode()_ function shall decode 'string' into 'dest'.
-The length of 'string' shall be divisible by 5. 'dest' must be large
-enough for the decoded value (0.8 x strlen (string)). 
-
-The encoding shall follow the ZMQ RFC 32 specification.
-
-
-RETURN VALUE
-------------
-The _zmq_z85_decode()_ function shall return 'dest' if successful, else it
-shall return NULL.
-
-
-EXAMPLE
--------
-.Decoding a CURVE key
-----
-const char decoded [] = "rq:rM>}U?@Lns47E1%kR.o@n%FcmmsL/@{H8]yf7";
-uint8_t public_key [32];
-zmq_z85_decode (public_key, decoded);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_curve_keypair[3]
-linkzmq:zmq_curve_public[3]
-linkzmq:zmq_curve[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/doc/zmq_z85_encode.txt b/doc/zmq_z85_encode.txt
deleted file mode 100644
index f578f4d21..000000000
--- a/doc/zmq_z85_encode.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-zmq_z85_encode(3)
-=================
-
-
-NAME
-----
-zmq_z85_encode - encode a binary key as Z85 printable text
-
-
-SYNOPSIS
---------
-*char *zmq_z85_encode (char *dest, const uint8_t *data, size_t size);*
-
-
-DESCRIPTION
------------
-The _zmq_z85_encode()_ function shall encode the binary block specified 
-by 'data' and 'size' into a string in 'dest'. The size of the binary block
-must be divisible by 4. The 'dest' must have sufficient space for size * 1.25 
-plus 1 for a null terminator. A 32-byte CURVE key is encoded as 40 ASCII 
-characters plus a null terminator.
-
-The encoding shall follow the ZMQ RFC 32 specification.
-
-
-RETURN VALUE
-------------
-The _zmq_z85_encode()_ function shall return 'dest' if successful, else it
-shall return NULL.
-
-
-EXAMPLE
--------
-.Encoding a CURVE key
-----
-#include <sodium.h>
-uint8_t public_key [32];
-uint8_t secret_key [32];
-int rc = crypto_box_keypair (public_key, secret_key);
-assert (rc == 0);
-char encoded [41];
-zmq_z85_encode (encoded, public_key, 32);
-puts (encoded);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_curve_keypair[3]
-linkzmq:zmq_curve_public[3]
-linkzmq:zmq_curve[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/external/sha1/license.txt b/external/sha1/license.txt
deleted file mode 100644
index 3b5eb95a8..000000000
--- a/external/sha1/license.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
-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. Neither the name of the project nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS 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 PROJECT OR 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.
diff --git a/external/sha1/sha1.c b/external/sha1/sha1.c
deleted file mode 100644
index 2702c89ab..000000000
--- a/external/sha1/sha1.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS 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 PROJECT OR 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.
- */
-
-/*
- * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * based on: http://www.itl.nist.gov/fipspubs/fip180-1.htm
- * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
- */
-
-#include "sha1.h"
-#include <string.h>
-
-
-/* constant table */
-static uint32_t _K[] = {0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6};
-
-#define K(t)	_K[(t) / 20]
-
-#define F0(b, c, d) (((b) & (c)) | ((~(b)) & (d)))
-#define F1(b, c, d) (((b) ^ (c)) ^ (d))
-#define F2(b, c, d) (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
-#define F3(b, c, d) (((b) ^ (c)) ^ (d))
-
-#define S(n, x)		(((x) << (n)) | ((x) >> (32 - (n))))
-
-#define H(n)	(ctxt->h.b32[(n)])
-#define COUNT	(ctxt->count)
-#define BCOUNT	(ctxt->c.b64[0] / 8)
-#define W(n)	(ctxt->m.b32[(n)])
-
-#define PUTBYTE(x) \
-do { \
-	ctxt->m.b8[(COUNT % 64)] = (x);		\
-	COUNT++;				\
-	COUNT %= 64;				\
-	ctxt->c.b64[0] += 8;			\
-	if (COUNT % 64 == 0)			\
-		sha1_step(ctxt);		\
-} while (0)
-
-#define PUTPAD(x) \
-do { \
-	ctxt->m.b8[(COUNT % 64)] = (x);		\
-	COUNT++;				\
-	COUNT %= 64;				\
-	if (COUNT % 64 == 0)			\
-		sha1_step(ctxt);		\
-} while (0)
-
-static void sha1_step(struct sha1_ctxt *);
-
-static void
-sha1_step(struct sha1_ctxt * ctxt)
-{
-	uint32_t		a,
-				b,
-				c,
-				d,
-				e;
-	size_t		t,
-				s;
-	uint32_t		tmp;
-
-#ifndef WORDS_BIGENDIAN
-	struct sha1_ctxt tctxt;
-
-	memmove(&tctxt.m.b8[0], &ctxt->m.b8[0], 64);
-	ctxt->m.b8[0] = tctxt.m.b8[3];
-	ctxt->m.b8[1] = tctxt.m.b8[2];
-	ctxt->m.b8[2] = tctxt.m.b8[1];
-	ctxt->m.b8[3] = tctxt.m.b8[0];
-	ctxt->m.b8[4] = tctxt.m.b8[7];
-	ctxt->m.b8[5] = tctxt.m.b8[6];
-	ctxt->m.b8[6] = tctxt.m.b8[5];
-	ctxt->m.b8[7] = tctxt.m.b8[4];
-	ctxt->m.b8[8] = tctxt.m.b8[11];
-	ctxt->m.b8[9] = tctxt.m.b8[10];
-	ctxt->m.b8[10] = tctxt.m.b8[9];
-	ctxt->m.b8[11] = tctxt.m.b8[8];
-	ctxt->m.b8[12] = tctxt.m.b8[15];
-	ctxt->m.b8[13] = tctxt.m.b8[14];
-	ctxt->m.b8[14] = tctxt.m.b8[13];
-	ctxt->m.b8[15] = tctxt.m.b8[12];
-	ctxt->m.b8[16] = tctxt.m.b8[19];
-	ctxt->m.b8[17] = tctxt.m.b8[18];
-	ctxt->m.b8[18] = tctxt.m.b8[17];
-	ctxt->m.b8[19] = tctxt.m.b8[16];
-	ctxt->m.b8[20] = tctxt.m.b8[23];
-	ctxt->m.b8[21] = tctxt.m.b8[22];
-	ctxt->m.b8[22] = tctxt.m.b8[21];
-	ctxt->m.b8[23] = tctxt.m.b8[20];
-	ctxt->m.b8[24] = tctxt.m.b8[27];
-	ctxt->m.b8[25] = tctxt.m.b8[26];
-	ctxt->m.b8[26] = tctxt.m.b8[25];
-	ctxt->m.b8[27] = tctxt.m.b8[24];
-	ctxt->m.b8[28] = tctxt.m.b8[31];
-	ctxt->m.b8[29] = tctxt.m.b8[30];
-	ctxt->m.b8[30] = tctxt.m.b8[29];
-	ctxt->m.b8[31] = tctxt.m.b8[28];
-	ctxt->m.b8[32] = tctxt.m.b8[35];
-	ctxt->m.b8[33] = tctxt.m.b8[34];
-	ctxt->m.b8[34] = tctxt.m.b8[33];
-	ctxt->m.b8[35] = tctxt.m.b8[32];
-	ctxt->m.b8[36] = tctxt.m.b8[39];
-	ctxt->m.b8[37] = tctxt.m.b8[38];
-	ctxt->m.b8[38] = tctxt.m.b8[37];
-	ctxt->m.b8[39] = tctxt.m.b8[36];
-	ctxt->m.b8[40] = tctxt.m.b8[43];
-	ctxt->m.b8[41] = tctxt.m.b8[42];
-	ctxt->m.b8[42] = tctxt.m.b8[41];
-	ctxt->m.b8[43] = tctxt.m.b8[40];
-	ctxt->m.b8[44] = tctxt.m.b8[47];
-	ctxt->m.b8[45] = tctxt.m.b8[46];
-	ctxt->m.b8[46] = tctxt.m.b8[45];
-	ctxt->m.b8[47] = tctxt.m.b8[44];
-	ctxt->m.b8[48] = tctxt.m.b8[51];
-	ctxt->m.b8[49] = tctxt.m.b8[50];
-	ctxt->m.b8[50] = tctxt.m.b8[49];
-	ctxt->m.b8[51] = tctxt.m.b8[48];
-	ctxt->m.b8[52] = tctxt.m.b8[55];
-	ctxt->m.b8[53] = tctxt.m.b8[54];
-	ctxt->m.b8[54] = tctxt.m.b8[53];
-	ctxt->m.b8[55] = tctxt.m.b8[52];
-	ctxt->m.b8[56] = tctxt.m.b8[59];
-	ctxt->m.b8[57] = tctxt.m.b8[58];
-	ctxt->m.b8[58] = tctxt.m.b8[57];
-	ctxt->m.b8[59] = tctxt.m.b8[56];
-	ctxt->m.b8[60] = tctxt.m.b8[63];
-	ctxt->m.b8[61] = tctxt.m.b8[62];
-	ctxt->m.b8[62] = tctxt.m.b8[61];
-	ctxt->m.b8[63] = tctxt.m.b8[60];
-#endif
-
-	a = H(0);
-	b = H(1);
-	c = H(2);
-	d = H(3);
-	e = H(4);
-
-	for (t = 0; t < 20; t++)
-	{
-		s = t & 0x0f;
-		if (t >= 16)
-			W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F0(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-	for (t = 20; t < 40; t++)
-	{
-		s = t & 0x0f;
-		W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F1(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-	for (t = 40; t < 60; t++)
-	{
-		s = t & 0x0f;
-		W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F2(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-	for (t = 60; t < 80; t++)
-	{
-		s = t & 0x0f;
-		W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F3(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-
-	H(0) = H(0) + a;
-	H(1) = H(1) + b;
-	H(2) = H(2) + c;
-	H(3) = H(3) + d;
-	H(4) = H(4) + e;
-
-	memset(&ctxt->m.b8[0], 0, 64);
-}
-
-/*------------------------------------------------------------*/
-
-void
-sha1_init(struct sha1_ctxt * ctxt)
-{
-	memset(ctxt, 0, sizeof(struct sha1_ctxt));
-	H(0) = 0x67452301;
-	H(1) = 0xefcdab89;
-	H(2) = 0x98badcfe;
-	H(3) = 0x10325476;
-	H(4) = 0xc3d2e1f0;
-}
-
-void
-sha1_pad(struct sha1_ctxt * ctxt)
-{
-	size_t		padlen;			/* pad length in bytes */
-	size_t		padstart;
-
-	PUTPAD(0x80);
-
-	padstart = COUNT % 64;
-	padlen = 64 - padstart;
-	if (padlen < 8)
-	{
-		memset(&ctxt->m.b8[padstart], 0, padlen);
-		COUNT += (uint8_t) padlen;
-		COUNT %= 64;
-		sha1_step(ctxt);
-		padstart = COUNT % 64;	/* should be 0 */
-		padlen = 64 - padstart; /* should be 64 */
-	}
-	memset(&ctxt->m.b8[padstart], 0, padlen - 8);
-    COUNT += ((uint8_t) padlen - 8);
-	COUNT %= 64;
-#ifdef WORDS_BIGENDIAN
-	PUTPAD(ctxt->c.b8[0]);
-	PUTPAD(ctxt->c.b8[1]);
-	PUTPAD(ctxt->c.b8[2]);
-	PUTPAD(ctxt->c.b8[3]);
-	PUTPAD(ctxt->c.b8[4]);
-	PUTPAD(ctxt->c.b8[5]);
-	PUTPAD(ctxt->c.b8[6]);
-	PUTPAD(ctxt->c.b8[7]);
-#else
-	PUTPAD(ctxt->c.b8[7]);
-	PUTPAD(ctxt->c.b8[6]);
-	PUTPAD(ctxt->c.b8[5]);
-	PUTPAD(ctxt->c.b8[4]);
-	PUTPAD(ctxt->c.b8[3]);
-	PUTPAD(ctxt->c.b8[2]);
-	PUTPAD(ctxt->c.b8[1]);
-	PUTPAD(ctxt->c.b8[0]);
-#endif
-}
-
-void
-sha1_loop(struct sha1_ctxt * ctxt, const uint8_t *input0, size_t len)
-{
-	const uint8_t *input;
-	size_t		gaplen;
-	size_t		gapstart;
-	size_t		off;
-	size_t		copysiz;
-
-	input = (const uint8_t *) input0;
-	off = 0;
-
-	while (off < len)
-	{
-		gapstart = COUNT % 64;
-		gaplen = 64 - gapstart;
-
-		copysiz = (gaplen < len - off) ? gaplen : len - off;
-		memmove(&ctxt->m.b8[gapstart], &input[off], copysiz);
-		COUNT += (uint8_t) copysiz;
-		COUNT %= 64;
-		ctxt->c.b64[0] += copysiz * 8;
-		if (COUNT % 64 == 0)
-			sha1_step(ctxt);
-		off += copysiz;
-	}
-}
-
-void
-sha1_result(struct sha1_ctxt * ctxt, uint8_t *digest0)
-{
-	uint8_t	   *digest;
-
-	digest = (uint8_t *) digest0;
-	sha1_pad(ctxt);
-#ifdef WORDS_BIGENDIAN
-	memmove(digest, &ctxt->h.b8[0], 20);
-#else
-	digest[0] = ctxt->h.b8[3];
-	digest[1] = ctxt->h.b8[2];
-	digest[2] = ctxt->h.b8[1];
-	digest[3] = ctxt->h.b8[0];
-	digest[4] = ctxt->h.b8[7];
-	digest[5] = ctxt->h.b8[6];
-	digest[6] = ctxt->h.b8[5];
-	digest[7] = ctxt->h.b8[4];
-	digest[8] = ctxt->h.b8[11];
-	digest[9] = ctxt->h.b8[10];
-	digest[10] = ctxt->h.b8[9];
-	digest[11] = ctxt->h.b8[8];
-	digest[12] = ctxt->h.b8[15];
-	digest[13] = ctxt->h.b8[14];
-	digest[14] = ctxt->h.b8[13];
-	digest[15] = ctxt->h.b8[12];
-	digest[16] = ctxt->h.b8[19];
-	digest[17] = ctxt->h.b8[18];
-	digest[18] = ctxt->h.b8[17];
-	digest[19] = ctxt->h.b8[16];
-#endif
-}
\ No newline at end of file
diff --git a/external/sha1/sha1.h b/external/sha1/sha1.h
deleted file mode 100644
index 7354d1337..000000000
--- a/external/sha1/sha1.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	contrib/pgcrypto/sha1.h */
-/*	   $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $    */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE PROJECT OR 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.
- */
-/*
- * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * based on: http://www.itl.nist.gov/fipspubs/fip180-1.htm
- * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
- */
-
-#ifndef _NETINET6_SHA1_H_
-#define _NETINET6_SHA1_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdlib.h>
-#include "../../src/stdint.hpp"
-
-struct sha1_ctxt
-{
-	union
-	{
-		uint8_t	b8[20];
-		uint32_t b32[5];
-	} h;
-	union
-	{
-		uint8_t b8[8];
-		uint64_t b64[1];
-	} c;
-	union
-	{
-		uint8_t b8[64];
-		uint32_t b32[16];
-	} m;
-	uint8_t count;
-};
-
-void sha1_init(struct sha1_ctxt *);
-void sha1_pad(struct sha1_ctxt *);
-void sha1_loop(struct sha1_ctxt *, const uint8_t *, size_t);
-void sha1_result(struct sha1_ctxt *, uint8_t *);
-
-//  Compatibility with OpenSSL API
-#define SHA_DIGEST_LENGTH 20
-typedef struct sha1_ctxt SHA_CTX;
-
-#define SHA1_Init(x)            sha1_init((x))
-#define SHA1_Update(x, y, z)    sha1_loop((x), (y), (z))
-#define SHA1_Final(x, y)        sha1_result((y), (x))
-
-#define SHA1_RESULTLEN	(160/8)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif   /* _NETINET6_SHA1_H_ */
diff --git a/external/unity/license.txt b/external/unity/license.txt
deleted file mode 100644
index d66fba53e..000000000
--- a/external/unity/license.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) <year> 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/external/unity/unity.c b/external/unity/unity.c
deleted file mode 100644
index 03dcc02a2..000000000
--- a/external/unity/unity.c
+++ /dev/null
@@ -1,1570 +0,0 @@
-/* =========================================================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-============================================================================ */
-
-#define UNITY_INCLUDE_SETUP_STUBS
-#include "unity.h"
-#include <stddef.h>
-
-/* If omitted from header, declare overrideable prototypes here so they're ready for use */
-#ifdef UNITY_OMIT_OUTPUT_CHAR_HEADER_DECLARATION
-void UNITY_OUTPUT_CHAR(int);
-#endif
-
-/* Helpful macros for us to use here in Assert functions */
-#define UNITY_FAIL_AND_BAIL   { Unity.CurrentTestFailed  = 1; TEST_ABORT(); }
-#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; TEST_ABORT(); }
-#define RETURN_IF_FAIL_OR_IGNORE if (Unity.CurrentTestFailed || Unity.CurrentTestIgnored) return
-
-struct UNITY_STORAGE_T Unity;
-
-#ifdef UNITY_OUTPUT_COLOR
-static const char UnityStrOk[]                     = "\033[42mOK\033[00m";
-static const char UnityStrPass[]                   = "\033[42mPASS\033[00m";
-static const char UnityStrFail[]                   = "\033[41mFAIL\033[00m";
-static const char UnityStrIgnore[]                 = "\033[43mIGNORE\033[00m";
-#else
-static const char UnityStrOk[]                     = "OK";
-static const char UnityStrPass[]                   = "PASS";
-static const char UnityStrFail[]                   = "FAIL";
-static const char UnityStrIgnore[]                 = "IGNORE";
-#endif
-static const char UnityStrNull[]                   = "NULL";
-static const char UnityStrSpacer[]                 = ". ";
-static const char UnityStrExpected[]               = " Expected ";
-static const char UnityStrWas[]                    = " Was ";
-static const char UnityStrGt[]                     = " to be greater than ";
-static const char UnityStrLt[]                     = " to be less than ";
-static const char UnityStrOrEqual[]                = "or equal to ";
-static const char UnityStrElement[]                = " Element ";
-static const char UnityStrByte[]                   = " Byte ";
-static const char UnityStrMemory[]                 = " Memory Mismatch.";
-static const char UnityStrDelta[]                  = " Values Not Within Delta ";
-static const char UnityStrPointless[]              = " You Asked Me To Compare Nothing, Which Was Pointless.";
-static const char UnityStrNullPointerForExpected[] = " Expected pointer to be NULL";
-static const char UnityStrNullPointerForActual[]   = " Actual pointer was NULL";
-#ifndef UNITY_EXCLUDE_FLOAT
-static const char UnityStrNot[]                    = "Not ";
-static const char UnityStrInf[]                    = "Infinity";
-static const char UnityStrNegInf[]                 = "Negative Infinity";
-static const char UnityStrNaN[]                    = "NaN";
-static const char UnityStrDet[]                    = "Determinate";
-static const char UnityStrInvalidFloatTrait[]      = "Invalid Float Trait";
-#endif
-const char UnityStrErrFloat[]                      = "Unity Floating Point Disabled";
-const char UnityStrErrDouble[]                     = "Unity Double Precision Disabled";
-const char UnityStrErr64[]                         = "Unity 64-bit Support Disabled";
-static const char UnityStrBreaker[]                = "-----------------------";
-static const char UnityStrResultsTests[]           = " Tests ";
-static const char UnityStrResultsFailures[]        = " Failures ";
-static const char UnityStrResultsIgnored[]         = " Ignored ";
-static const char UnityStrDetail1Name[]            = UNITY_DETAIL1_NAME " ";
-static const char UnityStrDetail2Name[]            = " " UNITY_DETAIL2_NAME " ";
-
-/*-----------------------------------------------
- * Pretty Printers & Test Result Output Handlers
- *-----------------------------------------------*/
-
-void UnityPrint(const char* string)
-{
-    const char* pch = string;
-
-    if (pch != NULL)
-    {
-        while (*pch)
-        {
-            /* printable characters plus CR & LF are printed */
-            if ((*pch <= 126) && (*pch >= 32))
-            {
-                UNITY_OUTPUT_CHAR(*pch);
-            }
-            /* write escaped carriage returns */
-            else if (*pch == 13)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('r');
-            }
-            /* write escaped line feeds */
-            else if (*pch == 10)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('n');
-            }
-#ifdef UNITY_OUTPUT_COLOR
-            /* print ANSI escape code */
-            else if (*pch == 27 && *(pch + 1) == '[')
-            {
-                while (*pch && *pch != 'm')
-                {
-                    UNITY_OUTPUT_CHAR(*pch);
-                    pch++;
-                }
-                UNITY_OUTPUT_CHAR('m');
-            }
-#endif
-            /* unprintable characters are shown as codes */
-            else
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('x');
-                UnityPrintNumberHex((UNITY_UINT)*pch, 2);
-            }
-            pch++;
-        }
-    }
-}
-
-void UnityPrintLen(const char* string, const UNITY_UINT32 length)
-{
-    const char* pch = string;
-
-    if (pch != NULL)
-    {
-        while (*pch && (UNITY_UINT32)(pch - string) < length)
-        {
-            /* printable characters plus CR & LF are printed */
-            if ((*pch <= 126) && (*pch >= 32))
-            {
-                UNITY_OUTPUT_CHAR(*pch);
-            }
-            /* write escaped carriage returns */
-            else if (*pch == 13)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('r');
-            }
-            /* write escaped line feeds */
-            else if (*pch == 10)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('n');
-            }
-            /* unprintable characters are shown as codes */
-            else
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('x');
-                UnityPrintNumberHex((UNITY_UINT)*pch, 2);
-            }
-            pch++;
-        }
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style)
-{
-    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
-    {
-        UnityPrintNumber(number);
-    }
-    else if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT)
-    {
-        UnityPrintNumberUnsigned((UNITY_UINT)number);
-    }
-    else
-    {
-        UNITY_OUTPUT_CHAR('0');
-        UNITY_OUTPUT_CHAR('x');
-        UnityPrintNumberHex((UNITY_UINT)number, (char)((style & 0xF) * 2));
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityPrintNumber(const UNITY_INT number_to_print)
-{
-    UNITY_UINT number = (UNITY_UINT)number_to_print;
-
-    if (number_to_print < 0)
-    {
-        /* A negative number, including MIN negative */
-        UNITY_OUTPUT_CHAR('-');
-        number = (UNITY_UINT)(-number_to_print);
-    }
-    UnityPrintNumberUnsigned(number);
-}
-
-/*-----------------------------------------------
- * basically do an itoa using as little ram as possible */
-void UnityPrintNumberUnsigned(const UNITY_UINT number)
-{
-    UNITY_UINT divisor = 1;
-
-    /* figure out initial divisor */
-    while (number / divisor > 9)
-    {
-        divisor *= 10;
-    }
-
-    /* now mod and print, then divide divisor */
-    do
-    {
-        UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10)));
-        divisor /= 10;
-    } while (divisor > 0);
-}
-
-/*-----------------------------------------------*/
-void UnityPrintNumberHex(const UNITY_UINT number, const char nibbles_to_print)
-{
-    int nibble;
-    char nibbles = nibbles_to_print;
-    if ((unsigned)nibbles > (2 * sizeof(number)))
-        nibbles = 2 * sizeof(number);
-
-    while (nibbles > 0)
-    {
-        nibbles--;
-        nibble = (int)(number >> (nibbles * 4)) & 0x0F;
-        if (nibble <= 9)
-        {
-            UNITY_OUTPUT_CHAR((char)('0' + nibble));
-        }
-        else
-        {
-            UNITY_OUTPUT_CHAR((char)('A' - 10 + nibble));
-        }
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityPrintMask(const UNITY_UINT mask, const UNITY_UINT number)
-{
-    UNITY_UINT current_bit = (UNITY_UINT)1 << (UNITY_INT_WIDTH - 1);
-    UNITY_INT32 i;
-
-    for (i = 0; i < UNITY_INT_WIDTH; i++)
-    {
-        if (current_bit & mask)
-        {
-            if (current_bit & number)
-            {
-                UNITY_OUTPUT_CHAR('1');
-            }
-            else
-            {
-                UNITY_OUTPUT_CHAR('0');
-            }
-        }
-        else
-        {
-            UNITY_OUTPUT_CHAR('X');
-        }
-        current_bit = current_bit >> 1;
-    }
-}
-
-/*-----------------------------------------------*/
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-/* This function prints a floating-point value in a format similar to
- * printf("%.6g").  It can work with either single- or double-precision,
- * but for simplicity, it prints only 6 significant digits in either case.
- * Printing more than 6 digits accurately is hard (at least in the single-
- * precision case) and isn't attempted here. */
-void UnityPrintFloat(const UNITY_DOUBLE input_number)
-{
-    UNITY_DOUBLE number = input_number;
-
-    /* print minus sign (including for negative zero) */
-    if (number < 0.0f || (number == 0.0f && 1.0f / number < 0.0f))
-    {
-        UNITY_OUTPUT_CHAR('-');
-        number = -number;
-    }
-
-    /* handle zero, NaN, and +/- infinity */
-    if (number == 0.0f) UnityPrint("0");
-    else if (isnan(number)) UnityPrint("nan");
-    else if (isinf(number)) UnityPrint("inf");
-    else
-    {
-        int exponent = 0;
-        int decimals, digits;
-        UNITY_INT32 n;
-        char buf[16];
-
-        /* scale up or down by powers of 10 */
-        while (number < 100000.0f / 1e6f)  { number *= 1e6f; exponent -= 6; }
-        while (number < 100000.0f)         { number *= 10.0f; exponent--; }
-        while (number > 1000000.0f * 1e6f) { number /= 1e6f; exponent += 6; }
-        while (number > 1000000.0f)        { number /= 10.0f; exponent++; }
-
-        /* round to nearest integer */
-        n = ((UNITY_INT32)(number + number) + 1) / 2;
-        if (n > 999999)
-        {
-            n = 100000;
-            exponent++;
-        }
-
-        /* determine where to place decimal point */
-        decimals = (exponent <= 0 && exponent >= -9) ? -exponent : 5;
-        exponent += decimals;
-
-        /* truncate trailing zeroes after decimal point */
-        while (decimals > 0 && n % 10 == 0)
-        {
-            n /= 10;
-            decimals--;
-        }
-
-        /* build up buffer in reverse order */
-        digits = 0;
-        while (n != 0 || digits < decimals + 1)
-        {
-            buf[digits++] = (char)('0' + n % 10);
-            n /= 10;
-        }
-        while (digits > 0)
-        {
-            if(digits == decimals) UNITY_OUTPUT_CHAR('.');
-            UNITY_OUTPUT_CHAR(buf[--digits]);
-        }
-
-        /* print exponent if needed */
-        if (exponent != 0)
-        {
-            UNITY_OUTPUT_CHAR('e');
-
-            if(exponent < 0)
-            {
-                UNITY_OUTPUT_CHAR('-');
-                exponent = -exponent;
-            }
-            else
-            {
-                UNITY_OUTPUT_CHAR('+');
-            }
-
-            digits = 0;
-            while (exponent != 0 || digits < 2)
-            {
-                buf[digits++] = (char)('0' + exponent % 10);
-                exponent /= 10;
-            }
-            while (digits > 0)
-            {
-                UNITY_OUTPUT_CHAR(buf[--digits]);
-            }
-        }
-    }
-}
-#endif /* ! UNITY_EXCLUDE_FLOAT_PRINT */
-
-/*-----------------------------------------------*/
-static void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
-{
-    UnityPrint(file);
-    UNITY_OUTPUT_CHAR(':');
-    UnityPrintNumber((UNITY_INT)line);
-    UNITY_OUTPUT_CHAR(':');
-    UnityPrint(Unity.CurrentTestName);
-    UNITY_OUTPUT_CHAR(':');
-}
-
-/*-----------------------------------------------*/
-static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
-{
-    UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint(UnityStrFail);
-    UNITY_OUTPUT_CHAR(':');
-}
-
-/*-----------------------------------------------*/
-void UnityConcludeTest(void)
-{
-    if (Unity.CurrentTestIgnored)
-    {
-        Unity.TestIgnores++;
-    }
-    else if (!Unity.CurrentTestFailed)
-    {
-        UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber);
-        UnityPrint(UnityStrPass);
-    }
-    else
-    {
-        Unity.TestFailures++;
-    }
-
-    Unity.CurrentTestFailed = 0;
-    Unity.CurrentTestIgnored = 0;
-    UNITY_PRINT_EOL();
-    UNITY_FLUSH_CALL();
-}
-
-/*-----------------------------------------------*/
-static void UnityAddMsgIfSpecified(const char* msg)
-{
-    if (msg)
-    {
-        UnityPrint(UnityStrSpacer);
-#ifndef UNITY_EXCLUDE_DETAILS
-        if (Unity.CurrentDetail1)
-        {
-            UnityPrint(UnityStrDetail1Name);
-            UnityPrint(Unity.CurrentDetail1);
-            if (Unity.CurrentDetail2)
-            {
-                UnityPrint(UnityStrDetail2Name);
-                UnityPrint(Unity.CurrentDetail2);
-            }
-            UnityPrint(UnityStrSpacer);
-        }
-#endif
-        UnityPrint(msg);
-    }
-}
-
-/*-----------------------------------------------*/
-static void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual)
-{
-    UnityPrint(UnityStrExpected);
-    if (expected != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrint(expected);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-    UnityPrint(UnityStrWas);
-    if (actual != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrint(actual);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-}
-
-/*-----------------------------------------------*/
-static void UnityPrintExpectedAndActualStringsLen(const char* expected,
-                                                  const char* actual,
-                                                  const UNITY_UINT32 length)
-{
-    UnityPrint(UnityStrExpected);
-    if (expected != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrintLen(expected, length);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-    UnityPrint(UnityStrWas);
-    if (actual != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrintLen(actual, length);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-}
-
-/*-----------------------------------------------
- * Assertion & Control Helpers
- *-----------------------------------------------*/
-
-static int UnityIsOneArrayNull(UNITY_INTERNAL_PTR expected,
-                               UNITY_INTERNAL_PTR actual,
-                               const UNITY_LINE_TYPE lineNumber,
-                               const char* msg)
-{
-    if (expected == actual) return 0; /* Both are NULL or same pointer */
-
-    /* print and return true if just expected is NULL */
-    if (expected == NULL)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrNullPointerForExpected);
-        UnityAddMsgIfSpecified(msg);
-        return 1;
-    }
-
-    /* print and return true if just actual is NULL */
-    if (actual == NULL)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrNullPointerForActual);
-        UnityAddMsgIfSpecified(msg);
-        return 1;
-    }
-
-    return 0; /* return false if neither is NULL */
-}
-
-/*-----------------------------------------------
- * Assertion Functions
- *-----------------------------------------------*/
-
-void UnityAssertBits(const UNITY_INT mask,
-                     const UNITY_INT expected,
-                     const UNITY_INT actual,
-                     const char* msg,
-                     const UNITY_LINE_TYPE lineNumber)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if ((mask & expected) != (mask & actual))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintMask((UNITY_UINT)mask, (UNITY_UINT)expected);
-        UnityPrint(UnityStrWas);
-        UnityPrintMask((UNITY_UINT)mask, (UNITY_UINT)actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualNumber(const UNITY_INT expected,
-                            const UNITY_INT actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_DISPLAY_STYLE_T style)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (expected != actual)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(expected, style);
-        UnityPrint(UnityStrWas);
-        UnityPrintNumberByStyle(actual, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold,
-                                           const UNITY_INT actual,
-                                           const UNITY_COMPARISON_T compare,
-                                           const char *msg,
-                                           const UNITY_LINE_TYPE lineNumber,
-                                           const UNITY_DISPLAY_STYLE_T style)
-{
-    int failed = 0;
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (threshold == actual && compare & UNITY_EQUAL_TO) return;
-    if (threshold == actual) failed = 1;
-
-    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
-    {
-        if (actual > threshold && compare & UNITY_SMALLER_THAN) failed = 1;
-        if (actual < threshold && compare & UNITY_GREATER_THAN) failed = 1;
-    }
-    else /* UINT or HEX */
-    {
-        if ((UNITY_UINT)actual > (UNITY_UINT)threshold && compare & UNITY_SMALLER_THAN) failed = 1;
-        if ((UNITY_UINT)actual < (UNITY_UINT)threshold && compare & UNITY_GREATER_THAN) failed = 1;
-    }
-
-    if (failed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(actual, style);
-        if (compare & UNITY_GREATER_THAN) UnityPrint(UnityStrGt);
-        if (compare & UNITY_SMALLER_THAN) UnityPrint(UnityStrLt);
-        if (compare & UNITY_EQUAL_TO)     UnityPrint(UnityStrOrEqual);
-        UnityPrintNumberByStyle(threshold, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-#define UnityPrintPointlessAndBail()       \
-{                                          \
-    UnityTestResultsFailBegin(lineNumber); \
-    UnityPrint(UnityStrPointless);         \
-    UnityAddMsgIfSpecified(msg);           \
-    UNITY_FAIL_AND_BAIL; }
-
-/*-----------------------------------------------*/
-void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
-                              UNITY_INTERNAL_PTR actual,
-                              const UNITY_UINT32 num_elements,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style,
-                              const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 elements = num_elements;
-    unsigned int length   = style & 0xF;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (num_elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull(expected, actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while ((elements > 0) && elements--)
-    {
-        UNITY_INT expect_val;
-        UNITY_INT actual_val;
-        switch (length)
-        {
-            case 1:
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)actual;
-                break;
-            case 2:
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)actual;
-                break;
-#ifdef UNITY_SUPPORT_64
-            case 8:
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT64*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT64*)actual;
-                break;
-#endif
-            default: /* length 4 bytes */
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)actual;
-                length = 4;
-                break;
-        }
-
-        if (expect_val != actual_val)
-        {
-            if (style & UNITY_DISPLAY_RANGE_UINT && length < sizeof(expect_val))
-            {   /* For UINT, remove sign extension (padding 1's) from signed type casts above */
-                UNITY_INT mask = 1;
-                mask = (mask << 8 * length) - 1;
-                expect_val &= mask;
-                actual_val &= mask;
-            }
-            UnityTestResultsFailBegin(lineNumber);
-            UnityPrint(UnityStrElement);
-            UnityPrintNumberUnsigned(num_elements - elements - 1);
-            UnityPrint(UnityStrExpected);
-            UnityPrintNumberByStyle(expect_val, style);
-            UnityPrint(UnityStrWas);
-            UnityPrintNumberByStyle(actual_val, style);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            expected = (UNITY_INTERNAL_PTR)(length + (const char*)expected);
-        }
-        actual   = (UNITY_INTERNAL_PTR)(length + (const char*)actual);
-    }
-}
-
-/*-----------------------------------------------*/
-#ifndef UNITY_EXCLUDE_FLOAT
-/* Wrap this define in a function with variable types as float or double */
-#define UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff)                       \
-    if (isinf(expected) && isinf(actual) && ((expected < 0) == (actual < 0))) return 1;   \
-    if (UNITY_NAN_CHECK) return 1;                                                        \
-    diff = actual - expected;                                                             \
-    if (diff < 0) diff = -diff;                                                           \
-    if (delta < 0) delta = -delta;                                                        \
-    return !(isnan(diff) || isinf(diff) || (diff > delta))
-    /* This first part of this condition will catch any NaN or Infinite values */
-#ifndef UNITY_NAN_NOT_EQUAL_NAN
-  #define UNITY_NAN_CHECK isnan(expected) && isnan(actual)
-#else
-  #define UNITY_NAN_CHECK 0
-#endif
-
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-  #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
-  {                                                               \
-    UnityPrint(UnityStrExpected);                                 \
-    UnityPrintFloat(expected);                                    \
-    UnityPrint(UnityStrWas);                                      \
-    UnityPrintFloat(actual); }
-#else
-  #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
-    UnityPrint(UnityStrDelta)
-#endif /* UNITY_EXCLUDE_FLOAT_PRINT */
-
-static int UnityFloatsWithin(UNITY_FLOAT delta, UNITY_FLOAT expected, UNITY_FLOAT actual)
-{
-    UNITY_FLOAT diff;
-    UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff);
-}
-
-void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* expected,
-                                UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* actual,
-                                const UNITY_UINT32 num_elements,
-                                const char* msg,
-                                const UNITY_LINE_TYPE lineNumber,
-                                const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 elements = num_elements;
-    UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* ptr_expected = expected;
-    UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* ptr_actual = actual;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        if (!UnityFloatsWithin(*ptr_expected * UNITY_FLOAT_PRECISION, *ptr_expected, *ptr_actual))
-        {
-            UnityTestResultsFailBegin(lineNumber);
-            UnityPrint(UnityStrElement);
-            UnityPrintNumberUnsigned(num_elements - elements - 1);
-            UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT((UNITY_DOUBLE)*ptr_expected, (UNITY_DOUBLE)*ptr_actual);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            ptr_expected++;
-        }
-        ptr_actual++;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertFloatsWithin(const UNITY_FLOAT delta,
-                             const UNITY_FLOAT expected,
-                             const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-
-    if (!UnityFloatsWithin(delta, expected, actual))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT((UNITY_DOUBLE)expected, (UNITY_DOUBLE)actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertFloatSpecial(const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber,
-                             const UNITY_FLOAT_TRAIT_T style)
-{
-    const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
-    UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
-    UNITY_INT is_trait        = !should_be_trait;
-    UNITY_INT trait_index     = (UNITY_INT)(style >> 1);
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    switch (style)
-    {
-        case UNITY_FLOAT_IS_INF:
-        case UNITY_FLOAT_IS_NOT_INF:
-            is_trait = isinf(actual) && (actual > 0);
-            break;
-        case UNITY_FLOAT_IS_NEG_INF:
-        case UNITY_FLOAT_IS_NOT_NEG_INF:
-            is_trait = isinf(actual) && (actual < 0);
-            break;
-
-        case UNITY_FLOAT_IS_NAN:
-        case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual) ? 1 : 0;
-            break;
-
-        case UNITY_FLOAT_IS_DET: /* A determinate number is non infinite and not NaN. */
-        case UNITY_FLOAT_IS_NOT_DET:
-            is_trait = !isinf(actual) && !isnan(actual);
-            break;
-
-        default:
-            trait_index = 0;
-            trait_names[0] = UnityStrInvalidFloatTrait;
-            break;
-    }
-
-    if (is_trait != should_be_trait)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        if (!should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-        UnityPrint(UnityStrWas);
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-        UnityPrintFloat((UNITY_DOUBLE)actual);
-#else
-        if (should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-#endif
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-#endif /* not UNITY_EXCLUDE_FLOAT */
-
-/*-----------------------------------------------*/
-#ifndef UNITY_EXCLUDE_DOUBLE
-static int UnityDoublesWithin(UNITY_DOUBLE delta, UNITY_DOUBLE expected, UNITY_DOUBLE actual)
-{
-    UNITY_DOUBLE diff;
-    UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff);
-}
-
-void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* expected,
-                                 UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* actual,
-                                 const UNITY_UINT32 num_elements,
-                                 const char* msg,
-                                 const UNITY_LINE_TYPE lineNumber,
-                                 const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 elements = num_elements;
-    UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* ptr_expected = expected;
-    UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* ptr_actual = actual;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        if (!UnityDoublesWithin(*ptr_expected * UNITY_DOUBLE_PRECISION, *ptr_expected, *ptr_actual))
-        {
-            UnityTestResultsFailBegin(lineNumber);
-            UnityPrint(UnityStrElement);
-            UnityPrintNumberUnsigned(num_elements - elements - 1);
-            UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(*ptr_expected, *ptr_actual);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            ptr_expected++;
-        }
-        ptr_actual++;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertDoublesWithin(const UNITY_DOUBLE delta,
-                              const UNITY_DOUBLE expected,
-                              const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (!UnityDoublesWithin(delta, expected, actual))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-
-void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_FLOAT_TRAIT_T style)
-{
-    const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
-    UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
-    UNITY_INT is_trait        = !should_be_trait;
-    UNITY_INT trait_index     = (UNITY_INT)(style >> 1);
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    switch (style)
-    {
-        case UNITY_FLOAT_IS_INF:
-        case UNITY_FLOAT_IS_NOT_INF:
-            is_trait = isinf(actual) && (actual > 0);
-            break;
-        case UNITY_FLOAT_IS_NEG_INF:
-        case UNITY_FLOAT_IS_NOT_NEG_INF:
-            is_trait = isinf(actual) && (actual < 0);
-            break;
-
-        case UNITY_FLOAT_IS_NAN:
-        case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual) ? 1 : 0;
-            break;
-
-        case UNITY_FLOAT_IS_DET: /* A determinate number is non infinite and not NaN. */
-        case UNITY_FLOAT_IS_NOT_DET:
-            is_trait = !isinf(actual) && !isnan(actual);
-            break;
-
-        default:
-            trait_index = 0;
-            trait_names[0] = UnityStrInvalidFloatTrait;
-            break;
-    }
-
-    if (is_trait != should_be_trait)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        if (!should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-        UnityPrint(UnityStrWas);
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-        UnityPrintFloat(actual);
-#else
-        if (should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-#endif
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-#endif /* not UNITY_EXCLUDE_DOUBLE */
-
-/*-----------------------------------------------*/
-void UnityAssertNumbersWithin(const UNITY_UINT delta,
-                              const UNITY_INT expected,
-                              const UNITY_INT actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
-    {
-        if (actual > expected)
-          Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(actual - expected) > delta);
-        else
-            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(expected - actual) > delta);
-    }
-    else
-    {
-        if ((UNITY_UINT)actual > (UNITY_UINT)expected)
-            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(actual - expected) > delta);
-        else
-            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(expected - actual) > delta);
-    }
-
-    if (Unity.CurrentTestFailed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrDelta);
-        UnityPrintNumberByStyle((UNITY_INT)delta, style);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(expected, style);
-        UnityPrint(UnityStrWas);
-        UnityPrintNumberByStyle(actual, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualString(const char* expected,
-                            const char* actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber)
-{
-    UNITY_UINT32 i;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    /* if both pointers not null compare the strings */
-    if (expected && actual)
-    {
-        for (i = 0; expected[i] || actual[i]; i++)
-        {
-            if (expected[i] != actual[i])
-            {
-                Unity.CurrentTestFailed = 1;
-                break;
-            }
-        }
-    }
-    else
-    { /* handle case of one pointers being null (if both null, test should pass) */
-        if (expected != actual)
-        {
-            Unity.CurrentTestFailed = 1;
-        }
-    }
-
-    if (Unity.CurrentTestFailed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrintExpectedAndActualStrings(expected, actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualStringLen(const char* expected,
-                               const char* actual,
-                               const UNITY_UINT32 length,
-                               const char* msg,
-                               const UNITY_LINE_TYPE lineNumber)
-{
-    UNITY_UINT32 i;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    /* if both pointers not null compare the strings */
-    if (expected && actual)
-    {
-        for (i = 0; (i < length) && (expected[i] || actual[i]); i++)
-        {
-            if (expected[i] != actual[i])
-            {
-                Unity.CurrentTestFailed = 1;
-                break;
-            }
-        }
-    }
-    else
-    { /* handle case of one pointers being null (if both null, test should pass) */
-        if (expected != actual)
-        {
-            Unity.CurrentTestFailed = 1;
-        }
-    }
-
-    if (Unity.CurrentTestFailed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrintExpectedAndActualStringsLen(expected, actual, length);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
-                                 const char** actual,
-                                 const UNITY_UINT32 num_elements,
-                                 const char* msg,
-                                 const UNITY_LINE_TYPE lineNumber,
-                                 const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 i = 0;
-    UNITY_UINT32 j = 0;
-    const char* expd = NULL;
-    const char* act = NULL;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    /* if no elements, it's an error */
-    if (num_elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if ((const void*)expected == (const void*)actual)
-    {
-        return; /* Both are NULL or same pointer */
-    }
-
-    if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
-    {
-        UNITY_FAIL_AND_BAIL;
-    }
-
-    if (flags != UNITY_ARRAY_TO_ARRAY)
-    {
-        expd = (const char*)expected;
-    }
-
-    do
-    {
-        act = actual[j];
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            expd = ((const char* const*)expected)[j];
-        }
-
-        /* if both pointers not null compare the strings */
-        if (expd && act)
-        {
-            for (i = 0; expd[i] || act[i]; i++)
-            {
-                if (expd[i] != act[i])
-                {
-                    Unity.CurrentTestFailed = 1;
-                    break;
-                }
-            }
-        }
-        else
-        { /* handle case of one pointers being null (if both null, test should pass) */
-            if (expd != act)
-            {
-                Unity.CurrentTestFailed = 1;
-            }
-        }
-
-        if (Unity.CurrentTestFailed)
-        {
-            UnityTestResultsFailBegin(lineNumber);
-            if (num_elements > 1)
-            {
-                UnityPrint(UnityStrElement);
-                UnityPrintNumberUnsigned(j);
-            }
-            UnityPrintExpectedAndActualStrings(expd, act);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-    } while (++j < num_elements);
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualMemory(UNITY_INTERNAL_PTR expected,
-                            UNITY_INTERNAL_PTR actual,
-                            const UNITY_UINT32 length,
-                            const UNITY_UINT32 num_elements,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_FLAGS_T flags)
-{
-    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected;
-    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE const unsigned char*)actual;
-    UNITY_UINT32 elements = num_elements;
-    UNITY_UINT32 bytes;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if ((elements == 0) || (length == 0))
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull(expected, actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        bytes = length;
-        while (bytes--)
-        {
-            if (*ptr_exp != *ptr_act)
-            {
-                UnityTestResultsFailBegin(lineNumber);
-                UnityPrint(UnityStrMemory);
-                if (num_elements > 1)
-                {
-                    UnityPrint(UnityStrElement);
-                    UnityPrintNumberUnsigned(num_elements - elements - 1);
-                }
-                UnityPrint(UnityStrByte);
-                UnityPrintNumberUnsigned(length - bytes - 1);
-                UnityPrint(UnityStrExpected);
-                UnityPrintNumberByStyle(*ptr_exp, UNITY_DISPLAY_STYLE_HEX8);
-                UnityPrint(UnityStrWas);
-                UnityPrintNumberByStyle(*ptr_act, UNITY_DISPLAY_STYLE_HEX8);
-                UnityAddMsgIfSpecified(msg);
-                UNITY_FAIL_AND_BAIL;
-            }
-            ptr_exp++;
-            ptr_act++;
-        }
-        if (flags == UNITY_ARRAY_TO_VAL)
-        {
-            ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected;
-        }
-    }
-}
-
-/*-----------------------------------------------*/
-
-static union
-{
-    UNITY_INT8 i8;
-    UNITY_INT16 i16;
-    UNITY_INT32 i32;
-#ifdef UNITY_SUPPORT_64
-    UNITY_INT64 i64;
-#endif
-#ifndef UNITY_EXCLUDE_FLOAT
-    float f;
-#endif
-#ifndef UNITY_EXCLUDE_DOUBLE
-    double d;
-#endif
-} UnityQuickCompare;
-
-UNITY_INTERNAL_PTR UnityNumToPtr(const UNITY_INT num, const UNITY_UINT8 size)
-{
-    switch(size)
-    {
-        case 1:
-          UnityQuickCompare.i8 = (UNITY_INT8)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i8);
-
-        case 2:
-          UnityQuickCompare.i16 = (UNITY_INT16)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i16);
-
-#ifdef UNITY_SUPPORT_64
-        case 8:
-          UnityQuickCompare.i64 = (UNITY_INT64)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i64);
-#endif
-        default: /* 4 bytes */
-          UnityQuickCompare.i32 = (UNITY_INT32)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i32);
-    }
-}
-
-#ifndef UNITY_EXCLUDE_FLOAT
-UNITY_INTERNAL_PTR UnityFloatToPtr(const float num)
-{
-    UnityQuickCompare.f = num;
-    return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.f);
-}
-#endif
-
-#ifndef UNITY_EXCLUDE_DOUBLE
-UNITY_INTERNAL_PTR UnityDoubleToPtr(const double num)
-{
-    UnityQuickCompare.d = num;
-    return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.d);
-}
-#endif
-
-/*-----------------------------------------------
- * Control Functions
- *-----------------------------------------------*/
-
-void UnityFail(const char* msg, const UNITY_LINE_TYPE line)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint(UnityStrFail);
-    if (msg != NULL)
-    {
-        UNITY_OUTPUT_CHAR(':');
-
-#ifndef UNITY_EXCLUDE_DETAILS
-        if (Unity.CurrentDetail1)
-        {
-            UnityPrint(UnityStrDetail1Name);
-            UnityPrint(Unity.CurrentDetail1);
-            if (Unity.CurrentDetail2)
-            {
-                UnityPrint(UnityStrDetail2Name);
-                UnityPrint(Unity.CurrentDetail2);
-            }
-            UnityPrint(UnityStrSpacer);
-        }
-#endif
-        if (msg[0] != ' ')
-        {
-            UNITY_OUTPUT_CHAR(' ');
-        }
-        UnityPrint(msg);
-    }
-
-    UNITY_FAIL_AND_BAIL;
-}
-
-/*-----------------------------------------------*/
-void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint(UnityStrIgnore);
-    if (msg != NULL)
-    {
-        UNITY_OUTPUT_CHAR(':');
-        UNITY_OUTPUT_CHAR(' ');
-        UnityPrint(msg);
-    }
-    UNITY_IGNORE_AND_BAIL;
-}
-
-/*-----------------------------------------------*/
-void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)
-{
-    Unity.CurrentTestName = FuncName;
-    Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)FuncLineNum;
-    Unity.NumberOfTests++;
-    UNITY_CLR_DETAILS();
-    if (TEST_PROTECT())
-    {
-        setUp();
-        Func();
-    }
-    if (TEST_PROTECT())
-    {
-        tearDown();
-    }
-    UnityConcludeTest();
-}
-
-/*-----------------------------------------------*/
-void UnityBegin(const char* filename)
-{
-    Unity.TestFile = filename;
-    Unity.CurrentTestName = NULL;
-    Unity.CurrentTestLineNumber = 0;
-    Unity.NumberOfTests = 0;
-    Unity.TestFailures = 0;
-    Unity.TestIgnores = 0;
-    Unity.CurrentTestFailed = 0;
-    Unity.CurrentTestIgnored = 0;
-
-    UNITY_CLR_DETAILS();
-    UNITY_OUTPUT_START();
-}
-
-/*-----------------------------------------------*/
-int UnityEnd(void)
-{
-    UNITY_PRINT_EOL();
-    UnityPrint(UnityStrBreaker);
-    UNITY_PRINT_EOL();
-    UnityPrintNumber((UNITY_INT)(Unity.NumberOfTests));
-    UnityPrint(UnityStrResultsTests);
-    UnityPrintNumber((UNITY_INT)(Unity.TestFailures));
-    UnityPrint(UnityStrResultsFailures);
-    UnityPrintNumber((UNITY_INT)(Unity.TestIgnores));
-    UnityPrint(UnityStrResultsIgnored);
-    UNITY_PRINT_EOL();
-    if (Unity.TestFailures == 0U)
-    {
-        UnityPrint(UnityStrOk);
-    }
-    else
-    {
-        UnityPrint(UnityStrFail);
-#ifdef UNITY_DIFFERENTIATE_FINAL_FAIL
-        UNITY_OUTPUT_CHAR('E'); UNITY_OUTPUT_CHAR('D');
-#endif
-    }
-    UNITY_PRINT_EOL();
-    UNITY_FLUSH_CALL();
-    UNITY_OUTPUT_COMPLETE();
-    return (int)(Unity.TestFailures);
-}
-
-/*-----------------------------------------------
- * Command Line Argument Support
- *-----------------------------------------------*/
-#ifdef UNITY_USE_COMMAND_LINE_ARGS
-
-char* UnityOptionIncludeNamed = NULL;
-char* UnityOptionExcludeNamed = NULL;
-int UnityVerbosity            = 1;
-
-int UnityParseOptions(int argc, char** argv)
-{
-    UnityOptionIncludeNamed = NULL;
-    UnityOptionExcludeNamed = NULL;
-
-    for (int i = 1; i < argc; i++)
-    {
-        if (argv[i][0] == '-')
-        {
-            switch (argv[i][1])
-            {
-                case 'l': /* list tests */
-                    return -1;
-                case 'n': /* include tests with name including this string */
-                case 'f': /* an alias for -n */
-                    if (argv[i][2] == '=')
-                        UnityOptionIncludeNamed = &argv[i][3];
-                    else if (++i < argc)
-                        UnityOptionIncludeNamed = argv[i];
-                    else
-                    {
-                        UnityPrint("ERROR: No Test String to Include Matches For");
-                        UNITY_PRINT_EOL();
-                        return 1;
-                    }
-                    break;
-                case 'q': /* quiet */
-                    UnityVerbosity = 0;
-                    break;
-                case 'v': /* verbose */
-                    UnityVerbosity = 2;
-                    break;
-                case 'x': /* exclude tests with name including this string */
-                    if (argv[i][2] == '=')
-                        UnityOptionExcludeNamed = &argv[i][3];
-                    else if (++i < argc)
-                        UnityOptionExcludeNamed = argv[i];
-                    else
-                    {
-                        UnityPrint("ERROR: No Test String to Exclude Matches For");
-                        UNITY_PRINT_EOL();
-                        return 1;
-                    }
-                    break;
-                default:
-                    UnityPrint("ERROR: Unknown Option ");
-                    UNITY_OUTPUT_CHAR(argv[i][1]);
-                    UNITY_PRINT_EOL();
-                    return 1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int IsStringInBiggerString(const char* longstring, const char* shortstring)
-{
-    const char* lptr = longstring;
-    const char* sptr = shortstring;
-    const char* lnext = lptr;
-
-    if (*sptr == '*')
-        return 1;
-
-    while (*lptr)
-    {
-        lnext = lptr + 1;
-
-        /* If they current bytes match, go on to the next bytes */
-        while (*lptr && *sptr && (*lptr == *sptr))
-        {
-            lptr++;
-            sptr++;
-
-            /* We're done if we match the entire string or up to a wildcard */
-            if (*sptr == '*')
-                return 1;
-            if (*sptr == ',')
-                return 1;
-            if (*sptr == '"')
-                return 1;
-            if (*sptr == '\'')
-                return 1;
-            if (*sptr == ':')
-                return 2;
-            if (*sptr == 0)
-                return 1;
-        }
-
-        /* Otherwise we start in the long pointer 1 character further and try again */
-        lptr = lnext;
-        sptr = shortstring;
-    }
-    return 0;
-}
-
-int UnityStringArgumentMatches(const char* str)
-{
-    int retval;
-    const char* ptr1;
-    const char* ptr2;
-    const char* ptrf;
-
-    /* Go through the options and get the substrings for matching one at a time */
-    ptr1 = str;
-    while (ptr1[0] != 0)
-    {
-        if ((ptr1[0] == '"') || (ptr1[0] == '\''))
-            ptr1++;
-
-        /* look for the start of the next partial */
-        ptr2 = ptr1;
-        ptrf = 0;
-        do
-        {
-            ptr2++;
-            if ((ptr2[0] == ':') && (ptr2[1] != 0) && (ptr2[0] != '\'') && (ptr2[0] != '"') && (ptr2[0] != ','))
-                ptrf = &ptr2[1];
-        } while ((ptr2[0] != 0) && (ptr2[0] != '\'') && (ptr2[0] != '"') && (ptr2[0] != ','));
-        while ((ptr2[0] != 0) && ((ptr2[0] == ':') || (ptr2[0] == '\'') || (ptr2[0] == '"') || (ptr2[0] == ',')))
-            ptr2++;
-
-        /* done if complete filename match */
-        retval = IsStringInBiggerString(Unity.TestFile, ptr1);
-        if (retval == 1)
-            return retval;
-
-        /* done if testname match after filename partial match */
-        if ((retval == 2) && (ptrf != 0))
-        {
-            if (IsStringInBiggerString(Unity.CurrentTestName, ptrf))
-                return 1;
-        }
-
-        /* done if complete testname match */
-        if (IsStringInBiggerString(Unity.CurrentTestName, ptr1) == 1)
-            return 1;
-
-        ptr1 = ptr2;
-    }
-
-    /* we couldn't find a match for any substrings */
-    return 0;
-}
-
-int UnityTestMatches(void)
-{
-    /* Check if this test name matches the included test pattern */
-    int retval;
-    if (UnityOptionIncludeNamed)
-    {
-        retval = UnityStringArgumentMatches(UnityOptionIncludeNamed);
-    }
-    else
-        retval = 1;
-
-    /* Check if this test name matches the excluded test pattern */
-    if (UnityOptionExcludeNamed)
-    {
-        if (UnityStringArgumentMatches(UnityOptionExcludeNamed))
-            retval = 0;
-    }
-    return retval;
-}
-
-#endif /* UNITY_USE_COMMAND_LINE_ARGS */
-/*-----------------------------------------------*/
diff --git a/external/unity/unity.h b/external/unity/unity.h
deleted file mode 100644
index 32ff0e6df..000000000
--- a/external/unity/unity.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/* ==========================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-========================================== */
-
-#ifndef UNITY_FRAMEWORK_H
-#define UNITY_FRAMEWORK_H
-#define UNITY
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include "unity_internals.h"
-
-/*-------------------------------------------------------
- * Test Setup / Teardown
- *-------------------------------------------------------*/
-
-/* These functions are intended to be called before and after each test. */
-void setUp(void);
-void tearDown(void);
-
-/* These functions are intended to be called at the beginning and end of an
- * entire test suite.  suiteTearDown() is passed the number of tests that
- * failed, and its return value becomes the exit code of main(). */
-void suiteSetUp(void);
-int suiteTearDown(int num_failures);
-
-/* If the compiler supports it, the following block provides stub
- * implementations of the above functions as weak symbols.  Note that on
- * some platforms (MinGW for example), weak function implementations need
- * to be in the same translation unit they are called from.  This can be
- * achieved by defining UNITY_INCLUDE_SETUP_STUBS before including unity.h. */
-#ifdef UNITY_INCLUDE_SETUP_STUBS
-  #ifdef UNITY_WEAK_ATTRIBUTE
-    UNITY_WEAK_ATTRIBUTE void setUp(void) { }
-    UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
-    UNITY_WEAK_ATTRIBUTE void suiteSetUp(void) { }
-    UNITY_WEAK_ATTRIBUTE int suiteTearDown(int num_failures) { return num_failures; }
-  #elif defined(UNITY_WEAK_PRAGMA)
-    #pragma weak setUp
-    void setUp(void) { }
-    #pragma weak tearDown
-    void tearDown(void) { }
-    #pragma weak suiteSetUp
-    void suiteSetUp(void) { }
-    #pragma weak suiteTearDown
-    int suiteTearDown(int num_failures) { return num_failures; }
-  #endif
-#endif
-
-/*-------------------------------------------------------
- * Configuration Options
- *-------------------------------------------------------
- * All options described below should be passed as a compiler flag to all files using Unity. If you must add #defines, place them BEFORE the #include above.
-
- * Integers/longs/pointers
- *     - Unity attempts to automatically discover your integer sizes
- *       - define UNITY_EXCLUDE_STDINT_H to stop attempting to look in <stdint.h>
- *       - define UNITY_EXCLUDE_LIMITS_H to stop attempting to look in <limits.h>
- *     - If you cannot use the automatic methods above, you can force Unity by using these options:
- *       - define UNITY_SUPPORT_64
- *       - set UNITY_INT_WIDTH
- *       - set UNITY_LONG_WIDTH
- *       - set UNITY_POINTER_WIDTH
-
- * Floats
- *     - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons
- *     - define UNITY_FLOAT_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_FLOAT
- *     - define UNITY_FLOAT_TYPE to specify doubles instead of single precision floats
- *     - define UNITY_INCLUDE_DOUBLE to allow double floating point comparisons
- *     - define UNITY_EXCLUDE_DOUBLE to disallow double floating point comparisons (default)
- *     - define UNITY_DOUBLE_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_DOUBLE
- *     - define UNITY_DOUBLE_TYPE to specify something other than double
- *     - define UNITY_EXCLUDE_FLOAT_PRINT to trim binary size, won't print floating point values in errors
-
- * Output
- *     - by default, Unity prints to standard out with putchar.  define UNITY_OUTPUT_CHAR(a) with a different function if desired
- *     - define UNITY_DIFFERENTIATE_FINAL_FAIL to print FAILED (vs. FAIL) at test end summary - for automated search for failure
-
- * Optimization
- *     - by default, line numbers are stored in unsigned shorts.  Define UNITY_LINE_TYPE with a different type if your files are huge
- *     - by default, test and failure counters are unsigned shorts.  Define UNITY_COUNTER_TYPE with a different type if you want to save space or have more than 65535 Tests.
-
- * Test Cases
- *     - define UNITY_SUPPORT_TEST_CASES to include the TEST_CASE macro, though really it's mostly about the runner generator script
-
- * Parameterized Tests
- *     - you'll want to create a define of TEST_CASE(...) which basically evaluates to nothing
-
- * Tests with Arguments
- *     - you'll want to define UNITY_USE_COMMAND_LINE_ARGS if you have the test runner passing arguments to Unity
-
- *-------------------------------------------------------
- * Basic Fail and Ignore
- *-------------------------------------------------------*/
-
-#define TEST_FAIL_MESSAGE(message)                                                                 UNITY_TEST_FAIL(__LINE__, (message))
-#define TEST_FAIL()                                                                                UNITY_TEST_FAIL(__LINE__, NULL)
-#define TEST_IGNORE_MESSAGE(message)                                                               UNITY_TEST_IGNORE(__LINE__, (message))
-#define TEST_IGNORE()                                                                              UNITY_TEST_IGNORE(__LINE__, NULL)
-#define TEST_ONLY()
-
-/* It is not necessary for you to call PASS. A PASS condition is assumed if nothing fails.
- * This method allows you to abort a test immediately with a PASS state, ignoring the remainder of the test. */
-#define TEST_PASS()                                                                                TEST_ABORT()
-
-/* This macro does nothing, but it is useful for build tools (like Ceedling) to make use of this to figure out
- * which files should be linked to in order to perform a test. Use it like TEST_FILE("sandwiches.c") */
-#define TEST_FILE(a)
-
-/*-------------------------------------------------------
- * Test Asserts (simple)
- *-------------------------------------------------------*/
-
-/* Boolean */
-#define TEST_ASSERT(condition)                                                                     UNITY_TEST_ASSERT(       (condition), __LINE__, " Expression Evaluated To FALSE")
-#define TEST_ASSERT_TRUE(condition)                                                                UNITY_TEST_ASSERT(       (condition), __LINE__, " Expected TRUE Was FALSE")
-#define TEST_ASSERT_UNLESS(condition)                                                              UNITY_TEST_ASSERT(      !(condition), __LINE__, " Expression Evaluated To TRUE")
-#define TEST_ASSERT_FALSE(condition)                                                               UNITY_TEST_ASSERT(      !(condition), __LINE__, " Expected FALSE Was TRUE")
-#define TEST_ASSERT_NULL(pointer)                                                                  UNITY_TEST_ASSERT_NULL(    (pointer), __LINE__, " Expected NULL")
-#define TEST_ASSERT_NOT_NULL(pointer)                                                              UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, " Expected Non-NULL")
-
-/* Integers (of all sizes) */
-#define TEST_ASSERT_EQUAL_INT(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT8(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT16(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT32(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT64(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL(expected, actual)                                                        UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_NOT_EQUAL(expected, actual)                                                    UNITY_TEST_ASSERT(((expected) !=  (actual)), __LINE__, " Expected Not-Equal")
-#define TEST_ASSERT_EQUAL_UINT(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT8(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT16(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT32(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT64(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX8(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX16(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX32(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX64(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BITS(mask, expected, actual)                                                   UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BITS_HIGH(mask, actual)                                                        UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(-1), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BITS_LOW(mask, actual)                                                         UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(0), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BIT_HIGH(bit, actual)                                                          UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(-1), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BIT_LOW(bit, actual)                                                           UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(0), (actual), __LINE__, NULL)
-
-/* Integer Greater Than/ Less Than (of all sizes) */
-#define TEST_ASSERT_GREATER_THAN(threshold, actual)                                                UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT(threshold, actual)                                            UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT8(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT16(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT32(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT64(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX64((threshold), (actual), __LINE__, NULL)
-
-#define TEST_ASSERT_LESS_THAN(threshold, actual)                                                   UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT(threshold, actual)                                               UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT8(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT16(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT32(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT64(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT8(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT16(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT32(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT64(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX8(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX16(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX32(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX64(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX64((threshold), (actual), __LINE__, NULL)
-
-#define TEST_ASSERT_GREATER_OR_EQUAL(threshold, actual)                                            UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT(threshold, actual)                                        UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT8(threshold, actual)                                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT16(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT32(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT(threshold, actual)                                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT8(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT16(threshold, actual)                                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT32(threshold, actual)                                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual)                                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX8(threshold, actual)                                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX16(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX32(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64((threshold), (actual), __LINE__, NULL)
-
-#define TEST_ASSERT_LESS_OR_EQUAL(threshold, actual)                                               UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT(threshold, actual)                                           UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT8(threshold, actual)                                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT16(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT32(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT64(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT(threshold, actual)                                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT8(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT16(threshold, actual)                                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT32(threshold, actual)                                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT64(threshold, actual)                                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX8(threshold, actual)                                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX16(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX32(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX64(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64((threshold), (actual), __LINE__, NULL)
-
-/* Integer Ranges (of all sizes) */
-#define TEST_ASSERT_INT_WITHIN(delta, expected, actual)                                            UNITY_TEST_ASSERT_INT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT8_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_INT8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT16_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT16_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT32_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT64_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT64_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_UINT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT8_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_UINT8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT16_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT16_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT32_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT64_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT64_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX_WITHIN(delta, expected, actual)                                            UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX8_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_HEX8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX16_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX16_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX32_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX64_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX64_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-
-/* Structs and Strings */
-#define TEST_ASSERT_EQUAL_PTR(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_STRING(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_STRING((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_STRING_LEN(expected, actual, len)                                        UNITY_TEST_ASSERT_EQUAL_STRING_LEN((expected), (actual), (len), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_MEMORY(expected, actual, len)                                            UNITY_TEST_ASSERT_EQUAL_MEMORY((expected), (actual), (len), __LINE__, NULL)
-
-/* Arrays */
-#define TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_INT_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements)                        UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY((expected), (actual), (len), (num_elements), __LINE__, NULL)
-
-/* Arrays Compared To Single Value */
-#define TEST_ASSERT_EACH_EQUAL_INT(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_INT((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT8(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_INT8((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT16(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_INT16((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT32(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_INT32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT64(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_INT64((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_UINT((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT8(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_UINT8((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT16(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_UINT16((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT32(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_UINT32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT64(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_UINT64((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX8(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_HEX8((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX16(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_HEX16((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX32(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX64(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_HEX64((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_PTR(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_PTR((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_STRING(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_STRING((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_MEMORY(expected, actual, len, num_elements)                         UNITY_TEST_ASSERT_EACH_EQUAL_MEMORY((expected), (actual), (len), (num_elements), __LINE__, NULL)
-
-/* Floating Point (If Enabled) */
-#define TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_FLOAT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_FLOAT(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_FLOAT((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_FLOAT(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_INF(actual)                                                           UNITY_TEST_ASSERT_FLOAT_IS_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NEG_INF(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NAN(actual)                                                           UNITY_TEST_ASSERT_FLOAT_IS_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_DETERMINATE(actual)                                                   UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_INF(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual)                                                   UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_NAN(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual)                                               UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE((actual), __LINE__, NULL)
-
-/* Double (If Enabled) */
-#define TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_DOUBLE_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_DOUBLE(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_DOUBLE((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_DOUBLE(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_INF(actual)                                                          UNITY_TEST_ASSERT_DOUBLE_IS_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NEG_INF(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NAN(actual)                                                          UNITY_TEST_ASSERT_DOUBLE_IS_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual)                                                  UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_INF(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual)                                                  UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual)                                              UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE((actual), __LINE__, NULL)
-
-/*-------------------------------------------------------
- * Test Asserts (with additional messages)
- *-------------------------------------------------------*/
-
-/* Boolean */
-#define TEST_ASSERT_MESSAGE(condition, message)                                                    UNITY_TEST_ASSERT(       (condition), __LINE__, (message))
-#define TEST_ASSERT_TRUE_MESSAGE(condition, message)                                               UNITY_TEST_ASSERT(       (condition), __LINE__, (message))
-#define TEST_ASSERT_UNLESS_MESSAGE(condition, message)                                             UNITY_TEST_ASSERT(      !(condition), __LINE__, (message))
-#define TEST_ASSERT_FALSE_MESSAGE(condition, message)                                              UNITY_TEST_ASSERT(      !(condition), __LINE__, (message))
-#define TEST_ASSERT_NULL_MESSAGE(pointer, message)                                                 UNITY_TEST_ASSERT_NULL(    (pointer), __LINE__, (message))
-#define TEST_ASSERT_NOT_NULL_MESSAGE(pointer, message)                                             UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, (message))
-
-/* Integers (of all sizes) */
-#define TEST_ASSERT_EQUAL_INT_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT8_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT16_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT32_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT64_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_MESSAGE(expected, actual, message)                                       UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_NOT_EQUAL_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT(((expected) !=  (actual)), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT8_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT16_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT32_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT64_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX8_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX16_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX32_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX64_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_BITS_MESSAGE(mask, expected, actual, message)                                  UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_BITS_HIGH_MESSAGE(mask, actual, message)                                       UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(-1), (actual), __LINE__, (message))
-#define TEST_ASSERT_BITS_LOW_MESSAGE(mask, actual, message)                                        UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(0), (actual), __LINE__, (message))
-#define TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, message)                                         UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(-1), (actual), __LINE__, (message))
-#define TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, message)                                          UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(0), (actual), __LINE__, (message))
-
-/* Integer Greater Than/ Less Than (of all sizes) */
-#define TEST_ASSERT_GREATER_THAN_MESSAGE(threshold, actual, message)                               UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT8_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT16_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT32_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT64_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT64_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX8_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX16_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX32_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX64_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX64((threshold), (actual), __LINE__, (message))
-
-#define TEST_ASSERT_LESS_THAN_MESSAGE(threshold, actual, message)                                  UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT_MESSAGE(threshold, actual, message)                              UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT8_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT16_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT32_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT64_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT8_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT16_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT32_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT64_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX8_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX16_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX32_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX64_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX64((threshold), (actual), __LINE__, (message))
-
-#define TEST_ASSERT_GREATER_OR_EQUAL_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT8_MESSAGE(threshold, actual, message)                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT16_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT32_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT64_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT_MESSAGE(threshold, actual, message)                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT8_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT16_MESSAGE(threshold, actual, message)                    UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT32_MESSAGE(threshold, actual, message)                    UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT64_MESSAGE(threshold, actual, message)                    UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX8_MESSAGE(threshold, actual, message)                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX16_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX32_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX64_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64((threshold), (actual), __LINE__, (message))
-
-#define TEST_ASSERT_LESS_OR_EQUAL_MESSAGE(threshold, actual, message)                              UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT64_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT8_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT16_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT32_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT64_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX64_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_THAN_HEX64((threshold), (actual), __LINE__, (message))
-
-/* Integer Ranges (of all sizes) */
-#define TEST_ASSERT_INT_WITHIN_MESSAGE(delta, expected, actual, message)                           UNITY_TEST_ASSERT_INT_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT8_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_INT8_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT16_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT16_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT32_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT64_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT64_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_UINT_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT8_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_UINT8_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT16_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT16_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT32_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT64_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT64_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX_WITHIN_MESSAGE(delta, expected, actual, message)                           UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX8_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_HEX8_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX16_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX16_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX32_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX64_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX64_WITHIN((delta), (expected), (actual), __LINE__, (message))
-
-/* Structs and Strings */
-#define TEST_ASSERT_EQUAL_PTR_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_STRING((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_STRING_LEN_MESSAGE(expected, actual, len, message)                       UNITY_TEST_ASSERT_EQUAL_STRING_LEN((expected), (actual), (len), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_MEMORY_MESSAGE(expected, actual, len, message)                           UNITY_TEST_ASSERT_EQUAL_MEMORY((expected), (actual), (len), __LINE__, (message))
-
-/* Arrays */
-#define TEST_ASSERT_EQUAL_INT_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_INT_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT8_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT16_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT32_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT64_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT8_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT16_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT32_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT64_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX8_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX16_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX32_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX64_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_PTR_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_STRING_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_MEMORY_ARRAY_MESSAGE(expected, actual, len, num_elements, message)       UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY((expected), (actual), (len), (num_elements), __LINE__, (message))
-
-/* Arrays Compared To Single Value*/
-#define TEST_ASSERT_EACH_EQUAL_INT_MESSAGE(expected, actual, num_elements, message)                UNITY_TEST_ASSERT_EACH_EQUAL_INT((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT8_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EACH_EQUAL_INT8((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT16_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_INT16((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT32_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_INT32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT64_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_INT64((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EACH_EQUAL_UINT((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT8_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_UINT8((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT16_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_UINT16((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT32_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_UINT32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT64_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_UINT64((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX_MESSAGE(expected, actual, num_elements, message)                UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX8_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EACH_EQUAL_HEX8((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX16_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_HEX16((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX32_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX64_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_HEX64((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_PTR_MESSAGE(expected, actual, num_elements, message)                UNITY_TEST_ASSERT_EACH_EQUAL_PTR((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_STRING_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_STRING((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_MEMORY_MESSAGE(expected, actual, len, num_elements, message)        UNITY_TEST_ASSERT_EACH_EQUAL_MEMORY((expected), (actual), (len), (num_elements), __LINE__, (message))
-
-/* Floating Point (If Enabled) */
-#define TEST_ASSERT_FLOAT_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_FLOAT_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_FLOAT_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_FLOAT((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_FLOAT_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_FLOAT_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_INF_MESSAGE(actual, message)                                          UNITY_TEST_ASSERT_FLOAT_IS_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NEG_INF_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NAN_MESSAGE(actual, message)                                          UNITY_TEST_ASSERT_FLOAT_IS_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_DETERMINATE_MESSAGE(actual, message)                                  UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_INF_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_NEG_INF_MESSAGE(actual, message)                                  UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_NAN_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE_MESSAGE(actual, message)                              UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE((actual), __LINE__, (message))
-
-/* Double (If Enabled) */
-#define TEST_ASSERT_DOUBLE_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_DOUBLE_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_DOUBLE_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_DOUBLE((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_DOUBLE_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_INF_MESSAGE(actual, message)                                         UNITY_TEST_ASSERT_DOUBLE_IS_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NEG_INF_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NAN_MESSAGE(actual, message)                                         UNITY_TEST_ASSERT_DOUBLE_IS_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_DETERMINATE_MESSAGE(actual, message)                                 UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_INF_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF_MESSAGE(actual, message)                                 UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_NAN_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE_MESSAGE(actual, message)                             UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE((actual), __LINE__, (message))
-
-/* end of UNITY_FRAMEWORK_H */
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/external/unity/unity_internals.h b/external/unity/unity_internals.h
deleted file mode 100644
index 67e219b84..000000000
--- a/external/unity/unity_internals.h
+++ /dev/null
@@ -1,872 +0,0 @@
-/* ==========================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-========================================== */
-
-#ifndef UNITY_INTERNALS_H
-#define UNITY_INTERNALS_H
-
-#ifdef UNITY_INCLUDE_CONFIG_H
-#include "unity_config.h"
-#endif
-
-#ifndef UNITY_EXCLUDE_SETJMP_H
-#include <setjmp.h>
-#endif
-
-#ifndef UNITY_EXCLUDE_MATH_H
-#include <math.h>
-#endif
-
-/* Unity Attempts to Auto-Detect Integer Types
- * Attempt 1: UINT_MAX, ULONG_MAX in <limits.h>, or default to 32 bits
- * Attempt 2: UINTPTR_MAX in <stdint.h>, or default to same size as long
- * The user may override any of these derived constants:
- * UNITY_INT_WIDTH, UNITY_LONG_WIDTH, UNITY_POINTER_WIDTH */
-#ifndef UNITY_EXCLUDE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifndef UNITY_EXCLUDE_LIMITS_H
-#include <limits.h>
-#endif
-
-/*-------------------------------------------------------
- * Guess Widths If Not Specified
- *-------------------------------------------------------*/
-
-/* Determine the size of an int, if not already specified.
- * We cannot use sizeof(int), because it is not yet defined
- * at this stage in the translation of the C program.
- * Therefore, infer it from UINT_MAX if possible. */
-#ifndef UNITY_INT_WIDTH
-  #ifdef UINT_MAX
-    #if (UINT_MAX == 0xFFFF)
-      #define UNITY_INT_WIDTH (16)
-    #elif (UINT_MAX == 0xFFFFFFFF)
-      #define UNITY_INT_WIDTH (32)
-    #elif (UINT_MAX == 0xFFFFFFFFFFFFFFFF)
-      #define UNITY_INT_WIDTH (64)
-    #endif
-  #else /* Set to default */
-    #define UNITY_INT_WIDTH (32)
-  #endif /* UINT_MAX */
-#endif
-
-/* Determine the size of a long, if not already specified. */
-#ifndef UNITY_LONG_WIDTH
-  #ifdef ULONG_MAX
-    #if (ULONG_MAX == 0xFFFF)
-      #define UNITY_LONG_WIDTH (16)
-    #elif (ULONG_MAX == 0xFFFFFFFF)
-      #define UNITY_LONG_WIDTH (32)
-    #elif (ULONG_MAX == 0xFFFFFFFFFFFFFFFF)
-      #define UNITY_LONG_WIDTH (64)
-    #endif
-  #else /* Set to default */
-    #define UNITY_LONG_WIDTH (32)
-  #endif /* ULONG_MAX */
-#endif
-
-/* Determine the size of a pointer, if not already specified. */
-#ifndef UNITY_POINTER_WIDTH
-  #ifdef UINTPTR_MAX
-    #if (UINTPTR_MAX <= 0xFFFF)
-      #define UNITY_POINTER_WIDTH (16)
-    #elif (UINTPTR_MAX <= 0xFFFFFFFF)
-      #define UNITY_POINTER_WIDTH (32)
-    #elif (UINTPTR_MAX <= 0xFFFFFFFFFFFFFFFF)
-      #define UNITY_POINTER_WIDTH (64)
-    #endif
-  #else /* Set to default */
-    #define UNITY_POINTER_WIDTH UNITY_LONG_WIDTH
-  #endif /* UINTPTR_MAX */
-#endif
-
-/*-------------------------------------------------------
- * Int Support (Define types based on detected sizes)
- *-------------------------------------------------------*/
-
-#if (UNITY_INT_WIDTH == 32)
-    typedef unsigned char   UNITY_UINT8;
-    typedef unsigned short  UNITY_UINT16;
-    typedef unsigned int    UNITY_UINT32;
-    typedef signed char     UNITY_INT8;
-    typedef signed short    UNITY_INT16;
-    typedef signed int      UNITY_INT32;
-#elif (UNITY_INT_WIDTH == 16)
-    typedef unsigned char   UNITY_UINT8;
-    typedef unsigned int    UNITY_UINT16;
-    typedef unsigned long   UNITY_UINT32;
-    typedef signed char     UNITY_INT8;
-    typedef signed int      UNITY_INT16;
-    typedef signed long     UNITY_INT32;
-#else
-    #error Invalid UNITY_INT_WIDTH specified! (16 or 32 are supported)
-#endif
-
-/*-------------------------------------------------------
- * 64-bit Support
- *-------------------------------------------------------*/
-
-#ifndef UNITY_SUPPORT_64
-  #if UNITY_LONG_WIDTH == 64 || UNITY_POINTER_WIDTH == 64
-    #define UNITY_SUPPORT_64
-  #endif
-#endif
-
-#ifndef UNITY_SUPPORT_64
-    /* No 64-bit Support */
-    typedef UNITY_UINT32 UNITY_UINT;
-    typedef UNITY_INT32 UNITY_INT;
-#else
-
-    /* 64-bit Support */
-  #if (UNITY_LONG_WIDTH == 32)
-    typedef unsigned long long UNITY_UINT64;
-    typedef signed long long   UNITY_INT64;
-  #elif (UNITY_LONG_WIDTH == 64)
-    typedef unsigned long      UNITY_UINT64;
-    typedef signed long        UNITY_INT64;
-  #else
-    #error Invalid UNITY_LONG_WIDTH specified! (32 or 64 are supported)
-  #endif
-    typedef UNITY_UINT64 UNITY_UINT;
-    typedef UNITY_INT64 UNITY_INT;
-
-#endif
-
-/*-------------------------------------------------------
- * Pointer Support
- *-------------------------------------------------------*/
-
-#if (UNITY_POINTER_WIDTH == 32)
-#define UNITY_PTR_TO_INT UNITY_INT32
-#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32
-#elif (UNITY_POINTER_WIDTH == 64)
-#define UNITY_PTR_TO_INT UNITY_INT64
-#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX64
-#elif (UNITY_POINTER_WIDTH == 16)
-#define UNITY_PTR_TO_INT UNITY_INT16
-#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX16
-#else
-    #error Invalid UNITY_POINTER_WIDTH specified! (16, 32 or 64 are supported)
-#endif
-
-#ifndef UNITY_PTR_ATTRIBUTE
-#define UNITY_PTR_ATTRIBUTE
-#endif
-
-#ifndef UNITY_INTERNAL_PTR
-#define UNITY_INTERNAL_PTR UNITY_PTR_ATTRIBUTE const void*
-#endif
-
-/*-------------------------------------------------------
- * Float Support
- *-------------------------------------------------------*/
-
-#ifdef UNITY_EXCLUDE_FLOAT
-
-/* No Floating Point Support */
-#ifndef UNITY_EXCLUDE_DOUBLE
-#define UNITY_EXCLUDE_DOUBLE /* Remove double when excluding float support */
-#endif
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-#define UNITY_EXCLUDE_FLOAT_PRINT
-#endif
-
-#else
-
-/* Floating Point Support */
-#ifndef UNITY_FLOAT_PRECISION
-#define UNITY_FLOAT_PRECISION (0.00001f)
-#endif
-#ifndef UNITY_FLOAT_TYPE
-#define UNITY_FLOAT_TYPE float
-#endif
-typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
-
-/* isinf & isnan macros should be provided by math.h */
-#ifndef isinf
-/* The value of Inf - Inf is NaN */
-#define isinf(n) (isnan((n) - (n)) && !isnan(n))
-#endif
-
-#ifndef isnan
-/* NaN is the only floating point value that does NOT equal itself.
- * Therefore if n != n, then it is NaN. */
-#define isnan(n) ((n != n) ? 1 : 0)
-#endif
-
-#endif
-
-/*-------------------------------------------------------
- * Double Float Support
- *-------------------------------------------------------*/
-
-/* unlike float, we DON'T include by default */
-#if defined(UNITY_EXCLUDE_DOUBLE) || !defined(UNITY_INCLUDE_DOUBLE)
-
-  /* No Floating Point Support */
-  #ifndef UNITY_EXCLUDE_DOUBLE
-  #define UNITY_EXCLUDE_DOUBLE
-  #else
-    #undef UNITY_INCLUDE_DOUBLE
-  #endif
-
-  #ifndef UNITY_EXCLUDE_FLOAT
-    #ifndef UNITY_DOUBLE_TYPE
-    #define UNITY_DOUBLE_TYPE double
-    #endif
-  typedef UNITY_FLOAT UNITY_DOUBLE;
-  /* For parameter in UnityPrintFloat(UNITY_DOUBLE), which aliases to double or float */
-  #endif
-
-#else
-
-  /* Double Floating Point Support */
-  #ifndef UNITY_DOUBLE_PRECISION
-  #define UNITY_DOUBLE_PRECISION (1e-12)
-  #endif
-
-  #ifndef UNITY_DOUBLE_TYPE
-  #define UNITY_DOUBLE_TYPE double
-  #endif
-  typedef UNITY_DOUBLE_TYPE UNITY_DOUBLE;
-
-#endif
-
-/*-------------------------------------------------------
- * Output Method: stdout (DEFAULT)
- *-------------------------------------------------------*/
-#ifndef UNITY_OUTPUT_CHAR
-/* Default to using putchar, which is defined in stdio.h */
-#include <stdio.h>
-#define UNITY_OUTPUT_CHAR(a) (void)putchar(a)
-#else
-  /* If defined as something else, make sure we declare it here so it's ready for use */
-  #ifdef UNITY_OUTPUT_CHAR_HEADER_DECLARATION
-extern void UNITY_OUTPUT_CHAR_HEADER_DECLARATION;
-  #endif
-#endif
-
-#ifndef UNITY_OUTPUT_FLUSH
-#ifdef UNITY_USE_FLUSH_STDOUT
-/* We want to use the stdout flush utility */
-#include <stdio.h>
-#define UNITY_OUTPUT_FLUSH() (void)fflush(stdout)
-#else
-/* We've specified nothing, therefore flush should just be ignored */
-#define UNITY_OUTPUT_FLUSH()
-#endif
-#else
-/* We've defined flush as something else, so make sure we declare it here so it's ready for use */
-#ifdef UNITY_OUTPUT_FLUSH_HEADER_DECLARATION
-extern void UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION;
-#endif
-#endif
-
-#ifndef UNITY_OUTPUT_FLUSH
-#define UNITY_FLUSH_CALL()
-#else
-#define UNITY_FLUSH_CALL() UNITY_OUTPUT_FLUSH()
-#endif
-
-#ifndef UNITY_PRINT_EOL
-#define UNITY_PRINT_EOL()    UNITY_OUTPUT_CHAR('\n')
-#endif
-
-#ifndef UNITY_OUTPUT_START
-#define UNITY_OUTPUT_START()
-#endif
-
-#ifndef UNITY_OUTPUT_COMPLETE
-#define UNITY_OUTPUT_COMPLETE()
-#endif
-
-/*-------------------------------------------------------
- * Footprint
- *-------------------------------------------------------*/
-
-#ifndef UNITY_LINE_TYPE
-#define UNITY_LINE_TYPE UNITY_UINT
-#endif
-
-#ifndef UNITY_COUNTER_TYPE
-#define UNITY_COUNTER_TYPE UNITY_UINT
-#endif
-
-/*-------------------------------------------------------
- * Language Features Available
- *-------------------------------------------------------*/
-#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
-#   if defined(__GNUC__) || defined(__ghs__) /* __GNUC__ includes clang */
-#       if !(defined(__WIN32__) && defined(__clang__)) && !defined(__TMS470__)
-#           define UNITY_WEAK_ATTRIBUTE __attribute__((weak))
-#       endif
-#   endif
-#endif
-
-#ifdef UNITY_NO_WEAK
-#   undef UNITY_WEAK_ATTRIBUTE
-#   undef UNITY_WEAK_PRAGMA
-#endif
-
-
-/*-------------------------------------------------------
- * Internal Structs Needed
- *-------------------------------------------------------*/
-
-typedef void (*UnityTestFunction)(void);
-
-#define UNITY_DISPLAY_RANGE_INT  (0x10)
-#define UNITY_DISPLAY_RANGE_UINT (0x20)
-#define UNITY_DISPLAY_RANGE_HEX  (0x40)
-
-typedef enum
-{
-UNITY_DISPLAY_STYLE_INT = sizeof(int)+ UNITY_DISPLAY_RANGE_INT,
-    UNITY_DISPLAY_STYLE_INT8     = 1 + UNITY_DISPLAY_RANGE_INT,
-    UNITY_DISPLAY_STYLE_INT16    = 2 + UNITY_DISPLAY_RANGE_INT,
-    UNITY_DISPLAY_STYLE_INT32    = 4 + UNITY_DISPLAY_RANGE_INT,
-#ifdef UNITY_SUPPORT_64
-    UNITY_DISPLAY_STYLE_INT64    = 8 + UNITY_DISPLAY_RANGE_INT,
-#endif
-
-UNITY_DISPLAY_STYLE_UINT = sizeof(unsigned) + UNITY_DISPLAY_RANGE_UINT,
-    UNITY_DISPLAY_STYLE_UINT8    = 1 + UNITY_DISPLAY_RANGE_UINT,
-    UNITY_DISPLAY_STYLE_UINT16   = 2 + UNITY_DISPLAY_RANGE_UINT,
-    UNITY_DISPLAY_STYLE_UINT32   = 4 + UNITY_DISPLAY_RANGE_UINT,
-#ifdef UNITY_SUPPORT_64
-    UNITY_DISPLAY_STYLE_UINT64   = 8 + UNITY_DISPLAY_RANGE_UINT,
-#endif
-
-    UNITY_DISPLAY_STYLE_HEX8     = 1 + UNITY_DISPLAY_RANGE_HEX,
-    UNITY_DISPLAY_STYLE_HEX16    = 2 + UNITY_DISPLAY_RANGE_HEX,
-    UNITY_DISPLAY_STYLE_HEX32    = 4 + UNITY_DISPLAY_RANGE_HEX,
-#ifdef UNITY_SUPPORT_64
-    UNITY_DISPLAY_STYLE_HEX64    = 8 + UNITY_DISPLAY_RANGE_HEX,
-#endif
-
-    UNITY_DISPLAY_STYLE_UNKNOWN
-} UNITY_DISPLAY_STYLE_T;
-
-typedef enum
-{
-    UNITY_EQUAL_TO         = 1,
-    UNITY_GREATER_THAN     = 2,
-    UNITY_GREATER_OR_EQUAL = 2 + UNITY_EQUAL_TO,
-    UNITY_SMALLER_THAN     = 4,
-    UNITY_SMALLER_OR_EQUAL = 4 + UNITY_EQUAL_TO
-} UNITY_COMPARISON_T;
-
-#ifndef UNITY_EXCLUDE_FLOAT
-typedef enum UNITY_FLOAT_TRAIT
-{
-    UNITY_FLOAT_IS_NOT_INF       = 0,
-    UNITY_FLOAT_IS_INF,
-    UNITY_FLOAT_IS_NOT_NEG_INF,
-    UNITY_FLOAT_IS_NEG_INF,
-    UNITY_FLOAT_IS_NOT_NAN,
-    UNITY_FLOAT_IS_NAN,
-    UNITY_FLOAT_IS_NOT_DET,
-    UNITY_FLOAT_IS_DET,
-    UNITY_FLOAT_INVALID_TRAIT
-} UNITY_FLOAT_TRAIT_T;
-#endif
-
-typedef enum
-{
-    UNITY_ARRAY_TO_VAL = 0,
-    UNITY_ARRAY_TO_ARRAY
-} UNITY_FLAGS_T;
-
-struct UNITY_STORAGE_T
-{
-    const char* TestFile;
-    const char* CurrentTestName;
-#ifndef UNITY_EXCLUDE_DETAILS
-    const char* CurrentDetail1;
-    const char* CurrentDetail2;
-#endif
-    UNITY_LINE_TYPE CurrentTestLineNumber;
-    UNITY_COUNTER_TYPE NumberOfTests;
-    UNITY_COUNTER_TYPE TestFailures;
-    UNITY_COUNTER_TYPE TestIgnores;
-    UNITY_COUNTER_TYPE CurrentTestFailed;
-    UNITY_COUNTER_TYPE CurrentTestIgnored;
-#ifndef UNITY_EXCLUDE_SETJMP_H
-    jmp_buf AbortFrame;
-#endif
-};
-
-extern struct UNITY_STORAGE_T Unity;
-
-/*-------------------------------------------------------
- * Test Suite Management
- *-------------------------------------------------------*/
-
-void UnityBegin(const char* filename);
-int  UnityEnd(void);
-void UnityConcludeTest(void);
-void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum);
-
-/*-------------------------------------------------------
- * Details Support
- *-------------------------------------------------------*/
-
-#ifdef UNITY_EXCLUDE_DETAILS
-#define UNITY_CLR_DETAILS()
-#define UNITY_SET_DETAIL(d1)
-#define UNITY_SET_DETAILS(d1,d2)
-#else
-#define UNITY_CLR_DETAILS()      { Unity.CurrentDetail1 = 0;   Unity.CurrentDetail2 = 0;  }
-#define UNITY_SET_DETAIL(d1)     { Unity.CurrentDetail1 = d1;  Unity.CurrentDetail2 = 0;  }
-#define UNITY_SET_DETAILS(d1,d2) { Unity.CurrentDetail1 = d1;  Unity.CurrentDetail2 = d2; }
-
-#ifndef UNITY_DETAIL1_NAME
-#define UNITY_DETAIL1_NAME "Function"
-#endif
-
-#ifndef UNITY_DETAIL2_NAME
-#define UNITY_DETAIL2_NAME "Argument"
-#endif
-#endif
-
-/*-------------------------------------------------------
- * Test Output
- *-------------------------------------------------------*/
-
-void UnityPrint(const char* string);
-void UnityPrintLen(const char* string, const UNITY_UINT32 length);
-void UnityPrintMask(const UNITY_UINT mask, const UNITY_UINT number);
-void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style);
-void UnityPrintNumber(const UNITY_INT number);
-void UnityPrintNumberUnsigned(const UNITY_UINT number);
-void UnityPrintNumberHex(const UNITY_UINT number, const char nibbles);
-
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-void UnityPrintFloat(const UNITY_DOUBLE input_number);
-#endif
-
-/*-------------------------------------------------------
- * Test Assertion Functions
- *-------------------------------------------------------
- *  Use the macros below this section instead of calling
- *  these directly. The macros have a consistent naming
- *  convention and will pull in file and line information
- *  for you. */
-
-void UnityAssertEqualNumber(const UNITY_INT expected,
-                            const UNITY_INT actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_DISPLAY_STYLE_T style);
-
-void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold,
-                                           const UNITY_INT actual,
-                                           const UNITY_COMPARISON_T compare,
-                                           const char *msg,
-                                           const UNITY_LINE_TYPE lineNumber,
-                                           const UNITY_DISPLAY_STYLE_T style);
-
-void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
-                              UNITY_INTERNAL_PTR actual,
-                              const UNITY_UINT32 num_elements,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style,
-                              const UNITY_FLAGS_T flags);
-
-void UnityAssertBits(const UNITY_INT mask,
-                     const UNITY_INT expected,
-                     const UNITY_INT actual,
-                     const char* msg,
-                     const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualString(const char* expected,
-                            const char* actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualStringLen(const char* expected,
-                            const char* actual,
-                            const UNITY_UINT32 length,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualStringArray( UNITY_INTERNAL_PTR expected,
-                                  const char** actual,
-                                  const UNITY_UINT32 num_elements,
-                                  const char* msg,
-                                  const UNITY_LINE_TYPE lineNumber,
-                                  const UNITY_FLAGS_T flags);
-
-void UnityAssertEqualMemory( UNITY_INTERNAL_PTR expected,
-                             UNITY_INTERNAL_PTR actual,
-                             const UNITY_UINT32 length,
-                             const UNITY_UINT32 num_elements,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber,
-                             const UNITY_FLAGS_T flags);
-
-void UnityAssertNumbersWithin(const UNITY_UINT delta,
-                              const UNITY_INT expected,
-                              const UNITY_INT actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style);
-
-void UnityFail(const char* message, const UNITY_LINE_TYPE line);
-
-void UnityIgnore(const char* message, const UNITY_LINE_TYPE line);
-
-#ifndef UNITY_EXCLUDE_FLOAT
-void UnityAssertFloatsWithin(const UNITY_FLOAT delta,
-                             const UNITY_FLOAT expected,
-                             const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* expected,
-                                UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* actual,
-                                const UNITY_UINT32 num_elements,
-                                const char* msg,
-                                const UNITY_LINE_TYPE lineNumber,
-                                const UNITY_FLAGS_T flags);
-
-void UnityAssertFloatSpecial(const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber,
-                             const UNITY_FLOAT_TRAIT_T style);
-#endif
-
-#ifndef UNITY_EXCLUDE_DOUBLE
-void UnityAssertDoublesWithin(const UNITY_DOUBLE delta,
-                              const UNITY_DOUBLE expected,
-                              const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* expected,
-                                 UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* actual,
-                                 const UNITY_UINT32 num_elements,
-                                 const char* msg,
-                                 const UNITY_LINE_TYPE lineNumber,
-                                 const UNITY_FLAGS_T flags);
-
-void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_FLOAT_TRAIT_T style);
-#endif
-
-/*-------------------------------------------------------
- * Helpers
- *-------------------------------------------------------*/
-
-UNITY_INTERNAL_PTR UnityNumToPtr(const UNITY_INT num, const UNITY_UINT8 size);
-#ifndef UNITY_EXCLUDE_FLOAT
-UNITY_INTERNAL_PTR UnityFloatToPtr(const float num);
-#endif
-#ifndef UNITY_EXCLUDE_DOUBLE
-UNITY_INTERNAL_PTR UnityDoubleToPtr(const double num);
-#endif
-
-/*-------------------------------------------------------
- * Error Strings We Might Need
- *-------------------------------------------------------*/
-
-extern const char UnityStrErrFloat[];
-extern const char UnityStrErrDouble[];
-extern const char UnityStrErr64[];
-
-/*-------------------------------------------------------
- * Test Running Macros
- *-------------------------------------------------------*/
-
-#ifndef UNITY_EXCLUDE_SETJMP_H
-#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0)
-#define TEST_ABORT() longjmp(Unity.AbortFrame, 1)
-#else
-#define TEST_PROTECT() 1
-#define TEST_ABORT() return
-#endif
-
-/* This tricky series of macros gives us an optional line argument to treat it as RUN_TEST(func, num=__LINE__) */
-#ifndef RUN_TEST
-#ifdef __STDC_VERSION__
-#if __STDC_VERSION__ >= 199901L
-#define RUN_TEST(...) UnityDefaultTestRun(RUN_TEST_FIRST(__VA_ARGS__), RUN_TEST_SECOND(__VA_ARGS__))
-#define RUN_TEST_FIRST(...) RUN_TEST_FIRST_HELPER(__VA_ARGS__, throwaway)
-#define RUN_TEST_FIRST_HELPER(first, ...) (first), #first
-#define RUN_TEST_SECOND(...) RUN_TEST_SECOND_HELPER(__VA_ARGS__, __LINE__, throwaway)
-#define RUN_TEST_SECOND_HELPER(first, second, ...) (second)
-#endif
-#endif
-#endif
-
-/* If we can't do the tricky version, we'll just have to require them to always include the line number */
-#ifndef RUN_TEST
-#ifdef CMOCK
-#define RUN_TEST(func, num) UnityDefaultTestRun(func, #func, num)
-#else
-#define RUN_TEST(func) UnityDefaultTestRun(func, #func, __LINE__)
-#endif
-#endif
-
-#define TEST_LINE_NUM (Unity.CurrentTestLineNumber)
-#define TEST_IS_IGNORED (Unity.CurrentTestIgnored)
-#define UNITY_NEW_TEST(a) \
-    Unity.CurrentTestName = (a); \
-    Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)(__LINE__); \
-    Unity.NumberOfTests++;
-
-#ifndef UNITY_BEGIN
-#define UNITY_BEGIN() UnityBegin(__FILE__)
-#endif
-
-#ifndef UNITY_END
-#define UNITY_END() UnityEnd()
-#endif
-
-/*-----------------------------------------------
- * Command Line Argument Support
- *-----------------------------------------------*/
-
-#ifdef UNITY_USE_COMMAND_LINE_ARGS
-int UnityParseOptions(int argc, char** argv);
-int UnityTestMatches(void);
-#endif
-
-/*-------------------------------------------------------
- * Basic Fail and Ignore
- *-------------------------------------------------------*/
-
-#define UNITY_TEST_FAIL(line, message)   UnityFail(   (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)(line))
-
-/*-------------------------------------------------------
- * Test Asserts
- *-------------------------------------------------------*/
-
-#define UNITY_TEST_ASSERT(condition, line, message)                                              if (condition) {} else {UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), (message));}
-#define UNITY_TEST_ASSERT_NULL(pointer, line, message)                                           UNITY_TEST_ASSERT(((pointer) == NULL),  (UNITY_LINE_TYPE)(line), (message))
-#define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message)                                       UNITY_TEST_ASSERT(((pointer) != NULL),  (UNITY_LINE_TYPE)(line), (message))
-
-#define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message)                             UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message)                            UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message)                            UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message)                          UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message)                          UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message)                            UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-#define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message)                            UnityAssertBits((UNITY_INT)(mask), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line))
-
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT(threshold, actual, line, message)                     UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT(threshold, actual, line, message)                     UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT8(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT16(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT32(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT(threshold, actual, line, message)                 UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT(threshold, actual, line, message)                 UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message)                     UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_UINT8_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_UINT16_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_UINT32_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message)                             UnityAssertEqualNumber((UNITY_PTR_TO_INT)(expected), (UNITY_PTR_TO_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER)
-#define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message)                          UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_ASSERT_EQUAL_STRING_LEN(expected, actual, len, line, message)                 UnityAssertEqualStringLen((const char*)(expected), (const char*)(actual), (UNITY_UINT32)(len), (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message)                     UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), 1, (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-
-#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT,     UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8,    UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT,    UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8,    UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER, UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualStringArray((UNITY_INTERNAL_PTR)(expected), (const char**)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT(expected, actual, num_elements, line, message)          UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)              expected, sizeof(int)),  (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT,     UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT8(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT8  )expected, 1),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8,    UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT16(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT16 )expected, 2),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT32(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT32 )expected, 4),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)              expected, sizeof(unsigned int)), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT,    UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT8(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT8 )expected, 1),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT16(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT16)expected, 2),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT32(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT32)expected, 4),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX8(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT8  )expected, 1),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8,    UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX16(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT16 )expected, 2),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX32(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT32 )expected, 4),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_PTR(expected, actual, num_elements, line, message)          UnityAssertEqualIntArray(UnityNumToPtr((UNITY_PTR_TO_INT)       expected, sizeof(int*)), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER, UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_STRING(expected, actual, num_elements, line, message)       UnityAssertEqualStringArray((UNITY_INTERNAL_PTR)(expected), (const char**)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_MEMORY(expected, actual, len, num_elements, line, message)  UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_VAL)
-
-#ifdef UNITY_SUPPORT_64
-#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message)                          UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT64(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)expected, 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT64(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT64)expected, 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX64(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)expected, 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT64(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#else
-#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message)                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message)      UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual, line, message)              UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT64(threshold, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64(threshold, actual, line, message)              UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#endif
-
-#ifdef UNITY_EXCLUDE_FLOAT
-#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT(expected, actual, num_elements, line, message)        UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, line, message)                                    UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, line, message)                                    UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, line, message)                            UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, line, message)                            UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, line, message)                        UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#else
-#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message)                   UnityAssertFloatsWithin((UNITY_FLOAT)(delta), (UNITY_FLOAT)(expected), (UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message)                           UNITY_TEST_ASSERT_FLOAT_WITHIN((UNITY_FLOAT)(expected) * (UNITY_FLOAT)UNITY_FLOAT_PRECISION, (UNITY_FLOAT)(expected), (UNITY_FLOAT)(actual), (UNITY_LINE_TYPE)(line), (message))
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualFloatArray((UNITY_FLOAT*)(expected), (UNITY_FLOAT*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT(expected, actual, num_elements, line, message)        UnityAssertEqualFloatArray(UnityFloatToPtr(expected), (UNITY_FLOAT*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, line, message)                                    UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, line, message)                                UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NEG_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, line, message)                                    UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NAN)
-#define UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, line, message)                            UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_DET)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, line, message)                                UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, line, message)                            UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NEG_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, line, message)                                UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NAN)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, line, message)                        UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_DET)
-#endif
-
-#ifdef UNITY_EXCLUDE_DOUBLE
-#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, line, message)                                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, line, message)                                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message)                       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#else
-#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UnityAssertDoublesWithin((UNITY_DOUBLE)(delta), (UNITY_DOUBLE)(expected), (UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)line)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_ASSERT_DOUBLE_WITHIN((UNITY_DOUBLE)(expected) * (UNITY_DOUBLE)UNITY_DOUBLE_PRECISION, (UNITY_DOUBLE)expected, (UNITY_DOUBLE)actual, (UNITY_LINE_TYPE)(line), message)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualDoubleArray((UNITY_DOUBLE*)(expected), (UNITY_DOUBLE*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE(expected, actual, num_elements, line, message)       UnityAssertEqualDoubleArray(UnityDoubleToPtr(expected), (UNITY_DOUBLE*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, line, message)                                   UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, line, message)                               UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NEG_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, line, message)                                   UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NAN)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, line, message)                           UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_DET)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, line, message)                               UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, line, message)                           UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NEG_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, line, message)                               UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NAN)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message)                       UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_DET)
-#endif
-
-/* End of UNITY_INTERNALS_H */
-#endif
diff --git a/external/unity/version.txt b/external/unity/version.txt
deleted file mode 100644
index f1b3f42a7..000000000
--- a/external/unity/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/ThrowTheSwitch/Unity/commit/b4aca70fd9e0ddf0afbdafb1b826f5edcfc1049b
diff --git a/external/wepoll/README.md b/external/wepoll/README.md
deleted file mode 100644
index d334d0833..000000000
--- a/external/wepoll/README.md
+++ /dev/null
@@ -1,202 +0,0 @@
-# wepoll - epoll for windows
-
-[![][ci status badge]][ci status link]
-
-This library implements the [epoll][man epoll] API for Windows
-applications. It is fast and scalable, and it closely resembles the API
-and behavior of Linux' epoll.
-
-## Rationale
-
-Unlike Linux, OS X, and many other operating systems, Windows doesn't
-have a good API for receiving socket state notifications. It only
-supports the `select` and `WSAPoll` APIs, but they
-[don't scale][select scale] and suffer from
-[other issues][wsapoll broken].
-
-Using I/O completion ports isn't always practical when software is
-designed to be cross-platform. Wepoll offers an alternative that is
-much closer to a drop-in replacement for software that was designed
-to run on Linux.
-
-## Features
-
-* Can poll 100000s of sockets efficiently.
-* Fully thread-safe.
-* Multiple threads can poll the same epoll port.
-* Sockets can be added to multiple epoll sets.
-* All epoll events (`EPOLLIN`, `EPOLLOUT`, `EPOLLPRI`, `EPOLLRDHUP`)
-  are supported.
-* Level-triggered and one-shot (`EPOLLONESTHOT`) modes are supported
-* Trivial to embed: you need [only two files][dist].
-
-## Limitations
-
-* Only works with sockets.
-* Edge-triggered (`EPOLLET`) mode isn't supported.
-
-## How to use
-
-The library is [distributed][dist] as a single source file
-([wepoll.c][wepoll.c]) and a single header file ([wepoll.h][wepoll.h]).<br>
-Compile the .c file as part of your project, and include the header wherever
-needed.
-
-## Compatibility
-
-* Requires Windows Vista or higher.
-* Can be compiled with recent versions of MSVC, Clang, and GCC.
-
-## API
-
-### General remarks
-
-* The epoll port is a `HANDLE`, not a file descriptor.
-* All functions set both `errno` and `GetLastError()` on failure.
-* For more extensive documentation, see the [epoll(7) man page][man epoll],
-  and the per-function man pages that are linked below.
-
-### epoll_create/epoll_create1
-
-```c
-HANDLE epoll_create(int size);
-HANDLE epoll_create1(int flags);
-```
-
-* Create a new epoll instance (port).
-* `size` is ignored but most be greater than zero.
-* `flags` must be zero as there are no supported flags.
-* Returns `NULL` on failure.
-* [Linux man page][man epoll_create]
-
-### epoll_close
-
-```c
-int epoll_close(HANDLE ephnd);
-```
-
-* Close an epoll port.
-* Do not attempt to close the epoll port with `close()`,
-  `CloseHandle()` or `closesocket()`.
-
-### epoll_ctl
-
-```c
-int epoll_ctl(HANDLE ephnd,
-              int op,
-              SOCKET sock,
-              struct epoll_event* event);
-```
-
-* Control which socket events are monitored by an epoll port.
-* `ephnd` must be a HANDLE created by
-  [`epoll_create()`](#epoll_createepoll_create1) or
-  [`epoll_create1()`](#epoll_createepoll_create1).
-* `op` must be one of `EPOLL_CTL_ADD`, `EPOLL_CTL_MOD`, `EPOLL_CTL_DEL`.
-* `sock` must be a valid socket created by [`socket()`][msdn socket],
-  [`WSASocket()`][msdn wsasocket], or [`accept()`][msdn accept].
-* `event` should be a pointer to a [`struct epoll_event`](#struct-epoll_event).<br>
-  If `op` is `EPOLL_CTL_DEL` then the `event` parameter is ignored, and it
-  may be `NULL`.
-* Returns 0 on success, -1 on failure.
-* It is recommended to always explicitly remove a socket from its epoll
-  set using `EPOLL_CTL_DEL` *before* closing it.<br>
-  As on Linux, closed sockets are automatically removed from the epoll set, but
-  wepoll may not be able to detect that a socket was closed until the next call
-  to [`epoll_wait()`](#epoll_wait).
-* [Linux man page][man epoll_ctl]
-
-### epoll_wait
-
-```c
-int epoll_wait(HANDLE ephnd,
-               struct epoll_event* events,
-               int maxevents,
-               int timeout);
-```
-
-* Receive socket events from an epoll port.
-* `events` should point to a caller-allocated array of
-  [`epoll_event`](#struct-epoll_event) structs, which will receive the
-  reported events.
-* `maxevents` is the maximum number of events that will be written to the
-  `events` array, and must be greater than zero.
-* `timeout` specifies whether to block when no events are immediately available.
-  - `<0` block indefinitely
-  - `0`  report any events that are already waiting, but don't block
-  - `≥1` block for at most N milliseconds
-* Return value:
-  - `-1` an error occurred
-  - `0`  timed out without any events to report
-  - `≥1` the number of events stored in the `events` buffer
-* [Linux man page][man epoll_wait]
-
-### struct epoll_event
-
-```c
-typedef union epoll_data {
-  void* ptr;
-  int fd;
-  uint32_t u32;
-  uint64_t u64;
-  SOCKET sock;        /* Windows specific */
-  HANDLE hnd;         /* Windows specific */
-} epoll_data_t;
-```
-
-```c
-struct epoll_event {
-  uint32_t events;    /* Epoll events and flags */
-  epoll_data_t data;  /* User data variable */
-};
-```
-
-* The `events` field is a bit mask containing the events being
-  monitored/reported, and optional flags.<br>
-  Flags are accepted by [`epoll_ctl()`](#epoll_ctl), but they are not reported
-  back by [`epoll_wait()`](#epoll_wait).
-* The `data` field can be used to associate application-specific information
-  with a socket; its value will be returned unmodified by
-  [`epoll_wait()`](#epoll_wait).
-* [Linux man page][man epoll_ctl]
-
-| Event         | Description                                                          |
-|---------------|----------------------------------------------------------------------|
-| `EPOLLIN`     | incoming data available, or incoming connection ready to be accepted |
-| `EPOLLOUT`    | ready to send data, or outgoing connection successfully established  |
-| `EPOLLRDHUP`  | remote peer initiated graceful socket shutdown                       |
-| `EPOLLPRI`    | out-of-band data available for reading                               |
-| `EPOLLERR`    | socket error<sup>1</sup>                                             |
-| `EPOLLHUP`    | socket hang-up<sup>1</sup>                                           |
-| `EPOLLRDNORM` | same as `EPOLLIN`                                                    |
-| `EPOLLRDBAND` | same as `EPOLLPRI`                                                   |
-| `EPOLLWRNORM` | same as `EPOLLOUT`                                                   |
-| `EPOLLWRBAND` | same as `EPOLLOUT`                                                   |
-| `EPOLLMSG`    | never reported                                                       |
-
-| Flag             | Description               |
-|------------------|---------------------------|
-| `EPOLLONESHOT`   | report event(s) only once |
-| `EPOLLET`        | not supported by wepoll   |
-| `EPOLLEXCLUSIVE` | not supported by wepoll   |
-| `EPOLLWAKEUP`    | not supported by wepoll   |
-
-<sup>1</sup>: the `EPOLLERR` and `EPOLLHUP` events may always be reported by
-[`epoll_wait()`](#epoll_wait), regardless of the event mask that was passed to
-[`epoll_ctl()`](#epoll_ctl).
-
-
-[ci status badge]:  https://ci.appveyor.com/api/projects/status/github/piscisaureus/wepoll?branch=master&svg=true
-[ci status link]:   https://ci.appveyor.com/project/piscisaureus/wepoll/branch/master
-[dist]:             https://github.com/piscisaureus/wepoll/tree/dist
-[man epoll]:        http://man7.org/linux/man-pages/man7/epoll.7.html
-[man epoll_create]: http://man7.org/linux/man-pages/man2/epoll_create.2.html
-[man epoll_ctl]:    http://man7.org/linux/man-pages/man2/epoll_ctl.2.html
-[man epoll_wait]:   http://man7.org/linux/man-pages/man2/epoll_wait.2.html
-[msdn accept]:      https://msdn.microsoft.com/en-us/library/windows/desktop/ms737526(v=vs.85).aspx
-[msdn socket]:      https://msdn.microsoft.com/en-us/library/windows/desktop/ms740506(v=vs.85).aspx
-[msdn wsasocket]:   https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx
-[select scale]:     https://daniel.haxx.se/docs/poll-vs-select.html
-[wsapoll broken]:   https://daniel.haxx.se/blog/2012/10/10/wsapoll-is-broken/
-[wepoll.c]:         https://github.com/piscisaureus/wepoll/blob/dist/wepoll.c
-[wepoll.h]:         https://github.com/piscisaureus/wepoll/blob/dist/wepoll.h
diff --git a/external/wepoll/license.txt b/external/wepoll/license.txt
deleted file mode 100644
index 31ad7c229..000000000
--- a/external/wepoll/license.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-wepoll - epoll for Windows
-https://github.com/piscisaureus/wepoll
-
-Copyright 2012-2018, Bert Belder <bertbelder@gmail.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * 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.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS 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 COPYRIGHT
-OWNER OR 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.
diff --git a/external/wepoll/version.txt b/external/wepoll/version.txt
deleted file mode 100644
index 629158442..000000000
--- a/external/wepoll/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/piscisaureus/wepoll/tree/v1.5.4
diff --git a/external/wepoll/wepoll.c b/external/wepoll/wepoll.c
deleted file mode 100644
index 3d3014107..000000000
--- a/external/wepoll/wepoll.c
+++ /dev/null
@@ -1,2186 +0,0 @@
-/*
- * wepoll - epoll for Windows
- * https://github.com/piscisaureus/wepoll
- *
- * Copyright 2012-2018, Bert Belder <bertbelder@gmail.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS 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 COPYRIGHT
- * OWNER OR 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.
- */
-
-#ifndef WEPOLL_EXPORT
-#define WEPOLL_EXPORT
-#endif
-
-#include <stdint.h>
-
-/* clang-format off */
-
-enum EPOLL_EVENTS {
-  EPOLLIN      = (int) (1U <<  0),
-  EPOLLPRI     = (int) (1U <<  1),
-  EPOLLOUT     = (int) (1U <<  2),
-  EPOLLERR     = (int) (1U <<  3),
-  EPOLLHUP     = (int) (1U <<  4),
-  EPOLLRDNORM  = (int) (1U <<  6),
-  EPOLLRDBAND  = (int) (1U <<  7),
-  EPOLLWRNORM  = (int) (1U <<  8),
-  EPOLLWRBAND  = (int) (1U <<  9),
-  EPOLLMSG     = (int) (1U << 10), /* Never reported. */
-  EPOLLRDHUP   = (int) (1U << 13),
-  EPOLLONESHOT = (int) (1U << 31)
-};
-
-#define EPOLLIN      (1U <<  0)
-#define EPOLLPRI     (1U <<  1)
-#define EPOLLOUT     (1U <<  2)
-#define EPOLLERR     (1U <<  3)
-#define EPOLLHUP     (1U <<  4)
-#define EPOLLRDNORM  (1U <<  6)
-#define EPOLLRDBAND  (1U <<  7)
-#define EPOLLWRNORM  (1U <<  8)
-#define EPOLLWRBAND  (1U <<  9)
-#define EPOLLMSG     (1U << 10)
-#define EPOLLRDHUP   (1U << 13)
-#define EPOLLONESHOT (1U << 31)
-
-#define EPOLL_CTL_ADD 1
-#define EPOLL_CTL_MOD 2
-#define EPOLL_CTL_DEL 3
-
-/* clang-format on */
-
-typedef void* HANDLE;
-typedef uintptr_t SOCKET;
-
-typedef union epoll_data {
-  void* ptr;
-  int fd;
-  uint32_t u32;
-  uint64_t u64;
-  SOCKET sock; /* Windows specific */
-  HANDLE hnd;  /* Windows specific */
-} epoll_data_t;
-
-struct epoll_event {
-  uint32_t events;   /* Epoll events and flags */
-  epoll_data_t data; /* User data variable */
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WEPOLL_EXPORT HANDLE epoll_create(int size);
-WEPOLL_EXPORT HANDLE epoll_create1(int flags);
-
-WEPOLL_EXPORT int epoll_close(HANDLE ephnd);
-
-WEPOLL_EXPORT int epoll_ctl(HANDLE ephnd,
-                            int op,
-                            SOCKET sock,
-                            struct epoll_event* event);
-
-WEPOLL_EXPORT int epoll_wait(HANDLE ephnd,
-                             struct epoll_event* events,
-                             int maxevents,
-                             int timeout);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include <malloc.h>
-#include <stdlib.h>
-
-#define WEPOLL_INTERNAL static
-#define WEPOLL_INTERNAL_VAR static
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wreserved-id-macro"
-#endif
-
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-
-#define _WIN32_WINNT 0x0600
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#ifndef __GNUC__
-#pragma warning(push, 1)
-#endif
-
-#include <WS2tcpip.h>
-#include <WinSock2.h>
-#include <Windows.h>
-
-#ifndef __GNUC__
-#pragma warning(pop)
-#endif
-
-WEPOLL_INTERNAL int nt_global_init(void);
-
-typedef LONG NTSTATUS;
-typedef NTSTATUS* PNTSTATUS;
-
-#ifndef NT_SUCCESS
-#define NT_SUCCESS(status) (((NTSTATUS)(status)) >= 0)
-#endif
-
-#ifndef STATUS_SUCCESS
-#define STATUS_SUCCESS ((NTSTATUS) 0x00000000L)
-#endif
-
-#ifndef STATUS_PENDING
-#define STATUS_PENDING ((NTSTATUS) 0x00000103L)
-#endif
-
-#ifndef STATUS_CANCELLED
-#define STATUS_CANCELLED ((NTSTATUS) 0xC0000120L)
-#endif
-
-typedef struct _IO_STATUS_BLOCK {
-  NTSTATUS Status;
-  ULONG_PTR Information;
-} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
-
-typedef VOID(NTAPI* PIO_APC_ROUTINE)(PVOID ApcContext,
-                                     PIO_STATUS_BLOCK IoStatusBlock,
-                                     ULONG Reserved);
-
-typedef struct _LSA_UNICODE_STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PWSTR Buffer;
-} LSA_UNICODE_STRING, *PLSA_UNICODE_STRING, UNICODE_STRING, *PUNICODE_STRING;
-
-#define RTL_CONSTANT_STRING(s) \
-  { sizeof(s) - sizeof((s)[0]), sizeof(s), s }
-
-typedef struct _OBJECT_ATTRIBUTES {
-  ULONG Length;
-  HANDLE RootDirectory;
-  PUNICODE_STRING ObjectName;
-  ULONG Attributes;
-  PVOID SecurityDescriptor;
-  PVOID SecurityQualityOfService;
-} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
-
-#define RTL_CONSTANT_OBJECT_ATTRIBUTES(ObjectName, Attributes) \
-  { sizeof(OBJECT_ATTRIBUTES), NULL, ObjectName, Attributes, NULL, NULL }
-
-#ifndef FILE_OPEN
-#define FILE_OPEN 0x00000001UL
-#endif
-
-#define NT_NTDLL_IMPORT_LIST(X)                                              \
-  X(NTSTATUS,                                                                \
-    NTAPI,                                                                   \
-    NtCreateFile,                                                            \
-    (PHANDLE FileHandle,                                                     \
-     ACCESS_MASK DesiredAccess,                                              \
-     POBJECT_ATTRIBUTES ObjectAttributes,                                    \
-     PIO_STATUS_BLOCK IoStatusBlock,                                         \
-     PLARGE_INTEGER AllocationSize,                                          \
-     ULONG FileAttributes,                                                   \
-     ULONG ShareAccess,                                                      \
-     ULONG CreateDisposition,                                                \
-     ULONG CreateOptions,                                                    \
-     PVOID EaBuffer,                                                         \
-     ULONG EaLength))                                                        \
-                                                                             \
-  X(NTSTATUS,                                                                \
-    NTAPI,                                                                   \
-    NtDeviceIoControlFile,                                                   \
-    (HANDLE FileHandle,                                                      \
-     HANDLE Event,                                                           \
-     PIO_APC_ROUTINE ApcRoutine,                                             \
-     PVOID ApcContext,                                                       \
-     PIO_STATUS_BLOCK IoStatusBlock,                                         \
-     ULONG IoControlCode,                                                    \
-     PVOID InputBuffer,                                                      \
-     ULONG InputBufferLength,                                                \
-     PVOID OutputBuffer,                                                     \
-     ULONG OutputBufferLength))                                              \
-                                                                             \
-  X(ULONG, WINAPI, RtlNtStatusToDosError, (NTSTATUS Status))                 \
-                                                                             \
-  X(NTSTATUS,                                                                \
-    NTAPI,                                                                   \
-    NtCreateKeyedEvent,                                                      \
-    (PHANDLE handle,                                                         \
-     ACCESS_MASK access,                                                     \
-     POBJECT_ATTRIBUTES attr,                                                \
-     ULONG flags))                                                           \
-                                                                             \
-  X(NTSTATUS,                                                                \
-    NTAPI,                                                                   \
-    NtWaitForKeyedEvent,                                                     \
-    (HANDLE handle, PVOID key, BOOLEAN alertable, PLARGE_INTEGER mstimeout)) \
-                                                                             \
-  X(NTSTATUS,                                                                \
-    NTAPI,                                                                   \
-    NtReleaseKeyedEvent,                                                     \
-    (HANDLE handle, PVOID key, BOOLEAN alertable, PLARGE_INTEGER mstimeout))
-
-#define X(return_type, attributes, name, parameters) \
-  WEPOLL_INTERNAL_VAR return_type(attributes* name) parameters;
-NT_NTDLL_IMPORT_LIST(X)
-#undef X
-
-#include <assert.h>
-#include <stddef.h>
-
-#ifndef _SSIZE_T_DEFINED
-typedef intptr_t ssize_t;
-#endif
-
-#define array_count(a) (sizeof(a) / (sizeof((a)[0])))
-
-/* clang-format off */
-#define container_of(ptr, type, member) \
-  ((type*) ((uintptr_t) (ptr) - offsetof(type, member)))
-/* clang-format on */
-
-#define unused_var(v) ((void) (v))
-
-/* Polyfill `inline` for older versions of msvc (up to Visual Studio 2013) */
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#define inline __inline
-#endif
-
-/* clang-format off */
-#define AFD_POLL_RECEIVE           0x0001
-#define AFD_POLL_RECEIVE_EXPEDITED 0x0002
-#define AFD_POLL_SEND              0x0004
-#define AFD_POLL_DISCONNECT        0x0008
-#define AFD_POLL_ABORT             0x0010
-#define AFD_POLL_LOCAL_CLOSE       0x0020
-#define AFD_POLL_ACCEPT            0x0080
-#define AFD_POLL_CONNECT_FAIL      0x0100
-/* clang-format on */
-
-typedef struct _AFD_POLL_HANDLE_INFO {
-  HANDLE Handle;
-  ULONG Events;
-  NTSTATUS Status;
-} AFD_POLL_HANDLE_INFO, *PAFD_POLL_HANDLE_INFO;
-
-typedef struct _AFD_POLL_INFO {
-  LARGE_INTEGER Timeout;
-  ULONG NumberOfHandles;
-  ULONG Exclusive;
-  AFD_POLL_HANDLE_INFO Handles[1];
-} AFD_POLL_INFO, *PAFD_POLL_INFO;
-
-WEPOLL_INTERNAL int afd_create_helper_handle(HANDLE iocp,
-                                             HANDLE* afd_helper_handle_out);
-
-WEPOLL_INTERNAL int afd_poll(HANDLE afd_helper_handle,
-                             AFD_POLL_INFO* poll_info,
-                             OVERLAPPED* overlapped);
-
-#define return_map_error(value) \
-  do {                          \
-    err_map_win_error();        \
-    return (value);             \
-  } while (0)
-
-#define return_set_error(value, error) \
-  do {                                 \
-    err_set_win_error(error);          \
-    return (value);                    \
-  } while (0)
-
-WEPOLL_INTERNAL void err_map_win_error(void);
-WEPOLL_INTERNAL void err_set_win_error(DWORD error);
-WEPOLL_INTERNAL int err_check_handle(HANDLE handle);
-
-WEPOLL_INTERNAL int ws_global_init(void);
-WEPOLL_INTERNAL SOCKET ws_get_base_socket(SOCKET socket);
-
-#define IOCTL_AFD_POLL 0x00012024
-
-static UNICODE_STRING afd__helper_name =
-    RTL_CONSTANT_STRING(L"\\Device\\Afd\\Wepoll");
-
-static OBJECT_ATTRIBUTES afd__helper_attributes =
-    RTL_CONSTANT_OBJECT_ATTRIBUTES(&afd__helper_name, 0);
-
-int afd_create_helper_handle(HANDLE iocp, HANDLE* afd_helper_handle_out) {
-  HANDLE afd_helper_handle;
-  IO_STATUS_BLOCK iosb;
-  NTSTATUS status;
-
-  /* By opening \Device\Afd without specifying any extended attributes, we'll
-   * get a handle that lets us talk to the AFD driver, but that doesn't have an
-   * associated endpoint (so it's not a socket). */
-  status = NtCreateFile(&afd_helper_handle,
-                        SYNCHRONIZE,
-                        &afd__helper_attributes,
-                        &iosb,
-                        NULL,
-                        0,
-                        FILE_SHARE_READ | FILE_SHARE_WRITE,
-                        FILE_OPEN,
-                        0,
-                        NULL,
-                        0);
-  if (status != STATUS_SUCCESS)
-    return_set_error(-1, RtlNtStatusToDosError(status));
-
-  if (CreateIoCompletionPort(afd_helper_handle, iocp, 0, 0) == NULL)
-    goto error;
-
-  if (!SetFileCompletionNotificationModes(afd_helper_handle,
-                                          FILE_SKIP_SET_EVENT_ON_HANDLE))
-    goto error;
-
-  *afd_helper_handle_out = afd_helper_handle;
-  return 0;
-
-error:
-  CloseHandle(afd_helper_handle);
-  return_map_error(-1);
-}
-
-int afd_poll(HANDLE afd_helper_handle,
-             AFD_POLL_INFO* poll_info,
-             OVERLAPPED* overlapped) {
-  IO_STATUS_BLOCK* iosb;
-  HANDLE event;
-  void* apc_context;
-  NTSTATUS status;
-
-  /* Blocking operation is not supported. */
-  assert(overlapped != NULL);
-
-  iosb = (IO_STATUS_BLOCK*) &overlapped->Internal;
-  event = overlapped->hEvent;
-
-  /* Do what other windows APIs would do: if hEvent has it's lowest bit set,
-   * don't post a completion to the completion port. */
-  if ((uintptr_t) event & 1) {
-    event = (HANDLE)((uintptr_t) event & ~(uintptr_t) 1);
-    apc_context = NULL;
-  } else {
-    apc_context = overlapped;
-  }
-
-  iosb->Status = STATUS_PENDING;
-  status = NtDeviceIoControlFile(afd_helper_handle,
-                                 event,
-                                 NULL,
-                                 apc_context,
-                                 iosb,
-                                 IOCTL_AFD_POLL,
-                                 poll_info,
-                                 sizeof *poll_info,
-                                 poll_info,
-                                 sizeof *poll_info);
-
-  if (status == STATUS_SUCCESS)
-    return 0;
-  else if (status == STATUS_PENDING)
-    return_set_error(-1, ERROR_IO_PENDING);
-  else
-    return_set_error(-1, RtlNtStatusToDosError(status));
-}
-
-WEPOLL_INTERNAL int epoll_global_init(void);
-
-WEPOLL_INTERNAL int init(void);
-
-#include <stdbool.h>
-
-typedef struct queue_node queue_node_t;
-
-typedef struct queue_node {
-  queue_node_t* prev;
-  queue_node_t* next;
-} queue_node_t;
-
-typedef struct queue {
-  queue_node_t head;
-} queue_t;
-
-WEPOLL_INTERNAL void queue_init(queue_t* queue);
-WEPOLL_INTERNAL void queue_node_init(queue_node_t* node);
-
-WEPOLL_INTERNAL queue_node_t* queue_first(const queue_t* queue);
-WEPOLL_INTERNAL queue_node_t* queue_last(const queue_t* queue);
-
-WEPOLL_INTERNAL void queue_prepend(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_append(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_move_first(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_move_last(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_remove(queue_node_t* node);
-
-WEPOLL_INTERNAL bool queue_empty(const queue_t* queue);
-WEPOLL_INTERNAL bool queue_enqueued(const queue_node_t* node);
-
-typedef struct port_state port_state_t;
-typedef struct poll_group poll_group_t;
-
-WEPOLL_INTERNAL poll_group_t* poll_group_acquire(port_state_t* port);
-WEPOLL_INTERNAL void poll_group_release(poll_group_t* poll_group);
-
-WEPOLL_INTERNAL void poll_group_delete(poll_group_t* poll_group);
-
-WEPOLL_INTERNAL poll_group_t* poll_group_from_queue_node(
-    queue_node_t* queue_node);
-WEPOLL_INTERNAL HANDLE
-    poll_group_get_afd_helper_handle(poll_group_t* poll_group);
-
-/* N.b.: the tree functions do not set errno or LastError when they fail. Each
- * of the API functions has at most one failure mode. It is up to the caller to
- * set an appropriate error code when necessary. */
-
-typedef struct tree tree_t;
-typedef struct tree_node tree_node_t;
-
-typedef struct tree {
-  tree_node_t* root;
-} tree_t;
-
-typedef struct tree_node {
-  tree_node_t* left;
-  tree_node_t* right;
-  tree_node_t* parent;
-  uintptr_t key;
-  bool red;
-} tree_node_t;
-
-WEPOLL_INTERNAL void tree_init(tree_t* tree);
-WEPOLL_INTERNAL void tree_node_init(tree_node_t* node);
-
-WEPOLL_INTERNAL int tree_add(tree_t* tree, tree_node_t* node, uintptr_t key);
-WEPOLL_INTERNAL void tree_del(tree_t* tree, tree_node_t* node);
-
-WEPOLL_INTERNAL tree_node_t* tree_find(const tree_t* tree, uintptr_t key);
-WEPOLL_INTERNAL tree_node_t* tree_root(const tree_t* tree);
-
-typedef struct port_state port_state_t;
-typedef struct sock_state sock_state_t;
-
-WEPOLL_INTERNAL sock_state_t* sock_new(port_state_t* port_state,
-                                       SOCKET socket);
-WEPOLL_INTERNAL void sock_delete(port_state_t* port_state,
-                                 sock_state_t* sock_state);
-WEPOLL_INTERNAL void sock_force_delete(port_state_t* port_state,
-                                       sock_state_t* sock_state);
-
-WEPOLL_INTERNAL int sock_set_event(port_state_t* port_state,
-                                   sock_state_t* sock_state,
-                                   const struct epoll_event* ev);
-
-WEPOLL_INTERNAL int sock_update(port_state_t* port_state,
-                                sock_state_t* sock_state);
-WEPOLL_INTERNAL int sock_feed_event(port_state_t* port_state,
-                                    OVERLAPPED* overlapped,
-                                    struct epoll_event* ev);
-
-WEPOLL_INTERNAL sock_state_t* sock_state_from_queue_node(
-    queue_node_t* queue_node);
-WEPOLL_INTERNAL queue_node_t* sock_state_to_queue_node(
-    sock_state_t* sock_state);
-WEPOLL_INTERNAL sock_state_t* sock_state_from_tree_node(
-    tree_node_t* tree_node);
-WEPOLL_INTERNAL tree_node_t* sock_state_to_tree_node(sock_state_t* sock_state);
-
-/* The reflock is a special kind of lock that normally prevents a chunk of
- * memory from being freed, but does allow the chunk of memory to eventually be
- * released in a coordinated fashion.
- *
- * Under normal operation, threads increase and decrease the reference count,
- * which are wait-free operations.
- *
- * Exactly once during the reflock's lifecycle, a thread holding a reference to
- * the lock may "destroy" the lock; this operation blocks until all other
- * threads holding a reference to the lock have dereferenced it. After
- * "destroy" returns, the calling thread may assume that no other threads have
- * a reference to the lock.
- *
- * Attemmpting to lock or destroy a lock after reflock_unref_and_destroy() has
- * been called is invalid and results in undefined behavior. Therefore the user
- * should use another lock to guarantee that this can't happen.
- */
-
-typedef struct reflock {
-  volatile long state; /* 32-bit Interlocked APIs operate on `long` values. */
-} reflock_t;
-
-WEPOLL_INTERNAL int reflock_global_init(void);
-
-WEPOLL_INTERNAL void reflock_init(reflock_t* reflock);
-WEPOLL_INTERNAL void reflock_ref(reflock_t* reflock);
-WEPOLL_INTERNAL void reflock_unref(reflock_t* reflock);
-WEPOLL_INTERNAL void reflock_unref_and_destroy(reflock_t* reflock);
-
-typedef struct ts_tree {
-  tree_t tree;
-  SRWLOCK lock;
-} ts_tree_t;
-
-typedef struct ts_tree_node {
-  tree_node_t tree_node;
-  reflock_t reflock;
-} ts_tree_node_t;
-
-WEPOLL_INTERNAL void ts_tree_init(ts_tree_t* rtl);
-WEPOLL_INTERNAL void ts_tree_node_init(ts_tree_node_t* node);
-
-WEPOLL_INTERNAL int ts_tree_add(ts_tree_t* ts_tree,
-                                ts_tree_node_t* node,
-                                uintptr_t key);
-
-WEPOLL_INTERNAL ts_tree_node_t* ts_tree_del_and_ref(ts_tree_t* ts_tree,
-                                                    uintptr_t key);
-WEPOLL_INTERNAL ts_tree_node_t* ts_tree_find_and_ref(ts_tree_t* ts_tree,
-                                                     uintptr_t key);
-
-WEPOLL_INTERNAL void ts_tree_node_unref(ts_tree_node_t* node);
-WEPOLL_INTERNAL void ts_tree_node_unref_and_destroy(ts_tree_node_t* node);
-
-typedef struct port_state port_state_t;
-typedef struct sock_state sock_state_t;
-
-typedef struct port_state {
-  HANDLE iocp;
-  tree_t sock_tree;
-  queue_t sock_update_queue;
-  queue_t sock_deleted_queue;
-  queue_t poll_group_queue;
-  ts_tree_node_t handle_tree_node;
-  CRITICAL_SECTION lock;
-  size_t active_poll_count;
-} port_state_t;
-
-WEPOLL_INTERNAL port_state_t* port_new(HANDLE* iocp_out);
-WEPOLL_INTERNAL int port_close(port_state_t* port_state);
-WEPOLL_INTERNAL int port_delete(port_state_t* port_state);
-
-WEPOLL_INTERNAL int port_wait(port_state_t* port_state,
-                              struct epoll_event* events,
-                              int maxevents,
-                              int timeout);
-
-WEPOLL_INTERNAL int port_ctl(port_state_t* port_state,
-                             int op,
-                             SOCKET sock,
-                             struct epoll_event* ev);
-
-WEPOLL_INTERNAL int port_register_socket_handle(port_state_t* port_state,
-                                                sock_state_t* sock_state,
-                                                SOCKET socket);
-WEPOLL_INTERNAL void port_unregister_socket_handle(port_state_t* port_state,
-                                                   sock_state_t* sock_state);
-WEPOLL_INTERNAL sock_state_t* port_find_socket(port_state_t* port_state,
-                                               SOCKET socket);
-
-WEPOLL_INTERNAL void port_request_socket_update(port_state_t* port_state,
-                                                sock_state_t* sock_state);
-WEPOLL_INTERNAL void port_cancel_socket_update(port_state_t* port_state,
-                                               sock_state_t* sock_state);
-
-WEPOLL_INTERNAL void port_add_deleted_socket(port_state_t* port_state,
-                                             sock_state_t* sock_state);
-WEPOLL_INTERNAL void port_remove_deleted_socket(port_state_t* port_state,
-                                                sock_state_t* sock_state);
-
-static ts_tree_t epoll__handle_tree;
-
-static inline port_state_t* epoll__handle_tree_node_to_port(
-    ts_tree_node_t* tree_node) {
-  return container_of(tree_node, port_state_t, handle_tree_node);
-}
-
-int epoll_global_init(void) {
-  ts_tree_init(&epoll__handle_tree);
-  return 0;
-}
-
-static HANDLE epoll__create(void) {
-  port_state_t* port_state;
-  HANDLE ephnd;
-
-  if (init() < 0)
-    return NULL;
-
-  port_state = port_new(&ephnd);
-  if (port_state == NULL)
-    return NULL;
-
-  if (ts_tree_add(&epoll__handle_tree,
-                  &port_state->handle_tree_node,
-                  (uintptr_t) ephnd) < 0) {
-    /* This should never happen. */
-    port_delete(port_state);
-    return_set_error(NULL, ERROR_ALREADY_EXISTS);
-  }
-
-  return ephnd;
-}
-
-HANDLE epoll_create(int size) {
-  if (size <= 0)
-    return_set_error(NULL, ERROR_INVALID_PARAMETER);
-
-  return epoll__create();
-}
-
-HANDLE epoll_create1(int flags) {
-  if (flags != 0)
-    return_set_error(NULL, ERROR_INVALID_PARAMETER);
-
-  return epoll__create();
-}
-
-int epoll_close(HANDLE ephnd) {
-  ts_tree_node_t* tree_node;
-  port_state_t* port_state;
-
-  if (init() < 0)
-    return -1;
-
-  tree_node = ts_tree_del_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
-  if (tree_node == NULL) {
-    err_set_win_error(ERROR_INVALID_PARAMETER);
-    goto err;
-  }
-
-  port_state = epoll__handle_tree_node_to_port(tree_node);
-  port_close(port_state);
-
-  ts_tree_node_unref_and_destroy(tree_node);
-
-  return port_delete(port_state);
-
-err:
-  err_check_handle(ephnd);
-  return -1;
-}
-
-int epoll_ctl(HANDLE ephnd, int op, SOCKET sock, struct epoll_event* ev) {
-  ts_tree_node_t* tree_node;
-  port_state_t* port_state;
-  int r;
-
-  if (init() < 0)
-    return -1;
-
-  tree_node = ts_tree_find_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
-  if (tree_node == NULL) {
-    err_set_win_error(ERROR_INVALID_PARAMETER);
-    goto err;
-  }
-
-  port_state = epoll__handle_tree_node_to_port(tree_node);
-  r = port_ctl(port_state, op, sock, ev);
-
-  ts_tree_node_unref(tree_node);
-
-  if (r < 0)
-    goto err;
-
-  return 0;
-
-err:
-  /* On Linux, in the case of epoll_ctl_mod(), EBADF takes priority over other
-   * errors. Wepoll mimics this behavior. */
-  err_check_handle(ephnd);
-  err_check_handle((HANDLE) sock);
-  return -1;
-}
-
-int epoll_wait(HANDLE ephnd,
-               struct epoll_event* events,
-               int maxevents,
-               int timeout) {
-  ts_tree_node_t* tree_node;
-  port_state_t* port_state;
-  int num_events;
-
-  if (maxevents <= 0)
-    return_set_error(-1, ERROR_INVALID_PARAMETER);
-
-  if (init() < 0)
-    return -1;
-
-  tree_node = ts_tree_find_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
-  if (tree_node == NULL) {
-    err_set_win_error(ERROR_INVALID_PARAMETER);
-    goto err;
-  }
-
-  port_state = epoll__handle_tree_node_to_port(tree_node);
-  num_events = port_wait(port_state, events, maxevents, timeout);
-
-  ts_tree_node_unref(tree_node);
-
-  if (num_events < 0)
-    goto err;
-
-  return num_events;
-
-err:
-  err_check_handle(ephnd);
-  return -1;
-}
-
-#include <errno.h>
-
-#define ERR__ERRNO_MAPPINGS(X)               \
-  X(ERROR_ACCESS_DENIED, EACCES)             \
-  X(ERROR_ALREADY_EXISTS, EEXIST)            \
-  X(ERROR_BAD_COMMAND, EACCES)               \
-  X(ERROR_BAD_EXE_FORMAT, ENOEXEC)           \
-  X(ERROR_BAD_LENGTH, EACCES)                \
-  X(ERROR_BAD_NETPATH, ENOENT)               \
-  X(ERROR_BAD_NET_NAME, ENOENT)              \
-  X(ERROR_BAD_NET_RESP, ENETDOWN)            \
-  X(ERROR_BAD_PATHNAME, ENOENT)              \
-  X(ERROR_BROKEN_PIPE, EPIPE)                \
-  X(ERROR_CANNOT_MAKE, EACCES)               \
-  X(ERROR_COMMITMENT_LIMIT, ENOMEM)          \
-  X(ERROR_CONNECTION_ABORTED, ECONNABORTED)  \
-  X(ERROR_CONNECTION_ACTIVE, EISCONN)        \
-  X(ERROR_CONNECTION_REFUSED, ECONNREFUSED)  \
-  X(ERROR_CRC, EACCES)                       \
-  X(ERROR_DIR_NOT_EMPTY, ENOTEMPTY)          \
-  X(ERROR_DISK_FULL, ENOSPC)                 \
-  X(ERROR_DUP_NAME, EADDRINUSE)              \
-  X(ERROR_FILENAME_EXCED_RANGE, ENOENT)      \
-  X(ERROR_FILE_NOT_FOUND, ENOENT)            \
-  X(ERROR_GEN_FAILURE, EACCES)               \
-  X(ERROR_GRACEFUL_DISCONNECT, EPIPE)        \
-  X(ERROR_HOST_DOWN, EHOSTUNREACH)           \
-  X(ERROR_HOST_UNREACHABLE, EHOSTUNREACH)    \
-  X(ERROR_INSUFFICIENT_BUFFER, EFAULT)       \
-  X(ERROR_INVALID_ADDRESS, EADDRNOTAVAIL)    \
-  X(ERROR_INVALID_FUNCTION, EINVAL)          \
-  X(ERROR_INVALID_HANDLE, EBADF)             \
-  X(ERROR_INVALID_NETNAME, EADDRNOTAVAIL)    \
-  X(ERROR_INVALID_PARAMETER, EINVAL)         \
-  X(ERROR_INVALID_USER_BUFFER, EMSGSIZE)     \
-  X(ERROR_IO_PENDING, EINPROGRESS)           \
-  X(ERROR_LOCK_VIOLATION, EACCES)            \
-  X(ERROR_MORE_DATA, EMSGSIZE)               \
-  X(ERROR_NETNAME_DELETED, ECONNABORTED)     \
-  X(ERROR_NETWORK_ACCESS_DENIED, EACCES)     \
-  X(ERROR_NETWORK_BUSY, ENETDOWN)            \
-  X(ERROR_NETWORK_UNREACHABLE, ENETUNREACH)  \
-  X(ERROR_NOACCESS, EFAULT)                  \
-  X(ERROR_NONPAGED_SYSTEM_RESOURCES, ENOMEM) \
-  X(ERROR_NOT_ENOUGH_MEMORY, ENOMEM)         \
-  X(ERROR_NOT_ENOUGH_QUOTA, ENOMEM)          \
-  X(ERROR_NOT_FOUND, ENOENT)                 \
-  X(ERROR_NOT_LOCKED, EACCES)                \
-  X(ERROR_NOT_READY, EACCES)                 \
-  X(ERROR_NOT_SAME_DEVICE, EXDEV)            \
-  X(ERROR_NOT_SUPPORTED, ENOTSUP)            \
-  X(ERROR_NO_MORE_FILES, ENOENT)             \
-  X(ERROR_NO_SYSTEM_RESOURCES, ENOMEM)       \
-  X(ERROR_OPERATION_ABORTED, EINTR)          \
-  X(ERROR_OUT_OF_PAPER, EACCES)              \
-  X(ERROR_PAGED_SYSTEM_RESOURCES, ENOMEM)    \
-  X(ERROR_PAGEFILE_QUOTA, ENOMEM)            \
-  X(ERROR_PATH_NOT_FOUND, ENOENT)            \
-  X(ERROR_PIPE_NOT_CONNECTED, EPIPE)         \
-  X(ERROR_PORT_UNREACHABLE, ECONNRESET)      \
-  X(ERROR_PROTOCOL_UNREACHABLE, ENETUNREACH) \
-  X(ERROR_REM_NOT_LIST, ECONNREFUSED)        \
-  X(ERROR_REQUEST_ABORTED, EINTR)            \
-  X(ERROR_REQ_NOT_ACCEP, EWOULDBLOCK)        \
-  X(ERROR_SECTOR_NOT_FOUND, EACCES)          \
-  X(ERROR_SEM_TIMEOUT, ETIMEDOUT)            \
-  X(ERROR_SHARING_VIOLATION, EACCES)         \
-  X(ERROR_TOO_MANY_NAMES, ENOMEM)            \
-  X(ERROR_TOO_MANY_OPEN_FILES, EMFILE)       \
-  X(ERROR_UNEXP_NET_ERR, ECONNABORTED)       \
-  X(ERROR_WAIT_NO_CHILDREN, ECHILD)          \
-  X(ERROR_WORKING_SET_QUOTA, ENOMEM)         \
-  X(ERROR_WRITE_PROTECT, EACCES)             \
-  X(ERROR_WRONG_DISK, EACCES)                \
-  X(WSAEACCES, EACCES)                       \
-  X(WSAEADDRINUSE, EADDRINUSE)               \
-  X(WSAEADDRNOTAVAIL, EADDRNOTAVAIL)         \
-  X(WSAEAFNOSUPPORT, EAFNOSUPPORT)           \
-  X(WSAECONNABORTED, ECONNABORTED)           \
-  X(WSAECONNREFUSED, ECONNREFUSED)           \
-  X(WSAECONNRESET, ECONNRESET)               \
-  X(WSAEDISCON, EPIPE)                       \
-  X(WSAEFAULT, EFAULT)                       \
-  X(WSAEHOSTDOWN, EHOSTUNREACH)              \
-  X(WSAEHOSTUNREACH, EHOSTUNREACH)           \
-  X(WSAEINPROGRESS, EBUSY)                   \
-  X(WSAEINTR, EINTR)                         \
-  X(WSAEINVAL, EINVAL)                       \
-  X(WSAEISCONN, EISCONN)                     \
-  X(WSAEMSGSIZE, EMSGSIZE)                   \
-  X(WSAENETDOWN, ENETDOWN)                   \
-  X(WSAENETRESET, EHOSTUNREACH)              \
-  X(WSAENETUNREACH, ENETUNREACH)             \
-  X(WSAENOBUFS, ENOMEM)                      \
-  X(WSAENOTCONN, ENOTCONN)                   \
-  X(WSAENOTSOCK, ENOTSOCK)                   \
-  X(WSAEOPNOTSUPP, EOPNOTSUPP)               \
-  X(WSAEPROCLIM, ENOMEM)                     \
-  X(WSAESHUTDOWN, EPIPE)                     \
-  X(WSAETIMEDOUT, ETIMEDOUT)                 \
-  X(WSAEWOULDBLOCK, EWOULDBLOCK)             \
-  X(WSANOTINITIALISED, ENETDOWN)             \
-  X(WSASYSNOTREADY, ENETDOWN)                \
-  X(WSAVERNOTSUPPORTED, ENOSYS)
-
-static errno_t err__map_win_error_to_errno(DWORD error) {
-  switch (error) {
-#define X(error_sym, errno_sym) \
-  case error_sym:               \
-    return errno_sym;
-    ERR__ERRNO_MAPPINGS(X)
-#undef X
-  }
-  return EINVAL;
-}
-
-void err_map_win_error(void) {
-  errno = err__map_win_error_to_errno(GetLastError());
-}
-
-void err_set_win_error(DWORD error) {
-  SetLastError(error);
-  errno = err__map_win_error_to_errno(error);
-}
-
-int err_check_handle(HANDLE handle) {
-  DWORD flags;
-
-  /* GetHandleInformation() succeeds when passed INVALID_HANDLE_VALUE, so check
-   * for this condition explicitly. */
-  if (handle == INVALID_HANDLE_VALUE)
-    return_set_error(-1, ERROR_INVALID_HANDLE);
-
-  if (!GetHandleInformation(handle, &flags))
-    return_map_error(-1);
-
-  return 0;
-}
-
-static bool init__done = false;
-static INIT_ONCE init__once = INIT_ONCE_STATIC_INIT;
-
-static BOOL CALLBACK init__once_callback(INIT_ONCE* once,
-                                         void* parameter,
-                                         void** context) {
-  unused_var(once);
-  unused_var(parameter);
-  unused_var(context);
-
-  /* N.b. that initialization order matters here. */
-  if (ws_global_init() < 0 || nt_global_init() < 0 ||
-      reflock_global_init() < 0 || epoll_global_init() < 0)
-    return FALSE;
-
-  init__done = true;
-  return TRUE;
-}
-
-int init(void) {
-  if (!init__done &&
-      !InitOnceExecuteOnce(&init__once, init__once_callback, NULL, NULL))
-    return -1; /* LastError and errno aren't touched InitOnceExecuteOnce. */
-
-  return 0;
-}
-
-/* Set up a workaround for the following problem:
- *   FARPROC addr = GetProcAddress(...);
- *   MY_FUNC func = (MY_FUNC) addr;          <-- GCC 8 warning/error.
- *   MY_FUNC func = (MY_FUNC) (void*) addr;  <-- MSVC  warning/error.
- * To compile cleanly with either compiler, do casts with this "bridge" type:
- *   MY_FUNC func = (MY_FUNC) (nt__fn_ptr_cast_t) addr; */
-#ifdef __GNUC__
-typedef void* nt__fn_ptr_cast_t;
-#else
-typedef FARPROC nt__fn_ptr_cast_t;
-#endif
-
-#define X(return_type, attributes, name, parameters) \
-  WEPOLL_INTERNAL return_type(attributes* name) parameters = NULL;
-NT_NTDLL_IMPORT_LIST(X)
-#undef X
-
-int nt_global_init(void) {
-  HMODULE ntdll;
-  FARPROC fn_ptr;
-
-  ntdll = GetModuleHandleW(L"ntdll.dll");
-  if (ntdll == NULL)
-    return -1;
-
-#define X(return_type, attributes, name, parameters) \
-  fn_ptr = GetProcAddress(ntdll, #name);             \
-  if (fn_ptr == NULL)                                \
-    return -1;                                       \
-  name = (return_type(attributes*) parameters)(nt__fn_ptr_cast_t) fn_ptr;
-  NT_NTDLL_IMPORT_LIST(X)
-#undef X
-
-  return 0;
-}
-
-#include <string.h>
-
-static const size_t POLL_GROUP__MAX_GROUP_SIZE = 32;
-
-typedef struct poll_group {
-  port_state_t* port_state;
-  queue_node_t queue_node;
-  HANDLE afd_helper_handle;
-  size_t group_size;
-} poll_group_t;
-
-static poll_group_t* poll_group__new(port_state_t* port_state) {
-  poll_group_t* poll_group = malloc(sizeof *poll_group);
-  if (poll_group == NULL)
-    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
-
-  memset(poll_group, 0, sizeof *poll_group);
-
-  queue_node_init(&poll_group->queue_node);
-  poll_group->port_state = port_state;
-
-  if (afd_create_helper_handle(port_state->iocp,
-                               &poll_group->afd_helper_handle) < 0) {
-    free(poll_group);
-    return NULL;
-  }
-
-  queue_append(&port_state->poll_group_queue, &poll_group->queue_node);
-
-  return poll_group;
-}
-
-void poll_group_delete(poll_group_t* poll_group) {
-  assert(poll_group->group_size == 0);
-  CloseHandle(poll_group->afd_helper_handle);
-  queue_remove(&poll_group->queue_node);
-  free(poll_group);
-}
-
-poll_group_t* poll_group_from_queue_node(queue_node_t* queue_node) {
-  return container_of(queue_node, poll_group_t, queue_node);
-}
-
-HANDLE poll_group_get_afd_helper_handle(poll_group_t* poll_group) {
-  return poll_group->afd_helper_handle;
-}
-
-poll_group_t* poll_group_acquire(port_state_t* port_state) {
-  queue_t* queue = &port_state->poll_group_queue;
-  poll_group_t* poll_group =
-      !queue_empty(queue)
-          ? container_of(queue_last(queue), poll_group_t, queue_node)
-          : NULL;
-
-  if (poll_group == NULL ||
-      poll_group->group_size >= POLL_GROUP__MAX_GROUP_SIZE)
-    poll_group = poll_group__new(port_state);
-  if (poll_group == NULL)
-    return NULL;
-
-  if (++poll_group->group_size == POLL_GROUP__MAX_GROUP_SIZE)
-    queue_move_first(&port_state->poll_group_queue, &poll_group->queue_node);
-
-  return poll_group;
-}
-
-void poll_group_release(poll_group_t* poll_group) {
-  port_state_t* port_state = poll_group->port_state;
-
-  poll_group->group_size--;
-  assert(poll_group->group_size < POLL_GROUP__MAX_GROUP_SIZE);
-
-  queue_move_last(&port_state->poll_group_queue, &poll_group->queue_node);
-
-  /* Poll groups are currently only freed when the epoll port is closed. */
-}
-
-#define PORT__MAX_ON_STACK_COMPLETIONS 256
-
-static port_state_t* port__alloc(void) {
-  port_state_t* port_state = malloc(sizeof *port_state);
-  if (port_state == NULL)
-    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
-
-  return port_state;
-}
-
-static void port__free(port_state_t* port) {
-  assert(port != NULL);
-  free(port);
-}
-
-static HANDLE port__create_iocp(void) {
-  HANDLE iocp = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
-  if (iocp == NULL)
-    return_map_error(NULL);
-
-  return iocp;
-}
-
-port_state_t* port_new(HANDLE* iocp_out) {
-  port_state_t* port_state;
-  HANDLE iocp;
-
-  port_state = port__alloc();
-  if (port_state == NULL)
-    goto err1;
-
-  iocp = port__create_iocp();
-  if (iocp == NULL)
-    goto err2;
-
-  memset(port_state, 0, sizeof *port_state);
-
-  port_state->iocp = iocp;
-  tree_init(&port_state->sock_tree);
-  queue_init(&port_state->sock_update_queue);
-  queue_init(&port_state->sock_deleted_queue);
-  queue_init(&port_state->poll_group_queue);
-  ts_tree_node_init(&port_state->handle_tree_node);
-  InitializeCriticalSection(&port_state->lock);
-
-  *iocp_out = iocp;
-  return port_state;
-
-err2:
-  port__free(port_state);
-err1:
-  return NULL;
-}
-
-static int port__close_iocp(port_state_t* port_state) {
-  HANDLE iocp = port_state->iocp;
-  port_state->iocp = NULL;
-
-  if (!CloseHandle(iocp))
-    return_map_error(-1);
-
-  return 0;
-}
-
-int port_close(port_state_t* port_state) {
-  int result;
-
-  EnterCriticalSection(&port_state->lock);
-  result = port__close_iocp(port_state);
-  LeaveCriticalSection(&port_state->lock);
-
-  return result;
-}
-
-int port_delete(port_state_t* port_state) {
-  tree_node_t* tree_node;
-  queue_node_t* queue_node;
-
-  /* At this point the IOCP port should have been closed. */
-  assert(port_state->iocp == NULL);
-
-  while ((tree_node = tree_root(&port_state->sock_tree)) != NULL) {
-    sock_state_t* sock_state = sock_state_from_tree_node(tree_node);
-    sock_force_delete(port_state, sock_state);
-  }
-
-  while ((queue_node = queue_first(&port_state->sock_deleted_queue)) != NULL) {
-    sock_state_t* sock_state = sock_state_from_queue_node(queue_node);
-    sock_force_delete(port_state, sock_state);
-  }
-
-  while ((queue_node = queue_first(&port_state->poll_group_queue)) != NULL) {
-    poll_group_t* poll_group = poll_group_from_queue_node(queue_node);
-    poll_group_delete(poll_group);
-  }
-
-  assert(queue_empty(&port_state->sock_update_queue));
-
-  DeleteCriticalSection(&port_state->lock);
-
-  port__free(port_state);
-
-  return 0;
-}
-
-static int port__update_events(port_state_t* port_state) {
-  queue_t* sock_update_queue = &port_state->sock_update_queue;
-
-  /* Walk the queue, submitting new poll requests for every socket that needs
-   * it. */
-  while (!queue_empty(sock_update_queue)) {
-    queue_node_t* queue_node = queue_first(sock_update_queue);
-    sock_state_t* sock_state = sock_state_from_queue_node(queue_node);
-
-    if (sock_update(port_state, sock_state) < 0)
-      return -1;
-
-    /* sock_update() removes the socket from the update queue. */
-  }
-
-  return 0;
-}
-
-static void port__update_events_if_polling(port_state_t* port_state) {
-  if (port_state->active_poll_count > 0)
-    port__update_events(port_state);
-}
-
-static int port__feed_events(port_state_t* port_state,
-                             struct epoll_event* epoll_events,
-                             OVERLAPPED_ENTRY* iocp_events,
-                             DWORD iocp_event_count) {
-  int epoll_event_count = 0;
-  DWORD i;
-
-  for (i = 0; i < iocp_event_count; i++) {
-    OVERLAPPED* overlapped = iocp_events[i].lpOverlapped;
-    struct epoll_event* ev = &epoll_events[epoll_event_count];
-
-    epoll_event_count += sock_feed_event(port_state, overlapped, ev);
-  }
-
-  return epoll_event_count;
-}
-
-static int port__poll(port_state_t* port_state,
-                      struct epoll_event* epoll_events,
-                      OVERLAPPED_ENTRY* iocp_events,
-                      DWORD maxevents,
-                      DWORD timeout) {
-  DWORD completion_count;
-
-  if (port__update_events(port_state) < 0)
-    return -1;
-
-  port_state->active_poll_count++;
-
-  LeaveCriticalSection(&port_state->lock);
-
-  BOOL r = GetQueuedCompletionStatusEx(port_state->iocp,
-                                       iocp_events,
-                                       maxevents,
-                                       &completion_count,
-                                       timeout,
-                                       FALSE);
-
-  EnterCriticalSection(&port_state->lock);
-
-  port_state->active_poll_count--;
-
-  if (!r)
-    return_map_error(-1);
-
-  return port__feed_events(
-      port_state, epoll_events, iocp_events, completion_count);
-}
-
-int port_wait(port_state_t* port_state,
-              struct epoll_event* events,
-              int maxevents,
-              int timeout) {
-  OVERLAPPED_ENTRY stack_iocp_events[PORT__MAX_ON_STACK_COMPLETIONS];
-  OVERLAPPED_ENTRY* iocp_events;
-  uint64_t due = 0;
-  DWORD gqcs_timeout;
-  int result;
-
-  /* Check whether `maxevents` is in range. */
-  if (maxevents <= 0)
-    return_set_error(-1, ERROR_INVALID_PARAMETER);
-
-  /* Decide whether the IOCP completion list can live on the stack, or allocate
-   * memory for it on the heap. */
-  if ((size_t) maxevents <= array_count(stack_iocp_events)) {
-    iocp_events = stack_iocp_events;
-  } else if ((iocp_events =
-                  malloc((size_t) maxevents * sizeof *iocp_events)) == NULL) {
-    iocp_events = stack_iocp_events;
-    maxevents = array_count(stack_iocp_events);
-  }
-
-  /* Compute the timeout for GetQueuedCompletionStatus, and the wait end
-   * time, if the user specified a timeout other than zero or infinite. */
-  if (timeout > 0) {
-    due = GetTickCount64() + (uint64_t) timeout;
-    gqcs_timeout = (DWORD) timeout;
-  } else if (timeout == 0) {
-    gqcs_timeout = 0;
-  } else {
-    gqcs_timeout = INFINITE;
-  }
-
-  EnterCriticalSection(&port_state->lock);
-
-  /* Dequeue completion packets until either at least one interesting event
-   * has been discovered, or the timeout is reached. */
-  for (;;) {
-    uint64_t now;
-
-    result = port__poll(
-        port_state, events, iocp_events, (DWORD) maxevents, gqcs_timeout);
-    if (result < 0 || result > 0)
-      break; /* Result, error, or time-out. */
-
-    if (timeout < 0)
-      continue; /* When timeout is negative, never time out. */
-
-    /* Update time. */
-    now = GetTickCount64();
-
-    /* Do not allow the due time to be in the past. */
-    if (now >= due) {
-      SetLastError(WAIT_TIMEOUT);
-      break;
-    }
-
-    /* Recompute time-out argument for GetQueuedCompletionStatus. */
-    gqcs_timeout = (DWORD)(due - now);
-  }
-
-  port__update_events_if_polling(port_state);
-
-  LeaveCriticalSection(&port_state->lock);
-
-  if (iocp_events != stack_iocp_events)
-    free(iocp_events);
-
-  if (result >= 0)
-    return result;
-  else if (GetLastError() == WAIT_TIMEOUT)
-    return 0;
-  else
-    return -1;
-}
-
-static int port__ctl_add(port_state_t* port_state,
-                         SOCKET sock,
-                         struct epoll_event* ev) {
-  sock_state_t* sock_state = sock_new(port_state, sock);
-  if (sock_state == NULL)
-    return -1;
-
-  if (sock_set_event(port_state, sock_state, ev) < 0) {
-    sock_delete(port_state, sock_state);
-    return -1;
-  }
-
-  port__update_events_if_polling(port_state);
-
-  return 0;
-}
-
-static int port__ctl_mod(port_state_t* port_state,
-                         SOCKET sock,
-                         struct epoll_event* ev) {
-  sock_state_t* sock_state = port_find_socket(port_state, sock);
-  if (sock_state == NULL)
-    return -1;
-
-  if (sock_set_event(port_state, sock_state, ev) < 0)
-    return -1;
-
-  port__update_events_if_polling(port_state);
-
-  return 0;
-}
-
-static int port__ctl_del(port_state_t* port_state, SOCKET sock) {
-  sock_state_t* sock_state = port_find_socket(port_state, sock);
-  if (sock_state == NULL)
-    return -1;
-
-  sock_delete(port_state, sock_state);
-
-  return 0;
-}
-
-static int port__ctl_op(port_state_t* port_state,
-                        int op,
-                        SOCKET sock,
-                        struct epoll_event* ev) {
-  switch (op) {
-    case EPOLL_CTL_ADD:
-      return port__ctl_add(port_state, sock, ev);
-    case EPOLL_CTL_MOD:
-      return port__ctl_mod(port_state, sock, ev);
-    case EPOLL_CTL_DEL:
-      return port__ctl_del(port_state, sock);
-    default:
-      return_set_error(-1, ERROR_INVALID_PARAMETER);
-  }
-}
-
-int port_ctl(port_state_t* port_state,
-             int op,
-             SOCKET sock,
-             struct epoll_event* ev) {
-  int result;
-
-  EnterCriticalSection(&port_state->lock);
-  result = port__ctl_op(port_state, op, sock, ev);
-  LeaveCriticalSection(&port_state->lock);
-
-  return result;
-}
-
-int port_register_socket_handle(port_state_t* port_state,
-                                sock_state_t* sock_state,
-                                SOCKET socket) {
-  if (tree_add(&port_state->sock_tree,
-               sock_state_to_tree_node(sock_state),
-               socket) < 0)
-    return_set_error(-1, ERROR_ALREADY_EXISTS);
-  return 0;
-}
-
-void port_unregister_socket_handle(port_state_t* port_state,
-                                   sock_state_t* sock_state) {
-  tree_del(&port_state->sock_tree, sock_state_to_tree_node(sock_state));
-}
-
-sock_state_t* port_find_socket(port_state_t* port_state, SOCKET socket) {
-  tree_node_t* tree_node = tree_find(&port_state->sock_tree, socket);
-  if (tree_node == NULL)
-    return_set_error(NULL, ERROR_NOT_FOUND);
-  return sock_state_from_tree_node(tree_node);
-}
-
-void port_request_socket_update(port_state_t* port_state,
-                                sock_state_t* sock_state) {
-  if (queue_enqueued(sock_state_to_queue_node(sock_state)))
-    return;
-  queue_append(&port_state->sock_update_queue,
-               sock_state_to_queue_node(sock_state));
-}
-
-void port_cancel_socket_update(port_state_t* port_state,
-                               sock_state_t* sock_state) {
-  unused_var(port_state);
-  if (!queue_enqueued(sock_state_to_queue_node(sock_state)))
-    return;
-  queue_remove(sock_state_to_queue_node(sock_state));
-}
-
-void port_add_deleted_socket(port_state_t* port_state,
-                             sock_state_t* sock_state) {
-  if (queue_enqueued(sock_state_to_queue_node(sock_state)))
-    return;
-  queue_append(&port_state->sock_deleted_queue,
-               sock_state_to_queue_node(sock_state));
-}
-
-void port_remove_deleted_socket(port_state_t* port_state,
-                                sock_state_t* sock_state) {
-  unused_var(port_state);
-  if (!queue_enqueued(sock_state_to_queue_node(sock_state)))
-    return;
-  queue_remove(sock_state_to_queue_node(sock_state));
-}
-
-void queue_init(queue_t* queue) {
-  queue_node_init(&queue->head);
-}
-
-void queue_node_init(queue_node_t* node) {
-  node->prev = node;
-  node->next = node;
-}
-
-static inline void queue__detach_node(queue_node_t* node) {
-  node->prev->next = node->next;
-  node->next->prev = node->prev;
-}
-
-queue_node_t* queue_first(const queue_t* queue) {
-  return !queue_empty(queue) ? queue->head.next : NULL;
-}
-
-queue_node_t* queue_last(const queue_t* queue) {
-  return !queue_empty(queue) ? queue->head.prev : NULL;
-}
-
-void queue_prepend(queue_t* queue, queue_node_t* node) {
-  node->next = queue->head.next;
-  node->prev = &queue->head;
-  node->next->prev = node;
-  queue->head.next = node;
-}
-
-void queue_append(queue_t* queue, queue_node_t* node) {
-  node->next = &queue->head;
-  node->prev = queue->head.prev;
-  node->prev->next = node;
-  queue->head.prev = node;
-}
-
-void queue_move_first(queue_t* queue, queue_node_t* node) {
-  queue__detach_node(node);
-  queue_prepend(queue, node);
-}
-
-void queue_move_last(queue_t* queue, queue_node_t* node) {
-  queue__detach_node(node);
-  queue_append(queue, node);
-}
-
-void queue_remove(queue_node_t* node) {
-  queue__detach_node(node);
-  queue_node_init(node);
-}
-
-bool queue_empty(const queue_t* queue) {
-  return !queue_enqueued(&queue->head);
-}
-
-bool queue_enqueued(const queue_node_t* node) {
-  return node->prev != node;
-}
-
-/* clang-format off */
-static const long REFLOCK__REF          = (long) 0x00000001;
-static const long REFLOCK__REF_MASK     = (long) 0x0fffffff;
-static const long REFLOCK__DESTROY      = (long) 0x10000000;
-static const long REFLOCK__DESTROY_MASK = (long) 0xf0000000;
-static const long REFLOCK__POISON       = (long) 0x300DEAD0;
-/* clang-format on */
-
-static HANDLE reflock__keyed_event = NULL;
-
-int reflock_global_init(void) {
-  NTSTATUS status =
-      NtCreateKeyedEvent(&reflock__keyed_event, ~(ACCESS_MASK) 0, NULL, 0);
-  if (status != STATUS_SUCCESS)
-    return_set_error(-1, RtlNtStatusToDosError(status));
-  return 0;
-}
-
-void reflock_init(reflock_t* reflock) {
-  reflock->state = 0;
-}
-
-static void reflock__signal_event(void* address) {
-  NTSTATUS status =
-      NtReleaseKeyedEvent(reflock__keyed_event, address, FALSE, NULL);
-  if (status != STATUS_SUCCESS)
-    abort();
-}
-
-static void reflock__await_event(void* address) {
-  NTSTATUS status =
-      NtWaitForKeyedEvent(reflock__keyed_event, address, FALSE, NULL);
-  if (status != STATUS_SUCCESS)
-    abort();
-}
-
-void reflock_ref(reflock_t* reflock) {
-  long state = InterlockedAdd(&reflock->state, REFLOCK__REF);
-  unused_var(state);
-  assert((state & REFLOCK__DESTROY_MASK) == 0); /* Overflow or destroyed. */
-}
-
-void reflock_unref(reflock_t* reflock) {
-  long state = InterlockedAdd(&reflock->state, -REFLOCK__REF);
-  long ref_count = state & REFLOCK__REF_MASK;
-  long destroy = state & REFLOCK__DESTROY_MASK;
-
-  unused_var(ref_count);
-  unused_var(destroy);
-
-  if (state == REFLOCK__DESTROY)
-    reflock__signal_event(reflock);
-  else
-    assert(destroy == 0 || ref_count > 0);
-}
-
-void reflock_unref_and_destroy(reflock_t* reflock) {
-  long state =
-      InterlockedAdd(&reflock->state, REFLOCK__DESTROY - REFLOCK__REF);
-  long ref_count = state & REFLOCK__REF_MASK;
-
-  assert((state & REFLOCK__DESTROY_MASK) ==
-         REFLOCK__DESTROY); /* Underflow or already destroyed. */
-
-  if (ref_count != 0)
-    reflock__await_event(reflock);
-
-  state = InterlockedExchange(&reflock->state, REFLOCK__POISON);
-  assert(state == REFLOCK__DESTROY);
-}
-
-static const uint32_t SOCK__KNOWN_EPOLL_EVENTS =
-    EPOLLIN | EPOLLPRI | EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLRDNORM |
-    EPOLLRDBAND | EPOLLWRNORM | EPOLLWRBAND | EPOLLMSG | EPOLLRDHUP;
-
-typedef enum sock__poll_status {
-  SOCK__POLL_IDLE = 0,
-  SOCK__POLL_PENDING,
-  SOCK__POLL_CANCELLED
-} sock__poll_status_t;
-
-typedef struct sock_state {
-  OVERLAPPED overlapped;
-  AFD_POLL_INFO poll_info;
-  queue_node_t queue_node;
-  tree_node_t tree_node;
-  poll_group_t* poll_group;
-  SOCKET base_socket;
-  epoll_data_t user_data;
-  uint32_t user_events;
-  uint32_t pending_events;
-  sock__poll_status_t poll_status;
-  bool delete_pending;
-} sock_state_t;
-
-static inline sock_state_t* sock__alloc(void) {
-  sock_state_t* sock_state = malloc(sizeof *sock_state);
-  if (sock_state == NULL)
-    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
-  return sock_state;
-}
-
-static inline void sock__free(sock_state_t* sock_state) {
-  free(sock_state);
-}
-
-static int sock__cancel_poll(sock_state_t* sock_state) {
-  HANDLE afd_helper_handle =
-      poll_group_get_afd_helper_handle(sock_state->poll_group);
-  assert(sock_state->poll_status == SOCK__POLL_PENDING);
-
-  /* CancelIoEx() may fail with ERROR_NOT_FOUND if the overlapped operation has
-   * already completed. This is not a problem and we proceed normally. */
-  if (!HasOverlappedIoCompleted(&sock_state->overlapped) &&
-      !CancelIoEx(afd_helper_handle, &sock_state->overlapped) &&
-      GetLastError() != ERROR_NOT_FOUND)
-    return_map_error(-1);
-
-  sock_state->poll_status = SOCK__POLL_CANCELLED;
-  sock_state->pending_events = 0;
-  return 0;
-}
-
-sock_state_t* sock_new(port_state_t* port_state, SOCKET socket) {
-  SOCKET base_socket;
-  poll_group_t* poll_group;
-  sock_state_t* sock_state;
-
-  if (socket == 0 || socket == INVALID_SOCKET)
-    return_set_error(NULL, ERROR_INVALID_HANDLE);
-
-  base_socket = ws_get_base_socket(socket);
-  if (base_socket == INVALID_SOCKET)
-    return NULL;
-
-  poll_group = poll_group_acquire(port_state);
-  if (poll_group == NULL)
-    return NULL;
-
-  sock_state = sock__alloc();
-  if (sock_state == NULL)
-    goto err1;
-
-  memset(sock_state, 0, sizeof *sock_state);
-
-  sock_state->base_socket = base_socket;
-  sock_state->poll_group = poll_group;
-
-  tree_node_init(&sock_state->tree_node);
-  queue_node_init(&sock_state->queue_node);
-
-  if (port_register_socket_handle(port_state, sock_state, socket) < 0)
-    goto err2;
-
-  return sock_state;
-
-err2:
-  sock__free(sock_state);
-err1:
-  poll_group_release(poll_group);
-
-  return NULL;
-}
-
-static int sock__delete(port_state_t* port_state,
-                        sock_state_t* sock_state,
-                        bool force) {
-  if (!sock_state->delete_pending) {
-    if (sock_state->poll_status == SOCK__POLL_PENDING)
-      sock__cancel_poll(sock_state);
-
-    port_cancel_socket_update(port_state, sock_state);
-    port_unregister_socket_handle(port_state, sock_state);
-
-    sock_state->delete_pending = true;
-  }
-
-  /* If the poll request still needs to complete, the sock_state object can't
-   * be free()d yet. `sock_feed_event()` or `port_close()` will take care
-   * of this later. */
-  if (force || sock_state->poll_status == SOCK__POLL_IDLE) {
-    /* Free the sock_state now. */
-    port_remove_deleted_socket(port_state, sock_state);
-    poll_group_release(sock_state->poll_group);
-    sock__free(sock_state);
-  } else {
-    /* Free the socket later. */
-    port_add_deleted_socket(port_state, sock_state);
-  }
-
-  return 0;
-}
-
-void sock_delete(port_state_t* port_state, sock_state_t* sock_state) {
-  sock__delete(port_state, sock_state, false);
-}
-
-void sock_force_delete(port_state_t* port_state, sock_state_t* sock_state) {
-  sock__delete(port_state, sock_state, true);
-}
-
-int sock_set_event(port_state_t* port_state,
-                   sock_state_t* sock_state,
-                   const struct epoll_event* ev) {
-  /* EPOLLERR and EPOLLHUP are always reported, even when not requested by the
-   * caller. However they are disabled after a event has been reported for a
-   * socket for which the EPOLLONESHOT flag as set. */
-  uint32_t events = ev->events | EPOLLERR | EPOLLHUP;
-
-  sock_state->user_events = events;
-  sock_state->user_data = ev->data;
-
-  if ((events & SOCK__KNOWN_EPOLL_EVENTS & ~sock_state->pending_events) != 0)
-    port_request_socket_update(port_state, sock_state);
-
-  return 0;
-}
-
-static inline DWORD sock__epoll_events_to_afd_events(uint32_t epoll_events) {
-  /* Always monitor for AFD_POLL_LOCAL_CLOSE, which is triggered when the
-   * socket is closed with closesocket() or CloseHandle(). */
-  DWORD afd_events = AFD_POLL_LOCAL_CLOSE;
-
-  if (epoll_events & (EPOLLIN | EPOLLRDNORM))
-    afd_events |= AFD_POLL_RECEIVE | AFD_POLL_ACCEPT;
-  if (epoll_events & (EPOLLPRI | EPOLLRDBAND))
-    afd_events |= AFD_POLL_RECEIVE_EXPEDITED;
-  if (epoll_events & (EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND))
-    afd_events |= AFD_POLL_SEND;
-  if (epoll_events & (EPOLLIN | EPOLLRDNORM | EPOLLRDHUP))
-    afd_events |= AFD_POLL_DISCONNECT;
-  if (epoll_events & EPOLLHUP)
-    afd_events |= AFD_POLL_ABORT;
-  if (epoll_events & EPOLLERR)
-    afd_events |= AFD_POLL_CONNECT_FAIL;
-
-  return afd_events;
-}
-
-static inline uint32_t sock__afd_events_to_epoll_events(DWORD afd_events) {
-  uint32_t epoll_events = 0;
-
-  if (afd_events & (AFD_POLL_RECEIVE | AFD_POLL_ACCEPT))
-    epoll_events |= EPOLLIN | EPOLLRDNORM;
-  if (afd_events & AFD_POLL_RECEIVE_EXPEDITED)
-    epoll_events |= EPOLLPRI | EPOLLRDBAND;
-  if (afd_events & AFD_POLL_SEND)
-    epoll_events |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
-  if (afd_events & AFD_POLL_DISCONNECT)
-    epoll_events |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
-  if (afd_events & AFD_POLL_ABORT)
-    epoll_events |= EPOLLHUP;
-  if (afd_events & AFD_POLL_CONNECT_FAIL)
-    /* Linux reports all these events after connect() has failed. */
-    epoll_events |=
-        EPOLLIN | EPOLLOUT | EPOLLERR | EPOLLRDNORM | EPOLLWRNORM | EPOLLRDHUP;
-
-  return epoll_events;
-}
-
-int sock_update(port_state_t* port_state, sock_state_t* sock_state) {
-  assert(!sock_state->delete_pending);
-
-  if ((sock_state->poll_status == SOCK__POLL_PENDING) &&
-      (sock_state->user_events & SOCK__KNOWN_EPOLL_EVENTS &
-       ~sock_state->pending_events) == 0) {
-    /* All the events the user is interested in are already being monitored by
-     * the pending poll operation. It might spuriously complete because of an
-     * event that we're no longer interested in; when that happens we'll submit
-     * a new poll operation with the updated event mask. */
-
-  } else if (sock_state->poll_status == SOCK__POLL_PENDING) {
-    /* A poll operation is already pending, but it's not monitoring for all the
-     * events that the user is interested in. Therefore, cancel the pending
-     * poll operation; when we receive it's completion package, a new poll
-     * operation will be submitted with the correct event mask. */
-    if (sock__cancel_poll(sock_state) < 0)
-      return -1;
-
-  } else if (sock_state->poll_status == SOCK__POLL_CANCELLED) {
-    /* The poll operation has already been cancelled, we're still waiting for
-     * it to return. For now, there's nothing that needs to be done. */
-
-  } else if (sock_state->poll_status == SOCK__POLL_IDLE) {
-    /* No poll operation is pending; start one. */
-    sock_state->poll_info.Exclusive = FALSE;
-    sock_state->poll_info.NumberOfHandles = 1;
-    sock_state->poll_info.Timeout.QuadPart = INT64_MAX;
-    sock_state->poll_info.Handles[0].Handle = (HANDLE) sock_state->base_socket;
-    sock_state->poll_info.Handles[0].Status = 0;
-    sock_state->poll_info.Handles[0].Events =
-        sock__epoll_events_to_afd_events(sock_state->user_events);
-
-    memset(&sock_state->overlapped, 0, sizeof sock_state->overlapped);
-
-    if (afd_poll(poll_group_get_afd_helper_handle(sock_state->poll_group),
-                 &sock_state->poll_info,
-                 &sock_state->overlapped) < 0) {
-      switch (GetLastError()) {
-        case ERROR_IO_PENDING:
-          /* Overlapped poll operation in progress; this is expected. */
-          break;
-        case ERROR_INVALID_HANDLE:
-          /* Socket closed; it'll be dropped from the epoll set. */
-          return sock__delete(port_state, sock_state, false);
-        default:
-          /* Other errors are propagated to the caller. */
-          return_map_error(-1);
-      }
-    }
-
-    /* The poll request was successfully submitted. */
-    sock_state->poll_status = SOCK__POLL_PENDING;
-    sock_state->pending_events = sock_state->user_events;
-
-  } else {
-    /* Unreachable. */
-    assert(false);
-  }
-
-  port_cancel_socket_update(port_state, sock_state);
-  return 0;
-}
-
-int sock_feed_event(port_state_t* port_state,
-                    OVERLAPPED* overlapped,
-                    struct epoll_event* ev) {
-  sock_state_t* sock_state =
-      container_of(overlapped, sock_state_t, overlapped);
-  AFD_POLL_INFO* poll_info = &sock_state->poll_info;
-  uint32_t epoll_events = 0;
-
-  sock_state->poll_status = SOCK__POLL_IDLE;
-  sock_state->pending_events = 0;
-
-  if (sock_state->delete_pending) {
-    /* Socket has been deleted earlier and can now be freed. */
-    return sock__delete(port_state, sock_state, false);
-
-  } else if ((NTSTATUS) overlapped->Internal == STATUS_CANCELLED) {
-    /* The poll request was cancelled by CancelIoEx. */
-
-  } else if (!NT_SUCCESS(overlapped->Internal)) {
-    /* The overlapped request itself failed in an unexpected way. */
-    epoll_events = EPOLLERR;
-
-  } else if (poll_info->NumberOfHandles < 1) {
-    /* This poll operation succeeded but didn't report any socket events. */
-
-  } else if (poll_info->Handles[0].Events & AFD_POLL_LOCAL_CLOSE) {
-    /* The poll operation reported that the socket was closed. */
-    return sock__delete(port_state, sock_state, false);
-
-  } else {
-    /* Events related to our socket were reported. */
-    epoll_events =
-        sock__afd_events_to_epoll_events(poll_info->Handles[0].Events);
-  }
-
-  /* Requeue the socket so a new poll request will be submitted. */
-  port_request_socket_update(port_state, sock_state);
-
-  /* Filter out events that the user didn't ask for. */
-  epoll_events &= sock_state->user_events;
-
-  /* Return if there are no epoll events to report. */
-  if (epoll_events == 0)
-    return 0;
-
-  /* If the the socket has the EPOLLONESHOT flag set, unmonitor all events,
-   * even EPOLLERR and EPOLLHUP. But always keep looking for closed sockets. */
-  if (sock_state->user_events & EPOLLONESHOT)
-    sock_state->user_events = 0;
-
-  ev->data = sock_state->user_data;
-  ev->events = epoll_events;
-  return 1;
-}
-
-queue_node_t* sock_state_to_queue_node(sock_state_t* sock_state) {
-  return &sock_state->queue_node;
-}
-
-sock_state_t* sock_state_from_tree_node(tree_node_t* tree_node) {
-  return container_of(tree_node, sock_state_t, tree_node);
-}
-
-tree_node_t* sock_state_to_tree_node(sock_state_t* sock_state) {
-  return &sock_state->tree_node;
-}
-
-sock_state_t* sock_state_from_queue_node(queue_node_t* queue_node) {
-  return container_of(queue_node, sock_state_t, queue_node);
-}
-
-void ts_tree_init(ts_tree_t* ts_tree) {
-  tree_init(&ts_tree->tree);
-  InitializeSRWLock(&ts_tree->lock);
-}
-
-void ts_tree_node_init(ts_tree_node_t* node) {
-  tree_node_init(&node->tree_node);
-  reflock_init(&node->reflock);
-}
-
-int ts_tree_add(ts_tree_t* ts_tree, ts_tree_node_t* node, uintptr_t key) {
-  int r;
-
-  AcquireSRWLockExclusive(&ts_tree->lock);
-  r = tree_add(&ts_tree->tree, &node->tree_node, key);
-  ReleaseSRWLockExclusive(&ts_tree->lock);
-
-  return r;
-}
-
-static inline ts_tree_node_t* ts_tree__find_node(ts_tree_t* ts_tree,
-                                                 uintptr_t key) {
-  tree_node_t* tree_node = tree_find(&ts_tree->tree, key);
-  if (tree_node == NULL)
-    return NULL;
-
-  return container_of(tree_node, ts_tree_node_t, tree_node);
-}
-
-ts_tree_node_t* ts_tree_del_and_ref(ts_tree_t* ts_tree, uintptr_t key) {
-  ts_tree_node_t* ts_tree_node;
-
-  AcquireSRWLockExclusive(&ts_tree->lock);
-
-  ts_tree_node = ts_tree__find_node(ts_tree, key);
-  if (ts_tree_node != NULL) {
-    tree_del(&ts_tree->tree, &ts_tree_node->tree_node);
-    reflock_ref(&ts_tree_node->reflock);
-  }
-
-  ReleaseSRWLockExclusive(&ts_tree->lock);
-
-  return ts_tree_node;
-}
-
-ts_tree_node_t* ts_tree_find_and_ref(ts_tree_t* ts_tree, uintptr_t key) {
-  ts_tree_node_t* ts_tree_node;
-
-  AcquireSRWLockShared(&ts_tree->lock);
-
-  ts_tree_node = ts_tree__find_node(ts_tree, key);
-  if (ts_tree_node != NULL)
-    reflock_ref(&ts_tree_node->reflock);
-
-  ReleaseSRWLockShared(&ts_tree->lock);
-
-  return ts_tree_node;
-}
-
-void ts_tree_node_unref(ts_tree_node_t* node) {
-  reflock_unref(&node->reflock);
-}
-
-void ts_tree_node_unref_and_destroy(ts_tree_node_t* node) {
-  reflock_unref_and_destroy(&node->reflock);
-}
-
-void tree_init(tree_t* tree) {
-  memset(tree, 0, sizeof *tree);
-}
-
-void tree_node_init(tree_node_t* node) {
-  memset(node, 0, sizeof *node);
-}
-
-#define TREE__ROTATE(cis, trans)   \
-  tree_node_t* p = node;           \
-  tree_node_t* q = node->trans;    \
-  tree_node_t* parent = p->parent; \
-                                   \
-  if (parent) {                    \
-    if (parent->left == p)         \
-      parent->left = q;            \
-    else                           \
-      parent->right = q;           \
-  } else {                         \
-    tree->root = q;                \
-  }                                \
-                                   \
-  q->parent = parent;              \
-  p->parent = q;                   \
-  p->trans = q->cis;               \
-  if (p->trans)                    \
-    p->trans->parent = p;          \
-  q->cis = p;
-
-static inline void tree__rotate_left(tree_t* tree, tree_node_t* node) {
-  TREE__ROTATE(left, right)
-}
-
-static inline void tree__rotate_right(tree_t* tree, tree_node_t* node) {
-  TREE__ROTATE(right, left)
-}
-
-#define TREE__INSERT_OR_DESCEND(side) \
-  if (parent->side) {                 \
-    parent = parent->side;            \
-  } else {                            \
-    parent->side = node;              \
-    break;                            \
-  }
-
-#define TREE__FIXUP_AFTER_INSERT(cis, trans) \
-  tree_node_t* grandparent = parent->parent; \
-  tree_node_t* uncle = grandparent->trans;   \
-                                             \
-  if (uncle && uncle->red) {                 \
-    parent->red = uncle->red = false;        \
-    grandparent->red = true;                 \
-    node = grandparent;                      \
-  } else {                                   \
-    if (node == parent->trans) {             \
-      tree__rotate_##cis(tree, parent);      \
-      node = parent;                         \
-      parent = node->parent;                 \
-    }                                        \
-    parent->red = false;                     \
-    grandparent->red = true;                 \
-    tree__rotate_##trans(tree, grandparent); \
-  }
-
-int tree_add(tree_t* tree, tree_node_t* node, uintptr_t key) {
-  tree_node_t* parent;
-
-  parent = tree->root;
-  if (parent) {
-    for (;;) {
-      if (key < parent->key) {
-        TREE__INSERT_OR_DESCEND(left)
-      } else if (key > parent->key) {
-        TREE__INSERT_OR_DESCEND(right)
-      } else {
-        return -1;
-      }
-    }
-  } else {
-    tree->root = node;
-  }
-
-  node->key = key;
-  node->left = node->right = NULL;
-  node->parent = parent;
-  node->red = true;
-
-  for (; parent && parent->red; parent = node->parent) {
-    if (parent == parent->parent->left) {
-      TREE__FIXUP_AFTER_INSERT(left, right)
-    } else {
-      TREE__FIXUP_AFTER_INSERT(right, left)
-    }
-  }
-  tree->root->red = false;
-
-  return 0;
-}
-
-#define TREE__FIXUP_AFTER_REMOVE(cis, trans)       \
-  tree_node_t* sibling = parent->trans;            \
-                                                   \
-  if (sibling->red) {                              \
-    sibling->red = false;                          \
-    parent->red = true;                            \
-    tree__rotate_##cis(tree, parent);              \
-    sibling = parent->trans;                       \
-  }                                                \
-  if ((sibling->left && sibling->left->red) ||     \
-      (sibling->right && sibling->right->red)) {   \
-    if (!sibling->trans || !sibling->trans->red) { \
-      sibling->cis->red = false;                   \
-      sibling->red = true;                         \
-      tree__rotate_##trans(tree, sibling);         \
-      sibling = parent->trans;                     \
-    }                                              \
-    sibling->red = parent->red;                    \
-    parent->red = sibling->trans->red = false;     \
-    tree__rotate_##cis(tree, parent);              \
-    node = tree->root;                             \
-    break;                                         \
-  }                                                \
-  sibling->red = true;
-
-void tree_del(tree_t* tree, tree_node_t* node) {
-  tree_node_t* parent = node->parent;
-  tree_node_t* left = node->left;
-  tree_node_t* right = node->right;
-  tree_node_t* next;
-  bool red;
-
-  if (!left) {
-    next = right;
-  } else if (!right) {
-    next = left;
-  } else {
-    next = right;
-    while (next->left)
-      next = next->left;
-  }
-
-  if (parent) {
-    if (parent->left == node)
-      parent->left = next;
-    else
-      parent->right = next;
-  } else {
-    tree->root = next;
-  }
-
-  if (left && right) {
-    red = next->red;
-    next->red = node->red;
-    next->left = left;
-    left->parent = next;
-    if (next != right) {
-      parent = next->parent;
-      next->parent = node->parent;
-      node = next->right;
-      parent->left = node;
-      next->right = right;
-      right->parent = next;
-    } else {
-      next->parent = parent;
-      parent = next;
-      node = next->right;
-    }
-  } else {
-    red = node->red;
-    node = next;
-  }
-
-  if (node)
-    node->parent = parent;
-  if (red)
-    return;
-  if (node && node->red) {
-    node->red = false;
-    return;
-  }
-
-  do {
-    if (node == tree->root)
-      break;
-    if (node == parent->left) {
-      TREE__FIXUP_AFTER_REMOVE(left, right)
-    } else {
-      TREE__FIXUP_AFTER_REMOVE(right, left)
-    }
-    node = parent;
-    parent = parent->parent;
-  } while (!node->red);
-
-  if (node)
-    node->red = false;
-}
-
-tree_node_t* tree_find(const tree_t* tree, uintptr_t key) {
-  tree_node_t* node = tree->root;
-  while (node) {
-    if (key < node->key)
-      node = node->left;
-    else if (key > node->key)
-      node = node->right;
-    else
-      return node;
-  }
-  return NULL;
-}
-
-tree_node_t* tree_root(const tree_t* tree) {
-  return tree->root;
-}
-
-#ifndef SIO_BASE_HANDLE
-#define SIO_BASE_HANDLE 0x48000022
-#endif
-
-int ws_global_init(void) {
-  int r;
-  WSADATA wsa_data;
-
-  r = WSAStartup(MAKEWORD(2, 2), &wsa_data);
-  if (r != 0)
-    return_set_error(-1, (DWORD) r);
-
-  return 0;
-}
-
-SOCKET ws_get_base_socket(SOCKET socket) {
-  SOCKET base_socket;
-  DWORD bytes;
-
-  if (WSAIoctl(socket,
-               SIO_BASE_HANDLE,
-               NULL,
-               0,
-               &base_socket,
-               sizeof base_socket,
-               &bytes,
-               NULL,
-               NULL) == SOCKET_ERROR)
-    return_map_error(INVALID_SOCKET);
-
-  return base_socket;
-}
diff --git a/external/wepoll/wepoll.h b/external/wepoll/wepoll.h
deleted file mode 100644
index 7b5229846..000000000
--- a/external/wepoll/wepoll.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * wepoll - epoll for Windows
- * https://github.com/piscisaureus/wepoll
- *
- * Copyright 2012-2018, Bert Belder <bertbelder@gmail.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS 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 COPYRIGHT
- * OWNER OR 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.
- */
-
-#ifndef WEPOLL_H_
-#define WEPOLL_H_
-
-#ifndef WEPOLL_EXPORT
-#define WEPOLL_EXPORT
-#endif
-
-#include <stdint.h>
-
-/* clang-format off */
-
-enum EPOLL_EVENTS {
-  EPOLLIN      = (int) (1U <<  0),
-  EPOLLPRI     = (int) (1U <<  1),
-  EPOLLOUT     = (int) (1U <<  2),
-  EPOLLERR     = (int) (1U <<  3),
-  EPOLLHUP     = (int) (1U <<  4),
-  EPOLLRDNORM  = (int) (1U <<  6),
-  EPOLLRDBAND  = (int) (1U <<  7),
-  EPOLLWRNORM  = (int) (1U <<  8),
-  EPOLLWRBAND  = (int) (1U <<  9),
-  EPOLLMSG     = (int) (1U << 10), /* Never reported. */
-  EPOLLRDHUP   = (int) (1U << 13),
-  EPOLLONESHOT = (int) (1U << 31)
-};
-
-#define EPOLLIN      (1U <<  0)
-#define EPOLLPRI     (1U <<  1)
-#define EPOLLOUT     (1U <<  2)
-#define EPOLLERR     (1U <<  3)
-#define EPOLLHUP     (1U <<  4)
-#define EPOLLRDNORM  (1U <<  6)
-#define EPOLLRDBAND  (1U <<  7)
-#define EPOLLWRNORM  (1U <<  8)
-#define EPOLLWRBAND  (1U <<  9)
-#define EPOLLMSG     (1U << 10)
-#define EPOLLRDHUP   (1U << 13)
-#define EPOLLONESHOT (1U << 31)
-
-#define EPOLL_CTL_ADD 1
-#define EPOLL_CTL_MOD 2
-#define EPOLL_CTL_DEL 3
-
-/* clang-format on */
-
-typedef void* HANDLE;
-typedef uintptr_t SOCKET;
-
-typedef union epoll_data {
-  void* ptr;
-  int fd;
-  uint32_t u32;
-  uint64_t u64;
-  SOCKET sock; /* Windows specific */
-  HANDLE hnd;  /* Windows specific */
-} epoll_data_t;
-
-struct epoll_event {
-  uint32_t events;   /* Epoll events and flags */
-  epoll_data_t data; /* User data variable */
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WEPOLL_EXPORT HANDLE epoll_create(int size);
-WEPOLL_EXPORT HANDLE epoll_create1(int flags);
-
-WEPOLL_EXPORT int epoll_close(HANDLE ephnd);
-
-WEPOLL_EXPORT int epoll_ctl(HANDLE ephnd,
-                            int op,
-                            SOCKET sock,
-                            struct epoll_event* event);
-
-WEPOLL_EXPORT int epoll_wait(HANDLE ephnd,
-                             struct epoll_event* events,
-                             int maxevents,
-                             int timeout);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* WEPOLL_H_ */
diff --git a/include/zmq.h b/include/zmq.h
deleted file mode 100644
index df403c8f4..000000000
--- a/include/zmq.h
+++ /dev/null
@@ -1,784 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    *************************************************************************
-    NOTE to contributors. This file comprises the principal public contract
-    for ZeroMQ API users. Any change to this file supplied in a stable
-    release SHOULD not break existing applications.
-    In practice this means that the value of constants must not change, and
-    that old values may not be reused for new constants.
-    *************************************************************************
-*/
-
-#ifndef __ZMQ_H_INCLUDED__
-#define __ZMQ_H_INCLUDED__
-
-/*  Version macros for compile-time API version detection                     */
-#define ZMQ_VERSION_MAJOR 4
-#define ZMQ_VERSION_MINOR 3
-#define ZMQ_VERSION_PATCH 3
-
-#define ZMQ_MAKE_VERSION(major, minor, patch)                                  \
-    ((major) *10000 + (minor) *100 + (patch))
-#define ZMQ_VERSION                                                            \
-    ZMQ_MAKE_VERSION (ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR, ZMQ_VERSION_PATCH)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined _WIN32_WCE
-#include <errno.h>
-#endif
-#include <stddef.h>
-#include <stdio.h>
-#if defined _WIN32
-//  Set target version to Windows Server 2008, Windows Vista or higher.
-//  Windows XP (0x0501) is supported but without client & server socket types.
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
-#endif
-
-#ifdef __MINGW32__
-//  Require Windows XP or higher with MinGW for getaddrinfo().
-#if (_WIN32_WINNT >= 0x0501)
-#else
-#error You need at least Windows XP target
-#endif
-#endif
-#endif
-
-/*  Handle DSO symbol visibility                                             */
-#if defined _WIN32
-#if defined ZMQ_STATIC
-#define ZMQ_EXPORT
-#elif defined DLL_EXPORT
-#define ZMQ_EXPORT __declspec(dllexport)
-#else
-#define ZMQ_EXPORT __declspec(dllimport)
-#endif
-#else
-#if defined __SUNPRO_C || defined __SUNPRO_CC
-#define ZMQ_EXPORT __global
-#elif (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
-#define ZMQ_EXPORT __attribute__ ((visibility ("default")))
-#else
-#define ZMQ_EXPORT
-#endif
-#endif
-
-/*  Define integer types needed for event interface                          */
-#define ZMQ_DEFINED_STDINT 1
-#if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
-#include <inttypes.h>
-#elif defined _MSC_VER && _MSC_VER < 1600
-#ifndef uint64_t
-typedef unsigned __int64 uint64_t;
-#endif
-#ifndef int32_t
-typedef __int32 int32_t;
-#endif
-#ifndef uint32_t
-typedef unsigned __int32 uint32_t;
-#endif
-#ifndef uint16_t
-typedef unsigned __int16 uint16_t;
-#endif
-#ifndef uint8_t
-typedef unsigned __int8 uint8_t;
-#endif
-#else
-#include <stdint.h>
-#endif
-
-//  32-bit AIX's pollfd struct members are called reqevents and rtnevents so it
-//  defines compatibility macros for them. Need to include that header first to
-//  stop build failures since zmq_pollset_t defines them as events and revents.
-#ifdef ZMQ_HAVE_AIX
-#include <poll.h>
-#endif
-
-
-/******************************************************************************/
-/*  0MQ errors.                                                               */
-/******************************************************************************/
-
-/*  A number random enough not to collide with different errno ranges on      */
-/*  different OSes. The assumption is that error_t is at least 32-bit type.   */
-#define ZMQ_HAUSNUMERO 156384712
-
-/*  On Windows platform some of the standard POSIX errnos are not defined.    */
-#ifndef ENOTSUP
-#define ENOTSUP (ZMQ_HAUSNUMERO + 1)
-#endif
-#ifndef EPROTONOSUPPORT
-#define EPROTONOSUPPORT (ZMQ_HAUSNUMERO + 2)
-#endif
-#ifndef ENOBUFS
-#define ENOBUFS (ZMQ_HAUSNUMERO + 3)
-#endif
-#ifndef ENETDOWN
-#define ENETDOWN (ZMQ_HAUSNUMERO + 4)
-#endif
-#ifndef EADDRINUSE
-#define EADDRINUSE (ZMQ_HAUSNUMERO + 5)
-#endif
-#ifndef EADDRNOTAVAIL
-#define EADDRNOTAVAIL (ZMQ_HAUSNUMERO + 6)
-#endif
-#ifndef ECONNREFUSED
-#define ECONNREFUSED (ZMQ_HAUSNUMERO + 7)
-#endif
-#ifndef EINPROGRESS
-#define EINPROGRESS (ZMQ_HAUSNUMERO + 8)
-#endif
-#ifndef ENOTSOCK
-#define ENOTSOCK (ZMQ_HAUSNUMERO + 9)
-#endif
-#ifndef EMSGSIZE
-#define EMSGSIZE (ZMQ_HAUSNUMERO + 10)
-#endif
-#ifndef EAFNOSUPPORT
-#define EAFNOSUPPORT (ZMQ_HAUSNUMERO + 11)
-#endif
-#ifndef ENETUNREACH
-#define ENETUNREACH (ZMQ_HAUSNUMERO + 12)
-#endif
-#ifndef ECONNABORTED
-#define ECONNABORTED (ZMQ_HAUSNUMERO + 13)
-#endif
-#ifndef ECONNRESET
-#define ECONNRESET (ZMQ_HAUSNUMERO + 14)
-#endif
-#ifndef ENOTCONN
-#define ENOTCONN (ZMQ_HAUSNUMERO + 15)
-#endif
-#ifndef ETIMEDOUT
-#define ETIMEDOUT (ZMQ_HAUSNUMERO + 16)
-#endif
-#ifndef EHOSTUNREACH
-#define EHOSTUNREACH (ZMQ_HAUSNUMERO + 17)
-#endif
-#ifndef ENETRESET
-#define ENETRESET (ZMQ_HAUSNUMERO + 18)
-#endif
-
-/*  Native 0MQ error codes.                                                   */
-#define EFSM (ZMQ_HAUSNUMERO + 51)
-#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52)
-#define ETERM (ZMQ_HAUSNUMERO + 53)
-#define EMTHREAD (ZMQ_HAUSNUMERO + 54)
-
-/*  This function retrieves the errno as it is known to 0MQ library. The goal */
-/*  of this function is to make the code 100% portable, including where 0MQ   */
-/*  compiled with certain CRT library (on Windows) is linked to an            */
-/*  application that uses different CRT library.                              */
-ZMQ_EXPORT int zmq_errno (void);
-
-/*  Resolves system errors and 0MQ errors to human-readable string.           */
-ZMQ_EXPORT const char *zmq_strerror (int errnum_);
-
-/*  Run-time API version detection                                            */
-ZMQ_EXPORT void zmq_version (int *major_, int *minor_, int *patch_);
-
-/******************************************************************************/
-/*  0MQ infrastructure (a.k.a. context) initialisation & termination.         */
-/******************************************************************************/
-
-/*  Context options                                                           */
-#define ZMQ_IO_THREADS 1
-#define ZMQ_MAX_SOCKETS 2
-#define ZMQ_SOCKET_LIMIT 3
-#define ZMQ_THREAD_PRIORITY 3
-#define ZMQ_THREAD_SCHED_POLICY 4
-#define ZMQ_MAX_MSGSZ 5
-#define ZMQ_MSG_T_SIZE 6
-#define ZMQ_THREAD_AFFINITY_CPU_ADD 7
-#define ZMQ_THREAD_AFFINITY_CPU_REMOVE 8
-#define ZMQ_THREAD_NAME_PREFIX 9
-
-/*  Default for new contexts                                                  */
-#define ZMQ_IO_THREADS_DFLT 1
-#define ZMQ_MAX_SOCKETS_DFLT 1023
-#define ZMQ_THREAD_PRIORITY_DFLT -1
-#define ZMQ_THREAD_SCHED_POLICY_DFLT -1
-
-ZMQ_EXPORT void *zmq_ctx_new (void);
-ZMQ_EXPORT int zmq_ctx_term (void *context_);
-ZMQ_EXPORT int zmq_ctx_shutdown (void *context_);
-ZMQ_EXPORT int zmq_ctx_set (void *context_, int option_, int optval_);
-ZMQ_EXPORT int zmq_ctx_get (void *context_, int option_);
-
-/*  Old (legacy) API                                                          */
-ZMQ_EXPORT void *zmq_init (int io_threads_);
-ZMQ_EXPORT int zmq_term (void *context_);
-ZMQ_EXPORT int zmq_ctx_destroy (void *context_);
-
-
-/******************************************************************************/
-/*  0MQ message definition.                                                   */
-/******************************************************************************/
-
-/* Some architectures, like sparc64 and some variants of aarch64, enforce pointer
- * alignment and raise sigbus on violations. Make sure applications allocate
- * zmq_msg_t on addresses aligned on a pointer-size boundary to avoid this issue.
- */
-typedef struct zmq_msg_t
-{
-#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
-    __declspec(align (8)) unsigned char _[64];
-#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_ARM_ARMV7VE))
-    __declspec(align (4)) unsigned char _[64];
-#elif defined(__GNUC__) || defined(__INTEL_COMPILER)                           \
-  || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590)                              \
-  || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
-    unsigned char _[64] __attribute__ ((aligned (sizeof (void *))));
-#else
-    unsigned char _[64];
-#endif
-} zmq_msg_t;
-
-typedef void(zmq_free_fn) (void *data_, void *hint_);
-
-ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg_);
-ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_);
-ZMQ_EXPORT int zmq_msg_init_data (
-  zmq_msg_t *msg_, void *data_, size_t size_, zmq_free_fn *ffn_, void *hint_);
-ZMQ_EXPORT int zmq_msg_send (zmq_msg_t *msg_, void *s_, int flags_);
-ZMQ_EXPORT int zmq_msg_recv (zmq_msg_t *msg_, void *s_, int flags_);
-ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg_);
-ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest_, zmq_msg_t *src_);
-ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest_, zmq_msg_t *src_);
-ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg_);
-ZMQ_EXPORT size_t zmq_msg_size (const zmq_msg_t *msg_);
-ZMQ_EXPORT int zmq_msg_more (const zmq_msg_t *msg_);
-ZMQ_EXPORT int zmq_msg_get (const zmq_msg_t *msg_, int property_);
-ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg_, int property_, int optval_);
-ZMQ_EXPORT const char *zmq_msg_gets (const zmq_msg_t *msg_,
-                                     const char *property_);
-
-/******************************************************************************/
-/*  0MQ socket definition.                                                    */
-/******************************************************************************/
-
-/*  Socket types.                                                             */
-#define ZMQ_PAIR 0
-#define ZMQ_PUB 1
-#define ZMQ_SUB 2
-#define ZMQ_REQ 3
-#define ZMQ_REP 4
-#define ZMQ_DEALER 5
-#define ZMQ_ROUTER 6
-#define ZMQ_PULL 7
-#define ZMQ_PUSH 8
-#define ZMQ_XPUB 9
-#define ZMQ_XSUB 10
-#define ZMQ_STREAM 11
-
-/*  Deprecated aliases                                                        */
-#define ZMQ_XREQ ZMQ_DEALER
-#define ZMQ_XREP ZMQ_ROUTER
-
-/*  Socket options.                                                           */
-#define ZMQ_AFFINITY 4
-#define ZMQ_ROUTING_ID 5
-#define ZMQ_SUBSCRIBE 6
-#define ZMQ_UNSUBSCRIBE 7
-#define ZMQ_RATE 8
-#define ZMQ_RECOVERY_IVL 9
-#define ZMQ_SNDBUF 11
-#define ZMQ_RCVBUF 12
-#define ZMQ_RCVMORE 13
-#define ZMQ_FD 14
-#define ZMQ_EVENTS 15
-#define ZMQ_TYPE 16
-#define ZMQ_LINGER 17
-#define ZMQ_RECONNECT_IVL 18
-#define ZMQ_BACKLOG 19
-#define ZMQ_RECONNECT_IVL_MAX 21
-#define ZMQ_MAXMSGSIZE 22
-#define ZMQ_SNDHWM 23
-#define ZMQ_RCVHWM 24
-#define ZMQ_MULTICAST_HOPS 25
-#define ZMQ_RCVTIMEO 27
-#define ZMQ_SNDTIMEO 28
-#define ZMQ_LAST_ENDPOINT 32
-#define ZMQ_ROUTER_MANDATORY 33
-#define ZMQ_TCP_KEEPALIVE 34
-#define ZMQ_TCP_KEEPALIVE_CNT 35
-#define ZMQ_TCP_KEEPALIVE_IDLE 36
-#define ZMQ_TCP_KEEPALIVE_INTVL 37
-#define ZMQ_IMMEDIATE 39
-#define ZMQ_XPUB_VERBOSE 40
-#define ZMQ_ROUTER_RAW 41
-#define ZMQ_IPV6 42
-#define ZMQ_MECHANISM 43
-#define ZMQ_PLAIN_SERVER 44
-#define ZMQ_PLAIN_USERNAME 45
-#define ZMQ_PLAIN_PASSWORD 46
-#define ZMQ_CURVE_SERVER 47
-#define ZMQ_CURVE_PUBLICKEY 48
-#define ZMQ_CURVE_SECRETKEY 49
-#define ZMQ_CURVE_SERVERKEY 50
-#define ZMQ_PROBE_ROUTER 51
-#define ZMQ_REQ_CORRELATE 52
-#define ZMQ_REQ_RELAXED 53
-#define ZMQ_CONFLATE 54
-#define ZMQ_ZAP_DOMAIN 55
-#define ZMQ_ROUTER_HANDOVER 56
-#define ZMQ_TOS 57
-#define ZMQ_CONNECT_ROUTING_ID 61
-#define ZMQ_GSSAPI_SERVER 62
-#define ZMQ_GSSAPI_PRINCIPAL 63
-#define ZMQ_GSSAPI_SERVICE_PRINCIPAL 64
-#define ZMQ_GSSAPI_PLAINTEXT 65
-#define ZMQ_HANDSHAKE_IVL 66
-#define ZMQ_SOCKS_PROXY 68
-#define ZMQ_XPUB_NODROP 69
-#define ZMQ_BLOCKY 70
-#define ZMQ_XPUB_MANUAL 71
-#define ZMQ_XPUB_WELCOME_MSG 72
-#define ZMQ_STREAM_NOTIFY 73
-#define ZMQ_INVERT_MATCHING 74
-#define ZMQ_HEARTBEAT_IVL 75
-#define ZMQ_HEARTBEAT_TTL 76
-#define ZMQ_HEARTBEAT_TIMEOUT 77
-#define ZMQ_XPUB_VERBOSER 78
-#define ZMQ_CONNECT_TIMEOUT 79
-#define ZMQ_TCP_MAXRT 80
-#define ZMQ_THREAD_SAFE 81
-#define ZMQ_MULTICAST_MAXTPDU 84
-#define ZMQ_VMCI_BUFFER_SIZE 85
-#define ZMQ_VMCI_BUFFER_MIN_SIZE 86
-#define ZMQ_VMCI_BUFFER_MAX_SIZE 87
-#define ZMQ_VMCI_CONNECT_TIMEOUT 88
-#define ZMQ_USE_FD 89
-#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
-#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
-#define ZMQ_BINDTODEVICE 92
-
-/*  Message options                                                           */
-#define ZMQ_MORE 1
-#define ZMQ_SHARED 3
-
-/*  Send/recv options.                                                        */
-#define ZMQ_DONTWAIT 1
-#define ZMQ_SNDMORE 2
-
-/*  Security mechanisms                                                       */
-#define ZMQ_NULL 0
-#define ZMQ_PLAIN 1
-#define ZMQ_CURVE 2
-#define ZMQ_GSSAPI 3
-
-/*  RADIO-DISH protocol                                                       */
-#define ZMQ_GROUP_MAX_LENGTH 255
-
-/*  Deprecated options and aliases                                            */
-#define ZMQ_IDENTITY ZMQ_ROUTING_ID
-#define ZMQ_CONNECT_RID ZMQ_CONNECT_ROUTING_ID
-#define ZMQ_TCP_ACCEPT_FILTER 38
-#define ZMQ_IPC_FILTER_PID 58
-#define ZMQ_IPC_FILTER_UID 59
-#define ZMQ_IPC_FILTER_GID 60
-#define ZMQ_IPV4ONLY 31
-#define ZMQ_DELAY_ATTACH_ON_CONNECT ZMQ_IMMEDIATE
-#define ZMQ_NOBLOCK ZMQ_DONTWAIT
-#define ZMQ_FAIL_UNROUTABLE ZMQ_ROUTER_MANDATORY
-#define ZMQ_ROUTER_BEHAVIOR ZMQ_ROUTER_MANDATORY
-
-/*  Deprecated Message options                                                */
-#define ZMQ_SRCFD 2
-
-/******************************************************************************/
-/*  GSSAPI definitions                                                        */
-/******************************************************************************/
-
-/*  GSSAPI principal name types                                               */
-#define ZMQ_GSSAPI_NT_HOSTBASED 0
-#define ZMQ_GSSAPI_NT_USER_NAME 1
-#define ZMQ_GSSAPI_NT_KRB5_PRINCIPAL 2
-
-/******************************************************************************/
-/*  0MQ socket events and monitoring                                          */
-/******************************************************************************/
-
-/*  Socket transport events (TCP, IPC and TIPC only)                          */
-
-#define ZMQ_EVENT_CONNECTED 0x0001
-#define ZMQ_EVENT_CONNECT_DELAYED 0x0002
-#define ZMQ_EVENT_CONNECT_RETRIED 0x0004
-#define ZMQ_EVENT_LISTENING 0x0008
-#define ZMQ_EVENT_BIND_FAILED 0x0010
-#define ZMQ_EVENT_ACCEPTED 0x0020
-#define ZMQ_EVENT_ACCEPT_FAILED 0x0040
-#define ZMQ_EVENT_CLOSED 0x0080
-#define ZMQ_EVENT_CLOSE_FAILED 0x0100
-#define ZMQ_EVENT_DISCONNECTED 0x0200
-#define ZMQ_EVENT_MONITOR_STOPPED 0x0400
-#define ZMQ_EVENT_ALL 0xFFFF
-/*  Unspecified system errors during handshake. Event value is an errno.      */
-#define ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL 0x0800
-/*  Handshake complete successfully with successful authentication (if        *
- *  enabled). Event value is unused.                                          */
-#define ZMQ_EVENT_HANDSHAKE_SUCCEEDED 0x1000
-/*  Protocol errors between ZMTP peers or between server and ZAP handler.     *
- *  Event value is one of ZMQ_PROTOCOL_ERROR_*                                */
-#define ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL 0x2000
-/*  Failed authentication requests. Event value is the numeric ZAP status     *
- *  code, i.e. 300, 400 or 500.                                               */
-#define ZMQ_EVENT_HANDSHAKE_FAILED_AUTH 0x4000
-#define ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED 0x10000000
-#define ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND 0x10000001
-#define ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE 0x10000002
-#define ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE 0x10000003
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED 0x10000011
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE 0x10000012
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO 0x10000013
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE 0x10000014
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR 0x10000015
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY 0x10000016
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME 0x10000017
-#define ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA 0x10000018
-// the following two may be due to erroneous configuration of a peer
-#define ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC 0x11000001
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH 0x11000002
-#define ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED 0x20000000
-#define ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY 0x20000001
-#define ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID 0x20000002
-#define ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION 0x20000003
-#define ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE 0x20000004
-#define ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA 0x20000005
-#define ZMQ_PROTOCOL_ERROR_WS_UNSPECIFIED 0x30000000
-
-ZMQ_EXPORT void *zmq_socket (void *, int type_);
-ZMQ_EXPORT int zmq_close (void *s_);
-ZMQ_EXPORT int
-zmq_setsockopt (void *s_, int option_, const void *optval_, size_t optvallen_);
-ZMQ_EXPORT int
-zmq_getsockopt (void *s_, int option_, void *optval_, size_t *optvallen_);
-ZMQ_EXPORT int zmq_bind (void *s_, const char *addr_);
-ZMQ_EXPORT int zmq_connect (void *s_, const char *addr_);
-ZMQ_EXPORT int zmq_unbind (void *s_, const char *addr_);
-ZMQ_EXPORT int zmq_disconnect (void *s_, const char *addr_);
-ZMQ_EXPORT int zmq_send (void *s_, const void *buf_, size_t len_, int flags_);
-ZMQ_EXPORT int
-zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_);
-ZMQ_EXPORT int zmq_recv (void *s_, void *buf_, size_t len_, int flags_);
-ZMQ_EXPORT int zmq_socket_monitor (void *s_, const char *addr_, int events_);
-
-/******************************************************************************/
-/*  Hide socket fd type; this was before zmq_poller_event_t typedef below     */
-/******************************************************************************/
-
-#if defined _WIN32
-// Windows uses a pointer-sized unsigned integer to store the socket fd.
-#if defined _WIN64
-typedef unsigned __int64 zmq_fd_t;
-#else
-typedef unsigned int zmq_fd_t;
-#endif
-#else
-typedef int zmq_fd_t;
-#endif
-
-/******************************************************************************/
-/*  Deprecated I/O multiplexing. Prefer using zmq_poller API                  */
-/******************************************************************************/
-
-#define ZMQ_POLLIN 1
-#define ZMQ_POLLOUT 2
-#define ZMQ_POLLERR 4
-#define ZMQ_POLLPRI 8
-
-typedef struct zmq_pollitem_t
-{
-    void *socket;
-    zmq_fd_t fd;
-    short events;
-    short revents;
-} zmq_pollitem_t;
-
-#define ZMQ_POLLITEMS_DFLT 16
-
-ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_);
-
-/******************************************************************************/
-/*  Message proxying                                                          */
-/******************************************************************************/
-
-ZMQ_EXPORT int zmq_proxy (void *frontend_, void *backend_, void *capture_);
-ZMQ_EXPORT int zmq_proxy_steerable (void *frontend_,
-                                    void *backend_,
-                                    void *capture_,
-                                    void *control_);
-
-/******************************************************************************/
-/*  Probe library capabilities                                                */
-/******************************************************************************/
-
-#define ZMQ_HAS_CAPABILITIES 1
-ZMQ_EXPORT int zmq_has (const char *capability_);
-
-/*  Deprecated aliases */
-#define ZMQ_STREAMER 1
-#define ZMQ_FORWARDER 2
-#define ZMQ_QUEUE 3
-
-/*  Deprecated methods */
-ZMQ_EXPORT int zmq_device (int type_, void *frontend_, void *backend_);
-ZMQ_EXPORT int zmq_sendmsg (void *s_, zmq_msg_t *msg_, int flags_);
-ZMQ_EXPORT int zmq_recvmsg (void *s_, zmq_msg_t *msg_, int flags_);
-struct iovec;
-ZMQ_EXPORT int
-zmq_sendiov (void *s_, struct iovec *iov_, size_t count_, int flags_);
-ZMQ_EXPORT int
-zmq_recviov (void *s_, struct iovec *iov_, size_t *count_, int flags_);
-
-/******************************************************************************/
-/*  Encryption functions                                                      */
-/******************************************************************************/
-
-/*  Encode data with Z85 encoding. Returns encoded data                       */
-ZMQ_EXPORT char *
-zmq_z85_encode (char *dest_, const uint8_t *data_, size_t size_);
-
-/*  Decode data with Z85 encoding. Returns decoded data                       */
-ZMQ_EXPORT uint8_t *zmq_z85_decode (uint8_t *dest_, const char *string_);
-
-/*  Generate z85-encoded public and private keypair with tweetnacl/libsodium. */
-/*  Returns 0 on success.                                                     */
-ZMQ_EXPORT int zmq_curve_keypair (char *z85_public_key_, char *z85_secret_key_);
-
-/*  Derive the z85-encoded public key from the z85-encoded secret key.        */
-/*  Returns 0 on success.                                                     */
-ZMQ_EXPORT int zmq_curve_public (char *z85_public_key_,
-                                 const char *z85_secret_key_);
-
-/******************************************************************************/
-/*  Atomic utility methods                                                    */
-/******************************************************************************/
-
-ZMQ_EXPORT void *zmq_atomic_counter_new (void);
-ZMQ_EXPORT void zmq_atomic_counter_set (void *counter_, int value_);
-ZMQ_EXPORT int zmq_atomic_counter_inc (void *counter_);
-ZMQ_EXPORT int zmq_atomic_counter_dec (void *counter_);
-ZMQ_EXPORT int zmq_atomic_counter_value (void *counter_);
-ZMQ_EXPORT void zmq_atomic_counter_destroy (void **counter_p_);
-
-/******************************************************************************/
-/*  Scheduling timers                                                         */
-/******************************************************************************/
-
-#define ZMQ_HAVE_TIMERS
-
-typedef void(zmq_timer_fn) (int timer_id, void *arg);
-
-ZMQ_EXPORT void *zmq_timers_new (void);
-ZMQ_EXPORT int zmq_timers_destroy (void **timers_p);
-ZMQ_EXPORT int
-zmq_timers_add (void *timers, size_t interval, zmq_timer_fn handler, void *arg);
-ZMQ_EXPORT int zmq_timers_cancel (void *timers, int timer_id);
-ZMQ_EXPORT int
-zmq_timers_set_interval (void *timers, int timer_id, size_t interval);
-ZMQ_EXPORT int zmq_timers_reset (void *timers, int timer_id);
-ZMQ_EXPORT long zmq_timers_timeout (void *timers);
-ZMQ_EXPORT int zmq_timers_execute (void *timers);
-
-
-/******************************************************************************/
-/*  These functions are not documented by man pages -- use at your own risk.  */
-/*  If you need these to be part of the formal ZMQ API, then (a) write a man  */
-/*  page, and (b) write a test case in tests.                                 */
-/******************************************************************************/
-
-/*  Helper functions are used by perf tests so that they don't have to care   */
-/*  about minutiae of time-related functions on different OS platforms.       */
-
-/*  Starts the stopwatch. Returns the handle to the watch.                    */
-ZMQ_EXPORT void *zmq_stopwatch_start (void);
-
-/*  Returns the number of microseconds elapsed since the stopwatch was        */
-/*  started, but does not stop or deallocate the stopwatch.                   */
-ZMQ_EXPORT unsigned long zmq_stopwatch_intermediate (void *watch_);
-
-/*  Stops the stopwatch. Returns the number of microseconds elapsed since     */
-/*  the stopwatch was started, and deallocates that watch.                    */
-ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_);
-
-/*  Sleeps for specified number of seconds.                                   */
-ZMQ_EXPORT void zmq_sleep (int seconds_);
-
-typedef void(zmq_thread_fn) (void *);
-
-/* Start a thread. Returns a handle to the thread.                            */
-ZMQ_EXPORT void *zmq_threadstart (zmq_thread_fn *func_, void *arg_);
-
-/* Wait for thread to complete then free up resources.                        */
-ZMQ_EXPORT void zmq_threadclose (void *thread_);
-
-
-/******************************************************************************/
-/*  These functions are DRAFT and disabled in stable releases, and subject to */
-/*  change at ANY time until declared stable.                                 */
-/******************************************************************************/
-
-#ifdef ZMQ_BUILD_DRAFT_API
-
-/*  DRAFT Socket types.                                                       */
-#define ZMQ_SERVER 12
-#define ZMQ_CLIENT 13
-#define ZMQ_RADIO 14
-#define ZMQ_DISH 15
-#define ZMQ_GATHER 16
-#define ZMQ_SCATTER 17
-#define ZMQ_DGRAM 18
-#define ZMQ_PEER 19
-#define ZMQ_CHANNEL 20
-
-/*  DRAFT Socket options.                                                     */
-#define ZMQ_ZAP_ENFORCE_DOMAIN 93
-#define ZMQ_LOOPBACK_FASTPATH 94
-#define ZMQ_METADATA 95
-#define ZMQ_MULTICAST_LOOP 96
-#define ZMQ_ROUTER_NOTIFY 97
-#define ZMQ_XPUB_MANUAL_LAST_VALUE 98
-#define ZMQ_SOCKS_USERNAME 99
-#define ZMQ_SOCKS_PASSWORD 100
-#define ZMQ_IN_BATCH_SIZE 101
-#define ZMQ_OUT_BATCH_SIZE 102
-#define ZMQ_WSS_KEY_PEM 103
-#define ZMQ_WSS_CERT_PEM 104
-#define ZMQ_WSS_TRUST_PEM 105
-#define ZMQ_WSS_HOSTNAME 106
-#define ZMQ_WSS_TRUST_SYSTEM 107
-#define ZMQ_ONLY_FIRST_SUBSCRIBE 108
-#define ZMQ_RECONNECT_STOP 109
-#define ZMQ_HELLO_MSG 110
-#define ZMQ_DISCONNECT_MSG 111
-
-/*  DRAFT ZMQ_RECONNECT_STOP options                                          */
-#define ZMQ_RECONNECT_STOP_CONN_REFUSED 0x1
-
-/*  DRAFT Context options                                                     */
-#define ZMQ_ZERO_COPY_RECV 10
-
-/*  DRAFT Context methods.                                                    */
-ZMQ_EXPORT int zmq_ctx_set_ext (void *context_,
-                                int option_,
-                                const void *optval_,
-                                size_t optvallen_);
-ZMQ_EXPORT int zmq_ctx_get_ext (void *context_,
-                                int option_,
-                                void *optval_,
-                                size_t *optvallen_);
-
-/*  DRAFT Socket methods.                                                     */
-ZMQ_EXPORT int zmq_join (void *s, const char *group);
-ZMQ_EXPORT int zmq_leave (void *s, const char *group);
-ZMQ_EXPORT uint32_t zmq_connect_peer (void *s_, const char *addr_);
-
-/*  DRAFT Msg methods.                                                        */
-ZMQ_EXPORT int zmq_msg_set_routing_id (zmq_msg_t *msg, uint32_t routing_id);
-ZMQ_EXPORT uint32_t zmq_msg_routing_id (zmq_msg_t *msg);
-ZMQ_EXPORT int zmq_msg_set_group (zmq_msg_t *msg, const char *group);
-ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
-ZMQ_EXPORT int
-zmq_msg_init_buffer (zmq_msg_t *msg_, const void *buf_, size_t size_);
-
-/*  DRAFT Msg property names.                                                 */
-#define ZMQ_MSG_PROPERTY_ROUTING_ID "Routing-Id"
-#define ZMQ_MSG_PROPERTY_SOCKET_TYPE "Socket-Type"
-#define ZMQ_MSG_PROPERTY_USER_ID "User-Id"
-#define ZMQ_MSG_PROPERTY_PEER_ADDRESS "Peer-Address"
-
-/*  Router notify options                                                     */
-#define ZMQ_NOTIFY_CONNECT 1
-#define ZMQ_NOTIFY_DISCONNECT 2
-
-/******************************************************************************/
-/*  Poller polling on sockets,fd and thread-safe sockets                      */
-/******************************************************************************/
-
-#define ZMQ_HAVE_POLLER
-
-typedef struct zmq_poller_event_t
-{
-    void *socket;
-    zmq_fd_t fd;
-    void *user_data;
-    short events;
-} zmq_poller_event_t;
-
-ZMQ_EXPORT void *zmq_poller_new (void);
-ZMQ_EXPORT int zmq_poller_destroy (void **poller_p);
-ZMQ_EXPORT int zmq_poller_size (void *poller);
-ZMQ_EXPORT int
-zmq_poller_add (void *poller, void *socket, void *user_data, short events);
-ZMQ_EXPORT int zmq_poller_modify (void *poller, void *socket, short events);
-ZMQ_EXPORT int zmq_poller_remove (void *poller, void *socket);
-ZMQ_EXPORT int
-zmq_poller_wait (void *poller, zmq_poller_event_t *event, long timeout);
-ZMQ_EXPORT int zmq_poller_wait_all (void *poller,
-                                    zmq_poller_event_t *events,
-                                    int n_events,
-                                    long timeout);
-ZMQ_EXPORT int zmq_poller_fd (void *poller, zmq_fd_t *fd);
-
-ZMQ_EXPORT int
-zmq_poller_add_fd (void *poller, zmq_fd_t fd, void *user_data, short events);
-ZMQ_EXPORT int zmq_poller_modify_fd (void *poller, zmq_fd_t fd, short events);
-ZMQ_EXPORT int zmq_poller_remove_fd (void *poller, zmq_fd_t fd);
-
-ZMQ_EXPORT int zmq_socket_get_peer_state (void *socket,
-                                          const void *routing_id,
-                                          size_t routing_id_size);
-
-/*  DRAFT Socket monitoring events                                            */
-#define ZMQ_EVENT_PIPES_STATS 0x10000
-
-#define ZMQ_CURRENT_EVENT_VERSION 1
-#define ZMQ_CURRENT_EVENT_VERSION_DRAFT 2
-
-#define ZMQ_EVENT_ALL_V1 ZMQ_EVENT_ALL
-#define ZMQ_EVENT_ALL_V2 ZMQ_EVENT_ALL_V1 | ZMQ_EVENT_PIPES_STATS
-
-ZMQ_EXPORT int zmq_socket_monitor_versioned (
-  void *s_, const char *addr_, uint64_t events_, int event_version_, int type_);
-ZMQ_EXPORT int zmq_socket_monitor_pipes_stats (void *s);
-
-#endif // ZMQ_BUILD_DRAFT_API
-
-
-#undef ZMQ_EXPORT
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/zmq_utils.h b/include/zmq_utils.h
deleted file mode 100644
index b9398d57e..000000000
--- a/include/zmq_utils.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*  This file is deprecated, and all its functionality provided by zmq.h     */
-/*  Note that -Wpedantic compilation requires GCC to avoid using its custom
-    extensions such as #warning, hence the trick below. Also, pragmas for
-    warnings or other messages are not standard, not portable, and not all
-    compilers even have an equivalent concept.
-    So in the worst case, this include file is treated as silently empty. */
-
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)               \
-  || defined(_MSC_VER)
-#if defined(__GNUC__) || defined(__GNUG__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Wcpp"
-#pragma GCC diagnostic ignored "-Werror"
-#pragma GCC diagnostic ignored "-Wall"
-#endif
-#pragma message(                                                               \
-  "Warning: zmq_utils.h is deprecated. All its functionality is provided by zmq.h.")
-#if defined(__GNUC__) || defined(__GNUG__)
-#pragma GCC diagnostic pop
-#endif
-#endif
diff --git a/installer.ico b/installer.ico
deleted file mode 100755
index ba2709c556b13950a89eeed130e469b57e42d39a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2842
zcmeH_X;4#V6ozj=2t-H-L}e3#0wNL&5KW56W`e9C>?pXfsUWh;06|T{9uO!RF$EMY
zh!q7!i;55pgvA{yE}()qfR1E=k|05r^ag))I@A8>pE}d_n>lm7cg}s!cg~#$03g5$
zKz<+q8n9CU0GDO;Ro8=>0fzj@>q793QTkm2iU6Ri0ssXR@=kS_E)1-wySWm5!K@(<
z6|fGNVGw>`>ZW-5lj^Tt6XfSfygZ~<7^#)TjJvBan=x^g#XrehKxxSUU=gl9<4%%6
z05OF!6&o$c&*2vqd@(T=<mZmJG>^Bo@QawUc$)<zQsV116&1AzQx)W8i;gBsJX{6&
z+2R1-iBn~>+wjuOo5pW7i-Q73A9T;_>raP-h=T$o;B&c*>D{}<!2uIz&MZNp;=sUJ
z8|wv4<n*49(FgZGJ2@>ul?6Fj{F8-qmYYP>41Q73^zI<BpO27nf?rlFD9DqLJ*e$-
z<={q;6koC*;P_$SfLw%o>?Fbt^+^Ijp_<^jD;dnL%i;3iuswLGb|X6ZYxjGVyjtCX
zRol^}%u<hHab_*4OET{;yrgo%<ZiKmNHa$j6C)DQ?~!F2Gp;{lUrj28jMEwVUA}`2
z!M^@ol=b|W*vsvZACe|-?6}!yy6uGM^L=~evA!vlh@@~`zxO(x5oF6V9h=x8{CtZc
zmH4B-lFP%rN1^cPr^tjH?~m7ywYVoLirPyYo=a=^c~o{&{D_z(U0HIx@*bQ!-%n(N
zvznxkf>R>HQle}llA^!_SYxfMF<2bN8t-ql#TJXV#o<6{i^aZk8LR$-;YfUB^nvuh
zHZ<sk>VpQrjYK9kIPYit2|H-8j9zAkSi|fF#WFi!{ui*bTIS6GH~D+)KoD|v2#;8&
z1~nO2HPUE9wStJrT-Tst&YbU-$xdsnE5@$BHhaOCQ&+00&fQr+v}U{4_Om^=7N%Q5
z!@3maGB2Pr-B5*HzCVS2P%?It8twW3LFJUW*Y3XdVq(T+2P(R5P||Bd4_tXFb(`7k
zepUPGD|U{zJQ_=0Utu0@>{0%5Obv&LMJV%(?2lHd7rAI_ci-A>py+9;?NuiOZs-h(
zzw21whSTZMmgSKlt67KNOs-=CTVk5mQ8{qkn}gZ5I*I^+Je7Re?s=+*a9EfIyfUHQ
zbI_ma&@ZXe5?1!wKLISu_pSMyG1F@Up}q0a2*ukHX6FxHISX({>3s30bX?md9X6jZ
zqEw||yI9|S>^k@-zb&d*a02Wys{7xnHiP0nkE)LxRo5QQnZX8zqgt+$4=N$Z9~Ft5
zUE8HZOp}!-m6aKgJ3A}bvMa)ceLS2E(6hLvSDfQ~A=m=OpqR5Bj$1z``HUrzv@ZLb
zzlaI=Qfl#tdGUEna|Y+B<{_N!GepeRidb4;eNJs^>(Hl^J411eulxd7u|WBk#pAEf
z*<-cUs&V@88(A-Lm{$5PhdPzDOM0Y|cW*mk^aj2fz{8^1o~A8v{W#1c#=y-Z%Cu2J
zsb^ik_bvXN8taND=&Ih20(w_CT{NDgiqTfAe*r6-$>0pe_Hl;d5+Ak>iQ=zHAa<Ga
ziv~k^JR_<`Nl(Pn=vrlsD)NSn>nly~i|yK0eH63R6Iw$1g!4-?898ePg{iIYCT~m9
z?4B8%rlVDA3{kmZ;H-|4OnbKi!PuLfR?LfnY8`;s_-ZACP<+a`eIGQ*?RKcoieclK
z?As$bgr08>I}MzGwhX&u<omh*VFw_Qa@f;e3*Yp_Wn)n;VRaj7W{0VhoO?2lsN~8n
zQc!M@=C)@tj7|l00G*wyp*!J>&*&?(m+(Y}j{WH{3Qb`esur#i;K9>wH|wqjl+3E%
z(h`4OJMeM^3RI`Hu&VJq)FrE|U5|~1X>H=iKc<e$UDu%&+_+$(Yp^q`NlnSj5i-8w
zD%Y|Ie~t|8p?{W|%gtkm;H*7O#pmI}TvNeh2<SqUI_%d=ZHK>x50gUgL0jVt<-L}?
zxsbN@yry=!c!(e{_9PT(rDb^|^$#}9-!*iV_liVJ?WI)m^fKwC3979QbGbwajKV#y
zL=3vD*#<@MbyH7dCZ;QXo#btYUS=M3zyWJFf*ejiN7)o8e;PBQ^I|jAN%(Npa=-k&
zNPMTBU!5VL&8P-k0CwL%gTphBaW}Lf3`SQz?N*e3HwKp~*jhD;wo8)N{<Hl528Vp1
A^#A|>

diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
deleted file mode 100644
index ca3639715..000000000
--- a/m4/ax_check_compile_flag.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/m4/ax_check_vscript.m4 b/m4/ax_check_vscript.m4
deleted file mode 100644
index 9851f3225..000000000
--- a/m4/ax_check_vscript.m4
+++ /dev/null
@@ -1,142 +0,0 @@
-# ===========================================================================
-#     https://www.gnu.org/software/autoconf-archive/ax_check_vscript.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_VSCRIPT
-#
-# DESCRIPTION
-#
-#   Check whether the linker supports version scripts.  Version scripts are
-#   used when building shared libraries to bind symbols to version nodes
-#   (helping to detect incompatibilities) or to limit the visibility of
-#   non-public symbols.
-#
-#   Output:
-#
-#   If version scripts are supported, VSCRIPT_LDFLAGS will contain the
-#   appropriate flag to pass to the linker.  On GNU systems this would
-#   typically be "-Wl,--version-script", and on Solaris it would typically
-#   be "-Wl,-M".
-#
-#   Two Automake conditionals are also set:
-#
-#    HAVE_VSCRIPT is true if the linker supports version scripts with
-#    entries that use simple wildcards, like "local: *".
-#
-#    HAVE_VSCRIPT_COMPLEX is true if the linker supports version scripts with
-#    pattern matching wildcards, like "global: Java_*".
-#
-#   On systems that do not support symbol versioning, such as Mac OS X, both
-#   conditionals will be false.  They will also be false if the user passes
-#   "--disable-symvers" on the configure command line.
-#
-#   Example:
-#
-#    configure.ac:
-#
-#     AX_CHECK_VSCRIPT
-#
-#    Makefile.am:
-#
-#     if HAVE_VSCRIPT
-#     libfoo_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libfoo.map
-#     endif
-#
-#     if HAVE_VSCRIPT_COMPLEX
-#     libbar_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libbar.map
-#     endif
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Kevin Cernekee <cernekee@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 2
-
-# _AX_CHECK_VSCRIPT(flag, global-sym, action-if-link-succeeds, [junk-file=no])
-AC_DEFUN([_AX_CHECK_VSCRIPT], [
-  AC_LANG_PUSH([C])
-  ax_check_vscript_save_flags="$LDFLAGS"
-  echo "V1 { global: $2; local: *; };" > conftest.map
-  AS_IF([test x$4 = xyes], [
-    echo "{" >> conftest.map
-  ])
-  LDFLAGS="$LDFLAGS -Wl,$1,conftest.map"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[int show, hide;]], [])], [$3])
-  LDFLAGS="$ax_check_vscript_save_flags"
-  rm -f conftest.map
-  AC_LANG_POP([C])
-]) dnl _AX_CHECK_VSCRIPT
-
-AC_DEFUN([AX_CHECK_VSCRIPT], [
-
-  AC_ARG_ENABLE([symvers],
-    AS_HELP_STRING([--disable-symvers],
-                   [disable library symbol versioning [default=auto]]),
-    [want_symvers=$enableval],
-    [want_symvers=yes]
-  )
-
-  AS_IF([test x$want_symvers = xyes], [
-
-    dnl First test --version-script and -M with a simple wildcard.
-
-    AC_CACHE_CHECK([linker version script flag], ax_cv_check_vscript_flag, [
-      ax_cv_check_vscript_flag=unsupported
-      _AX_CHECK_VSCRIPT([--version-script], [show], [
-        ax_cv_check_vscript_flag=--version-script
-      ])
-      AS_IF([test x$ax_cv_check_vscript_flag = xunsupported], [
-        _AX_CHECK_VSCRIPT([-M], [show], [ax_cv_check_vscript_flag=-M])
-      ])
-
-      dnl The linker may interpret -M (no argument) as "produce a load map."
-      dnl If "-M conftest.map" doesn't fail when conftest.map contains
-      dnl obvious syntax errors, assume this is the case.
-
-      AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [
-        _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [show],
-	                  [ax_cv_check_vscript_flag=unsupported], [yes])
-      ])
-    ])
-
-    dnl If the simple wildcard worked, retest with a complex wildcard.
-
-    AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [
-      ax_check_vscript_flag=$ax_cv_check_vscript_flag
-      AC_CACHE_CHECK([if version scripts can use complex wildcards],
-                     ax_cv_check_vscript_complex_wildcards, [
-        ax_cv_check_vscript_complex_wildcards=no
-        _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [sh*], [
-        ax_cv_check_vscript_complex_wildcards=yes])
-      ])
-      ax_check_vscript_complex_wildcards="$ax_cv_check_vscript_complex_wildcards"
-    ], [
-      ax_check_vscript_flag=
-      ax_check_vscript_complex_wildcards=no
-    ])
-  ], [
-    AC_MSG_CHECKING([linker version script flag])
-    AC_MSG_RESULT([disabled])
-
-    ax_check_vscript_flag=
-    ax_check_vscript_complex_wildcards=no
-  ])
-
-  AS_IF([test x$ax_check_vscript_flag != x], [
-    VSCRIPT_LDFLAGS="-Wl,$ax_check_vscript_flag"
-    AC_SUBST([VSCRIPT_LDFLAGS])
-  ])
-
-  AM_CONDITIONAL([HAVE_VSCRIPT],
-    [test x$ax_check_vscript_flag != x])
-  AM_CONDITIONAL([HAVE_VSCRIPT_COMPLEX],
-    [test x$ax_check_vscript_complex_wildcards = xyes])
-
-]) dnl AX_CHECK_VSCRIPT
diff --git a/m4/ax_code_coverage.m4 b/m4/ax_code_coverage.m4
deleted file mode 100644
index 6484f0332..000000000
--- a/m4/ax_code_coverage.m4
+++ /dev/null
@@ -1,264 +0,0 @@
-# ===========================================================================
-#     https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CODE_COVERAGE()
-#
-# DESCRIPTION
-#
-#   Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS,
-#   CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included
-#   in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every
-#   build target (program or library) which should be built with code
-#   coverage support. Also defines CODE_COVERAGE_RULES which should be
-#   substituted in your Makefile; and $enable_code_coverage which can be
-#   used in subsequent configure output. CODE_COVERAGE_ENABLED is defined
-#   and substituted, and corresponds to the value of the
-#   --enable-code-coverage option, which defaults to being disabled.
-#
-#   Test also for gcov program and create GCOV variable that could be
-#   substituted.
-#
-#   Note that all optimization flags in CFLAGS must be disabled when code
-#   coverage is enabled.
-#
-#   Usage example:
-#
-#   configure.ac:
-#
-#     AX_CODE_COVERAGE
-#
-#   Makefile.am:
-#
-#     @CODE_COVERAGE_RULES@
-#     my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ...
-#     my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ...
-#     my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ...
-#     my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ...
-#
-#   This results in a "check-code-coverage" rule being added to any
-#   Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module
-#   has been configured with --enable-code-coverage). Running `make
-#   check-code-coverage` in that directory will run the module's test suite
-#   (`make check`) and build a code coverage report detailing the code which
-#   was touched, then print the URI for the report.
-#
-#   In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined
-#   instead of CODE_COVERAGE_LIBS. They are both still defined, but use of
-#   CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is
-#   deprecated. They have the same value.
-#
-#   This code was derived from Makefile.decl in GLib, originally licenced
-#   under LGPLv2.1+.
-#
-# LICENSE
-#
-#   Copyright (c) 2012, 2016 Philip Withnall
-#   Copyright (c) 2012 Xan Lopez
-#   Copyright (c) 2012 Christian Persch
-#   Copyright (c) 2012 Paolo Borelli
-#   Copyright (c) 2012 Dan Winship
-#   Copyright (c) 2015 Bastien ROUCARIES
-#
-#   This library is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation; either version 2.1 of the License, or (at
-#   your option) any later version.
-#
-#   This library is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-#serial 25
-
-AC_DEFUN([AX_CODE_COVERAGE],[
-	dnl Check for --enable-code-coverage
-	AC_REQUIRE([AC_PROG_SED])
-
-	# allow to override gcov location
-	AC_ARG_WITH([gcov],
-	  [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])],
-	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov],
-	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov])
-
-	AC_MSG_CHECKING([whether to build with code coverage support])
-	AC_ARG_ENABLE([code-coverage],
-	  AS_HELP_STRING([--enable-code-coverage],
-	  [Whether to enable code coverage support]),,
-	  enable_code_coverage=no)
-
-	AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
-	AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
-	AC_MSG_RESULT($enable_code_coverage)
-
-	AS_IF([ test "$enable_code_coverage" = "yes" ], [
-		# check for gcov
-		AC_CHECK_TOOL([GCOV],
-		  [$_AX_CODE_COVERAGE_GCOV_PROG_WITH],
-		  [:])
-		AS_IF([test "X$GCOV" = "X:"],
-		  [AC_MSG_ERROR([gcov is needed to do coverage])])
-		AC_SUBST([GCOV])
-
-		dnl Check if gcc is being used
-		AS_IF([ test "$GCC" = "no" ], [
-			AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
-		])
-
-		AC_CHECK_PROG([LCOV], [lcov], [lcov])
-		AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
-
-		AS_IF([ test -z "$LCOV" ], [
-			AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed])
-		])
-
-		AS_IF([ test -z "$GENHTML" ], [
-			AC_MSG_ERROR([Could not find genhtml from the lcov package])
-		])
-
-		dnl Build the code coverage flags
-		dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
-		CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
-		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-		CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-		CODE_COVERAGE_LIBS="-lgcov"
-		CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
-
-		AC_SUBST([CODE_COVERAGE_CPPFLAGS])
-		AC_SUBST([CODE_COVERAGE_CFLAGS])
-		AC_SUBST([CODE_COVERAGE_CXXFLAGS])
-		AC_SUBST([CODE_COVERAGE_LIBS])
-		AC_SUBST([CODE_COVERAGE_LDFLAGS])
-
-		[CODE_COVERAGE_RULES_CHECK='
-	-$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
-']
-		[CODE_COVERAGE_RULES_CAPTURE='
-	$(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS)
-	$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
-	-@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
-	$(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
-	@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
-']
-		[CODE_COVERAGE_RULES_CLEAN='
-clean: code-coverage-clean
-distclean: code-coverage-clean
-code-coverage-clean:
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-	-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
-']
-	], [
-		[CODE_COVERAGE_RULES_CHECK='
-	@echo "Need to reconfigure with --enable-code-coverage"
-']
-		CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK"
-		CODE_COVERAGE_RULES_CLEAN=''
-	])
-
-[CODE_COVERAGE_RULES='
-# Code coverage
-#
-# Optional:
-#  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
-#    Multiple directories may be specified, separated by whitespace.
-#    (Default: $(top_builddir))
-#  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
-#    by lcov for code coverage. (Default:
-#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
-#  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
-#    reports to be created. (Default:
-#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
-#  - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage,
-#    set to 0 to disable it and leave empty to stay with the default.
-#    (Default: empty)
-#  - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov
-#    instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
-#  - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov
-#    instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
-#  - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov
-#  - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the
-#    collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
-#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov
-#    instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-#  - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering
-#    lcov instance. (Default: empty)
-#  - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov
-#    instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
-#  - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the
-#    genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
-#  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
-#    instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
-#  - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore
-#
-# The generated report will be titled using the $(PACKAGE_NAME) and
-# $(PACKAGE_VERSION). In order to add the current git hash to the title,
-# use the git-version-gen script, available online.
-
-# Optional variables
-CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
-CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
-CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
-CODE_COVERAGE_BRANCH_COVERAGE ?=
-CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
---rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
-CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
-CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)"
-CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
-CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?=
-CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
-CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\
-$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
---rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
-CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
-CODE_COVERAGE_IGNORE_PATTERN ?=
-
-GITIGNOREFILES ?=
-GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-
-code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
-code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_lcov_cap_0 = @echo "  LCOV   --capture"\
- $(CODE_COVERAGE_OUTPUT_FILE);
-code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V))
-code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_lcov_ign_0 = @echo "  LCOV   --remove /tmp/*"\
- $(CODE_COVERAGE_IGNORE_PATTERN);
-code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V))
-code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_genhtml_0 = @echo "  GEN   " $(CODE_COVERAGE_OUTPUT_DIRECTORY);
-code_coverage_quiet = $(code_coverage_quiet_$(V))
-code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY))
-code_coverage_quiet_0 = --quiet
-
-# sanitizes the test-name: replaces with underscores: dashes and dots
-code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1)))
-
-# Use recursive makes in order to ignore errors during check
-check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"'
-
-# Capture code coverage data
-code-coverage-capture: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"'
-
-# Hook rule executed before code-coverage-capture, overridable by the user
-code-coverage-capture-hook:
-
-'"$CODE_COVERAGE_RULES_CLEAN"'
-
-A''M_DISTCHECK_CONFIGURE_FLAGS ?=
-A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
-
-.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
-']
-
-	AC_SUBST([CODE_COVERAGE_RULES])
-	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])])
-])
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
deleted file mode 100644
index 2c18e49c5..000000000
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ /dev/null
@@ -1,562 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 4
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [],
-        [$1], [14], [],
-        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-  ax_cv_cxx_compile_cxx$1,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-    [ax_cv_cxx_compile_cxx$1=yes],
-    [ax_cv_cxx_compile_cxx$1=no])])
-  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++$1 -std=gnu++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_seperators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4
deleted file mode 100644
index e08ce2f31..000000000
--- a/m4/ax_cxx_compile_stdcxx_11.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXX and CXXCPP to enable
-#   support.
-#
-#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
-#   macro with the version set to C++11.  The two optional arguments are
-#   forwarded literally as the second and third argument respectively.
-#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
-#   more information.  If you want to use this macro, you also need to
-#   download the ax_cxx_compile_stdcxx.m4 file.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 16
-
-m4_include([m4/ax_cxx_compile_stdcxx.m4])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])])
diff --git a/m4/ax_func_posix_memalign.m4 b/m4/ax_func_posix_memalign.m4
deleted file mode 100644
index 2442ceca7..000000000
--- a/m4/ax_func_posix_memalign.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-# ===========================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_func_posix_memalign.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_FUNC_POSIX_MEMALIGN
-#
-# DESCRIPTION
-#
-#   Some versions of posix_memalign (notably glibc 2.2.5) incorrectly apply
-#   their power-of-two check to the size argument, not the alignment
-#   argument. AX_FUNC_POSIX_MEMALIGN defines HAVE_POSIX_MEMALIGN if the
-#   power-of-two check is correctly applied to the alignment argument.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Scott Pakin <pakin@uiuc.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 9
-
-AC_DEFUN([AX_FUNC_POSIX_MEMALIGN],
-[AC_CACHE_CHECK([for working posix_memalign],
-  [ax_cv_func_posix_memalign_works],
-  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdlib.h>
-
-int
-main ()
-{
-  void *buffer;
-
-  /* Some versions of glibc incorrectly perform the alignment check on
-   * the size word. */
-  exit (posix_memalign (&buffer, sizeof(void *), 123) != 0);
-}
-    ]])],
-    [ax_cv_func_posix_memalign_works=yes],
-    [ax_cv_func_posix_memalign_works=no],
-    [ax_cv_func_posix_memalign_works=no])])
-if test "$ax_cv_func_posix_memalign_works" = "yes" ; then
-  AC_DEFINE([HAVE_POSIX_MEMALIGN], [1],
-    [Define to 1 if `posix_memalign' works.])
-fi
-])
diff --git a/m4/ax_valgrind_check.m4 b/m4/ax_valgrind_check.m4
deleted file mode 100644
index 2dd8f7184..000000000
--- a/m4/ax_valgrind_check.m4
+++ /dev/null
@@ -1,233 +0,0 @@
-# ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_VALGRIND_CHECK()
-#
-# DESCRIPTION
-#
-#   Checks whether Valgrind is present and, if so, allows running `make
-#   check` under a variety of Valgrind tools to check for memory and
-#   threading errors.
-#
-#   Defines VALGRIND_CHECK_RULES which should be substituted in your
-#   Makefile; and $enable_valgrind which can be used in subsequent configure
-#   output. VALGRIND_ENABLED is defined and substituted, and corresponds to
-#   the value of the --enable-valgrind option, which defaults to being
-#   enabled if Valgrind is installed and disabled otherwise.
-#
-#   If unit tests are written using a shell script and automake's
-#   LOG_COMPILER system, the $(VALGRIND) variable can be used within the
-#   shell scripts to enable Valgrind, as described here:
-#
-#     https://www.gnu.org/software/gnulib/manual/html_node/Running-self_002dtests-under-valgrind.html
-#
-#   Usage example:
-#
-#   configure.ac:
-#
-#     AX_VALGRIND_CHECK
-#
-#   Makefile.am:
-#
-#     @VALGRIND_CHECK_RULES@
-#     VALGRIND_SUPPRESSIONS_FILES = my-project.supp
-#     EXTRA_DIST = my-project.supp
-#
-#   This results in a "check-valgrind" rule being added to any Makefile.am
-#   which includes "@VALGRIND_CHECK_RULES@" (assuming the module has been
-#   configured with --enable-valgrind). Running `make check-valgrind` in
-#   that directory will run the module's test suite (`make check`) once for
-#   each of the available Valgrind tools (out of memcheck, helgrind, drd and
-#   sgcheck), and will output results to test-suite-$toolname.log for each.
-#   The target will succeed if there are zero errors and fail otherwise.
-#
-#   Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in
-#   memcheck, helgrind, drd and sgcheck. These are useful because often only
-#   some of those tools can be ran cleanly on a codebase.
-#
-#   The macro supports running with and without libtool.
-#
-# LICENSE
-#
-#   Copyright (c) 2014, 2015, 2016 Philip Withnall <philip.withnall@collabora.co.uk>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 9
-
-AC_DEFUN([AX_VALGRIND_CHECK],[
-	dnl Check for --enable-valgrind
-	AC_ARG_ENABLE([valgrind],
-	              [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests])],
-	              [enable_valgrind=$enableval],[enable_valgrind=])
-
-	AS_IF([test "$enable_valgrind" != "no"],[
-		# Check for Valgrind.
-		AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind])
-		AS_IF([test "$VALGRIND" = ""],[
-			AS_IF([test "$enable_valgrind" = "yes"],[
-				AC_MSG_ERROR([Could not find valgrind; either install it or reconfigure with --disable-valgrind])
-			],[
-				enable_valgrind=no
-			])
-		],[
-			enable_valgrind=yes
-		])
-	])
-
-	AM_CONDITIONAL([VALGRIND_ENABLED],[test "$enable_valgrind" = "yes"])
-	AC_SUBST([VALGRIND_ENABLED],[$enable_valgrind])
-
-	# Check for Valgrind tools we care about.
-	m4_define([valgrind_tool_list],[[memcheck], [helgrind], [drd], [exp-sgcheck]])
-
-	AS_IF([test "$VALGRIND" != ""],[
-		m4_foreach([vgtool],[valgrind_tool_list],[
-			m4_define([vgtooln],AS_TR_SH(vgtool))
-			m4_define([ax_cv_var],[ax_cv_valgrind_tool_]vgtooln)
-			AC_CACHE_CHECK([for Valgrind tool ]vgtool,ax_cv_var,[
-				ax_cv_var=
-				AS_IF([`$VALGRIND --tool=vgtool --help >/dev/null 2>&1`],[
-					ax_cv_var="vgtool"
-				])
-			])
-
-			AC_SUBST([VALGRIND_HAVE_TOOL_]vgtooln,[$ax_cv_var])
-		])
-	])
-
-[VALGRIND_CHECK_RULES='
-# Valgrind check
-#
-# Optional:
-#  - VALGRIND_SUPPRESSIONS_FILES: Space-separated list of Valgrind suppressions
-#    files to load. (Default: empty)
-#  - VALGRIND_FLAGS: General flags to pass to all Valgrind tools.
-#    (Default: --num-callers=30)
-#  - VALGRIND_$toolname_FLAGS: Flags to pass to Valgrind $toolname (one of:
-#    memcheck, helgrind, drd, sgcheck). (Default: various)
-
-# Optional variables
-VALGRIND_SUPPRESSIONS ?= $(addprefix --suppressions=,$(VALGRIND_SUPPRESSIONS_FILES))
-VALGRIND_FLAGS ?= --num-callers=30
-VALGRIND_memcheck_FLAGS ?= --leak-check=full --show-reachable=no
-VALGRIND_helgrind_FLAGS ?= --history-level=approx
-VALGRIND_drd_FLAGS ?=
-VALGRIND_sgcheck_FLAGS ?=
-
-# Internal use
-valgrind_tools = memcheck helgrind drd sgcheck
-valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools)))
-
-valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS)
-valgrind_helgrind_flags = --tool=helgrind $(VALGRIND_helgrind_FLAGS)
-valgrind_drd_flags = --tool=drd $(VALGRIND_drd_FLAGS)
-valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS)
-
-valgrind_quiet = $(valgrind_quiet_$(V))
-valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
-valgrind_quiet_0 = --quiet
-
-# Support running with and without libtool.
-ifneq ($(LIBTOOL),)
-valgrind_lt = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=execute
-else
-valgrind_lt =
-endif
-
-# Use recursive makes in order to ignore errors during check
-check-valgrind:
-ifeq ($(VALGRIND_ENABLED),yes)
-	-$(foreach tool,$(valgrind_tools), \
-		$(if $(VALGRIND_HAVE_TOOL_$(tool))$(VALGRIND_HAVE_TOOL_exp_$(tool)), \
-			$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=$(tool); \
-		) \
-	)
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-# Valgrind running
-VALGRIND_TESTS_ENVIRONMENT = \
-	$(TESTS_ENVIRONMENT) \
-	env VALGRIND=$(VALGRIND) \
-	G_SLICE=always-malloc,debug-blocks \
-	G_DEBUG=fatal-warnings,fatal-criticals,gc-friendly
-
-VALGRIND_LOG_COMPILER = \
-	$(valgrind_lt) \
-	$(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
-
-check-valgrind-tool:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_$(VALGRIND_TOOL)_flags)" \
-		TEST_SUITE_LOG=test-suite-$(VALGRIND_TOOL).log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-check-valgrind-memcheck:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_memcheck_flags)" \
-		TEST_SUITE_LOG=test-suite-memcheck.log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-check-valgrind-helgrind:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_helgrind_flags)" \
-		TEST_SUITE_LOG=test-suite-helgrind.log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-check-valgrind-drd:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_drd_flags)" \
-		TEST_SUITE_LOG=test-suite-drd.log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-check-valgrind-sgcheck:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_sgcheck_flags)" \
-		TEST_SUITE_LOG=test-suite-sgcheck.log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-A''M_DISTCHECK_CONFIGURE_FLAGS ?=
-A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
-
-MOSTLYCLEANFILES ?=
-MOSTLYCLEANFILES += $(valgrind_log_files)
-
-.PHONY: check-valgrind check-valgrind-tool
-']
-
-	AC_SUBST([VALGRIND_CHECK_RULES])
-	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])])
-])
diff --git a/packaging/README b/packaging/README
deleted file mode 100644
index c8350fe53..000000000
--- a/packaging/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory is for packaging tools. Please do not hardcode version
-numbers into your scripts; you can get them at runtime by calling
-version.sh, or at configure time if you use autoconf.
-
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
deleted file mode 100644
index 016c294ed..000000000
--- a/packaging/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-zeromq (4.3.3) UNRELEASED; urgency=low
-
-  * Initial packaging.
-
- -- libzmq Developers <zeromq-dev@lists.zeromq.org>  Wed, 31 Dec 2014 00:00:00 +0000
diff --git a/packaging/debian/compat b/packaging/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/packaging/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/packaging/debian/control b/packaging/debian/control
deleted file mode 100644
index 23c86a6da..000000000
--- a/packaging/debian/control
+++ /dev/null
@@ -1,75 +0,0 @@
-Source: zeromq
-Section: libs
-Priority: optional
-Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
- libkrb5-dev,
- libnorm-dev,
- libpgm-dev,
- libsodium-dev,
- libunwind-dev | libunwind8-dev | libunwind7-dev,
- libnss3-dev,
- libgnutls28-dev | libgnutls-dev,
- libbsd-dev,
- pkg-config,
- asciidoc-base | asciidoc, xmlto,
-Standards-Version: 3.9.8
-Homepage: http://www.zeromq.org/
-
-Package: libzmq5
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: lightweight messaging kernel (shared library)
- ØMQ is a library which extends the standard socket interfaces with features
- traditionally provided by specialised messaging middleware products.
- .
- ØMQ sockets provide an abstraction of asynchronous message queues, multiple
- messaging patterns, message filtering (subscriptions), seamless access to
- multiple transport protocols and more.
- .
- This package contains the libzmq shared library.
-
-Package: libzmq3-dev
-Architecture: any
-Section: libdevel
-Depends: libzmq5 (= ${binary:Version}), ${misc:Depends},
- libkrb5-dev,
- libnorm-dev,
- libpgm-dev,
- libsodium-dev,
- libunwind-dev | libunwind8-dev | libunwind7-dev,
- libnss3-dev,
- libgnutls28-dev | libgnutls-dev,
- libbsd-dev,
-Conflicts: libzmq-dev, libzmq5-dev
-Replaces: libzmq5-dev
-Provides: libzmq5-dev
-Multi-Arch: same
-Description: lightweight messaging kernel (development files)
- ØMQ is a library which extends the standard socket interfaces with features
- traditionally provided by specialised messaging middleware products.
- .
- ØMQ sockets provide an abstraction of asynchronous message queues, multiple
- messaging patterns, message filtering (subscriptions), seamless access to
- multiple transport protocols and more.
- .
- This package contains the ZeroMQ development libraries and header files.
-
-Package: libzmq5-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: libzmq5 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: lightweight messaging kernel (debugging symbols)
- ØMQ is a library which extends the standard socket interfaces with features
- traditionally provided by specialised messaging middleware products.
- .
- ØMQ sockets provide an abstraction of asynchronous message queues, multiple
- messaging patterns, message filtering (subscriptions), seamless access to
- multiple transport protocols and more.
- .
- This package contains the debugging symbols for the ZeroMQ library.
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
deleted file mode 100644
index 1acc7eea2..000000000
--- a/packaging/debian/copyright
+++ /dev/null
@@ -1,116 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ZeroMQ
-Source: http://zeromq.org
-
-Files: *
-Copyright: 2009-2011, 250bpm s.r.o
- 2007-2013, iMatix Corporation
- 2007-2011, Other contributors as noted in the AUTHORS file
-License: LGPL-3.0+
-
-Files: src/xreq.cpp
- src/xpub.cpp
- src/xsub.cpp
- tests/test_reqrep_device.cpp
- tests/test_invalid_rep.cpp
-Copyright: 2010-2011, 250bpm s.r.o
- 2011, VMware, Inc
- 2010-2011, Other contributors as noted in the AUTHORS file
-License: LGPL-3.0+
-
-Files: src/msg.hpp
- src/xrep.*
- src/options.*
- src/req.*
- src/socket_base.*
- src/pipe.*
- src/encoder.cpp
- src/lb.cpp
- src/session_base.*
- src/fq.cpp
- include/zmq.h
-Copyright: 2009-2011, 250bpm s.r.o
- 2007-2013, iMatix Corporation
- 2011, VMware, Inc
- 2007-2011, Other contributors as noted in the AUTHORS file
-License: LGPL-3.0+
-
-Files: src/pgm_receiver.*
- src/pgm_sender.*
- src/pgm_socket.*
-Copyright: 2009-2011, 250bpm s.r.o
- 2007-2013, iMatix Corporation
- 2010-2011, Miru Limited
- 2007-2011, Other contributors as noted in the AUTHORS file
-License: LGPL-3.0+
-
-Files: external/unity/*
-Copyright: 2007-2014 Mike Karlesky
-           2007-2014 Mark VanderVoord
-           2007-2014 Greg Williams
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-Files: debian/*
-Copyright: 2014-    , Laszlo Boszormenyi (GCS) <gcs@debian.org>
- 2012-2014, Alessandro Ghedini <ghedo@debian.org>
- 2010-2012, Martin Lucina <martin@lucina.net>
- 2009-2010, Adrian von Bidder <cmot@debian.org>
- 2009-2010, Peter Busser <peter@mirabilix.nl>
- 2012, Alessandro Ghedini <ghedo@debian.org>
-License: LGPL-2.0+
-
-License: LGPL-2.0+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL-2".
-
-License: LGPL-3.0+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL-3".BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
diff --git a/packaging/debian/libzmq3-dev.install b/packaging/debian/libzmq3-dev.install
deleted file mode 100644
index 4f315b7e0..000000000
--- a/packaging/debian/libzmq3-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/*/libzmq.a
-usr/lib/*/libzmq.so
-usr/lib/*/pkgconfig/libzmq.pc
diff --git a/packaging/debian/libzmq3-dev.manpages b/packaging/debian/libzmq3-dev.manpages
deleted file mode 100644
index fe4ecb45d..000000000
--- a/packaging/debian/libzmq3-dev.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man3/*
-debian/tmp/usr/share/man/man7/*
diff --git a/packaging/debian/libzmq5.docs b/packaging/debian/libzmq5.docs
deleted file mode 100644
index 3cc350b43..000000000
--- a/packaging/debian/libzmq5.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-AUTHORS
-NEWS
diff --git a/packaging/debian/libzmq5.install b/packaging/debian/libzmq5.install
deleted file mode 100644
index f0d5ab59e..000000000
--- a/packaging/debian/libzmq5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libzmq.so.*
diff --git a/packaging/debian/rules b/packaging/debian/rules
deleted file mode 100755
index b1e6abbdd..000000000
--- a/packaging/debian/rules
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-export TEST_VERBOSE=1
-
-ifeq ($(DEB_BUILD_ARCH_OS), kfreebsd)
-	DO_TEST = no
-endif
-
-DRAFTS=no
-
-# OBS build: add
-#   Macros:
-#   %_with_drafts 1
-# at the BOTTOM of the OBS prjconf
-OBS_BUILD_CFG=/.build/build.dist
-ifeq ("$(wildcard $(OBS_BUILD_CFG))","")
-BUILDCONFIG=$(shell ls -1 /usr/src/packages/SOURCES/_buildconfig* | head -n 1)
-endif
-ifneq ("$(wildcard $(OBS_BUILD_CFG))","")
-ifneq ("$(shell grep drafts $(OBS_BUILD_CFG))","")
-DRAFTS=yes
-endif
-endif
-
-# User build: DEB_BUILD_OPTIONS=drafts dpkg-buildpackage
-ifneq (,$(findstring drafts,$(DEB_BUILD_OPTIONS)))
-DRAFTS=yes
-endif
-
-# Workaround for automake < 1.14 bug
-$(shell dpkg --compare-versions `dpkg-query -W -f='$${Version}\n' automake` lt 1:1.14 && mkdir -p config)
-
-override_dh_clean:
-	dh_clean
-	find $(CURDIR) -type s -exec rm {} \;
-	rm -f $(CURDIR)/doc/*.xml $(CURDIR)/doc/*.3 $(CURDIR)/doc/*.7
-	rm -f config.log
-
-override_dh_auto_configure:
-	dh_auto_configure -- --with-pgm --with-libsodium --enable-drafts=$(DRAFTS) --with-libgssapi_krb5=yes --with-norm=yes --with-nss=yes --with-tls=yes
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-ifneq ($(DO_TEST), no)
-	dh_auto_test -- VERBOSE=1
-else
-	-dh_auto_test -- VERBOSE=1
-endif
-endif
-
-override_dh_auto_install:
-	dh_auto_install
-ifneq ("$(wildcard debian/zmq.hpp)","")
-	cp $(CURDIR)/debian/zmq.hpp $(CURDIR)/debian/tmp/usr/include/
-endif
-
-override_dh_strip:
-	dh_strip --dbg-package=libzmq5-dbg
-
-%:
-	dh $@ --with=autoreconf --parallel
-
-.PHONY: override_dh_auto_configure override_dh_strip
diff --git a/packaging/debian/source/format b/packaging/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/packaging/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/packaging/debian/zeromq.dsc.obs b/packaging/debian/zeromq.dsc.obs
deleted file mode 100644
index eeba17df0..000000000
--- a/packaging/debian/zeromq.dsc.obs
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: 3.0 (quilt)
-Source: zeromq
-Binary: libzmq5, libzmq3-dev, libzmq5-dbg
-Architecture: any
-Version: 4.3.3
-Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org>
-Homepage: http://www.zeromq.org/
-Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 9), dh-autoreconf, libkrb5-dev, libpgm-dev, libnorm-dev, libsodium-dev, libunwind-dev | libunwind8-dev | libunwind7-dev, libnss3-dev, libgnutls28-dev | libgnutls-dev, libbsd-dev, pkg-config, asciidoc-base | asciidoc, xmlto
-Package-List:
- libzmq3-dev deb libdevel optional arch=any
- libzmq5 deb libs optional arch=any
- libzmq5-dbg deb debug extra arch=any
-Files:
- e7adf4b7dbae09b28cfd10d26cd67fac 794853 zeromq.orig.tar.gz
diff --git a/packaging/nuget/package.bat b/packaging/nuget/package.bat
deleted file mode 100644
index d8096e4e3..000000000
--- a/packaging/nuget/package.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@ECHO OFF
-ECHO Started nuget packaging build.
-ECHO.
-REM http://www.nuget.org/packages/gsl
-gsl -q -script:package.gsl package.config
-ECHO.
-REM http://nuget.codeplex.com/releases
-nuget pack package.nuspec -verbosity detailed
-ECHO.
-ECHO NOTE: Ignore warnings not applicable to native code: "Issue: Assembly outside lib folder."
-ECHO.
-ECHO Completed nuget packaging build. The package is in the following folder:
-CD
-PAUSE
\ No newline at end of file
diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config
deleted file mode 100644
index 744309ade..000000000
--- a/packaging/nuget/package.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- These values are populated into the package.gsl templates by package.bat. -->
-<!-- The target attribute controls path and file name only, id controls package naming. -->
-<package id="libzmq-vc142" target="libzmq" version = "4.2.3.0" pathversion="4_2_3_0" platformtoolset="v142">
-  <!--<dependency id="libsodium_vc120" version="1.0.12.0" />-->
-</package>
\ No newline at end of file
diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl
deleted file mode 100644
index c0c3db499..000000000
--- a/packaging/nuget/package.gsl
+++ /dev/null
@@ -1,264 +0,0 @@
-.#  Generate NuGet nuspec file (for subsequent packing).
-.#
-.#  This is a code generator built using the iMatix GSL code generation
-.#  language. See https://github.com/zeromq/gsl for details. This script
-.#  is licensed under MIT/X11.
-.#
-.echo "Generating package.nuspec from template."
-.output "package.nuspec"
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
-    <metadata minClientVersion="2.5">
-        <id>$(package.id)</id>
-        <version>$(package.version)</version>
-        <title>$(package.id)</title>
-        <authors>libzmq contributors</authors>
-        <owners>Eric Voskuil</owners>
-        <licenseUrl>https://raw.github.com/zeromq/libzmq/master/COPYING.LESSER</licenseUrl>
-        <projectUrl>https://github.com/zeromq/libzmq</projectUrl>
-        <iconUrl>https://avatars1.githubusercontent.com/u/109777?s=32</iconUrl>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <developmentDependency>false</developmentDependency>
-        <description>The 0MQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products. 0MQ sockets provide an abstraction of asynchronous message queues, multiple messaging patterns, message filtering (subscriptions), seamless access to multiple transport protocols and more.</description>
-        <summary>The 0MQ lightweight messaging kernel, with tweetnacl integrated, packaged for specific Visual Studio compiler.</summary>
-        <releaseNotes>https://raw.github.com/zeromq/libzmq/master/NEWS</releaseNotes>
-        <copyright>GNU Lesser GPL v3</copyright>
-        <tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags>
-        <dependencies>
-.for dependency
-            <dependency id="$(id)" version="$(version)" />
-.endfor
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- include -->
-        
-        <file src="..\\..\\include\\*.h" target="build\\native\\include" />
-        <file src="..\\..\\builds\\msvc\\platform.hpp" target="build\\native\\include" />
-
-        <!-- targets -->
-      
-        <file src="package.targets" target="build\\native\\$(package.id).targets" />
-        <file src="package.xml" target="build\\native\\package.xml" />
-        
-        <!-- docs -->
-        
-        <!-- Documents (.*) -->
-        <!--<file src="..\\..\\docs\\*" target="build\\native\\docs" />-->
-        
-        <!-- libraries -->
-
-        <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />
-
-        <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />
-
-        <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />
-
-        <!-- x86 Export libraries (.exp) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
-
-        <!-- x86 Static libraries (.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
-
-        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
-
-        <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />
-
-        <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />
-
-        <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />
-
-        <!-- x64 Export libraries (.exp) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
-
-        <!-- x64 Static libraries (.lib) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
-
-        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
-    </files>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-</package>
-.echo "Generating package.targets from template."
-.output "package.targets"
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- user interface -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$\(MSBuildThisFileDirectory)package.xml" />
-  </ItemGroup>
-
-  <!-- general -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- ZMQ_USE_TWEETNACL defined in packaged builds and must be defined for package consumer. -->
-      <PreprocessorDefinitions>ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$\(MSBuildThisFileDirectory)include\\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$\(MSBuildThisFileDirectory)bin\\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Linkage-$(package.target))' == 'static' Or '$\(Linkage-$(package.target))' == 'ltcg'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- static libraries -->
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'static' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'static' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'static' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'static' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- static ltcg libraries -->
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'ltcg' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'ltcg' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'ltcg' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'ltcg' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <!-- dynamic import libraries -->
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- dynamic libraries with debug symbols -->
-  <Target Name="$(package.target)_AfterBuild" AfterTargets="AfterBuild" />
-  <Target Name="$(package.target)_AfterBuild_Win32_$(package.platformtoolset)_Dynamic_Release"
-          Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Release')) != -1"
-          AfterTargets="$(package.target)_AfterBuild">
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).dll" DestinationFiles="$\(TargetDir)$(package.target).dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).pdb" DestinationFiles="$\(TargetDir)$(package.target).pdb" SkipUnchangedFiles="true" />-->
-  </Target>
-  <Target Name="$(package.target)_AfterBuild_Win32_$(package.platformtoolset)_Dynamic_Debug"
-          Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Debug')) != -1"
-          AfterTargets="$(package.target)_AfterBuild">
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" DestinationFiles="$\(TargetDir)$(package.target).dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" DestinationFiles="$\(TargetDir)$(package.target).pdb" SkipUnchangedFiles="true" />
-  </Target>
-  <Target Name="$(package.target)_AfterBuild_x64_$(package.platformtoolset)_Dynamic_Release"
-          Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Release')) != -1"
-          AfterTargets="$(package.target)_AfterBuild">
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).dll" DestinationFiles="$\(TargetDir)$(package.target).dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).pdb" DestinationFiles="$\(TargetDir)$(package.target).pdb" SkipUnchangedFiles="true" />-->
-  </Target>
-  <Target Name="$(package.target)_AfterBuild_x64_$(package.platformtoolset)_Dynamic_Debug"
-          Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Debug')) != -1"
-          AfterTargets="$(package.target)_AfterBuild">
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" DestinationFiles="$\(TargetDir)$(package.target).dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" DestinationFiles="$\(TargetDir)$(package.target).pdb" SkipUnchangedFiles="true" />
-  </Target>
-
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-</Project>
-.echo "Generating package.xml (ui extension) from template."
-.output "package.xml"
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="Linkage-$(package.target)-uiextension" PageTemplate="tool" DisplayName="NuGet Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="$(package.target)" DisplayName="$(package.target)" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-$(package.target)" DisplayName="Linkage" Description="How NuGet $(package.target) will be linked into the output of this project" Category="$(package.target)">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec
deleted file mode 100644
index d1b2e2800..000000000
--- a/packaging/nuget/package.nuspec
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
-    <metadata minClientVersion="2.5">
-        <id>libzmq-vc142</id>
-        <version>4.2.3.0</version>
-        <title>libzmq-vc142</title>
-        <authors>libzmq contributors</authors>
-        <owners>Eric Voskuil</owners>
-        <licenseUrl>https://raw.github.com/zeromq/libzmq/master/COPYING.LESSER</licenseUrl>
-        <projectUrl>https://github.com/zeromq/libzmq</projectUrl>
-        <iconUrl>https://avatars1.githubusercontent.com/u/109777?s=32</iconUrl>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <developmentDependency>false</developmentDependency>
-        <description>The 0MQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products. 0MQ sockets provide an abstraction of asynchronous message queues, multiple messaging patterns, message filtering (subscriptions), seamless access to multiple transport protocols and more.</description>
-        <summary>The 0MQ lightweight messaging kernel, with tweetnacl integrated, packaged for specific Visual Studio compiler.</summary>
-        <releaseNotes>https://raw.github.com/zeromq/libzmq/master/NEWS</releaseNotes>
-        <copyright>GNU Lesser GPL v3</copyright>
-        <tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags>
-        <dependencies>
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- include -->
-
-        <file src="..\..\include\*.h" target="build\native\include" />
-        <file src="..\..\builds\msvc\platform.hpp" target="build\native\include" />
-
-        <!-- targets -->
-
-        <file src="package.targets" target="build\native\libzmq-vc142.targets" />
-        <file src="package.xml" target="build\native\package.xml" />
-
-        <!-- docs -->
-
-        <!-- Documents (.*) -->
-        <!--<file src="..\..\docs\*" target="build\native\docs" />-->
-
-        <!-- libraries -->
-
-        <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\Win32\Release\v142\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v142-mt-4_2_3_0.dll" />
-        <file src="..\..\bin\Win32\Debug\v142\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v142-mt-gd-4_2_3_0.dll" />
-
-        <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\Win32\Release\v142\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v142-mt-4_2_3_0.pdb" />-->
-        <file src="..\..\bin\Win32\Debug\v142\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v142-mt-gd-4_2_3_0.pdb" />
-
-        <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\Win32\Release\v142\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-4_2_3_0.imp.lib" />
-        <file src="..\..\bin\Win32\Debug\v142\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-gd-4_2_3_0.imp.lib" />
-
-        <!-- x86 Export libraries (.exp) -->
-        <file src="..\..\bin\Win32\Release\v142\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v142-mt-4_2_3_0.exp" />
-        <file src="..\..\bin\Win32\Debug\v142\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v142-mt-gd-4_2_3_0.exp" />
-
-        <!-- x86 Static libraries (.lib) -->
-        <file src="..\..\bin\Win32\Release\v142\static\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-s-4_2_3_0.lib" />
-        <file src="..\..\bin\Win32\Debug\v142\static\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-sgd-4_2_3_0.lib" />
-
-        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\v142\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-s-4_2_3_0.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\v142\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-sgd-4_2_3_0.ltcg.lib" />
-
-        <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\x64\Release\v142\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v142-mt-4_2_3_0.dll" />
-        <file src="..\..\bin\x64\Debug\v142\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v142-mt-gd-4_2_3_0.dll" />
-
-        <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\x64\Release\v142\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v142-mt-4_2_3_0.pdb" />-->
-        <file src="..\..\bin\x64\Debug\v142\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v142-mt-gd-4_2_3_0.pdb" />
-
-        <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\x64\Release\v142\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-4_2_3_0.imp.lib" />
-        <file src="..\..\bin\x64\Debug\v142\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-gd-4_2_3_0.imp.lib" />
-
-        <!-- x64 Export libraries (.exp) -->
-        <file src="..\..\bin\x64\Release\v142\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v142-mt-4_2_3_0.exp" />
-        <file src="..\..\bin\x64\Debug\v142\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v142-mt-gd-4_2_3_0.exp" />
-
-        <!-- x64 Static libraries (.lib) -->
-        <file src="..\..\bin\x64\Release\v142\static\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-s-4_2_3_0.lib" />
-        <file src="..\..\bin\x64\Debug\v142\static\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-sgd-4_2_3_0.lib" />
-
-        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\v142\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-s-4_2_3_0.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\v142\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-sgd-4_2_3_0.ltcg.lib" />
-    </files>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-</package>
diff --git a/packaging/nuget/package.targets b/packaging/nuget/package.targets
deleted file mode 100644
index 57813a710..000000000
--- a/packaging/nuget/package.targets
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- user interface -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)package.xml" />
-  </ItemGroup>
-
-  <!-- general -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- ZMQ_USE_TWEETNACL defined in packaged builds and must be defined for package consumer. -->
-      <PreprocessorDefinitions>ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)bin\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- static libraries -->
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-s-4_2_3_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-sgd-4_2_3_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-s-4_2_3_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-sgd-4_2_3_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- static ltcg libraries -->
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-s-4_2_3_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-sgd-4_2_3_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-s-4_2_3_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-sgd-4_2_3_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- dynamic import libraries -->
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-4_2_3_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-gd-4_2_3_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-4_2_3_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-gd-4_2_3_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- dynamic libraries with debug symbols -->
-  <Target Name="libzmq_AfterBuild" AfterTargets="AfterBuild" />
-  <Target Name="libzmq_AfterBuild_Win32_v142_Dynamic_Release"
-          Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
-          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v142-mt-4_2_3_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v142-mt-4_2_3_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
-  </Target>
-  <Target Name="libzmq_AfterBuild_Win32_v142_Dynamic_Debug"
-          Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
-          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v142-mt-gd-4_2_3_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v142-mt-gd-4_2_3_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
-  </Target>
-  <Target Name="libzmq_AfterBuild_x64_v142_Dynamic_Release"
-          Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
-          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v142-mt-4_2_3_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v142-mt-4_2_3_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
-  </Target>
-  <Target Name="libzmq_AfterBuild_x64_v142_Dynamic_Debug"
-          Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
-          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v142-mt-gd-4_2_3_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v142-mt-gd-4_2_3_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
-  </Target>
-
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-</Project>
diff --git a/packaging/nuget/package.xml b/packaging/nuget/package.xml
deleted file mode 100644
index eb8228db5..000000000
--- a/packaging/nuget/package.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="Linkage-libzmq-uiextension" PageTemplate="tool" DisplayName="NuGet Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How NuGet libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/packaging/obs/_service b/packaging/obs/_service
deleted file mode 100644
index 64f30332c..000000000
--- a/packaging/obs/_service
+++ /dev/null
@@ -1,99 +0,0 @@
-<services>
-  <service name="tar_scm">
-    <param name="url">https://github.com/zeromq/libzmq</param>
-    <param name="scm">git</param>
-    <param name="revision">@PARENT_TAG@</param>
-    <param name="versionformat">@PARENT_TAG@+git%cd</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="versionrewrite-replacement">\1</param>
-    <param name="exclude">.git</param>
-    <param name="changesgenerate">enable</param>
-    <param name="filename">zeromq</param>
-  </service>
-
-  <!-- embed zmq.hpp like Debian and Ubuntu do -->
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">zeromq/cppzmq/archive/master.zip</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*master.zip</param>
-    <param name="files">*/zmq.hpp</param>
-    <param name="outfilename">debian.zmq.hpp</param>
-  </service>
-
-  <!-- extract redhat packaging -->
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/redhat/zeromq.spec</param>
-    <param name="outfilename">zeromq.spec</param>
-  </service>
-
-  <!-- extract debian packaging -->
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/zeromq.dsc.obs</param>
-    <param name="outfilename">zeromq.dsc</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/changelog</param>
-    <param name="outfilename">debian.changelog</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/compat</param>
-    <param name="outfilename">debian.compat</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/control</param>
-    <param name="outfilename">debian.control</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/copyright</param>
-    <param name="outfilename">debian.copyright</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/source/format</param>
-    <param name="outfilename">debian.format</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/rules</param>
-    <param name="outfilename">debian.rules</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/libzmq3-dev.install</param>
-    <param name="outfilename">debian.libzmq3-dev.install</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/libzmq3-dev.manpages</param>
-    <param name="outfilename">debian.libzmq3-dev.manpages</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/libzmq5.docs</param>
-    <param name="outfilename">debian.libzmq5.docs</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/libzmq5.install</param>
-    <param name="outfilename">debian.libzmq5.install</param>
-  </service>
-
-  <service name="set_version">
-    <param name="basename">zeromq</param>
-  </service>
-
-  <service name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-</services>
-
diff --git a/packaging/redhat/zeromq.spec b/packaging/redhat/zeromq.spec
deleted file mode 100644
index 64600e667..000000000
--- a/packaging/redhat/zeromq.spec
+++ /dev/null
@@ -1,310 +0,0 @@
-# To build with draft APIs, use "--with drafts" in rpmbuild for local builds or add
-#   Macros:
-#   %_with_drafts 1
-# at the BOTTOM of the OBS prjconf
-%bcond_with drafts
-%if %{with drafts}
-%define DRAFTS yes
-%else
-%define DRAFTS no
-%endif
-%define lib_name libzmq5
-Name:          zeromq
-Version:       4.3.3
-Release:       1%{?dist}
-Summary:       The ZeroMQ messaging library
-Group:         Applications/Internet
-License:       LGPLv3+
-URL:           http://www.zeromq.org/
-Source:        http://download.zeromq.org/%{name}-%{version}.tar.gz
-Prefix:        %{_prefix}
-Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  autoconf automake libtool glib2-devel libbsd-devel
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-BuildRequires:  e2fsprogs-devel
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-%endif
-%bcond_with pgm
-%if %{with pgm}
-BuildRequires:  openpgm-devel
-%define PGM yes
-%else
-%define PGM no
-%endif
-%bcond_with libgssapi_krb5
-%if %{with libgssapi_krb5}
-BuildRequires:  krb5-devel
-%define GSSAPI yes
-%else
-%define GSSAPI no
-%endif
-%bcond_with libsodium
-%if %{with libsodium}
-BuildRequires:  libsodium-devel
-%define SODIUM yes
-%else
-%define SODIUM no
-%endif
-%bcond_with nss
-%if %{with nss}
-%if 0%{?suse_version}
-BuildRequires:  mozilla-nss-devel
-%else
-BuildRequires:  nss-devel
-%endif
-%define NSS yes
-%else
-%define NSS no
-%endif
-%bcond_with tls
-%if %{with tls} && ! 0%{?centos_version} < 700
-%if 0%{?suse_version}
-BuildRequires:  libgnutls-devel
-%else
-BuildRequires:  gnutls-devel
-%endif
-%define TLS yes
-%else
-%define TLS no
-%endif
-BuildRequires: gcc, make, gcc-c++, libstdc++-devel, asciidoc, xmlto
-Requires:      libstdc++
-
-#
-# Conditional build options
-# Default values are:
-#    --without-libgssapi_krb5
-#    --without-libsodium
-#    --without-pgm
-#
-
-# If neither macro exists, use the default value.
-%{!?_with_libgssapi_krb5: %{!?_without_libgssapi_krb5: %define _without_libgssapi_krb5 --without-liblibgssapi_krb5}}
-%{!?_with_libsodium: %{!?_without_libsodium: %define _without_libsodium --without-libsodium}}
-%{!?_with_pgm: %{!?_without_pgm: %define _without_pgm --without-pgm}}
-%{!?_with_nss: %{!?_without_nss: %define _without_nss --without-nss}}
-
-# It's an error if both --with and --without options are specified
-%{?_with_libgssapi_krb5: %{?_without_libgssapi_krb5: %{error: both _with_libgssapi_krb5 and _without_libgssapi_krb5}}}
-%{?_with_libsodium: %{?_without_libsodium: %{error: both _with_libsodium and _without_libsodium}}}
-%{?_with_pgm: %{?_without_pgm: %{error: both _with_pgm and _without_pgm}}}
-
-%{?_with_libgssapi_krb5:BuildRequires: krb5-devel}
-%{?_with_libgssapi_krb5:Requires: krb5-libs}
-
-%{?_with_libsodium:BuildRequires: libsodium-devel}
-%{?_with_libsodium:Requires: libsodium}
-
-%{?_with_pgm:BuildRequires: openpgm-devel}
-%{?_with_pgm:Requires: openpgm}
-
-%if 0%{?suse_version}
-%{?_with_nss:BuildRequires: mozilla-nss-devel}
-%{?_with_nss:Requires: mozilla-nss}
-%else
-%{?_with_nss:BuildRequires: nss-devel}
-%{?_with_nss:Requires: nss}
-%endif
-
-%if ! 0%{?centos_version} < 700
-%if 0%{?suse_version}
-%{?_with_tls:BuildRequires: libgnutls-devel}
-%else
-%{?_with_tls:BuildRequires: gnutls-devel}
-%endif
-%{?_with_tls:Requires: gnutls}
-%endif
-
-%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
-%{!?_with_pic: %{!?_without_pic: %define _with_pic --with-pic}}
-%{!?_with_gnu_ld: %{!?_without_gnu_ld: %define _with_gnu_ld --with-gnu_ld}}
-%endif
-
-# We do not want to ship libzmq.la
-%define _unpackaged_files_terminate_build 0
-
-%description
-The 0MQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. 0MQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging
-patterns, message filtering (subscriptions), seamless access to
-multiple transport protocols and more.
-
-%package -n %{lib_name}
-Summary:   Shared Library for ZeroMQ
-Group:     Productivity/Networking/Web/Servers
-Conflicts: zeromq
-
-%description -n %{lib_name}
-The 0MQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. 0MQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging
-patterns, message filtering (subscriptions), seamless access to
-multiple transport protocols and more.
-
-This package contains the ZeroMQ shared library.
-
-%package devel
-Summary:  Development files and static library for the ZeroMQ library
-Group:    Development/Libraries
-Requires: %{lib_name} = %{version}-%{release}, pkgconfig
-%bcond_with pgm
-%if %{with pgm}
-Requires:  openpgm-devel
-%endif
-%bcond_with libgssapi_krb5
-%if %{with libgssapi_krb5}
-Requires:  krb5-devel
-%endif
-%bcond_with libsodium
-%if %{with libsodium}
-Requires:  libsodium-devel
-%endif
-%bcond_with nss
-%if %{with nss}
-%if 0%{?suse_version}
-Requires:  mozilla-nss-devel
-%else
-Requires:  nss-devel
-%endif
-%endif
-%bcond_with tls
-%if %{with tls} && ! 0%{?centos_version} < 700
-%if 0%{?suse_version}
-Requires:  libgnutls-devel
-%else
-Requires:  gnutls-devel
-%endif
-%endif
-
-%description devel
-The 0MQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. 0MQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging
-patterns, message filtering (subscriptions), seamless access to
-multiple transport protocols and more.
-
-This package contains ZeroMQ related development libraries and header files.
-
-%package -n libzmq-tools
-Summary:   ZeroMQ tools
-Group:     Productivity/Networking/Web/Servers
-
-%description -n libzmq-tools
-The 0MQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. 0MQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging
-patterns, message filtering (subscriptions), seamless access to
-multiple transport protocols and more.
-
-This package contains tools such as curve_keygen to use with libzmq.
-
-%prep
-%setup -q
-
-# Sed version number of openpgm into configure
-%global openpgm_pc $(basename %{_libdir}/pkgconfig/openpgm*.pc .pc)
-sed -i "s/openpgm-[0-9].[0-9]/%{openpgm_pc}/g" \
-    configure*
-
-%build
-# Workaround for automake < 1.14 bug
-mkdir -p config
-autoreconf -fi
-%configure --enable-drafts=%{DRAFTS} \
-    --with-pgm=%{PGM} \
-    --with-libsodium=%{SODIUM} \
-    --with-libgssapi_krb5=%{GSSAPI} \
-    --with-nss=%{NSS} \
-    --with-tls=%{TLS} \
-    %{?_with_pic} \
-    %{?_without_pic} \
-    %{?_with_gnu_ld} \
-    %{?_without_gnu_ld}
-
-%{__make} %{?_smp_mflags}
-
-%install
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-
-# Install the package to build area
-%{__make} check VERBOSE=1
-%makeinstall
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-
-%files -n %{lib_name}
-%defattr(-,root,root,-)
-
-# docs in the main package
-%doc AUTHORS COPYING COPYING.LESSER NEWS
-
-# libraries
-%{_libdir}/libzmq.so.*
-
-%{_mandir}/man7/zmq.7.gz
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/zmq.h
-%{_includedir}/zmq_utils.h
-
-%{_libdir}/libzmq.a
-%{_libdir}/pkgconfig/libzmq.pc
-%{_libdir}/libzmq.so
-
-%{_mandir}/man3/zmq*
-# skip man7/zmq.7.gz
-%{_mandir}/man7/zmq_*
-
-%files -n libzmq-tools
-%defattr(-,root,root,-)
-%{_bindir}/curve_keygen
-
-%changelog
-* Fri Oct 4 2019 Luca Boccassi <luca.boccassi@gmail.com>
-- Add macro for optional TLS dependency
-
-* Wed Sep 11 2019 Luca Boccassi <luca.boccassi@gmail.com>
-- Add macro for optional NSS dependency
-
-* Sat Aug 19 2017 Luca Boccassi <luca.boccassi@gmail.com>
-- Fix parsing and usage of conditionals for sodium/pgm/krb5 so that they work
-  in OBS
-- Do not ship libzmq.la anymore, it's not needed and causes overlinking
-
-* Sun Nov 06 2016 Luca Boccassi <luca.boccassi@gmail.com>
-- Add libzmq-tool to package curve_keygen in /usr/bin
-
-* Sun Jul 31 2016 Luca Boccassi <luca.boccassi@gmail.com>
-- Follow RPM standards and rename zeromq to libzmq5
-
-* Sat Oct 25 2014 Phillip Mienk <mienkphi@gmail.com>
-- Add --with/--without libgssapi_krb5 support following J.T.Conklin's pattern
-
-* Sat Oct 18 2014 J.T. Conklin <jtc@acorntoolworks.com>
-- Add --with/--without pgm support
-- Add --with/--without libsodium support
-
-* Tue Jun 10 2014 Tristian Celestin <tristian.celestin@outlook.com> 4.0.4
-- Updated packaged files
-
-* Mon Nov 26 2012 Justin Cook <jhcook@gmail.com> 3.2.2
-- Update packaged files
-
-* Fri Apr 8 2011 Mikko Koppanen <mikko@kuut.io> 3.0.0-1
-- Update dependencies and packaged files
-
-* Sat Apr 10 2010 Mikko Koppanen <mkoppanen@php.net> 2.0.7-1
-- Initial packaging
diff --git a/perf/benchmark_radix_tree.cpp b/perf/benchmark_radix_tree.cpp
deleted file mode 100644
index 432d535fe..000000000
--- a/perf/benchmark_radix_tree.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#if __cplusplus >= 201103L
-
-#include "radix_tree.hpp"
-#include "trie.hpp"
-
-#include <chrono>
-#include <cstddef>
-#include <cstdio>
-#include <random>
-#include <ratio>
-#include <vector>
-
-const std::size_t nkeys = 10000;
-const std::size_t nqueries = 1000000;
-const std::size_t warmup_runs = 10;
-const std::size_t samples = 10;
-const std::size_t key_length = 20;
-const char *chars = "abcdefghijklmnopqrstuvwxyz0123456789";
-const int chars_len = 36;
-
-template <class T>
-void benchmark_lookup (T &subscriptions_,
-                       std::vector<unsigned char *> &queries_)
-{
-    using namespace std::chrono;
-    std::vector<duration<long, std::nano> > samples_vec;
-    samples_vec.reserve (samples);
-
-    for (std::size_t run = 0; run < warmup_runs; ++run) {
-        for (auto &query : queries_)
-            subscriptions_.check (query, key_length);
-    }
-
-    for (std::size_t run = 0; run < samples; ++run) {
-        duration<long, std::nano> interval (0);
-        for (auto &query : queries_) {
-            auto start = steady_clock::now ();
-            subscriptions_.check (query, key_length);
-            auto end = steady_clock::now ();
-            interval += end - start;
-        }
-        samples_vec.push_back (interval / queries_.size ());
-    }
-
-    std::size_t sum = 0;
-    for (const auto &sample : samples_vec)
-        sum += sample.count ();
-    std::printf ("Average lookup time = %.1lf ns\n",
-                 static_cast<double> (sum) / samples);
-}
-
-int main ()
-{
-    // Generate input set.
-    std::minstd_rand rng (123456789);
-    std::vector<unsigned char *> input_set;
-    std::vector<unsigned char *> queries;
-    input_set.reserve (nkeys);
-    queries.reserve (nqueries);
-
-    for (std::size_t i = 0; i < nkeys; ++i) {
-        unsigned char *key = new unsigned char[key_length];
-        for (std::size_t j = 0; j < key_length; j++)
-            key[j] = static_cast<unsigned char> (chars[rng () % chars_len]);
-        input_set.emplace_back (key);
-    }
-    for (std::size_t i = 0; i < nqueries; ++i)
-        queries.push_back (input_set[rng () % nkeys]);
-
-    // Initialize both data structures.
-    //
-    // Keeping initialization out of the benchmarking function helps
-    // heaptrack detect peak memory consumption of the radix tree.
-    zmq::trie_t trie;
-    zmq::radix_tree_t radix_tree;
-    for (auto &key : input_set) {
-        trie.add (key, key_length);
-        radix_tree.add (key, key_length);
-    }
-
-    // Create a benchmark.
-    std::printf ("keys = %llu, queries = %llu, key size = %llu\n",
-                 static_cast<unsigned long long> (nkeys),
-                 static_cast<unsigned long long> (nqueries),
-                 static_cast<unsigned long long> (key_length));
-    std::puts ("[trie]");
-    benchmark_lookup (trie, queries);
-
-    std::puts ("[radix_tree]");
-    benchmark_lookup (radix_tree, queries);
-
-    for (auto &op : input_set)
-        delete[] op;
-}
-
-#else
-
-int main ()
-{
-}
-
-#endif
diff --git a/perf/generate_csv.sh b/perf/generate_csv.sh
deleted file mode 100755
index d307f29e4..000000000
--- a/perf/generate_csv.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-
-#
-# This script assumes that 2 machines are used to generate performance results.
-# First machine is assumed to be the one where this script runs.
-# Second machine is the "REMOTE_IP_SSH" machine; we assume to have passwordless SSH access.
-#
-# Usage example:
-#    export REMOTE_IP_SSH=10.0.0.1
-#    export LOCAL_TEST_ENDPOINT="tcp://192.168.1.1:1234"
-#    export REMOTE_TEST_ENDPOINT="tcp://192.168.1.2:1234"
-#    export REMOTE_LIBZMQ_PATH="/home/fmontorsi/libzmq/perf"
-#    ./generate_csv.sh
-#
-
-set -u
-
-# configurable values (via environment variables):
-REMOTE_IP_SSH=${REMOTE_IP_SSH:-127.0.0.1}
-REMOTE_LIBZMQ_PATH=${REMOTE_LIBZMQ_PATH:-/root/libzmq/perf}
-LOCAL_TEST_ENDPOINT=${LOCAL_TEST_ENDPOINT:-tcp://192.168.1.1:1234}
-REMOTE_TEST_ENDPOINT=${REMOTE_TEST_ENDPOINT:-tcp://192.168.1.2:1234}
-
-# constant values:
-MESSAGE_SIZE_LIST="8 16 32 64 128 256 512 1024 2048 4096 8192 16384 32768 65536 131072"
-OUTPUT_DIR="results"
-OUTPUT_FILE_PREFIX="results.txt"
-OUTPUT_FILE_CSV_PREFIX="results.csv"
-
-
-# utility functions:
-
-function verify_ssh()
-{
-    ssh $REMOTE_IP_SSH "ls /" >/dev/null
-    if [ $? -ne 0 ]; then
-        echo "Cannot connect via SSH passwordless to the REMOTE_IP_SSH $REMOTE_IP_SSH. Please fix the problem and retry."
-        exit 2
-    fi
-
-    ssh $REMOTE_IP_SSH "ls $REMOTE_LIBZMQ_PATH" >/dev/null
-    if [ $? -ne 0 ]; then
-        echo "The folder $REMOTE_LIBZMQ_PATH is not valid. Please fix the problem and retry."
-        exit 2
-    fi
-
-    echo "SSH connection to the remote $REMOTE_IP_SSH is working fine."
-}
-
-function run_remote_perf_util()
-{
-    local MESSAGE_SIZE_BYTES="$1"
-    local REMOTE_PERF_UTIL="$2"
-    local NUM_MESSAGES="$3"
-
-    echo "Launching on $REMOTE_IP_SSH the utility [$REMOTE_PERF_UTIL] for messages ${MESSAGE_SIZE_BYTES}B long"
-    ssh $REMOTE_IP_SSH "$REMOTE_LIBZMQ_PATH/$REMOTE_PERF_UTIL $TEST_ENDPOINT $MESSAGE_SIZE_BYTES $NUM_MESSAGES" &
-    if [ $? -ne 0 ]; then
-        echo "Failed to launch remote perf util."
-        exit 2
-    fi
-}
-
-function generate_output_file()
-{
-    local LOCAL_PERF_UTIL="$1"     # must be the utility generating the TXT output
-    local REMOTE_PERF_UTIL="$2"
-    local OUTPUT_FILE_PREFIX="$3"
-    local NUM_MESSAGES="$4"
-    local CSV_HEADER_LINE="$5"
-
-    # derived values:
-    local OUTPUT_FILE_TXT="${OUTPUT_DIR}/${OUTPUT_FILE_PREFIX}.txt"         # useful just for human-friendly debugging
-    local OUTPUT_FILE_CSV="${OUTPUT_DIR}/${OUTPUT_FILE_PREFIX}.csv"     # actually used to later produce graphs
-    local MESSAGE_SIZE_ARRAY=($MESSAGE_SIZE_LIST)
-
-    echo "Killing still-running ZMQ performance utils, if any"
-    pkill $LOCAL_PERF_UTIL                       # in case it's running from a previous test
-    if [ ! -z "$REMOTE_PERF_UTIL" ]; then
-        ssh $REMOTE_IP_SSH "pkill $REMOTE_PERF_UTIL"     # in case it's running from a previous test
-    fi
-
-    echo "Resetting output file $OUTPUT_FILE_TXT and $OUTPUT_FILE_CSV"
-    mkdir -p ${OUTPUT_DIR}
-    > $OUTPUT_FILE_TXT
-    echo "$CSV_HEADER_LINE" > $OUTPUT_FILE_CSV
-
-    for MESSAGE_SIZE in ${MESSAGE_SIZE_ARRAY[@]}; do
-        echo "Launching locally the utility [$LOCAL_PERF_UTIL] for messages ${MESSAGE_SIZE}B long"
-        ./$LOCAL_PERF_UTIL $TEST_ENDPOINT $MESSAGE_SIZE $NUM_MESSAGES >${OUTPUT_FILE_TXT}-${MESSAGE_SIZE} &
-
-        if [ ! -z "$REMOTE_PERF_UTIL" ]; then
-            run_remote_perf_util $MESSAGE_SIZE $REMOTE_PERF_UTIL $NUM_MESSAGES
-        fi
-        wait
-
-        # produce the complete human-readable output file:
-        cat ${OUTPUT_FILE_TXT}-${MESSAGE_SIZE} >>${OUTPUT_FILE_TXT}
-
-        # produce a machine-friendly file for later plotting:
-        local DATALINE="$(cat ${OUTPUT_FILE_TXT}-${MESSAGE_SIZE} | grep -o '[0-9.]*' | tr '\n' ',')"
-        echo ${DATALINE::-1} >>$OUTPUT_FILE_CSV
-        rm -f ${OUTPUT_FILE_TXT}-${MESSAGE_SIZE}
-    done
-
-    echo "All measurements completed and saved into $OUTPUT_FILE_TXT and $OUTPUT_FILE_CSV"
-}
-
-
-
-# main:
-
-verify_ssh
-
-THROUGHPUT_CSV_HEADER_LINE="# message_size,message_count,PPS[msg/s],throughput[Mb/s]"
-
-# PUSH/PULL TCP throughput CSV file:
-TEST_ENDPOINT="$LOCAL_TEST_ENDPOINT"
-generate_output_file "local_thr" "remote_thr" \
-    "pushpull_tcp_thr_results" \
-    "1000000" \
-    "$THROUGHPUT_CSV_HEADER_LINE"
-
-# PUSH/PULL INPROC throughput CSV file:
-# NOTE: in this case there is no remote utility to run and no ENDPOINT to provide:
-TEST_ENDPOINT=""  # inproc does not require any endpoint
-generate_output_file "inproc_thr" "" \
-    "pushpull_inproc_thr_results" \
-    "10000000" \
-    "$THROUGHPUT_CSV_HEADER_LINE"
-
-# PUB/SUB proxy INPROC throughput CSV file:
-# NOTE: in this case there is no remote utility to run and no ENDPOINT to provide:
-TEST_ENDPOINT="" # inproc does	not require any	endpoint
-generate_output_file "proxy_thr" "" \
-    "pubsubproxy_inproc_thr_results" \
-    "10000000" \
-    "$THROUGHPUT_CSV_HEADER_LINE"
-
-
-# REQ/REP TCP latency CSV file:
-# NOTE: in this case it's the remote_lat utility that prints out the data, so we swap the local/remote arguments to the bash func:
-TEST_ENDPOINT="$REMOTE_TEST_ENDPOINT"
-generate_output_file "remote_lat" "local_lat" \
-    "reqrep_tcp_lat_results" \
-    "10000" \
-    "# message_size,message_count,latency[us]"
diff --git a/perf/generate_graphs.py b/perf/generate_graphs.py
deleted file mode 100755
index 20651b716..000000000
--- a/perf/generate_graphs.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/python3
-
-#
-# This script assumes that the set of CSV files produced by "generate_csv.sh" is provided as input
-# and that locally there is the "results" folder.
-#
-
-# results for TCP:
-INPUT_FILE_PUSHPULL_TCP_THROUGHPUT="results/pushpull_tcp_thr_results.csv"
-INPUT_FILE_REQREP_TCP_LATENCY="results/reqrep_tcp_lat_results.csv"
-TCP_LINK_GPBS=100
-
-# results for INPROC:
-INPUT_FILE_PUSHPULL_INPROC_THROUGHPUT="results/pushpull_inproc_thr_results.csv"
-INPUT_FILE_PUBSUBPROXY_INPROC_THROUGHPUT="results/pubsubproxy_inproc_thr_results.csv"
-
-
-# dependencies
-#
-# pip3 install matplotlib
-#
-
-import matplotlib.pyplot as plt
-import numpy as np
-
-
-# functions
-
-def plot_throughput(csv_filename, title, is_tcp=False):
-    message_size_bytes, message_count, pps, mbps = np.loadtxt(csv_filename, delimiter=',', unpack=True)
-
-    fig, ax1 = plt.subplots()
-
-    # PPS axis
-    color = 'tab:red'
-    ax1.set_xlabel('Message size [B]')
-    ax1.set_ylabel('PPS [Mmsg/s]', color=color)
-    ax1.semilogx(message_size_bytes, pps / 1e6, label='PPS [Mmsg/s]', marker='x', color=color)
-    ax1.tick_params(axis='y', labelcolor=color)
-
-    # GBPS axis
-    color = 'tab:blue'
-    ax2 = ax1.twinx()  # instantiate a second axes that shares the same x-axis
-    ax2.set_ylabel('Throughput [Gb/s]', color=color)
-    ax2.semilogx(message_size_bytes, mbps / 1e3, label='Throughput [Gb/s]', marker='o')
-    if is_tcp:
-        ax2.set_yticks(np.arange(0, TCP_LINK_GPBS + 1, TCP_LINK_GPBS/10)) 
-    ax2.tick_params(axis='y', labelcolor=color)
-    ax2.grid(True)
-    
-    plt.title(title)
-    fig.tight_layout()  # otherwise the right y-label is slightly clippe
-    plt.savefig(csv_filename.replace('.csv', '.png'))
-    plt.show()
-
-def plot_latency(csv_filename, title):
-    message_size_bytes, message_count, lat = np.loadtxt(csv_filename, delimiter=',', unpack=True)
-    plt.semilogx(message_size_bytes, lat, label='Latency [us]', marker='o')
-    
-    plt.xlabel('Message size [B]')
-    plt.ylabel('Latency [us]')
-    plt.grid(True)
-    plt.title(title)
-    plt.savefig(csv_filename.replace('.csv', '.png'))
-    plt.show()
-
-
-# main
-
-plot_throughput(INPUT_FILE_PUSHPULL_TCP_THROUGHPUT, 'ZeroMQ PUSH/PULL socket throughput, TCP transport', is_tcp=True)
-plot_throughput(INPUT_FILE_PUSHPULL_INPROC_THROUGHPUT, 'ZeroMQ PUSH/PULL socket throughput, INPROC transport')
-plot_throughput(INPUT_FILE_PUBSUBPROXY_INPROC_THROUGHPUT, 'ZeroMQ PUB/SUB PROXY socket throughput, INPROC transport')
-plot_latency(INPUT_FILE_REQREP_TCP_LATENCY, 'ZeroMQ REQ/REP socket latency, TCP transport')
diff --git a/perf/inproc_lat.cpp b/perf/inproc_lat.cpp
deleted file mode 100644
index bf89e9983..000000000
--- a/perf/inproc_lat.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include <windows.h>
-#include <process.h>
-#else
-#include <pthread.h>
-#endif
-
-static size_t message_size;
-static int roundtrip_count;
-
-#if defined ZMQ_HAVE_WINDOWS
-static unsigned int __stdcall worker (void *ctx_)
-#else
-static void *worker (void *ctx_)
-#endif
-{
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-
-    s = zmq_socket (ctx_, ZMQ_REP);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    rc = zmq_connect (s, "inproc://lat_test");
-    if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    rc = zmq_msg_init (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-    }
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    return 0;
-#else
-    return NULL;
-#endif
-}
-
-int main (int argc, char *argv[])
-{
-#if defined ZMQ_HAVE_WINDOWS
-    HANDLE local_thread;
-#else
-    pthread_t local_thread;
-#endif
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    void *watch;
-    unsigned long elapsed;
-    double latency;
-
-    if (argc != 3) {
-        printf ("usage: inproc_lat <message-size> <roundtrip-count>\n");
-        return 1;
-    }
-
-    message_size = atoi (argv[1]);
-    roundtrip_count = atoi (argv[2]);
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_REQ);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_bind (s, "inproc://lat_test");
-    if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    local_thread = (HANDLE) _beginthreadex (NULL, 0, worker, ctx, 0, NULL);
-    if (local_thread == 0) {
-        printf ("error in _beginthreadex\n");
-        return -1;
-    }
-#else
-    rc = pthread_create (&local_thread, NULL, worker, ctx);
-    if (rc != 0) {
-        printf ("error in pthread_create: %s\n", zmq_strerror (rc));
-        return -1;
-    }
-#endif
-
-    rc = zmq_msg_init_size (&msg, message_size);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-    memset (zmq_msg_data (&msg), 0, message_size);
-
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("roundtrip count: %d\n", (int) roundtrip_count);
-
-    watch = zmq_stopwatch_start ();
-
-    for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-    }
-
-    elapsed = zmq_stopwatch_stop (watch);
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    latency = (double) elapsed / (roundtrip_count * 2);
-
-#if defined ZMQ_HAVE_WINDOWS
-    DWORD rc2 = WaitForSingleObject (local_thread, INFINITE);
-    if (rc2 == WAIT_FAILED) {
-        printf ("error in WaitForSingleObject\n");
-        return -1;
-    }
-    BOOL rc3 = CloseHandle (local_thread);
-    if (rc3 == 0) {
-        printf ("error in CloseHandle\n");
-        return -1;
-    }
-#else
-    rc = pthread_join (local_thread, NULL);
-    if (rc != 0) {
-        printf ("error in pthread_join: %s\n", zmq_strerror (rc));
-        return -1;
-    }
-#endif
-
-    printf ("average latency: %.3f [us]\n", (double) latency);
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/perf/inproc_thr.cpp b/perf/inproc_thr.cpp
deleted file mode 100644
index 2dcf64228..000000000
--- a/perf/inproc_thr.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
-    Copyright (c) 2007-2012 iMatix Corporation
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include <windows.h>
-#include <process.h>
-#else
-#include <pthread.h>
-#endif
-
-static int message_count;
-static size_t message_size;
-
-#if defined ZMQ_HAVE_WINDOWS
-static unsigned int __stdcall worker (void *ctx_)
-#else
-static void *worker (void *ctx_)
-#endif
-{
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-
-    s = zmq_socket (ctx_, ZMQ_PUSH);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    rc = zmq_connect (s, "inproc://thr_test");
-    if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    for (i = 0; i != message_count; i++) {
-        rc = zmq_msg_init_size (&msg, message_size);
-        if (rc != 0) {
-            printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-#if defined ZMQ_MAKE_VALGRIND_HAPPY
-        memset (zmq_msg_data (&msg), 0, message_size);
-#endif
-
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-        rc = zmq_msg_close (&msg);
-        if (rc != 0) {
-            printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-    }
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    return 0;
-#else
-    return NULL;
-#endif
-}
-
-int main (int argc, char *argv[])
-{
-#if defined ZMQ_HAVE_WINDOWS
-    HANDLE local_thread;
-#else
-    pthread_t local_thread;
-#endif
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    void *watch;
-    unsigned long elapsed;
-    unsigned long throughput;
-    double megabits;
-
-    if (argc != 3) {
-        printf ("usage: inproc_thr <message-size> <message-count>\n");
-        return 1;
-    }
-
-    message_size = atoi (argv[1]);
-    message_count = atoi (argv[2]);
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_PULL);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_bind (s, "inproc://thr_test");
-    if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    local_thread = (HANDLE) _beginthreadex (NULL, 0, worker, ctx, 0, NULL);
-    if (local_thread == 0) {
-        printf ("error in _beginthreadex\n");
-        return -1;
-    }
-#else
-    rc = pthread_create (&local_thread, NULL, worker, ctx);
-    if (rc != 0) {
-        printf ("error in pthread_create: %s\n", zmq_strerror (rc));
-        return -1;
-    }
-#endif
-
-    rc = zmq_msg_init (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("message count: %d\n", (int) message_count);
-
-    rc = zmq_recvmsg (s, &msg, 0);
-    if (rc < 0) {
-        printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-    if (zmq_msg_size (&msg) != message_size) {
-        printf ("message of incorrect size received\n");
-        return -1;
-    }
-
-    watch = zmq_stopwatch_start ();
-
-    for (i = 0; i != message_count - 1; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-    }
-
-    elapsed = zmq_stopwatch_stop (watch);
-    if (elapsed == 0)
-        elapsed = 1;
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    DWORD rc2 = WaitForSingleObject (local_thread, INFINITE);
-    if (rc2 == WAIT_FAILED) {
-        printf ("error in WaitForSingleObject\n");
-        return -1;
-    }
-    BOOL rc3 = CloseHandle (local_thread);
-    if (rc3 == 0) {
-        printf ("error in CloseHandle\n");
-        return -1;
-    }
-#else
-    rc = pthread_join (local_thread, NULL);
-    if (rc != 0) {
-        printf ("error in pthread_join: %s\n", zmq_strerror (rc));
-        return -1;
-    }
-#endif
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    throughput =
-      (unsigned long) ((double) message_count / (double) elapsed * 1000000);
-    megabits = (double) (throughput * message_size * 8) / 1000000;
-
-    printf ("mean throughput: %d [msg/s]\n", (int) throughput);
-    printf ("mean throughput: %.3f [Mb/s]\n", (double) megabits);
-
-    return 0;
-}
diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp
deleted file mode 100644
index dc14cc30d..000000000
--- a/perf/local_lat.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-int main (int argc, char *argv[])
-{
-    const char *bind_to;
-    int roundtrip_count;
-    size_t message_size;
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-
-    if (argc != 4) {
-        printf ("usage: local_lat <bind-to> <message-size> "
-                "<roundtrip-count>\n");
-        return 1;
-    }
-    bind_to = argv[1];
-    message_size = atoi (argv[2]);
-    roundtrip_count = atoi (argv[3]);
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_REP);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_bind (s, bind_to);
-    if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_msg_init (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-    }
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    zmq_sleep (1);
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp
deleted file mode 100644
index 07dd75b13..000000000
--- a/perf/local_thr.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-// keys are arbitrary but must match remote_lat.cpp
-const char server_prvkey[] = "{X}#>t#jRGaQ}gMhv=30r(Mw+87YGs+5%kh=i@f8";
-
-int main (int argc, char *argv[])
-{
-    const char *bind_to;
-    int message_count;
-    size_t message_size;
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    void *watch;
-    unsigned long elapsed;
-    double throughput;
-    double megabits;
-    int curve = 0;
-
-    if (argc != 4 && argc != 5) {
-        printf ("usage: local_thr <bind-to> <message-size> <message-count> "
-                "[<enable_curve>]\n");
-        return 1;
-    }
-    bind_to = argv[1];
-    message_size = atoi (argv[2]);
-    message_count = atoi (argv[3]);
-    if (argc >= 5 && atoi (argv[4])) {
-        curve = 1;
-    }
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_PULL);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    //  Add your socket options here.
-    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
-    if (curve) {
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SECRETKEY, server_prvkey,
-                             sizeof (server_prvkey));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        int server = 1;
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SERVER, &server, sizeof (int));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-    }
-
-    rc = zmq_bind (s, bind_to);
-    if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_msg_init (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_recvmsg (s, &msg, 0);
-    if (rc < 0) {
-        printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-    if (zmq_msg_size (&msg) != message_size) {
-        printf ("message of incorrect size received\n");
-        return -1;
-    }
-
-    watch = zmq_stopwatch_start ();
-
-    for (i = 0; i != message_count - 1; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-    }
-
-    elapsed = zmq_stopwatch_stop (watch);
-    if (elapsed == 0)
-        elapsed = 1;
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    throughput = ((double) message_count / (double) elapsed * 1000000);
-    megabits = ((double) throughput * message_size * 8) / 1000000;
-
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("message count: %d\n", (int) message_count);
-    printf ("mean throughput: %d [msg/s]\n", (int) throughput);
-    printf ("mean throughput: %.3f [Mb/s]\n", (double) megabits);
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/perf/proxy_thr.cpp b/perf/proxy_thr.cpp
deleted file mode 100644
index 7e9ea14e7..000000000
--- a/perf/proxy_thr.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "../include/zmq.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <time.h>
-#include <stdarg.h>
-#include <string.h>
-#include <string>
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include <windows.h>
-#include <process.h>
-#else
-#include <pthread.h>
-#include <unistd.h>
-#endif
-
-
-/*
-   Asynchronous proxy benchmark using ZMQ_XPUB_NODROP.
-
-   Topology:
-
-     XPUB                      SUB
-      |                         |
-      +-----> XSUB -> XPUB -----/
-      |       ^^^^^^^^^^^^
-     XPUB      ZMQ proxy
-
-   All connections use "inproc" transport. The two XPUB sockets start
-   flooding the proxy. The throughput is computed using the bytes received
-   in the SUB socket.
-*/
-
-
-#define HWM 10000
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof (x) / sizeof (*x))
-#endif
-
-#define TEST_ASSERT_SUCCESS_ERRNO(expr)                                        \
-    test_assert_success_message_errno_helper (expr, NULL, #expr)
-
-// This macro is used to avoid-variable warning. If used with an expression,
-// the sizeof is not evaluated to avoid polluting the assembly code.
-#ifdef NDEBUG
-#define ASSERT_EXPR_SAFE(x)                                                    \
-    do {                                                                       \
-        (void) sizeof (x);                                                     \
-    } while (0)
-#else
-#define ASSERT_EXPR_SAFE(x) assert (x)
-#endif
-
-
-static uint64_t message_count = 0;
-static size_t message_size = 0;
-
-
-typedef struct
-{
-    void *context;
-    int thread_idx;
-    const char *frontend_endpoint[4];
-    const char *backend_endpoint[4];
-    const char *control_endpoint;
-} proxy_hwm_cfg_t;
-
-
-int test_assert_success_message_errno_helper (int rc_,
-                                              const char *msg_,
-                                              const char *expr_)
-{
-    if (rc_ == -1) {
-        char buffer[512];
-        buffer[sizeof (buffer) - 1] =
-          0; //  to ensure defined behavior with VC++ <= 2013
-        printf ("%s failed%s%s%s, errno = %i (%s)", expr_,
-                msg_ ? " (additional info: " : "", msg_ ? msg_ : "",
-                msg_ ? ")" : "", zmq_errno (), zmq_strerror (zmq_errno ()));
-        exit (1);
-    }
-    return rc_;
-}
-
-static void set_hwm (void *skt)
-{
-    int hwm = HWM;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (skt, ZMQ_SNDHWM, &hwm, sizeof (hwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (skt, ZMQ_RCVHWM, &hwm, sizeof (hwm)));
-}
-
-static void publisher_thread_main (void *pvoid)
-{
-    const proxy_hwm_cfg_t *cfg = (proxy_hwm_cfg_t *) pvoid;
-    const int idx = cfg->thread_idx;
-    int optval;
-    int rc;
-
-    void *pubsocket = zmq_socket (cfg->context, ZMQ_XPUB);
-    assert (pubsocket);
-
-    set_hwm (pubsocket);
-
-    optval = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pubsocket, ZMQ_XPUB_NODROP, &optval, sizeof (optval)));
-
-    optval = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pubsocket, ZMQ_SNDTIMEO, &optval, sizeof (optval)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (pubsocket, cfg->frontend_endpoint[idx]));
-
-    //  Wait before starting TX operations till 1 subscriber has subscribed
-    //  (in this test there's 1 subscriber only)
-    char buffer[32] = {};
-    rc = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_recv (pubsocket, buffer, sizeof (buffer), 0));
-    if (rc != 1) {
-        printf ("invalid response length: expected 1, received %d", rc);
-        exit (1);
-    }
-    if (buffer[0] != 1) {
-        printf ("invalid response value: expected 1, received %d",
-                (int) buffer[0]);
-        exit (1);
-    }
-
-    zmq_msg_t msg_orig;
-    rc = zmq_msg_init_size (&msg_orig, message_size);
-    assert (rc == 0);
-    memset (zmq_msg_data (&msg_orig), 'A', zmq_msg_size (&msg_orig));
-
-    uint64_t send_count = 0;
-    while (send_count < message_count) {
-        zmq_msg_t msg;
-        zmq_msg_init (&msg);
-        rc = zmq_msg_copy (&msg, &msg_orig);
-        assert (rc == 0);
-
-        //  Send the message to the socket
-        rc = zmq_msg_send (&msg, pubsocket, 0);
-        if (rc != -1) {
-            send_count++;
-        } else {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-        }
-    }
-
-    zmq_close (pubsocket);
-    //printf ("publisher thread ended\n");
-}
-
-static void subscriber_thread_main (void *pvoid)
-{
-    const proxy_hwm_cfg_t *cfg = (proxy_hwm_cfg_t *) pvoid;
-    const int idx = cfg->thread_idx;
-
-    void *subsocket = zmq_socket (cfg->context, ZMQ_SUB);
-    assert (subsocket);
-
-    set_hwm (subsocket);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (subsocket, ZMQ_SUBSCRIBE, 0, 0));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (subsocket, cfg->backend_endpoint[idx]));
-
-    //  Receive message_count messages
-    uint64_t rxsuccess = 0;
-    bool success = true;
-    while (success) {
-        zmq_msg_t msg;
-        int rc = zmq_msg_init (&msg);
-        assert (rc == 0);
-
-        rc = zmq_msg_recv (&msg, subsocket, 0);
-        if (rc != -1) {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            rxsuccess++;
-        }
-
-        if (rxsuccess == message_count)
-            break;
-    }
-
-    //  Cleanup
-
-    zmq_close (subsocket);
-    //printf ("subscriber thread ended\n");
-}
-
-static void proxy_thread_main (void *pvoid)
-{
-    const proxy_hwm_cfg_t *cfg = (proxy_hwm_cfg_t *) pvoid;
-    int rc;
-
-    //  FRONTEND SUB
-
-    void *frontend_xsub = zmq_socket (
-      cfg->context,
-      ZMQ_XSUB); // the frontend is the one exposed to internal threads (INPROC)
-    assert (frontend_xsub);
-
-    set_hwm (frontend_xsub);
-
-    //  Bind FRONTEND
-    for (unsigned int i = 0; i < ARRAY_SIZE (cfg->frontend_endpoint); i++) {
-        const char *ep = cfg->frontend_endpoint[i];
-        if (ep != NULL) {
-            assert (strlen (ep) > 5);
-            rc = zmq_bind (frontend_xsub, ep);
-            ASSERT_EXPR_SAFE (rc == 0);
-        }
-    }
-
-    //  BACKEND PUB
-
-    void *backend_xpub = zmq_socket (
-      cfg->context,
-      ZMQ_XPUB); //  the backend is the one exposed to the external world (TCP)
-    assert (backend_xpub);
-
-    int optval = 1;
-    rc =
-      zmq_setsockopt (backend_xpub, ZMQ_XPUB_NODROP, &optval, sizeof (optval));
-    ASSERT_EXPR_SAFE (rc == 0);
-
-    set_hwm (backend_xpub);
-
-    //  Bind BACKEND
-    for (unsigned int i = 0; i < ARRAY_SIZE (cfg->backend_endpoint); i++) {
-        const char *ep = cfg->backend_endpoint[i];
-        if (ep != NULL) {
-            assert (strlen (ep) > 5);
-            rc = zmq_bind (backend_xpub, ep);
-            ASSERT_EXPR_SAFE (rc == 0);
-        }
-    }
-
-    //  CONTROL REP
-
-    void *control_rep = zmq_socket (
-      cfg->context,
-      ZMQ_REP); //  This one is used by the proxy to receive&reply to commands
-    assert (control_rep);
-
-    //  Bind CONTROL
-    rc = zmq_bind (control_rep, cfg->control_endpoint);
-    ASSERT_EXPR_SAFE (rc == 0);
-
-    //  Start proxying!
-
-    zmq_proxy_steerable (frontend_xsub, backend_xpub, NULL, control_rep);
-
-    zmq_close (frontend_xsub);
-    zmq_close (backend_xpub);
-    zmq_close (control_rep);
-    //printf ("proxy thread ended\n");
-}
-
-void terminate_proxy (const proxy_hwm_cfg_t *cfg)
-{
-    //  CONTROL REQ
-
-    void *control_req = zmq_socket (
-      cfg->context,
-      ZMQ_REQ); //  This one can be used to send command to the proxy
-    assert (control_req);
-
-    //  Connect CONTROL-REQ: a socket to which send commands
-    int rc = zmq_connect (control_req, cfg->control_endpoint);
-    ASSERT_EXPR_SAFE (rc == 0);
-
-    //  Ask the proxy to exit: the subscriber has received all messages
-
-    rc = zmq_send (control_req, "TERMINATE", 9, 0);
-    ASSERT_EXPR_SAFE (rc == 9);
-
-    zmq_close (control_req);
-}
-
-//  The main thread simply starts some publishers, a proxy,
-//  and a subscriber. Finish when all packets are received.
-
-int main (int argc, char *argv[])
-{
-    if (argc != 3) {
-        printf ("usage: proxy_thr <message-size> <message-count>\n");
-        return 1;
-    }
-
-    message_size = atoi (argv[1]);
-    message_count = atoi (argv[2]);
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("message count: %d\n", (int) message_count);
-
-    void *context = zmq_ctx_new ();
-    assert (context);
-
-    int rv = zmq_ctx_set (context, ZMQ_IO_THREADS, 4);
-    ASSERT_EXPR_SAFE (rv == 0);
-
-    //  START ALL SECONDARY THREADS
-
-    const char *pub1 = "inproc://perf_pub1";
-    const char *pub2 = "inproc://perf_pub2";
-    const char *sub1 = "inproc://perf_backend";
-
-    proxy_hwm_cfg_t cfg_global = {};
-    cfg_global.context = context;
-    cfg_global.frontend_endpoint[0] = pub1;
-    cfg_global.frontend_endpoint[1] = pub2;
-    cfg_global.backend_endpoint[0] = sub1;
-    cfg_global.control_endpoint = "inproc://ctrl";
-
-    //  Proxy
-    proxy_hwm_cfg_t cfg_proxy = cfg_global;
-    void *proxy = zmq_threadstart (&proxy_thread_main, (void *) &cfg_proxy);
-    assert (proxy != 0);
-
-    //  Subscriber 1
-    proxy_hwm_cfg_t cfg_sub1 = cfg_global;
-    cfg_sub1.thread_idx = 0;
-    void *subscriber =
-      zmq_threadstart (&subscriber_thread_main, (void *) &cfg_sub1);
-    assert (subscriber != 0);
-
-    //  Start measuring
-    void *watch = zmq_stopwatch_start ();
-
-    //  Publisher 1
-    proxy_hwm_cfg_t cfg_pub1 = cfg_global;
-    cfg_pub1.thread_idx = 0;
-    void *publisher1 =
-      zmq_threadstart (&publisher_thread_main, (void *) &cfg_pub1);
-    assert (publisher1 != 0);
-
-    //  Publisher 2
-    proxy_hwm_cfg_t cfg_pub2 = cfg_global;
-    cfg_pub2.thread_idx = 1;
-    void *publisher2 =
-      zmq_threadstart (&publisher_thread_main, (void *) &cfg_pub2);
-    assert (publisher2 != 0);
-
-    //  Wait for all packets to be received
-    zmq_threadclose (subscriber);
-
-    //  Stop measuring
-    unsigned long elapsed = zmq_stopwatch_stop (watch);
-    if (elapsed == 0)
-        elapsed = 1;
-
-    unsigned long throughput =
-      (unsigned long) ((double) message_count / (double) elapsed * 1000000);
-    double megabits = (double) (throughput * message_size * 8) / 1000000;
-
-    printf ("mean throughput: %d [msg/s]\n", (int) throughput);
-    printf ("mean throughput: %.3f [Mb/s]\n", (double) megabits);
-
-    //  Wait for the end of publishers...
-    zmq_threadclose (publisher1);
-    zmq_threadclose (publisher2);
-
-    //  ... then close the proxy
-    terminate_proxy (&cfg_proxy);
-    zmq_threadclose (proxy);
-
-    int rc = zmq_ctx_term (context);
-    ASSERT_EXPR_SAFE (rc == 0);
-
-    return 0;
-}
diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp
deleted file mode 100644
index a21b0a5d2..000000000
--- a/perf/remote_lat.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int main (int argc, char *argv[])
-{
-    const char *connect_to;
-    int roundtrip_count;
-    size_t message_size;
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    void *watch;
-    unsigned long elapsed;
-    double latency;
-
-    if (argc != 4) {
-        printf ("usage: remote_lat <connect-to> <message-size> "
-                "<roundtrip-count>\n");
-        return 1;
-    }
-    connect_to = argv[1];
-    message_size = atoi (argv[2]);
-    roundtrip_count = atoi (argv[3]);
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_REQ);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_connect (s, connect_to);
-    if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_msg_init_size (&msg, message_size);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-    memset (zmq_msg_data (&msg), 0, message_size);
-
-    watch = zmq_stopwatch_start ();
-
-    for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-    }
-
-    elapsed = zmq_stopwatch_stop (watch);
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    latency = (double) elapsed / (roundtrip_count * 2);
-
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("roundtrip count: %d\n", (int) roundtrip_count);
-    printf ("average latency: %.3f [us]\n", (double) latency);
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp
deleted file mode 100644
index 8378950cd..000000000
--- a/perf/remote_thr.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-// keys are arbitrary but must match local_lat.cpp
-const char server_pubkey[] = "DX4nh=yUn{-9ugra0X3Src4SU-4xTgqxcYY.+<SH";
-const char client_pubkey[] = "<n^oA}I:66W+*ds3tAmi1+KJzv-}k&fC2aA5Bj0K";
-const char client_prvkey[] = "9R9bV}[6z6DC-%$!jTVTKvWc=LEL{4i4gzUe$@Zx";
-
-int main (int argc, char *argv[])
-{
-    const char *connect_to;
-    int message_count;
-    int message_size;
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    int curve = 0;
-
-    if (argc != 4 && argc != 5) {
-        printf ("usage: remote_thr <connect-to> <message-size> "
-                "<message-count> [<enable_curve>]\n");
-        return 1;
-    }
-    connect_to = argv[1];
-    message_size = atoi (argv[2]);
-    message_count = atoi (argv[3]);
-    if (argc >= 5 && atoi (argv[4])) {
-        curve = 1;
-    }
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_PUSH);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    //  Add your socket options here.
-    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
-    if (curve) {
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SECRETKEY, client_prvkey,
-                             sizeof (client_prvkey));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-
-        rc = zmq_setsockopt (s, ZMQ_CURVE_PUBLICKEY, client_pubkey,
-                             sizeof (client_pubkey));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SERVERKEY, server_pubkey,
-                             sizeof (server_pubkey));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-    }
-
-    rc = zmq_connect (s, connect_to);
-    if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    for (i = 0; i != message_count; i++) {
-        rc = zmq_msg_init_size (&msg, message_size);
-        if (rc != 0) {
-            printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        rc = zmq_msg_close (&msg);
-        if (rc != 0) {
-            printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-    }
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/src/address.cpp b/src/address.cpp
deleted file mode 100644
index 9ec83c2fd..000000000
--- a/src/address.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "address.hpp"
-#include "ctx.hpp"
-#include "err.hpp"
-#include "tcp_address.hpp"
-#include "udp_address.hpp"
-#include "ipc_address.hpp"
-#include "tipc_address.hpp"
-#include "ws_address.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-#include "vmci_address.hpp"
-#endif
-
-#include <string>
-#include <sstream>
-
-zmq::address_t::address_t (const std::string &protocol_,
-                           const std::string &address_,
-                           ctx_t *parent_) :
-    protocol (protocol_),
-    address (address_),
-    parent (parent_)
-{
-    resolved.dummy = NULL;
-}
-
-zmq::address_t::~address_t ()
-{
-    if (protocol == protocol_name::tcp) {
-        LIBZMQ_DELETE (resolved.tcp_addr);
-    } else if (protocol == protocol_name::udp) {
-        LIBZMQ_DELETE (resolved.udp_addr);
-    }
-#ifdef ZMQ_HAVE_WS
-    else if (protocol == protocol_name::ws) {
-        LIBZMQ_DELETE (resolved.ws_addr);
-    }
-#endif
-
-#ifdef ZMQ_HAVE_WSS
-    else if (protocol == protocol_name::wss) {
-        LIBZMQ_DELETE (resolved.ws_addr);
-    }
-#endif
-
-#if defined ZMQ_HAVE_IPC
-    else if (protocol == protocol_name::ipc) {
-        LIBZMQ_DELETE (resolved.ipc_addr);
-    }
-#endif
-#if defined ZMQ_HAVE_TIPC
-    else if (protocol == protocol_name::tipc) {
-        LIBZMQ_DELETE (resolved.tipc_addr);
-    }
-#endif
-#if defined ZMQ_HAVE_VMCI
-    else if (protocol == protocol_name::vmci) {
-        LIBZMQ_DELETE (resolved.vmci_addr);
-    }
-#endif
-}
-
-int zmq::address_t::to_string (std::string &addr_) const
-{
-    if (protocol == protocol_name::tcp && resolved.tcp_addr)
-        return resolved.tcp_addr->to_string (addr_);
-    if (protocol == protocol_name::udp && resolved.udp_addr)
-        return resolved.udp_addr->to_string (addr_);
-#ifdef ZMQ_HAVE_WS
-    if (protocol == protocol_name::ws && resolved.ws_addr)
-        return resolved.ws_addr->to_string (addr_);
-#endif
-#ifdef ZMQ_HAVE_WSS
-    if (protocol == protocol_name::wss && resolved.ws_addr)
-        return resolved.ws_addr->to_string (addr_);
-#endif
-#if defined ZMQ_HAVE_IPC
-    if (protocol == protocol_name::ipc && resolved.ipc_addr)
-        return resolved.ipc_addr->to_string (addr_);
-#endif
-#if defined ZMQ_HAVE_TIPC
-    if (protocol == protocol_name::tipc && resolved.tipc_addr)
-        return resolved.tipc_addr->to_string (addr_);
-#endif
-#if defined ZMQ_HAVE_VMCI
-    if (protocol == protocol_name::vmci && resolved.vmci_addr)
-        return resolved.vmci_addr->to_string (addr_);
-#endif
-
-    if (!protocol.empty () && !address.empty ()) {
-        std::stringstream s;
-        s << protocol << "://" << address;
-        addr_ = s.str ();
-        return 0;
-    }
-    addr_.clear ();
-    return -1;
-}
-
-zmq::zmq_socklen_t zmq::get_socket_address (fd_t fd_,
-                                            socket_end_t socket_end_,
-                                            sockaddr_storage *ss_)
-{
-    zmq_socklen_t sl = static_cast<zmq_socklen_t> (sizeof (*ss_));
-
-    const int rc =
-      socket_end_ == socket_end_local
-        ? getsockname (fd_, reinterpret_cast<struct sockaddr *> (ss_), &sl)
-        : getpeername (fd_, reinterpret_cast<struct sockaddr *> (ss_), &sl);
-
-    return rc != 0 ? 0 : sl;
-}
diff --git a/src/address.hpp b/src/address.hpp
deleted file mode 100644
index 3c0a51de4..000000000
--- a/src/address.hpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_ADDRESS_HPP_INCLUDED__
-
-#include "fd.hpp"
-
-#include <string>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#else
-#include <ws2tcpip.h>
-#endif
-
-namespace zmq
-{
-class ctx_t;
-class tcp_address_t;
-class udp_address_t;
-class ws_address_t;
-#ifdef ZMQ_HAVE_WSS
-class wss_address_t;
-#endif
-#if defined ZMQ_HAVE_IPC
-class ipc_address_t;
-#endif
-#if defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_VXWORKS
-class tipc_address_t;
-#endif
-#if defined ZMQ_HAVE_VMCI
-class vmci_address_t;
-#endif
-
-namespace protocol_name
-{
-static const char inproc[] = "inproc";
-static const char tcp[] = "tcp";
-static const char udp[] = "udp";
-#ifdef ZMQ_HAVE_OPENPGM
-static const char pgm[] = "pgm";
-static const char epgm[] = "epgm";
-#endif
-#ifdef ZMQ_HAVE_NORM
-static const char norm[] = "norm";
-#endif
-#ifdef ZMQ_HAVE_WS
-static const char ws[] = "ws";
-#endif
-#ifdef ZMQ_HAVE_WSS
-static const char wss[] = "wss";
-#endif
-#if defined ZMQ_HAVE_IPC
-static const char ipc[] = "ipc";
-#endif
-#if defined ZMQ_HAVE_TIPC
-static const char tipc[] = "tipc";
-#endif
-#if defined ZMQ_HAVE_VMCI
-static const char vmci[] = "vmci";
-#endif
-}
-
-struct address_t
-{
-    address_t (const std::string &protocol_,
-               const std::string &address_,
-               ctx_t *parent_);
-
-    ~address_t ();
-
-    const std::string protocol;
-    const std::string address;
-    ctx_t *const parent;
-
-    //  Protocol specific resolved address
-    //  All members must be pointers to allow for consistent initialization
-    union
-    {
-        void *dummy;
-        tcp_address_t *tcp_addr;
-        udp_address_t *udp_addr;
-#ifdef ZMQ_HAVE_WS
-        ws_address_t *ws_addr;
-#endif
-#ifdef ZMQ_HAVE_WSS
-        wss_address_t *wss_addr;
-#endif
-#if defined ZMQ_HAVE_IPC
-        ipc_address_t *ipc_addr;
-#endif
-#if defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_VXWORKS
-        tipc_address_t *tipc_addr;
-#endif
-#if defined ZMQ_HAVE_VMCI
-        vmci_address_t *vmci_addr;
-#endif
-    } resolved;
-
-    int to_string (std::string &addr_) const;
-};
-
-#if defined(ZMQ_HAVE_HPUX) || defined(ZMQ_HAVE_VXWORKS)                        \
-  || defined(ZMQ_HAVE_WINDOWS)
-typedef int zmq_socklen_t;
-#else
-typedef socklen_t zmq_socklen_t;
-#endif
-
-enum socket_end_t
-{
-    socket_end_local,
-    socket_end_remote
-};
-
-zmq_socklen_t
-get_socket_address (fd_t fd_, socket_end_t socket_end_, sockaddr_storage *ss_);
-
-template <typename T>
-std::string get_socket_name (fd_t fd_, socket_end_t socket_end_)
-{
-    struct sockaddr_storage ss;
-    const zmq_socklen_t sl = get_socket_address (fd_, socket_end_, &ss);
-    if (sl == 0) {
-        return std::string ();
-    }
-
-    const T addr (reinterpret_cast<struct sockaddr *> (&ss), sl);
-    std::string address_string;
-    addr.to_string (address_string);
-    return address_string;
-}
-}
-
-#endif
diff --git a/src/array.hpp b/src/array.hpp
deleted file mode 100644
index 8c8138244..000000000
--- a/src/array.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ARRAY_INCLUDED__
-#define __ZMQ_ARRAY_INCLUDED__
-
-#include <vector>
-#include <algorithm>
-
-#include "macros.hpp"
-
-namespace zmq
-{
-//  Implementation of fast arrays with O(1) access, insertion and
-//  removal. The array stores pointers rather than objects.
-//  O(1) is achieved by making items inheriting from
-//  array_item_t<ID> class which internally stores the position
-//  in the array.
-//  The ID template argument is used to differentiate among arrays
-//  and thus let an object be stored in different arrays.
-
-//  Base class for objects stored in the array. If you want to store
-//  same object in multiple arrays, each of those arrays has to have
-//  different ID. The item itself has to be derived from instantiations of
-//  array_item_t template for all relevant IDs.
-
-template <int ID = 0> class array_item_t
-{
-  public:
-    array_item_t () : _array_index (-1) {}
-
-    //  The destructor doesn't have to be virtual. It is made virtual
-    //  just to keep ICC and code checking tools from complaining.
-    virtual ~array_item_t () ZMQ_DEFAULT;
-
-    void set_array_index (int index_) { _array_index = index_; }
-
-    int get_array_index () const { return _array_index; }
-
-  private:
-    int _array_index;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (array_item_t)
-};
-
-
-template <typename T, int ID = 0> class array_t
-{
-  private:
-    typedef array_item_t<ID> item_t;
-
-  public:
-    typedef typename std::vector<T *>::size_type size_type;
-
-    array_t () ZMQ_DEFAULT;
-
-    size_type size () { return _items.size (); }
-
-    bool empty () { return _items.empty (); }
-
-    T *&operator[] (size_type index_) { return _items[index_]; }
-
-    void push_back (T *item_)
-    {
-        if (item_)
-            static_cast<item_t *> (item_)->set_array_index (
-              static_cast<int> (_items.size ()));
-        _items.push_back (item_);
-    }
-
-    void erase (T *item_)
-    {
-        erase (static_cast<item_t *> (item_)->get_array_index ());
-    }
-
-    void erase (size_type index_)
-    {
-        if (_items.empty ())
-            return;
-        static_cast<item_t *> (_items.back ())
-          ->set_array_index (static_cast<int> (index_));
-
-        _items[index_] = _items.back ();
-        _items.pop_back ();
-    }
-
-    void swap (size_type index1_, size_type index2_)
-    {
-        if (_items[index1_])
-            static_cast<item_t *> (_items[index1_])
-              ->set_array_index (static_cast<int> (index2_));
-        if (_items[index2_])
-            static_cast<item_t *> (_items[index2_])
-              ->set_array_index (static_cast<int> (index1_));
-        std::swap (_items[index1_], _items[index2_]);
-    }
-
-    void clear () { _items.clear (); }
-
-    static size_type index (T *item_)
-    {
-        return static_cast<size_type> (
-          static_cast<item_t *> (item_)->get_array_index ());
-    }
-
-  private:
-    typedef std::vector<T *> items_t;
-    items_t _items;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (array_t)
-};
-}
-
-#endif
diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp
deleted file mode 100644
index d05837a13..000000000
--- a/src/atomic_counter.hpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ATOMIC_COUNTER_HPP_INCLUDED__
-#define __ZMQ_ATOMIC_COUNTER_HPP_INCLUDED__
-
-#include "stdint.hpp"
-#include "macros.hpp"
-
-#if defined ZMQ_FORCE_MUTEXES
-#define ZMQ_ATOMIC_COUNTER_MUTEX
-#elif (defined __cplusplus && __cplusplus >= 201103L)                          \
-  || (defined _MSC_VER && _MSC_VER >= 1900)
-#define ZMQ_ATOMIC_COUNTER_CXX11
-#elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
-#define ZMQ_ATOMIC_COUNTER_INTRINSIC
-#elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
-#define ZMQ_ATOMIC_COUNTER_X86
-#elif defined __ARM_ARCH_7A__ && defined __GNUC__
-#define ZMQ_ATOMIC_COUNTER_ARM
-#elif defined ZMQ_HAVE_WINDOWS
-#define ZMQ_ATOMIC_COUNTER_WINDOWS
-#elif (defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_NETBSD                     \
-       || defined ZMQ_HAVE_GNU)
-#define ZMQ_ATOMIC_COUNTER_ATOMIC_H
-#elif defined __tile__
-#define ZMQ_ATOMIC_COUNTER_TILE
-#else
-#define ZMQ_ATOMIC_COUNTER_MUTEX
-#endif
-
-#if defined ZMQ_ATOMIC_COUNTER_MUTEX
-#include "mutex.hpp"
-#elif defined ZMQ_ATOMIC_COUNTER_CXX11
-#include <atomic>
-#elif defined ZMQ_ATOMIC_COUNTER_WINDOWS
-#include "windows.hpp"
-#elif defined ZMQ_ATOMIC_COUNTER_ATOMIC_H
-#include <atomic.h>
-#elif defined ZMQ_ATOMIC_COUNTER_TILE
-#include <arch/atomic.h>
-#endif
-
-namespace zmq
-{
-//  This class represents an integer that can be incremented/decremented
-//  in atomic fashion.
-//
-//  In zmq::shared_message_memory_allocator a buffer with an atomic_counter_t
-//  at the start is allocated. If the class does not align to pointer size,
-//  access to pointers in structures in the buffer will cause SIGBUS on
-//  architectures that do not allow mis-aligned pointers (eg: SPARC).
-//  Force the compiler to align to pointer size, which will cause the object
-//  to grow from 4 bytes to 8 bytes on 64 bit architectures (when not using
-//  mutexes).
-
-#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
-class __declspec(align (8)) atomic_counter_t
-#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_ARM_ARMV7VE))
-class __declspec(align (4)) atomic_counter_t
-#else
-class atomic_counter_t
-#endif
-{
-  public:
-    typedef uint32_t integer_t;
-
-    atomic_counter_t (integer_t value_ = 0) ZMQ_NOEXCEPT : _value (value_) {}
-
-    //  Set counter _value (not thread-safe).
-    void set (integer_t value_) ZMQ_NOEXCEPT { _value = value_; }
-
-    //  Atomic addition. Returns the old _value.
-    integer_t add (integer_t increment_) ZMQ_NOEXCEPT
-    {
-        integer_t old_value;
-
-#if defined ZMQ_ATOMIC_COUNTER_WINDOWS
-        old_value = InterlockedExchangeAdd ((LONG *) &_value, increment_);
-#elif defined ZMQ_ATOMIC_COUNTER_INTRINSIC
-        old_value = __atomic_fetch_add (&_value, increment_, __ATOMIC_ACQ_REL);
-#elif defined ZMQ_ATOMIC_COUNTER_CXX11
-        old_value = _value.fetch_add (increment_, std::memory_order_acq_rel);
-#elif defined ZMQ_ATOMIC_COUNTER_ATOMIC_H
-        integer_t new_value = atomic_add_32_nv (&_value, increment_);
-        old_value = new_value - increment_;
-#elif defined ZMQ_ATOMIC_COUNTER_TILE
-        old_value = arch_atomic_add (&_value, increment_);
-#elif defined ZMQ_ATOMIC_COUNTER_X86
-        __asm__ volatile("lock; xadd %0, %1 \n\t"
-                         : "=r"(old_value), "=m"(_value)
-                         : "0"(increment_), "m"(_value)
-                         : "cc", "memory");
-#elif defined ZMQ_ATOMIC_COUNTER_ARM
-        integer_t flag, tmp;
-        __asm__ volatile("       dmb     sy\n\t"
-                         "1:     ldrex   %0, [%5]\n\t"
-                         "       add     %2, %0, %4\n\t"
-                         "       strex   %1, %2, [%5]\n\t"
-                         "       teq     %1, #0\n\t"
-                         "       bne     1b\n\t"
-                         "       dmb     sy\n\t"
-                         : "=&r"(old_value), "=&r"(flag), "=&r"(tmp),
-                           "+Qo"(_value)
-                         : "Ir"(increment_), "r"(&_value)
-                         : "cc");
-#elif defined ZMQ_ATOMIC_COUNTER_MUTEX
-        sync.lock ();
-        old_value = _value;
-        _value += increment_;
-        sync.unlock ();
-#else
-#error atomic_counter is not implemented for this platform
-#endif
-        return old_value;
-    }
-
-    //  Atomic subtraction. Returns false if the counter drops to zero.
-    bool sub (integer_t decrement_) ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_COUNTER_WINDOWS
-        LONG delta = -((LONG) decrement_);
-        integer_t old = InterlockedExchangeAdd ((LONG *) &_value, delta);
-        return old - decrement_ != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_INTRINSIC
-        integer_t nv =
-          __atomic_sub_fetch (&_value, decrement_, __ATOMIC_ACQ_REL);
-        return nv != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_CXX11
-        const integer_t old =
-          _value.fetch_sub (decrement_, std::memory_order_acq_rel);
-        return old - decrement_ != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_ATOMIC_H
-        int32_t delta = -((int32_t) decrement_);
-        integer_t nv = atomic_add_32_nv (&_value, delta);
-        return nv != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_TILE
-        int32_t delta = -((int32_t) decrement_);
-        integer_t nv = arch_atomic_add (&_value, delta);
-        return nv != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_X86
-        integer_t oldval = -decrement_;
-        volatile integer_t *val = &_value;
-        __asm__ volatile("lock; xaddl %0,%1"
-                         : "=r"(oldval), "=m"(*val)
-                         : "0"(oldval), "m"(*val)
-                         : "cc", "memory");
-        return oldval != decrement_;
-#elif defined ZMQ_ATOMIC_COUNTER_ARM
-        integer_t old_value, flag, tmp;
-        __asm__ volatile("       dmb     sy\n\t"
-                         "1:     ldrex   %0, [%5]\n\t"
-                         "       sub     %2, %0, %4\n\t"
-                         "       strex   %1, %2, [%5]\n\t"
-                         "       teq     %1, #0\n\t"
-                         "       bne     1b\n\t"
-                         "       dmb     sy\n\t"
-                         : "=&r"(old_value), "=&r"(flag), "=&r"(tmp),
-                           "+Qo"(_value)
-                         : "Ir"(decrement_), "r"(&_value)
-                         : "cc");
-        return old_value - decrement_ != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_MUTEX
-        sync.lock ();
-        _value -= decrement_;
-        bool result = _value ? true : false;
-        sync.unlock ();
-        return result;
-#else
-#error atomic_counter is not implemented for this platform
-#endif
-    }
-
-    integer_t get () const ZMQ_NOEXCEPT { return _value; }
-
-  private:
-#if defined ZMQ_ATOMIC_COUNTER_CXX11
-    std::atomic<integer_t> _value;
-#else
-    volatile integer_t _value;
-#endif
-
-#if defined ZMQ_ATOMIC_COUNTER_MUTEX
-    mutex_t sync;
-#endif
-
-#if !defined ZMQ_ATOMIC_COUNTER_CXX11
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (atomic_counter_t)
-#endif
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)                             \
-  || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590)                              \
-  || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
-} __attribute__ ((aligned (sizeof (void *))));
-#else
-};
-#endif
-}
-
-//  Remove macros local to this file.
-#undef ZMQ_ATOMIC_COUNTER_MUTEX
-#undef ZMQ_ATOMIC_COUNTER_INTRINSIC
-#undef ZMQ_ATOMIC_COUNTER_CXX11
-#undef ZMQ_ATOMIC_COUNTER_X86
-#undef ZMQ_ATOMIC_COUNTER_ARM
-#undef ZMQ_ATOMIC_COUNTER_WINDOWS
-#undef ZMQ_ATOMIC_COUNTER_ATOMIC_H
-#undef ZMQ_ATOMIC_COUNTER_TILE
-
-#endif
diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp
deleted file mode 100644
index fa8bc7c35..000000000
--- a/src/atomic_ptr.hpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ATOMIC_PTR_HPP_INCLUDED__
-#define __ZMQ_ATOMIC_PTR_HPP_INCLUDED__
-
-#include "macros.hpp"
-
-#if defined ZMQ_FORCE_MUTEXES
-#define ZMQ_ATOMIC_PTR_MUTEX
-#elif (defined __cplusplus && __cplusplus >= 201103L)                          \
-  || (defined _MSC_VER && _MSC_VER >= 1900)
-#define ZMQ_ATOMIC_PTR_CXX11
-#elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
-#define ZMQ_ATOMIC_PTR_INTRINSIC
-#elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
-#define ZMQ_ATOMIC_PTR_X86
-#elif defined __ARM_ARCH_7A__ && defined __GNUC__
-#define ZMQ_ATOMIC_PTR_ARM
-#elif defined __tile__
-#define ZMQ_ATOMIC_PTR_TILE
-#elif defined ZMQ_HAVE_WINDOWS
-#define ZMQ_ATOMIC_PTR_WINDOWS
-#elif (defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_NETBSD                     \
-       || defined ZMQ_HAVE_GNU)
-#define ZMQ_ATOMIC_PTR_ATOMIC_H
-#else
-#define ZMQ_ATOMIC_PTR_MUTEX
-#endif
-
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-#include "mutex.hpp"
-#elif defined ZMQ_ATOMIC_PTR_CXX11
-#include <atomic>
-#elif defined ZMQ_ATOMIC_PTR_WINDOWS
-#include "windows.hpp"
-#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
-#include <atomic.h>
-#elif defined ZMQ_ATOMIC_PTR_TILE
-#include <arch/atomic.h>
-#endif
-
-namespace zmq
-{
-#if !defined ZMQ_ATOMIC_PTR_CXX11
-inline void *atomic_xchg_ptr (void **ptr_,
-                              void *const val_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                              ,
-                              mutex_t &_sync
-#endif
-                              ) ZMQ_NOEXCEPT
-{
-#if defined ZMQ_ATOMIC_PTR_WINDOWS
-    return InterlockedExchangePointer ((PVOID *) ptr_, val_);
-#elif defined ZMQ_ATOMIC_PTR_INTRINSIC
-    return __atomic_exchange_n (ptr_, val_, __ATOMIC_ACQ_REL);
-#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
-    return atomic_swap_ptr (ptr_, val_);
-#elif defined ZMQ_ATOMIC_PTR_TILE
-    return arch_atomic_exchange (ptr_, val_);
-#elif defined ZMQ_ATOMIC_PTR_X86
-    void *old;
-    __asm__ volatile("lock; xchg %0, %2"
-                     : "=r"(old), "=m"(*ptr_)
-                     : "m"(*ptr_), "0"(val_));
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_ARM
-    void *old;
-    unsigned int flag;
-    __asm__ volatile("       dmb     sy\n\t"
-                     "1:     ldrex   %1, [%3]\n\t"
-                     "       strex   %0, %4, [%3]\n\t"
-                     "       teq     %0, #0\n\t"
-                     "       bne     1b\n\t"
-                     "       dmb     sy\n\t"
-                     : "=&r"(flag), "=&r"(old), "+Qo"(*ptr_)
-                     : "r"(ptr_), "r"(val_)
-                     : "cc");
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_MUTEX
-    _sync.lock ();
-    void *old = *ptr_;
-    *ptr_ = val_;
-    _sync.unlock ();
-    return old;
-#else
-#error atomic_ptr is not implemented for this platform
-#endif
-}
-
-inline void *atomic_cas (void *volatile *ptr_,
-                         void *cmp_,
-                         void *val_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                         ,
-                         mutex_t &_sync
-#endif
-                         ) ZMQ_NOEXCEPT
-{
-#if defined ZMQ_ATOMIC_PTR_WINDOWS
-    return InterlockedCompareExchangePointer ((volatile PVOID *) ptr_, val_,
-                                              cmp_);
-#elif defined ZMQ_ATOMIC_PTR_INTRINSIC
-    void *old = cmp_;
-    __atomic_compare_exchange_n (ptr_, &old, val_, false, __ATOMIC_RELEASE,
-                                 __ATOMIC_ACQUIRE);
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
-    return atomic_cas_ptr (ptr_, cmp_, val_);
-#elif defined ZMQ_ATOMIC_PTR_TILE
-    return arch_atomic_val_compare_and_exchange (ptr_, cmp_, val_);
-#elif defined ZMQ_ATOMIC_PTR_X86
-    void *old;
-    __asm__ volatile("lock; cmpxchg %2, %3"
-                     : "=a"(old), "=m"(*ptr_)
-                     : "r"(val_), "m"(*ptr_), "0"(cmp_)
-                     : "cc");
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_ARM
-    void *old;
-    unsigned int flag;
-    __asm__ volatile("       dmb     sy\n\t"
-                     "1:     ldrex   %1, [%3]\n\t"
-                     "       mov     %0, #0\n\t"
-                     "       teq     %1, %4\n\t"
-                     "       it      eq\n\t"
-                     "       strexeq %0, %5, [%3]\n\t"
-                     "       teq     %0, #0\n\t"
-                     "       bne     1b\n\t"
-                     "       dmb     sy\n\t"
-                     : "=&r"(flag), "=&r"(old), "+Qo"(*ptr_)
-                     : "r"(ptr_), "r"(cmp_), "r"(val_)
-                     : "cc");
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_MUTEX
-    _sync.lock ();
-    void *old = *ptr_;
-    if (*ptr_ == cmp_)
-        *ptr_ = val_;
-    _sync.unlock ();
-    return old;
-#else
-#error atomic_ptr is not implemented for this platform
-#endif
-}
-#endif
-
-//  This class encapsulates several atomic operations on pointers.
-
-template <typename T> class atomic_ptr_t
-{
-  public:
-    //  Initialise atomic pointer
-    atomic_ptr_t () ZMQ_NOEXCEPT { _ptr = NULL; }
-
-    //  Set value of atomic pointer in a non-threadsafe way
-    //  Use this function only when you are sure that at most one
-    //  thread is accessing the pointer at the moment.
-    void set (T *ptr_) ZMQ_NOEXCEPT { _ptr = ptr_; }
-
-    //  Perform atomic 'exchange pointers' operation. Pointer is set
-    //  to the 'val_' value. Old value is returned.
-    T *xchg (T *val_) ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_PTR_CXX11
-        return _ptr.exchange (val_, std::memory_order_acq_rel);
-#else
-        return (T *) atomic_xchg_ptr ((void **) &_ptr, val_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                                      ,
-                                      _sync
-#endif
-        );
-#endif
-    }
-
-    //  Perform atomic 'compare and swap' operation on the pointer.
-    //  The pointer is compared to 'cmp' argument and if they are
-    //  equal, its value is set to 'val_'. Old value of the pointer
-    //  is returned.
-    T *cas (T *cmp_, T *val_) ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_PTR_CXX11
-        _ptr.compare_exchange_strong (cmp_, val_, std::memory_order_acq_rel);
-        return cmp_;
-#else
-        return (T *) atomic_cas ((void **) &_ptr, cmp_, val_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                                 ,
-                                 _sync
-#endif
-        );
-#endif
-    }
-
-  private:
-#if defined ZMQ_ATOMIC_PTR_CXX11
-    std::atomic<T *> _ptr;
-#else
-    volatile T *_ptr;
-#endif
-
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-    mutex_t _sync;
-#endif
-
-#if !defined ZMQ_ATOMIC_PTR_CXX11
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (atomic_ptr_t)
-#endif
-};
-
-struct atomic_value_t
-{
-    atomic_value_t (const int value_) ZMQ_NOEXCEPT : _value (value_) {}
-
-    atomic_value_t (const atomic_value_t &src_) ZMQ_NOEXCEPT
-        : _value (src_.load ())
-    {
-    }
-
-    void store (const int value_) ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_PTR_CXX11
-        _value.store (value_, std::memory_order_release);
-#else
-        atomic_xchg_ptr ((void **) &_value, (void *) (ptrdiff_t) value_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                         ,
-                         _sync
-#endif
-        );
-#endif
-    }
-
-    int load () const ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_PTR_CXX11
-        return _value.load (std::memory_order_acquire);
-#else
-        return (int) (ptrdiff_t) atomic_cas ((void **) &_value, 0, 0
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                                             ,
-#if defined __SUNPRO_CC
-                                             const_cast<mutex_t &> (_sync)
-#else
-                                             _sync
-#endif
-#endif
-        );
-#endif
-    }
-
-  private:
-#if defined ZMQ_ATOMIC_PTR_CXX11
-    std::atomic<int> _value;
-#else
-    volatile ptrdiff_t _value;
-#endif
-
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-    mutable mutex_t _sync;
-#endif
-
-  private:
-    atomic_value_t &operator= (const atomic_value_t &src_);
-};
-}
-
-//  Remove macros local to this file.
-#undef ZMQ_ATOMIC_PTR_MUTEX
-#undef ZMQ_ATOMIC_PTR_INTRINSIC
-#undef ZMQ_ATOMIC_PTR_CXX11
-#undef ZMQ_ATOMIC_PTR_X86
-#undef ZMQ_ATOMIC_PTR_ARM
-#undef ZMQ_ATOMIC_PTR_TILE
-#undef ZMQ_ATOMIC_PTR_WINDOWS
-#undef ZMQ_ATOMIC_PTR_ATOMIC_H
-
-#endif
diff --git a/src/blob.hpp b/src/blob.hpp
deleted file mode 100644
index 542216188..000000000
--- a/src/blob.hpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_BLOB_HPP_INCLUDED__
-#define __ZMQ_BLOB_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "err.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-#include <algorithm>
-#include <ios>
-
-#if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER > 1700
-#define ZMQ_HAS_MOVE_SEMANTICS
-#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v)
-#define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back
-#define ZMQ_MOVE(x) std::move (x)
-#else
-#if defined __SUNPRO_CC
-template <typename K, typename V>
-std::pair<const K, V> make_pair_fix_const (const K &k, const V &v)
-{
-    return std::pair<const K, V> (k, v);
-}
-
-#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) insert (make_pair_fix_const (k, v))
-#else
-#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) insert (std::make_pair (k, v))
-#endif
-
-#define ZMQ_PUSH_OR_EMPLACE_BACK push_back
-#define ZMQ_MOVE(x) (x)
-#endif
-
-namespace zmq
-{
-struct reference_tag_t
-{
-};
-
-//  Object to hold dynamically allocated opaque binary data.
-//  On modern compilers, it will be movable but not copyable. Copies
-//  must be explicitly created by set_deep_copy.
-//  On older compilers, it is copyable for syntactical reasons.
-struct blob_t
-{
-    //  Creates an empty blob_t.
-    blob_t () : _data (0), _size (0), _owned (true) {}
-
-    //  Creates a blob_t of a given size, with uninitialized content.
-    explicit blob_t (const size_t size_) :
-        _data (static_cast<unsigned char *> (malloc (size_))),
-        _size (size_),
-        _owned (true)
-    {
-        alloc_assert (_data);
-    }
-
-    //  Creates a blob_t of a given size, an initializes content by copying
-    // from another buffer.
-    blob_t (const unsigned char *const data_, const size_t size_) :
-        _data (static_cast<unsigned char *> (malloc (size_))),
-        _size (size_),
-        _owned (true)
-    {
-        alloc_assert (_data);
-        memcpy (_data, data_, size_);
-    }
-
-    //  Creates a blob_t for temporary use that only references a
-    //  pre-allocated block of data.
-    //  Use with caution and ensure that the blob_t will not outlive
-    //  the referenced data.
-    blob_t (unsigned char *const data_, const size_t size_, reference_tag_t) :
-        _data (data_),
-        _size (size_),
-        _owned (false)
-    {
-    }
-
-    //  Returns the size of the blob_t.
-    size_t size () const { return _size; }
-
-    //  Returns a pointer to the data of the blob_t.
-    const unsigned char *data () const { return _data; }
-
-    //  Returns a pointer to the data of the blob_t.
-    unsigned char *data () { return _data; }
-
-    //  Defines an order relationship on blob_t.
-    bool operator< (blob_t const &other_) const
-    {
-        const int cmpres =
-          memcmp (_data, other_._data, std::min (_size, other_._size));
-        return cmpres < 0 || (cmpres == 0 && _size < other_._size);
-    }
-
-    //  Sets a blob_t to a deep copy of another blob_t.
-    void set_deep_copy (blob_t const &other_)
-    {
-        clear ();
-        _data = static_cast<unsigned char *> (malloc (other_._size));
-        alloc_assert (_data);
-        _size = other_._size;
-        _owned = true;
-        memcpy (_data, other_._data, _size);
-    }
-
-    //  Sets a blob_t to a copy of a given buffer.
-    void set (const unsigned char *const data_, const size_t size_)
-    {
-        clear ();
-        _data = static_cast<unsigned char *> (malloc (size_));
-        alloc_assert (_data);
-        _size = size_;
-        _owned = true;
-        memcpy (_data, data_, size_);
-    }
-
-    //  Empties a blob_t.
-    void clear ()
-    {
-        if (_owned) {
-            free (_data);
-        }
-        _data = 0;
-        _size = 0;
-    }
-
-    ~blob_t ()
-    {
-        if (_owned) {
-            free (_data);
-        }
-    }
-
-#ifdef ZMQ_HAS_MOVE_SEMANTICS
-    blob_t (const blob_t &) = delete;
-    blob_t &operator= (const blob_t &) = delete;
-
-    blob_t (blob_t &&other_) ZMQ_NOEXCEPT : _data (other_._data),
-                                            _size (other_._size),
-                                            _owned (other_._owned)
-    {
-        other_._owned = false;
-    }
-    blob_t &operator= (blob_t &&other_) ZMQ_NOEXCEPT
-    {
-        if (this != &other_) {
-            clear ();
-            _data = other_._data;
-            _size = other_._size;
-            _owned = other_._owned;
-            other_._owned = false;
-        }
-        return *this;
-    }
-#else
-    blob_t (const blob_t &other) : _owned (false) { set_deep_copy (other); }
-    blob_t &operator= (const blob_t &other)
-    {
-        if (this != &other) {
-            clear ();
-            set_deep_copy (other);
-        }
-        return *this;
-    }
-#endif
-
-  private:
-    unsigned char *_data;
-    size_t _size;
-    bool _owned;
-};
-}
-
-#endif
diff --git a/src/channel.cpp b/src/channel.cpp
deleted file mode 100644
index 6a396228d..000000000
--- a/src/channel.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-    Copyright (c) 2007-2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "channel.hpp"
-#include "err.hpp"
-#include "pipe.hpp"
-#include "msg.hpp"
-
-zmq::channel_t::channel_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true),
-    _pipe (NULL)
-{
-    options.type = ZMQ_CHANNEL;
-}
-
-zmq::channel_t::~channel_t ()
-{
-    zmq_assert (!_pipe);
-}
-
-void zmq::channel_t::xattach_pipe (pipe_t *pipe_,
-                                   bool subscribe_to_all_,
-                                   bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_ != NULL);
-
-    //  ZMQ_PAIR socket can only be connected to a single peer.
-    //  The socket rejects any further connection requests.
-    if (_pipe == NULL)
-        _pipe = pipe_;
-    else
-        pipe_->terminate (false);
-}
-
-void zmq::channel_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (pipe_ == _pipe)
-        _pipe = NULL;
-}
-
-void zmq::channel_t::xread_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-void zmq::channel_t::xwrite_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-int zmq::channel_t::xsend (msg_t *msg_)
-{
-    //  CHANNEL sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (!_pipe || !_pipe->write (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    _pipe->flush ();
-
-    //  Detach the original message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::channel_t::xrecv (msg_t *msg_)
-{
-    //  Deallocate old content of the message.
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    if (!_pipe) {
-        //  Initialise the output parameter to be a 0-byte message.
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-
-        errno = EAGAIN;
-        return -1;
-    }
-
-    // Drop any messages with more flag
-    bool read = _pipe->read (msg_);
-    while (read && msg_->flags () & msg_t::more) {
-        // drop all frames of the current multi-frame message
-        read = _pipe->read (msg_);
-        while (read && msg_->flags () & msg_t::more)
-            read = _pipe->read (msg_);
-
-        // get the new message
-        if (read)
-            read = _pipe->read (msg_);
-    }
-
-    if (!read) {
-        //  Initialise the output parameter to be a 0-byte message.
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-
-        errno = EAGAIN;
-        return -1;
-    }
-
-    return 0;
-}
-
-bool zmq::channel_t::xhas_in ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_read ();
-}
-
-bool zmq::channel_t::xhas_out ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_write ();
-}
diff --git a/src/channel.hpp b/src/channel.hpp
deleted file mode 100644
index 0eb360a00..000000000
--- a/src/channel.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    Copyright (c) 2007-2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CHANNEL_HPP_INCLUDED__
-#define __ZMQ_CHANNEL_HPP_INCLUDED__
-
-#include "blob.hpp"
-#include "socket_base.hpp"
-#include "session_base.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class channel_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    channel_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~channel_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    zmq::pipe_t *_pipe;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (channel_t)
-};
-}
-
-#endif
diff --git a/src/client.cpp b/src/client.cpp
deleted file mode 100644
index f26b13860..000000000
--- a/src/client.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "client.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::client_t::client_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true)
-{
-    options.type = ZMQ_CLIENT;
-    options.can_send_hello_msg = true;
-}
-
-zmq::client_t::~client_t ()
-{
-}
-
-void zmq::client_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    _fq.attach (pipe_);
-    _lb.attach (pipe_);
-}
-
-int zmq::client_t::xsend (msg_t *msg_)
-{
-    //  CLIENT sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-    return _lb.sendpipe (msg_, NULL);
-}
-
-int zmq::client_t::xrecv (msg_t *msg_)
-{
-    int rc = _fq.recvpipe (msg_, NULL);
-
-    // Drop any messages with more flag
-    while (rc == 0 && msg_->flags () & msg_t::more) {
-        // drop all frames of the current multi-frame message
-        rc = _fq.recvpipe (msg_, NULL);
-
-        while (rc == 0 && msg_->flags () & msg_t::more)
-            rc = _fq.recvpipe (msg_, NULL);
-
-        // get the new message
-        if (rc == 0)
-            rc = _fq.recvpipe (msg_, NULL);
-    }
-
-    return rc;
-}
-
-bool zmq::client_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
-
-bool zmq::client_t::xhas_out ()
-{
-    return _lb.has_out ();
-}
-
-void zmq::client_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::client_t::xwrite_activated (pipe_t *pipe_)
-{
-    _lb.activated (pipe_);
-}
-
-void zmq::client_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-    _lb.pipe_terminated (pipe_);
-}
diff --git a/src/client.hpp b/src/client.hpp
deleted file mode 100644
index c166f0e85..000000000
--- a/src/client.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CLIENT_HPP_INCLUDED__
-#define __ZMQ_CLIENT_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "fq.hpp"
-#include "lb.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class client_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    client_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~client_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Messages are fair-queued from inbound pipes. And load-balanced to
-    //  the outbound pipes.
-    fq_t _fq;
-    lb_t _lb;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (client_t)
-};
-}
-
-#endif
diff --git a/src/clock.cpp b/src/clock.cpp
deleted file mode 100644
index 8802b71d5..000000000
--- a/src/clock.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "clock.hpp"
-#include "likely.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "mutex.hpp"
-
-#include <stddef.h>
-
-#if defined _MSC_VER
-#if defined _WIN32_WCE
-#include <cmnintrin.h>
-#else
-#include <intrin.h>
-#endif
-#endif
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/time.h>
-#endif
-
-#if defined HAVE_CLOCK_GETTIME || defined HAVE_GETHRTIME
-#include <time.h>
-#endif
-
-#if defined ZMQ_HAVE_VXWORKS
-#include "timers.h"
-#endif
-
-#if defined ZMQ_HAVE_OSX
-int alt_clock_gettime (int clock_id, timespec *ts)
-{
-    clock_serv_t cclock;
-    mach_timespec_t mts;
-    host_get_clock_service (mach_host_self (), clock_id, &cclock);
-    clock_get_time (cclock, &mts);
-    mach_port_deallocate (mach_task_self (), cclock);
-    ts->tv_sec = mts.tv_sec;
-    ts->tv_nsec = mts.tv_nsec;
-    return 0;
-}
-#endif
-
-#ifdef ZMQ_HAVE_WINDOWS
-typedef ULONGLONG (*f_compatible_get_tick_count64) ();
-
-static zmq::mutex_t compatible_get_tick_count64_mutex;
-
-ULONGLONG compatible_get_tick_count64 ()
-{
-#ifdef ZMQ_HAVE_WINDOWS_UWP
-    const ULONGLONG result = ::GetTickCount64 ();
-    return result;
-#else
-    zmq::scoped_lock_t locker (compatible_get_tick_count64_mutex);
-
-    static DWORD s_wrap = 0;
-    static DWORD s_last_tick = 0;
-    const DWORD current_tick = ::GetTickCount ();
-
-    if (current_tick < s_last_tick)
-        ++s_wrap;
-
-    s_last_tick = current_tick;
-    const ULONGLONG result = (static_cast<ULONGLONG> (s_wrap) << 32)
-                             + static_cast<ULONGLONG> (current_tick);
-
-    return result;
-#endif
-}
-
-f_compatible_get_tick_count64 init_compatible_get_tick_count64 ()
-{
-    f_compatible_get_tick_count64 func = NULL;
-#if !defined ZMQ_HAVE_WINDOWS_UWP
-
-    const HMODULE module = ::LoadLibraryA ("Kernel32.dll");
-    if (module != NULL)
-        func = reinterpret_cast<f_compatible_get_tick_count64> (
-          ::GetProcAddress (module, "GetTickCount64"));
-#endif
-    if (func == NULL)
-        func = compatible_get_tick_count64;
-
-#if !defined ZMQ_HAVE_WINDOWS_UWP
-    if (module != NULL)
-        ::FreeLibrary (module);
-#endif
-
-    return func;
-}
-
-static f_compatible_get_tick_count64 my_get_tick_count64 =
-  init_compatible_get_tick_count64 ();
-#endif
-
-const uint64_t usecs_per_msec = 1000;
-const uint64_t usecs_per_sec = 1000000;
-const uint64_t nsecs_per_usec = 1000;
-
-zmq::clock_t::clock_t () :
-    _last_tsc (rdtsc ()),
-#ifdef ZMQ_HAVE_WINDOWS
-    _last_time (static_cast<uint64_t> ((*my_get_tick_count64) ()))
-#else
-    _last_time (now_us () / usecs_per_msec)
-#endif
-{
-}
-
-uint64_t zmq::clock_t::now_us ()
-{
-#if defined ZMQ_HAVE_WINDOWS
-
-    //  Get the high resolution counter's accuracy.
-    //  While QueryPerformanceFrequency only needs to be called once, since its
-    //  value does not change during runtime, we query it here since this is a
-    //  static function. It might make sense to cache it, though.
-    LARGE_INTEGER ticks_per_second;
-    QueryPerformanceFrequency (&ticks_per_second);
-
-    //  What time is it?
-    LARGE_INTEGER tick;
-    QueryPerformanceCounter (&tick);
-
-    //  Convert the tick number into the number of seconds
-    //  since the system was started.
-    const double ticks_div =
-      static_cast<double> (ticks_per_second.QuadPart) / usecs_per_sec;
-    return static_cast<uint64_t> (tick.QuadPart / ticks_div);
-
-#elif defined HAVE_CLOCK_GETTIME                                               \
-  && (defined CLOCK_MONOTONIC || defined ZMQ_HAVE_VXWORKS)
-
-    //  Use POSIX clock_gettime function to get precise monotonic time.
-    struct timespec tv;
-
-#if defined ZMQ_HAVE_OSX                                                       \
-  && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200 // less than macOS 10.12
-    int rc = alt_clock_gettime (SYSTEM_CLOCK, &tv);
-#else
-    int rc = clock_gettime (CLOCK_MONOTONIC, &tv);
-#endif
-    // Fix case where system has clock_gettime but CLOCK_MONOTONIC is not supported.
-    // This should be a configuration check, but I looked into it and writing an
-    // AC_FUNC_CLOCK_MONOTONIC seems beyond my powers.
-    if (rc != 0) {
-#ifndef ZMQ_HAVE_VXWORKS
-        //  Use POSIX gettimeofday function to get precise time.
-        struct timeval tv;
-        int rc = gettimeofday (&tv, NULL);
-        errno_assert (rc == 0);
-        return tv.tv_sec * usecs_per_sec + tv.tv_usec;
-#endif
-    }
-    return tv.tv_sec * usecs_per_sec + tv.tv_nsec / nsecs_per_usec;
-
-#elif defined HAVE_GETHRTIME
-
-    return gethrtime () / nsecs_per_usec;
-
-#else
-
-    //  Use POSIX gettimeofday function to get precise time.
-    struct timeval tv;
-    int rc = gettimeofday (&tv, NULL);
-    errno_assert (rc == 0);
-    return tv.tv_sec * usecs_per_sec + tv.tv_usec;
-
-#endif
-}
-
-uint64_t zmq::clock_t::now_ms ()
-{
-    const uint64_t tsc = rdtsc ();
-
-    //  If TSC is not supported, get precise time and chop off the microseconds.
-    if (!tsc) {
-#ifdef ZMQ_HAVE_WINDOWS
-        // Under Windows, now_us is not so reliable since QueryPerformanceCounter
-        // does not guarantee that it will use a hardware that offers a monotonic timer.
-        // So, lets use GetTickCount when GetTickCount64 is not available with an workaround
-        // to its 32 bit limitation.
-        return static_cast<uint64_t> ((*my_get_tick_count64) ());
-#else
-        return now_us () / usecs_per_msec;
-#endif
-    }
-
-    //  If TSC haven't jumped back (in case of migration to a different
-    //  CPU core) and if not too much time elapsed since last measurement,
-    //  we can return cached time value.
-    if (likely (tsc - _last_tsc <= (clock_precision / 2) && tsc >= _last_tsc))
-        return _last_time;
-
-    _last_tsc = tsc;
-#ifdef ZMQ_HAVE_WINDOWS
-    _last_time = static_cast<uint64_t> ((*my_get_tick_count64) ());
-#else
-    _last_time = now_us () / usecs_per_msec;
-#endif
-    return _last_time;
-}
-
-uint64_t zmq::clock_t::rdtsc ()
-{
-#if (defined _MSC_VER && (defined _M_IX86 || defined _M_X64))
-    return __rdtsc ();
-#elif (defined __GNUC__ && (defined __i386__ || defined __x86_64__))
-    uint32_t low, high;
-    __asm__ volatile("rdtsc" : "=a"(low), "=d"(high));
-    return static_cast<uint64_t> (high) << 32 | low;
-#elif (defined __SUNPRO_CC && (__SUNPRO_CC >= 0x5100)                          \
-       && (defined __i386 || defined __amd64 || defined __x86_64))
-    union
-    {
-        uint64_t u64val;
-        uint32_t u32val[2];
-    } tsc;
-    asm("rdtsc" : "=a"(tsc.u32val[0]), "=d"(tsc.u32val[1]));
-    return tsc.u64val;
-#elif defined(__s390__)
-    uint64_t tsc;
-    asm("\tstck\t%0\n" : "=Q"(tsc) : : "cc");
-    return tsc;
-#else
-    struct timespec ts;
-#if defined ZMQ_HAVE_OSX                                                       \
-  && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200 // less than macOS 10.12
-    alt_clock_gettime (SYSTEM_CLOCK, &ts);
-#else
-    clock_gettime (CLOCK_MONOTONIC, &ts);
-#endif
-    return static_cast<uint64_t> (ts.tv_sec) * nsecs_per_usec * usecs_per_sec
-           + ts.tv_nsec;
-#endif
-}
diff --git a/src/clock.hpp b/src/clock.hpp
deleted file mode 100644
index 300d1801a..000000000
--- a/src/clock.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CLOCK_HPP_INCLUDED__
-#define __ZMQ_CLOCK_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-#if defined ZMQ_HAVE_OSX
-// TODO this is not required in this file, but condition_variable.hpp includes
-// clock.hpp to get these definitions
-#ifndef CLOCK_REALTIME
-#define CLOCK_REALTIME 0
-#endif
-#ifndef HAVE_CLOCK_GETTIME
-#define HAVE_CLOCK_GETTIME
-#endif
-
-#include <mach/clock.h>
-#include <mach/mach.h>
-#include <time.h>
-#include <sys/time.h>
-#endif
-
-namespace zmq
-{
-class clock_t
-{
-  public:
-    clock_t ();
-
-    //  CPU's timestamp counter. Returns 0 if it's not available.
-    static uint64_t rdtsc ();
-
-    //  High precision timestamp.
-    static uint64_t now_us ();
-
-    //  Low precision timestamp. In tight loops generating it can be
-    //  10 to 100 times faster than the high precision timestamp.
-    uint64_t now_ms ();
-
-  private:
-    //  TSC timestamp of when last time measurement was made.
-    uint64_t _last_tsc;
-
-    //  Physical time corresponding to the TSC above (in milliseconds).
-    uint64_t _last_time;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (clock_t)
-};
-}
-
-#endif
diff --git a/src/command.hpp b/src/command.hpp
deleted file mode 100644
index c92f7a7c6..000000000
--- a/src/command.hpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_COMMAND_HPP_INCLUDED__
-#define __ZMQ_COMMAND_HPP_INCLUDED__
-
-#include <string>
-#include "stdint.hpp"
-#include "endpoint.hpp"
-
-namespace zmq
-{
-class object_t;
-class own_t;
-struct i_engine;
-class pipe_t;
-class socket_base_t;
-
-//  This structure defines the commands that can be sent between threads.
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4324) // C4324: alignment padding warnings
-__declspec(align (64))
-#endif
-  struct command_t
-{
-    //  Object to process the command.
-    zmq::object_t *destination;
-
-    enum type_t
-    {
-        stop,
-        plug,
-        own,
-        attach,
-        bind,
-        activate_read,
-        activate_write,
-        hiccup,
-        pipe_term,
-        pipe_term_ack,
-        pipe_hwm,
-        term_req,
-        term,
-        term_ack,
-        term_endpoint,
-        reap,
-        reaped,
-        inproc_connected,
-        conn_failed,
-        pipe_peer_stats,
-        pipe_stats_publish,
-        done
-    } type;
-
-    union args_t
-    {
-        //  Sent to I/O thread to let it know that it should
-        //  terminate itself.
-        struct
-        {
-        } stop;
-
-        //  Sent to I/O object to make it register with its I/O thread.
-        struct
-        {
-        } plug;
-
-        //  Sent to socket to let it know about the newly created object.
-        struct
-        {
-            zmq::own_t *object;
-        } own;
-
-        //  Attach the engine to the session. If engine is NULL, it informs
-        //  session that the connection have failed.
-        struct
-        {
-            struct i_engine *engine;
-        } attach;
-
-        //  Sent from session to socket to establish pipe(s) between them.
-        //  Caller have used inc_seqnum beforehand sending the command.
-        struct
-        {
-            zmq::pipe_t *pipe;
-        } bind;
-
-        //  Sent by pipe writer to inform dormant pipe reader that there
-        //  are messages in the pipe.
-        struct
-        {
-        } activate_read;
-
-        //  Sent by pipe reader to inform pipe writer about how many
-        //  messages it has read so far.
-        struct
-        {
-            uint64_t msgs_read;
-        } activate_write;
-
-        //  Sent by pipe reader to writer after creating a new inpipe.
-        //  The parameter is actually of type pipe_t::upipe_t, however,
-        //  its definition is private so we'll have to do with void*.
-        struct
-        {
-            void *pipe;
-        } hiccup;
-
-        //  Sent by pipe reader to pipe writer to ask it to terminate
-        //  its end of the pipe.
-        struct
-        {
-        } pipe_term;
-
-        //  Pipe writer acknowledges pipe_term command.
-        struct
-        {
-        } pipe_term_ack;
-
-        //  Sent by one of pipe to another part for modify hwm
-        struct
-        {
-            int inhwm;
-            int outhwm;
-        } pipe_hwm;
-
-        //  Sent by I/O object ot the socket to request the shutdown of
-        //  the I/O object.
-        struct
-        {
-            zmq::own_t *object;
-        } term_req;
-
-        //  Sent by socket to I/O object to start its shutdown.
-        struct
-        {
-            int linger;
-        } term;
-
-        //  Sent by I/O object to the socket to acknowledge it has
-        //  shut down.
-        struct
-        {
-        } term_ack;
-
-        //  Sent by session_base (I/O thread) to socket (application thread)
-        //  to ask to disconnect the endpoint.
-        struct
-        {
-            std::string *endpoint;
-        } term_endpoint;
-
-        //  Transfers the ownership of the closed socket
-        //  to the reaper thread.
-        struct
-        {
-            zmq::socket_base_t *socket;
-        } reap;
-
-        //  Closed socket notifies the reaper that it's already deallocated.
-        struct
-        {
-        } reaped;
-
-        //  Send application-side pipe count and ask to send monitor event
-        struct
-        {
-            uint64_t queue_count;
-            zmq::own_t *socket_base;
-            endpoint_uri_pair_t *endpoint_pair;
-        } pipe_peer_stats;
-
-        //  Collate application thread and I/O thread pipe counts and endpoints
-        //  and send as event
-        struct
-        {
-            uint64_t outbound_queue_count;
-            uint64_t inbound_queue_count;
-            endpoint_uri_pair_t *endpoint_pair;
-        } pipe_stats_publish;
-
-        //  Sent by reaper thread to the term thread when all the sockets
-        //  are successfully deallocated.
-        struct
-        {
-        } done;
-
-    } args;
-#ifdef _MSC_VER
-};
-#pragma warning(pop)
-#else
-} __attribute__ ((aligned (64)));
-#endif
-}
-
-#endif
diff --git a/src/condition_variable.hpp b/src/condition_variable.hpp
deleted file mode 100644
index 66412d374..000000000
--- a/src/condition_variable.hpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CONDITON_VARIABLE_HPP_INCLUDED__
-#define __ZMQ_CONDITON_VARIABLE_HPP_INCLUDED__
-
-#include "err.hpp"
-#include "mutex.hpp"
-
-//  Condition variable class encapsulates OS mutex in a platform-independent way.
-
-#if defined(ZMQ_USE_CV_IMPL_NONE)
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    inline condition_variable_t () { zmq_assert (false); }
-
-    inline int wait (mutex_t *mutex_, int timeout_)
-    {
-        zmq_assert (false);
-        return -1;
-    }
-
-    inline void broadcast () { zmq_assert (false); }
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#elif defined(ZMQ_USE_CV_IMPL_WIN32API)
-
-#include "windows.hpp"
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    inline condition_variable_t () { InitializeConditionVariable (&_cv); }
-
-    inline int wait (mutex_t *mutex_, int timeout_)
-    {
-        int rc = SleepConditionVariableCS (&_cv, mutex_->get_cs (), timeout_);
-
-        if (rc != 0)
-            return 0;
-
-        rc = GetLastError ();
-
-        if (rc != ERROR_TIMEOUT)
-            win_assert (rc);
-
-        errno = EAGAIN;
-        return -1;
-    }
-
-    inline void broadcast () { WakeAllConditionVariable (&_cv); }
-
-  private:
-    CONDITION_VARIABLE _cv;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#elif defined(ZMQ_USE_CV_IMPL_STL11)
-
-#include <condition_variable>
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    condition_variable_t () ZMQ_DEFAULT;
-
-    int wait (mutex_t *mutex_, int timeout_)
-    {
-        // this assumes that the mutex mutex_ has been locked by the caller
-        int res = 0;
-        if (timeout_ == -1) {
-            _cv.wait (
-              *mutex_); // unlock mtx and wait cv.notify_all(), lock mtx after cv.notify_all()
-        } else if (_cv.wait_for (*mutex_, std::chrono::milliseconds (timeout_))
-                   == std::cv_status::timeout) {
-            // time expired
-            errno = EAGAIN;
-            res = -1;
-        }
-        return res;
-    }
-
-    void broadcast ()
-    {
-        // this assumes that the mutex associated with _cv has been locked by the caller
-        _cv.notify_all ();
-    }
-
-  private:
-    std::condition_variable_any _cv;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#elif defined(ZMQ_USE_CV_IMPL_VXWORKS)
-
-#include <sysLib.h>
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    inline condition_variable_t () ZMQ_DEFAULT;
-
-    inline ~condition_variable_t ()
-    {
-        scoped_lock_t l (_listenersMutex);
-        for (size_t i = 0; i < _listeners.size (); i++) {
-            semDelete (_listeners[i]);
-        }
-    }
-
-    inline int wait (mutex_t *mutex_, int timeout_)
-    {
-        //Atomically releases lock, blocks the current executing thread,
-        //and adds it to the list of threads waiting on *this. The thread
-        //will be unblocked when broadcast() is executed.
-        //It may also be unblocked spuriously. When unblocked, regardless
-        //of the reason, lock is reacquired and wait exits.
-
-        SEM_ID sem = semBCreate (SEM_Q_PRIORITY, SEM_EMPTY);
-        {
-            scoped_lock_t l (_listenersMutex);
-            _listeners.push_back (sem);
-        }
-        mutex_->unlock ();
-
-        int rc;
-        if (timeout_ < 0)
-            rc = semTake (sem, WAIT_FOREVER);
-        else {
-            int ticksPerSec = sysClkRateGet ();
-            int timeoutTicks = (timeout_ * ticksPerSec) / 1000 + 1;
-            rc = semTake (sem, timeoutTicks);
-        }
-
-        {
-            scoped_lock_t l (_listenersMutex);
-            // remove sem from listeners
-            for (size_t i = 0; i < _listeners.size (); i++) {
-                if (_listeners[i] == sem) {
-                    _listeners.erase (_listeners.begin () + i);
-                    break;
-                }
-            }
-            semDelete (sem);
-        }
-        mutex_->lock ();
-
-        if (rc == 0)
-            return 0;
-
-        if (rc == S_objLib_OBJ_TIMEOUT) {
-            errno = EAGAIN;
-            return -1;
-        }
-
-        return -1;
-    }
-
-    inline void broadcast ()
-    {
-        scoped_lock_t l (_listenersMutex);
-        for (size_t i = 0; i < _listeners.size (); i++) {
-            semGive (_listeners[i]);
-        }
-    }
-
-  private:
-    mutex_t _listenersMutex;
-    std::vector<SEM_ID> _listeners;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#elif defined(ZMQ_USE_CV_IMPL_PTHREADS)
-
-#include <pthread.h>
-
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 21
-#define ANDROID_LEGACY
-extern "C" int pthread_cond_timedwait_monotonic_np (pthread_cond_t *,
-                                                    pthread_mutex_t *,
-                                                    const struct timespec *);
-#endif
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    inline condition_variable_t ()
-    {
-        pthread_condattr_t attr;
-        pthread_condattr_init (&attr);
-#if !defined(ZMQ_HAVE_OSX) && !defined(ANDROID_LEGACY)
-        pthread_condattr_setclock (&attr, CLOCK_MONOTONIC);
-#endif
-        int rc = pthread_cond_init (&_cond, &attr);
-        posix_assert (rc);
-    }
-
-    inline ~condition_variable_t ()
-    {
-        int rc = pthread_cond_destroy (&_cond);
-        posix_assert (rc);
-    }
-
-    inline int wait (mutex_t *mutex_, int timeout_)
-    {
-        int rc;
-
-        if (timeout_ != -1) {
-            struct timespec timeout;
-
-#ifdef ZMQ_HAVE_OSX
-            timeout.tv_sec = 0;
-            timeout.tv_nsec = 0;
-#else
-            clock_gettime (CLOCK_MONOTONIC, &timeout);
-#endif
-
-            timeout.tv_sec += timeout_ / 1000;
-            timeout.tv_nsec += (timeout_ % 1000) * 1000000;
-
-            if (timeout.tv_nsec > 1000000000) {
-                timeout.tv_sec++;
-                timeout.tv_nsec -= 1000000000;
-            }
-#ifdef ZMQ_HAVE_OSX
-            rc = pthread_cond_timedwait_relative_np (
-              &_cond, mutex_->get_mutex (), &timeout);
-#elif defined(ANDROID_LEGACY)
-            rc = pthread_cond_timedwait_monotonic_np (
-              &_cond, mutex_->get_mutex (), &timeout);
-#else
-            rc =
-              pthread_cond_timedwait (&_cond, mutex_->get_mutex (), &timeout);
-#endif
-        } else
-            rc = pthread_cond_wait (&_cond, mutex_->get_mutex ());
-
-        if (rc == 0)
-            return 0;
-
-        if (rc == ETIMEDOUT) {
-            errno = EAGAIN;
-            return -1;
-        }
-
-        posix_assert (rc);
-        return -1;
-    }
-
-    inline void broadcast ()
-    {
-        int rc = pthread_cond_broadcast (&_cond);
-        posix_assert (rc);
-    }
-
-  private:
-    pthread_cond_t _cond;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/config.hpp b/src/config.hpp
deleted file mode 100644
index c355c6d7d..000000000
--- a/src/config.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CONFIG_HPP_INCLUDED__
-#define __ZMQ_CONFIG_HPP_INCLUDED__
-
-namespace zmq
-{
-//  Compile-time settings.
-
-enum
-{
-    //  Number of new messages in message pipe needed to trigger new memory
-    //  allocation. Setting this parameter to 256 decreases the impact of
-    //  memory allocation by approximately 99.6%
-    message_pipe_granularity = 256,
-
-    //  Commands in pipe per allocation event.
-    command_pipe_granularity = 16,
-
-    //  Determines how often does socket poll for new commands when it
-    //  still has unprocessed messages to handle. Thus, if it is set to 100,
-    //  socket will process 100 inbound messages before doing the poll.
-    //  If there are no unprocessed messages available, poll is done
-    //  immediately. Decreasing the value trades overall latency for more
-    //  real-time behaviour (less latency peaks).
-    inbound_poll_rate = 100,
-
-    //  Maximal delta between high and low watermark.
-    max_wm_delta = 1024,
-
-    //  Maximum number of events the I/O thread can process in one go.
-    max_io_events = 256,
-
-    //  Maximal batch size of packets forwarded by a ZMQ proxy.
-    //  Increasing this value improves throughput at the expense of
-    //  latency and fairness.
-    proxy_burst_size = 1000,
-
-    //  Maximal delay to process command in API thread (in CPU ticks).
-    //  3,000,000 ticks equals to 1 - 2 milliseconds on current CPUs.
-    //  Note that delay is only applied when there is continuous stream of
-    //  messages to process. If not so, commands are processed immediately.
-    max_command_delay = 3000000,
-
-    //  Low-precision clock precision in CPU ticks. 1ms. Value of 1000000
-    //  should be OK for CPU frequencies above 1GHz. If should work
-    //  reasonably well for CPU frequencies above 500MHz. For lower CPU
-    //  frequencies you may consider lowering this value to get best
-    //  possible latencies.
-    clock_precision = 1000000,
-
-    //  On some OSes the signaler has to be emulated using a TCP
-    //  connection. In such cases following port is used.
-    //  If 0, it lets the OS choose a free port without requiring use of a
-    //  global mutex. The original implementation of a Windows signaler
-    //  socket used port 5905 instead of letting the OS choose a free port.
-    //  https://github.com/zeromq/libzmq/issues/1542
-    signaler_port = 0
-};
-}
-
-#endif
diff --git a/src/ctx.cpp b/src/ctx.cpp
deleted file mode 100644
index 2b64c5104..000000000
--- a/src/ctx.cpp
+++ /dev/null
@@ -1,893 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <limits>
-#include <climits>
-#include <new>
-#include <sstream>
-#include <string.h>
-
-#include "ctx.hpp"
-#include "socket_base.hpp"
-#include "io_thread.hpp"
-#include "reaper.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "random.hpp"
-
-#ifdef ZMQ_HAVE_VMCI
-#include <vmci_sockets.h>
-#endif
-
-#ifdef ZMQ_USE_NSS
-#include <nss.h>
-#endif
-
-#ifdef ZMQ_USE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif
-
-#define ZMQ_CTX_TAG_VALUE_GOOD 0xabadcafe
-#define ZMQ_CTX_TAG_VALUE_BAD 0xdeadbeef
-
-static int clipped_maxsocket (int max_requested_)
-{
-    if (max_requested_ >= zmq::poller_t::max_fds ()
-        && zmq::poller_t::max_fds () != -1)
-        // -1 because we need room for the reaper mailbox.
-        max_requested_ = zmq::poller_t::max_fds () - 1;
-
-    return max_requested_;
-}
-
-zmq::ctx_t::ctx_t () :
-    _tag (ZMQ_CTX_TAG_VALUE_GOOD),
-    _starting (true),
-    _terminating (false),
-    _reaper (NULL),
-    _max_sockets (clipped_maxsocket (ZMQ_MAX_SOCKETS_DFLT)),
-    _max_msgsz (INT_MAX),
-    _io_thread_count (ZMQ_IO_THREADS_DFLT),
-    _blocky (true),
-    _ipv6 (false),
-    _zero_copy (true)
-{
-#ifdef HAVE_FORK
-    _pid = getpid ();
-#endif
-#ifdef ZMQ_HAVE_VMCI
-    _vmci_fd = -1;
-    _vmci_family = -1;
-#endif
-
-    //  Initialise crypto library, if needed.
-    zmq::random_open ();
-
-#ifdef ZMQ_USE_NSS
-    NSS_NoDB_Init (NULL);
-#endif
-
-#ifdef ZMQ_USE_GNUTLS
-    gnutls_global_init ();
-#endif
-}
-
-bool zmq::ctx_t::check_tag () const
-{
-    return _tag == ZMQ_CTX_TAG_VALUE_GOOD;
-}
-
-zmq::ctx_t::~ctx_t ()
-{
-    //  Check that there are no remaining _sockets.
-    zmq_assert (_sockets.empty ());
-
-    //  Ask I/O threads to terminate. If stop signal wasn't sent to I/O
-    //  thread subsequent invocation of destructor would hang-up.
-    const io_threads_t::size_type io_threads_size = _io_threads.size ();
-    for (io_threads_t::size_type i = 0; i != io_threads_size; i++) {
-        _io_threads[i]->stop ();
-    }
-
-    //  Wait till I/O threads actually terminate.
-    for (io_threads_t::size_type i = 0; i != io_threads_size; i++) {
-        LIBZMQ_DELETE (_io_threads[i]);
-    }
-
-    //  Deallocate the reaper thread object.
-    LIBZMQ_DELETE (_reaper);
-
-    //  The mailboxes in _slots themselves were deallocated with their
-    //  corresponding io_thread/socket objects.
-
-    //  De-initialise crypto library, if needed.
-    zmq::random_close ();
-
-#ifdef ZMQ_USE_NSS
-    NSS_Shutdown ();
-#endif
-
-#ifdef ZMQ_USE_GNUTLS
-    gnutls_global_deinit ();
-#endif
-
-    //  Remove the tag, so that the object is considered dead.
-    _tag = ZMQ_CTX_TAG_VALUE_BAD;
-}
-
-bool zmq::ctx_t::valid () const
-{
-    return _term_mailbox.valid ();
-}
-
-int zmq::ctx_t::terminate ()
-{
-    _slot_sync.lock ();
-
-    const bool save_terminating = _terminating;
-    _terminating = false;
-
-    // Connect up any pending inproc connections, otherwise we will hang
-    pending_connections_t copy = _pending_connections;
-    for (pending_connections_t::iterator p = copy.begin (), end = copy.end ();
-         p != end; ++p) {
-        zmq::socket_base_t *s = create_socket (ZMQ_PAIR);
-        // create_socket might fail eg: out of memory/sockets limit reached
-        zmq_assert (s);
-        s->bind (p->first.c_str ());
-        s->close ();
-    }
-    _terminating = save_terminating;
-
-    if (!_starting) {
-#ifdef HAVE_FORK
-        if (_pid != getpid ()) {
-            // we are a forked child process. Close all file descriptors
-            // inherited from the parent.
-            for (sockets_t::size_type i = 0, size = _sockets.size (); i != size;
-                 i++) {
-                _sockets[i]->get_mailbox ()->forked ();
-            }
-            _term_mailbox.forked ();
-        }
-#endif
-
-        //  Check whether termination was already underway, but interrupted and now
-        //  restarted.
-        const bool restarted = _terminating;
-        _terminating = true;
-
-        //  First attempt to terminate the context.
-        if (!restarted) {
-            //  First send stop command to sockets so that any blocking calls
-            //  can be interrupted. If there are no sockets we can ask reaper
-            //  thread to stop.
-            for (sockets_t::size_type i = 0, size = _sockets.size (); i != size;
-                 i++) {
-                _sockets[i]->stop ();
-            }
-            if (_sockets.empty ())
-                _reaper->stop ();
-        }
-        _slot_sync.unlock ();
-
-        //  Wait till reaper thread closes all the sockets.
-        command_t cmd;
-        const int rc = _term_mailbox.recv (&cmd, -1);
-        if (rc == -1 && errno == EINTR)
-            return -1;
-        errno_assert (rc == 0);
-        zmq_assert (cmd.type == command_t::done);
-        _slot_sync.lock ();
-        zmq_assert (_sockets.empty ());
-    }
-    _slot_sync.unlock ();
-
-#ifdef ZMQ_HAVE_VMCI
-    _vmci_sync.lock ();
-
-    VMCISock_ReleaseAFValueFd (_vmci_fd);
-    _vmci_family = -1;
-    _vmci_fd = -1;
-
-    _vmci_sync.unlock ();
-#endif
-
-    //  Deallocate the resources.
-    delete this;
-
-    return 0;
-}
-
-int zmq::ctx_t::shutdown ()
-{
-    scoped_lock_t locker (_slot_sync);
-
-    if (!_terminating) {
-        _terminating = true;
-
-        if (!_starting) {
-            //  Send stop command to sockets so that any blocking calls
-            //  can be interrupted. If there are no sockets we can ask reaper
-            //  thread to stop.
-            for (sockets_t::size_type i = 0, size = _sockets.size (); i != size;
-                 i++) {
-                _sockets[i]->stop ();
-            }
-            if (_sockets.empty ())
-                _reaper->stop ();
-        }
-    }
-
-    return 0;
-}
-
-int zmq::ctx_t::set (int option_, const void *optval_, size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_MAX_SOCKETS:
-            if (is_int && value >= 1 && value == clipped_maxsocket (value)) {
-                scoped_lock_t locker (_opt_sync);
-                _max_sockets = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IO_THREADS:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _io_thread_count = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IPV6:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _ipv6 = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_BLOCKY:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _blocky = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_MAX_MSGSZ:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _max_msgsz = value < INT_MAX ? value : INT_MAX;
-                return 0;
-            }
-            break;
-
-        case ZMQ_ZERO_COPY_RECV:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _zero_copy = (value != 0);
-                return 0;
-            }
-            break;
-
-        default: {
-            return thread_ctx_t::set (option_, optval_, optvallen_);
-        }
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::ctx_t::get (int option_, void *optval_, const size_t *optvallen_)
-{
-    const bool is_int = (*optvallen_ == sizeof (int));
-    int *value = static_cast<int *> (optval_);
-
-    switch (option_) {
-        case ZMQ_MAX_SOCKETS:
-            if (is_int) {
-                *value = _max_sockets;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SOCKET_LIMIT:
-            if (is_int) {
-                *value = clipped_maxsocket (65535);
-                return 0;
-            }
-            break;
-
-        case ZMQ_IO_THREADS:
-            if (is_int) {
-                *value = _io_thread_count;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IPV6:
-            if (is_int) {
-                *value = _ipv6;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BLOCKY:
-            if (is_int) {
-                *value = _blocky;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MAX_MSGSZ:
-            if (is_int) {
-                *value = _max_msgsz;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MSG_T_SIZE:
-            if (is_int) {
-                *value = sizeof (zmq_msg_t);
-                return 0;
-            }
-            break;
-
-        case ZMQ_ZERO_COPY_RECV:
-            if (is_int) {
-                *value = _zero_copy;
-                return 0;
-            }
-            break;
-
-        default: {
-            return thread_ctx_t::get (option_, optval_, optvallen_);
-        }
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::ctx_t::get (int option_)
-{
-    int optval = 0;
-    size_t optvallen = sizeof (int);
-
-    if (get (option_, &optval, &optvallen) == 0)
-        return optval;
-
-    errno = EINVAL;
-    return -1;
-}
-
-bool zmq::ctx_t::start ()
-{
-    //  Initialise the array of mailboxes. Additional two slots are for
-    //  zmq_ctx_term thread and reaper thread.
-    _opt_sync.lock ();
-    const int term_and_reaper_threads_count = 2;
-    const int mazmq = _max_sockets;
-    const int ios = _io_thread_count;
-    _opt_sync.unlock ();
-    const int slot_count = mazmq + ios + term_and_reaper_threads_count;
-    try {
-        _slots.reserve (slot_count);
-        _empty_slots.reserve (slot_count - term_and_reaper_threads_count);
-    }
-    catch (const std::bad_alloc &) {
-        errno = ENOMEM;
-        return false;
-    }
-    _slots.resize (term_and_reaper_threads_count);
-
-    //  Initialise the infrastructure for zmq_ctx_term thread.
-    _slots[term_tid] = &_term_mailbox;
-
-    //  Create the reaper thread.
-    _reaper = new (std::nothrow) reaper_t (this, reaper_tid);
-    if (!_reaper) {
-        errno = ENOMEM;
-        goto fail_cleanup_slots;
-    }
-    if (!_reaper->get_mailbox ()->valid ())
-        goto fail_cleanup_reaper;
-    _slots[reaper_tid] = _reaper->get_mailbox ();
-    _reaper->start ();
-
-    //  Create I/O thread objects and launch them.
-    _slots.resize (slot_count, NULL);
-
-    for (int i = term_and_reaper_threads_count;
-         i != ios + term_and_reaper_threads_count; i++) {
-        io_thread_t *io_thread = new (std::nothrow) io_thread_t (this, i);
-        if (!io_thread) {
-            errno = ENOMEM;
-            goto fail_cleanup_reaper;
-        }
-        if (!io_thread->get_mailbox ()->valid ()) {
-            delete io_thread;
-            goto fail_cleanup_reaper;
-        }
-        _io_threads.push_back (io_thread);
-        _slots[i] = io_thread->get_mailbox ();
-        io_thread->start ();
-    }
-
-    //  In the unused part of the slot array, create a list of empty slots.
-    for (int32_t i = static_cast<int32_t> (_slots.size ()) - 1;
-         i >= static_cast<int32_t> (ios) + term_and_reaper_threads_count; i--) {
-        _empty_slots.push_back (i);
-    }
-
-    _starting = false;
-    return true;
-
-fail_cleanup_reaper:
-    _reaper->stop ();
-    delete _reaper;
-    _reaper = NULL;
-
-fail_cleanup_slots:
-    _slots.clear ();
-    return false;
-}
-
-zmq::socket_base_t *zmq::ctx_t::create_socket (int type_)
-{
-    scoped_lock_t locker (_slot_sync);
-
-    //  Once zmq_ctx_term() or zmq_ctx_shutdown() was called, we can't create
-    //  new sockets.
-    if (_terminating) {
-        errno = ETERM;
-        return NULL;
-    }
-
-    if (unlikely (_starting)) {
-        if (!start ())
-            return NULL;
-    }
-
-    //  If max_sockets limit was reached, return error.
-    if (_empty_slots.empty ()) {
-        errno = EMFILE;
-        return NULL;
-    }
-
-    //  Choose a slot for the socket.
-    const uint32_t slot = _empty_slots.back ();
-    _empty_slots.pop_back ();
-
-    //  Generate new unique socket ID.
-    const int sid = (static_cast<int> (max_socket_id.add (1))) + 1;
-
-    //  Create the socket and register its mailbox.
-    socket_base_t *s = socket_base_t::create (type_, this, slot, sid);
-    if (!s) {
-        _empty_slots.push_back (slot);
-        return NULL;
-    }
-    _sockets.push_back (s);
-    _slots[slot] = s->get_mailbox ();
-
-    return s;
-}
-
-void zmq::ctx_t::destroy_socket (class socket_base_t *socket_)
-{
-    scoped_lock_t locker (_slot_sync);
-
-    //  Free the associated thread slot.
-    const uint32_t tid = socket_->get_tid ();
-    _empty_slots.push_back (tid);
-    _slots[tid] = NULL;
-
-    //  Remove the socket from the list of sockets.
-    _sockets.erase (socket_);
-
-    //  If zmq_ctx_term() was already called and there are no more socket
-    //  we can ask reaper thread to terminate.
-    if (_terminating && _sockets.empty ())
-        _reaper->stop ();
-}
-
-zmq::object_t *zmq::ctx_t::get_reaper () const
-{
-    return _reaper;
-}
-
-zmq::thread_ctx_t::thread_ctx_t () :
-    _thread_priority (ZMQ_THREAD_PRIORITY_DFLT),
-    _thread_sched_policy (ZMQ_THREAD_SCHED_POLICY_DFLT)
-{
-}
-
-void zmq::thread_ctx_t::start_thread (thread_t &thread_,
-                                      thread_fn *tfn_,
-                                      void *arg_,
-                                      const char *name_) const
-{
-    thread_.setSchedulingParameters (_thread_priority, _thread_sched_policy,
-                                     _thread_affinity_cpus);
-
-    char namebuf[16] = "";
-    snprintf (namebuf, sizeof (namebuf), "%s%sZMQbg%s%s",
-              _thread_name_prefix.empty () ? "" : _thread_name_prefix.c_str (),
-              _thread_name_prefix.empty () ? "" : "/", name_ ? "/" : "",
-              name_ ? name_ : "");
-    thread_.start (tfn_, arg_, namebuf);
-}
-
-int zmq::thread_ctx_t::set (int option_, const void *optval_, size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_THREAD_SCHED_POLICY:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _thread_sched_policy = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_AFFINITY_CPU_ADD:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _thread_affinity_cpus.insert (value);
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_AFFINITY_CPU_REMOVE:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                if (0 == _thread_affinity_cpus.erase (value)) {
-                    errno = EINVAL;
-                    return -1;
-                }
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_PRIORITY:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _thread_priority = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_NAME_PREFIX:
-            // start_thread() allows max 16 chars for thread name
-            if (is_int) {
-                std::ostringstream s;
-                s << value;
-                scoped_lock_t locker (_opt_sync);
-                _thread_name_prefix = s.str ();
-                return 0;
-            } else if (optvallen_ > 0 && optvallen_ <= 16) {
-                scoped_lock_t locker (_opt_sync);
-                _thread_name_prefix.assign (static_cast<const char *> (optval_),
-                                            optvallen_);
-                return 0;
-            }
-            break;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::thread_ctx_t::get (int option_,
-                            void *optval_,
-                            const size_t *optvallen_)
-{
-    const bool is_int = (*optvallen_ == sizeof (int));
-    int *value = static_cast<int *> (optval_);
-
-    switch (option_) {
-        case ZMQ_THREAD_SCHED_POLICY:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = _thread_sched_policy;
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_NAME_PREFIX:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = atoi (_thread_name_prefix.c_str ());
-                return 0;
-            } else if (*optvallen_ >= _thread_name_prefix.size ()) {
-                scoped_lock_t locker (_opt_sync);
-                memcpy (optval_, _thread_name_prefix.data (),
-                        _thread_name_prefix.size ());
-                return 0;
-            }
-            break;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-void zmq::ctx_t::send_command (uint32_t tid_, const command_t &command_)
-{
-    _slots[tid_]->send (command_);
-}
-
-zmq::io_thread_t *zmq::ctx_t::choose_io_thread (uint64_t affinity_)
-{
-    if (_io_threads.empty ())
-        return NULL;
-
-    //  Find the I/O thread with minimum load.
-    int min_load = -1;
-    io_thread_t *selected_io_thread = NULL;
-    for (io_threads_t::size_type i = 0, size = _io_threads.size (); i != size;
-         i++) {
-        if (!affinity_ || (affinity_ & (uint64_t (1) << i))) {
-            const int load = _io_threads[i]->get_load ();
-            if (selected_io_thread == NULL || load < min_load) {
-                min_load = load;
-                selected_io_thread = _io_threads[i];
-            }
-        }
-    }
-    return selected_io_thread;
-}
-
-int zmq::ctx_t::register_endpoint (const char *addr_,
-                                   const endpoint_t &endpoint_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    const bool inserted =
-      _endpoints.ZMQ_MAP_INSERT_OR_EMPLACE (std::string (addr_), endpoint_)
-        .second;
-    if (!inserted) {
-        errno = EADDRINUSE;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::ctx_t::unregister_endpoint (const std::string &addr_,
-                                     const socket_base_t *const socket_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    const endpoints_t::iterator it = _endpoints.find (addr_);
-    if (it == _endpoints.end () || it->second.socket != socket_) {
-        errno = ENOENT;
-        return -1;
-    }
-
-    //  Remove endpoint.
-    _endpoints.erase (it);
-
-    return 0;
-}
-
-void zmq::ctx_t::unregister_endpoints (const socket_base_t *const socket_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    for (endpoints_t::iterator it = _endpoints.begin (),
-                               end = _endpoints.end ();
-         it != end;) {
-        if (it->second.socket == socket_)
-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
-            it = _endpoints.erase (it);
-#else
-            _endpoints.erase (it++);
-#endif
-        else
-            ++it;
-    }
-}
-
-zmq::endpoint_t zmq::ctx_t::find_endpoint (const char *addr_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    endpoints_t::iterator it = _endpoints.find (addr_);
-    if (it == _endpoints.end ()) {
-        errno = ECONNREFUSED;
-        endpoint_t empty = {NULL, options_t ()};
-        return empty;
-    }
-    endpoint_t endpoint = it->second;
-
-    //  Increment the command sequence number of the peer so that it won't
-    //  get deallocated until "bind" command is issued by the caller.
-    //  The subsequent 'bind' has to be called with inc_seqnum parameter
-    //  set to false, so that the seqnum isn't incremented twice.
-    endpoint.socket->inc_seqnum ();
-
-    return endpoint;
-}
-
-void zmq::ctx_t::pend_connection (const std::string &addr_,
-                                  const endpoint_t &endpoint_,
-                                  pipe_t **pipes_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    const pending_connection_t pending_connection = {endpoint_, pipes_[0],
-                                                     pipes_[1]};
-
-    const endpoints_t::iterator it = _endpoints.find (addr_);
-    if (it == _endpoints.end ()) {
-        //  Still no bind.
-        endpoint_.socket->inc_seqnum ();
-        _pending_connections.ZMQ_MAP_INSERT_OR_EMPLACE (addr_,
-                                                        pending_connection);
-    } else {
-        //  Bind has happened in the mean time, connect directly
-        connect_inproc_sockets (it->second.socket, it->second.options,
-                                pending_connection, connect_side);
-    }
-}
-
-void zmq::ctx_t::connect_pending (const char *addr_,
-                                  zmq::socket_base_t *bind_socket_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    const std::pair<pending_connections_t::iterator,
-                    pending_connections_t::iterator>
-      pending = _pending_connections.equal_range (addr_);
-    for (pending_connections_t::iterator p = pending.first; p != pending.second;
-         ++p)
-        connect_inproc_sockets (bind_socket_, _endpoints[addr_].options,
-                                p->second, bind_side);
-
-    _pending_connections.erase (pending.first, pending.second);
-}
-
-void zmq::ctx_t::connect_inproc_sockets (
-  zmq::socket_base_t *bind_socket_,
-  const options_t &bind_options_,
-  const pending_connection_t &pending_connection_,
-  side side_)
-{
-    bind_socket_->inc_seqnum ();
-    pending_connection_.bind_pipe->set_tid (bind_socket_->get_tid ());
-
-    if (!bind_options_.recv_routing_id) {
-        msg_t msg;
-        const bool ok = pending_connection_.bind_pipe->read (&msg);
-        zmq_assert (ok);
-        const int rc = msg.close ();
-        errno_assert (rc == 0);
-    }
-
-    if (!get_effective_conflate_option (pending_connection_.endpoint.options)) {
-        pending_connection_.connect_pipe->set_hwms_boost (bind_options_.sndhwm,
-                                                          bind_options_.rcvhwm);
-        pending_connection_.bind_pipe->set_hwms_boost (
-          pending_connection_.endpoint.options.sndhwm,
-          pending_connection_.endpoint.options.rcvhwm);
-
-        pending_connection_.connect_pipe->set_hwms (
-          pending_connection_.endpoint.options.rcvhwm,
-          pending_connection_.endpoint.options.sndhwm);
-        pending_connection_.bind_pipe->set_hwms (bind_options_.rcvhwm,
-                                                 bind_options_.sndhwm);
-    } else {
-        pending_connection_.connect_pipe->set_hwms (-1, -1);
-        pending_connection_.bind_pipe->set_hwms (-1, -1);
-    }
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    if (bind_options_.can_recv_disconnect_msg
-        && !bind_options_.disconnect_msg.empty ())
-        pending_connection_.connect_pipe->set_disconnect_msg (
-          bind_options_.disconnect_msg);
-#endif
-
-    if (side_ == bind_side) {
-        command_t cmd;
-        cmd.type = command_t::bind;
-        cmd.args.bind.pipe = pending_connection_.bind_pipe;
-        bind_socket_->process_command (cmd);
-        bind_socket_->send_inproc_connected (
-          pending_connection_.endpoint.socket);
-    } else
-        pending_connection_.connect_pipe->send_bind (
-          bind_socket_, pending_connection_.bind_pipe, false);
-
-    // When a ctx is terminated all pending inproc connection will be
-    // connected, but the socket will already be closed and the pipe will be
-    // in waiting_for_delimiter state, which means no more writes can be done
-    // and the routing id write fails and causes an assert. Check if the socket
-    // is open before sending.
-    if (pending_connection_.endpoint.options.recv_routing_id
-        && pending_connection_.endpoint.socket->check_tag ()) {
-        send_routing_id (pending_connection_.bind_pipe, bind_options_);
-    }
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    //  If set, send the hello msg of the bind socket to the pending connection.
-    if (bind_options_.can_send_hello_msg
-        && bind_options_.hello_msg.size () > 0) {
-        send_hello_msg (pending_connection_.bind_pipe, bind_options_);
-    }
-#endif
-}
-
-#ifdef ZMQ_HAVE_VMCI
-
-int zmq::ctx_t::get_vmci_socket_family ()
-{
-    zmq::scoped_lock_t locker (_vmci_sync);
-
-    if (_vmci_fd == -1) {
-        _vmci_family = VMCISock_GetAFValueFd (&_vmci_fd);
-
-        if (_vmci_fd != -1) {
-#ifdef FD_CLOEXEC
-            int rc = fcntl (_vmci_fd, F_SETFD, FD_CLOEXEC);
-            errno_assert (rc != -1);
-#endif
-        }
-    }
-
-    return _vmci_family;
-}
-
-#endif
-
-//  The last used socket ID, or 0 if no socket was used so far. Note that this
-//  is a global variable. Thus, even sockets created in different contexts have
-//  unique IDs.
-zmq::atomic_counter_t zmq::ctx_t::max_socket_id;
diff --git a/src/ctx.hpp b/src/ctx.hpp
deleted file mode 100644
index 0ccd68fa5..000000000
--- a/src/ctx.hpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CTX_HPP_INCLUDED__
-#define __ZMQ_CTX_HPP_INCLUDED__
-
-#include <map>
-#include <vector>
-#include <string>
-#include <stdarg.h>
-
-#include "mailbox.hpp"
-#include "array.hpp"
-#include "config.hpp"
-#include "mutex.hpp"
-#include "stdint.hpp"
-#include "options.hpp"
-#include "atomic_counter.hpp"
-#include "thread.hpp"
-
-namespace zmq
-{
-class object_t;
-class io_thread_t;
-class socket_base_t;
-class reaper_t;
-class pipe_t;
-
-//  Information associated with inproc endpoint. Note that endpoint options
-//  are registered as well so that the peer can access them without a need
-//  for synchronisation, handshaking or similar.
-struct endpoint_t
-{
-    socket_base_t *socket;
-    options_t options;
-};
-
-class thread_ctx_t
-{
-  public:
-    thread_ctx_t ();
-
-    //  Start a new thread with proper scheduling parameters.
-    void start_thread (thread_t &thread_,
-                       thread_fn *tfn_,
-                       void *arg_,
-                       const char *name_ = NULL) const;
-
-    int set (int option_, const void *optval_, size_t optvallen_);
-    int get (int option_, void *optval_, const size_t *optvallen_);
-
-  protected:
-    //  Synchronisation of access to context options.
-    mutex_t _opt_sync;
-
-  private:
-    //  Thread parameters.
-    int _thread_priority;
-    int _thread_sched_policy;
-    std::set<int> _thread_affinity_cpus;
-    std::string _thread_name_prefix;
-};
-
-//  Context object encapsulates all the global state associated with
-//  the library.
-
-class ctx_t ZMQ_FINAL : public thread_ctx_t
-{
-  public:
-    //  Create the context object.
-    ctx_t ();
-
-    //  Returns false if object is not a context.
-    bool check_tag () const;
-
-    //  This function is called when user invokes zmq_ctx_term. If there are
-    //  no more sockets open it'll cause all the infrastructure to be shut
-    //  down. If there are open sockets still, the deallocation happens
-    //  after the last one is closed.
-    int terminate ();
-
-    // This function starts the terminate process by unblocking any blocking
-    // operations currently in progress and stopping any more socket activity
-    // (except zmq_close).
-    // This function is non-blocking.
-    // terminate must still be called afterwards.
-    // This function is optional, terminate will unblock any current
-    // operations as well.
-    int shutdown ();
-
-    //  Set and get context properties.
-    int set (int option_, const void *optval_, size_t optvallen_);
-    int get (int option_, void *optval_, const size_t *optvallen_);
-    int get (int option_);
-
-    //  Create and destroy a socket.
-    zmq::socket_base_t *create_socket (int type_);
-    void destroy_socket (zmq::socket_base_t *socket_);
-
-    //  Send command to the destination thread.
-    void send_command (uint32_t tid_, const command_t &command_);
-
-    //  Returns the I/O thread that is the least busy at the moment.
-    //  Affinity specifies which I/O threads are eligible (0 = all).
-    //  Returns NULL if no I/O thread is available.
-    zmq::io_thread_t *choose_io_thread (uint64_t affinity_);
-
-    //  Returns reaper thread object.
-    zmq::object_t *get_reaper () const;
-
-    //  Management of inproc endpoints.
-    int register_endpoint (const char *addr_, const endpoint_t &endpoint_);
-    int unregister_endpoint (const std::string &addr_,
-                             const socket_base_t *socket_);
-    void unregister_endpoints (const zmq::socket_base_t *socket_);
-    endpoint_t find_endpoint (const char *addr_);
-    void pend_connection (const std::string &addr_,
-                          const endpoint_t &endpoint_,
-                          pipe_t **pipes_);
-    void connect_pending (const char *addr_, zmq::socket_base_t *bind_socket_);
-
-#ifdef ZMQ_HAVE_VMCI
-    // Return family for the VMCI socket or -1 if it's not available.
-    int get_vmci_socket_family ();
-#endif
-
-    enum
-    {
-        term_tid = 0,
-        reaper_tid = 1
-    };
-
-    ~ctx_t ();
-
-    bool valid () const;
-
-  private:
-    bool start ();
-
-    struct pending_connection_t
-    {
-        endpoint_t endpoint;
-        pipe_t *connect_pipe;
-        pipe_t *bind_pipe;
-    };
-
-    //  Used to check whether the object is a context.
-    uint32_t _tag;
-
-    //  Sockets belonging to this context. We need the list so that
-    //  we can notify the sockets when zmq_ctx_term() is called.
-    //  The sockets will return ETERM then.
-    typedef array_t<socket_base_t> sockets_t;
-    sockets_t _sockets;
-
-    //  List of unused thread slots.
-    typedef std::vector<uint32_t> empty_slots_t;
-    empty_slots_t _empty_slots;
-
-    //  If true, zmq_init has been called but no socket has been created
-    //  yet. Launching of I/O threads is delayed.
-    bool _starting;
-
-    //  If true, zmq_ctx_term was already called.
-    bool _terminating;
-
-    //  Synchronisation of accesses to global slot-related data:
-    //  sockets, empty_slots, terminating. It also synchronises
-    //  access to zombie sockets as such (as opposed to slots) and provides
-    //  a memory barrier to ensure that all CPU cores see the same data.
-    mutex_t _slot_sync;
-
-    //  The reaper thread.
-    zmq::reaper_t *_reaper;
-
-    //  I/O threads.
-    typedef std::vector<zmq::io_thread_t *> io_threads_t;
-    io_threads_t _io_threads;
-
-    //  Array of pointers to mailboxes for both application and I/O threads.
-    std::vector<i_mailbox *> _slots;
-
-    //  Mailbox for zmq_ctx_term thread.
-    mailbox_t _term_mailbox;
-
-    //  List of inproc endpoints within this context.
-    typedef std::map<std::string, endpoint_t> endpoints_t;
-    endpoints_t _endpoints;
-
-    // List of inproc connection endpoints pending a bind
-    typedef std::multimap<std::string, pending_connection_t>
-      pending_connections_t;
-    pending_connections_t _pending_connections;
-
-    //  Synchronisation of access to the list of inproc endpoints.
-    mutex_t _endpoints_sync;
-
-    //  Maximum socket ID.
-    static atomic_counter_t max_socket_id;
-
-    //  Maximum number of sockets that can be opened at the same time.
-    int _max_sockets;
-
-    //  Maximum allowed message size
-    int _max_msgsz;
-
-    //  Number of I/O threads to launch.
-    int _io_thread_count;
-
-    //  Does context wait (possibly forever) on termination?
-    bool _blocky;
-
-    //  Is IPv6 enabled on this context?
-    bool _ipv6;
-
-    // Should we use zero copy message decoding in this context?
-    bool _zero_copy;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ctx_t)
-
-#ifdef HAVE_FORK
-    // the process that created this context. Used to detect forking.
-    pid_t _pid;
-#endif
-    enum side
-    {
-        connect_side,
-        bind_side
-    };
-
-    static void
-    connect_inproc_sockets (zmq::socket_base_t *bind_socket_,
-                            const options_t &bind_options_,
-                            const pending_connection_t &pending_connection_,
-                            side side_);
-
-#ifdef ZMQ_HAVE_VMCI
-    int _vmci_fd;
-    int _vmci_family;
-    mutex_t _vmci_sync;
-#endif
-};
-}
-
-#endif
diff --git a/src/curve_client.cpp b/src/curve_client.cpp
deleted file mode 100644
index 5d1f64e82..000000000
--- a/src/curve_client.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "curve_client.hpp"
-#include "wire.hpp"
-#include "curve_client_tools.hpp"
-#include "secure_allocator.hpp"
-
-zmq::curve_client_t::curve_client_t (session_base_t *session_,
-                                     const options_t &options_,
-                                     const bool downgrade_sub_) :
-    mechanism_base_t (session_, options_),
-    curve_mechanism_base_t (session_,
-                            options_,
-                            "CurveZMQMESSAGEC",
-                            "CurveZMQMESSAGES",
-                            downgrade_sub_),
-    _state (send_hello),
-    _tools (options_.curve_public_key,
-            options_.curve_secret_key,
-            options_.curve_server_key)
-{
-}
-
-zmq::curve_client_t::~curve_client_t ()
-{
-}
-
-int zmq::curve_client_t::next_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (_state) {
-        case send_hello:
-            rc = produce_hello (msg_);
-            if (rc == 0)
-                _state = expect_welcome;
-            break;
-        case send_initiate:
-            rc = produce_initiate (msg_);
-            if (rc == 0)
-                _state = expect_ready;
-            break;
-        default:
-            errno = EAGAIN;
-            rc = -1;
-    }
-    return rc;
-}
-
-int zmq::curve_client_t::process_handshake_command (msg_t *msg_)
-{
-    const unsigned char *msg_data =
-      static_cast<unsigned char *> (msg_->data ());
-    const size_t msg_size = msg_->size ();
-
-    int rc = 0;
-    if (curve_client_tools_t::is_handshake_command_welcome (msg_data, msg_size))
-        rc = process_welcome (msg_data, msg_size);
-    else if (curve_client_tools_t::is_handshake_command_ready (msg_data,
-                                                               msg_size))
-        rc = process_ready (msg_data, msg_size);
-    else if (curve_client_tools_t::is_handshake_command_error (msg_data,
-                                                               msg_size))
-        rc = process_error (msg_data, msg_size);
-    else {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        rc = -1;
-    }
-
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-
-    return rc;
-}
-
-int zmq::curve_client_t::encode (msg_t *msg_)
-{
-    zmq_assert (_state == connected);
-    return curve_mechanism_base_t::encode (msg_);
-}
-
-int zmq::curve_client_t::decode (msg_t *msg_)
-{
-    zmq_assert (_state == connected);
-    return curve_mechanism_base_t::decode (msg_);
-}
-
-zmq::mechanism_t::status_t zmq::curve_client_t::status () const
-{
-    if (_state == connected)
-        return mechanism_t::ready;
-    if (_state == error_received)
-        return mechanism_t::error;
-
-    return mechanism_t::handshaking;
-}
-
-int zmq::curve_client_t::produce_hello (msg_t *msg_)
-{
-    int rc = msg_->init_size (200);
-    errno_assert (rc == 0);
-
-    rc = _tools.produce_hello (msg_->data (), get_and_inc_nonce ());
-    if (rc == -1) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-        // TODO this is somewhat inconsistent: we call init_size, but we may
-        // not close msg_; i.e. we assume that msg_ is initialized but empty
-        // (if it were non-empty, calling init_size might cause a leak!)
-
-        // msg_->close ();
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::curve_client_t::process_welcome (const uint8_t *msg_data_,
-                                          size_t msg_size_)
-{
-    const int rc = _tools.process_welcome (msg_data_, msg_size_,
-                                           get_writable_precom_buffer ());
-
-    if (rc == -1) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-        errno = EPROTO;
-        return -1;
-    }
-
-    _state = send_initiate;
-
-    return 0;
-}
-
-int zmq::curve_client_t::produce_initiate (msg_t *msg_)
-{
-    const size_t metadata_length = basic_properties_len ();
-    std::vector<unsigned char, secure_allocator_t<unsigned char> >
-      metadata_plaintext (metadata_length);
-
-    add_basic_properties (&metadata_plaintext[0], metadata_length);
-
-    const size_t msg_size =
-      113 + 128 + crypto_box_BOXZEROBYTES + metadata_length;
-    int rc = msg_->init_size (msg_size);
-    errno_assert (rc == 0);
-
-    rc = _tools.produce_initiate (msg_->data (), msg_size, get_and_inc_nonce (),
-                                  &metadata_plaintext[0], metadata_length);
-
-    if (-1 == rc) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-        // TODO see comment in produce_hello
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::curve_client_t::process_ready (const uint8_t *msg_data_,
-                                        size_t msg_size_)
-{
-    if (msg_size_ < 30) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const size_t clen = (msg_size_ - 14) + crypto_box_BOXZEROBYTES;
-
-    uint8_t ready_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > ready_plaintext (
-      crypto_box_ZEROBYTES + clen);
-    std::vector<uint8_t> ready_box (crypto_box_BOXZEROBYTES + 16 + clen);
-
-    std::fill (ready_box.begin (), ready_box.begin () + crypto_box_BOXZEROBYTES,
-               0);
-    memcpy (&ready_box[crypto_box_BOXZEROBYTES], msg_data_ + 14,
-            clen - crypto_box_BOXZEROBYTES);
-
-    memcpy (ready_nonce, "CurveZMQREADY---", 16);
-    memcpy (ready_nonce + 16, msg_data_ + 6, 8);
-    set_peer_nonce (get_uint64 (msg_data_ + 6));
-
-    int rc = crypto_box_open_afternm (&ready_plaintext[0], &ready_box[0], clen,
-                                      ready_nonce, get_precom_buffer ());
-
-    if (rc != 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    rc = parse_metadata (&ready_plaintext[crypto_box_ZEROBYTES],
-                         clen - crypto_box_ZEROBYTES);
-
-    if (rc == 0)
-        _state = connected;
-    else {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA);
-        errno = EPROTO;
-    }
-
-    return rc;
-}
-
-int zmq::curve_client_t::process_error (const uint8_t *msg_data_,
-                                        size_t msg_size_)
-{
-    if (_state != expect_welcome && _state != expect_ready) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    if (msg_size_ < 7) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-        errno = EPROTO;
-        return -1;
-    }
-    const size_t error_reason_len = static_cast<size_t> (msg_data_[6]);
-    if (error_reason_len > msg_size_ - 7) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-        errno = EPROTO;
-        return -1;
-    }
-    const char *error_reason = reinterpret_cast<const char *> (msg_data_) + 7;
-    handle_error_reason (error_reason, error_reason_len);
-    _state = error_received;
-    return 0;
-}
-
-#endif
diff --git a/src/curve_client.hpp b/src/curve_client.hpp
deleted file mode 100644
index 9d51d3a05..000000000
--- a/src/curve_client.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CURVE_CLIENT_HPP_INCLUDED__
-#define __ZMQ_CURVE_CLIENT_HPP_INCLUDED__
-
-#ifdef ZMQ_HAVE_CURVE
-
-#include "curve_mechanism_base.hpp"
-#include "options.hpp"
-#include "curve_client_tools.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class curve_client_t ZMQ_FINAL : public curve_mechanism_base_t
-{
-  public:
-    curve_client_t (session_base_t *session_,
-                    const options_t &options_,
-                    const bool downgrade_sub_);
-    ~curve_client_t () ZMQ_FINAL;
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int process_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int encode (msg_t *msg_) ZMQ_FINAL;
-    int decode (msg_t *msg_) ZMQ_FINAL;
-    status_t status () const ZMQ_FINAL;
-
-  private:
-    enum state_t
-    {
-        send_hello,
-        expect_welcome,
-        send_initiate,
-        expect_ready,
-        error_received,
-        connected
-    };
-
-    //  Current FSM state
-    state_t _state;
-
-    //  CURVE protocol tools
-    curve_client_tools_t _tools;
-
-    int produce_hello (msg_t *msg_);
-    int process_welcome (const uint8_t *msg_data_, size_t msg_size_);
-    int produce_initiate (msg_t *msg_);
-    int process_ready (const uint8_t *msg_data_, size_t msg_size_);
-    int process_error (const uint8_t *msg_data_, size_t msg_size_);
-};
-}
-
-#endif
-
-#endif
diff --git a/src/curve_client_tools.hpp b/src/curve_client_tools.hpp
deleted file mode 100644
index 3c098ba93..000000000
--- a/src/curve_client_tools.hpp
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CURVE_CLIENT_TOOLS_HPP_INCLUDED__
-#define __ZMQ_CURVE_CLIENT_TOOLS_HPP_INCLUDED__
-
-#ifdef ZMQ_HAVE_CURVE
-
-#if defined(ZMQ_USE_TWEETNACL)
-#include "tweetnacl.h"
-#elif defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-#if crypto_box_NONCEBYTES != 24 || crypto_box_PUBLICKEYBYTES != 32             \
-  || crypto_box_SECRETKEYBYTES != 32 || crypto_box_ZEROBYTES != 32             \
-  || crypto_box_BOXZEROBYTES != 16
-#error "CURVE library not built properly"
-#endif
-
-#include "wire.hpp"
-#include "err.hpp"
-#include "secure_allocator.hpp"
-
-#include <vector>
-
-namespace zmq
-{
-struct curve_client_tools_t
-{
-    static int produce_hello (void *data_,
-                              const uint8_t *server_key_,
-                              const uint64_t cn_nonce_,
-                              const uint8_t *cn_public_,
-                              const uint8_t *cn_secret_)
-    {
-        uint8_t hello_nonce[crypto_box_NONCEBYTES];
-        std::vector<uint8_t, secure_allocator_t<uint8_t> > hello_plaintext (
-          crypto_box_ZEROBYTES + 64, 0);
-        uint8_t hello_box[crypto_box_BOXZEROBYTES + 80];
-
-        //  Prepare the full nonce
-        memcpy (hello_nonce, "CurveZMQHELLO---", 16);
-        put_uint64 (hello_nonce + 16, cn_nonce_);
-
-        //  Create Box [64 * %x0](C'->S)
-        const int rc =
-          crypto_box (hello_box, &hello_plaintext[0], hello_plaintext.size (),
-                      hello_nonce, server_key_, cn_secret_);
-        if (rc == -1)
-            return -1;
-
-        uint8_t *hello = static_cast<uint8_t *> (data_);
-
-        memcpy (hello, "\x05HELLO", 6);
-        //  CurveZMQ major and minor version numbers
-        memcpy (hello + 6, "\1\0", 2);
-        //  Anti-amplification padding
-        memset (hello + 8, 0, 72);
-        //  Client public connection key
-        memcpy (hello + 80, cn_public_, crypto_box_PUBLICKEYBYTES);
-        //  Short nonce, prefixed by "CurveZMQHELLO---"
-        memcpy (hello + 112, hello_nonce + 16, 8);
-        //  Signature, Box [64 * %x0](C'->S)
-        memcpy (hello + 120, hello_box + crypto_box_BOXZEROBYTES, 80);
-
-        return 0;
-    }
-
-    static int process_welcome (const uint8_t *msg_data_,
-                                size_t msg_size_,
-                                const uint8_t *server_key_,
-                                const uint8_t *cn_secret_,
-                                uint8_t *cn_server_,
-                                uint8_t *cn_cookie_,
-                                uint8_t *cn_precom_)
-    {
-        if (msg_size_ != 168) {
-            errno = EPROTO;
-            return -1;
-        }
-
-        uint8_t welcome_nonce[crypto_box_NONCEBYTES];
-        std::vector<uint8_t, secure_allocator_t<uint8_t> > welcome_plaintext (
-          crypto_box_ZEROBYTES + 128);
-        uint8_t welcome_box[crypto_box_BOXZEROBYTES + 144];
-
-        //  Open Box [S' + cookie](C'->S)
-        memset (welcome_box, 0, crypto_box_BOXZEROBYTES);
-        memcpy (welcome_box + crypto_box_BOXZEROBYTES, msg_data_ + 24, 144);
-
-        memcpy (welcome_nonce, "WELCOME-", 8);
-        memcpy (welcome_nonce + 8, msg_data_ + 8, 16);
-
-        int rc = crypto_box_open (&welcome_plaintext[0], welcome_box,
-                                  sizeof welcome_box, welcome_nonce,
-                                  server_key_, cn_secret_);
-        if (rc != 0) {
-            errno = EPROTO;
-            return -1;
-        }
-
-        memcpy (cn_server_, &welcome_plaintext[crypto_box_ZEROBYTES], 32);
-        memcpy (cn_cookie_, &welcome_plaintext[crypto_box_ZEROBYTES + 32],
-                16 + 80);
-
-        //  Message independent precomputation
-        rc = crypto_box_beforenm (cn_precom_, cn_server_, cn_secret_);
-        zmq_assert (rc == 0);
-
-        return 0;
-    }
-
-    static int produce_initiate (void *data_,
-                                 size_t size_,
-                                 const uint64_t cn_nonce_,
-                                 const uint8_t *server_key_,
-                                 const uint8_t *public_key_,
-                                 const uint8_t *secret_key_,
-                                 const uint8_t *cn_public_,
-                                 const uint8_t *cn_secret_,
-                                 const uint8_t *cn_server_,
-                                 const uint8_t *cn_cookie_,
-                                 const uint8_t *metadata_plaintext_,
-                                 const size_t metadata_length_)
-    {
-        uint8_t vouch_nonce[crypto_box_NONCEBYTES];
-        std::vector<uint8_t, secure_allocator_t<uint8_t> > vouch_plaintext (
-          crypto_box_ZEROBYTES + 64);
-        uint8_t vouch_box[crypto_box_BOXZEROBYTES + 80];
-
-        //  Create vouch = Box [C',S](C->S')
-        std::fill (vouch_plaintext.begin (),
-                   vouch_plaintext.begin () + crypto_box_ZEROBYTES, 0);
-        memcpy (&vouch_plaintext[crypto_box_ZEROBYTES], cn_public_, 32);
-        memcpy (&vouch_plaintext[crypto_box_ZEROBYTES + 32], server_key_, 32);
-
-        memset (vouch_nonce, 0, crypto_box_NONCEBYTES);
-        memcpy (vouch_nonce, "VOUCH---", 8);
-        randombytes (vouch_nonce + 8, 16);
-
-        int rc =
-          crypto_box (vouch_box, &vouch_plaintext[0], vouch_plaintext.size (),
-                      vouch_nonce, cn_server_, secret_key_);
-        if (rc == -1)
-            return -1;
-
-        uint8_t initiate_nonce[crypto_box_NONCEBYTES];
-        std::vector<uint8_t> initiate_box (crypto_box_BOXZEROBYTES + 144
-                                           + metadata_length_);
-        std::vector<uint8_t, secure_allocator_t<uint8_t> > initiate_plaintext (
-          crypto_box_ZEROBYTES + 128 + metadata_length_);
-
-        //  Create Box [C + vouch + metadata](C'->S')
-        std::fill (initiate_plaintext.begin (),
-                   initiate_plaintext.begin () + crypto_box_ZEROBYTES, 0);
-        memcpy (&initiate_plaintext[crypto_box_ZEROBYTES], public_key_, 32);
-        memcpy (&initiate_plaintext[crypto_box_ZEROBYTES + 32], vouch_nonce + 8,
-                16);
-        memcpy (&initiate_plaintext[crypto_box_ZEROBYTES + 48],
-                vouch_box + crypto_box_BOXZEROBYTES, 80);
-        if (metadata_length_) {
-            memcpy (&initiate_plaintext[crypto_box_ZEROBYTES + 48 + 80],
-                    metadata_plaintext_, metadata_length_);
-        }
-
-        memcpy (initiate_nonce, "CurveZMQINITIATE", 16);
-        put_uint64 (initiate_nonce + 16, cn_nonce_);
-
-        rc = crypto_box (&initiate_box[0], &initiate_plaintext[0],
-                         crypto_box_ZEROBYTES + 128 + metadata_length_,
-                         initiate_nonce, cn_server_, cn_secret_);
-
-        if (rc == -1)
-            return -1;
-
-        uint8_t *initiate = static_cast<uint8_t *> (data_);
-
-        zmq_assert (size_
-                    == 113 + 128 + crypto_box_BOXZEROBYTES + metadata_length_);
-
-        memcpy (initiate, "\x08INITIATE", 9);
-        //  Cookie provided by the server in the WELCOME command
-        memcpy (initiate + 9, cn_cookie_, 96);
-        //  Short nonce, prefixed by "CurveZMQINITIATE"
-        memcpy (initiate + 105, initiate_nonce + 16, 8);
-        //  Box [C + vouch + metadata](C'->S')
-        memcpy (initiate + 113, &initiate_box[crypto_box_BOXZEROBYTES],
-                128 + metadata_length_ + crypto_box_BOXZEROBYTES);
-
-        return 0;
-    }
-
-    static bool is_handshake_command_welcome (const uint8_t *msg_data_,
-                                              const size_t msg_size_)
-    {
-        return is_handshake_command (msg_data_, msg_size_, "\7WELCOME");
-    }
-
-    static bool is_handshake_command_ready (const uint8_t *msg_data_,
-                                            const size_t msg_size_)
-    {
-        return is_handshake_command (msg_data_, msg_size_, "\5READY");
-    }
-
-    static bool is_handshake_command_error (const uint8_t *msg_data_,
-                                            const size_t msg_size_)
-    {
-        return is_handshake_command (msg_data_, msg_size_, "\5ERROR");
-    }
-
-    //  non-static functions
-    curve_client_tools_t (
-      const uint8_t (&curve_public_key_)[crypto_box_PUBLICKEYBYTES],
-      const uint8_t (&curve_secret_key_)[crypto_box_SECRETKEYBYTES],
-      const uint8_t (&curve_server_key_)[crypto_box_PUBLICKEYBYTES])
-    {
-        int rc;
-        memcpy (public_key, curve_public_key_, crypto_box_PUBLICKEYBYTES);
-        memcpy (secret_key, curve_secret_key_, crypto_box_SECRETKEYBYTES);
-        memcpy (server_key, curve_server_key_, crypto_box_PUBLICKEYBYTES);
-
-        //  Generate short-term key pair
-        memset (cn_secret, 0, crypto_box_SECRETKEYBYTES);
-        memset (cn_public, 0, crypto_box_PUBLICKEYBYTES);
-        rc = crypto_box_keypair (cn_public, cn_secret);
-        zmq_assert (rc == 0);
-    }
-
-    int produce_hello (void *data_, const uint64_t cn_nonce_) const
-    {
-        return produce_hello (data_, server_key, cn_nonce_, cn_public,
-                              cn_secret);
-    }
-
-    int process_welcome (const uint8_t *msg_data_,
-                         size_t msg_size_,
-                         uint8_t *cn_precom_)
-    {
-        return process_welcome (msg_data_, msg_size_, server_key, cn_secret,
-                                cn_server, cn_cookie, cn_precom_);
-    }
-
-    int produce_initiate (void *data_,
-                          size_t size_,
-                          const uint64_t cn_nonce_,
-                          const uint8_t *metadata_plaintext_,
-                          const size_t metadata_length_) const
-    {
-        return produce_initiate (data_, size_, cn_nonce_, server_key,
-                                 public_key, secret_key, cn_public, cn_secret,
-                                 cn_server, cn_cookie, metadata_plaintext_,
-                                 metadata_length_);
-    }
-
-    //  Our public key (C)
-    uint8_t public_key[crypto_box_PUBLICKEYBYTES];
-
-    //  Our secret key (c)
-    uint8_t secret_key[crypto_box_SECRETKEYBYTES];
-
-    //  Our short-term public key (C')
-    uint8_t cn_public[crypto_box_PUBLICKEYBYTES];
-
-    //  Our short-term secret key (c')
-    uint8_t cn_secret[crypto_box_SECRETKEYBYTES];
-
-    //  Server's public key (S)
-    uint8_t server_key[crypto_box_PUBLICKEYBYTES];
-
-    //  Server's short-term public key (S')
-    uint8_t cn_server[crypto_box_PUBLICKEYBYTES];
-
-    //  Cookie received from server
-    uint8_t cn_cookie[16 + 80];
-
-  private:
-    template <size_t N>
-    static bool is_handshake_command (const uint8_t *msg_data_,
-                                      const size_t msg_size_,
-                                      const char (&prefix_)[N])
-    {
-        return msg_size_ >= (N - 1) && !memcmp (msg_data_, prefix_, N - 1);
-    }
-};
-}
-
-#endif
-
-#endif
diff --git a/src/curve_mechanism_base.cpp b/src/curve_mechanism_base.cpp
deleted file mode 100644
index 6f0173e1d..000000000
--- a/src/curve_mechanism_base.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "precompiled.hpp"
-#include "curve_mechanism_base.hpp"
-#include "msg.hpp"
-#include "wire.hpp"
-#include "session_base.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-
-#ifdef ZMQ_USE_LIBSODIUM
-//  libsodium added crypto_box_easy_afternm and crypto_box_open_easy_afternm with
-//  https: //github.com/jedisct1/libsodium/commit/aaf5fbf2e53a33b18d8ea9bdf2c6f73d7acc8c3e
-#if SODIUM_LIBRARY_VERSION_MAJOR > 7                                           \
-  || (SODIUM_LIBRARY_VERSION_MAJOR == 7 && SODIUM_LIBRARY_VERSION_MINOR >= 4)
-#define ZMQ_HAVE_CRYPTO_BOX_EASY_FNS 1
-#endif
-#endif
-
-zmq::curve_mechanism_base_t::curve_mechanism_base_t (
-  session_base_t *session_,
-  const options_t &options_,
-  const char *encode_nonce_prefix_,
-  const char *decode_nonce_prefix_,
-  const bool downgrade_sub_) :
-    mechanism_base_t (session_, options_),
-    curve_encoding_t (
-      encode_nonce_prefix_, decode_nonce_prefix_, downgrade_sub_)
-{
-}
-
-int zmq::curve_mechanism_base_t::encode (msg_t *msg_)
-{
-    return curve_encoding_t::encode (msg_);
-}
-
-int zmq::curve_mechanism_base_t::decode (msg_t *msg_)
-{
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return -1;
-
-    int error_event_code;
-    rc = curve_encoding_t::decode (msg_, &error_event_code);
-    if (-1 == rc) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), error_event_code);
-    }
-
-    return rc;
-}
-
-zmq::curve_encoding_t::curve_encoding_t (const char *encode_nonce_prefix_,
-                                         const char *decode_nonce_prefix_,
-                                         const bool downgrade_sub_) :
-    _encode_nonce_prefix (encode_nonce_prefix_),
-    _decode_nonce_prefix (decode_nonce_prefix_),
-    _cn_nonce (1),
-    _cn_peer_nonce (1),
-    _downgrade_sub (downgrade_sub_)
-{
-}
-
-//  Right now, we only transport the lower two bit flags of zmq::msg_t, so they
-//  are binary identical, and we can just use a bitmask to select them. If we
-//  happened to add more flags, this might change.
-static const uint8_t flag_mask = zmq::msg_t::more | zmq::msg_t::command;
-static const size_t flags_len = 1;
-static const size_t nonce_prefix_len = 16;
-static const char message_command[] = "\x07MESSAGE";
-static const size_t message_command_len = sizeof (message_command) - 1;
-static const size_t message_header_len =
-  message_command_len + sizeof (zmq::curve_encoding_t::nonce_t);
-
-#ifndef ZMQ_USE_LIBSODIUM
-static const size_t crypto_box_MACBYTES = 16;
-#endif
-
-int zmq::curve_encoding_t::check_validity (msg_t *msg_, int *error_event_code_)
-{
-    const size_t size = msg_->size ();
-    const uint8_t *const message = static_cast<uint8_t *> (msg_->data ());
-
-    if (size < message_command_len
-        || 0 != memcmp (message, message_command, message_command_len)) {
-        *error_event_code_ = ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND;
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (size < message_header_len + crypto_box_MACBYTES + flags_len) {
-        *error_event_code_ = ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE;
-        errno = EPROTO;
-        return -1;
-    }
-
-    {
-        const uint64_t nonce = get_uint64 (message + message_command_len);
-        if (nonce <= _cn_peer_nonce) {
-            *error_event_code_ = ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE;
-            errno = EPROTO;
-            return -1;
-        }
-        set_peer_nonce (nonce);
-    }
-
-    return 0;
-}
-
-int zmq::curve_encoding_t::encode (msg_t *msg_)
-{
-    size_t sub_cancel_len = 0;
-    uint8_t message_nonce[crypto_box_NONCEBYTES];
-    memcpy (message_nonce, _encode_nonce_prefix, nonce_prefix_len);
-    put_uint64 (message_nonce + nonce_prefix_len, get_and_inc_nonce ());
-
-    if (msg_->is_subscribe () || msg_->is_cancel ()) {
-        if (_downgrade_sub)
-            sub_cancel_len = 1;
-        else
-            sub_cancel_len = msg_->is_cancel ()
-                               ? zmq::msg_t::cancel_cmd_name_size
-                               : zmq::msg_t::sub_cmd_name_size;
-    }
-
-#ifdef ZMQ_HAVE_CRYPTO_BOX_EASY_FNS
-    const size_t mlen = flags_len + sub_cancel_len + msg_->size ();
-    std::vector<uint8_t> message_plaintext (mlen);
-#else
-    const size_t mlen =
-      crypto_box_ZEROBYTES + flags_len + sub_cancel_len + msg_->size ();
-    std::vector<uint8_t> message_plaintext_with_zerobytes (mlen);
-    uint8_t *const message_plaintext =
-      &message_plaintext_with_zerobytes[crypto_box_ZEROBYTES];
-
-    std::fill (message_plaintext_with_zerobytes.begin (),
-               message_plaintext_with_zerobytes.begin () + crypto_box_ZEROBYTES,
-               0);
-#endif
-
-    const uint8_t flags = msg_->flags () & flag_mask;
-    message_plaintext[0] = flags;
-
-    // For backward compatibility subscribe/cancel command messages are not stored with
-    // the message flags, and are encoded in the encoder, so that messages for < 3.0 peers
-    // can be encoded in the "old" 0/1 way rather than as commands.
-    if (sub_cancel_len == 1)
-        message_plaintext[flags_len] = msg_->is_subscribe () ? 1 : 0;
-    else if (sub_cancel_len == zmq::msg_t::sub_cmd_name_size) {
-        message_plaintext[0] |= zmq::msg_t::command;
-        memcpy (&message_plaintext[flags_len], zmq::sub_cmd_name,
-                zmq::msg_t::sub_cmd_name_size);
-    } else if (sub_cancel_len == zmq::msg_t::cancel_cmd_name_size) {
-        message_plaintext[0] |= zmq::msg_t::command;
-        memcpy (&message_plaintext[flags_len], zmq::cancel_cmd_name,
-                zmq::msg_t::cancel_cmd_name_size);
-    }
-
-    // this is copying the data from insecure memory, so there is no point in
-    // using secure_allocator_t for message_plaintext
-    if (msg_->size () > 0)
-        memcpy (&message_plaintext[flags_len + sub_cancel_len], msg_->data (),
-                msg_->size ());
-
-#ifdef ZMQ_HAVE_CRYPTO_BOX_EASY_FNS
-    msg_t msg_box;
-    int rc =
-      msg_box.init_size (message_header_len + mlen + crypto_box_MACBYTES);
-    zmq_assert (rc == 0);
-
-    rc = crypto_box_easy_afternm (
-      static_cast<uint8_t *> (msg_box.data ()) + message_header_len,
-      &message_plaintext[0], mlen, message_nonce, _cn_precom);
-    zmq_assert (rc == 0);
-
-    msg_->move (msg_box);
-
-    uint8_t *const message = static_cast<uint8_t *> (msg_->data ());
-#else
-    std::vector<uint8_t> message_box (mlen);
-
-    int rc =
-      crypto_box_afternm (&message_box[0], &message_plaintext_with_zerobytes[0],
-                          mlen, message_nonce, _cn_precom);
-    zmq_assert (rc == 0);
-
-    rc = msg_->close ();
-    zmq_assert (rc == 0);
-
-    rc = msg_->init_size (16 + mlen - crypto_box_BOXZEROBYTES);
-    zmq_assert (rc == 0);
-
-    uint8_t *const message = static_cast<uint8_t *> (msg_->data ());
-
-    memcpy (message + message_header_len, &message_box[crypto_box_BOXZEROBYTES],
-            mlen - crypto_box_BOXZEROBYTES);
-#endif
-
-    memcpy (message, message_command, message_command_len);
-    memcpy (message + message_command_len, message_nonce + nonce_prefix_len,
-            sizeof (nonce_t));
-
-    return 0;
-}
-
-int zmq::curve_encoding_t::decode (msg_t *msg_, int *error_event_code_)
-{
-    int rc = check_validity (msg_, error_event_code_);
-    if (0 != rc) {
-        return rc;
-    }
-
-    uint8_t *const message = static_cast<uint8_t *> (msg_->data ());
-
-    uint8_t message_nonce[crypto_box_NONCEBYTES];
-    memcpy (message_nonce, _decode_nonce_prefix, nonce_prefix_len);
-    memcpy (message_nonce + nonce_prefix_len, message + message_command_len,
-            sizeof (nonce_t));
-
-#ifdef ZMQ_HAVE_CRYPTO_BOX_EASY_FNS
-    const size_t clen = msg_->size () - message_header_len;
-
-    uint8_t *const message_plaintext = message + message_header_len;
-
-    rc = crypto_box_open_easy_afternm (message_plaintext,
-                                       message + message_header_len, clen,
-                                       message_nonce, _cn_precom);
-#else
-    const size_t clen =
-      crypto_box_BOXZEROBYTES + msg_->size () - message_header_len;
-
-    std::vector<uint8_t> message_plaintext_with_zerobytes (clen);
-    std::vector<uint8_t> message_box (clen);
-
-    std::fill (message_box.begin (),
-               message_box.begin () + crypto_box_BOXZEROBYTES, 0);
-    memcpy (&message_box[crypto_box_BOXZEROBYTES], message + message_header_len,
-            msg_->size () - message_header_len);
-
-    rc = crypto_box_open_afternm (&message_plaintext_with_zerobytes[0],
-                                  &message_box[0], clen, message_nonce,
-                                  _cn_precom);
-
-    const uint8_t *const message_plaintext =
-      &message_plaintext_with_zerobytes[crypto_box_ZEROBYTES];
-#endif
-
-    if (rc == 0) {
-        const uint8_t flags = message_plaintext[0];
-
-#ifdef ZMQ_HAVE_CRYPTO_BOX_EASY_FNS
-        const size_t plaintext_size = clen - flags_len - crypto_box_MACBYTES;
-
-        if (plaintext_size > 0) {
-            memmove (msg_->data (), &message_plaintext[flags_len],
-                     plaintext_size);
-        }
-
-        msg_->shrink (plaintext_size);
-#else
-        rc = msg_->close ();
-        zmq_assert (rc == 0);
-
-        rc = msg_->init_size (clen - flags_len - crypto_box_ZEROBYTES);
-        zmq_assert (rc == 0);
-
-        // this is copying the data to insecure memory, so there is no point in
-        // using secure_allocator_t for message_plaintext
-        if (msg_->size () > 0) {
-            memcpy (msg_->data (), &message_plaintext[flags_len],
-                    msg_->size ());
-        }
-#endif
-
-        msg_->set_flags (flags & flag_mask);
-    } else {
-        // CURVE I : connection key used for MESSAGE is wrong
-        *error_event_code_ = ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC;
-        errno = EPROTO;
-    }
-
-    return rc;
-}
-
-#endif
diff --git a/src/curve_mechanism_base.hpp b/src/curve_mechanism_base.hpp
deleted file mode 100644
index a72965e9b..000000000
--- a/src/curve_mechanism_base.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CURVE_MECHANISM_BASE_HPP_INCLUDED__
-#define __ZMQ_CURVE_MECHANISM_BASE_HPP_INCLUDED__
-
-#ifdef ZMQ_HAVE_CURVE
-
-#if defined(ZMQ_USE_TWEETNACL)
-#include "tweetnacl.h"
-#elif defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-#if crypto_box_NONCEBYTES != 24 || crypto_box_PUBLICKEYBYTES != 32             \
-  || crypto_box_SECRETKEYBYTES != 32 || crypto_box_ZEROBYTES != 32             \
-  || crypto_box_BOXZEROBYTES != 16 || crypto_secretbox_NONCEBYTES != 24        \
-  || crypto_secretbox_ZEROBYTES != 32 || crypto_secretbox_BOXZEROBYTES != 16
-#error "CURVE library not built properly"
-#endif
-
-#include "mechanism_base.hpp"
-#include "options.hpp"
-
-#include <memory>
-
-namespace zmq
-{
-class curve_encoding_t
-{
-  public:
-    curve_encoding_t (const char *encode_nonce_prefix_,
-                      const char *decode_nonce_prefix_,
-                      const bool downgrade_sub_);
-
-    int encode (msg_t *msg_);
-    int decode (msg_t *msg_, int *error_event_code_);
-
-    uint8_t *get_writable_precom_buffer () { return _cn_precom; }
-    const uint8_t *get_precom_buffer () const { return _cn_precom; }
-
-    typedef uint64_t nonce_t;
-
-    nonce_t get_and_inc_nonce () { return _cn_nonce++; }
-    void set_peer_nonce (nonce_t peer_nonce_) { _cn_peer_nonce = peer_nonce_; };
-
-  private:
-    int check_validity (msg_t *msg_, int *error_event_code_);
-
-    const char *_encode_nonce_prefix;
-    const char *_decode_nonce_prefix;
-
-    nonce_t _cn_nonce;
-    nonce_t _cn_peer_nonce;
-
-    //  Intermediary buffer used to speed up boxing and unboxing.
-    uint8_t _cn_precom[crypto_box_BEFORENMBYTES];
-
-    const bool _downgrade_sub;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (curve_encoding_t)
-};
-
-class curve_mechanism_base_t : public virtual mechanism_base_t,
-                               public curve_encoding_t
-{
-  public:
-    curve_mechanism_base_t (session_base_t *session_,
-                            const options_t &options_,
-                            const char *encode_nonce_prefix_,
-                            const char *decode_nonce_prefix_,
-                            const bool downgrade_sub_);
-
-    // mechanism implementation
-    int encode (msg_t *msg_) ZMQ_OVERRIDE;
-    int decode (msg_t *msg_) ZMQ_OVERRIDE;
-};
-}
-
-#endif
-
-#endif
diff --git a/src/curve_server.cpp b/src/curve_server.cpp
deleted file mode 100644
index fadfc7463..000000000
--- a/src/curve_server.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "curve_server.hpp"
-#include "wire.hpp"
-#include "secure_allocator.hpp"
-
-zmq::curve_server_t::curve_server_t (session_base_t *session_,
-                                     const std::string &peer_address_,
-                                     const options_t &options_,
-                                     const bool downgrade_sub_) :
-    mechanism_base_t (session_, options_),
-    zap_client_common_handshake_t (
-      session_, peer_address_, options_, sending_ready),
-    curve_mechanism_base_t (session_,
-                            options_,
-                            "CurveZMQMESSAGES",
-                            "CurveZMQMESSAGEC",
-                            downgrade_sub_)
-{
-    int rc;
-    //  Fetch our secret key from socket options
-    memcpy (_secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES);
-
-    //  Generate short-term key pair
-    memset (_cn_secret, 0, crypto_box_SECRETKEYBYTES);
-    memset (_cn_public, 0, crypto_box_PUBLICKEYBYTES);
-    rc = crypto_box_keypair (_cn_public, _cn_secret);
-    zmq_assert (rc == 0);
-}
-
-zmq::curve_server_t::~curve_server_t ()
-{
-}
-
-int zmq::curve_server_t::next_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (state) {
-        case sending_welcome:
-            rc = produce_welcome (msg_);
-            if (rc == 0)
-                state = waiting_for_initiate;
-            break;
-        case sending_ready:
-            rc = produce_ready (msg_);
-            if (rc == 0)
-                state = ready;
-            break;
-        case sending_error:
-            rc = produce_error (msg_);
-            if (rc == 0)
-                state = error_sent;
-            break;
-        default:
-            errno = EAGAIN;
-            rc = -1;
-            break;
-    }
-    return rc;
-}
-
-int zmq::curve_server_t::process_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (state) {
-        case waiting_for_hello:
-            rc = process_hello (msg_);
-            break;
-        case waiting_for_initiate:
-            rc = process_initiate (msg_);
-            break;
-        default:
-            // TODO I think this is not a case reachable with a misbehaving
-            // client. It is not an "invalid handshake command", but would be
-            // trying to process a handshake command in an invalid state,
-            // which is purely under control of this peer.
-            // Therefore, it should be changed to zmq_assert (false);
-
-            // CURVE I: invalid handshake command
-            session->get_socket ()->event_handshake_failed_protocol (
-              session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED);
-            errno = EPROTO;
-            rc = -1;
-            break;
-    }
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-    return rc;
-}
-
-int zmq::curve_server_t::encode (msg_t *msg_)
-{
-    zmq_assert (state == ready);
-    return curve_mechanism_base_t::encode (msg_);
-}
-
-int zmq::curve_server_t::decode (msg_t *msg_)
-{
-    zmq_assert (state == ready);
-    return curve_mechanism_base_t::decode (msg_);
-}
-
-int zmq::curve_server_t::process_hello (msg_t *msg_)
-{
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return -1;
-
-    const size_t size = msg_->size ();
-    const uint8_t *const hello = static_cast<uint8_t *> (msg_->data ());
-
-    if (size < 6 || memcmp (hello, "\x05HELLO", 6)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (size != 200) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const uint8_t major = hello[6];
-    const uint8_t minor = hello[7];
-
-    if (major != 1 || minor != 0) {
-        // CURVE I: client HELLO has unknown version number
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  Save client's short-term public key (C')
-    memcpy (_cn_client, hello + 80, 32);
-
-    uint8_t hello_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > hello_plaintext (
-      crypto_box_ZEROBYTES + 64);
-    uint8_t hello_box[crypto_box_BOXZEROBYTES + 80];
-
-    memcpy (hello_nonce, "CurveZMQHELLO---", 16);
-    memcpy (hello_nonce + 16, hello + 112, 8);
-    set_peer_nonce (get_uint64 (hello + 112));
-
-    memset (hello_box, 0, crypto_box_BOXZEROBYTES);
-    memcpy (hello_box + crypto_box_BOXZEROBYTES, hello + 120, 80);
-
-    //  Open Box [64 * %x0](C'->S)
-    rc = crypto_box_open (&hello_plaintext[0], hello_box, sizeof hello_box,
-                          hello_nonce, _cn_client, _secret_key);
-    if (rc != 0) {
-        // CURVE I: cannot open client HELLO -- wrong server key?
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    state = sending_welcome;
-    return rc;
-}
-
-int zmq::curve_server_t::produce_welcome (msg_t *msg_)
-{
-    uint8_t cookie_nonce[crypto_secretbox_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > cookie_plaintext (
-      crypto_secretbox_ZEROBYTES + 64);
-    uint8_t cookie_ciphertext[crypto_secretbox_BOXZEROBYTES + 80];
-
-    //  Create full nonce for encryption
-    //  8-byte prefix plus 16-byte random nonce
-    memset (cookie_nonce, 0, crypto_secretbox_NONCEBYTES);
-    memcpy (cookie_nonce, "COOKIE--", 8);
-    randombytes (cookie_nonce + 8, 16);
-
-    //  Generate cookie = Box [C' + s'](t)
-    std::fill (cookie_plaintext.begin (),
-               cookie_plaintext.begin () + crypto_secretbox_ZEROBYTES, 0);
-    memcpy (&cookie_plaintext[crypto_secretbox_ZEROBYTES], _cn_client, 32);
-    memcpy (&cookie_plaintext[crypto_secretbox_ZEROBYTES + 32], _cn_secret, 32);
-
-    //  Generate fresh cookie key
-    memset (_cookie_key, 0, crypto_secretbox_KEYBYTES);
-    randombytes (_cookie_key, crypto_secretbox_KEYBYTES);
-
-    //  Encrypt using symmetric cookie key
-    int rc =
-      crypto_secretbox (cookie_ciphertext, &cookie_plaintext[0],
-                        cookie_plaintext.size (), cookie_nonce, _cookie_key);
-    zmq_assert (rc == 0);
-
-    uint8_t welcome_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > welcome_plaintext (
-      crypto_box_ZEROBYTES + 128);
-    uint8_t welcome_ciphertext[crypto_box_BOXZEROBYTES + 144];
-
-    //  Create full nonce for encryption
-    //  8-byte prefix plus 16-byte random nonce
-    memset (welcome_nonce, 0, crypto_box_NONCEBYTES);
-    memcpy (welcome_nonce, "WELCOME-", 8);
-    randombytes (welcome_nonce + 8, crypto_box_NONCEBYTES - 8);
-
-    //  Create 144-byte Box [S' + cookie](S->C')
-    std::fill (welcome_plaintext.begin (),
-               welcome_plaintext.begin () + crypto_box_ZEROBYTES, 0);
-    memcpy (&welcome_plaintext[crypto_box_ZEROBYTES], _cn_public, 32);
-    memcpy (&welcome_plaintext[crypto_box_ZEROBYTES + 32], cookie_nonce + 8,
-            16);
-    memcpy (&welcome_plaintext[crypto_box_ZEROBYTES + 48],
-            cookie_ciphertext + crypto_secretbox_BOXZEROBYTES, 80);
-
-    rc = crypto_box (welcome_ciphertext, &welcome_plaintext[0],
-                     welcome_plaintext.size (), welcome_nonce, _cn_client,
-                     _secret_key);
-
-    //  TODO I think we should change this back to zmq_assert (rc == 0);
-    //  as it was before https://github.com/zeromq/libzmq/pull/1832
-    //  The reason given there was that secret_key might be 0ed.
-    //  But if it were, we would never get this far, since we could
-    //  not have opened the client's hello box with a 0ed key.
-
-    if (rc == -1)
-        return -1;
-
-    rc = msg_->init_size (168);
-    errno_assert (rc == 0);
-
-    uint8_t *const welcome = static_cast<uint8_t *> (msg_->data ());
-    memcpy (welcome, "\x07WELCOME", 8);
-    memcpy (welcome + 8, welcome_nonce + 8, 16);
-    memcpy (welcome + 24, welcome_ciphertext + crypto_box_BOXZEROBYTES, 144);
-
-    return 0;
-}
-
-int zmq::curve_server_t::process_initiate (msg_t *msg_)
-{
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return -1;
-
-    const size_t size = msg_->size ();
-    const uint8_t *initiate = static_cast<uint8_t *> (msg_->data ());
-
-    if (size < 9 || memcmp (initiate, "\x08INITIATE", 9)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (size < 257) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    uint8_t cookie_nonce[crypto_secretbox_NONCEBYTES];
-    uint8_t cookie_plaintext[crypto_secretbox_ZEROBYTES + 64];
-    uint8_t cookie_box[crypto_secretbox_BOXZEROBYTES + 80];
-
-    //  Open Box [C' + s'](t)
-    memset (cookie_box, 0, crypto_secretbox_BOXZEROBYTES);
-    memcpy (cookie_box + crypto_secretbox_BOXZEROBYTES, initiate + 25, 80);
-
-    memcpy (cookie_nonce, "COOKIE--", 8);
-    memcpy (cookie_nonce + 8, initiate + 9, 16);
-
-    rc = crypto_secretbox_open (cookie_plaintext, cookie_box, sizeof cookie_box,
-                                cookie_nonce, _cookie_key);
-    if (rc != 0) {
-        // CURVE I: cannot open client INITIATE cookie
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  Check cookie plain text is as expected [C' + s']
-    if (memcmp (cookie_plaintext + crypto_secretbox_ZEROBYTES, _cn_client, 32)
-        || memcmp (cookie_plaintext + crypto_secretbox_ZEROBYTES + 32,
-                   _cn_secret, 32)) {
-        // TODO this case is very hard to test, as it would require a modified
-        //  client that knows the server's secret temporary cookie key
-
-        // CURVE I: client INITIATE cookie is not valid
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const size_t clen = (size - 113) + crypto_box_BOXZEROBYTES;
-
-    uint8_t initiate_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > initiate_plaintext (
-      crypto_box_ZEROBYTES + clen);
-    std::vector<uint8_t> initiate_box (crypto_box_BOXZEROBYTES + clen);
-
-    //  Open Box [C + vouch + metadata](C'->S')
-    std::fill (initiate_box.begin (),
-               initiate_box.begin () + crypto_box_BOXZEROBYTES, 0);
-    memcpy (&initiate_box[crypto_box_BOXZEROBYTES], initiate + 113,
-            clen - crypto_box_BOXZEROBYTES);
-
-    memcpy (initiate_nonce, "CurveZMQINITIATE", 16);
-    memcpy (initiate_nonce + 16, initiate + 105, 8);
-    set_peer_nonce (get_uint64 (initiate + 105));
-
-    const uint8_t *client_key = &initiate_plaintext[crypto_box_ZEROBYTES];
-
-    rc = crypto_box_open (&initiate_plaintext[0], &initiate_box[0], clen,
-                          initiate_nonce, _cn_client, _cn_secret);
-    if (rc != 0) {
-        // CURVE I: cannot open client INITIATE
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    uint8_t vouch_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > vouch_plaintext (
-      crypto_box_ZEROBYTES + 64);
-    uint8_t vouch_box[crypto_box_BOXZEROBYTES + 80];
-
-    //  Open Box Box [C',S](C->S') and check contents
-    memset (vouch_box, 0, crypto_box_BOXZEROBYTES);
-    memcpy (vouch_box + crypto_box_BOXZEROBYTES,
-            &initiate_plaintext[crypto_box_ZEROBYTES + 48], 80);
-
-    memset (vouch_nonce, 0, crypto_box_NONCEBYTES);
-    memcpy (vouch_nonce, "VOUCH---", 8);
-    memcpy (vouch_nonce + 8, &initiate_plaintext[crypto_box_ZEROBYTES + 32],
-            16);
-
-    rc = crypto_box_open (&vouch_plaintext[0], vouch_box, sizeof vouch_box,
-                          vouch_nonce, client_key, _cn_secret);
-    if (rc != 0) {
-        // CURVE I: cannot open client INITIATE vouch
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  What we decrypted must be the client's short-term public key
-    if (memcmp (&vouch_plaintext[crypto_box_ZEROBYTES], _cn_client, 32)) {
-        // TODO this case is very hard to test, as it would require a modified
-        //  client that knows the server's secret short-term key
-
-        // CURVE I: invalid handshake from client (public key)
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  Precompute connection secret from client key
-    rc = crypto_box_beforenm (get_writable_precom_buffer (), _cn_client,
-                              _cn_secret);
-    zmq_assert (rc == 0);
-
-    //  Given this is a backward-incompatible change, it's behind a socket
-    //  option disabled by default.
-    if (zap_required () || !options.zap_enforce_domain) {
-        //  Use ZAP protocol (RFC 27) to authenticate the user.
-        rc = session->zap_connect ();
-        if (rc == 0) {
-            send_zap_request (client_key);
-            state = waiting_for_zap_reply;
-
-            //  TODO actually, it is quite unlikely that we can read the ZAP
-            //  reply already, but removing this has some strange side-effect
-            //  (probably because the pipe's in_active flag is true until a read
-            //  is attempted)
-            if (-1 == receive_and_process_zap_reply ())
-                return -1;
-        } else if (!options.zap_enforce_domain) {
-            //  This supports the Stonehouse pattern (encryption without
-            //  authentication) in legacy mode (domain set but no handler).
-            state = sending_ready;
-        } else {
-            session->get_socket ()->event_handshake_failed_no_detail (
-              session->get_endpoint (), EFAULT);
-            return -1;
-        }
-    } else {
-        //  This supports the Stonehouse pattern (encryption without authentication).
-        state = sending_ready;
-    }
-
-    return parse_metadata (&initiate_plaintext[crypto_box_ZEROBYTES + 128],
-                           clen - crypto_box_ZEROBYTES - 128);
-}
-
-int zmq::curve_server_t::produce_ready (msg_t *msg_)
-{
-    const size_t metadata_length = basic_properties_len ();
-    uint8_t ready_nonce[crypto_box_NONCEBYTES];
-
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > ready_plaintext (
-      crypto_box_ZEROBYTES + metadata_length);
-
-    //  Create Box [metadata](S'->C')
-    std::fill (ready_plaintext.begin (),
-               ready_plaintext.begin () + crypto_box_ZEROBYTES, 0);
-    uint8_t *ptr = &ready_plaintext[crypto_box_ZEROBYTES];
-
-    ptr += add_basic_properties (ptr, metadata_length);
-    const size_t mlen = ptr - &ready_plaintext[0];
-
-    memcpy (ready_nonce, "CurveZMQREADY---", 16);
-    put_uint64 (ready_nonce + 16, get_and_inc_nonce ());
-
-    std::vector<uint8_t> ready_box (crypto_box_BOXZEROBYTES + 16
-                                    + metadata_length);
-
-    int rc = crypto_box_afternm (&ready_box[0], &ready_plaintext[0], mlen,
-                                 ready_nonce, get_precom_buffer ());
-    zmq_assert (rc == 0);
-
-    rc = msg_->init_size (14 + mlen - crypto_box_BOXZEROBYTES);
-    errno_assert (rc == 0);
-
-    uint8_t *ready = static_cast<uint8_t *> (msg_->data ());
-
-    memcpy (ready, "\x05READY", 6);
-    //  Short nonce, prefixed by "CurveZMQREADY---"
-    memcpy (ready + 6, ready_nonce + 16, 8);
-    //  Box [metadata](S'->C')
-    memcpy (ready + 14, &ready_box[crypto_box_BOXZEROBYTES],
-            mlen - crypto_box_BOXZEROBYTES);
-
-    return 0;
-}
-
-int zmq::curve_server_t::produce_error (msg_t *msg_) const
-{
-    const size_t expected_status_code_length = 3;
-    zmq_assert (status_code.length () == 3);
-    const int rc = msg_->init_size (6 + 1 + expected_status_code_length);
-    zmq_assert (rc == 0);
-    char *msg_data = static_cast<char *> (msg_->data ());
-    memcpy (msg_data, "\5ERROR", 6);
-    msg_data[6] = expected_status_code_length;
-    memcpy (msg_data + 7, status_code.c_str (), expected_status_code_length);
-    return 0;
-}
-
-void zmq::curve_server_t::send_zap_request (const uint8_t *key_)
-{
-    zap_client_t::send_zap_request ("CURVE", 5, key_,
-                                    crypto_box_PUBLICKEYBYTES);
-}
-
-#endif
diff --git a/src/curve_server.hpp b/src/curve_server.hpp
deleted file mode 100644
index 995efce03..000000000
--- a/src/curve_server.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CURVE_SERVER_HPP_INCLUDED__
-#define __ZMQ_CURVE_SERVER_HPP_INCLUDED__
-
-#ifdef ZMQ_HAVE_CURVE
-
-#include "curve_mechanism_base.hpp"
-#include "options.hpp"
-#include "zap_client.hpp"
-
-namespace zmq
-{
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-class curve_server_t ZMQ_FINAL : public zap_client_common_handshake_t,
-                                 public curve_mechanism_base_t
-{
-  public:
-    curve_server_t (session_base_t *session_,
-                    const std::string &peer_address_,
-                    const options_t &options_,
-                    const bool downgrade_sub_);
-    ~curve_server_t ();
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-    int encode (msg_t *msg_);
-    int decode (msg_t *msg_);
-
-  private:
-    //  Our secret key (s)
-    uint8_t _secret_key[crypto_box_SECRETKEYBYTES];
-
-    //  Our short-term public key (S')
-    uint8_t _cn_public[crypto_box_PUBLICKEYBYTES];
-
-    //  Our short-term secret key (s')
-    uint8_t _cn_secret[crypto_box_SECRETKEYBYTES];
-
-    //  Client's short-term public key (C')
-    uint8_t _cn_client[crypto_box_PUBLICKEYBYTES];
-
-    //  Key used to produce cookie
-    uint8_t _cookie_key[crypto_secretbox_KEYBYTES];
-
-    int process_hello (msg_t *msg_);
-    int produce_welcome (msg_t *msg_);
-    int process_initiate (msg_t *msg_);
-    int produce_ready (msg_t *msg_);
-    int produce_error (msg_t *msg_) const;
-
-    void send_zap_request (const uint8_t *key_);
-};
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-}
-
-#endif
-
-#endif
diff --git a/src/dbuffer.hpp b/src/dbuffer.hpp
deleted file mode 100644
index 00ea66bef..000000000
--- a/src/dbuffer.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DBUFFER_HPP_INCLUDED__
-#define __ZMQ_DBUFFER_HPP_INCLUDED__
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <algorithm>
-
-#include "mutex.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-//  dbuffer is a single-producer single-consumer double-buffer
-//  implementation.
-//
-//  The producer writes to a back buffer and then tries to swap
-//  pointers between the back and front buffers. If it fails,
-//  due to the consumer reading from the front buffer, it just
-//  gives up, which is ok since writes are many and redundant.
-//
-//  The reader simply reads from the front buffer.
-//
-//  has_msg keeps track of whether there has been a not yet read
-//  value written, it is used by ypipe_conflate to mimic ypipe
-//  functionality regarding a reader being asleep
-
-template <typename T> class dbuffer_t;
-
-template <> class dbuffer_t<msg_t>
-{
-  public:
-    dbuffer_t () : _back (&_storage[0]), _front (&_storage[1]), _has_msg (false)
-    {
-        _back->init ();
-        _front->init ();
-    }
-
-    ~dbuffer_t ()
-    {
-        _back->close ();
-        _front->close ();
-    }
-
-    void write (const msg_t &value_)
-    {
-        zmq_assert (value_.check ());
-        *_back = value_;
-
-        zmq_assert (_back->check ());
-
-        if (_sync.try_lock ()) {
-            _front->move (*_back);
-            _has_msg = true;
-
-            _sync.unlock ();
-        }
-    }
-
-    bool read (msg_t *value_)
-    {
-        if (!value_)
-            return false;
-
-        {
-            scoped_lock_t lock (_sync);
-            if (!_has_msg)
-                return false;
-
-            zmq_assert (_front->check ());
-
-            *value_ = *_front;
-            _front->init (); // avoid double free
-
-            _has_msg = false;
-            return true;
-        }
-    }
-
-
-    bool check_read ()
-    {
-        scoped_lock_t lock (_sync);
-
-        return _has_msg;
-    }
-
-    bool probe (bool (*fn_) (const msg_t &))
-    {
-        scoped_lock_t lock (_sync);
-        return (*fn_) (*_front);
-    }
-
-
-  private:
-    msg_t _storage[2];
-    msg_t *_back, *_front;
-
-    mutex_t _sync;
-    bool _has_msg;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dbuffer_t)
-};
-}
-
-#endif
diff --git a/src/dealer.cpp b/src/dealer.cpp
deleted file mode 100644
index bf1c41da8..000000000
--- a/src/dealer.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "dealer.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::dealer_t::dealer_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_),
-    _probe_router (false)
-{
-    options.type = ZMQ_DEALER;
-    options.can_send_hello_msg = true;
-}
-
-zmq::dealer_t::~dealer_t ()
-{
-}
-
-void zmq::dealer_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    if (_probe_router) {
-        msg_t probe_msg;
-        int rc = probe_msg.init ();
-        errno_assert (rc == 0);
-
-        rc = pipe_->write (&probe_msg);
-        // zmq_assert (rc) is not applicable here, since it is not a bug.
-        LIBZMQ_UNUSED (rc);
-
-        pipe_->flush ();
-
-        rc = probe_msg.close ();
-        errno_assert (rc == 0);
-    }
-
-    _fq.attach (pipe_);
-    _lb.attach (pipe_);
-}
-
-int zmq::dealer_t::xsetsockopt (int option_,
-                                const void *optval_,
-                                size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_PROBE_ROUTER:
-            if (is_int && value >= 0) {
-                _probe_router = (value != 0);
-                return 0;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::dealer_t::xsend (msg_t *msg_)
-{
-    return sendpipe (msg_, NULL);
-}
-
-int zmq::dealer_t::xrecv (msg_t *msg_)
-{
-    return recvpipe (msg_, NULL);
-}
-
-bool zmq::dealer_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
-
-bool zmq::dealer_t::xhas_out ()
-{
-    return _lb.has_out ();
-}
-
-void zmq::dealer_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::dealer_t::xwrite_activated (pipe_t *pipe_)
-{
-    _lb.activated (pipe_);
-}
-
-void zmq::dealer_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-    _lb.pipe_terminated (pipe_);
-}
-
-int zmq::dealer_t::sendpipe (msg_t *msg_, pipe_t **pipe_)
-{
-    return _lb.sendpipe (msg_, pipe_);
-}
-
-int zmq::dealer_t::recvpipe (msg_t *msg_, pipe_t **pipe_)
-{
-    return _fq.recvpipe (msg_, pipe_);
-}
diff --git a/src/dealer.hpp b/src/dealer.hpp
deleted file mode 100644
index 5515fd39c..000000000
--- a/src/dealer.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DEALER_HPP_INCLUDED__
-#define __ZMQ_DEALER_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "fq.hpp"
-#include "lb.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-class socket_base_t;
-
-class dealer_t : public socket_base_t
-{
-  public:
-    dealer_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~dealer_t () ZMQ_OVERRIDE;
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_) ZMQ_FINAL;
-    int xsetsockopt (int option_,
-                     const void *optval_,
-                     size_t optvallen_) ZMQ_OVERRIDE;
-    int xsend (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    int xrecv (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    bool xhas_in () ZMQ_OVERRIDE;
-    bool xhas_out () ZMQ_OVERRIDE;
-    void xread_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xwrite_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xpipe_terminated (zmq::pipe_t *pipe_) ZMQ_OVERRIDE;
-
-    //  Send and recv - knowing which pipe was used.
-    int sendpipe (zmq::msg_t *msg_, zmq::pipe_t **pipe_);
-    int recvpipe (zmq::msg_t *msg_, zmq::pipe_t **pipe_);
-
-  private:
-    //  Messages are fair-queued from inbound pipes. And load-balanced to
-    //  the outbound pipes.
-    fq_t _fq;
-    lb_t _lb;
-
-    // if true, send an empty message to every connected router peer
-    bool _probe_router;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dealer_t)
-};
-}
-
-#endif
diff --git a/src/decoder.hpp b/src/decoder.hpp
deleted file mode 100644
index a2cd5a99d..000000000
--- a/src/decoder.hpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DECODER_HPP_INCLUDED__
-#define __ZMQ_DECODER_HPP_INCLUDED__
-
-#include <algorithm>
-#include <cstddef>
-#include <cstring>
-
-#include "decoder_allocators.hpp"
-#include "err.hpp"
-#include "i_decoder.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Helper base class for decoders that know the amount of data to read
-//  in advance at any moment. Knowing the amount in advance is a property
-//  of the protocol used. 0MQ framing protocol is based size-prefixed
-//  paradigm, which qualifies it to be parsed by this class.
-//  On the other hand, XML-based transports (like XMPP or SOAP) don't allow
-//  for knowing the size of data to read in advance and should use different
-//  decoding algorithms.
-//
-//  This class implements the state machine that parses the incoming buffer.
-//  Derived class should implement individual state machine actions.
-//
-//  Buffer management is done by an allocator policy.
-template <typename T, typename A = c_single_allocator>
-class decoder_base_t : public i_decoder
-{
-  public:
-    explicit decoder_base_t (const size_t buf_size_) :
-        _next (NULL),
-        _read_pos (NULL),
-        _to_read (0),
-        _allocator (buf_size_)
-    {
-        _buf = _allocator.allocate ();
-    }
-
-    ~decoder_base_t () ZMQ_OVERRIDE { _allocator.deallocate (); }
-
-    //  Returns a buffer to be filled with binary data.
-    void get_buffer (unsigned char **data_, std::size_t *size_) ZMQ_FINAL
-    {
-        _buf = _allocator.allocate ();
-
-        //  If we are expected to read large message, we'll opt for zero-
-        //  copy, i.e. we'll ask caller to fill the data directly to the
-        //  message. Note that subsequent read(s) are non-blocking, thus
-        //  each single read reads at most SO_RCVBUF bytes at once not
-        //  depending on how large is the chunk returned from here.
-        //  As a consequence, large messages being received won't block
-        //  other engines running in the same I/O thread for excessive
-        //  amounts of time.
-        if (_to_read >= _allocator.size ()) {
-            *data_ = _read_pos;
-            *size_ = _to_read;
-            return;
-        }
-
-        *data_ = _buf;
-        *size_ = _allocator.size ();
-    }
-
-    //  Processes the data in the buffer previously allocated using
-    //  get_buffer function. size_ argument specifies number of bytes
-    //  actually filled into the buffer. Function returns 1 when the
-    //  whole message was decoded or 0 when more data is required.
-    //  On error, -1 is returned and errno set accordingly.
-    //  Number of bytes processed is returned in bytes_used_.
-    int decode (const unsigned char *data_,
-                std::size_t size_,
-                std::size_t &bytes_used_) ZMQ_FINAL
-    {
-        bytes_used_ = 0;
-
-        //  In case of zero-copy simply adjust the pointers, no copying
-        //  is required. Also, run the state machine in case all the data
-        //  were processed.
-        if (data_ == _read_pos) {
-            zmq_assert (size_ <= _to_read);
-            _read_pos += size_;
-            _to_read -= size_;
-            bytes_used_ = size_;
-
-            while (!_to_read) {
-                const int rc =
-                  (static_cast<T *> (this)->*_next) (data_ + bytes_used_);
-                if (rc != 0)
-                    return rc;
-            }
-            return 0;
-        }
-
-        while (bytes_used_ < size_) {
-            //  Copy the data from buffer to the message.
-            const size_t to_copy = std::min (_to_read, size_ - bytes_used_);
-            // Only copy when destination address is different from the
-            // current address in the buffer.
-            if (_read_pos != data_ + bytes_used_) {
-                memcpy (_read_pos, data_ + bytes_used_, to_copy);
-            }
-
-            _read_pos += to_copy;
-            _to_read -= to_copy;
-            bytes_used_ += to_copy;
-            //  Try to get more space in the message to fill in.
-            //  If none is available, return.
-            while (_to_read == 0) {
-                // pass current address in the buffer
-                const int rc =
-                  (static_cast<T *> (this)->*_next) (data_ + bytes_used_);
-                if (rc != 0)
-                    return rc;
-            }
-        }
-
-        return 0;
-    }
-
-    void resize_buffer (std::size_t new_size_) ZMQ_FINAL
-    {
-        _allocator.resize (new_size_);
-    }
-
-  protected:
-    //  Prototype of state machine action. Action should return false if
-    //  it is unable to push the data to the system.
-    typedef int (T::*step_t) (unsigned char const *);
-
-    //  This function should be called from derived class to read data
-    //  from the buffer and schedule next state machine action.
-    void next_step (void *read_pos_, std::size_t to_read_, step_t next_)
-    {
-        _read_pos = static_cast<unsigned char *> (read_pos_);
-        _to_read = to_read_;
-        _next = next_;
-    }
-
-    A &get_allocator () { return _allocator; }
-
-  private:
-    //  Next step. If set to NULL, it means that associated data stream
-    //  is dead. Note that there can be still data in the process in such
-    //  case.
-    step_t _next;
-
-    //  Where to store the read data.
-    unsigned char *_read_pos;
-
-    //  How much data to read before taking next step.
-    std::size_t _to_read;
-
-    //  The duffer for data to decode.
-    A _allocator;
-    unsigned char *_buf;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (decoder_base_t)
-};
-}
-
-#endif
diff --git a/src/decoder_allocators.cpp b/src/decoder_allocators.cpp
deleted file mode 100644
index 078d294a8..000000000
--- a/src/decoder_allocators.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "decoder_allocators.hpp"
-
-#include "msg.hpp"
-
-zmq::shared_message_memory_allocator::shared_message_memory_allocator (
-  std::size_t bufsize_) :
-    _buf (NULL),
-    _buf_size (0),
-    _max_size (bufsize_),
-    _msg_content (NULL),
-    _max_counters ((_max_size + msg_t::max_vsm_size - 1) / msg_t::max_vsm_size)
-{
-}
-
-zmq::shared_message_memory_allocator::shared_message_memory_allocator (
-  std::size_t bufsize_, std::size_t max_messages_) :
-    _buf (NULL),
-    _buf_size (0),
-    _max_size (bufsize_),
-    _msg_content (NULL),
-    _max_counters (max_messages_)
-{
-}
-
-zmq::shared_message_memory_allocator::~shared_message_memory_allocator ()
-{
-    deallocate ();
-}
-
-unsigned char *zmq::shared_message_memory_allocator::allocate ()
-{
-    if (_buf) {
-        // release reference count to couple lifetime to messages
-        zmq::atomic_counter_t *c =
-          reinterpret_cast<zmq::atomic_counter_t *> (_buf);
-
-        // if refcnt drops to 0, there are no message using the buffer
-        // because either all messages have been closed or only vsm-messages
-        // were created
-        if (c->sub (1)) {
-            // buffer is still in use as message data. "Release" it and create a new one
-            // release pointer because we are going to create a new buffer
-            release ();
-        }
-    }
-
-    // if buf != NULL it is not used by any message so we can re-use it for the next run
-    if (!_buf) {
-        // allocate memory for reference counters together with reception buffer
-        std::size_t const allocationsize =
-          _max_size + sizeof (zmq::atomic_counter_t)
-          + _max_counters * sizeof (zmq::msg_t::content_t);
-
-        _buf = static_cast<unsigned char *> (std::malloc (allocationsize));
-        alloc_assert (_buf);
-
-        new (_buf) atomic_counter_t (1);
-    } else {
-        // release reference count to couple lifetime to messages
-        zmq::atomic_counter_t *c =
-          reinterpret_cast<zmq::atomic_counter_t *> (_buf);
-        c->set (1);
-    }
-
-    _buf_size = _max_size;
-    _msg_content = reinterpret_cast<zmq::msg_t::content_t *> (
-      _buf + sizeof (atomic_counter_t) + _max_size);
-    return _buf + sizeof (zmq::atomic_counter_t);
-}
-
-void zmq::shared_message_memory_allocator::deallocate ()
-{
-    zmq::atomic_counter_t *c = reinterpret_cast<zmq::atomic_counter_t *> (_buf);
-    if (_buf && !c->sub (1)) {
-        std::free (_buf);
-    }
-    clear ();
-}
-
-unsigned char *zmq::shared_message_memory_allocator::release ()
-{
-    unsigned char *b = _buf;
-    clear ();
-    return b;
-}
-
-void zmq::shared_message_memory_allocator::clear ()
-{
-    _buf = NULL;
-    _buf_size = 0;
-    _msg_content = NULL;
-}
-
-void zmq::shared_message_memory_allocator::inc_ref ()
-{
-    (reinterpret_cast<zmq::atomic_counter_t *> (_buf))->add (1);
-}
-
-void zmq::shared_message_memory_allocator::call_dec_ref (void *, void *hint_)
-{
-    zmq_assert (hint_);
-    unsigned char *buf = static_cast<unsigned char *> (hint_);
-    zmq::atomic_counter_t *c = reinterpret_cast<zmq::atomic_counter_t *> (buf);
-
-    if (!c->sub (1)) {
-        c->~atomic_counter_t ();
-        std::free (buf);
-        buf = NULL;
-    }
-}
-
-
-std::size_t zmq::shared_message_memory_allocator::size () const
-{
-    return _buf_size;
-}
-
-unsigned char *zmq::shared_message_memory_allocator::data ()
-{
-    return _buf + sizeof (zmq::atomic_counter_t);
-}
diff --git a/src/decoder_allocators.hpp b/src/decoder_allocators.hpp
deleted file mode 100644
index 2620f1b8e..000000000
--- a/src/decoder_allocators.hpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DECODER_ALLOCATORS_HPP_INCLUDED__
-#define __ZMQ_DECODER_ALLOCATORS_HPP_INCLUDED__
-
-#include <cstddef>
-#include <cstdlib>
-
-#include "atomic_counter.hpp"
-#include "msg.hpp"
-#include "err.hpp"
-
-namespace zmq
-{
-// Static buffer policy.
-class c_single_allocator
-{
-  public:
-    explicit c_single_allocator (std::size_t bufsize_) :
-        _buf_size (bufsize_),
-        _buf (static_cast<unsigned char *> (std::malloc (_buf_size)))
-    {
-        alloc_assert (_buf);
-    }
-
-    ~c_single_allocator () { std::free (_buf); }
-
-    unsigned char *allocate () { return _buf; }
-
-    void deallocate () {}
-
-    std::size_t size () const { return _buf_size; }
-
-    //  This buffer is fixed, size must not be changed
-    void resize (std::size_t new_size_) { LIBZMQ_UNUSED (new_size_); }
-
-  private:
-    std::size_t _buf_size;
-    unsigned char *_buf;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (c_single_allocator)
-};
-
-// This allocator allocates a reference counted buffer which is used by v2_decoder_t
-// to use zero-copy msg::init_data to create messages with memory from this buffer as
-// data storage.
-//
-// The buffer is allocated with a reference count of 1 to make sure that is is alive while
-// decoding messages. Otherwise, it is possible that e.g. the first message increases the count
-// from zero to one, gets passed to the user application, processed in the user thread and deleted
-// which would then deallocate the buffer. The drawback is that the buffer may be allocated longer
-// than necessary because it is only deleted when allocate is called the next time.
-class shared_message_memory_allocator
-{
-  public:
-    explicit shared_message_memory_allocator (std::size_t bufsize_);
-
-    // Create an allocator for a maximum number of messages
-    shared_message_memory_allocator (std::size_t bufsize_,
-                                     std::size_t max_messages_);
-
-    ~shared_message_memory_allocator ();
-
-    // Allocate a new buffer
-    //
-    // This releases the current buffer to be bound to the lifetime of the messages
-    // created on this buffer.
-    unsigned char *allocate ();
-
-    // force deallocation of buffer.
-    void deallocate ();
-
-    // Give up ownership of the buffer. The buffer's lifetime is now coupled to
-    // the messages constructed on top of it.
-    unsigned char *release ();
-
-    void inc_ref ();
-
-    static void call_dec_ref (void *, void *hint_);
-
-    std::size_t size () const;
-
-    // Return pointer to the first message data byte.
-    unsigned char *data ();
-
-    // Return pointer to the first byte of the buffer.
-    unsigned char *buffer () { return _buf; }
-
-    void resize (std::size_t new_size_) { _buf_size = new_size_; }
-
-    zmq::msg_t::content_t *provide_content () { return _msg_content; }
-
-    void advance_content () { _msg_content++; }
-
-  private:
-    void clear ();
-
-    unsigned char *_buf;
-    std::size_t _buf_size;
-    const std::size_t _max_size;
-    zmq::msg_t::content_t *_msg_content;
-    std::size_t _max_counters;
-};
-}
-
-#endif
diff --git a/src/devpoll.cpp b/src/devpoll.cpp
deleted file mode 100644
index 11b38ccb7..000000000
--- a/src/devpoll.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "devpoll.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_DEVPOLL
-
-#include <sys/devpoll.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <limits.h>
-#include <algorithm>
-
-#include "devpoll.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-zmq::devpoll_t::devpoll_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_)
-{
-    devpoll_fd = open ("/dev/poll", O_RDWR);
-    errno_assert (devpoll_fd != -1);
-}
-
-zmq::devpoll_t::~devpoll_t ()
-{
-    //  Wait till the worker thread exits.
-    stop_worker ();
-
-    close (devpoll_fd);
-}
-
-void zmq::devpoll_t::devpoll_ctl (fd_t fd_, short events_)
-{
-    struct pollfd pfd = {fd_, events_, 0};
-    ssize_t rc = write (devpoll_fd, &pfd, sizeof pfd);
-    zmq_assert (rc == sizeof pfd);
-}
-
-zmq::devpoll_t::handle_t zmq::devpoll_t::add_fd (fd_t fd_,
-                                                 i_poll_events *reactor_)
-{
-    check_thread ();
-    //  If the file descriptor table is too small expand it.
-    fd_table_t::size_type sz = fd_table.size ();
-    if (sz <= (fd_table_t::size_type) fd_) {
-        fd_table.resize (fd_ + 1);
-        while (sz != (fd_table_t::size_type) (fd_ + 1)) {
-            fd_table[sz].valid = false;
-            ++sz;
-        }
-    }
-
-    zmq_assert (!fd_table[fd_].valid);
-
-    fd_table[fd_].events = 0;
-    fd_table[fd_].reactor = reactor_;
-    fd_table[fd_].valid = true;
-    fd_table[fd_].accepted = false;
-
-    devpoll_ctl (fd_, 0);
-    pending_list.push_back (fd_);
-
-    //  Increase the load metric of the thread.
-    adjust_load (1);
-
-    return fd_;
-}
-
-void zmq::devpoll_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    zmq_assert (fd_table[handle_].valid);
-
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].valid = false;
-
-    //  Decrease the load metric of the thread.
-    adjust_load (-1);
-}
-
-void zmq::devpoll_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].events |= POLLIN;
-    devpoll_ctl (handle_, fd_table[handle_].events);
-}
-
-void zmq::devpoll_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].events &= ~((short) POLLIN);
-    devpoll_ctl (handle_, fd_table[handle_].events);
-}
-
-void zmq::devpoll_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].events |= POLLOUT;
-    devpoll_ctl (handle_, fd_table[handle_].events);
-}
-
-void zmq::devpoll_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].events &= ~((short) POLLOUT);
-    devpoll_ctl (handle_, fd_table[handle_].events);
-}
-
-void zmq::devpoll_t::stop ()
-{
-    check_thread ();
-}
-
-int zmq::devpoll_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::devpoll_t::loop ()
-{
-    while (true) {
-        struct pollfd ev_buf[max_io_events];
-        struct dvpoll poll_req;
-
-        for (pending_list_t::size_type i = 0; i < pending_list.size (); i++)
-            fd_table[pending_list[i]].accepted = true;
-        pending_list.clear ();
-
-        //  Execute any due timers.
-        int timeout = (int) execute_timers ();
-
-        if (get_load () == 0) {
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-        //  Wait for events.
-        //  On Solaris, we can retrieve no more then (OPEN_MAX - 1) events.
-        poll_req.dp_fds = &ev_buf[0];
-#if defined ZMQ_HAVE_SOLARIS
-        poll_req.dp_nfds = std::min ((int) max_io_events, OPEN_MAX - 1);
-#else
-        poll_req.dp_nfds = max_io_events;
-#endif
-        poll_req.dp_timeout = timeout ? timeout : -1;
-        int n = ioctl (devpoll_fd, DP_POLL, &poll_req);
-        if (n == -1 && errno == EINTR)
-            continue;
-        errno_assert (n != -1);
-
-        for (int i = 0; i < n; i++) {
-            fd_entry_t *fd_ptr = &fd_table[ev_buf[i].fd];
-            if (!fd_ptr->valid || !fd_ptr->accepted)
-                continue;
-            if (ev_buf[i].revents & (POLLERR | POLLHUP))
-                fd_ptr->reactor->in_event ();
-            if (!fd_ptr->valid || !fd_ptr->accepted)
-                continue;
-            if (ev_buf[i].revents & POLLOUT)
-                fd_ptr->reactor->out_event ();
-            if (!fd_ptr->valid || !fd_ptr->accepted)
-                continue;
-            if (ev_buf[i].revents & POLLIN)
-                fd_ptr->reactor->in_event ();
-        }
-    }
-}
-
-#endif
diff --git a/src/devpoll.hpp b/src/devpoll.hpp
deleted file mode 100644
index e57814b9c..000000000
--- a/src/devpoll.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DEVPOLL_HPP_INCLUDED__
-#define __ZMQ_DEVPOLL_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_DEVPOLL
-
-#include <vector>
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  Implements socket polling mechanism using the "/dev/poll" interface.
-
-class devpoll_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef fd_t handle_t;
-
-    devpoll_t (const thread_ctx_t &ctx_);
-    ~devpoll_t () ZMQ_FINAL;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    //  File descriptor referring to "/dev/poll" pseudo-device.
-    fd_t devpoll_fd;
-
-    struct fd_entry_t
-    {
-        short events;
-        zmq::i_poll_events *reactor;
-        bool valid;
-        bool accepted;
-    };
-
-    typedef std::vector<fd_entry_t> fd_table_t;
-    fd_table_t fd_table;
-
-    typedef std::vector<fd_t> pending_list_t;
-    pending_list_t pending_list;
-
-    //  Pollset manipulation function.
-    void devpoll_ctl (fd_t fd_, short events_);
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (devpoll_t)
-};
-
-typedef devpoll_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/src/dgram.cpp b/src/dgram.cpp
deleted file mode 100644
index 879ff4da7..000000000
--- a/src/dgram.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "dgram.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::dgram_t::dgram_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_),
-    _pipe (NULL),
-    _last_in (NULL),
-    _more_out (false)
-{
-    options.type = ZMQ_DGRAM;
-    options.raw_socket = true;
-}
-
-zmq::dgram_t::~dgram_t ()
-{
-    zmq_assert (!_pipe);
-}
-
-void zmq::dgram_t::xattach_pipe (pipe_t *pipe_,
-                                 bool subscribe_to_all_,
-                                 bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    //  ZMQ_DGRAM socket can only be connected to a single peer.
-    //  The socket rejects any further connection requests.
-    if (_pipe == NULL)
-        _pipe = pipe_;
-    else
-        pipe_->terminate (false);
-}
-
-void zmq::dgram_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (pipe_ == _pipe) {
-        if (_last_in == _pipe) {
-            _last_in = NULL;
-        }
-        _pipe = NULL;
-    }
-}
-
-void zmq::dgram_t::xread_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-void zmq::dgram_t::xwrite_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-int zmq::dgram_t::xsend (msg_t *msg_)
-{
-    // If there's no out pipe, just drop it.
-    if (!_pipe) {
-        const int rc = msg_->close ();
-        errno_assert (rc == 0);
-        return -1;
-    }
-
-    //  If this is the first part of the message it's the ID of the
-    //  peer to send the message to.
-    if (!_more_out) {
-        if (!(msg_->flags () & msg_t::more)) {
-            errno = EINVAL;
-            return -1;
-        }
-    } else {
-        //  dgram messages are two part only, reject part if more is set
-        if (msg_->flags () & msg_t::more) {
-            errno = EINVAL;
-            return -1;
-        }
-    }
-
-    // Push the message into the pipe.
-    if (!_pipe->write (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (!(msg_->flags () & msg_t::more))
-        _pipe->flush ();
-
-    // flip the more flag
-    _more_out = !_more_out;
-
-    //  Detach the message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::dgram_t::xrecv (msg_t *msg_)
-{
-    //  Deallocate old content of the message.
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    if (!_pipe || !_pipe->read (msg_)) {
-        //  Initialise the output parameter to be a 0-byte message.
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-
-        errno = EAGAIN;
-        return -1;
-    }
-    _last_in = _pipe;
-
-    return 0;
-}
-
-bool zmq::dgram_t::xhas_in ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_read ();
-}
-
-bool zmq::dgram_t::xhas_out ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_write ();
-}
diff --git a/src/dgram.hpp b/src/dgram.hpp
deleted file mode 100644
index 51385aad6..000000000
--- a/src/dgram.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DGRAM_HPP_INCLUDED__
-#define __ZMQ_DGRAM_HPP_INCLUDED__
-
-#include "blob.hpp"
-#include "socket_base.hpp"
-#include "session_base.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class dgram_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    dgram_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~dgram_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    zmq::pipe_t *_pipe;
-
-    zmq::pipe_t *_last_in;
-
-    //  If true, more outgoing message parts are expected.
-    bool _more_out;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dgram_t)
-};
-}
-
-#endif
diff --git a/src/dish.cpp b/src/dish.cpp
deleted file mode 100644
index d8a4befc1..000000000
--- a/src/dish.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-
-#include "macros.hpp"
-#include "dish.hpp"
-#include "err.hpp"
-
-zmq::dish_t::dish_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true),
-    _has_message (false)
-{
-    options.type = ZMQ_DISH;
-
-    //  When socket is being closed down we don't want to wait till pending
-    //  subscription commands are sent to the wire.
-    options.linger.store (0);
-
-    const int rc = _message.init ();
-    errno_assert (rc == 0);
-}
-
-zmq::dish_t::~dish_t ()
-{
-    const int rc = _message.close ();
-    errno_assert (rc == 0);
-}
-
-void zmq::dish_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _fq.attach (pipe_);
-    _dist.attach (pipe_);
-
-    //  Send all the cached subscriptions to the new upstream peer.
-    send_subscriptions (pipe_);
-}
-
-void zmq::dish_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::dish_t::xwrite_activated (pipe_t *pipe_)
-{
-    _dist.activated (pipe_);
-}
-
-void zmq::dish_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-    _dist.pipe_terminated (pipe_);
-}
-
-void zmq::dish_t::xhiccuped (pipe_t *pipe_)
-{
-    //  Send all the cached subscriptions to the hiccuped pipe.
-    send_subscriptions (pipe_);
-}
-
-int zmq::dish_t::xjoin (const char *group_)
-{
-    const std::string group = std::string (group_);
-
-    if (group.length () > ZMQ_GROUP_MAX_LENGTH) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  User cannot join same group twice
-    if (!_subscriptions.insert (group).second) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    msg_t msg;
-    int rc = msg.init_join ();
-    errno_assert (rc == 0);
-
-    rc = msg.set_group (group_);
-    errno_assert (rc == 0);
-
-    int err = 0;
-    rc = _dist.send_to_all (&msg);
-    if (rc != 0)
-        err = errno;
-    const int rc2 = msg.close ();
-    errno_assert (rc2 == 0);
-    if (rc != 0)
-        errno = err;
-    return rc;
-}
-
-int zmq::dish_t::xleave (const char *group_)
-{
-    const std::string group = std::string (group_);
-
-    if (group.length () > ZMQ_GROUP_MAX_LENGTH) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (0 == _subscriptions.erase (group)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    msg_t msg;
-    int rc = msg.init_leave ();
-    errno_assert (rc == 0);
-
-    rc = msg.set_group (group_);
-    errno_assert (rc == 0);
-
-    int err = 0;
-    rc = _dist.send_to_all (&msg);
-    if (rc != 0)
-        err = errno;
-    const int rc2 = msg.close ();
-    errno_assert (rc2 == 0);
-    if (rc != 0)
-        errno = err;
-    return rc;
-}
-
-int zmq::dish_t::xsend (msg_t *msg_)
-{
-    LIBZMQ_UNUSED (msg_);
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::dish_t::xhas_out ()
-{
-    //  Subscription can be added/removed anytime.
-    return true;
-}
-
-int zmq::dish_t::xrecv (msg_t *msg_)
-{
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return it straight ahead.
-    if (_has_message) {
-        const int rc = msg_->move (_message);
-        errno_assert (rc == 0);
-        _has_message = false;
-        return 0;
-    }
-
-    return xxrecv (msg_);
-}
-
-int zmq::dish_t::xxrecv (msg_t *msg_)
-{
-    do {
-        //  Get a message using fair queueing algorithm.
-        const int rc = _fq.recv (msg_);
-
-        //  If there's no message available, return immediately.
-        //  The same when error occurs.
-        if (rc != 0)
-            return -1;
-
-        //  Skip non matching messages
-    } while (0 == _subscriptions.count (std::string (msg_->group ())));
-
-    //  Found a matching message
-    return 0;
-}
-
-bool zmq::dish_t::xhas_in ()
-{
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return straight ahead.
-    if (_has_message)
-        return true;
-
-    const int rc = xxrecv (&_message);
-    if (rc != 0) {
-        errno_assert (errno == EAGAIN);
-        return false;
-    }
-
-    //  Matching message found
-    _has_message = true;
-    return true;
-}
-
-void zmq::dish_t::send_subscriptions (pipe_t *pipe_)
-{
-    for (subscriptions_t::iterator it = _subscriptions.begin (),
-                                   end = _subscriptions.end ();
-         it != end; ++it) {
-        msg_t msg;
-        int rc = msg.init_join ();
-        errno_assert (rc == 0);
-
-        rc = msg.set_group (it->c_str ());
-        errno_assert (rc == 0);
-
-        //  Send it to the pipe.
-        pipe_->write (&msg);
-    }
-
-    pipe_->flush ();
-}
-
-zmq::dish_session_t::dish_session_t (io_thread_t *io_thread_,
-                                     bool connect_,
-                                     socket_base_t *socket_,
-                                     const options_t &options_,
-                                     address_t *addr_) :
-    session_base_t (io_thread_, connect_, socket_, options_, addr_),
-    _state (group)
-{
-}
-
-zmq::dish_session_t::~dish_session_t ()
-{
-}
-
-int zmq::dish_session_t::push_msg (msg_t *msg_)
-{
-    if (_state == group) {
-        if ((msg_->flags () & msg_t::more) != msg_t::more) {
-            errno = EFAULT;
-            return -1;
-        }
-
-        if (msg_->size () > ZMQ_GROUP_MAX_LENGTH) {
-            errno = EFAULT;
-            return -1;
-        }
-
-        _group_msg = *msg_;
-        _state = body;
-
-        const int rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-    const char *group_setting = msg_->group ();
-    int rc;
-    if (group_setting[0] != 0)
-        goto has_group;
-
-    //  Set the message group
-    rc = msg_->set_group (static_cast<char *> (_group_msg.data ()),
-                          _group_msg.size ());
-    errno_assert (rc == 0);
-
-    //  We set the group, so we don't need the group_msg anymore
-    rc = _group_msg.close ();
-    errno_assert (rc == 0);
-has_group:
-    //  Thread safe socket doesn't support multipart messages
-    if ((msg_->flags () & msg_t::more) == msg_t::more) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    //  Push message to dish socket
-    rc = session_base_t::push_msg (msg_);
-
-    if (rc == 0)
-        _state = group;
-
-    return rc;
-}
-
-int zmq::dish_session_t::pull_msg (msg_t *msg_)
-{
-    int rc = session_base_t::pull_msg (msg_);
-
-    if (rc != 0)
-        return rc;
-
-    if (!msg_->is_join () && !msg_->is_leave ())
-        return rc;
-
-    const int group_length = static_cast<int> (strlen (msg_->group ()));
-
-    msg_t command;
-    int offset;
-
-    if (msg_->is_join ()) {
-        rc = command.init_size (group_length + 5);
-        errno_assert (rc == 0);
-        offset = 5;
-        memcpy (command.data (), "\4JOIN", 5);
-    } else {
-        rc = command.init_size (group_length + 6);
-        errno_assert (rc == 0);
-        offset = 6;
-        memcpy (command.data (), "\5LEAVE", 6);
-    }
-
-    command.set_flags (msg_t::command);
-    char *command_data = static_cast<char *> (command.data ());
-
-    //  Copy the group
-    memcpy (command_data + offset, msg_->group (), group_length);
-
-    //  Close the join message
-    rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    *msg_ = command;
-
-    return 0;
-}
-
-void zmq::dish_session_t::reset ()
-{
-    session_base_t::reset ();
-    _state = group;
-}
diff --git a/src/dish.hpp b/src/dish.hpp
deleted file mode 100644
index c41ca92e0..000000000
--- a/src/dish.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DISH_HPP_INCLUDED__
-#define __ZMQ_DISH_HPP_INCLUDED__
-
-#include <string>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "dist.hpp"
-#include "fq.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class io_thread_t;
-
-class dish_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    dish_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~dish_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xhiccuped (pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-    int xjoin (const char *group_);
-    int xleave (const char *group_);
-
-  private:
-    int xxrecv (zmq::msg_t *msg_);
-
-    //  Send subscriptions to a pipe
-    void send_subscriptions (pipe_t *pipe_);
-
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    //  Object for distributing the subscriptions upstream.
-    dist_t _dist;
-
-    //  The repository of subscriptions.
-    typedef std::set<std::string> subscriptions_t;
-    subscriptions_t _subscriptions;
-
-    //  If true, 'message' contains a matching message to return on the
-    //  next recv call.
-    bool _has_message;
-    msg_t _message;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dish_t)
-};
-
-class dish_session_t ZMQ_FINAL : public session_base_t
-{
-  public:
-    dish_session_t (zmq::io_thread_t *io_thread_,
-                    bool connect_,
-                    zmq::socket_base_t *socket_,
-                    const options_t &options_,
-                    address_t *addr_);
-    ~dish_session_t ();
-
-    //  Overrides of the functions from session_base_t.
-    int push_msg (msg_t *msg_);
-    int pull_msg (msg_t *msg_);
-    void reset ();
-
-  private:
-    enum
-    {
-        group,
-        body
-    } _state;
-
-    msg_t _group_msg;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dish_session_t)
-};
-}
-
-#endif
diff --git a/src/dist.cpp b/src/dist.cpp
deleted file mode 100644
index 7795bb36c..000000000
--- a/src/dist.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "dist.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "likely.hpp"
-
-zmq::dist_t::dist_t () :
-    _matching (0),
-    _active (0),
-    _eligible (0),
-    _more (false)
-{
-}
-
-zmq::dist_t::~dist_t ()
-{
-    zmq_assert (_pipes.empty ());
-}
-
-void zmq::dist_t::attach (pipe_t *pipe_)
-{
-    //  If we are in the middle of sending a message, we'll add new pipe
-    //  into the list of eligible pipes. Otherwise we add it to the list
-    //  of active pipes.
-    if (_more) {
-        _pipes.push_back (pipe_);
-        _pipes.swap (_eligible, _pipes.size () - 1);
-        _eligible++;
-    } else {
-        _pipes.push_back (pipe_);
-        _pipes.swap (_active, _pipes.size () - 1);
-        _active++;
-        _eligible++;
-    }
-}
-
-void zmq::dist_t::match (pipe_t *pipe_)
-{
-    //  If pipe is already matching do nothing.
-    if (_pipes.index (pipe_) < _matching)
-        return;
-
-    //  If the pipe isn't eligible, ignore it.
-    if (_pipes.index (pipe_) >= _eligible)
-        return;
-
-    //  Mark the pipe as matching.
-    _pipes.swap (_pipes.index (pipe_), _matching);
-    _matching++;
-}
-
-void zmq::dist_t::reverse_match ()
-{
-    const pipes_t::size_type prev_matching = _matching;
-
-    // Reset matching to 0
-    unmatch ();
-
-    // Mark all matching pipes as not matching and vice-versa.
-    // To do this, push all pipes that are eligible but not
-    // matched - i.e. between "matching" and "eligible" -
-    // to the beginning of the queue.
-    for (pipes_t::size_type i = prev_matching; i < _eligible; ++i) {
-        _pipes.swap (i, _matching++);
-    }
-}
-
-void zmq::dist_t::unmatch ()
-{
-    _matching = 0;
-}
-
-void zmq::dist_t::pipe_terminated (pipe_t *pipe_)
-{
-    //  Remove the pipe from the list; adjust number of matching, active and/or
-    //  eligible pipes accordingly.
-    if (_pipes.index (pipe_) < _matching) {
-        _pipes.swap (_pipes.index (pipe_), _matching - 1);
-        _matching--;
-    }
-    if (_pipes.index (pipe_) < _active) {
-        _pipes.swap (_pipes.index (pipe_), _active - 1);
-        _active--;
-    }
-    if (_pipes.index (pipe_) < _eligible) {
-        _pipes.swap (_pipes.index (pipe_), _eligible - 1);
-        _eligible--;
-    }
-
-    _pipes.erase (pipe_);
-}
-
-void zmq::dist_t::activated (pipe_t *pipe_)
-{
-    //  Move the pipe from passive to eligible state.
-    if (_eligible < _pipes.size ()) {
-        _pipes.swap (_pipes.index (pipe_), _eligible);
-        _eligible++;
-    }
-
-    //  If there's no message being sent at the moment, move it to
-    //  the active state.
-    if (!_more && _active < _pipes.size ()) {
-        _pipes.swap (_eligible - 1, _active);
-        _active++;
-    }
-}
-
-int zmq::dist_t::send_to_all (msg_t *msg_)
-{
-    _matching = _active;
-    return send_to_matching (msg_);
-}
-
-int zmq::dist_t::send_to_matching (msg_t *msg_)
-{
-    //  Is this end of a multipart message?
-    const bool msg_more = (msg_->flags () & msg_t::more) != 0;
-
-    //  Push the message to matching pipes.
-    distribute (msg_);
-
-    //  If multipart message is fully sent, activate all the eligible pipes.
-    if (!msg_more)
-        _active = _eligible;
-
-    _more = msg_more;
-
-    return 0;
-}
-
-void zmq::dist_t::distribute (msg_t *msg_)
-{
-    //  If there are no matching pipes available, simply drop the message.
-    if (_matching == 0) {
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-        return;
-    }
-
-    if (msg_->is_vsm ()) {
-        for (pipes_t::size_type i = 0; i < _matching;) {
-            if (!write (_pipes[i], msg_)) {
-                //  Use same index again because entry will have been removed.
-            } else {
-                ++i;
-            }
-        }
-        int rc = msg_->init ();
-        errno_assert (rc == 0);
-        return;
-    }
-
-    //  Add matching-1 references to the message. We already hold one reference,
-    //  that's why -1.
-    msg_->add_refs (static_cast<int> (_matching) - 1);
-
-    //  Push copy of the message to each matching pipe.
-    int failed = 0;
-    for (pipes_t::size_type i = 0; i < _matching;) {
-        if (!write (_pipes[i], msg_)) {
-            ++failed;
-            //  Use same index again because entry will have been removed.
-        } else {
-            ++i;
-        }
-    }
-    if (unlikely (failed))
-        msg_->rm_refs (failed);
-
-    //  Detach the original message from the data buffer. Note that we don't
-    //  close the message. That's because we've already used all the references.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-}
-
-bool zmq::dist_t::has_out ()
-{
-    return true;
-}
-
-bool zmq::dist_t::write (pipe_t *pipe_, msg_t *msg_)
-{
-    if (!pipe_->write (msg_)) {
-        _pipes.swap (_pipes.index (pipe_), _matching - 1);
-        _matching--;
-        _pipes.swap (_pipes.index (pipe_), _active - 1);
-        _active--;
-        _pipes.swap (_active, _eligible - 1);
-        _eligible--;
-        return false;
-    }
-    if (!(msg_->flags () & msg_t::more))
-        pipe_->flush ();
-    return true;
-}
-
-bool zmq::dist_t::check_hwm ()
-{
-    for (pipes_t::size_type i = 0; i < _matching; ++i)
-        if (!_pipes[i]->check_hwm ())
-            return false;
-
-    return true;
-}
diff --git a/src/dist.hpp b/src/dist.hpp
deleted file mode 100644
index f772a7163..000000000
--- a/src/dist.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DIST_HPP_INCLUDED__
-#define __ZMQ_DIST_HPP_INCLUDED__
-
-#include <vector>
-
-#include "array.hpp"
-#include "macros.hpp"
-
-namespace zmq
-{
-class pipe_t;
-class msg_t;
-
-//  Class manages a set of outbound pipes. It sends each messages to
-//  each of them.
-class dist_t
-{
-  public:
-    dist_t ();
-    ~dist_t ();
-
-    //  Adds the pipe to the distributor object.
-    void attach (zmq::pipe_t *pipe_);
-
-    //  Activates pipe that have previously reached high watermark.
-    void activated (zmq::pipe_t *pipe_);
-
-    //  Mark the pipe as matching. Subsequent call to send_to_matching
-    //  will send message also to this pipe.
-    void match (zmq::pipe_t *pipe_);
-
-    //  Marks all pipes that are not matched as matched and vice-versa.
-    void reverse_match ();
-
-    //  Mark all pipes as non-matching.
-    void unmatch ();
-
-    //  Removes the pipe from the distributor object.
-    void pipe_terminated (zmq::pipe_t *pipe_);
-
-    //  Send the message to the matching outbound pipes.
-    int send_to_matching (zmq::msg_t *msg_);
-
-    //  Send the message to all the outbound pipes.
-    int send_to_all (zmq::msg_t *msg_);
-
-    static bool has_out ();
-
-    // check HWM of all pipes matching
-    bool check_hwm ();
-
-  private:
-    //  Write the message to the pipe. Make the pipe inactive if writing
-    //  fails. In such a case false is returned.
-    bool write (zmq::pipe_t *pipe_, zmq::msg_t *msg_);
-
-    //  Put the message to all active pipes.
-    void distribute (zmq::msg_t *msg_);
-
-    //  List of outbound pipes.
-    typedef array_t<zmq::pipe_t, 2> pipes_t;
-    pipes_t _pipes;
-
-    //  Number of all the pipes to send the next message to.
-    pipes_t::size_type _matching;
-
-    //  Number of active pipes. All the active pipes are located at the
-    //  beginning of the pipes array. These are the pipes the messages
-    //  can be sent to at the moment.
-    pipes_t::size_type _active;
-
-    //  Number of pipes eligible for sending messages to. This includes all
-    //  the active pipes plus all the pipes that we can in theory send
-    //  messages to (the HWM is not yet reached), but sending a message
-    //  to them would result in partial message being delivered, ie. message
-    //  with initial parts missing.
-    pipes_t::size_type _eligible;
-
-    //  True if last we are in the middle of a multipart message.
-    bool _more;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dist_t)
-};
-}
-
-#endif
diff --git a/src/encoder.hpp b/src/encoder.hpp
deleted file mode 100644
index 84ffe3291..000000000
--- a/src/encoder.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ENCODER_HPP_INCLUDED__
-#define __ZMQ_ENCODER_HPP_INCLUDED__
-
-#if defined(_MSC_VER)
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-#include <algorithm>
-
-#include "err.hpp"
-#include "i_encoder.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-//  Helper base class for encoders. It implements the state machine that
-//  fills the outgoing buffer. Derived classes should implement individual
-//  state machine actions.
-
-template <typename T> class encoder_base_t : public i_encoder
-{
-  public:
-    explicit encoder_base_t (size_t bufsize_) :
-        _write_pos (0),
-        _to_write (0),
-        _next (NULL),
-        _new_msg_flag (false),
-        _buf_size (bufsize_),
-        _buf (static_cast<unsigned char *> (malloc (bufsize_))),
-        _in_progress (NULL)
-    {
-        alloc_assert (_buf);
-    }
-
-    ~encoder_base_t () ZMQ_OVERRIDE { free (_buf); }
-
-    //  The function returns a batch of binary data. The data
-    //  are filled to a supplied buffer. If no buffer is supplied (data_
-    //  points to NULL) decoder object will provide buffer of its own.
-    size_t encode (unsigned char **data_, size_t size_) ZMQ_FINAL
-    {
-        unsigned char *buffer = !*data_ ? _buf : *data_;
-        const size_t buffersize = !*data_ ? _buf_size : size_;
-
-        if (in_progress () == NULL)
-            return 0;
-
-        size_t pos = 0;
-        while (pos < buffersize) {
-            //  If there are no more data to return, run the state machine.
-            //  If there are still no data, return what we already have
-            //  in the buffer.
-            if (!_to_write) {
-                if (_new_msg_flag) {
-                    int rc = _in_progress->close ();
-                    errno_assert (rc == 0);
-                    rc = _in_progress->init ();
-                    errno_assert (rc == 0);
-                    _in_progress = NULL;
-                    break;
-                }
-                (static_cast<T *> (this)->*_next) ();
-            }
-
-            //  If there are no data in the buffer yet and we are able to
-            //  fill whole buffer in a single go, let's use zero-copy.
-            //  There's no disadvantage to it as we cannot stuck multiple
-            //  messages into the buffer anyway. Note that subsequent
-            //  write(s) are non-blocking, thus each single write writes
-            //  at most SO_SNDBUF bytes at once not depending on how large
-            //  is the chunk returned from here.
-            //  As a consequence, large messages being sent won't block
-            //  other engines running in the same I/O thread for excessive
-            //  amounts of time.
-            if (!pos && !*data_ && _to_write >= buffersize) {
-                *data_ = _write_pos;
-                pos = _to_write;
-                _write_pos = NULL;
-                _to_write = 0;
-                return pos;
-            }
-
-            //  Copy data to the buffer. If the buffer is full, return.
-            const size_t to_copy = std::min (_to_write, buffersize - pos);
-            memcpy (buffer + pos, _write_pos, to_copy);
-            pos += to_copy;
-            _write_pos += to_copy;
-            _to_write -= to_copy;
-        }
-
-        *data_ = buffer;
-        return pos;
-    }
-
-    void load_msg (msg_t *msg_) ZMQ_FINAL
-    {
-        zmq_assert (in_progress () == NULL);
-        _in_progress = msg_;
-        (static_cast<T *> (this)->*_next) ();
-    }
-
-  protected:
-    //  Prototype of state machine action.
-    typedef void (T::*step_t) ();
-
-    //  This function should be called from derived class to write the data
-    //  to the buffer and schedule next state machine action.
-    void next_step (void *write_pos_,
-                    size_t to_write_,
-                    step_t next_,
-                    bool new_msg_flag_)
-    {
-        _write_pos = static_cast<unsigned char *> (write_pos_);
-        _to_write = to_write_;
-        _next = next_;
-        _new_msg_flag = new_msg_flag_;
-    }
-
-    msg_t *in_progress () { return _in_progress; }
-
-  private:
-    //  Where to get the data to write from.
-    unsigned char *_write_pos;
-
-    //  How much data to write before next step should be executed.
-    size_t _to_write;
-
-    //  Next step. If set to NULL, it means that associated data stream
-    //  is dead.
-    step_t _next;
-
-    bool _new_msg_flag;
-
-    //  The buffer for encoded data.
-    const size_t _buf_size;
-    unsigned char *const _buf;
-
-    msg_t *_in_progress;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (encoder_base_t)
-};
-}
-
-#endif
diff --git a/src/endpoint.cpp b/src/endpoint.cpp
deleted file mode 100644
index c9ad6d66b..000000000
--- a/src/endpoint.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "endpoint.hpp"
-
-zmq::endpoint_uri_pair_t
-zmq::make_unconnected_connect_endpoint_pair (const std::string &endpoint_)
-{
-    return endpoint_uri_pair_t (std::string (), endpoint_,
-                                endpoint_type_connect);
-}
-
-zmq::endpoint_uri_pair_t
-zmq::make_unconnected_bind_endpoint_pair (const std::string &endpoint_)
-{
-    return endpoint_uri_pair_t (endpoint_, std::string (), endpoint_type_bind);
-}
diff --git a/src/endpoint.hpp b/src/endpoint.hpp
deleted file mode 100644
index 56b7d0e74..000000000
--- a/src/endpoint.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ENDPOINT_HPP_INCLUDED__
-#define __ZMQ_ENDPOINT_HPP_INCLUDED__
-
-#include <string>
-
-namespace zmq
-{
-enum endpoint_type_t
-{
-    endpoint_type_none,   // a connection-less endpoint
-    endpoint_type_bind,   // a connection-oriented bind endpoint
-    endpoint_type_connect // a connection-oriented connect endpoint
-};
-
-struct endpoint_uri_pair_t
-{
-    endpoint_uri_pair_t () : local_type (endpoint_type_none) {}
-    endpoint_uri_pair_t (const std::string &local,
-                         const std::string &remote,
-                         endpoint_type_t local_type) :
-        local (local),
-        remote (remote),
-        local_type (local_type)
-    {
-    }
-
-    const std::string &identifier () const
-    {
-        return local_type == endpoint_type_bind ? local : remote;
-    }
-
-    std::string local, remote;
-    endpoint_type_t local_type;
-};
-
-endpoint_uri_pair_t
-make_unconnected_connect_endpoint_pair (const std::string &endpoint_);
-
-endpoint_uri_pair_t
-make_unconnected_bind_endpoint_pair (const std::string &endpoint_);
-}
-
-#endif
diff --git a/src/epoll.cpp b/src/epoll.cpp
deleted file mode 100644
index fc641b74e..000000000
--- a/src/epoll.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_EPOLL
-#include "epoll.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <algorithm>
-#include <new>
-
-#include "macros.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-#ifdef ZMQ_HAVE_WINDOWS
-const zmq::epoll_t::epoll_fd_t zmq::epoll_t::epoll_retired_fd =
-  INVALID_HANDLE_VALUE;
-#endif
-
-zmq::epoll_t::epoll_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_)
-{
-#ifdef ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC
-    //  Setting this option result in sane behaviour when exec() functions
-    //  are used. Old sockets are closed and don't block TCP ports, avoid
-    //  leaks, etc.
-    _epoll_fd = epoll_create1 (EPOLL_CLOEXEC);
-#else
-    _epoll_fd = epoll_create (1);
-#endif
-    errno_assert (_epoll_fd != epoll_retired_fd);
-}
-
-zmq::epoll_t::~epoll_t ()
-{
-    //  Wait till the worker thread exits.
-    stop_worker ();
-
-#ifdef ZMQ_HAVE_WINDOWS
-    epoll_close (_epoll_fd);
-#else
-    close (_epoll_fd);
-#endif
-    for (retired_t::iterator it = _retired.begin (), end = _retired.end ();
-         it != end; ++it) {
-        LIBZMQ_DELETE (*it);
-    }
-}
-
-zmq::epoll_t::handle_t zmq::epoll_t::add_fd (fd_t fd_, i_poll_events *events_)
-{
-    check_thread ();
-    poll_entry_t *pe = new (std::nothrow) poll_entry_t;
-    alloc_assert (pe);
-
-    //  The memset is not actually needed. It's here to prevent debugging
-    //  tools to complain about using uninitialised memory.
-    memset (pe, 0, sizeof (poll_entry_t));
-
-    pe->fd = fd_;
-    pe->ev.events = 0;
-    pe->ev.data.ptr = pe;
-    pe->events = events_;
-
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_ADD, fd_, &pe->ev);
-    errno_assert (rc != -1);
-
-    //  Increase the load metric of the thread.
-    adjust_load (1);
-
-    return pe;
-}
-
-void zmq::epoll_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_DEL, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-    pe->fd = retired_fd;
-    _retired.push_back (pe);
-
-    //  Decrease the load metric of the thread.
-    adjust_load (-1);
-}
-
-void zmq::epoll_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    pe->ev.events |= EPOLLIN;
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-}
-
-void zmq::epoll_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    pe->ev.events &= ~(static_cast<short> (EPOLLIN));
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-}
-
-void zmq::epoll_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    pe->ev.events |= EPOLLOUT;
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-}
-
-void zmq::epoll_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    pe->ev.events &= ~(static_cast<short> (EPOLLOUT));
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-}
-
-void zmq::epoll_t::stop ()
-{
-    check_thread ();
-}
-
-int zmq::epoll_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::epoll_t::loop ()
-{
-    epoll_event ev_buf[max_io_events];
-
-    while (true) {
-        //  Execute any due timers.
-        const int timeout = static_cast<int> (execute_timers ());
-
-        if (get_load () == 0) {
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-        //  Wait for events.
-        const int n = epoll_wait (_epoll_fd, &ev_buf[0], max_io_events,
-                                  timeout ? timeout : -1);
-        if (n == -1) {
-            errno_assert (errno == EINTR);
-            continue;
-        }
-
-        for (int i = 0; i < n; i++) {
-            const poll_entry_t *const pe =
-              static_cast<const poll_entry_t *> (ev_buf[i].data.ptr);
-
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].events & (EPOLLERR | EPOLLHUP))
-                pe->events->in_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].events & EPOLLOUT)
-                pe->events->out_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].events & EPOLLIN)
-                pe->events->in_event ();
-        }
-
-        //  Destroy retired event sources.
-        for (retired_t::iterator it = _retired.begin (), end = _retired.end ();
-             it != end; ++it) {
-            LIBZMQ_DELETE (*it);
-        }
-        _retired.clear ();
-    }
-}
-
-#endif
diff --git a/src/epoll.hpp b/src/epoll.hpp
deleted file mode 100644
index 0e7bad029..000000000
--- a/src/epoll.hpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_EPOLL_HPP_INCLUDED__
-#define __ZMQ_EPOLL_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_EPOLL
-
-#include <vector>
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "../external/wepoll/wepoll.h"
-#else
-#include <sys/epoll.h>
-#endif
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-#include "mutex.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  This class implements socket polling mechanism using the Linux-specific
-//  epoll mechanism.
-
-class epoll_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef void *handle_t;
-
-    epoll_t (const thread_ctx_t &ctx_);
-    ~epoll_t () ZMQ_OVERRIDE;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-#if defined ZMQ_HAVE_WINDOWS
-    typedef HANDLE epoll_fd_t;
-    static const epoll_fd_t epoll_retired_fd;
-#else
-    typedef fd_t epoll_fd_t;
-    enum
-    {
-        epoll_retired_fd = retired_fd
-    };
-#endif
-
-    //  Main event loop.
-    void loop ();
-
-    //  Main epoll file descriptor
-    epoll_fd_t _epoll_fd;
-
-    struct poll_entry_t
-    {
-        fd_t fd;
-        epoll_event ev;
-        zmq::i_poll_events *events;
-    };
-
-    //  List of retired event sources.
-    typedef std::vector<poll_entry_t *> retired_t;
-    retired_t _retired;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (epoll_t)
-};
-
-typedef epoll_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/src/err.cpp b/src/err.cpp
deleted file mode 100644
index ea2a9b514..000000000
--- a/src/err.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "err.hpp"
-#include "macros.hpp"
-
-const char *zmq::errno_to_string (int errno_)
-{
-    switch (errno_) {
-#if defined ZMQ_HAVE_WINDOWS
-        case ENOTSUP:
-            return "Not supported";
-        case EPROTONOSUPPORT:
-            return "Protocol not supported";
-        case ENOBUFS:
-            return "No buffer space available";
-        case ENETDOWN:
-            return "Network is down";
-        case EADDRINUSE:
-            return "Address in use";
-        case EADDRNOTAVAIL:
-            return "Address not available";
-        case ECONNREFUSED:
-            return "Connection refused";
-        case EINPROGRESS:
-            return "Operation in progress";
-#endif
-        case EFSM:
-            return "Operation cannot be accomplished in current state";
-        case ENOCOMPATPROTO:
-            return "The protocol is not compatible with the socket type";
-        case ETERM:
-            return "Context was terminated";
-        case EMTHREAD:
-            return "No thread available";
-        case EHOSTUNREACH:
-            return "Host unreachable";
-        default:
-#if defined _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#endif
-            return strerror (errno_);
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-    }
-}
-
-void zmq::zmq_abort (const char *errmsg_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-
-    //  Raise STATUS_FATAL_APP_EXIT.
-    ULONG_PTR extra_info[1];
-    extra_info[0] = (ULONG_PTR) errmsg_;
-    RaiseException (0x40000015, EXCEPTION_NONCONTINUABLE, 1, extra_info);
-#else
-    LIBZMQ_UNUSED (errmsg_);
-    print_backtrace ();
-    abort ();
-#endif
-}
-
-#ifdef ZMQ_HAVE_WINDOWS
-
-const char *zmq::wsa_error ()
-{
-    return wsa_error_no (WSAGetLastError (), NULL);
-}
-
-const char *zmq::wsa_error_no (int no_, const char *wsae_wouldblock_string_)
-{
-    //  TODO:  It seems that list of Windows socket errors is longer than this.
-    //         Investigate whether there's a way to convert it into the string
-    //         automatically (wsaError->HRESULT->string?).
-    switch (no_) {
-        case WSABASEERR:
-            return "No Error";
-        case WSAEINTR:
-            return "Interrupted system call";
-        case WSAEBADF:
-            return "Bad file number";
-        case WSAEACCES:
-            return "Permission denied";
-        case WSAEFAULT:
-            return "Bad address";
-        case WSAEINVAL:
-            return "Invalid argument";
-        case WSAEMFILE:
-            return "Too many open files";
-        case WSAEWOULDBLOCK:
-            return wsae_wouldblock_string_;
-        case WSAEINPROGRESS:
-            return "Operation now in progress";
-        case WSAEALREADY:
-            return "Operation already in progress";
-        case WSAENOTSOCK:
-            return "Socket operation on non-socket";
-        case WSAEDESTADDRREQ:
-            return "Destination address required";
-        case WSAEMSGSIZE:
-            return "Message too long";
-        case WSAEPROTOTYPE:
-            return "Protocol wrong type for socket";
-        case WSAENOPROTOOPT:
-            return "Bas protocol option";
-        case WSAEPROTONOSUPPORT:
-            return "Protocol not supported";
-        case WSAESOCKTNOSUPPORT:
-            return "Socket type not supported";
-        case WSAEOPNOTSUPP:
-            return "Operation not supported on socket";
-        case WSAEPFNOSUPPORT:
-            return "Protocol family not supported";
-        case WSAEAFNOSUPPORT:
-            return "Address family not supported by protocol family";
-        case WSAEADDRINUSE:
-            return "Address already in use";
-        case WSAEADDRNOTAVAIL:
-            return "Can't assign requested address";
-        case WSAENETDOWN:
-            return "Network is down";
-        case WSAENETUNREACH:
-            return "Network is unreachable";
-        case WSAENETRESET:
-            return "Net dropped connection or reset";
-        case WSAECONNABORTED:
-            return "Software caused connection abort";
-        case WSAECONNRESET:
-            return "Connection reset by peer";
-        case WSAENOBUFS:
-            return "No buffer space available";
-        case WSAEISCONN:
-            return "Socket is already connected";
-        case WSAENOTCONN:
-            return "Socket is not connected";
-        case WSAESHUTDOWN:
-            return "Can't send after socket shutdown";
-        case WSAETOOMANYREFS:
-            return "Too many references can't splice";
-        case WSAETIMEDOUT:
-            return "Connection timed out";
-        case WSAECONNREFUSED:
-            return "Connection refused";
-        case WSAELOOP:
-            return "Too many levels of symbolic links";
-        case WSAENAMETOOLONG:
-            return "File name too long";
-        case WSAEHOSTDOWN:
-            return "Host is down";
-        case WSAEHOSTUNREACH:
-            return "No Route to Host";
-        case WSAENOTEMPTY:
-            return "Directory not empty";
-        case WSAEPROCLIM:
-            return "Too many processes";
-        case WSAEUSERS:
-            return "Too many users";
-        case WSAEDQUOT:
-            return "Disc Quota Exceeded";
-        case WSAESTALE:
-            return "Stale NFS file handle";
-        case WSAEREMOTE:
-            return "Too many levels of remote in path";
-        case WSASYSNOTREADY:
-            return "Network SubSystem is unavailable";
-        case WSAVERNOTSUPPORTED:
-            return "WINSOCK DLL Version out of range";
-        case WSANOTINITIALISED:
-            return "Successful WSASTARTUP not yet performed";
-        case WSAHOST_NOT_FOUND:
-            return "Host not found";
-        case WSATRY_AGAIN:
-            return "Non-Authoritative Host not found";
-        case WSANO_RECOVERY:
-            return "Non-Recoverable errors: FORMERR REFUSED NOTIMP";
-        case WSANO_DATA:
-            return "Valid name no data record of requested";
-        default:
-            return "error not defined";
-    }
-}
-
-void zmq::win_error (char *buffer_, size_t buffer_size_)
-{
-    const DWORD errcode = GetLastError ();
-#if defined _WIN32_WCE
-    DWORD rc = FormatMessageW (
-      FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode,
-      MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR) buffer_,
-      buffer_size_ / sizeof (wchar_t), NULL);
-#else
-    const DWORD rc = FormatMessageA (
-      FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode,
-      MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), buffer_,
-      static_cast<DWORD> (buffer_size_), NULL);
-#endif
-    zmq_assert (rc);
-}
-
-int zmq::wsa_error_to_errno (int errcode_)
-{
-    switch (errcode_) {
-            //  10004 - Interrupted system call.
-        case WSAEINTR:
-            return EINTR;
-            //  10009 - File handle is not valid.
-        case WSAEBADF:
-            return EBADF;
-            //  10013 - Permission denied.
-        case WSAEACCES:
-            return EACCES;
-            //  10014 - Bad address.
-        case WSAEFAULT:
-            return EFAULT;
-            //  10022 - Invalid argument.
-        case WSAEINVAL:
-            return EINVAL;
-            //  10024 - Too many open files.
-        case WSAEMFILE:
-            return EMFILE;
-            //  10035 - Operation would block.
-        case WSAEWOULDBLOCK:
-            return EBUSY;
-            //  10036 - Operation now in progress.
-        case WSAEINPROGRESS:
-            return EAGAIN;
-            //  10037 - Operation already in progress.
-        case WSAEALREADY:
-            return EAGAIN;
-            //  10038 - Socket operation on non-socket.
-        case WSAENOTSOCK:
-            return ENOTSOCK;
-            //  10039 - Destination address required.
-        case WSAEDESTADDRREQ:
-            return EFAULT;
-            //  10040 - Message too long.
-        case WSAEMSGSIZE:
-            return EMSGSIZE;
-            //  10041 - Protocol wrong type for socket.
-        case WSAEPROTOTYPE:
-            return EFAULT;
-            //  10042 - Bad protocol option.
-        case WSAENOPROTOOPT:
-            return EINVAL;
-            //  10043 - Protocol not supported.
-        case WSAEPROTONOSUPPORT:
-            return EPROTONOSUPPORT;
-            //  10044 - Socket type not supported.
-        case WSAESOCKTNOSUPPORT:
-            return EFAULT;
-            //  10045 - Operation not supported on socket.
-        case WSAEOPNOTSUPP:
-            return EFAULT;
-            //  10046 - Protocol family not supported.
-        case WSAEPFNOSUPPORT:
-            return EPROTONOSUPPORT;
-            //  10047 - Address family not supported by protocol family.
-        case WSAEAFNOSUPPORT:
-            return EAFNOSUPPORT;
-            //  10048 - Address already in use.
-        case WSAEADDRINUSE:
-            return EADDRINUSE;
-            //  10049 - Cannot assign requested address.
-        case WSAEADDRNOTAVAIL:
-            return EADDRNOTAVAIL;
-            //  10050 - Network is down.
-        case WSAENETDOWN:
-            return ENETDOWN;
-            //  10051 - Network is unreachable.
-        case WSAENETUNREACH:
-            return ENETUNREACH;
-            //  10052 - Network dropped connection on reset.
-        case WSAENETRESET:
-            return ENETRESET;
-            //  10053 - Software caused connection abort.
-        case WSAECONNABORTED:
-            return ECONNABORTED;
-            //  10054 - Connection reset by peer.
-        case WSAECONNRESET:
-            return ECONNRESET;
-            //  10055 - No buffer space available.
-        case WSAENOBUFS:
-            return ENOBUFS;
-            //  10056 - Socket is already connected.
-        case WSAEISCONN:
-            return EFAULT;
-            //  10057 - Socket is not connected.
-        case WSAENOTCONN:
-            return ENOTCONN;
-            //  10058 - Can't send after socket shutdown.
-        case WSAESHUTDOWN:
-            return EFAULT;
-            //  10059 - Too many references can't splice.
-        case WSAETOOMANYREFS:
-            return EFAULT;
-            //  10060 - Connection timed out.
-        case WSAETIMEDOUT:
-            return ETIMEDOUT;
-            //  10061 - Connection refused.
-        case WSAECONNREFUSED:
-            return ECONNREFUSED;
-            //  10062 - Too many levels of symbolic links.
-        case WSAELOOP:
-            return EFAULT;
-            //  10063 - File name too long.
-        case WSAENAMETOOLONG:
-            return EFAULT;
-            //  10064 - Host is down.
-        case WSAEHOSTDOWN:
-            return EAGAIN;
-            //  10065 - No route to host.
-        case WSAEHOSTUNREACH:
-            return EHOSTUNREACH;
-            //  10066 - Directory not empty.
-        case WSAENOTEMPTY:
-            return EFAULT;
-            //  10067 - Too many processes.
-        case WSAEPROCLIM:
-            return EFAULT;
-            //  10068 - Too many users.
-        case WSAEUSERS:
-            return EFAULT;
-            //  10069 - Disc Quota Exceeded.
-        case WSAEDQUOT:
-            return EFAULT;
-            //  10070 - Stale NFS file handle.
-        case WSAESTALE:
-            return EFAULT;
-            //  10071 - Too many levels of remote in path.
-        case WSAEREMOTE:
-            return EFAULT;
-            //  10091 - Network SubSystem is unavailable.
-        case WSASYSNOTREADY:
-            return EFAULT;
-            //  10092 - WINSOCK DLL Version out of range.
-        case WSAVERNOTSUPPORTED:
-            return EFAULT;
-            //  10093 - Successful WSASTARTUP not yet performed.
-        case WSANOTINITIALISED:
-            return EFAULT;
-            //  11001 - Host not found.
-        case WSAHOST_NOT_FOUND:
-            return EFAULT;
-            //  11002 - Non-Authoritative Host not found.
-        case WSATRY_AGAIN:
-            return EFAULT;
-            //  11003 - Non-Recoverable errors: FORMERR REFUSED NOTIMP.
-        case WSANO_RECOVERY:
-            return EFAULT;
-            //  11004 - Valid name no data record of requested.
-        case WSANO_DATA:
-            return EFAULT;
-        default:
-            wsa_assert (false);
-    }
-    //  Not reachable
-    return 0;
-}
-
-#endif
-
-#if defined(HAVE_LIBUNWIND) && !defined(__SUNPRO_CC)
-
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#include <dlfcn.h>
-#include <cxxabi.h>
-#include "mutex.hpp"
-
-void zmq::print_backtrace (void)
-{
-    static zmq::mutex_t mtx;
-    mtx.lock ();
-    Dl_info dl_info;
-    unw_cursor_t cursor;
-    unw_context_t ctx;
-    unsigned frame_n = 0;
-
-    unw_getcontext (&ctx);
-    unw_init_local (&cursor, &ctx);
-
-    while (unw_step (&cursor) > 0) {
-        unw_word_t offset;
-        unw_proc_info_t p_info;
-        static const char unknown[] = "?";
-        const char *file_name;
-        char *demangled_name;
-        char func_name[256] = "";
-        void *addr;
-        int rc;
-
-        if (unw_get_proc_info (&cursor, &p_info))
-            break;
-
-        rc = unw_get_proc_name (&cursor, func_name, 256, &offset);
-        if (rc == -UNW_ENOINFO)
-            memcpy (func_name, unknown, sizeof unknown);
-
-        addr = (void *) (p_info.start_ip + offset);
-
-        if (dladdr (addr, &dl_info) && dl_info.dli_fname)
-            file_name = dl_info.dli_fname;
-        else
-            file_name = unknown;
-
-        demangled_name = abi::__cxa_demangle (func_name, NULL, NULL, &rc);
-
-        printf ("#%u  %p in %s (%s+0x%lx)\n", frame_n++, addr, file_name,
-                rc ? func_name : demangled_name, (unsigned long) offset);
-        free (demangled_name);
-    }
-    puts ("");
-
-    fflush (stdout);
-    mtx.unlock ();
-}
-
-#else
-
-void zmq::print_backtrace ()
-{
-}
-
-#endif
diff --git a/src/err.hpp b/src/err.hpp
deleted file mode 100644
index 3f3278f8c..000000000
--- a/src/err.hpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ERR_HPP_INCLUDED__
-#define __ZMQ_ERR_HPP_INCLUDED__
-
-#include <assert.h>
-#if defined _WIN32_WCE
-#include "..\builds\msvc\errno.hpp"
-#else
-#include <errno.h>
-#endif
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <netdb.h>
-#endif
-
-#include "likely.hpp"
-
-//  0MQ-specific error codes are defined in zmq.h
-
-// EPROTO is not used by OpenBSD and maybe other platforms.
-#ifndef EPROTO
-#define EPROTO 0
-#endif
-
-namespace zmq
-{
-const char *errno_to_string (int errno_);
-#if defined __clang__
-#if __has_feature(attribute_analyzer_noreturn)
-void zmq_abort (const char *errmsg_) __attribute__ ((analyzer_noreturn));
-#else
-void zmq_abort (const char *errmsg_);
-#endif
-#elif defined __MSCVER__
-__declspec(noreturn) void zmq_abort (const char *errmsg_);
-#else
-void zmq_abort (const char *errmsg_);
-#endif
-void print_backtrace ();
-}
-
-#ifdef ZMQ_HAVE_WINDOWS
-
-namespace zmq
-{
-const char *wsa_error ();
-const char *
-wsa_error_no (int no_,
-              const char *wsae_wouldblock_string_ = "Operation would block");
-void win_error (char *buffer_, size_t buffer_size_);
-int wsa_error_to_errno (int errcode_);
-}
-
-//  Provides convenient way to check WSA-style errors on Windows.
-#define wsa_assert(x)                                                          \
-    do {                                                                       \
-        if (unlikely (!(x))) {                                                 \
-            const char *errstr = zmq::wsa_error ();                            \
-            if (errstr != NULL) {                                              \
-                fprintf (stderr, "Assertion failed: %s [%i] (%s:%d)\n",        \
-                         errstr, WSAGetLastError (), __FILE__, __LINE__);      \
-                fflush (stderr);                                               \
-                zmq::zmq_abort (errstr);                                       \
-            }                                                                  \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to assert on WSA-style errors on Windows.
-#define wsa_assert_no(no)                                                      \
-    do {                                                                       \
-        const char *errstr = zmq::wsa_error_no (no);                           \
-        if (errstr != NULL) {                                                  \
-            fprintf (stderr, "Assertion failed: %s (%s:%d)\n", errstr,         \
-                     __FILE__, __LINE__);                                      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-// Provides convenient way to check GetLastError-style errors on Windows.
-#define win_assert(x)                                                          \
-    do {                                                                       \
-        if (unlikely (!(x))) {                                                 \
-            char errstr[256];                                                  \
-            zmq::win_error (errstr, 256);                                      \
-            fprintf (stderr, "Assertion failed: %s (%s:%d)\n", errstr,         \
-                     __FILE__, __LINE__);                                      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-#endif
-
-//  This macro works in exactly the same way as the normal assert. It is used
-//  in its stead because standard assert on Win32 in broken - it prints nothing
-//  when used within the scope of JNI library.
-#define zmq_assert(x)                                                          \
-    do {                                                                       \
-        if (unlikely (!(x))) {                                                 \
-            fprintf (stderr, "Assertion failed: %s (%s:%d)\n", #x, __FILE__,   \
-                     __LINE__);                                                \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (#x);                                               \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to check for errno-style errors.
-#define errno_assert(x)                                                        \
-    do {                                                                       \
-        if (unlikely (!(x))) {                                                 \
-            const char *errstr = strerror (errno);                             \
-            fprintf (stderr, "%s (%s:%d)\n", errstr, __FILE__, __LINE__);      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to check for POSIX errors.
-#define posix_assert(x)                                                        \
-    do {                                                                       \
-        if (unlikely (x)) {                                                    \
-            const char *errstr = strerror (x);                                 \
-            fprintf (stderr, "%s (%s:%d)\n", errstr, __FILE__, __LINE__);      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to check for errors from getaddrinfo.
-#define gai_assert(x)                                                          \
-    do {                                                                       \
-        if (unlikely (x)) {                                                    \
-            const char *errstr = gai_strerror (x);                             \
-            fprintf (stderr, "%s (%s:%d)\n", errstr, __FILE__, __LINE__);      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to check whether memory allocation have succeeded.
-#define alloc_assert(x)                                                        \
-    do {                                                                       \
-        if (unlikely (!x)) {                                                   \
-            fprintf (stderr, "FATAL ERROR: OUT OF MEMORY (%s:%d)\n", __FILE__, \
-                     __LINE__);                                                \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort ("FATAL ERROR: OUT OF MEMORY");                     \
-        }                                                                      \
-    } while (false)
-
-#endif
diff --git a/src/fd.hpp b/src/fd.hpp
deleted file mode 100644
index 21925ae69..000000000
--- a/src/fd.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_FD_HPP_INCLUDED__
-#define __ZMQ_FD_HPP_INCLUDED__
-
-#if defined _WIN32
-#include "windows.hpp"
-#endif
-
-namespace zmq
-{
-typedef zmq_fd_t fd_t;
-
-#ifdef ZMQ_HAVE_WINDOWS
-#if defined _MSC_VER && _MSC_VER <= 1400
-enum
-{
-    retired_fd = (fd_t) (~0)
-};
-#else
-enum
-#if _MSC_VER >= 1800
-  : fd_t
-#endif
-{
-    retired_fd = INVALID_SOCKET
-};
-#endif
-#else
-enum
-{
-    retired_fd = -1
-};
-#endif
-}
-#endif
diff --git a/src/fq.cpp b/src/fq.cpp
deleted file mode 100644
index 2a700977e..000000000
--- a/src/fq.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "fq.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::fq_t::fq_t () : _active (0), _last_in (NULL), _current (0), _more (false)
-{
-}
-
-zmq::fq_t::~fq_t ()
-{
-    zmq_assert (_pipes.empty ());
-}
-
-void zmq::fq_t::attach (pipe_t *pipe_)
-{
-    _pipes.push_back (pipe_);
-    _pipes.swap (_active, _pipes.size () - 1);
-    _active++;
-}
-
-void zmq::fq_t::pipe_terminated (pipe_t *pipe_)
-{
-    const pipes_t::size_type index = _pipes.index (pipe_);
-
-    //  Remove the pipe from the list; adjust number of active pipes
-    //  accordingly.
-    if (index < _active) {
-        _active--;
-        _pipes.swap (index, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-    _pipes.erase (pipe_);
-
-    if (_last_in == pipe_) {
-        _last_in = NULL;
-    }
-}
-
-void zmq::fq_t::activated (pipe_t *pipe_)
-{
-    //  Move the pipe to the list of active pipes.
-    _pipes.swap (_pipes.index (pipe_), _active);
-    _active++;
-}
-
-int zmq::fq_t::recv (msg_t *msg_)
-{
-    return recvpipe (msg_, NULL);
-}
-
-int zmq::fq_t::recvpipe (msg_t *msg_, pipe_t **pipe_)
-{
-    //  Deallocate old content of the message.
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    //  Round-robin over the pipes to get the next message.
-    while (_active > 0) {
-        //  Try to fetch new message. If we've already read part of the message
-        //  subsequent part should be immediately available.
-        const bool fetched = _pipes[_current]->read (msg_);
-
-        //  Note that when message is not fetched, current pipe is deactivated
-        //  and replaced by another active pipe. Thus we don't have to increase
-        //  the 'current' pointer.
-        if (fetched) {
-            if (pipe_)
-                *pipe_ = _pipes[_current];
-            _more = (msg_->flags () & msg_t::more) != 0;
-            if (!_more) {
-                _last_in = _pipes[_current];
-                _current = (_current + 1) % _active;
-            }
-            return 0;
-        }
-
-        //  Check the atomicity of the message.
-        //  If we've already received the first part of the message
-        //  we should get the remaining parts without blocking.
-        zmq_assert (!_more);
-
-        _active--;
-        _pipes.swap (_current, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-
-    //  No message is available. Initialise the output parameter
-    //  to be a 0-byte message.
-    rc = msg_->init ();
-    errno_assert (rc == 0);
-    errno = EAGAIN;
-    return -1;
-}
-
-bool zmq::fq_t::has_in ()
-{
-    //  There are subsequent parts of the partly-read message available.
-    if (_more)
-        return true;
-
-    //  Note that messing with current doesn't break the fairness of fair
-    //  queueing algorithm. If there are no messages available current will
-    //  get back to its original value. Otherwise it'll point to the first
-    //  pipe holding messages, skipping only pipes with no messages available.
-    while (_active > 0) {
-        if (_pipes[_current]->check_read ())
-            return true;
-
-        //  Deactivate the pipe.
-        _active--;
-        _pipes.swap (_current, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-
-    return false;
-}
diff --git a/src/fq.hpp b/src/fq.hpp
deleted file mode 100644
index 26724101a..000000000
--- a/src/fq.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_FQ_HPP_INCLUDED__
-#define __ZMQ_FQ_HPP_INCLUDED__
-
-#include "array.hpp"
-#include "blob.hpp"
-
-namespace zmq
-{
-class msg_t;
-class pipe_t;
-
-//  Class manages a set of inbound pipes. On receive it performs fair
-//  queueing so that senders gone berserk won't cause denial of
-//  service for decent senders.
-
-class fq_t
-{
-  public:
-    fq_t ();
-    ~fq_t ();
-
-    void attach (pipe_t *pipe_);
-    void activated (pipe_t *pipe_);
-    void pipe_terminated (pipe_t *pipe_);
-
-    int recv (msg_t *msg_);
-    int recvpipe (msg_t *msg_, pipe_t **pipe_);
-    bool has_in ();
-
-  private:
-    //  Inbound pipes.
-    typedef array_t<pipe_t, 1> pipes_t;
-    pipes_t _pipes;
-
-    //  Number of active pipes. All the active pipes are located at the
-    //  beginning of the pipes array.
-    pipes_t::size_type _active;
-
-    //  Pointer to the last pipe we received message from.
-    //  NULL when no message has been received or the pipe
-    //  has terminated.
-    pipe_t *_last_in;
-
-    //  Index of the next bound pipe to read a message from.
-    pipes_t::size_type _current;
-
-    //  If true, part of a multipart message was already received, but
-    //  there are following parts still waiting in the current pipe.
-    bool _more;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (fq_t)
-};
-}
-
-#endif
diff --git a/src/gather.cpp b/src/gather.cpp
deleted file mode 100644
index 231e72537..000000000
--- a/src/gather.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "gather.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "pipe.hpp"
-
-zmq::gather_t::gather_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true)
-{
-    options.type = ZMQ_GATHER;
-}
-
-zmq::gather_t::~gather_t ()
-{
-}
-
-void zmq::gather_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _fq.attach (pipe_);
-}
-
-void zmq::gather_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::gather_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-}
-
-int zmq::gather_t::xrecv (msg_t *msg_)
-{
-    int rc = _fq.recvpipe (msg_, NULL);
-
-    // Drop any messages with more flag
-    while (rc == 0 && msg_->flags () & msg_t::more) {
-        // drop all frames of the current multi-frame message
-        rc = _fq.recvpipe (msg_, NULL);
-
-        while (rc == 0 && msg_->flags () & msg_t::more)
-            rc = _fq.recvpipe (msg_, NULL);
-
-        // get the new message
-        if (rc == 0)
-            rc = _fq.recvpipe (msg_, NULL);
-    }
-
-    return rc;
-}
-
-bool zmq::gather_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
diff --git a/src/gather.hpp b/src/gather.hpp
deleted file mode 100644
index f2de06470..000000000
--- a/src/gather.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GATHER_HPP_INCLUDED__
-#define __ZMQ_GATHER_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class msg_t;
-
-class gather_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    gather_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~gather_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (gather_t)
-};
-}
-
-#endif
diff --git a/src/generic_mtrie.hpp b/src/generic_mtrie.hpp
deleted file mode 100644
index 85095b44f..000000000
--- a/src/generic_mtrie.hpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GENERIC_MTRIE_HPP_INCLUDED__
-#define __ZMQ_GENERIC_MTRIE_HPP_INCLUDED__
-
-#include <stddef.h>
-#include <set>
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Multi-trie (prefix tree). Each node in the trie is a set of pointers.
-template <typename T> class generic_mtrie_t
-{
-  public:
-    typedef T value_t;
-    typedef const unsigned char *prefix_t;
-
-    enum rm_result
-    {
-        not_found,
-        last_value_removed,
-        values_remain
-    };
-
-    generic_mtrie_t ();
-    ~generic_mtrie_t ();
-
-    //  Add key to the trie. Returns true iff no entry with the same prefix_
-    //  and size_ existed before.
-    bool add (prefix_t prefix_, size_t size_, value_t *value_);
-
-    //  Remove all entries with a specific value from the trie.
-    //  The call_on_uniq_ flag controls if the callback is invoked
-    //  when there are no entries left on a prefix only (true)
-    //  or on every removal (false). The arg_ argument is passed
-    //  through to the callback function.
-    template <typename Arg>
-    void rm (value_t *value_,
-             void (*func_) (const unsigned char *data_, size_t size_, Arg arg_),
-             Arg arg_,
-             bool call_on_uniq_);
-
-    //  Removes a specific entry from the trie.
-    //  Returns the result of the operation.
-    rm_result rm (prefix_t prefix_, size_t size_, value_t *value_);
-
-    //  Calls a callback function for all matching entries, i.e. any node
-    //  corresponding to data_ or a prefix of it. The arg_ argument
-    //  is passed through to the callback function.
-    template <typename Arg>
-    void match (prefix_t data_,
-                size_t size_,
-                void (*func_) (value_t *value_, Arg arg_),
-                Arg arg_);
-
-  private:
-    bool add_helper (prefix_t prefix_, size_t size_, value_t *value_);
-    template <typename Arg>
-    void rm_helper (value_t *value_,
-                    unsigned char **buff_,
-                    size_t buffsize_,
-                    size_t maxbuffsize_,
-                    void (*func_) (prefix_t data_, size_t size_, Arg arg_),
-                    Arg arg_,
-                    bool call_on_uniq_);
-    template <typename Arg>
-    void rm_helper_multiple_subnodes (unsigned char **buff_,
-                                      size_t buffsize_,
-                                      size_t maxbuffsize_,
-                                      void (*func_) (prefix_t data_,
-                                                     size_t size_,
-                                                     Arg arg_),
-                                      Arg arg_,
-                                      bool call_on_uniq_,
-                                      value_t *pipe_);
-
-    rm_result rm_helper (prefix_t prefix_, size_t size_, value_t *value_);
-    bool is_redundant () const;
-
-    typedef std::set<value_t *> pipes_t;
-    pipes_t *_pipes;
-
-    unsigned char _min;
-    unsigned short _count;
-    unsigned short _live_nodes;
-    union
-    {
-        class generic_mtrie_t<value_t> *node;
-        class generic_mtrie_t<value_t> **table;
-    } _next;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (generic_mtrie_t)
-};
-}
-
-#endif
diff --git a/src/generic_mtrie_impl.hpp b/src/generic_mtrie_impl.hpp
deleted file mode 100644
index 5e8ea431b..000000000
--- a/src/generic_mtrie_impl.hpp
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GENERIC_MTRIE_IMPL_HPP_INCLUDED__
-#define __ZMQ_GENERIC_MTRIE_IMPL_HPP_INCLUDED__
-
-
-#include <stdlib.h>
-
-#include <new>
-#include <algorithm>
-
-#include "err.hpp"
-#include "macros.hpp"
-#include "generic_mtrie.hpp"
-
-namespace zmq
-{
-template <typename T>
-generic_mtrie_t<T>::generic_mtrie_t () :
-    _pipes (0),
-    _min (0),
-    _count (0),
-    _live_nodes (0)
-{
-}
-
-template <typename T> generic_mtrie_t<T>::~generic_mtrie_t ()
-{
-    LIBZMQ_DELETE (_pipes);
-
-    if (_count == 1) {
-        zmq_assert (_next.node);
-        LIBZMQ_DELETE (_next.node);
-    } else if (_count > 1) {
-        for (unsigned short i = 0; i != _count; ++i) {
-            LIBZMQ_DELETE (_next.table[i]);
-        }
-        free (_next.table);
-    }
-}
-
-template <typename T>
-bool generic_mtrie_t<T>::add (prefix_t prefix_, size_t size_, value_t *pipe_)
-{
-    return add_helper (prefix_, size_, pipe_);
-}
-
-template <typename T>
-bool generic_mtrie_t<T>::add_helper (prefix_t prefix_,
-                                     size_t size_,
-                                     value_t *pipe_)
-{
-    //  We are at the node corresponding to the prefix. We are done.
-    if (!size_) {
-        const bool result = !_pipes;
-        if (!_pipes) {
-            _pipes = new (std::nothrow) pipes_t;
-            alloc_assert (_pipes);
-        }
-        _pipes->insert (pipe_);
-        return result;
-    }
-
-    const unsigned char c = *prefix_;
-    if (c < _min || c >= _min + _count) {
-        //  The character is out of range of currently handled
-        //  characters. We have to extend the table.
-        if (!_count) {
-            _min = c;
-            _count = 1;
-            _next.node = NULL;
-        } else if (_count == 1) {
-            const unsigned char oldc = _min;
-            generic_mtrie_t *oldp = _next.node;
-            _count = (_min < c ? c - _min : _min - c) + 1;
-            _next.table = static_cast<generic_mtrie_t **> (
-              malloc (sizeof (generic_mtrie_t *) * _count));
-            alloc_assert (_next.table);
-            for (unsigned short i = 0; i != _count; ++i)
-                _next.table[i] = 0;
-            _min = std::min (_min, c);
-            _next.table[oldc - _min] = oldp;
-        } else if (_min < c) {
-            //  The new character is above the current character range.
-            const unsigned short old_count = _count;
-            _count = c - _min + 1;
-            _next.table = static_cast<generic_mtrie_t **> (
-              realloc (_next.table, sizeof (generic_mtrie_t *) * _count));
-            alloc_assert (_next.table);
-            for (unsigned short i = old_count; i != _count; i++)
-                _next.table[i] = NULL;
-        } else {
-            //  The new character is below the current character range.
-            const unsigned short old_count = _count;
-            _count = (_min + old_count) - c;
-            _next.table = static_cast<generic_mtrie_t **> (
-              realloc (_next.table, sizeof (generic_mtrie_t *) * _count));
-            alloc_assert (_next.table);
-            memmove (_next.table + _min - c, _next.table,
-                     old_count * sizeof (generic_mtrie_t *));
-            for (unsigned short i = 0; i != _min - c; i++)
-                _next.table[i] = NULL;
-            _min = c;
-        }
-    }
-
-    //  If next node does not exist, create one.
-    if (_count == 1) {
-        if (!_next.node) {
-            _next.node = new (std::nothrow) generic_mtrie_t;
-            alloc_assert (_next.node);
-            ++_live_nodes;
-        }
-        return _next.node->add_helper (prefix_ + 1, size_ - 1, pipe_);
-    }
-    if (!_next.table[c - _min]) {
-        _next.table[c - _min] = new (std::nothrow) generic_mtrie_t;
-        alloc_assert (_next.table[c - _min]);
-        ++_live_nodes;
-    }
-    return _next.table[c - _min]->add_helper (prefix_ + 1, size_ - 1, pipe_);
-}
-
-
-template <typename T>
-template <typename Arg>
-void generic_mtrie_t<T>::rm (value_t *pipe_,
-                             void (*func_) (prefix_t data_,
-                                            size_t size_,
-                                            Arg arg_),
-                             Arg arg_,
-                             bool call_on_uniq_)
-{
-    unsigned char *buff = NULL;
-    rm_helper (pipe_, &buff, 0, 0, func_, arg_, call_on_uniq_);
-    free (buff);
-}
-
-template <typename T>
-template <typename Arg>
-void generic_mtrie_t<T>::rm_helper (value_t *pipe_,
-                                    unsigned char **buff_,
-                                    size_t buffsize_,
-                                    size_t maxbuffsize_,
-                                    void (*func_) (prefix_t data_,
-                                                   size_t size_,
-                                                   Arg arg_),
-                                    Arg arg_,
-                                    bool call_on_uniq_)
-{
-    //  Remove the subscription from this node.
-    if (_pipes && _pipes->erase (pipe_)) {
-        if (!call_on_uniq_ || _pipes->empty ()) {
-            func_ (*buff_, buffsize_, arg_);
-        }
-
-        if (_pipes->empty ()) {
-            LIBZMQ_DELETE (_pipes);
-        }
-    }
-
-    //  Adjust the buffer.
-    if (buffsize_ >= maxbuffsize_) {
-        maxbuffsize_ = buffsize_ + 256;
-        *buff_ = static_cast<unsigned char *> (realloc (*buff_, maxbuffsize_));
-        alloc_assert (*buff_);
-    }
-
-    switch (_count) {
-        case 0:
-            //  If there are no subnodes in the trie, return.
-            break;
-        case 1:
-            //  If there's one subnode (optimisation).
-
-            (*buff_)[buffsize_] = _min;
-            buffsize_++;
-            _next.node->rm_helper (pipe_, buff_, buffsize_, maxbuffsize_, func_,
-                                   arg_, call_on_uniq_);
-
-            //  Prune the node if it was made redundant by the removal
-            if (_next.node->is_redundant ()) {
-                LIBZMQ_DELETE (_next.node);
-                _count = 0;
-                --_live_nodes;
-                zmq_assert (_live_nodes == 0);
-            }
-            break;
-        default:
-            //  If there are multiple subnodes.
-            rm_helper_multiple_subnodes (buff_, buffsize_, maxbuffsize_, func_,
-                                         arg_, call_on_uniq_, pipe_);
-            break;
-    }
-}
-
-template <typename T>
-template <typename Arg>
-void generic_mtrie_t<T>::rm_helper_multiple_subnodes (
-  unsigned char **buff_,
-  size_t buffsize_,
-  size_t maxbuffsize_,
-  void (*func_) (prefix_t data_, size_t size_, Arg arg_),
-  Arg arg_,
-  bool call_on_uniq_,
-  value_t *pipe_)
-{
-    //  New min non-null character in the node table after the removal
-    unsigned char new_min = _min + _count - 1;
-    //  New max non-null character in the node table after the removal
-    unsigned char new_max = _min;
-    for (unsigned short c = 0; c != _count; c++) {
-        (*buff_)[buffsize_] = _min + c;
-        if (_next.table[c]) {
-            _next.table[c]->rm_helper (pipe_, buff_, buffsize_ + 1,
-                                       maxbuffsize_, func_, arg_,
-                                       call_on_uniq_);
-
-            //  Prune redundant nodes from the mtrie
-            if (_next.table[c]->is_redundant ()) {
-                LIBZMQ_DELETE (_next.table[c]);
-
-                zmq_assert (_live_nodes > 0);
-                --_live_nodes;
-            } else {
-                //  The node is not redundant, so it's a candidate for being
-                //  the new min/max node.
-                //
-                //  We loop through the node array from left to right, so the
-                //  first non-null, non-redundant node encountered is the new
-                //  minimum index. Conversely, the last non-redundant, non-null
-                //  node encountered is the new maximum index.
-                if (c + _min < new_min)
-                    new_min = c + _min;
-                if (c + _min > new_max)
-                    new_max = c + _min;
-            }
-        }
-    }
-
-    zmq_assert (_count > 1);
-
-    //  Free the node table if it's no longer used.
-    switch (_live_nodes) {
-        case 0:
-            free (_next.table);
-            _next.table = NULL;
-            _count = 0;
-            break;
-        case 1:
-            //  Compact the node table if possible
-
-            //  If there's only one live node in the table we can
-            //  switch to using the more compact single-node
-            //  representation
-            zmq_assert (new_min == new_max);
-            zmq_assert (new_min >= _min && new_min < _min + _count);
-            {
-                generic_mtrie_t *node = _next.table[new_min - _min];
-                zmq_assert (node);
-                free (_next.table);
-                _next.node = node;
-            }
-            _count = 1;
-            _min = new_min;
-            break;
-        default:
-            if (new_min > _min || new_max < _min + _count - 1) {
-                zmq_assert (new_max - new_min + 1 > 1);
-
-                generic_mtrie_t **old_table = _next.table;
-                zmq_assert (new_min > _min || new_max < _min + _count - 1);
-                zmq_assert (new_min >= _min);
-                zmq_assert (new_max <= _min + _count - 1);
-                zmq_assert (new_max - new_min + 1 < _count);
-
-                _count = new_max - new_min + 1;
-                _next.table = static_cast<generic_mtrie_t **> (
-                  malloc (sizeof (generic_mtrie_t *) * _count));
-                alloc_assert (_next.table);
-
-                memmove (_next.table, old_table + (new_min - _min),
-                         sizeof (generic_mtrie_t *) * _count);
-                free (old_table);
-
-                _min = new_min;
-            }
-    }
-}
-template <typename T>
-typename generic_mtrie_t<T>::rm_result
-generic_mtrie_t<T>::rm (prefix_t prefix_, size_t size_, value_t *pipe_)
-{
-    return rm_helper (prefix_, size_, pipe_);
-}
-
-template <typename T>
-typename generic_mtrie_t<T>::rm_result
-generic_mtrie_t<T>::rm_helper (prefix_t prefix_, size_t size_, value_t *pipe_)
-{
-    if (!size_) {
-        if (!_pipes)
-            return not_found;
-
-        typename pipes_t::size_type erased = _pipes->erase (pipe_);
-        if (_pipes->empty ()) {
-            zmq_assert (erased == 1);
-            LIBZMQ_DELETE (_pipes);
-            return last_value_removed;
-        }
-        return (erased == 1) ? values_remain : not_found;
-    }
-
-    const unsigned char c = *prefix_;
-    if (!_count || c < _min || c >= _min + _count)
-        return not_found;
-
-    generic_mtrie_t *next_node =
-      _count == 1 ? _next.node : _next.table[c - _min];
-
-    if (!next_node)
-        return not_found;
-
-    const rm_result ret = next_node->rm_helper (prefix_ + 1, size_ - 1, pipe_);
-
-    if (next_node->is_redundant ()) {
-        LIBZMQ_DELETE (next_node);
-        zmq_assert (_count > 0);
-
-        if (_count == 1) {
-            _next.node = 0;
-            _count = 0;
-            --_live_nodes;
-            zmq_assert (_live_nodes == 0);
-        } else {
-            _next.table[c - _min] = 0;
-            zmq_assert (_live_nodes > 1);
-            --_live_nodes;
-
-            //  Compact the table if possible
-            if (_live_nodes == 1) {
-                //  If there's only one live node in the table we can
-                //  switch to using the more compact single-node
-                //  representation
-                unsigned short i;
-                for (i = 0; i < _count; ++i)
-                    if (_next.table[i])
-                        break;
-
-                zmq_assert (i < _count);
-                _min += i;
-                _count = 1;
-                generic_mtrie_t *oldp = _next.table[i];
-                free (_next.table);
-                _next.node = oldp;
-            } else if (c == _min) {
-                //  We can compact the table "from the left"
-                unsigned short i;
-                for (i = 1; i < _count; ++i)
-                    if (_next.table[i])
-                        break;
-
-                zmq_assert (i < _count);
-                _min += i;
-                _count -= i;
-                generic_mtrie_t **old_table = _next.table;
-                _next.table = static_cast<generic_mtrie_t **> (
-                  malloc (sizeof (generic_mtrie_t *) * _count));
-                alloc_assert (_next.table);
-                memmove (_next.table, old_table + i,
-                         sizeof (generic_mtrie_t *) * _count);
-                free (old_table);
-            } else if (c == _min + _count - 1) {
-                //  We can compact the table "from the right"
-                unsigned short i;
-                for (i = 1; i < _count; ++i)
-                    if (_next.table[_count - 1 - i])
-                        break;
-
-                zmq_assert (i < _count);
-                _count -= i;
-                generic_mtrie_t **old_table = _next.table;
-                _next.table = static_cast<generic_mtrie_t **> (
-                  malloc (sizeof (generic_mtrie_t *) * _count));
-                alloc_assert (_next.table);
-                memmove (_next.table, old_table,
-                         sizeof (generic_mtrie_t *) * _count);
-                free (old_table);
-            }
-        }
-    }
-
-    return ret;
-}
-
-template <typename T>
-template <typename Arg>
-void generic_mtrie_t<T>::match (prefix_t data_,
-                                size_t size_,
-                                void (*func_) (value_t *pipe_, Arg arg_),
-                                Arg arg_)
-{
-    for (generic_mtrie_t *current = this; current; data_++, size_--) {
-        //  Signal the pipes attached to this node.
-        if (current->_pipes) {
-            for (typename pipes_t::iterator it = current->_pipes->begin (),
-                                            end = current->_pipes->end ();
-                 it != end; ++it) {
-                func_ (*it, arg_);
-            }
-        }
-
-        //  If we are at the end of the message, there's nothing more to match.
-        if (!size_)
-            break;
-
-        //  If there are no subnodes in the trie, return.
-        if (current->_count == 0)
-            break;
-
-        if (current->_count == 1) {
-            //  If there's one subnode (optimisation).
-            if (data_[0] != current->_min) {
-                break;
-            }
-            current = current->_next.node;
-        } else {
-            //  If there are multiple subnodes.
-            if (data_[0] < current->_min
-                || data_[0] >= current->_min + current->_count) {
-                break;
-            }
-            current = current->_next.table[data_[0] - current->_min];
-        }
-    }
-}
-
-template <typename T> bool generic_mtrie_t<T>::is_redundant () const
-{
-    return !_pipes && _live_nodes == 0;
-}
-}
-
-
-#endif
diff --git a/src/gssapi_client.cpp b/src/gssapi_client.cpp
deleted file mode 100644
index 291e9f09b..000000000
--- a/src/gssapi_client.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include <string.h>
-#include <string>
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "gssapi_client.hpp"
-#include "wire.hpp"
-
-zmq::gssapi_client_t::gssapi_client_t (session_base_t *session_,
-                                       const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    gssapi_mechanism_base_t (session_, options_),
-    state (call_next_init),
-    token_ptr (GSS_C_NO_BUFFER),
-    mechs (),
-    security_context_established (false)
-{
-    const std::string::size_type service_size =
-      options_.gss_service_principal.size ();
-    service_name = static_cast<char *> (malloc (service_size + 1));
-    assert (service_name);
-    memcpy (service_name, options_.gss_service_principal.c_str (),
-            service_size + 1);
-
-    service_name_type = convert_nametype (options_.gss_service_principal_nt);
-    maj_stat = GSS_S_COMPLETE;
-    if (!options_.gss_principal.empty ()) {
-        const std::string::size_type principal_size =
-          options_.gss_principal.size ();
-        principal_name = static_cast<char *> (malloc (principal_size + 1));
-        assert (principal_name);
-        memcpy (principal_name, options_.gss_principal.c_str (),
-                principal_size + 1);
-
-        gss_OID name_type = convert_nametype (options_.gss_principal_nt);
-        if (acquire_credentials (principal_name, &cred, name_type) != 0)
-            maj_stat = GSS_S_FAILURE;
-    }
-
-    mechs.elements = NULL;
-    mechs.count = 0;
-}
-
-zmq::gssapi_client_t::~gssapi_client_t ()
-{
-    if (service_name)
-        free (service_name);
-    if (cred)
-        gss_release_cred (&min_stat, &cred);
-}
-
-int zmq::gssapi_client_t::next_handshake_command (msg_t *msg_)
-{
-    if (state == send_ready) {
-        int rc = produce_ready (msg_);
-        if (rc == 0)
-            state = connected;
-
-        return rc;
-    }
-
-    if (state != call_next_init) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (initialize_context () < 0)
-        return -1;
-
-    if (produce_next_token (msg_) < 0)
-        return -1;
-
-    if (maj_stat != GSS_S_CONTINUE_NEEDED && maj_stat != GSS_S_COMPLETE)
-        return -1;
-
-    if (maj_stat == GSS_S_COMPLETE) {
-        security_context_established = true;
-        state = recv_ready;
-    } else
-        state = recv_next_token;
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::process_handshake_command (msg_t *msg_)
-{
-    if (state == recv_ready) {
-        int rc = process_ready (msg_);
-        if (rc == 0)
-            state = send_ready;
-
-        return rc;
-    }
-
-    if (state != recv_next_token) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (process_next_token (msg_) < 0)
-        return -1;
-
-    if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED)
-        return -1;
-
-    state = call_next_init;
-
-    errno_assert (msg_->close () == 0);
-    errno_assert (msg_->init () == 0);
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::encode (msg_t *msg_)
-{
-    zmq_assert (state == connected);
-
-    if (do_encryption)
-        return encode_message (msg_);
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::decode (msg_t *msg_)
-{
-    zmq_assert (state == connected);
-
-    if (do_encryption)
-        return decode_message (msg_);
-
-    return 0;
-}
-
-zmq::mechanism_t::status_t zmq::gssapi_client_t::status () const
-{
-    return state == connected ? mechanism_t::ready : mechanism_t::handshaking;
-}
-
-int zmq::gssapi_client_t::initialize_context ()
-{
-    // principal was specified but credentials could not be acquired
-    if (principal_name != NULL && cred == NULL)
-        return -1;
-
-    // First time through, import service_name into target_name
-    if (target_name == GSS_C_NO_NAME) {
-        send_tok.value = service_name;
-        send_tok.length = strlen (service_name) + 1;
-        OM_uint32 maj = gss_import_name (&min_stat, &send_tok,
-                                         service_name_type, &target_name);
-
-        if (maj != GSS_S_COMPLETE)
-            return -1;
-    }
-
-    maj_stat = gss_init_sec_context (
-      &init_sec_min_stat, cred, &context, target_name, mechs.elements,
-      gss_flags, 0, NULL, token_ptr, NULL, &send_tok, &ret_flags, NULL);
-
-    if (token_ptr != GSS_C_NO_BUFFER)
-        free (recv_tok.value);
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::produce_next_token (msg_t *msg_)
-{
-    if (send_tok.length != 0) { // Server expects another token
-        if (produce_initiate (msg_, send_tok.value, send_tok.length) < 0) {
-            gss_release_buffer (&min_stat, &send_tok);
-            gss_release_name (&min_stat, &target_name);
-            return -1;
-        }
-    }
-    gss_release_buffer (&min_stat, &send_tok);
-
-    if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) {
-        gss_release_name (&min_stat, &target_name);
-        if (context != GSS_C_NO_CONTEXT)
-            gss_delete_sec_context (&min_stat, &context, GSS_C_NO_BUFFER);
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::process_next_token (msg_t *msg_)
-{
-    if (maj_stat == GSS_S_CONTINUE_NEEDED) {
-        if (process_initiate (msg_, &recv_tok.value, recv_tok.length) < 0) {
-            gss_release_name (&min_stat, &target_name);
-            return -1;
-        }
-        token_ptr = &recv_tok;
-    }
-
-    return 0;
-}
-
-#endif
diff --git a/src/gssapi_client.hpp b/src/gssapi_client.hpp
deleted file mode 100644
index 18d428c8f..000000000
--- a/src/gssapi_client.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__
-#define __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include "gssapi_mechanism_base.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class gssapi_client_t ZMQ_FINAL : public gssapi_mechanism_base_t
-{
-  public:
-    gssapi_client_t (session_base_t *session_, const options_t &options_);
-    ~gssapi_client_t () ZMQ_FINAL;
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int process_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int encode (msg_t *msg_) ZMQ_FINAL;
-    int decode (msg_t *msg_) ZMQ_FINAL;
-    status_t status () const ZMQ_FINAL;
-
-  private:
-    enum state_t
-    {
-        call_next_init,
-        send_next_token,
-        recv_next_token,
-        send_ready,
-        recv_ready,
-        connected
-    };
-
-    //  Human-readable principal name of the service we are connecting to
-    char *service_name;
-
-    gss_OID service_name_type;
-
-    //  Current FSM state
-    state_t state;
-
-    //  Points to either send_tok or recv_tok
-    //  during context initialization
-    gss_buffer_desc *token_ptr;
-
-    //  The desired underlying mechanism
-    gss_OID_set_desc mechs;
-
-    //  True iff client considers the server authenticated
-    bool security_context_established;
-
-    int initialize_context ();
-    int produce_next_token (msg_t *msg_);
-    int process_next_token (msg_t *msg_);
-};
-}
-
-#endif
-
-#endif
diff --git a/src/gssapi_mechanism_base.cpp b/src/gssapi_mechanism_base.cpp
deleted file mode 100644
index b9ffeec52..000000000
--- a/src/gssapi_mechanism_base.cpp
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include <string.h>
-#include <string>
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "gssapi_mechanism_base.hpp"
-#include "wire.hpp"
-
-zmq::gssapi_mechanism_base_t::gssapi_mechanism_base_t (
-  session_base_t *session_, const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    send_tok (),
-    recv_tok (),
-    /// FIXME remove? in_buf (),
-    target_name (GSS_C_NO_NAME),
-    principal_name (NULL),
-    maj_stat (GSS_S_COMPLETE),
-    min_stat (0),
-    init_sec_min_stat (0),
-    ret_flags (0),
-    gss_flags (GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG),
-    cred (GSS_C_NO_CREDENTIAL),
-    context (GSS_C_NO_CONTEXT),
-    do_encryption (!options_.gss_plaintext)
-{
-}
-
-zmq::gssapi_mechanism_base_t::~gssapi_mechanism_base_t ()
-{
-    if (target_name)
-        gss_release_name (&min_stat, &target_name);
-    if (context)
-        gss_delete_sec_context (&min_stat, &context, GSS_C_NO_BUFFER);
-}
-
-int zmq::gssapi_mechanism_base_t::encode_message (msg_t *msg_)
-{
-    // Wrap the token value
-    int state;
-    gss_buffer_desc plaintext;
-    gss_buffer_desc wrapped;
-
-    uint8_t flags = 0;
-    if (msg_->flags () & msg_t::more)
-        flags |= 0x01;
-    if (msg_->flags () & msg_t::command)
-        flags |= 0x02;
-
-    uint8_t *plaintext_buffer =
-      static_cast<uint8_t *> (malloc (msg_->size () + 1));
-    alloc_assert (plaintext_buffer);
-
-    plaintext_buffer[0] = flags;
-    memcpy (plaintext_buffer + 1, msg_->data (), msg_->size ());
-
-    plaintext.value = plaintext_buffer;
-    plaintext.length = msg_->size () + 1;
-
-    maj_stat = gss_wrap (&min_stat, context, 1, GSS_C_QOP_DEFAULT, &plaintext,
-                         &state, &wrapped);
-
-    zmq_assert (maj_stat == GSS_S_COMPLETE);
-    zmq_assert (state);
-
-    // Re-initialize msg_ for wrapped text
-    int rc = msg_->close ();
-    zmq_assert (rc == 0);
-
-    rc = msg_->init_size (8 + 4 + wrapped.length);
-    zmq_assert (rc == 0);
-
-    uint8_t *ptr = static_cast<uint8_t *> (msg_->data ());
-
-    // Add command string
-    memcpy (ptr, "\x07MESSAGE", 8);
-    ptr += 8;
-
-    // Add token length
-    put_uint32 (ptr, static_cast<uint32_t> (wrapped.length));
-    ptr += 4;
-
-    // Add wrapped token value
-    memcpy (ptr, wrapped.value, wrapped.length);
-    ptr += wrapped.length;
-
-    gss_release_buffer (&min_stat, &wrapped);
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::decode_message (msg_t *msg_)
-{
-    const uint8_t *ptr = static_cast<uint8_t *> (msg_->data ());
-    size_t bytes_left = msg_->size ();
-
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return rc;
-
-    // Get command string
-    if (bytes_left < 8 || memcmp (ptr, "\x07MESSAGE", 8)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    ptr += 8;
-    bytes_left -= 8;
-
-    // Get token length
-    if (bytes_left < 4) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE);
-        errno = EPROTO;
-        return -1;
-    }
-    gss_buffer_desc wrapped;
-    wrapped.length = get_uint32 (ptr);
-    ptr += 4;
-    bytes_left -= 4;
-
-    // Get token value
-    if (bytes_left < wrapped.length) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE);
-        errno = EPROTO;
-        return -1;
-    }
-    // TODO: instead of malloc/memcpy, can we just do: wrapped.value = ptr;
-    const size_t alloc_length = wrapped.length ? wrapped.length : 1;
-    wrapped.value = static_cast<char *> (malloc (alloc_length));
-    alloc_assert (wrapped.value);
-
-    if (wrapped.length) {
-        memcpy (wrapped.value, ptr, wrapped.length);
-        ptr += wrapped.length;
-        bytes_left -= wrapped.length;
-    }
-
-    // Unwrap the token value
-    int state;
-    gss_buffer_desc plaintext;
-    maj_stat = gss_unwrap (&min_stat, context, &wrapped, &plaintext, &state,
-                           (gss_qop_t *) NULL);
-
-    if (maj_stat != GSS_S_COMPLETE) {
-        gss_release_buffer (&min_stat, &plaintext);
-        free (wrapped.value);
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-    zmq_assert (state);
-
-    // Re-initialize msg_ for plaintext
-    rc = msg_->close ();
-    zmq_assert (rc == 0);
-
-    rc = msg_->init_size (plaintext.length - 1);
-    zmq_assert (rc == 0);
-
-    const uint8_t flags = static_cast<char *> (plaintext.value)[0];
-    if (flags & 0x01)
-        msg_->set_flags (msg_t::more);
-    if (flags & 0x02)
-        msg_->set_flags (msg_t::command);
-
-    memcpy (msg_->data (), static_cast<char *> (plaintext.value) + 1,
-            plaintext.length - 1);
-
-    gss_release_buffer (&min_stat, &plaintext);
-    free (wrapped.value);
-
-    if (bytes_left > 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::produce_initiate (msg_t *msg_,
-                                                    void *token_value_,
-                                                    size_t token_length_)
-{
-    zmq_assert (token_value_);
-    zmq_assert (token_length_ <= 0xFFFFFFFFUL);
-
-    const size_t command_size = 9 + 4 + token_length_;
-
-    const int rc = msg_->init_size (command_size);
-    errno_assert (rc == 0);
-
-    uint8_t *ptr = static_cast<uint8_t *> (msg_->data ());
-
-    // Add command string
-    memcpy (ptr, "\x08INITIATE", 9);
-    ptr += 9;
-
-    // Add token length
-    put_uint32 (ptr, static_cast<uint32_t> (token_length_));
-    ptr += 4;
-
-    // Add token value
-    memcpy (ptr, token_value_, token_length_);
-    ptr += token_length_;
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::process_initiate (msg_t *msg_,
-                                                    void **token_value_,
-                                                    size_t &token_length_)
-{
-    zmq_assert (token_value_);
-
-    const uint8_t *ptr = static_cast<uint8_t *> (msg_->data ());
-    size_t bytes_left = msg_->size ();
-
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return rc;
-
-    // Get command string
-    if (bytes_left < 9 || memcmp (ptr, "\x08INITIATE", 9)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    ptr += 9;
-    bytes_left -= 9;
-
-    // Get token length
-    if (bytes_left < 4) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-        errno = EPROTO;
-        return -1;
-    }
-    token_length_ = get_uint32 (ptr);
-    ptr += 4;
-    bytes_left -= 4;
-
-    // Get token value
-    if (bytes_left < token_length_) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    *token_value_ =
-      static_cast<char *> (malloc (token_length_ ? token_length_ : 1));
-    alloc_assert (*token_value_);
-
-    if (token_length_) {
-        memcpy (*token_value_, ptr, token_length_);
-        ptr += token_length_;
-        bytes_left -= token_length_;
-    }
-
-    if (bytes_left > 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::produce_ready (msg_t *msg_)
-{
-    make_command_with_basic_properties (msg_, "\5READY", 6);
-
-    if (do_encryption)
-        return encode_message (msg_);
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::process_ready (msg_t *msg_)
-{
-    if (do_encryption) {
-        const int rc = decode_message (msg_);
-        if (rc != 0)
-            return rc;
-    }
-
-    const unsigned char *ptr = static_cast<unsigned char *> (msg_->data ());
-    size_t bytes_left = msg_->size ();
-
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return rc;
-
-    if (bytes_left < 6 || memcmp (ptr, "\x05READY", 6)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    ptr += 6;
-    bytes_left -= 6;
-    rc = parse_metadata (ptr, bytes_left);
-    if (rc == -1)
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA);
-
-    return rc;
-}
-
-const gss_OID zmq::gssapi_mechanism_base_t::convert_nametype (int zmq_nametype)
-{
-    switch (zmq_nametype) {
-        case ZMQ_GSSAPI_NT_HOSTBASED:
-            return GSS_C_NT_HOSTBASED_SERVICE;
-        case ZMQ_GSSAPI_NT_USER_NAME:
-            return GSS_C_NT_USER_NAME;
-        case ZMQ_GSSAPI_NT_KRB5_PRINCIPAL:
-#ifdef GSS_KRB5_NT_PRINCIPAL_NAME
-            return (gss_OID) GSS_KRB5_NT_PRINCIPAL_NAME;
-#else
-            return GSS_C_NT_USER_NAME;
-#endif
-    }
-    return NULL;
-}
-
-int zmq::gssapi_mechanism_base_t::acquire_credentials (char *service_name_,
-                                                       gss_cred_id_t *cred_,
-                                                       gss_OID name_type_)
-{
-    OM_uint32 maj_stat;
-    OM_uint32 min_stat;
-    gss_name_t server_name;
-
-    gss_buffer_desc name_buf;
-    name_buf.value = service_name_;
-    name_buf.length = strlen ((char *) name_buf.value) + 1;
-
-    maj_stat = gss_import_name (&min_stat, &name_buf, name_type_, &server_name);
-
-    if (maj_stat != GSS_S_COMPLETE)
-        return -1;
-
-    maj_stat = gss_acquire_cred (&min_stat, server_name, 0, GSS_C_NO_OID_SET,
-                                 GSS_C_BOTH, cred_, NULL, NULL);
-
-    if (maj_stat != GSS_S_COMPLETE)
-        return -1;
-
-    gss_release_name (&min_stat, &server_name);
-
-    return 0;
-}
-
-#endif
diff --git a/src/gssapi_mechanism_base.hpp b/src/gssapi_mechanism_base.hpp
deleted file mode 100644
index dec53d0bc..000000000
--- a/src/gssapi_mechanism_base.hpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__
-#define __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#if HAVE_GSSAPI_GSSAPI_GENERIC_H
-#include <gssapi/gssapi_generic.h>
-#endif
-#include <gssapi/gssapi_krb5.h>
-
-#include "mechanism_base.hpp"
-#include "options.hpp"
-
-namespace zmq
-{
-class msg_t;
-
-/// Commonalities between clients and servers are captured here.
-/// For example, clients and servers both need to produce and
-/// process context-level GSSAPI tokens (via INITIATE commands)
-/// and per-message GSSAPI tokens (via MESSAGE commands).
-class gssapi_mechanism_base_t : public virtual mechanism_base_t
-{
-  public:
-    gssapi_mechanism_base_t (session_base_t *session_,
-                             const options_t &options_);
-    ~gssapi_mechanism_base_t () ZMQ_OVERRIDE = 0;
-
-  protected:
-    //  Produce a context-level GSSAPI token (INITIATE command)
-    //  during security context initialization.
-    int produce_initiate (msg_t *msg_, void *data_, size_t data_len_);
-
-    //  Process a context-level GSSAPI token (INITIATE command)
-    //  during security context initialization.
-    int process_initiate (msg_t *msg_, void **data_, size_t &data_len_);
-
-    // Produce a metadata ready msg (READY) to conclude handshake
-    int produce_ready (msg_t *msg_);
-
-    // Process a metadata ready msg (READY)
-    int process_ready (msg_t *msg_);
-
-    //  Encode a per-message GSSAPI token (MESSAGE command) using
-    //  the established security context.
-    int encode_message (msg_t *msg_);
-
-    //  Decode a per-message GSSAPI token (MESSAGE command) using
-    //  the  established security context.
-    int decode_message (msg_t *msg_);
-
-    //  Convert ZMQ_GSSAPI_NT values to GSSAPI name_type
-    static const gss_OID convert_nametype (int zmq_name_type_);
-
-    //  Acquire security context credentials from the
-    //  underlying mechanism.
-    static int acquire_credentials (char *principal_name_,
-                                    gss_cred_id_t *cred_,
-                                    gss_OID name_type_);
-
-  protected:
-    //  Opaque GSSAPI token for outgoing data
-    gss_buffer_desc send_tok;
-
-    //  Opaque GSSAPI token for incoming data
-    gss_buffer_desc recv_tok;
-
-    //  Opaque GSSAPI representation of principal
-    gss_name_t target_name;
-
-    //  Human-readable principal name
-    char *principal_name;
-
-    //  Status code returned by GSSAPI functions
-    OM_uint32 maj_stat;
-
-    //  Status code returned by the underlying mechanism
-    OM_uint32 min_stat;
-
-    //  Status code returned by the underlying mechanism
-    //  during context initialization
-    OM_uint32 init_sec_min_stat;
-
-    //  Flags returned by GSSAPI (ignored)
-    OM_uint32 ret_flags;
-
-    //  Flags returned by GSSAPI (ignored)
-    OM_uint32 gss_flags;
-
-    //  Credentials used to establish security context
-    gss_cred_id_t cred;
-
-    //  Opaque GSSAPI representation of the security context
-    gss_ctx_id_t context;
-
-    //  If true, use gss to encrypt messages. If false, only utilize gss for auth.
-    bool do_encryption;
-};
-}
-
-#endif
-
-#endif
diff --git a/src/gssapi_server.cpp b/src/gssapi_server.cpp
deleted file mode 100644
index 0a43349a5..000000000
--- a/src/gssapi_server.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include <string.h>
-#include <string>
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "gssapi_server.hpp"
-#include "wire.hpp"
-
-#include <gssapi/gssapi.h>
-
-zmq::gssapi_server_t::gssapi_server_t (session_base_t *session_,
-                                       const std::string &peer_address_,
-                                       const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    gssapi_mechanism_base_t (session_, options_),
-    zap_client_t (session_, peer_address_, options_),
-    session (session_),
-    peer_address (peer_address_),
-    state (recv_next_token),
-    security_context_established (false)
-{
-    maj_stat = GSS_S_CONTINUE_NEEDED;
-    if (!options_.gss_principal.empty ()) {
-        const std::string::size_type principal_size =
-          options_.gss_principal.size ();
-        principal_name = static_cast<char *> (malloc (principal_size + 1));
-        assert (principal_name);
-        memcpy (principal_name, options_.gss_principal.c_str (),
-                principal_size + 1);
-        gss_OID name_type = convert_nametype (options_.gss_principal_nt);
-        if (acquire_credentials (principal_name, &cred, name_type) != 0)
-            maj_stat = GSS_S_FAILURE;
-    }
-}
-
-zmq::gssapi_server_t::~gssapi_server_t ()
-{
-    if (cred)
-        gss_release_cred (&min_stat, &cred);
-
-    if (target_name)
-        gss_release_name (&min_stat, &target_name);
-}
-
-int zmq::gssapi_server_t::next_handshake_command (msg_t *msg_)
-{
-    if (state == send_ready) {
-        int rc = produce_ready (msg_);
-        if (rc == 0)
-            state = recv_ready;
-
-        return rc;
-    }
-
-    if (state != send_next_token) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (produce_next_token (msg_) < 0)
-        return -1;
-
-    if (maj_stat != GSS_S_CONTINUE_NEEDED && maj_stat != GSS_S_COMPLETE)
-        return -1;
-
-    if (maj_stat == GSS_S_COMPLETE) {
-        security_context_established = true;
-    }
-
-    state = recv_next_token;
-
-    return 0;
-}
-
-int zmq::gssapi_server_t::process_handshake_command (msg_t *msg_)
-{
-    if (state == recv_ready) {
-        int rc = process_ready (msg_);
-        if (rc == 0)
-            state = connected;
-
-        return rc;
-    }
-
-    if (state != recv_next_token) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (security_context_established) {
-        //  Use ZAP protocol (RFC 27) to authenticate the user.
-        //  Note that rc will be -1 only if ZAP is not set up, but if it was
-        //  requested and it does not work properly the program will abort.
-        bool expecting_zap_reply = false;
-        int rc = session->zap_connect ();
-        if (rc == 0) {
-            send_zap_request ();
-            rc = receive_and_process_zap_reply ();
-            if (rc != 0) {
-                if (rc == -1)
-                    return -1;
-                expecting_zap_reply = true;
-            }
-        }
-        state = expecting_zap_reply ? expect_zap_reply : send_ready;
-        return 0;
-    }
-
-    if (process_next_token (msg_) < 0)
-        return -1;
-
-    accept_context ();
-    state = send_next_token;
-
-    errno_assert (msg_->close () == 0);
-    errno_assert (msg_->init () == 0);
-
-    return 0;
-}
-
-void zmq::gssapi_server_t::send_zap_request ()
-{
-    gss_buffer_desc principal;
-    gss_display_name (&min_stat, target_name, &principal, NULL);
-    zap_client_t::send_zap_request (
-      "GSSAPI", 6, reinterpret_cast<const uint8_t *> (principal.value),
-      principal.length);
-
-    gss_release_buffer (&min_stat, &principal);
-}
-
-int zmq::gssapi_server_t::encode (msg_t *msg_)
-{
-    zmq_assert (state == connected);
-
-    if (do_encryption)
-        return encode_message (msg_);
-
-    return 0;
-}
-
-int zmq::gssapi_server_t::decode (msg_t *msg_)
-{
-    zmq_assert (state == connected);
-
-    if (do_encryption)
-        return decode_message (msg_);
-
-    return 0;
-}
-
-int zmq::gssapi_server_t::zap_msg_available ()
-{
-    if (state != expect_zap_reply) {
-        errno = EFSM;
-        return -1;
-    }
-    const int rc = receive_and_process_zap_reply ();
-    if (rc == 0)
-        state = send_ready;
-    return rc == -1 ? -1 : 0;
-}
-
-zmq::mechanism_t::status_t zmq::gssapi_server_t::status () const
-{
-    return state == connected ? mechanism_t::ready : mechanism_t::handshaking;
-}
-
-int zmq::gssapi_server_t::produce_next_token (msg_t *msg_)
-{
-    if (send_tok.length != 0) { // Client expects another token
-        if (produce_initiate (msg_, send_tok.value, send_tok.length) < 0)
-            return -1;
-        gss_release_buffer (&min_stat, &send_tok);
-    }
-
-    if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) {
-        gss_release_name (&min_stat, &target_name);
-        if (context != GSS_C_NO_CONTEXT)
-            gss_delete_sec_context (&min_stat, &context, GSS_C_NO_BUFFER);
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::gssapi_server_t::process_next_token (msg_t *msg_)
-{
-    if (maj_stat == GSS_S_CONTINUE_NEEDED) {
-        if (process_initiate (msg_, &recv_tok.value, recv_tok.length) < 0) {
-            if (target_name != GSS_C_NO_NAME)
-                gss_release_name (&min_stat, &target_name);
-            return -1;
-        }
-    }
-
-    return 0;
-}
-
-void zmq::gssapi_server_t::accept_context ()
-{
-    maj_stat = gss_accept_sec_context (
-      &init_sec_min_stat, &context, cred, &recv_tok, GSS_C_NO_CHANNEL_BINDINGS,
-      &target_name, &doid, &send_tok, &ret_flags, NULL, NULL);
-
-    if (recv_tok.value) {
-        free (recv_tok.value);
-        recv_tok.value = NULL;
-    }
-}
-
-#endif
diff --git a/src/gssapi_server.hpp b/src/gssapi_server.hpp
deleted file mode 100644
index 261301153..000000000
--- a/src/gssapi_server.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__
-#define __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include "gssapi_mechanism_base.hpp"
-#include "zap_client.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class gssapi_server_t ZMQ_FINAL : public gssapi_mechanism_base_t,
-                                  public zap_client_t
-{
-  public:
-    gssapi_server_t (session_base_t *session_,
-                     const std::string &peer_address,
-                     const options_t &options_);
-    ~gssapi_server_t () ZMQ_FINAL;
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int process_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int encode (msg_t *msg_) ZMQ_FINAL;
-    int decode (msg_t *msg_) ZMQ_FINAL;
-    int zap_msg_available () ZMQ_FINAL;
-    status_t status () const ZMQ_FINAL;
-
-  private:
-    enum state_t
-    {
-        send_next_token,
-        recv_next_token,
-        expect_zap_reply,
-        send_ready,
-        recv_ready,
-        connected
-    };
-
-    session_base_t *const session;
-
-    const std::string peer_address;
-
-    //  Current FSM state
-    state_t state;
-
-    //  True iff server considers the client authenticated
-    bool security_context_established;
-
-    //  The underlying mechanism type (ignored)
-    gss_OID doid;
-
-    void accept_context ();
-    int produce_next_token (msg_t *msg_);
-    int process_next_token (msg_t *msg_);
-    void send_zap_request ();
-};
-}
-
-#endif
-
-#endif
diff --git a/src/i_decoder.hpp b/src/i_decoder.hpp
deleted file mode 100644
index e0bcf0745..000000000
--- a/src/i_decoder.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_DECODER_HPP_INCLUDED__
-#define __ZMQ_I_DECODER_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-class msg_t;
-
-//  Interface to be implemented by message decoder.
-
-class i_decoder
-{
-  public:
-    virtual ~i_decoder () ZMQ_DEFAULT;
-
-    virtual void get_buffer (unsigned char **data_, size_t *size_) = 0;
-
-    virtual void resize_buffer (size_t) = 0;
-    //  Decodes data pointed to by data_.
-    //  When a message is decoded, 1 is returned.
-    //  When the decoder needs more data, 0 is returned.
-    //  On error, -1 is returned and errno is set accordingly.
-    virtual int
-    decode (const unsigned char *data_, size_t size_, size_t &processed_) = 0;
-
-    virtual msg_t *msg () = 0;
-};
-}
-
-#endif
diff --git a/src/i_encoder.hpp b/src/i_encoder.hpp
deleted file mode 100644
index 33ef9dd84..000000000
--- a/src/i_encoder.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_ENCODER_HPP_INCLUDED__
-#define __ZMQ_I_ENCODER_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Forward declaration
-class msg_t;
-
-//  Interface to be implemented by message encoder.
-
-struct i_encoder
-{
-    virtual ~i_encoder () ZMQ_DEFAULT;
-
-    //  The function returns a batch of binary data. The data
-    //  are filled to a supplied buffer. If no buffer is supplied (data_
-    //  is NULL) encoder will provide buffer of its own.
-    //  Function returns 0 when a new message is required.
-    virtual size_t encode (unsigned char **data_, size_t size_) = 0;
-
-    //  Load a new message into encoder.
-    virtual void load_msg (msg_t *msg_) = 0;
-};
-}
-
-#endif
diff --git a/src/i_engine.hpp b/src/i_engine.hpp
deleted file mode 100644
index 7d05df8ab..000000000
--- a/src/i_engine.hpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_ENGINE_HPP_INCLUDED__
-#define __ZMQ_I_ENGINE_HPP_INCLUDED__
-
-#include "endpoint.hpp"
-#include "macros.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-
-//  Abstract interface to be implemented by various engines.
-
-struct i_engine
-{
-    enum error_reason_t
-    {
-        protocol_error,
-        connection_error,
-        timeout_error
-    };
-
-    virtual ~i_engine () ZMQ_DEFAULT;
-
-    //  Indicate if the engine has an handshake stage.
-    //  If engine has handshake stage, engine must call session.engine_ready when the handshake is complete.
-    virtual bool has_handshake_stage () = 0;
-
-    //  Plug the engine to the session.
-    virtual void plug (zmq::io_thread_t *io_thread_,
-                       class session_base_t *session_) = 0;
-
-    //  Terminate and deallocate the engine. Note that 'detached'
-    //  events are not fired on termination.
-    virtual void terminate () = 0;
-
-    //  This method is called by the session to signalise that more
-    //  messages can be written to the pipe.
-    //  Returns false if the engine was deleted due to an error.
-    //  TODO it is probably better to change the design such that the engine
-    //  does not delete itself
-    virtual bool restart_input () = 0;
-
-    //  This method is called by the session to signalise that there
-    //  are messages to send available.
-    virtual void restart_output () = 0;
-
-    virtual void zap_msg_available () = 0;
-
-    virtual const endpoint_uri_pair_t &get_endpoint () const = 0;
-};
-}
-
-#endif
diff --git a/src/i_mailbox.hpp b/src/i_mailbox.hpp
deleted file mode 100644
index 7402a2196..000000000
--- a/src/i_mailbox.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_MAILBOX_HPP_INCLUDED__
-#define __ZMQ_I_MAILBOX_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Interface to be implemented by mailbox.
-
-class i_mailbox
-{
-  public:
-    virtual ~i_mailbox () ZMQ_DEFAULT;
-
-    virtual void send (const command_t &cmd_) = 0;
-    virtual int recv (command_t *cmd_, int timeout_) = 0;
-
-
-#ifdef HAVE_FORK
-    // close the file descriptors in the signaller. This is used in a forked
-    // child process to close the file descriptors so that they do not interfere
-    // with the context in the parent process.
-    virtual void forked () = 0;
-#endif
-};
-}
-
-#endif
diff --git a/src/i_poll_events.hpp b/src/i_poll_events.hpp
deleted file mode 100644
index 5e70162c9..000000000
--- a/src/i_poll_events.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_POLL_EVENTS_HPP_INCLUDED__
-#define __ZMQ_I_POLL_EVENTS_HPP_INCLUDED__
-
-#include "macros.hpp"
-
-namespace zmq
-{
-// Virtual interface to be exposed by object that want to be notified
-// about events on file descriptors.
-
-struct i_poll_events
-{
-    virtual ~i_poll_events () ZMQ_DEFAULT;
-
-    // Called by I/O thread when file descriptor is ready for reading.
-    virtual void in_event () = 0;
-
-    // Called by I/O thread when file descriptor is ready for writing.
-    virtual void out_event () = 0;
-
-    // Called when timer expires.
-    virtual void timer_event (int id_) = 0;
-};
-}
-
-#endif
diff --git a/src/io_object.cpp b/src/io_object.cpp
deleted file mode 100644
index aa466c086..000000000
--- a/src/io_object.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "io_object.hpp"
-#include "io_thread.hpp"
-#include "err.hpp"
-
-zmq::io_object_t::io_object_t (io_thread_t *io_thread_) : _poller (NULL)
-{
-    if (io_thread_)
-        plug (io_thread_);
-}
-
-zmq::io_object_t::~io_object_t ()
-{
-}
-
-void zmq::io_object_t::plug (io_thread_t *io_thread_)
-{
-    zmq_assert (io_thread_);
-    zmq_assert (!_poller);
-
-    //  Retrieve the poller from the thread we are running in.
-    _poller = io_thread_->get_poller ();
-}
-
-void zmq::io_object_t::unplug ()
-{
-    zmq_assert (_poller);
-
-    //  Forget about old poller in preparation to be migrated
-    //  to a different I/O thread.
-    _poller = NULL;
-}
-
-zmq::io_object_t::handle_t zmq::io_object_t::add_fd (fd_t fd_)
-{
-    return _poller->add_fd (fd_, this);
-}
-
-void zmq::io_object_t::rm_fd (handle_t handle_)
-{
-    _poller->rm_fd (handle_);
-}
-
-void zmq::io_object_t::set_pollin (handle_t handle_)
-{
-    _poller->set_pollin (handle_);
-}
-
-void zmq::io_object_t::reset_pollin (handle_t handle_)
-{
-    _poller->reset_pollin (handle_);
-}
-
-void zmq::io_object_t::set_pollout (handle_t handle_)
-{
-    _poller->set_pollout (handle_);
-}
-
-void zmq::io_object_t::reset_pollout (handle_t handle_)
-{
-    _poller->reset_pollout (handle_);
-}
-
-void zmq::io_object_t::add_timer (int timeout_, int id_)
-{
-    _poller->add_timer (timeout_, this, id_);
-}
-
-void zmq::io_object_t::cancel_timer (int id_)
-{
-    _poller->cancel_timer (this, id_);
-}
-
-void zmq::io_object_t::in_event ()
-{
-    zmq_assert (false);
-}
-
-void zmq::io_object_t::out_event ()
-{
-    zmq_assert (false);
-}
-
-void zmq::io_object_t::timer_event (int)
-{
-    zmq_assert (false);
-}
diff --git a/src/io_object.hpp b/src/io_object.hpp
deleted file mode 100644
index 703af7efc..000000000
--- a/src/io_object.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IO_OBJECT_HPP_INCLUDED__
-#define __ZMQ_IO_OBJECT_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "stdint.hpp"
-#include "poller.hpp"
-#include "i_poll_events.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-
-//  Simple base class for objects that live in I/O threads.
-//  It makes communication with the poller object easier and
-//  makes defining unneeded event handlers unnecessary.
-
-class io_object_t : public i_poll_events
-{
-  public:
-    io_object_t (zmq::io_thread_t *io_thread_ = NULL);
-    ~io_object_t () ZMQ_OVERRIDE;
-
-    //  When migrating an object from one I/O thread to another, first
-    //  unplug it, then migrate it, then plug it to the new thread.
-    void plug (zmq::io_thread_t *io_thread_);
-    void unplug ();
-
-  protected:
-    typedef poller_t::handle_t handle_t;
-
-    //  Methods to access underlying poller object.
-    handle_t add_fd (fd_t fd_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void add_timer (int timeout_, int id_);
-    void cancel_timer (int id_);
-
-    //  i_poll_events interface implementation.
-    void in_event () ZMQ_OVERRIDE;
-    void out_event () ZMQ_OVERRIDE;
-    void timer_event (int id_) ZMQ_OVERRIDE;
-
-  private:
-    poller_t *_poller;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (io_object_t)
-};
-}
-
-#endif
diff --git a/src/io_thread.cpp b/src/io_thread.cpp
deleted file mode 100644
index a2ca950a2..000000000
--- a/src/io_thread.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include <new>
-
-#include "macros.hpp"
-#include "io_thread.hpp"
-#include "err.hpp"
-#include "ctx.hpp"
-
-zmq::io_thread_t::io_thread_t (ctx_t *ctx_, uint32_t tid_) :
-    object_t (ctx_, tid_),
-    _mailbox_handle (static_cast<poller_t::handle_t> (NULL))
-{
-    _poller = new (std::nothrow) poller_t (*ctx_);
-    alloc_assert (_poller);
-
-    if (_mailbox.get_fd () != retired_fd) {
-        _mailbox_handle = _poller->add_fd (_mailbox.get_fd (), this);
-        _poller->set_pollin (_mailbox_handle);
-    }
-}
-
-zmq::io_thread_t::~io_thread_t ()
-{
-    LIBZMQ_DELETE (_poller);
-}
-
-void zmq::io_thread_t::start ()
-{
-    char name[16] = "";
-    snprintf (name, sizeof (name), "IO/%u",
-              get_tid () - zmq::ctx_t::reaper_tid - 1);
-    //  Start the underlying I/O thread.
-    _poller->start (name);
-}
-
-void zmq::io_thread_t::stop ()
-{
-    send_stop ();
-}
-
-zmq::mailbox_t *zmq::io_thread_t::get_mailbox ()
-{
-    return &_mailbox;
-}
-
-int zmq::io_thread_t::get_load () const
-{
-    return _poller->get_load ();
-}
-
-void zmq::io_thread_t::in_event ()
-{
-    //  TODO: Do we want to limit number of commands I/O thread can
-    //  process in a single go?
-
-    command_t cmd;
-    int rc = _mailbox.recv (&cmd, 0);
-
-    while (rc == 0 || errno == EINTR) {
-        if (rc == 0)
-            cmd.destination->process_command (cmd);
-        rc = _mailbox.recv (&cmd, 0);
-    }
-
-    errno_assert (rc != 0 && errno == EAGAIN);
-}
-
-void zmq::io_thread_t::out_event ()
-{
-    //  We are never polling for POLLOUT here. This function is never called.
-    zmq_assert (false);
-}
-
-void zmq::io_thread_t::timer_event (int)
-{
-    //  No timers here. This function is never called.
-    zmq_assert (false);
-}
-
-zmq::poller_t *zmq::io_thread_t::get_poller () const
-{
-    zmq_assert (_poller);
-    return _poller;
-}
-
-void zmq::io_thread_t::process_stop ()
-{
-    zmq_assert (_mailbox_handle);
-    _poller->rm_fd (_mailbox_handle);
-    _poller->stop ();
-}
diff --git a/src/io_thread.hpp b/src/io_thread.hpp
deleted file mode 100644
index 65e276d97..000000000
--- a/src/io_thread.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IO_THREAD_HPP_INCLUDED__
-#define __ZMQ_IO_THREAD_HPP_INCLUDED__
-
-#include "stdint.hpp"
-#include "object.hpp"
-#include "poller.hpp"
-#include "i_poll_events.hpp"
-#include "mailbox.hpp"
-
-namespace zmq
-{
-class ctx_t;
-
-//  Generic part of the I/O thread. Polling-mechanism-specific features
-//  are implemented in separate "polling objects".
-
-class io_thread_t ZMQ_FINAL : public object_t, public i_poll_events
-{
-  public:
-    io_thread_t (zmq::ctx_t *ctx_, uint32_t tid_);
-
-    //  Clean-up. If the thread was started, it's necessary to call 'stop'
-    //  before invoking destructor. Otherwise the destructor would hang up.
-    ~io_thread_t ();
-
-    //  Launch the physical thread.
-    void start ();
-
-    //  Ask underlying thread to stop.
-    void stop ();
-
-    //  Returns mailbox associated with this I/O thread.
-    mailbox_t *get_mailbox ();
-
-    //  i_poll_events implementation.
-    void in_event ();
-    void out_event ();
-    void timer_event (int id_);
-
-    //  Used by io_objects to retrieve the associated poller object.
-    poller_t *get_poller () const;
-
-    //  Command handlers.
-    void process_stop ();
-
-    //  Returns load experienced by the I/O thread.
-    int get_load () const;
-
-  private:
-    //  I/O thread accesses incoming commands via this mailbox.
-    mailbox_t _mailbox;
-
-    //  Handle associated with mailbox' file descriptor.
-    poller_t::handle_t _mailbox_handle;
-
-    //  I/O multiplexing is performed using a poller object.
-    poller_t *_poller;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (io_thread_t)
-};
-}
-
-#endif
diff --git a/src/ip.cpp b/src/ip.cpp
deleted file mode 100644
index 7550bdecd..000000000
--- a/src/ip.cpp
+++ /dev/null
@@ -1,911 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "ip.hpp"
-#include "err.hpp"
-#include "macros.hpp"
-#include "config.hpp"
-#include "address.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <vector>
-#else
-#include "tcp.hpp"
-#ifdef ZMQ_HAVE_IPC
-#include "ipc_address.hpp"
-#endif
-
-#include <direct.h>
-#endif
-
-#if defined ZMQ_HAVE_OPENVMS || defined ZMQ_HAVE_VXWORKS
-#include <ioctl.h>
-#endif
-
-#if defined ZMQ_HAVE_VXWORKS
-#include <unistd.h>
-#include <sockLib.h>
-#include <ioLib.h>
-#endif
-
-#if defined ZMQ_HAVE_EVENTFD
-#include <sys/eventfd.h>
-#endif
-
-#if defined ZMQ_HAVE_OPENPGM
-#ifdef ZMQ_HAVE_WINDOWS
-#define __PGM_WININT_H__
-#endif
-
-#include <pgm/pgm.h>
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-#ifndef ZMQ_HAVE_WINDOWS
-// Acceptable temporary directory environment variables
-static const char *tmp_env_vars[] = {
-  "TMPDIR", "TEMPDIR", "TMP",
-  0 // Sentinel
-};
-#endif
-
-zmq::fd_t zmq::open_socket (int domain_, int type_, int protocol_)
-{
-    int rc;
-
-    //  Setting this option result in sane behaviour when exec() functions
-    //  are used. Old sockets are closed and don't block TCP ports etc.
-#if defined ZMQ_HAVE_SOCK_CLOEXEC
-    type_ |= SOCK_CLOEXEC;
-#endif
-
-#if defined ZMQ_HAVE_WINDOWS && defined WSA_FLAG_NO_HANDLE_INHERIT
-    // if supported, create socket with WSA_FLAG_NO_HANDLE_INHERIT, such that
-    // the race condition in making it non-inheritable later is avoided
-    const fd_t s =
-      WSASocket (domain_, type_, protocol_, NULL, 0,
-                 WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
-#else
-    const fd_t s = socket (domain_, type_, protocol_);
-#endif
-    if (s == retired_fd) {
-#ifdef ZMQ_HAVE_WINDOWS
-        errno = wsa_error_to_errno (WSAGetLastError ());
-#endif
-        return retired_fd;
-    }
-
-    make_socket_noninheritable (s);
-
-    //  Socket is not yet connected so EINVAL is not a valid networking error
-    rc = zmq::set_nosigpipe (s);
-    errno_assert (rc == 0);
-
-    return s;
-}
-
-void zmq::unblock_socket (fd_t s_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    u_long nonblock = 1;
-    const int rc = ioctlsocket (s_, FIONBIO, &nonblock);
-    wsa_assert (rc != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_OPENVMS || defined ZMQ_HAVE_VXWORKS
-    int nonblock = 1;
-    int rc = ioctl (s_, FIONBIO, &nonblock);
-    errno_assert (rc != -1);
-#else
-    int flags = fcntl (s_, F_GETFL, 0);
-    if (flags == -1)
-        flags = 0;
-    int rc = fcntl (s_, F_SETFL, flags | O_NONBLOCK);
-    errno_assert (rc != -1);
-#endif
-}
-
-void zmq::enable_ipv4_mapping (fd_t s_)
-{
-    LIBZMQ_UNUSED (s_);
-
-#if defined IPV6_V6ONLY && !defined ZMQ_HAVE_OPENBSD                           \
-  && !defined ZMQ_HAVE_DRAGONFLY
-#ifdef ZMQ_HAVE_WINDOWS
-    DWORD flag = 0;
-#else
-    int flag = 0;
-#endif
-    const int rc = setsockopt (s_, IPPROTO_IPV6, IPV6_V6ONLY,
-                               reinterpret_cast<char *> (&flag), sizeof (flag));
-#ifdef ZMQ_HAVE_WINDOWS
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    errno_assert (rc == 0);
-#endif
-#endif
-}
-
-int zmq::get_peer_ip_address (fd_t sockfd_, std::string &ip_addr_)
-{
-    struct sockaddr_storage ss;
-
-    const zmq_socklen_t addrlen =
-      get_socket_address (sockfd_, socket_end_remote, &ss);
-
-    if (addrlen == 0) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int last_error = WSAGetLastError ();
-        wsa_assert (last_error != WSANOTINITIALISED && last_error != WSAEFAULT
-                    && last_error != WSAEINPROGRESS
-                    && last_error != WSAENOTSOCK);
-#elif !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EBADF && errno != EFAULT && errno != ENOTSOCK);
-#else
-        errno_assert (errno != EFAULT && errno != ENOTSOCK);
-#endif
-        return 0;
-    }
-
-    char host[NI_MAXHOST];
-    const int rc =
-      getnameinfo (reinterpret_cast<struct sockaddr *> (&ss), addrlen, host,
-                   sizeof host, NULL, 0, NI_NUMERICHOST);
-    if (rc != 0)
-        return 0;
-
-    ip_addr_ = host;
-
-    union
-    {
-        struct sockaddr sa;
-        struct sockaddr_storage sa_stor;
-    } u;
-
-    u.sa_stor = ss;
-    return static_cast<int> (u.sa.sa_family);
-}
-
-void zmq::set_ip_type_of_service (fd_t s_, int iptos_)
-{
-    int rc = setsockopt (s_, IPPROTO_IP, IP_TOS,
-                         reinterpret_cast<char *> (&iptos_), sizeof (iptos_));
-
-#ifdef ZMQ_HAVE_WINDOWS
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    errno_assert (rc == 0);
-#endif
-
-    //  Windows and Hurd do not support IPV6_TCLASS
-#if !defined(ZMQ_HAVE_WINDOWS) && defined(IPV6_TCLASS)
-    rc = setsockopt (s_, IPPROTO_IPV6, IPV6_TCLASS,
-                     reinterpret_cast<char *> (&iptos_), sizeof (iptos_));
-
-    //  If IPv6 is not enabled ENOPROTOOPT will be returned on Linux and
-    //  EINVAL on OSX
-    if (rc == -1) {
-        errno_assert (errno == ENOPROTOOPT || errno == EINVAL);
-    }
-#endif
-}
-
-int zmq::set_nosigpipe (fd_t s_)
-{
-#ifdef SO_NOSIGPIPE
-    //  Make sure that SIGPIPE signal is not generated when writing to a
-    //  connection that was already closed by the peer.
-    //  As per POSIX spec, EINVAL will be returned if the socket was valid but
-    //  the connection has been reset by the peer. Return an error so that the
-    //  socket can be closed and the connection retried if necessary.
-    int set = 1;
-    int rc = setsockopt (s_, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof (int));
-    if (rc != 0 && errno == EINVAL)
-        return -1;
-    errno_assert (rc == 0);
-#else
-    LIBZMQ_UNUSED (s_);
-#endif
-
-    return 0;
-}
-
-int zmq::bind_to_device (fd_t s_, const std::string &bound_device_)
-{
-#ifdef ZMQ_HAVE_SO_BINDTODEVICE
-    int rc = setsockopt (s_, SOL_SOCKET, SO_BINDTODEVICE,
-                         bound_device_.c_str (), bound_device_.length ());
-    if (rc != 0) {
-        assert_success_or_recoverable (s_, rc);
-        return -1;
-    }
-    return 0;
-
-#else
-    LIBZMQ_UNUSED (s_);
-    LIBZMQ_UNUSED (bound_device_);
-
-    errno = ENOTSUP;
-    return -1;
-#endif
-}
-
-bool zmq::initialize_network ()
-{
-#if defined ZMQ_HAVE_OPENPGM
-
-    //  Init PGM transport. Ensure threading and timer are enabled. Find PGM
-    //  protocol ID. Note that if you want to use gettimeofday and sleep for
-    //  openPGM timing, set environment variables PGM_TIMER to "GTOD" and
-    //  PGM_SLEEP to "USLEEP".
-    pgm_error_t *pgm_error = NULL;
-    const bool ok = pgm_init (&pgm_error);
-    if (ok != TRUE) {
-        //  Invalid parameters don't set pgm_error_t
-        zmq_assert (pgm_error != NULL);
-        if (pgm_error->domain == PGM_ERROR_DOMAIN_TIME
-            && (pgm_error->code == PGM_ERROR_FAILED)) {
-            //  Failed to access RTC or HPET device.
-            pgm_error_free (pgm_error);
-            errno = EINVAL;
-            return false;
-        }
-
-        //  PGM_ERROR_DOMAIN_ENGINE: WSAStartup errors or missing WSARecvMsg.
-        zmq_assert (false);
-    }
-#endif
-
-#ifdef ZMQ_HAVE_WINDOWS
-    //  Intialise Windows sockets. Note that WSAStartup can be called multiple
-    //  times given that WSACleanup will be called for each WSAStartup.
-
-    const WORD version_requested = MAKEWORD (2, 2);
-    WSADATA wsa_data;
-    const int rc = WSAStartup (version_requested, &wsa_data);
-    zmq_assert (rc == 0);
-    zmq_assert (LOBYTE (wsa_data.wVersion) == 2
-                && HIBYTE (wsa_data.wVersion) == 2);
-#endif
-
-    return true;
-}
-
-void zmq::shutdown_network ()
-{
-#ifdef ZMQ_HAVE_WINDOWS
-    //  On Windows, uninitialise socket layer.
-    const int rc = WSACleanup ();
-    wsa_assert (rc != SOCKET_ERROR);
-#endif
-
-#if defined ZMQ_HAVE_OPENPGM
-    //  Shut down the OpenPGM library.
-    if (pgm_shutdown () != TRUE)
-        zmq_assert (false);
-#endif
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-static void tune_socket (const SOCKET socket_)
-{
-    BOOL tcp_nodelay = 1;
-    const int rc =
-      setsockopt (socket_, IPPROTO_TCP, TCP_NODELAY,
-                  reinterpret_cast<char *> (&tcp_nodelay), sizeof tcp_nodelay);
-    wsa_assert (rc != SOCKET_ERROR);
-
-    zmq::tcp_tune_loopback_fast_path (socket_);
-}
-
-static int make_fdpair_tcpip (zmq::fd_t *r_, zmq::fd_t *w_)
-{
-#if !defined _WIN32_WCE && !defined ZMQ_HAVE_WINDOWS_UWP
-    //  Windows CE does not manage security attributes
-    SECURITY_DESCRIPTOR sd;
-    SECURITY_ATTRIBUTES sa;
-    memset (&sd, 0, sizeof sd);
-    memset (&sa, 0, sizeof sa);
-
-    InitializeSecurityDescriptor (&sd, SECURITY_DESCRIPTOR_REVISION);
-    SetSecurityDescriptorDacl (&sd, TRUE, 0, FALSE);
-
-    sa.nLength = sizeof (SECURITY_ATTRIBUTES);
-    sa.lpSecurityDescriptor = &sd;
-#endif
-
-    //  This function has to be in a system-wide critical section so that
-    //  two instances of the library don't accidentally create signaler
-    //  crossing the process boundary.
-    //  We'll use named event object to implement the critical section.
-    //  Note that if the event object already exists, the CreateEvent requests
-    //  EVENT_ALL_ACCESS access right. If this fails, we try to open
-    //  the event object asking for SYNCHRONIZE access only.
-    HANDLE sync = NULL;
-
-    //  Create critical section only if using fixed signaler port
-    //  Use problematic Event implementation for compatibility if using old port 5905.
-    //  Otherwise use Mutex implementation.
-    const int event_signaler_port = 5905;
-
-    if (zmq::signaler_port == event_signaler_port) {
-#if !defined _WIN32_WCE && !defined ZMQ_HAVE_WINDOWS_UWP
-        sync =
-          CreateEventW (&sa, FALSE, TRUE, L"Global\\zmq-signaler-port-sync");
-#else
-        sync =
-          CreateEventW (NULL, FALSE, TRUE, L"Global\\zmq-signaler-port-sync");
-#endif
-        if (sync == NULL && GetLastError () == ERROR_ACCESS_DENIED)
-            sync = OpenEventW (SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE,
-                               L"Global\\zmq-signaler-port-sync");
-
-        win_assert (sync != NULL);
-    } else if (zmq::signaler_port != 0) {
-        wchar_t mutex_name[MAX_PATH];
-#ifdef __MINGW32__
-        _snwprintf (mutex_name, MAX_PATH, L"Global\\zmq-signaler-port-%d",
-                    zmq::signaler_port);
-#else
-        swprintf (mutex_name, MAX_PATH, L"Global\\zmq-signaler-port-%d",
-                  zmq::signaler_port);
-#endif
-
-#if !defined _WIN32_WCE && !defined ZMQ_HAVE_WINDOWS_UWP
-        sync = CreateMutexW (&sa, FALSE, mutex_name);
-#else
-        sync = CreateMutexW (NULL, FALSE, mutex_name);
-#endif
-        if (sync == NULL && GetLastError () == ERROR_ACCESS_DENIED)
-            sync = OpenMutexW (SYNCHRONIZE, FALSE, mutex_name);
-
-        win_assert (sync != NULL);
-    }
-
-    //  Windows has no 'socketpair' function. CreatePipe is no good as pipe
-    //  handles cannot be polled on. Here we create the socketpair by hand.
-    *w_ = INVALID_SOCKET;
-    *r_ = INVALID_SOCKET;
-
-    //  Create listening socket.
-    SOCKET listener;
-    listener = zmq::open_socket (AF_INET, SOCK_STREAM, 0);
-    wsa_assert (listener != INVALID_SOCKET);
-
-    //  Set SO_REUSEADDR and TCP_NODELAY on listening socket.
-    BOOL so_reuseaddr = 1;
-    int rc = setsockopt (listener, SOL_SOCKET, SO_REUSEADDR,
-                         reinterpret_cast<char *> (&so_reuseaddr),
-                         sizeof so_reuseaddr);
-    wsa_assert (rc != SOCKET_ERROR);
-
-    tune_socket (listener);
-
-    //  Init sockaddr to signaler port.
-    struct sockaddr_in addr;
-    memset (&addr, 0, sizeof addr);
-    addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-    addr.sin_port = htons (zmq::signaler_port);
-
-    //  Create the writer socket.
-    *w_ = zmq::open_socket (AF_INET, SOCK_STREAM, 0);
-    wsa_assert (*w_ != INVALID_SOCKET);
-
-    if (sync != NULL) {
-        //  Enter the critical section.
-        const DWORD dwrc = WaitForSingleObject (sync, INFINITE);
-        zmq_assert (dwrc == WAIT_OBJECT_0 || dwrc == WAIT_ABANDONED);
-    }
-
-    //  Bind listening socket to signaler port.
-    rc = bind (listener, reinterpret_cast<const struct sockaddr *> (&addr),
-               sizeof addr);
-
-    if (rc != SOCKET_ERROR && zmq::signaler_port == 0) {
-        //  Retrieve ephemeral port number
-        int addrlen = sizeof addr;
-        rc = getsockname (listener, reinterpret_cast<struct sockaddr *> (&addr),
-                          &addrlen);
-    }
-
-    //  Listen for incoming connections.
-    if (rc != SOCKET_ERROR) {
-        rc = listen (listener, 1);
-    }
-
-    //  Connect writer to the listener.
-    if (rc != SOCKET_ERROR) {
-        rc = connect (*w_, reinterpret_cast<struct sockaddr *> (&addr),
-                      sizeof addr);
-    }
-
-    //  Accept connection from writer.
-    if (rc != SOCKET_ERROR) {
-        //  Set TCP_NODELAY on writer socket.
-        tune_socket (*w_);
-
-        *r_ = accept (listener, NULL, NULL);
-    }
-
-    //  Send/receive large chunk to work around TCP slow start
-    //  This code is a workaround for #1608
-    if (*r_ != INVALID_SOCKET) {
-        const size_t dummy_size =
-          1024 * 1024; //  1M to overload default receive buffer
-        unsigned char *dummy =
-          static_cast<unsigned char *> (malloc (dummy_size));
-        wsa_assert (dummy);
-
-        int still_to_send = static_cast<int> (dummy_size);
-        int still_to_recv = static_cast<int> (dummy_size);
-        while (still_to_send || still_to_recv) {
-            int nbytes;
-            if (still_to_send > 0) {
-                nbytes = ::send (
-                  *w_,
-                  reinterpret_cast<char *> (dummy + dummy_size - still_to_send),
-                  still_to_send, 0);
-                wsa_assert (nbytes != SOCKET_ERROR);
-                still_to_send -= nbytes;
-            }
-            nbytes = ::recv (
-              *r_,
-              reinterpret_cast<char *> (dummy + dummy_size - still_to_recv),
-              still_to_recv, 0);
-            wsa_assert (nbytes != SOCKET_ERROR);
-            still_to_recv -= nbytes;
-        }
-        free (dummy);
-    }
-
-    //  Save errno if error occurred in bind/listen/connect/accept.
-    int saved_errno = 0;
-    if (*r_ == INVALID_SOCKET)
-        saved_errno = WSAGetLastError ();
-
-    //  We don't need the listening socket anymore. Close it.
-    rc = closesocket (listener);
-    wsa_assert (rc != SOCKET_ERROR);
-
-    if (sync != NULL) {
-        //  Exit the critical section.
-        BOOL brc;
-        if (zmq::signaler_port == event_signaler_port)
-            brc = SetEvent (sync);
-        else
-            brc = ReleaseMutex (sync);
-        win_assert (brc != 0);
-
-        //  Release the kernel object
-        brc = CloseHandle (sync);
-        win_assert (brc != 0);
-    }
-
-    if (*r_ != INVALID_SOCKET) {
-        zmq::make_socket_noninheritable (*r_);
-        return 0;
-    }
-    //  Cleanup writer if connection failed
-    if (*w_ != INVALID_SOCKET) {
-        rc = closesocket (*w_);
-        wsa_assert (rc != SOCKET_ERROR);
-        *w_ = INVALID_SOCKET;
-    }
-    //  Set errno from saved value
-    errno = zmq::wsa_error_to_errno (saved_errno);
-    return -1;
-}
-#endif
-
-int zmq::make_fdpair (fd_t *r_, fd_t *w_)
-{
-#if defined ZMQ_HAVE_EVENTFD
-    int flags = 0;
-#if defined ZMQ_HAVE_EVENTFD_CLOEXEC
-    //  Setting this option result in sane behaviour when exec() functions
-    //  are used. Old sockets are closed and don't block TCP ports, avoid
-    //  leaks, etc.
-    flags |= EFD_CLOEXEC;
-#endif
-    fd_t fd = eventfd (0, flags);
-    if (fd == -1) {
-        errno_assert (errno == ENFILE || errno == EMFILE);
-        *w_ = *r_ = -1;
-        return -1;
-    }
-    *w_ = *r_ = fd;
-    return 0;
-
-
-#elif defined ZMQ_HAVE_WINDOWS
-#ifdef ZMQ_HAVE_IPC
-    ipc_address_t address;
-    std::string dirname, filename;
-
-    //  Create a listening socket.
-    const SOCKET listener = open_socket (AF_UNIX, SOCK_STREAM, 0);
-    if (listener == retired_fd) {
-        //  This may happen if the library was built on a system supporting AF_UNIX, but the system running doesn't support it.
-        goto try_tcpip;
-    }
-
-    create_ipc_wildcard_address (dirname, filename);
-
-    //  Initialise the address structure.
-    int rc = address.resolve (filename.c_str ());
-    if (rc != 0) {
-        goto error_closelistener;
-    }
-
-    //  Bind the socket to the file path.
-    rc = bind (listener, const_cast<sockaddr *> (address.addr ()),
-               address.addrlen ());
-    if (rc != 0) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error_closelistener;
-    }
-
-    //  Listen for incoming connections.
-    rc = listen (listener, 1);
-    if (rc != 0) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error_closelistener;
-    }
-
-    sockaddr_un lcladdr;
-    socklen_t lcladdr_len = sizeof lcladdr;
-
-    rc = getsockname (listener, reinterpret_cast<struct sockaddr *> (&lcladdr),
-                      &lcladdr_len);
-    wsa_assert (rc != -1);
-
-    //  Create the client socket.
-    *w_ = open_socket (AF_UNIX, SOCK_STREAM, 0);
-    if (*w_ == -1) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error_closelistener;
-    }
-
-    //  Connect to the remote peer.
-    rc = ::connect (*w_, reinterpret_cast<const struct sockaddr *> (&lcladdr),
-                    lcladdr_len);
-    if (rc == -1) {
-        goto error_closeclient;
-    }
-
-    *r_ = accept (listener, NULL, NULL);
-    errno_assert (*r_ != -1);
-
-    //  Close the listener socket, we don't need it anymore.
-    rc = closesocket (listener);
-    wsa_assert (rc == 0);
-
-    return 0;
-
-error_closeclient:
-    int saved_errno = errno;
-    rc = closesocket (*w_);
-    wsa_assert (rc == 0);
-    errno = saved_errno;
-
-error_closelistener:
-    saved_errno = errno;
-    rc = closesocket (listener);
-    wsa_assert (rc == 0);
-    errno = saved_errno;
-
-    return -1;
-
-try_tcpip:
-    // try to fallback to TCP/IP
-    // TODO: maybe remember this decision permanently?
-#endif
-
-    return make_fdpair_tcpip (r_, w_);
-#elif defined ZMQ_HAVE_OPENVMS
-
-    //  Whilst OpenVMS supports socketpair - it maps to AF_INET only.  Further,
-    //  it does not set the socket options TCP_NODELAY and TCP_NODELACK which
-    //  can lead to performance problems.
-    //
-    //  The bug will be fixed in V5.6 ECO4 and beyond.  In the meantime, we'll
-    //  create the socket pair manually.
-    struct sockaddr_in lcladdr;
-    memset (&lcladdr, 0, sizeof lcladdr);
-    lcladdr.sin_family = AF_INET;
-    lcladdr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-    lcladdr.sin_port = 0;
-
-    int listener = open_socket (AF_INET, SOCK_STREAM, 0);
-    errno_assert (listener != -1);
-
-    int on = 1;
-    int rc = setsockopt (listener, IPPROTO_TCP, TCP_NODELAY, &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = setsockopt (listener, IPPROTO_TCP, TCP_NODELACK, &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = bind (listener, (struct sockaddr *) &lcladdr, sizeof lcladdr);
-    errno_assert (rc != -1);
-
-    socklen_t lcladdr_len = sizeof lcladdr;
-
-    rc = getsockname (listener, (struct sockaddr *) &lcladdr, &lcladdr_len);
-    errno_assert (rc != -1);
-
-    rc = listen (listener, 1);
-    errno_assert (rc != -1);
-
-    *w_ = open_socket (AF_INET, SOCK_STREAM, 0);
-    errno_assert (*w_ != -1);
-
-    rc = setsockopt (*w_, IPPROTO_TCP, TCP_NODELAY, &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = setsockopt (*w_, IPPROTO_TCP, TCP_NODELACK, &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = connect (*w_, (struct sockaddr *) &lcladdr, sizeof lcladdr);
-    errno_assert (rc != -1);
-
-    *r_ = accept (listener, NULL, NULL);
-    errno_assert (*r_ != -1);
-
-    close (listener);
-
-    return 0;
-#elif defined ZMQ_HAVE_VXWORKS
-    struct sockaddr_in lcladdr;
-    memset (&lcladdr, 0, sizeof lcladdr);
-    lcladdr.sin_family = AF_INET;
-    lcladdr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-    lcladdr.sin_port = 0;
-
-    int listener = open_socket (AF_INET, SOCK_STREAM, 0);
-    errno_assert (listener != -1);
-
-    int on = 1;
-    int rc =
-      setsockopt (listener, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = bind (listener, (struct sockaddr *) &lcladdr, sizeof lcladdr);
-    errno_assert (rc != -1);
-
-    socklen_t lcladdr_len = sizeof lcladdr;
-
-    rc = getsockname (listener, (struct sockaddr *) &lcladdr,
-                      (int *) &lcladdr_len);
-    errno_assert (rc != -1);
-
-    rc = listen (listener, 1);
-    errno_assert (rc != -1);
-
-    *w_ = open_socket (AF_INET, SOCK_STREAM, 0);
-    errno_assert (*w_ != -1);
-
-    rc = setsockopt (*w_, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = connect (*w_, (struct sockaddr *) &lcladdr, sizeof lcladdr);
-    errno_assert (rc != -1);
-
-    *r_ = accept (listener, NULL, NULL);
-    errno_assert (*r_ != -1);
-
-    close (listener);
-
-    return 0;
-#else
-    // All other implementations support socketpair()
-    int sv[2];
-    int type = SOCK_STREAM;
-    //  Setting this option result in sane behaviour when exec() functions
-    //  are used. Old sockets are closed and don't block TCP ports, avoid
-    //  leaks, etc.
-#if defined ZMQ_HAVE_SOCK_CLOEXEC
-    type |= SOCK_CLOEXEC;
-#endif
-    int rc = socketpair (AF_UNIX, type, 0, sv);
-    if (rc == -1) {
-        errno_assert (errno == ENFILE || errno == EMFILE);
-        *w_ = *r_ = -1;
-        return -1;
-    } else {
-        make_socket_noninheritable (sv[0]);
-        make_socket_noninheritable (sv[1]);
-
-        *w_ = sv[0];
-        *r_ = sv[1];
-        return 0;
-    }
-#endif
-}
-
-void zmq::make_socket_noninheritable (fd_t sock_)
-{
-#if defined ZMQ_HAVE_WINDOWS && !defined _WIN32_WCE                            \
-  && !defined ZMQ_HAVE_WINDOWS_UWP
-    //  On Windows, preventing sockets to be inherited by child processes.
-    const BOOL brc = SetHandleInformation (reinterpret_cast<HANDLE> (sock_),
-                                           HANDLE_FLAG_INHERIT, 0);
-    win_assert (brc);
-#elif (!defined ZMQ_HAVE_SOCK_CLOEXEC || !defined HAVE_ACCEPT4)                \
-  && defined FD_CLOEXEC
-    //  If there 's no SOCK_CLOEXEC, let's try the second best option.
-    //  Race condition can cause socket not to be closed (if fork happens
-    //  between accept and this point).
-    const int rc = fcntl (sock_, F_SETFD, FD_CLOEXEC);
-    errno_assert (rc != -1);
-#else
-    LIBZMQ_UNUSED (sock_);
-#endif
-}
-
-void zmq::assert_success_or_recoverable (zmq::fd_t s_, int rc_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc_ != SOCKET_ERROR) {
-        return;
-    }
-#else
-    if (rc_ != -1) {
-        return;
-    }
-#endif
-
-    //  Check whether an error occurred
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int len = sizeof err;
-#else
-    socklen_t len = sizeof err;
-#endif
-
-    const int rc = getsockopt (s_, SOL_SOCKET, SO_ERROR,
-                               reinterpret_cast<char *> (&err), &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        wsa_assert (err == WSAECONNREFUSED || err == WSAECONNRESET
-                    || err == WSAECONNABORTED || err == WSAEINTR
-                    || err == WSAETIMEDOUT || err == WSAEHOSTUNREACH
-                    || err == WSAENETUNREACH || err == WSAENETDOWN
-                    || err == WSAENETRESET || err == WSAEACCES
-                    || err == WSAEINVAL || err == WSAEADDRINUSE);
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-        errno_assert (errno == ECONNREFUSED || errno == ECONNRESET
-                      || errno == ECONNABORTED || errno == EINTR
-                      || errno == ETIMEDOUT || errno == EHOSTUNREACH
-                      || errno == ENETUNREACH || errno == ENETDOWN
-                      || errno == ENETRESET || errno == EINVAL);
-    }
-#endif
-}
-
-#ifdef ZMQ_HAVE_IPC
-int zmq::create_ipc_wildcard_address (std::string &path_, std::string &file_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    char buffer[MAX_PATH];
-
-    {
-        const errno_t rc = tmpnam_s (buffer);
-        errno_assert (rc == 0);
-    }
-
-    // TODO or use CreateDirectoryA and specify permissions?
-    const int rc = _mkdir (buffer);
-    if (rc != 0) {
-        return -1;
-    }
-
-    path_.assign (buffer);
-    file_ = path_ + "/socket";
-#else
-    std::string tmp_path;
-
-    // If TMPDIR, TEMPDIR, or TMP are available and are directories, create
-    // the socket directory there.
-    const char **tmp_env = tmp_env_vars;
-    while (tmp_path.empty () && *tmp_env != 0) {
-        const char *const tmpdir = getenv (*tmp_env);
-        struct stat statbuf;
-
-        // Confirm it is actually a directory before trying to use
-        if (tmpdir != 0 && ::stat (tmpdir, &statbuf) == 0
-            && S_ISDIR (statbuf.st_mode)) {
-            tmp_path.assign (tmpdir);
-            if (*(tmp_path.rbegin ()) != '/') {
-                tmp_path.push_back ('/');
-            }
-        }
-
-        // Try the next environment variable
-        ++tmp_env;
-    }
-
-    // Append a directory name
-    tmp_path.append ("tmpXXXXXX");
-
-    // We need room for tmp_path + trailing NUL
-    std::vector<char> buffer (tmp_path.length () + 1);
-    memcpy (&buffer[0], tmp_path.c_str (), tmp_path.length () + 1);
-
-#if defined HAVE_MKDTEMP
-    // Create the directory.  POSIX requires that mkdtemp() creates the
-    // directory with 0700 permissions, meaning the only possible race
-    // with socket creation could be the same user.  However, since
-    // each socket is created in a directory created by mkdtemp(), and
-    // mkdtemp() guarantees a unique directory name, there will be no
-    // collision.
-    if (mkdtemp (&buffer[0]) == 0) {
-        return -1;
-    }
-
-    path_.assign (&buffer[0]);
-    file_ = path_ + "/socket";
-#else
-    LIBZMQ_UNUSED (path_);
-    int fd = mkstemp (&buffer[0]);
-    if (fd == -1)
-        return -1;
-    ::close (fd);
-
-    file_.assign (&buffer[0]);
-#endif
-#endif
-
-    return 0;
-}
-#endif
diff --git a/src/ip.hpp b/src/ip.hpp
deleted file mode 100644
index 50ae7d64b..000000000
--- a/src/ip.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IP_HPP_INCLUDED__
-#define __ZMQ_IP_HPP_INCLUDED__
-
-#include <string>
-#include "fd.hpp"
-
-namespace zmq
-{
-//  Same as socket(2), but allows for transparent tweaking the options.
-fd_t open_socket (int domain_, int type_, int protocol_);
-
-//  Sets the socket into non-blocking mode.
-void unblock_socket (fd_t s_);
-
-//  Enable IPv4-mapping of addresses in case it is disabled by default.
-void enable_ipv4_mapping (fd_t s_);
-
-//  Returns string representation of peer's address.
-//  Socket sockfd_ must be connected. Returns true iff successful.
-int get_peer_ip_address (fd_t sockfd_, std::string &ip_addr_);
-
-// Sets the IP Type-Of-Service for the underlying socket
-void set_ip_type_of_service (fd_t s_, int iptos_);
-
-// Sets the SO_NOSIGPIPE option for the underlying socket.
-// Return 0 on success, -1 if the connection has been closed by the peer
-int set_nosigpipe (fd_t s_);
-
-// Binds the underlying socket to the given device, eg. VRF or interface
-int bind_to_device (fd_t s_, const std::string &bound_device_);
-
-// Initialize network subsystem. May be called multiple times. Each call must be matched by a call to shutdown_network.
-bool initialize_network ();
-
-// Shutdown network subsystem. Must be called once for each call to initialize_network before terminating.
-void shutdown_network ();
-
-// Creates a pair of sockets (using signaler_port on OS using TCP sockets).
-// Returns -1 if we could not make the socket pair successfully
-int make_fdpair (fd_t *r_, fd_t *w_);
-
-// Makes a socket non-inheritable to child processes.
-// Asserts on any failure.
-void make_socket_noninheritable (fd_t sock_);
-
-//  Asserts that:
-//  - an internal 0MQ error did not occur,
-//  - and, if a socket error occured, it can be recovered from.
-void assert_success_or_recoverable (fd_t s_, int rc_);
-
-#ifdef ZMQ_HAVE_IPC
-// Create an IPC wildcard path address
-int create_ipc_wildcard_address (std::string &path_, std::string &file_);
-#endif
-}
-
-#endif
diff --git a/src/ip_resolver.cpp b/src/ip_resolver.cpp
deleted file mode 100644
index 4728ba777..000000000
--- a/src/ip_resolver.cpp
+++ /dev/null
@@ -1,742 +0,0 @@
-#include "precompiled.hpp"
-#include <string>
-#include <cstring>
-
-#include "macros.hpp"
-#include "stdint.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-#include "ip_resolver.hpp"
-
-int zmq::ip_addr_t::family () const
-{
-    return generic.sa_family;
-}
-
-bool zmq::ip_addr_t::is_multicast () const
-{
-    if (family () == AF_INET) {
-        //  IPv4 Multicast: address MSBs are 1110
-        //  Range: 224.0.0.0 - 239.255.255.255
-        return IN_MULTICAST (ntohl (ipv4.sin_addr.s_addr));
-    }
-    //  IPv6 Multicast: ff00::/8
-    return IN6_IS_ADDR_MULTICAST (&ipv6.sin6_addr) != 0;
-}
-
-uint16_t zmq::ip_addr_t::port () const
-{
-    if (family () == AF_INET6) {
-        return ntohs (ipv6.sin6_port);
-    }
-    return ntohs (ipv4.sin_port);
-}
-
-const struct sockaddr *zmq::ip_addr_t::as_sockaddr () const
-{
-    return &generic;
-}
-
-zmq::zmq_socklen_t zmq::ip_addr_t::sockaddr_len () const
-{
-    return static_cast<zmq_socklen_t> (family () == AF_INET6 ? sizeof (ipv6)
-                                                             : sizeof (ipv4));
-}
-
-void zmq::ip_addr_t::set_port (uint16_t port_)
-{
-    if (family () == AF_INET6) {
-        ipv6.sin6_port = htons (port_);
-    } else {
-        ipv4.sin_port = htons (port_);
-    }
-}
-
-//  Construct an "ANY" address for the given family
-zmq::ip_addr_t zmq::ip_addr_t::any (int family_)
-{
-    ip_addr_t addr;
-
-    if (family_ == AF_INET) {
-        sockaddr_in *ip4_addr = &addr.ipv4;
-        memset (ip4_addr, 0, sizeof (*ip4_addr));
-        ip4_addr->sin_family = AF_INET;
-        ip4_addr->sin_addr.s_addr = htonl (INADDR_ANY);
-    } else if (family_ == AF_INET6) {
-        sockaddr_in6 *ip6_addr = &addr.ipv6;
-
-        memset (ip6_addr, 0, sizeof (*ip6_addr));
-        ip6_addr->sin6_family = AF_INET6;
-#ifdef ZMQ_HAVE_VXWORKS
-        struct in6_addr newaddr = IN6ADDR_ANY_INIT;
-        memcpy (&ip6_addr->sin6_addr, &newaddr, sizeof (in6_addr));
-#else
-        memcpy (&ip6_addr->sin6_addr, &in6addr_any, sizeof (in6addr_any));
-#endif
-    } else {
-        assert (0 == "unsupported address family");
-    }
-
-    return addr;
-}
-
-zmq::ip_resolver_options_t::ip_resolver_options_t () :
-    _bindable_wanted (false),
-    _nic_name_allowed (false),
-    _ipv6_wanted (false),
-    _port_expected (false),
-    _dns_allowed (false),
-    _path_allowed (false)
-{
-}
-
-zmq::ip_resolver_options_t &
-zmq::ip_resolver_options_t::bindable (bool bindable_)
-{
-    _bindable_wanted = bindable_;
-
-    return *this;
-}
-
-zmq::ip_resolver_options_t &
-zmq::ip_resolver_options_t::allow_nic_name (bool allow_)
-{
-    _nic_name_allowed = allow_;
-
-    return *this;
-}
-
-zmq::ip_resolver_options_t &zmq::ip_resolver_options_t::ipv6 (bool ipv6_)
-{
-    _ipv6_wanted = ipv6_;
-
-    return *this;
-}
-
-//  If true we expect that the host will be followed by a colon and a port
-//  number or service name
-zmq::ip_resolver_options_t &
-zmq::ip_resolver_options_t::expect_port (bool expect_)
-{
-    _port_expected = expect_;
-
-    return *this;
-}
-
-zmq::ip_resolver_options_t &zmq::ip_resolver_options_t::allow_dns (bool allow_)
-{
-    _dns_allowed = allow_;
-
-    return *this;
-}
-
-zmq::ip_resolver_options_t &zmq::ip_resolver_options_t::allow_path (bool allow_)
-{
-    _path_allowed = allow_;
-
-    return *this;
-}
-
-bool zmq::ip_resolver_options_t::bindable ()
-{
-    return _bindable_wanted;
-}
-
-bool zmq::ip_resolver_options_t::allow_nic_name ()
-{
-    return _nic_name_allowed;
-}
-
-bool zmq::ip_resolver_options_t::ipv6 ()
-{
-    return _ipv6_wanted;
-}
-
-bool zmq::ip_resolver_options_t::expect_port ()
-{
-    return _port_expected;
-}
-
-bool zmq::ip_resolver_options_t::allow_dns ()
-{
-    return _dns_allowed;
-}
-
-bool zmq::ip_resolver_options_t::allow_path ()
-{
-    return _path_allowed;
-}
-
-zmq::ip_resolver_t::ip_resolver_t (ip_resolver_options_t opts_) :
-    _options (opts_)
-{
-}
-
-int zmq::ip_resolver_t::resolve (ip_addr_t *ip_addr_, const char *name_)
-{
-    std::string addr;
-    uint16_t port;
-
-    if (_options.expect_port ()) {
-        //  We expect 'addr:port'. It's important to use str*r*chr to only get
-        //  the latest colon since IPv6 addresses use colons as delemiters.
-        const char *delim = strrchr (name_, ':');
-
-        if (delim == NULL) {
-            errno = EINVAL;
-            return -1;
-        }
-
-        addr = std::string (name_, delim - name_);
-        const std::string port_str = std::string (delim + 1);
-
-        if (port_str == "*") {
-            if (_options.bindable ()) {
-                //  Resolve wildcard to 0 to allow autoselection of port
-                port = 0;
-            } else {
-                errno = EINVAL;
-                return -1;
-            }
-        } else if (port_str == "0") {
-            //  Using "0" for a bind address is equivalent to using "*". For a
-            //  connectable address it could be used to connect to port 0.
-            port = 0;
-        } else {
-            //  Parse the port number (0 is not a valid port).
-            port = static_cast<uint16_t> (atoi (port_str.c_str ()));
-            if (port == 0) {
-                errno = EINVAL;
-                return -1;
-            }
-        }
-    } else {
-        addr = std::string (name_);
-        port = 0;
-    }
-
-    // Check if path is allowed in ip address, if allowed it must be truncated
-    if (_options.allow_path ()) {
-        const size_t pos = addr.find ('/');
-        if (pos != std::string::npos)
-            addr = addr.substr (0, pos);
-    }
-
-    //  Trim any square brackets surrounding the address. Used for
-    //  IPv6 addresses to remove the confusion with the port
-    //  delimiter.
-    //  TODO Should we validate that the brackets are present if
-    //  'addr' contains ':' ?
-    const size_t brackets_length = 2;
-    if (addr.size () >= brackets_length && addr[0] == '['
-        && addr[addr.size () - 1] == ']') {
-        addr = addr.substr (1, addr.size () - brackets_length);
-    }
-
-    //  Look for an interface name / zone_id in the address
-    //  Reference: https://tools.ietf.org/html/rfc4007
-    const std::size_t pos = addr.rfind ('%');
-    uint32_t zone_id = 0;
-
-    if (pos != std::string::npos) {
-        std::string if_str = addr.substr (pos + 1);
-        if (if_str.empty ()) {
-            errno = EINVAL;
-            return -1;
-        }
-        addr = addr.substr (0, pos);
-
-        if (isalpha (if_str.at (0))) {
-            zone_id = do_if_nametoindex (if_str.c_str ());
-        } else {
-            zone_id = static_cast<uint32_t> (atoi (if_str.c_str ()));
-        }
-
-        if (zone_id == 0) {
-            errno = EINVAL;
-            return -1;
-        }
-    }
-
-    bool resolved = false;
-    const char *addr_str = addr.c_str ();
-
-    if (_options.bindable () && addr == "*") {
-        //  Return an ANY address
-        *ip_addr_ = ip_addr_t::any (_options.ipv6 () ? AF_INET6 : AF_INET);
-        resolved = true;
-    }
-
-    if (!resolved && _options.allow_nic_name ()) {
-        //  Try to resolve the string as a NIC name.
-        const int rc = resolve_nic_name (ip_addr_, addr_str);
-
-        if (rc == 0) {
-            resolved = true;
-        } else if (errno != ENODEV) {
-            return rc;
-        }
-    }
-
-    if (!resolved) {
-        const int rc = resolve_getaddrinfo (ip_addr_, addr_str);
-
-        if (rc != 0) {
-            return rc;
-        }
-        resolved = true;
-    }
-
-    //  Store the port into the structure. We could get 'getaddrinfo' to do it
-    //  for us but since we don't resolve service names it's a bit overkill and
-    //  we'd still have to do it manually when the address is resolved by
-    //  'resolve_nic_name'
-    ip_addr_->set_port (port);
-
-    if (ip_addr_->family () == AF_INET6) {
-        ip_addr_->ipv6.sin6_scope_id = zone_id;
-    }
-
-    assert (resolved == true);
-    return 0;
-}
-
-int zmq::ip_resolver_t::resolve_getaddrinfo (ip_addr_t *ip_addr_,
-                                             const char *addr_)
-{
-#if defined ZMQ_HAVE_OPENVMS && defined __ia64
-    __addrinfo64 *res = NULL;
-    __addrinfo64 req;
-#else
-    addrinfo *res = NULL;
-    addrinfo req;
-#endif
-
-    memset (&req, 0, sizeof (req));
-
-    //  Choose IPv4 or IPv6 protocol family. Note that IPv6 allows for
-    //  IPv4-in-IPv6 addresses.
-    req.ai_family = _options.ipv6 () ? AF_INET6 : AF_INET;
-
-    //  Arbitrary, not used in the output, but avoids duplicate results.
-    req.ai_socktype = SOCK_STREAM;
-
-    req.ai_flags = 0;
-
-    if (_options.bindable ()) {
-        req.ai_flags |= AI_PASSIVE;
-    }
-
-    if (!_options.allow_dns ()) {
-        req.ai_flags |= AI_NUMERICHOST;
-    }
-
-#if defined AI_V4MAPPED
-    //  In this API we only require IPv4-mapped addresses when
-    //  no native IPv6 interfaces are available (~AI_ALL).
-    //  This saves an additional DNS roundtrip for IPv4 addresses.
-    if (req.ai_family == AF_INET6) {
-        req.ai_flags |= AI_V4MAPPED;
-    }
-#endif
-
-    //  Resolve the literal address. Some of the error info is lost in case
-    //  of error, however, there's no way to report EAI errors via errno.
-    int rc = do_getaddrinfo (addr_, NULL, &req, &res);
-
-#if defined AI_V4MAPPED
-    // Some OS do have AI_V4MAPPED defined but it is not supported in getaddrinfo()
-    // returning EAI_BADFLAGS. Detect this and retry
-    if (rc == EAI_BADFLAGS && (req.ai_flags & AI_V4MAPPED)) {
-        req.ai_flags &= ~AI_V4MAPPED;
-        rc = do_getaddrinfo (addr_, NULL, &req, &res);
-    }
-#endif
-
-#if defined ZMQ_HAVE_WINDOWS
-    //  Resolve specific case on Windows platform when using IPv4 address
-    //  with ZMQ_IPv6 socket option.
-    if ((req.ai_family == AF_INET6) && (rc == WSAHOST_NOT_FOUND)) {
-        req.ai_family = AF_INET;
-        rc = do_getaddrinfo (addr_, NULL, &req, &res);
-    }
-#endif
-
-    if (rc) {
-        switch (rc) {
-            case EAI_MEMORY:
-                errno = ENOMEM;
-                break;
-            default:
-                if (_options.bindable ()) {
-                    errno = ENODEV;
-                } else {
-                    errno = EINVAL;
-                }
-                break;
-        }
-        return -1;
-    }
-
-    //  Use the first result.
-    zmq_assert (res != NULL);
-    zmq_assert (static_cast<size_t> (res->ai_addrlen) <= sizeof (*ip_addr_));
-    memcpy (ip_addr_, res->ai_addr, res->ai_addrlen);
-
-    //  Cleanup getaddrinfo after copying the possibly referenced result.
-    do_freeaddrinfo (res);
-
-    return 0;
-}
-
-#ifdef ZMQ_HAVE_SOLARIS
-#include <sys/sockio.h>
-
-//  On Solaris platform, network interface name can be queried by ioctl.
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-    //  Create a socket.
-    const int fd = open_socket (AF_INET, SOCK_DGRAM, 0);
-    errno_assert (fd != -1);
-
-    //  Retrieve number of interfaces.
-    lifnum ifn;
-    ifn.lifn_family = AF_INET;
-    ifn.lifn_flags = 0;
-    int rc = ioctl (fd, SIOCGLIFNUM, (char *) &ifn);
-    errno_assert (rc != -1);
-
-    //  Allocate memory to get interface names.
-    const size_t ifr_size = sizeof (struct lifreq) * ifn.lifn_count;
-    char *ifr = (char *) malloc (ifr_size);
-    alloc_assert (ifr);
-
-    //  Retrieve interface names.
-    lifconf ifc;
-    ifc.lifc_family = AF_INET;
-    ifc.lifc_flags = 0;
-    ifc.lifc_len = ifr_size;
-    ifc.lifc_buf = ifr;
-    rc = ioctl (fd, SIOCGLIFCONF, (char *) &ifc);
-    errno_assert (rc != -1);
-
-    //  Find the interface with the specified name and AF_INET family.
-    bool found = false;
-    lifreq *ifrp = ifc.lifc_req;
-    for (int n = 0; n < (int) (ifc.lifc_len / sizeof (lifreq)); n++, ifrp++) {
-        if (!strcmp (nic_, ifrp->lifr_name)) {
-            rc = ioctl (fd, SIOCGLIFADDR, (char *) ifrp);
-            errno_assert (rc != -1);
-            if (ifrp->lifr_addr.ss_family == AF_INET) {
-                ip_addr_->ipv4 = *(sockaddr_in *) &ifrp->lifr_addr;
-                found = true;
-                break;
-            }
-        }
-    }
-
-    //  Clean-up.
-    free (ifr);
-    close (fd);
-
-    if (!found) {
-        errno = ENODEV;
-        return -1;
-    }
-    return 0;
-}
-
-#elif defined ZMQ_HAVE_AIX || defined ZMQ_HAVE_HPUX                            \
-  || defined ZMQ_HAVE_ANDROID || defined ZMQ_HAVE_VXWORKS
-#include <sys/ioctl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <ioLib.h>
-#endif
-
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-#if defined ZMQ_HAVE_AIX || defined ZMQ_HAVE_HPUX
-    // IPv6 support not implemented for AIX or HP/UX.
-    if (_options.ipv6 ()) {
-        errno = ENODEV;
-        return -1;
-    }
-#endif
-
-    //  Create a socket.
-    const int sd =
-      open_socket (_options.ipv6 () ? AF_INET6 : AF_INET, SOCK_DGRAM, 0);
-    errno_assert (sd != -1);
-
-    struct ifreq ifr;
-
-    //  Copy interface name for ioctl get.
-    strncpy (ifr.ifr_name, nic_, sizeof (ifr.ifr_name));
-
-    //  Fetch interface address.
-    const int rc = ioctl (sd, SIOCGIFADDR, (caddr_t) &ifr, sizeof (ifr));
-
-    //  Clean up.
-    close (sd);
-
-    if (rc == -1) {
-        errno = ENODEV;
-        return -1;
-    }
-
-    const int family = ifr.ifr_addr.sa_family;
-    if (family == (_options.ipv6 () ? AF_INET6 : AF_INET)
-        && !strcmp (nic_, ifr.ifr_name)) {
-        memcpy (ip_addr_, &ifr.ifr_addr,
-                (family == AF_INET) ? sizeof (struct sockaddr_in)
-                                    : sizeof (struct sockaddr_in6));
-    } else {
-        errno = ENODEV;
-        return -1;
-    }
-
-    return 0;
-}
-
-#elif ((defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_FREEBSD                     \
-        || defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_OPENBSD                    \
-        || defined ZMQ_HAVE_QNXNTO || defined ZMQ_HAVE_NETBSD                  \
-        || defined ZMQ_HAVE_DRAGONFLY || defined ZMQ_HAVE_GNU)                 \
-       && defined ZMQ_HAVE_IFADDRS)
-
-#include <ifaddrs.h>
-
-//  On these platforms, network interface name can be queried
-//  using getifaddrs function.
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-    //  Get the addresses.
-    ifaddrs *ifa = NULL;
-    int rc = 0;
-    const int max_attempts = 10;
-    const int backoff_msec = 1;
-    for (int i = 0; i < max_attempts; i++) {
-        rc = getifaddrs (&ifa);
-        if (rc == 0 || (rc < 0 && errno != ECONNREFUSED))
-            break;
-        usleep ((backoff_msec << i) * 1000);
-    }
-
-    if (rc != 0 && ((errno == EINVAL) || (errno == EOPNOTSUPP))) {
-        // Windows Subsystem for Linux compatibility
-        errno = ENODEV;
-        return -1;
-    }
-    errno_assert (rc == 0);
-    zmq_assert (ifa != NULL);
-
-    //  Find the corresponding network interface.
-    bool found = false;
-    for (const ifaddrs *ifp = ifa; ifp != NULL; ifp = ifp->ifa_next) {
-        if (ifp->ifa_addr == NULL)
-            continue;
-
-        const int family = ifp->ifa_addr->sa_family;
-        if (family == (_options.ipv6 () ? AF_INET6 : AF_INET)
-            && !strcmp (nic_, ifp->ifa_name)) {
-            memcpy (ip_addr_, ifp->ifa_addr,
-                    (family == AF_INET) ? sizeof (struct sockaddr_in)
-                                        : sizeof (struct sockaddr_in6));
-            found = true;
-            break;
-        }
-    }
-
-    //  Clean-up;
-    freeifaddrs (ifa);
-
-    if (!found) {
-        errno = ENODEV;
-        return -1;
-    }
-    return 0;
-}
-
-#elif (defined ZMQ_HAVE_WINDOWS)
-
-#include <netioapi.h>
-
-int zmq::ip_resolver_t::get_interface_name (unsigned long index_,
-                                            char **dest_) const
-{
-#ifdef ZMQ_HAVE_WINDOWS_UWP
-    char *buffer = (char *) malloc (1024);
-#else
-    char *buffer = static_cast<char *> (malloc (IF_MAX_STRING_SIZE));
-#endif
-    alloc_assert (buffer);
-
-    char *if_name_result = NULL;
-
-#if _WIN32_WINNT > _WIN32_WINNT_WINXP && !defined ZMQ_HAVE_WINDOWS_UWP
-    if_name_result = if_indextoname (index_, buffer);
-#endif
-
-    if (if_name_result == NULL) {
-        free (buffer);
-        return -1;
-    }
-
-    *dest_ = buffer;
-    return 0;
-}
-
-int zmq::ip_resolver_t::wchar_to_utf8 (const WCHAR *src_, char **dest_) const
-{
-    int rc;
-    const int buffer_len =
-      WideCharToMultiByte (CP_UTF8, 0, src_, -1, NULL, 0, NULL, 0);
-
-    char *buffer = static_cast<char *> (malloc (buffer_len));
-    alloc_assert (buffer);
-
-    rc =
-      WideCharToMultiByte (CP_UTF8, 0, src_, -1, buffer, buffer_len, NULL, 0);
-
-    if (rc == 0) {
-        free (buffer);
-        return -1;
-    }
-
-    *dest_ = buffer;
-    return 0;
-}
-
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-    int rc;
-    bool found = false;
-    const int max_attempts = 10;
-
-    int iterations = 0;
-    IP_ADAPTER_ADDRESSES *addresses;
-    unsigned long out_buf_len = sizeof (IP_ADAPTER_ADDRESSES);
-
-    do {
-        addresses = static_cast<IP_ADAPTER_ADDRESSES *> (malloc (out_buf_len));
-        alloc_assert (addresses);
-
-        rc =
-          GetAdaptersAddresses (AF_UNSPEC,
-                                GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST
-                                  | GAA_FLAG_SKIP_DNS_SERVER,
-                                NULL, addresses, &out_buf_len);
-        if (rc == ERROR_BUFFER_OVERFLOW) {
-            free (addresses);
-            addresses = NULL;
-        } else {
-            break;
-        }
-        iterations++;
-    } while ((rc == ERROR_BUFFER_OVERFLOW) && (iterations < max_attempts));
-
-    if (rc == 0) {
-        for (const IP_ADAPTER_ADDRESSES *current_addresses = addresses;
-             current_addresses; current_addresses = current_addresses->Next) {
-            char *if_name = NULL;
-            char *if_friendly_name = NULL;
-
-            const int str_rc1 =
-              get_interface_name (current_addresses->IfIndex, &if_name);
-            const int str_rc2 = wchar_to_utf8 (current_addresses->FriendlyName,
-                                               &if_friendly_name);
-
-            //  Find a network adapter by its "name" or "friendly name"
-            if (((str_rc1 == 0) && (!strcmp (nic_, if_name)))
-                || ((str_rc2 == 0) && (!strcmp (nic_, if_friendly_name)))) {
-                //  Iterate over all unicast addresses bound to the current network interface
-                for (const IP_ADAPTER_UNICAST_ADDRESS *current_unicast_address =
-                       current_addresses->FirstUnicastAddress;
-                     current_unicast_address;
-                     current_unicast_address = current_unicast_address->Next) {
-                    const ADDRESS_FAMILY family =
-                      current_unicast_address->Address.lpSockaddr->sa_family;
-
-                    if (family == (_options.ipv6 () ? AF_INET6 : AF_INET)) {
-                        memcpy (
-                          ip_addr_, current_unicast_address->Address.lpSockaddr,
-                          (family == AF_INET) ? sizeof (struct sockaddr_in)
-                                              : sizeof (struct sockaddr_in6));
-                        found = true;
-                        break;
-                    }
-                }
-
-                if (found)
-                    break;
-            }
-
-            if (str_rc1 == 0)
-                free (if_name);
-            if (str_rc2 == 0)
-                free (if_friendly_name);
-        }
-
-        free (addresses);
-    }
-
-    if (!found) {
-        errno = ENODEV;
-        return -1;
-    }
-    return 0;
-}
-
-#else
-
-//  On other platforms we assume there are no sane interface names.
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-    LIBZMQ_UNUSED (ip_addr_);
-    LIBZMQ_UNUSED (nic_);
-
-    errno = ENODEV;
-    return -1;
-}
-
-#endif
-
-int zmq::ip_resolver_t::do_getaddrinfo (const char *node_,
-                                        const char *service_,
-                                        const struct addrinfo *hints_,
-                                        struct addrinfo **res_)
-{
-    return getaddrinfo (node_, service_, hints_, res_);
-}
-
-void zmq::ip_resolver_t::do_freeaddrinfo (struct addrinfo *res_)
-{
-    freeaddrinfo (res_);
-}
-
-unsigned int zmq::ip_resolver_t::do_if_nametoindex (const char *ifname_)
-{
-#if _WIN32_WINNT > _WIN32_WINNT_WINXP && !defined ZMQ_HAVE_WINDOWS_UWP         \
-  && !defined ZMQ_HAVE_VXWORKS
-    return if_nametoindex (ifname_);
-#else
-    // The function 'if_nametoindex' is not supported on Windows XP.
-    // If we are targeting XP using a vxxx_xp toolset then fail.
-    // This is brutal as this code could be run on later windows clients
-    // meaning the IPv6 zone_id cannot have an interface name.
-    // This could be fixed with a runtime check.
-    return 0;
-#endif
-}
diff --git a/src/ip_resolver.hpp b/src/ip_resolver.hpp
deleted file mode 100644
index e60f6356e..000000000
--- a/src/ip_resolver.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IP_RESOLVER_HPP_INCLUDED__
-#define __ZMQ_IP_RESOLVER_HPP_INCLUDED__
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-
-#include "address.hpp"
-
-namespace zmq
-{
-union ip_addr_t
-{
-    sockaddr generic;
-    sockaddr_in ipv4;
-    sockaddr_in6 ipv6;
-
-    int family () const;
-    bool is_multicast () const;
-    uint16_t port () const;
-
-    const struct sockaddr *as_sockaddr () const;
-    zmq_socklen_t sockaddr_len () const;
-
-    void set_port (uint16_t);
-
-    static ip_addr_t any (int family_);
-};
-
-class ip_resolver_options_t
-{
-  public:
-    ip_resolver_options_t ();
-
-    ip_resolver_options_t &bindable (bool bindable_);
-    ip_resolver_options_t &allow_nic_name (bool allow_);
-    ip_resolver_options_t &ipv6 (bool ipv6_);
-    ip_resolver_options_t &expect_port (bool expect_);
-    ip_resolver_options_t &allow_dns (bool allow_);
-    ip_resolver_options_t &allow_path (bool allow_);
-
-    bool bindable ();
-    bool allow_nic_name ();
-    bool ipv6 ();
-    bool expect_port ();
-    bool allow_dns ();
-    bool allow_path ();
-
-  private:
-    bool _bindable_wanted;
-    bool _nic_name_allowed;
-    bool _ipv6_wanted;
-    bool _port_expected;
-    bool _dns_allowed;
-    bool _path_allowed;
-};
-
-class ip_resolver_t
-{
-  public:
-    ip_resolver_t (ip_resolver_options_t opts_);
-    virtual ~ip_resolver_t (){};
-
-    int resolve (ip_addr_t *ip_addr_, const char *name_);
-
-  protected:
-    //  Virtual functions that are overridden in tests
-    virtual int do_getaddrinfo (const char *node_,
-                                const char *service_,
-                                const struct addrinfo *hints_,
-                                struct addrinfo **res_);
-
-    virtual void do_freeaddrinfo (struct addrinfo *res_);
-
-    virtual unsigned int do_if_nametoindex (const char *ifname_);
-
-  private:
-    ip_resolver_options_t _options;
-
-    int resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_);
-    int resolve_getaddrinfo (ip_addr_t *ip_addr_, const char *addr_);
-
-#if defined ZMQ_HAVE_WINDOWS
-    int get_interface_name (unsigned long index_, char **dest_) const;
-    int wchar_to_utf8 (const WCHAR *src_, char **dest_) const;
-#endif
-};
-}
-
-#endif
diff --git a/src/ipc_address.cpp b/src/ipc_address.cpp
deleted file mode 100644
index 4325b439f..000000000
--- a/src/ipc_address.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "ipc_address.hpp"
-
-#if defined ZMQ_HAVE_IPC
-
-#include "err.hpp"
-
-#include <string>
-
-#ifndef HAVE_STRNLEN
-static size_t strnlen (const char *s, size_t len)
-{
-    for (size_t i = 0; i < len; i++) {
-        if (s[i] == '\0')
-            return i + 1;
-    }
-
-    return len;
-}
-#endif
-
-zmq::ipc_address_t::ipc_address_t ()
-{
-    memset (&_address, 0, sizeof _address);
-}
-
-zmq::ipc_address_t::ipc_address_t (const sockaddr *sa_, socklen_t sa_len_) :
-    _addrlen (sa_len_)
-{
-    zmq_assert (sa_ && sa_len_ > 0);
-
-    memset (&_address, 0, sizeof _address);
-    if (sa_->sa_family == AF_UNIX)
-        memcpy (&_address, sa_, sa_len_);
-}
-
-zmq::ipc_address_t::~ipc_address_t ()
-{
-}
-
-int zmq::ipc_address_t::resolve (const char *path_)
-{
-    const size_t path_len = strlen (path_);
-    if (path_len >= sizeof _address.sun_path) {
-        errno = ENAMETOOLONG;
-        return -1;
-    }
-    if (path_[0] == '@' && !path_[1]) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _address.sun_family = AF_UNIX;
-    memcpy (_address.sun_path, path_, path_len + 1);
-    /* Abstract sockets start with '\0' */
-    if (path_[0] == '@')
-        *_address.sun_path = '\0';
-
-    _addrlen =
-      static_cast<socklen_t> (offsetof (sockaddr_un, sun_path) + path_len);
-    return 0;
-}
-
-int zmq::ipc_address_t::to_string (std::string &addr_) const
-{
-    if (_address.sun_family != AF_UNIX) {
-        addr_.clear ();
-        return -1;
-    }
-
-    const char prefix[] = "ipc://";
-    char buf[sizeof prefix + sizeof _address.sun_path];
-    char *pos = buf;
-    memcpy (pos, prefix, sizeof prefix - 1);
-    pos += sizeof prefix - 1;
-    const char *src_pos = _address.sun_path;
-    if (!_address.sun_path[0] && _address.sun_path[1]) {
-        *pos++ = '@';
-        src_pos++;
-    }
-    // according to http://man7.org/linux/man-pages/man7/unix.7.html, NOTES
-    // section, address.sun_path might not always be null-terminated; therefore,
-    // we calculate the length based of addrlen
-    const size_t src_len =
-      strnlen (src_pos, _addrlen - offsetof (sockaddr_un, sun_path)
-                          - (src_pos - _address.sun_path));
-    memcpy (pos, src_pos, src_len);
-    addr_.assign (buf, pos - buf + src_len);
-    return 0;
-}
-
-const sockaddr *zmq::ipc_address_t::addr () const
-{
-    return reinterpret_cast<const sockaddr *> (&_address);
-}
-
-socklen_t zmq::ipc_address_t::addrlen () const
-{
-    return _addrlen;
-}
-
-#endif
diff --git a/src/ipc_address.hpp b/src/ipc_address.hpp
deleted file mode 100644
index 4c2277d39..000000000
--- a/src/ipc_address.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IPC_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_IPC_ADDRESS_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_IPC
-
-#include <string>
-
-#if defined _MSC_VER
-#include <afunix.h>
-#else
-#include <sys/socket.h>
-#include <sys/un.h>
-#endif
-
-#include "macros.hpp"
-
-namespace zmq
-{
-class ipc_address_t
-{
-  public:
-    ipc_address_t ();
-    ipc_address_t (const sockaddr *sa_, socklen_t sa_len_);
-    ~ipc_address_t ();
-
-    //  This function sets up the address for UNIX domain transport.
-    int resolve (const char *path_);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-  private:
-    struct sockaddr_un _address;
-    socklen_t _addrlen;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ipc_address_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp
deleted file mode 100644
index 0bd03d580..000000000
--- a/src/ipc_connecter.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "ipc_connecter.hpp"
-
-#if defined ZMQ_HAVE_IPC
-
-#include <new>
-#include <string>
-
-#include "io_thread.hpp"
-#include "random.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "address.hpp"
-#include "ipc_address.hpp"
-#include "session_base.hpp"
-
-#ifdef _MSC_VER
-#include <afunix.h>
-#else
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#endif
-
-zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
-                                       class session_base_t *session_,
-                                       const options_t &options_,
-                                       address_t *addr_,
-                                       bool delayed_start_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_)
-{
-    zmq_assert (_addr->protocol == protocol_name::ipc);
-}
-
-void zmq::ipc_connecter_t::out_event ()
-{
-    const fd_t fd = connect ();
-    rm_handle ();
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    create_engine (fd, get_socket_name<ipc_address_t> (fd, socket_end_local));
-}
-
-void zmq::ipc_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    const int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        out_event ();
-    }
-
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (rc == -1 && errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-
-        // TODO, tcp_connecter_t adds a connect timer in this case; maybe this
-        // should be done here as well (and then this could be pulled up to
-        // stream_connecter_base_t).
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-int zmq::ipc_connecter_t::open ()
-{
-    zmq_assert (_s == retired_fd);
-
-    //  Create the socket.
-    _s = open_socket (AF_UNIX, SOCK_STREAM, 0);
-    if (_s == retired_fd)
-        return -1;
-
-    //  Set the non-blocking flag.
-    unblock_socket (_s);
-
-    //  Connect to the remote peer.
-    const int rc = ::connect (_s, _addr->resolved.ipc_addr->addr (),
-                              _addr->resolved.ipc_addr->addrlen ());
-
-    //  Connect was successful immediately.
-    if (rc == 0)
-        return 0;
-
-        //  Translate other error codes indicating asynchronous connect has been
-        //  launched to a uniform EINPROGRESS.
-#ifdef ZMQ_HAVE_WINDOWS
-    const int last_error = WSAGetLastError ();
-    if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)
-        errno = EINPROGRESS;
-    else
-        errno = wsa_error_to_errno (last_error);
-#else
-    if (rc == -1 && errno == EINTR) {
-        errno = EINPROGRESS;
-    }
-#endif
-
-    //  Forward the error.
-    return -1;
-}
-
-zmq::fd_t zmq::ipc_connecter_t::connect ()
-{
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    int err = 0;
-    zmq_socklen_t len = static_cast<zmq_socklen_t> (sizeof (err));
-    const int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                               reinterpret_cast<char *> (&err), &len);
-    if (rc == -1) {
-        if (errno == ENOPROTOOPT)
-            errno = 0;
-        err = errno;
-    }
-    if (err != 0) {
-        //  Assert if the error was caused by 0MQ bug.
-        //  Networking problems are OK. No need to assert.
-        errno = err;
-        errno_assert (errno == ECONNREFUSED || errno == ECONNRESET
-                      || errno == ETIMEDOUT || errno == EHOSTUNREACH
-                      || errno == ENETUNREACH || errno == ENETDOWN);
-
-        return retired_fd;
-    }
-
-    const fd_t result = _s;
-    _s = retired_fd;
-    return result;
-}
-
-#endif
diff --git a/src/ipc_connecter.hpp b/src/ipc_connecter.hpp
deleted file mode 100644
index 1f85c8934..000000000
--- a/src/ipc_connecter.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __IPC_CONNECTER_HPP_INCLUDED__
-#define __IPC_CONNECTER_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_IPC
-
-#include "fd.hpp"
-#include "stream_connecter_base.hpp"
-
-namespace zmq
-{
-class ipc_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    ipc_connecter_t (zmq::io_thread_t *io_thread_,
-                     zmq::session_base_t *session_,
-                     const options_t &options_,
-                     address_t *addr_,
-                     bool delayed_start_);
-
-  private:
-    //  Handlers for I/O events.
-    void out_event ();
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    //  Open IPC connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ipc_connecter_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/ipc_listener.cpp b/src/ipc_listener.cpp
deleted file mode 100644
index fc5bc51ae..000000000
--- a/src/ipc_listener.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "ipc_listener.hpp"
-
-#if defined ZMQ_HAVE_IPC
-
-#include <new>
-
-#include <string.h>
-
-#include "ipc_address.hpp"
-#include "io_thread.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "socket_base.hpp"
-#include "address.hpp"
-
-#ifdef _MSC_VER
-#ifdef ZMQ_IOTHREAD_POLLER_USE_SELECT
-#error On Windows, IPC does not work with POLLER=select, use POLLER=epoll instead, or disable IPC transport
-#endif
-
-#include <afunix.h>
-#include <direct.h>
-
-#define rmdir _rmdir
-#define unlink _unlink
-
-#else
-#include <unistd.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <sys/un.h>
-#endif
-
-#ifdef ZMQ_HAVE_LOCAL_PEERCRED
-#include <sys/types.h>
-#include <sys/ucred.h>
-#endif
-#ifdef ZMQ_HAVE_SO_PEERCRED
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
-#if defined ZMQ_HAVE_OPENBSD
-#define ucred sockpeercred
-#endif
-#endif
-
-zmq::ipc_listener_t::ipc_listener_t (io_thread_t *io_thread_,
-                                     socket_base_t *socket_,
-                                     const options_t &options_) :
-    stream_listener_base_t (io_thread_, socket_, options_),
-    _has_file (false)
-{
-}
-
-void zmq::ipc_listener_t::in_event ()
-{
-    const fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    //  TODO: Handle specific errors like ENFILE/EMFILE etc.
-    if (fd == retired_fd) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    //  Create the engine object for this connection.
-    create_engine (fd);
-}
-
-std::string
-zmq::ipc_listener_t::get_socket_name (zmq::fd_t fd_,
-                                      socket_end_t socket_end_) const
-{
-    return zmq::get_socket_name<ipc_address_t> (fd_, socket_end_);
-}
-
-int zmq::ipc_listener_t::set_local_address (const char *addr_)
-{
-    //  Create addr on stack for auto-cleanup
-    std::string addr (addr_);
-
-    //  Allow wildcard file
-    if (options.use_fd == -1 && addr[0] == '*') {
-        if (create_ipc_wildcard_address (_tmp_socket_dirname, addr) < 0) {
-            return -1;
-        }
-    }
-
-    //  Get rid of the file associated with the UNIX domain socket that
-    //  may have been left behind by the previous run of the application.
-    //  MUST NOT unlink if the FD is managed by the user, or it will stop
-    //  working after the first client connects. The user will take care of
-    //  cleaning up the file after the service is stopped.
-    if (options.use_fd == -1) {
-        ::unlink (addr.c_str ());
-    }
-    _filename.clear ();
-
-    //  Initialise the address structure.
-    ipc_address_t address;
-    int rc = address.resolve (addr.c_str ());
-    if (rc != 0) {
-        if (!_tmp_socket_dirname.empty ()) {
-            // We need to preserve errno to return to the user
-            const int tmp_errno = errno;
-            ::rmdir (_tmp_socket_dirname.c_str ());
-            _tmp_socket_dirname.clear ();
-            errno = tmp_errno;
-        }
-        return -1;
-    }
-
-    address.to_string (_endpoint);
-
-    if (options.use_fd != -1) {
-        _s = options.use_fd;
-    } else {
-        //  Create a listening socket.
-        _s = open_socket (AF_UNIX, SOCK_STREAM, 0);
-        if (_s == retired_fd) {
-            if (!_tmp_socket_dirname.empty ()) {
-                // We need to preserve errno to return to the user
-                const int tmp_errno = errno;
-                ::rmdir (_tmp_socket_dirname.c_str ());
-                _tmp_socket_dirname.clear ();
-                errno = tmp_errno;
-            }
-            return -1;
-        }
-
-        //  Bind the socket to the file path.
-        rc = bind (_s, const_cast<sockaddr *> (address.addr ()),
-                   address.addrlen ());
-        if (rc != 0)
-            goto error;
-
-        //  Listen for incoming connections.
-        rc = listen (_s, options.backlog);
-        if (rc != 0)
-            goto error;
-    }
-
-    _filename = ZMQ_MOVE (addr);
-    _has_file = true;
-
-    _socket->event_listening (make_unconnected_bind_endpoint_pair (_endpoint),
-                              _s);
-    return 0;
-
-error:
-    const int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-int zmq::ipc_listener_t::close ()
-{
-    zmq_assert (_s != retired_fd);
-    const fd_t fd_for_event = _s;
-#ifdef ZMQ_HAVE_WINDOWS
-    int rc = closesocket (_s);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    int rc = ::close (_s);
-    errno_assert (rc == 0);
-#endif
-
-    _s = retired_fd;
-
-    if (_has_file && options.use_fd == -1) {
-        if (!_tmp_socket_dirname.empty ()) {
-            //  TODO review this behaviour, it is inconsistent with the use of
-            //  unlink in open since 656cdb959a7482c45db979c1d08ede585d12e315;
-            //  however, we must at least remove the file before removing the
-            //  directory, otherwise it will always fail
-            rc = ::unlink (_filename.c_str ());
-
-            if (rc == 0) {
-                rc = ::rmdir (_tmp_socket_dirname.c_str ());
-                _tmp_socket_dirname.clear ();
-            }
-        }
-
-        if (rc != 0) {
-            _socket->event_close_failed (
-              make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-            return -1;
-        }
-    }
-
-    _socket->event_closed (make_unconnected_bind_endpoint_pair (_endpoint),
-                           fd_for_event);
-    return 0;
-}
-
-#if defined ZMQ_HAVE_SO_PEERCRED
-
-bool zmq::ipc_listener_t::filter (fd_t sock_)
-{
-    if (options.ipc_uid_accept_filters.empty ()
-        && options.ipc_pid_accept_filters.empty ()
-        && options.ipc_gid_accept_filters.empty ())
-        return true;
-
-    struct ucred cred;
-    socklen_t size = sizeof (cred);
-
-    if (getsockopt (sock_, SOL_SOCKET, SO_PEERCRED, &cred, &size))
-        return false;
-    if (options.ipc_uid_accept_filters.find (cred.uid)
-          != options.ipc_uid_accept_filters.end ()
-        || options.ipc_gid_accept_filters.find (cred.gid)
-             != options.ipc_gid_accept_filters.end ()
-        || options.ipc_pid_accept_filters.find (cred.pid)
-             != options.ipc_pid_accept_filters.end ())
-        return true;
-
-    const struct passwd *pw;
-    const struct group *gr;
-
-    if (!(pw = getpwuid (cred.uid)))
-        return false;
-    for (options_t::ipc_gid_accept_filters_t::const_iterator
-           it = options.ipc_gid_accept_filters.begin (),
-           end = options.ipc_gid_accept_filters.end ();
-         it != end; it++) {
-        if (!(gr = getgrgid (*it)))
-            continue;
-        for (char **mem = gr->gr_mem; *mem; mem++) {
-            if (!strcmp (*mem, pw->pw_name))
-                return true;
-        }
-    }
-    return false;
-}
-
-#elif defined ZMQ_HAVE_LOCAL_PEERCRED
-
-bool zmq::ipc_listener_t::filter (fd_t sock_)
-{
-    if (options.ipc_uid_accept_filters.empty ()
-        && options.ipc_gid_accept_filters.empty ())
-        return true;
-
-    struct xucred cred;
-    socklen_t size = sizeof (cred);
-
-    if (getsockopt (sock_, 0, LOCAL_PEERCRED, &cred, &size))
-        return false;
-    if (cred.cr_version != XUCRED_VERSION)
-        return false;
-    if (options.ipc_uid_accept_filters.find (cred.cr_uid)
-        != options.ipc_uid_accept_filters.end ())
-        return true;
-    for (int i = 0; i < cred.cr_ngroups; i++) {
-        if (options.ipc_gid_accept_filters.find (cred.cr_groups[i])
-            != options.ipc_gid_accept_filters.end ())
-            return true;
-    }
-
-    return false;
-}
-
-#endif
-
-zmq::fd_t zmq::ipc_listener_t::accept ()
-{
-    //  Accept one connection and deal with different failure modes.
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    zmq_assert (_s != retired_fd);
-#if defined ZMQ_HAVE_SOCK_CLOEXEC && defined HAVE_ACCEPT4
-    fd_t sock = ::accept4 (_s, NULL, NULL, SOCK_CLOEXEC);
-#else
-    struct sockaddr_storage ss;
-    memset (&ss, 0, sizeof (ss));
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int ss_len = sizeof (ss);
-#else
-    socklen_t ss_len = sizeof (ss);
-#endif
-
-    const fd_t sock =
-      ::accept (_s, reinterpret_cast<struct sockaddr *> (&ss), &ss_len);
-#endif
-    if (sock == retired_fd) {
-#if defined ZMQ_HAVE_WINDOWS
-        const int last_error = WSAGetLastError ();
-        wsa_assert (last_error == WSAEWOULDBLOCK || last_error == WSAECONNRESET
-                    || last_error == WSAEMFILE || last_error == WSAENOBUFS);
-#else
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENFILE);
-#endif
-        return retired_fd;
-    }
-
-    make_socket_noninheritable (sock);
-
-    // IPC accept() filters
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    if (!filter (sock)) {
-        int rc = ::close (sock);
-        errno_assert (rc == 0);
-        return retired_fd;
-    }
-#endif
-
-    if (zmq::set_nosigpipe (sock)) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (sock);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = ::close (sock);
-        errno_assert (rc == 0);
-#endif
-        return retired_fd;
-    }
-
-    return sock;
-}
-
-#endif
diff --git a/src/ipc_listener.hpp b/src/ipc_listener.hpp
deleted file mode 100644
index 85c7d41ea..000000000
--- a/src/ipc_listener.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IPC_LISTENER_HPP_INCLUDED__
-#define __ZMQ_IPC_LISTENER_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_IPC
-
-#include <string>
-
-#include "fd.hpp"
-#include "stream_listener_base.hpp"
-
-namespace zmq
-{
-class ipc_listener_t ZMQ_FINAL : public stream_listener_base_t
-{
-  public:
-    ipc_listener_t (zmq::io_thread_t *io_thread_,
-                    zmq::socket_base_t *socket_,
-                    const options_t &options_);
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-  protected:
-    std::string get_socket_name (fd_t fd_, socket_end_t socket_end_) const;
-
-  private:
-    //  Handlers for I/O events.
-    void in_event ();
-
-    //  Filter new connections if the OS provides a mechanism to get
-    //  the credentials of the peer process.  Called from accept().
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    bool filter (fd_t sock_);
-#endif
-
-    int close ();
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog.
-    fd_t accept ();
-
-    //  True, if the underlying file for UNIX domain socket exists.
-    bool _has_file;
-
-    //  Name of the temporary directory (if any) that has the
-    //  UNIX domain socket
-    std::string _tmp_socket_dirname;
-
-    //  Name of the file associated with the UNIX domain address.
-    std::string _filename;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ipc_listener_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/kqueue.cpp b/src/kqueue.cpp
deleted file mode 100644
index 53d82ac4f..000000000
--- a/src/kqueue.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "kqueue.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_KQUEUE
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <algorithm>
-#include <new>
-
-#include "macros.hpp"
-#include "kqueue.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-#include "likely.hpp"
-
-//  NetBSD defines (struct kevent).udata as intptr_t, everyone else
-//  as void *.
-#if defined ZMQ_HAVE_NETBSD
-#define kevent_udata_t intptr_t
-#else
-#define kevent_udata_t void *
-#endif
-
-zmq::kqueue_t::kqueue_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_)
-{
-    //  Create event queue
-    kqueue_fd = kqueue ();
-    errno_assert (kqueue_fd != -1);
-#ifdef HAVE_FORK
-    pid = getpid ();
-#endif
-}
-
-zmq::kqueue_t::~kqueue_t ()
-{
-    stop_worker ();
-    close (kqueue_fd);
-}
-
-void zmq::kqueue_t::kevent_add (fd_t fd_, short filter_, void *udata_)
-{
-    check_thread ();
-    struct kevent ev;
-
-    EV_SET (&ev, fd_, filter_, EV_ADD, 0, 0, (kevent_udata_t) udata_);
-    int rc = kevent (kqueue_fd, &ev, 1, NULL, 0, NULL);
-    errno_assert (rc != -1);
-}
-
-void zmq::kqueue_t::kevent_delete (fd_t fd_, short filter_)
-{
-    struct kevent ev;
-
-    EV_SET (&ev, fd_, filter_, EV_DELETE, 0, 0, 0);
-    int rc = kevent (kqueue_fd, &ev, 1, NULL, 0, NULL);
-    errno_assert (rc != -1);
-}
-
-zmq::kqueue_t::handle_t zmq::kqueue_t::add_fd (fd_t fd_,
-                                               i_poll_events *reactor_)
-{
-    check_thread ();
-    poll_entry_t *pe = new (std::nothrow) poll_entry_t;
-    alloc_assert (pe);
-
-    pe->fd = fd_;
-    pe->flag_pollin = 0;
-    pe->flag_pollout = 0;
-    pe->reactor = reactor_;
-
-    adjust_load (1);
-
-    return pe;
-}
-
-void zmq::kqueue_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (pe->flag_pollin)
-        kevent_delete (pe->fd, EVFILT_READ);
-    if (pe->flag_pollout)
-        kevent_delete (pe->fd, EVFILT_WRITE);
-    pe->fd = retired_fd;
-    retired.push_back (pe);
-
-    adjust_load (-1);
-}
-
-void zmq::kqueue_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (!pe->flag_pollin)) {
-        pe->flag_pollin = true;
-        kevent_add (pe->fd, EVFILT_READ, pe);
-    }
-}
-
-void zmq::kqueue_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (pe->flag_pollin)) {
-        pe->flag_pollin = false;
-        kevent_delete (pe->fd, EVFILT_READ);
-    }
-}
-
-void zmq::kqueue_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (!pe->flag_pollout)) {
-        pe->flag_pollout = true;
-        kevent_add (pe->fd, EVFILT_WRITE, pe);
-    }
-}
-
-void zmq::kqueue_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (pe->flag_pollout)) {
-        pe->flag_pollout = false;
-        kevent_delete (pe->fd, EVFILT_WRITE);
-    }
-}
-
-void zmq::kqueue_t::stop ()
-{
-}
-
-int zmq::kqueue_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::kqueue_t::loop ()
-{
-    while (true) {
-        //  Execute any due timers.
-        int timeout = (int) execute_timers ();
-
-        if (get_load () == 0) {
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-        //  Wait for events.
-        struct kevent ev_buf[max_io_events];
-        timespec ts = {timeout / 1000, (timeout % 1000) * 1000000};
-        int n = kevent (kqueue_fd, NULL, 0, &ev_buf[0], max_io_events,
-                        timeout ? &ts : NULL);
-#ifdef HAVE_FORK
-        if (unlikely (pid != getpid ())) {
-            //printf("zmq::kqueue_t::loop aborting on forked child %d\n", (int)getpid());
-            // simply exit the loop in a forked process.
-            return;
-        }
-#endif
-        if (n == -1) {
-            errno_assert (errno == EINTR);
-            continue;
-        }
-
-        for (int i = 0; i < n; i++) {
-            poll_entry_t *pe = (poll_entry_t *) ev_buf[i].udata;
-
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].flags & EV_EOF)
-                pe->reactor->in_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].filter == EVFILT_WRITE)
-                pe->reactor->out_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].filter == EVFILT_READ)
-                pe->reactor->in_event ();
-        }
-
-        //  Destroy retired event sources.
-        for (retired_t::iterator it = retired.begin (); it != retired.end ();
-             ++it) {
-            LIBZMQ_DELETE (*it);
-        }
-        retired.clear ();
-    }
-}
-
-#endif
diff --git a/src/kqueue.hpp b/src/kqueue.hpp
deleted file mode 100644
index 002fbab38..000000000
--- a/src/kqueue.hpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_KQUEUE_HPP_INCLUDED__
-#define __ZMQ_KQUEUE_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_KQUEUE
-
-#include <vector>
-#include <unistd.h>
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  Implements socket polling mechanism using the BSD-specific
-//  kqueue interface.
-
-class kqueue_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef void *handle_t;
-
-    kqueue_t (const thread_ctx_t &ctx_);
-    ~kqueue_t () ZMQ_FINAL;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    //  File descriptor referring to the kernel event queue.
-    fd_t kqueue_fd;
-
-    //  Adds the event to the kqueue.
-    void kevent_add (fd_t fd_, short filter_, void *udata_);
-
-    //  Deletes the event from the kqueue.
-    void kevent_delete (fd_t fd_, short filter_);
-
-    struct poll_entry_t
-    {
-        fd_t fd;
-        bool flag_pollin;
-        bool flag_pollout;
-        zmq::i_poll_events *reactor;
-    };
-
-    //  List of retired event sources.
-    typedef std::vector<poll_entry_t *> retired_t;
-    retired_t retired;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (kqueue_t)
-
-#ifdef HAVE_FORK
-    // the process that created this context. Used to detect forking.
-    pid_t pid;
-#endif
-};
-
-typedef kqueue_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/src/lb.cpp b/src/lb.cpp
deleted file mode 100644
index e766b4f2f..000000000
--- a/src/lb.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "lb.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::lb_t::lb_t () : _active (0), _current (0), _more (false), _dropping (false)
-{
-}
-
-zmq::lb_t::~lb_t ()
-{
-    zmq_assert (_pipes.empty ());
-}
-
-void zmq::lb_t::attach (pipe_t *pipe_)
-{
-    _pipes.push_back (pipe_);
-    activated (pipe_);
-}
-
-void zmq::lb_t::pipe_terminated (pipe_t *pipe_)
-{
-    const pipes_t::size_type index = _pipes.index (pipe_);
-
-    //  If we are in the middle of multipart message and current pipe
-    //  have disconnected, we have to drop the remainder of the message.
-    if (index == _current && _more)
-        _dropping = true;
-
-    //  Remove the pipe from the list; adjust number of active pipes
-    //  accordingly.
-    if (index < _active) {
-        _active--;
-        _pipes.swap (index, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-    _pipes.erase (pipe_);
-}
-
-void zmq::lb_t::activated (pipe_t *pipe_)
-{
-    //  Move the pipe to the list of active pipes.
-    _pipes.swap (_pipes.index (pipe_), _active);
-    _active++;
-}
-
-int zmq::lb_t::send (msg_t *msg_)
-{
-    return sendpipe (msg_, NULL);
-}
-
-int zmq::lb_t::sendpipe (msg_t *msg_, pipe_t **pipe_)
-{
-    //  Drop the message if required. If we are at the end of the message
-    //  switch back to non-dropping mode.
-    if (_dropping) {
-        _more = (msg_->flags () & msg_t::more) != 0;
-        _dropping = _more;
-
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-
-    while (_active > 0) {
-        if (_pipes[_current]->write (msg_)) {
-            if (pipe_)
-                *pipe_ = _pipes[_current];
-            break;
-        }
-
-        // If send fails for multi-part msg rollback other
-        // parts sent earlier and return EAGAIN.
-        // Application should handle this as suitable
-        if (_more) {
-            _pipes[_current]->rollback ();
-            // At this point the pipe is already being deallocated
-            // and the first N frames are unreachable (_outpipe is
-            // most likely already NULL so rollback won't actually do
-            // anything and they can't be un-written to deliver later).
-            // Return EFAULT to socket_base caller to drop current message
-            // and any other subsequent frames to avoid them being
-            // "stuck" and received when a new client reconnects, which
-            // would break atomicity of multi-part messages (in blocking mode
-            // socket_base just tries again and again to send the same message)
-            // Note that given dropping mode returns 0, the user will
-            // never know that the message could not be delivered, but
-            // can't really fix it without breaking backward compatibility.
-            // -2/EAGAIN will make sure socket_base caller does not re-enter
-            // immediately or after a short sleep in blocking mode.
-            _dropping = (msg_->flags () & msg_t::more) != 0;
-            _more = false;
-            errno = EAGAIN;
-            return -2;
-        }
-
-        _active--;
-        if (_current < _active)
-            _pipes.swap (_current, _active);
-        else
-            _current = 0;
-    }
-
-    //  If there are no pipes we cannot send the message.
-    if (_active == 0) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    //  If it's final part of the message we can flush it downstream and
-    //  continue round-robining (load balance).
-    _more = (msg_->flags () & msg_t::more) != 0;
-    if (!_more) {
-        _pipes[_current]->flush ();
-
-        if (++_current >= _active)
-            _current = 0;
-    }
-
-    //  Detach the message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-bool zmq::lb_t::has_out ()
-{
-    //  If one part of the message was already written we can definitely
-    //  write the rest of the message.
-    if (_more)
-        return true;
-
-    while (_active > 0) {
-        //  Check whether a pipe has room for another message.
-        if (_pipes[_current]->check_write ())
-            return true;
-
-        //  Deactivate the pipe.
-        _active--;
-        _pipes.swap (_current, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-
-    return false;
-}
diff --git a/src/lb.hpp b/src/lb.hpp
deleted file mode 100644
index b206967bc..000000000
--- a/src/lb.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_LB_HPP_INCLUDED__
-#define __ZMQ_LB_HPP_INCLUDED__
-
-#include "array.hpp"
-
-namespace zmq
-{
-class msg_t;
-class pipe_t;
-
-//  This class manages a set of outbound pipes. On send it load balances
-//  messages fairly among the pipes.
-
-class lb_t
-{
-  public:
-    lb_t ();
-    ~lb_t ();
-
-    void attach (pipe_t *pipe_);
-    void activated (pipe_t *pipe_);
-    void pipe_terminated (pipe_t *pipe_);
-
-    int send (msg_t *msg_);
-
-    //  Sends a message and stores the pipe that was used in pipe_.
-    //  It is possible for this function to return success but keep pipe_
-    //  unset if the rest of a multipart message to a terminated pipe is
-    //  being dropped. For the first frame, this will never happen.
-    int sendpipe (msg_t *msg_, pipe_t **pipe_);
-
-    bool has_out ();
-
-  private:
-    //  List of outbound pipes.
-    typedef array_t<pipe_t, 2> pipes_t;
-    pipes_t _pipes;
-
-    //  Number of active pipes. All the active pipes are located at the
-    //  beginning of the pipes array.
-    pipes_t::size_type _active;
-
-    //  Points to the last pipe that the most recent message was sent to.
-    pipes_t::size_type _current;
-
-    //  True if last we are in the middle of a multipart message.
-    bool _more;
-
-    //  True if we are dropping current message.
-    bool _dropping;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (lb_t)
-};
-}
-
-#endif
diff --git a/src/libzmq.pc.in b/src/libzmq.pc.in
deleted file mode 100644
index 233bc3a08..000000000
--- a/src/libzmq.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libzmq
-Description: 0MQ c++ library
-Version: @VERSION@
-Libs: -L${libdir} -lzmq
-Libs.private: -lstdc++ @pkg_config_libs_private@
-Requires.private: @pkg_config_names_private@
-Cflags: -I${includedir} @pkg_config_defines@
diff --git a/src/libzmq.vers b/src/libzmq.vers
deleted file mode 100644
index 9a2d41548..000000000
--- a/src/libzmq.vers
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  global: zmq_*;
-  local: *;
-};
diff --git a/src/likely.hpp b/src/likely.hpp
deleted file mode 100644
index d6cb14d70..000000000
--- a/src/likely.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_LIKELY_HPP_INCLUDED__
-#define __ZMQ_LIKELY_HPP_INCLUDED__
-
-#if defined __GNUC__
-#define likely(x) __builtin_expect ((x), 1)
-#define unlikely(x) __builtin_expect ((x), 0)
-#else
-#define likely(x) (x)
-#define unlikely(x) (x)
-#endif
-
-
-#endif
diff --git a/src/macros.hpp b/src/macros.hpp
deleted file mode 100644
index 427a9e25b..000000000
--- a/src/macros.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-
-/******************************************************************************/
-/*  0MQ Internal Use                                                          */
-/******************************************************************************/
-
-#define LIBZMQ_UNUSED(object) (void) object
-#define LIBZMQ_DELETE(p_object)                                                \
-    {                                                                          \
-        delete p_object;                                                       \
-        p_object = 0;                                                          \
-    }
-
-/******************************************************************************/
-
-#if !defined ZMQ_NOEXCEPT
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_NOEXCEPT noexcept
-#else
-#define ZMQ_NOEXCEPT
-#endif
-#endif
-
-#if !defined ZMQ_OVERRIDE
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_OVERRIDE override
-#else
-#define ZMQ_OVERRIDE
-#endif
-#endif
-
-#if !defined ZMQ_FINAL
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_FINAL final
-#else
-#define ZMQ_FINAL
-#endif
-#endif
-
-#if !defined ZMQ_DEFAULT
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_DEFAULT = default;
-#else
-#define ZMQ_DEFAULT                                                            \
-    {                                                                          \
-    }
-#endif
-#endif
-
-#if !defined ZMQ_NON_COPYABLE_NOR_MOVABLE
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_NON_COPYABLE_NOR_MOVABLE(classname)                                \
-  public:                                                                      \
-    classname (const classname &) = delete;                                    \
-    classname &operator= (const classname &) = delete;                         \
-    classname (classname &&) = delete;                                         \
-    classname &operator= (classname &&) = delete;
-#else
-#define ZMQ_NON_COPYABLE_NOR_MOVABLE(classname)                                \
-  private:                                                                     \
-    classname (const classname &);                                             \
-    classname &operator= (const classname &);
-#endif
-#endif
diff --git a/src/mailbox.cpp b/src/mailbox.cpp
deleted file mode 100644
index 2fb0fe0ca..000000000
--- a/src/mailbox.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "mailbox.hpp"
-#include "err.hpp"
-
-zmq::mailbox_t::mailbox_t ()
-{
-    //  Get the pipe into passive state. That way, if the users starts by
-    //  polling on the associated file descriptor it will get woken up when
-    //  new command is posted.
-    const bool ok = _cpipe.check_read ();
-    zmq_assert (!ok);
-    _active = false;
-}
-
-zmq::mailbox_t::~mailbox_t ()
-{
-    //  TODO: Retrieve and deallocate commands inside the _cpipe.
-
-    // Work around problem that other threads might still be in our
-    // send() method, by waiting on the mutex before disappearing.
-    _sync.lock ();
-    _sync.unlock ();
-}
-
-zmq::fd_t zmq::mailbox_t::get_fd () const
-{
-    return _signaler.get_fd ();
-}
-
-void zmq::mailbox_t::send (const command_t &cmd_)
-{
-    _sync.lock ();
-    _cpipe.write (cmd_, false);
-    const bool ok = _cpipe.flush ();
-    _sync.unlock ();
-    if (!ok)
-        _signaler.send ();
-}
-
-int zmq::mailbox_t::recv (command_t *cmd_, int timeout_)
-{
-    //  Try to get the command straight away.
-    if (_active) {
-        if (_cpipe.read (cmd_))
-            return 0;
-
-        //  If there are no more commands available, switch into passive state.
-        _active = false;
-    }
-
-    //  Wait for signal from the command sender.
-    int rc = _signaler.wait (timeout_);
-    if (rc == -1) {
-        errno_assert (errno == EAGAIN || errno == EINTR);
-        return -1;
-    }
-
-    //  Receive the signal.
-    rc = _signaler.recv_failable ();
-    if (rc == -1) {
-        errno_assert (errno == EAGAIN);
-        return -1;
-    }
-
-    //  Switch into active state.
-    _active = true;
-
-    //  Get a command.
-    const bool ok = _cpipe.read (cmd_);
-    zmq_assert (ok);
-    return 0;
-}
-
-bool zmq::mailbox_t::valid () const
-{
-    return _signaler.valid ();
-}
diff --git a/src/mailbox.hpp b/src/mailbox.hpp
deleted file mode 100644
index 0cd92d208..000000000
--- a/src/mailbox.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MAILBOX_HPP_INCLUDED__
-#define __ZMQ_MAILBOX_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "signaler.hpp"
-#include "fd.hpp"
-#include "config.hpp"
-#include "command.hpp"
-#include "ypipe.hpp"
-#include "mutex.hpp"
-#include "i_mailbox.hpp"
-
-namespace zmq
-{
-class mailbox_t ZMQ_FINAL : public i_mailbox
-{
-  public:
-    mailbox_t ();
-    ~mailbox_t ();
-
-    fd_t get_fd () const;
-    void send (const command_t &cmd_);
-    int recv (command_t *cmd_, int timeout_);
-
-    bool valid () const;
-
-#ifdef HAVE_FORK
-    // close the file descriptors in the signaller. This is used in a forked
-    // child process to close the file descriptors so that they do not interfere
-    // with the context in the parent process.
-    void forked () ZMQ_FINAL { _signaler.forked (); }
-#endif
-
-  private:
-    //  The pipe to store actual commands.
-    typedef ypipe_t<command_t, command_pipe_granularity> cpipe_t;
-    cpipe_t _cpipe;
-
-    //  Signaler to pass signals from writer thread to reader thread.
-    signaler_t _signaler;
-
-    //  There's only one thread receiving from the mailbox, but there
-    //  is arbitrary number of threads sending. Given that ypipe requires
-    //  synchronised access on both of its endpoints, we have to synchronise
-    //  the sending side.
-    mutex_t _sync;
-
-    //  True if the underlying pipe is active, ie. when we are allowed to
-    //  read commands from it.
-    bool _active;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mailbox_t)
-};
-}
-
-#endif
diff --git a/src/mailbox_safe.cpp b/src/mailbox_safe.cpp
deleted file mode 100644
index f49fa957a..000000000
--- a/src/mailbox_safe.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "mailbox_safe.hpp"
-#include "clock.hpp"
-#include "err.hpp"
-
-#include <algorithm>
-
-zmq::mailbox_safe_t::mailbox_safe_t (mutex_t *sync_) : _sync (sync_)
-{
-    //  Get the pipe into passive state. That way, if the users starts by
-    //  polling on the associated file descriptor it will get woken up when
-    //  new command is posted.
-    const bool ok = _cpipe.check_read ();
-    zmq_assert (!ok);
-}
-
-zmq::mailbox_safe_t::~mailbox_safe_t ()
-{
-    //  TODO: Retrieve and deallocate commands inside the cpipe.
-
-    // Work around problem that other threads might still be in our
-    // send() method, by waiting on the mutex before disappearing.
-    _sync->lock ();
-    _sync->unlock ();
-}
-
-void zmq::mailbox_safe_t::add_signaler (signaler_t *signaler_)
-{
-    _signalers.push_back (signaler_);
-}
-
-void zmq::mailbox_safe_t::remove_signaler (signaler_t *signaler_)
-{
-    // TODO: make a copy of array and signal outside the lock
-    const std::vector<zmq::signaler_t *>::iterator end = _signalers.end ();
-    const std::vector<signaler_t *>::iterator it =
-      std::find (_signalers.begin (), end, signaler_);
-
-    if (it != end)
-        _signalers.erase (it);
-}
-
-void zmq::mailbox_safe_t::clear_signalers ()
-{
-    _signalers.clear ();
-}
-
-void zmq::mailbox_safe_t::send (const command_t &cmd_)
-{
-    _sync->lock ();
-    _cpipe.write (cmd_, false);
-    const bool ok = _cpipe.flush ();
-
-    if (!ok) {
-        _cond_var.broadcast ();
-
-        for (std::vector<signaler_t *>::iterator it = _signalers.begin (),
-                                                 end = _signalers.end ();
-             it != end; ++it) {
-            (*it)->send ();
-        }
-    }
-
-    _sync->unlock ();
-}
-
-int zmq::mailbox_safe_t::recv (command_t *cmd_, int timeout_)
-{
-    //  Try to get the command straight away.
-    if (_cpipe.read (cmd_))
-        return 0;
-
-    //  If the timeout is zero, it will be quicker to release the lock, giving other a chance to send a command
-    //  and immediately relock it.
-    if (timeout_ == 0) {
-        _sync->unlock ();
-        _sync->lock ();
-    } else {
-        //  Wait for signal from the command sender.
-        const int rc = _cond_var.wait (_sync, timeout_);
-        if (rc == -1) {
-            errno_assert (errno == EAGAIN || errno == EINTR);
-            return -1;
-        }
-    }
-
-    //  Another thread may already fetch the command
-    const bool ok = _cpipe.read (cmd_);
-
-    if (!ok) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/src/mailbox_safe.hpp b/src/mailbox_safe.hpp
deleted file mode 100644
index 04dbf1409..000000000
--- a/src/mailbox_safe.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MAILBOX_SAFE_HPP_INCLUDED__
-#define __ZMQ_MAILBOX_SAFE_HPP_INCLUDED__
-
-#include <vector>
-#include <stddef.h>
-
-#include "signaler.hpp"
-#include "fd.hpp"
-#include "config.hpp"
-#include "command.hpp"
-#include "ypipe.hpp"
-#include "mutex.hpp"
-#include "i_mailbox.hpp"
-#include "condition_variable.hpp"
-
-namespace zmq
-{
-class mailbox_safe_t ZMQ_FINAL : public i_mailbox
-{
-  public:
-    mailbox_safe_t (mutex_t *sync_);
-    ~mailbox_safe_t ();
-
-    void send (const command_t &cmd_);
-    int recv (command_t *cmd_, int timeout_);
-
-    // Add signaler to mailbox which will be called when a message is ready
-    void add_signaler (signaler_t *signaler_);
-    void remove_signaler (signaler_t *signaler_);
-    void clear_signalers ();
-
-#ifdef HAVE_FORK
-    // close the file descriptors in the signaller. This is used in a forked
-    // child process to close the file descriptors so that they do not interfere
-    // with the context in the parent process.
-    void forked () ZMQ_FINAL
-    {
-        // TODO: call fork on the condition variable
-    }
-#endif
-
-  private:
-    //  The pipe to store actual commands.
-    typedef ypipe_t<command_t, command_pipe_granularity> cpipe_t;
-    cpipe_t _cpipe;
-
-    //  Condition variable to pass signals from writer thread to reader thread.
-    condition_variable_t _cond_var;
-
-    //  Synchronize access to the mailbox from receivers and senders
-    mutex_t *const _sync;
-
-    std::vector<zmq::signaler_t *> _signalers;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mailbox_safe_t)
-};
-}
-
-#endif
diff --git a/src/mechanism.cpp b/src/mechanism.cpp
deleted file mode 100644
index 0d46c11ea..000000000
--- a/src/mechanism.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-#include <limits.h>
-
-#include "mechanism.hpp"
-#include "options.hpp"
-#include "msg.hpp"
-#include "err.hpp"
-#include "wire.hpp"
-#include "session_base.hpp"
-
-zmq::mechanism_t::mechanism_t (const options_t &options_) : options (options_)
-{
-}
-
-zmq::mechanism_t::~mechanism_t ()
-{
-}
-
-void zmq::mechanism_t::set_peer_routing_id (const void *id_ptr_,
-                                            size_t id_size_)
-{
-    _routing_id.set (static_cast<const unsigned char *> (id_ptr_), id_size_);
-}
-
-void zmq::mechanism_t::peer_routing_id (msg_t *msg_)
-{
-    const int rc = msg_->init_size (_routing_id.size ());
-    errno_assert (rc == 0);
-    memcpy (msg_->data (), _routing_id.data (), _routing_id.size ());
-    msg_->set_flags (msg_t::routing_id);
-}
-
-void zmq::mechanism_t::set_user_id (const void *user_id_, size_t size_)
-{
-    _user_id.set (static_cast<const unsigned char *> (user_id_), size_);
-    _zap_properties.ZMQ_MAP_INSERT_OR_EMPLACE (
-      std::string (ZMQ_MSG_PROPERTY_USER_ID),
-      std::string (reinterpret_cast<const char *> (user_id_), size_));
-}
-
-const zmq::blob_t &zmq::mechanism_t::get_user_id () const
-{
-    return _user_id;
-}
-
-const char socket_type_pair[] = "PAIR";
-const char socket_type_pub[] = "PUB";
-const char socket_type_sub[] = "SUB";
-const char socket_type_req[] = "REQ";
-const char socket_type_rep[] = "REP";
-const char socket_type_dealer[] = "DEALER";
-const char socket_type_router[] = "ROUTER";
-const char socket_type_pull[] = "PULL";
-const char socket_type_push[] = "PUSH";
-const char socket_type_xpub[] = "XPUB";
-const char socket_type_xsub[] = "XSUB";
-const char socket_type_stream[] = "STREAM";
-#ifdef ZMQ_BUILD_DRAFT_API
-const char socket_type_server[] = "SERVER";
-const char socket_type_client[] = "CLIENT";
-const char socket_type_radio[] = "RADIO";
-const char socket_type_dish[] = "DISH";
-const char socket_type_gather[] = "GATHER";
-const char socket_type_scatter[] = "SCATTER";
-const char socket_type_dgram[] = "DGRAM";
-const char socket_type_peer[] = "PEER";
-const char socket_type_channel[] = "CHANNEL";
-#endif
-
-const char *zmq::mechanism_t::socket_type_string (int socket_type_)
-{
-    // TODO the order must of the names must correspond to the values resp. order of ZMQ_* socket type definitions in zmq.h!
-    static const char *names[] = {socket_type_pair,   socket_type_pub,
-                                  socket_type_sub,    socket_type_req,
-                                  socket_type_rep,    socket_type_dealer,
-                                  socket_type_router, socket_type_pull,
-                                  socket_type_push,   socket_type_xpub,
-                                  socket_type_xsub,   socket_type_stream,
-#ifdef ZMQ_BUILD_DRAFT_API
-                                  socket_type_server, socket_type_client,
-                                  socket_type_radio,  socket_type_dish,
-                                  socket_type_gather, socket_type_scatter,
-                                  socket_type_dgram,  socket_type_peer,
-                                  socket_type_channel
-#endif
-    };
-    static const size_t names_count = sizeof (names) / sizeof (names[0]);
-    zmq_assert (socket_type_ >= 0
-                && socket_type_ < static_cast<int> (names_count));
-    return names[socket_type_];
-}
-
-const size_t name_len_size = sizeof (unsigned char);
-const size_t value_len_size = sizeof (uint32_t);
-
-static size_t property_len (size_t name_len_, size_t value_len_)
-{
-    return name_len_size + name_len_ + value_len_size + value_len_;
-}
-
-static size_t name_len (const char *name_)
-{
-    const size_t name_len = strlen (name_);
-    zmq_assert (name_len <= UCHAR_MAX);
-    return name_len;
-}
-
-size_t zmq::mechanism_t::add_property (unsigned char *ptr_,
-                                       size_t ptr_capacity_,
-                                       const char *name_,
-                                       const void *value_,
-                                       size_t value_len_)
-{
-    const size_t name_len = ::name_len (name_);
-    const size_t total_len = ::property_len (name_len, value_len_);
-    zmq_assert (total_len <= ptr_capacity_);
-
-    *ptr_ = static_cast<unsigned char> (name_len);
-    ptr_ += name_len_size;
-    memcpy (ptr_, name_, name_len);
-    ptr_ += name_len;
-    zmq_assert (value_len_ <= 0x7FFFFFFF);
-    put_uint32 (ptr_, static_cast<uint32_t> (value_len_));
-    ptr_ += value_len_size;
-    memcpy (ptr_, value_, value_len_);
-
-    return total_len;
-}
-
-size_t zmq::mechanism_t::property_len (const char *name_, size_t value_len_)
-{
-    return ::property_len (name_len (name_), value_len_);
-}
-
-#define ZMTP_PROPERTY_SOCKET_TYPE "Socket-Type"
-#define ZMTP_PROPERTY_IDENTITY "Identity"
-
-size_t zmq::mechanism_t::add_basic_properties (unsigned char *ptr_,
-                                               size_t ptr_capacity_) const
-{
-    unsigned char *ptr = ptr_;
-
-    //  Add socket type property
-    const char *socket_type = socket_type_string (options.type);
-    ptr += add_property (ptr, ptr_capacity_, ZMTP_PROPERTY_SOCKET_TYPE,
-                         socket_type, strlen (socket_type));
-
-    //  Add identity (aka routing id) property
-    if (options.type == ZMQ_REQ || options.type == ZMQ_DEALER
-        || options.type == ZMQ_ROUTER) {
-        ptr += add_property (ptr, ptr_capacity_ - (ptr - ptr_),
-                             ZMTP_PROPERTY_IDENTITY, options.routing_id,
-                             options.routing_id_size);
-    }
-
-
-    for (std::map<std::string, std::string>::const_iterator
-           it = options.app_metadata.begin (),
-           end = options.app_metadata.end ();
-         it != end; ++it) {
-        ptr +=
-          add_property (ptr, ptr_capacity_ - (ptr - ptr_), it->first.c_str (),
-                        it->second.c_str (), strlen (it->second.c_str ()));
-    }
-
-    return ptr - ptr_;
-}
-
-size_t zmq::mechanism_t::basic_properties_len () const
-{
-    const char *socket_type = socket_type_string (options.type);
-    size_t meta_len = 0;
-
-    for (std::map<std::string, std::string>::const_iterator
-           it = options.app_metadata.begin (),
-           end = options.app_metadata.end ();
-         it != end; ++it) {
-        meta_len +=
-          property_len (it->first.c_str (), strlen (it->second.c_str ()));
-    }
-
-    return property_len (ZMTP_PROPERTY_SOCKET_TYPE, strlen (socket_type))
-           + meta_len
-           + ((options.type == ZMQ_REQ || options.type == ZMQ_DEALER
-               || options.type == ZMQ_ROUTER)
-                ? property_len (ZMTP_PROPERTY_IDENTITY, options.routing_id_size)
-                : 0);
-}
-
-void zmq::mechanism_t::make_command_with_basic_properties (
-  msg_t *msg_, const char *prefix_, size_t prefix_len_) const
-{
-    const size_t command_size = prefix_len_ + basic_properties_len ();
-    const int rc = msg_->init_size (command_size);
-    errno_assert (rc == 0);
-
-    unsigned char *ptr = static_cast<unsigned char *> (msg_->data ());
-
-    //  Add prefix
-    memcpy (ptr, prefix_, prefix_len_);
-    ptr += prefix_len_;
-
-    add_basic_properties (
-      ptr, command_size - (ptr - static_cast<unsigned char *> (msg_->data ())));
-}
-
-int zmq::mechanism_t::parse_metadata (const unsigned char *ptr_,
-                                      size_t length_,
-                                      bool zap_flag_)
-{
-    size_t bytes_left = length_;
-
-    while (bytes_left > 1) {
-        const size_t name_length = static_cast<size_t> (*ptr_);
-        ptr_ += name_len_size;
-        bytes_left -= name_len_size;
-        if (bytes_left < name_length)
-            break;
-
-        const std::string name =
-          std::string (reinterpret_cast<const char *> (ptr_), name_length);
-        ptr_ += name_length;
-        bytes_left -= name_length;
-        if (bytes_left < value_len_size)
-            break;
-
-        const size_t value_length = static_cast<size_t> (get_uint32 (ptr_));
-        ptr_ += value_len_size;
-        bytes_left -= value_len_size;
-        if (bytes_left < value_length)
-            break;
-
-        const uint8_t *value = ptr_;
-        ptr_ += value_length;
-        bytes_left -= value_length;
-
-        if (name == ZMTP_PROPERTY_IDENTITY && options.recv_routing_id)
-            set_peer_routing_id (value, value_length);
-        else if (name == ZMTP_PROPERTY_SOCKET_TYPE) {
-            if (!check_socket_type (reinterpret_cast<const char *> (value),
-                                    value_length)) {
-                errno = EINVAL;
-                return -1;
-            }
-        } else {
-            const int rc = property (name, value, value_length);
-            if (rc == -1)
-                return -1;
-        }
-        (zap_flag_ ? _zap_properties : _zmtp_properties)
-          .ZMQ_MAP_INSERT_OR_EMPLACE (
-            name,
-            std::string (reinterpret_cast<const char *> (value), value_length));
-    }
-    if (bytes_left > 0) {
-        errno = EPROTO;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::mechanism_t::property (const std::string & /* name_ */,
-                                const void * /* value_ */,
-                                size_t /* length_ */)
-{
-    //  Default implementation does not check
-    //  property values and returns 0 to signal success.
-    return 0;
-}
-
-template <size_t N>
-static bool strequals (const char *actual_type_,
-                       const size_t actual_len_,
-                       const char (&expected_type_)[N])
-{
-    return actual_len_ == N - 1
-           && memcmp (actual_type_, expected_type_, N - 1) == 0;
-}
-
-bool zmq::mechanism_t::check_socket_type (const char *type_,
-                                          const size_t len_) const
-{
-    switch (options.type) {
-        case ZMQ_REQ:
-            return strequals (type_, len_, socket_type_rep)
-                   || strequals (type_, len_, socket_type_router);
-        case ZMQ_REP:
-            return strequals (type_, len_, socket_type_req)
-                   || strequals (type_, len_, socket_type_dealer);
-        case ZMQ_DEALER:
-            return strequals (type_, len_, socket_type_rep)
-                   || strequals (type_, len_, socket_type_dealer)
-                   || strequals (type_, len_, socket_type_router);
-        case ZMQ_ROUTER:
-            return strequals (type_, len_, socket_type_req)
-                   || strequals (type_, len_, socket_type_dealer)
-                   || strequals (type_, len_, socket_type_router);
-        case ZMQ_PUSH:
-            return strequals (type_, len_, socket_type_pull);
-        case ZMQ_PULL:
-            return strequals (type_, len_, socket_type_push);
-        case ZMQ_PUB:
-            return strequals (type_, len_, socket_type_sub)
-                   || strequals (type_, len_, socket_type_xsub);
-        case ZMQ_SUB:
-            return strequals (type_, len_, socket_type_pub)
-                   || strequals (type_, len_, socket_type_xpub);
-        case ZMQ_XPUB:
-            return strequals (type_, len_, socket_type_sub)
-                   || strequals (type_, len_, socket_type_xsub);
-        case ZMQ_XSUB:
-            return strequals (type_, len_, socket_type_pub)
-                   || strequals (type_, len_, socket_type_xpub);
-        case ZMQ_PAIR:
-            return strequals (type_, len_, socket_type_pair);
-#ifdef ZMQ_BUILD_DRAFT_API
-        case ZMQ_SERVER:
-            return strequals (type_, len_, socket_type_client);
-        case ZMQ_CLIENT:
-            return strequals (type_, len_, socket_type_server);
-        case ZMQ_RADIO:
-            return strequals (type_, len_, socket_type_dish);
-        case ZMQ_DISH:
-            return strequals (type_, len_, socket_type_radio);
-        case ZMQ_GATHER:
-            return strequals (type_, len_, socket_type_scatter);
-        case ZMQ_SCATTER:
-            return strequals (type_, len_, socket_type_gather);
-        case ZMQ_DGRAM:
-            return strequals (type_, len_, socket_type_dgram);
-        case ZMQ_PEER:
-            return strequals (type_, len_, socket_type_peer);
-        case ZMQ_CHANNEL:
-            return strequals (type_, len_, socket_type_channel);
-#endif
-        default:
-            break;
-    }
-    return false;
-}
diff --git a/src/mechanism.hpp b/src/mechanism.hpp
deleted file mode 100644
index 13f0ffbe3..000000000
--- a/src/mechanism.hpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MECHANISM_HPP_INCLUDED__
-#define __ZMQ_MECHANISM_HPP_INCLUDED__
-
-#include "stdint.hpp"
-#include "options.hpp"
-#include "blob.hpp"
-#include "metadata.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-//  Abstract class representing security mechanism.
-//  Different mechanism extends this class.
-
-class mechanism_t
-{
-  public:
-    enum status_t
-    {
-        handshaking,
-        ready,
-        error
-    };
-
-    mechanism_t (const options_t &options_);
-
-    virtual ~mechanism_t ();
-
-    //  Prepare next handshake command that is to be sent to the peer.
-    virtual int next_handshake_command (msg_t *msg_) = 0;
-
-    //  Process the handshake command received from the peer.
-    virtual int process_handshake_command (msg_t *msg_) = 0;
-
-    virtual int encode (msg_t *) { return 0; }
-
-    virtual int decode (msg_t *) { return 0; }
-
-    //  Notifies mechanism about availability of ZAP message.
-    virtual int zap_msg_available () { return 0; }
-
-    //  Returns the status of this mechanism.
-    virtual status_t status () const = 0;
-
-    void set_peer_routing_id (const void *id_ptr_, size_t id_size_);
-
-    void peer_routing_id (msg_t *msg_);
-
-    void set_user_id (const void *user_id_, size_t size_);
-
-    const blob_t &get_user_id () const;
-
-    const metadata_t::dict_t &get_zmtp_properties () const
-    {
-        return _zmtp_properties;
-    }
-
-    const metadata_t::dict_t &get_zap_properties () const
-    {
-        return _zap_properties;
-    }
-
-  protected:
-    //  Only used to identify the socket for the Socket-Type
-    //  property in the wire protocol.
-    static const char *socket_type_string (int socket_type_);
-
-    static size_t add_property (unsigned char *ptr_,
-                                size_t ptr_capacity_,
-                                const char *name_,
-                                const void *value_,
-                                size_t value_len_);
-    static size_t property_len (const char *name_, size_t value_len_);
-
-    size_t add_basic_properties (unsigned char *ptr_,
-                                 size_t ptr_capacity_) const;
-    size_t basic_properties_len () const;
-
-    void make_command_with_basic_properties (msg_t *msg_,
-                                             const char *prefix_,
-                                             size_t prefix_len_) const;
-
-    //  Parses a metadata.
-    //  Metadata consists of a list of properties consisting of
-    //  name and value as size-specified strings.
-    //  Returns 0 on success and -1 on error, in which case errno is set.
-    int parse_metadata (const unsigned char *ptr_,
-                        size_t length_,
-                        bool zap_flag_ = false);
-
-    //  This is called by parse_property method whenever it
-    //  parses a new property. The function should return 0
-    //  on success and -1 on error, in which case it should
-    //  set errno. Signaling error prevents parser from
-    //  parsing remaining data.
-    //  Derived classes are supposed to override this
-    //  method to handle custom processing.
-    virtual int
-    property (const std::string &name_, const void *value_, size_t length_);
-
-    const options_t options;
-
-  private:
-    //  Properties received from ZMTP peer.
-    metadata_t::dict_t _zmtp_properties;
-
-    //  Properties received from ZAP server.
-    metadata_t::dict_t _zap_properties;
-
-    blob_t _routing_id;
-
-    blob_t _user_id;
-
-    //  Returns true iff socket associated with the mechanism
-    //  is compatible with a given socket type 'type_'.
-    bool check_socket_type (const char *type_, size_t len_) const;
-};
-}
-
-#endif
diff --git a/src/mechanism_base.cpp b/src/mechanism_base.cpp
deleted file mode 100644
index d51b3695a..000000000
--- a/src/mechanism_base.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "mechanism_base.hpp"
-#include "session_base.hpp"
-
-zmq::mechanism_base_t::mechanism_base_t (session_base_t *const session_,
-                                         const options_t &options_) :
-    mechanism_t (options_),
-    session (session_)
-{
-}
-
-int zmq::mechanism_base_t::check_basic_command_structure (msg_t *msg_) const
-{
-    if (msg_->size () <= 1
-        || msg_->size () <= (static_cast<uint8_t *> (msg_->data ()))[0]) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED);
-        errno = EPROTO;
-        return -1;
-    }
-    return 0;
-}
-
-void zmq::mechanism_base_t::handle_error_reason (const char *error_reason_,
-                                                 size_t error_reason_len_)
-{
-    const size_t status_code_len = 3;
-    const char zero_digit = '0';
-    const size_t significant_digit_index = 0;
-    const size_t first_zero_digit_index = 1;
-    const size_t second_zero_digit_index = 2;
-    const int factor = 100;
-    if (error_reason_len_ == status_code_len
-        && error_reason_[first_zero_digit_index] == zero_digit
-        && error_reason_[second_zero_digit_index] == zero_digit
-        && error_reason_[significant_digit_index] >= '3'
-        && error_reason_[significant_digit_index] <= '5') {
-        // it is a ZAP error status code (300, 400 or 500), so emit an authentication failure event
-        session->get_socket ()->event_handshake_failed_auth (
-          session->get_endpoint (),
-          (error_reason_[significant_digit_index] - zero_digit) * factor);
-    } else {
-        // this is a violation of the ZAP protocol
-        // TODO zmq_assert in this case?
-    }
-}
-
-bool zmq::mechanism_base_t::zap_required () const
-{
-    return !options.zap_domain.empty ();
-}
diff --git a/src/mechanism_base.hpp b/src/mechanism_base.hpp
deleted file mode 100644
index 767f1803c..000000000
--- a/src/mechanism_base.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MECHANISM_BASE_HPP_INCLUDED__
-#define __ZMQ_MECHANISM_BASE_HPP_INCLUDED__
-
-#include "mechanism.hpp"
-
-namespace zmq
-{
-class msg_t;
-
-class mechanism_base_t : public mechanism_t
-{
-  protected:
-    mechanism_base_t (session_base_t *session_, const options_t &options_);
-
-    session_base_t *const session;
-
-    int check_basic_command_structure (msg_t *msg_) const;
-
-    void handle_error_reason (const char *error_reason_,
-                              size_t error_reason_len_);
-
-    bool zap_required () const;
-};
-}
-
-#endif
diff --git a/src/metadata.cpp b/src/metadata.cpp
deleted file mode 100644
index 45a16a600..000000000
--- a/src/metadata.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "metadata.hpp"
-
-zmq::metadata_t::metadata_t (const dict_t &dict_) : _ref_cnt (1), _dict (dict_)
-{
-}
-
-const char *zmq::metadata_t::get (const std::string &property_) const
-{
-    const dict_t::const_iterator it = _dict.find (property_);
-    if (it == _dict.end ()) {
-        /** \todo remove this when support for the deprecated name "Identity" is dropped */
-        if (property_ == "Identity")
-            return get (ZMQ_MSG_PROPERTY_ROUTING_ID);
-
-        return NULL;
-    }
-    return it->second.c_str ();
-}
-
-void zmq::metadata_t::add_ref ()
-{
-    _ref_cnt.add (1);
-}
-
-bool zmq::metadata_t::drop_ref ()
-{
-    return !_ref_cnt.sub (1);
-}
diff --git a/src/metadata.hpp b/src/metadata.hpp
deleted file mode 100644
index b8c145131..000000000
--- a/src/metadata.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_METADATA_HPP_INCLUDED__
-#define __ZMQ_METADATA_HPP_INCLUDED__
-
-#include <map>
-#include <string>
-
-#include "atomic_counter.hpp"
-
-namespace zmq
-{
-class metadata_t
-{
-  public:
-    typedef std::map<std::string, std::string> dict_t;
-
-    metadata_t (const dict_t &dict_);
-
-    //  Returns pointer to property value or NULL if
-    //  property is not found.
-    const char *get (const std::string &property_) const;
-
-    void add_ref ();
-
-    //  Drop reference. Returns true iff the reference
-    //  counter drops to zero.
-    bool drop_ref ();
-
-  private:
-    //  Reference counter.
-    atomic_counter_t _ref_cnt;
-
-    //  Dictionary holding metadata.
-    const dict_t _dict;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (metadata_t)
-};
-}
-
-#endif
diff --git a/src/msg.cpp b/src/msg.cpp
deleted file mode 100644
index 23148523b..000000000
--- a/src/msg.cpp
+++ /dev/null
@@ -1,724 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "msg.hpp"
-
-#include <string.h>
-#include <stdlib.h>
-#include <new>
-
-#include "stdint.hpp"
-#include "likely.hpp"
-#include "metadata.hpp"
-#include "err.hpp"
-
-//  Check whether the sizes of public representation of the message (zmq_msg_t)
-//  and private representation of the message (zmq::msg_t) match.
-
-typedef char
-  zmq_msg_size_check[2 * ((sizeof (zmq::msg_t) == sizeof (zmq_msg_t)) != 0)
-                     - 1];
-
-bool zmq::msg_t::check () const
-{
-    return _u.base.type >= type_min && _u.base.type <= type_max;
-}
-
-int zmq::msg_t::init (void *data_,
-                      size_t size_,
-                      msg_free_fn *ffn_,
-                      void *hint_,
-                      content_t *content_)
-{
-    if (size_ < max_vsm_size) {
-        const int rc = init_size (size_);
-
-        if (rc != -1) {
-            memcpy (data (), data_, size_);
-            return 0;
-        }
-        return -1;
-    }
-    if (content_) {
-        return init_external_storage (content_, data_, size_, ffn_, hint_);
-    }
-    return init_data (data_, size_, ffn_, hint_);
-}
-
-int zmq::msg_t::init ()
-{
-    _u.vsm.metadata = NULL;
-    _u.vsm.type = type_vsm;
-    _u.vsm.flags = 0;
-    _u.vsm.size = 0;
-    _u.vsm.group.sgroup.group[0] = '\0';
-    _u.vsm.group.type = group_type_short;
-    _u.vsm.routing_id = 0;
-    return 0;
-}
-
-int zmq::msg_t::init_size (size_t size_)
-{
-    if (size_ <= max_vsm_size) {
-        _u.vsm.metadata = NULL;
-        _u.vsm.type = type_vsm;
-        _u.vsm.flags = 0;
-        _u.vsm.size = static_cast<unsigned char> (size_);
-        _u.vsm.group.sgroup.group[0] = '\0';
-        _u.vsm.group.type = group_type_short;
-        _u.vsm.routing_id = 0;
-    } else {
-        _u.lmsg.metadata = NULL;
-        _u.lmsg.type = type_lmsg;
-        _u.lmsg.flags = 0;
-        _u.lmsg.group.sgroup.group[0] = '\0';
-        _u.lmsg.group.type = group_type_short;
-        _u.lmsg.routing_id = 0;
-        _u.lmsg.content = NULL;
-        if (sizeof (content_t) + size_ > size_)
-            _u.lmsg.content =
-              static_cast<content_t *> (malloc (sizeof (content_t) + size_));
-        if (unlikely (!_u.lmsg.content)) {
-            errno = ENOMEM;
-            return -1;
-        }
-
-        _u.lmsg.content->data = _u.lmsg.content + 1;
-        _u.lmsg.content->size = size_;
-        _u.lmsg.content->ffn = NULL;
-        _u.lmsg.content->hint = NULL;
-        new (&_u.lmsg.content->refcnt) zmq::atomic_counter_t ();
-    }
-    return 0;
-}
-
-int zmq::msg_t::init_buffer (const void *buf_, size_t size_)
-{
-    const int rc = init_size (size_);
-    if (unlikely (rc < 0)) {
-        return -1;
-    }
-    if (size_) {
-        // NULL and zero size is allowed
-        assert (NULL != buf_);
-        memcpy (data (), buf_, size_);
-    }
-    return 0;
-}
-
-int zmq::msg_t::init_external_storage (content_t *content_,
-                                       void *data_,
-                                       size_t size_,
-                                       msg_free_fn *ffn_,
-                                       void *hint_)
-{
-    zmq_assert (NULL != data_);
-    zmq_assert (NULL != content_);
-
-    _u.zclmsg.metadata = NULL;
-    _u.zclmsg.type = type_zclmsg;
-    _u.zclmsg.flags = 0;
-    _u.zclmsg.group.sgroup.group[0] = '\0';
-    _u.zclmsg.group.type = group_type_short;
-    _u.zclmsg.routing_id = 0;
-
-    _u.zclmsg.content = content_;
-    _u.zclmsg.content->data = data_;
-    _u.zclmsg.content->size = size_;
-    _u.zclmsg.content->ffn = ffn_;
-    _u.zclmsg.content->hint = hint_;
-    new (&_u.zclmsg.content->refcnt) zmq::atomic_counter_t ();
-
-    return 0;
-}
-
-int zmq::msg_t::init_data (void *data_,
-                           size_t size_,
-                           msg_free_fn *ffn_,
-                           void *hint_)
-{
-    //  If data is NULL and size is not 0, a segfault
-    //  would occur once the data is accessed
-    zmq_assert (data_ != NULL || size_ == 0);
-
-    //  Initialize constant message if there's no need to deallocate
-    if (ffn_ == NULL) {
-        _u.cmsg.metadata = NULL;
-        _u.cmsg.type = type_cmsg;
-        _u.cmsg.flags = 0;
-        _u.cmsg.data = data_;
-        _u.cmsg.size = size_;
-        _u.cmsg.group.sgroup.group[0] = '\0';
-        _u.cmsg.group.type = group_type_short;
-        _u.cmsg.routing_id = 0;
-    } else {
-        _u.lmsg.metadata = NULL;
-        _u.lmsg.type = type_lmsg;
-        _u.lmsg.flags = 0;
-        _u.lmsg.group.sgroup.group[0] = '\0';
-        _u.lmsg.group.type = group_type_short;
-        _u.lmsg.routing_id = 0;
-        _u.lmsg.content =
-          static_cast<content_t *> (malloc (sizeof (content_t)));
-        if (!_u.lmsg.content) {
-            errno = ENOMEM;
-            return -1;
-        }
-
-        _u.lmsg.content->data = data_;
-        _u.lmsg.content->size = size_;
-        _u.lmsg.content->ffn = ffn_;
-        _u.lmsg.content->hint = hint_;
-        new (&_u.lmsg.content->refcnt) zmq::atomic_counter_t ();
-    }
-    return 0;
-}
-
-int zmq::msg_t::init_delimiter ()
-{
-    _u.delimiter.metadata = NULL;
-    _u.delimiter.type = type_delimiter;
-    _u.delimiter.flags = 0;
-    _u.delimiter.group.sgroup.group[0] = '\0';
-    _u.delimiter.group.type = group_type_short;
-    _u.delimiter.routing_id = 0;
-    return 0;
-}
-
-int zmq::msg_t::init_join ()
-{
-    _u.base.metadata = NULL;
-    _u.base.type = type_join;
-    _u.base.flags = 0;
-    _u.base.group.sgroup.group[0] = '\0';
-    _u.base.group.type = group_type_short;
-    _u.base.routing_id = 0;
-    return 0;
-}
-
-int zmq::msg_t::init_leave ()
-{
-    _u.base.metadata = NULL;
-    _u.base.type = type_leave;
-    _u.base.flags = 0;
-    _u.base.group.sgroup.group[0] = '\0';
-    _u.base.group.type = group_type_short;
-    _u.base.routing_id = 0;
-    return 0;
-}
-
-int zmq::msg_t::init_subscribe (const size_t size_, const unsigned char *topic_)
-{
-    int rc = init_size (size_);
-    if (rc == 0) {
-        set_flags (zmq::msg_t::subscribe);
-
-        //  We explicitly allow a NULL subscription with size zero
-        if (size_) {
-            assert (topic_);
-            memcpy (data (), topic_, size_);
-        }
-    }
-    return rc;
-}
-
-int zmq::msg_t::init_cancel (const size_t size_, const unsigned char *topic_)
-{
-    int rc = init_size (size_);
-    if (rc == 0) {
-        set_flags (zmq::msg_t::cancel);
-
-        //  We explicitly allow a NULL subscription with size zero
-        if (size_) {
-            assert (topic_);
-            memcpy (data (), topic_, size_);
-        }
-    }
-    return rc;
-}
-
-int zmq::msg_t::close ()
-{
-    //  Check the validity of the message.
-    if (unlikely (!check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    if (_u.base.type == type_lmsg) {
-        //  If the content is not shared, or if it is shared and the reference
-        //  count has dropped to zero, deallocate it.
-        if (!(_u.lmsg.flags & msg_t::shared)
-            || !_u.lmsg.content->refcnt.sub (1)) {
-            //  We used "placement new" operator to initialize the reference
-            //  counter so we call the destructor explicitly now.
-            _u.lmsg.content->refcnt.~atomic_counter_t ();
-
-            if (_u.lmsg.content->ffn)
-                _u.lmsg.content->ffn (_u.lmsg.content->data,
-                                      _u.lmsg.content->hint);
-            free (_u.lmsg.content);
-        }
-    }
-
-    if (is_zcmsg ()) {
-        zmq_assert (_u.zclmsg.content->ffn);
-
-        //  If the content is not shared, or if it is shared and the reference
-        //  count has dropped to zero, deallocate it.
-        if (!(_u.zclmsg.flags & msg_t::shared)
-            || !_u.zclmsg.content->refcnt.sub (1)) {
-            //  We used "placement new" operator to initialize the reference
-            //  counter so we call the destructor explicitly now.
-            _u.zclmsg.content->refcnt.~atomic_counter_t ();
-
-            _u.zclmsg.content->ffn (_u.zclmsg.content->data,
-                                    _u.zclmsg.content->hint);
-        }
-    }
-
-    if (_u.base.metadata != NULL) {
-        if (_u.base.metadata->drop_ref ()) {
-            LIBZMQ_DELETE (_u.base.metadata);
-        }
-        _u.base.metadata = NULL;
-    }
-
-    if (_u.base.group.type == group_type_long) {
-        if (!_u.base.group.lgroup.content->refcnt.sub (1)) {
-            //  We used "placement new" operator to initialize the reference
-            //  counter so we call the destructor explicitly now.
-            _u.base.group.lgroup.content->refcnt.~atomic_counter_t ();
-
-            free (_u.base.group.lgroup.content);
-        }
-    }
-
-    //  Make the message invalid.
-    _u.base.type = 0;
-
-    return 0;
-}
-
-int zmq::msg_t::move (msg_t &src_)
-{
-    //  Check the validity of the source.
-    if (unlikely (!src_.check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    int rc = close ();
-    if (unlikely (rc < 0))
-        return rc;
-
-    *this = src_;
-
-    rc = src_.init ();
-    if (unlikely (rc < 0))
-        return rc;
-
-    return 0;
-}
-
-int zmq::msg_t::copy (msg_t &src_)
-{
-    //  Check the validity of the source.
-    if (unlikely (!src_.check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    const int rc = close ();
-    if (unlikely (rc < 0))
-        return rc;
-
-    // The initial reference count, when a non-shared message is initially
-    // shared (between the original and the copy we create here).
-    const atomic_counter_t::integer_t initial_shared_refcnt = 2;
-
-    if (src_.is_lmsg () || src_.is_zcmsg ()) {
-        //  One reference is added to shared messages. Non-shared messages
-        //  are turned into shared messages.
-        if (src_.flags () & msg_t::shared)
-            src_.refcnt ()->add (1);
-        else {
-            src_.set_flags (msg_t::shared);
-            src_.refcnt ()->set (initial_shared_refcnt);
-        }
-    }
-
-    if (src_._u.base.metadata != NULL)
-        src_._u.base.metadata->add_ref ();
-
-    if (src_._u.base.group.type == group_type_long)
-        src_._u.base.group.lgroup.content->refcnt.add (1);
-
-    *this = src_;
-
-    return 0;
-}
-
-void *zmq::msg_t::data ()
-{
-    //  Check the validity of the message.
-    zmq_assert (check ());
-
-    switch (_u.base.type) {
-        case type_vsm:
-            return _u.vsm.data;
-        case type_lmsg:
-            return _u.lmsg.content->data;
-        case type_cmsg:
-            return _u.cmsg.data;
-        case type_zclmsg:
-            return _u.zclmsg.content->data;
-        default:
-            zmq_assert (false);
-            return NULL;
-    }
-}
-
-size_t zmq::msg_t::size () const
-{
-    //  Check the validity of the message.
-    zmq_assert (check ());
-
-    switch (_u.base.type) {
-        case type_vsm:
-            return _u.vsm.size;
-        case type_lmsg:
-            return _u.lmsg.content->size;
-        case type_zclmsg:
-            return _u.zclmsg.content->size;
-        case type_cmsg:
-            return _u.cmsg.size;
-        default:
-            zmq_assert (false);
-            return 0;
-    }
-}
-
-void zmq::msg_t::shrink (size_t new_size_)
-{
-    //  Check the validity of the message.
-    zmq_assert (check ());
-    zmq_assert (new_size_ <= size ());
-
-    switch (_u.base.type) {
-        case type_vsm:
-            _u.vsm.size = static_cast<unsigned char> (new_size_);
-            break;
-        case type_lmsg:
-            _u.lmsg.content->size = new_size_;
-            break;
-        case type_zclmsg:
-            _u.zclmsg.content->size = new_size_;
-            break;
-        case type_cmsg:
-            _u.cmsg.size = new_size_;
-            break;
-        default:
-            zmq_assert (false);
-    }
-}
-
-unsigned char zmq::msg_t::flags () const
-{
-    return _u.base.flags;
-}
-
-void zmq::msg_t::set_flags (unsigned char flags_)
-{
-    _u.base.flags |= flags_;
-}
-
-void zmq::msg_t::reset_flags (unsigned char flags_)
-{
-    _u.base.flags &= ~flags_;
-}
-
-zmq::metadata_t *zmq::msg_t::metadata () const
-{
-    return _u.base.metadata;
-}
-
-void zmq::msg_t::set_metadata (zmq::metadata_t *metadata_)
-{
-    assert (metadata_ != NULL);
-    assert (_u.base.metadata == NULL);
-    metadata_->add_ref ();
-    _u.base.metadata = metadata_;
-}
-
-void zmq::msg_t::reset_metadata ()
-{
-    if (_u.base.metadata) {
-        if (_u.base.metadata->drop_ref ()) {
-            LIBZMQ_DELETE (_u.base.metadata);
-        }
-        _u.base.metadata = NULL;
-    }
-}
-
-bool zmq::msg_t::is_routing_id () const
-{
-    return (_u.base.flags & routing_id) == routing_id;
-}
-
-bool zmq::msg_t::is_credential () const
-{
-    return (_u.base.flags & credential) == credential;
-}
-
-bool zmq::msg_t::is_delimiter () const
-{
-    return _u.base.type == type_delimiter;
-}
-
-bool zmq::msg_t::is_vsm () const
-{
-    return _u.base.type == type_vsm;
-}
-
-bool zmq::msg_t::is_cmsg () const
-{
-    return _u.base.type == type_cmsg;
-}
-
-bool zmq::msg_t::is_lmsg () const
-{
-    return _u.base.type == type_lmsg;
-}
-
-bool zmq::msg_t::is_zcmsg () const
-{
-    return _u.base.type == type_zclmsg;
-}
-
-bool zmq::msg_t::is_join () const
-{
-    return _u.base.type == type_join;
-}
-
-bool zmq::msg_t::is_leave () const
-{
-    return _u.base.type == type_leave;
-}
-
-bool zmq::msg_t::is_ping () const
-{
-    return (_u.base.flags & CMD_TYPE_MASK) == ping;
-}
-
-bool zmq::msg_t::is_pong () const
-{
-    return (_u.base.flags & CMD_TYPE_MASK) == pong;
-}
-
-bool zmq::msg_t::is_close_cmd () const
-{
-    return (_u.base.flags & CMD_TYPE_MASK) == close_cmd;
-}
-
-size_t zmq::msg_t::command_body_size () const
-{
-    if (this->is_ping () || this->is_pong ())
-        return this->size () - ping_cmd_name_size;
-    else if (!(this->flags () & msg_t::command)
-             && (this->is_subscribe () || this->is_cancel ()))
-        return this->size ();
-    else if (this->is_subscribe ())
-        return this->size () - sub_cmd_name_size;
-    else if (this->is_cancel ())
-        return this->size () - cancel_cmd_name_size;
-
-    return 0;
-}
-
-void *zmq::msg_t::command_body ()
-{
-    unsigned char *data = NULL;
-
-    if (this->is_ping () || this->is_pong ())
-        data =
-          static_cast<unsigned char *> (this->data ()) + ping_cmd_name_size;
-    //  With inproc, command flag is not set for sub/cancel
-    else if (!(this->flags () & msg_t::command)
-             && (this->is_subscribe () || this->is_cancel ()))
-        data = static_cast<unsigned char *> (this->data ());
-    else if (this->is_subscribe ())
-        data = static_cast<unsigned char *> (this->data ()) + sub_cmd_name_size;
-    else if (this->is_cancel ())
-        data =
-          static_cast<unsigned char *> (this->data ()) + cancel_cmd_name_size;
-
-    return data;
-}
-
-void zmq::msg_t::add_refs (int refs_)
-{
-    zmq_assert (refs_ >= 0);
-
-    //  Operation not supported for messages with metadata.
-    zmq_assert (_u.base.metadata == NULL);
-
-    //  No copies required.
-    if (!refs_)
-        return;
-
-    //  VSMs, CMSGS and delimiters can be copied straight away. The only
-    //  message type that needs special care are long messages.
-    if (_u.base.type == type_lmsg || is_zcmsg ()) {
-        if (_u.base.flags & msg_t::shared)
-            refcnt ()->add (refs_);
-        else {
-            refcnt ()->set (refs_ + 1);
-            _u.base.flags |= msg_t::shared;
-        }
-    }
-}
-
-bool zmq::msg_t::rm_refs (int refs_)
-{
-    zmq_assert (refs_ >= 0);
-
-    //  Operation not supported for messages with metadata.
-    zmq_assert (_u.base.metadata == NULL);
-
-    //  No copies required.
-    if (!refs_)
-        return true;
-
-    //  If there's only one reference close the message.
-    if ((_u.base.type != type_zclmsg && _u.base.type != type_lmsg)
-        || !(_u.base.flags & msg_t::shared)) {
-        close ();
-        return false;
-    }
-
-    //  The only message type that needs special care are long and zcopy messages.
-    if (_u.base.type == type_lmsg && !_u.lmsg.content->refcnt.sub (refs_)) {
-        //  We used "placement new" operator to initialize the reference
-        //  counter so we call the destructor explicitly now.
-        _u.lmsg.content->refcnt.~atomic_counter_t ();
-
-        if (_u.lmsg.content->ffn)
-            _u.lmsg.content->ffn (_u.lmsg.content->data, _u.lmsg.content->hint);
-        free (_u.lmsg.content);
-
-        return false;
-    }
-
-    if (is_zcmsg () && !_u.zclmsg.content->refcnt.sub (refs_)) {
-        // storage for rfcnt is provided externally
-        if (_u.zclmsg.content->ffn) {
-            _u.zclmsg.content->ffn (_u.zclmsg.content->data,
-                                    _u.zclmsg.content->hint);
-        }
-
-        return false;
-    }
-
-    return true;
-}
-
-uint32_t zmq::msg_t::get_routing_id () const
-{
-    return _u.base.routing_id;
-}
-
-int zmq::msg_t::set_routing_id (uint32_t routing_id_)
-{
-    if (routing_id_) {
-        _u.base.routing_id = routing_id_;
-        return 0;
-    }
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::msg_t::reset_routing_id ()
-{
-    _u.base.routing_id = 0;
-    return 0;
-}
-
-const char *zmq::msg_t::group () const
-{
-    if (_u.base.group.type == group_type_long)
-        return _u.base.group.lgroup.content->group;
-    return _u.base.group.sgroup.group;
-}
-
-int zmq::msg_t::set_group (const char *group_)
-{
-    size_t length = strnlen (group_, ZMQ_GROUP_MAX_LENGTH);
-
-    return set_group (group_, length);
-}
-
-int zmq::msg_t::set_group (const char *group_, size_t length_)
-{
-    if (length_ > ZMQ_GROUP_MAX_LENGTH) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (length_ > 14) {
-        _u.base.group.lgroup.type = group_type_long;
-        _u.base.group.lgroup.content =
-          (long_group_t *) malloc (sizeof (long_group_t));
-        assert (_u.base.group.lgroup.content);
-        new (&_u.base.group.lgroup.content->refcnt) zmq::atomic_counter_t ();
-        _u.base.group.lgroup.content->refcnt.set (1);
-        strncpy (_u.base.group.lgroup.content->group, group_, length_);
-        _u.base.group.lgroup.content->group[length_] = '\0';
-    } else {
-        strncpy (_u.base.group.sgroup.group, group_, length_);
-        _u.base.group.sgroup.group[length_] = '\0';
-    }
-
-    return 0;
-}
-
-zmq::atomic_counter_t *zmq::msg_t::refcnt ()
-{
-    switch (_u.base.type) {
-        case type_lmsg:
-            return &_u.lmsg.content->refcnt;
-        case type_zclmsg:
-            return &_u.zclmsg.content->refcnt;
-        default:
-            zmq_assert (false);
-            return NULL;
-    }
-}
diff --git a/src/msg.hpp b/src/msg.hpp
deleted file mode 100644
index d956b2ac8..000000000
--- a/src/msg.hpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MSG_HPP_INCLUDE__
-#define __ZMQ_MSG_HPP_INCLUDE__
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include "config.hpp"
-#include "err.hpp"
-#include "fd.hpp"
-#include "atomic_counter.hpp"
-#include "metadata.hpp"
-
-//  bits 2-5
-#define CMD_TYPE_MASK 0x1c
-
-//  Signature for free function to deallocate the message content.
-//  Note that it has to be declared as "C" so that it is the same as
-//  zmq_free_fn defined in zmq.h.
-extern "C" {
-typedef void(msg_free_fn) (void *data_, void *hint_);
-}
-
-namespace zmq
-{
-//  Note that this structure needs to be explicitly constructed
-//  (init functions) and destructed (close function).
-
-static const char cancel_cmd_name[] = "\6CANCEL";
-static const char sub_cmd_name[] = "\x9SUBSCRIBE";
-
-class msg_t
-{
-  public:
-    //  Shared message buffer. Message data are either allocated in one
-    //  continuous block along with this structure - thus avoiding one
-    //  malloc/free pair or they are stored in user-supplied memory.
-    //  In the latter case, ffn member stores pointer to the function to be
-    //  used to deallocate the data. If the buffer is actually shared (there
-    //  are at least 2 references to it) refcount member contains number of
-    //  references.
-    struct content_t
-    {
-        void *data;
-        size_t size;
-        msg_free_fn *ffn;
-        void *hint;
-        zmq::atomic_counter_t refcnt;
-    };
-
-    //  Message flags.
-    enum
-    {
-        more = 1,    //  Followed by more parts
-        command = 2, //  Command frame (see ZMTP spec)
-        //  Command types, use only bits 2-5 and compare with ==, not bitwise,
-        //  a command can never be of more that one type at the same time
-        ping = 4,
-        pong = 8,
-        subscribe = 12,
-        cancel = 16,
-        close_cmd = 20,
-        credential = 32,
-        routing_id = 64,
-        shared = 128
-    };
-
-    bool check () const;
-    int init ();
-
-    int init (void *data_,
-              size_t size_,
-              msg_free_fn *ffn_,
-              void *hint_,
-              content_t *content_ = NULL);
-
-    int init_size (size_t size_);
-    int init_buffer (const void *buf_, size_t size_);
-    int init_data (void *data_, size_t size_, msg_free_fn *ffn_, void *hint_);
-    int init_external_storage (content_t *content_,
-                               void *data_,
-                               size_t size_,
-                               msg_free_fn *ffn_,
-                               void *hint_);
-    int init_delimiter ();
-    int init_join ();
-    int init_leave ();
-    int init_subscribe (const size_t size_, const unsigned char *topic);
-    int init_cancel (const size_t size_, const unsigned char *topic);
-    int close ();
-    int move (msg_t &src_);
-    int copy (msg_t &src_);
-    void *data ();
-    size_t size () const;
-    unsigned char flags () const;
-    void set_flags (unsigned char flags_);
-    void reset_flags (unsigned char flags_);
-    metadata_t *metadata () const;
-    void set_metadata (metadata_t *metadata_);
-    void reset_metadata ();
-    bool is_routing_id () const;
-    bool is_credential () const;
-    bool is_delimiter () const;
-    bool is_join () const;
-    bool is_leave () const;
-    bool is_ping () const;
-    bool is_pong () const;
-    bool is_close_cmd () const;
-
-    //  These are called on each message received by the session_base class,
-    //  so get them inlined to avoid the overhead of 2 function calls per msg
-    bool is_subscribe () const
-    {
-        return (_u.base.flags & CMD_TYPE_MASK) == subscribe;
-    }
-
-    bool is_cancel () const
-    {
-        return (_u.base.flags & CMD_TYPE_MASK) == cancel;
-    }
-
-    size_t command_body_size () const;
-    void *command_body ();
-    bool is_vsm () const;
-    bool is_cmsg () const;
-    bool is_lmsg () const;
-    bool is_zcmsg () const;
-    uint32_t get_routing_id () const;
-    int set_routing_id (uint32_t routing_id_);
-    int reset_routing_id ();
-    const char *group () const;
-    int set_group (const char *group_);
-    int set_group (const char *, size_t length_);
-
-    //  After calling this function you can copy the message in POD-style
-    //  refs_ times. No need to call copy.
-    void add_refs (int refs_);
-
-    //  Removes references previously added by add_refs. If the number of
-    //  references drops to 0, the message is closed and false is returned.
-    bool rm_refs (int refs_);
-
-    void shrink (size_t new_size_);
-
-    //  Size in bytes of the largest message that is still copied around
-    //  rather than being reference-counted.
-    enum
-    {
-        msg_t_size = 64
-    };
-    enum
-    {
-        max_vsm_size =
-          msg_t_size - (sizeof (metadata_t *) + 3 + 16 + sizeof (uint32_t))
-    };
-    enum
-    {
-        ping_cmd_name_size = 5,   // 4PING
-        cancel_cmd_name_size = 7, // 6CANCEL
-        sub_cmd_name_size = 10    // 9SUBSCRIBE
-    };
-
-  private:
-    zmq::atomic_counter_t *refcnt ();
-
-    //  Different message types.
-    enum type_t
-    {
-        type_min = 101,
-        //  VSM messages store the content in the message itself
-        type_vsm = 101,
-        //  LMSG messages store the content in malloc-ed memory
-        type_lmsg = 102,
-        //  Delimiter messages are used in envelopes
-        type_delimiter = 103,
-        //  CMSG messages point to constant data
-        type_cmsg = 104,
-
-        // zero-copy LMSG message for v2_decoder
-        type_zclmsg = 105,
-
-        //  Join message for radio_dish
-        type_join = 106,
-
-        //  Leave message for radio_dish
-        type_leave = 107,
-
-        type_max = 107
-    };
-
-    enum group_type_t
-    {
-        group_type_short,
-        group_type_long
-    };
-
-    struct long_group_t
-    {
-        char group[ZMQ_GROUP_MAX_LENGTH + 1];
-        atomic_counter_t refcnt;
-    };
-
-    union group_t
-    {
-        unsigned char type;
-        struct
-        {
-            unsigned char type;
-            char group[15];
-        } sgroup;
-        struct
-        {
-            unsigned char type;
-            long_group_t *content;
-        } lgroup;
-    };
-
-    //  Note that fields shared between different message types are not
-    //  moved to the parent class (msg_t). This way we get tighter packing
-    //  of the data. Shared fields can be accessed via 'base' member of
-    //  the union.
-    union
-    {
-        struct
-        {
-            metadata_t *metadata;
-            unsigned char unused[msg_t_size
-                                 - (sizeof (metadata_t *) + 2
-                                    + sizeof (uint32_t) + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } base;
-        struct
-        {
-            metadata_t *metadata;
-            unsigned char data[max_vsm_size];
-            unsigned char size;
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } vsm;
-        struct
-        {
-            metadata_t *metadata;
-            content_t *content;
-            unsigned char
-              unused[msg_t_size
-                     - (sizeof (metadata_t *) + sizeof (content_t *) + 2
-                        + sizeof (uint32_t) + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } lmsg;
-        struct
-        {
-            metadata_t *metadata;
-            content_t *content;
-            unsigned char
-              unused[msg_t_size
-                     - (sizeof (metadata_t *) + sizeof (content_t *) + 2
-                        + sizeof (uint32_t) + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } zclmsg;
-        struct
-        {
-            metadata_t *metadata;
-            void *data;
-            size_t size;
-            unsigned char unused[msg_t_size
-                                 - (sizeof (metadata_t *) + sizeof (void *)
-                                    + sizeof (size_t) + 2 + sizeof (uint32_t)
-                                    + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } cmsg;
-        struct
-        {
-            metadata_t *metadata;
-            unsigned char unused[msg_t_size
-                                 - (sizeof (metadata_t *) + 2
-                                    + sizeof (uint32_t) + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } delimiter;
-    } _u;
-};
-
-inline int close_and_return (zmq::msg_t *msg_, int echo_)
-{
-    // Since we abort on close failure we preserve errno for success case.
-    const int err = errno;
-    const int rc = msg_->close ();
-    errno_assert (rc == 0);
-    errno = err;
-    return echo_;
-}
-
-inline int close_and_return (zmq::msg_t msg_[], int count_, int echo_)
-{
-    for (int i = 0; i < count_; i++)
-        close_and_return (&msg_[i], 0);
-    return echo_;
-}
-}
-
-#endif
diff --git a/src/mtrie.cpp b/src/mtrie.cpp
deleted file mode 100644
index 30a84e324..000000000
--- a/src/mtrie.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "mtrie.hpp"
-#include "generic_mtrie_impl.hpp"
-
-namespace zmq
-{
-template class generic_mtrie_t<pipe_t>;
-}
diff --git a/src/mtrie.hpp b/src/mtrie.hpp
deleted file mode 100644
index b5ca3ac0f..000000000
--- a/src/mtrie.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MTRIE_HPP_INCLUDED__
-#define __ZMQ_MTRIE_HPP_INCLUDED__
-
-#include "generic_mtrie.hpp"
-
-#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER > 1600)
-#define ZMQ_HAS_EXTERN_TEMPLATE 1
-#else
-#define ZMQ_HAS_EXTERN_TEMPLATE 0
-#endif
-
-namespace zmq
-{
-class pipe_t;
-
-#if ZMQ_HAS_EXTERN_TEMPLATE
-extern template class generic_mtrie_t<pipe_t>;
-#endif
-
-typedef generic_mtrie_t<pipe_t> mtrie_t;
-}
-
-#endif
diff --git a/src/mutex.hpp b/src/mutex.hpp
deleted file mode 100644
index 8ff02269c..000000000
--- a/src/mutex.hpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MUTEX_HPP_INCLUDED__
-#define __ZMQ_MUTEX_HPP_INCLUDED__
-
-#include "err.hpp"
-#include "macros.hpp"
-
-//  Mutex class encapsulates OS mutex in a platform-independent way.
-
-#ifdef ZMQ_HAVE_WINDOWS
-
-#include "windows.hpp"
-
-namespace zmq
-{
-class mutex_t
-{
-  public:
-    mutex_t () { InitializeCriticalSection (&_cs); }
-
-    ~mutex_t () { DeleteCriticalSection (&_cs); }
-
-    void lock () { EnterCriticalSection (&_cs); }
-
-    bool try_lock () { return (TryEnterCriticalSection (&_cs)) ? true : false; }
-
-    void unlock () { LeaveCriticalSection (&_cs); }
-
-    CRITICAL_SECTION *get_cs () { return &_cs; }
-
-  private:
-    CRITICAL_SECTION _cs;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mutex_t)
-};
-}
-
-#elif defined ZMQ_HAVE_VXWORKS
-
-#include <vxWorks.h>
-#include <semLib.h>
-
-namespace zmq
-{
-class mutex_t
-{
-  public:
-    inline mutex_t ()
-    {
-        _semId =
-          semMCreate (SEM_Q_PRIORITY | SEM_INVERSION_SAFE | SEM_DELETE_SAFE);
-    }
-
-    inline ~mutex_t () { semDelete (_semId); }
-
-    inline void lock () { semTake (_semId, WAIT_FOREVER); }
-
-    inline bool try_lock ()
-    {
-        if (semTake (_semId, NO_WAIT) == OK) {
-            return true;
-        }
-        return false;
-    }
-
-    inline void unlock () { semGive (_semId); }
-
-  private:
-    SEM_ID _semId;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mutex_t)
-};
-}
-
-#else
-
-#include <pthread.h>
-
-namespace zmq
-{
-class mutex_t
-{
-  public:
-    inline mutex_t ()
-    {
-        int rc = pthread_mutexattr_init (&_attr);
-        posix_assert (rc);
-
-        rc = pthread_mutexattr_settype (&_attr, PTHREAD_MUTEX_RECURSIVE);
-        posix_assert (rc);
-
-        rc = pthread_mutex_init (&_mutex, &_attr);
-        posix_assert (rc);
-    }
-
-    inline ~mutex_t ()
-    {
-        int rc = pthread_mutex_destroy (&_mutex);
-        posix_assert (rc);
-
-        rc = pthread_mutexattr_destroy (&_attr);
-        posix_assert (rc);
-    }
-
-    inline void lock ()
-    {
-        int rc = pthread_mutex_lock (&_mutex);
-        posix_assert (rc);
-    }
-
-    inline bool try_lock ()
-    {
-        int rc = pthread_mutex_trylock (&_mutex);
-        if (rc == EBUSY)
-            return false;
-
-        posix_assert (rc);
-        return true;
-    }
-
-    inline void unlock ()
-    {
-        int rc = pthread_mutex_unlock (&_mutex);
-        posix_assert (rc);
-    }
-
-    inline pthread_mutex_t *get_mutex () { return &_mutex; }
-
-  private:
-    pthread_mutex_t _mutex;
-    pthread_mutexattr_t _attr;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mutex_t)
-};
-}
-
-#endif
-
-
-namespace zmq
-{
-struct scoped_lock_t
-{
-    scoped_lock_t (mutex_t &mutex_) : _mutex (mutex_) { _mutex.lock (); }
-
-    ~scoped_lock_t () { _mutex.unlock (); }
-
-  private:
-    mutex_t &_mutex;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (scoped_lock_t)
-};
-
-
-struct scoped_optional_lock_t
-{
-    scoped_optional_lock_t (mutex_t *mutex_) : _mutex (mutex_)
-    {
-        if (_mutex != NULL)
-            _mutex->lock ();
-    }
-
-    ~scoped_optional_lock_t ()
-    {
-        if (_mutex != NULL)
-            _mutex->unlock ();
-    }
-
-  private:
-    mutex_t *_mutex;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (scoped_optional_lock_t)
-};
-}
-
-#endif
diff --git a/src/norm_engine.cpp b/src/norm_engine.cpp
deleted file mode 100644
index f2166fdc9..000000000
--- a/src/norm_engine.cpp
+++ /dev/null
@@ -1,721 +0,0 @@
-
-#include "precompiled.hpp"
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_NORM
-
-#include "norm_engine.hpp"
-#include "session_base.hpp"
-#include "v2_protocol.hpp"
-
-zmq::norm_engine_t::norm_engine_t (io_thread_t *parent_,
-                                   const options_t &options_) :
-    io_object_t (parent_),
-    zmq_session (NULL),
-    options (options_),
-    norm_instance (NORM_INSTANCE_INVALID),
-    norm_session (NORM_SESSION_INVALID),
-    is_sender (false),
-    is_receiver (false),
-    zmq_encoder (0),
-    norm_tx_stream (NORM_OBJECT_INVALID),
-    tx_first_msg (true),
-    tx_more_bit (false),
-    zmq_output_ready (false),
-    norm_tx_ready (false),
-    tx_index (0),
-    tx_len (0),
-    zmq_input_ready (false)
-{
-    int rc = tx_msg.init ();
-    errno_assert (0 == rc);
-}
-
-zmq::norm_engine_t::~norm_engine_t ()
-{
-    shutdown (); // in case it was not already called
-}
-
-
-int zmq::norm_engine_t::init (const char *network_, bool send, bool recv)
-{
-    // Parse the "network_" address int "iface", "addr", and "port"
-    // norm endpoint format: [id,][<iface>;]<addr>:<port>
-    // First, look for optional local NormNodeId
-    // (default NORM_NODE_ANY causes NORM to use host IP addr for NormNodeId)
-    NormNodeId localId = NORM_NODE_ANY;
-    const char *ifacePtr = strchr (network_, ',');
-    if (NULL != ifacePtr) {
-        size_t idLen = ifacePtr - network_;
-        if (idLen > 31)
-            idLen = 31;
-        char idText[32];
-        strncpy (idText, network_, idLen);
-        idText[idLen] = '\0';
-        localId = (NormNodeId) atoi (idText);
-        ifacePtr++;
-    } else {
-        ifacePtr = network_;
-    }
-
-    // Second, look for optional multicast ifaceName
-    char ifaceName[256];
-    const char *addrPtr = strchr (ifacePtr, ';');
-    if (NULL != addrPtr) {
-        size_t ifaceLen = addrPtr - ifacePtr;
-        if (ifaceLen > 255)
-            ifaceLen = 255; // return error instead?
-        strncpy (ifaceName, ifacePtr, ifaceLen);
-        ifaceName[ifaceLen] = '\0';
-        ifacePtr = ifaceName;
-        addrPtr++;
-    } else {
-        addrPtr = ifacePtr;
-        ifacePtr = NULL;
-    }
-
-    // Finally, parse IP address and port number
-    const char *portPtr = strrchr (addrPtr, ':');
-    if (NULL == portPtr) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    char addr[256];
-    size_t addrLen = portPtr - addrPtr;
-    if (addrLen > 255)
-        addrLen = 255;
-    strncpy (addr, addrPtr, addrLen);
-    addr[addrLen] = '\0';
-    portPtr++;
-    unsigned short portNumber = atoi (portPtr);
-
-    if (NORM_INSTANCE_INVALID == norm_instance) {
-        if (NORM_INSTANCE_INVALID == (norm_instance = NormCreateInstance ())) {
-            // errno set by whatever caused NormCreateInstance() to fail
-            return -1;
-        }
-    }
-
-    // TBD - What do we use for our local NormNodeId?
-    //       (for now we use automatic, IP addr based assignment or passed in 'id')
-    //       a) Use ZMQ Identity somehow?
-    //       b) Add function to use iface addr
-    //       c) Randomize and implement a NORM session layer
-    //          conflict detection/resolution protocol
-
-    norm_session = NormCreateSession (norm_instance, addr, portNumber, localId);
-    if (NORM_SESSION_INVALID == norm_session) {
-        int savedErrno = errno;
-        NormDestroyInstance (norm_instance);
-        norm_instance = NORM_INSTANCE_INVALID;
-        errno = savedErrno;
-        return -1;
-    }
-    // There's many other useful NORM options that could be applied here
-    if (NormIsUnicastAddress (addr)) {
-        NormSetDefaultUnicastNack (norm_session, true);
-    } else {
-        // These only apply for multicast sessions
-        //NormSetTTL(norm_session, options.multicast_hops);  // ZMQ default is 1
-        NormSetTTL (
-          norm_session,
-          255); // since the ZMQ_MULTICAST_HOPS socket option isn't well-supported
-        NormSetRxPortReuse (
-          norm_session,
-          true); // port reuse doesn't work for non-connected unicast
-        NormSetLoopback (norm_session,
-                         true); // needed when multicast users on same machine
-        if (NULL != ifacePtr) {
-            // Note a bad interface may not be caught until sender or receiver start
-            // (Since sender/receiver is not yet started, this always succeeds here)
-            NormSetMulticastInterface (norm_session, ifacePtr);
-        }
-    }
-
-    if (recv) {
-        // The alternative NORM_SYNC_CURRENT here would provide "instant"
-        // receiver sync to the sender's _current_ message transmission.
-        // NORM_SYNC_STREAM tries to get everything the sender has cached/buffered
-        NormSetDefaultSyncPolicy (norm_session, NORM_SYNC_STREAM);
-        if (!NormStartReceiver (norm_session, 2 * 1024 * 1024)) {
-            // errno set by whatever failed
-            int savedErrno = errno;
-            NormDestroyInstance (norm_instance); // session gets closed, too
-            norm_session = NORM_SESSION_INVALID;
-            norm_instance = NORM_INSTANCE_INVALID;
-            errno = savedErrno;
-            return -1;
-        }
-        is_receiver = true;
-    }
-
-    if (send) {
-        // Pick a random sender instance id (aka norm sender session id)
-        NormSessionId instanceId = NormGetRandomSessionId ();
-        // TBD - provide "options" for some NORM sender parameters
-        if (!NormStartSender (norm_session, instanceId, 2 * 1024 * 1024, 1400,
-                              16, 4)) {
-            // errno set by whatever failed
-            int savedErrno = errno;
-            NormDestroyInstance (norm_instance); // session gets closed, too
-            norm_session = NORM_SESSION_INVALID;
-            norm_instance = NORM_INSTANCE_INVALID;
-            errno = savedErrno;
-            return -1;
-        }
-        NormSetCongestionControl (norm_session, true);
-        norm_tx_ready = true;
-        is_sender = true;
-        if (NORM_OBJECT_INVALID
-            == (norm_tx_stream =
-                  NormStreamOpen (norm_session, 2 * 1024 * 1024))) {
-            // errno set by whatever failed
-            int savedErrno = errno;
-            NormDestroyInstance (norm_instance); // session gets closed, too
-            norm_session = NORM_SESSION_INVALID;
-            norm_instance = NORM_INSTANCE_INVALID;
-            errno = savedErrno;
-            return -1;
-        }
-    }
-
-    //NormSetMessageTrace(norm_session, true);
-    //NormSetDebugLevel(3);
-    //NormOpenDebugLog(norm_instance, "normLog.txt");
-
-    return 0; // no error
-} // end zmq::norm_engine_t::init()
-
-void zmq::norm_engine_t::shutdown ()
-{
-    // TBD - implement a more graceful shutdown option
-    if (is_receiver) {
-        NormStopReceiver (norm_session);
-
-        // delete any active NormRxStreamState
-        rx_pending_list.Destroy ();
-        rx_ready_list.Destroy ();
-        msg_ready_list.Destroy ();
-
-        is_receiver = false;
-    }
-    if (is_sender) {
-        NormStopSender (norm_session);
-        is_sender = false;
-    }
-    if (NORM_SESSION_INVALID != norm_session) {
-        NormDestroySession (norm_session);
-        norm_session = NORM_SESSION_INVALID;
-    }
-    if (NORM_INSTANCE_INVALID != norm_instance) {
-        NormStopInstance (norm_instance);
-        NormDestroyInstance (norm_instance);
-        norm_instance = NORM_INSTANCE_INVALID;
-    }
-} // end zmq::norm_engine_t::shutdown()
-
-void zmq::norm_engine_t::plug (io_thread_t *io_thread_,
-                               session_base_t *session_)
-{
-    // TBD - we may assign the NORM engine to an io_thread in the future???
-    zmq_session = session_;
-    if (is_sender)
-        zmq_output_ready = true;
-    if (is_receiver)
-        zmq_input_ready = true;
-
-    fd_t normDescriptor = NormGetDescriptor (norm_instance);
-    norm_descriptor_handle = add_fd (normDescriptor);
-    // Set POLLIN for notification of pending NormEvents
-    set_pollin (norm_descriptor_handle);
-
-    if (is_sender)
-        send_data ();
-
-} // end zmq::norm_engine_t::init()
-
-void zmq::norm_engine_t::unplug ()
-{
-    rm_fd (norm_descriptor_handle);
-
-    zmq_session = NULL;
-} // end zmq::norm_engine_t::unplug()
-
-void zmq::norm_engine_t::terminate ()
-{
-    unplug ();
-    shutdown ();
-    delete this;
-}
-
-void zmq::norm_engine_t::restart_output ()
-{
-    // There's new message data available from the session
-    zmq_output_ready = true;
-    if (norm_tx_ready)
-        send_data ();
-
-} // end zmq::norm_engine_t::restart_output()
-
-void zmq::norm_engine_t::send_data ()
-{
-    // Here we write as much as is available or we can
-    while (zmq_output_ready && norm_tx_ready) {
-        if (0 == tx_len) {
-            // Our tx_buffer needs data to send
-            // Get more data from encoder
-            size_t space = BUFFER_SIZE;
-            unsigned char *bufPtr = (unsigned char *) tx_buffer;
-            tx_len = zmq_encoder.encode (&bufPtr, space);
-            if (0 == tx_len) {
-                if (tx_first_msg) {
-                    // We don't need to mark eom/flush until a message is sent
-                    tx_first_msg = false;
-                } else {
-                    // A prior message was completely written to stream, so
-                    // mark end-of-message and possibly flush (to force packet transmission,
-                    // even if it's not a full segment so message gets delivered quickly)
-                    // NormStreamMarkEom(norm_tx_stream);  // the flush below marks eom
-                    // Note NORM_FLUSH_ACTIVE makes NORM fairly chatty for low duty cycle messaging
-                    // but makes sure content is delivered quickly.  Positive acknowledgements
-                    // with flush override would make NORM more succinct here
-                    NormStreamFlush (norm_tx_stream, true, NORM_FLUSH_ACTIVE);
-                }
-                // Need to pull and load a new message to send
-                if (-1 == zmq_session->pull_msg (&tx_msg)) {
-                    // We need to wait for "restart_output()" to be called by ZMQ
-                    zmq_output_ready = false;
-                    break;
-                }
-                zmq_encoder.load_msg (&tx_msg);
-                // Should we write message size header for NORM to use? Or expect NORM
-                // receiver to decode ZMQ message framing format(s)?
-                // OK - we need to use a byte to denote when the ZMQ frame is the _first_
-                //      frame of a message so it can be decoded properly when a receiver
-                //      'syncs' mid-stream.  We key off the the state of the 'more_flag'
-                //      I.e.,If  more_flag _was_ false previously, this is the first
-                //      frame of a ZMQ message.
-                if (tx_more_bit)
-                    tx_buffer[0] =
-                      (char) 0xff; // this is not first frame of message
-                else
-                    tx_buffer[0] = 0x00; // this is first frame of message
-                tx_more_bit = (0 != (tx_msg.flags () & msg_t::more));
-                // Go ahead an get a first chunk of the message
-                bufPtr++;
-                space--;
-                tx_len = 1 + zmq_encoder.encode (&bufPtr, space);
-                tx_index = 0;
-            }
-        }
-        // Do we have data in our tx_buffer pending
-        if (tx_index < tx_len) {
-            // We have data in our tx_buffer to send, so write it to the stream
-            tx_index += NormStreamWrite (norm_tx_stream, tx_buffer + tx_index,
-                                         tx_len - tx_index);
-            if (tx_index < tx_len) {
-                // NORM stream buffer full, wait for NORM_TX_QUEUE_VACANCY
-                norm_tx_ready = false;
-                break;
-            }
-            tx_len = 0; // all buffered data was written
-        }
-    } // end while (zmq_output_ready && norm_tx_ready)
-} // end zmq::norm_engine_t::send_data()
-
-void zmq::norm_engine_t::in_event ()
-{
-    // This means a NormEvent is pending, so call NormGetNextEvent() and handle
-    NormEvent event;
-    if (!NormGetNextEvent (norm_instance, &event)) {
-        // NORM has died before we unplugged?!
-        zmq_assert (false);
-        return;
-    }
-
-    switch (event.type) {
-        case NORM_TX_QUEUE_VACANCY:
-        case NORM_TX_QUEUE_EMPTY:
-            if (!norm_tx_ready) {
-                norm_tx_ready = true;
-                send_data ();
-            }
-            break;
-
-        case NORM_RX_OBJECT_NEW:
-            //break;
-        case NORM_RX_OBJECT_UPDATED:
-            recv_data (event.object);
-            break;
-
-        case NORM_RX_OBJECT_ABORTED: {
-            NormRxStreamState *rxState =
-              (NormRxStreamState *) NormObjectGetUserData (event.object);
-            if (NULL != rxState) {
-                // Remove the state from the list it's in
-                // This is now unnecessary since deletion takes care of list removal
-                // but in the interest of being clear ...
-                NormRxStreamState::List *list = rxState->AccessList ();
-                if (NULL != list)
-                    list->Remove (*rxState);
-            }
-            delete rxState;
-            break;
-        }
-        case NORM_REMOTE_SENDER_INACTIVE:
-            // Here we free resources used for this formerly active sender.
-            // Note w/ NORM_SYNC_STREAM, if sender reactivates, we may
-            //  get some messages delivered twice.  NORM_SYNC_CURRENT would
-            // mitigate that but might miss data at startup. Always tradeoffs.
-            // Instead of immediately deleting, we could instead initiate a
-            // user configurable timeout here to wait some amount of time
-            // after this event to declare the remote sender truly dead
-            // and delete its state???
-            NormNodeDelete (event.sender);
-            break;
-
-        default:
-            // We ignore some NORM events
-            break;
-    }
-} // zmq::norm_engine_t::in_event()
-
-bool zmq::norm_engine_t::restart_input ()
-{
-    // TBD - should we check/assert that zmq_input_ready was false???
-    zmq_input_ready = true;
-    // Process any pending received messages
-    if (!msg_ready_list.IsEmpty ())
-        recv_data (NORM_OBJECT_INVALID);
-
-    return true;
-} // end zmq::norm_engine_t::restart_input()
-
-void zmq::norm_engine_t::recv_data (NormObjectHandle object)
-{
-    if (NORM_OBJECT_INVALID != object) {
-        // Call result of NORM_RX_OBJECT_UPDATED notification
-        // This is a rx_ready indication for a new or existing rx stream
-        // First, determine if this is a stream we already know
-        zmq_assert (NORM_OBJECT_STREAM == NormObjectGetType (object));
-        // Since there can be multiple senders (publishers), we keep
-        // state for each separate rx stream.
-        NormRxStreamState *rxState =
-          (NormRxStreamState *) NormObjectGetUserData (object);
-        if (NULL == rxState) {
-            // This is a new stream, so create rxState with zmq decoder, etc
-            rxState = new (std::nothrow)
-              NormRxStreamState (object, options.maxmsgsize, options.zero_copy,
-                                 options.in_batch_size);
-            errno_assert (rxState);
-
-            if (!rxState->Init ()) {
-                errno_assert (false);
-                delete rxState;
-                return;
-            }
-            NormObjectSetUserData (object, rxState);
-        } else if (!rxState->IsRxReady ()) {
-            // Existing non-ready stream, so remove from pending
-            // list to be promoted to rx_ready_list ...
-            rx_pending_list.Remove (*rxState);
-        }
-        if (!rxState->IsRxReady ()) {
-            // TBD - prepend up front for immediate service?
-            rxState->SetRxReady (true);
-            rx_ready_list.Append (*rxState);
-        }
-    }
-    // This loop repeats until we've read all data available from "rx ready" inbound streams
-    // and pushed any accumulated messages we can up to the zmq session.
-    while (!rx_ready_list.IsEmpty ()
-           || (zmq_input_ready && !msg_ready_list.IsEmpty ())) {
-        // Iterate through our rx_ready streams, reading data into the decoder
-        // (This services incoming "rx ready" streams in a round-robin fashion)
-        NormRxStreamState::List::Iterator iterator (rx_ready_list);
-        NormRxStreamState *rxState;
-        while (NULL != (rxState = iterator.GetNextItem ())) {
-            switch (rxState->Decode ()) {
-                case 1: // msg completed
-                    // Complete message decoded, move this stream to msg_ready_list
-                    // to push the message up to the session below.  Note the stream
-                    // will be returned to the "rx_ready_list" after that's done
-                    rx_ready_list.Remove (*rxState);
-                    msg_ready_list.Append (*rxState);
-                    continue;
-
-                case -1: // decoding error (shouldn't happen w/ NORM, but ...)
-                    // We need to re-sync this stream (decoder buffer was reset)
-                    rxState->SetSync (false);
-                    break;
-
-                default: // 0 - need more data
-                    break;
-            }
-            // Get more data from this stream
-            NormObjectHandle stream = rxState->GetStreamHandle ();
-            // First, make sure we're in sync ...
-            while (!rxState->InSync ()) {
-                // seek NORM message start
-                if (!NormStreamSeekMsgStart (stream)) {
-                    // Need to wait for more data
-                    break;
-                }
-                // read message 'flag' byte to see if this it's a 'final' frame
-                char syncFlag;
-                unsigned int numBytes = 1;
-                if (!NormStreamRead (stream, &syncFlag, &numBytes)) {
-                    // broken stream (shouldn't happen after seek msg start?)
-                    zmq_assert (false);
-                    continue;
-                }
-                if (0 == numBytes) {
-                    // This probably shouldn't happen either since we found msg start
-                    // Need to wait for more data
-                    break;
-                }
-                if (0 == syncFlag)
-                    rxState->SetSync (true);
-                // else keep seeking ...
-            } // end while(!rxState->InSync())
-            if (!rxState->InSync ()) {
-                // Need more data for this stream, so remove from "rx ready"
-                // list and iterate to next "rx ready" stream
-                rxState->SetRxReady (false);
-                // Move from rx_ready_list to rx_pending_list
-                rx_ready_list.Remove (*rxState);
-                rx_pending_list.Append (*rxState);
-                continue;
-            }
-            // Now we're actually ready to read data from the NORM stream to the zmq_decoder
-            // the underlying zmq_decoder->get_buffer() call sets how much is needed.
-            unsigned int numBytes = rxState->GetBytesNeeded ();
-            if (!NormStreamRead (stream, rxState->AccessBuffer (), &numBytes)) {
-                // broken NORM stream, so re-sync
-                rxState->Init (); // TBD - check result
-                // This will retry syncing, and getting data from this stream
-                // since we don't increment the "it" iterator
-                continue;
-            }
-            rxState->IncrementBufferCount (numBytes);
-            if (0 == numBytes) {
-                // All the data available has been read
-                // Need to wait for NORM_RX_OBJECT_UPDATED for this stream
-                rxState->SetRxReady (false);
-                // Move from rx_ready_list to rx_pending_list
-                rx_ready_list.Remove (*rxState);
-                rx_pending_list.Append (*rxState);
-            }
-        } // end while(NULL != (rxState = iterator.GetNextItem()))
-
-        if (zmq_input_ready) {
-            // At this point, we've made a pass through the "rx_ready" stream list
-            // Now make a pass through the "msg_pending" list (if the zmq session
-            // ready for more input).  This may possibly return streams back to
-            // the "rx ready" stream list after their pending message is handled
-            NormRxStreamState::List::Iterator iterator (msg_ready_list);
-            NormRxStreamState *rxState;
-            while (NULL != (rxState = iterator.GetNextItem ())) {
-                msg_t *msg = rxState->AccessMsg ();
-                int rc = zmq_session->push_msg (msg);
-                if (-1 == rc) {
-                    if (EAGAIN == errno) {
-                        // need to wait until session calls "restart_input()"
-                        zmq_input_ready = false;
-                        break;
-                    } else {
-                        // session rejected message?
-                        // TBD - handle this better
-                        zmq_assert (false);
-                    }
-                }
-                // else message was accepted.
-                msg_ready_list.Remove (*rxState);
-                if (
-                  rxState
-                    ->IsRxReady ()) // Move back to "rx_ready" list to read more data
-                    rx_ready_list.Append (*rxState);
-                else // Move back to "rx_pending" list until NORM_RX_OBJECT_UPDATED
-                    msg_ready_list.Append (*rxState);
-            } // end while(NULL != (rxState = iterator.GetNextItem()))
-        }     // end if (zmq_input_ready)
-    } // end while ((!rx_ready_list.empty() || (zmq_input_ready && !msg_ready_list.empty()))
-
-    // Alert zmq of the messages we have pushed up
-    zmq_session->flush ();
-
-} // end zmq::norm_engine_t::recv_data()
-
-zmq::norm_engine_t::NormRxStreamState::NormRxStreamState (
-  NormObjectHandle normStream,
-  int64_t maxMsgSize,
-  bool zeroCopy,
-  int inBatchSize) :
-    norm_stream (normStream),
-    max_msg_size (maxMsgSize),
-    zero_copy (zeroCopy),
-    in_batch_size (inBatchSize),
-    in_sync (false),
-    rx_ready (false),
-    zmq_decoder (NULL),
-    skip_norm_sync (false),
-    buffer_ptr (NULL),
-    buffer_size (0),
-    buffer_count (0),
-    prev (NULL),
-    next (NULL),
-    list (NULL)
-{
-}
-
-zmq::norm_engine_t::NormRxStreamState::~NormRxStreamState ()
-{
-    if (NULL != zmq_decoder) {
-        delete zmq_decoder;
-        zmq_decoder = NULL;
-    }
-    if (NULL != list) {
-        list->Remove (*this);
-        list = NULL;
-    }
-}
-
-bool zmq::norm_engine_t::NormRxStreamState::Init ()
-{
-    in_sync = false;
-    skip_norm_sync = false;
-    if (NULL != zmq_decoder)
-        delete zmq_decoder;
-    zmq_decoder =
-      new (std::nothrow) v2_decoder_t (in_batch_size, max_msg_size, zero_copy);
-    alloc_assert (zmq_decoder);
-    if (NULL != zmq_decoder) {
-        buffer_count = 0;
-        buffer_size = 0;
-        zmq_decoder->get_buffer (&buffer_ptr, &buffer_size);
-        return true;
-    } else {
-        return false;
-    }
-} // end zmq::norm_engine_t::NormRxStreamState::Init()
-
-// This decodes any pending data sitting in our stream decoder buffer
-// It returns 1 upon message completion, -1 on error, 1 on msg completion
-int zmq::norm_engine_t::NormRxStreamState::Decode ()
-{
-    // If we have pending bytes to decode, process those first
-    while (buffer_count > 0) {
-        // There's pending data for the decoder to decode
-        size_t processed = 0;
-
-        // This a bit of a kludgy approach used to weed
-        // out the NORM ZMQ message transport "syncFlag" byte
-        // from the ZMQ message stream being decoded (but it works!)
-        if (skip_norm_sync) {
-            buffer_ptr++;
-            buffer_count--;
-            skip_norm_sync = false;
-        }
-
-        int rc = zmq_decoder->decode (buffer_ptr, buffer_count, processed);
-        buffer_ptr += processed;
-        buffer_count -= processed;
-        switch (rc) {
-            case 1:
-                // msg completed
-                if (0 == buffer_count) {
-                    buffer_size = 0;
-                    zmq_decoder->get_buffer (&buffer_ptr, &buffer_size);
-                }
-                skip_norm_sync = true;
-                return 1;
-            case -1:
-                // decoder error (reset decoder and state variables)
-                in_sync = false;
-                skip_norm_sync = false; // will get consumed by norm sync check
-                Init ();
-                break;
-
-            case 0:
-                // need more data, keep decoding until buffer exhausted
-                break;
-        }
-    }
-    // Reset buffer pointer/count for next read
-    buffer_count = 0;
-    buffer_size = 0;
-    zmq_decoder->get_buffer (&buffer_ptr, &buffer_size);
-    return 0; //  need more data
-
-} // end zmq::norm_engine_t::NormRxStreamState::Decode()
-
-zmq::norm_engine_t::NormRxStreamState::List::List () : head (NULL), tail (NULL)
-{
-}
-
-zmq::norm_engine_t::NormRxStreamState::List::~List ()
-{
-    Destroy ();
-}
-
-void zmq::norm_engine_t::NormRxStreamState::List::Destroy ()
-{
-    NormRxStreamState *item = head;
-    while (NULL != item) {
-        Remove (*item);
-        delete item;
-        item = head;
-    }
-} // end zmq::norm_engine_t::NormRxStreamState::List::Destroy()
-
-void zmq::norm_engine_t::NormRxStreamState::List::Append (
-  NormRxStreamState &item)
-{
-    item.prev = tail;
-    if (NULL != tail)
-        tail->next = &item;
-    else
-        head = &item;
-    item.next = NULL;
-    tail = &item;
-    item.list = this;
-} // end zmq::norm_engine_t::NormRxStreamState::List::Append()
-
-void zmq::norm_engine_t::NormRxStreamState::List::Remove (
-  NormRxStreamState &item)
-{
-    if (NULL != item.prev)
-        item.prev->next = item.next;
-    else
-        head = item.next;
-    if (NULL != item.next)
-        item.next->prev = item.prev;
-    else
-        tail = item.prev;
-    item.prev = item.next = NULL;
-    item.list = NULL;
-} // end zmq::norm_engine_t::NormRxStreamState::List::Remove()
-
-zmq::norm_engine_t::NormRxStreamState::List::Iterator::Iterator (
-  const List &list) :
-    next_item (list.head)
-{
-}
-
-zmq::norm_engine_t::NormRxStreamState *
-zmq::norm_engine_t::NormRxStreamState::List::Iterator::GetNextItem ()
-{
-    NormRxStreamState *nextItem = next_item;
-    if (NULL != nextItem)
-        next_item = nextItem->next;
-    return nextItem;
-} // end zmq::norm_engine_t::NormRxStreamState::List::Iterator::GetNextItem()
-
-const zmq::endpoint_uri_pair_t &zmq::norm_engine_t::get_endpoint () const
-{
-    return _empty_endpoint;
-}
-
-#endif // ZMQ_HAVE_NORM
diff --git a/src/norm_engine.hpp b/src/norm_engine.hpp
deleted file mode 100644
index c5ae9e84b..000000000
--- a/src/norm_engine.hpp
+++ /dev/null
@@ -1,195 +0,0 @@
-
-#ifndef __ZMQ_NORM_ENGINE_HPP_INCLUDED__
-#define __ZMQ_NORM_ENGINE_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_NORM
-
-#include "io_object.hpp"
-#include "i_engine.hpp"
-#include "options.hpp"
-#include "v2_decoder.hpp"
-#include "v2_encoder.hpp"
-
-#include <normApi.h>
-
-namespace zmq
-{
-class io_thread_t;
-class msg_t;
-class session_base_t;
-
-class norm_engine_t ZMQ_FINAL : public io_object_t, public i_engine
-{
-  public:
-    norm_engine_t (zmq::io_thread_t *parent_, const options_t &options_);
-    ~norm_engine_t () ZMQ_FINAL;
-
-    // create NORM instance, session, etc
-    int init (const char *network_, bool send, bool recv);
-    void shutdown ();
-
-    bool has_handshake_stage () ZMQ_FINAL { return false; };
-
-    //  i_engine interface implementation.
-    //  Plug the engine to the session.
-    void plug (zmq::io_thread_t *io_thread_,
-               class session_base_t *session_) ZMQ_FINAL;
-
-    //  Terminate and deallocate the engine. Note that 'detached'
-    //  events are not fired on termination.
-    void terminate () ZMQ_FINAL;
-
-    //  This method is called by the session to signalise that more
-    //  messages can be written to the pipe.
-    bool restart_input () ZMQ_FINAL;
-
-    //  This method is called by the session to signalise that there
-    //  are messages to send available.
-    void restart_output () ZMQ_FINAL;
-
-    void zap_msg_available () ZMQ_FINAL {}
-
-    const endpoint_uri_pair_t &get_endpoint () const ZMQ_FINAL;
-
-    // i_poll_events interface implementation.
-    // (we only need in_event() for NormEvent notification)
-    // (i.e., don't have any output events or timers (yet))
-    void in_event ();
-
-  private:
-    void unplug ();
-    void send_data ();
-    void recv_data (NormObjectHandle stream);
-
-
-    enum
-    {
-        BUFFER_SIZE = 2048
-    };
-
-    // Used to keep track of streams from multiple senders
-    class NormRxStreamState
-    {
-      public:
-        NormRxStreamState (NormObjectHandle normStream,
-                           int64_t maxMsgSize,
-                           bool zeroCopy,
-                           int inBatchSize);
-        ~NormRxStreamState ();
-
-        NormObjectHandle GetStreamHandle () const { return norm_stream; }
-
-        bool Init ();
-
-        void SetRxReady (bool state) { rx_ready = state; }
-        bool IsRxReady () const { return rx_ready; }
-
-        void SetSync (bool state) { in_sync = state; }
-        bool InSync () const { return in_sync; }
-
-        // These are used to feed data to decoder
-        // and its underlying "msg" buffer
-        char *AccessBuffer () { return (char *) (buffer_ptr + buffer_count); }
-        size_t GetBytesNeeded () const { return buffer_size - buffer_count; }
-        void IncrementBufferCount (size_t count) { buffer_count += count; }
-        msg_t *AccessMsg () { return zmq_decoder->msg (); }
-        // This invokes the decoder "decode" method
-        // returning 0 if more data is needed,
-        // 1 if the message is complete, If an error
-        // occurs the 'sync' is dropped and the
-        // decoder re-initialized
-        int Decode ();
-
-        class List
-        {
-          public:
-            List ();
-            ~List ();
-
-            void Append (NormRxStreamState &item);
-            void Remove (NormRxStreamState &item);
-
-            bool IsEmpty () const { return NULL == head; }
-
-            void Destroy ();
-
-            class Iterator
-            {
-              public:
-                Iterator (const List &list);
-                NormRxStreamState *GetNextItem ();
-
-              private:
-                NormRxStreamState *next_item;
-            };
-            friend class Iterator;
-
-          private:
-            NormRxStreamState *head;
-            NormRxStreamState *tail;
-
-        }; // end class zmq::norm_engine_t::NormRxStreamState::List
-
-        friend class List;
-
-        List *AccessList () { return list; }
-
-
-      private:
-        NormObjectHandle norm_stream;
-        int64_t max_msg_size;
-        bool zero_copy;
-        int in_batch_size;
-        bool in_sync;
-        bool rx_ready;
-        v2_decoder_t *zmq_decoder;
-        bool skip_norm_sync;
-        unsigned char *buffer_ptr;
-        size_t buffer_size;
-        size_t buffer_count;
-
-        NormRxStreamState *prev;
-        NormRxStreamState *next;
-        NormRxStreamState::List *list;
-
-    }; // end class zmq::norm_engine_t::NormRxStreamState
-
-    const endpoint_uri_pair_t _empty_endpoint;
-
-    session_base_t *zmq_session;
-    options_t options;
-    NormInstanceHandle norm_instance;
-    handle_t norm_descriptor_handle;
-    NormSessionHandle norm_session;
-    bool is_sender;
-    bool is_receiver;
-    // Sender state
-    msg_t tx_msg;
-    v2_encoder_t zmq_encoder; // for tx messages (we use v2 for now)
-    NormObjectHandle norm_tx_stream;
-    bool tx_first_msg;
-    bool tx_more_bit;
-    bool zmq_output_ready; // zmq has msg(s) to send
-    bool norm_tx_ready;    // norm has tx queue vacancy
-    // TBD - maybe don't need buffer if can access zmq message buffer directly?
-    char tx_buffer[BUFFER_SIZE];
-    unsigned int tx_index;
-    unsigned int tx_len;
-
-    // Receiver state
-    // Lists of norm rx streams from remote senders
-    bool zmq_input_ready; // zmq ready to receive msg(s)
-    NormRxStreamState::List
-      rx_pending_list; // rx streams waiting for data reception
-    NormRxStreamState::List
-      rx_ready_list; // rx streams ready for NormStreamRead()
-    NormRxStreamState::List
-      msg_ready_list; // rx streams w/ msg ready for push to zmq
-
-
-}; // end class norm_engine_t
-}
-
-#endif // ZMQ_HAVE_NORM
-
-#endif // !__ZMQ_NORM_ENGINE_HPP_INCLUDED__
diff --git a/src/null_mechanism.cpp b/src/null_mechanism.cpp
deleted file mode 100644
index 4c1fd2a4e..000000000
--- a/src/null_mechanism.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "err.hpp"
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "null_mechanism.hpp"
-
-const char error_command_name[] = "\5ERROR";
-const size_t error_command_name_len = sizeof (error_command_name) - 1;
-const size_t error_reason_len_size = 1;
-
-const char ready_command_name[] = "\5READY";
-const size_t ready_command_name_len = sizeof (ready_command_name) - 1;
-
-zmq::null_mechanism_t::null_mechanism_t (session_base_t *session_,
-                                         const std::string &peer_address_,
-                                         const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    zap_client_t (session_, peer_address_, options_),
-    _ready_command_sent (false),
-    _error_command_sent (false),
-    _ready_command_received (false),
-    _error_command_received (false),
-    _zap_request_sent (false),
-    _zap_reply_received (false)
-{
-}
-
-zmq::null_mechanism_t::~null_mechanism_t ()
-{
-}
-
-int zmq::null_mechanism_t::next_handshake_command (msg_t *msg_)
-{
-    if (_ready_command_sent || _error_command_sent) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (zap_required () && !_zap_reply_received) {
-        if (_zap_request_sent) {
-            errno = EAGAIN;
-            return -1;
-        }
-        //  Given this is a backward-incompatible change, it's behind a socket
-        //  option disabled by default.
-        int rc = session->zap_connect ();
-        if (rc == -1 && options.zap_enforce_domain) {
-            session->get_socket ()->event_handshake_failed_no_detail (
-              session->get_endpoint (), EFAULT);
-            return -1;
-        }
-        if (rc == 0) {
-            send_zap_request ();
-            _zap_request_sent = true;
-
-            //  TODO actually, it is quite unlikely that we can read the ZAP
-            //  reply already, but removing this has some strange side-effect
-            //  (probably because the pipe's in_active flag is true until a read
-            //  is attempted)
-            rc = receive_and_process_zap_reply ();
-            if (rc != 0)
-                return -1;
-
-            _zap_reply_received = true;
-        }
-    }
-
-    if (_zap_reply_received && status_code != "200") {
-        _error_command_sent = true;
-        if (status_code != "300") {
-            const size_t status_code_len = 3;
-            const int rc = msg_->init_size (
-              error_command_name_len + error_reason_len_size + status_code_len);
-            zmq_assert (rc == 0);
-            unsigned char *msg_data =
-              static_cast<unsigned char *> (msg_->data ());
-            memcpy (msg_data, error_command_name, error_command_name_len);
-            msg_data += error_command_name_len;
-            *msg_data = status_code_len;
-            msg_data += error_reason_len_size;
-            memcpy (msg_data, status_code.c_str (), status_code_len);
-            return 0;
-        }
-        errno = EAGAIN;
-        return -1;
-    }
-
-    make_command_with_basic_properties (msg_, ready_command_name,
-                                        ready_command_name_len);
-
-    _ready_command_sent = true;
-
-    return 0;
-}
-
-int zmq::null_mechanism_t::process_handshake_command (msg_t *msg_)
-{
-    if (_ready_command_received || _error_command_received) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const unsigned char *cmd_data =
-      static_cast<unsigned char *> (msg_->data ());
-    const size_t data_size = msg_->size ();
-
-    int rc = 0;
-    if (data_size >= ready_command_name_len
-        && !memcmp (cmd_data, ready_command_name, ready_command_name_len))
-        rc = process_ready_command (cmd_data, data_size);
-    else if (data_size >= error_command_name_len
-             && !memcmp (cmd_data, error_command_name, error_command_name_len))
-        rc = process_error_command (cmd_data, data_size);
-    else {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        rc = -1;
-    }
-
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-    return rc;
-}
-
-int zmq::null_mechanism_t::process_ready_command (
-  const unsigned char *cmd_data_, size_t data_size_)
-{
-    _ready_command_received = true;
-    return parse_metadata (cmd_data_ + ready_command_name_len,
-                           data_size_ - ready_command_name_len);
-}
-
-int zmq::null_mechanism_t::process_error_command (
-  const unsigned char *cmd_data_, size_t data_size_)
-{
-    const size_t fixed_prefix_size =
-      error_command_name_len + error_reason_len_size;
-    if (data_size_ < fixed_prefix_size) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-
-        errno = EPROTO;
-        return -1;
-    }
-    const size_t error_reason_len =
-      static_cast<size_t> (cmd_data_[error_command_name_len]);
-    if (error_reason_len > data_size_ - fixed_prefix_size) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-
-        errno = EPROTO;
-        return -1;
-    }
-    const char *error_reason =
-      reinterpret_cast<const char *> (cmd_data_) + fixed_prefix_size;
-    handle_error_reason (error_reason, error_reason_len);
-    _error_command_received = true;
-    return 0;
-}
-
-int zmq::null_mechanism_t::zap_msg_available ()
-{
-    if (_zap_reply_received) {
-        errno = EFSM;
-        return -1;
-    }
-    const int rc = receive_and_process_zap_reply ();
-    if (rc == 0)
-        _zap_reply_received = true;
-    return rc == -1 ? -1 : 0;
-}
-
-zmq::mechanism_t::status_t zmq::null_mechanism_t::status () const
-{
-    if (_ready_command_sent && _ready_command_received)
-        return ready;
-
-    const bool command_sent = _ready_command_sent || _error_command_sent;
-    const bool command_received =
-      _ready_command_received || _error_command_received;
-    return command_sent && command_received ? error : handshaking;
-}
-
-void zmq::null_mechanism_t::send_zap_request ()
-{
-    zap_client_t::send_zap_request ("NULL", 4, NULL, NULL, 0);
-}
diff --git a/src/null_mechanism.hpp b/src/null_mechanism.hpp
deleted file mode 100644
index 3ea31649e..000000000
--- a/src/null_mechanism.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_NULL_MECHANISM_HPP_INCLUDED__
-#define __ZMQ_NULL_MECHANISM_HPP_INCLUDED__
-
-#include "mechanism.hpp"
-#include "options.hpp"
-#include "zap_client.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class null_mechanism_t ZMQ_FINAL : public zap_client_t
-{
-  public:
-    null_mechanism_t (session_base_t *session_,
-                      const std::string &peer_address_,
-                      const options_t &options_);
-    ~null_mechanism_t ();
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-    int zap_msg_available ();
-    status_t status () const;
-
-  private:
-    bool _ready_command_sent;
-    bool _error_command_sent;
-    bool _ready_command_received;
-    bool _error_command_received;
-    bool _zap_request_sent;
-    bool _zap_reply_received;
-
-    int process_ready_command (const unsigned char *cmd_data_,
-                               size_t data_size_);
-    int process_error_command (const unsigned char *cmd_data_,
-                               size_t data_size_);
-
-    void send_zap_request ();
-};
-}
-
-#endif
diff --git a/src/object.cpp b/src/object.cpp
deleted file mode 100644
index ba3558f66..000000000
--- a/src/object.cpp
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-#include <stdarg.h>
-
-#include "object.hpp"
-#include "ctx.hpp"
-#include "err.hpp"
-#include "pipe.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "socket_base.hpp"
-
-zmq::object_t::object_t (ctx_t *ctx_, uint32_t tid_) : _ctx (ctx_), _tid (tid_)
-{
-}
-
-zmq::object_t::object_t (object_t *parent_) :
-    _ctx (parent_->_ctx),
-    _tid (parent_->_tid)
-{
-}
-
-zmq::object_t::~object_t ()
-{
-}
-
-uint32_t zmq::object_t::get_tid () const
-{
-    return _tid;
-}
-
-void zmq::object_t::set_tid (uint32_t id_)
-{
-    _tid = id_;
-}
-
-zmq::ctx_t *zmq::object_t::get_ctx () const
-{
-    return _ctx;
-}
-
-void zmq::object_t::process_command (const command_t &cmd_)
-{
-    switch (cmd_.type) {
-        case command_t::activate_read:
-            process_activate_read ();
-            break;
-
-        case command_t::activate_write:
-            process_activate_write (cmd_.args.activate_write.msgs_read);
-            break;
-
-        case command_t::stop:
-            process_stop ();
-            break;
-
-        case command_t::plug:
-            process_plug ();
-            process_seqnum ();
-            break;
-
-        case command_t::own:
-            process_own (cmd_.args.own.object);
-            process_seqnum ();
-            break;
-
-        case command_t::attach:
-            process_attach (cmd_.args.attach.engine);
-            process_seqnum ();
-            break;
-
-        case command_t::bind:
-            process_bind (cmd_.args.bind.pipe);
-            process_seqnum ();
-            break;
-
-        case command_t::hiccup:
-            process_hiccup (cmd_.args.hiccup.pipe);
-            break;
-
-        case command_t::pipe_peer_stats:
-            process_pipe_peer_stats (cmd_.args.pipe_peer_stats.queue_count,
-                                     cmd_.args.pipe_peer_stats.socket_base,
-                                     cmd_.args.pipe_peer_stats.endpoint_pair);
-            break;
-
-        case command_t::pipe_stats_publish:
-            process_pipe_stats_publish (
-              cmd_.args.pipe_stats_publish.outbound_queue_count,
-              cmd_.args.pipe_stats_publish.inbound_queue_count,
-              cmd_.args.pipe_stats_publish.endpoint_pair);
-            break;
-
-        case command_t::pipe_term:
-            process_pipe_term ();
-            break;
-
-        case command_t::pipe_term_ack:
-            process_pipe_term_ack ();
-            break;
-
-        case command_t::pipe_hwm:
-            process_pipe_hwm (cmd_.args.pipe_hwm.inhwm,
-                              cmd_.args.pipe_hwm.outhwm);
-            break;
-
-        case command_t::term_req:
-            process_term_req (cmd_.args.term_req.object);
-            break;
-
-        case command_t::term:
-            process_term (cmd_.args.term.linger);
-            break;
-
-        case command_t::term_ack:
-            process_term_ack ();
-            break;
-
-        case command_t::term_endpoint:
-            process_term_endpoint (cmd_.args.term_endpoint.endpoint);
-            break;
-
-        case command_t::reap:
-            process_reap (cmd_.args.reap.socket);
-            break;
-
-        case command_t::reaped:
-            process_reaped ();
-            break;
-
-        case command_t::inproc_connected:
-            process_seqnum ();
-            break;
-
-        case command_t::conn_failed:
-            process_conn_failed ();
-            break;
-
-        case command_t::done:
-        default:
-            zmq_assert (false);
-    }
-}
-
-int zmq::object_t::register_endpoint (const char *addr_,
-                                      const endpoint_t &endpoint_)
-{
-    return _ctx->register_endpoint (addr_, endpoint_);
-}
-
-int zmq::object_t::unregister_endpoint (const std::string &addr_,
-                                        socket_base_t *socket_)
-{
-    return _ctx->unregister_endpoint (addr_, socket_);
-}
-
-void zmq::object_t::unregister_endpoints (socket_base_t *socket_)
-{
-    return _ctx->unregister_endpoints (socket_);
-}
-
-zmq::endpoint_t zmq::object_t::find_endpoint (const char *addr_) const
-{
-    return _ctx->find_endpoint (addr_);
-}
-
-void zmq::object_t::pend_connection (const std::string &addr_,
-                                     const endpoint_t &endpoint_,
-                                     pipe_t **pipes_)
-{
-    _ctx->pend_connection (addr_, endpoint_, pipes_);
-}
-
-void zmq::object_t::connect_pending (const char *addr_,
-                                     zmq::socket_base_t *bind_socket_)
-{
-    return _ctx->connect_pending (addr_, bind_socket_);
-}
-
-void zmq::object_t::destroy_socket (socket_base_t *socket_)
-{
-    _ctx->destroy_socket (socket_);
-}
-
-zmq::io_thread_t *zmq::object_t::choose_io_thread (uint64_t affinity_) const
-{
-    return _ctx->choose_io_thread (affinity_);
-}
-
-void zmq::object_t::send_stop ()
-{
-    //  'stop' command goes always from administrative thread to
-    //  the current object.
-    command_t cmd;
-    cmd.destination = this;
-    cmd.type = command_t::stop;
-    _ctx->send_command (_tid, cmd);
-}
-
-void zmq::object_t::send_plug (own_t *destination_, bool inc_seqnum_)
-{
-    if (inc_seqnum_)
-        destination_->inc_seqnum ();
-
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::plug;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_own (own_t *destination_, own_t *object_)
-{
-    destination_->inc_seqnum ();
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::own;
-    cmd.args.own.object = object_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_attach (session_base_t *destination_,
-                                 i_engine *engine_,
-                                 bool inc_seqnum_)
-{
-    if (inc_seqnum_)
-        destination_->inc_seqnum ();
-
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::attach;
-    cmd.args.attach.engine = engine_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_conn_failed (session_base_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::conn_failed;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_bind (own_t *destination_,
-                               pipe_t *pipe_,
-                               bool inc_seqnum_)
-{
-    if (inc_seqnum_)
-        destination_->inc_seqnum ();
-
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::bind;
-    cmd.args.bind.pipe = pipe_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_activate_read (pipe_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::activate_read;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_activate_write (pipe_t *destination_,
-                                         uint64_t msgs_read_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::activate_write;
-    cmd.args.activate_write.msgs_read = msgs_read_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_hiccup (pipe_t *destination_, void *pipe_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::hiccup;
-    cmd.args.hiccup.pipe = pipe_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_peer_stats (pipe_t *destination_,
-                                          uint64_t queue_count_,
-                                          own_t *socket_base_,
-                                          endpoint_uri_pair_t *endpoint_pair_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_peer_stats;
-    cmd.args.pipe_peer_stats.queue_count = queue_count_;
-    cmd.args.pipe_peer_stats.socket_base = socket_base_;
-    cmd.args.pipe_peer_stats.endpoint_pair = endpoint_pair_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_stats_publish (
-  own_t *destination_,
-  uint64_t outbound_queue_count_,
-  uint64_t inbound_queue_count_,
-  endpoint_uri_pair_t *endpoint_pair_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_stats_publish;
-    cmd.args.pipe_stats_publish.outbound_queue_count = outbound_queue_count_;
-    cmd.args.pipe_stats_publish.inbound_queue_count = inbound_queue_count_;
-    cmd.args.pipe_stats_publish.endpoint_pair = endpoint_pair_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_term (pipe_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_term;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_term_ack (pipe_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_term_ack;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_hwm (pipe_t *destination_,
-                                   int inhwm_,
-                                   int outhwm_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_hwm;
-    cmd.args.pipe_hwm.inhwm = inhwm_;
-    cmd.args.pipe_hwm.outhwm = outhwm_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_term_req (own_t *destination_, own_t *object_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::term_req;
-    cmd.args.term_req.object = object_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_term (own_t *destination_, int linger_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::term;
-    cmd.args.term.linger = linger_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_term_ack (own_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::term_ack;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_term_endpoint (own_t *destination_,
-                                        std::string *endpoint_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::term_endpoint;
-    cmd.args.term_endpoint.endpoint = endpoint_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_reap (class socket_base_t *socket_)
-{
-    command_t cmd;
-    cmd.destination = _ctx->get_reaper ();
-    cmd.type = command_t::reap;
-    cmd.args.reap.socket = socket_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_reaped ()
-{
-    command_t cmd;
-    cmd.destination = _ctx->get_reaper ();
-    cmd.type = command_t::reaped;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_inproc_connected (zmq::socket_base_t *socket_)
-{
-    command_t cmd;
-    cmd.destination = socket_;
-    cmd.type = command_t::inproc_connected;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_done ()
-{
-    command_t cmd;
-    cmd.destination = NULL;
-    cmd.type = command_t::done;
-    _ctx->send_command (ctx_t::term_tid, cmd);
-}
-
-void zmq::object_t::process_stop ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_plug ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_own (own_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_attach (i_engine *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_bind (pipe_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_activate_read ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_activate_write (uint64_t)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_hiccup (void *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_peer_stats (uint64_t,
-                                             own_t *,
-                                             endpoint_uri_pair_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_stats_publish (uint64_t,
-                                                uint64_t,
-                                                endpoint_uri_pair_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_term ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_term_ack ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_hwm (int, int)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_term_req (own_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_term (int)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_term_ack ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_term_endpoint (std::string *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_reap (class socket_base_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_reaped ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_seqnum ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_conn_failed ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::send_command (const command_t &cmd_)
-{
-    _ctx->send_command (cmd_.destination->get_tid (), cmd_);
-}
diff --git a/src/object.hpp b/src/object.hpp
deleted file mode 100644
index b672b0d86..000000000
--- a/src/object.hpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_OBJECT_HPP_INCLUDED__
-#define __ZMQ_OBJECT_HPP_INCLUDED__
-
-#include <string>
-
-#include "endpoint.hpp"
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-struct i_engine;
-struct endpoint_t;
-struct pending_connection_t;
-struct command_t;
-class ctx_t;
-class pipe_t;
-class socket_base_t;
-class session_base_t;
-class io_thread_t;
-class own_t;
-
-//  Base class for all objects that participate in inter-thread
-//  communication.
-
-class object_t
-{
-  public:
-    object_t (zmq::ctx_t *ctx_, uint32_t tid_);
-    object_t (object_t *parent_);
-    virtual ~object_t ();
-
-    uint32_t get_tid () const;
-    void set_tid (uint32_t id_);
-    ctx_t *get_ctx () const;
-    void process_command (const zmq::command_t &cmd_);
-    void send_inproc_connected (zmq::socket_base_t *socket_);
-    void send_bind (zmq::own_t *destination_,
-                    zmq::pipe_t *pipe_,
-                    bool inc_seqnum_ = true);
-
-  protected:
-    //  Using following function, socket is able to access global
-    //  repository of inproc endpoints.
-    int register_endpoint (const char *addr_, const zmq::endpoint_t &endpoint_);
-    int unregister_endpoint (const std::string &addr_, socket_base_t *socket_);
-    void unregister_endpoints (zmq::socket_base_t *socket_);
-    zmq::endpoint_t find_endpoint (const char *addr_) const;
-    void pend_connection (const std::string &addr_,
-                          const endpoint_t &endpoint_,
-                          pipe_t **pipes_);
-    void connect_pending (const char *addr_, zmq::socket_base_t *bind_socket_);
-
-    void destroy_socket (zmq::socket_base_t *socket_);
-
-    //  Logs an message.
-    void log (const char *format_, ...);
-
-    //  Chooses least loaded I/O thread.
-    zmq::io_thread_t *choose_io_thread (uint64_t affinity_) const;
-
-    //  Derived object can use these functions to send commands
-    //  to other objects.
-    void send_stop ();
-    void send_plug (zmq::own_t *destination_, bool inc_seqnum_ = true);
-    void send_own (zmq::own_t *destination_, zmq::own_t *object_);
-    void send_attach (zmq::session_base_t *destination_,
-                      zmq::i_engine *engine_,
-                      bool inc_seqnum_ = true);
-    void send_activate_read (zmq::pipe_t *destination_);
-    void send_activate_write (zmq::pipe_t *destination_, uint64_t msgs_read_);
-    void send_hiccup (zmq::pipe_t *destination_, void *pipe_);
-    void send_pipe_peer_stats (zmq::pipe_t *destination_,
-                               uint64_t queue_count_,
-                               zmq::own_t *socket_base,
-                               endpoint_uri_pair_t *endpoint_pair_);
-    void send_pipe_stats_publish (zmq::own_t *destination_,
-                                  uint64_t outbound_queue_count_,
-                                  uint64_t inbound_queue_count_,
-                                  endpoint_uri_pair_t *endpoint_pair_);
-    void send_pipe_term (zmq::pipe_t *destination_);
-    void send_pipe_term_ack (zmq::pipe_t *destination_);
-    void send_pipe_hwm (zmq::pipe_t *destination_, int inhwm_, int outhwm_);
-    void send_term_req (zmq::own_t *destination_, zmq::own_t *object_);
-    void send_term (zmq::own_t *destination_, int linger_);
-    void send_term_ack (zmq::own_t *destination_);
-    void send_term_endpoint (own_t *destination_, std::string *endpoint_);
-    void send_reap (zmq::socket_base_t *socket_);
-    void send_reaped ();
-    void send_done ();
-    void send_conn_failed (zmq::session_base_t *destination_);
-
-
-    //  These handlers can be overridden by the derived objects. They are
-    //  called when command arrives from another thread.
-    virtual void process_stop ();
-    virtual void process_plug ();
-    virtual void process_own (zmq::own_t *object_);
-    virtual void process_attach (zmq::i_engine *engine_);
-    virtual void process_bind (zmq::pipe_t *pipe_);
-    virtual void process_activate_read ();
-    virtual void process_activate_write (uint64_t msgs_read_);
-    virtual void process_hiccup (void *pipe_);
-    virtual void process_pipe_peer_stats (uint64_t queue_count_,
-                                          zmq::own_t *socket_base_,
-                                          endpoint_uri_pair_t *endpoint_pair_);
-    virtual void
-    process_pipe_stats_publish (uint64_t outbound_queue_count_,
-                                uint64_t inbound_queue_count_,
-                                endpoint_uri_pair_t *endpoint_pair_);
-    virtual void process_pipe_term ();
-    virtual void process_pipe_term_ack ();
-    virtual void process_pipe_hwm (int inhwm_, int outhwm_);
-    virtual void process_term_req (zmq::own_t *object_);
-    virtual void process_term (int linger_);
-    virtual void process_term_ack ();
-    virtual void process_term_endpoint (std::string *endpoint_);
-    virtual void process_reap (zmq::socket_base_t *socket_);
-    virtual void process_reaped ();
-    virtual void process_conn_failed ();
-
-
-    //  Special handler called after a command that requires a seqnum
-    //  was processed. The implementation should catch up with its counter
-    //  of processed commands here.
-    virtual void process_seqnum ();
-
-  private:
-    //  Context provides access to the global state.
-    zmq::ctx_t *const _ctx;
-
-    //  Thread ID of the thread the object belongs to.
-    uint32_t _tid;
-
-    void send_command (const command_t &cmd_);
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (object_t)
-};
-}
-
-#endif
diff --git a/src/options.cpp b/src/options.cpp
deleted file mode 100644
index b257fe14d..000000000
--- a/src/options.cpp
+++ /dev/null
@@ -1,1283 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-#include <limits.h>
-#include <set>
-
-#include "options.hpp"
-#include "err.hpp"
-#include "macros.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <net/if.h>
-#endif
-
-#if defined IFNAMSIZ
-#define BINDDEVSIZ IFNAMSIZ
-#else
-#define BINDDEVSIZ 16
-#endif
-
-static int sockopt_invalid ()
-{
-#if defined(ZMQ_ACT_MILITANT)
-    zmq_assert (false);
-#endif
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::do_getsockopt (void *const optval_,
-                        size_t *const optvallen_,
-                        const std::string &value_)
-{
-    return do_getsockopt (optval_, optvallen_, value_.c_str (),
-                          value_.size () + 1);
-}
-
-int zmq::do_getsockopt (void *const optval_,
-                        size_t *const optvallen_,
-                        const void *value_,
-                        const size_t value_len_)
-{
-    // TODO behaviour is inconsistent with options_t::getsockopt; there, an
-    // *exact* length match is required except for string-like (but not the
-    // CURVE keys!) (and therefore null-ing remaining memory is a no-op, see
-    // comment below)
-    if (*optvallen_ < value_len_) {
-        return sockopt_invalid ();
-    }
-    memcpy (optval_, value_, value_len_);
-    // TODO why is the remaining memory null-ed?
-    memset (static_cast<char *> (optval_) + value_len_, 0,
-            *optvallen_ - value_len_);
-    *optvallen_ = value_len_;
-    return 0;
-}
-
-#ifdef ZMQ_HAVE_CURVE
-static int do_getsockopt_curve_key (void *const optval_,
-                                    const size_t *const optvallen_,
-                                    const uint8_t (&curve_key_)[CURVE_KEYSIZE])
-{
-    if (*optvallen_ == CURVE_KEYSIZE) {
-        memcpy (optval_, curve_key_, CURVE_KEYSIZE);
-        return 0;
-    }
-    if (*optvallen_ == CURVE_KEYSIZE_Z85 + 1) {
-        zmq_z85_encode (static_cast<char *> (optval_), curve_key_,
-                        CURVE_KEYSIZE);
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-#endif
-
-template <typename T>
-static int do_setsockopt (const void *const optval_,
-                          const size_t optvallen_,
-                          T *const out_value_)
-{
-    if (optvallen_ == sizeof (T)) {
-        memcpy (out_value_, optval_, sizeof (T));
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-int zmq::do_setsockopt_int_as_bool_strict (const void *const optval_,
-                                           const size_t optvallen_,
-                                           bool *const out_value_)
-{
-    // TODO handling of values other than 0 or 1 is not consistent,
-    // here it is disallowed, but for other options such as
-    // ZMQ_ROUTER_RAW any positive value is accepted
-    int value = -1;
-    if (do_setsockopt (optval_, optvallen_, &value) == -1)
-        return -1;
-    if (value == 0 || value == 1) {
-        *out_value_ = (value != 0);
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-int zmq::do_setsockopt_int_as_bool_relaxed (const void *const optval_,
-                                            const size_t optvallen_,
-                                            bool *const out_value_)
-{
-    int value = -1;
-    if (do_setsockopt (optval_, optvallen_, &value) == -1)
-        return -1;
-    *out_value_ = (value != 0);
-    return 0;
-}
-
-static int
-do_setsockopt_string_allow_empty_strict (const void *const optval_,
-                                         const size_t optvallen_,
-                                         std::string *const out_value_,
-                                         const size_t max_len_)
-{
-    // TODO why is optval_ != NULL not allowed in case of optvallen_== 0?
-    // TODO why are empty strings allowed for some socket options, but not for others?
-    if (optval_ == NULL && optvallen_ == 0) {
-        out_value_->clear ();
-        return 0;
-    }
-    if (optval_ != NULL && optvallen_ > 0 && optvallen_ <= max_len_) {
-        out_value_->assign (static_cast<const char *> (optval_), optvallen_);
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-static int
-do_setsockopt_string_allow_empty_relaxed (const void *const optval_,
-                                          const size_t optvallen_,
-                                          std::string *const out_value_,
-                                          const size_t max_len_)
-{
-    // TODO use either do_setsockopt_string_allow_empty_relaxed or
-    // do_setsockopt_string_allow_empty_strict everywhere
-    if (optvallen_ > 0 && optvallen_ <= max_len_) {
-        out_value_->assign (static_cast<const char *> (optval_), optvallen_);
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-template <typename T>
-static int do_setsockopt_set (const void *const optval_,
-                              const size_t optvallen_,
-                              std::set<T> *const set_)
-{
-    if (optvallen_ == 0 && optval_ == NULL) {
-        set_->clear ();
-        return 0;
-    }
-    if (optvallen_ == sizeof (T) && optval_ != NULL) {
-        set_->insert (*(static_cast<const T *> (optval_)));
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-// TODO why is 1000 a sensible default?
-const int default_hwm = 1000;
-
-zmq::options_t::options_t () :
-    sndhwm (default_hwm),
-    rcvhwm (default_hwm),
-    affinity (0),
-    routing_id_size (0),
-    rate (100),
-    recovery_ivl (10000),
-    multicast_hops (1),
-    multicast_maxtpdu (1500),
-    sndbuf (-1),
-    rcvbuf (-1),
-    tos (0),
-    type (-1),
-    linger (-1),
-    connect_timeout (0),
-    tcp_maxrt (0),
-    reconnect_stop (0),
-    reconnect_ivl (100),
-    reconnect_ivl_max (0),
-    backlog (100),
-    maxmsgsize (-1),
-    rcvtimeo (-1),
-    sndtimeo (-1),
-    ipv6 (false),
-    immediate (0),
-    filter (false),
-    invert_matching (false),
-    recv_routing_id (false),
-    raw_socket (false),
-    raw_notify (true),
-    tcp_keepalive (-1),
-    tcp_keepalive_cnt (-1),
-    tcp_keepalive_idle (-1),
-    tcp_keepalive_intvl (-1),
-    mechanism (ZMQ_NULL),
-    as_server (0),
-    gss_principal_nt (ZMQ_GSSAPI_NT_HOSTBASED),
-    gss_service_principal_nt (ZMQ_GSSAPI_NT_HOSTBASED),
-    gss_plaintext (false),
-    socket_id (0),
-    conflate (false),
-    handshake_ivl (30000),
-    connected (false),
-    heartbeat_ttl (0),
-    heartbeat_interval (0),
-    heartbeat_timeout (-1),
-    use_fd (-1),
-    zap_enforce_domain (false),
-    loopback_fastpath (false),
-    multicast_loop (true),
-    in_batch_size (8192),
-    out_batch_size (8192),
-    zero_copy (true),
-    router_notify (0),
-    monitor_event_version (1),
-    wss_trust_system (false),
-    hello_msg (),
-    can_send_hello_msg (false),
-    disconnect_msg (),
-    can_recv_disconnect_msg (false)
-{
-    memset (curve_public_key, 0, CURVE_KEYSIZE);
-    memset (curve_secret_key, 0, CURVE_KEYSIZE);
-    memset (curve_server_key, 0, CURVE_KEYSIZE);
-#if defined ZMQ_HAVE_VMCI
-    vmci_buffer_size = 0;
-    vmci_buffer_min_size = 0;
-    vmci_buffer_max_size = 0;
-    vmci_connect_timeout = -1;
-#endif
-}
-
-int zmq::options_t::set_curve_key (uint8_t *destination_,
-                                   const void *optval_,
-                                   size_t optvallen_)
-{
-    switch (optvallen_) {
-        case CURVE_KEYSIZE:
-            memcpy (destination_, optval_, optvallen_);
-            mechanism = ZMQ_CURVE;
-            return 0;
-
-        case CURVE_KEYSIZE_Z85 + 1:
-            if (zmq_z85_decode (destination_,
-                                reinterpret_cast<const char *> (optval_))) {
-                mechanism = ZMQ_CURVE;
-                return 0;
-            }
-            break;
-
-        case CURVE_KEYSIZE_Z85:
-            char z85_key[CURVE_KEYSIZE_Z85 + 1];
-            memcpy (z85_key, reinterpret_cast<const char *> (optval_),
-                    optvallen_);
-            z85_key[CURVE_KEYSIZE_Z85] = 0;
-            if (zmq_z85_decode (destination_, z85_key)) {
-                mechanism = ZMQ_CURVE;
-                return 0;
-            }
-            break;
-
-        default:
-            break;
-    }
-    return -1;
-}
-
-const int deciseconds_per_millisecond = 100;
-
-int zmq::options_t::setsockopt (int option_,
-                                const void *optval_,
-                                size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-#if defined(ZMQ_ACT_MILITANT)
-    bool malformed = true; //  Did caller pass a bad option value?
-#endif
-
-    switch (option_) {
-        case ZMQ_SNDHWM:
-            if (is_int && value >= 0) {
-                sndhwm = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVHWM:
-            if (is_int && value >= 0) {
-                rcvhwm = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_AFFINITY:
-            return do_setsockopt (optval_, optvallen_, &affinity);
-
-        case ZMQ_ROUTING_ID:
-            //  Routing id is any binary string from 1 to 255 octets
-            if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX) {
-                routing_id_size = static_cast<unsigned char> (optvallen_);
-                memcpy (routing_id, optval_, routing_id_size);
-                return 0;
-            }
-            break;
-
-        case ZMQ_RATE:
-            if (is_int && value > 0) {
-                rate = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECOVERY_IVL:
-            if (is_int && value >= 0) {
-                recovery_ivl = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SNDBUF:
-            if (is_int && value >= -1) {
-                sndbuf = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVBUF:
-            if (is_int && value >= -1) {
-                rcvbuf = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TOS:
-            if (is_int && value >= 0) {
-                tos = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_LINGER:
-            if (is_int && value >= -1) {
-                linger.store (value);
-                return 0;
-            }
-            break;
-
-        case ZMQ_CONNECT_TIMEOUT:
-            if (is_int && value >= 0) {
-                connect_timeout = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_MAXRT:
-            if (is_int && value >= 0) {
-                tcp_maxrt = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_STOP:
-            if (is_int) {
-                reconnect_stop = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_IVL:
-            if (is_int && value >= -1) {
-                reconnect_ivl = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_IVL_MAX:
-            if (is_int && value >= 0) {
-                reconnect_ivl_max = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BACKLOG:
-            if (is_int && value >= 0) {
-                backlog = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MAXMSGSIZE:
-            return do_setsockopt (optval_, optvallen_, &maxmsgsize);
-
-        case ZMQ_MULTICAST_HOPS:
-            if (is_int && value > 0) {
-                multicast_hops = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MULTICAST_MAXTPDU:
-            if (is_int && value > 0) {
-                multicast_maxtpdu = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVTIMEO:
-            if (is_int && value >= -1) {
-                rcvtimeo = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SNDTIMEO:
-            if (is_int && value >= -1) {
-                sndtimeo = value;
-                return 0;
-            }
-            break;
-
-        /*  Deprecated in favor of ZMQ_IPV6  */
-        case ZMQ_IPV4ONLY: {
-            bool value;
-            const int rc =
-              do_setsockopt_int_as_bool_strict (optval_, optvallen_, &value);
-            if (rc == 0)
-                ipv6 = !value;
-            return rc;
-        }
-
-        /*  To replace the somewhat surprising IPV4ONLY */
-        case ZMQ_IPV6:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &ipv6);
-
-        case ZMQ_SOCKS_PROXY:
-            return do_setsockopt_string_allow_empty_strict (
-              optval_, optvallen_, &socks_proxy_address, SIZE_MAX);
-
-        case ZMQ_SOCKS_USERNAME:
-            /* Make empty string or NULL equivalent. */
-            if (optval_ == NULL || optvallen_ == 0) {
-                socks_proxy_username.clear ();
-                return 0;
-            } else {
-                return do_setsockopt_string_allow_empty_strict (
-                  optval_, optvallen_, &socks_proxy_username, 255);
-            }
-        case ZMQ_SOCKS_PASSWORD:
-            /* Make empty string or NULL equivalent. */
-            if (optval_ == NULL || optvallen_ == 0) {
-                socks_proxy_password.clear ();
-                return 0;
-            } else {
-                return do_setsockopt_string_allow_empty_strict (
-                  optval_, optvallen_, &socks_proxy_password, 255);
-            }
-        case ZMQ_TCP_KEEPALIVE:
-            if (is_int && (value == -1 || value == 0 || value == 1)) {
-                tcp_keepalive = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_CNT:
-            if (is_int && (value == -1 || value >= 0)) {
-                tcp_keepalive_cnt = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_IDLE:
-            if (is_int && (value == -1 || value >= 0)) {
-                tcp_keepalive_idle = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_INTVL:
-            if (is_int && (value == -1 || value >= 0)) {
-                tcp_keepalive_intvl = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IMMEDIATE:
-            // TODO why is immediate not bool (and called non_immediate, as its meaning appears to be reversed)
-            if (is_int && (value == 0 || value == 1)) {
-                immediate = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_ACCEPT_FILTER: {
-            std::string filter_str;
-            int rc = do_setsockopt_string_allow_empty_strict (
-              optval_, optvallen_, &filter_str, UCHAR_MAX);
-            if (rc == 0) {
-                if (filter_str.empty ()) {
-                    tcp_accept_filters.clear ();
-                } else {
-                    tcp_address_mask_t mask;
-                    rc = mask.resolve (filter_str.c_str (), ipv6);
-                    if (rc == 0) {
-                        tcp_accept_filters.push_back (mask);
-                    }
-                }
-            }
-            return rc;
-        }
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-        case ZMQ_IPC_FILTER_UID:
-            return do_setsockopt_set (optval_, optvallen_,
-                                      &ipc_uid_accept_filters);
-
-
-        case ZMQ_IPC_FILTER_GID:
-            return do_setsockopt_set (optval_, optvallen_,
-                                      &ipc_gid_accept_filters);
-#endif
-
-#if defined ZMQ_HAVE_SO_PEERCRED
-        case ZMQ_IPC_FILTER_PID:
-            return do_setsockopt_set (optval_, optvallen_,
-                                      &ipc_pid_accept_filters);
-#endif
-
-        case ZMQ_PLAIN_SERVER:
-            if (is_int && (value == 0 || value == 1)) {
-                as_server = value;
-                mechanism = value ? ZMQ_PLAIN : ZMQ_NULL;
-                return 0;
-            }
-            break;
-
-        case ZMQ_PLAIN_USERNAME:
-            if (optvallen_ == 0 && optval_ == NULL) {
-                mechanism = ZMQ_NULL;
-                return 0;
-            } else if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX
-                       && optval_ != NULL) {
-                plain_username.assign (static_cast<const char *> (optval_),
-                                       optvallen_);
-                as_server = 0;
-                mechanism = ZMQ_PLAIN;
-                return 0;
-            }
-            break;
-
-        case ZMQ_PLAIN_PASSWORD:
-            if (optvallen_ == 0 && optval_ == NULL) {
-                mechanism = ZMQ_NULL;
-                return 0;
-            } else if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX
-                       && optval_ != NULL) {
-                plain_password.assign (static_cast<const char *> (optval_),
-                                       optvallen_);
-                as_server = 0;
-                mechanism = ZMQ_PLAIN;
-                return 0;
-            }
-            break;
-
-        case ZMQ_ZAP_DOMAIN:
-            return do_setsockopt_string_allow_empty_relaxed (
-              optval_, optvallen_, &zap_domain, UCHAR_MAX);
-
-            //  If curve encryption isn't built, these options provoke EINVAL
-#ifdef ZMQ_HAVE_CURVE
-        case ZMQ_CURVE_SERVER:
-            if (is_int && (value == 0 || value == 1)) {
-                as_server = value;
-                mechanism = value ? ZMQ_CURVE : ZMQ_NULL;
-                return 0;
-            }
-            break;
-
-        case ZMQ_CURVE_PUBLICKEY:
-            if (0 == set_curve_key (curve_public_key, optval_, optvallen_)) {
-                return 0;
-            }
-            break;
-
-        case ZMQ_CURVE_SECRETKEY:
-            if (0 == set_curve_key (curve_secret_key, optval_, optvallen_)) {
-                return 0;
-            }
-            break;
-
-        case ZMQ_CURVE_SERVERKEY:
-            if (0 == set_curve_key (curve_server_key, optval_, optvallen_)) {
-                as_server = 0;
-                return 0;
-            }
-            break;
-#endif
-
-        case ZMQ_CONFLATE:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &conflate);
-
-            //  If libgssapi isn't installed, these options provoke EINVAL
-#ifdef HAVE_LIBGSSAPI_KRB5
-        case ZMQ_GSSAPI_SERVER:
-            if (is_int && (value == 0 || value == 1)) {
-                as_server = value;
-                mechanism = ZMQ_GSSAPI;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_PRINCIPAL:
-            if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX && optval_ != NULL) {
-                gss_principal.assign ((const char *) optval_, optvallen_);
-                mechanism = ZMQ_GSSAPI;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_SERVICE_PRINCIPAL:
-            if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX && optval_ != NULL) {
-                gss_service_principal.assign ((const char *) optval_,
-                                              optvallen_);
-                mechanism = ZMQ_GSSAPI;
-                as_server = 0;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_PLAINTEXT:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &gss_plaintext);
-
-        case ZMQ_GSSAPI_PRINCIPAL_NAMETYPE:
-            if (is_int
-                && (value == ZMQ_GSSAPI_NT_HOSTBASED
-                    || value == ZMQ_GSSAPI_NT_USER_NAME
-                    || value == ZMQ_GSSAPI_NT_KRB5_PRINCIPAL)) {
-                gss_principal_nt = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE:
-            if (is_int
-                && (value == ZMQ_GSSAPI_NT_HOSTBASED
-                    || value == ZMQ_GSSAPI_NT_USER_NAME
-                    || value == ZMQ_GSSAPI_NT_KRB5_PRINCIPAL)) {
-                gss_service_principal_nt = value;
-                return 0;
-            }
-            break;
-#endif
-
-        case ZMQ_HANDSHAKE_IVL:
-            if (is_int && value >= 0) {
-                handshake_ivl = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_INVERT_MATCHING:
-            return do_setsockopt_int_as_bool_relaxed (optval_, optvallen_,
-                                                      &invert_matching);
-
-        case ZMQ_HEARTBEAT_IVL:
-            if (is_int && value >= 0) {
-                heartbeat_interval = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_TTL:
-            // Convert this to deciseconds from milliseconds
-            value = value / deciseconds_per_millisecond;
-            if (is_int && value >= 0 && value <= UINT16_MAX) {
-                heartbeat_ttl = static_cast<uint16_t> (value);
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_TIMEOUT:
-            if (is_int && value >= 0) {
-                heartbeat_timeout = value;
-                return 0;
-            }
-            break;
-
-#ifdef ZMQ_HAVE_VMCI
-        case ZMQ_VMCI_BUFFER_SIZE:
-            return do_setsockopt (optval_, optvallen_, &vmci_buffer_size);
-
-        case ZMQ_VMCI_BUFFER_MIN_SIZE:
-            return do_setsockopt (optval_, optvallen_, &vmci_buffer_min_size);
-
-        case ZMQ_VMCI_BUFFER_MAX_SIZE:
-            return do_setsockopt (optval_, optvallen_, &vmci_buffer_max_size);
-
-        case ZMQ_VMCI_CONNECT_TIMEOUT:
-            return do_setsockopt (optval_, optvallen_, &vmci_connect_timeout);
-#endif
-
-        case ZMQ_USE_FD:
-            if (is_int && value >= -1) {
-                use_fd = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BINDTODEVICE:
-            return do_setsockopt_string_allow_empty_strict (
-              optval_, optvallen_, &bound_device, BINDDEVSIZ);
-
-        case ZMQ_ZAP_ENFORCE_DOMAIN:
-            return do_setsockopt_int_as_bool_relaxed (optval_, optvallen_,
-                                                      &zap_enforce_domain);
-
-        case ZMQ_LOOPBACK_FASTPATH:
-            return do_setsockopt_int_as_bool_relaxed (optval_, optvallen_,
-                                                      &loopback_fastpath);
-
-        case ZMQ_METADATA:
-            if (optvallen_ > 0 && !is_int) {
-                const std::string s (static_cast<const char *> (optval_));
-                const size_t pos = s.find (':');
-                if (pos != std::string::npos && pos != 0
-                    && pos != s.length () - 1) {
-                    const std::string key = s.substr (0, pos);
-                    if (key.compare (0, 2, "X-") == 0
-                        && key.length () <= UCHAR_MAX) {
-                        std::string val = s.substr (pos + 1, s.length ());
-                        app_metadata.insert (
-                          std::pair<std::string, std::string> (key, val));
-                        return 0;
-                    }
-                }
-            }
-            errno = EINVAL;
-            return -1;
-
-        case ZMQ_MULTICAST_LOOP:
-            return do_setsockopt_int_as_bool_relaxed (optval_, optvallen_,
-                                                      &multicast_loop);
-
-#ifdef ZMQ_BUILD_DRAFT_API
-        case ZMQ_IN_BATCH_SIZE:
-            if (is_int && value > 0) {
-                in_batch_size = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_OUT_BATCH_SIZE:
-            if (is_int && value > 0) {
-                out_batch_size = value;
-                return 0;
-            }
-            break;
-
-#ifdef ZMQ_HAVE_WSS
-        case ZMQ_WSS_KEY_PEM:
-            // TODO: check if valid certificate
-            wss_key_pem = std::string ((char *) optval_, optvallen_);
-            return 0;
-        case ZMQ_WSS_CERT_PEM:
-            // TODO: check if valid certificate
-            wss_cert_pem = std::string ((char *) optval_, optvallen_);
-            return 0;
-        case ZMQ_WSS_TRUST_PEM:
-            // TODO: check if valid certificate
-            wss_trust_pem = std::string ((char *) optval_, optvallen_);
-            return 0;
-        case ZMQ_WSS_HOSTNAME:
-            wss_hostname = std::string ((char *) optval_, optvallen_);
-            return 0;
-        case ZMQ_WSS_TRUST_SYSTEM:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &wss_trust_system);
-#endif
-
-        case ZMQ_HELLO_MSG:
-            if (optvallen_ > 0) {
-                unsigned char *bytes = (unsigned char *) optval_;
-                hello_msg =
-                  std::vector<unsigned char> (bytes, bytes + optvallen_);
-            } else {
-                hello_msg = std::vector<unsigned char> ();
-            }
-
-            return 0;
-
-        case ZMQ_DISCONNECT_MSG:
-            if (optvallen_ > 0) {
-                unsigned char *bytes = (unsigned char *) optval_;
-                disconnect_msg =
-                  std::vector<unsigned char> (bytes, bytes + optvallen_);
-            } else {
-                disconnect_msg = std::vector<unsigned char> ();
-            }
-
-            return 0;
-
-#endif
-
-        default:
-#if defined(ZMQ_ACT_MILITANT)
-            //  There are valid scenarios for probing with unknown socket option
-            //  values, e.g. to check if security is enabled or not. This will not
-            //  provoke a militant assert. However, passing bad values to a valid
-            //  socket option will, if ZMQ_ACT_MILITANT is defined.
-            malformed = false;
-#endif
-            break;
-    }
-
-        // TODO mechanism should either be set explicitly, or determined when
-        // connecting. currently, it depends on the order of setsockopt calls
-        // if there is some inconsistency, which is confusing. in addition,
-        // the assumed or set mechanism should be queryable (as a socket option)
-
-#if defined(ZMQ_ACT_MILITANT)
-    //  There is no valid use case for passing an error back to the application
-    //  when it sent malformed arguments to a socket option. Use ./configure
-    //  --with-militant to enable this checking.
-    if (malformed)
-        zmq_assert (false);
-#endif
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::options_t::getsockopt (int option_,
-                                void *optval_,
-                                size_t *optvallen_) const
-{
-    const bool is_int = (*optvallen_ == sizeof (int));
-    int *value = static_cast<int *> (optval_);
-#if defined(ZMQ_ACT_MILITANT)
-    bool malformed = true; //  Did caller pass a bad option value?
-#endif
-
-    switch (option_) {
-        case ZMQ_SNDHWM:
-            if (is_int) {
-                *value = sndhwm;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVHWM:
-            if (is_int) {
-                *value = rcvhwm;
-                return 0;
-            }
-            break;
-
-        case ZMQ_AFFINITY:
-            if (*optvallen_ == sizeof (uint64_t)) {
-                *(static_cast<uint64_t *> (optval_)) = affinity;
-                return 0;
-            }
-            break;
-
-        case ZMQ_ROUTING_ID:
-            return do_getsockopt (optval_, optvallen_, routing_id,
-                                  routing_id_size);
-
-        case ZMQ_RATE:
-            if (is_int) {
-                *value = rate;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECOVERY_IVL:
-            if (is_int) {
-                *value = recovery_ivl;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SNDBUF:
-            if (is_int) {
-                *value = sndbuf;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVBUF:
-            if (is_int) {
-                *value = rcvbuf;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TOS:
-            if (is_int) {
-                *value = tos;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TYPE:
-            if (is_int) {
-                *value = type;
-                return 0;
-            }
-            break;
-
-        case ZMQ_LINGER:
-            if (is_int) {
-                *value = linger.load ();
-                return 0;
-            }
-            break;
-
-        case ZMQ_CONNECT_TIMEOUT:
-            if (is_int) {
-                *value = connect_timeout;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_MAXRT:
-            if (is_int) {
-                *value = tcp_maxrt;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_STOP:
-            if (is_int) {
-                *value = reconnect_stop;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_IVL:
-            if (is_int) {
-                *value = reconnect_ivl;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_IVL_MAX:
-            if (is_int) {
-                *value = reconnect_ivl_max;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BACKLOG:
-            if (is_int) {
-                *value = backlog;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MAXMSGSIZE:
-            if (*optvallen_ == sizeof (int64_t)) {
-                *(static_cast<int64_t *> (optval_)) = maxmsgsize;
-                *optvallen_ = sizeof (int64_t);
-                return 0;
-            }
-            break;
-
-        case ZMQ_MULTICAST_HOPS:
-            if (is_int) {
-                *value = multicast_hops;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MULTICAST_MAXTPDU:
-            if (is_int) {
-                *value = multicast_maxtpdu;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVTIMEO:
-            if (is_int) {
-                *value = rcvtimeo;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SNDTIMEO:
-            if (is_int) {
-                *value = sndtimeo;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IPV4ONLY:
-            if (is_int) {
-                *value = 1 - ipv6;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IPV6:
-            if (is_int) {
-                *value = ipv6;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IMMEDIATE:
-            if (is_int) {
-                *value = immediate;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SOCKS_PROXY:
-            return do_getsockopt (optval_, optvallen_, socks_proxy_address);
-
-        case ZMQ_SOCKS_USERNAME:
-            return do_getsockopt (optval_, optvallen_, socks_proxy_username);
-
-        case ZMQ_SOCKS_PASSWORD:
-            return do_getsockopt (optval_, optvallen_, socks_proxy_password);
-
-        case ZMQ_TCP_KEEPALIVE:
-            if (is_int) {
-                *value = tcp_keepalive;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_CNT:
-            if (is_int) {
-                *value = tcp_keepalive_cnt;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_IDLE:
-            if (is_int) {
-                *value = tcp_keepalive_idle;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_INTVL:
-            if (is_int) {
-                *value = tcp_keepalive_intvl;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MECHANISM:
-            if (is_int) {
-                *value = mechanism;
-                return 0;
-            }
-            break;
-
-        case ZMQ_PLAIN_SERVER:
-            if (is_int) {
-                *value = as_server && mechanism == ZMQ_PLAIN;
-                return 0;
-            }
-            break;
-
-        case ZMQ_PLAIN_USERNAME:
-            return do_getsockopt (optval_, optvallen_, plain_username);
-
-        case ZMQ_PLAIN_PASSWORD:
-            return do_getsockopt (optval_, optvallen_, plain_password);
-
-        case ZMQ_ZAP_DOMAIN:
-            return do_getsockopt (optval_, optvallen_, zap_domain);
-
-            //  If curve encryption isn't built, these options provoke EINVAL
-#ifdef ZMQ_HAVE_CURVE
-        case ZMQ_CURVE_SERVER:
-            if (is_int) {
-                *value = as_server && mechanism == ZMQ_CURVE;
-                return 0;
-            }
-            break;
-
-        case ZMQ_CURVE_PUBLICKEY:
-            return do_getsockopt_curve_key (optval_, optvallen_,
-                                            curve_public_key);
-
-        case ZMQ_CURVE_SECRETKEY:
-            return do_getsockopt_curve_key (optval_, optvallen_,
-                                            curve_secret_key);
-
-        case ZMQ_CURVE_SERVERKEY:
-            return do_getsockopt_curve_key (optval_, optvallen_,
-                                            curve_server_key);
-#endif
-
-        case ZMQ_CONFLATE:
-            if (is_int) {
-                *value = conflate;
-                return 0;
-            }
-            break;
-
-            //  If libgssapi isn't installed, these options provoke EINVAL
-#ifdef HAVE_LIBGSSAPI_KRB5
-        case ZMQ_GSSAPI_SERVER:
-            if (is_int) {
-                *value = as_server && mechanism == ZMQ_GSSAPI;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_PRINCIPAL:
-            return do_getsockopt (optval_, optvallen_, gss_principal);
-
-        case ZMQ_GSSAPI_SERVICE_PRINCIPAL:
-            return do_getsockopt (optval_, optvallen_, gss_service_principal);
-
-        case ZMQ_GSSAPI_PLAINTEXT:
-            if (is_int) {
-                *value = gss_plaintext;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_PRINCIPAL_NAMETYPE:
-            if (is_int) {
-                *value = gss_principal_nt;
-                return 0;
-            }
-            break;
-        case ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE:
-            if (is_int) {
-                *value = gss_service_principal_nt;
-                return 0;
-            }
-            break;
-#endif
-
-        case ZMQ_HANDSHAKE_IVL:
-            if (is_int) {
-                *value = handshake_ivl;
-                return 0;
-            }
-            break;
-
-        case ZMQ_INVERT_MATCHING:
-            if (is_int) {
-                *value = invert_matching;
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_IVL:
-            if (is_int) {
-                *value = heartbeat_interval;
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_TTL:
-            if (is_int) {
-                // Convert the internal deciseconds value to milliseconds
-                *value = heartbeat_ttl * 100;
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_TIMEOUT:
-            if (is_int) {
-                *value = heartbeat_timeout;
-                return 0;
-            }
-            break;
-
-        case ZMQ_USE_FD:
-            if (is_int) {
-                *value = use_fd;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BINDTODEVICE:
-            return do_getsockopt (optval_, optvallen_, bound_device);
-
-        case ZMQ_ZAP_ENFORCE_DOMAIN:
-            if (is_int) {
-                *value = zap_enforce_domain;
-                return 0;
-            }
-            break;
-
-        case ZMQ_LOOPBACK_FASTPATH:
-            if (is_int) {
-                *value = loopback_fastpath;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MULTICAST_LOOP:
-            if (is_int) {
-                *value = multicast_loop;
-                return 0;
-            }
-            break;
-
-#ifdef ZMQ_BUILD_DRAFT_API
-        case ZMQ_ROUTER_NOTIFY:
-            if (is_int) {
-                *value = router_notify;
-                return 0;
-            }
-            break;
-        case ZMQ_IN_BATCH_SIZE:
-            if (is_int) {
-                *value = in_batch_size;
-                return 0;
-            }
-            break;
-
-        case ZMQ_OUT_BATCH_SIZE:
-            if (is_int) {
-                *value = out_batch_size;
-                return 0;
-            }
-            break;
-#endif
-
-
-        default:
-#if defined(ZMQ_ACT_MILITANT)
-            malformed = false;
-#endif
-            break;
-    }
-#if defined(ZMQ_ACT_MILITANT)
-    if (malformed)
-        zmq_assert (false);
-#endif
-    errno = EINVAL;
-    return -1;
-}
diff --git a/src/options.hpp b/src/options.hpp
deleted file mode 100644
index 556eea468..000000000
--- a/src/options.hpp
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_OPTIONS_HPP_INCLUDED__
-#define __ZMQ_OPTIONS_HPP_INCLUDED__
-
-#include <string>
-#include <vector>
-#include <map>
-
-#include "atomic_ptr.hpp"
-#include "stddef.h"
-#include "stdint.hpp"
-#include "tcp_address.hpp"
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-#include <set>
-#include <sys/types.h>
-#endif
-#ifdef ZMQ_HAVE_LOCAL_PEERCRED
-#include <sys/ucred.h>
-#endif
-
-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
-#include <type_traits>
-#endif
-
-//  Normal base 256 key is 32 bytes
-#define CURVE_KEYSIZE 32
-//  Key encoded using Z85 is 40 bytes
-#define CURVE_KEYSIZE_Z85 40
-
-namespace zmq
-{
-struct options_t
-{
-    options_t ();
-
-    int set_curve_key (uint8_t *destination_,
-                       const void *optval_,
-                       size_t optvallen_);
-
-    int setsockopt (int option_, const void *optval_, size_t optvallen_);
-    int getsockopt (int option_, void *optval_, size_t *optvallen_) const;
-
-    //  High-water marks for message pipes.
-    int sndhwm;
-    int rcvhwm;
-
-    //  I/O thread affinity.
-    uint64_t affinity;
-
-    //  Socket routing id.
-    unsigned char routing_id_size;
-    unsigned char routing_id[256];
-
-    //  Maximum transfer rate [kb/s]. Default 100kb/s.
-    int rate;
-
-    //  Reliability time interval [ms]. Default 10 seconds.
-    int recovery_ivl;
-
-    // Sets the time-to-live field in every multicast packet sent.
-    int multicast_hops;
-
-    // Sets the maximum transport data unit size in every multicast
-    // packet sent.
-    int multicast_maxtpdu;
-
-    // SO_SNDBUF and SO_RCVBUF to be passed to underlying transport sockets.
-    int sndbuf;
-    int rcvbuf;
-
-    // Type of service (containing DSCP and ECN socket options)
-    int tos;
-
-    //  Socket type.
-    int8_t type;
-
-    //  Linger time, in milliseconds.
-    atomic_value_t linger;
-
-    //  Maximum interval in milliseconds beyond which userspace will
-    //  timeout connect().
-    //  Default 0 (unused)
-    int connect_timeout;
-
-    //  Maximum interval in milliseconds beyond which TCP will timeout
-    //  retransmitted packets.
-    //  Default 0 (unused)
-    int tcp_maxrt;
-
-    //  Disable reconnect under certain conditions
-    //  Default 0
-    int reconnect_stop;
-
-    //  Minimum interval between attempts to reconnect, in milliseconds.
-    //  Default 100ms
-    int reconnect_ivl;
-
-    //  Maximum interval between attempts to reconnect, in milliseconds.
-    //  Default 0 (unused)
-    int reconnect_ivl_max;
-
-    //  Maximum backlog for pending connections.
-    int backlog;
-
-    //  Maximal size of message to handle.
-    int64_t maxmsgsize;
-
-    // The timeout for send/recv operations for this socket, in milliseconds.
-    int rcvtimeo;
-    int sndtimeo;
-
-    //  If true, IPv6 is enabled (as well as IPv4)
-    bool ipv6;
-
-    //  If 1, connecting pipes are not attached immediately, meaning a send()
-    //  on a socket with only connecting pipes would block
-    int immediate;
-
-    //  If 1, (X)SUB socket should filter the messages. If 0, it should not.
-    bool filter;
-
-    //  If true, the subscription matching on (X)PUB and (X)SUB sockets
-    //  is reversed. Messages are sent to and received by non-matching
-    //  sockets.
-    bool invert_matching;
-
-    //  If true, the routing id message is forwarded to the socket.
-    bool recv_routing_id;
-
-    // if true, router socket accepts non-zmq tcp connections
-    bool raw_socket;
-    bool raw_notify; //  Provide connect notifications
-
-    //  Address of SOCKS proxy
-    std::string socks_proxy_address;
-
-    // Credentials for SOCKS proxy.
-    // Conneciton method will be basic auth if username
-    // is not empty, no auth otherwise.
-    std::string socks_proxy_username;
-    std::string socks_proxy_password;
-
-    //  TCP keep-alive settings.
-    //  Defaults to -1 = do not change socket options
-    int tcp_keepalive;
-    int tcp_keepalive_cnt;
-    int tcp_keepalive_idle;
-    int tcp_keepalive_intvl;
-
-    // TCP accept() filters
-    typedef std::vector<tcp_address_mask_t> tcp_accept_filters_t;
-    tcp_accept_filters_t tcp_accept_filters;
-
-    // IPC accept() filters
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    typedef std::set<uid_t> ipc_uid_accept_filters_t;
-    ipc_uid_accept_filters_t ipc_uid_accept_filters;
-    typedef std::set<gid_t> ipc_gid_accept_filters_t;
-    ipc_gid_accept_filters_t ipc_gid_accept_filters;
-#endif
-#if defined ZMQ_HAVE_SO_PEERCRED
-    typedef std::set<pid_t> ipc_pid_accept_filters_t;
-    ipc_pid_accept_filters_t ipc_pid_accept_filters;
-#endif
-
-    //  Security mechanism for all connections on this socket
-    int mechanism;
-
-    //  If peer is acting as server for PLAIN or CURVE mechanisms
-    int as_server;
-
-    //  ZAP authentication domain
-    std::string zap_domain;
-
-    //  Security credentials for PLAIN mechanism
-    std::string plain_username;
-    std::string plain_password;
-
-    //  Security credentials for CURVE mechanism
-    uint8_t curve_public_key[CURVE_KEYSIZE];
-    uint8_t curve_secret_key[CURVE_KEYSIZE];
-    uint8_t curve_server_key[CURVE_KEYSIZE];
-
-    //  Principals for GSSAPI mechanism
-    std::string gss_principal;
-    std::string gss_service_principal;
-
-    //  Name types GSSAPI principals
-    int gss_principal_nt;
-    int gss_service_principal_nt;
-
-    //  If true, gss encryption will be disabled
-    bool gss_plaintext;
-
-    //  ID of the socket.
-    int socket_id;
-
-    //  If true, socket conflates outgoing/incoming messages.
-    //  Applicable to dealer, push/pull, pub/sub socket types.
-    //  Cannot receive multi-part messages.
-    //  Ignores hwm
-    bool conflate;
-
-    //  If connection handshake is not done after this many milliseconds,
-    //  close socket.  Default is 30 secs.  0 means no handshake timeout.
-    int handshake_ivl;
-
-    bool connected;
-    //  If remote peer receives a PING message and doesn't receive another
-    //  message within the ttl value, it should close the connection
-    //  (measured in tenths of a second)
-    uint16_t heartbeat_ttl;
-    //  Time in milliseconds between sending heartbeat PING messages.
-    int heartbeat_interval;
-    //  Time in milliseconds to wait for a PING response before disconnecting
-    int heartbeat_timeout;
-
-#if defined ZMQ_HAVE_VMCI
-    uint64_t vmci_buffer_size;
-    uint64_t vmci_buffer_min_size;
-    uint64_t vmci_buffer_max_size;
-    int vmci_connect_timeout;
-#endif
-
-    //  When creating a new ZMQ socket, if this option is set the value
-    //  will be used as the File Descriptor instead of allocating a new
-    //  one via the socket () system call.
-    int use_fd;
-
-    // Device to bind the underlying socket to, eg. VRF or interface
-    std::string bound_device;
-
-    //  Enforce a non-empty ZAP domain requirement for PLAIN auth
-    bool zap_enforce_domain;
-
-    // Use of loopback fastpath.
-    bool loopback_fastpath;
-
-    //  Loop sent multicast packets to local sockets
-    bool multicast_loop;
-
-    //  Maximal batching size for engines with receiving functionality.
-    //  So, if there are 10 messages that fit into the batch size, all of
-    //  them may be read by a single 'recv' system call, thus avoiding
-    //  unnecessary network stack traversals.
-    int in_batch_size;
-    //  Maximal batching size for engines with sending functionality.
-    //  So, if there are 10 messages that fit into the batch size, all of
-    //  them may be written by a single 'send' system call, thus avoiding
-    //  unnecessary network stack traversals.
-    int out_batch_size;
-
-    // Use zero copy strategy for storing message content when decoding.
-    bool zero_copy;
-
-    // Router socket ZMQ_NOTIFY_CONNECT/ZMQ_NOTIFY_DISCONNECT notifications
-    int router_notify;
-
-    // Application metadata
-    std::map<std::string, std::string> app_metadata;
-
-    // Version of monitor events to emit
-    int monitor_event_version;
-
-    //  WSS Keys
-    std::string wss_key_pem;
-    std::string wss_cert_pem;
-    std::string wss_trust_pem;
-    std::string wss_hostname;
-    bool wss_trust_system;
-
-    //  Hello msg
-    std::vector<unsigned char> hello_msg;
-    bool can_send_hello_msg;
-
-    //  Disconnect msg
-    std::vector<unsigned char> disconnect_msg;
-    bool can_recv_disconnect_msg;
-};
-
-inline bool get_effective_conflate_option (const options_t &options)
-{
-    // conflate is only effective for some socket types
-    return options.conflate
-           && (options.type == ZMQ_DEALER || options.type == ZMQ_PULL
-               || options.type == ZMQ_PUSH || options.type == ZMQ_PUB
-               || options.type == ZMQ_SUB);
-}
-
-int do_getsockopt (void *optval_,
-                   size_t *optvallen_,
-                   const void *value_,
-                   size_t value_len_);
-
-template <typename T>
-int do_getsockopt (void *const optval_, size_t *const optvallen_, T value_)
-{
-#if __cplusplus >= 201103L && (!defined(__GNUC__) || __GNUC__ > 5)
-    static_assert (std::is_trivially_copyable<T>::value,
-                   "invalid use of do_getsockopt");
-#endif
-    return do_getsockopt (optval_, optvallen_, &value_, sizeof (T));
-}
-
-int do_getsockopt (void *optval_,
-                   size_t *optvallen_,
-                   const std::string &value_);
-
-int do_setsockopt_int_as_bool_strict (const void *optval_,
-                                      size_t optvallen_,
-                                      bool *out_value_);
-
-int do_setsockopt_int_as_bool_relaxed (const void *optval_,
-                                       size_t optvallen_,
-                                       bool *out_value_);
-}
-
-#endif
diff --git a/src/own.cpp b/src/own.cpp
deleted file mode 100644
index f74824bb2..000000000
--- a/src/own.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "own.hpp"
-#include "err.hpp"
-#include "io_thread.hpp"
-
-zmq::own_t::own_t (class ctx_t *parent_, uint32_t tid_) :
-    object_t (parent_, tid_),
-    _terminating (false),
-    _sent_seqnum (0),
-    _processed_seqnum (0),
-    _owner (NULL),
-    _term_acks (0)
-{
-}
-
-zmq::own_t::own_t (io_thread_t *io_thread_, const options_t &options_) :
-    object_t (io_thread_),
-    options (options_),
-    _terminating (false),
-    _sent_seqnum (0),
-    _processed_seqnum (0),
-    _owner (NULL),
-    _term_acks (0)
-{
-}
-
-zmq::own_t::~own_t ()
-{
-}
-
-void zmq::own_t::set_owner (own_t *owner_)
-{
-    zmq_assert (!_owner);
-    _owner = owner_;
-}
-
-void zmq::own_t::inc_seqnum ()
-{
-    //  This function may be called from a different thread!
-    _sent_seqnum.add (1);
-}
-
-void zmq::own_t::process_seqnum ()
-{
-    //  Catch up with counter of processed commands.
-    _processed_seqnum++;
-
-    //  We may have catched up and still have pending terms acks.
-    check_term_acks ();
-}
-
-void zmq::own_t::launch_child (own_t *object_)
-{
-    //  Specify the owner of the object.
-    object_->set_owner (this);
-
-    //  Plug the object into the I/O thread.
-    send_plug (object_);
-
-    //  Take ownership of the object.
-    send_own (this, object_);
-}
-
-void zmq::own_t::term_child (own_t *object_)
-{
-    process_term_req (object_);
-}
-
-void zmq::own_t::process_term_req (own_t *object_)
-{
-    //  When shutting down we can ignore termination requests from owned
-    //  objects. The termination request was already sent to the object.
-    if (_terminating)
-        return;
-
-    //  If not found, we assume that termination request was already sent to
-    //  the object so we can safely ignore the request.
-    if (0 == _owned.erase (object_))
-        return;
-
-    //  If I/O object is well and alive let's ask it to terminate.
-    register_term_acks (1);
-
-    //  Note that this object is the root of the (partial shutdown) thus, its
-    //  value of linger is used, rather than the value stored by the children.
-    send_term (object_, options.linger.load ());
-}
-
-void zmq::own_t::process_own (own_t *object_)
-{
-    //  If the object is already being shut down, new owned objects are
-    //  immediately asked to terminate. Note that linger is set to zero.
-    if (_terminating) {
-        register_term_acks (1);
-        send_term (object_, 0);
-        return;
-    }
-
-    //  Store the reference to the owned object.
-    _owned.insert (object_);
-}
-
-void zmq::own_t::terminate ()
-{
-    //  If termination is already underway, there's no point
-    //  in starting it anew.
-    if (_terminating)
-        return;
-
-    //  As for the root of the ownership tree, there's no one to terminate it,
-    //  so it has to terminate itself.
-    if (!_owner) {
-        process_term (options.linger.load ());
-        return;
-    }
-
-    //  If I am an owned object, I'll ask my owner to terminate me.
-    send_term_req (_owner, this);
-}
-
-bool zmq::own_t::is_terminating () const
-{
-    return _terminating;
-}
-
-void zmq::own_t::process_term (int linger_)
-{
-    //  Double termination should never happen.
-    zmq_assert (!_terminating);
-
-    //  Send termination request to all owned objects.
-    for (owned_t::iterator it = _owned.begin (), end = _owned.end (); it != end;
-         ++it)
-        send_term (*it, linger_);
-    register_term_acks (static_cast<int> (_owned.size ()));
-    _owned.clear ();
-
-    //  Start termination process and check whether by chance we cannot
-    //  terminate immediately.
-    _terminating = true;
-    check_term_acks ();
-}
-
-void zmq::own_t::register_term_acks (int count_)
-{
-    _term_acks += count_;
-}
-
-void zmq::own_t::unregister_term_ack ()
-{
-    zmq_assert (_term_acks > 0);
-    _term_acks--;
-
-    //  This may be a last ack we are waiting for before termination...
-    check_term_acks ();
-}
-
-void zmq::own_t::process_term_ack ()
-{
-    unregister_term_ack ();
-}
-
-void zmq::own_t::check_term_acks ()
-{
-    if (_terminating && _processed_seqnum == _sent_seqnum.get ()
-        && _term_acks == 0) {
-        //  Sanity check. There should be no active children at this point.
-        zmq_assert (_owned.empty ());
-
-        //  The root object has nobody to confirm the termination to.
-        //  Other nodes will confirm the termination to the owner.
-        if (_owner)
-            send_term_ack (_owner);
-
-        //  Deallocate the resources.
-        process_destroy ();
-    }
-}
-
-void zmq::own_t::process_destroy ()
-{
-    delete this;
-}
diff --git a/src/own.hpp b/src/own.hpp
deleted file mode 100644
index 21463fe32..000000000
--- a/src/own.hpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_OWN_HPP_INCLUDED__
-#define __ZMQ_OWN_HPP_INCLUDED__
-
-#include <set>
-
-#include "object.hpp"
-#include "options.hpp"
-#include "atomic_counter.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class io_thread_t;
-
-//  Base class for objects forming a part of ownership hierarchy.
-//  It handles initialisation and destruction of such objects.
-
-class own_t : public object_t
-{
-  public:
-    //  Note that the owner is unspecified in the constructor.
-    //  It'll be supplied later on when the object is plugged in.
-
-    //  The object is not living within an I/O thread. It has it's own
-    //  thread outside of 0MQ infrastructure.
-    own_t (zmq::ctx_t *parent_, uint32_t tid_);
-
-    //  The object is living within I/O thread.
-    own_t (zmq::io_thread_t *io_thread_, const options_t &options_);
-
-    //  When another owned object wants to send command to this object
-    //  it calls this function to let it know it should not shut down
-    //  before the command is delivered.
-    void inc_seqnum ();
-
-    //  Use following two functions to wait for arbitrary events before
-    //  terminating. Just add number of events to wait for using
-    //  register_tem_acks functions. When event occurs, call
-    //  remove_term_ack. When number of pending acks reaches zero
-    //  object will be deallocated.
-    void register_term_acks (int count_);
-    void unregister_term_ack ();
-
-  protected:
-    //  Launch the supplied object and become its owner.
-    void launch_child (own_t *object_);
-
-    //  Terminate owned object
-    void term_child (own_t *object_);
-
-    //  Ask owner object to terminate this object. It may take a while
-    //  while actual termination is started. This function should not be
-    //  called more than once.
-    void terminate ();
-
-    //  Returns true if the object is in process of termination.
-    bool is_terminating () const;
-
-    //  Derived object destroys own_t. There's no point in allowing
-    //  others to invoke the destructor. At the same time, it has to be
-    //  virtual so that generic own_t deallocation mechanism destroys
-    //  specific type of the owned object correctly.
-    ~own_t () ZMQ_OVERRIDE;
-
-    //  Term handler is protected rather than private so that it can
-    //  be intercepted by the derived class. This is useful to add custom
-    //  steps to the beginning of the termination process.
-    void process_term (int linger_) ZMQ_OVERRIDE;
-
-    //  A place to hook in when physical destruction of the object
-    //  is to be delayed.
-    virtual void process_destroy ();
-
-    //  Socket options associated with this object.
-    options_t options;
-
-  private:
-    //  Set owner of the object
-    void set_owner (own_t *owner_);
-
-    //  Handlers for incoming commands.
-    void process_own (own_t *object_) ZMQ_OVERRIDE;
-    void process_term_req (own_t *object_) ZMQ_OVERRIDE;
-    void process_term_ack () ZMQ_OVERRIDE;
-    void process_seqnum () ZMQ_OVERRIDE;
-
-    //  Check whether all the pending term acks were delivered.
-    //  If so, deallocate this object.
-    void check_term_acks ();
-
-    //  True if termination was already initiated. If so, we can destroy
-    //  the object if there are no more child objects or pending term acks.
-    bool _terminating;
-
-    //  Sequence number of the last command sent to this object.
-    atomic_counter_t _sent_seqnum;
-
-    //  Sequence number of the last command processed by this object.
-    uint64_t _processed_seqnum;
-
-    //  Socket owning this object. It's responsible for shutting down
-    //  this object.
-    own_t *_owner;
-
-    //  List of all objects owned by this socket. We are responsible
-    //  for deallocating them before we quit.
-    typedef std::set<own_t *> owned_t;
-    owned_t _owned;
-
-    //  Number of events we have to get before we can destroy the object.
-    int _term_acks;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (own_t)
-};
-}
-
-#endif
diff --git a/src/pair.cpp b/src/pair.cpp
deleted file mode 100644
index f3bfe34b8..000000000
--- a/src/pair.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "pair.hpp"
-#include "err.hpp"
-#include "pipe.hpp"
-#include "msg.hpp"
-
-zmq::pair_t::pair_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_),
-    _pipe (NULL),
-    _last_in (NULL)
-{
-    options.type = ZMQ_PAIR;
-}
-
-zmq::pair_t::~pair_t ()
-{
-    zmq_assert (!_pipe);
-}
-
-void zmq::pair_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_ != NULL);
-
-    //  ZMQ_PAIR socket can only be connected to a single peer.
-    //  The socket rejects any further connection requests.
-    if (_pipe == NULL)
-        _pipe = pipe_;
-    else
-        pipe_->terminate (false);
-}
-
-void zmq::pair_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (pipe_ == _pipe) {
-        if (_last_in == _pipe) {
-            _last_in = NULL;
-        }
-        _pipe = NULL;
-    }
-}
-
-void zmq::pair_t::xread_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-void zmq::pair_t::xwrite_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-int zmq::pair_t::xsend (msg_t *msg_)
-{
-    if (!_pipe || !_pipe->write (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (!(msg_->flags () & msg_t::more))
-        _pipe->flush ();
-
-    //  Detach the original message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::pair_t::xrecv (msg_t *msg_)
-{
-    //  Deallocate old content of the message.
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    if (!_pipe || !_pipe->read (msg_)) {
-        //  Initialise the output parameter to be a 0-byte message.
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-
-        errno = EAGAIN;
-        return -1;
-    }
-    _last_in = _pipe;
-    return 0;
-}
-
-bool zmq::pair_t::xhas_in ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_read ();
-}
-
-bool zmq::pair_t::xhas_out ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_write ();
-}
diff --git a/src/pair.hpp b/src/pair.hpp
deleted file mode 100644
index 2d7bc0711..000000000
--- a/src/pair.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PAIR_HPP_INCLUDED__
-#define __ZMQ_PAIR_HPP_INCLUDED__
-
-#include "blob.hpp"
-#include "socket_base.hpp"
-#include "session_base.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class pair_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    pair_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~pair_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    zmq::pipe_t *_pipe;
-
-    zmq::pipe_t *_last_in;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pair_t)
-};
-}
-
-#endif
diff --git a/src/peer.cpp b/src/peer.cpp
deleted file mode 100644
index 4d7e74615..000000000
--- a/src/peer.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "peer.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::peer_t::peer_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    server_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_PEER;
-    options.can_send_hello_msg = true;
-    options.can_recv_disconnect_msg = true;
-}
-
-uint32_t zmq::peer_t::connect_peer (const char *endpoint_uri_)
-{
-    scoped_optional_lock_t sync_lock (&_sync);
-
-    // connect_peer cannot work with immediate enabled
-    if (options.immediate == 1) {
-        errno = EFAULT;
-        return 0;
-    }
-
-    int rc = socket_base_t::connect_internal (endpoint_uri_);
-    if (rc != 0)
-        return 0;
-
-    return _peer_last_routing_id;
-}
-
-void zmq::peer_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    server_t::xattach_pipe (pipe_, subscribe_to_all_, locally_initiated_);
-    _peer_last_routing_id = pipe_->get_server_socket_routing_id ();
-}
diff --git a/src/peer.hpp b/src/peer.hpp
deleted file mode 100644
index 96674b29e..000000000
--- a/src/peer.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PEER_HPP_INCLUDED__
-#define __ZMQ_PEER_HPP_INCLUDED__
-
-#include <map>
-
-#include "socket_base.hpp"
-#include "server.hpp"
-#include "session_base.hpp"
-#include "stdint.hpp"
-#include "blob.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-
-class peer_t ZMQ_FINAL : public server_t
-{
-  public:
-    peer_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-
-    uint32_t connect_peer (const char *endpoint_uri_);
-
-  private:
-    uint32_t _peer_last_routing_id;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (peer_t)
-};
-}
-
-#endif
diff --git a/src/pgm_receiver.cpp b/src/pgm_receiver.cpp
deleted file mode 100644
index 227efa063..000000000
--- a/src/pgm_receiver.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#include <new>
-
-#include "pgm_receiver.hpp"
-#include "session_base.hpp"
-#include "v1_decoder.hpp"
-#include "stdint.hpp"
-#include "wire.hpp"
-#include "err.hpp"
-
-zmq::pgm_receiver_t::pgm_receiver_t (class io_thread_t *parent_,
-                                     const options_t &options_) :
-    io_object_t (parent_),
-    has_rx_timer (false),
-    pgm_socket (true, options_),
-    options (options_),
-    session (NULL),
-    active_tsi (NULL),
-    insize (0)
-{
-}
-
-zmq::pgm_receiver_t::~pgm_receiver_t ()
-{
-    //  Destructor should not be called before unplug.
-    zmq_assert (peers.empty ());
-}
-
-int zmq::pgm_receiver_t::init (bool udp_encapsulation_, const char *network_)
-{
-    return pgm_socket.init (udp_encapsulation_, network_);
-}
-
-void zmq::pgm_receiver_t::plug (io_thread_t *io_thread_,
-                                session_base_t *session_)
-{
-    LIBZMQ_UNUSED (io_thread_);
-    //  Retrieve PGM fds and start polling.
-    fd_t socket_fd = retired_fd;
-    fd_t waiting_pipe_fd = retired_fd;
-    pgm_socket.get_receiver_fds (&socket_fd, &waiting_pipe_fd);
-    socket_handle = add_fd (socket_fd);
-    pipe_handle = add_fd (waiting_pipe_fd);
-    set_pollin (pipe_handle);
-    set_pollin (socket_handle);
-
-    session = session_;
-
-    //  If there are any subscriptions already queued in the session, drop them.
-    drop_subscriptions ();
-}
-
-void zmq::pgm_receiver_t::unplug ()
-{
-    //  Delete decoders.
-    for (peers_t::iterator it = peers.begin (), end = peers.end (); it != end;
-         ++it) {
-        if (it->second.decoder != NULL) {
-            LIBZMQ_DELETE (it->second.decoder);
-        }
-    }
-    peers.clear ();
-    active_tsi = NULL;
-
-    if (has_rx_timer) {
-        cancel_timer (rx_timer_id);
-        has_rx_timer = false;
-    }
-
-    rm_fd (socket_handle);
-    rm_fd (pipe_handle);
-
-    session = NULL;
-}
-
-void zmq::pgm_receiver_t::terminate ()
-{
-    unplug ();
-    delete this;
-}
-
-void zmq::pgm_receiver_t::restart_output ()
-{
-    drop_subscriptions ();
-}
-
-bool zmq::pgm_receiver_t::restart_input ()
-{
-    zmq_assert (session != NULL);
-    zmq_assert (active_tsi != NULL);
-
-    const peers_t::iterator it = peers.find (*active_tsi);
-    zmq_assert (it != peers.end ());
-    zmq_assert (it->second.joined);
-
-    //  Push the pending message into the session.
-    int rc = session->push_msg (it->second.decoder->msg ());
-    errno_assert (rc == 0);
-
-    if (insize > 0) {
-        rc = process_input (it->second.decoder);
-        if (rc == -1) {
-            //  HWM reached; we will try later.
-            if (errno == EAGAIN) {
-                session->flush ();
-                return true;
-            }
-            //  Data error. Delete message decoder, mark the
-            //  peer as not joined and drop remaining data.
-            it->second.joined = false;
-            LIBZMQ_DELETE (it->second.decoder);
-            insize = 0;
-        }
-    }
-
-    //  Resume polling.
-    set_pollin (pipe_handle);
-    set_pollin (socket_handle);
-
-    active_tsi = NULL;
-    in_event ();
-
-    return true;
-}
-
-const zmq::endpoint_uri_pair_t &zmq::pgm_receiver_t::get_endpoint () const
-{
-    return _empty_endpoint;
-}
-
-void zmq::pgm_receiver_t::in_event ()
-{
-    // If active_tsi is not null, there is a pending restart_input.
-    // Keep the internal state as is so that restart_input would process the right data
-    if (active_tsi) {
-        return;
-    }
-
-    // Read data from the underlying pgm_socket.
-    const pgm_tsi_t *tsi = NULL;
-
-    if (has_rx_timer) {
-        cancel_timer (rx_timer_id);
-        has_rx_timer = false;
-    }
-
-    //  TODO: This loop can effectively block other engines in the same I/O
-    //  thread in the case of high load.
-    while (true) {
-        //  Get new batch of data.
-        //  Note the workaround made not to break strict-aliasing rules.
-        insize = 0;
-        void *tmp = NULL;
-        ssize_t received = pgm_socket.receive (&tmp, &tsi);
-
-        //  No data to process. This may happen if the packet received is
-        //  neither ODATA nor ODATA.
-        if (received == 0) {
-            if (errno == ENOMEM || errno == EBUSY) {
-                const long timeout = pgm_socket.get_rx_timeout ();
-                add_timer (timeout, rx_timer_id);
-                has_rx_timer = true;
-            }
-            break;
-        }
-
-        //  Find the peer based on its TSI.
-        peers_t::iterator it = peers.find (*tsi);
-
-        //  Data loss. Delete decoder and mark the peer as disjoint.
-        if (received == -1) {
-            if (it != peers.end ()) {
-                it->second.joined = false;
-                if (it->second.decoder != NULL) {
-                    LIBZMQ_DELETE (it->second.decoder);
-                }
-            }
-            break;
-        }
-
-        //  New peer. Add it to the list of know but unjoint peers.
-        if (it == peers.end ()) {
-            peer_info_t peer_info = {false, NULL};
-            it = peers.ZMQ_MAP_INSERT_OR_EMPLACE (*tsi, peer_info).first;
-        }
-
-        insize = static_cast<size_t> (received);
-        inpos = (unsigned char *) tmp;
-
-        //  Read the offset of the fist message in the current packet.
-        zmq_assert (insize >= sizeof (uint16_t));
-        uint16_t offset = get_uint16 (inpos);
-        inpos += sizeof (uint16_t);
-        insize -= sizeof (uint16_t);
-
-        //  Join the stream if needed.
-        if (!it->second.joined) {
-            //  There is no beginning of the message in current packet.
-            //  Ignore the data.
-            if (offset == 0xffff)
-                continue;
-
-            zmq_assert (offset <= insize);
-            zmq_assert (it->second.decoder == NULL);
-
-            //  We have to move data to the beginning of the first message.
-            inpos += offset;
-            insize -= offset;
-
-            //  Mark the stream as joined.
-            it->second.joined = true;
-
-            //  Create and connect decoder for the peer.
-            it->second.decoder =
-              new (std::nothrow) v1_decoder_t (0, options.maxmsgsize);
-            alloc_assert (it->second.decoder);
-        }
-
-        int rc = process_input (it->second.decoder);
-        if (rc == -1) {
-            if (errno == EAGAIN) {
-                active_tsi = tsi;
-
-                //  Stop polling.
-                reset_pollin (pipe_handle);
-                reset_pollin (socket_handle);
-
-                break;
-            }
-
-            it->second.joined = false;
-            LIBZMQ_DELETE (it->second.decoder);
-            insize = 0;
-        }
-    }
-
-    //  Flush any messages decoder may have produced.
-    session->flush ();
-}
-
-int zmq::pgm_receiver_t::process_input (v1_decoder_t *decoder)
-{
-    zmq_assert (session != NULL);
-
-    while (insize > 0) {
-        size_t n = 0;
-        int rc = decoder->decode (inpos, insize, n);
-        if (rc == -1)
-            return -1;
-        inpos += n;
-        insize -= n;
-        if (rc == 0)
-            break;
-        rc = session->push_msg (decoder->msg ());
-        if (rc == -1) {
-            errno_assert (errno == EAGAIN);
-            return -1;
-        }
-    }
-    return 0;
-}
-
-
-void zmq::pgm_receiver_t::timer_event (int token)
-{
-    zmq_assert (token == rx_timer_id);
-
-    //  Timer cancels on return by poller_base.
-    has_rx_timer = false;
-    in_event ();
-}
-
-void zmq::pgm_receiver_t::drop_subscriptions ()
-{
-    msg_t msg;
-    msg.init ();
-    while (session->pull_msg (&msg) == 0)
-        msg.close ();
-}
-
-#endif
diff --git a/src/pgm_receiver.hpp b/src/pgm_receiver.hpp
deleted file mode 100644
index cb0337453..000000000
--- a/src/pgm_receiver.hpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PGM_RECEIVER_HPP_INCLUDED__
-#define __ZMQ_PGM_RECEIVER_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#include <map>
-#include <algorithm>
-
-#include "io_object.hpp"
-#include "i_engine.hpp"
-#include "options.hpp"
-#include "v1_decoder.hpp"
-#include "pgm_socket.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-
-class pgm_receiver_t ZMQ_FINAL : public io_object_t, public i_engine
-{
-  public:
-    pgm_receiver_t (zmq::io_thread_t *parent_, const options_t &options_);
-    ~pgm_receiver_t ();
-
-    int init (bool udp_encapsulation_, const char *network_);
-
-    //  i_engine interface implementation.
-    bool has_handshake_stage () { return false; };
-    void plug (zmq::io_thread_t *io_thread_, zmq::session_base_t *session_);
-    void terminate ();
-    bool restart_input ();
-    void restart_output ();
-    void zap_msg_available () {}
-    const endpoint_uri_pair_t &get_endpoint () const;
-
-    //  i_poll_events interface implementation.
-    void in_event ();
-    void timer_event (int token);
-
-  private:
-    //  Unplug the engine from the session.
-    void unplug ();
-
-    //  Decode received data (inpos, insize) and forward decoded
-    //  messages to the session.
-    int process_input (v1_decoder_t *decoder);
-
-    //  PGM is not able to move subscriptions upstream. Thus, drop all
-    //  the pending subscriptions.
-    void drop_subscriptions ();
-
-    //  RX timeout timer ID.
-    enum
-    {
-        rx_timer_id = 0xa1
-    };
-
-    const endpoint_uri_pair_t _empty_endpoint;
-
-    //  RX timer is running.
-    bool has_rx_timer;
-
-    //  If joined is true we are already getting messages from the peer.
-    //  It it's false, we are getting data but still we haven't seen
-    //  beginning of a message.
-    struct peer_info_t
-    {
-        bool joined;
-        v1_decoder_t *decoder;
-    };
-
-    struct tsi_comp
-    {
-        bool operator() (const pgm_tsi_t &ltsi, const pgm_tsi_t &rtsi) const
-        {
-            uint32_t ll[2], rl[2];
-            memcpy (ll, &ltsi, sizeof (ll));
-            memcpy (rl, &rtsi, sizeof (rl));
-            return (ll[0] < rl[0]) || (ll[0] == rl[0] && ll[1] < rl[1]);
-        }
-    };
-
-    typedef std::map<pgm_tsi_t, peer_info_t, tsi_comp> peers_t;
-    peers_t peers;
-
-    //  PGM socket.
-    pgm_socket_t pgm_socket;
-
-    //  Socket options.
-    options_t options;
-
-    //  Associated session.
-    zmq::session_base_t *session;
-
-    const pgm_tsi_t *active_tsi;
-
-    //  Number of bytes not consumed by the decoder due to pipe overflow.
-    size_t insize;
-
-    //  Pointer to data still waiting to be processed by the decoder.
-    const unsigned char *inpos;
-
-    //  Poll handle associated with PGM socket.
-    handle_t socket_handle;
-
-    //  Poll handle associated with engine PGM waiting pipe.
-    handle_t pipe_handle;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pgm_receiver_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp
deleted file mode 100644
index 3c68f23b7..000000000
--- a/src/pgm_sender.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#include <stdlib.h>
-
-#include "io_thread.hpp"
-#include "pgm_sender.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "wire.hpp"
-#include "stdint.hpp"
-#include "macros.hpp"
-
-zmq::pgm_sender_t::pgm_sender_t (io_thread_t *parent_,
-                                 const options_t &options_) :
-    io_object_t (parent_),
-    has_tx_timer (false),
-    has_rx_timer (false),
-    session (NULL),
-    encoder (0),
-    more_flag (false),
-    pgm_socket (false, options_),
-    options (options_),
-    handle (static_cast<handle_t> (NULL)),
-    uplink_handle (static_cast<handle_t> (NULL)),
-    rdata_notify_handle (static_cast<handle_t> (NULL)),
-    pending_notify_handle (static_cast<handle_t> (NULL)),
-    out_buffer (NULL),
-    out_buffer_size (0),
-    write_size (0)
-{
-    int rc = msg.init ();
-    errno_assert (rc == 0);
-}
-
-int zmq::pgm_sender_t::init (bool udp_encapsulation_, const char *network_)
-{
-    int rc = pgm_socket.init (udp_encapsulation_, network_);
-    if (rc != 0)
-        return rc;
-
-    out_buffer_size = pgm_socket.get_max_tsdu_size ();
-    out_buffer = (unsigned char *) malloc (out_buffer_size);
-    alloc_assert (out_buffer);
-
-    return rc;
-}
-
-void zmq::pgm_sender_t::plug (io_thread_t *io_thread_, session_base_t *session_)
-{
-    LIBZMQ_UNUSED (io_thread_);
-    //  Allocate 2 fds for PGM socket.
-    fd_t downlink_socket_fd = retired_fd;
-    fd_t uplink_socket_fd = retired_fd;
-    fd_t rdata_notify_fd = retired_fd;
-    fd_t pending_notify_fd = retired_fd;
-
-    session = session_;
-
-    //  Fill fds from PGM transport and add them to the poller.
-    pgm_socket.get_sender_fds (&downlink_socket_fd, &uplink_socket_fd,
-                               &rdata_notify_fd, &pending_notify_fd);
-
-    handle = add_fd (downlink_socket_fd);
-    uplink_handle = add_fd (uplink_socket_fd);
-    rdata_notify_handle = add_fd (rdata_notify_fd);
-    pending_notify_handle = add_fd (pending_notify_fd);
-
-    //  Set POLLIN. We wont never want to stop polling for uplink = we never
-    //  want to stop processing NAKs.
-    set_pollin (uplink_handle);
-    set_pollin (rdata_notify_handle);
-    set_pollin (pending_notify_handle);
-
-    //  Set POLLOUT for downlink_socket_handle.
-    set_pollout (handle);
-}
-
-void zmq::pgm_sender_t::unplug ()
-{
-    if (has_rx_timer) {
-        cancel_timer (rx_timer_id);
-        has_rx_timer = false;
-    }
-
-    if (has_tx_timer) {
-        cancel_timer (tx_timer_id);
-        has_tx_timer = false;
-    }
-
-    rm_fd (handle);
-    rm_fd (uplink_handle);
-    rm_fd (rdata_notify_handle);
-    rm_fd (pending_notify_handle);
-    session = NULL;
-}
-
-void zmq::pgm_sender_t::terminate ()
-{
-    unplug ();
-    delete this;
-}
-
-void zmq::pgm_sender_t::restart_output ()
-{
-    set_pollout (handle);
-    out_event ();
-}
-
-bool zmq::pgm_sender_t::restart_input ()
-{
-    zmq_assert (false);
-    return true;
-}
-
-const zmq::endpoint_uri_pair_t &zmq::pgm_sender_t::get_endpoint () const
-{
-    return _empty_endpoint;
-}
-
-zmq::pgm_sender_t::~pgm_sender_t ()
-{
-    int rc = msg.close ();
-    errno_assert (rc == 0);
-
-    if (out_buffer) {
-        free (out_buffer);
-        out_buffer = NULL;
-    }
-}
-
-void zmq::pgm_sender_t::in_event ()
-{
-    if (has_rx_timer) {
-        cancel_timer (rx_timer_id);
-        has_rx_timer = false;
-    }
-
-    //  In-event on sender side means NAK or SPMR receiving from some peer.
-    pgm_socket.process_upstream ();
-    if (errno == ENOMEM || errno == EBUSY) {
-        const long timeout = pgm_socket.get_rx_timeout ();
-        add_timer (timeout, rx_timer_id);
-        has_rx_timer = true;
-    }
-}
-
-void zmq::pgm_sender_t::out_event ()
-{
-    //  POLLOUT event from send socket. If write buffer is empty,
-    //  try to read new data from the encoder.
-    if (write_size == 0) {
-        //  First two bytes (sizeof uint16_t) are used to store message
-        //  offset in following steps. Note that by passing our buffer to
-        //  the get data function we prevent it from returning its own buffer.
-        unsigned char *bf = out_buffer + sizeof (uint16_t);
-        size_t bfsz = out_buffer_size - sizeof (uint16_t);
-        uint16_t offset = 0xffff;
-
-        size_t bytes = encoder.encode (&bf, bfsz);
-        while (bytes < bfsz) {
-            if (!more_flag && offset == 0xffff)
-                offset = static_cast<uint16_t> (bytes);
-            int rc = session->pull_msg (&msg);
-            if (rc == -1)
-                break;
-            more_flag = msg.flags () & msg_t::more;
-            encoder.load_msg (&msg);
-            bf = out_buffer + sizeof (uint16_t) + bytes;
-            bytes += encoder.encode (&bf, bfsz - bytes);
-        }
-
-        //  If there are no data to write stop polling for output.
-        if (bytes == 0) {
-            reset_pollout (handle);
-            return;
-        }
-
-        write_size = sizeof (uint16_t) + bytes;
-
-        //  Put offset information in the buffer.
-        put_uint16 (out_buffer, offset);
-    }
-
-    if (has_tx_timer) {
-        cancel_timer (tx_timer_id);
-        set_pollout (handle);
-        has_tx_timer = false;
-    }
-
-    //  Send the data.
-    size_t nbytes = pgm_socket.send (out_buffer, write_size);
-
-    //  We can write either all data or 0 which means rate limit reached.
-    if (nbytes == write_size)
-        write_size = 0;
-    else {
-        zmq_assert (nbytes == 0);
-
-        if (errno == ENOMEM) {
-            // Stop polling handle and wait for tx timeout
-            const long timeout = pgm_socket.get_tx_timeout ();
-            add_timer (timeout, tx_timer_id);
-            reset_pollout (handle);
-            has_tx_timer = true;
-        } else
-            errno_assert (errno == EBUSY);
-    }
-}
-
-void zmq::pgm_sender_t::timer_event (int token)
-{
-    //  Timer cancels on return by poller_base.
-    if (token == rx_timer_id) {
-        has_rx_timer = false;
-        in_event ();
-    } else if (token == tx_timer_id) {
-        // Restart polling handle and retry sending
-        has_tx_timer = false;
-        set_pollout (handle);
-        out_event ();
-    } else
-        zmq_assert (false);
-}
-
-#endif
diff --git a/src/pgm_sender.hpp b/src/pgm_sender.hpp
deleted file mode 100644
index 1d120c955..000000000
--- a/src/pgm_sender.hpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PGM_SENDER_HPP_INCLUDED__
-#define __ZMQ_PGM_SENDER_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#include "stdint.hpp"
-#include "io_object.hpp"
-#include "i_engine.hpp"
-#include "options.hpp"
-#include "pgm_socket.hpp"
-#include "v1_encoder.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-
-class pgm_sender_t ZMQ_FINAL : public io_object_t, public i_engine
-{
-  public:
-    pgm_sender_t (zmq::io_thread_t *parent_, const options_t &options_);
-    ~pgm_sender_t ();
-
-    int init (bool udp_encapsulation_, const char *network_);
-
-    //  i_engine interface implementation.
-    bool has_handshake_stage () { return false; };
-    void plug (zmq::io_thread_t *io_thread_, zmq::session_base_t *session_);
-    void terminate ();
-    bool restart_input ();
-    void restart_output ();
-    void zap_msg_available () {}
-    const endpoint_uri_pair_t &get_endpoint () const;
-
-    //  i_poll_events interface implementation.
-    void in_event ();
-    void out_event ();
-    void timer_event (int token);
-
-  private:
-    //  Unplug the engine from the session.
-    void unplug ();
-
-    //  TX and RX timeout timer ID's.
-    enum
-    {
-        tx_timer_id = 0xa0,
-        rx_timer_id = 0xa1
-    };
-
-    const endpoint_uri_pair_t _empty_endpoint;
-
-    //  Timers are running.
-    bool has_tx_timer;
-    bool has_rx_timer;
-
-    session_base_t *session;
-
-    //  Message encoder.
-    v1_encoder_t encoder;
-
-    msg_t msg;
-
-    //  Keeps track of message boundaries.
-    bool more_flag;
-
-    //  PGM socket.
-    pgm_socket_t pgm_socket;
-
-    //  Socket options.
-    options_t options;
-
-    //  Poll handle associated with PGM socket.
-    handle_t handle;
-    handle_t uplink_handle;
-    handle_t rdata_notify_handle;
-    handle_t pending_notify_handle;
-
-    //  Output buffer from pgm_socket.
-    unsigned char *out_buffer;
-
-    //  Output buffer size.
-    size_t out_buffer_size;
-
-    //  Number of bytes in the buffer to be written to the socket.
-    //  If zero, there are no data to be sent.
-    size_t write_size;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pgm_sender_t)
-};
-}
-#endif
-
-#endif
diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp
deleted file mode 100644
index e3399db12..000000000
--- a/src/pgm_socket.cpp
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef ZMQ_HAVE_OPENPGM
-
-#ifdef ZMQ_HAVE_LINUX
-#include <poll.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <string>
-
-#include "options.hpp"
-#include "pgm_socket.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "random.hpp"
-#include "stdint.hpp"
-
-#ifndef MSG_ERRQUEUE
-#define MSG_ERRQUEUE 0x2000
-#endif
-
-zmq::pgm_socket_t::pgm_socket_t (bool receiver_, const options_t &options_) :
-    sock (NULL),
-    options (options_),
-    receiver (receiver_),
-    pgm_msgv (NULL),
-    pgm_msgv_len (0),
-    nbytes_rec (0),
-    nbytes_processed (0),
-    pgm_msgv_processed (0)
-{
-}
-
-//  Resolve PGM socket address.
-//  network_ of the form <interface & multicast group decls>:<IP port>
-//  e.g. eth0;239.192.0.1:7500
-//       link-local;224.250.0.1,224.250.0.2;224.250.0.3:8000
-//       ;[fe80::1%en0]:7500
-int zmq::pgm_socket_t::init_address (const char *network_,
-                                     struct pgm_addrinfo_t **res,
-                                     uint16_t *port_number)
-{
-    //  Parse port number, start from end for IPv6
-    const char *port_delim = strrchr (network_, ':');
-    if (!port_delim) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    *port_number = atoi (port_delim + 1);
-
-    char network[256];
-    if (port_delim - network_ >= (int) sizeof (network) - 1) {
-        errno = EINVAL;
-        return -1;
-    }
-    memset (network, '\0', sizeof (network));
-    memcpy (network, network_, port_delim - network_);
-
-    pgm_error_t *pgm_error = NULL;
-    struct pgm_addrinfo_t hints;
-
-    memset (&hints, 0, sizeof (hints));
-    hints.ai_family = AF_UNSPEC;
-    if (!pgm_getaddrinfo (network, NULL, res, &pgm_error)) {
-        //  Invalid parameters don't set pgm_error_t.
-        zmq_assert (pgm_error != NULL);
-        if (pgm_error->domain == PGM_ERROR_DOMAIN_IF &&
-
-            //  NB: cannot catch EAI_BADFLAGS.
-            (pgm_error->code != PGM_ERROR_SERVICE
-             && pgm_error->code != PGM_ERROR_SOCKTNOSUPPORT)) {
-            //  User, host, or network configuration or transient error.
-            pgm_error_free (pgm_error);
-            errno = EINVAL;
-            return -1;
-        }
-
-        //  Fatal OpenPGM internal error.
-        zmq_assert (false);
-    }
-    return 0;
-}
-
-//  Create, bind and connect PGM socket.
-int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
-{
-    //  Can not open transport before destroying old one.
-    zmq_assert (sock == NULL);
-    zmq_assert (options.rate > 0);
-
-    //  Zero counter used in msgrecv.
-    nbytes_rec = 0;
-    nbytes_processed = 0;
-    pgm_msgv_processed = 0;
-
-    uint16_t port_number;
-    struct pgm_addrinfo_t *res = NULL;
-    sa_family_t sa_family;
-
-    pgm_error_t *pgm_error = NULL;
-
-    if (init_address (network_, &res, &port_number) < 0) {
-        goto err_abort;
-    }
-
-    zmq_assert (res != NULL);
-
-    //  Pick up detected IP family.
-    sa_family = res->ai_send_addrs[0].gsr_group.ss_family;
-
-    //  Create IP/PGM or UDP/PGM socket.
-    if (udp_encapsulation_) {
-        if (!pgm_socket (&sock, sa_family, SOCK_SEQPACKET, IPPROTO_UDP,
-                         &pgm_error)) {
-            //  Invalid parameters don't set pgm_error_t.
-            zmq_assert (pgm_error != NULL);
-            if (pgm_error->domain == PGM_ERROR_DOMAIN_SOCKET
-                && (pgm_error->code != PGM_ERROR_BADF
-                    && pgm_error->code != PGM_ERROR_FAULT
-                    && pgm_error->code != PGM_ERROR_NOPROTOOPT
-                    && pgm_error->code != PGM_ERROR_FAILED))
-
-                //  User, host, or network configuration or transient error.
-                goto err_abort;
-
-            //  Fatal OpenPGM internal error.
-            zmq_assert (false);
-        }
-
-        //  All options are of data type int
-        const int encapsulation_port = port_number;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_UDP_ENCAP_UCAST_PORT,
-                             &encapsulation_port, sizeof (encapsulation_port)))
-            goto err_abort;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_UDP_ENCAP_MCAST_PORT,
-                             &encapsulation_port, sizeof (encapsulation_port)))
-            goto err_abort;
-    } else {
-        if (!pgm_socket (&sock, sa_family, SOCK_SEQPACKET, IPPROTO_PGM,
-                         &pgm_error)) {
-            //  Invalid parameters don't set pgm_error_t.
-            zmq_assert (pgm_error != NULL);
-            if (pgm_error->domain == PGM_ERROR_DOMAIN_SOCKET
-                && (pgm_error->code != PGM_ERROR_BADF
-                    && pgm_error->code != PGM_ERROR_FAULT
-                    && pgm_error->code != PGM_ERROR_NOPROTOOPT
-                    && pgm_error->code != PGM_ERROR_FAILED))
-
-                //  User, host, or network configuration or transient error.
-                goto err_abort;
-
-            //  Fatal OpenPGM internal error.
-            zmq_assert (false);
-        }
-    }
-
-    {
-        const int rcvbuf = (int) options.rcvbuf;
-        if (rcvbuf >= 0) {
-            if (!pgm_setsockopt (sock, SOL_SOCKET, SO_RCVBUF, &rcvbuf,
-                                 sizeof (rcvbuf)))
-                goto err_abort;
-        }
-
-        const int sndbuf = (int) options.sndbuf;
-        if (sndbuf >= 0) {
-            if (!pgm_setsockopt (sock, SOL_SOCKET, SO_SNDBUF, &sndbuf,
-                                 sizeof (sndbuf)))
-                goto err_abort;
-        }
-
-        const int max_tpdu = (int) options.multicast_maxtpdu;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_MTU, &max_tpdu,
-                             sizeof (max_tpdu)))
-            goto err_abort;
-    }
-
-    if (receiver) {
-        const int recv_only = 1, rxw_max_tpdu = (int) options.multicast_maxtpdu,
-                  rxw_sqns = compute_sqns (rxw_max_tpdu),
-                  peer_expiry = pgm_secs (300), spmr_expiry = pgm_msecs (25),
-                  nak_bo_ivl = pgm_msecs (50), nak_rpt_ivl = pgm_msecs (200),
-                  nak_rdata_ivl = pgm_msecs (200), nak_data_retries = 50,
-                  nak_ncf_retries = 50;
-
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_RECV_ONLY, &recv_only,
-                             sizeof (recv_only))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_RXW_SQNS, &rxw_sqns,
-                                sizeof (rxw_sqns))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_PEER_EXPIRY,
-                                &peer_expiry, sizeof (peer_expiry))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_SPMR_EXPIRY,
-                                &spmr_expiry, sizeof (spmr_expiry))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_BO_IVL, &nak_bo_ivl,
-                                sizeof (nak_bo_ivl))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_RPT_IVL,
-                                &nak_rpt_ivl, sizeof (nak_rpt_ivl))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_RDATA_IVL,
-                                &nak_rdata_ivl, sizeof (nak_rdata_ivl))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_DATA_RETRIES,
-                                &nak_data_retries, sizeof (nak_data_retries))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_NCF_RETRIES,
-                                &nak_ncf_retries, sizeof (nak_ncf_retries)))
-            goto err_abort;
-    } else {
-        const int send_only = 1, max_rte = (int) ((options.rate * 1000) / 8),
-                  txw_max_tpdu = (int) options.multicast_maxtpdu,
-                  txw_sqns = compute_sqns (txw_max_tpdu),
-                  ambient_spm = pgm_secs (30),
-                  heartbeat_spm[] = {
-                    pgm_msecs (100), pgm_msecs (100),  pgm_msecs (100),
-                    pgm_msecs (100), pgm_msecs (1300), pgm_secs (7),
-                    pgm_secs (16),   pgm_secs (25),    pgm_secs (30)};
-
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_SEND_ONLY, &send_only,
-                             sizeof (send_only))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_ODATA_MAX_RTE, &max_rte,
-                                sizeof (max_rte))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_TXW_SQNS, &txw_sqns,
-                                sizeof (txw_sqns))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_AMBIENT_SPM,
-                                &ambient_spm, sizeof (ambient_spm))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_HEARTBEAT_SPM,
-                                &heartbeat_spm, sizeof (heartbeat_spm)))
-            goto err_abort;
-    }
-
-    //  PGM transport GSI.
-    struct pgm_sockaddr_t addr;
-
-    memset (&addr, 0, sizeof (addr));
-    addr.sa_port = port_number;
-    addr.sa_addr.sport = DEFAULT_DATA_SOURCE_PORT;
-
-    //  Create random GSI.
-    uint32_t buf[2];
-    buf[0] = generate_random ();
-    buf[1] = generate_random ();
-    if (!pgm_gsi_create_from_data (&addr.sa_addr.gsi, (uint8_t *) buf, 8))
-        goto err_abort;
-
-
-    //  Bind a transport to the specified network devices.
-    struct pgm_interface_req_t if_req;
-    memset (&if_req, 0, sizeof (if_req));
-    if_req.ir_interface = res->ai_recv_addrs[0].gsr_interface;
-    if_req.ir_scope_id = 0;
-    if (AF_INET6 == sa_family) {
-        struct sockaddr_in6 sa6;
-        memcpy (&sa6, &res->ai_recv_addrs[0].gsr_group, sizeof (sa6));
-        if_req.ir_scope_id = sa6.sin6_scope_id;
-    }
-    if (!pgm_bind3 (sock, &addr, sizeof (addr), &if_req, sizeof (if_req),
-                    &if_req, sizeof (if_req), &pgm_error)) {
-        //  Invalid parameters don't set pgm_error_t.
-        zmq_assert (pgm_error != NULL);
-        if ((pgm_error->domain == PGM_ERROR_DOMAIN_SOCKET
-             || pgm_error->domain == PGM_ERROR_DOMAIN_IF)
-            && (pgm_error->code != PGM_ERROR_INVAL
-                && pgm_error->code != PGM_ERROR_BADF
-                && pgm_error->code != PGM_ERROR_FAULT))
-
-            //  User, host, or network configuration or transient error.
-            goto err_abort;
-
-        //  Fatal OpenPGM internal error.
-        zmq_assert (false);
-    }
-
-    //  Join IP multicast groups.
-    for (unsigned i = 0; i < res->ai_recv_addrs_len; i++) {
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_JOIN_GROUP,
-                             &res->ai_recv_addrs[i], sizeof (struct group_req)))
-            goto err_abort;
-    }
-    if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_SEND_GROUP,
-                         &res->ai_send_addrs[0], sizeof (struct group_req)))
-        goto err_abort;
-
-    pgm_freeaddrinfo (res);
-    res = NULL;
-
-    //  Set IP level parameters.
-    {
-        // Multicast loopback disabled by default
-        const int multicast_loop = 0;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_MULTICAST_LOOP,
-                             &multicast_loop, sizeof (multicast_loop)))
-            goto err_abort;
-
-        const int multicast_hops = options.multicast_hops;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_MULTICAST_HOPS,
-                             &multicast_hops, sizeof (multicast_hops)))
-            goto err_abort;
-
-        //  Expedited Forwarding PHB for network elements, no ECN.
-        //  Ignore return value due to varied runtime support.
-        const int dscp = 0x2e << 2;
-        if (AF_INET6 != sa_family)
-            pgm_setsockopt (sock, IPPROTO_PGM, PGM_TOS, &dscp, sizeof (dscp));
-
-        const int nonblocking = 1;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_NOBLOCK, &nonblocking,
-                             sizeof (nonblocking)))
-            goto err_abort;
-    }
-
-    //  Connect PGM transport to start state machine.
-    if (!pgm_connect (sock, &pgm_error)) {
-        //  Invalid parameters don't set pgm_error_t.
-        zmq_assert (pgm_error != NULL);
-        goto err_abort;
-    }
-
-    //  For receiver transport preallocate pgm_msgv array.
-    if (receiver) {
-        zmq_assert (options.in_batch_size > 0);
-        size_t max_tsdu_size = get_max_tsdu_size ();
-        pgm_msgv_len = (int) options.in_batch_size / max_tsdu_size;
-        if ((int) options.in_batch_size % max_tsdu_size)
-            pgm_msgv_len++;
-        zmq_assert (pgm_msgv_len);
-
-        pgm_msgv = (pgm_msgv_t *) malloc (sizeof (pgm_msgv_t) * pgm_msgv_len);
-        alloc_assert (pgm_msgv);
-    }
-
-    return 0;
-
-err_abort:
-    if (sock != NULL) {
-        pgm_close (sock, FALSE);
-        sock = NULL;
-    }
-    if (res != NULL) {
-        pgm_freeaddrinfo (res);
-        res = NULL;
-    }
-    if (pgm_error != NULL) {
-        pgm_error_free (pgm_error);
-        pgm_error = NULL;
-    }
-    errno = EINVAL;
-    return -1;
-}
-
-zmq::pgm_socket_t::~pgm_socket_t ()
-{
-    if (pgm_msgv)
-        free (pgm_msgv);
-    if (sock)
-        pgm_close (sock, TRUE);
-}
-
-//  Get receiver fds. receive_fd_ is signaled for incoming packets,
-//  waiting_pipe_fd_ is signaled for state driven events and data.
-void zmq::pgm_socket_t::get_receiver_fds (fd_t *receive_fd_,
-                                          fd_t *waiting_pipe_fd_)
-{
-    socklen_t socklen;
-    bool rc;
-
-    zmq_assert (receive_fd_);
-    zmq_assert (waiting_pipe_fd_);
-
-    socklen = sizeof (*receive_fd_);
-    rc =
-      pgm_getsockopt (sock, IPPROTO_PGM, PGM_RECV_SOCK, receive_fd_, &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*receive_fd_));
-
-    socklen = sizeof (*waiting_pipe_fd_);
-    rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_PENDING_SOCK, waiting_pipe_fd_,
-                         &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*waiting_pipe_fd_));
-}
-
-//  Get fds and store them into user allocated memory.
-//  send_fd is for non-blocking send wire notifications.
-//  receive_fd_ is for incoming back-channel protocol packets.
-//  rdata_notify_fd_ is raised for waiting repair transmissions.
-//  pending_notify_fd_ is for state driven events.
-void zmq::pgm_socket_t::get_sender_fds (fd_t *send_fd_,
-                                        fd_t *receive_fd_,
-                                        fd_t *rdata_notify_fd_,
-                                        fd_t *pending_notify_fd_)
-{
-    socklen_t socklen;
-    bool rc;
-
-    zmq_assert (send_fd_);
-    zmq_assert (receive_fd_);
-    zmq_assert (rdata_notify_fd_);
-    zmq_assert (pending_notify_fd_);
-
-    socklen = sizeof (*send_fd_);
-    rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_SEND_SOCK, send_fd_, &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*receive_fd_));
-
-    socklen = sizeof (*receive_fd_);
-    rc =
-      pgm_getsockopt (sock, IPPROTO_PGM, PGM_RECV_SOCK, receive_fd_, &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*receive_fd_));
-
-    socklen = sizeof (*rdata_notify_fd_);
-    rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_REPAIR_SOCK, rdata_notify_fd_,
-                         &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*rdata_notify_fd_));
-
-    socklen = sizeof (*pending_notify_fd_);
-    rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_PENDING_SOCK,
-                         pending_notify_fd_, &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*pending_notify_fd_));
-}
-
-//  Send one APDU, transmit window owned memory.
-//  data_len_ must be less than one TPDU.
-size_t zmq::pgm_socket_t::send (unsigned char *data_, size_t data_len_)
-{
-    size_t nbytes = 0;
-
-    const int status = pgm_send (sock, data_, data_len_, &nbytes);
-
-    //  We have to write all data as one packet.
-    if (nbytes > 0) {
-        zmq_assert (status == PGM_IO_STATUS_NORMAL);
-        zmq_assert (nbytes == data_len_);
-    } else {
-        zmq_assert (status == PGM_IO_STATUS_RATE_LIMITED
-                    || status == PGM_IO_STATUS_WOULD_BLOCK);
-
-        if (status == PGM_IO_STATUS_RATE_LIMITED)
-            errno = ENOMEM;
-        else
-            errno = EBUSY;
-    }
-
-    //  Save return value.
-    last_tx_status = status;
-
-    return nbytes;
-}
-
-long zmq::pgm_socket_t::get_rx_timeout ()
-{
-    if (last_rx_status != PGM_IO_STATUS_RATE_LIMITED
-        && last_rx_status != PGM_IO_STATUS_TIMER_PENDING)
-        return -1;
-
-    struct timeval tv;
-    socklen_t optlen = sizeof (tv);
-    const bool rc = pgm_getsockopt (sock, IPPROTO_PGM,
-                                    last_rx_status == PGM_IO_STATUS_RATE_LIMITED
-                                      ? PGM_RATE_REMAIN
-                                      : PGM_TIME_REMAIN,
-                                    &tv, &optlen);
-    zmq_assert (rc);
-
-    const long timeout = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
-
-    return timeout;
-}
-
-long zmq::pgm_socket_t::get_tx_timeout ()
-{
-    if (last_tx_status != PGM_IO_STATUS_RATE_LIMITED)
-        return -1;
-
-    struct timeval tv;
-    socklen_t optlen = sizeof (tv);
-    const bool rc =
-      pgm_getsockopt (sock, IPPROTO_PGM, PGM_RATE_REMAIN, &tv, &optlen);
-    zmq_assert (rc);
-
-    const long timeout = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
-
-    return timeout;
-}
-
-//  Return max TSDU size without fragmentation from current PGM transport.
-size_t zmq::pgm_socket_t::get_max_tsdu_size ()
-{
-    int max_tsdu = 0;
-    socklen_t optlen = sizeof (max_tsdu);
-
-    bool rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_MSS, &max_tsdu, &optlen);
-    zmq_assert (rc);
-    zmq_assert (optlen == sizeof (max_tsdu));
-    return (size_t) max_tsdu;
-}
-
-//  pgm_recvmsgv is called to fill the pgm_msgv array up to  pgm_msgv_len.
-//  In subsequent calls data from pgm_msgv structure are returned.
-ssize_t zmq::pgm_socket_t::receive (void **raw_data_, const pgm_tsi_t **tsi_)
-{
-    size_t raw_data_len = 0;
-
-    //  We just sent all data from pgm_transport_recvmsgv up
-    //  and have to return 0 that another engine in this thread is scheduled.
-    if (nbytes_rec == nbytes_processed && nbytes_rec > 0) {
-        //  Reset all the counters.
-        nbytes_rec = 0;
-        nbytes_processed = 0;
-        pgm_msgv_processed = 0;
-        errno = EAGAIN;
-        return 0;
-    }
-
-    //  If we have are going first time or if we have processed all pgm_msgv_t
-    //  structure previously read from the pgm socket.
-    if (nbytes_rec == nbytes_processed) {
-        //  Check program flow.
-        zmq_assert (pgm_msgv_processed == 0);
-        zmq_assert (nbytes_processed == 0);
-        zmq_assert (nbytes_rec == 0);
-
-        //  Receive a vector of Application Protocol Domain Unit's (APDUs)
-        //  from the transport.
-        pgm_error_t *pgm_error = NULL;
-
-        const int status = pgm_recvmsgv (sock, pgm_msgv, pgm_msgv_len,
-                                         MSG_ERRQUEUE, &nbytes_rec, &pgm_error);
-
-        //  Invalid parameters.
-        zmq_assert (status != PGM_IO_STATUS_ERROR);
-
-        last_rx_status = status;
-
-        //  In a case when no ODATA/RDATA fired POLLIN event (SPM...)
-        //  pgm_recvmsg returns PGM_IO_STATUS_TIMER_PENDING.
-        if (status == PGM_IO_STATUS_TIMER_PENDING) {
-            zmq_assert (nbytes_rec == 0);
-
-            //  In case if no RDATA/ODATA caused POLLIN 0 is
-            //  returned.
-            nbytes_rec = 0;
-            errno = EBUSY;
-            return 0;
-        }
-
-        //  Send SPMR, NAK, ACK is rate limited.
-        if (status == PGM_IO_STATUS_RATE_LIMITED) {
-            zmq_assert (nbytes_rec == 0);
-
-            //  In case if no RDATA/ODATA caused POLLIN 0 is returned.
-            nbytes_rec = 0;
-            errno = ENOMEM;
-            return 0;
-        }
-
-        //  No peers and hence no incoming packets.
-        if (status == PGM_IO_STATUS_WOULD_BLOCK) {
-            zmq_assert (nbytes_rec == 0);
-
-            //  In case if no RDATA/ODATA caused POLLIN 0 is returned.
-            nbytes_rec = 0;
-            errno = EAGAIN;
-            return 0;
-        }
-
-        //  Data loss.
-        if (status == PGM_IO_STATUS_RESET) {
-            struct pgm_sk_buff_t *skb = pgm_msgv[0].msgv_skb[0];
-
-            //  Save lost data TSI.
-            *tsi_ = &skb->tsi;
-            nbytes_rec = 0;
-
-            //  In case of dala loss -1 is returned.
-            errno = EINVAL;
-            pgm_free_skb (skb);
-            return -1;
-        }
-
-        zmq_assert (status == PGM_IO_STATUS_NORMAL);
-    } else {
-        zmq_assert (pgm_msgv_processed <= pgm_msgv_len);
-    }
-
-    // Zero byte payloads are valid in PGM, but not 0MQ protocol.
-    zmq_assert (nbytes_rec > 0);
-
-    // Only one APDU per pgm_msgv_t structure is allowed.
-    zmq_assert (pgm_msgv[pgm_msgv_processed].msgv_len == 1);
-
-    struct pgm_sk_buff_t *skb = pgm_msgv[pgm_msgv_processed].msgv_skb[0];
-
-    //  Take pointers from pgm_msgv_t structure.
-    *raw_data_ = skb->data;
-    raw_data_len = skb->len;
-
-    //  Save current TSI.
-    *tsi_ = &skb->tsi;
-
-    //  Move the the next pgm_msgv_t structure.
-    pgm_msgv_processed++;
-    zmq_assert (pgm_msgv_processed <= pgm_msgv_len);
-    nbytes_processed += raw_data_len;
-
-    return raw_data_len;
-}
-
-void zmq::pgm_socket_t::process_upstream ()
-{
-    pgm_msgv_t dummy_msg;
-
-    size_t dummy_bytes = 0;
-    pgm_error_t *pgm_error = NULL;
-
-    const int status = pgm_recvmsgv (sock, &dummy_msg, 1, MSG_ERRQUEUE,
-                                     &dummy_bytes, &pgm_error);
-
-    //  Invalid parameters.
-    zmq_assert (status != PGM_IO_STATUS_ERROR);
-
-    //  No data should be returned.
-    zmq_assert (dummy_bytes == 0
-                && (status == PGM_IO_STATUS_TIMER_PENDING
-                    || status == PGM_IO_STATUS_RATE_LIMITED
-                    || status == PGM_IO_STATUS_WOULD_BLOCK));
-
-    last_rx_status = status;
-
-    if (status == PGM_IO_STATUS_TIMER_PENDING)
-        errno = EBUSY;
-    else if (status == PGM_IO_STATUS_RATE_LIMITED)
-        errno = ENOMEM;
-    else
-        errno = EAGAIN;
-}
-
-int zmq::pgm_socket_t::compute_sqns (int tpdu_)
-{
-    //  Convert rate into B/ms.
-    uint64_t rate = uint64_t (options.rate) / 8;
-
-    //  Compute the size of the buffer in bytes.
-    uint64_t size = uint64_t (options.recovery_ivl) * rate;
-
-    //  Translate the size into number of packets.
-    uint64_t sqns = size / tpdu_;
-
-    //  Buffer should be able to hold at least one packet.
-    if (sqns == 0)
-        sqns = 1;
-
-    return (int) sqns;
-}
-
-#endif
diff --git a/src/pgm_socket.hpp b/src/pgm_socket.hpp
deleted file mode 100644
index 00ec4856e..000000000
--- a/src/pgm_socket.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __PGM_SOCKET_HPP_INCLUDED__
-#define __PGM_SOCKET_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#ifdef ZMQ_HAVE_WINDOWS
-#define __PGM_WININT_H__
-#endif
-
-#include <pgm/pgm.h>
-
-#if defined(ZMQ_HAVE_OSX) || defined(ZMQ_HAVE_NETBSD)
-#include <pgm/in.h>
-#endif
-
-#include "fd.hpp"
-#include "options.hpp"
-
-namespace zmq
-{
-//  Encapsulates PGM socket.
-class pgm_socket_t
-{
-  public:
-    //  If receiver_ is true PGM transport is not generating SPM packets.
-    pgm_socket_t (bool receiver_, const options_t &options_);
-
-    //  Closes the transport.
-    ~pgm_socket_t ();
-
-    //  Initialize PGM network structures (GSI, GSRs).
-    int init (bool udp_encapsulation_, const char *network_);
-
-    //  Resolve PGM socket address.
-    static int init_address (const char *network_,
-                             struct pgm_addrinfo_t **addr,
-                             uint16_t *port_number);
-
-    //   Get receiver fds and store them into user allocated memory.
-    void get_receiver_fds (fd_t *receive_fd_, fd_t *waiting_pipe_fd_);
-
-    //   Get sender and receiver fds and store it to user allocated
-    //   memory. Receive fd is used to process NAKs from peers.
-    void get_sender_fds (fd_t *send_fd_,
-                         fd_t *receive_fd_,
-                         fd_t *rdata_notify_fd_,
-                         fd_t *pending_notify_fd_);
-
-    //  Send data as one APDU, transmit window owned memory.
-    size_t send (unsigned char *data_, size_t data_len_);
-
-    //  Returns max tsdu size without fragmentation.
-    size_t get_max_tsdu_size ();
-
-    //  Receive data from pgm socket.
-    ssize_t receive (void **data_, const pgm_tsi_t **tsi_);
-
-    long get_rx_timeout ();
-    long get_tx_timeout ();
-
-    //  POLLIN on sender side should mean NAK or SPMR receiving.
-    //  process_upstream function is used to handle such a situation.
-    void process_upstream ();
-
-  private:
-    //  Compute size of the buffer based on rate and recovery interval.
-    int compute_sqns (int tpdu_);
-
-    //  OpenPGM transport.
-    pgm_sock_t *sock;
-
-    int last_rx_status, last_tx_status;
-
-    //  Associated socket options.
-    options_t options;
-
-    //  true when pgm_socket should create receiving side.
-    bool receiver;
-
-    //  Array of pgm_msgv_t structures to store received data
-    //  from the socket (pgm_transport_recvmsgv).
-    pgm_msgv_t *pgm_msgv;
-
-    //  Size of pgm_msgv array.
-    size_t pgm_msgv_len;
-
-    // How many bytes were read from pgm socket.
-    size_t nbytes_rec;
-
-    //  How many bytes were processed from last pgm socket read.
-    size_t nbytes_processed;
-
-    //  How many messages from pgm_msgv were already sent up.
-    size_t pgm_msgv_processed;
-};
-}
-#endif
-
-#endif
diff --git a/src/pipe.cpp b/src/pipe.cpp
deleted file mode 100644
index b391b6eae..000000000
--- a/src/pipe.cpp
+++ /dev/null
@@ -1,617 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <stddef.h>
-
-#include "macros.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-
-#include "ypipe.hpp"
-#include "ypipe_conflate.hpp"
-
-int zmq::pipepair (object_t *parents_[2],
-                   pipe_t *pipes_[2],
-                   const int hwms_[2],
-                   const bool conflate_[2])
-{
-    //   Creates two pipe objects. These objects are connected by two ypipes,
-    //   each to pass messages in one direction.
-
-    typedef ypipe_t<msg_t, message_pipe_granularity> upipe_normal_t;
-    typedef ypipe_conflate_t<msg_t> upipe_conflate_t;
-
-    pipe_t::upipe_t *upipe1;
-    if (conflate_[0])
-        upipe1 = new (std::nothrow) upipe_conflate_t ();
-    else
-        upipe1 = new (std::nothrow) upipe_normal_t ();
-    alloc_assert (upipe1);
-
-    pipe_t::upipe_t *upipe2;
-    if (conflate_[1])
-        upipe2 = new (std::nothrow) upipe_conflate_t ();
-    else
-        upipe2 = new (std::nothrow) upipe_normal_t ();
-    alloc_assert (upipe2);
-
-    pipes_[0] = new (std::nothrow)
-      pipe_t (parents_[0], upipe1, upipe2, hwms_[1], hwms_[0], conflate_[0]);
-    alloc_assert (pipes_[0]);
-    pipes_[1] = new (std::nothrow)
-      pipe_t (parents_[1], upipe2, upipe1, hwms_[0], hwms_[1], conflate_[1]);
-    alloc_assert (pipes_[1]);
-
-    pipes_[0]->set_peer (pipes_[1]);
-    pipes_[1]->set_peer (pipes_[0]);
-
-    return 0;
-}
-
-void zmq::send_routing_id (pipe_t *pipe_, const options_t &options_)
-{
-    zmq::msg_t id;
-    const int rc = id.init_size (options_.routing_id_size);
-    errno_assert (rc == 0);
-    memcpy (id.data (), options_.routing_id, options_.routing_id_size);
-    id.set_flags (zmq::msg_t::routing_id);
-    const bool written = pipe_->write (&id);
-    zmq_assert (written);
-    pipe_->flush ();
-}
-
-void zmq::send_hello_msg (pipe_t *pipe_, const options_t &options_)
-{
-    zmq::msg_t hello;
-    const int rc =
-      hello.init_buffer (&options_.hello_msg[0], options_.hello_msg.size ());
-    errno_assert (rc == 0);
-    const bool written = pipe_->write (&hello);
-    zmq_assert (written);
-    pipe_->flush ();
-}
-
-zmq::pipe_t::pipe_t (object_t *parent_,
-                     upipe_t *inpipe_,
-                     upipe_t *outpipe_,
-                     int inhwm_,
-                     int outhwm_,
-                     bool conflate_) :
-    object_t (parent_),
-    _in_pipe (inpipe_),
-    _out_pipe (outpipe_),
-    _in_active (true),
-    _out_active (true),
-    _hwm (outhwm_),
-    _lwm (compute_lwm (inhwm_)),
-    _in_hwm_boost (-1),
-    _out_hwm_boost (-1),
-    _msgs_read (0),
-    _msgs_written (0),
-    _peers_msgs_read (0),
-    _peer (NULL),
-    _sink (NULL),
-    _state (active),
-    _delay (true),
-    _server_socket_routing_id (0),
-    _conflate (conflate_)
-{
-    _disconnect_msg.init ();
-}
-
-zmq::pipe_t::~pipe_t ()
-{
-    _disconnect_msg.close ();
-}
-
-void zmq::pipe_t::set_peer (pipe_t *peer_)
-{
-    //  Peer can be set once only.
-    zmq_assert (!_peer);
-    _peer = peer_;
-}
-
-void zmq::pipe_t::set_event_sink (i_pipe_events *sink_)
-{
-    // Sink can be set once only.
-    zmq_assert (!_sink);
-    _sink = sink_;
-}
-
-void zmq::pipe_t::set_server_socket_routing_id (
-  uint32_t server_socket_routing_id_)
-{
-    _server_socket_routing_id = server_socket_routing_id_;
-}
-
-uint32_t zmq::pipe_t::get_server_socket_routing_id () const
-{
-    return _server_socket_routing_id;
-}
-
-void zmq::pipe_t::set_router_socket_routing_id (
-  const blob_t &router_socket_routing_id_)
-{
-    _router_socket_routing_id.set_deep_copy (router_socket_routing_id_);
-}
-
-const zmq::blob_t &zmq::pipe_t::get_routing_id () const
-{
-    return _router_socket_routing_id;
-}
-
-bool zmq::pipe_t::check_read ()
-{
-    if (unlikely (!_in_active))
-        return false;
-    if (unlikely (_state != active && _state != waiting_for_delimiter))
-        return false;
-
-    //  Check if there's an item in the pipe.
-    if (!_in_pipe->check_read ()) {
-        _in_active = false;
-        return false;
-    }
-
-    //  If the next item in the pipe is message delimiter,
-    //  initiate termination process.
-    if (_in_pipe->probe (is_delimiter)) {
-        msg_t msg;
-        const bool ok = _in_pipe->read (&msg);
-        zmq_assert (ok);
-        process_delimiter ();
-        return false;
-    }
-
-    return true;
-}
-
-bool zmq::pipe_t::read (msg_t *msg_)
-{
-    if (unlikely (!_in_active))
-        return false;
-    if (unlikely (_state != active && _state != waiting_for_delimiter))
-        return false;
-
-    while (true) {
-        if (!_in_pipe->read (msg_)) {
-            _in_active = false;
-            return false;
-        }
-
-        //  If this is a credential, ignore it and receive next message.
-        if (unlikely (msg_->is_credential ())) {
-            const int rc = msg_->close ();
-            zmq_assert (rc == 0);
-        } else {
-            break;
-        }
-    }
-
-    //  If delimiter was read, start termination process of the pipe.
-    if (msg_->is_delimiter ()) {
-        process_delimiter ();
-        return false;
-    }
-
-    if (!(msg_->flags () & msg_t::more) && !msg_->is_routing_id ())
-        _msgs_read++;
-
-    if (_lwm > 0 && _msgs_read % _lwm == 0)
-        send_activate_write (_peer, _msgs_read);
-
-    return true;
-}
-
-bool zmq::pipe_t::check_write ()
-{
-    if (unlikely (!_out_active || _state != active))
-        return false;
-
-    const bool full = !check_hwm ();
-
-    if (unlikely (full)) {
-        _out_active = false;
-        return false;
-    }
-
-    return true;
-}
-
-bool zmq::pipe_t::write (const msg_t *msg_)
-{
-    if (unlikely (!check_write ()))
-        return false;
-
-    const bool more = (msg_->flags () & msg_t::more) != 0;
-    const bool is_routing_id = msg_->is_routing_id ();
-    _out_pipe->write (*msg_, more);
-    if (!more && !is_routing_id)
-        _msgs_written++;
-
-    return true;
-}
-
-void zmq::pipe_t::rollback () const
-{
-    //  Remove incomplete message from the outbound pipe.
-    msg_t msg;
-    if (_out_pipe) {
-        while (_out_pipe->unwrite (&msg)) {
-            zmq_assert (msg.flags () & msg_t::more);
-            const int rc = msg.close ();
-            errno_assert (rc == 0);
-        }
-    }
-}
-
-void zmq::pipe_t::flush ()
-{
-    //  The peer does not exist anymore at this point.
-    if (_state == term_ack_sent)
-        return;
-
-    if (_out_pipe && !_out_pipe->flush ())
-        send_activate_read (_peer);
-}
-
-void zmq::pipe_t::process_activate_read ()
-{
-    if (!_in_active && (_state == active || _state == waiting_for_delimiter)) {
-        _in_active = true;
-        _sink->read_activated (this);
-    }
-}
-
-void zmq::pipe_t::process_activate_write (uint64_t msgs_read_)
-{
-    //  Remember the peer's message sequence number.
-    _peers_msgs_read = msgs_read_;
-
-    if (!_out_active && _state == active) {
-        _out_active = true;
-        _sink->write_activated (this);
-    }
-}
-
-void zmq::pipe_t::process_hiccup (void *pipe_)
-{
-    //  Destroy old outpipe. Note that the read end of the pipe was already
-    //  migrated to this thread.
-    zmq_assert (_out_pipe);
-    _out_pipe->flush ();
-    msg_t msg;
-    while (_out_pipe->read (&msg)) {
-        if (!(msg.flags () & msg_t::more))
-            _msgs_written--;
-        const int rc = msg.close ();
-        errno_assert (rc == 0);
-    }
-    LIBZMQ_DELETE (_out_pipe);
-
-    //  Plug in the new outpipe.
-    zmq_assert (pipe_);
-    _out_pipe = static_cast<upipe_t *> (pipe_);
-    _out_active = true;
-
-    //  If appropriate, notify the user about the hiccup.
-    if (_state == active)
-        _sink->hiccuped (this);
-}
-
-void zmq::pipe_t::process_pipe_term ()
-{
-    zmq_assert (_state == active || _state == delimiter_received
-                || _state == term_req_sent1);
-
-    //  This is the simple case of peer-induced termination. If there are no
-    //  more pending messages to read, or if the pipe was configured to drop
-    //  pending messages, we can move directly to the term_ack_sent state.
-    //  Otherwise we'll hang up in waiting_for_delimiter state till all
-    //  pending messages are read.
-    if (_state == active) {
-        if (_delay)
-            _state = waiting_for_delimiter;
-        else {
-            _state = term_ack_sent;
-            _out_pipe = NULL;
-            send_pipe_term_ack (_peer);
-        }
-    }
-
-    //  Delimiter happened to arrive before the term command. Now we have the
-    //  term command as well, so we can move straight to term_ack_sent state.
-    else if (_state == delimiter_received) {
-        _state = term_ack_sent;
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-    }
-
-    //  This is the case where both ends of the pipe are closed in parallel.
-    //  We simply reply to the request by ack and continue waiting for our
-    //  own ack.
-    else if (_state == term_req_sent1) {
-        _state = term_req_sent2;
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-    }
-}
-
-void zmq::pipe_t::process_pipe_term_ack ()
-{
-    //  Notify the user that all the references to the pipe should be dropped.
-    zmq_assert (_sink);
-    _sink->pipe_terminated (this);
-
-    //  In term_ack_sent and term_req_sent2 states there's nothing to do.
-    //  Simply deallocate the pipe. In term_req_sent1 state we have to ack
-    //  the peer before deallocating this side of the pipe.
-    //  All the other states are invalid.
-    if (_state == term_req_sent1) {
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-    } else
-        zmq_assert (_state == term_ack_sent || _state == term_req_sent2);
-
-    //  We'll deallocate the inbound pipe, the peer will deallocate the outbound
-    //  pipe (which is an inbound pipe from its point of view).
-    //  First, delete all the unread messages in the pipe. We have to do it by
-    //  hand because msg_t doesn't have automatic destructor. Then deallocate
-    //  the ypipe itself.
-
-    if (!_conflate) {
-        msg_t msg;
-        while (_in_pipe->read (&msg)) {
-            const int rc = msg.close ();
-            errno_assert (rc == 0);
-        }
-    }
-
-    LIBZMQ_DELETE (_in_pipe);
-
-    //  Deallocate the pipe object
-    delete this;
-}
-
-void zmq::pipe_t::process_pipe_hwm (int inhwm_, int outhwm_)
-{
-    set_hwms (inhwm_, outhwm_);
-}
-
-void zmq::pipe_t::set_nodelay ()
-{
-    this->_delay = false;
-}
-
-void zmq::pipe_t::terminate (bool delay_)
-{
-    //  Overload the value specified at pipe creation.
-    _delay = delay_;
-
-    //  If terminate was already called, we can ignore the duplicate invocation.
-    if (_state == term_req_sent1 || _state == term_req_sent2) {
-        return;
-    }
-    //  If the pipe is in the final phase of async termination, it's going to
-    //  closed anyway. No need to do anything special here.
-    if (_state == term_ack_sent) {
-        return;
-    }
-    //  The simple sync termination case. Ask the peer to terminate and wait
-    //  for the ack.
-    if (_state == active) {
-        send_pipe_term (_peer);
-        _state = term_req_sent1;
-    }
-    //  There are still pending messages available, but the user calls
-    //  'terminate'. We can act as if all the pending messages were read.
-    else if (_state == waiting_for_delimiter && !_delay) {
-        //  Drop any unfinished outbound messages.
-        rollback ();
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-        _state = term_ack_sent;
-    }
-    //  If there are pending messages still available, do nothing.
-    else if (_state == waiting_for_delimiter) {
-    }
-    //  We've already got delimiter, but not term command yet. We can ignore
-    //  the delimiter and ack synchronously terminate as if we were in
-    //  active state.
-    else if (_state == delimiter_received) {
-        send_pipe_term (_peer);
-        _state = term_req_sent1;
-    }
-    //  There are no other states.
-    else {
-        zmq_assert (false);
-    }
-
-    //  Stop outbound flow of messages.
-    _out_active = false;
-
-    if (_out_pipe) {
-        //  Drop any unfinished outbound messages.
-        rollback ();
-
-        //  Write the delimiter into the pipe. Note that watermarks are not
-        //  checked; thus the delimiter can be written even when the pipe is full.
-        msg_t msg;
-        msg.init_delimiter ();
-        _out_pipe->write (msg, false);
-        flush ();
-    }
-}
-
-bool zmq::pipe_t::is_delimiter (const msg_t &msg_)
-{
-    return msg_.is_delimiter ();
-}
-
-int zmq::pipe_t::compute_lwm (int hwm_)
-{
-    //  Compute the low water mark. Following point should be taken
-    //  into consideration:
-    //
-    //  1. LWM has to be less than HWM.
-    //  2. LWM cannot be set to very low value (such as zero) as after filling
-    //     the queue it would start to refill only after all the messages are
-    //     read from it and thus unnecessarily hold the progress back.
-    //  3. LWM cannot be set to very high value (such as HWM-1) as it would
-    //     result in lock-step filling of the queue - if a single message is
-    //     read from a full queue, writer thread is resumed to write exactly one
-    //     message to the queue and go back to sleep immediately. This would
-    //     result in low performance.
-    //
-    //  Given the 3. it would be good to keep HWM and LWM as far apart as
-    //  possible to reduce the thread switching overhead to almost zero.
-    //  Let's make LWM 1/2 of HWM.
-    const int result = (hwm_ + 1) / 2;
-
-    return result;
-}
-
-void zmq::pipe_t::process_delimiter ()
-{
-    zmq_assert (_state == active || _state == waiting_for_delimiter);
-
-    if (_state == active)
-        _state = delimiter_received;
-    else {
-        rollback ();
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-        _state = term_ack_sent;
-    }
-}
-
-void zmq::pipe_t::hiccup ()
-{
-    //  If termination is already under way do nothing.
-    if (_state != active)
-        return;
-
-    //  We'll drop the pointer to the inpipe. From now on, the peer is
-    //  responsible for deallocating it.
-
-    //  Create new inpipe.
-    _in_pipe =
-      _conflate
-        ? static_cast<upipe_t *> (new (std::nothrow) ypipe_conflate_t<msg_t> ())
-        : new (std::nothrow) ypipe_t<msg_t, message_pipe_granularity> ();
-
-    alloc_assert (_in_pipe);
-    _in_active = true;
-
-    //  Notify the peer about the hiccup.
-    send_hiccup (_peer, _in_pipe);
-}
-
-void zmq::pipe_t::set_hwms (int inhwm_, int outhwm_)
-{
-    int in = inhwm_ + std::max (_in_hwm_boost, 0);
-    int out = outhwm_ + std::max (_out_hwm_boost, 0);
-
-    // if either send or recv side has hwm <= 0 it means infinite so we should set hwms infinite
-    if (inhwm_ <= 0 || _in_hwm_boost == 0)
-        in = 0;
-
-    if (outhwm_ <= 0 || _out_hwm_boost == 0)
-        out = 0;
-
-    _lwm = compute_lwm (in);
-    _hwm = out;
-}
-
-void zmq::pipe_t::set_hwms_boost (int inhwmboost_, int outhwmboost_)
-{
-    _in_hwm_boost = inhwmboost_;
-    _out_hwm_boost = outhwmboost_;
-}
-
-bool zmq::pipe_t::check_hwm () const
-{
-    const bool full =
-      _hwm > 0 && _msgs_written - _peers_msgs_read >= uint64_t (_hwm);
-    return !full;
-}
-
-void zmq::pipe_t::send_hwms_to_peer (int inhwm_, int outhwm_)
-{
-    send_pipe_hwm (_peer, inhwm_, outhwm_);
-}
-
-void zmq::pipe_t::set_endpoint_pair (zmq::endpoint_uri_pair_t endpoint_pair_)
-{
-    _endpoint_pair = ZMQ_MOVE (endpoint_pair_);
-}
-
-const zmq::endpoint_uri_pair_t &zmq::pipe_t::get_endpoint_pair () const
-{
-    return _endpoint_pair;
-}
-
-void zmq::pipe_t::send_stats_to_peer (own_t *socket_base_)
-{
-    endpoint_uri_pair_t *ep =
-      new (std::nothrow) endpoint_uri_pair_t (_endpoint_pair);
-    send_pipe_peer_stats (_peer, _msgs_written - _peers_msgs_read, socket_base_,
-                          ep);
-}
-
-void zmq::pipe_t::process_pipe_peer_stats (uint64_t queue_count_,
-                                           own_t *socket_base_,
-                                           endpoint_uri_pair_t *endpoint_pair_)
-{
-    send_pipe_stats_publish (socket_base_, queue_count_,
-                             _msgs_written - _peers_msgs_read, endpoint_pair_);
-}
-
-void zmq::pipe_t::send_disconnect_msg ()
-{
-    if (_disconnect_msg.size () > 0) {
-        // Rollback any incomplete message in the pipe, and push the disconnect message.
-        rollback ();
-
-        _out_pipe->write (_disconnect_msg, false);
-        flush ();
-        _disconnect_msg.init ();
-    }
-}
-
-void zmq::pipe_t::set_disconnect_msg (
-  const std::vector<unsigned char> &disconnect_)
-{
-    _disconnect_msg.close ();
-    const int rc =
-      _disconnect_msg.init_buffer (&disconnect_[0], disconnect_.size ());
-    errno_assert (rc == 0);
-}
diff --git a/src/pipe.hpp b/src/pipe.hpp
deleted file mode 100644
index 8136b8600..000000000
--- a/src/pipe.hpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PIPE_HPP_INCLUDED__
-#define __ZMQ_PIPE_HPP_INCLUDED__
-
-#include "ypipe_base.hpp"
-#include "config.hpp"
-#include "object.hpp"
-#include "stdint.hpp"
-#include "array.hpp"
-#include "blob.hpp"
-#include "options.hpp"
-#include "endpoint.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class pipe_t;
-
-//  Create a pipepair for bi-directional transfer of messages.
-//  First HWM is for messages passed from first pipe to the second pipe.
-//  Second HWM is for messages passed from second pipe to the first pipe.
-//  Delay specifies how the pipe behaves when the peer terminates. If true
-//  pipe receives all the pending messages before terminating, otherwise it
-//  terminates straight away.
-//  If conflate is true, only the most recently arrived message could be
-//  read (older messages are discarded)
-int pipepair (zmq::object_t *parents_[2],
-              zmq::pipe_t *pipes_[2],
-              const int hwms_[2],
-              const bool conflate_[2]);
-
-struct i_pipe_events
-{
-    virtual ~i_pipe_events () ZMQ_DEFAULT;
-
-    virtual void read_activated (zmq::pipe_t *pipe_) = 0;
-    virtual void write_activated (zmq::pipe_t *pipe_) = 0;
-    virtual void hiccuped (zmq::pipe_t *pipe_) = 0;
-    virtual void pipe_terminated (zmq::pipe_t *pipe_) = 0;
-};
-
-//  Note that pipe can be stored in three different arrays.
-//  The array of inbound pipes (1), the array of outbound pipes (2) and
-//  the generic array of pipes to be deallocated (3).
-
-class pipe_t ZMQ_FINAL : public object_t,
-                         public array_item_t<1>,
-                         public array_item_t<2>,
-                         public array_item_t<3>
-{
-    //  This allows pipepair to create pipe objects.
-    friend int pipepair (zmq::object_t *parents_[2],
-                         zmq::pipe_t *pipes_[2],
-                         const int hwms_[2],
-                         const bool conflate_[2]);
-
-  public:
-    //  Specifies the object to send events to.
-    void set_event_sink (i_pipe_events *sink_);
-
-    //  Pipe endpoint can store an routing ID to be used by its clients.
-    void set_server_socket_routing_id (uint32_t server_socket_routing_id_);
-    uint32_t get_server_socket_routing_id () const;
-
-    //  Pipe endpoint can store an opaque ID to be used by its clients.
-    void set_router_socket_routing_id (const blob_t &router_socket_routing_id_);
-    const blob_t &get_routing_id () const;
-
-    //  Returns true if there is at least one message to read in the pipe.
-    bool check_read ();
-
-    //  Reads a message to the underlying pipe.
-    bool read (msg_t *msg_);
-
-    //  Checks whether messages can be written to the pipe. If the pipe is
-    //  closed or if writing the message would cause high watermark the
-    //  function returns false.
-    bool check_write ();
-
-    //  Writes a message to the underlying pipe. Returns false if the
-    //  message does not pass check_write. If false, the message object
-    //  retains ownership of its message buffer.
-    bool write (const msg_t *msg_);
-
-    //  Remove unfinished parts of the outbound message from the pipe.
-    void rollback () const;
-
-    //  Flush the messages downstream.
-    void flush ();
-
-    //  Temporarily disconnects the inbound message stream and drops
-    //  all the messages on the fly. Causes 'hiccuped' event to be generated
-    //  in the peer.
-    void hiccup ();
-
-    //  Ensure the pipe won't block on receiving pipe_term.
-    void set_nodelay ();
-
-    //  Ask pipe to terminate. The termination will happen asynchronously
-    //  and user will be notified about actual deallocation by 'terminated'
-    //  event. If delay is true, the pending messages will be processed
-    //  before actual shutdown.
-    void terminate (bool delay_);
-
-    //  Set the high water marks.
-    void set_hwms (int inhwm_, int outhwm_);
-
-    //  Set the boost to high water marks, used by inproc sockets so total hwm are sum of connect and bind sockets watermarks
-    void set_hwms_boost (int inhwmboost_, int outhwmboost_);
-
-    // send command to peer for notify the change of hwm
-    void send_hwms_to_peer (int inhwm_, int outhwm_);
-
-    //  Returns true if HWM is not reached
-    bool check_hwm () const;
-
-    void set_endpoint_pair (endpoint_uri_pair_t endpoint_pair_);
-    const endpoint_uri_pair_t &get_endpoint_pair () const;
-
-    void send_stats_to_peer (own_t *socket_base_);
-
-    void send_disconnect_msg ();
-    void set_disconnect_msg (const std::vector<unsigned char> &disconnect_);
-
-  private:
-    //  Type of the underlying lock-free pipe.
-    typedef ypipe_base_t<msg_t> upipe_t;
-
-    //  Command handlers.
-    void process_activate_read () ZMQ_OVERRIDE;
-    void process_activate_write (uint64_t msgs_read_) ZMQ_OVERRIDE;
-    void process_hiccup (void *pipe_) ZMQ_OVERRIDE;
-    void
-    process_pipe_peer_stats (uint64_t queue_count_,
-                             own_t *socket_base_,
-                             endpoint_uri_pair_t *endpoint_pair_) ZMQ_OVERRIDE;
-    void process_pipe_term () ZMQ_OVERRIDE;
-    void process_pipe_term_ack () ZMQ_OVERRIDE;
-    void process_pipe_hwm (int inhwm_, int outhwm_) ZMQ_OVERRIDE;
-
-    //  Handler for delimiter read from the pipe.
-    void process_delimiter ();
-
-    //  Constructor is private. Pipe can only be created using
-    //  pipepair function.
-    pipe_t (object_t *parent_,
-            upipe_t *inpipe_,
-            upipe_t *outpipe_,
-            int inhwm_,
-            int outhwm_,
-            bool conflate_);
-
-    //  Pipepair uses this function to let us know about
-    //  the peer pipe object.
-    void set_peer (pipe_t *peer_);
-
-    //  Destructor is private. Pipe objects destroy themselves.
-    ~pipe_t () ZMQ_OVERRIDE;
-
-    //  Underlying pipes for both directions.
-    upipe_t *_in_pipe;
-    upipe_t *_out_pipe;
-
-    //  Can the pipe be read from / written to?
-    bool _in_active;
-    bool _out_active;
-
-    //  High watermark for the outbound pipe.
-    int _hwm;
-
-    //  Low watermark for the inbound pipe.
-    int _lwm;
-
-    // boosts for high and low watermarks, used with inproc sockets so hwm are sum of send and recv hmws on each side of pipe
-    int _in_hwm_boost;
-    int _out_hwm_boost;
-
-    //  Number of messages read and written so far.
-    uint64_t _msgs_read;
-    uint64_t _msgs_written;
-
-    //  Last received peer's msgs_read. The actual number in the peer
-    //  can be higher at the moment.
-    uint64_t _peers_msgs_read;
-
-    //  The pipe object on the other side of the pipepair.
-    pipe_t *_peer;
-
-    //  Sink to send events to.
-    i_pipe_events *_sink;
-
-    //  States of the pipe endpoint:
-    //  active: common state before any termination begins,
-    //  delimiter_received: delimiter was read from pipe before
-    //      term command was received,
-    //  waiting_for_delimiter: term command was already received
-    //      from the peer but there are still pending messages to read,
-    //  term_ack_sent: all pending messages were already read and
-    //      all we are waiting for is ack from the peer,
-    //  term_req_sent1: 'terminate' was explicitly called by the user,
-    //  term_req_sent2: user called 'terminate' and then we've got
-    //      term command from the peer as well.
-    enum
-    {
-        active,
-        delimiter_received,
-        waiting_for_delimiter,
-        term_ack_sent,
-        term_req_sent1,
-        term_req_sent2
-    } _state;
-
-    //  If true, we receive all the pending inbound messages before
-    //  terminating. If false, we terminate immediately when the peer
-    //  asks us to.
-    bool _delay;
-
-    //  Routing id of the writer. Used uniquely by the reader side.
-    blob_t _router_socket_routing_id;
-
-    //  Routing id of the writer. Used uniquely by the reader side.
-    int _server_socket_routing_id;
-
-    //  Returns true if the message is delimiter; false otherwise.
-    static bool is_delimiter (const msg_t &msg_);
-
-    //  Computes appropriate low watermark from the given high watermark.
-    static int compute_lwm (int hwm_);
-
-    const bool _conflate;
-
-    // The endpoints of this pipe.
-    endpoint_uri_pair_t _endpoint_pair;
-
-    // Disconnect msg
-    msg_t _disconnect_msg;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pipe_t)
-};
-
-void send_routing_id (pipe_t *pipe_, const options_t &options_);
-
-void send_hello_msg (pipe_t *pipe_, const options_t &options_);
-}
-
-#endif
diff --git a/src/plain_client.cpp b/src/plain_client.cpp
deleted file mode 100644
index 2af6d1ddc..000000000
--- a/src/plain_client.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#include <string>
-#include <limits.h>
-
-#include "msg.hpp"
-#include "err.hpp"
-#include "plain_client.hpp"
-#include "session_base.hpp"
-#include "plain_common.hpp"
-
-zmq::plain_client_t::plain_client_t (session_base_t *const session_,
-                                     const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    _state (sending_hello)
-{
-}
-
-zmq::plain_client_t::~plain_client_t ()
-{
-}
-
-int zmq::plain_client_t::next_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (_state) {
-        case sending_hello:
-            produce_hello (msg_);
-            _state = waiting_for_welcome;
-            break;
-        case sending_initiate:
-            produce_initiate (msg_);
-            _state = waiting_for_ready;
-            break;
-        default:
-            errno = EAGAIN;
-            rc = -1;
-    }
-    return rc;
-}
-
-int zmq::plain_client_t::process_handshake_command (msg_t *msg_)
-{
-    const unsigned char *cmd_data =
-      static_cast<unsigned char *> (msg_->data ());
-    const size_t data_size = msg_->size ();
-
-    int rc = 0;
-    if (data_size >= welcome_prefix_len
-        && !memcmp (cmd_data, welcome_prefix, welcome_prefix_len))
-        rc = process_welcome (cmd_data, data_size);
-    else if (data_size >= ready_prefix_len
-             && !memcmp (cmd_data, ready_prefix, ready_prefix_len))
-        rc = process_ready (cmd_data, data_size);
-    else if (data_size >= error_prefix_len
-             && !memcmp (cmd_data, error_prefix, error_prefix_len))
-        rc = process_error (cmd_data, data_size);
-    else {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        rc = -1;
-    }
-
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-
-    return rc;
-}
-
-zmq::mechanism_t::status_t zmq::plain_client_t::status () const
-{
-    switch (_state) {
-        case ready:
-            return mechanism_t::ready;
-        case error_command_received:
-            return mechanism_t::error;
-        default:
-            return mechanism_t::handshaking;
-    }
-}
-
-void zmq::plain_client_t::produce_hello (msg_t *msg_) const
-{
-    const std::string username = options.plain_username;
-    zmq_assert (username.length () <= UCHAR_MAX);
-
-    const std::string password = options.plain_password;
-    zmq_assert (password.length () <= UCHAR_MAX);
-
-    const size_t command_size = hello_prefix_len + brief_len_size
-                                + username.length () + brief_len_size
-                                + password.length ();
-
-    const int rc = msg_->init_size (command_size);
-    errno_assert (rc == 0);
-
-    unsigned char *ptr = static_cast<unsigned char *> (msg_->data ());
-    memcpy (ptr, hello_prefix, hello_prefix_len);
-    ptr += hello_prefix_len;
-
-    *ptr++ = static_cast<unsigned char> (username.length ());
-    memcpy (ptr, username.c_str (), username.length ());
-    ptr += username.length ();
-
-    *ptr++ = static_cast<unsigned char> (password.length ());
-    memcpy (ptr, password.c_str (), password.length ());
-}
-
-int zmq::plain_client_t::process_welcome (const unsigned char *cmd_data_,
-                                          size_t data_size_)
-{
-    LIBZMQ_UNUSED (cmd_data_);
-
-    if (_state != waiting_for_welcome) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    if (data_size_ != welcome_prefix_len) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME);
-        errno = EPROTO;
-        return -1;
-    }
-    _state = sending_initiate;
-    return 0;
-}
-
-void zmq::plain_client_t::produce_initiate (msg_t *msg_) const
-{
-    make_command_with_basic_properties (msg_, initiate_prefix,
-                                        initiate_prefix_len);
-}
-
-int zmq::plain_client_t::process_ready (const unsigned char *cmd_data_,
-                                        size_t data_size_)
-{
-    if (_state != waiting_for_ready) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    const int rc = parse_metadata (cmd_data_ + ready_prefix_len,
-                                   data_size_ - ready_prefix_len);
-    if (rc == 0)
-        _state = ready;
-    else
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA);
-
-    return rc;
-}
-
-int zmq::plain_client_t::process_error (const unsigned char *cmd_data_,
-                                        size_t data_size_)
-{
-    if (_state != waiting_for_welcome && _state != waiting_for_ready) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    const size_t start_of_error_reason = error_prefix_len + brief_len_size;
-    if (data_size_ < start_of_error_reason) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-        errno = EPROTO;
-        return -1;
-    }
-    const size_t error_reason_len =
-      static_cast<size_t> (cmd_data_[error_prefix_len]);
-    if (error_reason_len > data_size_ - start_of_error_reason) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-        errno = EPROTO;
-        return -1;
-    }
-    const char *error_reason =
-      reinterpret_cast<const char *> (cmd_data_) + start_of_error_reason;
-    handle_error_reason (error_reason, error_reason_len);
-    _state = error_command_received;
-    return 0;
-}
diff --git a/src/plain_client.hpp b/src/plain_client.hpp
deleted file mode 100644
index 7b49d498c..000000000
--- a/src/plain_client.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLAIN_CLIENT_HPP_INCLUDED__
-#define __ZMQ_PLAIN_CLIENT_HPP_INCLUDED__
-
-#include "mechanism_base.hpp"
-#include "options.hpp"
-
-namespace zmq
-{
-class msg_t;
-
-class plain_client_t ZMQ_FINAL : public mechanism_base_t
-{
-  public:
-    plain_client_t (session_base_t *session_, const options_t &options_);
-    ~plain_client_t ();
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-    status_t status () const;
-
-  private:
-    enum state_t
-    {
-        sending_hello,
-        waiting_for_welcome,
-        sending_initiate,
-        waiting_for_ready,
-        error_command_received,
-        ready
-    };
-
-    state_t _state;
-
-    void produce_hello (msg_t *msg_) const;
-    void produce_initiate (msg_t *msg_) const;
-
-    int process_welcome (const unsigned char *cmd_data_, size_t data_size_);
-    int process_ready (const unsigned char *cmd_data_, size_t data_size_);
-    int process_error (const unsigned char *cmd_data_, size_t data_size_);
-};
-}
-
-#endif
diff --git a/src/plain_common.hpp b/src/plain_common.hpp
deleted file mode 100644
index c97e184eb..000000000
--- a/src/plain_common.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLAIN_COMMON_HPP_INCLUDED__
-#define __ZMQ_PLAIN_COMMON_HPP_INCLUDED__
-
-namespace zmq
-{
-const char hello_prefix[] = "\x05HELLO";
-const size_t hello_prefix_len = sizeof (hello_prefix) - 1;
-
-const char welcome_prefix[] = "\x07WELCOME";
-const size_t welcome_prefix_len = sizeof (welcome_prefix) - 1;
-
-const char initiate_prefix[] = "\x08INITIATE";
-const size_t initiate_prefix_len = sizeof (initiate_prefix) - 1;
-
-const char ready_prefix[] = "\x05READY";
-const size_t ready_prefix_len = sizeof (ready_prefix) - 1;
-
-const char error_prefix[] = "\x05ERROR";
-const size_t error_prefix_len = sizeof (error_prefix) - 1;
-
-const size_t brief_len_size = sizeof (char);
-}
-
-#endif
diff --git a/src/plain_server.cpp b/src/plain_server.cpp
deleted file mode 100644
index 694c925e6..000000000
--- a/src/plain_server.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include <string>
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "plain_server.hpp"
-#include "wire.hpp"
-#include "plain_common.hpp"
-
-zmq::plain_server_t::plain_server_t (session_base_t *session_,
-                                     const std::string &peer_address_,
-                                     const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    zap_client_common_handshake_t (
-      session_, peer_address_, options_, sending_welcome)
-{
-    //  Note that there is no point to PLAIN if ZAP is not set up to handle the
-    //  username and password, so if ZAP is not configured it is considered a
-    //  failure.
-    //  Given this is a backward-incompatible change, it's behind a socket
-    //  option disabled by default.
-    if (options.zap_enforce_domain)
-        zmq_assert (zap_required ());
-}
-
-zmq::plain_server_t::~plain_server_t ()
-{
-}
-
-int zmq::plain_server_t::next_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (state) {
-        case sending_welcome:
-            produce_welcome (msg_);
-            state = waiting_for_initiate;
-            break;
-        case sending_ready:
-            produce_ready (msg_);
-            state = ready;
-            break;
-        case sending_error:
-            produce_error (msg_);
-            state = error_sent;
-            break;
-        default:
-            errno = EAGAIN;
-            rc = -1;
-    }
-    return rc;
-}
-
-int zmq::plain_server_t::process_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (state) {
-        case waiting_for_hello:
-            rc = process_hello (msg_);
-            break;
-        case waiting_for_initiate:
-            rc = process_initiate (msg_);
-            break;
-        default:
-            //  TODO see comment in curve_server_t::process_handshake_command
-            session->get_socket ()->event_handshake_failed_protocol (
-              session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED);
-            errno = EPROTO;
-            rc = -1;
-            break;
-    }
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-    return rc;
-}
-
-int zmq::plain_server_t::process_hello (msg_t *msg_)
-{
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return -1;
-
-    const char *ptr = static_cast<char *> (msg_->data ());
-    size_t bytes_left = msg_->size ();
-
-    if (bytes_left < hello_prefix_len
-        || memcmp (ptr, hello_prefix, hello_prefix_len) != 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    ptr += hello_prefix_len;
-    bytes_left -= hello_prefix_len;
-
-    if (bytes_left < 1) {
-        //  PLAIN I: invalid PLAIN client, did not send username
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-    const uint8_t username_length = *ptr++;
-    bytes_left -= sizeof (username_length);
-
-    if (bytes_left < username_length) {
-        //  PLAIN I: invalid PLAIN client, sent malformed username
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-    const std::string username = std::string (ptr, username_length);
-    ptr += username_length;
-    bytes_left -= username_length;
-    if (bytes_left < 1) {
-        //  PLAIN I: invalid PLAIN client, did not send password
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const uint8_t password_length = *ptr++;
-    bytes_left -= sizeof (password_length);
-    if (bytes_left != password_length) {
-        //  PLAIN I: invalid PLAIN client, sent malformed password or
-        //  extraneous data
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const std::string password = std::string (ptr, password_length);
-
-    //  Use ZAP protocol (RFC 27) to authenticate the user.
-    rc = session->zap_connect ();
-    if (rc != 0) {
-        session->get_socket ()->event_handshake_failed_no_detail (
-          session->get_endpoint (), EFAULT);
-        return -1;
-    }
-
-    send_zap_request (username, password);
-    state = waiting_for_zap_reply;
-
-    //  TODO actually, it is quite unlikely that we can read the ZAP
-    //  reply already, but removing this has some strange side-effect
-    //  (probably because the pipe's in_active flag is true until a read
-    //  is attempted)
-    return receive_and_process_zap_reply () == -1 ? -1 : 0;
-}
-
-void zmq::plain_server_t::produce_welcome (msg_t *msg_)
-{
-    const int rc = msg_->init_size (welcome_prefix_len);
-    errno_assert (rc == 0);
-    memcpy (msg_->data (), welcome_prefix, welcome_prefix_len);
-}
-
-int zmq::plain_server_t::process_initiate (msg_t *msg_)
-{
-    const unsigned char *ptr = static_cast<unsigned char *> (msg_->data ());
-    const size_t bytes_left = msg_->size ();
-
-    if (bytes_left < initiate_prefix_len
-        || memcmp (ptr, initiate_prefix, initiate_prefix_len) != 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    const int rc = parse_metadata (ptr + initiate_prefix_len,
-                                   bytes_left - initiate_prefix_len);
-    if (rc == 0)
-        state = sending_ready;
-    return rc;
-}
-
-void zmq::plain_server_t::produce_ready (msg_t *msg_) const
-{
-    make_command_with_basic_properties (msg_, ready_prefix, ready_prefix_len);
-}
-
-void zmq::plain_server_t::produce_error (msg_t *msg_) const
-{
-    const char expected_status_code_len = 3;
-    zmq_assert (status_code.length ()
-                == static_cast<size_t> (expected_status_code_len));
-    const size_t status_code_len_size = sizeof (expected_status_code_len);
-    const int rc = msg_->init_size (error_prefix_len + status_code_len_size
-                                    + expected_status_code_len);
-    zmq_assert (rc == 0);
-    char *msg_data = static_cast<char *> (msg_->data ());
-    memcpy (msg_data, error_prefix, error_prefix_len);
-    msg_data[error_prefix_len] = expected_status_code_len;
-    memcpy (msg_data + error_prefix_len + status_code_len_size,
-            status_code.c_str (), status_code.length ());
-}
-
-void zmq::plain_server_t::send_zap_request (const std::string &username_,
-                                            const std::string &password_)
-{
-    const uint8_t *credentials[] = {
-      reinterpret_cast<const uint8_t *> (username_.c_str ()),
-      reinterpret_cast<const uint8_t *> (password_.c_str ())};
-    size_t credentials_sizes[] = {username_.size (), password_.size ()};
-    const char plain_mechanism_name[] = "PLAIN";
-    zap_client_t::send_zap_request (
-      plain_mechanism_name, sizeof (plain_mechanism_name) - 1, credentials,
-      credentials_sizes, sizeof (credentials) / sizeof (credentials[0]));
-}
diff --git a/src/plain_server.hpp b/src/plain_server.hpp
deleted file mode 100644
index 3e6e2d3f9..000000000
--- a/src/plain_server.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLAIN_SERVER_HPP_INCLUDED__
-#define __ZMQ_PLAIN_SERVER_HPP_INCLUDED__
-
-#include "options.hpp"
-#include "zap_client.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class plain_server_t ZMQ_FINAL : public zap_client_common_handshake_t
-{
-  public:
-    plain_server_t (session_base_t *session_,
-                    const std::string &peer_address_,
-                    const options_t &options_);
-    ~plain_server_t ();
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-
-  private:
-    static void produce_welcome (msg_t *msg_);
-    void produce_ready (msg_t *msg_) const;
-    void produce_error (msg_t *msg_) const;
-
-    int process_hello (msg_t *msg_);
-    int process_initiate (msg_t *msg_);
-
-    void send_zap_request (const std::string &username_,
-                           const std::string &password_);
-};
-}
-
-#endif
diff --git a/src/poll.cpp b/src/poll.cpp
deleted file mode 100644
index 67de088d4..000000000
--- a/src/poll.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "poll.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLL
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <poll.h>
-#include <algorithm>
-
-#include "poll.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-zmq::poll_t::poll_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_),
-    retired (false)
-{
-}
-
-zmq::poll_t::~poll_t ()
-{
-    stop_worker ();
-}
-
-zmq::poll_t::handle_t zmq::poll_t::add_fd (fd_t fd_, i_poll_events *events_)
-{
-    check_thread ();
-    zmq_assert (fd_ != retired_fd);
-
-    //  If the file descriptor table is too small expand it.
-    fd_table_t::size_type sz = fd_table.size ();
-    if (sz <= (fd_table_t::size_type) fd_) {
-        fd_table.resize (fd_ + 1);
-        while (sz != (fd_table_t::size_type) (fd_ + 1)) {
-            fd_table[sz].index = retired_fd;
-            ++sz;
-        }
-    }
-
-    pollfd pfd = {fd_, 0, 0};
-    pollset.push_back (pfd);
-    zmq_assert (fd_table[fd_].index == retired_fd);
-
-    fd_table[fd_].index = pollset.size () - 1;
-    fd_table[fd_].events = events_;
-
-    //  Increase the load metric of the thread.
-    adjust_load (1);
-
-    return fd_;
-}
-
-void zmq::poll_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    zmq_assert (index != retired_fd);
-
-    //  Mark the fd as unused.
-    pollset[index].fd = retired_fd;
-    fd_table[handle_].index = retired_fd;
-    retired = true;
-
-    //  Decrease the load metric of the thread.
-    adjust_load (-1);
-}
-
-void zmq::poll_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    pollset[index].events |= POLLIN;
-}
-
-void zmq::poll_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    pollset[index].events &= ~((short) POLLIN);
-}
-
-void zmq::poll_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    pollset[index].events |= POLLOUT;
-}
-
-void zmq::poll_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    pollset[index].events &= ~((short) POLLOUT);
-}
-
-void zmq::poll_t::stop ()
-{
-    check_thread ();
-    //  no-op... thread is stopped when no more fds or timers are registered
-}
-
-int zmq::poll_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::poll_t::loop ()
-{
-    while (true) {
-        //  Execute any due timers.
-        int timeout = (int) execute_timers ();
-
-        cleanup_retired ();
-
-        if (pollset.empty ()) {
-            zmq_assert (get_load () == 0);
-
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-        //  Wait for events.
-        int rc = poll (&pollset[0], static_cast<nfds_t> (pollset.size ()),
-                       timeout ? timeout : -1);
-        if (rc == -1) {
-            errno_assert (errno == EINTR);
-            continue;
-        }
-
-        //  If there are no events (i.e. it's a timeout) there's no point
-        //  in checking the pollset.
-        if (rc == 0)
-            continue;
-
-        for (pollset_t::size_type i = 0; i != pollset.size (); i++) {
-            zmq_assert (!(pollset[i].revents & POLLNVAL));
-            if (pollset[i].fd == retired_fd)
-                continue;
-            if (pollset[i].revents & (POLLERR | POLLHUP))
-                fd_table[pollset[i].fd].events->in_event ();
-            if (pollset[i].fd == retired_fd)
-                continue;
-            if (pollset[i].revents & POLLOUT)
-                fd_table[pollset[i].fd].events->out_event ();
-            if (pollset[i].fd == retired_fd)
-                continue;
-            if (pollset[i].revents & POLLIN)
-                fd_table[pollset[i].fd].events->in_event ();
-        }
-    }
-}
-
-void zmq::poll_t::cleanup_retired ()
-{
-    //  Clean up the pollset and update the fd_table accordingly.
-    if (retired) {
-        pollset_t::size_type i = 0;
-        while (i < pollset.size ()) {
-            if (pollset[i].fd == retired_fd)
-                pollset.erase (pollset.begin () + i);
-            else {
-                fd_table[pollset[i].fd].index = i;
-                i++;
-            }
-        }
-        retired = false;
-    }
-}
-
-
-#endif
diff --git a/src/poll.hpp b/src/poll.hpp
deleted file mode 100644
index 4c274425c..000000000
--- a/src/poll.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_POLL_HPP_INCLUDED__
-#define __ZMQ_POLL_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLL
-
-#if defined ZMQ_HAVE_WINDOWS
-#error                                                                         \
-  "poll is broken on Windows for the purpose of the I/O thread poller, use select instead; "\
-  "see https://github.com/zeromq/libzmq/issues/3107"
-#endif
-
-#include <poll.h>
-#include <stddef.h>
-#include <vector>
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  Implements socket polling mechanism using the POSIX.1-2001
-//  poll() system call.
-
-class poll_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef fd_t handle_t;
-
-    poll_t (const thread_ctx_t &ctx_);
-    ~poll_t ();
-
-    //  "poller" concept.
-    //  These methods may only be called from an event callback; add_fd may also be called before start.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    void cleanup_retired ();
-
-    struct fd_entry_t
-    {
-        fd_t index;
-        zmq::i_poll_events *events;
-    };
-
-    //  This table stores data for registered descriptors.
-    typedef std::vector<fd_entry_t> fd_table_t;
-    fd_table_t fd_table;
-
-    //  Pollset to pass to the poll function.
-    typedef std::vector<pollfd> pollset_t;
-    pollset_t pollset;
-
-    //  If true, there's at least one retired event source.
-    bool retired;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (poll_t)
-};
-
-typedef poll_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/src/poller.hpp b/src/poller.hpp
deleted file mode 100644
index ba9fbb173..000000000
--- a/src/poller.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_POLLER_HPP_INCLUDED__
-#define __ZMQ_POLLER_HPP_INCLUDED__
-
-#if defined ZMQ_IOTHREAD_POLLER_USE_KQUEUE                                     \
-    + defined ZMQ_IOTHREAD_POLLER_USE_EPOLL                                    \
-    + defined ZMQ_IOTHREAD_POLLER_USE_DEVPOLL                                  \
-    + defined ZMQ_IOTHREAD_POLLER_USE_POLLSET                                  \
-    + defined ZMQ_IOTHREAD_POLLER_POLL                                         \
-    + defined ZMQ_IOTHREAD_POLLER_USE_SELECT                                   \
-  > 1
-#error More than one of the ZMQ_IOTHREAD_POLLER_USE_* macros defined
-#endif
-
-#if defined ZMQ_IOTHREAD_POLLER_USE_KQUEUE
-#include "kqueue.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_EPOLL
-#include "epoll.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_DEVPOLL
-#include "devpoll.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_POLLSET
-#include "pollset.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_POLL
-#include "poll.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_SELECT
-#include "select.hpp"
-#elif defined ZMQ_HAVE_GNU
-#define ZMQ_IOTHREAD_POLLER_USE_POLL
-#include "poll.hpp"
-#else
-#error None of the ZMQ_IOTHREAD_POLLER_USE_* macros defined
-#endif
-
-#if (defined ZMQ_POLL_BASED_ON_SELECT + defined ZMQ_POLL_BASED_ON_POLL) > 1
-#error More than one of the ZMQ_POLL_BASED_ON_* macros defined
-#elif (defined ZMQ_POLL_BASED_ON_SELECT + defined ZMQ_POLL_BASED_ON_POLL) == 0
-#error None of the ZMQ_POLL_BASED_ON_* macros defined
-#endif
-
-#endif
diff --git a/src/poller_base.cpp b/src/poller_base.cpp
deleted file mode 100644
index d4cc07fac..000000000
--- a/src/poller_base.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "poller_base.hpp"
-#include "i_poll_events.hpp"
-#include "err.hpp"
-
-zmq::poller_base_t::~poller_base_t ()
-{
-    //  Make sure there is no more load on the shutdown.
-    zmq_assert (get_load () == 0);
-}
-
-int zmq::poller_base_t::get_load () const
-{
-    return _load.get ();
-}
-
-void zmq::poller_base_t::adjust_load (int amount_)
-{
-    if (amount_ > 0)
-        _load.add (amount_);
-    else if (amount_ < 0)
-        _load.sub (-amount_);
-}
-
-void zmq::poller_base_t::add_timer (int timeout_, i_poll_events *sink_, int id_)
-{
-    uint64_t expiration = _clock.now_ms () + timeout_;
-    timer_info_t info = {sink_, id_};
-    _timers.insert (timers_t::value_type (expiration, info));
-}
-
-void zmq::poller_base_t::cancel_timer (i_poll_events *sink_, int id_)
-{
-    //  Complexity of this operation is O(n). We assume it is rarely used.
-    for (timers_t::iterator it = _timers.begin (), end = _timers.end ();
-         it != end; ++it)
-        if (it->second.sink == sink_ && it->second.id == id_) {
-            _timers.erase (it);
-            return;
-        }
-
-    //  We should generally never get here. Calling 'cancel_timer ()' on
-    //  an already expired or canceled timer (or even worse - on a timer which
-    //  never existed, supplying bad sink_ and/or id_ values) does not make any
-    //  sense.
-    //  But in some edge cases this might happen. As described in issue #3645
-    //  `timer_event ()` call from `execute_timers ()` might call `cancel_timer ()`
-    //  on already canceled (deleted) timer.
-    //  As soon as that is resolved an 'assert (false)' should be put here.
-}
-
-uint64_t zmq::poller_base_t::execute_timers ()
-{
-    //  Fast track.
-    if (_timers.empty ())
-        return 0;
-
-    //  Get the current time.
-    const uint64_t current = _clock.now_ms ();
-
-    //  Execute the timers that are already due.
-    uint64_t res = 0;
-    timer_info_t timer_temp;
-    timers_t::iterator it;
-
-    do {
-        it = _timers.begin ();
-
-        //  If we have to wait to execute the item, same will be true for
-        //  all the following items because multimap is sorted. Thus we can
-        //  stop checking the subsequent timers.
-        if (it->first > current) {
-            res = it->first - current;
-            break;
-        }
-
-        //  Save and remove the timer because timer_event() call might delete
-        //  exactly this timer and then the iterator will be invalid.
-        timer_temp = it->second;
-        _timers.erase (it);
-
-        //  Trigger the timer.
-        timer_temp.sink->timer_event (timer_temp.id);
-
-    } while (!_timers.empty ());
-
-    //  Return the time to wait for the next timer (at least 1ms), or 0, if
-    //  there are no more timers.
-    return res;
-}
-
-zmq::worker_poller_base_t::worker_poller_base_t (const thread_ctx_t &ctx_) :
-    _ctx (ctx_)
-{
-}
-
-void zmq::worker_poller_base_t::stop_worker ()
-{
-    _worker.stop ();
-}
-
-void zmq::worker_poller_base_t::start (const char *name_)
-{
-    zmq_assert (get_load () > 0);
-    _ctx.start_thread (_worker, worker_routine, this, name_);
-}
-
-void zmq::worker_poller_base_t::check_thread () const
-{
-#ifdef _DEBUG
-    zmq_assert (!_worker.get_started () || _worker.is_current_thread ());
-#endif
-}
-
-void zmq::worker_poller_base_t::worker_routine (void *arg_)
-{
-    (static_cast<worker_poller_base_t *> (arg_))->loop ();
-}
diff --git a/src/poller_base.hpp b/src/poller_base.hpp
deleted file mode 100644
index b39f2a412..000000000
--- a/src/poller_base.hpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_POLLER_BASE_HPP_INCLUDED__
-#define __ZMQ_POLLER_BASE_HPP_INCLUDED__
-
-#include <map>
-
-#include "clock.hpp"
-#include "atomic_counter.hpp"
-#include "ctx.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-// A build of libzmq must provide an implementation of the poller_t concept. By
-// convention, this is done via a typedef.
-//
-// At the time of writing, the following implementations of the poller_t
-// concept exist: zmq::devpoll_t, zmq::epoll_t, zmq::kqueue_t, zmq::poll_t,
-// zmq::pollset_t, zmq::select_t
-//
-// An implementation of the poller_t concept must provide the following public
-// methods:
-//   Returns load of the poller.
-// int get_load() const;
-//
-//   Add a timeout to expire in timeout_ milliseconds. After the
-//   expiration, timer_event on sink_ object will be called with
-//   argument set to id_.
-// void add_timer(int timeout_, zmq::i_poll_events *sink_, int id_);
-//
-//   Cancel the timer created by sink_ object with ID equal to id_.
-// void cancel_timer(zmq::i_poll_events *sink_, int id_);
-//
-//   Adds a fd to the poller. Initially, no events are activated. These must
-//   be activated by the set_* methods using the returned handle_.
-// handle_t add_fd(fd_t fd_, zmq::i_poll_events *events_);
-//
-//   Deactivates any events that may be active for the given handle_, and
-//   removes the fd associated with the given handle_.
-// void rm_fd(handle_t handle_);
-//
-//   The set_* and reset_* methods activate resp. deactivate polling for
-//   input/output readiness on the respective handle_, such that the
-//   in_event/out_event methods on the associated zmq::i_poll_events object
-//   will be called.
-//   Note: while handle_t and fd_t may be the same type, and may even have the
-//   same values for some implementation, this may not be assumed in general.
-//   The methods may only be called with the handle returned by add_fd.
-// void set_pollin(handle_t handle_);
-// void reset_pollin(handle_t handle_);
-// void set_pollout(handle_t handle_);//
-// void reset_pollout(handle_t handle_);
-//
-//   Starts operation of the poller. See below for details.
-// void start();
-//
-//   Request termination of the poller.
-//   TODO: might be removed in the future, as it has no effect.
-// void stop();
-//
-//   Returns the maximum number of fds that can be added to an instance of the
-//   poller at the same time, or -1 if there is no such fixed limit.
-// static int max_fds();
-//
-// Most of the methods may only be called from a zmq::i_poll_events callback
-// function when invoked by the poller (and, therefore, typically from the
-// poller's worker thread), with the following exceptions:
-// - get_load may be called from outside
-// - add_fd and add_timer may be called from outside before start
-// - start may be called from outside once
-//
-// After a poller is started, it waits for the registered events (input/output
-// readiness, timeout) to happen, and calls the respective functions on the
-// zmq::i_poll_events object. It terminates when no further registrations (fds
-// or timers) exist.
-//
-// Before start, add_fd must have been called at least once. Behavior may be
-// undefined otherwise.
-//
-// If the poller is implemented by a single worker thread (the
-// worker_poller_base_t base  class may be used to implement such a poller),
-// no synchronization is required for the data structures modified by
-// add_fd, rm_fd, add_timer, cancel_timer, (re)set_poll(in|out). However,
-// reentrancy must be considered, e.g. when one of the functions modifies
-// a container that is being iterated by the poller.
-
-
-// A class that can be used as abase class for implementations of the poller
-// concept.
-//
-// For documentation of the public methods, see the description of the poller_t
-// concept.
-class poller_base_t
-{
-  public:
-    poller_base_t () ZMQ_DEFAULT;
-    virtual ~poller_base_t ();
-
-    // Methods from the poller concept.
-    int get_load () const;
-    void add_timer (int timeout_, zmq::i_poll_events *sink_, int id_);
-    void cancel_timer (zmq::i_poll_events *sink_, int id_);
-
-  protected:
-    //  Called by individual poller implementations to manage the load.
-    void adjust_load (int amount_);
-
-    //  Executes any timers that are due. Returns number of milliseconds
-    //  to wait to match the next timer or 0 meaning "no timers".
-    uint64_t execute_timers ();
-
-  private:
-    //  Clock instance private to this I/O thread.
-    clock_t _clock;
-
-    //  List of active timers.
-    struct timer_info_t
-    {
-        zmq::i_poll_events *sink;
-        int id;
-    };
-    typedef std::multimap<uint64_t, timer_info_t> timers_t;
-    timers_t _timers;
-
-    //  Load of the poller. Currently the number of file descriptors
-    //  registered.
-    atomic_counter_t _load;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (poller_base_t)
-};
-
-//  Base class for a poller with a single worker thread.
-class worker_poller_base_t : public poller_base_t
-{
-  public:
-    worker_poller_base_t (const thread_ctx_t &ctx_);
-
-    // Methods from the poller concept.
-    void start (const char *name = NULL);
-
-  protected:
-    //  Checks whether the currently executing thread is the worker thread
-    //  via an assertion.
-    //  Should be called by the add_fd, removed_fd, set_*, reset_* functions
-    //  to ensure correct usage.
-    void check_thread () const;
-
-    //  Stops the worker thread. Should be called from the destructor of the
-    //  leaf class.
-    void stop_worker ();
-
-  private:
-    //  Main worker thread routine.
-    static void worker_routine (void *arg_);
-
-    virtual void loop () = 0;
-
-    // Reference to ZMQ context.
-    const thread_ctx_t &_ctx;
-
-    //  Handle of the physical thread doing the I/O work.
-    thread_t _worker;
-};
-}
-
-#endif
diff --git a/src/polling_util.cpp b/src/polling_util.cpp
deleted file mode 100644
index c8e42eb8d..000000000
--- a/src/polling_util.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "polling_util.hpp"
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-#include <limits.h>
-#include <algorithm>
-
-zmq::timeout_t zmq::compute_timeout (const bool first_pass_,
-                                     const long timeout_,
-                                     const uint64_t now_,
-                                     const uint64_t end_)
-{
-    if (first_pass_)
-        return 0;
-
-    if (timeout_ < 0)
-        return -1;
-
-    return static_cast<zmq::timeout_t> (
-      std::min<uint64_t> (end_ - now_, INT_MAX));
-}
-#endif
diff --git a/src/polling_util.hpp b/src/polling_util.hpp
deleted file mode 100644
index 2af8c4561..000000000
--- a/src/polling_util.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SOCKET_POLLING_UTIL_HPP_INCLUDED__
-#define __ZMQ_SOCKET_POLLING_UTIL_HPP_INCLUDED__
-
-#include <stdlib.h>
-#include <vector>
-
-#include "macros.hpp"
-#include "stdint.hpp"
-#include "platform.hpp"
-#include "err.hpp"
-
-namespace zmq
-{
-template <typename T, size_t S> class fast_vector_t
-{
-  public:
-    explicit fast_vector_t (const size_t nitems_)
-    {
-        if (nitems_ > S) {
-            _buf = static_cast<T *> (malloc (nitems_ * sizeof (T)));
-            //  TODO since this function is called by a client, we could return errno == ENOMEM here
-            alloc_assert (_buf);
-        } else {
-            _buf = _static_buf;
-        }
-    }
-
-    T &operator[] (const size_t i) { return _buf[i]; }
-
-    ~fast_vector_t ()
-    {
-        if (_buf != _static_buf)
-            free (_buf);
-    }
-
-  private:
-    T _static_buf[S];
-    T *_buf;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (fast_vector_t)
-};
-
-template <typename T, size_t S> class resizable_fast_vector_t
-{
-  public:
-    resizable_fast_vector_t () : _dynamic_buf (NULL) {}
-
-    void resize (const size_t nitems_)
-    {
-        if (_dynamic_buf)
-            _dynamic_buf->resize (nitems_);
-        if (nitems_ > S) {
-            _dynamic_buf = new (std::nothrow) std::vector<T>;
-            //  TODO since this function is called by a client, we could return errno == ENOMEM here
-            alloc_assert (_dynamic_buf);
-        }
-    }
-
-    T *get_buf ()
-    {
-        // e.g. MSVC 2008 does not have std::vector::data, so we use &...[0]
-        return _dynamic_buf ? &(*_dynamic_buf)[0] : _static_buf;
-    }
-
-    T &operator[] (const size_t i) { return get_buf ()[i]; }
-
-    ~resizable_fast_vector_t () { delete _dynamic_buf; }
-
-  private:
-    T _static_buf[S];
-    std::vector<T> *_dynamic_buf;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (resizable_fast_vector_t)
-};
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-typedef int timeout_t;
-
-timeout_t
-compute_timeout (bool first_pass_, long timeout_, uint64_t now_, uint64_t end_);
-
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-inline size_t valid_pollset_bytes (const fd_set &pollset_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    // On Windows we don't need to copy the whole fd_set.
-    // SOCKETS are continuous from the beginning of fd_array in fd_set.
-    // We just need to copy fd_count elements of fd_array.
-    // We gain huge memcpy() improvement if number of used SOCKETs is much lower than FD_SETSIZE.
-    return reinterpret_cast<const char *> (
-             &pollset_.fd_array[pollset_.fd_count])
-           - reinterpret_cast<const char *> (&pollset_);
-#else
-    return sizeof (fd_set);
-#endif
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-// struct fd_set {
-//  u_int   fd_count;
-//  SOCKET  fd_array[1];
-// };
-// NOTE: offsetof(fd_set, fd_array)==sizeof(SOCKET) on both x86 and x64
-//       due to alignment bytes for the latter.
-class optimized_fd_set_t
-{
-  public:
-    explicit optimized_fd_set_t (size_t nevents_) : _fd_set (1 + nevents_) {}
-
-    fd_set *get () { return reinterpret_cast<fd_set *> (&_fd_set[0]); }
-
-  private:
-    fast_vector_t<SOCKET, 1 + ZMQ_POLLITEMS_DFLT> _fd_set;
-};
-
-class resizable_optimized_fd_set_t
-{
-  public:
-    void resize (size_t nevents_) { _fd_set.resize (1 + nevents_); }
-
-    fd_set *get () { return reinterpret_cast<fd_set *> (&_fd_set[0]); }
-
-  private:
-    resizable_fast_vector_t<SOCKET, 1 + ZMQ_POLLITEMS_DFLT> _fd_set;
-};
-#else
-class optimized_fd_set_t
-{
-  public:
-    explicit optimized_fd_set_t (size_t /*nevents_*/) {}
-
-    fd_set *get () { return &_fd_set; }
-
-  private:
-    fd_set _fd_set;
-};
-
-class resizable_optimized_fd_set_t : public optimized_fd_set_t
-{
-  public:
-    resizable_optimized_fd_set_t () : optimized_fd_set_t (0) {}
-
-    void resize (size_t /*nevents_*/) {}
-};
-#endif
-#endif
-}
-
-#endif
diff --git a/src/pollset.cpp b/src/pollset.cpp
deleted file mode 100644
index 1a1dee954..000000000
--- a/src/pollset.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "pollset.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLLSET
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <algorithm>
-#include <new>
-
-#include "macros.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-zmq::pollset_t::pollset_t (const zmq::thread_ctx_t &ctx_) :
-    ctx (ctx_),
-    stopping (false)
-{
-    pollset_fd = pollset_create (-1);
-    errno_assert (pollset_fd != -1);
-}
-
-zmq::pollset_t::~pollset_t ()
-{
-    //  Wait till the worker thread exits.
-    worker.stop ();
-
-    pollset_destroy (pollset_fd);
-    for (retired_t::iterator it = retired.begin (); it != retired.end (); ++it)
-        LIBZMQ_DELETE (*it);
-}
-
-zmq::pollset_t::handle_t zmq::pollset_t::add_fd (fd_t fd_,
-                                                 i_poll_events *events_)
-{
-    poll_entry_t *pe = new (std::nothrow) poll_entry_t;
-    alloc_assert (pe);
-
-    pe->fd = fd_;
-    pe->flag_pollin = false;
-    pe->flag_pollout = false;
-    pe->events = events_;
-
-    struct poll_ctl pc;
-    pc.fd = fd_;
-    pc.cmd = PS_ADD;
-    pc.events = 0;
-
-    int rc = pollset_ctl (pollset_fd, &pc, 1);
-    errno_assert (rc != -1);
-
-    //  Increase the load metric of the thread.
-    adjust_load (1);
-
-    if (fd_ >= fd_table.size ()) {
-        fd_table.resize (fd_ + 1, NULL);
-    }
-    fd_table[fd_] = pe;
-    return pe;
-}
-
-void zmq::pollset_t::rm_fd (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-
-    struct poll_ctl pc;
-    pc.fd = pe->fd;
-    pc.cmd = PS_DELETE;
-    pc.events = 0;
-    pollset_ctl (pollset_fd, &pc, 1);
-
-    fd_table[pe->fd] = NULL;
-
-    pe->fd = retired_fd;
-    retired.push_back (pe);
-
-    //  Decrease the load metric of the thread.
-    adjust_load (-1);
-}
-
-void zmq::pollset_t::set_pollin (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (!pe->flag_pollin)) {
-        struct poll_ctl pc;
-        pc.fd = pe->fd;
-        pc.cmd = PS_MOD;
-        pc.events = POLLIN;
-
-        const int rc = pollset_ctl (pollset_fd, &pc, 1);
-        errno_assert (rc != -1);
-
-        pe->flag_pollin = true;
-    }
-}
-
-void zmq::pollset_t::reset_pollin (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (unlikely (!pe->flag_pollin)) {
-        return;
-    }
-
-    struct poll_ctl pc;
-    pc.fd = pe->fd;
-    pc.events = 0;
-
-    pc.cmd = PS_DELETE;
-    int rc = pollset_ctl (pollset_fd, &pc, 1);
-
-    if (pe->flag_pollout) {
-        pc.events = POLLOUT;
-        pc.cmd = PS_MOD;
-        rc = pollset_ctl (pollset_fd, &pc, 1);
-        errno_assert (rc != -1);
-    }
-
-    pe->flag_pollin = false;
-}
-
-void zmq::pollset_t::set_pollout (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (!pe->flag_pollout)) {
-        struct poll_ctl pc;
-        pc.fd = pe->fd;
-        pc.cmd = PS_MOD;
-        pc.events = POLLOUT;
-
-        const int rc = pollset_ctl (pollset_fd, &pc, 1);
-        errno_assert (rc != -1);
-
-        pe->flag_pollout = true;
-    }
-}
-
-void zmq::pollset_t::reset_pollout (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (unlikely (!pe->flag_pollout)) {
-        return;
-    }
-
-    struct poll_ctl pc;
-    pc.fd = pe->fd;
-    pc.events = 0;
-
-    pc.cmd = PS_DELETE;
-    int rc = pollset_ctl (pollset_fd, &pc, 1);
-    errno_assert (rc != -1);
-
-    if (pe->flag_pollin) {
-        pc.cmd = PS_MOD;
-        pc.events = POLLIN;
-        rc = pollset_ctl (pollset_fd, &pc, 1);
-        errno_assert (rc != -1);
-    }
-    pe->flag_pollout = false;
-}
-
-void zmq::pollset_t::start ()
-{
-    ctx.start_thread (worker, worker_routine, this);
-}
-
-void zmq::pollset_t::stop ()
-{
-    stopping = true;
-}
-
-int zmq::pollset_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::pollset_t::loop ()
-{
-    struct pollfd polldata_array[max_io_events];
-
-    while (!stopping) {
-        //  Execute any due timers.
-        int timeout = (int) execute_timers ();
-
-        //  Wait for events.
-        int n = pollset_poll (pollset_fd, polldata_array, max_io_events,
-                              timeout ? timeout : -1);
-        if (n == -1) {
-            errno_assert (errno == EINTR);
-            continue;
-        }
-
-        for (int i = 0; i < n; i++) {
-            poll_entry_t *pe = fd_table[polldata_array[i].fd];
-            if (!pe)
-                continue;
-
-            if (pe->fd == retired_fd)
-                continue;
-            if (polldata_array[i].revents & (POLLERR | POLLHUP))
-                pe->events->in_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (polldata_array[i].revents & POLLOUT)
-                pe->events->out_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (polldata_array[i].revents & POLLIN)
-                pe->events->in_event ();
-        }
-
-        //  Destroy retired event sources.
-        for (retired_t::iterator it = retired.begin (); it != retired.end ();
-             ++it)
-            LIBZMQ_DELETE (*it);
-        retired.clear ();
-    }
-}
-
-void zmq::pollset_t::worker_routine (void *arg_)
-{
-    ((pollset_t *) arg_)->loop ();
-}
-
-#endif
diff --git a/src/pollset.hpp b/src/pollset.hpp
deleted file mode 100644
index 8286bed29..000000000
--- a/src/pollset.hpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_POLLSET_HPP_INCLUDED__
-#define __ZMQ_POLLSET_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLLSET
-
-#include <sys/poll.h>
-#include <sys/pollset.h>
-#include <vector>
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  This class implements socket polling mechanism using the AIX-specific
-//  pollset mechanism.
-
-class pollset_t ZMQ_FINAL : public poller_base_t
-{
-  public:
-    typedef void *handle_t;
-
-    pollset_t (const thread_ctx_t &ctx_);
-    ~pollset_t () ZMQ_FINAL;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void start ();
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main worker thread routine.
-    static void worker_routine (void *arg_);
-
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    // Reference to ZMQ context.
-    const thread_ctx_t &ctx;
-
-    //  Main pollset file descriptor
-    ::pollset_t pollset_fd;
-
-    struct poll_entry_t
-    {
-        fd_t fd;
-        bool flag_pollin;
-        bool flag_pollout;
-        zmq::i_poll_events *events;
-    };
-
-    //  List of retired event sources.
-    typedef std::vector<poll_entry_t *> retired_t;
-    retired_t retired;
-
-    //  This table stores data for registered descriptors.
-    typedef std::vector<poll_entry_t *> fd_table_t;
-    fd_table_t fd_table;
-
-    //  If true, thread is in the process of shutting down.
-    bool stopping;
-
-    //  Handle of the physical thread doing the I/O work.
-    thread_t worker;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pollset_t)
-};
-
-typedef pollset_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/src/precompiled.cpp b/src/precompiled.cpp
deleted file mode 100644
index acf58f76f..000000000
--- a/src/precompiled.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
diff --git a/src/precompiled.hpp b/src/precompiled.hpp
deleted file mode 100644
index f22a69374..000000000
--- a/src/precompiled.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PRECOMPILED_HPP_INCLUDED__
-#define __ZMQ_PRECOMPILED_HPP_INCLUDED__
-
-//  On AIX platform, poll.h has to be included first to get consistent
-//  definition of pollfd structure (AIX uses 'reqevents' and 'retnevents'
-//  instead of 'events' and 'revents' and defines macros to map from POSIX-y
-//  names to AIX-specific names).
-//  zmq.h must be included *after* poll.h for AIX to build properly.
-//  precompiled.hpp includes include/zmq.h
-#if defined ZMQ_POLL_BASED_ON_POLL && defined ZMQ_HAVE_AIX
-#include <poll.h>
-#endif
-
-#include "platform.hpp"
-
-#define __STDC_LIMIT_MACROS
-
-// This must be included before any windows headers are compiled.
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
-#if defined ZMQ_HAVE_OPENBSD
-#define ucred sockpeercred
-#endif
-
-// 0MQ definitions and exported functions
-#include "../include/zmq.h"
-
-// 0MQ DRAFT definitions and exported functions
-#include "zmq_draft.h"
-
-// TODO: expand pch implementation to non-windows builds.
-#ifdef _MSC_VER
-
-// standard C headers
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <io.h>
-#include <ipexport.h>
-#include <iphlpapi.h>
-#include <limits.h>
-#include <Mstcpip.h>
-#include <mswsock.h>
-#include <process.h>
-#include <rpc.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-
-// standard C++ headers
-#include <algorithm>
-#include <climits>
-#include <cmath>
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <deque>
-#include <limits>
-#include <map>
-#include <new>
-#include <set>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#if _MSC_VER >= 1800
-#include <inttypes.h>
-#endif
-
-#if _MSC_VER >= 1700
-#include <atomic>
-#endif
-
-#if defined _WIN32_WCE
-#include <cmnintrin.h>
-#else
-#include <intrin.h>
-#endif
-
-#if defined HAVE_LIBGSSAPI_KRB5
-#include "err.hpp"
-#include "msg.hpp"
-#include "mechanism.hpp"
-#include "session_base.hpp"
-#include "gssapi_server.hpp"
-#include "wire.hpp"
-#include <gssapi/gssapi.h>
-#include <gssapi/gssapi_krb5.h>
-#endif
-
-#include "options.hpp"
-
-#endif // _MSC_VER
-
-#endif //ifndef __ZMQ_PRECOMPILED_HPP_INCLUDED__
diff --git a/src/proxy.cpp b/src/proxy.cpp
deleted file mode 100644
index 8a517c782..000000000
--- a/src/proxy.cpp
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include <stddef.h>
-#include "poller.hpp"
-#include "proxy.hpp"
-#include "likely.hpp"
-#include "msg.hpp"
-
-#if defined ZMQ_POLL_BASED_ON_POLL && !defined ZMQ_HAVE_WINDOWS                \
-  && !defined ZMQ_HAVE_AIX
-#include <poll.h>
-#endif
-
-// These headers end up pulling in zmq.h somewhere in their include
-// dependency chain
-#include "socket_base.hpp"
-#include "err.hpp"
-
-#ifdef ZMQ_HAVE_POLLER
-
-#include "socket_poller.hpp"
-
-//  Macros for repetitive code.
-
-//  PROXY_CLEANUP() must not be used before these variables are initialized.
-#define PROXY_CLEANUP()                                                        \
-    do {                                                                       \
-        delete poller_all;                                                     \
-        delete poller_in;                                                      \
-        delete poller_control;                                                 \
-        delete poller_receive_blocked;                                         \
-        delete poller_send_blocked;                                            \
-        delete poller_both_blocked;                                            \
-        delete poller_frontend_only;                                           \
-        delete poller_backend_only;                                            \
-    } while (false)
-
-
-#define CHECK_RC_EXIT_ON_FAILURE()                                             \
-    do {                                                                       \
-        if (rc < 0) {                                                          \
-            PROXY_CLEANUP ();                                                  \
-            return close_and_return (&msg, -1);                                \
-        }                                                                      \
-    } while (false)
-
-#endif //  ZMQ_HAVE_POLLER
-
-
-// Control socket messages
-
-typedef struct
-{
-    uint64_t msg_in;
-    uint64_t bytes_in;
-    uint64_t msg_out;
-    uint64_t bytes_out;
-} zmq_socket_stats_t;
-
-
-// Utility functions
-
-static int
-capture (class zmq::socket_base_t *capture_, zmq::msg_t *msg_, int more_ = 0)
-{
-    //  Copy message to capture socket if any
-    if (capture_) {
-        zmq::msg_t ctrl;
-        int rc = ctrl.init ();
-        if (unlikely (rc < 0))
-            return -1;
-        rc = ctrl.copy (*msg_);
-        if (unlikely (rc < 0))
-            return -1;
-        rc = capture_->send (&ctrl, more_ ? ZMQ_SNDMORE : 0);
-        if (unlikely (rc < 0))
-            return -1;
-    }
-    return 0;
-}
-
-static int forward (class zmq::socket_base_t *from_,
-                    zmq_socket_stats_t *from_stats_,
-                    class zmq::socket_base_t *to_,
-                    zmq_socket_stats_t *to_stats_,
-                    class zmq::socket_base_t *capture_,
-                    zmq::msg_t *msg_)
-{
-    // Forward a burst of messages
-    for (unsigned int i = 0; i < zmq::proxy_burst_size; i++) {
-        int more;
-        size_t moresz;
-        size_t complete_msg_size = 0;
-
-        // Forward all the parts of one message
-        while (true) {
-            int rc = from_->recv (msg_, ZMQ_DONTWAIT);
-            if (rc < 0) {
-                if (likely (errno == EAGAIN && i > 0))
-                    return 0; // End of burst
-
-                return -1;
-            }
-
-            complete_msg_size += msg_->size ();
-
-            moresz = sizeof more;
-            rc = from_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
-            if (unlikely (rc < 0))
-                return -1;
-
-            //  Copy message to capture socket if any
-            rc = capture (capture_, msg_, more);
-            if (unlikely (rc < 0))
-                return -1;
-
-            rc = to_->send (msg_, more ? ZMQ_SNDMORE : 0);
-            if (unlikely (rc < 0))
-                return -1;
-
-            if (more == 0)
-                break;
-        }
-
-        // A multipart message counts as 1 packet:
-        from_stats_->msg_in++;
-        from_stats_->bytes_in += complete_msg_size;
-        to_stats_->msg_out++;
-        to_stats_->bytes_out += complete_msg_size;
-    }
-
-    return 0;
-}
-
-static int loop_and_send_multipart_stat (zmq::socket_base_t *control_,
-                                         uint64_t stat_,
-                                         bool first_,
-                                         bool more_)
-{
-    int rc;
-    zmq::msg_t msg;
-
-    //  VSM of 8 bytes can't fail to init
-    msg.init_size (sizeof (uint64_t));
-    memcpy (msg.data (), &stat_, sizeof (uint64_t));
-
-    //  if the first message is handed to the pipe successfully then the HWM
-    //  is not full, which means failures are due to interrupts (on Windows pipes
-    //  are TCP sockets), so keep retrying
-    do {
-        rc = control_->send (&msg, more_ ? ZMQ_SNDMORE : 0);
-    } while (!first_ && rc != 0 && errno == EAGAIN);
-
-    return rc;
-}
-
-static int reply_stats (zmq::socket_base_t *control_,
-                        const zmq_socket_stats_t *frontend_stats_,
-                        const zmq_socket_stats_t *backend_stats_)
-{
-    // first part: frontend stats - the first send might fail due to HWM
-    if (loop_and_send_multipart_stat (control_, frontend_stats_->msg_in, true,
-                                      true)
-        != 0)
-        return -1;
-
-    loop_and_send_multipart_stat (control_, frontend_stats_->bytes_in, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, frontend_stats_->msg_out, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, frontend_stats_->bytes_out, false,
-                                  true);
-
-    // second part: backend stats
-    loop_and_send_multipart_stat (control_, backend_stats_->msg_in, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, backend_stats_->bytes_in, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, backend_stats_->msg_out, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, backend_stats_->bytes_out, false,
-                                  false);
-
-    return 0;
-}
-
-
-#ifdef ZMQ_HAVE_POLLER
-
-int zmq::proxy (class socket_base_t *frontend_,
-                class socket_base_t *backend_,
-                class socket_base_t *capture_,
-                class socket_base_t *control_)
-{
-    msg_t msg;
-    int rc = msg.init ();
-    if (rc != 0)
-        return -1;
-
-    //  The algorithm below assumes ratio of requests and replies processed
-    //  under full load to be 1:1.
-
-    int more;
-    size_t moresz = sizeof (more);
-
-    //  Proxy can be in these three states
-    enum
-    {
-        active,
-        paused,
-        terminated
-    } state = active;
-
-    bool frontend_equal_to_backend;
-    bool frontend_in = false;
-    bool frontend_out = false;
-    bool backend_in = false;
-    bool backend_out = false;
-    bool control_in = false;
-    zmq::socket_poller_t::event_t events[3];
-    zmq_socket_stats_t frontend_stats;
-    zmq_socket_stats_t backend_stats;
-    memset (&frontend_stats, 0, sizeof (frontend_stats));
-    memset (&backend_stats, 0, sizeof (backend_stats));
-
-    //  Don't allocate these pollers from stack because they will take more than 900 kB of stack!
-    //  On Windows this blows up default stack of 1 MB and aborts the program.
-    //  I wanted to use std::shared_ptr here as the best solution but that requires C++11...
-    zmq::socket_poller_t *poller_all =
-      new (std::nothrow) zmq::socket_poller_t; //  Poll for everything.
-    zmq::socket_poller_t *poller_in = new (std::nothrow) zmq::
-      socket_poller_t; //  Poll only 'ZMQ_POLLIN' on all sockets. Initial blocking poll in loop.
-    zmq::socket_poller_t *poller_control = new (std::nothrow) zmq::
-      socket_poller_t; //  Poll only for 'ZMQ_POLLIN' on 'control_', when proxy is paused.
-    zmq::socket_poller_t *poller_receive_blocked = new (std::nothrow)
-      zmq::socket_poller_t; //  All except 'ZMQ_POLLIN' on 'frontend_'.
-
-    //  If frontend_==backend_ 'poller_send_blocked' and 'poller_receive_blocked' are the same, 'ZMQ_POLLIN' is ignored.
-    //  In that case 'poller_send_blocked' is not used. We need only 'poller_receive_blocked'.
-    //  We also don't need 'poller_both_blocked', 'poller_backend_only' nor 'poller_frontend_only' no need to initialize it.
-    //  We save some RAM and time for initialization.
-    zmq::socket_poller_t *poller_send_blocked =
-      NULL; //  All except 'ZMQ_POLLIN' on 'backend_'.
-    zmq::socket_poller_t *poller_both_blocked =
-      NULL; //  All except 'ZMQ_POLLIN' on both 'frontend_' and 'backend_'.
-    zmq::socket_poller_t *poller_frontend_only =
-      NULL; //  Only 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' on 'frontend_'.
-    zmq::socket_poller_t *poller_backend_only =
-      NULL; //  Only 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' on 'backend_'.
-
-    if (frontend_ != backend_) {
-        poller_send_blocked = new (std::nothrow)
-          zmq::socket_poller_t; //  All except 'ZMQ_POLLIN' on 'backend_'.
-        poller_both_blocked = new (std::nothrow) zmq::
-          socket_poller_t; //  All except 'ZMQ_POLLIN' on both 'frontend_' and 'backend_'.
-        poller_frontend_only = new (std::nothrow) zmq::
-          socket_poller_t; //  Only 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' on 'frontend_'.
-        poller_backend_only = new (std::nothrow) zmq::
-          socket_poller_t; //  Only 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' on 'backend_'.
-        frontend_equal_to_backend = false;
-    } else
-        frontend_equal_to_backend = true;
-
-    if (poller_all == NULL || poller_in == NULL || poller_control == NULL
-        || poller_receive_blocked == NULL
-        || ((poller_send_blocked == NULL || poller_both_blocked == NULL)
-            && !frontend_equal_to_backend)) {
-        PROXY_CLEANUP ();
-        return close_and_return (&msg, -1);
-    }
-
-    zmq::socket_poller_t *poller_wait =
-      poller_in; //  Poller for blocking wait, initially all 'ZMQ_POLLIN'.
-
-    //  Register 'frontend_' and 'backend_' with pollers.
-    rc = poller_all->add (frontend_, NULL,
-                          ZMQ_POLLIN | ZMQ_POLLOUT); //  Everything.
-    CHECK_RC_EXIT_ON_FAILURE ();
-    rc = poller_in->add (frontend_, NULL, ZMQ_POLLIN); //  All 'ZMQ_POLLIN's.
-    CHECK_RC_EXIT_ON_FAILURE ();
-
-    if (frontend_equal_to_backend) {
-        //  If frontend_==backend_ 'poller_send_blocked' and 'poller_receive_blocked' are the same,
-        //  so we don't need 'poller_send_blocked'. We need only 'poller_receive_blocked'.
-        //  We also don't need 'poller_both_blocked', no need to initialize it.
-        rc = poller_receive_blocked->add (frontend_, NULL, ZMQ_POLLOUT);
-        CHECK_RC_EXIT_ON_FAILURE ();
-    } else {
-        rc = poller_all->add (backend_, NULL,
-                              ZMQ_POLLIN | ZMQ_POLLOUT); //  Everything.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_in->add (backend_, NULL, ZMQ_POLLIN); //  All 'ZMQ_POLLIN's.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_both_blocked->add (
-          frontend_, NULL, ZMQ_POLLOUT); //  Waiting only for 'ZMQ_POLLOUT'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_both_blocked->add (
-          backend_, NULL, ZMQ_POLLOUT); //  Waiting only for 'ZMQ_POLLOUT'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_send_blocked->add (
-          backend_, NULL,
-          ZMQ_POLLOUT); //  All except 'ZMQ_POLLIN' on 'backend_'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_send_blocked->add (
-          frontend_, NULL,
-          ZMQ_POLLIN | ZMQ_POLLOUT); //  All except 'ZMQ_POLLIN' on 'backend_'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_receive_blocked->add (
-          frontend_, NULL,
-          ZMQ_POLLOUT); //  All except 'ZMQ_POLLIN' on 'frontend_'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_receive_blocked->add (
-          backend_, NULL,
-          ZMQ_POLLIN | ZMQ_POLLOUT); //  All except 'ZMQ_POLLIN' on 'frontend_'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc =
-          poller_frontend_only->add (frontend_, NULL, ZMQ_POLLIN | ZMQ_POLLOUT);
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc =
-          poller_backend_only->add (backend_, NULL, ZMQ_POLLIN | ZMQ_POLLOUT);
-        CHECK_RC_EXIT_ON_FAILURE ();
-    }
-
-    //  Register 'control_' with pollers.
-    if (control_ != NULL) {
-        rc = poller_all->add (control_, NULL, ZMQ_POLLIN);
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_in->add (control_, NULL, ZMQ_POLLIN);
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_control->add (
-          control_, NULL,
-          ZMQ_POLLIN); //  When proxy is paused we wait only for ZMQ_POLLIN on 'control_' socket.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_receive_blocked->add (control_, NULL, ZMQ_POLLIN);
-        CHECK_RC_EXIT_ON_FAILURE ();
-        if (!frontend_equal_to_backend) {
-            rc = poller_send_blocked->add (control_, NULL, ZMQ_POLLIN);
-            CHECK_RC_EXIT_ON_FAILURE ();
-            rc = poller_both_blocked->add (control_, NULL, ZMQ_POLLIN);
-            CHECK_RC_EXIT_ON_FAILURE ();
-            rc = poller_frontend_only->add (control_, NULL, ZMQ_POLLIN);
-            CHECK_RC_EXIT_ON_FAILURE ();
-            rc = poller_backend_only->add (control_, NULL, ZMQ_POLLIN);
-            CHECK_RC_EXIT_ON_FAILURE ();
-        }
-    }
-
-    bool request_processed, reply_processed;
-
-    while (state != terminated) {
-        //  Blocking wait initially only for 'ZMQ_POLLIN' - 'poller_wait' points to 'poller_in'.
-        //  If one of receiving end's queue is full ('ZMQ_POLLOUT' not available),
-        //  'poller_wait' is pointed to 'poller_receive_blocked', 'poller_send_blocked' or 'poller_both_blocked'.
-        rc = poller_wait->wait (events, 3, -1);
-        if (rc < 0 && errno == EAGAIN)
-            rc = 0;
-        CHECK_RC_EXIT_ON_FAILURE ();
-
-        //  Some of events waited for by 'poller_wait' have arrived, now poll for everything without blocking.
-        rc = poller_all->wait (events, 3, 0);
-        if (rc < 0 && errno == EAGAIN)
-            rc = 0;
-        CHECK_RC_EXIT_ON_FAILURE ();
-
-        //  Process events.
-        for (int i = 0; i < rc; i++) {
-            if (events[i].socket == frontend_) {
-                frontend_in = (events[i].events & ZMQ_POLLIN) != 0;
-                frontend_out = (events[i].events & ZMQ_POLLOUT) != 0;
-            } else
-              //  This 'if' needs to be after check for 'frontend_' in order never
-              //  to be reached in case frontend_==backend_, so we ensure backend_in=false in that case.
-              if (events[i].socket == backend_) {
-                backend_in = (events[i].events & ZMQ_POLLIN) != 0;
-                backend_out = (events[i].events & ZMQ_POLLOUT) != 0;
-            } else if (events[i].socket == control_)
-                control_in = (events[i].events & ZMQ_POLLIN) != 0;
-        }
-
-
-        //  Process a control command if any.
-        if (control_in) {
-            rc = control_->recv (&msg, 0);
-            CHECK_RC_EXIT_ON_FAILURE ();
-            rc = control_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
-            if (unlikely (rc < 0) || more) {
-                PROXY_CLEANUP ();
-                return close_and_return (&msg, -1);
-            }
-
-            //  Copy message to capture socket if any.
-            rc = capture (capture_, &msg);
-            CHECK_RC_EXIT_ON_FAILURE ();
-
-            if (msg.size () == 5 && memcmp (msg.data (), "PAUSE", 5) == 0) {
-                state = paused;
-                poller_wait = poller_control;
-            } else if (msg.size () == 6
-                       && memcmp (msg.data (), "RESUME", 6) == 0) {
-                state = active;
-                poller_wait = poller_in;
-            } else {
-                if (msg.size () == 9
-                    && memcmp (msg.data (), "TERMINATE", 9) == 0)
-                    state = terminated;
-                else {
-                    if (msg.size () == 10
-                        && memcmp (msg.data (), "STATISTICS", 10) == 0) {
-                        rc = reply_stats (control_, &frontend_stats,
-                                          &backend_stats);
-                        CHECK_RC_EXIT_ON_FAILURE ();
-                    } else {
-                        //  This is an API error, we assert
-                        puts ("E: invalid command sent to proxy");
-                        zmq_assert (false);
-                    }
-                }
-            }
-            control_in = false;
-        }
-
-        if (state == active) {
-            //  Process a request, 'ZMQ_POLLIN' on 'frontend_' and 'ZMQ_POLLOUT' on 'backend_'.
-            //  In case of frontend_==backend_ there's no 'ZMQ_POLLOUT' event.
-            if (frontend_in && (backend_out || frontend_equal_to_backend)) {
-                rc = forward (frontend_, &frontend_stats, backend_,
-                              &backend_stats, capture_, &msg);
-                CHECK_RC_EXIT_ON_FAILURE ();
-                request_processed = true;
-                frontend_in = backend_out = false;
-            } else
-                request_processed = false;
-
-            //  Process a reply, 'ZMQ_POLLIN' on 'backend_' and 'ZMQ_POLLOUT' on 'frontend_'.
-            //  If 'frontend_' and 'backend_' are the same this is not needed because previous processing
-            //  covers all of the cases. 'backend_in' is always false if frontend_==backend_ due to
-            //  design in 'for' event processing loop.
-            if (backend_in && frontend_out) {
-                rc = forward (backend_, &backend_stats, frontend_,
-                              &frontend_stats, capture_, &msg);
-                CHECK_RC_EXIT_ON_FAILURE ();
-                reply_processed = true;
-                backend_in = frontend_out = false;
-            } else
-                reply_processed = false;
-
-            if (request_processed || reply_processed) {
-                //  If request/reply is processed that means we had at least one 'ZMQ_POLLOUT' event.
-                //  Enable corresponding 'ZMQ_POLLIN' for blocking wait if any was disabled.
-                if (poller_wait != poller_in) {
-                    if (request_processed) { //  'frontend_' -> 'backend_'
-                        if (poller_wait == poller_both_blocked)
-                            poller_wait = poller_send_blocked;
-                        else if (poller_wait == poller_receive_blocked
-                                 || poller_wait == poller_frontend_only)
-                            poller_wait = poller_in;
-                    }
-                    if (reply_processed) { //  'backend_' -> 'frontend_'
-                        if (poller_wait == poller_both_blocked)
-                            poller_wait = poller_receive_blocked;
-                        else if (poller_wait == poller_send_blocked
-                                 || poller_wait == poller_backend_only)
-                            poller_wait = poller_in;
-                    }
-                }
-            } else {
-                //  No requests have been processed, there were no 'ZMQ_POLLIN' with corresponding 'ZMQ_POLLOUT' events.
-                //  That means that out queue(s) is/are full or one out queue is full and second one has no messages to process.
-                //  Disable receiving 'ZMQ_POLLIN' for sockets for which there's no 'ZMQ_POLLOUT',
-                //  or wait only on both 'backend_''s or 'frontend_''s 'ZMQ_POLLIN' and 'ZMQ_POLLOUT'.
-                if (frontend_in) {
-                    if (frontend_out)
-                        // If frontend_in and frontend_out are true, obviously backend_in and backend_out are both false.
-                        // In that case we need to wait for both 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' only on 'backend_'.
-                        // We'll never get here in case of frontend_==backend_ because then frontend_out will always be false.
-                        poller_wait = poller_backend_only;
-                    else {
-                        if (poller_wait == poller_send_blocked)
-                            poller_wait = poller_both_blocked;
-                        else if (poller_wait == poller_in)
-                            poller_wait = poller_receive_blocked;
-                    }
-                }
-                if (backend_in) {
-                    //  Will never be reached if frontend_==backend_, 'backend_in' will
-                    //  always be false due to design in 'for' event processing loop.
-                    if (backend_out)
-                        // If backend_in and backend_out are true, obviously frontend_in and frontend_out are both false.
-                        // In that case we need to wait for both 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' only on 'frontend_'.
-                        poller_wait = poller_frontend_only;
-                    else {
-                        if (poller_wait == poller_receive_blocked)
-                            poller_wait = poller_both_blocked;
-                        else if (poller_wait == poller_in)
-                            poller_wait = poller_send_blocked;
-                    }
-                }
-            }
-        }
-    }
-    PROXY_CLEANUP ();
-    return close_and_return (&msg, 0);
-}
-
-#else //  ZMQ_HAVE_POLLER
-
-int zmq::proxy (class socket_base_t *frontend_,
-                class socket_base_t *backend_,
-                class socket_base_t *capture_,
-                class socket_base_t *control_)
-{
-    msg_t msg;
-    int rc = msg.init ();
-    if (rc != 0)
-        return -1;
-
-    //  The algorithm below assumes ratio of requests and replies processed
-    //  under full load to be 1:1.
-
-    int more;
-    size_t moresz;
-    zmq_pollitem_t items[] = {{frontend_, 0, ZMQ_POLLIN, 0},
-                              {backend_, 0, ZMQ_POLLIN, 0},
-                              {control_, 0, ZMQ_POLLIN, 0}};
-    int qt_poll_items = (control_ ? 3 : 2);
-    zmq_pollitem_t itemsout[] = {{frontend_, 0, ZMQ_POLLOUT, 0},
-                                 {backend_, 0, ZMQ_POLLOUT, 0}};
-
-    zmq_socket_stats_t frontend_stats;
-    memset (&frontend_stats, 0, sizeof (frontend_stats));
-    zmq_socket_stats_t backend_stats;
-    memset (&backend_stats, 0, sizeof (backend_stats));
-
-    //  Proxy can be in these three states
-    enum
-    {
-        active,
-        paused,
-        terminated
-    } state = active;
-
-    while (state != terminated) {
-        //  Wait while there are either requests or replies to process.
-        rc = zmq_poll (&items[0], qt_poll_items, -1);
-        if (unlikely (rc < 0))
-            return close_and_return (&msg, -1);
-
-        //  Get the pollout separately because when combining this with pollin it maxes the CPU
-        //  because pollout shall most of the time return directly.
-        //  POLLOUT is only checked when frontend and backend sockets are not the same.
-        if (frontend_ != backend_) {
-            rc = zmq_poll (&itemsout[0], 2, 0);
-            if (unlikely (rc < 0)) {
-                return close_and_return (&msg, -1);
-            }
-        }
-
-        //  Process a control command if any
-        if (control_ && items[2].revents & ZMQ_POLLIN) {
-            rc = control_->recv (&msg, 0);
-            if (unlikely (rc < 0))
-                return close_and_return (&msg, -1);
-
-            moresz = sizeof more;
-            rc = control_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
-            if (unlikely (rc < 0) || more)
-                return close_and_return (&msg, -1);
-
-            //  Copy message to capture socket if any
-            rc = capture (capture_, &msg);
-            if (unlikely (rc < 0))
-                return close_and_return (&msg, -1);
-
-            if (msg.size () == 5 && memcmp (msg.data (), "PAUSE", 5) == 0)
-                state = paused;
-            else if (msg.size () == 6 && memcmp (msg.data (), "RESUME", 6) == 0)
-                state = active;
-            else if (msg.size () == 9
-                     && memcmp (msg.data (), "TERMINATE", 9) == 0)
-                state = terminated;
-            else {
-                if (msg.size () == 10
-                    && memcmp (msg.data (), "STATISTICS", 10) == 0) {
-                    rc =
-                      reply_stats (control_, &frontend_stats, &backend_stats);
-                    if (unlikely (rc < 0))
-                        return close_and_return (&msg, -1);
-                } else {
-                    //  This is an API error, we assert
-                    puts ("E: invalid command sent to proxy");
-                    zmq_assert (false);
-                }
-            }
-        }
-        //  Process a request
-        if (state == active && items[0].revents & ZMQ_POLLIN
-            && (frontend_ == backend_ || itemsout[1].revents & ZMQ_POLLOUT)) {
-            rc = forward (frontend_, &frontend_stats, backend_, &backend_stats,
-                          capture_, &msg);
-            if (unlikely (rc < 0))
-                return close_and_return (&msg, -1);
-        }
-        //  Process a reply
-        if (state == active && frontend_ != backend_
-            && items[1].revents & ZMQ_POLLIN
-            && itemsout[0].revents & ZMQ_POLLOUT) {
-            rc = forward (backend_, &backend_stats, frontend_, &frontend_stats,
-                          capture_, &msg);
-            if (unlikely (rc < 0))
-                return close_and_return (&msg, -1);
-        }
-    }
-
-    return close_and_return (&msg, 0);
-}
-
-#endif //  ZMQ_HAVE_POLLER
diff --git a/src/proxy.hpp b/src/proxy.hpp
deleted file mode 100644
index f078c6ae5..000000000
--- a/src/proxy.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PROXY_HPP_INCLUDED__
-#define __ZMQ_PROXY_HPP_INCLUDED__
-
-namespace zmq
-{
-int proxy (class socket_base_t *frontend_,
-           class socket_base_t *backend_,
-           class socket_base_t *capture_,
-           class socket_base_t *control_ =
-             NULL); // backward compatibility without this argument
-}
-
-#endif
diff --git a/src/pub.cpp b/src/pub.cpp
deleted file mode 100644
index fe42982ed..000000000
--- a/src/pub.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "pub.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::pub_t::pub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    xpub_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_PUB;
-}
-
-zmq::pub_t::~pub_t ()
-{
-}
-
-void zmq::pub_t::xattach_pipe (pipe_t *pipe_,
-                               bool subscribe_to_all_,
-                               bool locally_initiated_)
-{
-    zmq_assert (pipe_);
-
-    //  Don't delay pipe termination as there is no one
-    //  to receive the delimiter.
-    pipe_->set_nodelay ();
-
-    xpub_t::xattach_pipe (pipe_, subscribe_to_all_, locally_initiated_);
-}
-
-int zmq::pub_t::xrecv (class msg_t *)
-{
-    //  Messages cannot be received from PUB socket.
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::pub_t::xhas_in ()
-{
-    return false;
-}
diff --git a/src/pub.hpp b/src/pub.hpp
deleted file mode 100644
index b423da026..000000000
--- a/src/pub.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PUB_HPP_INCLUDED__
-#define __ZMQ_PUB_HPP_INCLUDED__
-
-#include "xpub.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class io_thread_t;
-class socket_base_t;
-class msg_t;
-
-class pub_t ZMQ_FINAL : public xpub_t
-{
-  public:
-    pub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~pub_t ();
-
-    //  Implementations of virtual functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_ = false,
-                       bool locally_initiated_ = false);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pub_t)
-};
-}
-
-#endif
diff --git a/src/pull.cpp b/src/pull.cpp
deleted file mode 100644
index 9c9a843e3..000000000
--- a/src/pull.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "pull.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "pipe.hpp"
-
-zmq::pull_t::pull_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_PULL;
-}
-
-zmq::pull_t::~pull_t ()
-{
-}
-
-void zmq::pull_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _fq.attach (pipe_);
-}
-
-void zmq::pull_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::pull_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-}
-
-int zmq::pull_t::xrecv (msg_t *msg_)
-{
-    return _fq.recv (msg_);
-}
-
-bool zmq::pull_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
diff --git a/src/pull.hpp b/src/pull.hpp
deleted file mode 100644
index 4634d82c4..000000000
--- a/src/pull.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PULL_HPP_INCLUDED__
-#define __ZMQ_PULL_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class msg_t;
-class io_thread_t;
-
-class pull_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    pull_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~pull_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pull_t)
-};
-}
-
-#endif
diff --git a/src/push.cpp b/src/push.cpp
deleted file mode 100644
index 42184807c..000000000
--- a/src/push.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "push.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::push_t::push_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_PUSH;
-}
-
-zmq::push_t::~push_t ()
-{
-}
-
-void zmq::push_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    //  Don't delay pipe termination as there is no one
-    //  to receive the delimiter.
-    pipe_->set_nodelay ();
-
-    zmq_assert (pipe_);
-    _lb.attach (pipe_);
-}
-
-void zmq::push_t::xwrite_activated (pipe_t *pipe_)
-{
-    _lb.activated (pipe_);
-}
-
-void zmq::push_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _lb.pipe_terminated (pipe_);
-}
-
-int zmq::push_t::xsend (msg_t *msg_)
-{
-    return _lb.send (msg_);
-}
-
-bool zmq::push_t::xhas_out ()
-{
-    return _lb.has_out ();
-}
diff --git a/src/push.hpp b/src/push.hpp
deleted file mode 100644
index 3b908c109..000000000
--- a/src/push.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PUSH_HPP_INCLUDED__
-#define __ZMQ_PUSH_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "lb.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class msg_t;
-class io_thread_t;
-
-class push_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    push_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~push_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Load balancer managing the outbound pipes.
-    lb_t _lb;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (push_t)
-};
-}
-
-#endif
diff --git a/src/radio.cpp b/src/radio.cpp
deleted file mode 100644
index aa9f100af..000000000
--- a/src/radio.cpp
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-
-#include "radio.hpp"
-#include "macros.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::radio_t::radio_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true),
-    _lossy (true)
-{
-    options.type = ZMQ_RADIO;
-}
-
-zmq::radio_t::~radio_t ()
-{
-}
-
-void zmq::radio_t::xattach_pipe (pipe_t *pipe_,
-                                 bool subscribe_to_all_,
-                                 bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    //  Don't delay pipe termination as there is no one
-    //  to receive the delimiter.
-    pipe_->set_nodelay ();
-
-    _dist.attach (pipe_);
-
-    if (subscribe_to_all_)
-        _udp_pipes.push_back (pipe_);
-    //  The pipe is active when attached. Let's read the subscriptions from
-    //  it, if any.
-    else
-        xread_activated (pipe_);
-}
-
-void zmq::radio_t::xread_activated (pipe_t *pipe_)
-{
-    //  There are some subscriptions waiting. Let's process them.
-    msg_t msg;
-    while (pipe_->read (&msg)) {
-        //  Apply the subscription to the trie
-        if (msg.is_join () || msg.is_leave ()) {
-            std::string group = std::string (msg.group ());
-
-            if (msg.is_join ())
-                _subscriptions.ZMQ_MAP_INSERT_OR_EMPLACE (ZMQ_MOVE (group),
-                                                          pipe_);
-            else {
-                std::pair<subscriptions_t::iterator, subscriptions_t::iterator>
-                  range = _subscriptions.equal_range (group);
-
-                for (subscriptions_t::iterator it = range.first;
-                     it != range.second; ++it) {
-                    if (it->second == pipe_) {
-                        _subscriptions.erase (it);
-                        break;
-                    }
-                }
-            }
-        }
-        msg.close ();
-    }
-}
-
-void zmq::radio_t::xwrite_activated (pipe_t *pipe_)
-{
-    _dist.activated (pipe_);
-}
-int zmq::radio_t::xsetsockopt (int option_,
-                               const void *optval_,
-                               size_t optvallen_)
-{
-    if (optvallen_ != sizeof (int) || *static_cast<const int *> (optval_) < 0) {
-        errno = EINVAL;
-        return -1;
-    }
-    if (option_ == ZMQ_XPUB_NODROP)
-        _lossy = (*static_cast<const int *> (optval_) == 0);
-    else {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
-
-void zmq::radio_t::xpipe_terminated (pipe_t *pipe_)
-{
-    for (subscriptions_t::iterator it = _subscriptions.begin (),
-                                   end = _subscriptions.end ();
-         it != end;) {
-        if (it->second == pipe_) {
-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
-            it = _subscriptions.erase (it);
-#else
-            _subscriptions.erase (it++);
-#endif
-        } else {
-            ++it;
-        }
-    }
-
-    {
-        const udp_pipes_t::iterator end = _udp_pipes.end ();
-        const udp_pipes_t::iterator it =
-          std::find (_udp_pipes.begin (), end, pipe_);
-        if (it != end)
-            _udp_pipes.erase (it);
-    }
-
-    _dist.pipe_terminated (pipe_);
-}
-
-int zmq::radio_t::xsend (msg_t *msg_)
-{
-    //  Radio sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _dist.unmatch ();
-
-    const std::pair<subscriptions_t::iterator, subscriptions_t::iterator>
-      range = _subscriptions.equal_range (std::string (msg_->group ()));
-
-    for (subscriptions_t::iterator it = range.first; it != range.second; ++it)
-        _dist.match (it->second);
-
-    for (udp_pipes_t::iterator it = _udp_pipes.begin (),
-                               end = _udp_pipes.end ();
-         it != end; ++it)
-        _dist.match (*it);
-
-    int rc = -1;
-    if (_lossy || _dist.check_hwm ()) {
-        if (_dist.send_to_matching (msg_) == 0) {
-            rc = 0; //  Yay, sent successfully
-        }
-    } else
-        errno = EAGAIN;
-
-    return rc;
-}
-
-bool zmq::radio_t::xhas_out ()
-{
-    return _dist.has_out ();
-}
-
-int zmq::radio_t::xrecv (msg_t *msg_)
-{
-    //  Messages cannot be received from PUB socket.
-    LIBZMQ_UNUSED (msg_);
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::radio_t::xhas_in ()
-{
-    return false;
-}
-
-zmq::radio_session_t::radio_session_t (io_thread_t *io_thread_,
-                                       bool connect_,
-                                       socket_base_t *socket_,
-                                       const options_t &options_,
-                                       address_t *addr_) :
-    session_base_t (io_thread_, connect_, socket_, options_, addr_),
-    _state (group)
-{
-}
-
-zmq::radio_session_t::~radio_session_t ()
-{
-}
-
-int zmq::radio_session_t::push_msg (msg_t *msg_)
-{
-    if (msg_->flags () & msg_t::command) {
-        char *command_data = static_cast<char *> (msg_->data ());
-        const size_t data_size = msg_->size ();
-
-        int group_length;
-        const char *group;
-
-        msg_t join_leave_msg;
-        int rc;
-
-        //  Set the msg type to either JOIN or LEAVE
-        if (data_size >= 5 && memcmp (command_data, "\4JOIN", 5) == 0) {
-            group_length = static_cast<int> (data_size) - 5;
-            group = command_data + 5;
-            rc = join_leave_msg.init_join ();
-        } else if (data_size >= 6 && memcmp (command_data, "\5LEAVE", 6) == 0) {
-            group_length = static_cast<int> (data_size) - 6;
-            group = command_data + 6;
-            rc = join_leave_msg.init_leave ();
-        }
-        //  If it is not a JOIN or LEAVE just push the message
-        else
-            return session_base_t::push_msg (msg_);
-
-        errno_assert (rc == 0);
-
-        //  Set the group
-        rc = join_leave_msg.set_group (group, group_length);
-        errno_assert (rc == 0);
-
-        //  Close the current command
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-
-        //  Push the join or leave command
-        *msg_ = join_leave_msg;
-        return session_base_t::push_msg (msg_);
-    }
-    return session_base_t::push_msg (msg_);
-}
-
-int zmq::radio_session_t::pull_msg (msg_t *msg_)
-{
-    if (_state == group) {
-        int rc = session_base_t::pull_msg (&_pending_msg);
-        if (rc != 0)
-            return rc;
-
-        const char *group = _pending_msg.group ();
-        const int length = static_cast<int> (strlen (group));
-
-        //  First frame is the group
-        rc = msg_->init_size (length);
-        errno_assert (rc == 0);
-        msg_->set_flags (msg_t::more);
-        memcpy (msg_->data (), group, length);
-
-        //  Next status is the body
-        _state = body;
-        return 0;
-    }
-    *msg_ = _pending_msg;
-    _state = group;
-    return 0;
-}
-
-void zmq::radio_session_t::reset ()
-{
-    session_base_t::reset ();
-    _state = group;
-}
diff --git a/src/radio.hpp b/src/radio.hpp
deleted file mode 100644
index 8b3bd6412..000000000
--- a/src/radio.hpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RADIO_HPP_INCLUDED__
-#define __ZMQ_RADIO_HPP_INCLUDED__
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "dist.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class io_thread_t;
-
-class radio_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    radio_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~radio_t ();
-
-    //  Implementations of virtual functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_ = false,
-                       bool locally_initiated_ = false);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  List of all subscriptions mapped to corresponding pipes.
-    typedef std::multimap<std::string, pipe_t *> subscriptions_t;
-    subscriptions_t _subscriptions;
-
-    //  List of udp pipes
-    typedef std::vector<pipe_t *> udp_pipes_t;
-    udp_pipes_t _udp_pipes;
-
-    //  Distributor of messages holding the list of outbound pipes.
-    dist_t _dist;
-
-    //  Drop messages if HWM reached, otherwise return with EAGAIN
-    bool _lossy;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (radio_t)
-};
-
-class radio_session_t ZMQ_FINAL : public session_base_t
-{
-  public:
-    radio_session_t (zmq::io_thread_t *io_thread_,
-                     bool connect_,
-                     zmq::socket_base_t *socket_,
-                     const options_t &options_,
-                     address_t *addr_);
-    ~radio_session_t ();
-
-    //  Overrides of the functions from session_base_t.
-    int push_msg (msg_t *msg_);
-    int pull_msg (msg_t *msg_);
-    void reset ();
-
-  private:
-    enum
-    {
-        group,
-        body
-    } _state;
-
-    msg_t _pending_msg;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (radio_session_t)
-};
-}
-
-#endif
diff --git a/src/radix_tree.cpp b/src/radix_tree.cpp
deleted file mode 100644
index 04374eec5..000000000
--- a/src/radix_tree.cpp
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "err.hpp"
-#include "radix_tree.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-#include <iterator>
-#include <vector>
-
-node_t::node_t (unsigned char *data_) : _data (data_)
-{
-}
-
-uint32_t node_t::refcount ()
-{
-    uint32_t u32;
-    memcpy (&u32, _data, sizeof (u32));
-    return u32;
-}
-
-void node_t::set_refcount (uint32_t value_)
-{
-    memcpy (_data, &value_, sizeof (value_));
-}
-
-uint32_t node_t::prefix_length ()
-{
-    uint32_t u32;
-    memcpy (&u32, _data + sizeof (uint32_t), sizeof (u32));
-    return u32;
-}
-
-void node_t::set_prefix_length (uint32_t value_)
-{
-    memcpy (_data + sizeof (value_), &value_, sizeof (value_));
-}
-
-uint32_t node_t::edgecount ()
-{
-    uint32_t u32;
-    memcpy (&u32, _data + 2 * sizeof (uint32_t), sizeof (u32));
-    return u32;
-}
-
-void node_t::set_edgecount (uint32_t value_)
-{
-    memcpy (_data + 2 * sizeof (value_), &value_, sizeof (value_));
-}
-
-unsigned char *node_t::prefix ()
-{
-    return _data + 3 * sizeof (uint32_t);
-}
-
-void node_t::set_prefix (const unsigned char *bytes_)
-{
-    memcpy (prefix (), bytes_, prefix_length ());
-}
-
-unsigned char *node_t::first_bytes ()
-{
-    return prefix () + prefix_length ();
-}
-
-void node_t::set_first_bytes (const unsigned char *bytes_)
-{
-    memcpy (first_bytes (), bytes_, edgecount ());
-}
-
-unsigned char node_t::first_byte_at (size_t index_)
-{
-    zmq_assert (index_ < edgecount ());
-    return first_bytes ()[index_];
-}
-
-void node_t::set_first_byte_at (size_t index_, unsigned char byte_)
-{
-    zmq_assert (index_ < edgecount ());
-    first_bytes ()[index_] = byte_;
-}
-
-unsigned char *node_t::node_pointers ()
-{
-    return prefix () + prefix_length () + edgecount ();
-}
-
-void node_t::set_node_pointers (const unsigned char *pointers_)
-{
-    memcpy (node_pointers (), pointers_, edgecount () * sizeof (void *));
-}
-
-node_t node_t::node_at (size_t index_)
-{
-    zmq_assert (index_ < edgecount ());
-
-    unsigned char *data;
-    memcpy (&data, node_pointers () + index_ * sizeof (void *), sizeof (data));
-    return node_t (data);
-}
-
-void node_t::set_node_at (size_t index_, node_t node_)
-{
-    zmq_assert (index_ < edgecount ());
-    memcpy (node_pointers () + index_ * sizeof (void *), &node_._data,
-            sizeof (node_._data));
-}
-
-void node_t::set_edge_at (size_t index_,
-                          unsigned char first_byte_,
-                          node_t node_)
-{
-    set_first_byte_at (index_, first_byte_);
-    set_node_at (index_, node_);
-}
-
-bool node_t::operator== (node_t other_) const
-{
-    return _data == other_._data;
-}
-
-bool node_t::operator!= (node_t other_) const
-{
-    return !(*this == other_);
-}
-
-void node_t::resize (size_t prefix_length_, size_t edgecount_)
-{
-    const size_t node_size = 3 * sizeof (uint32_t) + prefix_length_
-                             + edgecount_ * (1 + sizeof (void *));
-    unsigned char *new_data =
-      static_cast<unsigned char *> (realloc (_data, node_size));
-    zmq_assert (new_data);
-    _data = new_data;
-    set_prefix_length (static_cast<uint32_t> (prefix_length_));
-    set_edgecount (static_cast<uint32_t> (edgecount_));
-}
-
-node_t make_node (size_t refcount_, size_t prefix_length_, size_t edgecount_)
-{
-    const size_t node_size = 3 * sizeof (uint32_t) + prefix_length_
-                             + edgecount_ * (1 + sizeof (void *));
-
-    unsigned char *data = static_cast<unsigned char *> (malloc (node_size));
-    zmq_assert (data);
-
-    node_t node (data);
-    node.set_refcount (static_cast<uint32_t> (refcount_));
-    node.set_prefix_length (static_cast<uint32_t> (prefix_length_));
-    node.set_edgecount (static_cast<uint32_t> (edgecount_));
-    return node;
-}
-
-// ----------------------------------------------------------------------
-
-zmq::radix_tree_t::radix_tree_t () : _root (make_node (0, 0, 0)), _size (0)
-{
-}
-
-static void free_nodes (node_t node_)
-{
-    for (size_t i = 0, count = node_.edgecount (); i < count; ++i)
-        free_nodes (node_.node_at (i));
-    free (node_._data);
-}
-
-zmq::radix_tree_t::~radix_tree_t ()
-{
-    free_nodes (_root);
-}
-
-match_result_t::match_result_t (size_t key_bytes_matched_,
-                                size_t prefix_bytes_matched_,
-                                size_t edge_index_,
-                                size_t parent_edge_index_,
-                                node_t current_,
-                                node_t parent_,
-                                node_t grandparent_) :
-    _key_bytes_matched (key_bytes_matched_),
-    _prefix_bytes_matched (prefix_bytes_matched_),
-    _edge_index (edge_index_),
-    _parent_edge_index (parent_edge_index_),
-    _current_node (current_),
-    _parent_node (parent_),
-    _grandparent_node (grandparent_)
-{
-}
-
-match_result_t zmq::radix_tree_t::match (const unsigned char *key_,
-                                         size_t key_size_,
-                                         bool is_lookup_ = false) const
-{
-    zmq_assert (key_);
-
-    // Node we're currently at in the traversal and its predecessors.
-    node_t current_node = _root;
-    node_t parent_node = current_node;
-    node_t grandparent_node = current_node;
-    // Index of the next byte to match in the key.
-    size_t key_byte_index = 0;
-    // Index of the next byte to match in the current node's prefix.
-    size_t prefix_byte_index = 0;
-    // Index of the edge from parent to current node.
-    size_t edge_index = 0;
-    // Index of the edge from grandparent to parent.
-    size_t parent_edge_index = 0;
-
-    while (current_node.prefix_length () > 0 || current_node.edgecount () > 0) {
-        const unsigned char *const prefix = current_node.prefix ();
-        const size_t prefix_length = current_node.prefix_length ();
-
-        for (prefix_byte_index = 0;
-             prefix_byte_index < prefix_length && key_byte_index < key_size_;
-             ++prefix_byte_index, ++key_byte_index) {
-            if (prefix[prefix_byte_index] != key_[key_byte_index])
-                break;
-        }
-
-        // Even if a prefix of the key matches and we're doing a
-        // lookup, this means we've found a matching subscription.
-        if (is_lookup_ && prefix_byte_index == prefix_length
-            && current_node.refcount () > 0) {
-            key_byte_index = key_size_;
-            break;
-        }
-
-        // There was a mismatch or we've matched the whole key, so
-        // there's nothing more to do.
-        if (prefix_byte_index != prefix_length || key_byte_index == key_size_)
-            break;
-
-        // We need to match the rest of the key. Check if there's an
-        // outgoing edge from this node.
-        node_t next_node = current_node;
-        for (size_t i = 0, edgecount = current_node.edgecount (); i < edgecount;
-             ++i) {
-            if (current_node.first_byte_at (i) == key_[key_byte_index]) {
-                parent_edge_index = edge_index;
-                edge_index = i;
-                next_node = current_node.node_at (i);
-                break;
-            }
-        }
-
-        if (next_node == current_node)
-            break; // No outgoing edge.
-        grandparent_node = parent_node;
-        parent_node = current_node;
-        current_node = next_node;
-    }
-
-    return match_result_t (key_byte_index, prefix_byte_index, edge_index,
-                           parent_edge_index, current_node, parent_node,
-                           grandparent_node);
-}
-
-bool zmq::radix_tree_t::add (const unsigned char *key_, size_t key_size_)
-{
-    const match_result_t match_result = match (key_, key_size_);
-    const size_t key_bytes_matched = match_result._key_bytes_matched;
-    const size_t prefix_bytes_matched = match_result._prefix_bytes_matched;
-    const size_t edge_index = match_result._edge_index;
-    node_t current_node = match_result._current_node;
-    node_t parent_node = match_result._parent_node;
-
-    if (key_bytes_matched != key_size_) {
-        // Not all characters match, we might have to split the node.
-        if (prefix_bytes_matched == current_node.prefix_length ()) {
-            // The mismatch is at one of the outgoing edges, so we
-            // create an edge from the current node to a new leaf node
-            // that has the rest of the key as the prefix.
-            node_t key_node = make_node (1, key_size_ - key_bytes_matched, 0);
-            key_node.set_prefix (key_ + key_bytes_matched);
-
-            // Reallocate for one more edge.
-            current_node.resize (current_node.prefix_length (),
-                                 current_node.edgecount () + 1);
-
-            // Make room for the new edge. We need to shift the chunk
-            // of node pointers one byte to the right. Since resize()
-            // increments the edgecount by 1, node_pointers() tells us the
-            // destination address. The chunk of node pointers starts
-            // at one byte to the left of this destination.
-            //
-            // Since the regions can overlap, we use memmove.
-            memmove (current_node.node_pointers (),
-                     current_node.node_pointers () - 1,
-                     (current_node.edgecount () - 1) * sizeof (void *));
-
-            // Add an edge to the new node.
-            current_node.set_edge_at (current_node.edgecount () - 1,
-                                      key_[key_bytes_matched], key_node);
-
-            // We need to update all pointers to the current node
-            // after the call to resize().
-            if (current_node.prefix_length () == 0)
-                _root._data = current_node._data;
-            else
-                parent_node.set_node_at (edge_index, current_node);
-            ++_size;
-            return true;
-        }
-
-        // There was a mismatch, so we need to split this node.
-        //
-        // Create two nodes that will be reachable from the parent.
-        // One node will have the rest of the characters from the key,
-        // and the other node will have the rest of the characters
-        // from the current node's prefix.
-        node_t key_node = make_node (1, key_size_ - key_bytes_matched, 0);
-        node_t split_node =
-          make_node (current_node.refcount (),
-                     current_node.prefix_length () - prefix_bytes_matched,
-                     current_node.edgecount ());
-
-        // Copy the prefix chunks to the new nodes.
-        key_node.set_prefix (key_ + key_bytes_matched);
-        split_node.set_prefix (current_node.prefix () + prefix_bytes_matched);
-
-        // Copy the current node's edges to the new node.
-        split_node.set_first_bytes (current_node.first_bytes ());
-        split_node.set_node_pointers (current_node.node_pointers ());
-
-        // Resize the current node to accommodate a prefix comprising
-        // the matched characters and 2 outgoing edges to the above
-        // nodes. Set the refcount to 0 since this node doesn't hold a
-        // key.
-        current_node.resize (prefix_bytes_matched, 2);
-        current_node.set_refcount (0);
-
-        // Add links to the new nodes. We don't need to copy the
-        // prefix since resize() retains it in the current node.
-        current_node.set_edge_at (0, key_node.prefix ()[0], key_node);
-        current_node.set_edge_at (1, split_node.prefix ()[0], split_node);
-
-        ++_size;
-        parent_node.set_node_at (edge_index, current_node);
-        return true;
-    }
-
-    // All characters in the key match, but we still might need to split.
-    if (prefix_bytes_matched != current_node.prefix_length ()) {
-        // All characters in the key match, but not all characters
-        // from the current node's prefix match.
-
-        // Create a node that contains the rest of the characters from
-        // the current node's prefix and the outgoing edges from the
-        // current node.
-        node_t split_node =
-          make_node (current_node.refcount (),
-                     current_node.prefix_length () - prefix_bytes_matched,
-                     current_node.edgecount ());
-        split_node.set_prefix (current_node.prefix () + prefix_bytes_matched);
-        split_node.set_first_bytes (current_node.first_bytes ());
-        split_node.set_node_pointers (current_node.node_pointers ());
-
-        // Resize the current node to hold only the matched characters
-        // from its prefix and one edge to the new node.
-        current_node.resize (prefix_bytes_matched, 1);
-
-        // Add an edge to the split node and set the refcount to 1
-        // since this key wasn't inserted earlier. We don't need to
-        // set the prefix because the first `prefix_bytes_matched` bytes
-        // in the prefix are preserved by resize().
-        current_node.set_edge_at (0, split_node.prefix ()[0], split_node);
-        current_node.set_refcount (1);
-
-        ++_size;
-        parent_node.set_node_at (edge_index, current_node);
-        return true;
-    }
-
-    zmq_assert (key_bytes_matched == key_size_);
-    zmq_assert (prefix_bytes_matched == current_node.prefix_length ());
-
-    ++_size;
-    current_node.set_refcount (current_node.refcount () + 1);
-    return current_node.refcount () == 1;
-}
-
-bool zmq::radix_tree_t::rm (const unsigned char *key_, size_t key_size_)
-{
-    const match_result_t match_result = match (key_, key_size_);
-    const size_t key_bytes_matched = match_result._key_bytes_matched;
-    const size_t prefix_bytes_matched = match_result._prefix_bytes_matched;
-    const size_t edge_index = match_result._edge_index;
-    const size_t parent_edge_index = match_result._parent_edge_index;
-    node_t current_node = match_result._current_node;
-    node_t parent_node = match_result._parent_node;
-    node_t grandparent_node = match_result._grandparent_node;
-
-    if (key_bytes_matched != key_size_
-        || prefix_bytes_matched != current_node.prefix_length ()
-        || current_node.refcount () == 0)
-        return false;
-
-    current_node.set_refcount (current_node.refcount () - 1);
-    --_size;
-    if (current_node.refcount () > 0)
-        return false;
-
-    // Don't delete the root node.
-    if (current_node == _root)
-        return true;
-
-    const size_t outgoing_edges = current_node.edgecount ();
-    if (outgoing_edges > 1)
-        // This node can't be merged with any other node, so there's
-        // nothing more to do.
-        return true;
-
-    if (outgoing_edges == 1) {
-        // Merge this node with the single child node.
-        node_t child = current_node.node_at (0);
-
-        // Make room for the child node's prefix and edges. We need to
-        // keep the old prefix length since resize() will overwrite
-        // it.
-        const uint32_t old_prefix_length = current_node.prefix_length ();
-        current_node.resize (old_prefix_length + child.prefix_length (),
-                             child.edgecount ());
-
-        // Append the child node's prefix to the current node.
-        memcpy (current_node.prefix () + old_prefix_length, child.prefix (),
-                child.prefix_length ());
-
-        // Copy the rest of child node's data to the current node.
-        current_node.set_first_bytes (child.first_bytes ());
-        current_node.set_node_pointers (child.node_pointers ());
-        current_node.set_refcount (child.refcount ());
-
-        free (child._data);
-        parent_node.set_node_at (edge_index, current_node);
-        return true;
-    }
-
-    if (parent_node.edgecount () == 2 && parent_node.refcount () == 0
-        && parent_node != _root) {
-        // Removing this node leaves the parent with one child.
-        // If the parent doesn't hold a key or if it isn't the root,
-        // we can merge it with its single child node.
-        zmq_assert (edge_index < 2);
-        node_t other_child = parent_node.node_at (!edge_index);
-
-        // Make room for the child node's prefix and edges. We need to
-        // keep the old prefix length since resize() will overwrite
-        // it.
-        const uint32_t old_prefix_length = parent_node.prefix_length ();
-        parent_node.resize (old_prefix_length + other_child.prefix_length (),
-                            other_child.edgecount ());
-
-        // Append the child node's prefix to the current node.
-        memcpy (parent_node.prefix () + old_prefix_length,
-                other_child.prefix (), other_child.prefix_length ());
-
-        // Copy the rest of child node's data to the current node.
-        parent_node.set_first_bytes (other_child.first_bytes ());
-        parent_node.set_node_pointers (other_child.node_pointers ());
-        parent_node.set_refcount (other_child.refcount ());
-
-        free (current_node._data);
-        free (other_child._data);
-        grandparent_node.set_node_at (parent_edge_index, parent_node);
-        return true;
-    }
-
-    // This is a leaf node that doesn't leave its parent with one
-    // outgoing edge. Remove the outgoing edge to this node from the
-    // parent.
-    zmq_assert (outgoing_edges == 0);
-
-    // Replace the edge to the current node with the last edge. An
-    // edge consists of a byte and a pointer to the next node. First
-    // replace the byte.
-    const size_t last_index = parent_node.edgecount () - 1;
-    const unsigned char last_byte = parent_node.first_byte_at (last_index);
-    const node_t last_node = parent_node.node_at (last_index);
-    parent_node.set_edge_at (edge_index, last_byte, last_node);
-
-    // Move the chunk of pointers one byte to the left, effectively
-    // deleting the last byte in the region of first bytes by
-    // overwriting it.
-    memmove (parent_node.node_pointers () - 1, parent_node.node_pointers (),
-             parent_node.edgecount () * sizeof (void *));
-
-    // Shrink the parent node to the new size, which "deletes" the
-    // last pointer in the chunk of node pointers.
-    parent_node.resize (parent_node.prefix_length (),
-                        parent_node.edgecount () - 1);
-
-    // Nothing points to this node now, so we can reclaim it.
-    free (current_node._data);
-
-    if (parent_node.prefix_length () == 0)
-        _root._data = parent_node._data;
-    else
-        grandparent_node.set_node_at (parent_edge_index, parent_node);
-    return true;
-}
-
-bool zmq::radix_tree_t::check (const unsigned char *key_, size_t key_size_)
-{
-    if (_root.refcount () > 0)
-        return true;
-
-    match_result_t match_result = match (key_, key_size_, true);
-    return match_result._key_bytes_matched == key_size_
-           && match_result._prefix_bytes_matched
-                == match_result._current_node.prefix_length ()
-           && match_result._current_node.refcount () > 0;
-}
-
-static void
-visit_keys (node_t node_,
-            std::vector<unsigned char> &buffer_,
-            void (*func_) (unsigned char *data_, size_t size_, void *arg_),
-            void *arg_)
-{
-    const size_t prefix_length = node_.prefix_length ();
-    buffer_.reserve (buffer_.size () + prefix_length);
-    std::copy (node_.prefix (), node_.prefix () + prefix_length,
-               std::back_inserter (buffer_));
-
-    if (node_.refcount () > 0) {
-        zmq_assert (!buffer_.empty ());
-        func_ (&buffer_[0], buffer_.size (), arg_);
-    }
-
-    for (size_t i = 0, edgecount = node_.edgecount (); i < edgecount; ++i) {
-        visit_keys (node_.node_at (i), buffer_, func_, arg_);
-    }
-    buffer_.resize (buffer_.size () - prefix_length);
-}
-
-void zmq::radix_tree_t::apply (
-  void (*func_) (unsigned char *data_, size_t size_, void *arg_), void *arg_)
-{
-    if (_root.refcount () > 0)
-        func_ (NULL, 0, arg_); // Root node is always empty.
-
-    std::vector<unsigned char> buffer;
-    for (size_t i = 0; i < _root.edgecount (); ++i)
-        visit_keys (_root.node_at (i), buffer, func_, arg_);
-}
-
-size_t zmq::radix_tree_t::size () const
-{
-    return _size;
-}
diff --git a/src/radix_tree.hpp b/src/radix_tree.hpp
deleted file mode 100644
index 02e74969c..000000000
--- a/src/radix_tree.hpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef RADIX_TREE_HPP
-#define RADIX_TREE_HPP
-
-#include <stddef.h>
-
-#include "stdint.hpp"
-
-// Wrapper type for a node's data layout.
-//
-// There are 3 32-bit unsigned integers that act as a header. These
-// integers represent the following values in this order:
-//
-// (1) The reference count of the key held by the node. This is 0 if
-// the node doesn't hold a key.
-//
-// (2) The number of characters in the node's prefix. The prefix is a
-// part of one or more keys in the tree, e.g. the prefix of each node
-// in a trie consists of a single character.
-//
-// (3) The number of outgoing edges from this node.
-//
-// The rest of the layout consists of 3 chunks in this order:
-//
-// (1) The node's prefix as a sequence of one or more bytes. The root
-// node always has an empty prefix, unlike other nodes in the tree.
-//
-// (2) The first byte of the prefix of each of this node's children.
-//
-// (3) The pointer to each child node.
-//
-// The link to each child is looked up using its index, e.g. the child
-// with index 0 will have its first byte and node pointer at the start
-// of the chunk of first bytes and node pointers respectively.
-struct node_t
-{
-    explicit node_t (unsigned char *data_);
-
-    bool operator== (node_t other_) const;
-    bool operator!= (node_t other_) const;
-
-    uint32_t refcount ();
-    uint32_t prefix_length ();
-    uint32_t edgecount ();
-    unsigned char *prefix ();
-    unsigned char *first_bytes ();
-    unsigned char first_byte_at (size_t index_);
-    unsigned char *node_pointers ();
-    node_t node_at (size_t index_);
-    void set_refcount (uint32_t value_);
-    void set_prefix_length (uint32_t value_);
-    void set_edgecount (uint32_t value_);
-    void set_prefix (const unsigned char *bytes_);
-    void set_first_bytes (const unsigned char *bytes_);
-    void set_first_byte_at (size_t index_, unsigned char byte_);
-    void set_node_pointers (const unsigned char *pointers_);
-    void set_node_at (size_t index_, node_t node_);
-    void set_edge_at (size_t index_, unsigned char first_byte_, node_t node_);
-    void resize (size_t prefix_length_, size_t edgecount_);
-
-    unsigned char *_data;
-};
-
-node_t make_node (size_t refcount_, size_t prefix_length_, size_t edgecount_);
-
-struct match_result_t
-{
-    match_result_t (size_t key_bytes_matched_,
-                    size_t prefix_bytes_matched_,
-                    size_t edge_index_,
-                    size_t parent_edge_index_,
-                    node_t current_,
-                    node_t parent_,
-                    node_t grandparent);
-
-    size_t _key_bytes_matched;
-    size_t _prefix_bytes_matched;
-    size_t _edge_index;
-    size_t _parent_edge_index;
-    node_t _current_node;
-    node_t _parent_node;
-    node_t _grandparent_node;
-};
-
-namespace zmq
-{
-class radix_tree_t
-{
-  public:
-    radix_tree_t ();
-    ~radix_tree_t ();
-
-    //  Add key to the tree. Returns true if this was a new key rather
-    //  than a duplicate.
-    bool add (const unsigned char *key_, size_t key_size_);
-
-    //  Remove key from the tree. Returns true if the item is actually
-    //  removed from the tree.
-    bool rm (const unsigned char *key_, size_t key_size_);
-
-    //  Check whether particular key is in the tree.
-    bool check (const unsigned char *key_, size_t key_size_);
-
-    //  Apply the function supplied to each key in the tree.
-    void apply (void (*func_) (unsigned char *data, size_t size, void *arg),
-                void *arg_);
-
-    size_t size () const;
-
-  private:
-    match_result_t
-    match (const unsigned char *key_, size_t key_size_, bool is_lookup_) const;
-
-    node_t _root;
-    size_t _size;
-};
-}
-
-#endif
diff --git a/src/random.cpp b/src/random.cpp
deleted file mode 100644
index 17c3537df..000000000
--- a/src/random.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include "random.hpp"
-#include "stdint.hpp"
-#include "clock.hpp"
-#include "mutex.hpp"
-#include "macros.hpp"
-
-#if defined(ZMQ_USE_TWEETNACL)
-#include "tweetnacl.h"
-#elif defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-void zmq::seed_random ()
-{
-#if defined ZMQ_HAVE_WINDOWS
-    const int pid = static_cast<int> (GetCurrentProcessId ());
-#else
-    int pid = static_cast<int> (getpid ());
-#endif
-    srand (static_cast<unsigned int> (clock_t::now_us () + pid));
-}
-
-uint32_t zmq::generate_random ()
-{
-    //  Compensate for the fact that rand() returns signed integer.
-    const uint32_t low = static_cast<uint32_t> (rand ());
-    uint32_t high = static_cast<uint32_t> (rand ());
-    high <<= (sizeof (int) * 8 - 1);
-    return high | low;
-}
-
-//  When different threads have their own context the file descriptor
-//  variable is shared and is subject to race conditions in tweetnacl,
-//  that lead to file descriptors leaks. In long-running programs with
-//  ephemeral threads this is a problem as it accumulates.
-//  thread-local storage cannot be used to initialise the file descriptor
-//  as it is perfectly legal to share a context among many threads, each
-//  of which might call curve APIs.
-//  Also libsodium documentation specifically states that sodium_init
-//  must not be called concurrently from multiple threads, for the
-//  same reason. Inspecting the code also reveals that the close API is
-//  not thread safe.
-//  The context class cannot be used with static variables as the curve
-//  utility APIs like zmq_curve_keypair also call into the crypto
-//  library.
-//  The safest solution for all use cases therefore is to have a
-//  static lock to serialize calls into an initialiser and a finaliser,
-//  using refcounts to make sure that a thread does not close the library
-//  while another is still using it. To avoid the static initialization
-//  order fiasco, this is done using function-local statics, if the
-//  compiler implementation supports thread-safe initialization of those.
-//  Otherwise, we fall back to global statics.
-//  HOWEVER, this initialisation code imposes ordering constraints, which
-//  are not obvious to users of libzmq, and may lead to problems if atexit
-//  or similar methods are used for cleanup.
-//  In that case, a strict ordering is imposed whereas the contexts MUST
-//  be initialised BEFORE registering the cleanup with atexit. CZMQ is an
-//  example. Hence we make the choice to restrict this global transition
-//  mechanism ONLY to Tweenacl + *NIX (when using /dev/urandom) as it is
-//  the less risky option.
-
-//  TODO if there is some other user of libsodium besides libzmq, this must
-//    be synchronized by the application. This should probably also be
-//    configurable via config.h
-
-//  TODO this should probably be done via config.h
-#if __cplusplus >= 201103L                                                     \
-  || (defined(__cpp_threadsafe_static_init)                                    \
-      && __cpp_threadsafe_static_init >= 200806)                               \
-  || (defined(_MSC_VER) && _MSC_VER >= 1900)
-#define ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT 1
-//  TODO this might probably also be set if a sufficiently recent gcc is used
-//  without -fno-threadsafe-statics, but this cannot be determined at
-//  compile-time, so it must be set via config.h
-#else
-#define ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT 0
-#endif
-
-#if !ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT                                     \
-  && (defined(ZMQ_USE_TWEETNACL) && !defined(ZMQ_HAVE_WINDOWS)                 \
-      && !defined(ZMQ_HAVE_GETRANDOM))
-static unsigned int random_refcount = 0;
-static zmq::mutex_t random_sync;
-#endif
-
-static void manage_random (bool init_)
-{
-#if defined(ZMQ_USE_TWEETNACL) && !defined(ZMQ_HAVE_WINDOWS)                   \
-  && !defined(ZMQ_HAVE_GETRANDOM)
-
-#if ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT
-    static int random_refcount = 0;
-    static zmq::mutex_t random_sync;
-#endif
-
-    if (init_) {
-        zmq::scoped_lock_t locker (random_sync);
-
-        if (random_refcount == 0) {
-            int rc = sodium_init ();
-            zmq_assert (rc != -1);
-        }
-
-        ++random_refcount;
-    } else {
-        zmq::scoped_lock_t locker (random_sync);
-        --random_refcount;
-
-        if (random_refcount == 0) {
-            randombytes_close ();
-        }
-    }
-
-#elif defined(ZMQ_USE_LIBSODIUM)
-    if (init_) {
-        int rc = sodium_init ();
-        zmq_assert (rc != -1);
-    } else {
-        randombytes_close ();
-    }
-#else
-    LIBZMQ_UNUSED (init_);
-#endif
-}
-
-void zmq::random_open ()
-{
-    manage_random (true);
-}
-
-void zmq::random_close ()
-{
-    manage_random (false);
-}
diff --git a/src/random.hpp b/src/random.hpp
deleted file mode 100644
index 0b57adb96..000000000
--- a/src/random.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RANDOM_HPP_INCLUDED__
-#define __ZMQ_RANDOM_HPP_INCLUDED__
-
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Seeds the random number generator.
-void seed_random ();
-
-//  Generates random value.
-uint32_t generate_random ();
-
-//  [De-]Initialise crypto library, if needed.
-//  Serialised and refcounted, so that it can be called
-//  from multiple threads, each with its own context, and from
-//  the various zmq_utils curve functions safely.
-void random_open ();
-void random_close ();
-}
-
-#endif
diff --git a/src/raw_decoder.cpp b/src/raw_decoder.cpp
deleted file mode 100644
index 97ed7972d..000000000
--- a/src/raw_decoder.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-#include <string.h>
-
-#include "raw_decoder.hpp"
-#include "err.hpp"
-
-zmq::raw_decoder_t::raw_decoder_t (size_t bufsize_) : _allocator (bufsize_, 1)
-{
-    const int rc = _in_progress.init ();
-    errno_assert (rc == 0);
-}
-
-zmq::raw_decoder_t::~raw_decoder_t ()
-{
-    const int rc = _in_progress.close ();
-    errno_assert (rc == 0);
-}
-
-void zmq::raw_decoder_t::get_buffer (unsigned char **data_, size_t *size_)
-{
-    *data_ = _allocator.allocate ();
-    *size_ = _allocator.size ();
-}
-
-int zmq::raw_decoder_t::decode (const uint8_t *data_,
-                                size_t size_,
-                                size_t &bytes_used_)
-{
-    const int rc =
-      _in_progress.init (const_cast<unsigned char *> (data_), size_,
-                         shared_message_memory_allocator::call_dec_ref,
-                         _allocator.buffer (), _allocator.provide_content ());
-
-    // if the buffer serves as memory for a zero-copy message, release it
-    // and allocate a new buffer in get_buffer for the next decode
-    if (_in_progress.is_zcmsg ()) {
-        _allocator.advance_content ();
-        _allocator.release ();
-    }
-
-    errno_assert (rc != -1);
-    bytes_used_ = size_;
-    return 1;
-}
diff --git a/src/raw_decoder.hpp b/src/raw_decoder.hpp
deleted file mode 100644
index 4f6e83417..000000000
--- a/src/raw_decoder.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RAW_DECODER_HPP_INCLUDED__
-#define __ZMQ_RAW_DECODER_HPP_INCLUDED__
-
-#include "msg.hpp"
-#include "i_decoder.hpp"
-#include "stdint.hpp"
-#include "decoder_allocators.hpp"
-
-namespace zmq
-{
-//  Decoder for 0MQ v1 framing protocol. Converts data stream into messages.
-
-class raw_decoder_t ZMQ_FINAL : public i_decoder
-{
-  public:
-    raw_decoder_t (size_t bufsize_);
-    ~raw_decoder_t ();
-
-    //  i_decoder interface.
-
-    void get_buffer (unsigned char **data_, size_t *size_);
-
-    int decode (const unsigned char *data_, size_t size_, size_t &bytes_used_);
-
-    msg_t *msg () { return &_in_progress; }
-
-    void resize_buffer (size_t) {}
-
-  private:
-    msg_t _in_progress;
-
-    shared_message_memory_allocator _allocator;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (raw_decoder_t)
-};
-}
-
-#endif
diff --git a/src/raw_encoder.cpp b/src/raw_encoder.cpp
deleted file mode 100644
index 39c7633ee..000000000
--- a/src/raw_encoder.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "encoder.hpp"
-#include "raw_encoder.hpp"
-#include "msg.hpp"
-
-zmq::raw_encoder_t::raw_encoder_t (size_t bufsize_) :
-    encoder_base_t<raw_encoder_t> (bufsize_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &raw_encoder_t::raw_message_ready, true);
-}
-
-zmq::raw_encoder_t::~raw_encoder_t ()
-{
-}
-
-void zmq::raw_encoder_t::raw_message_ready ()
-{
-    next_step (in_progress ()->data (), in_progress ()->size (),
-               &raw_encoder_t::raw_message_ready, true);
-}
diff --git a/src/raw_encoder.hpp b/src/raw_encoder.hpp
deleted file mode 100644
index 0485e64a7..000000000
--- a/src/raw_encoder.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RAW_ENCODER_HPP_INCLUDED__
-#define __ZMQ_RAW_ENCODER_HPP_INCLUDED__
-
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "encoder.hpp"
-
-namespace zmq
-{
-//  Encoder for 0MQ framing protocol. Converts messages into data batches.
-
-class raw_encoder_t ZMQ_FINAL : public encoder_base_t<raw_encoder_t>
-{
-  public:
-    raw_encoder_t (size_t bufsize_);
-    ~raw_encoder_t ();
-
-  private:
-    void raw_message_ready ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (raw_encoder_t)
-};
-}
-
-#endif
diff --git a/src/raw_engine.cpp b/src/raw_engine.cpp
deleted file mode 100644
index 5910cd996..000000000
--- a/src/raw_engine.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#include <limits.h>
-#include <string.h>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <new>
-#include <sstream>
-
-#include "raw_engine.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "v1_encoder.hpp"
-#include "v1_decoder.hpp"
-#include "v2_encoder.hpp"
-#include "v2_decoder.hpp"
-#include "null_mechanism.hpp"
-#include "plain_client.hpp"
-#include "plain_server.hpp"
-#include "gssapi_client.hpp"
-#include "gssapi_server.hpp"
-#include "curve_client.hpp"
-#include "curve_server.hpp"
-#include "raw_decoder.hpp"
-#include "raw_encoder.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-zmq::raw_engine_t::raw_engine_t (
-  fd_t fd_,
-  const options_t &options_,
-  const endpoint_uri_pair_t &endpoint_uri_pair_) :
-    stream_engine_base_t (fd_, options_, endpoint_uri_pair_, false)
-{
-}
-
-zmq::raw_engine_t::~raw_engine_t ()
-{
-}
-
-void zmq::raw_engine_t::plug_internal ()
-{
-    // no handshaking for raw sock, instantiate raw encoder and decoders
-    _encoder = new (std::nothrow) raw_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow) raw_decoder_t (_options.in_batch_size);
-    alloc_assert (_decoder);
-
-    _next_msg = &raw_engine_t::pull_msg_from_session;
-    _process_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &raw_engine_t::push_raw_msg_to_session);
-
-    properties_t properties;
-    if (init_properties (properties)) {
-        //  Compile metadata.
-        zmq_assert (_metadata == NULL);
-        _metadata = new (std::nothrow) metadata_t (properties);
-        alloc_assert (_metadata);
-    }
-
-    if (_options.raw_notify) {
-        //  For raw sockets, send an initial 0-length message to the
-        // application so that it knows a peer has connected.
-        msg_t connector;
-        connector.init ();
-        push_raw_msg_to_session (&connector);
-        connector.close ();
-        session ()->flush ();
-    }
-
-    set_pollin ();
-    set_pollout ();
-    //  Flush all the data that may have been already received downstream.
-    in_event ();
-}
-
-bool zmq::raw_engine_t::handshake ()
-{
-    return true;
-}
-
-void zmq::raw_engine_t::error (error_reason_t reason_)
-{
-    if (_options.raw_socket && _options.raw_notify) {
-        //  For raw sockets, send a final 0-length message to the application
-        //  so that it knows the peer has been disconnected.
-        msg_t terminator;
-        terminator.init ();
-        (this->*_process_msg) (&terminator);
-        terminator.close ();
-    }
-    stream_engine_base_t::error (reason_);
-}
-
-int zmq::raw_engine_t::push_raw_msg_to_session (msg_t *msg_)
-{
-    if (_metadata && _metadata != msg_->metadata ())
-        msg_->set_metadata (_metadata);
-    return push_msg_to_session (msg_);
-}
diff --git a/src/raw_engine.hpp b/src/raw_engine.hpp
deleted file mode 100644
index cf60bb675..000000000
--- a/src/raw_engine.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RAW_ENGINE_HPP_INCLUDED__
-#define __ZMQ_RAW_ENGINE_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "fd.hpp"
-#include "i_engine.hpp"
-#include "io_object.hpp"
-#include "i_encoder.hpp"
-#include "i_decoder.hpp"
-#include "options.hpp"
-#include "socket_base.hpp"
-#include "metadata.hpp"
-#include "msg.hpp"
-#include "stream_engine_base.hpp"
-
-namespace zmq
-{
-//  Protocol revisions
-
-class io_thread_t;
-class session_base_t;
-class mechanism_t;
-
-//  This engine handles any socket with SOCK_STREAM semantics,
-//  e.g. TCP socket or an UNIX domain socket.
-
-class raw_engine_t ZMQ_FINAL : public stream_engine_base_t
-{
-  public:
-    raw_engine_t (fd_t fd_,
-                  const options_t &options_,
-                  const endpoint_uri_pair_t &endpoint_uri_pair_);
-    ~raw_engine_t ();
-
-  protected:
-    void error (error_reason_t reason_);
-    void plug_internal ();
-    bool handshake ();
-
-  private:
-    int push_raw_msg_to_session (msg_t *msg_);
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (raw_engine_t)
-};
-}
-
-#endif
diff --git a/src/reaper.cpp b/src/reaper.cpp
deleted file mode 100644
index 525bf578a..000000000
--- a/src/reaper.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "reaper.hpp"
-#include "socket_base.hpp"
-#include "err.hpp"
-
-zmq::reaper_t::reaper_t (class ctx_t *ctx_, uint32_t tid_) :
-    object_t (ctx_, tid_),
-    _mailbox_handle (static_cast<poller_t::handle_t> (NULL)),
-    _poller (NULL),
-    _sockets (0),
-    _terminating (false)
-{
-    if (!_mailbox.valid ())
-        return;
-
-    _poller = new (std::nothrow) poller_t (*ctx_);
-    alloc_assert (_poller);
-
-    if (_mailbox.get_fd () != retired_fd) {
-        _mailbox_handle = _poller->add_fd (_mailbox.get_fd (), this);
-        _poller->set_pollin (_mailbox_handle);
-    }
-
-#ifdef HAVE_FORK
-    _pid = getpid ();
-#endif
-}
-
-zmq::reaper_t::~reaper_t ()
-{
-    LIBZMQ_DELETE (_poller);
-}
-
-zmq::mailbox_t *zmq::reaper_t::get_mailbox ()
-{
-    return &_mailbox;
-}
-
-void zmq::reaper_t::start ()
-{
-    zmq_assert (_mailbox.valid ());
-
-    //  Start the thread.
-    _poller->start ("Reaper");
-}
-
-void zmq::reaper_t::stop ()
-{
-    if (get_mailbox ()->valid ()) {
-        send_stop ();
-    }
-}
-
-void zmq::reaper_t::in_event ()
-{
-    while (true) {
-#ifdef HAVE_FORK
-        if (unlikely (_pid != getpid ())) {
-            //printf("zmq::reaper_t::in_event return in child process %d\n", (int)getpid());
-            return;
-        }
-#endif
-
-        //  Get the next command. If there is none, exit.
-        command_t cmd;
-        const int rc = _mailbox.recv (&cmd, 0);
-        if (rc != 0 && errno == EINTR)
-            continue;
-        if (rc != 0 && errno == EAGAIN)
-            break;
-        errno_assert (rc == 0);
-
-        //  Process the command.
-        cmd.destination->process_command (cmd);
-    }
-}
-
-void zmq::reaper_t::out_event ()
-{
-    zmq_assert (false);
-}
-
-void zmq::reaper_t::timer_event (int)
-{
-    zmq_assert (false);
-}
-
-void zmq::reaper_t::process_stop ()
-{
-    _terminating = true;
-
-    //  If there are no sockets being reaped finish immediately.
-    if (!_sockets) {
-        send_done ();
-        _poller->rm_fd (_mailbox_handle);
-        _poller->stop ();
-    }
-}
-
-void zmq::reaper_t::process_reap (socket_base_t *socket_)
-{
-    //  Add the socket to the poller.
-    socket_->start_reaping (_poller);
-
-    ++_sockets;
-}
-
-void zmq::reaper_t::process_reaped ()
-{
-    --_sockets;
-
-    //  If reaped was already asked to terminate and there are no more sockets,
-    //  finish immediately.
-    if (!_sockets && _terminating) {
-        send_done ();
-        _poller->rm_fd (_mailbox_handle);
-        _poller->stop ();
-    }
-}
diff --git a/src/reaper.hpp b/src/reaper.hpp
deleted file mode 100644
index 7b2d51cce..000000000
--- a/src/reaper.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_REAPER_HPP_INCLUDED__
-#define __ZMQ_REAPER_HPP_INCLUDED__
-
-#include "object.hpp"
-#include "mailbox.hpp"
-#include "poller.hpp"
-#include "i_poll_events.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class socket_base_t;
-
-class reaper_t ZMQ_FINAL : public object_t, public i_poll_events
-{
-  public:
-    reaper_t (zmq::ctx_t *ctx_, uint32_t tid_);
-    ~reaper_t ();
-
-    mailbox_t *get_mailbox ();
-
-    void start ();
-    void stop ();
-
-    //  i_poll_events implementation.
-    void in_event ();
-    void out_event ();
-    void timer_event (int id_);
-
-  private:
-    //  Command handlers.
-    void process_stop ();
-    void process_reap (zmq::socket_base_t *socket_);
-    void process_reaped ();
-
-    //  Reaper thread accesses incoming commands via this mailbox.
-    mailbox_t _mailbox;
-
-    //  Handle associated with mailbox' file descriptor.
-    poller_t::handle_t _mailbox_handle;
-
-    //  I/O multiplexing is performed using a poller object.
-    poller_t *_poller;
-
-    //  Number of sockets being reaped at the moment.
-    int _sockets;
-
-    //  If true, we were already asked to terminate.
-    bool _terminating;
-
-#ifdef HAVE_FORK
-    // the process that created this context. Used to detect forking.
-    pid_t _pid;
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (reaper_t)
-};
-}
-
-#endif
diff --git a/src/rep.cpp b/src/rep.cpp
deleted file mode 100644
index 99707f89c..000000000
--- a/src/rep.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "rep.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::rep_t::rep_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    router_t (parent_, tid_, sid_),
-    _sending_reply (false),
-    _request_begins (true)
-{
-    options.type = ZMQ_REP;
-}
-
-zmq::rep_t::~rep_t ()
-{
-}
-
-int zmq::rep_t::xsend (msg_t *msg_)
-{
-    //  If we are in the middle of receiving a request, we cannot send reply.
-    if (!_sending_reply) {
-        errno = EFSM;
-        return -1;
-    }
-
-    const bool more = (msg_->flags () & msg_t::more) != 0;
-
-    //  Push message to the reply pipe.
-    const int rc = router_t::xsend (msg_);
-    if (rc != 0)
-        return rc;
-
-    //  If the reply is complete flip the FSM back to request receiving state.
-    if (!more)
-        _sending_reply = false;
-
-    return 0;
-}
-
-int zmq::rep_t::xrecv (msg_t *msg_)
-{
-    //  If we are in middle of sending a reply, we cannot receive next request.
-    if (_sending_reply) {
-        errno = EFSM;
-        return -1;
-    }
-
-    //  First thing to do when receiving a request is to copy all the labels
-    //  to the reply pipe.
-    if (_request_begins) {
-        while (true) {
-            int rc = router_t::xrecv (msg_);
-            if (rc != 0)
-                return rc;
-
-            if ((msg_->flags () & msg_t::more)) {
-                //  Empty message part delimits the traceback stack.
-                const bool bottom = (msg_->size () == 0);
-
-                //  Push it to the reply pipe.
-                rc = router_t::xsend (msg_);
-                errno_assert (rc == 0);
-
-                if (bottom)
-                    break;
-            } else {
-                //  If the traceback stack is malformed, discard anything
-                //  already sent to pipe (we're at end of invalid message).
-                rc = router_t::rollback ();
-                errno_assert (rc == 0);
-            }
-        }
-        _request_begins = false;
-    }
-
-    //  Get next message part to return to the user.
-    const int rc = router_t::xrecv (msg_);
-    if (rc != 0)
-        return rc;
-
-    //  If whole request is read, flip the FSM to reply-sending state.
-    if (!(msg_->flags () & msg_t::more)) {
-        _sending_reply = true;
-        _request_begins = true;
-    }
-
-    return 0;
-}
-
-bool zmq::rep_t::xhas_in ()
-{
-    if (_sending_reply)
-        return false;
-
-    return router_t::xhas_in ();
-}
-
-bool zmq::rep_t::xhas_out ()
-{
-    if (!_sending_reply)
-        return false;
-
-    return router_t::xhas_out ();
-}
diff --git a/src/rep.hpp b/src/rep.hpp
deleted file mode 100644
index 995fe40cf..000000000
--- a/src/rep.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_REP_HPP_INCLUDED__
-#define __ZMQ_REP_HPP_INCLUDED__
-
-#include "router.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class io_thread_t;
-class socket_base_t;
-
-class rep_t ZMQ_FINAL : public router_t
-{
-  public:
-    rep_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~rep_t ();
-
-    //  Overrides of functions from socket_base_t.
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-
-  private:
-    //  If true, we are in process of sending the reply. If false we are
-    //  in process of receiving a request.
-    bool _sending_reply;
-
-    //  If true, we are starting to receive a request. The beginning
-    //  of the request is the backtrace stack.
-    bool _request_begins;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (rep_t)
-};
-}
-
-#endif
diff --git a/src/req.cpp b/src/req.cpp
deleted file mode 100644
index b9bb35b0f..000000000
--- a/src/req.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "req.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-
-zmq::req_t::req_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    dealer_t (parent_, tid_, sid_),
-    _receiving_reply (false),
-    _message_begins (true),
-    _reply_pipe (NULL),
-    _request_id_frames_enabled (false),
-    _request_id (generate_random ()),
-    _strict (true)
-{
-    options.type = ZMQ_REQ;
-}
-
-zmq::req_t::~req_t ()
-{
-}
-
-int zmq::req_t::xsend (msg_t *msg_)
-{
-    //  If we've sent a request and we still haven't got the reply,
-    //  we can't send another request unless the strict option is disabled.
-    if (_receiving_reply) {
-        if (_strict) {
-            errno = EFSM;
-            return -1;
-        }
-
-        _receiving_reply = false;
-        _message_begins = true;
-    }
-
-    //  First part of the request is the request routing id.
-    if (_message_begins) {
-        _reply_pipe = NULL;
-
-        if (_request_id_frames_enabled) {
-            _request_id++;
-
-            msg_t id;
-            int rc = id.init_size (sizeof (uint32_t));
-            memcpy (id.data (), &_request_id, sizeof (uint32_t));
-            errno_assert (rc == 0);
-            id.set_flags (msg_t::more);
-
-            rc = dealer_t::sendpipe (&id, &_reply_pipe);
-            if (rc != 0) {
-                return -1;
-            }
-        }
-
-        msg_t bottom;
-        int rc = bottom.init ();
-        errno_assert (rc == 0);
-        bottom.set_flags (msg_t::more);
-
-        rc = dealer_t::sendpipe (&bottom, &_reply_pipe);
-        if (rc != 0)
-            return -1;
-        zmq_assert (_reply_pipe);
-
-        _message_begins = false;
-
-        // Eat all currently available messages before the request is fully
-        // sent. This is done to avoid:
-        //   REQ sends request to A, A replies, B replies too.
-        //   A's reply was first and matches, that is used.
-        //   An hour later REQ sends a request to B. B's old reply is used.
-        msg_t drop;
-        while (true) {
-            rc = drop.init ();
-            errno_assert (rc == 0);
-            rc = dealer_t::xrecv (&drop);
-            if (rc != 0)
-                break;
-            drop.close ();
-        }
-    }
-
-    bool more = (msg_->flags () & msg_t::more) != 0;
-
-    int rc = dealer_t::xsend (msg_);
-    if (rc != 0)
-        return rc;
-
-    //  If the request was fully sent, flip the FSM into reply-receiving state.
-    if (!more) {
-        _receiving_reply = true;
-        _message_begins = true;
-    }
-
-    return 0;
-}
-
-int zmq::req_t::xrecv (msg_t *msg_)
-{
-    //  If request wasn't send, we can't wait for reply.
-    if (!_receiving_reply) {
-        errno = EFSM;
-        return -1;
-    }
-
-    //  Skip messages until one with the right first frames is found.
-    while (_message_begins) {
-        //  If enabled, the first frame must have the correct request_id.
-        if (_request_id_frames_enabled) {
-            int rc = recv_reply_pipe (msg_);
-            if (rc != 0)
-                return rc;
-
-            if (unlikely (!(msg_->flags () & msg_t::more)
-                          || msg_->size () != sizeof (_request_id)
-                          || *static_cast<uint32_t *> (msg_->data ())
-                               != _request_id)) {
-                //  Skip the remaining frames and try the next message
-                while (msg_->flags () & msg_t::more) {
-                    rc = recv_reply_pipe (msg_);
-                    errno_assert (rc == 0);
-                }
-                continue;
-            }
-        }
-
-        //  The next frame must be 0.
-        // TODO: Failing this check should also close the connection with the peer!
-        int rc = recv_reply_pipe (msg_);
-        if (rc != 0)
-            return rc;
-
-        if (unlikely (!(msg_->flags () & msg_t::more) || msg_->size () != 0)) {
-            //  Skip the remaining frames and try the next message
-            while (msg_->flags () & msg_t::more) {
-                rc = recv_reply_pipe (msg_);
-                errno_assert (rc == 0);
-            }
-            continue;
-        }
-
-        _message_begins = false;
-    }
-
-    const int rc = recv_reply_pipe (msg_);
-    if (rc != 0)
-        return rc;
-
-    //  If the reply is fully received, flip the FSM into request-sending state.
-    if (!(msg_->flags () & msg_t::more)) {
-        _receiving_reply = false;
-        _message_begins = true;
-    }
-
-    return 0;
-}
-
-bool zmq::req_t::xhas_in ()
-{
-    //  TODO: Duplicates should be removed here.
-
-    if (!_receiving_reply)
-        return false;
-
-    return dealer_t::xhas_in ();
-}
-
-bool zmq::req_t::xhas_out ()
-{
-    if (_receiving_reply && _strict)
-        return false;
-
-    return dealer_t::xhas_out ();
-}
-
-int zmq::req_t::xsetsockopt (int option_,
-                             const void *optval_,
-                             size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_REQ_CORRELATE:
-            if (is_int && value >= 0) {
-                _request_id_frames_enabled = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_REQ_RELAXED:
-            if (is_int && value >= 0) {
-                _strict = (value == 0);
-                return 0;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    return dealer_t::xsetsockopt (option_, optval_, optvallen_);
-}
-
-void zmq::req_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (_reply_pipe == pipe_)
-        _reply_pipe = NULL;
-    dealer_t::xpipe_terminated (pipe_);
-}
-
-int zmq::req_t::recv_reply_pipe (msg_t *msg_)
-{
-    while (true) {
-        pipe_t *pipe = NULL;
-        const int rc = dealer_t::recvpipe (msg_, &pipe);
-        if (rc != 0)
-            return rc;
-        if (!_reply_pipe || pipe == _reply_pipe)
-            return 0;
-    }
-}
-
-zmq::req_session_t::req_session_t (io_thread_t *io_thread_,
-                                   bool connect_,
-                                   socket_base_t *socket_,
-                                   const options_t &options_,
-                                   address_t *addr_) :
-    session_base_t (io_thread_, connect_, socket_, options_, addr_),
-    _state (bottom)
-{
-}
-
-zmq::req_session_t::~req_session_t ()
-{
-}
-
-int zmq::req_session_t::push_msg (msg_t *msg_)
-{
-    //  Ignore commands, they are processed by the engine and should not
-    //  affect the state machine.
-    if (unlikely (msg_->flags () & msg_t::command))
-        return 0;
-
-    switch (_state) {
-        case bottom:
-            if (msg_->flags () == msg_t::more) {
-                //  In case option ZMQ_CORRELATE is on, allow request_id to be
-                //  transfered as first frame (would be too cumbersome to check
-                //  whether the option is actually on or not).
-                if (msg_->size () == sizeof (uint32_t)) {
-                    _state = request_id;
-                    return session_base_t::push_msg (msg_);
-                }
-                if (msg_->size () == 0) {
-                    _state = body;
-                    return session_base_t::push_msg (msg_);
-                }
-            }
-            break;
-        case request_id:
-            if (msg_->flags () == msg_t::more && msg_->size () == 0) {
-                _state = body;
-                return session_base_t::push_msg (msg_);
-            }
-            break;
-        case body:
-            if (msg_->flags () == msg_t::more)
-                return session_base_t::push_msg (msg_);
-            if (msg_->flags () == 0) {
-                _state = bottom;
-                return session_base_t::push_msg (msg_);
-            }
-            break;
-    }
-    errno = EFAULT;
-    return -1;
-}
-
-void zmq::req_session_t::reset ()
-{
-    session_base_t::reset ();
-    _state = bottom;
-}
diff --git a/src/req.hpp b/src/req.hpp
deleted file mode 100644
index 0b0084cf9..000000000
--- a/src/req.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_REQ_HPP_INCLUDED__
-#define __ZMQ_REQ_HPP_INCLUDED__
-
-#include "dealer.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class io_thread_t;
-class socket_base_t;
-
-class req_t ZMQ_FINAL : public dealer_t
-{
-  public:
-    req_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~req_t ();
-
-    //  Overrides of functions from socket_base_t.
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  protected:
-    //  Receive only from the pipe the request was sent to, discarding
-    //  frames from other pipes.
-    int recv_reply_pipe (zmq::msg_t *msg_);
-
-  private:
-    //  If true, request was already sent and reply wasn't received yet or
-    //  was received partially.
-    bool _receiving_reply;
-
-    //  If true, we are starting to send/recv a message. The first part
-    //  of the message must be empty message part (backtrace stack bottom).
-    bool _message_begins;
-
-    //  The pipe the request was sent to and where the reply is expected.
-    zmq::pipe_t *_reply_pipe;
-
-    //  Whether request id frames shall be sent and expected.
-    bool _request_id_frames_enabled;
-
-    //  The current request id. It is incremented every time before a new
-    //  request is sent.
-    uint32_t _request_id;
-
-    //  If false, send() will reset its internal state and terminate the
-    //  reply_pipe's connection instead of failing if a previous request is
-    //  still pending.
-    bool _strict;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (req_t)
-};
-
-class req_session_t ZMQ_FINAL : public session_base_t
-{
-  public:
-    req_session_t (zmq::io_thread_t *io_thread_,
-                   bool connect_,
-                   zmq::socket_base_t *socket_,
-                   const options_t &options_,
-                   address_t *addr_);
-    ~req_session_t ();
-
-    //  Overrides of the functions from session_base_t.
-    int push_msg (msg_t *msg_);
-    void reset ();
-
-  private:
-    enum
-    {
-        bottom,
-        request_id,
-        body
-    } _state;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (req_session_t)
-};
-}
-
-#endif
diff --git a/src/router.cpp b/src/router.cpp
deleted file mode 100644
index 77526e4e4..000000000
--- a/src/router.cpp
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "router.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::router_t::router_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    routing_socket_base_t (parent_, tid_, sid_),
-    _prefetched (false),
-    _routing_id_sent (false),
-    _current_in (NULL),
-    _terminate_current_in (false),
-    _more_in (false),
-    _current_out (NULL),
-    _more_out (false),
-    _next_integral_routing_id (generate_random ()),
-    _mandatory (false),
-    //  raw_socket functionality in ROUTER is deprecated
-    _raw_socket (false),
-    _probe_router (false),
-    _handover (false)
-{
-    options.type = ZMQ_ROUTER;
-    options.recv_routing_id = true;
-    options.raw_socket = false;
-    options.can_send_hello_msg = true;
-    options.can_recv_disconnect_msg = true;
-
-    _prefetched_id.init ();
-    _prefetched_msg.init ();
-}
-
-zmq::router_t::~router_t ()
-{
-    zmq_assert (_anonymous_pipes.empty ());
-    _prefetched_id.close ();
-    _prefetched_msg.close ();
-}
-
-void zmq::router_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-
-    zmq_assert (pipe_);
-
-    if (_probe_router) {
-        msg_t probe_msg;
-        int rc = probe_msg.init ();
-        errno_assert (rc == 0);
-
-        rc = pipe_->write (&probe_msg);
-        // zmq_assert (rc) is not applicable here, since it is not a bug.
-        LIBZMQ_UNUSED (rc);
-
-        pipe_->flush ();
-
-        rc = probe_msg.close ();
-        errno_assert (rc == 0);
-    }
-
-    const bool routing_id_ok = identify_peer (pipe_, locally_initiated_);
-    if (routing_id_ok)
-        _fq.attach (pipe_);
-    else
-        _anonymous_pipes.insert (pipe_);
-}
-
-int zmq::router_t::xsetsockopt (int option_,
-                                const void *optval_,
-                                size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_ROUTER_RAW:
-            if (is_int && value >= 0) {
-                _raw_socket = (value != 0);
-                if (_raw_socket) {
-                    options.recv_routing_id = false;
-                    options.raw_socket = true;
-                }
-                return 0;
-            }
-            break;
-
-        case ZMQ_ROUTER_MANDATORY:
-            if (is_int && value >= 0) {
-                _mandatory = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_PROBE_ROUTER:
-            if (is_int && value >= 0) {
-                _probe_router = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_ROUTER_HANDOVER:
-            if (is_int && value >= 0) {
-                _handover = (value != 0);
-                return 0;
-            }
-            break;
-
-#ifdef ZMQ_BUILD_DRAFT_API
-        case ZMQ_ROUTER_NOTIFY:
-            if (is_int && value >= 0
-                && value <= (ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT)) {
-                options.router_notify = value;
-                return 0;
-            }
-            break;
-#endif
-
-        default:
-            return routing_socket_base_t::xsetsockopt (option_, optval_,
-                                                       optvallen_);
-    }
-    errno = EINVAL;
-    return -1;
-}
-
-
-void zmq::router_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (0 == _anonymous_pipes.erase (pipe_)) {
-        erase_out_pipe (pipe_);
-        _fq.pipe_terminated (pipe_);
-        pipe_->rollback ();
-        if (pipe_ == _current_out)
-            _current_out = NULL;
-    }
-}
-
-void zmq::router_t::xread_activated (pipe_t *pipe_)
-{
-    const std::set<pipe_t *>::iterator it = _anonymous_pipes.find (pipe_);
-    if (it == _anonymous_pipes.end ())
-        _fq.activated (pipe_);
-    else {
-        const bool routing_id_ok = identify_peer (pipe_, false);
-        if (routing_id_ok) {
-            _anonymous_pipes.erase (it);
-            _fq.attach (pipe_);
-        }
-    }
-}
-
-int zmq::router_t::xsend (msg_t *msg_)
-{
-    //  If this is the first part of the message it's the ID of the
-    //  peer to send the message to.
-    if (!_more_out) {
-        zmq_assert (!_current_out);
-
-        //  If we have malformed message (prefix with no subsequent message)
-        //  then just silently ignore it.
-        //  TODO: The connections should be killed instead.
-        if (msg_->flags () & msg_t::more) {
-            _more_out = true;
-
-            //  Find the pipe associated with the routing id stored in the prefix.
-            //  If there's no such pipe just silently ignore the message, unless
-            //  router_mandatory is set.
-            out_pipe_t *out_pipe = lookup_out_pipe (
-              blob_t (static_cast<unsigned char *> (msg_->data ()),
-                      msg_->size (), zmq::reference_tag_t ()));
-
-            if (out_pipe) {
-                _current_out = out_pipe->pipe;
-
-                // Check whether pipe is closed or not
-                if (!_current_out->check_write ()) {
-                    // Check whether pipe is full or not
-                    const bool pipe_full = !_current_out->check_hwm ();
-                    out_pipe->active = false;
-                    _current_out = NULL;
-
-                    if (_mandatory) {
-                        _more_out = false;
-                        if (pipe_full)
-                            errno = EAGAIN;
-                        else
-                            errno = EHOSTUNREACH;
-                        return -1;
-                    }
-                }
-            } else if (_mandatory) {
-                _more_out = false;
-                errno = EHOSTUNREACH;
-                return -1;
-            }
-        }
-
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-
-    //  Ignore the MORE flag for raw-sock or assert?
-    if (options.raw_socket)
-        msg_->reset_flags (msg_t::more);
-
-    //  Check whether this is the last part of the message.
-    _more_out = (msg_->flags () & msg_t::more) != 0;
-
-    //  Push the message into the pipe. If there's no out pipe, just drop it.
-    if (_current_out) {
-        // Close the remote connection if user has asked to do so
-        // by sending zero length message.
-        // Pending messages in the pipe will be dropped (on receiving term- ack)
-        if (_raw_socket && msg_->size () == 0) {
-            _current_out->terminate (false);
-            int rc = msg_->close ();
-            errno_assert (rc == 0);
-            rc = msg_->init ();
-            errno_assert (rc == 0);
-            _current_out = NULL;
-            return 0;
-        }
-
-        const bool ok = _current_out->write (msg_);
-        if (unlikely (!ok)) {
-            // Message failed to send - we must close it ourselves.
-            const int rc = msg_->close ();
-            errno_assert (rc == 0);
-            // HWM was checked before, so the pipe must be gone. Roll back
-            // messages that were piped, for example REP labels.
-            _current_out->rollback ();
-            _current_out = NULL;
-        } else {
-            if (!_more_out) {
-                _current_out->flush ();
-                _current_out = NULL;
-            }
-        }
-    } else {
-        const int rc = msg_->close ();
-        errno_assert (rc == 0);
-    }
-
-    //  Detach the message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::router_t::xrecv (msg_t *msg_)
-{
-    if (_prefetched) {
-        if (!_routing_id_sent) {
-            const int rc = msg_->move (_prefetched_id);
-            errno_assert (rc == 0);
-            _routing_id_sent = true;
-        } else {
-            const int rc = msg_->move (_prefetched_msg);
-            errno_assert (rc == 0);
-            _prefetched = false;
-        }
-        _more_in = (msg_->flags () & msg_t::more) != 0;
-
-        if (!_more_in) {
-            if (_terminate_current_in) {
-                _current_in->terminate (true);
-                _terminate_current_in = false;
-            }
-            _current_in = NULL;
-        }
-        return 0;
-    }
-
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (msg_, &pipe);
-
-    //  It's possible that we receive peer's routing id. That happens
-    //  after reconnection. The current implementation assumes that
-    //  the peer always uses the same routing id.
-    while (rc == 0 && msg_->is_routing_id ())
-        rc = _fq.recvpipe (msg_, &pipe);
-
-    if (rc != 0)
-        return -1;
-
-    zmq_assert (pipe != NULL);
-
-    //  If we are in the middle of reading a message, just return the next part.
-    if (_more_in) {
-        _more_in = (msg_->flags () & msg_t::more) != 0;
-
-        if (!_more_in) {
-            if (_terminate_current_in) {
-                _current_in->terminate (true);
-                _terminate_current_in = false;
-            }
-            _current_in = NULL;
-        }
-    } else {
-        //  We are at the beginning of a message.
-        //  Keep the message part we have in the prefetch buffer
-        //  and return the ID of the peer instead.
-        rc = _prefetched_msg.move (*msg_);
-        errno_assert (rc == 0);
-        _prefetched = true;
-        _current_in = pipe;
-
-        const blob_t &routing_id = pipe->get_routing_id ();
-        rc = msg_->init_size (routing_id.size ());
-        errno_assert (rc == 0);
-        memcpy (msg_->data (), routing_id.data (), routing_id.size ());
-        msg_->set_flags (msg_t::more);
-        if (_prefetched_msg.metadata ())
-            msg_->set_metadata (_prefetched_msg.metadata ());
-        _routing_id_sent = true;
-    }
-
-    return 0;
-}
-
-int zmq::router_t::rollback ()
-{
-    if (_current_out) {
-        _current_out->rollback ();
-        _current_out = NULL;
-        _more_out = false;
-    }
-    return 0;
-}
-
-bool zmq::router_t::xhas_in ()
-{
-    //  If we are in the middle of reading the messages, there are
-    //  definitely more parts available.
-    if (_more_in)
-        return true;
-
-    //  We may already have a message pre-fetched.
-    if (_prefetched)
-        return true;
-
-    //  Try to read the next message.
-    //  The message, if read, is kept in the pre-fetch buffer.
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (&_prefetched_msg, &pipe);
-
-    //  It's possible that we receive peer's routing id. That happens
-    //  after reconnection. The current implementation assumes that
-    //  the peer always uses the same routing id.
-    //  TODO: handle the situation when the peer changes its routing id.
-    while (rc == 0 && _prefetched_msg.is_routing_id ())
-        rc = _fq.recvpipe (&_prefetched_msg, &pipe);
-
-    if (rc != 0)
-        return false;
-
-    zmq_assert (pipe != NULL);
-
-    const blob_t &routing_id = pipe->get_routing_id ();
-    rc = _prefetched_id.init_size (routing_id.size ());
-    errno_assert (rc == 0);
-    memcpy (_prefetched_id.data (), routing_id.data (), routing_id.size ());
-    _prefetched_id.set_flags (msg_t::more);
-
-    _prefetched = true;
-    _routing_id_sent = false;
-    _current_in = pipe;
-
-    return true;
-}
-
-static bool check_pipe_hwm (const zmq::pipe_t &pipe_)
-{
-    return pipe_.check_hwm ();
-}
-
-bool zmq::router_t::xhas_out ()
-{
-    //  In theory, ROUTER socket is always ready for writing (except when
-    //  MANDATORY is set). Whether actual attempt to write succeeds depends
-    //  on whitch pipe the message is going to be routed to.
-
-    if (!_mandatory)
-        return true;
-
-    return any_of_out_pipes (check_pipe_hwm);
-}
-
-int zmq::router_t::get_peer_state (const void *routing_id_,
-                                   size_t routing_id_size_) const
-{
-    int res = 0;
-
-    // TODO remove the const_cast, see comment in lookup_out_pipe
-    const blob_t routing_id_blob (
-      static_cast<unsigned char *> (const_cast<void *> (routing_id_)),
-      routing_id_size_, reference_tag_t ());
-    const out_pipe_t *out_pipe = lookup_out_pipe (routing_id_blob);
-    if (!out_pipe) {
-        errno = EHOSTUNREACH;
-        return -1;
-    }
-
-    if (out_pipe->pipe->check_hwm ())
-        res |= ZMQ_POLLOUT;
-
-    /** \todo does it make any sense to check the inpipe as well? */
-
-    return res;
-}
-
-bool zmq::router_t::identify_peer (pipe_t *pipe_, bool locally_initiated_)
-{
-    msg_t msg;
-    blob_t routing_id;
-
-    if (locally_initiated_ && connect_routing_id_is_set ()) {
-        const std::string connect_routing_id = extract_connect_routing_id ();
-        routing_id.set (
-          reinterpret_cast<const unsigned char *> (connect_routing_id.c_str ()),
-          connect_routing_id.length ());
-        //  Not allowed to duplicate an existing rid
-        zmq_assert (!has_out_pipe (routing_id));
-    } else if (
-      options
-        .raw_socket) { //  Always assign an integral routing id for raw-socket
-        unsigned char buf[5];
-        buf[0] = 0;
-        put_uint32 (buf + 1, _next_integral_routing_id++);
-        routing_id.set (buf, sizeof buf);
-    } else if (!options.raw_socket) {
-        //  Pick up handshake cases and also case where next integral routing id is set
-        msg.init ();
-        const bool ok = pipe_->read (&msg);
-        if (!ok)
-            return false;
-
-        if (msg.size () == 0) {
-            //  Fall back on the auto-generation
-            unsigned char buf[5];
-            buf[0] = 0;
-            put_uint32 (buf + 1, _next_integral_routing_id++);
-            routing_id.set (buf, sizeof buf);
-            msg.close ();
-        } else {
-            routing_id.set (static_cast<unsigned char *> (msg.data ()),
-                            msg.size ());
-            msg.close ();
-
-            //  Try to remove an existing routing id entry to allow the new
-            //  connection to take the routing id.
-            const out_pipe_t *const existing_outpipe =
-              lookup_out_pipe (routing_id);
-
-            if (existing_outpipe) {
-                if (!_handover)
-                    //  Ignore peers with duplicate ID
-                    return false;
-
-                //  We will allow the new connection to take over this
-                //  routing id. Temporarily assign a new routing id to the
-                //  existing pipe so we can terminate it asynchronously.
-                unsigned char buf[5];
-                buf[0] = 0;
-                put_uint32 (buf + 1, _next_integral_routing_id++);
-                blob_t new_routing_id (buf, sizeof buf);
-
-                pipe_t *const old_pipe = existing_outpipe->pipe;
-
-                erase_out_pipe (old_pipe);
-                old_pipe->set_router_socket_routing_id (new_routing_id);
-                add_out_pipe (ZMQ_MOVE (new_routing_id), old_pipe);
-
-                if (old_pipe == _current_in)
-                    _terminate_current_in = true;
-                else
-                    old_pipe->terminate (true);
-            }
-        }
-    }
-
-    pipe_->set_router_socket_routing_id (routing_id);
-    add_out_pipe (ZMQ_MOVE (routing_id), pipe_);
-
-    return true;
-}
diff --git a/src/router.hpp b/src/router.hpp
deleted file mode 100644
index f020672f2..000000000
--- a/src/router.hpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ROUTER_HPP_INCLUDED__
-#define __ZMQ_ROUTER_HPP_INCLUDED__
-
-#include <map>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "stdint.hpp"
-#include "blob.hpp"
-#include "msg.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-
-//  TODO: This class uses O(n) scheduling. Rewrite it to use O(1) algorithm.
-class router_t : public routing_socket_base_t
-{
-  public:
-    router_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~router_t () ZMQ_OVERRIDE;
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_) ZMQ_FINAL;
-    int
-    xsetsockopt (int option_, const void *optval_, size_t optvallen_) ZMQ_FINAL;
-    int xsend (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    int xrecv (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    bool xhas_in () ZMQ_OVERRIDE;
-    bool xhas_out () ZMQ_OVERRIDE;
-    void xread_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xpipe_terminated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    int get_peer_state (const void *routing_id_,
-                        size_t routing_id_size_) const ZMQ_FINAL;
-
-  protected:
-    //  Rollback any message parts that were sent but not yet flushed.
-    int rollback ();
-
-  private:
-    //  Receive peer id and update lookup map
-    bool identify_peer (pipe_t *pipe_, bool locally_initiated_);
-
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    //  True iff there is a message held in the pre-fetch buffer.
-    bool _prefetched;
-
-    //  If true, the receiver got the message part with
-    //  the peer's identity.
-    bool _routing_id_sent;
-
-    //  Holds the prefetched identity.
-    msg_t _prefetched_id;
-
-    //  Holds the prefetched message.
-    msg_t _prefetched_msg;
-
-    //  The pipe we are currently reading from
-    zmq::pipe_t *_current_in;
-
-    //  Should current_in should be terminate after all parts received?
-    bool _terminate_current_in;
-
-    //  If true, more incoming message parts are expected.
-    bool _more_in;
-
-    //  We keep a set of pipes that have not been identified yet.
-    std::set<pipe_t *> _anonymous_pipes;
-
-    //  The pipe we are currently writing to.
-    zmq::pipe_t *_current_out;
-
-    //  If true, more outgoing message parts are expected.
-    bool _more_out;
-
-    //  Routing IDs are generated. It's a simple increment and wrap-over
-    //  algorithm. This value is the next ID to use (if not used already).
-    uint32_t _next_integral_routing_id;
-
-    // If true, report EAGAIN to the caller instead of silently dropping
-    // the message targeting an unknown peer.
-    bool _mandatory;
-    bool _raw_socket;
-
-    // if true, send an empty message to every connected router peer
-    bool _probe_router;
-
-    // If true, the router will reassign an identity upon encountering a
-    // name collision. The new pipe will take the identity, the old pipe
-    // will be terminated.
-    bool _handover;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (router_t)
-};
-}
-
-#endif
diff --git a/src/scatter.cpp b/src/scatter.cpp
deleted file mode 100644
index b951b92e1..000000000
--- a/src/scatter.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "scatter.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::scatter_t::scatter_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true)
-{
-    options.type = ZMQ_SCATTER;
-}
-
-zmq::scatter_t::~scatter_t ()
-{
-}
-
-void zmq::scatter_t::xattach_pipe (pipe_t *pipe_,
-                                   bool subscribe_to_all_,
-                                   bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    //  Don't delay pipe termination as there is no one
-    //  to receive the delimiter.
-    pipe_->set_nodelay ();
-
-    zmq_assert (pipe_);
-    _lb.attach (pipe_);
-}
-
-void zmq::scatter_t::xwrite_activated (pipe_t *pipe_)
-{
-    _lb.activated (pipe_);
-}
-
-void zmq::scatter_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _lb.pipe_terminated (pipe_);
-}
-
-int zmq::scatter_t::xsend (msg_t *msg_)
-{
-    //  SCATTER sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    return _lb.send (msg_);
-}
-
-bool zmq::scatter_t::xhas_out ()
-{
-    return _lb.has_out ();
-}
diff --git a/src/scatter.hpp b/src/scatter.hpp
deleted file mode 100644
index 5fd36a2b9..000000000
--- a/src/scatter.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SCATTER_HPP_INCLUDED__
-#define __ZMQ_SCATTER_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "lb.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class msg_t;
-class io_thread_t;
-
-class scatter_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    scatter_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~scatter_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Load balancer managing the outbound pipes.
-    lb_t _lb;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (scatter_t)
-};
-}
-
-#endif
diff --git a/src/secure_allocator.hpp b/src/secure_allocator.hpp
deleted file mode 100644
index 0d37e7ed8..000000000
--- a/src/secure_allocator.hpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SECURE_ALLOCATOR_HPP_INCLUDED__
-#define __ZMQ_SECURE_ALLOCATOR_HPP_INCLUDED__
-
-#include "platform.hpp"
-#include "macros.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-
-#if defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-#include <memory>
-
-namespace zmq
-{
-#if defined(ZMQ_USE_LIBSODIUM)
-template <class T> struct secure_allocator_t
-{
-    typedef T value_type;
-
-    secure_allocator_t () ZMQ_DEFAULT;
-
-    template <class U>
-    secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT
-    {
-    }
-    T *allocate (std::size_t n) ZMQ_NOEXCEPT
-    {
-        T *res = static_cast<T *> (sodium_allocarray (sizeof (T), n));
-        alloc_assert (res);
-        return res;
-    }
-    void deallocate (T *p, std::size_t) ZMQ_NOEXCEPT { sodium_free (p); }
-
-    // the following is only required with C++98
-    // TODO maybe make this conditionally compiled
-    typedef T *pointer;
-    typedef const T *const_pointer;
-    typedef T &reference;
-    typedef const T &const_reference;
-    typedef std::size_t size_type;
-    typedef std::ptrdiff_t difference_type;
-    template <class U> struct rebind
-    {
-        typedef secure_allocator_t<U> other;
-    };
-
-    void construct (pointer p, const_reference val)
-    {
-        new ((void *) p) value_type (val);
-    }
-    void destroy (pointer p) { p->~value_type (); }
-    size_type max_size () const { return SIZE_MAX; }
-};
-template <class T, class U>
-bool operator== (const secure_allocator_t<T> &, const secure_allocator_t<U> &)
-{
-    return true;
-}
-template <class T, class U>
-bool operator!= (const secure_allocator_t<T> &, const secure_allocator_t<U> &)
-{
-    return false;
-}
-#else
-template <typename T> struct secure_allocator_t : std::allocator<T>
-{
-};
-#endif
-}
-
-#endif
-
-#endif
diff --git a/src/select.cpp b/src/select.cpp
deleted file mode 100644
index 159f44f23..000000000
--- a/src/select.cpp
+++ /dev/null
@@ -1,626 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "select.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_SELECT
-
-#if defined ZMQ_HAVE_WINDOWS
-#elif defined ZMQ_HAVE_HPUX
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#elif defined ZMQ_HAVE_OPENVMS
-#include <sys/types.h>
-#include <sys/time.h>
-#elif defined ZMQ_HAVE_VXWORKS
-#include <sys/types.h>
-#include <sys/time.h>
-#include <strings.h>
-#else
-#include <sys/select.h>
-#endif
-
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-#include <algorithm>
-#include <limits>
-#include <climits>
-
-zmq::select_t::select_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_),
-#if defined ZMQ_HAVE_WINDOWS
-    //  Fine as long as map is not cleared.
-    _current_family_entry_it (_family_entries.end ())
-#else
-    _max_fd (retired_fd)
-#endif
-{
-#if defined ZMQ_HAVE_WINDOWS
-    for (size_t i = 0; i < fd_family_cache_size; ++i)
-        _fd_family_cache[i] = std::make_pair (retired_fd, 0);
-#endif
-}
-
-zmq::select_t::~select_t ()
-{
-    stop_worker ();
-}
-
-zmq::select_t::handle_t zmq::select_t::add_fd (fd_t fd_, i_poll_events *events_)
-{
-    check_thread ();
-    zmq_assert (fd_ != retired_fd);
-
-    fd_entry_t fd_entry;
-    fd_entry.fd = fd_;
-    fd_entry.events = events_;
-
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (fd_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    family_entry.fd_entries.push_back (fd_entry);
-    FD_SET (fd_, &family_entry.fds_set.error);
-
-#if !defined ZMQ_HAVE_WINDOWS
-    if (fd_ > _max_fd)
-        _max_fd = fd_;
-#endif
-
-    adjust_load (1);
-
-    return fd_;
-}
-
-zmq::select_t::fd_entries_t::iterator
-zmq::select_t::find_fd_entry_by_handle (fd_entries_t &fd_entries_,
-                                        handle_t handle_)
-{
-    fd_entries_t::iterator fd_entry_it;
-    for (fd_entry_it = fd_entries_.begin (); fd_entry_it != fd_entries_.end ();
-         ++fd_entry_it)
-        if (fd_entry_it->fd == handle_)
-            break;
-
-    return fd_entry_it;
-}
-
-void zmq::select_t::trigger_events (const fd_entries_t &fd_entries_,
-                                    const fds_set_t &local_fds_set_,
-                                    int event_count_)
-{
-    //  Size is cached to avoid iteration through recently added descriptors.
-    for (fd_entries_t::size_type i = 0, size = fd_entries_.size ();
-         i < size && event_count_ > 0; ++i) {
-        //  fd_entries_[i] may not be stored, since calls to
-        //  in_event/out_event may reallocate the vector
-
-        if (is_retired_fd (fd_entries_[i]))
-            continue;
-
-        if (FD_ISSET (fd_entries_[i].fd, &local_fds_set_.read)) {
-            fd_entries_[i].events->in_event ();
-            --event_count_;
-        }
-
-        //  TODO: can the is_retired_fd be true at this point? if it
-        //  was retired before, we would already have continued, and I
-        //  don't see where it might have been modified
-        //  And if rc == 0, we can break instead of continuing
-        if (is_retired_fd (fd_entries_[i]) || event_count_ == 0)
-            continue;
-
-        if (FD_ISSET (fd_entries_[i].fd, &local_fds_set_.write)) {
-            fd_entries_[i].events->out_event ();
-            --event_count_;
-        }
-
-        //  TODO: same as above
-        if (is_retired_fd (fd_entries_[i]) || event_count_ == 0)
-            continue;
-
-        if (FD_ISSET (fd_entries_[i].fd, &local_fds_set_.error)) {
-            fd_entries_[i].events->in_event ();
-            --event_count_;
-        }
-    }
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-int zmq::select_t::try_retire_fd_entry (
-  family_entries_t::iterator family_entry_it_, zmq::fd_t &handle_)
-{
-    family_entry_t &family_entry = family_entry_it_->second;
-
-    fd_entries_t::iterator fd_entry_it =
-      find_fd_entry_by_handle (family_entry.fd_entries, handle_);
-
-    if (fd_entry_it == family_entry.fd_entries.end ())
-        return 0;
-
-    fd_entry_t &fd_entry = *fd_entry_it;
-    zmq_assert (fd_entry.fd != retired_fd);
-
-    if (family_entry_it_ != _current_family_entry_it) {
-        //  Family is not currently being iterated and can be safely
-        //  modified in-place. So later it can be skipped without
-        //  re-verifying its content.
-        family_entry.fd_entries.erase (fd_entry_it);
-    } else {
-        //  Otherwise mark removed entries as retired. It will be cleaned up
-        //  at the end of the iteration. See zmq::select_t::loop
-        fd_entry.fd = retired_fd;
-        family_entry.has_retired = true;
-    }
-    family_entry.fds_set.remove_fd (handle_);
-    return 1;
-}
-#endif
-
-void zmq::select_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    int retired = 0;
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    if (family != AF_UNSPEC) {
-        family_entries_t::iterator family_entry_it =
-          _family_entries.find (family);
-
-        retired += try_retire_fd_entry (family_entry_it, handle_);
-    } else {
-        //  get_fd_family may fail and return AF_UNSPEC if the socket was not
-        //  successfully connected. In that case, we need to look for the
-        //  socket in all family_entries.
-        family_entries_t::iterator end = _family_entries.end ();
-        for (family_entries_t::iterator family_entry_it =
-               _family_entries.begin ();
-             family_entry_it != end; ++family_entry_it) {
-            if (retired += try_retire_fd_entry (family_entry_it, handle_)) {
-                break;
-            }
-        }
-    }
-#else
-    fd_entries_t::iterator fd_entry_it =
-      find_fd_entry_by_handle (_family_entry.fd_entries, handle_);
-    assert (fd_entry_it != _family_entry.fd_entries.end ());
-
-    zmq_assert (fd_entry_it->fd != retired_fd);
-    fd_entry_it->fd = retired_fd;
-    _family_entry.fds_set.remove_fd (handle_);
-
-    ++retired;
-
-    if (handle_ == _max_fd) {
-        _max_fd = retired_fd;
-        for (fd_entry_it = _family_entry.fd_entries.begin ();
-             fd_entry_it != _family_entry.fd_entries.end (); ++fd_entry_it)
-            if (fd_entry_it->fd > _max_fd)
-                _max_fd = fd_entry_it->fd;
-    }
-
-    _family_entry.has_retired = true;
-#endif
-    zmq_assert (retired == 1);
-    adjust_load (-1);
-}
-
-void zmq::select_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    FD_SET (handle_, &family_entry.fds_set.read);
-}
-
-void zmq::select_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    FD_CLR (handle_, &family_entry.fds_set.read);
-}
-
-void zmq::select_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    FD_SET (handle_, &family_entry.fds_set.write);
-}
-
-void zmq::select_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    FD_CLR (handle_, &family_entry.fds_set.write);
-}
-
-void zmq::select_t::stop ()
-{
-    check_thread ();
-    //  no-op... thread is stopped when no more fds or timers are registered
-}
-
-int zmq::select_t::max_fds ()
-{
-    return FD_SETSIZE;
-}
-
-void zmq::select_t::loop ()
-{
-    while (true) {
-        //  Execute any due timers.
-        int timeout = static_cast<int> (execute_timers ());
-
-        cleanup_retired ();
-
-#ifdef _WIN32
-        if (_family_entries.empty ()) {
-#else
-        if (_family_entry.fd_entries.empty ()) {
-#endif
-            zmq_assert (get_load () == 0);
-
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-#if defined ZMQ_HAVE_OSX
-        struct timeval tv = {(long) (timeout / 1000), timeout % 1000 * 1000};
-#else
-        struct timeval tv = {static_cast<long> (timeout / 1000),
-                             static_cast<long> (timeout % 1000 * 1000)};
-#endif
-
-#if defined ZMQ_HAVE_WINDOWS
-        /*
-            On Windows select does not allow to mix descriptors from different
-            service providers. It seems to work for AF_INET and AF_INET6,
-            but fails for AF_INET and VMCI. The workaround is to use
-            WSAEventSelect and WSAWaitForMultipleEvents to wait, then use
-            select to find out what actually changed. WSAWaitForMultipleEvents
-            cannot be used alone, because it does not support more than 64 events
-            which is not enough.
-
-            To reduce unnecessary overhead, WSA is only used when there are more
-            than one family. Moreover, AF_INET and AF_INET6 are considered the same
-            family because Windows seems to handle them properly.
-            See get_fd_family for details.
-        */
-
-        //  If there is just one family, there is no reason to use WSA events.
-        int rc = 0;
-        const bool use_wsa_events = _family_entries.size () > 1;
-        if (use_wsa_events) {
-            // TODO: I don't really understand why we are doing this. If any of
-            // the events was signaled, we will call select for each fd_family
-            // afterwards. The only benefit is if none of the events was
-            // signaled, then we continue early.
-            // IMHO, either WSAEventSelect/WSAWaitForMultipleEvents or select
-            // should be used, but not both
-
-            wsa_events_t wsa_events;
-
-            for (family_entries_t::iterator family_entry_it =
-                   _family_entries.begin ();
-                 family_entry_it != _family_entries.end (); ++family_entry_it) {
-                family_entry_t &family_entry = family_entry_it->second;
-
-                for (fd_entries_t::iterator fd_entry_it =
-                       family_entry.fd_entries.begin ();
-                     fd_entry_it != family_entry.fd_entries.end ();
-                     ++fd_entry_it) {
-                    fd_t fd = fd_entry_it->fd;
-
-                    //  http://stackoverflow.com/q/35043420/188530
-                    if (FD_ISSET (fd, &family_entry.fds_set.read)
-                        && FD_ISSET (fd, &family_entry.fds_set.write))
-                        rc = WSAEventSelect (fd, wsa_events.events[3],
-                                             FD_READ | FD_ACCEPT | FD_CLOSE
-                                               | FD_WRITE | FD_CONNECT);
-                    else if (FD_ISSET (fd, &family_entry.fds_set.read))
-                        rc = WSAEventSelect (fd, wsa_events.events[0],
-                                             FD_READ | FD_ACCEPT | FD_CLOSE);
-                    else if (FD_ISSET (fd, &family_entry.fds_set.write))
-                        rc = WSAEventSelect (fd, wsa_events.events[1],
-                                             FD_WRITE | FD_CONNECT);
-                    else
-                        rc = 0;
-
-                    wsa_assert (rc != SOCKET_ERROR);
-                }
-            }
-
-            rc = WSAWaitForMultipleEvents (4, wsa_events.events, FALSE,
-                                           timeout ? timeout : INFINITE, FALSE);
-            wsa_assert (rc != (int) WSA_WAIT_FAILED);
-            zmq_assert (rc != WSA_WAIT_IO_COMPLETION);
-
-            if (rc == WSA_WAIT_TIMEOUT)
-                continue;
-        }
-
-        for (_current_family_entry_it = _family_entries.begin ();
-             _current_family_entry_it != _family_entries.end ();
-             ++_current_family_entry_it) {
-            family_entry_t &family_entry = _current_family_entry_it->second;
-
-
-            if (use_wsa_events) {
-                //  There is no reason to wait again after WSAWaitForMultipleEvents.
-                //  Simply collect what is ready.
-                struct timeval tv_nodelay = {0, 0};
-                select_family_entry (family_entry, 0, true, tv_nodelay);
-            } else {
-                select_family_entry (family_entry, 0, timeout > 0, tv);
-            }
-        }
-#else
-        select_family_entry (_family_entry, _max_fd + 1, timeout > 0, tv);
-#endif
-    }
-}
-
-void zmq::select_t::select_family_entry (family_entry_t &family_entry_,
-                                         const int max_fd_,
-                                         const bool use_timeout_,
-                                         struct timeval &tv_)
-{
-    //  select will fail when run with empty sets.
-    fd_entries_t &fd_entries = family_entry_.fd_entries;
-    if (fd_entries.empty ())
-        return;
-
-    fds_set_t local_fds_set = family_entry_.fds_set;
-    int rc = select (max_fd_, &local_fds_set.read, &local_fds_set.write,
-                     &local_fds_set.error, use_timeout_ ? &tv_ : NULL);
-
-#if defined ZMQ_HAVE_WINDOWS
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    if (rc == -1) {
-        errno_assert (errno == EINTR);
-        return;
-    }
-#endif
-
-    trigger_events (fd_entries, local_fds_set, rc);
-
-    cleanup_retired (family_entry_);
-}
-
-zmq::select_t::fds_set_t::fds_set_t ()
-{
-    FD_ZERO (&read);
-    FD_ZERO (&write);
-    FD_ZERO (&error);
-}
-
-zmq::select_t::fds_set_t::fds_set_t (const fds_set_t &other_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    // On Windows we don't need to copy the whole fd_set.
-    // SOCKETS are continuous from the beginning of fd_array in fd_set.
-    // We just need to copy fd_count elements of fd_array.
-    // We gain huge memcpy() improvement if number of used SOCKETs is much lower than FD_SETSIZE.
-    memcpy (&read, &other_.read,
-            (char *) (other_.read.fd_array + other_.read.fd_count)
-              - (char *) &other_.read);
-    memcpy (&write, &other_.write,
-            (char *) (other_.write.fd_array + other_.write.fd_count)
-              - (char *) &other_.write);
-    memcpy (&error, &other_.error,
-            (char *) (other_.error.fd_array + other_.error.fd_count)
-              - (char *) &other_.error);
-#else
-    memcpy (&read, &other_.read, sizeof other_.read);
-    memcpy (&write, &other_.write, sizeof other_.write);
-    memcpy (&error, &other_.error, sizeof other_.error);
-#endif
-}
-
-zmq::select_t::fds_set_t &zmq::select_t::fds_set_t::
-operator= (const fds_set_t &other_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    // On Windows we don't need to copy the whole fd_set.
-    // SOCKETS are continuous from the beginning of fd_array in fd_set.
-    // We just need to copy fd_count elements of fd_array.
-    // We gain huge memcpy() improvement if number of used SOCKETs is much lower than FD_SETSIZE.
-    memcpy (&read, &other_.read,
-            (char *) (other_.read.fd_array + other_.read.fd_count)
-              - (char *) &other_.read);
-    memcpy (&write, &other_.write,
-            (char *) (other_.write.fd_array + other_.write.fd_count)
-              - (char *) &other_.write);
-    memcpy (&error, &other_.error,
-            (char *) (other_.error.fd_array + other_.error.fd_count)
-              - (char *) &other_.error);
-#else
-    memcpy (&read, &other_.read, sizeof other_.read);
-    memcpy (&write, &other_.write, sizeof other_.write);
-    memcpy (&error, &other_.error, sizeof other_.error);
-#endif
-    return *this;
-}
-
-void zmq::select_t::fds_set_t::remove_fd (const fd_t &fd_)
-{
-    FD_CLR (fd_, &read);
-    FD_CLR (fd_, &write);
-    FD_CLR (fd_, &error);
-}
-
-bool zmq::select_t::cleanup_retired (family_entry_t &family_entry_)
-{
-    if (family_entry_.has_retired) {
-        family_entry_.has_retired = false;
-        family_entry_.fd_entries.erase (
-          std::remove_if (family_entry_.fd_entries.begin (),
-                          family_entry_.fd_entries.end (), is_retired_fd),
-          family_entry_.fd_entries.end ());
-    }
-    return family_entry_.fd_entries.empty ();
-}
-
-void zmq::select_t::cleanup_retired ()
-{
-#ifdef _WIN32
-    for (family_entries_t::iterator it = _family_entries.begin ();
-         it != _family_entries.end ();) {
-        if (cleanup_retired (it->second))
-            it = _family_entries.erase (it);
-        else
-            ++it;
-    }
-#else
-    cleanup_retired (_family_entry);
-#endif
-}
-
-bool zmq::select_t::is_retired_fd (const fd_entry_t &entry_)
-{
-    return entry_.fd == retired_fd;
-}
-
-zmq::select_t::family_entry_t::family_entry_t () : has_retired (false)
-{
-}
-
-
-#if defined ZMQ_HAVE_WINDOWS
-u_short zmq::select_t::get_fd_family (fd_t fd_)
-{
-    // cache the results of determine_fd_family, as this is frequently called
-    // for the same sockets, and determine_fd_family is expensive
-    size_t i;
-    for (i = 0; i < fd_family_cache_size; ++i) {
-        const std::pair<fd_t, u_short> &entry = _fd_family_cache[i];
-        if (entry.first == fd_) {
-            return entry.second;
-        }
-        if (entry.first == retired_fd)
-            break;
-    }
-
-    std::pair<fd_t, u_short> res =
-      std::make_pair (fd_, determine_fd_family (fd_));
-    if (i < fd_family_cache_size) {
-        _fd_family_cache[i] = res;
-    } else {
-        // just overwrite a random entry
-        // could be optimized by some LRU strategy
-        _fd_family_cache[rand () % fd_family_cache_size] = res;
-    }
-
-    return res.second;
-}
-
-u_short zmq::select_t::determine_fd_family (fd_t fd_)
-{
-    //  Use sockaddr_storage instead of sockaddr to accommodate different structure sizes
-    sockaddr_storage addr = {0};
-    int addr_size = sizeof addr;
-
-    int type;
-    int type_length = sizeof (int);
-
-    int rc = getsockopt (fd_, SOL_SOCKET, SO_TYPE,
-                         reinterpret_cast<char *> (&type), &type_length);
-
-    if (rc == 0) {
-        if (type == SOCK_DGRAM)
-            return AF_INET;
-
-        rc =
-          getsockname (fd_, reinterpret_cast<sockaddr *> (&addr), &addr_size);
-
-        //  AF_INET and AF_INET6 can be mixed in select
-        //  TODO: If proven otherwise, should simply return addr.sa_family
-        if (rc != SOCKET_ERROR)
-            return addr.ss_family == AF_INET6 ? AF_INET : addr.ss_family;
-    }
-
-    return AF_UNSPEC;
-}
-
-zmq::select_t::wsa_events_t::wsa_events_t ()
-{
-    events[0] = WSACreateEvent ();
-    wsa_assert (events[0] != WSA_INVALID_EVENT);
-    events[1] = WSACreateEvent ();
-    wsa_assert (events[1] != WSA_INVALID_EVENT);
-    events[2] = WSACreateEvent ();
-    wsa_assert (events[2] != WSA_INVALID_EVENT);
-    events[3] = WSACreateEvent ();
-    wsa_assert (events[3] != WSA_INVALID_EVENT);
-}
-
-zmq::select_t::wsa_events_t::~wsa_events_t ()
-{
-    wsa_assert (WSACloseEvent (events[0]));
-    wsa_assert (WSACloseEvent (events[1]));
-    wsa_assert (WSACloseEvent (events[2]));
-    wsa_assert (WSACloseEvent (events[3]));
-}
-#endif
-
-#endif
diff --git a/src/select.hpp b/src/select.hpp
deleted file mode 100644
index 8f18a383f..000000000
--- a/src/select.hpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SELECT_HPP_INCLUDED__
-#define __ZMQ_SELECT_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_SELECT
-
-#include <stddef.h>
-#include <vector>
-#include <map>
-
-#if defined ZMQ_HAVE_WINDOWS
-#elif defined ZMQ_HAVE_OPENVMS
-#include <sys/types.h>
-#include <sys/time.h>
-#else
-#include <sys/select.h>
-#endif
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  Implements socket polling mechanism using POSIX.1-2001 select()
-//  function.
-
-class select_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef fd_t handle_t;
-
-    select_t (const thread_ctx_t &ctx_);
-    ~select_t () ZMQ_FINAL;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    //  Internal state.
-    struct fds_set_t
-    {
-        fds_set_t ();
-        fds_set_t (const fds_set_t &other_);
-        fds_set_t &operator= (const fds_set_t &other_);
-        //  Convenience method to descriptor from all sets.
-        void remove_fd (const fd_t &fd_);
-
-        fd_set read;
-        fd_set write;
-        fd_set error;
-    };
-
-    struct fd_entry_t
-    {
-        fd_t fd;
-        zmq::i_poll_events *events;
-    };
-    typedef std::vector<fd_entry_t> fd_entries_t;
-
-    void trigger_events (const fd_entries_t &fd_entries_,
-                         const fds_set_t &local_fds_set_,
-                         int event_count_);
-
-    struct family_entry_t
-    {
-        family_entry_t ();
-
-        fd_entries_t fd_entries;
-        fds_set_t fds_set;
-        bool has_retired;
-    };
-
-    void select_family_entry (family_entry_t &family_entry_,
-                              int max_fd_,
-                              bool use_timeout_,
-                              struct timeval &tv_);
-
-#if defined ZMQ_HAVE_WINDOWS
-    typedef std::map<u_short, family_entry_t> family_entries_t;
-
-    struct wsa_events_t
-    {
-        wsa_events_t ();
-        ~wsa_events_t ();
-
-        //  read, write, error and readwrite
-        WSAEVENT events[4];
-    };
-
-    family_entries_t _family_entries;
-    // See loop for details.
-    family_entries_t::iterator _current_family_entry_it;
-
-    int try_retire_fd_entry (family_entries_t::iterator family_entry_it_,
-                             zmq::fd_t &handle_);
-
-    static const size_t fd_family_cache_size = 8;
-    std::pair<fd_t, u_short> _fd_family_cache[fd_family_cache_size];
-
-    u_short get_fd_family (fd_t fd_);
-
-    //  Socket's family or AF_UNSPEC on error.
-    static u_short determine_fd_family (fd_t fd_);
-#else
-    //  on non-Windows, we can treat all fds as one family
-    family_entry_t _family_entry;
-    fd_t _max_fd;
-#endif
-
-    void cleanup_retired ();
-    bool cleanup_retired (family_entry_t &family_entry_);
-
-    //  Checks if an fd_entry_t is retired.
-    static bool is_retired_fd (const fd_entry_t &entry_);
-
-    static fd_entries_t::iterator
-    find_fd_entry_by_handle (fd_entries_t &fd_entries_, handle_t handle_);
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (select_t)
-};
-
-typedef select_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/src/server.cpp b/src/server.cpp
deleted file mode 100644
index 6f0cf2692..000000000
--- a/src/server.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "server.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::server_t::server_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true),
-    _next_routing_id (generate_random ())
-{
-    options.type = ZMQ_SERVER;
-    options.can_send_hello_msg = true;
-    options.can_recv_disconnect_msg = true;
-}
-
-zmq::server_t::~server_t ()
-{
-    zmq_assert (_out_pipes.empty ());
-}
-
-void zmq::server_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    uint32_t routing_id = _next_routing_id++;
-    if (!routing_id)
-        routing_id = _next_routing_id++; //  Never use Routing ID zero
-
-    pipe_->set_server_socket_routing_id (routing_id);
-    //  Add the record into output pipes lookup table
-    outpipe_t outpipe = {pipe_, true};
-    const bool ok =
-      _out_pipes.ZMQ_MAP_INSERT_OR_EMPLACE (routing_id, outpipe).second;
-    zmq_assert (ok);
-
-    _fq.attach (pipe_);
-}
-
-void zmq::server_t::xpipe_terminated (pipe_t *pipe_)
-{
-    const out_pipes_t::iterator it =
-      _out_pipes.find (pipe_->get_server_socket_routing_id ());
-    zmq_assert (it != _out_pipes.end ());
-    _out_pipes.erase (it);
-    _fq.pipe_terminated (pipe_);
-}
-
-void zmq::server_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::server_t::xwrite_activated (pipe_t *pipe_)
-{
-    const out_pipes_t::iterator end = _out_pipes.end ();
-    out_pipes_t::iterator it;
-    for (it = _out_pipes.begin (); it != end; ++it)
-        if (it->second.pipe == pipe_)
-            break;
-
-    zmq_assert (it != _out_pipes.end ());
-    zmq_assert (!it->second.active);
-    it->second.active = true;
-}
-
-int zmq::server_t::xsend (msg_t *msg_)
-{
-    //  SERVER sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-    //  Find the pipe associated with the routing stored in the message.
-    const uint32_t routing_id = msg_->get_routing_id ();
-    out_pipes_t::iterator it = _out_pipes.find (routing_id);
-
-    if (it != _out_pipes.end ()) {
-        if (!it->second.pipe->check_write ()) {
-            it->second.active = false;
-            errno = EAGAIN;
-            return -1;
-        }
-    } else {
-        errno = EHOSTUNREACH;
-        return -1;
-    }
-
-    //  Message might be delivered over inproc, so we reset routing id
-    int rc = msg_->reset_routing_id ();
-    errno_assert (rc == 0);
-
-    const bool ok = it->second.pipe->write (msg_);
-    if (unlikely (!ok)) {
-        // Message failed to send - we must close it ourselves.
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-    } else
-        it->second.pipe->flush ();
-
-    //  Detach the message from the data buffer.
-    rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::server_t::xrecv (msg_t *msg_)
-{
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (msg_, &pipe);
-
-    // Drop any messages with more flag
-    while (rc == 0 && msg_->flags () & msg_t::more) {
-        // drop all frames of the current multi-frame message
-        rc = _fq.recvpipe (msg_, NULL);
-
-        while (rc == 0 && msg_->flags () & msg_t::more)
-            rc = _fq.recvpipe (msg_, NULL);
-
-        // get the new message
-        if (rc == 0)
-            rc = _fq.recvpipe (msg_, &pipe);
-    }
-
-    if (rc != 0)
-        return rc;
-
-    zmq_assert (pipe != NULL);
-
-    const uint32_t routing_id = pipe->get_server_socket_routing_id ();
-    msg_->set_routing_id (routing_id);
-
-    return 0;
-}
-
-bool zmq::server_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
-
-bool zmq::server_t::xhas_out ()
-{
-    //  In theory, SERVER socket is always ready for writing. Whether actual
-    //  attempt to write succeeds depends on which pipe the message is going
-    //  to be routed to.
-    return true;
-}
diff --git a/src/server.hpp b/src/server.hpp
deleted file mode 100644
index cef1e4d26..000000000
--- a/src/server.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SERVER_HPP_INCLUDED__
-#define __ZMQ_SERVER_HPP_INCLUDED__
-
-#include <map>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "stdint.hpp"
-#include "blob.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-
-//  TODO: This class uses O(n) scheduling. Rewrite it to use O(1) algorithm.
-class server_t : public socket_base_t
-{
-  public:
-    server_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~server_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    struct outpipe_t
-    {
-        zmq::pipe_t *pipe;
-        bool active;
-    };
-
-    //  Outbound pipes indexed by the peer IDs.
-    typedef std::map<uint32_t, outpipe_t> out_pipes_t;
-    out_pipes_t _out_pipes;
-
-    //  Routing IDs are generated. It's a simple increment and wrap-over
-    //  algorithm. This value is the next ID to use (if not used already).
-    uint32_t _next_routing_id;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (server_t)
-};
-}
-
-#endif
diff --git a/src/session_base.cpp b/src/session_base.cpp
deleted file mode 100644
index c63185edc..000000000
--- a/src/session_base.cpp
+++ /dev/null
@@ -1,810 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "session_base.hpp"
-#include "i_engine.hpp"
-#include "err.hpp"
-#include "pipe.hpp"
-#include "likely.hpp"
-#include "tcp_connecter.hpp"
-#include "ws_connecter.hpp"
-#include "ipc_connecter.hpp"
-#include "tipc_connecter.hpp"
-#include "socks_connecter.hpp"
-#include "vmci_connecter.hpp"
-#include "pgm_sender.hpp"
-#include "pgm_receiver.hpp"
-#include "address.hpp"
-#include "norm_engine.hpp"
-#include "udp_engine.hpp"
-
-#include "ctx.hpp"
-#include "req.hpp"
-#include "radio.hpp"
-#include "dish.hpp"
-
-zmq::session_base_t *zmq::session_base_t::create (class io_thread_t *io_thread_,
-                                                  bool active_,
-                                                  class socket_base_t *socket_,
-                                                  const options_t &options_,
-                                                  address_t *addr_)
-{
-    session_base_t *s = NULL;
-    switch (options_.type) {
-        case ZMQ_REQ:
-            s = new (std::nothrow)
-              req_session_t (io_thread_, active_, socket_, options_, addr_);
-            break;
-        case ZMQ_RADIO:
-            s = new (std::nothrow)
-              radio_session_t (io_thread_, active_, socket_, options_, addr_);
-            break;
-        case ZMQ_DISH:
-            s = new (std::nothrow)
-              dish_session_t (io_thread_, active_, socket_, options_, addr_);
-            break;
-        case ZMQ_DEALER:
-        case ZMQ_REP:
-        case ZMQ_ROUTER:
-        case ZMQ_PUB:
-        case ZMQ_XPUB:
-        case ZMQ_SUB:
-        case ZMQ_XSUB:
-        case ZMQ_PUSH:
-        case ZMQ_PULL:
-        case ZMQ_PAIR:
-        case ZMQ_STREAM:
-        case ZMQ_SERVER:
-        case ZMQ_CLIENT:
-        case ZMQ_GATHER:
-        case ZMQ_SCATTER:
-        case ZMQ_DGRAM:
-        case ZMQ_PEER:
-        case ZMQ_CHANNEL:
-#ifdef ZMQ_BUILD_DRAFT_API
-            if (options_.can_send_hello_msg && options_.hello_msg.size () > 0)
-                s = new (std::nothrow) hello_msg_session_t (
-                  io_thread_, active_, socket_, options_, addr_);
-            else
-                s = new (std::nothrow) session_base_t (
-                  io_thread_, active_, socket_, options_, addr_);
-
-            break;
-#else
-            s = new (std::nothrow)
-              session_base_t (io_thread_, active_, socket_, options_, addr_);
-            break;
-#endif
-
-        default:
-            errno = EINVAL;
-            return NULL;
-    }
-    alloc_assert (s);
-    return s;
-}
-
-zmq::session_base_t::session_base_t (class io_thread_t *io_thread_,
-                                     bool active_,
-                                     class socket_base_t *socket_,
-                                     const options_t &options_,
-                                     address_t *addr_) :
-    own_t (io_thread_, options_),
-    io_object_t (io_thread_),
-    _active (active_),
-    _pipe (NULL),
-    _zap_pipe (NULL),
-    _incomplete_in (false),
-    _pending (false),
-    _engine (NULL),
-    _socket (socket_),
-    _io_thread (io_thread_),
-    _has_linger_timer (false),
-    _addr (addr_)
-#ifdef ZMQ_HAVE_WSS
-    ,
-    _wss_hostname (options_.wss_hostname)
-#endif
-{
-}
-
-const zmq::endpoint_uri_pair_t &zmq::session_base_t::get_endpoint () const
-{
-    return _engine->get_endpoint ();
-}
-
-zmq::session_base_t::~session_base_t ()
-{
-    zmq_assert (!_pipe);
-    zmq_assert (!_zap_pipe);
-
-    //  If there's still a pending linger timer, remove it.
-    if (_has_linger_timer) {
-        cancel_timer (linger_timer_id);
-        _has_linger_timer = false;
-    }
-
-    //  Close the engine.
-    if (_engine)
-        _engine->terminate ();
-
-    LIBZMQ_DELETE (_addr);
-}
-
-void zmq::session_base_t::attach_pipe (pipe_t *pipe_)
-{
-    zmq_assert (!is_terminating ());
-    zmq_assert (!_pipe);
-    zmq_assert (pipe_);
-    _pipe = pipe_;
-    _pipe->set_event_sink (this);
-}
-
-int zmq::session_base_t::pull_msg (msg_t *msg_)
-{
-    if (!_pipe || !_pipe->read (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    _incomplete_in = (msg_->flags () & msg_t::more) != 0;
-
-    return 0;
-}
-
-int zmq::session_base_t::push_msg (msg_t *msg_)
-{
-    //  pass subscribe/cancel to the sockets
-    if ((msg_->flags () & msg_t::command) && !msg_->is_subscribe ()
-        && !msg_->is_cancel ())
-        return 0;
-    if (_pipe && _pipe->write (msg_)) {
-        const int rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-
-    errno = EAGAIN;
-    return -1;
-}
-
-int zmq::session_base_t::read_zap_msg (msg_t *msg_)
-{
-    if (_zap_pipe == NULL) {
-        errno = ENOTCONN;
-        return -1;
-    }
-
-    if (!_zap_pipe->read (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::session_base_t::write_zap_msg (msg_t *msg_)
-{
-    if (_zap_pipe == NULL || !_zap_pipe->write (msg_)) {
-        errno = ENOTCONN;
-        return -1;
-    }
-
-    if ((msg_->flags () & msg_t::more) == 0)
-        _zap_pipe->flush ();
-
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-    return 0;
-}
-
-void zmq::session_base_t::reset ()
-{
-}
-
-void zmq::session_base_t::flush ()
-{
-    if (_pipe)
-        _pipe->flush ();
-}
-
-void zmq::session_base_t::rollback ()
-{
-    if (_pipe)
-        _pipe->rollback ();
-}
-
-void zmq::session_base_t::clean_pipes ()
-{
-    zmq_assert (_pipe != NULL);
-
-    //  Get rid of half-processed messages in the out pipe. Flush any
-    //  unflushed messages upstream.
-    _pipe->rollback ();
-    _pipe->flush ();
-
-    //  Remove any half-read message from the in pipe.
-    while (_incomplete_in) {
-        msg_t msg;
-        int rc = msg.init ();
-        errno_assert (rc == 0);
-        rc = pull_msg (&msg);
-        errno_assert (rc == 0);
-        rc = msg.close ();
-        errno_assert (rc == 0);
-    }
-}
-
-void zmq::session_base_t::pipe_terminated (pipe_t *pipe_)
-{
-    // Drop the reference to the deallocated pipe if required.
-    zmq_assert (pipe_ == _pipe || pipe_ == _zap_pipe
-                || _terminating_pipes.count (pipe_) == 1);
-
-    if (pipe_ == _pipe) {
-        // If this is our current pipe, remove it
-        _pipe = NULL;
-        if (_has_linger_timer) {
-            cancel_timer (linger_timer_id);
-            _has_linger_timer = false;
-        }
-    } else if (pipe_ == _zap_pipe)
-        _zap_pipe = NULL;
-    else
-        // Remove the pipe from the detached pipes set
-        _terminating_pipes.erase (pipe_);
-
-    if (!is_terminating () && options.raw_socket) {
-        if (_engine) {
-            _engine->terminate ();
-            _engine = NULL;
-        }
-        terminate ();
-    }
-
-    //  If we are waiting for pending messages to be sent, at this point
-    //  we are sure that there will be no more messages and we can proceed
-    //  with termination safely.
-    if (_pending && !_pipe && !_zap_pipe && _terminating_pipes.empty ()) {
-        _pending = false;
-        own_t::process_term (0);
-    }
-}
-
-void zmq::session_base_t::read_activated (pipe_t *pipe_)
-{
-    // Skip activating if we're detaching this pipe
-    if (unlikely (pipe_ != _pipe && pipe_ != _zap_pipe)) {
-        zmq_assert (_terminating_pipes.count (pipe_) == 1);
-        return;
-    }
-
-    if (unlikely (_engine == NULL)) {
-        _pipe->check_read ();
-        return;
-    }
-
-    if (likely (pipe_ == _pipe))
-        _engine->restart_output ();
-    else {
-        // i.e. pipe_ == zap_pipe
-        _engine->zap_msg_available ();
-    }
-}
-
-void zmq::session_base_t::write_activated (pipe_t *pipe_)
-{
-    // Skip activating if we're detaching this pipe
-    if (_pipe != pipe_) {
-        zmq_assert (_terminating_pipes.count (pipe_) == 1);
-        return;
-    }
-
-    if (_engine)
-        _engine->restart_input ();
-}
-
-void zmq::session_base_t::hiccuped (pipe_t *)
-{
-    //  Hiccups are always sent from session to socket, not the other
-    //  way round.
-    zmq_assert (false);
-}
-
-zmq::socket_base_t *zmq::session_base_t::get_socket () const
-{
-    return _socket;
-}
-
-void zmq::session_base_t::process_plug ()
-{
-    if (_active)
-        start_connecting (false);
-}
-
-//  This functions can return 0 on success or -1 and errno=ECONNREFUSED if ZAP
-//  is not setup (IE: inproc://zeromq.zap.01 does not exist in the same context)
-//  or it aborts on any other error. In other words, either ZAP is not
-//  configured or if it is configured it MUST be configured correctly and it
-//  MUST work, otherwise authentication cannot be guaranteed and it would be a
-//  security flaw.
-int zmq::session_base_t::zap_connect ()
-{
-    if (_zap_pipe != NULL)
-        return 0;
-
-    endpoint_t peer = find_endpoint ("inproc://zeromq.zap.01");
-    if (peer.socket == NULL) {
-        errno = ECONNREFUSED;
-        return -1;
-    }
-    zmq_assert (peer.options.type == ZMQ_REP || peer.options.type == ZMQ_ROUTER
-                || peer.options.type == ZMQ_SERVER);
-
-    //  Create a bi-directional pipe that will connect
-    //  session with zap socket.
-    object_t *parents[2] = {this, peer.socket};
-    pipe_t *new_pipes[2] = {NULL, NULL};
-    int hwms[2] = {0, 0};
-    bool conflates[2] = {false, false};
-    int rc = pipepair (parents, new_pipes, hwms, conflates);
-    errno_assert (rc == 0);
-
-    //  Attach local end of the pipe to this socket object.
-    _zap_pipe = new_pipes[0];
-    _zap_pipe->set_nodelay ();
-    _zap_pipe->set_event_sink (this);
-
-    send_bind (peer.socket, new_pipes[1], false);
-
-    //  Send empty routing id if required by the peer.
-    if (peer.options.recv_routing_id) {
-        msg_t id;
-        rc = id.init ();
-        errno_assert (rc == 0);
-        id.set_flags (msg_t::routing_id);
-        bool ok = _zap_pipe->write (&id);
-        zmq_assert (ok);
-        _zap_pipe->flush ();
-    }
-
-    return 0;
-}
-
-bool zmq::session_base_t::zap_enabled () const
-{
-    return (options.mechanism != ZMQ_NULL || !options.zap_domain.empty ());
-}
-
-void zmq::session_base_t::process_attach (i_engine *engine_)
-{
-    zmq_assert (engine_ != NULL);
-    zmq_assert (!_engine);
-    _engine = engine_;
-
-    if (!engine_->has_handshake_stage ())
-        engine_ready ();
-
-    //  Plug in the engine.
-    _engine->plug (_io_thread, this);
-}
-
-void zmq::session_base_t::engine_ready ()
-{
-    //  Create the pipe if it does not exist yet.
-    if (!_pipe && !is_terminating ()) {
-        object_t *parents[2] = {this, _socket};
-        pipe_t *pipes[2] = {NULL, NULL};
-
-        const bool conflate = get_effective_conflate_option (options);
-
-        int hwms[2] = {conflate ? -1 : options.rcvhwm,
-                       conflate ? -1 : options.sndhwm};
-        bool conflates[2] = {conflate, conflate};
-        const int rc = pipepair (parents, pipes, hwms, conflates);
-        errno_assert (rc == 0);
-
-        //  Plug the local end of the pipe.
-        pipes[0]->set_event_sink (this);
-
-        //  Remember the local end of the pipe.
-        zmq_assert (!_pipe);
-        _pipe = pipes[0];
-
-        //  The endpoints strings are not set on bind, set them here so that
-        //  events can use them.
-        pipes[0]->set_endpoint_pair (_engine->get_endpoint ());
-        pipes[1]->set_endpoint_pair (_engine->get_endpoint ());
-
-        //  Ask socket to plug into the remote end of the pipe.
-        send_bind (_socket, pipes[1]);
-    }
-}
-
-void zmq::session_base_t::engine_error (bool handshaked_,
-                                        zmq::i_engine::error_reason_t reason_)
-{
-    //  Engine is dead. Let's forget about it.
-    _engine = NULL;
-
-    //  Remove any half-done messages from the pipes.
-    if (_pipe) {
-        clean_pipes ();
-
-#ifdef ZMQ_BUILD_DRAFT_API
-        //  Only send disconnect message if socket was accepted and handshake was completed
-        if (!_active && handshaked_ && options.can_recv_disconnect_msg
-            && !options.disconnect_msg.empty ()) {
-            _pipe->set_disconnect_msg (options.disconnect_msg);
-            _pipe->send_disconnect_msg ();
-        }
-#endif
-    }
-
-    zmq_assert (reason_ == i_engine::connection_error
-                || reason_ == i_engine::timeout_error
-                || reason_ == i_engine::protocol_error);
-
-    switch (reason_) {
-        case i_engine::timeout_error:
-            /* FALLTHROUGH */
-        case i_engine::connection_error:
-            if (_active) {
-                reconnect ();
-                break;
-            }
-            /* FALLTHROUGH */
-        case i_engine::protocol_error:
-            if (_pending) {
-                if (_pipe)
-                    _pipe->terminate (false);
-                if (_zap_pipe)
-                    _zap_pipe->terminate (false);
-            } else {
-                terminate ();
-            }
-            break;
-    }
-
-    //  Just in case there's only a delimiter in the pipe.
-    if (_pipe)
-        _pipe->check_read ();
-
-    if (_zap_pipe)
-        _zap_pipe->check_read ();
-}
-
-void zmq::session_base_t::process_term (int linger_)
-{
-    zmq_assert (!_pending);
-
-    //  If the termination of the pipe happens before the term command is
-    //  delivered there's nothing much to do. We can proceed with the
-    //  standard termination immediately.
-    if (!_pipe && !_zap_pipe && _terminating_pipes.empty ()) {
-        own_t::process_term (0);
-        return;
-    }
-
-    _pending = true;
-
-    if (_pipe != NULL) {
-        //  If there's finite linger value, delay the termination.
-        //  If linger is infinite (negative) we don't even have to set
-        //  the timer.
-        if (linger_ > 0) {
-            zmq_assert (!_has_linger_timer);
-            add_timer (linger_, linger_timer_id);
-            _has_linger_timer = true;
-        }
-
-        //  Start pipe termination process. Delay the termination till all messages
-        //  are processed in case the linger time is non-zero.
-        _pipe->terminate (linger_ != 0);
-
-        //  TODO: Should this go into pipe_t::terminate ?
-        //  In case there's no engine and there's only delimiter in the
-        //  pipe it wouldn't be ever read. Thus we check for it explicitly.
-        if (!_engine)
-            _pipe->check_read ();
-    }
-
-    if (_zap_pipe != NULL)
-        _zap_pipe->terminate (false);
-}
-
-void zmq::session_base_t::timer_event (int id_)
-{
-    //  Linger period expired. We can proceed with termination even though
-    //  there are still pending messages to be sent.
-    zmq_assert (id_ == linger_timer_id);
-    _has_linger_timer = false;
-
-    //  Ask pipe to terminate even though there may be pending messages in it.
-    zmq_assert (_pipe);
-    _pipe->terminate (false);
-}
-
-void zmq::session_base_t::process_conn_failed ()
-{
-    std::string *ep = new (std::string);
-    _addr->to_string (*ep);
-    send_term_endpoint (_socket, ep);
-}
-
-void zmq::session_base_t::reconnect ()
-{
-    //  For delayed connect situations, terminate the pipe
-    //  and reestablish later on
-    if (_pipe && options.immediate == 1
-#ifdef ZMQ_HAVE_OPENPGM
-        && _addr->protocol != protocol_name::pgm
-        && _addr->protocol != protocol_name::epgm
-#endif
-#ifdef ZMQ_HAVE_NORM
-        && _addr->protocol != protocol_name::norm
-#endif
-        && _addr->protocol != protocol_name::udp) {
-        _pipe->hiccup ();
-        _pipe->terminate (false);
-        _terminating_pipes.insert (_pipe);
-        _pipe = NULL;
-
-        if (_has_linger_timer) {
-            cancel_timer (linger_timer_id);
-            _has_linger_timer = false;
-        }
-    }
-
-    reset ();
-
-    //  Reconnect.
-    if (options.reconnect_ivl != -1)
-        start_connecting (true);
-    else {
-        std::string *ep = new (std::string);
-        _addr->to_string (*ep);
-        send_term_endpoint (_socket, ep);
-    }
-
-    //  For subscriber sockets we hiccup the inbound pipe, which will cause
-    //  the socket object to resend all the subscriptions.
-    if (_pipe
-        && (options.type == ZMQ_SUB || options.type == ZMQ_XSUB
-            || options.type == ZMQ_DISH))
-        _pipe->hiccup ();
-}
-
-void zmq::session_base_t::start_connecting (bool wait_)
-{
-    zmq_assert (_active);
-
-    //  Choose I/O thread to run connecter in. Given that we are already
-    //  running in an I/O thread, there must be at least one available.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    zmq_assert (io_thread);
-
-    //  Create the connecter object.
-    own_t *connecter = NULL;
-    if (_addr->protocol == protocol_name::tcp) {
-        if (!options.socks_proxy_address.empty ()) {
-            address_t *proxy_address = new (std::nothrow)
-              address_t (protocol_name::tcp, options.socks_proxy_address,
-                         this->get_ctx ());
-            alloc_assert (proxy_address);
-            connecter = new (std::nothrow) socks_connecter_t (
-              io_thread, this, options, _addr, proxy_address, wait_);
-            alloc_assert (connecter);
-            if (!options.socks_proxy_username.empty ()) {
-                reinterpret_cast<socks_connecter_t *> (connecter)
-                  ->set_auth_method_basic (options.socks_proxy_username,
-                                           options.socks_proxy_password);
-            }
-        } else {
-            connecter = new (std::nothrow)
-              tcp_connecter_t (io_thread, this, options, _addr, wait_);
-        }
-    }
-#if defined ZMQ_HAVE_IPC
-    else if (_addr->protocol == protocol_name::ipc) {
-        connecter = new (std::nothrow)
-          ipc_connecter_t (io_thread, this, options, _addr, wait_);
-    }
-#endif
-#if defined ZMQ_HAVE_TIPC
-    else if (_addr->protocol == protocol_name::tipc) {
-        connecter = new (std::nothrow)
-          tipc_connecter_t (io_thread, this, options, _addr, wait_);
-    }
-#endif
-#if defined ZMQ_HAVE_VMCI
-    else if (_addr->protocol == protocol_name::vmci) {
-        connecter = new (std::nothrow)
-          vmci_connecter_t (io_thread, this, options, _addr, wait_);
-    }
-#endif
-#if defined ZMQ_HAVE_WS
-    else if (_addr->protocol == protocol_name::ws) {
-        connecter = new (std::nothrow) ws_connecter_t (
-          io_thread, this, options, _addr, wait_, false, std::string ());
-    }
-#endif
-#if defined ZMQ_HAVE_WSS
-    else if (_addr->protocol == protocol_name::wss) {
-        connecter = new (std::nothrow) ws_connecter_t (
-          io_thread, this, options, _addr, wait_, true, _wss_hostname);
-    }
-#endif
-    if (connecter != NULL) {
-        alloc_assert (connecter);
-        launch_child (connecter);
-        return;
-    }
-
-    if (_addr->protocol == protocol_name::udp) {
-        zmq_assert (options.type == ZMQ_DISH || options.type == ZMQ_RADIO
-                    || options.type == ZMQ_DGRAM);
-
-        udp_engine_t *engine = new (std::nothrow) udp_engine_t (options);
-        alloc_assert (engine);
-
-        bool recv = false;
-        bool send = false;
-
-        if (options.type == ZMQ_RADIO) {
-            send = true;
-            recv = false;
-        } else if (options.type == ZMQ_DISH) {
-            send = false;
-            recv = true;
-        } else if (options.type == ZMQ_DGRAM) {
-            send = true;
-            recv = true;
-        }
-
-        int rc = engine->init (_addr, send, recv);
-        errno_assert (rc == 0);
-
-        send_attach (this, engine);
-
-        return;
-    }
-
-#ifdef ZMQ_HAVE_OPENPGM
-
-    //  Both PGM and EPGM transports are using the same infrastructure.
-    if (_addr->protocol == "pgm" || _addr->protocol == "epgm") {
-        zmq_assert (options.type == ZMQ_PUB || options.type == ZMQ_XPUB
-                    || options.type == ZMQ_SUB || options.type == ZMQ_XSUB);
-
-        //  For EPGM transport with UDP encapsulation of PGM is used.
-        bool const udp_encapsulation = _addr->protocol == "epgm";
-
-        //  At this point we'll create message pipes to the session straight
-        //  away. There's no point in delaying it as no concept of 'connect'
-        //  exists with PGM anyway.
-        if (options.type == ZMQ_PUB || options.type == ZMQ_XPUB) {
-            //  PGM sender.
-            pgm_sender_t *pgm_sender =
-              new (std::nothrow) pgm_sender_t (io_thread, options);
-            alloc_assert (pgm_sender);
-
-            int rc =
-              pgm_sender->init (udp_encapsulation, _addr->address.c_str ());
-            errno_assert (rc == 0);
-
-            send_attach (this, pgm_sender);
-        } else {
-            //  PGM receiver.
-            pgm_receiver_t *pgm_receiver =
-              new (std::nothrow) pgm_receiver_t (io_thread, options);
-            alloc_assert (pgm_receiver);
-
-            int rc =
-              pgm_receiver->init (udp_encapsulation, _addr->address.c_str ());
-            errno_assert (rc == 0);
-
-            send_attach (this, pgm_receiver);
-        }
-
-        return;
-    }
-#endif
-
-#ifdef ZMQ_HAVE_NORM
-    if (_addr->protocol == "norm") {
-        //  At this point we'll create message pipes to the session straight
-        //  away. There's no point in delaying it as no concept of 'connect'
-        //  exists with NORM anyway.
-        if (options.type == ZMQ_PUB || options.type == ZMQ_XPUB) {
-            //  NORM sender.
-            norm_engine_t *norm_sender =
-              new (std::nothrow) norm_engine_t (io_thread, options);
-            alloc_assert (norm_sender);
-
-            int rc = norm_sender->init (_addr->address.c_str (), true, false);
-            errno_assert (rc == 0);
-
-            send_attach (this, norm_sender);
-        } else { // ZMQ_SUB or ZMQ_XSUB
-
-            //  NORM receiver.
-            norm_engine_t *norm_receiver =
-              new (std::nothrow) norm_engine_t (io_thread, options);
-            alloc_assert (norm_receiver);
-
-            int rc = norm_receiver->init (_addr->address.c_str (), false, true);
-            errno_assert (rc == 0);
-
-            send_attach (this, norm_receiver);
-        }
-        return;
-    }
-#endif // ZMQ_HAVE_NORM
-
-    zmq_assert (false);
-}
-
-zmq::hello_msg_session_t::hello_msg_session_t (io_thread_t *io_thread_,
-                                               bool connect_,
-                                               socket_base_t *socket_,
-                                               const options_t &options_,
-                                               address_t *addr_) :
-    session_base_t (io_thread_, connect_, socket_, options_, addr_),
-    _new_pipe (true)
-{
-}
-
-zmq::hello_msg_session_t::~hello_msg_session_t ()
-{
-}
-
-
-int zmq::hello_msg_session_t::pull_msg (msg_t *msg_)
-{
-    if (_new_pipe) {
-        _new_pipe = false;
-
-        const int rc =
-          msg_->init_buffer (&options.hello_msg[0], options.hello_msg.size ());
-        errno_assert (rc == 0);
-
-        return 0;
-    }
-
-    return session_base_t::pull_msg (msg_);
-}
-
-void zmq::hello_msg_session_t::reset ()
-{
-    session_base_t::reset ();
-    _new_pipe = true;
-}
diff --git a/src/session_base.hpp b/src/session_base.hpp
deleted file mode 100644
index c2e6d0985..000000000
--- a/src/session_base.hpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SESSION_BASE_HPP_INCLUDED__
-#define __ZMQ_SESSION_BASE_HPP_INCLUDED__
-
-#include <stdarg.h>
-
-#include "own.hpp"
-#include "io_object.hpp"
-#include "pipe.hpp"
-#include "socket_base.hpp"
-#include "i_engine.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-struct i_engine;
-struct address_t;
-
-class session_base_t : public own_t, public io_object_t, public i_pipe_events
-{
-  public:
-    //  Create a session of the particular type.
-    static session_base_t *create (zmq::io_thread_t *io_thread_,
-                                   bool active_,
-                                   zmq::socket_base_t *socket_,
-                                   const options_t &options_,
-                                   address_t *addr_);
-
-    //  To be used once only, when creating the session.
-    void attach_pipe (zmq::pipe_t *pipe_);
-
-    //  Following functions are the interface exposed towards the engine.
-    virtual void reset ();
-    void flush ();
-    void rollback ();
-    void engine_error (bool handshaked_, zmq::i_engine::error_reason_t reason_);
-    void engine_ready ();
-
-    //  i_pipe_events interface implementation.
-    void read_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void write_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void hiccuped (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void pipe_terminated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-
-    //  Delivers a message. Returns 0 if successful; -1 otherwise.
-    //  The function takes ownership of the message.
-    virtual int push_msg (msg_t *msg_);
-
-    int zap_connect ();
-    bool zap_enabled () const;
-
-    //  Fetches a message. Returns 0 if successful; -1 otherwise.
-    //  The caller is responsible for freeing the message when no
-    //  longer used.
-    virtual int pull_msg (msg_t *msg_);
-
-    //  Receives message from ZAP socket.
-    //  Returns 0 on success; -1 otherwise.
-    //  The caller is responsible for freeing the message.
-    int read_zap_msg (msg_t *msg_);
-
-    //  Sends message to ZAP socket.
-    //  Returns 0 on success; -1 otherwise.
-    //  The function takes ownership of the message.
-    int write_zap_msg (msg_t *msg_);
-
-    socket_base_t *get_socket () const;
-    const endpoint_uri_pair_t &get_endpoint () const;
-
-  protected:
-    session_base_t (zmq::io_thread_t *io_thread_,
-                    bool active_,
-                    zmq::socket_base_t *socket_,
-                    const options_t &options_,
-                    address_t *addr_);
-    ~session_base_t () ZMQ_OVERRIDE;
-
-  private:
-    void start_connecting (bool wait_);
-
-    void reconnect ();
-
-    //  Handlers for incoming commands.
-    void process_plug () ZMQ_FINAL;
-    void process_attach (zmq::i_engine *engine_) ZMQ_FINAL;
-    void process_term (int linger_) ZMQ_FINAL;
-    void process_conn_failed ();
-
-    //  i_poll_events handlers.
-    void timer_event (int id_) ZMQ_FINAL;
-
-    //  Remove any half processed messages. Flush unflushed messages.
-    //  Call this function when engine disconnect to get rid of leftovers.
-    void clean_pipes ();
-
-    //  If true, this session (re)connects to the peer. Otherwise, it's
-    //  a transient session created by the listener.
-    const bool _active;
-
-    //  Pipe connecting the session to its socket.
-    zmq::pipe_t *_pipe;
-
-    //  Pipe used to exchange messages with ZAP socket.
-    zmq::pipe_t *_zap_pipe;
-
-    //  This set is added to with pipes we are disconnecting, but haven't yet completed
-    std::set<pipe_t *> _terminating_pipes;
-
-    //  This flag is true if the remainder of the message being processed
-    //  is still in the in pipe.
-    bool _incomplete_in;
-
-    //  True if termination have been suspended to push the pending
-    //  messages to the network.
-    bool _pending;
-
-    //  The protocol I/O engine connected to the session.
-    zmq::i_engine *_engine;
-
-    //  The socket the session belongs to.
-    zmq::socket_base_t *_socket;
-
-    //  I/O thread the session is living in. It will be used to plug in
-    //  the engines into the same thread.
-    zmq::io_thread_t *_io_thread;
-
-    //  ID of the linger timer
-    enum
-    {
-        linger_timer_id = 0x20
-    };
-
-    //  True is linger timer is running.
-    bool _has_linger_timer;
-
-    //  Protocol and address to use when connecting.
-    address_t *_addr;
-
-#ifdef ZMQ_HAVE_WSS
-    //  TLS handshake, we need to take a copy when the session is created,
-    //  in order to maintain the value at the creation time
-    const std::string _wss_hostname;
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (session_base_t)
-};
-
-class hello_msg_session_t ZMQ_FINAL : public session_base_t
-{
-  public:
-    hello_msg_session_t (zmq::io_thread_t *io_thread_,
-                         bool connect_,
-                         zmq::socket_base_t *socket_,
-                         const options_t &options_,
-                         address_t *addr_);
-    ~hello_msg_session_t ();
-
-    //  Overrides of the functions from session_base_t.
-    int pull_msg (msg_t *msg_);
-    void reset ();
-
-  private:
-    bool _new_pipe;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (hello_msg_session_t)
-};
-}
-
-#endif
diff --git a/src/signaler.cpp b/src/signaler.cpp
deleted file mode 100644
index 93fb248e1..000000000
--- a/src/signaler.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "poller.hpp"
-#include "polling_util.hpp"
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_AIX
-#include <poll.h>
-#endif
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-#if defined ZMQ_HAVE_WINDOWS
-#elif defined ZMQ_HAVE_HPUX
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#elif defined ZMQ_HAVE_OPENVMS
-#include <sys/types.h>
-#include <sys/time.h>
-#elif defined ZMQ_HAVE_VXWORKS
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sockLib.h>
-#include <strings.h>
-#else
-#include <sys/select.h>
-#endif
-#endif
-
-#include "signaler.hpp"
-#include "likely.hpp"
-#include "stdint.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "fd.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <netinet/tcp.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif
-
-#if !defined(ZMQ_HAVE_WINDOWS)
-// Helper to sleep for specific number of milliseconds (or until signal)
-//
-static int sleep_ms (unsigned int ms_)
-{
-    if (ms_ == 0)
-        return 0;
-#if defined ZMQ_HAVE_ANDROID
-    usleep (ms_ * 1000);
-    return 0;
-#elif defined ZMQ_HAVE_VXWORKS
-    struct timespec ns_;
-    ns_.tv_sec = ms_ / 1000;
-    ns_.tv_nsec = ms_ % 1000 * 1000000;
-    return nanosleep (&ns_, 0);
-#else
-    return usleep (ms_ * 1000);
-#endif
-}
-
-// Helper to wait on close(), for non-blocking sockets, until it completes
-// If EAGAIN is received, will sleep briefly (1-100ms) then try again, until
-// the overall timeout is reached.
-//
-static int close_wait_ms (int fd_, unsigned int max_ms_ = 2000)
-{
-    unsigned int ms_so_far = 0;
-    const unsigned int min_step_ms = 1;
-    const unsigned int max_step_ms = 100;
-    const unsigned int step_ms =
-      std::min (std::max (min_step_ms, max_ms_ / 10), max_step_ms);
-
-    int rc = 0; // do not sleep on first attempt
-    do {
-        if (rc == -1 && errno == EAGAIN) {
-            sleep_ms (step_ms);
-            ms_so_far += step_ms;
-        }
-        rc = close (fd_);
-    } while (ms_so_far < max_ms_ && rc == -1 && errno == EAGAIN);
-
-    return rc;
-}
-#endif
-
-zmq::signaler_t::signaler_t ()
-{
-    //  Create the socketpair for signaling.
-    if (make_fdpair (&_r, &_w) == 0) {
-        unblock_socket (_w);
-        unblock_socket (_r);
-    }
-#ifdef HAVE_FORK
-    pid = getpid ();
-#endif
-}
-
-// This might get run after some part of construction failed, leaving one or
-// both of _r and _w retired_fd.
-zmq::signaler_t::~signaler_t ()
-{
-#if defined ZMQ_HAVE_EVENTFD
-    if (_r == retired_fd)
-        return;
-    int rc = close_wait_ms (_r);
-    errno_assert (rc == 0);
-#elif defined ZMQ_HAVE_WINDOWS
-    if (_w != retired_fd) {
-        const struct linger so_linger = {1, 0};
-        int rc = setsockopt (_w, SOL_SOCKET, SO_LINGER,
-                             reinterpret_cast<const char *> (&so_linger),
-                             sizeof so_linger);
-        //  Only check shutdown if WSASTARTUP was previously done
-        if (rc == 0 || WSAGetLastError () != WSANOTINITIALISED) {
-            wsa_assert (rc != SOCKET_ERROR);
-            rc = closesocket (_w);
-            wsa_assert (rc != SOCKET_ERROR);
-            if (_r == retired_fd)
-                return;
-            rc = closesocket (_r);
-            wsa_assert (rc != SOCKET_ERROR);
-        }
-    }
-#else
-    if (_w != retired_fd) {
-        int rc = close_wait_ms (_w);
-        errno_assert (rc == 0);
-    }
-    if (_r != retired_fd) {
-        int rc = close_wait_ms (_r);
-        errno_assert (rc == 0);
-    }
-#endif
-}
-
-zmq::fd_t zmq::signaler_t::get_fd () const
-{
-    return _r;
-}
-
-void zmq::signaler_t::send ()
-{
-#if defined HAVE_FORK
-    if (unlikely (pid != getpid ())) {
-        //printf("Child process %d signaler_t::send returning without sending #1\n", getpid());
-        return; // do not send anything in forked child context
-    }
-#endif
-#if defined ZMQ_HAVE_EVENTFD
-    const uint64_t inc = 1;
-    ssize_t sz = write (_w, &inc, sizeof (inc));
-    errno_assert (sz == sizeof (inc));
-#elif defined ZMQ_HAVE_WINDOWS
-    const char dummy = 0;
-    int nbytes;
-    do {
-        nbytes = ::send (_w, &dummy, sizeof (dummy), 0);
-        wsa_assert (nbytes != SOCKET_ERROR);
-        // wsa_assert does not abort on WSAEWOULDBLOCK. If we get this, we retry.
-    } while (nbytes == SOCKET_ERROR);
-    // Given the small size of dummy (should be 1) expect that send was able to send everything.
-    zmq_assert (nbytes == sizeof (dummy));
-#elif defined ZMQ_HAVE_VXWORKS
-    unsigned char dummy = 0;
-    while (true) {
-        ssize_t nbytes = ::send (_w, (char *) &dummy, sizeof (dummy), 0);
-        if (unlikely (nbytes == -1 && errno == EINTR))
-            continue;
-#if defined(HAVE_FORK)
-        if (unlikely (pid != getpid ())) {
-            //printf("Child process %d signaler_t::send returning without sending #2\n", getpid());
-            errno = EINTR;
-            break;
-        }
-#endif
-        zmq_assert (nbytes == sizeof dummy);
-        break;
-    }
-#else
-    unsigned char dummy = 0;
-    while (true) {
-        ssize_t nbytes = ::send (_w, &dummy, sizeof (dummy), 0);
-        if (unlikely (nbytes == -1 && errno == EINTR))
-            continue;
-#if defined(HAVE_FORK)
-        if (unlikely (pid != getpid ())) {
-            //printf("Child process %d signaler_t::send returning without sending #2\n", getpid());
-            errno = EINTR;
-            break;
-        }
-#endif
-        zmq_assert (nbytes == sizeof dummy);
-        break;
-    }
-#endif
-}
-
-int zmq::signaler_t::wait (int timeout_) const
-{
-#ifdef HAVE_FORK
-    if (unlikely (pid != getpid ())) {
-        // we have forked and the file descriptor is closed. Emulate an interrupt
-        // response.
-        //printf("Child process %d signaler_t::wait returning simulating interrupt #1\n", getpid());
-        errno = EINTR;
-        return -1;
-    }
-#endif
-
-#ifdef ZMQ_POLL_BASED_ON_POLL
-    struct pollfd pfd;
-    pfd.fd = _r;
-    pfd.events = POLLIN;
-    const int rc = poll (&pfd, 1, timeout_);
-    if (unlikely (rc < 0)) {
-        errno_assert (errno == EINTR);
-        return -1;
-    }
-    if (unlikely (rc == 0)) {
-        errno = EAGAIN;
-        return -1;
-    }
-#ifdef HAVE_FORK
-    if (unlikely (pid != getpid ())) {
-        // we have forked and the file descriptor is closed. Emulate an interrupt
-        // response.
-        //printf("Child process %d signaler_t::wait returning simulating interrupt #2\n", getpid());
-        errno = EINTR;
-        return -1;
-    }
-#endif
-    zmq_assert (rc == 1);
-    zmq_assert (pfd.revents & POLLIN);
-    return 0;
-
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-
-    optimized_fd_set_t fds (1);
-    FD_ZERO (fds.get ());
-    FD_SET (_r, fds.get ());
-    struct timeval timeout;
-    if (timeout_ >= 0) {
-        timeout.tv_sec = timeout_ / 1000;
-        timeout.tv_usec = timeout_ % 1000 * 1000;
-    }
-#ifdef ZMQ_HAVE_WINDOWS
-    int rc =
-      select (0, fds.get (), NULL, NULL, timeout_ >= 0 ? &timeout : NULL);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    int rc =
-      select (_r + 1, fds.get (), NULL, NULL, timeout_ >= 0 ? &timeout : NULL);
-    if (unlikely (rc < 0)) {
-        errno_assert (errno == EINTR);
-        return -1;
-    }
-#endif
-    if (unlikely (rc == 0)) {
-        errno = EAGAIN;
-        return -1;
-    }
-    zmq_assert (rc == 1);
-    return 0;
-
-#else
-#error
-#endif
-}
-
-void zmq::signaler_t::recv ()
-{
-//  Attempt to read a signal.
-#if defined ZMQ_HAVE_EVENTFD
-    uint64_t dummy;
-    ssize_t sz = read (_r, &dummy, sizeof (dummy));
-    errno_assert (sz == sizeof (dummy));
-
-    //  If we accidentally grabbed the next signal(s) along with the current
-    //  one, return it back to the eventfd object.
-    if (unlikely (dummy > 1)) {
-        const uint64_t inc = dummy - 1;
-        ssize_t sz2 = write (_w, &inc, sizeof (inc));
-        errno_assert (sz2 == sizeof (inc));
-        return;
-    }
-
-    zmq_assert (dummy == 1);
-#else
-    unsigned char dummy;
-#if defined ZMQ_HAVE_WINDOWS
-    const int nbytes =
-      ::recv (_r, reinterpret_cast<char *> (&dummy), sizeof (dummy), 0);
-    wsa_assert (nbytes != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_VXWORKS
-    ssize_t nbytes = ::recv (_r, (char *) &dummy, sizeof (dummy), 0);
-    errno_assert (nbytes >= 0);
-#else
-    ssize_t nbytes = ::recv (_r, &dummy, sizeof (dummy), 0);
-    errno_assert (nbytes >= 0);
-#endif
-    zmq_assert (nbytes == sizeof (dummy));
-    zmq_assert (dummy == 0);
-#endif
-}
-
-int zmq::signaler_t::recv_failable ()
-{
-//  Attempt to read a signal.
-#if defined ZMQ_HAVE_EVENTFD
-    uint64_t dummy;
-    ssize_t sz = read (_r, &dummy, sizeof (dummy));
-    if (sz == -1) {
-        errno_assert (errno == EAGAIN);
-        return -1;
-    }
-    errno_assert (sz == sizeof (dummy));
-
-    //  If we accidentally grabbed the next signal(s) along with the current
-    //  one, return it back to the eventfd object.
-    if (unlikely (dummy > 1)) {
-        const uint64_t inc = dummy - 1;
-        ssize_t sz2 = write (_w, &inc, sizeof (inc));
-        errno_assert (sz2 == sizeof (inc));
-        return 0;
-    }
-
-    zmq_assert (dummy == 1);
-
-#else
-    unsigned char dummy;
-#if defined ZMQ_HAVE_WINDOWS
-    const int nbytes =
-      ::recv (_r, reinterpret_cast<char *> (&dummy), sizeof (dummy), 0);
-    if (nbytes == SOCKET_ERROR) {
-        const int last_error = WSAGetLastError ();
-        if (last_error == WSAEWOULDBLOCK) {
-            errno = EAGAIN;
-            return -1;
-        }
-        wsa_assert (last_error == WSAEWOULDBLOCK);
-    }
-#elif defined ZMQ_HAVE_VXWORKS
-    ssize_t nbytes = ::recv (_r, (char *) &dummy, sizeof (dummy), 0);
-    if (nbytes == -1) {
-        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
-            errno = EAGAIN;
-            return -1;
-        }
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK
-                      || errno == EINTR);
-    }
-#else
-    ssize_t nbytes = ::recv (_r, &dummy, sizeof (dummy), 0);
-    if (nbytes == -1) {
-        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
-            errno = EAGAIN;
-            return -1;
-        }
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK
-                      || errno == EINTR);
-    }
-#endif
-    zmq_assert (nbytes == sizeof (dummy));
-    zmq_assert (dummy == 0);
-#endif
-    return 0;
-}
-
-bool zmq::signaler_t::valid () const
-{
-    return _w != retired_fd;
-}
-
-#ifdef HAVE_FORK
-void zmq::signaler_t::forked ()
-{
-    //  Close file descriptors created in the parent and create new pair
-    close (_r);
-    close (_w);
-    make_fdpair (&_r, &_w);
-}
-#endif
diff --git a/src/signaler.hpp b/src/signaler.hpp
deleted file mode 100644
index 49fac1bad..000000000
--- a/src/signaler.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SIGNALER_HPP_INCLUDED__
-#define __ZMQ_SIGNALER_HPP_INCLUDED__
-
-#ifdef HAVE_FORK
-#include <unistd.h>
-#endif
-
-#include "fd.hpp"
-#include "macros.hpp"
-
-namespace zmq
-{
-//  This is a cross-platform equivalent to signal_fd. However, as opposed
-//  to signal_fd there can be at most one signal in the signaler at any
-//  given moment. Attempt to send a signal before receiving the previous
-//  one will result in undefined behaviour.
-
-class signaler_t
-{
-  public:
-    signaler_t ();
-    ~signaler_t ();
-
-    // Returns the socket/file descriptor
-    // May return retired_fd if the signaler could not be initialized.
-    fd_t get_fd () const;
-    void send ();
-    int wait (int timeout_) const;
-    void recv ();
-    int recv_failable ();
-
-    bool valid () const;
-
-#ifdef HAVE_FORK
-    // close the file descriptors in a forked child process so that they
-    // do not interfere with the context in the parent process.
-    void forked ();
-#endif
-
-  private:
-    //  Underlying write & read file descriptor
-    //  Will be -1 if an error occurred during initialization, e.g. we
-    //  exceeded the number of available handles
-    fd_t _w;
-    fd_t _r;
-
-#ifdef HAVE_FORK
-    // the process that created this context. Used to detect forking.
-    pid_t pid;
-    // idempotent close of file descriptors that is safe to use by destructor
-    // and forked().
-    void close_internal ();
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (signaler_t)
-};
-}
-
-#endif
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
deleted file mode 100644
index e724b3f97..000000000
--- a/src/socket_base.cpp
+++ /dev/null
@@ -1,2158 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <string>
-#include <algorithm>
-#include <limits>
-
-#include "macros.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#if defined _MSC_VER
-#if defined _WIN32_WCE
-#include <cmnintrin.h>
-#else
-#include <intrin.h>
-#endif
-#endif
-#else
-#include <unistd.h>
-#include <ctype.h>
-#endif
-
-#include "socket_base.hpp"
-#include "tcp_listener.hpp"
-#include "ws_listener.hpp"
-#include "ipc_listener.hpp"
-#include "tipc_listener.hpp"
-#include "tcp_connecter.hpp"
-#ifdef ZMQ_HAVE_WS
-#include "ws_address.hpp"
-#endif
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "config.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "ctx.hpp"
-#include "likely.hpp"
-#include "msg.hpp"
-#include "address.hpp"
-#include "ipc_address.hpp"
-#include "tcp_address.hpp"
-#include "udp_address.hpp"
-#include "tipc_address.hpp"
-#include "mailbox.hpp"
-#include "mailbox_safe.hpp"
-
-#ifdef ZMQ_HAVE_WSS
-#include "wss_address.hpp"
-#endif
-#if defined ZMQ_HAVE_VMCI
-#include "vmci_address.hpp"
-#include "vmci_listener.hpp"
-#endif
-
-#ifdef ZMQ_HAVE_OPENPGM
-#include "pgm_socket.hpp"
-#endif
-
-#include "pair.hpp"
-#include "pub.hpp"
-#include "sub.hpp"
-#include "req.hpp"
-#include "rep.hpp"
-#include "pull.hpp"
-#include "push.hpp"
-#include "dealer.hpp"
-#include "router.hpp"
-#include "xpub.hpp"
-#include "xsub.hpp"
-#include "stream.hpp"
-#include "server.hpp"
-#include "client.hpp"
-#include "radio.hpp"
-#include "dish.hpp"
-#include "gather.hpp"
-#include "scatter.hpp"
-#include "dgram.hpp"
-#include "peer.hpp"
-#include "channel.hpp"
-
-void zmq::socket_base_t::inprocs_t::emplace (const char *endpoint_uri_,
-                                             pipe_t *pipe_)
-{
-    _inprocs.ZMQ_MAP_INSERT_OR_EMPLACE (std::string (endpoint_uri_), pipe_);
-}
-
-int zmq::socket_base_t::inprocs_t::erase_pipes (
-  const std::string &endpoint_uri_str_)
-{
-    const std::pair<map_t::iterator, map_t::iterator> range =
-      _inprocs.equal_range (endpoint_uri_str_);
-    if (range.first == range.second) {
-        errno = ENOENT;
-        return -1;
-    }
-
-    for (map_t::iterator it = range.first; it != range.second; ++it) {
-        it->second->send_disconnect_msg ();
-        it->second->terminate (true);
-    }
-    _inprocs.erase (range.first, range.second);
-    return 0;
-}
-
-void zmq::socket_base_t::inprocs_t::erase_pipe (const pipe_t *pipe_)
-{
-    for (map_t::iterator it = _inprocs.begin (), end = _inprocs.end ();
-         it != end; ++it)
-        if (it->second == pipe_) {
-            _inprocs.erase (it);
-            break;
-        }
-}
-
-bool zmq::socket_base_t::check_tag () const
-{
-    return _tag == 0xbaddecaf;
-}
-
-bool zmq::socket_base_t::is_thread_safe () const
-{
-    return _thread_safe;
-}
-
-zmq::socket_base_t *zmq::socket_base_t::create (int type_,
-                                                class ctx_t *parent_,
-                                                uint32_t tid_,
-                                                int sid_)
-{
-    socket_base_t *s = NULL;
-    switch (type_) {
-        case ZMQ_PAIR:
-            s = new (std::nothrow) pair_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_PUB:
-            s = new (std::nothrow) pub_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_SUB:
-            s = new (std::nothrow) sub_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_REQ:
-            s = new (std::nothrow) req_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_REP:
-            s = new (std::nothrow) rep_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_DEALER:
-            s = new (std::nothrow) dealer_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_ROUTER:
-            s = new (std::nothrow) router_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_PULL:
-            s = new (std::nothrow) pull_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_PUSH:
-            s = new (std::nothrow) push_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_XPUB:
-            s = new (std::nothrow) xpub_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_XSUB:
-            s = new (std::nothrow) xsub_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_STREAM:
-            s = new (std::nothrow) stream_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_SERVER:
-            s = new (std::nothrow) server_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_CLIENT:
-            s = new (std::nothrow) client_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_RADIO:
-            s = new (std::nothrow) radio_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_DISH:
-            s = new (std::nothrow) dish_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_GATHER:
-            s = new (std::nothrow) gather_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_SCATTER:
-            s = new (std::nothrow) scatter_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_DGRAM:
-            s = new (std::nothrow) dgram_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_PEER:
-            s = new (std::nothrow) peer_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_CHANNEL:
-            s = new (std::nothrow) channel_t (parent_, tid_, sid_);
-            break;
-        default:
-            errno = EINVAL;
-            return NULL;
-    }
-
-    alloc_assert (s);
-
-    if (s->_mailbox == NULL) {
-        s->_destroyed = true;
-        LIBZMQ_DELETE (s);
-        return NULL;
-    }
-
-    return s;
-}
-
-zmq::socket_base_t::socket_base_t (ctx_t *parent_,
-                                   uint32_t tid_,
-                                   int sid_,
-                                   bool thread_safe_) :
-    own_t (parent_, tid_),
-    _sync (),
-    _tag (0xbaddecaf),
-    _ctx_terminated (false),
-    _destroyed (false),
-    _poller (NULL),
-    _handle (static_cast<poller_t::handle_t> (NULL)),
-    _last_tsc (0),
-    _ticks (0),
-    _rcvmore (false),
-    _monitor_socket (NULL),
-    _monitor_events (0),
-    _thread_safe (thread_safe_),
-    _reaper_signaler (NULL),
-    _monitor_sync ()
-{
-    options.socket_id = sid_;
-    options.ipv6 = (parent_->get (ZMQ_IPV6) != 0);
-    options.linger.store (parent_->get (ZMQ_BLOCKY) ? -1 : 0);
-    options.zero_copy = parent_->get (ZMQ_ZERO_COPY_RECV) != 0;
-
-    if (_thread_safe) {
-        _mailbox = new (std::nothrow) mailbox_safe_t (&_sync);
-        zmq_assert (_mailbox);
-    } else {
-        mailbox_t *m = new (std::nothrow) mailbox_t ();
-        zmq_assert (m);
-
-        if (m->get_fd () != retired_fd)
-            _mailbox = m;
-        else {
-            LIBZMQ_DELETE (m);
-            _mailbox = NULL;
-        }
-    }
-}
-
-int zmq::socket_base_t::get_peer_state (const void *routing_id_,
-                                        size_t routing_id_size_) const
-{
-    LIBZMQ_UNUSED (routing_id_);
-    LIBZMQ_UNUSED (routing_id_size_);
-
-    //  Only ROUTER sockets support this
-    errno = ENOTSUP;
-    return -1;
-}
-
-zmq::socket_base_t::~socket_base_t ()
-{
-    if (_mailbox)
-        LIBZMQ_DELETE (_mailbox);
-
-    if (_reaper_signaler)
-        LIBZMQ_DELETE (_reaper_signaler);
-
-    scoped_lock_t lock (_monitor_sync);
-    stop_monitor ();
-
-    zmq_assert (_destroyed);
-}
-
-zmq::i_mailbox *zmq::socket_base_t::get_mailbox () const
-{
-    return _mailbox;
-}
-
-void zmq::socket_base_t::stop ()
-{
-    //  Called by ctx when it is terminated (zmq_ctx_term).
-    //  'stop' command is sent from the threads that called zmq_ctx_term to
-    //  the thread owning the socket. This way, blocking call in the
-    //  owner thread can be interrupted.
-    send_stop ();
-}
-
-// TODO consider renaming protocol_ to scheme_ in conformance with RFC 3986
-// terminology, but this requires extensive changes to be consistent
-int zmq::socket_base_t::parse_uri (const char *uri_,
-                                   std::string &protocol_,
-                                   std::string &path_)
-{
-    zmq_assert (uri_ != NULL);
-
-    const std::string uri (uri_);
-    const std::string::size_type pos = uri.find ("://");
-    if (pos == std::string::npos) {
-        errno = EINVAL;
-        return -1;
-    }
-    protocol_ = uri.substr (0, pos);
-    path_ = uri.substr (pos + 3);
-
-    if (protocol_.empty () || path_.empty ()) {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::socket_base_t::check_protocol (const std::string &protocol_) const
-{
-    //  First check out whether the protocol is something we are aware of.
-    if (protocol_ != protocol_name::inproc
-#if defined ZMQ_HAVE_IPC
-        && protocol_ != protocol_name::ipc
-#endif
-        && protocol_ != protocol_name::tcp
-#ifdef ZMQ_HAVE_WS
-        && protocol_ != protocol_name::ws
-#endif
-#ifdef ZMQ_HAVE_WSS
-        && protocol_ != protocol_name::wss
-#endif
-#if defined ZMQ_HAVE_OPENPGM
-        //  pgm/epgm transports only available if 0MQ is compiled with OpenPGM.
-        && protocol_ != protocol_name::pgm
-        && protocol_ != protocol_name::epgm
-#endif
-#if defined ZMQ_HAVE_TIPC
-        // TIPC transport is only available on Linux.
-        && protocol_ != protocol_name::tipc
-#endif
-#if defined ZMQ_HAVE_NORM
-        && protocol_ != protocol_name::norm
-#endif
-#if defined ZMQ_HAVE_VMCI
-        && protocol_ != protocol_name::vmci
-#endif
-        && protocol_ != protocol_name::udp) {
-        errno = EPROTONOSUPPORT;
-        return -1;
-    }
-
-    //  Check whether socket type and transport protocol match.
-    //  Specifically, multicast protocols can't be combined with
-    //  bi-directional messaging patterns (socket types).
-#if defined ZMQ_HAVE_OPENPGM || defined ZMQ_HAVE_NORM
-#if defined ZMQ_HAVE_OPENPGM && defined ZMQ_HAVE_NORM
-    if ((protocol_ == protocol_name::pgm || protocol_ == protocol_name::epgm
-         || protocol_ == protocol_name::norm)
-#elif defined ZMQ_HAVE_OPENPGM
-    if ((protocol_ == protocol_name::pgm || protocol_ == protocol_name::epgm)
-#else // defined ZMQ_HAVE_NORM
-    if (protocol_ == protocol_name::norm
-#endif
-        && options.type != ZMQ_PUB && options.type != ZMQ_SUB
-        && options.type != ZMQ_XPUB && options.type != ZMQ_XSUB) {
-        errno = ENOCOMPATPROTO;
-        return -1;
-    }
-#endif
-
-    if (protocol_ == protocol_name::udp
-        && (options.type != ZMQ_DISH && options.type != ZMQ_RADIO
-            && options.type != ZMQ_DGRAM)) {
-        errno = ENOCOMPATPROTO;
-        return -1;
-    }
-
-    //  Protocol is available.
-    return 0;
-}
-
-void zmq::socket_base_t::attach_pipe (pipe_t *pipe_,
-                                      bool subscribe_to_all_,
-                                      bool locally_initiated_)
-{
-    //  First, register the pipe so that we can terminate it later on.
-    pipe_->set_event_sink (this);
-    _pipes.push_back (pipe_);
-
-    //  Let the derived socket type know about new pipe.
-    xattach_pipe (pipe_, subscribe_to_all_, locally_initiated_);
-
-    //  If the socket is already being closed, ask any new pipes to terminate
-    //  straight away.
-    if (is_terminating ()) {
-        register_term_acks (1);
-        pipe_->terminate (false);
-    }
-}
-
-int zmq::socket_base_t::setsockopt (int option_,
-                                    const void *optval_,
-                                    size_t optvallen_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  First, check whether specific socket type overloads the option.
-    int rc = xsetsockopt (option_, optval_, optvallen_);
-    if (rc == 0 || errno != EINVAL) {
-        return rc;
-    }
-
-    //  If the socket type doesn't support the option, pass it to
-    //  the generic option parser.
-    rc = options.setsockopt (option_, optval_, optvallen_);
-    update_pipe_options (option_);
-
-    return rc;
-}
-
-int zmq::socket_base_t::getsockopt (int option_,
-                                    void *optval_,
-                                    size_t *optvallen_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    if (option_ == ZMQ_RCVMORE) {
-        return do_getsockopt<int> (optval_, optvallen_, _rcvmore ? 1 : 0);
-    }
-
-    if (option_ == ZMQ_FD) {
-        if (_thread_safe) {
-            // thread safe socket doesn't provide file descriptor
-            errno = EINVAL;
-            return -1;
-        }
-
-        return do_getsockopt<fd_t> (
-          optval_, optvallen_,
-          (static_cast<mailbox_t *> (_mailbox))->get_fd ());
-    }
-
-    if (option_ == ZMQ_EVENTS) {
-        const int rc = process_commands (0, false);
-        if (rc != 0 && (errno == EINTR || errno == ETERM)) {
-            return -1;
-        }
-        errno_assert (rc == 0);
-
-        return do_getsockopt<int> (optval_, optvallen_,
-                                   (has_out () ? ZMQ_POLLOUT : 0)
-                                     | (has_in () ? ZMQ_POLLIN : 0));
-    }
-
-    if (option_ == ZMQ_LAST_ENDPOINT) {
-        return do_getsockopt (optval_, optvallen_, _last_endpoint);
-    }
-
-    if (option_ == ZMQ_THREAD_SAFE) {
-        return do_getsockopt<int> (optval_, optvallen_, _thread_safe ? 1 : 0);
-    }
-
-    return options.getsockopt (option_, optval_, optvallen_);
-}
-
-int zmq::socket_base_t::join (const char *group_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    return xjoin (group_);
-}
-
-int zmq::socket_base_t::leave (const char *group_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    return xleave (group_);
-}
-
-void zmq::socket_base_t::add_signaler (signaler_t *s_)
-{
-    zmq_assert (_thread_safe);
-
-    scoped_lock_t sync_lock (_sync);
-    (static_cast<mailbox_safe_t *> (_mailbox))->add_signaler (s_);
-}
-
-void zmq::socket_base_t::remove_signaler (signaler_t *s_)
-{
-    zmq_assert (_thread_safe);
-
-    scoped_lock_t sync_lock (_sync);
-    (static_cast<mailbox_safe_t *> (_mailbox))->remove_signaler (s_);
-}
-
-int zmq::socket_base_t::bind (const char *endpoint_uri_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Process pending commands, if any.
-    int rc = process_commands (0, false);
-    if (unlikely (rc != 0)) {
-        return -1;
-    }
-
-    //  Parse endpoint_uri_ string.
-    std::string protocol;
-    std::string address;
-    if (parse_uri (endpoint_uri_, protocol, address)
-        || check_protocol (protocol)) {
-        return -1;
-    }
-
-    if (protocol == protocol_name::inproc) {
-        const endpoint_t endpoint = {this, options};
-        rc = register_endpoint (endpoint_uri_, endpoint);
-        if (rc == 0) {
-            connect_pending (endpoint_uri_, this);
-            _last_endpoint.assign (endpoint_uri_);
-            options.connected = true;
-        }
-        return rc;
-    }
-
-#if defined ZMQ_HAVE_OPENPGM || defined ZMQ_HAVE_NORM
-#if defined ZMQ_HAVE_OPENPGM && defined ZMQ_HAVE_NORM
-    if (protocol == protocol_name::pgm || protocol == protocol_name::epgm
-        || protocol == protocol_name::norm) {
-#elif defined ZMQ_HAVE_OPENPGM
-    if (protocol == protocol_name::pgm || protocol == protocol_name::epgm) {
-#else // defined ZMQ_HAVE_NORM
-    if (protocol == protocol_name::norm) {
-#endif
-        //  For convenience's sake, bind can be used interchangeable with
-        //  connect for PGM, EPGM, NORM transports.
-        rc = connect (endpoint_uri_);
-        if (rc != -1)
-            options.connected = true;
-        return rc;
-    }
-#endif
-
-    if (protocol == protocol_name::udp) {
-        if (!(options.type == ZMQ_DGRAM || options.type == ZMQ_DISH)) {
-            errno = ENOCOMPATPROTO;
-            return -1;
-        }
-
-        //  Choose the I/O thread to run the session in.
-        io_thread_t *io_thread = choose_io_thread (options.affinity);
-        if (!io_thread) {
-            errno = EMTHREAD;
-            return -1;
-        }
-
-        address_t *paddr =
-          new (std::nothrow) address_t (protocol, address, this->get_ctx ());
-        alloc_assert (paddr);
-
-        paddr->resolved.udp_addr = new (std::nothrow) udp_address_t ();
-        alloc_assert (paddr->resolved.udp_addr);
-        rc = paddr->resolved.udp_addr->resolve (address.c_str (), true,
-                                                options.ipv6);
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-
-        session_base_t *session =
-          session_base_t::create (io_thread, true, this, options, paddr);
-        errno_assert (session);
-
-        //  Create a bi-directional pipe.
-        object_t *parents[2] = {this, session};
-        pipe_t *new_pipes[2] = {NULL, NULL};
-
-        int hwms[2] = {options.sndhwm, options.rcvhwm};
-        bool conflates[2] = {false, false};
-        rc = pipepair (parents, new_pipes, hwms, conflates);
-        errno_assert (rc == 0);
-
-        //  Attach local end of the pipe to the socket object.
-        attach_pipe (new_pipes[0], true, true);
-        pipe_t *const newpipe = new_pipes[0];
-
-        //  Attach remote end of the pipe to the session object later on.
-        session->attach_pipe (new_pipes[1]);
-
-        //  Save last endpoint URI
-        paddr->to_string (_last_endpoint);
-
-        //  TODO shouldn't this use _last_endpoint instead of endpoint_uri_? as in the other cases
-        add_endpoint (endpoint_uri_pair_t (endpoint_uri_, std::string (),
-                                           endpoint_type_none),
-                      static_cast<own_t *> (session), newpipe);
-
-        return 0;
-    }
-
-    //  Remaining transports require to be run in an I/O thread, so at this
-    //  point we'll choose one.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    if (!io_thread) {
-        errno = EMTHREAD;
-        return -1;
-    }
-
-    if (protocol == protocol_name::tcp) {
-        tcp_listener_t *listener =
-          new (std::nothrow) tcp_listener_t (io_thread, this, options);
-        alloc_assert (listener);
-        rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        // Save last endpoint URI
-        listener->get_local_address (_last_endpoint);
-
-        add_endpoint (make_unconnected_bind_endpoint_pair (_last_endpoint),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-
-#ifdef ZMQ_HAVE_WS
-#ifdef ZMQ_HAVE_WSS
-    if (protocol == protocol_name::ws || protocol == protocol_name::wss) {
-        ws_listener_t *listener = new (std::nothrow) ws_listener_t (
-          io_thread, this, options, protocol == protocol_name::wss);
-#else
-    if (protocol == protocol_name::ws) {
-        ws_listener_t *listener =
-          new (std::nothrow) ws_listener_t (io_thread, this, options, false);
-#endif
-        alloc_assert (listener);
-        rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        // Save last endpoint URI
-        listener->get_local_address (_last_endpoint);
-
-        add_endpoint (make_unconnected_bind_endpoint_pair (_last_endpoint),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-#endif
-
-#if defined ZMQ_HAVE_IPC
-    if (protocol == protocol_name::ipc) {
-        ipc_listener_t *listener =
-          new (std::nothrow) ipc_listener_t (io_thread, this, options);
-        alloc_assert (listener);
-        int rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        // Save last endpoint URI
-        listener->get_local_address (_last_endpoint);
-
-        add_endpoint (make_unconnected_bind_endpoint_pair (_last_endpoint),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-#endif
-#if defined ZMQ_HAVE_TIPC
-    if (protocol == protocol_name::tipc) {
-        tipc_listener_t *listener =
-          new (std::nothrow) tipc_listener_t (io_thread, this, options);
-        alloc_assert (listener);
-        int rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        // Save last endpoint URI
-        listener->get_local_address (_last_endpoint);
-
-        // TODO shouldn't this use _last_endpoint as in the other cases?
-        add_endpoint (make_unconnected_bind_endpoint_pair (endpoint_uri_),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-#endif
-#if defined ZMQ_HAVE_VMCI
-    if (protocol == protocol_name::vmci) {
-        vmci_listener_t *listener =
-          new (std::nothrow) vmci_listener_t (io_thread, this, options);
-        alloc_assert (listener);
-        int rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        listener->get_local_address (_last_endpoint);
-
-        add_endpoint (make_unconnected_bind_endpoint_pair (_last_endpoint),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-#endif
-
-    zmq_assert (false);
-    return -1;
-}
-
-int zmq::socket_base_t::connect (const char *endpoint_uri_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-    return connect_internal (endpoint_uri_);
-}
-
-int zmq::socket_base_t::connect_internal (const char *endpoint_uri_)
-{
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Process pending commands, if any.
-    int rc = process_commands (0, false);
-    if (unlikely (rc != 0)) {
-        return -1;
-    }
-
-    //  Parse endpoint_uri_ string.
-    std::string protocol;
-    std::string address;
-    if (parse_uri (endpoint_uri_, protocol, address)
-        || check_protocol (protocol)) {
-        return -1;
-    }
-
-    if (protocol == protocol_name::inproc) {
-        //  TODO: inproc connect is specific with respect to creating pipes
-        //  as there's no 'reconnect' functionality implemented. Once that
-        //  is in place we should follow generic pipe creation algorithm.
-
-        //  Find the peer endpoint.
-        const endpoint_t peer = find_endpoint (endpoint_uri_);
-
-        // The total HWM for an inproc connection should be the sum of
-        // the binder's HWM and the connector's HWM.
-        const int sndhwm = peer.socket == NULL
-                             ? options.sndhwm
-                             : options.sndhwm != 0 && peer.options.rcvhwm != 0
-                                 ? options.sndhwm + peer.options.rcvhwm
-                                 : 0;
-        const int rcvhwm = peer.socket == NULL
-                             ? options.rcvhwm
-                             : options.rcvhwm != 0 && peer.options.sndhwm != 0
-                                 ? options.rcvhwm + peer.options.sndhwm
-                                 : 0;
-
-        //  Create a bi-directional pipe to connect the peers.
-        object_t *parents[2] = {this, peer.socket == NULL ? this : peer.socket};
-        pipe_t *new_pipes[2] = {NULL, NULL};
-
-        const bool conflate = get_effective_conflate_option (options);
-
-        int hwms[2] = {conflate ? -1 : sndhwm, conflate ? -1 : rcvhwm};
-        bool conflates[2] = {conflate, conflate};
-        rc = pipepair (parents, new_pipes, hwms, conflates);
-        if (!conflate) {
-            new_pipes[0]->set_hwms_boost (peer.options.sndhwm,
-                                          peer.options.rcvhwm);
-            new_pipes[1]->set_hwms_boost (options.sndhwm, options.rcvhwm);
-        }
-
-        errno_assert (rc == 0);
-
-        if (!peer.socket) {
-            //  The peer doesn't exist yet so we don't know whether
-            //  to send the routing id message or not. To resolve this,
-            //  we always send our routing id and drop it later if
-            //  the peer doesn't expect it.
-            send_routing_id (new_pipes[0], options);
-
-#ifdef ZMQ_BUILD_DRAFT_API
-            //  If set, send the hello msg of the local socket to the peer.
-            if (options.can_send_hello_msg && options.hello_msg.size () > 0) {
-                send_hello_msg (new_pipes[0], options);
-            }
-#endif
-
-            const endpoint_t endpoint = {this, options};
-            pend_connection (std::string (endpoint_uri_), endpoint, new_pipes);
-        } else {
-            //  If required, send the routing id of the local socket to the peer.
-            if (peer.options.recv_routing_id) {
-                send_routing_id (new_pipes[0], options);
-            }
-
-            //  If required, send the routing id of the peer to the local socket.
-            if (options.recv_routing_id) {
-                send_routing_id (new_pipes[1], peer.options);
-            }
-
-#ifdef ZMQ_BUILD_DRAFT_API
-            //  If set, send the hello msg of the local socket to the peer.
-            if (options.can_send_hello_msg && options.hello_msg.size () > 0) {
-                send_hello_msg (new_pipes[0], options);
-            }
-
-            //  If set, send the hello msg of the peer to the local socket.
-            if (peer.options.can_send_hello_msg
-                && peer.options.hello_msg.size () > 0) {
-                send_hello_msg (new_pipes[1], peer.options);
-            }
-
-            if (peer.options.can_recv_disconnect_msg
-                && peer.options.disconnect_msg.size () > 0)
-                new_pipes[0]->set_disconnect_msg (peer.options.disconnect_msg);
-#endif
-
-            //  Attach remote end of the pipe to the peer socket. Note that peer's
-            //  seqnum was incremented in find_endpoint function. We don't need it
-            //  increased here.
-            send_bind (peer.socket, new_pipes[1], false);
-        }
-
-        //  Attach local end of the pipe to this socket object.
-        attach_pipe (new_pipes[0], false, true);
-
-        // Save last endpoint URI
-        _last_endpoint.assign (endpoint_uri_);
-
-        // remember inproc connections for disconnect
-        _inprocs.emplace (endpoint_uri_, new_pipes[0]);
-
-        options.connected = true;
-        return 0;
-    }
-    const bool is_single_connect =
-      (options.type == ZMQ_DEALER || options.type == ZMQ_SUB
-       || options.type == ZMQ_PUB || options.type == ZMQ_REQ);
-    if (unlikely (is_single_connect)) {
-        if (0 != _endpoints.count (endpoint_uri_)) {
-            // There is no valid use for multiple connects for SUB-PUB nor
-            // DEALER-ROUTER nor REQ-REP. Multiple connects produces
-            // nonsensical results.
-            return 0;
-        }
-    }
-
-    //  Choose the I/O thread to run the session in.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    if (!io_thread) {
-        errno = EMTHREAD;
-        return -1;
-    }
-
-    address_t *paddr =
-      new (std::nothrow) address_t (protocol, address, this->get_ctx ());
-    alloc_assert (paddr);
-
-    //  Resolve address (if needed by the protocol)
-    if (protocol == protocol_name::tcp) {
-        //  Do some basic sanity checks on tcp:// address syntax
-        //  - hostname starts with digit or letter, with embedded '-' or '.'
-        //  - IPv6 address may contain hex chars and colons.
-        //  - IPv6 link local address may contain % followed by interface name / zone_id
-        //    (Reference: https://tools.ietf.org/html/rfc4007)
-        //  - IPv4 address may contain decimal digits and dots.
-        //  - Address must end in ":port" where port is *, or numeric
-        //  - Address may contain two parts separated by ':'
-        //  Following code is quick and dirty check to catch obvious errors,
-        //  without trying to be fully accurate.
-        const char *check = address.c_str ();
-        if (isalnum (*check) || isxdigit (*check) || *check == '['
-            || *check == ':') {
-            check++;
-            while (isalnum (*check) || isxdigit (*check) || *check == '.'
-                   || *check == '-' || *check == ':' || *check == '%'
-                   || *check == ';' || *check == '[' || *check == ']'
-                   || *check == '_' || *check == '*') {
-                check++;
-            }
-        }
-        //  Assume the worst, now look for success
-        rc = -1;
-        //  Did we reach the end of the address safely?
-        if (*check == 0) {
-            //  Do we have a valid port string? (cannot be '*' in connect
-            check = strrchr (address.c_str (), ':');
-            if (check) {
-                check++;
-                if (*check && (isdigit (*check)))
-                    rc = 0; //  Valid
-            }
-        }
-        if (rc == -1) {
-            errno = EINVAL;
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-        //  Defer resolution until a socket is opened
-        paddr->resolved.tcp_addr = NULL;
-    }
-#ifdef ZMQ_HAVE_WS
-#ifdef ZMQ_HAVE_WSS
-    else if (protocol == protocol_name::ws || protocol == protocol_name::wss) {
-        if (protocol == protocol_name::wss) {
-            paddr->resolved.wss_addr = new (std::nothrow) wss_address_t ();
-            alloc_assert (paddr->resolved.wss_addr);
-            rc = paddr->resolved.wss_addr->resolve (address.c_str (), false,
-                                                    options.ipv6);
-        } else
-#else
-    else if (protocol == protocol_name::ws) {
-#endif
-        {
-            paddr->resolved.ws_addr = new (std::nothrow) ws_address_t ();
-            alloc_assert (paddr->resolved.ws_addr);
-            rc = paddr->resolved.ws_addr->resolve (address.c_str (), false,
-                                                   options.ipv6);
-        }
-
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-    }
-#endif
-
-#if defined ZMQ_HAVE_IPC
-    else if (protocol == protocol_name::ipc) {
-        paddr->resolved.ipc_addr = new (std::nothrow) ipc_address_t ();
-        alloc_assert (paddr->resolved.ipc_addr);
-        int rc = paddr->resolved.ipc_addr->resolve (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-    }
-#endif
-
-    if (protocol == protocol_name::udp) {
-        if (options.type != ZMQ_RADIO) {
-            errno = ENOCOMPATPROTO;
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-
-        paddr->resolved.udp_addr = new (std::nothrow) udp_address_t ();
-        alloc_assert (paddr->resolved.udp_addr);
-        rc = paddr->resolved.udp_addr->resolve (address.c_str (), false,
-                                                options.ipv6);
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-    }
-
-    // TBD - Should we check address for ZMQ_HAVE_NORM???
-
-#ifdef ZMQ_HAVE_OPENPGM
-    if (protocol == protocol_name::pgm || protocol == protocol_name::epgm) {
-        struct pgm_addrinfo_t *res = NULL;
-        uint16_t port_number = 0;
-        int rc =
-          pgm_socket_t::init_address (address.c_str (), &res, &port_number);
-        if (res != NULL)
-            pgm_freeaddrinfo (res);
-        if (rc != 0 || port_number == 0) {
-            return -1;
-        }
-    }
-#endif
-#if defined ZMQ_HAVE_TIPC
-    else if (protocol == protocol_name::tipc) {
-        paddr->resolved.tipc_addr = new (std::nothrow) tipc_address_t ();
-        alloc_assert (paddr->resolved.tipc_addr);
-        int rc = paddr->resolved.tipc_addr->resolve (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-        const sockaddr_tipc *const saddr =
-          reinterpret_cast<const sockaddr_tipc *> (
-            paddr->resolved.tipc_addr->addr ());
-        // Cannot connect to random Port Identity
-        if (saddr->addrtype == TIPC_ADDR_ID
-            && paddr->resolved.tipc_addr->is_random ()) {
-            LIBZMQ_DELETE (paddr);
-            errno = EINVAL;
-            return -1;
-        }
-    }
-#endif
-#if defined ZMQ_HAVE_VMCI
-    else if (protocol == protocol_name::vmci) {
-        paddr->resolved.vmci_addr =
-          new (std::nothrow) vmci_address_t (this->get_ctx ());
-        alloc_assert (paddr->resolved.vmci_addr);
-        int rc = paddr->resolved.vmci_addr->resolve (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-    }
-#endif
-
-    //  Create session.
-    session_base_t *session =
-      session_base_t::create (io_thread, true, this, options, paddr);
-    errno_assert (session);
-
-    //  PGM does not support subscription forwarding; ask for all data to be
-    //  sent to this pipe. (same for NORM, currently?)
-#if defined ZMQ_HAVE_OPENPGM && defined ZMQ_HAVE_NORM
-    const bool subscribe_to_all =
-      protocol == protocol_name::pgm || protocol == protocol_name::epgm
-      || protocol == protocol_name::norm || protocol == protocol_name::udp;
-#elif defined ZMQ_HAVE_OPENPGM
-    const bool subscribe_to_all = protocol == protocol_name::pgm
-                                  || protocol == protocol_name::epgm
-                                  || protocol == protocol_name::udp;
-#elif defined ZMQ_HAVE_NORM
-    const bool subscribe_to_all =
-      protocol == protocol_name::norm || protocol == protocol_name::udp;
-#else
-    const bool subscribe_to_all = protocol == protocol_name::udp;
-#endif
-    pipe_t *newpipe = NULL;
-
-    if (options.immediate != 1 || subscribe_to_all) {
-        //  Create a bi-directional pipe.
-        object_t *parents[2] = {this, session};
-        pipe_t *new_pipes[2] = {NULL, NULL};
-
-        const bool conflate = get_effective_conflate_option (options);
-
-        int hwms[2] = {conflate ? -1 : options.sndhwm,
-                       conflate ? -1 : options.rcvhwm};
-        bool conflates[2] = {conflate, conflate};
-        rc = pipepair (parents, new_pipes, hwms, conflates);
-        errno_assert (rc == 0);
-
-        //  Attach local end of the pipe to the socket object.
-        attach_pipe (new_pipes[0], subscribe_to_all, true);
-        newpipe = new_pipes[0];
-
-        //  Attach remote end of the pipe to the session object later on.
-        session->attach_pipe (new_pipes[1]);
-    }
-
-    //  Save last endpoint URI
-    paddr->to_string (_last_endpoint);
-
-    add_endpoint (make_unconnected_connect_endpoint_pair (endpoint_uri_),
-                  static_cast<own_t *> (session), newpipe);
-    return 0;
-}
-
-std::string
-zmq::socket_base_t::resolve_tcp_addr (std::string endpoint_uri_pair_,
-                                      const char *tcp_address_)
-{
-    // The resolved last_endpoint is used as a key in the endpoints map.
-    // The address passed by the user might not match in the TCP case due to
-    // IPv4-in-IPv6 mapping (EG: tcp://[::ffff:127.0.0.1]:9999), so try to
-    // resolve before giving up. Given at this stage we don't know whether a
-    // socket is connected or bound, try with both.
-    if (_endpoints.find (endpoint_uri_pair_) == _endpoints.end ()) {
-        tcp_address_t *tcp_addr = new (std::nothrow) tcp_address_t ();
-        alloc_assert (tcp_addr);
-        int rc = tcp_addr->resolve (tcp_address_, false, options.ipv6);
-
-        if (rc == 0) {
-            tcp_addr->to_string (endpoint_uri_pair_);
-            if (_endpoints.find (endpoint_uri_pair_) == _endpoints.end ()) {
-                rc = tcp_addr->resolve (tcp_address_, true, options.ipv6);
-                if (rc == 0) {
-                    tcp_addr->to_string (endpoint_uri_pair_);
-                }
-            }
-        }
-        LIBZMQ_DELETE (tcp_addr);
-    }
-    return endpoint_uri_pair_;
-}
-
-void zmq::socket_base_t::add_endpoint (
-  const endpoint_uri_pair_t &endpoint_pair_, own_t *endpoint_, pipe_t *pipe_)
-{
-    //  Activate the session. Make it a child of this socket.
-    launch_child (endpoint_);
-    _endpoints.ZMQ_MAP_INSERT_OR_EMPLACE (endpoint_pair_.identifier (),
-                                          endpoint_pipe_t (endpoint_, pipe_));
-
-    if (pipe_ != NULL)
-        pipe_->set_endpoint_pair (endpoint_pair_);
-}
-
-int zmq::socket_base_t::term_endpoint (const char *endpoint_uri_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    //  Check whether the context hasn't been shut down yet.
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Check whether endpoint address passed to the function is valid.
-    if (unlikely (!endpoint_uri_)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Process pending commands, if any, since there could be pending unprocessed process_own()'s
-    //  (from launch_child() for example) we're asked to terminate now.
-    const int rc = process_commands (0, false);
-    if (unlikely (rc != 0)) {
-        return -1;
-    }
-
-    //  Parse endpoint_uri_ string.
-    std::string uri_protocol;
-    std::string uri_path;
-    if (parse_uri (endpoint_uri_, uri_protocol, uri_path)
-        || check_protocol (uri_protocol)) {
-        return -1;
-    }
-
-    const std::string endpoint_uri_str = std::string (endpoint_uri_);
-
-    // Disconnect an inproc socket
-    if (uri_protocol == protocol_name::inproc) {
-        return unregister_endpoint (endpoint_uri_str, this) == 0
-                 ? 0
-                 : _inprocs.erase_pipes (endpoint_uri_str);
-    }
-
-    const std::string resolved_endpoint_uri =
-      uri_protocol == protocol_name::tcp
-        ? resolve_tcp_addr (endpoint_uri_str, uri_path.c_str ())
-        : endpoint_uri_str;
-
-    //  Find the endpoints range (if any) corresponding to the endpoint_uri_pair_ string.
-    const std::pair<endpoints_t::iterator, endpoints_t::iterator> range =
-      _endpoints.equal_range (resolved_endpoint_uri);
-    if (range.first == range.second) {
-        errno = ENOENT;
-        return -1;
-    }
-
-    for (endpoints_t::iterator it = range.first; it != range.second; ++it) {
-        //  If we have an associated pipe, terminate it.
-        if (it->second.second != NULL)
-            it->second.second->terminate (false);
-        term_child (it->second.first);
-    }
-    _endpoints.erase (range.first, range.second);
-    return 0;
-}
-
-int zmq::socket_base_t::send (msg_t *msg_, int flags_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    //  Check whether the context hasn't been shut down yet.
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Check whether message passed to the function is valid.
-    if (unlikely (!msg_ || !msg_->check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    //  Process pending commands, if any.
-    int rc = process_commands (0, true);
-    if (unlikely (rc != 0)) {
-        return -1;
-    }
-
-    //  Clear any user-visible flags that are set on the message.
-    msg_->reset_flags (msg_t::more);
-
-    //  At this point we impose the flags on the message.
-    if (flags_ & ZMQ_SNDMORE)
-        msg_->set_flags (msg_t::more);
-
-    msg_->reset_metadata ();
-
-    //  Try to send the message using method in each socket class
-    rc = xsend (msg_);
-    if (rc == 0) {
-        return 0;
-    }
-    //  Special case for ZMQ_PUSH: -2 means pipe is dead while a
-    //  multi-part send is in progress and can't be recovered, so drop
-    //  silently when in blocking mode to keep backward compatibility.
-    if (unlikely (rc == -2)) {
-        if (!((flags_ & ZMQ_DONTWAIT) || options.sndtimeo == 0)) {
-            rc = msg_->close ();
-            errno_assert (rc == 0);
-            rc = msg_->init ();
-            errno_assert (rc == 0);
-            return 0;
-        }
-    }
-    if (unlikely (errno != EAGAIN)) {
-        return -1;
-    }
-
-    //  In case of non-blocking send we'll simply propagate
-    //  the error - including EAGAIN - up the stack.
-    if ((flags_ & ZMQ_DONTWAIT) || options.sndtimeo == 0) {
-        return -1;
-    }
-
-    //  Compute the time when the timeout should occur.
-    //  If the timeout is infinite, don't care.
-    int timeout = options.sndtimeo;
-    const uint64_t end = timeout < 0 ? 0 : (_clock.now_ms () + timeout);
-
-    //  Oops, we couldn't send the message. Wait for the next
-    //  command, process it and try to send the message again.
-    //  If timeout is reached in the meantime, return EAGAIN.
-    while (true) {
-        if (unlikely (process_commands (timeout, false) != 0)) {
-            return -1;
-        }
-        rc = xsend (msg_);
-        if (rc == 0)
-            break;
-        if (unlikely (errno != EAGAIN)) {
-            return -1;
-        }
-        if (timeout > 0) {
-            timeout = static_cast<int> (end - _clock.now_ms ());
-            if (timeout <= 0) {
-                errno = EAGAIN;
-                return -1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    //  Check whether the context hasn't been shut down yet.
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Check whether message passed to the function is valid.
-    if (unlikely (!msg_ || !msg_->check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    //  Once every inbound_poll_rate messages check for signals and process
-    //  incoming commands. This happens only if we are not polling altogether
-    //  because there are messages available all the time. If poll occurs,
-    //  ticks is set to zero and thus we avoid this code.
-    //
-    //  Note that 'recv' uses different command throttling algorithm (the one
-    //  described above) from the one used by 'send'. This is because counting
-    //  ticks is more efficient than doing RDTSC all the time.
-    if (++_ticks == inbound_poll_rate) {
-        if (unlikely (process_commands (0, false) != 0)) {
-            return -1;
-        }
-        _ticks = 0;
-    }
-
-    //  Get the message.
-    int rc = xrecv (msg_);
-    if (unlikely (rc != 0 && errno != EAGAIN)) {
-        return -1;
-    }
-
-    //  If we have the message, return immediately.
-    if (rc == 0) {
-        extract_flags (msg_);
-        return 0;
-    }
-
-    //  If the message cannot be fetched immediately, there are two scenarios.
-    //  For non-blocking recv, commands are processed in case there's an
-    //  activate_reader command already waiting in a command pipe.
-    //  If it's not, return EAGAIN.
-    if ((flags_ & ZMQ_DONTWAIT) || options.rcvtimeo == 0) {
-        if (unlikely (process_commands (0, false) != 0)) {
-            return -1;
-        }
-        _ticks = 0;
-
-        rc = xrecv (msg_);
-        if (rc < 0) {
-            return rc;
-        }
-        extract_flags (msg_);
-
-        return 0;
-    }
-
-    //  Compute the time when the timeout should occur.
-    //  If the timeout is infinite, don't care.
-    int timeout = options.rcvtimeo;
-    const uint64_t end = timeout < 0 ? 0 : (_clock.now_ms () + timeout);
-
-    //  In blocking scenario, commands are processed over and over again until
-    //  we are able to fetch a message.
-    bool block = (_ticks != 0);
-    while (true) {
-        if (unlikely (process_commands (block ? timeout : 0, false) != 0)) {
-            return -1;
-        }
-        rc = xrecv (msg_);
-        if (rc == 0) {
-            _ticks = 0;
-            break;
-        }
-        if (unlikely (errno != EAGAIN)) {
-            return -1;
-        }
-        block = true;
-        if (timeout > 0) {
-            timeout = static_cast<int> (end - _clock.now_ms ());
-            if (timeout <= 0) {
-                errno = EAGAIN;
-                return -1;
-            }
-        }
-    }
-
-    extract_flags (msg_);
-    return 0;
-}
-
-int zmq::socket_base_t::close ()
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    //  Remove all existing signalers for thread safe sockets
-    if (_thread_safe)
-        (static_cast<mailbox_safe_t *> (_mailbox))->clear_signalers ();
-
-    //  Mark the socket as dead
-    _tag = 0xdeadbeef;
-
-
-    //  Transfer the ownership of the socket from this application thread
-    //  to the reaper thread which will take care of the rest of shutdown
-    //  process.
-    send_reap (this);
-
-    return 0;
-}
-
-bool zmq::socket_base_t::has_in ()
-{
-    return xhas_in ();
-}
-
-bool zmq::socket_base_t::has_out ()
-{
-    return xhas_out ();
-}
-
-void zmq::socket_base_t::start_reaping (poller_t *poller_)
-{
-    //  Plug the socket to the reaper thread.
-    _poller = poller_;
-
-    fd_t fd;
-
-    if (!_thread_safe)
-        fd = (static_cast<mailbox_t *> (_mailbox))->get_fd ();
-    else {
-        scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-        _reaper_signaler = new (std::nothrow) signaler_t ();
-        zmq_assert (_reaper_signaler);
-
-        //  Add signaler to the safe mailbox
-        fd = _reaper_signaler->get_fd ();
-        (static_cast<mailbox_safe_t *> (_mailbox))
-          ->add_signaler (_reaper_signaler);
-
-        //  Send a signal to make sure reaper handle existing commands
-        _reaper_signaler->send ();
-    }
-
-    _handle = _poller->add_fd (fd, this);
-    _poller->set_pollin (_handle);
-
-    //  Initialise the termination and check whether it can be deallocated
-    //  immediately.
-    terminate ();
-    check_destroy ();
-}
-
-int zmq::socket_base_t::process_commands (int timeout_, bool throttle_)
-{
-    if (timeout_ == 0) {
-        //  If we are asked not to wait, check whether we haven't processed
-        //  commands recently, so that we can throttle the new commands.
-
-        //  Get the CPU's tick counter. If 0, the counter is not available.
-        const uint64_t tsc = zmq::clock_t::rdtsc ();
-
-        //  Optimised version of command processing - it doesn't have to check
-        //  for incoming commands each time. It does so only if certain time
-        //  elapsed since last command processing. Command delay varies
-        //  depending on CPU speed: It's ~1ms on 3GHz CPU, ~2ms on 1.5GHz CPU
-        //  etc. The optimisation makes sense only on platforms where getting
-        //  a timestamp is a very cheap operation (tens of nanoseconds).
-        if (tsc && throttle_) {
-            //  Check whether TSC haven't jumped backwards (in case of migration
-            //  between CPU cores) and whether certain time have elapsed since
-            //  last command processing. If it didn't do nothing.
-            if (tsc >= _last_tsc && tsc - _last_tsc <= max_command_delay)
-                return 0;
-            _last_tsc = tsc;
-        }
-    }
-
-    //  Check whether there are any commands pending for this thread.
-    command_t cmd;
-    int rc = _mailbox->recv (&cmd, timeout_);
-
-    //  Process all available commands.
-    while (rc == 0) {
-        cmd.destination->process_command (cmd);
-        rc = _mailbox->recv (&cmd, 0);
-    }
-
-    if (errno == EINTR)
-        return -1;
-
-    zmq_assert (errno == EAGAIN);
-
-    if (_ctx_terminated) {
-        errno = ETERM;
-        return -1;
-    }
-
-    return 0;
-}
-
-void zmq::socket_base_t::process_stop ()
-{
-    //  Here, someone have called zmq_ctx_term while the socket was still alive.
-    //  We'll remember the fact so that any blocking call is interrupted and any
-    //  further attempt to use the socket will return ETERM. The user is still
-    //  responsible for calling zmq_close on the socket though!
-    scoped_lock_t lock (_monitor_sync);
-    stop_monitor ();
-
-    _ctx_terminated = true;
-}
-
-void zmq::socket_base_t::process_bind (pipe_t *pipe_)
-{
-    attach_pipe (pipe_);
-}
-
-void zmq::socket_base_t::process_term (int linger_)
-{
-    //  Unregister all inproc endpoints associated with this socket.
-    //  Doing this we make sure that no new pipes from other sockets (inproc)
-    //  will be initiated.
-    unregister_endpoints (this);
-
-    //  Ask all attached pipes to terminate.
-    for (pipes_t::size_type i = 0, size = _pipes.size (); i != size; ++i) {
-        //  Only inprocs might have a disconnect message set
-        _pipes[i]->send_disconnect_msg ();
-        _pipes[i]->terminate (false);
-    }
-    register_term_acks (static_cast<int> (_pipes.size ()));
-
-    //  Continue the termination process immediately.
-    own_t::process_term (linger_);
-}
-
-void zmq::socket_base_t::process_term_endpoint (std::string *endpoint_)
-{
-    term_endpoint (endpoint_->c_str ());
-    delete endpoint_;
-}
-
-void zmq::socket_base_t::process_pipe_stats_publish (
-  uint64_t outbound_queue_count_,
-  uint64_t inbound_queue_count_,
-  endpoint_uri_pair_t *endpoint_pair_)
-{
-    uint64_t values[2] = {outbound_queue_count_, inbound_queue_count_};
-    event (*endpoint_pair_, values, 2, ZMQ_EVENT_PIPES_STATS);
-    delete endpoint_pair_;
-}
-
-/*
- * There are 2 pipes per connection, and the inbound one _must_ be queried from
- * the I/O thread. So ask the outbound pipe, in the application thread, to send
- * a message (pipe_peer_stats) to its peer. The message will carry the outbound
- * pipe stats and endpoint, and the reference to the socket object.
- * The inbound pipe on the I/O thread will then add its own stats and endpoint,
- * and write back a message to the socket object (pipe_stats_publish) which
- * will raise an event with the data.
- */
-int zmq::socket_base_t::query_pipes_stats ()
-{
-    {
-        scoped_lock_t lock (_monitor_sync);
-        if (!(_monitor_events & ZMQ_EVENT_PIPES_STATS)) {
-            errno = EINVAL;
-            return -1;
-        }
-    }
-    if (_pipes.size () == 0) {
-        errno = EAGAIN;
-        return -1;
-    }
-    for (pipes_t::size_type i = 0, size = _pipes.size (); i != size; ++i) {
-        _pipes[i]->send_stats_to_peer (this);
-    }
-
-    return 0;
-}
-
-void zmq::socket_base_t::update_pipe_options (int option_)
-{
-    if (option_ == ZMQ_SNDHWM || option_ == ZMQ_RCVHWM) {
-        for (pipes_t::size_type i = 0, size = _pipes.size (); i != size; ++i) {
-            _pipes[i]->set_hwms (options.rcvhwm, options.sndhwm);
-            _pipes[i]->send_hwms_to_peer (options.sndhwm, options.rcvhwm);
-        }
-    }
-}
-
-void zmq::socket_base_t::process_destroy ()
-{
-    _destroyed = true;
-}
-
-int zmq::socket_base_t::xsetsockopt (int, const void *, size_t)
-{
-    errno = EINVAL;
-    return -1;
-}
-
-bool zmq::socket_base_t::xhas_out ()
-{
-    return false;
-}
-
-int zmq::socket_base_t::xsend (msg_t *)
-{
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::socket_base_t::xhas_in ()
-{
-    return false;
-}
-
-int zmq::socket_base_t::xjoin (const char *group_)
-{
-    LIBZMQ_UNUSED (group_);
-    errno = ENOTSUP;
-    return -1;
-}
-
-int zmq::socket_base_t::xleave (const char *group_)
-{
-    LIBZMQ_UNUSED (group_);
-    errno = ENOTSUP;
-    return -1;
-}
-
-int zmq::socket_base_t::xrecv (msg_t *)
-{
-    errno = ENOTSUP;
-    return -1;
-}
-
-void zmq::socket_base_t::xread_activated (pipe_t *)
-{
-    zmq_assert (false);
-}
-void zmq::socket_base_t::xwrite_activated (pipe_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::socket_base_t::xhiccuped (pipe_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::socket_base_t::in_event ()
-{
-    //  This function is invoked only once the socket is running in the context
-    //  of the reaper thread. Process any commands from other threads/sockets
-    //  that may be available at the moment. Ultimately, the socket will
-    //  be destroyed.
-    {
-        scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-        //  If the socket is thread safe we need to unsignal the reaper signaler
-        if (_thread_safe)
-            _reaper_signaler->recv ();
-
-        process_commands (0, false);
-    }
-    check_destroy ();
-}
-
-void zmq::socket_base_t::out_event ()
-{
-    zmq_assert (false);
-}
-
-void zmq::socket_base_t::timer_event (int)
-{
-    zmq_assert (false);
-}
-
-void zmq::socket_base_t::check_destroy ()
-{
-    //  If the object was already marked as destroyed, finish the deallocation.
-    if (_destroyed) {
-        //  Remove the socket from the reaper's poller.
-        _poller->rm_fd (_handle);
-
-        //  Remove the socket from the context.
-        destroy_socket (this);
-
-        //  Notify the reaper about the fact.
-        send_reaped ();
-
-        //  Deallocate.
-        own_t::process_destroy ();
-    }
-}
-
-void zmq::socket_base_t::read_activated (pipe_t *pipe_)
-{
-    xread_activated (pipe_);
-}
-
-void zmq::socket_base_t::write_activated (pipe_t *pipe_)
-{
-    xwrite_activated (pipe_);
-}
-
-void zmq::socket_base_t::hiccuped (pipe_t *pipe_)
-{
-    if (options.immediate == 1)
-        pipe_->terminate (false);
-    else
-        // Notify derived sockets of the hiccup
-        xhiccuped (pipe_);
-}
-
-void zmq::socket_base_t::pipe_terminated (pipe_t *pipe_)
-{
-    //  Notify the specific socket type about the pipe termination.
-    xpipe_terminated (pipe_);
-
-    // Remove pipe from inproc pipes
-    _inprocs.erase_pipe (pipe_);
-
-    //  Remove the pipe from the list of attached pipes and confirm its
-    //  termination if we are already shutting down.
-    _pipes.erase (pipe_);
-
-    // Remove the pipe from _endpoints (set it to NULL).
-    const std::string &identifier = pipe_->get_endpoint_pair ().identifier ();
-    if (!identifier.empty ()) {
-        std::pair<endpoints_t::iterator, endpoints_t::iterator> range;
-        range = _endpoints.equal_range (identifier);
-
-        for (endpoints_t::iterator it = range.first; it != range.second; ++it) {
-            if (it->second.second == pipe_) {
-                it->second.second = NULL;
-                break;
-            }
-        }
-    }
-
-    if (is_terminating ())
-        unregister_term_ack ();
-}
-
-void zmq::socket_base_t::extract_flags (const msg_t *msg_)
-{
-    //  Test whether routing_id flag is valid for this socket type.
-    if (unlikely (msg_->flags () & msg_t::routing_id))
-        zmq_assert (options.recv_routing_id);
-
-    //  Remove MORE flag.
-    _rcvmore = (msg_->flags () & msg_t::more) != 0;
-}
-
-int zmq::socket_base_t::monitor (const char *endpoint_,
-                                 uint64_t events_,
-                                 int event_version_,
-                                 int type_)
-{
-    scoped_lock_t lock (_monitor_sync);
-
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Event version 1 supports only first 16 events.
-    if (unlikely (event_version_ == 1 && events_ >> 16 != 0)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Support deregistering monitoring endpoints as well
-    if (endpoint_ == NULL) {
-        stop_monitor ();
-        return 0;
-    }
-    //  Parse endpoint_uri_ string.
-    std::string protocol;
-    std::string address;
-    if (parse_uri (endpoint_, protocol, address) || check_protocol (protocol))
-        return -1;
-
-    //  Event notification only supported over inproc://
-    if (protocol != protocol_name::inproc) {
-        errno = EPROTONOSUPPORT;
-        return -1;
-    }
-
-    // already monitoring. Stop previous monitor before starting new one.
-    if (_monitor_socket != NULL) {
-        stop_monitor (true);
-    }
-
-    // Check if the specified socket type is supported. It must be a
-    // one-way socket types that support the SNDMORE flag.
-    switch (type_) {
-        case ZMQ_PAIR:
-            break;
-        case ZMQ_PUB:
-            break;
-        case ZMQ_PUSH:
-            break;
-        default:
-            errno = EINVAL;
-            return -1;
-    }
-
-    //  Register events to monitor
-    _monitor_events = events_;
-    options.monitor_event_version = event_version_;
-    //  Create a monitor socket of the specified type.
-    _monitor_socket = zmq_socket (get_ctx (), type_);
-    if (_monitor_socket == NULL)
-        return -1;
-
-    //  Never block context termination on pending event messages
-    int linger = 0;
-    int rc =
-      zmq_setsockopt (_monitor_socket, ZMQ_LINGER, &linger, sizeof (linger));
-    if (rc == -1)
-        stop_monitor (false);
-
-    //  Spawn the monitor socket endpoint
-    rc = zmq_bind (_monitor_socket, endpoint_);
-    if (rc == -1)
-        stop_monitor (false);
-    return rc;
-}
-
-void zmq::socket_base_t::event_connected (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CONNECTED);
-}
-
-void zmq::socket_base_t::event_connect_delayed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CONNECT_DELAYED);
-}
-
-void zmq::socket_base_t::event_connect_retried (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int interval_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (interval_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CONNECT_RETRIED);
-}
-
-void zmq::socket_base_t::event_listening (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_LISTENING);
-}
-
-void zmq::socket_base_t::event_bind_failed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_BIND_FAILED);
-}
-
-void zmq::socket_base_t::event_accepted (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_ACCEPTED);
-}
-
-void zmq::socket_base_t::event_accept_failed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_ACCEPT_FAILED);
-}
-
-void zmq::socket_base_t::event_closed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CLOSED);
-}
-
-void zmq::socket_base_t::event_close_failed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CLOSE_FAILED);
-}
-
-void zmq::socket_base_t::event_disconnected (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_DISCONNECTED);
-}
-
-void zmq::socket_base_t::event_handshake_failed_no_detail (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL);
-}
-
-void zmq::socket_base_t::event_handshake_failed_protocol (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL);
-}
-
-void zmq::socket_base_t::event_handshake_failed_auth (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH);
-}
-
-void zmq::socket_base_t::event_handshake_succeeded (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-}
-
-void zmq::socket_base_t::event (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                uint64_t values_[],
-                                uint64_t values_count_,
-                                uint64_t type_)
-{
-    scoped_lock_t lock (_monitor_sync);
-    if (_monitor_events & type_) {
-        monitor_event (type_, values_, values_count_, endpoint_uri_pair_);
-    }
-}
-
-//  Send a monitor event
-void zmq::socket_base_t::monitor_event (
-  uint64_t event_,
-  const uint64_t values_[],
-  uint64_t values_count_,
-  const endpoint_uri_pair_t &endpoint_uri_pair_) const
-{
-    // this is a private method which is only called from
-    // contexts where the _monitor_sync mutex has been locked before
-
-    if (_monitor_socket) {
-        zmq_msg_t msg;
-
-        switch (options.monitor_event_version) {
-            case 1: {
-                //  The API should not allow to activate unsupported events
-                zmq_assert (event_ <= std::numeric_limits<uint16_t>::max ());
-                //  v1 only allows one value
-                zmq_assert (values_count_ == 1);
-                zmq_assert (values_[0]
-                            <= std::numeric_limits<uint32_t>::max ());
-
-                //  Send event and value in first frame
-                const uint16_t event = static_cast<uint16_t> (event_);
-                const uint32_t value = static_cast<uint32_t> (values_[0]);
-                zmq_msg_init_size (&msg, sizeof (event) + sizeof (value));
-                uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg));
-                //  Avoid dereferencing uint32_t on unaligned address
-                memcpy (data + 0, &event, sizeof (event));
-                memcpy (data + sizeof (event), &value, sizeof (value));
-                zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-
-                const std::string &endpoint_uri =
-                  endpoint_uri_pair_.identifier ();
-
-                //  Send address in second frame
-                zmq_msg_init_size (&msg, endpoint_uri.size ());
-                memcpy (zmq_msg_data (&msg), endpoint_uri.c_str (),
-                        endpoint_uri.size ());
-                zmq_msg_send (&msg, _monitor_socket, 0);
-            } break;
-            case 2: {
-                //  Send event in first frame (64bit unsigned)
-                zmq_msg_init_size (&msg, sizeof (event_));
-                memcpy (zmq_msg_data (&msg), &event_, sizeof (event_));
-                zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-
-                //  Send number of values that will follow in second frame
-                zmq_msg_init_size (&msg, sizeof (values_count_));
-                memcpy (zmq_msg_data (&msg), &values_count_,
-                        sizeof (values_count_));
-                zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-
-                //  Send values in third-Nth frames (64bit unsigned)
-                for (uint64_t i = 0; i < values_count_; ++i) {
-                    zmq_msg_init_size (&msg, sizeof (values_[i]));
-                    memcpy (zmq_msg_data (&msg), &values_[i],
-                            sizeof (values_[i]));
-                    zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-                }
-
-                //  Send local endpoint URI in second-to-last frame (string)
-                zmq_msg_init_size (&msg, endpoint_uri_pair_.local.size ());
-                memcpy (zmq_msg_data (&msg), endpoint_uri_pair_.local.c_str (),
-                        endpoint_uri_pair_.local.size ());
-                zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-
-                //  Send remote endpoint URI in last frame (string)
-                zmq_msg_init_size (&msg, endpoint_uri_pair_.remote.size ());
-                memcpy (zmq_msg_data (&msg), endpoint_uri_pair_.remote.c_str (),
-                        endpoint_uri_pair_.remote.size ());
-                zmq_msg_send (&msg, _monitor_socket, 0);
-            } break;
-        }
-    }
-}
-
-void zmq::socket_base_t::stop_monitor (bool send_monitor_stopped_event_)
-{
-    // this is a private method which is only called from
-    // contexts where the _monitor_sync mutex has been locked before
-
-    if (_monitor_socket) {
-        if ((_monitor_events & ZMQ_EVENT_MONITOR_STOPPED)
-            && send_monitor_stopped_event_) {
-            uint64_t values[1] = {0};
-            monitor_event (ZMQ_EVENT_MONITOR_STOPPED, values, 1,
-                           endpoint_uri_pair_t ());
-        }
-        zmq_close (_monitor_socket);
-        _monitor_socket = NULL;
-        _monitor_events = 0;
-    }
-}
-
-zmq::routing_socket_base_t::routing_socket_base_t (class ctx_t *parent_,
-                                                   uint32_t tid_,
-                                                   int sid_) :
-    socket_base_t (parent_, tid_, sid_)
-{
-}
-
-zmq::routing_socket_base_t::~routing_socket_base_t ()
-{
-    zmq_assert (_out_pipes.empty ());
-}
-
-int zmq::routing_socket_base_t::xsetsockopt (int option_,
-                                             const void *optval_,
-                                             size_t optvallen_)
-{
-    switch (option_) {
-        case ZMQ_CONNECT_ROUTING_ID:
-            // TODO why isn't it possible to set an empty connect_routing_id
-            //   (which is the default value)
-            if (optval_ && optvallen_) {
-                _connect_routing_id.assign (static_cast<const char *> (optval_),
-                                            optvallen_);
-                return 0;
-            }
-            break;
-    }
-    errno = EINVAL;
-    return -1;
-}
-
-void zmq::routing_socket_base_t::xwrite_activated (pipe_t *pipe_)
-{
-    const out_pipes_t::iterator end = _out_pipes.end ();
-    out_pipes_t::iterator it;
-    for (it = _out_pipes.begin (); it != end; ++it)
-        if (it->second.pipe == pipe_)
-            break;
-
-    zmq_assert (it != end);
-    zmq_assert (!it->second.active);
-    it->second.active = true;
-}
-
-std::string zmq::routing_socket_base_t::extract_connect_routing_id ()
-{
-    std::string res = ZMQ_MOVE (_connect_routing_id);
-    _connect_routing_id.clear ();
-    return res;
-}
-
-bool zmq::routing_socket_base_t::connect_routing_id_is_set () const
-{
-    return !_connect_routing_id.empty ();
-}
-
-void zmq::routing_socket_base_t::add_out_pipe (blob_t routing_id_,
-                                               pipe_t *pipe_)
-{
-    //  Add the record into output pipes lookup table
-    const out_pipe_t outpipe = {pipe_, true};
-    const bool ok =
-      _out_pipes.ZMQ_MAP_INSERT_OR_EMPLACE (ZMQ_MOVE (routing_id_), outpipe)
-        .second;
-    zmq_assert (ok);
-}
-
-bool zmq::routing_socket_base_t::has_out_pipe (const blob_t &routing_id_) const
-{
-    return 0 != _out_pipes.count (routing_id_);
-}
-
-zmq::routing_socket_base_t::out_pipe_t *
-zmq::routing_socket_base_t::lookup_out_pipe (const blob_t &routing_id_)
-{
-    // TODO we could probably avoid constructor a temporary blob_t to call this function
-    out_pipes_t::iterator it = _out_pipes.find (routing_id_);
-    return it == _out_pipes.end () ? NULL : &it->second;
-}
-
-const zmq::routing_socket_base_t::out_pipe_t *
-zmq::routing_socket_base_t::lookup_out_pipe (const blob_t &routing_id_) const
-{
-    // TODO we could probably avoid constructor a temporary blob_t to call this function
-    const out_pipes_t::const_iterator it = _out_pipes.find (routing_id_);
-    return it == _out_pipes.end () ? NULL : &it->second;
-}
-
-void zmq::routing_socket_base_t::erase_out_pipe (const pipe_t *pipe_)
-{
-    const size_t erased = _out_pipes.erase (pipe_->get_routing_id ());
-    zmq_assert (erased);
-}
-
-zmq::routing_socket_base_t::out_pipe_t
-zmq::routing_socket_base_t::try_erase_out_pipe (const blob_t &routing_id_)
-{
-    const out_pipes_t::iterator it = _out_pipes.find (routing_id_);
-    out_pipe_t res = {NULL, false};
-    if (it != _out_pipes.end ()) {
-        res = it->second;
-        _out_pipes.erase (it);
-    }
-    return res;
-}
diff --git a/src/socket_base.hpp b/src/socket_base.hpp
deleted file mode 100644
index c60667412..000000000
--- a/src/socket_base.hpp
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SOCKET_BASE_HPP_INCLUDED__
-#define __ZMQ_SOCKET_BASE_HPP_INCLUDED__
-
-#include <string>
-#include <map>
-#include <stdarg.h>
-
-#include "own.hpp"
-#include "array.hpp"
-#include "blob.hpp"
-#include "stdint.hpp"
-#include "poller.hpp"
-#include "i_poll_events.hpp"
-#include "i_mailbox.hpp"
-#include "clock.hpp"
-#include "pipe.hpp"
-#include "endpoint.hpp"
-
-extern "C" {
-void zmq_free_event (void *data_, void *hint_);
-}
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-
-class socket_base_t : public own_t,
-                      public array_item_t<>,
-                      public i_poll_events,
-                      public i_pipe_events
-{
-    friend class reaper_t;
-
-  public:
-    //  Returns false if object is not a socket.
-    bool check_tag () const;
-
-    //  Returns whether the socket is thread-safe.
-    bool is_thread_safe () const;
-
-    //  Create a socket of a specified type.
-    static socket_base_t *
-    create (int type_, zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-
-    //  Returns the mailbox associated with this socket.
-    i_mailbox *get_mailbox () const;
-
-    //  Interrupt blocking call if the socket is stuck in one.
-    //  This function can be called from a different thread!
-    void stop ();
-
-    //  Interface for communication with the API layer.
-    int setsockopt (int option_, const void *optval_, size_t optvallen_);
-    int getsockopt (int option_, void *optval_, size_t *optvallen_);
-    int bind (const char *endpoint_uri_);
-    int connect (const char *endpoint_uri_);
-    int term_endpoint (const char *endpoint_uri_);
-    int send (zmq::msg_t *msg_, int flags_);
-    int recv (zmq::msg_t *msg_, int flags_);
-    void add_signaler (signaler_t *s_);
-    void remove_signaler (signaler_t *s_);
-    int close ();
-
-    //  These functions are used by the polling mechanism to determine
-    //  which events are to be reported from this socket.
-    bool has_in ();
-    bool has_out ();
-
-    //  Joining and leaving groups
-    int join (const char *group_);
-    int leave (const char *group_);
-
-    //  Using this function reaper thread ask the socket to register with
-    //  its poller.
-    void start_reaping (poller_t *poller_);
-
-    //  i_poll_events implementation. This interface is used when socket
-    //  is handled by the poller in the reaper thread.
-    void in_event () ZMQ_FINAL;
-    void out_event () ZMQ_FINAL;
-    void timer_event (int id_) ZMQ_FINAL;
-
-    //  i_pipe_events interface implementation.
-    void read_activated (pipe_t *pipe_) ZMQ_FINAL;
-    void write_activated (pipe_t *pipe_) ZMQ_FINAL;
-    void hiccuped (pipe_t *pipe_) ZMQ_FINAL;
-    void pipe_terminated (pipe_t *pipe_) ZMQ_FINAL;
-    void lock ();
-    void unlock ();
-
-    int monitor (const char *endpoint_,
-                 uint64_t events_,
-                 int event_version_,
-                 int type_);
-
-    void event_connected (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                          zmq::fd_t fd_);
-    void event_connect_delayed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                int err_);
-    void event_connect_retried (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                int interval_);
-    void event_listening (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                          zmq::fd_t fd_);
-    void event_bind_failed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                            int err_);
-    void event_accepted (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                         zmq::fd_t fd_);
-    void event_accept_failed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                              int err_);
-    void event_closed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                       zmq::fd_t fd_);
-    void event_close_failed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                             int err_);
-    void event_disconnected (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                             zmq::fd_t fd_);
-    void event_handshake_failed_no_detail (
-      const endpoint_uri_pair_t &endpoint_uri_pair_, int err_);
-    void event_handshake_failed_protocol (
-      const endpoint_uri_pair_t &endpoint_uri_pair_, int err_);
-    void
-    event_handshake_failed_auth (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                 int err_);
-    void
-    event_handshake_succeeded (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                               int err_);
-
-    //  Query the state of a specific peer. The default implementation
-    //  always returns an ENOTSUP error.
-    virtual int get_peer_state (const void *routing_id_,
-                                size_t routing_id_size_) const;
-
-    //  Request for pipes statistics - will generate a ZMQ_EVENT_PIPES_STATS
-    //  after gathering the data asynchronously. Requires event monitoring to
-    //  be enabled.
-    int query_pipes_stats ();
-
-  protected:
-    socket_base_t (zmq::ctx_t *parent_,
-                   uint32_t tid_,
-                   int sid_,
-                   bool thread_safe_ = false);
-    ~socket_base_t () ZMQ_OVERRIDE;
-
-    //  Concrete algorithms for the x- methods are to be defined by
-    //  individual socket types.
-    virtual void xattach_pipe (zmq::pipe_t *pipe_,
-                               bool subscribe_to_all_ = false,
-                               bool locally_initiated_ = false) = 0;
-
-    //  The default implementation assumes there are no specific socket
-    //  options for the particular socket type. If not so, ZMQ_FINAL this
-    //  method.
-    virtual int
-    xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-
-    //  The default implementation assumes that send is not supported.
-    virtual bool xhas_out ();
-    virtual int xsend (zmq::msg_t *msg_);
-
-    //  The default implementation assumes that recv in not supported.
-    virtual bool xhas_in ();
-    virtual int xrecv (zmq::msg_t *msg_);
-
-    //  i_pipe_events will be forwarded to these functions.
-    virtual void xread_activated (pipe_t *pipe_);
-    virtual void xwrite_activated (pipe_t *pipe_);
-    virtual void xhiccuped (pipe_t *pipe_);
-    virtual void xpipe_terminated (pipe_t *pipe_) = 0;
-
-    //  the default implementation assumes that joub and leave are not supported.
-    virtual int xjoin (const char *group_);
-    virtual int xleave (const char *group_);
-
-    //  Delay actual destruction of the socket.
-    void process_destroy () ZMQ_FINAL;
-
-    int connect_internal (const char *endpoint_uri_);
-
-    // Mutex for synchronize access to the socket in thread safe mode
-    mutex_t _sync;
-
-  private:
-    // test if event should be sent and then dispatch it
-    void event (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                uint64_t values_[],
-                uint64_t values_count_,
-                uint64_t type_);
-
-    // Socket event data dispatch
-    void monitor_event (uint64_t event_,
-                        const uint64_t values_[],
-                        uint64_t values_count_,
-                        const endpoint_uri_pair_t &endpoint_uri_pair_) const;
-
-    // Monitor socket cleanup
-    void stop_monitor (bool send_monitor_stopped_event_ = true);
-
-    //  Creates new endpoint ID and adds the endpoint to the map.
-    void add_endpoint (const endpoint_uri_pair_t &endpoint_pair_,
-                       own_t *endpoint_,
-                       pipe_t *pipe_);
-
-    //  Map of open endpoints.
-    typedef std::pair<own_t *, pipe_t *> endpoint_pipe_t;
-    typedef std::multimap<std::string, endpoint_pipe_t> endpoints_t;
-    endpoints_t _endpoints;
-
-    //  Map of open inproc endpoints.
-    class inprocs_t
-    {
-      public:
-        void emplace (const char *endpoint_uri_, pipe_t *pipe_);
-        int erase_pipes (const std::string &endpoint_uri_str_);
-        void erase_pipe (const pipe_t *pipe_);
-
-      private:
-        typedef std::multimap<std::string, pipe_t *> map_t;
-        map_t _inprocs;
-    };
-    inprocs_t _inprocs;
-
-    //  To be called after processing commands or invoking any command
-    //  handlers explicitly. If required, it will deallocate the socket.
-    void check_destroy ();
-
-    //  Moves the flags from the message to local variables,
-    //  to be later retrieved by getsockopt.
-    void extract_flags (const msg_t *msg_);
-
-    //  Used to check whether the object is a socket.
-    uint32_t _tag;
-
-    //  If true, associated context was already terminated.
-    bool _ctx_terminated;
-
-    //  If true, object should have been already destroyed. However,
-    //  destruction is delayed while we unwind the stack to the point
-    //  where it doesn't intersect the object being destroyed.
-    bool _destroyed;
-
-    //  Parse URI string.
-    static int
-    parse_uri (const char *uri_, std::string &protocol_, std::string &path_);
-
-    //  Check whether transport protocol, as specified in connect or
-    //  bind, is available and compatible with the socket type.
-    int check_protocol (const std::string &protocol_) const;
-
-    //  Register the pipe with this socket.
-    void attach_pipe (zmq::pipe_t *pipe_,
-                      bool subscribe_to_all_ = false,
-                      bool locally_initiated_ = false);
-
-    //  Processes commands sent to this socket (if any). If timeout is -1,
-    //  returns only after at least one command was processed.
-    //  If throttle argument is true, commands are processed at most once
-    //  in a predefined time period.
-    int process_commands (int timeout_, bool throttle_);
-
-    //  Handlers for incoming commands.
-    void process_stop () ZMQ_FINAL;
-    void process_bind (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void
-    process_pipe_stats_publish (uint64_t outbound_queue_count_,
-                                uint64_t inbound_queue_count_,
-                                endpoint_uri_pair_t *endpoint_pair_) ZMQ_FINAL;
-    void process_term (int linger_) ZMQ_FINAL;
-    void process_term_endpoint (std::string *endpoint_) ZMQ_FINAL;
-
-    void update_pipe_options (int option_);
-
-    std::string resolve_tcp_addr (std::string endpoint_uri_,
-                                  const char *tcp_address_);
-
-    //  Socket's mailbox object.
-    i_mailbox *_mailbox;
-
-    //  List of attached pipes.
-    typedef array_t<pipe_t, 3> pipes_t;
-    pipes_t _pipes;
-
-    //  Reaper's poller and handle of this socket within it.
-    poller_t *_poller;
-    poller_t::handle_t _handle;
-
-    //  Timestamp of when commands were processed the last time.
-    uint64_t _last_tsc;
-
-    //  Number of messages received since last command processing.
-    int _ticks;
-
-    //  True if the last message received had MORE flag set.
-    bool _rcvmore;
-
-    //  Improves efficiency of time measurement.
-    clock_t _clock;
-
-    // Monitor socket;
-    void *_monitor_socket;
-
-    // Bitmask of events being monitored
-    int64_t _monitor_events;
-
-    // Last socket endpoint resolved URI
-    std::string _last_endpoint;
-
-    // Indicate if the socket is thread safe
-    const bool _thread_safe;
-
-    // Signaler to be used in the reaping stage
-    signaler_t *_reaper_signaler;
-
-    // Mutex to synchronize access to the monitor Pair socket
-    mutex_t _monitor_sync;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (socket_base_t)
-};
-
-class routing_socket_base_t : public socket_base_t
-{
-  protected:
-    routing_socket_base_t (class ctx_t *parent_, uint32_t tid_, int sid_);
-    ~routing_socket_base_t () ZMQ_OVERRIDE;
-
-    // methods from socket_base_t
-    int xsetsockopt (int option_,
-                     const void *optval_,
-                     size_t optvallen_) ZMQ_OVERRIDE;
-    void xwrite_activated (pipe_t *pipe_) ZMQ_FINAL;
-
-    // own methods
-    std::string extract_connect_routing_id ();
-    bool connect_routing_id_is_set () const;
-
-    struct out_pipe_t
-    {
-        pipe_t *pipe;
-        bool active;
-    };
-
-    void add_out_pipe (blob_t routing_id_, pipe_t *pipe_);
-    bool has_out_pipe (const blob_t &routing_id_) const;
-    out_pipe_t *lookup_out_pipe (const blob_t &routing_id_);
-    const out_pipe_t *lookup_out_pipe (const blob_t &routing_id_) const;
-    void erase_out_pipe (const pipe_t *pipe_);
-    out_pipe_t try_erase_out_pipe (const blob_t &routing_id_);
-    template <typename Func> bool any_of_out_pipes (Func func_)
-    {
-        bool res = false;
-        for (out_pipes_t::iterator it = _out_pipes.begin (),
-                                   end = _out_pipes.end ();
-             it != end && !res; ++it) {
-            res |= func_ (*it->second.pipe);
-        }
-
-        return res;
-    }
-
-  private:
-    //  Outbound pipes indexed by the peer IDs.
-    typedef std::map<blob_t, out_pipe_t> out_pipes_t;
-    out_pipes_t _out_pipes;
-
-    // Next assigned name on a zmq_connect() call used by ROUTER and STREAM socket types
-    std::string _connect_routing_id;
-};
-}
-
-#endif
diff --git a/src/socket_poller.cpp b/src/socket_poller.cpp
deleted file mode 100644
index eecbf16b7..000000000
--- a/src/socket_poller.cpp
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "socket_poller.hpp"
-#include "err.hpp"
-#include "polling_util.hpp"
-#include "macros.hpp"
-
-#include <limits.h>
-
-static bool is_thread_safe (const zmq::socket_base_t &socket_)
-{
-    // do not use getsockopt here, since that would fail during context termination
-    return socket_.is_thread_safe ();
-}
-
-// compare elements to value
-template <class It, class T, class Pred>
-static It find_if2 (It b_, It e_, const T &value, Pred pred)
-{
-    for (; b_ != e_; ++b_) {
-        if (pred (*b_, value)) {
-            break;
-        }
-    }
-    return b_;
-}
-
-zmq::socket_poller_t::socket_poller_t () :
-    _tag (0xCAFEBABE),
-    _signaler (NULL)
-#if defined ZMQ_POLL_BASED_ON_POLL
-    ,
-    _pollfds (NULL)
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-    ,
-    _max_fd (0)
-#endif
-{
-    rebuild ();
-}
-
-zmq::socket_poller_t::~socket_poller_t ()
-{
-    //  Mark the socket_poller as dead
-    _tag = 0xdeadbeef;
-
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        // TODO shouldn't this zmq_assert (it->socket->check_tag ()) instead?
-        if (it->socket && it->socket->check_tag ()
-            && is_thread_safe (*it->socket)) {
-            it->socket->remove_signaler (_signaler);
-        }
-    }
-
-    if (_signaler != NULL) {
-        LIBZMQ_DELETE (_signaler);
-    }
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-    if (_pollfds) {
-        free (_pollfds);
-        _pollfds = NULL;
-    }
-#endif
-}
-
-bool zmq::socket_poller_t::check_tag () const
-{
-    return _tag == 0xCAFEBABE;
-}
-
-int zmq::socket_poller_t::signaler_fd (fd_t *fd_) const
-{
-    if (_signaler) {
-        *fd_ = _signaler->get_fd ();
-        return 0;
-    }
-    // Only thread-safe socket types are guaranteed to have a signaler.
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::socket_poller_t::add (socket_base_t *socket_,
-                               void *user_data_,
-                               short events_)
-{
-    if (find_if2 (_items.begin (), _items.end (), socket_, &is_socket)
-        != _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (is_thread_safe (*socket_)) {
-        if (_signaler == NULL) {
-            _signaler = new (std::nothrow) signaler_t ();
-            if (!_signaler) {
-                errno = ENOMEM;
-                return -1;
-            }
-            if (!_signaler->valid ()) {
-                delete _signaler;
-                _signaler = NULL;
-                errno = EMFILE;
-                return -1;
-            }
-        }
-
-        socket_->add_signaler (_signaler);
-    }
-
-    const item_t item = {
-        socket_,
-        0,
-        user_data_,
-        events_
-#if defined ZMQ_POLL_BASED_ON_POLL
-        ,
-        -1
-#endif
-    };
-    try {
-        _items.push_back (item);
-    }
-    catch (const std::bad_alloc &) {
-        errno = ENOMEM;
-        return -1;
-    }
-    _need_rebuild = true;
-
-    return 0;
-}
-
-int zmq::socket_poller_t::add_fd (fd_t fd_, void *user_data_, short events_)
-{
-    if (find_if2 (_items.begin (), _items.end (), fd_, &is_fd)
-        != _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    const item_t item = {
-        NULL,
-        fd_,
-        user_data_,
-        events_
-#if defined ZMQ_POLL_BASED_ON_POLL
-        ,
-        -1
-#endif
-    };
-    try {
-        _items.push_back (item);
-    }
-    catch (const std::bad_alloc &) {
-        errno = ENOMEM;
-        return -1;
-    }
-    _need_rebuild = true;
-
-    return 0;
-}
-
-int zmq::socket_poller_t::modify (const socket_base_t *socket_, short events_)
-{
-    const items_t::iterator it =
-      find_if2 (_items.begin (), _items.end (), socket_, &is_socket);
-
-    if (it == _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    it->events = events_;
-    _need_rebuild = true;
-
-    return 0;
-}
-
-
-int zmq::socket_poller_t::modify_fd (fd_t fd_, short events_)
-{
-    const items_t::iterator it =
-      find_if2 (_items.begin (), _items.end (), fd_, &is_fd);
-
-    if (it == _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    it->events = events_;
-    _need_rebuild = true;
-
-    return 0;
-}
-
-
-int zmq::socket_poller_t::remove (socket_base_t *socket_)
-{
-    const items_t::iterator it =
-      find_if2 (_items.begin (), _items.end (), socket_, &is_socket);
-
-    if (it == _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _items.erase (it);
-    _need_rebuild = true;
-
-    if (is_thread_safe (*socket_)) {
-        socket_->remove_signaler (_signaler);
-    }
-
-    return 0;
-}
-
-int zmq::socket_poller_t::remove_fd (fd_t fd_)
-{
-    const items_t::iterator it =
-      find_if2 (_items.begin (), _items.end (), fd_, &is_fd);
-
-    if (it == _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _items.erase (it);
-    _need_rebuild = true;
-
-    return 0;
-}
-
-int zmq::socket_poller_t::rebuild ()
-{
-    _use_signaler = false;
-    _pollset_size = 0;
-    _need_rebuild = false;
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-
-    if (_pollfds) {
-        free (_pollfds);
-        _pollfds = NULL;
-    }
-
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        if (it->events) {
-            if (it->socket && is_thread_safe (*it->socket)) {
-                if (!_use_signaler) {
-                    _use_signaler = true;
-                    _pollset_size++;
-                }
-            } else
-                _pollset_size++;
-        }
-    }
-
-    if (_pollset_size == 0)
-        return 0;
-
-    _pollfds = static_cast<pollfd *> (malloc (_pollset_size * sizeof (pollfd)));
-
-    if (!_pollfds) {
-        errno = ENOMEM;
-        _need_rebuild = true;
-        return -1;
-    }
-
-    int item_nbr = 0;
-
-    if (_use_signaler) {
-        item_nbr = 1;
-        _pollfds[0].fd = _signaler->get_fd ();
-        _pollfds[0].events = POLLIN;
-    }
-
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        if (it->events) {
-            if (it->socket) {
-                if (!is_thread_safe (*it->socket)) {
-                    size_t fd_size = sizeof (zmq::fd_t);
-                    const int rc = it->socket->getsockopt (
-                      ZMQ_FD, &_pollfds[item_nbr].fd, &fd_size);
-                    zmq_assert (rc == 0);
-
-                    _pollfds[item_nbr].events = POLLIN;
-                    item_nbr++;
-                }
-            } else {
-                _pollfds[item_nbr].fd = it->fd;
-                _pollfds[item_nbr].events =
-                  (it->events & ZMQ_POLLIN ? POLLIN : 0)
-                  | (it->events & ZMQ_POLLOUT ? POLLOUT : 0)
-                  | (it->events & ZMQ_POLLPRI ? POLLPRI : 0);
-                it->pollfd_index = item_nbr;
-                item_nbr++;
-            }
-        }
-    }
-
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-
-    //  Ensure we do not attempt to select () on more than FD_SETSIZE
-    //  file descriptors.
-    zmq_assert (_items.size () <= FD_SETSIZE);
-
-    _pollset_in.resize (_items.size ());
-    _pollset_out.resize (_items.size ());
-    _pollset_err.resize (_items.size ());
-
-    FD_ZERO (_pollset_in.get ());
-    FD_ZERO (_pollset_out.get ());
-    FD_ZERO (_pollset_err.get ());
-
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        if (it->socket && is_thread_safe (*it->socket) && it->events) {
-            _use_signaler = true;
-            FD_SET (_signaler->get_fd (), _pollset_in.get ());
-            _pollset_size = 1;
-            break;
-        }
-    }
-
-    _max_fd = 0;
-
-    //  Build the fd_sets for passing to select ().
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        if (it->events) {
-            //  If the poll item is a 0MQ socket we are interested in input on the
-            //  notification file descriptor retrieved by the ZMQ_FD socket option.
-            if (it->socket) {
-                if (!is_thread_safe (*it->socket)) {
-                    zmq::fd_t notify_fd;
-                    size_t fd_size = sizeof (zmq::fd_t);
-                    int rc =
-                      it->socket->getsockopt (ZMQ_FD, &notify_fd, &fd_size);
-                    zmq_assert (rc == 0);
-
-                    FD_SET (notify_fd, _pollset_in.get ());
-                    if (_max_fd < notify_fd)
-                        _max_fd = notify_fd;
-
-                    _pollset_size++;
-                }
-            }
-            //  Else, the poll item is a raw file descriptor. Convert the poll item
-            //  events to the appropriate fd_sets.
-            else {
-                if (it->events & ZMQ_POLLIN)
-                    FD_SET (it->fd, _pollset_in.get ());
-                if (it->events & ZMQ_POLLOUT)
-                    FD_SET (it->fd, _pollset_out.get ());
-                if (it->events & ZMQ_POLLERR)
-                    FD_SET (it->fd, _pollset_err.get ());
-                if (_max_fd < it->fd)
-                    _max_fd = it->fd;
-
-                _pollset_size++;
-            }
-        }
-    }
-
-#endif
-
-    return 0;
-}
-
-void zmq::socket_poller_t::zero_trail_events (
-  zmq::socket_poller_t::event_t *events_, int n_events_, int found_)
-{
-    for (int i = found_; i < n_events_; ++i) {
-        events_[i].socket = NULL;
-        events_[i].fd = zmq::retired_fd;
-        events_[i].user_data = NULL;
-        events_[i].events = 0;
-    }
-}
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-int zmq::socket_poller_t::check_events (zmq::socket_poller_t::event_t *events_,
-                                        int n_events_)
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-int zmq::socket_poller_t::check_events (zmq::socket_poller_t::event_t *events_,
-                                        int n_events_,
-                                        fd_set &inset_,
-                                        fd_set &outset_,
-                                        fd_set &errset_)
-#endif
-{
-    int found = 0;
-    for (items_t::iterator it = _items.begin (), end = _items.end ();
-         it != end && found < n_events_; ++it) {
-        //  The poll item is a 0MQ socket. Retrieve pending events
-        //  using the ZMQ_EVENTS socket option.
-        if (it->socket) {
-            size_t events_size = sizeof (uint32_t);
-            uint32_t events;
-            if (it->socket->getsockopt (ZMQ_EVENTS, &events, &events_size)
-                == -1) {
-                return -1;
-            }
-
-            if (it->events & events) {
-                events_[found].socket = it->socket;
-                events_[found].fd = zmq::retired_fd;
-                events_[found].user_data = it->user_data;
-                events_[found].events = it->events & events;
-                ++found;
-            }
-        }
-        //  Else, the poll item is a raw file descriptor, simply convert
-        //  the events to zmq_pollitem_t-style format.
-        else if (it->events) {
-#if defined ZMQ_POLL_BASED_ON_POLL
-            zmq_assert (it->pollfd_index >= 0);
-            const short revents = _pollfds[it->pollfd_index].revents;
-            short events = 0;
-
-            if (revents & POLLIN)
-                events |= ZMQ_POLLIN;
-            if (revents & POLLOUT)
-                events |= ZMQ_POLLOUT;
-            if (revents & POLLPRI)
-                events |= ZMQ_POLLPRI;
-            if (revents & ~(POLLIN | POLLOUT | POLLPRI))
-                events |= ZMQ_POLLERR;
-
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-
-            short events = 0;
-
-            if (FD_ISSET (it->fd, &inset_))
-                events |= ZMQ_POLLIN;
-            if (FD_ISSET (it->fd, &outset_))
-                events |= ZMQ_POLLOUT;
-            if (FD_ISSET (it->fd, &errset_))
-                events |= ZMQ_POLLERR;
-#endif //POLL_SELECT
-
-            if (events) {
-                events_[found].socket = NULL;
-                events_[found].fd = it->fd;
-                events_[found].user_data = it->user_data;
-                events_[found].events = events;
-                ++found;
-            }
-        }
-    }
-
-    return found;
-}
-
-//Return 0 if timeout is expired otherwise 1
-int zmq::socket_poller_t::adjust_timeout (zmq::clock_t &clock_,
-                                          long timeout_,
-                                          uint64_t &now_,
-                                          uint64_t &end_,
-                                          bool &first_pass_)
-{
-    //  If socket_poller_t::timeout is zero, exit immediately whether there
-    //  are events or not.
-    if (timeout_ == 0)
-        return 0;
-
-    //  At this point we are meant to wait for events but there are none.
-    //  If timeout is infinite we can just loop until we get some events.
-    if (timeout_ < 0) {
-        if (first_pass_)
-            first_pass_ = false;
-        return 1;
-    }
-
-    //  The timeout is finite and there are no events. In the first pass
-    //  we get a timestamp of when the polling have begun. (We assume that
-    //  first pass have taken negligible time). We also compute the time
-    //  when the polling should time out.
-    now_ = clock_.now_ms ();
-    if (first_pass_) {
-        end_ = now_ + timeout_;
-        first_pass_ = false;
-        return 1;
-    }
-
-    //  Find out whether timeout have expired.
-    if (now_ >= end_)
-        return 0;
-
-    return 1;
-}
-
-int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *events_,
-                                int n_events_,
-                                long timeout_)
-{
-    if (_items.empty () && timeout_ < 0) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    if (_need_rebuild) {
-        const int rc = rebuild ();
-        if (rc == -1)
-            return -1;
-    }
-
-    if (unlikely (_pollset_size == 0)) {
-        if (timeout_ < 0) {
-            // Fail instead of trying to sleep forever
-            errno = EFAULT;
-            return -1;
-        }
-        // We'll report an error (timed out) as if the list was non-empty and
-        // no event occurred within the specified timeout. Otherwise the caller
-        // needs to check the return value AND the event to avoid using the
-        // nullified event data.
-        errno = EAGAIN;
-        if (timeout_ == 0)
-            return -1;
-#if defined ZMQ_HAVE_WINDOWS
-        Sleep (timeout_ > 0 ? timeout_ : INFINITE);
-        return -1;
-#elif defined ZMQ_HAVE_ANDROID
-        usleep (timeout_ * 1000);
-        return -1;
-#elif defined ZMQ_HAVE_OSX
-        usleep (timeout_ * 1000);
-        errno = EAGAIN;
-        return -1;
-#elif defined ZMQ_HAVE_VXWORKS
-        struct timespec ns_;
-        ns_.tv_sec = timeout_ / 1000;
-        ns_.tv_nsec = timeout_ % 1000 * 1000000;
-        nanosleep (&ns_, 0);
-        return -1;
-#else
-        usleep (timeout_ * 1000);
-        return -1;
-#endif
-    }
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-    zmq::clock_t clock;
-    uint64_t now = 0;
-    uint64_t end = 0;
-
-    bool first_pass = true;
-
-    while (true) {
-        //  Compute the timeout for the subsequent poll.
-        int timeout;
-        if (first_pass)
-            timeout = 0;
-        else if (timeout_ < 0)
-            timeout = -1;
-        else
-            timeout =
-              static_cast<int> (std::min<uint64_t> (end - now, INT_MAX));
-
-        //  Wait for events.
-        const int rc = poll (_pollfds, _pollset_size, timeout);
-        if (rc == -1 && errno == EINTR) {
-            return -1;
-        }
-        errno_assert (rc >= 0);
-
-        //  Receive the signal from pollfd
-        if (_use_signaler && _pollfds[0].revents & POLLIN)
-            _signaler->recv ();
-
-        //  Check for the events.
-        const int found = check_events (events_, n_events_);
-        if (found) {
-            if (found > 0)
-                zero_trail_events (events_, n_events_, found);
-            return found;
-        }
-
-        //  Adjust timeout or break
-        if (adjust_timeout (clock, timeout_, now, end, first_pass) == 0)
-            break;
-    }
-    errno = EAGAIN;
-    return -1;
-
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-
-    zmq::clock_t clock;
-    uint64_t now = 0;
-    uint64_t end = 0;
-
-    bool first_pass = true;
-
-    optimized_fd_set_t inset (_pollset_size);
-    optimized_fd_set_t outset (_pollset_size);
-    optimized_fd_set_t errset (_pollset_size);
-
-    while (true) {
-        //  Compute the timeout for the subsequent poll.
-        timeval timeout;
-        timeval *ptimeout;
-        if (first_pass) {
-            timeout.tv_sec = 0;
-            timeout.tv_usec = 0;
-            ptimeout = &timeout;
-        } else if (timeout_ < 0)
-            ptimeout = NULL;
-        else {
-            timeout.tv_sec = static_cast<long> ((end - now) / 1000);
-            timeout.tv_usec = static_cast<long> ((end - now) % 1000 * 1000);
-            ptimeout = &timeout;
-        }
-
-        //  Wait for events. Ignore interrupts if there's infinite timeout.
-        memcpy (inset.get (), _pollset_in.get (),
-                valid_pollset_bytes (*_pollset_in.get ()));
-        memcpy (outset.get (), _pollset_out.get (),
-                valid_pollset_bytes (*_pollset_out.get ()));
-        memcpy (errset.get (), _pollset_err.get (),
-                valid_pollset_bytes (*_pollset_err.get ()));
-        const int rc = select (static_cast<int> (_max_fd + 1), inset.get (),
-                               outset.get (), errset.get (), ptimeout);
-#if defined ZMQ_HAVE_WINDOWS
-        if (unlikely (rc == SOCKET_ERROR)) {
-            errno = wsa_error_to_errno (WSAGetLastError ());
-            wsa_assert (errno == ENOTSOCK);
-            return -1;
-        }
-#else
-        if (unlikely (rc == -1)) {
-            errno_assert (errno == EINTR || errno == EBADF);
-            return -1;
-        }
-#endif
-
-        if (_use_signaler && FD_ISSET (_signaler->get_fd (), inset.get ()))
-            _signaler->recv ();
-
-        //  Check for the events.
-        const int found = check_events (events_, n_events_, *inset.get (),
-                                        *outset.get (), *errset.get ());
-        if (found) {
-            if (found > 0)
-                zero_trail_events (events_, n_events_, found);
-            return found;
-        }
-
-        //  Adjust timeout or break
-        if (adjust_timeout (clock, timeout_, now, end, first_pass) == 0)
-            break;
-    }
-
-    errno = EAGAIN;
-    return -1;
-
-#else
-
-    //  Exotic platforms that support neither poll() nor select().
-    errno = ENOTSUP;
-    return -1;
-
-#endif
-}
diff --git a/src/socket_poller.hpp b/src/socket_poller.hpp
deleted file mode 100644
index 6f4923e77..000000000
--- a/src/socket_poller.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SOCKET_POLLER_HPP_INCLUDED__
-#define __ZMQ_SOCKET_POLLER_HPP_INCLUDED__
-
-#include "poller.hpp"
-
-#if defined ZMQ_POLL_BASED_ON_POLL && !defined ZMQ_HAVE_WINDOWS
-#include <poll.h>
-#endif
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#elif defined ZMQ_HAVE_VXWORKS
-#include <unistd.h>
-#include <sys/time.h>
-#include <strings.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <vector>
-
-#include "socket_base.hpp"
-#include "signaler.hpp"
-#include "polling_util.hpp"
-
-namespace zmq
-{
-class socket_poller_t
-{
-  public:
-    socket_poller_t ();
-    ~socket_poller_t ();
-
-    typedef zmq_poller_event_t event_t;
-
-    int add (socket_base_t *socket_, void *user_data_, short events_);
-    int modify (const socket_base_t *socket_, short events_);
-    int remove (socket_base_t *socket_);
-
-    int add_fd (fd_t fd_, void *user_data_, short events_);
-    int modify_fd (fd_t fd_, short events_);
-    int remove_fd (fd_t fd_);
-    // Returns the signaler's fd if there is one, otherwise errors.
-    int signaler_fd (fd_t *fd_) const;
-
-    int wait (event_t *events_, int n_events_, long timeout_);
-
-    int size () const { return static_cast<int> (_items.size ()); };
-
-    //  Return false if object is not a socket.
-    bool check_tag () const;
-
-  private:
-    typedef struct item_t
-    {
-        socket_base_t *socket;
-        fd_t fd;
-        void *user_data;
-        short events;
-#if defined ZMQ_POLL_BASED_ON_POLL
-        int pollfd_index;
-#endif
-    } item_t;
-
-    static void zero_trail_events (zmq::socket_poller_t::event_t *events_,
-                                   int n_events_,
-                                   int found_);
-#if defined ZMQ_POLL_BASED_ON_POLL
-    int check_events (zmq::socket_poller_t::event_t *events_, int n_events_);
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-    int check_events (zmq::socket_poller_t::event_t *events_,
-                      int n_events_,
-                      fd_set &inset_,
-                      fd_set &outset_,
-                      fd_set &errset_);
-#endif
-    static int adjust_timeout (zmq::clock_t &clock_,
-                               long timeout_,
-                               uint64_t &now_,
-                               uint64_t &end_,
-                               bool &first_pass_);
-    static bool is_socket (const item_t &item, const socket_base_t *socket_)
-    {
-        return item.socket == socket_;
-    }
-    static bool is_fd (const item_t &item, fd_t fd_)
-    {
-        return !item.socket && item.fd == fd_;
-    }
-
-    int rebuild ();
-
-    //  Used to check whether the object is a socket_poller.
-    uint32_t _tag;
-
-    //  Signaler used for thread safe sockets polling
-    signaler_t *_signaler;
-
-    //  List of sockets
-    typedef std::vector<item_t> items_t;
-    items_t _items;
-
-    //  Does the pollset needs rebuilding?
-    bool _need_rebuild;
-
-    //  Should the signaler be used for the thread safe polling?
-    bool _use_signaler;
-
-    //  Size of the pollset
-    int _pollset_size;
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-    pollfd *_pollfds;
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-    resizable_optimized_fd_set_t _pollset_in;
-    resizable_optimized_fd_set_t _pollset_out;
-    resizable_optimized_fd_set_t _pollset_err;
-    zmq::fd_t _max_fd;
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (socket_poller_t)
-};
-}
-
-#endif
diff --git a/src/socks.cpp b/src/socks.cpp
deleted file mode 100644
index 9da12be63..000000000
--- a/src/socks.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <sys/types.h>
-
-#include "err.hpp"
-#include "socks.hpp"
-#include "tcp.hpp"
-#include "blob.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-
-zmq::socks_greeting_t::socks_greeting_t (uint8_t method_) : num_methods (1)
-{
-    methods[0] = method_;
-}
-
-zmq::socks_greeting_t::socks_greeting_t (const uint8_t *methods_,
-                                         uint8_t num_methods_) :
-    num_methods (num_methods_)
-{
-    for (uint8_t i = 0; i < num_methods_; i++)
-        methods[i] = methods_[i];
-}
-
-zmq::socks_greeting_encoder_t::socks_greeting_encoder_t () :
-    _bytes_encoded (0),
-    _bytes_written (0)
-{
-}
-
-void zmq::socks_greeting_encoder_t::encode (const socks_greeting_t &greeting_)
-{
-    uint8_t *ptr = _buf;
-
-    *ptr++ = 0x05;
-    *ptr++ = static_cast<uint8_t> (greeting_.num_methods);
-    for (uint8_t i = 0; i < greeting_.num_methods; i++)
-        *ptr++ = greeting_.methods[i];
-
-    _bytes_encoded = 2 + greeting_.num_methods;
-    _bytes_written = 0;
-}
-
-int zmq::socks_greeting_encoder_t::output (fd_t fd_)
-{
-    const int rc =
-      tcp_write (fd_, _buf + _bytes_written, _bytes_encoded - _bytes_written);
-    if (rc > 0)
-        _bytes_written += static_cast<size_t> (rc);
-    return rc;
-}
-
-bool zmq::socks_greeting_encoder_t::has_pending_data () const
-{
-    return _bytes_written < _bytes_encoded;
-}
-
-void zmq::socks_greeting_encoder_t::reset ()
-{
-    _bytes_encoded = _bytes_written = 0;
-}
-
-zmq::socks_choice_t::socks_choice_t (unsigned char method_) : method (method_)
-{
-}
-
-zmq::socks_choice_decoder_t::socks_choice_decoder_t () : _bytes_read (0)
-{
-}
-
-int zmq::socks_choice_decoder_t::input (fd_t fd_)
-{
-    zmq_assert (_bytes_read < 2);
-    const int rc = tcp_read (fd_, _buf + _bytes_read, 2 - _bytes_read);
-    if (rc > 0) {
-        _bytes_read += static_cast<size_t> (rc);
-        if (_buf[0] != 0x05)
-            return -1;
-    }
-    return rc;
-}
-
-bool zmq::socks_choice_decoder_t::message_ready () const
-{
-    return _bytes_read == 2;
-}
-
-zmq::socks_choice_t zmq::socks_choice_decoder_t::decode ()
-{
-    zmq_assert (message_ready ());
-    return socks_choice_t (_buf[1]);
-}
-
-void zmq::socks_choice_decoder_t::reset ()
-{
-    _bytes_read = 0;
-}
-
-
-zmq::socks_basic_auth_request_t::socks_basic_auth_request_t (
-  const std::string &username_, const std::string &password_) :
-    username (username_),
-    password (password_)
-{
-    zmq_assert (username_.size () <= UINT8_MAX);
-    zmq_assert (password_.size () <= UINT8_MAX);
-}
-
-
-zmq::socks_basic_auth_request_encoder_t::socks_basic_auth_request_encoder_t () :
-    _bytes_encoded (0),
-    _bytes_written (0)
-{
-}
-
-void zmq::socks_basic_auth_request_encoder_t::encode (
-  const socks_basic_auth_request_t &req_)
-{
-    unsigned char *ptr = _buf;
-    *ptr++ = 0x01;
-    *ptr++ = static_cast<unsigned char> (req_.username.size ());
-    memcpy (ptr, req_.username.c_str (), req_.username.size ());
-    ptr += req_.username.size ();
-    *ptr++ = static_cast<unsigned char> (req_.password.size ());
-    memcpy (ptr, req_.password.c_str (), req_.password.size ());
-    ptr += req_.password.size ();
-
-    _bytes_encoded = ptr - _buf;
-    _bytes_written = 0;
-}
-
-int zmq::socks_basic_auth_request_encoder_t::output (fd_t fd_)
-{
-    const int rc =
-      tcp_write (fd_, _buf + _bytes_written, _bytes_encoded - _bytes_written);
-    if (rc > 0)
-        _bytes_written += static_cast<size_t> (rc);
-    return rc;
-}
-
-bool zmq::socks_basic_auth_request_encoder_t::has_pending_data () const
-{
-    return _bytes_written < _bytes_encoded;
-}
-
-void zmq::socks_basic_auth_request_encoder_t::reset ()
-{
-    _bytes_encoded = _bytes_written = 0;
-}
-
-
-zmq::socks_auth_response_t::socks_auth_response_t (uint8_t response_code_) :
-    response_code (response_code_)
-{
-}
-
-zmq::socks_auth_response_decoder_t::socks_auth_response_decoder_t () :
-    _bytes_read (0)
-{
-}
-
-int zmq::socks_auth_response_decoder_t::input (fd_t fd_)
-{
-    zmq_assert (_bytes_read < 2);
-    const int rc = tcp_read (fd_, _buf + _bytes_read, 2 - _bytes_read);
-    if (rc > 0) {
-        _bytes_read += static_cast<size_t> (rc);
-        if (_buf[0] != 0x01)
-            return -1;
-    }
-    return rc;
-}
-
-bool zmq::socks_auth_response_decoder_t::message_ready () const
-{
-    return _bytes_read == 2;
-}
-
-zmq::socks_auth_response_t zmq::socks_auth_response_decoder_t::decode ()
-{
-    zmq_assert (message_ready ());
-    return socks_auth_response_t (_buf[1]);
-}
-
-void zmq::socks_auth_response_decoder_t::reset ()
-{
-    _bytes_read = 0;
-}
-
-
-zmq::socks_request_t::socks_request_t (uint8_t command_,
-                                       std::string hostname_,
-                                       uint16_t port_) :
-    command (command_),
-    hostname (ZMQ_MOVE (hostname_)),
-    port (port_)
-{
-    zmq_assert (hostname.size () <= UINT8_MAX);
-}
-
-zmq::socks_request_encoder_t::socks_request_encoder_t () :
-    _bytes_encoded (0),
-    _bytes_written (0)
-{
-}
-
-void zmq::socks_request_encoder_t::encode (const socks_request_t &req_)
-{
-    zmq_assert (req_.hostname.size () <= UINT8_MAX);
-
-    unsigned char *ptr = _buf;
-    *ptr++ = 0x05;
-    *ptr++ = req_.command;
-    *ptr++ = 0x00;
-
-#if defined ZMQ_HAVE_OPENVMS && defined __ia64 && __INITIAL_POINTER_SIZE == 64
-    __addrinfo64 hints, *res = NULL;
-#else
-    addrinfo hints, *res = NULL;
-#endif
-
-    memset (&hints, 0, sizeof hints);
-
-    //  Suppress potential DNS lookups.
-    hints.ai_flags = AI_NUMERICHOST;
-
-    const int rc = getaddrinfo (req_.hostname.c_str (), NULL, &hints, &res);
-    if (rc == 0 && res->ai_family == AF_INET) {
-        const struct sockaddr_in *sockaddr_in =
-          reinterpret_cast<const struct sockaddr_in *> (res->ai_addr);
-        *ptr++ = 0x01;
-        memcpy (ptr, &sockaddr_in->sin_addr, 4);
-        ptr += 4;
-    } else if (rc == 0 && res->ai_family == AF_INET6) {
-        const struct sockaddr_in6 *sockaddr_in6 =
-          reinterpret_cast<const struct sockaddr_in6 *> (res->ai_addr);
-        *ptr++ = 0x04;
-        memcpy (ptr, &sockaddr_in6->sin6_addr, 16);
-        ptr += 16;
-    } else {
-        *ptr++ = 0x03;
-        *ptr++ = static_cast<unsigned char> (req_.hostname.size ());
-        memcpy (ptr, req_.hostname.c_str (), req_.hostname.size ());
-        ptr += req_.hostname.size ();
-    }
-
-    if (rc == 0)
-        freeaddrinfo (res);
-
-    *ptr++ = req_.port / 256;
-    *ptr++ = req_.port % 256;
-
-    _bytes_encoded = ptr - _buf;
-    _bytes_written = 0;
-}
-
-int zmq::socks_request_encoder_t::output (fd_t fd_)
-{
-    const int rc =
-      tcp_write (fd_, _buf + _bytes_written, _bytes_encoded - _bytes_written);
-    if (rc > 0)
-        _bytes_written += static_cast<size_t> (rc);
-    return rc;
-}
-
-bool zmq::socks_request_encoder_t::has_pending_data () const
-{
-    return _bytes_written < _bytes_encoded;
-}
-
-void zmq::socks_request_encoder_t::reset ()
-{
-    _bytes_encoded = _bytes_written = 0;
-}
-
-zmq::socks_response_t::socks_response_t (uint8_t response_code_,
-                                         const std::string &address_,
-                                         uint16_t port_) :
-    response_code (response_code_),
-    address (address_),
-    port (port_)
-{
-}
-
-zmq::socks_response_decoder_t::socks_response_decoder_t () : _bytes_read (0)
-{
-}
-
-int zmq::socks_response_decoder_t::input (fd_t fd_)
-{
-    size_t n = 0;
-
-    if (_bytes_read < 5)
-        n = 5 - _bytes_read;
-    else {
-        const uint8_t atyp = _buf[3];
-        zmq_assert (atyp == 0x01 || atyp == 0x03 || atyp == 0x04);
-        if (atyp == 0x01)
-            n = 3 + 2;
-        else if (atyp == 0x03)
-            n = _buf[4] + 2;
-        else if (atyp == 0x04)
-            n = 15 + 2;
-    }
-    const int rc = tcp_read (fd_, _buf + _bytes_read, n);
-    if (rc > 0) {
-        _bytes_read += static_cast<size_t> (rc);
-        if (_buf[0] != 0x05)
-            return -1;
-        if (_bytes_read >= 2)
-            if (_buf[1] > 0x08)
-                return -1;
-        if (_bytes_read >= 3)
-            if (_buf[2] != 0x00)
-                return -1;
-        if (_bytes_read >= 4) {
-            const uint8_t atyp = _buf[3];
-            if (atyp != 0x01 && atyp != 0x03 && atyp != 0x04)
-                return -1;
-        }
-    }
-    return rc;
-}
-
-bool zmq::socks_response_decoder_t::message_ready () const
-{
-    if (_bytes_read < 4)
-        return false;
-
-    const uint8_t atyp = _buf[3];
-    zmq_assert (atyp == 0x01 || atyp == 0x03 || atyp == 0x04);
-    if (atyp == 0x01)
-        return _bytes_read == 10;
-    if (atyp == 0x03)
-        return _bytes_read > 4 && _bytes_read == 4 + 1 + _buf[4] + 2u;
-
-    return _bytes_read == 22;
-}
-
-zmq::socks_response_t zmq::socks_response_decoder_t::decode ()
-{
-    zmq_assert (message_ready ());
-    return socks_response_t (_buf[1], "", 0);
-}
-
-void zmq::socks_response_decoder_t::reset ()
-{
-    _bytes_read = 0;
-}
diff --git a/src/socks.hpp b/src/socks.hpp
deleted file mode 100644
index bc3d5e2f7..000000000
--- a/src/socks.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SOCKS_HPP_INCLUDED__
-#define __ZMQ_SOCKS_HPP_INCLUDED__
-
-#include <string>
-#include "fd.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-struct socks_greeting_t
-{
-    socks_greeting_t (uint8_t method_);
-    socks_greeting_t (const uint8_t *methods_, uint8_t num_methods_);
-
-    uint8_t methods[UINT8_MAX];
-    const size_t num_methods;
-};
-
-class socks_greeting_encoder_t
-{
-  public:
-    socks_greeting_encoder_t ();
-    void encode (const socks_greeting_t &greeting_);
-    int output (fd_t fd_);
-    bool has_pending_data () const;
-    void reset ();
-
-  private:
-    size_t _bytes_encoded;
-    size_t _bytes_written;
-    uint8_t _buf[2 + UINT8_MAX];
-};
-
-struct socks_choice_t
-{
-    socks_choice_t (uint8_t method_);
-
-    uint8_t method;
-};
-
-class socks_choice_decoder_t
-{
-  public:
-    socks_choice_decoder_t ();
-    int input (fd_t fd_);
-    bool message_ready () const;
-    socks_choice_t decode ();
-    void reset ();
-
-  private:
-    unsigned char _buf[2];
-    size_t _bytes_read;
-};
-
-
-struct socks_basic_auth_request_t
-{
-    socks_basic_auth_request_t (const std::string &username_,
-                                const std::string &password_);
-
-    const std::string username;
-    const std::string password;
-};
-
-class socks_basic_auth_request_encoder_t
-{
-  public:
-    socks_basic_auth_request_encoder_t ();
-    void encode (const socks_basic_auth_request_t &req_);
-    int output (fd_t fd_);
-    bool has_pending_data () const;
-    void reset ();
-
-  private:
-    size_t _bytes_encoded;
-    size_t _bytes_written;
-    uint8_t _buf[1 + 1 + UINT8_MAX + 1 + UINT8_MAX];
-};
-
-struct socks_auth_response_t
-{
-    socks_auth_response_t (uint8_t response_code_);
-    uint8_t response_code;
-};
-
-class socks_auth_response_decoder_t
-{
-  public:
-    socks_auth_response_decoder_t ();
-    int input (fd_t fd_);
-    bool message_ready () const;
-    socks_auth_response_t decode ();
-    void reset ();
-
-  private:
-    int8_t _buf[2];
-    size_t _bytes_read;
-};
-
-struct socks_request_t
-{
-    socks_request_t (uint8_t command_, std::string hostname_, uint16_t port_);
-
-    const uint8_t command;
-    const std::string hostname;
-    const uint16_t port;
-};
-
-class socks_request_encoder_t
-{
-  public:
-    socks_request_encoder_t ();
-    void encode (const socks_request_t &req_);
-    int output (fd_t fd_);
-    bool has_pending_data () const;
-    void reset ();
-
-  private:
-    size_t _bytes_encoded;
-    size_t _bytes_written;
-    uint8_t _buf[4 + UINT8_MAX + 1 + 2];
-};
-
-struct socks_response_t
-{
-    socks_response_t (uint8_t response_code_,
-                      const std::string &address_,
-                      uint16_t port_);
-    uint8_t response_code;
-    std::string address;
-    uint16_t port;
-};
-
-class socks_response_decoder_t
-{
-  public:
-    socks_response_decoder_t ();
-    int input (fd_t fd_);
-    bool message_ready () const;
-    socks_response_t decode ();
-    void reset ();
-
-  private:
-    int8_t _buf[4 + UINT8_MAX + 1 + 2];
-    size_t _bytes_read;
-};
-}
-
-#endif
diff --git a/src/socks_connecter.cpp b/src/socks_connecter.cpp
deleted file mode 100644
index b2931605c..000000000
--- a/src/socks_connecter.cpp
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <string>
-
-#include "macros.hpp"
-#include "socks_connecter.hpp"
-#include "random.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "address.hpp"
-#include "tcp_address.hpp"
-#include "session_base.hpp"
-#include "socks.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#if defined ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-zmq::socks_connecter_t::socks_connecter_t (class io_thread_t *io_thread_,
-                                           class session_base_t *session_,
-                                           const options_t &options_,
-                                           address_t *addr_,
-                                           address_t *proxy_addr_,
-                                           bool delayed_start_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_),
-    _proxy_addr (proxy_addr_),
-    _auth_method (socks_no_auth_required),
-    _status (unplugged)
-{
-    zmq_assert (_addr->protocol == protocol_name::tcp);
-    _proxy_addr->to_string (_endpoint);
-}
-
-zmq::socks_connecter_t::~socks_connecter_t ()
-{
-    LIBZMQ_DELETE (_proxy_addr);
-}
-
-void zmq::socks_connecter_t::set_auth_method_none ()
-{
-    _auth_method = socks_no_auth_required;
-    _auth_username.clear ();
-    _auth_password.clear ();
-}
-
-void zmq::socks_connecter_t::set_auth_method_basic (
-  const std::string &username_, const std::string &password_)
-{
-    _auth_method = socks_basic_auth;
-    _auth_username = username_;
-    _auth_password = password_;
-}
-
-void zmq::socks_connecter_t::in_event ()
-{
-    int expected_status = -1;
-    zmq_assert (_status != unplugged);
-
-    if (_status == waiting_for_choice) {
-        int rc = _choice_decoder.input (_s);
-        if (rc == 0 || rc == -1)
-            error ();
-        else if (_choice_decoder.message_ready ()) {
-            const socks_choice_t choice = _choice_decoder.decode ();
-            rc = process_server_response (choice);
-            if (rc == -1)
-                error ();
-            else {
-                if (choice.method == socks_basic_auth)
-                    expected_status = sending_basic_auth_request;
-                else
-                    expected_status = sending_request;
-            }
-        }
-    } else if (_status == waiting_for_auth_response) {
-        int rc = _auth_response_decoder.input (_s);
-        if (rc == 0 || rc == -1)
-            error ();
-        else if (_auth_response_decoder.message_ready ()) {
-            const socks_auth_response_t auth_response =
-              _auth_response_decoder.decode ();
-            rc = process_server_response (auth_response);
-            if (rc == -1)
-                error ();
-            else {
-                expected_status = sending_request;
-            }
-        }
-    } else if (_status == waiting_for_response) {
-        int rc = _response_decoder.input (_s);
-        if (rc == 0 || rc == -1)
-            error ();
-        else if (_response_decoder.message_ready ()) {
-            const socks_response_t response = _response_decoder.decode ();
-            rc = process_server_response (response);
-            if (rc == -1)
-                error ();
-            else {
-                rm_handle ();
-                create_engine (
-                  _s, get_socket_name<tcp_address_t> (_s, socket_end_local));
-                _s = -1;
-                _status = unplugged;
-            }
-        }
-    } else
-        error ();
-
-    if (expected_status == sending_basic_auth_request) {
-        _basic_auth_request_encoder.encode (
-          socks_basic_auth_request_t (_auth_username, _auth_password));
-        reset_pollin (_handle);
-        set_pollout (_handle);
-        _status = sending_basic_auth_request;
-    } else if (expected_status == sending_request) {
-        std::string hostname;
-        uint16_t port = 0;
-        if (parse_address (_addr->address, hostname, port) == -1)
-            error ();
-        else {
-            _request_encoder.encode (socks_request_t (1, hostname, port));
-            reset_pollin (_handle);
-            set_pollout (_handle);
-            _status = sending_request;
-        }
-    }
-}
-
-void zmq::socks_connecter_t::out_event ()
-{
-    zmq_assert (
-      _status == waiting_for_proxy_connection || _status == sending_greeting
-      || _status == sending_basic_auth_request || _status == sending_request);
-
-    if (_status == waiting_for_proxy_connection) {
-        const int rc = static_cast<int> (check_proxy_connection ());
-        if (rc == -1)
-            error ();
-        else {
-            _greeting_encoder.encode (socks_greeting_t (_auth_method));
-            _status = sending_greeting;
-        }
-    } else if (_status == sending_greeting) {
-        zmq_assert (_greeting_encoder.has_pending_data ());
-        const int rc = _greeting_encoder.output (_s);
-        if (rc == -1 || rc == 0)
-            error ();
-        else if (!_greeting_encoder.has_pending_data ()) {
-            reset_pollout (_handle);
-            set_pollin (_handle);
-            _status = waiting_for_choice;
-        }
-    } else if (_status == sending_basic_auth_request) {
-        zmq_assert (_basic_auth_request_encoder.has_pending_data ());
-        const int rc = _basic_auth_request_encoder.output (_s);
-        if (rc == -1 || rc == 0)
-            error ();
-        else if (!_basic_auth_request_encoder.has_pending_data ()) {
-            reset_pollout (_handle);
-            set_pollin (_handle);
-            _status = waiting_for_auth_response;
-        }
-    } else {
-        zmq_assert (_request_encoder.has_pending_data ());
-        const int rc = _request_encoder.output (_s);
-        if (rc == -1 || rc == 0)
-            error ();
-        else if (!_request_encoder.has_pending_data ()) {
-            reset_pollout (_handle);
-            set_pollin (_handle);
-            _status = waiting_for_response;
-        }
-    }
-}
-
-void zmq::socks_connecter_t::start_connecting ()
-{
-    zmq_assert (_status == unplugged);
-
-    //  Open the connecting socket.
-    const int rc = connect_to_proxy ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _status = sending_greeting;
-    }
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _status = waiting_for_proxy_connection;
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-    }
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-int zmq::socks_connecter_t::process_server_response (
-  const socks_choice_t &response_)
-{
-    return response_.method == socks_no_auth_required
-               || response_.method == socks_basic_auth
-             ? 0
-             : -1;
-}
-
-int zmq::socks_connecter_t::process_server_response (
-  const socks_response_t &response_)
-{
-    return response_.response_code == 0 ? 0 : -1;
-}
-
-int zmq::socks_connecter_t::process_server_response (
-  const socks_auth_response_t &response_)
-{
-    return response_.response_code == 0 ? 0 : -1;
-}
-
-void zmq::socks_connecter_t::error ()
-{
-    rm_fd (_handle);
-    close ();
-    _greeting_encoder.reset ();
-    _choice_decoder.reset ();
-    _basic_auth_request_encoder.reset ();
-    _auth_response_decoder.reset ();
-    _request_encoder.reset ();
-    _response_decoder.reset ();
-    _status = unplugged;
-    add_reconnect_timer ();
-}
-
-int zmq::socks_connecter_t::connect_to_proxy ()
-{
-    zmq_assert (_s == retired_fd);
-
-    //  Resolve the address
-    if (_proxy_addr->resolved.tcp_addr != NULL) {
-        LIBZMQ_DELETE (_proxy_addr->resolved.tcp_addr);
-    }
-
-    _proxy_addr->resolved.tcp_addr = new (std::nothrow) tcp_address_t ();
-    alloc_assert (_proxy_addr->resolved.tcp_addr);
-    //  Automatic fallback to ipv4 is disabled here since this was the existing
-    //  behaviour, however I don't see a real reason for this. Maybe this can
-    //  be changed to true (and then the parameter can be removed entirely).
-    _s = tcp_open_socket (_proxy_addr->address.c_str (), options, false, false,
-                          _proxy_addr->resolved.tcp_addr);
-    if (_s == retired_fd) {
-        //  TODO we should emit some event in this case!
-        LIBZMQ_DELETE (_proxy_addr->resolved.tcp_addr);
-        return -1;
-    }
-    zmq_assert (_proxy_addr->resolved.tcp_addr != NULL);
-
-    // Set the socket to non-blocking mode so that we get async connect().
-    unblock_socket (_s);
-
-    const tcp_address_t *const tcp_addr = _proxy_addr->resolved.tcp_addr;
-
-    int rc;
-
-    // Set a source address for conversations
-    if (tcp_addr->has_src_addr ()) {
-#if defined ZMQ_HAVE_VXWORKS
-        rc = ::bind (_s, (sockaddr *) tcp_addr->src_addr (),
-                     tcp_addr->src_addrlen ());
-#else
-        rc = ::bind (_s, tcp_addr->src_addr (), tcp_addr->src_addrlen ());
-#endif
-        if (rc == -1) {
-            close ();
-            return -1;
-        }
-    }
-
-    //  Connect to the remote peer.
-#if defined ZMQ_HAVE_VXWORKS
-    rc = ::connect (_s, (sockaddr *) tcp_addr->addr (), tcp_addr->addrlen ());
-#else
-    rc = ::connect (_s, tcp_addr->addr (), tcp_addr->addrlen ());
-#endif
-    //  Connect was successful immediately.
-    if (rc == 0)
-        return 0;
-
-        //  Translate error codes indicating asynchronous connect has been
-        //  launched to a uniform EINPROGRESS.
-#ifdef ZMQ_HAVE_WINDOWS
-    const int last_error = WSAGetLastError ();
-    if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)
-        errno = EINPROGRESS;
-    else {
-        errno = wsa_error_to_errno (last_error);
-        close ();
-    }
-#else
-    if (errno == EINTR)
-        errno = EINPROGRESS;
-#endif
-    return -1;
-}
-
-zmq::fd_t zmq::socks_connecter_t::check_proxy_connection () const
-{
-    //  Async connect has finished. Check whether an error occurred
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int len = sizeof err;
-#else
-    socklen_t len = sizeof err;
-#endif
-
-    int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                         reinterpret_cast<char *> (&err), &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        wsa_assert (err == WSAECONNREFUSED || err == WSAETIMEDOUT
-                    || err == WSAECONNABORTED || err == WSAEHOSTUNREACH
-                    || err == WSAENETUNREACH || err == WSAENETDOWN
-                    || err == WSAEACCES || err == WSAEINVAL
-                    || err == WSAEADDRINUSE);
-        return -1;
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-        errno_assert (errno == ECONNREFUSED || errno == ECONNRESET
-                      || errno == ETIMEDOUT || errno == EHOSTUNREACH
-                      || errno == ENETUNREACH || errno == ENETDOWN
-                      || errno == EINVAL);
-        return -1;
-    }
-#endif
-
-    rc = tune_tcp_socket (_s);
-    rc = rc
-         | tune_tcp_keepalives (
-           _s, options.tcp_keepalive, options.tcp_keepalive_cnt,
-           options.tcp_keepalive_idle, options.tcp_keepalive_intvl);
-    if (rc != 0)
-        return -1;
-
-    return 0;
-}
-
-int zmq::socks_connecter_t::parse_address (const std::string &address_,
-                                           std::string &hostname_,
-                                           uint16_t &port_)
-{
-    //  Find the ':' at end that separates address from the port number.
-    const size_t idx = address_.rfind (':');
-    if (idx == std::string::npos) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Extract hostname
-    if (idx < 2 || address_[0] != '[' || address_[idx - 1] != ']')
-        hostname_ = address_.substr (0, idx);
-    else
-        hostname_ = address_.substr (1, idx - 2);
-
-    //  Separate the hostname/port.
-    const std::string port_str = address_.substr (idx + 1);
-    //  Parse the port number (0 is not a valid port).
-    port_ = static_cast<uint16_t> (atoi (port_str.c_str ()));
-    if (port_ == 0) {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
diff --git a/src/socks_connecter.hpp b/src/socks_connecter.hpp
deleted file mode 100644
index de79415c9..000000000
--- a/src/socks_connecter.hpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __SOCKS_CONNECTER_HPP_INCLUDED__
-#define __SOCKS_CONNECTER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "stream_connecter_base.hpp"
-#include "stdint.hpp"
-#include "socks.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-struct address_t;
-
-class socks_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    socks_connecter_t (zmq::io_thread_t *io_thread_,
-                       zmq::session_base_t *session_,
-                       const options_t &options_,
-                       address_t *addr_,
-                       address_t *proxy_addr_,
-                       bool delayed_start_);
-    ~socks_connecter_t ();
-
-    void set_auth_method_basic (const std::string &username,
-                                const std::string &password);
-    void set_auth_method_none ();
-
-
-  private:
-    enum
-    {
-        unplugged,
-        waiting_for_reconnect_time,
-        waiting_for_proxy_connection,
-        sending_greeting,
-        waiting_for_choice,
-        sending_basic_auth_request,
-        waiting_for_auth_response,
-        sending_request,
-        waiting_for_response
-    };
-
-    //  Method ID
-    enum
-    {
-        socks_no_auth_required = 0x00,
-        socks_basic_auth = 0x02,
-        socks_no_acceptable_method = 0xff
-    };
-
-    //  Handlers for I/O events.
-    void in_event ();
-    void out_event ();
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    static int process_server_response (const socks_choice_t &response_);
-    static int process_server_response (const socks_response_t &response_);
-    static int process_server_response (const socks_auth_response_t &response_);
-
-    static int parse_address (const std::string &address_,
-                              std::string &hostname_,
-                              uint16_t &port_);
-
-    int connect_to_proxy ();
-
-    void error ();
-
-    //  Open TCP connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    zmq::fd_t check_proxy_connection () const;
-
-    socks_greeting_encoder_t _greeting_encoder;
-    socks_choice_decoder_t _choice_decoder;
-    socks_basic_auth_request_encoder_t _basic_auth_request_encoder;
-    socks_auth_response_decoder_t _auth_response_decoder;
-    socks_request_encoder_t _request_encoder;
-    socks_response_decoder_t _response_decoder;
-
-    //  SOCKS address; owned by this connecter.
-    address_t *_proxy_addr;
-
-    // User defined authentication method
-    int _auth_method;
-
-    // Credentials for basic authentication
-    std::string _auth_username;
-    std::string _auth_password;
-
-    int _status;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (socks_connecter_t)
-};
-}
-
-#endif
diff --git a/src/stdint.hpp b/src/stdint.hpp
deleted file mode 100644
index dc4d5df1f..000000000
--- a/src/stdint.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_STDINT_HPP_INCLUDED__
-#define __ZMQ_STDINT_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
-
-#include <inttypes.h>
-
-#elif defined _MSC_VER && _MSC_VER < 1600
-
-#ifndef int8_t
-typedef __int8 int8_t;
-#endif
-#ifndef int16_t
-typedef __int16 int16_t;
-#endif
-#ifndef int32_t
-typedef __int32 int32_t;
-#endif
-#ifndef int64_t
-typedef __int64 int64_t;
-#endif
-#ifndef uint8_t
-typedef unsigned __int8 uint8_t;
-#endif
-#ifndef uint16_t
-typedef unsigned __int16 uint16_t;
-#endif
-#ifndef uint32_t
-typedef unsigned __int32 uint32_t;
-#endif
-#ifndef uint64_t
-typedef unsigned __int64 uint64_t;
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX _UI16_MAX
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX _UI32_MAX
-#endif
-
-#else
-
-#include <stdint.h>
-
-#endif
-
-#ifndef UINT8_MAX
-#define UINT8_MAX 0xFF
-#endif
-
-#endif
diff --git a/src/stream.cpp b/src/stream.cpp
deleted file mode 100644
index 3713c7e7d..000000000
--- a/src/stream.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "stream.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::stream_t::stream_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    routing_socket_base_t (parent_, tid_, sid_),
-    _prefetched (false),
-    _routing_id_sent (false),
-    _current_out (NULL),
-    _more_out (false),
-    _next_integral_routing_id (generate_random ())
-{
-    options.type = ZMQ_STREAM;
-    options.raw_socket = true;
-
-    _prefetched_routing_id.init ();
-    _prefetched_msg.init ();
-}
-
-zmq::stream_t::~stream_t ()
-{
-    _prefetched_routing_id.close ();
-    _prefetched_msg.close ();
-}
-
-void zmq::stream_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-
-    zmq_assert (pipe_);
-
-    identify_peer (pipe_, locally_initiated_);
-    _fq.attach (pipe_);
-}
-
-void zmq::stream_t::xpipe_terminated (pipe_t *pipe_)
-{
-    erase_out_pipe (pipe_);
-    _fq.pipe_terminated (pipe_);
-    // TODO router_t calls pipe_->rollback() here; should this be done here as
-    // well? then xpipe_terminated could be pulled up to routing_socket_base_t
-    if (pipe_ == _current_out)
-        _current_out = NULL;
-}
-
-void zmq::stream_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-int zmq::stream_t::xsend (msg_t *msg_)
-{
-    //  If this is the first part of the message it's the ID of the
-    //  peer to send the message to.
-    if (!_more_out) {
-        zmq_assert (!_current_out);
-
-        //  If we have malformed message (prefix with no subsequent message)
-        //  then just silently ignore it.
-        //  TODO: The connections should be killed instead.
-        if (msg_->flags () & msg_t::more) {
-            //  Find the pipe associated with the routing id stored in the prefix.
-            //  If there's no such pipe return an error
-
-            out_pipe_t *out_pipe = lookup_out_pipe (
-              blob_t (static_cast<unsigned char *> (msg_->data ()),
-                      msg_->size (), reference_tag_t ()));
-
-            if (out_pipe) {
-                _current_out = out_pipe->pipe;
-                if (!_current_out->check_write ()) {
-                    out_pipe->active = false;
-                    _current_out = NULL;
-                    errno = EAGAIN;
-                    return -1;
-                }
-            } else {
-                errno = EHOSTUNREACH;
-                return -1;
-            }
-        }
-
-        //  Expect one more message frame.
-        _more_out = true;
-
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-
-    //  Ignore the MORE flag
-    msg_->reset_flags (msg_t::more);
-
-    //  This is the last part of the message.
-    _more_out = false;
-
-    //  Push the message into the pipe. If there's no out pipe, just drop it.
-    if (_current_out) {
-        // Close the remote connection if user has asked to do so
-        // by sending zero length message.
-        // Pending messages in the pipe will be dropped (on receiving term- ack)
-        if (msg_->size () == 0) {
-            _current_out->terminate (false);
-            int rc = msg_->close ();
-            errno_assert (rc == 0);
-            rc = msg_->init ();
-            errno_assert (rc == 0);
-            _current_out = NULL;
-            return 0;
-        }
-        const bool ok = _current_out->write (msg_);
-        if (likely (ok))
-            _current_out->flush ();
-        _current_out = NULL;
-    } else {
-        const int rc = msg_->close ();
-        errno_assert (rc == 0);
-    }
-
-    //  Detach the message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::stream_t::xsetsockopt (int option_,
-                                const void *optval_,
-                                size_t optvallen_)
-{
-    switch (option_) {
-        case ZMQ_STREAM_NOTIFY:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &options.raw_notify);
-
-        default:
-            return routing_socket_base_t::xsetsockopt (option_, optval_,
-                                                       optvallen_);
-    }
-}
-
-int zmq::stream_t::xrecv (msg_t *msg_)
-{
-    if (_prefetched) {
-        if (!_routing_id_sent) {
-            const int rc = msg_->move (_prefetched_routing_id);
-            errno_assert (rc == 0);
-            _routing_id_sent = true;
-        } else {
-            const int rc = msg_->move (_prefetched_msg);
-            errno_assert (rc == 0);
-            _prefetched = false;
-        }
-        return 0;
-    }
-
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (&_prefetched_msg, &pipe);
-    if (rc != 0)
-        return -1;
-
-    zmq_assert (pipe != NULL);
-    zmq_assert ((_prefetched_msg.flags () & msg_t::more) == 0);
-
-    //  We have received a frame with TCP data.
-    //  Rather than sending this frame, we keep it in prefetched
-    //  buffer and send a frame with peer's ID.
-    const blob_t &routing_id = pipe->get_routing_id ();
-    rc = msg_->close ();
-    errno_assert (rc == 0);
-    rc = msg_->init_size (routing_id.size ());
-    errno_assert (rc == 0);
-
-    // forward metadata (if any)
-    metadata_t *metadata = _prefetched_msg.metadata ();
-    if (metadata)
-        msg_->set_metadata (metadata);
-
-    memcpy (msg_->data (), routing_id.data (), routing_id.size ());
-    msg_->set_flags (msg_t::more);
-
-    _prefetched = true;
-    _routing_id_sent = true;
-
-    return 0;
-}
-
-bool zmq::stream_t::xhas_in ()
-{
-    //  We may already have a message pre-fetched.
-    if (_prefetched)
-        return true;
-
-    //  Try to read the next message.
-    //  The message, if read, is kept in the pre-fetch buffer.
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (&_prefetched_msg, &pipe);
-    if (rc != 0)
-        return false;
-
-    zmq_assert (pipe != NULL);
-    zmq_assert ((_prefetched_msg.flags () & msg_t::more) == 0);
-
-    const blob_t &routing_id = pipe->get_routing_id ();
-    rc = _prefetched_routing_id.init_size (routing_id.size ());
-    errno_assert (rc == 0);
-
-    // forward metadata (if any)
-    metadata_t *metadata = _prefetched_msg.metadata ();
-    if (metadata)
-        _prefetched_routing_id.set_metadata (metadata);
-
-    memcpy (_prefetched_routing_id.data (), routing_id.data (),
-            routing_id.size ());
-    _prefetched_routing_id.set_flags (msg_t::more);
-
-    _prefetched = true;
-    _routing_id_sent = false;
-
-    return true;
-}
-
-bool zmq::stream_t::xhas_out ()
-{
-    //  In theory, STREAM socket is always ready for writing. Whether actual
-    //  attempt to write succeeds depends on which pipe the message is going
-    //  to be routed to.
-    return true;
-}
-
-void zmq::stream_t::identify_peer (pipe_t *pipe_, bool locally_initiated_)
-{
-    //  Always assign routing id for raw-socket
-    unsigned char buffer[5];
-    buffer[0] = 0;
-    blob_t routing_id;
-    if (locally_initiated_ && connect_routing_id_is_set ()) {
-        const std::string connect_routing_id = extract_connect_routing_id ();
-        routing_id.set (
-          reinterpret_cast<const unsigned char *> (connect_routing_id.c_str ()),
-          connect_routing_id.length ());
-        //  Not allowed to duplicate an existing rid
-        zmq_assert (!has_out_pipe (routing_id));
-    } else {
-        put_uint32 (buffer + 1, _next_integral_routing_id++);
-        routing_id.set (buffer, sizeof buffer);
-        memcpy (options.routing_id, routing_id.data (), routing_id.size ());
-        options.routing_id_size =
-          static_cast<unsigned char> (routing_id.size ());
-    }
-    pipe_->set_router_socket_routing_id (routing_id);
-    add_out_pipe (ZMQ_MOVE (routing_id), pipe_);
-}
diff --git a/src/stream.hpp b/src/stream.hpp
deleted file mode 100644
index b5ea24cdd..000000000
--- a/src/stream.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_STREAM_HPP_INCLUDED__
-#define __ZMQ_STREAM_HPP_INCLUDED__
-
-#include <map>
-
-#include "router.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-
-class stream_t ZMQ_FINAL : public routing_socket_base_t
-{
-  public:
-    stream_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~stream_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-    int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-
-  private:
-    //  Generate peer's id and update lookup map
-    void identify_peer (pipe_t *pipe_, bool locally_initiated_);
-
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    //  True iff there is a message held in the pre-fetch buffer.
-    bool _prefetched;
-
-    //  If true, the receiver got the message part with
-    //  the peer's identity.
-    bool _routing_id_sent;
-
-    //  Holds the prefetched identity.
-    msg_t _prefetched_routing_id;
-
-    //  Holds the prefetched message.
-    msg_t _prefetched_msg;
-
-    //  The pipe we are currently writing to.
-    zmq::pipe_t *_current_out;
-
-    //  If true, more outgoing message parts are expected.
-    bool _more_out;
-
-    //  Routing IDs are generated. It's a simple increment and wrap-over
-    //  algorithm. This value is the next ID to use (if not used already).
-    uint32_t _next_integral_routing_id;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (stream_t)
-};
-}
-
-#endif
diff --git a/src/stream_connecter_base.cpp b/src/stream_connecter_base.cpp
deleted file mode 100755
index 16c58f66b..000000000
--- a/src/stream_connecter_base.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "stream_connecter_base.hpp"
-#include "session_base.hpp"
-#include "address.hpp"
-#include "random.hpp"
-#include "zmtp_engine.hpp"
-#include "raw_engine.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#else
-#include <winsock2.h>
-#endif
-
-#include <limits>
-
-zmq::stream_connecter_base_t::stream_connecter_base_t (
-  zmq::io_thread_t *io_thread_,
-  zmq::session_base_t *session_,
-  const zmq::options_t &options_,
-  zmq::address_t *addr_,
-  bool delayed_start_) :
-    own_t (io_thread_, options_),
-    io_object_t (io_thread_),
-    _addr (addr_),
-    _s (retired_fd),
-    _handle (static_cast<handle_t> (NULL)),
-    _socket (session_->get_socket ()),
-    _delayed_start (delayed_start_),
-    _reconnect_timer_started (false),
-    _current_reconnect_ivl (options.reconnect_ivl),
-    _session (session_)
-{
-    zmq_assert (_addr);
-    _addr->to_string (_endpoint);
-    // TODO the return value is unused! what if it fails? if this is impossible
-    // or does not matter, change such that endpoint in initialized using an
-    // initializer, and make endpoint const
-}
-
-zmq::stream_connecter_base_t::~stream_connecter_base_t ()
-{
-    zmq_assert (!_reconnect_timer_started);
-    zmq_assert (!_handle);
-    zmq_assert (_s == retired_fd);
-}
-
-void zmq::stream_connecter_base_t::process_plug ()
-{
-    if (_delayed_start)
-        add_reconnect_timer ();
-    else
-        start_connecting ();
-}
-
-void zmq::stream_connecter_base_t::process_term (int linger_)
-{
-    if (_reconnect_timer_started) {
-        cancel_timer (reconnect_timer_id);
-        _reconnect_timer_started = false;
-    }
-
-    if (_handle) {
-        rm_handle ();
-    }
-
-    if (_s != retired_fd)
-        close ();
-
-    own_t::process_term (linger_);
-}
-
-void zmq::stream_connecter_base_t::add_reconnect_timer ()
-{
-    if (options.reconnect_ivl != -1) {
-        const int interval = get_new_reconnect_ivl ();
-        add_timer (interval, reconnect_timer_id);
-        _socket->event_connect_retried (
-          make_unconnected_connect_endpoint_pair (_endpoint), interval);
-        _reconnect_timer_started = true;
-    }
-}
-
-int zmq::stream_connecter_base_t::get_new_reconnect_ivl ()
-{
-    //  TODO should the random jitter be really based on the configured initial
-    //  reconnect interval options.reconnect_ivl, or better on the
-    //  _current_reconnect_ivl?
-
-    //  The new interval is the current interval + random value.
-    const int random_jitter = generate_random () % options.reconnect_ivl;
-    const int interval =
-      _current_reconnect_ivl < std::numeric_limits<int>::max () - random_jitter
-        ? _current_reconnect_ivl + random_jitter
-        : std::numeric_limits<int>::max ();
-
-    //  Only change the new current reconnect interval if the maximum reconnect
-    //  interval was set and if it's larger than the reconnect interval.
-    if (options.reconnect_ivl_max > 0
-        && options.reconnect_ivl_max > options.reconnect_ivl) {
-        //  Calculate the next interval
-        _current_reconnect_ivl =
-          _current_reconnect_ivl < std::numeric_limits<int>::max () / 2
-            ? std::min (_current_reconnect_ivl * 2, options.reconnect_ivl_max)
-            : options.reconnect_ivl_max;
-    }
-
-    return interval;
-}
-
-void zmq::stream_connecter_base_t::rm_handle ()
-{
-    rm_fd (_handle);
-    _handle = static_cast<handle_t> (NULL);
-}
-
-void zmq::stream_connecter_base_t::close ()
-{
-    // TODO before, this was an assertion for _s != retired_fd, but this does not match usage of close
-    if (_s != retired_fd) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (_s);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        const int rc = ::close (_s);
-        errno_assert (rc == 0);
-#endif
-        _socket->event_closed (
-          make_unconnected_connect_endpoint_pair (_endpoint), _s);
-        _s = retired_fd;
-    }
-}
-
-void zmq::stream_connecter_base_t::in_event ()
-{
-    //  We are not polling for incoming data, so we are actually called
-    //  because of error here. However, we can get error on out event as well
-    //  on some platforms, so we'll simply handle both events in the same way.
-    out_event ();
-}
-
-void zmq::stream_connecter_base_t::create_engine (
-  fd_t fd_, const std::string &local_address_)
-{
-    const endpoint_uri_pair_t endpoint_pair (local_address_, _endpoint,
-                                             endpoint_type_connect);
-
-    //  Create the engine object for this connection.
-    i_engine *engine;
-    if (options.raw_socket)
-        engine = new (std::nothrow) raw_engine_t (fd_, options, endpoint_pair);
-    else
-        engine = new (std::nothrow) zmtp_engine_t (fd_, options, endpoint_pair);
-    alloc_assert (engine);
-
-    //  Attach the engine to the corresponding session object.
-    send_attach (_session, engine);
-
-    //  Shut the connecter down.
-    terminate ();
-
-    _socket->event_connected (endpoint_pair, fd_);
-}
-
-void zmq::stream_connecter_base_t::timer_event (int id_)
-{
-    zmq_assert (id_ == reconnect_timer_id);
-    _reconnect_timer_started = false;
-    start_connecting ();
-}
diff --git a/src/stream_connecter_base.hpp b/src/stream_connecter_base.hpp
deleted file mode 100755
index 008c90147..000000000
--- a/src/stream_connecter_base.hpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __STREAM_CONNECTER_BASE_HPP_INCLUDED__
-#define __STREAM_CONNECTER_BASE_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "own.hpp"
-#include "io_object.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-struct address_t;
-
-class stream_connecter_base_t : public own_t, public io_object_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    stream_connecter_base_t (zmq::io_thread_t *io_thread_,
-                             zmq::session_base_t *session_,
-                             const options_t &options_,
-                             address_t *addr_,
-                             bool delayed_start_);
-
-    ~stream_connecter_base_t () ZMQ_OVERRIDE;
-
-  protected:
-    //  Handlers for incoming commands.
-    void process_plug () ZMQ_FINAL;
-    void process_term (int linger_) ZMQ_OVERRIDE;
-
-    //  Handlers for I/O events.
-    void in_event () ZMQ_OVERRIDE;
-    void timer_event (int id_) ZMQ_OVERRIDE;
-
-    //  Internal function to create the engine after connection was established.
-    virtual void create_engine (fd_t fd, const std::string &local_address_);
-
-    //  Internal function to add a reconnect timer
-    void add_reconnect_timer ();
-
-    //  Removes the handle from the poller.
-    void rm_handle ();
-
-    //  Close the connecting socket.
-    void close ();
-
-    //  Address to connect to. Owned by session_base_t.
-    //  It is non-const since some parts may change during opening.
-    address_t *const _addr;
-
-    //  Underlying socket.
-    fd_t _s;
-
-    //  Handle corresponding to the listening socket, if file descriptor is
-    //  registered with the poller, or NULL.
-    handle_t _handle;
-
-    // String representation of endpoint to connect to
-    std::string _endpoint;
-
-    // Socket
-    zmq::socket_base_t *const _socket;
-
-  private:
-    //  ID of the timer used to delay the reconnection.
-    enum
-    {
-        reconnect_timer_id = 1
-    };
-
-    //  Internal function to return a reconnect backoff delay.
-    //  Will modify the current_reconnect_ivl used for next call
-    //  Returns the currently used interval
-    int get_new_reconnect_ivl ();
-
-    virtual void start_connecting () = 0;
-
-    //  If true, connecter is waiting a while before trying to connect.
-    const bool _delayed_start;
-
-    //  True iff a timer has been started.
-    bool _reconnect_timer_started;
-
-    //  Current reconnect ivl, updated for backoff strategy
-    int _current_reconnect_ivl;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (stream_connecter_base_t)
-
-  protected:
-    //  Reference to the session we belong to.
-    zmq::session_base_t *const _session;
-};
-}
-
-#endif
diff --git a/src/stream_engine_base.cpp b/src/stream_engine_base.cpp
deleted file mode 100644
index 9cddacacc..000000000
--- a/src/stream_engine_base.cpp
+++ /dev/null
@@ -1,768 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#include <limits.h>
-#include <string.h>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <new>
-#include <sstream>
-
-#include "stream_engine_base.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "v1_encoder.hpp"
-#include "v1_decoder.hpp"
-#include "v2_encoder.hpp"
-#include "v2_decoder.hpp"
-#include "null_mechanism.hpp"
-#include "plain_client.hpp"
-#include "plain_server.hpp"
-#include "gssapi_client.hpp"
-#include "gssapi_server.hpp"
-#include "curve_client.hpp"
-#include "curve_server.hpp"
-#include "raw_decoder.hpp"
-#include "raw_encoder.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-static std::string get_peer_address (zmq::fd_t s_)
-{
-    std::string peer_address;
-
-    const int family = zmq::get_peer_ip_address (s_, peer_address);
-    if (family == 0)
-        peer_address.clear ();
-#if defined ZMQ_HAVE_SO_PEERCRED
-    else if (family == PF_UNIX) {
-        struct ucred cred;
-        socklen_t size = sizeof (cred);
-        if (!getsockopt (s_, SOL_SOCKET, SO_PEERCRED, &cred, &size)) {
-            std::ostringstream buf;
-            buf << ":" << cred.uid << ":" << cred.gid << ":" << cred.pid;
-            peer_address += buf.str ();
-        }
-    }
-#elif defined ZMQ_HAVE_LOCAL_PEERCRED
-    else if (family == PF_UNIX) {
-        struct xucred cred;
-        socklen_t size = sizeof (cred);
-        if (!getsockopt (_s, 0, LOCAL_PEERCRED, &cred, &size)
-            && cred.cr_version == XUCRED_VERSION) {
-            std::ostringstream buf;
-            buf << ":" << cred.cr_uid << ":";
-            if (cred.cr_ngroups > 0)
-                buf << cred.cr_groups[0];
-            buf << ":";
-            _peer_address += buf.str ();
-        }
-    }
-#endif
-
-    return peer_address;
-}
-
-zmq::stream_engine_base_t::stream_engine_base_t (
-  fd_t fd_,
-  const options_t &options_,
-  const endpoint_uri_pair_t &endpoint_uri_pair_,
-  bool has_handshake_stage_) :
-    _options (options_),
-    _inpos (NULL),
-    _insize (0),
-    _decoder (NULL),
-    _outpos (NULL),
-    _outsize (0),
-    _encoder (NULL),
-    _mechanism (NULL),
-    _next_msg (NULL),
-    _process_msg (NULL),
-    _metadata (NULL),
-    _input_stopped (false),
-    _output_stopped (false),
-    _endpoint_uri_pair (endpoint_uri_pair_),
-    _has_handshake_timer (false),
-    _has_ttl_timer (false),
-    _has_timeout_timer (false),
-    _has_heartbeat_timer (false),
-    _peer_address (get_peer_address (fd_)),
-    _s (fd_),
-    _handle (static_cast<handle_t> (NULL)),
-    _plugged (false),
-    _handshaking (true),
-    _io_error (false),
-    _session (NULL),
-    _socket (NULL),
-    _has_handshake_stage (has_handshake_stage_)
-{
-    const int rc = _tx_msg.init ();
-    errno_assert (rc == 0);
-
-    //  Put the socket into non-blocking mode.
-    unblock_socket (_s);
-}
-
-zmq::stream_engine_base_t::~stream_engine_base_t ()
-{
-    zmq_assert (!_plugged);
-
-    if (_s != retired_fd) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (_s);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = close (_s);
-#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
-        // FreeBSD may return ECONNRESET on close() under load but this is not
-        // an error.
-        if (rc == -1 && errno == ECONNRESET)
-            rc = 0;
-#endif
-        errno_assert (rc == 0);
-#endif
-        _s = retired_fd;
-    }
-
-    const int rc = _tx_msg.close ();
-    errno_assert (rc == 0);
-
-    //  Drop reference to metadata and destroy it if we are
-    //  the only user.
-    if (_metadata != NULL) {
-        if (_metadata->drop_ref ()) {
-            LIBZMQ_DELETE (_metadata);
-        }
-    }
-
-    LIBZMQ_DELETE (_encoder);
-    LIBZMQ_DELETE (_decoder);
-    LIBZMQ_DELETE (_mechanism);
-}
-
-void zmq::stream_engine_base_t::plug (io_thread_t *io_thread_,
-                                      session_base_t *session_)
-{
-    zmq_assert (!_plugged);
-    _plugged = true;
-
-    //  Connect to session object.
-    zmq_assert (!_session);
-    zmq_assert (session_);
-    _session = session_;
-    _socket = _session->get_socket ();
-
-    //  Connect to I/O threads poller object.
-    io_object_t::plug (io_thread_);
-    _handle = add_fd (_s);
-    _io_error = false;
-
-    plug_internal ();
-}
-
-void zmq::stream_engine_base_t::unplug ()
-{
-    zmq_assert (_plugged);
-    _plugged = false;
-
-    //  Cancel all timers.
-    if (_has_handshake_timer) {
-        cancel_timer (handshake_timer_id);
-        _has_handshake_timer = false;
-    }
-
-    if (_has_ttl_timer) {
-        cancel_timer (heartbeat_ttl_timer_id);
-        _has_ttl_timer = false;
-    }
-
-    if (_has_timeout_timer) {
-        cancel_timer (heartbeat_timeout_timer_id);
-        _has_timeout_timer = false;
-    }
-
-    if (_has_heartbeat_timer) {
-        cancel_timer (heartbeat_ivl_timer_id);
-        _has_heartbeat_timer = false;
-    }
-    //  Cancel all fd subscriptions.
-    if (!_io_error)
-        rm_fd (_handle);
-
-    //  Disconnect from I/O threads poller object.
-    io_object_t::unplug ();
-
-    _session = NULL;
-}
-
-void zmq::stream_engine_base_t::terminate ()
-{
-    unplug ();
-    delete this;
-}
-
-void zmq::stream_engine_base_t::in_event ()
-{
-    // ignore errors
-    const bool res = in_event_internal ();
-    LIBZMQ_UNUSED (res);
-}
-
-bool zmq::stream_engine_base_t::in_event_internal ()
-{
-    zmq_assert (!_io_error);
-
-    //  If still handshaking, receive and process the greeting message.
-    if (unlikely (_handshaking)) {
-        if (handshake ()) {
-            //  Handshaking was successful.
-            //  Switch into the normal message flow.
-            _handshaking = false;
-
-            if (_mechanism == NULL && _has_handshake_stage)
-                _session->engine_ready ();
-        } else
-            return false;
-    }
-
-
-    zmq_assert (_decoder);
-
-    //  If there has been an I/O error, stop polling.
-    if (_input_stopped) {
-        rm_fd (_handle);
-        _io_error = true;
-        return true; // TODO or return false in this case too?
-    }
-
-    //  If there's no data to process in the buffer...
-    if (!_insize) {
-        //  Retrieve the buffer and read as much data as possible.
-        //  Note that buffer can be arbitrarily large. However, we assume
-        //  the underlying TCP layer has fixed buffer size and thus the
-        //  number of bytes read will be always limited.
-        size_t bufsize = 0;
-        _decoder->get_buffer (&_inpos, &bufsize);
-
-        const int rc = read (_inpos, bufsize);
-
-        if (rc == -1) {
-            if (errno != EAGAIN) {
-                error (connection_error);
-                return false;
-            }
-            return true;
-        }
-
-        //  Adjust input size
-        _insize = static_cast<size_t> (rc);
-        // Adjust buffer size to received bytes
-        _decoder->resize_buffer (_insize);
-    }
-
-    int rc = 0;
-    size_t processed = 0;
-
-    while (_insize > 0) {
-        rc = _decoder->decode (_inpos, _insize, processed);
-        zmq_assert (processed <= _insize);
-        _inpos += processed;
-        _insize -= processed;
-        if (rc == 0 || rc == -1)
-            break;
-        rc = (this->*_process_msg) (_decoder->msg ());
-        if (rc == -1)
-            break;
-    }
-
-    //  Tear down the connection if we have failed to decode input data
-    //  or the session has rejected the message.
-    if (rc == -1) {
-        if (errno != EAGAIN) {
-            error (protocol_error);
-            return false;
-        }
-        _input_stopped = true;
-        reset_pollin (_handle);
-    }
-
-    _session->flush ();
-    return true;
-}
-
-void zmq::stream_engine_base_t::out_event ()
-{
-    zmq_assert (!_io_error);
-
-    //  If write buffer is empty, try to read new data from the encoder.
-    if (!_outsize) {
-        //  Even when we stop polling as soon as there is no
-        //  data to send, the poller may invoke out_event one
-        //  more time due to 'speculative write' optimisation.
-        if (unlikely (_encoder == NULL)) {
-            zmq_assert (_handshaking);
-            return;
-        }
-
-        _outpos = NULL;
-        _outsize = _encoder->encode (&_outpos, 0);
-
-        while (_outsize < static_cast<size_t> (_options.out_batch_size)) {
-            if ((this->*_next_msg) (&_tx_msg) == -1)
-                break;
-            _encoder->load_msg (&_tx_msg);
-            unsigned char *bufptr = _outpos + _outsize;
-            const size_t n =
-              _encoder->encode (&bufptr, _options.out_batch_size - _outsize);
-            zmq_assert (n > 0);
-            if (_outpos == NULL)
-                _outpos = bufptr;
-            _outsize += n;
-        }
-
-        //  If there is no data to send, stop polling for output.
-        if (_outsize == 0) {
-            _output_stopped = true;
-            reset_pollout ();
-            return;
-        }
-    }
-
-    //  If there are any data to write in write buffer, write as much as
-    //  possible to the socket. Note that amount of data to write can be
-    //  arbitrarily large. However, we assume that underlying TCP layer has
-    //  limited transmission buffer and thus the actual number of bytes
-    //  written should be reasonably modest.
-    const int nbytes = write (_outpos, _outsize);
-
-    //  IO error has occurred. We stop waiting for output events.
-    //  The engine is not terminated until we detect input error;
-    //  this is necessary to prevent losing incoming messages.
-    if (nbytes == -1) {
-        reset_pollout ();
-        return;
-    }
-
-    _outpos += nbytes;
-    _outsize -= nbytes;
-
-    //  If we are still handshaking and there are no data
-    //  to send, stop polling for output.
-    if (unlikely (_handshaking))
-        if (_outsize == 0)
-            reset_pollout ();
-}
-
-void zmq::stream_engine_base_t::restart_output ()
-{
-    if (unlikely (_io_error))
-        return;
-
-    if (likely (_output_stopped)) {
-        set_pollout ();
-        _output_stopped = false;
-    }
-
-    //  Speculative write: The assumption is that at the moment new message
-    //  was sent by the user the socket is probably available for writing.
-    //  Thus we try to write the data to socket avoiding polling for POLLOUT.
-    //  Consequently, the latency should be better in request/reply scenarios.
-    out_event ();
-}
-
-bool zmq::stream_engine_base_t::restart_input ()
-{
-    zmq_assert (_input_stopped);
-    zmq_assert (_session != NULL);
-    zmq_assert (_decoder != NULL);
-
-    int rc = (this->*_process_msg) (_decoder->msg ());
-    if (rc == -1) {
-        if (errno == EAGAIN)
-            _session->flush ();
-        else {
-            error (protocol_error);
-            return false;
-        }
-        return true;
-    }
-
-    while (_insize > 0) {
-        size_t processed = 0;
-        rc = _decoder->decode (_inpos, _insize, processed);
-        zmq_assert (processed <= _insize);
-        _inpos += processed;
-        _insize -= processed;
-        if (rc == 0 || rc == -1)
-            break;
-        rc = (this->*_process_msg) (_decoder->msg ());
-        if (rc == -1)
-            break;
-    }
-
-    if (rc == -1 && errno == EAGAIN)
-        _session->flush ();
-    else if (_io_error) {
-        error (connection_error);
-        return false;
-    } else if (rc == -1) {
-        error (protocol_error);
-        return false;
-    }
-
-    else {
-        _input_stopped = false;
-        set_pollin ();
-        _session->flush ();
-
-        //  Speculative read.
-        if (!in_event_internal ())
-            return false;
-    }
-
-    return true;
-}
-
-int zmq::stream_engine_base_t::next_handshake_command (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    if (_mechanism->status () == mechanism_t::ready) {
-        mechanism_ready ();
-        return pull_and_encode (msg_);
-    }
-    if (_mechanism->status () == mechanism_t::error) {
-        errno = EPROTO;
-        return -1;
-    }
-    const int rc = _mechanism->next_handshake_command (msg_);
-
-    if (rc == 0)
-        msg_->set_flags (msg_t::command);
-
-    return rc;
-}
-
-int zmq::stream_engine_base_t::process_handshake_command (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-    const int rc = _mechanism->process_handshake_command (msg_);
-    if (rc == 0) {
-        if (_mechanism->status () == mechanism_t::ready)
-            mechanism_ready ();
-        else if (_mechanism->status () == mechanism_t::error) {
-            errno = EPROTO;
-            return -1;
-        }
-        if (_output_stopped)
-            restart_output ();
-    }
-
-    return rc;
-}
-
-void zmq::stream_engine_base_t::zap_msg_available ()
-{
-    zmq_assert (_mechanism != NULL);
-
-    const int rc = _mechanism->zap_msg_available ();
-    if (rc == -1) {
-        error (protocol_error);
-        return;
-    }
-    if (_input_stopped)
-        if (!restart_input ())
-            return;
-    if (_output_stopped)
-        restart_output ();
-}
-
-const zmq::endpoint_uri_pair_t &zmq::stream_engine_base_t::get_endpoint () const
-{
-    return _endpoint_uri_pair;
-}
-
-void zmq::stream_engine_base_t::mechanism_ready ()
-{
-    if (_options.heartbeat_interval > 0 && !_has_heartbeat_timer) {
-        add_timer (_options.heartbeat_interval, heartbeat_ivl_timer_id);
-        _has_heartbeat_timer = true;
-    }
-
-    if (_has_handshake_stage)
-        _session->engine_ready ();
-
-    bool flush_session = false;
-
-    if (_options.recv_routing_id) {
-        msg_t routing_id;
-        _mechanism->peer_routing_id (&routing_id);
-        const int rc = _session->push_msg (&routing_id);
-        if (rc == -1 && errno == EAGAIN) {
-            // If the write is failing at this stage with
-            // an EAGAIN the pipe must be being shut down,
-            // so we can just bail out of the routing id set.
-            return;
-        }
-        errno_assert (rc == 0);
-        flush_session = true;
-    }
-
-    if (_options.router_notify & ZMQ_NOTIFY_CONNECT) {
-        msg_t connect_notification;
-        connect_notification.init ();
-        const int rc = _session->push_msg (&connect_notification);
-        if (rc == -1 && errno == EAGAIN) {
-            // If the write is failing at this stage with
-            // an EAGAIN the pipe must be being shut down,
-            // so we can just bail out of the notification.
-            return;
-        }
-        errno_assert (rc == 0);
-        flush_session = true;
-    }
-
-    if (flush_session)
-        _session->flush ();
-
-    _next_msg = &stream_engine_base_t::pull_and_encode;
-    _process_msg = &stream_engine_base_t::write_credential;
-
-    //  Compile metadata.
-    properties_t properties;
-    init_properties (properties);
-
-    //  Add ZAP properties.
-    const properties_t &zap_properties = _mechanism->get_zap_properties ();
-    properties.insert (zap_properties.begin (), zap_properties.end ());
-
-    //  Add ZMTP properties.
-    const properties_t &zmtp_properties = _mechanism->get_zmtp_properties ();
-    properties.insert (zmtp_properties.begin (), zmtp_properties.end ());
-
-    zmq_assert (_metadata == NULL);
-    if (!properties.empty ()) {
-        _metadata = new (std::nothrow) metadata_t (properties);
-        alloc_assert (_metadata);
-    }
-
-    _socket->event_handshake_succeeded (_endpoint_uri_pair, 0);
-}
-
-int zmq::stream_engine_base_t::write_credential (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-    zmq_assert (_session != NULL);
-
-    const blob_t &credential = _mechanism->get_user_id ();
-    if (credential.size () > 0) {
-        msg_t msg;
-        int rc = msg.init_size (credential.size ());
-        zmq_assert (rc == 0);
-        memcpy (msg.data (), credential.data (), credential.size ());
-        msg.set_flags (msg_t::credential);
-        rc = _session->push_msg (&msg);
-        if (rc == -1) {
-            rc = msg.close ();
-            errno_assert (rc == 0);
-            return -1;
-        }
-    }
-    _process_msg = &stream_engine_base_t::decode_and_push;
-    return decode_and_push (msg_);
-}
-
-int zmq::stream_engine_base_t::pull_and_encode (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    if (_session->pull_msg (msg_) == -1)
-        return -1;
-    if (_mechanism->encode (msg_) == -1)
-        return -1;
-    return 0;
-}
-
-int zmq::stream_engine_base_t::decode_and_push (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    if (_mechanism->decode (msg_) == -1)
-        return -1;
-
-    if (_has_timeout_timer) {
-        _has_timeout_timer = false;
-        cancel_timer (heartbeat_timeout_timer_id);
-    }
-
-    if (_has_ttl_timer) {
-        _has_ttl_timer = false;
-        cancel_timer (heartbeat_ttl_timer_id);
-    }
-
-    if (msg_->flags () & msg_t::command) {
-        process_command_message (msg_);
-    }
-
-    if (_metadata)
-        msg_->set_metadata (_metadata);
-    if (_session->push_msg (msg_) == -1) {
-        if (errno == EAGAIN)
-            _process_msg = &stream_engine_base_t::push_one_then_decode_and_push;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::stream_engine_base_t::push_one_then_decode_and_push (msg_t *msg_)
-{
-    const int rc = _session->push_msg (msg_);
-    if (rc == 0)
-        _process_msg = &stream_engine_base_t::decode_and_push;
-    return rc;
-}
-
-int zmq::stream_engine_base_t::pull_msg_from_session (msg_t *msg_)
-{
-    return _session->pull_msg (msg_);
-}
-
-int zmq::stream_engine_base_t::push_msg_to_session (msg_t *msg_)
-{
-    return _session->push_msg (msg_);
-}
-
-void zmq::stream_engine_base_t::error (error_reason_t reason_)
-{
-    zmq_assert (_session);
-
-    if ((_options.router_notify & ZMQ_NOTIFY_DISCONNECT) && !_handshaking) {
-        // For router sockets with disconnect notification, rollback
-        // any incomplete message in the pipe, and push the disconnect
-        // notification message.
-        _session->rollback ();
-
-        msg_t disconnect_notification;
-        disconnect_notification.init ();
-        _session->push_msg (&disconnect_notification);
-    }
-
-    // protocol errors have been signaled already at the point where they occurred
-    if (reason_ != protocol_error
-        && (_mechanism == NULL
-            || _mechanism->status () == mechanism_t::handshaking)) {
-        const int err = errno;
-        _socket->event_handshake_failed_no_detail (_endpoint_uri_pair, err);
-    }
-
-    _socket->event_disconnected (_endpoint_uri_pair, _s);
-    _session->flush ();
-    _session->engine_error (
-      !_handshaking
-        && (_mechanism == NULL
-            || _mechanism->status () != mechanism_t::handshaking),
-      reason_);
-    unplug ();
-    delete this;
-}
-
-void zmq::stream_engine_base_t::set_handshake_timer ()
-{
-    zmq_assert (!_has_handshake_timer);
-
-    if (_options.handshake_ivl > 0) {
-        add_timer (_options.handshake_ivl, handshake_timer_id);
-        _has_handshake_timer = true;
-    }
-}
-
-bool zmq::stream_engine_base_t::init_properties (properties_t &properties_)
-{
-    if (_peer_address.empty ())
-        return false;
-    properties_.ZMQ_MAP_INSERT_OR_EMPLACE (
-      std::string (ZMQ_MSG_PROPERTY_PEER_ADDRESS), _peer_address);
-
-    //  Private property to support deprecated SRCFD
-    std::ostringstream stream;
-    stream << static_cast<int> (_s);
-    std::string fd_string = stream.str ();
-    properties_.ZMQ_MAP_INSERT_OR_EMPLACE (std::string ("__fd"),
-                                           ZMQ_MOVE (fd_string));
-    return true;
-}
-
-void zmq::stream_engine_base_t::timer_event (int id_)
-{
-    if (id_ == handshake_timer_id) {
-        _has_handshake_timer = false;
-        //  handshake timer expired before handshake completed, so engine fail
-        error (timeout_error);
-    } else if (id_ == heartbeat_ivl_timer_id) {
-        _next_msg = &stream_engine_base_t::produce_ping_message;
-        out_event ();
-        add_timer (_options.heartbeat_interval, heartbeat_ivl_timer_id);
-    } else if (id_ == heartbeat_ttl_timer_id) {
-        _has_ttl_timer = false;
-        error (timeout_error);
-    } else if (id_ == heartbeat_timeout_timer_id) {
-        _has_timeout_timer = false;
-        error (timeout_error);
-    } else
-        // There are no other valid timer ids!
-        assert (false);
-}
-
-int zmq::stream_engine_base_t::read (void *data_, size_t size_)
-{
-    const int rc = zmq::tcp_read (_s, data_, size_);
-
-    if (rc == 0) {
-        // connection closed by peer
-        errno = EPIPE;
-        return -1;
-    }
-
-    return rc;
-}
-
-int zmq::stream_engine_base_t::write (const void *data_, size_t size_)
-{
-    return zmq::tcp_write (_s, data_, size_);
-}
diff --git a/src/stream_engine_base.hpp b/src/stream_engine_base.hpp
deleted file mode 100644
index 43f02e715..000000000
--- a/src/stream_engine_base.hpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_STREAM_ENGINE_BASE_HPP_INCLUDED__
-#define __ZMQ_STREAM_ENGINE_BASE_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "fd.hpp"
-#include "i_engine.hpp"
-#include "io_object.hpp"
-#include "i_encoder.hpp"
-#include "i_decoder.hpp"
-#include "options.hpp"
-#include "socket_base.hpp"
-#include "metadata.hpp"
-#include "msg.hpp"
-#include "tcp.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-class mechanism_t;
-
-//  This engine handles any socket with SOCK_STREAM semantics,
-//  e.g. TCP socket or an UNIX domain socket.
-
-class stream_engine_base_t : public io_object_t, public i_engine
-{
-  public:
-    stream_engine_base_t (fd_t fd_,
-                          const options_t &options_,
-                          const endpoint_uri_pair_t &endpoint_uri_pair_,
-                          bool has_handshake_stage_);
-    ~stream_engine_base_t () ZMQ_OVERRIDE;
-
-    //  i_engine interface implementation.
-    bool has_handshake_stage () ZMQ_FINAL { return _has_handshake_stage; };
-    void plug (zmq::io_thread_t *io_thread_,
-               zmq::session_base_t *session_) ZMQ_FINAL;
-    void terminate () ZMQ_FINAL;
-    bool restart_input () ZMQ_FINAL;
-    void restart_output () ZMQ_FINAL;
-    void zap_msg_available () ZMQ_FINAL;
-    const endpoint_uri_pair_t &get_endpoint () const ZMQ_FINAL;
-
-    //  i_poll_events interface implementation.
-    void in_event () ZMQ_FINAL;
-    void out_event ();
-    void timer_event (int id_) ZMQ_FINAL;
-
-  protected:
-    typedef metadata_t::dict_t properties_t;
-    bool init_properties (properties_t &properties_);
-
-    //  Function to handle network disconnections.
-    virtual void error (error_reason_t reason_);
-
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-
-    int pull_msg_from_session (msg_t *msg_);
-    int push_msg_to_session (msg_t *msg_);
-
-    int pull_and_encode (msg_t *msg_);
-    virtual int decode_and_push (msg_t *msg_);
-    int push_one_then_decode_and_push (msg_t *msg_);
-
-    void set_handshake_timer ();
-
-    virtual bool handshake () { return true; };
-    virtual void plug_internal (){};
-
-    virtual int process_command_message (msg_t *msg_) { return -1; };
-    virtual int produce_ping_message (msg_t *msg_) { return -1; };
-    virtual int process_heartbeat_message (msg_t *msg_) { return -1; };
-    virtual int produce_pong_message (msg_t *msg_) { return -1; };
-
-    virtual int read (void *data, size_t size_);
-    virtual int write (const void *data_, size_t size_);
-
-    void reset_pollout () { io_object_t::reset_pollout (_handle); }
-    void set_pollout () { io_object_t::set_pollout (_handle); }
-    void set_pollin () { io_object_t::set_pollin (_handle); }
-    session_base_t *session () { return _session; }
-    socket_base_t *socket () { return _socket; }
-
-    const options_t _options;
-
-    unsigned char *_inpos;
-    size_t _insize;
-    i_decoder *_decoder;
-
-    unsigned char *_outpos;
-    size_t _outsize;
-    i_encoder *_encoder;
-
-    mechanism_t *_mechanism;
-
-    int (stream_engine_base_t::*_next_msg) (msg_t *msg_);
-    int (stream_engine_base_t::*_process_msg) (msg_t *msg_);
-
-    //  Metadata to be attached to received messages. May be NULL.
-    metadata_t *_metadata;
-
-    //  True iff the engine couldn't consume the last decoded message.
-    bool _input_stopped;
-
-    //  True iff the engine doesn't have any message to encode.
-    bool _output_stopped;
-
-    //  Representation of the connected endpoints.
-    const endpoint_uri_pair_t _endpoint_uri_pair;
-
-    //  ID of the handshake timer
-    enum
-    {
-        handshake_timer_id = 0x40
-    };
-
-    //  True is linger timer is running.
-    bool _has_handshake_timer;
-
-    //  Heartbeat stuff
-    enum
-    {
-        heartbeat_ivl_timer_id = 0x80,
-        heartbeat_timeout_timer_id = 0x81,
-        heartbeat_ttl_timer_id = 0x82
-    };
-    bool _has_ttl_timer;
-    bool _has_timeout_timer;
-    bool _has_heartbeat_timer;
-
-
-    const std::string _peer_address;
-
-  private:
-    bool in_event_internal ();
-
-    //  Unplug the engine from the session.
-    void unplug ();
-
-    int write_credential (msg_t *msg_);
-
-    void mechanism_ready ();
-
-    //  Underlying socket.
-    fd_t _s;
-
-    handle_t _handle;
-
-    bool _plugged;
-
-    //  When true, we are still trying to determine whether
-    //  the peer is using versioned protocol, and if so, which
-    //  version.  When false, normal message flow has started.
-    bool _handshaking;
-
-    msg_t _tx_msg;
-
-    bool _io_error;
-
-    //  The session this engine is attached to.
-    zmq::session_base_t *_session;
-
-    //  Socket
-    zmq::socket_base_t *_socket;
-
-    //  Indicate if engine has an handshake stage, if it does, engine must call session.engine_ready
-    //  when handshake is completed.
-    bool _has_handshake_stage;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (stream_engine_base_t)
-};
-}
-
-#endif
diff --git a/src/stream_listener_base.cpp b/src/stream_listener_base.cpp
deleted file mode 100644
index ecd21be08..000000000
--- a/src/stream_listener_base.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "stream_listener_base.hpp"
-#include "session_base.hpp"
-#include "socket_base.hpp"
-#include "zmtp_engine.hpp"
-#include "raw_engine.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#else
-#include <winsock2.h>
-#endif
-
-zmq::stream_listener_base_t::stream_listener_base_t (
-  zmq::io_thread_t *io_thread_,
-  zmq::socket_base_t *socket_,
-  const zmq::options_t &options_) :
-    own_t (io_thread_, options_),
-    io_object_t (io_thread_),
-    _s (retired_fd),
-    _handle (static_cast<handle_t> (NULL)),
-    _socket (socket_)
-{
-}
-
-zmq::stream_listener_base_t::~stream_listener_base_t ()
-{
-    zmq_assert (_s == retired_fd);
-    zmq_assert (!_handle);
-}
-
-int zmq::stream_listener_base_t::get_local_address (std::string &addr_) const
-{
-    addr_ = get_socket_name (_s, socket_end_local);
-    return addr_.empty () ? -1 : 0;
-}
-
-void zmq::stream_listener_base_t::process_plug ()
-{
-    //  Start polling for incoming connections.
-    _handle = add_fd (_s);
-    set_pollin (_handle);
-}
-
-void zmq::stream_listener_base_t::process_term (int linger_)
-{
-    rm_fd (_handle);
-    _handle = static_cast<handle_t> (NULL);
-    close ();
-    own_t::process_term (linger_);
-}
-
-int zmq::stream_listener_base_t::close ()
-{
-    // TODO this is identical to stream_connector_base_t::close
-
-    zmq_assert (_s != retired_fd);
-#ifdef ZMQ_HAVE_WINDOWS
-    const int rc = closesocket (_s);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    const int rc = ::close (_s);
-    errno_assert (rc == 0);
-#endif
-    _socket->event_closed (make_unconnected_bind_endpoint_pair (_endpoint), _s);
-    _s = retired_fd;
-
-    return 0;
-}
-
-void zmq::stream_listener_base_t::create_engine (fd_t fd_)
-{
-    const endpoint_uri_pair_t endpoint_pair (
-      get_socket_name (fd_, socket_end_local),
-      get_socket_name (fd_, socket_end_remote), endpoint_type_bind);
-
-    i_engine *engine;
-    if (options.raw_socket)
-        engine = new (std::nothrow) raw_engine_t (fd_, options, endpoint_pair);
-    else
-        engine = new (std::nothrow) zmtp_engine_t (fd_, options, endpoint_pair);
-    alloc_assert (engine);
-
-    //  Choose I/O thread to run connecter in. Given that we are already
-    //  running in an I/O thread, there must be at least one available.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    zmq_assert (io_thread);
-
-    //  Create and launch a session object.
-    session_base_t *session =
-      session_base_t::create (io_thread, false, _socket, options, NULL);
-    errno_assert (session);
-    session->inc_seqnum ();
-    launch_child (session);
-    send_attach (session, engine, false);
-
-    _socket->event_accepted (endpoint_pair, fd_);
-}
diff --git a/src/stream_listener_base.hpp b/src/stream_listener_base.hpp
deleted file mode 100644
index 71582541b..000000000
--- a/src/stream_listener_base.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_STREAM_LISTENER_BASE_HPP_INCLUDED__
-#define __ZMQ_STREAM_LISTENER_BASE_HPP_INCLUDED__
-
-#include <string>
-
-#include "fd.hpp"
-#include "own.hpp"
-#include "stdint.hpp"
-#include "io_object.hpp"
-#include "address.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class socket_base_t;
-
-class stream_listener_base_t : public own_t, public io_object_t
-{
-  public:
-    stream_listener_base_t (zmq::io_thread_t *io_thread_,
-                            zmq::socket_base_t *socket_,
-                            const options_t &options_);
-    ~stream_listener_base_t () ZMQ_OVERRIDE;
-
-    // Get the bound address for use with wildcards
-    int get_local_address (std::string &addr_) const;
-
-  protected:
-    virtual std::string get_socket_name (fd_t fd_,
-                                         socket_end_t socket_end_) const = 0;
-
-  private:
-    //  Handlers for incoming commands.
-    void process_plug () ZMQ_FINAL;
-    void process_term (int linger_) ZMQ_FINAL;
-
-  protected:
-    //  Close the listening socket.
-    virtual int close ();
-
-    virtual void create_engine (fd_t fd);
-
-    //  Underlying socket.
-    fd_t _s;
-
-    //  Handle corresponding to the listening socket.
-    handle_t _handle;
-
-    //  Socket the listener belongs to.
-    zmq::socket_base_t *_socket;
-
-    // String representation of endpoint to bind to
-    std::string _endpoint;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (stream_listener_base_t)
-};
-}
-
-#endif
diff --git a/src/sub.cpp b/src/sub.cpp
deleted file mode 100644
index 7240054ab..000000000
--- a/src/sub.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "sub.hpp"
-#include "msg.hpp"
-
-zmq::sub_t::sub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    xsub_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_SUB;
-
-    //  Switch filtering messages on (as opposed to XSUB which where the
-    //  filtering is off).
-    options.filter = true;
-}
-
-zmq::sub_t::~sub_t ()
-{
-}
-
-int zmq::sub_t::xsetsockopt (int option_,
-                             const void *optval_,
-                             size_t optvallen_)
-{
-    if (option_ != ZMQ_SUBSCRIBE && option_ != ZMQ_UNSUBSCRIBE) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Create the subscription message.
-    msg_t msg;
-    int rc;
-    const unsigned char *data = static_cast<const unsigned char *> (optval_);
-    if (option_ == ZMQ_SUBSCRIBE) {
-        rc = msg.init_subscribe (optvallen_, data);
-    } else {
-        rc = msg.init_cancel (optvallen_, data);
-    }
-    errno_assert (rc == 0);
-
-    //  Pass it further on in the stack.
-    rc = xsub_t::xsend (&msg);
-    return close_and_return (&msg, rc);
-}
-
-int zmq::sub_t::xsend (msg_t *)
-{
-    //  Override the XSUB's send.
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::sub_t::xhas_out ()
-{
-    //  Override the XSUB's send.
-    return false;
-}
diff --git a/src/sub.hpp b/src/sub.hpp
deleted file mode 100644
index ee519c89f..000000000
--- a/src/sub.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SUB_HPP_INCLUDED__
-#define __ZMQ_SUB_HPP_INCLUDED__
-
-#include "xsub.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class io_thread_t;
-class socket_base_t;
-
-class sub_t ZMQ_FINAL : public xsub_t
-{
-  public:
-    sub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~sub_t ();
-
-  protected:
-    int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (sub_t)
-};
-}
-
-#endif
diff --git a/src/tcp.cpp b/src/tcp.cpp
deleted file mode 100644
index 188e4a475..000000000
--- a/src/tcp.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "err.hpp"
-#include "options.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <unistd.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#if defined ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-int zmq::tune_tcp_socket (fd_t s_)
-{
-    //  Disable Nagle's algorithm. We are doing data batching on 0MQ level,
-    //  so using Nagle wouldn't improve throughput in anyway, but it would
-    //  hurt latency.
-    int nodelay = 1;
-    const int rc =
-      setsockopt (s_, IPPROTO_TCP, TCP_NODELAY,
-                  reinterpret_cast<char *> (&nodelay), sizeof (int));
-    assert_success_or_recoverable (s_, rc);
-    if (rc != 0)
-        return rc;
-
-#ifdef ZMQ_HAVE_OPENVMS
-    //  Disable delayed acknowledgements as they hurt latency significantly.
-    int nodelack = 1;
-    rc = setsockopt (s_, IPPROTO_TCP, TCP_NODELACK, (char *) &nodelack,
-                     sizeof (int));
-    assert_success_or_recoverable (s_, rc);
-#endif
-    return rc;
-}
-
-int zmq::set_tcp_send_buffer (fd_t sockfd_, int bufsize_)
-{
-    const int rc =
-      setsockopt (sockfd_, SOL_SOCKET, SO_SNDBUF,
-                  reinterpret_cast<char *> (&bufsize_), sizeof bufsize_);
-    assert_success_or_recoverable (sockfd_, rc);
-    return rc;
-}
-
-int zmq::set_tcp_receive_buffer (fd_t sockfd_, int bufsize_)
-{
-    const int rc =
-      setsockopt (sockfd_, SOL_SOCKET, SO_RCVBUF,
-                  reinterpret_cast<char *> (&bufsize_), sizeof bufsize_);
-    assert_success_or_recoverable (sockfd_, rc);
-    return rc;
-}
-
-int zmq::tune_tcp_keepalives (fd_t s_,
-                              int keepalive_,
-                              int keepalive_cnt_,
-                              int keepalive_idle_,
-                              int keepalive_intvl_)
-{
-    // These options are used only under certain #ifdefs below.
-    LIBZMQ_UNUSED (keepalive_);
-    LIBZMQ_UNUSED (keepalive_cnt_);
-    LIBZMQ_UNUSED (keepalive_idle_);
-    LIBZMQ_UNUSED (keepalive_intvl_);
-
-    // If none of the #ifdefs apply, then s_ is unused.
-    LIBZMQ_UNUSED (s_);
-
-    //  Tuning TCP keep-alives if platform allows it
-    //  All values = -1 means skip and leave it for OS
-#ifdef ZMQ_HAVE_WINDOWS
-    if (keepalive_ != -1) {
-        tcp_keepalive keepalive_opts;
-        keepalive_opts.onoff = keepalive_;
-        keepalive_opts.keepalivetime =
-          keepalive_idle_ != -1 ? keepalive_idle_ * 1000 : 7200000;
-        keepalive_opts.keepaliveinterval =
-          keepalive_intvl_ != -1 ? keepalive_intvl_ * 1000 : 1000;
-        DWORD num_bytes_returned;
-        const int rc = WSAIoctl (s_, SIO_KEEPALIVE_VALS, &keepalive_opts,
-                                 sizeof (keepalive_opts), NULL, 0,
-                                 &num_bytes_returned, NULL, NULL);
-        assert_success_or_recoverable (s_, rc);
-        if (rc == SOCKET_ERROR)
-            return rc;
-    }
-#else
-#ifdef ZMQ_HAVE_SO_KEEPALIVE
-    if (keepalive_ != -1) {
-        int rc =
-          setsockopt (s_, SOL_SOCKET, SO_KEEPALIVE,
-                      reinterpret_cast<char *> (&keepalive_), sizeof (int));
-        assert_success_or_recoverable (s_, rc);
-        if (rc != 0)
-            return rc;
-
-#ifdef ZMQ_HAVE_TCP_KEEPCNT
-        if (keepalive_cnt_ != -1) {
-            int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPCNT, &keepalive_cnt_,
-                                 sizeof (int));
-            assert_success_or_recoverable (s_, rc);
-            if (rc != 0)
-                return rc;
-        }
-#endif // ZMQ_HAVE_TCP_KEEPCNT
-
-#ifdef ZMQ_HAVE_TCP_KEEPIDLE
-        if (keepalive_idle_ != -1) {
-            int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPIDLE,
-                                 &keepalive_idle_, sizeof (int));
-            assert_success_or_recoverable (s_, rc);
-            if (rc != 0)
-                return rc;
-        }
-#else // ZMQ_HAVE_TCP_KEEPIDLE
-#ifdef ZMQ_HAVE_TCP_KEEPALIVE
-        if (keepalive_idle_ != -1) {
-            int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPALIVE,
-                                 &keepalive_idle_, sizeof (int));
-            assert_success_or_recoverable (s_, rc);
-            if (rc != 0)
-                return rc;
-        }
-#endif // ZMQ_HAVE_TCP_KEEPALIVE
-#endif // ZMQ_HAVE_TCP_KEEPIDLE
-
-#ifdef ZMQ_HAVE_TCP_KEEPINTVL
-        if (keepalive_intvl_ != -1) {
-            int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPINTVL,
-                                 &keepalive_intvl_, sizeof (int));
-            assert_success_or_recoverable (s_, rc);
-            if (rc != 0)
-                return rc;
-        }
-#endif // ZMQ_HAVE_TCP_KEEPINTVL
-    }
-#endif // ZMQ_HAVE_SO_KEEPALIVE
-#endif // ZMQ_HAVE_WINDOWS
-
-    return 0;
-}
-
-int zmq::tune_tcp_maxrt (fd_t sockfd_, int timeout_)
-{
-    if (timeout_ <= 0)
-        return 0;
-
-    LIBZMQ_UNUSED (sockfd_);
-
-#if defined(ZMQ_HAVE_WINDOWS) && defined(TCP_MAXRT)
-    // msdn says it's supported in >= Vista, >= Windows Server 2003
-    timeout_ /= 1000; // in seconds
-    const int rc =
-      setsockopt (sockfd_, IPPROTO_TCP, TCP_MAXRT,
-                  reinterpret_cast<char *> (&timeout_), sizeof (timeout_));
-    assert_success_or_recoverable (sockfd_, rc);
-    return rc;
-// FIXME: should be ZMQ_HAVE_TCP_USER_TIMEOUT
-#elif defined(TCP_USER_TIMEOUT)
-    int rc = setsockopt (sockfd_, IPPROTO_TCP, TCP_USER_TIMEOUT, &timeout_,
-                         sizeof (timeout_));
-    assert_success_or_recoverable (sockfd_, rc);
-    return rc;
-#else
-    return 0;
-#endif
-}
-
-int zmq::tcp_write (fd_t s_, const void *data_, size_t size_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-
-    const int nbytes = send (s_, (char *) data_, static_cast<int> (size_), 0);
-
-    //  If not a single byte can be written to the socket in non-blocking mode
-    //  we'll get an error (this may happen during the speculative write).
-    const int last_error = WSAGetLastError ();
-    if (nbytes == SOCKET_ERROR && last_error == WSAEWOULDBLOCK)
-        return 0;
-
-    //  Signalise peer failure.
-    if (nbytes == SOCKET_ERROR
-        && (last_error == WSAENETDOWN || last_error == WSAENETRESET
-            || last_error == WSAEHOSTUNREACH || last_error == WSAECONNABORTED
-            || last_error == WSAETIMEDOUT || last_error == WSAECONNRESET))
-        return -1;
-
-    //  Circumvent a Windows bug:
-    //  See https://support.microsoft.com/en-us/kb/201213
-    //  See https://zeromq.jira.com/browse/LIBZMQ-195
-    if (nbytes == SOCKET_ERROR && last_error == WSAENOBUFS)
-        return 0;
-
-    wsa_assert (nbytes != SOCKET_ERROR);
-    return nbytes;
-
-#else
-    ssize_t nbytes = send (s_, static_cast<const char *> (data_), size_, 0);
-
-    //  Several errors are OK. When speculative write is being done we may not
-    //  be able to write a single byte from the socket. Also, SIGSTOP issued
-    //  by a debugging tool can result in EINTR error.
-    if (nbytes == -1
-        && (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR))
-        return 0;
-
-    //  Signalise peer failure.
-    if (nbytes == -1) {
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EACCES && errno != EBADF && errno != EDESTADDRREQ
-                      && errno != EFAULT && errno != EISCONN
-                      && errno != EMSGSIZE && errno != ENOMEM
-                      && errno != ENOTSOCK && errno != EOPNOTSUPP);
-#else
-        errno_assert (errno != EACCES && errno != EDESTADDRREQ
-                      && errno != EFAULT && errno != EISCONN
-                      && errno != EMSGSIZE && errno != ENOMEM
-                      && errno != ENOTSOCK && errno != EOPNOTSUPP);
-#endif
-        return -1;
-    }
-
-    return static_cast<int> (nbytes);
-
-#endif
-}
-
-int zmq::tcp_read (fd_t s_, void *data_, size_t size_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-
-    const int rc =
-      recv (s_, static_cast<char *> (data_), static_cast<int> (size_), 0);
-
-    //  If not a single byte can be read from the socket in non-blocking mode
-    //  we'll get an error (this may happen during the speculative read).
-    if (rc == SOCKET_ERROR) {
-        const int last_error = WSAGetLastError ();
-        if (last_error == WSAEWOULDBLOCK) {
-            errno = EAGAIN;
-        } else {
-            wsa_assert (
-              last_error == WSAENETDOWN || last_error == WSAENETRESET
-              || last_error == WSAECONNABORTED || last_error == WSAETIMEDOUT
-              || last_error == WSAECONNRESET || last_error == WSAECONNREFUSED
-              || last_error == WSAENOTCONN || last_error == WSAENOBUFS);
-            errno = wsa_error_to_errno (last_error);
-        }
-    }
-
-    return rc == SOCKET_ERROR ? -1 : rc;
-
-#else
-
-    const ssize_t rc = recv (s_, static_cast<char *> (data_), size_, 0);
-
-    //  Several errors are OK. When speculative read is being done we may not
-    //  be able to read a single byte from the socket. Also, SIGSTOP issued
-    //  by a debugging tool can result in EINTR error.
-    if (rc == -1) {
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EBADF && errno != EFAULT && errno != ENOMEM
-                      && errno != ENOTSOCK);
-#else
-        errno_assert (errno != EFAULT && errno != ENOMEM && errno != ENOTSOCK);
-#endif
-        if (errno == EWOULDBLOCK || errno == EINTR)
-            errno = EAGAIN;
-    }
-
-    return static_cast<int> (rc);
-
-#endif
-}
-
-void zmq::tcp_tune_loopback_fast_path (const fd_t socket_)
-{
-#if defined ZMQ_HAVE_WINDOWS && defined SIO_LOOPBACK_FAST_PATH
-    int sio_loopback_fastpath = 1;
-    DWORD number_of_bytes_returned = 0;
-
-    const int rc = WSAIoctl (
-      socket_, SIO_LOOPBACK_FAST_PATH, &sio_loopback_fastpath,
-      sizeof sio_loopback_fastpath, NULL, 0, &number_of_bytes_returned, 0, 0);
-
-    if (SOCKET_ERROR == rc) {
-        const DWORD last_error = ::WSAGetLastError ();
-
-        if (WSAEOPNOTSUPP == last_error) {
-            // This system is not Windows 8 or Server 2012, and the call is not supported.
-        } else {
-            wsa_assert (false);
-        }
-    }
-#else
-    LIBZMQ_UNUSED (socket_);
-#endif
-}
-
-zmq::fd_t zmq::tcp_open_socket (const char *address_,
-                                const zmq::options_t &options_,
-                                bool local_,
-                                bool fallback_to_ipv4_,
-                                zmq::tcp_address_t *out_tcp_addr_)
-{
-    //  Convert the textual address into address structure.
-    int rc = out_tcp_addr_->resolve (address_, local_, options_.ipv6);
-    if (rc != 0)
-        return retired_fd;
-
-    //  Create the socket.
-    fd_t s = open_socket (out_tcp_addr_->family (), SOCK_STREAM, IPPROTO_TCP);
-
-    //  IPv6 address family not supported, try automatic downgrade to IPv4.
-    if (s == retired_fd && fallback_to_ipv4_
-        && out_tcp_addr_->family () == AF_INET6 && errno == EAFNOSUPPORT
-        && options_.ipv6) {
-        rc = out_tcp_addr_->resolve (address_, local_, false);
-        if (rc != 0) {
-            return retired_fd;
-        }
-        s = open_socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    }
-
-    if (s == retired_fd) {
-        return retired_fd;
-    }
-
-    //  On some systems, IPv4 mapping in IPv6 sockets is disabled by default.
-    //  Switch it on in such cases.
-    if (out_tcp_addr_->family () == AF_INET6)
-        enable_ipv4_mapping (s);
-
-    // Set the IP Type-Of-Service priority for this socket
-    if (options_.tos != 0)
-        set_ip_type_of_service (s, options_.tos);
-
-    // Set the socket to loopback fastpath if configured.
-    if (options_.loopback_fastpath)
-        tcp_tune_loopback_fast_path (s);
-
-    // Bind the socket to a device if applicable
-    if (!options_.bound_device.empty ())
-        if (bind_to_device (s, options_.bound_device) == -1)
-            goto setsockopt_error;
-
-    //  Set the socket buffer limits for the underlying socket.
-    if (options_.sndbuf >= 0)
-        set_tcp_send_buffer (s, options_.sndbuf);
-    if (options_.rcvbuf >= 0)
-        set_tcp_receive_buffer (s, options_.rcvbuf);
-
-    return s;
-
-setsockopt_error:
-#ifdef ZMQ_HAVE_WINDOWS
-    rc = closesocket (s);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    rc = ::close (s);
-    errno_assert (rc == 0);
-#endif
-    return retired_fd;
-}
diff --git a/src/tcp.hpp b/src/tcp.hpp
deleted file mode 100644
index fc355a634..000000000
--- a/src/tcp.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TCP_HPP_INCLUDED__
-#define __ZMQ_TCP_HPP_INCLUDED__
-
-#include "fd.hpp"
-
-namespace zmq
-{
-class tcp_address_t;
-struct options_t;
-
-//  Tunes the supplied TCP socket for the best latency.
-int tune_tcp_socket (fd_t s_);
-
-//  Sets the socket send buffer size.
-int set_tcp_send_buffer (fd_t sockfd_, int bufsize_);
-
-//  Sets the socket receive buffer size.
-int set_tcp_receive_buffer (fd_t sockfd_, int bufsize_);
-
-//  Tunes TCP keep-alives
-int tune_tcp_keepalives (fd_t s_,
-                         int keepalive_,
-                         int keepalive_cnt_,
-                         int keepalive_idle_,
-                         int keepalive_intvl_);
-
-//  Tunes TCP max retransmit timeout
-int tune_tcp_maxrt (fd_t sockfd_, int timeout_);
-
-//  Writes data to the socket. Returns the number of bytes actually
-//  written (even zero is to be considered to be a success). In case
-//  of error or orderly shutdown by the other peer -1 is returned.
-int tcp_write (fd_t s_, const void *data_, size_t size_);
-
-//  Reads data from the socket (up to 'size' bytes).
-//  Returns the number of bytes actually read or -1 on error.
-//  Zero indicates the peer has closed the connection.
-int tcp_read (fd_t s_, void *data_, size_t size_);
-
-void tcp_tune_loopback_fast_path (fd_t socket_);
-
-//  Resolves the given address_ string, opens a socket and sets socket options
-//  according to the passed options_. On success, returns the socket
-//  descriptor and assigns the resolved address to out_tcp_addr_. In case of
-//  an error, retired_fd is returned, and the value of out_tcp_addr_ is undefined.
-//  errno is set to an error code describing the cause of the error.
-fd_t tcp_open_socket (const char *address_,
-                      const options_t &options_,
-                      bool local_,
-                      bool fallback_to_ipv4_,
-                      tcp_address_t *out_tcp_addr_);
-}
-
-#endif
diff --git a/src/tcp_address.cpp b/src/tcp_address.cpp
deleted file mode 100644
index d788f3c4a..000000000
--- a/src/tcp_address.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string>
-
-#include "macros.hpp"
-#include "tcp_address.hpp"
-#include "stdint.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-#include <limits.h>
-
-zmq::tcp_address_t::tcp_address_t () : _has_src_addr (false)
-{
-    memset (&_address, 0, sizeof (_address));
-    memset (&_source_address, 0, sizeof (_source_address));
-}
-
-zmq::tcp_address_t::tcp_address_t (const sockaddr *sa_, socklen_t sa_len_) :
-    _has_src_addr (false)
-{
-    zmq_assert (sa_ && sa_len_ > 0);
-
-    memset (&_address, 0, sizeof (_address));
-    memset (&_source_address, 0, sizeof (_source_address));
-    if (sa_->sa_family == AF_INET
-        && sa_len_ >= static_cast<socklen_t> (sizeof (_address.ipv4)))
-        memcpy (&_address.ipv4, sa_, sizeof (_address.ipv4));
-    else if (sa_->sa_family == AF_INET6
-             && sa_len_ >= static_cast<socklen_t> (sizeof (_address.ipv6)))
-        memcpy (&_address.ipv6, sa_, sizeof (_address.ipv6));
-}
-
-int zmq::tcp_address_t::resolve (const char *name_, bool local_, bool ipv6_)
-{
-    // Test the ';' to know if we have a source address in name_
-    const char *src_delimiter = strrchr (name_, ';');
-    if (src_delimiter) {
-        const std::string src_name (name_, src_delimiter - name_);
-
-        ip_resolver_options_t src_resolver_opts;
-
-        src_resolver_opts
-          .bindable (true)
-          //  Restrict hostname/service to literals to avoid any DNS
-          //  lookups or service-name irregularity due to
-          //  indeterminate socktype.
-          .allow_dns (false)
-          .allow_nic_name (true)
-          .ipv6 (ipv6_)
-          .expect_port (true);
-
-        ip_resolver_t src_resolver (src_resolver_opts);
-
-        const int rc =
-          src_resolver.resolve (&_source_address, src_name.c_str ());
-        if (rc != 0)
-            return -1;
-        name_ = src_delimiter + 1;
-        _has_src_addr = true;
-    }
-
-    ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (local_)
-      .allow_dns (!local_)
-      .allow_nic_name (local_)
-      .ipv6 (ipv6_)
-      .expect_port (true);
-
-    ip_resolver_t resolver (resolver_opts);
-
-    return resolver.resolve (&_address, name_);
-}
-
-template <size_t N1, size_t N2>
-static std::string make_address_string (const char *hbuf_,
-                                        uint16_t port_,
-                                        const char (&ipv6_prefix_)[N1],
-                                        const char (&ipv6_suffix_)[N2])
-{
-    const size_t max_port_str_length = 5;
-    char buf[NI_MAXHOST + sizeof ipv6_prefix_ + sizeof ipv6_suffix_
-             + max_port_str_length];
-    char *pos = buf;
-    memcpy (pos, ipv6_prefix_, sizeof ipv6_prefix_ - 1);
-    pos += sizeof ipv6_prefix_ - 1;
-    const size_t hbuf_len = strlen (hbuf_);
-    memcpy (pos, hbuf_, hbuf_len);
-    pos += hbuf_len;
-    memcpy (pos, ipv6_suffix_, sizeof ipv6_suffix_ - 1);
-    pos += sizeof ipv6_suffix_ - 1;
-    pos += sprintf (pos, "%d", ntohs (port_));
-    return std::string (buf, pos - buf);
-}
-
-int zmq::tcp_address_t::to_string (std::string &addr_) const
-{
-    if (_address.family () != AF_INET && _address.family () != AF_INET6) {
-        addr_.clear ();
-        return -1;
-    }
-
-    //  Not using service resolving because of
-    //  https://github.com/zeromq/libzmq/commit/1824574f9b5a8ce786853320e3ea09fe1f822bc4
-    char hbuf[NI_MAXHOST];
-    const int rc = getnameinfo (addr (), addrlen (), hbuf, sizeof (hbuf), NULL,
-                                0, NI_NUMERICHOST);
-    if (rc != 0) {
-        addr_.clear ();
-        return rc;
-    }
-
-    const char ipv4_prefix[] = "tcp://";
-    const char ipv4_suffix[] = ":";
-    const char ipv6_prefix[] = "tcp://[";
-    const char ipv6_suffix[] = "]:";
-    if (_address.family () == AF_INET6) {
-        addr_ = make_address_string (hbuf, _address.ipv6.sin6_port, ipv6_prefix,
-                                     ipv6_suffix);
-    } else {
-        addr_ = make_address_string (hbuf, _address.ipv4.sin_port, ipv4_prefix,
-                                     ipv4_suffix);
-    }
-    return 0;
-}
-
-const sockaddr *zmq::tcp_address_t::addr () const
-{
-    return _address.as_sockaddr ();
-}
-
-socklen_t zmq::tcp_address_t::addrlen () const
-{
-    return _address.sockaddr_len ();
-}
-
-const sockaddr *zmq::tcp_address_t::src_addr () const
-{
-    return _source_address.as_sockaddr ();
-}
-
-socklen_t zmq::tcp_address_t::src_addrlen () const
-{
-    return _source_address.sockaddr_len ();
-}
-
-bool zmq::tcp_address_t::has_src_addr () const
-{
-    return _has_src_addr;
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-unsigned short zmq::tcp_address_t::family () const
-#else
-sa_family_t zmq::tcp_address_t::family () const
-#endif
-{
-    return _address.family ();
-}
-
-zmq::tcp_address_mask_t::tcp_address_mask_t () : _address_mask (-1)
-{
-    memset (&_network_address, 0, sizeof (_network_address));
-}
-
-int zmq::tcp_address_mask_t::mask () const
-{
-    return _address_mask;
-}
-
-int zmq::tcp_address_mask_t::resolve (const char *name_, bool ipv6_)
-{
-    // Find '/' at the end that separates address from the cidr mask number.
-    // Allow empty mask clause and treat it like '/32' for ipv4 or '/128' for ipv6.
-    std::string addr_str, mask_str;
-    const char *delimiter = strrchr (name_, '/');
-    if (delimiter != NULL) {
-        addr_str.assign (name_, delimiter - name_);
-        mask_str.assign (delimiter + 1);
-        if (mask_str.empty ()) {
-            errno = EINVAL;
-            return -1;
-        }
-    } else
-        addr_str.assign (name_);
-
-    // Parse address part using standard routines.
-    ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (false)
-      .allow_dns (false)
-      .allow_nic_name (false)
-      .ipv6 (ipv6_)
-      .expect_port (false);
-
-    ip_resolver_t resolver (resolver_opts);
-
-    const int rc = resolver.resolve (&_network_address, addr_str.c_str ());
-    if (rc != 0)
-        return rc;
-
-    // Parse the cidr mask number.
-    const int full_mask_ipv4 =
-      sizeof (_network_address.ipv4.sin_addr) * CHAR_BIT;
-    const int full_mask_ipv6 =
-      sizeof (_network_address.ipv6.sin6_addr) * CHAR_BIT;
-    if (mask_str.empty ()) {
-        _address_mask = _network_address.family () == AF_INET6 ? full_mask_ipv6
-                                                               : full_mask_ipv4;
-    } else if (mask_str == "0")
-        _address_mask = 0;
-    else {
-        const long mask = strtol (mask_str.c_str (), NULL, 10);
-        if ((mask < 1)
-            || (_network_address.family () == AF_INET6 && mask > full_mask_ipv6)
-            || (_network_address.family () != AF_INET6
-                && mask > full_mask_ipv4)) {
-            errno = EINVAL;
-            return -1;
-        }
-        _address_mask = static_cast<int> (mask);
-    }
-
-    return 0;
-}
-
-int zmq::tcp_address_mask_t::to_string (std::string &addr_) const
-{
-    if (_network_address.family () != AF_INET
-        && _network_address.family () != AF_INET6) {
-        addr_.clear ();
-        return -1;
-    }
-    if (_address_mask == -1) {
-        addr_.clear ();
-        return -1;
-    }
-
-    char hbuf[NI_MAXHOST];
-    const int rc = getnameinfo (_network_address.as_sockaddr (),
-                                _network_address.sockaddr_len (), hbuf,
-                                sizeof (hbuf), NULL, 0, NI_NUMERICHOST);
-    if (rc != 0) {
-        addr_.clear ();
-        return rc;
-    }
-
-    const size_t max_mask_len = 4;
-    const char ipv6_prefix[] = "[";
-    const char ipv6_suffix[] = "]/";
-    const char ipv4_suffix[] = "/";
-    char
-      buf[NI_MAXHOST + sizeof ipv6_prefix + sizeof ipv6_suffix + max_mask_len];
-    char *pos = buf;
-    if (_network_address.family () == AF_INET6) {
-        memcpy (pos, ipv6_prefix, sizeof ipv6_prefix - 1);
-        pos += sizeof ipv6_prefix - 1;
-    }
-    const size_t hbuf_len = strlen (hbuf);
-    memcpy (pos, hbuf, hbuf_len);
-    pos += hbuf_len;
-    if (_network_address.family () == AF_INET6) {
-        memcpy (pos, ipv6_suffix, sizeof ipv6_suffix - 1);
-        pos += sizeof ipv6_suffix - 1;
-    } else {
-        memcpy (pos, ipv4_suffix, sizeof ipv4_suffix - 1);
-        pos += sizeof ipv4_suffix - 1;
-    }
-    pos += sprintf (pos, "%d", _address_mask);
-    addr_.assign (buf, pos - buf);
-    return 0;
-}
-
-bool zmq::tcp_address_mask_t::match_address (const struct sockaddr *ss_,
-                                             const socklen_t ss_len_) const
-{
-    zmq_assert (_address_mask != -1 && ss_ != NULL
-                && ss_len_
-                     >= static_cast<socklen_t> (sizeof (struct sockaddr)));
-
-    if (ss_->sa_family != _network_address.generic.sa_family)
-        return false;
-
-    if (_address_mask > 0) {
-        int mask;
-        const uint8_t *our_bytes, *their_bytes;
-        if (ss_->sa_family == AF_INET6) {
-            zmq_assert (ss_len_ == sizeof (struct sockaddr_in6));
-            their_bytes = reinterpret_cast<const uint8_t *> (
-              &((reinterpret_cast<const struct sockaddr_in6 *> (ss_))
-                  ->sin6_addr));
-            our_bytes = reinterpret_cast<const uint8_t *> (
-              &_network_address.ipv6.sin6_addr);
-            mask = sizeof (struct in6_addr) * 8;
-        } else {
-            zmq_assert (ss_len_ == sizeof (struct sockaddr_in));
-            their_bytes = reinterpret_cast<const uint8_t *> (&(
-              (reinterpret_cast<const struct sockaddr_in *> (ss_))->sin_addr));
-            our_bytes = reinterpret_cast<const uint8_t *> (
-              &_network_address.ipv4.sin_addr);
-            mask = sizeof (struct in_addr) * 8;
-        }
-        if (_address_mask < mask)
-            mask = _address_mask;
-
-        const size_t full_bytes = mask / 8;
-        if (memcmp (our_bytes, their_bytes, full_bytes) != 0)
-            return false;
-
-        const uint8_t last_byte_bits = 0xffU << (8 - mask % 8);
-        if (last_byte_bits) {
-            if ((their_bytes[full_bytes] & last_byte_bits)
-                != (our_bytes[full_bytes] & last_byte_bits))
-                return false;
-        }
-    }
-
-    return true;
-}
diff --git a/src/tcp_address.hpp b/src/tcp_address.hpp
deleted file mode 100644
index 6e69f615f..000000000
--- a/src/tcp_address.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TCP_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_TCP_ADDRESS_HPP_INCLUDED__
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
-#include "ip_resolver.hpp"
-
-namespace zmq
-{
-class tcp_address_t
-{
-  public:
-    tcp_address_t ();
-    tcp_address_t (const sockaddr *sa_, socklen_t sa_len_);
-
-    //  This function translates textual TCP address into an address
-    //  structure. If 'local' is true, names are resolved as local interface
-    //  names. If it is false, names are resolved as remote hostnames.
-    //  If 'ipv6' is true, the name may resolve to IPv6 address.
-    int resolve (const char *name_, bool local_, bool ipv6_);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-#if defined ZMQ_HAVE_WINDOWS
-    unsigned short family () const;
-#else
-    sa_family_t family () const;
-#endif
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-    const sockaddr *src_addr () const;
-    socklen_t src_addrlen () const;
-    bool has_src_addr () const;
-
-  private:
-    ip_addr_t _address;
-    ip_addr_t _source_address;
-    bool _has_src_addr;
-};
-
-class tcp_address_mask_t
-{
-  public:
-    tcp_address_mask_t ();
-
-    // This function enhances tcp_address_t::resolve() with ability to parse
-    // additional cidr-like(/xx) mask value at the end of the name string.
-    // Works only with remote hostnames.
-    int resolve (const char *name_, bool ipv6_);
-
-    // The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-    int mask () const;
-
-    bool match_address (const struct sockaddr *ss_, socklen_t ss_len_) const;
-
-  private:
-    ip_addr_t _network_address;
-    int _address_mask;
-};
-}
-
-#endif
diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
deleted file mode 100644
index a0138eb1a..000000000
--- a/src/tcp_connecter.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <string>
-
-#include "macros.hpp"
-#include "tcp_connecter.hpp"
-#include "io_thread.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "address.hpp"
-#include "tcp_address.hpp"
-#include "session_base.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <fcntl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#ifdef ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-zmq::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_,
-                                       class session_base_t *session_,
-                                       const options_t &options_,
-                                       address_t *addr_,
-                                       bool delayed_start_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_),
-    _connect_timer_started (false)
-{
-    zmq_assert (_addr->protocol == protocol_name::tcp);
-}
-
-zmq::tcp_connecter_t::~tcp_connecter_t ()
-{
-    zmq_assert (!_connect_timer_started);
-}
-
-void zmq::tcp_connecter_t::process_term (int linger_)
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    stream_connecter_base_t::process_term (linger_);
-}
-
-void zmq::tcp_connecter_t::out_event ()
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    //  TODO this is still very similar to (t)ipc_connecter_t, maybe the
-    //  differences can be factored out
-
-    rm_handle ();
-
-    const fd_t fd = connect ();
-
-    if (fd == retired_fd
-        && ((options.reconnect_stop & ZMQ_RECONNECT_STOP_CONN_REFUSED)
-            && errno == ECONNREFUSED)) {
-        send_conn_failed (_session);
-        close ();
-        terminate ();
-        return;
-    }
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd || !tune_socket (fd)) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    create_engine (fd, get_socket_name<tcp_address_t> (fd, socket_end_local));
-}
-
-void zmq::tcp_connecter_t::timer_event (int id_)
-{
-    if (id_ == connect_timer_id) {
-        _connect_timer_started = false;
-        rm_handle ();
-        close ();
-        add_reconnect_timer ();
-    } else
-        stream_connecter_base_t::timer_event (id_);
-}
-
-void zmq::tcp_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    const int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        out_event ();
-    }
-
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (rc == -1 && errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-
-        //  add userspace connect timeout
-        add_connect_timer ();
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-void zmq::tcp_connecter_t::add_connect_timer ()
-{
-    if (options.connect_timeout > 0) {
-        add_timer (options.connect_timeout, connect_timer_id);
-        _connect_timer_started = true;
-    }
-}
-
-int zmq::tcp_connecter_t::open ()
-{
-    zmq_assert (_s == retired_fd);
-
-    //  Resolve the address
-    if (_addr->resolved.tcp_addr != NULL) {
-        LIBZMQ_DELETE (_addr->resolved.tcp_addr);
-    }
-
-    _addr->resolved.tcp_addr = new (std::nothrow) tcp_address_t ();
-    alloc_assert (_addr->resolved.tcp_addr);
-    _s = tcp_open_socket (_addr->address.c_str (), options, false, true,
-                          _addr->resolved.tcp_addr);
-    if (_s == retired_fd) {
-        //  TODO we should emit some event in this case!
-
-        LIBZMQ_DELETE (_addr->resolved.tcp_addr);
-        return -1;
-    }
-    zmq_assert (_addr->resolved.tcp_addr != NULL);
-
-    // Set the socket to non-blocking mode so that we get async connect().
-    unblock_socket (_s);
-
-    const tcp_address_t *const tcp_addr = _addr->resolved.tcp_addr;
-
-    int rc;
-
-    // Set a source address for conversations
-    if (tcp_addr->has_src_addr ()) {
-        //  Allow reusing of the address, to connect to different servers
-        //  using the same source port on the client.
-        int flag = 1;
-#ifdef ZMQ_HAVE_WINDOWS
-        rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR,
-                         reinterpret_cast<const char *> (&flag), sizeof (int));
-        wsa_assert (rc != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_VXWORKS
-        rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, (char *) &flag,
-                         sizeof (int));
-        errno_assert (rc == 0);
-#else
-        rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int));
-        errno_assert (rc == 0);
-#endif
-
-#if defined ZMQ_HAVE_VXWORKS
-        rc = ::bind (_s, (sockaddr *) tcp_addr->src_addr (),
-                     tcp_addr->src_addrlen ());
-#else
-        rc = ::bind (_s, tcp_addr->src_addr (), tcp_addr->src_addrlen ());
-#endif
-        if (rc == -1)
-            return -1;
-    }
-
-    //  Connect to the remote peer.
-#if defined ZMQ_HAVE_VXWORKS
-    rc = ::connect (_s, (sockaddr *) tcp_addr->addr (), tcp_addr->addrlen ());
-#else
-    rc = ::connect (_s, tcp_addr->addr (), tcp_addr->addrlen ());
-#endif
-    //  Connect was successful immediately.
-    if (rc == 0) {
-        return 0;
-    }
-
-    //  Translate error codes indicating asynchronous connect has been
-    //  launched to a uniform EINPROGRESS.
-#ifdef ZMQ_HAVE_WINDOWS
-    const int last_error = WSAGetLastError ();
-    if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)
-        errno = EINPROGRESS;
-    else
-        errno = wsa_error_to_errno (last_error);
-#else
-    if (errno == EINTR)
-        errno = EINPROGRESS;
-#endif
-    return -1;
-}
-
-zmq::fd_t zmq::tcp_connecter_t::connect ()
-{
-    //  Async connect has finished. Check whether an error occurred
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int len = sizeof err;
-#else
-    socklen_t len = sizeof err;
-#endif
-
-    const int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                               reinterpret_cast<char *> (&err), &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        if (err == WSAEBADF || err == WSAENOPROTOOPT || err == WSAENOTSOCK
-            || err == WSAENOBUFS) {
-            wsa_assert_no (err);
-        }
-        errno = wsa_error_to_errno (err);
-        return retired_fd;
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EBADF && errno != ENOPROTOOPT
-                      && errno != ENOTSOCK && errno != ENOBUFS);
-#else
-        errno_assert (errno != ENOPROTOOPT && errno != ENOTSOCK
-                      && errno != ENOBUFS);
-#endif
-        return retired_fd;
-    }
-#endif
-
-    //  Return the newly connected socket.
-    const fd_t result = _s;
-    _s = retired_fd;
-    return result;
-}
-
-bool zmq::tcp_connecter_t::tune_socket (const fd_t fd_)
-{
-    const int rc = tune_tcp_socket (fd_)
-                   | tune_tcp_keepalives (
-                     fd_, options.tcp_keepalive, options.tcp_keepalive_cnt,
-                     options.tcp_keepalive_idle, options.tcp_keepalive_intvl)
-                   | tune_tcp_maxrt (fd_, options.tcp_maxrt);
-    return rc == 0;
-}
diff --git a/src/tcp_connecter.hpp b/src/tcp_connecter.hpp
deleted file mode 100644
index 494770396..000000000
--- a/src/tcp_connecter.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TCP_CONNECTER_HPP_INCLUDED__
-#define __TCP_CONNECTER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "stdint.hpp"
-#include "stream_connecter_base.hpp"
-
-namespace zmq
-{
-class tcp_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    tcp_connecter_t (zmq::io_thread_t *io_thread_,
-                     zmq::session_base_t *session_,
-                     const options_t &options_,
-                     address_t *addr_,
-                     bool delayed_start_);
-    ~tcp_connecter_t ();
-
-  private:
-    //  ID of the timer used to check the connect timeout, must be different from stream_connecter_base_t::reconnect_timer_id.
-    enum
-    {
-        connect_timer_id = 2
-    };
-
-    //  Handlers for incoming commands.
-    void process_term (int linger_);
-
-    //  Handlers for I/O events.
-    void out_event ();
-    void timer_event (int id_);
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    //  Internal function to add a connect timer
-    void add_connect_timer ();
-
-    //  Open TCP connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    //  Tunes a connected socket.
-    bool tune_socket (fd_t fd_);
-
-    //  True iff a timer has been started.
-    bool _connect_timer_started;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (tcp_connecter_t)
-};
-}
-
-#endif
diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp
deleted file mode 100644
index 8e07c73d0..000000000
--- a/src/tcp_listener.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-
-#include <string>
-#include <stdio.h>
-
-#include "tcp_listener.hpp"
-#include "io_thread.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "socket_base.hpp"
-#include "address.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <fcntl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#ifdef ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-
-zmq::tcp_listener_t::tcp_listener_t (io_thread_t *io_thread_,
-                                     socket_base_t *socket_,
-                                     const options_t &options_) :
-    stream_listener_base_t (io_thread_, socket_, options_)
-{
-}
-
-void zmq::tcp_listener_t::in_event ()
-{
-    const fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    //  TODO: Handle specific errors like ENFILE/EMFILE etc.
-    if (fd == retired_fd) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    int rc = tune_tcp_socket (fd);
-    rc = rc
-         | tune_tcp_keepalives (
-           fd, options.tcp_keepalive, options.tcp_keepalive_cnt,
-           options.tcp_keepalive_idle, options.tcp_keepalive_intvl);
-    rc = rc | tune_tcp_maxrt (fd, options.tcp_maxrt);
-    if (rc != 0) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    //  Create the engine object for this connection.
-    create_engine (fd);
-}
-
-std::string
-zmq::tcp_listener_t::get_socket_name (zmq::fd_t fd_,
-                                      socket_end_t socket_end_) const
-{
-    return zmq::get_socket_name<tcp_address_t> (fd_, socket_end_);
-}
-
-int zmq::tcp_listener_t::create_socket (const char *addr_)
-{
-    _s = tcp_open_socket (addr_, options, true, true, &_address);
-    if (_s == retired_fd) {
-        return -1;
-    }
-
-    //  TODO why is this only done for the listener?
-    make_socket_noninheritable (_s);
-
-    //  Allow reusing of the address.
-    int flag = 1;
-    int rc;
-#ifdef ZMQ_HAVE_WINDOWS
-    //  TODO this was changed for Windows from SO_REUSEADDRE to
-    //  SE_EXCLUSIVEADDRUSE by 0ab65324195ad70205514d465b03d851a6de051c,
-    //  so the comment above is no longer correct; also, now the settings are
-    //  different between listener and connecter with a src address.
-    //  is this intentional?
-    rc = setsockopt (_s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
-                     reinterpret_cast<const char *> (&flag), sizeof (int));
-    wsa_assert (rc != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_VXWORKS
-    rc =
-      setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, (char *) &flag, sizeof (int));
-    errno_assert (rc == 0);
-#else
-    rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int));
-    errno_assert (rc == 0);
-#endif
-
-    //  Bind the socket to the network interface and port.
-#if defined ZMQ_HAVE_VXWORKS
-    rc = bind (_s, (sockaddr *) _address.addr (), _address.addrlen ());
-#else
-    rc = bind (_s, _address.addr (), _address.addrlen ());
-#endif
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    //  Listen for incoming connections.
-    rc = listen (_s, options.backlog);
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    return 0;
-
-error:
-    const int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-int zmq::tcp_listener_t::set_local_address (const char *addr_)
-{
-    if (options.use_fd != -1) {
-        //  in this case, the addr_ passed is not used and ignored, since the
-        //  socket was already created by the application
-        _s = options.use_fd;
-    } else {
-        if (create_socket (addr_) == -1)
-            return -1;
-    }
-
-    _endpoint = get_socket_name (_s, socket_end_local);
-
-    _socket->event_listening (make_unconnected_bind_endpoint_pair (_endpoint),
-                              _s);
-    return 0;
-}
-
-zmq::fd_t zmq::tcp_listener_t::accept ()
-{
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    //  Accept one connection and deal with different failure modes.
-    zmq_assert (_s != retired_fd);
-
-    struct sockaddr_storage ss;
-    memset (&ss, 0, sizeof (ss));
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int ss_len = sizeof (ss);
-#else
-    socklen_t ss_len = sizeof (ss);
-#endif
-#if defined ZMQ_HAVE_SOCK_CLOEXEC && defined HAVE_ACCEPT4
-    fd_t sock = ::accept4 (_s, reinterpret_cast<struct sockaddr *> (&ss),
-                           &ss_len, SOCK_CLOEXEC);
-#else
-    const fd_t sock =
-      ::accept (_s, reinterpret_cast<struct sockaddr *> (&ss), &ss_len);
-#endif
-
-    if (sock == retired_fd) {
-#if defined ZMQ_HAVE_WINDOWS
-        const int last_error = WSAGetLastError ();
-        wsa_assert (last_error == WSAEWOULDBLOCK || last_error == WSAECONNRESET
-                    || last_error == WSAEMFILE || last_error == WSAENOBUFS);
-#elif defined ZMQ_HAVE_ANDROID
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE || errno == EINVAL);
-#else
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE);
-#endif
-        return retired_fd;
-    }
-
-    make_socket_noninheritable (sock);
-
-    if (!options.tcp_accept_filters.empty ()) {
-        bool matched = false;
-        for (options_t::tcp_accept_filters_t::size_type
-               i = 0,
-               size = options.tcp_accept_filters.size ();
-             i != size; ++i) {
-            if (options.tcp_accept_filters[i].match_address (
-                  reinterpret_cast<struct sockaddr *> (&ss), ss_len)) {
-                matched = true;
-                break;
-            }
-        }
-        if (!matched) {
-#ifdef ZMQ_HAVE_WINDOWS
-            const int rc = closesocket (sock);
-            wsa_assert (rc != SOCKET_ERROR);
-#else
-            int rc = ::close (sock);
-            errno_assert (rc == 0);
-#endif
-            return retired_fd;
-        }
-    }
-
-    if (zmq::set_nosigpipe (sock)) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (sock);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = ::close (sock);
-        errno_assert (rc == 0);
-#endif
-        return retired_fd;
-    }
-
-    // Set the IP Type-Of-Service priority for this client socket
-    if (options.tos != 0)
-        set_ip_type_of_service (sock, options.tos);
-
-    return sock;
-}
diff --git a/src/tcp_listener.hpp b/src/tcp_listener.hpp
deleted file mode 100644
index 3f41b8fb9..000000000
--- a/src/tcp_listener.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TCP_LISTENER_HPP_INCLUDED__
-#define __ZMQ_TCP_LISTENER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "tcp_address.hpp"
-#include "stream_listener_base.hpp"
-
-namespace zmq
-{
-class tcp_listener_t ZMQ_FINAL : public stream_listener_base_t
-{
-  public:
-    tcp_listener_t (zmq::io_thread_t *io_thread_,
-                    zmq::socket_base_t *socket_,
-                    const options_t &options_);
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-  protected:
-    std::string get_socket_name (fd_t fd_, socket_end_t socket_end_) const;
-
-  private:
-    //  Handlers for I/O events.
-    void in_event ();
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog
-    //  or was denied because of accept filters.
-    fd_t accept ();
-
-    int create_socket (const char *addr_);
-
-    //  Address to listen on.
-    tcp_address_t _address;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (tcp_listener_t)
-};
-}
-
-#endif
diff --git a/src/thread.cpp b/src/thread.cpp
deleted file mode 100644
index 539622b9f..000000000
--- a/src/thread.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "thread.hpp"
-#include "err.hpp"
-
-#ifdef ZMQ_HAVE_WINDOWS
-#include <winnt.h>
-#endif
-
-bool zmq::thread_t::get_started () const
-{
-    return _started;
-}
-
-#ifdef ZMQ_HAVE_WINDOWS
-
-extern "C" {
-#if defined _WIN32_WCE
-static DWORD thread_routine (LPVOID arg_)
-#else
-static unsigned int __stdcall thread_routine (void *arg_)
-#endif
-{
-    zmq::thread_t *self = static_cast<zmq::thread_t *> (arg_);
-    self->applyThreadName ();
-    self->_tfn (self->_arg);
-    return 0;
-}
-}
-
-void zmq::thread_t::start (thread_fn *tfn_, void *arg_, const char *name_)
-{
-    _tfn = tfn_;
-    _arg = arg_;
-    if (name_)
-        strncpy (_name, name_, sizeof (_name) - 1);
-#if defined _WIN32_WCE
-    _descriptor =
-      (HANDLE) CreateThread (NULL, 0, &::thread_routine, this, 0, &_thread_id);
-#else
-    _descriptor = (HANDLE) _beginthreadex (NULL, 0, &::thread_routine, this, 0,
-                                           &_thread_id);
-#endif
-    win_assert (_descriptor != NULL);
-    _started = true;
-}
-
-bool zmq::thread_t::is_current_thread () const
-{
-    return GetCurrentThreadId () == _thread_id;
-}
-
-void zmq::thread_t::stop ()
-{
-    if (_started) {
-        const DWORD rc = WaitForSingleObject (_descriptor, INFINITE);
-        win_assert (rc != WAIT_FAILED);
-        const BOOL rc2 = CloseHandle (_descriptor);
-        win_assert (rc2 != 0);
-    }
-}
-
-void zmq::thread_t::setSchedulingParameters (
-  int priority_, int scheduling_policy_, const std::set<int> &affinity_cpus_)
-{
-    // not implemented
-    LIBZMQ_UNUSED (priority_);
-    LIBZMQ_UNUSED (scheduling_policy_);
-    LIBZMQ_UNUSED (affinity_cpus_);
-}
-
-void zmq::thread_t::
-  applySchedulingParameters () // to be called in secondary thread context
-{
-    // not implemented
-}
-
-namespace
-{
-#pragma pack(push, 8)
-struct thread_info_t
-{
-    DWORD _type;
-    LPCSTR _name;
-    DWORD _thread_id;
-    DWORD _flags;
-};
-#pragma pack(pop)
-}
-
-struct MY_EXCEPTION_REGISTRATION_RECORD
-{
-    typedef EXCEPTION_DISPOSITION (NTAPI *HandlerFunctionType) (
-      EXCEPTION_RECORD *, void *, CONTEXT *, void *);
-
-    MY_EXCEPTION_REGISTRATION_RECORD *Next;
-    HandlerFunctionType Handler;
-};
-
-static EXCEPTION_DISPOSITION NTAPI continue_execution (EXCEPTION_RECORD *rec,
-                                                       void *frame,
-                                                       CONTEXT *ctx,
-                                                       void *disp)
-{
-    return ExceptionContinueExecution;
-}
-
-void zmq::thread_t::
-  applyThreadName () // to be called in secondary thread context
-{
-    if (!_name[0] || !IsDebuggerPresent ())
-        return;
-
-    thread_info_t thread_info;
-    thread_info._type = 0x1000;
-    thread_info._name = _name;
-    thread_info._thread_id = -1;
-    thread_info._flags = 0;
-
-    NT_TIB *tib = ((NT_TIB *) NtCurrentTeb ());
-
-    MY_EXCEPTION_REGISTRATION_RECORD rec;
-    rec.Next = (MY_EXCEPTION_REGISTRATION_RECORD *) tib->ExceptionList;
-    rec.Handler = continue_execution;
-
-    // push our handler, raise, and finally pop our handler
-    tib->ExceptionList = (_EXCEPTION_REGISTRATION_RECORD *) &rec;
-    const DWORD MS_VC_EXCEPTION = 0x406D1388;
-    RaiseException (MS_VC_EXCEPTION, 0,
-                    sizeof (thread_info) / sizeof (ULONG_PTR),
-                    (ULONG_PTR *) &thread_info);
-    tib->ExceptionList =
-      (_EXCEPTION_REGISTRATION_RECORD
-         *) (((MY_EXCEPTION_REGISTRATION_RECORD *) tib->ExceptionList)->Next);
-}
-
-#elif defined ZMQ_HAVE_VXWORKS
-
-extern "C" {
-static void *thread_routine (void *arg_)
-{
-    zmq::thread_t *self = (zmq::thread_t *) arg_;
-    self->applySchedulingParameters ();
-    self->_tfn (self->_arg);
-    return NULL;
-}
-}
-
-void zmq::thread_t::start (thread_fn *tfn_, void *arg_, const char *name_)
-{
-    LIBZMQ_UNUSED (name_);
-    _tfn = tfn_;
-    _arg = arg_;
-    _descriptor = taskSpawn (NULL, DEFAULT_PRIORITY, DEFAULT_OPTIONS,
-                             DEFAULT_STACK_SIZE, (FUNCPTR) thread_routine,
-                             (int) this, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    if (_descriptor != NULL || _descriptor > 0)
-        _started = true;
-}
-
-void zmq::thread_t::stop ()
-{
-    if (_started)
-        while ((_descriptor != NULL || _descriptor > 0)
-               && taskIdVerify (_descriptor) == 0) {
-        }
-}
-
-bool zmq::thread_t::is_current_thread () const
-{
-    return taskIdSelf () == _descriptor;
-}
-
-void zmq::thread_t::setSchedulingParameters (
-  int priority_, int schedulingPolicy_, const std::set<int> &affinity_cpus_)
-{
-    _thread_priority = priority_;
-    _thread_sched_policy = schedulingPolicy_;
-    _thread_affinity_cpus = affinity_cpus_;
-}
-
-void zmq::thread_t::
-  applySchedulingParameters () // to be called in secondary thread context
-{
-    int priority =
-      (_thread_priority >= 0 ? _thread_priority : DEFAULT_PRIORITY);
-    priority = (priority < UCHAR_MAX ? priority : DEFAULT_PRIORITY);
-    if (_descriptor != NULL || _descriptor > 0) {
-        taskPrioritySet (_descriptor, priority);
-    }
-}
-
-void zmq::thread_t::
-  applyThreadName () // to be called in secondary thread context
-{
-    // not implemented
-}
-
-#else
-
-#include <signal.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-extern "C" {
-static void *thread_routine (void *arg_)
-{
-#if !defined ZMQ_HAVE_OPENVMS && !defined ZMQ_HAVE_ANDROID
-    //  Following code will guarantee more predictable latencies as it'll
-    //  disallow any signal handling in the I/O thread.
-    sigset_t signal_set;
-    int rc = sigfillset (&signal_set);
-    errno_assert (rc == 0);
-    rc = pthread_sigmask (SIG_BLOCK, &signal_set, NULL);
-    posix_assert (rc);
-#endif
-    zmq::thread_t *self = (zmq::thread_t *) arg_;
-    self->applySchedulingParameters ();
-    self->applyThreadName ();
-    self->_tfn (self->_arg);
-    return NULL;
-}
-}
-
-void zmq::thread_t::start (thread_fn *tfn_, void *arg_, const char *name_)
-{
-    _tfn = tfn_;
-    _arg = arg_;
-    if (name_)
-        strncpy (_name, name_, sizeof (_name) - 1);
-    int rc = pthread_create (&_descriptor, NULL, thread_routine, this);
-    posix_assert (rc);
-    _started = true;
-}
-
-void zmq::thread_t::stop ()
-{
-    if (_started) {
-        int rc = pthread_join (_descriptor, NULL);
-        posix_assert (rc);
-    }
-}
-
-bool zmq::thread_t::is_current_thread () const
-{
-    return bool(pthread_equal (pthread_self (), _descriptor));
-}
-
-void zmq::thread_t::setSchedulingParameters (
-  int priority_, int scheduling_policy_, const std::set<int> &affinity_cpus_)
-{
-    _thread_priority = priority_;
-    _thread_sched_policy = scheduling_policy_;
-    _thread_affinity_cpus = affinity_cpus_;
-}
-
-void zmq::thread_t::
-  applySchedulingParameters () // to be called in secondary thread context
-{
-#if defined _POSIX_THREAD_PRIORITY_SCHEDULING                                  \
-  && _POSIX_THREAD_PRIORITY_SCHEDULING >= 0
-    int policy = 0;
-    struct sched_param param;
-
-#if _POSIX_THREAD_PRIORITY_SCHEDULING == 0                                     \
-  && defined _SC_THREAD_PRIORITY_SCHEDULING
-    if (sysconf (_SC_THREAD_PRIORITY_SCHEDULING) < 0) {
-        return;
-    }
-#endif
-    int rc = pthread_getschedparam (pthread_self (), &policy, &param);
-    posix_assert (rc);
-
-    if (_thread_sched_policy != ZMQ_THREAD_SCHED_POLICY_DFLT) {
-        policy = _thread_sched_policy;
-    }
-
-    /* Quoting docs:
-       "Linux allows the static priority range 1 to 99 for the SCHED_FIFO and
-       SCHED_RR policies, and the priority 0 for the remaining policies."
-       Other policies may use the "nice value" in place of the priority:
-    */
-    bool use_nice_instead_priority =
-      (policy != SCHED_FIFO) && (policy != SCHED_RR);
-
-    if (_thread_priority != ZMQ_THREAD_PRIORITY_DFLT) {
-        if (use_nice_instead_priority)
-            param.sched_priority =
-              0; // this is the only supported priority for most scheduling policies
-        else
-            param.sched_priority =
-              _thread_priority; // user should provide a value between 1 and 99
-    }
-
-#ifdef __NetBSD__
-    if (policy == SCHED_OTHER)
-        param.sched_priority = -1;
-#endif
-
-    rc = pthread_setschedparam (pthread_self (), policy, &param);
-
-#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
-    // If this feature is unavailable at run-time, don't abort.
-    if (rc == ENOSYS)
-        return;
-#endif
-
-    posix_assert (rc);
-
-#if !defined ZMQ_HAVE_VXWORKS
-    if (use_nice_instead_priority
-        && _thread_priority != ZMQ_THREAD_PRIORITY_DFLT) {
-        // assume the user wants to decrease the thread's nice value
-        // i.e., increase the chance of this thread being scheduled: try setting that to
-        // maximum priority.
-        rc = nice (-20);
-
-        errno_assert (rc != -1);
-        // IMPORTANT: EPERM is typically returned for unprivileged processes: that's because
-        //            CAP_SYS_NICE capability is required or RLIMIT_NICE resource limit should be changed to avoid EPERM!
-    }
-#endif
-
-#ifdef ZMQ_HAVE_PTHREAD_SET_AFFINITY
-    if (!_thread_affinity_cpus.empty ()) {
-        cpu_set_t cpuset;
-        CPU_ZERO (&cpuset);
-        for (std::set<int>::const_iterator it = _thread_affinity_cpus.begin (),
-                                           end = _thread_affinity_cpus.end ();
-             it != end; it++) {
-            CPU_SET ((int) (*it), &cpuset);
-        }
-        rc =
-          pthread_setaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset);
-        posix_assert (rc);
-    }
-#endif
-#endif
-}
-
-void zmq::thread_t::
-  applyThreadName () // to be called in secondary thread context
-{
-    /* The thread name is a cosmetic string, added to ease debugging of
- * multi-threaded applications. It is not a big issue if this value
- * can not be set for any reason (such as Permission denied in some
- * cases where the application changes its EUID, etc.) The value of
- * "int rc" is retained where available, to help debuggers stepping
- * through code to see its value - but otherwise it is ignored.
- */
-    if (!_name[0])
-        return;
-
-        /* Fails with permission denied on Android 5/6 */
-#if defined(ZMQ_HAVE_ANDROID)
-    return;
-#endif
-
-#if defined(ZMQ_HAVE_PTHREAD_SETNAME_1)
-    int rc = pthread_setname_np (_name);
-    if (rc)
-        return;
-#elif defined(ZMQ_HAVE_PTHREAD_SETNAME_2)
-    int rc = pthread_setname_np (pthread_self (), _name);
-    if (rc)
-        return;
-#elif defined(ZMQ_HAVE_PTHREAD_SETNAME_3)
-    int rc = pthread_setname_np (pthread_self (), _name, NULL);
-    if (rc)
-        return;
-#elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
-    pthread_set_name_np (pthread_self (), _name);
-#endif
-}
-
-#endif
diff --git a/src/thread.hpp b/src/thread.hpp
deleted file mode 100644
index 256bfef3c..000000000
--- a/src/thread.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_THREAD_HPP_INCLUDED__
-#define __ZMQ_THREAD_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_VXWORKS
-#include <vxWorks.h>
-#include <taskLib.h>
-#elif !defined ZMQ_HAVE_WINDOWS
-#include <pthread.h>
-#endif
-#include <set>
-#include <cstring>
-
-namespace zmq
-{
-typedef void(thread_fn) (void *);
-
-//  Class encapsulating OS thread. Thread initiation/termination is done
-//  using special functions rather than in constructor/destructor so that
-//  thread isn't created during object construction by accident, causing
-//  newly created thread to access half-initialised object. Same applies
-//  to the destruction process: Thread should be terminated before object
-//  destruction begins, otherwise it can access half-destructed object.
-
-class thread_t
-{
-  public:
-    thread_t () :
-        _tfn (NULL),
-        _arg (NULL),
-        _started (false),
-        _thread_priority (ZMQ_THREAD_PRIORITY_DFLT),
-        _thread_sched_policy (ZMQ_THREAD_SCHED_POLICY_DFLT)
-    {
-        memset (_name, 0, sizeof (_name));
-    }
-
-#ifdef ZMQ_HAVE_VXWORKS
-    ~thread_t ()
-    {
-        if (descriptor != NULL || descriptor > 0) {
-            taskDelete (descriptor);
-        }
-    }
-#endif
-
-    //  Creates OS thread. 'tfn' is main thread function. It'll be passed
-    //  'arg' as an argument.
-    //  Name is 16 characters max including terminating NUL. Thread naming is
-    //  implemented only for pthread, and windows when a debugger is attached.
-    void start (thread_fn *tfn_, void *arg_, const char *name_);
-
-    //  Returns whether the thread was started, i.e. start was called.
-    bool get_started () const;
-
-    //  Returns whether the executing thread is the thread represented by the
-    //  thread object.
-    bool is_current_thread () const;
-
-    //  Waits for thread termination.
-    void stop ();
-
-    // Sets the thread scheduling parameters. Only implemented for
-    // pthread. Has no effect on other platforms.
-    void setSchedulingParameters (int priority_,
-                                  int scheduling_policy_,
-                                  const std::set<int> &affinity_cpus_);
-
-    //  These are internal members. They should be private, however then
-    //  they would not be accessible from the main C routine of the thread.
-    void applySchedulingParameters ();
-    void applyThreadName ();
-    thread_fn *_tfn;
-    void *_arg;
-    char _name[16];
-
-  private:
-    bool _started;
-
-#ifdef ZMQ_HAVE_WINDOWS
-    HANDLE _descriptor;
-#if defined _WIN32_WCE
-    DWORD _thread_id;
-#else
-    unsigned int _thread_id;
-#endif
-#elif defined ZMQ_HAVE_VXWORKS
-    int _descriptor;
-    enum
-    {
-        DEFAULT_PRIORITY = 100,
-        DEFAULT_OPTIONS = 0,
-        DEFAULT_STACK_SIZE = 4000
-    };
-#else
-    pthread_t _descriptor;
-#endif
-
-    //  Thread scheduling parameters.
-    int _thread_priority;
-    int _thread_sched_policy;
-    std::set<int> _thread_affinity_cpus;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (thread_t)
-};
-}
-
-#endif
diff --git a/src/timers.cpp b/src/timers.cpp
deleted file mode 100644
index e9b516e03..000000000
--- a/src/timers.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "timers.hpp"
-#include "err.hpp"
-
-#include <algorithm>
-
-zmq::timers_t::timers_t () : _tag (0xCAFEDADA), _next_timer_id (0)
-{
-}
-
-zmq::timers_t::~timers_t ()
-{
-    //  Mark the timers as dead
-    _tag = 0xdeadbeef;
-}
-
-bool zmq::timers_t::check_tag () const
-{
-    return _tag == 0xCAFEDADA;
-}
-
-int zmq::timers_t::add (size_t interval_, timers_timer_fn handler_, void *arg_)
-{
-    if (handler_ == NULL) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    uint64_t when = _clock.now_ms () + interval_;
-    timer_t timer = {++_next_timer_id, interval_, handler_, arg_};
-    _timers.insert (timersmap_t::value_type (when, timer));
-
-    return timer.timer_id;
-}
-
-struct zmq::timers_t::match_by_id
-{
-    match_by_id (int timer_id_) : _timer_id (timer_id_) {}
-
-    bool operator() (timersmap_t::value_type const &entry_) const
-    {
-        return entry_.second.timer_id == _timer_id;
-    }
-
-  private:
-    int _timer_id;
-};
-
-int zmq::timers_t::cancel (int timer_id_)
-{
-    // check first if timer exists at all
-    if (_timers.end ()
-        == std::find_if (_timers.begin (), _timers.end (),
-                         match_by_id (timer_id_))) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    // check if timer was already canceled
-    if (_cancelled_timers.count (timer_id_)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _cancelled_timers.insert (timer_id_);
-
-    return 0;
-}
-
-int zmq::timers_t::set_interval (int timer_id_, size_t interval_)
-{
-    const timersmap_t::iterator end = _timers.end ();
-    const timersmap_t::iterator it =
-      std::find_if (_timers.begin (), end, match_by_id (timer_id_));
-    if (it != end) {
-        timer_t timer = it->second;
-        timer.interval = interval_;
-        uint64_t when = _clock.now_ms () + interval_;
-        _timers.erase (it);
-        _timers.insert (timersmap_t::value_type (when, timer));
-
-        return 0;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::timers_t::reset (int timer_id_)
-{
-    const timersmap_t::iterator end = _timers.end ();
-    const timersmap_t::iterator it =
-      std::find_if (_timers.begin (), end, match_by_id (timer_id_));
-    if (it != end) {
-        timer_t timer = it->second;
-        uint64_t when = _clock.now_ms () + timer.interval;
-        _timers.erase (it);
-        _timers.insert (timersmap_t::value_type (when, timer));
-
-        return 0;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-long zmq::timers_t::timeout ()
-{
-    const uint64_t now = _clock.now_ms ();
-    long res = -1;
-
-    const timersmap_t::iterator begin = _timers.begin ();
-    const timersmap_t::iterator end = _timers.end ();
-    timersmap_t::iterator it = begin;
-    for (; it != end; ++it) {
-        if (0 == _cancelled_timers.erase (it->second.timer_id)) {
-            //  Live timer, lets return the timeout
-            res = std::max (static_cast<long> (it->first - now), 0l);
-            break;
-        }
-    }
-
-    //  Remove timed-out timers
-    _timers.erase (begin, it);
-
-    return res;
-}
-
-int zmq::timers_t::execute ()
-{
-    const uint64_t now = _clock.now_ms ();
-
-    const timersmap_t::iterator begin = _timers.begin ();
-    const timersmap_t::iterator end = _timers.end ();
-    timersmap_t::iterator it = _timers.begin ();
-    for (; it != end; ++it) {
-        if (0 == _cancelled_timers.erase (it->second.timer_id)) {
-            //  Timer is not cancelled
-
-            //  Map is ordered, if we have to wait for current timer we can stop.
-            if (it->first > now)
-                break;
-
-            const timer_t &timer = it->second;
-
-            timer.handler (timer.timer_id, timer.arg);
-
-            _timers.insert (
-              timersmap_t::value_type (now + timer.interval, timer));
-        }
-    }
-    _timers.erase (begin, it);
-
-    return 0;
-}
diff --git a/src/timers.hpp b/src/timers.hpp
deleted file mode 100644
index 384d5e3f1..000000000
--- a/src/timers.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TIMERS_HPP_INCLUDED__
-#define __ZMQ_TIMERS_HPP_INCLUDED__
-
-#include <stddef.h>
-#include <map>
-#include <set>
-
-#include "clock.hpp"
-
-namespace zmq
-{
-typedef void(timers_timer_fn) (int timer_id_, void *arg_);
-
-class timers_t
-{
-  public:
-    timers_t ();
-    ~timers_t ();
-
-    //  Add timer to the set, timer repeats forever, or until cancel is called.
-    //  Returns a timer_id that is used to cancel the timer.
-    //  Returns -1 if there was an error.
-    int add (size_t interval_, timers_timer_fn handler_, void *arg_);
-
-    //  Set the interval of the timer.
-    //  This method is slow, cancelling exsting and adding a new timer yield better performance.
-    //  Returns 0 on success and -1 on error.
-    int set_interval (int timer_id_, size_t interval_);
-
-    //  Reset the timer.
-    //  This method is slow, cancelling exsting and adding a new timer yield better performance.
-    //  Returns 0 on success and -1 on error.
-    int reset (int timer_id_);
-
-    //  Cancel a timer.
-    //  Returns 0 on success and -1 on error.
-    int cancel (int timer_id_);
-
-    //  Returns the time in millisecond until the next timer.
-    //  Returns -1 if no timer is due.
-    long timeout ();
-
-    //  Execute timers.
-    //  Return 0 if all succeed and -1 if error.
-    int execute ();
-
-    //  Return false if object is not a timers class.
-    bool check_tag () const;
-
-  private:
-    //  Used to check whether the object is a timers class.
-    uint32_t _tag;
-
-    int _next_timer_id;
-
-    //  Clock instance.
-    clock_t _clock;
-
-    typedef struct timer_t
-    {
-        int timer_id;
-        size_t interval;
-        timers_timer_fn *handler;
-        void *arg;
-    } timer_t;
-
-    typedef std::multimap<uint64_t, timer_t> timersmap_t;
-    timersmap_t _timers;
-
-    typedef std::set<int> cancelled_timers_t;
-    cancelled_timers_t _cancelled_timers;
-
-    struct match_by_id;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (timers_t)
-};
-}
-
-#endif
diff --git a/src/tipc_address.cpp b/src/tipc_address.cpp
deleted file mode 100644
index 758b6a56f..000000000
--- a/src/tipc_address.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "tipc_address.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include "err.hpp"
-
-#include <string>
-#include <sstream>
-
-zmq::tipc_address_t::tipc_address_t ()
-{
-    memset (&address, 0, sizeof address);
-    _random = false;
-}
-
-zmq::tipc_address_t::tipc_address_t (const sockaddr *sa_, socklen_t sa_len_)
-{
-    zmq_assert (sa_ && sa_len_ > 0);
-
-    memset (&address, 0, sizeof address);
-    if (sa_->sa_family == AF_TIPC)
-        memcpy (&address, sa_, sa_len_);
-
-    _random = false;
-}
-
-void zmq::tipc_address_t::set_random ()
-{
-    _random = true;
-}
-bool zmq::tipc_address_t::is_random () const
-{
-    return _random;
-}
-bool zmq::tipc_address_t::is_service () const
-{
-    if (address.addrtype == TIPC_ADDR_ID)
-        return false;
-
-    return true;
-}
-int zmq::tipc_address_t::resolve (const char *name_)
-{
-    unsigned int type = 0;
-    unsigned int lower = 0;
-    unsigned int upper = 0;
-    unsigned int ref = 0;
-    unsigned int z = 1, c = 0, n = 0;
-    char eof;
-    const char *domain;
-    int res;
-
-
-    if (strncmp (name_, "<*>", 3) == 0) {
-        set_random ();
-        address.family = AF_TIPC;
-        address.addrtype = TIPC_ADDR_ID;
-        address.addr.id.node = 0;
-        address.addr.id.ref = 0;
-        address.scope = 0;
-        return 0;
-    }
-
-    res = sscanf (name_, "{%u,%u,%u}", &type, &lower, &upper);
-    /* Fetch optional domain suffix. */
-    if ((domain = strchr (name_, '@'))) {
-        if (sscanf (domain, "@%u.%u.%u%c", &z, &c, &n, &eof) != 3)
-            return EINVAL;
-    }
-    if (res == 3) {
-        if (type < TIPC_RESERVED_TYPES || upper < lower)
-            return EINVAL;
-        address.family = AF_TIPC;
-        address.addrtype = TIPC_ADDR_NAMESEQ;
-        address.addr.nameseq.type = type;
-        address.addr.nameseq.lower = lower;
-        address.addr.nameseq.upper = upper;
-        address.scope = TIPC_ZONE_SCOPE;
-        return 0;
-    }
-    if (res == 2 && type > TIPC_RESERVED_TYPES) {
-        address.family = AF_TIPC;
-        address.addrtype = TIPC_ADDR_NAME;
-        address.addr.name.name.type = type;
-        address.addr.name.name.instance = lower;
-        address.addr.name.domain = tipc_addr (z, c, n);
-        address.scope = 0;
-        return 0;
-    } else if (res == 0) {
-        res = sscanf (name_, "<%u.%u.%u:%u>", &z, &c, &n, &ref);
-        if (res == 4) {
-            address.family = AF_TIPC;
-            address.addrtype = TIPC_ADDR_ID;
-            address.addr.id.node = tipc_addr (z, c, n);
-            address.addr.id.ref = ref;
-            address.scope = 0;
-            return 0;
-        }
-    }
-    return EINVAL;
-}
-
-int zmq::tipc_address_t::to_string (std::string &addr_) const
-{
-    if (address.family != AF_TIPC) {
-        addr_.clear ();
-        return -1;
-    }
-    std::stringstream s;
-    if (address.addrtype == TIPC_ADDR_NAMESEQ
-        || address.addrtype == TIPC_ADDR_NAME) {
-        s << "tipc://"
-          << "{" << address.addr.nameseq.type;
-        s << ", " << address.addr.nameseq.lower;
-        s << ", " << address.addr.nameseq.upper << "}";
-        addr_ = s.str ();
-    } else if (address.addrtype == TIPC_ADDR_ID || is_random ()) {
-        s << "tipc://"
-          << "<" << tipc_zone (address.addr.id.node);
-        s << "." << tipc_cluster (address.addr.id.node);
-        s << "." << tipc_node (address.addr.id.node);
-        s << ":" << address.addr.id.ref << ">";
-        addr_ = s.str ();
-    } else {
-        addr_.clear ();
-        return -1;
-    }
-    return 0;
-}
-
-const sockaddr *zmq::tipc_address_t::addr () const
-{
-    return (sockaddr *) &address;
-}
-
-socklen_t zmq::tipc_address_t::addrlen () const
-{
-    return static_cast<socklen_t> (sizeof address);
-}
-
-#endif
diff --git a/src/tipc_address.hpp b/src/tipc_address.hpp
deleted file mode 100644
index 55ae0e7dc..000000000
--- a/src/tipc_address.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TIPC_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_TIPC_ADDRESS_HPP_INCLUDED__
-
-#include <string>
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include <sys/socket.h>
-#if defined ZMQ_HAVE_VXWORKS
-#include <tipc/tipc.h>
-#else
-#include <linux/tipc.h>
-#endif
-
-namespace zmq
-{
-class tipc_address_t
-{
-  public:
-    tipc_address_t ();
-    tipc_address_t (const sockaddr *sa, socklen_t sa_len);
-
-    //  This function sets up the address "{type, lower, upper}" for TIPC transport
-    int resolve (const char *name);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-    // Handling different TIPC address types
-    bool is_service () const;
-    bool is_random () const;
-    void set_random ();
-
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-  private:
-    bool _random;
-    struct sockaddr_tipc address;
-};
-}
-
-#endif
-
-#endif
diff --git a/src/tipc_connecter.cpp b/src/tipc_connecter.cpp
deleted file mode 100644
index 6057997f6..000000000
--- a/src/tipc_connecter.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "tipc_connecter.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include <new>
-#include <string>
-
-#include "io_thread.hpp"
-#include "platform.hpp"
-#include "random.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "address.hpp"
-#include "tipc_address.hpp"
-#include "session_base.hpp"
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-
-zmq::tipc_connecter_t::tipc_connecter_t (class io_thread_t *io_thread_,
-                                         class session_base_t *session_,
-                                         const options_t &options_,
-                                         address_t *addr_,
-                                         bool delayed_start_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_)
-{
-    zmq_assert (_addr->protocol == "tipc");
-}
-
-void zmq::tipc_connecter_t::out_event ()
-{
-    fd_t fd = connect ();
-    rm_handle ();
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    create_engine (fd, get_socket_name<tipc_address_t> (fd, socket_end_local));
-}
-
-void zmq::tipc_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        out_event ();
-    }
-
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (rc == -1 && errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-int zmq::tipc_connecter_t::open ()
-{
-    zmq_assert (_s == retired_fd);
-
-    // Cannot connect to random tipc addresses
-    if (_addr->resolved.tipc_addr->is_random ()) {
-        errno = EINVAL;
-        return -1;
-    }
-    //  Create the socket.
-    _s = open_socket (AF_TIPC, SOCK_STREAM, 0);
-    if (_s == retired_fd)
-        return -1;
-
-    //  Set the non-blocking flag.
-    unblock_socket (_s);
-    //  Connect to the remote peer.
-#ifdef ZMQ_HAVE_VXWORKS
-    int rc = ::connect (s, (sockaddr *) addr->resolved.tipc_addr->addr (),
-                        addr->resolved.tipc_addr->addrlen ());
-#else
-    int rc = ::connect (_s, _addr->resolved.tipc_addr->addr (),
-                        _addr->resolved.tipc_addr->addrlen ());
-#endif
-    //  Connect was successful immediately.
-    if (rc == 0)
-        return 0;
-
-    //  Translate other error codes indicating asynchronous connect has been
-    //  launched to a uniform EINPROGRESS.
-    if (rc == -1 && errno == EINTR) {
-        errno = EINPROGRESS;
-        return -1;
-    }
-    //  Forward the error.
-    return -1;
-}
-
-zmq::fd_t zmq::tipc_connecter_t::connect ()
-{
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    int err = 0;
-#ifdef ZMQ_HAVE_VXWORKS
-    int len = sizeof (err);
-#else
-    socklen_t len = sizeof (err);
-#endif
-    int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                         reinterpret_cast<char *> (&err), &len);
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        //  Assert if the error was caused by 0MQ bug.
-        //  Networking problems are OK. No need to assert.
-        errno = err;
-        errno_assert (errno == ECONNREFUSED || errno == ECONNRESET
-                      || errno == ETIMEDOUT || errno == EHOSTUNREACH
-                      || errno == ENETUNREACH || errno == ENETDOWN);
-
-        return retired_fd;
-    }
-    fd_t result = _s;
-    _s = retired_fd;
-    return result;
-}
-
-#endif
diff --git a/src/tipc_connecter.hpp b/src/tipc_connecter.hpp
deleted file mode 100644
index e12643ff9..000000000
--- a/src/tipc_connecter.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TIPC_CONNECTER_HPP_INCLUDED__
-#define __TIPC_CONNECTER_HPP_INCLUDED__
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include "fd.hpp"
-#include "stream_connecter_base.hpp"
-
-namespace zmq
-{
-class tipc_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    tipc_connecter_t (zmq::io_thread_t *io_thread_,
-                      zmq::session_base_t *session_,
-                      const options_t &options_,
-                      address_t *addr_,
-                      bool delayed_start_);
-
-  private:
-    //  Handlers for I/O events.
-    void out_event () ZMQ_FINAL;
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting () ZMQ_FINAL;
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    //  Open IPC connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (tipc_connecter_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/tipc_listener.cpp b/src/tipc_listener.cpp
deleted file mode 100644
index 338327bc1..000000000
--- a/src/tipc_listener.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "tipc_listener.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include <new>
-
-#include <string.h>
-
-#include "tipc_address.hpp"
-#include "io_thread.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "socket_base.hpp"
-#include "address.hpp"
-
-#include <unistd.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#if defined ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#include <tipc/tipc.h>
-#else
-#include <linux/tipc.h>
-#endif
-
-zmq::tipc_listener_t::tipc_listener_t (io_thread_t *io_thread_,
-                                       socket_base_t *socket_,
-                                       const options_t &options_) :
-    stream_listener_base_t (io_thread_, socket_, options_)
-{
-}
-
-void zmq::tipc_listener_t::in_event ()
-{
-    fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    //  TODO: Handle specific errors like ENFILE/EMFILE etc.
-    if (fd == retired_fd) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    //  Create the engine object for this connection.
-    create_engine (fd);
-}
-
-std::string
-zmq::tipc_listener_t::get_socket_name (zmq::fd_t fd_,
-                                       socket_end_t socket_end_) const
-{
-    return zmq::get_socket_name<tipc_address_t> (fd_, socket_end_);
-}
-
-int zmq::tipc_listener_t::set_local_address (const char *addr_)
-{
-    // Convert str to address struct
-    int rc = _address.resolve (addr_);
-    if (rc != 0)
-        return -1;
-
-    // Cannot bind non-random Port Identity
-    const sockaddr_tipc *const a =
-      reinterpret_cast<const sockaddr_tipc *> (_address.addr ());
-    if (!_address.is_random () && a->addrtype == TIPC_ADDR_ID) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Create a listening socket.
-    _s = open_socket (AF_TIPC, SOCK_STREAM, 0);
-    if (_s == retired_fd)
-        return -1;
-
-    // If random Port Identity, update address object to reflect the assigned address
-    if (_address.is_random ()) {
-        struct sockaddr_storage ss;
-        const zmq_socklen_t sl = get_socket_address (_s, socket_end_local, &ss);
-        if (sl == 0)
-            goto error;
-
-        _address =
-          tipc_address_t (reinterpret_cast<struct sockaddr *> (&ss), sl);
-    }
-
-
-    _address.to_string (_endpoint);
-
-    //  Bind the socket to tipc name
-    if (_address.is_service ()) {
-#ifdef ZMQ_HAVE_VXWORKS
-        rc = bind (_s, (sockaddr *) address.addr (), address.addrlen ());
-#else
-        rc = bind (_s, _address.addr (), _address.addrlen ());
-#endif
-        if (rc != 0)
-            goto error;
-    }
-
-    //  Listen for incoming connections.
-    rc = listen (_s, options.backlog);
-    if (rc != 0)
-        goto error;
-
-    _socket->event_listening (make_unconnected_bind_endpoint_pair (_endpoint),
-                              _s);
-    return 0;
-
-error:
-    int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-zmq::fd_t zmq::tipc_listener_t::accept ()
-{
-    //  Accept one connection and deal with different failure modes.
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    struct sockaddr_storage ss = {};
-    socklen_t ss_len = sizeof (ss);
-
-    zmq_assert (_s != retired_fd);
-#ifdef ZMQ_HAVE_VXWORKS
-    fd_t sock = ::accept (_s, (struct sockaddr *) &ss, (int *) &ss_len);
-#else
-    fd_t sock =
-      ::accept (_s, reinterpret_cast<struct sockaddr *> (&ss), &ss_len);
-#endif
-    if (sock == -1) {
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK
-                      || errno == ENOBUFS || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == EMFILE || errno == ENFILE);
-        return retired_fd;
-    }
-    /*FIXME Accept filters?*/
-    return sock;
-}
-
-#endif
diff --git a/src/tipc_listener.hpp b/src/tipc_listener.hpp
deleted file mode 100644
index 040a99e6f..000000000
--- a/src/tipc_listener.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TIPC_LISTENER_HPP_INCLUDED__
-#define __ZMQ_TIPC_LISTENER_HPP_INCLUDED__
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include <string>
-
-#include "fd.hpp"
-#include "stream_listener_base.hpp"
-#include "tipc_address.hpp"
-
-namespace zmq
-{
-class tipc_listener_t ZMQ_FINAL : public stream_listener_base_t
-{
-  public:
-    tipc_listener_t (zmq::io_thread_t *io_thread_,
-                     zmq::socket_base_t *socket_,
-                     const options_t &options_);
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-  protected:
-    std::string get_socket_name (fd_t fd_,
-                                 socket_end_t socket_end_) const ZMQ_FINAL;
-
-  private:
-    //  Handlers for I/O events.
-    void in_event () ZMQ_FINAL;
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog.
-    fd_t accept ();
-
-    // Address to listen on
-    tipc_address_t _address;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (tipc_listener_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/trie.cpp b/src/trie.cpp
deleted file mode 100644
index 3c1e85651..000000000
--- a/src/trie.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "err.hpp"
-#include "trie.hpp"
-
-#include <stdlib.h>
-
-#include <new>
-#include <algorithm>
-
-zmq::trie_t::trie_t () : _refcnt (0), _min (0), _count (0), _live_nodes (0)
-{
-}
-
-zmq::trie_t::~trie_t ()
-{
-    if (_count == 1) {
-        zmq_assert (_next.node);
-        LIBZMQ_DELETE (_next.node);
-    } else if (_count > 1) {
-        for (unsigned short i = 0; i != _count; ++i) {
-            LIBZMQ_DELETE (_next.table[i]);
-        }
-        free (_next.table);
-    }
-}
-
-bool zmq::trie_t::add (unsigned char *prefix_, size_t size_)
-{
-    //  We are at the node corresponding to the prefix. We are done.
-    if (!size_) {
-        ++_refcnt;
-        return _refcnt == 1;
-    }
-
-    const unsigned char c = *prefix_;
-    if (c < _min || c >= _min + _count) {
-        //  The character is out of range of currently handled
-        //  characters. We have to extend the table.
-        if (!_count) {
-            _min = c;
-            _count = 1;
-            _next.node = NULL;
-        } else if (_count == 1) {
-            const unsigned char oldc = _min;
-            trie_t *oldp = _next.node;
-            _count = (_min < c ? c - _min : _min - c) + 1;
-            _next.table =
-              static_cast<trie_t **> (malloc (sizeof (trie_t *) * _count));
-            alloc_assert (_next.table);
-            for (unsigned short i = 0; i != _count; ++i)
-                _next.table[i] = 0;
-            _min = std::min (_min, c);
-            _next.table[oldc - _min] = oldp;
-        } else if (_min < c) {
-            //  The new character is above the current character range.
-            const unsigned short old_count = _count;
-            _count = c - _min + 1;
-            _next.table = static_cast<trie_t **> (
-              realloc (_next.table, sizeof (trie_t *) * _count));
-            zmq_assert (_next.table);
-            for (unsigned short i = old_count; i != _count; i++)
-                _next.table[i] = NULL;
-        } else {
-            //  The new character is below the current character range.
-            const unsigned short old_count = _count;
-            _count = (_min + old_count) - c;
-            _next.table = static_cast<trie_t **> (
-              realloc (_next.table, sizeof (trie_t *) * _count));
-            zmq_assert (_next.table);
-            memmove (_next.table + _min - c, _next.table,
-                     old_count * sizeof (trie_t *));
-            for (unsigned short i = 0; i != _min - c; i++)
-                _next.table[i] = NULL;
-            _min = c;
-        }
-    }
-
-    //  If next node does not exist, create one.
-    if (_count == 1) {
-        if (!_next.node) {
-            _next.node = new (std::nothrow) trie_t;
-            alloc_assert (_next.node);
-            ++_live_nodes;
-            zmq_assert (_live_nodes == 1);
-        }
-        return _next.node->add (prefix_ + 1, size_ - 1);
-    }
-    if (!_next.table[c - _min]) {
-        _next.table[c - _min] = new (std::nothrow) trie_t;
-        alloc_assert (_next.table[c - _min]);
-        ++_live_nodes;
-        zmq_assert (_live_nodes > 1);
-    }
-    return _next.table[c - _min]->add (prefix_ + 1, size_ - 1);
-}
-
-bool zmq::trie_t::rm (unsigned char *prefix_, size_t size_)
-{
-    //  TODO: Shouldn't an error be reported if the key does not exist?
-    if (!size_) {
-        if (!_refcnt)
-            return false;
-        _refcnt--;
-        return _refcnt == 0;
-    }
-    const unsigned char c = *prefix_;
-    if (!_count || c < _min || c >= _min + _count)
-        return false;
-
-    trie_t *next_node = _count == 1 ? _next.node : _next.table[c - _min];
-
-    if (!next_node)
-        return false;
-
-    const bool ret = next_node->rm (prefix_ + 1, size_ - 1);
-
-    //  Prune redundant nodes
-    if (next_node->is_redundant ()) {
-        LIBZMQ_DELETE (next_node);
-        zmq_assert (_count > 0);
-
-        if (_count == 1) {
-            //  The just pruned node is was the only live node
-            _next.node = 0;
-            _count = 0;
-            --_live_nodes;
-            zmq_assert (_live_nodes == 0);
-        } else {
-            _next.table[c - _min] = 0;
-            zmq_assert (_live_nodes > 1);
-            --_live_nodes;
-
-            //  Compact the table if possible
-            if (_live_nodes == 1) {
-                //  We can switch to using the more compact single-node
-                //  representation since the table only contains one live node
-                trie_t *node = 0;
-                //  Since we always compact the table the pruned node must
-                //  either be the left-most or right-most ptr in the node
-                //  table
-                if (c == _min) {
-                    //  The pruned node is the left-most node ptr in the
-                    //  node table => keep the right-most node
-                    node = _next.table[_count - 1];
-                    _min += _count - 1;
-                } else if (c == _min + _count - 1) {
-                    //  The pruned node is the right-most node ptr in the
-                    //  node table => keep the left-most node
-                    node = _next.table[0];
-                }
-                zmq_assert (node);
-                free (_next.table);
-                _next.node = node;
-                _count = 1;
-            } else if (c == _min) {
-                //  We can compact the table "from the left".
-                //  Find the left-most non-null node ptr, which we'll use as
-                //  our new min
-                unsigned char new_min = _min;
-                for (unsigned short i = 1; i < _count; ++i) {
-                    if (_next.table[i]) {
-                        new_min = i + _min;
-                        break;
-                    }
-                }
-                zmq_assert (new_min != _min);
-
-                trie_t **old_table = _next.table;
-                zmq_assert (new_min > _min);
-                zmq_assert (_count > new_min - _min);
-
-                _count = _count - (new_min - _min);
-                _next.table =
-                  static_cast<trie_t **> (malloc (sizeof (trie_t *) * _count));
-                alloc_assert (_next.table);
-
-                memmove (_next.table, old_table + (new_min - _min),
-                         sizeof (trie_t *) * _count);
-                free (old_table);
-
-                _min = new_min;
-            } else if (c == _min + _count - 1) {
-                //  We can compact the table "from the right".
-                //  Find the right-most non-null node ptr, which we'll use to
-                //  determine the new table size
-                unsigned short new_count = _count;
-                for (unsigned short i = 1; i < _count; ++i) {
-                    if (_next.table[_count - 1 - i]) {
-                        new_count = _count - i;
-                        break;
-                    }
-                }
-                zmq_assert (new_count != _count);
-                _count = new_count;
-
-                trie_t **old_table = _next.table;
-                _next.table =
-                  static_cast<trie_t **> (malloc (sizeof (trie_t *) * _count));
-                alloc_assert (_next.table);
-
-                memmove (_next.table, old_table, sizeof (trie_t *) * _count);
-                free (old_table);
-            }
-        }
-    }
-    return ret;
-}
-
-bool zmq::trie_t::check (const unsigned char *data_, size_t size_) const
-{
-    //  This function is on critical path. It deliberately doesn't use
-    //  recursion to get a bit better performance.
-    const trie_t *current = this;
-    while (true) {
-        //  We've found a corresponding subscription!
-        if (current->_refcnt)
-            return true;
-
-        //  We've checked all the data and haven't found matching subscription.
-        if (!size_)
-            return false;
-
-        //  If there's no corresponding slot for the first character
-        //  of the prefix, the message does not match.
-        const unsigned char c = *data_;
-        if (c < current->_min || c >= current->_min + current->_count)
-            return false;
-
-        //  Move to the next character.
-        if (current->_count == 1)
-            current = current->_next.node;
-        else {
-            current = current->_next.table[c - current->_min];
-            if (!current)
-                return false;
-        }
-        data_++;
-        size_--;
-    }
-}
-
-void zmq::trie_t::apply (
-  void (*func_) (unsigned char *data_, size_t size_, void *arg_), void *arg_)
-{
-    unsigned char *buff = NULL;
-    apply_helper (&buff, 0, 0, func_, arg_);
-    free (buff);
-}
-
-void zmq::trie_t::apply_helper (unsigned char **buff_,
-                                size_t buffsize_,
-                                size_t maxbuffsize_,
-                                void (*func_) (unsigned char *data_,
-                                               size_t size_,
-                                               void *arg_),
-                                void *arg_) const
-{
-    //  If this node is a subscription, apply the function.
-    if (_refcnt)
-        func_ (*buff_, buffsize_, arg_);
-
-    //  Adjust the buffer.
-    if (buffsize_ >= maxbuffsize_) {
-        maxbuffsize_ = buffsize_ + 256;
-        *buff_ = static_cast<unsigned char *> (realloc (*buff_, maxbuffsize_));
-        zmq_assert (*buff_);
-    }
-
-    //  If there are no subnodes in the trie, return.
-    if (_count == 0)
-        return;
-
-    //  If there's one subnode (optimisation).
-    if (_count == 1) {
-        (*buff_)[buffsize_] = _min;
-        buffsize_++;
-        _next.node->apply_helper (buff_, buffsize_, maxbuffsize_, func_, arg_);
-        return;
-    }
-
-    //  If there are multiple subnodes.
-    for (unsigned short c = 0; c != _count; c++) {
-        (*buff_)[buffsize_] = _min + c;
-        if (_next.table[c])
-            _next.table[c]->apply_helper (buff_, buffsize_ + 1, maxbuffsize_,
-                                          func_, arg_);
-    }
-}
-
-bool zmq::trie_t::is_redundant () const
-{
-    return _refcnt == 0 && _live_nodes == 0;
-}
diff --git a/src/trie.hpp b/src/trie.hpp
deleted file mode 100644
index 32a2c2cb7..000000000
--- a/src/trie.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TRIE_HPP_INCLUDED__
-#define __ZMQ_TRIE_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-class trie_t
-{
-  public:
-    trie_t ();
-    ~trie_t ();
-
-    //  Add key to the trie. Returns true if this is a new item in the trie
-    //  rather than a duplicate.
-    bool add (unsigned char *prefix_, size_t size_);
-
-    //  Remove key from the trie. Returns true if the item is actually
-    //  removed from the trie.
-    bool rm (unsigned char *prefix_, size_t size_);
-
-    //  Check whether particular key is in the trie.
-    bool check (const unsigned char *data_, size_t size_) const;
-
-    //  Apply the function supplied to each subscription in the trie.
-    void apply (void (*func_) (unsigned char *data_, size_t size_, void *arg_),
-                void *arg_);
-
-  private:
-    void apply_helper (unsigned char **buff_,
-                       size_t buffsize_,
-                       size_t maxbuffsize_,
-                       void (*func_) (unsigned char *data_,
-                                      size_t size_,
-                                      void *arg_),
-                       void *arg_) const;
-    bool is_redundant () const;
-
-    uint32_t _refcnt;
-    unsigned char _min;
-    unsigned short _count;
-    unsigned short _live_nodes;
-    union
-    {
-        class trie_t *node;
-        class trie_t **table;
-    } _next;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (trie_t)
-};
-}
-
-#endif
diff --git a/src/tweetnacl.c b/src/tweetnacl.c
deleted file mode 100644
index 6e6f657cf..000000000
--- a/src/tweetnacl.c
+++ /dev/null
@@ -1,993 +0,0 @@
-/*
-    Copyright (c) 2016-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
-    The precompiled header is not used for c files so this is required here.
-*/
-#include "platform.hpp"
-
-#if defined(ZMQ_USE_TWEETNACL)
-
-/*
-    Disable warnings for this source only, rather than for the whole
-    codebase when building with C99 (gcc >= 4.2) or with Microsoft's compiler
-*/
-#if defined __GNUC__                                                           \
-  && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))                  \
-  && __STDC_VERSION__ < 201112L
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#elif defined _MSC_VER
-#pragma warning(disable : 4018 4244 4146)
-#endif
-
-/* clang-format off */
-
-#include "tweetnacl.h"
-
-#define FOR(i,n) for (i = 0;i < n;++i)
-#define sv static void
-
-static const u8
-  _0[16],
-  _9[32] = {9};
-static const gf
-  gf0,
-  gf1 = {1},
-  _121665 = {0xDB41,1},
-  D = {0x78a3, 0x1359, 0x4dca, 0x75eb, 0xd8ab, 0x4141, 0x0a4d, 0x0070, 0xe898, 0x7779, 0x4079, 0x8cc7, 0xfe73, 0x2b6f, 0x6cee, 0x5203},
-  D2 = {0xf159, 0x26b2, 0x9b94, 0xebd6, 0xb156, 0x8283, 0x149a, 0x00e0, 0xd130, 0xeef3, 0x80f2, 0x198e, 0xfce7, 0x56df, 0xd9dc, 0x2406},
-  X = {0xd51a, 0x8f25, 0x2d60, 0xc956, 0xa7b2, 0x9525, 0xc760, 0x692c, 0xdc5c, 0xfdd6, 0xe231, 0xc0a4, 0x53fe, 0xcd6e, 0x36d3, 0x2169},
-  Y = {0x6658, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666},
-  I = {0xa0b0, 0x4a0e, 0x1b27, 0xc4ee, 0xe478, 0xad2f, 0x1806, 0x2f43, 0xd7a7, 0x3dfb, 0x0099, 0x2b4d, 0xdf0b, 0x4fc1, 0x2480, 0x2b83};
-
-static u32 L32(u32 x,int c) { return (x << c) | ((x&0xffffffff) >> (32 - c)); }
-
-static u32 ld32(const u8 *x)
-{
-  u32 u = x[3];
-  u = (u<<8)|x[2];
-  u = (u<<8)|x[1];
-  return (u<<8)|x[0];
-}
-
-static u64 dl64(const u8 *x)
-{
-  u64 i,u=0;
-  FOR(i,8) u=(u<<8)|x[i];
-  return u;
-}
-
-sv st32(u8 *x,u32 u)
-{
-  int i;
-  FOR(i,4) { x[i] = u; u >>= 8; }
-}
-
-sv ts64(u8 *x,u64 u)
-{
-  int i;
-  for (i = 7;i >= 0;--i) { x[i] = u; u >>= 8; }
-}
-
-static int vn(const u8 *x,const u8 *y,int n)
-{
-  u32 i,d = 0;
-  FOR(i,n) d |= x[i]^y[i];
-  return (1 & ((d - 1) >> 8)) - 1;
-}
-
-int crypto_verify_16(const u8 *x,const u8 *y)
-{
-  return vn(x,y,16);
-}
-
-int crypto_verify_32(const u8 *x,const u8 *y)
-{
-  return vn(x,y,32);
-}
-
-sv core(u8 *out,const u8 *in,const u8 *k,const u8 *c,int h)
-{
-  u32 w[16],x[16],y[16],t[4];
-  int i,j,m;
-
-  FOR(i,4) {
-    x[5*i] = ld32(c+4*i);
-    x[1+i] = ld32(k+4*i);
-    x[6+i] = ld32(in+4*i);
-    x[11+i] = ld32(k+16+4*i);
-  }
-
-  FOR(i,16) y[i] = x[i];
-
-  FOR(i,20) {
-    FOR(j,4) {
-      FOR(m,4) t[m] = x[(5*j+4*m)%16];
-      t[1] ^= L32(t[0]+t[3], 7);
-      t[2] ^= L32(t[1]+t[0], 9);
-      t[3] ^= L32(t[2]+t[1],13);
-      t[0] ^= L32(t[3]+t[2],18);
-      FOR(m,4) w[4*j+(j+m)%4] = t[m];
-    }
-    FOR(m,16) x[m] = w[m];
-  }
-
-  if (h) {
-    FOR(i,16) x[i] += y[i];
-    FOR(i,4) {
-      x[5*i] -= ld32(c+4*i);
-      x[6+i] -= ld32(in+4*i);
-    }
-    FOR(i,4) {
-      st32(out+4*i,x[5*i]);
-      st32(out+16+4*i,x[6+i]);
-    }
-  } else
-    FOR(i,16) st32(out + 4 * i,x[i] + y[i]);
-}
-
-int crypto_core_salsa20(u8 *out,const u8 *in,const u8 *k,const u8 *c)
-{
-  core(out,in,k,c,0);
-  return 0;
-}
-
-int crypto_core_hsalsa20(u8 *out,const u8 *in,const u8 *k,const u8 *c)
-{
-  core(out,in,k,c,1);
-  return 0;
-}
-
-static const u8 sigma[16] = "expand 32-byte k";
-
-int crypto_stream_salsa20_xor(u8 *c,const u8 *m,u64 b,const u8 *n,const u8 *k)
-{
-  u8 z[16],x[64];
-  u32 u,i;
-  if (!b) return 0;
-  FOR(i,16) z[i] = 0;
-  FOR(i,8) z[i] = n[i];
-  while (b >= 64) {
-    crypto_core_salsa20(x,z,k,sigma);
-    FOR(i,64) c[i] = (m?m[i]:0) ^ x[i];
-    u = 1;
-    for (i = 8;i < 16;++i) {
-      u += (u32) z[i];
-      z[i] = u;
-      u >>= 8;
-    }
-    b -= 64;
-    c += 64;
-    if (m) m += 64;
-  }
-  if (b) {
-    crypto_core_salsa20(x,z,k,sigma);
-    FOR(i,b) c[i] = (m?m[i]:0) ^ x[i];
-  }
-  return 0;
-}
-
-int crypto_stream_salsa20(u8 *c,u64 d,const u8 *n,const u8 *k)
-{
-  return crypto_stream_salsa20_xor(c,0,d,n,k);
-}
-
-int crypto_stream(u8 *c,u64 d,const u8 *n,const u8 *k)
-{
-  u8 s[32];
-  crypto_core_hsalsa20(s,n,k,sigma);
-  return crypto_stream_salsa20(c,d,n+16,s);
-}
-
-int crypto_stream_xor(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *k)
-{
-  u8 s[32];
-  crypto_core_hsalsa20(s,n,k,sigma);
-  return crypto_stream_salsa20_xor(c,m,d,n+16,s);
-}
-
-sv add1305(u32 *h,const u32 *c)
-{
-  u32 j,u = 0;
-  FOR(j,17) {
-    u += h[j] + c[j];
-    h[j] = u & 255;
-    u >>= 8;
-  }
-}
-
-static const u32 minusp[17] = {
-  5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252
-} ;
-
-int crypto_onetimeauth(u8 *out,const u8 *m,u64 n,const u8 *k)
-{
-  u32 s,i,j,u,x[17],r[17],h[17],c[17],g[17];
-
-  FOR(j,17) r[j]=h[j]=0;
-  FOR(j,16) r[j]=k[j];
-  r[3]&=15;
-  r[4]&=252;
-  r[7]&=15;
-  r[8]&=252;
-  r[11]&=15;
-  r[12]&=252;
-  r[15]&=15;
-
-  while (n > 0) {
-    FOR(j,17) c[j] = 0;
-    for (j = 0;(j < 16) && (j < n);++j) c[j] = m[j];
-    c[j] = 1;
-    m += j; n -= j;
-    add1305(h,c);
-    FOR(i,17) {
-      x[i] = 0;
-      FOR(j,17) x[i] += h[j] * ((j <= i) ? r[i - j] : 320 * r[i + 17 - j]);
-    }
-    FOR(i,17) h[i] = x[i];
-    u = 0;
-    FOR(j,16) {
-      u += h[j];
-      h[j] = u & 255;
-      u >>= 8;
-    }
-    u += h[16]; h[16] = u & 3;
-    u = 5 * (u >> 2);
-    FOR(j,16) {
-      u += h[j];
-      h[j] = u & 255;
-      u >>= 8;
-    }
-    u += h[16]; h[16] = u;
-  }
-
-  FOR(j,17) g[j] = h[j];
-  add1305(h,minusp);
-  s = -(h[16] >> 7);
-  FOR(j,17) h[j] ^= s & (g[j] ^ h[j]);
-
-  FOR(j,16) c[j] = k[j + 16];
-  c[16] = 0;
-  add1305(h,c);
-  FOR(j,16) out[j] = h[j];
-  return 0;
-}
-
-int crypto_onetimeauth_verify(const u8 *h,const u8 *m,u64 n,const u8 *k)
-{
-  u8 x[16];
-  crypto_onetimeauth(x,m,n,k);
-  return crypto_verify_16(h,x);
-}
-
-int crypto_secretbox(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *k)
-{
-  int i;
-  if (d < 32) return -1;
-  crypto_stream_xor(c,m,d,n,k);
-  crypto_onetimeauth(c + 16,c + 32,d - 32,c);
-  FOR(i,16) c[i] = 0;
-  return 0;
-}
-
-int crypto_secretbox_open(u8 *m,const u8 *c,u64 d,const u8 *n,const u8 *k)
-{
-  int i;
-  u8 x[32];
-  if (d < 32) return -1;
-  crypto_stream(x,32,n,k);
-  if (crypto_onetimeauth_verify(c + 16,c + 32,d - 32,x) != 0) return -1;
-  crypto_stream_xor(m,c,d,n,k);
-  FOR(i,32) m[i] = 0;
-  return 0;
-}
-
-sv set25519(gf r, const gf a)
-{
-  int i;
-  FOR(i,16) r[i]=a[i];
-}
-
-sv car25519(gf o)
-{
-  int i;
-  i64 c;
-  FOR(i,16) {
-    o[i]+=(1LL<<16);
-    c=o[i]>>16;
-    o[(i+1)*(i<15)]+=c-1+37*(c-1)*(i==15);
-    o[i]-=c<<16;
-  }
-}
-
-sv sel25519(gf p,gf q,int b)
-{
-  i64 t,i,c=~(b-1);
-  FOR(i,16) {
-    t= c&(p[i]^q[i]);
-    p[i]^=t;
-    q[i]^=t;
-  }
-}
-
-sv pack25519(u8 *o,const gf n)
-{
-  int i,j,b;
-  gf m,t;
-  FOR(i,16) t[i]=n[i];
-  car25519(t);
-  car25519(t);
-  car25519(t);
-  FOR(j,2) {
-    m[0]=t[0]-0xffed;
-    for(i=1;i<15;i++) {
-      m[i]=t[i]-0xffff-((m[i-1]>>16)&1);
-      m[i-1]&=0xffff;
-    }
-    m[15]=t[15]-0x7fff-((m[14]>>16)&1);
-    b=(m[15]>>16)&1;
-    m[14]&=0xffff;
-    sel25519(t,m,1-b);
-  }
-  FOR(i,16) {
-    o[2*i]=t[i]&0xff;
-    o[2*i+1]=t[i]>>8;
-  }
-}
-
-static int neq25519(const gf a, const gf b)
-{
-  u8 c[32],d[32];
-  pack25519(c,a);
-  pack25519(d,b);
-  return crypto_verify_32(c,d);
-}
-
-static u8 par25519(const gf a)
-{
-  u8 d[32];
-  pack25519(d,a);
-  return d[0]&1;
-}
-
-sv unpack25519(gf o, const u8 *n)
-{
-  int i;
-  FOR(i,16) o[i]=n[2*i]+((i64)n[2*i+1]<<8);
-  o[15]&=0x7fff;
-}
-
-sv A(gf o,const gf a,const gf b)
-{
-  int i;
-  FOR(i,16) o[i]=a[i]+b[i];
-}
-
-sv Z(gf o,const gf a,const gf b)
-{
-  int i;
-  FOR(i,16) o[i]=a[i]-b[i];
-}
-
-sv M(gf o,const gf a,const gf b)
-{
-  i64 i,j,t[31];
-  FOR(i,31) t[i]=0;
-  FOR(i,16) FOR(j,16) t[i+j]+=a[i]*b[j];
-  FOR(i,15) t[i]+=38*t[i+16];
-  FOR(i,16) o[i]=t[i];
-  car25519(o);
-  car25519(o);
-}
-
-sv S(gf o,const gf a)
-{
-  M(o,a,a);
-}
-
-sv inv25519(gf o,const gf i)
-{
-  gf c;
-  int a;
-  FOR(a,16) c[a]=i[a];
-  for(a=253;a>=0;a--) {
-    S(c,c);
-    if(a!=2&&a!=4) M(c,c,i);
-  }
-  FOR(a,16) o[a]=c[a];
-}
-
-sv pow2523(gf o,const gf i)
-{
-  gf c;
-  int a;
-  FOR(a,16) c[a]=i[a];
-  for(a=250;a>=0;a--) {
-    S(c,c);
-    if(a!=1) M(c,c,i);
-  }
-  FOR(a,16) o[a]=c[a];
-}
-
-int crypto_scalarmult(u8 *q,const u8 *n,const u8 *p)
-{
-  u8 z[32];
-  i64 x[80],r,i;
-  gf a,b,c,d,e,f;
-  FOR(i,31) z[i]=n[i];
-  z[31]=(n[31]&127)|64;
-  z[0]&=248;
-  unpack25519(x,p);
-  FOR(i,16) {
-    b[i]=x[i];
-    d[i]=a[i]=c[i]=0;
-  }
-  a[0]=d[0]=1;
-  for(i=254;i>=0;--i) {
-    r=(z[i>>3]>>(i&7))&1;
-    sel25519(a,b,r);
-    sel25519(c,d,r);
-    A(e,a,c);
-    Z(a,a,c);
-    A(c,b,d);
-    Z(b,b,d);
-    S(d,e);
-    S(f,a);
-    M(a,c,a);
-    M(c,b,e);
-    A(e,a,c);
-    Z(a,a,c);
-    S(b,a);
-    Z(c,d,f);
-    M(a,c,_121665);
-    A(a,a,d);
-    M(c,c,a);
-    M(a,d,f);
-    M(d,b,x);
-    S(b,e);
-    sel25519(a,b,r);
-    sel25519(c,d,r);
-  }
-  FOR(i,16) {
-    x[i+16]=a[i];
-    x[i+32]=c[i];
-    x[i+48]=b[i];
-    x[i+64]=d[i];
-  }
-  inv25519(x+32,x+32);
-  M(x+16,x+16,x+32);
-  pack25519(q,x+16);
-  return 0;
-}
-
-int crypto_scalarmult_base(u8 *q,const u8 *n)
-{
-  return crypto_scalarmult(q,n,_9);
-}
-
-int crypto_box_keypair(u8 *y,u8 *x)
-{
-  randombytes(x,32);
-  return crypto_scalarmult_base(y,x);
-}
-
-int crypto_box_beforenm(u8 *k,const u8 *y,const u8 *x)
-{
-  u8 s[32];
-  crypto_scalarmult(s,x,y);
-  return crypto_core_hsalsa20(k,_0,s,sigma);
-}
-
-int crypto_box_afternm(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *k)
-{
-  return crypto_secretbox(c,m,d,n,k);
-}
-
-int crypto_box_open_afternm(u8 *m,const u8 *c,u64 d,const u8 *n,const u8 *k)
-{
-  return crypto_secretbox_open(m,c,d,n,k);
-}
-
-int crypto_box(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *y,const u8 *x)
-{
-  u8 k[32];
-  crypto_box_beforenm(k,y,x);
-  return crypto_box_afternm(c,m,d,n,k);
-}
-
-int crypto_box_open(u8 *m,const u8 *c,u64 d,const u8 *n,const u8 *y,const u8 *x)
-{
-  u8 k[32];
-  crypto_box_beforenm(k,y,x);
-  return crypto_box_open_afternm(m,c,d,n,k);
-}
-
-static u64 R(u64 x,int c) { return (x >> c) | (x << (64 - c)); }
-static u64 Ch(u64 x,u64 y,u64 z) { return (x & y) ^ (~x & z); }
-static u64 Maj(u64 x,u64 y,u64 z) { return (x & y) ^ (x & z) ^ (y & z); }
-static u64 Sigma0(u64 x) { return R(x,28) ^ R(x,34) ^ R(x,39); }
-static u64 Sigma1(u64 x) { return R(x,14) ^ R(x,18) ^ R(x,41); }
-static u64 sigma0(u64 x) { return R(x, 1) ^ R(x, 8) ^ (x >> 7); }
-static u64 sigma1(u64 x) { return R(x,19) ^ R(x,61) ^ (x >> 6); }
-
-static const u64 K[80] =
-{
-  0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
-  0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
-  0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
-  0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
-  0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
-  0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
-  0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
-  0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
-  0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
-  0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
-  0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
-  0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
-  0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
-  0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
-  0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
-  0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
-  0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
-  0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
-  0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
-  0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
-};
-
-int crypto_hashblocks(u8 *x,const u8 *m,u64 n)
-{
-  u64 z[8],b[8],a[8],w[16],t;
-  int i,j;
-
-  FOR(i,8) z[i] = a[i] = dl64(x + 8 * i);
-
-  while (n >= 128) {
-    FOR(i,16) w[i] = dl64(m + 8 * i);
-
-    FOR(i,80) {
-      FOR(j,8) b[j] = a[j];
-      t = a[7] + Sigma1(a[4]) + Ch(a[4],a[5],a[6]) + K[i] + w[i%16];
-      b[7] = t + Sigma0(a[0]) + Maj(a[0],a[1],a[2]);
-      b[3] += t;
-      FOR(j,8) a[(j+1)%8] = b[j];
-      if (i%16 == 15)
-        FOR(j,16)
-          w[j] += w[(j+9)%16] + sigma0(w[(j+1)%16]) + sigma1(w[(j+14)%16]);
-    }
-
-    FOR(i,8) { a[i] += z[i]; z[i] = a[i]; }
-
-    m += 128;
-    n -= 128;
-  }
-
-  FOR(i,8) ts64(x+8*i,z[i]);
-
-  return n;
-}
-
-static const u8 iv[64] = {
-  0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08,
-  0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b,
-  0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b,
-  0xa5,0x4f,0xf5,0x3a,0x5f,0x1d,0x36,0xf1,
-  0x51,0x0e,0x52,0x7f,0xad,0xe6,0x82,0xd1,
-  0x9b,0x05,0x68,0x8c,0x2b,0x3e,0x6c,0x1f,
-  0x1f,0x83,0xd9,0xab,0xfb,0x41,0xbd,0x6b,
-  0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79
-} ;
-
-int crypto_hash(u8 *out,const u8 *m,u64 n)
-{
-  u8 h[64],x[256];
-  u64 i,b = n;
-
-  FOR(i,64) h[i] = iv[i];
-
-  crypto_hashblocks(h,m,n);
-  m += n;
-  n &= 127;
-  m -= n;
-
-  FOR(i,256) x[i] = 0;
-  FOR(i,n) x[i] = m[i];
-  x[n] = 128;
-
-  n = 256-128*(n<112);
-  x[n-9] = b >> 61;
-  ts64(x+n-8,b<<3);
-  crypto_hashblocks(h,x,n);
-
-  FOR(i,64) out[i] = h[i];
-
-  return 0;
-}
-
-sv add(gf p[4],gf q[4])
-{
-  gf a,b,c,d,t,e,f,g,h;
-
-  Z(a, p[1], p[0]);
-  Z(t, q[1], q[0]);
-  M(a, a, t);
-  A(b, p[0], p[1]);
-  A(t, q[0], q[1]);
-  M(b, b, t);
-  M(c, p[3], q[3]);
-  M(c, c, D2);
-  M(d, p[2], q[2]);
-  A(d, d, d);
-  Z(e, b, a);
-  Z(f, d, c);
-  A(g, d, c);
-  A(h, b, a);
-
-  M(p[0], e, f);
-  M(p[1], h, g);
-  M(p[2], g, f);
-  M(p[3], e, h);
-}
-
-sv cswap(gf p[4],gf q[4],u8 b)
-{
-  int i;
-  FOR(i,4)
-    sel25519(p[i],q[i],b);
-}
-
-sv pack(u8 *r,gf p[4])
-{
-  gf tx, ty, zi;
-  inv25519(zi, p[2]);
-  M(tx, p[0], zi);
-  M(ty, p[1], zi);
-  pack25519(r, ty);
-  r[31] ^= par25519(tx) << 7;
-}
-
-sv scalarmult(gf p[4],gf q[4],const u8 *s)
-{
-  int i;
-  set25519(p[0],gf0);
-  set25519(p[1],gf1);
-  set25519(p[2],gf1);
-  set25519(p[3],gf0);
-  for (i = 255;i >= 0;--i) {
-      const u8 b = (s[i/8]>>(i&7))&1;
-    cswap(p,q,b);
-    add(q,p);
-    add(p,p);
-    cswap(p,q,b);
-  }
-}
-
-sv scalarbase(gf p[4],const u8 *s)
-{
-  gf q[4];
-  set25519(q[0],X);
-  set25519(q[1],Y);
-  set25519(q[2],gf1);
-  M(q[3],X,Y);
-  scalarmult(p,q,s);
-}
-
-int crypto_sign_keypair(u8 *pk, u8 *sk)
-{
-  u8 d[64];
-  gf p[4];
-  int i;
-
-  randombytes(sk, 32);
-  crypto_hash(d, sk, 32);
-  d[0] &= 248;
-  d[31] &= 127;
-  d[31] |= 64;
-
-  scalarbase(p,d);
-  pack(pk,p);
-
-  FOR(i,32) sk[32 + i] = pk[i];
-  return 0;
-}
-
-static const u64 L[32] = {0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10};
-
-sv modL(u8 *r,i64 x[64])
-{
-  i64 carry,i,j;
-  for (i = 63;i >= 32;--i) {
-    carry = 0;
-    for (j = i - 32;j < i - 12;++j) {
-      x[j] += carry - 16 * x[i] * L[j - (i - 32)];
-      carry = (x[j] + 128) >> 8;
-      x[j] -= carry << 8;
-    }
-    x[j] += carry;
-    x[i] = 0;
-  }
-  carry = 0;
-  FOR(j,32) {
-    x[j] += carry - (x[31] >> 4) * L[j];
-    carry = x[j] >> 8;
-    x[j] &= 255;
-  }
-  FOR(j,32) x[j] -= carry * L[j];
-  FOR(i,32) {
-    x[i+1] += x[i] >> 8;
-    r[i] = x[i] & 255;
-  }
-}
-
-sv reduce(u8 *r)
-{
-  i64 x[64],i;
-  FOR(i,64) x[i] = (u64) r[i];
-  FOR(i,64) r[i] = 0;
-  modL(r,x);
-}
-
-int crypto_sign(u8 *sm,u64 *smlen,const u8 *m,u64 n,const u8 *sk)
-{
-  u8 d[64],h[64],r[64];
-  i64 i,j,x[64];
-  gf p[4];
-
-  crypto_hash(d, sk, 32);
-  d[0] &= 248;
-  d[31] &= 127;
-  d[31] |= 64;
-
-  *smlen = n+64;
-  FOR(i,n) sm[64 + i] = m[i];
-  FOR(i,32) sm[32 + i] = d[32 + i];
-
-  crypto_hash(r, sm+32, n+32);
-  reduce(r);
-  scalarbase(p,r);
-  pack(sm,p);
-
-  FOR(i,32) sm[i+32] = sk[i+32];
-  crypto_hash(h,sm,n + 64);
-  reduce(h);
-
-  FOR(i,64) x[i] = 0;
-  FOR(i,32) x[i] = (u64) r[i];
-  FOR(i,32) FOR(j,32) x[i+j] += h[i] * (u64) d[j];
-  modL(sm + 32,x);
-
-  return 0;
-}
-
-static int unpackneg(gf r[4],const u8 p[32])
-{
-  gf t, chk, num, den, den2, den4, den6;
-  set25519(r[2],gf1);
-  unpack25519(r[1],p);
-  S(num,r[1]);
-  M(den,num,D);
-  Z(num,num,r[2]);
-  A(den,r[2],den);
-
-  S(den2,den);
-  S(den4,den2);
-  M(den6,den4,den2);
-  M(t,den6,num);
-  M(t,t,den);
-
-  pow2523(t,t);
-  M(t,t,num);
-  M(t,t,den);
-  M(t,t,den);
-  M(r[0],t,den);
-
-  S(chk,r[0]);
-  M(chk,chk,den);
-  if (neq25519(chk, num)) M(r[0],r[0],I);
-
-  S(chk,r[0]);
-  M(chk,chk,den);
-  if (neq25519(chk, num)) return -1;
-
-  if (par25519(r[0]) == (p[31]>>7)) Z(r[0],gf0,r[0]);
-
-  M(r[3],r[0],r[1]);
-  return 0;
-}
-
-int crypto_sign_open(u8 *m,u64 *mlen,const u8 *sm,u64 n,const u8 *pk)
-{
-  int i;
-  u8 t[32],h[64];
-  gf p[4],q[4];
-
-  *mlen = -1;
-  if (n < 64) return -1;
-
-  if (unpackneg(q,pk)) return -1;
-
-  FOR(i,n) m[i] = sm[i];
-  FOR(i,32) m[i+32] = pk[i];
-  crypto_hash(h,m,n);
-  reduce(h);
-  scalarmult(p,q,h);
-
-  scalarbase(q,sm + 32);
-  add(p,q);
-  pack(t,p);
-
-  n -= 64;
-  if (crypto_verify_32(sm, t)) {
-    FOR(i,n) m[i] = 0;
-    return -1;
-  }
-
-  FOR(i,n) m[i] = sm[i + 64];
-  *mlen = n;
-  return 0;
-}
-
-
-#ifdef ZMQ_HAVE_WINDOWS
-
-#include <windows.h>
-#include <wincrypt.h>
-
-#define NCP ((HCRYPTPROV) 0)
-
-HCRYPTPROV hProvider = NCP;
-
-void randombytes(unsigned char *x,unsigned long long xlen)
-{
-    unsigned i;
-    BOOL ret;
-
-    if (hProvider == NCP) {
-        for (;;) {
-            ret = CryptAcquireContext(&hProvider, NULL, NULL,
-                                      PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT);
-            if (ret != FALSE)
-                break;
-            Sleep (1);
-        }
-    }
-    while (xlen > 0) {
-        if (xlen < 1048576)
-            i = (unsigned) xlen;
-        else
-            i = 1048576;
-
-        ret = CryptGenRandom(hProvider, i, x);
-        if (ret == FALSE) {
-            Sleep(1);
-            continue;
-        }
-        x += i;
-        xlen -= i;
-    }
-}
-
-int randombytes_close(void)
-{
-    int rc = -1;
-    if ((hProvider != NCP) && (CryptReleaseContext(hProvider, 0) != FALSE)) {
-        hProvider = NCP;
-        rc = 0;
-    }
-    return rc;
-}
-
-int sodium_init (void)
-{
-    return 0;
-}
-
-#else
-
-#include <unistd.h>
-#include <assert.h>
-
-#ifdef ZMQ_HAVE_GETRANDOM
-#include <sys/random.h>
-#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-static int fd = -1;
-#endif
-
-void randombytes (unsigned char *x,unsigned long long xlen)
-{
-    int i;
-#ifndef ZMQ_HAVE_GETRANDOM
-    /*  Require that random_open has already been called, to avoid
-        race conditions. */
-    assert (fd != -1);
-#endif
-    while (xlen > 0) {
-        if (xlen < 1048576)
-            i = xlen;
-        else
-            i = 1048576;
-
-#ifdef ZMQ_HAVE_GETRANDOM
-        i = getrandom (x, i, 0);
-#else
-        i = read(fd,x,i);
-#endif
-        if (i < 1) {
-            sleep (1);
-            continue;
-        }
-        x += i;
-        xlen -= i;
-    }
-}
-
-/*  Do not call manually! Use random_close from random.hpp */
-int randombytes_close (void)
-{
-    int rc = -1;
-#ifndef ZMQ_HAVE_GETRANDOM
-    if (fd != -1 && close(fd) == 0) {
-        fd = -1;
-        rc = 0;
-    }
-#endif /* ZMQ_HAVE_GETRANDOM */
-    return rc;
-}
-
-/*  Do not call manually! Use random_open from random.hpp */
-int sodium_init (void)
-{
-#ifndef ZMQ_HAVE_GETRANDOM
-    if (fd == -1) {
-        for (;;) {
-            int flags = O_RDONLY;
-#ifdef ZMQ_HAVE_O_CLOEXEC
-            flags |= O_CLOEXEC;
-#endif
-            fd = open ("/dev/urandom", flags);
-            if (fd != -1)
-                break;
-            sleep (1);
-        }
-#if !defined ZMQ_HAVE_O_CLOEXEC && defined FD_CLOEXEC
-        int rc = fcntl (fd, F_SETFD, FD_CLOEXEC);
-        assert (rc != -1);
-#endif
-    }
-#endif /* ZMQ_HAVE_GETRANDOM */
-    return 0;
-}
-
-#endif
-
-#endif
-/* clang-format on */
diff --git a/src/tweetnacl.h b/src/tweetnacl.h
deleted file mode 100644
index 28fd9c191..000000000
--- a/src/tweetnacl.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2016-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TWEETNACL_H
-#define TWEETNACL_H
-
-#if defined(ZMQ_USE_TWEETNACL)
-
-#define crypto_box_SECRETKEYBYTES 32
-#define crypto_box_BOXZEROBYTES 16
-#define crypto_box_NONCEBYTES 24
-#define crypto_box_ZEROBYTES 32
-#define crypto_box_PUBLICKEYBYTES 32
-#define crypto_box_BEFORENMBYTES 32
-#define crypto_secretbox_KEYBYTES 32
-#define crypto_secretbox_NONCEBYTES 24
-#define crypto_secretbox_ZEROBYTES 32
-#define crypto_secretbox_BOXZEROBYTES 16
-typedef unsigned char u8;
-typedef unsigned long u32;
-typedef unsigned long long u64;
-typedef long long i64;
-typedef i64 gf[16];
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-void randombytes (unsigned char *, unsigned long long);
-/* Do not call manually! Use random_close from random.hpp */
-int randombytes_close (void);
-/* Do not call manually! Use random_open from random.hpp */
-int sodium_init (void);
-
-int crypto_box_keypair (u8 *y_, u8 *x_);
-int crypto_box_afternm (
-  u8 *c_, const u8 *m_, u64 d_, const u8 *n_, const u8 *k_);
-int crypto_box_open_afternm (
-  u8 *m_, const u8 *c_, u64 d_, const u8 *n_, const u8 *k_);
-int crypto_box (
-  u8 *c_, const u8 *m_, u64 d_, const u8 *n_, const u8 *y_, const u8 *x_);
-int crypto_box_open (
-  u8 *m_, const u8 *c_, u64 d_, const u8 *n_, const u8 *y_, const u8 *x_);
-int crypto_box_beforenm (u8 *k_, const u8 *y_, const u8 *x_);
-int crypto_scalarmult_base (u8 *q_, const u8 *n_);
-int crypto_secretbox (u8 *c_, const u8 *m_, u64 d_, const u8 *n_, const u8 *k_);
-int crypto_secretbox_open (
-  u8 *m_, const u8 *c_, u64 d_, const u8 *n_, const u8 *k_);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#endif
diff --git a/src/udp_address.cpp b/src/udp_address.cpp
deleted file mode 100644
index 76d4bac41..000000000
--- a/src/udp_address.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string>
-#include <sstream>
-
-#include "macros.hpp"
-#include "udp_address.hpp"
-#include "stdint.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <net/if.h>
-#include <ctype.h>
-#endif
-
-zmq::udp_address_t::udp_address_t () :
-    _bind_interface (-1),
-    _is_multicast (false)
-{
-    _bind_address = ip_addr_t::any (AF_INET);
-    _target_address = ip_addr_t::any (AF_INET);
-}
-
-zmq::udp_address_t::~udp_address_t ()
-{
-}
-
-int zmq::udp_address_t::resolve (const char *name_, bool bind_, bool ipv6_)
-{
-    //  No IPv6 support yet
-    bool has_interface = false;
-
-    _address = name_;
-
-    //  If we have a semicolon then we should have an interface specifier in the
-    //  URL
-    const char *src_delimiter = strrchr (name_, ';');
-    if (src_delimiter) {
-        const std::string src_name (name_, src_delimiter - name_);
-
-        ip_resolver_options_t src_resolver_opts;
-
-        src_resolver_opts
-          .bindable (true)
-          //  Restrict hostname/service to literals to avoid any DNS
-          //  lookups or service-name irregularity due to
-          //  indeterminate socktype.
-          .allow_dns (false)
-          .allow_nic_name (true)
-          .ipv6 (ipv6_)
-          .expect_port (false);
-
-        ip_resolver_t src_resolver (src_resolver_opts);
-
-        const int rc = src_resolver.resolve (&_bind_address, src_name.c_str ());
-
-        if (rc != 0) {
-            return -1;
-        }
-
-        if (_bind_address.is_multicast ()) {
-            //  It doesn't make sense to have a multicast address as a source
-            errno = EINVAL;
-            return -1;
-        }
-
-        //  This is a hack because we need the interface index when binding
-        //  multicast IPv6, we can't do it by address. Unfortunately for the
-        //  time being we don't have a generic platform-independent function to
-        //  resolve an interface index from an address, so we only support it
-        //  when an actual interface name is provided.
-        if (src_name == "*") {
-            _bind_interface = 0;
-        } else {
-#if _WIN32_WINNT > _WIN32_WINNT_WINXP && !defined ZMQ_HAVE_WINDOWS_UWP         \
-  && !defined ZMQ_HAVE_VXWORKS
-            _bind_interface = if_nametoindex (src_name.c_str ());
-            if (_bind_interface == 0) {
-                //  Error, probably not an interface name.
-                _bind_interface = -1;
-            }
-#endif
-        }
-
-        has_interface = true;
-        name_ = src_delimiter + 1;
-    }
-
-    ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (bind_)
-      .allow_dns (!bind_)
-      .allow_nic_name (bind_)
-      .expect_port (true)
-      .ipv6 (ipv6_);
-
-    ip_resolver_t resolver (resolver_opts);
-
-    const int rc = resolver.resolve (&_target_address, name_);
-    if (rc != 0) {
-        return -1;
-    }
-
-    _is_multicast = _target_address.is_multicast ();
-    const uint16_t port = _target_address.port ();
-
-    if (has_interface) {
-        //  If we have an interface specifier then the target address must be a
-        //  multicast address
-        if (!_is_multicast) {
-            errno = EINVAL;
-            return -1;
-        }
-
-        _bind_address.set_port (port);
-    } else {
-        //  If we don't have an explicit interface specifier then the URL is
-        //  ambiguous: if the target address is multicast then it's the
-        //  destination address and the bind address is ANY, if it's unicast
-        //  then it's the bind address when 'bind_' is true and the destination
-        //  otherwise
-        if (_is_multicast || !bind_) {
-            _bind_address = ip_addr_t::any (_target_address.family ());
-            _bind_address.set_port (port);
-            _bind_interface = 0;
-        } else {
-            //  If we were asked for a bind socket and the address
-            //  provided was not multicast then it was really meant as
-            //  a bind address and the target_address is useless.
-            _bind_address = _target_address;
-        }
-    }
-
-    if (_bind_address.family () != _target_address.family ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  For IPv6 multicast we *must* have an interface index since we can't
-    //  bind by address.
-    if (ipv6_ && _is_multicast && _bind_interface < 0) {
-        errno = ENODEV;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::udp_address_t::family () const
-{
-    return _bind_address.family ();
-}
-
-bool zmq::udp_address_t::is_mcast () const
-{
-    return _is_multicast;
-}
-
-const zmq::ip_addr_t *zmq::udp_address_t::bind_addr () const
-{
-    return &_bind_address;
-}
-
-int zmq::udp_address_t::bind_if () const
-{
-    return _bind_interface;
-}
-
-const zmq::ip_addr_t *zmq::udp_address_t::target_addr () const
-{
-    return &_target_address;
-}
-
-int zmq::udp_address_t::to_string (std::string &addr_)
-{
-    // XXX what do (factor TCP code?)
-    addr_ = _address;
-    return 0;
-}
diff --git a/src/udp_address.hpp b/src/udp_address.hpp
deleted file mode 100644
index a2530d8fc..000000000
--- a/src/udp_address.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_UDP_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_UDP_ADDRESS_HPP_INCLUDED__
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
-#include <string>
-
-#include "ip_resolver.hpp"
-
-namespace zmq
-{
-class udp_address_t
-{
-  public:
-    udp_address_t ();
-    virtual ~udp_address_t ();
-
-    int resolve (const char *name_, bool bind_, bool ipv6_);
-
-    //  The opposite to resolve()
-    virtual int to_string (std::string &addr_);
-
-
-    int family () const;
-
-    bool is_mcast () const;
-
-    const ip_addr_t *bind_addr () const;
-    int bind_if () const;
-    const ip_addr_t *target_addr () const;
-
-  private:
-    ip_addr_t _bind_address;
-    int _bind_interface;
-    ip_addr_t _target_address;
-    bool _is_multicast;
-    std::string _address;
-};
-}
-
-#endif
diff --git a/src/udp_engine.cpp b/src/udp_engine.cpp
deleted file mode 100644
index 0f7f58b3e..000000000
--- a/src/udp_engine.cpp
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
-Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#include "udp_address.hpp"
-#include "udp_engine.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-//  OSX uses a different name for this socket option
-#ifndef IPV6_ADD_MEMBERSHIP
-#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-zmq::udp_engine_t::udp_engine_t (const options_t &options_) :
-    _plugged (false),
-    _fd (-1),
-    _session (NULL),
-    _handle (static_cast<handle_t> (NULL)),
-    _address (NULL),
-    _options (options_),
-    _send_enabled (false),
-    _recv_enabled (false)
-{
-}
-
-zmq::udp_engine_t::~udp_engine_t ()
-{
-    zmq_assert (!_plugged);
-
-    if (_fd != retired_fd) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (_fd);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = close (_fd);
-        errno_assert (rc == 0);
-#endif
-        _fd = retired_fd;
-    }
-}
-
-int zmq::udp_engine_t::init (address_t *address_, bool send_, bool recv_)
-{
-    zmq_assert (address_);
-    zmq_assert (send_ || recv_);
-    _send_enabled = send_;
-    _recv_enabled = recv_;
-    _address = address_;
-
-    _fd = open_socket (_address->resolved.udp_addr->family (), SOCK_DGRAM,
-                       IPPROTO_UDP);
-    if (_fd == retired_fd)
-        return -1;
-
-    unblock_socket (_fd);
-
-    return 0;
-}
-
-void zmq::udp_engine_t::plug (io_thread_t *io_thread_, session_base_t *session_)
-{
-    zmq_assert (!_plugged);
-    _plugged = true;
-
-    zmq_assert (!_session);
-    zmq_assert (session_);
-    _session = session_;
-
-    //  Connect to I/O threads poller object.
-    io_object_t::plug (io_thread_);
-    _handle = add_fd (_fd);
-
-    const udp_address_t *const udp_addr = _address->resolved.udp_addr;
-
-    int rc = 0;
-
-    // Bind the socket to a device if applicable
-    if (!_options.bound_device.empty ()) {
-        rc = rc | bind_to_device (_fd, _options.bound_device);
-        if (rc != 0) {
-            assert_success_or_recoverable (_fd, rc);
-            error (connection_error);
-            return;
-        }
-    }
-
-    if (_send_enabled) {
-        if (!_options.raw_socket) {
-            const ip_addr_t *out = udp_addr->target_addr ();
-            _out_address = out->as_sockaddr ();
-            _out_address_len = out->sockaddr_len ();
-
-            if (out->is_multicast ()) {
-                const bool is_ipv6 = (out->family () == AF_INET6);
-                rc = rc
-                     | set_udp_multicast_loop (_fd, is_ipv6,
-                                               _options.multicast_loop);
-
-                if (_options.multicast_hops > 0) {
-                    rc = rc
-                         | set_udp_multicast_ttl (_fd, is_ipv6,
-                                                  _options.multicast_hops);
-                }
-
-                rc = rc | set_udp_multicast_iface (_fd, is_ipv6, udp_addr);
-            }
-        } else {
-            /// XXX fixme ?
-            _out_address = reinterpret_cast<sockaddr *> (&_raw_address);
-            _out_address_len =
-              static_cast<zmq_socklen_t> (sizeof (sockaddr_in));
-        }
-    }
-
-    if (_recv_enabled) {
-        rc = rc | set_udp_reuse_address (_fd, true);
-
-        const ip_addr_t *bind_addr = udp_addr->bind_addr ();
-        ip_addr_t any = ip_addr_t::any (bind_addr->family ());
-        const ip_addr_t *real_bind_addr;
-
-        const bool multicast = udp_addr->is_mcast ();
-
-        if (multicast) {
-            //  Multicast addresses should be allowed to bind to more than
-            //  one port as all ports should receive the message
-            rc = rc | set_udp_reuse_port (_fd, true);
-
-            //  In multicast we should bind ANY and use the mreq struct to
-            //  specify the interface
-            any.set_port (bind_addr->port ());
-
-            real_bind_addr = &any;
-        } else {
-            real_bind_addr = bind_addr;
-        }
-
-        if (rc != 0) {
-            error (protocol_error);
-            return;
-        }
-
-#ifdef ZMQ_HAVE_VXWORKS
-        rc = rc
-             | bind (_fd, (sockaddr *) real_bind_addr->as_sockaddr (),
-                     real_bind_addr->sockaddr_len ());
-#else
-        rc = rc
-             | bind (_fd, real_bind_addr->as_sockaddr (),
-                     real_bind_addr->sockaddr_len ());
-#endif
-        if (rc != 0) {
-            assert_success_or_recoverable (_fd, rc);
-            error (connection_error);
-            return;
-        }
-
-        if (multicast) {
-            rc = rc | add_membership (_fd, udp_addr);
-        }
-    }
-
-    if (rc != 0) {
-        error (protocol_error);
-    } else {
-        if (_send_enabled) {
-            set_pollout (_handle);
-        }
-
-        if (_recv_enabled) {
-            set_pollin (_handle);
-
-            //  Call restart output to drop all join/leave commands
-            restart_output ();
-        }
-    }
-}
-
-int zmq::udp_engine_t::set_udp_multicast_loop (fd_t s_,
-                                               bool is_ipv6_,
-                                               bool loop_)
-{
-    int level;
-    int optname;
-
-    if (is_ipv6_) {
-        level = IPPROTO_IPV6;
-        optname = IPV6_MULTICAST_LOOP;
-    } else {
-        level = IPPROTO_IP;
-        optname = IP_MULTICAST_LOOP;
-    }
-
-    int loop = loop_ ? 1 : 0;
-    const int rc = setsockopt (s_, level, optname,
-                               reinterpret_cast<char *> (&loop), sizeof (loop));
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-int zmq::udp_engine_t::set_udp_multicast_ttl (fd_t s_, bool is_ipv6_, int hops_)
-{
-    int level;
-
-    if (is_ipv6_) {
-        level = IPPROTO_IPV6;
-    } else {
-        level = IPPROTO_IP;
-    }
-
-    const int rc =
-      setsockopt (s_, level, IP_MULTICAST_TTL,
-                  reinterpret_cast<char *> (&hops_), sizeof (hops_));
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-int zmq::udp_engine_t::set_udp_multicast_iface (fd_t s_,
-                                                bool is_ipv6_,
-                                                const udp_address_t *addr_)
-{
-    int rc = 0;
-
-    if (is_ipv6_) {
-        int bind_if = addr_->bind_if ();
-
-        if (bind_if > 0) {
-            //  If a bind interface is provided we tell the
-            //  kernel to use it to send multicast packets
-            rc = setsockopt (s_, IPPROTO_IPV6, IPV6_MULTICAST_IF,
-                             reinterpret_cast<char *> (&bind_if),
-                             sizeof (bind_if));
-        }
-    } else {
-        struct in_addr bind_addr = addr_->bind_addr ()->ipv4.sin_addr;
-
-        if (bind_addr.s_addr != INADDR_ANY) {
-            rc = setsockopt (s_, IPPROTO_IP, IP_MULTICAST_IF,
-                             reinterpret_cast<char *> (&bind_addr),
-                             sizeof (bind_addr));
-        }
-    }
-
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-int zmq::udp_engine_t::set_udp_reuse_address (fd_t s_, bool on_)
-{
-    int on = on_ ? 1 : 0;
-    const int rc = setsockopt (s_, SOL_SOCKET, SO_REUSEADDR,
-                               reinterpret_cast<char *> (&on), sizeof (on));
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-int zmq::udp_engine_t::set_udp_reuse_port (fd_t s_, bool on_)
-{
-#ifndef SO_REUSEPORT
-    return 0;
-#else
-    int on = on_ ? 1 : 0;
-    int rc = setsockopt (s_, SOL_SOCKET, SO_REUSEPORT,
-                         reinterpret_cast<char *> (&on), sizeof (on));
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-#endif
-}
-
-int zmq::udp_engine_t::add_membership (fd_t s_, const udp_address_t *addr_)
-{
-    const ip_addr_t *mcast_addr = addr_->target_addr ();
-    int rc = 0;
-
-    if (mcast_addr->family () == AF_INET) {
-        struct ip_mreq mreq;
-        mreq.imr_multiaddr = mcast_addr->ipv4.sin_addr;
-        mreq.imr_interface = addr_->bind_addr ()->ipv4.sin_addr;
-
-        rc = setsockopt (s_, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-                         reinterpret_cast<char *> (&mreq), sizeof (mreq));
-
-    } else if (mcast_addr->family () == AF_INET6) {
-        struct ipv6_mreq mreq;
-        const int iface = addr_->bind_if ();
-
-        zmq_assert (iface >= -1);
-
-        mreq.ipv6mr_multiaddr = mcast_addr->ipv6.sin6_addr;
-        mreq.ipv6mr_interface = iface;
-
-        rc = setsockopt (s_, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP,
-                         reinterpret_cast<char *> (&mreq), sizeof (mreq));
-    }
-
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-void zmq::udp_engine_t::error (error_reason_t reason_)
-{
-    zmq_assert (_session);
-    _session->engine_error (false, reason_);
-    terminate ();
-}
-
-void zmq::udp_engine_t::terminate ()
-{
-    zmq_assert (_plugged);
-    _plugged = false;
-
-    rm_fd (_handle);
-
-    //  Disconnect from I/O threads poller object.
-    io_object_t::unplug ();
-
-    delete this;
-}
-
-void zmq::udp_engine_t::sockaddr_to_msg (zmq::msg_t *msg_,
-                                         const sockaddr_in *addr_)
-{
-    const char *const name = inet_ntoa (addr_->sin_addr);
-
-    char port[6];
-    const int port_len =
-      sprintf (port, "%d", static_cast<int> (ntohs (addr_->sin_port)));
-    zmq_assert (port_len > 0);
-
-    const size_t name_len = strlen (name);
-    const int size = static_cast<int> (name_len) + 1 /* colon */
-                     + port_len + 1;                 //  terminating NUL
-    const int rc = msg_->init_size (size);
-    errno_assert (rc == 0);
-    msg_->set_flags (msg_t::more);
-
-    //  use memcpy instead of strcpy/strcat, since this is more efficient when
-    //  we already know the lengths, which we calculated above
-    char *address = static_cast<char *> (msg_->data ());
-    memcpy (address, name, name_len);
-    address += name_len;
-    *address++ = ':';
-    memcpy (address, port, static_cast<size_t> (port_len));
-    address += port_len;
-    *address = 0;
-}
-
-int zmq::udp_engine_t::resolve_raw_address (const char *name_, size_t length_)
-{
-    memset (&_raw_address, 0, sizeof _raw_address);
-
-    const char *delimiter = NULL;
-
-    // Find delimiter, cannot use memrchr as it is not supported on windows
-    if (length_ != 0) {
-        int chars_left = static_cast<int> (length_);
-        const char *current_char = name_ + length_;
-        do {
-            if (*(--current_char) == ':') {
-                delimiter = current_char;
-                break;
-            }
-        } while (--chars_left != 0);
-    }
-
-    if (!delimiter) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    const std::string addr_str (name_, delimiter - name_);
-    const std::string port_str (delimiter + 1, name_ + length_ - delimiter - 1);
-
-    //  Parse the port number (0 is not a valid port).
-    const uint16_t port = static_cast<uint16_t> (atoi (port_str.c_str ()));
-    if (port == 0) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _raw_address.sin_family = AF_INET;
-    _raw_address.sin_port = htons (port);
-    _raw_address.sin_addr.s_addr = inet_addr (addr_str.c_str ());
-
-    if (_raw_address.sin_addr.s_addr == INADDR_NONE) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    return 0;
-}
-
-void zmq::udp_engine_t::out_event ()
-{
-    msg_t group_msg;
-    int rc = _session->pull_msg (&group_msg);
-    errno_assert (rc == 0 || (rc == -1 && errno == EAGAIN));
-
-    if (rc == 0) {
-        msg_t body_msg;
-        rc = _session->pull_msg (&body_msg);
-        //  If there's a group, there should also be a body
-        errno_assert (rc == 0);
-
-        const size_t group_size = group_msg.size ();
-        const size_t body_size = body_msg.size ();
-        size_t size;
-
-        if (_options.raw_socket) {
-            rc = resolve_raw_address (static_cast<char *> (group_msg.data ()),
-                                      group_size);
-
-            //  We discard the message if address is not valid
-            if (rc != 0) {
-                rc = group_msg.close ();
-                errno_assert (rc == 0);
-
-                rc = body_msg.close ();
-                errno_assert (rc == 0);
-
-                return;
-            }
-
-            size = body_size;
-
-            memcpy (_out_buffer, body_msg.data (), body_size);
-        } else {
-            size = group_size + body_size + 1;
-
-            // TODO: check if larger than maximum size
-            _out_buffer[0] = static_cast<unsigned char> (group_size);
-            memcpy (_out_buffer + 1, group_msg.data (), group_size);
-            memcpy (_out_buffer + 1 + group_size, body_msg.data (), body_size);
-        }
-
-        rc = group_msg.close ();
-        errno_assert (rc == 0);
-
-        body_msg.close ();
-        errno_assert (rc == 0);
-
-#ifdef ZMQ_HAVE_WINDOWS
-        rc = sendto (_fd, _out_buffer, static_cast<int> (size), 0, _out_address,
-                     _out_address_len);
-#elif defined ZMQ_HAVE_VXWORKS
-        rc = sendto (_fd, reinterpret_cast<caddr_t> (_out_buffer), size, 0,
-                     (sockaddr *) _out_address, _out_address_len);
-#else
-        rc = sendto (_fd, _out_buffer, size, 0, _out_address, _out_address_len);
-#endif
-        if (rc < 0) {
-#ifdef ZMQ_HAVE_WINDOWS
-            if (WSAGetLastError () != WSAEWOULDBLOCK) {
-                assert_success_or_recoverable (_fd, rc);
-                error (connection_error);
-            }
-#else
-            if (rc != EWOULDBLOCK) {
-                assert_success_or_recoverable (_fd, rc);
-                error (connection_error);
-            }
-#endif
-        }
-    } else {
-        reset_pollout (_handle);
-    }
-}
-
-const zmq::endpoint_uri_pair_t &zmq::udp_engine_t::get_endpoint () const
-{
-    return _empty_endpoint;
-}
-
-void zmq::udp_engine_t::restart_output ()
-{
-    //  If we don't support send we just drop all messages
-    if (!_send_enabled) {
-        msg_t msg;
-        while (_session->pull_msg (&msg) == 0)
-            msg.close ();
-    } else {
-        set_pollout (_handle);
-        out_event ();
-    }
-}
-
-void zmq::udp_engine_t::in_event ()
-{
-    sockaddr_storage in_address;
-    zmq_socklen_t in_addrlen =
-      static_cast<zmq_socklen_t> (sizeof (sockaddr_storage));
-
-    const int nbytes =
-      recvfrom (_fd, _in_buffer, MAX_UDP_MSG, 0,
-                reinterpret_cast<sockaddr *> (&in_address), &in_addrlen);
-
-    if (nbytes < 0) {
-#ifdef ZMQ_HAVE_WINDOWS
-        if (WSAGetLastError () != WSAEWOULDBLOCK) {
-            assert_success_or_recoverable (_fd, nbytes);
-            error (connection_error);
-        }
-#else
-        if (nbytes != EWOULDBLOCK) {
-            assert_success_or_recoverable (_fd, nbytes);
-            error (connection_error);
-        }
-#endif
-        return;
-    }
-
-    int rc;
-    int body_size;
-    int body_offset;
-    msg_t msg;
-
-    if (_options.raw_socket) {
-        zmq_assert (in_address.ss_family == AF_INET);
-        sockaddr_to_msg (&msg, reinterpret_cast<sockaddr_in *> (&in_address));
-
-        body_size = nbytes;
-        body_offset = 0;
-    } else {
-        // TODO in out_event, the group size is an *unsigned* char. what is
-        // the maximum value?
-        const char *group_buffer = _in_buffer + 1;
-        const int group_size = _in_buffer[0];
-
-        rc = msg.init_size (group_size);
-        errno_assert (rc == 0);
-        msg.set_flags (msg_t::more);
-        memcpy (msg.data (), group_buffer, group_size);
-
-        //  This doesn't fit, just ingore
-        if (nbytes - 1 < group_size)
-            return;
-
-        body_size = nbytes - 1 - group_size;
-        body_offset = 1 + group_size;
-    }
-    // Push group description to session
-    rc = _session->push_msg (&msg);
-    errno_assert (rc == 0 || (rc == -1 && errno == EAGAIN));
-
-    //  Group description message doesn't fit in the pipe, drop
-    if (rc != 0) {
-        rc = msg.close ();
-        errno_assert (rc == 0);
-
-        reset_pollin (_handle);
-        return;
-    }
-
-    rc = msg.close ();
-    errno_assert (rc == 0);
-    rc = msg.init_size (body_size);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), _in_buffer + body_offset, body_size);
-
-    // Push message body to session
-    rc = _session->push_msg (&msg);
-    // Message body doesn't fit in the pipe, drop and reset session state
-    if (rc != 0) {
-        rc = msg.close ();
-        errno_assert (rc == 0);
-
-        _session->reset ();
-        reset_pollin (_handle);
-        return;
-    }
-
-    rc = msg.close ();
-    errno_assert (rc == 0);
-    _session->flush ();
-}
-
-bool zmq::udp_engine_t::restart_input ()
-{
-    if (_recv_enabled) {
-        set_pollin (_handle);
-        in_event ();
-    }
-
-    return true;
-}
diff --git a/src/udp_engine.hpp b/src/udp_engine.hpp
deleted file mode 100644
index 4208181ec..000000000
--- a/src/udp_engine.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-
-#ifndef __ZMQ_UDP_ENGINE_HPP_INCLUDED__
-#define __ZMQ_UDP_ENGINE_HPP_INCLUDED__
-
-#include "io_object.hpp"
-#include "i_engine.hpp"
-#include "address.hpp"
-#include "msg.hpp"
-
-#define MAX_UDP_MSG 8192
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-
-class udp_engine_t ZMQ_FINAL : public io_object_t, public i_engine
-{
-  public:
-    udp_engine_t (const options_t &options_);
-    ~udp_engine_t ();
-
-    int init (address_t *address_, bool send_, bool recv_);
-
-    bool has_handshake_stage () ZMQ_FINAL { return false; };
-
-    //  i_engine interface implementation.
-    //  Plug the engine to the session.
-    void plug (zmq::io_thread_t *io_thread_, class session_base_t *session_);
-
-    //  Terminate and deallocate the engine. Note that 'detached'
-    //  events are not fired on termination.
-    void terminate ();
-
-    //  This method is called by the session to signalise that more
-    //  messages can be written to the pipe.
-    bool restart_input ();
-
-    //  This method is called by the session to signalise that there
-    //  are messages to send available.
-    void restart_output ();
-
-    void zap_msg_available (){};
-
-    void in_event ();
-    void out_event ();
-
-    const endpoint_uri_pair_t &get_endpoint () const;
-
-  private:
-    int resolve_raw_address (const char *name_, size_t length_);
-    static void sockaddr_to_msg (zmq::msg_t *msg_, const sockaddr_in *addr_);
-
-    static int set_udp_reuse_address (fd_t s_, bool on_);
-    static int set_udp_reuse_port (fd_t s_, bool on_);
-    // Indicate, if the multicast data being sent should be looped back
-    static int set_udp_multicast_loop (fd_t s_, bool is_ipv6_, bool loop_);
-    // Set multicast TTL
-    static int set_udp_multicast_ttl (fd_t s_, bool is_ipv6_, int hops_);
-    // Set multicast address/interface
-    int set_udp_multicast_iface (fd_t s_,
-                                 bool is_ipv6_,
-                                 const udp_address_t *addr_);
-    // Join a multicast group
-    int add_membership (fd_t s_, const udp_address_t *addr_);
-
-    //  Function to handle network issues.
-    void error (error_reason_t reason_);
-
-    const endpoint_uri_pair_t _empty_endpoint;
-
-    bool _plugged;
-
-    fd_t _fd;
-    session_base_t *_session;
-    handle_t _handle;
-    address_t *_address;
-
-    options_t _options;
-
-    sockaddr_in _raw_address;
-    const struct sockaddr *_out_address;
-    zmq_socklen_t _out_address_len;
-
-    char _out_buffer[MAX_UDP_MSG];
-    char _in_buffer[MAX_UDP_MSG];
-    bool _send_enabled;
-    bool _recv_enabled;
-};
-}
-
-#endif
diff --git a/src/v1_decoder.cpp b/src/v1_decoder.cpp
deleted file mode 100644
index e988ed72e..000000000
--- a/src/v1_decoder.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-#include <string.h>
-#include <limits>
-#include <limits.h>
-
-#include "decoder.hpp"
-#include "v1_decoder.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-#include "err.hpp"
-
-zmq::v1_decoder_t::v1_decoder_t (size_t bufsize_, int64_t maxmsgsize_) :
-    decoder_base_t<v1_decoder_t> (bufsize_),
-    _max_msg_size (maxmsgsize_)
-{
-    int rc = _in_progress.init ();
-    errno_assert (rc == 0);
-
-    //  At the beginning, read one byte and go to one_byte_size_ready state.
-    next_step (_tmpbuf, 1, &v1_decoder_t::one_byte_size_ready);
-}
-
-zmq::v1_decoder_t::~v1_decoder_t ()
-{
-    const int rc = _in_progress.close ();
-    errno_assert (rc == 0);
-}
-
-int zmq::v1_decoder_t::one_byte_size_ready (unsigned char const *)
-{
-    //  First byte of size is read. If it is UCHAR_MAX (0xff) read 8-byte size.
-    //  Otherwise allocate the buffer for message data and read the
-    //  message data into it.
-    if (*_tmpbuf == UCHAR_MAX)
-        next_step (_tmpbuf, 8, &v1_decoder_t::eight_byte_size_ready);
-    else {
-        //  There has to be at least one byte (the flags) in the message).
-        if (!*_tmpbuf) {
-            errno = EPROTO;
-            return -1;
-        }
-
-        if (_max_msg_size >= 0
-            && static_cast<int64_t> (*_tmpbuf - 1) > _max_msg_size) {
-            errno = EMSGSIZE;
-            return -1;
-        }
-
-        int rc = _in_progress.close ();
-        assert (rc == 0);
-        rc = _in_progress.init_size (*_tmpbuf - 1);
-        if (rc != 0) {
-            errno_assert (errno == ENOMEM);
-            rc = _in_progress.init ();
-            errno_assert (rc == 0);
-            errno = ENOMEM;
-            return -1;
-        }
-
-        next_step (_tmpbuf, 1, &v1_decoder_t::flags_ready);
-    }
-    return 0;
-}
-
-int zmq::v1_decoder_t::eight_byte_size_ready (unsigned char const *)
-{
-    //  8-byte payload length is read. Allocate the buffer
-    //  for message body and read the message data into it.
-    const uint64_t payload_length = get_uint64 (_tmpbuf);
-
-    //  There has to be at least one byte (the flags) in the message).
-    if (payload_length == 0) {
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  Message size must not exceed the maximum allowed size.
-    if (_max_msg_size >= 0
-        && payload_length - 1 > static_cast<uint64_t> (_max_msg_size)) {
-        errno = EMSGSIZE;
-        return -1;
-    }
-
-#ifndef __aarch64__
-    //  Message size must fit within range of size_t data type.
-    if (payload_length - 1 > std::numeric_limits<size_t>::max ()) {
-        errno = EMSGSIZE;
-        return -1;
-    }
-#endif
-
-    const size_t msg_size = static_cast<size_t> (payload_length - 1);
-
-    int rc = _in_progress.close ();
-    assert (rc == 0);
-    rc = _in_progress.init_size (msg_size);
-    if (rc != 0) {
-        errno_assert (errno == ENOMEM);
-        rc = _in_progress.init ();
-        errno_assert (rc == 0);
-        errno = ENOMEM;
-        return -1;
-    }
-
-    next_step (_tmpbuf, 1, &v1_decoder_t::flags_ready);
-    return 0;
-}
-
-int zmq::v1_decoder_t::flags_ready (unsigned char const *)
-{
-    //  Store the flags from the wire into the message structure.
-    _in_progress.set_flags (_tmpbuf[0] & msg_t::more);
-
-    next_step (_in_progress.data (), _in_progress.size (),
-               &v1_decoder_t::message_ready);
-
-    return 0;
-}
-
-int zmq::v1_decoder_t::message_ready (unsigned char const *)
-{
-    //  Message is completely read. Push it further and start reading
-    //  new message. (in_progress is a 0-byte message after this point.)
-    next_step (_tmpbuf, 1, &v1_decoder_t::one_byte_size_ready);
-    return 1;
-}
diff --git a/src/v1_decoder.hpp b/src/v1_decoder.hpp
deleted file mode 100644
index ccf63fc04..000000000
--- a/src/v1_decoder.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V1_DECODER_HPP_INCLUDED__
-#define __ZMQ_V1_DECODER_HPP_INCLUDED__
-
-#include "decoder.hpp"
-
-namespace zmq
-{
-//  Decoder for ZMTP/1.0 protocol. Converts data batches into messages.
-
-class v1_decoder_t ZMQ_FINAL : public decoder_base_t<v1_decoder_t>
-{
-  public:
-    v1_decoder_t (size_t bufsize_, int64_t maxmsgsize_);
-    ~v1_decoder_t ();
-
-    msg_t *msg () { return &_in_progress; }
-
-  private:
-    int one_byte_size_ready (unsigned char const *);
-    int eight_byte_size_ready (unsigned char const *);
-    int flags_ready (unsigned char const *);
-    int message_ready (unsigned char const *);
-
-    unsigned char _tmpbuf[8];
-    msg_t _in_progress;
-
-    const int64_t _max_msg_size;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v1_decoder_t)
-};
-}
-
-#endif
diff --git a/src/v1_encoder.cpp b/src/v1_encoder.cpp
deleted file mode 100644
index 38e7e982f..000000000
--- a/src/v1_encoder.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "encoder.hpp"
-#include "v1_encoder.hpp"
-#include "msg.hpp"
-#include "wire.hpp"
-
-#include <limits.h>
-
-zmq::v1_encoder_t::v1_encoder_t (size_t bufsize_) :
-    encoder_base_t<v1_encoder_t> (bufsize_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &v1_encoder_t::message_ready, true);
-}
-
-zmq::v1_encoder_t::~v1_encoder_t ()
-{
-}
-
-void zmq::v1_encoder_t::size_ready ()
-{
-    //  Write message body into the buffer.
-    next_step (in_progress ()->data (), in_progress ()->size (),
-               &v1_encoder_t::message_ready, true);
-}
-
-void zmq::v1_encoder_t::message_ready ()
-{
-    size_t header_size = 2; // flags byte + size byte
-    //  Get the message size.
-    size_t size = in_progress ()->size ();
-
-    //  Account for the 'flags' byte.
-    size++;
-
-    //  Account for the subscribe/cancel byte.
-    if (in_progress ()->is_subscribe () || in_progress ()->is_cancel ())
-        size++;
-
-    //  For messages less than 255 bytes long, write one byte of message size.
-    //  For longer messages write 0xff escape character followed by 8-byte
-    //  message size. In both cases 'flags' field follows.
-    if (size < UCHAR_MAX) {
-        _tmpbuf[0] = static_cast<unsigned char> (size);
-        _tmpbuf[1] = (in_progress ()->flags () & msg_t::more);
-    } else {
-        _tmpbuf[0] = UCHAR_MAX;
-        put_uint64 (_tmpbuf + 1, size);
-        _tmpbuf[9] = (in_progress ()->flags () & msg_t::more);
-        header_size = 10;
-    }
-
-    //  Encode the subscribe/cancel byte. This is done in the encoder as
-    //  opposed to when the subscribe message is created to allow different
-    //  protocol behaviour on the wire in the v3.1 and legacy encoders.
-    //  It results in the work being done multiple times in case the sub
-    //  is sending the subscription/cancel to multiple pubs, but it cannot
-    //  be avoided. This processing can be moved to xsub once support for
-    //  ZMTP < 3.1 is dropped.
-    if (in_progress ()->is_subscribe ())
-        _tmpbuf[header_size++] = 1;
-    else if (in_progress ()->is_cancel ())
-        _tmpbuf[header_size++] = 0;
-
-    next_step (_tmpbuf, header_size, &v1_encoder_t::size_ready, false);
-}
diff --git a/src/v1_encoder.hpp b/src/v1_encoder.hpp
deleted file mode 100644
index 3f7a57e33..000000000
--- a/src/v1_encoder.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V1_ENCODER_HPP_INCLUDED__
-#define __ZMQ_V1_ENCODER_HPP_INCLUDED__
-
-#include "encoder.hpp"
-
-namespace zmq
-{
-//  Encoder for ZMTP/1.0 protocol. Converts messages into data batches.
-
-class v1_encoder_t ZMQ_FINAL : public encoder_base_t<v1_encoder_t>
-{
-  public:
-    v1_encoder_t (size_t bufsize_);
-    ~v1_encoder_t ();
-
-  private:
-    void size_ready ();
-    void message_ready ();
-
-    unsigned char _tmpbuf[11];
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v1_encoder_t)
-};
-}
-
-#endif
diff --git a/src/v2_decoder.cpp b/src/v2_decoder.cpp
deleted file mode 100644
index 5848d6a0f..000000000
--- a/src/v2_decoder.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-#include <string.h>
-#include <cmath>
-
-#include "v2_protocol.hpp"
-#include "v2_decoder.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-#include "err.hpp"
-
-zmq::v2_decoder_t::v2_decoder_t (size_t bufsize_,
-                                 int64_t maxmsgsize_,
-                                 bool zero_copy_) :
-    decoder_base_t<v2_decoder_t, shared_message_memory_allocator> (bufsize_),
-    _msg_flags (0),
-    _zero_copy (zero_copy_),
-    _max_msg_size (maxmsgsize_)
-{
-    int rc = _in_progress.init ();
-    errno_assert (rc == 0);
-
-    //  At the beginning, read one byte and go to flags_ready state.
-    next_step (_tmpbuf, 1, &v2_decoder_t::flags_ready);
-}
-
-zmq::v2_decoder_t::~v2_decoder_t ()
-{
-    const int rc = _in_progress.close ();
-    errno_assert (rc == 0);
-}
-
-int zmq::v2_decoder_t::flags_ready (unsigned char const *)
-{
-    _msg_flags = 0;
-    if (_tmpbuf[0] & v2_protocol_t::more_flag)
-        _msg_flags |= msg_t::more;
-    if (_tmpbuf[0] & v2_protocol_t::command_flag)
-        _msg_flags |= msg_t::command;
-
-    //  The payload length is either one or eight bytes,
-    //  depending on whether the 'large' bit is set.
-    if (_tmpbuf[0] & v2_protocol_t::large_flag)
-        next_step (_tmpbuf, 8, &v2_decoder_t::eight_byte_size_ready);
-    else
-        next_step (_tmpbuf, 1, &v2_decoder_t::one_byte_size_ready);
-
-    return 0;
-}
-
-int zmq::v2_decoder_t::one_byte_size_ready (unsigned char const *read_from_)
-{
-    return size_ready (_tmpbuf[0], read_from_);
-}
-
-int zmq::v2_decoder_t::eight_byte_size_ready (unsigned char const *read_from_)
-{
-    //  The payload size is encoded as 64-bit unsigned integer.
-    //  The most significant byte comes first.
-    const uint64_t msg_size = get_uint64 (_tmpbuf);
-
-    return size_ready (msg_size, read_from_);
-}
-
-int zmq::v2_decoder_t::size_ready (uint64_t msg_size_,
-                                   unsigned char const *read_pos_)
-{
-    //  Message size must not exceed the maximum allowed size.
-    if (_max_msg_size >= 0)
-        if (unlikely (msg_size_ > static_cast<uint64_t> (_max_msg_size))) {
-            errno = EMSGSIZE;
-            return -1;
-        }
-
-    //  Message size must fit into size_t data type.
-    if (unlikely (msg_size_ != static_cast<size_t> (msg_size_))) {
-        errno = EMSGSIZE;
-        return -1;
-    }
-
-    int rc = _in_progress.close ();
-    assert (rc == 0);
-
-    // the current message can exceed the current buffer. We have to copy the buffer
-    // data into a new message and complete it in the next receive.
-
-    shared_message_memory_allocator &allocator = get_allocator ();
-    if (unlikely (!_zero_copy
-                  || msg_size_ > static_cast<size_t> (
-                       allocator.data () + allocator.size () - read_pos_))) {
-        // a new message has started, but the size would exceed the pre-allocated arena
-        // this happens every time when a message does not fit completely into the buffer
-        rc = _in_progress.init_size (static_cast<size_t> (msg_size_));
-    } else {
-        // construct message using n bytes from the buffer as storage
-        // increase buffer ref count
-        // if the message will be a large message, pass a valid refcnt memory location as well
-        rc =
-          _in_progress.init (const_cast<unsigned char *> (read_pos_),
-                             static_cast<size_t> (msg_size_),
-                             shared_message_memory_allocator::call_dec_ref,
-                             allocator.buffer (), allocator.provide_content ());
-
-        // For small messages, data has been copied and refcount does not have to be increased
-        if (_in_progress.is_zcmsg ()) {
-            allocator.advance_content ();
-            allocator.inc_ref ();
-        }
-    }
-
-    if (unlikely (rc)) {
-        errno_assert (errno == ENOMEM);
-        rc = _in_progress.init ();
-        errno_assert (rc == 0);
-        errno = ENOMEM;
-        return -1;
-    }
-
-    _in_progress.set_flags (_msg_flags);
-    // this sets read_pos to
-    // the message data address if the data needs to be copied
-    // for small message / messages exceeding the current buffer
-    // or
-    // to the current start address in the buffer because the message
-    // was constructed to use n bytes from the address passed as argument
-    next_step (_in_progress.data (), _in_progress.size (),
-               &v2_decoder_t::message_ready);
-
-    return 0;
-}
-
-int zmq::v2_decoder_t::message_ready (unsigned char const *)
-{
-    //  Message is completely read. Signal this to the caller
-    //  and prepare to decode next message.
-    next_step (_tmpbuf, 1, &v2_decoder_t::flags_ready);
-    return 1;
-}
diff --git a/src/v2_decoder.hpp b/src/v2_decoder.hpp
deleted file mode 100644
index 4c5d135d3..000000000
--- a/src/v2_decoder.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V2_DECODER_HPP_INCLUDED__
-#define __ZMQ_V2_DECODER_HPP_INCLUDED__
-
-#include "decoder.hpp"
-#include "decoder_allocators.hpp"
-
-namespace zmq
-{
-//  Decoder for ZMTP/2.x framing protocol. Converts data stream into messages.
-//  The class has to inherit from shared_message_memory_allocator because
-//  the base class calls allocate in its constructor.
-class v2_decoder_t ZMQ_FINAL
-    : public decoder_base_t<v2_decoder_t, shared_message_memory_allocator>
-{
-  public:
-    v2_decoder_t (size_t bufsize_, int64_t maxmsgsize_, bool zero_copy_);
-    ~v2_decoder_t ();
-
-    //  i_decoder interface.
-    msg_t *msg () { return &_in_progress; }
-
-  private:
-    int flags_ready (unsigned char const *);
-    int one_byte_size_ready (unsigned char const *);
-    int eight_byte_size_ready (unsigned char const *);
-    int message_ready (unsigned char const *);
-
-    int size_ready (uint64_t size_, unsigned char const *);
-
-    unsigned char _tmpbuf[8];
-    unsigned char _msg_flags;
-    msg_t _in_progress;
-
-    const bool _zero_copy;
-    const int64_t _max_msg_size;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v2_decoder_t)
-};
-}
-
-#endif
diff --git a/src/v2_encoder.cpp b/src/v2_encoder.cpp
deleted file mode 100644
index f331adee7..000000000
--- a/src/v2_encoder.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "v2_protocol.hpp"
-#include "v2_encoder.hpp"
-#include "msg.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-#include <limits.h>
-
-zmq::v2_encoder_t::v2_encoder_t (size_t bufsize_) :
-    encoder_base_t<v2_encoder_t> (bufsize_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &v2_encoder_t::message_ready, true);
-}
-
-zmq::v2_encoder_t::~v2_encoder_t ()
-{
-}
-
-void zmq::v2_encoder_t::message_ready ()
-{
-    //  Encode flags.
-    size_t size = in_progress ()->size ();
-    size_t header_size = 2; // flags byte + size byte
-    unsigned char &protocol_flags = _tmp_buf[0];
-    protocol_flags = 0;
-    if (in_progress ()->flags () & msg_t::more)
-        protocol_flags |= v2_protocol_t::more_flag;
-    if (in_progress ()->size () > UCHAR_MAX)
-        protocol_flags |= v2_protocol_t::large_flag;
-    if (in_progress ()->flags () & msg_t::command)
-        protocol_flags |= v2_protocol_t::command_flag;
-    if (in_progress ()->is_subscribe () || in_progress ()->is_cancel ())
-        ++size;
-
-    //  Encode the message length. For messages less then 256 bytes,
-    //  the length is encoded as 8-bit unsigned integer. For larger
-    //  messages, 64-bit unsigned integer in network byte order is used.
-    if (unlikely (size > UCHAR_MAX)) {
-        put_uint64 (_tmp_buf + 1, size);
-        header_size = 9; // flags byte + size 8 bytes
-    } else {
-        _tmp_buf[1] = static_cast<uint8_t> (size);
-    }
-
-    //  Encode the subscribe/cancel byte. This is done in the encoder as
-    //  opposed to when the subscribe message is created to allow different
-    //  protocol behaviour on the wire in the v3.1 and legacy encoders.
-    //  It results in the work being done multiple times in case the sub
-    //  is sending the subscription/cancel to multiple pubs, but it cannot
-    //  be avoided. This processing can be moved to xsub once support for
-    //  ZMTP < 3.1 is dropped.
-    if (in_progress ()->is_subscribe ())
-        _tmp_buf[header_size++] = 1;
-    else if (in_progress ()->is_cancel ())
-        _tmp_buf[header_size++] = 0;
-
-    next_step (_tmp_buf, header_size, &v2_encoder_t::size_ready, false);
-}
-
-void zmq::v2_encoder_t::size_ready ()
-{
-    //  Write message body into the buffer.
-    next_step (in_progress ()->data (), in_progress ()->size (),
-               &v2_encoder_t::message_ready, true);
-}
diff --git a/src/v2_encoder.hpp b/src/v2_encoder.hpp
deleted file mode 100644
index 4f60616f4..000000000
--- a/src/v2_encoder.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V2_ENCODER_HPP_INCLUDED__
-#define __ZMQ_V2_ENCODER_HPP_INCLUDED__
-
-#include "encoder.hpp"
-
-namespace zmq
-{
-//  Encoder for 0MQ framing protocol. Converts messages into data stream.
-
-class v2_encoder_t ZMQ_FINAL : public encoder_base_t<v2_encoder_t>
-{
-  public:
-    v2_encoder_t (size_t bufsize_);
-    ~v2_encoder_t ();
-
-  private:
-    void size_ready ();
-    void message_ready ();
-
-    //  flags byte + size byte (or 8 bytes) + sub/cancel byte
-    unsigned char _tmp_buf[10];
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v2_encoder_t)
-};
-}
-
-#endif
diff --git a/src/v2_protocol.hpp b/src/v2_protocol.hpp
deleted file mode 100644
index f1297295b..000000000
--- a/src/v2_protocol.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V2_PROTOCOL_HPP_INCLUDED__
-#define __ZMQ_V2_PROTOCOL_HPP_INCLUDED__
-
-namespace zmq
-{
-//  Definition of constants for ZMTP/2.0 transport protocol.
-class v2_protocol_t
-{
-  public:
-    //  Message flags.
-    enum
-    {
-        more_flag = 1,
-        large_flag = 2,
-        command_flag = 4
-    };
-};
-}
-
-#endif
diff --git a/src/v3_1_encoder.cpp b/src/v3_1_encoder.cpp
deleted file mode 100644
index f9e11dfaf..000000000
--- a/src/v3_1_encoder.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "v2_protocol.hpp"
-#include "v3_1_encoder.hpp"
-#include "msg.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-#include <limits.h>
-
-zmq::v3_1_encoder_t::v3_1_encoder_t (size_t bufsize_) :
-    encoder_base_t<v3_1_encoder_t> (bufsize_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &v3_1_encoder_t::message_ready, true);
-}
-
-zmq::v3_1_encoder_t::~v3_1_encoder_t ()
-{
-}
-
-void zmq::v3_1_encoder_t::message_ready ()
-{
-    //  Encode flags.
-    size_t size = in_progress ()->size ();
-    size_t header_size = 2; // flags byte + size byte
-    unsigned char &protocol_flags = _tmp_buf[0];
-    protocol_flags = 0;
-    if (in_progress ()->flags () & msg_t::more)
-        protocol_flags |= v2_protocol_t::more_flag;
-    if (in_progress ()->size () > UCHAR_MAX)
-        protocol_flags |= v2_protocol_t::large_flag;
-    if (in_progress ()->flags () & msg_t::command
-        || in_progress ()->is_subscribe () || in_progress ()->is_cancel ()) {
-        protocol_flags |= v2_protocol_t::command_flag;
-        if (in_progress ()->is_subscribe ())
-            size += zmq::msg_t::sub_cmd_name_size;
-        else if (in_progress ()->is_cancel ())
-            size += zmq::msg_t::cancel_cmd_name_size;
-    }
-
-    //  Encode the message length. For messages less then 256 bytes,
-    //  the length is encoded as 8-bit unsigned integer. For larger
-    //  messages, 64-bit unsigned integer in network byte order is used.
-    if (unlikely (size > UCHAR_MAX)) {
-        put_uint64 (_tmp_buf + 1, size);
-        header_size = 9; // flags byte + size 8 bytes
-    } else {
-        _tmp_buf[1] = static_cast<uint8_t> (size);
-    }
-
-    //  Encode the sub/cancel command string. This is done in the encoder as
-    //  opposed to when the subscribe message is created to allow different
-    //  protocol behaviour on the wire in the v3.1 and legacy encoders.
-    //  It results in the work being done multiple times in case the sub
-    //  is sending the subscription/cancel to multiple pubs, but it cannot
-    //  be avoided. This processing can be moved to xsub once support for
-    //  ZMTP < 3.1 is dropped.
-    if (in_progress ()->is_subscribe ()) {
-        memcpy (_tmp_buf + header_size, zmq::sub_cmd_name,
-                zmq::msg_t::sub_cmd_name_size);
-        header_size += zmq::msg_t::sub_cmd_name_size;
-    } else if (in_progress ()->is_cancel ()) {
-        memcpy (_tmp_buf + header_size, zmq::cancel_cmd_name,
-                zmq::msg_t::cancel_cmd_name_size);
-        header_size += zmq::msg_t::cancel_cmd_name_size;
-    }
-
-    next_step (_tmp_buf, header_size, &v3_1_encoder_t::size_ready, false);
-}
-
-void zmq::v3_1_encoder_t::size_ready ()
-{
-    //  Write message body into the buffer.
-    next_step (in_progress ()->data (), in_progress ()->size (),
-               &v3_1_encoder_t::message_ready, true);
-}
diff --git a/src/v3_1_encoder.hpp b/src/v3_1_encoder.hpp
deleted file mode 100644
index d5d9c1366..000000000
--- a/src/v3_1_encoder.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V3_1_ENCODER_HPP_INCLUDED__
-#define __ZMQ_V3_1_ENCODER_HPP_INCLUDED__
-
-#include "encoder.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-//  Encoder for 0MQ framing protocol. Converts messages into data stream.
-
-class v3_1_encoder_t ZMQ_FINAL : public encoder_base_t<v3_1_encoder_t>
-{
-  public:
-    v3_1_encoder_t (size_t bufsize_);
-    ~v3_1_encoder_t () ZMQ_FINAL;
-
-  private:
-    void size_ready ();
-    void message_ready ();
-
-    unsigned char _tmp_buf[9 + zmq::msg_t::sub_cmd_name_size];
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v3_1_encoder_t)
-};
-}
-
-#endif
diff --git a/src/version.rc.in b/src/version.rc.in
deleted file mode 100644
index 34280555b..000000000
--- a/src/version.rc.in
+++ /dev/null
@@ -1,93 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// VERSIONINFO resource
-//
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx
-
-// @MAJOR@,@MINOR@,@BUILD@,@PATCH@
-#define VER_FILEVERSION		@ZMQ_VERSION_MAJOR@,@ZMQ_VERSION_MINOR@,@ZMQ_VERSION_PATCH@,0
-#define VER_FILEVERSION_STR	"@ZMQ_VERSION_MAJOR@.@ZMQ_VERSION_MINOR@.@ZMQ_VERSION_PATCH@.0\0"
-
-#define VER_PRODUCTVERSION	VER_FILEVERSION
-#define VER_PRODUCTVERSION_STR	VER_FILEVERSION_STR
-
-
-// versionID
-// Version-information resource identifier.  This value must be 1.
-1 VERSIONINFO
-
-//// fixed-info
-// Binary version number for the file.
-	FILEVERSION VER_FILEVERSION
-
-// Binary version number for the product with which the file is distributed.
-	PRODUCTVERSION VER_PRODUCTVERSION
-
-// Bits in the FILEFLAGS statement are valid.
-	FILEFLAGSMASK 0x17L
-
-// Attributes of the file.
-// VS_FF_DEBUG        =  1 : File contains debugging information or is compiled with debugging features enabled.
-// VS_FF_PATCHED      =  4 : File has been modified and is not identical to the original shipping file of the 
-//                           same version number.
-// VS_FF_PRERELEASE   =  2 : File is a development version, not a commercially released product.
-// VS_FF_PRIVATEBUILD =  8 : File was not built using standard release procedures.
-// VS_FF_SPECIALBUILD = 20 : File was built by the original company using standard release procedures but is a
-//                         : variation of the standard file of the same version number.
-#ifdef _DEBUG
-	FILEFLAGS 0x1L
-#else
-	FILEFLAGS 0x2L
-#endif
-
-// Operating system for which this file was designed.
-// VOS_DOS           = 0x10000 : File was designed for MS-DOS.
-// VOS_NT            = 0x40000 : File was designed for 32-bit Windows.
-// VOS_WINDOWS16     =     0x1 : File was designed for 16-bit Windows.
-// VOS_WINDOWS32     =     0x4 : File was designed for 32-bit Windows.
-// VOS_DOS_WINDOWS16 = 0x10001 : File was designed for 16-bit Windows running with MS-DOS.
-// VOS_DOS_WINDOWS32 = 0x10004 : File was designed for 32-bit Windows running with MS-DOS.
-// VOS_NT_WINDOWS32  = 0x40004 : File was designed for 32-bit Windows.
-// NB: appears obsolete, nothing for x64.
-	FILEOS 0x4L
-
-// General type of file.
-// VFT_APP        = 0x1 : File contains an application.
-// VFT_DLL        = 0x2 : File contains a dynamic-link library (DLL).
-// VFT_DRV        = 0x3 : File contains a device driver.
-// VFT_FONT       = 0x4 : File contains a font.
-// VFT_VXD        = 0x5 : File contains a virtual device.
-// VFT_STATIC_LIB = 0x7 : File contains a static-link library.
-	FILETYPE 0x2L
-
-// Function of the file.
-	FILESUBTYPE 0x0L
-
-BEGIN
-	BLOCK "StringFileInfo"
-	BEGIN
-		BLOCK "080904b0"
-		BEGIN
-			VALUE "CompanyName",      "iMatix Corporation"
-			VALUE "FileDescription",  "ZeroMQ lightweight messaging kernel"
-			VALUE "FileVersion",      VER_FILEVERSION_STR
-			VALUE "InternalName",     "zeromq"
-			VALUE "LegalCopyright",   "Copyright (c) 2012 The ZeroMQ Authors."
-			VALUE "OriginalFilename", "libzmq.dll"
-			VALUE "ProductName",      "ZeroMQ"
-			VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
-		END
-	END
-
-	BLOCK "VarFileInfo"
-	BEGIN
-// langID, one of the following language codes.
-// 0x409 : U.S. English
-// 0x809 : U.K. English
-// charsetID, one of the following character-set identifiers.
-// 1200 : Unicode
-		VALUE "Translation", 0x809, 1200
-	END
-END
-
-// end of file.
diff --git a/src/vmci.cpp b/src/vmci.cpp
deleted file mode 100644
index 4edd096be..000000000
--- a/src/vmci.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "precompiled.hpp"
-
-#include "vmci.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include <cassert>
-#include <vmci_sockets.h>
-
-void zmq::tune_vmci_buffer_size (ctx_t *context_,
-                                 fd_t sockfd_,
-                                 uint64_t default_size_,
-                                 uint64_t min_size_,
-                                 uint64_t max_size_)
-{
-    int family = context_->get_vmci_socket_family ();
-    assert (family != -1);
-
-    if (default_size_ != 0) {
-        int rc = setsockopt (sockfd_, family, SO_VMCI_BUFFER_SIZE,
-                             (char *) &default_size_, sizeof default_size_);
-#if defined ZMQ_HAVE_WINDOWS
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        errno_assert (rc == 0);
-#endif
-    }
-
-    if (min_size_ != 0) {
-        int rc = setsockopt (sockfd_, family, SO_VMCI_BUFFER_SIZE,
-                             (char *) &min_size_, sizeof min_size_);
-#if defined ZMQ_HAVE_WINDOWS
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        errno_assert (rc == 0);
-#endif
-    }
-
-    if (max_size_ != 0) {
-        int rc = setsockopt (sockfd_, family, SO_VMCI_BUFFER_SIZE,
-                             (char *) &max_size_, sizeof max_size_);
-#if defined ZMQ_HAVE_WINDOWS
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        errno_assert (rc == 0);
-#endif
-    }
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-void zmq::tune_vmci_connect_timeout (ctx_t *context_,
-                                     fd_t sockfd_,
-                                     DWORD timeout_)
-#else
-void zmq::tune_vmci_connect_timeout (ctx_t *context_,
-                                     fd_t sockfd_,
-                                     struct timeval timeout_)
-#endif
-{
-    int family = context_->get_vmci_socket_family ();
-    assert (family != -1);
-
-    int rc = setsockopt (sockfd_, family, SO_VMCI_CONNECT_TIMEOUT,
-                         (char *) &timeout_, sizeof timeout_);
-#if defined ZMQ_HAVE_WINDOWS
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    errno_assert (rc == 0);
-#endif
-}
-
-#endif
diff --git a/src/vmci.hpp b/src/vmci.hpp
deleted file mode 100644
index 16a0c7346..000000000
--- a/src/vmci.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_VMCI_HPP_INCLUDED__
-#define __ZMQ_VMCI_HPP_INCLUDED__
-
-#include <string>
-
-#include "platform.hpp"
-#include "fd.hpp"
-#include "ctx.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
-#include <sys/time.h>
-#endif
-
-namespace zmq
-{
-void tune_vmci_buffer_size (ctx_t *context_,
-                            fd_t sockfd_,
-                            uint64_t default_size_,
-                            uint64_t min_size_,
-                            uint64_t max_size_);
-
-#if defined ZMQ_HAVE_WINDOWS
-void tune_vmci_connect_timeout (ctx_t *context_, fd_t sockfd_, DWORD timeout_);
-#else
-void tune_vmci_connect_timeout (ctx_t *context_,
-                                fd_t sockfd_,
-                                struct timeval timeout_);
-#endif
-}
-
-#endif
-
-#endif
diff --git a/src/vmci_address.cpp b/src/vmci_address.cpp
deleted file mode 100644
index cf97d99cb..000000000
--- a/src/vmci_address.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "vmci_address.hpp"
-
-#if defined(ZMQ_HAVE_VMCI)
-
-#include <climits>
-#include <string>
-#include <sstream>
-
-#include "err.hpp"
-
-zmq::vmci_address_t::vmci_address_t (ctx_t *parent_) : parent (parent_)
-{
-    memset (&address, 0, sizeof address);
-}
-
-zmq::vmci_address_t::vmci_address_t (const sockaddr *sa,
-                                     socklen_t sa_len,
-                                     ctx_t *parent_) :
-    parent (parent_)
-{
-    zmq_assert (sa && sa_len > 0);
-
-    memset (&address, 0, sizeof address);
-    if (sa->sa_family == parent->get_vmci_socket_family ())
-        memcpy (&address, sa, sa_len);
-}
-
-zmq::vmci_address_t::~vmci_address_t ()
-{
-}
-
-int zmq::vmci_address_t::resolve (const char *path_)
-{
-    //  Find the ':' at end that separates address from the port number.
-    const char *delimiter = strrchr (path_, ':');
-    if (!delimiter) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Separate the address/port.
-    std::string addr_str (path_, delimiter - path_);
-    std::string port_str (delimiter + 1);
-
-    unsigned int cid = VMADDR_CID_ANY;
-    unsigned int port = VMADDR_PORT_ANY;
-
-    if (!addr_str.length ()) {
-        errno = EINVAL;
-        return -1;
-    } else if (addr_str == "@") {
-        cid = VMCISock_GetLocalCID ();
-
-        if (cid == VMADDR_CID_ANY) {
-            errno = ENODEV;
-            return -1;
-        }
-    } else if (addr_str != "*" && addr_str != "-1") {
-        const char *begin = addr_str.c_str ();
-        char *end = NULL;
-        unsigned long l = strtoul (begin, &end, 10);
-
-        if ((l == 0 && end == begin) || (l == ULONG_MAX && errno == ERANGE)
-            || l > UINT_MAX) {
-            errno = EINVAL;
-            return -1;
-        }
-
-        cid = static_cast<unsigned int> (l);
-    }
-
-    if (!port_str.length ()) {
-        errno = EINVAL;
-        return -1;
-    } else if (port_str != "*" && port_str != "-1") {
-        const char *begin = port_str.c_str ();
-        char *end = NULL;
-        unsigned long l = strtoul (begin, &end, 10);
-
-        if ((l == 0 && end == begin) || (l == ULONG_MAX && errno == ERANGE)
-            || l > UINT_MAX) {
-            errno = EINVAL;
-            return -1;
-        }
-
-        port = static_cast<unsigned int> (l);
-    }
-
-    address.svm_family =
-      static_cast<sa_family_t> (parent->get_vmci_socket_family ());
-    address.svm_cid = cid;
-    address.svm_port = port;
-
-    return 0;
-}
-
-int zmq::vmci_address_t::to_string (std::string &addr_)
-{
-    if (address.svm_family != parent->get_vmci_socket_family ()) {
-        addr_.clear ();
-        return -1;
-    }
-
-    std::stringstream s;
-
-    s << "vmci://";
-
-    if (address.svm_cid == VMADDR_CID_ANY) {
-        s << "*";
-    } else {
-        s << address.svm_cid;
-    }
-
-    s << ":";
-
-    if (address.svm_port == VMADDR_PORT_ANY) {
-        s << "*";
-    } else {
-        s << address.svm_port;
-    }
-
-    addr_ = s.str ();
-    return 0;
-}
-
-const sockaddr *zmq::vmci_address_t::addr () const
-{
-    return reinterpret_cast<const sockaddr *> (&address);
-}
-
-socklen_t zmq::vmci_address_t::addrlen () const
-{
-    return static_cast<socklen_t> (sizeof address);
-}
-
-#endif
diff --git a/src/vmci_address.hpp b/src/vmci_address.hpp
deleted file mode 100644
index 16dab4a38..000000000
--- a/src/vmci_address.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_VMCI_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_VMCI_ADDRESS_HPP_INCLUDED__
-
-#include <string>
-
-#include "platform.hpp"
-#include "ctx.hpp"
-
-#if defined(ZMQ_HAVE_VMCI)
-#include <vmci_sockets.h>
-
-namespace zmq
-{
-class vmci_address_t
-{
-  public:
-    vmci_address_t (ctx_t *parent_);
-    vmci_address_t (const sockaddr *sa, socklen_t sa_len, ctx_t *parent_);
-    ~vmci_address_t ();
-
-    //  This function sets up the address for VMCI transport.
-    int resolve (const char *path_);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_);
-
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-  private:
-    struct sockaddr_vm address;
-    ctx_t *parent;
-
-    vmci_address_t ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (vmci_address_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/vmci_connecter.cpp b/src/vmci_connecter.cpp
deleted file mode 100644
index b53090ff9..000000000
--- a/src/vmci_connecter.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "vmci_connecter.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include <new>
-
-#include "stream_engine.hpp"
-#include "io_thread.hpp"
-#include "platform.hpp"
-#include "random.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "address.hpp"
-#include "session_base.hpp"
-#include "vmci_address.hpp"
-#include "vmci.hpp"
-
-zmq::vmci_connecter_t::vmci_connecter_t (class io_thread_t *io_thread_,
-                                         class session_base_t *session_,
-                                         const options_t &options_,
-                                         const address_t *addr_,
-                                         bool delayed_start_) :
-    own_t (io_thread_, options_),
-    io_object_t (io_thread_),
-    addr (addr_),
-    s (retired_fd),
-    handle_valid (false),
-    delayed_start (delayed_start_),
-    timer_started (false),
-    session (session_),
-    current_reconnect_ivl (options.reconnect_ivl)
-{
-    zmq_assert (addr);
-    zmq_assert (addr->protocol == "vmci");
-    addr->to_string (endpoint);
-    socket = session->get_socket ();
-}
-
-zmq::vmci_connecter_t::~vmci_connecter_t ()
-{
-    zmq_assert (!timer_started);
-    zmq_assert (!handle_valid);
-    zmq_assert (s == retired_fd);
-}
-
-void zmq::vmci_connecter_t::process_plug ()
-{
-    if (delayed_start)
-        add_reconnect_timer ();
-    else
-        start_connecting ();
-}
-
-void zmq::vmci_connecter_t::process_term (int linger_)
-{
-    if (timer_started) {
-        cancel_timer (reconnect_timer_id);
-        timer_started = false;
-    }
-
-    if (handle_valid) {
-        rm_fd (handle);
-        handle_valid = false;
-    }
-
-    if (s != retired_fd)
-        close ();
-
-    own_t::process_term (linger_);
-}
-
-void zmq::vmci_connecter_t::in_event ()
-{
-    //  We are not polling for incoming data, so we are actually called
-    //  because of error here. However, we can get error on out event as well
-    //  on some platforms, so we'll simply handle both events in the same way.
-    out_event ();
-}
-
-void zmq::vmci_connecter_t::out_event ()
-{
-    fd_t fd = connect ();
-    rm_fd (handle);
-    handle_valid = false;
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    tune_vmci_buffer_size (this->get_ctx (), fd, options.vmci_buffer_size,
-                           options.vmci_buffer_min_size,
-                           options.vmci_buffer_max_size);
-
-    if (options.vmci_connect_timeout > 0) {
-#if defined ZMQ_HAVE_WINDOWS
-        tune_vmci_connect_timeout (this->get_ctx (), fd,
-                                   options.vmci_connect_timeout);
-#else
-        struct timeval timeout = {0, options.vmci_connect_timeout * 1000};
-        tune_vmci_connect_timeout (this->get_ctx (), fd, timeout);
-#endif
-    }
-
-    //  Create the engine object for this connection.
-    stream_engine_t *engine = new (std::nothrow) stream_engine_t (
-      fd, options, make_unconnected_bind_endpoint_pair (endpoint));
-    alloc_assert (engine);
-
-    //  Attach the engine to the corresponding session object.
-    send_attach (session, engine);
-
-    //  Shut the connecter down.
-    terminate ();
-
-    socket->event_connected (make_unconnected_bind_endpoint_pair (endpoint),
-                             fd);
-}
-
-void zmq::vmci_connecter_t::timer_event (int id_)
-{
-    zmq_assert (id_ == reconnect_timer_id);
-    timer_started = false;
-    start_connecting ();
-}
-
-void zmq::vmci_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        handle = add_fd (s);
-        handle_valid = true;
-        out_event ();
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-void zmq::vmci_connecter_t::add_reconnect_timer ()
-{
-    if (options.reconnect_ivl != -1) {
-        int rc_ivl = get_new_reconnect_ivl ();
-        add_timer (rc_ivl, reconnect_timer_id);
-        socket->event_connect_retried (
-          make_unconnected_bind_endpoint_pair (endpoint), rc_ivl);
-        timer_started = true;
-    }
-}
-
-int zmq::vmci_connecter_t::get_new_reconnect_ivl ()
-{
-    //  The new interval is the current interval + random value.
-    int this_interval =
-      current_reconnect_ivl + (generate_random () % options.reconnect_ivl);
-
-    //  Only change the current reconnect interval  if the maximum reconnect
-    //  interval was set and if it's larger than the reconnect interval.
-    if (options.reconnect_ivl_max > 0
-        && options.reconnect_ivl_max > options.reconnect_ivl) {
-        //  Calculate the next interval
-        current_reconnect_ivl = current_reconnect_ivl * 2;
-        if (current_reconnect_ivl >= options.reconnect_ivl_max) {
-            current_reconnect_ivl = options.reconnect_ivl_max;
-        }
-    }
-    return this_interval;
-}
-
-int zmq::vmci_connecter_t::open ()
-{
-    zmq_assert (s == retired_fd);
-
-    int family = this->get_ctx ()->get_vmci_socket_family ();
-    if (family == -1)
-        return -1;
-
-    //  Create the socket.
-    s = open_socket (family, SOCK_STREAM, 0);
-#ifdef ZMQ_HAVE_WINDOWS
-    if (s == INVALID_SOCKET) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        return -1;
-    }
-#else
-    if (s == -1)
-        return -1;
-#endif
-
-    //  Connect to the remote peer.
-    int rc = ::connect (s, addr->resolved.vmci_addr->addr (),
-                        addr->resolved.vmci_addr->addrlen ());
-
-    //  Connect was successful immediately.
-    if (rc == 0)
-        return 0;
-
-    //  Forward the error.
-    return -1;
-}
-
-void zmq::vmci_connecter_t::close ()
-{
-    zmq_assert (s != retired_fd);
-#ifdef ZMQ_HAVE_WINDOWS
-    const int rc = closesocket (s);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    const int rc = ::close (s);
-    errno_assert (rc == 0);
-#endif
-    socket->event_closed (make_unconnected_bind_endpoint_pair (endpoint), s);
-    s = retired_fd;
-}
-
-zmq::fd_t zmq::vmci_connecter_t::connect ()
-{
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX
-    int len = sizeof (err);
-#else
-    socklen_t len = sizeof (err);
-#endif
-    int rc = getsockopt (s, SOL_SOCKET, SO_ERROR, (char *) &err, &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        if (err != WSAECONNREFUSED && err != WSAETIMEDOUT
-            && err != WSAECONNABORTED && err != WSAEHOSTUNREACH
-            && err != WSAENETUNREACH && err != WSAENETDOWN && err != WSAEACCES
-            && err != WSAEINVAL && err != WSAEADDRINUSE
-            && err != WSAECONNRESET) {
-            wsa_assert_no (err);
-        }
-        return retired_fd;
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-        errno_assert (errno == ECONNREFUSED || errno == ECONNRESET
-                      || errno == ETIMEDOUT || errno == EHOSTUNREACH
-                      || errno == ENETUNREACH || errno == ENETDOWN
-                      || errno == EINVAL);
-        return retired_fd;
-    }
-#endif
-
-    fd_t result = s;
-    s = retired_fd;
-    return result;
-}
-
-#endif
diff --git a/src/vmci_connecter.hpp b/src/vmci_connecter.hpp
deleted file mode 100644
index d0ebaac99..000000000
--- a/src/vmci_connecter.hpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_VMCI_CONNECTER_HPP_INCLUDED__
-#define __ZMQ_VMCI_CONNECTER_HPP_INCLUDED__
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include "fd.hpp"
-#include "own.hpp"
-#include "stdint.hpp"
-#include "io_object.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-struct address_t;
-
-//  TODO consider refactoring this to derive from stream_connecter_base_t
-class vmci_connecter_t ZMQ_FINAL : public own_t, public io_object_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    vmci_connecter_t (zmq::io_thread_t *io_thread_,
-                      zmq::session_base_t *session_,
-                      const options_t &options_,
-                      const address_t *addr_,
-                      bool delayed_start_);
-    ~vmci_connecter_t ();
-
-  private:
-    //  ID of the timer used to delay the reconnection.
-    enum
-    {
-        reconnect_timer_id = 1
-    };
-
-    //  Handlers for incoming commands.
-    void process_plug ();
-    void process_term (int linger_);
-
-    //  Handlers for I/O events.
-    void in_event ();
-    void out_event ();
-    void timer_event (int id_);
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    //  Internal function to add a reconnect timer
-    void add_reconnect_timer ();
-
-    //  Internal function to return a reconnect backoff delay.
-    //  Will modify the current_reconnect_ivl used for next call
-    //  Returns the currently used interval
-    int get_new_reconnect_ivl ();
-
-    //  Open VMCI connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Close the connecting socket.
-    void close ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    //  Address to connect to. Owned by session_base_t.
-    const address_t *addr;
-
-    //  Underlying socket.
-    fd_t s;
-
-    //  Handle corresponding to the listening socket.
-    handle_t handle;
-
-    //  If true file descriptor is registered with the poller and 'handle'
-    //  contains valid value.
-    bool handle_valid;
-
-    //  If true, connecter is waiting a while before trying to connect.
-    const bool delayed_start;
-
-    //  True iff a timer has been started.
-    bool timer_started;
-
-    //  Reference to the session we belong to.
-    zmq::session_base_t *session;
-
-    //  Current reconnect ivl, updated for backoff strategy
-    int current_reconnect_ivl;
-
-    // String representation of endpoint to connect to
-    std::string endpoint;
-
-    // Socket
-    zmq::socket_base_t *socket;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (vmci_connecter_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/vmci_listener.cpp b/src/vmci_listener.cpp
deleted file mode 100644
index 0ac6db341..000000000
--- a/src/vmci_listener.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "vmci_listener.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include <new>
-
-#include "stream_engine.hpp"
-#include "vmci_address.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "socket_base.hpp"
-#include "vmci.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
-#include <unistd.h>
-#include <fcntl.h>
-#endif
-
-zmq::vmci_listener_t::vmci_listener_t (io_thread_t *io_thread_,
-                                       socket_base_t *socket_,
-                                       const options_t &options_) :
-    own_t (io_thread_, options_),
-    io_object_t (io_thread_),
-    s (retired_fd),
-    socket (socket_)
-{
-}
-
-zmq::vmci_listener_t::~vmci_listener_t ()
-{
-    zmq_assert (s == retired_fd);
-}
-
-void zmq::vmci_listener_t::process_plug ()
-{
-    //  Start polling for incoming connections.
-    handle = add_fd (s);
-    set_pollin (handle);
-}
-
-void zmq::vmci_listener_t::process_term (int linger_)
-{
-    rm_fd (handle);
-    close ();
-    own_t::process_term (linger_);
-}
-
-void zmq::vmci_listener_t::in_event ()
-{
-    fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    if (fd == retired_fd) {
-        socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (endpoint), zmq_errno ());
-        return;
-    }
-
-    tune_vmci_buffer_size (this->get_ctx (), fd, options.vmci_buffer_size,
-                           options.vmci_buffer_min_size,
-                           options.vmci_buffer_max_size);
-
-    if (options.vmci_connect_timeout > 0) {
-#if defined ZMQ_HAVE_WINDOWS
-        tune_vmci_connect_timeout (this->get_ctx (), fd,
-                                   options.vmci_connect_timeout);
-#else
-        struct timeval timeout = {0, options.vmci_connect_timeout * 1000};
-        tune_vmci_connect_timeout (this->get_ctx (), fd, timeout);
-#endif
-    }
-
-    //  Create the engine object for this connection.
-    stream_engine_t *engine = new (std::nothrow) stream_engine_t (
-      fd, options, make_unconnected_bind_endpoint_pair (endpoint));
-    alloc_assert (engine);
-
-    //  Choose I/O thread to run connecter in. Given that we are already
-    //  running in an I/O thread, there must be at least one available.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    zmq_assert (io_thread);
-
-    //  Create and launch a session object.
-    session_base_t *session =
-      session_base_t::create (io_thread, false, socket, options, NULL);
-    errno_assert (session);
-    session->inc_seqnum ();
-    launch_child (session);
-    send_attach (session, engine, false);
-    socket->event_accepted (make_unconnected_bind_endpoint_pair (endpoint), fd);
-}
-
-int zmq::vmci_listener_t::get_local_address (std::string &addr_)
-{
-    struct sockaddr_storage ss;
-#ifdef ZMQ_HAVE_HPUX
-    int sl = sizeof (ss);
-#else
-    socklen_t sl = sizeof (ss);
-#endif
-    int rc = getsockname (s, (sockaddr *) &ss, &sl);
-    if (rc != 0) {
-        addr_.clear ();
-        return rc;
-    }
-
-    vmci_address_t addr ((struct sockaddr *) &ss, sl, this->get_ctx ());
-    return addr.to_string (addr_);
-}
-
-int zmq::vmci_listener_t::set_local_address (const char *addr_)
-{
-    //  Create addr on stack for auto-cleanup
-    std::string addr (addr_);
-
-    //  Initialise the address structure.
-    vmci_address_t address (this->get_ctx ());
-    int rc = address.resolve (addr.c_str ());
-    if (rc != 0)
-        return -1;
-
-    //  Create a listening socket.
-    s =
-      open_socket (this->get_ctx ()->get_vmci_socket_family (), SOCK_STREAM, 0);
-#ifdef ZMQ_HAVE_WINDOWS
-    if (s == INVALID_SOCKET) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        return -1;
-    }
-#if !defined _WIN32_WCE
-    //  On Windows, preventing sockets to be inherited by child processes.
-    BOOL brc = SetHandleInformation ((HANDLE) s, HANDLE_FLAG_INHERIT, 0);
-    win_assert (brc);
-#endif
-#else
-    if (s == -1)
-        return -1;
-#endif
-
-    address.to_string (endpoint);
-
-    //  Bind the socket.
-    rc = bind (s, address.addr (), address.addrlen ());
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    //  Listen for incoming connections.
-    rc = listen (s, options.backlog);
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    socket->event_listening (make_unconnected_bind_endpoint_pair (endpoint), s);
-    return 0;
-
-error:
-    int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-void zmq::vmci_listener_t::close ()
-{
-    zmq_assert (s != retired_fd);
-#ifdef ZMQ_HAVE_WINDOWS
-    int rc = closesocket (s);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    int rc = ::close (s);
-    errno_assert (rc == 0);
-#endif
-    socket->event_closed (make_unconnected_bind_endpoint_pair (endpoint), s);
-    s = retired_fd;
-}
-
-zmq::fd_t zmq::vmci_listener_t::accept ()
-{
-    //  Accept one connection and deal with different failure modes.
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    zmq_assert (s != retired_fd);
-    fd_t sock = ::accept (s, NULL, NULL);
-
-#ifdef ZMQ_HAVE_WINDOWS
-    if (sock == INVALID_SOCKET) {
-        wsa_assert (WSAGetLastError () == WSAEWOULDBLOCK
-                    || WSAGetLastError () == WSAECONNRESET
-                    || WSAGetLastError () == WSAEMFILE
-                    || WSAGetLastError () == WSAENOBUFS);
-        return retired_fd;
-    }
-#if !defined _WIN32_WCE
-    //  On Windows, preventing sockets to be inherited by child processes.
-    BOOL brc = SetHandleInformation ((HANDLE) sock, HANDLE_FLAG_INHERIT, 0);
-    win_assert (brc);
-#endif
-#else
-    if (sock == -1) {
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE);
-        return retired_fd;
-    }
-#endif
-
-    //  Race condition can cause socket not to be closed (if fork happens
-    //  between accept and this point).
-#ifdef FD_CLOEXEC
-    int rc = fcntl (sock, F_SETFD, FD_CLOEXEC);
-    errno_assert (rc != -1);
-#endif
-
-    return sock;
-}
-
-#endif
diff --git a/src/vmci_listener.hpp b/src/vmci_listener.hpp
deleted file mode 100644
index 4ab11842f..000000000
--- a/src/vmci_listener.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_VMCI_LISTENER_HPP_INCLUDED__
-#define __ZMQ_VMCI_LISTENER_HPP_INCLUDED__
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include <string>
-
-#include "fd.hpp"
-#include "own.hpp"
-#include "stdint.hpp"
-#include "io_object.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class socket_base_t;
-
-//  TODO consider refactoring this to derive from stream_listener_base_t
-class vmci_listener_t ZMQ_FINAL : public own_t, public io_object_t
-{
-  public:
-    vmci_listener_t (zmq::io_thread_t *io_thread_,
-                     zmq::socket_base_t *socket_,
-                     const options_t &options_);
-    ~vmci_listener_t ();
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-    // Get the bound address for use with wildcards
-    int get_local_address (std::string &addr_);
-
-  private:
-    //  Handlers for incoming commands.
-    void process_plug ();
-    void process_term (int linger_);
-
-    //  Handlers for I/O events.
-    void in_event ();
-
-    //  Close the listening socket.
-    void close ();
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog.
-    fd_t accept ();
-
-    //  Underlying socket.
-    fd_t s;
-
-    //  Handle corresponding to the listening socket.
-    handle_t handle;
-
-    //  Socket the listerner belongs to.
-    zmq::socket_base_t *socket;
-
-    // String representation of endpoint to bind to
-    std::string endpoint;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (vmci_listener_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/src/windows.hpp b/src/windows.hpp
deleted file mode 100644
index 11c7581de..000000000
--- a/src/windows.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WINDOWS_HPP_INCLUDED__
-#define __ZMQ_WINDOWS_HPP_INCLUDED__
-
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX // Macros min(a,b) and max(a,b)
-#endif
-
-//  Set target version to Windows Server 2008, Windows Vista or higher.
-//  Windows XP (0x0501) is supported but without client & server socket types.
-#if !defined _WIN32_WINNT && !defined ZMQ_HAVE_WINDOWS_UWP
-#define _WIN32_WINNT 0x0600
-#endif
-
-#ifdef __MINGW32__
-//  Require Windows XP or higher with MinGW for getaddrinfo().
-#if (_WIN32_WINNT >= 0x0501)
-#else
-#error You need at least Windows XP target
-#endif
-#endif
-
-#include <winsock2.h>
-#include <windows.h>
-#include <mswsock.h>
-#include <iphlpapi.h>
-
-#if !defined __MINGW32__
-#include <mstcpip.h>
-#endif
-
-//  Workaround missing mstcpip.h in mingw32 (MinGW64 provides this)
-//  __MINGW64_VERSION_MAJOR is only defined when using in mingw-w64
-#if defined __MINGW32__ && !defined SIO_KEEPALIVE_VALS                         \
-  && !defined __MINGW64_VERSION_MAJOR
-struct tcp_keepalive
-{
-    u_long onoff;
-    u_long keepalivetime;
-    u_long keepaliveinterval;
-};
-#define SIO_KEEPALIVE_VALS _WSAIOW (IOC_VENDOR, 4)
-#endif
-
-#include <ws2tcpip.h>
-#include <ipexport.h>
-#if !defined _WIN32_WCE
-#include <process.h>
-#endif
-
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLL || defined ZMQ_POLL_BASED_ON_POLL
-static inline int poll (struct pollfd *pfd, unsigned long nfds, int timeout)
-{
-    return WSAPoll (pfd, nfds, timeout);
-}
-#endif
-
-//  In MinGW environment AI_NUMERICSERV is not defined.
-#ifndef AI_NUMERICSERV
-#define AI_NUMERICSERV 0x0400
-#endif
-#endif
-
-//  In MSVC prior to v14, snprintf is not available
-//  The closest implementation is the _snprintf_s function
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#define snprintf(buffer_, count_, format_, ...)                                \
-    _snprintf_s (buffer_, count_, _TRUNCATE, format_, __VA_ARGS__)
-#endif
diff --git a/src/wire.hpp b/src/wire.hpp
deleted file mode 100644
index 47b61b009..000000000
--- a/src/wire.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WIRE_HPP_INCLUDED__
-#define __ZMQ_WIRE_HPP_INCLUDED__
-
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Helper functions to convert different integer types to/from network
-//  byte order.
-
-inline void put_uint8 (unsigned char *buffer_, uint8_t value_)
-{
-    *buffer_ = value_;
-}
-
-inline uint8_t get_uint8 (const unsigned char *buffer_)
-{
-    return *buffer_;
-}
-
-inline void put_uint16 (unsigned char *buffer_, uint16_t value_)
-{
-    buffer_[0] = static_cast<unsigned char> (((value_) >> 8) & 0xff);
-    buffer_[1] = static_cast<unsigned char> (value_ & 0xff);
-}
-
-inline uint16_t get_uint16 (const unsigned char *buffer_)
-{
-    return ((static_cast<uint16_t> (buffer_[0])) << 8)
-           | (static_cast<uint16_t> (buffer_[1]));
-}
-
-inline void put_uint32 (unsigned char *buffer_, uint32_t value_)
-{
-    buffer_[0] = static_cast<unsigned char> (((value_) >> 24) & 0xff);
-    buffer_[1] = static_cast<unsigned char> (((value_) >> 16) & 0xff);
-    buffer_[2] = static_cast<unsigned char> (((value_) >> 8) & 0xff);
-    buffer_[3] = static_cast<unsigned char> (value_ & 0xff);
-}
-
-inline uint32_t get_uint32 (const unsigned char *buffer_)
-{
-    return ((static_cast<uint32_t> (buffer_[0])) << 24)
-           | ((static_cast<uint32_t> (buffer_[1])) << 16)
-           | ((static_cast<uint32_t> (buffer_[2])) << 8)
-           | (static_cast<uint32_t> (buffer_[3]));
-}
-
-inline void put_uint64 (unsigned char *buffer_, uint64_t value_)
-{
-    buffer_[0] = static_cast<unsigned char> (((value_) >> 56) & 0xff);
-    buffer_[1] = static_cast<unsigned char> (((value_) >> 48) & 0xff);
-    buffer_[2] = static_cast<unsigned char> (((value_) >> 40) & 0xff);
-    buffer_[3] = static_cast<unsigned char> (((value_) >> 32) & 0xff);
-    buffer_[4] = static_cast<unsigned char> (((value_) >> 24) & 0xff);
-    buffer_[5] = static_cast<unsigned char> (((value_) >> 16) & 0xff);
-    buffer_[6] = static_cast<unsigned char> (((value_) >> 8) & 0xff);
-    buffer_[7] = static_cast<unsigned char> (value_ & 0xff);
-}
-
-inline uint64_t get_uint64 (const unsigned char *buffer_)
-{
-    return ((static_cast<uint64_t> (buffer_[0])) << 56)
-           | ((static_cast<uint64_t> (buffer_[1])) << 48)
-           | ((static_cast<uint64_t> (buffer_[2])) << 40)
-           | ((static_cast<uint64_t> (buffer_[3])) << 32)
-           | ((static_cast<uint64_t> (buffer_[4])) << 24)
-           | ((static_cast<uint64_t> (buffer_[5])) << 16)
-           | ((static_cast<uint64_t> (buffer_[6])) << 8)
-           | (static_cast<uint64_t> (buffer_[7]));
-}
-}
-
-#endif
diff --git a/src/ws_address.cpp b/src/ws_address.cpp
deleted file mode 100644
index 9e5224b97..000000000
--- a/src/ws_address.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string>
-#include <sstream>
-
-#include "macros.hpp"
-#include "ws_address.hpp"
-#include "stdint.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-#include <limits.h>
-
-zmq::ws_address_t::ws_address_t ()
-{
-    memset (&_address, 0, sizeof (_address));
-}
-
-zmq::ws_address_t::ws_address_t (const sockaddr *sa_, socklen_t sa_len_)
-{
-    zmq_assert (sa_ && sa_len_ > 0);
-
-    memset (&_address, 0, sizeof (_address));
-    if (sa_->sa_family == AF_INET
-        && sa_len_ >= static_cast<socklen_t> (sizeof (_address.ipv4)))
-        memcpy (&_address.ipv4, sa_, sizeof (_address.ipv4));
-    else if (sa_->sa_family == AF_INET6
-             && sa_len_ >= static_cast<socklen_t> (sizeof (_address.ipv6)))
-        memcpy (&_address.ipv6, sa_, sizeof (_address.ipv6));
-
-    _path = std::string ("");
-
-    char hbuf[NI_MAXHOST];
-    const int rc = getnameinfo (addr (), addrlen (), hbuf, sizeof (hbuf), NULL,
-                                0, NI_NUMERICHOST);
-    if (rc != 0) {
-        _host = std::string ("localhost");
-        return;
-    }
-
-    std::ostringstream os;
-
-    if (_address.family () == AF_INET6)
-        os << std::string ("[");
-
-    os << std::string (hbuf);
-
-    if (_address.family () == AF_INET6)
-        os << std::string ("]");
-
-    _host = os.str ();
-}
-
-int zmq::ws_address_t::resolve (const char *name_, bool local_, bool ipv6_)
-{
-    //  find the host part, It's important to use str*r*chr to only get
-    //  the latest colon since IPv6 addresses use colons as delemiters.
-    const char *delim = strrchr (name_, ':');
-    if (delim == NULL) {
-        errno = EINVAL;
-        return -1;
-    }
-    _host = std::string (name_, delim - name_);
-
-    // find the path part, which is optional
-    delim = strrchr (name_, '/');
-    std::string host_name;
-    if (delim) {
-        _path = std::string (delim);
-        // remove the path, otherwise resolving the port will fail with wildcard
-        host_name = std::string (name_, delim - name_);
-    } else {
-        _path = std::string ("/");
-        host_name = name_;
-    }
-
-    ip_resolver_options_t resolver_opts;
-    resolver_opts.bindable (local_)
-      .allow_dns (!local_)
-      .allow_nic_name (local_)
-      .ipv6 (ipv6_)
-      .allow_path (true)
-      .expect_port (true);
-
-    ip_resolver_t resolver (resolver_opts);
-
-    return resolver.resolve (&_address, host_name.c_str ());
-}
-
-int zmq::ws_address_t::to_string (std::string &addr_) const
-{
-    std::ostringstream os;
-    os << std::string ("ws://") << host () << std::string (":")
-       << _address.port () << _path;
-    addr_ = os.str ();
-
-    return 0;
-}
-
-const sockaddr *zmq::ws_address_t::addr () const
-{
-    return _address.as_sockaddr ();
-}
-
-socklen_t zmq::ws_address_t::addrlen () const
-{
-    return _address.sockaddr_len ();
-}
-
-const char *zmq::ws_address_t::host () const
-{
-    return _host.c_str ();
-}
-
-const char *zmq::ws_address_t::path () const
-{
-    return _path.c_str ();
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-unsigned short zmq::ws_address_t::family () const
-#else
-sa_family_t zmq::ws_address_t::family () const
-#endif
-{
-    return _address.family ();
-}
diff --git a/src/ws_address.hpp b/src/ws_address.hpp
deleted file mode 100644
index a5d5de892..000000000
--- a/src/ws_address.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_WS_ADDRESS_HPP_INCLUDED__
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
-#include "ip_resolver.hpp"
-
-namespace zmq
-{
-class ws_address_t
-{
-  public:
-    ws_address_t ();
-    ws_address_t (const sockaddr *sa_, socklen_t sa_len_);
-
-    //  This function translates textual WS address into an address
-    //  structure. If 'local' is true, names are resolved as local interface
-    //  names. If it is false, names are resolved as remote hostnames.
-    //  If 'ipv6' is true, the name may resolve to IPv6 address.
-    int resolve (const char *name_, bool local_, bool ipv6_);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-#if defined ZMQ_HAVE_WINDOWS
-    unsigned short family () const;
-#else
-    sa_family_t family () const;
-#endif
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-    const char *host () const;
-    const char *path () const;
-
-  protected:
-    ip_addr_t _address;
-
-  private:
-    std::string _host;
-    std::string _path;
-};
-}
-
-#endif
diff --git a/src/ws_connecter.cpp b/src/ws_connecter.cpp
deleted file mode 100644
index 3c6be9dee..000000000
--- a/src/ws_connecter.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <string>
-
-#include "macros.hpp"
-#include "ws_connecter.hpp"
-#include "io_thread.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "address.hpp"
-#include "ws_address.hpp"
-#include "ws_engine.hpp"
-#include "session_base.hpp"
-
-#ifdef ZMQ_HAVE_WSS
-#include "wss_engine.hpp"
-#include "wss_address.hpp"
-#endif
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <fcntl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#ifdef ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-zmq::ws_connecter_t::ws_connecter_t (class io_thread_t *io_thread_,
-                                     class session_base_t *session_,
-                                     const options_t &options_,
-                                     address_t *addr_,
-                                     bool delayed_start_,
-                                     bool wss_,
-                                     const std::string &tls_hostname_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_),
-    _connect_timer_started (false),
-    _wss (wss_),
-    _hostname (tls_hostname_)
-{
-}
-
-zmq::ws_connecter_t::~ws_connecter_t ()
-{
-    zmq_assert (!_connect_timer_started);
-}
-
-void zmq::ws_connecter_t::process_term (int linger_)
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    stream_connecter_base_t::process_term (linger_);
-}
-
-void zmq::ws_connecter_t::out_event ()
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    //  TODO this is still very similar to (t)ipc_connecter_t, maybe the
-    //  differences can be factored out
-
-    rm_handle ();
-
-    const fd_t fd = connect ();
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd || !tune_socket (fd)) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    if (_wss)
-#ifdef ZMQ_HAVE_WSS
-        create_engine (fd,
-                       get_socket_name<wss_address_t> (fd, socket_end_local));
-#else
-        assert (false);
-#endif
-    else
-        create_engine (fd,
-                       get_socket_name<ws_address_t> (fd, socket_end_local));
-}
-
-void zmq::ws_connecter_t::timer_event (int id_)
-{
-    if (id_ == connect_timer_id) {
-        _connect_timer_started = false;
-        rm_handle ();
-        close ();
-        add_reconnect_timer ();
-    } else
-        stream_connecter_base_t::timer_event (id_);
-}
-
-void zmq::ws_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    const int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        out_event ();
-    }
-
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (rc == -1 && errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-
-        //  add userspace connect timeout
-        add_connect_timer ();
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-void zmq::ws_connecter_t::add_connect_timer ()
-{
-    if (options.connect_timeout > 0) {
-        add_timer (options.connect_timeout, connect_timer_id);
-        _connect_timer_started = true;
-    }
-}
-
-int zmq::ws_connecter_t::open ()
-{
-    zmq_assert (_s == retired_fd);
-
-    tcp_address_t tcp_addr;
-    _s = tcp_open_socket (_addr->address.c_str (), options, false, true,
-                          &tcp_addr);
-    if (_s == retired_fd)
-        return -1;
-
-    // Set the socket to non-blocking mode so that we get async connect().
-    unblock_socket (_s);
-
-    //  Connect to the remote peer.
-#ifdef ZMQ_HAVE_VXWORKS
-    int rc = ::connect (_s, (sockaddr *) tcp_addr.addr (), tcp_addr.addrlen ());
-#else
-    const int rc = ::connect (_s, tcp_addr.addr (), tcp_addr.addrlen ());
-#endif
-    //  Connect was successful immediately.
-    if (rc == 0) {
-        return 0;
-    }
-
-    //  Translate error codes indicating asynchronous connect has been
-    //  launched to a uniform EINPROGRESS.
-#ifdef ZMQ_HAVE_WINDOWS
-    const int last_error = WSAGetLastError ();
-    if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)
-        errno = EINPROGRESS;
-    else
-        errno = wsa_error_to_errno (last_error);
-#else
-    if (errno == EINTR)
-        errno = EINPROGRESS;
-#endif
-    return -1;
-}
-
-zmq::fd_t zmq::ws_connecter_t::connect ()
-{
-    //  Async connect has finished. Check whether an error occurred
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int len = sizeof err;
-#else
-    socklen_t len = sizeof err;
-#endif
-
-    const int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                               reinterpret_cast<char *> (&err), &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        if (err == WSAEBADF || err == WSAENOPROTOOPT || err == WSAENOTSOCK
-            || err == WSAENOBUFS) {
-            wsa_assert_no (err);
-        }
-        return retired_fd;
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EBADF && errno != ENOPROTOOPT
-                      && errno != ENOTSOCK && errno != ENOBUFS);
-#else
-        errno_assert (errno != ENOPROTOOPT && errno != ENOTSOCK
-                      && errno != ENOBUFS);
-#endif
-        return retired_fd;
-    }
-#endif
-
-    //  Return the newly connected socket.
-    const fd_t result = _s;
-    _s = retired_fd;
-    return result;
-}
-
-bool zmq::ws_connecter_t::tune_socket (const fd_t fd_)
-{
-    const int rc =
-      tune_tcp_socket (fd_) | tune_tcp_maxrt (fd_, options.tcp_maxrt);
-    return rc == 0;
-}
-
-void zmq::ws_connecter_t::create_engine (fd_t fd_,
-                                         const std::string &local_address_)
-{
-    const endpoint_uri_pair_t endpoint_pair (local_address_, _endpoint,
-                                             endpoint_type_connect);
-
-    //  Create the engine object for this connection.
-    i_engine *engine = NULL;
-    if (_wss)
-#ifdef ZMQ_HAVE_WSS
-        engine = new (std::nothrow)
-          wss_engine_t (fd_, options, endpoint_pair, *_addr->resolved.ws_addr,
-                        true, NULL, _hostname);
-#else
-        assert (false);
-#endif
-    else
-        engine = new (std::nothrow) ws_engine_t (
-          fd_, options, endpoint_pair, *_addr->resolved.ws_addr, true);
-    alloc_assert (engine);
-
-    //  Attach the engine to the corresponding session object.
-    send_attach (_session, engine);
-
-    //  Shut the connecter down.
-    terminate ();
-
-    _socket->event_connected (endpoint_pair, fd_);
-}
diff --git a/src/ws_connecter.hpp b/src/ws_connecter.hpp
deleted file mode 100644
index 9755b2165..000000000
--- a/src/ws_connecter.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __WS_CONNECTER_HPP_INCLUDED__
-#define __WS_CONNECTER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "stdint.hpp"
-#include "stream_connecter_base.hpp"
-
-namespace zmq
-{
-class ws_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    ws_connecter_t (zmq::io_thread_t *io_thread_,
-                    zmq::session_base_t *session_,
-                    const options_t &options_,
-                    address_t *addr_,
-                    bool delayed_start_,
-                    bool wss_,
-                    const std::string &tls_hostname_);
-    ~ws_connecter_t ();
-
-  protected:
-    void create_engine (fd_t fd, const std::string &local_address_);
-
-  private:
-    //  ID of the timer used to check the connect timeout, must be different from stream_connecter_base_t::reconnect_timer_id.
-    enum
-    {
-        connect_timer_id = 2
-    };
-
-    //  Handlers for incoming commands.
-    void process_term (int linger_);
-
-    //  Handlers for I/O events.
-    void out_event ();
-    void timer_event (int id_);
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    //  Internal function to add a connect timer
-    void add_connect_timer ();
-
-    //  Open TCP connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    //  Tunes a connected socket.
-    bool tune_socket (fd_t fd_);
-
-    //  True iff a timer has been started.
-    bool _connect_timer_started;
-
-    bool _wss;
-    const std::string &_hostname;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ws_connecter_t)
-};
-}
-
-#endif
diff --git a/src/ws_decoder.cpp b/src/ws_decoder.cpp
deleted file mode 100644
index 9fc4e2e2b..000000000
--- a/src/ws_decoder.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-#include <string.h>
-#include <cmath>
-
-#include "ws_protocol.hpp"
-#include "ws_decoder.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-#include "err.hpp"
-
-zmq::ws_decoder_t::ws_decoder_t (size_t bufsize_,
-                                 int64_t maxmsgsize_,
-                                 bool zero_copy_,
-                                 bool must_mask_) :
-    decoder_base_t<ws_decoder_t, shared_message_memory_allocator> (bufsize_),
-    _msg_flags (0),
-    _zero_copy (zero_copy_),
-    _max_msg_size (maxmsgsize_),
-    _must_mask (must_mask_),
-    _size (0)
-{
-    memset (_tmpbuf, 0, sizeof (_tmpbuf));
-    int rc = _in_progress.init ();
-    errno_assert (rc == 0);
-
-    //  At the beginning, read one byte and go to opcode_ready state.
-    next_step (_tmpbuf, 1, &ws_decoder_t::opcode_ready);
-}
-
-zmq::ws_decoder_t::~ws_decoder_t ()
-{
-    const int rc = _in_progress.close ();
-    errno_assert (rc == 0);
-}
-
-int zmq::ws_decoder_t::opcode_ready (unsigned char const *)
-{
-    const bool final = (_tmpbuf[0] & 0x80) != 0; // final bit
-    if (!final)
-        return -1; // non final messages are not supported
-
-    _opcode = static_cast<zmq::ws_protocol_t::opcode_t> (_tmpbuf[0] & 0xF);
-
-    _msg_flags = 0;
-
-    switch (_opcode) {
-        case zmq::ws_protocol_t::opcode_binary:
-            break;
-        case zmq::ws_protocol_t::opcode_close:
-            _msg_flags = msg_t::command | msg_t::close_cmd;
-            break;
-        case zmq::ws_protocol_t::opcode_ping:
-            _msg_flags = msg_t::ping | msg_t::command;
-            break;
-        case zmq::ws_protocol_t::opcode_pong:
-            _msg_flags = msg_t::pong | msg_t::command;
-            break;
-        default:
-            return -1;
-    }
-
-    next_step (_tmpbuf, 1, &ws_decoder_t::size_first_byte_ready);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::size_first_byte_ready (unsigned char const *read_from_)
-{
-    const bool is_masked = (_tmpbuf[0] & 0x80) != 0;
-
-    if (is_masked != _must_mask) // wrong mask value
-        return -1;
-
-    _size = static_cast<uint64_t> (_tmpbuf[0] & 0x7F);
-
-    if (_size < 126) {
-        if (_must_mask)
-            next_step (_tmpbuf, 4, &ws_decoder_t::mask_ready);
-        else if (_opcode == ws_protocol_t::opcode_binary) {
-            if (_size == 0)
-                return -1;
-            next_step (_tmpbuf, 1, &ws_decoder_t::flags_ready);
-        } else
-            return size_ready (read_from_);
-    } else if (_size == 126)
-        next_step (_tmpbuf, 2, &ws_decoder_t::short_size_ready);
-    else
-        next_step (_tmpbuf, 8, &ws_decoder_t::long_size_ready);
-
-    return 0;
-}
-
-
-int zmq::ws_decoder_t::short_size_ready (unsigned char const *read_from_)
-{
-    _size = (_tmpbuf[0] << 8) | _tmpbuf[1];
-
-    if (_must_mask)
-        next_step (_tmpbuf, 4, &ws_decoder_t::mask_ready);
-    else if (_opcode == ws_protocol_t::opcode_binary) {
-        if (_size == 0)
-            return -1;
-        next_step (_tmpbuf, 1, &ws_decoder_t::flags_ready);
-    } else
-        return size_ready (read_from_);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::long_size_ready (unsigned char const *read_from_)
-{
-    //  The payload size is encoded as 64-bit unsigned integer.
-    //  The most significant byte comes first.
-    _size = get_uint64 (_tmpbuf);
-
-    if (_must_mask)
-        next_step (_tmpbuf, 4, &ws_decoder_t::mask_ready);
-    else if (_opcode == ws_protocol_t::opcode_binary) {
-        if (_size == 0)
-            return -1;
-        next_step (_tmpbuf, 1, &ws_decoder_t::flags_ready);
-    } else
-        return size_ready (read_from_);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::mask_ready (unsigned char const *read_from_)
-{
-    memcpy (_mask, _tmpbuf, 4);
-
-    if (_opcode == ws_protocol_t::opcode_binary) {
-        if (_size == 0)
-            return -1;
-
-        next_step (_tmpbuf, 1, &ws_decoder_t::flags_ready);
-    } else
-        return size_ready (read_from_);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::flags_ready (unsigned char const *read_from_)
-{
-    unsigned char flags;
-
-    if (_must_mask)
-        flags = _tmpbuf[0] ^ _mask[0];
-    else
-        flags = _tmpbuf[0];
-
-    if (flags & ws_protocol_t::more_flag)
-        _msg_flags |= msg_t::more;
-    if (flags & ws_protocol_t::command_flag)
-        _msg_flags |= msg_t::command;
-
-    _size--;
-
-    return size_ready (read_from_);
-}
-
-
-int zmq::ws_decoder_t::size_ready (unsigned char const *read_pos_)
-{
-    //  Message size must not exceed the maximum allowed size.
-    if (_max_msg_size >= 0)
-        if (unlikely (_size > static_cast<uint64_t> (_max_msg_size))) {
-            errno = EMSGSIZE;
-            return -1;
-        }
-
-    //  Message size must fit into size_t data type.
-    if (unlikely (_size != static_cast<size_t> (_size))) {
-        errno = EMSGSIZE;
-        return -1;
-    }
-
-    int rc = _in_progress.close ();
-    assert (rc == 0);
-
-    // the current message can exceed the current buffer. We have to copy the buffer
-    // data into a new message and complete it in the next receive.
-
-    shared_message_memory_allocator &allocator = get_allocator ();
-    if (unlikely (!_zero_copy
-                  || _size > static_cast<size_t> (
-                       allocator.data () + allocator.size () - read_pos_))) {
-        // a new message has started, but the size would exceed the pre-allocated arena
-        // this happens every time when a message does not fit completely into the buffer
-        rc = _in_progress.init_size (static_cast<size_t> (_size));
-    } else {
-        // construct message using n bytes from the buffer as storage
-        // increase buffer ref count
-        // if the message will be a large message, pass a valid refcnt memory location as well
-        rc = _in_progress.init (
-          const_cast<unsigned char *> (read_pos_), static_cast<size_t> (_size),
-          shared_message_memory_allocator::call_dec_ref, allocator.buffer (),
-          allocator.provide_content ());
-
-        // For small messages, data has been copied and refcount does not have to be increased
-        if (_in_progress.is_zcmsg ()) {
-            allocator.advance_content ();
-            allocator.inc_ref ();
-        }
-    }
-
-    if (unlikely (rc)) {
-        errno_assert (errno == ENOMEM);
-        rc = _in_progress.init ();
-        errno_assert (rc == 0);
-        errno = ENOMEM;
-        return -1;
-    }
-
-    _in_progress.set_flags (_msg_flags);
-    // this sets read_pos to
-    // the message data address if the data needs to be copied
-    // for small message / messages exceeding the current buffer
-    // or
-    // to the current start address in the buffer because the message
-    // was constructed to use n bytes from the address passed as argument
-    next_step (_in_progress.data (), _in_progress.size (),
-               &ws_decoder_t::message_ready);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::message_ready (unsigned char const *)
-{
-    if (_must_mask) {
-        int mask_index = _opcode == ws_protocol_t::opcode_binary ? 1 : 0;
-
-        unsigned char *data =
-          static_cast<unsigned char *> (_in_progress.data ());
-        for (size_t i = 0; i < _size; ++i, mask_index++)
-            data[i] = data[i] ^ _mask[mask_index % 4];
-    }
-
-    //  Message is completely read. Signal this to the caller
-    //  and prepare to decode next message.
-    next_step (_tmpbuf, 1, &ws_decoder_t::opcode_ready);
-    return 1;
-}
diff --git a/src/ws_decoder.hpp b/src/ws_decoder.hpp
deleted file mode 100644
index a12f7d1ed..000000000
--- a/src/ws_decoder.hpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_DECODER_HPP_INCLUDED__
-#define __ZMQ_WS_DECODER_HPP_INCLUDED__
-
-#include "decoder.hpp"
-#include "decoder_allocators.hpp"
-#include "ws_protocol.hpp"
-
-namespace zmq
-{
-//  Decoder for Web socket framing protocol. Converts data stream into messages.
-//  The class has to inherit from shared_message_memory_allocator because
-//  the base class calls allocate in its constructor.
-class ws_decoder_t ZMQ_FINAL
-    : public decoder_base_t<ws_decoder_t, shared_message_memory_allocator>
-{
-  public:
-    ws_decoder_t (size_t bufsize_,
-                  int64_t maxmsgsize_,
-                  bool zero_copy_,
-                  bool must_mask_);
-    ~ws_decoder_t ();
-
-    //  i_decoder interface.
-    msg_t *msg () { return &_in_progress; }
-
-  private:
-    int opcode_ready (unsigned char const *);
-    int size_first_byte_ready (unsigned char const *);
-    int short_size_ready (unsigned char const *);
-    int long_size_ready (unsigned char const *);
-    int mask_ready (unsigned char const *);
-    int flags_ready (unsigned char const *);
-    int message_ready (unsigned char const *);
-
-    int size_ready (unsigned char const *);
-
-    unsigned char _tmpbuf[8];
-    unsigned char _msg_flags;
-    msg_t _in_progress;
-
-    const bool _zero_copy;
-    const int64_t _max_msg_size;
-    const bool _must_mask;
-    uint64_t _size;
-    zmq::ws_protocol_t::opcode_t _opcode;
-    unsigned char _mask[4];
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ws_decoder_t)
-};
-}
-
-#endif
diff --git a/src/ws_encoder.cpp b/src/ws_encoder.cpp
deleted file mode 100644
index dfccb8bb3..000000000
--- a/src/ws_encoder.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "ws_protocol.hpp"
-#include "ws_encoder.hpp"
-#include "msg.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-
-#include <limits.h>
-
-zmq::ws_encoder_t::ws_encoder_t (size_t bufsize_, bool must_mask_) :
-    encoder_base_t<ws_encoder_t> (bufsize_),
-    _must_mask (must_mask_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &ws_encoder_t::message_ready, true);
-    _masked_msg.init ();
-}
-
-zmq::ws_encoder_t::~ws_encoder_t ()
-{
-    _masked_msg.close ();
-}
-
-void zmq::ws_encoder_t::message_ready ()
-{
-    int offset = 0;
-
-    _is_binary = false;
-
-    if (in_progress ()->is_ping ())
-        _tmp_buf[offset++] = 0x80 | zmq::ws_protocol_t::opcode_ping;
-    else if (in_progress ()->is_pong ())
-        _tmp_buf[offset++] = 0x80 | zmq::ws_protocol_t::opcode_pong;
-    else if (in_progress ()->is_close_cmd ())
-        _tmp_buf[offset++] = 0x80 | zmq::ws_protocol_t::opcode_close;
-    else {
-        _tmp_buf[offset++] = 0x82; // Final | binary
-        _is_binary = true;
-    }
-
-    _tmp_buf[offset] = _must_mask ? 0x80 : 0x00;
-
-    size_t size = in_progress ()->size ();
-    if (_is_binary)
-        size++;
-
-    if (size <= 125)
-        _tmp_buf[offset++] |= static_cast<unsigned char> (size & 127);
-    else if (size <= 0xFFFF) {
-        _tmp_buf[offset++] |= 126;
-        _tmp_buf[offset++] = static_cast<unsigned char> ((size >> 8) & 0xFF);
-        _tmp_buf[offset++] = static_cast<unsigned char> (size & 0xFF);
-    } else {
-        _tmp_buf[offset++] |= 127;
-        put_uint64 (_tmp_buf + offset, size);
-        offset += 8;
-    }
-
-    if (_must_mask) {
-        const uint32_t random = generate_random ();
-        put_uint32 (_tmp_buf + offset, random);
-        put_uint32 (_mask, random);
-        offset += 4;
-    }
-
-    if (_is_binary) {
-        //  Encode flags.
-        unsigned char protocol_flags = 0;
-        if (in_progress ()->flags () & msg_t::more)
-            protocol_flags |= ws_protocol_t::more_flag;
-        if (in_progress ()->flags () & msg_t::command)
-            protocol_flags |= ws_protocol_t::command_flag;
-
-        _tmp_buf[offset++] =
-          _must_mask ? protocol_flags ^ _mask[0] : protocol_flags;
-    }
-
-    next_step (_tmp_buf, offset, &ws_encoder_t::size_ready, false);
-}
-
-void zmq::ws_encoder_t::size_ready ()
-{
-    if (_must_mask) {
-        assert (in_progress () != &_masked_msg);
-        const size_t size = in_progress ()->size ();
-
-        unsigned char *src =
-          static_cast<unsigned char *> (in_progress ()->data ());
-        unsigned char *dest = src;
-
-        //  If msg is shared or data is constant we cannot mask in-place, allocate a new msg for it
-        if (in_progress ()->flags () & msg_t::shared
-            || in_progress ()->is_cmsg ()) {
-            _masked_msg.close ();
-            _masked_msg.init_size (size);
-            dest = static_cast<unsigned char *> (_masked_msg.data ());
-        }
-
-        int mask_index = _is_binary ? 1 : 0;
-        for (size_t i = 0; i < size; ++i, mask_index++)
-            dest[i] = src[i] ^ _mask[mask_index % 4];
-
-        next_step (dest, size, &ws_encoder_t::message_ready, true);
-    } else {
-        next_step (in_progress ()->data (), in_progress ()->size (),
-                   &ws_encoder_t::message_ready, true);
-    }
-}
diff --git a/src/ws_encoder.hpp b/src/ws_encoder.hpp
deleted file mode 100644
index 299259a7c..000000000
--- a/src/ws_encoder.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_ENCODER_HPP_INCLUDED__
-#define __ZMQ_WS_ENCODER_HPP_INCLUDED__
-
-#include "encoder.hpp"
-
-namespace zmq
-{
-//  Encoder for web socket framing protocol. Converts messages into data stream.
-
-class ws_encoder_t ZMQ_FINAL : public encoder_base_t<ws_encoder_t>
-{
-  public:
-    ws_encoder_t (size_t bufsize_, bool must_mask_);
-    ~ws_encoder_t ();
-
-  private:
-    void size_ready ();
-    void message_ready ();
-
-    unsigned char _tmp_buf[16];
-    bool _must_mask;
-    unsigned char _mask[4];
-    msg_t _masked_msg;
-    bool _is_binary;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ws_encoder_t)
-};
-}
-
-#endif
diff --git a/src/ws_engine.cpp b/src/ws_engine.cpp
deleted file mode 100644
index d1c8333d1..000000000
--- a/src/ws_engine.cpp
+++ /dev/null
@@ -1,1094 +0,0 @@
-/*
-Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef ZMQ_USE_NSS
-#include <secoid.h>
-#include <sechash.h>
-#define SHA_DIGEST_LENGTH 20
-#elif defined ZMQ_USE_BUILTIN_SHA1
-#include "../external/sha1/sha1.h"
-#elif defined ZMQ_USE_GNUTLS
-#define SHA_DIGEST_LENGTH 20
-#include <gnutls/gnutls.h>
-#include <gnutls/crypto.h>
-#endif
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#include <cstring>
-
-#include "tcp.hpp"
-#include "ws_engine.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "random.hpp"
-#include "ws_decoder.hpp"
-#include "ws_encoder.hpp"
-#include "null_mechanism.hpp"
-#include "plain_server.hpp"
-#include "plain_client.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-#include "curve_client.hpp"
-#include "curve_server.hpp"
-#endif
-
-#ifdef ZMQ_HAVE_WINDOWS
-#define strcasecmp _stricmp
-#define strtok_r strtok_s
-#else
-#ifdef ZMQ_HAVE_LIBBSD
-#include <bsd/string.h>
-#elif !defined(ZMQ_HAVE_STRLCPY)
-static size_t strlcpy (char *dest_, const char *src_, const size_t dest_size_)
-{
-    size_t remain = dest_size_;
-    for (; remain && *src_; --remain, ++src_, ++dest_) {
-        *dest_ = *src_;
-    }
-    return dest_size_ - remain;
-}
-#endif
-template <size_t size>
-static int strcpy_s (char (&dest_)[size], const char *const src_)
-{
-    const size_t res = strlcpy (dest_, src_, size);
-    return res >= size ? ERANGE : 0;
-}
-#endif
-
-//  OSX uses a different name for this socket option
-#ifndef IPV6_ADD_MEMBERSHIP
-#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-static int
-encode_base64 (const unsigned char *in_, int in_len_, char *out_, int out_len_);
-
-static void compute_accept_key (char *key_,
-                                unsigned char hash_[SHA_DIGEST_LENGTH]);
-
-zmq::ws_engine_t::ws_engine_t (fd_t fd_,
-                               const options_t &options_,
-                               const endpoint_uri_pair_t &endpoint_uri_pair_,
-                               const ws_address_t &address_,
-                               bool client_) :
-    stream_engine_base_t (fd_, options_, endpoint_uri_pair_, true),
-    _client (client_),
-    _address (address_),
-    _client_handshake_state (client_handshake_initial),
-    _server_handshake_state (handshake_initial),
-    _header_name_position (0),
-    _header_value_position (0),
-    _header_upgrade_websocket (false),
-    _header_connection_upgrade (false),
-    _heartbeat_timeout (0)
-{
-    memset (_websocket_key, 0, MAX_HEADER_VALUE_LENGTH + 1);
-    memset (_websocket_accept, 0, MAX_HEADER_VALUE_LENGTH + 1);
-    memset (_websocket_protocol, 0, 256);
-
-    _next_msg = &ws_engine_t::next_handshake_command;
-    _process_msg = &ws_engine_t::process_handshake_command;
-    _close_msg.init ();
-
-    if (_options.heartbeat_interval > 0) {
-        _heartbeat_timeout = _options.heartbeat_timeout;
-        if (_heartbeat_timeout == -1)
-            _heartbeat_timeout = _options.heartbeat_interval;
-    }
-}
-
-zmq::ws_engine_t::~ws_engine_t ()
-{
-    _close_msg.close ();
-}
-
-void zmq::ws_engine_t::start_ws_handshake ()
-{
-    if (_client) {
-        const char *protocol;
-        if (_options.mechanism == ZMQ_NULL)
-            protocol = "ZWS2.0/NULL,ZWS2.0";
-        else if (_options.mechanism == ZMQ_PLAIN)
-            protocol = "ZWS2.0/PLAIN";
-#ifdef ZMQ_HAVE_CURVE
-        else if (_options.mechanism == ZMQ_CURVE)
-            protocol = "ZWS2.0/CURVE";
-#endif
-        else {
-            // Avoid unitialized variable error breaking UWP build
-            protocol = "";
-            assert (false);
-        }
-
-        unsigned char nonce[16];
-        int *p = reinterpret_cast<int *> (nonce);
-
-        // The nonce doesn't have to be secure one, it is just use to avoid proxy cache
-        *p = zmq::generate_random ();
-        *(p + 1) = zmq::generate_random ();
-        *(p + 2) = zmq::generate_random ();
-        *(p + 3) = zmq::generate_random ();
-
-        int size =
-          encode_base64 (nonce, 16, _websocket_key, MAX_HEADER_VALUE_LENGTH);
-        assert (size > 0);
-
-        size = snprintf (
-          reinterpret_cast<char *> (_write_buffer), WS_BUFFER_SIZE,
-          "GET %s HTTP/1.1\r\n"
-          "Host: %s\r\n"
-          "Upgrade: websocket\r\n"
-          "Connection: Upgrade\r\n"
-          "Sec-WebSocket-Key: %s\r\n"
-          "Sec-WebSocket-Protocol: %s\r\n"
-          "Sec-WebSocket-Version: 13\r\n\r\n",
-          _address.path (), _address.host (), _websocket_key, protocol);
-        assert (size > 0 && size < WS_BUFFER_SIZE);
-        _outpos = _write_buffer;
-        _outsize = size;
-        set_pollout ();
-    }
-}
-
-void zmq::ws_engine_t::plug_internal ()
-{
-    start_ws_handshake ();
-    set_pollin ();
-    in_event ();
-}
-
-int zmq::ws_engine_t::routing_id_msg (msg_t *msg_)
-{
-    const int rc = msg_->init_size (_options.routing_id_size);
-    errno_assert (rc == 0);
-    if (_options.routing_id_size > 0)
-        memcpy (msg_->data (), _options.routing_id, _options.routing_id_size);
-    _next_msg = &ws_engine_t::pull_msg_from_session;
-
-    return 0;
-}
-
-int zmq::ws_engine_t::process_routing_id_msg (msg_t *msg_)
-{
-    if (_options.recv_routing_id) {
-        msg_->set_flags (msg_t::routing_id);
-        const int rc = session ()->push_msg (msg_);
-        errno_assert (rc == 0);
-    } else {
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-
-    _process_msg = &ws_engine_t::push_msg_to_session;
-
-    return 0;
-}
-
-bool zmq::ws_engine_t::select_protocol (const char *protocol_)
-{
-    if (_options.mechanism == ZMQ_NULL && (strcmp ("ZWS2.0", protocol_) == 0)) {
-        _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &ws_engine_t::routing_id_msg);
-        _process_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &ws_engine_t::process_routing_id_msg);
-
-        // No mechanism in place, enabling heartbeat
-        if (_options.heartbeat_interval > 0 && !_has_heartbeat_timer) {
-            add_timer (_options.heartbeat_interval, heartbeat_ivl_timer_id);
-            _has_heartbeat_timer = true;
-        }
-
-        return true;
-    }
-    if (_options.mechanism == ZMQ_NULL
-        && strcmp ("ZWS2.0/NULL", protocol_) == 0) {
-        _mechanism = new (std::nothrow)
-          null_mechanism_t (session (), _peer_address, _options);
-        alloc_assert (_mechanism);
-        return true;
-    } else if (_options.mechanism == ZMQ_PLAIN
-               && strcmp ("ZWS2.0/PLAIN", protocol_) == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow)
-              plain_server_t (session (), _peer_address, _options);
-        else
-            _mechanism =
-              new (std::nothrow) plain_client_t (session (), _options);
-        alloc_assert (_mechanism);
-        return true;
-    }
-#ifdef ZMQ_HAVE_CURVE
-    else if (_options.mechanism == ZMQ_CURVE
-             && strcmp ("ZWS2.0/CURVE", protocol_) == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow)
-              curve_server_t (session (), _peer_address, _options, false);
-        else
-            _mechanism =
-              new (std::nothrow) curve_client_t (session (), _options, false);
-        alloc_assert (_mechanism);
-        return true;
-    }
-#endif
-
-    return false;
-}
-
-bool zmq::ws_engine_t::handshake ()
-{
-    bool complete;
-
-    if (_client)
-        complete = client_handshake ();
-    else
-        complete = server_handshake ();
-
-    if (complete) {
-        _encoder =
-          new (std::nothrow) ws_encoder_t (_options.out_batch_size, _client);
-        alloc_assert (_encoder);
-
-        _decoder = new (std::nothrow)
-          ws_decoder_t (_options.in_batch_size, _options.maxmsgsize,
-                        _options.zero_copy, !_client);
-        alloc_assert (_decoder);
-
-        socket ()->event_handshake_succeeded (_endpoint_uri_pair, 0);
-
-        set_pollout ();
-    }
-
-    return complete;
-}
-
-bool zmq::ws_engine_t::server_handshake ()
-{
-    const int nbytes = read (_read_buffer, WS_BUFFER_SIZE);
-    if (nbytes == -1) {
-        if (errno != EAGAIN)
-            error (zmq::i_engine::connection_error);
-        return false;
-    }
-
-    _inpos = _read_buffer;
-    _insize = nbytes;
-
-    while (_insize > 0) {
-        const char c = static_cast<char> (*_inpos);
-
-        switch (_server_handshake_state) {
-            case handshake_initial:
-                if (c == 'G')
-                    _server_handshake_state = request_line_G;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_G:
-                if (c == 'E')
-                    _server_handshake_state = request_line_GE;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_GE:
-                if (c == 'T')
-                    _server_handshake_state = request_line_GET;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_GET:
-                if (c == ' ')
-                    _server_handshake_state = request_line_GET_space;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_GET_space:
-                if (c == '\r' || c == '\n')
-                    _server_handshake_state = handshake_error;
-                // TODO: instead of check what is not allowed check what is allowed
-                if (c != ' ')
-                    _server_handshake_state = request_line_resource;
-                else
-                    _server_handshake_state = request_line_GET_space;
-                break;
-            case request_line_resource:
-                if (c == '\r' || c == '\n')
-                    _server_handshake_state = handshake_error;
-                else if (c == ' ')
-                    _server_handshake_state = request_line_resource_space;
-                else
-                    _server_handshake_state = request_line_resource;
-                break;
-            case request_line_resource_space:
-                if (c == 'H')
-                    _server_handshake_state = request_line_H;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_H:
-                if (c == 'T')
-                    _server_handshake_state = request_line_HT;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HT:
-                if (c == 'T')
-                    _server_handshake_state = request_line_HTT;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTT:
-                if (c == 'P')
-                    _server_handshake_state = request_line_HTTP;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP:
-                if (c == '/')
-                    _server_handshake_state = request_line_HTTP_slash;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP_slash:
-                if (c == '1')
-                    _server_handshake_state = request_line_HTTP_slash_1;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP_slash_1:
-                if (c == '.')
-                    _server_handshake_state = request_line_HTTP_slash_1_dot;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP_slash_1_dot:
-                if (c == '1')
-                    _server_handshake_state = request_line_HTTP_slash_1_dot_1;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP_slash_1_dot_1:
-                if (c == '\r')
-                    _server_handshake_state = request_line_cr;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_cr:
-                if (c == '\n')
-                    _server_handshake_state = header_field_begin_name;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case header_field_begin_name:
-                switch (c) {
-                    case '\r':
-                        _server_handshake_state = handshake_end_line_cr;
-                        break;
-                    case '\n':
-                        _server_handshake_state = handshake_error;
-                        break;
-                    default:
-                        _header_name[0] = c;
-                        _header_name_position = 1;
-                        _server_handshake_state = header_field_name;
-                        break;
-                }
-                break;
-            case header_field_name:
-                if (c == '\r' || c == '\n')
-                    _server_handshake_state = handshake_error;
-                else if (c == ':') {
-                    _header_name[_header_name_position] = '\0';
-                    _server_handshake_state = header_field_colon;
-                } else if (_header_name_position + 1 > MAX_HEADER_NAME_LENGTH)
-                    _server_handshake_state = handshake_error;
-                else {
-                    _header_name[_header_name_position] = c;
-                    _header_name_position++;
-                    _server_handshake_state = header_field_name;
-                }
-                break;
-            case header_field_colon:
-            case header_field_value_trailing_space:
-                if (c == '\n')
-                    _server_handshake_state = handshake_error;
-                else if (c == '\r')
-                    _server_handshake_state = header_field_cr;
-                else if (c == ' ')
-                    _server_handshake_state = header_field_value_trailing_space;
-                else {
-                    _header_value[0] = c;
-                    _header_value_position = 1;
-                    _server_handshake_state = header_field_value;
-                }
-                break;
-            case header_field_value:
-                if (c == '\n')
-                    _server_handshake_state = handshake_error;
-                else if (c == '\r') {
-                    _header_value[_header_value_position] = '\0';
-
-                    if (strcasecmp ("upgrade", _header_name) == 0)
-                        _header_upgrade_websocket =
-                          strcasecmp ("websocket", _header_value) == 0;
-                    else if (strcasecmp ("connection", _header_name) == 0)
-                        _header_connection_upgrade =
-                          strcasecmp ("upgrade", _header_value) == 0;
-                    else if (strcasecmp ("Sec-WebSocket-Key", _header_name)
-                             == 0)
-                        strcpy_s (_websocket_key, _header_value);
-                    else if (strcasecmp ("Sec-WebSocket-Protocol", _header_name)
-                             == 0) {
-                        // Currently only the ZWS2.0 is supported
-                        // Sec-WebSocket-Protocol can appear multiple times or be a comma separated list
-                        // if _websocket_protocol is already set we skip the check
-                        if (_websocket_protocol[0] == '\0') {
-                            char *rest = 0;
-                            char *p = strtok_r (_header_value, ",", &rest);
-                            while (p != NULL) {
-                                if (*p == ' ')
-                                    p++;
-
-                                if (select_protocol (p)) {
-                                    strcpy_s (_websocket_protocol, p);
-                                    break;
-                                }
-
-                                p = strtok_r (NULL, ",", &rest);
-                            }
-                        }
-                    }
-
-                    _server_handshake_state = header_field_cr;
-                } else if (_header_value_position + 1 > MAX_HEADER_VALUE_LENGTH)
-                    _server_handshake_state = handshake_error;
-                else {
-                    _header_value[_header_value_position] = c;
-                    _header_value_position++;
-                    _server_handshake_state = header_field_value;
-                }
-                break;
-            case header_field_cr:
-                if (c == '\n')
-                    _server_handshake_state = header_field_begin_name;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case handshake_end_line_cr:
-                if (c == '\n') {
-                    if (_header_connection_upgrade && _header_upgrade_websocket
-                        && _websocket_protocol[0] != '\0'
-                        && _websocket_key[0] != '\0') {
-                        _server_handshake_state = handshake_complete;
-
-                        unsigned char hash[SHA_DIGEST_LENGTH];
-                        compute_accept_key (_websocket_key, hash);
-
-                        const int accept_key_len = encode_base64 (
-                          hash, SHA_DIGEST_LENGTH, _websocket_accept,
-                          MAX_HEADER_VALUE_LENGTH);
-                        assert (accept_key_len > 0);
-                        _websocket_accept[accept_key_len] = '\0';
-
-                        const int written =
-                          snprintf (reinterpret_cast<char *> (_write_buffer),
-                                    WS_BUFFER_SIZE,
-                                    "HTTP/1.1 101 Switching Protocols\r\n"
-                                    "Upgrade: websocket\r\n"
-                                    "Connection: Upgrade\r\n"
-                                    "Sec-WebSocket-Accept: %s\r\n"
-                                    "Sec-WebSocket-Protocol: %s\r\n"
-                                    "\r\n",
-                                    _websocket_accept, _websocket_protocol);
-                        assert (written >= 0 && written < WS_BUFFER_SIZE);
-                        _outpos = _write_buffer;
-                        _outsize = written;
-
-                        _inpos++;
-                        _insize--;
-
-                        return true;
-                    }
-                    _server_handshake_state = handshake_error;
-                } else
-                    _server_handshake_state = handshake_error;
-                break;
-            default:
-                assert (false);
-        }
-
-        _inpos++;
-        _insize--;
-
-        if (_server_handshake_state == handshake_error) {
-            // TODO: send bad request
-
-            socket ()->event_handshake_failed_protocol (
-              _endpoint_uri_pair, ZMQ_PROTOCOL_ERROR_WS_UNSPECIFIED);
-
-            error (zmq::i_engine::protocol_error);
-            return false;
-        }
-    }
-    return false;
-}
-
-bool zmq::ws_engine_t::client_handshake ()
-{
-    const int nbytes = read (_read_buffer, WS_BUFFER_SIZE);
-    if (nbytes == -1) {
-        if (errno != EAGAIN)
-            error (zmq::i_engine::connection_error);
-        return false;
-    }
-
-    _inpos = _read_buffer;
-    _insize = nbytes;
-
-    while (_insize > 0) {
-        const char c = static_cast<char> (*_inpos);
-
-        switch (_client_handshake_state) {
-            case client_handshake_initial:
-                if (c == 'H')
-                    _client_handshake_state = response_line_H;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_H:
-                if (c == 'T')
-                    _client_handshake_state = response_line_HT;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HT:
-                if (c == 'T')
-                    _client_handshake_state = response_line_HTT;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTT:
-                if (c == 'P')
-                    _client_handshake_state = response_line_HTTP;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP:
-                if (c == '/')
-                    _client_handshake_state = response_line_HTTP_slash;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash:
-                if (c == '1')
-                    _client_handshake_state = response_line_HTTP_slash_1;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash_1:
-                if (c == '.')
-                    _client_handshake_state = response_line_HTTP_slash_1_dot;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash_1_dot:
-                if (c == '1')
-                    _client_handshake_state = response_line_HTTP_slash_1_dot_1;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash_1_dot_1:
-                if (c == ' ')
-                    _client_handshake_state =
-                      response_line_HTTP_slash_1_dot_1_space;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash_1_dot_1_space:
-                if (c == ' ')
-                    _client_handshake_state =
-                      response_line_HTTP_slash_1_dot_1_space;
-                else if (c == '1')
-                    _client_handshake_state = response_line_status_1;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_status_1:
-                if (c == '0')
-                    _client_handshake_state = response_line_status_10;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_status_10:
-                if (c == '1')
-                    _client_handshake_state = response_line_status_101;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_status_101:
-                if (c == ' ')
-                    _client_handshake_state = response_line_status_101_space;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_status_101_space:
-                if (c == ' ')
-                    _client_handshake_state = response_line_status_101_space;
-                else if (c == 'S')
-                    _client_handshake_state = response_line_s;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_s:
-                if (c == 'w')
-                    _client_handshake_state = response_line_sw;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_sw:
-                if (c == 'i')
-                    _client_handshake_state = response_line_swi;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_swi:
-                if (c == 't')
-                    _client_handshake_state = response_line_swit;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_swit:
-                if (c == 'c')
-                    _client_handshake_state = response_line_switc;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switc:
-                if (c == 'h')
-                    _client_handshake_state = response_line_switch;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switch:
-                if (c == 'i')
-                    _client_handshake_state = response_line_switchi;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switchi:
-                if (c == 'n')
-                    _client_handshake_state = response_line_switchin;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switchin:
-                if (c == 'g')
-                    _client_handshake_state = response_line_switching;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switching:
-                if (c == ' ')
-                    _client_handshake_state = response_line_switching_space;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switching_space:
-                if (c == 'P')
-                    _client_handshake_state = response_line_p;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_p:
-                if (c == 'r')
-                    _client_handshake_state = response_line_pr;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_pr:
-                if (c == 'o')
-                    _client_handshake_state = response_line_pro;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_pro:
-                if (c == 't')
-                    _client_handshake_state = response_line_prot;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_prot:
-                if (c == 'o')
-                    _client_handshake_state = response_line_proto;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_proto:
-                if (c == 'c')
-                    _client_handshake_state = response_line_protoc;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_protoc:
-                if (c == 'o')
-                    _client_handshake_state = response_line_protoco;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_protoco:
-                if (c == 'l')
-                    _client_handshake_state = response_line_protocol;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_protocol:
-                if (c == 's')
-                    _client_handshake_state = response_line_protocols;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_protocols:
-                if (c == '\r')
-                    _client_handshake_state = response_line_cr;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_cr:
-                if (c == '\n')
-                    _client_handshake_state = client_header_field_begin_name;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case client_header_field_begin_name:
-                switch (c) {
-                    case '\r':
-                        _client_handshake_state = client_handshake_end_line_cr;
-                        break;
-                    case '\n':
-                        _client_handshake_state = client_handshake_error;
-                        break;
-                    default:
-                        _header_name[0] = c;
-                        _header_name_position = 1;
-                        _client_handshake_state = client_header_field_name;
-                        break;
-                }
-                break;
-            case client_header_field_name:
-                if (c == '\r' || c == '\n')
-                    _client_handshake_state = client_handshake_error;
-                else if (c == ':') {
-                    _header_name[_header_name_position] = '\0';
-                    _client_handshake_state = client_header_field_colon;
-                } else if (_header_name_position + 1 > MAX_HEADER_NAME_LENGTH)
-                    _client_handshake_state = client_handshake_error;
-                else {
-                    _header_name[_header_name_position] = c;
-                    _header_name_position++;
-                    _client_handshake_state = client_header_field_name;
-                }
-                break;
-            case client_header_field_colon:
-            case client_header_field_value_trailing_space:
-                if (c == '\n')
-                    _client_handshake_state = client_handshake_error;
-                else if (c == '\r')
-                    _client_handshake_state = client_header_field_cr;
-                else if (c == ' ')
-                    _client_handshake_state =
-                      client_header_field_value_trailing_space;
-                else {
-                    _header_value[0] = c;
-                    _header_value_position = 1;
-                    _client_handshake_state = client_header_field_value;
-                }
-                break;
-            case client_header_field_value:
-                if (c == '\n')
-                    _client_handshake_state = client_handshake_error;
-                else if (c == '\r') {
-                    _header_value[_header_value_position] = '\0';
-
-                    if (strcasecmp ("upgrade", _header_name) == 0)
-                        _header_upgrade_websocket =
-                          strcasecmp ("websocket", _header_value) == 0;
-                    else if (strcasecmp ("connection", _header_name) == 0)
-                        _header_connection_upgrade =
-                          strcasecmp ("upgrade", _header_value) == 0;
-                    else if (strcasecmp ("Sec-WebSocket-Accept", _header_name)
-                             == 0)
-                        strcpy_s (_websocket_accept, _header_value);
-                    else if (strcasecmp ("Sec-WebSocket-Protocol", _header_name)
-                             == 0) {
-                        if (select_protocol (_header_value))
-                            strcpy_s (_websocket_protocol, _header_value);
-                    }
-                    _client_handshake_state = client_header_field_cr;
-                } else if (_header_value_position + 1 > MAX_HEADER_VALUE_LENGTH)
-                    _client_handshake_state = client_handshake_error;
-                else {
-                    _header_value[_header_value_position] = c;
-                    _header_value_position++;
-                    _client_handshake_state = client_header_field_value;
-                }
-                break;
-            case client_header_field_cr:
-                if (c == '\n')
-                    _client_handshake_state = client_header_field_begin_name;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case client_handshake_end_line_cr:
-                if (c == '\n') {
-                    if (_header_connection_upgrade && _header_upgrade_websocket
-                        && _websocket_protocol[0] != '\0'
-                        && _websocket_accept[0] != '\0') {
-                        _client_handshake_state = client_handshake_complete;
-
-                        // TODO: validate accept key
-
-                        _inpos++;
-                        _insize--;
-
-                        return true;
-                    }
-                    _client_handshake_state = client_handshake_error;
-                } else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            default:
-                assert (false);
-        }
-
-        _inpos++;
-        _insize--;
-
-        if (_client_handshake_state == client_handshake_error) {
-            socket ()->event_handshake_failed_protocol (
-              _endpoint_uri_pair, ZMQ_PROTOCOL_ERROR_WS_UNSPECIFIED);
-
-            error (zmq::i_engine::protocol_error);
-            return false;
-        }
-    }
-
-    return false;
-}
-
-int zmq::ws_engine_t::decode_and_push (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    //  with WS engine, ping and pong commands are control messages and should not go through any mechanism
-    if (msg_->is_ping () || msg_->is_pong () || msg_->is_close_cmd ()) {
-        if (process_command_message (msg_) == -1)
-            return -1;
-    } else if (_mechanism->decode (msg_) == -1)
-        return -1;
-
-    if (_has_timeout_timer) {
-        _has_timeout_timer = false;
-        cancel_timer (heartbeat_timeout_timer_id);
-    }
-
-    if (msg_->flags () & msg_t::command && !msg_->is_ping ()
-        && !msg_->is_pong () && !msg_->is_close_cmd ())
-        process_command_message (msg_);
-
-    if (_metadata)
-        msg_->set_metadata (_metadata);
-    if (session ()->push_msg (msg_) == -1) {
-        if (errno == EAGAIN)
-            _process_msg = &ws_engine_t::push_one_then_decode_and_push;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::ws_engine_t::produce_close_message (msg_t *msg_)
-{
-    int rc = msg_->move (_close_msg);
-    errno_assert (rc == 0);
-
-    _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &ws_engine_t::produce_no_msg_after_close);
-
-    return rc;
-}
-
-int zmq::ws_engine_t::produce_no_msg_after_close (msg_t *msg_)
-{
-    _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &ws_engine_t::close_connection_after_close);
-
-    errno = EAGAIN;
-    return -1;
-}
-
-int zmq::ws_engine_t::close_connection_after_close (msg_t *msg_)
-{
-    error (connection_error);
-    errno = ECONNRESET;
-    return -1;
-}
-
-int zmq::ws_engine_t::produce_ping_message (msg_t *msg_)
-{
-    int rc = msg_->init ();
-    errno_assert (rc == 0);
-    msg_->set_flags (msg_t::command | msg_t::ping);
-
-    _next_msg = &ws_engine_t::pull_and_encode;
-    if (!_has_timeout_timer && _heartbeat_timeout > 0) {
-        add_timer (_heartbeat_timeout, heartbeat_timeout_timer_id);
-        _has_timeout_timer = true;
-    }
-
-    return rc;
-}
-
-
-int zmq::ws_engine_t::produce_pong_message (msg_t *msg_)
-{
-    int rc = msg_->init ();
-    errno_assert (rc == 0);
-    msg_->set_flags (msg_t::command | msg_t::pong);
-
-    _next_msg = &ws_engine_t::pull_and_encode;
-    return rc;
-}
-
-
-int zmq::ws_engine_t::process_command_message (msg_t *msg_)
-{
-    if (msg_->is_ping ()) {
-        _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &ws_engine_t::produce_pong_message);
-        out_event ();
-    } else if (msg_->is_close_cmd ()) {
-        int rc = _close_msg.copy (*msg_);
-        errno_assert (rc == 0);
-        _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &ws_engine_t::produce_close_message);
-        out_event ();
-    }
-
-    return 0;
-}
-
-static int
-encode_base64 (const unsigned char *in_, int in_len_, char *out_, int out_len_)
-{
-    static const unsigned char base64enc_tab[65] =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-    int io = 0;
-    uint32_t v = 0;
-    int rem = 0;
-
-    for (int ii = 0; ii < in_len_; ii++) {
-        unsigned char ch;
-        ch = in_[ii];
-        v = (v << 8) | ch;
-        rem += 8;
-        while (rem >= 6) {
-            rem -= 6;
-            if (io >= out_len_)
-                return -1; /* truncation is failure */
-            out_[io++] = base64enc_tab[(v >> rem) & 63];
-        }
-    }
-    if (rem) {
-        v <<= (6 - rem);
-        if (io >= out_len_)
-            return -1; /* truncation is failure */
-        out_[io++] = base64enc_tab[v & 63];
-    }
-    while (io & 3) {
-        if (io >= out_len_)
-            return -1; /* truncation is failure */
-        out_[io++] = '=';
-    }
-    if (io >= out_len_)
-        return -1; /* no room for null terminator */
-    out_[io] = 0;
-    return io;
-}
-
-static void compute_accept_key (char *key_, unsigned char *hash_)
-{
-    const char *magic_string = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-#ifdef ZMQ_USE_NSS
-    unsigned int len;
-    HASH_HashType type = HASH_GetHashTypeByOidTag (SEC_OID_SHA1);
-    HASHContext *ctx = HASH_Create (type);
-    assert (ctx);
-
-    HASH_Begin (ctx);
-    HASH_Update (ctx, (unsigned char *) key_, (unsigned int) strlen (key_));
-    HASH_Update (ctx, (unsigned char *) magic_string,
-                 (unsigned int) strlen (magic_string));
-    HASH_End (ctx, hash_, &len, SHA_DIGEST_LENGTH);
-    HASH_Destroy (ctx);
-#elif defined ZMQ_USE_BUILTIN_SHA1
-    sha1_ctxt ctx;
-    SHA1_Init (&ctx);
-    SHA1_Update (&ctx, (unsigned char *) key_, strlen (key_));
-    SHA1_Update (&ctx, (unsigned char *) magic_string, strlen (magic_string));
-
-    SHA1_Final (hash_, &ctx);
-#elif defined ZMQ_USE_GNUTLS
-    gnutls_hash_hd_t hd;
-    gnutls_hash_init (&hd, GNUTLS_DIG_SHA1);
-    gnutls_hash (hd, key_, strlen (key_));
-    gnutls_hash (hd, magic_string, strlen (magic_string));
-    gnutls_hash_deinit (hd, hash_);
-#else
-#error "No sha1 implementation set"
-#endif
-}
diff --git a/src/ws_engine.hpp b/src/ws_engine.hpp
deleted file mode 100644
index bdf145b88..000000000
--- a/src/ws_engine.hpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_ENGINE_HPP_INCLUDED__
-#define __ZMQ_WS_ENGINE_HPP_INCLUDED__
-
-#include "io_object.hpp"
-#include "address.hpp"
-#include "msg.hpp"
-#include "stream_engine_base.hpp"
-#include "ws_address.hpp"
-
-#define WS_BUFFER_SIZE 8192
-#define MAX_HEADER_NAME_LENGTH 1024
-#define MAX_HEADER_VALUE_LENGTH 2048
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-
-typedef enum
-{
-    handshake_initial = 0,
-    request_line_G,
-    request_line_GE,
-    request_line_GET,
-    request_line_GET_space,
-    request_line_resource,
-    request_line_resource_space,
-    request_line_H,
-    request_line_HT,
-    request_line_HTT,
-    request_line_HTTP,
-    request_line_HTTP_slash,
-    request_line_HTTP_slash_1,
-    request_line_HTTP_slash_1_dot,
-    request_line_HTTP_slash_1_dot_1,
-    request_line_cr,
-    header_field_begin_name,
-    header_field_name,
-    header_field_colon,
-    header_field_value_trailing_space,
-    header_field_value,
-    header_field_cr,
-    handshake_end_line_cr,
-    handshake_complete,
-
-    handshake_error = -1
-} ws_server_handshake_state_t;
-
-
-typedef enum
-{
-    client_handshake_initial = 0,
-    response_line_H,
-    response_line_HT,
-    response_line_HTT,
-    response_line_HTTP,
-    response_line_HTTP_slash,
-    response_line_HTTP_slash_1,
-    response_line_HTTP_slash_1_dot,
-    response_line_HTTP_slash_1_dot_1,
-    response_line_HTTP_slash_1_dot_1_space,
-    response_line_status_1,
-    response_line_status_10,
-    response_line_status_101,
-    response_line_status_101_space,
-    response_line_s,
-    response_line_sw,
-    response_line_swi,
-    response_line_swit,
-    response_line_switc,
-    response_line_switch,
-    response_line_switchi,
-    response_line_switchin,
-    response_line_switching,
-    response_line_switching_space,
-    response_line_p,
-    response_line_pr,
-    response_line_pro,
-    response_line_prot,
-    response_line_proto,
-    response_line_protoc,
-    response_line_protoco,
-    response_line_protocol,
-    response_line_protocols,
-    response_line_cr,
-    client_header_field_begin_name,
-    client_header_field_name,
-    client_header_field_colon,
-    client_header_field_value_trailing_space,
-    client_header_field_value,
-    client_header_field_cr,
-    client_handshake_end_line_cr,
-    client_handshake_complete,
-
-    client_handshake_error = -1
-} ws_client_handshake_state_t;
-
-class ws_engine_t : public stream_engine_base_t
-{
-  public:
-    ws_engine_t (fd_t fd_,
-                 const options_t &options_,
-                 const endpoint_uri_pair_t &endpoint_uri_pair_,
-                 const ws_address_t &address_,
-                 bool client_);
-    ~ws_engine_t ();
-
-  protected:
-    int decode_and_push (msg_t *msg_);
-    int process_command_message (msg_t *msg_);
-    int produce_pong_message (msg_t *msg_);
-    int produce_ping_message (msg_t *msg_);
-    bool handshake ();
-    void plug_internal ();
-    void start_ws_handshake ();
-
-  private:
-    int routing_id_msg (msg_t *msg_);
-    int process_routing_id_msg (msg_t *msg_);
-    int produce_close_message (msg_t *msg_);
-    int produce_no_msg_after_close (msg_t *msg_);
-    int close_connection_after_close (msg_t *msg_);
-
-    bool select_protocol (const char *protocol);
-
-    bool client_handshake ();
-    bool server_handshake ();
-
-    bool _client;
-    ws_address_t _address;
-
-    ws_client_handshake_state_t _client_handshake_state;
-    ws_server_handshake_state_t _server_handshake_state;
-
-    unsigned char _read_buffer[WS_BUFFER_SIZE];
-    unsigned char _write_buffer[WS_BUFFER_SIZE];
-    char _header_name[MAX_HEADER_NAME_LENGTH + 1];
-    int _header_name_position;
-    char _header_value[MAX_HEADER_VALUE_LENGTH + 1];
-    int _header_value_position;
-
-    bool _header_upgrade_websocket;
-    bool _header_connection_upgrade;
-    char _websocket_protocol[256];
-    char _websocket_key[MAX_HEADER_VALUE_LENGTH + 1];
-    char _websocket_accept[MAX_HEADER_VALUE_LENGTH + 1];
-
-    int _heartbeat_timeout;
-    msg_t _close_msg;
-};
-}
-
-#endif
diff --git a/src/ws_listener.cpp b/src/ws_listener.cpp
deleted file mode 100644
index af04917c6..000000000
--- a/src/ws_listener.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-
-#include <string>
-#include <stdio.h>
-
-#include "ws_listener.hpp"
-#include "io_thread.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "socket_base.hpp"
-#include "address.hpp"
-#include "ws_engine.hpp"
-#include "session_base.hpp"
-
-#ifdef ZMQ_HAVE_WSS
-#include "wss_engine.hpp"
-#include "wss_address.hpp"
-#endif
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <fcntl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#ifdef ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-
-zmq::ws_listener_t::ws_listener_t (io_thread_t *io_thread_,
-                                   socket_base_t *socket_,
-                                   const options_t &options_,
-                                   bool wss_) :
-    stream_listener_base_t (io_thread_, socket_, options_),
-    _wss (wss_)
-{
-#ifdef ZMQ_HAVE_WSS
-    if (_wss) {
-        int rc = gnutls_certificate_allocate_credentials (&_tls_cred);
-        assert (rc == GNUTLS_E_SUCCESS);
-
-        gnutls_datum_t cert = {(unsigned char *) options_.wss_cert_pem.c_str (),
-                               (unsigned int) options_.wss_cert_pem.length ()};
-        gnutls_datum_t key = {(unsigned char *) options_.wss_key_pem.c_str (),
-                              (unsigned int) options_.wss_key_pem.length ()};
-        rc = gnutls_certificate_set_x509_key_mem (_tls_cred, &cert, &key,
-                                                  GNUTLS_X509_FMT_PEM);
-        assert (rc == GNUTLS_E_SUCCESS);
-    }
-#endif
-}
-
-zmq::ws_listener_t::~ws_listener_t ()
-{
-#ifdef ZMQ_HAVE_WSS
-    if (_wss)
-        gnutls_certificate_free_credentials (_tls_cred);
-#endif
-}
-
-void zmq::ws_listener_t::in_event ()
-{
-    const fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    //  TODO: Handle specific errors like ENFILE/EMFILE etc.
-    if (fd == retired_fd) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    int rc = tune_tcp_socket (fd);
-    rc = rc | tune_tcp_maxrt (fd, options.tcp_maxrt);
-    if (rc != 0) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    //  Create the engine object for this connection.
-    create_engine (fd);
-}
-
-std::string zmq::ws_listener_t::get_socket_name (zmq::fd_t fd_,
-                                                 socket_end_t socket_end_) const
-{
-    std::string socket_name;
-
-#ifdef ZMQ_HAVE_WSS
-    if (_wss)
-        socket_name = zmq::get_socket_name<wss_address_t> (fd_, socket_end_);
-    else
-#endif
-        socket_name = zmq::get_socket_name<ws_address_t> (fd_, socket_end_);
-
-    return socket_name + _address.path ();
-}
-
-int zmq::ws_listener_t::create_socket (const char *addr_)
-{
-    tcp_address_t address;
-    _s = tcp_open_socket (addr_, options, true, true, &address);
-    if (_s == retired_fd) {
-        return -1;
-    }
-
-    //  TODO why is this only done for the listener?
-    make_socket_noninheritable (_s);
-
-    //  Allow reusing of the address.
-    int flag = 1;
-    int rc;
-#ifdef ZMQ_HAVE_WINDOWS
-    //  TODO this was changed for Windows from SO_REUSEADDRE to
-    //  SE_EXCLUSIVEADDRUSE by 0ab65324195ad70205514d465b03d851a6de051c,
-    //  so the comment above is no longer correct; also, now the settings are
-    //  different between listener and connecter with a src address.
-    //  is this intentional?
-    rc = setsockopt (_s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
-                     reinterpret_cast<const char *> (&flag), sizeof (int));
-    wsa_assert (rc != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_VXWORKS
-    rc =
-      setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, (char *) &flag, sizeof (int));
-    errno_assert (rc == 0);
-#else
-    rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int));
-    errno_assert (rc == 0);
-#endif
-
-    //  Bind the socket to the network interface and port.
-#if defined ZMQ_HAVE_VXWORKS
-    rc = bind (_s, (sockaddr *) _address.addr (), _address.addrlen ());
-#else
-    rc = bind (_s, address.addr (), address.addrlen ());
-#endif
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    //  Listen for incoming connections.
-    rc = listen (_s, options.backlog);
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    return 0;
-
-error:
-    const int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-int zmq::ws_listener_t::set_local_address (const char *addr_)
-{
-    if (options.use_fd != -1) {
-        //  in this case, the addr_ passed is not used and ignored, since the
-        //  socket was already created by the application
-        _s = options.use_fd;
-    } else {
-        const int rc = _address.resolve (addr_, true, options.ipv6);
-        if (rc != 0)
-            return -1;
-
-        //  remove the path, otherwise resolving the port will fail with wildcard
-        const char *delim = strrchr (addr_, '/');
-        std::string host_address;
-        if (delim) {
-            host_address = std::string (addr_, delim - addr_);
-        } else {
-            host_address = addr_;
-        }
-
-        if (create_socket (host_address.c_str ()) == -1)
-            return -1;
-    }
-
-    _endpoint = get_socket_name (_s, socket_end_local);
-
-    _socket->event_listening (make_unconnected_bind_endpoint_pair (_endpoint),
-                              _s);
-    return 0;
-}
-
-zmq::fd_t zmq::ws_listener_t::accept ()
-{
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    //  Accept one connection and deal with different failure modes.
-    zmq_assert (_s != retired_fd);
-
-    struct sockaddr_storage ss;
-    memset (&ss, 0, sizeof (ss));
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int ss_len = sizeof (ss);
-#else
-    socklen_t ss_len = sizeof (ss);
-#endif
-#if defined ZMQ_HAVE_SOCK_CLOEXEC && defined HAVE_ACCEPT4
-    fd_t sock = ::accept4 (_s, reinterpret_cast<struct sockaddr *> (&ss),
-                           &ss_len, SOCK_CLOEXEC);
-#else
-    const fd_t sock =
-      ::accept (_s, reinterpret_cast<struct sockaddr *> (&ss), &ss_len);
-#endif
-
-    if (sock == retired_fd) {
-#if defined ZMQ_HAVE_WINDOWS
-        const int last_error = WSAGetLastError ();
-        wsa_assert (last_error == WSAEWOULDBLOCK || last_error == WSAECONNRESET
-                    || last_error == WSAEMFILE || last_error == WSAENOBUFS);
-#elif defined ZMQ_HAVE_ANDROID
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE || errno == EINVAL);
-#else
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE);
-#endif
-        return retired_fd;
-    }
-
-    make_socket_noninheritable (sock);
-
-    if (zmq::set_nosigpipe (sock)) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (sock);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = ::close (sock);
-        errno_assert (rc == 0);
-#endif
-        return retired_fd;
-    }
-
-    // Set the IP Type-Of-Service priority for this client socket
-    if (options.tos != 0)
-        set_ip_type_of_service (sock, options.tos);
-
-    return sock;
-}
-
-void zmq::ws_listener_t::create_engine (fd_t fd_)
-{
-    const endpoint_uri_pair_t endpoint_pair (
-      get_socket_name (fd_, socket_end_local),
-      get_socket_name (fd_, socket_end_remote), endpoint_type_bind);
-
-    i_engine *engine = NULL;
-    if (_wss)
-#ifdef ZMQ_HAVE_WSS
-        engine = new (std::nothrow)
-          wss_engine_t (fd_, options, endpoint_pair, _address, false, _tls_cred,
-                        std::string ());
-#else
-        assert (false);
-#endif
-    else
-        engine = new (std::nothrow)
-          ws_engine_t (fd_, options, endpoint_pair, _address, false);
-
-    alloc_assert (engine);
-
-    //  Choose I/O thread to run connecter in. Given that we are already
-    //  running in an I/O thread, there must be at least one available.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    zmq_assert (io_thread);
-
-    //  Create and launch a session object.
-    session_base_t *session =
-      session_base_t::create (io_thread, false, _socket, options, NULL);
-    errno_assert (session);
-    session->inc_seqnum ();
-    launch_child (session);
-    send_attach (session, engine, false);
-
-    _socket->event_accepted (endpoint_pair, fd_);
-}
diff --git a/src/ws_listener.hpp b/src/ws_listener.hpp
deleted file mode 100644
index 88f3b08be..000000000
--- a/src/ws_listener.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_LISTENER_HPP_INCLUDED__
-#define __ZMQ_WS_LISTENER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "ws_address.hpp"
-#include "stream_listener_base.hpp"
-
-#ifdef ZMQ_USE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif
-
-namespace zmq
-{
-class ws_listener_t ZMQ_FINAL : public stream_listener_base_t
-{
-  public:
-    ws_listener_t (zmq::io_thread_t *io_thread_,
-                   zmq::socket_base_t *socket_,
-                   const options_t &options_,
-                   bool wss_);
-
-    ~ws_listener_t ();
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-  protected:
-    std::string get_socket_name (fd_t fd_, socket_end_t socket_end_) const;
-    void create_engine (fd_t fd);
-
-  private:
-    //  Handlers for I/O events.
-    void in_event ();
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog
-    //  or was denied because of accept filters.
-    fd_t accept ();
-
-    int create_socket (const char *addr_);
-
-    //  Address to listen on.
-    ws_address_t _address;
-
-    bool _wss;
-#ifdef ZMQ_HAVE_WSS
-    gnutls_certificate_credentials_t _tls_cred;
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ws_listener_t)
-};
-}
-
-#endif
diff --git a/src/ws_protocol.hpp b/src/ws_protocol.hpp
deleted file mode 100644
index b4b7e81f6..000000000
--- a/src/ws_protocol.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_PROTOCOL_HPP_INCLUDED__
-#define __ZMQ_WS_PROTOCOL_HPP_INCLUDED__
-
-namespace zmq
-{
-//  Definition of constants for WS transport protocol.
-class ws_protocol_t
-{
-  public:
-    //  Message flags.
-    enum opcode_t
-    {
-        opcode_continuation = 0,
-        opcode_text = 0x01,
-        opcode_binary = 0x02,
-        opcode_close = 0x08,
-        opcode_ping = 0x09,
-        opcode_pong = 0xA
-    };
-
-    enum
-    {
-        more_flag = 1,
-        command_flag = 2
-    };
-};
-}
-
-#endif
diff --git a/src/wss_address.cpp b/src/wss_address.cpp
deleted file mode 100644
index abfec9ebf..000000000
--- a/src/wss_address.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-    Copyright (c) 2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string>
-#include <sstream>
-
-#include "wss_address.hpp"
-
-zmq::wss_address_t::wss_address_t () : ws_address_t ()
-{
-}
-
-zmq::wss_address_t::wss_address_t (const sockaddr *sa_, socklen_t sa_len_) :
-    ws_address_t (sa_, sa_len_)
-{
-}
-
-int zmq::wss_address_t::to_string (std::string &addr_) const
-{
-    std::ostringstream os;
-    os << std::string ("wss://") << host () << std::string (":")
-       << _address.port () << path ();
-    addr_ = os.str ();
-
-    return 0;
-}
diff --git a/src/wss_address.hpp b/src/wss_address.hpp
deleted file mode 100644
index ec6a90338..000000000
--- a/src/wss_address.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    Copyright (c) 2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WSS_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_WSS_ADDRESS_HPP_INCLUDED__
-
-#include "ws_address.hpp"
-
-namespace zmq
-{
-class wss_address_t : public ws_address_t
-{
-  public:
-    wss_address_t ();
-    wss_address_t (const sockaddr *sa_, socklen_t sa_len_);
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-};
-}
-
-#endif
diff --git a/src/wss_engine.cpp b/src/wss_engine.cpp
deleted file mode 100644
index f5a4645d4..000000000
--- a/src/wss_engine.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "wss_engine.hpp"
-
-static int verify_certificate_callback (gnutls_session_t session)
-{
-    unsigned int status;
-    const char *hostname;
-
-    // read hostname
-    hostname = (const char *) gnutls_session_get_ptr (session);
-
-    int rc = gnutls_certificate_verify_peers3 (session, hostname, &status);
-    assert (rc >= 0);
-
-    if (status != 0) {
-        // TODO: somehow log the error
-        // Certificate is not trusted
-        return GNUTLS_E_CERTIFICATE_ERROR;
-    }
-
-    // notify gnutls to continue handshake normally
-    return 0;
-}
-
-
-zmq::wss_engine_t::wss_engine_t (fd_t fd_,
-                                 const options_t &options_,
-                                 const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                 ws_address_t &address_,
-                                 bool client_,
-                                 void *tls_server_cred_,
-                                 const std::string &hostname_) :
-    ws_engine_t (fd_, options_, endpoint_uri_pair_, address_, client_),
-    _established (false),
-    _tls_client_cred (NULL)
-{
-    int rc = 0;
-
-    if (client_) {
-        // TODO: move to session_base, to allow changing the socket options between connect calls
-        rc = gnutls_certificate_allocate_credentials (&_tls_client_cred);
-        assert (rc == 0);
-
-        if (options_.wss_trust_system)
-            gnutls_certificate_set_x509_system_trust (_tls_client_cred);
-
-        if (options_.wss_trust_pem.length () > 0) {
-            gnutls_datum_t trust = {
-              (unsigned char *) options_.wss_trust_pem.c_str (),
-              (unsigned int) options_.wss_trust_pem.length ()};
-            rc = gnutls_certificate_set_x509_trust_mem (
-              _tls_client_cred, &trust, GNUTLS_X509_FMT_PEM);
-            assert (rc >= 0);
-        }
-
-        gnutls_certificate_set_verify_function (_tls_client_cred,
-                                                verify_certificate_callback);
-
-        rc = gnutls_init (&_tls_session, GNUTLS_CLIENT | GNUTLS_NONBLOCK);
-        assert (rc == GNUTLS_E_SUCCESS);
-
-        if (!hostname_.empty ())
-            gnutls_server_name_set (_tls_session, GNUTLS_NAME_DNS,
-                                    hostname_.c_str (), hostname_.size ());
-
-        gnutls_session_set_ptr (
-          _tls_session,
-          hostname_.empty () ? NULL : const_cast<char *> (hostname_.c_str ()));
-
-        rc = gnutls_credentials_set (_tls_session, GNUTLS_CRD_CERTIFICATE,
-                                     _tls_client_cred);
-        assert (rc == GNUTLS_E_SUCCESS);
-    } else {
-        assert (tls_server_cred_);
-
-        rc = gnutls_init (&_tls_session, GNUTLS_SERVER | GNUTLS_NONBLOCK);
-        assert (rc == GNUTLS_E_SUCCESS);
-
-        rc = gnutls_credentials_set (_tls_session, GNUTLS_CRD_CERTIFICATE,
-                                     tls_server_cred_);
-        assert (rc == GNUTLS_E_SUCCESS);
-    }
-
-    gnutls_set_default_priority (_tls_session);
-    gnutls_transport_set_int (_tls_session, fd_);
-}
-
-zmq::wss_engine_t::~wss_engine_t ()
-{
-    gnutls_deinit (_tls_session);
-
-    if (_tls_client_cred)
-        gnutls_certificate_free_credentials (_tls_client_cred);
-}
-
-void zmq::wss_engine_t::plug_internal ()
-{
-    set_pollin ();
-    in_event ();
-}
-
-void zmq::wss_engine_t::out_event ()
-{
-    if (_established)
-        return ws_engine_t::out_event ();
-
-    int rc = gnutls_handshake (_tls_session);
-
-    reset_pollout ();
-
-    if (rc == GNUTLS_E_SUCCESS) {
-        start_ws_handshake ();
-        _established = true;
-        return;
-    } else if (rc == GNUTLS_E_AGAIN) {
-        int direction = gnutls_record_get_direction (_tls_session);
-        if (direction == 1)
-            set_pollout ();
-
-        return;
-    } else if (rc == GNUTLS_E_INTERRUPTED
-               || rc == GNUTLS_E_WARNING_ALERT_RECEIVED) {
-        return;
-    } else {
-        error (zmq::i_engine::connection_error);
-        return;
-    }
-}
-
-bool zmq::wss_engine_t::handshake ()
-{
-    if (!_established) {
-        int rc = gnutls_handshake (_tls_session);
-
-        if (rc == GNUTLS_E_SUCCESS) {
-            start_ws_handshake ();
-            _established = true;
-            return false;
-        } else if (rc == GNUTLS_E_AGAIN) {
-            int direction = gnutls_record_get_direction (_tls_session);
-            if (direction == 1)
-                set_pollout ();
-
-            return false;
-        } else if (rc == GNUTLS_E_INTERRUPTED
-                   || rc == GNUTLS_E_WARNING_ALERT_RECEIVED) {
-            return false;
-        } else {
-            error (zmq::i_engine::connection_error);
-            return false;
-        }
-    }
-
-    return ws_engine_t::handshake ();
-}
-
-int zmq::wss_engine_t::read (void *data_, size_t size_)
-{
-    ssize_t rc = gnutls_record_recv (_tls_session, data_, size_);
-
-    if (rc == GNUTLS_E_REHANDSHAKE) {
-        gnutls_alert_send (_tls_session, GNUTLS_AL_WARNING,
-                           GNUTLS_A_NO_RENEGOTIATION);
-        return 0;
-    }
-
-    if (rc == GNUTLS_E_INTERRUPTED) {
-        errno = EINTR;
-        return -1;
-    }
-
-    if (rc == GNUTLS_E_AGAIN) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (rc < 0) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    // TODO: change return type to ssize_t (signed)
-    return rc;
-}
-
-int zmq::wss_engine_t::write (const void *data_, size_t size_)
-{
-    ssize_t rc = gnutls_record_send (_tls_session, data_, size_);
-
-    if (rc == GNUTLS_E_INTERRUPTED) {
-        errno = EINTR;
-        return -1;
-    }
-
-    if (rc == GNUTLS_E_AGAIN) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (rc < 0) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    // TODO: change return type to ssize_t (signed)
-    return rc;
-}
diff --git a/src/wss_engine.hpp b/src/wss_engine.hpp
deleted file mode 100644
index adfaf4549..000000000
--- a/src/wss_engine.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WSS_ENGINE_HPP_INCLUDED__
-#define __ZMQ_WSS_ENGINE_HPP_INCLUDED__
-
-#include <gnutls/gnutls.h>
-#include "ws_engine.hpp"
-
-#define WSS_BUFFER_SIZE 8192
-
-namespace zmq
-{
-class wss_engine_t : public ws_engine_t
-{
-  public:
-    wss_engine_t (fd_t fd_,
-                  const options_t &options_,
-                  const endpoint_uri_pair_t &endpoint_uri_pair_,
-                  ws_address_t &address_,
-                  bool client_,
-                  void *tls_server_cred_,
-                  const std::string &hostname_);
-    ~wss_engine_t ();
-
-    void out_event ();
-
-  protected:
-    bool handshake ();
-    void plug_internal ();
-    int read (void *data, size_t size_);
-    int write (const void *data_, size_t size_);
-
-
-  private:
-    bool _established;
-    gnutls_certificate_credentials_t _tls_client_cred;
-    gnutls_session_t _tls_session;
-};
-}
-
-#endif
diff --git a/src/xpub.cpp b/src/xpub.cpp
deleted file mode 100644
index 677af36a9..000000000
--- a/src/xpub.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-
-#include "xpub.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "macros.hpp"
-#include "generic_mtrie_impl.hpp"
-
-zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_),
-    _verbose_subs (false),
-    _verbose_unsubs (false),
-    _more_send (false),
-    _more_recv (false),
-    _process_subscribe (false),
-    _only_first_subscribe (false),
-    _lossy (true),
-    _manual (false),
-    _send_last_pipe (false),
-    _pending_pipes (),
-    _welcome_msg ()
-{
-    _last_pipe = NULL;
-    options.type = ZMQ_XPUB;
-    _welcome_msg.init ();
-}
-
-zmq::xpub_t::~xpub_t ()
-{
-    _welcome_msg.close ();
-    for (std::deque<metadata_t *>::iterator it = _pending_metadata.begin (),
-                                            end = _pending_metadata.end ();
-         it != end; ++it)
-        if (*it && (*it)->drop_ref ())
-            LIBZMQ_DELETE (*it);
-}
-
-void zmq::xpub_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _dist.attach (pipe_);
-
-    //  If subscribe_to_all_ is specified, the caller would like to subscribe
-    //  to all data on this pipe, implicitly.
-    if (subscribe_to_all_)
-        _subscriptions.add (NULL, 0, pipe_);
-
-    // if welcome message exists, send a copy of it
-    if (_welcome_msg.size () > 0) {
-        msg_t copy;
-        copy.init ();
-        const int rc = copy.copy (_welcome_msg);
-        errno_assert (rc == 0);
-        const bool ok = pipe_->write (&copy);
-        zmq_assert (ok);
-        pipe_->flush ();
-    }
-
-    //  The pipe is active when attached. Let's read the subscriptions from
-    //  it, if any.
-    xread_activated (pipe_);
-}
-
-void zmq::xpub_t::xread_activated (pipe_t *pipe_)
-{
-    //  There are some subscriptions waiting. Let's process them.
-    msg_t msg;
-    while (pipe_->read (&msg)) {
-        metadata_t *metadata = msg.metadata ();
-        unsigned char *msg_data = static_cast<unsigned char *> (msg.data ()),
-                      *data = NULL;
-        size_t size = 0;
-        bool subscribe = false;
-        bool is_subscribe_or_cancel = false;
-        bool notify = false;
-
-        const bool first_part = !_more_recv;
-        _more_recv = (msg.flags () & msg_t::more) != 0;
-
-        if (first_part || _process_subscribe) {
-            //  Apply the subscription to the trie
-            if (msg.is_subscribe () || msg.is_cancel ()) {
-                data = static_cast<unsigned char *> (msg.command_body ());
-                size = msg.command_body_size ();
-                subscribe = msg.is_subscribe ();
-                is_subscribe_or_cancel = true;
-            } else if (msg.size () > 0 && (*msg_data == 0 || *msg_data == 1)) {
-                data = msg_data + 1;
-                size = msg.size () - 1;
-                subscribe = *msg_data == 1;
-                is_subscribe_or_cancel = true;
-            }
-        }
-
-        if (first_part)
-            _process_subscribe =
-              !_only_first_subscribe || is_subscribe_or_cancel;
-
-        if (!is_subscribe_or_cancel && options.type != ZMQ_PUB) {
-            //  Process user message coming upstream from xsub socket,
-            //  but not if the type is PUB, which never processes user
-            //  messages
-            _pending_data.push_back (blob_t (msg_data, msg.size ()));
-            if (metadata)
-                metadata->add_ref ();
-            _pending_metadata.push_back (metadata);
-            _pending_flags.push_back (msg.flags ());
-            msg.close ();
-            continue;
-        }
-
-        if (_manual) {
-            // Store manual subscription to use on termination
-            if (!subscribe)
-                _manual_subscriptions.rm (data, size, pipe_);
-            else
-                _manual_subscriptions.add (data, size, pipe_);
-
-            _pending_pipes.push_back (pipe_);
-        } else {
-            if (!subscribe) {
-                const mtrie_t::rm_result rm_result =
-                  _subscriptions.rm (data, size, pipe_);
-                //  TODO reconsider what to do if rm_result == mtrie_t::not_found
-                notify = rm_result != mtrie_t::values_remain || _verbose_unsubs;
-            } else {
-                const bool first_added = _subscriptions.add (data, size, pipe_);
-                notify = first_added || _verbose_subs;
-            }
-        }
-
-        //  If the request was a new subscription, or the subscription
-        //  was removed, or verbose mode or manual mode are enabled, store it
-        //  so that it can be passed to the user on next recv call.
-        if (_manual || (options.type == ZMQ_XPUB && notify)) {
-            //  ZMTP 3.1 hack: we need to support sub/cancel commands, but
-            //  we can't give them back to userspace as it would be an API
-            //  breakage since the payload of the message is completely
-            //  different. Manually craft an old-style message instead.
-            //  Although with other transports it would be possible to simply
-            //  reuse the same buffer and prefix a 0/1 byte to the topic, with
-            //  inproc the subscribe/cancel command string is not present in
-            //  the message, so this optimization is not possible.
-            //  The pushback makes a copy of the data array anyway, so the
-            //  number of buffer copies does not change.
-            blob_t notification (size + 1);
-            if (subscribe)
-                *notification.data () = 1;
-            else
-                *notification.data () = 0;
-            memcpy (notification.data () + 1, data, size);
-
-            _pending_data.push_back (ZMQ_MOVE (notification));
-            if (metadata)
-                metadata->add_ref ();
-            _pending_metadata.push_back (metadata);
-            _pending_flags.push_back (0);
-        }
-
-        msg.close ();
-    }
-}
-
-void zmq::xpub_t::xwrite_activated (pipe_t *pipe_)
-{
-    _dist.activated (pipe_);
-}
-
-int zmq::xpub_t::xsetsockopt (int option_,
-                              const void *optval_,
-                              size_t optvallen_)
-{
-    if (option_ == ZMQ_XPUB_VERBOSE || option_ == ZMQ_XPUB_VERBOSER
-        || option_ == ZMQ_XPUB_MANUAL_LAST_VALUE || option_ == ZMQ_XPUB_NODROP
-        || option_ == ZMQ_XPUB_MANUAL || option_ == ZMQ_ONLY_FIRST_SUBSCRIBE) {
-        if (optvallen_ != sizeof (int)
-            || *static_cast<const int *> (optval_) < 0) {
-            errno = EINVAL;
-            return -1;
-        }
-        if (option_ == ZMQ_XPUB_VERBOSE) {
-            _verbose_subs = (*static_cast<const int *> (optval_) != 0);
-            _verbose_unsubs = false;
-        } else if (option_ == ZMQ_XPUB_VERBOSER) {
-            _verbose_subs = (*static_cast<const int *> (optval_) != 0);
-            _verbose_unsubs = _verbose_subs;
-        } else if (option_ == ZMQ_XPUB_MANUAL_LAST_VALUE) {
-            _manual = (*static_cast<const int *> (optval_) != 0);
-            _send_last_pipe = _manual;
-        } else if (option_ == ZMQ_XPUB_NODROP)
-            _lossy = (*static_cast<const int *> (optval_) == 0);
-        else if (option_ == ZMQ_XPUB_MANUAL)
-            _manual = (*static_cast<const int *> (optval_) != 0);
-        else if (option_ == ZMQ_ONLY_FIRST_SUBSCRIBE)
-            _only_first_subscribe = (*static_cast<const int *> (optval_) != 0);
-    } else if (option_ == ZMQ_SUBSCRIBE && _manual) {
-        if (_last_pipe != NULL)
-            _subscriptions.add ((unsigned char *) optval_, optvallen_,
-                                _last_pipe);
-    } else if (option_ == ZMQ_UNSUBSCRIBE && _manual) {
-        if (_last_pipe != NULL)
-            _subscriptions.rm ((unsigned char *) optval_, optvallen_,
-                               _last_pipe);
-    } else if (option_ == ZMQ_XPUB_WELCOME_MSG) {
-        _welcome_msg.close ();
-
-        if (optvallen_ > 0) {
-            const int rc = _welcome_msg.init_size (optvallen_);
-            errno_assert (rc == 0);
-
-            unsigned char *data =
-              static_cast<unsigned char *> (_welcome_msg.data ());
-            memcpy (data, optval_, optvallen_);
-        } else
-            _welcome_msg.init ();
-    } else {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
-
-static void stub (zmq::mtrie_t::prefix_t data_, size_t size_, void *arg_)
-{
-    LIBZMQ_UNUSED (data_);
-    LIBZMQ_UNUSED (size_);
-    LIBZMQ_UNUSED (arg_);
-}
-
-void zmq::xpub_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (_manual) {
-        //  Remove the pipe from the trie and send corresponding manual
-        //  unsubscriptions upstream.
-        _manual_subscriptions.rm (pipe_, send_unsubscription, this, false);
-        //  Remove pipe without actually sending the message as it was taken
-        //  care of by the manual call above. subscriptions is the real mtrie,
-        //  so the pipe must be removed from there or it will be left over.
-        _subscriptions.rm (pipe_, stub, static_cast<void *> (NULL), false);
-    } else {
-        //  Remove the pipe from the trie. If there are topics that nobody
-        //  is interested in anymore, send corresponding unsubscriptions
-        //  upstream.
-        _subscriptions.rm (pipe_, send_unsubscription, this, !_verbose_unsubs);
-    }
-
-    _dist.pipe_terminated (pipe_);
-}
-
-void zmq::xpub_t::mark_as_matching (pipe_t *pipe_, xpub_t *self_)
-{
-    self_->_dist.match (pipe_);
-}
-
-void zmq::xpub_t::mark_last_pipe_as_matching (pipe_t *pipe_, xpub_t *self_)
-{
-    if (self_->_last_pipe == pipe_)
-        self_->_dist.match (pipe_);
-}
-
-int zmq::xpub_t::xsend (msg_t *msg_)
-{
-    const bool msg_more = (msg_->flags () & msg_t::more) != 0;
-
-    //  For the first part of multi-part message, find the matching pipes.
-    if (!_more_send) {
-        if (unlikely (_manual && _last_pipe && _send_last_pipe)) {
-            _subscriptions.match (static_cast<unsigned char *> (msg_->data ()),
-                                  msg_->size (), mark_last_pipe_as_matching,
-                                  this);
-            _last_pipe = NULL;
-        } else
-            _subscriptions.match (static_cast<unsigned char *> (msg_->data ()),
-                                  msg_->size (), mark_as_matching, this);
-        // If inverted matching is used, reverse the selection now
-        if (options.invert_matching) {
-            _dist.reverse_match ();
-        }
-    }
-
-    int rc = -1; //  Assume we fail
-    if (_lossy || _dist.check_hwm ()) {
-        if (_dist.send_to_matching (msg_) == 0) {
-            //  If we are at the end of multi-part message we can mark
-            //  all the pipes as non-matching.
-            if (!msg_more)
-                _dist.unmatch ();
-            _more_send = msg_more;
-            rc = 0; //  Yay, sent successfully
-        }
-    } else
-        errno = EAGAIN;
-    return rc;
-}
-
-bool zmq::xpub_t::xhas_out ()
-{
-    return _dist.has_out ();
-}
-
-int zmq::xpub_t::xrecv (msg_t *msg_)
-{
-    //  If there is at least one
-    if (_pending_data.empty ()) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    // User is reading a message, set last_pipe and remove it from the deque
-    if (_manual && !_pending_pipes.empty ()) {
-        _last_pipe = _pending_pipes.front ();
-        _pending_pipes.pop_front ();
-    }
-
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-    rc = msg_->init_size (_pending_data.front ().size ());
-    errno_assert (rc == 0);
-    memcpy (msg_->data (), _pending_data.front ().data (),
-            _pending_data.front ().size ());
-
-    // set metadata only if there is some
-    if (metadata_t *metadata = _pending_metadata.front ()) {
-        msg_->set_metadata (metadata);
-        // Remove ref corresponding to vector placement
-        metadata->drop_ref ();
-    }
-
-    msg_->set_flags (_pending_flags.front ());
-    _pending_data.pop_front ();
-    _pending_metadata.pop_front ();
-    _pending_flags.pop_front ();
-    return 0;
-}
-
-bool zmq::xpub_t::xhas_in ()
-{
-    return !_pending_data.empty ();
-}
-
-void zmq::xpub_t::send_unsubscription (zmq::mtrie_t::prefix_t data_,
-                                       size_t size_,
-                                       xpub_t *self_)
-{
-    if (self_->options.type != ZMQ_PUB) {
-        //  Place the unsubscription to the queue of pending (un)subscriptions
-        //  to be retrieved by the user later on.
-        blob_t unsub (size_ + 1);
-        *unsub.data () = 0;
-        if (size_ > 0)
-            memcpy (unsub.data () + 1, data_, size_);
-        self_->_pending_data.ZMQ_PUSH_OR_EMPLACE_BACK (ZMQ_MOVE (unsub));
-        self_->_pending_metadata.push_back (NULL);
-        self_->_pending_flags.push_back (0);
-
-        if (self_->_manual) {
-            self_->_last_pipe = NULL;
-            self_->_pending_pipes.push_back (NULL);
-        }
-    }
-}
diff --git a/src/xpub.hpp b/src/xpub.hpp
deleted file mode 100644
index 82504b0e2..000000000
--- a/src/xpub.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_XPUB_HPP_INCLUDED__
-#define __ZMQ_XPUB_HPP_INCLUDED__
-
-#include <deque>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "mtrie.hpp"
-#include "dist.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class xpub_t : public socket_base_t
-{
-  public:
-    xpub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~xpub_t () ZMQ_OVERRIDE;
-
-    //  Implementations of virtual functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_ = false,
-                       bool locally_initiated_ = false) ZMQ_OVERRIDE;
-    int xsend (zmq::msg_t *msg_) ZMQ_FINAL;
-    bool xhas_out () ZMQ_FINAL;
-    int xrecv (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    bool xhas_in () ZMQ_OVERRIDE;
-    void xread_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xwrite_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    int
-    xsetsockopt (int option_, const void *optval_, size_t optvallen_) ZMQ_FINAL;
-    void xpipe_terminated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-
-  private:
-    //  Function to be applied to the trie to send all the subscriptions
-    //  upstream.
-    static void send_unsubscription (zmq::mtrie_t::prefix_t data_,
-                                     size_t size_,
-                                     xpub_t *self_);
-
-    //  Function to be applied to each matching pipes.
-    static void mark_as_matching (zmq::pipe_t *pipe_, xpub_t *self_);
-
-    //  List of all subscriptions mapped to corresponding pipes.
-    mtrie_t _subscriptions;
-
-    //  List of manual subscriptions mapped to corresponding pipes.
-    mtrie_t _manual_subscriptions;
-
-    //  Distributor of messages holding the list of outbound pipes.
-    dist_t _dist;
-
-    // If true, send all subscription messages upstream, not just
-    // unique ones
-    bool _verbose_subs;
-
-    // If true, send all unsubscription messages upstream, not just
-    // unique ones
-    bool _verbose_unsubs;
-
-    //  True if we are in the middle of sending a multi-part message.
-    bool _more_send;
-
-    //  True if we are in the middle of receiving a multi-part message.
-    bool _more_recv;
-
-    //  If true, subscribe and cancel messages are processed for the rest
-    //  of multipart message.
-    bool _process_subscribe;
-
-    //  This option is enabled with ZMQ_ONLY_FIRST_SUBSCRIBE.
-    //  If true, messages following subscribe/unsubscribe in a multipart
-    //  message are treated as user data regardless of the first byte.
-    bool _only_first_subscribe;
-
-    //  Drop messages if HWM reached, otherwise return with EAGAIN
-    bool _lossy;
-
-    //  Subscriptions will not bed added automatically, only after calling set option with ZMQ_SUBSCRIBE or ZMQ_UNSUBSCRIBE
-    bool _manual;
-
-    //  Send message to the last pipe, only used if xpub is on manual and after calling set option with ZMQ_SUBSCRIBE
-    bool _send_last_pipe;
-
-    //  Function to be applied to match the last pipe.
-    static void mark_last_pipe_as_matching (zmq::pipe_t *pipe_, xpub_t *self_);
-
-    //  Last pipe that sent subscription message, only used if xpub is on manual
-    pipe_t *_last_pipe;
-
-    // Pipes that sent subscriptions messages that have not yet been processed, only used if xpub is on manual
-    std::deque<pipe_t *> _pending_pipes;
-
-    //  Welcome message to send to pipe when attached
-    msg_t _welcome_msg;
-
-    //  List of pending (un)subscriptions, ie. those that were already
-    //  applied to the trie, but not yet received by the user.
-    std::deque<blob_t> _pending_data;
-    std::deque<metadata_t *> _pending_metadata;
-    std::deque<unsigned char> _pending_flags;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (xpub_t)
-};
-}
-
-#endif
diff --git a/src/xsub.cpp b/src/xsub.cpp
deleted file mode 100644
index 66c4d16b1..000000000
--- a/src/xsub.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-
-#include "macros.hpp"
-#include "xsub.hpp"
-#include "err.hpp"
-
-zmq::xsub_t::xsub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_),
-    _has_message (false),
-    _more_send (false),
-    _more_recv (false),
-    _process_subscribe (false),
-    _only_first_subscribe (false)
-{
-    options.type = ZMQ_XSUB;
-
-    //  When socket is being closed down we don't want to wait till pending
-    //  subscription commands are sent to the wire.
-    options.linger.store (0);
-
-    const int rc = _message.init ();
-    errno_assert (rc == 0);
-}
-
-zmq::xsub_t::~xsub_t ()
-{
-    const int rc = _message.close ();
-    errno_assert (rc == 0);
-}
-
-void zmq::xsub_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _fq.attach (pipe_);
-    _dist.attach (pipe_);
-
-    //  Send all the cached subscriptions to the new upstream peer.
-    _subscriptions.apply (send_subscription, pipe_);
-    pipe_->flush ();
-}
-
-void zmq::xsub_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::xsub_t::xwrite_activated (pipe_t *pipe_)
-{
-    _dist.activated (pipe_);
-}
-
-void zmq::xsub_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-    _dist.pipe_terminated (pipe_);
-}
-
-void zmq::xsub_t::xhiccuped (pipe_t *pipe_)
-{
-    //  Send all the cached subscriptions to the hiccuped pipe.
-    _subscriptions.apply (send_subscription, pipe_);
-    pipe_->flush ();
-}
-
-int zmq::xsub_t::xsetsockopt (int option_,
-                              const void *optval_,
-                              size_t optvallen_)
-{
-    if (option_ == ZMQ_ONLY_FIRST_SUBSCRIBE) {
-        if (optvallen_ != sizeof (int)
-            || *static_cast<const int *> (optval_) < 0) {
-            errno = EINVAL;
-            return -1;
-        }
-        _only_first_subscribe = (*static_cast<const int *> (optval_) != 0);
-        return 0;
-    }
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::xsub_t::xsend (msg_t *msg_)
-{
-    size_t size = msg_->size ();
-    unsigned char *data = static_cast<unsigned char *> (msg_->data ());
-
-    const bool first_part = !_more_send;
-    _more_send = (msg_->flags () & msg_t::more) != 0;
-
-    if (first_part) {
-        _process_subscribe = !_only_first_subscribe;
-    } else if (!_process_subscribe) {
-        //  User message sent upstream to XPUB socket
-        return _dist.send_to_all (msg_);
-    }
-
-    if (msg_->is_subscribe () || (size > 0 && *data == 1)) {
-        //  Process subscribe message
-        //  This used to filter out duplicate subscriptions,
-        //  however this is alread done on the XPUB side and
-        //  doing it here as well breaks ZMQ_XPUB_VERBOSE
-        //  when there are forwarding devices involved.
-        if (!msg_->is_subscribe ()) {
-            data = data + 1;
-            size = size - 1;
-        }
-        _subscriptions.add (data, size);
-        _process_subscribe = true;
-        return _dist.send_to_all (msg_);
-    }
-    if (msg_->is_cancel () || (size > 0 && *data == 0)) {
-        //  Process unsubscribe message
-        if (!msg_->is_cancel ()) {
-            data = data + 1;
-            size = size - 1;
-        }
-        _process_subscribe = true;
-        if (_subscriptions.rm (data, size))
-            return _dist.send_to_all (msg_);
-    } else
-        //  User message sent upstream to XPUB socket
-        return _dist.send_to_all (msg_);
-
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-    rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-bool zmq::xsub_t::xhas_out ()
-{
-    //  Subscription can be added/removed anytime.
-    return true;
-}
-
-int zmq::xsub_t::xrecv (msg_t *msg_)
-{
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return it straight ahead.
-    if (_has_message) {
-        const int rc = msg_->move (_message);
-        errno_assert (rc == 0);
-        _has_message = false;
-        _more_recv = (msg_->flags () & msg_t::more) != 0;
-        return 0;
-    }
-
-    //  TODO: This can result in infinite loop in the case of continuous
-    //  stream of non-matching messages which breaks the non-blocking recv
-    //  semantics.
-    while (true) {
-        //  Get a message using fair queueing algorithm.
-        int rc = _fq.recv (msg_);
-
-        //  If there's no message available, return immediately.
-        //  The same when error occurs.
-        if (rc != 0)
-            return -1;
-
-        //  Check whether the message matches at least one subscription.
-        //  Non-initial parts of the message are passed
-        if (_more_recv || !options.filter || match (msg_)) {
-            _more_recv = (msg_->flags () & msg_t::more) != 0;
-            return 0;
-        }
-
-        //  Message doesn't match. Pop any remaining parts of the message
-        //  from the pipe.
-        while (msg_->flags () & msg_t::more) {
-            rc = _fq.recv (msg_);
-            errno_assert (rc == 0);
-        }
-    }
-}
-
-bool zmq::xsub_t::xhas_in ()
-{
-    //  There are subsequent parts of the partly-read message available.
-    if (_more_recv)
-        return true;
-
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return straight ahead.
-    if (_has_message)
-        return true;
-
-    //  TODO: This can result in infinite loop in the case of continuous
-    //  stream of non-matching messages.
-    while (true) {
-        //  Get a message using fair queueing algorithm.
-        int rc = _fq.recv (&_message);
-
-        //  If there's no message available, return immediately.
-        //  The same when error occurs.
-        if (rc != 0) {
-            errno_assert (errno == EAGAIN);
-            return false;
-        }
-
-        //  Check whether the message matches at least one subscription.
-        if (!options.filter || match (&_message)) {
-            _has_message = true;
-            return true;
-        }
-
-        //  Message doesn't match. Pop any remaining parts of the message
-        //  from the pipe.
-        while (_message.flags () & msg_t::more) {
-            rc = _fq.recv (&_message);
-            errno_assert (rc == 0);
-        }
-    }
-}
-
-bool zmq::xsub_t::match (msg_t *msg_)
-{
-    const bool matching = _subscriptions.check (
-      static_cast<unsigned char *> (msg_->data ()), msg_->size ());
-
-    return matching ^ options.invert_matching;
-}
-
-void zmq::xsub_t::send_subscription (unsigned char *data_,
-                                     size_t size_,
-                                     void *arg_)
-{
-    pipe_t *pipe = static_cast<pipe_t *> (arg_);
-
-    //  Create the subscription message.
-    msg_t msg;
-    const int rc = msg.init_subscribe (size_, data_);
-    errno_assert (rc == 0);
-
-    //  Send it to the pipe.
-    const bool sent = pipe->write (&msg);
-    //  If we reached the SNDHWM, and thus cannot send the subscription, drop
-    //  the subscription message instead. This matches the behaviour of
-    //  zmq_setsockopt(ZMQ_SUBSCRIBE, ...), which also drops subscriptions
-    //  when the SNDHWM is reached.
-    if (!sent)
-        msg.close ();
-}
diff --git a/src/xsub.hpp b/src/xsub.hpp
deleted file mode 100644
index 6bbbce072..000000000
--- a/src/xsub.hpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_XSUB_HPP_INCLUDED__
-#define __ZMQ_XSUB_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "dist.hpp"
-#include "fq.hpp"
-#ifdef ZMQ_USE_RADIX_TREE
-#include "radix_tree.hpp"
-#else
-#include "trie.hpp"
-#endif
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class io_thread_t;
-
-class xsub_t : public socket_base_t
-{
-  public:
-    xsub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~xsub_t () ZMQ_OVERRIDE;
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_) ZMQ_FINAL;
-    int xsetsockopt (int option_,
-                     const void *optval_,
-                     size_t optvallen_) ZMQ_OVERRIDE;
-    int xsend (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    bool xhas_out () ZMQ_OVERRIDE;
-    int xrecv (zmq::msg_t *msg_) ZMQ_FINAL;
-    bool xhas_in () ZMQ_FINAL;
-    void xread_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xwrite_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xhiccuped (pipe_t *pipe_) ZMQ_FINAL;
-    void xpipe_terminated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-
-  private:
-    //  Check whether the message matches at least one subscription.
-    bool match (zmq::msg_t *msg_);
-
-    //  Function to be applied to the trie to send all the subsciptions
-    //  upstream.
-    static void
-    send_subscription (unsigned char *data_, size_t size_, void *arg_);
-
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    //  Object for distributing the subscriptions upstream.
-    dist_t _dist;
-
-    //  The repository of subscriptions.
-#ifdef ZMQ_USE_RADIX_TREE
-    radix_tree_t _subscriptions;
-#else
-    trie_t _subscriptions;
-#endif
-
-    //  If true, 'message' contains a matching message to return on the
-    //  next recv call.
-    bool _has_message;
-    msg_t _message;
-
-    //  If true, part of a multipart message was already sent, but
-    //  there are following parts still waiting.
-    bool _more_send;
-
-    //  If true, part of a multipart message was already received, but
-    //  there are following parts still waiting.
-    bool _more_recv;
-
-    //  If true, subscribe and cancel messages are processed for the rest
-    //  of multipart message.
-    bool _process_subscribe;
-
-    //  This option is enabled with ZMQ_ONLY_FIRST_SUBSCRIBE.
-    //  If true, messages following subscribe/unsubscribe in a multipart
-    //  message are treated as user data regardless of the first byte.
-    bool _only_first_subscribe;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (xsub_t)
-};
-}
-
-#endif
diff --git a/src/ypipe.hpp b/src/ypipe.hpp
deleted file mode 100644
index e30878f9f..000000000
--- a/src/ypipe.hpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_YPIPE_HPP_INCLUDED__
-#define __ZMQ_YPIPE_HPP_INCLUDED__
-
-#include "atomic_ptr.hpp"
-#include "yqueue.hpp"
-#include "ypipe_base.hpp"
-
-namespace zmq
-{
-//  Lock-free queue implementation.
-//  Only a single thread can read from the pipe at any specific moment.
-//  Only a single thread can write to the pipe at any specific moment.
-//  T is the type of the object in the queue.
-//  N is granularity of the pipe, i.e. how many items are needed to
-//  perform next memory allocation.
-
-template <typename T, int N> class ypipe_t ZMQ_FINAL : public ypipe_base_t<T>
-{
-  public:
-    //  Initialises the pipe.
-    ypipe_t ()
-    {
-        //  Insert terminator element into the queue.
-        _queue.push ();
-
-        //  Let all the pointers to point to the terminator.
-        //  (unless pipe is dead, in which case c is set to NULL).
-        _r = _w = _f = &_queue.back ();
-        _c.set (&_queue.back ());
-    }
-
-    //  Following function (write) deliberately copies uninitialised data
-    //  when used with zmq_msg. Initialising the VSM body for
-    //  non-VSM messages won't be good for performance.
-
-#ifdef ZMQ_HAVE_OPENVMS
-#pragma message save
-#pragma message disable(UNINIT)
-#endif
-
-    //  Write an item to the pipe.  Don't flush it yet. If incomplete is
-    //  set to true the item is assumed to be continued by items
-    //  subsequently written to the pipe. Incomplete items are never
-    //  flushed down the stream.
-    void write (const T &value_, bool incomplete_)
-    {
-        //  Place the value to the queue, add new terminator element.
-        _queue.back () = value_;
-        _queue.push ();
-
-        //  Move the "flush up to here" poiter.
-        if (!incomplete_)
-            _f = &_queue.back ();
-    }
-
-#ifdef ZMQ_HAVE_OPENVMS
-#pragma message restore
-#endif
-
-    //  Pop an incomplete item from the pipe. Returns true if such
-    //  item exists, false otherwise.
-    bool unwrite (T *value_)
-    {
-        if (_f == &_queue.back ())
-            return false;
-        _queue.unpush ();
-        *value_ = _queue.back ();
-        return true;
-    }
-
-    //  Flush all the completed items into the pipe. Returns false if
-    //  the reader thread is sleeping. In that case, caller is obliged to
-    //  wake the reader up before using the pipe again.
-    bool flush ()
-    {
-        //  If there are no un-flushed items, do nothing.
-        if (_w == _f)
-            return true;
-
-        //  Try to set 'c' to 'f'.
-        if (_c.cas (_w, _f) != _w) {
-            //  Compare-and-swap was unseccessful because 'c' is NULL.
-            //  This means that the reader is asleep. Therefore we don't
-            //  care about thread-safeness and update c in non-atomic
-            //  manner. We'll return false to let the caller know
-            //  that reader is sleeping.
-            _c.set (_f);
-            _w = _f;
-            return false;
-        }
-
-        //  Reader is alive. Nothing special to do now. Just move
-        //  the 'first un-flushed item' pointer to 'f'.
-        _w = _f;
-        return true;
-    }
-
-    //  Check whether item is available for reading.
-    bool check_read ()
-    {
-        //  Was the value prefetched already? If so, return.
-        if (&_queue.front () != _r && _r)
-            return true;
-
-        //  There's no prefetched value, so let us prefetch more values.
-        //  Prefetching is to simply retrieve the
-        //  pointer from c in atomic fashion. If there are no
-        //  items to prefetch, set c to NULL (using compare-and-swap).
-        _r = _c.cas (&_queue.front (), NULL);
-
-        //  If there are no elements prefetched, exit.
-        //  During pipe's lifetime r should never be NULL, however,
-        //  it can happen during pipe shutdown when items
-        //  are being deallocated.
-        if (&_queue.front () == _r || !_r)
-            return false;
-
-        //  There was at least one value prefetched.
-        return true;
-    }
-
-    //  Reads an item from the pipe. Returns false if there is no value.
-    //  available.
-    bool read (T *value_)
-    {
-        //  Try to prefetch a value.
-        if (!check_read ())
-            return false;
-
-        //  There was at least one value prefetched.
-        //  Return it to the caller.
-        *value_ = _queue.front ();
-        _queue.pop ();
-        return true;
-    }
-
-    //  Applies the function fn to the first elemenent in the pipe
-    //  and returns the value returned by the fn.
-    //  The pipe mustn't be empty or the function crashes.
-    bool probe (bool (*fn_) (const T &))
-    {
-        const bool rc = check_read ();
-        zmq_assert (rc);
-
-        return (*fn_) (_queue.front ());
-    }
-
-  protected:
-    //  Allocation-efficient queue to store pipe items.
-    //  Front of the queue points to the first prefetched item, back of
-    //  the pipe points to last un-flushed item. Front is used only by
-    //  reader thread, while back is used only by writer thread.
-    yqueue_t<T, N> _queue;
-
-    //  Points to the first un-flushed item. This variable is used
-    //  exclusively by writer thread.
-    T *_w;
-
-    //  Points to the first un-prefetched item. This variable is used
-    //  exclusively by reader thread.
-    T *_r;
-
-    //  Points to the first item to be flushed in the future.
-    T *_f;
-
-    //  The single point of contention between writer and reader thread.
-    //  Points past the last flushed item. If it is NULL,
-    //  reader is asleep. This pointer should be always accessed using
-    //  atomic operations.
-    atomic_ptr_t<T> _c;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ypipe_t)
-};
-}
-
-#endif
diff --git a/src/ypipe_base.hpp b/src/ypipe_base.hpp
deleted file mode 100644
index 50a534f8e..000000000
--- a/src/ypipe_base.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_YPIPE_BASE_HPP_INCLUDED__
-#define __ZMQ_YPIPE_BASE_HPP_INCLUDED__
-
-#include "macros.hpp"
-
-namespace zmq
-{
-// ypipe_base abstracts ypipe and ypipe_conflate specific
-// classes, one is selected according to a the conflate
-// socket option
-
-template <typename T> class ypipe_base_t
-{
-  public:
-    virtual ~ypipe_base_t () ZMQ_DEFAULT;
-    virtual void write (const T &value_, bool incomplete_) = 0;
-    virtual bool unwrite (T *value_) = 0;
-    virtual bool flush () = 0;
-    virtual bool check_read () = 0;
-    virtual bool read (T *value_) = 0;
-    virtual bool probe (bool (*fn_) (const T &)) = 0;
-};
-}
-
-#endif
diff --git a/src/ypipe_conflate.hpp b/src/ypipe_conflate.hpp
deleted file mode 100644
index aa0731d10..000000000
--- a/src/ypipe_conflate.hpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_YPIPE_CONFLATE_HPP_INCLUDED__
-#define __ZMQ_YPIPE_CONFLATE_HPP_INCLUDED__
-
-#include "platform.hpp"
-#include "dbuffer.hpp"
-#include "ypipe_base.hpp"
-
-namespace zmq
-{
-//  Adapter for dbuffer, to plug it in instead of a queue for the sake
-//  of implementing the conflate socket option, which, if set, makes
-//  the receiving side to discard all incoming messages but the last one.
-//
-//  reader_awake flag is needed here to mimic ypipe delicate behaviour
-//  around the reader being asleep (see 'c' pointer being NULL in ypipe.hpp)
-
-template <typename T> class ypipe_conflate_t ZMQ_FINAL : public ypipe_base_t<T>
-{
-  public:
-    //  Initialises the pipe.
-    ypipe_conflate_t () : reader_awake (false) {}
-
-    //  Following function (write) deliberately copies uninitialised data
-    //  when used with zmq_msg. Initialising the VSM body for
-    //  non-VSM messages won't be good for performance.
-
-#ifdef ZMQ_HAVE_OPENVMS
-#pragma message save
-#pragma message disable(UNINIT)
-#endif
-    void write (const T &value_, bool incomplete_)
-    {
-        (void) incomplete_;
-
-        dbuffer.write (value_);
-    }
-
-#ifdef ZMQ_HAVE_OPENVMS
-#pragma message restore
-#endif
-
-    // There are no incomplete items for conflate ypipe
-    bool unwrite (T *) { return false; }
-
-    //  Flush is no-op for conflate ypipe. Reader asleep behaviour
-    //  is as of the usual ypipe.
-    //  Returns false if the reader thread is sleeping. In that case,
-    //  caller is obliged to wake the reader up before using the pipe again.
-    bool flush () { return reader_awake; }
-
-    //  Check whether item is available for reading.
-    bool check_read ()
-    {
-        const bool res = dbuffer.check_read ();
-        if (!res)
-            reader_awake = false;
-
-        return res;
-    }
-
-    //  Reads an item from the pipe. Returns false if there is no value.
-    //  available.
-    bool read (T *value_)
-    {
-        if (!check_read ())
-            return false;
-
-        return dbuffer.read (value_);
-    }
-
-    //  Applies the function fn to the first elemenent in the pipe
-    //  and returns the value returned by the fn.
-    //  The pipe mustn't be empty or the function crashes.
-    bool probe (bool (*fn_) (const T &)) { return dbuffer.probe (fn_); }
-
-  protected:
-    dbuffer_t<T> dbuffer;
-    bool reader_awake;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ypipe_conflate_t)
-};
-}
-
-#endif
diff --git a/src/yqueue.hpp b/src/yqueue.hpp
deleted file mode 100644
index 6ba634a3f..000000000
--- a/src/yqueue.hpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_YQUEUE_HPP_INCLUDED__
-#define __ZMQ_YQUEUE_HPP_INCLUDED__
-
-#include <stdlib.h>
-#include <stddef.h>
-
-#include "err.hpp"
-#include "atomic_ptr.hpp"
-
-namespace zmq
-{
-//  yqueue is an efficient queue implementation. The main goal is
-//  to minimise number of allocations/deallocations needed. Thus yqueue
-//  allocates/deallocates elements in batches of N.
-//
-//  yqueue allows one thread to use push/back function and another one
-//  to use pop/front functions. However, user must ensure that there's no
-//  pop on the empty queue and that both threads don't access the same
-//  element in unsynchronised manner.
-//
-//  T is the type of the object in the queue.
-//  N is granularity of the queue (how many pushes have to be done till
-//  actual memory allocation is required).
-#ifdef HAVE_POSIX_MEMALIGN
-// ALIGN is the memory alignment size to use in the case where we have
-// posix_memalign available. Default value is 64, this alignment will
-// prevent two queue chunks from occupying the same CPU cache line on
-// architectures where cache lines are <= 64 bytes (e.g. most things
-// except POWER). It is detected at build time to try to account for other
-// platforms like POWER and s390x.
-template <typename T, int N, size_t ALIGN = ZMQ_CACHELINE_SIZE> class yqueue_t
-#else
-template <typename T, int N> class yqueue_t
-#endif
-{
-  public:
-    //  Create the queue.
-    inline yqueue_t ()
-    {
-        _begin_chunk = allocate_chunk ();
-        alloc_assert (_begin_chunk);
-        _begin_pos = 0;
-        _back_chunk = NULL;
-        _back_pos = 0;
-        _end_chunk = _begin_chunk;
-        _end_pos = 0;
-    }
-
-    //  Destroy the queue.
-    inline ~yqueue_t ()
-    {
-        while (true) {
-            if (_begin_chunk == _end_chunk) {
-                free (_begin_chunk);
-                break;
-            }
-            chunk_t *o = _begin_chunk;
-            _begin_chunk = _begin_chunk->next;
-            free (o);
-        }
-
-        chunk_t *sc = _spare_chunk.xchg (NULL);
-        free (sc);
-    }
-
-    //  Returns reference to the front element of the queue.
-    //  If the queue is empty, behaviour is undefined.
-    inline T &front () { return _begin_chunk->values[_begin_pos]; }
-
-    //  Returns reference to the back element of the queue.
-    //  If the queue is empty, behaviour is undefined.
-    inline T &back () { return _back_chunk->values[_back_pos]; }
-
-    //  Adds an element to the back end of the queue.
-    inline void push ()
-    {
-        _back_chunk = _end_chunk;
-        _back_pos = _end_pos;
-
-        if (++_end_pos != N)
-            return;
-
-        chunk_t *sc = _spare_chunk.xchg (NULL);
-        if (sc) {
-            _end_chunk->next = sc;
-            sc->prev = _end_chunk;
-        } else {
-            _end_chunk->next = allocate_chunk ();
-            alloc_assert (_end_chunk->next);
-            _end_chunk->next->prev = _end_chunk;
-        }
-        _end_chunk = _end_chunk->next;
-        _end_pos = 0;
-    }
-
-    //  Removes element from the back end of the queue. In other words
-    //  it rollbacks last push to the queue. Take care: Caller is
-    //  responsible for destroying the object being unpushed.
-    //  The caller must also guarantee that the queue isn't empty when
-    //  unpush is called. It cannot be done automatically as the read
-    //  side of the queue can be managed by different, completely
-    //  unsynchronised thread.
-    inline void unpush ()
-    {
-        //  First, move 'back' one position backwards.
-        if (_back_pos)
-            --_back_pos;
-        else {
-            _back_pos = N - 1;
-            _back_chunk = _back_chunk->prev;
-        }
-
-        //  Now, move 'end' position backwards. Note that obsolete end chunk
-        //  is not used as a spare chunk. The analysis shows that doing so
-        //  would require free and atomic operation per chunk deallocated
-        //  instead of a simple free.
-        if (_end_pos)
-            --_end_pos;
-        else {
-            _end_pos = N - 1;
-            _end_chunk = _end_chunk->prev;
-            free (_end_chunk->next);
-            _end_chunk->next = NULL;
-        }
-    }
-
-    //  Removes an element from the front end of the queue.
-    inline void pop ()
-    {
-        if (++_begin_pos == N) {
-            chunk_t *o = _begin_chunk;
-            _begin_chunk = _begin_chunk->next;
-            _begin_chunk->prev = NULL;
-            _begin_pos = 0;
-
-            //  'o' has been more recently used than _spare_chunk,
-            //  so for cache reasons we'll get rid of the spare and
-            //  use 'o' as the spare.
-            chunk_t *cs = _spare_chunk.xchg (o);
-            free (cs);
-        }
-    }
-
-  private:
-    //  Individual memory chunk to hold N elements.
-    struct chunk_t
-    {
-        T values[N];
-        chunk_t *prev;
-        chunk_t *next;
-    };
-
-    static inline chunk_t *allocate_chunk ()
-    {
-#ifdef HAVE_POSIX_MEMALIGN
-        void *pv;
-        if (posix_memalign (&pv, ALIGN, sizeof (chunk_t)) == 0)
-            return (chunk_t *) pv;
-        return NULL;
-#else
-        return static_cast<chunk_t *> (malloc (sizeof (chunk_t)));
-#endif
-    }
-
-    //  Back position may point to invalid memory if the queue is empty,
-    //  while begin & end positions are always valid. Begin position is
-    //  accessed exclusively be queue reader (front/pop), while back and
-    //  end positions are accessed exclusively by queue writer (back/push).
-    chunk_t *_begin_chunk;
-    int _begin_pos;
-    chunk_t *_back_chunk;
-    int _back_pos;
-    chunk_t *_end_chunk;
-    int _end_pos;
-
-    //  People are likely to produce and consume at similar rates.  In
-    //  this scenario holding onto the most recently freed chunk saves
-    //  us from having to call malloc/free.
-    atomic_ptr_t<chunk_t> _spare_chunk;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (yqueue_t)
-};
-}
-
-#endif
diff --git a/src/zap_client.cpp b/src/zap_client.cpp
deleted file mode 100644
index 7ba28c91c..000000000
--- a/src/zap_client.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "zap_client.hpp"
-#include "msg.hpp"
-#include "session_base.hpp"
-
-namespace zmq
-{
-const char zap_version[] = "1.0";
-const size_t zap_version_len = sizeof (zap_version) - 1;
-
-const char id[] = "1";
-const size_t id_len = sizeof (id) - 1;
-
-zap_client_t::zap_client_t (session_base_t *const session_,
-                            const std::string &peer_address_,
-                            const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    peer_address (peer_address_)
-{
-}
-
-void zap_client_t::send_zap_request (const char *mechanism_,
-                                     size_t mechanism_length_,
-                                     const uint8_t *credentials_,
-                                     size_t credentials_size_)
-{
-    send_zap_request (mechanism_, mechanism_length_, &credentials_,
-                      &credentials_size_, 1);
-}
-
-void zap_client_t::send_zap_request (const char *mechanism_,
-                                     size_t mechanism_length_,
-                                     const uint8_t **credentials_,
-                                     size_t *credentials_sizes_,
-                                     size_t credentials_count_)
-{
-    // write_zap_msg cannot fail. It could only fail if the HWM was exceeded,
-    // but on the ZAP socket, the HWM is disabled.
-
-    int rc;
-    msg_t msg;
-
-    //  Address delimiter frame
-    rc = msg.init ();
-    errno_assert (rc == 0);
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Version frame
-    rc = msg.init_size (zap_version_len);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), zap_version, zap_version_len);
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Request ID frame
-    rc = msg.init_size (id_len);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), id, id_len);
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Domain frame
-    rc = msg.init_size (options.zap_domain.length ());
-    errno_assert (rc == 0);
-    memcpy (msg.data (), options.zap_domain.c_str (),
-            options.zap_domain.length ());
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Address frame
-    rc = msg.init_size (peer_address.length ());
-    errno_assert (rc == 0);
-    memcpy (msg.data (), peer_address.c_str (), peer_address.length ());
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Routing id frame
-    rc = msg.init_size (options.routing_id_size);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), options.routing_id, options.routing_id_size);
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Mechanism frame
-    rc = msg.init_size (mechanism_length_);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), mechanism_, mechanism_length_);
-    if (credentials_count_)
-        msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Credentials frames
-    for (size_t i = 0; i < credentials_count_; ++i) {
-        rc = msg.init_size (credentials_sizes_[i]);
-        errno_assert (rc == 0);
-        if (i < credentials_count_ - 1)
-            msg.set_flags (msg_t::more);
-        memcpy (msg.data (), credentials_[i], credentials_sizes_[i]);
-        rc = session->write_zap_msg (&msg);
-        errno_assert (rc == 0);
-    }
-}
-
-int zap_client_t::receive_and_process_zap_reply ()
-{
-    int rc = 0;
-    const size_t zap_reply_frame_count = 7;
-    msg_t msg[zap_reply_frame_count];
-
-    //  Initialize all reply frames
-    for (size_t i = 0; i < zap_reply_frame_count; i++) {
-        rc = msg[i].init ();
-        errno_assert (rc == 0);
-    }
-
-    for (size_t i = 0; i < zap_reply_frame_count; i++) {
-        rc = session->read_zap_msg (&msg[i]);
-        if (rc == -1) {
-            if (errno == EAGAIN) {
-                return 1;
-            }
-            return close_and_return (msg, -1);
-        }
-        if ((msg[i].flags () & msg_t::more)
-            == (i < zap_reply_frame_count - 1 ? 0 : msg_t::more)) {
-            session->get_socket ()->event_handshake_failed_protocol (
-              session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY);
-            errno = EPROTO;
-            return close_and_return (msg, -1);
-        }
-    }
-
-    //  Address delimiter frame
-    if (msg[0].size () > 0) {
-        //  TODO can a ZAP handler produce such a message at all?
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Version frame
-    if (msg[1].size () != zap_version_len
-        || memcmp (msg[1].data (), zap_version, zap_version_len)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Request id frame
-    if (msg[2].size () != id_len || memcmp (msg[2].data (), id, id_len)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Status code frame, only 200, 300, 400 and 500 are valid status codes
-    const char *status_code_data = static_cast<const char *> (msg[3].data ());
-    if (msg[3].size () != 3 || status_code_data[0] < '2'
-        || status_code_data[0] > '5' || status_code_data[1] != '0'
-        || status_code_data[2] != '0') {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Save status code
-    status_code.assign (static_cast<char *> (msg[3].data ()), 3);
-
-    //  Save user id
-    set_user_id (msg[5].data (), msg[5].size ());
-
-    //  Process metadata frame
-    rc = parse_metadata (static_cast<const unsigned char *> (msg[6].data ()),
-                         msg[6].size (), true);
-
-    if (rc != 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Close all reply frames
-    for (size_t i = 0; i < zap_reply_frame_count; i++) {
-        const int rc2 = msg[i].close ();
-        errno_assert (rc2 == 0);
-    }
-
-    handle_zap_status_code ();
-
-    return 0;
-}
-
-void zap_client_t::handle_zap_status_code ()
-{
-    //  we can assume here that status_code is a valid ZAP status code,
-    //  i.e. 200, 300, 400 or 500
-    int status_code_numeric = 0;
-    switch (status_code[0]) {
-        case '2':
-            return;
-        case '3':
-            status_code_numeric = 300;
-            break;
-        case '4':
-            status_code_numeric = 400;
-            break;
-        case '5':
-            status_code_numeric = 500;
-            break;
-    }
-
-    session->get_socket ()->event_handshake_failed_auth (
-      session->get_endpoint (), status_code_numeric);
-}
-
-zap_client_common_handshake_t::zap_client_common_handshake_t (
-  session_base_t *const session_,
-  const std::string &peer_address_,
-  const options_t &options_,
-  state_t zap_reply_ok_state_) :
-    mechanism_base_t (session_, options_),
-    zap_client_t (session_, peer_address_, options_),
-    state (waiting_for_hello),
-    _zap_reply_ok_state (zap_reply_ok_state_)
-{
-}
-
-zmq::mechanism_t::status_t zap_client_common_handshake_t::status () const
-{
-    if (state == ready)
-        return mechanism_t::ready;
-    if (state == error_sent)
-        return mechanism_t::error;
-
-    return mechanism_t::handshaking;
-}
-
-int zap_client_common_handshake_t::zap_msg_available ()
-{
-    zmq_assert (state == waiting_for_zap_reply);
-    return receive_and_process_zap_reply () == -1 ? -1 : 0;
-}
-
-void zap_client_common_handshake_t::handle_zap_status_code ()
-{
-    zap_client_t::handle_zap_status_code ();
-
-    //  we can assume here that status_code is a valid ZAP status code,
-    //  i.e. 200, 300, 400 or 500
-    switch (status_code[0]) {
-        case '2':
-            state = _zap_reply_ok_state;
-            break;
-        case '3':
-            //  a 300 error code (temporary failure)
-            //  should NOT result in an ERROR message, but instead the
-            //  client should be silently disconnected (see CURVEZMQ RFC)
-            //  therefore, go immediately to state error_sent
-            state = error_sent;
-            break;
-        default:
-            state = sending_error;
-    }
-}
-
-int zap_client_common_handshake_t::receive_and_process_zap_reply ()
-{
-    zmq_assert (state == waiting_for_zap_reply);
-    return zap_client_t::receive_and_process_zap_reply ();
-}
-}
diff --git a/src/zap_client.hpp b/src/zap_client.hpp
deleted file mode 100644
index 970a03799..000000000
--- a/src/zap_client.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ZAP_CLIENT_HPP_INCLUDED__
-#define __ZMQ_ZAP_CLIENT_HPP_INCLUDED__
-
-#include "mechanism_base.hpp"
-
-namespace zmq
-{
-class zap_client_t : public virtual mechanism_base_t
-{
-  public:
-    zap_client_t (session_base_t *session_,
-                  const std::string &peer_address_,
-                  const options_t &options_);
-
-    void send_zap_request (const char *mechanism_,
-                           size_t mechanism_length_,
-                           const uint8_t *credentials_,
-                           size_t credentials_size_);
-
-    void send_zap_request (const char *mechanism_,
-                           size_t mechanism_length_,
-                           const uint8_t **credentials_,
-                           size_t *credentials_sizes_,
-                           size_t credentials_count_);
-
-    virtual int receive_and_process_zap_reply ();
-    virtual void handle_zap_status_code ();
-
-  protected:
-    const std::string peer_address;
-
-    //  Status code as received from ZAP handler
-    std::string status_code;
-};
-
-class zap_client_common_handshake_t : public zap_client_t
-{
-  protected:
-    enum state_t
-    {
-        waiting_for_hello,
-        sending_welcome,
-        waiting_for_initiate,
-        waiting_for_zap_reply,
-        sending_ready,
-        sending_error,
-        error_sent,
-        ready
-    };
-
-    zap_client_common_handshake_t (session_base_t *session_,
-                                   const std::string &peer_address_,
-                                   const options_t &options_,
-                                   state_t zap_reply_ok_state_);
-
-    //  methods from mechanism_t
-    status_t status () const ZMQ_FINAL;
-    int zap_msg_available () ZMQ_FINAL;
-
-    //  zap_client_t methods
-    int receive_and_process_zap_reply () ZMQ_FINAL;
-    void handle_zap_status_code () ZMQ_FINAL;
-
-    //  Current FSM state
-    state_t state;
-
-  private:
-    const state_t _zap_reply_ok_state;
-};
-}
-
-#endif
diff --git a/src/zmq.cpp b/src/zmq.cpp
deleted file mode 100644
index 834f668f9..000000000
--- a/src/zmq.cpp
+++ /dev/null
@@ -1,1535 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// "Tell them I was a writer.
-//  A maker of software.
-//  A humanist. A father.
-//  And many things.
-//  But above all, a writer.
-//  Thank You. :)"
-//  - Pieter Hintjens
-
-#include "precompiled.hpp"
-#define ZMQ_TYPE_UNSAFE
-
-#include "macros.hpp"
-#include "poller.hpp"
-#include "peer.hpp"
-
-#if !defined ZMQ_HAVE_POLLER
-//  On AIX platform, poll.h has to be included first to get consistent
-//  definition of pollfd structure (AIX uses 'reqevents' and 'retnevents'
-//  instead of 'events' and 'revents' and defines macros to map from POSIX-y
-//  names to AIX-specific names).
-#if defined ZMQ_POLL_BASED_ON_POLL && !defined ZMQ_HAVE_WINDOWS
-#include <poll.h>
-#endif
-
-#include "polling_util.hpp"
-#endif
-
-// TODO: determine if this is an issue, since zmq.h is being loaded from pch.
-// zmq.h must be included *after* poll.h for AIX to build properly
-//#include "../include/zmq.h"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <strings.h>
-#endif
-#endif
-
-// XSI vector I/O
-#if defined ZMQ_HAVE_UIO
-#include <sys/uio.h>
-#else
-struct iovec
-{
-    void *iov_base;
-    size_t iov_len;
-};
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <new>
-#include <climits>
-
-#include "proxy.hpp"
-#include "socket_base.hpp"
-#include "stdint.hpp"
-#include "config.hpp"
-#include "likely.hpp"
-#include "clock.hpp"
-#include "ctx.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "fd.hpp"
-#include "metadata.hpp"
-#include "socket_poller.hpp"
-#include "timers.hpp"
-#include "ip.hpp"
-#include "address.hpp"
-
-#if defined ZMQ_HAVE_OPENPGM
-#define __PGM_WININT_H__
-#include <pgm/pgm.h>
-#endif
-
-//  Compile time check whether msg_t fits into zmq_msg_t.
-typedef char
-  check_msg_t_size[sizeof (zmq::msg_t) == sizeof (zmq_msg_t) ? 1 : -1];
-
-
-void zmq_version (int *major_, int *minor_, int *patch_)
-{
-    *major_ = ZMQ_VERSION_MAJOR;
-    *minor_ = ZMQ_VERSION_MINOR;
-    *patch_ = ZMQ_VERSION_PATCH;
-}
-
-
-const char *zmq_strerror (int errnum_)
-{
-    return zmq::errno_to_string (errnum_);
-}
-
-int zmq_errno (void)
-{
-    return errno;
-}
-
-
-//  New context API
-
-void *zmq_ctx_new (void)
-{
-    //  We do this before the ctx constructor since its embedded mailbox_t
-    //  object needs the network to be up and running (at least on Windows).
-    if (!zmq::initialize_network ()) {
-        return NULL;
-    }
-
-    //  Create 0MQ context.
-    zmq::ctx_t *ctx = new (std::nothrow) zmq::ctx_t;
-    if (ctx) {
-        if (!ctx->valid ()) {
-            delete ctx;
-            return NULL;
-        }
-    }
-    return ctx;
-}
-
-int zmq_ctx_term (void *ctx_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    const int rc = (static_cast<zmq::ctx_t *> (ctx_))->terminate ();
-    const int en = errno;
-
-    //  Shut down only if termination was not interrupted by a signal.
-    if (!rc || en != EINTR) {
-        zmq::shutdown_network ();
-    }
-
-    errno = en;
-    return rc;
-}
-
-int zmq_ctx_shutdown (void *ctx_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-    return (static_cast<zmq::ctx_t *> (ctx_))->shutdown ();
-}
-
-int zmq_ctx_set (void *ctx_, int option_, int optval_)
-{
-    return zmq_ctx_set_ext (ctx_, option_, &optval_, sizeof (int));
-}
-
-int zmq_ctx_set_ext (void *ctx_,
-                     int option_,
-                     const void *optval_,
-                     size_t optvallen_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-    return (static_cast<zmq::ctx_t *> (ctx_))
-      ->set (option_, optval_, optvallen_);
-}
-
-int zmq_ctx_get (void *ctx_, int option_)
-{
-    int optval = 0;
-    size_t optvallen = sizeof (int);
-    if (zmq_ctx_get_ext (ctx_, option_, &optval, &optvallen) == 0) {
-        return optval;
-    }
-
-    errno = EFAULT;
-    return -1;
-}
-
-int zmq_ctx_get_ext (void *ctx_, int option_, void *optval_, size_t *optvallen_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-    return (static_cast<zmq::ctx_t *> (ctx_))
-      ->get (option_, optval_, optvallen_);
-}
-
-
-//  Stable/legacy context API
-
-void *zmq_init (int io_threads_)
-{
-    if (io_threads_ >= 0) {
-        void *ctx = zmq_ctx_new ();
-        zmq_ctx_set (ctx, ZMQ_IO_THREADS, io_threads_);
-        return ctx;
-    }
-    errno = EINVAL;
-    return NULL;
-}
-
-int zmq_term (void *ctx_)
-{
-    return zmq_ctx_term (ctx_);
-}
-
-int zmq_ctx_destroy (void *ctx_)
-{
-    return zmq_ctx_term (ctx_);
-}
-
-
-// Sockets
-
-static zmq::socket_base_t *as_socket_base_t (void *s_)
-{
-    zmq::socket_base_t *s = static_cast<zmq::socket_base_t *> (s_);
-    if (!s_ || !s->check_tag ()) {
-        errno = ENOTSOCK;
-        return NULL;
-    }
-    return s;
-}
-
-void *zmq_socket (void *ctx_, int type_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return NULL;
-    }
-    zmq::ctx_t *ctx = static_cast<zmq::ctx_t *> (ctx_);
-    zmq::socket_base_t *s = ctx->create_socket (type_);
-    return static_cast<void *> (s);
-}
-
-int zmq_close (void *s_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    s->close ();
-    return 0;
-}
-
-int zmq_setsockopt (void *s_,
-                    int option_,
-                    const void *optval_,
-                    size_t optvallen_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->setsockopt (option_, optval_, optvallen_);
-}
-
-int zmq_getsockopt (void *s_, int option_, void *optval_, size_t *optvallen_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->getsockopt (option_, optval_, optvallen_);
-}
-
-int zmq_socket_monitor_versioned (
-  void *s_, const char *addr_, uint64_t events_, int event_version_, int type_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->monitor (addr_, events_, event_version_, type_);
-}
-
-int zmq_socket_monitor (void *s_, const char *addr_, int events_)
-{
-    return zmq_socket_monitor_versioned (s_, addr_, events_, 1, ZMQ_PAIR);
-}
-
-int zmq_join (void *s_, const char *group_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->join (group_);
-}
-
-int zmq_leave (void *s_, const char *group_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->leave (group_);
-}
-
-int zmq_bind (void *s_, const char *addr_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->bind (addr_);
-}
-
-int zmq_connect (void *s_, const char *addr_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->connect (addr_);
-}
-
-uint32_t zmq_connect_peer (void *s_, const char *addr_)
-{
-    zmq::peer_t *s = static_cast<zmq::peer_t *> (s_);
-    if (!s_ || !s->check_tag ()) {
-        errno = ENOTSOCK;
-        return 0;
-    }
-
-    int socket_type;
-    size_t socket_type_size = sizeof (socket_type);
-    if (s->getsockopt (ZMQ_TYPE, &socket_type, &socket_type_size) != 0)
-        return 0;
-
-    if (socket_type != ZMQ_PEER) {
-        errno = ENOTSUP;
-        return 0;
-    }
-
-    return s->connect_peer (addr_);
-}
-
-
-int zmq_unbind (void *s_, const char *addr_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->term_endpoint (addr_);
-}
-
-int zmq_disconnect (void *s_, const char *addr_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->term_endpoint (addr_);
-}
-
-// Sending functions.
-
-static inline int
-s_sendmsg (zmq::socket_base_t *s_, zmq_msg_t *msg_, int flags_)
-{
-    size_t sz = zmq_msg_size (msg_);
-    const int rc = s_->send (reinterpret_cast<zmq::msg_t *> (msg_), flags_);
-    if (unlikely (rc < 0))
-        return -1;
-
-    //  This is what I'd like to do, my C++ fu is too weak -- PH 2016/02/09
-    //  int max_msgsz = s_->parent->get (ZMQ_MAX_MSGSZ);
-    size_t max_msgsz = INT_MAX;
-
-    //  Truncate returned size to INT_MAX to avoid overflow to negative values
-    return static_cast<int> (sz < max_msgsz ? sz : max_msgsz);
-}
-
-/*  To be deprecated once zmq_msg_send() is stable                           */
-int zmq_sendmsg (void *s_, zmq_msg_t *msg_, int flags_)
-{
-    return zmq_msg_send (msg_, s_, flags_);
-}
-
-int zmq_send (void *s_, const void *buf_, size_t len_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    zmq_msg_t msg;
-    int rc = zmq_msg_init_buffer (&msg, buf_, len_);
-    if (unlikely (rc < 0))
-        return -1;
-
-    rc = s_sendmsg (s, &msg, flags_);
-    if (unlikely (rc < 0)) {
-        const int err = errno;
-        const int rc2 = zmq_msg_close (&msg);
-        errno_assert (rc2 == 0);
-        errno = err;
-        return -1;
-    }
-    //  Note the optimisation here. We don't close the msg object as it is
-    //  empty anyway. This may change when implementation of zmq_msg_t changes.
-    return rc;
-}
-
-int zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    zmq_msg_t msg;
-    int rc =
-      zmq_msg_init_data (&msg, const_cast<void *> (buf_), len_, NULL, NULL);
-    if (rc != 0)
-        return -1;
-
-    rc = s_sendmsg (s, &msg, flags_);
-    if (unlikely (rc < 0)) {
-        const int err = errno;
-        const int rc2 = zmq_msg_close (&msg);
-        errno_assert (rc2 == 0);
-        errno = err;
-        return -1;
-    }
-    //  Note the optimisation here. We don't close the msg object as it is
-    //  empty anyway. This may change when implementation of zmq_msg_t changes.
-    return rc;
-}
-
-
-// Send multiple messages.
-// TODO: this function has no man page
-//
-// If flag bit ZMQ_SNDMORE is set the vector is treated as
-// a single multi-part message, i.e. the last message has
-// ZMQ_SNDMORE bit switched off.
-//
-int zmq_sendiov (void *s_, iovec *a_, size_t count_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    if (unlikely (count_ <= 0 || !a_)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    int rc = 0;
-    zmq_msg_t msg;
-
-    for (size_t i = 0; i < count_; ++i) {
-        rc = zmq_msg_init_size (&msg, a_[i].iov_len);
-        if (rc != 0) {
-            rc = -1;
-            break;
-        }
-        memcpy (zmq_msg_data (&msg), a_[i].iov_base, a_[i].iov_len);
-        if (i == count_ - 1)
-            flags_ = flags_ & ~ZMQ_SNDMORE;
-        rc = s_sendmsg (s, &msg, flags_);
-        if (unlikely (rc < 0)) {
-            const int err = errno;
-            const int rc2 = zmq_msg_close (&msg);
-            errno_assert (rc2 == 0);
-            errno = err;
-            rc = -1;
-            break;
-        }
-    }
-    return rc;
-}
-
-// Receiving functions.
-
-static int s_recvmsg (zmq::socket_base_t *s_, zmq_msg_t *msg_, int flags_)
-{
-    const int rc = s_->recv (reinterpret_cast<zmq::msg_t *> (msg_), flags_);
-    if (unlikely (rc < 0))
-        return -1;
-
-    //  Truncate returned size to INT_MAX to avoid overflow to negative values
-    const size_t sz = zmq_msg_size (msg_);
-    return static_cast<int> (sz < INT_MAX ? sz : INT_MAX);
-}
-
-/*  To be deprecated once zmq_msg_recv() is stable                           */
-int zmq_recvmsg (void *s_, zmq_msg_t *msg_, int flags_)
-{
-    return zmq_msg_recv (msg_, s_, flags_);
-}
-
-
-int zmq_recv (void *s_, void *buf_, size_t len_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    zmq_msg_t msg;
-    int rc = zmq_msg_init (&msg);
-    errno_assert (rc == 0);
-
-    const int nbytes = s_recvmsg (s, &msg, flags_);
-    if (unlikely (nbytes < 0)) {
-        const int err = errno;
-        rc = zmq_msg_close (&msg);
-        errno_assert (rc == 0);
-        errno = err;
-        return -1;
-    }
-
-    //  An oversized message is silently truncated.
-    const size_t to_copy = size_t (nbytes) < len_ ? size_t (nbytes) : len_;
-
-    //  We explicitly allow a null buffer argument if len is zero
-    if (to_copy) {
-        assert (buf_);
-        memcpy (buf_, zmq_msg_data (&msg), to_copy);
-    }
-    rc = zmq_msg_close (&msg);
-    errno_assert (rc == 0);
-
-    return nbytes;
-}
-
-// Receive a multi-part message
-//
-// Receives up to *count_ parts of a multi-part message.
-// Sets *count_ to the actual number of parts read.
-// ZMQ_RCVMORE is set to indicate if a complete multi-part message was read.
-// Returns number of message parts read, or -1 on error.
-//
-// Note: even if -1 is returned, some parts of the message
-// may have been read. Therefore the client must consult
-// *count_ to retrieve message parts successfully read,
-// even if -1 is returned.
-//
-// The iov_base* buffers of each iovec *a_ filled in by this
-// function may be freed using free().
-// TODO: this function has no man page
-//
-int zmq_recviov (void *s_, iovec *a_, size_t *count_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    if (unlikely (!count_ || *count_ <= 0 || !a_)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    const size_t count = *count_;
-    int nread = 0;
-    bool recvmore = true;
-
-    *count_ = 0;
-
-    for (size_t i = 0; recvmore && i < count; ++i) {
-        zmq_msg_t msg;
-        int rc = zmq_msg_init (&msg);
-        errno_assert (rc == 0);
-
-        const int nbytes = s_recvmsg (s, &msg, flags_);
-        if (unlikely (nbytes < 0)) {
-            const int err = errno;
-            rc = zmq_msg_close (&msg);
-            errno_assert (rc == 0);
-            errno = err;
-            nread = -1;
-            break;
-        }
-
-        a_[i].iov_len = zmq_msg_size (&msg);
-        a_[i].iov_base = static_cast<char *> (malloc (a_[i].iov_len));
-        if (unlikely (!a_[i].iov_base)) {
-            errno = ENOMEM;
-            return -1;
-        }
-        memcpy (a_[i].iov_base, static_cast<char *> (zmq_msg_data (&msg)),
-                a_[i].iov_len);
-        // Assume zmq_socket ZMQ_RVCMORE is properly set.
-        const zmq::msg_t *p_msg = reinterpret_cast<const zmq::msg_t *> (&msg);
-        recvmore = p_msg->flags () & zmq::msg_t::more;
-        rc = zmq_msg_close (&msg);
-        errno_assert (rc == 0);
-        ++*count_;
-        ++nread;
-    }
-    return nread;
-}
-
-// Message manipulators.
-
-int zmq_msg_init (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->init ();
-}
-
-int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->init_size (size_);
-}
-
-int zmq_msg_init_buffer (zmq_msg_t *msg_, const void *buf_, size_t size_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->init_buffer (buf_, size_);
-}
-
-int zmq_msg_init_data (
-  zmq_msg_t *msg_, void *data_, size_t size_, zmq_free_fn *ffn_, void *hint_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))
-      ->init_data (data_, size_, ffn_, hint_);
-}
-
-int zmq_msg_send (zmq_msg_t *msg_, void *s_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s_sendmsg (s, msg_, flags_);
-}
-
-int zmq_msg_recv (zmq_msg_t *msg_, void *s_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s_recvmsg (s, msg_, flags_);
-}
-
-int zmq_msg_close (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->close ();
-}
-
-int zmq_msg_move (zmq_msg_t *dest_, zmq_msg_t *src_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (dest_))
-      ->move (*reinterpret_cast<zmq::msg_t *> (src_));
-}
-
-int zmq_msg_copy (zmq_msg_t *dest_, zmq_msg_t *src_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (dest_))
-      ->copy (*reinterpret_cast<zmq::msg_t *> (src_));
-}
-
-void *zmq_msg_data (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->data ();
-}
-
-size_t zmq_msg_size (const zmq_msg_t *msg_)
-{
-    return ((zmq::msg_t *) msg_)->size ();
-}
-
-int zmq_msg_more (const zmq_msg_t *msg_)
-{
-    return zmq_msg_get (msg_, ZMQ_MORE);
-}
-
-int zmq_msg_get (const zmq_msg_t *msg_, int property_)
-{
-    const char *fd_string;
-
-    switch (property_) {
-        case ZMQ_MORE:
-            return (((zmq::msg_t *) msg_)->flags () & zmq::msg_t::more) ? 1 : 0;
-        case ZMQ_SRCFD:
-            fd_string = zmq_msg_gets (msg_, "__fd");
-            if (fd_string == NULL)
-                return -1;
-
-            return atoi (fd_string);
-        case ZMQ_SHARED:
-            return (((zmq::msg_t *) msg_)->is_cmsg ())
-                       || (((zmq::msg_t *) msg_)->flags () & zmq::msg_t::shared)
-                     ? 1
-                     : 0;
-        default:
-            errno = EINVAL;
-            return -1;
-    }
-}
-
-int zmq_msg_set (zmq_msg_t *, int, int)
-{
-    //  No properties supported at present
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq_msg_set_routing_id (zmq_msg_t *msg_, uint32_t routing_id_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))
-      ->set_routing_id (routing_id_);
-}
-
-uint32_t zmq_msg_routing_id (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->get_routing_id ();
-}
-
-int zmq_msg_set_group (zmq_msg_t *msg_, const char *group_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->set_group (group_);
-}
-
-const char *zmq_msg_group (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->group ();
-}
-
-//  Get message metadata string
-
-const char *zmq_msg_gets (const zmq_msg_t *msg_, const char *property_)
-{
-    const zmq::metadata_t *metadata =
-      reinterpret_cast<const zmq::msg_t *> (msg_)->metadata ();
-    const char *value = NULL;
-    if (metadata)
-        value = metadata->get (std::string (property_));
-    if (value)
-        return value;
-
-    errno = EINVAL;
-    return NULL;
-}
-
-// Polling.
-
-#if defined ZMQ_HAVE_POLLER
-static int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
-{
-    // implement zmq_poll on top of zmq_poller
-    int rc;
-    zmq_poller_event_t *events;
-    zmq::socket_poller_t poller;
-    events = new (std::nothrow) zmq_poller_event_t[nitems_];
-    alloc_assert (events);
-
-    bool repeat_items = false;
-    //  Register sockets with poller
-    for (int i = 0; i < nitems_; i++) {
-        items_[i].revents = 0;
-
-        bool modify = false;
-        short e = items_[i].events;
-        if (items_[i].socket) {
-            //  Poll item is a 0MQ socket.
-            for (int j = 0; j < i; ++j) {
-                // Check for repeat entries
-                if (items_[j].socket == items_[i].socket) {
-                    repeat_items = true;
-                    modify = true;
-                    e |= items_[j].events;
-                }
-            }
-            if (modify) {
-                rc = zmq_poller_modify (&poller, items_[i].socket, e);
-            } else {
-                rc = zmq_poller_add (&poller, items_[i].socket, NULL, e);
-            }
-            if (rc < 0) {
-                delete[] events;
-                return rc;
-            }
-        } else {
-            //  Poll item is a raw file descriptor.
-            for (int j = 0; j < i; ++j) {
-                // Check for repeat entries
-                if (!items_[j].socket && items_[j].fd == items_[i].fd) {
-                    repeat_items = true;
-                    modify = true;
-                    e |= items_[j].events;
-                }
-            }
-            if (modify) {
-                rc = zmq_poller_modify_fd (&poller, items_[i].fd, e);
-            } else {
-                rc = zmq_poller_add_fd (&poller, items_[i].fd, NULL, e);
-            }
-            if (rc < 0) {
-                delete[] events;
-                return rc;
-            }
-        }
-    }
-
-    //  Wait for events
-    rc = zmq_poller_wait_all (&poller, events, nitems_, timeout_);
-    if (rc < 0) {
-        delete[] events;
-        if (zmq_errno () == EAGAIN) {
-            return 0;
-        }
-        return rc;
-    }
-
-    //  Transform poller events into zmq_pollitem events.
-    //  items_ contains all items, while events only contains fired events.
-    //  If no sockets are repeated (likely), the two are still co-ordered, so step through the items
-    //  checking for matches only on the first event.
-    //  If there are repeat items, they cannot be assumed to be co-ordered,
-    //  so each pollitem must check fired events from the beginning.
-    int j_start = 0, found_events = rc;
-    for (int i = 0; i < nitems_; i++) {
-        for (int j = j_start; j < found_events; ++j) {
-            if ((items_[i].socket && items_[i].socket == events[j].socket)
-                || (!(items_[i].socket || events[j].socket)
-                    && items_[i].fd == events[j].fd)) {
-                items_[i].revents = events[j].events & items_[i].events;
-                if (!repeat_items) {
-                    // no repeats, we can ignore events we've already seen
-                    j_start++;
-                }
-                break;
-            }
-            if (!repeat_items) {
-                // no repeats, never have to look at j > j_start
-                break;
-            }
-        }
-    }
-
-    //  Cleanup
-    delete[] events;
-    return rc;
-}
-#endif // ZMQ_HAVE_POLLER
-
-int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
-{
-#if defined ZMQ_HAVE_POLLER
-    // if poller is present, use that if there is at least 1 thread-safe socket,
-    // otherwise fall back to the previous implementation as it's faster.
-    for (int i = 0; i != nitems_; i++) {
-        if (items_[i].socket
-            && as_socket_base_t (items_[i].socket)->is_thread_safe ()) {
-            return zmq_poller_poll (items_, nitems_, timeout_);
-        }
-    }
-#endif // ZMQ_HAVE_POLLER
-#if defined ZMQ_POLL_BASED_ON_POLL || defined ZMQ_POLL_BASED_ON_SELECT
-    if (unlikely (nitems_ < 0)) {
-        errno = EINVAL;
-        return -1;
-    }
-    if (unlikely (nitems_ == 0)) {
-        if (timeout_ == 0)
-            return 0;
-#if defined ZMQ_HAVE_WINDOWS
-        Sleep (timeout_ > 0 ? timeout_ : INFINITE);
-        return 0;
-#elif defined ZMQ_HAVE_VXWORKS
-        struct timespec ns_;
-        ns_.tv_sec = timeout_ / 1000;
-        ns_.tv_nsec = timeout_ % 1000 * 1000000;
-        return nanosleep (&ns_, 0);
-#else
-        return usleep (timeout_ * 1000);
-#endif
-    }
-    if (!items_) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    zmq::clock_t clock;
-    uint64_t now = 0;
-    uint64_t end = 0;
-#if defined ZMQ_POLL_BASED_ON_POLL
-    zmq::fast_vector_t<pollfd, ZMQ_POLLITEMS_DFLT> pollfds (nitems_);
-
-    //  Build pollset for poll () system call.
-    for (int i = 0; i != nitems_; i++) {
-        //  If the poll item is a 0MQ socket, we poll on the file descriptor
-        //  retrieved by the ZMQ_FD socket option.
-        if (items_[i].socket) {
-            size_t zmq_fd_size = sizeof (zmq::fd_t);
-            if (zmq_getsockopt (items_[i].socket, ZMQ_FD, &pollfds[i].fd,
-                                &zmq_fd_size)
-                == -1) {
-                return -1;
-            }
-            pollfds[i].events = items_[i].events ? POLLIN : 0;
-        }
-        //  Else, the poll item is a raw file descriptor. Just convert the
-        //  events to normal POLLIN/POLLOUT for poll ().
-        else {
-            pollfds[i].fd = items_[i].fd;
-            pollfds[i].events =
-              (items_[i].events & ZMQ_POLLIN ? POLLIN : 0)
-              | (items_[i].events & ZMQ_POLLOUT ? POLLOUT : 0)
-              | (items_[i].events & ZMQ_POLLPRI ? POLLPRI : 0);
-        }
-    }
-#else
-    //  Ensure we do not attempt to select () on more than FD_SETSIZE
-    //  file descriptors.
-    //  TODO since this function is called by a client, we could return errno EINVAL/ENOMEM/... here
-    zmq_assert (nitems_ <= FD_SETSIZE);
-
-    zmq::optimized_fd_set_t pollset_in (nitems_);
-    FD_ZERO (pollset_in.get ());
-    zmq::optimized_fd_set_t pollset_out (nitems_);
-    FD_ZERO (pollset_out.get ());
-    zmq::optimized_fd_set_t pollset_err (nitems_);
-    FD_ZERO (pollset_err.get ());
-
-    zmq::fd_t maxfd = 0;
-
-    //  Build the fd_sets for passing to select ().
-    for (int i = 0; i != nitems_; i++) {
-        //  If the poll item is a 0MQ socket we are interested in input on the
-        //  notification file descriptor retrieved by the ZMQ_FD socket option.
-        if (items_[i].socket) {
-            size_t zmq_fd_size = sizeof (zmq::fd_t);
-            zmq::fd_t notify_fd;
-            if (zmq_getsockopt (items_[i].socket, ZMQ_FD, &notify_fd,
-                                &zmq_fd_size)
-                == -1)
-                return -1;
-            if (items_[i].events) {
-                FD_SET (notify_fd, pollset_in.get ());
-                if (maxfd < notify_fd)
-                    maxfd = notify_fd;
-            }
-        }
-        //  Else, the poll item is a raw file descriptor. Convert the poll item
-        //  events to the appropriate fd_sets.
-        else {
-            if (items_[i].events & ZMQ_POLLIN)
-                FD_SET (items_[i].fd, pollset_in.get ());
-            if (items_[i].events & ZMQ_POLLOUT)
-                FD_SET (items_[i].fd, pollset_out.get ());
-            if (items_[i].events & ZMQ_POLLERR)
-                FD_SET (items_[i].fd, pollset_err.get ());
-            if (maxfd < items_[i].fd)
-                maxfd = items_[i].fd;
-        }
-    }
-
-    zmq::optimized_fd_set_t inset (nitems_);
-    zmq::optimized_fd_set_t outset (nitems_);
-    zmq::optimized_fd_set_t errset (nitems_);
-#endif
-
-    bool first_pass = true;
-    int nevents = 0;
-
-    while (true) {
-#if defined ZMQ_POLL_BASED_ON_POLL
-
-        //  Compute the timeout for the subsequent poll.
-        const zmq::timeout_t timeout =
-          zmq::compute_timeout (first_pass, timeout_, now, end);
-
-        //  Wait for events.
-        {
-            const int rc = poll (&pollfds[0], nitems_, timeout);
-            if (rc == -1 && errno == EINTR) {
-                return -1;
-            }
-            errno_assert (rc >= 0);
-        }
-        //  Check for the events.
-        for (int i = 0; i != nitems_; i++) {
-            items_[i].revents = 0;
-
-            //  The poll item is a 0MQ socket. Retrieve pending events
-            //  using the ZMQ_EVENTS socket option.
-            if (items_[i].socket) {
-                size_t zmq_events_size = sizeof (uint32_t);
-                uint32_t zmq_events;
-                if (zmq_getsockopt (items_[i].socket, ZMQ_EVENTS, &zmq_events,
-                                    &zmq_events_size)
-                    == -1) {
-                    return -1;
-                }
-                if ((items_[i].events & ZMQ_POLLOUT)
-                    && (zmq_events & ZMQ_POLLOUT))
-                    items_[i].revents |= ZMQ_POLLOUT;
-                if ((items_[i].events & ZMQ_POLLIN)
-                    && (zmq_events & ZMQ_POLLIN))
-                    items_[i].revents |= ZMQ_POLLIN;
-            }
-            //  Else, the poll item is a raw file descriptor, simply convert
-            //  the events to zmq_pollitem_t-style format.
-            else {
-                if (pollfds[i].revents & POLLIN)
-                    items_[i].revents |= ZMQ_POLLIN;
-                if (pollfds[i].revents & POLLOUT)
-                    items_[i].revents |= ZMQ_POLLOUT;
-                if (pollfds[i].revents & POLLPRI)
-                    items_[i].revents |= ZMQ_POLLPRI;
-                if (pollfds[i].revents & ~(POLLIN | POLLOUT | POLLPRI))
-                    items_[i].revents |= ZMQ_POLLERR;
-            }
-
-            if (items_[i].revents)
-                nevents++;
-        }
-
-#else
-
-        //  Compute the timeout for the subsequent poll.
-        timeval timeout;
-        timeval *ptimeout;
-        if (first_pass) {
-            timeout.tv_sec = 0;
-            timeout.tv_usec = 0;
-            ptimeout = &timeout;
-        } else if (timeout_ < 0)
-            ptimeout = NULL;
-        else {
-            timeout.tv_sec = static_cast<long> ((end - now) / 1000);
-            timeout.tv_usec = static_cast<long> ((end - now) % 1000 * 1000);
-            ptimeout = &timeout;
-        }
-
-        //  Wait for events. Ignore interrupts if there's infinite timeout.
-        while (true) {
-            memcpy (inset.get (), pollset_in.get (),
-                    zmq::valid_pollset_bytes (*pollset_in.get ()));
-            memcpy (outset.get (), pollset_out.get (),
-                    zmq::valid_pollset_bytes (*pollset_out.get ()));
-            memcpy (errset.get (), pollset_err.get (),
-                    zmq::valid_pollset_bytes (*pollset_err.get ()));
-#if defined ZMQ_HAVE_WINDOWS
-            int rc =
-              select (0, inset.get (), outset.get (), errset.get (), ptimeout);
-            if (unlikely (rc == SOCKET_ERROR)) {
-                errno = zmq::wsa_error_to_errno (WSAGetLastError ());
-                wsa_assert (errno == ENOTSOCK);
-                return -1;
-            }
-#else
-            int rc = select (maxfd + 1, inset.get (), outset.get (),
-                             errset.get (), ptimeout);
-            if (unlikely (rc == -1)) {
-                errno_assert (errno == EINTR || errno == EBADF);
-                return -1;
-            }
-#endif
-            break;
-        }
-
-        //  Check for the events.
-        for (int i = 0; i != nitems_; i++) {
-            items_[i].revents = 0;
-
-            //  The poll item is a 0MQ socket. Retrieve pending events
-            //  using the ZMQ_EVENTS socket option.
-            if (items_[i].socket) {
-                size_t zmq_events_size = sizeof (uint32_t);
-                uint32_t zmq_events;
-                if (zmq_getsockopt (items_[i].socket, ZMQ_EVENTS, &zmq_events,
-                                    &zmq_events_size)
-                    == -1)
-                    return -1;
-                if ((items_[i].events & ZMQ_POLLOUT)
-                    && (zmq_events & ZMQ_POLLOUT))
-                    items_[i].revents |= ZMQ_POLLOUT;
-                if ((items_[i].events & ZMQ_POLLIN)
-                    && (zmq_events & ZMQ_POLLIN))
-                    items_[i].revents |= ZMQ_POLLIN;
-            }
-            //  Else, the poll item is a raw file descriptor, simply convert
-            //  the events to zmq_pollitem_t-style format.
-            else {
-                if (FD_ISSET (items_[i].fd, inset.get ()))
-                    items_[i].revents |= ZMQ_POLLIN;
-                if (FD_ISSET (items_[i].fd, outset.get ()))
-                    items_[i].revents |= ZMQ_POLLOUT;
-                if (FD_ISSET (items_[i].fd, errset.get ()))
-                    items_[i].revents |= ZMQ_POLLERR;
-            }
-
-            if (items_[i].revents)
-                nevents++;
-        }
-#endif
-
-        //  If timeout is zero, exit immediately whether there are events or not.
-        if (timeout_ == 0)
-            break;
-
-        //  If there are events to return, we can exit immediately.
-        if (nevents)
-            break;
-
-        //  At this point we are meant to wait for events but there are none.
-        //  If timeout is infinite we can just loop until we get some events.
-        if (timeout_ < 0) {
-            if (first_pass)
-                first_pass = false;
-            continue;
-        }
-
-        //  The timeout is finite and there are no events. In the first pass
-        //  we get a timestamp of when the polling have begun. (We assume that
-        //  first pass have taken negligible time). We also compute the time
-        //  when the polling should time out.
-        if (first_pass) {
-            now = clock.now_ms ();
-            end = now + timeout_;
-            if (now == end)
-                break;
-            first_pass = false;
-            continue;
-        }
-
-        //  Find out whether timeout have expired.
-        now = clock.now_ms ();
-        if (now >= end)
-            break;
-    }
-
-    return nevents;
-#else
-    //  Exotic platforms that support neither poll() nor select().
-    errno = ENOTSUP;
-    return -1;
-#endif
-}
-
-//  The poller functionality
-
-void *zmq_poller_new (void)
-{
-    zmq::socket_poller_t *poller = new (std::nothrow) zmq::socket_poller_t;
-    if (!poller) {
-        errno = ENOMEM;
-    }
-    return poller;
-}
-
-int zmq_poller_destroy (void **poller_p_)
-{
-    if (poller_p_) {
-        const zmq::socket_poller_t *const poller =
-          static_cast<const zmq::socket_poller_t *> (*poller_p_);
-        if (poller && poller->check_tag ()) {
-            delete poller;
-            *poller_p_ = NULL;
-            return 0;
-        }
-    }
-    errno = EFAULT;
-    return -1;
-}
-
-
-static int check_poller (void *const poller_)
-{
-    if (!poller_
-        || !(static_cast<zmq::socket_poller_t *> (poller_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return 0;
-}
-
-static int check_events (const short events_)
-{
-    if (events_ & ~(ZMQ_POLLIN | ZMQ_POLLOUT | ZMQ_POLLERR | ZMQ_POLLPRI)) {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
-
-static int check_poller_registration_args (void *const poller_, void *const s_)
-{
-    if (-1 == check_poller (poller_))
-        return -1;
-
-    if (!s_ || !(static_cast<zmq::socket_base_t *> (s_))->check_tag ()) {
-        errno = ENOTSOCK;
-        return -1;
-    }
-
-    return 0;
-}
-
-static int check_poller_fd_registration_args (void *const poller_,
-                                              const zmq::fd_t fd_)
-{
-    if (-1 == check_poller (poller_))
-        return -1;
-
-    if (fd_ == zmq::retired_fd) {
-        errno = EBADF;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq_poller_size (void *poller_)
-{
-    if (-1 == check_poller (poller_))
-        return -1;
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))->size ();
-}
-
-int zmq_poller_add (void *poller_, void *s_, void *user_data_, short events_)
-{
-    if (-1 == check_poller_registration_args (poller_, s_)
-        || -1 == check_events (events_))
-        return -1;
-
-    zmq::socket_base_t *socket = static_cast<zmq::socket_base_t *> (s_);
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))
-      ->add (socket, user_data_, events_);
-}
-
-int zmq_poller_add_fd (void *poller_,
-                       zmq::fd_t fd_,
-                       void *user_data_,
-                       short events_)
-{
-    if (-1 == check_poller_fd_registration_args (poller_, fd_)
-        || -1 == check_events (events_))
-        return -1;
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))
-      ->add_fd (fd_, user_data_, events_);
-}
-
-
-int zmq_poller_modify (void *poller_, void *s_, short events_)
-{
-    if (-1 == check_poller_registration_args (poller_, s_)
-        || -1 == check_events (events_))
-        return -1;
-
-    const zmq::socket_base_t *const socket =
-      static_cast<const zmq::socket_base_t *> (s_);
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))
-      ->modify (socket, events_);
-}
-
-int zmq_poller_modify_fd (void *poller_, zmq::fd_t fd_, short events_)
-{
-    if (-1 == check_poller_fd_registration_args (poller_, fd_)
-        || -1 == check_events (events_))
-        return -1;
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))
-      ->modify_fd (fd_, events_);
-}
-
-int zmq_poller_remove (void *poller_, void *s_)
-{
-    if (-1 == check_poller_registration_args (poller_, s_))
-        return -1;
-
-    zmq::socket_base_t *socket = static_cast<zmq::socket_base_t *> (s_);
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))->remove (socket);
-}
-
-int zmq_poller_remove_fd (void *poller_, zmq::fd_t fd_)
-{
-    if (-1 == check_poller_fd_registration_args (poller_, fd_))
-        return -1;
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))->remove_fd (fd_);
-}
-
-int zmq_poller_wait (void *poller_, zmq_poller_event_t *event_, long timeout_)
-{
-    const int rc = zmq_poller_wait_all (poller_, event_, 1, timeout_);
-
-    if (rc < 0 && event_) {
-        event_->socket = NULL;
-        event_->fd = zmq::retired_fd;
-        event_->user_data = NULL;
-        event_->events = 0;
-    }
-    // wait_all returns number of events, but we return 0 for any success
-    return rc >= 0 ? 0 : rc;
-}
-
-int zmq_poller_wait_all (void *poller_,
-                         zmq_poller_event_t *events_,
-                         int n_events_,
-                         long timeout_)
-{
-    if (-1 == check_poller (poller_))
-        return -1;
-
-    if (!events_) {
-        errno = EFAULT;
-        return -1;
-    }
-    if (n_events_ < 0) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    const int rc =
-      (static_cast<zmq::socket_poller_t *> (poller_))
-        ->wait (reinterpret_cast<zmq::socket_poller_t::event_t *> (events_),
-                n_events_, timeout_);
-
-    return rc;
-}
-
-int zmq_poller_fd (void *poller_, zmq_fd_t *fd_)
-{
-    if (!poller_
-        || !(static_cast<zmq::socket_poller_t *> (poller_)->check_tag ())) {
-        errno = EFAULT;
-        return -1;
-    }
-    return static_cast<zmq::socket_poller_t *> (poller_)->signaler_fd (fd_);
-}
-
-//  Peer-specific state
-
-int zmq_socket_get_peer_state (void *s_,
-                               const void *routing_id_,
-                               size_t routing_id_size_)
-{
-    const zmq::socket_base_t *const s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-
-    return s->get_peer_state (routing_id_, routing_id_size_);
-}
-
-//  Timers
-
-void *zmq_timers_new (void)
-{
-    zmq::timers_t *timers = new (std::nothrow) zmq::timers_t;
-    alloc_assert (timers);
-    return timers;
-}
-
-int zmq_timers_destroy (void **timers_p_)
-{
-    void *timers = *timers_p_;
-    if (!timers || !(static_cast<zmq::timers_t *> (timers))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-    delete (static_cast<zmq::timers_t *> (timers));
-    *timers_p_ = NULL;
-    return 0;
-}
-
-int zmq_timers_add (void *timers_,
-                    size_t interval_,
-                    zmq_timer_fn handler_,
-                    void *arg_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))
-      ->add (interval_, handler_, arg_);
-}
-
-int zmq_timers_cancel (void *timers_, int timer_id_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))->cancel (timer_id_);
-}
-
-int zmq_timers_set_interval (void *timers_, int timer_id_, size_t interval_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))
-      ->set_interval (timer_id_, interval_);
-}
-
-int zmq_timers_reset (void *timers_, int timer_id_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))->reset (timer_id_);
-}
-
-long zmq_timers_timeout (void *timers_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))->timeout ();
-}
-
-int zmq_timers_execute (void *timers_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))->execute ();
-}
-
-//  The proxy functionality
-
-int zmq_proxy (void *frontend_, void *backend_, void *capture_)
-{
-    if (!frontend_ || !backend_) {
-        errno = EFAULT;
-        return -1;
-    }
-    return zmq::proxy (static_cast<zmq::socket_base_t *> (frontend_),
-                       static_cast<zmq::socket_base_t *> (backend_),
-                       static_cast<zmq::socket_base_t *> (capture_));
-}
-
-int zmq_proxy_steerable (void *frontend_,
-                         void *backend_,
-                         void *capture_,
-                         void *control_)
-{
-    if (!frontend_ || !backend_) {
-        errno = EFAULT;
-        return -1;
-    }
-    return zmq::proxy (static_cast<zmq::socket_base_t *> (frontend_),
-                       static_cast<zmq::socket_base_t *> (backend_),
-                       static_cast<zmq::socket_base_t *> (capture_),
-                       static_cast<zmq::socket_base_t *> (control_));
-}
-
-//  The deprecated device functionality
-
-int zmq_device (int /* type */, void *frontend_, void *backend_)
-{
-    return zmq::proxy (static_cast<zmq::socket_base_t *> (frontend_),
-                       static_cast<zmq::socket_base_t *> (backend_), NULL);
-}
-
-//  Probe library capabilities; for now, reports on transport and security
-
-int zmq_has (const char *capability_)
-{
-#if defined(ZMQ_HAVE_IPC)
-    if (strcmp (capability_, zmq::protocol_name::ipc) == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_OPENPGM)
-    if (strcmp (capability_, zmq::protocol_name::pgm) == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_TIPC)
-    if (strcmp (capability_, zmq::protocol_name::tipc) == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_NORM)
-    if (strcmp (capability_, zmq::protocol_name::norm) == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_CURVE)
-    if (strcmp (capability_, "curve") == 0)
-        return true;
-#endif
-#if defined(HAVE_LIBGSSAPI_KRB5)
-    if (strcmp (capability_, "gssapi") == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_VMCI)
-    if (strcmp (capability_, zmq::protocol_name::vmci) == 0)
-        return true;
-#endif
-#if defined(ZMQ_BUILD_DRAFT_API)
-    if (strcmp (capability_, "draft") == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_WS)
-    if (strcmp (capability_, "WS") == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_WSS)
-    if (strcmp (capability_, "WSS") == 0)
-        return true;
-#endif
-    //  Whatever the application asked for, we don't have
-    return false;
-}
-
-int zmq_socket_monitor_pipes_stats (void *s_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->query_pipes_stats ();
-}
diff --git a/src/zmq_draft.h b/src/zmq_draft.h
deleted file mode 100644
index 63fd508a9..000000000
--- a/src/zmq_draft.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DRAFT_H_INCLUDED__
-#define __ZMQ_DRAFT_H_INCLUDED__
-
-/******************************************************************************/
-/*  These functions are DRAFT and disabled in stable releases, and subject to */
-/*  change at ANY time until declared stable.                                 */
-/******************************************************************************/
-
-#ifndef ZMQ_BUILD_DRAFT_API
-
-/*  DRAFT Socket types.                                                       */
-#define ZMQ_SERVER 12
-#define ZMQ_CLIENT 13
-#define ZMQ_RADIO 14
-#define ZMQ_DISH 15
-#define ZMQ_GATHER 16
-#define ZMQ_SCATTER 17
-#define ZMQ_DGRAM 18
-#define ZMQ_PEER 19
-#define ZMQ_CHANNEL 20
-
-/*  DRAFT Socket options.                                                     */
-#define ZMQ_ZAP_ENFORCE_DOMAIN 93
-#define ZMQ_LOOPBACK_FASTPATH 94
-#define ZMQ_METADATA 95
-#define ZMQ_MULTICAST_LOOP 96
-#define ZMQ_ROUTER_NOTIFY 97
-#define ZMQ_XPUB_MANUAL_LAST_VALUE 98
-#define ZMQ_SOCKS_USERNAME 99
-#define ZMQ_SOCKS_PASSWORD 100
-#define ZMQ_IN_BATCH_SIZE 101
-#define ZMQ_OUT_BATCH_SIZE 102
-#define ZMQ_WSS_KEY_PEM 103
-#define ZMQ_WSS_CERT_PEM 104
-#define ZMQ_WSS_TRUST_PEM 105
-#define ZMQ_WSS_HOSTNAME 106
-#define ZMQ_WSS_TRUST_SYSTEM 107
-#define ZMQ_ONLY_FIRST_SUBSCRIBE 108
-#define ZMQ_RECONNECT_STOP 109
-#define ZMQ_HELLO_MSG 110
-#define ZMQ_DISCONNECT_MSG 111
-
-/*  DRAFT ZMQ_RECONNECT_STOP options                                          */
-#define ZMQ_RECONNECT_STOP_CONN_REFUSED 0x1
-
-/*  DRAFT Context options                                                     */
-#define ZMQ_ZERO_COPY_RECV 10
-
-/*  DRAFT Context methods.                                                    */
-int zmq_ctx_set_ext (void *context_,
-                     int option_,
-                     const void *optval_,
-                     size_t optvallen_);
-int zmq_ctx_get_ext (void *context_,
-                     int option_,
-                     void *optval_,
-                     size_t *optvallen_);
-
-/*  DRAFT Socket methods.                                                     */
-int zmq_join (void *s_, const char *group_);
-int zmq_leave (void *s_, const char *group_);
-
-/*  DRAFT Msg methods.                                                        */
-int zmq_msg_set_routing_id (zmq_msg_t *msg_, uint32_t routing_id_);
-uint32_t zmq_msg_routing_id (zmq_msg_t *msg_);
-int zmq_msg_set_group (zmq_msg_t *msg_, const char *group_);
-const char *zmq_msg_group (zmq_msg_t *msg_);
-int zmq_msg_init_buffer (zmq_msg_t *msg_, const void *buf_, size_t size_);
-
-/*  DRAFT Msg property names.                                                 */
-#define ZMQ_MSG_PROPERTY_ROUTING_ID "Routing-Id"
-#define ZMQ_MSG_PROPERTY_SOCKET_TYPE "Socket-Type"
-#define ZMQ_MSG_PROPERTY_USER_ID "User-Id"
-#define ZMQ_MSG_PROPERTY_PEER_ADDRESS "Peer-Address"
-
-/*  Router notify options                                                     */
-#define ZMQ_NOTIFY_CONNECT 1
-#define ZMQ_NOTIFY_DISCONNECT 2
-
-/******************************************************************************/
-/*  Poller polling on sockets,fd and thread-safe sockets                      */
-/******************************************************************************/
-
-#if defined _WIN32
-typedef SOCKET zmq_fd_t;
-#else
-typedef int zmq_fd_t;
-#endif
-
-typedef struct zmq_poller_event_t
-{
-    void *socket;
-    zmq_fd_t fd;
-    void *user_data;
-    short events;
-} zmq_poller_event_t;
-
-void *zmq_poller_new (void);
-int zmq_poller_destroy (void **poller_p_);
-int zmq_poller_size (void *poller_);
-int zmq_poller_add (void *poller_,
-                    void *socket_,
-                    void *user_data_,
-                    short events_);
-int zmq_poller_modify (void *poller_, void *socket_, short events_);
-int zmq_poller_remove (void *poller_, void *socket_);
-int zmq_poller_wait (void *poller_, zmq_poller_event_t *event_, long timeout_);
-int zmq_poller_wait_all (void *poller_,
-                         zmq_poller_event_t *events_,
-                         int n_events_,
-                         long timeout_);
-zmq_fd_t zmq_poller_fd (void *poller_);
-
-int zmq_poller_add_fd (void *poller_,
-                       zmq_fd_t fd_,
-                       void *user_data_,
-                       short events_);
-int zmq_poller_modify_fd (void *poller_, zmq_fd_t fd_, short events_);
-int zmq_poller_remove_fd (void *poller_, zmq_fd_t fd_);
-
-int zmq_socket_get_peer_state (void *socket_,
-                               const void *routing_id_,
-                               size_t routing_id_size_);
-
-/*  DRAFT Socket monitoring events                                            */
-#define ZMQ_EVENT_PIPES_STATS 0x10000
-
-#define ZMQ_CURRENT_EVENT_VERSION 1
-#define ZMQ_CURRENT_EVENT_VERSION_DRAFT 2
-
-#define ZMQ_EVENT_ALL_V1 ZMQ_EVENT_ALL
-#define ZMQ_EVENT_ALL_V2 ZMQ_EVENT_ALL_V1 | ZMQ_EVENT_PIPES_STATS
-
-int zmq_socket_monitor_versioned (
-  void *s_, const char *addr_, uint64_t events_, int event_version_, int type_);
-int zmq_socket_monitor_pipes_stats (void *s_);
-
-#endif // ZMQ_BUILD_DRAFT_API
-
-#endif //ifndef __ZMQ_DRAFT_H_INCLUDED__
diff --git a/src/zmq_utils.cpp b/src/zmq_utils.cpp
deleted file mode 100644
index a42d732a2..000000000
--- a/src/zmq_utils.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "macros.hpp"
-#include "clock.hpp"
-#include "err.hpp"
-#include "thread.hpp"
-#include "atomic_counter.hpp"
-#include "atomic_ptr.hpp"
-#include "random.hpp"
-#include <assert.h>
-#include <new>
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#if defined(ZMQ_USE_TWEETNACL)
-#include "tweetnacl.h"
-#elif defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-void zmq_sleep (int seconds_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    Sleep (seconds_ * 1000);
-#else
-    sleep (seconds_);
-#endif
-}
-
-void *zmq_stopwatch_start ()
-{
-    uint64_t *watch = static_cast<uint64_t *> (malloc (sizeof (uint64_t)));
-    alloc_assert (watch);
-    *watch = zmq::clock_t::now_us ();
-    return static_cast<void *> (watch);
-}
-
-unsigned long zmq_stopwatch_intermediate (void *watch_)
-{
-    const uint64_t end = zmq::clock_t::now_us ();
-    const uint64_t start = *static_cast<uint64_t *> (watch_);
-    return static_cast<unsigned long> (end - start);
-}
-
-unsigned long zmq_stopwatch_stop (void *watch_)
-{
-    const unsigned long res = zmq_stopwatch_intermediate (watch_);
-    free (watch_);
-    return res;
-}
-
-void *zmq_threadstart (zmq_thread_fn *func_, void *arg_)
-{
-    zmq::thread_t *thread = new (std::nothrow) zmq::thread_t;
-    alloc_assert (thread);
-    thread->start (func_, arg_, "ZMQapp");
-    return thread;
-}
-
-void zmq_threadclose (void *thread_)
-{
-    zmq::thread_t *p_thread = static_cast<zmq::thread_t *> (thread_);
-    p_thread->stop ();
-    LIBZMQ_DELETE (p_thread);
-}
-
-//  Z85 codec, taken from 0MQ RFC project, implements RFC32 Z85 encoding
-
-//  Maps base 256 to base 85
-static char encoder[85 + 1] = {"0123456789"
-                               "abcdefghij"
-                               "klmnopqrst"
-                               "uvwxyzABCD"
-                               "EFGHIJKLMN"
-                               "OPQRSTUVWX"
-                               "YZ.-:+=^!/"
-                               "*?&<>()[]{"
-                               "}@%$#"};
-
-//  Maps base 85 to base 256
-//  We chop off lower 32 and higher 128 ranges
-//  0xFF denotes invalid characters within this range
-static uint8_t decoder[96] = {
-  0xFF, 0x44, 0xFF, 0x54, 0x53, 0x52, 0x48, 0xFF, 0x4B, 0x4C, 0x46, 0x41,
-  0xFF, 0x3F, 0x3E, 0x45, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-  0x08, 0x09, 0x40, 0xFF, 0x49, 0x42, 0x4A, 0x47, 0x51, 0x24, 0x25, 0x26,
-  0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32,
-  0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x4D,
-  0xFF, 0x4E, 0x43, 0xFF, 0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
-  0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C,
-  0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x4F, 0xFF, 0x50, 0xFF, 0xFF};
-
-//  --------------------------------------------------------------------------
-//  Encode a binary frame as a string; destination string MUST be at least
-//  size * 5 / 4 bytes long plus 1 byte for the null terminator. Returns
-//  dest. Size must be a multiple of 4.
-//  Returns NULL and sets errno = EINVAL for invalid input.
-
-char *zmq_z85_encode (char *dest_, const uint8_t *data_, size_t size_)
-{
-    if (size_ % 4 != 0) {
-        errno = EINVAL;
-        return NULL;
-    }
-    unsigned int char_nbr = 0;
-    unsigned int byte_nbr = 0;
-    uint32_t value = 0;
-    while (byte_nbr < size_) {
-        //  Accumulate value in base 256 (binary)
-        value = value * 256 + data_[byte_nbr++];
-        if (byte_nbr % 4 == 0) {
-            //  Output value in base 85
-            unsigned int divisor = 85 * 85 * 85 * 85;
-            while (divisor) {
-                dest_[char_nbr++] = encoder[value / divisor % 85];
-                divisor /= 85;
-            }
-            value = 0;
-        }
-    }
-    assert (char_nbr == size_ * 5 / 4);
-    dest_[char_nbr] = 0;
-    return dest_;
-}
-
-
-//  --------------------------------------------------------------------------
-//  Decode an encoded string into a binary frame; dest must be at least
-//  strlen (string) * 4 / 5 bytes long. Returns dest. strlen (string)
-//  must be a multiple of 5.
-//  Returns NULL and sets errno = EINVAL for invalid input.
-
-uint8_t *zmq_z85_decode (uint8_t *dest_, const char *string_)
-{
-    unsigned int byte_nbr = 0;
-    unsigned int char_nbr = 0;
-    uint32_t value = 0;
-    while (string_[char_nbr]) {
-        //  Accumulate value in base 85
-        if (UINT32_MAX / 85 < value) {
-            //  Invalid z85 encoding, represented value exceeds 0xffffffff
-            goto error_inval;
-        }
-        value *= 85;
-        const uint8_t index = string_[char_nbr++] - 32;
-        if (index >= sizeof (decoder)) {
-            //  Invalid z85 encoding, character outside range
-            goto error_inval;
-        }
-        const uint32_t summand = decoder[index];
-        if (summand == 0xFF || summand > (UINT32_MAX - value)) {
-            //  Invalid z85 encoding, invalid character or represented value exceeds 0xffffffff
-            goto error_inval;
-        }
-        value += summand;
-        if (char_nbr % 5 == 0) {
-            //  Output value in base 256
-            unsigned int divisor = 256 * 256 * 256;
-            while (divisor) {
-                dest_[byte_nbr++] = value / divisor % 256;
-                divisor /= 256;
-            }
-            value = 0;
-        }
-    }
-    if (char_nbr % 5 != 0) {
-        goto error_inval;
-    }
-    assert (byte_nbr == strlen (string_) * 4 / 5);
-    return dest_;
-
-error_inval:
-    errno = EINVAL;
-    return NULL;
-}
-
-//  --------------------------------------------------------------------------
-//  Generate a public/private keypair with tweetnacl or libsodium.
-//  Generated keys will be 40 byte z85-encoded strings.
-//  Returns 0 on success, -1 on failure, setting errno.
-//  Sets errno = ENOTSUP in the absence of a CURVE library.
-
-int zmq_curve_keypair (char *z85_public_key_, char *z85_secret_key_)
-{
-#if defined(ZMQ_HAVE_CURVE)
-#if crypto_box_PUBLICKEYBYTES != 32 || crypto_box_SECRETKEYBYTES != 32
-#error "CURVE encryption library not built correctly"
-#endif
-
-    uint8_t public_key[32];
-    uint8_t secret_key[32];
-
-    zmq::random_open ();
-
-    const int res = crypto_box_keypair (public_key, secret_key);
-    zmq_z85_encode (z85_public_key_, public_key, 32);
-    zmq_z85_encode (z85_secret_key_, secret_key, 32);
-
-    zmq::random_close ();
-
-    return res;
-#else
-    (void) z85_public_key_, (void) z85_secret_key_;
-    errno = ENOTSUP;
-    return -1;
-#endif
-}
-
-//  --------------------------------------------------------------------------
-//  Derive the public key from a private key using tweetnacl or libsodium.
-//  Derived key will be 40 byte z85-encoded string.
-//  Returns 0 on success, -1 on failure, setting errno.
-//  Sets errno = ENOTSUP in the absence of a CURVE library.
-
-int zmq_curve_public (char *z85_public_key_, const char *z85_secret_key_)
-{
-#if defined(ZMQ_HAVE_CURVE)
-#if crypto_box_PUBLICKEYBYTES != 32 || crypto_box_SECRETKEYBYTES != 32
-#error "CURVE encryption library not built correctly"
-#endif
-
-    uint8_t public_key[32];
-    uint8_t secret_key[32];
-
-    zmq::random_open ();
-
-    if (zmq_z85_decode (secret_key, z85_secret_key_) == NULL)
-        return -1;
-
-    // Return codes are suppressed as none of these can actually fail.
-    crypto_scalarmult_base (public_key, secret_key);
-    zmq_z85_encode (z85_public_key_, public_key, 32);
-
-    zmq::random_close ();
-
-    return 0;
-#else
-    (void) z85_public_key_, (void) z85_secret_key_;
-    errno = ENOTSUP;
-    return -1;
-#endif
-}
-
-
-//  --------------------------------------------------------------------------
-//  Initialize a new atomic counter, which is set to zero
-
-void *zmq_atomic_counter_new (void)
-{
-    zmq::atomic_counter_t *counter = new (std::nothrow) zmq::atomic_counter_t;
-    alloc_assert (counter);
-    return counter;
-}
-
-//  Se the value of the atomic counter
-
-void zmq_atomic_counter_set (void *counter_, int value_)
-{
-    (static_cast<zmq::atomic_counter_t *> (counter_))->set (value_);
-}
-
-//  Increment the atomic counter, and return the old value
-
-int zmq_atomic_counter_inc (void *counter_)
-{
-    return (static_cast<zmq::atomic_counter_t *> (counter_))->add (1);
-}
-
-//  Decrement the atomic counter and return 1 (if counter >= 1), or
-//  0 if counter hit zero.
-
-int zmq_atomic_counter_dec (void *counter_)
-{
-    return (static_cast<zmq::atomic_counter_t *> (counter_))->sub (1) ? 1 : 0;
-}
-
-//  Return actual value of atomic counter
-
-int zmq_atomic_counter_value (void *counter_)
-{
-    return (static_cast<zmq::atomic_counter_t *> (counter_))->get ();
-}
-
-//  Destroy atomic counter, and set reference to NULL
-
-void zmq_atomic_counter_destroy (void **counter_p_)
-{
-    delete (static_cast<zmq::atomic_counter_t *> (*counter_p_));
-    *counter_p_ = NULL;
-}
diff --git a/src/zmtp_engine.cpp b/src/zmtp_engine.cpp
deleted file mode 100644
index b722919b1..000000000
--- a/src/zmtp_engine.cpp
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#include <limits.h>
-#include <string.h>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <new>
-#include <sstream>
-
-#include "zmtp_engine.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "v1_encoder.hpp"
-#include "v1_decoder.hpp"
-#include "v2_encoder.hpp"
-#include "v2_decoder.hpp"
-#include "v3_1_encoder.hpp"
-#include "null_mechanism.hpp"
-#include "plain_client.hpp"
-#include "plain_server.hpp"
-#include "gssapi_client.hpp"
-#include "gssapi_server.hpp"
-#include "curve_client.hpp"
-#include "curve_server.hpp"
-#include "raw_decoder.hpp"
-#include "raw_encoder.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-zmq::zmtp_engine_t::zmtp_engine_t (
-  fd_t fd_,
-  const options_t &options_,
-  const endpoint_uri_pair_t &endpoint_uri_pair_) :
-    stream_engine_base_t (fd_, options_, endpoint_uri_pair_, true),
-    _greeting_size (v2_greeting_size),
-    _greeting_bytes_read (0),
-    _subscription_required (false),
-    _heartbeat_timeout (0)
-{
-    _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &zmtp_engine_t::routing_id_msg);
-    _process_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &zmtp_engine_t::process_routing_id_msg);
-
-    int rc = _pong_msg.init ();
-    errno_assert (rc == 0);
-
-    rc = _routing_id_msg.init ();
-    errno_assert (rc == 0);
-
-    if (_options.heartbeat_interval > 0) {
-        _heartbeat_timeout = _options.heartbeat_timeout;
-        if (_heartbeat_timeout == -1)
-            _heartbeat_timeout = _options.heartbeat_interval;
-    }
-}
-
-zmq::zmtp_engine_t::~zmtp_engine_t ()
-{
-    const int rc = _routing_id_msg.close ();
-    errno_assert (rc == 0);
-}
-
-void zmq::zmtp_engine_t::plug_internal ()
-{
-    // start optional timer, to prevent handshake hanging on no input
-    set_handshake_timer ();
-
-    //  Send the 'length' and 'flags' fields of the routing id message.
-    //  The 'length' field is encoded in the long format.
-    _outpos = _greeting_send;
-    _outpos[_outsize++] = UCHAR_MAX;
-    put_uint64 (&_outpos[_outsize], _options.routing_id_size + 1);
-    _outsize += 8;
-    _outpos[_outsize++] = 0x7f;
-
-    set_pollin ();
-    set_pollout ();
-    //  Flush all the data that may have been already received downstream.
-    in_event ();
-}
-
-//  Position of the revision and minor fields in the greeting.
-const size_t revision_pos = 10;
-const size_t minor_pos = 11;
-
-bool zmq::zmtp_engine_t::handshake ()
-{
-    zmq_assert (_greeting_bytes_read < _greeting_size);
-    //  Receive the greeting.
-    const int rc = receive_greeting ();
-    if (rc == -1)
-        return false;
-    const bool unversioned = rc != 0;
-
-    if (!(this
-            ->*select_handshake_fun (unversioned, _greeting_recv[revision_pos],
-                                     _greeting_recv[minor_pos])) ())
-        return false;
-
-    // Start polling for output if necessary.
-    if (_outsize == 0)
-        set_pollout ();
-
-    if (_has_handshake_timer) {
-        cancel_timer (handshake_timer_id);
-        _has_handshake_timer = false;
-    }
-
-    return true;
-}
-
-int zmq::zmtp_engine_t::receive_greeting ()
-{
-    bool unversioned = false;
-    while (_greeting_bytes_read < _greeting_size) {
-        const int n = read (_greeting_recv + _greeting_bytes_read,
-                            _greeting_size - _greeting_bytes_read);
-        if (n == -1) {
-            if (errno != EAGAIN)
-                error (connection_error);
-            return -1;
-        }
-
-        _greeting_bytes_read += n;
-
-        //  We have received at least one byte from the peer.
-        //  If the first byte is not 0xff, we know that the
-        //  peer is using unversioned protocol.
-        if (_greeting_recv[0] != 0xff) {
-            unversioned = true;
-            break;
-        }
-
-        if (_greeting_bytes_read < signature_size)
-            continue;
-
-        //  Inspect the right-most bit of the 10th byte (which coincides
-        //  with the 'flags' field if a regular message was sent).
-        //  Zero indicates this is a header of a routing id message
-        //  (i.e. the peer is using the unversioned protocol).
-        if (!(_greeting_recv[9] & 0x01)) {
-            unversioned = true;
-            break;
-        }
-
-        //  The peer is using versioned protocol.
-        receive_greeting_versioned ();
-    }
-    return unversioned ? 1 : 0;
-}
-
-void zmq::zmtp_engine_t::receive_greeting_versioned ()
-{
-    //  Send the major version number.
-    if (_outpos + _outsize == _greeting_send + signature_size) {
-        if (_outsize == 0)
-            set_pollout ();
-        _outpos[_outsize++] = 3; //  Major version number
-    }
-
-    if (_greeting_bytes_read > signature_size) {
-        if (_outpos + _outsize == _greeting_send + signature_size + 1) {
-            if (_outsize == 0)
-                set_pollout ();
-
-            //  Use ZMTP/2.0 to talk to older peers.
-            if (_greeting_recv[revision_pos] == ZMTP_1_0
-                || _greeting_recv[revision_pos] == ZMTP_2_0)
-                _outpos[_outsize++] = _options.type;
-            else {
-                _outpos[_outsize++] = 1; //  Minor version number
-                memset (_outpos + _outsize, 0, 20);
-
-                zmq_assert (_options.mechanism == ZMQ_NULL
-                            || _options.mechanism == ZMQ_PLAIN
-                            || _options.mechanism == ZMQ_CURVE
-                            || _options.mechanism == ZMQ_GSSAPI);
-
-                if (_options.mechanism == ZMQ_NULL)
-                    memcpy (_outpos + _outsize, "NULL", 4);
-                else if (_options.mechanism == ZMQ_PLAIN)
-                    memcpy (_outpos + _outsize, "PLAIN", 5);
-                else if (_options.mechanism == ZMQ_GSSAPI)
-                    memcpy (_outpos + _outsize, "GSSAPI", 6);
-                else if (_options.mechanism == ZMQ_CURVE)
-                    memcpy (_outpos + _outsize, "CURVE", 5);
-                _outsize += 20;
-                memset (_outpos + _outsize, 0, 32);
-                _outsize += 32;
-                _greeting_size = v3_greeting_size;
-            }
-        }
-    }
-}
-
-zmq::zmtp_engine_t::handshake_fun_t zmq::zmtp_engine_t::select_handshake_fun (
-  bool unversioned_, unsigned char revision_, unsigned char minor_)
-{
-    //  Is the peer using ZMTP/1.0 with no revision number?
-    if (unversioned_) {
-        return &zmtp_engine_t::handshake_v1_0_unversioned;
-    }
-    switch (revision_) {
-        case ZMTP_1_0:
-            return &zmtp_engine_t::handshake_v1_0;
-        case ZMTP_2_0:
-            return &zmtp_engine_t::handshake_v2_0;
-        case ZMTP_3_x:
-            switch (minor_) {
-                case 0:
-                    return &zmtp_engine_t::handshake_v3_0;
-                default:
-                    return &zmtp_engine_t::handshake_v3_1;
-            }
-        default:
-            return &zmtp_engine_t::handshake_v3_1;
-    }
-}
-
-bool zmq::zmtp_engine_t::handshake_v1_0_unversioned ()
-{
-    //  We send and receive rest of routing id message
-    if (session ()->zap_enabled ()) {
-        // reject ZMTP 1.0 connections if ZAP is enabled
-        error (protocol_error);
-        return false;
-    }
-
-    _encoder = new (std::nothrow) v1_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow)
-      v1_decoder_t (_options.in_batch_size, _options.maxmsgsize);
-    alloc_assert (_decoder);
-
-    //  We have already sent the message header.
-    //  Since there is no way to tell the encoder to
-    //  skip the message header, we simply throw that
-    //  header data away.
-    const size_t header_size =
-      _options.routing_id_size + 1 >= UCHAR_MAX ? 10 : 2;
-    unsigned char tmp[10], *bufferp = tmp;
-
-    //  Prepare the routing id message and load it into encoder.
-    //  Then consume bytes we have already sent to the peer.
-    int rc = _routing_id_msg.close ();
-    zmq_assert (rc == 0);
-    rc = _routing_id_msg.init_size (_options.routing_id_size);
-    zmq_assert (rc == 0);
-    memcpy (_routing_id_msg.data (), _options.routing_id,
-            _options.routing_id_size);
-    _encoder->load_msg (&_routing_id_msg);
-    const size_t buffer_size = _encoder->encode (&bufferp, header_size);
-    zmq_assert (buffer_size == header_size);
-
-    //  Make sure the decoder sees the data we have already received.
-    _inpos = _greeting_recv;
-    _insize = _greeting_bytes_read;
-
-    //  To allow for interoperability with peers that do not forward
-    //  their subscriptions, we inject a phantom subscription message
-    //  message into the incoming message stream.
-    if (_options.type == ZMQ_PUB || _options.type == ZMQ_XPUB)
-        _subscription_required = true;
-
-    //  We are sending our routing id now and the next message
-    //  will come from the socket.
-    _next_msg = &zmtp_engine_t::pull_msg_from_session;
-
-    //  We are expecting routing id message.
-    _process_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &zmtp_engine_t::process_routing_id_msg);
-
-    return true;
-}
-
-bool zmq::zmtp_engine_t::handshake_v1_0 ()
-{
-    if (session ()->zap_enabled ()) {
-        // reject ZMTP 1.0 connections if ZAP is enabled
-        error (protocol_error);
-        return false;
-    }
-
-    _encoder = new (std::nothrow) v1_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow)
-      v1_decoder_t (_options.in_batch_size, _options.maxmsgsize);
-    alloc_assert (_decoder);
-
-    return true;
-}
-
-bool zmq::zmtp_engine_t::handshake_v2_0 ()
-{
-    if (session ()->zap_enabled ()) {
-        // reject ZMTP 2.0 connections if ZAP is enabled
-        error (protocol_error);
-        return false;
-    }
-
-    _encoder = new (std::nothrow) v2_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow) v2_decoder_t (
-      _options.in_batch_size, _options.maxmsgsize, _options.zero_copy);
-    alloc_assert (_decoder);
-
-    return true;
-}
-
-bool zmq::zmtp_engine_t::handshake_v3_x (const bool downgrade_sub_)
-{
-    if (_options.mechanism == ZMQ_NULL
-        && memcmp (_greeting_recv + 12, "NULL\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                   20)
-             == 0) {
-        _mechanism = new (std::nothrow)
-          null_mechanism_t (session (), _peer_address, _options);
-        alloc_assert (_mechanism);
-    } else if (_options.mechanism == ZMQ_PLAIN
-               && memcmp (_greeting_recv + 12,
-                          "PLAIN\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20)
-                    == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow)
-              plain_server_t (session (), _peer_address, _options);
-        else
-            _mechanism =
-              new (std::nothrow) plain_client_t (session (), _options);
-        alloc_assert (_mechanism);
-    }
-#ifdef ZMQ_HAVE_CURVE
-    else if (_options.mechanism == ZMQ_CURVE
-             && memcmp (_greeting_recv + 12,
-                        "CURVE\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20)
-                  == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow) curve_server_t (
-              session (), _peer_address, _options, downgrade_sub_);
-        else
-            _mechanism = new (std::nothrow)
-              curve_client_t (session (), _options, downgrade_sub_);
-        alloc_assert (_mechanism);
-    }
-#endif
-#ifdef HAVE_LIBGSSAPI_KRB5
-    else if (_options.mechanism == ZMQ_GSSAPI
-             && memcmp (_greeting_recv + 12,
-                        "GSSAPI\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20)
-                  == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow)
-              gssapi_server_t (session (), _peer_address, _options);
-        else
-            _mechanism =
-              new (std::nothrow) gssapi_client_t (session (), _options);
-        alloc_assert (_mechanism);
-    }
-#endif
-    else {
-        socket ()->event_handshake_failed_protocol (
-          session ()->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH);
-        error (protocol_error);
-        return false;
-    }
-    _next_msg = &zmtp_engine_t::next_handshake_command;
-    _process_msg = &zmtp_engine_t::process_handshake_command;
-
-    return true;
-}
-
-bool zmq::zmtp_engine_t::handshake_v3_0 ()
-{
-    _encoder = new (std::nothrow) v2_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow) v2_decoder_t (
-      _options.in_batch_size, _options.maxmsgsize, _options.zero_copy);
-    alloc_assert (_decoder);
-
-    return zmq::zmtp_engine_t::handshake_v3_x (true);
-}
-
-bool zmq::zmtp_engine_t::handshake_v3_1 ()
-{
-    _encoder = new (std::nothrow) v3_1_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow) v2_decoder_t (
-      _options.in_batch_size, _options.maxmsgsize, _options.zero_copy);
-    alloc_assert (_decoder);
-
-    return zmq::zmtp_engine_t::handshake_v3_x (false);
-}
-
-int zmq::zmtp_engine_t::routing_id_msg (msg_t *msg_)
-{
-    const int rc = msg_->init_size (_options.routing_id_size);
-    errno_assert (rc == 0);
-    if (_options.routing_id_size > 0)
-        memcpy (msg_->data (), _options.routing_id, _options.routing_id_size);
-    _next_msg = &zmtp_engine_t::pull_msg_from_session;
-    return 0;
-}
-
-int zmq::zmtp_engine_t::process_routing_id_msg (msg_t *msg_)
-{
-    if (_options.recv_routing_id) {
-        msg_->set_flags (msg_t::routing_id);
-        const int rc = session ()->push_msg (msg_);
-        errno_assert (rc == 0);
-    } else {
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-
-    if (_subscription_required) {
-        msg_t subscription;
-
-        //  Inject the subscription message, so that also
-        //  ZMQ 2.x peers receive published messages.
-        int rc = subscription.init_size (1);
-        errno_assert (rc == 0);
-        *static_cast<unsigned char *> (subscription.data ()) = 1;
-        rc = session ()->push_msg (&subscription);
-        errno_assert (rc == 0);
-    }
-
-    _process_msg = &zmtp_engine_t::push_msg_to_session;
-
-    return 0;
-}
-
-int zmq::zmtp_engine_t::produce_ping_message (msg_t *msg_)
-{
-    // 16-bit TTL + \4PING == 7
-    const size_t ping_ttl_len = msg_t::ping_cmd_name_size + 2;
-    zmq_assert (_mechanism != NULL);
-
-    int rc = msg_->init_size (ping_ttl_len);
-    errno_assert (rc == 0);
-    msg_->set_flags (msg_t::command);
-    // Copy in the command message
-    memcpy (msg_->data (), "\4PING", msg_t::ping_cmd_name_size);
-
-    uint16_t ttl_val = htons (_options.heartbeat_ttl);
-    memcpy (static_cast<uint8_t *> (msg_->data ()) + msg_t::ping_cmd_name_size,
-            &ttl_val, sizeof (ttl_val));
-
-    rc = _mechanism->encode (msg_);
-    _next_msg = &zmtp_engine_t::pull_and_encode;
-    if (!_has_timeout_timer && _heartbeat_timeout > 0) {
-        add_timer (_heartbeat_timeout, heartbeat_timeout_timer_id);
-        _has_timeout_timer = true;
-    }
-    return rc;
-}
-
-int zmq::zmtp_engine_t::produce_pong_message (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    int rc = msg_->move (_pong_msg);
-    errno_assert (rc == 0);
-
-    rc = _mechanism->encode (msg_);
-    _next_msg = &zmtp_engine_t::pull_and_encode;
-    return rc;
-}
-
-int zmq::zmtp_engine_t::process_heartbeat_message (msg_t *msg_)
-{
-    if (msg_->is_ping ()) {
-        // 16-bit TTL + \4PING == 7
-        const size_t ping_ttl_len = msg_t::ping_cmd_name_size + 2;
-        const size_t ping_max_ctx_len = 16;
-        uint16_t remote_heartbeat_ttl;
-
-        // Get the remote heartbeat TTL to setup the timer
-        memcpy (&remote_heartbeat_ttl,
-                static_cast<uint8_t *> (msg_->data ())
-                  + msg_t::ping_cmd_name_size,
-                ping_ttl_len - msg_t::ping_cmd_name_size);
-        remote_heartbeat_ttl = ntohs (remote_heartbeat_ttl);
-        // The remote heartbeat is in 10ths of a second
-        // so we multiply it by 100 to get the timer interval in ms.
-        remote_heartbeat_ttl *= 100;
-
-        if (!_has_ttl_timer && remote_heartbeat_ttl > 0) {
-            add_timer (remote_heartbeat_ttl, heartbeat_ttl_timer_id);
-            _has_ttl_timer = true;
-        }
-
-        //  As per ZMTP 3.1 the PING command might contain an up to 16 bytes
-        //  context which needs to be PONGed back, so build the pong message
-        //  here and store it. Truncate it if it's too long.
-        //  Given the engine goes straight to out_event, sequential PINGs will
-        //  not be a problem.
-        const size_t context_len =
-          std::min (msg_->size () - ping_ttl_len, ping_max_ctx_len);
-        const int rc =
-          _pong_msg.init_size (msg_t::ping_cmd_name_size + context_len);
-        errno_assert (rc == 0);
-        _pong_msg.set_flags (msg_t::command);
-        memcpy (_pong_msg.data (), "\4PONG", msg_t::ping_cmd_name_size);
-        if (context_len > 0)
-            memcpy (static_cast<uint8_t *> (_pong_msg.data ())
-                      + msg_t::ping_cmd_name_size,
-                    static_cast<uint8_t *> (msg_->data ()) + ping_ttl_len,
-                    context_len);
-
-        _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &zmtp_engine_t::produce_pong_message);
-        out_event ();
-    }
-
-    return 0;
-}
-
-int zmq::zmtp_engine_t::process_command_message (msg_t *msg_)
-{
-    const uint8_t cmd_name_size =
-      *(static_cast<const uint8_t *> (msg_->data ()));
-    const size_t ping_name_size = msg_t::ping_cmd_name_size - 1;
-    const size_t sub_name_size = msg_t::sub_cmd_name_size - 1;
-    const size_t cancel_name_size = msg_t::cancel_cmd_name_size - 1;
-    //  Malformed command
-    if (unlikely (msg_->size () < cmd_name_size + sizeof (cmd_name_size)))
-        return -1;
-
-    const uint8_t *const cmd_name =
-      static_cast<const uint8_t *> (msg_->data ()) + 1;
-    if (cmd_name_size == ping_name_size
-        && memcmp (cmd_name, "PING", cmd_name_size) == 0)
-        msg_->set_flags (zmq::msg_t::ping);
-    if (cmd_name_size == ping_name_size
-        && memcmp (cmd_name, "PONG", cmd_name_size) == 0)
-        msg_->set_flags (zmq::msg_t::pong);
-    if (cmd_name_size == sub_name_size
-        && memcmp (cmd_name, "SUBSCRIBE", cmd_name_size) == 0)
-        msg_->set_flags (zmq::msg_t::subscribe);
-    if (cmd_name_size == cancel_name_size
-        && memcmp (cmd_name, "CANCEL", cmd_name_size) == 0)
-        msg_->set_flags (zmq::msg_t::cancel);
-
-    if (msg_->is_ping () || msg_->is_pong ())
-        return process_heartbeat_message (msg_);
-
-    return 0;
-}
diff --git a/src/zmtp_engine.hpp b/src/zmtp_engine.hpp
deleted file mode 100644
index 10f4134cc..000000000
--- a/src/zmtp_engine.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ZMTP_ENGINE_HPP_INCLUDED__
-#define __ZMQ_ZMTP_ENGINE_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "fd.hpp"
-#include "i_engine.hpp"
-#include "io_object.hpp"
-#include "i_encoder.hpp"
-#include "i_decoder.hpp"
-#include "options.hpp"
-#include "socket_base.hpp"
-#include "metadata.hpp"
-#include "msg.hpp"
-#include "stream_engine_base.hpp"
-
-namespace zmq
-{
-//  Protocol revisions
-enum
-{
-    ZMTP_1_0 = 0,
-    ZMTP_2_0 = 1,
-    ZMTP_3_x = 3
-};
-
-class io_thread_t;
-class session_base_t;
-class mechanism_t;
-
-//  This engine handles any socket with SOCK_STREAM semantics,
-//  e.g. TCP socket or an UNIX domain socket.
-
-class zmtp_engine_t ZMQ_FINAL : public stream_engine_base_t
-{
-  public:
-    zmtp_engine_t (fd_t fd_,
-                   const options_t &options_,
-                   const endpoint_uri_pair_t &endpoint_uri_pair_);
-    ~zmtp_engine_t ();
-
-  protected:
-    //  Detects the protocol used by the peer.
-    bool handshake ();
-
-    void plug_internal ();
-
-    int process_command_message (msg_t *msg_);
-    int produce_ping_message (msg_t *msg_);
-    int process_heartbeat_message (msg_t *msg_);
-    int produce_pong_message (msg_t *msg_);
-
-  private:
-    //  Receive the greeting from the peer.
-    int receive_greeting ();
-    void receive_greeting_versioned ();
-
-    typedef bool (zmtp_engine_t::*handshake_fun_t) ();
-    static handshake_fun_t select_handshake_fun (bool unversioned,
-                                                 unsigned char revision,
-                                                 unsigned char minor);
-
-    bool handshake_v1_0_unversioned ();
-    bool handshake_v1_0 ();
-    bool handshake_v2_0 ();
-    bool handshake_v3_x (bool downgrade_sub);
-    bool handshake_v3_0 ();
-    bool handshake_v3_1 ();
-
-    int routing_id_msg (msg_t *msg_);
-    int process_routing_id_msg (msg_t *msg_);
-
-    msg_t _routing_id_msg;
-
-    //  Need to store PING payload for PONG
-    msg_t _pong_msg;
-
-    static const size_t signature_size = 10;
-
-    //  Size of ZMTP/1.0 and ZMTP/2.0 greeting message
-    static const size_t v2_greeting_size = 12;
-
-    //  Size of ZMTP/3.0 greeting message
-    static const size_t v3_greeting_size = 64;
-
-    //  Expected greeting size.
-    size_t _greeting_size;
-
-    //  Greeting received from, and sent to peer
-    unsigned char _greeting_recv[v3_greeting_size];
-    unsigned char _greeting_send[v3_greeting_size];
-
-    //  Size of greeting received so far
-    unsigned int _greeting_bytes_read;
-
-    //  Indicates whether the engine is to inject a phantom
-    //  subscription message into the incoming stream.
-    //  Needed to support old peers.
-    bool _subscription_required;
-
-    int _heartbeat_timeout;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (zmtp_engine_t)
-};
-}
-
-#endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
deleted file mode 100755
index cbd2ecc8c..000000000
--- a/tests/CMakeLists.txt
+++ /dev/null
@@ -1,307 +0,0 @@
-# CMake build script for ZeroMQ tests
-cmake_minimum_required(VERSION "2.8.1")
-
-# On Windows: solution file will be called tests.sln
-project(tests)
-
-set(tests
-    test_ancillaries
-    test_system
-    test_pair_inproc
-    test_pair_tcp
-    test_reqrep_inproc
-    test_reqrep_tcp
-    test_hwm
-    test_hwm_pubsub
-    test_reqrep_device
-    test_sub_forward
-    test_invalid_rep
-    test_msg_flags
-    test_msg_ffn
-    test_connect_resolve
-    test_immediate
-    test_last_endpoint
-    test_term_endpoint
-    test_router_mandatory
-    test_probe_router
-    test_stream
-    test_stream_empty
-    test_stream_disconnect
-    test_disconnect_inproc
-    test_unbind_wildcard
-    test_ctx_options
-    test_ctx_destroy
-    test_security_no_zap_handler
-    test_security_null
-    test_security_plain
-    test_security_zap
-    test_iov
-    test_spec_req
-    test_spec_rep
-    test_spec_dealer
-    test_spec_router
-    test_spec_pushpull
-    test_req_correlate
-    test_req_relaxed
-    test_conflate
-    test_inproc_connect
-    test_issue_566
-    test_shutdown_stress
-    test_timeo
-    test_many_sockets
-    test_diffserv
-    test_connect_rid
-    test_xpub_nodrop
-    test_pub_invert_matching
-    test_setsockopt
-    test_sockopt_hwm
-    test_heartbeats
-    test_atomics
-    test_bind_src_address
-    test_capabilities
-    test_metadata
-    test_router_handover
-    test_srcfd
-    test_stream_timeout
-    test_xpub_manual
-    test_xpub_welcome_msg
-    test_xpub_verbose
-    test_base85
-    test_bind_after_connect_tcp
-    test_sodium
-    test_monitor
-    test_socket_null
-    test_reconnect_ivl
-    test_mock_pub_sub)
-
-if(NOT WIN32)
-  list(APPEND tests test_security_gssapi test_socks test_connect_null_fuzzer test_bind_null_fuzzer test_connect_fuzzer test_bind_fuzzer)
-endif()
-
-if(ZMQ_HAVE_CURVE)
-  list(APPEND tests test_security_curve)
-  if(NOT WIN32)
-    list(APPEND tests test_connect_curve_fuzzer test_bind_curve_fuzzer test_z85_decode_fuzzer)
-  endif()
-endif()
-
-option(ENABLE_CAPSH "Run tests that require sudo and capsh (for cap_net_admin)" OFF)
-if(ENABLE_CAPSH)
-  find_program(CAPSH_PROGRAM NAMES capsh)
-
-  if(CAPSH_PROGRAM)
-    list(APPEND tests test_pair_tcp_cap_net_admin)
-  else()
-    message(STATUS "capsh not found, skipping tests that require CAP_NET_ADMIN")
-  endif()
-endif()
-
-if(ZMQ_HAVE_IPC)
-  list(APPEND tests test_ipc_wildcard test_pair_ipc test_reqrep_ipc test_rebind_ipc)
-endif()
-
-if(NOT WIN32)
-  list(
-    APPEND
-    tests
-    test_proxy
-    test_proxy_hwm
-    test_proxy_single_socket
-    test_proxy_terminate
-    test_getsockopt_memset
-    test_filter_ipc
-    test_stream_exceeds_buffer
-    test_router_mandatory_hwm
-    test_use_fd
-    test_zmq_poll_fd)
-  if(HAVE_FORK)
-    list(APPEND tests test_fork)
-  endif()
-  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    list(APPEND tests test_abstract_ipc)
-    if(ZMQ_HAVE_TIPC)
-      list(
-        APPEND
-        tests
-        test_address_tipc
-        test_pair_tipc
-        test_reqrep_device_tipc
-        test_reqrep_tipc
-        test_router_mandatory_tipc
-        test_sub_forward_tipc
-        test_connect_delay_tipc
-        test_shutdown_stress_tipc
-        test_term_endpoint_tipc)
-    endif()
-  endif()
-endif()
-
-if(WITH_VMCI)
-  list(APPEND tests test_pair_vmci test_reqrep_vmci)
-endif()
-
-if(ENABLE_DRAFTS)
-  list(
-    APPEND
-    tests
-    test_poller
-    test_thread_safe
-    test_client_server
-    test_timers
-    test_radio_dish
-    test_scatter_gather
-    test_dgram
-    test_app_meta
-    test_router_notify
-    test_xpub_manual_last_value
-    test_peer
-    test_reconnect_options
-    test_msg_init
-    test_channel
-    test_hello_msg
-    test_disconnect_msg
-  )
-endif()
-
-if(ZMQ_HAVE_WS)
-  list(APPEND tests test_ws_transport)
-  if(ZMQ_HAVE_WSS)
-    list(APPEND tests test_wss_transport)
-  endif()
-endif()
-
-# add location of platform.hpp for Windows builds
-if(WIN32)
-  add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
-  add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
-  # Same name on 64bit systems
-  link_libraries(ws2_32.lib)
-endif()
-
-add_library(
-  unity STATIC
-  "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.c" "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.h"
-  "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity_internals.h")
-set_target_properties(unity PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.h")
-target_compile_definitions(unity PUBLIC "UNITY_USE_COMMAND_LINE_ARGS" "UNITY_EXCLUDE_FLOAT")
-target_include_directories(unity PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../external/unity")
-
-set(TESTUTIL_SOURCES
-    testutil.cpp
-    testutil.hpp
-    testutil_monitoring.cpp
-    testutil_monitoring.hpp
-    testutil_security.cpp
-    testutil_security.hpp
-    testutil_unity.cpp
-    testutil_unity.hpp)
-if(BUILD_STATIC)
-  add_library(testutil-static STATIC ${TESTUTIL_SOURCES})
-  target_link_libraries(testutil-static libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} unity)
-endif()
-if(BUILD_SHARED)
-  add_library(testutil STATIC ${TESTUTIL_SOURCES})
-  target_link_libraries(testutil libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} unity)
-endif()
-if(BUILD_STATIC AND NOT BUILD_SHARED)
-  # use testutil-static for both tests and unit tests
-  set(TESTUTIL_LIB testutil-static)
-else()
-  # use testutil for tests and testutil-static for unit tests
-  set(TESTUTIL_LIB testutil)
-endif()
-
-if(MSVC_VERSION LESS 1700)
-  set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.c" PROPERTIES LANGUAGE CXX)
-endif()
-
-if(MSVC_VERSION LESS 1600)
-  target_compile_definitions(unity PUBLIC "UNITY_EXCLUDE_STDINT_H")
-endif()
-
-# add include dirs for all targets
-include_directories("${ZeroMQ_SOURCE_DIR}/../include" "${ZeroMQ_BINARY_DIR}")
-if(WIN32)
-  add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-endif()
-
-# Does not work, times out every time
-if(WIN32)
-  list(REMOVE_ITEM tests test_many_sockets)
-endif()
-
-foreach(test ${tests})
-  # target_sources not supported before CMake 3.1
-  if(ZMQ_HAVE_CURVE AND ${test} MATCHES test_security_curve)
-    add_executable(${test} ${test}.cpp "../src/tweetnacl.c" "../src/err.cpp" "../src/random.cpp" "../src/clock.cpp")
-  else()
-    add_executable(${test} ${test}.cpp)
-  endif()
-  target_link_libraries(${test} ${TESTUTIL_LIB})
-  if(WIN32)
-    # This is the output for Debug dynamic builds on Visual Studio 6.0 You should provide the correct directory, don't
-    # know how to do it automatically
-    find_path(LIBZMQ_PATH "libzmq.lib" PATHS "../bin/Win32/Debug/v120/dynamic")
-    if(NOT ${LIBZMQ_PATH} STREQUAL "LIBZMQ_PATH-NOTFOUND")
-      set_target_properties(${test} PROPERTIES LINK_FLAGS "/LIBPATH:${LIBZMQ_PATH}")
-    endif()
-  else()
-    # per-test directories not generated on OS X / Darwin
-    if(NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang.*")
-      link_directories(${test} PRIVATE "${ZeroMQ_SOURCE_DIR}/../lib")
-    endif()
-  endif()
-
-  if(RT_LIBRARY)
-    target_link_libraries(${test} ${RT_LIBRARY})
-  endif()
-
-  if(CMAKE_SYSTEM_NAME MATCHES "QNX")
-    target_link_libraries(${test} socket)
-    target_link_libraries(${test} m)
-  endif()
-
-  if(WIN32)
-    add_test(
-      NAME ${test}
-      WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-      COMMAND ${test})
-  else()
-    if(${test} MATCHES "_cap_net_admin")
-      add_test(NAME ${test} COMMAND sh -c "sudo ${CAPSH_PROGRAM} --caps=cap_net_admin+eip -- -c $<TARGET_FILE:${test}>")
-    else()
-      add_test(NAME ${test} COMMAND ${test})
-    endif()
-  endif()
-  set_tests_properties(${test} PROPERTIES TIMEOUT 10)
-  set_tests_properties(${test} PROPERTIES SKIP_RETURN_CODE 77)
-endforeach()
-
-# override timeout for these tests
-if(ZMQ_HAVE_CURVE)
-  set_tests_properties(test_security_curve PROPERTIES TIMEOUT 60)
-endif()
-set_tests_properties(test_heartbeats PROPERTIES TIMEOUT 60)
-
-if(WIN32 AND ENABLE_DRAFTS)
-  set_tests_properties(test_radio_dish PROPERTIES TIMEOUT 30)
-endif()
-
-# add additional required flags ZMQ_USE_TWEETNACL will already be defined when not using sodium
-if(ZMQ_HAVE_CURVE AND NOT ZMQ_USE_TWEETNACL)
-  target_compile_definitions(test_security_curve PRIVATE "-DZMQ_USE_TWEETNACL")
-endif()
-
-set_tests_properties(test_security_zap PROPERTIES TIMEOUT 60)
-set_tests_properties(test_reconnect_ivl PROPERTIES TIMEOUT 15)
-
-# Check whether all tests in the current folder are present
-file(READ "${CMAKE_CURRENT_LIST_FILE}" CURRENT_LIST_FILE_CONTENT)
-file(GLOB ALL_TEST_SOURCES "test_*.cpp")
-foreach(TEST_SOURCE ${ALL_TEST_SOURCES})
-  get_filename_component(TESTNAME "${TEST_SOURCE}" NAME_WE)
-  string(REGEX MATCH "${TESTNAME}" MATCH_TESTNAME "${CURRENT_LIST_FILE_CONTENT}")
-  if(NOT MATCH_TESTNAME)
-    message(AUTHOR_WARNING "Test '${TESTNAME}' is not known to CTest.")
-  endif()
-endforeach()
diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index f45689887..000000000
--- a/tests/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-#   Guidelines for tests
-
-Write your test case as if you were writing clean application code. It should be safe to compile on all platforms.
-
-Normally, you should only include the header files from the tests directory, e.g. `testutil.hpp`. Do not include files from src. Do not use the internal libzmq API. Tests for these should be placed in unittests instead.
-
-If you must write non-portable code, wrap it in #ifdefs to ensure it will compile and run on all systems.
-
-Note that testutil.hpp includes platform.h. Do not include it yourself as it changes location depending on the build system and OS.
-
-All sources must contain the correct copyright header. Please copy from test_system.cpp if you're not certain.
-
-Write new tests using the unity test framework. For an example, see test_sockopt_hwm.
-
-Please use only ANSI C99 in test cases, no C++. This is to make the code more reusable.
-
-On many slower environments, like embedded systems, VMs or CI systems, tests might
-fail because it takes time for sockets to settle after a connect. If you need
-to add a sleep, please be consistent with all the other tests and use:
-  msleep (SETTLE_TIME);
-  
-#   Ensure proper cleanup
-
-If a test program uses unity, it will execute test cases individually, and will continue to run further test cases if an assertion in one test case fails. However, the test case that had an assertion failure will be aborted.
-To ensure that the resources of the test case are properly cleaned up, use appropriate setUp and tearDown functions. These are run by unity before each test case starts resp. after it ended (whether successfully or not).
-The same setUp and tearDown function is used for all test cases in a test program.
-
-For many test cases, the following setUp and tearDown functions will be appropriate:
-	void setUp ()
-	{
-		setup_test_context ();
-	}
-
-	void tearDown ()
-	{
-		teardown_test_context ();
-	}
-
-Within the tests, do not use zmq_socket and zmq_close then but test_context_socket and test_context_socket_close instead. These functions will register/unregister sockets with the test_context. 
-All sockets not closed when tearDown is executed, with forcibly be closed with linger=0 before terminating the context. Note that it is a misuse not to close sockets during successful test execution, 
-and a warning will be output.
-
-#   Building tests in Windows
-
-The tests are only built via cmake, not when using the checked-in Visual Studio .sln files.
diff --git a/tests/fuzzer_corpora/endpoint.dict b/tests/fuzzer_corpora/endpoint.dict
deleted file mode 100644
index 6a1b65f62..000000000
--- a/tests/fuzzer_corpora/endpoint.dict
+++ /dev/null
@@ -1,4 +0,0 @@
-ipc="ipc://"
-inproc="inproc://"
-tcp="tcp://"
-udp="udp://"
\ No newline at end of file
diff --git a/tests/fuzzer_corpora/test_bind_curve_fuzzer.txt b/tests/fuzzer_corpora/test_bind_curve_fuzzer.txt
deleted file mode 100644
index cd9b29934..000000000
--- a/tests/fuzzer_corpora/test_bind_curve_fuzzer.txt
+++ /dev/null
@@ -1 +0,0 @@
-ff00000000000000017f03014355525645000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c80548454c4c4f010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000029ce356a87e7861b3ac340f8a76785982e7684627cc279564b05548b3425a66c00000000000000012ae574af7907bb06a481251c90df3d15f995a53ce358f904c834217a0d7cb021fbbd630f847cd261e1dcf9786f995fde297792bd0b521c827e41e841ae8d643e7757f98a6d8959ca7258cf1a09b6a10306000000000000012408494e49544941544573a40c9d42d89d69e7bee1124a13b8ad85749e2300e1e10f5c833529360f964a82761a463c1a85332e5fadd161d2ba391952c1d875a159d326786330b462fda30a4a6f4d28817a5726950a185a3cd9abf122c99b95fbb3b77b77702e7b57e7b600000000000000029d559274e0c937e8ecf25725b81caae149205ec686718e97f48b3788588280de18405bbd139f1a530b87f1ab4f139ef99ba711d45c55aae6001204fa986f342bac01f90b28fd69a3d9f3fdf5aaff5b7934a0a1f1a70c9fce70720e7f6c25773882d4f1a85460a79cf8da6972efb1571b48fe0d03d09c522523f32796eb635c44210a6bcedd8c3ca66c7bf62016ee08d80ccd4d64a7f2fdec8eb06fe3dfc91a9fc31c4a8c559b4a245de2ff344ab27da7725bd90041074d4553534147450000000000000003d5ce709afb2455b7402a18f01eb61cb7a65d227bb6de4c9714c2a027ba9f2481e43ed60ecbb615fa00b948fa34469f553f0041074d4553534147450000000000000004f08579612e848d6ad69131eba369cdc2634967eb5d223481cc6838e6c355a33edc948e4b6d9ca2b2796c458327a2872de2
diff --git a/tests/fuzzer_corpora/test_bind_fuzzer.txt b/tests/fuzzer_corpora/test_bind_fuzzer.txt
deleted file mode 100644
index 6e950c987..000000000
--- a/tests/fuzzer_corpora/test_bind_fuzzer.txt
+++ /dev/null
@@ -1 +0,0 @@
-77733a2f2f253a39
diff --git a/tests/fuzzer_corpora/test_bind_null_fuzzer.txt b/tests/fuzzer_corpora/test_bind_null_fuzzer.txt
deleted file mode 100644
index da90b2398..000000000
--- a/tests/fuzzer_corpora/test_bind_null_fuzzer.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ff00000000000000017f03014e554c4c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004190552454144590b536f636b65742d5479706500000003535542040a09535542534352494245
-ff000000200000000000008585858585000000000000004700280000000000000000002100006d000028000000000000000000000000000004000019
diff --git a/tests/fuzzer_corpora/test_connect_curve_fuzzer.txt b/tests/fuzzer_corpora/test_connect_curve_fuzzer.txt
deleted file mode 100644
index 1ef32c239..000000000
--- a/tests/fuzzer_corpora/test_connect_curve_fuzzer.txt
+++ /dev/null
@@ -1 +0,0 @@
-ff00000000000000067f03014355525645000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a80757454c434f4d4574535c9301c7695f2db73109ce0c78ab4ea9012648001fb41f846af73271f30f92d967c988286958f93f795ba211178500a0ea3b8396f5a580868d1fb26f8d4cfac3473c37da8cb825864c61f96c805140e9885e349652bf4cf9b0623e4c6a6de41e2f3db58bed2d152dac0ba6a8c83a222aac67bea733e97815e9c4ebc3ff5968869a42116a9530ee6eba37820c87f382e7ec057c38dc2c337a8dd9b0bc9bcd044605524541445900000000000000012bf9ffd6aadcc15e02e02a9b6e63490b004cb446038b8d1d6e224f507c25c4be0dfd9f30c41a24bff8d277dcad0b83daf292c32bd7792e610041074d45535341474500000000000000028c302f949ffbd09aaf559bd228aeeda6c69c677910edc29642976632bec514afa1a2df7eb5abcfd91f94d9b9e4a61097910041074d4553534147450000000000000003300b7856f1d04647531b04fd46322d34a6ad1f6cf05cc5dfd032cc3ec1c4870a3fdfcbf0e8d6d8a7bbc64c1304c37b5854
diff --git a/tests/fuzzer_corpora/test_connect_null_fuzzer.txt b/tests/fuzzer_corpora/test_connect_null_fuzzer.txt
deleted file mode 100644
index d318c8508..000000000
--- a/tests/fuzzer_corpora/test_connect_null_fuzzer.txt
+++ /dev/null
@@ -1 +0,0 @@
-ff00000000000000017f03014e554c4c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000041a0552454144590b536f636b65742d547970650000000458505542000568656c6c6f0005776f726c64
diff --git a/tests/fuzzer_corpora/test_z85_decode_fuzzer.txt b/tests/fuzzer_corpora/test_z85_decode_fuzzer.txt
deleted file mode 100644
index 69f90d1a4..000000000
--- a/tests/fuzzer_corpora/test_z85_decode_fuzzer.txt
+++ /dev/null
@@ -1 +0,0 @@
-46555a5a2d54414746555a5ad6514147ec
\ No newline at end of file
diff --git a/tests/fuzzer_corpora/zmtp.dict b/tests/fuzzer_corpora/zmtp.dict
deleted file mode 100644
index 74a88e3d1..000000000
--- a/tests/fuzzer_corpora/zmtp.dict
+++ /dev/null
@@ -1,45 +0,0 @@
-# ZMTP magic binary streams
-# 1.0 https://rfc.zeromq.org/spec/13/
-# 2.0 https://rfc.zeromq.org/spec/15/
-# 3.1 https://rfc.zeromq.org/spec/37/
-# curve https://rfc.zeromq.org/spec/26/
-signature="\xFF\x00\x00\x00\x00\x00\x00\x00\x00\x7F"
-signature_v1="\x01\x00"
-version_v2="\x01"
-version_v3="\x03\x00"
-version_v3_1="\x03\x01"
-mechanism_null="\x4E\x55\x4C\x4C\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-mechanism_curve="\x43\x55\x52\x56\x45\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-short_command="\x04"
-long_command="\x06"
-ready="\x05\x52\x45\x41\x44\x59"
-error="\x05\x45\x52\x52\x4F\x52"
-identity="\x08\x49\x64\x65\x6E\x74\x69\x74\x79"
-socket_type="\x0B\x53\x6F\x63\x6B\x65\x74\x2D\x54\x79\x70\x65"
-dealer="\x06\x44\x45\x41\x4C\x45\x52"
-router="\x06\x52\x4F\x55\x54\x45\x52"
-pub="\x03\x50\x55\x42"
-sub="\x03\x53\x55\x42"
-xpub="\x04\x58\x50\x55\x42"
-xsub="\x04\x58\x53\x55\x42"
-req="\x03\x52\x45\x51"
-rep="\x03\x52\x45\x50"
-push="\x04\x50\x55\x53\x48"
-pull="\x04\x50\x55\x4C\x4C"
-pair="\x04\x50\x41\x49\x52"
-client="\x05\x43\x4C\x49\x45\x4E\x54"
-server="\x05\x53\x45\x52\x56\x45\x52"
-radio="\x05\x52\x41\x44\x49\x4F"
-dish="\x04\x44\x49\x53\x48"
-scatter="\x06\x53\x43\x41\x54\x54\x45\x52"
-gather="\x06\x47\x41\x54\x48\x45\x52"
-subscribe="\x09\x53\x55\x42\x53\x43\x52\x49\x42\x45"
-cancel="\x06\x43\x41\x4E\x43\x45\x4C"
-join="\x04\x4A\x4F\x49\x4E"
-leave="\x05\x43\x41\x4E\x43\x45\x4C"
-ping="\x04\x50\x49\x4E\x47"
-pong="\x04\x50\x4F\x4E\x47"
-hello="\x05\x48\x45\x4C\x4C\x4F\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-welcome="\x07\x57\x45\x4C\x43\x4F\x4D\x45"
-initiate="\x08\x49\x4E\x49\x54\x49\x41\x54\x45"
-message="\x07\x4D\x45\x53\x53\x41\x47\x45"
\ No newline at end of file
diff --git a/tests/test_abstract_ipc.cpp b/tests/test_abstract_ipc.cpp
deleted file mode 100644
index c44bf9f32..000000000
--- a/tests/test_abstract_ipc.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static const char test_endpoint[] = "ipc://@tmp-tester";
-
-void test_roundtrip ()
-{
-    void *sb = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, test_endpoint));
-
-    char endpoint[MAX_SOCKET_STRING];
-    size_t size = sizeof (endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &size));
-    TEST_ASSERT_EQUAL_INT (0, strncmp (endpoint, test_endpoint, size));
-
-    void *sc = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, test_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/tests/test_address_tipc.cpp b/tests/test_address_tipc.cpp
deleted file mode 100644
index de545a181..000000000
--- a/tests/test_address_tipc.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_tipc_port_name_and_domain ()
-{
-    // test Port Name addressing
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tipc://{5560,0,0}"));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "tipc://{5560,0}@0.0.0"));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_tipc_port_identity ()
-{
-    char endpoint[256];
-    unsigned int z, c, n, ref;
-
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    // Test binding to random Port Identity and
-    // test resolving assigned address, should return a properly formatted string
-    bind_loopback_tipc (sb, endpoint, sizeof endpoint);
-
-    int rc = sscanf (&endpoint[0], "tipc://<%u.%u.%u:%u>", &z, &c, &n, &ref);
-    TEST_ASSERT_EQUAL_INT (4, rc);
-
-    TEST_ASSERT_NOT_EQUAL_MESSAGE (
-      0, ref, "tipc port number must not be 0 after random assignment");
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_tipc_bad_addresses ()
-{
-    // Test Port Name addressing
-    void *sb = test_context_socket (ZMQ_REP);
-
-    // Test binding to a fixed address, should fail
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_bind (sb, "tipc://<1.2.3:123123>"));
-
-    // Test connecting to random identity, should fail
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_connect (sb, "tipc://<*>"));
-
-    // Clean up
-    test_context_socket_close (sb);
-}
-
-
-int main ()
-{
-    setup_test_environment ();
-
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_tipc_port_name_and_domain);
-    RUN_TEST (test_tipc_port_identity);
-    RUN_TEST (test_tipc_bad_addresses);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_ancillaries.cpp b/tests/test_ancillaries.cpp
deleted file mode 100644
index 2f9825627..000000000
--- a/tests/test_ancillaries.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * File for adding tests for ancillary API methods and other miscellaenous
- * API internals. Please ensure that when adding such tests into this file,
- * that they are short-lived so they do not trigger timeouts in the
- * CI build environments.
- */
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void test_version ()
-{
-    int major, minor, patch;
-
-    zmq_version (&major, &minor, &patch);
-    TEST_ASSERT_EQUAL_INT (ZMQ_VERSION_MAJOR, major);
-    TEST_ASSERT_EQUAL_INT (ZMQ_VERSION_MINOR, minor);
-    TEST_ASSERT_EQUAL_INT (ZMQ_VERSION_PATCH, patch);
-}
-
-void test_strerrror ()
-{
-    TEST_ASSERT_NOT_NULL (zmq_strerror (EINVAL));
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_version);
-    RUN_TEST (test_strerrror);
-    return UNITY_END ();
-}
diff --git a/tests/test_app_meta.cpp b/tests/test_app_meta.cpp
deleted file mode 100644
index f1f824b48..000000000
--- a/tests/test_app_meta.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-#include <unity.h>
-
-#include <string.h>
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-void test_app_meta_reqrep ()
-{
-    void *ctx;
-    zmq_msg_t msg;
-    void *rep_sock, *req_sock;
-    char connect_address[MAX_SOCKET_STRING];
-    const char *req_hello = "X-hello:hello";
-    const char *req_connection = "X-connection:primary";
-    const char *req_z85 = "X-bin:009c6";
-    const char *rep_hello = "X-hello:world";
-    const char *rep_connection = "X-connection:backup";
-    const char *bad_strings[] = {
-      ":",
-      "key:",
-      ":value",
-      "keyvalue",
-      "",
-      "X-"
-      "KeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKe"
-      "yTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyT"
-      "ooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyToo"
-      "LongKeyTooLongKeyTooLongKeyTooLongKeyTooLong:value"};
-
-    ctx = zmq_ctx_new ();
-    rep_sock = zmq_socket (ctx, ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (rep_sock);
-    req_sock = zmq_socket (ctx, ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (req_sock);
-
-    int rc =
-      zmq_setsockopt (rep_sock, ZMQ_METADATA, rep_hello, strlen (rep_hello));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    int l = 0;
-    rc = zmq_setsockopt (rep_sock, ZMQ_LINGER, &l, sizeof (l));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_setsockopt (rep_sock, ZMQ_METADATA, rep_connection,
-                         strlen (rep_connection));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    for (int i = 0; i < 6; i++) {
-        rc = zmq_setsockopt (rep_sock, ZMQ_METADATA, bad_strings[i],
-                             strlen (bad_strings[i]));
-        TEST_ASSERT_EQUAL_INT (-1, rc);
-    }
-
-    bind_loopback_ipv4 (rep_sock, connect_address, sizeof connect_address);
-
-    l = 0;
-    rc = zmq_setsockopt (req_sock, ZMQ_LINGER, &l, sizeof (l));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_setsockopt (req_sock, ZMQ_METADATA, req_hello, strlen (req_hello));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_setsockopt (req_sock, ZMQ_METADATA, req_connection,
-                         strlen (req_connection));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_setsockopt (req_sock, ZMQ_METADATA, req_z85, strlen (req_z85));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_connect (req_sock, connect_address);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_msg_init_size (&msg, 1);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    char *data = static_cast<char *> (zmq_msg_data (&msg));
-    data[0] = 1;
-
-    rc = zmq_msg_send (&msg, req_sock, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    rc = zmq_msg_init (&msg);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_msg_recv (&msg, rep_sock, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    TEST_ASSERT_EQUAL_STRING ("hello", zmq_msg_gets (&msg, "X-hello"));
-    TEST_ASSERT_EQUAL_STRING ("primary", zmq_msg_gets (&msg, "X-connection"));
-    const char *const bindata = zmq_msg_gets (&msg, "X-bin");
-    TEST_ASSERT_NOT_NULL (bindata);
-    uint8_t rawdata[4];
-    const uint8_t *const ret = zmq_z85_decode (rawdata, bindata);
-    TEST_ASSERT_NOT_NULL (ret);
-    TEST_ASSERT_EQUAL_UINT8 (0, rawdata[0]);
-    TEST_ASSERT_EQUAL_UINT8 (1, rawdata[1]);
-    TEST_ASSERT_EQUAL_UINT8 (2, rawdata[2]);
-    TEST_ASSERT_EQUAL_UINT8 (3, rawdata[3]);
-
-    TEST_ASSERT_NULL (zmq_msg_gets (&msg, "X-foobar"));
-    TEST_ASSERT_NULL (zmq_msg_gets (&msg, "foobar"));
-
-    rc = zmq_msg_send (&msg, rep_sock, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    rc = zmq_msg_recv (&msg, req_sock, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    TEST_ASSERT_EQUAL_STRING ("world", zmq_msg_gets (&msg, "X-hello"));
-    TEST_ASSERT_EQUAL_STRING ("backup", zmq_msg_gets (&msg, "X-connection"));
-
-    rc = zmq_msg_close (&msg);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_close (req_sock);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_close (rep_sock);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    zmq_ctx_term (ctx);
-}
-
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_app_meta_reqrep);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_atomics.cpp b/tests/test_atomics.cpp
deleted file mode 100644
index b1e5772dd..000000000
--- a/tests/test_atomics.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void test ()
-{
-    void *counter = zmq_atomic_counter_new ();
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_value (counter));
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_inc (counter));
-    TEST_ASSERT_EQUAL_INT (1, zmq_atomic_counter_inc (counter));
-    TEST_ASSERT_EQUAL_INT (2, zmq_atomic_counter_inc (counter));
-    TEST_ASSERT_EQUAL_INT (3, zmq_atomic_counter_value (counter));
-    TEST_ASSERT_EQUAL_INT (1, zmq_atomic_counter_dec (counter));
-    TEST_ASSERT_EQUAL_INT (1, zmq_atomic_counter_dec (counter));
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_dec (counter));
-    zmq_atomic_counter_set (counter, 2);
-    TEST_ASSERT_EQUAL_INT (1, zmq_atomic_counter_dec (counter));
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_dec (counter));
-    zmq_atomic_counter_destroy (&counter);
-}
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/tests/test_base85.cpp b/tests/test_base85.cpp
deleted file mode 100644
index d2fc131bf..000000000
--- a/tests/test_base85.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-// Test vector: rfc.zeromq.org/spec:32/Z85
-void test__zmq_z85_encode__valid__success ()
-{
-    static const size_t size = 8;
-    static const size_t length = size * 5 / 4;
-    static const uint8_t decoded[size] = {0x86, 0x4F, 0xD2, 0x6F,
-                                          0xB5, 0x59, 0xF7, 0x5B};
-    static const char expected[length + 1] = "HelloWorld";
-    char out_encoded[length + 1] = {0};
-
-    errno = 0;
-    TEST_ASSERT_NOT_NULL (zmq_z85_encode (out_encoded, decoded, size));
-    TEST_ASSERT_EQUAL_STRING (expected, out_encoded);
-    TEST_ASSERT_EQUAL_INT (0, zmq_errno ());
-}
-
-// Buffer length must be evenly divisible by 4 or must fail with EINVAL.
-void test__zmq_z85_encode__invalid__failure (size_t size_)
-{
-    errno = 0;
-    TEST_ASSERT_NULL (zmq_z85_encode (NULL, NULL, size_));
-    TEST_ASSERT_EQUAL_INT (EINVAL, zmq_errno ());
-}
-
-// Test vector: rfc.zeromq.org/spec:32/Z85
-void test__zmq_z85_decode__valid__success ()
-{
-    static const size_t size = 10 * 4 / 5;
-    static const uint8_t expected[size] = {0x86, 0x4F, 0xD2, 0x6F,
-                                           0xB5, 0x59, 0xF7, 0x5B};
-    static const char *encoded = "HelloWorld";
-    uint8_t out_decoded[size] = {0};
-
-    errno = 0;
-    TEST_ASSERT_NOT_NULL (zmq_z85_decode (out_decoded, encoded));
-    TEST_ASSERT_EQUAL_INT (0, zmq_errno ());
-    TEST_ASSERT_EQUAL_UINT8_ARRAY (expected, out_decoded, size);
-}
-
-// Invalid input data must fail with EINVAL.
-template <size_t SIZE>
-void test__zmq_z85_decode__invalid__failure (const char (&encoded_)[SIZE])
-{
-    uint8_t decoded[SIZE * 4 / 5 + 1];
-    errno = 0;
-    TEST_ASSERT_NULL (zmq_z85_decode (decoded, encoded_));
-    TEST_ASSERT_EQUAL_INT (EINVAL, zmq_errno ());
-}
-
-
-// call zmq_z85_encode, then zmq_z85_decode, and compare the results with the original
-template <size_t SIZE>
-void test__zmq_z85_encode__zmq_z85_decode__roundtrip (
-  const uint8_t (&test_data_)[SIZE])
-{
-    char test_data_z85[SIZE * 5 / 4 + 1];
-    const char *const res1 = zmq_z85_encode (test_data_z85, test_data_, SIZE);
-    TEST_ASSERT_NOT_NULL (res1);
-
-    uint8_t test_data_decoded[SIZE];
-    const uint8_t *const res2 =
-      zmq_z85_decode (test_data_decoded, test_data_z85);
-    TEST_ASSERT_NOT_NULL (res2);
-
-    TEST_ASSERT_EQUAL_UINT8_ARRAY (test_data_, test_data_decoded, SIZE);
-}
-
-// call zmq_z85_encode, then zmq_z85_decode, and compare the results with the original
-template <size_t SIZE>
-void test__zmq_z85_decode__zmq_z85_encode__roundtrip (
-  const char (&test_data_)[SIZE])
-{
-    const size_t decoded_size = (SIZE - 1) * 4 / 5;
-    uint8_t test_data_decoded[decoded_size];
-    const uint8_t *const res1 = zmq_z85_decode (test_data_decoded, test_data_);
-    TEST_ASSERT_NOT_NULL (res1);
-
-    char test_data_z85[SIZE];
-    const char *const res2 =
-      zmq_z85_encode (test_data_z85, test_data_decoded, decoded_size);
-    TEST_ASSERT_NOT_NULL (res2);
-
-    TEST_ASSERT_EQUAL_UINT8_ARRAY (test_data_, test_data_z85, SIZE);
-}
-
-#define def_test__zmq_z85_basename(basename, name, param)                      \
-    void test__zmq_z85_##basename##_##name ()                                  \
-    {                                                                          \
-        test__zmq_z85_##basename (param);                                      \
-    }
-
-#define def_test__zmq_z85_encode__invalid__failure(name, param)                \
-    def_test__zmq_z85_basename (encode__invalid__failure, name, param)
-
-def_test__zmq_z85_encode__invalid__failure (1, 1)
-  def_test__zmq_z85_encode__invalid__failure (42, 42)
-
-#define def_test__zmq_z85_decode__invalid__failure(name, param)                \
-    def_test__zmq_z85_basename (decode__invalid__failure, name, param)
-
-  // String length must be evenly divisible by 5 or must fail with EINVAL.
-  def_test__zmq_z85_decode__invalid__failure (indivisble_by_5_multiple_chars,
-                                              "01234567")
-    def_test__zmq_z85_decode__invalid__failure (indivisble_by_5_one_char, "0")
-
-  // decode invalid data with the maximum representable value
-  def_test__zmq_z85_decode__invalid__failure (max, "#####")
-
-  // decode invalid data with the minimum value beyond the limit
-  // "%nSc0" is 0xffffffff
-  def_test__zmq_z85_decode__invalid__failure (above_limit, "%nSc1")
-
-  // decode invalid data with an invalid character in the range of valid
-  // characters
-  def_test__zmq_z85_decode__invalid__failure (char_within, "####\0047")
-
-  // decode invalid data with an invalid character just below the range of valid
-  // characters
-  def_test__zmq_z85_decode__invalid__failure (char_adjacent_below, "####\0200")
-
-  // decode invalid data with an invalid character just above the range of valid
-  // characters
-  def_test__zmq_z85_decode__invalid__failure (char_adjacent_above, "####\0037")
-
-#define def_test__encode__zmq_z85_decode__roundtrip(name, param)               \
-    def_test__zmq_z85_basename (encode__zmq_z85_decode__roundtrip, name, param)
-
-    const uint8_t test_data_min[] = {0x00, 0x00, 0x00, 0x00};
-const uint8_t test_data_max[] = {0xff, 0xff, 0xff, 0xff};
-
-def_test__encode__zmq_z85_decode__roundtrip (min, test_data_min)
-  def_test__encode__zmq_z85_decode__roundtrip (max, test_data_max)
-
-#define def_test__decode__zmq_z85_encode__roundtrip(name, param)               \
-    def_test__zmq_z85_basename (decode__zmq_z85_encode__roundtrip, name, param)
-
-    const char test_data_regular[] = "r^/rM9M=rMToK)63O8dCvd9D<PY<7iGlC+{BiSnG";
-
-def_test__decode__zmq_z85_encode__roundtrip (regular, test_data_regular)
-
-  int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test__zmq_z85_encode__valid__success);
-    RUN_TEST (test__zmq_z85_encode__invalid__failure_1);
-    RUN_TEST (test__zmq_z85_encode__invalid__failure_42);
-
-    RUN_TEST (test__zmq_z85_decode__valid__success);
-    RUN_TEST (
-      test__zmq_z85_decode__invalid__failure_indivisble_by_5_multiple_chars);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_indivisble_by_5_one_char);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_max);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_above_limit);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_char_within);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_char_adjacent_below);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_char_adjacent_above);
-
-    RUN_TEST (test__zmq_z85_encode__zmq_z85_decode__roundtrip_min);
-    RUN_TEST (test__zmq_z85_encode__zmq_z85_decode__roundtrip_max);
-
-    RUN_TEST (test__zmq_z85_decode__zmq_z85_encode__roundtrip_regular);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_bind_after_connect_tcp.cpp b/tests/test_bind_after_connect_tcp.cpp
deleted file mode 100644
index eb2ecb1c5..000000000
--- a/tests/test_bind_after_connect_tcp.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_x ()
-{
-    void *sb = test_context_socket (ZMQ_DEALER);
-    void *sc = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, ENDPOINT_3));
-
-    send_string_expect_success (sc, "foobar", 0);
-    send_string_expect_success (sc, "baz", 0);
-    send_string_expect_success (sc, "buzz", 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, ENDPOINT_3));
-
-    recv_string_expect_success (sb, "foobar", 0);
-    recv_string_expect_success (sb, "baz", 0);
-    recv_string_expect_success (sb, "buzz", 0);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_x);
-    return UNITY_END ();
-}
diff --git a/tests/test_bind_curve_fuzzer.cpp b/tests/test_bind_curve_fuzzer.cpp
deleted file mode 100644
index 643a37238..000000000
--- a/tests/test_bind_curve_fuzzer.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include <string.h>
-
-#include "testutil.hpp"
-#include "testutil_security.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when binding
-// https://rfc.zeromq.org/spec/37/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    const char *fixed_client_public =
-      "{{k*81)yMWEF{/BxdMd[5RL^qRFxBgoL<8m.D^KD";
-    const char *fixed_client_secret =
-      "N?Gmik8R[2ACw{b7*[-$S6[4}aO#?DB?#=<OQPc7";
-    const char *fixed_server_public =
-      "3.9-xXwy{g*w72TP*3iB9IJJRxlBH<ufTAvPd2>C";
-    const char *fixed_server_secret =
-      "T}t5GLq%&Qm1)y3ywu-}pY3KEA//{^Ut!M1ut+B4";
-    void *handler;
-    void *zap_thread;
-    void *server;
-    void *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    setup_test_context ();
-    memcpy (valid_client_public, fixed_client_public, 41);
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint, &zap_handler,
-      &socket_config_curve_server, (void *) fixed_server_secret);
-    fd_t client = connect_socket (my_endpoint);
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[512];
-    if (size >= 64) {
-        send (client, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (client, buf, 64, 0);
-    // Then send HELLO and expect WELCOME if there's enough data
-    if (size >= 202) {
-        send (client, (void *) data, 202, MSG_NOSIGNAL);
-        data += 202;
-        size -= 202;
-        recv (client, buf, 170, MSG_DONTWAIT);
-    }
-    // Then send READY and expect INITIATE if there's enough data
-    if (size >= 301) {
-        send (client, (void *) data, 301, MSG_NOSIGNAL);
-        data += 301;
-        size -= 301;
-        recv (client, buf, 512, MSG_DONTWAIT);
-    }
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (client, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-
-    //  Drain the queue, if any
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, server, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    //  A well-behaved client should work while the malformed data from the other
-    //  is being received
-    curve_client_data_t curve_client_data = {
-      fixed_server_public, fixed_client_public, fixed_client_secret};
-    void *client_mon;
-    void *client_good = create_and_connect_client (
-      my_endpoint, socket_config_curve_client, &curve_client_data, &client_mon);
-
-    bounce (server, client_good);
-
-    close (client);
-    test_context_socket_close_zero_linger (client_good);
-    test_context_socket_close_zero_linger (client_mon);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_bind_curve_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode ("tests/fuzzer_corpora/test_bind_curve_fuzzer.txt",
-                              &data, &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_curve_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/tests/test_bind_fuzzer.cpp b/tests/test_bind_fuzzer.cpp
deleted file mode 100644
index 3a29a30c2..000000000
--- a/tests/test_bind_fuzzer.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include <string>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that zmq_bind can handle malformed strings
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    std::string my_endpoint (reinterpret_cast<const char *> (data), size);
-    void *socket = test_context_socket (ZMQ_PUB);
-    zmq_bind (socket, my_endpoint.c_str ());
-
-    test_context_socket_close_zero_linger (socket);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_bind_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode ("tests/fuzzer_corpora/test_bind_fuzzer.txt",
-                              &data, &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/tests/test_bind_null_fuzzer.cpp b/tests/test_bind_null_fuzzer.cpp
deleted file mode 100644
index 11d289f24..000000000
--- a/tests/test_bind_null_fuzzer.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when binding
-// https://rfc.zeromq.org/spec/37/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *server = test_context_socket (ZMQ_PUB);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-    fd_t client = connect_socket (my_endpoint);
-
-    void *client_good = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client_good, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client_good, my_endpoint));
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[64];
-    if (size >= 64) {
-        send (client, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (client, buf, 64, 0);
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (client, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-
-    TEST_ASSERT_EQUAL_INT (6, zmq_send_const (server, "HELLO", 6, 0));
-    TEST_ASSERT_EQUAL_INT (6, zmq_recv (client_good, buf, 6, 0));
-
-    close (client);
-    test_context_socket_close_zero_linger (client_good);
-    test_context_socket_close_zero_linger (server);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_bind_null_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode ("tests/fuzzer_corpora/test_bind_null_fuzzer.txt",
-                              &data, &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_null_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/tests/test_bind_src_address.cpp b/tests/test_bind_src_address.cpp
deleted file mode 100644
index 8f80a3aaa..000000000
--- a/tests/test_bind_src_address.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_x ()
-{
-    void *sock = test_context_socket (ZMQ_PUB);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (sock, "tcp://127.0.0.1:0;localhost:1234"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (sock, "tcp://localhost:5555;localhost:1235"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (sock, "tcp://lo:5555;localhost:1235"));
-
-    test_context_socket_close (sock);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_x);
-    return UNITY_END ();
-}
diff --git a/tests/test_capabilities.cpp b/tests/test_capabilities.cpp
deleted file mode 100644
index 5417fed7d..000000000
--- a/tests/test_capabilities.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void test_capabilities ()
-{
-#if defined(ZMQ_HAVE_IPC)
-    TEST_ASSERT_TRUE (zmq_has ("ipc"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("ipc"));
-#endif
-
-#if defined(ZMQ_HAVE_OPENPGM)
-    TEST_ASSERT_TRUE (zmq_has ("pgm"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("pgm"));
-#endif
-
-#if defined(ZMQ_HAVE_TIPC)
-    TEST_ASSERT_TRUE (zmq_has ("tipc"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("tipc"));
-#endif
-
-#if defined(ZMQ_HAVE_NORM)
-    TEST_ASSERT_TRUE (zmq_has ("norm"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("norm"));
-#endif
-
-#if defined(ZMQ_HAVE_CURVE)
-    TEST_ASSERT_TRUE (zmq_has ("curve"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("curve"));
-#endif
-
-#if defined(HAVE_LIBGSSAPI_KRB5)
-    TEST_ASSERT_TRUE (zmq_has ("gssapi"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("gssapi"));
-#endif
-
-#if defined(ZMQ_HAVE_VMCI)
-    TEST_ASSERT_TRUE (zmq_has ("vmci"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("vmci"));
-#endif
-
-#if defined(ZMQ_BUILD_DRAFT_API)
-    TEST_ASSERT_TRUE (zmq_has ("draft"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("draft"));
-#endif
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_capabilities);
-    return UNITY_END ();
-}
diff --git a/tests/test_channel.cpp b/tests/test_channel.cpp
deleted file mode 100644
index 42777b437..000000000
--- a/tests/test_channel.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-    Copyright (c) 2007-2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void *sb;
-void *sc;
-
-void setUp ()
-{
-    setup_test_context ();
-
-    sb = test_context_socket (ZMQ_CHANNEL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    sc = test_context_socket (ZMQ_CHANNEL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-}
-
-void tearDown ()
-{
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-
-    teardown_test_context ();
-}
-
-void test_roundtrip ()
-{
-    send_string_expect_success (sb, "HELLO", 0);
-    recv_string_expect_success (sc, "HELLO", 0);
-
-    send_string_expect_success (sc, "WORLD", 0);
-    recv_string_expect_success (sb, "WORLD", 0);
-}
-
-void test_sndmore_fails ()
-{
-    int rc = zmq_send (sc, "X", 1, ZMQ_SNDMORE);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EINVAL, errno);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    RUN_TEST (test_sndmore_fails);
-    return UNITY_END ();
-}
diff --git a/tests/test_client_server.cpp b/tests/test_client_server.cpp
deleted file mode 100644
index c74883d83..000000000
--- a/tests/test_client_server.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void create_inproc_client_server_pair (void **server_, void **client_)
-{
-    *server_ = test_context_socket (ZMQ_SERVER);
-    *client_ = test_context_socket (ZMQ_CLIENT);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (*server_, "inproc://test-client-server"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (*client_, "inproc://test-client-server"));
-}
-
-void send_sndmore_expect_failure (void *socket_)
-{
-    int rc = zmq_send (socket_, "X", 1, ZMQ_SNDMORE);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EINVAL, errno);
-}
-
-void test_client_sndmore_fails ()
-{
-    void *server, *client;
-    create_inproc_client_server_pair (&server, &client);
-
-    send_sndmore_expect_failure (client);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-void test_server_sndmore_fails ()
-{
-    void *server, *client;
-    create_inproc_client_server_pair (&server, &client);
-
-    send_sndmore_expect_failure (server);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-void test_routing_id ()
-{
-    void *server, *client;
-    create_inproc_client_server_pair (&server, &client);
-
-    send_string_expect_success (client, "X", 0);
-
-    uint32_t routing_id;
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-        int rc = TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, server, 0));
-        TEST_ASSERT_EQUAL_INT (1, rc);
-
-        routing_id = zmq_msg_routing_id (&msg);
-        TEST_ASSERT_NOT_EQUAL (0, routing_id);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    }
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-        char *data = static_cast<char *> (zmq_msg_data (&msg));
-        data[0] = 2;
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_set_routing_id (&msg, routing_id));
-
-        int rc = zmq_msg_send (&msg, server, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-    }
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-        int rc = zmq_msg_recv (&msg, client, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-
-        routing_id = zmq_msg_routing_id (&msg);
-        TEST_ASSERT_EQUAL_UINT32 (0, routing_id);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    }
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_client_sndmore_fails);
-    RUN_TEST (test_server_sndmore_fails);
-    RUN_TEST (test_routing_id);
-    return UNITY_END ();
-}
diff --git a/tests/test_conflate.cpp b/tests/test_conflate.cpp
deleted file mode 100644
index dce3fb327..000000000
--- a/tests/test_conflate.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_conflate ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    int rc;
-
-    void *s_in = test_context_socket (ZMQ_PULL);
-
-    int conflate = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (s_in, ZMQ_CONFLATE, &conflate, sizeof (conflate)));
-    bind_loopback_ipv4 (s_in, my_endpoint, sizeof my_endpoint);
-
-    void *s_out = test_context_socket (ZMQ_PUSH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (s_out, my_endpoint));
-
-    int message_count = 20;
-    for (int j = 0; j < message_count; ++j) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_send (s_out, (void *) &j, sizeof (int), 0));
-    }
-    msleep (SETTLE_TIME);
-
-    int payload_recved = 0;
-    rc = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_recv (s_in, (void *) &payload_recved, sizeof (int), 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, rc);
-    TEST_ASSERT_EQUAL_INT (message_count - 1, payload_recved);
-
-    test_context_socket_close (s_in);
-    test_context_socket_close (s_out);
-}
-
-int main (int, char *[])
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_conflate);
-    return UNITY_END ();
-}
diff --git a/tests/test_connect_curve_fuzzer.cpp b/tests/test_connect_curve_fuzzer.cpp
deleted file mode 100644
index e0dbb386f..000000000
--- a/tests/test_connect_curve_fuzzer.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_security.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when connecting
-// https://rfc.zeromq.org/spec/37/
-// https://rfc.zeromq.org/spec/26/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    const char *fixed_client_public =
-      "{{k*81)yMWEF{/BxdMd[5RL^qRFxBgoL<8m.D^KD";
-    const char *fixed_client_secret =
-      "N?Gmik8R[2ACw{b7*[-$S6[4}aO#?DB?#=<OQPc7";
-    const char *fixed_server_public =
-      "3.9-xXwy{g*w72TP*3iB9IJJRxlBH<ufTAvPd2>C";
-
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    fd_t server = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint);
-
-    curve_client_data_t curve_client_data = {
-      fixed_server_public, fixed_client_public, fixed_client_secret};
-    void *client_mon;
-    void *client = create_and_connect_client (
-      my_endpoint, socket_config_curve_client, &curve_client_data, &client_mon);
-
-    fd_t server_accept =
-      TEST_ASSERT_SUCCESS_RAW_ERRNO (accept (server, NULL, NULL));
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[512];
-    if (size >= 64) {
-        send (server_accept, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (server_accept, buf, 64, 0);
-    // Then expect HELLO and send WELCOME if there's enough data
-    if (size >= 170) {
-        recv (server_accept, buf, 202, 0);
-        send (server_accept, (void *) data, 170, MSG_NOSIGNAL);
-        data += 170;
-        size -= 170;
-    }
-    // Then expect INITIATE and send READY if there's enough data
-    if (size >= 72) {
-        recv (server_accept, buf, 512, 0);
-        send (server_accept, (void *) data, 72, MSG_NOSIGNAL);
-        data += 72;
-        size -= 72;
-    }
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (server_accept, (const char *) data, size, MSG_NOSIGNAL);
-    recv (server_accept, buf, 512, MSG_DONTWAIT);
-    msleep (250);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, client, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    close (server_accept);
-    close (server);
-
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (client_mon);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_connect_curve_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/fuzzer_corpora/test_connect_curve_fuzzer.txt", &data, &len,
-          &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_curve_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/tests/test_connect_delay_tipc.cpp b/tests/test_connect_delay_tipc.cpp
deleted file mode 100644
index 8fd40f14a..000000000
--- a/tests/test_connect_delay_tipc.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-#include "testutil_security.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_send_one_connected_one_unconnected ()
-{
-    int val;
-    // TEST 1.
-    // First we're going to attempt to send messages to two
-    // pipes, one connected, the other not. We should see
-    // the PUSH load balancing to both pipes, and hence half
-    // of the messages getting queued, as connect() creates a
-    // pipe immediately.
-
-    void *to = test_context_socket (ZMQ_PULL);
-    int timeout = 5000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &timeout, sizeof (timeout)));
-
-    // Bind the one valid receiver
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &val, sizeof (val)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (to, "tipc://{6555,0,0}"));
-
-    // Create a socket pushing to two endpoints - only 1 message should arrive.
-    void *from = test_context_socket (ZMQ_PUSH);
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &timeout, sizeof (timeout)));
-    // This pipe will not connect
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tipc://{5556,0}@0.0.0"));
-    // This pipe will
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tipc://{6555,0}@0.0.0"));
-
-    // We send 10 messages, 5 should just get stuck in the queue
-    // for the not-yet-connected pipe
-    const int send_count = 10;
-    for (int i = 0; i < send_count; ++i) {
-        send_string_expect_success (from, "Hello", 0);
-    }
-
-    // We now consume from the connected pipe
-    // - we should see just 5
-    timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    int seen = 0;
-    while (true) {
-        char buffer[16];
-        int rc = zmq_recv (to, &buffer, sizeof (buffer), 0);
-        if (rc == -1) {
-            TEST_ASSERT_EQUAL_INT (EAGAIN, zmq_errno ());
-            break; //  Break when we didn't get a message
-        }
-        seen++;
-    }
-    TEST_ASSERT_EQUAL_INT (send_count / 2, seen);
-
-    test_context_socket_close (from);
-    test_context_socket_close (to);
-}
-
-void test_send_one_connected_one_unconnected_with_delay ()
-{
-    int val;
-
-    // TEST 2
-    // This time we will do the same thing, connect two pipes,
-    // one of which will succeed in connecting to a bound
-    // receiver, the other of which will fail. However, we will
-    // also set the delay attach on connect flag, which should
-    // cause the pipe attachment to be delayed until the connection
-    // succeeds.
-
-    // Bind the valid socket
-    void *to = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (to, "tipc://{5560,0,0}"));
-    int timeout = 5000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &timeout, sizeof (timeout)));
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &val, sizeof (val)));
-
-    // Create a socket pushing to two endpoints - all messages should arrive.
-    void *from = test_context_socket (ZMQ_PUSH);
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &timeout, sizeof (timeout)));
-
-    // Set the key flag
-    val = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_DELAY_ATTACH_ON_CONNECT, &val, sizeof (val)));
-
-    // Connect to the invalid socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tipc://{5561,0}@0.0.0"));
-    // Connect to the valid socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tipc://{5560,0}@0.0.0"));
-
-    // Send 10 messages, all should be routed to the connected pipe
-    const int send_count = 10;
-    for (int i = 0; i < send_count; ++i) {
-        send_string_expect_success (from, "Hello", 0);
-    }
-    timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    int seen = 0;
-    while (true) {
-        char buffer[16];
-        int rc = zmq_recv (to, &buffer, sizeof (buffer), 0);
-        if (rc == -1) {
-            TEST_ASSERT_EQUAL_INT (EAGAIN, zmq_errno ());
-            break; //  Break when we didn't get a message
-        }
-        seen++;
-    }
-    TEST_ASSERT_EQUAL_INT (send_count, seen);
-
-    test_context_socket_close (from);
-    test_context_socket_close (to);
-}
-
-void test_send_disconnected_with_delay ()
-{
-    // TEST 3
-    // This time we want to validate that the same blocking behaviour
-    // occurs with an existing connection that is broken. We will send
-    // messages to a connected pipe, disconnect and verify the messages
-    // block. Then we reconnect and verify messages flow again.
-    void *backend = test_context_socket (ZMQ_DEALER);
-    void *frontend = test_context_socket (ZMQ_DEALER);
-    void *monitor = test_context_socket (ZMQ_PAIR);
-    int rc;
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (frontend, "inproc://monitor",
-                                                   ZMQ_EVENT_DISCONNECTED));
-    int timeout = 5000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &timeout, sizeof (timeout)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_LINGER, &timeout, sizeof (timeout)));
-
-    //  Frontend connects to backend using DELAY_ATTACH_ON_CONNECT
-    int on = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_DELAY_ATTACH_ON_CONNECT, &on, sizeof (on)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, "tipc://{5560,0,0}"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (monitor, "inproc://monitor"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (frontend, "tipc://{5560,0}@0.0.0"));
-
-    //  Ping backend to frontend so we know when the connection is up
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    // Send message from frontend to backend
-    send_string_expect_success (frontend, "Hello", ZMQ_DONTWAIT);
-
-    test_context_socket_close (backend);
-
-    // Wait for disconnect to happen
-    expect_monitor_event (monitor, ZMQ_EVENT_DISCONNECTED);
-
-    // Send a message, might succeed depending on scheduling of the I/O thread
-    do {
-        rc = zmq_send (frontend, "Hello", 5, ZMQ_DONTWAIT);
-        TEST_ASSERT_TRUE (rc == 5 || (rc == -1 && zmq_errno () == EAGAIN));
-    } while (rc == 5);
-
-    //  Recreate backend socket
-    backend = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, "tipc://{5560,0,0}"));
-
-    //  Ping backend to frontend so we know when the connection is up
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    // After the reconnect, should succeed
-    send_string_expect_success (frontend, "Hello", ZMQ_DONTWAIT);
-
-    test_context_socket_close (monitor);
-    test_context_socket_close (backend);
-    test_context_socket_close (frontend);
-}
-
-int main (void)
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_send_one_connected_one_unconnected);
-    RUN_TEST (test_send_one_connected_one_unconnected_with_delay);
-    RUN_TEST (test_send_disconnected_with_delay);
-    return UNITY_END ();
-}
diff --git a/tests/test_connect_fuzzer.cpp b/tests/test_connect_fuzzer.cpp
deleted file mode 100644
index 4ef2cfddc..000000000
--- a/tests/test_connect_fuzzer.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include <string>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that zmq_connect can handle malformed strings
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    std::string my_endpoint (reinterpret_cast<const char *> (data), size);
-    void *socket = test_context_socket (ZMQ_PUB);
-    zmq_connect (socket, my_endpoint.c_str ());
-
-    test_context_socket_close_zero_linger (socket);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_connect_fuzzer ()
-{
-    uint8_t buffer[32] = {0};
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      LLVMFuzzerTestOneInput (buffer, sizeof (buffer)));
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/tests/test_connect_null_fuzzer.cpp b/tests/test_connect_null_fuzzer.cpp
deleted file mode 100644
index 985a27252..000000000
--- a/tests/test_connect_null_fuzzer.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when connecting
-// https://rfc.zeromq.org/spec/37/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    fd_t server = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint);
-
-    void *client = test_context_socket (ZMQ_SUB);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    fd_t server_accept =
-      TEST_ASSERT_SUCCESS_RAW_ERRNO (accept (server, NULL, NULL));
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[64];
-    if (size >= 64) {
-        send (server_accept, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (server_accept, buf, 64, 0);
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (server_accept, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, client, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    close (server_accept);
-    close (server);
-
-    test_context_socket_close_zero_linger (client);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_connect_null_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/fuzzer_corpora/test_connect_null_fuzzer.txt", &data, &len,
-          &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_null_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/tests/test_connect_resolve.cpp b/tests/test_connect_resolve.cpp
deleted file mode 100644
index b846ca39e..000000000
--- a/tests/test_connect_resolve.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void *sock;
-
-void setUp ()
-{
-    setup_test_context ();
-    sock = test_context_socket (ZMQ_PUB);
-}
-
-void tearDown ()
-{
-    test_context_socket_close (sock);
-    sock = NULL;
-    teardown_test_context ();
-}
-
-void test_hostname_ipv4 ()
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sock, "tcp://localhost:1234"));
-}
-
-void test_loopback_ipv6 ()
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sock, "tcp://[::1]:1234"));
-}
-
-void test_invalid_service_fails ()
-{
-    int rc = zmq_connect (sock, "tcp://localhost:invalid");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_hostname_with_spaces_fails ()
-{
-    int rc = zmq_connect (sock, "tcp://in val id:1234");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_no_hostname_fails ()
-{
-    int rc = zmq_connect (sock, "tcp://");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_x ()
-{
-    int rc = zmq_connect (sock, "tcp://192.168.0.200:*");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_invalid_proto_fails ()
-{
-    int rc = zmq_connect (sock, "invalid://localhost:1234");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EPROTONOSUPPORT, errno);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_hostname_ipv4);
-    RUN_TEST (test_loopback_ipv6);
-    RUN_TEST (test_hostname_with_spaces_fails);
-    RUN_TEST (test_no_hostname_fails);
-    RUN_TEST (test_invalid_service_fails);
-    RUN_TEST (test_invalid_proto_fails);
-    return UNITY_END ();
-}
diff --git a/tests/test_connect_rid.cpp b/tests/test_connect_rid.cpp
deleted file mode 100644
index 49dbded34..000000000
--- a/tests/test_connect_rid.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const char *rconn1routing_id = "conn1";
-const char *x_routing_id = "X";
-const char *y_routing_id = "Y";
-const char *z_routing_id = "Z";
-
-void test_stream_2_stream ()
-{
-    char buff[256];
-    const char msg[] = "hi 1";
-    const int disabled = 0;
-    const int zero = 0;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Set up listener STREAM.
-    void *rbind = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rbind, ZMQ_STREAM_NOTIFY, &disabled, sizeof (disabled)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rbind, ZMQ_LINGER, &zero, sizeof zero));
-    bind_loopback_ipv4 (rbind, my_endpoint, sizeof my_endpoint);
-
-    //  Set up connection stream.
-    void *rconn1 = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rconn1, ZMQ_LINGER, &zero, sizeof zero));
-
-    //  Do the connection.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (rconn1, ZMQ_CONNECT_ROUTING_ID,
-                                               rconn1routing_id,
-                                               strlen (rconn1routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rconn1, my_endpoint));
-
-    /*  Uncomment to test assert on duplicate routing id.
-    //  Test duplicate connect attempt.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (rconn1, ZMQ_CONNECT_ROUTING_ID, rconn1routing_id, strlen(rconn1routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rconn1, bindip));
-*/
-    //  Send data to the bound stream.
-    send_string_expect_success (rconn1, rconn1routing_id, ZMQ_SNDMORE);
-    send_string_expect_success (rconn1, msg, 0);
-
-    //  Accept data on the bound stream.
-    TEST_ASSERT_GREATER_THAN (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (rbind, buff, 256, 0)));
-    TEST_ASSERT_EQUAL (0, buff[0]); // an auto-generated routing id
-    recv_string_expect_success (rbind, msg, 0);
-
-    // Handle close of the socket.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (rbind, my_endpoint));
-    test_context_socket_close (rbind);
-    test_context_socket_close (rconn1);
-}
-
-void test_router_2_router (bool named_)
-{
-    char buff[256];
-    const char msg[] = "hi 1";
-    const int zero = 0;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Create bind socket.
-    void *rbind = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rbind, ZMQ_LINGER, &zero, sizeof (zero)));
-    bind_loopback_ipv4 (rbind, my_endpoint, sizeof my_endpoint);
-
-    //  Create connection socket.
-    void *rconn1 = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rconn1, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    //  If we're in named mode, set some identities.
-    if (named_) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rbind, ZMQ_ROUTING_ID, x_routing_id, 1));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rconn1, ZMQ_ROUTING_ID, y_routing_id, 1));
-    }
-
-    //  Make call to connect using a connect_routing_id.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (rconn1, ZMQ_CONNECT_ROUTING_ID,
-                                               rconn1routing_id,
-                                               strlen (rconn1routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rconn1, my_endpoint));
-    /*  Uncomment to test assert on duplicate routing id
-    //  Test duplicate connect attempt.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (rconn1, ZMQ_CONNECT_ROUTING_ID, rconn1routing_id, strlen (rconn1routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rconn1, bindip));
-*/
-    //  Send some data.
-
-    send_string_expect_success (rconn1, rconn1routing_id, ZMQ_SNDMORE);
-    send_string_expect_success (rconn1, msg, 0);
-
-    //  Receive the name.
-    const int routing_id_len = zmq_recv (rbind, buff, 256, 0);
-    if (named_) {
-        TEST_ASSERT_EQUAL_INT (strlen (y_routing_id), routing_id_len);
-        TEST_ASSERT_EQUAL_STRING_LEN (y_routing_id, buff, routing_id_len);
-    } else {
-        TEST_ASSERT_TRUE (routing_id_len && 0 == buff[0]);
-    }
-
-    //  Receive the data.
-    recv_string_expect_success (rbind, msg, 0);
-
-    //  Send some data back.
-    const int ret = zmq_send (rbind, buff, routing_id_len, ZMQ_SNDMORE);
-    TEST_ASSERT_EQUAL_INT (routing_id_len, ret);
-    send_string_expect_success (rbind, "ok", 0);
-
-    //  If bound socket identity naming a problem, we'll likely see something funky here.
-    recv_string_expect_success (rconn1, rconn1routing_id, 0);
-    recv_string_expect_success (rconn1, "ok", 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (rbind, my_endpoint));
-    test_context_socket_close (rbind);
-    test_context_socket_close (rconn1);
-}
-
-void test_router_2_router_while_receiving ()
-{
-    char buff[256];
-    const char msg[] = "hi 1";
-    const int zero = 0;
-    char x_endpoint[MAX_SOCKET_STRING];
-    char z_endpoint[MAX_SOCKET_STRING];
-
-    //  Create xbind socket.
-    void *xbind = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xbind, ZMQ_LINGER, &zero, sizeof (zero)));
-    bind_loopback_ipv4 (xbind, x_endpoint, sizeof x_endpoint);
-
-    //  Create zbind socket.
-    void *zbind = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (zbind, ZMQ_LINGER, &zero, sizeof (zero)));
-    bind_loopback_ipv4 (zbind, z_endpoint, sizeof z_endpoint);
-
-    //  Create connection socket.
-    void *yconn = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (yconn, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    // set identities for each socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      xbind, ZMQ_ROUTING_ID, x_routing_id, strlen (x_routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (yconn, ZMQ_ROUTING_ID, y_routing_id, 2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      zbind, ZMQ_ROUTING_ID, z_routing_id, strlen (z_routing_id)));
-
-    //  Connect Y to X using a routing id
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      yconn, ZMQ_CONNECT_ROUTING_ID, x_routing_id, strlen (x_routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (yconn, x_endpoint));
-
-    //  Send some data from Y to X.
-    send_string_expect_success (yconn, x_routing_id, ZMQ_SNDMORE);
-    send_string_expect_success (yconn, msg, 0);
-
-    // wait for the Y->X message to be received
-    msleep (SETTLE_TIME);
-
-    // Now X tries to connect to Z and send a message
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      xbind, ZMQ_CONNECT_ROUTING_ID, z_routing_id, strlen (z_routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (xbind, z_endpoint));
-
-    //  Try to send some data from X to Z.
-    send_string_expect_success (xbind, z_routing_id, ZMQ_SNDMORE);
-    send_string_expect_success (xbind, msg, 0);
-
-    // wait for the X->Z message to be received (so that our non-blocking check will actually
-    // fail if the message is routed to Y)
-    msleep (SETTLE_TIME);
-
-    // nothing should have been received on the Y socket
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_recv (yconn, buff, 256, ZMQ_DONTWAIT));
-
-    // the message should have been received on the Z socket
-    recv_string_expect_success (zbind, x_routing_id, 0);
-    recv_string_expect_success (zbind, msg, 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (xbind, x_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (zbind, z_endpoint));
-
-    test_context_socket_close (yconn);
-    test_context_socket_close (xbind);
-    test_context_socket_close (zbind);
-}
-
-void test_router_2_router_unnamed ()
-{
-    test_router_2_router (false);
-}
-
-void test_router_2_router_named ()
-{
-    test_router_2_router (true);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_2_stream);
-    RUN_TEST (test_router_2_router_unnamed);
-    RUN_TEST (test_router_2_router_named);
-    RUN_TEST (test_router_2_router_while_receiving);
-    return UNITY_END ();
-}
diff --git a/tests/test_ctx_destroy.cpp b/tests/test_ctx_destroy.cpp
deleted file mode 100644
index 661ca19d3..000000000
--- a/tests/test_ctx_destroy.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-static void receiver (void *socket_)
-{
-    char buffer[16];
-    int rc = zmq_recv (socket_, &buffer, sizeof (buffer), 0);
-    // TODO which error is expected here? use TEST_ASSERT_FAILURE_ERRNO instead
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_ctx_destroy ()
-{
-    //  Set up our context and sockets
-    void *ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx);
-
-    void *socket = zmq_socket (ctx, ZMQ_PULL);
-    TEST_ASSERT_NOT_NULL (socket);
-
-    // Close the socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-
-    // Destroy the context
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (ctx));
-}
-
-void test_ctx_shutdown ()
-{
-    //  Set up our context and sockets
-    void *ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx);
-
-    void *socket = zmq_socket (ctx, ZMQ_PULL);
-    TEST_ASSERT_NOT_NULL (socket);
-
-    // Spawn a thread to receive on socket
-    void *receiver_thread = zmq_threadstart (&receiver, socket);
-
-    // Wait for thread to start up and block
-    msleep (SETTLE_TIME);
-
-    // Shutdown context, if we used destroy here we would deadlock.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_shutdown (ctx));
-
-    // Wait for thread to finish
-    zmq_threadclose (receiver_thread);
-
-    // Close the socket.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-
-    // Destroy the context, will now not hang as we have closed the socket.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (ctx));
-}
-
-void test_ctx_shutdown_socket_opened_after ()
-{
-    //  Set up our context.
-    void *ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx);
-
-    // Open a socket to start context, and close it immediately again.
-    void *socket = zmq_socket (ctx, ZMQ_PULL);
-    TEST_ASSERT_NOT_NULL (socket);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-
-    // Shutdown context.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_shutdown (ctx));
-
-    // Opening socket should now fail.
-    TEST_ASSERT_NULL (zmq_socket (ctx, ZMQ_PULL));
-    TEST_ASSERT_FAILURE_ERRNO (ETERM, -1);
-
-    // Destroy the context.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (ctx));
-}
-
-void test_ctx_shutdown_only_socket_opened_after ()
-{
-    //  Set up our context.
-    void *ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx);
-
-    // Shutdown context.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_shutdown (ctx));
-
-    // Opening socket should now fail.
-    TEST_ASSERT_NULL (zmq_socket (ctx, ZMQ_PULL));
-    TEST_ASSERT_FAILURE_ERRNO (ETERM, -1);
-
-    // Destroy the context.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (ctx));
-}
-
-void test_zmq_ctx_term_null_fails ()
-{
-    int rc = zmq_ctx_term (NULL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EFAULT, errno);
-}
-
-void test_zmq_term_null_fails ()
-{
-    int rc = zmq_term (NULL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EFAULT, errno);
-}
-
-void test_zmq_ctx_shutdown_null_fails ()
-{
-    int rc = zmq_ctx_shutdown (NULL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EFAULT, errno);
-}
-
-#ifdef ZMQ_HAVE_POLLER
-struct poller_test_data_t
-{
-    int socket_type;
-    void *ctx;
-    void *counter;
-};
-
-void run_poller (void *data_)
-{
-    const poller_test_data_t *const poller_test_data =
-      static_cast<const poller_test_data_t *> (data_);
-
-    void *socket =
-      zmq_socket (poller_test_data->ctx, poller_test_data->socket_type);
-    TEST_ASSERT_NOT_NULL (socket);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
-
-    zmq_atomic_counter_set (poller_test_data->counter, 1);
-
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (ETERM, zmq_poller_wait (poller, &event, -1));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    // Close the socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-}
-#endif
-
-void test_poller_exists_with_socket_on_zmq_ctx_term (const int socket_type_)
-{
-#ifdef ZMQ_HAVE_POLLER
-    struct poller_test_data_t poller_test_data;
-
-    poller_test_data.socket_type = socket_type_;
-
-    //  Set up our context and sockets
-    poller_test_data.ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (poller_test_data.ctx);
-
-    poller_test_data.counter = zmq_atomic_counter_new ();
-    TEST_ASSERT_NOT_NULL (poller_test_data.counter);
-
-    void *thread = zmq_threadstart (run_poller, &poller_test_data);
-    TEST_ASSERT_NOT_NULL (thread);
-
-    while (zmq_atomic_counter_value (poller_test_data.counter) == 0) {
-        msleep (10);
-    }
-
-    // Destroy the context
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (poller_test_data.ctx));
-
-    zmq_threadclose (thread);
-
-    zmq_atomic_counter_destroy (&poller_test_data.counter);
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without zmq_poller_* support, ignoring test");
-#endif
-}
-
-void test_poller_exists_with_socket_on_zmq_ctx_term_thread_safe_socket ()
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    test_poller_exists_with_socket_on_zmq_ctx_term (ZMQ_CLIENT);
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without DRAFT support, ignoring test");
-#endif
-}
-
-void test_poller_exists_with_socket_on_zmq_ctx_term_non_thread_safe_socket ()
-{
-    test_poller_exists_with_socket_on_zmq_ctx_term (ZMQ_DEALER);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_ctx_destroy);
-    RUN_TEST (test_ctx_shutdown);
-    RUN_TEST (test_ctx_shutdown_socket_opened_after);
-    RUN_TEST (test_ctx_shutdown_only_socket_opened_after);
-    RUN_TEST (test_zmq_ctx_term_null_fails);
-    RUN_TEST (test_zmq_term_null_fails);
-    RUN_TEST (test_zmq_ctx_shutdown_null_fails);
-
-    RUN_TEST (
-      test_poller_exists_with_socket_on_zmq_ctx_term_non_thread_safe_socket);
-    RUN_TEST (
-      test_poller_exists_with_socket_on_zmq_ctx_term_thread_safe_socket);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_ctx_options.cpp b/tests/test_ctx_options.cpp
deleted file mode 100644
index a1f2d00bf..000000000
--- a/tests/test_ctx_options.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <limits>
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#define WAIT_FOR_BACKGROUND_THREAD_INSPECTION (0)
-
-#ifdef ZMQ_HAVE_LINUX
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <unistd.h> // for sleep()
-#include <sched.h>
-
-#define TEST_POLICY                                                            \
-    (SCHED_OTHER) // NOTE: SCHED_OTHER is the default Linux scheduler
-
-bool is_allowed_to_raise_priority ()
-{
-    // NOTE1: if setrlimit() fails with EPERM, this means that current user has not enough permissions.
-    // NOTE2: even for privileged users (e.g., root) getrlimit() would usually return 0 as nice limit; the only way to
-    //        discover if the user is able to increase the nice value is to actually try to change the rlimit:
-    struct rlimit rlim;
-    rlim.rlim_cur = 40;
-    rlim.rlim_max = 40;
-    if (setrlimit (RLIMIT_NICE, &rlim) == 0) {
-        // rlim_cur == 40 means that this process is allowed to set a nice value of -20
-        if (WAIT_FOR_BACKGROUND_THREAD_INSPECTION)
-            printf ("This process has enough permissions to raise ZMQ "
-                    "background thread priority!\n");
-        return true;
-    }
-
-    if (WAIT_FOR_BACKGROUND_THREAD_INSPECTION)
-        printf ("This process has NOT enough permissions to raise ZMQ "
-                "background thread priority.\n");
-    return false;
-}
-
-#else
-
-#define TEST_POLICY (0)
-
-bool is_allowed_to_raise_priority ()
-{
-    return false;
-}
-
-#endif
-
-
-void test_ctx_thread_opts ()
-{
-    // verify that setting negative values (e.g., default values) fail:
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_ctx_set (get_test_context (), ZMQ_THREAD_SCHED_POLICY,
-                           ZMQ_THREAD_SCHED_POLICY_DFLT));
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_ctx_set (get_test_context (),
-                                                    ZMQ_THREAD_PRIORITY,
-                                                    ZMQ_THREAD_PRIORITY_DFLT));
-
-
-    // test scheduling policy:
-
-    // set context options that alter the background thread CPU scheduling/affinity settings;
-    // as of ZMQ 4.2.3 this has an effect only on POSIX systems (nothing happens on Windows, but still it should return success):
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_THREAD_SCHED_POLICY, TEST_POLICY));
-    TEST_ASSERT_EQUAL_INT (
-      TEST_POLICY, zmq_ctx_get (get_test_context (), ZMQ_THREAD_SCHED_POLICY));
-
-    // test priority:
-
-    // in theory SCHED_OTHER supports only the static priority 0 but quoting the docs
-    //     http://man7.org/linux/man-pages/man7/sched.7.html
-    // "The thread to run is chosen from the static priority 0 list based on
-    // a dynamic priority that is determined only inside this list.  The
-    // dynamic priority is based on the nice value [...]
-    // The nice value can be modified using nice(2), setpriority(2), or sched_setattr(2)."
-    // ZMQ will internally use nice(2) to set the nice value when using SCHED_OTHER.
-    // However changing the nice value of a process requires appropriate permissions...
-    // check that the current effective user is able to do that:
-    if (is_allowed_to_raise_priority ()) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_set (
-          get_test_context (), ZMQ_THREAD_PRIORITY,
-          1 /* any positive value different than the default will be ok */));
-    }
-
-
-    // test affinity:
-
-    // this should result in background threads being placed only on the
-    // first CPU available on this system; try experimenting with other values
-    // (e.g., 5 to use CPU index 5) and use "top -H" or "taskset -pc" to see the result
-
-    int cpus_add[] = {0, 1};
-    for (unsigned int idx = 0; idx < sizeof (cpus_add) / sizeof (cpus_add[0]);
-         idx++) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_set (
-          get_test_context (), ZMQ_THREAD_AFFINITY_CPU_ADD, cpus_add[idx]));
-    }
-
-    // you can also remove CPUs from list of affinities:
-    int cpus_remove[] = {1};
-    for (unsigned int idx = 0;
-         idx < sizeof (cpus_remove) / sizeof (cpus_remove[0]); idx++) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_set (get_test_context (),
-                                                ZMQ_THREAD_AFFINITY_CPU_REMOVE,
-                                                cpus_remove[idx]));
-    }
-
-
-    // test INTEGER thread name prefix:
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_THREAD_NAME_PREFIX, 1234));
-    TEST_ASSERT_EQUAL_INT (
-      1234, zmq_ctx_get (get_test_context (), ZMQ_THREAD_NAME_PREFIX));
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    // test STRING thread name prefix:
-
-    const char prefix[] = "MyPrefix9012345"; // max len is 16 chars
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set_ext (get_test_context (), ZMQ_THREAD_NAME_PREFIX, prefix,
-                       sizeof (prefix) / sizeof (char)));
-
-    char buf[16];
-    size_t buflen = sizeof (buf) / sizeof (char);
-    zmq_ctx_get_ext (get_test_context (), ZMQ_THREAD_NAME_PREFIX, buf, &buflen);
-    TEST_ASSERT_EQUAL_STRING (prefix, buf);
-#endif
-}
-
-void test_ctx_zero_copy ()
-{
-#ifdef ZMQ_ZERO_COPY_RECV
-    int zero_copy;
-    // Default value is 1.
-    zero_copy = zmq_ctx_get (get_test_context (), ZMQ_ZERO_COPY_RECV);
-    TEST_ASSERT_EQUAL_INT (1, zero_copy);
-
-    // Test we can set it to 0.
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_ZERO_COPY_RECV, 0));
-    zero_copy = zmq_ctx_get (get_test_context (), ZMQ_ZERO_COPY_RECV);
-    TEST_ASSERT_EQUAL_INT (0, zero_copy);
-
-    // Create a TCP socket pair using the context and test that messages can be
-    // received. Note that inproc sockets cannot be used for this test.
-    void *pull = zmq_socket (get_test_context (), ZMQ_PULL);
-    char endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (pull, endpoint, sizeof endpoint);
-
-    void *push = zmq_socket (get_test_context (), ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (push, endpoint));
-
-    const char *small_str = "abcd";
-    const char *large_str =
-      "01234567890123456789012345678901234567890123456789";
-
-    send_string_expect_success (push, small_str, 0);
-    send_string_expect_success (push, large_str, 0);
-
-    recv_string_expect_success (pull, small_str, 0);
-    recv_string_expect_success (pull, large_str, 0);
-
-    // Clean up.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (push));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (pull));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_ZERO_COPY_RECV, 1));
-    TEST_ASSERT_EQUAL_INT (
-      1, zmq_ctx_get (get_test_context (), ZMQ_ZERO_COPY_RECV));
-#endif
-}
-
-void test_ctx_option_max_sockets ()
-{
-    TEST_ASSERT_EQUAL_INT (ZMQ_MAX_SOCKETS_DFLT,
-                           zmq_ctx_get (get_test_context (), ZMQ_MAX_SOCKETS));
-}
-
-void test_ctx_option_socket_limit ()
-{
-#if defined(ZMQ_USE_SELECT)
-    TEST_ASSERT_EQUAL_INT (FD_SETSIZE - 1, zmq_ctx_get (ctx, ZMQ_SOCKET_LIMIT));
-#elif defined(ZMQ_USE_POLL) || defined(ZMQ_USE_EPOLL)                          \
-  || defined(ZMQ_USE_DEVPOLL) || defined(ZMQ_USE_KQUEUE)
-    TEST_ASSERT_EQUAL_INT (65535, zmq_ctx_get (ctx, ZMQ_SOCKET_LIMIT));
-#endif
-}
-
-void test_ctx_option_io_threads ()
-{
-    TEST_ASSERT_EQUAL_INT (ZMQ_IO_THREADS_DFLT,
-                           zmq_ctx_get (get_test_context (), ZMQ_IO_THREADS));
-}
-
-void test_ctx_option_ipv6 ()
-{
-    TEST_ASSERT_EQUAL_INT (0, zmq_ctx_get (get_test_context (), ZMQ_IPV6));
-}
-
-void test_ctx_option_msg_t_size ()
-{
-#if defined(ZMQ_MSG_T_SIZE)
-    TEST_ASSERT_EQUAL_INT (sizeof (zmq_msg_t),
-                           zmq_ctx_get (get_test_context (), ZMQ_MSG_T_SIZE));
-#endif
-}
-
-void test_ctx_option_ipv6_set ()
-{
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_IPV6, true));
-    TEST_ASSERT_EQUAL_INT (1, zmq_ctx_get (get_test_context (), ZMQ_IPV6));
-}
-
-void test_ctx_option_blocky ()
-{
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_IPV6, true));
-
-    void *router = test_context_socket (ZMQ_ROUTER);
-    int value;
-    size_t optsize = sizeof (int);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_IPV6, &value, &optsize));
-    TEST_ASSERT_EQUAL_INT (1, value);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_LINGER, &value, &optsize));
-    TEST_ASSERT_EQUAL_INT (-1, value);
-    test_context_socket_close (router);
-
-#if WAIT_FOR_BACKGROUND_THREAD_INSPECTION
-    // this is useful when you want to use an external tool (like top or taskset) to view
-    // properties of the background threads
-    printf ("Sleeping for 100sec. You can now use 'top -H -p $(pgrep -f "
-            "test_ctx_options)' and 'taskset -pc <ZMQ background thread PID>' "
-            "to view ZMQ background thread properties.\n");
-    sleep (100);
-#endif
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_BLOCKY, false));
-    TEST_ASSERT_EQUAL_INT (0, TEST_ASSERT_SUCCESS_ERRNO ((zmq_ctx_get (
-                                get_test_context (), ZMQ_BLOCKY))));
-    router = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_LINGER, &value, &optsize));
-    TEST_ASSERT_EQUAL_INT (0, value);
-    test_context_socket_close (router);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_ctx_option_max_sockets);
-    RUN_TEST (test_ctx_option_socket_limit);
-    RUN_TEST (test_ctx_option_io_threads);
-    RUN_TEST (test_ctx_option_ipv6);
-    RUN_TEST (test_ctx_option_msg_t_size);
-    RUN_TEST (test_ctx_option_ipv6_set);
-    RUN_TEST (test_ctx_thread_opts);
-    RUN_TEST (test_ctx_zero_copy);
-    RUN_TEST (test_ctx_option_blocky);
-    return UNITY_END ();
-}
diff --git a/tests/test_dgram.cpp b/tests/test_dgram.cpp
deleted file mode 100644
index e4f1cf58c..000000000
--- a/tests/test_dgram.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void str_send_to (void *s_, const char *content_, const char *address_)
-{
-    send_string_expect_success (s_, address_, ZMQ_SNDMORE);
-    send_string_expect_success (s_, content_, 0);
-}
-
-void str_recv_from (void *s_, char **ptr_content_, char **ptr_address_)
-{
-    *ptr_address_ = s_recv (s_);
-    TEST_ASSERT_NOT_NULL (ptr_address_);
-
-    *ptr_content_ = s_recv (s_);
-    TEST_ASSERT_NOT_NULL (ptr_content_);
-}
-
-static const char test_question[] = "Is someone there ?";
-static const char test_answer[] = "Yes, there is !";
-
-void test_connect_fails ()
-{
-    void *socket = test_context_socket (ZMQ_DGRAM);
-
-    //  Connecting dgram should fail
-    TEST_ASSERT_FAILURE_ERRNO (ENOCOMPATPROTO,
-                               zmq_connect (socket, ENDPOINT_4));
-
-    test_context_socket_close (socket);
-}
-
-void test_roundtrip ()
-{
-    char *message_string;
-    char *address;
-
-    void *sender = test_context_socket (ZMQ_DGRAM);
-    void *listener = test_context_socket (ZMQ_DGRAM);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (listener, ENDPOINT_4));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sender, ENDPOINT_5));
-
-    str_send_to (sender, test_question, strrchr (ENDPOINT_4, '/') + 1);
-
-    str_recv_from (listener, &message_string, &address);
-    TEST_ASSERT_EQUAL_STRING (test_question, message_string);
-    TEST_ASSERT_EQUAL_STRING (strrchr (ENDPOINT_5, '/') + 1, address);
-    free (message_string);
-
-    str_send_to (listener, test_answer, address);
-    free (address);
-
-    str_recv_from (sender, &message_string, &address);
-    TEST_ASSERT_EQUAL_STRING (test_answer, message_string);
-    TEST_ASSERT_EQUAL_STRING (strrchr (ENDPOINT_4, '/') + 1, address);
-    free (message_string);
-    free (address);
-
-    test_context_socket_close (sender);
-    test_context_socket_close (listener);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_fails);
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/tests/test_diffserv.cpp b/tests/test_diffserv.cpp
deleted file mode 100644
index 4ed6dc626..000000000
--- a/tests/test_diffserv.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_diffserv ()
-{
-    int tos = 0x28;
-    int o_tos;
-    size_t tos_size = sizeof (tos);
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sb, ZMQ_TOS, &tos, tos_size));
-    bind_loopback_ipv4 (sb, my_endpoint, sizeof (my_endpoint));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (sb, ZMQ_TOS, &o_tos, &tos_size));
-    TEST_ASSERT_EQUAL (tos, o_tos);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    tos = 0x58;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sc, ZMQ_TOS, &tos, tos_size));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (sc, ZMQ_TOS, &o_tos, &tos_size));
-    TEST_ASSERT_EQUAL (tos, o_tos);
-
-    // Wireshark can be used to verify that the server socket is
-    // using DSCP 0x28 in packets to the client while the client
-    // is using 0x58 in packets to the server.
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_diffserv);
-    return UNITY_END ();
-}
diff --git a/tests/test_disconnect_inproc.cpp b/tests/test_disconnect_inproc.cpp
deleted file mode 100644
index 240f29d78..000000000
--- a/tests/test_disconnect_inproc.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-/// Initialize a zeromq message with a given null-terminated string
-#define ZMQ_PREPARE_STRING(msg, data, size)                                    \
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));                           \
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, size + 1));            \
-    memcpy (zmq_msg_data (&msg), data, size + 1);
-
-static int publicationsReceived = 0;
-static bool isSubscribed = false;
-
-void test_disconnect_inproc ()
-{
-    void *pub_socket = test_context_socket (ZMQ_XPUB);
-    void *sub_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_SUBSCRIBE, "foo", 3));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (pub_socket, "inproc://someInProcDescriptor"));
-
-    int more;
-    size_t more_size = sizeof (more);
-
-    for (int iteration = 0;; ++iteration) {
-        zmq_pollitem_t items[] = {
-          {sub_socket, 0, ZMQ_POLLIN, 0}, // read publications
-          {pub_socket, 0, ZMQ_POLLIN, 0}, // read subscriptions
-        };
-        int rc = zmq_poll (items, 2, 100);
-
-        if (items[1].revents & ZMQ_POLLIN) {
-            for (more = 1; more;) {
-                zmq_msg_t msg;
-                zmq_msg_init (&msg);
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, pub_socket, 0));
-                const char *const buffer =
-                  static_cast<const char *> (zmq_msg_data (&msg));
-
-                if (buffer[0] == 0) {
-                    TEST_ASSERT_TRUE (isSubscribed);
-                    isSubscribed = false;
-                } else {
-                    TEST_ASSERT_FALSE (isSubscribed);
-                    isSubscribed = true;
-                }
-
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_getsockopt (pub_socket, ZMQ_RCVMORE, &more, &more_size));
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            }
-        }
-
-        if (items[0].revents & ZMQ_POLLIN) {
-            more = 1;
-            for (more = 1; more;) {
-                zmq_msg_t msg;
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sub_socket, 0));
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_getsockopt (sub_socket, ZMQ_RCVMORE, &more, &more_size));
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            }
-            publicationsReceived++;
-        }
-        if (iteration == 1) {
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_connect (sub_socket, "inproc://someInProcDescriptor"));
-            msleep (SETTLE_TIME);
-        }
-        if (iteration == 4) {
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_disconnect (sub_socket, "inproc://someInProcDescriptor"));
-        }
-        if (iteration > 4 && rc == 0)
-            break;
-
-        zmq_msg_t channel_envlp;
-        ZMQ_PREPARE_STRING (channel_envlp, "foo", 3);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&channel_envlp, pub_socket, ZMQ_SNDMORE));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&channel_envlp));
-
-        zmq_msg_t message;
-        ZMQ_PREPARE_STRING (message, "this is foo!", 12);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&message, pub_socket, 0));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&message));
-    }
-    TEST_ASSERT_EQUAL_INT (3, publicationsReceived);
-    TEST_ASSERT_FALSE (isSubscribed);
-
-    test_context_socket_close (pub_socket);
-    test_context_socket_close (sub_socket);
-}
-
-int main (int, char **)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_disconnect_inproc);
-    return UNITY_END ();
-}
diff --git a/tests/test_disconnect_msg.cpp b/tests/test_disconnect_msg.cpp
deleted file mode 100644
index 73efef3d5..000000000
--- a/tests/test_disconnect_msg.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test (const char *address)
-{
-    //  Create a server
-    void *server = test_context_socket (ZMQ_SERVER);
-
-    //  set server socket options
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_DISCONNECT_MSG, "D", 1));
-
-    //  bind server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, address));
-
-    //  Create a client
-    void *client = test_context_socket (ZMQ_CLIENT);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_HELLO_MSG, "H", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, address));
-
-    // Receive the hello message from client
-    recv_string_expect_success (server, "H", 0);
-
-    // Kill the client
-    test_context_socket_close (client);
-
-    // Receive the disconnect message
-    recv_string_expect_success (server, "D", 0);
-
-    //  Clean up.
-    test_context_socket_close (server);
-}
-
-void test_tcp ()
-{
-    test ("tcp://127.0.0.1:5569");
-}
-
-void test_inproc ()
-{
-    test ("inproc://disconnect-msg");
-}
-
-
-void test_inproc_disconnect ()
-{
-    const char *address = "inproc://disconnect-msg";
-
-    //  Create a server
-    void *server = test_context_socket (ZMQ_SERVER);
-
-    //  set server socket options
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_DISCONNECT_MSG, "D", 1));
-
-    //  bind server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, address));
-
-    //  Create a client
-    void *client = test_context_socket (ZMQ_CLIENT);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_HELLO_MSG, "H", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, address));
-
-    // Receive the hello message from client
-    recv_string_expect_success (server, "H", 0);
-
-    // disconnect the client
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (client, address));
-
-    // Receive the disconnect message
-    recv_string_expect_success (server, "D", 0);
-
-    //  Clean up.
-    test_context_socket_close (client);
-    test_context_socket_close (server);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_tcp);
-    RUN_TEST (test_inproc);
-    RUN_TEST (test_inproc_disconnect);
-    return UNITY_END ();
-}
diff --git a/tests/test_filter_ipc.cpp b/tests/test_filter_ipc.cpp
deleted file mode 100644
index 57fdd949b..000000000
--- a/tests/test_filter_ipc.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unistd.h>
-#include <grp.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void bounce_fail (void *server_, void *client_)
-{
-    const char *content = "12345678ABCDEFGH12345678abcdefgh";
-    char buffer[32];
-
-    //  Send message from client to server
-    send_string_expect_success (client_, content, ZMQ_SNDMORE);
-    send_string_expect_success (client_, content, 0);
-
-    //  Receive message at server side (should not succeed)
-    int timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (server_, buffer, 32, 0));
-
-    //  Send message from server to client to test other direction
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_send (server_, content, 32, ZMQ_SNDMORE));
-}
-
-template <class T>
-static void
-run_test (int opt_, T optval_, int expected_error_, int bounce_test_)
-{
-    void *sb = test_context_socket (ZMQ_DEALER);
-
-    if (opt_) {
-        const int rc = zmq_setsockopt (sb, opt_, &optval_, sizeof (optval_));
-        if (expected_error_) {
-            TEST_ASSERT_FAILURE_ERRNO (expected_error_, rc);
-        } else {
-            TEST_ASSERT_SUCCESS_ERRNO (rc);
-        }
-    }
-
-    void *sc = test_context_socket (ZMQ_DEALER);
-
-    // If a test fails, don't hang for too long
-    int timeout = 2500;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-    int interval = -1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_RECONNECT_IVL, &interval, sizeof (int)));
-
-    if (bounce_test_) {
-        const char *endpoint = "ipc://test_filter_ipc.sock";
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, endpoint));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-        if (bounce_test_ > 0)
-            bounce (sb, sc);
-        else
-            bounce_fail (sb, sc);
-    }
-
-    // TODO only use zero linger when bounce_test_ < 0?
-    test_context_socket_close_zero_linger (sc);
-    test_context_socket_close_zero_linger (sb);
-}
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-gid_t group, supgroup, notgroup;
-
-void init_groups ()
-{
-    // Get the group and supplemental groups of the process owner
-    gid_t groups[100];
-    int ngroups = getgroups (100, groups);
-    TEST_ASSERT_NOT_EQUAL (-1, ngroups);
-    group = getgid ();
-    supgroup = group;
-    notgroup = group + 1;
-    for (int i = 0; i < ngroups; i++) {
-        if (supgroup == group && group != groups[i]) {
-            if (getgrgid (groups[i]))
-                supgroup = groups[i];
-        }
-        if (notgroup <= groups[i])
-            notgroup = groups[i] + 1;
-    }
-}
-#endif
-
-void test_no_filters ()
-{
-    run_test<int> (0, 0, 0, 1);
-}
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-void test_filter_with_process_owner_uid ()
-{
-    run_test<uid_t> (ZMQ_IPC_FILTER_UID, getuid (), 0, 1);
-}
-void test_filter_with_possibly_nonexistent_uid ()
-{
-    run_test<uid_t> (ZMQ_IPC_FILTER_UID, getuid () + 1, 0, -1);
-}
-void test_filter_with_process_owner_gid ()
-{
-    run_test<gid_t> (ZMQ_IPC_FILTER_GID, group, 0, 1);
-}
-void test_filter_with_supplemental_process_owner_gid ()
-{
-    run_test<gid_t> (ZMQ_IPC_FILTER_GID, supgroup, 0, 1);
-}
-void test_filter_with_possibly_nonexistent_gid ()
-{
-    run_test<gid_t> (ZMQ_IPC_FILTER_GID, notgroup, 0, -1);
-}
-#if defined ZMQ_HAVE_SO_PEERCRED
-void test_filter_with_current_process_pid ()
-{
-    run_test<pid_t> (ZMQ_IPC_FILTER_PID, getpid (), 0, 1);
-}
-void test_filter_with_possibly_nonexistent_pid ()
-{
-    run_test<pid_t> (ZMQ_IPC_FILTER_PID, getpid () + 1, 0, -1);
-}
-#else
-void test_filter_with_pid_fails ()
-{
-    // Setup of PID filter should fail with operation not supported error
-    // TODO EINVAL is not ENOTSUP (!)
-    run_test<pid_t> (ZMQ_IPC_FILTER_PID, getpid (), EINVAL, 0);
-}
-#endif
-#else
-void test_filter_with_zero_uid_fails ()
-{
-    run_test<uid_t> (ZMQ_IPC_FILTER_UID, 0, EINVAL, 0);
-}
-void test_filter_with_zero_gid_fails ()
-{
-    run_test<gid_t> (ZMQ_IPC_FILTER_GID, 0, EINVAL, 0);
-}
-void test_filter_with_zero_pid_fails ()
-{
-    run_test<pid_t> (ZMQ_IPC_FILTER_PID, 0, EINVAL, 0);
-}
-#endif // defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-
-int main (void)
-{
-#if !defined(ZMQ_HAVE_WINDOWS)
-    setup_test_environment ();
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    init_groups ();
-#endif
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_no_filters);
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    RUN_TEST (test_filter_with_process_owner_uid);
-    RUN_TEST (test_filter_with_possibly_nonexistent_uid);
-    RUN_TEST (test_filter_with_process_owner_gid);
-    RUN_TEST (test_filter_with_supplemental_process_owner_gid);
-    RUN_TEST (test_filter_with_possibly_nonexistent_gid);
-#if defined ZMQ_HAVE_SO_PEERCRED
-    RUN_TEST (test_filter_with_current_process_pid);
-    RUN_TEST (test_filter_with_possibly_nonexistent_pid);
-#else
-    RUN_TEST (test_filter_with_pid_fails);
-#endif
-#else
-    RUN_TEST (test_filter_with_zero_uid_fails);
-    RUN_TEST (test_filter_with_zero_gid_fails);
-    RUN_TEST (test_filter_with_zero_pid_fails);
-#endif // defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    return UNITY_END ();
-#else
-    return 0;
-#endif
-}
diff --git a/tests/test_fork.cpp b/tests/test_fork.cpp
deleted file mode 100644
index 212a65c45..000000000
--- a/tests/test_fork.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <assert.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-char connect_address[MAX_SOCKET_STRING];
-
-#define NUM_MESSAGES 5
-
-void test_fork ()
-{
-#if !defined(ZMQ_HAVE_WINDOWS)
-    //  Create and bind pull socket to receive messages
-    void *pull = test_context_socket (ZMQ_PULL);
-    bind_loopback_ipv4 (pull, connect_address, sizeof connect_address);
-
-    int pid = fork ();
-    if (pid == 0) {
-        // use regular assertions in the child process
-
-        //  Child process
-        //  Immediately close parent sockets and context
-        zmq_close (pull);
-        zmq_ctx_term (get_test_context ());
-
-        //  Create new context, socket, connect and send some messages
-        void *child_ctx = zmq_ctx_new ();
-        assert (child_ctx);
-        void *push = zmq_socket (child_ctx, ZMQ_PUSH);
-        assert (push);
-        int rc = zmq_connect (push, connect_address);
-        assert (rc == 0);
-        int count;
-        for (count = 0; count < NUM_MESSAGES; count++)
-            zmq_send (push, "Hello", 5, 0);
-
-        zmq_close (push);
-        zmq_ctx_destroy (child_ctx);
-        exit (0);
-    } else {
-        //  Parent process
-        int count;
-        for (count = 0; count < NUM_MESSAGES; count++) {
-            recv_string_expect_success (pull, "Hello", 0);
-        }
-        int child_status;
-        while (true) {
-            int rc = waitpid (pid, &child_status, 0);
-            if (rc == -1 && errno == EINTR)
-                continue;
-            TEST_ASSERT_GREATER_THAN (0, rc);
-            //  Verify the status code of the child was zero
-            TEST_ASSERT_EQUAL (0, WEXITSTATUS (child_status));
-            break;
-        }
-        test_context_socket_close (pull);
-    }
-#endif
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_fork);
-    return UNITY_END ();
-}
diff --git a/tests/test_getsockopt_memset.cpp b/tests/test_getsockopt_memset.cpp
deleted file mode 100644
index caab9c27d..000000000
--- a/tests/test_getsockopt_memset.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_getsockopt_memset ()
-{
-    int64_t more;
-    size_t more_size = sizeof (more);
-
-    void *sb = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    void *sc = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-
-    memset (&more, 0xFF, sizeof (int64_t));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sc, ZMQ_RCVMORE, &more, &more_size));
-    TEST_ASSERT_EQUAL_INT (sizeof (int), more_size);
-    TEST_ASSERT_EQUAL_INT (0, more);
-
-    // Cleanup
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_getsockopt_memset);
-    return UNITY_END ();
-}
diff --git a/tests/test_heartbeats.cpp b/tests/test_heartbeats.cpp
deleted file mode 100644
index 420dd33b0..000000000
--- a/tests/test_heartbeats.cpp
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    0MQ is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#if defined(ZMQ_HAVE_WINDOWS)
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <stdexcept>
-#define close closesocket
-typedef SOCKET raw_socket;
-#else
-#include <arpa/inet.h>
-#include <unistd.h>
-typedef int raw_socket;
-#endif
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-// TODO remove this here, either ensure that UINT16_MAX is always properly
-// defined or handle this at a more central location
-#ifndef UINT16_MAX
-#define UINT16_MAX 65535
-#endif
-
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-
-static int get_monitor_event (void *monitor_)
-{
-    for (int i = 0; i < 10; i++) {
-        //  First frame in message contains event number and value
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        if (zmq_msg_recv (&msg, monitor_, ZMQ_DONTWAIT) == -1) {
-            msleep (SETTLE_TIME);
-            continue; //  Interrupted, presumably
-        }
-        TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-
-        uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg));
-        uint16_t event = *reinterpret_cast<uint16_t *> (data);
-
-        //  Second frame in message contains event address
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        if (zmq_msg_recv (&msg, monitor_, 0) == -1) {
-            return -1; //  Interrupted, presumably
-        }
-        TEST_ASSERT_FALSE (zmq_msg_more (&msg));
-
-        return event;
-    }
-    return -1;
-}
-
-static void recv_with_retry (raw_socket fd_, char *buffer_, int bytes_)
-{
-    int received = 0;
-    while (true) {
-        int rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-          recv (fd_, buffer_ + received, bytes_ - received, 0));
-        TEST_ASSERT_GREATER_THAN_INT (0, rc);
-        received += rc;
-        TEST_ASSERT_LESS_OR_EQUAL_INT (bytes_, received);
-        if (received == bytes_)
-            break;
-    }
-}
-
-static void mock_handshake (raw_socket fd_, int mock_ping_)
-{
-    char buffer[128];
-    memset (buffer, 0, sizeof (buffer));
-    memcpy (buffer, zmtp_greeting_null, sizeof (zmtp_greeting_null));
-
-    int rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      send (fd_, buffer, sizeof (zmtp_greeting_null), 0));
-    TEST_ASSERT_EQUAL_INT (sizeof (zmtp_greeting_null), rc);
-
-    recv_with_retry (fd_, buffer, sizeof (zmtp_greeting_null));
-
-    memset (buffer, 0, sizeof (buffer));
-    memcpy (buffer, zmtp_ready_dealer, sizeof (zmtp_ready_dealer));
-    rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      send (fd_, buffer, sizeof (zmtp_ready_dealer), 0));
-    TEST_ASSERT_EQUAL_INT (sizeof (zmtp_ready_dealer), rc);
-
-    //  greeting
-    recv_with_retry (fd_, buffer, sizeof (zmtp_ready_dealer));
-
-    if (mock_ping_) {
-        //  test PING context - should be replicated in the PONG
-        //  to avoid timeouts, do a bulk send
-        const uint8_t zmtp_ping[12] = {4,   10, 4, 'P', 'I', 'N',
-                                       'G', 0,  0, 'L', 'O', 'L'};
-        uint8_t zmtp_pong[10] = {4, 8, 4, 'P', 'O', 'N', 'G', 'L', 'O', 'L'};
-        memset (buffer, 0, sizeof (buffer));
-        memcpy (buffer, zmtp_ping, 12);
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (fd_, buffer, 12, 0));
-        TEST_ASSERT_EQUAL_INT (12, rc);
-
-        //  test a larger body that won't fit in a small message and should get
-        //  truncated
-        memset (buffer, 'z', sizeof (buffer));
-        memcpy (buffer, zmtp_ping, 12);
-        buffer[1] = 65;
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (fd_, buffer, 67, 0));
-        TEST_ASSERT_EQUAL_INT (67, rc);
-
-        //  small pong
-        recv_with_retry (fd_, buffer, 10);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (zmtp_pong, buffer, 10));
-        //  large pong
-        recv_with_retry (fd_, buffer, 23);
-        uint8_t zmtp_pooong[65] = {4, 21, 4, 'P', 'O', 'N', 'G', 'L', 'O', 'L'};
-        memset (zmtp_pooong + 10, 'z', 55);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (zmtp_pooong, buffer, 23));
-    }
-}
-
-static void setup_curve (void *socket_, int is_server_)
-{
-    const char *secret_key;
-    const char *public_key;
-    const char *server_key;
-
-    if (is_server_) {
-        secret_key = "JTKVSB%%)wK0E.X)V>+}o?pNmC{O&4W4b!Ni{Lh6";
-        public_key = "rq:rM>}U?@Lns47E1%kR.o@n%FcmmsL/@{H8]yf7";
-        server_key = NULL;
-    } else {
-        secret_key = "D:)Q[IlAW!ahhC2ac:9*A}h:p?([4%wOTJ%JR%cs";
-        public_key = "Yne@$w-vo<fVvi]a<NY6T1ed:M$fCG*[IaLV{hID";
-        server_key = "rq:rM>}U?@Lns47E1%kR.o@n%FcmmsL/@{H8]yf7";
-    }
-
-    zmq_setsockopt (socket_, ZMQ_CURVE_SECRETKEY, secret_key,
-                    strlen (secret_key));
-    zmq_setsockopt (socket_, ZMQ_CURVE_PUBLICKEY, public_key,
-                    strlen (public_key));
-    if (is_server_)
-        zmq_setsockopt (socket_, ZMQ_CURVE_SERVER, &is_server_,
-                        sizeof (is_server_));
-    else
-        zmq_setsockopt (socket_, ZMQ_CURVE_SERVERKEY, server_key,
-                        strlen (server_key));
-}
-
-static void prep_server_socket (int set_heartbeats_,
-                                int is_curve_,
-                                void **server_out_,
-                                void **mon_out_,
-                                char *endpoint_,
-                                size_t ep_length_,
-                                int socket_type_)
-{
-    //  We'll be using this socket in raw mode
-    void *server = test_context_socket (socket_type_);
-
-    int value = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_LINGER, &value, sizeof (value)));
-
-    if (set_heartbeats_) {
-        value = 50;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (server, ZMQ_HEARTBEAT_IVL, &value, sizeof (value)));
-    }
-
-    if (is_curve_)
-        setup_curve (server, 1);
-
-    bind_loopback_ipv4 (server, endpoint_, ep_length_);
-
-    //  Create and connect a socket for collecting monitor events on dealer
-    void *server_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      server, "inproc://monitor-dealer",
-      ZMQ_EVENT_CONNECTED | ZMQ_EVENT_DISCONNECTED | ZMQ_EVENT_ACCEPTED));
-
-    //  Connect to the inproc endpoint so we'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (server_mon, "inproc://monitor-dealer"));
-
-    *server_out_ = server;
-    *mon_out_ = server_mon;
-}
-
-// This checks for a broken TCP connection (or, in this case a stuck one
-// where the peer never responds to PINGS). There should be an accepted event
-// then a disconnect event.
-static void test_heartbeat_timeout (int server_type_, int mock_ping_)
-{
-    int rc;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server, *server_mon;
-    prep_server_socket (!mock_ping_, 0, &server, &server_mon, my_endpoint,
-                        MAX_SOCKET_STRING, server_type_);
-
-    fd_t s = connect_socket (my_endpoint);
-
-    // Mock a ZMTP 3 client so we can forcibly time out a connection
-    mock_handshake (s, mock_ping_);
-
-    // By now everything should report as connected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, rc);
-
-    if (!mock_ping_) {
-        // We should have been disconnected
-        rc = get_monitor_event (server_mon);
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_DISCONNECTED, rc);
-    }
-
-    close (s);
-
-    test_context_socket_close (server);
-    test_context_socket_close (server_mon);
-}
-
-// This checks that peers respect the TTL value in ping messages
-// We set up a mock ZMTP 3 client and send a ping message with a TLL
-// to a server that is not doing any heartbeating. Then we sleep,
-// if the server disconnects the client, then we know the TTL did
-// its thing correctly.
-static void test_heartbeat_ttl (int client_type_, int server_type_)
-{
-    int rc, value;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server, *server_mon, *client;
-    prep_server_socket (0, 0, &server, &server_mon, my_endpoint,
-                        MAX_SOCKET_STRING, server_type_);
-
-    client = test_context_socket (client_type_);
-
-    // Set the heartbeat TTL to 0.1 seconds
-    value = 100;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_HEARTBEAT_TTL, &value, sizeof (value)));
-
-    // Set the heartbeat interval to much longer than the TTL so that
-    // the socket times out oon the remote side.
-    value = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_HEARTBEAT_IVL, &value, sizeof (value)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    // By now everything should report as connected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, rc);
-
-    msleep (SETTLE_TIME);
-
-    // We should have been disconnected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_DISCONNECTED, rc);
-
-    test_context_socket_close (server);
-    test_context_socket_close (server_mon);
-    test_context_socket_close (client);
-}
-
-// This checks for normal operation - that is pings and pongs being
-// exchanged normally. There should be an accepted event on the server,
-// and then no event afterwards.
-static void
-test_heartbeat_notimeout (int is_curve_, int client_type_, int server_type_)
-{
-    int rc;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server, *server_mon;
-    prep_server_socket (1, is_curve_, &server, &server_mon, my_endpoint,
-                        MAX_SOCKET_STRING, server_type_);
-
-    void *client = test_context_socket (client_type_);
-    if (is_curve_)
-        setup_curve (client, 0);
-    rc = zmq_connect (client, my_endpoint);
-
-    // Give it a sec to connect and handshake
-    msleep (SETTLE_TIME);
-
-    // By now everything should report as connected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, rc);
-
-    // We should still be connected because pings and pongs are happenin'
-    TEST_ASSERT_EQUAL_INT (-1, get_monitor_event (server_mon));
-
-    test_context_socket_close (client);
-    test_context_socket_close (server);
-    test_context_socket_close (server_mon);
-}
-
-void test_heartbeat_timeout_router ()
-{
-    test_heartbeat_timeout (ZMQ_ROUTER, 0);
-}
-
-void test_heartbeat_timeout_router_mock_ping ()
-{
-    test_heartbeat_timeout (ZMQ_ROUTER, 1);
-}
-
-#define DEFINE_TESTS(first, second, first_define, second_define)               \
-    void test_heartbeat_ttl_##first##_##second ()                              \
-    {                                                                          \
-        test_heartbeat_ttl (first_define, second_define);                      \
-    }                                                                          \
-    void test_heartbeat_notimeout_##first##_##second ()                        \
-    {                                                                          \
-        test_heartbeat_notimeout (0, first_define, second_define);             \
-    }                                                                          \
-    void test_heartbeat_notimeout_##first##_##second##_with_curve ()           \
-    {                                                                          \
-        test_heartbeat_notimeout (1, first_define, second_define);             \
-    }
-
-DEFINE_TESTS (dealer, router, ZMQ_DEALER, ZMQ_ROUTER)
-DEFINE_TESTS (req, rep, ZMQ_REQ, ZMQ_REP)
-DEFINE_TESTS (pull, push, ZMQ_PULL, ZMQ_PUSH)
-DEFINE_TESTS (sub, pub, ZMQ_SUB, ZMQ_PUB)
-DEFINE_TESTS (pair, pair, ZMQ_PAIR, ZMQ_PAIR)
-
-#ifdef ZMQ_BUILD_DRAFT_API
-DEFINE_TESTS (gather, scatter, ZMQ_GATHER, ZMQ_SCATTER)
-DEFINE_TESTS (client, server, ZMQ_CLIENT, ZMQ_SERVER)
-#endif
-
-const int deciseconds_per_millisecond = 100;
-const int heartbeat_ttl_max =
-  (UINT16_MAX + 1) * deciseconds_per_millisecond - 1;
-
-void test_setsockopt_heartbeat_success (const int value_)
-{
-    void *const socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_HEARTBEAT_TTL, &value_, sizeof (value_)));
-
-    int value_read;
-    size_t value_read_size = sizeof (value_read);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (socket, ZMQ_HEARTBEAT_TTL,
-                                               &value_read, &value_read_size));
-
-    TEST_ASSERT_EQUAL_INT (value_ - value_ % deciseconds_per_millisecond,
-                           value_read);
-
-    test_context_socket_close (socket);
-}
-
-void test_setsockopt_heartbeat_ttl_max ()
-{
-    test_setsockopt_heartbeat_success (heartbeat_ttl_max);
-}
-
-void test_setsockopt_heartbeat_ttl_more_than_max_fails ()
-{
-    void *const socket = test_context_socket (ZMQ_PAIR);
-    const int value = heartbeat_ttl_max + 1;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL,
-      zmq_setsockopt (socket, ZMQ_HEARTBEAT_TTL, &value, sizeof (value)));
-
-    test_context_socket_close (socket);
-}
-
-void test_setsockopt_heartbeat_ttl_near_zero ()
-{
-    test_setsockopt_heartbeat_success (deciseconds_per_millisecond - 1);
-}
-
-int main (void)
-{
-    //  The test cases are very long-running. The default timeout of 60 seconds
-    //  is not always enough.
-    setup_test_environment (90);
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_heartbeat_timeout_router);
-    RUN_TEST (test_heartbeat_timeout_router_mock_ping);
-
-    RUN_TEST (test_heartbeat_ttl_dealer_router);
-    RUN_TEST (test_heartbeat_ttl_req_rep);
-    RUN_TEST (test_heartbeat_ttl_pull_push);
-    RUN_TEST (test_heartbeat_ttl_sub_pub);
-    RUN_TEST (test_heartbeat_ttl_pair_pair);
-
-    RUN_TEST (test_setsockopt_heartbeat_ttl_max);
-    RUN_TEST (test_setsockopt_heartbeat_ttl_more_than_max_fails);
-    RUN_TEST (test_setsockopt_heartbeat_ttl_near_zero);
-
-    RUN_TEST (test_heartbeat_notimeout_dealer_router);
-    RUN_TEST (test_heartbeat_notimeout_req_rep);
-    RUN_TEST (test_heartbeat_notimeout_pull_push);
-    RUN_TEST (test_heartbeat_notimeout_sub_pub);
-    RUN_TEST (test_heartbeat_notimeout_pair_pair);
-
-    RUN_TEST (test_heartbeat_notimeout_dealer_router_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_req_rep_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_pull_push_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_sub_pub_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_pair_pair_with_curve);
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    RUN_TEST (test_heartbeat_ttl_client_server);
-    RUN_TEST (test_heartbeat_ttl_gather_scatter);
-
-    RUN_TEST (test_heartbeat_notimeout_client_server);
-    RUN_TEST (test_heartbeat_notimeout_gather_scatter);
-
-    RUN_TEST (test_heartbeat_notimeout_client_server_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_gather_scatter_with_curve);
-#endif
-
-    return UNITY_END ();
-}
diff --git a/tests/test_hello_msg.cpp b/tests/test_hello_msg.cpp
deleted file mode 100644
index e38ea87cf..000000000
--- a/tests/test_hello_msg.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-    Copyright (c) 2007-2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test (const char *address)
-{
-    //  Create a router
-    void *router = test_context_socket (ZMQ_ROUTER);
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  set router socket options
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_HELLO_MSG, "H", 1));
-
-    //  bind router
-    test_bind (router, address, my_endpoint, MAX_SOCKET_STRING);
-
-    //  Create a dealer
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    // Receive the hello message
-    recv_string_expect_success (dealer, "H", 0);
-
-    //  Clean up.
-    test_context_socket_close (dealer);
-    test_context_socket_close (router);
-}
-
-void test_tcp ()
-{
-    test ("tcp://127.0.0.1:*");
-}
-
-void test_inproc ()
-{
-    test ("inproc://hello-msg");
-}
-
-void test_inproc_late_bind ()
-{
-    char address[] = "inproc://late-hello-msg";
-
-    //  Create a server
-    void *server = test_context_socket (ZMQ_SERVER);
-
-    //  set server socket options
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (server, ZMQ_HELLO_MSG, "W", 1));
-
-    //  Create a dealer
-    void *client = test_context_socket (ZMQ_CLIENT);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_HELLO_MSG, "H", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, address));
-
-    //  bind server after the dealer
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, address));
-
-    // Receive the welcome message from server
-    recv_string_expect_success (client, "W", 0);
-
-    // Receive the hello message from client
-    recv_string_expect_success (server, "H", 0);
-
-    //  Clean up.
-    test_context_socket_close (client);
-    test_context_socket_close (server);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_tcp);
-    RUN_TEST (test_inproc);
-    RUN_TEST (test_inproc_late_bind);
-    return UNITY_END ();
-}
diff --git a/tests/test_hwm.cpp b/tests/test_hwm.cpp
deleted file mode 100644
index e07d1888e..000000000
--- a/tests/test_hwm.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const int MAX_SENDS = 10000;
-
-enum TestType
-{
-    BIND_FIRST,
-    CONNECT_FIRST
-};
-
-void test_defaults ()
-{
-    // Set up bind socket
-    void *bind_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-
-    // Set up connect socket
-    void *connect_socket = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-    // Send until we block
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    msleep (SETTLE_TIME);
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (zmq_recv (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++recv_count;
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    // Clean up
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-
-    // Default values are 1000 on send and 1000 one receive, so 2000 total
-    TEST_ASSERT_EQUAL_INT (2000, send_count);
-}
-
-int count_msg (int send_hwm_, int recv_hwm_, TestType test_type_)
-{
-    void *bind_socket;
-    void *connect_socket;
-    if (test_type_ == BIND_FIRST) {
-        // Set up bind socket
-        bind_socket = test_context_socket (ZMQ_PULL);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          bind_socket, ZMQ_RCVHWM, &recv_hwm_, sizeof (recv_hwm_)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-
-        // Set up connect socket
-        connect_socket = test_context_socket (ZMQ_PUSH);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          connect_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-        //  we must wait for the connect to succeed here, unfortunately we don't
-        //  have monitoring events for inproc, so we just hope SETTLE_TIME suffices
-        msleep (SETTLE_TIME);
-    } else {
-        // Set up connect socket
-        connect_socket = test_context_socket (ZMQ_PUSH);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          connect_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-        // Set up bind socket
-        bind_socket = test_context_socket (ZMQ_PULL);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          bind_socket, ZMQ_RCVHWM, &recv_hwm_, sizeof (recv_hwm_)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-    }
-
-    // Send until we block
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (zmq_recv (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++recv_count;
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    // Now it should be possible to send one more.
-    send_string_expect_success (connect_socket, NULL, 0);
-
-    //  Consume the remaining message.
-    recv_string_expect_success (bind_socket, NULL, 0);
-
-    // Clean up
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-
-    return send_count;
-}
-
-int test_inproc_bind_first (int send_hwm_, int recv_hwm_)
-{
-    return count_msg (send_hwm_, recv_hwm_, BIND_FIRST);
-}
-
-int test_inproc_connect_first (int send_hwm_, int recv_hwm_)
-{
-    return count_msg (send_hwm_, recv_hwm_, CONNECT_FIRST);
-}
-
-int test_inproc_connect_and_close_first (int send_hwm_, int recv_hwm_)
-{
-    // Set up connect socket
-    void *connect_socket = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (connect_socket, ZMQ_SNDHWM,
-                                               &send_hwm_, sizeof (send_hwm_)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-    // Send until we block
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    // Close connect
-    test_context_socket_close (connect_socket);
-
-    // Set up bind socket
-    void *bind_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_RCVHWM, &recv_hwm_, sizeof (recv_hwm_)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (zmq_recv (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++recv_count;
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    // Clean up
-    test_context_socket_close (bind_socket);
-
-    return send_count;
-}
-
-int test_inproc_bind_and_close_first (int send_hwm_, int /* recv_hwm */)
-{
-    // Set up bind socket
-    void *bind_socket = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-
-    // Send until we block
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    // Close bind
-    test_context_socket_close (bind_socket);
-
-    /* TODO Can't currently do connect without then wiring up a bind as things hang, this needs top be fixed.
-    // Set up connect socket
-    void *connect_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &recv_hwm, sizeof (recv_hwm)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (zmq_recv (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++recv_count;
-
-    TEST_ASSERT_EQUAL_INT(send_count, recv_count);
-    */
-
-    // Clean up
-    //test_context_socket_close (connect_socket);
-
-    return send_count;
-}
-
-void test_infinite_both_inproc_bind_first ()
-{
-    int count = test_inproc_bind_first (0, 0);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_both_inproc_connect_first ()
-{
-    int count = test_inproc_connect_first (0, 0);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_receive_inproc_bind_first ()
-{
-    int count = test_inproc_bind_first (1, 0);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_receive_inproc_connect_first ()
-{
-    int count = test_inproc_connect_first (1, 0);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_send_inproc_bind_first ()
-{
-    int count = test_inproc_bind_first (0, 1);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_send_inproc_connect_first ()
-{
-    int count = test_inproc_connect_first (0, 1);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_finite_both_bind_first ()
-{
-    // Send and recv buffers hwm 1, so total that can be queued is 2
-    int count = test_inproc_bind_first (1, 1);
-    TEST_ASSERT_EQUAL_INT (2, count);
-}
-void test_finite_both_connect_first ()
-{
-    // Send and recv buffers hwm 1, so total that can be queued is 2
-    int count = test_inproc_connect_first (1, 1);
-    TEST_ASSERT_EQUAL_INT (2, count);
-}
-
-void test_infinite_recv_connect_and_close_first ()
-{
-    // Send hwm of 1, send before bind so total that can be queued is 1
-    int count = test_inproc_connect_and_close_first (1, 0);
-    TEST_ASSERT_EQUAL_INT (1, count);
-}
-
-void test_infinite_recv_bind_and_close_first ()
-{
-    // Send hwm of 1, send from bind side before connect so total that can be queued should be 1,
-    // however currently all messages get thrown away before the connect.  BUG?
-    /*int count = */ test_inproc_bind_and_close_first (1, 0);
-    // TEST_ASSERT_EQUAL_INT (1, count);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_defaults);
-
-    RUN_TEST (test_infinite_both_inproc_bind_first);
-    RUN_TEST (test_infinite_both_inproc_connect_first);
-
-    RUN_TEST (test_infinite_receive_inproc_bind_first);
-    RUN_TEST (test_infinite_receive_inproc_connect_first);
-
-    RUN_TEST (test_infinite_send_inproc_bind_first);
-    RUN_TEST (test_infinite_send_inproc_connect_first);
-
-    RUN_TEST (test_finite_both_bind_first);
-    RUN_TEST (test_finite_both_connect_first);
-
-    RUN_TEST (test_infinite_recv_connect_and_close_first);
-    RUN_TEST (test_infinite_recv_bind_and_close_first);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_hwm_pubsub.cpp b/tests/test_hwm_pubsub.cpp
deleted file mode 100644
index b85e6dc64..000000000
--- a/tests/test_hwm_pubsub.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-// NOTE: on OSX the endpoint returned by ZMQ_LAST_ENDPOINT may be quite long,
-//       ensure we have extra space for that:
-#define SOCKET_STRING_LEN (MAX_SOCKET_STRING * 4)
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-int test_defaults (int send_hwm_, int msg_cnt_, const char *endpoint_)
-{
-    char pub_endpoint[SOCKET_STRING_LEN];
-
-    // Set up and bind XPUB socket
-    void *pub_socket = test_context_socket (ZMQ_XPUB);
-    test_bind (pub_socket, endpoint_, pub_endpoint, sizeof pub_endpoint);
-
-    // Set up and connect SUB socket
-    void *sub_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_socket, pub_endpoint));
-
-    //set a hwm on publisher
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_SUBSCRIBE, 0, 0));
-
-    // Wait before starting TX operations till 1 subscriber has subscribed
-    // (in this test there's 1 subscriber only)
-    const char subscription_to_all_topics[] = {1, 0};
-    recv_string_expect_success (pub_socket, subscription_to_all_topics, 0);
-
-    // Send until we reach "mute" state
-    int send_count = 0;
-    while (send_count < msg_cnt_
-           && zmq_send (pub_socket, "test message", 13, ZMQ_DONTWAIT) == 13)
-        ++send_count;
-
-    TEST_ASSERT_EQUAL_INT (send_hwm_, send_count);
-    msleep (SETTLE_TIME);
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    char dummybuff[64];
-    while (13 == zmq_recv (sub_socket, &dummybuff, 64, ZMQ_DONTWAIT)) {
-        ++recv_count;
-    }
-
-    TEST_ASSERT_EQUAL_INT (send_hwm_, recv_count);
-
-    // Clean up
-    test_context_socket_close (sub_socket);
-    test_context_socket_close (pub_socket);
-
-    return recv_count;
-}
-
-int receive (void *socket_, int *is_termination_)
-{
-    int recv_count = 0;
-    *is_termination_ = 0;
-
-    // Now receive all sent messages
-    char buffer[255];
-    int len;
-    while ((len = zmq_recv (socket_, buffer, sizeof (buffer), 0)) >= 0) {
-        ++recv_count;
-
-        if (len == 3 && strncmp (buffer, "end", len) == 0) {
-            *is_termination_ = 1;
-            return recv_count;
-        }
-    }
-
-    return recv_count;
-}
-
-int test_blocking (int send_hwm_, int msg_cnt_, const char *endpoint_)
-{
-    char pub_endpoint[SOCKET_STRING_LEN];
-
-    // Set up bind socket
-    void *pub_socket = test_context_socket (ZMQ_XPUB);
-    test_bind (pub_socket, endpoint_, pub_endpoint, sizeof pub_endpoint);
-
-    // Set up connect socket
-    void *sub_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_socket, pub_endpoint));
-
-    //set a hwm on publisher
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-    int wait = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub_socket, ZMQ_XPUB_NODROP, &wait, sizeof (wait)));
-    int timeout_ms = 10;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      sub_socket, ZMQ_RCVTIMEO, &timeout_ms, sizeof (timeout_ms)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_SUBSCRIBE, 0, 0));
-
-    // Wait before starting TX operations till 1 subscriber has subscribed
-    // (in this test there's 1 subscriber only)
-    const uint8_t subscription_to_all_topics[] = {1};
-    recv_array_expect_success (pub_socket, subscription_to_all_topics, 0);
-
-    // Send until we block
-    int send_count = 0;
-    int recv_count = 0;
-    int blocked_count = 0;
-    int is_termination = 0;
-    while (send_count < msg_cnt_) {
-        const int rc = zmq_send (pub_socket, NULL, 0, ZMQ_DONTWAIT);
-        if (rc == 0) {
-            ++send_count;
-        } else if (-1 == rc) {
-            // if the PUB socket blocks due to HWM, errno should be EAGAIN:
-            blocked_count++;
-            TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-            recv_count += receive (sub_socket, &is_termination);
-        }
-    }
-
-    // if send_hwm_ < msg_cnt_, we should block at least once:
-    char counts_string[128];
-    snprintf (counts_string, sizeof counts_string - 1,
-              "sent = %i, received = %i", send_count, recv_count);
-    TEST_ASSERT_GREATER_THAN_INT_MESSAGE (0, blocked_count, counts_string);
-
-    // dequeue SUB socket again, to make sure XPUB has space to send the termination message
-    recv_count += receive (sub_socket, &is_termination);
-
-    // send termination message
-    send_string_expect_success (pub_socket, "end", 0);
-
-    // now block on the SUB side till we get the termination message
-    while (is_termination == 0)
-        recv_count += receive (sub_socket, &is_termination);
-
-    // remove termination message from the count:
-    recv_count--;
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    // Clean up
-    test_context_socket_close (sub_socket);
-    test_context_socket_close (pub_socket);
-
-    return recv_count;
-}
-
-// hwm should apply to the messages that have already been received
-// with hwm 11024: send 9999 msg, receive 9999, send 1100, receive 1100
-void test_reset_hwm ()
-{
-    const int first_count = 9999;
-    const int second_count = 1100;
-    int hwm = 11024;
-    char my_endpoint[SOCKET_STRING_LEN];
-
-    // Set up bind socket
-    void *pub_socket = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub_socket, ZMQ_SNDHWM, &hwm, sizeof (hwm)));
-    bind_loopback_ipv4 (pub_socket, my_endpoint, MAX_SOCKET_STRING);
-
-    // Set up connect socket
-    void *sub_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_RCVHWM, &hwm, sizeof (hwm)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_socket, my_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_SUBSCRIBE, 0, 0));
-
-    msleep (SETTLE_TIME);
-
-    // Send messages
-    int send_count = 0;
-    while (send_count < first_count
-           && zmq_send (pub_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-    TEST_ASSERT_EQUAL_INT (first_count, send_count);
-
-    msleep (SETTLE_TIME);
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (0 == zmq_recv (sub_socket, NULL, 0, ZMQ_DONTWAIT)) {
-        ++recv_count;
-    }
-    TEST_ASSERT_EQUAL_INT (first_count, recv_count);
-
-    msleep (SETTLE_TIME);
-
-    // Send messages
-    send_count = 0;
-    while (send_count < second_count
-           && zmq_send (pub_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-    TEST_ASSERT_EQUAL_INT (second_count, send_count);
-
-    msleep (SETTLE_TIME);
-
-    // Now receive all sent messages
-    recv_count = 0;
-    while (0 == zmq_recv (sub_socket, NULL, 0, ZMQ_DONTWAIT)) {
-        ++recv_count;
-    }
-    TEST_ASSERT_EQUAL_INT (second_count, recv_count);
-
-    // Clean up
-    test_context_socket_close (sub_socket);
-    test_context_socket_close (pub_socket);
-}
-
-void test_defaults_large (const char *bind_endpoint_)
-{
-    // send 1000 msg on hwm 1000, receive 1000
-    TEST_ASSERT_EQUAL_INT (1000, test_defaults (1000, 1000, bind_endpoint_));
-}
-
-void test_defaults_small (const char *bind_endpoint_)
-{
-    // send 1000 msg on hwm 100, receive 100
-    TEST_ASSERT_EQUAL_INT (100, test_defaults (100, 100, bind_endpoint_));
-}
-
-void test_blocking (const char *bind_endpoint_)
-{
-    // send 6000 msg on hwm 2000, drops above hwm, only receive hwm:
-    TEST_ASSERT_EQUAL_INT (6000, test_blocking (2000, 6000, bind_endpoint_));
-}
-
-#define DEFINE_REGULAR_TEST_CASES(name, bind_endpoint)                         \
-    void test_defaults_large_##name ()                                         \
-    {                                                                          \
-        test_defaults_large (bind_endpoint);                                   \
-    }                                                                          \
-                                                                               \
-    void test_defaults_small_##name ()                                         \
-    {                                                                          \
-        test_defaults_small (bind_endpoint);                                   \
-    }                                                                          \
-                                                                               \
-    void test_blocking_##name () { test_blocking (bind_endpoint); }
-
-#define RUN_REGULAR_TEST_CASES(name)                                           \
-    RUN_TEST (test_defaults_large_##name);                                     \
-    RUN_TEST (test_defaults_small_##name);                                     \
-    RUN_TEST (test_blocking_##name)
-
-DEFINE_REGULAR_TEST_CASES (tcp, "tcp://127.0.0.1:*")
-DEFINE_REGULAR_TEST_CASES (inproc, "inproc://a")
-
-#if !defined(ZMQ_HAVE_WINDOWS) && !defined(ZMQ_HAVE_GNU)
-DEFINE_REGULAR_TEST_CASES (ipc, "ipc://*")
-#endif
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_REGULAR_TEST_CASES (tcp);
-    RUN_REGULAR_TEST_CASES (inproc);
-
-#if !defined(ZMQ_HAVE_WINDOWS) && !defined(ZMQ_HAVE_GNU)
-    RUN_REGULAR_TEST_CASES (ipc);
-#endif
-    RUN_TEST (test_reset_hwm);
-    return UNITY_END ();
-}
diff --git a/tests/test_immediate.cpp b/tests/test_immediate.cpp
deleted file mode 100644
index bbb9927df..000000000
--- a/tests/test_immediate.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-    
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_immediate_1 ()
-{
-    int val;
-    int rc;
-    char buffer[16];
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    // TEST 1.
-    // First we're going to attempt to send messages to two
-    // pipes, one connected, the other not. We should see
-    // the PUSH load balancing to both pipes, and hence half
-    // of the messages getting queued, as connect() creates a
-    // pipe immediately.
-
-    void *to = test_context_socket (ZMQ_PULL);
-
-    // Bind the one valid receiver
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &val, sizeof (val)));
-    bind_loopback_ipv4 (to, my_endpoint, len);
-
-    // Create a socket pushing to two endpoints - only 1 message should arrive.
-    void *from = test_context_socket (ZMQ_PUSH);
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val)));
-    // This pipe will not connect (provided the ephemeral port is not 5556)
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tcp://localhost:5556"));
-    // This pipe will
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, my_endpoint));
-
-    msleep (SETTLE_TIME);
-
-    // We send 10 messages, 5 should just get stuck in the queue
-    // for the not-yet-connected pipe
-    for (int i = 0; i < 10; ++i) {
-        send_string_expect_success (from, "Hello", 0);
-    }
-
-    // We now consume from the connected pipe
-    // - we should see just 5
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    int seen = 0;
-    while (true) {
-        rc = zmq_recv (to, &buffer, sizeof (buffer), 0);
-        if (rc == -1)
-            break; //  Break when we didn't get a message
-        seen++;
-    }
-    TEST_ASSERT_EQUAL_INT (5, seen);
-
-    test_context_socket_close (from);
-    test_context_socket_close (to);
-}
-
-
-void test_immediate_2 ()
-{
-    // This time we will do the same thing, connect two pipes,
-    // one of which will succeed in connecting to a bound
-    // receiver, the other of which will fail. However, we will
-    // also set the delay attach on connect flag, which should
-    // cause the pipe attachment to be delayed until the connection
-    // succeeds.
-
-    // Bind the valid socket
-    void *to = test_context_socket (ZMQ_PULL);
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (to, my_endpoint, len);
-
-    int val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &val, sizeof (val)));
-
-    // Create a socket pushing to two endpoints - all messages should arrive.
-    void *from = test_context_socket (ZMQ_PUSH);
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val)));
-
-    // Set the key flag
-    val = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_IMMEDIATE, &val, sizeof (val)));
-
-    // Connect to the invalid socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tcp://localhost:5561"));
-    // Connect to the valid socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, my_endpoint));
-
-    // Send 10 messages, all should be routed to the connected pipe
-    for (int i = 0; i < 10; ++i) {
-        send_string_expect_success (from, "Hello", 0);
-    }
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    int seen = 0;
-    while (true) {
-        char buffer[16];
-        int rc = zmq_recv (to, &buffer, sizeof (buffer), 0);
-        if (rc == -1)
-            break; //  Break when we didn't get a message
-        seen++;
-    }
-    TEST_ASSERT_EQUAL_INT (10, seen);
-
-    test_context_socket_close (from);
-    test_context_socket_close (to);
-}
-
-void test_immediate_3 ()
-{
-    // This time we want to validate that the same blocking behaviour
-    // occurs with an existing connection that is broken. We will send
-    // messages to a connected pipe, disconnect and verify the messages
-    // block. Then we reconnect and verify messages flow again.
-    void *backend = test_context_socket (ZMQ_DEALER);
-    void *frontend = test_context_socket (ZMQ_DEALER);
-
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    //  Frontend connects to backend using IMMEDIATE
-    int on = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_IMMEDIATE, &on, sizeof (on)));
-
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (backend, my_endpoint, len);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (frontend, my_endpoint));
-
-    //  Ping backend to frontend so we know when the connection is up
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    // Send message from frontend to backend
-    send_string_expect_success (frontend, "Hello", ZMQ_DONTWAIT);
-
-    test_context_socket_close (backend);
-
-    //  Give time to process disconnect
-    msleep (SETTLE_TIME * 10);
-
-    // Send a message, should fail
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_send (frontend, "Hello", 5, ZMQ_DONTWAIT));
-
-    //  Recreate backend socket
-    backend = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, my_endpoint));
-
-    //  Ping backend to frontend so we know when the connection is up
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    // After the reconnect, should succeed
-    send_string_expect_success (frontend, "Hello", ZMQ_DONTWAIT);
-
-    test_context_socket_close (backend);
-    test_context_socket_close (frontend);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-    UNITY_BEGIN ();
-    RUN_TEST (test_immediate_1);
-    RUN_TEST (test_immediate_2);
-    RUN_TEST (test_immediate_3);
-    return UNITY_END ();
-}
diff --git a/tests/test_inproc_connect.cpp b/tests/test_inproc_connect.cpp
deleted file mode 100644
index de1923fb7..000000000
--- a/tests/test_inproc_connect.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void pusher (void * /*unused*/)
-{
-    // Connect first
-    // do not use test_context_socket here, as it is not thread-safe
-    void *connect_socket = zmq_socket (get_test_context (), ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://sink"));
-
-    // Queue up some data
-    send_string_expect_success (connect_socket, "foobar", 0);
-
-    // Cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (connect_socket));
-}
-
-static void simult_conn (void *endpt_)
-{
-    // Pull out arguments - endpoint string
-    const char *endpt = static_cast<const char *> (endpt_);
-
-    // Connect
-    // do not use test_context_socket here, as it is not thread-safe
-    void *connect_socket = zmq_socket (get_test_context (), ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, endpt));
-
-    // Cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (connect_socket));
-}
-
-static void simult_bind (void *endpt_)
-{
-    // Pull out arguments - context followed by endpoint string
-    const char *endpt = static_cast<const char *> (endpt_);
-
-    // Bind
-    // do not use test_context_socket here, as it is not thread-safe
-    void *bind_socket = zmq_socket (get_test_context (), ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, endpt));
-
-    // Cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (bind_socket));
-}
-
-void test_bind_before_connect ()
-{
-    // Bind first
-    void *bind_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://bbc"));
-
-    // Now connect
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://bbc"));
-
-    // Queue up some data
-    send_string_expect_success (connect_socket, "foobar", 0);
-
-    // Read pending message
-    recv_string_expect_success (bind_socket, "foobar", 0);
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-}
-
-void test_connect_before_bind ()
-{
-    // Connect first
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://cbb"));
-
-    // Queue up some data
-    send_string_expect_success (connect_socket, "foobar", 0);
-
-    // Now bind
-    void *bind_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://cbb"));
-
-    // Read pending message
-    recv_string_expect_success (bind_socket, "foobar", 0);
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-}
-
-void test_connect_before_bind_pub_sub ()
-{
-    // Connect first
-    void *connect_socket = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://cbbps"));
-
-    // Queue up some data, this will be dropped
-    send_string_expect_success (connect_socket, "before", 0);
-
-    // Now bind
-    void *bind_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://cbbps"));
-
-    // Wait for pub-sub connection to happen
-    msleep (SETTLE_TIME);
-
-    // Queue up some data, this not will be dropped
-    send_string_expect_success (connect_socket, "after", 0);
-
-    // Read pending message
-    recv_string_expect_success (bind_socket, "after", 0);
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-}
-
-void test_connect_before_bind_ctx_term ()
-{
-    for (int i = 0; i < 20; ++i) {
-        // Connect first
-        void *connect_socket = test_context_socket (ZMQ_ROUTER);
-
-        char ep[32];
-        sprintf (ep, "inproc://cbbrr%d", i);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, ep));
-
-        // Cleanup
-        test_context_socket_close (connect_socket);
-    }
-}
-
-void test_multiple_connects ()
-{
-    const unsigned int no_of_connects = 10;
-
-    void *connect_socket[no_of_connects];
-
-    // Connect first
-    for (unsigned int i = 0; i < no_of_connects; ++i) {
-        connect_socket[i] = test_context_socket (ZMQ_PUSH);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_connect (connect_socket[i], "inproc://multiple"));
-
-        // Queue up some data
-        send_string_expect_success (connect_socket[i], "foobar", 0);
-    }
-
-    // Now bind
-    void *bind_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://multiple"));
-
-    for (unsigned int i = 0; i < no_of_connects; ++i) {
-        recv_string_expect_success (bind_socket, "foobar", 0);
-    }
-
-    // Cleanup
-    for (unsigned int i = 0; i < no_of_connects; ++i) {
-        test_context_socket_close (connect_socket[i]);
-    }
-
-    test_context_socket_close (bind_socket);
-}
-
-void test_multiple_threads ()
-{
-    const unsigned int no_of_threads = 30;
-
-    void *threads[no_of_threads];
-
-    // Connect first
-    for (unsigned int i = 0; i < no_of_threads; ++i) {
-        threads[i] = zmq_threadstart (&pusher, NULL);
-    }
-
-    // Now bind
-    void *bind_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://sink"));
-
-    for (unsigned int i = 0; i < no_of_threads; ++i) {
-        // Read pending message
-        recv_string_expect_success (bind_socket, "foobar", 0);
-    }
-
-    // Cleanup
-    for (unsigned int i = 0; i < no_of_threads; ++i) {
-        zmq_threadclose (threads[i]);
-    }
-
-    test_context_socket_close (bind_socket);
-}
-
-void test_simultaneous_connect_bind_threads ()
-{
-    const unsigned int no_of_times = 50;
-    void *threads[no_of_times * 2];
-    void *thr_args[no_of_times];
-    char endpts[no_of_times][20];
-
-    // Set up thread arguments: context followed by endpoint string
-    for (unsigned int i = 0; i < no_of_times; ++i) {
-        thr_args[i] = (void *) endpts[i];
-        sprintf (endpts[i], "inproc://foo_%d", i);
-    }
-
-    // Spawn all threads as simultaneously as possible
-    for (unsigned int i = 0; i < no_of_times; ++i) {
-        threads[i * 2 + 0] = zmq_threadstart (&simult_conn, thr_args[i]);
-        threads[i * 2 + 1] = zmq_threadstart (&simult_bind, thr_args[i]);
-    }
-
-    // Close all threads
-    for (unsigned int i = 0; i < no_of_times; ++i) {
-        zmq_threadclose (threads[i * 2 + 0]);
-        zmq_threadclose (threads[i * 2 + 1]);
-    }
-}
-
-void test_routing_id ()
-{
-    //  Create the infrastructure
-    void *sc = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://routing_id"));
-
-    void *sb = test_context_socket (ZMQ_ROUTER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://routing_id"));
-
-    //  Send 2-part message.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (sc, "A", 1, ZMQ_SNDMORE)));
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (sc, "B", 1, 0)));
-
-    //  Routing id comes first.
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0));
-    TEST_ASSERT_EQUAL_INT (1, zmq_msg_more (&msg));
-
-    //  Then the first part of the message body.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0)));
-    TEST_ASSERT_EQUAL_INT (1, zmq_msg_more (&msg));
-
-    //  And finally, the second part of the message body.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0)));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_more (&msg));
-
-    //  Deallocate the infrastructure.
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_connect_only ()
-{
-    void *connect_socket = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-    test_context_socket_close (connect_socket);
-}
-
-
-void test_unbind ()
-{
-    // Bind and unbind socket 1
-    void *bind_socket1 = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket1, "inproc://unbind"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (bind_socket1, "inproc://unbind"));
-
-    // Bind socket 2
-    void *bind_socket2 = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket2, "inproc://unbind"));
-
-    // Now connect
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://unbind"));
-
-    // Queue up some data
-    send_string_expect_success (connect_socket, "foobar", 0);
-
-    // Read pending message
-    recv_string_expect_success (bind_socket2, "foobar", 0);
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket1);
-    test_context_socket_close (bind_socket2);
-}
-
-void test_shutdown_during_pend ()
-{
-    // Connect first
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://cbb"));
-
-    zmq_ctx_shutdown (get_test_context ());
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_before_connect);
-    RUN_TEST (test_connect_before_bind);
-    RUN_TEST (test_connect_before_bind_pub_sub);
-    RUN_TEST (test_connect_before_bind_ctx_term);
-    RUN_TEST (test_multiple_connects);
-    RUN_TEST (test_multiple_threads);
-    RUN_TEST (test_simultaneous_connect_bind_threads);
-    RUN_TEST (test_routing_id);
-    RUN_TEST (test_connect_only);
-    RUN_TEST (test_unbind);
-    RUN_TEST (test_shutdown_during_pend);
-    return UNITY_END ();
-}
diff --git a/tests/test_invalid_rep.cpp b/tests/test_invalid_rep.cpp
deleted file mode 100644
index ae9fb18b6..000000000
--- a/tests/test_invalid_rep.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_invalid_rep ()
-{
-    //  Create REQ/ROUTER wiring.
-    void *router_socket = test_context_socket (ZMQ_ROUTER);
-    void *req_socket = test_context_socket (ZMQ_REQ);
-
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router_socket, ZMQ_LINGER, &linger, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req_socket, ZMQ_LINGER, &linger, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router_socket, "inproc://hi"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req_socket, "inproc://hi"));
-
-    //  Initial request.
-    send_string_expect_success (req_socket, "r", 0);
-
-    //  Receive the request.
-    char addr[32];
-    int addr_size;
-    char bottom[1];
-    char body[1];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      addr_size = zmq_recv (router_socket, addr, sizeof (addr), 0));
-    TEST_ASSERT_EQUAL_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (
-                                router_socket, bottom, sizeof (bottom), 0)));
-    TEST_ASSERT_EQUAL_INT (1, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (
-                                router_socket, body, sizeof (body), 0)));
-
-    //  Send invalid reply.
-    TEST_ASSERT_EQUAL_INT (addr_size, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (
-                                        router_socket, addr, addr_size, 0)));
-
-    //  Send valid reply.
-    TEST_ASSERT_EQUAL_INT (
-      addr_size, TEST_ASSERT_SUCCESS_ERRNO (
-                   zmq_send (router_socket, addr, addr_size, ZMQ_SNDMORE)));
-    TEST_ASSERT_EQUAL_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (
-                                router_socket, bottom, 0, ZMQ_SNDMORE)));
-    send_string_expect_success (router_socket, "b", 0);
-
-    //  Check whether we've got the valid reply.
-    recv_string_expect_success (req_socket, "b", 0);
-
-    //  Tear down the wiring.
-    test_context_socket_close (router_socket);
-    test_context_socket_close (req_socket);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_invalid_rep);
-    return UNITY_END ();
-}
diff --git a/tests/test_iov.cpp b/tests/test_iov.cpp
deleted file mode 100644
index f9ccbafc0..000000000
--- a/tests/test_iov.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// XSI vector I/O
-#if defined ZMQ_HAVE_UIO
-#include <sys/uio.h>
-#else
-struct iovec
-{
-    void *iov_base;
-    size_t iov_len;
-};
-#endif
-
-static void do_check (void *sb_, void *sc_, size_t msg_size_)
-{
-    TEST_ASSERT_NOT_NULL (sb_);
-    TEST_ASSERT_NOT_NULL (sc_);
-    TEST_ASSERT_GREATER_THAN (0, msg_size_);
-
-    const char msg_val = '1';
-    const int num_messages = 10;
-    size_t send_count, recv_count;
-
-    send_count = recv_count = num_messages;
-
-    char *ref_msg = static_cast<char *> (malloc (msg_size_));
-    TEST_ASSERT_NOT_NULL (ref_msg);
-    memset (ref_msg, msg_val, msg_size_);
-
-    // zmq_sendiov(3) as a single multi-part send
-    struct iovec send_iov[num_messages];
-    char *buf = static_cast<char *> (malloc (msg_size_ * num_messages));
-
-    for (int i = 0; i < num_messages; i++) {
-        send_iov[i].iov_base = &buf[i * msg_size_];
-        send_iov[i].iov_len = msg_size_;
-        memcpy (send_iov[i].iov_base, ref_msg, msg_size_);
-
-        // TODO: this assertion only checks if memcpy behaves as expected... remove this or assert something else?
-        TEST_ASSERT_EQUAL_HEX8_ARRAY (ref_msg, send_iov[i].iov_base, msg_size_);
-    }
-
-    // Test errors - zmq_recviov - null socket
-    TEST_ASSERT_FAILURE_ERRNO (
-      ENOTSOCK, zmq_sendiov (NULL, send_iov, send_count, ZMQ_SNDMORE));
-    // Test errors - zmq_recviov - invalid send count
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_sendiov (sc_, send_iov, 0, 0));
-    // Test errors - zmq_recviov - null iovec
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_sendiov (sc_, NULL, send_count, 0));
-
-    // Test success
-
-    // The zmq_sendiov(3) API method does not follow the same semantics as
-    // zmq_recviov(3); the latter returns the count of messages sent, rightly
-    // so, whilst the former sends the number of bytes successfully sent from
-    // the last message, which does not hold much sense from a batch send
-    // perspective; hence the assert checks if the result is same as msg_size.
-    TEST_ASSERT_EQUAL_INT (
-      (int) msg_size_, TEST_ASSERT_SUCCESS_ERRNO (
-                         zmq_sendiov (sc_, send_iov, send_count, ZMQ_SNDMORE)));
-
-    // zmq_recviov(3) single-shot
-    struct iovec recv_iov[num_messages];
-
-    // Test errors - zmq_recviov - null socket
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK,
-                               zmq_recviov (NULL, recv_iov, &recv_count, 0));
-    // Test error - zmq_recviov - invalid receive count
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_recviov (sb_, recv_iov, NULL, 0));
-    size_t invalid_recv_count = 0;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_recviov (sb_, recv_iov, &invalid_recv_count, 0));
-    // Test error - zmq_recviov - null iovec
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_recviov (sb_, NULL, &recv_count, 0));
-
-    // Test success
-    TEST_ASSERT_EQUAL_INT (
-      num_messages,
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recviov (sb_, recv_iov, &recv_count, 0)));
-
-    for (int i = 0; i < num_messages; i++) {
-        TEST_ASSERT_NOT_NULL (recv_iov[i].iov_base);
-        TEST_ASSERT_EQUAL_STRING_LEN (ref_msg, recv_iov[i].iov_base, msg_size_);
-        free (recv_iov[i].iov_base);
-    }
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-    free (ref_msg);
-    free (buf);
-}
-
-void test_iov ()
-{
-    void *sb = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    msleep (SETTLE_TIME);
-
-    void *sc = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-
-    // message bigger than VSM max
-    do_check (sb, sc, 100);
-
-    // message smaller than VSM max
-    do_check (sb, sc, 10);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_iov);
-    return UNITY_END ();
-}
diff --git a/tests/test_ipc_wildcard.cpp b/tests/test_ipc_wildcard.cpp
deleted file mode 100644
index 2f0ae176c..000000000
--- a/tests/test_ipc_wildcard.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_ipc_wildcard ()
-{
-    void *sb = test_context_socket (ZMQ_PAIR);
-    char endpoint[200];
-    bind_loopback_ipc (sb, endpoint, sizeof endpoint);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_ipc_wildcard);
-    return UNITY_END ();
-}
diff --git a/tests/test_issue_566.cpp b/tests/test_issue_566.cpp
deleted file mode 100644
index 7a8859feb..000000000
--- a/tests/test_issue_566.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Issue 566 describes a problem in libzmq v4.0.0 where a dealer to router
-//  connection would fail randomly. The test works when the two sockets are
-//  on the same context, and failed when they were on separate contexts.
-//  Fixed by https://github.com/zeromq/libzmq/commit/be25cf.
-void test_issue_566 ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *ctx1 = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx1);
-
-    void *ctx2 = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx2);
-
-    void *router = zmq_socket (ctx1, ZMQ_ROUTER);
-    int on = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_ROUTER_MANDATORY, &on, sizeof (on)));
-    bind_loopback_ipv4 (router, my_endpoint, sizeof (my_endpoint));
-
-    //  Repeat often enough to be sure this works as it should
-    for (int cycle = 0; cycle < 100; cycle++) {
-        //  Create dealer with unique explicit routing id
-        //  We assume the router learns this out-of-band
-        void *dealer = zmq_socket (ctx2, ZMQ_DEALER);
-        //  Leave space for NULL char from sprintf, gcc warning
-        char routing_id[11];
-        sprintf (routing_id, "%09d", cycle);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (dealer, ZMQ_ROUTING_ID, routing_id, 10));
-        int rcvtimeo = 1000;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (dealer, ZMQ_RCVTIMEO, &rcvtimeo, sizeof (int)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-        //  Router will try to send to dealer, at short intervals.
-        //  It typically takes 2-5 msec for the connection to establish
-        //  on a loopback interface, but we'll allow up to one second
-        //  before failing the test (e.g. for running on a debugger or
-        //  a very slow system).
-        for (int attempt = 0; attempt < 500; attempt++) {
-            zmq_poll (NULL, 0, 2);
-            int rc = zmq_send (router, routing_id, 10, ZMQ_SNDMORE);
-            if (rc == -1 && errno == EHOSTUNREACH)
-                continue;
-            TEST_ASSERT_EQUAL (10, rc);
-            send_string_expect_success (router, "HELLO", 0);
-            break;
-        }
-        recv_string_expect_success (dealer, "HELLO", 0);
-        close_zero_linger (dealer);
-    }
-    zmq_close (router);
-    zmq_ctx_destroy (ctx1);
-    zmq_ctx_destroy (ctx2);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_issue_566);
-    return UNITY_END ();
-}
diff --git a/tests/test_last_endpoint.cpp b/tests/test_last_endpoint.cpp
deleted file mode 100644
index 663b8d712..000000000
--- a/tests/test_last_endpoint.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void do_bind_and_verify (void *s_, const char *endpoint_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (s_, endpoint_));
-    char reported[255];
-    size_t size = 255;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (s_, ZMQ_LAST_ENDPOINT, reported, &size));
-    TEST_ASSERT_EQUAL_STRING (endpoint_, reported);
-}
-
-void test_last_endpoint ()
-{
-    void *sb = test_context_socket (ZMQ_ROUTER);
-    int val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_LINGER, &val, sizeof (val)));
-
-    do_bind_and_verify (sb, ENDPOINT_1);
-    do_bind_and_verify (sb, ENDPOINT_2);
-
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_last_endpoint);
-    return UNITY_END ();
-}
diff --git a/tests/test_many_sockets.cpp b/tests/test_many_sockets.cpp
deleted file mode 100644
index 9444a3808..000000000
--- a/tests/test_many_sockets.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <vector>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_system_max ()
-{
-    // Keep allocating sockets until we run out of system resources
-    const int no_of_sockets = 2 * 65536;
-    zmq_ctx_set (get_test_context (), ZMQ_MAX_SOCKETS, no_of_sockets);
-    std::vector<void *> sockets;
-
-    while (true) {
-        void *socket = zmq_socket (get_test_context (), ZMQ_PAIR);
-        if (!socket)
-            break;
-        sockets.push_back (socket);
-    }
-    TEST_ASSERT_LESS_OR_EQUAL (no_of_sockets,
-                               static_cast<int> (sockets.size ()));
-    printf ("Socket creation failed after %i sockets\n",
-            static_cast<int> (sockets.size ()));
-
-    //  System is out of resources, further calls to zmq_socket should return NULL
-    for (unsigned int i = 0; i < 10; ++i) {
-        TEST_ASSERT_NULL (zmq_socket (get_test_context (), ZMQ_PAIR));
-    }
-    // Clean up.
-    for (unsigned int i = 0; i < sockets.size (); ++i)
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_close (sockets[i]));
-}
-
-void test_zmq_default_max ()
-{
-    //  Keep allocating sockets until we hit the default limit
-    std::vector<void *> sockets;
-
-    while (true) {
-        void *socket = zmq_socket (get_test_context (), ZMQ_PAIR);
-        if (!socket)
-            break;
-        sockets.push_back (socket);
-    }
-    //  We may stop sooner if system has fewer available sockets
-    TEST_ASSERT_LESS_OR_EQUAL (ZMQ_MAX_SOCKETS_DFLT, sockets.size ());
-
-    //  Further calls to zmq_socket should return NULL
-    for (unsigned int i = 0; i < 10; ++i) {
-        TEST_ASSERT_NULL (zmq_socket (get_test_context (), ZMQ_PAIR));
-    }
-
-    //  Clean up
-    for (unsigned int i = 0; i < sockets.size (); ++i)
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_close (sockets[i]));
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_system_max);
-    RUN_TEST (test_zmq_default_max);
-    return UNITY_END ();
-}
diff --git a/tests/test_metadata.cpp b/tests/test_metadata.cpp
deleted file mode 100644
index 3ae3643e1..000000000
--- a/tests/test_metadata.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <unity.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-static void zap_handler (void *handler_)
-{
-    uint8_t metadata[] = {5, 'H', 'e', 'l', 'l', 'o', 0,  0,
-                          0, 5,   'W', 'o', 'r', 'l', 'd'};
-
-    //  Process ZAP requests forever
-    while (true) {
-        char *version = s_recv (handler_);
-        if (!version)
-            break; //  Terminating
-
-        char *sequence = s_recv (handler_);
-        char *domain = s_recv (handler_);
-        char *address = s_recv (handler_);
-        char *routing_id = s_recv (handler_);
-        char *mechanism = s_recv (handler_);
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING ("NULL", mechanism);
-
-        send_string_expect_success (handler_, version, ZMQ_SNDMORE);
-        send_string_expect_success (handler_, sequence, ZMQ_SNDMORE);
-        if (streq (domain, "DOMAIN")) {
-            send_string_expect_success (handler_, "200", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "anonymous", ZMQ_SNDMORE);
-            zmq_send (handler_, metadata, sizeof (metadata), 0);
-        } else {
-            send_string_expect_success (handler_, "400", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "BAD DOMAIN", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-    }
-    close_zero_linger (handler_);
-}
-
-void test_metadata ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    setup_test_context ();
-
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (handler);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-    void *zap_thread = zmq_threadstart (&zap_handler, handler);
-
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "DOMAIN", 6));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    send_string_expect_success (client, "This is a message", 0);
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, server, 0));
-    TEST_ASSERT_EQUAL_STRING ("World", zmq_msg_gets (&msg, "Hello"));
-    TEST_ASSERT_EQUAL_STRING ("DEALER", zmq_msg_gets (&msg, "Socket-Type"));
-    TEST_ASSERT_EQUAL_STRING ("anonymous", zmq_msg_gets (&msg, "User-Id"));
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", zmq_msg_gets (&msg, "Peer-Address"));
-
-    TEST_ASSERT_NULL (zmq_msg_gets (&msg, "No Such"));
-    TEST_ASSERT_EQUAL_INT (EINVAL, zmq_errno ());
-    zmq_msg_close (&msg);
-
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-
-    //  Shutdown
-    teardown_test_context ();
-
-    //  Wait until ZAP handler terminates
-    zmq_threadclose (zap_thread);
-}
-
-int main ()
-{
-    setup_test_environment ();
-    UNITY_BEGIN ();
-    RUN_TEST (test_metadata);
-    return UNITY_END ();
-}
diff --git a/tests/test_mock_pub_sub.cpp b/tests/test_mock_pub_sub.cpp
deleted file mode 100644
index 757c1e17c..000000000
--- a/tests/test_mock_pub_sub.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    0MQ is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-
-static int get_monitor_event (void *monitor_)
-{
-    for (int i = 0; i < 2; i++) {
-        //  First frame in message contains event number and value
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        if (zmq_msg_recv (&msg, monitor_, ZMQ_DONTWAIT) == -1) {
-            msleep (SETTLE_TIME);
-            continue; //  Interrupted, presumably
-        }
-        TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-
-        uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg));
-        uint16_t event = *reinterpret_cast<uint16_t *> (data);
-
-        //  Second frame in message contains event address
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        if (zmq_msg_recv (&msg, monitor_, 0) == -1) {
-            return -1; //  Interrupted, presumably
-        }
-        TEST_ASSERT_FALSE (zmq_msg_more (&msg));
-
-        return event;
-    }
-    return -1;
-}
-
-static void recv_with_retry (fd_t fd_, char *buffer_, int bytes_)
-{
-    int received = 0;
-    while (true) {
-        int rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-          recv (fd_, buffer_ + received, bytes_ - received, 0));
-        TEST_ASSERT_GREATER_THAN_INT (0, rc);
-        received += rc;
-        TEST_ASSERT_LESS_OR_EQUAL_INT (bytes_, received);
-        if (received == bytes_)
-            break;
-    }
-}
-
-static void mock_handshake (fd_t fd_, bool sub_command, bool mock_pub)
-{
-    char buffer[128];
-    memset (buffer, 0, sizeof (buffer));
-    memcpy (buffer, zmtp_greeting_null, sizeof (zmtp_greeting_null));
-
-    //  Mock ZMTP 3.1 which uses commands
-    if (sub_command) {
-        buffer[11] = 1;
-    }
-    int rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (fd_, buffer, 64, 0));
-    TEST_ASSERT_EQUAL_INT (64, rc);
-
-    recv_with_retry (fd_, buffer, 64);
-
-    if (!mock_pub) {
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (
-          fd_, (const char *) zmtp_ready_sub, sizeof (zmtp_ready_sub), 0));
-        TEST_ASSERT_EQUAL_INT (sizeof (zmtp_ready_sub), rc);
-    } else {
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (
-          fd_, (const char *) zmtp_ready_xpub, sizeof (zmtp_ready_xpub), 0));
-        TEST_ASSERT_EQUAL_INT (sizeof (zmtp_ready_xpub), rc);
-    }
-
-    //  greeting - XPUB has one extra byte
-    memset (buffer, 0, sizeof (buffer));
-    recv_with_retry (fd_, buffer,
-                     mock_pub ? sizeof (zmtp_ready_sub)
-                              : sizeof (zmtp_ready_xpub));
-}
-
-static void prep_server_socket (void **server_out_,
-                                void **mon_out_,
-                                char *endpoint_,
-                                size_t ep_length_,
-                                int socket_type)
-{
-    //  We'll be using this socket in raw mode
-    void *server = test_context_socket (socket_type);
-
-    int value = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_LINGER, &value, sizeof (value)));
-
-    bind_loopback_ipv4 (server, endpoint_, ep_length_);
-
-    //  Create and connect a socket for collecting monitor events on xpub
-    void *server_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      server, "inproc://monitor-dealer",
-      ZMQ_EVENT_CONNECTED | ZMQ_EVENT_DISCONNECTED | ZMQ_EVENT_ACCEPTED));
-
-    //  Connect to the inproc endpoint so we'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (server_mon, "inproc://monitor-dealer"));
-
-    *server_out_ = server;
-    *mon_out_ = server_mon;
-}
-
-static void test_mock_pub_sub (bool sub_command_, bool mock_pub_)
-{
-    int rc;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server, *server_mon;
-    prep_server_socket (&server, &server_mon, my_endpoint, MAX_SOCKET_STRING,
-                        mock_pub_ ? ZMQ_SUB : ZMQ_XPUB);
-
-    fd_t s = connect_socket (my_endpoint);
-
-    // Mock a ZMTP 3 client so we can forcibly try sub commands
-    mock_handshake (s, sub_command_, mock_pub_);
-
-    // By now everything should report as connected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, rc);
-
-    char buffer[32];
-    memset (buffer, 0, sizeof (buffer));
-
-    if (mock_pub_) {
-        rc = zmq_setsockopt (server, ZMQ_SUBSCRIBE, "A", 1);
-        TEST_ASSERT_EQUAL_INT (0, rc);
-        //  SUB binds, let its state machine run
-        //  Because zeromq attach the pipe after the handshake, we need more time here before we can run the state-machine
-        msleep (1);
-        zmq_recv (server, buffer, 16, ZMQ_DONTWAIT);
-
-        if (sub_command_) {
-            recv_with_retry (s, buffer, 13);
-            TEST_ASSERT_EQUAL_INT (0,
-                                   memcmp (buffer, "\4\xb\x9SUBSCRIBEA", 13));
-        } else {
-            recv_with_retry (s, buffer, 4);
-            TEST_ASSERT_EQUAL_INT (0, memcmp (buffer, "\0\2\1A", 4));
-        }
-
-        memcpy (buffer, "\0\4ALOL", 6);
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (s, buffer, 6, 0));
-        TEST_ASSERT_EQUAL_INT (6, rc);
-
-        memset (buffer, 0, sizeof (buffer));
-        rc = zmq_recv (server, buffer, 4, 0);
-        TEST_ASSERT_EQUAL_INT (4, rc);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (buffer, "ALOL", 4));
-    } else {
-        if (sub_command_) {
-            const uint8_t sub[13] = {4,   11,  9,   'S', 'U', 'B', 'S',
-                                     'C', 'R', 'I', 'B', 'E', 'A'};
-            rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-              send (s, (const char *) sub, 13, 0));
-            TEST_ASSERT_EQUAL_INT (13, rc);
-        } else {
-            const uint8_t sub[4] = {0, 2, 1, 'A'};
-            rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-              send (s, (const char *) sub, 4, 0));
-            TEST_ASSERT_EQUAL_INT (4, rc);
-        }
-        rc = zmq_recv (server, buffer, 2, 0);
-        TEST_ASSERT_EQUAL_INT (2, rc);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (buffer, "\1A", 2));
-
-        rc = zmq_send (server, "ALOL", 4, 0);
-        TEST_ASSERT_EQUAL_INT (4, rc);
-
-        memset (buffer, 0, sizeof (buffer));
-        recv_with_retry (s, buffer, 6);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (buffer, "\0\4ALOL", 6));
-    }
-
-    close (s);
-
-    test_context_socket_close (server);
-    test_context_socket_close (server_mon);
-}
-
-void test_mock_sub_command ()
-{
-    test_mock_pub_sub (true, false);
-}
-
-void test_mock_sub_legacy ()
-{
-    test_mock_pub_sub (false, false);
-}
-
-void test_mock_pub_command ()
-{
-    test_mock_pub_sub (true, true);
-}
-
-void test_mock_pub_legacy ()
-{
-    test_mock_pub_sub (false, true);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_mock_sub_command);
-    RUN_TEST (test_mock_sub_legacy);
-    RUN_TEST (test_mock_pub_command);
-    RUN_TEST (test_mock_pub_legacy);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_monitor.cpp b/tests/test_monitor.cpp
deleted file mode 100644
index b9309e6df..000000000
--- a/tests/test_monitor.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_monitoring.hpp"
-
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_monitor_invalid_protocol_fails ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-
-    //  Socket monitoring only works over inproc://
-    TEST_ASSERT_FAILURE_ERRNO (
-      EPROTONOSUPPORT, zmq_socket_monitor (client, "tcp://127.0.0.1:*", 0));
-
-#ifdef ZMQ_EVENT_PIPES_STATS
-    //  Stats command needs to be called on a valid socket with monitoring
-    //  enabled
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK, zmq_socket_monitor_pipes_stats (NULL));
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_socket_monitor_pipes_stats (client));
-#endif
-
-    test_context_socket_close_zero_linger (client);
-}
-
-void test_monitor_basic ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  We'll monitor these two sockets
-    void *client = test_context_socket (ZMQ_DEALER);
-    void *server = test_context_socket (ZMQ_DEALER);
-
-    //  Monitor all events on client and server sockets
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (client, "inproc://monitor-client", ZMQ_EVENT_ALL));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (server, "inproc://monitor-server", ZMQ_EVENT_ALL));
-
-    //  Create two sockets for collecting monitor events
-    void *client_mon = test_context_socket (ZMQ_PAIR);
-    void *server_mon = test_context_socket (ZMQ_PAIR);
-
-    //  Connect these to the inproc endpoints so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (client_mon, "inproc://monitor-client"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (server_mon, "inproc://monitor-server"));
-
-    //  Now do a basic ping test
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-
-    //  Close client and server
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-
-    //  Now collect and check events from both sockets
-    int event = get_monitor_event (client_mon, NULL, NULL);
-    if (event == ZMQ_EVENT_CONNECT_DELAYED)
-        event = get_monitor_event (client_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CONNECTED, event);
-    expect_monitor_event (client_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-    event = get_monitor_event (client_mon, NULL, NULL);
-    if (event == ZMQ_EVENT_DISCONNECTED) {
-        expect_monitor_event (client_mon, ZMQ_EVENT_CONNECT_RETRIED);
-        expect_monitor_event (client_mon, ZMQ_EVENT_MONITOR_STOPPED);
-    } else
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
-
-    //  This is the flow of server events
-    expect_monitor_event (server_mon, ZMQ_EVENT_LISTENING);
-    expect_monitor_event (server_mon, ZMQ_EVENT_ACCEPTED);
-    expect_monitor_event (server_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    //  Sometimes the server sees the client closing before it gets closed.
-    if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CLOSED, event);
-        event = get_monitor_event (server_mon, NULL, NULL);
-    }
-    if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
-    }
-    //  TODO: When not waiting until the monitor stopped, the I/O thread runs
-    //  into some deadlock. This must be fixed, but until it is fixed, we wait
-    //  here in order to have more reliable test execution.
-    while (event != ZMQ_EVENT_MONITOR_STOPPED) {
-        event = get_monitor_event (server_mon, NULL, NULL);
-    }
-
-    //  Close down the sockets
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (client_mon);
-    test_context_socket_close_zero_linger (server_mon);
-}
-
-#if (defined ZMQ_CURRENT_EVENT_VERSION && ZMQ_CURRENT_EVENT_VERSION >= 2)      \
-  || (defined ZMQ_CURRENT_EVENT_VERSION                                        \
-      && ZMQ_CURRENT_EVENT_VERSION_DRAFT >= 2)
-void test_monitor_versioned_invalid_socket_type ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-
-    //  Socket monitoring only works with ZMQ_PAIR, ZMQ_PUB and ZMQ_PUSH.
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_socket_monitor_versioned (
-                client, "inproc://invalid-socket-type", 0, 2, ZMQ_CLIENT));
-
-    test_context_socket_close_zero_linger (client);
-}
-
-void test_monitor_versioned_basic (bind_function_t bind_function_,
-                                   const char *expected_prefix_,
-                                   int type_)
-{
-    char server_endpoint[MAX_SOCKET_STRING];
-    char client_mon_endpoint[MAX_SOCKET_STRING];
-    char server_mon_endpoint[MAX_SOCKET_STRING];
-
-    //  Create a unique endpoint for each call so we don't have
-    //  to wait for the sockets to unbind.
-    snprintf (client_mon_endpoint, MAX_SOCKET_STRING, "inproc://client%s%d",
-              expected_prefix_, type_);
-    snprintf (server_mon_endpoint, MAX_SOCKET_STRING, "inproc://server%s%d",
-              expected_prefix_, type_);
-
-    //  We'll monitor these two sockets
-    void *client = test_context_socket (ZMQ_DEALER);
-    void *server = test_context_socket (ZMQ_DEALER);
-
-    //  Monitor all events on client and server sockets
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor_versioned (
-      client, client_mon_endpoint, ZMQ_EVENT_ALL_V2, 2, type_));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor_versioned (
-      server, server_mon_endpoint, ZMQ_EVENT_ALL_V2, 2, type_));
-
-    //  Choose the appropriate consumer socket type.
-    int mon_type = ZMQ_PAIR;
-    switch (type_) {
-        case ZMQ_PAIR:
-            mon_type = ZMQ_PAIR;
-            break;
-        case ZMQ_PUSH:
-            mon_type = ZMQ_PULL;
-            break;
-        case ZMQ_PUB:
-            mon_type = ZMQ_SUB;
-            break;
-    }
-
-    //  Create two sockets for collecting monitor events
-    void *client_mon = test_context_socket (mon_type);
-    void *server_mon = test_context_socket (mon_type);
-
-    //  Additionally subscribe to all events if a PUB socket is used.
-    if (type_ == ZMQ_PUB) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (client_mon, ZMQ_SUBSCRIBE, "", 0));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (server_mon, ZMQ_SUBSCRIBE, "", 0));
-    }
-
-    //  Connect these to the inproc endpoints so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client_mon, client_mon_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (server_mon, server_mon_endpoint));
-
-    //  Now do a basic ping test
-    bind_function_ (server, server_endpoint, sizeof server_endpoint);
-
-    int ipv6;
-    size_t ipv6_size = sizeof (ipv6);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (server, ZMQ_IPV6, &ipv6, &ipv6_size));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_IPV6, &ipv6, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, server_endpoint));
-    bounce (server, client);
-
-    //  Close client and server
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-
-    char *client_local_address = NULL;
-    char *client_remote_address = NULL;
-
-    //  Now collect and check events from both sockets
-    int64_t event = get_monitor_event_v2 (
-      client_mon, NULL, &client_local_address, &client_remote_address);
-    if (event == ZMQ_EVENT_CONNECT_DELAYED) {
-        free (client_local_address);
-        free (client_remote_address);
-        event = get_monitor_event_v2 (client_mon, NULL, &client_local_address,
-                                      &client_remote_address);
-    }
-    TEST_ASSERT_EQUAL (ZMQ_EVENT_CONNECTED, event);
-    TEST_ASSERT_EQUAL_STRING (server_endpoint, client_remote_address);
-    TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, client_local_address,
-                                  strlen (expected_prefix_));
-    TEST_ASSERT_NOT_EQUAL (
-      0, strcmp (client_local_address, client_remote_address));
-
-    expect_monitor_event_v2 (client_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED,
-                             client_local_address, client_remote_address);
-    event = get_monitor_event_v2 (client_mon, NULL, NULL, NULL);
-    if (event == ZMQ_EVENT_DISCONNECTED) {
-        expect_monitor_event_v2 (client_mon, ZMQ_EVENT_CONNECT_RETRIED,
-                                 client_local_address, client_remote_address);
-        expect_monitor_event_v2 (client_mon, ZMQ_EVENT_MONITOR_STOPPED, "", "");
-    } else
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
-
-    //  This is the flow of server events
-    expect_monitor_event_v2 (server_mon, ZMQ_EVENT_LISTENING,
-                             client_remote_address, "");
-    expect_monitor_event_v2 (server_mon, ZMQ_EVENT_ACCEPTED,
-                             client_remote_address, client_local_address);
-    expect_monitor_event_v2 (server_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED,
-                             client_remote_address, client_local_address);
-    event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
-    //  Sometimes the server sees the client closing before it gets closed.
-    if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CLOSED, event);
-        event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
-    }
-    if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
-    }
-    //  TODO: When not waiting until the monitor stopped, the I/O thread runs
-    //  into some deadlock. This must be fixed, but until it is fixed, we wait
-    //  here in order to have more reliable test execution.
-    while (event != ZMQ_EVENT_MONITOR_STOPPED) {
-        event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
-    }
-    free (client_local_address);
-    free (client_remote_address);
-
-    //  Close down the sockets
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (client_mon);
-    test_context_socket_close_zero_linger (server_mon);
-}
-
-void test_monitor_versioned_basic_tcp_ipv4 ()
-{
-    static const char prefix[] = "tcp://127.0.0.1:";
-    test_monitor_versioned_basic (bind_loopback_ipv4, prefix, ZMQ_PAIR);
-    test_monitor_versioned_basic (bind_loopback_ipv4, prefix, ZMQ_PUB);
-    test_monitor_versioned_basic (bind_loopback_ipv4, prefix, ZMQ_PUSH);
-}
-
-void test_monitor_versioned_basic_tcp_ipv6 ()
-{
-    static const char prefix[] = "tcp://[::1]:";
-    test_monitor_versioned_basic (bind_loopback_ipv6, prefix, ZMQ_PAIR);
-    test_monitor_versioned_basic (bind_loopback_ipv6, prefix, ZMQ_PUB);
-    test_monitor_versioned_basic (bind_loopback_ipv6, prefix, ZMQ_PUSH);
-}
-
-void test_monitor_versioned_basic_ipc ()
-{
-    static const char prefix[] = "ipc://";
-    test_monitor_versioned_basic (bind_loopback_ipc, prefix, ZMQ_PAIR);
-    test_monitor_versioned_basic (bind_loopback_ipc, prefix, ZMQ_PUB);
-    test_monitor_versioned_basic (bind_loopback_ipc, prefix, ZMQ_PUSH);
-}
-
-void test_monitor_versioned_basic_tipc ()
-{
-    static const char prefix[] = "tipc://";
-    test_monitor_versioned_basic (bind_loopback_tipc, prefix, ZMQ_PAIR);
-    test_monitor_versioned_basic (bind_loopback_tipc, prefix, ZMQ_PUB);
-    test_monitor_versioned_basic (bind_loopback_tipc, prefix, ZMQ_PUSH);
-}
-
-#ifdef ZMQ_EVENT_PIPES_STATS
-void test_monitor_versioned_stats (bind_function_t bind_function_,
-                                   const char *expected_prefix_)
-{
-    char server_endpoint[MAX_SOCKET_STRING];
-    const int pulls_count = 4;
-    void *pulls[pulls_count];
-
-    //  We'll monitor these two sockets
-    void *push = test_context_socket (ZMQ_PUSH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor_versioned (
-      push, "inproc://monitor-push", ZMQ_EVENT_PIPES_STATS, 2, ZMQ_PAIR));
-
-    //  Should fail if there are no pipes to monitor
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_socket_monitor_pipes_stats (push));
-
-    void *push_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (push_mon, "inproc://monitor-push"));
-
-    //  Set lower HWM - queues will be filled so we should see it in the stats
-    int send_hwm = 500;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (push, ZMQ_SNDHWM, &send_hwm, sizeof (send_hwm)));
-    //  Set very low TCP buffers so that messages cannot be stored in-flight
-    const int tcp_buffer_size = 4096;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      push, ZMQ_SNDBUF, &tcp_buffer_size, sizeof (tcp_buffer_size)));
-    bind_function_ (push, server_endpoint, sizeof (server_endpoint));
-
-    int ipv6;
-    size_t ipv6_size = sizeof (ipv6);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (push, ZMQ_IPV6, &ipv6, &ipv6_size));
-    for (int i = 0; i < pulls_count; ++i) {
-        pulls[i] = test_context_socket (ZMQ_PULL);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (pulls[i], ZMQ_IPV6, &ipv6, sizeof (int)));
-        int timeout_ms = 10;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          pulls[i], ZMQ_RCVTIMEO, &timeout_ms, sizeof (timeout_ms)));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (pulls[i], ZMQ_RCVHWM, &send_hwm, sizeof (send_hwm)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          pulls[i], ZMQ_RCVBUF, &tcp_buffer_size, sizeof (tcp_buffer_size)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pulls[i], server_endpoint));
-    }
-
-    //  Send until we block
-    int send_count = 0;
-    //  Saturate the TCP buffers too
-    char data[tcp_buffer_size * 2];
-    memset (data, 0, sizeof (data));
-    //  Saturate all pipes - send + receive - on all connections
-    while (send_count < send_hwm * 2 * pulls_count) {
-        TEST_ASSERT_EQUAL_INT (sizeof (data),
-                               zmq_send (push, data, sizeof (data), 0));
-        ++send_count;
-    }
-
-    //  Drain one of the pulls - doesn't matter how many messages, at least one
-    send_count = send_count / 4;
-    do {
-        zmq_recv (pulls[0], data, sizeof (data), 0);
-        --send_count;
-    } while (send_count > 0);
-
-    //  To kick the application thread, do a dummy getsockopt - users here
-    //  should use the monitor and the other sockets in a poll.
-    unsigned long int dummy;
-    size_t dummy_size = sizeof (dummy);
-    msleep (SETTLE_TIME);
-    //  Note that the pipe stats on the sender will not get updated until the
-    //  receiver has processed at least lwm ((hwm + 1) / 2) messages AND until
-    //  the application thread has ran through the mailbox, as the update is
-    //  delivered via a message (send_activate_write)
-    zmq_getsockopt (push, ZMQ_EVENTS, &dummy, &dummy_size);
-
-    //  Ask for stats and check that they match
-    zmq_socket_monitor_pipes_stats (push);
-
-    msleep (SETTLE_TIME);
-    zmq_getsockopt (push, ZMQ_EVENTS, &dummy, &dummy_size);
-
-    for (int i = 0; i < pulls_count; ++i) {
-        char *push_local_address = NULL;
-        char *push_remote_address = NULL;
-        uint64_t queue_stat[2];
-        int64_t event = get_monitor_event_v2 (
-          push_mon, queue_stat, &push_local_address, &push_remote_address);
-        TEST_ASSERT_EQUAL_STRING (server_endpoint, push_local_address);
-        TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, push_remote_address,
-                                      strlen (expected_prefix_));
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_PIPES_STATS, event);
-        TEST_ASSERT_EQUAL_INT (i == 0 ? 0 : send_hwm, queue_stat[0]);
-        TEST_ASSERT_EQUAL_INT (0, queue_stat[1]);
-        free (push_local_address);
-        free (push_remote_address);
-    }
-
-    //  Close client and server
-    test_context_socket_close_zero_linger (push_mon);
-    test_context_socket_close_zero_linger (push);
-    for (int i = 0; i < pulls_count; ++i)
-        test_context_socket_close_zero_linger (pulls[i]);
-}
-
-void test_monitor_versioned_stats_tcp_ipv4 ()
-{
-    static const char prefix[] = "tcp://127.0.0.1:";
-    test_monitor_versioned_stats (bind_loopback_ipv4, prefix);
-}
-
-void test_monitor_versioned_stats_tcp_ipv6 ()
-{
-    static const char prefix[] = "tcp://[::1]:";
-    test_monitor_versioned_stats (bind_loopback_ipv6, prefix);
-}
-
-void test_monitor_versioned_stats_ipc ()
-{
-    static const char prefix[] = "ipc://";
-    test_monitor_versioned_stats (bind_loopback_ipc, prefix);
-}
-#endif // ZMQ_EVENT_PIPES_STATS
-#endif
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_monitor_invalid_protocol_fails);
-    RUN_TEST (test_monitor_basic);
-
-#if (defined ZMQ_CURRENT_EVENT_VERSION && ZMQ_CURRENT_EVENT_VERSION >= 2)      \
-  || (defined ZMQ_CURRENT_EVENT_VERSION                                        \
-      && ZMQ_CURRENT_EVENT_VERSION_DRAFT >= 2)
-    RUN_TEST (test_monitor_versioned_invalid_socket_type);
-    RUN_TEST (test_monitor_versioned_basic_tcp_ipv4);
-    RUN_TEST (test_monitor_versioned_basic_tcp_ipv6);
-    RUN_TEST (test_monitor_versioned_basic_ipc);
-    RUN_TEST (test_monitor_versioned_basic_tipc);
-#ifdef ZMQ_EVENT_PIPES_STATS
-    RUN_TEST (test_monitor_versioned_stats_tcp_ipv4);
-    RUN_TEST (test_monitor_versioned_stats_tcp_ipv6);
-    RUN_TEST (test_monitor_versioned_stats_ipc);
-#endif
-#endif
-
-    return UNITY_END ();
-}
diff --git a/tests/test_msg_ffn.cpp b/tests/test_msg_ffn.cpp
deleted file mode 100644
index 5f40f288e..000000000
--- a/tests/test_msg_ffn.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void ffn (void *data_, void *hint_)
-{
-    // Signal that ffn has been called by writing "freed" to hint
-    (void) data_; //  Suppress 'unused' warnings at compile time
-    memcpy (hint_, (void *) "freed", 5);
-}
-
-void test_msg_init_ffn ()
-{
-    //  Create the infrastructure
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *router = test_context_socket (ZMQ_ROUTER);
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    // Test that creating and closing a message triggers ffn
-    zmq_msg_t msg;
-    char hint[5];
-    char data[255];
-    memset (data, 0, 255);
-    memcpy (data, (void *) "data", 4);
-    memcpy (hint, (void *) "hint", 4);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg, (void *) data, 255, ffn, (void *) hint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    msleep (SETTLE_TIME);
-    TEST_ASSERT_EQUAL_STRING_LEN ("freed", hint, 5);
-    memcpy (hint, (void *) "hint", 4);
-
-    // Making and closing a copy triggers ffn
-    zmq_msg_t msg2;
-    zmq_msg_init (&msg2);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg, (void *) data, 255, ffn, (void *) hint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_copy (&msg2, &msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    msleep (SETTLE_TIME);
-    TEST_ASSERT_EQUAL_STRING_LEN ("freed", hint, 5);
-    memcpy (hint, (void *) "hint", 4);
-
-    // Test that sending a message triggers ffn
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg, (void *) data, 255, ffn, (void *) hint));
-
-    zmq_msg_send (&msg, dealer, 0);
-    char buf[255];
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (router, buf, 255, 0));
-    TEST_ASSERT_EQUAL_INT (255, zmq_recv (router, buf, 255, 0));
-    TEST_ASSERT_EQUAL_STRING_LEN (data, buf, 4);
-
-    msleep (SETTLE_TIME);
-    TEST_ASSERT_EQUAL_STRING_LEN ("freed", hint, 5);
-    memcpy (hint, (void *) "hint", 4);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    // Sending a copy of a message triggers ffn
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg, (void *) data, 255, ffn, (void *) hint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_copy (&msg2, &msg));
-
-    zmq_msg_send (&msg, dealer, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (router, buf, 255, 0));
-    TEST_ASSERT_EQUAL_INT (255, zmq_recv (router, buf, 255, 0));
-    TEST_ASSERT_EQUAL_STRING_LEN (data, buf, 4);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    msleep (SETTLE_TIME);
-    TEST_ASSERT_EQUAL_STRING_LEN ("freed", hint, 5);
-
-    //  Deallocate the infrastructure.
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_msg_init_ffn);
-    return UNITY_END ();
-}
diff --git a/tests/test_msg_flags.cpp b/tests/test_msg_flags.cpp
deleted file mode 100644
index 55cf348b8..000000000
--- a/tests/test_msg_flags.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_more ()
-{
-    //  Create the infrastructure
-    void *sb = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    void *sc = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-
-    //  Send 2-part message.
-    send_string_expect_success (sc, "A", ZMQ_SNDMORE);
-    send_string_expect_success (sc, "B", 0);
-
-    //  Routing id comes first.
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0));
-    TEST_ASSERT_EQUAL_INT (1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_more (&msg)));
-
-    //  Then the first part of the message body.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0)));
-    TEST_ASSERT_EQUAL_INT (1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_more (&msg)));
-
-    //  And finally, the second part of the message body.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0)));
-    TEST_ASSERT_EQUAL_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_more (&msg)));
-
-    //  Deallocate the infrastructure.
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_shared_refcounted ()
-{
-    // Test ZMQ_SHARED property (case 1, refcounted messages)
-    zmq_msg_t msg_a;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_size (&msg_a, 1024)); // large enough to be a type_lmsg
-
-    // Message is not shared
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_get (&msg_a, ZMQ_SHARED));
-
-    zmq_msg_t msg_b;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg_b));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_copy (&msg_b, &msg_a));
-
-    // Message is now shared
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_get (&msg_b, ZMQ_SHARED)));
-
-    // cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg_a));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg_b));
-}
-
-void test_shared_const ()
-{
-    zmq_msg_t msg_a;
-    // Test ZMQ_SHARED property (case 2, constant data messages)
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg_a, (void *) "TEST", 5, 0, 0));
-
-    // Message reports as shared
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_get (&msg_a, ZMQ_SHARED)));
-
-    // cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg_a));
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_more);
-    RUN_TEST (test_shared_refcounted);
-    RUN_TEST (test_shared_const);
-    return UNITY_END ();
-}
diff --git a/tests/test_msg_init.cpp b/tests/test_msg_init.cpp
deleted file mode 100644
index 75e781027..000000000
--- a/tests/test_msg_init.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_msg_init ()
-{
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-}
-
-void test_msg_init_size ()
-{
-    const char *data = "foobar";
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 6));
-    TEST_ASSERT_EQUAL_INT (6, zmq_msg_size (&msg));
-    memcpy (zmq_msg_data (&msg), data, 6);
-    TEST_ASSERT_EQUAL_STRING_LEN (data, zmq_msg_data (&msg), 6);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    zmq_msg_t msg2;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg2, 0));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg2));
-}
-
-void test_msg_init_buffer ()
-{
-    const char *data = "foobar";
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_buffer (&msg, data, 6));
-    TEST_ASSERT_EQUAL_INT (6, zmq_msg_size (&msg));
-    TEST_ASSERT (data != zmq_msg_data (&msg));
-    TEST_ASSERT_EQUAL_STRING_LEN (data, zmq_msg_data (&msg), 6);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    zmq_msg_t msg2;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_buffer (&msg2, NULL, 0));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg2));
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_msg_init);
-    RUN_TEST (test_msg_init_size);
-    RUN_TEST (test_msg_init_buffer);
-    return UNITY_END ();
-}
diff --git a/tests/test_pair_inproc.cpp b/tests/test_pair_inproc.cpp
deleted file mode 100644
index efbd9301f..000000000
--- a/tests/test_pair_inproc.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void *sb;
-void *sc;
-
-void setUp ()
-{
-    setup_test_context ();
-
-    sb = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-}
-
-void tearDown ()
-{
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-
-    teardown_test_context ();
-}
-
-void test_roundtrip ()
-{
-    bounce (sb, sc);
-}
-
-// TODO it appears that this has nothing to do with pair or inproc, and belongs somewhere else
-void test_zmq_send_const ()
-{
-    TEST_ASSERT_EQUAL_INT (3, TEST_ASSERT_SUCCESS_ERRNO (
-                                zmq_send_const (sb, "foo", 3, ZMQ_SNDMORE)));
-    TEST_ASSERT_EQUAL_INT (
-      6, TEST_ASSERT_SUCCESS_ERRNO (zmq_send_const (sb, "foobar", 6, 0)));
-
-    recv_string_expect_success (sc, "foo", 0);
-    recv_string_expect_success (sc, "foobar", 0);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    RUN_TEST (test_zmq_send_const);
-    return UNITY_END ();
-}
diff --git a/tests/test_pair_ipc.cpp b/tests/test_pair_ipc.cpp
deleted file mode 100644
index 81cad180c..000000000
--- a/tests/test_pair_ipc.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    char my_endpoint[256];
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    bind_loopback_ipc (sb, my_endpoint, sizeof my_endpoint);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/tests/test_pair_tcp.cpp b/tests/test_pair_tcp.cpp
deleted file mode 100644
index 81b442dec..000000000
--- a/tests/test_pair_tcp.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-#if defined _WIN32
-#include "../src/windows.hpp"
-#endif
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-typedef void (*extra_func_t) (void *socket_);
-
-#ifdef ZMQ_BUILD_DRAFT
-void set_sockopt_fastpath (void *socket)
-{
-    int value = 1;
-    int rc =
-      zmq_setsockopt (socket, ZMQ_LOOPBACK_FASTPATH, &value, sizeof value);
-    assert (rc == 0);
-}
-#endif
-
-void test_pair_tcp (extra_func_t extra_func_ = NULL)
-{
-    void *sb = test_context_socket (ZMQ_PAIR);
-
-    if (extra_func_)
-        extra_func_ (sb);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (sb, my_endpoint, sizeof my_endpoint);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    if (extra_func_)
-        extra_func_ (sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_pair_tcp_regular ()
-{
-    test_pair_tcp ();
-}
-
-void test_pair_tcp_connect_by_name ()
-{
-    // all other tcp test cases bind to a loopback wildcard address, then
-    // retrieve the bound endpoint, which is numerical, and use that to
-    // connect. this test cases specifically uses "localhost" to connect
-    // to ensure that names are correctly resolved
-    void *sb = test_context_socket (ZMQ_PAIR);
-
-    char bound_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (sb, bound_endpoint, sizeof bound_endpoint);
-
-    // extract the bound port number
-    const char *pos = strrchr (bound_endpoint, ':');
-    TEST_ASSERT_NOT_NULL (pos);
-    const char connect_endpoint_prefix[] = "tcp://localhost";
-    char connect_endpoint[MAX_SOCKET_STRING];
-    strcpy (connect_endpoint, connect_endpoint_prefix);
-    strcat (connect_endpoint, pos);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-
-#ifdef ZMQ_BUILD_DRAFT
-void test_pair_tcp_fastpath ()
-{
-    test_pair_tcp (set_sockopt_fastpath);
-}
-#endif
-
-#ifdef _WIN32
-void test_io_completion_port ()
-{
-    void *const s = test_context_socket (ZMQ_PAIR);
-    SOCKET fd;
-    size_t fd_size = sizeof fd;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (s, ZMQ_FD, &fd, &fd_size));
-
-    ::WSAPROTOCOL_INFO pi;
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      ::WSADuplicateSocket (fd, ::GetCurrentProcessId (), &pi));
-    const SOCKET socket = ::WSASocket (pi.iAddressFamily /*AF_INET*/,
-                                       pi.iSocketType /*SOCK_STREAM*/,
-                                       pi.iProtocol /*IPPROTO_TCP*/, &pi, 0, 0);
-
-    const HANDLE iocp =
-      ::CreateIoCompletionPort (INVALID_HANDLE_VALUE, NULL, 0, 0);
-    TEST_ASSERT_NOT_EQUAL (NULL, iocp);
-    const HANDLE res =
-      ::CreateIoCompletionPort (reinterpret_cast<HANDLE> (socket), iocp, 0, 0);
-    TEST_ASSERT_NOT_EQUAL (NULL, res);
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (closesocket (socket));
-    TEST_ASSERT_TRUE (CloseHandle (iocp));
-
-    test_context_socket_close (s);
-}
-#endif
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_pair_tcp_regular);
-    RUN_TEST (test_pair_tcp_connect_by_name);
-#ifdef ZMQ_BUILD_DRAFT
-    RUN_TEST (test_pair_tcp_fastpath);
-#endif
-#ifdef _WIN32
-    RUN_TEST (test_io_completion_port);
-#endif
-
-    return UNITY_END ();
-}
diff --git a/tests/test_pair_tcp_cap_net_admin.cpp b/tests/test_pair_tcp_cap_net_admin.cpp
deleted file mode 100644
index 1cc664100..000000000
--- a/tests/test_pair_tcp_cap_net_admin.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-typedef void (*extra_func_t) (void *socket_);
-
-void set_sockopt_bind_to_device (void *socket)
-{
-    const char device[] = "lo";
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_BINDTODEVICE, &device, sizeof (device) - 1));
-}
-
-//  TODO this is duplicated from test_pair_tcp
-void test_pair_tcp (extra_func_t extra_func_ = NULL)
-{
-    void *sb = test_context_socket (ZMQ_PAIR);
-
-    if (extra_func_)
-        extra_func_ (sb);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (sb, my_endpoint, sizeof my_endpoint);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    if (extra_func_)
-        extra_func_ (sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_pair_tcp_bind_to_device ()
-{
-    test_pair_tcp (set_sockopt_bind_to_device);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_pair_tcp_bind_to_device);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_pair_tipc.cpp b/tests/test_pair_tipc.cpp
deleted file mode 100644
index 9040dda02..000000000
--- a/tests/test_pair_tipc.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdio.h>
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    void *sb = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tipc://{5560,0,0}"));
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "tipc://{5560,0}@0.0.0"));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/tests/test_pair_vmci.cpp b/tests/test_pair_vmci.cpp
deleted file mode 100644
index 721c1ba55..000000000
--- a/tests/test_pair_vmci.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string>
-#include <sstream>
-#include <vmci_sockets.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_pair_vmci ()
-{
-    std::stringstream s;
-    s << "vmci://" << VMCISock_GetLocalCID () << ":" << 5560;
-    std::string endpoint = s.str ();
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, endpoint.c_str ()));
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint.c_str ()));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_pair_vmci);
-    return UNITY_END ();
-}
diff --git a/tests/test_peer.cpp b/tests/test_peer.cpp
deleted file mode 100644
index 30127f580..000000000
--- a/tests/test_peer.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_peer ()
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *peer1 = test_context_socket (ZMQ_PEER);
-    bind_loopback (peer1, false, my_endpoint, len);
-
-    void *peer2 = test_context_socket (ZMQ_PEER);
-    uint32_t peer1_routing_id = zmq_connect_peer (peer2, my_endpoint);
-    TEST_ASSERT_NOT_EQUAL (0, peer1_routing_id);
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-        char *data = static_cast<char *> (zmq_msg_data (&msg));
-        data[0] = 1;
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_set_routing_id (&msg, peer1_routing_id));
-
-        int rc = zmq_msg_send (&msg, peer2, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-    }
-
-    uint32_t peer2_routing_id;
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-        int rc = TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, peer1, 0));
-        TEST_ASSERT_EQUAL_INT (1, rc);
-
-        peer2_routing_id = zmq_msg_routing_id (&msg);
-        TEST_ASSERT_NOT_EQUAL (0, peer2_routing_id);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    }
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-        char *data = static_cast<char *> (zmq_msg_data (&msg));
-        data[0] = 2;
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_set_routing_id (&msg, peer2_routing_id));
-
-        int rc = zmq_msg_send (&msg, peer1, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-    }
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-        int rc = zmq_msg_recv (&msg, peer2, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-
-        uint32_t routing_id = zmq_msg_routing_id (&msg);
-        TEST_ASSERT_EQUAL_UINT32 (peer1_routing_id, routing_id);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    }
-
-    test_context_socket_close (peer1);
-    test_context_socket_close (peer2);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_peer);
-    return UNITY_END ();
-}
diff --git a/tests/test_poller.cpp b/tests/test_poller.cpp
deleted file mode 100644
index 78a352b09..000000000
--- a/tests/test_poller.cpp
+++ /dev/null
@@ -1,778 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <limits.h>
-
-#ifndef _WIN32
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-fd_t get_fd (void *socket_)
-{
-    fd_t fd;
-    size_t fd_size = sizeof fd;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (socket_, ZMQ_FD, &fd, &fd_size));
-    return fd;
-}
-
-void test_null_poller_pointers_destroy_direct ()
-{
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_destroy (NULL));
-}
-
-void test_null_poller_pointers_destroy_indirect ()
-{
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_destroy (&null_poller));
-}
-
-void test_null_poller_pointers_size_direct ()
-{
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_size (NULL));
-}
-
-void test_null_poller_pointers_size_indirect ()
-{
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_size (&null_poller));
-}
-
-void test_null_poller_pointers_add_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_add (NULL, socket, NULL, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_add_indirect ()
-{
-    void *null_poller = NULL;
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_add (&null_poller, socket, NULL, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_modify_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_modify (NULL, socket, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_modify_indirect ()
-{
-    void *null_poller = NULL;
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_modify (&null_poller, socket, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_remove_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_remove (NULL, socket));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_remove_indirect ()
-{
-    void *null_poller = NULL;
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_remove (&null_poller, socket));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_add_fd_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_add_fd (NULL, fd, NULL, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_add_fd_indirect ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_add_fd (&null_poller, fd, NULL, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_modify_fd_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_modify_fd (NULL, fd, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_modify_fd_indirect ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_modify_fd (&null_poller, fd, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_remove_fd_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_remove_fd (NULL, fd));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_remove_fd_indirect ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_remove_fd (&null_poller, fd));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_wait_direct ()
-{
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_wait (NULL, &event, 0));
-}
-
-void test_null_poller_pointers_wait_indirect ()
-{
-    zmq_poller_event_t event;
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait (&null_poller, &event, 0));
-}
-
-void test_null_poller_pointers_wait_all_direct ()
-{
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait_all (NULL, &event, 1, 0));
-}
-
-void test_null_poller_pointers_wait_all_indirect ()
-{
-    zmq_poller_event_t event;
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_wait_all (&null_poller, &event, 1, 0));
-}
-
-void test_null_poller_pointer_poller_fd ()
-{
-    void *null_poller = NULL;
-    fd_t fd;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_fd (&null_poller, &fd));
-}
-
-void test_null_socket_pointers ()
-{
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK,
-                               zmq_poller_add (poller, NULL, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK,
-                               zmq_poller_modify (poller, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK, zmq_poller_remove (poller, NULL));
-
-    fd_t null_socket_fd = retired_fd;
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EBADF, zmq_poller_add_fd (poller, null_socket_fd, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EBADF, zmq_poller_modify_fd (poller, null_socket_fd, ZMQ_POLLIN));
-
-    TEST_ASSERT_FAILURE_ERRNO (EBADF,
-                               zmq_poller_remove_fd (poller, null_socket_fd));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-}
-
-typedef void (*extra_poller_socket_func_t) (void *poller_, void *socket_);
-
-void test_with_empty_poller (extra_poller_socket_func_t extra_func_)
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    extra_func_ (poller, socket);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    test_context_socket_close (socket);
-}
-
-typedef void (*extra_poller_func_t) (void *poller_);
-
-void test_with_valid_poller (extra_poller_func_t extra_func_)
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
-
-    extra_func_ (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    test_context_socket_close (socket);
-}
-
-void test_call_poller_fd_no_signaler ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
-
-    fd_t fd;
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_poller_fd (poller, &fd));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    test_context_socket_close (socket);
-}
-
-void test_call_poller_fd ()
-{
-    void *socket = test_context_socket (ZMQ_CLIENT);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
-
-    fd_t fd;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_fd (poller, &fd));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    test_context_socket_close (socket);
-}
-
-void call_poller_wait_null_event_fails (void *poller_)
-{
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_wait (poller_, NULL, 0));
-}
-
-void call_poller_wait_all_null_event_fails_event_count_nonzero (void *poller_)
-{
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait_all (poller_, NULL, 1, 0));
-}
-
-void call_poller_wait_all_null_event_fails_event_count_zero (void *poller_)
-{
-#if 0
-    //  TODO this causes an assertion, which is not consistent if the number
-    //  of events may be 0, the pointer should be allowed to by NULL in that
-    //  case too
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait_all (poller, NULL, 0, 0));
-#endif
-}
-
-#define TEST_CASE_FUNC_PARAM(name, func)                                       \
-    void test_##name () { func (name); }
-
-TEST_CASE_FUNC_PARAM (call_poller_wait_null_event_fails, test_with_valid_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_null_event_fails_event_count_nonzero,
-                      test_with_valid_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_null_event_fails_event_count_zero,
-                      test_with_valid_poller)
-
-void call_poller_size (void *poller_, void *socket_)
-{
-    int rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller_, socket_, NULL, ZMQ_POLLIN));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 1);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_modify (poller_, socket_, 0));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 1);
-
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add_fd (poller_, plain_socket, NULL, ZMQ_POLLOUT));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 2);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove (poller_, socket_));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 1);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove_fd (poller_, plain_socket));
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 0);
-}
-
-void call_poller_add_twice_fails (void *poller_, void *socket_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller_, socket_, NULL, ZMQ_POLLIN));
-
-    //  attempt to add the same socket twice
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_add (poller_, socket_, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove (poller_, socket_));
-}
-
-void call_poller_remove_unregistered_fails (void *poller_, void *socket_)
-{
-    //  attempt to remove socket that is not present
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_poller_remove (poller_, socket_));
-}
-
-void call_poller_modify_unregistered_fails (void *poller_, void *socket_)
-{
-    //  attempt to modify socket that is not present
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_modify (poller_, socket_, ZMQ_POLLIN));
-}
-
-void call_poller_add_no_events (void *poller_, void *socket_)
-{
-    //  add a socket with no events initially (may be activated later with
-    //  zmq_poller_modify)
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_add (poller_, socket_, NULL, 0));
-    //  TODO test that no events are signalled
-}
-
-void call_poller_modify_no_events (void *poller_, void *socket_)
-{
-    //  deactivates all events for a socket temporarily (may be activated again
-    //  later with zmq_poller_modify)
-    zmq_poller_add (poller_, socket_, NULL, ZMQ_POLLIN);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_modify (poller_, socket_, 0));
-    //  TODO test that no events are signalled
-}
-
-void call_poller_add_fd_twice_fails (void *poller_, void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add_fd (poller_, plain_socket, NULL, ZMQ_POLLIN));
-
-    //  attempt to add the same plain socket twice
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_add_fd (poller_, plain_socket, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove_fd (poller_, plain_socket));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-void call_poller_remove_fd_unregistered_fails (void *poller_,
-                                               void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-
-    //  attempt to remove plain socket that is not present
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_poller_remove_fd (poller_, plain_socket));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-void call_poller_modify_fd_unregistered_fails (void *poller_,
-                                               void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-
-    //  attempt to remove plain socket that is not present
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_modify_fd (poller_, plain_socket, ZMQ_POLLIN));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-void call_poller_add_invalid_events_fails (void *poller_, void *zeromq_socket_)
-{
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_add (poller_, zeromq_socket_, NULL, SHRT_MAX));
-}
-
-void call_poller_modify_invalid_events_fails (void *poller_,
-                                              void *zeromq_socket_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller_, zeromq_socket_, NULL, 0));
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_modify (poller_, zeromq_socket_, SHRT_MAX));
-}
-
-void call_poller_add_fd_invalid_events_fails (void *poller_,
-                                              void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_add_fd (poller_, plain_socket, NULL, SHRT_MAX));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-void call_poller_modify_fd_invalid_events_fails (void *poller_,
-                                                 void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add_fd (poller_, plain_socket, NULL, 0));
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_modify_fd (poller_, plain_socket, SHRT_MAX));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-TEST_CASE_FUNC_PARAM (call_poller_size, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_add_twice_fails, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_remove_unregistered_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_unregistered_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_add_no_events, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_no_events, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_add_fd_twice_fails, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_remove_fd_unregistered_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_fd_unregistered_fails,
-                      test_with_empty_poller)
-
-TEST_CASE_FUNC_PARAM (call_poller_add_invalid_events_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_invalid_events_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_add_fd_invalid_events_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_fd_invalid_events_fails,
-                      test_with_empty_poller)
-
-void call_poller_wait_empty_with_timeout_fails (void *poller_,
-                                                void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    // waiting on poller with no registered sockets should report error
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_poller_wait (poller_, &event, 0));
-}
-
-void call_poller_wait_empty_without_timeout_fails (void *poller_,
-                                                   void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    //  this would never be able to return since no socket was registered, and should yield an error
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_wait (poller_, &event, -1));
-}
-
-void call_poller_wait_all_empty_negative_count_fails (void *poller_,
-                                                      void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_poller_wait_all (poller_, &event, -1, 0));
-}
-
-void call_poller_wait_all_empty_without_timeout_fails (void *poller_,
-                                                       void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_poller_wait_all (poller_, &event, 0, 0));
-}
-
-void call_poller_wait_all_empty_with_timeout_fails (void *poller_,
-                                                    void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    //  this would never be able to return since no socket was registered, and should yield an error
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait_all (poller_, &event, 0, -1));
-}
-
-void call_poller_wait_all_inf_disabled_fails (void *poller_, void *socket_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_add (poller_, socket_, NULL, 0));
-
-    zmq_poller_event_t events[1];
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_poller_wait_all (poller_, events, 1, 0));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait_all (poller_, events, 1, -1));
-}
-
-TEST_CASE_FUNC_PARAM (call_poller_wait_empty_with_timeout_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_empty_without_timeout_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_empty_negative_count_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_empty_without_timeout_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_empty_with_timeout_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_inf_disabled_fails,
-                      test_with_empty_poller)
-
-void test_poll_basic ()
-{
-    //  Create few sockets
-    void *vent = test_context_socket (ZMQ_PUSH);
-
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (vent, my_endpoint, len);
-
-    void *sink = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sink, my_endpoint));
-
-    //  Set up poller
-    void *poller = zmq_poller_new ();
-
-    // register sink
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_add (poller, sink, sink, ZMQ_POLLIN));
-
-    //  Send a message
-    const char *vent_sink_msg = "H";
-    send_string_expect_success (vent, vent_sink_msg, 0);
-
-    //  We expect a message only on the sink
-    zmq_poller_event_t event;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait (poller, &event, -1));
-    TEST_ASSERT_EQUAL_PTR (sink, event.socket);
-    TEST_ASSERT_EQUAL_PTR (sink, event.user_data);
-    recv_string_expect_success (sink, vent_sink_msg, 0);
-
-    //  We expect timed out
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_poller_wait (poller, &event, 0));
-
-    //  Stop polling sink
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove (poller, sink));
-
-    //  Clean up
-    test_context_socket_close (vent);
-    test_context_socket_close (sink);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-}
-
-void test_poll_fd ()
-{
-    //  Create sockets
-    void *vent = test_context_socket (ZMQ_PUSH);
-
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (vent, my_endpoint, len);
-
-    void *bowl = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (bowl, my_endpoint));
-
-    //  Set up poller
-    void *poller = zmq_poller_new ();
-
-    //  Check we can poll an FD
-    const fd_t fd = get_fd (bowl);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add_fd (poller, fd, bowl, ZMQ_POLLIN));
-
-    zmq_poller_event_t event;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait (poller, &event, 500));
-    TEST_ASSERT_NULL (event.socket);
-    TEST_ASSERT_EQUAL (fd, event.fd);
-    TEST_ASSERT_EQUAL_PTR (bowl, event.user_data);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove_fd (poller, fd));
-
-    //  Clean up
-    test_context_socket_close (vent);
-    test_context_socket_close (bowl);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-}
-
-void test_poll_client_server ()
-{
-#if defined(ZMQ_SERVER) && defined(ZMQ_CLIENT)
-    //  Create sockets
-    void *server = test_context_socket (ZMQ_SERVER);
-
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, len);
-
-    void *client = test_context_socket (ZMQ_CLIENT);
-
-    //  Set up poller
-    void *poller = zmq_poller_new ();
-
-    //  Polling on thread safe sockets
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, server, NULL, ZMQ_POLLIN));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    const char *client_server_msg = "I";
-    send_string_expect_success (client, client_server_msg, 0);
-
-    zmq_poller_event_t event;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait (poller, &event, 500));
-    TEST_ASSERT_EQUAL_PTR (server, event.socket);
-    TEST_ASSERT_NULL (event.user_data);
-#ifndef _WIN32
-    TEST_ASSERT (event.fd == -1);
-#endif
-    recv_string_expect_success (server, client_server_msg, 0);
-
-    //  Polling on pollout
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_modify (poller, server, ZMQ_POLLOUT | ZMQ_POLLIN));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait (poller, &event, 0));
-    TEST_ASSERT_EQUAL_PTR (server, event.socket);
-    TEST_ASSERT_NULL (event.user_data);
-#ifndef _WIN32
-    TEST_ASSERT (event.fd == -1);
-#endif
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLOUT, event.events);
-
-    //  Stop polling server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove (poller, server));
-
-    //  Clean up
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-#endif
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_null_poller_pointers_destroy_direct);
-    RUN_TEST (test_null_poller_pointers_destroy_indirect);
-    RUN_TEST (test_null_poller_pointers_size_direct);
-    RUN_TEST (test_null_poller_pointers_size_indirect);
-    RUN_TEST (test_null_poller_pointers_add_direct);
-    RUN_TEST (test_null_poller_pointers_add_indirect);
-    RUN_TEST (test_null_poller_pointers_modify_direct);
-    RUN_TEST (test_null_poller_pointers_modify_indirect);
-    RUN_TEST (test_null_poller_pointers_remove_direct);
-    RUN_TEST (test_null_poller_pointers_remove_indirect);
-    RUN_TEST (test_null_poller_pointers_add_fd_direct);
-    RUN_TEST (test_null_poller_pointers_add_fd_indirect);
-    RUN_TEST (test_null_poller_pointers_modify_fd_direct);
-    RUN_TEST (test_null_poller_pointers_modify_fd_indirect);
-    RUN_TEST (test_null_poller_pointers_remove_fd_direct);
-    RUN_TEST (test_null_poller_pointers_remove_fd_indirect);
-    RUN_TEST (test_null_poller_pointers_wait_direct);
-    RUN_TEST (test_null_poller_pointers_wait_indirect);
-    RUN_TEST (test_null_poller_pointers_wait_all_direct);
-    RUN_TEST (test_null_poller_pointers_wait_all_indirect);
-    RUN_TEST (test_null_poller_pointer_poller_fd);
-
-    RUN_TEST (test_null_socket_pointers);
-
-    RUN_TEST (test_call_poller_wait_null_event_fails);
-    RUN_TEST (test_call_poller_wait_all_null_event_fails_event_count_nonzero);
-    RUN_TEST (test_call_poller_wait_all_null_event_fails_event_count_zero);
-
-    RUN_TEST (test_call_poller_size);
-    RUN_TEST (test_call_poller_add_twice_fails);
-    RUN_TEST (test_call_poller_remove_unregistered_fails);
-    RUN_TEST (test_call_poller_modify_unregistered_fails);
-    RUN_TEST (test_call_poller_add_no_events);
-    RUN_TEST (test_call_poller_modify_no_events);
-    RUN_TEST (test_call_poller_add_fd_twice_fails);
-    RUN_TEST (test_call_poller_remove_fd_unregistered_fails);
-    RUN_TEST (test_call_poller_modify_fd_unregistered_fails);
-    RUN_TEST (test_call_poller_add_invalid_events_fails);
-    RUN_TEST (test_call_poller_modify_invalid_events_fails);
-    RUN_TEST (test_call_poller_add_fd_invalid_events_fails);
-    RUN_TEST (test_call_poller_modify_fd_invalid_events_fails);
-
-    RUN_TEST (test_call_poller_wait_empty_with_timeout_fails);
-    RUN_TEST (test_call_poller_wait_empty_without_timeout_fails);
-    RUN_TEST (test_call_poller_wait_all_empty_negative_count_fails);
-    RUN_TEST (test_call_poller_wait_all_empty_without_timeout_fails);
-    RUN_TEST (test_call_poller_wait_all_empty_with_timeout_fails);
-    RUN_TEST (test_call_poller_wait_all_inf_disabled_fails);
-
-    RUN_TEST (test_call_poller_fd_no_signaler);
-    RUN_TEST (test_call_poller_fd);
-
-    RUN_TEST (test_poll_basic);
-    RUN_TEST (test_poll_fd);
-    RUN_TEST (test_poll_client_server);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_probe_router.cpp b/tests/test_probe_router.cpp
deleted file mode 100644
index 14e68e31a..000000000
--- a/tests/test_probe_router.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_probe_router_router ()
-{
-    //  Create server and bind to endpoint
-    void *server = test_context_socket (ZMQ_ROUTER);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-
-    //  Create client and connect to server, doing a probe
-    void *client = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_ROUTING_ID, "X", 1));
-    int probe = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PROBE_ROUTER, &probe, sizeof (probe)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    //  We expect a routing id=X + empty message from client
-    recv_string_expect_success (server, "X", 0);
-    unsigned char buffer[255];
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 255, 0)));
-
-    //  Send a message to client now
-    send_string_expect_success (server, "X", ZMQ_SNDMORE);
-    send_string_expect_success (server, "Hello", 0);
-
-    // receive the routing ID, which is auto-generated in this case, since the
-    // peer did not set one explicitly
-    TEST_ASSERT_EQUAL_INT (
-      5, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, buffer, 255, 0)));
-
-    recv_string_expect_success (client, "Hello", 0);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-void test_probe_router_dealer ()
-{
-    //  Create server and bind to endpoint
-    void *server = test_context_socket (ZMQ_ROUTER);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-
-    //  Create client and connect to server, doing a probe
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_ROUTING_ID, "X", 1));
-    int probe = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PROBE_ROUTER, &probe, sizeof (probe)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    //  We expect a routing id=X + empty message from client
-    recv_string_expect_success (server, "X", 0);
-    unsigned char buffer[255];
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 255, 0));
-
-    //  Send a message to client now
-    send_string_expect_success (server, "X", ZMQ_SNDMORE);
-    send_string_expect_success (server, "Hello", 0);
-
-    recv_string_expect_success (client, "Hello", 0);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_probe_router_router);
-    RUN_TEST (test_probe_router_dealer);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_proxy.cpp b/tests/test_proxy.cpp
deleted file mode 100644
index e5c855fe1..000000000
--- a/tests/test_proxy.cpp
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#define CONTENT_SIZE 13
-#define CONTENT_SIZE_MAX 32
-#define ROUTING_ID_SIZE 10
-#define ROUTING_ID_SIZE_MAX 32
-#define QT_WORKERS 5
-#define QT_CLIENTS 3
-#define is_verbose 0
-
-struct thread_data
-{
-    int id;
-};
-
-typedef struct
-{
-    uint64_t msg_in;
-    uint64_t bytes_in;
-    uint64_t msg_out;
-    uint64_t bytes_out;
-} zmq_socket_stats_t;
-
-typedef struct
-{
-    zmq_socket_stats_t frontend;
-    zmq_socket_stats_t backend;
-} zmq_proxy_stats_t;
-
-void *g_clients_pkts_out = NULL;
-void *g_workers_pkts_out = NULL;
-
-// Asynchronous client-to-server (DEALER to ROUTER) - pure libzmq
-//
-// While this example runs in a single process, that is to make
-// it easier to start and stop the example. Each task may have its own
-// context and conceptually acts as a separate process. To have this
-// behaviour, it is necessary to replace the inproc transport of the
-// control socket by a tcp transport.
-
-// This is our client task
-// It connects to the server, and then sends a request once per second
-// It collects responses as they arrive, and it prints them out. We will
-// run several client tasks in parallel, each with a different random ID.
-
-static void client_task (void *db_)
-{
-    const thread_data *const databag = static_cast<const thread_data *> (db_);
-    // Endpoint socket gets random port to avoid test failing when port in use
-    void *endpoint = zmq_socket (get_test_context (), ZMQ_PAIR);
-    TEST_ASSERT_NOT_NULL (endpoint);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (endpoint, ZMQ_LINGER, &linger, sizeof (linger)));
-    char endpoint_source[256];
-    sprintf (endpoint_source, "inproc://endpoint%d", databag->id);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (endpoint, endpoint_source));
-    char *my_endpoint = s_recv (endpoint);
-    TEST_ASSERT_NOT_NULL (my_endpoint);
-
-    void *client = zmq_socket (get_test_context (), ZMQ_DEALER);
-    TEST_ASSERT_NOT_NULL (client);
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_SUB);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (control, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control"));
-
-    char content[CONTENT_SIZE_MAX] = {};
-    // Set random routing id to make tracing easier
-    char routing_id[ROUTING_ID_SIZE] = {};
-    sprintf (routing_id, "%04X-%04X", rand () % 0xFFFF, rand () % 0xFFFF);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_ROUTING_ID, routing_id,
-      ROUTING_ID_SIZE)); // includes '\0' as an helper for printf
-    linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    zmq_pollitem_t items[] = {{client, 0, ZMQ_POLLIN, 0},
-                              {control, 0, ZMQ_POLLIN, 0}};
-    int request_nbr = 0;
-    bool run = true;
-    bool keep_sending = true;
-    while (run) {
-        // Tick once per 200 ms, pulling in arriving messages
-        int centitick;
-        for (centitick = 0; centitick < 20; centitick++) {
-            zmq_poll (items, 2, 10);
-            if (items[0].revents & ZMQ_POLLIN) {
-                int rcvmore;
-                size_t sz = sizeof (rcvmore);
-                int rc = TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_recv (client, content, CONTENT_SIZE_MAX, 0));
-                TEST_ASSERT_EQUAL_INT (CONTENT_SIZE, rc);
-                if (is_verbose)
-                    printf (
-                      "client receive - routing_id = %s    content = %s\n",
-                      routing_id, content);
-                //  Check that message is still the same
-                TEST_ASSERT_EQUAL_STRING_LEN ("request #", content, 9);
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_getsockopt (client, ZMQ_RCVMORE, &rcvmore, &sz));
-                TEST_ASSERT_FALSE (rcvmore);
-            }
-            if (items[1].revents & ZMQ_POLLIN) {
-                int rc = zmq_recv (control, content, CONTENT_SIZE_MAX, 0);
-
-                if (rc > 0) {
-                    content[rc] = 0; // NULL-terminate the command string
-                    if (is_verbose)
-                        printf (
-                          "client receive - routing_id = %s    command = %s\n",
-                          routing_id, content);
-                    if (memcmp (content, "TERMINATE", 9) == 0) {
-                        run = false;
-                        break;
-                    }
-                    if (memcmp (content, "STOP", 4) == 0) {
-                        keep_sending = false;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (keep_sending) {
-            sprintf (content, "request #%03d", ++request_nbr); // CONTENT_SIZE
-            if (is_verbose)
-                printf ("client send - routing_id = %s    request #%03d\n",
-                        routing_id, request_nbr);
-            zmq_atomic_counter_inc (g_clients_pkts_out);
-
-            TEST_ASSERT_EQUAL_INT (CONTENT_SIZE,
-                                   zmq_send (client, content, CONTENT_SIZE, 0));
-        }
-    }
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (client));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (endpoint));
-    free (my_endpoint);
-}
-
-// This is our server task.
-// It uses the multithreaded server model to deal requests out to a pool
-// of workers and route replies back to clients. One worker can handle
-// one request at a time but one client can talk to multiple workers at
-// once.
-
-static void server_worker (void * /*unused_*/);
-
-void server_task (void * /*unused_*/)
-{
-    // Frontend socket talks to clients over TCP
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *frontend = zmq_socket (get_test_context (), ZMQ_ROUTER);
-    TEST_ASSERT_NOT_NULL (frontend);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_LINGER, &linger, sizeof (linger)));
-    bind_loopback_ipv4 (frontend, my_endpoint, sizeof my_endpoint);
-
-    // Backend socket talks to workers over inproc
-    void *backend = zmq_socket (get_test_context (), ZMQ_DEALER);
-    TEST_ASSERT_NOT_NULL (backend);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, "inproc://backend"));
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control_proxy"));
-
-    // Launch pool of worker threads, precise number is not critical
-    int thread_nbr;
-    void *threads[5];
-    for (thread_nbr = 0; thread_nbr < QT_WORKERS; thread_nbr++)
-        threads[thread_nbr] = zmq_threadstart (&server_worker, NULL);
-
-    // Endpoint socket sends random port to avoid test failing when port in use
-    void *endpoint_receivers[QT_CLIENTS];
-    char endpoint_source[256];
-    for (int i = 0; i < QT_CLIENTS; ++i) {
-        endpoint_receivers[i] = zmq_socket (get_test_context (), ZMQ_PAIR);
-        TEST_ASSERT_NOT_NULL (endpoint_receivers[i]);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          endpoint_receivers[i], ZMQ_LINGER, &linger, sizeof (linger)));
-        sprintf (endpoint_source, "inproc://endpoint%d", i);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_bind (endpoint_receivers[i], endpoint_source));
-    }
-
-    for (int i = 0; i < QT_CLIENTS; ++i) {
-        send_string_expect_success (endpoint_receivers[i], my_endpoint, 0);
-    }
-
-    // Connect backend to frontend via a proxy
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_proxy_steerable (frontend, backend, NULL, control));
-
-    for (thread_nbr = 0; thread_nbr < QT_WORKERS; thread_nbr++)
-        zmq_threadclose (threads[thread_nbr]);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (frontend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-    for (int i = 0; i < QT_CLIENTS; ++i) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_close (endpoint_receivers[i]));
-    }
-}
-
-// Each worker task works on one request at a time and sends a random number
-// of replies back, with random delays between replies:
-// The comments in the first column, if suppressed, makes it a poller version
-
-static void server_worker (void * /*unused_*/)
-{
-    void *worker = zmq_socket (get_test_context (), ZMQ_DEALER);
-    TEST_ASSERT_NOT_NULL (worker);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (worker, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (worker, "inproc://backend"));
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_SUB);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (control, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control"));
-
-    char content[CONTENT_SIZE_MAX] =
-      {}; // bigger than what we need to check that
-    char routing_id[ROUTING_ID_SIZE_MAX] =
-      {}; // the size received is the size sent
-
-    bool run = true;
-    bool keep_sending = true;
-    while (run) {
-        int rc = zmq_recv (control, content, CONTENT_SIZE_MAX,
-                           ZMQ_DONTWAIT); // usually, rc == -1 (no message)
-        if (rc > 0) {
-            content[rc] = 0; // NULL-terminate the command string
-            if (is_verbose)
-                printf ("server_worker receives command = %s\n", content);
-            if (memcmp (content, "TERMINATE", 9) == 0)
-                run = false;
-            if (memcmp (content, "STOP", 4) == 0)
-                keep_sending = false;
-        }
-        // The DEALER socket gives us the reply envelope and message
-        // if we don't poll, we have to use ZMQ_DONTWAIT, if we poll, we can block-receive with 0
-        rc = zmq_recv (worker, routing_id, ROUTING_ID_SIZE_MAX, ZMQ_DONTWAIT);
-        if (rc == ROUTING_ID_SIZE) {
-            rc = zmq_recv (worker, content, CONTENT_SIZE_MAX, 0);
-            TEST_ASSERT_EQUAL_INT (CONTENT_SIZE, rc);
-            if (is_verbose)
-                printf ("server receive - routing_id = %s    content = %s\n",
-                        routing_id, content);
-
-            // Send 0..4 replies back
-            if (keep_sending) {
-                int reply, replies = rand () % 5;
-                for (reply = 0; reply < replies; reply++) {
-                    // Sleep for some fraction of a second
-                    msleep (rand () % 10 + 1);
-
-                    //  Send message from server to client
-                    if (is_verbose)
-                        printf ("server send - routing_id = %s    reply\n",
-                                routing_id);
-                    zmq_atomic_counter_inc (g_workers_pkts_out);
-
-                    rc = zmq_send (worker, routing_id, ROUTING_ID_SIZE,
-                                   ZMQ_SNDMORE);
-                    TEST_ASSERT_EQUAL_INT (ROUTING_ID_SIZE, rc);
-                    rc = zmq_send (worker, content, CONTENT_SIZE, 0);
-                    TEST_ASSERT_EQUAL_INT (CONTENT_SIZE, rc);
-                }
-            }
-        }
-    }
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (worker));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-}
-
-uint64_t recv_stat (void *sock_, bool last_)
-{
-    uint64_t res;
-    zmq_msg_t stats_msg;
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&stats_msg));
-    TEST_ASSERT_EQUAL_INT (sizeof (uint64_t),
-                           zmq_recvmsg (sock_, &stats_msg, 0));
-    memcpy (&res, zmq_msg_data (&stats_msg), zmq_msg_size (&stats_msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&stats_msg));
-
-    int more;
-    size_t moresz = sizeof more;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sock_, ZMQ_RCVMORE, &more, &moresz));
-    TEST_ASSERT_TRUE ((last_ && !more) || (!last_ && more));
-
-    return res;
-}
-
-// Utility function to interrogate the proxy:
-
-void check_proxy_stats (void *control_proxy_)
-{
-    zmq_proxy_stats_t total_stats;
-
-    send_string_expect_success (control_proxy_, "STATISTICS", 0);
-
-    // first frame of the reply contains FRONTEND stats:
-    total_stats.frontend.msg_in = recv_stat (control_proxy_, false);
-    total_stats.frontend.bytes_in = recv_stat (control_proxy_, false);
-    total_stats.frontend.msg_out = recv_stat (control_proxy_, false);
-    total_stats.frontend.bytes_out = recv_stat (control_proxy_, false);
-
-    // second frame of the reply contains BACKEND stats:
-    total_stats.backend.msg_in = recv_stat (control_proxy_, false);
-    total_stats.backend.bytes_in = recv_stat (control_proxy_, false);
-    total_stats.backend.msg_out = recv_stat (control_proxy_, false);
-    total_stats.backend.bytes_out = recv_stat (control_proxy_, true);
-
-    // check stats
-
-    if (is_verbose) {
-        printf (
-          "frontend: pkts_in=%lu bytes_in=%lu  pkts_out=%lu bytes_out=%lu\n",
-          static_cast<unsigned long int> (total_stats.frontend.msg_in),
-          static_cast<unsigned long int> (total_stats.frontend.bytes_in),
-          static_cast<unsigned long int> (total_stats.frontend.msg_out),
-          static_cast<unsigned long int> (total_stats.frontend.bytes_out));
-        printf (
-          "backend: pkts_in=%lu bytes_in=%lu  pkts_out=%lu bytes_out=%lu\n",
-          static_cast<unsigned long int> (total_stats.backend.msg_in),
-          static_cast<unsigned long int> (total_stats.backend.bytes_in),
-          static_cast<unsigned long int> (total_stats.backend.msg_out),
-          static_cast<unsigned long int> (total_stats.backend.bytes_out));
-
-        printf ("clients sent out %d requests\n",
-                zmq_atomic_counter_value (g_clients_pkts_out));
-        printf ("workers sent out %d replies\n",
-                zmq_atomic_counter_value (g_workers_pkts_out));
-    }
-    TEST_ASSERT_EQUAL_UINT (
-      (unsigned) zmq_atomic_counter_value (g_clients_pkts_out),
-      total_stats.frontend.msg_in);
-    TEST_ASSERT_EQUAL_UINT (
-      (unsigned) zmq_atomic_counter_value (g_workers_pkts_out),
-      total_stats.frontend.msg_out);
-    TEST_ASSERT_EQUAL_UINT (
-      (unsigned) zmq_atomic_counter_value (g_workers_pkts_out),
-      total_stats.backend.msg_in);
-    TEST_ASSERT_EQUAL_UINT (
-      (unsigned) zmq_atomic_counter_value (g_clients_pkts_out),
-      total_stats.backend.msg_out);
-}
-
-
-// The main thread simply starts several clients and a server, and then
-// waits for the server to finish.
-
-void test_proxy ()
-{
-    g_clients_pkts_out = zmq_atomic_counter_new ();
-    g_workers_pkts_out = zmq_atomic_counter_new ();
-
-    // Control socket receives terminate command from main over inproc
-    void *control = test_context_socket (ZMQ_PUB);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (control, "inproc://control"));
-
-    // Control socket receives terminate command from main over inproc
-    void *control_proxy = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control_proxy, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (control_proxy, "inproc://control_proxy"));
-
-    void *threads[QT_CLIENTS + 1];
-    struct thread_data databags[QT_CLIENTS + 1];
-    for (int i = 0; i < QT_CLIENTS; i++) {
-        databags[i].id = i;
-        threads[i] = zmq_threadstart (&client_task, &databags[i]);
-    }
-    threads[QT_CLIENTS] = zmq_threadstart (&server_task, NULL);
-    msleep (500); // Run for 500 ms then quit
-
-    if (is_verbose)
-        printf ("stopping all clients and server workers\n");
-    send_string_expect_success (control, "STOP", 0);
-
-    msleep (500); // Wait for all clients and workers to STOP
-
-    if (is_verbose)
-        printf ("retrieving stats from the proxy\n");
-    check_proxy_stats (control_proxy);
-
-    if (is_verbose)
-        printf ("shutting down all clients and server workers\n");
-    send_string_expect_success (control, "TERMINATE", 0);
-
-    if (is_verbose)
-        printf ("shutting down the proxy\n");
-    send_string_expect_success (control_proxy, "TERMINATE", 0);
-
-    test_context_socket_close (control);
-    test_context_socket_close (control_proxy);
-
-    for (int i = 0; i < QT_CLIENTS + 1; i++)
-        zmq_threadclose (threads[i]);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_proxy);
-    return UNITY_END ();
-}
diff --git a/tests/test_proxy_hwm.cpp b/tests/test_proxy_hwm.cpp
deleted file mode 100644
index 463d88134..000000000
--- a/tests/test_proxy_hwm.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-#include <string.h>
-#include <unity.h>
-#include <assert.h>
-#include <unistd.h>
-
-//
-// Asynchronous proxy test using ZMQ_XPUB_NODROP and HWM:
-//
-// Topology:
-//
-//   XPUB                      SUB
-//    |                         |
-//    \-----> XSUB -> XPUB -----/
-//           ^^^^^^^^^^^^^^
-//             ZMQ proxy
-//
-// All connections use "inproc" transport and have artificially-low HWMs set.
-// Then the PUB socket starts flooding the Proxy. The SUB is artificially slow
-// at receiving messages.
-// This scenario simulates what happens when a SUB is slower than
-// its (X)PUB: since ZMQ_XPUB_NODROP=1, the XPUB will block and then
-// also the (X)PUB socket will block.
-// The exact number of the messages that go through before (X)PUB blocks depends
-// on ZeroMQ internals and how the OS will schedule the different threads.
-// In the meanwhile asking statistics to the Proxy must NOT be blocking.
-//
-
-
-#define HWM 10
-#define NUM_BYTES_PER_MSG 50000
-
-
-typedef struct
-{
-    void *context;
-    const char *frontend_endpoint;
-    const char *backend_endpoint;
-    const char *control_endpoint;
-
-    void *subscriber_received_all;
-} proxy_hwm_cfg_t;
-
-static void lower_hwm (void *skt_)
-{
-    int send_hwm = HWM;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (skt_, ZMQ_SNDHWM, &send_hwm, sizeof (send_hwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (skt_, ZMQ_RCVHWM, &send_hwm, sizeof (send_hwm)));
-}
-
-static void publisher_thread_main (void *pvoid_)
-{
-    const proxy_hwm_cfg_t *const cfg =
-      static_cast<const proxy_hwm_cfg_t *> (pvoid_);
-
-    void *pubsocket = zmq_socket (cfg->context, ZMQ_XPUB);
-    assert (pubsocket);
-
-    lower_hwm (pubsocket);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pubsocket, cfg->frontend_endpoint));
-
-    int optval = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pubsocket, ZMQ_XPUB_NODROP, &optval, sizeof (optval)));
-
-    // Wait before starting TX operations till 1 subscriber has subscribed
-    // (in this test there's 1 subscriber only)
-    const char subscription_to_all_topics[] = {1, 0};
-    recv_string_expect_success (pubsocket, subscription_to_all_topics, 0);
-
-    uint64_t send_count = 0;
-    while (true) {
-        zmq_msg_t msg;
-        int rc = zmq_msg_init_size (&msg, NUM_BYTES_PER_MSG);
-        assert (rc == 0);
-
-        /* Fill in message content with 'AAAAAA' */
-        memset (zmq_msg_data (&msg), 'A', NUM_BYTES_PER_MSG);
-
-        /* Send the message to the socket */
-        rc = zmq_msg_send (&msg, pubsocket, ZMQ_DONTWAIT);
-        if (rc != -1) {
-            send_count++;
-        } else {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            break;
-        }
-    }
-
-    // VERIFY EXPECTED RESULTS
-    // EXPLANATION FOR TX TO BE CONSIDERED SUCCESSFUL:
-    // this test has 3 threads doing I/O across 2 queues. Depending on the scheduling,
-    // it might happen that 20, 30 or 40 messages go through before the pub blocks.
-    // That's because the receiver thread gets kicked once every (hwm_ + 1) / 2 sent
-    // messages (search for zeromq sources compute_lwm function).
-    // So depending on the scheduling of the second thread, the publisher might get one,
-    // two or three more batches in. The ceiling is 40 as there's 2 queues.
-    //
-    assert (4 * HWM >= send_count && 2 * HWM <= send_count);
-
-    // CLEANUP
-
-    zmq_close (pubsocket);
-}
-
-static void subscriber_thread_main (void *pvoid_)
-{
-    const proxy_hwm_cfg_t *const cfg =
-      static_cast<const proxy_hwm_cfg_t *> (pvoid_);
-
-    void *subsocket = zmq_socket (cfg->context, ZMQ_SUB);
-    assert (subsocket);
-
-    lower_hwm (subsocket);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (subsocket, ZMQ_SUBSCRIBE, 0, 0));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (subsocket, cfg->backend_endpoint));
-
-
-    // receive all sent messages
-    uint64_t rxsuccess = 0;
-    bool success = true;
-    while (success) {
-        zmq_msg_t msg;
-        int rc = zmq_msg_init (&msg);
-        assert (rc == 0);
-
-        rc = zmq_msg_recv (&msg, subsocket, 0);
-        if (rc != -1) {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            rxsuccess++;
-
-            // after receiving 1st message, set a finite timeout (default is infinite)
-            int timeout_ms = 100;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-              subsocket, ZMQ_RCVTIMEO, &timeout_ms, sizeof (timeout_ms)));
-        } else {
-            break;
-        }
-
-        msleep (100);
-    }
-
-
-    // VERIFY EXPECTED RESULTS
-    // EXPLANATION FOR RX TO BE CONSIDERED SUCCESSFUL:
-    // see publisher thread why we have 3 possible outcomes as number of RX messages
-
-    assert (4 * HWM >= rxsuccess && 2 * HWM <= rxsuccess);
-
-    // INFORM THAT WE COMPLETED:
-
-    zmq_atomic_counter_inc (cfg->subscriber_received_all);
-
-    // CLEANUP
-
-    zmq_close (subsocket);
-}
-
-bool recv_stat (void *sock_, bool last_, uint64_t *res_)
-{
-    zmq_msg_t stats_msg;
-
-    int rc = zmq_msg_init (&stats_msg);
-    assert (rc == 0);
-
-    rc = zmq_msg_recv (&stats_msg, sock_, 0); //ZMQ_DONTWAIT);
-    if (rc == -1 && errno == EAGAIN) {
-        rc = zmq_msg_close (&stats_msg);
-        assert (rc == 0);
-        return false; // cannot retrieve the stat
-    }
-
-    assert (rc == sizeof (uint64_t));
-    memcpy (res_, zmq_msg_data (&stats_msg), zmq_msg_size (&stats_msg));
-
-    rc = zmq_msg_close (&stats_msg);
-    assert (rc == 0);
-
-    int more;
-    size_t moresz = sizeof more;
-    rc = zmq_getsockopt (sock_, ZMQ_RCVMORE, &more, &moresz);
-    assert (rc == 0);
-    assert ((last_ && !more) || (!last_ && more));
-
-    return true;
-}
-
-// Utility function to interrogate the proxy:
-
-typedef struct
-{
-    uint64_t msg_in;
-    uint64_t bytes_in;
-    uint64_t msg_out;
-    uint64_t bytes_out;
-} zmq_socket_stats_t;
-
-typedef struct
-{
-    zmq_socket_stats_t frontend;
-    zmq_socket_stats_t backend;
-} zmq_proxy_stats_t;
-
-bool check_proxy_stats (void *control_proxy_)
-{
-    zmq_proxy_stats_t total_stats;
-    int rc;
-
-    rc = zmq_send (control_proxy_, "STATISTICS", 10, ZMQ_DONTWAIT);
-    assert (rc == 10 || (rc == -1 && errno == EAGAIN));
-    if (rc == -1 && errno == EAGAIN) {
-        return false;
-    }
-
-    // first frame of the reply contains FRONTEND stats:
-    if (!recv_stat (control_proxy_, false, &total_stats.frontend.msg_in)) {
-        return false;
-    }
-
-    recv_stat (control_proxy_, false, &total_stats.frontend.bytes_in);
-    recv_stat (control_proxy_, false, &total_stats.frontend.msg_out);
-    recv_stat (control_proxy_, false, &total_stats.frontend.bytes_out);
-
-    // second frame of the reply contains BACKEND stats:
-    recv_stat (control_proxy_, false, &total_stats.backend.msg_in);
-    recv_stat (control_proxy_, false, &total_stats.backend.bytes_in);
-    recv_stat (control_proxy_, false, &total_stats.backend.msg_out);
-    recv_stat (control_proxy_, true, &total_stats.backend.bytes_out);
-
-    return true;
-}
-
-static void proxy_stats_asker_thread_main (void *pvoid_)
-{
-    const proxy_hwm_cfg_t *const cfg =
-      static_cast<const proxy_hwm_cfg_t *> (pvoid_);
-
-    // CONTROL REQ
-
-    void *control_req =
-      zmq_socket (cfg->context,
-                  ZMQ_REQ); // this one can be used to send command to the proxy
-    assert (control_req);
-
-    // connect CONTROL-REQ: a socket to which send commands
-    int rc = zmq_connect (control_req, cfg->control_endpoint);
-    assert (rc == 0);
-
-
-    // IMPORTANT: by setting the tx/rx timeouts, we avoid getting blocked when interrogating a proxy which is
-    //            itself blocked in a zmq_msg_send() on its XPUB socket having ZMQ_XPUB_NODROP=1!
-
-    int optval = 10;
-    rc = zmq_setsockopt (control_req, ZMQ_SNDTIMEO, &optval, sizeof (optval));
-    assert (rc == 0);
-    rc = zmq_setsockopt (control_req, ZMQ_RCVTIMEO, &optval, sizeof (optval));
-    assert (rc == 0);
-
-    optval = 10;
-    rc =
-      zmq_setsockopt (control_req, ZMQ_REQ_CORRELATE, &optval, sizeof (optval));
-    assert (rc == 0);
-
-    rc =
-      zmq_setsockopt (control_req, ZMQ_REQ_RELAXED, &optval, sizeof (optval));
-    assert (rc == 0);
-
-
-    // Start!
-
-    while (!zmq_atomic_counter_value (cfg->subscriber_received_all)) {
-        check_proxy_stats (control_req);
-        usleep (1000); // 1ms -> in best case we will get 1000updates/second
-    }
-
-
-    // Ask the proxy to exit: the subscriber has received all messages
-
-    rc = zmq_send (control_req, "TERMINATE", 9, 0);
-    assert (rc == 9);
-
-    zmq_close (control_req);
-}
-
-static void proxy_thread_main (void *pvoid_)
-{
-    const proxy_hwm_cfg_t *const cfg =
-      static_cast<const proxy_hwm_cfg_t *> (pvoid_);
-    int rc;
-
-    // FRONTEND SUB
-
-    void *frontend_xsub = zmq_socket (
-      cfg->context,
-      ZMQ_XSUB); // the frontend is the one exposed to internal threads (INPROC)
-    assert (frontend_xsub);
-
-    lower_hwm (frontend_xsub);
-
-    // bind FRONTEND
-    rc = zmq_bind (frontend_xsub, cfg->frontend_endpoint);
-    assert (rc == 0);
-
-
-    // BACKEND PUB
-
-    void *backend_xpub = zmq_socket (
-      cfg->context,
-      ZMQ_XPUB); // the backend is the one exposed to the external world (TCP)
-    assert (backend_xpub);
-
-    int optval = 1;
-    rc =
-      zmq_setsockopt (backend_xpub, ZMQ_XPUB_NODROP, &optval, sizeof (optval));
-    assert (rc == 0);
-
-    lower_hwm (backend_xpub);
-
-    // bind BACKEND
-    rc = zmq_bind (backend_xpub, cfg->backend_endpoint);
-    assert (rc == 0);
-
-
-    // CONTROL REP
-
-    void *control_rep = zmq_socket (
-      cfg->context,
-      ZMQ_REP); // this one is used by the proxy to receive&reply to commands
-    assert (control_rep);
-
-    // bind CONTROL
-    rc = zmq_bind (control_rep, cfg->control_endpoint);
-    assert (rc == 0);
-
-
-    // start proxying!
-
-    zmq_proxy_steerable (frontend_xsub, backend_xpub, NULL, control_rep);
-
-    zmq_close (frontend_xsub);
-    zmq_close (backend_xpub);
-    zmq_close (control_rep);
-}
-
-
-// The main thread simply starts several clients and a server, and then
-// waits for the server to finish.
-
-int main (void)
-{
-    setup_test_environment ();
-
-    void *context = zmq_ctx_new ();
-    assert (context);
-
-
-    // START ALL SECONDARY THREADS
-
-    proxy_hwm_cfg_t cfg;
-    cfg.context = context;
-    cfg.frontend_endpoint = "inproc://frontend";
-    cfg.backend_endpoint = "inproc://backend";
-    cfg.control_endpoint = "inproc://ctrl";
-    cfg.subscriber_received_all = zmq_atomic_counter_new ();
-
-    void *proxy = zmq_threadstart (&proxy_thread_main, (void *) &cfg);
-    assert (proxy != 0);
-    void *publisher = zmq_threadstart (&publisher_thread_main, (void *) &cfg);
-    assert (publisher != 0);
-    void *subscriber = zmq_threadstart (&subscriber_thread_main, (void *) &cfg);
-    assert (subscriber != 0);
-    void *asker =
-      zmq_threadstart (&proxy_stats_asker_thread_main, (void *) &cfg);
-    assert (asker != 0);
-
-
-    // CLEANUP
-
-    zmq_threadclose (publisher);
-    zmq_threadclose (subscriber);
-    zmq_threadclose (asker);
-    zmq_threadclose (proxy);
-
-    int rc = zmq_ctx_term (context);
-    assert (rc == 0);
-
-    zmq_atomic_counter_destroy (&cfg.subscriber_received_all);
-
-    return 0;
-}
diff --git a/tests/test_proxy_single_socket.cpp b/tests/test_proxy_single_socket.cpp
deleted file mode 100644
index 8545267e5..000000000
--- a/tests/test_proxy_single_socket.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// This is our server task.
-// It runs a proxy with a single REP socket as both frontend and backend.
-
-void server_task (void * /*unused_*/)
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *rep = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (rep);
-    bind_loopback_ipv4 (rep, my_endpoint, sizeof my_endpoint);
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control"));
-    send_string_expect_success (control, my_endpoint, 0);
-
-    // Use rep as both frontend and backend
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_proxy_steerable (rep, rep, NULL, control));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (rep));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-}
-
-
-// The main thread simply starts several clients and a server, and then
-// waits for the server to finish.
-void test_proxy_single_socket ()
-{
-    void *server_thread = zmq_threadstart (&server_task, NULL);
-
-    // Control socket receives terminate command from main over inproc
-    void *control = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (control, "inproc://control"));
-    char *my_endpoint = s_recv (control);
-    TEST_ASSERT_NOT_NULL (my_endpoint);
-
-    // client socket pings proxy over tcp
-    void *req = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (req);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, my_endpoint));
-
-    send_string_expect_success (req, "msg1", 0);
-    recv_string_expect_success (req, "msg1", 0);
-
-    send_string_expect_success (req, "msg22", 0);
-    recv_string_expect_success (req, "msg22", 0);
-
-    send_string_expect_success (control, "TERMINATE", 0);
-
-    test_context_socket_close (control);
-    test_context_socket_close (req);
-    free (my_endpoint);
-
-    zmq_threadclose (server_thread);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_proxy_single_socket);
-    return UNITY_END ();
-}
diff --git a/tests/test_proxy_terminate.cpp b/tests/test_proxy_terminate.cpp
deleted file mode 100644
index 69daaded2..000000000
--- a/tests/test_proxy_terminate.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// This is a test for issue #1382. The server thread creates a SUB-PUSH
-// steerable proxy. The main process then sends messages to the SUB
-// but there is no pull on the other side, previously the proxy blocks
-// in writing to the backend, preventing the proxy from terminating
-
-void server_task (void * /*unused_*/)
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    // Frontend socket talks to main process
-    void *frontend = zmq_socket (get_test_context (), ZMQ_SUB);
-    TEST_ASSERT_NOT_NULL (frontend);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (frontend, ZMQ_SUBSCRIBE, "", 0));
-    bind_loopback_ipv4 (frontend, my_endpoint, sizeof my_endpoint);
-
-    // Nice socket which is never read
-    void *backend = zmq_socket (get_test_context (), ZMQ_PUSH);
-    TEST_ASSERT_NOT_NULL (backend);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, "tcp://127.0.0.1:*"));
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control"));
-    send_string_expect_success (control, my_endpoint, 0);
-
-    // Connect backend to frontend via a proxy
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_proxy_steerable (frontend, backend, NULL, control));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (frontend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-}
-
-
-// The main thread simply starts a basic steerable proxy server, publishes some messages, and then
-// waits for the server to terminate.
-void test_proxy_terminate ()
-{
-    void *thread = zmq_threadstart (&server_task, NULL);
-
-    // Control socket receives terminate command from main over inproc
-    void *control = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (control, "inproc://control"));
-    char *my_endpoint = s_recv (control);
-    TEST_ASSERT_NOT_NULL (my_endpoint);
-
-    msleep (500); // Run for 500 ms
-
-    // Start a secondary publisher which writes data to the SUB-PUSH server socket
-    void *publisher = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_NOT_NULL (publisher);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (publisher, my_endpoint));
-
-    msleep (SETTLE_TIME);
-    send_string_expect_success (publisher, "This is a test", 0);
-
-    msleep (50);
-    send_string_expect_success (publisher, "This is a test", 0);
-
-    msleep (50);
-    send_string_expect_success (publisher, "This is a test", 0);
-    send_string_expect_success (control, "TERMINATE", 0);
-
-    test_context_socket_close (publisher);
-    test_context_socket_close (control);
-    free (my_endpoint);
-
-    zmq_threadclose (thread);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_proxy_terminate);
-    return UNITY_END ();
-}
diff --git a/tests/test_pub_invert_matching.cpp b/tests/test_pub_invert_matching.cpp
deleted file mode 100644
index 4a5b3f5d9..000000000
--- a/tests/test_pub_invert_matching.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create two subscribers
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, "inproc://soname"));
-
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, "inproc://soname"));
-
-    //  Subscribe pub1 to one prefix
-    //  and pub2 to another prefix.
-    const char prefi_x1[] = "prefix1";
-    const char prefi_x2[] = "p2";
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, prefi_x1, strlen (prefi_x1)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, prefi_x2, strlen (prefi_x2)));
-
-    //  Send a message with the first prefix
-    send_string_expect_success (pub, prefi_x1, 0);
-    msleep (SETTLE_TIME);
-
-    //  sub1 should receive it, but not sub2
-    recv_string_expect_success (sub1, prefi_x1, ZMQ_DONTWAIT);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (sub2, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Send a message with the second prefix
-    send_string_expect_success (pub, prefi_x2, 0);
-    msleep (SETTLE_TIME);
-
-    //  sub2 should receive it, but not sub1
-    recv_string_expect_success (sub2, prefi_x2, ZMQ_DONTWAIT);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (sub1, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Now invert the matching
-    int invert = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_INVERT_MATCHING, &invert, sizeof (invert)));
-
-    //  ... on both sides, otherwise the SUB socket will filter the messages out
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_INVERT_MATCHING, &invert, sizeof (invert)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub2, ZMQ_INVERT_MATCHING, &invert, sizeof (invert)));
-
-    //  Send a message with the first prefix
-    send_string_expect_success (pub, prefi_x1, 0);
-    msleep (SETTLE_TIME);
-
-    //  sub2 should receive it, but not sub1
-    recv_string_expect_success (sub2, prefi_x1, ZMQ_DONTWAIT);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (sub1, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Send a message with the second prefix
-    send_string_expect_success (pub, prefi_x2, 0);
-    msleep (SETTLE_TIME);
-
-    //  sub1 should receive it, but not sub2
-    recv_string_expect_success (sub1, prefi_x2, ZMQ_DONTWAIT);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (sub2, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/tests/test_radio_dish.cpp b/tests/test_radio_dish.cpp
deleted file mode 100644
index 3c3fb18e5..000000000
--- a/tests/test_radio_dish.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-#ifndef _WIN32
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-
-// Helper macro to define the v4/v6 function pairs
-#define MAKE_TEST_V4V6(_test)                                                  \
-    static void _test##_ipv4 () { _test (false); }                             \
-                                                                               \
-    static void _test##_ipv6 ()                                                \
-    {                                                                          \
-        if (!is_ipv6_available ()) {                                           \
-            TEST_IGNORE_MESSAGE ("ipv6 is not available");                     \
-        }                                                                      \
-        _test (true);                                                          \
-    }
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void msg_send_expect_success (void *s_, const char *group_, const char *body_)
-{
-    zmq_msg_t msg;
-    const size_t len = strlen (body_);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, len));
-
-    memcpy (zmq_msg_data (&msg), body_, len);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_set_group (&msg, group_));
-
-    int rc = zmq_msg_send (&msg, s_, 0);
-    TEST_ASSERT_EQUAL_INT ((int) len, rc);
-
-    // TODO isn't the msg closed by zmq_msg_send?
-    zmq_msg_close (&msg);
-}
-
-void msg_recv_cmp (void *s_, const char *group_, const char *body_)
-{
-    zmq_msg_t msg;
-    const size_t len = strlen (body_);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    int recv_rc = TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, s_, 0));
-    TEST_ASSERT_EQUAL_INT (len, recv_rc);
-
-    TEST_ASSERT_EQUAL_STRING (group_, zmq_msg_group (&msg));
-
-    TEST_ASSERT_EQUAL_STRING_LEN (body_, zmq_msg_data (&msg), len);
-
-    zmq_msg_close (&msg);
-}
-
-void test_leave_unjoined_fails ()
-{
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    //  Leaving a group which we didn't join
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_leave (dish, "Movies"));
-
-    test_context_socket_close (dish);
-}
-
-void test_long_group ()
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *radio = test_context_socket (ZMQ_RADIO);
-    bind_loopback (radio, false, my_endpoint, len);
-
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    // Joining to a long group, over 14 chars
-    char group[19] = "0123456789ABCDEFGH";
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, group));
-
-    // Connecting
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dish, my_endpoint));
-
-    msleep (SETTLE_TIME);
-
-    //  This is going to be sent to the dish
-    msg_send_expect_success (radio, group, "HELLO");
-
-    //  Check the correct message arrived
-    msg_recv_cmp (dish, group, "HELLO");
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-
-void test_join_too_long_fails ()
-{
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    //  Joining too long group
-    char too_long_group[ZMQ_GROUP_MAX_LENGTH + 2];
-    for (int index = 0; index < ZMQ_GROUP_MAX_LENGTH + 2; index++)
-        too_long_group[index] = 'A';
-    too_long_group[ZMQ_GROUP_MAX_LENGTH + 1] = '\0';
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_join (dish, too_long_group));
-
-    test_context_socket_close (dish);
-}
-
-void test_join_twice_fails ()
-{
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "Movies"));
-
-    // Duplicate Joining
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_join (dish, "Movies"));
-
-    test_context_socket_close (dish);
-}
-
-void test_radio_dish_tcp_poll (int ipv6_)
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *radio = test_context_socket (ZMQ_RADIO);
-    bind_loopback (radio, ipv6_, my_endpoint, len);
-
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    // Joining
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "Movies"));
-
-    // Connecting
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dish, my_endpoint));
-
-    msleep (SETTLE_TIME);
-
-    //  This is not going to be sent as dish only subscribe to "Movies"
-    msg_send_expect_success (radio, "TV", "Friends");
-
-    //  This is going to be sent to the dish
-    msg_send_expect_success (radio, "Movies", "Godfather");
-
-    //  Check the correct message arrived
-    msg_recv_cmp (dish, "Movies", "Godfather");
-
-    //  Join group during connection optvallen
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "TV"));
-
-    zmq_sleep (1);
-
-    //  This should arrive now as we joined the group
-    msg_send_expect_success (radio, "TV", "Friends");
-
-    //  Check the correct message arrived
-    msg_recv_cmp (dish, "TV", "Friends");
-
-    //  Leaving group
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_leave (dish, "TV"));
-
-    zmq_sleep (1);
-
-    //  This is not going to be sent as dish only subscribe to "Movies"
-    msg_send_expect_success (radio, "TV", "Friends");
-
-    //  This is going to be sent to the dish
-    msg_send_expect_success (radio, "Movies", "Godfather");
-
-    // test zmq_poll with dish
-    zmq_pollitem_t items[] = {
-      {radio, 0, ZMQ_POLLIN, 0}, // read publications
-      {dish, 0, ZMQ_POLLIN, 0},  // read subscriptions
-    };
-    int rc = zmq_poll (items, 2, 2000);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLIN, items[1].revents);
-
-    //  Check the correct message arrived
-    msg_recv_cmp (dish, "Movies", "Godfather");
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_dish_tcp_poll)
-
-void test_dish_connect_fails (int ipv6_)
-{
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    const char *url = ipv6_ ? "udp://[::1]:5556" : "udp://127.0.0.1:5556";
-
-    //  Connecting dish should fail
-    TEST_ASSERT_FAILURE_ERRNO (ENOCOMPATPROTO, zmq_connect (dish, url));
-
-    test_context_socket_close (dish);
-}
-MAKE_TEST_V4V6 (test_dish_connect_fails)
-
-void test_radio_bind_fails (int ipv6_)
-{
-    void *radio = test_context_socket (ZMQ_RADIO);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    //  Connecting dish should fail
-    //  Bind radio should fail
-    TEST_ASSERT_FAILURE_ERRNO (ENOCOMPATPROTO,
-                               zmq_bind (radio, "udp://*:5556"));
-
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_bind_fails)
-
-void test_radio_dish_udp (int ipv6_)
-{
-    void *radio = test_context_socket (ZMQ_RADIO);
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    const char *radio_url = ipv6_ ? "udp://[::1]:5556" : "udp://127.0.0.1:5556";
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (dish, "udp://*:5556"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (radio, radio_url));
-
-    msleep (SETTLE_TIME);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "TV"));
-
-    msg_send_expect_success (radio, "TV", "Friends");
-    msg_recv_cmp (dish, "TV", "Friends");
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_dish_udp)
-
-#define MCAST_IPV4 "226.8.5.5"
-#define MCAST_IPV6 "ff02::7a65:726f:6df1:0a01"
-
-static const char *mcast_url (int ipv6_)
-{
-    if (ipv6_) {
-        return "udp://[" MCAST_IPV6 "]:5555";
-    }
-    return "udp://" MCAST_IPV4 ":5555";
-}
-
-//  OSX uses a different name for this socket option
-#ifndef IPV6_ADD_MEMBERSHIP
-#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-#endif
-
-union sa_u
-{
-    struct sockaddr generic;
-    struct sockaddr_in ipv4;
-    struct sockaddr_in6 ipv6;
-};
-
-//  Test if multicast is available on this machine by attempting to
-//  send a receive a multicast datagram
-static bool is_multicast_available (int ipv6_)
-{
-    int family = ipv6_ ? AF_INET6 : AF_INET;
-    fd_t bind_sock = retired_fd;
-    fd_t send_sock = retired_fd;
-    int port = 5555;
-    bool success = false;
-    const char *msg = "it works";
-    char buf[32];
-    union sa_u any;
-    union sa_u mcast;
-    socklen_t sl;
-    int rc;
-
-    if (ipv6_) {
-        struct sockaddr_in6 *any_ipv6 = &any.ipv6;
-        struct sockaddr_in6 *mcast_ipv6 = &mcast.ipv6;
-
-        any_ipv6->sin6_family = AF_INET6;
-        any_ipv6->sin6_port = htons (port);
-        any_ipv6->sin6_flowinfo = 0;
-        any_ipv6->sin6_scope_id = 0;
-
-        rc = test_inet_pton (AF_INET6, "::", &any_ipv6->sin6_addr);
-        if (rc == 0) {
-            goto out;
-        }
-
-        *mcast_ipv6 = *any_ipv6;
-
-        rc = test_inet_pton (AF_INET6, MCAST_IPV6, &mcast_ipv6->sin6_addr);
-        if (rc == 0) {
-            goto out;
-        }
-
-        sl = sizeof (*any_ipv6);
-    } else {
-        struct sockaddr_in *any_ipv4 = &any.ipv4;
-        struct sockaddr_in *mcast_ipv4 = &mcast.ipv4;
-
-        any_ipv4->sin_family = AF_INET;
-        any_ipv4->sin_port = htons (5555);
-
-        rc = test_inet_pton (AF_INET, "0.0.0.0", &any_ipv4->sin_addr);
-        if (rc == 0) {
-            goto out;
-        }
-
-        *mcast_ipv4 = *any_ipv4;
-
-        rc = test_inet_pton (AF_INET, MCAST_IPV4, &mcast_ipv4->sin_addr);
-        if (rc == 0) {
-            goto out;
-        }
-
-        sl = sizeof (*any_ipv4);
-    }
-
-    bind_sock = socket (family, SOCK_DGRAM, IPPROTO_UDP);
-    if (bind_sock < 0) {
-        goto out;
-    }
-
-    send_sock = socket (family, SOCK_DGRAM, IPPROTO_UDP);
-    if (bind_sock < 0) {
-        goto out;
-    }
-
-    rc = bind (bind_sock, &any.generic, sl);
-    if (rc < 0) {
-        goto out;
-    }
-
-    if (ipv6_) {
-        struct ipv6_mreq mreq;
-        const sockaddr_in6 *const mcast_ipv6 = &mcast.ipv6;
-
-        mreq.ipv6mr_multiaddr = mcast_ipv6->sin6_addr;
-        mreq.ipv6mr_interface = 0;
-
-        rc = setsockopt (bind_sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP,
-                         as_setsockopt_opt_t (&mreq), sizeof (mreq));
-        if (rc < 0) {
-            goto out;
-        }
-
-        int loop = 1;
-        rc = setsockopt (send_sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
-                         as_setsockopt_opt_t (&loop), sizeof (loop));
-        if (rc < 0) {
-            goto out;
-        }
-    } else {
-        struct ip_mreq mreq;
-        const sockaddr_in *const mcast_ipv4 = &mcast.ipv4;
-
-        mreq.imr_multiaddr = mcast_ipv4->sin_addr;
-        mreq.imr_interface.s_addr = htonl (INADDR_ANY);
-
-        rc = setsockopt (bind_sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-                         as_setsockopt_opt_t (&mreq), sizeof (mreq));
-        if (rc < 0) {
-            goto out;
-        }
-
-        int loop = 1;
-        rc = setsockopt (send_sock, IPPROTO_IP, IP_MULTICAST_LOOP,
-                         as_setsockopt_opt_t (&loop), sizeof (loop));
-        if (rc < 0) {
-            goto out;
-        }
-    }
-
-    msleep (SETTLE_TIME);
-
-    rc = sendto (send_sock, msg, static_cast<socklen_t> (strlen (msg)), 0,
-                 &mcast.generic, sl);
-    if (rc < 0) {
-        goto out;
-    }
-
-    msleep (SETTLE_TIME);
-
-    rc = recvfrom (bind_sock, buf, sizeof (buf) - 1, 0, NULL, 0);
-    if (rc < 0) {
-        goto out;
-    }
-
-    buf[rc] = '\0';
-
-    success = (strcmp (msg, buf) == 0);
-
-out:
-    if (bind_sock >= 0) {
-        close (bind_sock);
-    }
-
-    if (send_sock >= 0) {
-        close (send_sock);
-    }
-
-    return success;
-}
-
-static void ignore_if_unavailable (int ipv6_)
-{
-    if (ipv6_ && !is_ipv6_available ())
-        TEST_IGNORE_MESSAGE ("No IPV6 available");
-    if (!is_multicast_available (ipv6_))
-        TEST_IGNORE_MESSAGE ("No multicast available");
-}
-
-static void test_radio_dish_mcast (int ipv6_)
-{
-    ignore_if_unavailable (ipv6_);
-
-    void *radio = test_context_socket (ZMQ_RADIO);
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    const char *url = mcast_url (ipv6_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (dish, url));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (radio, url));
-
-    msleep (SETTLE_TIME);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "TV"));
-
-    msg_send_expect_success (radio, "TV", "Friends");
-    msg_recv_cmp (dish, "TV", "Friends");
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_dish_mcast)
-
-static void test_radio_dish_no_loop (int ipv6_)
-{
-#ifdef _WIN32
-    TEST_IGNORE_MESSAGE (
-      "ZMQ_MULTICAST_LOOP=false does not appear to work on Windows (TODO)");
-#endif
-    ignore_if_unavailable (ipv6_);
-
-    void *radio = test_context_socket (ZMQ_RADIO);
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    //  Disable multicast loop for radio
-    int loop = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_MULTICAST_LOOP, &loop, sizeof (int)));
-
-    const char *url = mcast_url (ipv6_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (dish, url));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (radio, url));
-
-    msleep (SETTLE_TIME);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "TV"));
-
-    msg_send_expect_success (radio, "TV", "Friends");
-
-    // Looping is disabled, we shouldn't receive anything
-    msleep (SETTLE_TIME);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (dish, NULL, 0, ZMQ_DONTWAIT));
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_dish_no_loop)
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_leave_unjoined_fails);
-    RUN_TEST (test_join_too_long_fails);
-    RUN_TEST (test_long_group);
-    RUN_TEST (test_join_twice_fails);
-    RUN_TEST (test_radio_bind_fails_ipv4);
-    RUN_TEST (test_radio_bind_fails_ipv6);
-    RUN_TEST (test_dish_connect_fails_ipv4);
-    RUN_TEST (test_dish_connect_fails_ipv6);
-    RUN_TEST (test_radio_dish_tcp_poll_ipv4);
-    RUN_TEST (test_radio_dish_tcp_poll_ipv6);
-    RUN_TEST (test_radio_dish_udp_ipv4);
-    RUN_TEST (test_radio_dish_udp_ipv6);
-
-    RUN_TEST (test_radio_dish_mcast_ipv4);
-    RUN_TEST (test_radio_dish_no_loop_ipv4);
-
-    RUN_TEST (test_radio_dish_mcast_ipv6);
-    RUN_TEST (test_radio_dish_no_loop_ipv6);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_rebind_ipc.cpp b/tests/test_rebind_ipc.cpp
deleted file mode 100644
index 61736eed6..000000000
--- a/tests/test_rebind_ipc.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_rebind_ipc ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    make_random_ipc_endpoint (my_endpoint);
-
-    void *sb0 = test_context_socket (ZMQ_PUSH);
-    void *sb1 = test_context_socket (ZMQ_PUSH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb0, my_endpoint));
-
-    void *sc = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    send_string_expect_success (sb0, "42", 0);
-    recv_string_expect_success (sc, "42", 0);
-
-    test_context_socket_close (sb0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb1, my_endpoint));
-
-    send_string_expect_success (sb1, "42", 0);
-    recv_string_expect_success (sc, "42", 0);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb1);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_rebind_ipc);
-    return UNITY_END ();
-}
diff --git a/tests/test_reconnect_ivl.cpp b/tests/test_reconnect_ivl.cpp
deleted file mode 100644
index 51be3368c..000000000
--- a/tests/test_reconnect_ivl.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-    Copyright (c) 2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_reconnect_ivl_against_pair_socket (const char *my_endpoint_,
-                                             void *sb_)
-{
-    void *sc = test_context_socket (ZMQ_PAIR);
-    int interval = -1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_RECONNECT_IVL, &interval, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_));
-
-    bounce (sb_, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb_, my_endpoint_));
-
-    expect_bounce_fail (sb_, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb_, my_endpoint_));
-
-    expect_bounce_fail (sb_, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_));
-
-    bounce (sb_, sc);
-
-    test_context_socket_close (sc);
-}
-
-#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU)
-void test_reconnect_ivl_ipc (void)
-{
-    char my_endpoint[256];
-    make_random_ipc_endpoint (my_endpoint);
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, my_endpoint));
-
-    test_reconnect_ivl_against_pair_socket (my_endpoint, sb);
-    test_context_socket_close (sb);
-}
-#endif
-
-void test_reconnect_ivl_tcp (bind_function_t bind_function_)
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    bind_function_ (sb, my_endpoint, sizeof my_endpoint);
-
-    test_reconnect_ivl_against_pair_socket (my_endpoint, sb);
-    test_context_socket_close (sb);
-}
-
-void test_reconnect_ivl_tcp_ipv4 ()
-{
-    test_reconnect_ivl_tcp (bind_loopback_ipv4);
-}
-
-void test_reconnect_ivl_tcp_ipv6 ()
-{
-    if (is_ipv6_available ()) {
-        zmq_ctx_set (get_test_context (), ZMQ_IPV6, 1);
-        test_reconnect_ivl_tcp (bind_loopback_ipv6);
-    }
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU)
-    RUN_TEST (test_reconnect_ivl_ipc);
-#endif
-    RUN_TEST (test_reconnect_ivl_tcp_ipv4);
-    RUN_TEST (test_reconnect_ivl_tcp_ipv6);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_reconnect_options.cpp b/tests/test_reconnect_options.cpp
deleted file mode 100644
index 03122d7b4..000000000
--- a/tests/test_reconnect_options.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-    Copyright (c) 2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <assert.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-#include "testutil_monitoring.hpp"
-
-#include <unity.h>
-
-// test behavior with (mostly) default values
-void reconnect_default ()
-{
-    // setup pub socket
-    void *pub = test_context_socket (ZMQ_PUB);
-    //  Bind pub socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, ENDPOINT_0));
-
-    // setup sub socket
-    void *sub = test_context_socket (ZMQ_SUB);
-    //  Monitor all events on sub
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (sub, "inproc://monitor-sub", ZMQ_EVENT_ALL));
-    //  Create socket for collecting monitor events
-    void *sub_mon = test_context_socket (ZMQ_PAIR);
-    //  Connect so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_mon, "inproc://monitor-sub"));
-    // set reconnect interval so only a single reconnect is tried
-    int interval = 60 * 1000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_RECONNECT_IVL, &interval, sizeof (interval)));
-    // connect to pub
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, ENDPOINT_0));
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    // close the pub socket
-    test_context_socket_close_zero_linger (pub);
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_DISCONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_RETRIED);
-
-    // ZMQ_EVENT_CONNECT_RETRIED should be last event, because of timeout set above
-    int event;
-    char *event_address;
-    int rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                             2 * 1000);
-    assert (rc == -1);
-
-    //  Close sub
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub);
-
-    //  Close monitor
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub_mon);
-}
-
-
-// test successful reconnect
-void reconnect_success ()
-{
-    // setup pub socket
-    void *pub = test_context_socket (ZMQ_PUB);
-    //  Bind pub socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, ENDPOINT_0));
-
-    // setup sub socket
-    void *sub = test_context_socket (ZMQ_SUB);
-    //  Monitor all events on sub
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (sub, "inproc://monitor-sub", ZMQ_EVENT_ALL));
-    //  Create socket for collecting monitor events
-    void *sub_mon = test_context_socket (ZMQ_PAIR);
-    //  Connect so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_mon, "inproc://monitor-sub"));
-    // set reconnect interval so only a single reconnect is tried
-    int interval = 1 * 1000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_RECONNECT_IVL, &interval, sizeof (interval)));
-    // connect to pub
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, ENDPOINT_0));
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    // close the pub socket
-    test_context_socket_close_zero_linger (pub);
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_DISCONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_RETRIED);
-
-    // ZMQ_EVENT_CONNECT_RETRIED should be last event, because of timeout set above
-    int event;
-    char *event_address;
-    int rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                             SETTLE_TIME);
-    assert (rc == -1);
-
-    //  Now re-bind pub socket and wait for re-connect
-    pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, ENDPOINT_0));
-    msleep (SETTLE_TIME);
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    // ZMQ_EVENT_HANDSHAKE_SUCCEEDED should be last event
-    rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                         SETTLE_TIME);
-    assert (rc == -1);
-
-    //  Close sub
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub);
-    test_context_socket_close_zero_linger (pub);
-
-    //  Close monitor
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub_mon);
-}
-
-
-// test stopping reconnect on connection refused
-void reconnect_stop_on_refused ()
-{
-    // setup pub socket
-    void *pub = test_context_socket (ZMQ_PUB);
-    //  Bind pub socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, ENDPOINT_0));
-
-    // setup sub socket
-    void *sub = test_context_socket (ZMQ_SUB);
-    //  Monitor all events on sub
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (sub, "inproc://monitor-sub", ZMQ_EVENT_ALL));
-    //  Create socket for collecting monitor events
-    void *sub_mon = test_context_socket (ZMQ_PAIR);
-    //  Connect so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_mon, "inproc://monitor-sub"));
-    // set option to stop reconnecting on error
-    int stopReconnectOnError = ZMQ_RECONNECT_STOP_CONN_REFUSED;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_RECONNECT_STOP,
-                                               &stopReconnectOnError,
-                                               sizeof (stopReconnectOnError)));
-    // connect to pub
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, ENDPOINT_0));
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    // close the pub socket
-    test_context_socket_close_zero_linger (pub);
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_DISCONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_RETRIED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CLOSED);
-
-    // ZMQ_EVENT_CLOSED should be last event, because of ZMQ_RECONNECT_STOP set above
-    int event = 0;
-    char *event_address;
-    int rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                             2 * 1000);
-    int limit = 0;
-    while ((rc != -1) && (++limit < 1000)) {
-        print_unexpected_event_stderr (event, rc, 0, -1);
-        rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                             2 * 1000);
-    }
-
-    //  Close sub
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub);
-
-    //  Close monitor
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub_mon);
-}
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (reconnect_default);
-    RUN_TEST (reconnect_success);
-    RUN_TEST (reconnect_stop_on_refused);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_req_correlate.cpp b/tests/test_req_correlate.cpp
deleted file mode 100644
index 03a17ed87..000000000
--- a/tests/test_req_correlate.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_req_correlate ()
-{
-    void *req = test_context_socket (ZMQ_REQ);
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_CORRELATE, &enabled, sizeof (int)));
-
-    int rcvtimeo = 100;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_RCVTIMEO, &rcvtimeo, sizeof (int)));
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, my_endpoint));
-
-    // Send a multi-part request.
-    s_send_seq (req, "ABC", "DEF", SEQ_END);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    // Receive peer routing id
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&msg));
-    zmq_msg_t peer_id_msg;
-    zmq_msg_init (&peer_id_msg);
-    zmq_msg_copy (&peer_id_msg, &msg);
-
-    int more = 0;
-    size_t more_size = sizeof (more);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_RCVMORE, &more, &more_size));
-    TEST_ASSERT_TRUE (more);
-
-    // Receive request id 1
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-    TEST_ASSERT_EQUAL_UINT (sizeof (uint32_t), zmq_msg_size (&msg));
-    const uint32_t req_id = *static_cast<uint32_t *> (zmq_msg_data (&msg));
-    zmq_msg_t req_id_msg;
-    zmq_msg_init (&req_id_msg);
-    zmq_msg_copy (&req_id_msg, &msg);
-
-    more = 0;
-    more_size = sizeof (more);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_RCVMORE, &more, &more_size));
-    TEST_ASSERT_TRUE (more);
-
-    // Receive the rest.
-    s_recv_seq (router, 0, "ABC", "DEF", SEQ_END);
-
-    uint32_t bad_req_id = req_id + 1;
-
-    // Send back a bad reply: wrong req id, 0, data
-    zmq_msg_copy (&msg, &peer_id_msg);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&msg, router, ZMQ_SNDMORE));
-    zmq_msg_init_data (&msg, &bad_req_id, sizeof (uint32_t), NULL, NULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&msg, router, ZMQ_SNDMORE));
-    s_send_seq (router, 0, "DATA", SEQ_END);
-
-    // Send back a good reply: good req id, 0, data
-    zmq_msg_copy (&msg, &peer_id_msg);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&msg, router, ZMQ_SNDMORE));
-    zmq_msg_copy (&msg, &req_id_msg);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&msg, router, ZMQ_SNDMORE));
-    s_send_seq (router, 0, "GHI", SEQ_END);
-
-    // Receive reply. If bad reply got through, we wouldn't see
-    // this particular data.
-    s_recv_seq (req, "GHI", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_id_msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&req_id_msg));
-
-    test_context_socket_close_zero_linger (req);
-    test_context_socket_close_zero_linger (router);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_req_correlate);
-    return UNITY_END ();
-}
diff --git a/tests/test_req_relaxed.cpp b/tests/test_req_relaxed.cpp
deleted file mode 100644
index 7165ce912..000000000
--- a/tests/test_req_relaxed.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-const size_t services = 5;
-
-void *req;
-void *rep[services];
-
-void setUp ()
-{
-    setup_test_context ();
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    req = test_context_socket (ZMQ_REQ);
-
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_RELAXED, &enabled, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_CORRELATE, &enabled, sizeof (int)));
-
-    bind_loopback_ipv4 (req, my_endpoint, sizeof (my_endpoint));
-
-    for (size_t peer = 0; peer < services; peer++) {
-        rep[peer] = test_context_socket (ZMQ_REP);
-
-        int timeout = 500;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rep[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep[peer], my_endpoint));
-    }
-    //  We have to give the connects time to finish otherwise the requests
-    //  will not properly round-robin. We could alternatively connect the
-    //  REQ sockets to the REP sockets.
-    msleep (SETTLE_TIME);
-}
-
-void tearDown ()
-{
-    test_context_socket_close_zero_linger (req);
-    for (size_t peer = 0; peer < services; peer++)
-        test_context_socket_close_zero_linger (rep[peer]);
-
-    teardown_test_context ();
-}
-
-static void bounce (void *socket_)
-{
-    int more;
-    size_t more_size = sizeof (more);
-    do {
-        zmq_msg_t recv_part, sent_part;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&recv_part));
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&recv_part, socket_, 0));
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (socket_, ZMQ_RCVMORE, &more, &more_size));
-
-        zmq_msg_init (&sent_part);
-        zmq_msg_copy (&sent_part, &recv_part);
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&sent_part, socket_, more ? ZMQ_SNDMORE : 0));
-
-        zmq_msg_close (&recv_part);
-    } while (more);
-}
-
-static int get_events (void *socket_)
-{
-    int events;
-    size_t events_size = sizeof (events);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_EVENTS, &events, &events_size));
-    return events;
-}
-
-void test_case_1 ()
-{
-    //  Case 1: Second send() before a reply arrives in a pipe.
-
-    int events = get_events (req);
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLOUT, events);
-
-    //  Send a request, ensure it arrives, don't send a reply
-    s_send_seq (req, "A", "B", SEQ_END);
-    s_recv_seq (rep[0], "A", "B", SEQ_END);
-
-    events = get_events (req);
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLOUT, events);
-
-    //  Send another request on the REQ socket
-    s_send_seq (req, "C", "D", SEQ_END);
-    s_recv_seq (rep[1], "C", "D", SEQ_END);
-
-    events = get_events (req);
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLOUT, events);
-
-    //  Send a reply to the first request - that should be discarded by the REQ
-    s_send_seq (rep[0], "WRONG", SEQ_END);
-
-    //  Send the expected reply
-    s_send_seq (rep[1], "OK", SEQ_END);
-    s_recv_seq (req, "OK", SEQ_END);
-
-    //  Another standard req-rep cycle, just to check
-    s_send_seq (req, "E", SEQ_END);
-    s_recv_seq (rep[2], "E", SEQ_END);
-    s_send_seq (rep[2], "F", "G", SEQ_END);
-    s_recv_seq (req, "F", "G", SEQ_END);
-}
-
-void test_case_2 ()
-{
-    //  Case 2: Second send() after a reply is already in a pipe on the REQ.
-
-    // TODO instead of rerunning the previous test cases, only do the relevant parts (or change the peer)
-    test_case_1 ();
-
-    //  Send a request, ensure it arrives, send a reply
-    s_send_seq (req, "H", SEQ_END);
-    s_recv_seq (rep[3], "H", SEQ_END);
-    s_send_seq (rep[3], "BAD", SEQ_END);
-
-    //  Wait for message to be there.
-    msleep (SETTLE_TIME);
-
-    //  Without receiving that reply, send another request on the REQ socket
-    s_send_seq (req, "I", SEQ_END);
-    s_recv_seq (rep[4], "I", SEQ_END);
-
-    //  Send the expected reply
-    s_send_seq (rep[4], "GOOD", SEQ_END);
-    s_recv_seq (req, "GOOD", SEQ_END);
-}
-
-void test_case_3 ()
-{
-    //  Case 3: Check issue #1690. Two send() in a row should not close the
-    //  communication pipes. For example pipe from req to rep[0] should not be
-    //  closed after executing Case 1. So rep[0] should be the next to receive,
-    //  not rep[1].
-
-    // TODO instead of rerunning the previous test cases, only do the relevant parts (or change the peer)
-    test_case_2 ();
-
-    s_send_seq (req, "J", SEQ_END);
-    s_recv_seq (rep[0], "J", SEQ_END);
-}
-
-void test_case_4 ()
-{
-    // TODO this test case does not use the sockets from setUp
-
-    //  Case 4: Check issue #1695. As messages may pile up before a responder
-    //  is available, we check that responses to messages other than the last
-    //  sent one are correctly discarded by the REQ pipe
-
-    //  Setup REQ socket as client
-    void *req = test_context_socket (ZMQ_REQ);
-
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_RELAXED, &enabled, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_CORRELATE, &enabled, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, ENDPOINT_0));
-
-    //  Setup ROUTER socket as server but do not bind it just yet
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    //  Send two requests
-    s_send_seq (req, "TO_BE_DISCARDED", SEQ_END);
-    s_send_seq (req, "TO_BE_ANSWERED", SEQ_END);
-
-    //  Bind server allowing it to receive messages
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router, ENDPOINT_0));
-
-    //  Read the two messages and send them back as is
-    bounce (router);
-    bounce (router);
-
-    //  Read the expected correlated reply. As the ZMQ_REQ_CORRELATE is active,
-    //  the expected answer is "TO_BE_ANSWERED", not "TO_BE_DISCARDED".
-    s_recv_seq (req, "TO_BE_ANSWERED", SEQ_END);
-
-    test_context_socket_close_zero_linger (req);
-    test_context_socket_close_zero_linger (router);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_case_1);
-    RUN_TEST (test_case_2);
-    RUN_TEST (test_case_3);
-    RUN_TEST (test_case_4);
-    return UNITY_END ();
-}
diff --git a/tests/test_reqrep_device.cpp b/tests/test_reqrep_device.cpp
deleted file mode 100644
index 3b7b20703..000000000
--- a/tests/test_reqrep_device.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    char endpoint1[MAX_SOCKET_STRING];
-    char endpoint2[MAX_SOCKET_STRING];
-
-    //  Create a req/rep device.
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    bind_loopback_ipv4 (dealer, endpoint1, sizeof (endpoint1));
-
-    void *router = test_context_socket (ZMQ_ROUTER);
-    bind_loopback_ipv4 (router, endpoint2, sizeof (endpoint2));
-
-    //  Create a worker.
-    void *rep = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep, endpoint1));
-
-    //  Create a client.
-    void *req = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, endpoint2));
-
-    //  Send a request.
-    send_string_expect_success (req, "ABC", ZMQ_SNDMORE);
-    send_string_expect_success (req, "DEF", 0);
-
-    //  Pass the request through the device.
-    for (int i = 0; i != 4; i++) {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-        int rcvmore;
-        size_t sz = sizeof (rcvmore);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (router, ZMQ_RCVMORE, &rcvmore, &sz));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&msg, dealer, rcvmore ? ZMQ_SNDMORE : 0));
-    }
-
-    //  Receive the request.
-    recv_string_expect_success (rep, "ABC", 0);
-    int rcvmore;
-    size_t sz = sizeof (rcvmore);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (rep, "DEF", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-
-    //  Send the reply.
-    send_string_expect_success (rep, "GHI", ZMQ_SNDMORE);
-    send_string_expect_success (rep, "JKL", 0);
-
-    //  Pass the reply through the device.
-    for (int i = 0; i != 4; i++) {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, dealer, 0));
-        int rcvmore;
-        size_t sz = sizeof (rcvmore);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (dealer, ZMQ_RCVMORE, &rcvmore, &sz));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&msg, router, rcvmore ? ZMQ_SNDMORE : 0));
-    }
-
-    //  Receive the reply.
-    recv_string_expect_success (req, "GHI", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (req, "JKL", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-
-    //  Clean up.
-    test_context_socket_close (req);
-    test_context_socket_close (rep);
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/tests/test_reqrep_device_tipc.cpp b/tests/test_reqrep_device_tipc.cpp
deleted file mode 100644
index 930c9dad6..000000000
--- a/tests/test_reqrep_device_tipc.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// TODO this is heavily duplicated with test_reqrep_device.cpp
-void test_roundtrip ()
-{
-    //  Create a req/rep device.
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (dealer, "tipc://{5560,0,0}"));
-    void *router = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router, "tipc://{5561,0,0}"));
-
-    //  Create a worker.
-    void *rep = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep, "tipc://{5560,0}@0.0.0"));
-
-    //  Create a client.
-    void *req = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, "tipc://{5561,0}@0.0.0"));
-
-    //  Send a request.
-    send_string_expect_success (req, "ABC", ZMQ_SNDMORE);
-    send_string_expect_success (req, "DEF", 0);
-
-    //  Pass the request through the device.
-    for (int i = 0; i != 4; i++) {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-        int rcvmore;
-        size_t sz = sizeof (rcvmore);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (router, ZMQ_RCVMORE, &rcvmore, &sz));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&msg, dealer, rcvmore ? ZMQ_SNDMORE : 0));
-    }
-
-    //  Receive the request.
-    recv_string_expect_success (rep, "ABC", 0);
-    int rcvmore;
-    size_t sz = sizeof (rcvmore);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (rep, "DEF", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-
-    //  Send the reply.
-    send_string_expect_success (rep, "GHI", ZMQ_SNDMORE);
-    send_string_expect_success (rep, "JKL", 0);
-
-    //  Pass the reply through the device.
-    for (int i = 0; i != 4; i++) {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, dealer, 0));
-        int rcvmore;
-        size_t sz = sizeof (rcvmore);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (dealer, ZMQ_RCVMORE, &rcvmore, &sz));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&msg, router, rcvmore ? ZMQ_SNDMORE : 0));
-    }
-
-    //  Receive the reply.
-    recv_string_expect_success (req, "GHI", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (req, "JKL", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-
-    //  Clean up.
-    test_context_socket_close (req);
-    test_context_socket_close (rep);
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main ()
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/tests/test_reqrep_inproc.cpp b/tests/test_reqrep_inproc.cpp
deleted file mode 100644
index d12d67e0d..000000000
--- a/tests/test_reqrep_inproc.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/tests/test_reqrep_ipc.cpp b/tests/test_reqrep_ipc.cpp
deleted file mode 100644
index 90b990398..000000000
--- a/tests/test_reqrep_ipc.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_leak ()
-{
-    char my_endpoint[256];
-
-    void *sb = test_context_socket (ZMQ_REP);
-    bind_loopback_ipc (sb, my_endpoint, sizeof my_endpoint);
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    static const char leakymsg[] = "leakymsg";
-    send_string_expect_success (sc, leakymsg, 0);
-
-    char *buf = s_recv (sb);
-    free (buf);
-
-    test_context_socket_close (sc);
-
-    msleep (SETTLE_TIME);
-
-    send_string_expect_success (sb, leakymsg, 0);
-
-    test_context_socket_close (sb);
-}
-
-void test_simple (void)
-{
-    char my_endpoint[256];
-
-    void *sb = test_context_socket (ZMQ_REP);
-    bind_loopback_ipc (sb, my_endpoint, sizeof my_endpoint);
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_simple);
-    RUN_TEST (test_leak);
-    return UNITY_END ();
-}
diff --git a/tests/test_reqrep_tcp.cpp b/tests/test_reqrep_tcp.cpp
deleted file mode 100644
index c1bdf4719..000000000
--- a/tests/test_reqrep_tcp.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_single_connect (int ipv6_)
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *sb = test_context_socket (ZMQ_REP);
-    bind_loopback (sb, ipv6_, my_endpoint, len);
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    // the sockets are disconnected and unbound explicitly in this test case
-    // to check that this can be done successfully with the expected
-    // endpoints/addresses
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, my_endpoint));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, my_endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void make_connect_address (char *connect_address_,
-                           const int ipv6_,
-                           const int port_,
-                           const char *bind_address_)
-{
-    sprintf (connect_address_, "tcp://%s:%i;%s", ipv6_ ? "[::1]" : "127.0.0.1",
-             port_, strrchr (bind_address_, '/') + 1);
-}
-
-void test_multi_connect (int ipv6_)
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint_0[MAX_SOCKET_STRING];
-    char my_endpoint_1[MAX_SOCKET_STRING];
-    char my_endpoint_2[MAX_SOCKET_STRING];
-    char my_endpoint_3[MAX_SOCKET_STRING * 2];
-
-    void *sb0 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb0, ipv6_, my_endpoint_0, len);
-
-    void *sb1 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb1, ipv6_, my_endpoint_1, len);
-
-    void *sb2 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb2, ipv6_, my_endpoint_2, len);
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_1));
-    make_connect_address (my_endpoint_3, ipv6_, 5564, my_endpoint_2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_3));
-
-    bounce (sb0, sc);
-    bounce (sb1, sc);
-    bounce (sb2, sc);
-    bounce (sb0, sc);
-    bounce (sb1, sc);
-    bounce (sb2, sc);
-    bounce (sb0, sc);
-
-    /// see comment on zmq_disconnect/zmq_unbind in test_single_connect
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, my_endpoint_0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, my_endpoint_3));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, my_endpoint_1));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb0, my_endpoint_0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb1, my_endpoint_1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb2, my_endpoint_2));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb0);
-    test_context_socket_close (sb1);
-    test_context_socket_close (sb2);
-}
-
-void test_multi_connect_same_port (int ipv6_)
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint_0[MAX_SOCKET_STRING];
-    char my_endpoint_1[MAX_SOCKET_STRING];
-    char my_endpoint_2[MAX_SOCKET_STRING * 2];
-    char my_endpoint_3[MAX_SOCKET_STRING * 2];
-    char my_endpoint_4[MAX_SOCKET_STRING * 2];
-    char my_endpoint_5[MAX_SOCKET_STRING * 2];
-
-    void *sb0 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb0, ipv6_, my_endpoint_0, len);
-
-    void *sb1 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb1, ipv6_, my_endpoint_1, len);
-
-    void *sc0 = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc0, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    make_connect_address (my_endpoint_2, ipv6_, 5564, my_endpoint_0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc0, my_endpoint_2));
-    make_connect_address (my_endpoint_3, ipv6_, 5565, my_endpoint_1);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc0, my_endpoint_3));
-
-    void *sc1 = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc1, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    make_connect_address (my_endpoint_4, ipv6_, 5565, my_endpoint_0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc1, my_endpoint_4));
-    make_connect_address (my_endpoint_5, ipv6_, 5564, my_endpoint_1);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc1, my_endpoint_5));
-
-    bounce (sb0, sc0);
-    bounce (sb1, sc0);
-    bounce (sb0, sc1);
-    bounce (sb1, sc1);
-    bounce (sb0, sc0);
-    bounce (sb1, sc0);
-
-    /// see comment on zmq_disconnect/zmq_unbind in test_single_connect
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc1, my_endpoint_4));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc1, my_endpoint_5));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc0, my_endpoint_2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc0, my_endpoint_3));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb0, my_endpoint_0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb1, my_endpoint_1));
-
-    test_context_socket_close (sc0);
-    test_context_socket_close (sc1);
-    test_context_socket_close (sb0);
-    test_context_socket_close (sb1);
-}
-
-void test_single_connect_ipv4 ()
-{
-    test_single_connect (false);
-}
-
-void test_multi_connect_ipv4 ()
-{
-    test_multi_connect (false);
-}
-
-void test_multi_connect_same_port_ipv4 ()
-{
-    test_multi_connect_same_port (false);
-}
-
-void test_single_connect_ipv6 ()
-{
-    test_single_connect (true);
-}
-
-void test_multi_connect_ipv6 ()
-{
-    test_multi_connect (true);
-}
-
-void test_multi_connect_same_port_ipv6 ()
-{
-    test_multi_connect_same_port (true);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_single_connect_ipv4);
-    RUN_TEST (test_multi_connect_ipv4);
-    RUN_TEST (test_multi_connect_same_port_ipv4);
-    RUN_TEST (test_single_connect_ipv6);
-    RUN_TEST (test_multi_connect_ipv6);
-    RUN_TEST (test_multi_connect_same_port_ipv6);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_reqrep_tipc.cpp b/tests/test_reqrep_tipc.cpp
deleted file mode 100644
index c4b64c8fc..000000000
--- a/tests/test_reqrep_tipc.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tipc://{5560,0,0}"));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "tipc://{5560,0}@0.0.0"));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_reqrep_vmci.cpp b/tests/test_reqrep_vmci.cpp
deleted file mode 100644
index 0672f68de..000000000
--- a/tests/test_reqrep_vmci.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string>
-#include <sstream>
-#include <vmci_sockets.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_reqrep_vmci ()
-{
-    std::stringstream s;
-    s << "vmci://" << VMCISock_GetLocalCID () << ":" << 5560;
-    std::string endpoint = s.str ();
-
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, endpoint.c_str ()));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint.c_str ()));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_reqrep_vmci);
-    return UNITY_END ();
-}
diff --git a/tests/test_router_handover.cpp b/tests/test_router_handover.cpp
deleted file mode 100644
index 65cd82eda..000000000
--- a/tests/test_router_handover.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_with_handover ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *router = test_context_socket (ZMQ_ROUTER);
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    // Enable the handover flag
-    int handover = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_ROUTER_HANDOVER,
-                                               &handover, sizeof (handover)));
-
-    //  Create dealer called "X" and connect it to our router
-    void *dealer_one = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_one, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer_one, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    char buffer[255];
-    send_string_expect_success (dealer_one, "Hello", 0);
-
-    recv_string_expect_success (router, "X", 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    // Now create a second dealer that uses the same routing id
-    void *dealer_two = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_two, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer_two, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    send_string_expect_success (dealer_two, "Hello", 0);
-
-    recv_string_expect_success (router, "X", 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    //  Send a message to 'X' routing id. This should be delivered
-    //  to the second dealer, instead of the first because of the handover.
-    send_string_expect_success (router, "X", ZMQ_SNDMORE);
-    send_string_expect_success (router, "Hello", 0);
-
-    //  Ensure that the first dealer doesn't receive the message
-    //  but the second one does
-    const int timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_one, ZMQ_RCVTIMEO, &timeout, sizeof timeout));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (dealer_one, buffer, 255, 0));
-
-    recv_string_expect_success (dealer_two, "Hello", 0);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer_one);
-    test_context_socket_close (dealer_two);
-}
-
-void test_without_handover ()
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router, "tcp://127.0.0.1:*"));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_LAST_ENDPOINT, my_endpoint, &len));
-
-    //  Create dealer called "X" and connect it to our router
-    void *dealer_one = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_one, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer_one, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    char buffer[255];
-    send_string_expect_success (dealer_one, "Hello", 0);
-
-    recv_string_expect_success (router, "X", 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    // Now create a second dealer that uses the same routing id
-    void *dealer_two = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_two, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer_two, my_endpoint));
-
-    //  Send message from second dealer
-    send_string_expect_success (dealer_two, "Hello", 0);
-
-    //  This should be ignored by the router
-    const int timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_RCVTIMEO, &timeout, sizeof timeout));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (router, buffer, 255, 0));
-
-    //  Send a message to 'X' routing id. This should be delivered
-    //  to the second dealer, instead of the first because of the handover.
-    send_string_expect_success (router, "X", ZMQ_SNDMORE);
-    send_string_expect_success (router, "Hello", 0);
-
-    //  Ensure that the second dealer doesn't receive the message
-    //  but the first one does
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_two, ZMQ_RCVTIMEO, &timeout, sizeof timeout));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (dealer_two, buffer, 255, 0));
-
-    recv_string_expect_success (dealer_one, "Hello", 0);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer_one);
-    test_context_socket_close (dealer_two);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_with_handover);
-    RUN_TEST (test_without_handover);
-    return UNITY_END ();
-}
diff --git a/tests/test_router_mandatory.cpp b/tests/test_router_mandatory.cpp
deleted file mode 100644
index 021f6715e..000000000
--- a/tests/test_router_mandatory.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#ifdef ZMQ_BUILD_DRAFT_API
-bool send_msg_to_peer_if_ready (void *router_, const char *peer_routing_id_)
-{
-    int rc = TEST_ASSERT_SUCCESS_MESSAGE_ERRNO (
-      zmq_socket_get_peer_state (router_, peer_routing_id_, 1),
-      peer_routing_id_);
-    if (rc & ZMQ_POLLOUT) {
-        send_string_expect_success (router_, peer_routing_id_,
-                                    ZMQ_SNDMORE | ZMQ_DONTWAIT);
-        send_string_expect_success (router_, "Hello", ZMQ_DONTWAIT);
-
-        return true;
-    }
-    return false;
-}
-#endif
-
-void test_get_peer_state ()
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    int mandatory = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_ROUTER_MANDATORY,
-                                               &mandatory, sizeof (mandatory)));
-
-    const char *my_endpoint = "inproc://test_get_peer_state";
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router, my_endpoint));
-
-    void *dealer1 = test_context_socket (ZMQ_DEALER);
-    void *dealer2 = test_context_socket (ZMQ_DEALER);
-
-    //  Lower HWMs to allow doing the test with fewer messages
-    const int hwm = 100;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_SNDHWM, &hwm, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer1, ZMQ_RCVHWM, &hwm, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer2, ZMQ_RCVHWM, &hwm, sizeof (int)));
-
-    const char *dealer1_routing_id = "X";
-    const char *dealer2_routing_id = "Y";
-
-    //  Name dealer1 "X" and connect it to our router
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer1, ZMQ_ROUTING_ID, dealer1_routing_id, 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer1, my_endpoint));
-
-    //  Name dealer2 "Y" and connect it to our router
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer2, ZMQ_ROUTING_ID, dealer2_routing_id, 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer2, my_endpoint));
-
-    //  Get message from both dealers to know when connection is ready
-    send_string_expect_success (dealer1, "Hello", 0);
-    recv_string_expect_success (router, dealer1_routing_id, 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    send_string_expect_success (dealer2, "Hello", 0);
-    recv_string_expect_success (router, dealer2_routing_id, 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    //  Poll on router and dealer1, but not on dealer2
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, router, NULL, ZMQ_POLLOUT));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, dealer1, NULL, ZMQ_POLLIN));
-
-    const unsigned int count = 10000;
-    const unsigned int event_size = 2;
-    bool dealer2_blocked = false;
-    unsigned int dealer1_sent = 0, dealer2_sent = 0, dealer1_received = 0;
-    zmq_poller_event_t events[event_size];
-    for (unsigned int iteration = 0; iteration < count; ++iteration) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_poller_wait_all (poller, events, event_size, -1));
-        for (unsigned int event_no = 0; event_no < event_size; ++event_no) {
-            const zmq_poller_event_t &current_event = events[event_no];
-            if (current_event.socket == router
-                && current_event.events & ZMQ_POLLOUT) {
-                if (send_msg_to_peer_if_ready (router, dealer1_routing_id))
-                    ++dealer1_sent;
-
-                if (send_msg_to_peer_if_ready (router, dealer2_routing_id))
-                    ++dealer2_sent;
-                else
-                    dealer2_blocked = true;
-            }
-            if (current_event.socket == dealer1
-                && current_event.events & ZMQ_POLLIN) {
-                recv_string_expect_success (dealer1, "Hello", ZMQ_DONTWAIT);
-                int more;
-                size_t more_size = sizeof (more);
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_getsockopt (dealer1, ZMQ_RCVMORE, &more, &more_size));
-                TEST_ASSERT_FALSE (more);
-
-                ++dealer1_received;
-            }
-            // never read from dealer2, so its pipe becomes full eventually
-        }
-    }
-    printf ("dealer1_sent = %u, dealer2_sent = %u, dealer1_received = %u\n",
-            dealer1_sent, dealer2_sent, dealer1_received);
-    TEST_ASSERT_TRUE (dealer2_blocked);
-    zmq_poller_destroy (&poller);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer1);
-    test_context_socket_close (dealer2);
-#endif
-}
-
-void test_get_peer_state_corner_cases ()
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    const char peer_routing_id[] = "foo";
-
-    //  call get_peer_state with NULL socket
-    int rc = zmq_socket_get_peer_state (NULL, peer_routing_id,
-                                        strlen (peer_routing_id));
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno);
-
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    //  call get_peer_state with a non-ROUTER socket
-    rc = zmq_socket_get_peer_state (dealer, peer_routing_id,
-                                    strlen (peer_routing_id));
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSUP, errno);
-
-    //  call get_peer_state for an unknown routing id
-    rc = zmq_socket_get_peer_state (router, peer_routing_id,
-                                    strlen (peer_routing_id));
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EHOSTUNREACH, errno);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-#endif
-}
-
-void test_basic ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *router = test_context_socket (ZMQ_ROUTER);
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    //  Send a message to an unknown peer with the default setting
-    //  This will not report any error
-    send_string_expect_success (router, "UNKNOWN", ZMQ_SNDMORE);
-    send_string_expect_success (router, "DATA", 0);
-
-    //  Send a message to an unknown peer with mandatory routing
-    //  This will fail
-    int mandatory = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_ROUTER_MANDATORY,
-                                               &mandatory, sizeof (mandatory)));
-    int rc = zmq_send (router, "UNKNOWN", 7, ZMQ_SNDMORE);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EHOSTUNREACH, errno);
-
-    //  Create dealer called "X" and connect it to our router
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (dealer, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    send_string_expect_success (dealer, "Hello", 0);
-    recv_string_expect_success (router, "X", 0);
-
-    //  Send a message to connected dealer now
-    //  It should work
-    send_string_expect_success (router, "X", ZMQ_SNDMORE);
-    send_string_expect_success (router, "Hello", 0);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_basic);
-    RUN_TEST (test_get_peer_state);
-    RUN_TEST (test_get_peer_state_corner_cases);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_router_mandatory_hwm.cpp b/tests/test_router_mandatory_hwm.cpp
deleted file mode 100644
index 870365b3a..000000000
--- a/tests/test_router_mandatory_hwm.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// DEBUG shouldn't be defined in sources as it will cause a redefined symbol
-// error when it is defined in the build configuration. It appears that the
-// intent here is to semi-permanently disable DEBUG tracing statements, so the
-// implementation is changed to accomodate that intent.
-//#define DEBUG 0
-#define TRACE_ENABLED 0
-
-void test_router_mandatory_hwm ()
-{
-    if (TRACE_ENABLED)
-        fprintf (stderr, "Staring router mandatory HWM test ...\n");
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    // Configure router socket to mandatory routing and set HWM and linger
-    int mandatory = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_ROUTER_MANDATORY,
-                                               &mandatory, sizeof (mandatory)));
-    int sndhwm = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm)));
-    int linger = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_LINGER, &linger, sizeof (linger)));
-
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    //  Create dealer called "X" and connect it to our router, configure HWM
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (dealer, ZMQ_ROUTING_ID, "X", 1));
-    int rcvhwm = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_RCVHWM, &rcvhwm, sizeof (rcvhwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    send_string_expect_success (dealer, "Hello", 0);
-    recv_string_expect_success (router, "X", 0);
-
-    int i;
-    const int buf_size = 65536;
-    const uint8_t buf[buf_size] = {0};
-    // Send first batch of messages
-    for (i = 0; i < 100000; ++i) {
-        if (TRACE_ENABLED)
-            fprintf (stderr, "Sending message %d ...\n", i);
-        const int rc = zmq_send (router, "X", 1, ZMQ_DONTWAIT | ZMQ_SNDMORE);
-        if (rc == -1 && zmq_errno () == EAGAIN)
-            break;
-        TEST_ASSERT_EQUAL_INT (1, rc);
-        send_array_expect_success (router, buf, ZMQ_DONTWAIT);
-    }
-    // This should fail after one message but kernel buffering could
-    // skew results
-    TEST_ASSERT_LESS_THAN_INT (10, i);
-    msleep (1000);
-    // Send second batch of messages
-    for (; i < 100000; ++i) {
-        if (TRACE_ENABLED)
-            fprintf (stderr, "Sending message %d (part 2) ...\n", i);
-        const int rc = zmq_send (router, "X", 1, ZMQ_DONTWAIT | ZMQ_SNDMORE);
-        if (rc == -1 && zmq_errno () == EAGAIN)
-            break;
-        TEST_ASSERT_EQUAL_INT (1, rc);
-        send_array_expect_success (router, buf, ZMQ_DONTWAIT);
-    }
-    // This should fail after two messages but kernel buffering could
-    // skew results
-    TEST_ASSERT_LESS_THAN_INT (20, i);
-
-    if (TRACE_ENABLED)
-        fprintf (stderr, "Done sending messages.\n");
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_router_mandatory_hwm);
-    return UNITY_END ();
-}
diff --git a/tests/test_router_mandatory_tipc.cpp b/tests/test_router_mandatory_tipc.cpp
deleted file mode 100644
index af9b25683..000000000
--- a/tests/test_router_mandatory_tipc.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdio.h>
-#include "testutil.hpp"
-
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_router_mandatory_tipc ()
-{
-    if (!is_tipc_available ()) {
-        TEST_IGNORE_MESSAGE ("TIPC environment unavailable, skipping test");
-    }
-
-    // Creating the first socket.
-    void *sa = test_context_socket (ZMQ_ROUTER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sa, "tipc://{15560,0,0}"));
-
-    // Sending a message to an unknown peer with the default setting
-    send_string_expect_success (sa, "UNKNOWN", ZMQ_SNDMORE);
-    send_string_expect_success (sa, "DATA", 0);
-
-    int mandatory = 1;
-
-    // Set mandatory routing on socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sa, ZMQ_ROUTER_MANDATORY,
-                                               &mandatory, sizeof (mandatory)));
-
-    // Send a message and check that it fails
-    TEST_ASSERT_FAILURE_ERRNO (
-      EHOSTUNREACH, zmq_send (sa, "UNKNOWN", 7, ZMQ_SNDMORE | ZMQ_DONTWAIT));
-
-    test_context_socket_close (sa);
-}
-
-int main (void)
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_router_mandatory_tipc);
-    return UNITY_END ();
-}
diff --git a/tests/test_router_notify.cpp b/tests/test_router_notify.cpp
deleted file mode 100644
index ff3ca4b8c..000000000
--- a/tests/test_router_notify.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_sockopt_router_notify ()
-{
-    void *router = test_context_socket (ZMQ_ROUTER);
-    int opt_notify;
-
-    int opt_notify_read;
-    size_t opt_notify_read_size = sizeof (opt_notify_read);
-
-
-    // default value is off when socket is constructed
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (0, opt_notify_read);
-
-
-    // valid value - Connect
-    opt_notify = ZMQ_NOTIFY_CONNECT;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (opt_notify, opt_notify_read);
-
-
-    // valid value - Disconnect
-    opt_notify = ZMQ_NOTIFY_DISCONNECT;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (opt_notify, opt_notify_read);
-
-
-    // valid value - Off
-    opt_notify = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (opt_notify, opt_notify_read);
-
-
-    // valid value - Both
-    opt_notify = ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (opt_notify, opt_notify_read);
-
-
-    // value boundary
-    opt_notify = -1;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_setsockopt (router, ZMQ_ROUTER_NOTIFY, &opt_notify,
-                              sizeof (opt_notify)));
-
-    opt_notify = (ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT) + 1;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_setsockopt (router, ZMQ_ROUTER_NOTIFY, &opt_notify,
-                              sizeof (opt_notify)));
-
-    // failures don't update the value
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT,
-                       opt_notify_read);
-
-
-    test_context_socket_close (router);
-
-
-    // check a non-router socket type
-    void *dealer = test_context_socket (ZMQ_DEALER);
-
-    // setsockopt fails for non-router sockets
-    opt_notify = ZMQ_NOTIFY_CONNECT;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_setsockopt (dealer, ZMQ_ROUTER_NOTIFY, &opt_notify,
-                              sizeof (opt_notify)));
-
-    // getsockopts returns off for any non-router socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      dealer, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (0, opt_notify_read);
-
-
-    test_context_socket_close (dealer);
-}
-
-
-void test_router_notify_helper (int opt_notify_)
-{
-    void *router = test_context_socket (ZMQ_ROUTER);
-    int opt_more;
-    size_t opt_more_length = sizeof (opt_more);
-    int opt_events;
-    size_t opt_events_length = sizeof (opt_events);
-    char connect_address[MAX_SOCKET_STRING];
-
-
-    // valid values
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_, sizeof (opt_notify_)));
-
-    bind_loopback_ipv4 (router, connect_address, sizeof connect_address);
-
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    const char *dealer_routing_id = "X";
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_ROUTING_ID, dealer_routing_id, 1));
-
-    // dealer connects
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, connect_address));
-
-    // connection notification msg
-    if (opt_notify_ & ZMQ_NOTIFY_CONNECT) {
-        // routing-id only message of the connect
-        recv_string_expect_success (router, dealer_routing_id,
-                                    0);             // 1st part: routing-id
-        recv_string_expect_success (router, "", 0); // 2nd part: empty
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (router, ZMQ_RCVMORE, &opt_more, &opt_more_length));
-        TEST_ASSERT_EQUAL (0, opt_more);
-    }
-
-    // test message from the dealer
-    send_string_expect_success (dealer, "Hello", 0);
-    recv_string_expect_success (router, dealer_routing_id, 0);
-    recv_string_expect_success (router, "Hello", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_RCVMORE, &opt_more, &opt_more_length));
-    TEST_ASSERT_EQUAL (0, opt_more);
-
-    // dealer disconnects
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (dealer, connect_address));
-
-    // need one more process_commands() (???)
-    msleep (SETTLE_TIME);
-    zmq_getsockopt (dealer, ZMQ_EVENTS, &opt_events, &opt_events_length);
-
-    // connection notification msg
-    if (opt_notify_ & ZMQ_NOTIFY_DISCONNECT) {
-        // routing-id only message of the connect
-        recv_string_expect_success (router, dealer_routing_id,
-                                    0);             // 1st part: routing-id
-        recv_string_expect_success (router, "", 0); // 2nd part: empty
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (router, ZMQ_RCVMORE, &opt_more, &opt_more_length));
-        TEST_ASSERT_EQUAL (0, opt_more);
-    }
-
-    test_context_socket_close (dealer);
-    test_context_socket_close (router);
-}
-
-
-void test_router_notify_connect ()
-{
-    test_router_notify_helper (ZMQ_NOTIFY_CONNECT);
-}
-
-
-void test_router_notify_disconnect ()
-{
-    test_router_notify_helper (ZMQ_NOTIFY_DISCONNECT);
-}
-
-
-void test_router_notify_both ()
-{
-    test_router_notify_helper (ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT);
-}
-
-
-void test_handshake_fail ()
-{
-    // setup router socket
-    void *router = test_context_socket (ZMQ_ROUTER);
-    int opt_timeout = 200;
-    int opt_notify = ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT;
-    char connect_address[MAX_SOCKET_STRING];
-
-    // valid values
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_RCVTIMEO, &opt_timeout, sizeof (opt_timeout)));
-
-    bind_loopback_ipv4 (router, connect_address, sizeof connect_address);
-
-    // send something on raw tcp
-    void *stream = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (stream, connect_address));
-
-    send_string_expect_success (stream, "not-a-handshake", 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (stream, connect_address));
-    test_context_socket_close (stream);
-
-    // no notification delivered
-    char buffer[255];
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_recv (router, buffer, sizeof (buffer), 0));
-
-    test_context_socket_close (router);
-}
-
-
-void test_error_during_multipart ()
-{
-    /*
-     * If the disconnect occurs in the middle of the multipart
-     * message, the socket should not add the notification at the
-     * end of the incomplete message. It must discard the incomplete
-     * message, and delivert the notification as a new message.
-     */
-
-    char connect_address[MAX_SOCKET_STRING];
-    char long_str[128] = {0};
-    memset (long_str, '*', sizeof (long_str) - 1);
-
-    // setup router
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    int opt_notify = ZMQ_NOTIFY_DISCONNECT;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    int64_t opt_maxmsgsize = 64; // the handshake fails if this is too small
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_MAXMSGSIZE, &opt_maxmsgsize, sizeof (opt_maxmsgsize)));
-
-    bind_loopback_ipv4 (router, connect_address, sizeof connect_address);
-
-    // setup dealer
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    const char *dealer_routing_id = "X";
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_ROUTING_ID, dealer_routing_id, 1));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, connect_address));
-
-
-    // send multipart message, the 2nd part causes a disconnect.
-    send_string_expect_success (dealer, "Hello2", ZMQ_SNDMORE);
-    send_string_expect_success (dealer, long_str, 0);
-
-    // disconnect notification
-    recv_string_expect_success (router, dealer_routing_id, 0);
-    recv_string_expect_success (router, "", 0);
-
-
-    test_context_socket_close (dealer);
-    test_context_socket_close (router);
-}
-
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_sockopt_router_notify);
-    RUN_TEST (test_router_notify_connect);
-    RUN_TEST (test_router_notify_disconnect);
-    RUN_TEST (test_router_notify_both);
-    RUN_TEST (test_handshake_fail);
-    RUN_TEST (test_error_during_multipart);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_scatter_gather.cpp b/tests/test_scatter_gather.cpp
deleted file mode 100644
index 275f155fd..000000000
--- a/tests/test_scatter_gather.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_scatter_gather_multipart_fails ()
-{
-    void *scatter = test_context_socket (ZMQ_SCATTER);
-    void *gather = test_context_socket (ZMQ_GATHER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (scatter, "inproc://test-scatter-gather"));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (gather, "inproc://test-scatter-gather"));
-
-    //  Should fail, multipart is not supported
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_send_const (scatter, "1", 1, ZMQ_SNDMORE));
-
-    test_context_socket_close (scatter);
-    test_context_socket_close (gather);
-}
-
-void test_scatter_gather ()
-{
-    void *scatter = test_context_socket (ZMQ_SCATTER);
-    void *gather = test_context_socket (ZMQ_GATHER);
-    void *gather2 = test_context_socket (ZMQ_GATHER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (scatter, "inproc://test-scatter-gather"));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (gather, "inproc://test-scatter-gather"));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (gather2, "inproc://test-scatter-gather"));
-
-    send_string_expect_success (scatter, "1", 0);
-    send_string_expect_success (scatter, "2", 0);
-
-    recv_string_expect_success (gather, "1", 0);
-    recv_string_expect_success (gather2, "2", 0);
-
-    test_context_socket_close (scatter);
-    test_context_socket_close (gather);
-    test_context_socket_close (gather2);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_scatter_gather);
-    RUN_TEST (test_scatter_gather_multipart_fails);
-    return UNITY_END ();
-}
diff --git a/tests/test_security_curve.cpp b/tests/test_security_curve.cpp
deleted file mode 100644
index 45de75816..000000000
--- a/tests/test_security_curve.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// TODO remove this workaround for handling libsodium/tweetnacl
-
-//  To define SIZE_MAX with older compilers
-#define __STDC_LIMIT_MACROS
-
-#if defined ZMQ_CUSTOM_PLATFORM_HPP
-#include "platform.hpp"
-#else
-#include "../src/platform.hpp"
-#endif
-
-#ifndef ZMQ_USE_TWEETNACL
-#define ZMQ_USE_TWEETNACL
-#endif
-#ifdef ZMQ_USE_LIBSODIUM
-#undef ZMQ_USE_LIBSODIUM
-#endif
-
-#include "testutil.hpp"
-#include "testutil_security.hpp"
-#include <unity.h>
-
-#include "../src/tweetnacl.h"
-#include "../src/curve_client_tools.hpp"
-#include "../src/random.hpp"
-
-char error_message_buffer[256];
-
-void *handler;
-void *zap_thread;
-void *server;
-void *server_mon;
-char my_endpoint[MAX_SOCKET_STRING];
-
-void setUp ()
-{
-    setup_test_context ();
-    setup_context_and_server_side (&handler, &zap_thread, &server, &server_mon,
-                                   my_endpoint);
-}
-
-void tearDown ()
-{
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-    teardown_test_context ();
-}
-
-const int timeout = 250;
-
-const char large_routing_id[] = "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "012345678901234";
-
-static void zap_handler_large_routing_id (void * /*unused_*/)
-{
-    zap_handler_generic (zap_ok, large_routing_id);
-}
-
-void expect_new_client_curve_bounce_fail (const char *server_public_,
-                                          const char *client_public_,
-                                          const char *client_secret_,
-                                          char *my_endpoint_,
-                                          void *server_,
-                                          void **client_mon_ = NULL,
-                                          int expected_client_event_ = 0,
-                                          int expected_client_value_ = 0)
-{
-    curve_client_data_t curve_client_data = {server_public_, client_public_,
-                                             client_secret_};
-    expect_new_client_bounce_fail (
-      my_endpoint_, server_, socket_config_curve_client, &curve_client_data,
-      client_mon_, expected_client_event_, expected_client_value_);
-}
-
-void test_null_key (void *server_,
-                    void *server_mon_,
-                    char *my_endpoint_,
-                    char *server_public_,
-                    char *client_public_,
-                    char *client_secret_)
-{
-    expect_new_client_curve_bounce_fail (server_public_, client_public_,
-                                         client_secret_, my_endpoint_, server_);
-
-    int handshake_failed_encryption_event_count =
-      expect_monitor_event_multiple (server_mon_,
-                                     ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                     ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-    // handshake_failed_encryption_event_count should be at least two because
-    // expect_bounce_fail involves two exchanges
-    // however, with valgrind we see only one event (maybe the next one takes
-    // very long, or does not happen at all because something else takes very
-    // long)
-
-    fprintf (stderr,
-             "count of "
-             "ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL/"
-             "ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC events: %i\n",
-             handshake_failed_encryption_event_count);
-}
-
-void test_curve_security_with_valid_credentials ()
-{
-    curve_client_data_t curve_client_data = {
-      valid_server_public, valid_client_public, valid_client_secret};
-    void *client_mon;
-    void *client = create_and_connect_client (
-      my_endpoint, socket_config_curve_client, &curve_client_data, &client_mon);
-    bounce (server, client);
-    test_context_socket_close (client);
-
-    int event = get_monitor_event_with_timeout (server_mon, NULL, NULL, -1);
-    assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    assert_no_more_monitor_events_with_timeout (server_mon, timeout);
-
-    event = get_monitor_event_with_timeout (client_mon, NULL, NULL, -1);
-    assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    assert_no_more_monitor_events_with_timeout (client_mon, timeout);
-
-    test_context_socket_close (client_mon);
-}
-
-void test_curve_security_with_bogus_client_credentials ()
-{
-    //  This must be caught by the ZAP handler
-    char bogus_public[41];
-    char bogus_secret[41];
-    zmq_curve_keypair (bogus_public, bogus_secret);
-
-    expect_new_client_curve_bounce_fail (
-      valid_server_public, bogus_public, bogus_secret, my_endpoint, server,
-      NULL, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 400);
-
-    int server_event_count = 0;
-    server_event_count = expect_monitor_event_multiple (
-      server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 400);
-    TEST_ASSERT_LESS_OR_EQUAL_INT (1, server_event_count);
-
-    // there may be more than one ZAP request due to repeated attempts by the client
-    TEST_ASSERT (0 == server_event_count
-                 || 1 <= zmq_atomic_counter_value (zap_requests_handled));
-}
-
-void expect_zmtp_mechanism_mismatch (void *client_,
-                                     char *my_endpoint_,
-                                     void *server_,
-                                     void *server_mon_)
-{
-    //  This must be caught by the curve_server class, not passed to ZAP
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client_, my_endpoint_));
-    expect_bounce_fail (server_, client_);
-    test_context_socket_close_zero_linger (client_);
-
-    expect_monitor_event_multiple (server_mon_,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH);
-
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_value (zap_requests_handled));
-}
-
-void test_curve_security_with_null_client_credentials ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-
-    expect_zmtp_mechanism_mismatch (client, my_endpoint, server, server_mon);
-}
-
-void test_curve_security_with_plain_client_credentials ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, "admin", 5));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, "password", 8));
-
-    expect_zmtp_mechanism_mismatch (client, my_endpoint, server, server_mon);
-}
-
-void test_curve_security_unauthenticated_message ()
-{
-    // Unauthenticated messages from a vanilla socket shouldn't be received
-    fd_t s = connect_socket (my_endpoint);
-    // send anonymous ZMTP/1.0 greeting
-    send (s, "\x01\x00", 2, 0);
-    // send sneaky message that shouldn't be received
-    send (s, "\x08\x00sneaky\0", 9, 0);
-
-    zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout));
-    char *buf = s_recv (server);
-    TEST_ASSERT_NULL_MESSAGE (buf, "Received unauthenticated message");
-    close (s);
-}
-
-void send_all (fd_t fd_, const char *data_, socket_size_t size_)
-{
-    while (size_ > 0) {
-        int res = send (fd_, data_, size_, 0);
-        TEST_ASSERT_GREATER_THAN_INT (0, res);
-        size_ -= res;
-        data_ += res;
-    }
-}
-
-template <size_t N> void send (fd_t fd_, const char (&data_)[N])
-{
-    send_all (fd_, data_, N - 1);
-}
-
-template <size_t N> void send (fd_t fd_, const uint8_t (&data_)[N])
-{
-    send_all (fd_, reinterpret_cast<const char *> (&data_), N);
-}
-
-void test_curve_security_invalid_hello_wrong_length ()
-{
-    fd_t s = connect_socket (my_endpoint);
-
-    send (s, zmtp_greeting_curve);
-
-    // send CURVE HELLO of wrong size
-    send (s, "\x04\x06\x05HELLO");
-
-    expect_monitor_event_multiple (
-      server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-      ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-
-    close (s);
-}
-
-const size_t hello_length = 200;
-const size_t welcome_length = 168;
-
-zmq::curve_client_tools_t make_curve_client_tools ()
-{
-    uint8_t valid_client_secret_decoded[32];
-    uint8_t valid_client_public_decoded[32];
-
-    zmq_z85_decode (valid_client_public_decoded, valid_client_public);
-    zmq_z85_decode (valid_client_secret_decoded, valid_client_secret);
-
-    uint8_t valid_server_public_decoded[32];
-    zmq_z85_decode (valid_server_public_decoded, valid_server_public);
-
-    return zmq::curve_client_tools_t (valid_client_public_decoded,
-                                      valid_client_secret_decoded,
-                                      valid_server_public_decoded);
-}
-
-// same as htonll, which is only available on few platforms (recent Windows, but not on Linux, e.g.(
-static uint64_t host_to_network (uint64_t value_)
-{
-    // The answer is 42
-    static const int num = 42;
-
-    // Check the endianness
-    if (*reinterpret_cast<const char *> (&num) == num) {
-        const uint32_t high_part = htonl (static_cast<uint32_t> (value_ >> 32));
-        const uint32_t low_part =
-          htonl (static_cast<uint32_t> (value_ & 0xFFFFFFFFLL));
-
-        return (static_cast<uint64_t> (low_part) << 32) | high_part;
-    }
-    return value_;
-}
-
-template <size_t N> void send_command (fd_t s_, char (&command_)[N])
-{
-    if (N < 256) {
-        send (s_, "\x04");
-        char len = (char) N;
-        send_all (s_, &len, 1);
-    } else {
-        send (s_, "\x06");
-        uint64_t len = host_to_network (N);
-        send_all (s_, reinterpret_cast<char *> (&len), 8);
-    }
-    send_all (s_, command_, N);
-}
-
-void test_curve_security_invalid_hello_command_name ()
-{
-    fd_t s = connect_socket (my_endpoint);
-
-    send (s, zmtp_greeting_curve);
-
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-
-    // send CURVE HELLO with a misspelled command name (but otherwise correct)
-    char hello[hello_length];
-    TEST_ASSERT_SUCCESS_ERRNO (tools.produce_hello (hello, 0));
-    hello[5] = 'X';
-
-    send_command (s, hello);
-
-    expect_monitor_event_multiple (server_mon,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-
-    close (s);
-}
-
-void test_curve_security_invalid_hello_version ()
-{
-    fd_t s = connect_socket (my_endpoint);
-
-    send (s, zmtp_greeting_curve);
-
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-
-    // send CURVE HELLO with a wrong version number (but otherwise correct)
-    char hello[hello_length];
-    TEST_ASSERT_SUCCESS_ERRNO (tools.produce_hello (hello, 0));
-    hello[6] = 2;
-
-    send_command (s, hello);
-
-    expect_monitor_event_multiple (
-      server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-      ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-
-    close (s);
-}
-
-void flush_read (fd_t fd_)
-{
-    int res;
-    char buf[256];
-
-    while ((res = recv (fd_, buf, 256, 0)) == 256) {
-    }
-    TEST_ASSERT_NOT_EQUAL (-1, res);
-}
-
-void recv_all (fd_t fd_, uint8_t *data_, socket_size_t len_)
-{
-    socket_size_t received = 0;
-    while (received < len_) {
-        int res = recv (fd_, reinterpret_cast<char *> (data_), len_, 0);
-        TEST_ASSERT_GREATER_THAN_INT (0, res);
-
-        data_ += res;
-        received += res;
-    }
-}
-
-void recv_greeting (fd_t fd_)
-{
-    uint8_t greeting[64];
-    recv_all (fd_, greeting, 64);
-    //  TODO assert anything about the greeting received from the server?
-}
-
-fd_t connect_exchange_greeting_and_send_hello (
-  char *my_endpoint_, zmq::curve_client_tools_t &tools_)
-{
-    fd_t s = connect_socket (my_endpoint_);
-
-    send (s, zmtp_greeting_curve);
-    recv_greeting (s);
-
-    // send valid CURVE HELLO
-    char hello[hello_length];
-    TEST_ASSERT_SUCCESS_ERRNO (tools_.produce_hello (hello, 0));
-
-    send_command (s, hello);
-    return s;
-}
-
-void test_curve_security_invalid_initiate_wrong_length ()
-{
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-
-    fd_t s = connect_exchange_greeting_and_send_hello (my_endpoint, tools);
-
-    // receive but ignore WELCOME
-    flush_read (s);
-
-    int res = get_monitor_event_with_timeout (server_mon, NULL, NULL, timeout);
-    TEST_ASSERT_EQUAL_INT (-1, res);
-
-    send (s, "\x04\x09\x08INITIATE");
-
-    expect_monitor_event_multiple (
-      server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-      ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-
-    close (s);
-}
-
-fd_t connect_exchange_greeting_and_hello_welcome (
-  char *my_endpoint_,
-  void *server_mon_,
-  int timeout_,
-  zmq::curve_client_tools_t &tools_)
-{
-    fd_t s = connect_exchange_greeting_and_send_hello (my_endpoint_, tools_);
-
-    // receive but ignore WELCOME
-    uint8_t welcome[welcome_length + 2];
-    recv_all (s, welcome, welcome_length + 2);
-
-    uint8_t cn_precom[crypto_box_BEFORENMBYTES];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      tools_.process_welcome (welcome + 2, welcome_length, cn_precom));
-
-    const int res =
-      get_monitor_event_with_timeout (server_mon_, NULL, NULL, timeout_);
-    TEST_ASSERT_EQUAL_INT (-1, res);
-
-    return s;
-}
-
-void test_curve_security_invalid_initiate_command_name ()
-{
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-    fd_t s = connect_exchange_greeting_and_hello_welcome (
-      my_endpoint, server_mon, timeout, tools);
-
-    char initiate[257];
-    tools.produce_initiate (initiate, 257, 1, NULL, 0);
-    // modify command name
-    initiate[5] = 'X';
-
-    send_command (s, initiate);
-
-    expect_monitor_event_multiple (server_mon,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-
-    close (s);
-}
-
-void test_curve_security_invalid_initiate_command_encrypted_cookie ()
-{
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-    fd_t s = connect_exchange_greeting_and_hello_welcome (
-      my_endpoint, server_mon, timeout, tools);
-
-    char initiate[257];
-    tools.produce_initiate (initiate, 257, 1, NULL, 0);
-    // make garbage from encrypted cookie
-    initiate[30] = !initiate[30];
-
-    send_command (s, initiate);
-
-    expect_monitor_event_multiple (server_mon,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-    close (s);
-}
-
-void test_curve_security_invalid_initiate_command_encrypted_content ()
-{
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-    fd_t s = connect_exchange_greeting_and_hello_welcome (
-      my_endpoint, server_mon, timeout, tools);
-
-    char initiate[257];
-    tools.produce_initiate (initiate, 257, 1, NULL, 0);
-    // make garbage from encrypted content
-    initiate[150] = !initiate[150];
-
-    send_command (s, initiate);
-
-    expect_monitor_event_multiple (server_mon,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-    close (s);
-}
-
-void test_curve_security_invalid_keysize (void *ctx_)
-{
-    //  Check return codes for invalid buffer sizes
-    void *client = zmq_socket (ctx_, ZMQ_DEALER);
-    TEST_ASSERT_NOT_NULL (client);
-    errno = 0;
-    int rc =
-      zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, valid_server_public, 123);
-    assert (rc == -1 && errno == EINVAL);
-    errno = 0;
-    rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, valid_client_public, 123);
-    assert (rc == -1 && errno == EINVAL);
-    errno = 0;
-    rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, valid_client_secret, 123);
-    assert (rc == -1 && errno == EINVAL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (client));
-}
-
-// TODO why isn't this const?
-char null_key[] = "0000000000000000000000000000000000000000";
-
-void test_null_server_key ()
-{
-    //  Check CURVE security with a null server key
-    //  This will be caught by the curve_server class, not passed to ZAP
-    test_null_key (server, server_mon, my_endpoint, null_key,
-                   valid_client_public, valid_client_secret);
-}
-
-void test_null_client_public_key ()
-{
-    //  Check CURVE security with a null client public key
-    //  This will be caught by the curve_server class, not passed to ZAP
-    test_null_key (server, server_mon, my_endpoint, valid_server_public,
-                   null_key, valid_client_secret);
-}
-
-void test_null_client_secret_key ()
-{
-    //  Check CURVE security with a null client public key
-    //  This will be caught by the curve_server class, not passed to ZAP
-    test_null_key (server, server_mon, my_endpoint, valid_server_public,
-                   valid_client_public, null_key);
-}
-
-
-int main (void)
-{
-    if (!zmq_has ("curve")) {
-        printf ("CURVE encryption not installed, skipping test\n");
-        return 0;
-    }
-
-    zmq::random_open ();
-
-    setup_testutil_security_curve ();
-
-
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_curve_security_with_valid_credentials);
-    RUN_TEST (test_null_server_key);
-    RUN_TEST (test_null_client_public_key);
-    RUN_TEST (test_null_client_secret_key);
-    RUN_TEST (test_curve_security_with_bogus_client_credentials);
-    RUN_TEST (test_curve_security_with_null_client_credentials);
-    RUN_TEST (test_curve_security_with_plain_client_credentials);
-    RUN_TEST (test_curve_security_unauthenticated_message);
-
-    //  tests with misbehaving CURVE client
-    RUN_TEST (test_curve_security_invalid_hello_wrong_length);
-    RUN_TEST (test_curve_security_invalid_hello_command_name);
-    RUN_TEST (test_curve_security_invalid_hello_version);
-    RUN_TEST (test_curve_security_invalid_initiate_wrong_length);
-    RUN_TEST (test_curve_security_invalid_initiate_command_name);
-    RUN_TEST (test_curve_security_invalid_initiate_command_encrypted_cookie);
-    RUN_TEST (test_curve_security_invalid_initiate_command_encrypted_content);
-
-    // TODO this requires a deviating test setup, must be moved to a separate executable/fixture
-    //  test with a large routing id (resulting in large metadata)
-    fprintf (stderr,
-             "test_curve_security_with_valid_credentials (large routing id)\n");
-    setup_test_context ();
-    setup_context_and_server_side (&handler, &zap_thread, &server, &server_mon,
-                                   my_endpoint, &zap_handler_large_routing_id,
-                                   &socket_config_curve_server,
-                                   &valid_server_secret, large_routing_id);
-    test_curve_security_with_valid_credentials ();
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-    teardown_test_context ();
-
-    void *ctx = zmq_ctx_new ();
-    test_curve_security_invalid_keysize (ctx);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_term (ctx));
-
-    zmq::random_close ();
-
-    return UNITY_END ();
-}
diff --git a/tests/test_security_gssapi.cpp b/tests/test_security_gssapi.cpp
deleted file mode 100644
index ea4de3709..000000000
--- a/tests/test_security_gssapi.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_monitoring.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-//  This test requires a KRB5 environment with the following
-//  service principal (substitute your host.domain and REALM):
-//
-//    zmqtest2/host.domain@REALM   (host.domain should be host running test)
-//
-//  Export keys for this principal to a keytab file and set the environment
-//  variables KRB5_KTNAME and KRB5_CLIENT_KTNAME to FILE:/path/to/your/keytab.
-//  The test will use it both for client and server roles.
-//
-//  The test is derived in large part from test_security_curve.cpp
-
-const char *name = "zmqtest2";
-
-static volatile int zap_deny_all = 0;
-
-//  --------------------------------------------------------------------------
-//  This methods receives and validates ZAP requestes (allowing or denying
-//  each client connection).
-//  N.B. on failure, each crypto type in keytab will be tried
-
-static void zap_handler (void *handler_)
-{
-    //  Process ZAP requests forever
-    while (true) {
-        char *version = s_recv (handler_);
-        if (!version)
-            break; //  Terminating
-
-        char *sequence = s_recv (handler_);
-        char *domain = s_recv (handler_);
-        char *address = s_recv (handler_);
-        char *routing_id = s_recv (handler_);
-        char *mechanism = s_recv (handler_);
-        char *principal = s_recv (handler_);
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING ("GSSAPI", mechanism);
-
-        send_string_expect_success (handler_, version, ZMQ_SNDMORE);
-        send_string_expect_success (handler_, sequence, ZMQ_SNDMORE);
-
-        if (!zap_deny_all) {
-            send_string_expect_success (handler_, "200", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "anonymous", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-            //fprintf (stderr, "ALLOW %s\n", principal);
-        } else {
-            send_string_expect_success (handler_, "400", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "Denied", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-            //fprintf (stderr, "DENY %s\n", principal);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-        free (principal);
-    }
-    zmq_close (handler_);
-}
-
-static char my_endpoint[MAX_SOCKET_STRING];
-static void *zap_thread;
-static void *server;
-static void *server_mon;
-
-void check_krb_available ()
-{
-    if (!getenv ("KRB5_KTNAME") || !getenv ("KRB5_CLIENT_KTNAME")) {
-        TEST_IGNORE_MESSAGE ("KRB5 environment unavailable, skipping test");
-    }
-}
-
-void setUp ()
-{
-    setup_test_context ();
-
-    zap_thread = 0;
-    server = NULL;
-    server_mon = NULL;
-
-    check_krb_available ();
-
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-    zap_thread = zmq_threadstart (&zap_handler, handler);
-
-    //  Server socket will accept connections
-    server = test_context_socket (ZMQ_DEALER);
-    int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_GSSAPI_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_GSSAPI_PRINCIPAL, name, strlen (name) + 1));
-    int name_type = ZMQ_GSSAPI_NT_HOSTBASED;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      server, ZMQ_GSSAPI_PRINCIPAL_NAMETYPE, &name_type, sizeof (name_type)));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    //  Monitor handshake events on the server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      server, "inproc://monitor-server",
-      ZMQ_EVENT_HANDSHAKE_SUCCEEDED | ZMQ_EVENT_HANDSHAKE_FAILED_AUTH
-        | ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL));
-
-    //  Create socket for collecting monitor events
-    server_mon = test_context_socket (ZMQ_PAIR);
-
-    //  Connect it to the inproc endpoints so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (server_mon, "inproc://monitor-server"));
-}
-
-void tearDown ()
-{
-    //  Shutdown
-    if (server_mon)
-        test_context_socket_close_zero_linger (server_mon);
-    if (server)
-        test_context_socket_close (server);
-    teardown_test_context ();
-
-    //  Wait until ZAP handler terminates
-    if (zap_thread)
-        zmq_threadclose (zap_thread);
-}
-
-void test_valid_creds ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_GSSAPI_SERVICE_PRINCIPAL, name, strlen (name) + 1));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_GSSAPI_PRINCIPAL, name, strlen (name) + 1));
-    int name_type = ZMQ_GSSAPI_NT_HOSTBASED;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_GSSAPI_PRINCIPAL_NAMETYPE, &name_type, sizeof (name_type)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    bounce (server, client);
-    test_context_socket_close (client);
-
-    int event = get_monitor_event (server_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_HANDSHAKE_SUCCEEDED, event);
-}
-
-//  Check security with valid but unauthorized credentials
-//  Note: ZAP may see multiple requests - after a failure, client will
-//  fall back to other crypto types for principal, if available.
-void test_unauth_creds ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_GSSAPI_SERVICE_PRINCIPAL, name, strlen (name) + 1));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_GSSAPI_PRINCIPAL, name, strlen (name) + 1));
-    int name_type = ZMQ_GSSAPI_NT_HOSTBASED;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_GSSAPI_PRINCIPAL_NAMETYPE, &name_type, sizeof (name_type)));
-    zap_deny_all = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-
-    int event = get_monitor_event (server_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, event);
-}
-
-//  Check GSSAPI security with NULL client credentials
-//  This must be caught by the gssapi_server class, not passed to ZAP
-void test_null_creds ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-
-    int error;
-    int event = get_monitor_event (server_mon, &error, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL, event);
-    TEST_ASSERT_EQUAL_INT (ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH, error);
-}
-
-//  Check GSSAPI security with PLAIN client credentials
-//  This must be caught by the curve_server class, not passed to ZAP
-void test_plain_creds ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, "admin", 5));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, "password", 8));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-}
-
-// Unauthenticated messages from a vanilla socket shouldn't be received
-void test_vanilla_socket ()
-{
-    fd_t s = connect_socket (my_endpoint);
-    // send anonymous ZMTP/1.0 greeting
-    send (s, "\x01\x00", 2, 0);
-    // send sneaky message that shouldn't be received
-    send (s, "\x08\x00sneaky\0", 9, 0);
-    int timeout = 250;
-    zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout));
-    char *buf = s_recv (server);
-    if (buf != NULL) {
-        printf ("Received unauthenticated message: %s\n", buf);
-        TEST_ASSERT_NULL (buf);
-    }
-    close (s);
-}
-
-int main (void)
-{
-    // Avoid entanglements with user's credential cache
-    setenv ("KRB5CCNAME", "MEMORY", 1);
-
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_valid_creds);
-    RUN_TEST (test_null_creds);
-    RUN_TEST (test_plain_creds);
-    RUN_TEST (test_vanilla_socket);
-    RUN_TEST (test_unauth_creds);
-    return UNITY_END ();
-}
diff --git a/tests/test_security_no_zap_handler.cpp b/tests/test_security_no_zap_handler.cpp
deleted file mode 100644
index cce2ef667..000000000
--- a/tests/test_security_no_zap_handler.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_no_zap_handler ()
-{
-    //  We first test client/server with a ZAP domain but with no handler
-    //  If there is no handler, libzmq should ignore the ZAP option unless
-    //  ZMQ_ZAP_ENFORCE_DOMAIN is set
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 5));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-}
-
-void test_no_zap_handler_enforce_domain ()
-{
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-    //  Now set ZMQ_ZAP_ENFORCE_DOMAIN which strictly enforces the ZAP
-    //  RFC but is backward-incompatible, now it should fail
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    int required = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_ENFORCE_DOMAIN, &required, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 5));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-#endif
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_no_zap_handler);
-    RUN_TEST (test_no_zap_handler_enforce_domain);
-    return UNITY_END ();
-}
diff --git a/tests/test_security_null.cpp b/tests/test_security_null.cpp
deleted file mode 100644
index d6e17a2d2..000000000
--- a/tests/test_security_null.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#if defined(ZMQ_HAVE_WINDOWS)
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <stdexcept>
-#define close closesocket
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-
-static void zap_handler (void *handler_)
-{
-    //  Process ZAP requests forever
-    while (true) {
-        char *version = s_recv (handler_);
-        if (!version)
-            break; //  Terminating
-
-        char *sequence = s_recv (handler_);
-        char *domain = s_recv (handler_);
-        char *address = s_recv (handler_);
-        char *routing_id = s_recv (handler_);
-        char *mechanism = s_recv (handler_);
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING ("NULL", mechanism);
-
-        send_string_expect_success (handler_, version, ZMQ_SNDMORE);
-        send_string_expect_success (handler_, sequence, ZMQ_SNDMORE);
-        if (streq (domain, "TEST")) {
-            send_string_expect_success (handler_, "200", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "anonymous", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-        } else {
-            send_string_expect_success (handler_, "400", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "BAD DOMAIN", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-    }
-    close_zero_linger (handler_);
-}
-
-void *zap_thread;
-
-static void setup_zap_handler ()
-{
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-    zap_thread = zmq_threadstart (&zap_handler, handler);
-}
-
-static void teardown_zap_handler ()
-{
-    //  Wait until ZAP handler terminates
-    zmq_threadclose (zap_thread);
-}
-
-void setUp ()
-{
-    setup_test_context ();
-    setup_zap_handler ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-    teardown_zap_handler ();
-}
-
-void test_no_domain ()
-{
-    //  We first test client/server with no ZAP domain
-    //  Libzmq does not call our ZAP handler, the connect must succeed
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-}
-
-void test_wrong_domain_fails ()
-{
-    //  Now define a ZAP domain for the server; this enables
-    //  authentication. We're using the wrong domain so this test
-    //  must fail.
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-}
-
-void test_success ()
-{
-    //  Now use the right domain, the test must pass
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 4));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-}
-
-void test_vanilla_socket ()
-{
-    // Unauthenticated messages from a vanilla socket shouldn't be received
-    void *server = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    fd_t s = connect_socket (my_endpoint);
-
-    // send anonymous ZMTP/1.0 greeting
-    send (s, "\x01\x00", 2, 0);
-    // send sneaky message that shouldn't be received
-    send (s, "\x08\x00sneaky\0", 9, 0);
-    int timeout = 250;
-    zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout));
-    char *buf = s_recv (server);
-    if (buf != NULL) {
-        printf ("Received unauthenticated message: %s\n", buf);
-        TEST_ASSERT_NULL (buf);
-    }
-    close (s);
-    test_context_socket_close_zero_linger (server);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_no_domain);
-    RUN_TEST (test_wrong_domain_fails);
-    RUN_TEST (test_success);
-    RUN_TEST (test_vanilla_socket);
-    return UNITY_END ();
-}
diff --git a/tests/test_security_plain.cpp b/tests/test_security_plain.cpp
deleted file mode 100644
index 7cfc53c9f..000000000
--- a/tests/test_security_plain.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-static void zap_handler (void *zap_)
-{
-    //  Process ZAP requests forever
-    while (true) {
-        char *version = s_recv (zap_);
-        if (!version)
-            break; //  Terminating
-        char *sequence = s_recv (zap_);
-        char *domain = s_recv (zap_);
-        char *address = s_recv (zap_);
-        char *routing_id = s_recv (zap_);
-        char *mechanism = s_recv (zap_);
-        char *username = s_recv (zap_);
-        char *password = s_recv (zap_);
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING ("PLAIN", mechanism);
-        TEST_ASSERT_EQUAL_STRING ("IDENT", routing_id);
-
-        send_string_expect_success (zap_, version, ZMQ_SNDMORE);
-        send_string_expect_success (zap_, sequence, ZMQ_SNDMORE);
-        if (streq (username, "admin") && streq (password, "password")) {
-            send_string_expect_success (zap_, "200", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "anonymous", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "", 0);
-        } else {
-            send_string_expect_success (zap_, "400", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "Invalid username or password",
-                                        ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "", 0);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-        free (username);
-        free (password);
-    }
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (zap_));
-}
-
-void *zap_thread;
-
-char my_endpoint[MAX_SOCKET_STRING];
-
-static void setup_zap_handler ()
-{
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-    zap_thread = zmq_threadstart (&zap_handler, handler);
-}
-
-static void teardown_zap_handler ()
-{
-    //  Wait until ZAP handler terminates
-    zmq_threadclose (zap_thread);
-}
-
-const char domain[] = "test";
-
-void *server;
-
-static void setup_server ()
-{
-    //  Server socket will accept connections
-    server = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ROUTING_ID, "IDENT", 6));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, domain, strlen (domain)));
-    const int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_PLAIN_SERVER, &as_server, sizeof (int)));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-}
-
-static void teardown_server ()
-{
-    test_context_socket_close (server);
-}
-
-void setUp ()
-{
-    setup_test_context ();
-    setup_zap_handler ();
-    setup_server ();
-}
-
-void tearDown ()
-{
-    teardown_server ();
-    teardown_test_context ();
-    teardown_zap_handler ();
-}
-
-void test_plain_success ()
-{
-    //  Check PLAIN security with correct username/password
-    void *client = test_context_socket (ZMQ_DEALER);
-    const char username[] = "admin";
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, username, strlen (username)));
-    const char password[] = "password";
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, password, strlen (password)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-    test_context_socket_close (client);
-}
-
-void test_plain_client_as_server_fails ()
-{
-    //  Check PLAIN security with badly configured client (as_server)
-    //  This will be caught by the plain_server class, not passed to ZAP
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_ZAP_DOMAIN, domain, strlen (domain)));
-    const int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-}
-
-void test_plain_wrong_credentials_fails ()
-{
-    //  Check PLAIN security -- failed authentication
-    void *client = test_context_socket (ZMQ_DEALER);
-    const char username[] = "wronguser";
-    const char password[] = "wrongpass";
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, username, strlen (username)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, password, strlen (password)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-}
-
-void test_plain_vanilla_socket ()
-{
-    // Unauthenticated messages from a vanilla socket shouldn't be received
-    fd_t s = connect_socket (my_endpoint);
-    // send anonymous ZMTP/1.0 greeting
-    send (s, "\x01\x00", 2, 0);
-    // send sneaky message that shouldn't be received
-    send (s, "\x08\x00sneaky\0", 9, 0);
-    int timeout = 250;
-    zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout));
-    char *buf = s_recv (server);
-    if (buf != NULL) {
-        printf ("Received unauthenticated message: %s\n", buf);
-        TEST_ASSERT_NULL (buf);
-    }
-    close (s);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_plain_success);
-    RUN_TEST (test_plain_client_as_server_fails);
-    RUN_TEST (test_plain_wrong_credentials_fails);
-    RUN_TEST (test_plain_vanilla_socket);
-    return UNITY_END ();
-}
diff --git a/tests/test_security_zap.cpp b/tests/test_security_zap.cpp
deleted file mode 100644
index d76a1c243..000000000
--- a/tests/test_security_zap.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil_security.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void zap_handler_wrong_version (void * /*unused_*/)
-{
-    zap_handler_generic (zap_wrong_version);
-}
-
-static void zap_handler_wrong_request_id (void * /*unused_*/)
-{
-    zap_handler_generic (zap_wrong_request_id);
-}
-
-static void zap_handler_wrong_status_invalid (void * /*unused_*/)
-{
-    zap_handler_generic (zap_status_invalid);
-}
-
-static void zap_handler_wrong_status_temporary_failure (void * /*unused_*/)
-{
-    zap_handler_generic (zap_status_temporary_failure);
-}
-
-static void zap_handler_wrong_status_internal_error (void * /*unused_*/)
-{
-    zap_handler_generic (zap_status_internal_error);
-}
-
-static void zap_handler_too_many_parts (void * /*unused_*/)
-{
-    zap_handler_generic (zap_too_many_parts);
-}
-
-static void zap_handler_disconnect (void * /*unused_*/)
-{
-    zap_handler_generic (zap_disconnect);
-}
-
-static void zap_handler_do_not_recv (void * /*unused_*/)
-{
-    zap_handler_generic (zap_do_not_recv);
-}
-
-static void zap_handler_do_not_send (void * /*unused_*/)
-{
-    zap_handler_generic (zap_do_not_send);
-}
-
-int expect_new_client_bounce_fail_and_count_monitor_events (
-  char *my_endpoint_,
-  void *server_,
-  socket_config_fn socket_config_,
-  void *socket_config_data_,
-  void **client_mon_,
-  void *server_mon_,
-  int expected_server_event_,
-  int expected_server_value_,
-  int expected_client_event_ = 0,
-  int expected_client_value_ = 0)
-{
-    expect_new_client_bounce_fail (
-      my_endpoint_, server_, socket_config_, socket_config_data_, client_mon_,
-      expected_client_event_, expected_client_value_);
-
-    int events_received = 0;
-    events_received = expect_monitor_event_multiple (
-      server_mon_, expected_server_event_, expected_server_value_);
-
-    return events_received;
-}
-
-void test_zap_unsuccessful (char *my_endpoint_,
-                            void *server_,
-                            void *server_mon_,
-                            int expected_server_event_,
-                            int expected_server_value_,
-                            socket_config_fn socket_config_,
-                            void *socket_config_data_,
-                            void **client_mon_ = NULL,
-                            int expected_client_event_ = 0,
-                            int expected_client_value_ = 0)
-{
-    int server_events_received =
-      expect_new_client_bounce_fail_and_count_monitor_events (
-        my_endpoint_, server_, socket_config_, socket_config_data_, client_mon_,
-        server_mon_, expected_server_event_, expected_server_value_,
-        expected_client_event_, expected_client_value_);
-
-    //  there may be more than one ZAP request due to repeated attempts by the
-    //  client (actually only in case if ZAP status code 300)
-    TEST_ASSERT_TRUE (server_events_received == 0
-                      || 1 <= zmq_atomic_counter_value (zap_requests_handled));
-}
-
-void test_zap_unsuccessful_no_handler (char *my_endpoint_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       int expected_event_,
-                                       int expected_err_,
-                                       socket_config_fn socket_config_,
-                                       void *socket_config_data_,
-                                       void **client_mon_ = NULL)
-{
-    const int events_received =
-      expect_new_client_bounce_fail_and_count_monitor_events (
-        my_endpoint_, server_, socket_config_, socket_config_data_, client_mon_,
-        server_mon_, expected_event_, expected_err_);
-
-    //  there may be more than one ZAP request due to repeated attempts by the
-    //  client
-    TEST_ASSERT_GREATER_THAN_INT (0, events_received);
-}
-
-void test_zap_protocol_error (char *my_endpoint_,
-                              void *server_,
-                              void *server_mon_,
-                              socket_config_fn socket_config_,
-                              void *socket_config_data_,
-                              int expected_error_)
-{
-    test_zap_unsuccessful (my_endpoint_, server_, server_mon_,
-                           ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL, expected_error_,
-                           socket_config_, socket_config_data_);
-}
-
-void test_zap_unsuccessful_status_300 (char *my_endpoint_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       socket_config_fn client_socket_config_,
-                                       void *client_socket_config_data_)
-{
-    void *client_mon;
-    test_zap_unsuccessful (
-      my_endpoint_, server_, server_mon_, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 300,
-      client_socket_config_, client_socket_config_data_, &client_mon);
-
-    // we can use a 0 timeout here, since the client socket is already closed
-    assert_no_more_monitor_events_with_timeout (client_mon, 0);
-
-    test_context_socket_close (client_mon);
-}
-
-void test_zap_unsuccessful_status_500 (char *my_endpoint_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       socket_config_fn client_socket_config_,
-                                       void *client_socket_config_data_)
-{
-    test_zap_unsuccessful (my_endpoint_, server_, server_mon_,
-                           ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 500,
-                           client_socket_config_, client_socket_config_data_,
-                           NULL, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 500);
-}
-
-static void
-test_zap_protocol_error_closure (socket_config_fn server_socket_config_,
-                                 socket_config_fn client_socket_config_,
-                                 void *client_socket_config_data_,
-                                 void *server_socket_config_data_,
-                                 zmq_thread_fn zap_handler_,
-                                 int expected_failure_)
-{
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint, zap_handler_,
-      server_socket_config_, server_socket_config_data_);
-    test_zap_protocol_error (my_endpoint, server, server_mon,
-                             client_socket_config_, client_socket_config_data_,
-                             expected_failure_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-}
-
-static void
-test_zap_protocol_error_wrong_version (socket_config_fn server_socket_config_,
-                                       socket_config_fn client_socket_config_,
-                                       void *client_socket_config_data_,
-                                       void *server_socket_config_data_)
-{
-    test_zap_protocol_error_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      server_socket_config_data_, &zap_handler_wrong_version,
-      ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION);
-}
-
-static void test_zap_protocol_error_wrong_request_id (
-  socket_config_fn server_socket_config_,
-  socket_config_fn client_socket_config_,
-  void *client_socket_config_data_,
-  void *server_socket_config_data_)
-{
-    test_zap_protocol_error_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      server_socket_config_data_, &zap_handler_wrong_request_id,
-      ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID);
-}
-
-static void test_zap_protocol_error_wrong_status_invalid (
-  socket_config_fn server_socket_config_,
-  socket_config_fn client_socket_config_,
-  void *client_socket_config_data_,
-  void *server_socket_config_data_)
-{
-    test_zap_protocol_error_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      server_socket_config_data_, &zap_handler_wrong_status_invalid,
-      ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE);
-}
-
-static void
-test_zap_protocol_error_too_many_parts (socket_config_fn server_socket_config_,
-                                        socket_config_fn client_socket_config_,
-                                        void *client_socket_config_data_,
-                                        void *server_socket_config_data_)
-{
-    test_zap_protocol_error_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      server_socket_config_data_, &zap_handler_too_many_parts,
-      ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY);
-}
-
-//  TODO the failed status (300/500) should be observable as monitoring events on the client side as well (they are
-//  already transmitted as an ERROR message)
-
-static void
-test_zap_wrong_status_temporary_failure (socket_config_fn server_socket_config_,
-                                         socket_config_fn client_socket_config_,
-                                         void *client_socket_config_data_,
-                                         void *server_socket_config_data_)
-{
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint,
-      &zap_handler_wrong_status_temporary_failure, server_socket_config_,
-      server_socket_config_data_);
-    test_zap_unsuccessful_status_300 (my_endpoint, server, server_mon,
-                                      client_socket_config_,
-                                      client_socket_config_data_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-}
-
-static void
-test_zap_wrong_status_internal_error (socket_config_fn server_socket_config_,
-                                      socket_config_fn client_socket_config_,
-                                      void *client_socket_config_data_)
-{
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint,
-      &zap_handler_wrong_status_internal_error, server_socket_config_);
-    test_zap_unsuccessful_status_500 (my_endpoint, server, server_mon,
-                                      client_socket_config_,
-                                      client_socket_config_data_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-}
-
-static void
-test_zap_unsuccesful_no_handler_started (socket_config_fn server_socket_config_,
-                                         socket_config_fn client_socket_config_,
-                                         void *client_socket_config_data_,
-                                         void *server_socket_config_data_)
-{
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-    // TODO this looks wrong, where will the enforce value be used?
-
-    //  no ZAP handler
-    int enforce = 1;
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint, NULL,
-      server_socket_config_,
-      server_socket_config_data_ ? server_socket_config_data_ : &enforce);
-    test_zap_unsuccessful_no_handler (
-      my_endpoint, server, server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL,
-      EFAULT, client_socket_config_, client_socket_config_data_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-#endif
-}
-
-static void
-test_zap_unsuccesful_no_handler_closure (socket_config_fn server_socket_config_,
-                                         socket_config_fn client_socket_config_,
-                                         void *client_socket_config_data_,
-                                         zmq_thread_fn zap_handler_func_,
-                                         bool zap_handler_disconnected_ = false)
-{
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-    setup_context_and_server_side (&handler, &zap_thread, &server, &server_mon,
-                                   my_endpoint, zap_handler_func_,
-                                   server_socket_config_);
-    test_zap_unsuccessful_no_handler (
-      my_endpoint, server, server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL,
-      EPIPE, client_socket_config_, client_socket_config_data_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler,
-                                      zap_handler_disconnected_);
-}
-
-static void
-test_zap_unsuccesful_disconnect (socket_config_fn server_socket_config_,
-                                 socket_config_fn client_socket_config_,
-                                 void *client_socket_config_data_)
-{
-    test_zap_unsuccesful_no_handler_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      &zap_handler_disconnect, true);
-}
-
-static void
-test_zap_unsuccesful_do_not_recv (socket_config_fn server_socket_config_,
-                                  socket_config_fn client_socket_config_,
-                                  void *client_socket_config_data_)
-{
-    test_zap_unsuccesful_no_handler_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      &zap_handler_do_not_recv);
-}
-
-static void
-test_zap_unsuccesful_do_not_send (socket_config_fn server_socket_config_,
-                                  socket_config_fn client_socket_config_,
-                                  void *client_socket_config_data_)
-{
-    test_zap_unsuccesful_no_handler_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      &zap_handler_do_not_send);
-}
-
-#define DEFINE_ZAP_ERROR_TESTS(                                                \
-  name_, server_socket_config_, server_socket_config_data_,                    \
-  client_socket_config_, client_socket_config_data_)                           \
-    void test_zap_protocol_error_wrong_version_##name_ ()                      \
-    {                                                                          \
-        test_zap_protocol_error_wrong_version (                                \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_protocol_error_wrong_request_id_##name_ ()                   \
-    {                                                                          \
-        test_zap_protocol_error_wrong_request_id (                             \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_protocol_error_wrong_status_invalid_##name_ ()               \
-    {                                                                          \
-        test_zap_protocol_error_wrong_status_invalid (                         \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_protocol_error_too_many_parts_##name_ ()                     \
-    {                                                                          \
-        test_zap_protocol_error_too_many_parts (                               \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_wrong_status_temporary_failure_##name_ ()                    \
-    {                                                                          \
-        test_zap_wrong_status_temporary_failure (                              \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_wrong_status_internal_error_##name_ ()                       \
-    {                                                                          \
-        test_zap_wrong_status_internal_error (server_socket_config_,           \
-                                              client_socket_config_,           \
-                                              client_socket_config_data_);     \
-    }                                                                          \
-    void test_zap_unsuccessful_no_handler_started_##name_ ()                   \
-    {                                                                          \
-        test_zap_unsuccesful_no_handler_started (                              \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_unsuccessful_disconnect_##name_ ()                           \
-    {                                                                          \
-        test_zap_unsuccesful_disconnect (server_socket_config_,                \
-                                         client_socket_config_,                \
-                                         client_socket_config_data_);          \
-    }                                                                          \
-    void test_zap_unsuccessful_do_not_recv_##name_ ()                          \
-    {                                                                          \
-        test_zap_unsuccesful_do_not_recv (server_socket_config_,               \
-                                          client_socket_config_,               \
-                                          client_socket_config_data_);         \
-    }                                                                          \
-    void test_zap_unsuccessful_do_not_send_##name_ ()                          \
-    {                                                                          \
-        test_zap_unsuccesful_do_not_send (server_socket_config_,               \
-                                          client_socket_config_,               \
-                                          client_socket_config_data_);         \
-    }
-
-DEFINE_ZAP_ERROR_TESTS (
-  null, &socket_config_null_server, NULL, &socket_config_null_client, NULL)
-
-DEFINE_ZAP_ERROR_TESTS (
-  plain, &socket_config_plain_server, NULL, &socket_config_plain_client, NULL)
-
-static curve_client_data_t curve_client_data = {
-  valid_server_public, valid_client_public, valid_client_secret};
-
-DEFINE_ZAP_ERROR_TESTS (curve,
-                        &socket_config_curve_server,
-                        valid_server_secret,
-                        &socket_config_curve_client,
-                        &curve_client_data)
-
-#define RUN_ZAP_ERROR_TESTS(name_)                                             \
-    {                                                                          \
-        RUN_TEST (test_zap_protocol_error_wrong_version_##name_);              \
-        RUN_TEST (test_zap_protocol_error_wrong_request_id_##name_);           \
-        RUN_TEST (test_zap_protocol_error_wrong_status_invalid_##name_);       \
-        RUN_TEST (test_zap_protocol_error_too_many_parts_##name_);             \
-        RUN_TEST (test_zap_wrong_status_temporary_failure_##name_);            \
-        RUN_TEST (test_zap_wrong_status_internal_error_##name_);               \
-        RUN_TEST (test_zap_unsuccessful_no_handler_started_##name_);           \
-        RUN_TEST (test_zap_unsuccessful_disconnect_##name_);                   \
-        RUN_TEST (test_zap_unsuccessful_do_not_recv_##name_);                  \
-        RUN_TEST (test_zap_unsuccessful_do_not_send_##name_);                  \
-    }
-
-int main ()
-{
-    setup_test_environment ();
-
-    if (zmq_has ("curve")) {
-        setup_testutil_security_curve ();
-    }
-
-    UNITY_BEGIN ();
-    RUN_ZAP_ERROR_TESTS (null);
-    RUN_ZAP_ERROR_TESTS (plain);
-    if (zmq_has ("curve")) {
-        RUN_ZAP_ERROR_TESTS (curve);
-    }
-    return UNITY_END ();
-}
diff --git a/tests/test_setsockopt.cpp b/tests/test_setsockopt.cpp
deleted file mode 100644
index b2edfb9e9..000000000
--- a/tests/test_setsockopt.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_setsockopt_tcp_recv_buffer ()
-{
-    void *socket = test_context_socket (ZMQ_PUSH);
-
-    int val = 0;
-    size_t placeholder = sizeof (val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_RCVBUF, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (-1, val);
-
-    val = 16384;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_RCVBUF, &val, sizeof (val)));
-    TEST_ASSERT_EQUAL_INT (16384, val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_RCVBUF, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (16384, val);
-
-    test_context_socket_close (socket);
-}
-
-void test_setsockopt_tcp_send_buffer ()
-{
-    void *socket = test_context_socket (ZMQ_PUSH);
-
-    int val = 0;
-    size_t placeholder = sizeof (val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_SNDBUF, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (-1, val);
-
-    val = 16384;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_SNDBUF, &val, sizeof (val)));
-    TEST_ASSERT_EQUAL_INT (16384, val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_SNDBUF, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (16384, val);
-
-    test_context_socket_close (socket);
-}
-
-void test_setsockopt_use_fd ()
-{
-    void *socket = test_context_socket (ZMQ_PUSH);
-
-    int val = 0;
-    size_t placeholder = sizeof (val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_USE_FD, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (-1, val);
-
-    val = 3;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_USE_FD, &val, sizeof (val)));
-    TEST_ASSERT_EQUAL_INT (3, val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_USE_FD, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (3, val);
-
-    test_context_socket_close (socket);
-}
-
-#define BOUNDDEVBUFSZ 16
-void test_setsockopt_bindtodevice ()
-{
-    void *socket = test_context_socket (ZMQ_PUSH);
-
-#ifdef ZMQ_BINDTODEVICE
-    char devname[BOUNDDEVBUFSZ];
-    size_t buflen = BOUNDDEVBUFSZ;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_BINDTODEVICE, devname, &buflen));
-    TEST_ASSERT_EQUAL_INT8 ('\0', devname[0]);
-    TEST_ASSERT_EQUAL_UINT (1, buflen);
-
-    sprintf (devname, "testdev");
-    buflen = strlen (devname);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_BINDTODEVICE, devname, buflen));
-
-    buflen = BOUNDDEVBUFSZ;
-    memset (devname, 0, buflen);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_BINDTODEVICE, devname, &buflen));
-    TEST_ASSERT_EQUAL_STRING_LEN ("testdev", devname, buflen);
-#endif
-
-    test_context_socket_close (socket);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_setsockopt_tcp_recv_buffer);
-    RUN_TEST (test_setsockopt_tcp_send_buffer);
-    RUN_TEST (test_setsockopt_use_fd);
-    RUN_TEST (test_setsockopt_bindtodevice);
-    return UNITY_END ();
-}
diff --git a/tests/test_shutdown_stress.cpp b/tests/test_shutdown_stress.cpp
deleted file mode 100644
index 23dd4dbce..000000000
--- a/tests/test_shutdown_stress.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-#define THREAD_COUNT 100
-
-struct thread_data
-{
-    char endpoint[MAX_SOCKET_STRING];
-};
-
-extern "C" {
-static void worker (void *data_)
-{
-    const thread_data *const tdata = static_cast<const thread_data *> (data_);
-
-    void *socket = zmq_socket (get_test_context (), ZMQ_SUB);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (socket, tdata->endpoint));
-
-    //  Start closing the socket while the connecting process is underway.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-}
-}
-
-void test_shutdown_stress ()
-{
-    void *threads[THREAD_COUNT];
-
-    for (int j = 0; j != 10; j++) {
-        //  Check the shutdown with many parallel I/O threads.
-        struct thread_data tdata;
-        setup_test_context ();
-        zmq_ctx_set (get_test_context (), ZMQ_IO_THREADS, 7);
-
-        void *socket = test_context_socket (ZMQ_PUB);
-
-        bind_loopback_ipv4 (socket, tdata.endpoint, sizeof (tdata.endpoint));
-
-        for (int i = 0; i != THREAD_COUNT; i++) {
-            threads[i] = zmq_threadstart (&worker, &tdata);
-        }
-
-        for (int i = 0; i != THREAD_COUNT; i++) {
-            zmq_threadclose (threads[i]);
-        }
-
-        test_context_socket_close (socket);
-
-        teardown_test_context ();
-    }
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_shutdown_stress);
-    return UNITY_END ();
-}
diff --git a/tests/test_shutdown_stress_tipc.cpp b/tests/test_shutdown_stress_tipc.cpp
deleted file mode 100644
index 9d91ff030..000000000
--- a/tests/test_shutdown_stress_tipc.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <pthread.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-#define THREAD_COUNT 100
-
-extern "C" {
-static void *worker (void *ctx)
-{
-    void *s = zmq_socket (ctx, ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (s, "tipc://{5560,0}@0.0.0"));
-
-    //  Start closing the socket while the connecting process is underway.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (s));
-
-    return NULL;
-}
-}
-
-void test_shutdown_stress_tipc ()
-{
-    void *s1;
-    int i;
-    int j;
-    pthread_t threads[THREAD_COUNT];
-
-    for (j = 0; j != 10; j++) {
-        //  Check the shutdown with many parallel I/O threads.
-        setup_test_context ();
-        zmq_ctx_set (get_test_context (), ZMQ_IO_THREADS, 7);
-
-        s1 = test_context_socket (ZMQ_PUB);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (s1, "tipc://{5560,0,0}"));
-
-        for (i = 0; i != THREAD_COUNT; i++) {
-            TEST_ASSERT_SUCCESS_RAW_ERRNO (
-              pthread_create (&threads[i], NULL, worker, get_test_context ()));
-        }
-
-        for (i = 0; i != THREAD_COUNT; i++) {
-            TEST_ASSERT_SUCCESS_RAW_ERRNO (pthread_join (threads[i], NULL));
-        }
-
-        test_context_socket_close (s1);
-
-        teardown_test_context ();
-    }
-}
-
-int main ()
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_shutdown_stress_tipc);
-    return UNITY_END ();
-}
diff --git a/tests/test_socket_null.cpp b/tests/test_socket_null.cpp
deleted file mode 100644
index 7c1cc9faf..000000000
--- a/tests/test_socket_null.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-//  tests all socket-related functions with a NULL socket argument
-void test_zmq_socket_null_context ()
-{
-    TEST_ASSERT_NULL (zmq_socket (NULL, ZMQ_PAIR));
-    TEST_ASSERT_EQUAL_INT (EFAULT, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_close_null_socket ()
-{
-    int rc = zmq_close (NULL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_setsockopt_null_socket ()
-{
-    int hwm = 100;
-    size_t hwm_size = sizeof hwm;
-    int rc = zmq_setsockopt (NULL, ZMQ_SNDHWM, &hwm, hwm_size);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_getsockopt_null_socket ()
-{
-    int hwm;
-    size_t hwm_size = sizeof hwm;
-    int rc = zmq_getsockopt (NULL, ZMQ_SNDHWM, &hwm, &hwm_size);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_socket_monitor_null_socket ()
-{
-    int rc = zmq_socket_monitor (NULL, "inproc://monitor", ZMQ_EVENT_ALL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-#ifdef ZMQ_BUILD_DRAFT_API
-void test_zmq_join_null_socket ()
-{
-    int rc = zmq_join (NULL, "group");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_leave_null_socket ()
-{
-    int rc = zmq_leave (NULL, "group");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-#endif
-
-
-void test_zmq_bind_null_socket ()
-{
-    int rc = zmq_bind (NULL, "inproc://socket");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_connect_null_socket ()
-{
-    int rc = zmq_connect (NULL, "inproc://socket");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_unbind_null_socket ()
-{
-    int rc = zmq_unbind (NULL, "inproc://socket");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_disconnect_null_socket ()
-{
-    int rc = zmq_disconnect (NULL, "inproc://socket");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-int main (void)
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_zmq_socket_null_context);
-    RUN_TEST (test_zmq_close_null_socket);
-    RUN_TEST (test_zmq_setsockopt_null_socket);
-    RUN_TEST (test_zmq_getsockopt_null_socket);
-    RUN_TEST (test_zmq_socket_monitor_null_socket);
-    RUN_TEST (test_zmq_bind_null_socket);
-    RUN_TEST (test_zmq_connect_null_socket);
-    RUN_TEST (test_zmq_unbind_null_socket);
-    RUN_TEST (test_zmq_disconnect_null_socket);
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    RUN_TEST (test_zmq_join_null_socket);
-    RUN_TEST (test_zmq_leave_null_socket);
-#endif
-
-    return UNITY_END ();
-}
diff --git a/tests/test_sockopt_hwm.cpp b/tests/test_sockopt_hwm.cpp
deleted file mode 100644
index d96118e3c..000000000
--- a/tests/test_sockopt_hwm.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const int MAX_SENDS = 10000;
-
-void test_change_before_connected ()
-{
-    int rc;
-
-    void *bind_socket = test_context_socket (ZMQ_PUSH);
-    void *connect_socket = test_context_socket (ZMQ_PULL);
-
-    int val = 2;
-    rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    zmq_connect (connect_socket, "inproc://a");
-    zmq_bind (bind_socket, "inproc://a");
-
-    size_t placeholder = sizeof (val);
-    val = 0;
-    rc = zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &val, &placeholder);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    TEST_ASSERT_EQUAL_INT (2, val);
-
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    TEST_ASSERT_EQUAL_INT (4, send_count);
-
-    test_context_socket_close (bind_socket);
-    test_context_socket_close (connect_socket);
-}
-
-void test_change_after_connected ()
-{
-    int rc;
-
-    void *bind_socket = test_context_socket (ZMQ_PUSH);
-    void *connect_socket = test_context_socket (ZMQ_PULL);
-
-    int val = 1;
-    rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    zmq_connect (connect_socket, "inproc://a");
-    zmq_bind (bind_socket, "inproc://a");
-
-    val = 5;
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    size_t placeholder = sizeof (val);
-    val = 0;
-    rc = zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &val, &placeholder);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    TEST_ASSERT_EQUAL_INT (5, val);
-
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    TEST_ASSERT_EQUAL_INT (6, send_count);
-
-    test_context_socket_close (bind_socket);
-    test_context_socket_close (connect_socket);
-}
-
-int send_until_wouldblock (void *socket_)
-{
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (socket_, &send_count, sizeof (send_count), ZMQ_DONTWAIT)
-                == sizeof (send_count)) {
-        ++send_count;
-    }
-    return send_count;
-}
-
-int test_fill_up_to_hwm (void *socket_, int sndhwm_)
-{
-    int send_count = send_until_wouldblock (socket_);
-    fprintf (stderr, "sndhwm==%i, send_count==%i\n", sndhwm_, send_count);
-    TEST_ASSERT_LESS_OR_EQUAL_INT (sndhwm_ + 1, send_count);
-    TEST_ASSERT_GREATER_THAN_INT (sndhwm_ / 10, send_count);
-    return send_count;
-}
-
-void test_decrease_when_full ()
-{
-    int rc;
-
-    void *bind_socket = test_context_socket (ZMQ_PUSH);
-    void *connect_socket = test_context_socket (ZMQ_PULL);
-
-    int val = 1;
-    rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    int sndhwm = 100;
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    zmq_bind (bind_socket, "inproc://a");
-    zmq_connect (connect_socket, "inproc://a");
-
-    //  we must wait for the connect to succeed here, unfortunately we don't
-    //  have monitoring events for inproc, so we just hope SETTLE_TIME suffices
-    msleep (SETTLE_TIME);
-
-    // Fill up to hwm
-    int send_count = test_fill_up_to_hwm (bind_socket, sndhwm);
-
-    // Decrease snd hwm
-    sndhwm = 70;
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    int sndhwm_read = 0;
-    size_t sndhwm_read_size = sizeof (sndhwm_read);
-    rc =
-      zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm_read, &sndhwm_read_size);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    TEST_ASSERT_EQUAL_INT (sndhwm, sndhwm_read);
-
-    msleep (SETTLE_TIME);
-
-    // Read out all data (should get up to previous hwm worth so none were dropped)
-    int read_count = 0;
-    int read_data = 0;
-    while (
-      read_count < MAX_SENDS
-      && zmq_recv (connect_socket, &read_data, sizeof (read_data), ZMQ_DONTWAIT)
-           == sizeof (read_data)) {
-        TEST_ASSERT_EQUAL_INT (read_data, read_count);
-        ++read_count;
-    }
-
-    TEST_ASSERT_EQUAL_INT (send_count, read_count);
-
-    // Give io thread some time to catch up
-    msleep (SETTLE_TIME);
-
-    // Fill up to new hwm
-    test_fill_up_to_hwm (bind_socket, sndhwm);
-
-    test_context_socket_close (bind_socket);
-    test_context_socket_close (connect_socket);
-}
-
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_change_before_connected);
-    RUN_TEST (test_change_after_connected);
-    RUN_TEST (test_decrease_when_full);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_socks.cpp b/tests/test_socks.cpp
deleted file mode 100644
index 396c76fba..000000000
--- a/tests/test_socks.cpp
+++ /dev/null
@@ -1,893 +0,0 @@
-/*
-    Copyright (c) 2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef _WIN32
-#include "../src/windows.hpp"
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void recvall (int sock_fd, char *buffer, int len)
-{
-    int res;
-    int total = 0;
-    while (len - total > 0) {
-        res = recv (sock_fd, buffer + total, len - total, 0);
-        if (res == -1)
-            fprintf (stderr, "socks_server: error receiving %d bytes: %d %d\n",
-                     len, res, errno);
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-        TEST_ASSERT (res != 0);
-        total += res;
-    }
-    TEST_ASSERT (total == len);
-}
-
-int recvonce (int sock_fd, char *buffer, int len)
-{
-    int res;
-    res = recv (sock_fd, buffer, len, 0);
-    if (res == -1)
-        fprintf (stderr, "socks_server: error receiving bytes: %d %d\n", res,
-                 errno);
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-    return res;
-}
-
-void sendall (int sock_fd, char *buffer, int len)
-{
-    int res;
-    int total = 0;
-    while (len - total > 0) {
-        res = send (sock_fd, buffer + total, len - total, 0);
-        if (res == -1)
-            fprintf (stderr, "socks_server: error sending %d bytes: %d %d\n",
-                     len, res, errno);
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-        TEST_ASSERT (res != 0);
-        total += res;
-    }
-}
-
-int remote_connect (int socket, uint32_t addr, uint16_t port)
-{
-    int res;
-    struct sockaddr_in ip4addr;
-    ip4addr.sin_family = AF_INET;
-    ip4addr.sin_addr.s_addr = htonl (addr);
-    ip4addr.sin_port = htons (port);
-    res = connect (socket, (struct sockaddr *) &ip4addr, sizeof ip4addr);
-    return res;
-}
-
-void *setup_socks_server (char *socks_server_address,
-                          int socks_server_address_len)
-{
-    fprintf (stderr, "socks_server: setup socks server\n");
-    int server_fd =
-      bind_socket_resolve_port ("127.0.0.1", "0", socks_server_address);
-    memmove (socks_server_address, strchr (socks_server_address, '/') + 2,
-             strlen (strchr (socks_server_address, '/') + 1));
-    fprintf (stderr, "socks_server: bound to: tcp://%s\n",
-             socks_server_address);
-    return (void *) (intptr_t) server_fd;
-}
-
-void socks_server_task (void *socks_server,
-                        const char *username,
-                        const char *password,
-                        int max_client_connect)
-{
-    int server_fd = (int) (intptr_t) socks_server;
-    fprintf (stderr, "socks_server: starting server thread\n");
-
-    int res;
-    res = listen (server_fd, max_client_connect);
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-
-    int auth_method;
-    if (username == NULL || username[0] == '\0') {
-        auth_method = 0x0; /* No auth */
-    } else {
-        auth_method = 0x2; /* Basic auth */
-        if (password == NULL)
-            password = "";
-    }
-
-    int count = 0;
-    while (count < max_client_connect) {
-        int client = -1;
-        do {
-            char buffer[4096];
-            fprintf (stderr, "socks_server: waiting for connection\n");
-            client = accept (server_fd, NULL, NULL);
-            TEST_ASSERT_SUCCESS_RAW_ERRNO (client);
-            count++;
-            fprintf (stderr, "socks_server: accepted client connection %d/%d\n",
-                     count, max_client_connect);
-
-            /* Greetings [version, nmethods, methods...]. */
-            recvall (client, buffer, 2);
-            TEST_ASSERT (buffer[0] == 0x5);
-            int nmethods = buffer[1];
-            int method = 0xff;
-            recvall (client, buffer, nmethods);
-            for (int i = 0; i < nmethods; i++) {
-                if (buffer[i] == auth_method)
-                    method = auth_method;
-            }
-            fprintf (stderr, "socks_server: received greetings\n");
-
-            /* Greetings response [version, method]. */
-            buffer[0] = 0x5;
-            buffer[1] = method;
-            sendall (client, buffer, 2);
-            fprintf (stderr,
-                     "socks_server: answered greetings (method: 0x%x)\n",
-                     method);
-
-            if (method == 0xff)
-                break; /* Out of client connection */
-
-            if (method == 0x2) {
-                int len;
-                int err = 0;
-                recvall (client, buffer, 1);
-                if (buffer[0] != 0x1) {
-                    err = 1;
-                } else {
-                    recvall (client, buffer, 1);
-                    len = (unsigned char) buffer[0];
-                    recvall (client, buffer, len);
-                    buffer[len] = '\0';
-                    if (strcmp (username, buffer) != 0) {
-                        fprintf (stderr,
-                                 "socks_server: error on username check: '%s', "
-                                 "expected: '%s'\n",
-                                 buffer, username);
-                        err = 1;
-                    }
-                    recvall (client, buffer, 1);
-                    len = (unsigned char) buffer[0];
-                    recvall (client, buffer, len);
-                    buffer[len] = '\0';
-                    if (strcmp (password, buffer) != 0) {
-                        fprintf (stderr,
-                                 "socks_server: error on password check: '%s', "
-                                 "expected: '%s'\n",
-                                 buffer, password);
-                        err = 1;
-                    }
-                }
-                fprintf (stderr, "socks_server: received credentials\n");
-                buffer[0] = 0x1;
-                buffer[1] = err;
-                sendall (client, buffer, 2);
-                fprintf (stderr,
-                         "socks_server: answered credentials (err: 0x%x)\n",
-                         err);
-                if (err != 0)
-                    break; /* Out of client connection. */
-            }
-
-            /* Request [version, cmd, rsv, atype, dst.addr, dst.port */
-            /* Test only tcp connect on top of IPV4 */
-            recvall (client, buffer, 4);
-            TEST_ASSERT (buffer[0] == 0x5);
-            TEST_ASSERT (buffer[1] == 0x1); /* CONNECT cmd */
-            TEST_ASSERT (buffer[2] == 0x0); /* reserved, ensure we send 0 */
-            fprintf (stderr,
-                     "socks_server: received command (cmd: %d, atype: %d)\n",
-                     buffer[1], buffer[3]);
-            /* IPv4 ADDR & PORT */
-            uint32_t naddr = 0, bind_naddr = 0;
-            uint16_t nport = 0, bind_nport = 0;
-            int remote = -1;
-            int err = 0;
-            int request_atype = buffer[3];
-            if (request_atype == 0x1) /* ATYPE IPv4 */ {
-                recvall (client, (char *) &naddr, 4);
-                fprintf (stderr,
-                         "socks_server: received address (addr: 0x%x)\n",
-                         ntohl (naddr));
-            } else if (request_atype == 0x3) /* ATYPE DOMAINNAME */ {
-                int len;
-                recvall (client, buffer, 1);
-                len = (unsigned char) buffer[0];
-                recvall (client, buffer, len);
-                buffer[len] = '\0';
-                fprintf (stderr,
-                         "socks_server: received domainname (hostname: %s)\n",
-                         buffer);
-                /* For the test we support static resolution of
-                   hostname "somedomainnmame.org" to localhost */
-                if (strcmp ("somedomainname.org", buffer) == 0) {
-                    naddr = htonl (0x7f000001); /* 127.0.0.1 */
-                } else {
-                    err = 0x4; /* Host unreachable */
-                }
-            } else if (request_atype == 0x4) {
-                /* For the test we simulate IPV6 connection request ::1, but connect to IPv4 localhost */
-                unsigned char nipv6local[16] = {0};
-                nipv6local[15] = 1;
-                recvall (client, buffer, 16);
-                fprintf (stderr,
-                         "socks_server: received ipv6 address (buffer:");
-                for (int i = 0; i < 16; i++)
-                    fprintf (stderr, " 0x%x", (unsigned char) buffer[i]);
-                fprintf (stderr, ")\n");
-                if (memcmp (buffer, nipv6local, 16) == 0) {
-                    naddr = htonl (0x7f000001); /* 127.0.0.1 */
-                } else {
-                    err = 0x4; /* Host unreachable */
-                }
-            } else {
-                err = 0x8; /* ATYPE not supported */
-            }
-            recvall (client, (char *) &nport, 2);
-            fprintf (stderr, "socks_server: received port (port: %d)\n",
-                     ntohs (nport));
-            if (err == 0) {
-                fprintf (stderr, "socks_server: trying to connect to %x:%d\n",
-                         ntohl (naddr), ntohs (nport));
-                remote = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-                res = remote_connect (remote, ntohl (naddr), ntohs (nport));
-                if (res != 0) {
-                    err = 0x5; /* Connection refused */
-                } else {
-                    struct sockaddr_in ip4addr;
-                    socklen_t len = sizeof (ip4addr);
-                    res =
-                      getsockname (remote, (struct sockaddr *) &ip4addr, &len);
-                    TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-                    fprintf (stderr,
-                             "socks_server: connected and bound at: %x:%d\n",
-                             ntohl (ip4addr.sin_addr.s_addr),
-                             ntohs (ip4addr.sin_port));
-                    bind_naddr = ip4addr.sin_addr.s_addr;
-                    bind_nport = ip4addr.sin_port;
-                }
-            }
-
-            /* Reply request */
-            buffer[0] = 0x5;
-            buffer[1] = err;
-            buffer[2] = 0;
-            buffer[3] = request_atype;
-            sendall (client, buffer, 4);
-            if (request_atype == 0x1) /* ATYPE IPv4 */ {
-                sendall (client, (char *) &bind_naddr, 4);
-            } else if (request_atype == 0x3) {
-                /* This is just for testing reply with a hostname,
-                   normally a resolved address is passed in return to connect. */
-                buffer[0] = strlen ("localhost");
-                sendall (client, buffer, 1);
-                strcpy (buffer, "localhost");
-                sendall (client, buffer, strlen ("localhost"));
-            } else if (request_atype == 0x4) {
-                /* We simulate a bind to ::1, though the actual connection is IPv4 */
-                char nipv6local[16] = {0};
-                nipv6local[15] = 1;
-                sendall (client, nipv6local, sizeof nipv6local);
-            }
-            sendall (client, (char *) &bind_nport, 2);
-            fprintf (stderr, "socks_server: replied to request (err: 0x%x)\n",
-                     err);
-            if (err != 0)
-                break; /* Out of client connection. */
-
-            /* Communication loop */
-            zmq_pollitem_t items[] = {
-              {NULL, client, ZMQ_POLLIN, 0},
-              {NULL, remote, ZMQ_POLLIN, 0},
-            };
-            fprintf (stderr,
-                     "socks_server: waiting for input (client fd: %d, remote "
-                     "fd: %d)\n",
-                     client, remote);
-            while (1) {
-                if (client == -1 || remote == -1)
-                    break;
-                if (zmq_poll (items, 2, -1) < 0)
-                    break;
-                int nbytes;
-                for (int i = 0; i < 2; i++) {
-                    if ((items[i].revents & ZMQ_POLLIN) == 0)
-                        continue;
-                    fprintf (stderr, "socks_server: ready to read from fd %d\n",
-                             items[i].fd);
-                    int write_fd, read_fd = items[i].fd;
-                    if (read_fd == client) {
-                        write_fd = remote;
-                    } else {
-                        write_fd = client;
-                    }
-                    nbytes = recvonce (read_fd, buffer, sizeof buffer);
-                    fprintf (stderr, "socks_server: read returned: %d\n",
-                             nbytes);
-                    if (nbytes == 0 || nbytes == -1) {
-                        /* End of stream or error */
-                        if (read_fd == client) {
-                            close (client);
-                            client = -1;
-                        }
-                        if (read_fd == remote) {
-                            close (remote);
-                            remote = -1;
-                        }
-                        break;
-                    }
-                    sendall (write_fd, buffer, nbytes);
-                }
-            }
-            if (remote != -1) {
-                close (remote);
-                remote = -1;
-            }
-            fprintf (stderr, "socks_server: closed remote connection %d/%d\n",
-                     count, max_client_connect);
-        } while (0); /* Client socket scope. */
-        if (client != -1) {
-            close (client);
-            client = -1;
-        }
-        fprintf (stderr, "socks_server: closed client connection %d/%d\n",
-                 count, max_client_connect);
-    }
-    close (server_fd);
-    fprintf (stderr, "socks_server: closed server\n");
-}
-
-void socks_server_no_auth (void *socks_server)
-{
-    socks_server_task (socks_server, NULL, NULL, 1);
-}
-
-void socks_server_no_auth_delay (void *socks_server)
-{
-    fprintf (stderr, "socks_server: delay no auth socks server start\n");
-    // Enough delay to have client connecting before proxy listens
-    msleep (SETTLE_TIME * 10);
-    socks_server_task (socks_server, NULL, NULL, 1);
-}
-
-void socks_server_basic_auth (void *socks_server)
-{
-    socks_server_task (socks_server, "someuser", "somepass", 1);
-}
-
-void socks_server_basic_auth_delay (void *socks_server)
-{
-    fprintf (stderr, "socks_server: delay basic auth socks server start\n");
-    // Enough delay to have client connecting before proxy listens
-    msleep (SETTLE_TIME * 10);
-    socks_server_task (socks_server, "someuser", "somepass", 1);
-}
-
-void socks_server_basic_auth_no_pass (void *socks_server)
-{
-    socks_server_task (socks_server, "someuser", NULL, 1);
-}
-
-void *setup_push_server (char *connect_address, int connect_address_size)
-{
-    int res;
-    const char *bind_address = "tcp://127.0.0.1:*";
-    void *push = test_context_socket (ZMQ_PUSH);
-    res = zmq_bind (push, bind_address);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    size_t len = connect_address_size;
-    res = zmq_getsockopt (push, ZMQ_LAST_ENDPOINT, connect_address, &len);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    fprintf (stderr, "push_server: bound to: %s\n", connect_address);
-    return push;
-}
-
-void *setup_pull_client (const char *connect_address, const char *socks_proxy)
-{
-    int res;
-    void *pull = test_context_socket (ZMQ_PULL);
-    if (socks_proxy != NULL) {
-        res = zmq_setsockopt (pull, ZMQ_SOCKS_PROXY, socks_proxy,
-                              strlen (socks_proxy));
-        TEST_ASSERT_SUCCESS_ERRNO (res);
-        fprintf (stderr, "pull_client: use socks proxy: tcp://%s\n",
-                 socks_proxy);
-    }
-    res = zmq_connect (pull, connect_address);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    fprintf (stderr, "pull_client: connected to: %s\n", connect_address);
-    return pull;
-}
-
-#ifdef ZMQ_BUILD_DRAFT_API
-void *setup_pull_client_with_auth (const char *connect_address,
-                                   const char *socks_proxy,
-                                   const char *username,
-                                   const char *password)
-{
-    int res;
-    void *pull = test_context_socket (ZMQ_PULL);
-
-    if (socks_proxy != NULL) {
-        res = zmq_setsockopt (pull, ZMQ_SOCKS_PROXY, socks_proxy,
-                              strlen (socks_proxy));
-        TEST_ASSERT_SUCCESS_ERRNO (res);
-        fprintf (stderr, "pull_client: use socks proxy: tcp://%s\n",
-                 socks_proxy);
-    }
-
-    res = zmq_setsockopt (pull, ZMQ_SOCKS_USERNAME, username,
-                          username == NULL ? 0 : strlen (username));
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-
-    res = zmq_setsockopt (pull, ZMQ_SOCKS_PASSWORD, password,
-                          password == NULL ? 0 : strlen (password));
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-
-    res = zmq_connect (pull, connect_address);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    fprintf (stderr, "pull_client: connected to: %s\n", connect_address);
-    return pull;
-}
-#endif
-
-void communicate (void *push, void *pull)
-{
-    fprintf (stderr, "push_server: sending 2 messages\n");
-    s_send_seq (push, "ABC", SEQ_END);
-    s_send_seq (push, "DEF", SEQ_END);
-
-    fprintf (stderr, "pull_client: receiving 2 messages\n");
-    s_recv_seq (pull, "ABC", SEQ_END);
-    s_recv_seq (pull, "DEF", SEQ_END);
-}
-
-void test_socks_no_socks (void)
-{
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client (connect_address, NULL);
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-}
-
-void test_socks (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client (connect_address, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_delay (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client (connect_address, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth_delay, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_domainname (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    char connect_address_hostname[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    // Will be resolved by the proxy test server to 127.0.0.1
-    strcpy (connect_address_hostname, "tcp://somedomainname.org");
-    strcat (connect_address_hostname, strrchr (connect_address, ':'));
-    void *pull =
-      setup_pull_client (connect_address_hostname, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_ipv6 (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    char connect_address_hostname[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    // Will be resolved by the proxy test server to 127.0.0.1
-    strcpy (connect_address_hostname, "tcp://::1");
-    strcat (connect_address_hostname, strrchr (connect_address, ':'));
-    void *pull =
-      setup_pull_client (connect_address_hostname, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_ipv6_sb (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    char connect_address_hostname[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    // Will be resolved by the proxy test server to 127.0.0.1
-    strcpy (connect_address_hostname, "tcp://[::1]");
-    strcat (connect_address_hostname, strrchr (connect_address, ':'));
-    void *pull =
-      setup_pull_client (connect_address_hostname, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_bind_before_connect (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    char socks_address_bind_before_connect[MAX_SOCKET_STRING * 2];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    // Will do a bind before connect when connecting to proxy
-    strcpy (socks_address_bind_before_connect, "127.0.0.1:0;");
-    strcat (socks_address_bind_before_connect, socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull =
-      setup_pull_client (connect_address, socks_address_bind_before_connect);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_basic_auth (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (
-      connect_address, socks_server_address, "someuser", "somepass");
-    void *thread = zmq_threadstart (&socks_server_basic_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_delay (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (
-      connect_address, socks_server_address, "someuser", "somepass");
-    void *thread = zmq_threadstart (&socks_server_basic_auth_delay, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_empty_user (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (connect_address,
-                                              socks_server_address, "", NULL);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_null_user (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (connect_address,
-                                              socks_server_address, NULL, NULL);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_empty_pass (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (
-      connect_address, socks_server_address, "someuser", "");
-    void *thread = zmq_threadstart (&socks_server_basic_auth_no_pass, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_null_pass (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (
-      connect_address, socks_server_address, "someuser", NULL);
-    void *thread = zmq_threadstart (&socks_server_basic_auth_no_pass, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-
-void test_string_opt_ok (const char *msg, int opt, const char *value)
-{
-    int res;
-    void *sub = test_context_socket (ZMQ_SUB);
-    fprintf (stderr, "test_string_opt_ok: testing %s\n", msg);
-    res = zmq_setsockopt (sub, opt, value, strlen (value));
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    char buffer[1024];
-    size_t res_len = (size_t) sizeof buffer;
-    res = zmq_getsockopt (sub, opt, buffer, &res_len);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    TEST_ASSERT_EQUAL (strlen (value) + 1, res_len);
-    TEST_ASSERT (strcmp (buffer, value) == 0);
-    test_context_socket_close_zero_linger (sub);
-}
-
-void test_opt_ok (const char *msg,
-                  int opt,
-                  const char *value,
-                  size_t len,
-                  const char *expected_value,
-                  size_t expected_len)
-{
-    int res;
-    void *sub = test_context_socket (ZMQ_SUB);
-    fprintf (stderr, "test_opt_ok: testing %s\n", msg);
-    res = zmq_setsockopt (sub, opt, value, len);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    char buffer[1024];
-    size_t res_len = (size_t) sizeof buffer;
-    res = zmq_getsockopt (sub, opt, buffer, &res_len);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    TEST_ASSERT_EQUAL (expected_len + 1, res_len);
-    TEST_ASSERT_EQUAL (expected_len, strlen (buffer));
-    TEST_ASSERT (strncmp (buffer, expected_value, expected_len) == 0);
-    test_context_socket_close_zero_linger (sub);
-}
-
-void test_opt_invalid (const char *msg, int opt, const char *value, int len)
-{
-    int res;
-    void *sub = test_context_socket (ZMQ_SUB);
-    fprintf (stderr, "test_opt_invalid: testing %s\n", msg);
-    res = zmq_setsockopt (sub, opt, value, len);
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, res);
-    test_context_socket_close_zero_linger (sub);
-}
-
-void test_socks_proxy_options (void)
-{
-    // NULL is equivalent to not set and returns empty string
-    test_opt_ok ("NULL proxy", ZMQ_SOCKS_PROXY, NULL, 0, "", 0);
-    test_string_opt_ok ("valid proxy", ZMQ_SOCKS_PROXY, "somehost:1080");
-    // Empty value not allowed for proxy server
-    test_opt_invalid ("empty proxy", ZMQ_SOCKS_PROXY, "", 0);
-}
-
-void test_socks_userpass_options (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char buffer[1024];
-    for (int i = 0; i < (int) sizeof buffer; i++) {
-        buffer[i] = 'a' + i % 26;
-    }
-
-    // NULL is equivalent to not-set or ""
-    test_opt_ok ("NULL username", ZMQ_SOCKS_USERNAME, NULL, 0, "", 0);
-    // Empty value is allowed for username, means no authentication
-    test_string_opt_ok ("empty username", ZMQ_SOCKS_USERNAME, "");
-    test_string_opt_ok ("valid username", ZMQ_SOCKS_USERNAME, "someuser");
-    test_opt_ok ("255 bytes username", ZMQ_SOCKS_USERNAME, buffer, 255, buffer,
-                 255);
-    test_opt_invalid ("too long username", ZMQ_SOCKS_USERNAME, buffer, 256);
-
-    // NULL is equivalent to not-set or ""
-    test_opt_ok ("NULL password", ZMQ_SOCKS_PASSWORD, NULL, 0, "", 0);
-    // Empty value allowed for password
-    test_string_opt_ok ("empty password", ZMQ_SOCKS_PASSWORD, "");
-    test_string_opt_ok ("valid password", ZMQ_SOCKS_PASSWORD, "someuser");
-    test_opt_ok ("255 bytes password", ZMQ_SOCKS_PASSWORD, buffer, 255, buffer,
-                 255);
-    test_opt_invalid ("too long password", ZMQ_SOCKS_PASSWORD, buffer, 256);
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without DRAFT support, ignoring socks setopt "
-                         "username/password test");
-#endif
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_socks_proxy_options);
-    RUN_TEST (test_socks_userpass_options);
-    RUN_TEST (test_socks_no_socks);
-    RUN_TEST (test_socks);
-    RUN_TEST (test_socks_delay);
-    RUN_TEST (test_socks_domainname);
-    RUN_TEST (test_socks_ipv6);
-    RUN_TEST (test_socks_ipv6_sb);
-    RUN_TEST (test_socks_bind_before_connect);
-    RUN_TEST (test_socks_basic_auth);
-    RUN_TEST (test_socks_basic_auth_delay);
-    RUN_TEST (test_socks_basic_auth_empty_user);
-    RUN_TEST (test_socks_basic_auth_null_user);
-    RUN_TEST (test_socks_basic_auth_empty_pass);
-    RUN_TEST (test_socks_basic_auth_null_pass);
-    return UNITY_END ();
-}
diff --git a/tests/test_sodium.cpp b/tests/test_sodium.cpp
deleted file mode 100644
index 1cd7fce59..000000000
--- a/tests/test_sodium.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-// There is no way to test for correctness because of the embedded RNG.
-void test__zmq_curve_keypair__always__success (void)
-{
-    errno = 0;
-    char public_key[41] = {0};
-    char secret_key[41] = {0};
-
-    const int rc = zmq_curve_keypair (public_key, secret_key);
-
-#if defined(ZMQ_HAVE_CURVE)
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-#else
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSUP, rc);
-#endif
-}
-
-void test__zmq_curve_public__valid__success ()
-{
-    // These are paired according to hintjens.com/blog:45
-    static const char public_key[] = "Yne@$w-vo<fVvi]a<NY6T1ed:M$fCG*[IaLV{hID";
-    static const char secret_key[] = "D:)Q[IlAW!ahhC2ac:9*A}h:p?([4%wOTJ%JR%cs";
-
-    errno = 0;
-    char out_public[41] = {0};
-
-    const int rc = zmq_curve_public (out_public, secret_key);
-
-#if defined(ZMQ_HAVE_CURVE)
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL_STRING (public_key, out_public);
-#else
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSUP, rc);
-    (void) public_key;
-#endif
-}
-
-// The key length must be evenly divisible by 5 or must fail with EINVAL.
-void test__zmq_curve_public__invalid__failure (const char *secret_)
-{
-    errno = 0;
-    char out_public[41] = {0};
-
-    const int rc = zmq_curve_public (out_public, secret_);
-
-#if defined(ZMQ_HAVE_CURVE)
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, rc);
-    TEST_ASSERT_EQUAL_STRING ("", out_public);
-#else
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSUP, rc);
-#endif
-}
-
-void test__zmq_curve_public__invalid__failure_short ()
-{
-    test__zmq_curve_public__invalid__failure ("42");
-}
-
-void test__zmq_curve_public__invalid__failure_long ()
-{
-    test__zmq_curve_public__invalid__failure (
-      "0123456789012345678901234567890123456789.");
-}
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test__zmq_curve_keypair__always__success);
-
-    RUN_TEST (test__zmq_curve_public__valid__success);
-    RUN_TEST (test__zmq_curve_public__invalid__failure_short);
-    RUN_TEST (test__zmq_curve_public__invalid__failure_long);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_spec_dealer.cpp b/tests/test_spec_dealer.cpp
deleted file mode 100644
index 8b9aeb7fa..000000000
--- a/tests/test_spec_dealer.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// SHALL route outgoing messages to available peers using a round-robin
-// strategy.
-void test_round_robin_out (const char *bind_address_)
-{
-    void *dealer = test_context_socket (ZMQ_DEALER);
-
-    char connect_address[MAX_SOCKET_STRING];
-    test_bind (dealer, bind_address_, connect_address,
-               sizeof (connect_address));
-
-    const size_t services = 5;
-    void *rep[services];
-    for (size_t peer = 0; peer < services; ++peer) {
-        rep[peer] = test_context_socket (ZMQ_REP);
-
-        int timeout = 250;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rep[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep[peer], connect_address));
-    }
-
-    // Wait for connections.
-    msleep (SETTLE_TIME);
-
-    // Send all requests
-    for (size_t i = 0; i < services; ++i)
-        s_send_seq (dealer, 0, "ABC", SEQ_END);
-
-    // Expect every REP got one message
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        s_recv_seq (rep[peer], "ABC", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (dealer);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (rep[peer]);
-}
-
-// SHALL receive incoming messages from its peers using a fair-queuing
-// strategy.
-void test_fair_queue_in (const char *bind_address_)
-{
-    void *receiver = test_context_socket (ZMQ_DEALER);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (receiver, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    char connect_address[MAX_SOCKET_STRING];
-    test_bind (receiver, bind_address_, connect_address,
-               sizeof (connect_address));
-
-    const size_t services = 5;
-    void *senders[services];
-    for (size_t peer = 0; peer < services; ++peer) {
-        senders[peer] = test_context_socket (ZMQ_DEALER);
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (senders[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_connect (senders[peer], connect_address));
-    }
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    s_send_seq (senders[0], "A", SEQ_END);
-    s_recv_seq (receiver, "A", SEQ_END);
-
-    s_send_seq (senders[0], "A", SEQ_END);
-    s_recv_seq (receiver, "A", SEQ_END);
-
-    // send our requests
-    for (size_t peer = 0; peer < services; ++peer)
-        s_send_seq (senders[peer], "B", SEQ_END);
-
-    // Wait for data.
-    msleep (SETTLE_TIME);
-
-    // handle the requests
-    for (size_t peer = 0; peer < services; ++peer)
-        s_recv_seq (receiver, "B", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (receiver);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (senders[peer]);
-}
-
-// SHALL create a double queue when a peer connects to it. If this peer
-// disconnects, the DEALER socket SHALL destroy its double queue and SHALL
-// discard any messages it contains.
-void test_destroy_queue_on_disconnect (const char *bind_address_)
-{
-    void *a = test_context_socket (ZMQ_DEALER);
-
-    char connect_address[MAX_SOCKET_STRING];
-    test_bind (a, bind_address_, connect_address, sizeof (connect_address));
-
-    void *b = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    // Send a message in both directions
-    s_send_seq (a, "ABC", SEQ_END);
-    s_send_seq (b, "DEF", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (b, connect_address));
-
-    // Disconnect may take time and need command processing.
-    zmq_pollitem_t poller[2] = {{a, 0, 0, 0}, {b, 0, 0, 0}};
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100));
-
-    // No messages should be available, sending should fail.
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (a, 0, 0, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, a, ZMQ_DONTWAIT));
-
-    // After a reconnect of B, the messages should still be gone
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, a, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, b, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (a);
-    test_context_socket_close_zero_linger (b);
-}
-
-// SHALL block on sending, or return a suitable error, when it has no connected peers.
-void test_block_on_send_no_peers (const char *bind_address_)
-{
-    void *sc = test_context_socket (ZMQ_DEALER);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof (timeout)));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, ZMQ_DONTWAIT));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, 0));
-
-    test_context_socket_close (sc);
-}
-
-#define TEST_CASES(name, bind_address)                                         \
-    void test_round_robin_out_##name ()                                        \
-    {                                                                          \
-        test_round_robin_out (bind_address);                                   \
-    }                                                                          \
-    void test_fair_queue_in_##name () { test_fair_queue_in (bind_address); }   \
-    void test_block_on_send_no_peers_##name ()                                 \
-    {                                                                          \
-        test_block_on_send_no_peers (bind_address);                            \
-    }
-
-TEST_CASES (inproc, "inproc://a")
-TEST_CASES (tcp, "tcp://127.0.0.1:*")
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_round_robin_out_inproc);
-    RUN_TEST (test_fair_queue_in_inproc);
-    RUN_TEST (test_block_on_send_no_peers_inproc);
-
-    RUN_TEST (test_round_robin_out_tcp);
-    RUN_TEST (test_fair_queue_in_tcp);
-    RUN_TEST (test_block_on_send_no_peers_tcp);
-
-    // TODO *** Test disabled until libzmq does this properly ***
-    // test_destroy_queue_on_disconnect (ctx);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_spec_pushpull.cpp b/tests/test_spec_pushpull.cpp
deleted file mode 100644
index 2c31c9345..000000000
--- a/tests/test_spec_pushpull.cpp
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-char connect_address[MAX_SOCKET_STRING];
-
-// PUSH: SHALL route outgoing messages to connected peers using a
-// round-robin strategy.
-void test_push_round_robin_out (const char *bind_address_)
-{
-    void *push = test_context_socket (ZMQ_PUSH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (push, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (push, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const size_t services = 5;
-    void *pulls[services];
-    for (size_t peer = 0; peer < services; ++peer) {
-        pulls[peer] = test_context_socket (ZMQ_PULL);
-
-        int timeout = 250;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (pulls[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pulls[peer], connect_address));
-    }
-
-    // Wait for connections.
-    msleep (SETTLE_TIME);
-
-    // Send 2N messages
-    for (size_t peer = 0; peer < services; ++peer)
-        s_send_seq (push, "ABC", SEQ_END);
-    for (size_t peer = 0; peer < services; ++peer)
-        s_send_seq (push, "DEF", SEQ_END);
-
-    // Expect every PULL got one of each
-    for (size_t peer = 0; peer < services; ++peer) {
-        s_recv_seq (pulls[peer], "ABC", SEQ_END);
-        s_recv_seq (pulls[peer], "DEF", SEQ_END);
-    }
-
-    test_context_socket_close_zero_linger (push);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (pulls[peer]);
-}
-
-// PULL: SHALL receive incoming messages from its peers using a fair-queuing
-// strategy.
-void test_pull_fair_queue_in (const char *bind_address_)
-{
-    void *pull = test_context_socket (ZMQ_PULL);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pull, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (pull, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const unsigned char services = 5;
-    void *pushs[services];
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        pushs[peer] = test_context_socket (ZMQ_PUSH);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pushs[peer], connect_address));
-    }
-
-    // Wait for connections.
-    msleep (SETTLE_TIME);
-
-    int first_half = 0;
-    int second_half = 0;
-
-    // Send 2N messages
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        char *str = strdup ("A");
-
-        str[0] += peer;
-        s_send_seq (pushs[peer], str, SEQ_END);
-        first_half += str[0];
-
-        str[0] += services;
-        s_send_seq (pushs[peer], str, SEQ_END);
-        second_half += str[0];
-
-        free (str);
-    }
-
-    // Wait for data.
-    msleep (SETTLE_TIME);
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    // Expect to pull one from each first
-    for (size_t peer = 0; peer < services; ++peer) {
-        TEST_ASSERT_EQUAL_INT (
-          2, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, pull, 0)));
-        const char *str = static_cast<const char *> (zmq_msg_data (&msg));
-        first_half -= str[0];
-    }
-    TEST_ASSERT_EQUAL_INT (0, first_half);
-
-    // And then get the second batch
-    for (size_t peer = 0; peer < services; ++peer) {
-        TEST_ASSERT_EQUAL_INT (
-          2, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, pull, 0)));
-        const char *str = static_cast<const char *> (zmq_msg_data (&msg));
-        second_half -= str[0];
-    }
-    TEST_ASSERT_EQUAL_INT (0, second_half);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (pull);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (pushs[peer]);
-}
-
-// PUSH: SHALL block on sending, or return a suitable error, when it has no
-// available peers.
-void test_push_block_on_send_no_peers (const char *bind_address_)
-{
-    void *sc = test_context_socket (ZMQ_PUSH);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof (timeout)));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, ZMQ_DONTWAIT));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, 0));
-
-    test_context_socket_close (sc);
-}
-
-// PUSH and PULL: SHALL create this queue when a peer connects to it. If
-// this peer disconnects, the socket SHALL destroy its queue and SHALL
-// discard any messages it contains.
-void test_destroy_queue_on_disconnect (const char *bind_address_)
-{
-    void *a = test_context_socket (ZMQ_PUSH);
-
-    int hwm = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (a, ZMQ_SNDHWM, &hwm, sizeof (hwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (a, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (a, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    void *b = test_context_socket (ZMQ_PULL);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (b, ZMQ_RCVHWM, &hwm, sizeof (hwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    // Send two messages, one should be stuck in A's outgoing queue, the other
-    // arrives at B.
-    s_send_seq (a, "ABC", SEQ_END);
-    s_send_seq (a, "DEF", SEQ_END);
-
-    // Both queues should now be full, indicated by A blocking on send.
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (a, 0, 0, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (b, connect_address));
-
-    // Disconnect may take time and need command processing.
-    zmq_pollitem_t poller[2] = {{a, 0, 0, 0}, {b, 0, 0, 0}};
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100)));
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100)));
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    // Can't receive old data on B.
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, b, ZMQ_DONTWAIT));
-
-    // Sending fails.
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (a, 0, 0, ZMQ_DONTWAIT));
-
-    // Reconnect B
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    // Still can't receive old data on B.
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, b, ZMQ_DONTWAIT));
-
-    // two messages should be sendable before the queues are filled up.
-    s_send_seq (a, "ABC", SEQ_END);
-    s_send_seq (a, "DEF", SEQ_END);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (a, 0, 0, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (a);
-    test_context_socket_close_zero_linger (b);
-}
-
-// PUSH and PULL: SHALL either receive or drop multipart messages atomically.
-void test_push_multipart_atomic_drop (const char *bind_address_,
-                                      const bool block_)
-{
-    int linger = 0;
-    int hwm = 1;
-
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (push, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (push, ZMQ_SNDHWM, &hwm, sizeof (hwm)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (push, bind_address_));
-    size_t addr_len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (push, ZMQ_LAST_ENDPOINT, connect_address, &addr_len));
-
-    void *pull = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pull, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pull, ZMQ_RCVHWM, &hwm, sizeof (hwm)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pull, connect_address));
-
-    // Wait for connections.
-    msleep (SETTLE_TIME);
-
-    int rc;
-    zmq_msg_t msg_data;
-    // A large message is needed to overrun the TCP buffers
-    const size_t len = 16 * 1024 * 1024;
-    size_t zmq_events_size = sizeof (int);
-    int zmq_events;
-
-    // Normal case - excercise the queues
-    send_string_expect_success (push, "0", ZMQ_SNDMORE);
-    send_string_expect_success (push, "0", ZMQ_SNDMORE);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg_data, len));
-    memset (zmq_msg_data (&msg_data), 'a', len);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_send (&msg_data, push, 0));
-
-    recv_string_expect_success (pull, "0", 0);
-    recv_string_expect_success (pull, "0", 0);
-    zmq_msg_init (&msg_data);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_recv (&msg_data, pull, 0));
-    zmq_msg_close (&msg_data);
-
-    // Fill the HWMs of sender and receiver, one message each
-    send_string_expect_success (push, "1", 0);
-
-    send_string_expect_success (push, "2", ZMQ_SNDMORE);
-    send_string_expect_success (push, "2", ZMQ_SNDMORE);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg_data, len));
-    memset (zmq_msg_data (&msg_data), 'b', len);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_send (&msg_data, push, 0));
-
-    // Disconnect and simulate a poll (doesn't work on Windows) to
-    // let the commands run and let the pipes start to be deallocated
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (pull, connect_address));
-
-    zmq_getsockopt (push, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    zmq_getsockopt (pull, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    msleep (SETTLE_TIME);
-    zmq_getsockopt (push, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    zmq_getsockopt (pull, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-
-    // Reconnect and immediately push a large message into the pipe,
-    // if the problem is reproduced the pipe is in the process of being
-    // terminated but still exists (state term_ack_sent) and had already
-    // accepted the frame, so with the first frames already gone and
-    // unreachable only the last is left, and is stuck in the lb.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pull, connect_address));
-
-    send_string_expect_success (push, "3", ZMQ_SNDMORE);
-    send_string_expect_success (push, "3", ZMQ_SNDMORE);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg_data, len));
-    memset (zmq_msg_data (&msg_data), 'c', len);
-    if (block_) {
-        TEST_ASSERT_EQUAL_INT (len,
-                               zmq_msg_send (&msg_data, push, ZMQ_SNDMORE));
-    } else {
-        rc = zmq_msg_send (&msg_data, push, ZMQ_SNDMORE | ZMQ_DONTWAIT);
-        // inproc won't fail, much faster to connect/disconnect pipes than TCP
-        if (rc == -1) {
-            // at this point the new pipe is there and it works
-            send_string_expect_success (push, "3", ZMQ_SNDMORE);
-            send_string_expect_success (push, "3", ZMQ_SNDMORE);
-            TEST_ASSERT_EQUAL_INT (len,
-                                   zmq_msg_send (&msg_data, push, ZMQ_SNDMORE));
-        }
-    }
-    send_string_expect_success (push, "3b", 0);
-
-    zmq_getsockopt (push, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    zmq_getsockopt (pull, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    msleep (SETTLE_TIME);
-    zmq_getsockopt (push, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    zmq_getsockopt (pull, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-
-    send_string_expect_success (push, "5", ZMQ_SNDMORE);
-    send_string_expect_success (push, "5", ZMQ_SNDMORE);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg_data, len));
-    memset (zmq_msg_data (&msg_data), 'd', len);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_send (&msg_data, push, 0));
-
-    // On very slow machines the message will not be lost, as it will
-    // be sent when the new pipe is already in place, so avoid failing
-    // and simply carry on as it would be very noisy otherwise.
-    // Receive both to avoid leaking metadata.
-    // If only the "5" message is received, the problem is reproduced, and
-    // without the fix the first message received would be the last large
-    // frame of "3".
-    char buffer[2];
-    rc =
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (pull, buffer, sizeof (buffer), 0));
-    TEST_ASSERT_EQUAL_INT (1, rc);
-    TEST_ASSERT_TRUE (buffer[0] == '3' || buffer[0] == '5');
-    if (buffer[0] == '3') {
-        recv_string_expect_success (pull, "3", 0);
-        zmq_msg_init (&msg_data);
-        TEST_ASSERT_EQUAL_INT (len, zmq_msg_recv (&msg_data, pull, 0));
-        zmq_msg_close (&msg_data);
-        recv_string_expect_success (pull, "3b", 0);
-        recv_string_expect_success (pull, "5", 0);
-    }
-    recv_string_expect_success (pull, "5", 0);
-    zmq_msg_init (&msg_data);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_recv (&msg_data, pull, 0));
-    zmq_msg_close (&msg_data);
-
-    test_context_socket_close_zero_linger (pull);
-    test_context_socket_close_zero_linger (push);
-}
-
-#define def_test_spec_pushpull(name, bind_address_)                            \
-    void test_spec_pushpull_##name##_push_round_robin_out ()                   \
-    {                                                                          \
-        test_push_round_robin_out (bind_address_);                             \
-    }                                                                          \
-    void test_spec_pushpull_##name##_pull_fair_queue_in ()                     \
-    {                                                                          \
-        test_pull_fair_queue_in (bind_address_);                               \
-    }                                                                          \
-    void test_spec_pushpull_##name##_push_block_on_send_no_peers ()            \
-    {                                                                          \
-        test_push_block_on_send_no_peers (bind_address_);                      \
-    }                                                                          \
-    void test_spec_pushpull_##name##_destroy_queue_on_disconnect ()            \
-    {                                                                          \
-        test_destroy_queue_on_disconnect (bind_address_);                      \
-    }                                                                          \
-    void test_spec_pushpull_##name##_push_multipart_atomic_drop_block ()       \
-    {                                                                          \
-        test_push_multipart_atomic_drop (bind_address_, true);                 \
-    }                                                                          \
-    void test_spec_pushpull_##name##_push_multipart_atomic_drop_non_block ()   \
-    {                                                                          \
-        test_push_multipart_atomic_drop (bind_address_, false);                \
-    }
-
-def_test_spec_pushpull (inproc, "inproc://a")
-
-  def_test_spec_pushpull (tcp, "tcp://127.0.0.1:*")
-
-    int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_spec_pushpull_inproc_push_round_robin_out);
-    RUN_TEST (test_spec_pushpull_tcp_push_round_robin_out);
-    RUN_TEST (test_spec_pushpull_inproc_pull_fair_queue_in);
-    RUN_TEST (test_spec_pushpull_tcp_pull_fair_queue_in);
-    RUN_TEST (test_spec_pushpull_inproc_push_block_on_send_no_peers);
-    RUN_TEST (test_spec_pushpull_tcp_push_block_on_send_no_peers);
-    // TODO Tests disabled until libzmq does this properly
-    //RUN_TEST (test_spec_pushpull_inproc_destroy_queue_on_disconnect);
-    //RUN_TEST (test_spec_pushpull_tcp_destroy_queue_on_disconnect);
-    RUN_TEST (test_spec_pushpull_inproc_push_multipart_atomic_drop_block);
-    RUN_TEST (test_spec_pushpull_inproc_push_multipart_atomic_drop_non_block);
-    RUN_TEST (test_spec_pushpull_tcp_push_multipart_atomic_drop_block);
-    RUN_TEST (test_spec_pushpull_tcp_push_multipart_atomic_drop_non_block);
-    return UNITY_END ();
-}
diff --git a/tests/test_spec_rep.cpp b/tests/test_spec_rep.cpp
deleted file mode 100644
index a183b0a41..000000000
--- a/tests/test_spec_rep.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-char connect_address[MAX_SOCKET_STRING];
-
-void test_fair_queue_in (const char *bind_address_)
-{
-    void *rep = test_context_socket (ZMQ_REP);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rep, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (rep, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const size_t services = 5;
-    void *reqs[services];
-    for (size_t peer = 0; peer < services; ++peer) {
-        reqs[peer] = test_context_socket (ZMQ_REQ);
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (reqs[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (reqs[peer], connect_address));
-    }
-
-    msleep (SETTLE_TIME);
-
-    s_send_seq (reqs[0], "A", SEQ_END);
-    s_recv_seq (rep, "A", SEQ_END);
-    s_send_seq (rep, "A", SEQ_END);
-    s_recv_seq (reqs[0], "A", SEQ_END);
-
-    s_send_seq (reqs[0], "A", SEQ_END);
-    s_recv_seq (rep, "A", SEQ_END);
-    s_send_seq (rep, "A", SEQ_END);
-    s_recv_seq (reqs[0], "A", SEQ_END);
-
-    // TODO: following test fails randomly on some boxes
-#ifdef SOMEONE_FIXES_THIS
-    // send N requests
-    for (size_t peer = 0; peer < services; ++peer) {
-        char *str = strdup ("A");
-        str[0] += peer;
-        s_send_seq (reqs[peer], str, SEQ_END);
-        free (str);
-    }
-
-    // handle N requests
-    for (size_t peer = 0; peer < services; ++peer) {
-        char *str = strdup ("A");
-        str[0] += peer;
-        //  Test fails here
-        s_recv_seq (rep, str, SEQ_END);
-        s_send_seq (rep, str, SEQ_END);
-        s_recv_seq (reqs[peer], str, SEQ_END);
-        free (str);
-    }
-#endif
-    test_context_socket_close_zero_linger (rep);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (reqs[peer]);
-}
-
-void test_envelope (const char *bind_address_)
-{
-    void *rep = test_context_socket (ZMQ_REP);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (rep, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    void *dealer = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, connect_address));
-
-    // minimal envelope
-    s_send_seq (dealer, 0, "A", SEQ_END);
-    s_recv_seq (rep, "A", SEQ_END);
-    s_send_seq (rep, "A", SEQ_END);
-    s_recv_seq (dealer, 0, "A", SEQ_END);
-
-    // big envelope
-    s_send_seq (dealer, "X", "Y", 0, "A", SEQ_END);
-    s_recv_seq (rep, "A", SEQ_END);
-    s_send_seq (rep, "A", SEQ_END);
-    s_recv_seq (dealer, "X", "Y", 0, "A", SEQ_END);
-
-    test_context_socket_close_zero_linger (rep);
-    test_context_socket_close_zero_linger (dealer);
-}
-
-const char bind_inproc[] = "inproc://a";
-const char bind_tcp[] = "tcp://127.0.0.1:*";
-
-void test_fair_queue_in_inproc ()
-{
-    test_fair_queue_in (bind_inproc);
-}
-
-void test_fair_queue_in_tcp ()
-{
-    test_fair_queue_in (bind_tcp);
-}
-
-void test_envelope_inproc ()
-{
-    test_envelope (bind_inproc);
-}
-
-void test_envelope_tcp ()
-{
-    test_envelope (bind_tcp);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    // SHALL receive incoming messages from its peers using a fair-queuing
-    // strategy.
-    RUN_TEST (test_fair_queue_in_inproc);
-    RUN_TEST (test_fair_queue_in_tcp);
-
-    // For an incoming message:
-    // SHALL remove and store the address envelope, including the delimiter.
-    // SHALL pass the remaining data frames to its calling application.
-    // SHALL wait for a single reply message from its calling application.
-    // SHALL prepend the address envelope and delimiter.
-    // SHALL deliver this message back to the originating peer.
-    RUN_TEST (test_envelope_inproc);
-    RUN_TEST (test_envelope_tcp);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_spec_req.cpp b/tests/test_spec_req.cpp
deleted file mode 100644
index 6df0de812..000000000
--- a/tests/test_spec_req.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-char connect_address[MAX_SOCKET_STRING];
-
-void test_round_robin_out (const char *bind_address_)
-{
-    void *req = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (req, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const size_t services = 5;
-    void *rep[services];
-    for (size_t peer = 0; peer < services; peer++) {
-        rep[peer] = test_context_socket (ZMQ_REP);
-
-        int timeout = 250;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rep[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep[peer], connect_address));
-    }
-    //  We have to give the connects time to finish otherwise the requests
-    //  will not properly round-robin. We could alternatively connect the
-    //  REQ sockets to the REP sockets.
-    msleep (SETTLE_TIME);
-
-    // Send our peer-replies, and expect every REP it used once in order
-    for (size_t peer = 0; peer < services; peer++) {
-        s_send_seq (req, "ABC", SEQ_END);
-        s_recv_seq (rep[peer], "ABC", SEQ_END);
-        s_send_seq (rep[peer], "DEF", SEQ_END);
-        s_recv_seq (req, "DEF", SEQ_END);
-    }
-
-    test_context_socket_close_zero_linger (req);
-    for (size_t peer = 0; peer < services; peer++)
-        test_context_socket_close_zero_linger (rep[peer]);
-}
-
-void test_req_only_listens_to_current_peer (const char *bind_address_)
-{
-    void *req = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (req, ZMQ_ROUTING_ID, "A", 2));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (req, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const size_t services = 3;
-    void *router[services];
-
-    for (size_t i = 0; i < services; ++i) {
-        router[i] = test_context_socket (ZMQ_ROUTER);
-
-        int timeout = 250;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (router[i], ZMQ_RCVTIMEO, &timeout, sizeof (timeout)));
-
-        int enabled = 1;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          router[i], ZMQ_ROUTER_MANDATORY, &enabled, sizeof (enabled)));
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (router[i], connect_address));
-    }
-
-    // Wait for connects to finish.
-    msleep (SETTLE_TIME);
-
-    for (size_t i = 0; i < services; ++i) {
-        // There still is a race condition when a stale peer's message
-        // arrives at the REQ just after a request was sent to that peer.
-        // To avoid that happening in the test, sleep for a bit.
-        TEST_ASSERT_EQUAL_INT (1,
-                               TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (0, 0, 10)));
-
-        s_send_seq (req, "ABC", SEQ_END);
-
-        // Receive on router i
-        s_recv_seq (router[i], "A", 0, "ABC", SEQ_END);
-
-        // Send back replies on all routers
-        for (size_t j = 0; j < services; ++j) {
-            const char *replies[] = {"WRONG", "GOOD"};
-            const char *reply = replies[i == j ? 1 : 0];
-            s_send_seq (router[j], "A", 0, reply, SEQ_END);
-        }
-
-        // Receive only the good reply
-        s_recv_seq (req, "GOOD", SEQ_END);
-    }
-
-    test_context_socket_close_zero_linger (req);
-    for (size_t i = 0; i < services; ++i)
-        test_context_socket_close_zero_linger (router[i]);
-}
-
-void test_req_message_format (const char *bind_address_)
-{
-    void *req = test_context_socket (ZMQ_REQ);
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (req, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (router, connect_address));
-
-    // Send a multi-part request.
-    s_send_seq (req, "ABC", "DEF", SEQ_END);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    // Receive peer routing id
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&msg));
-    zmq_msg_t peer_id_msg;
-    zmq_msg_init (&peer_id_msg);
-    zmq_msg_copy (&peer_id_msg, &msg);
-
-    int more = 0;
-    size_t more_size = sizeof (more);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_RCVMORE, &more, &more_size));
-    TEST_ASSERT_TRUE (more);
-
-    // Receive the rest.
-    s_recv_seq (router, 0, "ABC", "DEF", SEQ_END);
-
-    // Send back a single-part reply.
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_send (&peer_id_msg, router, ZMQ_SNDMORE));
-    s_send_seq (router, 0, "GHI", SEQ_END);
-
-    // Receive reply.
-    s_recv_seq (req, "GHI", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_id_msg));
-
-    test_context_socket_close_zero_linger (req);
-    test_context_socket_close_zero_linger (router);
-}
-
-void test_block_on_send_no_peers ()
-{
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof (timeout)));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, ZMQ_DONTWAIT));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, 0));
-
-    test_context_socket_close (sc);
-}
-
-const char bind_inproc[] = "inproc://a";
-const char bind_tcp[] = "tcp://127.0.0.1:*";
-
-void test_round_robin_out_inproc ()
-{
-    test_round_robin_out (bind_inproc);
-}
-
-void test_round_robin_out_tcp ()
-{
-    test_round_robin_out (bind_tcp);
-}
-
-void test_req_message_format_inproc ()
-{
-    test_req_message_format (bind_inproc);
-}
-
-void test_req_message_format_tcp ()
-{
-    test_req_message_format (bind_tcp);
-}
-
-void test_req_only_listens_to_current_peer_inproc ()
-{
-    test_req_only_listens_to_current_peer (bind_inproc);
-}
-
-void test_req_only_listens_to_current_peer_tcp ()
-{
-    test_req_only_listens_to_current_peer (bind_tcp);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    // SHALL route outgoing messages to connected peers using a round-robin
-    // strategy.
-    RUN_TEST (test_round_robin_out_inproc);
-    RUN_TEST (test_round_robin_out_tcp);
-
-    // The request and reply messages SHALL have this format on the wire:
-    // * A delimiter, consisting of an empty frame, added by the REQ socket.
-    // * One or more data frames, comprising the message visible to the
-    //   application.
-    RUN_TEST (test_req_message_format_inproc);
-    RUN_TEST (test_req_message_format_tcp);
-
-    // SHALL block on sending, or return a suitable error, when it has no
-    // connected peers.
-    RUN_TEST (test_block_on_send_no_peers);
-
-    // SHALL accept an incoming message only from the last peer that it sent a
-    // request to.
-    // SHALL discard silently any messages received from other peers.
-    // TODO PH: this test is still failing; disabled for now to allow build to
-    // complete.
-    // RUN_TEST (test_req_only_listens_to_current_peer_inproc);
-    // RUN_TEST (test_req_only_listens_to_current_peer_tcp);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_spec_router.cpp b/tests/test_spec_router.cpp
deleted file mode 100644
index 869b66eb8..000000000
--- a/tests/test_spec_router.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// SHALL receive incoming messages from its peers using a fair-queuing
-// strategy.
-void test_fair_queue_in (const char *bind_address_)
-{
-    char connect_address[MAX_SOCKET_STRING];
-    void *receiver = test_context_socket (ZMQ_ROUTER);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (receiver, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (receiver, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (receiver, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const unsigned char services = 5;
-    void *senders[services];
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        senders[peer] = test_context_socket (ZMQ_DEALER);
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (senders[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-        char *str = strdup ("A");
-        str[0] += peer;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (senders[peer], ZMQ_ROUTING_ID, str, 2));
-        free (str);
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_connect (senders[peer], connect_address));
-    }
-
-    msleep (SETTLE_TIME);
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    s_send_seq (senders[0], "M", SEQ_END);
-    s_recv_seq (receiver, "A", "M", SEQ_END);
-
-    s_send_seq (senders[0], "M", SEQ_END);
-    s_recv_seq (receiver, "A", "M", SEQ_END);
-
-    int sum = 0;
-
-    // send N requests
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        s_send_seq (senders[peer], "M", SEQ_END);
-        sum += 'A' + peer;
-    }
-
-    TEST_ASSERT_EQUAL_INT (services * 'A' + services * (services - 1) / 2, sum);
-
-    // handle N requests
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        TEST_ASSERT_EQUAL_INT (
-          2, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, receiver, 0)));
-        const char *id = static_cast<const char *> (zmq_msg_data (&msg));
-        sum -= id[0];
-
-        s_recv_seq (receiver, "M", SEQ_END);
-    }
-
-    TEST_ASSERT_EQUAL_INT (0, sum);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (receiver);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (senders[peer]);
-
-    // Wait for disconnects.
-    msleep (SETTLE_TIME);
-}
-
-// SHALL create a double queue when a peer connects to it. If this peer
-// disconnects, the ROUTER socket SHALL destroy its double queue and SHALL
-// discard any messages it contains.
-void test_destroy_queue_on_disconnect (const char *bind_address_)
-{
-    void *a = test_context_socket (ZMQ_ROUTER);
-
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (a, ZMQ_ROUTER_MANDATORY, &enabled, sizeof (enabled)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (a, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    char connect_address[MAX_SOCKET_STRING];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (a, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    void *b = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (b, ZMQ_ROUTING_ID, "B", 2));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    // Wait for connection.
-    msleep (SETTLE_TIME);
-
-    // Send a message in both directions
-    s_send_seq (a, "B", "ABC", SEQ_END);
-    s_send_seq (b, "DEF", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (b, connect_address));
-
-    // Disconnect may take time and need command processing.
-    zmq_pollitem_t poller[2] = {{a, 0, 0, 0}, {b, 0, 0, 0}};
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100));
-
-    // No messages should be available, sending should fail.
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EHOSTUNREACH, zmq_send (a, "B", 2, ZMQ_SNDMORE | ZMQ_DONTWAIT));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, a, ZMQ_DONTWAIT));
-
-    // After a reconnect of B, the messages should still be gone
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, a, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, b, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (a);
-    test_context_socket_close_zero_linger (b);
-
-    // Wait for disconnects.
-    msleep (SETTLE_TIME);
-}
-
-#define TEST_SUITE(name, bind_address)                                         \
-    void test_fair_queue_in_##name () { test_fair_queue_in (bind_address); }   \
-    void test_destroy_queue_on_disconnect_##name ()                            \
-    {                                                                          \
-        test_destroy_queue_on_disconnect (bind_address);                       \
-    }
-
-TEST_SUITE (inproc, "inproc://a")
-TEST_SUITE (tcp, "tcp://127.0.0.1:*")
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_fair_queue_in_tcp);
-    RUN_TEST (test_fair_queue_in_inproc);
-    // TODO commented out until libzmq implements this properly
-    // RUN_TEST (test_destroy_queue_on_disconnect_tcp);
-    // RUN_TEST (test_destroy_queue_on_disconnect_inproc);
-    return UNITY_END ();
-}
diff --git a/tests/test_srcfd.cpp b/tests/test_srcfd.cpp
deleted file mode 100644
index e0c08d19f..000000000
--- a/tests/test_srcfd.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#define MSG_SIZE 20
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
-void test_srcfd ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Create the infrastructure
-
-    void *rep = test_context_socket (ZMQ_REP);
-    void *req = test_context_socket (ZMQ_REQ);
-
-    bind_loopback_ipv4 (rep, my_endpoint, sizeof (my_endpoint));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, my_endpoint));
-
-    char tmp[MSG_SIZE];
-    memset (tmp, 0, MSG_SIZE);
-    zmq_send (req, tmp, MSG_SIZE, 0);
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    zmq_recvmsg (rep, &msg, 0);
-    TEST_ASSERT_EQUAL_UINT (MSG_SIZE, zmq_msg_size (&msg));
-
-    // get the messages source file descriptor
-    int src_fd = zmq_msg_get (&msg, ZMQ_SRCFD);
-    TEST_ASSERT_GREATER_OR_EQUAL (0, src_fd);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    // get the remote endpoint
-    struct sockaddr_storage ss;
-#ifdef ZMQ_HAVE_HPUX
-    int addrlen = sizeof ss;
-#else
-    socklen_t addrlen = sizeof ss;
-#endif
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      getpeername (src_fd, (struct sockaddr *) &ss, &addrlen));
-
-    char host[NI_MAXHOST];
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (getnameinfo ((struct sockaddr *) &ss,
-                                                addrlen, host, sizeof host,
-                                                NULL, 0, NI_NUMERICHOST));
-
-    // assert it is localhost which connected
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", host);
-
-    test_context_socket_close (rep);
-    test_context_socket_close (req);
-
-    // sleep a bit for the socket to be freed
-    msleep (SETTLE_TIME);
-
-    // getting name from closed socket will fail
-#ifdef ZMQ_HAVE_WINDOWS
-    const int expected_errno = WSAENOTSOCK;
-#else
-    const int expected_errno = EBADF;
-#endif
-    TEST_ASSERT_FAILURE_RAW_ERRNO (
-      expected_errno, getpeername (src_fd, (struct sockaddr *) &ss, &addrlen));
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_srcfd);
-    return UNITY_END ();
-}
diff --git a/tests/test_stream.cpp b/tests/test_stream.cpp
deleted file mode 100644
index 0ae8bf07d..000000000
--- a/tests/test_stream.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  ZMTP protocol greeting structure
-
-typedef uint8_t byte;
-typedef struct
-{
-    byte signature[10]; //  0xFF 8*0x00 0x7F
-    byte version[2];    //  0x03 0x01 for ZMTP/3.1
-    byte mechanism[20]; //  "NULL"
-    byte as_server;
-    byte filler[31];
-} zmtp_greeting_t;
-
-#define ZMTP_DEALER 5 //  Socket type constants
-
-//  This is a greeting matching what 0MQ will send us; note the
-//  8-byte size is set to 1 for backwards compatibility
-
-static zmtp_greeting_t greeting = {
-  {0xFF, 0, 0, 0, 0, 0, 0, 0, 1, 0x7F}, {3, 1}, {'N', 'U', 'L', 'L'}, 0, {0}};
-
-static void test_stream_to_dealer ()
-{
-    int rc;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  We'll be using this socket in raw mode
-    void *stream = test_context_socket (ZMQ_STREAM);
-
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (stream, ZMQ_LINGER, &zero, sizeof (zero)));
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (stream, ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    bind_loopback_ipv4 (stream, my_endpoint, sizeof my_endpoint);
-
-    //  We'll be using this socket as the other peer
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    //  Send a message on the dealer socket
-    send_string_expect_success (dealer, "Hello", 0);
-
-    //  Connecting sends a zero message
-    //  First frame is routing id
-    zmq_msg_t routing_id;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&routing_id));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&routing_id, stream, 0));
-    TEST_ASSERT_TRUE (zmq_msg_more (&routing_id));
-
-    //  Verify the existence of Peer-Address metadata
-    char const *peer_address = zmq_msg_gets (&routing_id, "Peer-Address");
-    TEST_ASSERT_NOT_NULL (peer_address);
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", peer_address);
-
-    //  Second frame is zero
-    byte buffer[255];
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (stream, buffer, 255, 0)));
-
-    //  Verify the existence of Peer-Address metadata
-    peer_address = zmq_msg_gets (&routing_id, "Peer-Address");
-    TEST_ASSERT_NOT_NULL (peer_address);
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", peer_address);
-
-    //  Real data follows
-    //  First frame is routing id
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&routing_id, stream, 0));
-    TEST_ASSERT_TRUE (zmq_msg_more (&routing_id));
-
-    //  Verify the existence of Peer-Address metadata
-    peer_address = zmq_msg_gets (&routing_id, "Peer-Address");
-    TEST_ASSERT_NOT_NULL (peer_address);
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", peer_address);
-
-    //  Second frame is greeting signature
-    recv_array_expect_success (stream, greeting.signature, 0);
-
-    //  Send our own protocol greeting
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&routing_id, stream, ZMQ_SNDMORE));
-    TEST_ASSERT_EQUAL_INT (
-      sizeof (greeting), TEST_ASSERT_SUCCESS_ERRNO (
-                           zmq_send (stream, &greeting, sizeof (greeting), 0)));
-
-    //  Now we expect the data from the DEALER socket
-    //  We want the rest of greeting along with the Ready command
-    int bytes_read = 0;
-    while (bytes_read < 97) {
-        //  First frame is the routing id of the connection (each time)
-        TEST_ASSERT_GREATER_THAN_INT (
-          0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&routing_id, stream, 0)));
-        TEST_ASSERT_TRUE (zmq_msg_more (&routing_id));
-        //  Second frame contains the next chunk of data
-        TEST_ASSERT_SUCCESS_ERRNO (
-          rc = zmq_recv (stream, buffer + bytes_read, 255 - bytes_read, 0));
-        bytes_read += rc;
-    }
-
-    //  First two bytes are major and minor version numbers.
-    TEST_ASSERT_EQUAL_INT (3, buffer[0]); //  ZMTP/3.1
-    TEST_ASSERT_EQUAL_INT (1, buffer[1]);
-
-    //  Mechanism is "NULL"
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 2,
-                                  "NULL\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20);
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 54, "\4\51\5READY", 8);
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 62, "\13Socket-Type\0\0\0\6DEALER",
-                                  22);
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 84, "\10Identity\0\0\0\0", 13);
-
-    //  Announce we are ready
-    memcpy (buffer, "\4\51\5READY", 8);
-    memcpy (buffer + 8, "\13Socket-Type\0\0\0\6ROUTER", 22);
-    memcpy (buffer + 30, "\10Identity\0\0\0\0", 13);
-
-    //  Send Ready command
-    TEST_ASSERT_GREATER_THAN_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (
-                                       &routing_id, stream, ZMQ_SNDMORE)));
-    TEST_ASSERT_EQUAL_INT (
-      43, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (stream, buffer, 43, 0)));
-
-    //  Now we expect the data from the DEALER socket
-    //  First frame is, again, the routing id of the connection
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&routing_id, stream, 0)));
-    TEST_ASSERT_TRUE (zmq_msg_more (&routing_id));
-
-    //  Third frame contains Hello message from DEALER
-    TEST_ASSERT_EQUAL_INT (7, TEST_ASSERT_SUCCESS_ERRNO (
-                                zmq_recv (stream, buffer, sizeof buffer, 0)));
-
-    //  Then we have a 5-byte message "Hello"
-    TEST_ASSERT_EQUAL_INT (0, buffer[0]); //  Flags = 0
-    TEST_ASSERT_EQUAL_INT (5, buffer[1]); //  Size = 5
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 2, "Hello", 5);
-
-    //  Send "World" back to DEALER
-    TEST_ASSERT_GREATER_THAN_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (
-                                       &routing_id, stream, ZMQ_SNDMORE)));
-    byte world[] = {0, 5, 'W', 'o', 'r', 'l', 'd'};
-    TEST_ASSERT_EQUAL_INT (
-      sizeof (world),
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_send (stream, world, sizeof (world), 0)));
-
-    //  Expect response on DEALER socket
-    recv_string_expect_success (dealer, "World", 0);
-
-    //  Test large messages over STREAM socket
-#define size 64000
-    uint8_t msgout[size];
-    memset (msgout, 0xAB, size);
-    zmq_send (dealer, msgout, size, 0);
-
-    uint8_t msgin[9 + size];
-    memset (msgin, 0, 9 + size);
-    bytes_read = 0;
-    while (bytes_read < 9 + size) {
-        //  Get routing id frame
-        TEST_ASSERT_GREATER_THAN_INT (
-          0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (stream, buffer, 256, 0)));
-        //  Get next chunk
-        TEST_ASSERT_GREATER_THAN_INT (
-          0,
-          TEST_ASSERT_SUCCESS_ERRNO (rc = zmq_recv (stream, msgin + bytes_read,
-                                                    9 + size - bytes_read, 0)));
-        bytes_read += rc;
-    }
-    for (int byte_nbr = 0; byte_nbr < size; byte_nbr++) {
-        TEST_ASSERT_EQUAL_UINT8 (0xAB, msgin[9 + byte_nbr]);
-    }
-    test_context_socket_close (dealer);
-    test_context_socket_close (stream);
-}
-
-
-static void test_stream_to_stream ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    //  Set-up our context and sockets
-
-    void *server = test_context_socket (ZMQ_STREAM);
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    void *client = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    uint8_t id[256];
-    uint8_t buffer[256];
-
-    //  Connecting sends a zero message
-    //  Server: First frame is routing id, second frame is zero
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, id, 256, 0)));
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 256, 0)));
-    //  Client: First frame is routing id, second frame is zero
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, id, 256, 0)));
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, buffer, 256, 0)));
-
-    //  Sent HTTP request on client socket
-    //  Get server routing id
-    size_t id_size = sizeof id;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (client, ZMQ_ROUTING_ID, id, &id_size));
-    //  First frame is server routing id
-    TEST_ASSERT_EQUAL_INT ((int) id_size, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (
-                                            client, id, id_size, ZMQ_SNDMORE)));
-    //  Second frame is HTTP GET request
-    TEST_ASSERT_EQUAL_INT (
-      7, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (client, "GET /\n\n", 7, 0)));
-
-    //  Get HTTP request; ID frame and then request
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, id, 256, 0)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 256, 0));
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer, "GET /\n\n", 7);
-
-    //  Send reply back to client
-    char http_response[] = "HTTP/1.0 200 OK\r\n"
-                           "Content-Type: text/plain\r\n"
-                           "\r\n"
-                           "Hello, World!";
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (server, id, id_size, ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_send (server, http_response, sizeof (http_response), ZMQ_SNDMORE));
-
-    //  Send zero to close connection to client
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (server, id, id_size, ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (server, NULL, 0, ZMQ_SNDMORE));
-
-    //  Get reply at client and check that it's complete
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, id, 256, 0)));
-    TEST_ASSERT_EQUAL_INT (
-      sizeof http_response,
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, buffer, 256, 0)));
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer, http_response,
-                                  sizeof (http_response));
-
-    // //  Get disconnection notification
-    // FIXME: why does this block? Bug in STREAM disconnect notification?
-    // id_size = zmq_recv (client, id, 256, 0);
-    // assert (id_size > 0);
-    // rc = zmq_recv (client, buffer, 256, 0);
-    // assert (rc == 0);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_to_dealer);
-    RUN_TEST (test_stream_to_stream);
-    return UNITY_END ();
-}
diff --git a/tests/test_stream_disconnect.cpp b/tests/test_stream_disconnect.cpp
deleted file mode 100644
index d46916f27..000000000
--- a/tests/test_stream_disconnect.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static const int SERVER = 0;
-static const int CLIENT = 1;
-
-struct test_message_t
-{
-    int turn;
-    const char *text;
-};
-
-// NOTE: messages are sent without null terminator.
-const test_message_t dialog[] = {
-  {CLIENT, "i can haz cheez burger?"},
-  {SERVER, "y u no disonnect?"},
-  {CLIENT, ""},
-};
-const int steps = sizeof (dialog) / sizeof (dialog[0]);
-
-bool has_more (void *socket_)
-{
-    int more = 0;
-    size_t more_size = sizeof (more);
-    int rc = zmq_getsockopt (socket_, ZMQ_RCVMORE, &more, &more_size);
-    if (rc != 0)
-        return false;
-    return more != 0;
-}
-
-void test_stream_disconnect ()
-{
-    size_t len = MAX_SOCKET_STRING;
-    char bind_endpoint[MAX_SOCKET_STRING];
-    char connect_endpoint[MAX_SOCKET_STRING];
-    void *sockets[2];
-
-    sockets[SERVER] = test_context_socket (ZMQ_STREAM);
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      sockets[SERVER], ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sockets[SERVER], "tcp://0.0.0.0:*"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sockets[SERVER], ZMQ_LAST_ENDPOINT, bind_endpoint, &len));
-
-    //  Apparently Windows can't connect to 0.0.0.0. A better fix would be welcome.
-#ifdef ZMQ_HAVE_WINDOWS
-    sprintf (connect_endpoint, "tcp://127.0.0.1:%s",
-             strrchr (bind_endpoint, ':') + 1);
-#else
-    strcpy (connect_endpoint, bind_endpoint);
-#endif
-
-    sockets[CLIENT] = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      sockets[CLIENT], ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sockets[CLIENT], connect_endpoint));
-
-    // wait for connect notification
-    // Server: Grab the 1st frame (peer routing id).
-    zmq_msg_t peer_frame;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&peer_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&peer_frame, sockets[SERVER], 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&peer_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_frame));
-    TEST_ASSERT_TRUE (has_more (sockets[SERVER]));
-
-    // Server: Grab the 2nd frame (actual payload).
-    zmq_msg_t data_frame;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&data_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&data_frame, sockets[SERVER], 0));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&data_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-
-    // Client: Grab the 1st frame (peer routing id).
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&peer_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&peer_frame, sockets[CLIENT], 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&peer_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_frame));
-    TEST_ASSERT_TRUE (has_more (sockets[CLIENT]));
-
-    // Client: Grab the 2nd frame (actual payload).
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&data_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&data_frame, sockets[CLIENT], 0));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&data_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-
-    // Send initial message.
-    char blob_data[256];
-    size_t blob_size = sizeof (blob_data);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sockets[CLIENT], ZMQ_ROUTING_ID, blob_data, &blob_size));
-    TEST_ASSERT_GREATER_THAN (0, blob_size);
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, blob_size));
-    memcpy (zmq_msg_data (&msg), blob_data, blob_size);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_send (&msg, sockets[dialog[0].turn], ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_size (&msg, strlen (dialog[0].text)));
-    memcpy (zmq_msg_data (&msg), dialog[0].text, strlen (dialog[0].text));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_send (&msg, sockets[dialog[0].turn], ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    // TODO: make sure this loop doesn't loop forever if something is wrong
-    //       with the test (or the implementation).
-
-    int step = 0;
-    while (step < steps) {
-        // Wait until something happens.
-        zmq_pollitem_t items[] = {
-          {sockets[SERVER], 0, ZMQ_POLLIN, 0},
-          {sockets[CLIENT], 0, ZMQ_POLLIN, 0},
-        };
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (items, 2, 100));
-
-        // Check for data received by the server.
-        if (items[SERVER].revents & ZMQ_POLLIN) {
-            TEST_ASSERT_EQUAL_INT (CLIENT, dialog[step].turn);
-
-            // Grab the 1st frame (peer routing id).
-            zmq_msg_t peer_frame;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&peer_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_recv (&peer_frame, sockets[SERVER], 0));
-            TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&peer_frame));
-            TEST_ASSERT_TRUE (has_more (sockets[SERVER]));
-
-            // Grab the 2nd frame (actual payload).
-            zmq_msg_t data_frame;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&data_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_recv (&data_frame, sockets[SERVER], 0));
-
-            // Make sure payload matches what we expect.
-            const char *const data =
-              static_cast<const char *> (zmq_msg_data (&data_frame));
-            const size_t size = zmq_msg_size (&data_frame);
-            // 0-length frame is a disconnection notification.  The server
-            // should receive it as the last step in the dialogue.
-            if (size == 0) {
-                ++step;
-                TEST_ASSERT_EQUAL_INT (steps, step);
-            } else {
-                TEST_ASSERT_EQUAL_INT (strlen (dialog[step].text), size);
-                TEST_ASSERT_EQUAL_STRING_LEN (dialog[step].text, data, size);
-
-                ++step;
-
-                TEST_ASSERT_LESS_THAN_INT (steps, step);
-
-                // Prepare the response.
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_msg_init_size (&data_frame, strlen (dialog[step].text)));
-                memcpy (zmq_msg_data (&data_frame), dialog[step].text,
-                        zmq_msg_size (&data_frame));
-
-                // Send the response.
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_msg_send (&peer_frame, sockets[SERVER], ZMQ_SNDMORE));
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_msg_send (&data_frame, sockets[SERVER], ZMQ_SNDMORE));
-            }
-
-            // Release resources.
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-        }
-
-        // Check for data received by the client.
-        if (items[CLIENT].revents & ZMQ_POLLIN) {
-            TEST_ASSERT_EQUAL_INT (SERVER, dialog[step].turn);
-
-            // Grab the 1st frame (peer routing id).
-            zmq_msg_t peer_frame;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&peer_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_recv (&peer_frame, sockets[CLIENT], 0));
-            TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&peer_frame));
-            TEST_ASSERT_TRUE (has_more (sockets[CLIENT]));
-
-            // Grab the 2nd frame (actual payload).
-            zmq_msg_t data_frame;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&data_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_recv (&data_frame, sockets[CLIENT], 0));
-            TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&data_frame));
-
-            // Make sure payload matches what we expect.
-            const char *const data =
-              static_cast<const char *> (zmq_msg_data (&data_frame));
-            const size_t size = zmq_msg_size (&data_frame);
-            TEST_ASSERT_EQUAL_INT (strlen (dialog[step].text), size);
-            TEST_ASSERT_EQUAL_STRING_LEN (dialog[step].text, data, size);
-
-            ++step;
-
-            // Prepare the response (next line in the dialog).
-            TEST_ASSERT_LESS_THAN_INT (steps, step);
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_init_size (&data_frame, strlen (dialog[step].text)));
-            memcpy (zmq_msg_data (&data_frame), dialog[step].text,
-                    zmq_msg_size (&data_frame));
-
-            // Send the response.
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_send (&peer_frame, sockets[CLIENT], ZMQ_SNDMORE));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_send (&data_frame, sockets[CLIENT], ZMQ_SNDMORE));
-
-            // Release resources.
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-        }
-    }
-    TEST_ASSERT_EQUAL_INT (steps, step);
-    test_context_socket_close (sockets[CLIENT]);
-    test_context_socket_close (sockets[SERVER]);
-}
-
-int main (int, char **)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_disconnect);
-    return UNITY_END ();
-}
diff --git a/tests/test_stream_empty.cpp b/tests/test_stream_empty.cpp
deleted file mode 100644
index dd4c2c6a2..000000000
--- a/tests/test_stream_empty.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_stream_empty ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *stream = test_context_socket (ZMQ_STREAM);
-    void *dealer = test_context_socket (ZMQ_DEALER);
-
-    bind_loopback_ipv4 (stream, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-    send_string_expect_success (dealer, "", 0);
-
-    zmq_msg_t ident, empty;
-    zmq_msg_init (&ident);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&ident, stream, 0));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&empty, (void *) "", 0, NULL, NULL));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&ident, stream, ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&ident));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&empty, stream, 0));
-
-    //  This close used to fail with Bad Address
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&empty));
-
-    test_context_socket_close_zero_linger (dealer);
-    test_context_socket_close_zero_linger (stream);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_empty);
-    return UNITY_END ();
-}
diff --git a/tests/test_stream_exceeds_buffer.cpp b/tests/test_stream_exceeds_buffer.cpp
deleted file mode 100644
index e8478ad4a..000000000
--- a/tests/test_stream_exceeds_buffer.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_stream_exceeds_buffer ()
-{
-    const int msgsize = 8193;
-    char sndbuf[msgsize] = "\xde\xad\xbe\xef";
-    unsigned char rcvbuf[msgsize];
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    int server_sock = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint);
-
-    void *zsock = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (zsock, my_endpoint));
-
-    int client_sock =
-      TEST_ASSERT_SUCCESS_RAW_ERRNO (accept (server_sock, NULL, NULL));
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (close (server_sock));
-
-    TEST_ASSERT_EQUAL_INT (msgsize, send (client_sock, sndbuf, msgsize, 0));
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    int rcvbytes = 0;
-    while (rcvbytes == 0) // skip connection notification, if any
-    {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, zsock, 0)); // peerid
-        TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-        rcvbytes = TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, zsock, 0));
-        TEST_ASSERT_FALSE (zmq_msg_more (&msg));
-    }
-
-    // for this test, we only collect the first chunk
-    // since the corruption already occurs in the first chunk
-    memcpy (rcvbuf, zmq_msg_data (&msg), zmq_msg_size (&msg));
-
-    zmq_msg_close (&msg);
-    test_context_socket_close (zsock);
-    close (client_sock);
-
-    TEST_ASSERT_GREATER_OR_EQUAL (4, rcvbytes);
-
-    // notice that only the 1st byte gets corrupted
-    TEST_ASSERT_EQUAL_UINT (0xef, rcvbuf[3]);
-    TEST_ASSERT_EQUAL_UINT (0xbe, rcvbuf[2]);
-    TEST_ASSERT_EQUAL_UINT (0xad, rcvbuf[1]);
-    TEST_ASSERT_EQUAL_UINT (0xde, rcvbuf[0]);
-}
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_exceeds_buffer);
-    return UNITY_END ();
-}
diff --git a/tests/test_stream_timeout.cpp b/tests/test_stream_timeout.cpp
deleted file mode 100644
index 0ab4ca60d..000000000
--- a/tests/test_stream_timeout.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_monitoring.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void test_stream_handshake_timeout_accept ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  We use this socket in raw mode, to make a connection and send nothing
-    void *stream = test_context_socket (ZMQ_STREAM);
-
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (stream, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    //  We'll be using this socket to test TCP stream handshake timeout
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_LINGER, &zero, sizeof (zero)));
-    int val, tenth = 100;
-    size_t vsize = sizeof (val);
-
-    // check for the expected default handshake timeout value - 30 sec
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (dealer, ZMQ_HANDSHAKE_IVL, &val, &vsize));
-    TEST_ASSERT_EQUAL (sizeof (val), vsize);
-    TEST_ASSERT_EQUAL_INT (30000, val);
-    // make handshake timeout faster - 1/10 sec
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_HANDSHAKE_IVL, &tenth, sizeof (tenth)));
-    vsize = sizeof (val);
-    // make sure zmq_setsockopt changed the value
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (dealer, ZMQ_HANDSHAKE_IVL, &val, &vsize));
-    TEST_ASSERT_EQUAL (sizeof (val), vsize);
-    TEST_ASSERT_EQUAL_INT (tenth, val);
-
-    //  Create and connect a socket for collecting monitor events on dealer
-    void *dealer_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      dealer, "inproc://monitor-dealer",
-      ZMQ_EVENT_CONNECTED | ZMQ_EVENT_DISCONNECTED | ZMQ_EVENT_ACCEPTED));
-
-    //  Connect to the inproc endpoint so we'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (dealer_mon, "inproc://monitor-dealer"));
-
-    // bind dealer socket to accept connection from non-sending stream socket
-    bind_loopback_ipv4 (dealer, my_endpoint, sizeof my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (stream, my_endpoint));
-
-    // we should get ZMQ_EVENT_ACCEPTED and then ZMQ_EVENT_DISCONNECTED
-    int event = get_monitor_event (dealer_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, event);
-    event = get_monitor_event (dealer_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_DISCONNECTED, event);
-
-    test_context_socket_close (dealer);
-    test_context_socket_close (dealer_mon);
-    test_context_socket_close (stream);
-}
-
-static void test_stream_handshake_timeout_connect ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  We use this socket in raw mode, to accept a connection and send nothing
-    void *stream = test_context_socket (ZMQ_STREAM);
-
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (stream, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    bind_loopback_ipv4 (stream, my_endpoint, sizeof my_endpoint);
-
-    //  We'll be using this socket to test TCP stream handshake timeout
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_LINGER, &zero, sizeof (zero)));
-    int val, tenth = 100;
-    size_t vsize = sizeof (val);
-
-    // check for the expected default handshake timeout value - 30 sec
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (dealer, ZMQ_HANDSHAKE_IVL, &val, &vsize));
-    TEST_ASSERT_EQUAL (sizeof (val), vsize);
-    TEST_ASSERT_EQUAL_INT (30000, val);
-    // make handshake timeout faster - 1/10 sec
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_HANDSHAKE_IVL, &tenth, sizeof (tenth)));
-    vsize = sizeof (val);
-    // make sure zmq_setsockopt changed the value
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (dealer, ZMQ_HANDSHAKE_IVL, &val, &vsize));
-    TEST_ASSERT_EQUAL (sizeof (val), vsize);
-    TEST_ASSERT_EQUAL_INT (tenth, val);
-
-    //  Create and connect a socket for collecting monitor events on dealer
-    void *dealer_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      dealer, "inproc://monitor-dealer",
-      ZMQ_EVENT_CONNECTED | ZMQ_EVENT_DISCONNECTED | ZMQ_EVENT_ACCEPTED));
-
-    //  Connect to the inproc endpoint so we'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (dealer_mon, "inproc://monitor-dealer"));
-
-    // connect dealer socket to non-sending stream socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    // we should get ZMQ_EVENT_CONNECTED and then ZMQ_EVENT_DISCONNECTED
-    int event = get_monitor_event (dealer_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CONNECTED, event);
-    event = get_monitor_event (dealer_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_DISCONNECTED, event);
-
-    test_context_socket_close (dealer);
-    test_context_socket_close (dealer_mon);
-    test_context_socket_close (stream);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_handshake_timeout_accept);
-    RUN_TEST (test_stream_handshake_timeout_connect);
-    return UNITY_END ();
-}
diff --git a/tests/test_sub_forward.cpp b/tests/test_sub_forward.cpp
deleted file mode 100644
index c5a9865cd..000000000
--- a/tests/test_sub_forward.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    char endpoint1[MAX_SOCKET_STRING];
-    char endpoint2[MAX_SOCKET_STRING];
-
-    //  First, create an intermediate device
-    void *xpub = test_context_socket (ZMQ_XPUB);
-    bind_loopback_ipv4 (xpub, endpoint1, sizeof (endpoint1));
-
-    void *xsub = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub, endpoint2, sizeof (endpoint2));
-
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, endpoint2));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, endpoint1));
-
-    //  Subscribe for all messages.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "", 0));
-
-    //  Pass the subscription upstream through the device
-    char buff[32];
-    int size;
-    TEST_ASSERT_SUCCESS_ERRNO (size = zmq_recv (xpub, buff, sizeof (buff), 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (xsub, buff, size, 0));
-
-    //  Wait a bit till the subscription gets to the publisher
-    msleep (SETTLE_TIME);
-
-    //  Send an empty message
-    send_string_expect_success (pub, "", 0);
-
-    //  Pass the message downstream through the device
-    TEST_ASSERT_SUCCESS_ERRNO (size = zmq_recv (xsub, buff, sizeof (buff), 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (xpub, buff, size, 0));
-
-    //  Receive the message in the subscriber
-    recv_string_expect_success (sub, "", 0);
-
-    //  Clean up.
-    test_context_socket_close (xpub);
-    test_context_socket_close (xsub);
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/tests/test_sub_forward_tipc.cpp b/tests/test_sub_forward_tipc.cpp
deleted file mode 100644
index 949c0d1eb..000000000
--- a/tests/test_sub_forward_tipc.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    //  First, create an intermediate device.
-    void *xpub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (xpub, "tipc://{5560,0,0}"));
-    void *xsub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (xsub, "tipc://{5561,0,0}"));
-
-    //  Create a publisher.
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, "tipc://{5561,0}@0.0.0"));
-
-    //  Create a subscriber.
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "tipc://{5560,0}@0.0.0"));
-
-    // TODO the remainder of this method is duplicated with test_sub_forward
-
-    //  Subscribe for all messages.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "", 0));
-
-    //  Pass the subscription upstream through the device
-    char buff[32];
-    int size;
-    TEST_ASSERT_SUCCESS_ERRNO (size = zmq_recv (xpub, buff, sizeof (buff), 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (xsub, buff, size, 0));
-
-    //  Wait a bit till the subscription gets to the publisher
-    msleep (SETTLE_TIME);
-
-    //  Send an empty message
-    send_string_expect_success (pub, "", 0);
-
-    //  Pass the message downstream through the device
-    TEST_ASSERT_SUCCESS_ERRNO (size = zmq_recv (xsub, buff, sizeof (buff), 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (xpub, buff, size, 0));
-
-    //  Receive the message in the subscriber
-    recv_string_expect_success (sub, "", 0);
-
-    //  Clean up.
-    test_context_socket_close (xpub);
-    test_context_socket_close (xsub);
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-int main ()
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/tests/test_system.cpp b/tests/test_system.cpp
deleted file mode 100644
index 8c595502a..000000000
--- a/tests/test_system.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#if defined(ZMQ_HAVE_WINDOWS)
-#include <winsock2.h>
-#include <stdexcept>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Solaris has a default of 256 max files per process
-#ifdef ZMQ_HAVE_SOLARIS
-#define MAX_SOCKETS 200
-#else
-#define MAX_SOCKETS 1000
-#endif
-
-#if defined(ZMQ_HAVE_WINDOWS)
-
-void initialise_network (void)
-{
-    WSADATA info;
-    if (WSAStartup (MAKEWORD (2, 0), &info) != 0)
-        throw std::runtime_error ("Could not start WSA");
-}
-
-#else
-
-void initialise_network (void)
-{
-}
-
-#endif
-
-void test_localhost ()
-{
-    //  Check that we have local networking via ZeroMQ
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    if (zmq_bind (dealer, "tcp://127.0.0.1:*") == -1) {
-        TEST_FAIL_MESSAGE (
-          "E: Cannot find 127.0.0.1 -- your system does not have local\n"
-          "E: networking. Please fix this before running libzmq checks.\n");
-    }
-
-    test_context_socket_close (dealer);
-}
-
-void test_max_sockets ()
-{
-    //  Check that we can create 1,000 sockets
-    fd_t handle[MAX_SOCKETS];
-    int count;
-    for (count = 0; count < MAX_SOCKETS; count++) {
-        handle[count] = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-        if (handle[count] == retired_fd) {
-            printf ("W: Only able to create %d sockets on this box\n", count);
-            const char msg[] =
-              "I: Tune your system to increase maximum allowed file handles\n"
-#if !defined(ZMQ_HAVE_WINDOWS)
-              "I: Run 'ulimit -n 1200' in bash\n"
-#endif
-              ;
-            TEST_FAIL_MESSAGE (msg);
-        }
-    }
-    //  Release the socket handles
-    for (count = 0; count < MAX_SOCKETS; count++) {
-        close (handle[count]);
-    }
-}
-
-//  This test case stresses the system to shake out known configuration
-//  problems. We're direct system calls when necessary. Some code may
-//  need wrapping to be properly portable.
-
-int main (void)
-{
-    initialise_network ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_localhost);
-    RUN_TEST (test_max_sockets);
-    return UNITY_END ();
-}
diff --git a/tests/test_term_endpoint.cpp b/tests/test_term_endpoint.cpp
deleted file mode 100644
index 8f1a9e245..000000000
--- a/tests/test_term_endpoint.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-/* Use the worst case filename size for the buffer (+1 for trailing NUL), this
- * is larger than MAX_SOCKET_STRING, which is not large enough for IPC */
-#define BUF_SIZE (FILENAME_MAX + 1)
-
-const char *ep_wc_tcp = "tcp://127.0.0.1:*";
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-const char *ep_wc_ipc = "ipc://*";
-#endif
-#if defined ZMQ_HAVE_VMCI
-const char *ep_wc_vmci = "vmci://*:*";
-#endif
-
-void test_send_after_unbind_fails ()
-{
-    char my_endpoint[BUF_SIZE];
-
-    //  Create infrastructure.
-    void *push = test_context_socket (ZMQ_PUSH);
-    bind_loopback_ipv4 (push, my_endpoint, BUF_SIZE);
-
-    void *pull = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pull, my_endpoint));
-
-    //  Pass one message through to ensure the connection is established
-    send_string_expect_success (push, "ABC", 0);
-    recv_string_expect_success (pull, "ABC", 0);
-
-    //  Unbind the listening endpoint
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (push, my_endpoint));
-
-    //  Allow unbind to settle
-    msleep (SETTLE_TIME);
-
-    //  Check that sending would block (there's no outbound connection)
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (push, "ABC", 3, ZMQ_DONTWAIT));
-
-    //  Clean up
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-void test_send_after_disconnect_fails ()
-{
-    //  Create infrastructure
-    void *pull = test_context_socket (ZMQ_PULL);
-    char my_endpoint[BUF_SIZE];
-    bind_loopback_ipv4 (pull, my_endpoint, BUF_SIZE);
-
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (push, my_endpoint));
-
-    //  Pass one message through to ensure the connection is established.
-    send_string_expect_success (push, "ABC", 0);
-    recv_string_expect_success (pull, "ABC", 0);
-
-    //  Disconnect the bound endpoint
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (push, my_endpoint));
-
-    //  Allow disconnect to settle
-    msleep (SETTLE_TIME);
-
-    //  Check that sending would block (there's no inbound connections).
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (push, "ABC", 3, ZMQ_DONTWAIT));
-
-    //  Clean up
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-void test_unbind_via_last_endpoint ()
-{
-    //  Create infrastructure (wild-card binding)
-    void *push = test_context_socket (ZMQ_PUSH);
-    char my_endpoint[BUF_SIZE];
-    bind_loopback_ipv4 (push, my_endpoint, BUF_SIZE);
-
-    void *pull = test_context_socket (ZMQ_PULL);
-
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pull, ep_wc_ipc));
-#endif
-#if defined ZMQ_HAVE_VMCI
-    void *req = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (req, ep_wc_vmci));
-#endif
-
-    // Unbind sockets binded by wild-card address
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (push, my_endpoint));
-
-    size_t buf_size = 0;
-    (void) buf_size;
-
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    buf_size = sizeof (my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (pull, ZMQ_LAST_ENDPOINT, my_endpoint, &buf_size));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (pull, my_endpoint));
-#endif
-#if defined ZMQ_HAVE_VMCI
-    buf_size = sizeof (my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_LAST_ENDPOINT, my_endpoint, &buf_size));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (req, my_endpoint));
-#endif
-
-    //  Clean up
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-void test_wildcard_unbind_fails ()
-{
-    //  Create infrastructure (wild-card binding)
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (push, ep_wc_tcp));
-    void *pull = test_context_socket (ZMQ_PULL);
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pull, ep_wc_ipc));
-#endif
-#if defined ZMQ_HAVE_VMCI
-    void *req = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (req, ep_wc_vmci));
-#endif
-
-    // Sockets binded by wild-card address can't be unbinded by wild-card address
-    TEST_ASSERT_FAILURE_ERRNO (ENOENT, zmq_unbind (push, ep_wc_tcp));
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    TEST_ASSERT_FAILURE_ERRNO (ENOENT, zmq_unbind (pull, ep_wc_ipc));
-#endif
-#if defined ZMQ_HAVE_VMCI
-    TEST_ASSERT_FAILURE_ERRNO (ENOENT, zmq_unbind (req, ep_wc_vmci));
-#endif
-
-    //  Clean up
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_send_after_unbind_fails);
-    RUN_TEST (test_send_after_disconnect_fails);
-    RUN_TEST (test_unbind_via_last_endpoint);
-    RUN_TEST (test_wildcard_unbind_fails);
-    return UNITY_END ();
-}
diff --git a/tests/test_term_endpoint_tipc.cpp b/tests/test_term_endpoint_tipc.cpp
deleted file mode 100644
index 7562b0d59..000000000
--- a/tests/test_term_endpoint_tipc.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const char ep[] = "tipc://{5560,0,0}";
-const char name[] = "tipc://{5560,0}@0.0.0";
-
-void test_term_endpoint_unbind_tipc ()
-{
-    if (!is_tipc_available ()) {
-        TEST_IGNORE_MESSAGE ("TIPC environment unavailable, skipping test\n");
-    }
-
-    //  Create infrastructure.
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (push, ep));
-    void *pull = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pull, name));
-
-    //  Pass one message through to ensure the connection is established.
-    send_string_expect_success (push, "ABC", 0);
-    recv_string_expect_success (pull, "ABC", 0);
-
-    // Unbind the lisnening endpoint
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (push, ep));
-
-    // Let events some time
-    msleep (SETTLE_TIME);
-
-    //  Check that sending would block (there's no outbound connection).
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (push, "ABC", 3, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-void test_term_endpoint_disconnect_tipc ()
-{
-    if (!is_tipc_available ()) {
-        TEST_IGNORE_MESSAGE ("TIPC environment unavailable, skipping test\n");
-    }
-
-    //  Create infrastructure.
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (push, name));
-    void *pull = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pull, ep));
-
-    //  Pass one message through to ensure the connection is established.
-    send_string_expect_success (push, "ABC", 0);
-    recv_string_expect_success (pull, "ABC", 0);
-
-    // Disconnect the bound endpoint
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (push, name));
-
-    msleep (SETTLE_TIME);
-
-    //  Check that sending would block (there's no inbound connections).
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (push, "ABC", 3, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-int main (void)
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_term_endpoint_unbind_tipc);
-    RUN_TEST (test_term_endpoint_disconnect_tipc);
-    return UNITY_END ();
-}
diff --git a/tests/test_thread_safe.cpp b/tests/test_thread_safe.cpp
deleted file mode 100644
index bbd2f0dcc..000000000
--- a/tests/test_thread_safe.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*:
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Client threads loop on send/recv until told to exit
-void client_thread (void *client_)
-{
-    for (int count = 0; count < 15000; count++) {
-        send_string_expect_success (client_, "0", 0);
-    }
-    send_string_expect_success (client_, "1", 0);
-}
-
-void test_thread_safe ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server = test_context_socket (ZMQ_SERVER);
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    void *client = test_context_socket (ZMQ_CLIENT);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    void *t1 = zmq_threadstart (client_thread, client);
-    void *t2 = zmq_threadstart (client_thread, client);
-
-    char data;
-    int threads_completed = 0;
-    while (threads_completed < 2) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, &data, 1, 0));
-        if (data == '1')
-            threads_completed++; //  Thread ended
-    }
-    zmq_threadclose (t1);
-    zmq_threadclose (t2);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-void test_getsockopt_thread_safe (void *const socket_)
-{
-    int thread_safe;
-    size_t size = sizeof (int);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_THREAD_SAFE, &thread_safe, &size));
-    TEST_ASSERT_EQUAL_INT (1, thread_safe);
-}
-
-void test_client_getsockopt_thread_safe ()
-{
-    void *client = test_context_socket (ZMQ_CLIENT);
-    test_getsockopt_thread_safe (client);
-    test_context_socket_close (client);
-}
-
-void test_server_getsockopt_thread_safe ()
-{
-    void *server = test_context_socket (ZMQ_SERVER);
-    test_getsockopt_thread_safe (server);
-    test_context_socket_close (server);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    // TODO this file could be merged with test_client_server
-    UNITY_BEGIN ();
-    RUN_TEST (test_client_getsockopt_thread_safe);
-    RUN_TEST (test_server_getsockopt_thread_safe);
-    RUN_TEST (test_thread_safe);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_timeo.cpp b/tests/test_timeo.cpp
deleted file mode 100644
index 5de316f1c..000000000
--- a/tests/test_timeo.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_timeo ()
-{
-    void *frontend = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (frontend, "inproc://timeout_test"));
-
-    //  Receive on disconnected socket returns immediately
-    char buffer[32];
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_recv (frontend, buffer, 32, ZMQ_DONTWAIT));
-
-
-    //  Check whether receive timeout is honored
-    const int timeout = 250;
-    const int jitter = 50;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    void *stopwatch = zmq_stopwatch_start ();
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (frontend, buffer, 32, 0));
-    unsigned int elapsed = zmq_stopwatch_stop (stopwatch) / 1000;
-    TEST_ASSERT_GREATER_THAN_INT (timeout - jitter, elapsed);
-    if (elapsed >= timeout + jitter) {
-        // we cannot assert this on a non-RT system
-        fprintf (stderr,
-                 "zmq_recv took quite long, with a timeout of %i ms, it took "
-                 "actually %i ms\n",
-                 timeout, elapsed);
-    }
-
-    //  Check that normal message flow works as expected
-    void *backend = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (backend, "inproc://timeout_test"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    //  Clean-up
-    test_context_socket_close (backend);
-    test_context_socket_close (frontend);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_timeo);
-    return UNITY_END ();
-}
diff --git a/tests/test_timers.cpp b/tests/test_timers.cpp
deleted file mode 100644
index fb4a7655c..000000000
--- a/tests/test_timers.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#define __STDC_LIMIT_MACROS // to define SIZE_MAX with older compilers
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void handler (int timer_id_, void *arg_)
-{
-    (void) timer_id_; //  Stop 'unused' compiler warnings
-    *(static_cast<bool *> (arg_)) = true;
-}
-
-int sleep_and_execute (void *timers_)
-{
-    int timeout = zmq_timers_timeout (timers_);
-
-    //  Sleep methods are inaccurate, so we sleep in a loop until time arrived
-    while (timeout > 0) {
-        msleep (timeout);
-        timeout = zmq_timers_timeout (timers_);
-    }
-
-    return zmq_timers_execute (timers_);
-}
-
-void test_null_timer_pointers ()
-{
-    void *timers = NULL;
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_destroy (&timers));
-
-//  TODO this currently triggers an access violation
-#if 0
-  TEST_ASSERT_FAILURE_ERRNO(EFAULT, zmq_timers_destroy (NULL));
-#endif
-
-    const size_t dummy_interval = 100;
-    const int dummy_timer_id = 1;
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_timers_add (timers, dummy_interval, &handler, NULL));
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_timers_add (&timers, dummy_interval, &handler, NULL));
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_timers_cancel (timers, dummy_timer_id));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_timers_cancel (&timers, dummy_timer_id));
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_timers_set_interval (timers, dummy_timer_id, dummy_interval));
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT,
-      zmq_timers_set_interval (&timers, dummy_timer_id, dummy_interval));
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_timers_reset (timers, dummy_timer_id));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_timers_reset (&timers, dummy_timer_id));
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_timeout (timers));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_timeout (&timers));
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_execute (timers));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_execute (&timers));
-}
-
-void test_corner_cases ()
-{
-    void *timers = zmq_timers_new ();
-    TEST_ASSERT_NOT_NULL (timers);
-
-    const size_t dummy_interval = SIZE_MAX;
-    const int dummy_timer_id = 1;
-
-    //  attempt to cancel non-existent timer
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_timers_cancel (timers, dummy_timer_id));
-
-    //  attempt to set interval of non-existent timer
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_timers_set_interval (timers, dummy_timer_id, dummy_interval));
-
-    //  attempt to reset non-existent timer
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_timers_reset (timers, dummy_timer_id));
-
-    //  attempt to add NULL handler
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_timers_add (timers, dummy_interval, NULL, NULL));
-
-    const int timer_id = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_timers_add (timers, dummy_interval, handler, NULL));
-
-    //  attempt to cancel timer twice
-    //  TODO should this case really be an error? canceling twice could be allowed
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_cancel (timers, timer_id));
-
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_timers_cancel (timers, timer_id));
-
-    //  timeout without any timers active
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_timers_timeout (timers));
-
-    //  cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_destroy (&timers));
-}
-
-void test_timers ()
-{
-    void *timers = zmq_timers_new ();
-    TEST_ASSERT_NOT_NULL (timers);
-
-    bool timer_invoked = false;
-
-    const unsigned long full_timeout = 100;
-    void *const stopwatch = zmq_stopwatch_start ();
-
-    const int timer_id = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_timers_add (timers, full_timeout, handler, &timer_invoked));
-
-    //  Timer should not have been invoked yet
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-
-    if (zmq_stopwatch_intermediate (stopwatch) < full_timeout) {
-        TEST_ASSERT_FALSE (timer_invoked);
-    }
-
-    //  Wait half the time and check again
-    long timeout = TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_timeout (timers));
-    msleep (timeout / 2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-    if (zmq_stopwatch_intermediate (stopwatch) < full_timeout) {
-        TEST_ASSERT_FALSE (timer_invoked);
-    }
-
-    // Wait until the end
-    TEST_ASSERT_SUCCESS_ERRNO (sleep_and_execute (timers));
-    TEST_ASSERT_TRUE (timer_invoked);
-    timer_invoked = false;
-
-    //  Wait half the time and check again
-    timeout = TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_timeout (timers));
-    msleep (timeout / 2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-    if (zmq_stopwatch_intermediate (stopwatch) < 2 * full_timeout) {
-        TEST_ASSERT_FALSE (timer_invoked);
-    }
-
-    // Reset timer and wait half of the time left
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_reset (timers, timer_id));
-    msleep (timeout / 2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-    if (zmq_stopwatch_stop (stopwatch) < 2 * full_timeout) {
-        TEST_ASSERT_FALSE (timer_invoked);
-    }
-
-    // Wait until the end
-    TEST_ASSERT_SUCCESS_ERRNO (sleep_and_execute (timers));
-    TEST_ASSERT_TRUE (timer_invoked);
-    timer_invoked = false;
-
-    // reschedule
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_set_interval (timers, timer_id, 50));
-    TEST_ASSERT_SUCCESS_ERRNO (sleep_and_execute (timers));
-    TEST_ASSERT_TRUE (timer_invoked);
-    timer_invoked = false;
-
-    // cancel timer
-    timeout = TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_timeout (timers));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_cancel (timers, timer_id));
-    msleep (timeout * 2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-    TEST_ASSERT_FALSE (timer_invoked);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_destroy (&timers));
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_timers);
-    RUN_TEST (test_null_timer_pointers);
-    RUN_TEST (test_corner_cases);
-    return UNITY_END ();
-}
diff --git a/tests/test_unbind_wildcard.cpp b/tests/test_unbind_wildcard.cpp
deleted file mode 100644
index f25d6acc4..000000000
--- a/tests/test_unbind_wildcard.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    0MQ is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_address_wildcard_ipv4 ()
-{
-    /* Address wildcard, IPv6 disabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://*:*"));
-
-    char bind_endpoint[256];
-    char connect_endpoint[256];
-    size_t endpoint_len = sizeof (bind_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, bind_endpoint, &endpoint_len));
-
-    //  Apparently Windows can't connect to 0.0.0.0. A better fix would be welcome.
-#ifdef ZMQ_HAVE_WINDOWS
-    sprintf (connect_endpoint, "tcp://127.0.0.1:%s",
-             strrchr (bind_endpoint, ':') + 1);
-#else
-    strcpy (connect_endpoint, bind_endpoint);
-#endif
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, connect_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, bind_endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_address_wildcard_ipv6 ()
-{
-    int ipv6 = is_ipv6_available ();
-
-    /* Address wildcard, IPv6 enabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_IPV6, &ipv6, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://*:*"));
-
-    char bind_endpoint[256];
-    char connect_endpoint[256];
-    size_t endpoint_len = sizeof (bind_endpoint);
-    memset (bind_endpoint, 0, endpoint_len);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, bind_endpoint, &endpoint_len));
-
-#ifdef ZMQ_HAVE_WINDOWS
-    if (ipv6)
-        sprintf (connect_endpoint, "tcp://[::1]:%s",
-                 strrchr (bind_endpoint, ':') + 1);
-    else
-        sprintf (connect_endpoint, "tcp://127.0.0.1:%s",
-                 strrchr (bind_endpoint, ':') + 1);
-#else
-    strcpy (connect_endpoint, bind_endpoint);
-#endif
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, connect_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, bind_endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_port_wildcard_ipv4_address ()
-{
-    /* Port wildcard, IPv4 address, IPv6 disabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://127.0.0.1:*"));
-
-    char endpoint[256];
-    size_t endpoint_len = sizeof (endpoint);
-    memset (endpoint, 0, endpoint_len);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &endpoint_len));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_port_wildcard_ipv4_address_ipv6 ()
-{
-    /* Port wildcard, IPv4 address, IPv6 enabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    const int ipv6 = is_ipv6_available ();
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_IPV6, &ipv6, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://127.0.0.1:*"));
-
-    char endpoint[256];
-    size_t endpoint_len = sizeof (endpoint);
-    memset (endpoint, 0, endpoint_len);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &endpoint_len));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_port_wildcard_ipv6_address ()
-{
-    const int ipv6 = is_ipv6_available ();
-    if (!ipv6)
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-
-    /* Port wildcard, IPv6 address, IPv6 enabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_IPV6, &ipv6, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://[::1]:*"));
-
-    char endpoint[256];
-    size_t endpoint_len = sizeof (endpoint);
-    memset (endpoint, 0, endpoint_len);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &endpoint_len));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_address_wildcard_ipv4);
-    RUN_TEST (test_address_wildcard_ipv6);
-    RUN_TEST (test_port_wildcard_ipv4_address);
-    RUN_TEST (test_port_wildcard_ipv4_address_ipv6);
-    RUN_TEST (test_port_wildcard_ipv6_address);
-    return UNITY_END ();
-}
diff --git a/tests/test_use_fd.cpp b/tests/test_use_fd.cpp
deleted file mode 100644
index 888cf203e..000000000
--- a/tests/test_use_fd.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-    Copyright (c) 2016-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#if !defined(ZMQ_HAVE_WINDOWS)
-
-void pre_allocate_sock_tcp (void *socket_, char *my_endpoint_)
-{
-    fd_t s = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint_);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket_, ZMQ_USE_FD, &s, sizeof (s)));
-}
-
-typedef void (*pre_allocate_sock_fun_t) (void *, char *);
-
-void setup_socket_pair (pre_allocate_sock_fun_t pre_allocate_sock_fun_,
-                        int bind_socket_type_,
-                        int connect_socket_type_,
-                        void **out_sb_,
-                        void **out_sc_)
-{
-    *out_sb_ = test_context_socket (bind_socket_type_);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    pre_allocate_sock_fun_ (*out_sb_, my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (*out_sb_, my_endpoint));
-
-    *out_sc_ = test_context_socket (connect_socket_type_);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (*out_sc_, my_endpoint));
-}
-
-void test_socket_pair (pre_allocate_sock_fun_t pre_allocate_sock_fun_,
-                       int bind_socket_type_,
-                       int connect_socket_type_)
-{
-    void *sb, *sc;
-    setup_socket_pair (pre_allocate_sock_fun_, bind_socket_type_,
-                       connect_socket_type_, &sb, &sc);
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_req_rep (pre_allocate_sock_fun_t pre_allocate_sock_fun_)
-{
-    test_socket_pair (pre_allocate_sock_fun_, ZMQ_REP, ZMQ_REQ);
-}
-
-void test_pair (pre_allocate_sock_fun_t pre_allocate_sock_fun_)
-{
-    test_socket_pair (pre_allocate_sock_fun_, ZMQ_PAIR, ZMQ_PAIR);
-}
-
-void test_client_server (pre_allocate_sock_fun_t pre_allocate_sock_fun_)
-{
-#if defined(ZMQ_SERVER) && defined(ZMQ_CLIENT)
-    void *sb, *sc;
-    setup_socket_pair (pre_allocate_sock_fun_, ZMQ_SERVER, ZMQ_CLIENT, &sb,
-                       &sc);
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-    char *data = static_cast<char *> (zmq_msg_data (&msg));
-    data[0] = 1;
-
-    int rc = zmq_msg_send (&msg, sc, ZMQ_SNDMORE);
-    // TODO which error code is expected?
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-
-    rc = zmq_msg_send (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    rc = zmq_msg_recv (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    uint32_t routing_id = zmq_msg_routing_id (&msg);
-    TEST_ASSERT_NOT_EQUAL (0, routing_id);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-    data = static_cast<char *> (zmq_msg_data (&msg));
-    data[0] = 2;
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_set_routing_id (&msg, routing_id));
-
-    rc = zmq_msg_send (&msg, sb, ZMQ_SNDMORE);
-    // TODO which error code is expected?
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-
-    rc = zmq_msg_send (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    rc = zmq_msg_recv (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    routing_id = zmq_msg_routing_id (&msg);
-    TEST_ASSERT_EQUAL_INT (0, routing_id);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-#endif
-}
-
-void test_req_rep_tcp ()
-{
-    test_req_rep (pre_allocate_sock_tcp);
-}
-
-void test_pair_tcp ()
-{
-    test_pair (pre_allocate_sock_tcp);
-}
-
-void test_client_server_tcp ()
-{
-#if defined(ZMQ_SERVER) && defined(ZMQ_CLIENT)
-    test_client_server (pre_allocate_sock_tcp);
-#endif
-}
-
-char ipc_endpoint[MAX_SOCKET_STRING] = "";
-
-void pre_allocate_sock_ipc (void *sb_, char *my_endpoint_)
-{
-    fd_t s = bind_socket_resolve_port ("", "", my_endpoint_, AF_UNIX, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb_, ZMQ_USE_FD, &s, sizeof (s)));
-    strcpy (ipc_endpoint, strchr (my_endpoint_, '/') + 2);
-}
-
-void test_req_rep_ipc ()
-{
-    test_req_rep (pre_allocate_sock_ipc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (unlink (ipc_endpoint));
-}
-
-void test_pair_ipc ()
-{
-    test_pair (pre_allocate_sock_ipc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (unlink (ipc_endpoint));
-}
-
-void test_client_server_ipc ()
-{
-#if defined(ZMQ_SERVER) && defined(ZMQ_CLIENT)
-    test_client_server (pre_allocate_sock_ipc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (unlink (ipc_endpoint));
-#endif
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_req_rep_tcp);
-    RUN_TEST (test_pair_tcp);
-    RUN_TEST (test_client_server_tcp);
-
-    RUN_TEST (test_req_rep_ipc);
-    RUN_TEST (test_pair_ipc);
-    RUN_TEST (test_client_server_ipc);
-
-    return UNITY_END ();
-}
-#else
-int main ()
-{
-    return 0;
-}
-#endif
diff --git a/tests/test_ws_transport.cpp b/tests/test_ws_transport.cpp
deleted file mode 100644
index dbb6aed9a..000000000
--- a/tests/test_ws_transport.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string.h>
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    char bind_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://*:*/roundtrip"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, bind_address, &addr_length));
-
-    // Windows can't connect to 0.0.0.0
-    sprintf (connect_address, "ws://127.0.0.1%s", strrchr (bind_address, ':'));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, connect_address));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, bind_address));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_roundtrip_without_path ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-
-void test_heartbeat ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*/heartbeat"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    // Setting heartbeat settings
-    int ivl = 10;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_HEARTBEAT_IVL, &ivl, sizeof (ivl)));
-
-    // Disable reconnect, to make sure the ping-pong actually work
-    ivl = -1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_RECONNECT_IVL, &ivl, sizeof (ivl)));
-
-    // Connect to server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    // Make sure some ping and pong going through
-    msleep (100);
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_short_message ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*/short"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 255));
-
-    for (unsigned char i = 0; i < 255; ++i)
-        ((unsigned char *) zmq_msg_data (&msg))[i] = i;
-
-    int rc = zmq_msg_send (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (255, rc);
-
-    rc = zmq_msg_recv (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (255, rc);
-
-    for (unsigned char i = 0; i < 255; ++i)
-        TEST_ASSERT_EQUAL_INT (i, ((unsigned char *) zmq_msg_data (&msg))[i]);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_large_message ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*/large"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 65536));
-
-    for (int i = 0; i < 65536; ++i)
-        ((unsigned char *) zmq_msg_data (&msg))[i] = i % 255;
-
-    int rc = zmq_msg_send (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (65536, rc);
-
-    rc = zmq_msg_recv (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (65536, rc);
-
-    for (int i = 0; i < 65536; ++i)
-        TEST_ASSERT_EQUAL_INT (i % 255,
-                               ((unsigned char *) zmq_msg_data (&msg))[i]);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_curve ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    char client_public[41];
-    char client_secret[41];
-    char server_public[41];
-    char server_secret[41];
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_curve_keypair (server_public, server_secret));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_curve_keypair (client_public, client_secret));
-
-    void *server = test_context_socket (ZMQ_REP);
-    int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_CURVE_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_CURVE_SECRETKEY, server_secret, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, "ws://127.0.0.1:*/roundtrip"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (server, ZMQ_LAST_ENDPOINT,
-                                               connect_address, &addr_length));
-
-    void *client = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, client_public, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, client_secret, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, connect_address));
-
-    bounce (server, client);
-
-    test_context_socket_close (client);
-    test_context_socket_close (server);
-}
-
-
-void test_mask_shared_msg ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*/mask-shared"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    zmq_msg_t msg;
-    zmq_msg_init_size (
-      &msg, 255); // Message have to be long enough so it won't fit inside msg
-    unsigned char *data = (unsigned char *) zmq_msg_data (&msg);
-    for (int i = 0; i < 255; i++)
-        data[i] = i;
-
-    //  Taking a copy to make the msg shared
-    zmq_msg_t copy;
-    zmq_msg_init (&copy);
-    zmq_msg_copy (&copy, &msg);
-
-    //  Sending the shared msg
-    int rc = zmq_msg_send (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (255, rc);
-
-    //  Recv the msg and check that it was masked correctly
-    rc = zmq_msg_recv (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (255, rc);
-    data = (unsigned char *) zmq_msg_data (&msg);
-    for (int i = 0; i < 255; i++)
-        TEST_ASSERT_EQUAL_INT (i, data[i]);
-
-    //  Testing that copy was not masked
-    data = (unsigned char *) zmq_msg_data (&copy);
-    for (int i = 0; i < 255; i++)
-        TEST_ASSERT_EQUAL_INT (i, data[i]);
-
-    //  Constant msg cannot be masked as well, as it is constant
-    rc = zmq_send_const (sc, "HELLO", 5, 0);
-    TEST_ASSERT_EQUAL_INT (5, rc);
-    recv_string_expect_success (sb, "HELLO", 0);
-
-    zmq_msg_close (&copy);
-    zmq_msg_close (&msg);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip_without_path);
-    RUN_TEST (test_roundtrip);
-    RUN_TEST (test_short_message);
-    RUN_TEST (test_large_message);
-    RUN_TEST (test_heartbeat);
-    RUN_TEST (test_mask_shared_msg);
-
-    if (zmq_has ("curve"))
-        RUN_TEST (test_curve);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_wss_transport.cpp b/tests/test_wss_transport.cpp
deleted file mode 100644
index 7865ab675..000000000
--- a/tests/test_wss_transport.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string.h>
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#ifdef ZMQ_WSS_CERT_PEM
-const char *key =
-  "-----BEGIN PRIVATE KEY-----\n"
-  "MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDnzizmqK1e0iRR\n"
-  "lY75z9q3TWVBzFYX00Rl18GT2liW6AYzOB/qa55EhjTf4snhC2FaUoosu4MYRdvo\n"
-  "8qBOpFvnQDScJ6o06LyrWyL15kkBYEsTkjmDEXe/TxUVE2IBb991m1F91SIEjK5m\n"
-  "NRH2aRjrN5mL9f8+Crrv96Y4sxGCDkqwOarViFbDYFxdYa7WrvZImpknrmM5KPyg\n"
-  "PtU9gqnlIgAU9bPTGUJGdQeQ+AWKOgw6unV8IiKEX8jyHBoKiAqTspRCCV9yDOKx\n"
-  "eVUGgkcAMpeSv8HVboNbfof8DI+eT8EtYNsWW4dINgiYYEGZIhy74X2dKria6hCc\n"
-  "AYdS+/90nf0RAyymniDtgTGrMIXFmjlYpLngqfAo+zzl21dGh3VnRUFbTak8CH4g\n"
-  "wYIefJFerwJP1im5jAiULWHaiOOk2r5fHdxbBLebqcaWBRSGGNE9cj4bj/qYuHAf\n"
-  "VrNW5+CN3j0h5ss/f8lOoDbbrb6GtSJfI16fuQZd2hW84u38EuVd1/mzbVMv7Bip\n"
-  "yzjbEAcOgn0Mk89zZewooz8Sxr2e1R47/5CCHJodUFqc5hmcnOqRd7YmpM68bS7V\n"
-  "KbnOY3w9Llw6tkXMitmtUs7IiKZ1ViXA3UzMSumvEJKMqOnfNEUH9pkqYe2lVbay\n"
-  "1HSk/hz7AkprVPMlqlF12x/794fg9wIDAQABAoICAHI10UWsYg9P9nkD+Tf4Q0kB\n"
-  "JxyuMtT2UMLk9QmGERP5KeTeiEsVzxrwDOkqclEhLEw2UsILeWHiOaGiuX1F2cos\n"
-  "hj9SA7ih2yOKecUyO1IkQZlY+GEtoBRwQHDr5ePTXQQzDIm1E1eugNb22uzPh2mN\n"
-  "MWgWQjYtT0GggRN6luu/YulE4Hjo/eaxeZDA6kX4WnwXP9KfR2AIY8AIdUQjNtYg\n"
-  "VG3/SSR/U3onexzgNsqOIyxkZjJNFzilgPpZAjOiJ6Px3r5So+Yrlx3eLBhS4+yj\n"
-  "AK9bL4ObOblAtHtpLPHRVdqn2ApB+nuHs+BvvKJYflPLm/pt7BrXrGtRDX3Dj27T\n"
-  "sXPZTBsPmFr8vqlbgIYNCiY3uQonsAO95o0Y0Dx6oVFlzL1ajP49KmUye+p/wEHc\n"
-  "1XfYD8DxfU+ECEZk1/DvmKIPc4cZr2U1i9RBVRiKFd4NFIGYylLihuYhB9FZEyWQ\n"
-  "p0TwM3DFs7PwIQNPE6mGKtjgdgBGkY4AGfCxQzdp1mM+I2700OIx0EHAbxm5JMQm\n"
-  "NQKtBWliiz7+DLK/NWrDVS8N8tdkZVpHUK6ahvJbYG8oDqX0me6Bmk+0SaQJujis\n"
-  "fOPFRNGanr0X97+fqMJnDeOfXAcYurXBm81IkGilUF+2a0wWhS7PGhOT4dcLKRU8\n"
-  "tcmIZRJDWWyv2uQGg2yhAoIBAQD5sM7SX/ZuQ44HHmjQP59//vxCoZYqcPtf+52z\n"
-  "kCpRnbbzFh/uTLRBvQ5NjZp7XOpZ/3y05JnarYChjCuVjG5+SJO7UQ0pl5N7LL0r\n"
-  "3YGSRkfBGE05AiccyitonQssnJ4GVGfkt+1l9kVn4aMN9YkgoWc68vFzHY9CfIjS\n"
-  "3d7QM89vGJBmBCpLG9WC0R24VNH6mfnM0MANwFlYFk9a2cKWueNjMidtHaNgry7A\n"
-  "lWKn7jEUizkb5kNiVoFC+9qYx16unR1U2K4eRJoOhOLNWPaPuGX219iMvQ+CHs2T\n"
-  "ZA72qj0d29t2wS8RmFXAIRNDuc7MkPh3iTF4jdRt57/pU1WPAoIBAQDtqavyOx/h\n"
-  "kilyGjALfca68iQscWuVmWCVzFFfeGvFN4IXSxgM38xmtSEhAILVf7ozv/QNJsxv\n"
-  "9l1xGkY+FaoFTSxglMw0iO4fZwNp2GuEy57jFzJuJyzE4FiueNb5dzoZnGnXxJIS\n"
-  "bnprZgR42aaYAU0PzPwrqyc3PXv2J4tn6O8Mt53JO4bN+/XomD4oQBOhM0iLuS7t\n"
-  "xTUQnsaHr1QglSIGQf4XOmXTO0+dE5uhFXkKP0Frq4MtoJUdEiWNzOdzwzxAZJTL\n"
-  "v8dPOQud9yxKxwRg2rroasKgyRgE6GHqKSRhggiMwVOFzeMxPLJ2oeWmpRZXiMoH\n"
-  "dkiCnPh7DBoZAoIBAGSuUJcvrrSDdO+V6XmfTfdUn+9WLLDsYdAwK0TOauICEFUw\n"
-  "pKt4Lm8bhnrrEFGSA8VKacSfMRKmR2nclW5188/j//3WDtKolgVi4tyfMrICuMg5\n"
-  "vlmwbokDVEGYoXrZpDa1Ljdhms40YYQjzZXBXgvUSUXR1F4wmyWaBanRYRje61PG\n"
-  "ueMI5uzmSk+3dp5vRUQhdkKKIgbpep00Ucc2a2pPhkrnXFJ5UvmXaeip0+AXAZ9h\n"
-  "DCQd0yoB65lQ6LIWIi2SmNMvk/YMf3o/Rxy6NKF7H1JLcrw9N9WmCgrWm9oGhyJV\n"
-  "Fsdp2krj/B++tn/mmmaORkIdBd+wgOnYOuAghC0CggEBAK6KtLgyieh9Eqk06GIY\n"
-  "HlJ/sOde6Pc2bIO3SW/HHcb6TDVVNjWGSzSHA+yb1np70sFc0RyziOMVWWzOMhY4\n"
-  "jORV2CiaPxq6Eb/IRO6APf6KGIeJKsVRSgTRCvAf2SnfUTEr+WO4ftrAfnHPu6sR\n"
-  "ldL+6ZyYG/7qNOPR6O9P/YbzwFRjqaL3b7ppuCD5ZnTjEkeKRVYwS3HeKmmpYf6W\n"
-  "Wj+PpyxXXQesIMowPfkLRHnaLknDSQWNMcrZq4ltIV1xxe3zzZUxCUJV90eMiqaZ\n"
-  "t9K3NNT47tnwRj4VUemQzRBO5OQjvqm49eFH4vnvLNYJcoKfrbfdwxoV2YzrQWYE\n"
-  "7kkCggEBAKzLviuI6eoaPwgKeR2wrFBbrucnY4yqkVIFzFRpjM6azzMArYVpslZW\n"
-  "DTdmi/2QCd9altVAT20Yvml8YqrFszpINV1DqBIfHtQPEy9oKrhFW92rhuJQo/aX\n"
-  "1yILvzmyzLdpQG6zLm7TD7mEkumiT9F3ObeoVnAOllEwUrNAfDPPclRHGowJs6Ya\n"
-  "wv50Idk62v7gnXny9OyFN3kUq6dtwItYqmalfKKGXhTi49mEWX39SSZSt+a15oKM\n"
-  "21fKHdqiG/AXST7n8IlBGRzyW9TqTnmVC5zj7esmqfRT0eno399hl0LOZgJoa4dx\n"
-  "lMwbKi/uEdrUT3ei3nAxnuQolXgClZk=\n"
-  "-----END PRIVATE KEY-----";
-
-const char *cert =
-  "-----BEGIN CERTIFICATE-----\n"
-  "MIIFkTCCA3mgAwIBAgIUWazS3jRxgV/9TgdybZ9ch7nYsQIwDQYJKoZIhvcNAQEL\n"
-  "BQAwVzELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UE\n"
-  "CgwTRGVmYXVsdCBDb21wYW55IEx0ZDETMBEGA1UEAwwKemVyb21xLm9yZzAgFw0x\n"
-  "OTExMTAwODMzMThaGA8yMTE5MTAxNzA4MzMxOFowVzELMAkGA1UEBhMCWFgxFTAT\n"
-  "BgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0\n"
-  "ZDETMBEGA1UEAwwKemVyb21xLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC\n"
-  "AgoCggIBAOfOLOaorV7SJFGVjvnP2rdNZUHMVhfTRGXXwZPaWJboBjM4H+prnkSG\n"
-  "NN/iyeELYVpSiiy7gxhF2+jyoE6kW+dANJwnqjTovKtbIvXmSQFgSxOSOYMRd79P\n"
-  "FRUTYgFv33WbUX3VIgSMrmY1EfZpGOs3mYv1/z4Kuu/3pjizEYIOSrA5qtWIVsNg\n"
-  "XF1hrtau9kiamSeuYzko/KA+1T2CqeUiABT1s9MZQkZ1B5D4BYo6DDq6dXwiIoRf\n"
-  "yPIcGgqICpOylEIJX3IM4rF5VQaCRwAyl5K/wdVug1t+h/wMj55PwS1g2xZbh0g2\n"
-  "CJhgQZkiHLvhfZ0quJrqEJwBh1L7/3Sd/REDLKaeIO2BMaswhcWaOVikueCp8Cj7\n"
-  "POXbV0aHdWdFQVtNqTwIfiDBgh58kV6vAk/WKbmMCJQtYdqI46Tavl8d3FsEt5up\n"
-  "xpYFFIYY0T1yPhuP+pi4cB9Ws1bn4I3ePSHmyz9/yU6gNtutvoa1Il8jXp+5Bl3a\n"
-  "Fbzi7fwS5V3X+bNtUy/sGKnLONsQBw6CfQyTz3Nl7CijPxLGvZ7VHjv/kIIcmh1Q\n"
-  "WpzmGZyc6pF3tiakzrxtLtUpuc5jfD0uXDq2RcyK2a1SzsiIpnVWJcDdTMxK6a8Q\n"
-  "koyo6d80RQf2mSph7aVVtrLUdKT+HPsCSmtU8yWqUXXbH/v3h+D3AgMBAAGjUzBR\n"
-  "MB0GA1UdDgQWBBTVHR+4lBIBcr2rEEMdideTAkwDZDAfBgNVHSMEGDAWgBTVHR+4\n"
-  "lBIBcr2rEEMdideTAkwDZDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA\n"
-  "A4ICAQB9M5p9z92UhVXg2baUj9QBN2YFGAeveFRpZ9Y/wktEssTqMKkc+39UtfJS\n"
-  "UclZnzMEhLyTieNqf+8GCgLLI0YSTIJpWwzvQBcXPoo+8IcexANvxR22KZrE51y4\n"
-  "/YfCKh8Q0ZbG8oc5Br8YHwipzGcmWjWtznfMpuaELezv/r381QV1Sbmpw2a0jvwp\n"
-  "uA/bc+4IZ9yvrhC9KkOUnivnCV71U2Wy8zOvrBEJicuGOc+lbWJRKyjbMDi1IybG\n"
-  "VnemtkQEyXFh6f1h8AdaN+Xj7qXX/YKmNk20Siu4qDNo8nozVpOL2DHjoKLa4N2c\n"
-  "ULG3kXScxVxWqCuPVNeypV2TZ9uSVFeKK/VJ5iGvFeifDsqVVo6WC4Pdz0WYes8H\n"
-  "3VqEPSwmNJ1FswLpYpGgCEFnkGRPFFB5dmwr0fuubkgaJPatxrImFac+nukfqZ8N\n"
-  "x/d4t72u1yIs0HnrkAj96ZIUXH5jFGPXbD8eGO0hzw+wbY9KRLXGBBl2B4EAaBdt\n"
-  "Cmp8R8xus3FGDZ5RVftZvTQO2CiTC4yn9Wab/ADDwcXDs6ntHctx4xQpm0tLqMoz\n"
-  "BTH8+ftqyzklar35gJluD84oh1kynEojrPkUvb75NlzxikBSF3pRrOx30Myy7DBx\n"
-  "rhUIqDFxqlYFx9InEzHlvI7cWWdMNqAmSxpz4SXMrd/7PJG+Ag==\n"
-  "-----END CERTIFICATE-----";
-
-void test_roundtrip ()
-{
-    char connect_address[MAX_SOCKET_STRING + strlen ("/roundtrip")];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    zmq_setsockopt (sb, ZMQ_WSS_CERT_PEM, cert, strlen (cert));
-    zmq_setsockopt (sb, ZMQ_WSS_KEY_PEM, key, strlen (key));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "wss://*:*/roundtrip"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-    strcat (connect_address, "/roundtrip");
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    zmq_setsockopt (sc, ZMQ_WSS_TRUST_PEM, cert, strlen (cert));
-    zmq_setsockopt (sc, ZMQ_WSS_HOSTNAME, "zeromq.org", strlen ("zeromq.org"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
-#else
-int main ()
-{
-    printf ("WSS unavailable, skipping test\n");
-    return 77;
-}
-#endif
diff --git a/tests/test_xpub_manual.cpp b/tests/test_xpub_manual.cpp
deleted file mode 100644
index b9db2bc23..000000000
--- a/tests/test_xpub_manual.cpp
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_basic ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL, &manual, 4));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for A
-    const char subscription[] = {1, 'A', 0};
-    send_string_expect_success (sub, subscription, 0);
-
-    // Receive subscriptions from subscriber
-    recv_string_expect_success (pub, subscription, 0);
-
-    // Subscribe socket for B instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "B", 1));
-
-    // Sending A message and B Message
-    send_string_expect_success (pub, "A", 0);
-    send_string_expect_success (pub, "B", 0);
-
-    recv_string_expect_success (sub, "B", ZMQ_DONTWAIT);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_unsubscribe_manual ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  set pub socket options
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL, &manual, sizeof (manual)));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for A
-    const uint8_t subscription1[] = {1, 'A'};
-    send_array_expect_success (sub, subscription1, 0);
-
-    //  Subscribe for B
-    const uint8_t subscription2[] = {1, 'B'};
-    send_array_expect_success (sub, subscription2, 0);
-
-    char buffer[3];
-
-    // Receive subscription "A" from subscriber
-    recv_array_expect_success (pub, subscription1, 0);
-
-    // Subscribe socket for XA instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XA", 2));
-
-    // Receive subscription "B" from subscriber
-    recv_array_expect_success (pub, subscription2, 0);
-
-    // Subscribe socket for XB instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XB", 2));
-
-    //  Unsubscribe from A
-    const uint8_t unsubscription1[2] = {0, 'A'};
-    send_array_expect_success (sub, unsubscription1, 0);
-
-    // Receive unsubscription "A" from subscriber
-    recv_array_expect_success (pub, unsubscription1, 0);
-
-    // Unsubscribe socket from XA instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XA", 2));
-
-    // Sending messages XA, XB
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // Subscriber should receive XB only
-    recv_string_expect_success (sub, "XB", ZMQ_DONTWAIT);
-
-    // Close subscriber
-    test_context_socket_close (sub);
-
-    // Receive unsubscription "B"
-    const char unsubscription2[2] = {0, 'B'};
-    TEST_ASSERT_EQUAL_INT (
-      sizeof unsubscription2,
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (pub, buffer, sizeof buffer, 0)));
-    TEST_ASSERT_EQUAL_INT8_ARRAY (unsubscription2, buffer,
-                                  sizeof unsubscription2);
-
-    // Unsubscribe socket from XB instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XB", 2));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-}
-
-void test_xpub_proxy_unsubscribe_on_disconnect ()
-{
-    const uint8_t topic_buff[] = {"1"};
-    const uint8_t payload_buff[] = {"X"};
-
-    char my_endpoint_backend[MAX_SOCKET_STRING];
-    char my_endpoint_frontend[MAX_SOCKET_STRING];
-
-    int manual = 1;
-
-    // proxy frontend
-    void *xsub_proxy = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub_proxy, my_endpoint_frontend,
-                        sizeof my_endpoint_frontend);
-
-    // proxy backend
-    void *xpub_proxy = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_XPUB_MANUAL, &manual, 4));
-    bind_loopback_ipv4 (xpub_proxy, my_endpoint_backend,
-                        sizeof my_endpoint_backend);
-
-    // publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, my_endpoint_frontend));
-
-    // first subscriber subscribes
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic_buff, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes and confirms subscriptions
-    const uint8_t subscription[2] = {1, *topic_buff};
-    recv_array_expect_success (xpub_proxy, subscription, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, subscription, 0);
-
-    // second subscriber subscribes
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, topic_buff, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes
-    recv_array_expect_success (xpub_proxy, subscription, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, subscription, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send a msg
-    send_array_expect_success (pub, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (pub, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes data messages to subscribers
-    recv_array_expect_success (xsub_proxy, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (xsub_proxy, payload_buff, ZMQ_DONTWAIT);
-    send_array_expect_success (xpub_proxy, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (xpub_proxy, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // each subscriber should now get a message
-    recv_array_expect_success (sub2, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub2, payload_buff, ZMQ_DONTWAIT);
-
-    recv_array_expect_success (sub1, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub1, payload_buff, ZMQ_DONTWAIT);
-
-    //  Disconnect both subscribers
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // unsubscribe messages are passed from proxy to publisher
-    const uint8_t unsubscription[] = {0, *topic_buff};
-    recv_array_expect_success (xpub_proxy, unsubscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_UNSUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, unsubscription, 0);
-
-    // should receive another unsubscribe msg
-    recv_array_expect_success (xpub_proxy, unsubscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_UNSUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, unsubscription, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send a msg
-    send_array_expect_success (pub, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (pub, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // nothing should come to the proxy
-    char buffer[1];
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (xsub_proxy, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    test_context_socket_close (pub);
-    test_context_socket_close (xpub_proxy);
-    test_context_socket_close (xsub_proxy);
-}
-
-void test_missing_subscriptions ()
-{
-    const char *topic1 = "1";
-    const char *topic2 = "2";
-    const char *payload = "X";
-
-    char my_endpoint_backend[MAX_SOCKET_STRING];
-    char my_endpoint_frontend[MAX_SOCKET_STRING];
-
-    int manual = 1;
-
-    // proxy frontend
-    void *xsub_proxy = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub_proxy, my_endpoint_frontend,
-                        sizeof my_endpoint_frontend);
-
-    // proxy backend
-    void *xpub_proxy = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_XPUB_MANUAL, &manual, 4));
-    bind_loopback_ipv4 (xpub_proxy, my_endpoint_backend,
-                        sizeof my_endpoint_backend);
-
-    // publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, my_endpoint_frontend));
-
-    // Here's the problem: because subscribers subscribe in quick succession,
-    // the proxy is unable to confirm the first subscription before receiving
-    // the second. This causes the first subscription to get lost.
-
-    // first subscriber
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic1, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy now reroutes and confirms subscriptions
-    const uint8_t subscription1[] = {1, static_cast<uint8_t> (topic1[0])};
-    recv_array_expect_success (xpub_proxy, subscription1, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic1, 1));
-    send_array_expect_success (xsub_proxy, subscription1, 0);
-
-    // second subscriber
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, topic2, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    const uint8_t subscription2[] = {1, static_cast<uint8_t> (topic2[0])};
-    recv_array_expect_success (xpub_proxy, subscription2, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic2, 1));
-    send_array_expect_success (xsub_proxy, subscription2, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send 2 msgs, each with its own topic_buff
-    send_string_expect_success (pub, topic1, ZMQ_SNDMORE);
-    send_string_expect_success (pub, payload, 0);
-    send_string_expect_success (pub, topic2, ZMQ_SNDMORE);
-    send_string_expect_success (pub, payload, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes data messages to subscribers
-    recv_string_expect_success (xsub_proxy, topic1, ZMQ_DONTWAIT);
-    recv_string_expect_success (xsub_proxy, payload, ZMQ_DONTWAIT);
-    send_string_expect_success (xpub_proxy, topic1, ZMQ_SNDMORE);
-    send_string_expect_success (xpub_proxy, payload, 0);
-
-    recv_string_expect_success (xsub_proxy, topic2, ZMQ_DONTWAIT);
-    recv_string_expect_success (xsub_proxy, payload, ZMQ_DONTWAIT);
-    send_string_expect_success (xpub_proxy, topic2, ZMQ_SNDMORE);
-    send_string_expect_success (xpub_proxy, payload, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // each subscriber should now get a message
-    recv_string_expect_success (sub2, topic2, ZMQ_DONTWAIT);
-    recv_string_expect_success (sub2, payload, ZMQ_DONTWAIT);
-
-    recv_string_expect_success (sub1, topic1, ZMQ_DONTWAIT);
-    recv_string_expect_success (sub1, payload, ZMQ_DONTWAIT);
-
-    //  Clean up
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-    test_context_socket_close (pub);
-    test_context_socket_close (xpub_proxy);
-    test_context_socket_close (xsub_proxy);
-}
-
-void test_unsubscribe_cleanup ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL, &manual, 4));
-    bind_loopback_ipv4 (pub, my_endpoint, sizeof my_endpoint);
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, my_endpoint));
-
-    //  Subscribe for A
-    const uint8_t subscription1[2] = {1, 'A'};
-    send_array_expect_success (sub, subscription1, 0);
-
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscription1, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XA", 2));
-
-    // send 2 messages
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // receive the single message
-    recv_string_expect_success (sub, "XA", 0);
-
-    // should be nothing left in the queue
-    char buffer[2];
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    // close the socket
-    test_context_socket_close (sub);
-
-    // closing the socket will result in an unsubscribe event
-    const uint8_t unsubscription[2] = {0, 'A'};
-    recv_array_expect_success (pub, unsubscription, 0);
-
-    // this doesn't really do anything
-    // there is no last_pipe set it will just fail silently
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XA", 2));
-
-    // reconnect
-    sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, my_endpoint));
-
-    // send a subscription for B
-    const uint8_t subscription2[2] = {1, 'B'};
-    send_array_expect_success (sub, subscription2, 0);
-
-    // receive the subscription, overwrite it to XB
-    recv_array_expect_success (pub, subscription2, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XB", 2));
-
-    // send 2 messages
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // receive the single message
-    recv_string_expect_success (sub, "XB", 0);
-
-    // should be nothing left in the queue
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_user_message ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Send some data that is neither sub nor unsub
-    const char subscription[] = {2, 'A', 0};
-    send_string_expect_success (sub, subscription, 0);
-
-    // Receive subscriptions from subscriber
-    recv_string_expect_success (pub, subscription, 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-#ifdef ZMQ_ONLY_FIRST_SUBSCRIBE
-void test_user_message_multi ()
-{
-    const int only_first_subscribe = 1;
-
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_ONLY_FIRST_SUBSCRIBE,
-                                               &only_first_subscribe,
-                                               sizeof (only_first_subscribe)));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_ONLY_FIRST_SUBSCRIBE,
-                                               &only_first_subscribe,
-                                               sizeof (only_first_subscribe)));
-
-    //  Send some data that is neither sub nor unsub
-    const uint8_t msg_common[] = {'A', 'B', 'C'};
-    //  Message starts with 0 but should still treated as user
-    const uint8_t msg_0a[] = {0, 'B', 'C'};
-    const uint8_t msg_0b[] = {0, 'C', 'D'};
-    //  Message starts with 1 but should still treated as user
-    const uint8_t msg_1a[] = {1, 'B', 'C'};
-    const uint8_t msg_1b[] = {1, 'C', 'D'};
-
-    // Test second message starting with 0
-    send_array_expect_success (sub, msg_common, ZMQ_SNDMORE);
-    send_array_expect_success (sub, msg_0a, 0);
-
-    // Receive messages from subscriber
-    recv_array_expect_success (pub, msg_common, 0);
-    recv_array_expect_success (pub, msg_0a, 0);
-
-    // Test second message starting with 1
-    send_array_expect_success (sub, msg_common, ZMQ_SNDMORE);
-    send_array_expect_success (sub, msg_1a, 0);
-
-    // Receive messages from subscriber
-    recv_array_expect_success (pub, msg_common, 0);
-    recv_array_expect_success (pub, msg_1a, 0);
-
-    // Test first message starting with 1
-    send_array_expect_success (sub, msg_1a, ZMQ_SNDMORE);
-    send_array_expect_success (sub, msg_1b, 0);
-    recv_array_expect_success (pub, msg_1a, 0);
-    recv_array_expect_success (pub, msg_1b, 0);
-
-    send_array_expect_success (sub, msg_0a, ZMQ_SNDMORE);
-    send_array_expect_success (sub, msg_0b, 0);
-    recv_array_expect_success (pub, msg_0a, 0);
-    recv_array_expect_success (pub, msg_0b, 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-#endif
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_basic);
-    RUN_TEST (test_unsubscribe_manual);
-    RUN_TEST (test_xpub_proxy_unsubscribe_on_disconnect);
-    RUN_TEST (test_missing_subscriptions);
-    RUN_TEST (test_unsubscribe_cleanup);
-    RUN_TEST (test_user_message);
-#ifdef ZMQ_ONLY_FIRST_SUBSCRIBE
-    RUN_TEST (test_user_message_multi);
-#endif
-
-    return UNITY_END ();
-}
diff --git a/tests/test_xpub_manual_last_value.cpp b/tests/test_xpub_manual_last_value.cpp
deleted file mode 100644
index 733e34ae5..000000000
--- a/tests/test_xpub_manual_last_value.cpp
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_basic ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for A
-    const char subscription[] = {1, 'A', 0};
-    send_string_expect_success (sub, subscription, 0);
-
-    // Receive subscriptions from subscriber
-    recv_string_expect_success (pub, subscription, 0);
-
-    // Subscribe socket for B instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "B", 1));
-
-    // Sending A message and B Message
-    send_string_expect_success (pub, "A", 0);
-    send_string_expect_success (pub, "B", 0);
-
-    recv_string_expect_success (sub, "B", ZMQ_DONTWAIT);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_unsubscribe_manual ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  set pub socket options
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_XPUB_MANUAL_LAST_VALUE,
-                                               &manual, sizeof (manual)));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for A
-    const uint8_t subscription1[] = {1, 'A'};
-    send_array_expect_success (sub, subscription1, 0);
-
-    //  Subscribe for B
-    const uint8_t subscription2[] = {1, 'B'};
-    send_array_expect_success (sub, subscription2, 0);
-
-    char buffer[3];
-
-    // Receive subscription "A" from subscriber
-    recv_array_expect_success (pub, subscription1, 0);
-
-    // Subscribe socket for XA instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XA", 2));
-
-    // Receive subscription "B" from subscriber
-    recv_array_expect_success (pub, subscription2, 0);
-
-    // Subscribe socket for XB instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XB", 2));
-
-    //  Unsubscribe from A
-    const uint8_t unsubscription1[2] = {0, 'A'};
-    send_array_expect_success (sub, unsubscription1, 0);
-
-    // Receive unsubscription "A" from subscriber
-    recv_array_expect_success (pub, unsubscription1, 0);
-
-    // Unsubscribe socket from XA instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XA", 2));
-
-    // Sending messages XA, XB
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // Subscriber should receive XB only
-    recv_string_expect_success (sub, "XB", ZMQ_DONTWAIT);
-
-    // Close subscriber
-    test_context_socket_close (sub);
-
-    // Receive unsubscription "B"
-    const char unsubscription2[2] = {0, 'B'};
-    TEST_ASSERT_EQUAL_INT (
-      sizeof unsubscription2,
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (pub, buffer, sizeof buffer, 0)));
-    TEST_ASSERT_EQUAL_INT8_ARRAY (unsubscription2, buffer,
-                                  sizeof unsubscription2);
-
-    // Unsubscribe socket from XB instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XB", 2));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-}
-
-void test_xpub_proxy_unsubscribe_on_disconnect ()
-{
-    const uint8_t topic_buff[] = {"1"};
-    const uint8_t payload_buff[] = {"X"};
-
-    char my_endpoint_backend[MAX_SOCKET_STRING];
-    char my_endpoint_frontend[MAX_SOCKET_STRING];
-
-    int manual = 1;
-
-    // proxy frontend
-    void *xsub_proxy = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub_proxy, my_endpoint_frontend,
-                        sizeof my_endpoint_frontend);
-
-    // proxy backend
-    void *xpub_proxy = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-    bind_loopback_ipv4 (xpub_proxy, my_endpoint_backend,
-                        sizeof my_endpoint_backend);
-
-    // publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, my_endpoint_frontend));
-
-    // first subscriber subscribes
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic_buff, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes and confirms subscriptions
-    const uint8_t subscription[2] = {1, *topic_buff};
-    recv_array_expect_success (xpub_proxy, subscription, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, subscription, 0);
-
-    // second subscriber subscribes
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, topic_buff, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes
-    recv_array_expect_success (xpub_proxy, subscription, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, subscription, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send a msg
-    send_array_expect_success (pub, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (pub, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes data messages to subscribers
-    recv_array_expect_success (xsub_proxy, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (xsub_proxy, payload_buff, ZMQ_DONTWAIT);
-
-    // send 2 messages
-    send_array_expect_success (xpub_proxy, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (xpub_proxy, payload_buff, 0);
-    send_array_expect_success (xpub_proxy, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (xpub_proxy, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // sub2 will get 2 messages because the last subscription is sub2.
-    recv_array_expect_success (sub2, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub2, payload_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub2, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub2, payload_buff, ZMQ_DONTWAIT);
-
-    recv_array_expect_success (sub1, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub1, payload_buff, ZMQ_DONTWAIT);
-
-    //  Disconnect both subscribers
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // unsubscribe messages are passed from proxy to publisher
-    const uint8_t unsubscription[] = {0, *topic_buff};
-    recv_array_expect_success (xpub_proxy, unsubscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_UNSUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, unsubscription, 0);
-
-    // should receive another unsubscribe msg
-    recv_array_expect_success (xpub_proxy, unsubscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_UNSUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, unsubscription, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send a msg
-    send_array_expect_success (pub, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (pub, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // nothing should come to the proxy
-    char buffer[1];
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (xsub_proxy, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    test_context_socket_close (pub);
-    test_context_socket_close (xpub_proxy);
-    test_context_socket_close (xsub_proxy);
-}
-
-void test_missing_subscriptions ()
-{
-    const char *topic1 = "1";
-    const char *topic2 = "2";
-    const char *payload = "X";
-
-    char my_endpoint_backend[MAX_SOCKET_STRING];
-    char my_endpoint_frontend[MAX_SOCKET_STRING];
-
-    int manual = 1;
-
-    // proxy frontend
-    void *xsub_proxy = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub_proxy, my_endpoint_frontend,
-                        sizeof my_endpoint_frontend);
-
-    // proxy backend
-    void *xpub_proxy = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-    bind_loopback_ipv4 (xpub_proxy, my_endpoint_backend,
-                        sizeof my_endpoint_backend);
-
-    // publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, my_endpoint_frontend));
-
-    // Here's the problem: because subscribers subscribe in quick succession,
-    // the proxy is unable to confirm the first subscription before receiving
-    // the second. This causes the first subscription to get lost.
-
-    // first subscriber
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic1, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy now reroutes and confirms subscriptions
-    const uint8_t subscription1[] = {1, static_cast<uint8_t> (topic1[0])};
-    recv_array_expect_success (xpub_proxy, subscription1, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic1, 1));
-    send_array_expect_success (xsub_proxy, subscription1, 0);
-
-    // second subscriber
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, topic2, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy now reroutes and confirms subscriptions
-    const uint8_t subscription2[] = {1, static_cast<uint8_t> (topic2[0])};
-    recv_array_expect_success (xpub_proxy, subscription2, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic2, 1));
-    send_array_expect_success (xsub_proxy, subscription2, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send 2 msgs, each with its own topic_buff
-    send_string_expect_success (pub, topic1, ZMQ_SNDMORE);
-    send_string_expect_success (pub, payload, 0);
-    send_string_expect_success (pub, topic2, ZMQ_SNDMORE);
-    send_string_expect_success (pub, payload, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes data messages to subscribers
-    recv_string_expect_success (xsub_proxy, topic1, ZMQ_DONTWAIT);
-    recv_string_expect_success (xsub_proxy, payload, ZMQ_DONTWAIT);
-    send_string_expect_success (xpub_proxy, topic1, ZMQ_SNDMORE);
-    send_string_expect_success (xpub_proxy, payload, 0);
-
-    recv_string_expect_success (xsub_proxy, topic2, ZMQ_DONTWAIT);
-    recv_string_expect_success (xsub_proxy, payload, ZMQ_DONTWAIT);
-    send_string_expect_success (xpub_proxy, topic2, ZMQ_SNDMORE);
-    send_string_expect_success (xpub_proxy, payload, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // only sub2 should now get a message
-    recv_string_expect_success (sub2, topic2, ZMQ_DONTWAIT);
-    recv_string_expect_success (sub2, payload, ZMQ_DONTWAIT);
-
-    //recv_string_expect_success (sub1, topic1, ZMQ_DONTWAIT);
-    //recv_string_expect_success (sub1, payload, ZMQ_DONTWAIT);
-
-    //  Clean up
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-    test_context_socket_close (pub);
-    test_context_socket_close (xpub_proxy);
-    test_context_socket_close (xsub_proxy);
-}
-
-void test_unsubscribe_cleanup ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-    bind_loopback_ipv4 (pub, my_endpoint, sizeof my_endpoint);
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, my_endpoint));
-
-    //  Subscribe for A
-    const uint8_t subscription1[2] = {1, 'A'};
-    send_array_expect_success (sub, subscription1, 0);
-
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscription1, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XA", 2));
-
-    // send 2 messages
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // receive the single message
-    recv_string_expect_success (sub, "XA", 0);
-
-    // should be nothing left in the queue
-    char buffer[2];
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    // close the socket
-    test_context_socket_close (sub);
-
-    // closing the socket will result in an unsubscribe event
-    const uint8_t unsubscription[2] = {0, 'A'};
-    recv_array_expect_success (pub, unsubscription, 0);
-
-    // this doesn't really do anything
-    // there is no last_pipe set it will just fail silently
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XA", 2));
-
-    // reconnect
-    sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, my_endpoint));
-
-    // send a subscription for B
-    const uint8_t subscription2[2] = {1, 'B'};
-    send_array_expect_success (sub, subscription2, 0);
-
-    // receive the subscription, overwrite it to XB
-    recv_array_expect_success (pub, subscription2, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XB", 2));
-
-    // send 2 messages
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // receive the single message
-    recv_string_expect_success (sub, "XB", 0);
-
-    // should be nothing left in the queue
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_manual_last_value ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-
-    int hwm = 2000;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SNDHWM, &hwm, 4));
-
-    //  set pub socket options
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Create another subscriber
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, "inproc://soname"));
-
-    //  Subscribe for "A".
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "A", 1));
-
-    const uint8_t subscription[2] = {1, 'A'};
-    //  we must wait for the subscription to be processed here, otherwise some
-    //  or all published messages might be lost
-    recv_array_expect_success (pub, subscription, 0);
-
-    //  manual subscribe message
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "A", 1));
-    send_string_expect_success (pub, "A", 0);
-    recv_string_expect_success (sub, "A", 0);
-
-    //  Subscribe for "A".
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, "A", 1));
-    recv_array_expect_success (pub, subscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "A", 1));
-    send_string_expect_success (pub, "A", 0);
-    recv_string_expect_success (sub2, "A", 0);
-
-    char buffer[255];
-    //  sub won't get a message because the last subscription pipe is sub2.
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof (buffer), ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-    test_context_socket_close (sub2);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_basic);
-    RUN_TEST (test_unsubscribe_manual);
-    RUN_TEST (test_xpub_proxy_unsubscribe_on_disconnect);
-    RUN_TEST (test_missing_subscriptions);
-    RUN_TEST (test_unsubscribe_cleanup);
-    RUN_TEST (test_manual_last_value);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_xpub_nodrop.cpp b/tests/test_xpub_nodrop.cpp
deleted file mode 100644
index 8599f7778..000000000
--- a/tests/test_xpub_nodrop.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-
-    int hwm = 2000;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SNDHWM, &hwm, 4));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  set pub socket options
-    int wait = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_XPUB_NODROP, &wait, 4));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for all messages.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "", 0));
-
-    //  we must wait for the subscription to be processed here, otherwise some
-    //  or all published messages might be lost
-    recv_string_expect_success (pub, "\1", 0);
-
-    int hwmlimit = hwm - 1;
-    int send_count = 0;
-
-    //  Send an empty message
-    for (int i = 0; i < hwmlimit; i++) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_send (pub, NULL, 0, 0));
-        send_count++;
-    }
-
-    int recv_count = 0;
-    do {
-        //  Receive the message in the subscriber
-        int rc = zmq_recv (sub, NULL, 0, 0);
-        if (rc == -1) {
-            TEST_ASSERT_EQUAL_INT (EAGAIN, errno);
-            break;
-        }
-        TEST_ASSERT_EQUAL_INT (0, rc);
-        recv_count++;
-
-        if (recv_count == 1) {
-            const int sub_rcvtimeo = 250;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-              sub, ZMQ_RCVTIMEO, &sub_rcvtimeo, sizeof (sub_rcvtimeo)));
-        }
-
-    } while (true);
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    //  Now test real blocking behavior
-    //  Set a timeout, default is infinite
-    int timeout = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SNDTIMEO, &timeout, 4));
-
-    send_count = 0;
-    recv_count = 0;
-    hwmlimit = hwm;
-
-    //  Send an empty message until we get an error, which must be EAGAIN
-    while (zmq_send (pub, "", 0, 0) == 0)
-        send_count++;
-    TEST_ASSERT_EQUAL_INT (EAGAIN, errno);
-
-    if (send_count > 0) {
-        //  Receive first message with blocking
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (sub, NULL, 0, 0));
-        recv_count++;
-
-        while (zmq_recv (sub, NULL, 0, ZMQ_DONTWAIT) == 0)
-            recv_count++;
-    }
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-int main ()
-{
-    setup_test_environment ();
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/tests/test_xpub_verbose.cpp b/tests/test_xpub_verbose.cpp
deleted file mode 100644
index 258c5674c..000000000
--- a/tests/test_xpub_verbose.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const uint8_t unsubscribe_a_msg[] = {0, 'A'};
-const uint8_t subscribe_a_msg[] = {1, 'A'};
-const uint8_t subscribe_b_msg[] = {1, 'B'};
-
-const char test_endpoint[] = "inproc://soname";
-const char topic_a[] = "A";
-const char topic_b[] = "B";
-
-void test_xpub_verbose_one_sub ()
-{
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, test_endpoint));
-
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, test_endpoint));
-
-    //  Subscribe for A
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Subscribe socket for B instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_b, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscribe_b_msg, 0);
-
-    //  Subscribe again for A again
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    //  This time it is duplicated, so it will be filtered out
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    int verbose = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_VERBOSE, &verbose, sizeof (int)));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // This time with VERBOSE the duplicated sub will be received
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Sending A message and B Message
-    send_string_expect_success (pub, topic_a, 0);
-    send_string_expect_success (pub, topic_b, 0);
-
-    recv_string_expect_success (sub, topic_a, 0);
-    recv_string_expect_success (sub, topic_b, 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void create_xpub_with_2_subs (void **pub_, void **sub0_, void **sub1_)
-{
-    *pub_ = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (*pub_, test_endpoint));
-
-    *sub0_ = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (*sub0_, test_endpoint));
-
-    *sub1_ = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (*sub1_, test_endpoint));
-}
-
-void create_duplicate_subscription (void *pub_, void *sub0_, void *sub1_)
-{
-    //  Subscribe for A
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0_, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub_, subscribe_a_msg, 0);
-
-    //  Subscribe again for A on the other socket
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1_, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    //  This time it is duplicated, so it will be filtered out by XPUB
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub_, NULL, 0, ZMQ_DONTWAIT));
-}
-
-void test_xpub_verbose_two_subs ()
-{
-    void *pub, *sub0, *sub1;
-    create_xpub_with_2_subs (&pub, &sub0, &sub1);
-    create_duplicate_subscription (pub, sub0, sub1);
-
-    // Subscribe socket for B instead
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0, ZMQ_SUBSCRIBE, topic_b, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscribe_b_msg, 0);
-
-    int verbose = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_VERBOSE, &verbose, sizeof (int)));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // This time with VERBOSE the duplicated sub will be received
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Sending A message and B Message
-    send_string_expect_success (pub, topic_a, 0);
-
-    send_string_expect_success (pub, topic_b, 0);
-
-    recv_string_expect_success (sub0, topic_a, 0);
-    recv_string_expect_success (sub1, topic_a, 0);
-    recv_string_expect_success (sub0, topic_b, 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub0);
-    test_context_socket_close (sub1);
-}
-
-void test_xpub_verboser_one_sub ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, test_endpoint));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, test_endpoint));
-
-    //  Unsubscribe for A, does not exist yet
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  Does not exist, so it will be filtered out by XSUB
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Subscribe for A
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    //  Subscribe again for A again, XSUB will increase refcount
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    //  This time it is duplicated, so it will be filtered out by XPUB
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Unsubscribe for A, this time it exists in XPUB
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  XSUB refcounts and will not actually send unsub to PUB until the number
-    //  of unsubs match the earlier subs
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions from subscriber
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  XSUB only sends the last and final unsub, so XPUB will only receive 1
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Unsubscribe for A, does not exist anymore
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  Does not exist, so it will be filtered out by XSUB
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    int verbose = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_VERBOSER, &verbose, sizeof (int)));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber, did not exist anymore
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Sending A message to make sure everything still works
-    send_string_expect_success (pub, topic_a, 0);
-
-    recv_string_expect_success (sub, topic_a, 0);
-
-    //  Unsubscribe for A, this time it exists
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions from subscriber
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  Unsubscribe for A again, it does not exist anymore so XSUB will filter
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  XSUB only sends unsub if it matched it in its trie, IOW: it will only
-    //  send it if it existed in the first place even with XPUB_VERBBOSER
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_xpub_verboser_two_subs ()
-{
-    void *pub, *sub0, *sub1;
-    create_xpub_with_2_subs (&pub, &sub0, &sub1);
-    create_duplicate_subscription (pub, sub0, sub1);
-
-    //  Unsubscribe for A, this time it exists in XPUB
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  sub1 is still subscribed, so no notification
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Unsubscribe the second socket to trigger the notification
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions since all sockets are gone
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  Make really sure there is only one notification
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    int verbose = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_VERBOSER, &verbose, sizeof (int)));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber, did not exist anymore
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    //  VERBOSER is set, so subs from both sockets are received
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Sending A message to make sure everything still works
-    send_string_expect_success (pub, topic_a, 0);
-
-    recv_string_expect_success (sub0, topic_a, 0);
-    recv_string_expect_success (sub1, topic_a, 0);
-
-    //  Unsubscribe for A
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions from first subscriber due to VERBOSER
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  Unsubscribe for A again from the other socket
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions from first subscriber due to VERBOSER
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  Unsubscribe again to make sure it gets filtered now
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  Unmatched, so XSUB filters even with VERBOSER
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub0);
-    test_context_socket_close (sub1);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_xpub_verbose_one_sub);
-    RUN_TEST (test_xpub_verbose_two_subs);
-    RUN_TEST (test_xpub_verboser_one_sub);
-    RUN_TEST (test_xpub_verboser_two_subs);
-
-    return UNITY_END ();
-}
diff --git a/tests/test_xpub_welcome_msg.cpp b/tests/test_xpub_welcome_msg.cpp
deleted file mode 100644
index 0066d9ffc..000000000
--- a/tests/test_xpub_welcome_msg.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  set pub socket options
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_WELCOME_MSG, "W", 1));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-
-    // Subscribe to the welcome message
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "W", 1));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    const uint8_t buffer[2] = {1, 'W'};
-
-    // Receive the welcome subscription
-    recv_array_expect_success (pub, buffer, 0);
-
-    // Receive the welcome message
-    recv_string_expect_success (sub, "W", 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/tests/test_z85_decode_fuzzer.cpp b/tests/test_z85_decode_fuzzer.cpp
deleted file mode 100644
index a3044927f..000000000
--- a/tests/test_z85_decode_fuzzer.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include <string>
-#include <stdlib.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    uint8_t *secret_key;
-
-    if (size < 5)
-        return 0;
-
-    // As per API definition, input must be divisible by 5, so truncate it if it's not
-    size -= size % 5;
-    // As per API definition, the destination must be at least 0.8 times the input data
-    TEST_ASSERT_NOT_NULL (secret_key = (uint8_t *) malloc (size * 4 / 5));
-
-    std::string z85_secret_key (reinterpret_cast<const char *> (data), size);
-    zmq_z85_decode (secret_key, z85_secret_key.c_str ());
-
-    free (secret_key);
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_z85_decode_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode ("tests/fuzzer_corpora/test_z85_decode_fuzzer.txt",
-                              &data, &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_z85_decode_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/tests/test_zmq_poll_fd.cpp b/tests/test_zmq_poll_fd.cpp
deleted file mode 100644
index e155310f3..000000000
--- a/tests/test_zmq_poll_fd.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <netdb.h>
-#include <string.h>
-
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_poll_fd ()
-{
-    int recv_socket = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    TEST_ASSERT_NOT_EQUAL (-1, recv_socket);
-
-    int flag = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      setsockopt (recv_socket, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int)));
-
-    struct sockaddr_in saddr = bind_bsd_socket (recv_socket);
-
-    void *sb = test_context_socket (ZMQ_REP);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://127.0.0.1:*"));
-
-    zmq_pollitem_t pollitems[] = {
-      {sb, 0, ZMQ_POLLIN, 0},
-      {NULL, recv_socket, ZMQ_POLLIN, 0},
-    };
-
-    int send_socket = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    TEST_ASSERT_NOT_EQUAL (-1, send_socket);
-
-    char buf[10];
-    memset (buf, 1, 10);
-
-    TEST_ASSERT_SUCCESS_ERRNO (sendto (
-      send_socket, buf, 10, 0, (struct sockaddr *) &saddr, sizeof (saddr)));
-
-    TEST_ASSERT_EQUAL (1, zmq_poll (pollitems, 2, 1));
-    TEST_ASSERT_BITS_LOW (ZMQ_POLLIN, pollitems[0].revents);
-    TEST_ASSERT_BITS_HIGH (ZMQ_POLLIN, pollitems[1].revents);
-
-    test_context_socket_close (sb);
-
-    close (send_socket);
-    close (recv_socket);
-}
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_poll_fd);
-    return UNITY_END ();
-}
diff --git a/tests/testutil.cpp b/tests/testutil.cpp
deleted file mode 100644
index 971159a36..000000000
--- a/tests/testutil.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdarg.h>
-#include <string.h>
-
-#if defined _WIN32
-#include "../src/windows.hpp"
-#if defined _MSC_VER
-#if defined ZMQ_HAVE_IPC
-#include <direct.h>
-#include <afunix.h>
-#endif
-#include <crtdbg.h>
-#pragma warning(disable : 4996)
-// iphlpapi is needed for if_nametoindex (not on Windows XP)
-#if _WIN32_WINNT > _WIN32_WINNT_WINXP
-#pragma comment(lib, "iphlpapi")
-#endif
-#endif
-#else
-#include <pthread.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <grp.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <sys/un.h>
-#if defined(ZMQ_HAVE_AIX)
-#include <sys/types.h>
-#include <sys/socketvar.h>
-#endif
-#endif
-
-const char *SEQ_END = (const char *) 1;
-
-const char bounce_content[] = "12345678ABCDEFGH12345678abcdefgh";
-
-static void send_bounce_msg (void *socket_)
-{
-    send_string_expect_success (socket_, bounce_content, ZMQ_SNDMORE);
-    send_string_expect_success (socket_, bounce_content, 0);
-}
-
-static void recv_bounce_msg (void *socket_)
-{
-    recv_string_expect_success (socket_, bounce_content, 0);
-    int rcvmore;
-    size_t sz = sizeof (rcvmore);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (socket_, bounce_content, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-}
-
-void bounce (void *server_, void *client_)
-{
-    //  Send message from client to server
-    send_bounce_msg (client_);
-
-    //  Receive message at server side and
-    //  check that message is still the same
-    recv_bounce_msg (server_);
-
-    //  Send two parts back to client
-    send_bounce_msg (server_);
-
-    //  Receive the two parts at the client side
-    recv_bounce_msg (client_);
-}
-
-static void send_bounce_msg_may_fail (void *socket_)
-{
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket_, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-    int rc = zmq_send (socket_, bounce_content, 32, ZMQ_SNDMORE);
-    TEST_ASSERT_TRUE ((rc == 32) || ((rc == -1) && (errno == EAGAIN)));
-    rc = zmq_send (socket_, bounce_content, 32, 0);
-    TEST_ASSERT_TRUE ((rc == 32) || ((rc == -1) && (errno == EAGAIN)));
-}
-
-static void recv_bounce_msg_fail (void *socket_)
-{
-    int timeout = 250;
-    char buffer[32];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket_, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (socket_, buffer, 32, 0));
-}
-
-void expect_bounce_fail (void *server_, void *client_)
-{
-    //  Send message from client to server
-    send_bounce_msg_may_fail (client_);
-
-    //  Receive message at server side (should not succeed)
-    recv_bounce_msg_fail (server_);
-
-    //  Send message from server to client to test other direction
-    //  If connection failed, send may block, without a timeout
-    send_bounce_msg_may_fail (server_);
-
-    //  Receive message at client side (should not succeed)
-    recv_bounce_msg_fail (client_);
-}
-
-char *s_recv (void *socket_)
-{
-    char buffer[256];
-    int size = zmq_recv (socket_, buffer, 255, 0);
-    if (size == -1)
-        return NULL;
-    if (size > 255)
-        size = 255;
-    buffer[size] = 0;
-    return strdup (buffer);
-}
-
-void s_send_seq (void *socket_, ...)
-{
-    va_list ap;
-    va_start (ap, socket_);
-    const char *data = va_arg (ap, const char *);
-    while (true) {
-        const char *prev = data;
-        data = va_arg (ap, const char *);
-        bool end = data == SEQ_END;
-
-        if (!prev) {
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_send (socket_, 0, 0, end ? 0 : ZMQ_SNDMORE));
-        } else {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_send (
-              socket_, prev, strlen (prev) + 1, end ? 0 : ZMQ_SNDMORE));
-        }
-        if (end)
-            break;
-    }
-    va_end (ap);
-}
-
-void s_recv_seq (void *socket_, ...)
-{
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    int more;
-    size_t more_size = sizeof (more);
-
-    va_list ap;
-    va_start (ap, socket_);
-    const char *data = va_arg (ap, const char *);
-
-    while (true) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, socket_, 0));
-
-        if (!data)
-            TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&msg));
-        else
-            TEST_ASSERT_EQUAL_STRING (data, (const char *) zmq_msg_data (&msg));
-
-        data = va_arg (ap, const char *);
-        bool end = data == SEQ_END;
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (socket_, ZMQ_RCVMORE, &more, &more_size));
-
-        TEST_ASSERT_TRUE (!more == end);
-        if (end)
-            break;
-    }
-    va_end (ap);
-
-    zmq_msg_close (&msg);
-}
-
-void close_zero_linger (void *socket_)
-{
-    int linger = 0;
-    int rc = zmq_setsockopt (socket_, ZMQ_LINGER, &linger, sizeof (linger));
-    TEST_ASSERT_TRUE (rc == 0 || errno == ETERM);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket_));
-}
-
-void setup_test_environment (int timeout_seconds_)
-{
-#if defined _WIN32
-#if defined _MSC_VER
-    _set_abort_behavior (0, _WRITE_ABORT_MSG);
-    _CrtSetReportMode (_CRT_ASSERT, _CRTDBG_MODE_FILE);
-    _CrtSetReportFile (_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-#endif
-#else
-#if defined ZMQ_HAVE_CYGWIN
-    // abort test after 121 seconds
-    alarm (121);
-#else
-#if !defined ZMQ_DISABLE_TEST_TIMEOUT
-    // abort test after timeout_seconds_ seconds
-    alarm (timeout_seconds_);
-#endif
-#endif
-#endif
-#if defined __MVS__
-    // z/OS UNIX System Services: Ignore SIGPIPE during test runs, as a
-    // workaround for no SO_NOGSIGPIPE socket option.
-    signal (SIGPIPE, SIG_IGN);
-#endif
-}
-
-void msleep (int milliseconds_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-    Sleep (milliseconds_);
-#else
-    usleep (static_cast<useconds_t> (milliseconds_) * 1000);
-#endif
-}
-
-int is_ipv6_available ()
-{
-#if defined(ZMQ_HAVE_WINDOWS) && (_WIN32_WINNT < 0x0600)
-    return 0;
-#else
-    int rc, ipv6 = 1;
-    struct sockaddr_in6 test_addr;
-
-    memset (&test_addr, 0, sizeof (test_addr));
-    test_addr.sin6_family = AF_INET6;
-    inet_pton (AF_INET6, "::1", &(test_addr.sin6_addr));
-
-    fd_t fd = socket (AF_INET6, SOCK_STREAM, IPPROTO_IP);
-    if (fd == retired_fd)
-        ipv6 = 0;
-    else {
-#ifdef ZMQ_HAVE_WINDOWS
-        setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (const char *) &ipv6,
-                    sizeof (int));
-        rc = setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, (const char *) &ipv6,
-                         sizeof (int));
-        if (rc == SOCKET_ERROR)
-            ipv6 = 0;
-        else {
-            rc = bind (fd, (struct sockaddr *) &test_addr, sizeof (test_addr));
-            if (rc == SOCKET_ERROR)
-                ipv6 = 0;
-        }
-#else
-        setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &ipv6, sizeof (int));
-        rc = setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &ipv6, sizeof (int));
-        if (rc != 0)
-            ipv6 = 0;
-        else {
-            rc = bind (fd, reinterpret_cast<struct sockaddr *> (&test_addr),
-                       sizeof (test_addr));
-            if (rc != 0)
-                ipv6 = 0;
-        }
-#endif
-        close (fd);
-    }
-
-    return ipv6;
-#endif // _WIN32_WINNT < 0x0600
-}
-
-int is_tipc_available ()
-{
-#ifndef ZMQ_HAVE_TIPC
-    return 0;
-#else
-    int tipc = 0;
-
-    void *ctx = zmq_init (1);
-    TEST_ASSERT_NOT_NULL (ctx);
-    void *rep = zmq_socket (ctx, ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (rep);
-    tipc = zmq_bind (rep, "tipc://{5560,0,0}");
-
-    zmq_close (rep);
-    zmq_ctx_term (ctx);
-
-    return tipc == 0;
-#endif // ZMQ_HAVE_TIPC
-}
-
-int test_inet_pton (int af_, const char *src_, void *dst_)
-{
-#if defined(ZMQ_HAVE_WINDOWS) && (_WIN32_WINNT < 0x0600)
-    if (af_ == AF_INET) {
-        struct in_addr *ip4addr = (struct in_addr *) dst_;
-
-        ip4addr->s_addr = inet_addr (src_);
-
-        //  INADDR_NONE is -1 which is also a valid representation for IP
-        //  255.255.255.255
-        if (ip4addr->s_addr == INADDR_NONE
-            && strcmp (src_, "255.255.255.255") != 0) {
-            return 0;
-        }
-
-        //  Success
-        return 1;
-    } else {
-        //  Not supported.
-        return 0;
-    }
-#else
-    return inet_pton (af_, src_, dst_);
-#endif
-}
-
-sockaddr_in bind_bsd_socket (int socket_)
-{
-    struct sockaddr_in saddr;
-    memset (&saddr, 0, sizeof (saddr));
-    saddr.sin_family = AF_INET;
-    saddr.sin_addr.s_addr = INADDR_ANY;
-#if !defined(_WIN32_WINNT) || (_WIN32_WINNT >= 0x0600)
-    saddr.sin_port = 0;
-#else
-    saddr.sin_port = htons (PORT_6);
-#endif
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      bind (socket_, (struct sockaddr *) &saddr, sizeof (saddr)));
-
-#if !defined(_WIN32_WINNT) || (_WIN32_WINNT >= 0x0600)
-    socklen_t saddr_len = sizeof (saddr);
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      getsockname (socket_, (struct sockaddr *) &saddr, &saddr_len));
-#endif
-
-    return saddr;
-}
-
-fd_t connect_socket (const char *endpoint_, const int af_, const int protocol_)
-{
-    struct sockaddr_storage addr;
-    //  OSX is very opinionated and wants the size to match the AF family type
-    socklen_t addr_len;
-    const fd_t s_pre = socket (af_, SOCK_STREAM, protocol_);
-    TEST_ASSERT_NOT_EQUAL (-1, s_pre);
-
-    if (af_ == AF_INET || af_ == AF_INET6) {
-        const char *port = strrchr (endpoint_, ':') + 1;
-        char address[MAX_SOCKET_STRING];
-        // getaddrinfo does not like [x:y::z]
-        if (*strchr (endpoint_, '/') + 2 == '[') {
-            strcpy (address, strchr (endpoint_, '[') + 1);
-            address[strlen (address) - strlen (port) - 2] = '\0';
-        } else {
-            strcpy (address, strchr (endpoint_, '/') + 2);
-            address[strlen (address) - strlen (port) - 1] = '\0';
-        }
-
-        struct addrinfo *in, hint;
-        memset (&hint, 0, sizeof (struct addrinfo));
-        hint.ai_flags = AI_NUMERICSERV;
-        hint.ai_family = af_;
-        hint.ai_socktype = SOCK_STREAM;
-        hint.ai_protocol = protocol_;
-
-        TEST_ASSERT_SUCCESS_RAW_ZERO_ERRNO (
-          getaddrinfo (address, port, &hint, &in));
-        TEST_ASSERT_NOT_NULL (in);
-        memcpy (&addr, in->ai_addr, in->ai_addrlen);
-        addr_len = (socklen_t) in->ai_addrlen;
-        freeaddrinfo (in);
-    } else {
-#if defined(ZMQ_HAVE_IPC)
-        //  Cannot cast addr as gcc 4.4 will fail with strict aliasing errors
-        (*(struct sockaddr_un *) &addr).sun_family = AF_UNIX;
-        strcpy ((*(struct sockaddr_un *) &addr).sun_path, endpoint_);
-        addr_len = sizeof (struct sockaddr_un);
-#else
-        return retired_fd;
-#endif
-    }
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      connect (s_pre, (struct sockaddr *) &addr, addr_len));
-
-    return s_pre;
-}
-
-fd_t bind_socket_resolve_port (const char *address_,
-                               const char *port_,
-                               char *my_endpoint_,
-                               const int af_,
-                               const int protocol_)
-{
-    struct sockaddr_storage addr;
-    //  OSX is very opinionated and wants the size to match the AF family type
-    socklen_t addr_len;
-    const fd_t s_pre = socket (af_, SOCK_STREAM, protocol_);
-    TEST_ASSERT_NOT_EQUAL (-1, s_pre);
-
-    if (af_ == AF_INET || af_ == AF_INET6) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const char flag = '\1';
-#elif defined ZMQ_HAVE_VXWORKS
-        char flag = '\1';
-#else
-        int flag = 1;
-#endif
-        struct addrinfo *in, hint;
-        memset (&hint, 0, sizeof (struct addrinfo));
-        hint.ai_flags = AI_NUMERICSERV;
-        hint.ai_family = af_;
-        hint.ai_socktype = protocol_ == IPPROTO_UDP ? SOCK_DGRAM : SOCK_STREAM;
-        hint.ai_protocol = protocol_;
-
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (
-          setsockopt (s_pre, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int)));
-        TEST_ASSERT_SUCCESS_RAW_ZERO_ERRNO (
-          getaddrinfo (address_, port_, &hint, &in));
-        TEST_ASSERT_NOT_NULL (in);
-        memcpy (&addr, in->ai_addr, in->ai_addrlen);
-        addr_len = (socklen_t) in->ai_addrlen;
-        freeaddrinfo (in);
-    } else {
-#if defined(ZMQ_HAVE_IPC)
-        //  Cannot cast addr as gcc 4.4 will fail with strict aliasing errors
-        (*(struct sockaddr_un *) &addr).sun_family = AF_UNIX;
-        addr_len = sizeof (struct sockaddr_un);
-#if defined ZMQ_HAVE_WINDOWS
-        char buffer[MAX_PATH] = "";
-
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (tmpnam_s (buffer));
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (_mkdir (buffer));
-        strcat (buffer, "/ipc");
-#else
-        char buffer[PATH_MAX] = "";
-        strcpy (buffer, "tmpXXXXXX");
-#ifdef HAVE_MKDTEMP
-        TEST_ASSERT_TRUE (mkdtemp (buffer));
-        strcat (buffer, "/socket");
-#else
-        int fd = mkstemp (buffer);
-        TEST_ASSERT_TRUE (fd != -1);
-        close (fd);
-#endif
-#endif
-        strcpy ((*(struct sockaddr_un *) &addr).sun_path, buffer);
-        memcpy (my_endpoint_, "ipc://", 7);
-        strcat (my_endpoint_, buffer);
-
-        // TODO check return value of unlink
-        unlink (buffer);
-#else
-        return retired_fd;
-#endif
-    }
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      bind (s_pre, (struct sockaddr *) &addr, addr_len));
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (listen (s_pre, SOMAXCONN));
-
-    if (af_ == AF_INET || af_ == AF_INET6) {
-        addr_len = sizeof (struct sockaddr_storage);
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (
-          getsockname (s_pre, (struct sockaddr *) &addr, &addr_len));
-        sprintf (my_endpoint_, "%s://%s:%u",
-                 protocol_ == IPPROTO_TCP ? "tcp" : "udp", address_,
-                 af_ == AF_INET
-                   ? ntohs ((*(struct sockaddr_in *) &addr).sin_port)
-                   : ntohs ((*(struct sockaddr_in6 *) &addr).sin6_port));
-    }
-
-    return s_pre;
-}
-
-bool streq (const char *lhs_, const char *rhs_)
-{
-    return strcmp (lhs_, rhs_) == 0;
-}
-
-bool strneq (const char *lhs_, const char *rhs_)
-{
-    return strcmp (lhs_, rhs_) != 0;
-}
-
-int fuzzer_corpus_encode (const char *filename,
-                          uint8_t ***data,
-                          size_t **len,
-                          size_t *num_cases)
-{
-    TEST_ASSERT_NOT_NULL (filename);
-    TEST_ASSERT_NOT_NULL (data);
-    TEST_ASSERT_NOT_NULL (len);
-    FILE *f = fopen (filename, "r");
-    if (!f)
-        return -1;
-    fseek (f, 0, SEEK_END);
-    size_t text_len = ftell (f) + 1;
-    fseek (f, 0, SEEK_SET);
-    char *buf = (char *) malloc (text_len);
-    TEST_ASSERT_NOT_NULL (buf);
-
-    *len = NULL;
-    *data = NULL;
-    *num_cases = 0;
-    //  Convert to binary format, corpus is stored in ascii (hex)
-    while (fgets (buf, (int) text_len, f)) {
-        *len = (size_t *) realloc (*len, (*num_cases + 1) * sizeof (size_t));
-        TEST_ASSERT_NOT_NULL (*len);
-        *(*len + *num_cases) = strlen (buf) / 2;
-        *data =
-          (uint8_t **) realloc (*data, (*num_cases + 1) * sizeof (uint8_t *));
-        TEST_ASSERT_NOT_NULL (*data);
-        *(*data + *num_cases) =
-          (uint8_t *) malloc (*(*len + *num_cases) * sizeof (uint8_t));
-        TEST_ASSERT_NOT_NULL (*(*data + *num_cases));
-
-        const char *pos = buf;
-        for (size_t count = 0; count < *(*len + *num_cases);
-             ++count, pos += 2) {
-            char tmp[3] = {pos[0], pos[1], 0};
-            *(*(*data + *num_cases) + count) = (uint8_t) strtol (tmp, NULL, 16);
-        }
-        (*num_cases)++;
-    }
-
-
-    free (buf);
-    fclose (f);
-
-    return 0;
-}
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
deleted file mode 100644
index c8567391c..000000000
--- a/tests/testutil.hpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TESTUTIL_HPP_INCLUDED__
-#define __TESTUTIL_HPP_INCLUDED__
-
-#if defined ZMQ_CUSTOM_PLATFORM_HPP
-#include "platform.hpp"
-#else
-#include "../src/platform.hpp"
-#endif
-#include "../include/zmq.h"
-#include "../src/stdint.hpp"
-
-//  For AF_INET and IPPROTO_TCP
-#if defined _WIN32
-#include "../src/windows.hpp"
-#else
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-//  This defines the settle time used in tests; raise this if we
-//  get test failures on slower systems due to binds/connects not
-//  settled. Tested to work reliably at 1 msec on a fast PC.
-#define SETTLE_TIME 300 //  In msec
-//  Commonly used buffer size for ZMQ_LAST_ENDPOINT
-//  this used to be sizeof ("tcp://[::ffff:127.127.127.127]:65536"), but this
-//  may be too short for ipc wildcard binds, e.g.
-#define MAX_SOCKET_STRING 256
-
-//  We need to test codepaths with non-random bind ports. List them here to
-//  keep them unique, to allow parallel test runs.
-#define ENDPOINT_0 "tcp://127.0.0.1:5555"
-#define ENDPOINT_1 "tcp://127.0.0.1:5556"
-#define ENDPOINT_2 "tcp://127.0.0.1:5557"
-#define ENDPOINT_3 "tcp://127.0.0.1:5558"
-#define ENDPOINT_4 "udp://127.0.0.1:5559"
-#define ENDPOINT_5 "udp://127.0.0.1:5560"
-#define PORT_6 5561
-
-//  For tests that mock ZMTP
-const uint8_t zmtp_greeting_null[64] = {
-  0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x7f, 3, 0, 'N', 'U', 'L', 'L',
-  0,    0, 0, 0, 0, 0, 0, 0, 0, 0,    0, 0, 0,   0,   0,   0,
-  0,    0, 0, 0, 0, 0, 0, 0, 0, 0,    0, 0, 0,   0,   0,   0};
-
-const uint8_t zmtp_greeting_curve[64] = {
-  0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x7f, 3, 0, 'C', 'U', 'R', 'V',
-  'E',  0, 0, 0, 0, 0, 0, 0, 0, 0,    0, 0, 0,   0,   0,   0,
-  0,    0, 0, 0, 0, 0, 0, 0, 0, 0,    0, 0, 0,   0,   0,   0};
-const uint8_t zmtp_ready_dealer[43] = {
-  4,   41,  5,   'R', 'E', 'A', 'D', 'Y', 11,  'S', 'o', 'c', 'k', 'e', 't',
-  '-', 'T', 'y', 'p', 'e', 0,   0,   0,   6,   'D', 'E', 'A', 'L', 'E', 'R',
-  8,   'I', 'd', 'e', 'n', 't', 'i', 't', 'y', 0,   0,   0,   0};
-const uint8_t zmtp_ready_xpub[28] = {
-  4,   26,  5,   'R', 'E', 'A', 'D', 'Y', 11, 'S', 'o', 'c', 'k', 'e',
-  't', '-', 'T', 'y', 'p', 'e', 0,   0,   0,  4,   'X', 'P', 'U', 'B'};
-const uint8_t zmtp_ready_sub[27] = {
-  4,   25,  5,   'R', 'E', 'A', 'D', 'Y', 11, 'S', 'o', 'c', 'k', 'e',
-  't', '-', 'T', 'y', 'p', 'e', 0,   0,   0,  3,   'S', 'U', 'B'};
-
-#undef NDEBUG
-
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-// duplicated from fd.hpp
-#ifdef ZMQ_HAVE_WINDOWS
-#ifndef NOMINMAX
-#define NOMINMAX // Macros min(a,b) and max(a,b)
-#endif
-
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <stdexcept>
-#define close closesocket
-typedef int socket_size_t;
-inline const char *as_setsockopt_opt_t (const void *opt)
-{
-    return static_cast<const char *> (opt);
-}
-#else
-typedef size_t socket_size_t;
-inline const void *as_setsockopt_opt_t (const void *opt_)
-{
-    return opt_;
-}
-#endif
-
-// duplicated from fd.hpp
-typedef zmq_fd_t fd_t;
-#ifdef ZMQ_HAVE_WINDOWS
-#if defined _MSC_VER && _MSC_VER <= 1400
-enum
-{
-    retired_fd = (zmq_fd_t) (~0)
-};
-#else
-enum
-#if _MSC_VER >= 1800
-  : zmq_fd_t
-#endif
-{
-    retired_fd = INVALID_SOCKET
-};
-#endif
-#else
-enum
-{
-    retired_fd = -1
-};
-#endif
-
-//  In MSVC prior to v14, snprintf is not available
-//  The closest implementation is the _snprintf_s function
-#if defined _MSC_VER && _MSC_VER < 1900
-#define snprintf(buffer_, count_, format_, ...)                                \
-    _snprintf_s (buffer_, count_, _TRUNCATE, format_, __VA_ARGS__)
-#endif
-
-#define LIBZMQ_UNUSED(object) (void) object
-
-//  Bounce a message from client to server and back
-//  For REQ/REP or DEALER/DEALER pairs only
-void bounce (void *server_, void *client_);
-
-//  Same as bounce, but expect messages to never arrive
-//  for security or subscriber reasons.
-void expect_bounce_fail (void *server_, void *client_);
-
-//  Receive 0MQ string from socket and convert into C string
-//  Caller must free returned string. Returns NULL if the context
-//  is being terminated.
-char *s_recv (void *socket_);
-
-bool streq (const char *lhs, const char *rhs);
-bool strneq (const char *lhs, const char *rhs);
-
-extern const char *SEQ_END;
-
-//  Sends a message composed of frames that are C strings or null frames.
-//  The list must be terminated by SEQ_END.
-//  Example: s_send_seq (req, "ABC", 0, "DEF", SEQ_END);
-
-void s_send_seq (void *socket_, ...);
-
-//  Receives message a number of frames long and checks that the frames have
-//  the given data which can be either C strings or 0 for a null frame.
-//  The list must be terminated by SEQ_END.
-//  Example: s_recv_seq (rep, "ABC", 0, "DEF", SEQ_END);
-
-void s_recv_seq (void *socket_, ...);
-
-
-//  Sets a zero linger period on a socket and closes it.
-void close_zero_linger (void *socket_);
-
-//  Setups the test environment. Must be called at the beginning of each test
-//  executable. On POSIX systems, it sets an alarm to the specified number of
-//  seconds, after which the test will be killed. Set to 0 to disable this
-//  timeout.
-void setup_test_environment (int timeout_seconds_ = 60);
-
-//  Provide portable millisecond sleep
-//  http://www.cplusplus.com/forum/unices/60161/
-//  http://en.cppreference.com/w/cpp/thread/sleep_for
-
-void msleep (int milliseconds_);
-
-// check if IPv6 is available (0/false if not, 1/true if it is)
-// only way to reliably check is to actually open a socket and try to bind it
-int is_ipv6_available (void);
-
-// check if tipc is available (0/false if not, 1/true if it is)
-// only way to reliably check is to actually open a socket and try to bind it
-// as it depends on a non-default kernel module to be already loaded
-int is_tipc_available (void);
-
-//  Wrapper around 'inet_pton' for systems that don't support it (e.g. Windows
-//  XP)
-int test_inet_pton (int af_, const char *src_, void *dst_);
-
-//  Binds an ipv4 BSD socket to an ephemeral port, returns the compiled sockaddr
-struct sockaddr_in bind_bsd_socket (int socket);
-
-//  Connects a BSD socket to the ZMQ endpoint. Works with ipv4/ipv6/unix.
-fd_t connect_socket (const char *endpoint_,
-                     const int af_ = AF_INET,
-                     const int protocol_ = IPPROTO_TCP);
-
-//  Binds a BSD socket to an ephemeral port, returns the file descriptor.
-//  The resulting ZMQ endpoint will be stored in my_endpoint, including the protocol
-//  prefix, so ensure it is writable and of appropriate size.
-//  Works with ipv4/ipv6/unix. With unix sockets address_/port_ can be empty and
-//  my_endpoint_ will contain a random path.
-fd_t bind_socket_resolve_port (const char *address_,
-                               const char *port_,
-                               char *my_endpoint_,
-                               const int af_ = AF_INET,
-                               const int protocol_ = IPPROTO_TCP);
-
-int fuzzer_corpus_encode (const char *filename,
-                          uint8_t ***data,
-                          size_t **len,
-                          size_t *num_cases);
-
-#endif
diff --git a/tests/testutil_monitoring.cpp b/tests/testutil_monitoring.cpp
deleted file mode 100644
index 3de2d3c73..000000000
--- a/tests/testutil_monitoring.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "testutil_monitoring.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-static int
-receive_monitor_address (void *monitor_, char **address_, bool expect_more_)
-{
-    zmq_msg_t msg;
-
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor_, 0) == -1)
-        return -1; //  Interrupted, presumably
-    TEST_ASSERT_EQUAL (expect_more_, zmq_msg_more (&msg));
-
-    if (address_) {
-        const uint8_t *const data =
-          static_cast<const uint8_t *> (zmq_msg_data (&msg));
-        const size_t size = zmq_msg_size (&msg);
-        *address_ = static_cast<char *> (malloc (size + 1));
-        memcpy (*address_, data, size);
-        (*address_)[size] = 0;
-    }
-    zmq_msg_close (&msg);
-
-    return 0;
-}
-
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-static int get_monitor_event_internal (void *monitor_,
-                                       int *value_,
-                                       char **address_,
-                                       int recv_flag_)
-{
-    //  First frame in message contains event number and value
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor_, recv_flag_) == -1) {
-        TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-        return -1; //  timed out or no message available
-    }
-    TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-
-    uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg));
-    uint16_t event = *reinterpret_cast<uint16_t *> (data);
-    if (value_)
-        memcpy (value_, data + 2, sizeof (uint32_t));
-
-    //  Second frame in message contains event address
-    TEST_ASSERT_SUCCESS_ERRNO (
-      receive_monitor_address (monitor_, address_, false));
-
-    return event;
-}
-
-int get_monitor_event_with_timeout (void *monitor_,
-                                    int *value_,
-                                    char **address_,
-                                    int timeout_)
-{
-    int res;
-    if (timeout_ == -1) {
-        // process infinite timeout in small steps to allow the user
-        // to see some information on the console
-
-        int timeout_step = 250;
-        int wait_time = 0;
-        zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_step,
-                        sizeof (timeout_step));
-        while (
-          (res = get_monitor_event_internal (monitor_, value_, address_, 0))
-          == -1) {
-            wait_time += timeout_step;
-            fprintf (stderr, "Still waiting for monitor event after %i ms\n",
-                     wait_time);
-        }
-    } else {
-        zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_, sizeof (timeout_));
-        res = get_monitor_event_internal (monitor_, value_, address_, 0);
-    }
-    int timeout_infinite = -1;
-    zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_infinite,
-                    sizeof (timeout_infinite));
-    return res;
-}
-
-int get_monitor_event (void *monitor_, int *value_, char **address_)
-{
-    return get_monitor_event_with_timeout (monitor_, value_, address_, -1);
-}
-
-void expect_monitor_event (void *monitor_, int expected_event_)
-{
-    TEST_ASSERT_EQUAL_HEX (expected_event_,
-                           get_monitor_event (monitor_, NULL, NULL));
-}
-
-static void print_unexpected_event (char *buf_,
-                                    size_t buf_size_,
-                                    int event_,
-                                    int err_,
-                                    int expected_event_,
-                                    int expected_err_)
-{
-    snprintf (buf_, buf_size_,
-              "Unexpected event: 0x%x, value = %i/0x%x (expected: 0x%x, value "
-              "= %i/0x%x)\n",
-              event_, err_, err_, expected_event_, expected_err_,
-              expected_err_);
-}
-
-void print_unexpected_event_stderr (int event_,
-                                    int err_,
-                                    int expected_event_,
-                                    int expected_err_)
-{
-    char buf[256];
-    print_unexpected_event (buf, sizeof buf, event_, err_, expected_event_,
-                            expected_err_);
-    fputs (buf, stderr);
-}
-
-int expect_monitor_event_multiple (void *server_mon_,
-                                   int expected_event_,
-                                   int expected_err_,
-                                   bool optional_)
-{
-    int count_of_expected_events = 0;
-    int client_closed_connection = 0;
-    int timeout = 250;
-    int wait_time = 0;
-
-    int event;
-    int err;
-    while ((event =
-              get_monitor_event_with_timeout (server_mon_, &err, NULL, timeout))
-             != -1
-           || !count_of_expected_events) {
-        if (event == -1) {
-            if (optional_)
-                break;
-            wait_time += timeout;
-            fprintf (stderr,
-                     "Still waiting for first event after %ims (expected event "
-                     "%x (value %i/0x%x))\n",
-                     wait_time, expected_event_, expected_err_, expected_err_);
-            continue;
-        }
-        // ignore errors with EPIPE/ECONNRESET/ECONNABORTED, which can happen
-        // ECONNRESET can happen on very slow machines, when the engine writes
-        // to the peer and then tries to read the socket before the peer reads
-        // ECONNABORTED happens when a client aborts a connection via RST/timeout
-        if (event == ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL
-            && ((err == EPIPE && expected_err_ != EPIPE) || err == ECONNRESET
-                || err == ECONNABORTED)) {
-            fprintf (stderr,
-                     "Ignored event (skipping any further events): %x (err = "
-                     "%i == %s)\n",
-                     event, err, zmq_strerror (err));
-            client_closed_connection = 1;
-            break;
-        }
-        if (event != expected_event_
-            || (-1 != expected_err_ && err != expected_err_)) {
-            char buf[256];
-            print_unexpected_event (buf, sizeof buf, event, err,
-                                    expected_event_, expected_err_);
-            TEST_FAIL_MESSAGE (buf);
-        }
-        ++count_of_expected_events;
-    }
-    TEST_ASSERT_TRUE (optional_ || count_of_expected_events > 0
-                      || client_closed_connection);
-
-    return count_of_expected_events;
-}
-
-static int64_t get_monitor_event_internal_v2 (void *monitor_,
-                                              uint64_t *value_,
-                                              char **local_address_,
-                                              char **remote_address_,
-                                              int recv_flag_)
-{
-    //  First frame in message contains event number
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor_, recv_flag_) == -1) {
-        TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-        return -1; //  timed out or no message available
-    }
-    TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-    TEST_ASSERT_EQUAL_UINT (sizeof (uint64_t), zmq_msg_size (&msg));
-
-    uint64_t event;
-    memcpy (&event, zmq_msg_data (&msg), sizeof (event));
-    zmq_msg_close (&msg);
-
-    //  Second frame in message contains the number of values
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor_, recv_flag_) == -1) {
-        TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-        return -1; //  timed out or no message available
-    }
-    TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-    TEST_ASSERT_EQUAL_UINT (sizeof (uint64_t), zmq_msg_size (&msg));
-
-    uint64_t value_count;
-    memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count));
-    zmq_msg_close (&msg);
-
-    for (uint64_t i = 0; i < value_count; ++i) {
-        //  Subsequent frames in message contain event values
-        zmq_msg_init (&msg);
-        if (zmq_msg_recv (&msg, monitor_, recv_flag_) == -1) {
-            TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-            return -1; //  timed out or no message available
-        }
-        TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-        TEST_ASSERT_EQUAL_UINT (sizeof (uint64_t), zmq_msg_size (&msg));
-
-        if (value_ && value_ + i)
-            memcpy (value_ + i, zmq_msg_data (&msg), sizeof (*value_));
-        zmq_msg_close (&msg);
-    }
-
-    //  Second-to-last frame in message contains local address
-    TEST_ASSERT_SUCCESS_ERRNO (
-      receive_monitor_address (monitor_, local_address_, true));
-
-    //  Last frame in message contains remote address
-    TEST_ASSERT_SUCCESS_ERRNO (
-      receive_monitor_address (monitor_, remote_address_, false));
-
-    return event;
-}
-
-static int64_t get_monitor_event_with_timeout_v2 (void *monitor_,
-                                                  uint64_t *value_,
-                                                  char **local_address_,
-                                                  char **remote_address_,
-                                                  int timeout_)
-{
-    int64_t res;
-    if (timeout_ == -1) {
-        // process infinite timeout in small steps to allow the user
-        // to see some information on the console
-
-        int timeout_step = 250;
-        int wait_time = 0;
-        zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_step,
-                        sizeof (timeout_step));
-        while ((res = get_monitor_event_internal_v2 (
-                  monitor_, value_, local_address_, remote_address_, 0))
-               == -1) {
-            wait_time += timeout_step;
-            fprintf (stderr, "Still waiting for monitor event after %i ms\n",
-                     wait_time);
-        }
-    } else {
-        zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_, sizeof (timeout_));
-        res = get_monitor_event_internal_v2 (monitor_, value_, local_address_,
-                                             remote_address_, 0);
-    }
-    int timeout_infinite = -1;
-    zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_infinite,
-                    sizeof (timeout_infinite));
-    return res;
-}
-
-int64_t get_monitor_event_v2 (void *monitor_,
-                              uint64_t *value_,
-                              char **local_address_,
-                              char **remote_address_)
-{
-    return get_monitor_event_with_timeout_v2 (monitor_, value_, local_address_,
-                                              remote_address_, -1);
-}
-
-void expect_monitor_event_v2 (void *monitor_,
-                              int64_t expected_event_,
-                              const char *expected_local_address_,
-                              const char *expected_remote_address_)
-{
-    char *local_address = NULL;
-    char *remote_address = NULL;
-    int64_t event = get_monitor_event_v2 (
-      monitor_, NULL, expected_local_address_ ? &local_address : NULL,
-      expected_remote_address_ ? &remote_address : NULL);
-    bool failed = false;
-    char buf[256];
-    char *pos = buf;
-    if (event != expected_event_) {
-        pos += snprintf (pos, sizeof buf - (pos - buf),
-                         "Expected monitor event %llx, but received %llx\n",
-                         static_cast<long long> (expected_event_),
-                         static_cast<long long> (event));
-        failed = true;
-    }
-    if (expected_local_address_
-        && 0 != strcmp (local_address, expected_local_address_)) {
-        pos += snprintf (pos, sizeof buf - (pos - buf),
-                         "Expected local address %s, but received %s\n",
-                         expected_local_address_, local_address);
-    }
-    if (expected_remote_address_
-        && 0 != strcmp (remote_address, expected_remote_address_)) {
-        snprintf (pos, sizeof buf - (pos - buf),
-                  "Expected remote address %s, but received %s\n",
-                  expected_remote_address_, remote_address);
-    }
-    free (local_address);
-    free (remote_address);
-    TEST_ASSERT_FALSE_MESSAGE (failed, buf);
-}
diff --git a/tests/testutil_monitoring.hpp b/tests/testutil_monitoring.hpp
deleted file mode 100644
index 3fc1acefb..000000000
--- a/tests/testutil_monitoring.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TESTUTIL_MONITORING_HPP_INCLUDED__
-#define __TESTUTIL_MONITORING_HPP_INCLUDED__
-
-#include "../include/zmq.h"
-#include "../src/stdint.hpp"
-
-#include <stddef.h>
-
-//  General, i.e. non-security specific, monitor utilities
-
-int get_monitor_event_with_timeout (void *monitor_,
-                                    int *value_,
-                                    char **address_,
-                                    int timeout_);
-
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-int get_monitor_event (void *monitor_, int *value_, char **address_);
-
-void expect_monitor_event (void *monitor_, int expected_event_);
-
-void print_unexpected_event_stderr (int event_,
-                                    int err_,
-                                    int expected_event_,
-                                    int expected_err_);
-
-//  expects that one or more occurrences of the expected event are received
-//  via the specified socket monitor
-//  returns the number of occurrences of the expected event
-//  interrupts, if a ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL with EPIPE, ECONNRESET
-//  or ECONNABORTED occurs; in this case, 0 is returned
-//  this should be investigated further, see
-//  https://github.com/zeromq/libzmq/issues/2644
-int expect_monitor_event_multiple (void *server_mon_,
-                                   int expected_event_,
-                                   int expected_err_ = -1,
-                                   bool optional_ = false);
-
-int64_t get_monitor_event_v2 (void *monitor_,
-                              uint64_t *value_,
-                              char **local_address_,
-                              char **remote_address_);
-
-void expect_monitor_event_v2 (void *monitor_,
-                              int64_t expected_event_,
-                              const char *expected_local_address_ = NULL,
-                              const char *expected_remote_address_ = NULL);
-
-#endif
diff --git a/tests/testutil_security.cpp b/tests/testutil_security.cpp
deleted file mode 100644
index bb6efb27a..000000000
--- a/tests/testutil_security.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "testutil_security.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-const char *test_zap_domain = "ZAPTEST";
-
-void socket_config_null_client (void *server_, void *server_secret_)
-{
-    LIBZMQ_UNUSED (server_);
-    LIBZMQ_UNUSED (server_secret_);
-}
-
-void socket_config_null_server (void *server_, void *server_secret_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      server_, ZMQ_ZAP_DOMAIN, test_zap_domain, strlen (test_zap_domain)));
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-    int required = server_secret_ ? *static_cast<int *> (server_secret_) : 0;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (server_, ZMQ_ZAP_ENFORCE_DOMAIN,
-                                               &required, sizeof (int)));
-#else
-    LIBZMQ_UNUSED (server_secret_);
-#endif
-}
-
-static const char test_plain_username[] = "testuser";
-static const char test_plain_password[] = "testpass";
-
-void socket_config_plain_client (void *server_, void *server_secret_)
-{
-    LIBZMQ_UNUSED (server_secret_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_PLAIN_PASSWORD, test_plain_password, 8));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_PLAIN_USERNAME, test_plain_username, 8));
-}
-
-void socket_config_plain_server (void *server_, void *server_secret_)
-{
-    LIBZMQ_UNUSED (server_secret_);
-
-    int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_PLAIN_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      server_, ZMQ_ZAP_DOMAIN, test_zap_domain, strlen (test_zap_domain)));
-}
-
-char valid_client_public[41];
-char valid_client_secret[41];
-char valid_server_public[41];
-char valid_server_secret[41];
-
-void setup_testutil_security_curve ()
-{
-    //  Generate new keypairs for these tests
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_curve_keypair (valid_client_public, valid_client_secret));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_curve_keypair (valid_server_public, valid_server_secret));
-}
-
-void socket_config_curve_server (void *server_, void *server_secret_)
-{
-    int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_CURVE_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_CURVE_SECRETKEY, server_secret_, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      server_, ZMQ_ZAP_DOMAIN, test_zap_domain, strlen (test_zap_domain)));
-
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-    int required = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (server_, ZMQ_ZAP_ENFORCE_DOMAIN,
-                                               &required, sizeof (int)));
-#endif
-}
-
-void socket_config_curve_client (void *client_, void *data_)
-{
-    const curve_client_data_t *const curve_client_data =
-      static_cast<const curve_client_data_t *> (data_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client_, ZMQ_CURVE_SERVERKEY, curve_client_data->server_public, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client_, ZMQ_CURVE_PUBLICKEY, curve_client_data->client_public, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client_, ZMQ_CURVE_SECRETKEY, curve_client_data->client_secret, 41));
-}
-
-void *zap_requests_handled;
-
-void zap_handler_generic (zap_protocol_t zap_protocol_,
-                          const char *expected_routing_id_)
-{
-    void *control = zmq_socket (get_test_context (), ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (control, "inproc://handler-control"));
-
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (handler);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-
-    //  Signal main thread that we are ready
-    send_string_expect_success (control, "GO", 0);
-
-    zmq_pollitem_t items[] = {
-      {control, 0, ZMQ_POLLIN, 0},
-      {handler, 0, ZMQ_POLLIN, 0},
-    };
-
-    // if ordered not to receive the request, ignore the second poll item
-    const int numitems = (zap_protocol_ == zap_do_not_recv) ? 1 : 2;
-
-    //  Process ZAP requests forever
-    while (zmq_poll (items, numitems, -1) >= 0) {
-        if (items[0].revents & ZMQ_POLLIN) {
-            recv_string_expect_success (control, "STOP", 0);
-            break; //  Terminating - main thread signal
-        }
-        if (!(items[1].revents & ZMQ_POLLIN))
-            continue;
-
-        char *version = s_recv (handler);
-        if (!version)
-            break; //  Terminating - peer's socket closed
-        if (zap_protocol_ == zap_disconnect) {
-            free (version);
-            break;
-        }
-
-        char *sequence = s_recv (handler);
-        char *domain = s_recv (handler);
-        char *address = s_recv (handler);
-        char *routing_id = s_recv (handler);
-        char *mechanism = s_recv (handler);
-        bool authentication_succeeded = false;
-        if (streq (mechanism, "CURVE")) {
-            uint8_t client_key[32];
-            TEST_ASSERT_EQUAL_INT (32, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (
-                                         handler, client_key, 32, 0)));
-
-            char client_key_text[41];
-            zmq_z85_encode (client_key_text, client_key, 32);
-
-            authentication_succeeded =
-              streq (client_key_text, valid_client_public);
-        } else if (streq (mechanism, "PLAIN")) {
-            char client_username[32];
-            int size = TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_recv (handler, client_username, 32, 0));
-            client_username[size] = 0;
-
-            char client_password[32];
-            size = TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_recv (handler, client_password, 32, 0));
-            client_password[size] = 0;
-
-            authentication_succeeded =
-              streq (test_plain_username, client_username)
-              && streq (test_plain_password, client_password);
-        } else if (streq (mechanism, "NULL")) {
-            authentication_succeeded = true;
-        } else {
-            char msg[128];
-            printf ("Unsupported mechanism: %s\n", mechanism);
-            TEST_FAIL_MESSAGE (msg);
-        }
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING (expected_routing_id_, routing_id);
-
-        send_string_expect_success (
-          handler,
-          zap_protocol_ == zap_wrong_version ? "invalid_version" : version,
-          ZMQ_SNDMORE);
-        send_string_expect_success (handler,
-                                    zap_protocol_ == zap_wrong_request_id
-                                      ? "invalid_request_id"
-                                      : sequence,
-                                    ZMQ_SNDMORE);
-
-        if (authentication_succeeded) {
-            const char *status_code;
-            switch (zap_protocol_) {
-                case zap_status_internal_error:
-                    status_code = "500";
-                    break;
-                case zap_status_temporary_failure:
-                    status_code = "300";
-                    break;
-                case zap_status_invalid:
-                    status_code = "invalid_status";
-                    break;
-                default:
-                    status_code = "200";
-            }
-            send_string_expect_success (handler, status_code, ZMQ_SNDMORE);
-            send_string_expect_success (handler, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (handler, "anonymous", ZMQ_SNDMORE);
-            if (zap_protocol_ == zap_too_many_parts) {
-                send_string_expect_success (handler, "", ZMQ_SNDMORE);
-            }
-            if (zap_protocol_ != zap_do_not_send)
-                send_string_expect_success (handler, "", 0);
-        } else {
-            send_string_expect_success (handler, "400", ZMQ_SNDMORE);
-            send_string_expect_success (handler, "Invalid client public key",
-                                        ZMQ_SNDMORE);
-            send_string_expect_success (handler, "", ZMQ_SNDMORE);
-            if (zap_protocol_ != zap_do_not_send)
-                send_string_expect_success (handler, "", 0);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-
-        zmq_atomic_counter_inc (zap_requests_handled);
-    }
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (handler, "inproc://zeromq.zap.01"));
-    close_zero_linger (handler);
-
-    if (zap_protocol_ != zap_disconnect) {
-        send_string_expect_success (control, "STOPPED", 0);
-    }
-    close_zero_linger (control);
-}
-
-void zap_handler (void *)
-{
-    zap_handler_generic (zap_ok);
-}
-
-static void setup_handshake_socket_monitor (void *server_,
-                                            void **server_mon_,
-                                            const char *monitor_endpoint_)
-{
-    //  Monitor handshake events on the server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      server_, monitor_endpoint_,
-      ZMQ_EVENT_HANDSHAKE_SUCCEEDED | ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL
-        | ZMQ_EVENT_HANDSHAKE_FAILED_AUTH
-        | ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL));
-
-    //  Create socket for collecting monitor events
-    *server_mon_ = test_context_socket (ZMQ_PAIR);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (*server_mon_, ZMQ_LINGER, &linger, sizeof (linger)));
-
-    //  Connect it to the inproc endpoints so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (*server_mon_, monitor_endpoint_));
-}
-
-void setup_context_and_server_side (void **zap_control_,
-                                    void **zap_thread_,
-                                    void **server_,
-                                    void **server_mon_,
-                                    char *my_endpoint_,
-                                    zmq_thread_fn zap_handler_,
-                                    socket_config_fn socket_config_,
-                                    void *socket_config_data_,
-                                    const char *routing_id_)
-{
-    //  Spawn ZAP handler
-    zap_requests_handled = zmq_atomic_counter_new ();
-    TEST_ASSERT_NOT_NULL (zap_requests_handled);
-
-    *zap_control_ = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (*zap_control_, "inproc://handler-control"));
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (*zap_control_, ZMQ_LINGER, &linger, sizeof (linger)));
-
-    if (zap_handler_ != NULL) {
-        *zap_thread_ = zmq_threadstart (zap_handler_, NULL);
-
-        recv_string_expect_success (*zap_control_, "GO", 0);
-    } else
-        *zap_thread_ = NULL;
-
-    //  Server socket will accept connections
-    *server_ = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (*server_, ZMQ_LINGER, &linger, sizeof (linger)));
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      *server_, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-
-    socket_config_ (*server_, socket_config_data_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      *server_, ZMQ_ROUTING_ID, routing_id_, strlen (routing_id_)));
-
-    bind_loopback_ipv4 (*server_, my_endpoint_, MAX_SOCKET_STRING);
-
-    const char server_monitor_endpoint[] = "inproc://monitor-server";
-    setup_handshake_socket_monitor (*server_, server_mon_,
-                                    server_monitor_endpoint);
-}
-
-void shutdown_context_and_server_side (void *zap_thread_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       void *zap_control_,
-                                       bool zap_handler_stopped_)
-{
-    if (zap_thread_ && !zap_handler_stopped_) {
-        send_string_expect_success (zap_control_, "STOP", 0);
-        recv_string_expect_success (zap_control_, "STOPPED", 0);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_unbind (zap_control_, "inproc://handler-control"));
-    }
-    test_context_socket_close (zap_control_);
-    zmq_socket_monitor (server_, NULL, 0);
-    test_context_socket_close (server_mon_);
-    test_context_socket_close (server_);
-
-    //  Wait until ZAP handler terminates
-    if (zap_thread_)
-        zmq_threadclose (zap_thread_);
-
-    zmq_atomic_counter_destroy (&zap_requests_handled);
-}
-
-void *create_and_connect_client (char *my_endpoint_,
-                                 socket_config_fn socket_config_,
-                                 void *socket_config_data_,
-                                 void **client_mon_)
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-
-    socket_config_ (client, socket_config_data_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint_));
-
-    if (client_mon_) {
-        setup_handshake_socket_monitor (client, client_mon_,
-                                        "inproc://client-monitor");
-    }
-
-    return client;
-}
-
-void expect_new_client_bounce_fail (char *my_endpoint_,
-                                    void *server_,
-                                    socket_config_fn socket_config_,
-                                    void *socket_config_data_,
-                                    void **client_mon_,
-                                    int expected_client_event_,
-                                    int expected_client_value_)
-{
-    void *my_client_mon = NULL;
-    TEST_ASSERT_TRUE (client_mon_ == NULL || expected_client_event_ == 0);
-    if (expected_client_event_ != 0)
-        client_mon_ = &my_client_mon;
-    void *client = create_and_connect_client (my_endpoint_, socket_config_,
-                                              socket_config_data_, client_mon_);
-    expect_bounce_fail (server_, client);
-
-    if (expected_client_event_ != 0) {
-        int events_received = 0;
-        events_received = expect_monitor_event_multiple (
-          my_client_mon, expected_client_event_, expected_client_value_, false);
-
-        TEST_ASSERT_EQUAL_INT (1, events_received);
-
-        test_context_socket_close (my_client_mon);
-    }
-
-    test_context_socket_close_zero_linger (client);
-}
diff --git a/tests/testutil_security.hpp b/tests/testutil_security.hpp
deleted file mode 100644
index 909bbeb9f..000000000
--- a/tests/testutil_security.hpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TESTUTIL_SECURITY_HPP_INCLUDED__
-#define __TESTUTIL_SECURITY_HPP_INCLUDED__
-
-#include "testutil_unity.hpp"
-#include "testutil_monitoring.hpp"
-
-//  security test utils
-
-typedef void(socket_config_fn) (void *, void *);
-
-//  NULL specific functions
-void socket_config_null_client (void *server_, void *server_secret_);
-
-void socket_config_null_server (void *server_, void *server_secret_);
-
-//  PLAIN specific functions
-void socket_config_plain_client (void *server_, void *server_secret_);
-
-void socket_config_plain_server (void *server_, void *server_secret_);
-
-//  CURVE specific functions
-
-//  We'll generate random test keys at startup
-extern char valid_client_public[41];
-extern char valid_client_secret[41];
-extern char valid_server_public[41];
-extern char valid_server_secret[41];
-
-void setup_testutil_security_curve ();
-
-void socket_config_curve_server (void *server_, void *server_secret_);
-
-struct curve_client_data_t
-{
-    const char *server_public;
-    const char *client_public;
-    const char *client_secret;
-};
-
-void socket_config_curve_client (void *client_, void *data_);
-
-//  --------------------------------------------------------------------------
-//  This methods receives and validates ZAP requests (allowing or denying
-//  each client connection).
-
-enum zap_protocol_t
-{
-    zap_ok,
-    // ZAP-compliant non-standard cases
-    zap_status_temporary_failure,
-    zap_status_internal_error,
-    // ZAP protocol errors
-    zap_wrong_version,
-    zap_wrong_request_id,
-    zap_status_invalid,
-    zap_too_many_parts,
-    zap_disconnect,
-    zap_do_not_recv,
-    zap_do_not_send
-};
-
-extern void *zap_requests_handled;
-
-void zap_handler_generic (zap_protocol_t zap_protocol_,
-                          const char *expected_routing_id_ = "IDENT");
-
-void zap_handler (void * /*unused_*/);
-
-//  Security-specific monitor event utilities
-
-// assert_* are macros rather than functions, to allow assertion failures be
-// attributed to the causing source code line
-#define assert_no_more_monitor_events_with_timeout(monitor, timeout)                  \
-    {                                                                                 \
-        int event_count = 0;                                                          \
-        int event, err;                                                               \
-        while ((event = get_monitor_event_with_timeout ((monitor), &err, NULL,        \
-                                                        (timeout)))                   \
-               != -1) {                                                               \
-            if (event == ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL                         \
-                && (err == EPIPE || err == ECONNRESET                                 \
-                    || err == ECONNABORTED)) {                                        \
-                fprintf (stderr,                                                      \
-                         "Ignored event (skipping any further events): %x "           \
-                         "(err = %i == %s)\n",                                        \
-                         event, err, zmq_strerror (err));                             \
-                continue;                                                             \
-            }                                                                         \
-            ++event_count;                                                            \
-            /* TODO write this into a buffer and attach to the assertion msg below */ \
-            print_unexpected_event_stderr (event, err, 0, 0);                         \
-        }                                                                             \
-        TEST_ASSERT_EQUAL_INT (0, event_count);                                       \
-    }
-
-void setup_context_and_server_side (
-  void **zap_control_,
-  void **zap_thread_,
-  void **server_,
-  void **server_mon_,
-  char *my_endpoint_,
-  zmq_thread_fn zap_handler_ = &zap_handler,
-  socket_config_fn socket_config_ = &socket_config_curve_server,
-  void *socket_config_data_ = valid_server_secret,
-  const char *routing_id_ = "IDENT");
-
-void shutdown_context_and_server_side (void *zap_thread_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       void *zap_control_,
-                                       bool zap_handler_stopped_ = false);
-
-void *create_and_connect_client (char *my_endpoint_,
-                                 socket_config_fn socket_config_,
-                                 void *socket_config_data_,
-                                 void **client_mon_ = NULL);
-
-void expect_new_client_bounce_fail (char *my_endpoint_,
-                                    void *server_,
-                                    socket_config_fn socket_config_,
-                                    void *socket_config_data_,
-                                    void **client_mon_ = NULL,
-                                    int expected_client_event_ = 0,
-                                    int expected_client_value_ = 0);
-
-#endif
diff --git a/tests/testutil_unity.cpp b/tests/testutil_unity.cpp
deleted file mode 100644
index 1c2730587..000000000
--- a/tests/testutil_unity.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-
-int test_assert_success_message_errno_helper (int rc_,
-                                              const char *msg_,
-                                              const char *expr_,
-                                              int line_)
-{
-    if (rc_ == -1) {
-        char buffer[512];
-        buffer[sizeof (buffer) - 1] =
-          0; // to ensure defined behavior with VC++ <= 2013
-        snprintf (buffer, sizeof (buffer) - 1,
-                  "%s failed%s%s%s, errno = %i (%s)", expr_,
-                  msg_ ? " (additional info: " : "", msg_ ? msg_ : "",
-                  msg_ ? ")" : "", zmq_errno (), zmq_strerror (zmq_errno ()));
-        UNITY_TEST_FAIL (line_, buffer);
-    }
-    return rc_;
-}
-
-int test_assert_success_message_raw_errno_helper (
-  int rc_, const char *msg_, const char *expr_, int line_, bool zero)
-{
-    if (rc_ == -1 || (zero && rc_ != 0)) {
-#if defined ZMQ_HAVE_WINDOWS
-        int current_errno = WSAGetLastError ();
-#else
-        int current_errno = errno;
-#endif
-
-        char buffer[512];
-        buffer[sizeof (buffer) - 1] =
-          0; // to ensure defined behavior with VC++ <= 2013
-        snprintf (
-          buffer, sizeof (buffer) - 1, "%s failed%s%s%s with %d, errno = %i/%s",
-          expr_, msg_ ? " (additional info: " : "", msg_ ? msg_ : "",
-          msg_ ? ")" : "", rc_, current_errno, strerror (current_errno));
-        UNITY_TEST_FAIL (line_, buffer);
-    }
-    return rc_;
-}
-
-int test_assert_success_message_raw_zero_errno_helper (int rc_,
-                                                       const char *msg_,
-                                                       const char *expr_,
-                                                       int line_)
-{
-    return test_assert_success_message_raw_errno_helper (rc_, msg_, expr_,
-                                                         line_, true);
-}
-
-int test_assert_failure_message_raw_errno_helper (
-  int rc_, int expected_errno_, const char *msg_, const char *expr_, int line_)
-{
-    char buffer[512];
-    buffer[sizeof (buffer) - 1] =
-      0; // to ensure defined behavior with VC++ <= 2013
-    if (rc_ != -1) {
-        snprintf (buffer, sizeof (buffer) - 1,
-                  "%s was unexpectedly successful%s%s%s, expected "
-                  "errno = %i, actual return value = %i",
-                  expr_, msg_ ? " (additional info: " : "", msg_ ? msg_ : "",
-                  msg_ ? ")" : "", expected_errno_, rc_);
-        UNITY_TEST_FAIL (line_, buffer);
-    } else {
-#if defined ZMQ_HAVE_WINDOWS
-        int current_errno = WSAGetLastError ();
-#else
-        int current_errno = errno;
-#endif
-        if (current_errno != expected_errno_) {
-            snprintf (buffer, sizeof (buffer) - 1,
-                      "%s failed with an unexpected error%s%s%s, expected "
-                      "errno = %i, actual errno = %i",
-                      expr_, msg_ ? " (additional info: " : "",
-                      msg_ ? msg_ : "", msg_ ? ")" : "", expected_errno_,
-                      current_errno);
-            UNITY_TEST_FAIL (line_, buffer);
-        }
-    }
-    return rc_;
-}
-
-void send_string_expect_success (void *socket_, const char *str_, int flags_)
-{
-    const size_t len = str_ ? strlen (str_) : 0;
-    const int rc = zmq_send (socket_, str_, len, flags_);
-    TEST_ASSERT_EQUAL_INT ((int) len, rc);
-}
-
-void recv_string_expect_success (void *socket_, const char *str_, int flags_)
-{
-    const size_t len = str_ ? strlen (str_) : 0;
-    char buffer[255];
-    TEST_ASSERT_LESS_OR_EQUAL_MESSAGE (sizeof (buffer), len,
-                                       "recv_string_expect_success cannot be "
-                                       "used for strings longer than 255 "
-                                       "characters");
-
-    const int rc = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_recv (socket_, buffer, sizeof (buffer), flags_));
-    TEST_ASSERT_EQUAL_INT ((int) len, rc);
-    if (str_)
-        TEST_ASSERT_EQUAL_STRING_LEN (str_, buffer, len);
-}
-
-static void *internal_manage_test_context (bool init_, bool clear_)
-{
-    static void *test_context = NULL;
-    if (clear_) {
-        TEST_ASSERT_NOT_NULL (test_context);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_term (test_context));
-        test_context = NULL;
-    } else {
-        if (init_) {
-            TEST_ASSERT_NULL (test_context);
-            test_context = zmq_ctx_new ();
-            TEST_ASSERT_NOT_NULL (test_context);
-        }
-    }
-    return test_context;
-}
-
-static void internal_manage_test_sockets (void *socket_, bool add_)
-{
-    static void *test_sockets[MAX_TEST_SOCKETS];
-    static size_t test_socket_count = 0;
-    if (!socket_) {
-        TEST_ASSERT_FALSE (add_);
-
-        // force-close all sockets
-        if (test_socket_count) {
-            for (size_t i = 0; i < test_socket_count; ++i) {
-                close_zero_linger (test_sockets[i]);
-            }
-            fprintf (stderr,
-                     "WARNING: Forced closure of %i sockets, this is an "
-                     "implementation error unless the test case failed\n",
-                     static_cast<int> (test_socket_count));
-            test_socket_count = 0;
-        }
-    } else {
-        if (add_) {
-            ++test_socket_count;
-            TEST_ASSERT_LESS_THAN_MESSAGE (MAX_TEST_SOCKETS, test_socket_count,
-                                           "MAX_TEST_SOCKETS must be "
-                                           "increased, or you cannot use the "
-                                           "test context");
-            test_sockets[test_socket_count - 1] = socket_;
-        } else {
-            bool found = false;
-            for (size_t i = 0; i < test_socket_count; ++i) {
-                if (test_sockets[i] == socket_) {
-                    found = true;
-                }
-                if (found) {
-                    if (i < test_socket_count)
-                        test_sockets[i] = test_sockets[i + 1];
-                }
-            }
-            TEST_ASSERT_TRUE_MESSAGE (found,
-                                      "Attempted to close a socket that was "
-                                      "not created by test_context_socket");
-            --test_socket_count;
-        }
-    }
-}
-
-void setup_test_context ()
-{
-    internal_manage_test_context (true, false);
-}
-
-void *get_test_context ()
-{
-    return internal_manage_test_context (false, false);
-}
-
-void teardown_test_context ()
-{
-    // this condition allows an explicit call to teardown_test_context from a
-    // test. if this is never used, it should probably be removed, to detect
-    // misuses
-    if (get_test_context ()) {
-        internal_manage_test_sockets (NULL, false);
-        internal_manage_test_context (false, true);
-    }
-}
-
-void *test_context_socket (int type_)
-{
-    void *const socket = zmq_socket (get_test_context (), type_);
-    TEST_ASSERT_NOT_NULL (socket);
-    internal_manage_test_sockets (socket, true);
-    return socket;
-}
-
-void *test_context_socket_close (void *socket_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket_));
-    internal_manage_test_sockets (socket_, false);
-    return socket_;
-}
-
-void *test_context_socket_close_zero_linger (void *socket_)
-{
-    const int linger = 0;
-    int rc = zmq_setsockopt (socket_, ZMQ_LINGER, &linger, sizeof (linger));
-    TEST_ASSERT_TRUE (rc == 0 || zmq_errno () == ETERM);
-    return test_context_socket_close (socket_);
-}
-
-void test_bind (void *socket_,
-                const char *bind_address_,
-                char *my_endpoint_,
-                size_t len_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (socket_, bind_address_));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_LAST_ENDPOINT, my_endpoint_, &len_));
-}
-
-void bind_loopback (void *socket_, int ipv6_, char *my_endpoint_, size_t len_)
-{
-    if (ipv6_ && !is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket_, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    test_bind (socket_, ipv6_ ? "tcp://[::1]:*" : "tcp://127.0.0.1:*",
-               my_endpoint_, len_);
-}
-
-void bind_loopback_ipv4 (void *socket_, char *my_endpoint_, size_t len_)
-{
-    bind_loopback (socket_, false, my_endpoint_, len_);
-}
-
-void bind_loopback_ipv6 (void *socket_, char *my_endpoint_, size_t len_)
-{
-    bind_loopback (socket_, true, my_endpoint_, len_);
-}
-
-void bind_loopback_ipc (void *socket_, char *my_endpoint_, size_t len_)
-{
-    if (!zmq_has ("ipc")) {
-        TEST_IGNORE_MESSAGE ("ipc is not available");
-    }
-
-    test_bind (socket_, "ipc://*", my_endpoint_, len_);
-}
-
-void bind_loopback_tipc (void *socket_, char *my_endpoint_, size_t len_)
-{
-    if (!is_tipc_available ()) {
-        TEST_IGNORE_MESSAGE ("tipc is not available");
-    }
-
-    test_bind (socket_, "tipc://<*>", my_endpoint_, len_);
-}
-
-#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU)
-void make_random_ipc_endpoint (char *out_endpoint_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-    char random_file[MAX_PATH];
-
-    {
-        const errno_t rc = tmpnam_s (random_file);
-        TEST_ASSERT_EQUAL (0, rc);
-    }
-
-    // TODO or use CreateDirectoryA and specify permissions?
-    const int rc = _mkdir (random_file);
-    TEST_ASSERT_EQUAL (0, rc);
-
-    strcat (random_file, "/ipc");
-
-#else
-    char random_file[16];
-    strcpy (random_file, "tmpXXXXXX");
-
-#ifdef HAVE_MKDTEMP
-    TEST_ASSERT_TRUE (mkdtemp (random_file));
-    strcat (random_file, "/ipc");
-#else
-    int fd = mkstemp (random_file);
-    TEST_ASSERT_TRUE (fd != -1);
-    close (fd);
-#endif
-#endif
-
-    strcpy (out_endpoint_, "ipc://");
-    strcat (out_endpoint_, random_file);
-}
-#endif
diff --git a/tests/testutil_unity.hpp b/tests/testutil_unity.hpp
deleted file mode 100644
index 0be46db2d..000000000
--- a/tests/testutil_unity.hpp
+++ /dev/null
@@ -1,280 +0,0 @@
-#pragma once
-
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-
-#include "testutil.hpp"
-
-#include <unity.h>
-
-// Internal helper functions that are not intended to be directly called from
-// tests. They must be declared in the header since they are used by macros.
-
-int test_assert_success_message_errno_helper (int rc_,
-                                              const char *msg_,
-                                              const char *expr_,
-                                              int line);
-
-int test_assert_success_message_raw_errno_helper (
-  int rc_, const char *msg_, const char *expr_, int line, bool zero_ = false);
-
-int test_assert_success_message_raw_zero_errno_helper (int rc_,
-                                                       const char *msg_,
-                                                       const char *expr_,
-                                                       int line);
-
-int test_assert_failure_message_raw_errno_helper (
-  int rc_, int expected_errno_, const char *msg_, const char *expr_, int line);
-
-/////////////////////////////////////////////////////////////////////////////
-// Macros extending Unity's TEST_ASSERT_* macros in a similar fashion.
-/////////////////////////////////////////////////////////////////////////////
-
-// For TEST_ASSERT_SUCCESS_ERRNO, TEST_ASSERT_SUCCESS_MESSAGE_ERRNO and
-// TEST_ASSERT_FAILURE_ERRNO, 'expr' must be an expression evaluating
-// to a result in the style of a libzmq API function, i.e. an integer which
-// is non-negative in case of success, and -1 in case of a failure, and sets
-// the value returned by zmq_errno () to the error code.
-// TEST_ASSERT_SUCCESS_RAW_ERRNO and TEST_ASSERT_FAILURE_RAW_ERRNO are similar,
-// but used with the native socket API functions, and expect that the error
-// code can be retrieved in the native way (i.e. WSAGetLastError on Windows,
-// and errno otherwise).
-
-// Asserts that the libzmq API 'expr' is successful. In case of a failure, the
-// assertion message includes the literal 'expr', the error number as
-// determined by zmq_errno(), and the additional 'msg'.
-// In case of success, the result of the macro is the result of 'expr'.
-#define TEST_ASSERT_SUCCESS_MESSAGE_ERRNO(expr, msg)                           \
-    test_assert_success_message_errno_helper (expr, msg, #expr, __LINE__)
-
-// Asserts that the libzmq API 'expr' is successful. In case of a failure, the
-// assertion message includes the literal 'expr' and the error code.
-// A typical use would be:
-//   TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (socket, endpoint));
-// In case of success, the result of the macro is the result of 'expr'.
-//
-// If an additional message should be displayed in case of a failure, use
-// TEST_ASSERT_SUCCESS_MESSAGE_ERRNO.
-#define TEST_ASSERT_SUCCESS_ERRNO(expr)                                        \
-    test_assert_success_message_errno_helper (expr, NULL, #expr, __LINE__)
-
-// Asserts that the socket API 'expr' is successful. In case of a failure, the
-// assertion message includes the literal 'expr' and the error code.
-// A typical use would be:
-//   TEST_ASSERT_SUCCESS_RAW_ERRNO (send (fd, buffer, 64, 0));
-// In case of success, the result of the macro is the result of 'expr'.
-// Success is strictly defined by a return value different from -1, as opposed
-// to checking that it is 0, like TEST_ASSERT_FAILURE_RAW_ZERO_ERRNO does.
-#define TEST_ASSERT_SUCCESS_RAW_ERRNO(expr)                                    \
-    test_assert_success_message_raw_errno_helper (expr, NULL, #expr, __LINE__)
-
-// Asserts that the socket API 'expr' is successful. In case of a failure, the
-// assertion message includes the literal 'expr' and the error code.
-// A typical use would be:
-//   TEST_ASSERT_SUCCESS_RAW_ZERO_ERRNO (send (fd, buffer, 64, 0));
-// In case of success, the result of the macro is the result of 'expr'.
-// Success is strictly defined by a return value of 0, as opposed to checking
-// that it is not -1, like TEST_ASSERT_FAILURE_RAW_ERRNO does.
-#define TEST_ASSERT_SUCCESS_RAW_ZERO_ERRNO(expr)                               \
-    test_assert_success_message_raw_zero_errno_helper (expr, NULL, #expr,      \
-                                                       __LINE__)
-
-// Asserts that the socket API 'expr' is not successful, and the error code is
-// 'error_code'. In case of an unexpected succces, or a failure with an
-// unexpected error code, the assertion message includes the literal 'expr'
-// and, in case of a failure, the actual error code.
-#define TEST_ASSERT_FAILURE_RAW_ERRNO(error_code, expr)                        \
-    test_assert_failure_message_raw_errno_helper (expr, error_code, NULL,      \
-                                                  #expr, __LINE__)
-
-// Asserts that the libzmq API 'expr' is not successful, and the error code is
-// 'error_code'. In case of an unexpected succces, or a failure with an
-// unexpected error code, the assertion message includes the literal 'expr'
-// and, in case of a failure, the actual error code.
-#define TEST_ASSERT_FAILURE_ERRNO(error_code, expr)                            \
-    {                                                                          \
-        int _rc = (expr);                                                      \
-        TEST_ASSERT_EQUAL_INT (-1, _rc);                                       \
-        TEST_ASSERT_EQUAL_INT (error_code, errno);                             \
-    }
-
-/////////////////////////////////////////////////////////////////////////////
-// Utility functions for testing sending and receiving.
-/////////////////////////////////////////////////////////////////////////////
-
-// Sends a string via a libzmq socket, and expects the operation to be
-// successful (the meaning of which depends on the socket type and configured
-// options, and might include dropping the message). Otherwise, a Unity test
-// assertion is triggered.
-// 'socket_' must be the libzmq socket to use for sending.
-// 'str_' must be a 0-terminated string.
-// 'flags_' are as documented by the zmq_send function.
-void send_string_expect_success (void *socket_, const char *str_, int flags_);
-
-// Receives a message via a libzmq socket, and expects the operation to be
-// successful, and the message to be a given string. Otherwise, a Unity test
-// assertion is triggered.
-// 'socket_' must be the libzmq socket to use for receiving.
-// 'str_' must be a 0-terminated string.
-// 'flags_' are as documented by the zmq_recv function.
-void recv_string_expect_success (void *socket_, const char *str_, int flags_);
-
-// Sends a byte array via a libzmq socket, and expects the operation to be
-// successful (the meaning of which depends on the socket type and configured
-// options, and might include dropping the message). Otherwise, a Unity test
-// assertion is triggered.
-// 'socket_' must be the libzmq socket to use for sending.
-// 'array_' must be a C uint8_t array. The array size is automatically
-// determined via template argument deduction.
-// 'flags_' are as documented by the zmq_send function.
-template <size_t SIZE>
-void send_array_expect_success (void *socket_,
-                                const uint8_t (&array_)[SIZE],
-                                int flags_)
-{
-    const int rc = zmq_send (socket_, array_, SIZE, flags_);
-    TEST_ASSERT_EQUAL_INT (static_cast<int> (SIZE), rc);
-}
-
-// Receives a message via a libzmq socket, and expects the operation to be
-// successful, and the message to be a given byte array. Otherwise, a Unity
-// test assertion is triggered.
-// 'socket_' must be the libzmq socket to use for receiving.
-// 'array_' must be a C uint8_t array. The array size is automatically
-// determined via template argument deduction.
-// 'flags_' are as documented by the zmq_recv function.
-template <size_t SIZE>
-void recv_array_expect_success (void *socket_,
-                                const uint8_t (&array_)[SIZE],
-                                int flags_)
-{
-    char buffer[255];
-    TEST_ASSERT_LESS_OR_EQUAL_MESSAGE (sizeof (buffer), SIZE,
-                                       "recv_string_expect_success cannot be "
-                                       "used for strings longer than 255 "
-                                       "characters");
-
-    const int rc = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_recv (socket_, buffer, sizeof (buffer), flags_));
-    TEST_ASSERT_EQUAL_INT (static_cast<int> (SIZE), rc);
-    TEST_ASSERT_EQUAL_UINT8_ARRAY (array_, buffer, SIZE);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Utility function for handling a test libzmq context, that is set up and
-// torn down for each Unity test case, such that a clean context is available
-// for each test case, and some consistency checks can be performed.
-/////////////////////////////////////////////////////////////////////////////
-
-// Use this is an test executable to perform a default setup and teardown of
-// the test context, which is appropriate for many libzmq test cases.
-#define SETUP_TEARDOWN_TESTCONTEXT                                             \
-    void setUp () { setup_test_context (); }                                   \
-    void tearDown () { teardown_test_context (); }
-
-// The maximum number of sockets that can be managed by the test context.
-#define MAX_TEST_SOCKETS 128
-
-// Expected to be called during Unity's setUp function.
-void setup_test_context ();
-
-// Returns the test context, e.g. to create sockets in another thread using
-// zmq_socket, or set context options.
-void *get_test_context ();
-
-// Expected to be called during Unity's tearDown function. Checks that all
-// sockets created via test_context_socket have been properly closed using
-// test_context_socket_close or test_context_socket_close_zero_linger, and generates a warning otherwise.
-void teardown_test_context ();
-
-// Creates a libzmq socket on the test context, and tracks its lifecycle.
-// You MUST use test_context_socket_close or test_context_socket_close_zero_linger
-// to close a socket created via this function, otherwise undefined behaviour
-// will result.
-// CAUTION: this function is not thread-safe, and may only be used from the
-// main thread.
-void *test_context_socket (int type_);
-
-// Closes a socket created via test_context_socket.
-// CAUTION: this function is not thread-safe, and may only be used from the
-// main thread.
-void *test_context_socket_close (void *socket_);
-
-// Closes a socket created via test_context_socket after setting its linger
-// timeout to 0.
-// CAUTION: this function is not thread-safe, and may only be used from the
-// main thread.
-void *test_context_socket_close_zero_linger (void *socket_);
-
-/////////////////////////////////////////////////////////////////////////////
-// Utility function for handling wildcard binds.
-/////////////////////////////////////////////////////////////////////////////
-
-// All function binds a socket to some wildcard address, and retrieve the bound
-// endpoint via the ZMQ_LAST_ENDPOINT socket option to a given buffer.
-// Triggers a Unity test assertion in case of a failure (including the buffer
-// being too small for the resulting endpoint string).
-
-// Binds to an explicitly given (wildcard) address.
-// TODO redesign such that this function is not necessary to be exposed, but
-// the protocol to use is rather specified via an enum value
-void test_bind (void *socket_,
-                const char *bind_address_,
-                char *my_endpoint_,
-                size_t len_);
-
-// Binds to a tcp endpoint using the ipv4 or ipv6 loopback wildcard address.
-void bind_loopback (void *socket_, int ipv6_, char *my_endpoint_, size_t len_);
-
-typedef void (*bind_function_t) (void *socket_,
-                                 char *my_endpoint_,
-                                 size_t len_);
-
-// Binds to a tcp endpoint using the ipv4 loopback wildcard address.
-void bind_loopback_ipv4 (void *socket_, char *my_endpoint_, size_t len_);
-
-// Binds to a tcp endpoint using the ipv6 loopback wildcard address.
-void bind_loopback_ipv6 (void *socket_, char *my_endpoint_, size_t len_);
-
-// Binds to an ipc endpoint using the ipc wildcard address.
-// Note that the returned address cannot be reused to bind a second socket.
-// If you need to do this, use make_random_ipc_endpoint instead.
-void bind_loopback_ipc (void *socket_, char *my_endpoint_, size_t len_);
-
-// Binds to an ipc endpoint using the tipc wildcard address.
-void bind_loopback_tipc (void *socket_, char *my_endpoint_, size_t len_);
-
-#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU)
-// utility function to create a random IPC endpoint, similar to what a ipc://*
-// wildcard binding does, but in a way it can be reused for multiple binds
-// TODO also add a len parameter here
-void make_random_ipc_endpoint (char *out_endpoint_);
-#endif
diff --git a/tools/curve_keygen.cpp b/tools/curve_keygen.cpp
deleted file mode 100644
index ff495c4b2..000000000
--- a/tools/curve_keygen.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdlib.h>
-#include <assert.h>
-#include <zmq.h>
-
-int main (void)
-{
-    puts ("This tool generates a CurveZMQ keypair, as two printable strings "
-          "you can");
-    puts ("use in configuration files or source code. The encoding uses Z85, "
-          "which");
-    puts (
-      "is a base-85 format that is described in 0MQ RFC 32, and which has an");
-    puts ("implementation in the z85_codec.h source used by this tool. The "
-          "keypair");
-    puts (
-      "always works with the secret key held by one party and the public key");
-    puts ("distributed (securely!) to peers wishing to connect to it.");
-
-    char public_key[41];
-    char secret_key[41];
-    if (zmq_curve_keypair (public_key, secret_key)) {
-        if (zmq_errno () == ENOTSUP)
-            puts ("To use curve_keygen, please install libsodium and then "
-                  "rebuild libzmq.");
-        exit (1);
-    }
-
-    puts ("\n== CURVE PUBLIC KEY ==");
-    puts (public_key);
-
-    puts ("\n== CURVE SECRET KEY ==");
-    puts (secret_key);
-
-    exit (0);
-}
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
deleted file mode 100644
index 7132f00ba..000000000
--- a/unittests/CMakeLists.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-# CMake build script for ZeroMQ unit tests
-cmake_minimum_required(VERSION "2.8.1")
-
-set(unittests
-    unittest_ypipe
-    unittest_poller
-    unittest_mtrie
-    unittest_ip_resolver
-    unittest_udp_address
-    unittest_radix_tree
-    unittest_curve_encoding)
-
-# if(ENABLE_DRAFTS) list(APPEND tests ) endif(ENABLE_DRAFTS)
-
-# add location of platform.hpp for Windows builds
-if(WIN32)
-  add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
-  add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
-  # Same name on 64bit systems
-  link_libraries(ws2_32.lib)
-endif()
-
-include_directories("${ZeroMQ_SOURCE_DIR}/include" "${ZeroMQ_SOURCE_DIR}/src" "${ZeroMQ_BINARY_DIR}")
-include_directories("${ZeroMQ_SOURCE_DIR}/external/unity")
-
-foreach(test ${unittests})
-  # target_sources not supported before CMake 3.1
-  add_executable(${test} ${test}.cpp "unittest_resolver_common.hpp")
-
-  # per-test directories not generated on OS X / Darwin
-  if(NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang.*")
-    link_directories(${test} PRIVATE "${ZeroMQ_SOURCE_DIR}/../lib")
-  endif()
-
-  target_link_libraries(${test} testutil-static)
-
-  if(RT_LIBRARY)
-    target_link_libraries(${test} ${RT_LIBRARY})
-  endif()
-
-  if(CMAKE_SYSTEM_NAME MATCHES "QNX")
-    target_link_libraries(${test} socket)
-    target_link_libraries(${test} m)
-  endif()
-
-  if(WIN32)
-    add_test(
-      NAME ${test}
-      WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-      COMMAND ${test})
-  else()
-    add_test(NAME ${test} COMMAND ${test})
-  endif()
-
-  set_tests_properties(${test} PROPERTIES TIMEOUT 10)
-
-  # TODO prevent libzmq (non-static) being in the list of link libraries at all
-  get_target_property(LIBS ${test} LINK_LIBRARIES)
-  list(REMOVE_ITEM LIBS libzmq)
-  set_target_properties(${test} PROPERTIES LINK_LIBRARIES "${LIBS}")
-endforeach()
-
-# Check whether all tests in the current folder are present TODO duplicated with tests/CMakeLists.txt, define as a
-# function?
-file(READ "${CMAKE_CURRENT_LIST_FILE}" CURRENT_LIST_FILE_CONTENT)
-file(GLOB ALL_TEST_SOURCES "test_*.cpp")
-foreach(TEST_SOURCE ${ALL_TEST_SOURCES})
-  get_filename_component(TESTNAME "${TEST_SOURCE}" NAME_WE)
-  string(REGEX MATCH "${TESTNAME}" MATCH_TESTNAME "${CURRENT_LIST_FILE_CONTENT}")
-  if(NOT MATCH_TESTNAME)
-    message(AUTHOR_WARNING "Test '${TESTNAME}' is not known to CTest.")
-  endif()
-endforeach()
diff --git a/unittests/unittest_curve_encoding.cpp b/unittests/unittest_curve_encoding.cpp
deleted file mode 100644
index a331476ef..000000000
--- a/unittests/unittest_curve_encoding.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil_unity.hpp"
-
-// TODO: remove this ugly hack
-#ifdef close
-#undef close
-#endif
-
-#include <curve_mechanism_base.hpp>
-#include <msg.hpp>
-#include <random.hpp>
-
-#include <unity.h>
-
-#include <vector>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void test_roundtrip (zmq::msg_t *msg_)
-{
-#ifdef ZMQ_HAVE_CURVE
-    const std::vector<uint8_t> original (static_cast<uint8_t *> (msg_->data ()),
-                                         static_cast<uint8_t *> (msg_->data ())
-                                           + msg_->size ());
-
-    zmq::curve_encoding_t encoding_client ("CurveZMQMESSAGEC",
-                                           "CurveZMQMESSAGES",
-                                           false);
-    zmq::curve_encoding_t encoding_server ("CurveZMQMESSAGES",
-                                           "CurveZMQMESSAGEC",
-                                           false);
-
-    uint8_t client_public[32];
-    uint8_t client_secret[32];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      crypto_box_keypair (client_public, client_secret));
-
-    uint8_t server_public[32];
-    uint8_t server_secret[32];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      crypto_box_keypair (server_public, server_secret));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      crypto_box_beforenm (encoding_client.get_writable_precom_buffer (),
-                           server_public, client_secret));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      crypto_box_beforenm (encoding_server.get_writable_precom_buffer (),
-                           client_public, server_secret));
-
-    TEST_ASSERT_SUCCESS_ERRNO (encoding_client.encode (msg_));
-
-    // TODO: This is hacky...
-    encoding_server.set_peer_nonce (0);
-    int error_event_code;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      encoding_server.decode (msg_, &error_event_code));
-
-    TEST_ASSERT_EQUAL_INT (original.size (), msg_->size ());
-    if (!original.empty ()) {
-        TEST_ASSERT_EQUAL_UINT8_ARRAY (&original[0], msg_->data (),
-                                       original.size ());
-    }
-#else
-    TEST_IGNORE_MESSAGE ("CURVE support is disabled");
-#endif
-}
-
-void test_roundtrip_empty ()
-{
-    zmq::msg_t msg;
-    msg.init ();
-
-    test_roundtrip (&msg);
-
-    msg.close ();
-}
-
-void test_roundtrip_small ()
-{
-    zmq::msg_t msg;
-    msg.init_size (32);
-    memcpy (msg.data (), "0123456789ABCDEF0123456789ABCDEF", 32);
-
-    test_roundtrip (&msg);
-
-    msg.close ();
-}
-
-void test_roundtrip_large ()
-{
-    zmq::msg_t msg;
-    msg.init_size (2048);
-    for (size_t pos = 0; pos < 2048; pos += 32) {
-        memcpy (static_cast<char *> (msg.data ()) + pos,
-                "0123456789ABCDEF0123456789ABCDEF", 32);
-    }
-
-    test_roundtrip (&msg);
-
-    msg.close ();
-}
-
-void test_roundtrip_empty_more ()
-{
-    zmq::msg_t msg;
-    msg.init ();
-    msg.set_flags (zmq::msg_t::more);
-
-    test_roundtrip (&msg);
-    TEST_ASSERT_TRUE (msg.flags () & zmq::msg_t::more);
-
-    msg.close ();
-}
-
-int main ()
-{
-    setup_test_environment ();
-    zmq::random_open ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_roundtrip_empty);
-    RUN_TEST (test_roundtrip_small);
-    RUN_TEST (test_roundtrip_large);
-
-    RUN_TEST (test_roundtrip_empty_more);
-
-    zmq::random_close ();
-
-    return UNITY_END ();
-}
diff --git a/unittests/unittest_ip_resolver.cpp b/unittests/unittest_ip_resolver.cpp
deleted file mode 100644
index 3d1fa8c21..000000000
--- a/unittests/unittest_ip_resolver.cpp
+++ /dev/null
@@ -1,969 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <unity.h>
-#include "../src/macros.hpp"
-#include "../tests/testutil.hpp"
-#include "../tests/testutil_unity.hpp"
-#include "../unittests/unittest_resolver_common.hpp"
-
-#include <ip_resolver.hpp>
-#include <ip.hpp>
-
-#ifndef _WIN32
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-class test_ip_resolver_t ZMQ_FINAL : public zmq::ip_resolver_t
-{
-  public:
-    test_ip_resolver_t (zmq::ip_resolver_options_t opts_) :
-        ip_resolver_t (opts_)
-    {
-    }
-
-  protected:
-    struct dns_lut_t
-    {
-        const char *hostname;
-        const char *ipv4;
-        const char *ipv6;
-    };
-
-    int do_getaddrinfo (const char *node_,
-                        const char *service_,
-                        const struct addrinfo *hints_,
-                        struct addrinfo **res_) ZMQ_FINAL
-    {
-        static const struct dns_lut_t dns_lut[] = {
-          {"ip.zeromq.org", "10.100.0.1", "fdf5:d058:d656::1"},
-          {"ipv4only.zeromq.org", "10.100.0.2", "::ffff:10.100.0.2"},
-          {"ipv6only.zeromq.org", NULL, "fdf5:d058:d656::2"},
-        };
-        unsigned lut_len = sizeof (dns_lut) / sizeof (dns_lut[0]);
-        struct addrinfo ai;
-
-        TEST_ASSERT_NULL (service_);
-
-        bool ipv6 = (hints_->ai_family == AF_INET6);
-        bool no_dns = (hints_->ai_flags & AI_NUMERICHOST) != 0;
-        const char *ip = NULL;
-
-        if (!no_dns) {
-            for (unsigned i = 0; i < lut_len; i++) {
-                if (strcmp (dns_lut[i].hostname, node_) == 0) {
-                    if (ipv6) {
-                        ip = dns_lut[i].ipv6;
-                    } else {
-                        ip = dns_lut[i].ipv4;
-
-                        if (ip == NULL) {
-                            //  No address associated with NAME
-                            return EAI_NODATA;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (ip == NULL) {
-            //  No entry for 'node_' found in the LUT (or DNS is
-            //  forbidden), assume that it's a numeric IP address
-            ip = node_;
-        }
-
-        //  Call the real getaddrinfo implementation, making sure that it won't
-        //  attempt to resolve using DNS
-        ai = *hints_;
-        ai.ai_flags |= AI_NUMERICHOST;
-
-        return zmq::ip_resolver_t::do_getaddrinfo (ip, NULL, &ai, res_);
-    }
-
-    unsigned int do_if_nametoindex (const char *ifname_) ZMQ_FINAL
-    {
-        static const char *dummy_interfaces[] = {
-          "lo0",
-          "eth0",
-          "eth1",
-        };
-        unsigned lut_len =
-          sizeof (dummy_interfaces) / sizeof (dummy_interfaces[0]);
-
-        for (unsigned i = 0; i < lut_len; i++) {
-            if (strcmp (dummy_interfaces[i], ifname_) == 0) {
-                //  The dummy index will be the position in the array + 1 (0 is
-                //  invalid)
-                return i + 1;
-            }
-        }
-
-        //  Not found
-        return 0;
-    }
-};
-
-//  Attempt a resolution and test the results. If 'expected_addr_' is NULL
-//  assume that the resolution is meant to fail.
-//
-//  On windows we can receive an IPv4 address even when an IPv6 is requested, if
-//  we're in this situation then we compare to 'expected_addr_v4_failover_'
-//  instead.
-static void test_resolve (zmq::ip_resolver_options_t opts_,
-                          const char *name_,
-                          const char *expected_addr_,
-                          uint16_t expected_port_ = 0,
-                          uint16_t expected_zone_ = 0,
-                          const char *expected_addr_v4_failover_ = NULL)
-{
-    zmq::ip_addr_t addr;
-    int family = opts_.ipv6 () ? AF_INET6 : AF_INET;
-
-    if (family == AF_INET6 && !is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    //  Generate an invalid but well-defined 'ip_addr_t'. Avoids testing
-    //  uninitialized values if the code is buggy.
-    memset (&addr, 0xba, sizeof (addr));
-
-    test_ip_resolver_t resolver (opts_);
-
-    int rc = resolver.resolve (&addr, name_);
-
-    if (expected_addr_ == NULL) {
-        // TODO also check the expected errno
-        TEST_ASSERT_EQUAL (-1, rc);
-        return;
-    }
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-
-
-    validate_address (family, &addr, expected_addr_, expected_port_,
-                      expected_zone_, expected_addr_v4_failover_);
-}
-
-// Helper macro to define the v4/v6 function pairs
-#define MAKE_TEST_V4V6(_test)                                                  \
-    static void _test##_ipv4 () { _test (false); }                             \
-                                                                               \
-    static void _test##_ipv6 () { _test (true); }
-
-static void test_bind_any (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (true).expect_port (true).ipv6 (ipv6_);
-
-    const char *expected = ipv6_ ? "::" : "0.0.0.0";
-    test_resolve (resolver_opts, "*:*", expected, 0);
-}
-MAKE_TEST_V4V6 (test_bind_any)
-
-static void test_bind_any_port0 (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (true).expect_port (true).ipv6 (ipv6_);
-
-    //  Should be equivalent to "*:*"
-    const char *expected = ipv6_ ? "::" : "0.0.0.0";
-    test_resolve (resolver_opts, "*:0", expected, 0);
-}
-MAKE_TEST_V4V6 (test_bind_any_port0)
-
-static void test_nobind_any (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (ipv6_);
-
-    //  Wildcard should be rejected if we're not looking for a
-    //  bindable address
-    test_resolve (resolver_opts, "*:*", NULL);
-}
-MAKE_TEST_V4V6 (test_nobind_any)
-
-static void test_nobind_any_port (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (ipv6_);
-
-    //  Wildcard should be rejected if we're not looking for a
-    //  bindable address
-    test_resolve (resolver_opts, "*:1234", NULL);
-}
-MAKE_TEST_V4V6 (test_nobind_any_port)
-
-static void test_nobind_addr_anyport (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (ipv6_);
-
-    //  Wildcard port should be rejected for non-bindable addresses
-    test_resolve (resolver_opts, "127.0.0.1:*", NULL);
-}
-MAKE_TEST_V4V6 (test_nobind_addr_anyport)
-
-static void test_nobind_addr_port0 (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (ipv6_);
-
-    //  Connecting to port 0 is allowed, although it might not be massively
-    //  useful
-    const char *expected = ipv6_ ? "::ffff:127.0.0.1" : "127.0.0.1";
-    const char *fallback = ipv6_ ? "127.0.0.1" : NULL;
-    test_resolve (resolver_opts, "127.0.0.1:0", expected, 0, 0, fallback);
-}
-MAKE_TEST_V4V6 (test_nobind_addr_port0)
-
-static void test_parse_ipv4_simple ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "1.2.128.129", "1.2.128.129");
-}
-
-static void test_parse_ipv4_zero ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "0.0.0.0", "0.0.0.0");
-}
-
-static void test_parse_ipv4_max ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "255.255.255.255", "255.255.255.255");
-}
-
-static void test_parse_ipv4_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    //  Not particularly useful, but valid
-    test_resolve (resolver_opts, "[1.2.128.129]", "1.2.128.129");
-}
-
-static void test_parse_ipv4_brackets_missingl ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "1.2.128.129]", NULL);
-}
-
-static void test_parse_ipv4_brackets_missingr ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "[1.2.128.129", NULL);
-}
-
-static void test_parse_ipv4_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "[1.2.128].129", NULL);
-}
-
-static void test_parse_ipv4_reject_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    //  No port expected, should be rejected
-    test_resolve (resolver_opts, "1.2.128.129:123", NULL);
-}
-
-static void test_parse_ipv4_reject_any ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    //  No port expected, should be rejected
-    test_resolve (resolver_opts, "1.2.128.129:*", NULL);
-}
-
-static void test_parse_ipv4_reject_ipv6 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    //  No port expected, should be rejected
-    test_resolve (resolver_opts, "::1", NULL);
-}
-
-static void test_parse_ipv4_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "1.2.128.129:123", "1.2.128.129", 123);
-}
-
-static void test_parse_ipv4_port0 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    //  Port 0 is accepted and is equivalent to *
-    test_resolve (resolver_opts, "1.2.128.129:0", "1.2.128.129", 0);
-}
-
-static void test_parse_ipv4_port_garbage ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    //  The code doesn't validate that the port doesn't contain garbage
-    test_resolve (resolver_opts, "1.2.3.4:567bad", "1.2.3.4", 567);
-}
-
-static void test_parse_ipv4_port_missing ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "1.2.3.4", NULL);
-}
-
-static void test_parse_ipv4_port_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "1.2.3.4:bad", NULL);
-}
-
-static void test_parse_ipv4_port_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[192.168.1.1]:5555", "192.168.1.1", 5555);
-}
-
-static void test_parse_ipv4_port_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[192.168.1.1:]5555", NULL);
-}
-
-static void test_parse_ipv4_port_brackets_bad2 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[192.168.1.1:5555]", NULL);
-}
-
-static void test_parse_ipv4_wild_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[192.168.1.1:*]", NULL);
-}
-
-static void test_parse_ipv4_port_ipv6_reject ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[::1]:1234", NULL);
-}
-
-static void test_parse_ipv6_simple ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "::1", "::1");
-}
-
-static void test_parse_ipv6_simple2 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "abcd:1234::1:0:234", "abcd:1234::1:0:234");
-}
-
-static void test_parse_ipv6_zero ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "::", "::");
-}
-
-static void test_parse_ipv6_max ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
-                  "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff");
-}
-
-static void test_parse_ipv6_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "[::1]", "::1");
-}
-
-static void test_parse_ipv6_brackets_missingl ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "::1]", NULL);
-}
-
-static void test_parse_ipv6_brackets_missingr ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "[::1", NULL);
-}
-
-static void test_parse_ipv6_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "[abcd:1234::1:]0:234", NULL);
-}
-
-static void test_parse_ipv6_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true);
-
-    test_resolve (resolver_opts, "[1234::1]:80", "1234::1", 80);
-}
-
-static void test_parse_ipv6_port_any ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true).bindable (true);
-
-    test_resolve (resolver_opts, "[1234::1]:*", "1234::1", 0);
-}
-
-static void test_parse_ipv6_port_nobrackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true);
-
-    //  Should this be allowed? Seems error-prone but so far ZMQ accepts it.
-    test_resolve (resolver_opts, "abcd:1234::1:0:234:123", "abcd:1234::1:0:234",
-                  123);
-}
-
-static void test_parse_ipv4_in_ipv6 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    //  Parsing IPv4 should also work if an IPv6 is requested, it returns an
-    //  IPv6 with the IPv4 address embedded (except sometimes on Windows where
-    //  we end up with an IPv4 anyway)
-    test_resolve (resolver_opts, "11.22.33.44", "::ffff:11.22.33.44", 0, 0,
-                  "11.22.33.44");
-}
-
-static void test_parse_ipv4_in_ipv6_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true);
-
-    test_resolve (resolver_opts, "11.22.33.44:55", "::ffff:11.22.33.44", 55, 0,
-                  "11.22.33.44");
-}
-
-static void test_parse_ipv6_scope_int ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%2", "3000:4:5::1:234", 0, 2);
-}
-
-static void test_parse_ipv6_scope_zero ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%0", NULL);
-}
-
-static void test_parse_ipv6_scope_int_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%2:1111", "3000:4:5::1:234",
-                  1111, 2);
-}
-
-static void test_parse_ipv6_scope_if ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%eth1", "3000:4:5::1:234", 0,
-                  3);
-}
-
-static void test_parse_ipv6_scope_if_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%eth0:8080", "3000:4:5::1:234",
-                  8080, 2);
-}
-
-static void test_parse_ipv6_scope_if_port_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (true);
-
-    test_resolve (resolver_opts, "[3000:4:5::1:234%eth0]:8080",
-                  "3000:4:5::1:234", 8080, 2);
-}
-
-static void test_parse_ipv6_scope_badif ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%bad0", NULL);
-}
-
-static void test_dns_ipv4_simple ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "ip.zeromq.org", "10.100.0.1");
-}
-
-static void test_dns_ipv4_only ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "ipv4only.zeromq.org", "10.100.0.2");
-}
-
-static void test_dns_ipv4_invalid ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "invalid.zeromq.org", NULL);
-}
-
-static void test_dns_ipv4_ipv6 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "ipv6only.zeromq.org", NULL);
-}
-
-static void test_dns_ipv4_numeric ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    //  Numeric IPs should still work
-    test_resolve (resolver_opts, "5.4.3.2", "5.4.3.2");
-}
-
-static void test_dns_ipv4_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "ip.zeromq.org:1234", "10.100.0.1", 1234);
-}
-
-static void test_dns_ipv6_simple ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "ip.zeromq.org", "fdf5:d058:d656::1");
-}
-
-static void test_dns_ipv6_only ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "ipv6only.zeromq.org", "fdf5:d058:d656::2");
-}
-
-static void test_dns_ipv6_invalid ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "invalid.zeromq.org", NULL);
-}
-
-static void test_dns_ipv6_ipv4 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    //  If a host doesn't have an IPv6 then it should resolve as an embedded v4
-    //  address in an IPv6
-    test_resolve (resolver_opts, "ipv4only.zeromq.org", "::ffff:10.100.0.2");
-}
-
-static void test_dns_ipv6_numeric ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    //  Numeric IPs should still work
-    test_resolve (resolver_opts, "fdf5:d058:d656::1", "fdf5:d058:d656::1");
-}
-
-static void test_dns_ipv6_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "ip.zeromq.org:1234", "fdf5:d058:d656::1",
-                  1234);
-}
-
-void test_dns_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq.org]", "10.100.0.1");
-}
-
-void test_dns_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq].org", NULL);
-}
-
-void test_dns_brackets_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq.org]:22", "10.100.0.1", 22);
-}
-
-void test_dns_brackets_port_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq.org:22]", NULL);
-}
-
-void test_dns_deny (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (false).ipv6 (ipv6_);
-
-    //  DNS resolution shouldn't work when disallowed
-    test_resolve (resolver_opts, "ip.zeromq.org", NULL);
-}
-MAKE_TEST_V4V6 (test_dns_deny)
-
-void test_dns_ipv6_scope ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true).ipv6 (true);
-
-    //  Not sure if that's very useful but you could technically add a scope
-    //  identifier to a hostname
-    test_resolve (resolver_opts, "ip.zeromq.org%lo0", "fdf5:d058:d656::1", 0,
-                  1);
-}
-
-void test_dns_ipv6_scope_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true).expect_port (true).ipv6 (true);
-
-    //  Not sure if that's very useful but you could technically add a scope
-    //  identifier to a hostname
-    test_resolve (resolver_opts, "ip.zeromq.org%lo0:4444", "fdf5:d058:d656::1",
-                  4444, 1);
-}
-
-void test_dns_ipv6_scope_port_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true).expect_port (true).ipv6 (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq.org%lo0]:4444",
-                  "fdf5:d058:d656::1", 4444, 1);
-}
-
-static void test_addr (int family_, const char *addr_, bool multicast_)
-{
-    if (family_ == AF_INET6 && !is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (family_ == AF_INET6);
-
-    test_ip_resolver_t resolver (resolver_opts);
-    zmq::ip_addr_t addr;
-
-    TEST_ASSERT_SUCCESS_ERRNO (resolver.resolve (&addr, addr_));
-
-    TEST_ASSERT_EQUAL (family_, addr.family ());
-    TEST_ASSERT_EQUAL (multicast_, addr.is_multicast ());
-}
-
-static void test_addr_unicast_ipv4 ()
-{
-    test_addr (AF_INET, "1.2.3.4", false);
-}
-
-static void test_addr_unicast_ipv6 ()
-{
-    test_addr (AF_INET6, "abcd::1", false);
-}
-
-static void test_addr_multicast_ipv4 ()
-{
-    test_addr (AF_INET, "230.1.2.3", true);
-}
-
-static void test_addr_multicast_ipv6 ()
-{
-    test_addr (AF_INET6, "ffab::1234", true);
-}
-
-static void test_addr_multicast_ipv4_min ()
-{
-    test_addr (AF_INET, "224.0.0.0", true);
-}
-
-static void test_addr_multicast_ipv6_min ()
-{
-    test_addr (AF_INET6, "ff00::", true);
-}
-
-static void test_addr_multicast_ipv4_max ()
-{
-    test_addr (AF_INET, "239.255.255.255", true);
-}
-
-static void test_addr_multicast_ipv6_max ()
-{
-    test_addr (AF_INET6, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", true);
-}
-
-static void test_addr_multicast_ipv4_sub ()
-{
-    test_addr (AF_INET, "223.255.255.255", false);
-}
-
-static void test_addr_multicast_ipv6_sub ()
-{
-    test_addr (AF_INET6, "feff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", false);
-}
-
-static void test_addr_multicast_ipv4_over ()
-{
-    test_addr (AF_INET, "240.0.0.0", false);
-}
-
-int main (void)
-{
-    zmq::initialize_network ();
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_bind_any_ipv4);
-    RUN_TEST (test_bind_any_ipv6);
-    RUN_TEST (test_bind_any_port0_ipv4);
-    RUN_TEST (test_bind_any_port0_ipv6);
-    RUN_TEST (test_nobind_any_ipv4);
-    RUN_TEST (test_nobind_any_ipv6);
-    RUN_TEST (test_nobind_any_port_ipv4);
-    RUN_TEST (test_nobind_any_port_ipv6);
-    RUN_TEST (test_nobind_addr_anyport_ipv4);
-    RUN_TEST (test_nobind_addr_anyport_ipv6);
-    RUN_TEST (test_nobind_addr_port0_ipv4);
-    RUN_TEST (test_nobind_addr_port0_ipv6);
-    RUN_TEST (test_parse_ipv4_simple);
-    RUN_TEST (test_parse_ipv4_zero);
-    RUN_TEST (test_parse_ipv4_max);
-    RUN_TEST (test_parse_ipv4_brackets);
-    RUN_TEST (test_parse_ipv4_brackets_missingl);
-    RUN_TEST (test_parse_ipv4_brackets_missingr);
-    RUN_TEST (test_parse_ipv4_brackets_bad);
-    RUN_TEST (test_parse_ipv4_reject_port);
-    RUN_TEST (test_parse_ipv4_reject_any);
-    RUN_TEST (test_parse_ipv4_reject_ipv6);
-    RUN_TEST (test_parse_ipv4_port);
-    RUN_TEST (test_parse_ipv4_port0);
-    RUN_TEST (test_parse_ipv4_port_garbage);
-    RUN_TEST (test_parse_ipv4_port_missing);
-    RUN_TEST (test_parse_ipv4_port_bad);
-    RUN_TEST (test_parse_ipv4_port_brackets);
-    RUN_TEST (test_parse_ipv4_port_brackets_bad);
-    RUN_TEST (test_parse_ipv4_port_brackets_bad2);
-    RUN_TEST (test_parse_ipv4_wild_brackets_bad);
-    RUN_TEST (test_parse_ipv4_port_ipv6_reject);
-    RUN_TEST (test_parse_ipv6_simple);
-    RUN_TEST (test_parse_ipv6_simple2);
-    RUN_TEST (test_parse_ipv6_zero);
-    RUN_TEST (test_parse_ipv6_max);
-    RUN_TEST (test_parse_ipv6_brackets);
-    RUN_TEST (test_parse_ipv6_brackets_missingl);
-    RUN_TEST (test_parse_ipv6_brackets_missingr);
-    RUN_TEST (test_parse_ipv6_brackets_bad);
-    RUN_TEST (test_parse_ipv6_port);
-    RUN_TEST (test_parse_ipv6_port_any);
-    RUN_TEST (test_parse_ipv6_port_nobrackets);
-    RUN_TEST (test_parse_ipv4_in_ipv6);
-    RUN_TEST (test_parse_ipv4_in_ipv6_port);
-    RUN_TEST (test_parse_ipv6_scope_int);
-    RUN_TEST (test_parse_ipv6_scope_zero);
-    RUN_TEST (test_parse_ipv6_scope_int_port);
-    RUN_TEST (test_parse_ipv6_scope_if);
-    RUN_TEST (test_parse_ipv6_scope_if_port);
-    RUN_TEST (test_parse_ipv6_scope_if_port_brackets);
-    RUN_TEST (test_parse_ipv6_scope_badif);
-    RUN_TEST (test_dns_ipv4_simple);
-    RUN_TEST (test_dns_ipv4_only);
-    RUN_TEST (test_dns_ipv4_invalid);
-    RUN_TEST (test_dns_ipv4_ipv6);
-    RUN_TEST (test_dns_ipv4_numeric);
-    RUN_TEST (test_dns_ipv4_port);
-    RUN_TEST (test_dns_ipv6_simple);
-    RUN_TEST (test_dns_ipv6_only);
-    RUN_TEST (test_dns_ipv6_invalid);
-    RUN_TEST (test_dns_ipv6_ipv4);
-    RUN_TEST (test_dns_ipv6_numeric);
-    RUN_TEST (test_dns_ipv6_port);
-    RUN_TEST (test_dns_brackets);
-    RUN_TEST (test_dns_brackets_bad);
-    RUN_TEST (test_dns_deny_ipv4);
-    RUN_TEST (test_dns_deny_ipv6);
-    RUN_TEST (test_dns_ipv6_scope);
-    RUN_TEST (test_dns_ipv6_scope_port);
-    RUN_TEST (test_dns_ipv6_scope_port_brackets);
-    RUN_TEST (test_addr_unicast_ipv4);
-    RUN_TEST (test_addr_unicast_ipv6);
-    RUN_TEST (test_addr_multicast_ipv4);
-    RUN_TEST (test_addr_multicast_ipv6);
-    RUN_TEST (test_addr_multicast_ipv4_min);
-    RUN_TEST (test_addr_multicast_ipv6_min);
-    RUN_TEST (test_addr_multicast_ipv4_max);
-    RUN_TEST (test_addr_multicast_ipv6_max);
-    RUN_TEST (test_addr_multicast_ipv4_sub);
-    RUN_TEST (test_addr_multicast_ipv6_sub);
-    RUN_TEST (test_addr_multicast_ipv4_over);
-
-    zmq::shutdown_network ();
-
-    return UNITY_END ();
-}
diff --git a/unittests/unittest_mtrie.cpp b/unittests/unittest_mtrie.cpp
deleted file mode 100644
index e85f7f36f..000000000
--- a/unittests/unittest_mtrie.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil.hpp"
-
-#if defined(min)
-#undef min
-#endif
-
-#include <generic_mtrie_impl.hpp>
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-int getlen (const zmq::generic_mtrie_t<int>::prefix_t &data_)
-{
-    return static_cast<int> (strlen (reinterpret_cast<const char *> (data_)));
-}
-
-void test_create ()
-{
-    zmq::generic_mtrie_t<int> mtrie;
-}
-
-void mtrie_count (int *pipe_, int *count_)
-{
-    LIBZMQ_UNUSED (pipe_);
-    ++*count_;
-}
-
-void test_check_empty_match_nonempty_data ()
-{
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (0, count);
-}
-
-void test_check_empty_match_empty_data ()
-{
-    zmq::generic_mtrie_t<int> mtrie;
-
-    int count = 0;
-    mtrie.match (NULL, 0, mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (0, count);
-}
-
-void test_add_single_entry_match_exact ()
-{
-    int pipe;
-
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    bool res = mtrie.add (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_TRUE (res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (1, count);
-}
-
-void test_add_single_entry_twice_match_exact ()
-{
-    int pipe;
-
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    bool res = mtrie.add (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_TRUE (res);
-
-    res = mtrie.add (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_FALSE (res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (1, count);
-}
-
-void test_add_two_entries_with_same_name_match_exact ()
-{
-    int pipe_1, pipe_2;
-
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    bool res = mtrie.add (test_name, getlen (test_name), &pipe_1);
-    TEST_ASSERT_TRUE (res);
-
-    res = mtrie.add (test_name, getlen (test_name), &pipe_2);
-    TEST_ASSERT_FALSE (res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (2, count);
-}
-
-void test_add_two_entries_match_prefix_and_exact ()
-{
-    int pipe_1, pipe_2;
-
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name_prefix =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-    const zmq::generic_mtrie_t<int>::prefix_t test_name_full =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foobar");
-
-    bool res = mtrie.add (test_name_prefix, getlen (test_name_prefix), &pipe_1);
-    TEST_ASSERT_TRUE (res);
-
-    res = mtrie.add (test_name_full, getlen (test_name_full), &pipe_2);
-    TEST_ASSERT_TRUE (res);
-
-    int count = 0;
-    mtrie.match (test_name_full, getlen (test_name_full), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (2, count);
-}
-
-void test_add_rm_single_entry_match_exact ()
-{
-    int pipe;
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    mtrie.add (test_name, getlen (test_name), &pipe);
-    zmq::generic_mtrie_t<int>::rm_result res =
-      mtrie.rm (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::last_value_removed, res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (0, count);
-}
-
-void test_rm_nonexistent_0_size_empty ()
-{
-    int pipe;
-    zmq::generic_mtrie_t<int> mtrie;
-
-    zmq::generic_mtrie_t<int>::rm_result res = mtrie.rm (0, 0, &pipe);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::not_found, res);
-}
-
-void test_rm_nonexistent_empty ()
-{
-    int pipe;
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    zmq::generic_mtrie_t<int>::rm_result res =
-      mtrie.rm (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::not_found, res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (0, count);
-}
-
-void test_add_and_rm_other (const char *add_name_, const char *rm_name_)
-{
-    int addpipe, rmpipe;
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t add_name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (add_name_);
-    const zmq::generic_mtrie_t<int>::prefix_t rm_name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (rm_name_);
-
-    mtrie.add (add_name_data, getlen (add_name_data), &addpipe);
-
-    zmq::generic_mtrie_t<int>::rm_result res =
-      mtrie.rm (rm_name_data, getlen (rm_name_data), &rmpipe);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::not_found, res);
-
-    {
-        int count = 0;
-        mtrie.match (add_name_data, getlen (add_name_data), mtrie_count,
-                     &count);
-        TEST_ASSERT_EQUAL_INT (1, count);
-    }
-
-    if (strncmp (add_name_, rm_name_,
-                 std::min (strlen (add_name_), strlen (rm_name_) + 1))
-        != 0) {
-        int count = 0;
-        mtrie.match (rm_name_data, getlen (rm_name_data), mtrie_count, &count);
-        TEST_ASSERT_EQUAL_INT (0, count);
-    }
-}
-
-void test_rm_nonexistent_nonempty_samename ()
-{
-    // TODO this triggers an assertion
-    test_add_and_rm_other ("foo", "foo");
-}
-
-void test_rm_nonexistent_nonempty_differentname ()
-{
-    test_add_and_rm_other ("foo", "bar");
-}
-
-void test_rm_nonexistent_nonempty_prefix ()
-{
-    // TODO here, a test assertion fails
-    test_add_and_rm_other ("foobar", "foo");
-}
-
-void test_rm_nonexistent_nonempty_prefixed ()
-{
-    test_add_and_rm_other ("foo", "foobar");
-}
-
-void add_indexed_expect_unique (zmq::generic_mtrie_t<int> &mtrie_,
-                                int *pipes_,
-                                const char **names_,
-                                size_t i_)
-{
-    const zmq::generic_mtrie_t<int>::prefix_t name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names_[i_]);
-
-    bool res = mtrie_.add (name_data, getlen (name_data), &pipes_[i_]);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::last_value_removed, res);
-}
-
-void test_rm_nonexistent_between ()
-{
-    int pipes[3];
-    const char *names[] = {"foo1", "foo2", "foo3"};
-
-    zmq::generic_mtrie_t<int> mtrie;
-    add_indexed_expect_unique (mtrie, pipes, names, 0);
-    add_indexed_expect_unique (mtrie, pipes, names, 2);
-
-    const zmq::generic_mtrie_t<int>::prefix_t name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names[1]);
-
-    zmq::generic_mtrie_t<int>::rm_result res =
-      mtrie.rm (name_data, getlen (name_data), &pipes[1]);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::not_found, res);
-}
-
-template <size_t N>
-void add_entries (zmq::generic_mtrie_t<int> &mtrie_,
-                  int (&pipes_)[N],
-                  const char *(&names_)[N])
-{
-    for (size_t i = 0; i < N; ++i) {
-        add_indexed_expect_unique (mtrie_, pipes_, names_, i);
-    }
-}
-
-void test_add_multiple ()
-{
-    int pipes[3];
-    const char *names[] = {"foo1", "foo2", "foo3"};
-
-    zmq::generic_mtrie_t<int> mtrie;
-    add_entries (mtrie, pipes, names);
-
-    for (size_t i = 0; i < sizeof (names) / sizeof (names[0]); ++i) {
-        const zmq::generic_mtrie_t<int>::prefix_t name_data =
-          reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names[i]);
-        int count = 0;
-        mtrie.match (name_data, getlen (name_data), mtrie_count, &count);
-        TEST_ASSERT_EQUAL_INT (1, count);
-    }
-}
-
-void test_add_multiple_reverse ()
-{
-    int pipes[3];
-    const char *names[] = {"foo1", "foo2", "foo3"};
-
-    zmq::generic_mtrie_t<int> mtrie;
-    for (int i = 2; i >= 0; --i) {
-        add_indexed_expect_unique (mtrie, pipes, names,
-                                   static_cast<size_t> (i));
-    }
-
-    for (size_t i = 0; i < 3; ++i) {
-        const zmq::generic_mtrie_t<int>::prefix_t name_data =
-          reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names[i]);
-        int count = 0;
-        mtrie.match (name_data, getlen (name_data), mtrie_count, &count);
-        TEST_ASSERT_EQUAL_INT (1, count);
-    }
-}
-
-template <size_t N> void add_and_rm_entries (const char *(&names_)[N])
-{
-    int pipes[N];
-    zmq::generic_mtrie_t<int> mtrie;
-    add_entries (mtrie, pipes, names_);
-
-    for (size_t i = 0; i < N; ++i) {
-        const zmq::generic_mtrie_t<int>::prefix_t name_data =
-          reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names_[i]);
-
-        zmq::generic_mtrie_t<int>::rm_result res =
-          mtrie.rm (name_data, getlen (name_data), &pipes[i]);
-        TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::last_value_removed, res);
-    }
-}
-
-void test_rm_multiple_in_order ()
-{
-    const char *names[] = {"foo1", "foo2", "foo3"};
-    add_and_rm_entries (names);
-}
-
-void test_rm_multiple_reverse_order ()
-{
-    const char *names[] = {"foo3", "foo2", "foo1"};
-    add_and_rm_entries (names);
-}
-
-void check_name (zmq::generic_mtrie_t<int>::prefix_t data_,
-                 size_t len_,
-                 const char *name_)
-{
-    TEST_ASSERT_EQUAL_UINT (strlen (name_), len_);
-    TEST_ASSERT_EQUAL_STRING_LEN (name_, data_, len_);
-}
-
-template <size_t N> void add_entries_rm_pipes_unique (const char *(&names_)[N])
-{
-    int pipes[N];
-    zmq::generic_mtrie_t<int> mtrie;
-    add_entries (mtrie, pipes, names_);
-
-    for (size_t i = 0; i < N; ++i) {
-        mtrie.rm (&pipes[i], check_name, names_[i], false);
-    }
-}
-
-void test_rm_with_callback_multiple_in_order ()
-{
-    const char *names[] = {"foo1", "foo2", "foo3"};
-
-    add_entries_rm_pipes_unique (names);
-}
-
-void test_rm_with_callback_multiple_reverse_order ()
-{
-    const char *names[] = {"foo3", "foo2", "foo1"};
-
-    add_entries_rm_pipes_unique (names);
-}
-
-void check_count (zmq::generic_mtrie_t<int>::prefix_t data_,
-                  size_t len_,
-                  int *count_)
-{
-    --(*count_);
-    TEST_ASSERT_GREATER_OR_EQUAL (0, *count_);
-}
-
-void add_duplicate_entry (zmq::generic_mtrie_t<int> &mtrie_, int (&pipes_)[2])
-{
-    const char *name = "foo";
-
-    const zmq::generic_mtrie_t<int>::prefix_t name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (name);
-
-    bool res = mtrie_.add (name_data, getlen (name_data), &pipes_[0]);
-    TEST_ASSERT_TRUE (res);
-    res = mtrie_.add (name_data, getlen (name_data), &pipes_[1]);
-    TEST_ASSERT_FALSE (res);
-}
-
-void test_rm_with_callback_duplicate ()
-{
-    int pipes[2];
-    zmq::generic_mtrie_t<int> mtrie;
-    add_duplicate_entry (mtrie, pipes);
-
-    int count = 1;
-    mtrie.rm (&pipes[0], check_count, &count, false);
-    count = 1;
-    mtrie.rm (&pipes[1], check_count, &count, false);
-}
-
-void test_rm_with_callback_duplicate_uniq_only ()
-{
-    int pipes[2];
-    zmq::generic_mtrie_t<int> mtrie;
-    add_duplicate_entry (mtrie, pipes);
-
-    int count = 0;
-    mtrie.rm (&pipes[0], check_count, &count, true);
-    count = 1;
-    mtrie.rm (&pipes[1], check_count, &count, true);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_create);
-    RUN_TEST (test_check_empty_match_nonempty_data);
-    RUN_TEST (test_check_empty_match_empty_data);
-    RUN_TEST (test_add_single_entry_match_exact);
-    RUN_TEST (test_add_single_entry_twice_match_exact);
-    RUN_TEST (test_add_rm_single_entry_match_exact);
-    RUN_TEST (test_add_two_entries_match_prefix_and_exact);
-    RUN_TEST (test_add_two_entries_with_same_name_match_exact);
-
-    RUN_TEST (test_rm_nonexistent_0_size_empty);
-    RUN_TEST (test_rm_nonexistent_empty);
-    RUN_TEST (test_rm_nonexistent_nonempty_samename);
-    RUN_TEST (test_rm_nonexistent_nonempty_differentname);
-    RUN_TEST (test_rm_nonexistent_nonempty_prefix);
-    RUN_TEST (test_rm_nonexistent_nonempty_prefixed);
-    RUN_TEST (test_rm_nonexistent_between);
-
-    RUN_TEST (test_add_multiple);
-    RUN_TEST (test_add_multiple_reverse);
-    RUN_TEST (test_rm_multiple_in_order);
-    RUN_TEST (test_rm_multiple_reverse_order);
-
-    RUN_TEST (test_rm_with_callback_multiple_in_order);
-    RUN_TEST (test_rm_with_callback_multiple_reverse_order);
-    RUN_TEST (test_rm_with_callback_duplicate);
-    RUN_TEST (test_rm_with_callback_duplicate_uniq_only);
-
-    return UNITY_END ();
-}
diff --git a/unittests/unittest_poller.cpp b/unittests/unittest_poller.cpp
deleted file mode 100644
index 0d150d823..000000000
--- a/unittests/unittest_poller.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil.hpp"
-
-#include <poller.hpp>
-#include <i_poll_events.hpp>
-#include <ip.hpp>
-
-#include <unity.h>
-
-#ifndef _WIN32
-#include <unistd.h>
-#define closesocket close
-#endif
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-void test_create ()
-{
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-}
-
-#if 0
-// TODO this triggers an assertion. should it be a valid use case?
-void test_start_empty ()
-{
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-    poller.start ();
-    msleep (SETTLE_TIME);
-}
-#endif
-
-struct test_events_t : zmq::i_poll_events
-{
-    test_events_t (zmq::fd_t fd_, zmq::poller_t &poller_) :
-        _fd (fd_),
-        _poller (poller_)
-    {
-        (void) _fd;
-    }
-
-    void in_event () ZMQ_OVERRIDE
-    {
-        _poller.rm_fd (_handle);
-        _handle = (zmq::poller_t::handle_t) NULL;
-
-        // this must only be incremented after rm_fd
-        in_events.add (1);
-    }
-
-
-    void out_event () ZMQ_OVERRIDE
-    {
-        // TODO
-    }
-
-
-    void timer_event (int id_) ZMQ_OVERRIDE
-    {
-        LIBZMQ_UNUSED (id_);
-        _poller.rm_fd (_handle);
-        _handle = (zmq::poller_t::handle_t) NULL;
-
-        // this must only be incremented after rm_fd
-        timer_events.add (1);
-    }
-
-    void set_handle (zmq::poller_t::handle_t handle_) { _handle = handle_; }
-
-    zmq::atomic_counter_t in_events, timer_events;
-
-  private:
-    zmq::fd_t _fd;
-    zmq::poller_t &_poller;
-    zmq::poller_t::handle_t _handle;
-};
-
-void wait_in_events (test_events_t &events_)
-{
-    void *watch = zmq_stopwatch_start ();
-    while (events_.in_events.get () < 1) {
-        msleep (1);
-#ifdef ZMQ_BUILD_DRAFT
-        TEST_ASSERT_LESS_OR_EQUAL_MESSAGE (SETTLE_TIME,
-                                           zmq_stopwatch_intermediate (watch),
-                                           "Timeout waiting for in event");
-#endif
-    }
-    zmq_stopwatch_stop (watch);
-}
-
-void wait_timer_events (test_events_t &events_)
-{
-    void *watch = zmq_stopwatch_start ();
-    while (events_.timer_events.get () < 1) {
-        msleep (1);
-#ifdef ZMQ_BUILD_DRAFT
-        TEST_ASSERT_LESS_OR_EQUAL_MESSAGE (SETTLE_TIME,
-                                           zmq_stopwatch_intermediate (watch),
-                                           "Timeout waiting for timer event");
-#endif
-    }
-    zmq_stopwatch_stop (watch);
-}
-
-void create_nonblocking_fdpair (zmq::fd_t *r_, zmq::fd_t *w_)
-{
-    int rc = zmq::make_fdpair (r_, w_);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    TEST_ASSERT_NOT_EQUAL (zmq::retired_fd, *r_);
-    TEST_ASSERT_NOT_EQUAL (zmq::retired_fd, *w_);
-    zmq::unblock_socket (*r_);
-    zmq::unblock_socket (*w_);
-}
-
-void send_signal (zmq::fd_t w_)
-{
-#if defined ZMQ_HAVE_EVENTFD
-    const uint64_t inc = 1;
-    ssize_t sz = write (w_, &inc, sizeof (inc));
-    assert (sz == sizeof (inc));
-#else
-    {
-        char msg[] = "test";
-        int rc = send (w_, msg, sizeof (msg), 0);
-        assert (rc == sizeof (msg));
-    }
-#endif
-}
-
-void close_fdpair (zmq::fd_t w_, zmq::fd_t r_)
-{
-    int rc = closesocket (w_);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-#if !defined ZMQ_HAVE_EVENTFD
-    rc = closesocket (r_);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-#else
-    LIBZMQ_UNUSED (r_);
-#endif
-}
-
-void test_add_fd_and_start_and_receive_data ()
-{
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-
-    zmq::fd_t r, w;
-    create_nonblocking_fdpair (&r, &w);
-
-    test_events_t events (r, poller);
-
-    zmq::poller_t::handle_t handle = poller.add_fd (r, &events);
-    events.set_handle (handle);
-    poller.set_pollin (handle);
-    poller.start ();
-
-    send_signal (w);
-
-    wait_in_events (events);
-
-    // required cleanup
-    close_fdpair (w, r);
-}
-
-void test_add_fd_and_remove_by_timer ()
-{
-    zmq::fd_t r, w;
-    create_nonblocking_fdpair (&r, &w);
-
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-
-    test_events_t events (r, poller);
-
-    zmq::poller_t::handle_t handle = poller.add_fd (r, &events);
-    events.set_handle (handle);
-
-    poller.add_timer (50, &events, 0);
-    poller.start ();
-
-    wait_timer_events (events);
-
-    // required cleanup
-    close_fdpair (w, r);
-}
-
-#ifdef _WIN32
-void test_add_fd_with_pending_failing_connect ()
-{
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-
-    zmq::fd_t bind_socket = socket (AF_INET, SOCK_STREAM, 0);
-    sockaddr_in addr = {0};
-    addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-    addr.sin_port = 0;
-    TEST_ASSERT_EQUAL_INT (0, bind (bind_socket,
-                                    reinterpret_cast<const sockaddr *> (&addr),
-                                    sizeof (addr)));
-
-    int addr_len = static_cast<int> (sizeof (addr));
-    TEST_ASSERT_EQUAL_INT (0, getsockname (bind_socket,
-                                           reinterpret_cast<sockaddr *> (&addr),
-                                           &addr_len));
-
-    zmq::fd_t connect_socket = socket (AF_INET, SOCK_STREAM, 0);
-    zmq::unblock_socket (connect_socket);
-
-    TEST_ASSERT_EQUAL_INT (
-      -1, connect (connect_socket, reinterpret_cast<const sockaddr *> (&addr),
-                   sizeof (addr)));
-    TEST_ASSERT_EQUAL_INT (WSAEWOULDBLOCK, WSAGetLastError ());
-
-    test_events_t events (connect_socket, poller);
-
-    zmq::poller_t::handle_t handle = poller.add_fd (connect_socket, &events);
-    events.set_handle (handle);
-    poller.set_pollin (handle);
-    poller.start ();
-
-    wait_in_events (events);
-
-    int value;
-    int value_len = sizeof (value);
-    TEST_ASSERT_EQUAL_INT (0, getsockopt (connect_socket, SOL_SOCKET, SO_ERROR,
-                                          reinterpret_cast<char *> (&value),
-                                          &value_len));
-    TEST_ASSERT_EQUAL_INT (WSAECONNREFUSED, value);
-
-    // required cleanup
-    close (connect_socket);
-    close (bind_socket);
-}
-#endif
-
-int main (void)
-{
-    UNITY_BEGIN ();
-
-    zmq::initialize_network ();
-    setup_test_environment ();
-
-    RUN_TEST (test_create);
-    RUN_TEST (test_add_fd_and_start_and_receive_data);
-    RUN_TEST (test_add_fd_and_remove_by_timer);
-
-#if defined _WIN32
-    RUN_TEST (test_add_fd_with_pending_failing_connect);
-#endif
-
-    zmq::shutdown_network ();
-
-    return UNITY_END ();
-}
diff --git a/unittests/unittest_radix_tree.cpp b/unittests/unittest_radix_tree.cpp
deleted file mode 100644
index 380b573e9..000000000
--- a/unittests/unittest_radix_tree.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil.hpp"
-
-#include <radix_tree.hpp>
-#include <stdint.hpp>
-
-#include <set>
-#include <string>
-#include <string.h>
-#include <unity.h>
-#include <vector>
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-bool tree_add (zmq::radix_tree_t &tree_, const std::string &key_)
-{
-    return tree_.add (reinterpret_cast<const unsigned char *> (key_.data ()),
-                      key_.size ());
-}
-
-bool tree_rm (zmq::radix_tree_t &tree_, const std::string &key_)
-{
-    return tree_.rm (reinterpret_cast<const unsigned char *> (key_.data ()),
-                     key_.size ());
-}
-
-bool tree_check (zmq::radix_tree_t &tree_, const std::string &key_)
-{
-    return tree_.check (reinterpret_cast<const unsigned char *> (key_.data ()),
-                        key_.size ());
-}
-
-void test_empty ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_TRUE (tree.size () == 0);
-}
-
-void test_add_single_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_TRUE (tree_add (tree, "foo"));
-}
-
-void test_add_same_entry_twice ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_TRUE (tree_add (tree, "test"));
-    TEST_ASSERT_FALSE (tree_add (tree, "test"));
-}
-
-void test_rm_when_empty ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_FALSE (tree_rm (tree, "test"));
-}
-
-void test_rm_single_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "temporary");
-    TEST_ASSERT_TRUE (tree_rm (tree, "temporary"));
-}
-
-void test_rm_unique_entry_twice ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "test");
-    TEST_ASSERT_TRUE (tree_rm (tree, "test"));
-    TEST_ASSERT_FALSE (tree_rm (tree, "test"));
-}
-
-void test_rm_duplicate_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "test");
-    tree_add (tree, "test");
-    TEST_ASSERT_FALSE (tree_rm (tree, "test"));
-    TEST_ASSERT_TRUE (tree_rm (tree, "test"));
-}
-
-void test_rm_common_prefix ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "checkpoint");
-    tree_add (tree, "checklist");
-    TEST_ASSERT_FALSE (tree_rm (tree, "check"));
-}
-
-void test_rm_common_prefix_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "checkpoint");
-    tree_add (tree, "checklist");
-    tree_add (tree, "check");
-    TEST_ASSERT_TRUE (tree_rm (tree, "check"));
-}
-
-void test_rm_null_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "");
-    TEST_ASSERT_TRUE (tree_rm (tree, ""));
-}
-
-void test_check_empty ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_FALSE (tree_check (tree, "foo"));
-}
-
-void test_check_added_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "entry");
-    TEST_ASSERT_TRUE (tree_check (tree, "entry"));
-}
-
-void test_check_common_prefix ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "introduce");
-    tree_add (tree, "introspect");
-    TEST_ASSERT_FALSE (tree_check (tree, "intro"));
-}
-
-void test_check_prefix ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "toasted");
-    TEST_ASSERT_FALSE (tree_check (tree, "toast"));
-    TEST_ASSERT_FALSE (tree_check (tree, "toaste"));
-    TEST_ASSERT_FALSE (tree_check (tree, "toaster"));
-}
-
-void test_check_nonexistent_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "red");
-    TEST_ASSERT_FALSE (tree_check (tree, "blue"));
-}
-
-void test_check_query_longer_than_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "foo");
-    TEST_ASSERT_TRUE (tree_check (tree, "foobar"));
-}
-
-void test_check_null_entry_added ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "");
-    TEST_ASSERT_TRUE (tree_check (tree, "all queries return true"));
-}
-
-void test_size ()
-{
-    zmq::radix_tree_t tree;
-
-    // Adapted from the example on wikipedia.
-    std::vector<std::string> keys;
-    keys.push_back ("tester");
-    keys.push_back ("water");
-    keys.push_back ("slow");
-    keys.push_back ("slower");
-    keys.push_back ("test");
-    keys.push_back ("team");
-    keys.push_back ("toast");
-
-    for (size_t i = 0; i < keys.size (); ++i)
-        TEST_ASSERT_TRUE (tree_add (tree, keys[i]));
-    TEST_ASSERT_TRUE (tree.size () == keys.size ());
-    for (size_t i = 0; i < keys.size (); ++i)
-        TEST_ASSERT_FALSE (tree_add (tree, keys[i]));
-    TEST_ASSERT_TRUE (tree.size () == 2 * keys.size ());
-    for (size_t i = 0; i < keys.size (); ++i)
-        TEST_ASSERT_FALSE (tree_rm (tree, keys[i]));
-    TEST_ASSERT_TRUE (tree.size () == keys.size ());
-    for (size_t i = 0; i < keys.size (); ++i)
-        TEST_ASSERT_TRUE (tree_rm (tree, keys[i]));
-    TEST_ASSERT_TRUE (tree.size () == 0);
-}
-
-void return_key (unsigned char *data_, size_t size_, void *arg_)
-{
-    std::vector<std::string> *vec =
-      reinterpret_cast<std::vector<std::string> *> (arg_);
-    std::string key;
-    for (size_t i = 0; i < size_; ++i)
-        key.push_back (static_cast<char> (data_[i]));
-    vec->push_back (key);
-}
-
-void test_apply ()
-{
-    zmq::radix_tree_t tree;
-
-    std::set<std::string> keys;
-    keys.insert ("tester");
-    keys.insert ("water");
-    keys.insert ("slow");
-    keys.insert ("slower");
-    keys.insert ("test");
-    keys.insert ("team");
-    keys.insert ("toast");
-
-    const std::set<std::string>::iterator end = keys.end ();
-    for (std::set<std::string>::iterator it = keys.begin (); it != end; ++it)
-        tree_add (tree, *it);
-
-    std::vector<std::string> *vec = new std::vector<std::string> ();
-    tree.apply (return_key, static_cast<void *> (vec));
-    for (size_t i = 0; i < vec->size (); ++i)
-        TEST_ASSERT_TRUE (keys.count ((*vec)[i]) > 0);
-    delete vec;
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_empty);
-    RUN_TEST (test_add_single_entry);
-    RUN_TEST (test_add_same_entry_twice);
-
-    RUN_TEST (test_rm_when_empty);
-    RUN_TEST (test_rm_single_entry);
-    RUN_TEST (test_rm_unique_entry_twice);
-    RUN_TEST (test_rm_duplicate_entry);
-    RUN_TEST (test_rm_common_prefix);
-    RUN_TEST (test_rm_common_prefix_entry);
-    RUN_TEST (test_rm_null_entry);
-
-    RUN_TEST (test_check_empty);
-    RUN_TEST (test_check_added_entry);
-    RUN_TEST (test_check_common_prefix);
-    RUN_TEST (test_check_prefix);
-    RUN_TEST (test_check_nonexistent_entry);
-    RUN_TEST (test_check_query_longer_than_entry);
-    RUN_TEST (test_check_null_entry_added);
-
-    RUN_TEST (test_size);
-
-    RUN_TEST (test_apply);
-
-    return UNITY_END ();
-}
diff --git a/unittests/unittest_resolver_common.hpp b/unittests/unittest_resolver_common.hpp
deleted file mode 100644
index ebbc446f2..000000000
--- a/unittests/unittest_resolver_common.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __UNITTEST_RESOLVER_COMMON_INCLUDED__
-#define __UNITTEST_RESOLVER_COMMON_INCLUDED__
-
-#include <ip_resolver.hpp>
-#include <string.h>
-
-//  Attempt a resolution and test the results.
-//
-//  On windows we can receive an IPv4 address even when an IPv6 is requested, if
-//  we're in this situation then we compare to 'expected_addr_v4_failover_'
-//  instead.
-void validate_address (int family,
-                       const zmq::ip_addr_t *addr_,
-                       const char *expected_addr_,
-                       uint16_t expected_port_ = 0,
-                       uint16_t expected_zone_ = 0,
-                       const char *expected_addr_v4_failover_ = NULL)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    if (family == AF_INET6 && expected_addr_v4_failover_ != NULL
-        && addr_->family () == AF_INET) {
-        //  We've requested an IPv6 but the system gave us an IPv4, use the
-        //  failover address
-        family = AF_INET;
-        expected_addr_ = expected_addr_v4_failover_;
-    }
-#else
-    (void) expected_addr_v4_failover_;
-#endif
-
-    TEST_ASSERT_EQUAL (family, addr_->family ());
-
-    if (family == AF_INET6) {
-        struct in6_addr expected_addr;
-        const sockaddr_in6 *ip6_addr = &addr_->ipv6;
-
-        TEST_ASSERT_EQUAL (
-          1, test_inet_pton (AF_INET6, expected_addr_, &expected_addr));
-
-        int neq = memcmp (&ip6_addr->sin6_addr, &expected_addr,
-                          sizeof (expected_addr_));
-
-        TEST_ASSERT_EQUAL (0, neq);
-        TEST_ASSERT_EQUAL (htons (expected_port_), ip6_addr->sin6_port);
-        TEST_ASSERT_EQUAL (expected_zone_, ip6_addr->sin6_scope_id);
-    } else {
-        struct in_addr expected_addr;
-        const sockaddr_in *ip4_addr = &addr_->ipv4;
-
-        TEST_ASSERT_EQUAL (
-          1, test_inet_pton (AF_INET, expected_addr_, &expected_addr));
-
-        TEST_ASSERT_EQUAL (expected_addr.s_addr, ip4_addr->sin_addr.s_addr);
-        TEST_ASSERT_EQUAL (htons (expected_port_), ip4_addr->sin_port);
-    }
-}
-
-#endif // __UNITTEST_RESOLVER_COMMON_INCLUDED__
diff --git a/unittests/unittest_udp_address.cpp b/unittests/unittest_udp_address.cpp
deleted file mode 100644
index 84dfdc572..000000000
--- a/unittests/unittest_udp_address.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <unity.h>
-#include "../tests/testutil.hpp"
-#include "../unittests/unittest_resolver_common.hpp"
-
-#include <ip.hpp>
-#include <udp_address.hpp>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-//  Test an UDP address resolution. If 'dest_addr_' is NULL assume the
-//  resolution is supposed to fail.
-static void test_resolve (bool bind_,
-                          int family_,
-                          const char *name_,
-                          const char *target_addr_,
-                          uint16_t expected_port_,
-                          const char *bind_addr_,
-                          bool multicast_)
-{
-    if (family_ == AF_INET6 && !is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    zmq::udp_address_t addr;
-
-    int rc = addr.resolve (name_, bind_, family_ == AF_INET6);
-
-    if (target_addr_ == NULL) {
-        TEST_ASSERT_EQUAL (-1, rc);
-        TEST_ASSERT_EQUAL (EINVAL, errno);
-        return;
-    }
-    TEST_ASSERT_EQUAL (0, rc);
-
-
-    TEST_ASSERT_EQUAL (multicast_, addr.is_mcast ());
-
-    if (bind_addr_ == NULL) {
-        // Bind ANY
-        if (family_ == AF_INET) {
-            bind_addr_ = "0.0.0.0";
-        } else {
-            bind_addr_ = "::";
-        }
-    }
-
-    validate_address (family_, addr.target_addr (), target_addr_,
-                      expected_port_);
-    validate_address (family_, addr.bind_addr (), bind_addr_, expected_port_);
-}
-
-static void test_resolve_bind (int family_,
-                               const char *name_,
-                               const char *dest_addr_,
-                               uint16_t expected_port_ = 0,
-                               const char *bind_addr_ = NULL,
-                               bool multicast_ = false)
-{
-    test_resolve (true, family_, name_, dest_addr_, expected_port_, bind_addr_,
-                  multicast_);
-}
-
-static void test_resolve_connect (int family_,
-                                  const char *name_,
-                                  const char *dest_addr_,
-                                  uint16_t expected_port_ = 0,
-                                  const char *bind_addr_ = NULL,
-                                  bool multicast_ = false)
-{
-    test_resolve (false, family_, name_, dest_addr_, expected_port_, bind_addr_,
-                  multicast_);
-}
-
-static void test_resolve_ipv4_simple ()
-{
-    test_resolve_connect (AF_INET, "127.0.0.1:5555", "127.0.0.1", 5555);
-}
-
-static void test_resolve_ipv6_simple ()
-{
-    test_resolve_connect (AF_INET6, "[::1]:123", "::1", 123);
-}
-
-static void test_resolve_ipv4_bind ()
-{
-    test_resolve_bind (AF_INET, "127.0.0.1:5555", "127.0.0.1", 5555,
-                       "127.0.0.1");
-}
-
-static void test_resolve_ipv6_bind ()
-{
-    test_resolve_bind (AF_INET6, "[abcd::1234:1]:5555", "abcd::1234:1", 5555,
-                       "abcd::1234:1");
-}
-
-static void test_resolve_ipv4_bind_any ()
-{
-    test_resolve_bind (AF_INET, "*:*", "0.0.0.0", 0, "0.0.0.0");
-}
-
-static void test_resolve_ipv6_bind_any ()
-{
-    test_resolve_bind (AF_INET6, "*:*", "::", 0, "::");
-}
-
-static void test_resolve_ipv4_bind_anyport ()
-{
-    test_resolve_bind (AF_INET, "127.0.0.1:*", "127.0.0.1", 0, "127.0.0.1");
-}
-
-static void test_resolve_ipv6_bind_anyport ()
-{
-    test_resolve_bind (AF_INET6, "[1:2:3:4::5]:*", "1:2:3:4::5", 0,
-                       "1:2:3:4::5");
-}
-
-static void test_resolve_ipv4_bind_any_port ()
-{
-    test_resolve_bind (AF_INET, "*:5555", "0.0.0.0", 5555, "0.0.0.0");
-}
-
-static void test_resolve_ipv6_bind_any_port ()
-{
-    test_resolve_bind (AF_INET6, "*:5555", "::", 5555, "::");
-}
-
-static void test_resolve_ipv4_connect_any ()
-{
-    //  Cannot use wildcard for connection
-    test_resolve_connect (AF_INET, "*:5555", NULL);
-}
-
-static void test_resolve_ipv6_connect_any ()
-{
-    //  Cannot use wildcard for connection
-    test_resolve_connect (AF_INET6, "*:5555", NULL);
-}
-
-static void test_resolve_ipv4_connect_anyport ()
-{
-    test_resolve_connect (AF_INET, "127.0.0.1:*", NULL);
-}
-
-static void test_resolve_ipv6_connect_anyport ()
-{
-    test_resolve_connect (AF_INET6, "[::1]:*", NULL);
-}
-
-static void test_resolve_ipv4_connect_port0 ()
-{
-    test_resolve_connect (AF_INET, "127.0.0.1:0", "127.0.0.1", 0);
-}
-
-static void test_resolve_ipv6_connect_port0 ()
-{
-    test_resolve_connect (AF_INET6, "[2000:abcd::1]:0", "2000:abcd::1", 0);
-}
-
-static void test_resolve_ipv4_bind_mcast ()
-{
-    test_resolve_bind (AF_INET, "239.0.0.1:1234", "239.0.0.1", 1234, "0.0.0.0",
-                       true);
-}
-
-static void test_resolve_ipv6_bind_mcast ()
-{
-    test_resolve_bind (AF_INET6, "[ff00::1]:1234", "ff00::1", 1234, "::", true);
-}
-
-static void test_resolve_ipv4_connect_mcast ()
-{
-    test_resolve_connect (AF_INET, "239.0.0.1:2222", "239.0.0.1", 2222, NULL,
-                          true);
-}
-
-static void test_resolve_ipv6_connect_mcast ()
-{
-    test_resolve_connect (AF_INET6, "[ff00::1]:2222", "ff00::1", 2222, NULL,
-                          true);
-}
-
-static void test_resolve_ipv4_mcast_src_bind ()
-{
-    test_resolve_bind (AF_INET, "127.0.0.1;230.2.8.12:5555", "230.2.8.12", 5555,
-                       "127.0.0.1", true);
-}
-
-static void test_resolve_ipv6_mcast_src_bind ()
-{
-    if (!is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    zmq::udp_address_t addr;
-    int rc = addr.resolve ("[::1];[ffab::4]:5555", true, true);
-
-    //  For the time being this fails because we only support binding multicast
-    //  by interface name, not interface IP
-    TEST_ASSERT_EQUAL (-1, rc);
-    TEST_ASSERT_EQUAL (ENODEV, errno);
-}
-
-static void test_resolve_ipv4_mcast_src_bind_any ()
-{
-    test_resolve_bind (AF_INET, "*;230.2.8.12:5555", "230.2.8.12", 5555,
-                       "0.0.0.0", true);
-}
-
-static void test_resolve_ipv6_mcast_src_bind_any ()
-{
-    test_resolve_bind (AF_INET6, "*;[ffff::]:5555", "ffff::", 5555, "::", true);
-}
-
-static void test_resolve_ipv4_mcast_src_connect ()
-{
-    test_resolve_connect (AF_INET, "8.9.10.11;230.2.8.12:5555", "230.2.8.12",
-                          5555, "8.9.10.11", true);
-}
-
-static void test_resolve_ipv6_mcast_src_connect ()
-{
-    if (!is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    zmq::udp_address_t addr;
-    int rc = addr.resolve ("[1:2:3::4];[ff01::1]:5555", false, true);
-
-    //  For the time being this fails because we only support binding multicast
-    //  by interface name, not interface IP
-    TEST_ASSERT_EQUAL (-1, rc);
-    TEST_ASSERT_EQUAL (ENODEV, errno);
-}
-
-static void test_resolve_ipv4_mcast_src_connect_any ()
-{
-    test_resolve_connect (AF_INET, "*;230.2.8.12:5555", "230.2.8.12", 5555,
-                          "0.0.0.0", true);
-}
-
-static void test_resolve_ipv6_mcast_src_connect_any ()
-{
-    test_resolve_connect (AF_INET6, "*;[ff10::1]:5555", "ff10::1", 5555,
-                          "::", true);
-}
-
-static void test_resolve_ipv4_mcast_src_bind_bad ()
-{
-    test_resolve_bind (AF_INET, "127.0.0.1;1.2.3.4:5555", NULL);
-}
-
-static void test_resolve_ipv6_mcast_src_bind_bad ()
-{
-    test_resolve_bind (AF_INET6, "[::1];[fe00::1]:5555", NULL);
-}
-
-static void test_resolve_ipv4_mcast_src_connect_bad ()
-{
-    test_resolve_connect (AF_INET, "127.0.0.1;1.2.3.4:5555", NULL);
-}
-
-static void test_resolve_ipv6_mcast_src_connect_bad ()
-{
-    test_resolve_connect (AF_INET6, "[::1];[fe00:1]:5555", NULL);
-}
-
-int main (void)
-{
-    zmq::initialize_network ();
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_resolve_ipv4_simple);
-    RUN_TEST (test_resolve_ipv6_simple);
-    RUN_TEST (test_resolve_ipv4_bind);
-    RUN_TEST (test_resolve_ipv6_bind);
-    RUN_TEST (test_resolve_ipv4_bind_any);
-    RUN_TEST (test_resolve_ipv6_bind_any);
-    RUN_TEST (test_resolve_ipv4_bind_anyport);
-    RUN_TEST (test_resolve_ipv6_bind_anyport);
-    RUN_TEST (test_resolve_ipv4_bind_any_port);
-    RUN_TEST (test_resolve_ipv6_bind_any_port);
-    RUN_TEST (test_resolve_ipv4_connect_any);
-    RUN_TEST (test_resolve_ipv6_connect_any);
-    RUN_TEST (test_resolve_ipv4_connect_anyport);
-    RUN_TEST (test_resolve_ipv6_connect_anyport);
-    RUN_TEST (test_resolve_ipv4_connect_port0);
-    RUN_TEST (test_resolve_ipv6_connect_port0);
-    RUN_TEST (test_resolve_ipv4_bind_mcast);
-    RUN_TEST (test_resolve_ipv6_bind_mcast);
-    RUN_TEST (test_resolve_ipv4_connect_mcast);
-    RUN_TEST (test_resolve_ipv6_connect_mcast);
-    RUN_TEST (test_resolve_ipv4_mcast_src_bind);
-    RUN_TEST (test_resolve_ipv6_mcast_src_bind);
-    RUN_TEST (test_resolve_ipv4_mcast_src_bind_any);
-    RUN_TEST (test_resolve_ipv6_mcast_src_bind_any);
-    RUN_TEST (test_resolve_ipv4_mcast_src_connect);
-    RUN_TEST (test_resolve_ipv6_mcast_src_connect);
-    RUN_TEST (test_resolve_ipv4_mcast_src_connect_any);
-    RUN_TEST (test_resolve_ipv6_mcast_src_connect_any);
-    RUN_TEST (test_resolve_ipv4_mcast_src_bind_bad);
-    RUN_TEST (test_resolve_ipv6_mcast_src_bind_bad);
-    RUN_TEST (test_resolve_ipv4_mcast_src_connect_bad);
-    RUN_TEST (test_resolve_ipv6_mcast_src_connect_bad);
-
-    zmq::shutdown_network ();
-
-    return UNITY_END ();
-}
diff --git a/unittests/unittest_ypipe.cpp b/unittests/unittest_ypipe.cpp
deleted file mode 100644
index c99717fbf..000000000
--- a/unittests/unittest_ypipe.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil.hpp"
-
-#include <ypipe.hpp>
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-void test_create ()
-{
-    zmq::ypipe_t<int, 1> ypipe;
-}
-
-void test_check_read_empty ()
-{
-    zmq::ypipe_t<int, 1> ypipe;
-    TEST_ASSERT_FALSE (ypipe.check_read ());
-}
-
-void test_read_empty ()
-{
-    zmq::ypipe_t<int, 1> ypipe;
-    int read_value = -1;
-    TEST_ASSERT_FALSE (ypipe.read (&read_value));
-    TEST_ASSERT_EQUAL (-1, read_value);
-}
-
-void test_write_complete_and_check_read_and_read ()
-{
-    const int value = 42;
-    zmq::ypipe_t<int, 1> ypipe;
-    ypipe.write (value, false);
-    TEST_ASSERT_FALSE (ypipe.check_read ());
-    int read_value = -1;
-    TEST_ASSERT_FALSE (ypipe.read (&read_value));
-    TEST_ASSERT_EQUAL_INT (-1, read_value);
-}
-
-void test_write_complete_and_flush_and_check_read_and_read ()
-{
-    const int value = 42;
-    zmq::ypipe_t<int, 1> ypipe;
-    ypipe.write (value, false);
-    ypipe.flush ();
-    TEST_ASSERT_TRUE (ypipe.check_read ());
-    int read_value = -1;
-    TEST_ASSERT_TRUE (ypipe.read (&read_value));
-    TEST_ASSERT_EQUAL_INT (value, read_value);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_create);
-    RUN_TEST (test_check_read_empty);
-    RUN_TEST (test_read_empty);
-    RUN_TEST (test_write_complete_and_check_read_and_read);
-    RUN_TEST (test_write_complete_and_flush_and_check_read_and_read);
-
-    return UNITY_END ();
-}
diff --git a/version.sh b/version.sh
deleted file mode 100755
index b4425d094..000000000
--- a/version.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# This script extracts the 0MQ version from include/zmq.h, which is the master
-# location for this information.
-#
-if [ ! -f include/zmq.h ]; then
-    echo "version.sh: error: include/zmq.h does not exist" 1>&2
-    exit 1
-fi
-MAJOR=`egrep '^#define +ZMQ_VERSION_MAJOR +[0-9]+$' include/zmq.h`
-MINOR=`egrep '^#define +ZMQ_VERSION_MINOR +[0-9]+$' include/zmq.h`
-PATCH=`egrep '^#define +ZMQ_VERSION_PATCH +[0-9]+$' include/zmq.h`
-if [ -z "$MAJOR" -o -z "$MINOR" -o -z "$PATCH" ]; then
-    echo "version.sh: error: could not extract version from include/zmq.h" 1>&2
-    exit 1
-fi
-MAJOR=`echo $MAJOR | awk '{ print $3 }'`
-MINOR=`echo $MINOR | awk '{ print $3 }'`
-PATCH=`echo $PATCH | awk '{ print $3 }'`
-echo $MAJOR.$MINOR.$PATCH | tr -d '\n'
-